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>

4704 files changed, 58198 insertions, 95279 deletions

diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 908b8a2873b5..55a8f940d7c4 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -74,7 +74,7 @@ public:
 
     virtual css::uno::Any SAL_CALL queryInterface(
         const css::uno::Type& aType
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  XTypeProvider
 
@@ -86,62 +86,59 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     //  XAggregation
 
     virtual css::uno::Any SAL_CALL queryAggregation(
         const css::uno::Type& aType
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  XControl
 
     virtual void SAL_CALL createPeer(
         const css::uno::Reference< css::awt::XToolkit >&      xToolkit ,
         const css::uno::Reference< css::awt::XWindowPeer >&   xParent
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual sal_Bool SAL_CALL setModel(
         const css::uno::Reference< css::awt::XControlModel >& xModel
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override;
 
     //  XComponent
 
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     //  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;
 
     //  XControlContainer
 
     virtual void SAL_CALL addControl(
         const OUString&                                     sName    ,
         const css::uno::Reference< css::awt::XControl >&    xControl
-    ) throw( css::uno::RuntimeException, std::exception  ) override;
+    ) override;
 
     virtual void SAL_CALL removeControl(
         const css::uno::Reference< css::awt::XControl >& xControl
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL setStatusText(
         const OUString& sStatusText
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl(
         const OUString& sName
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls() override;
 
     //  XWindow
 
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) override;
 
 protected:
     using OComponentHelper::disposing;
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 8e8b93784b7f..6967a3ff1085 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -139,7 +139,7 @@ public:
 
     virtual css::uno::Any SAL_CALL queryInterface(
         const css::uno::Type& aType
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -169,8 +169,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     /**_______________________________________________________________________________________________________
         @short      get implementation id
@@ -183,75 +182,68 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     //  XAggregation
 
     virtual void SAL_CALL setDelegator(
         const css::uno::Reference< css::uno::XInterface >& xDelegator
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual css::uno::Any SAL_CALL queryAggregation(
         const css::uno::Type& aType
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  XServiceInfo
 
     virtual sal_Bool SAL_CALL supportsService(
         const OUString& sServiceName
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() 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;
 
     //  XComponent
 
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     virtual void SAL_CALL addEventListener(
         const css::uno::Reference< css::lang::XEventListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL removeEventListener(
         const css::uno::Reference< css::lang::XEventListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  XControl
 
     virtual void SAL_CALL createPeer(
         const css::uno::Reference< css::awt::XToolkit >& xToolkit,
         const css::uno::Reference< css::awt::XWindowPeer >& xParent
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL setContext(
         const css::uno::Reference< css::uno::XInterface >& xContext
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual sal_Bool SAL_CALL setModel(
         const css::uno::Reference< css::awt::XControlModel >& xModel
-    ) throw( css::uno::RuntimeException, std::exception ) override = 0;
+    ) override = 0;
 
-    virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setDesignMode( sal_Bool bOn ) override;
 
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() override;
 
-    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
-        throw( css::uno::RuntimeException, std::exception ) override = 0;
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override = 0;
 
-    virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() override;
 
-    virtual css::uno::Reference< css::awt::XView > SAL_CALL getView()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() override;
 
-    virtual sal_Bool SAL_CALL isDesignMode() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isDesignMode() override;
 
-    virtual sal_Bool SAL_CALL isTransparent() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isTransparent() override;
 
     //  XWindow
 
@@ -259,99 +251,97 @@ public:
                                         sal_Int32   nY      ,
                                         sal_Int32   nWidth  ,
                                         sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( css::uno::RuntimeException, std::exception ) override;
+                                        sal_Int16   nFlags  ) override;
 
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) override;
 
-    virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setEnable( sal_Bool bEnable ) override;
 
-    virtual void SAL_CALL setFocus() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setFocus() override;
 
-    virtual css::awt::Rectangle SAL_CALL getPosSize() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Rectangle SAL_CALL getPosSize() override;
 
     virtual void SAL_CALL addWindowListener(
         const css::uno::Reference< css::awt::XWindowListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL addFocusListener(
         const css::uno::Reference< css::awt::XFocusListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL addKeyListener(
-        const css::uno::Reference< css::awt::XKeyListener >& xListener )
-    throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
 
     virtual void SAL_CALL addMouseListener(
         const css::uno::Reference< css::awt::XMouseListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL addMouseMotionListener(
         const css::uno::Reference< css::awt::XMouseMotionListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL addPaintListener(
         const css::uno::Reference< css::awt::XPaintListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL removeWindowListener(
         const css::uno::Reference< css::awt::XWindowListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL removeFocusListener(
         const css::uno::Reference< css::awt::XFocusListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL removeKeyListener(
         const css::uno::Reference< css::awt::XKeyListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL removeMouseListener(
         const css::uno::Reference< css::awt::XMouseListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL removeMouseMotionListener(
         const css::uno::Reference< css::awt::XMouseMotionListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL removePaintListener(
         const css::uno::Reference< css::awt::XPaintListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  XView
 
     virtual void SAL_CALL draw( sal_Int32   nX  ,
-                                sal_Int32   nY  ) throw( css::uno::RuntimeException, std::exception ) override;
+                                sal_Int32   nY  ) override;
 
     virtual sal_Bool SAL_CALL setGraphics(
         const css::uno::Reference< css::awt::XGraphics >& xDevice
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL setZoom(  float   fZoomX  ,
-                                    float   fZoomY  ) throw( css::uno::RuntimeException, std::exception ) override;
+                                    float   fZoomY  ) override;
 
-    virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() override;
 
-    virtual css::awt::Size SAL_CALL getSize() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
     //  css::lang::XEventListener
 
     virtual void SAL_CALL disposing(
         const css::lang::EventObject& rSource
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  XPaintListener
 
     virtual void SAL_CALL windowPaint(
         const css::awt::PaintEvent& rEvent
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  XWindowListener
 
-    virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) override;
+    virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) override;
+    virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) override;
 
 protected:
     using OComponentHelper::disposing;
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index f238293444f1..6229b5a5b17e 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -100,8 +100,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -154,88 +153,65 @@ public:
 
     //  XEventListener
 
-    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;
 
     //  XFocusListener
 
-    virtual void SAL_CALL focusGained(const css::awt::FocusEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL focusGained(const css::awt::FocusEvent& aEvent ) override;
 
-    virtual void SAL_CALL focusLost(const css::awt::FocusEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL focusLost(const css::awt::FocusEvent& aEvent ) override;
 
     //  XWindowListener
 
-    virtual void SAL_CALL windowResized(const css::awt::WindowEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowResized(const css::awt::WindowEvent& aEvent ) override;
 
-    virtual void SAL_CALL windowMoved(const css::awt::WindowEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowMoved(const css::awt::WindowEvent& aEvent ) override;
 
-    virtual void SAL_CALL windowShown(const css::lang::EventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowShown(const css::lang::EventObject& aEvent ) override;
 
-    virtual void SAL_CALL windowHidden(const css::lang::EventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowHidden(const css::lang::EventObject& aEvent ) override;
 
     //  XKeyListener
 
-    virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& aEvent ) override;
 
-    virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) override;
 
     //  XMouseListener
 
-    virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& aEvent ) override;
 
-    virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& aEvent ) override;
 
-    virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& aEvent ) override;
 
-    virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& aEvent ) override;
 
     //  XMouseMotionListener
 
-    virtual void SAL_CALL mouseDragged(const css::awt::MouseEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL mouseDragged(const css::awt::MouseEvent& aEvent ) override;
 
-    virtual void SAL_CALL mouseMoved(const css::awt::MouseEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL mouseMoved(const css::awt::MouseEvent& aEvent ) override;
 
     //  XPaintListener
 
-    virtual void SAL_CALL windowPaint(const css::awt::PaintEvent& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowPaint(const css::awt::PaintEvent& aEvent ) override;
 
     //  XTopWindowListener
 
-    virtual void SAL_CALL windowOpened( const css::lang::EventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowOpened( const css::lang::EventObject& aEvent ) override;
 
-    virtual void SAL_CALL windowClosing( const css::lang::EventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowClosing( const css::lang::EventObject& aEvent ) override;
 
-    virtual void SAL_CALL windowClosed( const css::lang::EventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowClosed( const css::lang::EventObject& aEvent ) override;
 
-    virtual void SAL_CALL windowMinimized( const css::lang::EventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowMinimized( const css::lang::EventObject& aEvent ) override;
 
-    virtual void SAL_CALL windowNormalized( const css::lang::EventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowNormalized( const css::lang::EventObject& aEvent ) override;
 
-    virtual void SAL_CALL windowActivated( const css::lang::EventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowActivated( const css::lang::EventObject& aEvent ) override;
 
-    virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& aEvent ) override;
 
 //  protected methods
 
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index cb00544b67d6..a6fb9b97447a 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -48,7 +48,7 @@ BaseContainerControl::~BaseContainerControl()
 
 //  XInterface
 
-Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -71,7 +71,7 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru
 
 //  XTypeProvider
 
-Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL BaseContainerControl::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -101,7 +101,7 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti
 
 //  XAggregation
 
-Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
+Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -127,7 +127,7 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw(
 //  XControl
 
 void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&      xToolkit    ,
-                                                const   Reference< XWindowPeer >&   xParent     ) throw( RuntimeException, std::exception )
+                                                const   Reference< XWindowPeer >&   xParent     )
 {
     if ( !getPeer().is() )
     {
@@ -151,7 +151,7 @@ void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&
 
 //  XControl
 
-sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& )
 {
     // This object has NO model.
     return false;
@@ -159,7 +159,7 @@ sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel
 
 //  XControl
 
-Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException, std::exception )
+Reference< XControlModel > SAL_CALL BaseContainerControl::getModel()
 {
     // This object has NO model.
     // return (XControlModel*)this;
@@ -168,7 +168,7 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt
 
 //  XComponent
 
-void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL BaseContainerControl::dispose()
 {
     // Tell everything that this container is now gone.
     // It's faster if you listen to both the control and the container.
@@ -207,7 +207,7 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exce
 
 //  XEventListener
 
-void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent )
 {
     Reference< XControl > xControl( rEvent.Source, UNO_QUERY );
 
@@ -217,7 +217,7 @@ void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw
 
 //  XControlContainer
 
-void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl )
 {
     if ( !rControl.is () )
         return;
@@ -271,7 +271,7 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
 
 //  XControlContainer
 
-void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl )
 {
     if ( rControl.is() )
     {
@@ -322,7 +322,7 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl >
 
 //  XControlContainer
 
-void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText )
 {
     // go down to each parent
     Reference< XControlContainer >  xContainer ( getContext(), UNO_QUERY );
@@ -335,7 +335,7 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText
 
 //  XControlContainer
 
-Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException, std::exception )
+Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName )
 {
     // Ready for multithreading
     MutexGuard  aGuard ( Mutex::getGlobalMutex() );
@@ -361,7 +361,7 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString
 
 //  XControlContainer
 
-Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException, std::exception )
+Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls ()
 {
     // Ready for multithreading
     MutexGuard  aGuard ( Mutex::getGlobalMutex() );
@@ -384,7 +384,7 @@ Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls ()
 
 //  XWindow
 
-void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible )
 {
     // override baseclass definition
     BaseControl::setVisible ( bVisible );
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 98d927aa2b1f..81a79a4da107 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -70,7 +70,7 @@ BaseControl::~BaseControl()
 
 //  XInterface
 
-Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL BaseControl::queryInterface( const Type& rType )
 {
     Any aReturn;
     if ( m_xDelegator.is() )
@@ -112,7 +112,7 @@ void SAL_CALL BaseControl::release() throw()
 
 //  XTypeProvider
 
-Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL BaseControl::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -147,14 +147,14 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::
 
 //  XTypeProvider
 
-Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 //  XAggregation
 
-void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -163,7 +163,7 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t
 
 //  XAggregation
 
-Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
+Any SAL_CALL BaseControl::queryAggregation( const Type& aType )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -192,28 +192,28 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx
 
 //  XServiceInfo
 
-OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL BaseControl::getImplementationName()
 {
     return OUString();
 }
 
 //  XServiceInfo
 
-sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 //  XServiceInfo
 
-Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames()
 {
     return Sequence< OUString >();
 }
 
 //  XComponent
 
-void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::dispose()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -258,7 +258,7 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception )
 
 //  XComponent
 
-void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -267,7 +267,7 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >&
 
 //  XComponent
 
-void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -277,7 +277,7 @@ void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener
 //  XControl
 
 void SAL_CALL BaseControl::createPeer(  const   Reference< XToolkit >&      xToolkit    ,
-                                        const   Reference< XWindowPeer >&   xParentPeer ) throw( RuntimeException, std::exception )
+                                        const   Reference< XWindowPeer >&   xParentPeer )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -337,7 +337,7 @@ void SAL_CALL BaseControl::createPeer(  const   Reference< XToolkit >&      xToo
 
 //  XControl
 
-void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -346,7 +346,7 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext )
 
 //  XControl
 
-void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -355,7 +355,7 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException
 
 //  XControl
 
-Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL BaseControl::getContext()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -364,7 +364,7 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti
 
 //  XControl
 
-Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException, std::exception )
+Reference< XWindowPeer > SAL_CALL BaseControl::getPeer()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -373,7 +373,7 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException
 
 //  XControl
 
-Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std::exception )
+Reference< XView > SAL_CALL BaseControl::getView()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -382,7 +382,7 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std:
 
 //  XControl
 
-sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL BaseControl::isDesignMode()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -391,7 +391,7 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exce
 
 //  XControl
 
-sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL BaseControl::isTransparent()
 {
     return false;
 }
@@ -402,7 +402,7 @@ void SAL_CALL BaseControl::setPosSize(  sal_Int32   nX      ,
                                         sal_Int32   nY      ,
                                         sal_Int32   nWidth  ,
                                         sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( RuntimeException, std::exception )
+                                        sal_Int16   nFlags  )
 {
     // - change size and position of window and save the values
 
@@ -443,7 +443,7 @@ void SAL_CALL BaseControl::setPosSize(  sal_Int32   nX      ,
 
 //  XWindow
 
-void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::setVisible( sal_Bool bVisible )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -460,7 +460,7 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti
 
 //  XWindow
 
-void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::setEnable( sal_Bool bEnable )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -477,7 +477,7 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException
 
 //  XWindow
 
-void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::setFocus()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -490,7 +490,7 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception )
 
 //  XWindow
 
-Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::exception )
+Rectangle SAL_CALL BaseControl::getPosSize()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -499,84 +499,84 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::excep
 
 //  XWindow
 
-void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener )
 {
     impl_getMultiplexer()->advise( cppu::UnoType<XWindowListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener )
 {
     impl_getMultiplexer()->advise( cppu::UnoType<XFocusListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener )
 {
     impl_getMultiplexer()->advise( cppu::UnoType<XKeyListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener )
 {
     impl_getMultiplexer()->advise( cppu::UnoType<XMouseListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener )
 {
     impl_getMultiplexer()->advise( cppu::UnoType<XMouseMotionListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener )
 {
     impl_getMultiplexer()->advise( cppu::UnoType<XPaintListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener )
 {
     impl_getMultiplexer()->unadvise( cppu::UnoType<XWindowListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener )
 {
     impl_getMultiplexer()->unadvise( cppu::UnoType<XFocusListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener )
 {
     impl_getMultiplexer()->unadvise( cppu::UnoType<XKeyListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener )
 {
     impl_getMultiplexer()->unadvise( cppu::UnoType<XMouseListener>::get(), xListener );
 }
 
 //  XWindow
 
-void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception )
+void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener )
 {
     impl_getMultiplexer()->unadvise( cppu::UnoType<XMouseMotionListener>::get(), xListener );
 }
 
 //  XWindow
 
-void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener )
 {
     impl_getMultiplexer()->unadvise( cppu::UnoType<XPaintListener>::get(), xListener );
 }
@@ -584,7 +584,7 @@ void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener
 //  XView
 
 void SAL_CALL BaseControl::draw(    sal_Int32   nX  ,
-                                    sal_Int32   nY  ) throw( RuntimeException, std::exception )
+                                    sal_Int32   nY  )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -597,7 +597,7 @@ void SAL_CALL BaseControl::draw(    sal_Int32   nX  ,
 
 //  XView
 
-sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice )
 {
     // - set the graphics for an view
     // - in this class exist 2 graphics-member ... one for peer[_xGraphicsPeer] and one for view[_xGraphicsView]
@@ -618,14 +618,14 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic
 //  XView
 
 void SAL_CALL BaseControl::setZoom( float   /*fZoomX*/  ,
-                                    float   /*fZoomY*/  ) throw( RuntimeException, std::exception )
+                                    float   /*fZoomY*/  )
 {
     // Not implemented yet
 }
 
 //  XView
 
-Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException, std::exception )
+Reference< XGraphics > SAL_CALL BaseControl::getGraphics()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -634,7 +634,7 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti
 
 //  XView
 
-Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception )
+Size SAL_CALL BaseControl::getSize()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -643,7 +643,7 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception )
 
 //  XEventListener
 
-void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -665,7 +665,7 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru
 
 //  XPaintListener
 
-void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -678,7 +678,7 @@ void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( Ru
 
 //  XWindowListener
 
-void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -693,7 +693,7 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run
 
 //  XWindowListener
 
-void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -708,13 +708,13 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti
 
 //  XWindowListener
 
-void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ )
 {
 }
 
 //  XWindowListener
 
-void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ )
 {
 }
 
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index fbf13bff4957..d19e930ea2b0 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -91,7 +91,7 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper()
 
 //  XInterface
 
-Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -219,7 +219,7 @@ void OMRCListenerMultiplexerHelper::unadvise(   const   Type&
 
 //  XEventListener
 
-void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ )
 {
     MutexGuard aGuard( m_aMutex );
     // peer is disposed, clear the reference
@@ -228,154 +228,154 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo
 
 //  XFcousListener
 
-void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent )
 {
     MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent )
 }
 
 //  XFcousListener
 
-void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent )
 {
     MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent )
 }
 
 //  XWindowListener
 
-void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent )
 {
     MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent )
 }
 
 //  XWindowListener
 
-void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent )
 {
     MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent )
 }
 
 //  XWindowListener
 
-void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent )
 {
     MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent )
 }
 
 //  XWindowListener
 
-void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent )
 {
     MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent )
 }
 
 //  XKeyListener
 
-void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent)
 {
     MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent )
 }
 
 //  XKeyListener
 
-void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent)
 {
     MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent )
 }
 
 //  XMouseListener
 
-void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent)
 {
     MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent )
 }
 
 //  XMouseListener
 
-void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent)
 {
     MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent )
 }
 
 //  XMouseListener
 
-void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent)
 {
     MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent )
 }
 
 //  XMouseListener
 
-void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent)
 {
     MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent )
 }
 
 //  XMouseMotionListener
 
-void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent)
 {
     MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent )
 }
 
 //  XMouseMotionListener
 
-void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent)
 {
     MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent )
 }
 
 //  XPaintListener
 
-void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent)
 {
     MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent )
 }
 
 //  XTopWindowListener
 
-void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent)
 {
     MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent )
 }
 
 //  XTopWindowListener
 
-void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent )
 {
     MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent )
 }
 
 //  XTopWindowListener
 
-void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent )
 {
     MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent )
 }
 
 //  XTopWindowListener
 
-void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent )
 {
     MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent )
 }
 
 //  XTopWindowListener
 
-void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent )
 {
     MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent )
 }
 
 //  XTopWindowListener
 
-void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent )
 {
     MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent )
 }
 
 //  XTopWindowListener
 
-void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent )
 {
     MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent )
 }
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 09de6a5716f9..4b83ed611d12 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -35,7 +35,6 @@ namespace {
 css::uno::Reference<css::uno::XInterface> SAL_CALL FrameControl_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &
         rServiceManager)
-    throw (css::uno::Exception)
 {
     return static_cast<cppu::OWeakObject *>(
         new unocontrols::FrameControl(
@@ -46,7 +45,6 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL FrameControl_createInstance(
 css::uno::Reference<css::uno::XInterface> SAL_CALL ProgressBar_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &
         rServiceManager)
-    throw (css::uno::Exception)
 {
     return static_cast<cppu::OWeakObject *>(
         new unocontrols::ProgressBar(
@@ -58,7 +56,6 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL
 ProgressMonitor_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &
         rServiceManager)
-    throw (css::uno::Exception)
 {
     return static_cast<cppu::OWeakObject *>(
         new unocontrols::ProgressMonitor(
@@ -70,7 +67,6 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL
 StatusIndicator_createInstance(
     css::uno::Reference<css::lang::XMultiServiceFactory> const &
         rServiceManager)
-    throw (css::uno::Exception)
 {
     return static_cast<cppu::OWeakObject *>(
         new unocontrols::StatusIndicator(
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
index ee1827691d6b..f631759ae87c 100644
--- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -46,7 +46,7 @@ OConnectionPointContainerHelper::~OConnectionPointContainerHelper()
 
 //  XInterface
 
-Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception )
+Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -91,7 +91,7 @@ void SAL_CALL OConnectionPointContainerHelper::release() throw()
 
 //  XConnectionPointContainer
 
-Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes()
 {
     // Container is threadsafe himself !
     return m_aMultiTypeContainer.getContainedTypes();
@@ -99,7 +99,7 @@ Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTyp
 
 //  XConnectionPointContainer
 
-Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception )
+Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType )
 {
     // Set default return value, if method failed.
     Reference< XConnectionPoint > xConnectionPoint;
@@ -121,7 +121,7 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon
 //  XConnectionPointContainer
 
 void SAL_CALL OConnectionPointContainerHelper::advise(  const   Type&                       aType       ,
-                                                        const   Reference< XInterface >&    xListener   ) throw( RuntimeException, std::exception )
+                                                        const   Reference< XInterface >&    xListener   )
 {
     // Container is threadsafe himself !
     m_aMultiTypeContainer.addInterface( aType, xListener );
@@ -130,7 +130,7 @@ void SAL_CALL OConnectionPointContainerHelper::advise(  const   Type&
 //  XConnectionPointContainer
 
 void SAL_CALL OConnectionPointContainerHelper::unadvise(    const   Type&                       aType       ,
-                                                            const   Reference< XInterface >&    xListener   ) throw( RuntimeException, std::exception )
+                                                            const   Reference< XInterface >&    xListener   )
 {
     // Container is threadsafe himself !
     m_aMultiTypeContainer.removeInterface( aType, xListener );
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
index 28692a405b38..6d51bb236408 100644
--- a/UnoControls/source/controls/OConnectionPointHelper.cxx
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -51,7 +51,7 @@ OConnectionPointHelper::~OConnectionPointHelper()
 
 //  XInterface
 
-Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception )
+Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -96,7 +96,7 @@ void SAL_CALL OConnectionPointHelper::release() throw()
 
 //  XConnectionPoint
 
-Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException, std::exception )
+Type SAL_CALL OConnectionPointHelper::getConnectionType()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aSharedMutex );
@@ -118,7 +118,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio
 
 //  XConnectionPoint
 
-Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException, std::exception )
+Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aSharedMutex );
@@ -128,9 +128,7 @@ Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConne
 
 //  XConnectionPoint
 
-void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw( ListenerExistException      ,
-                                                                                                InvalidListenerException    ,
-                                                                                                RuntimeException, std::exception            )
+void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aSharedMutex );
@@ -161,7 +159,7 @@ void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xLi
 
 //  XConnectionPoint
 
-void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aSharedMutex );
@@ -180,7 +178,7 @@ void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& x
 
 //  XConnectionPoint
 
-Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException, std::exception )
+Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aSharedMutex );
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 091a86dec91d..ed9b15e2870a 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -60,7 +60,7 @@ FrameControl::~FrameControl()
 
 //  XInterface
 
-Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL FrameControl::queryInterface( const Type& rType )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -105,7 +105,7 @@ void SAL_CALL FrameControl::release() throw()
 
 //  XTypeProvider
 
-Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL FrameControl::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -136,7 +136,7 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std:
 
 //  XAggregation
 
-Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
+Any SAL_CALL FrameControl::queryAggregation( const Type& aType )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -161,13 +161,11 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE
 }
 
 OUString FrameControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return impl_getStaticImplementationName();
 }
 
 css::uno::Sequence<OUString> FrameControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -175,7 +173,7 @@ css::uno::Sequence<OUString> FrameControl::getSupportedServiceNames()
 //  XControl
 
 void SAL_CALL FrameControl::createPeer( const   Reference< XToolkit >&      xToolkit    ,
-                                        const   Reference< XWindowPeer >&   xParentPeer ) throw( RuntimeException, std::exception )
+                                        const   Reference< XWindowPeer >&   xParentPeer )
 {
     BaseControl::createPeer( xToolkit, xParentPeer );
     if ( impl_getPeerWindow().is() )
@@ -189,7 +187,7 @@ void SAL_CALL FrameControl::createPeer( const   Reference< XToolkit >&      xToo
 
 //  XControl
 
-sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ )
 {
     // We have no model.
     return false;
@@ -197,7 +195,7 @@ sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xM
 
 //  XControl
 
-Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException, std::exception )
+Reference< XControlModel > SAL_CALL FrameControl::getModel()
 {
     // We have no model.
     return Reference< XControlModel >();
@@ -205,7 +203,7 @@ Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeExcep
 
 //  XControl
 
-void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL FrameControl::dispose()
 {
     impl_deleteFrame();
     BaseControl::dispose();
@@ -213,7 +211,7 @@ void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception )
 
 //  XView
 
-sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ )
 {
     // it is not possible to print this control
     return false;
@@ -221,7 +219,7 @@ sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDe
 
 //  XView
 
-Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException, std::exception )
+Reference< XGraphics > SAL_CALL FrameControl::getGraphics()
 {
     // when it's not possible to set graphics ! then it's possible to return null
     return Reference< XGraphics >();
@@ -229,7 +227,7 @@ Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeExcept
 
 //  XConnectionPointContainer
 
-Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes()
 {
     // Forwarded to helper class
     return m_aConnectionPointContainer->getConnectionPointTypes();
@@ -237,7 +235,7 @@ Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( Runtime
 
 //  XConnectionPointContainer
 
-Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception )
+Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType )
 {
     // Forwarded to helper class
     return m_aConnectionPointContainer->queryConnectionPoint( aType );
@@ -246,7 +244,7 @@ Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const
 //  XConnectionPointContainer
 
 void SAL_CALL FrameControl::advise( const   Type&                       aType       ,
-                                    const   Reference< XInterface >&    xListener   ) throw( RuntimeException, std::exception )
+                                    const   Reference< XInterface >&    xListener   )
 {
     // Forwarded to helper class
     m_aConnectionPointContainer->advise( aType, xListener );
@@ -255,7 +253,7 @@ void SAL_CALL FrameControl::advise( const   Type&                       aType
 //  XConnectionPointContainer
 
 void SAL_CALL FrameControl::unadvise(   const   Type&                       aType       ,
-                                        const   Reference< XInterface >&    xListener   ) throw( RuntimeException, std::exception )
+                                        const   Reference< XInterface >&    xListener   )
 {
     // Forwarded to helper class
     m_aConnectionPointContainer->unadvise( aType, xListener );
@@ -281,7 +279,7 @@ const OUString FrameControl::impl_getStaticImplementationName()
 sal_Bool FrameControl::convertFastPropertyValue(        Any&        rConvertedValue ,
                                                         Any&        rOldValue       ,
                                                         sal_Int32   nHandle         ,
-                                                const   Any&        rValue          ) throw( IllegalArgumentException )
+                                                const   Any&        rValue          )
 {
     bool bReturn = false;
     switch (nHandle)
@@ -309,7 +307,6 @@ sal_Bool FrameControl::convertFastPropertyValue(        Any&        rConvertedVa
 
 void FrameControl::setFastPropertyValue_NoBroadcast(            sal_Int32   nHandle ,
                                                         const   Any&        rValue  )
-                                                        throw ( css::uno::Exception, std::exception )
 {
     // this method only set the value
     MutexGuard  aGuard (m_aMutex);
@@ -374,7 +371,7 @@ IPropertyArrayHelper& FrameControl::getInfoHelper()
 
 //  OPropertySetHelper
 
-Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( RuntimeException, std::exception )
+Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 7fa718d6a064..99ae92d97d98 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -59,7 +59,7 @@ ProgressBar::~ProgressBar()
 
 //  XInterface
 
-Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL ProgressBar::queryInterface( const Type& rType )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -104,7 +104,7 @@ void SAL_CALL ProgressBar::release() throw()
 
 //  XTypeProvider
 
-Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ProgressBar::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -134,7 +134,7 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std::
 
 //  XAggregation
 
-Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
+Any SAL_CALL ProgressBar::queryAggregation( const Type& aType )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -156,7 +156,7 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx
 
 //  XProgressBar
 
-void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor )
 {
     // Ready for multithreading
     MutexGuard  aGuard (m_aMutex);
@@ -170,7 +170,7 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( Runtime
 
 //  XProgressBar
 
-void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor )
 {
     // Ready for multithreading
     MutexGuard  aGuard (m_aMutex);
@@ -184,7 +184,7 @@ void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( Runtim
 
 //  XProgressBar
 
-void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue )
 {
     // This method is defined for follow things:
     //      1) Values >= _nMinRange
@@ -213,7 +213,7 @@ void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException
 
 //  XProgressBar
 
-void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax )
 {
     // This method is defined for follow things:
     //      1) All values of sal_Int32
@@ -255,7 +255,7 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru
 
 //  XProgressBar
 
-sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ProgressBar::getValue ()
 {
     // Ready for multithreading
     MutexGuard aGuard (m_aMutex);
@@ -271,7 +271,7 @@ void SAL_CALL ProgressBar::setPosSize (
     sal_Int32 nWidth,
     sal_Int32 nHeight,
     sal_Int16 nFlags
-) throw( RuntimeException, std::exception )
+)
 {
     // Take old size BEFORE you set the new values at baseclass!
     // You will control changes. At the other way, the values are the same!
@@ -291,7 +291,7 @@ void SAL_CALL ProgressBar::setPosSize (
 
 //  XControl
 
-sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ )
 {
     // A model is not possible for this control.
     return false;
@@ -299,7 +299,7 @@ sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xMo
 
 //  XControl
 
-Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException, std::exception )
+Reference< XControlModel > SAL_CALL ProgressBar::getModel()
 {
     // A model is not possible for this control.
     return Reference< XControlModel >();
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 79bc853265d9..06a7d404d90b 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -103,7 +103,7 @@ ProgressMonitor::~ProgressMonitor()
 }
 
 //  XInterface
-Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -145,7 +145,7 @@ void SAL_CALL ProgressMonitor::release() throw()
 }
 
 //  XTypeProvider
-Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ProgressMonitor::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -175,7 +175,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, s
 }
 
 //  XAggregation
-Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
+Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -201,7 +201,7 @@ void SAL_CALL ProgressMonitor::addText(
     const OUString& rTopic,
     const OUString& rText,
     sal_Bool bbeforeProgress
-) throw( RuntimeException, std::exception )
+)
 {
     // Safe impossible cases
     // Check valid call of this method.
@@ -240,7 +240,7 @@ void SAL_CALL ProgressMonitor::addText(
 }
 
 //  XProgressMonitor
-void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress )
 {
     // Safe impossible cases
     // Check valid call of this method.
@@ -283,7 +283,7 @@ void SAL_CALL ProgressMonitor::updateText (
     const OUString& rTopic,
     const OUString& rText,
     sal_Bool bbeforeProgress
-) throw( RuntimeException, std::exception )
+)
 {
     // Safe impossible cases
     // Check valid call of this method.
@@ -307,7 +307,7 @@ void SAL_CALL ProgressMonitor::updateText (
 }
 
 //  XProgressBar
-void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor )
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -316,7 +316,7 @@ void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( Ru
 }
 
 //  XProgressBar
-void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor )
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -325,7 +325,7 @@ void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( Ru
 }
 
 //  XProgressBar
-void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue )
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -334,7 +334,7 @@ void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeExcep
 }
 
 //  XProgressBar
-void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax )
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -343,7 +343,7 @@ void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw
 }
 
 //  XProgressBar
-sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ProgressMonitor::getValue ()
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -352,7 +352,7 @@ sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException, std::ex
 }
 
 //  XButton
-void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener )
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -364,7 +364,7 @@ void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XA
 }
 
 //  XButton
-void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener )
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -376,7 +376,7 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference<
 }
 
 //  XButton
-void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel )
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -388,7 +388,7 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim
 }
 
 //  XButton
-void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand )
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -400,13 +400,13 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr
 }
 
 //  XLayoutConstrains
-Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException, std::exception )
+Size SAL_CALL ProgressMonitor::getMinimumSize ()
 {
     return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT);
 }
 
 //  XLayoutConstrains
-Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std::exception )
+Size SAL_CALL ProgressMonitor::getPreferredSize ()
 {
     // Ready for multithreading
     ClearableMutexGuard aGuard ( m_aMutex );
@@ -450,13 +450,13 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std:
 }
 
 //  XLayoutConstrains
-Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception )
+Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ )
 {
     return getPreferredSize ();
 }
 
 //  XControl
-void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent    ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent    )
 {
     if (!getPeer().is())
     {
@@ -471,14 +471,14 @@ void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit
 }
 
 //  XControl
-sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ )
 {
     // We have no model.
     return false;
 }
 
 //  XControl
-css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException, std::exception )
+css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel ()
 {
     // We have no model.
     // return (XControlModel*)this;
@@ -486,7 +486,7 @@ css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw
 }
 
 //  XComponent
-void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::dispose ()
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -518,7 +518,7 @@ void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException, std::exceptio
 }
 
 //  XWindow
-void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException, std::exception )
+void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags )
 {
     Rectangle   aBasePosSize = getPosSize ();
     BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags);
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index a9c901dad70a..5b303f2a63f5 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -68,7 +68,7 @@ StatusIndicator::~StatusIndicator() {}
 
 //  XInterface
 
-Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL StatusIndicator::queryInterface( const Type& rType )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -113,7 +113,7 @@ void SAL_CALL StatusIndicator::release() throw()
 
 //  XTypeProvider
 
-Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL StatusIndicator::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -143,7 +143,7 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, s
 
 //  XAggregation
 
-Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
+Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -165,7 +165,7 @@ Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( Runti
 
 //  XStatusIndicator
 
-void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) throw( RuntimeException, std::exception )
+void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -179,7 +179,7 @@ void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange )
 
 //  XStatusIndicator
 
-void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception )
+void SAL_CALL StatusIndicator::end()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -192,7 +192,7 @@ void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception )
 
 //  XStatusIndicator
 
-void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException, std::exception )
+void SAL_CALL StatusIndicator::setText( const OUString& sText )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -203,7 +203,7 @@ void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeEx
 
 //  XStatusIndicator
 
-void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException, std::exception )
+void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -214,7 +214,7 @@ void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeExcept
 
 //  XStatusIndicator
 
-void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception )
+void SAL_CALL StatusIndicator::reset()
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -227,14 +227,14 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception )
 
 //  XLayoutConstrains
 
-Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException, std::exception )
+Size SAL_CALL StatusIndicator::getMinimumSize ()
 {
     return Size (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_DEFAULT_HEIGHT);
 }
 
 //  XLayoutConstrains
 
-Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std::exception )
+Size SAL_CALL StatusIndicator::getPreferredSize ()
 {
     // Ready for multithreading
     ClearableMutexGuard aGuard ( m_aMutex );
@@ -265,7 +265,7 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std:
 
 //  XLayoutConstrains
 
-Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception )
+Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ )
 {
     return getPreferredSize ();
 }
@@ -275,7 +275,7 @@ Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) thr
 void SAL_CALL StatusIndicator::createPeer (
     const css::uno::Reference< XToolkit > & rToolkit,
     const css::uno::Reference< XWindowPeer > & rParent
-) throw( RuntimeException, std::exception )
+)
 {
     if( !getPeer().is() )
     {
@@ -291,7 +291,7 @@ void SAL_CALL StatusIndicator::createPeer (
 
 //  XControl
 
-sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ )
 {
     // We have no model.
     return false;
@@ -299,7 +299,7 @@ sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XContro
 
 //  XControl
 
-css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException, std::exception )
+css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel ()
 {
     // We have no model.
     // return (XControlModel*)this;
@@ -308,7 +308,7 @@ css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw
 
 //  XComponent
 
-void SAL_CALL StatusIndicator::dispose () throw( RuntimeException, std::exception )
+void SAL_CALL StatusIndicator::dispose ()
 {
     // Ready for multithreading
     MutexGuard aGuard ( m_aMutex );
@@ -334,7 +334,7 @@ void SAL_CALL StatusIndicator::setPosSize (
     sal_Int32 nWidth,
     sal_Int32 nHeight,
     sal_Int16 nFlags
-) throw( RuntimeException, std::exception )
+)
 {
     Rectangle   aBasePosSize = getPosSize ();
     BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags);
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 31a95f5e42a4..abc4191e7bde 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -56,8 +56,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -79,22 +78,21 @@ public:
 
     //  XConnectionPointContainer
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() override;
 
     virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
         const css::uno::Type& aType
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL advise(
         const   css::uno::Type&                              aType ,
         const   css::uno::Reference< css::uno::XInterface >&  xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL unadvise(
         const   css::uno::Type&                              aType       ,
         const   css::uno::Reference< css::uno::XInterface >&  xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  public but impl method!
     //  Is necessary to get container member at OConnectionPoint-instance.
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
index 371b70facdfa..2e86fc29f302 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -61,8 +61,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -84,25 +83,17 @@ public:
 
     //  XConnectionPoint
 
-    virtual css::uno::Type SAL_CALL getConnectionType()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Type SAL_CALL getConnectionType() override;
 
-    virtual css::uno::Reference< css::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer() override;
 
     virtual void SAL_CALL advise(
         const css::uno::Reference< css::uno::XInterface >& xListener
-    ) throw (
-        css::lang::ListenerExistException,
-        css::lang::InvalidListenerException ,
-        css::uno::RuntimeException, std::exception
     ) override;
 
-    virtual void SAL_CALL unadvise( const css::uno::Reference< css::uno::XInterface >& xListener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL unadvise( const css::uno::Reference< css::uno::XInterface >& xListener ) override;
 
-    virtual css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > SAL_CALL getConnections()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > SAL_CALL getConnections() override;
 
 private:
 
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
index ff28dadcf858..f087a1a43107 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -71,7 +71,7 @@ public:
 
     virtual css::uno::Any SAL_CALL queryInterface(
         const css::uno::Type& aType
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -93,66 +93,60 @@ public:
 
     //  XTypeProvider
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     //  XAggregation
 
     css::uno::Any SAL_CALL queryAggregation(
         const css::uno::Type& aType
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     //  XControl
 
     virtual void SAL_CALL createPeer(
         const css::uno::Reference< css::awt::XToolkit >&      xToolkit ,
         const css::uno::Reference< css::awt::XWindowPeer >&   xParent
-    ) throw ( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual sal_Bool SAL_CALL setModel(
         const css::uno::Reference< css::awt::XControlModel >& xModel
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override;
 
     //  XComponent
 
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     //  XView
 
     virtual sal_Bool SAL_CALL setGraphics(
         const css::uno::Reference< css::awt::XGraphics >& xDevice
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() override;
 
     //  XConnectionPointContainer
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() override;
 
     virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
         const css::uno::Type& aType
-    ) throw ( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL advise(
         const css::uno::Type&                                aType       ,
         const css::uno::Reference< css::uno::XInterface >&    xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL unadvise(
         const css::uno::Type&                                aType ,
         const css::uno::Reference< css::uno::XInterface >&    xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  impl but public methods to register service!
 
@@ -172,12 +166,12 @@ protected:
         css::uno::Any&       rOldValue         ,
         sal_Int32           nHandle           ,
         const css::uno::Any& rValue
-    ) throw( css::lang::IllegalArgumentException ) override;
+    ) override;
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle ,
         const css::uno::Any& rValue
-    ) throw ( css::uno::Exception, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL getFastPropertyValue( css::uno::Any&   rValue  ,
                                                 sal_Int32       nHandle ) const override;
@@ -186,8 +180,7 @@ protected:
 
     //  XPropertySet
 
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
     //  BaseControl
 
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
index e7523d778fba..768f273dc087 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -56,8 +56,7 @@ public:
 
     //  XInterface
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -79,30 +78,26 @@ public:
 
     //  XTypeProvider
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     //  XAggregation
 
-    css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
 
     //  XProgressBar
 
-    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) override;
 
-    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override;
 
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) override;
 
     virtual void SAL_CALL setRange(
         sal_Int32   nMin    ,
         sal_Int32   nMax
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    virtual sal_Int32 SAL_CALL getValue() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getValue() override;
 
     //  XWindow
 
@@ -112,16 +107,15 @@ public:
         sal_Int32   nWidth  ,
         sal_Int32   nHeight ,
         sal_Int16   nFlags
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  XControl
 
     virtual sal_Bool SAL_CALL setModel(
         const css::uno::Reference< css::awt::XControlModel >& xModel
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override;
 
     //  BaseControl
 
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 04044cc50fe2..027a8d3fdc9e 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -121,8 +121,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     /**_______________________________________________________________________________________________________
         @short      increment refcount
@@ -152,12 +151,11 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     //  XAggregation
 
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
 
     //  XProgressMonitor
 
@@ -182,72 +180,68 @@ public:
         const OUString& sTopic ,
         const OUString& sText ,
         sal_Bool bbeforeProgress
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL removeText(
         const OUString& sTopic ,
         sal_Bool bbeforeProgress
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL updateText(
         const OUString&  sTopic ,
         const OUString&  sText ,
         sal_Bool bbeforeProgress
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     //  XProgressBar
 
-    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) override;
 
-    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override;
 
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) override;
 
     virtual void SAL_CALL setRange( sal_Int32   nMin    ,
-                                    sal_Int32   nMax    ) throw( css::uno::RuntimeException, std::exception ) override;
+                                    sal_Int32   nMax    ) override;
 
-    virtual sal_Int32 SAL_CALL getValue() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getValue() override;
 
     //  XButton
 
     virtual void SAL_CALL addActionListener(
         const css::uno::Reference< css::awt::XActionListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
     virtual void SAL_CALL removeActionListener(
         const css::uno::Reference< css::awt::XActionListener >& xListener
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    virtual void SAL_CALL setLabel( const OUString& sLabel ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setLabel( const OUString& sLabel ) override;
 
-    virtual void SAL_CALL setActionCommand( const OUString& sCommand )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setActionCommand( const OUString& sCommand ) override;
 
     //  XLayoutConstrains
 
-    virtual css::awt::Size SAL_CALL getMinimumSize() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getMinimumSize() override;
 
-    virtual css::awt::Size SAL_CALL getPreferredSize() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getPreferredSize() override;
 
-    virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     //  XControl
 
     virtual void SAL_CALL createPeer(
         const css::uno::Reference< css::awt::XToolkit     >& xToolkit ,
         const css::uno::Reference< css::awt::XWindowPeer  >& xParent
-    ) throw( css::uno::RuntimeException, std::exception ) override;
+    ) override;
 
-    virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) override;
 
-    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override;
 
     //  XComponent
 
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     //  XWindow
 
@@ -255,7 +249,7 @@ public:
                                         sal_Int32   nY      ,
                                         sal_Int32   nWidth  ,
                                         sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( css::uno::RuntimeException, std::exception ) override;
+                                        sal_Int16   nFlags  ) override;
 
     //  BaseControl
 
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index b1e377c46f4d..cf49fd558684 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -78,8 +78,7 @@ class StatusIndicator   : public css::awt::XLayoutConstrains
             @onerror    A RuntimeException is thrown.
         */
 
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
         /**_______________________________________________________________________________________________________
             @short      increment refcount
@@ -109,54 +108,49 @@ class StatusIndicator   : public css::awt::XLayoutConstrains
             @onerror    A RuntimeException is thrown.
         */
 
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
         //  XAggregation
 
-        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
 
         //  XStatusIndicator
 
         virtual void SAL_CALL start(
             const OUString&  sText   ,
             sal_Int32 nRange
-        ) throw( css::uno::RuntimeException, std::exception ) override;
+        ) override;
 
-        virtual void SAL_CALL end() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL end() override;
 
-        virtual void SAL_CALL reset() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL reset() override;
 
-        virtual void SAL_CALL setText( const OUString& sText ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setText( const OUString& sText ) override;
 
-        virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setValue( sal_Int32 nValue ) override;
 
         //  XLayoutConstrains
 
-        virtual css::awt::Size SAL_CALL getMinimumSize() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::awt::Size SAL_CALL getMinimumSize() override;
 
-        virtual css::awt::Size SAL_CALL getPreferredSize() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::awt::Size SAL_CALL getPreferredSize() override;
 
-        virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
         //  XControl
 
         virtual void SAL_CALL createPeer(
             const   css::uno::Reference< css::awt::XToolkit >&    xToolkit    ,
             const   css::uno::Reference< css::awt::XWindowPeer >& xParent
-        ) throw( css::uno::RuntimeException, std::exception ) override;
+        ) override;
 
-        virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) override;
 
-        virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override;
 
         //  XComponent
 
-        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         //  XWindow
 
@@ -164,7 +158,7 @@ class StatusIndicator   : public css::awt::XLayoutConstrains
                                             sal_Int32   nY      ,
                                             sal_Int32   nWidth  ,
                                             sal_Int32   nHeight ,
-                                            sal_Int16   nFlags  ) throw( css::uno::RuntimeException, std::exception ) override;
+                                            sal_Int16   nFlags  ) override;
 
         //  BaseControl
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index 69debf478f35..a2b31babbe13 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -63,15 +63,12 @@ protected:
     // XAccessibleContext
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
 
     // XAccessibleComponent
 
@@ -80,20 +77,17 @@ protected:
     */
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-    getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     /** Grabs the focus to the BrowseBox. */
-    virtual void SAL_CALL grabFocus()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL grabFocus() override;
 
     // XServiceInfo
 
     /** @return
             The name of this class.
     */
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 public:
     // helper functions
@@ -216,7 +210,7 @@ protected:
 
     // XAccessible
     virtual css::uno::Reference< css::accessibility::XAccessibleContext >
-        SAL_CALL getAccessibleContext() throw ( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL getAccessibleContext() override;
 
     // IAccessibleBrowseBox
     virtual css::uno::Reference< css::accessibility::XAccessible >
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 81e81aa91c02..217e20a48ecb 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -115,45 +115,36 @@ public:
     // XAccessibleContext
 
     /** @return  A reference to the parent accessible object. */
-    virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL getAccessibleParent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
     /** @return
             The description of this object.
     */
-    virtual OUString SAL_CALL getAccessibleDescription()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
 
     /** @return
             The name of this object.
     */
-    virtual OUString SAL_CALL getAccessibleName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleName() override;
 
     /** @return
             The relation set (the BrowseBox does not have one).
     */
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
 
     /** @return  The set of current states. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override;
 
     /** @return  The parent's locale. */
-    virtual css::lang::Locale SAL_CALL getLocale()
-        throw ( css::accessibility::IllegalAccessibleComponentStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
 
     /** @return
             The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported.
     */
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     /*  Derived classes have to implement:
         -   getAccessibleChildCount,
@@ -166,34 +157,29 @@ public:
 
     /** @return
         TRUE, if the point lies within the bounding box of this object. */
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) override;
 
     /** @return  The bounding box of this object. */
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
     /** @return
         The upper left corner of the bounding box relative to the parent. */
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
     /** @return
         The upper left corner of the bounding box in screen coordinates. */
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
     /** @return  The size of the bounding box. */
-    virtual css::awt::Size SAL_CALL getSize()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XFocusListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+    virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override;
+    virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override;
 
     /*  Derived classes have to implement:
         -   getAccessibleAt,
@@ -202,36 +188,30 @@ public:
     /** @return
             The accessible child rendered under the given point.
     */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     // XAccessibleEventBroadcaster
 
     /** Adds a new event listener */
     virtual void SAL_CALL addAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override;
 
     /** Removes an event listener. */
     virtual void SAL_CALL removeAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override;
 
     // XTypeProvider
 
     /** @return  An unique implementation ID. */
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XServiceInfo
 
     /** @return  Whether the specified service is supported by this class. */
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
 
     /** @return  A list of all supported services. */
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /*  Derived classes have to implement:
         -   getImplementationName. */
@@ -292,15 +272,13 @@ protected:
         @return  The bounding box (VCL rect.) relative to the parent object.
         @throws css::lang::DisposedException
     */
-    Rectangle getBoundingBox()
-        throw ( css::lang::DisposedException );
+    Rectangle getBoundingBox();
     /** Locks all mutex's and calculates the bounding box in screen
         coordinates.
         @return  The bounding box (VCL rect.) in screen coordinates.
         @throws css::lang::DisposedException
     */
-    Rectangle getBoundingBoxOnScreen()
-        throw ( css::lang::DisposedException );
+    Rectangle getBoundingBoxOnScreen();
 
     ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
     void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
@@ -310,8 +288,7 @@ public:
     inline ::osl::Mutex&    getMutex( ) { return m_aMutex; }
 
     /** @throws <type>DisposedException</type>  If the object is not alive. */
-    void ensureIsAlive() const
-        throw ( css::lang::DisposedException );
+    void ensureIsAlive() const;
 
 
 protected:
@@ -400,8 +377,7 @@ protected:
     // XAccessible
 
     /** @return  The XAccessibleContext interface of this object. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override;
 };
 
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index df7f6a4f2c2f..2bb3328a5acb 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -60,20 +60,20 @@ namespace accessibility
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
-        virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
 
 
         // XAccessibleValue
-        virtual css::uno::Any SAL_CALL getCurrentValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getMaximumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+        virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+        virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+        virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
 
         // internal
         void        SetChecked( bool _bChecked );
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
index c529875a7238..c81c836a4de8 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -60,121 +60,88 @@ public:
         The XAccessible interface of the specified child.
     */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
 
     /** @return  The index of this object among the parent's children. */
     virtual sal_Int32 SAL_CALL
-    getAccessibleIndexInParent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleIndexInParent() override;
 
     // XAccessibleComponent
 
     /** @return  The accessible child rendered under the given point. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     /** Grabs the focus to (the current cell of) the data table. */
-    virtual void SAL_CALL grabFocus()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL grabFocus() override;
 
     // XAccessibleTable
 
     /** @return  The description text of the specified row. */
     virtual OUString SAL_CALL
-    getAccessibleRowDescription( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleRowDescription( sal_Int32 nRow ) override;
 
     /** @return  The description text of the specified column. */
-    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
 
     /** @return  The XAccessibleTable interface of the row header bar. */
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-    getAccessibleRowHeaders()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleRowHeaders() override;
 
     /** @return  The XAccessibleTable interface of the column header bar. */
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-    getAccessibleColumnHeaders()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleColumnHeaders() override;
 
     /** @return  An index list of completely selected rows. */
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-    getSelectedAccessibleRows()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleRows() override;
 
     /** @return  An index list of completely selected columns. */
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-    getSelectedAccessibleColumns()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleColumns() override;
 
     /** @return  TRUE, if the specified row is completely selected. */
-    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
 
     /** @return  TRUE, if the specified column is completely selected. */
-    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
 
     /** @return The XAccessible interface of the cell object at the specified
                 cell position. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  TRUE, if the specified cell is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     // XAccessibleSelection
 
     /** Selects the specified child (row or column of the table). */
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     /** @return  TRUE, if the specified child (row/column) is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
 
     /** Clears the complete selection. */
-    virtual void SAL_CALL clearAccessibleSelection()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL clearAccessibleSelection() override;
 
     /** Selects all children or first, if multiselection is not supported. */
-    virtual void SAL_CALL selectAllAccessibleChildren()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren() override;
 
     /** @return  The number of selected rows/columns. */
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
 
     /** @return  The specified selected row/column. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     /** Removes the specified row/column from the selection. */
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     // XInterface
 
     /** Queries for a new interface. */
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
     /** Aquires the object (calls acquire() on base class). */
     virtual void SAL_CALL acquire() throw () override;
@@ -185,12 +152,10 @@ public:
     // XServiceInfo
 
     /** @return  The name of this class. */
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     /** @return  An unique implementation ID. */
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 protected:
     // internal virtual methods
@@ -227,14 +192,12 @@ protected:
         @return  The absolute child index from the index of selected children.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified index is invalid. */
-    sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException );
+    sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex );
 
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified row/column index (depending on type) is invalid. */
-    void ensureIsValidHeaderIndex( sal_Int32 nIndex )
-        throw ( css::lang::IndexOutOfBoundsException );
+    void ensureIsValidHeaderIndex( sal_Int32 nIndex );
 };
 
 // inlines
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index b616529c0b65..cfe00b40aa07 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -33,17 +33,17 @@ namespace accessibility
                                           const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
                                           ::svt::AccessibleBrowseBoxObjType  _eObjType);
         /** @return  The count of visible children. */
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
         /** @return  The XAccessible interface of the specified child. */
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-            getAccessibleChild( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception ) override;
+            getAccessibleChild( sal_Int32 nChildIndex ) override;
 
         /** @return  The index of this object among the parent's children. */
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
         /** Grabs the focus to the BrowseBox. */
-        virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL grabFocus() override;
 
         inline bool isRowBarCell() const
         {
@@ -53,7 +53,7 @@ namespace accessibility
         /** @return
                 The name of this class.
         */
-        virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         /** Creates a new AccessibleStateSetHelper and fills it with states of the
             current object.
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
index c4a3f01939ee..a6735dcdffcc 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
@@ -45,84 +45,62 @@ public:
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
     // XAccessibleComponent
 
     /** @return  The accessible child rendered under the given point. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     /** Grabs the focus to (the current cell of) the data table. */
-    virtual void SAL_CALL grabFocus()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL grabFocus() override;
 
     // XAccessibleTable
 
     /** @return  The description text of the specified row. */
-    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override;
 
     /** @return  The description text of the specified column. */
-    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
 
     /** @return  The XAccessibleTable interface of the row header bar. */
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-    getAccessibleRowHeaders()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleRowHeaders() override;
 
     /** @return  The XAccessibleTable interface of the column header bar. */
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-    getAccessibleColumnHeaders()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleColumnHeaders() override;
 
     /** @return  An index list of completely selected rows. */
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-    getSelectedAccessibleRows()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleRows() override;
 
     /** @return  An index list of completely selected columns. */
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-    getSelectedAccessibleColumns()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleColumns() override;
 
     /** @return  TRUE, if the specified row is completely selected. */
-    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
 
     /** @return  TRUE, if the specified column is completely selected. */
-    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
 
     /** @return The XAccessible interface of the cell object at the specified
                 cell position. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  TRUE, if the specified cell is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     // XServiceInfo
 
     /** @return  The name of this class. */
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 protected:
     // internal virtual methods
@@ -141,8 +119,7 @@ protected:
         @throws css::uno::RuntimeException
     */
     css::uno::Reference< css::accessibility::XAccessibleTable >
-    implGetHeaderBar( sal_Int32 nChildIndex )
-        throw ( css::uno::RuntimeException );
+    implGetHeaderBar( sal_Int32 nChildIndex );
 };
 
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
index 6d0ff563271f..8b28ae8acf98 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
@@ -60,12 +60,10 @@ public:
     // XAccessibleContext
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The role of this object (a table). */
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     /*  Derived classes have to implement:
         -   getAccessibleChild,
@@ -80,51 +78,37 @@ public:
     // XAccessibleTable
 
     /** @return  The number of used rows in the table (0 = empty table). */
-    virtual sal_Int32 SAL_CALL getAccessibleRowCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
 
     /** @return  The number of used columns in the table (0 = empty table). */
-    virtual sal_Int32 SAL_CALL getAccessibleColumnCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount() override;
 
     /** @return  The row extent of the specified cell (always 1). */
     virtual sal_Int32 SAL_CALL
-    getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  The column extent of the specified cell (always 1). */
     virtual sal_Int32 SAL_CALL
-    getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  The caption cell of the table (not supported). */
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-    getAccessibleCaption()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleCaption() override;
 
     /** @return  The summary object of the table (not supported). */
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-    getAccessibleSummary()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleSummary() override;
 
     /** @return  The child index of the specified cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  The row index of the specified child cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
 
     /** @return  The column index of the specified child cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
 
     /*  Derived classes have to implement:
         -   getAccessibleRowDescription,
@@ -141,8 +125,7 @@ public:
     // XInterface
 
     /** Queries for a new interface. */
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
     /** Aquires the object (calls acquire() on base class). */
     virtual void SAL_CALL acquire() throw () override;
@@ -153,12 +136,10 @@ public:
     // XTypeProvider
 
     /** @return  A sequence of possible types (received from base classes). */
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     /** @return  An unique implementation ID. */
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XServiceInfo
 
@@ -236,23 +217,19 @@ protected:
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified row index is invalid. */
-    void ensureIsValidRow( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException );
+    void ensureIsValidRow( sal_Int32 nRow );
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified column index is invalid. */
-    void ensureIsValidColumn( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException );
+    void ensureIsValidColumn( sal_Int32 nColumn );
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified cell address is invalid. */
-    void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException );
+    void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn );
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified child index is invalid. */
-    void ensureIsValidIndex( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException );
+    void ensureIsValidIndex( sal_Int32 nChildIndex );
 };
 
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
index 0fb9388ed61c..dbd0aa0e6e99 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
@@ -56,8 +56,7 @@ namespace accessibility
         // XInterface -------------------------------------------------------------
 
         /** Queries for a new interface. */
-        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
         /** Aquires the object (calls acquire() on base class). */
         virtual void SAL_CALL acquire() throw () override;
@@ -67,32 +66,26 @@ namespace accessibility
 
         // XEventListener
         using AccessibleBrowseBoxBase::disposing;
-        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;
 
         /** @return  The index of this object among the parent's children. */
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
         /** @return
                 The name of this class.
         */
-        virtual OUString SAL_CALL getImplementationName()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         /** @return
                 The count of visible children.
         */
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
         /** @return
                 The XAccessible interface of the specified child.
         */
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-            getAccessibleChild( sal_Int32 nChildIndex )
-                throw ( css::lang::IndexOutOfBoundsException,
-                        css::uno::RuntimeException, std::exception ) override;
+            getAccessibleChild( sal_Int32 nChildIndex ) override;
 
         /** Creates a new AccessibleStateSetHelper and fills it with states of the
             current object.
@@ -105,27 +98,26 @@ namespace accessibility
 
         /** @return  The XAccessibleContext interface of this object. */
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
-        getAccessibleContext()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleContext() override;
 
         // XAccessibleText
-        virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
     };
 }
 #endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index 703ea09a5cce..b55523d39d23 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -54,18 +54,14 @@ protected:
     // XAccessibleContext -----------------------------------------------------
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
 
     /** @return  The role of this object (a table). */
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     // XAccessibleComponent ---------------------------------------------------
 
@@ -73,20 +69,17 @@ protected:
             The accessible child rendered under the given point.
     */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     /** Grabs the focus to the Grid Control. */
-    virtual void SAL_CALL grabFocus()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL grabFocus() override;
 
     // XServiceInfo -----------------------------------------------------------
 
     /** @return
             The name of this class.
     */
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 public:
     // helper functions
@@ -182,7 +175,7 @@ protected:
 
     // XAccessible
     virtual css::uno::Reference< css::accessibility::XAccessibleContext >
-        SAL_CALL getAccessibleContext() throw ( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL getAccessibleContext() override;
 
     // IAccessibleTable
     virtual css::uno::Reference< css::accessibility::XAccessible >
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index 3776fb4a0037..3c8dd7cbb11e 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -87,47 +87,38 @@ public:
 
     /** @return  A reference to the parent accessible object. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleParent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleParent() override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
     /** @return
             The description of this object.
     */
-    virtual OUString SAL_CALL getAccessibleDescription()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
 
     /** @return
             The name of this object.
     */
-    virtual OUString SAL_CALL getAccessibleName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleName() override;
 
     /** @return
             The relation set (the GridControl does not have one).
     */
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
-        getAccessibleRelationSet()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleRelationSet() override;
 
     /** @return  The set of current states. */
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-        getAccessibleStateSet()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleStateSet() override;
 
     /** @return  The parent's locale. */
-    virtual css::lang::Locale SAL_CALL getLocale()
-        throw ( css::accessibility::IllegalAccessibleComponentStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
 
     /** @return
             The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported.
     */
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     /*  Derived classes have to implement:
         -   getAccessibleChildCount,
@@ -140,29 +131,24 @@ public:
 
     /** @return
         TRUE, if the point lies within the bounding box of this object. */
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) override;
 
     /** @return  The bounding box of this object. */
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
     /** @return
         The upper left corner of the bounding box relative to the parent. */
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
     /** @return
         The upper left corner of the bounding box in screen coordinates. */
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
     /** @return  The size of the bounding box. */
-    virtual css::awt::Size SAL_CALL getSize()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
 
     /*  Derived classes have to implement:
@@ -173,37 +159,31 @@ public:
             The accessible child rendered under the given point.
     */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     // XAccessibleEventBroadcaster
 
     /** Adds a new event listener */
     virtual void SAL_CALL addAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override;
 
     /** Removes an event listener. */
     virtual void SAL_CALL removeAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override;
 
     // XTypeProvider
 
     /** @return  An unique implementation ID. */
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XServiceInfo
 
     /** @return  Whether the specified service is supported by this class. */
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
 
     /** @return  A list of all supported services. */
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     /*  Derived classes have to implement:
         -   getImplementationName. */
@@ -251,8 +231,7 @@ protected:
     // internal helper methods
 
     /** @throws <type>DisposedException</type>  If the object is not alive. */
-    void ensureIsAlive() const
-        throw ( css::lang::DisposedException );
+    void ensureIsAlive() const;
 
     /** Changes the name of the object (flat assignment, no notify).
         @attention  This method requires a locked mutex. */
@@ -263,14 +242,12 @@ protected:
         @return  The bounding box (VCL rect.) relative to the parent object.
         @throws css::lang::DisposedException
     */
-    Rectangle getBoundingBox()
-        throw ( css::lang::DisposedException );
+    Rectangle getBoundingBox();
     ///** Locks all mutex's and calculates the bounding box in screen
     //    coordinates.
     //    @return  The bounding box (VCL rect.) in screen coordinates. */
     /// @throws css::lang::DisposedException
-    Rectangle getBoundingBoxOnScreen()
-        throw ( css::lang::DisposedException );
+    Rectangle getBoundingBoxOnScreen();
 
     ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
     void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
@@ -330,8 +307,7 @@ protected:
 
     /** @return  The XAccessibleContext interface of this object. */
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
-    getAccessibleContext()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleContext() override;
 
 private:
     GridControlAccessibleElement( const GridControlAccessibleElement& ) = delete;
diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
index 49641b60dab0..439941a67a55 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
@@ -53,90 +53,67 @@ public:
         The XAccessible interface of the specified child.
     */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
     // XAccessibleComponent
 
     /** @return  The accessible child rendered under the given point. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     /** Grabs the focus to (the current cell of) the data table. */
-    virtual void SAL_CALL grabFocus()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL grabFocus() override;
 
     // XAccessibleTable
 
     /** @return  The description text of the specified row. */
     virtual OUString SAL_CALL
-    getAccessibleRowDescription( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleRowDescription( sal_Int32 nRow ) override;
 
     /** @return  The description text of the specified column. */
     virtual OUString SAL_CALL
-    getAccessibleColumnDescription( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleColumnDescription( sal_Int32 nColumn ) override;
 
     /** @return  The XAccessibleTable interface of the row header bar. */
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-    getAccessibleRowHeaders()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleRowHeaders() override;
 
     /** @return  The XAccessibleTable interface of the column header bar. */
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-    getAccessibleColumnHeaders()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleColumnHeaders() override;
 
     /** @return  An index list of completely selected rows. */
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-    getSelectedAccessibleRows()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleRows() override;
 
     /** @return  An index list of completely selected columns. */
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-    getSelectedAccessibleColumns()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleColumns() override;
 
     /** @return  TRUE, if the specified row is completely selected. */
-    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
 
     /** @return  TRUE, if the specified column is completely selected. */
-    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
 
     /** @return The XAccessible interface of the cell object at the specified
                 cell position. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  TRUE, if the specified cell is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     // XServiceInfo
 
     /** @return  The name of this class. */
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     /** @return  An unique implementation ID. */
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 protected:
     /** Returns the specified row or column. Uses one of the parameters,
diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
index 82272a000ad4..bece5123ad85 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
@@ -32,23 +32,22 @@ namespace accessibility
                         ::svt::table::IAccessibleTable& _rTable,
                         ::svt::table::AccessibleTableControlObjType  _eObjType);
         /** @return  The count of visible children. */
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
         /** @return  The XAccessible interface of the specified child. */
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-            getAccessibleChild( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception ) override;
+            getAccessibleChild( sal_Int32 nChildIndex ) override;
 
         /** @return  The index of this object among the parent's children. */
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
         /** Grabs the focus to the GridControl. */
-        virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL grabFocus() override;
 
         // XInterface
 
         /** Queries for a new interface. */
-        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
         /** Aquires the object (calls acquire() on base class). */
         virtual void SAL_CALL acquire() throw () override;
@@ -59,13 +58,12 @@ namespace accessibility
 
         /** @return  The XAccessibleContext interface of this object. */
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
-        getAccessibleContext()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleContext() override;
 
         /** @return
                 The name of this class.
         */
-        virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         /** Creates a new AccessibleStateSetHelper and fills it with states of the
             current object.
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx
index ab88c0284a5e..df91b96c664e 100644
--- a/accessibility/inc/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -52,118 +52,85 @@ public:
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
     // XAccessibleComponent
 
     /** @return  The accessible child rendered under the given point. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     /** Grabs the focus to (the current cell of) the data table. */
-    virtual void SAL_CALL grabFocus()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL grabFocus() override;
 
     // XAccessibleTable
 
     /** @return  The description text of the specified row. */
-    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override;
 
     /** @return  The description text of the specified column. */
-    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
 
     /** @return  The XAccessibleTable interface of the row header bar. */
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-    getAccessibleRowHeaders()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleRowHeaders() override;
 
     /** @return  The XAccessibleTable interface of the column header bar. */
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-    getAccessibleColumnHeaders()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleColumnHeaders() override;
 
     /** @return  An index list of completely selected rows. */
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-    getSelectedAccessibleRows()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleRows() override;
 
     /** @return  An index list of completely selected columns. */
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-    getSelectedAccessibleColumns()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleColumns() override;
 
     /** @return  TRUE, if the specified row is completely selected. */
-    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
 
     /** @return  TRUE, if the specified column is completely selected. */
-    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
 
     /** @return The XAccessible interface of the cell object at the specified
                 cell position. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  TRUE, if the specified cell is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     // XAccessibleSelection
 
     /** Selects the specified child (row or column of the table). */
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     /** @return  TRUE, if the specified child (row/column) is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
 
     /** Clears the complete selection. */
-    virtual void SAL_CALL clearAccessibleSelection()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL clearAccessibleSelection() override;
 
     /** Selects all children or first, if multiselection is not supported. */
-    virtual void SAL_CALL selectAllAccessibleChildren()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren() override;
 
     /** @return  The number of selected rows/columns. */
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
 
     /** @return  The specified selected row/column. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     /** Removes the specified row/column from the selection. */
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
      // XInterface
 
     /** Queries for a new interface. */
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
     /** Aquires the object (calls acquire() on base class). */
     virtual void SAL_CALL acquire() throw () override;
@@ -173,8 +140,7 @@ public:
     // XServiceInfo
 
     /** @return  The name of this class. */
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     /**@return m_pCellVector*/
     std::vector< AccessibleGridControlTableCell* >& getCellVector() { return m_pCellVector;}
@@ -197,8 +163,7 @@ protected:
     //    @return  The XAccessibleTable interface of the specified header bar. */
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::accessibility::XAccessibleTable >
-    implGetHeaderBar( sal_Int32 nChildIndex )
-        throw ( css::uno::RuntimeException );
+    implGetHeaderBar( sal_Int32 nChildIndex );
 };
 
 
diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
index 9276247f3a5a..051e99b1da96 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
@@ -56,12 +56,10 @@ public:
     // XAccessibleContext
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The role of this object (a table). */
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     /*  Derived classes have to implement:
         -   getAccessibleChild,
@@ -76,49 +74,35 @@ public:
     // XAccessibleTable
 
     /** @return  The number of used rows in the table (0 = empty table). */
-    virtual sal_Int32 SAL_CALL getAccessibleRowCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
 
     /** @return  The number of used columns in the table (0 = empty table). */
-    virtual sal_Int32 SAL_CALL getAccessibleColumnCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount() override;
 
     /** @return  The row extent of the specified cell (always 1). */
     virtual sal_Int32 SAL_CALL
-    getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  The column extent of the specified cell (always 1). */
     virtual sal_Int32 SAL_CALL
-    getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  The caption cell of the table (not supported). */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleCaption()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleCaption() override;
 
     /** @return  The summary object of the table (not supported). */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleSummary()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getAccessibleSummary() override;
 
     /** @return  The child index of the specified cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** @return  The row index of the specified child cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
 
     /** @return  The column index of the specified child cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
 
     /*  Derived classes have to implement:
         -   getAccessibleRowDescription,
@@ -135,8 +119,7 @@ public:
     // XInterface
 
     /** Queries for a new interface. */
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
     /** Aquires the object (calls acquire() on base class). */
     virtual void SAL_CALL acquire() throw () override;
@@ -147,12 +130,10 @@ public:
     // XTypeProvider
 
     /** @return  A sequence of possible types (received from base classes). */
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     /** @return  An unique implementation ID. */
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 protected:
     // internal helper methods
@@ -172,23 +153,19 @@ protected:
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified row index is invalid. */
-    void ensureIsValidRow( sal_Int32 nRow )
-        throw ( css::lang::IndexOutOfBoundsException );
+    void ensureIsValidRow( sal_Int32 nRow );
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified column index is invalid. */
-    void ensureIsValidColumn( sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException );
+    void ensureIsValidColumn( sal_Int32 nColumn );
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified cell address is invalid. */
-    void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn )
-        throw ( css::lang::IndexOutOfBoundsException );
+    void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn );
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified child index is invalid. */
-    void ensureIsValidIndex( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException );
+    void ensureIsValidIndex( sal_Int32 nChildIndex );
 };
 
 
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index 6edf28c07560..e3d138f1eaff 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -38,7 +38,7 @@ namespace accessibility
         inline sal_Int32    getColumnPos( ) const { return m_nColPos; }
 
         // XAccessibleComponent
-        virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL grabFocus() override;
 
     protected:
         AccessibleGridControlCell(
@@ -81,8 +81,7 @@ namespace accessibility
         // XInterface -------------------------------------------------------------
 
         /** Queries for a new interface. */
-        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
         /** Aquires the object (calls acquire() on base class). */
         virtual void SAL_CALL acquire() throw () override;
@@ -91,28 +90,23 @@ namespace accessibility
         virtual void SAL_CALL release() throw () override;
 
         /** @return  The index of this object among the parent's children. */
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
         /** @return
                 The name of this class.
         */
-        virtual OUString SAL_CALL getImplementationName()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         /** @return
                 The count of visible children.
         */
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
         /** @return
                 The XAccessible interface of the specified child.
         */
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-            getAccessibleChild( sal_Int32 nChildIndex )
-                throw ( css::lang::IndexOutOfBoundsException,
-                        css::uno::RuntimeException, std::exception ) override;
+            getAccessibleChild( sal_Int32 nChildIndex ) override;
 
         /** Creates a new AccessibleStateSetHelper and fills it with states of the
             current object.
@@ -125,27 +119,26 @@ namespace accessibility
 
         /** @return  The XAccessibleContext interface of this object. */
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
-        getAccessibleContext()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleContext() override;
 
         // XAccessibleText
-        virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
     };
 }
 #endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX
diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
index 53415c1dcc80..113e38f752df 100644
--- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
@@ -49,7 +49,7 @@ namespace accessibility
         virtual Rectangle implGetBoundingBoxOnScreen() override;
 
         // XAccessibleComponent
-        virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL grabFocus() override;
 
     protected:
         AccessibleBrowseBoxCell(
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index 7082ee06c0d4..d81f4e65ae01 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -52,11 +52,11 @@ namespace accessibility
 
     protected:
         // XAccessibleComponent
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override ;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override ;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override ;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override ;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         // XInterface
         DECLARE_XINTERFACE( )
@@ -64,27 +64,27 @@ namespace accessibility
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleContext
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
 
-        sal_Int16 SAL_CALL getAccessibleRole() throw ( css::uno::RuntimeException, std::exception ) override;
+        sal_Int16 SAL_CALL getAccessibleRole() override;
 
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
 
-        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;
     protected:
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
 
         // XComponent/OComponentProxyAggregationHelper (needs to be disambiguated)
-        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) final override;
+        virtual void SAL_CALL dispose() final override;
 
         // OAccessibleContextWrapperHelper();
-        void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) override;
+        void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) override;
 
     private:
         EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) = delete;
@@ -126,7 +126,7 @@ namespace accessibility
         virtual ~EditBrowseBoxTableCellAccess() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XComponent/OComponentHelper
         virtual void SAL_CALL disposing() override;
diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
index 8b54e3058a86..3d83f7762bf9 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -71,30 +71,29 @@ namespace accessibility
         DECLARE_XINTERFACE()
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
 
         // XAccessibleSelection
-        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        void SAL_CALL clearAccessibleSelection(  ) override;
+        void SAL_CALL selectAllAccessibleChildren(  ) override;
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
     };
 
 
diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
index 6217ea70f43b..fb020db028b5 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
@@ -80,16 +80,12 @@ namespace accessibility
 
         /// @throws css::lang::DisposedException
         /// @throws css::uno::RuntimeException
-        Rectangle               GetBoundingBox()
-            throw (css::lang::DisposedException,
-                   css::uno::RuntimeException);
+        Rectangle               GetBoundingBox();
         /// @throws css::lang::DisposedException
         /// @throws css::uno::RuntimeException
-        Rectangle               GetBoundingBoxOnScreen()
-            throw (css::lang::DisposedException,
-                   css::uno::RuntimeException);
+        Rectangle               GetBoundingBoxOnScreen();
         /// @throws css::lang::DisposedException
-        void                    EnsureIsAlive() const throw ( css::lang::DisposedException );
+        void                    EnsureIsAlive() const;
 
     protected:
         virtual ~AccessibleIconChoiceCtrlEntry() override;
@@ -116,71 +112,70 @@ namespace accessibility
                                        const css::uno::Reference< css::accessibility::XAccessible >& _xParent );
 
         // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
-        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+        virtual css::awt::Point SAL_CALL getLocation(  ) override;
+        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+        virtual css::awt::Size SAL_CALL getSize(  ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
         // XAccessibleText
-        virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
         // XAccessibleEventBroadcaster
-        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
         // XAccessibleAction
-        virtual sal_Int32 SAL_CALL getAccessibleActionCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleActionCount(  ) override;
+        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override;
+        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
     };
 
 
diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx
index e8249be5d20a..924eb9347d15 100644
--- a/accessibility/inc/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -84,30 +84,29 @@ namespace accessibility
         DECLARE_XINTERFACE()
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
 
         // XAccessibleSelection
-        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        void SAL_CALL clearAccessibleSelection(  ) override;
+        void SAL_CALL selectAllAccessibleChildren(  ) override;
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
 private:
 
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
index 7b0a49538131..8c233ec3025d 100644
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -96,16 +96,12 @@ namespace accessibility
 
         /// @throws css::lang::DisposedException
         /// @throws css::uno::RuntimeException
-        Rectangle               GetBoundingBox()
-                                    throw (css::lang::DisposedException,
-                                           css::uno::RuntimeException);
+        Rectangle               GetBoundingBox();
         /// @throws css::lang::DisposedException
         /// @throws css::uno::RuntimeException
-        Rectangle               GetBoundingBoxOnScreen()
-                                    throw (css::lang::DisposedException,
-                                           css::uno::RuntimeException);
+        Rectangle               GetBoundingBoxOnScreen();
         /// @throws css::lang::DisposedException
-        void                    EnsureIsAlive() const throw ( css::lang::DisposedException );
+        void                    EnsureIsAlive() const;
 
         void                    NotifyAccessibleEvent( sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );
 
@@ -117,7 +113,7 @@ namespace accessibility
         virtual void SAL_CALL                   disposing() override;
 
         // ListBoxAccessible/XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) final override;
+        virtual void SAL_CALL dispose() final override;
 
         // OCommonAccessibleText
         virtual OUString                        implGetText() override;
@@ -141,81 +137,80 @@ namespace accessibility
 
     protected:
         // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
-        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+        virtual css::awt::Point SAL_CALL getLocation(  ) override;
+        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+        virtual css::awt::Size SAL_CALL getSize(  ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
         // XAccessibleText
-        virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
         // XAccessibleEventBroadcaster
-        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
         // XAccessibleAction
-        virtual sal_Int32 SAL_CALL getAccessibleActionCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleActionCount(  ) override;
+        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override;
+        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
         // XAccessibleSelection
-        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getCurrentValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getMaximumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        void SAL_CALL clearAccessibleSelection(  ) override;
+        void SAL_CALL selectAllAccessibleChildren(  ) override;
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+        virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+        virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+        virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
     private:
         css::uno::Reference< css::accessibility::XAccessible > implGetParentAccessible( ) const;
         SvTreeListEntry* GetRealChild(sal_Int32 nIndex);
diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx
index 6415a46844aa..9b95e994a885 100644
--- a/accessibility/inc/extended/accessibletabbar.hxx
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -56,7 +56,7 @@ namespace accessibility
         void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
         // OCommonAccessibleComponent
-        virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+        virtual css::awt::Rectangle implGetBounds(  ) override;
 
         // XComponent
         virtual void SAL_CALL   disposing() override;
@@ -72,35 +72,35 @@ namespace accessibility
         DECLARE_XTYPEPROVIDER()
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
         // XAccessibleExtendedComponent
-        virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+        virtual OUString SAL_CALL getTitledBorderText(  ) override;
+        virtual OUString SAL_CALL getToolTipText(  ) override;
     };
 
 
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx
index 04239d6fa0c8..3fa3d7a93a54 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -71,7 +71,7 @@ namespace accessibility
         void                    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
         // OCommonAccessibleComponent
-        virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+        virtual css::awt::Rectangle implGetBounds(  ) override;
 
         // XComponent
         virtual void SAL_CALL   disposing() override;
@@ -88,35 +88,35 @@ namespace accessibility
         DECLARE_XTYPEPROVIDER()
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
         // XAccessibleExtendedComponent
-        virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+        virtual OUString SAL_CALL getTitledBorderText(  ) override;
+        virtual OUString SAL_CALL getToolTipText(  ) override;
     };
 
 
diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index f473fe9adfd2..be287316b426 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -67,7 +67,7 @@ namespace accessibility
         void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
         // OCommonAccessibleComponent
-        virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+        virtual css::awt::Rectangle implGetBounds(  ) override;
 
         // XComponent
         virtual void SAL_CALL   disposing() override;
@@ -83,44 +83,44 @@ namespace accessibility
         DECLARE_XTYPEPROVIDER()
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
         // XAccessibleExtendedComponent
-        virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+        virtual OUString SAL_CALL getTitledBorderText(  ) override;
+        virtual OUString SAL_CALL getToolTipText(  ) override;
 
         // XAccessibleSelection
-        virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        virtual void SAL_CALL clearAccessibleSelection(  ) override;
+        virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
     };
 
 
diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx
index 9673b8675884..bca61c58e09f 100644
--- a/accessibility/inc/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/extended/accessibletablistbox.hxx
@@ -61,17 +61,14 @@ public:
     // XAccessibleContext -----------------------------------------------------
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    getAccessibleChild( sal_Int32 nChildIndex ) override;
 
     // XAccessibleContext
-    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() throw ( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override;
 
     // IAccessibleTabListBox
     virtual css::uno::Reference< css::accessibility::XAccessible >
diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx
index 6a12f2ad829b..1a3bfc6c8dea 100644
--- a/accessibility/inc/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/extended/accessibletablistboxtable.hxx
@@ -83,17 +83,16 @@ public:
     DECLARE_XTYPEPROVIDER( )
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     // XAccessibleSelection
-    void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    void SAL_CALL clearAccessibleSelection(  ) override;
+    void SAL_CALL selectAllAccessibleChildren(  ) override;
+    sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 };
 
 
diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx
index 58576fd1e0e3..7e17bf55313d 100644
--- a/accessibility/inc/extended/listboxaccessible.hxx
+++ b/accessibility/inc/extended/listboxaccessible.hxx
@@ -60,7 +60,7 @@ namespace accessibility
 
             @throws css::uno::RuntimeException
         */
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) = 0;
+        virtual void SAL_CALL dispose() = 0;
 
         /// to be called in the dispose method of your derived class
         void disposing();
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index 6cb2d6a30243..f7e739eb2d6e 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -169,196 +169,134 @@ protected:
 
 private:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext >
-    SAL_CALL getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getAccessibleContext() override;
 
-    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild(::sal_Int32 i)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    getAccessibleChild(::sal_Int32 i) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleParent() throw (css::uno::RuntimeException, std::exception) override;
+    getAccessibleParent() override;
 
-    virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
-    virtual ::sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int16 SAL_CALL getAccessibleRole() override;
 
-    virtual OUString SAL_CALL getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
 
-    virtual OUString SAL_CALL getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName() override;
 
     virtual
     css::uno::Reference< css::accessibility::XAccessibleRelationSet >
-    SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getAccessibleRelationSet() override;
 
     virtual
     css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-    getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override;
+    getAccessibleStateSet() override;
 
-    virtual css::lang::Locale SAL_CALL getLocale()
-        throw (css::accessibility::IllegalAccessibleComponentStateException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
 
-    virtual sal_Bool SAL_CALL containsPoint(css::awt::Point const & rPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint(css::awt::Point const & rPoint) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleAtPoint(css::awt::Point const & rPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+    getAccessibleAtPoint(css::awt::Point const & rPoint) override;
 
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
-    virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() override;
 
-    virtual css::util::Color SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Color SAL_CALL getForeground() override;
 
-    virtual css::util::Color SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Color SAL_CALL getBackground() override;
 
-    virtual ::sal_Int32 SAL_CALL getCaretPosition()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getCaretPosition() override;
 
-    virtual sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex) override;
 
-    virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex) override;
 
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-    getCharacterAttributes(::sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    getCharacterAttributes(::sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
 
     virtual css::awt::Rectangle SAL_CALL
-    getCharacterBounds(::sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    getCharacterBounds(::sal_Int32 nIndex) override;
 
-    virtual ::sal_Int32 SAL_CALL getCharacterCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getCharacterCount() override;
 
     virtual ::sal_Int32 SAL_CALL
-    getIndexAtPoint(css::awt::Point const & rPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+    getIndexAtPoint(css::awt::Point const & rPoint) override;
 
-    virtual OUString SAL_CALL getSelectedText()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSelectedText() override;
 
-    virtual ::sal_Int32 SAL_CALL getSelectionStart()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getSelectionStart() override;
 
-    virtual ::sal_Int32 SAL_CALL getSelectionEnd()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getSelectionEnd() override;
 
     virtual sal_Bool SAL_CALL setSelection(::sal_Int32 nStartIndex,
-                                             ::sal_Int32 nEndIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+                                             ::sal_Int32 nEndIndex) override;
 
-    virtual OUString SAL_CALL getText()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getText() override;
 
     virtual OUString SAL_CALL getTextRange(::sal_Int32 nStartIndex,
-                                                  ::sal_Int32 nEndIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+                                                  ::sal_Int32 nEndIndex) override;
 
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
 
     virtual sal_Bool SAL_CALL copyText(::sal_Int32 nStartIndex,
-                                         ::sal_Int32 nEndIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+                                         ::sal_Int32 nEndIndex) override;
 
     virtual sal_Bool SAL_CALL cutText(::sal_Int32 nStartIndex,
-                                        ::sal_Int32 nEndIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+                                        ::sal_Int32 nEndIndex) override;
 
-    virtual sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex) override;
 
     virtual sal_Bool SAL_CALL deleteText(::sal_Int32 nStartIndex,
-                                           ::sal_Int32 nEndIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+                                           ::sal_Int32 nEndIndex) override;
 
     virtual sal_Bool SAL_CALL insertText(OUString const & rText,
-                                           ::sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+                                           ::sal_Int32 nIndex) override;
 
     virtual sal_Bool SAL_CALL replaceText(
         ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
-        OUString const & rReplacement)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        OUString const & rReplacement) override;
 
     virtual sal_Bool SAL_CALL setAttributes(
         ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
         css::uno::Sequence< css::beans::PropertyValue > const &
-        rAttributeSet)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        rAttributeSet) override;
 
-    virtual sal_Bool SAL_CALL setText(OUString const & rText)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL setText(OUString const & rText) override;
 
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-    getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes)
-        throw (css::uno::RuntimeException, std::exception) override;
+    getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) override;
 
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-    getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes) override;
 
-    virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) override;
 
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) override;
 
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret(  ) override;
 
-    virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret(  ) override;
 
     virtual void SAL_CALL addAccessibleEventListener(
         css::uno::Reference<
-        css::accessibility::XAccessibleEventListener > const & rListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::accessibility::XAccessibleEventListener > const & rListener) override;
 
     virtual void SAL_CALL removeAccessibleEventListener(
         css::uno::Reference<
-        css::accessibility::XAccessibleEventListener > const & rListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::accessibility::XAccessibleEventListener > const & rListener) override;
 
     virtual void SAL_CALL disposing() override;
 
@@ -550,20 +488,15 @@ public:
     retrieveParagraphRelationSet( Paragraph const * pParagraph );
 
 private:
-    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
-    SAL_CALL getAccessibleChild(::sal_Int32 i)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getAccessibleChild(::sal_Int32 i) override;
 
-    virtual ::sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int16 SAL_CALL getAccessibleRole() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
-    SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint) override;
 
     virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
     virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index 417e7a6bcf12..af8e9d640301 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -132,13 +132,13 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx
index de067b850357..f2ef7294ba8e 100644
--- a/accessibility/inc/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -40,7 +40,7 @@ protected:
     virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
 
     // OCommonAccessibleComponent
-    virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) override;
 
 public:
     OAccessibleMenuComponent( Menu* pMenu );
@@ -53,35 +53,35 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
diff --git a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
index acb6452faa09..0d893dde1c1f 100644
--- a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
@@ -53,7 +53,7 @@ protected:
     virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
 
     // OCommonAccessibleComponent
-    virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) override;
 
     // XComponent
     virtual void SAL_CALL   disposing() override;
@@ -63,26 +63,26 @@ public:
     virtual ~OAccessibleMenuItemComponent() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx
index a4fbce5b5eb7..b16a12f7702f 100644
--- a/accessibility/inc/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebox.hxx
@@ -62,7 +62,7 @@ public:
     // XAccessible
 
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
-            getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+            getAccessibleContext(  ) override;
 
     // XAccessibleContext
 
@@ -70,62 +70,47 @@ public:
         actual list.  The text field is not provided for non drop down list
         boxes.
     */
-    sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getAccessibleChildCount() override;
     /** For drop down list boxes the text field is a not editable
         VCLXAccessibleTextField, for combo boxes it is an
         editable VLCAccessibleEdit.
     */
     css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 i)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 i) override;
     /** The role is always AccessibleRole::COMBO_BOX.
     */
-    sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int16 SAL_CALL getAccessibleRole() override;
 
-    sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
     // XAccessibleAction
 
     /** There is one action for drop down boxes and none for others.
     */
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount() override;
     /** The action for drop down boxes lets the user toggle the visibility of the
         popup menu.
     */
-    virtual sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex) override;
     /** The returned string is associated with resource
         RID_STR_ACC_ACTION_TOGGLEPOPUP.
     */
-    virtual OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) override;
     /** No keybinding returned so far.
     */
     virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL
-            getAccessibleActionKeyBinding( sal_Int32 nIndex )
-                throw (css::lang::IndexOutOfBoundsException,
-                       css::uno::RuntimeException, std::exception) override;
+            getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleValue
 
-    virtual css::uno::Any SAL_CALL getCurrentValue( )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue( ) override;
 
     virtual sal_Bool SAL_CALL setCurrentValue(
-        const css::uno::Any& aNumber )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& aNumber ) override;
 
-    virtual css::uno::Any SAL_CALL getMaximumValue(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
 
-    virtual css::uno::Any SAL_CALL getMinimumValue(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
 protected:
     /** Specifies whether the box is a combo box or a list box.  List boxes
         have multi selection.
diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx
index 2a61a4e3b762..af9e49c4a938 100644
--- a/accessibility/inc/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx
@@ -54,23 +54,23 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
 
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleValue
-    virtual css::uno::Any SAL_CALL getCurrentValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMaximumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+    virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+    virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBUTTON_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
index 218d8a21e9b4..647c7b18f6f3 100644
--- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
@@ -64,20 +64,20 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleValue
-    virtual css::uno::Any SAL_CALL getCurrentValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMaximumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+    virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+    virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx
index 2f64a22c827d..dcd36fcfb60b 100644
--- a/accessibility/inc/standard/vclxaccessiblecombobox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx
@@ -38,12 +38,10 @@ public:
     VCLXAccessibleComboBox (VCLXWindow* pVCLXindow);
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     // Return combo box specific services.
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
 protected:
     virtual ~VCLXAccessibleComboBox() override;
diff --git a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
index 1368ba119540..72559afe66dd 100644
--- a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
+++ b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
@@ -37,12 +37,10 @@ public:
     VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow);
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     // Return drop down combo box specific services.
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
 protected:
     virtual ~VCLXAccessibleDropDownComboBox() override;
diff --git a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
index b9a10722998f..5c00b33b6bb6 100644
--- a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
+++ b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
@@ -36,12 +36,10 @@ public:
     VCLXAccessibleDropDownListBox (VCLXWindow* pVCLXindow);
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     // Return drop down list box specific services.
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
 protected:
     virtual ~VCLXAccessibleDropDownListBox() override;
diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx
index a9045839fed6..61ee87ee1102 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -63,47 +63,47 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition(  ) override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount(  ) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual OUString SAL_CALL getSelectedText(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectionStart(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd(  ) override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual OUString SAL_CALL getText(  ) override;
+    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     // XAccessibleEditableText
-    virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) override;
+    virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) override;
+    virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) override;
+    virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) override;
+    virtual sal_Bool SAL_CALL setText( const OUString& sText ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEEDIT_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
index da5341193a40..0cb1d2f96813 100644
--- a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
+++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
@@ -35,8 +35,8 @@ public:
     VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLXindow );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
index 4f870beab961..98b70542f639 100644
--- a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
+++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
@@ -37,8 +37,8 @@ public:
     VCLXAccessibleFixedText( VCLXWindow* pVCLXindow );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx
index cd79888f8922..b05bbd6d37ac 100644
--- a/accessibility/inc/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelist.hxx
@@ -88,45 +88,37 @@ public:
 
     // XAccessible
     virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
     css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 i)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 i) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleParent(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent(  ) override;
 
     /** The index returned as index in parent is always the one set with the
         SetIndexInParent() method.
     */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     // Return list specific services.
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
     bool    IsInDropDown();
     void        HandleDropOpen();
     void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList);
@@ -181,7 +173,7 @@ protected:
     void HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex);
 
     // VCLXAccessibleComponent
-    virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) override;
 
 private:
     /** We need to save the accessible parent to return it in getAccessibleParent(),
diff --git a/accessibility/inc/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/standard/vclxaccessiblelistbox.hxx
index 0ef7a3ed7e08..47890c9378ca 100644
--- a/accessibility/inc/standard/vclxaccessiblelistbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistbox.hxx
@@ -37,12 +37,10 @@ public:
     VCLXAccessibleListBox (VCLXWindow* pVCLXindow);
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     // Return list box specific services.
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
 protected:
     virtual ~VCLXAccessibleListBox() override;
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index cbf874e41cb8..57c93997c24b 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -97,61 +97,61 @@ public:
     void                    SetVisible( bool _bVisible );
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition() override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount() override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual OUString SAL_CALL getSelectedText() override;
+    virtual sal_Int32 SAL_CALL getSelectionStart() override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 };
 
 #endif // ACCESSIBILITY_STANDARD_ACCESSIBLELISTBOXENTRY_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx
index 27cd4149c771..58c0b116f662 100644
--- a/accessibility/inc/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx
@@ -50,28 +50,28 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     // XAccessibleAction
-    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/standard/vclxaccessiblemenubar.hxx
index a4ecc4097335..2c795cd31992 100644
--- a/accessibility/inc/standard/vclxaccessiblemenubar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenubar.hxx
@@ -50,15 +50,15 @@ public:
     virtual ~VCLXAccessibleMenuBar() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
     // XAccessibleExtendedComponent
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
index ecb39a44d92e..ee0ccd5589e8 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
@@ -66,42 +66,42 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition() override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount() override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual OUString SAL_CALL getSelectedText() override;
+    virtual sal_Int32 SAL_CALL getSelectionStart() override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleValue
-    virtual css::uno::Any SAL_CALL getCurrentValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMaximumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+    virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+    virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
index c477caa7450e..2b4a49b7473b 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
@@ -33,11 +33,11 @@ public:
     virtual ~VCLXAccessibleMenuSeparator() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 };
 
 
diff --git a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
index 112ea3dbb5c7..e576189c0048 100644
--- a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
@@ -36,15 +36,15 @@ public:
     virtual ~VCLXAccessiblePopupMenu() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
     // XAccessibleExtendedComponent
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
index 1d36eb87efbf..a3643a61c6e9 100644
--- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
+++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
@@ -55,20 +55,20 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleValue
-    virtual css::uno::Any SAL_CALL getCurrentValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMaximumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+    virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+    virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
index bd9ba54d5f8a..19537d7739a9 100644
--- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
@@ -54,23 +54,23 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleValue
-    virtual css::uno::Any SAL_CALL getCurrentValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMaximumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+    virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+    virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
 
     // XAccessibleContext
-    ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    ::rtl::OUString SAL_CALL getAccessibleName(  ) override;
 
 };
 
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
index 467b7d191192..ebe9ac1a6ae4 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
@@ -57,15 +57,15 @@ public:
     virtual ~VCLXAccessibleStatusBar() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
 };
 
 
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
index 6bd8a3961ad7..5fb0813a44f8 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
@@ -68,7 +68,7 @@ protected:
     void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     // OCommonAccessibleComponent
-    virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) override;
 
     // OCommonAccessibleText
     virtual OUString                        implGetText() override;
@@ -89,44 +89,44 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition() override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
index faa3c684f32e..bdef5ef291da 100644
--- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
@@ -71,23 +71,23 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
 };
 
 
diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx
index 1232259cef93..d5153b11f630 100644
--- a/accessibility/inc/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx
@@ -73,7 +73,7 @@ protected:
     void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     // OCommonAccessibleComponent
-    virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) override;
 
     // OCommonAccessibleText
     virtual OUString                        implGetText() override;
@@ -94,44 +94,44 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition() override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGE_HXX
diff --git a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
index d7e7388e9976..aeaf923e0f12 100644
--- a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
@@ -40,7 +40,7 @@ private:
 
 protected:
     // OCommonAccessibleComponent
-    virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) override;
 
     // XComponent
     virtual void SAL_CALL   disposing() override;
@@ -50,8 +50,8 @@ public:
     virtual ~VCLXAccessibleTabPageWindow() override;
 
     // XAccessibleContext
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
 };
 
 
diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
index 5eba648cdde1..b5ae9e510be1 100644
--- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
@@ -60,23 +60,23 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition() override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount() override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual OUString SAL_CALL getSelectedText() override;
+    virtual sal_Int32 SAL_CALL getSelectionStart() override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 };
 
 
diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx
index 7d57a7c2cd4e..f1bb4fec8aa1 100644
--- a/accessibility/inc/standard/vclxaccessibletextfield.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx
@@ -49,28 +49,21 @@ public:
 
     // XAccessible
     css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
     // XAccessibleContext
-    sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getAccessibleChildCount() override;
     css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 i)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 i) override;
+    sal_Int16 SAL_CALL getAccessibleRole() override;
     css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleParent(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     // Return text field specific services.
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
 protected:
     virtual ~VCLXAccessibleTextField() override;
diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
index 368de4326402..f914075ff0ce 100644
--- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
@@ -76,22 +76,22 @@ public:
     DECLARE_XTYPEPROVIDER( )
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
 
 private:
     void implReleaseToolboxItem(
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index ba97b30abc18..77f8411d8295 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -68,7 +68,7 @@ protected:
     virtual void SAL_CALL                   disposing() override;
 
     /// implements the calculation of the bounding rectangle
-    virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) override;
 
     // OCommonAccessibleText
     virtual OUString                                    implGetText() override;
@@ -98,55 +98,55 @@ public:
     DECLARE_XTYPEPROVIDER( )
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition() override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
 
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleValue
-    virtual css::uno::Any SAL_CALL getCurrentValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMaximumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMinimumValue(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+    virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
+    virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
 };
 
 #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 07baad096774..bfef475f1fe3 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -108,7 +108,6 @@ void SAL_CALL AccessibleBrowseBox::disposing()
 // css::accessibility::XAccessibleContext
 
 sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -119,7 +118,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount()
 
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
 AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -147,7 +145,6 @@ AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex )
 
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
 AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -177,7 +174,6 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
 
 
 void SAL_CALL AccessibleBrowseBox::grabFocus()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -188,7 +184,6 @@ void SAL_CALL AccessibleBrowseBox::grabFocus()
 // XServiceInfo
 
 OUString SAL_CALL AccessibleBrowseBox::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBox" );
 }
@@ -318,7 +313,7 @@ void AccessibleBrowseBoxAccess::dispose()
 }
 
 
-css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() throw ( RuntimeException, std::exception )
+css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index ccb2c3728062..3b17348b31c1 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -115,7 +115,6 @@ void SAL_CALL AccessibleBrowseBoxBase::disposing()
 // css::accessibility::XAccessibleContext
 
 Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleParent()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
@@ -123,7 +122,6 @@ Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBoxBase::g
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
@@ -159,7 +157,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent()
 }
 
 OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleDescription()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
@@ -167,7 +164,6 @@ OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleDescription()
 }
 
 OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleName()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
@@ -176,7 +172,6 @@ OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleName()
 
 Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
 AccessibleBrowseBoxBase::getAccessibleRelationSet()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     // BrowseBox does not have relations.
@@ -185,7 +180,6 @@ AccessibleBrowseBoxBase::getAccessibleRelationSet()
 
 Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
 AccessibleBrowseBoxBase::getAccessibleStateSet()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard( getMutex() );
     // don't check whether alive -> StateSet may contain DEFUNC
@@ -193,7 +187,6 @@ AccessibleBrowseBoxBase::getAccessibleStateSet()
 }
 
 lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale()
-    throw ( IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
@@ -210,36 +203,31 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale()
 // css::accessibility::XAccessibleComponent
 
 sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const css::awt::Point& rPoint )
-    throw ( uno::RuntimeException, std::exception )
 {
     return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
 }
 
 awt::Rectangle SAL_CALL AccessibleBrowseBoxBase::getBounds()
-    throw ( uno::RuntimeException, std::exception )
 {
     return AWTRectangle( getBoundingBox() );
 }
 
 awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocation()
-    throw ( uno::RuntimeException, std::exception )
 {
     return AWTPoint( getBoundingBox().TopLeft() );
 }
 
 awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocationOnScreen()
-    throw ( uno::RuntimeException, std::exception )
 {
     return AWTPoint( getBoundingBoxOnScreen().TopLeft() );
 }
 
 awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize()
-    throw ( uno::RuntimeException, std::exception )
 {
     return AWTSize( getBoundingBox().GetSize() );
 }
 
-void SAL_CALL AccessibleBrowseBoxBase::focusGained( const css::awt::FocusEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleBrowseBoxBase::focusGained( const css::awt::FocusEvent& )
 {
     com::sun::star::uno::Any aFocused;
     com::sun::star::uno::Any aEmpty;
@@ -249,7 +237,7 @@ void SAL_CALL AccessibleBrowseBoxBase::focusGained( const css::awt::FocusEvent&
 }
 
 
-void SAL_CALL AccessibleBrowseBoxBase::focusLost( const css::awt::FocusEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleBrowseBoxBase::focusLost( const css::awt::FocusEvent& )
 {
     com::sun::star::uno::Any aFocused;
     com::sun::star::uno::Any aEmpty;
@@ -261,7 +249,6 @@ void SAL_CALL AccessibleBrowseBoxBase::focusLost( const css::awt::FocusEvent& )
 
 void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener(
         const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( _rxListener.is() )
     {
@@ -275,7 +262,6 @@ void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener(
 
 void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener(
         const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     if( _rxListener.is() && getClientId( ) )
     {
@@ -298,7 +284,6 @@ void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener(
 // XTypeProvider
 
 Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId()
-    throw ( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -307,13 +292,11 @@ Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId()
 
 sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService(
         const OUString& rServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL AccessibleBrowseBoxBase::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" );
     return Sequence< OUString >( &aServiceName, 1 );
@@ -394,14 +377,12 @@ bool AccessibleBrowseBoxBase::isAlive() const
 }
 
 void AccessibleBrowseBoxBase::ensureIsAlive() const
-    throw ( lang::DisposedException )
 {
     if( !isAlive() )
         throw lang::DisposedException();
 }
 
 Rectangle AccessibleBrowseBoxBase::getBoundingBox()
-    throw ( lang::DisposedException )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -415,7 +396,6 @@ Rectangle AccessibleBrowseBoxBase::getBoundingBox()
 }
 
 Rectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen()
-    throw ( lang::DisposedException )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -450,7 +430,6 @@ void AccessibleBrowseBoxBase::commitEvent(
 }
 
 sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     sal_Int16 nRole = AccessibleRole::UNKNOWN;
@@ -481,17 +460,16 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
 }
 
 Reference<XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleAtPoint( const css::awt::Point& )
-        throw ( uno::RuntimeException, std::exception )
 {
     return nullptr;
 }
 
-void SAL_CALL AccessibleBrowseBoxBase::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleBrowseBoxBase::disposing( const css::lang::EventObject& )
 {
     m_xFocusWindow = nullptr;
 }
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground(  )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -516,7 +494,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground(  ) throw (css::uno::R
     return nColor;
 }
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground(  )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -543,7 +521,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( BrowseBoxAccessibleElement, AccessibleBrowseBo
 
 // css::accessibility::XAccessible
 
-Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception )
+Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext()
 {
     ensureIsAlive();
     return this;
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index c8490babdcc8..da749b76fb38 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -44,7 +44,7 @@ namespace accessibility
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleCheckBoxCell, AccessibleBrowseBoxCell, AccessibleCheckBoxCell_BASE )
 
-    Reference< XAccessibleContext > SAL_CALL AccessibleCheckBoxCell::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleContext > SAL_CALL AccessibleCheckBoxCell::getAccessibleContext(  )
     {
         ensureIsAlive();
         return this;
@@ -66,7 +66,7 @@ namespace accessibility
 
     // XAccessibleValue
 
-    Any SAL_CALL AccessibleCheckBoxCell::getCurrentValue(  ) throw (RuntimeException, std::exception)
+    Any SAL_CALL AccessibleCheckBoxCell::getCurrentValue(  )
     {
         ::osl::MutexGuard aGuard( getMutex() );
 
@@ -86,12 +86,12 @@ namespace accessibility
         return makeAny(nValue);
     }
 
-    sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& )
     {
         return false;
     }
 
-    Any SAL_CALL AccessibleCheckBoxCell::getMaximumValue(  ) throw (RuntimeException, std::exception)
+    Any SAL_CALL AccessibleCheckBoxCell::getMaximumValue(  )
     {
         ::osl::MutexGuard aGuard( getMutex() );
 
@@ -105,7 +105,7 @@ namespace accessibility
         return aValue;
     }
 
-    Any SAL_CALL AccessibleCheckBoxCell::getMinimumValue(  ) throw (RuntimeException, std::exception)
+    Any SAL_CALL AccessibleCheckBoxCell::getMinimumValue(  )
     {
         Any aValue;
         aValue <<= (sal_Int32) 0;
@@ -114,23 +114,22 @@ namespace accessibility
     }
 
     // XAccessibleContext
-    sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount(  )
     {
         return 0;
     }
 
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 )
     {
         throw css::lang::IndexOutOfBoundsException();
     }
 
-    OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() throw ( css::uno::RuntimeException, std::exception )
+    OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.TableCheckBoxCell" );
     }
 
     sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent()
-            throw ( css::uno::RuntimeException, std::exception )
     {
         ::osl::MutexGuard aGuard( getMutex() );
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index cd9ce964e298..00d04c7756e1 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -54,7 +54,6 @@ AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar()
 
 Reference< XAccessible > SAL_CALL
 AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -64,7 +63,6 @@ AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex )
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent()
-    throw ( uno::RuntimeException, std::exception )
 {
     return isRowBar() ? BBINDEX_ROWHEADERBAR : BBINDEX_COLUMNHEADERBAR;
 }
@@ -73,7 +71,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent()
 
 Reference< XAccessible > SAL_CALL
 AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -88,7 +85,6 @@ AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint )
 }
 
 void SAL_CALL AccessibleBrowseBoxHeaderBar::grabFocus()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     // focus on header not supported
@@ -97,7 +93,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::grabFocus()
 // XAccessibleTable -----------------------------------------------------------
 
 OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal_Int32 nRow )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
 
@@ -107,7 +102,6 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal
 }
 
 OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnDescription( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
 
@@ -117,21 +111,18 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnDescription(
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowHeaders()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     return nullptr;        // no headers in headers
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnHeaders()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     return nullptr;        // no headers in headers
 }
 
 Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleRows()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -144,7 +135,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessib
 }
 
 Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleColumns()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -157,7 +147,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessib
 }
 
 sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int32 nRow )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
 
@@ -167,7 +156,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int
 }
 
 sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
 
@@ -178,7 +166,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_
 
 Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleCellAt(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
 
@@ -190,7 +177,6 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleCel
 
 sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -202,7 +188,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected(
 // XAccessibleSelection -------------------------------------------------------
 
 void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -215,7 +200,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nCh
 }
 
 sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     // using interface methods - no mutex
     return isRowBar() ?
@@ -224,7 +208,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_I
 }
 
 void SAL_CALL AccessibleBrowseBoxHeaderBar::clearAccessibleSelection()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -233,7 +216,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::clearAccessibleSelection()
 }
 
 void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -246,7 +228,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren()
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -256,7 +237,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount
 
 Reference< XAccessible > SAL_CALL
 AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -268,7 +248,6 @@ AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChi
 
 void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild(
         sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -286,7 +265,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild(
 // XInterface -----------------------------------------------------------------
 
 Any SAL_CALL AccessibleBrowseBoxHeaderBar::queryInterface( const uno::Type& rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     Any aAny( AccessibleBrowseBoxTableBase::queryInterface( rType ) );
     return aAny.hasValue() ?
@@ -306,13 +284,11 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::release() throw ()
 // XServiceInfo ---------------------------------------------------------------
 
 OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderBar" );
 }
 
 Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId()
-    throw ( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -353,7 +329,6 @@ Reference< XAccessible > AccessibleBrowseBoxHeaderBar::implGetChild(
 
 sal_Int32 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex(
         sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException )
 {
     Sequence< sal_Int32 > aSelSeq;
     if( isRowBar() )
@@ -368,7 +343,6 @@ sal_Int32 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex(
 }
 
 void AccessibleBrowseBoxHeaderBar::ensureIsValidHeaderIndex( sal_Int32 nIndex )
-    throw ( lang::IndexOutOfBoundsException )
 {
     if( isRowBar() )
         ensureIsValidRow( nIndex );
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 2f706338a75c..ce5c3ef7f3f4 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -81,7 +81,6 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR
         The count of visible children.
 */
 sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount()
-    throw ( RuntimeException, std::exception )
 {
     return 0;
 }
@@ -91,7 +90,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount()
         The XAccessible interface of the specified child.
 */
 Reference<XAccessible > SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChild( sal_Int32 )
-    throw ( IndexOutOfBoundsException,RuntimeException, std::exception )
 {
     throw IndexOutOfBoundsException();
 }
@@ -99,7 +97,6 @@ Reference<XAccessible > SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChi
 
 /** Grabs the focus to the column header. */
 void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -114,7 +111,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus()
         The name of this class.
 */
 OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderCell" );
 }
@@ -148,7 +144,6 @@ Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen()
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent()
-    throw ( RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index 756146d0792d..61d7c2b21773 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -49,7 +49,6 @@ AccessibleBrowseBoxTable::~AccessibleBrowseBoxTable()
 
 Reference< XAccessible > SAL_CALL
 AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -60,7 +59,6 @@ AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex )
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     return BBINDEX_TABLE;
@@ -70,7 +68,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent()
 
 Reference< XAccessible > SAL_CALL
 AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -85,7 +82,6 @@ AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint )
 }
 
 void SAL_CALL AccessibleBrowseBoxTable::grabFocus()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -95,7 +91,6 @@ void SAL_CALL AccessibleBrowseBoxTable::grabFocus()
 // XAccessibleTable -----------------------------------------------------------
 
 OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int32 nRow )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -104,7 +99,6 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int
 }
 
 OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnDescription( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -114,7 +108,6 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnDescription( sal_
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowHeaders()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
@@ -122,7 +115,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleRo
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnHeaders()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
@@ -130,7 +122,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCo
 }
 
 Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRows()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -141,7 +132,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRo
 }
 
 Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleColumns()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -152,7 +142,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleCo
 }
 
 sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleRowSelected( sal_Int32 nRow )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -162,7 +151,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleRowSelected( sal_Int32 n
 }
 
 sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleColumnSelected( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -173,7 +161,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleColumnSelected( sal_Int3
 
 Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCellAt(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -184,7 +171,6 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCellAt(
 
 sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleSelected(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -196,7 +182,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleSelected(
 // XServiceInfo ---------------------------------------------------------------
 
 OUString SAL_CALL AccessibleBrowseBoxTable::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxTable" );
 }
@@ -217,7 +202,6 @@ Rectangle AccessibleBrowseBoxTable::implGetBoundingBoxOnScreen()
 
 Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar(
         sal_Int32 nChildIndex )
-    throw ( uno::RuntimeException )
 {
     Reference< XAccessible > xRet;
     Reference< XAccessibleContext > xContext( mxParent, uno::UNO_QUERY );
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 153ff855716a..f862854379b8 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -53,7 +53,6 @@ AccessibleBrowseBoxTableBase::~AccessibleBrowseBoxTableBase()
 // XAccessibleContext ---------------------------------------------------------
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -61,7 +60,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount()
 }
 
 sal_Int16 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRole()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     return AccessibleRole::TABLE;
@@ -70,7 +68,6 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRole()
 // XAccessibleTable -----------------------------------------------------------
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -78,7 +75,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowCount()
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -87,7 +83,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnCount()
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowExtentAt(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -97,7 +92,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowExtentAt(
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnExtentAt(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -106,14 +100,12 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnExtentAt(
 }
 
 Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleCaption()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     return nullptr;    // not supported
 }
 
 Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleSummary()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     return nullptr;    // not supported
@@ -121,7 +113,6 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleSum
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -130,7 +121,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex(
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -139,7 +129,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nCh
 }
 
 sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -150,7 +139,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int32
 // XInterface -----------------------------------------------------------------
 
 Any SAL_CALL AccessibleBrowseBoxTableBase::queryInterface( const uno::Type& rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     Any aAny( BrowseBoxAccessibleElement::queryInterface( rType ) );
     return aAny.hasValue() ?
@@ -170,7 +158,6 @@ void SAL_CALL AccessibleBrowseBoxTableBase::release() throw ()
 // XTypeProvider --------------------------------------------------------------
 
 Sequence< uno::Type > SAL_CALL AccessibleBrowseBoxTableBase::getTypes()
-    throw ( uno::RuntimeException, std::exception )
 {
     return ::comphelper::concatSequences(
         BrowseBoxAccessibleElement::getTypes(),
@@ -178,7 +165,6 @@ Sequence< uno::Type > SAL_CALL AccessibleBrowseBoxTableBase::getTypes()
 }
 
 Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxTableBase::getImplementationId()
-    throw ( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -279,7 +265,6 @@ void AccessibleBrowseBoxTableBase::implGetSelectedColumns( Sequence< sal_Int32 >
 }
 
 void AccessibleBrowseBoxTableBase::ensureIsValidRow( sal_Int32 nRow )
-    throw ( lang::IndexOutOfBoundsException )
 {
     if( nRow >= implGetRowCount() )
         throw lang::IndexOutOfBoundsException(
@@ -287,7 +272,6 @@ void AccessibleBrowseBoxTableBase::ensureIsValidRow( sal_Int32 nRow )
 }
 
 void AccessibleBrowseBoxTableBase::ensureIsValidColumn( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException )
 {
     if( nColumn >= implGetColumnCount() )
         throw lang::IndexOutOfBoundsException(
@@ -296,14 +280,12 @@ void AccessibleBrowseBoxTableBase::ensureIsValidColumn( sal_Int32 nColumn )
 
 void AccessibleBrowseBoxTableBase::ensureIsValidAddress(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException )
 {
     ensureIsValidRow( nRow );
     ensureIsValidColumn( nColumn );
 }
 
 void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException )
 {
     if( nChildIndex >= implGetChildCount() )
         throw lang::IndexOutOfBoundsException(
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index edf942981311..ea8f6694d290 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -28,7 +28,7 @@ namespace accessibility
     namespace
     {
         /// @throws css::lang::IndexOutOfBoundsException
-        void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException)
+        void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText )
         {
             if ( _nIndex >= _sText.getLength() )
                 throw css::lang::IndexOutOfBoundsException();
@@ -98,7 +98,6 @@ namespace accessibility
 
     /** Queries for a new interface. */
     css::uno::Any SAL_CALL AccessibleBrowseBoxTableCell::queryInterface( const css::uno::Type& rType )
-        throw ( css::uno::RuntimeException, std::exception )
     {
         Any aRet = AccessibleBrowseBoxCell::queryInterface(rType);
         if ( !aRet.hasValue() )
@@ -118,7 +117,7 @@ namespace accessibility
         AccessibleBrowseBoxCell::release();
     }
 
-    css::awt::Rectangle SAL_CALL AccessibleBrowseBoxTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    css::awt::Rectangle SAL_CALL AccessibleBrowseBoxTableCell::getCharacterBounds( sal_Int32 nIndex )
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -136,7 +135,7 @@ namespace accessibility
         return aRect;
     }
 
-    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getIndexAtPoint( const css::awt::Point& _aPoint ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getIndexAtPoint( const css::awt::Point& _aPoint )
     {
         //! TODO CTL bidi
         // OSL_FAIL("Need to be done by base class!");
@@ -150,14 +149,12 @@ namespace accessibility
             The name of this class.
     */
     OUString SAL_CALL AccessibleBrowseBoxTableCell::getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception )
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxTableCell" );
     }
 
     /** @return  The count of visible children. */
     sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleChildCount()
-        throw ( css::uno::RuntimeException, std::exception )
     {
         return 0;
     }
@@ -165,8 +162,6 @@ namespace accessibility
     /** @return  The XAccessible interface of the specified child. */
     css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
         AccessibleBrowseBoxTableCell::getAccessibleChild( sal_Int32 )
-            throw ( css::lang::IndexOutOfBoundsException,
-                    css::uno::RuntimeException, std::exception )
     {
         throw css::lang::IndexOutOfBoundsException();
     }
@@ -200,7 +195,7 @@ namespace accessibility
     // XAccessible ------------------------------------------------------------
 
     /** @return  The XAccessibleContext interface of this object. */
-    Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleContext() throw ( RuntimeException, std::exception )
+    Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleContext()
     {
         ensureIsAlive();
         return this;
@@ -209,7 +204,6 @@ namespace accessibility
     // XAccessibleContext -----------------------------------------------------
 
     sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleIndexInParent()
-            throw ( css::uno::RuntimeException, std::exception )
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -217,12 +211,12 @@ namespace accessibility
         return /*BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos();
     }
 
-    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition(  )
     {
         return -1;
     }
 
-    sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setCaretPosition ( sal_Int32 nIndex )
     {
         SolarMethodGuard aGuard(getMutex());
 
@@ -231,13 +225,13 @@ namespace accessibility
 
         return false;
     }
-    sal_Unicode SAL_CALL AccessibleBrowseBoxTableCell::getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Unicode SAL_CALL AccessibleBrowseBoxTableCell::getCharacter( sal_Int32 nIndex )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getCharacter( nIndex );
     }
-    css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& )
     {
         SolarMethodGuard aGuard(getMutex());
 
@@ -248,32 +242,32 @@ namespace accessibility
 
         return css::uno::Sequence< css::beans::PropertyValue >();
     }
-    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCharacterCount(  )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getCharacterCount(  );
     }
 
-    OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText(  )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getSelectedText(  );
     }
-    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionStart(  )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getSelectionStart(  );
     }
-    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionEnd(  )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getSelectionEnd(  );
     }
-    sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMethodGuard aGuard(getMutex());
 
@@ -282,37 +276,37 @@ namespace accessibility
 
         return false;
     }
-    OUString SAL_CALL AccessibleBrowseBoxTableCell::getText(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleBrowseBoxTableCell::getText(  )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getText(  );
     }
-    OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType);
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType);
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMethodGuard aGuard(getMutex());
 
         return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType);
     }
-    sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMethodGuard aGuard(getMutex());
 
@@ -323,7 +317,7 @@ namespace accessibility
         //!!! don't know how to put a string into the clipboard
         return false;
     }
-    void AccessibleBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void AccessibleBrowseBoxTableCell::disposing( const EventObject& _rSource )
     {
             if ( _rSource.Source == mxParent )
             {
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 1203e9a7576f..d95a19e83117 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -108,7 +108,6 @@ void SAL_CALL AccessibleGridControl::disposing()
 // css::accessibility::XAccessibleContext ---------------------------------------------------------
 
 sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
     ensureIsAlive();
@@ -118,7 +117,6 @@ sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount()
 
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
 AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -158,7 +156,6 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
 
 
 sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -171,7 +168,6 @@ sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole()
 
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
 AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
     ensureIsAlive();
@@ -201,7 +197,6 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
 
 
 void SAL_CALL AccessibleGridControl::grabFocus()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
     ensureIsAlive();
@@ -211,7 +206,6 @@ void SAL_CALL AccessibleGridControl::grabFocus()
 // XServiceInfo ---------------------------------------------------------------
 
 OUString SAL_CALL AccessibleGridControl::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.accessibility.AccessibleGridControl" );
 }
@@ -405,7 +399,7 @@ void AccessibleGridControlAccess::DisposeAccessImpl()
 }
 
 
-css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() throw ( RuntimeException, std::exception )
+css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext()
 {
     SolarMutexGuard g;
 
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 74d421416ea4..8e3d81df9d53 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -84,7 +84,6 @@ void SAL_CALL AccessibleGridControlBase::disposing()
 // css::accessibility::XAccessibleContext
 
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleParent()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -93,7 +92,6 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridCo
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -129,7 +127,6 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent()
 }
 
 OUString SAL_CALL AccessibleGridControlBase::getAccessibleDescription()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -138,7 +135,6 @@ OUString SAL_CALL AccessibleGridControlBase::getAccessibleDescription()
 }
 
 OUString SAL_CALL AccessibleGridControlBase::getAccessibleName()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -148,7 +144,6 @@ OUString SAL_CALL AccessibleGridControlBase::getAccessibleName()
 
 css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
 AccessibleGridControlBase::getAccessibleRelationSet()
-    throw ( uno::RuntimeException, std::exception )
 {
    SolarMutexGuard g;
 
@@ -159,7 +154,6 @@ AccessibleGridControlBase::getAccessibleRelationSet()
 
 css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
 AccessibleGridControlBase::getAccessibleStateSet()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -168,7 +162,6 @@ AccessibleGridControlBase::getAccessibleStateSet()
 }
 
 lang::Locale SAL_CALL AccessibleGridControlBase::getLocale()
-    throw ( IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -186,31 +179,26 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale()
 // css::accessibility::XAccessibleComponent
 
 sal_Bool SAL_CALL AccessibleGridControlBase::containsPoint( const awt::Point& rPoint )
-    throw ( uno::RuntimeException, std::exception )
 {
    return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
 }
 
 awt::Rectangle SAL_CALL AccessibleGridControlBase::getBounds()
-    throw ( uno::RuntimeException, std::exception )
 {
    return AWTRectangle( getBoundingBox() );
 }
 
 awt::Point SAL_CALL AccessibleGridControlBase::getLocation()
-    throw ( uno::RuntimeException, std::exception )
 {
     return AWTPoint( getBoundingBox().TopLeft() );
 }
 
 awt::Point SAL_CALL AccessibleGridControlBase::getLocationOnScreen()
-    throw ( uno::RuntimeException, std::exception )
 {
     return AWTPoint( getBoundingBoxOnScreen().TopLeft() );
 }
 
 awt::Size SAL_CALL AccessibleGridControlBase::getSize()
-    throw ( uno::RuntimeException, std::exception )
 {
     return AWTSize( getBoundingBox().GetSize() );
 }
@@ -219,7 +207,6 @@ awt::Size SAL_CALL AccessibleGridControlBase::getSize()
 
 void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener(
         const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( _rxListener.is() )
     {
@@ -234,7 +221,6 @@ void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener(
 
 void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener(
         const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     if( _rxListener.is() && getClientId( ) )
     {
@@ -257,7 +243,6 @@ void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener(
 // XTypeProvider
 
 Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId()
-    throw ( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -266,13 +251,11 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId()
 
 sal_Bool SAL_CALL AccessibleGridControlBase::supportsService(
         const OUString& rServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.accessibility.AccessibleContext" };
 }
@@ -319,14 +302,12 @@ bool AccessibleGridControlBase::isAlive() const
 }
 
 void AccessibleGridControlBase::ensureIsAlive() const
-    throw ( lang::DisposedException )
 {
     if( !isAlive() )
         throw lang::DisposedException();
 }
 
 Rectangle AccessibleGridControlBase::getBoundingBox()
-    throw ( lang::DisposedException )
 {
     SolarMutexGuard aSolarGuard;
     ensureIsAlive();
@@ -339,7 +320,6 @@ Rectangle AccessibleGridControlBase::getBoundingBox()
 }
 
 Rectangle AccessibleGridControlBase::getBoundingBoxOnScreen()
-    throw ( lang::DisposedException )
 {
     SolarMutexGuard aSolarGuard;
     ensureIsAlive();
@@ -374,7 +354,6 @@ void AccessibleGridControlBase::commitEvent(
 }
 
 sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     sal_Int16 nRole = AccessibleRole::UNKNOWN;
@@ -402,12 +381,11 @@ sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole()
 }
 
 css::uno::Reference<css::accessibility::XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const css::awt::Point& )
-        throw ( uno::RuntimeException, std::exception )
 {
     return nullptr;
 }
 
-sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -432,7 +410,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  ) throw (css::uno:
     return nColor;
 }
 
-sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground(  )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -465,7 +443,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridControlAccessibleElement, AccessibleGridCo
 
 // css::accessibility::XAccessible
 
-css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception )
+css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext()
 {
     SolarMutexGuard g;
 
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index c8d5c5551f2f..f3786228c4f5 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -56,7 +56,6 @@ AccessibleGridControlHeader::~AccessibleGridControlHeader()
 
 Reference< XAccessible > SAL_CALL
 AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -78,7 +77,6 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex )
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent()
-    throw ( uno::RuntimeException, std::exception )
 {
      ensureIsAlive();
      if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR && m_aTable.HasColHeader())
@@ -91,7 +89,6 @@ sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent()
 
 Reference< XAccessible > SAL_CALL
 AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -104,7 +101,6 @@ AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint )
 }
 
 void SAL_CALL AccessibleGridControlHeader::grabFocus()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     // focus on header not supported
@@ -113,7 +109,6 @@ void SAL_CALL AccessibleGridControlHeader::grabFocus()
 // XAccessibleTable -----------------------------------------------------------
 
 OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_Int32 nRow )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -123,7 +118,6 @@ OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_
 }
 
 OUString SAL_CALL AccessibleGridControlHeader::getAccessibleColumnDescription( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -133,7 +127,6 @@ OUString SAL_CALL AccessibleGridControlHeader::getAccessibleColumnDescription( s
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibleRowHeaders()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -142,7 +135,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibl
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibleColumnHeaders()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -151,27 +143,23 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibl
 }
 //not selectable
 Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleRows()
-    throw ( uno::RuntimeException, std::exception )
 {
     Sequence< sal_Int32 > aSelSeq(0);
     return aSelSeq;
 }
 //columns aren't selectable
 Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleColumns()
-    throw ( uno::RuntimeException, std::exception )
 {
     Sequence< sal_Int32 > aSelSeq(0);
     return aSelSeq;
 }
 //row headers not selectable
 sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleRowSelected( sal_Int32 /*nRow*/ )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     return false;
 }
 //columns aren't selectable
 sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleColumnSelected( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     (void)nColumn;
     return false;
@@ -179,14 +167,12 @@ sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleColumnSelected( sal_I
 //not implemented
 Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleCellAt(
         sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     return nullptr;
 }
 // not selectable
 sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected(
         sal_Int32 /*nRow*/, sal_Int32 /*nColumn */)
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     return false;
 }
@@ -194,13 +180,11 @@ sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected(
 // XServiceInfo ---------------------------------------------------------------
 
 OUString SAL_CALL AccessibleGridControlHeader::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.accessibility.AccessibleGridControlHeader" );
 }
 
 Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId()
-    throw ( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index 8d9825936692..49a84aa0d356 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -72,7 +72,6 @@ AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nCol
         The count of visible children.
 */
 sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount()
-    throw ( RuntimeException, std::exception )
 {
     return 0;
 }
@@ -82,7 +81,6 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount()
         The XAccessible interface of the specified child.
 */
 Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChild( sal_Int32 )
-    throw ( IndexOutOfBoundsException,RuntimeException, std::exception )
 {
     throw IndexOutOfBoundsException();
 }
@@ -90,7 +88,6 @@ Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC
 
     /** Queries for a new interface. */
     css::uno::Any SAL_CALL AccessibleGridControlHeaderCell::queryInterface( const css::uno::Type& rType )
-        throw ( css::uno::RuntimeException, std::exception )
     {
         Any aRet = AccessibleGridControlCell::queryInterface(rType);
         return aRet;
@@ -108,7 +105,7 @@ Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC
         AccessibleGridControlCell::release();
     }
         /** @return  The XAccessibleContext interface of this object. */
-    Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleContext() throw ( RuntimeException, std::exception )
+    Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleContext()
     {
         ensureIsAlive();
         return this;
@@ -117,7 +114,6 @@ Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC
 
 /** Grabs the focus to the column header. */
 void SAL_CALL AccessibleGridControlHeaderCell::grabFocus()
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
@@ -125,7 +121,6 @@ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus()
         The name of this class.
 */
 OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.accessibility.AccessibleGridControlHeaderCell" );
 }
@@ -157,7 +152,6 @@ Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent()
-    throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 38a04749c0ec..68262003f0f9 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -52,7 +52,6 @@ AccessibleGridControlTable::~AccessibleGridControlTable()
 
 Reference< XAccessible > SAL_CALL
 AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -74,7 +73,6 @@ AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex )
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlTable::getAccessibleIndexInParent()
-    throw ( uno::RuntimeException, std::exception )
 {
     ensureIsAlive();
     if(m_aTable.HasRowHeader() && m_aTable.HasColHeader())
@@ -89,7 +87,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTable::getAccessibleIndexInParent()
 
 Reference< XAccessible > SAL_CALL
 AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -104,7 +101,6 @@ AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint )
 }
 
 void SAL_CALL AccessibleGridControlTable::grabFocus()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -115,7 +111,6 @@ void SAL_CALL AccessibleGridControlTable::grabFocus()
 // XAccessibleTable -----------------------------------------------------------
 
 OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_Int32 nRow )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -125,7 +120,6 @@ OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_I
 }
 
 OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -135,7 +129,6 @@ OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sa
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessibleRowHeaders()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -147,7 +140,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessible
 }
 
 Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessibleColumnHeaders()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -156,7 +148,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessible
 }
 
 Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleRows()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -168,14 +159,12 @@ Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessible
 
 //columns aren't selectable
 Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleColumns()
-    throw ( uno::RuntimeException, std::exception )
 {
     Sequence< sal_Int32 > aSelSeq(0);
     return aSelSeq;
 }
 
 sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleRowSelected( sal_Int32 nRow )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -196,7 +185,6 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleRowSelected( sal_Int32
 
 //columns aren't selectable
 sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleColumnSelected( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     (void) nColumn;
     return false;
@@ -204,7 +192,6 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleColumnSelected( sal_In
 
 Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleCellAt(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -228,7 +215,6 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleCellA
 
 sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -239,7 +225,6 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected(
     return isAccessibleRowSelected(nRow);
 }
 void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -250,7 +235,6 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil
     m_aTable.SelectRow( nRow, true );
 }
 sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -261,7 +245,6 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int
     return isAccessibleRowSelected(nRow);
 }
 void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -269,7 +252,6 @@ void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection()
     m_aTable.SelectAllRows( false );
 }
 void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -279,7 +261,6 @@ void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
         selectedRows[i]=i;
 }
 sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -290,7 +271,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount()
 }
 Reference< XAccessible > SAL_CALL
 AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -303,7 +283,6 @@ AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChild
 //not implemented yet, because only row selection possible
 void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild(
         sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -313,7 +292,6 @@ void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild(
 // XInterface -----------------------------------------------------------------
 
 Any SAL_CALL AccessibleGridControlTable::queryInterface( const uno::Type& rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     Any aAny( AccessibleGridControlTableBase::queryInterface( rType ) );
     return aAny.hasValue() ?
@@ -332,7 +310,6 @@ void SAL_CALL AccessibleGridControlTable::release() throw ()
 // XServiceInfo ---------------------------------------------------------------
 
 OUString SAL_CALL AccessibleGridControlTable::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.accessibility.AccessibleGridControlTable" );
 }
@@ -367,7 +344,6 @@ Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
 // internal helper methods ----------------------------------------------------
 Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar(
         sal_Int32 nChildIndex )
-    throw ( uno::RuntimeException )
 {
     Reference< XAccessible > xRet;
     Reference< XAccessibleContext > xContext( m_xParent, uno::UNO_QUERY );
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index 0a3e09008f6f..acf58c091cd9 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -52,7 +52,6 @@ AccessibleGridControlTableBase::~AccessibleGridControlTableBase()
 // XAccessibleContext ---------------------------------------------------------
 
 sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -68,7 +67,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount()
 }
 
 sal_Int16 SAL_CALL AccessibleGridControlTableBase::getAccessibleRole()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -79,7 +77,6 @@ sal_Int16 SAL_CALL AccessibleGridControlTableBase::getAccessibleRole()
 // XAccessibleTable -----------------------------------------------------------
 
 sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -88,7 +85,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount()
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -98,7 +94,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount()
 
 sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowExtentAt(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -109,7 +104,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowExtentAt(
 
 sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnExtentAt(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -119,7 +113,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnExtentAt(
 }
 
 Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleCaption()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -128,7 +121,6 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleC
 }
 
 Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleSummary()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -138,7 +130,6 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleS
 
 sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -148,7 +139,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex(
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -158,7 +148,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 n
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -170,7 +159,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int3
 // XInterface -----------------------------------------------------------------
 
 Any SAL_CALL AccessibleGridControlTableBase::queryInterface( const uno::Type& rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     Any aAny( GridControlAccessibleElement::queryInterface( rType ) );
     return aAny.hasValue() ?
@@ -190,7 +178,6 @@ void SAL_CALL AccessibleGridControlTableBase::release() throw ()
 // XTypeProvider --------------------------------------------------------------
 
 Sequence< uno::Type > SAL_CALL AccessibleGridControlTableBase::getTypes()
-    throw ( uno::RuntimeException, std::exception )
 {
     return ::comphelper::concatSequences(
         GridControlAccessibleElement::getTypes(),
@@ -198,7 +185,6 @@ Sequence< uno::Type > SAL_CALL AccessibleGridControlTableBase::getTypes()
 }
 
 Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationId()
-    throw ( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -226,7 +212,6 @@ void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >&
 }
 
 void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow )
-    throw ( lang::IndexOutOfBoundsException )
 {
     if( nRow >= m_aTable.GetRowCount() )
         throw lang::IndexOutOfBoundsException(
@@ -234,7 +219,6 @@ void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow )
 }
 
 void AccessibleGridControlTableBase::ensureIsValidColumn( sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException )
 {
     if( nColumn >= m_aTable.GetColumnCount() )
         throw lang::IndexOutOfBoundsException(
@@ -243,14 +227,12 @@ void AccessibleGridControlTableBase::ensureIsValidColumn( sal_Int32 nColumn )
 
 void AccessibleGridControlTableBase::ensureIsValidAddress(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw ( lang::IndexOutOfBoundsException )
 {
     ensureIsValidRow( nRow );
     ensureIsValidColumn( nColumn );
 }
 
 void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException )
 {
     if( nChildIndex >= m_aTable.GetRowCount()*m_aTable.GetColumnCount() )
         throw lang::IndexOutOfBoundsException(
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 016eea27fc5b..55378092f535 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -31,7 +31,7 @@ namespace accessibility
         // FIXME this is a copy'n'paste from
         // source/extended/AccessibleBrowseBoxTableCell.cxx, get rid of that...
         /// @throws css::lang::IndexOutOfBoundsException
-        void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException)
+        void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText )
         {
             if ( _nIndex >= _sText.getLength() )
                 throw css::lang::IndexOutOfBoundsException();
@@ -75,7 +75,7 @@ namespace accessibility
     }
 
 
-    void SAL_CALL AccessibleGridControlCell::grabFocus() throw ( RuntimeException, std::exception )
+    void SAL_CALL AccessibleGridControlCell::grabFocus()
     {
         SolarMutexGuard aSolarGuard;
 
@@ -114,7 +114,6 @@ namespace accessibility
     /** Queries for a new interface. */
     css::uno::Any SAL_CALL AccessibleGridControlTableCell::queryInterface(
             const css::uno::Type& rType )
-        throw ( css::uno::RuntimeException, std::exception )
     {
         Any aRet = AccessibleGridControlCell::queryInterface(rType);
         if ( !aRet.hasValue() )
@@ -134,7 +133,7 @@ namespace accessibility
         AccessibleGridControlCell::release();
     }
 
-    css::awt::Rectangle SAL_CALL AccessibleGridControlTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    css::awt::Rectangle SAL_CALL AccessibleGridControlTableCell::getCharacterBounds( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
 
@@ -145,7 +144,7 @@ namespace accessibility
         return AWTRectangle( m_aTable.GetFieldCharacterBounds( getRowPos(), getColumnPos(), nIndex ) );
     }
 
-    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const css::awt::Point& _aPoint ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const css::awt::Point& _aPoint )
     {
         SolarMutexGuard aSolarGuard;
 
@@ -158,22 +157,18 @@ namespace accessibility
             The name of this class.
     */
     OUString SAL_CALL AccessibleGridControlTableCell::getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception )
     {
         return OUString( "com.sun.star.accessibility.AccessibleGridControlTableCell" );
     }
 
     /** @return  The count of visible children. */
     sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleChildCount()
-        throw ( css::uno::RuntimeException, std::exception )
     {
         return 0;
     }
 
     /** @return  The css::accessibility::XAccessible interface of the specified child. */
     css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControlTableCell::getAccessibleChild( sal_Int32 )
-            throw ( css::lang::IndexOutOfBoundsException,
-                    css::uno::RuntimeException, std::exception )
     {
         throw css::lang::IndexOutOfBoundsException();
     }
@@ -205,7 +200,7 @@ namespace accessibility
     // css::accessibility::XAccessible
 
     /** @return  The css::accessibility::XAccessibleContext interface of this object. */
-    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlTableCell::getAccessibleContext() throw ( RuntimeException, std::exception )
+    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlTableCell::getAccessibleContext()
     {
         SolarMutexGuard g;
 
@@ -216,7 +211,6 @@ namespace accessibility
     // css::accessibility::XAccessibleContext
 
     sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleIndexInParent()
-            throw ( css::uno::RuntimeException, std::exception )
     {
         SolarMutexGuard aSolarGuard;
 
@@ -225,11 +219,11 @@ namespace accessibility
         return ( getRowPos() * m_aTable.GetColumnCount() ) + getColumnPos();
     }
 
-    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCaretPosition(  )
     {
         return -1;
     }
-    sal_Bool SAL_CALL AccessibleGridControlTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleGridControlTableCell::setCaretPosition ( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
 
@@ -238,13 +232,13 @@ namespace accessibility
 
         return false;
     }
-    sal_Unicode SAL_CALL AccessibleGridControlTableCell::getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Unicode SAL_CALL AccessibleGridControlTableCell::getCharacter( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getCharacter( nIndex );
     }
-    css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& )
     {
         SolarMutexGuard aSolarGuard;
 
@@ -255,32 +249,32 @@ namespace accessibility
 
         return css::uno::Sequence< css::beans::PropertyValue >();
     }
-    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCharacterCount(  )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getCharacterCount(  );
     }
 
-    OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText(  )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getSelectedText(  );
     }
-    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart(  )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getSelectionStart(  );
     }
-    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd(  )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getSelectionEnd(  );
     }
-    sal_Bool SAL_CALL AccessibleGridControlTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleGridControlTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aSolarGuard;
 
@@ -289,37 +283,37 @@ namespace accessibility
 
         return false;
     }
-    OUString SAL_CALL AccessibleGridControlTableCell::getText(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleGridControlTableCell::getText(  )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getText(  );
     }
-    OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType);
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType);
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aSolarGuard;
 
         return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType);
     }
-    sal_Bool SAL_CALL AccessibleGridControlTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleGridControlTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aSolarGuard;
 
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index 576f00816192..099dde455ee7 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -48,7 +48,7 @@ namespace accessibility
     {
     }
 
-    void SAL_CALL AccessibleBrowseBoxCell::grabFocus() throw ( RuntimeException, std::exception )
+    void SAL_CALL AccessibleBrowseBoxCell::grabFocus()
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 2ce764c93ee2..acb2935f3d8a 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -58,7 +58,7 @@ namespace accessibility
         }
     }
 
-    OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() throw ( css::uno::RuntimeException, std::exception )
+    OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.TableCellProxy" );
     }
@@ -67,13 +67,13 @@ namespace accessibility
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( EditBrowseBoxTableCell, AccessibleBrowseBoxCell, OAccessibleContextWrapperHelper )
 
-    void EditBrowseBoxTableCell::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException)
+    void EditBrowseBoxTableCell::notifyTranslatedEvent( const AccessibleEventObject& _rEvent )
     {
         commitEvent( _rEvent.EventId, _rEvent.NewValue, _rEvent.OldValue );
     }
 
     // css::accessibility::XAccessibleComponent
-    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground(  )
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -84,7 +84,7 @@ namespace accessibility
         return 0;
     }
 
-    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground(  )
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -95,12 +95,12 @@ namespace accessibility
         return 0;
     }
 
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent(  )
     {
         return m_xParentAccessible;
     }
 
-    OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException, std::exception )
+    OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription()
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -108,7 +108,7 @@ namespace accessibility
         return m_xInnerContext->getAccessibleDescription();
     }
 
-    OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() throw ( RuntimeException, std::exception )
+    OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName()
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -117,7 +117,7 @@ namespace accessibility
                + TK_RES_STRING(RID_STR_ACC_ROW_NUM).replaceAll("%ROWNUMBER", OUString::number(getRowPos()));
     }
 
-    css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException, std::exception )
+    css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet()
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -125,7 +125,7 @@ namespace accessibility
         return baseGetAccessibleRelationSet( );
     }
 
-    css::uno::Reference<css::accessibility::XAccessibleStateSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException, std::exception )
+    css::uno::Reference<css::accessibility::XAccessibleStateSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet()
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -134,7 +134,7 @@ namespace accessibility
             // TODO: shouldn't we add an ACTIVE here? Isn't the EditBrowseBoxTableCell always ACTIVE?
     }
 
-    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount(  )
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -142,7 +142,7 @@ namespace accessibility
         return baseGetAccessibleChildCount();
     }
 
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i )
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -150,7 +150,7 @@ namespace accessibility
         return baseGetAccessibleChild( i );
     }
 
-    sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole() throw ( RuntimeException, std::exception )
+    sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole()
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
@@ -158,7 +158,7 @@ namespace accessibility
         return m_xInnerContext->getAccessibleRole( );
     }
 
-    void SAL_CALL EditBrowseBoxTableCell::dispose() throw( RuntimeException, std::exception )
+    void SAL_CALL EditBrowseBoxTableCell::dispose()
     {
         // simply disambiguate. Note that the OComponentHelper base in AccessibleBrowseBoxCell
         // will call our "disposing()", which will call "dispose()" on the OAccessibleContextWrapperHelper
@@ -166,7 +166,7 @@ namespace accessibility
         AccessibleBrowseBoxCell::dispose();
     }
 
-    void SAL_CALL EditBrowseBoxTableCell::disposing( const css::lang::EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL EditBrowseBoxTableCell::disposing( const css::lang::EventObject& _rSource )
     {
         AccessibleBrowseBoxCell::disposing( _rSource );
         OAccessibleContextWrapperHelper::disposing( _rSource );
@@ -200,7 +200,7 @@ namespace accessibility
     {
     }
 
-    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext(  )
     {
         if ( !m_pBrowseBox || !m_xControlAccessible.is() )
             throw DisposedException();
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 21c4a4a7889d..901adda5ce18 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -127,26 +127,26 @@ namespace accessibility
 
     // XServiceInfo
 
-    OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControl" );
     }
 
-    Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames()
     {
         return {"com.sun.star.accessibility.AccessibleContext",
                 "com.sun.star.accessibility.AccessibleComponent",
                 "com.sun.star.awt.AccessibleIconChoiceControl"};
     }
 
-    sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
     // XAccessible
 
-    Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext(  )
     {
         ensureAlive();
         return this;
@@ -154,7 +154,7 @@ namespace accessibility
 
     // XAccessibleContext
 
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -162,7 +162,7 @@ namespace accessibility
         return getCtrl()->GetEntryCount();
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, IndexOutOfBoundsException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -175,7 +175,7 @@ namespace accessibility
         return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this );
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleParent(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -183,13 +183,13 @@ namespace accessibility
         return m_xParent;
     }
 
-    sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole(  )
     {
         //return AccessibleRole::TREE;
         return AccessibleRole::LIST;
     }
 
-    OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -197,7 +197,7 @@ namespace accessibility
         return getCtrl()->GetAccessibleDescription();
     }
 
-    OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -211,7 +211,7 @@ namespace accessibility
 
     // XAccessibleSelection
 
-    void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -225,7 +225,7 @@ namespace accessibility
         pCtrl->SetCursor( pEntry );
     }
 
-    sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -239,7 +239,7 @@ namespace accessibility
         return ( pCtrl->GetCursor() == pEntry );
     }
 
-    void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -247,7 +247,7 @@ namespace accessibility
         getCtrl()->SetNoSelection();
     }
 
-    void SAL_CALL AccessibleIconChoiceCtrl::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleIconChoiceCtrl::selectAllAccessibleChildren(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -263,7 +263,7 @@ namespace accessibility
         }
     }
 
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -282,7 +282,7 @@ namespace accessibility
         return nSelCount;
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -311,7 +311,7 @@ namespace accessibility
         return xChild;
     }
 
-    void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index ba08bff38279..05d03deccc4f 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -43,7 +43,7 @@
 namespace
 {
     /// @throws css::lang::IndexOutOfBoundsException
-    void checkActionIndex_Impl( sal_Int32 _nIndex ) throw (css::lang::IndexOutOfBoundsException)
+    void checkActionIndex_Impl( sal_Int32 _nIndex )
     {
         if ( _nIndex < 0 || _nIndex >= ACCESSIBLE_ACTION_COUNT )
             // only three actions
@@ -87,7 +87,6 @@ namespace accessibility
     }
 
     void AccessibleIconChoiceCtrlEntry::disposing( const css::lang::EventObject& _rSource )
-throw(RuntimeException, std::exception)
     {
         if ( _rSource.Source == m_xParent )
         {
@@ -152,7 +151,6 @@ throw(RuntimeException, std::exception)
     }
 
     Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox()
-        throw (lang::DisposedException, uno::RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -162,7 +160,6 @@ throw(RuntimeException, std::exception)
     }
 
     Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen()
-        throw (lang::DisposedException, uno::RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -171,7 +168,7 @@ throw(RuntimeException, std::exception)
         return GetBoundingBoxOnScreen_Impl();
     }
 
-    void AccessibleIconChoiceCtrlEntry::EnsureIsAlive() const throw ( lang::DisposedException )
+    void AccessibleIconChoiceCtrlEntry::EnsureIsAlive() const
     {
         if ( !IsAlive_Impl() )
             throw lang::DisposedException();
@@ -202,7 +199,7 @@ throw(RuntimeException, std::exception)
     // XTypeProvider
 
 
-    Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId() throw (RuntimeException, std::exception)
+    Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId()
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -231,26 +228,26 @@ throw(RuntimeException, std::exception)
 
     // XServiceInfo
 
-    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControlEntry" );
     }
 
-    Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames()
     {
         return {"com.sun.star.accessibility.AccessibleContext",
                 "com.sun.star.accessibility.AccessibleComponent",
                 "com.sun.star.awt.AccessibleIconChoiceControlEntry"};
     }
 
-    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
     // XAccessible
 
-    Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleContext(  )
     {
         EnsureIsAlive();
         return this;
@@ -258,17 +255,17 @@ throw(RuntimeException, std::exception)
 
     // XAccessibleContext
 
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount(  )
     {
         return 0; // no children
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException,RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 )
     {
         throw IndexOutOfBoundsException();
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleParent(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -276,26 +273,26 @@ throw(RuntimeException, std::exception)
         return m_xParent;
     }
 
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return m_nIndex;
     }
 
-    sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole(  )
     {
         //return AccessibleRole::LABEL;
         return AccessibleRole::LIST_ITEM;
     }
 
-    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription(  )
     {
         // no description for every item
         return OUString();
     }
 
-    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -303,12 +300,12 @@ throw(RuntimeException, std::exception)
         return implGetText();
     }
 
-    Reference< XAccessibleRelationSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRelationSet(  )
     {
         return new utl::AccessibleRelationSetHelper;
     }
 
-    Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -337,7 +334,7 @@ throw(RuntimeException, std::exception)
         return xStateSet;
     }
 
-    Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+    Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -347,42 +344,42 @@ throw(RuntimeException, std::exception)
 
     // XAccessibleComponent
 
-    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint )
     {
         return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& )
     {
         return Reference< XAccessible >();
     }
 
-    awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getBounds(  ) throw (RuntimeException, std::exception)
+    awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getBounds(  )
     {
         return AWTRectangle( GetBoundingBox() );
     }
 
-    awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocation(  ) throw (RuntimeException, std::exception)
+    awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocation(  )
     {
         return AWTPoint( GetBoundingBox().TopLeft() );
     }
 
-    awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen(  ) throw (RuntimeException, std::exception)
+    awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen(  )
     {
         return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
     }
 
-    awt::Size SAL_CALL AccessibleIconChoiceCtrlEntry::getSize(  ) throw (RuntimeException, std::exception)
+    awt::Size SAL_CALL AccessibleIconChoiceCtrlEntry::getSize(  )
     {
         return AWTSize( GetBoundingBox().GetSize() );
     }
 
-    void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus(  )
     {
         // do nothing, because no focus for each item
     }
 
-    sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -399,7 +396,7 @@ throw(RuntimeException, std::exception)
         return nColor;
     }
 
-    sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -419,7 +416,7 @@ throw(RuntimeException, std::exception)
     // XAccessibleText
 
 
-    awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -439,7 +436,7 @@ throw(RuntimeException, std::exception)
         return aBounds;
     }
 
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -468,7 +465,7 @@ throw(RuntimeException, std::exception)
         return nIndex;
     }
 
-    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -486,7 +483,7 @@ throw(RuntimeException, std::exception)
 
     // XAccessibleEventBroadcaster
 
-    void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     {
         if (xListener.is())
         {
@@ -497,7 +494,7 @@ throw(RuntimeException, std::exception)
         }
     }
 
-    void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     {
         if (xListener.is())
         {
@@ -517,11 +514,11 @@ throw(RuntimeException, std::exception)
         }
     }
 
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCaretPosition(  )
     {
         return -1;
     }
-    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setCaretPosition ( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -532,14 +529,14 @@ throw(RuntimeException, std::exception)
 
         return false;
     }
-    sal_Unicode SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Unicode SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacter( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getCharacter( nIndex );
     }
-    css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -552,7 +549,7 @@ throw(RuntimeException, std::exception)
 
         return css::uno::Sequence< css::beans::PropertyValue >();
     }
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterCount(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -560,28 +557,28 @@ throw(RuntimeException, std::exception)
         return OCommonAccessibleText::getCharacterCount(  );
     }
 
-    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getSelectedText(  );
     }
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionStart(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getSelectionStart(  );
     }
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionEnd(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getSelectionEnd(  );
     }
-    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -592,35 +589,35 @@ throw(RuntimeException, std::exception)
 
         return false;
     }
-    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getText(  );
     }
-    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType);
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType);
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -632,7 +629,7 @@ throw(RuntimeException, std::exception)
 
     // XAccessibleAction
 
-    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionCount(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -640,7 +637,7 @@ throw(RuntimeException, std::exception)
         return ACCESSIBLE_ACTION_COUNT;
     }
 
-    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -660,7 +657,7 @@ throw(RuntimeException, std::exception)
         return bRet;
     }
 
-    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -671,7 +668,7 @@ throw(RuntimeException, std::exception)
         return OUString( "Select" );
     }
 
-    Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 2cb64e3814bb..b88cc9a58ec0 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -317,26 +317,26 @@ namespace accessibility
 
     // XServiceInfo
 
-    OUString SAL_CALL AccessibleListBox::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBox::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBox" );
     }
 
-    Sequence< OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames()
     {
         return {"com.sun.star.accessibility.AccessibleContext",
                 "com.sun.star.accessibility.AccessibleComponent",
                 "com.sun.star.awt.AccessibleTreeListBox"};
     }
 
-    sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
     // XAccessible
 
-    Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext(  )
     {
         ensureAlive();
         return this;
@@ -344,7 +344,7 @@ namespace accessibility
 
     // XAccessibleContext
 
-    sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -358,7 +358,7 @@ namespace accessibility
         return nCount;
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -372,7 +372,7 @@ namespace accessibility
         return new AccessibleListBoxEntry( *getListBox(), pEntry, nullptr );
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -410,7 +410,6 @@ namespace accessibility
     }
 
     sal_Int16 SAL_CALL AccessibleListBox::getAccessibleRole()
-        throw (RuntimeException, std::exception)
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -434,7 +433,7 @@ namespace accessibility
             return AccessibleRole::TREE;
     }
 
-    OUString SAL_CALL AccessibleListBox::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBox::getAccessibleDescription(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -442,7 +441,7 @@ namespace accessibility
         return getListBox()->GetAccessibleDescription();
     }
 
-    OUString SAL_CALL AccessibleListBox::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBox::getAccessibleName(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -452,7 +451,7 @@ namespace accessibility
 
     // XAccessibleSelection
 
-    void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -465,7 +464,7 @@ namespace accessibility
         getListBox()->Select( pEntry );
     }
 
-    sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -478,7 +477,7 @@ namespace accessibility
         return getListBox()->IsSelected( pEntry );
     }
 
-    void SAL_CALL AccessibleListBox::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBox::clearAccessibleSelection(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -493,7 +492,7 @@ namespace accessibility
         }
     }
 
-    void SAL_CALL AccessibleListBox::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBox::selectAllAccessibleChildren(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -508,7 +507,7 @@ namespace accessibility
         }
     }
 
-    sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount(  )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -517,7 +516,7 @@ namespace accessibility
         return getListBox()->GetSelectionCount();
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
@@ -547,7 +546,7 @@ namespace accessibility
         return xChild;
     }
 
-    void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         ::comphelper::OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index ba5500f93ca3..40431c7699b4 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -48,7 +48,7 @@
 namespace
 {
     /// @throws css::lang::IndexOutOfBoundsException
-    void checkActionIndex_Impl( sal_Int32 _nIndex ) throw (css::lang::IndexOutOfBoundsException)
+    void checkActionIndex_Impl( sal_Int32 _nIndex )
     {
         if ( _nIndex < 0 || _nIndex >= ACCESSIBLE_ACTION_COUNT )
             // only three actions
@@ -165,7 +165,6 @@ namespace accessibility
     }
 
     Rectangle AccessibleListBoxEntry::GetBoundingBox()
-        throw (lang::DisposedException, uno::RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -175,7 +174,6 @@ namespace accessibility
     }
 
     Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen()
-        throw (lang::DisposedException, uno::RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -184,7 +182,7 @@ namespace accessibility
         return GetBoundingBoxOnScreen_Impl();
     }
 
-    void AccessibleListBoxEntry::EnsureIsAlive() const throw ( lang::DisposedException )
+    void AccessibleListBoxEntry::EnsureIsAlive() const
     {
         if ( !IsAlive_Impl() )
             throw lang::DisposedException();
@@ -215,7 +213,7 @@ namespace accessibility
     // XTypeProvider
 
 
-    Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() throw (RuntimeException, std::exception)
+    Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId()
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -223,7 +221,7 @@ namespace accessibility
 
     // XComponent/ListBoxAccessibleBase
 
-    void SAL_CALL AccessibleListBoxEntry::dispose() throw ( uno::RuntimeException, std::exception )
+    void SAL_CALL AccessibleListBoxEntry::dispose()
     {
         AccessibleListBoxEntry_BASE::dispose();
     }
@@ -256,26 +254,26 @@ namespace accessibility
 
     // XServiceInfo
 
-    OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBoxEntry::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBoxEntry" );
     }
 
-    Sequence< OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames()
     {
         return {"com.sun.star.accessibility.AccessibleContext",
                 "com.sun.star.accessibility.AccessibleComponent",
                 "com.sun.star.awt.AccessibleTreeListBoxEntry"};
     }
 
-    sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
     // XAccessible
 
-    Reference< XAccessibleContext > SAL_CALL AccessibleListBoxEntry::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleContext > SAL_CALL AccessibleListBoxEntry::getAccessibleContext(  )
     {
         EnsureIsAlive();
         return this;
@@ -283,7 +281,7 @@ namespace accessibility
 
     // XAccessibleContext
 
-    sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -297,7 +295,7 @@ namespace accessibility
         return nCount;
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -348,7 +346,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -357,7 +355,7 @@ namespace accessibility
         return implGetParentAccessible( );
     }
 
-    sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -394,7 +392,7 @@ namespace accessibility
         return nCase;
     }
 
-    sal_Int16 SAL_CALL AccessibleListBoxEntry::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL AccessibleListBoxEntry::getAccessibleRole(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -432,7 +430,7 @@ namespace accessibility
         return AccessibleRole::UNKNOWN;
     }
 
-    OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -466,7 +464,7 @@ namespace accessibility
         }
     }
 
-    OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -486,7 +484,7 @@ namespace accessibility
         return sRet;
     }
 
-    Reference< XAccessibleRelationSet > SAL_CALL AccessibleListBoxEntry::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > SAL_CALL AccessibleListBoxEntry::getAccessibleRelationSet(  )
     {
         Reference< XAccessibleRelationSet > xRelSet;
         Reference< XAccessible > xParent;
@@ -503,7 +501,7 @@ namespace accessibility
         return xRelSet;
     }
 
-    Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -541,7 +539,7 @@ namespace accessibility
         return xStateSet;
     }
 
-    Locale SAL_CALL AccessibleListBoxEntry::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+    Locale SAL_CALL AccessibleListBoxEntry::getLocale(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -551,12 +549,12 @@ namespace accessibility
 
     // XAccessibleComponent
 
-    sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint )
     {
         return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -574,32 +572,32 @@ namespace accessibility
         return xAcc;
     }
 
-    awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds(  ) throw (RuntimeException, std::exception)
+    awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds(  )
     {
         return AWTRectangle( GetBoundingBox() );
     }
 
-    awt::Point SAL_CALL AccessibleListBoxEntry::getLocation(  ) throw (RuntimeException, std::exception)
+    awt::Point SAL_CALL AccessibleListBoxEntry::getLocation(  )
     {
         return AWTPoint( GetBoundingBox().TopLeft() );
     }
 
-    awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen(  ) throw (RuntimeException, std::exception)
+    awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen(  )
     {
         return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
     }
 
-    awt::Size SAL_CALL AccessibleListBoxEntry::getSize(  ) throw (RuntimeException, std::exception)
+    awt::Size SAL_CALL AccessibleListBoxEntry::getSize(  )
     {
         return AWTSize( GetBoundingBox().GetSize() );
     }
 
-    void SAL_CALL AccessibleListBoxEntry::grabFocus(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBoxEntry::grabFocus(  )
     {
         // do nothing, because no focus for each item
     }
 
-    sal_Int32 AccessibleListBoxEntry::getForeground(    ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleListBoxEntry::getForeground(    )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -616,7 +614,7 @@ namespace accessibility
         return nColor;
     }
 
-    sal_Int32 AccessibleListBoxEntry::getBackground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleListBoxEntry::getBackground(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -636,7 +634,7 @@ namespace accessibility
     // XAccessibleText
 
 
-    awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -661,7 +659,7 @@ namespace accessibility
         return aBounds;
     }
 
-    sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -683,7 +681,7 @@ namespace accessibility
         return nIndex;
     }
 
-    sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -702,7 +700,7 @@ namespace accessibility
 
     // XAccessibleEventBroadcaster
 
-    void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     {
         if (xListener.is())
         {
@@ -713,7 +711,7 @@ namespace accessibility
         }
     }
 
-    void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     {
         if (xListener.is())
         {
@@ -736,7 +734,7 @@ namespace accessibility
 
     // XAccessibleAction
 
-    sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleActionCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleActionCount(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -757,7 +755,7 @@ namespace accessibility
         return 0;
     }
 
-    sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -795,7 +793,7 @@ namespace accessibility
         return bRet;
     }
 
-    OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -833,7 +831,7 @@ namespace accessibility
         throw IndexOutOfBoundsException();
     }
 
-    Reference< XAccessibleKeyBinding > AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessibleKeyBinding > AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -845,7 +843,7 @@ namespace accessibility
 
     // XAccessibleSelection
 
-    void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -859,7 +857,7 @@ namespace accessibility
         getListBox()->Select( pEntry );
     }
 
-    sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -874,7 +872,7 @@ namespace accessibility
         return getListBox()->IsSelected( pEntry );
     }
 
-    void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -893,7 +891,7 @@ namespace accessibility
         }
     }
 
-    void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -912,7 +910,7 @@ namespace accessibility
         }
     }
 
-    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -935,7 +933,7 @@ namespace accessibility
         return nSelCount;
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -968,7 +966,7 @@ namespace accessibility
         return xChild;
     }
 
-    void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -982,11 +980,11 @@ namespace accessibility
 
         getListBox()->Select( pEntry, false );
     }
-    sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition(  )
     {
         return -1;
     }
-    sal_Bool SAL_CALL AccessibleListBoxEntry::setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleListBoxEntry::setCaretPosition ( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -997,14 +995,14 @@ namespace accessibility
 
         return false;
     }
-    sal_Unicode SAL_CALL AccessibleListBoxEntry::getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Unicode SAL_CALL AccessibleListBoxEntry::getCharacter( sal_Int32 nIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getCharacter( nIndex );
     }
-    css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1017,7 +1015,7 @@ namespace accessibility
 
         return css::uno::Sequence< css::beans::PropertyValue >();
     }
-    sal_Int32 SAL_CALL AccessibleListBoxEntry::getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getCharacterCount(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1025,28 +1023,28 @@ namespace accessibility
         return OCommonAccessibleText::getCharacterCount(  );
     }
 
-    OUString SAL_CALL AccessibleListBoxEntry::getSelectedText(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBoxEntry::getSelectedText(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getSelectedText(  );
     }
-    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionStart(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getSelectionStart(  );
     }
-    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionEnd(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getSelectionEnd(  );
     }
-    sal_Bool SAL_CALL AccessibleListBoxEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleListBoxEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1057,35 +1055,35 @@ namespace accessibility
 
         return false;
     }
-    OUString SAL_CALL AccessibleListBoxEntry::getText(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBoxEntry::getText(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getText(  );
     }
-    OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType);
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
         return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType);
     }
-    css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1097,7 +1095,7 @@ namespace accessibility
     // XAccessibleValue
 
 
-    Any AccessibleListBoxEntry::getCurrentValue(  ) throw (RuntimeException, std::exception)
+    Any AccessibleListBoxEntry::getCurrentValue(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Any aValue;
@@ -1108,7 +1106,7 @@ namespace accessibility
     }
 
 
-    sal_Bool AccessibleListBoxEntry::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception)
+    sal_Bool AccessibleListBoxEntry::setCurrentValue( const Any& aNumber )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1139,7 +1137,7 @@ namespace accessibility
     }
 
 
-    Any AccessibleListBoxEntry::getMaximumValue(  ) throw (RuntimeException, std::exception)
+    Any AccessibleListBoxEntry::getMaximumValue(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1159,7 +1157,7 @@ namespace accessibility
     }
 
 
-    Any AccessibleListBoxEntry::getMinimumValue(  ) throw (RuntimeException, std::exception)
+    Any AccessibleListBoxEntry::getMinimumValue(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 431dbd05f786..2e00081c2357 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -145,7 +145,7 @@ namespace accessibility
     // OCommonAccessibleComponent
 
 
-    awt::Rectangle AccessibleTabBar::implGetBounds() throw (RuntimeException)
+    awt::Rectangle AccessibleTabBar::implGetBounds()
     {
         awt::Rectangle aBounds;
         if ( m_pTabBar )
@@ -188,19 +188,19 @@ namespace accessibility
     // XServiceInfo
 
 
-    OUString AccessibleTabBar::getImplementationName() throw (RuntimeException, std::exception)
+    OUString AccessibleTabBar::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTabBar" );
     }
 
 
-    sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
 
-    Sequence< OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > AccessibleTabBar::getSupportedServiceNames()
     {
         return  { "com.sun.star.awt.AccessibleTabBar" };
     }
@@ -209,7 +209,7 @@ namespace accessibility
     // XAccessible
 
 
-    Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -220,7 +220,7 @@ namespace accessibility
     // XAccessibleContext
 
 
-    sal_Int32 AccessibleTabBar::getAccessibleChildCount() throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBar::getAccessibleChildCount()
     {
         OExternalLockGuard aGuard( this );
 
@@ -228,7 +228,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i )
     {
         OExternalLockGuard aGuard( this );
 
@@ -262,7 +262,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessible > AccessibleTabBar::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBar::getAccessibleParent(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -278,7 +278,7 @@ namespace accessibility
     }
 
 
-    sal_Int32 AccessibleTabBar::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBar::getAccessibleIndexInParent(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -304,7 +304,7 @@ namespace accessibility
     }
 
 
-    sal_Int16 AccessibleTabBar::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 AccessibleTabBar::getAccessibleRole(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -312,7 +312,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBar::getAccessibleDescription( )
     {
         OExternalLockGuard aGuard( this );
 
@@ -324,7 +324,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBar::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBar::getAccessibleName(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -336,7 +336,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -346,7 +346,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -366,7 +366,7 @@ namespace accessibility
     }
 
 
-    Locale AccessibleTabBar::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+    Locale AccessibleTabBar::getLocale(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -377,7 +377,7 @@ namespace accessibility
     // XAccessibleComponent
 
 
-    Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint )
     {
         OExternalLockGuard aGuard( this );
 
@@ -405,7 +405,7 @@ namespace accessibility
     }
 
 
-    void AccessibleTabBar::grabFocus(  ) throw (RuntimeException, std::exception)
+    void AccessibleTabBar::grabFocus(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -414,7 +414,7 @@ namespace accessibility
     }
 
 
-    sal_Int32 AccessibleTabBar::getForeground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBar::getForeground(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -438,7 +438,7 @@ namespace accessibility
     }
 
 
-    sal_Int32 AccessibleTabBar::getBackground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBar::getBackground(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -458,7 +458,7 @@ namespace accessibility
     // XAccessibleExtendedComponent
 
 
-    Reference< awt::XFont > AccessibleTabBar::getFont(  ) throw (RuntimeException, std::exception)
+    Reference< awt::XFont > AccessibleTabBar::getFont(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -483,7 +483,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBar::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBar::getTitledBorderText(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -495,7 +495,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBar::getToolTipText(  ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBar::getToolTipText(  )
     {
         OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 9d50f4822e0b..29c3ad441c50 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -163,7 +163,7 @@ namespace accessibility
     // OCommonAccessibleComponent
 
 
-    awt::Rectangle AccessibleTabBarPage::implGetBounds() throw (RuntimeException)
+    awt::Rectangle AccessibleTabBarPage::implGetBounds()
     {
         awt::Rectangle aBounds;
         if ( m_pTabBar )
@@ -216,19 +216,19 @@ namespace accessibility
     // XServiceInfo
 
 
-    OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPage::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPage" );
     }
 
 
-    sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
 
-    Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames()
     {
         return { "com.sun.star.awt.AccessibleTabBarPage" };
     }
@@ -237,7 +237,7 @@ namespace accessibility
     // XAccessible
 
 
-    Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -248,7 +248,7 @@ namespace accessibility
     // XAccessibleContext
 
 
-    sal_Int32 AccessibleTabBarPage::getAccessibleChildCount() throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBarPage::getAccessibleChildCount()
     {
         OExternalLockGuard aGuard( this );
 
@@ -256,7 +256,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i )
     {
         OExternalLockGuard aGuard( this );
 
@@ -267,7 +267,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -275,7 +275,7 @@ namespace accessibility
     }
 
 
-    sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -287,7 +287,7 @@ namespace accessibility
     }
 
 
-    sal_Int16 AccessibleTabBarPage::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 AccessibleTabBarPage::getAccessibleRole(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -295,7 +295,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPage::getAccessibleDescription( )
     {
         OExternalLockGuard aGuard( this );
 
@@ -307,7 +307,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBarPage::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPage::getAccessibleName(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -315,7 +315,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -325,7 +325,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -345,7 +345,7 @@ namespace accessibility
     }
 
 
-    Locale AccessibleTabBarPage::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+    Locale AccessibleTabBarPage::getLocale(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -356,7 +356,7 @@ namespace accessibility
     // XAccessibleComponent
 
 
-    Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const awt::Point& )
     {
         OExternalLockGuard aGuard( this );
 
@@ -364,13 +364,13 @@ namespace accessibility
     }
 
 
-    void AccessibleTabBarPage::grabFocus(  ) throw (RuntimeException, std::exception)
+    void AccessibleTabBarPage::grabFocus(  )
     {
         // no focus
     }
 
 
-    sal_Int32 AccessibleTabBarPage::getForeground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBarPage::getForeground(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -387,7 +387,7 @@ namespace accessibility
     }
 
 
-    sal_Int32 AccessibleTabBarPage::getBackground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBarPage::getBackground(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -407,7 +407,7 @@ namespace accessibility
     // XAccessibleExtendedComponent
 
 
-    Reference< awt::XFont > AccessibleTabBarPage::getFont(  ) throw (RuntimeException, std::exception)
+    Reference< awt::XFont > AccessibleTabBarPage::getFont(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -424,7 +424,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBarPage::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPage::getTitledBorderText(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -432,7 +432,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBarPage::getToolTipText(  ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPage::getToolTipText(  )
     {
         OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 05848a598b66..eac83b7fd20c 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -321,7 +321,7 @@ namespace accessibility
     // OCommonAccessibleComponent
 
 
-    awt::Rectangle AccessibleTabBarPageList::implGetBounds() throw (RuntimeException)
+    awt::Rectangle AccessibleTabBarPageList::implGetBounds()
     {
         awt::Rectangle aBounds;
         if ( m_pTabBar )
@@ -364,19 +364,19 @@ namespace accessibility
     // XServiceInfo
 
 
-    OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPageList::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPageList" );
     }
 
 
-    sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
 
-    Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames()
     {
         return { "com.sun.star.awt.AccessibleTabBarPageList" };
     }
@@ -385,7 +385,7 @@ namespace accessibility
     // XAccessible
 
 
-    Reference< XAccessibleContext > AccessibleTabBarPageList::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleContext > AccessibleTabBarPageList::getAccessibleContext(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -396,7 +396,7 @@ namespace accessibility
     // XAccessibleContext
 
 
-    sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount() throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount()
     {
         OExternalLockGuard aGuard( this );
 
@@ -404,7 +404,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i )
     {
         OExternalLockGuard aGuard( this );
 
@@ -429,7 +429,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -441,7 +441,7 @@ namespace accessibility
     }
 
 
-    sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -449,7 +449,7 @@ namespace accessibility
     }
 
 
-    sal_Int16 AccessibleTabBarPageList::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 AccessibleTabBarPageList::getAccessibleRole(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -457,7 +457,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPageList::getAccessibleDescription( )
     {
         OExternalLockGuard aGuard( this );
 
@@ -465,7 +465,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBarPageList::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPageList::getAccessibleName(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -473,7 +473,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -483,7 +483,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -503,7 +503,7 @@ namespace accessibility
     }
 
 
-    Locale AccessibleTabBarPageList::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+    Locale AccessibleTabBarPageList::getLocale(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -514,7 +514,7 @@ namespace accessibility
     // XAccessibleComponent
 
 
-    Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const awt::Point& rPoint )
     {
         OExternalLockGuard aGuard( this );
 
@@ -542,13 +542,13 @@ namespace accessibility
     }
 
 
-    void AccessibleTabBarPageList::grabFocus(  ) throw (RuntimeException, std::exception)
+    void AccessibleTabBarPageList::grabFocus(  )
     {
         // no focus
     }
 
 
-    sal_Int32 AccessibleTabBarPageList::getForeground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBarPageList::getForeground(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -565,7 +565,7 @@ namespace accessibility
     }
 
 
-    sal_Int32 AccessibleTabBarPageList::getBackground(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBarPageList::getBackground(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -585,7 +585,7 @@ namespace accessibility
     // XAccessibleExtendedComponent
 
 
-    Reference< awt::XFont > AccessibleTabBarPageList::getFont(  ) throw (RuntimeException, std::exception)
+    Reference< awt::XFont > AccessibleTabBarPageList::getFont(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -602,7 +602,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBarPageList::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPageList::getTitledBorderText(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -610,7 +610,7 @@ namespace accessibility
     }
 
 
-    OUString AccessibleTabBarPageList::getToolTipText(  ) throw (RuntimeException, std::exception)
+    OUString AccessibleTabBarPageList::getToolTipText(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -621,7 +621,7 @@ namespace accessibility
     // XAccessibleSelection
 
 
-    void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex )
     {
         OExternalLockGuard aGuard( this );
 
@@ -638,7 +638,7 @@ namespace accessibility
     }
 
 
-    sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex )
     {
         OExternalLockGuard aGuard( this );
 
@@ -653,13 +653,13 @@ namespace accessibility
     }
 
 
-    void AccessibleTabBarPageList::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+    void AccessibleTabBarPageList::clearAccessibleSelection(  )
     {
         // This method makes no sense in a TabBar, and so does nothing.
     }
 
 
-    void AccessibleTabBarPageList::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+    void AccessibleTabBarPageList::selectAllAccessibleChildren(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -667,7 +667,7 @@ namespace accessibility
     }
 
 
-    sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -675,7 +675,7 @@ namespace accessibility
     }
 
 
-    Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         OExternalLockGuard aGuard( this );
 
@@ -697,7 +697,7 @@ namespace accessibility
     }
 
 
-    void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex )
     {
         OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index 5f7824d190cb..6da361b0b910 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -75,13 +75,12 @@ namespace accessibility
     // XAccessibleContext ---------------------------------------------------------
 
     sal_Int32 SAL_CALL AccessibleTabListBox::getAccessibleChildCount()
-        throw ( uno::RuntimeException, std::exception )
     {
         return 2; // header and table
     }
 
 
-    Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext() throw ( RuntimeException, std::exception )
+    Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext()
     {
         return this;
     }
@@ -89,7 +88,6 @@ namespace accessibility
 
     Reference< XAccessible > SAL_CALL
     AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex )
-        throw ( IndexOutOfBoundsException, RuntimeException, std::exception )
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 2536ba06943e..d50f98ad56c8 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -311,14 +311,14 @@ namespace accessibility
 
     // XServiceInfo
 
-    OUString AccessibleTabListBoxTable::getImplementationName() throw (RuntimeException, std::exception)
+    OUString AccessibleTabListBoxTable::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.AccessibleTabListBoxTable" );
     }
 
     // XAccessibleSelection
 
-    void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getMutex() );
@@ -329,7 +329,7 @@ namespace accessibility
         implSelectRow( implGetRow( nChildIndex ), true );
     }
 
-    sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getMutex() );
@@ -340,7 +340,7 @@ namespace accessibility
         return m_pTabListBox && m_pTabListBox->IsSelected( m_pTabListBox->GetEntry( implGetRow( nChildIndex ) ) );
     }
 
-    void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getMutex() );
@@ -350,7 +350,7 @@ namespace accessibility
         m_pTabListBox->SetNoSelection();
     }
 
-    void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getMutex() );
@@ -360,7 +360,7 @@ namespace accessibility
         m_pTabListBox->SelectAll();
     }
 
-    sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getMutex() );
@@ -370,7 +370,7 @@ namespace accessibility
         return implGetColumnCount() * implGetSelRowCount();
     }
 
-    Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getMutex() );
@@ -386,7 +386,7 @@ namespace accessibility
         return getAccessibleCellAt( nRow, nColumn );
     }
 
-    void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( getMutex() );
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index c7180e8e13c4..5ee6a1d63cbb 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -106,7 +106,7 @@ void Paragraph::notifyEvent(::sal_Int16 nEventId,
 
 // virtual
 css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
-Paragraph::getAccessibleContext() throw (css::uno::RuntimeException, std::exception)
+Paragraph::getAccessibleContext()
 {
     checkDisposed();
     return this;
@@ -114,7 +114,6 @@ Paragraph::getAccessibleContext() throw (css::uno::RuntimeException, std::except
 
 // virtual
 ::sal_Int32 SAL_CALL Paragraph::getAccessibleChildCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return 0;
@@ -123,8 +122,6 @@ Paragraph::getAccessibleContext() throw (css::uno::RuntimeException, std::except
 // virtual
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
 Paragraph::getAccessibleChild(::sal_Int32)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     throw css::lang::IndexOutOfBoundsException(
@@ -136,7 +133,6 @@ Paragraph::getAccessibleChild(::sal_Int32)
 // virtual
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
 Paragraph::getAccessibleParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->getAccessible();
@@ -144,7 +140,6 @@ Paragraph::getAccessibleParent()
 
 // virtual
 ::sal_Int32 SAL_CALL Paragraph::getAccessibleIndexInParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->retrieveParagraphIndex(this);
@@ -152,7 +147,6 @@ Paragraph::getAccessibleParent()
 
 // virtual
 ::sal_Int16 SAL_CALL Paragraph::getAccessibleRole()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return css::accessibility::AccessibleRole::PARAGRAPH;
@@ -160,7 +154,6 @@ Paragraph::getAccessibleParent()
 
 // virtual
 OUString SAL_CALL Paragraph::getAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return OUString();
@@ -168,7 +161,6 @@ OUString SAL_CALL Paragraph::getAccessibleDescription()
 
 // virtual
 OUString SAL_CALL Paragraph::getAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return OUString();
@@ -177,7 +169,6 @@ OUString SAL_CALL Paragraph::getAccessibleName()
 // virtual
 css::uno::Reference< css::accessibility::XAccessibleRelationSet >
 SAL_CALL Paragraph::getAccessibleRelationSet()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->retrieveParagraphRelationSet( this );
@@ -186,7 +177,6 @@ SAL_CALL Paragraph::getAccessibleRelationSet()
 // virtual
 css::uno::Reference< css::accessibility::XAccessibleStateSet >
 SAL_CALL Paragraph::getAccessibleStateSet()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -198,8 +188,6 @@ SAL_CALL Paragraph::getAccessibleStateSet()
 
 // virtual
 css::lang::Locale SAL_CALL Paragraph::getLocale()
-    throw (css::accessibility::IllegalAccessibleComponentStateException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->retrieveLocale();
@@ -207,7 +195,6 @@ css::lang::Locale SAL_CALL Paragraph::getLocale()
 
 // virtual
 sal_Bool SAL_CALL Paragraph::containsPoint(css::awt::Point const & rPoint)
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this,
@@ -219,7 +206,6 @@ sal_Bool SAL_CALL Paragraph::containsPoint(css::awt::Point const & rPoint)
 // virtual
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
 Paragraph::getAccessibleAtPoint(css::awt::Point const &)
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return nullptr;
@@ -227,7 +213,6 @@ Paragraph::getAccessibleAtPoint(css::awt::Point const &)
 
 // virtual
 css::awt::Rectangle SAL_CALL Paragraph::getBounds()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->retrieveParagraphBounds(this, false);
@@ -235,7 +220,6 @@ css::awt::Rectangle SAL_CALL Paragraph::getBounds()
 
 // virtual
 css::awt::Point SAL_CALL Paragraph::getLocation()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this,
@@ -245,7 +229,6 @@ css::awt::Point SAL_CALL Paragraph::getLocation()
 
 // virtual
 css::awt::Point SAL_CALL Paragraph::getLocationOnScreen()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this,
@@ -255,7 +238,6 @@ css::awt::Point SAL_CALL Paragraph::getLocationOnScreen()
 
 // virtual
 css::awt::Size SAL_CALL Paragraph::getSize()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this,
@@ -264,7 +246,7 @@ css::awt::Size SAL_CALL Paragraph::getSize()
 }
 
 // virtual
-void SAL_CALL Paragraph::grabFocus() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL Paragraph::grabFocus()
 {
     checkDisposed();
     VclPtr<vcl::Window> pWindow = m_xDocument->GetWindow();
@@ -286,21 +268,18 @@ void SAL_CALL Paragraph::grabFocus() throw (css::uno::RuntimeException, std::exc
 
 // virtual
 css::util::Color SAL_CALL Paragraph::getForeground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return 0; // TODO
 }
 
 // virtual
 css::util::Color SAL_CALL Paragraph::getBackground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return 0; // TODO
 }
 
 // virtual
 ::sal_Int32 SAL_CALL Paragraph::getCaretPosition()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->retrieveParagraphCaretPosition(this);
@@ -308,8 +287,6 @@ css::util::Color SAL_CALL Paragraph::getBackground()
 
 // virtual
 sal_Bool SAL_CALL Paragraph::setCaretPosition(::sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->changeParagraphSelection(this, nIndex, nIndex);
@@ -318,8 +295,6 @@ sal_Bool SAL_CALL Paragraph::setCaretPosition(::sal_Int32 nIndex)
 
 // virtual
 ::sal_Unicode SAL_CALL Paragraph::getCharacter(::sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return OCommonAccessibleText::getCharacter(nIndex);
@@ -328,8 +303,6 @@ sal_Bool SAL_CALL Paragraph::setCaretPosition(::sal_Int32 nIndex)
 // virtual
 css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
 Paragraph::getCharacterAttributes(::sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->retrieveCharacterAttributes( this, nIndex, aRequestedAttributes );
@@ -338,8 +311,6 @@ Paragraph::getCharacterAttributes(::sal_Int32 nIndex, const css::uno::Sequence<
 // virtual
 css::awt::Rectangle SAL_CALL
 Paragraph::getCharacterBounds(::sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     css::awt::Rectangle aBounds(m_xDocument->retrieveCharacterBounds(this, nIndex));
@@ -351,7 +322,6 @@ Paragraph::getCharacterBounds(::sal_Int32 nIndex)
 
 // virtual
 ::sal_Int32 SAL_CALL Paragraph::getCharacterCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return OCommonAccessibleText::getCharacterCount();
@@ -360,7 +330,6 @@ Paragraph::getCharacterBounds(::sal_Int32 nIndex)
 // virtual
 ::sal_Int32 SAL_CALL
 Paragraph::getIndexAtPoint(css::awt::Point const & rPoint)
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     css::awt::Point aPoint(rPoint);
@@ -372,7 +341,6 @@ Paragraph::getIndexAtPoint(css::awt::Point const & rPoint)
 
 // virtual
 OUString SAL_CALL Paragraph::getSelectedText()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -381,7 +349,6 @@ OUString SAL_CALL Paragraph::getSelectedText()
 
 // virtual
 ::sal_Int32 SAL_CALL Paragraph::getSelectionStart()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return OCommonAccessibleText::getSelectionStart();
@@ -389,7 +356,6 @@ OUString SAL_CALL Paragraph::getSelectedText()
 
 // virtual
 ::sal_Int32 SAL_CALL Paragraph::getSelectionEnd()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return OCommonAccessibleText::getSelectionEnd();
@@ -398,8 +364,6 @@ OUString SAL_CALL Paragraph::getSelectedText()
 // virtual
 sal_Bool SAL_CALL Paragraph::setSelection(::sal_Int32 nStartIndex,
                                                 ::sal_Int32 nEndIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->changeParagraphSelection(this, nStartIndex, nEndIndex);
@@ -408,7 +372,6 @@ sal_Bool SAL_CALL Paragraph::setSelection(::sal_Int32 nStartIndex,
 
 // virtual
 OUString SAL_CALL Paragraph::getText()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return OCommonAccessibleText::getText();
@@ -417,29 +380,27 @@ OUString SAL_CALL Paragraph::getText()
 // virtual
 OUString SAL_CALL Paragraph::getTextRange(::sal_Int32 nStartIndex,
                                                      ::sal_Int32 nEndIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex);
 }
 
 // virtual
-css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     checkDisposed();
     return OCommonAccessibleText::getTextAtIndex(nIndex, aTextType);
 }
 
 // virtual
-css::accessibility::TextSegment SAL_CALL Paragraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL Paragraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     checkDisposed();
     return OCommonAccessibleText::getTextBeforeIndex(nIndex, aTextType);
 }
 
 // virtual
-css::accessibility::TextSegment SAL_CALL Paragraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL Paragraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     checkDisposed();
     return OCommonAccessibleText::getTextBehindIndex(nIndex, aTextType);
@@ -448,8 +409,6 @@ css::accessibility::TextSegment SAL_CALL Paragraph::getTextBehindIndex( sal_Int3
 // virtual
 sal_Bool SAL_CALL Paragraph::copyText(::sal_Int32 nStartIndex,
                                             ::sal_Int32 nEndIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->copyParagraphText(this, nStartIndex, nEndIndex);
@@ -459,8 +418,6 @@ sal_Bool SAL_CALL Paragraph::copyText(::sal_Int32 nStartIndex,
 // virtual
 sal_Bool SAL_CALL Paragraph::cutText(::sal_Int32 nStartIndex,
                                            ::sal_Int32 nEndIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, true, false,
@@ -470,8 +427,6 @@ sal_Bool SAL_CALL Paragraph::cutText(::sal_Int32 nStartIndex,
 
 // virtual
 sal_Bool SAL_CALL Paragraph::pasteText(::sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->changeParagraphText(this, nIndex, nIndex, false, true,
@@ -482,8 +437,6 @@ sal_Bool SAL_CALL Paragraph::pasteText(::sal_Int32 nIndex)
 // virtual
 sal_Bool SAL_CALL Paragraph::deleteText(::sal_Int32 nStartIndex,
                                           ::sal_Int32 nEndIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false,
@@ -494,8 +447,6 @@ sal_Bool SAL_CALL Paragraph::deleteText(::sal_Int32 nStartIndex,
 // virtual
 sal_Bool SAL_CALL Paragraph::insertText(OUString const & rText,
                                               ::sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->changeParagraphText(this, nIndex, nIndex, false, false, rText);
@@ -506,8 +457,6 @@ sal_Bool SAL_CALL Paragraph::insertText(OUString const & rText,
 sal_Bool SAL_CALL
 Paragraph::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
                            OUString const & rReplacement)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false,
@@ -519,8 +468,6 @@ Paragraph::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
 sal_Bool SAL_CALL Paragraph::setAttributes(
     ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
     css::uno::Sequence< css::beans::PropertyValue > const & rAttributeSet)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->changeParagraphAttributes(this, nStartIndex, nEndIndex,
@@ -530,7 +477,6 @@ sal_Bool SAL_CALL Paragraph::setAttributes(
 
 // virtual
 sal_Bool SAL_CALL Paragraph::setText(OUString const & rText)
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_xDocument->changeParagraphText(this, rText);
@@ -540,7 +486,6 @@ sal_Bool SAL_CALL Paragraph::setText(OUString const & rText)
 // virtual
 css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
 Paragraph::getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes)
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->retrieveDefaultAttributes( this, RequestedAttributes );
@@ -549,8 +494,6 @@ Paragraph::getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedA
 // virtual
 css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
 Paragraph::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->retrieveRunAttributes( this, Index, RequestedAttributes );
@@ -558,8 +501,6 @@ Paragraph::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUStrin
 
 // virtual
 ::sal_Int32 SAL_CALL Paragraph::getLineNumberAtIndex( ::sal_Int32 nIndex )
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -571,8 +512,6 @@ Paragraph::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUStrin
 
 // virtual
 css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineNumber( ::sal_Int32 nLineNo )
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -585,7 +524,6 @@ css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineNumber( ::sal_I
 
 // virtual
 css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineWithCaret(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -605,7 +543,6 @@ css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineWithCaret(  )
 
 // virtual
 ::sal_Int32 SAL_CALL Paragraph::getNumberOfLineWithCaret(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     return m_xDocument->retrieveParagraphLineWithCursor(this);
@@ -616,7 +553,6 @@ css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineWithCaret(  )
 void SAL_CALL Paragraph::addAccessibleEventListener(
     css::uno::Reference<
     css::accessibility::XAccessibleEventListener > const & rListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (rListener.is())
     {
@@ -640,7 +576,6 @@ void SAL_CALL Paragraph::addAccessibleEventListener(
 void SAL_CALL Paragraph::removeAccessibleEventListener(
     css::uno::Reference<
     css::accessibility::XAccessibleEventListener > const & rListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     comphelper::AccessibleEventNotifier::TClientId nId = 0;
     {
@@ -1441,7 +1376,6 @@ Document::retrieveParagraphRelationSet( Paragraph const * pParagraph )
 
 // virtual
 ::sal_Int32 SAL_CALL Document::getAccessibleChildCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::comphelper::OExternalLockGuard aGuard(this);
     init();
@@ -1451,8 +1385,6 @@ Document::retrieveParagraphRelationSet( Paragraph const * pParagraph )
 // virtual
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
 Document::getAccessibleChild(::sal_Int32 i)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     ::comphelper::OExternalLockGuard aGuard(this);
     init();
@@ -1467,7 +1399,6 @@ Document::getAccessibleChild(::sal_Int32 i)
 
 // virtual
 ::sal_Int16 SAL_CALL Document::getAccessibleRole()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::accessibility::AccessibleRole::TEXT_FRAME;
 }
@@ -1475,7 +1406,6 @@ Document::getAccessibleChild(::sal_Int32 i)
 // virtual
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
 Document::getAccessibleAtPoint(css::awt::Point const & rPoint)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::comphelper::OExternalLockGuard aGuard(this);
     init();
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 0d8fb8d8b03a..911d21eeb2e4 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -684,7 +684,7 @@ void OAccessibleMenuBaseComponent::disposing()
 // XServiceInfo
 
 
-sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
@@ -693,7 +693,7 @@ sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rService
 // XAccessible
 
 
-Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleContext(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -704,7 +704,7 @@ Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleConte
 // XAccessibleContext
 
 
-Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 2fc95d3afcca..ec69408f222f 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -100,7 +100,7 @@ void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHe
 // OCommonAccessibleComponent
 
 
-awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException)
+awt::Rectangle OAccessibleMenuComponent::implGetBounds()
 {
     awt::Rectangle aBounds( 0, 0, 0, 0 );
 
@@ -149,7 +149,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, OAccessibleMenuBaseC
 // XAccessibleContext
 
 
-sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -157,7 +157,7 @@ sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeExce
 }
 
 
-Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -168,7 +168,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32
 }
 
 
-Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -189,7 +189,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent(  ) throw
 }
 
 
-sal_Int16 OAccessibleMenuComponent::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 OAccessibleMenuComponent::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -197,7 +197,7 @@ sal_Int16 OAccessibleMenuComponent::getAccessibleRole(  ) throw (RuntimeExceptio
 }
 
 
-OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException, std::exception)
+OUString OAccessibleMenuComponent::getAccessibleDescription( )
 {
     OExternalLockGuard aGuard( this );
 
@@ -213,7 +213,7 @@ OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeExc
 }
 
 
-OUString OAccessibleMenuComponent::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString OAccessibleMenuComponent::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -221,7 +221,7 @@ OUString OAccessibleMenuComponent::getAccessibleName(  ) throw (RuntimeException
 }
 
 
-Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -231,7 +231,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelat
 }
 
 
-Locale OAccessibleMenuComponent::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale OAccessibleMenuComponent::getLocale(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -242,7 +242,7 @@ Locale OAccessibleMenuComponent::getLocale(  ) throw (IllegalAccessibleComponent
 // XAccessibleComponent
 
 
-Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception)
+Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const awt::Point& rPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -250,7 +250,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const a
 }
 
 
-awt::Point OAccessibleMenuComponent::getLocationOnScreen(  ) throw (RuntimeException, std::exception)
+awt::Point OAccessibleMenuComponent::getLocationOnScreen(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -270,7 +270,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen(  ) throw (RuntimeExcep
 }
 
 
-void OAccessibleMenuComponent::grabFocus(  ) throw (RuntimeException, std::exception)
+void OAccessibleMenuComponent::grabFocus(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -283,7 +283,7 @@ void OAccessibleMenuComponent::grabFocus(  ) throw (RuntimeException, std::excep
 }
 
 
-sal_Int32 OAccessibleMenuComponent::getForeground(  ) throw (RuntimeException, std::exception)
+sal_Int32 OAccessibleMenuComponent::getForeground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -294,7 +294,7 @@ sal_Int32 OAccessibleMenuComponent::getForeground(  ) throw (RuntimeException, s
 }
 
 
-sal_Int32 OAccessibleMenuComponent::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 OAccessibleMenuComponent::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -305,7 +305,7 @@ sal_Int32 OAccessibleMenuComponent::getBackground(  ) throw (RuntimeException, s
 // XAccessibleExtendedComponent
 
 
-Reference< awt::XFont > OAccessibleMenuComponent::getFont(  ) throw (RuntimeException, std::exception)
+Reference< awt::XFont > OAccessibleMenuComponent::getFont(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -331,7 +331,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont(  ) throw (RuntimeExce
 }
 
 
-OUString OAccessibleMenuComponent::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+OUString OAccessibleMenuComponent::getTitledBorderText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -339,7 +339,7 @@ OUString OAccessibleMenuComponent::getTitledBorderText(  ) throw (RuntimeExcepti
 }
 
 
-OUString OAccessibleMenuComponent::getToolTipText(  ) throw (RuntimeException, std::exception)
+OUString OAccessibleMenuComponent::getToolTipText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -350,7 +350,7 @@ OUString OAccessibleMenuComponent::getToolTipText(  ) throw (RuntimeException, s
 // XAccessibleSelection
 
 
-void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -361,7 +361,7 @@ void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) th
 }
 
 
-sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -372,7 +372,7 @@ sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIn
 }
 
 
-void OAccessibleMenuComponent::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+void OAccessibleMenuComponent::clearAccessibleSelection(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -380,13 +380,13 @@ void OAccessibleMenuComponent::clearAccessibleSelection(  ) throw (RuntimeExcept
 }
 
 
-void OAccessibleMenuComponent::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+void OAccessibleMenuComponent::selectAllAccessibleChildren(  )
 {
     // This method makes no sense in a menu, and so does nothing.
 }
 
 
-sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -402,7 +402,7 @@ sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount(  ) throw (R
 }
 
 
-Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -424,7 +424,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s
 }
 
 
-void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 50a83c63192b..33d469703c80 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -245,7 +245,7 @@ void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateS
 // OCommonAccessibleComponent
 
 
-awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeException)
+awt::Rectangle OAccessibleMenuItemComponent::implGetBounds()
 {
     awt::Rectangle aBounds( 0, 0, 0, 0 );
 
@@ -298,7 +298,7 @@ void SAL_CALL OAccessibleMenuItemComponent::disposing()
 // XAccessibleContext
 
 
-sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -306,7 +306,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (Runtime
 }
 
 
-Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -317,7 +317,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_I
 }
 
 
-Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -325,7 +325,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent(  ) t
 }
 
 
-sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -333,7 +333,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent(  ) throw (Ru
 }
 
 
-sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -341,7 +341,7 @@ sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole(  ) throw (RuntimeExce
 }
 
 
-OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException, std::exception)
+OUString OAccessibleMenuItemComponent::getAccessibleDescription( )
 {
     OExternalLockGuard aGuard( this );
 
@@ -353,7 +353,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (Runtim
 }
 
 
-OUString OAccessibleMenuItemComponent::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString OAccessibleMenuItemComponent::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -361,7 +361,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleName(  ) throw (RuntimeExcep
 }
 
 
-Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -371,7 +371,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleR
 }
 
 
-Locale OAccessibleMenuItemComponent::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale OAccessibleMenuItemComponent::getLocale(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -382,7 +382,7 @@ Locale OAccessibleMenuItemComponent::getLocale(  ) throw (IllegalAccessibleCompo
 // XAccessibleComponent
 
 
-Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception)
+Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( const awt::Point& )
 {
     OExternalLockGuard aGuard( this );
 
@@ -390,13 +390,13 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( con
 }
 
 
-void OAccessibleMenuItemComponent::grabFocus(  ) throw (RuntimeException, std::exception)
+void OAccessibleMenuItemComponent::grabFocus(  )
 {
     // no focus for items
 }
 
 
-sal_Int32 OAccessibleMenuItemComponent::getForeground(  ) throw (RuntimeException, std::exception)
+sal_Int32 OAccessibleMenuItemComponent::getForeground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -413,7 +413,7 @@ sal_Int32 OAccessibleMenuItemComponent::getForeground(  ) throw (RuntimeExceptio
 }
 
 
-sal_Int32 OAccessibleMenuItemComponent::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 OAccessibleMenuItemComponent::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -433,7 +433,7 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground(  ) throw (RuntimeExceptio
 // XAccessibleExtendedComponent
 
 
-Reference< awt::XFont > OAccessibleMenuItemComponent::getFont(  ) throw (RuntimeException, std::exception)
+Reference< awt::XFont > OAccessibleMenuItemComponent::getFont(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -450,7 +450,7 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont(  ) throw (Runtime
 }
 
 
-OUString OAccessibleMenuItemComponent::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+OUString OAccessibleMenuItemComponent::getTitledBorderText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -458,7 +458,7 @@ OUString OAccessibleMenuItemComponent::getTitledBorderText(  ) throw (RuntimeExc
 }
 
 
-OUString OAccessibleMenuItemComponent::getToolTipText(  ) throw (RuntimeException, std::exception)
+OUString OAccessibleMenuItemComponent::getToolTipText(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 2c043439a6d9..995ab3b73bd7 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -262,7 +262,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleBox, VCLXAccessibleComponent, VCL
 //=====  XAccessible  =========================================================
 
 Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext(  )
-    throw (RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -272,7 +271,6 @@ Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext
 //=====  XAccessibleContext  ==================================================
 
 sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -296,7 +294,6 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount()
 }
 
 Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 i)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -345,7 +342,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32
     return xChild;
 }
 
-sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -360,7 +357,6 @@ sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole() throw (RuntimeExceptio
 }
 
 sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT)
         return m_nIndexInParent;
@@ -371,7 +367,6 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent()
 //=====  XAccessibleAction  ===================================================
 
 sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount()
-    throw (RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex> aGuard (GetMutex());
 
@@ -381,7 +376,6 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount()
 }
 
 sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     bool bNotify = false;
 
@@ -423,7 +417,6 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
 }
 
 OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 nIndex)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     if (nIndex<0 || nIndex>=getAccessibleActionCount())
@@ -436,7 +429,6 @@ OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 n
 }
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -451,7 +443,6 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBind
 
 // =====  XAccessibleValue  ===============================================
 Any VCLXAccessibleBox::getCurrentValue( )
-    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -488,7 +479,6 @@ Any VCLXAccessibleBox::getCurrentValue( )
 }
 
 sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& aNumber )
-    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -504,14 +494,12 @@ sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& aNumber )
 }
 
 Any VCLXAccessibleBox::getMaximumValue( )
-    throw( RuntimeException, std::exception )
 {
     Any aAny;
     return aAny;
 }
 
 Any VCLXAccessibleBox::getMinimumValue(  )
-    throw( RuntimeException, std::exception )
 {
     Any aAny;
     return aAny;
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index cd12ca8c8796..7b2270fdb866 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -120,13 +120,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextCompon
 // XServiceInfo
 
 
-OUString VCLXAccessibleButton::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleButton::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleButton" );
 }
 
 
-Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleButton" };
 }
@@ -135,7 +135,7 @@ Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (Run
 // XAccessibleContext
 
 
-OUString VCLXAccessibleButton::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleButton::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -173,7 +173,7 @@ OUString VCLXAccessibleButton::getAccessibleName(  ) throw (RuntimeException, st
 // XAccessibleAction
 
 
-sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( )
 {
     OExternalLockGuard aGuard( this );
 
@@ -181,7 +181,7 @@ sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeExcept
 }
 
 
-sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -196,7 +196,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (In
 }
 
 
-OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -207,7 +207,7 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex
 }
 
 
-Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -248,7 +248,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB
 // XAccessibleValue
 
 
-Any VCLXAccessibleButton::getCurrentValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleButton::getCurrentValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -262,7 +262,7 @@ Any VCLXAccessibleButton::getCurrentValue(  ) throw (RuntimeException, std::exce
 }
 
 
-sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber )
 {
     OExternalLockGuard aGuard( this );
 
@@ -287,7 +287,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt
 }
 
 
-Any VCLXAccessibleButton::getMaximumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleButton::getMaximumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -298,7 +298,7 @@ Any VCLXAccessibleButton::getMaximumValue(  ) throw (RuntimeException, std::exce
 }
 
 
-Any VCLXAccessibleButton::getMinimumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleButton::getMinimumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 8c71bb48ec59..1459b6d2b506 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -156,13 +156,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComp
 // XServiceInfo
 
 
-OUString VCLXAccessibleCheckBox::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleCheckBox::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleCheckBox" );
 }
 
 
-Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleCheckBox" };
 }
@@ -171,7 +171,7 @@ Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (R
 // XAccessibleAction
 
 
-sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( )
 {
     OExternalLockGuard aGuard( this );
 
@@ -179,7 +179,7 @@ sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeExce
 }
 
 
-sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -210,7 +210,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (
 }
 
 
-OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -224,7 +224,7 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd
 }
 
 
-Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -265,7 +265,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe
 // XAccessibleValue
 
 
-Any VCLXAccessibleCheckBox::getCurrentValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleCheckBox::getCurrentValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -279,7 +279,7 @@ Any VCLXAccessibleCheckBox::getCurrentValue(  ) throw (RuntimeException, std::ex
 }
 
 
-sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber )
 {
     OExternalLockGuard aGuard( this );
 
@@ -306,7 +306,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru
 }
 
 
-Any VCLXAccessibleCheckBox::getMaximumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleCheckBox::getMaximumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -322,7 +322,7 @@ Any VCLXAccessibleCheckBox::getMaximumValue(  ) throw (RuntimeException, std::ex
 }
 
 
-Any VCLXAccessibleCheckBox::getMinimumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleCheckBox::getMinimumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx
index 1e4288e6815e..f7ac8890c762 100644
--- a/accessibility/source/standard/vclxaccessiblecombobox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx
@@ -49,14 +49,12 @@ bool VCLXAccessibleComboBox::IsValid() const
 // XServiceInfo
 
 OUString VCLXAccessibleComboBox::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleComboBox" );
 }
 
 
 Sequence< OUString > VCLXAccessibleComboBox::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 55b4506e05d3..e8aa7e599b2c 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -79,14 +79,12 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r
 // XServiceInfo
 
 OUString VCLXAccessibleDropDownComboBox::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleDropDownComboBox" );
 }
 
 
 Sequence< OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 67358b1b14eb..ca8ae7ee981b 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -63,14 +63,12 @@ bool VCLXAccessibleDropDownListBox::IsValid() const
 // XServiceInfo
 
 OUString VCLXAccessibleDropDownListBox::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleDropDownListBox" );
 }
 
 
 Sequence< OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index f9763202405a..8860044e1f66 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -181,13 +181,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, VCLXAccessibleTextComponen
 // XServiceInfo
 
 
-OUString VCLXAccessibleEdit::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleEdit::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleEdit" );
 }
 
 
-Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleEdit" };
 }
@@ -196,7 +196,7 @@ Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (Runti
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -204,7 +204,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException,
 }
 
 
-Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -215,7 +215,7 @@ Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) t
 }
 
 
-sal_Int16 VCLXAccessibleEdit::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleEdit::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -233,7 +233,7 @@ sal_Int16 VCLXAccessibleEdit::getAccessibleRole(  ) throw (RuntimeException, std
 // XAccessibleAction
 
 
-sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( )
 {
     OExternalLockGuard aGuard( this );
 
@@ -242,7 +242,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeExceptio
 }
 
 
-sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -261,7 +261,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde
 }
 
 
-OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -272,7 +272,7 @@ OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex )
 }
 
 
-Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -286,19 +286,19 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBin
 // XAccessibleText
 
 
-sal_Int32 VCLXAccessibleEdit::getCaretPosition(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleEdit::getCaretPosition(  )
 {
     return getSelectionEnd();
 }
 
 
-sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex )
 {
     return setSelection( nIndex, nIndex );
 }
 
 
-sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -306,7 +306,7 @@ sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOut
 }
 
 
-Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes )
 {
     OExternalLockGuard aGuard( this );
     Sequence< PropertyValue > aProperties = VCLXAccessibleTextComponent::getCharacterAttributes( nIndex, aRequestedAttributes );
@@ -352,7 +352,7 @@ Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32
 }
 
 
-awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -394,7 +394,7 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw
 }
 
 
-sal_Int32 VCLXAccessibleEdit::getCharacterCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleEdit::getCharacterCount(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -402,7 +402,7 @@ sal_Int32 VCLXAccessibleEdit::getCharacterCount(  ) throw (RuntimeException, std
 }
 
 
-sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -410,7 +410,7 @@ sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw
 }
 
 
-OUString VCLXAccessibleEdit::getSelectedText(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleEdit::getSelectedText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -418,7 +418,7 @@ OUString VCLXAccessibleEdit::getSelectedText(  ) throw (RuntimeException, std::e
 }
 
 
-sal_Int32 VCLXAccessibleEdit::getSelectionStart(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleEdit::getSelectionStart(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -426,7 +426,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionStart(  ) throw (RuntimeException, std
 }
 
 
-sal_Int32 VCLXAccessibleEdit::getSelectionEnd(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleEdit::getSelectionEnd(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -434,7 +434,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionEnd(  ) throw (RuntimeException, std::
 }
 
 
-sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -456,7 +456,7 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd
 }
 
 
-OUString VCLXAccessibleEdit::getText(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleEdit::getText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -464,7 +464,7 @@ OUString VCLXAccessibleEdit::getText(  ) throw (RuntimeException, std::exception
 }
 
 
-OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -472,7 +472,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd
 }
 
 
-css::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     OExternalLockGuard aGuard( this );
 
@@ -494,7 +494,7 @@ css::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nI
 }
 
 
-css::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     OExternalLockGuard aGuard( this );
 
@@ -502,7 +502,7 @@ css::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int3
 }
 
 
-css::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     OExternalLockGuard aGuard( this );
 
@@ -510,7 +510,7 @@ css::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int3
 }
 
 
-sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -521,7 +521,7 @@ sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndInde
 // XAccessibleEditableText
 
 
-sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -529,7 +529,7 @@ sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex
 }
 
 
-sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -564,7 +564,7 @@ sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoun
 }
 
 
-sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -572,7 +572,7 @@ sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIn
 }
 
 
-sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -580,7 +580,7 @@ sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex
 }
 
 
-sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement )
 {
     OExternalLockGuard aGuard( this );
 
@@ -606,7 +606,7 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI
 }
 
 
-sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const Sequence<PropertyValue>& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const Sequence<PropertyValue>& )
 {
     OExternalLockGuard aGuard( this );
 
@@ -617,7 +617,7 @@ sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEn
 }
 
 
-sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleEdit::setText( const OUString& sText )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
index 279c6e7e9129..2c4932e07694 100644
--- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
@@ -39,13 +39,13 @@ VCLXAccessibleFixedHyperlink::~VCLXAccessibleFixedHyperlink()
 // XServiceInfo
 
 
-OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString VCLXAccessibleFixedHyperlink::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleFixedHyperlink" );
 }
 
 
-uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleFixedHyperlink" };
 }
diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
index 6ac0adb3fb82..c84ddf9b3dda 100644
--- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
@@ -56,13 +56,13 @@ void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHel
 // XServiceInfo
 
 
-OUString VCLXAccessibleFixedText::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleFixedText::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleFixedText" );
 }
 
 
-Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleFixedText" };
 }
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index f134ca7d29ca..4b86efb391df 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -43,7 +43,6 @@ namespace
 {
     /// @throws css::lang::IndexOutOfBoundsException
     void checkSelection_Impl( sal_Int32 _nIndex, const IComboListBoxHelper& _rListBox, bool bSelected )
-        throw (css::lang::IndexOutOfBoundsException)
     {
         sal_Int32 nCount = bSelected ? (sal_Int32)_rListBox.GetSelectEntryCount()
                                      : (sal_Int32)_rListBox.GetEntryCount();
@@ -558,7 +557,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent, VC
 
 Reference<XAccessibleContext> SAL_CALL
     VCLXAccessibleList::getAccessibleContext()
-    throw (RuntimeException, std::exception)
 {
     return this;
 }
@@ -567,7 +565,6 @@ Reference<XAccessibleContext> SAL_CALL
 // XAccessibleContext
 
 sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -580,7 +577,6 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount()
 }
 
 Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int32 i)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -603,7 +599,6 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int3
 }
 
 Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent(  )
-    throw (RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -611,7 +606,6 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent(  )
 }
 
 sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT)
         return m_nIndexInParent;
@@ -620,20 +614,17 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent()
 }
 
 sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole()
-    throw (RuntimeException, std::exception)
 {
     return AccessibleRole::LIST;
 }
 
 // XServiceInfo
 OUString VCLXAccessibleList::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleList" );
 }
 
 Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
@@ -775,7 +766,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_Int32)
 
 // XAccessibleSelection
 
-void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     bool bNotify = false;
 
@@ -800,7 +791,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex )
         UpdateSelection_Impl();
 }
 
-sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -815,7 +806,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil
     return bRet;
 }
 
-void SAL_CALL VCLXAccessibleList::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXAccessibleList::clearAccessibleSelection(  )
 {
     bool bNotify = false;
 
@@ -834,7 +825,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection(  ) throw (RuntimeExc
         UpdateSelection_Impl();
 }
 
-void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren(  )
 {
     bool bNotify = false;
 
@@ -859,7 +850,7 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren(  ) throw (Runtime
         UpdateSelection_Impl();
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -870,7 +861,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount(  ) throw
     return nCount;
 }
 
-Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -884,7 +875,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild
     return nullptr;
 }
 
-void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     bool bNotify = false;
 
@@ -909,7 +900,7 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh
         UpdateSelection_Impl();
 }
 
-awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException)
+awt::Rectangle VCLXAccessibleList::implGetBounds()
 {
     awt::Rectangle aBounds ( 0, 0, 0, 0 );
     if ( m_pListBoxHelper
@@ -939,7 +930,7 @@ awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException)
 }
 
 
-awt::Point VCLXAccessibleList::getLocationOnScreen(  ) throw (uno::RuntimeException, std::exception)
+awt::Point VCLXAccessibleList::getLocationOnScreen(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 446b140ab981..ba9e8c601208 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -60,14 +60,12 @@ bool VCLXAccessibleListBox::IsValid() const
 // XServiceInfo
 
 OUString VCLXAccessibleListBox::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleListBox" );
 }
 
 
 Sequence< OUString > VCLXAccessibleListBox::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 07b7ea94a49e..61f38d849e91 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -44,7 +44,7 @@
 namespace
 {
     /// @throws css::lang::IndexOutOfBoundsException
-    void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException)
+    void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText )
     {
         if ( _nIndex < 0 || _nIndex > _sText.getLength() )
             throw css::lang::IndexOutOfBoundsException();
@@ -143,7 +143,7 @@ void VCLXAccessibleListItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32
 
 // XTypeProvider
 
-Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -175,17 +175,17 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
 
 // XServiceInfo
 
-OUString VCLXAccessibleListItem::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleListItem::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleListItem" );
 }
 
-sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames()
 {
     return {"com.sun.star.accessibility.AccessibleContext",
             "com.sun.star.accessibility.AccessibleComponent",
@@ -194,49 +194,49 @@ Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (R
 
 // XAccessible
 
-Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleContext(  )
 {
     return this;
 }
 
 // XAccessibleContext
 
-sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount(  )
 {
     return 0;
 }
 
-Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 )
 {
     return Reference< XAccessible >();
 }
 
-Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_xParent.get();
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_nIndexInParent;
 }
 
-sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole(  )
 {
     return AccessibleRole::LIST_ITEM;
     //  return AccessibleRole::LABEL;
 }
 
-OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription(  )
 {
     // no description for every item
     return OUString();
 }
 
-OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -244,14 +244,14 @@ OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName(  ) throw (RuntimeEx
     return implGetText();
 }
 
-Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleListItem::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleListItem::getAccessibleRelationSet(  )
 {
     utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
     Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
     return xSet;
 }
 
-Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleStateSet(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -284,7 +284,7 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleS
     return xStateSet;
 }
 
-Locale SAL_CALL VCLXAccessibleListItem::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale SAL_CALL VCLXAccessibleListItem::getLocale(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -294,7 +294,7 @@ Locale SAL_CALL VCLXAccessibleListItem::getLocale(  ) throw (IllegalAccessibleCo
 
 // XAccessibleComponent
 
-sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -310,12 +310,12 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi
     return bInside;
 }
 
-Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( const awt::Point& )
 {
     return Reference< XAccessible >();
 }
 
-awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds(  ) throw (RuntimeException, std::exception)
+awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -328,7 +328,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds(  ) throw (RuntimeExce
     return aRect;
 }
 
-awt::Point SAL_CALL VCLXAccessibleListItem::getLocation(  ) throw (RuntimeException, std::exception)
+awt::Point SAL_CALL VCLXAccessibleListItem::getLocation(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -343,7 +343,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation(  ) throw (RuntimeExcept
     return AWTPoint( aPoint );
 }
 
-awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen(  ) throw (RuntimeException, std::exception)
+awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -359,7 +359,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen(  ) throw (Runti
     return AWTPoint( aPoint );
 }
 
-awt::Size SAL_CALL VCLXAccessibleListItem::getSize(  ) throw (RuntimeException, std::exception)
+awt::Size SAL_CALL VCLXAccessibleListItem::getSize(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -372,19 +372,19 @@ awt::Size SAL_CALL VCLXAccessibleListItem::getSize(  ) throw (RuntimeException,
     return AWTSize( aSize );
 }
 
-void SAL_CALL VCLXAccessibleListItem::grabFocus(  ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXAccessibleListItem::grabFocus(  )
 {
     // no focus for each item
 }
 
 // XAccessibleText
 
-sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition()
 {
     return -1;
 }
 
-sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -395,7 +395,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) t
     return false;
 }
 
-sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -403,7 +403,7 @@ sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) th
     return OCommonAccessibleText::getCharacter( nIndex );
 }
 
-Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -415,7 +415,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttribute
     return Sequence< PropertyValue >();
 }
 
-awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -437,7 +437,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI
     return aBounds;
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount()
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -445,7 +445,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeExc
     return OCommonAccessibleText::getCharacterCount();
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -465,7 +465,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP
     return nIndex;
 }
 
-OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleListItem::getSelectedText()
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -473,7 +473,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeExcept
     return OCommonAccessibleText::getSelectedText();
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart()
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -481,7 +481,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeExc
     return OCommonAccessibleText::getSelectionStart();
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd()
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -489,7 +489,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeExcep
     return OCommonAccessibleText::getSelectionEnd();
 }
 
-sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -500,7 +500,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s
     return false;
 }
 
-OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleListItem::getText()
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -508,7 +508,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException, std
     return OCommonAccessibleText::getText();
 }
 
-OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -516,7 +516,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s
     return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
 }
 
-css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -524,7 +524,7 @@ css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex(
     return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
 }
 
-css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -532,7 +532,7 @@ css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIn
     return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
 }
 
-css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -540,7 +540,7 @@ css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIn
     return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
 }
 
-sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -573,7 +573,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I
 
 // XAccessibleEventBroadcaster
 
-void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
 {
     if (xListener.is())
     {
@@ -583,7 +583,7 @@ void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Referenc
     }
 }
 
-void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
 {
     if ( xListener.is() && m_nClientId )
     {
@@ -609,7 +609,6 @@ void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Refer
 // initial implementation and has to be substituted by code that determines
 // the color that is actually used.
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return COL_BLACK;
 }
@@ -618,7 +617,6 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground()
 // initial implementation and has to be substituted by code that determines
 // the color that is actually used.
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return COL_WHITE;
 }
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx
index 536e2a967370..a3a5774e1ff2 100644
--- a/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -85,13 +85,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VC
 // XServiceInfo
 
 
-OUString VCLXAccessibleMenu::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleMenu::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleMenu" );
 }
 
 
-Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleMenu" };
 }
@@ -100,7 +100,7 @@ Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (Runti
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -108,7 +108,7 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount(  ) throw (RuntimeExceptio
 }
 
 
-Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -119,7 +119,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) t
 }
 
 
-sal_Int16 VCLXAccessibleMenu::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleMenu::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -130,7 +130,7 @@ sal_Int16 VCLXAccessibleMenu::getAccessibleRole(  ) throw (RuntimeException, std
 // XAccessibleComponent
 
 
-Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Point& rPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -141,7 +141,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Po
 // XAccessibleSelection
 
 
-void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -152,7 +152,7 @@ void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (I
 }
 
 
-sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -163,7 +163,7 @@ sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex )
 }
 
 
-void VCLXAccessibleMenu::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+void VCLXAccessibleMenu::clearAccessibleSelection(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -171,13 +171,13 @@ void VCLXAccessibleMenu::clearAccessibleSelection(  ) throw (RuntimeException, s
 }
 
 
-void VCLXAccessibleMenu::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+void VCLXAccessibleMenu::selectAllAccessibleChildren(  )
 {
     // This method makes no sense in a menu, and so does nothing.
 }
 
 
-sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -193,7 +193,7 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount(  ) throw (Runtime
 }
 
 
-Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -215,7 +215,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int
 }
 
 
-void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -226,7 +226,7 @@ void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw
 }
 
 
-OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index f1855c59c3a4..ba5715e5d9de 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -124,13 +124,13 @@ void VCLXAccessibleMenuBar::disposing()
 // XServiceInfo
 
 
-OUString VCLXAccessibleMenuBar::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleMenuBar::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleMenuBar" );
 }
 
 
-Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleMenuBar" };
 }
@@ -139,7 +139,7 @@ Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (Ru
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -170,7 +170,7 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent(  ) throw (RuntimeEx
 }
 
 
-sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -181,7 +181,7 @@ sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole(  ) throw (RuntimeException,
 // XAccessibleExtendedComponent
 
 
-sal_Int32 VCLXAccessibleMenuBar::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenuBar::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index dcb14fb526f0..26fb4613136e 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -153,13 +153,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemCom
 // XServiceInfo
 
 
-OUString VCLXAccessibleMenuItem::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleMenuItem::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleMenuItem" );
 }
 
 
-Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleMenuItem" };
 }
@@ -168,7 +168,7 @@ Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (R
 // XAccessibleContext
 
 
-sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
     // IA2 CWS. MT: We had the additional roles in UAA for ever, but never used them anywhere.
@@ -190,7 +190,7 @@ sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole(  ) throw (RuntimeException,
 // XAccessibleText
 
 
-sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenuItem::getCaretPosition()
 {
     OExternalLockGuard aGuard( this );
 
@@ -198,7 +198,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException, st
 }
 
 
-sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex )
 {
 
     OExternalLockGuard aGuard( this );
@@ -210,7 +210,7 @@ sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (Ind
 }
 
 
-sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -218,7 +218,7 @@ sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (Inde
 }
 
 
-Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes )
 {
     OExternalLockGuard aGuard( this );
 
@@ -235,7 +235,7 @@ Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_In
 }
 
 
-awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -256,7 +256,7 @@ awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) th
 }
 
 
-sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenuItem::getCharacterCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -264,7 +264,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException, s
 }
 
 
-sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -284,7 +284,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th
 }
 
 
-OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleMenuItem::getSelectedText()
 {
     OExternalLockGuard aGuard( this );
 
@@ -292,7 +292,7 @@ OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException, std:
 }
 
 
-sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenuItem::getSelectionStart()
 {
     OExternalLockGuard aGuard( this );
 
@@ -300,7 +300,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException, s
 }
 
 
-sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd()
 {
     OExternalLockGuard aGuard( this );
 
@@ -308,7 +308,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException, std
 }
 
 
-sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -319,7 +319,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32
 }
 
 
-OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleMenuItem::getText()
 {
     OExternalLockGuard aGuard( this );
 
@@ -327,7 +327,7 @@ OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException, std::excepti
 }
 
 
-OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -335,7 +335,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32
 }
 
 
-css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     OExternalLockGuard aGuard( this );
 
@@ -343,7 +343,7 @@ css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int3
 }
 
 
-css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     OExternalLockGuard aGuard( this );
 
@@ -351,7 +351,7 @@ css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_
 }
 
 
-css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     OExternalLockGuard aGuard( this );
 
@@ -359,7 +359,7 @@ css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_
 }
 
 
-sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -395,7 +395,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd
 // XAccessibleAction
 
 
-sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( )
 {
     OExternalLockGuard aGuard( this );
 
@@ -403,7 +403,7 @@ sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeExce
 }
 
 
-sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -416,7 +416,7 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (
 }
 
 
-OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -427,7 +427,7 @@ OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nInd
 }
 
 
-Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -506,7 +506,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe
 // XAccessibleValue
 
 
-Any VCLXAccessibleMenuItem::getCurrentValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleMenuItem::getCurrentValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -520,7 +520,7 @@ Any VCLXAccessibleMenuItem::getCurrentValue(  ) throw (RuntimeException, std::ex
 }
 
 
-sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber )
 {
     OExternalLockGuard aGuard( this );
 
@@ -543,7 +543,7 @@ sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (Ru
 }
 
 
-Any VCLXAccessibleMenuItem::getMaximumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleMenuItem::getMaximumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -554,7 +554,7 @@ Any VCLXAccessibleMenuItem::getMaximumValue(  ) throw (RuntimeException, std::ex
 }
 
 
-Any VCLXAccessibleMenuItem::getMinimumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleMenuItem::getMinimumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
index 3e92cf818ddc..ca7162de520f 100644
--- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
@@ -45,13 +45,13 @@ VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator()
 // XServiceInfo
 
 
-OUString VCLXAccessibleMenuSeparator::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleMenuSeparator::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleMenuSeparator" );
 }
 
 
-Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleMenuSeparator" };
 }
@@ -60,7 +60,7 @@ Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() thr
 // XAccessibleContext
 
 
-sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
index 6f0730d212d0..2fb569857bf2 100644
--- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
@@ -51,13 +51,13 @@ bool VCLXAccessiblePopupMenu::IsFocused()
 // XServiceInfo
 
 
-OUString VCLXAccessiblePopupMenu::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessiblePopupMenu::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessiblePopupMenu" );
 }
 
 
-Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessiblePopupMenu" };
 }
@@ -66,7 +66,7 @@ Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -74,7 +74,7 @@ sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent(  ) throw (Runtime
 }
 
 
-sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -85,7 +85,7 @@ sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole(  ) throw (RuntimeException
 // XAccessibleExtendedComponent
 
 
-sal_Int32 VCLXAccessiblePopupMenu::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessiblePopupMenu::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index ab567e27609f..e39f07de5716 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -134,13 +134,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextC
 // XServiceInfo
 
 
-OUString VCLXAccessibleRadioButton::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleRadioButton::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleRadioButton" );
 }
 
 
-Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleRadioButton" };
 }
@@ -149,7 +149,7 @@ Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw
 // XAccessibleAction
 
 
-sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( )
 {
     OExternalLockGuard aGuard( this );
 
@@ -157,7 +157,7 @@ sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeE
 }
 
 
-sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -172,7 +172,7 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) thro
 }
 
 
-OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -183,7 +183,7 @@ OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 n
 }
 
 
-Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -224,7 +224,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio
 // XAccessibleValue
 
 
-Any VCLXAccessibleRadioButton::getCurrentValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleRadioButton::getCurrentValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -238,7 +238,7 @@ Any VCLXAccessibleRadioButton::getCurrentValue(  ) throw (RuntimeException, std:
 }
 
 
-sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber )
 {
     OExternalLockGuard aGuard( this );
 
@@ -263,7 +263,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw
 }
 
 
-Any VCLXAccessibleRadioButton::getMaximumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleRadioButton::getMaximumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -274,7 +274,7 @@ Any VCLXAccessibleRadioButton::getMaximumValue(  ) throw (RuntimeException, std:
 }
 
 
-Any VCLXAccessibleRadioButton::getMinimumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleRadioButton::getMinimumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 74e89b53d36e..6995adf18946 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -101,13 +101,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleCompone
 // XServiceInfo
 
 
-OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleScrollBar::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleScrollBar" );
 }
 
 
-Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleScrollBar" };
 }
@@ -116,7 +116,7 @@ Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (
 // XAccessibleAction
 
 
-sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( )
 {
     OExternalLockGuard aGuard( this );
 
@@ -124,7 +124,7 @@ sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeExc
 }
 
 
-sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -152,7 +152,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw
 }
 
 
-OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -174,7 +174,7 @@ OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIn
 }
 
 
-Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -188,7 +188,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionK
 // XAccessibleValue
 
 
-Any VCLXAccessibleScrollBar::getCurrentValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleScrollBar::getCurrentValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -202,7 +202,7 @@ Any VCLXAccessibleScrollBar::getCurrentValue(  ) throw (RuntimeException, std::e
 }
 
 
-sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber )
 {
     OExternalLockGuard aGuard( this );
 
@@ -229,7 +229,7 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R
 }
 
 
-Any VCLXAccessibleScrollBar::getMaximumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleScrollBar::getMaximumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -243,7 +243,7 @@ Any VCLXAccessibleScrollBar::getMaximumValue(  ) throw (RuntimeException, std::e
 }
 
 
-Any VCLXAccessibleScrollBar::getMinimumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleScrollBar::getMinimumValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -254,7 +254,7 @@ Any VCLXAccessibleScrollBar::getMinimumValue(  ) throw (RuntimeException, std::e
 }
 
 
-OUString VCLXAccessibleScrollBar::getAccessibleName(  ) throw (uno::RuntimeException, std::exception)
+OUString VCLXAccessibleScrollBar::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 22b4e22713ee..86686997e63b 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -273,13 +273,13 @@ void VCLXAccessibleStatusBar::disposing()
 // XServiceInfo
 
 
-OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleStatusBar::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBar" );
 }
 
 
-Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleStatusBar" };
 }
@@ -288,7 +288,7 @@ Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -296,7 +296,7 @@ sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeExcep
 }
 
 
-Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -324,7 +324,7 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32
 // XAccessibleComponent
 
 
-Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const awt::Point& rPoint )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 5ae808ffef67..8ef763456cea 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -157,7 +157,7 @@ void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSe
 // OCommonAccessibleComponent
 
 
-awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() throw (RuntimeException)
+awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds()
 {
     awt::Rectangle aBounds( 0, 0, 0, 0 );
 
@@ -218,19 +218,19 @@ void VCLXAccessibleStatusBarItem::disposing()
 // XServiceInfo
 
 
-OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleStatusBarItem::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBarItem" );
 }
 
 
-sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 
-Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleStatusBarItem" };
 }
@@ -239,7 +239,7 @@ Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() thr
 // XAccessible
 
 
-Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContext(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -250,7 +250,7 @@ Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContex
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -258,7 +258,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeE
 }
 
 
-Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -269,7 +269,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_In
 }
 
 
-Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -281,7 +281,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent(  ) th
 }
 
 
-sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -293,7 +293,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent(  ) throw (Run
 }
 
 
-sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -301,7 +301,7 @@ sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole(  ) throw (RuntimeExcep
 }
 
 
-OUString VCLXAccessibleStatusBarItem::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleStatusBarItem::getAccessibleDescription(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -313,7 +313,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleDescription(  ) throw (Runtim
 }
 
 
-OUString VCLXAccessibleStatusBarItem::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleStatusBarItem::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -321,7 +321,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleName(  ) throw (RuntimeExcept
 }
 
 
-Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -331,7 +331,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRe
 }
 
 
-Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -351,7 +351,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleState
 }
 
 
-Locale VCLXAccessibleStatusBarItem::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale VCLXAccessibleStatusBarItem::getLocale(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -362,7 +362,7 @@ Locale VCLXAccessibleStatusBarItem::getLocale(  ) throw (IllegalAccessibleCompon
 // XAccessibleComponent
 
 
-Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( const awt::Point& )
 {
     OExternalLockGuard aGuard( this );
 
@@ -370,13 +370,13 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( cons
 }
 
 
-void VCLXAccessibleStatusBarItem::grabFocus(  ) throw (RuntimeException, std::exception)
+void VCLXAccessibleStatusBarItem::grabFocus(  )
 {
     // no focus for status bar items
 }
 
 
-sal_Int32 VCLXAccessibleStatusBarItem::getForeground(   ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleStatusBarItem::getForeground(   )
 {
     OExternalLockGuard aGuard( this );
 
@@ -393,7 +393,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getForeground(   ) throw (RuntimeExceptio
 }
 
 
-sal_Int32 VCLXAccessibleStatusBarItem::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleStatusBarItem::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -413,7 +413,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground(  ) throw (RuntimeException
 // XAccessibleExtendedComponent
 
 
-Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont(  ) throw (RuntimeException, std::exception)
+Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -430,7 +430,7 @@ Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont(  ) throw (RuntimeE
 }
 
 
-OUString VCLXAccessibleStatusBarItem::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleStatusBarItem::getTitledBorderText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -438,7 +438,7 @@ OUString VCLXAccessibleStatusBarItem::getTitledBorderText(  ) throw (RuntimeExce
 }
 
 
-OUString VCLXAccessibleStatusBarItem::getToolTipText(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleStatusBarItem::getToolTipText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -449,7 +449,7 @@ OUString VCLXAccessibleStatusBarItem::getToolTipText(  ) throw (RuntimeException
 // XAccessibleText
 
 
-sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition()
 {
     OExternalLockGuard aGuard( this );
 
@@ -457,7 +457,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeExceptio
 }
 
 
-sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -468,7 +468,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw
 }
 
 
-Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes )
 {
     OExternalLockGuard aGuard( this );
 
@@ -491,7 +491,7 @@ Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( s
 }
 
 
-awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -513,7 +513,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex
 }
 
 
-sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -532,7 +532,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint
 }
 
 
-sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -543,7 +543,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_I
 }
 
 
-sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 17762a1a1472..e1426e9f08b3 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -332,13 +332,13 @@ void VCLXAccessibleTabControl::disposing()
 // XServiceInfo
 
 
-OUString VCLXAccessibleTabControl::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleTabControl::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleTabControl" );
 }
 
 
-Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleTabControl" };
 }
@@ -347,7 +347,7 @@ Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -355,7 +355,7 @@ sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeExce
 }
 
 
-Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -379,7 +379,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32
 }
 
 
-sal_Int16 VCLXAccessibleTabControl::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleTabControl::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -387,7 +387,7 @@ sal_Int16 VCLXAccessibleTabControl::getAccessibleRole(  ) throw (RuntimeExceptio
 }
 
 
-OUString VCLXAccessibleTabControl::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleTabControl::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -398,7 +398,7 @@ OUString VCLXAccessibleTabControl::getAccessibleName(  ) throw (RuntimeException
 // XAccessibleSelection
 
 
-void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -410,7 +410,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th
 }
 
 
-sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -425,13 +425,13 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn
 }
 
 
-void VCLXAccessibleTabControl::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+void VCLXAccessibleTabControl::clearAccessibleSelection(  )
 {
     // This method makes no sense in a tab control, and so does nothing.
 }
 
 
-void VCLXAccessibleTabControl::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+void VCLXAccessibleTabControl::selectAllAccessibleChildren(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -439,7 +439,7 @@ void VCLXAccessibleTabControl::selectAllAccessibleChildren(  ) throw (RuntimeExc
 }
 
 
-sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -447,7 +447,7 @@ sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount(  ) throw (R
 }
 
 
-Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -469,7 +469,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( s
 }
 
 
-void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 86259281e49e..9f6999ea5131 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -189,7 +189,7 @@ void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelpe
 // OCommonAccessibleComponent
 
 
-awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw (RuntimeException)
+awt::Rectangle VCLXAccessibleTabPage::implGetBounds()
 {
     awt::Rectangle aBounds( 0, 0, 0, 0 );
 
@@ -249,19 +249,19 @@ void VCLXAccessibleTabPage::disposing()
 // XServiceInfo
 
 
-OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleTabPage::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleTabPage" );
 }
 
 
-sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 
-Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleTabPage" };
 }
@@ -270,7 +270,7 @@ Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (Ru
 // XAccessible
 
 
-Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -281,7 +281,7 @@ Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext(  )
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -297,7 +297,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeExcepti
 }
 
 
-Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -316,7 +316,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i
 }
 
 
-Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -328,7 +328,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent(  ) throw (R
 }
 
 
-sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -340,7 +340,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent(  ) throw (RuntimeEx
 }
 
 
-sal_Int16 VCLXAccessibleTabPage::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleTabPage::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -348,7 +348,7 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole(  ) throw (RuntimeException,
 }
 
 
-OUString VCLXAccessibleTabPage::getAccessibleDescription(    ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleTabPage::getAccessibleDescription(    )
 {
     OExternalLockGuard aGuard( this );
 
@@ -360,7 +360,7 @@ OUString VCLXAccessibleTabPage::getAccessibleDescription(    ) throw (RuntimeExc
 }
 
 
-OUString VCLXAccessibleTabPage::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleTabPage::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -368,7 +368,7 @@ OUString VCLXAccessibleTabPage::getAccessibleName(  ) throw (RuntimeException, s
 }
 
 
-Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -378,7 +378,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelation
 }
 
 
-Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -398,7 +398,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet(
 }
 
 
-Locale VCLXAccessibleTabPage::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale VCLXAccessibleTabPage::getLocale(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -409,7 +409,7 @@ Locale VCLXAccessibleTabPage::getLocale(  ) throw (IllegalAccessibleComponentSta
 // XAccessibleComponent
 
 
-Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt::Point& rPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -437,7 +437,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt:
 }
 
 
-void VCLXAccessibleTabPage::grabFocus(  ) throw (RuntimeException, std::exception)
+void VCLXAccessibleTabPage::grabFocus(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -449,7 +449,7 @@ void VCLXAccessibleTabPage::grabFocus(  ) throw (RuntimeException, std::exceptio
 }
 
 
-sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTabPage::getForeground( )
 {
     OExternalLockGuard aGuard( this );
 
@@ -466,7 +466,7 @@ sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException, std::
 }
 
 
-sal_Int32 VCLXAccessibleTabPage::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTabPage::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -486,7 +486,7 @@ sal_Int32 VCLXAccessibleTabPage::getBackground(  ) throw (RuntimeException, std:
 // XAccessibleExtendedComponent
 
 
-Reference< awt::XFont > VCLXAccessibleTabPage::getFont(  ) throw (RuntimeException, std::exception)
+Reference< awt::XFont > VCLXAccessibleTabPage::getFont(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -503,7 +503,7 @@ Reference< awt::XFont > VCLXAccessibleTabPage::getFont(  ) throw (RuntimeExcepti
 }
 
 
-OUString VCLXAccessibleTabPage::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleTabPage::getTitledBorderText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -511,7 +511,7 @@ OUString VCLXAccessibleTabPage::getTitledBorderText(  ) throw (RuntimeException,
 }
 
 
-OUString VCLXAccessibleTabPage::getToolTipText(  ) throw (RuntimeException, std::exception)
+OUString VCLXAccessibleTabPage::getToolTipText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -522,7 +522,7 @@ OUString VCLXAccessibleTabPage::getToolTipText(  ) throw (RuntimeException, std:
 // XAccessibleText
 
 
-sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTabPage::getCaretPosition()
 {
     OExternalLockGuard aGuard( this );
 
@@ -530,7 +530,7 @@ sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException, std
 }
 
 
-sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -541,7 +541,7 @@ sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (Inde
 }
 
 
-Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes )
 {
     OExternalLockGuard aGuard( this );
 
@@ -564,7 +564,7 @@ Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int
 }
 
 
-awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -584,7 +584,7 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) thr
 }
 
 
-sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -604,7 +604,7 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) thr
 }
 
 
-sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -615,7 +615,7 @@ sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 n
 }
 
 
-sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 94283017d80e..ec89a48d5c3a 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -66,7 +66,7 @@ VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow()
 // OCommonAccessibleComponent
 
 
-awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw (RuntimeException)
+awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds()
 {
     awt::Rectangle aBounds( 0, 0, 0, 0 );
 
@@ -100,7 +100,7 @@ void VCLXAccessibleTabPageWindow::disposing()
 // XAccessibleContext
 
 
-Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -128,7 +128,7 @@ Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent(  ) th
 }
 
 
-sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 3fa741fa4a13..615f70f6d363 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -138,7 +138,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTextComponent, VCLXAccessibleCom
 // XAccessibleText
 
 
-sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTextComponent::getCaretPosition()
 {
     OExternalLockGuard aGuard( this );
 
@@ -146,7 +146,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeExceptio
 }
 
 
-sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -154,7 +154,7 @@ sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw
 }
 
 
-sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -162,7 +162,7 @@ sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw
 }
 
 
-Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes )
 {
     OExternalLockGuard aGuard( this );
 
@@ -236,7 +236,7 @@ Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( s
 }
 
 
-awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -252,7 +252,7 @@ awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex
 }
 
 
-sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTextComponent::getCharacterCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -260,7 +260,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeExcepti
 }
 
 
-sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -273,7 +273,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint
 }
 
 
-OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleTextComponent::getSelectedText()
 {
     OExternalLockGuard aGuard( this );
 
@@ -281,7 +281,7 @@ OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException,
 }
 
 
-sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTextComponent::getSelectionStart()
 {
     OExternalLockGuard aGuard( this );
 
@@ -289,7 +289,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeExcepti
 }
 
 
-sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd()
 {
     OExternalLockGuard aGuard( this );
 
@@ -297,7 +297,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException
 }
 
 
-sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -308,7 +308,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I
 }
 
 
-OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleTextComponent::getText()
 {
     OExternalLockGuard aGuard( this );
 
@@ -316,7 +316,7 @@ OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException, std::ex
 }
 
 
-OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -324,7 +324,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I
 }
 
 
-css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     OExternalLockGuard aGuard( this );
 
@@ -332,7 +332,7 @@ css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal
 }
 
 
-css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     OExternalLockGuard aGuard( this );
 
@@ -340,7 +340,7 @@ css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex(
 }
 
 
-css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     OExternalLockGuard aGuard( this );
 
@@ -348,7 +348,7 @@ css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex(
 }
 
 
-sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx
index 0b34a576dc77..f3a460c36bbd 100644
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -67,7 +67,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleTextField, VCLXAccessibleTextComp
 
 Reference<XAccessibleContext> SAL_CALL
     VCLXAccessibleTextField::getAccessibleContext()
-    throw (RuntimeException, std::exception)
 {
     return this;
 }
@@ -76,21 +75,18 @@ Reference<XAccessibleContext> SAL_CALL
 // XAccessibleContext
 
 sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount()
-    throw (RuntimeException, std::exception)
 {
     return 0;
 }
 
 
 Reference<XAccessible> SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal_Int32)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     throw IndexOutOfBoundsException();
 }
 
 
 sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole()
-    throw (RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -98,7 +94,6 @@ sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole()
 }
 
 Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent(  )
-    throw (RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -109,14 +104,12 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent(
 // XServiceInfo
 
 OUString VCLXAccessibleTextField::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleTextField" );
 }
 
 
 Sequence< OUString > VCLXAccessibleTextField::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aNames = VCLXAccessibleTextComponent::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index ab3ff8185dff..2280b4185d02 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -60,11 +60,11 @@ namespace
             ,m_nIndexInParent(_nIndexInParent)
         {
         }
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
     };
 
 
-    sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_nIndexInParent;
@@ -115,7 +115,7 @@ namespace
             ) override;
 
         // XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) override;
         static Sequence< sal_Int8 > getUnoTunnelImplementationId();
     };
 
@@ -157,7 +157,7 @@ namespace
         return pId->getImplementationId();
     }
 
-    sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException, std::exception)
+    sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId )
     {
         if  (   ( 16 == _rId.getLength() )
             &&  ( 0 == memcmp( getUnoTunnelImplementationId().getConstArray(),  _rId.getConstArray(), 16 ) )
@@ -666,12 +666,12 @@ void SAL_CALL VCLXAccessibleToolBox::disposing()
 }
 
 // XServiceInfo
-OUString VCLXAccessibleToolBox::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleToolBox::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleToolBox" );
 }
 
-Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames()
 {
     Sequence< OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
@@ -681,7 +681,7 @@ Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (Ru
 }
 
 // XAccessibleContext
-sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount(  )
 {
     comphelper::OExternalLockGuard aGuard( this );
 
@@ -693,7 +693,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount(  ) throw (Run
     return nCount;
 }
 
-Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i )
 {
     if ( i < 0 || i >= getAccessibleChildCount() )
         throw IndexOutOfBoundsException();
@@ -740,7 +740,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal
     return nullptr;
 }
 
-Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint )
 {
     comphelper::OExternalLockGuard aGuard( this );
 
@@ -785,7 +785,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetChildAccessible( const VclWin
 }
 
 // XAccessibleSelection
-void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
     if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
@@ -795,7 +795,7 @@ void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw
     pToolBox->ChangeHighlight( nPos );
 }
 
-sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
     if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
@@ -808,20 +808,20 @@ sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex
         return false;
 }
 
-void VCLXAccessibleToolBox::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+void VCLXAccessibleToolBox::clearAccessibleSelection(  )
 {
     OExternalLockGuard aGuard( this );
     VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
     pToolBox -> LoseFocus();
 }
 
-void VCLXAccessibleToolBox::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+void VCLXAccessibleToolBox::selectAllAccessibleChildren(  )
 {
     OExternalLockGuard aGuard( this );
     // intentionally empty. makes no sense for a toolbox
 }
 
-sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount(  )
 {
     OExternalLockGuard aGuard( this );
     sal_Int32 nRet = 0;
@@ -836,7 +836,7 @@ sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount(  ) throw (Runt
     return nRet;
 }
 
-Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     OExternalLockGuard aGuard( this );
     if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() )
@@ -853,7 +853,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_
     return xChild;
 }
 
-void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
     if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 9d189001e403..645c7cbe6663 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -238,7 +238,7 @@ void VCLXAccessibleToolBoxItem::ToggleEnableState()
     NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] );
 }
 
-awt::Rectangle VCLXAccessibleToolBoxItem::implGetBounds(  ) throw (RuntimeException)
+awt::Rectangle VCLXAccessibleToolBoxItem::implGetBounds(  )
 {
     awt::Rectangle aRect;
     if ( m_pToolBox )
@@ -266,7 +266,7 @@ void VCLXAccessibleToolBoxItem::implGetSelection( sal_Int32& nStartIndex, sal_In
 // XInterface
 
 IMPLEMENT_FORWARD_REFCOUNT( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE )
-Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType )
 {
     // #i33611# - toolbox buttons without text don't support XAccessibleText
     if ( _rType == cppu::UnoType<XAccessibleText>::get()
@@ -293,17 +293,17 @@ void SAL_CALL VCLXAccessibleToolBoxItem::disposing()
 
 // XServiceInfo
 
-OUString VCLXAccessibleToolBoxItem::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleToolBoxItem::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleToolBoxItem" );
 }
 
-sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames()
 {
     return {"com.sun.star.accessibility.AccessibleContext",
             "com.sun.star.accessibility.AccessibleComponent",
@@ -313,21 +313,21 @@ Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw
 
 // XAccessible
 
-Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleContext(  )
 {
     return this;
 }
 
 // XAccessibleContext
 
-sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount(  )
 {
     OContextEntryGuard aGuard( this );
 
     return m_xChild.is() ? 1 : 0;
 }
 
-Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i ) throw (RuntimeException,  css::lang::IndexOutOfBoundsException, std::exception)
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i )
 {
     OContextEntryGuard aGuard( this );
 
@@ -338,28 +338,28 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild(
     return m_xChild;
 }
 
-Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent(  )
 {
     OContextEntryGuard aGuard( this );
 
     return m_pToolBox->GetAccessible();
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent(  )
 {
     OContextEntryGuard aGuard( this );
 
     return m_nIndexInParent;
 }
 
-sal_Int16 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRole(  )
 {
     OContextEntryGuard aGuard( this );
 
     return m_nRole;
 }
 
-OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -376,7 +376,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription(  ) throw
     }
 }
 
-OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -384,7 +384,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName(  ) throw (Runtim
     return GetText();
 }
 
-Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet(  )
 {
     OContextEntryGuard aGuard( this );
 
@@ -393,7 +393,7 @@ Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAcces
     return xSet;
 }
 
-Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -427,12 +427,12 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessib
 
 // XAccessibleText
 
-sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition()
 {
     return -1;
 }
 
-sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -442,7 +442,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex
     return false;
 }
 
-Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& )
 {
     OExternalLockGuard aGuard( this );
 
@@ -454,7 +454,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttrib
     return Sequence< PropertyValue >();
 }
 
-awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -475,7 +475,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32
     return aBounds;
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& aPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -494,7 +494,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point&
     return nIndex;
 }
 
-sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -504,7 +504,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex
     return false;
 }
 
-sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -538,12 +538,12 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa
 
 // XAccessibleComponent
 
-Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoint( const awt::Point& )
 {
     return Reference< XAccessible >();
 }
 
-void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus(  ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus(  )
 {
     Reference< XAccessible > xParent(getAccessibleParent());
 
@@ -558,7 +558,7 @@ void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus(  ) throw (RuntimeException,
     }
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -569,7 +569,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground(  ) throw (RuntimeEx
     return nColor;
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -581,12 +581,12 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground(  ) throw (RuntimeEx
 }
 
 // XAccessibleExtendedComponent
-Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont(    ) throw (RuntimeException, std::exception)
+Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont(    )
 {
     return uno::Reference< awt::XFont >();
 }
 
-OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -597,7 +597,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText(  ) throw (Runt
     return sRet;
 }
 
-OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -617,13 +617,13 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText(  ) throw (RuntimeEx
 
 // XAccessibleAction
 
-sal_Int32 VCLXAccessibleToolBoxItem::getAccessibleActionCount( ) throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleToolBoxItem::getAccessibleActionCount( )
 {
     // only one action -> "Click"
     return 1;
 }
 
-sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -636,7 +636,7 @@ sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) thro
     return true;
 }
 
-OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -646,7 +646,7 @@ OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 n
     return OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
 }
 
-Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     OContextEntryGuard aGuard( this );
 
@@ -658,7 +658,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActio
 
 // XAccessibleValue
 
-Any VCLXAccessibleToolBoxItem::getCurrentValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleToolBoxItem::getCurrentValue(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -671,7 +671,7 @@ Any VCLXAccessibleToolBoxItem::getCurrentValue(  ) throw (RuntimeException, std:
     return aValue;
 }
 
-sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber )
 {
     OExternalLockGuard aGuard( this );
 
@@ -694,12 +694,12 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw
     return bReturn;
 }
 
-Any VCLXAccessibleToolBoxItem::getMaximumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleToolBoxItem::getMaximumValue(  )
 {
     return makeAny((sal_Int32)1);
 }
 
-Any VCLXAccessibleToolBoxItem::getMinimumValue(  ) throw (RuntimeException, std::exception)
+Any VCLXAccessibleToolBoxItem::getMinimumValue(  )
 {
     return makeAny((sal_Int32)0);
 }
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index db17efc1b558..77a5d0d77374 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -131,154 +131,154 @@ public:
     explicit AnimationNode(const AnimationNode& rNode);
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( const Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XTypeProvider
-    virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw(std::exception) override;
-    Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
 
     // XChild
-    virtual Reference< XInterface > SAL_CALL getParent() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) override;
+    virtual Reference< XInterface > SAL_CALL getParent() override;
+    virtual void SAL_CALL setParent( const Reference< XInterface >& Parent ) override;
 
     // XCloneable
-    virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException, std::exception) override;
+    virtual Reference< XCloneable > SAL_CALL createClone() override;
 
     // XAnimationNode
-    virtual sal_Int16 SAL_CALL getType() throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getBegin() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getDuration() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getEnd() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getEndSync() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getRepeatCount() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getRepeatDuration() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getFill() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getRestart() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) override;
-    virtual double SAL_CALL getAcceleration() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) override;
-    virtual double SAL_CALL getDecelerate() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getType() override;
+    virtual Any SAL_CALL getBegin() override;
+    virtual void SAL_CALL setBegin( const Any& _begin ) override;
+    virtual Any SAL_CALL getDuration() override;
+    virtual void SAL_CALL setDuration( const Any& _duration ) override;
+    virtual Any SAL_CALL getEnd() override;
+    virtual void SAL_CALL setEnd( const Any& _end ) override;
+    virtual Any SAL_CALL getEndSync() override;
+    virtual void SAL_CALL setEndSync( const Any& _endsync ) override;
+    virtual Any SAL_CALL getRepeatCount() override;
+    virtual void SAL_CALL setRepeatCount( const Any& _repeatcount ) override;
+    virtual Any SAL_CALL getRepeatDuration() override;
+    virtual void SAL_CALL setRepeatDuration( const Any& _repeatduration ) override;
+    virtual sal_Int16 SAL_CALL getFill() override;
+    virtual void SAL_CALL setFill( sal_Int16 _fill ) override;
+    virtual sal_Int16 SAL_CALL getFillDefault() override;
+    virtual void SAL_CALL setFillDefault( sal_Int16 _filldefault ) override;
+    virtual sal_Int16 SAL_CALL getRestart() override;
+    virtual void SAL_CALL setRestart( sal_Int16 _restart ) override;
+    virtual sal_Int16 SAL_CALL getRestartDefault() override;
+    virtual void SAL_CALL setRestartDefault( sal_Int16 _restartdefault ) override;
+    virtual double SAL_CALL getAcceleration() override;
+    virtual void SAL_CALL setAcceleration( double _acceleration ) override;
+    virtual double SAL_CALL getDecelerate() override;
+    virtual void SAL_CALL setDecelerate( double _decelerate ) override;
+    virtual sal_Bool SAL_CALL getAutoReverse() override;
+    virtual void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) override;
+    virtual Sequence< NamedValue > SAL_CALL getUserData() override;
+    virtual void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) override;
 
     // XAnimate
-    virtual Any SAL_CALL getTarget() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getSubItem() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSubItem( sal_Int16 _subitem ) throw (RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAttributeName() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAttributeName( const OUString& _attribute ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< Any > SAL_CALL getValues() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValues( const Sequence< Any >& _values ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< double > SAL_CALL getKeyTimes() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getValueType() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValueType( sal_Int16 _valuetype ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getCalcMode() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCalcMode( sal_Int16 _calcmode ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAccumulate() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAccumulate( sal_Bool _accumulate ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAdditive() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAdditive( sal_Int16 _additive ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getFrom() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFrom( const Any& _from ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getTo() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTo( const Any& _to ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getBy() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBy( const Any& _by ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< TimeFilterPair > SAL_CALL getTimeFilter() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) throw (RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getFormula() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFormula( const OUString& _formula ) throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getTarget() override;
+    virtual void SAL_CALL setTarget( const Any& _target ) override;
+    virtual sal_Int16 SAL_CALL getSubItem() override;
+    virtual void SAL_CALL setSubItem( sal_Int16 _subitem ) override;
+    virtual OUString SAL_CALL getAttributeName() override;
+    virtual void SAL_CALL setAttributeName( const OUString& _attribute ) override;
+    virtual Sequence< Any > SAL_CALL getValues() override;
+    virtual void SAL_CALL setValues( const Sequence< Any >& _values ) override;
+    virtual Sequence< double > SAL_CALL getKeyTimes() override;
+    virtual void SAL_CALL setKeyTimes( const Sequence< double >& _keytimes ) override;
+    virtual sal_Int16 SAL_CALL getValueType() override;
+    virtual void SAL_CALL setValueType( sal_Int16 _valuetype ) override;
+    virtual sal_Int16 SAL_CALL getCalcMode() override;
+    virtual void SAL_CALL setCalcMode( sal_Int16 _calcmode ) override;
+    virtual sal_Bool SAL_CALL getAccumulate() override;
+    virtual void SAL_CALL setAccumulate( sal_Bool _accumulate ) override;
+    virtual sal_Int16 SAL_CALL getAdditive() override;
+    virtual void SAL_CALL setAdditive( sal_Int16 _additive ) override;
+    virtual Any SAL_CALL getFrom() override;
+    virtual void SAL_CALL setFrom( const Any& _from ) override;
+    virtual Any SAL_CALL getTo() override;
+    virtual void SAL_CALL setTo( const Any& _to ) override;
+    virtual Any SAL_CALL getBy() override;
+    virtual void SAL_CALL setBy( const Any& _by ) override;
+    virtual Sequence< TimeFilterPair > SAL_CALL getTimeFilter() override;
+    virtual void SAL_CALL setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) override;
+    virtual OUString SAL_CALL getFormula() override;
+    virtual void SAL_CALL setFormula( const OUString& _formula ) override;
 
     // XAnimateColor
-    virtual sal_Int16 SAL_CALL getColorInterpolation() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDirection() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDirection( sal_Bool _direction ) throw (RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getColorInterpolation() override;
+    virtual void SAL_CALL setColorInterpolation( sal_Int16 _colorspace ) override;
+    virtual sal_Bool SAL_CALL getDirection() override;
+    virtual void SAL_CALL setDirection( sal_Bool _direction ) override;
 
     // XAnimateMotion
-    virtual Any SAL_CALL getPath() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPath( const Any& _path ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getOrigin() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOrigin( const Any& _origin ) throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getPath() override;
+    virtual void SAL_CALL setPath( const Any& _path ) override;
+    virtual Any SAL_CALL getOrigin() override;
+    virtual void SAL_CALL setOrigin( const Any& _origin ) override;
 
     // XAnimateTransform
-    virtual sal_Int16 SAL_CALL getTransformType() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTransformType( sal_Int16 _transformtype ) throw (RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getTransformType() override;
+    virtual void SAL_CALL setTransformType( sal_Int16 _transformtype ) override;
 
     // XTransitionFilter
-    virtual sal_Int16 SAL_CALL getTransition() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTransition( sal_Int16 _transition ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getSubtype() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSubtype( sal_Int16 _subtype ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMode() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMode( sal_Bool _mode ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getFadeColor() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getTransition() override;
+    virtual void SAL_CALL setTransition( sal_Int16 _transition ) override;
+    virtual sal_Int16 SAL_CALL getSubtype() override;
+    virtual void SAL_CALL setSubtype( sal_Int16 _subtype ) override;
+    virtual sal_Bool SAL_CALL getMode() override;
+    virtual void SAL_CALL setMode( sal_Bool _mode ) override;
+    virtual sal_Int32 SAL_CALL getFadeColor() override;
+    virtual void SAL_CALL setFadeColor( sal_Int32 _fadecolor ) override;
 
     // XAudio
-    virtual Any SAL_CALL getSource() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSource( const Any& _source ) throw (RuntimeException, std::exception) override;
-    virtual double SAL_CALL getVolume() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVolume( double _volume ) throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getSource() override;
+    virtual void SAL_CALL setSource( const Any& _source ) override;
+    virtual double SAL_CALL getVolume() override;
+    virtual void SAL_CALL setVolume( double _volume ) override;
 
 
     // XCommand - the following two shadowed by animate, unfortunately
 //    virtual Any SAL_CALL getTarget() throw (RuntimeException);
 //    virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException);
-    virtual sal_Int16 SAL_CALL getCommand() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCommand( sal_Int16 _command ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getParameter() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParameter( const Any& _parameter ) throw (RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getCommand() override;
+    virtual void SAL_CALL setCommand( sal_Int16 _command ) override;
+    virtual Any SAL_CALL getParameter() override;
+    virtual void SAL_CALL setParameter( const Any& _parameter ) override;
 
     // XElementAccess
-    virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override;
+    virtual Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
-    virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception) override;
+    virtual Reference< XEnumeration > SAL_CALL createEnumeration() override;
 
     // XTimeContainer
-    virtual Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) override;
+    virtual Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) override;
+    virtual Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) override;
+    virtual Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) override;
+    virtual Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) override;
 
     // XIterateContainer
-    virtual sal_Int16 SAL_CALL getIterateType() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException, std::exception) override;
-    virtual double SAL_CALL getIterateInterval() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setIterateInterval( double _iterateinterval ) throw (RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getIterateType() override;
+    virtual void SAL_CALL setIterateType( sal_Int16 _iteratetype ) override;
+    virtual double SAL_CALL getIterateInterval() override;
+    virtual void SAL_CALL setIterateInterval( double _iterateinterval ) override;
 
     // XChangesNotifier
-    virtual void SAL_CALL addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChangesListener( const Reference< XChangesListener >& aListener ) override;
+    virtual void SAL_CALL removeChangesListener( const Reference< XChangesListener >& aListener ) override;
 
     // XUnoTunnel
-    virtual ::sal_Int64 SAL_CALL getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception) override;
+    virtual ::sal_Int64 SAL_CALL getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) override;
 
     static const Sequence< sal_Int8 > & getUnoTunnelId();
     void fireChangeListener();
@@ -353,8 +353,8 @@ public:
     explicit TimeContainerEnumeration( const ChildList_t &rChildren );
 
     // Methods
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL nextElement(  ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual Any SAL_CALL nextElement(  ) override;
 
 private:
     /** sorted list of child nodes */
@@ -374,7 +374,7 @@ TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChildren
 }
 
 // Methods
-sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements()
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -382,7 +382,6 @@ sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeExce
 }
 
 Any SAL_CALL TimeContainerEnumeration::nextElement()
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -605,7 +604,7 @@ OUString getImplementationName_COMMAND()
 }
 
 // XInterface
-Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::queryInterface( const Type& aType )
 {
     Any aRet( ::cppu::queryInterface(
         aType,
@@ -771,7 +770,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw()
 }
 
 
-Sequence< Type > AnimationNode::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > AnimationNode::getTypes()
 {
     if (! mpTypes[mnNodeType])
         initTypeProvider(mnNodeType);
@@ -779,7 +778,7 @@ Sequence< Type > AnimationNode::getTypes() throw (RuntimeException, std::excepti
 }
 
 
-Sequence< sal_Int8 > AnimationNode::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > AnimationNode::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -800,7 +799,7 @@ void SAL_CALL AnimationNode::release(  ) throw ()
 
 
 // XServiceInfo
-OUString AnimationNode::getImplementationName() throw(std::exception)
+OUString AnimationNode::getImplementationName()
 {
     switch( mnNodeType )
     {
@@ -831,13 +830,13 @@ OUString AnimationNode::getImplementationName() throw(std::exception)
 }
 
 // XServiceInfo
-sal_Bool AnimationNode::supportsService(const OUString& ServiceName) throw(std::exception)
+sal_Bool AnimationNode::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > AnimationNode::getSupportedServiceNames() throw(std::exception)
+Sequence< OUString > AnimationNode::getSupportedServiceNames()
 {
     switch( mnNodeType )
     {
@@ -869,7 +868,7 @@ Sequence< OUString > AnimationNode::getSupportedServiceNames() throw(std::except
 
 
 // XAnimationNode
-sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getType()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnNodeType;
@@ -877,7 +876,7 @@ sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException, std::except
 
 
 // XAnimationNode
-Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getBegin()
 {
     Guard< Mutex > aGuard( maMutex );
     return maBegin;
@@ -885,7 +884,7 @@ Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException, std::exception)
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setBegin( const Any& _begin )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _begin != maBegin )
@@ -897,7 +896,7 @@ void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeExcepti
 
 
 // XAnimationNode
-Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getDuration()
 {
     Guard< Mutex > aGuard( maMutex );
     return maDuration;
@@ -905,7 +904,7 @@ Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException, std::exceptio
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setDuration( const Any& _duration )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _duration != maDuration )
@@ -917,7 +916,7 @@ void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeE
 
 
 // XAnimationNode
-Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getEnd()
 {
     Guard< Mutex > aGuard( maMutex );
     return maEnd;
@@ -925,7 +924,7 @@ Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException, std::exception)
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setEnd( const Any& _end )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _end != maEnd )
@@ -937,7 +936,7 @@ void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException,
 
 
 // XAnimationNode
-Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getEndSync()
 {
     Guard< Mutex > aGuard( maMutex );
     return maEndSync;
@@ -945,7 +944,7 @@ Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException, std::exception
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setEndSync( const Any& _endsync )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _endsync != maEndSync )
@@ -957,7 +956,7 @@ void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeExc
 
 
 // XAnimationNode
-Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getRepeatCount()
 {
     Guard< Mutex > aGuard( maMutex );
     return maRepeatCount;
@@ -965,7 +964,7 @@ Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException, std::excep
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _repeatcount != maRepeatCount )
@@ -977,7 +976,7 @@ void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (Ru
 
 
 // XAnimationNode
-Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getRepeatDuration()
 {
     Guard< Mutex > aGuard( maMutex );
     return maRepeatDuration;
@@ -985,7 +984,7 @@ Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException, std::ex
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _repeatduration != maRepeatDuration )
@@ -997,7 +996,7 @@ void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) thr
 
 
 // XAnimationNode
-sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getFill()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnFill;
@@ -1005,7 +1004,7 @@ sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException, std::except
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setFill( sal_Int16 _fill )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _fill != mnFill )
@@ -1017,7 +1016,7 @@ void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException,
 
 
 // XAnimationNode
-sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getFillDefault()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnFillDefault;
@@ -1025,7 +1024,7 @@ sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException, std:
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _filldefault != mnFillDefault )
@@ -1037,7 +1036,7 @@ void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (Run
 
 
 // XAnimationNode
-sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getRestart()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnRestart;
@@ -1045,7 +1044,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException, std::exc
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _restart != mnRestart )
@@ -1057,7 +1056,7 @@ void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeExce
 
 
 // XAnimationNode
-sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getRestartDefault()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnRestartDefault;
@@ -1065,7 +1064,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException, s
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _restartdefault != mnRestartDefault )
@@ -1077,7 +1076,7 @@ void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) thro
 
 
 // XAnimationNode
-double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException, std::exception)
+double SAL_CALL AnimationNode::getAcceleration()
 {
     Guard< Mutex > aGuard( maMutex );
     return mfAcceleration;
@@ -1085,7 +1084,7 @@ double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException, std::e
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setAcceleration( double _acceleration )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _acceleration != mfAcceleration )
@@ -1097,7 +1096,7 @@ void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (Runt
 
 
 // XAnimationNode
-double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException, std::exception)
+double SAL_CALL AnimationNode::getDecelerate()
 {
     Guard< Mutex > aGuard( maMutex );
     return mfDecelerate;
@@ -1105,7 +1104,7 @@ double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException, std::exc
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setDecelerate( double _decelerate )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _decelerate != mfDecelerate )
@@ -1117,7 +1116,7 @@ void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeE
 
 
 // XAnimationNode
-sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL AnimationNode::getAutoReverse()
 {
     Guard< Mutex > aGuard( maMutex );
     return mbAutoReverse;
@@ -1125,7 +1124,7 @@ sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException, std::
 
 
 // XAnimationNode
-void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse )
 {
     Guard< Mutex > aGuard( maMutex );
     if( bool(_autoreverse) != mbAutoReverse )
@@ -1136,14 +1135,14 @@ void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (Runt
 }
 
 
-Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeException, std::exception)
+Sequence< NamedValue > SAL_CALL AnimationNode::getUserData()
 {
     Guard< Mutex > aGuard( maMutex );
     return maUserData;
 }
 
 
-void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata )
 {
     Guard< Mutex > aGuard( maMutex );
     maUserData = _userdata;
@@ -1152,7 +1151,7 @@ void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdat
 
 
 // XChild
-Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL AnimationNode::getParent()
 {
     Guard< Mutex > aGuard( maMutex );
     return mxParent.get();
@@ -1160,7 +1159,7 @@ Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeExcept
 
 
 // XChild
-void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent )
 {
     Guard< Mutex > aGuard( maMutex );
     if( Parent != mxParent.get() )
@@ -1178,7 +1177,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent )
 
 
 // XCloneable
-Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeException, std::exception)
+Reference< XCloneable > SAL_CALL AnimationNode::createClone()
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -1222,7 +1221,6 @@ Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeExce
 
 // XAnimate
 Any SAL_CALL AnimationNode::getTarget()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     return maTarget;
@@ -1231,7 +1229,6 @@ Any SAL_CALL AnimationNode::getTarget()
 
 // XAnimate
 void SAL_CALL AnimationNode::setTarget( const Any& _target )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     if( _target != maTarget )
@@ -1243,7 +1240,7 @@ void SAL_CALL AnimationNode::setTarget( const Any& _target )
 
 
 // XAnimate
-OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException, std::exception)
+OUString SAL_CALL AnimationNode::getAttributeName()
 {
     Guard< Mutex > aGuard( maMutex );
     return maAttributeName;
@@ -1252,7 +1249,6 @@ OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException, std
 
 // XAnimate
 void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     if( _attribute != maAttributeName )
@@ -1265,7 +1261,6 @@ void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute )
 
 // XAnimate
 Sequence< Any > SAL_CALL AnimationNode::getValues()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     return maValues;
@@ -1274,7 +1269,6 @@ Sequence< Any > SAL_CALL AnimationNode::getValues()
 
 // XAnimate
 void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     maValues = _values;
@@ -1283,7 +1277,7 @@ void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values )
 
 
 // XAnimate
-sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getSubItem()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnSubItem;
@@ -1291,7 +1285,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException, std::exc
 
 
 // XAnimate
-void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _subitem != mnSubItem )
@@ -1303,7 +1297,7 @@ void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeExce
 
 
 // XAnimate
-Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException, std::exception)
+Sequence< double > SAL_CALL AnimationNode::getKeyTimes()
 {
     Guard< Mutex > aGuard( maMutex );
     return maKeyTimes;
@@ -1311,7 +1305,7 @@ Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException
 
 
 // XAnimate
-void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes )
 {
     Guard< Mutex > aGuard( maMutex );
     maKeyTimes = _keytimes;
@@ -1320,14 +1314,14 @@ void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes )
 
 
 // XAnimate
-sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getValueType()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnValueType;
 }
 
 
-void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _valuetype != mnValueType )
@@ -1340,7 +1334,6 @@ void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (Runtime
 
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getCalcMode()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     return mnCalcMode;
@@ -1349,7 +1342,6 @@ sal_Int16 SAL_CALL AnimationNode::getCalcMode()
 
 // XAnimate
 void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     if( _calcmode != mnCalcMode )
@@ -1362,7 +1354,6 @@ void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode )
 
 // XAnimate
 sal_Bool SAL_CALL AnimationNode::getAccumulate()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     return mbAccumulate;
@@ -1371,7 +1362,6 @@ sal_Bool SAL_CALL AnimationNode::getAccumulate()
 
 // XAnimate
 void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     if( bool(_accumulate) != mbAccumulate )
@@ -1384,7 +1374,6 @@ void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate )
 
 // XAnimate
 sal_Int16 SAL_CALL AnimationNode::getAdditive()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     return mnAdditive;
@@ -1393,7 +1382,6 @@ sal_Int16 SAL_CALL AnimationNode::getAdditive()
 
 // XAnimate
 void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     if( _additive != mnAdditive )
@@ -1406,7 +1394,6 @@ void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive )
 
 // XAnimate
 Any SAL_CALL AnimationNode::getFrom()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     return maFrom;
@@ -1415,7 +1402,6 @@ Any SAL_CALL AnimationNode::getFrom()
 
 // XAnimate
 void SAL_CALL AnimationNode::setFrom( const Any& _from )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     if( _from != maFrom )
@@ -1428,7 +1414,6 @@ void SAL_CALL AnimationNode::setFrom( const Any& _from )
 
 // XAnimate
 Any SAL_CALL AnimationNode::getTo()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     return maTo;
@@ -1437,7 +1422,6 @@ Any SAL_CALL AnimationNode::getTo()
 
 // XAnimate
 void SAL_CALL AnimationNode::setTo( const Any& _to )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     if( _to != maTo )
@@ -1450,7 +1434,6 @@ void SAL_CALL AnimationNode::setTo( const Any& _to )
 
 // XAnimate
 Any SAL_CALL AnimationNode::getBy()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     return maBy;
@@ -1459,7 +1442,6 @@ Any SAL_CALL AnimationNode::getBy()
 
 // XAnimate
 void SAL_CALL AnimationNode::setBy( const Any& _by )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     if( _by != maBy )
@@ -1472,7 +1454,6 @@ void SAL_CALL AnimationNode::setBy( const Any& _by )
 
 // XAnimate
 Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     return maTimeFilter;
@@ -1481,7 +1462,6 @@ Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter()
 
 // XAnimate
 void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _timefilter )
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
     maTimeFilter = _timefilter;
@@ -1489,14 +1469,14 @@ void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _t
 }
 
 
-OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException, std::exception)
+OUString SAL_CALL AnimationNode::getFormula()
 {
     Guard< Mutex > aGuard( maMutex );
     return maFormula;
 }
 
 
-void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setFormula( const OUString& _formula )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _formula != maFormula )
@@ -1508,7 +1488,7 @@ void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (Runti
 
 
 // XAnimateColor
-sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getColorInterpolation()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnColorSpace;
@@ -1516,7 +1496,7 @@ sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeExceptio
 
 
 // XAnimateColor
-void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _colorspace != mnColorSpace )
@@ -1528,7 +1508,7 @@ void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) thro
 
 
 // XAnimateColor
-sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL AnimationNode::getDirection()
 {
     Guard< Mutex > aGuard( maMutex );
     return mbDirection;
@@ -1536,7 +1516,7 @@ sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException, std::ex
 
 
 // XAnimateColor
-void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setDirection( sal_Bool _direction )
 {
     Guard< Mutex > aGuard( maMutex );
     if( bool(_direction) != mbDirection )
@@ -1548,7 +1528,7 @@ void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeE
 
 
 // XAnimateMotion
-Any SAL_CALL AnimationNode::getPath() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getPath()
 {
     Guard< Mutex > aGuard( maMutex );
     return maPath;
@@ -1556,7 +1536,7 @@ Any SAL_CALL AnimationNode::getPath() throw (RuntimeException, std::exception)
 
 
 // XAnimateMotion
-void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setPath( const Any& _path )
 {
     Guard< Mutex > aGuard( maMutex );
     maPath = _path;
@@ -1565,7 +1545,7 @@ void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException
 
 
 // XAnimateMotion
-Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getOrigin()
 {
     Guard< Mutex > aGuard( maMutex );
     return maOrigin;
@@ -1573,7 +1553,7 @@ Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException, std::exception)
 
 
 // XAnimateMotion
-void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setOrigin( const Any& _origin )
 {
     Guard< Mutex > aGuard( maMutex );
     maOrigin = _origin;
@@ -1582,7 +1562,7 @@ void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeExcep
 
 
 // XAnimateTransform
-sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getTransformType()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnTransformType;
@@ -1590,7 +1570,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException, st
 
 
 // XAnimateTransform
-void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _transformtype != mnTransformType )
@@ -1602,7 +1582,7 @@ void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw
 
 
 // XTransitionFilter
-sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getTransition()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnTransition;
@@ -1610,7 +1590,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException, std::
 
 
 // XTransitionFilter
-void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _transition != mnTransition )
@@ -1622,7 +1602,7 @@ void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (Runti
 
 
 // XTransitionFilter
-sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getSubtype()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnSubtype;
@@ -1630,7 +1610,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException, std::exc
 
 
 // XTransitionFilter
-void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _subtype != mnSubtype )
@@ -1642,7 +1622,7 @@ void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeExce
 
 
 // XTransitionFilter
-sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL AnimationNode::getMode()
 {
     Guard< Mutex > aGuard( maMutex );
     return mbMode;
@@ -1650,7 +1630,7 @@ sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException, std::excepti
 
 
 // XTransitionFilter
-void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setMode( sal_Bool _mode )
 {
     Guard< Mutex > aGuard( maMutex );
     if( bool(_mode) != mbMode )
@@ -1662,7 +1642,7 @@ void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException,
 
 
 // XTransitionFilter
-sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AnimationNode::getFadeColor()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnFadeColor;
@@ -1670,7 +1650,7 @@ sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException, std::e
 
 
 // XTransitionFilter
-void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _fadecolor != mnFadeColor )
@@ -1682,7 +1662,7 @@ void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (Runtime
 
 
 // XAudio
-Any SAL_CALL AnimationNode::getSource() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getSource()
 {
     Guard< Mutex > aGuard( maMutex );
     return maTarget;
@@ -1690,7 +1670,7 @@ Any SAL_CALL AnimationNode::getSource() throw (RuntimeException, std::exception)
 
 
 // XAudio
-void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setSource( const Any& _source )
 {
     Guard< Mutex > aGuard( maMutex );
     maTarget = _source;
@@ -1699,7 +1679,7 @@ void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeExcep
 
 
 // XAudio
-double SAL_CALL AnimationNode::getVolume() throw (RuntimeException, std::exception)
+double SAL_CALL AnimationNode::getVolume()
 {
     Guard< Mutex > aGuard( maMutex );
     return mfVolume;
@@ -1707,7 +1687,7 @@ double SAL_CALL AnimationNode::getVolume() throw (RuntimeException, std::excepti
 
 
 // XAudio
-void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setVolume( double _volume )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _volume != mfVolume )
@@ -1719,7 +1699,7 @@ void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException
 
 
 // XCommand
-sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getCommand()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnCommand;
@@ -1727,7 +1707,7 @@ sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException, std::exc
 
 
 // XCommand
-void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setCommand( sal_Int16 _command )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _command != mnCommand )
@@ -1739,7 +1719,7 @@ void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeExce
 
 
 // XCommand
-Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationNode::getParameter()
 {
     Guard< Mutex > aGuard( maMutex );
     return maParameter;
@@ -1747,7 +1727,7 @@ Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException, std::excepti
 
 
 // XCommand
-void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setParameter( const Any& _parameter )
 {
     Guard< Mutex > aGuard( maMutex );
     maParameter = _parameter;
@@ -1756,14 +1736,14 @@ void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (Runtim
 
 
 // XElementAccess
-Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException, std::exception)
+Type SAL_CALL AnimationNode::getElementType()
 {
     return cppu::UnoType<XAnimationNode>::get();
 }
 
 
 // XElementAccess
-sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL AnimationNode::hasElements()
 {
     Guard< Mutex > aGuard( maMutex );
     return !maChildren.empty();
@@ -1772,7 +1752,6 @@ sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException, std::exc
 
 // XEnumerationAccess
 Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -1782,7 +1761,6 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild )
-    throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -1807,7 +1785,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Referenc
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild )
-    throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -1836,7 +1813,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild )
-    throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -1864,7 +1840,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference< XAnimationNode >& oldChild )
-    throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -1886,7 +1861,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference< XAnimationNode >& newChild )
-    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -1911,7 +1885,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference
 
 
 // XIterateContainer
-sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnimationNode::getIterateType()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnIterateType;
@@ -1919,7 +1893,7 @@ sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException, std:
 
 
 // XIterateContainer
-void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _iteratetype != mnIterateType )
@@ -1931,7 +1905,7 @@ void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (Run
 
 
 // XIterateContainer
-double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException, std::exception)
+double SAL_CALL AnimationNode::getIterateInterval()
 {
     Guard< Mutex > aGuard( maMutex );
     return mfIterateInterval;
@@ -1939,7 +1913,7 @@ double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException, std
 
 
 // XIterateContainer
-void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval )
 {
     Guard< Mutex > aGuard( maMutex );
     if( _iterateinterval != mfIterateInterval )
@@ -1951,21 +1925,21 @@ void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw
 
 
 // XChangesNotifier
-void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener )
 {
     maChangeListener.addInterface( aListener );
 }
 
 
 // XChangesNotifier
-void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener )
 {
     maChangeListener.removeInterface(aListener);
 }
 
 
 // XUnoTunnel
-::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) throw (RuntimeException, std::exception)
+::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) )
     {
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 65a10ba3d3bb..45f1b61132f7 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -50,7 +50,7 @@ void SAL_CALL SoundHandler::release() throw()
        OWeakObject::release();
 }
 
-css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType )
 {
        /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface.     */
         /* Ask for my own supported interfaces ...*/
@@ -70,12 +70,12 @@ css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType
        return aReturn;
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes()
 {
     /* Optimize this method !                                       */
     /* We initialize a static variable only one time.               */
@@ -111,19 +111,19 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs
 /*===========================================================================================================*/
 /* XServiceInfo */
 /*===========================================================================================================*/
-OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SoundHandler::getImplementationName()
 {
     return IMPLEMENTATIONNAME_SOUNDHANDLER;
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 // XServiceInfo
-css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames()
 {
     return { "com.sun.star.frame.ContentHandler" };
 }
@@ -185,7 +185,7 @@ SoundHandler::~SoundHandler()
 *//*-*************************************************************************************************************/
 void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                      const css::uno::Sequence< css::beans::PropertyValue >&            lDescriptor,
-                                                     const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception)
+                                                     const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
 {
     // SAFE {
     const ::osl::MutexGuard aLock( m_aLock );
@@ -235,7 +235,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&
 }
 
 void SAL_CALL SoundHandler::dispatch( const css::util::URL&                                  aURL       ,
-                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
 {
     dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
@@ -261,7 +261,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
     @onerror    We return nothing.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor )
 {
     // Our default is "nothing". So we can return it, if detection failed or file type is really unknown.
     OUString sTypeName;
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index f055fdf82931..5ee3fc7ae831 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -77,33 +77,33 @@ class SoundHandler  :   // interfaces
         virtual ~SoundHandler(                                                                        ) override;
 
         //  XInterface, XTypeProvider, XServiceInfo
-        virtual css::uno::Any  SAL_CALL queryInterface( const css::uno::Type& aType   ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any  SAL_CALL queryInterface( const css::uno::Type& aType   ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
-        virtual css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes () throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes () override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     /* interface XServiceInfo */
-       virtual OUString                                               SAL_CALL getImplementationName              (                                                                               ) throw( css::uno::RuntimeException, std::exception ) override;
-       virtual sal_Bool                                               SAL_CALL supportsService                    ( const OUString&                                               sServiceName    ) throw( css::uno::RuntimeException, std::exception ) override;
-       virtual css::uno::Sequence< OUString >                         SAL_CALL getSupportedServiceNames           (                                                                               ) throw( css::uno::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;
 
         //  XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                        const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                       const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+                                                       const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
 
         //  XDispatch
         virtual void SAL_CALL dispatch              (   const   css::util::URL&                                     aURL        ,
-                                                        const   css::uno::Sequence< css::beans::PropertyValue >&    lArguments  ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                        const   css::uno::Sequence< css::beans::PropertyValue >&    lArguments  ) override;
         // not supported !
         virtual void SAL_CALL addStatusListener     (   const   css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
-                                                        const   css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException, std::exception ) override {};
+                                                        const   css::util::URL&                                     /*aURL*/        ) override {};
         virtual void SAL_CALL removeStatusListener  (   const   css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
-                                                        const   css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException, std::exception ) override {};
+                                                        const   css::util::URL&                                     /*aURL*/        ) override {};
 
         //  XExtendedFilterDetection
-        virtual OUString SAL_CALL detect           (           css::uno::Sequence< css::beans::PropertyValue >&    lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL detect           (           css::uno::Sequence< css::beans::PropertyValue >&    lDescriptor ) override;
 
     //  protected methods
     protected:
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 2ad8cfa09515..db2f20364b68 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -105,7 +105,6 @@ FrameGrabber* FrameGrabber::create( const OUString &rURL )
 }
 
 uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< graphic::XGraphic > xRet;
 
@@ -204,19 +203,16 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
 }
 
 OUString SAL_CALL FrameGrabber::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME );
 }
 
 sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return { AVMEDIA_GST_FRAMEGRABBER_SERVICENAME };
 }
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 51c9d6b39619..2b2f644f8b0f 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -45,12 +45,12 @@ public:
     virtual ~FrameGrabber() override;
 
     // XFrameGrabber
-    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     explicit FrameGrabber( const OUString &aURL );
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index f064cb13a388..aa55134e028f 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -40,7 +40,6 @@ Manager::~Manager()
 }
 
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
-    throw (uno::RuntimeException, std::exception)
 {
     Player*                             pPlayer( new Player );
     uno::Reference< media::XPlayer >    xRet( pPlayer );
@@ -53,19 +52,16 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
 }
 
 OUString SAL_CALL Manager::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME );
 }
 
 sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return { AVMEDIA_GST_MANAGER_SERVICENAME };
 }
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index d415559f41b5..24c057e3d545 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -35,12 +35,12 @@ public:
     virtual ~Manager() override;
 
     // XManager
-    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 } // namespace gstreamer
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 37b76626315b..50fa9b4cb1dc 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -684,7 +684,6 @@ bool Player::create( const OUString& rURL )
 
 
 void SAL_CALL Player::start()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -698,7 +697,6 @@ void SAL_CALL Player::start()
 
 
 void SAL_CALL Player::stop()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -712,7 +710,6 @@ void SAL_CALL Player::stop()
 
 
 sal_Bool SAL_CALL Player::isPlaying()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -731,7 +728,6 @@ sal_Bool SAL_CALL Player::isPlaying()
 
 
 double SAL_CALL Player::getDuration()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -747,7 +743,6 @@ double SAL_CALL Player::getDuration()
 
 
 void SAL_CALL Player::setMediaTime( double fTime )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -768,7 +763,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
 
 
 double SAL_CALL Player::getMediaTime()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -786,7 +780,6 @@ double SAL_CALL Player::getMediaTime()
 
 
 void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     // TODO check how to do with GST
@@ -795,7 +788,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
 
 
 sal_Bool SAL_CALL Player::isPlaybackLoop()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     // TODO check how to do with GST
@@ -804,7 +796,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop()
 
 
 void SAL_CALL Player::setMute( sal_Bool bSet )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -827,7 +818,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
 
 
 sal_Bool SAL_CALL Player::isMute()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -836,7 +826,6 @@ sal_Bool SAL_CALL Player::isMute()
 
 
 void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -853,7 +842,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
 
 
 sal_Int16 SAL_CALL Player::getVolumeDB()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -872,7 +860,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
 
 
 awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -900,7 +887,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
 
 
 uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -962,7 +948,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
 
 
 uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     FrameGrabber* pFrameGrabber = nullptr;
@@ -977,21 +962,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
 
 
 OUString SAL_CALL Player::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
 uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return { AVMEDIA_GST_PLAYER_SERVICENAME };
 }
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 3a61eba88625..61dc3c14cc58 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -53,26 +53,26 @@ public:
     GstBusSyncReply processSyncMessage( GstMessage *message );
 
     // XPlayer
-    virtual void SAL_CALL start(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stop(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isPlaying(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getDuration(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getMediaTime(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isMute(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getVolumeDB(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL start(  ) override;
+    virtual void SAL_CALL stop(  ) override;
+    virtual sal_Bool SAL_CALL isPlaying(  ) override;
+    virtual double SAL_CALL getDuration(  ) override;
+    virtual void SAL_CALL setMediaTime( double fTime ) override;
+    virtual double SAL_CALL getMediaTime(  ) override;
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) override;
+    virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isMute(  ) override;
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+    virtual sal_Int16 SAL_CALL getVolumeDB(  ) override;
+    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) override;
+    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // ::cppu::OComponentHelper
     virtual void SAL_CALL disposing() final override;
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 3b061f3915de..948fff012d0c 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -67,12 +67,10 @@ Window::~Window()
 
 
 void SAL_CALL Window::update(  )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
-    throw (uno::RuntimeException, std::exception)
 {
         bool bRet = false;
 
@@ -91,13 +89,11 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
 }
 
 media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return meZoomLevel;
 }
 
 void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
-    throw (uno::RuntimeException, std::exception)
 {
     mnPointerType = nPointerType;
 }
@@ -106,12 +102,10 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
 
 
 void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 awt::Rectangle SAL_CALL Window::getPosSize()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Rectangle aRet;
 
@@ -123,77 +117,62 @@ awt::Rectangle SAL_CALL Window::getPosSize()
 }
 
 void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::setFocus(  )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
@@ -201,17 +180,14 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
 
 
 void SAL_CALL Window::dispose(  )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
@@ -219,19 +195,16 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
 
 
 OUString SAL_CALL Window::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME );
 }
 
 sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return { AVMEDIA_GST_WINDOW_SERVICENAME };
 }
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index da090a8df1f0..3b8f431d767a 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -39,39 +39,39 @@ public:
     virtual ~Window() override;
 
     // XPlayerWindow
-    virtual void SAL_CALL update(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::media::ZoomLevel SAL_CALL getZoomLevel(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL update(  ) override;
+    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+    virtual css::media::ZoomLevel SAL_CALL getZoomLevel(  ) override;
+    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override;
 
     // XWindow
-    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) override;
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) override;
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) override;
+    virtual void SAL_CALL setFocus(  ) override;
+    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
 
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index 4567690e0c75..7f4681ef4364 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -39,12 +39,12 @@ public:
     bool    create( AVAsset* pMovie );
 
     // XFrameGrabber
-    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
 
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index b4022caf360e..2293a05ba03a 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -74,7 +74,6 @@ bool FrameGrabber::create( AVAsset* pMovie )
 
 
 uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
-    throw (uno::RuntimeException)
 {
     uno::Reference< graphic::XGraphic > xRet;
     if( !mpImageGen )
@@ -105,19 +104,16 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
 
 
 ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return ::rtl::OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME );
 }
 
 sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return ServiceName == AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME;
 }
 
 uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME };
 }
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index 6044df008d37..7761cc7d91e9 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -37,12 +37,12 @@ public:
     virtual ~Manager() override;
 
     // XManager
-    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) override;
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) override;
 private:
 
     css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 5df4af80c37b..69d2a3c0196f 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -37,7 +37,6 @@ Manager::~Manager()
 
 
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
-    throw (uno::RuntimeException)
 {
     Player*                             pPlayer( new Player( mxMgr ) );
     uno::Reference< media::XPlayer >    xRet( pPlayer );
@@ -51,21 +50,18 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
 
 
 ::rtl::OUString SAL_CALL Manager::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return ::rtl::OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return ServiceName == AVMEDIA_MACAVF_MANAGER_SERVICENAME;
 }
 
 
 uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_MACAVF_MANAGER_SERVICENAME };
 }
diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index b02400bba898..176f6f502cea 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -41,29 +41,29 @@ public:
     bool create( AVAsset* );
 
     // XPlayer
-    virtual void SAL_CALL start() throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL stop() throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isPlaying() throw (css::uno::RuntimeException) override;
-    virtual double SAL_CALL getDuration() throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) override;
-    virtual double SAL_CALL getMediaTime() throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL start() override;
+    virtual void SAL_CALL stop() override;
+    virtual sal_Bool SAL_CALL isPlaying() override;
+    virtual double SAL_CALL getDuration() override;
+    virtual void SAL_CALL setMediaTime( double fTime ) override;
+    virtual double SAL_CALL getMediaTime() override;
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setStopTime( double fTime ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setStopTime( double fTime );
     /// @throws css::uno::RuntimeException
-    virtual double SAL_CALL getStopTime() throw (css::uno::RuntimeException);
-    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isPlaybackLoop() throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isMute() throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) override;
-    virtual sal_Int16 SAL_CALL getVolumeDB() throw (css::uno::RuntimeException) override;
-    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) throw (css::uno::RuntimeException) override;
+    virtual double SAL_CALL getStopTime();
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isPlaybackLoop() override;
+    virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isMute() override;
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+    virtual sal_Int16 SAL_CALL getVolumeDB() override;
+    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) override;
+    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) override;
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual ::rtl::OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     AVPlayer* getAVPlayer() const { return mpPlayer; }
     virtual bool handleObservation( NSString* pKeyPath ) override;
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index bd63acaf4b43..a683b4790032 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -154,7 +154,6 @@ bool Player::create( const ::rtl::OUString& rURL )
 
 
 void SAL_CALL Player::start()
-    throw (uno::RuntimeException)
 {
     if( !mpPlayer )
         return;
@@ -165,7 +164,6 @@ void SAL_CALL Player::start()
 
 
 void SAL_CALL Player::stop()
-    throw (uno::RuntimeException)
 {
     if( !mpPlayer )
         return;
@@ -176,7 +174,6 @@ void SAL_CALL Player::stop()
 
 
 sal_Bool SAL_CALL Player::isPlaying()
-    throw (uno::RuntimeException)
 {
     if( !mpPlayer )
         return false;
@@ -186,7 +183,6 @@ sal_Bool SAL_CALL Player::isPlaying()
 
 
 double SAL_CALL Player::getDuration()
-    throw (uno::RuntimeException)
 {
     // slideshow checks for non-zero duration, so cheat here
     double duration = 0.01;
@@ -205,7 +201,6 @@ double SAL_CALL Player::getDuration()
 
 
 void SAL_CALL Player::setMediaTime( double fTime )
-    throw (uno::RuntimeException)
 {
     if( mpPlayer )
         [mpPlayer seekToTime: CMTimeMakeWithSeconds(fTime,1000) ];
@@ -213,7 +208,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
 
 
 double SAL_CALL Player::getMediaTime()
-    throw (uno::RuntimeException)
 {
     if( !mpPlayer )
         return 0.0;
@@ -228,35 +222,30 @@ double SAL_CALL Player::getMediaTime()
 
 
 void SAL_CALL Player::setStopTime( double fTime )
-    throw (uno::RuntimeException)
 {
     mfStopTime = fTime;
 }
 
 
 double SAL_CALL Player::getStopTime()
-    throw (uno::RuntimeException)
 {
     return mfStopTime;
 }
 
 
 void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
-    throw (uno::RuntimeException)
 {
     mbLooping = bSet;
 }
 
 
 sal_Bool SAL_CALL Player::isPlaybackLoop()
-    throw (uno::RuntimeException)
 {
     return mbLooping;
 }
 
 
 void SAL_CALL Player::setMute( sal_Bool bSet )
-    throw (uno::RuntimeException)
 {
     if( !mpPlayer )
         return;
@@ -267,14 +256,12 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
 
 
 sal_Bool SAL_CALL Player::isMute()
-    throw (uno::RuntimeException)
 {
     return mbMuted;
 }
 
 
 void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
-    throw (uno::RuntimeException)
 {
     // -40dB <-> AVPlayer volume 0.0
     //   0dB <-> AVPlayer volume 1.0
@@ -287,7 +274,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
 
 
 sal_Int16 SAL_CALL Player::getVolumeDB()
-    throw (uno::RuntimeException)
 {
     if( !mpPlayer )
         return 0;
@@ -305,7 +291,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
 
 
 awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
-    throw (uno::RuntimeException)
 {
     awt::Size aSize( 0, 0 ); // default size
 
@@ -323,7 +308,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
 
 
 uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
-    throw (uno::RuntimeException)
 {
     // get the preferred window size
     const awt::Size aSize( getPreferredPlayerWindowSize() );
@@ -346,7 +330,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
 
 
 uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
-    throw (uno::RuntimeException)
 {
     uno::Reference< media::XFrameGrabber > xRet;
 
@@ -360,21 +343,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
 
 
 ::rtl::OUString SAL_CALL Player::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return ::rtl::OUString( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return ServiceName == AVMEDIA_MACAVF_PLAYER_SERVICENAME;
 }
 
 
 uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_MACAVF_PLAYER_SERVICENAME };
 }
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index fc9387e0bc2d..54c9038ced3a 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -55,39 +55,39 @@ public:
     void    updatePointer();
 
     // XPlayerWindow
-    virtual void SAL_CALL update(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException) override;
-    virtual css::media::ZoomLevel SAL_CALL getZoomLevel(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL update(  ) override;
+    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+    virtual css::media::ZoomLevel SAL_CALL getZoomLevel(  ) override;
+    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override;
 
     // XWindow
-    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) override;
-    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setFocus(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) override;
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) override;
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) override;
+    virtual void SAL_CALL setFocus(  ) override;
+    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     virtual bool handleObservation( NSString* pKeyPath ) override;
 
diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index b1c64d8088ce..6807aadbfb2e 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -83,26 +83,22 @@ bool Window::handleObservation( NSString* /*pKeyPath*/ )
 // XPlayerWindow
 
 void SAL_CALL Window::update()
-    throw (uno::RuntimeException)
 {}
 
 
 sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel /* eZoomLevel */ )
-    throw (uno::RuntimeException)
 {
     return false;
 }
 
 
 media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
-    throw (uno::RuntimeException)
 {
     return meZoomLevel;
 }
 
 
 void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
-    throw (uno::RuntimeException)
 {
     mnPointerType = nPointerType;
 }
@@ -110,7 +106,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
 // XWindow
 
 void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ )
-    throw (uno::RuntimeException)
 {
     if( !mpView )
         return;
@@ -127,7 +122,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 Wi
 
 
 awt::Rectangle SAL_CALL Window::getPosSize()
-    throw (uno::RuntimeException)
 {
     awt::Rectangle aRet;
 
@@ -141,102 +135,87 @@ awt::Rectangle SAL_CALL Window::getPosSize()
 
 
 void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
-    throw (uno::RuntimeException)
 {
 }
 
 
 void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
-    throw (uno::RuntimeException)
 {
 }
 
 
 void SAL_CALL Window::setFocus()
-    throw (uno::RuntimeException)
 {
 }
 
 
 void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
@@ -245,20 +224,17 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
 // XComponent
 
 void SAL_CALL Window::dispose(  )
-    throw (uno::RuntimeException)
 {
 }
 
 
 void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
 void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
@@ -266,21 +242,18 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
 // XServiceInfo
 
 ::rtl::OUString SAL_CALL Window::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return ::rtl::OUString( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return ServiceName == AVMEDIA_MACAVF_WINDOW_SERVICENAME;
 }
 
 
 uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_MACAVF_WINDOW_SERVICENAME };
 }
diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx
index 9cb7ddd31416..52fa7a4da83a 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -35,7 +35,6 @@ OGLFrameGrabber::~OGLFrameGrabber()
 }
 
 uno::Reference< css::graphic::XGraphic > SAL_CALL OGLFrameGrabber::grabFrame( double /*fMediaTime*/ )
-        throw ( uno::RuntimeException, std::exception )
 {
     std::unique_ptr<sal_uInt8[]> pBuffer(new sal_uInt8[m_rHandle.viewport.width * m_rHandle.viewport.height * 4]);
     glTFHandle* pHandle = &m_rHandle;
@@ -49,19 +48,17 @@ uno::Reference< css::graphic::XGraphic > SAL_CALL OGLFrameGrabber::grabFrame( do
     return Graphic( aBitmap ).GetXGraphic();
 }
 
-OUString SAL_CALL OGLFrameGrabber::getImplementationName() throw ( uno::RuntimeException, std::exception )
+OUString SAL_CALL OGLFrameGrabber::getImplementationName()
 {
     return OUString("com.sun.star.comp.avmedia.FrameGrabber_OpenGL");
 }
 
 sal_Bool SAL_CALL OGLFrameGrabber::supportsService( const OUString& rServiceName )
-        throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OGLFrameGrabber::getSupportedServiceNames()
-        throw ( uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.media.FrameGrabber_OpenGL" };
 }
diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx
index 1c3799f616de..fd2c52865d48 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -29,12 +29,12 @@ public:
     virtual ~OGLFrameGrabber() override;
 
     // XFrameGrabber
-    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     libgltf::glTFHandle& m_rHandle;
diff --git a/avmedia/source/opengl/oglmanager.cxx b/avmedia/source/opengl/oglmanager.cxx
index 0e538373fc5a..0f7cfddc77d4 100644
--- a/avmedia/source/opengl/oglmanager.cxx
+++ b/avmedia/source/opengl/oglmanager.cxx
@@ -26,7 +26,6 @@ OGLManager::~OGLManager()
 }
 
 uno::Reference< media::XPlayer > SAL_CALL OGLManager::createPlayer( const OUString& rURL )
-    throw (uno::RuntimeException, std::exception)
 {
     OGLPlayer* pPlayer( new OGLPlayer() );
     if( pPlayer->create(rURL) )
@@ -39,19 +38,17 @@ uno::Reference< media::XPlayer > SAL_CALL OGLManager::createPlayer( const OUStri
     }
 }
 
-OUString SAL_CALL OGLManager::getImplementationName() throw ( uno::RuntimeException, std::exception )
+OUString SAL_CALL OGLManager::getImplementationName()
 {
     return OUString("com.sun.star.comp.avmedia.Manager_OpenGL");
 }
 
 sal_Bool SAL_CALL OGLManager::supportsService( const OUString& rServiceName )
-        throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OGLManager::getSupportedServiceNames()
-        throw ( uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.media.Manager_OpenGL" };
 }
diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx
index d6f147304e12..945139f2313a 100644
--- a/avmedia/source/opengl/oglmanager.hxx
+++ b/avmedia/source/opengl/oglmanager.hxx
@@ -25,12 +25,12 @@ public:
     virtual ~OGLManager() override;
 
     // XManager
-    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 private:
 
 };
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 4c5eba196713..18b4e9437d66 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -139,7 +139,7 @@ void OGLPlayer::releaseInputFiles()
     m_vInputFiles.clear();
 }
 
-void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::start()
 {
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
@@ -152,7 +152,7 @@ void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception )
     m_bIsRendering = true;
 }
 
-void SAL_CALL OGLPlayer::stop() throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::stop()
 {
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
@@ -161,7 +161,7 @@ void SAL_CALL OGLPlayer::stop() throw ( uno::RuntimeException, std::exception )
     m_bIsRendering = false;
 }
 
-sal_Bool SAL_CALL OGLPlayer::isPlaying() throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OGLPlayer::isPlaying()
 {
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
@@ -173,64 +173,64 @@ sal_Bool SAL_CALL OGLPlayer::isPlaying() throw ( uno::RuntimeException, std::exc
         return m_bIsRendering;
 }
 
-double SAL_CALL OGLPlayer::getDuration() throw ( uno::RuntimeException, std::exception )
+double SAL_CALL OGLPlayer::getDuration()
 {
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
     return gltf_animation_get_duration(m_pHandle);
 }
 
-void SAL_CALL OGLPlayer::setMediaTime( double fTime ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::setMediaTime( double fTime )
 {
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
     gltf_animation_set_time(m_pHandle, fTime);
 }
 
-double SAL_CALL OGLPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception )
+double SAL_CALL OGLPlayer::getMediaTime()
 {
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
     return gltf_animation_get_time(m_pHandle);
 }
 
-void SAL_CALL OGLPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::setPlaybackLoop( sal_Bool bSet )
 {
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
     gltf_animation_set_looping(m_pHandle, bSet);
 }
 
-sal_Bool SAL_CALL OGLPlayer::isPlaybackLoop() throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OGLPlayer::isPlaybackLoop()
 {
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
     return gltf_animation_get_looping(m_pHandle);
 }
 
-void SAL_CALL OGLPlayer::setVolumeDB( sal_Int16 /*nVolumDB*/ ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::setVolumeDB( sal_Int16 /*nVolumDB*/ )
 {
     // OpenGL models have no sound.
 }
 
-sal_Int16 SAL_CALL OGLPlayer::getVolumeDB() throw ( uno::RuntimeException, std::exception )
+sal_Int16 SAL_CALL OGLPlayer::getVolumeDB()
 {
     // OpenGL models have no sound.
     return 0;
 }
 
-void SAL_CALL OGLPlayer::setMute( sal_Bool /*bSet*/ ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::setMute( sal_Bool /*bSet*/ )
 {
     // OpenGL models have no sound.
 }
 
-sal_Bool SAL_CALL OGLPlayer::isMute() throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OGLPlayer::isMute()
 {
     // OpenGL models have no sound.
     return false;
 }
 
-awt::Size SAL_CALL OGLPlayer::getPreferredPlayerWindowSize() throw ( uno::RuntimeException, std::exception )
+awt::Size SAL_CALL OGLPlayer::getPreferredPlayerWindowSize()
 {
     return awt::Size( 480, 360 );
 }
@@ -241,7 +241,6 @@ static bool lcl_CheckOpenGLRequirements()
 }
 
 uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
-     throw ( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -300,7 +299,6 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c
 }
 
 uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
-     throw ( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard(m_aMutex);
     assert(m_pHandle);
@@ -341,19 +339,16 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
 }
 
 OUString SAL_CALL OGLPlayer::getImplementationName()
-     throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.avmedia.Player_OpenGL");
 }
 
 sal_Bool SAL_CALL OGLPlayer::supportsService( const OUString& rServiceName )
-     throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames()
-     throw ( uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.media.Player_OpenGL" };
 }
diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx
index 05716ad33b5f..a74aae4707f9 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++ b/avmedia/source/opengl/oglplayer.hxx
@@ -40,25 +40,25 @@ public:
     void releaseInputFiles();
 
     // XPlayer
-    virtual void SAL_CALL start() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isPlaying() throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getDuration() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getMediaTime() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isPlaybackLoop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getVolumeDB() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isMute() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& rArguments ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL start() override;
+    virtual void SAL_CALL stop() override;
+    virtual sal_Bool SAL_CALL isPlaying() override;
+    virtual double SAL_CALL getDuration() override;
+    virtual void SAL_CALL setMediaTime( double fTime ) override;
+    virtual double SAL_CALL getMediaTime() override;
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isPlaybackLoop() override;
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+    virtual sal_Int16 SAL_CALL getVolumeDB() override;
+    virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isMute() override;
+    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize() override;
+    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& rArguments ) override;
+    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() override;
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     DECL_LINK( TimerHandler, Timer*, void );
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 88209d55ee5c..fe0adab71a20 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -30,7 +30,7 @@ OGLWindow::~OGLWindow()
     dispose();
 }
 
-void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL OGLWindow::update()
 {
     m_xContext->makeCurrent();
     int nRet = gltf_prepare_renderer(&m_rHandle);
@@ -44,36 +44,36 @@ void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::except
     m_xContext->swapBuffers();
 }
 
-sal_Bool SAL_CALL OGLWindow::setZoomLevel( css::media::ZoomLevel /*eZoomLevel*/ ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGLWindow::setZoomLevel( css::media::ZoomLevel /*eZoomLevel*/ )
 {
     return false;
 }
 
-css::media::ZoomLevel SAL_CALL OGLWindow::getZoomLevel() throw (css::uno::RuntimeException, std::exception)
+css::media::ZoomLevel SAL_CALL OGLWindow::getZoomLevel()
 {
     return media::ZoomLevel_ORIGINAL;
 }
 
-void SAL_CALL OGLWindow::setPointerType( sal_Int32 ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL OGLWindow::setPointerType( sal_Int32 )
 {
 }
 
-OUString SAL_CALL OGLWindow::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OGLWindow::getImplementationName()
 {
     return OUString("com.sun.star.comp.avmedia.Window_OpenGL");
 }
 
-sal_Bool SAL_CALL OGLWindow::supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGLWindow::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL OGLWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OGLWindow::getSupportedServiceNames()
 {
     return { "com.sun.star.media.Window_OpenGL" };
 }
 
-void SAL_CALL OGLWindow::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGLWindow::dispose()
 {
     assert(m_rEventHandler.GetParent());
     m_rEventHandler.GetParent()->RemoveEventListener( LINK(this, OGLWindow, FocusGrabber));
@@ -81,17 +81,14 @@ void SAL_CALL OGLWindow::dispose() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL OGLWindow::addEventListener( const uno::Reference< lang::XEventListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::removeEventListener( const uno::Reference< lang::XEventListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 /*nFlags*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_rHandle.viewport.x != nX || m_rHandle.viewport.x != nY ||
         m_rHandle.viewport.width != nWidth || m_rHandle.viewport.height != nHeight )
@@ -105,14 +102,12 @@ void SAL_CALL OGLWindow::setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidt
 }
 
 awt::Rectangle SAL_CALL OGLWindow::getPosSize()
-    throw (uno::RuntimeException, std::exception)
 {
     return awt::Rectangle(m_rHandle.viewport.x, m_rHandle.viewport.y,
                           m_rHandle.viewport.width, m_rHandle.viewport.height);
 }
 
 void SAL_CALL OGLWindow::setVisible( sal_Bool bSet )
-    throw (uno::RuntimeException, std::exception)
 {
     assert(m_rEventHandler.GetParent());
     if( bSet && !m_bVisible )
@@ -130,72 +125,58 @@ void SAL_CALL OGLWindow::setVisible( sal_Bool bSet )
 }
 
 void SAL_CALL OGLWindow::setEnable( sal_Bool )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::setFocus()
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OGLWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx
index d89f2735fccb..5bb405979e37 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -30,36 +30,36 @@ public:
     OGLWindow( libgltf::glTFHandle& rHandle, const rtl::Reference<OpenGLContext> & rContext, vcl::Window& rEventHandlerParent );
     virtual ~OGLWindow() override;
 
-    virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPointerType( sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) final override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL update() override;
+    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+    virtual css::media::ZoomLevel SAL_CALL getZoomLevel() override;
+    virtual void SAL_CALL setPointerType( sal_Int32 SystemPointerType ) override;
+
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+    virtual void SAL_CALL dispose() final override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
+
+    virtual void SAL_CALL setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) override;
+    virtual css::awt::Rectangle SAL_CALL getPosSize() override;
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) override;
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) override;
+    virtual void SAL_CALL setFocus() override;
+    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 
 private:
     DECL_LINK( FocusGrabber, VclWindowEvent&, void );
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 7d2a8df902c7..2441e7538e6b 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -38,12 +38,12 @@ public:
     bool    create( const OUString& rURL );
 
     // XFrameGrabber
-    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     css::uno::Reference< css::lang::XMultiServiceFactory >    mxMgr;
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index 6817af1f0798..2ade85f292b9 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -83,7 +83,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
 
 
 uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
-    throw (uno::RuntimeException)
 {
     uno::Reference< graphic::XGraphic > xRet;
 
@@ -103,21 +102,18 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
 
 
 ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return ::rtl::OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return ( ServiceName == AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME );
 }
 
 
 uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME };
 }
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 215e14c47017..113fd7728bbd 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -37,12 +37,12 @@ public:
     virtual ~Manager();
 
     // XManager
-    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 private:
 
     css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index bcb27b6d4073..735b282d07a1 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -39,7 +39,6 @@ Manager::~Manager()
 
 
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
-    throw (uno::RuntimeException)
 {
     Player*                             pPlayer( new Player( mxMgr ) );
     uno::Reference< media::XPlayer >    xRet( pPlayer );
@@ -55,21 +54,18 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
 
 
 ::rtl::OUString SAL_CALL Manager::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return ::rtl::OUString( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return ( ServiceName == AVMEDIA_QUICKTIME_MANAGER_SERVICENAME );
 }
 
 
 uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_QUICKTIME_MANAGER_SERVICENAME };
 }
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 636efb034fee..f145c79fb120 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -37,25 +37,25 @@ public:
     bool create( const OUString& rURL );
 
     // XPlayer
-    virtual void SAL_CALL start(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL stop(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isPlaying(  ) throw (css::uno::RuntimeException) override;
-    virtual double SAL_CALL getDuration(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) override;
-    virtual double SAL_CALL getMediaTime(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isMute(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) override;
-    virtual sal_Int16 SAL_CALL getVolumeDB(  ) throw (css::uno::RuntimeException) override;
-    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL start(  ) override;
+    virtual void SAL_CALL stop(  ) override;
+    virtual sal_Bool SAL_CALL isPlaying(  ) override;
+    virtual double SAL_CALL getDuration(  ) override;
+    virtual void SAL_CALL setMediaTime( double fTime ) override;
+    virtual double SAL_CALL getMediaTime(  ) override;
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) override;
+    virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isMute(  ) override;
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+    virtual sal_Int16 SAL_CALL getVolumeDB(  ) override;
+    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) override;
+    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) override;
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     QTMovie* getMovie();
 
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index 32ab8c6df393..d1c44306834f 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -101,7 +101,6 @@ bool Player::create( const ::rtl::OUString& rURL )
 
 
 void SAL_CALL Player::start(  )
-    throw (uno::RuntimeException)
 {
   SAL_INFO ( "avmedia.quicktime", "Player::start" );
 
@@ -113,7 +112,6 @@ void SAL_CALL Player::start(  )
 
 
 void SAL_CALL Player::stop(  )
-    throw (uno::RuntimeException)
 {
     SAL_INFO ( "avmedia.quicktime", "Player::stop" );
     if( mpMovie )
@@ -124,7 +122,6 @@ void SAL_CALL Player::stop(  )
 
 
 sal_Bool SAL_CALL Player::isPlaying()
-    throw (uno::RuntimeException)
 {
     bool bRet = false;
 
@@ -141,7 +138,6 @@ sal_Bool SAL_CALL Player::isPlaying()
 
 
 double SAL_CALL Player::getDuration(  )
-    throw (uno::RuntimeException)
 {
     // slideshow checks for non-zero duration, so cheat here
     double duration = 0.01;
@@ -157,7 +153,6 @@ double SAL_CALL Player::getDuration(  )
 
 
 void SAL_CALL Player::setMediaTime( double fTime )
-    throw (uno::RuntimeException)
 {
     SAL_INFO ( "avmedia.quicktime", "Player::setMediaTime" );
 
@@ -169,7 +164,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
 
 
 double SAL_CALL Player::getMediaTime(  )
-    throw (uno::RuntimeException)
 {
   double position = 0.0;
 
@@ -188,7 +182,6 @@ double SAL_CALL Player::getMediaTime(  )
 }
 
 void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
-    throw (uno::RuntimeException)
 {
     SAL_INFO ( "avmedia.quicktime",
                "Player::setPlaybackLoop ? " << ( bSet?"True":"False" ) );
@@ -205,7 +198,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
 
 
 sal_Bool SAL_CALL Player::isPlaybackLoop(  )
-    throw (uno::RuntimeException)
 {
     bool bRet = [[mpMovie attributeForKey:QTMovieLoopsAttribute] boolValue];
 
@@ -217,7 +209,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop(  )
 
 
 void SAL_CALL Player::setMute( sal_Bool bSet )
-    throw (uno::RuntimeException)
 {
     SAL_INFO ( "avmedia.quicktime",
                "set mute: " << bSet <<
@@ -235,7 +226,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
 
 
 sal_Bool SAL_CALL Player::isMute(  )
-    throw (uno::RuntimeException)
 {
     SAL_INFO ( "avmedia.quicktime", "Player::isMuted" );
 
@@ -244,7 +234,6 @@ sal_Bool SAL_CALL Player::isMute(  )
 
 
 void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
-    throw (uno::RuntimeException)
 {
     // OOo db volume -40 = QTVolume 0
     // OOo db volume 0   = QTvolume 1
@@ -270,7 +259,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
 
 
 sal_Int16 SAL_CALL Player::getVolumeDB(  )
-    throw (uno::RuntimeException)
 {
     sal_Int16 nVolumeDB = 0.0;
 
@@ -294,7 +282,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB(  )
 
 
 awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
-    throw (uno::RuntimeException)
 {
     NSSize  nsSize = [[mpMovie attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
     awt::Size aSize( nsSize.width, nsSize.height );
@@ -303,7 +290,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
 
 
 uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
-    throw (uno::RuntimeException)
 {
     uno::Reference< ::media::XPlayerWindow >    xRet;
     awt::Size                                   aSize( getPreferredPlayerWindowSize() );
@@ -327,7 +313,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
 
 
 uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
-    throw (css::uno::RuntimeException)
 {
   uno::Reference< media::XFrameGrabber > xRet;
   SAL_INFO ( "avmedia.quicktime", "Player::createFrameGrabber" );
@@ -349,21 +334,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
 
 
 ::rtl::OUString SAL_CALL Player::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return ::rtl::OUString( AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return ( ServiceName == AVMEDIA_QUICKTIME_PLAYER_SERVICENAME );
 }
 
 
 uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_QUICKTIME_PLAYER_SERVICENAME };
 }
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index cbcb9ee2faf9..8e2ec9f1cd16 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -45,39 +45,39 @@ public:
     void    updatePointer();
 
     // XPlayerWindow
-    virtual void SAL_CALL update(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ) throw (css::uno::RuntimeException) override;
-    virtual css::media::ZoomLevel SAL_CALL getZoomLevel(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL update(  ) override;
+    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ) override;
+    virtual css::media::ZoomLevel SAL_CALL getZoomLevel(  ) override;
+    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override;
 
     // XWindow
-    virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) override;
-    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setVisible( sal_Bool ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setEnable( sal_Bool ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setFocus(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) override;
+    virtual void SAL_CALL setVisible( sal_Bool ) override;
+    virtual void SAL_CALL setEnable( sal_Bool ) override;
+    virtual void SAL_CALL setFocus(  ) override;
+    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
 
diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm
index 7d0db9af8efe..db3c2a6ff1ba 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -90,25 +90,21 @@ Window::~Window()
 // XPlayerWindow
 
 void SAL_CALL Window::update(  )
-    throw (uno::RuntimeException)
 {
     ;
 }
 
 sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel )
-    throw (uno::RuntimeException)
 {
         return false;
 }
 
 media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
-    throw (uno::RuntimeException)
 {
     return meZoomLevel;
 }
 
 void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
-    throw (uno::RuntimeException)
 {
     mnPointerType = nPointerType;
 }
@@ -116,7 +112,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
 // XWindow
 
 void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
-    throw (uno::RuntimeException)
 {
     if( mpParentView && mpMovieView )
     {
@@ -129,7 +124,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_I
 }
 
 awt::Rectangle SAL_CALL Window::getPosSize()
-    throw (uno::RuntimeException)
 {
     awt::Rectangle aRet;
 
@@ -142,92 +136,77 @@ awt::Rectangle SAL_CALL Window::getPosSize()
 }
 
 void SAL_CALL Window::setVisible( sal_Bool )
-    throw (uno::RuntimeException)
 {
     SAL_INFO ( "avmedia.quicktime", "Window::setVisible" );
 
 }
 
 void SAL_CALL Window::setEnable( sal_Bool )
-    throw (uno::RuntimeException)
 {
     ;
 }
 
 void SAL_CALL Window::setFocus(  )
-    throw (uno::RuntimeException)
 {
     SAL_INFO ( "avmedia.quicktime", "Window::setFocus" );
 }
 
 void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
@@ -235,18 +214,15 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
 // XComponent
 
 void SAL_CALL Window::dispose(  )
-    throw (uno::RuntimeException)
 {
 }
 
 void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
@@ -254,19 +230,16 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
 // XServiceInfo
 
 ::rtl::OUString SAL_CALL Window::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME );
 }
 
 sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return ( ServiceName == AVMEDIA_QUICKTIME_WINDOW_SERVICENAME );
 }
 
 uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_QUICKTIME_WINDOW_SERVICENAME };
 }
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 87ec80daa2b4..fac08d070870 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -46,13 +46,11 @@ void MediaEventListenersImpl::cleanUp()
 
 
 void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& )
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
-    throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
     const SolarMutexGuard aAppGuard;
@@ -71,7 +69,6 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
 
 
 void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e )
-    throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
     const SolarMutexGuard aAppGuard;
@@ -89,7 +86,6 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e
 
 
 void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& e )
-    throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
     const SolarMutexGuard aAppGuard;
@@ -109,7 +105,6 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent&
 
 
 void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent& e )
-    throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
     const SolarMutexGuard aAppGuard;
@@ -129,7 +124,6 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent
 
 
 void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
     const SolarMutexGuard aAppGuard;
@@ -141,7 +135,6 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent&
 
 
 void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
     const SolarMutexGuard aAppGuard;
@@ -153,7 +146,6 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent&
 
 
 void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& e )
-    throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
     const SolarMutexGuard aAppGuard;
@@ -167,7 +159,6 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent&
 
 
 void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e )
-    throw (css::uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
     const SolarMutexGuard aAppGuard;
@@ -181,13 +172,11 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e
 
 
 void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& )
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& )
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index e73e2968882c..f98279833333 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -50,23 +50,23 @@ namespace avmedia
         protected:
 
             // XKeyListener
-            virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+            virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) override;
+            virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) override;
 
             // XMouseListener
-            virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) override;
+            virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) override;
+            virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) override;
+            virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) override;
 
             // XMouseMotionListener
-            virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) override;
+            virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) override;
 
             // XFocusListener
-            virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override;
+            virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override;
 
         private:
 
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index a21af8e47d9b..8642f08a63a1 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -67,7 +67,6 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
 }
 
 ::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime )
-        throw ( css::uno::RuntimeException, std::exception )
 {
     osl::Condition condition;
 
@@ -112,19 +111,17 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
     return Graphic( bitmap ).GetXGraphic();
 }
 
-::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( css::uno::RuntimeException, std::exception )
+::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName()
 {
     return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME;
 }
 
 sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName )
-        throw ( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, serviceName);
 }
 
 ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception )
 {
     return { AVMEDIA_VLC_GRABBER_SERVICENAME };
 }
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index 2f5419dabc67..b78815006546 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -40,15 +40,11 @@ class VLCFrameGrabber : public FrameGrabber_BASE
 public:
     VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url );
 
-    css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime )
-            throw ( css::uno::RuntimeException, std::exception ) override;
-
-    ::rtl::OUString SAL_CALL getImplementationName()
-            throw ( css::uno::RuntimeException, std::exception ) override;
-    sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
-            throw ( css::uno::RuntimeException, std::exception ) override;
-    css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
+
+    ::rtl::OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
+    css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 }
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index b5819ee40004..2b1c73fa70bf 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -83,7 +83,6 @@ Manager::~Manager()
 }
 
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUString& rURL )
-    throw (uno::RuntimeException, std::exception)
 {
     if ( !m_is_vlc_found )
         throw uno::RuntimeException("VLC not found", nullptr);
@@ -107,19 +106,16 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt
 }
 
 rtl::OUString SAL_CALL Manager::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return VLC_IMPLEMENTATION_NAME;
 }
 
 sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return { VLC_SERVICENAME };
 }
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index cbc6f5ed1cac..f820fc1f72ee 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -37,11 +37,11 @@ public:
     explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
     virtual ~Manager() override;
 
-    css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) override;
 
-    rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    rtl::OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) override;
+    css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 5a9e94dedcd2..b93157d90da3 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -65,7 +65,7 @@ unsigned VLCPlayer::getHeight() const
     return mPlayer.getHeight();
 }
 
-void SAL_CALL VLCPlayer::start() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::start()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if (!mPlayer.play())
@@ -74,19 +74,19 @@ void SAL_CALL VLCPlayer::start() throw ( css::uno::RuntimeException, std::except
     }
 }
 
-void SAL_CALL VLCPlayer::stop() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::stop()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     mPlayer.pause();
 }
 
-sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL VLCPlayer::isPlaying()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return mPlayer.isPlaying();
 }
 
-double SAL_CALL VLCPlayer::getDuration() throw ( css::uno::RuntimeException, std::exception )
+double SAL_CALL VLCPlayer::getDuration()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return static_cast<double>( mMedia.getDuration() ) / MS_IN_SEC;
@@ -98,7 +98,7 @@ void SAL_CALL VLCPlayer::setScale( float factor )
     mPlayer.setScale( factor );
 }
 
-void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setMediaTime( double fTime )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( fTime < 0.00000001 && !mPlayer.isPlaying() )
@@ -109,7 +109,7 @@ void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( css::uno::RuntimeE
     mPlayer.setTime( fTime * MS_IN_SEC );
 }
 
-double SAL_CALL VLCPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception )
+double SAL_CALL VLCPlayer::getMediaTime()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return static_cast<double>( mPlayer.getTime() ) / MS_IN_SEC;
@@ -123,7 +123,7 @@ void VLCPlayer::replay()
     start();
 }
 
-void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     mPlaybackLoop = bSet;
@@ -134,37 +134,37 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::Runt
         mEventManager.onEndReached();
 }
 
-sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return mPlaybackLoop;
 }
 
-void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     mPlayer.setVolume( static_cast<sal_Int16>( ( nDB + 40 ) * 10.0  / 4 ) );
 }
 
-::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( css::uno::RuntimeException, std::exception )
+::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return static_cast<sal_Int16>( mPlayer.getVolume() / 10.0 * 4 - 40 );
 }
 
-void SAL_CALL VLCPlayer::setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setMute( sal_Bool bSet )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     mPlayer.setMute( bSet );
 }
 
-sal_Bool SAL_CALL VLCPlayer::isMute() throw ( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL VLCPlayer::isMute()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return mPlayer.getMute();
 }
 
-css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception )
+css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize()
 {
     return css::awt::Size( 480, 360 );
 }
@@ -215,7 +215,6 @@ void VLCPlayer::setVideoSize( unsigned width, unsigned height )
 }
 
 uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
-     throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -238,7 +237,6 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind
 }
 
 uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber()
-     throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -252,19 +250,16 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb
 }
 
 ::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
-     throw ( css::uno::RuntimeException, std::exception )
 {
     return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME;
 }
 
 sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName )
-     throw ( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, serviceName);
 }
 
 ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames()
-     throw ( css::uno::RuntimeException, std::exception )
 {
     return { AVMEDIA_VLC_PLAYER_SERVICENAME };
 }
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index 3cbecdd19fd5..e2c7f0c32b2f 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -61,30 +61,25 @@ public:
     void SAL_CALL setScale( float factor );
     void SAL_CALL setWindowID( const intptr_t windowID );
 
-    void SAL_CALL start() throw ( css::uno::RuntimeException, std::exception ) override;
-    void SAL_CALL stop() throw ( css::uno::RuntimeException, std::exception ) override;
-    sal_Bool SAL_CALL isPlaying() throw ( css::uno::RuntimeException, std::exception ) override;
-    double SAL_CALL getDuration() throw ( css::uno::RuntimeException, std::exception ) override;
-    void SAL_CALL setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception ) override;
-    double SAL_CALL getMediaTime() throw ( css::uno::RuntimeException, std::exception ) override;
-    void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) override;
-    sal_Bool SAL_CALL isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception ) override;
-    void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception ) override;
-    ::sal_Int16 SAL_CALL getVolumeDB() throw ( css::uno::RuntimeException, std::exception ) override;
-    void SAL_CALL setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) override;
-    sal_Bool SAL_CALL isMute() throw ( css::uno::RuntimeException, std::exception ) override;
-    css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception ) override;
-    css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw ( css::uno::RuntimeException, std::exception ) override;
-    css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+    void SAL_CALL start() override;
+    void SAL_CALL stop() override;
+    sal_Bool SAL_CALL isPlaying() override;
+    double SAL_CALL getDuration() override;
+    void SAL_CALL setMediaTime( double fTime ) override;
+    double SAL_CALL getMediaTime() override;
+    void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+    sal_Bool SAL_CALL isPlaybackLoop() override;
+    void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) override;
+    ::sal_Int16 SAL_CALL getVolumeDB() override;
+    void SAL_CALL setMute( sal_Bool bSet ) override;
+    sal_Bool SAL_CALL isMute() override;
+    css::awt::Size SAL_CALL getPreferredPlayerWindowSize() override;
+    css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+    css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() override;
 
-    ::rtl::OUString SAL_CALL getImplementationName()
-            throw ( css::uno::RuntimeException, std::exception ) override;
-    sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
-            throw ( css::uno::RuntimeException, std::exception ) override;
-    css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+    ::rtl::OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
+    css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     void replay();
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 2a4ad61bb27a..e3c0ab26147c 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -46,11 +46,11 @@ VLCWindow::~VLCWindow()
         mPlayer.setWindowID( mPrevWinID );
 }
 
-void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VLCWindow::update()
 {
 }
 
-sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel )
 {
     bool bRet = false;
 
@@ -82,46 +82,43 @@ sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) th
     return bRet;
 }
 
-css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel() throw (css::uno::RuntimeException, std::exception)
+css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel()
 {
     return meZoomLevel;
 }
 
-void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 )
 {
 }
 
-::rtl::OUString SAL_CALL VLCWindow::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+::rtl::OUString SAL_CALL VLCWindow::getImplementationName()
 {
     return AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME;
 }
 
-sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames()
 {
     return { AVMEDIA_VLC_WINDOW_SERVICENAME };
 }
 
-void SAL_CALL VLCWindow::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL VLCWindow::dispose()
 {
 }
 
 void SAL_CALL VLCWindow::addEventListener( const uno::Reference< lang::XEventListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::removeEventListener( const uno::Reference< lang::XEventListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ )
-    throw (uno::RuntimeException, std::exception)
 {
     mSize.X = X;
     mSize.Y = Y;
@@ -130,83 +127,67 @@ void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width,
 }
 
 awt::Rectangle SAL_CALL VLCWindow::getPosSize()
-    throw (uno::RuntimeException, std::exception)
 {
     return mSize;
 }
 
 void SAL_CALL VLCWindow::setVisible( sal_Bool )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::setEnable( sal_Bool )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::setFocus()
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL VLCWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index 2fc3991874e9..eaab56d718d2 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -37,36 +37,36 @@ public:
     VLCWindow( VLCPlayer& player, const intptr_t prevWinID );
     virtual ~VLCWindow() override;
 
-    void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override;
-    css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL update() override;
+    sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+    css::media::ZoomLevel SAL_CALL getZoomLevel() override;
+    void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) override;
 
-    ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    ::rtl::OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
+    css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
 
-    void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose() override;
+    void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
-    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override;
-    css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+    css::awt::Rectangle SAL_CALL getPosSize() override;
+    void SAL_CALL setVisible( sal_Bool Visible ) override;
+    void SAL_CALL setEnable( sal_Bool Enable ) override;
+    void SAL_CALL setFocus() override;
+    void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 };
 
 }
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 88408caa8a13..3d1f5906e2fc 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -106,7 +106,6 @@ bool FrameGrabber::create( const OUString& rURL )
 
 
 uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
-    throw (uno::RuntimeException)
 {
     uno::Reference< graphic::XGraphic > xRet;
     IMediaDet*                          pDet = implCreateMediaDet( maURL );
@@ -203,21 +202,18 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
 
 
 OUString SAL_CALL FrameGrabber::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return OUString( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
 uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME };
 }
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 8b3fd49f03b0..88ac4fc04674 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -39,12 +39,12 @@ public:
     bool    create( const OUString& rURL );
 
     // XFrameGrabber
-    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
 
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index c024f7ff19a7..4282b2599ff8 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -42,7 +42,6 @@ Manager::~Manager()
 
 
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
-    throw (uno::RuntimeException)
 {
     Player*                             pPlayer( new Player( mxMgr ) );
     uno::Reference< media::XPlayer >    xRet( pPlayer );
@@ -56,21 +55,18 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
 
 
 OUString SAL_CALL Manager::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return OUString( AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
 uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_WIN_MANAGER_SERVICENAME };
 }
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index fcd0c69a2c23..80454708319c 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -36,12 +36,12 @@ public:
     ~Manager() override;
 
     // XManager
-    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 private:
 
     css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index a5f9f4e62888..a7c3e6bd766d 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -246,7 +246,6 @@ long Player::processEvent()
 
 
 void SAL_CALL Player::start(  )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if( mpMC )
@@ -290,7 +289,6 @@ void SAL_CALL Player::start(  )
 
 
 void SAL_CALL Player::stop(  )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if( mpMC )
@@ -299,7 +297,6 @@ void SAL_CALL Player::stop(  )
 
 
 sal_Bool SAL_CALL Player::isPlaying()
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -314,7 +311,6 @@ sal_Bool SAL_CALL Player::isPlaying()
 
 
 double SAL_CALL Player::getDuration(  )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -328,7 +324,6 @@ double SAL_CALL Player::getDuration(  )
 
 
 void SAL_CALL Player::setMediaTime( double fTime )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -345,7 +340,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
 
 
 double SAL_CALL Player::getMediaTime(  )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -359,7 +353,6 @@ double SAL_CALL Player::getMediaTime(  )
 
 
 void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -368,7 +361,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
 
 
 sal_Bool SAL_CALL Player::isPlaybackLoop(  )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -377,7 +369,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop(  )
 
 
 void SAL_CALL Player::setMute( sal_Bool bSet )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -390,7 +381,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
 
 
 sal_Bool SAL_CALL Player::isMute(  )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -399,7 +389,6 @@ sal_Bool SAL_CALL Player::isMute(  )
 
 
 void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -411,7 +400,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
 
 
 sal_Int16 SAL_CALL Player::getVolumeDB(  )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -420,7 +408,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB(  )
 
 
 awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -440,7 +427,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
 
 
 uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
-    throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -462,7 +448,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
 
 
 uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
-    throw (uno::RuntimeException)
 {
     uno::Reference< media::XFrameGrabber > xRet;
 
@@ -481,21 +466,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
 
 
 OUString SAL_CALL Player::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return OUString( AVMEDIA_WIN_PLAYER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
 uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_WIN_PLAYER_SERVICENAME };
 }
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 425ae00dada3..02fb5ec8e9c8 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -66,26 +66,26 @@ public:
     const IVideoWindow* getVideoWindow() const;
 
     // XPlayer
-    virtual void SAL_CALL start(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL stop(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isPlaying(  ) throw (css::uno::RuntimeException) override;
-    virtual double SAL_CALL getDuration(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) override;
-    virtual double SAL_CALL getMediaTime(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isMute(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) override;
-    virtual sal_Int16 SAL_CALL getVolumeDB(  ) throw (css::uno::RuntimeException) override;
-    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL start(  ) override;
+    virtual void SAL_CALL stop(  ) override;
+    virtual sal_Bool SAL_CALL isPlaying(  ) override;
+    virtual double SAL_CALL getDuration(  ) override;
+    virtual void SAL_CALL setMediaTime( double fTime ) override;
+    virtual double SAL_CALL getMediaTime(  ) override;
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) override;
+    virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL isMute(  ) override;
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+    virtual sal_Int16 SAL_CALL getVolumeDB(  ) override;
+    virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) override;
+    virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+    virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // ::cppu::OComponentHelper
     virtual void SAL_CALL disposing() override;
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index ba30b07403c5..9886ada2b5a1 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -344,13 +344,11 @@ void Window::updatePointer()
 }
 
 void SAL_CALL Window::update(  )
-    throw (uno::RuntimeException)
 {
     ::RedrawWindow( mnFrameWnd, nullptr, nullptr, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE  );
 }
 
 sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
-    throw (uno::RuntimeException)
 {
         boolean bRet = false;
 
@@ -370,19 +368,16 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
 }
 
 media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
-    throw (uno::RuntimeException)
 {
     return meZoomLevel;
 }
 
 void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
-    throw (uno::RuntimeException)
 {
     mnPointerType = nPointerType;
 }
 
 void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 )
-    throw (uno::RuntimeException)
 {
     if( mnFrameWnd )
     {
@@ -392,7 +387,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal
 }
 
 awt::Rectangle SAL_CALL Window::getPosSize()
-    throw (uno::RuntimeException)
 {
     awt::Rectangle aRet;
 
@@ -413,7 +407,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
 }
 
 void SAL_CALL Window::setVisible( sal_Bool bVisible )
-    throw (uno::RuntimeException)
 {
     if( mnFrameWnd )
     {
@@ -427,104 +420,87 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
 }
 
 void SAL_CALL Window::setEnable( sal_Bool bEnable )
-    throw (uno::RuntimeException)
 {
     if( mnFrameWnd )
         ::EnableWindow( mnFrameWnd, bEnable );
 }
 
 void SAL_CALL Window::setFocus(  )
-    throw (uno::RuntimeException)
 {
     if( mnFrameWnd )
         ::SetFocus( mnFrameWnd );
 }
 
 void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::dispose(  )
-    throw (uno::RuntimeException)
 {
 }
 
 void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException)
 {
     maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
@@ -582,19 +558,16 @@ void Window::fireSetFocusEvent( const css::awt::FocusEvent& rEvt )
 }
 
 OUString SAL_CALL Window::getImplementationName(  )
-    throw (uno::RuntimeException)
 {
     return OUString( AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME );
 }
 
 sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     return { AVMEDIA_WIN_WINDOW_SERVICENAME };
 }
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index c034bd0c9f17..141c7abd6b6a 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -51,39 +51,39 @@ public:
     void    updatePointer();
 
     // XPlayerWindow
-    virtual void SAL_CALL update(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException) override;
-    virtual css::media::ZoomLevel SAL_CALL getZoomLevel(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL update(  ) override;
+    virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+    virtual css::media::ZoomLevel SAL_CALL getZoomLevel(  ) override;
+    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override;
 
     // XWindow
-    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) override;
-    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setFocus(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) override;
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) override;
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) override;
+    virtual void SAL_CALL setFocus(  ) override;
+    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 public:
 
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index ade2d1b2960d..b5ebc70fb57a 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -228,7 +228,7 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateS
 }
 
 // OCommonAccessibleComponent
-awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeException, std::exception)
+awt::Rectangle AccessibleDialogControlShape::implGetBounds()
 {
     return GetBounds();
 }
@@ -256,7 +256,7 @@ void AccessibleDialogControlShape::disposing()
 // XEventListener
 
 
-void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (RuntimeException, std::exception)
+void AccessibleDialogControlShape::disposing( const lang::EventObject& )
 {
     if ( m_xControlModel.is() )
         m_xControlModel->removePropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) );
@@ -267,7 +267,7 @@ void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (
 // XPropertyChangeListener
 
 
-void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEvent& rEvent ) throw (RuntimeException, std::exception)
+void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEvent& rEvent )
 {
     if ( rEvent.PropertyName == DLGED_PROP_NAME )
     {
@@ -289,23 +289,23 @@ void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEv
 }
 
 // XServiceInfo
-OUString AccessibleDialogControlShape::getImplementationName() throw (RuntimeException, std::exception)
+OUString AccessibleDialogControlShape::getImplementationName()
 {
     return OUString( "com.sun.star.comp.basctl.AccessibleShape" );
 }
 
-sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames()
 {
     return { "com.sun.star.drawing.AccessibleShape" };
 }
 
 // XAccessible
-Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleContext(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -313,7 +313,7 @@ Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleConte
 }
 
 // XAccessibleContext
-sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -321,7 +321,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (Runtime
 }
 
 
-Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -332,7 +332,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_I
 }
 
 
-Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -344,7 +344,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent(  ) t
 }
 
 
-sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -375,7 +375,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent(  ) throw (Ru
 }
 
 
-sal_Int16 AccessibleDialogControlShape::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 AccessibleDialogControlShape::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -383,7 +383,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole(  ) throw (RuntimeExce
 }
 
 
-OUString AccessibleDialogControlShape::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+OUString AccessibleDialogControlShape::getAccessibleDescription(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -391,7 +391,7 @@ OUString AccessibleDialogControlShape::getAccessibleDescription(  ) throw (Runti
 }
 
 
-OUString AccessibleDialogControlShape::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString AccessibleDialogControlShape::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -399,7 +399,7 @@ OUString AccessibleDialogControlShape::getAccessibleName(  ) throw (RuntimeExcep
 }
 
 
-Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleRelationSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -409,7 +409,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleR
 }
 
 
-Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -429,7 +429,7 @@ Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStat
 }
 
 
-Locale AccessibleDialogControlShape::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale AccessibleDialogControlShape::getLocale(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -440,7 +440,7 @@ Locale AccessibleDialogControlShape::getLocale(  ) throw (IllegalAccessibleCompo
 // XAccessibleComponent
 
 
-Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception)
+Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( const awt::Point& )
 {
     OExternalLockGuard aGuard( this );
 
@@ -448,13 +448,13 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( con
 }
 
 
-void AccessibleDialogControlShape::grabFocus(  ) throw (RuntimeException, std::exception)
+void AccessibleDialogControlShape::grabFocus(  )
 {
     // no focus for shapes
 }
 
 
-sal_Int32 AccessibleDialogControlShape::getForeground(  ) throw (RuntimeException, std::exception)
+sal_Int32 AccessibleDialogControlShape::getForeground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -479,7 +479,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground(  ) throw (RuntimeExceptio
 }
 
 
-sal_Int32 AccessibleDialogControlShape::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 AccessibleDialogControlShape::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -500,7 +500,7 @@ sal_Int32 AccessibleDialogControlShape::getBackground(  ) throw (RuntimeExceptio
 // XAccessibleExtendedComponent
 
 
-Reference< awt::XFont > AccessibleDialogControlShape::getFont(  ) throw (RuntimeException, std::exception)
+Reference< awt::XFont > AccessibleDialogControlShape::getFont(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -526,7 +526,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont(  ) throw (Runtime
 }
 
 
-OUString AccessibleDialogControlShape::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+OUString AccessibleDialogControlShape::getTitledBorderText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -534,7 +534,7 @@ OUString AccessibleDialogControlShape::getTitledBorderText(  ) throw (RuntimeExc
 }
 
 
-OUString AccessibleDialogControlShape::getToolTipText(  ) throw (RuntimeException, std::exception)
+OUString AccessibleDialogControlShape::getToolTipText(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 0d3447a17a1e..333e5ff15c4b 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -458,7 +458,7 @@ void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelp
 // OCommonAccessibleComponent
 
 
-awt::Rectangle AccessibleDialogWindow::implGetBounds() throw (RuntimeException)
+awt::Rectangle AccessibleDialogWindow::implGetBounds()
 {
     awt::Rectangle aBounds;
     if ( m_pDialogWindow )
@@ -573,23 +573,23 @@ void AccessibleDialogWindow::disposing()
 }
 
 // XServiceInfo
-OUString AccessibleDialogWindow::getImplementationName() throw (RuntimeException, std::exception)
+OUString AccessibleDialogWindow::getImplementationName()
 {
     return OUString( "com.sun.star.comp.basctl.AccessibleWindow" );
 }
 
-sal_Bool AccessibleDialogWindow::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool AccessibleDialogWindow::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > AccessibleDialogWindow::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > AccessibleDialogWindow::getSupportedServiceNames()
 {
     return { "com.sun.star.awt.AccessibleWindow" };
 }
 
 // XAccessible
-Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -597,7 +597,7 @@ Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext(  )
 }
 
 // XAccessibleContext
-sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 AccessibleDialogWindow::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -605,7 +605,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeExcept
 }
 
 
-Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -632,7 +632,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i
 }
 
 
-Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -648,7 +648,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent(  ) throw (
 }
 
 
-sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -674,7 +674,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent(  ) throw (RuntimeE
 }
 
 
-sal_Int16 AccessibleDialogWindow::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 AccessibleDialogWindow::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -682,7 +682,7 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole(  ) throw (RuntimeException,
 }
 
 
-OUString AccessibleDialogWindow::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+OUString AccessibleDialogWindow::getAccessibleDescription(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -694,7 +694,7 @@ OUString AccessibleDialogWindow::getAccessibleDescription(  ) throw (RuntimeExce
 }
 
 
-OUString AccessibleDialogWindow::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString AccessibleDialogWindow::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -706,7 +706,7 @@ OUString AccessibleDialogWindow::getAccessibleName(  ) throw (RuntimeException,
 }
 
 
-Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelationSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -716,7 +716,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelatio
 }
 
 
-Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -736,7 +736,7 @@ Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet(
 }
 
 
-Locale AccessibleDialogWindow::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale AccessibleDialogWindow::getLocale(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -747,7 +747,7 @@ Locale AccessibleDialogWindow::getLocale(  ) throw (IllegalAccessibleComponentSt
 // XAccessibleComponent
 
 
-Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception)
+Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt::Point& rPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -775,7 +775,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
 }
 
 
-void AccessibleDialogWindow::grabFocus(  ) throw (RuntimeException, std::exception)
+void AccessibleDialogWindow::grabFocus(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -784,7 +784,7 @@ void AccessibleDialogWindow::grabFocus(  ) throw (RuntimeException, std::excepti
 }
 
 
-sal_Int32 AccessibleDialogWindow::getForeground(  ) throw (RuntimeException, std::exception)
+sal_Int32 AccessibleDialogWindow::getForeground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -808,7 +808,7 @@ sal_Int32 AccessibleDialogWindow::getForeground(  ) throw (RuntimeException, std
 }
 
 
-sal_Int32 AccessibleDialogWindow::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 AccessibleDialogWindow::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -828,7 +828,7 @@ sal_Int32 AccessibleDialogWindow::getBackground(  ) throw (RuntimeException, std
 // XAccessibleExtendedComponent
 
 
-Reference< awt::XFont > AccessibleDialogWindow::getFont(  ) throw (RuntimeException, std::exception)
+Reference< awt::XFont > AccessibleDialogWindow::getFont(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -853,7 +853,7 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont(  ) throw (RuntimeExcept
 }
 
 
-OUString AccessibleDialogWindow::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+OUString AccessibleDialogWindow::getTitledBorderText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -861,7 +861,7 @@ OUString AccessibleDialogWindow::getTitledBorderText(  ) throw (RuntimeException
 }
 
 
-OUString AccessibleDialogWindow::getToolTipText(  ) throw (RuntimeException, std::exception)
+OUString AccessibleDialogWindow::getToolTipText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -876,7 +876,7 @@ OUString AccessibleDialogWindow::getToolTipText(  ) throw (RuntimeException, std
 // XAccessibleSelection
 
 
-void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -895,7 +895,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) thro
 }
 
 
-sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -910,7 +910,6 @@ sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildInde
 
 
 void AccessibleDialogWindow::clearAccessibleSelection()
-    throw (RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
 
@@ -919,7 +918,7 @@ void AccessibleDialogWindow::clearAccessibleSelection()
 }
 
 
-void AccessibleDialogWindow::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+void AccessibleDialogWindow::selectAllAccessibleChildren(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -928,7 +927,7 @@ void AccessibleDialogWindow::selectAllAccessibleChildren(  ) throw (RuntimeExcep
 }
 
 
-sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -944,7 +943,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount(  ) throw (Run
 }
 
 
-Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -966,7 +965,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal
 }
 
 
-void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index d1b7bced581d..3af2ee9ef9f9 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -86,7 +86,7 @@ VclPtr< Printer > Renderable::getPrinter()
 
 sal_Int32 SAL_CALL Renderable::getRendererCount (
         const Any&, const Sequence<beans::PropertyValue >& i_xOptions
-        ) throw (lang::IllegalArgumentException, RuntimeException, std::exception)
+        )
 {
     processProperties( i_xOptions );
 
@@ -118,7 +118,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount (
 
 Sequence<beans::PropertyValue> SAL_CALL Renderable::getRenderer (
         sal_Int32, const Any&, const Sequence<beans::PropertyValue>& i_xOptions
-        ) throw (lang::IllegalArgumentException, RuntimeException, std::exception)
+        )
 {
     processProperties( i_xOptions );
 
@@ -146,7 +146,7 @@ Sequence<beans::PropertyValue> SAL_CALL Renderable::getRenderer (
 void SAL_CALL Renderable::render (
         sal_Int32 nRenderer, const Any&,
         const Sequence<beans::PropertyValue>& i_xOptions
-        ) throw (lang::IllegalArgumentException, RuntimeException, std::exception)
+        )
 {
     processProperties( i_xOptions );
 
diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx
index c2bfce9fde94..412480609f0c 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -44,20 +44,17 @@ public:
     // XRenderable
     virtual sal_Int32 SAL_CALL getRendererCount (
         const css::uno::Any& aSelection,
-        const css::uno::Sequence<css::beans::PropertyValue >& xOptions)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::PropertyValue >& xOptions) override;
 
     virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getRenderer (
         sal_Int32 nRenderer,
         const css::uno::Any& rSelection,
-        const css::uno::Sequence<css::beans::PropertyValue>& rxOptions)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) override;
 
     virtual void SAL_CALL render (
         sal_Int32 nRenderer,
         const css::uno::Any& rSelection,
-        const css::uno::Sequence<css::beans::PropertyValue>& rxOptions)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) override;
 
 };
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index bd0b4cff2249..977d827f8230 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -183,14 +183,14 @@ public:
 private:
     virtual ~ChangesListener() override {}
 
-    virtual void SAL_CALL disposing(lang::EventObject const &) throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing(lang::EventObject const &) override
     {
         osl::MutexGuard g(editor_.mutex_);
         editor_.notifier_.clear();
     }
 
     virtual void SAL_CALL propertiesChange(
-        Sequence< beans::PropertyChangeEvent > const &) throw (RuntimeException, std::exception) override
+        Sequence< beans::PropertyChangeEvent > const &) override
     {
         SolarMutexGuard g;
         editor_.ImplSetFont();
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index 3dea60f64b22..7fa89a717dc6 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -56,7 +56,7 @@ Controller::~Controller()
 { }
 
 // XInterface
-Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL Controller::queryInterface( const Type & rType )
 {
     Any aReturn = SfxBaseController::queryInterface( rType );
     if ( !aReturn.hasValue() )
@@ -76,7 +76,7 @@ void SAL_CALL Controller::release() throw()
 }
 
 // XTypeProvider ( ::SfxBaseController )
-Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL Controller::getTypes()
 {
     Sequence< Type > aTypes = ::comphelper::concatSequences(
         SfxBaseController::getTypes(),
@@ -86,13 +86,13 @@ Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::ex
     return aTypes;
 }
 
-Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XPropertySet
-Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo()
 {
     Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 8e7ddc17e9b4..09aa70fb0536 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -109,17 +109,17 @@ public:
     }
 
     // XEventListener
-    virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) override {}
+    virtual void SAL_CALL disposing( const lang::EventObject& ) override {}
 
     // XContainerListener
-    virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) override
     {
         OUString sModuleName;
         if( mpShell && ( Event.Accessor >>= sModuleName ) )
             mpShell->FindBasWin( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, true );
     }
-    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( css::uno::RuntimeException, std::exception ) override { }
-    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) override { }
+    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) override
     {
         OUString sModuleName;
         if( mpShell && ( Event.Accessor >>= sModuleName ) )
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 0d8b7d23e71f..ae859336ee64 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -358,7 +358,6 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
 }
 
 Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     Sequence< OUString > aSeqMethods;
 
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index f3cdc49b6a70..d1bd544b5bc7 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -134,7 +134,6 @@ bool RenameDialog (
     OUString const& rOldName,
     OUString const& rNewName
 )
-    throw (ElementExistException, NoSuchElementException, RuntimeException, std::exception)
 {
     if ( !rDocument.hasDialog( rLibName, rOldName ) )
     {
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 3b4f345138d4..90e55e00ee18 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -73,10 +73,10 @@ namespace basctl
         virtual ~Impl () override;
 
         // XDocumentEventListener
-        virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const csslang::EventObject& Event ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const csslang::EventObject& Event ) override;
 
         // ComponentHelper
         virtual void SAL_CALL disposing() override;
@@ -115,7 +115,7 @@ namespace basctl
         }
     }
 
-    void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent )
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -168,7 +168,7 @@ namespace basctl
         }
     }
 
-    void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 43c8dc012ecd..3e7842aea543 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -80,7 +80,7 @@ public:
     {
     }
 
-    virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) override
     {
         if ( m_xHandler.is() )
         {
@@ -1154,20 +1154,16 @@ public:
     {}
 
     // Methods
-    virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
-        throw(RuntimeException, std::exception) override;
-    virtual Reference< XProgressHandler > SAL_CALL getProgressHandler()
-        throw(RuntimeException, std::exception) override;
+    virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override;
+    virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override;
 };
 
 Reference< task::XInteractionHandler > OLibCommandEnvironment::getInteractionHandler()
-    throw(RuntimeException, std::exception)
 {
     return mxInteraction;
 }
 
 Reference< XProgressHandler > OLibCommandEnvironment::getProgressHandler()
-    throw(RuntimeException, std::exception)
 {
     Reference< XProgressHandler > xRet;
     return xRet;
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 5cceb2a599c5..ca255657f8c8 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -43,7 +43,7 @@ SIDEModel::~SIDEModel()
 {
 }
 
-uno::Any SAL_CALL SIDEModel::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SIDEModel::queryInterface( const uno::Type& rType )
 {
     uno::Any aRet =  ::cppu::queryInterface ( rType,
                                     // OWeakObject interfaces
@@ -67,7 +67,7 @@ void SAL_CALL SIDEModel::release() throw()
     OWeakObject::release();
 }
 
-uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes(  )
 {
     uno::Sequence< uno::Type > aTypes = SfxBaseModel::getTypes();
     sal_Int32 nLen = aTypes.getLength();
@@ -78,7 +78,7 @@ uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes(  ) throw(uno::RuntimeEx
     return aTypes;
 }
 
-OUString SIDEModel::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SIDEModel::getImplementationName()
 {
     return getImplementationName_Static();
 }
@@ -88,11 +88,11 @@ OUString SIDEModel::getImplementationName_Static()
     return OUString( "com.sun.star.comp.basic.BasicIDE" );
 }
 
-sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SIDEModel::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
-uno::Sequence< OUString > SIDEModel::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SIDEModel::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -103,7 +103,7 @@ uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static()
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance(
-                const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception )
+                const uno::Reference< lang::XMultiServiceFactory > & )
 {
     SolarMutexGuard aGuard;
     EnsureIde();
@@ -112,25 +112,23 @@ uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance(
 }
 
 //  XStorable
-void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException, std::exception)
+void SAL_CALL SIDEModel::store()
 {
     notImplemented();
 }
 
 void SAL_CALL SIDEModel::storeAsURL( const OUString&, const uno::Sequence< beans::PropertyValue >& )
-        throw (io::IOException, uno::RuntimeException, std::exception)
 {
     notImplemented();
 }
 
 void SAL_CALL SIDEModel::storeToURL( const OUString&,
         const uno::Sequence< beans::PropertyValue >& )
-        throw (io::IOException, uno::RuntimeException, std::exception)
 {
     notImplemented();
 }
 
-void  SIDEModel::notImplemented() throw ( io::IOException )
+void  SIDEModel::notImplemented()
 {
     throw io::IOException("Can't store IDE model" );
 }
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index baea50903f83..e4d92351347a 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -29,37 +29,31 @@ class SIDEModel : public SfxBaseModel,
                 public com::sun::star::lang::XServiceInfo
 {
     /// @throws css::io::IOException
-    static void notImplemented() throw ( css::io::IOException );
+    static void notImplemented();
 public:
     explicit SIDEModel(SfxObjectShell *pObjSh = nullptr);
     virtual ~SIDEModel() override;
 
     //XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw() override;
     virtual void SAL_CALL release(  ) throw() override;
 
     //XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     // XStorable2
-    virtual void SAL_CALL storeSelf( const  css::uno::Sequence< css::beans::PropertyValue >& )
-        throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override { notImplemented(); }
+    virtual void SAL_CALL storeSelf( const  css::uno::Sequence< css::beans::PropertyValue >& ) override { notImplemented(); }
     //  XStorable
-    virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL store() override;
     virtual void SAL_CALL storeAsURL( const   OUString& sURL,
-                                      const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+                                      const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    ) override;
     virtual void SAL_CALL storeToURL( const   OUString& sURL,
-                                      const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+                                      const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    ) override;
 
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     static OUString getImplementationName_Static();
@@ -67,8 +61,7 @@ public:
 
 /// @throws com::sun::star::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL SIDEModel_createInstance(
-                const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
-                    throw( com::sun::star::uno::Exception );
+                const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 } // namespace basctl
 
diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx
index b6d91bf7ad7c..1d97b4cc94ef 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -61,7 +61,7 @@ bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, const
 }
 
 // XTransferable
-Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception)
+Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor )
 {
     const SolarMutexGuard aGuard;
 
@@ -81,13 +81,13 @@ Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor )
 
     return aData;
 }
-Sequence< DataFlavor > SAL_CALL DlgEdTransferableImpl::getTransferDataFlavors(  ) throw(RuntimeException, std::exception)
+Sequence< DataFlavor > SAL_CALL DlgEdTransferableImpl::getTransferDataFlavors(  )
 {
     const SolarMutexGuard aGuard;
 
     return m_SeqFlavors;
 }
-sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor& rFlavor ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor& rFlavor )
 {
     const SolarMutexGuard aGuard;
 
@@ -98,7 +98,7 @@ sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor
 }
 
 // XClipboardOwner
-void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw(RuntimeException, std::exception)
+void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& )
 {
     const SolarMutexGuard aGuard;
 
diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx
index f94774998ae8..8cda02a4520e 100644
--- a/basctl/source/dlged/dlgedlist.cxx
+++ b/basctl/source/dlged/dlgedlist.cxx
@@ -34,12 +34,12 @@ DlgEdPropListenerImpl::~DlgEdPropListenerImpl()
 }
 
 // XEventListener
-void SAL_CALL DlgEdPropListenerImpl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception)
+void SAL_CALL DlgEdPropListenerImpl::disposing( const css::lang::EventObject& )
 {
 }
 
 // XPropertyChangeListener
-void SAL_CALL DlgEdPropListenerImpl::propertyChange( const  css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException, std::exception)
+void SAL_CALL DlgEdPropListenerImpl::propertyChange( const  css::beans::PropertyChangeEvent& evt )
 {
     rDlgEdObj._propertyChange( evt );
 }
@@ -55,22 +55,22 @@ DlgEdEvtContListenerImpl::~DlgEdEvtContListenerImpl()
 }
 
 // XEventListener
-void SAL_CALL DlgEdEvtContListenerImpl::disposing( const  css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception)
+void SAL_CALL DlgEdEvtContListenerImpl::disposing( const  css::lang::EventObject& )
 {
 }
 
 // XContainerListener
-void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const css::container::ContainerEvent& Event)
 {
     rDlgEdObj._elementInserted( Event );
 }
 
-void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const css::container::ContainerEvent& Event)
 {
     rDlgEdObj._elementReplaced( Event );
 }
 
-void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const css::container::ContainerEvent& Event)
 {
     rDlgEdObj._elementRemoved( Event );
 }
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index a8dd5625cf58..7b839c3fcb34 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -439,7 +439,7 @@ void DlgEdObj::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
     SetRectFromProps();
 }
 
-void SAL_CALL DlgEdObj::NameChange( const  css::beans::PropertyChangeEvent& evt ) throw (css::container::NoSuchElementException, css::uno::RuntimeException)
+void SAL_CALL DlgEdObj::NameChange( const  css::beans::PropertyChangeEvent& evt )
 {
     // get old name
     OUString aOldName;
@@ -521,7 +521,7 @@ void DlgEdObj::UpdateStep()
     }
 }
 
-void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException)
+void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt )
 {
     DlgEdForm* pForm = GetDlgEdForm();
     if ( pForm )
@@ -1095,7 +1095,7 @@ void DlgEdObj::EndListening(bool bRemoveListener)
     }
 }
 
-void SAL_CALL DlgEdObj::_propertyChange( const  css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL DlgEdObj::_propertyChange( const  css::beans::PropertyChangeEvent& evt )
 {
     if (isListening())
     {
@@ -1151,7 +1151,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const  css::beans::PropertyChangeEvent&
     }
 }
 
-void SAL_CALL DlgEdObj::_elementInserted(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException)
+void SAL_CALL DlgEdObj::_elementInserted(const css::container::ContainerEvent& )
 {
     if (isListening())
     {
@@ -1160,7 +1160,7 @@ void SAL_CALL DlgEdObj::_elementInserted(const css::container::ContainerEvent& )
     }
 }
 
-void SAL_CALL DlgEdObj::_elementReplaced(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException)
+void SAL_CALL DlgEdObj::_elementReplaced(const css::container::ContainerEvent& )
 {
     if (isListening())
     {
@@ -1169,7 +1169,7 @@ void SAL_CALL DlgEdObj::_elementReplaced(const css::container::ContainerEvent& )
     }
 }
 
-void SAL_CALL DlgEdObj::_elementRemoved(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException)
+void SAL_CALL DlgEdObj::_elementRemoved(const css::container::ContainerEvent& )
 {
     if (isListening())
     {
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx
index 3571bd2692d0..ffdf0217c3f6 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -79,7 +79,7 @@ protected:
     void                    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     // OCommonAccessibleComponent
-    virtual css::awt::Rectangle implGetBounds() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle implGetBounds() override;
 
     // XComponent
     virtual void SAL_CALL   disposing() override;
@@ -95,41 +95,41 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) override;
 
     // XPropertyChangeListener
-    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;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
 };
 
 } // namespace basctl
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 1da0a2f905f0..bc87d60e2b0a 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -101,7 +101,7 @@ protected:
     void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     // OCommonAccessibleComponent
-    virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) override;
 
     // XComponent
     virtual void SAL_CALL   disposing() override;
@@ -120,46 +120,44 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection() override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
 };
 
 } // namespace basctl
diff --git a/basctl/source/inc/basidectrlr.hxx b/basctl/source/inc/basidectrlr.hxx
index 61f474fc9d7e..76049a5b3f37 100644
--- a/basctl/source/inc/basidectrlr.hxx
+++ b/basctl/source/inc/basidectrlr.hxx
@@ -45,16 +45,16 @@ public:
     virtual ~Controller() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XTypeProvider ( ::SfxBaseController )
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 91bc5507c96d..9ebbe0f949b8 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -84,8 +84,7 @@ namespace basctl
     /// @throws css::container::NoSuchElementException
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< OUString > GetMethodNames(
-        const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName )
-        throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception);
+        const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName );
 
     bool            HasMethod(
         const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName, const OUString& rMethName );
@@ -101,8 +100,7 @@ namespace basctl
         @throws css::uno::RuntimeException
     */
     bool            RenameDialog(
-        vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName )
-        throw (css::container::ElementExistException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception);
+        vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName );
 
     bool            RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName );
 
diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx
index 30f24ada0ac5..ef2f4c0fb7cb 100644
--- a/basctl/source/inc/dlgedclip.hxx
+++ b/basctl/source/inc/dlgedclip.hxx
@@ -42,12 +42,12 @@ public:
     virtual ~DlgEdTransferableImpl() override;
 
     // XTransferable
-    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) override;
 
     // XClipboardOwner
-    virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) override;
 };
 
 } // namespace basctl
diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx
index e803e852df60..a11e46087312 100644
--- a/basctl/source/inc/dlgedlist.hxx
+++ b/basctl/source/inc/dlgedlist.hxx
@@ -45,10 +45,10 @@ public:
     virtual ~DlgEdPropListenerImpl() 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;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
 };
 
@@ -68,12 +68,12 @@ public:
     virtual ~DlgEdEvtContListenerImpl() 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;
 
     // XContainerListener
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
 };
 
 } // namespace basctl
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index 34393d42332e..f88423976450 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -117,21 +117,21 @@ public:
     virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt );
     /// @throws css::container::NoSuchElementException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL NameChange( const  css::beans::PropertyChangeEvent& evt ) throw(css::container::NoSuchElementException, css::uno::RuntimeException);
+    void SAL_CALL NameChange( const  css::beans::PropertyChangeEvent& evt );
     /// @throws css::uno::RuntimeException
-    void SAL_CALL TabIndexChange( const  css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException);
+    void SAL_CALL TabIndexChange( const  css::beans::PropertyChangeEvent& evt );
 
     // PropertyChangeListener
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _propertyChange(const css::beans::PropertyChangeEvent& evt) throw (css::uno::RuntimeException, std::exception);
+    void SAL_CALL _propertyChange(const css::beans::PropertyChangeEvent& evt);
 
     // ContainerListener
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException);
+    void SAL_CALL _elementInserted( const css::container::ContainerEvent& Event );
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException);
+    void SAL_CALL _elementReplaced( const css::container::ContainerEvent& Event );
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException);
+    void SAL_CALL _elementRemoved( const css::container::ContainerEvent& Event );
 
     virtual void SetLayer(SdrLayerID nLayer) override;
     void MakeDataAware( const css::uno::Reference< css::frame::XModel >& xModel );
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
index 12e00a784422..6d87f738448c 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -51,7 +51,7 @@ namespace unotools
 
     void SAL_CALL UnoPolyPolygon::addPolyPolygon(
         const geometry::RealPoint2D&                        position,
-        const uno::Reference< rendering::XPolyPolygon2D >&  polyPolygon ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+        const uno::Reference< rendering::XPolyPolygon2D >&  polyPolygon )
     {
         osl::MutexGuard const guard( m_aMutex );
         modifying();
@@ -129,14 +129,14 @@ namespace unotools
         maPolyPoly.append( aSrcPoly );
     }
 
-    sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygons() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygons()
     {
         osl::MutexGuard const guard( m_aMutex );
         return maPolyPoly.count();
     }
 
     sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygonPoints(
-        sal_Int32 polygon ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception)
+        sal_Int32 polygon )
     {
         osl::MutexGuard const guard( m_aMutex );
         checkIndex( polygon );
@@ -144,14 +144,14 @@ namespace unotools
         return maPolyPoly.getB2DPolygon(polygon).count();
     }
 
-    rendering::FillRule SAL_CALL UnoPolyPolygon::getFillRule() throw (uno::RuntimeException, std::exception)
+    rendering::FillRule SAL_CALL UnoPolyPolygon::getFillRule()
     {
         osl::MutexGuard const guard( m_aMutex );
         return meFillRule;
     }
 
     void SAL_CALL UnoPolyPolygon::setFillRule(
-        rendering::FillRule fillRule ) throw (uno::RuntimeException, std::exception)
+        rendering::FillRule fillRule )
     {
         osl::MutexGuard const guard( m_aMutex );
         modifying();
@@ -160,7 +160,7 @@ namespace unotools
     }
 
     sal_Bool SAL_CALL UnoPolyPolygon::isClosed(
-        sal_Int32 index ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception)
+        sal_Int32 index )
     {
         osl::MutexGuard const guard( m_aMutex );
         checkIndex( index );
@@ -170,7 +170,7 @@ namespace unotools
 
     void SAL_CALL UnoPolyPolygon::setClosed(
         sal_Int32 index,
-        sal_Bool closedState ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception)
+        sal_Bool closedState )
     {
         osl::MutexGuard const guard( m_aMutex );
         modifying();
@@ -197,7 +197,7 @@ namespace unotools
         sal_Int32 nPolygonIndex,
         sal_Int32 nNumberOfPolygons,
         sal_Int32 nPointIndex,
-        sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception)
+        sal_Int32 nNumberOfPoints )
     {
         osl::MutexGuard const guard( m_aMutex );
 
@@ -210,7 +210,7 @@ namespace unotools
 
     void SAL_CALL UnoPolyPolygon::setPoints(
         const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points,
-        sal_Int32 nPolygonIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception)
+        sal_Int32 nPolygonIndex )
     {
         osl::MutexGuard const guard( m_aMutex );
         modifying();
@@ -232,7 +232,7 @@ namespace unotools
 
     geometry::RealPoint2D SAL_CALL UnoPolyPolygon::getPoint(
         sal_Int32 nPolygonIndex,
-        sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception)
+        sal_Int32 nPointIndex )
     {
         osl::MutexGuard const guard( m_aMutex );
         checkIndex( nPolygonIndex );
@@ -248,7 +248,7 @@ namespace unotools
     void SAL_CALL UnoPolyPolygon::setPoint(
         const geometry::RealPoint2D& point,
         sal_Int32 nPolygonIndex,
-        sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception)
+        sal_Int32 nPointIndex )
     {
         osl::MutexGuard const guard( m_aMutex );
         checkIndex( nPolygonIndex );
@@ -268,7 +268,7 @@ namespace unotools
         sal_Int32 nPolygonIndex,
         sal_Int32 nNumberOfPolygons,
         sal_Int32 nPointIndex,
-        sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+        sal_Int32 nNumberOfPoints )
     {
         osl::MutexGuard const guard( m_aMutex );
         return unotools::bezierSequenceSequenceFromB2DPolyPolygon(
@@ -280,8 +280,7 @@ namespace unotools
 
     void SAL_CALL UnoPolyPolygon::setBezierSegments(
         const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >&  points,
-        sal_Int32                                                               nPolygonIndex ) throw (lang::IndexOutOfBoundsException,
-                                                                                                       uno::RuntimeException, std::exception)
+        sal_Int32                                                               nPolygonIndex )
     {
         osl::MutexGuard const guard( m_aMutex );
         modifying();
@@ -301,8 +300,7 @@ namespace unotools
     }
 
     geometry::RealBezierSegment2D SAL_CALL UnoPolyPolygon::getBezierSegment( sal_Int32 nPolygonIndex,
-                                                                             sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,
-                                                                                                            uno::RuntimeException, std::exception)
+                                                                             sal_Int32 nPointIndex )
     {
         osl::MutexGuard const guard( m_aMutex );
         checkIndex( nPolygonIndex );
@@ -327,8 +325,7 @@ namespace unotools
 
     void SAL_CALL UnoPolyPolygon::setBezierSegment( const geometry::RealBezierSegment2D& segment,
                                                          sal_Int32                       nPolygonIndex,
-                                                         sal_Int32                       nPointIndex ) throw (lang::IndexOutOfBoundsException,
-                                                                                                              uno::RuntimeException, std::exception)
+                                                         sal_Int32                       nPointIndex )
     {
         osl::MutexGuard const guard( m_aMutex );
         checkIndex( nPolygonIndex );
@@ -436,17 +433,17 @@ namespace unotools
 
 #define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon"
 #define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D"
-    OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL UnoPolyPolygon::getImplementationName()
     {
         return OUString( IMPLEMENTATION_NAME );
     }
 
-    sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception )
+    sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    uno::Sequence< OUString > SAL_CALL UnoPolyPolygon::getSupportedServiceNames()  throw( uno::RuntimeException, std::exception )
+    uno::Sequence< OUString > SAL_CALL UnoPolyPolygon::getSupportedServiceNames()
     {
         return { SERVICE_NAME };
     }
diff --git a/basegfx/source/tools/unotools.cxx b/basegfx/source/tools/unotools.cxx
index b1666c3d149a..4e98741b9525 100644
--- a/basegfx/source/tools/unotools.cxx
+++ b/basegfx/source/tools/unotools.cxx
@@ -36,7 +36,6 @@ namespace unotools
 {
 
     B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
-        throw( lang::IllegalArgumentException )
     {
         const sal_Int32 nOuterSequenceCount(rSourcePolyPolygon.Coordinates.getLength());
         B2DPolyPolygon aNewPolyPolygon;
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index 1b63cc437d5d..a00c849bfee6 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -45,7 +45,7 @@ public:
     using SbxValue::GetObject;
     SbxVariable* GetObject();
     /// @throws css::uno::RuntimeException
-    void SetUnoObject( const css::uno::Any& aObj )throw ( css::uno::RuntimeException, std::exception ) ;
+    void SetUnoObject( const css::uno::Any& aObj ) ;
 };
 
 class FormObjEventListenerImpl;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 21ffb5b90a2f..56cf96adebb6 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -135,16 +135,12 @@ public:
 
 
     // XEventListener
-    virtual void SAL_CALL disposing( const lang::EventObject& Source )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
 
     // XContainerListener
-    virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event )
-        throw(uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event )
-        throw(uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) override;
 };
 
 
@@ -216,7 +212,6 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
 
 
 void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& Source )
-    throw( uno::RuntimeException, std::exception )
 {
     (void)Source;
 }
@@ -225,7 +220,6 @@ void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& S
 
 
 void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::ContainerEvent& Event )
-    throw( uno::RuntimeException, std::exception )
 {
     bool bLibContainer = maLibName.isEmpty();
     OUString aName;
@@ -272,7 +266,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::Con
 
 
 void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::ContainerEvent& Event )
-    throw( uno::RuntimeException, std::exception )
 {
     OUString aName;
     Event.Accessor >>= aName;
@@ -298,7 +291,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::Con
 
 
 void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const container::ContainerEvent& Event )
-    throw( uno::RuntimeException, std::exception )
 {
     OUString aName;
     Event.Accessor >>= aName;
@@ -1629,11 +1621,11 @@ public:
         : maName( aName ), maLanguage( aLanguage), maSource( aSource ) {}
 
     // Methods XStarBasicModuleInfo
-    virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getName() override
         { return maName; }
-    virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLanguage() override
         { return maLanguage; }
-    virtual OUString SAL_CALL getSource() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getSource() override
         { return maSource; }
 };
 
@@ -1648,9 +1640,9 @@ public:
         : maName( aName ), mData( Data ) {}
 
     // Methods XStarBasicDialogInfo
-    virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getName() override
         { return maName; }
-    virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< sal_Int8 > SAL_CALL getData() override
         { return mData; }
 };
 
@@ -1683,17 +1675,17 @@ public:
     {}
 
     // Methods XStarBasicLibraryInfo
-    virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getName() override
         { return maName; }
-    virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() override
         { return mxModuleContainer; }
-    virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() override
         { return mxDialogContainer; }
-    virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPassword() override
         { return maPassword; }
-    virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getExternalSourceURL() override
         { return maExternaleSourceURL; }
-    virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLinkTargetURL() override
         { return maLinkTargetURL; }
 };
 
@@ -1707,49 +1699,36 @@ public:
         :mpLib( pLib ) {}
 
     // Methods XElementAccess
-    virtual uno::Type SAL_CALL getElementType()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Methods XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::NoSuchElementException,
-              lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::ElementExistException,
-              lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 };
 
 // Methods XElementAccess
 uno::Type ModuleContainer_Impl::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Type aModuleType = cppu::UnoType<script::XStarBasicModuleInfo>::get();
     return aModuleType;
 }
 
 sal_Bool ModuleContainer_Impl::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     return mpLib && !mpLib->GetModules().empty();
 }
 
 // Methods XNameAccess
 uno::Any ModuleContainer_Impl::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr;
     if( !pMod )
@@ -1761,7 +1740,6 @@ uno::Any ModuleContainer_Impl::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > ModuleContainer_Impl::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     sal_uInt16 nMods = mpLib ? mpLib->GetModules().size() : 0;
     uno::Sequence< OUString > aRetSeq( nMods );
@@ -1774,7 +1752,6 @@ uno::Sequence< OUString > ModuleContainer_Impl::getElementNames()
 }
 
 sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr;
     bool bRet = (pMod != nullptr);
@@ -1784,7 +1761,6 @@ sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName )
 
 // Methods XNameReplace
 void ModuleContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     removeByName( aName );
     insertByName( aName, aElement );
@@ -1793,7 +1769,6 @@ void ModuleContainer_Impl::replaceByName( const OUString& aName, const uno::Any&
 
 // Methods XNameContainer
 void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Type aModuleType = cppu::UnoType<script::XStarBasicModuleInfo>::get();
     const uno::Type& aAnyType = aElement.getValueType();
@@ -1807,7 +1782,6 @@ void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any&
 }
 
 void ModuleContainer_Impl::removeByName( const OUString& Name )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SbModule* pMod = mpLib ? mpLib->FindModule( Name ) : nullptr;
     if( !pMod )
@@ -1853,40 +1827,30 @@ public:
         :mpLib( pLib ) {}
 
     // Methods XElementAccess
-    virtual uno::Type SAL_CALL getElementType()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Methods XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 };
 
 // Methods XElementAccess
 uno::Type DialogContainer_Impl::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Type aModuleType = cppu::UnoType<script::XStarBasicDialogInfo>::get();
     return aModuleType;
 }
 
 sal_Bool DialogContainer_Impl::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     bool bRet = false;
 
@@ -1906,7 +1870,6 @@ sal_Bool DialogContainer_Impl::hasElements()
 
 // Methods XNameAccess
 uno::Any DialogContainer_Impl::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxClassType::DontCare );
     SbxObject* pObj = dynamic_cast<SbxObject*>(pVar);
@@ -1924,7 +1887,6 @@ uno::Any DialogContainer_Impl::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > DialogContainer_Impl::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     sal_Int16 nCount = mpLib->GetObjects()->Count();
     uno::Sequence< OUString > aRetSeq( nCount );
@@ -1946,7 +1908,6 @@ uno::Sequence< OUString > DialogContainer_Impl::getElementNames()
 }
 
 sal_Bool DialogContainer_Impl::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     bool bRet = false;
     SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxClassType::DontCare );
@@ -1961,7 +1922,6 @@ sal_Bool DialogContainer_Impl::hasByName( const OUString& aName )
 
 // Methods XNameReplace
 void DialogContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     removeByName( aName );
     insertByName( aName, aElement );
@@ -1970,7 +1930,6 @@ void DialogContainer_Impl::replaceByName( const OUString& aName, const uno::Any&
 
 // Methods XNameContainer
 void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     (void)aName;
     uno::Type aModuleType = cppu::UnoType<script::XStarBasicDialogInfo>::get();
@@ -1986,7 +1945,6 @@ void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any&
 }
 
 void DialogContainer_Impl::removeByName( const OUString& Name )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     (void)Name;
     SbxVariable* pVar = mpLib->GetObjects()->Find( Name, SbxClassType::DontCare );
@@ -2008,41 +1966,31 @@ public:
         :mpMgr( pMgr ) {}
 
     // Methods XElementAccess
-    virtual uno::Type SAL_CALL getElementType()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Methods XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 };
 
 
 // Methods XElementAccess
 uno::Type LibraryContainer_Impl::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Type aType = cppu::UnoType<script::XStarBasicLibraryInfo>::get();
     return aType;
 }
 
 sal_Bool LibraryContainer_Impl::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     sal_Int32 nLibs = mpMgr->GetLibCount();
     bool bRet = (nLibs > 0);
@@ -2051,7 +1999,6 @@ sal_Bool LibraryContainer_Impl::hasElements()
 
 // Methods XNameAccess
 uno::Any LibraryContainer_Impl::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Any aRetAny;
     if( !mpMgr->HasLib( aName ) )
@@ -2094,7 +2041,6 @@ uno::Any LibraryContainer_Impl::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > LibraryContainer_Impl::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     sal_uInt16 nLibs = mpMgr->GetLibCount();
     uno::Sequence< OUString > aRetSeq( nLibs );
@@ -2107,7 +2053,6 @@ uno::Sequence< OUString > LibraryContainer_Impl::getElementNames()
 }
 
 sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     bool bRet = mpMgr->HasLib( aName );
     return bRet;
@@ -2115,7 +2060,6 @@ sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName )
 
 // Methods XNameReplace
 void LibraryContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     removeByName( aName );
     insertByName( aName, aElement );
@@ -2123,7 +2067,6 @@ void LibraryContainer_Impl::replaceByName( const OUString& aName, const uno::Any
 
 // Methods XNameContainer
 void LibraryContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     (void)aName;
     (void)aElement;
@@ -2131,7 +2074,6 @@ void LibraryContainer_Impl::insertByName( const OUString& aName, const uno::Any&
 }
 
 void LibraryContainer_Impl::removeByName( const OUString& Name )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     StarBASIC* pLib = mpMgr->GetLib( Name );
     if( !pLib )
@@ -2157,21 +2099,16 @@ public:
 
 public:
     // Methods
-    virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer()
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer() override;
     virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password,
-        const OUString& ExternalSourceURL, const OUString& LinkTargetURL )
-            throw(container::ElementExistException, uno::RuntimeException, std::exception) override;
+        const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) override;
     virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName,
-        const OUString& Language, const OUString& Source )
-            throw(container::NoSuchElementException, uno::RuntimeException, std::exception) override;
+        const OUString& Language, const OUString& Source ) override;
     virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName,
-        const uno::Sequence< sal_Int8 >& Data )
-            throw(container::NoSuchElementException, uno::RuntimeException, std::exception) override;
+        const uno::Sequence< sal_Int8 >& Data ) override;
 };
 
 uno::Reference< container::XNameContainer > SAL_CALL StarBasicAccess_Impl::getLibraryContainer()
-    throw(uno::RuntimeException, std::exception)
 {
     if( !mxLibContainer.is() )
         mxLibContainer = new LibraryContainer_Impl( mpMgr );
@@ -2185,7 +2122,6 @@ void SAL_CALL StarBasicAccess_Impl::createLibrary
     const OUString& ExternalSourceURL,
     const OUString& LinkTargetURL
 )
-    throw(container::ElementExistException, uno::RuntimeException, std::exception)
 {
     (void)ExternalSourceURL;
     StarBASIC* pLib = mpMgr->CreateLib( LibName, Password, LinkTargetURL );
@@ -2199,7 +2135,6 @@ void SAL_CALL StarBasicAccess_Impl::addModule
     const OUString& Language,
     const OUString& Source
 )
-    throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     (void)Language;
     StarBASIC* pLib = mpMgr->GetLib( LibraryName );
@@ -2216,7 +2151,6 @@ void SAL_CALL StarBasicAccess_Impl::addDialog
     const OUString& DialogName,
     const uno::Sequence< sal_Int8 >& Data
 )
-    throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     (void)LibraryName;
     (void)DialogName;
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 1401dcd45242..7f90e16ce6b6 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -40,27 +40,27 @@ public:
     ErrObject();
 
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSource() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getNumber() override;
+    virtual void SAL_CALL setNumber( ::sal_Int32 _number ) override;
+    virtual ::sal_Int32 SAL_CALL getHelpContext() override;
+    virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) override;
+    virtual OUString SAL_CALL getHelpFile() override;
+    virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) override;
+    virtual OUString SAL_CALL getDescription() override;
+    virtual void SAL_CALL setDescription( const OUString& _description ) override;
+    virtual OUString SAL_CALL getSource() override;
+    virtual void SAL_CALL setSource( const OUString& _source ) override;
 
     // Methods
-    virtual void SAL_CALL Clear(  ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Clear(  ) override;
+    virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) override;
     // XDefaultProperty
-    virtual OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDefaultPropertyName(  ) override;
 
     // Helper method
     /// @throws css::uno::RuntimeException
     void setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description,
-        const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException);
+        const uno::Any& HelpFile, const uno::Any& HelpContext );
 };
 
 ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0)
@@ -68,13 +68,13 @@ ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0)
 }
 
 sal_Int32 SAL_CALL
-ErrObject::getNumber() throw (uno::RuntimeException, std::exception)
+ErrObject::getNumber()
 {
     return m_nNumber;
 }
 
 void SAL_CALL
-ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception)
+ErrObject::setNumber( ::sal_Int32 _number )
 {
     GetSbData()->pInst->setErrorVB( _number, OUString() );
     OUString _description = GetSbData()->pInst->GetErrorMsg();
@@ -82,55 +82,55 @@ ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::e
 }
 
 ::sal_Int32 SAL_CALL
-ErrObject::getHelpContext() throw (uno::RuntimeException, std::exception)
+ErrObject::getHelpContext()
 {
     return m_nHelpContext;
 }
 void SAL_CALL
-ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception)
+ErrObject::setHelpContext( ::sal_Int32 _helpcontext )
 {
     m_nHelpContext = _helpcontext;
 }
 
 OUString SAL_CALL
-ErrObject::getHelpFile() throw (uno::RuntimeException, std::exception)
+ErrObject::getHelpFile()
 {
     return m_sHelpFile;
 }
 
 void SAL_CALL
-ErrObject::setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception)
+ErrObject::setHelpFile( const OUString& _helpfile )
 {
     m_sHelpFile = _helpfile;
 }
 
 OUString SAL_CALL
-ErrObject::getDescription() throw (uno::RuntimeException, std::exception)
+ErrObject::getDescription()
 {
     return m_sDescription;
 }
 
 void SAL_CALL
-ErrObject::setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception)
+ErrObject::setDescription( const OUString& _description )
 {
     m_sDescription = _description;
 }
 
 OUString SAL_CALL
-ErrObject::getSource() throw (uno::RuntimeException, std::exception)
+ErrObject::getSource()
 {
     return m_sSource;
 }
 
 void SAL_CALL
-ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception)
+ErrObject::setSource( const OUString& _source )
 {
     m_sSource = _source;
 }
 
 // Methods
 void SAL_CALL
-ErrObject::Clear(  ) throw (uno::RuntimeException, std::exception)
+ErrObject::Clear(  )
 {
     m_sHelpFile.clear();
     m_sSource = m_sHelpFile;
@@ -140,7 +140,7 @@ ErrObject::Clear(  ) throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception)
+ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext )
 {
     setData( Number, Source, Description, HelpFile, HelpContext );
     if ( m_nNumber )
@@ -149,13 +149,12 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any
 
 // XDefaultProperty
 OUString SAL_CALL
-ErrObject::getDefaultPropertyName(  ) throw (uno::RuntimeException, std::exception)
+ErrObject::getDefaultPropertyName(  )
 {
     return OUString( "Number" );
 }
 
 void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext )
-    throw (uno::RuntimeException)
 {
     if ( !Number.hasValue() )
         throw uno::RuntimeException("Missing Required Parameter" );
@@ -198,7 +197,6 @@ SbxErrObject::getErrObject()
 }
 
 void SbxErrObject::setNumberAndDescription( ::sal_Int32 _number, const OUString& _description )
-    throw (uno::RuntimeException)
 {
     if( m_pErrObject != nullptr )
     {
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index e5c428e6493a..e900fa9bf527 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -148,18 +148,15 @@ public:
         : maBasicRef( pBasic ), m_xModel( xModel ) {}
 
     // Methods of XAllListener
-    virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent)
-        throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent)
-        throw( InvocationTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent) override;
+    virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent) override;
 
     // Methods of XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source)
-        throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const EventObject& Source) override;
 };
 
 // Methods XAllListener
-void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException, std::exception )
+void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent )
 {
     SolarMutexGuard g;
 
@@ -167,7 +164,6 @@ void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw (
 }
 
 Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent )
-    throw ( InvocationTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -177,7 +173,7 @@ Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent )
 }
 
 // Methods XEventListener
-void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException, std::exception )
+void BasicScriptListener_Impl::disposing(const EventObject& )
 {
     // TODO: ???
     //SolarMutexGuard aGuard;
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 143ec4d8940a..1dc958879ddf 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -57,7 +57,7 @@ SbPropertyValues::~SbPropertyValues()
     m_xInfo.clear();
 }
 
-Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo() throw( RuntimeException, std::exception )
+Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo()
 {
     // create on demand?
     if (!m_xInfo.is())
@@ -96,11 +96,6 @@ size_t SbPropertyValues::GetIndex_Impl( const OUString &rPropName ) const
 void SbPropertyValues::setPropertyValue(
                     const OUString& aPropertyName,
                     const Any& aValue)
-                    throw (css::beans::UnknownPropertyException,
-                    css::beans::PropertyVetoException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::WrappedTargetException,
-                    css::uno::RuntimeException, std::exception)
 {
     size_t const nIndex = GetIndex_Impl( aPropertyName );
     PropertyValue & rPropVal = m_aPropVals[nIndex];
@@ -110,9 +105,6 @@ void SbPropertyValues::setPropertyValue(
 
 Any SbPropertyValues::getPropertyValue(
                     const OUString& aPropertyName)
-                    throw(css::beans::UnknownPropertyException,
-                    css::lang::WrappedTargetException,
-                    css::uno::RuntimeException, std::exception)
 {
     size_t const nIndex = GetIndex_Impl( aPropertyName );
     return m_aPropVals[nIndex].Value;
@@ -122,7 +114,6 @@ Any SbPropertyValues::getPropertyValue(
 void SbPropertyValues::addPropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& )
-                    throw (std::exception)
 {
     (void)aPropertyName;
 }
@@ -131,7 +122,6 @@ void SbPropertyValues::addPropertyChangeListener(
 void SbPropertyValues::removePropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& )
-                    throw (std::exception)
 {
     (void)aPropertyName;
 }
@@ -140,7 +130,6 @@ void SbPropertyValues::removePropertyChangeListener(
 void SbPropertyValues::addVetoableChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XVetoableChangeListener >& )
-                    throw(std::exception)
 {
     (void)aPropertyName;
 }
@@ -149,24 +138,18 @@ void SbPropertyValues::addVetoableChangeListener(
 void SbPropertyValues::removeVetoableChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XVetoableChangeListener >& )
-                    throw(std::exception)
 {
     (void)aPropertyName;
 }
 
 
-Sequence< PropertyValue > SbPropertyValues::getPropertyValues() throw (css::uno::RuntimeException, std::exception)
+Sequence< PropertyValue > SbPropertyValues::getPropertyValues()
 {
     return comphelper::containerToSequence(m_aPropVals);
 }
 
 
 void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPropertyValues )
-                     throw (css::beans::UnknownPropertyException,
-                     css::beans::PropertyVetoException,
-                     css::lang::IllegalArgumentException,
-                     css::lang::WrappedTargetException,
-                     css::uno::RuntimeException, std::exception)
 {
     if (!m_aPropVals.empty())
         throw IllegalArgumentException();
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index e5875224388a..66c1a94e562b 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -82,9 +82,9 @@ public:
         mbDisposed = bDisposed;
     }
 
-    virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& rSource ) override;
 
 private:
     StarBASIC&      mrDocBasic;
@@ -158,17 +158,17 @@ void DocBasicItem::stopListening()
     }
 }
 
-void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ )
 {
 }
 
-void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ )
 {
     stopListening();
     mbDocClosed = true;
 }
 
-void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ )
 {
     stopListening();
 }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index c1de49aa1dee..b85772631f74 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3826,11 +3826,11 @@ public:
     explicit BasicAllListener_Impl( const OUString& aPrefixName );
 
     // Methods of XAllListener
-    virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL firing(const AllEventObject& Event) override;
+    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) override;
 
     // Methods of XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const EventObject& Source) override;
 };
 
 
@@ -3890,12 +3890,12 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
 
 
 // Methods of Listener
-void BasicAllListener_Impl::firing( const AllEventObject& Event ) throw ( RuntimeException, std::exception )
+void BasicAllListener_Impl::firing( const AllEventObject& Event )
 {
     firing_impl( Event, nullptr );
 }
 
-Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( RuntimeException, std::exception )
+Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event )
 {
     Any aRetAny;
     firing_impl( Event, &aRetAny );
@@ -3904,7 +3904,7 @@ Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw (
 
 
 // Methods of XEventListener
-void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException, std::exception )
+void BasicAllListener_Impl ::disposing(const EventObject& )
 {
     SolarMutexGuard guard;
 
@@ -3922,14 +3922,12 @@ public:
         const Reference< XAllListener >& AllListener, const Any& Helper );
 
     // XInvocation
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
-        throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value)
-        throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override;
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() override;
+    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) override;
+    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) override;
+    virtual Any SAL_CALL getValue(const OUString& PropertyName) override;
+    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) override;
+    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) override;
 
 private:
     Reference< XAllListener >    m_xAllListener;
@@ -3972,7 +3970,6 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper
 
 
 Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection()
-    throw( RuntimeException, std::exception )
 {
     return Reference< XIntrospectionAccess >();
 }
@@ -3980,8 +3977,6 @@ Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getInt
 
 Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, const Sequence< Any >& Params,
     Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
-        throw( IllegalArgumentException, CannotConvertException,
-        InvocationTargetException, RuntimeException, std::exception )
 {
     (void)OutParamIndex;
     (void)OutParam     ;
@@ -4033,8 +4028,6 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
 
 
 void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyName, const Any& Value)
-    throw( UnknownPropertyException, CannotConvertException,
-           InvocationTargetException, RuntimeException, std::exception )
 {
     (void)PropertyName;
     (void)Value;
@@ -4042,7 +4035,6 @@ void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyNa
 
 
 Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyName)
-    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     (void)PropertyName;
 
@@ -4051,7 +4043,6 @@ Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyNam
 
 
 sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name)
-    throw( RuntimeException, std::exception )
 {
     Reference< XIdlMethod > xMethod = m_xListenerType->getMethod( Name );
     return xMethod.is();
@@ -4059,7 +4050,6 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name)
 
 
 sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Name)
-    throw( RuntimeException, std::exception )
 {
     Reference< XIdlField > xField = m_xListenerType->getField( Name );
     return xField.is();
@@ -4242,25 +4232,21 @@ public:
     ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj );
 
     // XInvocation
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception) override;
-    virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue )
-        throw (UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getValue( const OUString& rProperty )
-        throw (UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception) override;
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() override;
+    virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue ) override;
+    virtual Any SAL_CALL getValue( const OUString& rProperty ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) override;
 
     virtual Any SAL_CALL invoke( const OUString& rFunction,
                                  const Sequence< Any >& rParams,
                                  Sequence< sal_Int16 >& rOutParamIndex,
-                                 Sequence< Any >& rOutParam )
-        throw (CannotConvertException, InvocationTargetException,
-               RuntimeException, std::exception ) override;
+                                 Sequence< Any >& rOutParam ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) override;
 };
 
 ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj )
@@ -4272,13 +4258,12 @@ ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObject
     m_bProxyIsClassModuleObject = xScopeObj.Is() && nullptr != dynamic_cast<const SbClassModuleObject*>( xScopeObj.get() );
 }
 
-Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() throw(std::exception)
+Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection()
 {
     return Reference< XIntrospectionAccess >();
 }
 
 void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const Any& rValue)
-    throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     if( !m_bProxyIsClassModuleObject )
         throw UnknownPropertyException();
@@ -4316,7 +4301,6 @@ void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const A
 }
 
 Any SAL_CALL ModuleInvocationProxy::getValue(const OUString& rProperty)
-    throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     if( !m_bProxyIsClassModuleObject )
     {
@@ -4344,12 +4328,12 @@ Any SAL_CALL ModuleInvocationProxy::getValue(const OUString& rProperty)
     return aRet;
 }
 
-sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) throw(std::exception)
+sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) throw(std::exception)
+sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& )
 {
     return false;
 }
@@ -4358,8 +4342,6 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
                                             const Sequence< Any >& rParams,
                                             Sequence< sal_Int16 >&,
                                             Sequence< Any >& )
-    throw (CannotConvertException, InvocationTargetException,
-           RuntimeException, std::exception)
 {
     SolarMutexGuard guard;
 
@@ -4426,7 +4408,6 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
 }
 
 void SAL_CALL ModuleInvocationProxy::dispose()
-    throw(RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4437,13 +4418,11 @@ void SAL_CALL ModuleInvocationProxy::dispose()
 }
 
 void SAL_CALL ModuleInvocationProxy::addEventListener( const Reference< XEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     m_aListeners.addInterface( xListener );
 }
 
 void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     m_aListeners.removeInterface( xListener );
 }
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 6f07eb3df5ca..dce7d98cdded 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -94,28 +94,28 @@ class DocObjectWrapper : public DocObjectWrapper_BASE
     Sequence< Type >           m_Types;
     SbModule*                m_pMod;
     /// @throws css::uno::RuntimeException
-    SbMethodRef getMethod( const OUString& aName ) throw (RuntimeException, std::exception);
+    SbMethodRef getMethod( const OUString& aName );
     /// @throws css::uno::RuntimeException
-    SbPropertyRef getProperty( const OUString& aName ) throw (RuntimeException, std::exception);
+    SbPropertyRef getProperty( const OUString& aName );
 
 public:
     explicit DocObjectWrapper( SbModule* pMod );
 
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) override
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override
     {
         return css::uno::Sequence<sal_Int8>();
     }
 
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (RuntimeException, std::exception) override;
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(  ) override;
 
-    virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) override;
-    virtual  Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException, std::exception ) override;
+    virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) override;
+    virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) override;
+    virtual Any SAL_CALL getValue( const OUString& aPropertyName ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override;
+    virtual  Any SAL_CALL queryInterface( const Type& aType ) override;
 
-    virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception ) override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
 };
 
 DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar )
@@ -170,7 +170,6 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar )
 }
 
 Sequence< Type > SAL_CALL DocObjectWrapper::getTypes()
-    throw ( RuntimeException, std::exception )
 {
     if ( m_Types.getLength() == 0 )
     {
@@ -197,13 +196,13 @@ Sequence< Type > SAL_CALL DocObjectWrapper::getTypes()
 }
 
 Reference< XIntrospectionAccess > SAL_CALL
-DocObjectWrapper::getIntrospection(  ) throw (RuntimeException, std::exception)
+DocObjectWrapper::getIntrospection(  )
 {
     return nullptr;
 }
 
 Any SAL_CALL
-DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception)
+DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
 {
     if ( m_xAggInv.is() &&  m_xAggInv->hasMethod( aFunctionName ) )
             return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam );
@@ -297,7 +296,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >&
 }
 
 void SAL_CALL
-DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception)
+DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue )
 {
     if ( m_xAggInv.is() &&  m_xAggInv->hasProperty( aPropertyName ) )
             return m_xAggInv->setValue( aPropertyName, aValue );
@@ -309,7 +308,7 @@ DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) t
 }
 
 Any SAL_CALL
-DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+DocObjectWrapper::getValue( const OUString& aPropertyName )
 {
     if ( m_xAggInv.is() &&  m_xAggInv->hasProperty( aPropertyName ) )
             return m_xAggInv->getValue( aPropertyName );
@@ -327,7 +326,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownProper
 }
 
 sal_Bool SAL_CALL
-DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, std::exception)
+DocObjectWrapper::hasMethod( const OUString& aName )
 {
     if ( m_xAggInv.is() && m_xAggInv->hasMethod( aName ) )
         return true;
@@ -335,7 +334,7 @@ DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, st
 }
 
 sal_Bool SAL_CALL
-DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception)
+DocObjectWrapper::hasProperty( const OUString& aName )
 {
     bool bRes = false;
     if ( m_xAggInv.is() && m_xAggInv->hasProperty( aName ) )
@@ -345,7 +344,6 @@ DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException,
 }
 
 Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType )
-    throw ( RuntimeException, std::exception )
 {
     Any aRet = DocObjectWrapper_BASE::queryInterface( aType );
     if ( aRet.hasValue() )
@@ -355,7 +353,7 @@ Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType )
     return aRet;
 }
 
-SbMethodRef DocObjectWrapper::getMethod( const OUString& aName ) throw (RuntimeException, std::exception)
+SbMethodRef DocObjectWrapper::getMethod( const OUString& aName )
 {
     SbMethodRef pMethod = nullptr;
     if ( m_pMod )
@@ -370,7 +368,7 @@ SbMethodRef DocObjectWrapper::getMethod( const OUString& aName ) throw (RuntimeE
     return pMethod;
 }
 
-SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName ) throw (RuntimeException, std::exception)
+SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName )
 {
     SbPropertyRef pProperty = nullptr;
     if ( m_pMod )
@@ -2176,7 +2174,7 @@ SbObjModule::~SbObjModule()
 }
 
 void
-SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException, std::exception )
+SbObjModule::SetUnoObject( const uno::Any& aObj )
 {
     SbUnoObject* pUnoObj = dynamic_cast<SbUnoObject*>( pDocObject.get() );
     if ( pUnoObj && pUnoObj->getUnoAny() == aObj ) // object is equal, nothing to do
@@ -2300,7 +2298,7 @@ public:
         mxModel.clear();
     }
 
-    virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) override
     {
         if ( mpUserForm )
         {
@@ -2315,7 +2313,7 @@ public:
     }
 
 
-    virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) override
     {
 #ifdef IN_THE_FUTURE
         uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY );
@@ -2347,21 +2345,21 @@ public:
     }
 
 
-    virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) override
     {
         mbOpened = false;
         mbShowing = false;
     }
 
-    virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) override
     {
     }
 
-    virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) override
     {
     }
 
-    virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) override
     {
         if ( mpUserForm )
         {
@@ -2374,13 +2372,13 @@ public:
         }
     }
 
-    virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) override
     {
         if ( mpUserForm )
             mpUserForm->triggerDeactivateEvent();
     }
 
-    virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) override
     {
         if ( mpUserForm )
         {
@@ -2389,21 +2387,21 @@ public:
         }
     }
 
-    virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) override
     {
         if ( mpUserForm )
             mpUserForm->triggerLayoutEvent();
     }
 
-    virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) override
     {
     }
 
-    virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) override
     {
     }
 
-    virtual void SAL_CALL documentEventOccured( const document::DocumentEvent& rEvent ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL documentEventOccured( const document::DocumentEvent& rEvent ) override
     {
         // early disposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate"
         if( rEvent.EventName == GlobalEventConfig::GetEventName( GlobalEventId::CLOSEDOC ) )
@@ -2415,7 +2413,7 @@ public:
         }
     }
 
-    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) override
     {
         SAL_INFO("basic", "** Userform/Dialog disposing");
         removeListener();
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 2955c5c2490c..2218b29d2665 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -46,8 +46,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const css::uno::Reference< css::io::XOutputStream >& xOutput
-    )
-        throw(css::uno::Exception) override;
+    ) override;
 
     virtual css::uno::Any SAL_CALL importLibraryElement
     (
@@ -73,23 +72,17 @@ public:
 
     // Methods XStorageBasedLibraryContainer
     virtual void SAL_CALL storeLibrariesToStorage(
-        const css::uno::Reference< css::embed::XStorage >& RootStorage )
-            throw (css::uno::RuntimeException,
-                   css::lang::WrappedTargetException,
-                   std::exception) override;
+        const css::uno::Reference< css::embed::XStorage >& RootStorage ) override;
 
     // Resource handling
     css::uno::Reference< css::resource::XStringResourcePersistence >
         implCreateStringResource( class SfxDialogLibrary* pDialog );
 
     // Methods XServiceInfo
-    virtual OUString SAL_CALL getImplementationName( )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName( ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
     // XLibraryQueryExecutable
-    virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) override;
 };
 
 
@@ -135,7 +128,7 @@ public:
 
     // XStringResourceSupplier
     virtual css::uno::Reference< css::resource::XStringResourceResolver >
-        SAL_CALL getStringResource(  ) throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getStringResource(  ) override;
 
     const OUString& getName()
         { return m_aName; }
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index 07ac40f7e788..65c4722e3319 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -36,8 +36,7 @@ public:
     static css::uno::Reference< ooo::vba::XErrObject > const & getUnoErrObject();
 
     /// @throws css::uno::RuntimeException
-    void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description )
-        throw (css::uno::RuntimeException);
+    void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description );
 };
 #endif
 
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 832061d69f03..cd785d0877c2 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -98,65 +98,36 @@ public:
     /// @throws css::container::ElementExistException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void insertCheck(const OUString& aName, const css::uno::Any& aElement)
-        throw (css::lang::IllegalArgumentException,
-               css::container::ElementExistException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception);
+    void insertCheck(const OUString& aName, const css::uno::Any& aElement);
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void insertNoCheck(const OUString& aName, const css::uno::Any& aElement)
-        throw (css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception);
+    void insertNoCheck(const OUString& aName, const css::uno::Any& aElement);
 
     // Methods XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // Methods XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::ElementExistException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // Methods XContainer
-    virtual void SAL_CALL addContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener ) override;
+    virtual void SAL_CALL removeContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener ) override;
 
     // Methods XChangesNotifier
-    virtual void SAL_CALL addChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener ) override;
+    virtual void SAL_CALL removeChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener ) override;
 };
 
 
@@ -202,8 +173,7 @@ public:
 private:
     virtual bool implTypedNotify(
         const css::uno::Reference< css::script::vba::XVBAScriptListener >& rxListener,
-        const css::script::vba::VBAScriptEvent& rEvent )
-        throw (css::uno::Exception) override;
+        const css::script::vba::VBAScriptEvent& rEvent ) override;
 };
 
 
@@ -300,8 +270,7 @@ protected:
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const css::uno::Reference< css::io::XOutputStream >& xOutput
-    )
-        throw(css::uno::Exception) = 0;
+    ) = 0;
 
     virtual css::uno::Any SAL_CALL importLibraryElement
     (
@@ -324,9 +293,7 @@ protected:
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
     virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name,
-                                          bool bVerifyPasswordOnly=false )
-            throw(css::lang::WrappedTargetException,
-                  css::uno::RuntimeException, std::exception);
+                                          bool bVerifyPasswordOnly=false );
 
     virtual void onNewRootStorage() = 0;
 
@@ -357,8 +324,7 @@ protected:
         OUString& aUnexpandedStorageURL
     );
     /// @throws css::uno::RuntimeException
-    OUString expand_url( const OUString& url )
-        throw(css::uno::RuntimeException);
+    OUString expand_url( const OUString& url );
 
     SfxLibrary* getImplLib( const OUString& rLibraryName );
 
@@ -394,146 +360,85 @@ public:
     static void leaveMethod();
 
     // Methods XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Methods XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Members XStorageBasedLibraryContainer
-    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getRootStorage() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRootStorage( const css::uno::Reference< css::embed::XStorage >& _rootstorage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL storeLibrariesToStorage( const css::uno::Reference< css::embed::XStorage >& RootStorage ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getRootStorage() override;
+    virtual void SAL_CALL setRootStorage( const css::uno::Reference< css::embed::XStorage >& _rootstorage ) override;
+    virtual void SAL_CALL storeLibrariesToStorage( const css::uno::Reference< css::embed::XStorage >& RootStorage ) override;
 
     // Methods XModifiable (base of XPersistentLibraryContainer)
-    virtual sal_Bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isModified(  ) override;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // Methods XPersistentLibraryContainer (base of XStorageBasedLibraryContainer)
-    virtual css::uno::Any SAL_CALL getRootLocation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getContainerLocationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL storeLibraries(  ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getRootLocation() override;
+    virtual OUString SAL_CALL getContainerLocationName() override;
+    virtual void SAL_CALL storeLibraries(  ) override;
 
     //Methods XLibraryContainer3
-    virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name ) override;
 
     // Methods XLibraryContainer2 (base of XPersistentLibraryContainer)
-    virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName )
-        throw (css::container::NoSuchElementException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name ) override;
+    virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name ) override;
+    virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) override;
+    virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName ) override;
 
     // Methods XLibraryContainer (base of XLibraryContainer2)
     virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL
-        createLibrary( const OUString& Name )
-            throw(css::lang::IllegalArgumentException,
-                  css::container::ElementExistException,
-                  css::uno::RuntimeException, std::exception) override;
+        createLibrary( const OUString& Name ) override;
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL createLibraryLink
-        ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly )
-            throw(css::lang::IllegalArgumentException,
-                  css::container::ElementExistException,
-                  css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLibrary( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL loadLibrary( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+        ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly ) override;
+    virtual void SAL_CALL removeLibrary( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name ) override;
+    virtual void SAL_CALL loadLibrary( const OUString& Name ) override;
 
     // Methods XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence<
-        css::uno::Any >& aArguments )
-            throw (css::uno::Exception,
-                   css::uno::RuntimeException, std::exception) override;
+        css::uno::Any >& aArguments ) override;
 
     // Methods XLibraryContainerPassword
-    virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) override;
     virtual void SAL_CALL changeLibraryPassword( const OUString& Name,
-        const OUString& OldPassword, const OUString& NewPassword )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& OldPassword, const OUString& NewPassword ) override;
 
     // Methods XContainer
     virtual void SAL_CALL addContainerListener( const css::uno::Reference<
-        css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::container::XContainerListener >& xListener ) override;
     virtual void SAL_CALL removeContainerListener( const css::uno::Reference<
-        css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::container::XContainerListener >& xListener ) override;
 
     // Methods XLibraryContainerExport
     virtual void SAL_CALL exportLibrary( const OUString& Name, const OUString& URL,
-        const css::uno::Reference< css::task::XInteractionHandler >& Handler )
-            throw (css::uno::Exception,
-                   css::container::NoSuchElementException,
-                   css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
 
     // Methods XServiceInfo
-    virtual OUString SAL_CALL getImplementationName( )
-        throw (css::uno::RuntimeException, std::exception) override = 0;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
-        throw (css::uno::RuntimeException, std::exception) override = 0;
+    virtual OUString SAL_CALL getImplementationName( ) override = 0;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override = 0;
     // Methods XVBACompatibility
-    virtual sal_Bool SAL_CALL getVBACompatibilityMode() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getProjectName() throw (css::uno::RuntimeException, std::exception) override { return msProjectName; }
-    virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getRunningVBAScripts()
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getVBACompatibilityMode() override;
+    virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) override;
+    virtual OUString SAL_CALL getProjectName() override { return msProjectName; }
+    virtual void SAL_CALL setProjectName( const OUString& _projectname ) override;
+    virtual sal_Int32 SAL_CALL getRunningVBAScripts() override;
     virtual void SAL_CALL addVBAScriptListener(
-        const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) override;
     virtual void SAL_CALL removeVBAScriptListener(
-        const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName )
-            throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) override;
+    virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) override;
 };
 
 
@@ -636,65 +541,41 @@ public:
     );
 
     // Methods XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
     virtual void SAL_CALL acquire() throw() override { OComponentHelper::acquire(); }
     virtual void SAL_CALL release() throw() override { OComponentHelper::release(); }
 
     // Methods XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // Methods XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::ElementExistException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // XTypeProvider
-    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
     // Methods XContainer
     virtual void SAL_CALL addContainerListener( const css::uno::Reference<
-        css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::container::XContainerListener >& xListener ) override;
     virtual void SAL_CALL removeContainerListener( const css::uno::Reference<
-        css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::container::XContainerListener >& xListener ) override;
 
     // Methods XChangesNotifier
     virtual void SAL_CALL addChangesListener( const css::uno::Reference<
-        css::util::XChangesListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::util::XChangesListener >& xListener ) override;
     virtual void SAL_CALL removeChangesListener( const css::uno::Reference<
-        css::util::XChangesListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::util::XChangesListener >& xListener ) override;
 
 public:
     struct LibraryContainerAccess { friend class SfxLibraryContainer; private: LibraryContainerAccess() { } };
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 1488625498bb..a3c79e6cdee8 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -48,39 +48,27 @@ public:
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue(
                                 const OUString& aPropertyName,
-                                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 getPropertyValue( const OUString& PropertyName )
-        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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener(
                                 const OUString& aPropertyName,
-                                const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-                                throw (std::exception) override;
+                                const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override;
     virtual void SAL_CALL   removePropertyChangeListener(
                                 const OUString& aPropertyName,
-                                const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-                                throw (std::exception) override;
+                                const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override;
     virtual void SAL_CALL   addVetoableChangeListener(
                                 const OUString& aPropertyName,
-                                const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-                                throw (std::exception) override;
+                                const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override;
     virtual void SAL_CALL   removeVetoableChangeListener(
                                 const OUString& aPropertyName,
-                                const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-                                throw (std::exception) override;
+                                const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override;
 
     // XPropertyAccess
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< css::beans::PropertyValue >& PropertyValues_) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() override;
+    virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< css::beans::PropertyValue >& PropertyValues_) override;
 };
 
 class StarBASIC;
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 341b4828d4c2..e727ecccd02a 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -46,8 +46,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const css::uno::Reference< css::io::XOutputStream >& xOutput
-    )
-        throw(css::uno::Exception) override;
+    ) override;
 
     virtual css::uno::Any SAL_CALL importLibraryElement
     (
@@ -72,9 +71,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
                         const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI, const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
 
     virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name,
-                                          bool bVerifyPasswordOnly=false )
-            throw(css::lang::WrappedTargetException,
-                  css::uno::RuntimeException, std::exception) override;
+                                          bool bVerifyPasswordOnly=false ) override;
 
     virtual void onNewRootStorage() override;
 
@@ -93,30 +90,16 @@ public:
 
 
     // Methods XLibraryContainerPassword
-    virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) override;
     virtual void SAL_CALL changeLibraryPassword( const OUString& Name,
-        const OUString& OldPassword, const OUString& NewPassword )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& OldPassword, const OUString& NewPassword ) override;
     // XLibraryQueryExecutable
-    virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) override;
     // Methods XServiceInfo
-    virtual OUString SAL_CALL getImplementationName( )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName( ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
 };
 
 
@@ -161,10 +144,10 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XVBAModuleInfo
-    virtual css::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const css::script::ModuleInfo& ModuleInfo ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) override;
+    virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) override;
+    virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const css::script::ModuleInfo& ModuleInfo ) override;
+    virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) override;
 
     static bool containsValidModule( const css::uno::Any& _rElement );
 
diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx
index eefff5d46645..7e2432e43b15 100644
--- a/basic/source/runtime/comenumwrapper.cxx
+++ b/basic/source/runtime/comenumwrapper.cxx
@@ -22,7 +22,6 @@
 using namespace ::com::sun::star;
 
 sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements()
-    throw ( uno::RuntimeException, std::exception )
 {
     bool bResult = false;
 
@@ -41,9 +40,6 @@ sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements()
 }
 
 uno::Any SAL_CALL ComEnumerationWrapper::nextElement()
-    throw ( container::NoSuchElementException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     try
     {
diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx
index f1267ca9618f..8af4e164b06c 100644
--- a/basic/source/runtime/comenumwrapper.hxx
+++ b/basic/source/runtime/comenumwrapper.hxx
@@ -38,8 +38,8 @@ public:
     }
 
     // container::XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 };
 
 #endif // INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index fb90243ebaa2..a1a1f05f57b4 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -152,7 +152,6 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
     const OUString& aElementName,
     const Reference< XOutputStream >& xOutput
 )
-    throw(Exception)
 {
     Any aElement = xLib->getByName( aElementName );
     Reference< XInputStreamProvider > xISP;
@@ -185,7 +184,7 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
     xInput->closeInput();
 }
 
-void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException, WrappedTargetException, std::exception )
+void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage )
 {
     LibraryContainerMethodGuard aGuard( *this );
     mbOasis2OOoFormat = false;
@@ -444,19 +443,19 @@ void SfxDialogLibraryContainer::onNewRootStorage()
 }
 
 sal_Bool SAL_CALL
-SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) throw (uno::RuntimeException, std::exception)
+SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ )
 {
     return false; // dialog library has no executable code
 }
 
 // Service
 
-OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) throw (RuntimeException, std::exception)
+OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( )
 {
     return OUString("com.sun.star.comp.sfx2.DialogLibraryContainer");
 }
 
-Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( )
 {
     return {"com.sun.star.script.DocumentDialogLibraryContainer",
             "com.sun.star.script.DialogLibraryContainer"}; // for compatibility
@@ -554,7 +553,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const css::uno::Reference< css::
 
 // XStringResourceSupplier
 Reference< resource::XStringResourceResolver >
-    SAL_CALL SfxDialogLibrary::getStringResource(  ) throw (RuntimeException, std::exception)
+    SAL_CALL SfxDialogLibrary::getStringResource(  )
 {
     if( !m_xStringResourcePersistence.is() )
         m_xStringResourcePersistence = m_pParent->implCreateStringResource( this );
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index bc706067a172..ae579545f74b 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -99,13 +99,11 @@ static bool GbMigrationSuppressErrors = false;
 
 // Methods XElementAccess
 Type NameContainer::getElementType()
-    throw(RuntimeException, std::exception)
 {
     return mType;
 }
 
 sal_Bool NameContainer::hasElements()
-    throw(RuntimeException, std::exception)
 {
     bool bRet = (mnElementCount > 0);
     return bRet;
@@ -113,7 +111,6 @@ sal_Bool NameContainer::hasElements()
 
 // Methods XNameAccess
 Any NameContainer::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
     if( aIt == mHashMap.end() )
@@ -126,13 +123,11 @@ Any NameContainer::getByName( const OUString& aName )
 }
 
 Sequence< OUString > NameContainer::getElementNames()
-    throw(RuntimeException, std::exception)
 {
     return comphelper::containerToSequence(mNames);
 }
 
 sal_Bool NameContainer::hasByName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
     bool bRet = ( aIt != mHashMap.end() );
@@ -142,7 +137,6 @@ sal_Bool NameContainer::hasByName( const OUString& aName )
 
 // Methods XNameReplace
 void NameContainer::replaceByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     const Type& aAnyType = aElement.getValueType();
     if( mType != aAnyType )
@@ -187,7 +181,6 @@ void NameContainer::replaceByName( const OUString& aName, const Any& aElement )
 }
 
 void NameContainer::insertCheck(const OUString& aName, const Any& aElement)
-    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find(aName);
     if( aIt != mHashMap.end() )
@@ -198,7 +191,6 @@ void NameContainer::insertCheck(const OUString& aName, const Any& aElement)
 }
 
 void NameContainer::insertNoCheck(const OUString& aName, const Any& aElement)
-    throw(IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     const Type& aAnyType = aElement.getValueType();
     if( mType != aAnyType )
@@ -240,13 +232,11 @@ void NameContainer::insertNoCheck(const OUString& aName, const Any& aElement)
 
 // Methods XNameContainer
 void NameContainer::insertByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     insertCheck(aName, aElement);
 }
 
 void NameContainer::removeByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
     if( aIt == mHashMap.end() )
@@ -298,7 +288,6 @@ void NameContainer::removeByName( const OUString& aName )
 
 // Methods XContainer
 void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if( !xListener.is() )
     {
@@ -309,7 +298,6 @@ void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerLi
 }
 
 void SAL_CALL NameContainer::removeContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if( !xListener.is() )
     {
@@ -321,7 +309,6 @@ void SAL_CALL NameContainer::removeContainerListener( const Reference< XContaine
 
 // Methods XChangesNotifier
 void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if( !xListener.is() )
     {
@@ -332,7 +319,6 @@ void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListen
 }
 
 void SAL_CALL NameContainer::removeChangesListener( const Reference< XChangesListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if( !xListener.is() )
     {
@@ -368,7 +354,6 @@ VBAScriptListenerContainer::VBAScriptListenerContainer( ::osl::Mutex& rMutex ) :
 }
 
 bool VBAScriptListenerContainer::implTypedNotify( const Reference< vba::XVBAScriptListener >& rxListener, const vba::VBAScriptEvent& rEvent )
-    throw (Exception)
 {
     rxListener->notifyVBAScriptEvent( rEvent );
     return true;    // notify all other listeners too
@@ -444,14 +429,13 @@ BasicManager* SfxLibraryContainer::getBasicManager()
 }
 
 // Methods XStorageBasedLibraryContainer
-Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage() throw (RuntimeException, std::exception)
+Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage()
 {
     LibraryContainerMethodGuard aGuard( *this );
     return mxStorage;
 }
 
 void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >& _rxRootStorage )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     if ( !_rxRootStorage.is() )
@@ -463,7 +447,6 @@ void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >&
 }
 
 void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XStorage >& _rxRootStorage )
-    throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     if ( !_rxRootStorage.is() )
@@ -484,7 +467,6 @@ void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XSt
 
 // Methods XModifiable
 sal_Bool SfxLibraryContainer::isModified()
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     if ( maModifiable.isModified() )
@@ -527,41 +509,37 @@ sal_Bool SfxLibraryContainer::isModified()
 }
 
 void SAL_CALL SfxLibraryContainer::setModified( sal_Bool _bModified )
-    throw (PropertyVetoException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maModifiable.setModified( _bModified );
 }
 
 void SAL_CALL SfxLibraryContainer::addModifyListener( const Reference< XModifyListener >& _rxListener )
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maModifiable.addModifyListener( _rxListener );
 }
 
 void SAL_CALL SfxLibraryContainer::removeModifyListener( const Reference< XModifyListener >& _rxListener )
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maModifiable.removeModifyListener( _rxListener );
 }
 
 // Methods XPersistentLibraryContainer
-Any SAL_CALL SfxLibraryContainer::getRootLocation() throw (RuntimeException, std::exception)
+Any SAL_CALL SfxLibraryContainer::getRootLocation()
 {
     LibraryContainerMethodGuard aGuard( *this );
     return makeAny( getRootStorage() );
 }
 
-OUString SAL_CALL SfxLibraryContainer::getContainerLocationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL SfxLibraryContainer::getContainerLocationName()
 {
     LibraryContainerMethodGuard aGuard( *this );
     return maLibrariesDir;
 }
 
 void SAL_CALL SfxLibraryContainer::storeLibraries(  )
-    throw (WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     try
@@ -1362,7 +1340,6 @@ bool SfxLibraryContainer::implLoadPasswordLibrary(
     SfxLibrary* /*pLib*/,
     const OUString& /*Name*/,
     bool /*bVerifyPasswordOnly*/ )
-throw(WrappedTargetException, RuntimeException, std::exception)
 {
     return true;
 }
@@ -2180,14 +2157,12 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
 
 // Methods XElementAccess
 Type SAL_CALL SfxLibraryContainer::getElementType()
-    throw(RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     return maNameContainer->getElementType();
 }
 
 sal_Bool SfxLibraryContainer::hasElements()
-    throw(RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     bool bRet = maNameContainer->hasElements();
@@ -2196,7 +2171,6 @@ sal_Bool SfxLibraryContainer::hasElements()
 
 // Methods XNameAccess
 Any SfxLibraryContainer::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     Any aRetAny = maNameContainer->getByName( aName ) ;
@@ -2204,14 +2178,12 @@ Any SfxLibraryContainer::getByName( const OUString& aName )
 }
 
 Sequence< OUString > SfxLibraryContainer::getElementNames()
-    throw(RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     return maNameContainer->getElementNames();
 }
 
 sal_Bool SfxLibraryContainer::hasByName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     return maNameContainer->hasByName( aName ) ;
@@ -2219,7 +2191,6 @@ sal_Bool SfxLibraryContainer::hasByName( const OUString& aName )
 
 // Methods XLibraryContainer
 Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const OUString& Name )
-    throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pNewLib = implCreateLibrary( Name );
@@ -2238,7 +2209,6 @@ Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const O
 
 Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink
     ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly )
-    throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     // TODO: Check other reasons to force ReadOnly status
@@ -2286,7 +2256,6 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink
 }
 
 void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     // Get and hold library before removing
@@ -2357,7 +2326,6 @@ void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name )
 }
 
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name )
-    throw(NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2367,7 +2335,6 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name )
 
 
 void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     Any aLibAny = maNameContainer->getByName( Name ) ;
@@ -2508,7 +2475,6 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
 
 // Methods XLibraryContainer2
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2517,7 +2483,6 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name )
 }
 
 OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2531,7 +2496,6 @@ OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name )
 }
 
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2540,7 +2504,6 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name )
 }
 
 void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2564,7 +2527,6 @@ void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal
 }
 
 void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OUString& NewName )
-    throw (NoSuchElementException, ElementExistException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     if( maNameContainer->hasByName( NewName ) )
@@ -2696,7 +2658,6 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU
 
 // Methods XInitialization
 void SAL_CALL SfxLibraryContainer::initialize( const Sequence< Any >& _rArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     sal_Int32 nArgCount = _rArguments.getLength();
@@ -2772,28 +2733,24 @@ void SAL_CALL SfxLibraryContainer::disposing()
 
 // Methods XLibraryContainerPassword
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordProtected( const OUString& )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     return false;
 }
 
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordVerified( const OUString& )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     throw IllegalArgumentException();
 }
 
 sal_Bool SAL_CALL SfxLibraryContainer::verifyLibraryPassword( const OUString&, const OUString& )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     throw IllegalArgumentException();
 }
 
 void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&, const OUString&, const OUString& )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     throw IllegalArgumentException();
@@ -2801,7 +2758,6 @@ void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&, const
 
 // Methods XContainer
 void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maNameContainer->setEventSource( static_cast< XInterface* >( static_cast<OWeakObject*>(this) ) );
@@ -2809,7 +2765,6 @@ void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XConta
 }
 
 void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maNameContainer->removeContainerListener( xListener );
@@ -2818,7 +2773,6 @@ void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XCo
 // Methods XLibraryContainerExport
 void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OUString& URL,
     const Reference< XInteractionHandler >& Handler )
-    throw ( uno::Exception, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2854,7 +2808,6 @@ void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OU
 }
 
 OUString SfxLibraryContainer::expand_url( const OUString& url )
-    throw(css::uno::RuntimeException)
 {
     if (url.startsWithIgnoreAsciiCase( "vnd.sun.star.expand:" ))
     {
@@ -2873,7 +2826,6 @@ OUString SfxLibraryContainer::expand_url( const OUString& url )
 
 //XLibraryContainer3
 OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString& Name )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2888,12 +2840,12 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString
 
 
 // XVBACompatibility
-sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode()
 {
     return mbVBACompat;
 }
 
-void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( sal_Bool _vbacompatmodeon )
 {
     /*  The member variable mbVBACompat must be set first, the following call
         to getBasicManager() may call getVBACompatibilityMode() which returns
@@ -2930,7 +2882,7 @@ void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( sal_Bool _vbacompatm
     }
 }
 
-void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname )
 {
     msProjectName = _projectname;
     BasicManager* pBasMgr = getBasicManager();
@@ -2944,23 +2896,23 @@ void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname
     }
 }
 
-sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts()
 {
     LibraryContainerMethodGuard aGuard( *this );
     return mnRunningVBAScripts;
 }
 
-void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener )
 {
     maVBAScriptListeners.addTypedListener( rxListener );
 }
 
-void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener )
 {
     maVBAScriptListeners.removeTypedListener( rxListener );
 }
 
-void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName )
 {
     // own lock for accessing the number of running scripts
     enterMethod();
@@ -2982,7 +2934,6 @@ void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifie
 
 // Methods XServiceInfo
 sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -3055,7 +3006,6 @@ void SfxLibrary::implSetModified( bool _bIsModified )
 
 // Methods XInterface
 Any SAL_CALL SfxLibrary::queryInterface( const Type& rType )
-    throw( RuntimeException, std::exception )
 {
     Any aRet;
 
@@ -3076,13 +3026,11 @@ Any SAL_CALL SfxLibrary::queryInterface( const Type& rType )
 
 // Methods XElementAccess
 Type SfxLibrary::getElementType()
-    throw(RuntimeException, std::exception)
 {
     return maNameContainer->getElementType();
 }
 
 sal_Bool SfxLibrary::hasElements()
-    throw(RuntimeException, std::exception)
 {
     bool bRet = maNameContainer->hasElements();
     return bRet;
@@ -3090,7 +3038,6 @@ sal_Bool SfxLibrary::hasElements()
 
 // Methods XNameAccess
 Any SfxLibrary::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     impl_checkLoaded();
 
@@ -3099,13 +3046,11 @@ Any SfxLibrary::getByName( const OUString& aName )
 }
 
 Sequence< OUString > SfxLibrary::getElementNames()
-    throw(RuntimeException, std::exception)
 {
     return maNameContainer->getElementNames();
 }
 
 sal_Bool SfxLibrary::hasByName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     bool bRet = maNameContainer->hasByName( aName );
     return bRet;
@@ -3140,7 +3085,6 @@ void SfxLibrary::impl_checkLoaded()
 
 // Methods XNameReplace
 void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     impl_checkReadOnly();
     impl_checkLoaded();
@@ -3156,7 +3100,6 @@ void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement )
 
 // Methods XNameContainer
 void SfxLibrary::insertByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     impl_checkReadOnly();
     impl_checkLoaded();
@@ -3199,7 +3142,6 @@ void SfxLibrary::impl_removeWithoutChecks( const OUString& _rElementName )
 }
 
 void SfxLibrary::removeByName( const OUString& Name )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     impl_checkReadOnly();
     impl_checkLoaded();
@@ -3208,7 +3150,6 @@ void SfxLibrary::removeByName( const OUString& Name )
 
 // XTypeProvider
 Sequence< Type > SfxLibrary::getTypes()
-    throw( RuntimeException, std::exception )
 {
     static OTypeCollection * s_pTypes_NameContainer = nullptr;
     if( !s_pTypes_NameContainer )
@@ -3229,35 +3170,30 @@ Sequence< Type > SfxLibrary::getTypes()
 
 
 Sequence< sal_Int8 > SfxLibrary::getImplementationId()
-    throw( RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // Methods XContainer
 void SAL_CALL SfxLibrary::addContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     maNameContainer->setEventSource( static_cast< XInterface* >( static_cast<OWeakObject*>(this) ) );
     maNameContainer->addContainerListener( xListener );
 }
 
 void SAL_CALL SfxLibrary::removeContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     maNameContainer->removeContainerListener( xListener );
 }
 
 // Methods XChangesNotifier
 void SAL_CALL SfxLibrary::addChangesListener( const Reference< XChangesListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     maNameContainer->setEventSource( static_cast< XInterface* >( static_cast<OWeakObject*>(this) ) );
     maNameContainer->addChangesListener( xListener );
 }
 
 void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     maNameContainer->removeChangesListener( xListener );
 }
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index b50153e7eb2e..07f8935595e5 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -152,7 +152,6 @@ bool SAL_CALL SfxScriptLibraryContainer::isLibraryElementValid(const Any& rEleme
 void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement( const Reference < XNameContainer >& xLib,
                                                               const OUString& aElementName,
                                                               const Reference< XOutputStream >& xOutput)
-    throw(Exception)
 {
     // Create sax writer
     Reference< XWriter > xWriter = xml::sax::Writer::create(mxContext);
@@ -357,7 +356,6 @@ void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const OUString& a
 
 // Methods XLibraryContainerPassword
 sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const OUString& Name )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -366,7 +364,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const O
 }
 
 sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OUString& Name )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -380,7 +377,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
 
 sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword
     ( const OUString& Name, const OUString& Password )
-        throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -423,7 +419,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword
 void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& Name,
                                                                 const OUString& OldPassword,
                                                                 const OUString& NewPassword )
-        throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -856,7 +851,6 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
 
 bool SfxScriptLibraryContainer::implLoadPasswordLibrary
     ( SfxLibrary* pLib, const OUString& Name, bool bVerifyPasswordOnly )
-        throw(WrappedTargetException, RuntimeException, std::exception)
 {
     bool bRet = true;
 
@@ -1150,7 +1144,6 @@ void SfxScriptLibraryContainer::onNewRootStorage()
 }
 
 sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString& Library )
-    throw (uno::RuntimeException, std::exception)
 {
     BasicManager* pBasicMgr = getBasicManager();
     OSL_ENSURE( pBasicMgr, "we need a basicmanager, really we do" );
@@ -1165,13 +1158,11 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString&
 
 // Service
 OUString SAL_CALL SfxScriptLibraryContainer::getImplementationName( )
-    throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.sfx2.ScriptLibraryContainer" );
 }
 
 Sequence< OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServiceNames( )
-    throw (RuntimeException, std::exception)
 {
     return {"com.sun.star.script.DocumentScriptLibraryContainer",
             "com.sun.star.script.ScriptLibraryContainer"}; // for compatibility
@@ -1254,7 +1245,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BA
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BASE );
 
 script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& ModuleName )
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     if ( !hasModuleInfo( ModuleName ) )
     {
@@ -1264,7 +1254,6 @@ script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& Mod
 }
 
 sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName )
-    throw (RuntimeException, std::exception)
 {
     bool bRes = false;
     ModuleInfoMap::iterator it = mModuleInfo.find( ModuleName );
@@ -1277,7 +1266,6 @@ sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName )
 }
 
 void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, const script::ModuleInfo& ModuleInfo )
-    throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     if ( hasModuleInfo( ModuleName ) )
     {
@@ -1287,7 +1275,6 @@ void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, co
 }
 
 void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName )
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
         // #FIXME add NoSuchElementException to the spec
     if ( !hasModuleInfo( ModuleName ) )
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index d47b83410708..a47fbaa9a3cb 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -848,7 +848,7 @@ Bridge::~Bridge() {
 }
 
 css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
-    OUString const & sInstanceName) throw (css::uno::RuntimeException, std::exception)
+    OUString const & sInstanceName)
 {
     if (sInstanceName.isEmpty()) {
         throw css::uno::RuntimeException(
@@ -885,18 +885,18 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
         SAL_NO_ACQUIRE);
 }
 
-OUString Bridge::getName() throw (css::uno::RuntimeException, std::exception) {
+OUString Bridge::getName() {
     return name_;
 }
 
-OUString Bridge::getDescription() throw (css::uno::RuntimeException, std::exception) {
+OUString Bridge::getDescription() {
     OUStringBuffer b(name_);
     b.append(':');
     b.append(connection_->getDescription());
     return b.makeStringAndClear();
 }
 
-void Bridge::dispose() throw (css::uno::RuntimeException, std::exception) {
+void Bridge::dispose() {
     // For terminate(true) not to deadlock, an external protocol must ensure
     // that dispose is not called from a thread pool worker thread (that dispose
     // is never called from the reader or writer thread is already ensured
@@ -911,7 +911,6 @@ void Bridge::dispose() throw (css::uno::RuntimeException, std::exception) {
 
 void Bridge::addEventListener(
     css::uno::Reference< css::lang::XEventListener > const & xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(xListener.is());
     {
@@ -928,7 +927,6 @@ void Bridge::addEventListener(
 
 void Bridge::removeEventListener(
     css::uno::Reference< css::lang::XEventListener > const & aListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(mutex_);
     Listeners::iterator i(
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index 517b69b81552..89bfac393a90 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -175,27 +175,21 @@ private:
     virtual ~Bridge() override;
 
     virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-    SAL_CALL getInstance(OUString const & sInstanceName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    SAL_CALL getInstance(OUString const & sInstanceName) override;
 
-    virtual OUString SAL_CALL getName()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
 
-    virtual OUString SAL_CALL getDescription()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDescription() override;
 
-    virtual void SAL_CALL dispose()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     virtual void SAL_CALL addEventListener(
         com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
-            const & xListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+            const & xListener) override;
 
     virtual void SAL_CALL removeEventListener(
         com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
-            const & aListener)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+            const & aListener) override;
 
     // Only called from reader_ thread:
     void sendCommitChangeRequest();
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 6e7e756e2a12..7f2f02a05d57 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -84,19 +84,16 @@ BridgeFactory::BridgeFactory():
 BridgeFactory::~BridgeFactory() {}
 
 OUString BridgeFactory::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return static_getImplementationName();
 }
 
 sal_Bool BridgeFactory::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< OUString > BridgeFactory::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return static_getSupportedServiceNames();
 }
@@ -106,9 +103,6 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
     css::uno::Reference< css::connection::XConnection > const & aConnection,
     css::uno::Reference< css::bridge::XInstanceProvider > const &
         anInstanceProvider)
-    throw (
-        css::bridge::BridgeExistsException, css::lang::IllegalArgumentException,
-        css::uno::RuntimeException, std::exception)
 {
     rtl::Reference< Bridge > b;
     {
@@ -141,7 +135,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
 }
 
 css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge(
-    OUString const & sName) throw (css::uno::RuntimeException, std::exception)
+    OUString const & sName)
 {
     osl::MutexGuard g(m_aMutex);
     BridgeMap::iterator i(named_.find(sName));
@@ -150,7 +144,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge(
 }
 
 css::uno::Sequence< css::uno::Reference< css::bridge::XBridge > >
-BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException, std::exception) {
+BridgeFactory::getExistingBridges() {
     osl::MutexGuard g(m_aMutex);
     if (unnamed_.size() > SAL_MAX_INT32) {
         throw css::uno::RuntimeException(
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index 05e39b3dcfec..4d392c1e6a10 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -82,14 +82,12 @@ private:
 
     virtual ~BridgeFactory() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
-    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
     virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
     virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
     SAL_CALL createBridge(
@@ -98,21 +96,16 @@ private:
             com::sun::star::connection::XConnection > const & aConnection,
         com::sun::star::uno::Reference<
             com::sun::star::bridge::XInstanceProvider > const &
-                anInstanceProvider)
-        throw (
-            com::sun::star::bridge::BridgeExistsException,
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::uno::RuntimeException, std::exception) override;
+                anInstanceProvider) override;
 
     virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
     SAL_CALL getBridge(
-        OUString const & sName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        OUString const & sName) override;
 
     virtual
     com::sun::star::uno::Sequence<
         com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > >
-    SAL_CALL getExistingBridges() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    SAL_CALL getExistingBridges() override;
 
     void SAL_CALL disposing() override;
 
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index d56256d2f6cd..b3f403927f69 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -121,7 +121,7 @@ namespace cairocanvas
         CanvasBaseT::disposeThis();
     }
 
-    OUString SAL_CALL Canvas::getServiceName(  ) throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL Canvas::getServiceName(  )
     {
         return OUString( CANVAS_SERVICE_NAME );
     }
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index 588b13e2d4cc..4f32368dcd79 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -124,7 +124,7 @@ namespace cairocanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceName
-        virtual OUString SAL_CALL getServiceName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getServiceName(  ) override;
 
         // RepaintTarget
         virtual bool repaint( const ::cairo::SurfaceSharedPtr& pSurface,
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 09e1d210a9e7..88cef30db4c8 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -104,7 +104,7 @@ namespace cairocanvas
         return maCanvasHelper.repaint( pSurface, viewState, renderState );
     }
 
-    uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle )  throw (uno::RuntimeException, std::exception)
+    uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle )
     {
         uno::Any aRV( sal_Int32(0) );
         // 0 ... get BitmapEx
@@ -208,17 +208,17 @@ namespace cairocanvas
         return aRV;
     }
 
-    OUString SAL_CALL CanvasBitmap::getImplementationName(  ) throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL CanvasBitmap::getImplementationName(  )
     {
         return OUString( "CairoCanvas.CanvasBitmap" );
     }
 
-    sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames(  )
     {
         return { "com.sun.star.rendering.CanvasBitmap" };
     }
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index d7954183e75d..8b583340d3cc 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -87,9 +87,9 @@ namespace cairocanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // SurfaceProvider
         virtual ::cairo::SurfaceSharedPtr getSurface() override;
@@ -113,8 +113,8 @@ namespace cairocanvas
         //     1st a bool value: true - free the pixmap after used by XFreePixmap, false do nothing, the pixmap is used internally in the canvas
         //     2nd the pixmap handle
         //     3rd the pixmap depth
-        virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle)  throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&)  throw (css::uno::RuntimeException, std::exception) override {}
+        virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override;
+        virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {}
 
     private:
         SurfaceProviderRef        mpSurfaceProvider;
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index 107b0fe393c5..eeb0b2abc755 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx
@@ -132,17 +132,17 @@ namespace cairocanvas
         return mpSpriteCanvas->getOutputDevice();
     }
 
-    OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL CanvasCustomSprite::getImplementationName()
     {
         return OUString( "CairoCanvas.CanvasCustomSprite" );
     }
 
-    sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception )
+    sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames()  throw( uno::RuntimeException, std::exception )
+    uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames()
     {
         return { "com.sun.star.rendering.CanvasCustomSprite" };
     }
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index 6ce6102fbbc3..95f5bf91ef0c 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -113,9 +113,9 @@ namespace cairocanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // Sprite
         virtual void redraw( const ::cairo::CairoSharedPtr& pCairo,
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx
index 3206e2c31a3c..cbb9ff8f0d58 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.cxx
@@ -92,7 +92,7 @@ namespace cairocanvas
         mpRefDevice.clear();
     }
 
-    uno::Reference< rendering::XTextLayout > SAL_CALL  CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XTextLayout > SAL_CALL  CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed )
     {
         SolarMutexGuard aGuard;
 
@@ -106,42 +106,42 @@ namespace cairocanvas
                                mpRefDevice );
     }
 
-    rendering::FontRequest SAL_CALL  CanvasFont::getFontRequest(  ) throw (uno::RuntimeException, std::exception)
+    rendering::FontRequest SAL_CALL  CanvasFont::getFontRequest(  )
     {
         SolarMutexGuard aGuard;
 
         return maFontRequest;
     }
 
-    rendering::FontMetrics SAL_CALL  CanvasFont::getFontMetrics(  ) throw (uno::RuntimeException, std::exception)
+    rendering::FontMetrics SAL_CALL  CanvasFont::getFontMetrics(  )
     {
         // TODO(F1)
         return rendering::FontMetrics();
     }
 
-    uno::Sequence< double > SAL_CALL  CanvasFont::getAvailableSizes(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< double > SAL_CALL  CanvasFont::getAvailableSizes(  )
     {
         // TODO(F1)
         return uno::Sequence< double >();
     }
 
-    uno::Sequence< beans::PropertyValue > SAL_CALL  CanvasFont::getExtraFontProperties(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< beans::PropertyValue > SAL_CALL  CanvasFont::getExtraFontProperties(  )
     {
         // TODO(F1)
         return uno::Sequence< beans::PropertyValue >();
     }
 
-    OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL CanvasFont::getImplementationName()
     {
         return OUString( "CairoCanvas::CanvasFont" );
     }
 
-    sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception )
+    sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames()  throw( uno::RuntimeException, std::exception )
+    uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames()
     {
         return { "com.sun.star.rendering.CanvasFont" };
     }
diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 1fdeba085f6d..2bcb97eb2f8b 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.hxx
@@ -61,16 +61,16 @@ namespace cairocanvas
         virtual void SAL_CALL disposing() override;
 
         // XCanvasFont
-        virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::FontRequest SAL_CALL getFontRequest(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::FontMetrics SAL_CALL getFontMetrics(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override;
+        virtual css::rendering::FontRequest SAL_CALL getFontRequest(  ) override;
+        virtual css::rendering::FontMetrics SAL_CALL getFontMetrics(  ) override;
+        virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes(  ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         vcl::Font getVCLFont() const;
 
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index b2f673bab8c5..e75300ad1621 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1602,25 +1602,24 @@ namespace cairocanvas
             uno::Sequence< sal_Int8 >  maComponentTags;
             uno::Sequence< sal_Int32 > maBitCounts;
 
-            virtual ::sal_Int8 SAL_CALL getType(  ) throw (uno::RuntimeException, std::exception) override
+            virtual ::sal_Int8 SAL_CALL getType(  ) override
             {
                 return rendering::ColorSpaceType::RGB;
             }
-            virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) throw (uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) override
             {
                 return maComponentTags;
             }
-            virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) throw (uno::RuntimeException, std::exception) override
+            virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) override
             {
                 return rendering::RenderingIntent::PERCEPTUAL;
             }
-            virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) throw (uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) override
             {
                 return uno::Sequence< beans::PropertyValue >();
             }
             virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                        const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                  uno::RuntimeException, std::exception) override
+                                                                        const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
             {
                 // TODO(P3): if we know anything about target
                 // colorspace, this can be greatly sped up
@@ -1628,7 +1627,7 @@ namespace cairocanvas
                     convertToARGB(deviceColor));
                 return targetColorSpace->convertFromARGB(aIntermediate);
             }
-            virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override
             {
                 const double*  pIn( deviceColor.getConstArray() );
                 const std::size_t nLen( deviceColor.getLength() );
@@ -1649,7 +1648,7 @@ namespace cairocanvas
                 }
                 return aRes;
             }
-            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override
             {
                 const double*  pIn( deviceColor.getConstArray() );
                 const std::size_t nLen( deviceColor.getLength() );
@@ -1670,7 +1669,7 @@ namespace cairocanvas
                 }
                 return aRes;
             }
-            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override
             {
                 const double*  pIn( deviceColor.getConstArray() );
                 const std::size_t nLen( deviceColor.getLength() );
@@ -1687,7 +1686,7 @@ namespace cairocanvas
                 }
                 return aRes;
             }
-            virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
             {
                 const rendering::RGBColor* pIn( rgbColor.getConstArray() );
                 const std::size_t             nLen( rgbColor.getLength() );
@@ -1704,7 +1703,7 @@ namespace cairocanvas
                 }
                 return aRes;
             }
-            virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
             {
                 const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                 const std::size_t              nLen( rgbColor.getLength() );
@@ -1721,7 +1720,7 @@ namespace cairocanvas
                 }
                 return aRes;
             }
-            virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
             {
                 const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                 const std::size_t              nLen( rgbColor.getLength() );
@@ -1740,21 +1739,20 @@ namespace cairocanvas
             }
 
             // XIntegerBitmapColorSpace
-            virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) throw (uno::RuntimeException, std::exception) override
+            virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) override
             {
                 return 32;
             }
-            virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) throw (uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) override
             {
                 return maBitCounts;
             }
-            virtual ::sal_Int8 SAL_CALL getEndianness(  ) throw (uno::RuntimeException, std::exception) override
+            virtual ::sal_Int8 SAL_CALL getEndianness(  ) override
             {
                 return util::Endianness::LITTLE;
             }
             virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                 const uno::Reference< rendering::XColorSpace >& targetColorSpace )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                                                                                 const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
             {
                 if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) )
                 {
@@ -1785,8 +1783,7 @@ namespace cairocanvas
                 }
             }
             virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                     const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                                                                                     const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override
             {
                 if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) )
                 {
@@ -1802,8 +1799,7 @@ namespace cairocanvas
                     return targetColorSpace->convertIntegerFromARGB(aIntermediate);
                 }
             }
-            virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
             {
                 const sal_Int8* pIn( deviceColor.getConstArray() );
                 const std::size_t  nLen( deviceColor.getLength() );
@@ -1828,8 +1824,7 @@ namespace cairocanvas
                 return aRes;
             }
 
-            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
             {
                 const sal_Int8* pIn( deviceColor.getConstArray() );
                 const std::size_t  nLen( deviceColor.getLength() );
@@ -1854,8 +1849,7 @@ namespace cairocanvas
                 }
                 return aRes;
             }
-            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
             {
                 const sal_Int8* pIn( deviceColor.getConstArray() );
                 const std::size_t  nLen( deviceColor.getLength() );
@@ -1877,8 +1871,7 @@ namespace cairocanvas
                 return aRes;
             }
 
-            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
             {
                 const rendering::RGBColor* pIn( rgbColor.getConstArray() );
                 const std::size_t             nLen( rgbColor.getLength() );
@@ -1896,8 +1889,7 @@ namespace cairocanvas
                 return aRes;
             }
 
-            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
             {
                 const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                 const std::size_t              nLen( rgbColor.getLength() );
@@ -1915,8 +1907,7 @@ namespace cairocanvas
                 }
                 return aRes;
             }
-            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
             {
                 const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                 const std::size_t              nLen( rgbColor.getLength() );
@@ -1959,25 +1950,24 @@ namespace cairocanvas
             uno::Sequence< sal_Int8 >  maComponentTags;
             uno::Sequence< sal_Int32 > maBitCounts;
 
-            virtual ::sal_Int8 SAL_CALL getType(  ) throw (uno::RuntimeException, std::exception) override
+            virtual ::sal_Int8 SAL_CALL getType(  ) override
             {
                 return rendering::ColorSpaceType::RGB;
             }
-            virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) throw (uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) override
             {
                 return maComponentTags;
             }
-            virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) throw (uno::RuntimeException, std::exception) override
+            virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) override
             {
                 return rendering::RenderingIntent::PERCEPTUAL;
             }
-            virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) throw (uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) override
             {
                 return uno::Sequence< beans::PropertyValue >();
             }
             virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                        const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                  uno::RuntimeException, std::exception) override
+                                                                        const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
             {
                 // TODO(P3): if we know anything about target
                 // colorspace, this can be greatly sped up
@@ -1985,7 +1975,7 @@ namespace cairocanvas
                     convertToARGB(deviceColor));
                 return targetColorSpace->convertFromARGB(aIntermediate);
             }
-            virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override
             {
                 const double*  pIn( deviceColor.getConstArray() );
                 const std::size_t nLen( deviceColor.getLength() );
@@ -2019,15 +2009,15 @@ namespace cairocanvas
                 }
                 return aRes;
             }
-            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override
             {
                 return impl_convertToARGB( deviceColor );
             }
-            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override
             {
                 return impl_convertToARGB( deviceColor );
             }
-            virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
             {
                 const rendering::RGBColor* pIn( rgbColor.getConstArray() );
                 const std::size_t             nLen( rgbColor.getLength() );
@@ -2061,31 +2051,30 @@ namespace cairocanvas
                 }
                 return aRes;
             }
-            virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
             {
                 return impl_convertFromARGB( rgbColor );
             }
-            virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
             {
                 return impl_convertFromARGB( rgbColor );
             }
 
             // XIntegerBitmapColorSpace
-            virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) throw (uno::RuntimeException, std::exception) override
+            virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) override
             {
                 return 32;
             }
-            virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) throw (uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) override
             {
                 return maBitCounts;
             }
-            virtual ::sal_Int8 SAL_CALL getEndianness(  ) throw (uno::RuntimeException, std::exception) override
+            virtual ::sal_Int8 SAL_CALL getEndianness(  ) override
             {
                 return util::Endianness::LITTLE;
             }
             virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                 const uno::Reference< rendering::XColorSpace >& targetColorSpace )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                                                                                 const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
             {
                 if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) )
                 {
@@ -2116,8 +2105,7 @@ namespace cairocanvas
                 }
             }
             virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                     const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                                                                                     const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override
             {
                 if( dynamic_cast<CairoNoAlphaColorSpace*>(targetColorSpace.get()) )
                 {
@@ -2133,8 +2121,7 @@ namespace cairocanvas
                     return targetColorSpace->convertIntegerFromARGB(aIntermediate);
                 }
             }
-            virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
             {
                 const sal_Int8* pIn( deviceColor.getConstArray() );
                 const std::size_t  nLen( deviceColor.getLength() );
@@ -2152,13 +2139,11 @@ namespace cairocanvas
                 return aRes;
             }
 
-            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
             {
                 return impl_convertIntegerToARGB( deviceColor );
             }
-            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
             {
                 return impl_convertIntegerToARGB( deviceColor );
             }
@@ -2184,8 +2169,7 @@ namespace cairocanvas
                 return aRes;
             }
 
-            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
             {
                 const rendering::RGBColor* pIn( rgbColor.getConstArray() );
                 const std::size_t             nLen( rgbColor.getLength() );
@@ -2203,13 +2187,11 @@ namespace cairocanvas
                 return aRes;
             }
 
-            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
             {
                 return impl_convertIntegerFromARGB( rgbColor );
             }
-            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor )
-                throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+            virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
             {
                 return impl_convertIntegerFromARGB( rgbColor );
             }
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 906c220115ec..3370a9513b9f 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -115,17 +115,17 @@ namespace cairocanvas
         SpriteCanvasBaseT::disposeThis();
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll )
     {
         return updateScreen( bUpdateAll );
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+    sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll )
     {
         return updateScreen( bUpdateAll );
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -138,7 +138,7 @@ namespace cairocanvas
             mbSurfaceDirty);
     }
 
-    OUString SAL_CALL SpriteCanvas::getServiceName(  ) throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL SpriteCanvas::getServiceName(  )
     {
         return OUString( SPRITECANVAS_SERVICE_NAME );
     }
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index 9a3b61aaeb75..ee0b14d9e654 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -121,14 +121,14 @@ namespace cairocanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XBufferController (partial)
-        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override;
+        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override;
+        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override;
 
         // XSpriteCanvas (partial)
-        virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override;
 
         // XServiceName
-        virtual OUString SAL_CALL getServiceName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getServiceName(  ) override;
 
         // SurfaceProvider
         virtual ::cairo::SurfaceSharedPtr getSurface() override;
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 24efd369e062..eaf439923992 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -107,32 +107,32 @@ namespace cairocanvas
     }
 
     // XTextLayout
-    uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  )
     {
         // TODO
         return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >();
     }
 
-    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  )
     {
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
-    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  )
     {
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
-    uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return maLogicalAdvancements;
     }
 
-    void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -145,7 +145,7 @@ namespace cairocanvas
         maLogicalAdvancements = aAdvancements;
     }
 
-    geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds(  ) throw (uno::RuntimeException, std::exception)
+    geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -182,27 +182,27 @@ namespace cairocanvas
         }
     }
 
-    double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    double SAL_CALL TextLayout::justify( double /*nSize*/ )
     {
         // TODO
         return 0.0;
     }
 
     double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/,
-                                                 double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+                                                 double /*nSize*/ )
     {
         // TODO
         return 0.0;
     }
 
-    rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException, std::exception)
+    rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ )
     {
         // TODO
         return rendering::TextHit();
     }
 
     rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/,
-                                                    sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+                                                    sal_Bool /*bExcludeLigatures*/ )
     {
         // TODO
         return rendering::Caret();
@@ -210,47 +210,47 @@ namespace cairocanvas
 
     sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/,
                                                           sal_Int32 /*nCaretAdvancement*/,
-                                                          sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+                                                          sal_Bool /*bExcludeLigatures*/ )
     {
         // TODO
         return 0;
     }
 
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/,
-                                                                                              sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+                                                                                              sal_Int32 /*nEndIndex*/ )
     {
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/,
-                                                                                               sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+                                                                                               sal_Int32 /*nEndIndex*/ )
     {
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
-    double SAL_CALL TextLayout::getBaselineOffset(  ) throw (uno::RuntimeException, std::exception)
+    double SAL_CALL TextLayout::getBaselineOffset(  )
     {
         // TODO
         return 0.0;
     }
 
-    sal_Int8 SAL_CALL TextLayout::getMainTextDirection(  ) throw (uno::RuntimeException, std::exception)
+    sal_Int8 SAL_CALL TextLayout::getMainTextDirection(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return mnTextDirection;
     }
 
-    uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont(  ) throw (uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return mpFont.get();
     }
 
-    rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException, std::exception)
+    rendering::StringContext SAL_CALL TextLayout::getText(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -559,17 +559,17 @@ namespace cairocanvas
                           OffsetTransformer( aMatrix ) );
     }
 
-    OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL TextLayout::getImplementationName()
     {
         return OUString( "CairoCanvas::TextLayout" );
     }
 
-    sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception )
+    sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames()  throw( uno::RuntimeException, std::exception )
+    uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames()
     {
         return { "com.sun.star.rendering.TextLayout" };
     }
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index e39ce77457f0..b3db7803b2fa 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -59,28 +59,28 @@ namespace cairocanvas
         virtual void SAL_CALL disposing() override;
 
         // XTextLayout
-        virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getBaselineOffset(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getMainTextDirection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::StringContext SAL_CALL getText(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes(  ) override;
+        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures(  ) override;
+        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures(  ) override;
+        virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements(  ) override;
+        virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override;
+        virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds(  ) override;
+        virtual double SAL_CALL justify( double nSize ) override;
+        virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override;
+        virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override;
+        virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override;
+        virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override;
+        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual double SAL_CALL getBaselineOffset(  ) override;
+        virtual sal_Int8 SAL_CALL getMainTextDirection(  ) override;
+        virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont(  ) override;
+        virtual css::rendering::StringContext SAL_CALL getText(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         bool draw( ::cairo::CairoSharedPtr&                        pSCairo,
                    OutputDevice&                                   rOutDev,
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index b42f2ab92d56..3fa91396ee47 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -126,7 +126,7 @@ namespace dxcanvas
         CanvasBaseT::disposeThis();
     }
 
-    OUString SAL_CALL Canvas::getServiceName(  ) throw (uno::RuntimeException)
+    OUString SAL_CALL Canvas::getServiceName(  )
     {
         return OUString( CANVAS_SERVICE_NAME );
     }
@@ -202,7 +202,7 @@ namespace dxcanvas
         BitmapCanvasBaseT::disposeThis();
     }
 
-    OUString SAL_CALL BitmapCanvas::getServiceName(  ) throw (uno::RuntimeException)
+    OUString SAL_CALL BitmapCanvas::getServiceName(  )
     {
         return OUString( BITMAPCANVAS_SERVICE_NAME );
     }
diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx
index 8648d31a2d70..e690ca04f073 100644
--- a/canvas/source/directx/dx_canvas.hxx
+++ b/canvas/source/directx/dx_canvas.hxx
@@ -92,7 +92,7 @@ namespace dxcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceName
-        virtual OUString SAL_CALL getServiceName(  ) throw (css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getServiceName(  ) override;
 
     private:
         css::uno::Sequence< css::uno::Any >                maArguments;
@@ -148,7 +148,7 @@ namespace dxcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceName
-        virtual OUString SAL_CALL getServiceName(  ) throw (css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getServiceName(  ) override;
 
         // BitmapProvider
         virtual IBitmapSharedPtr getBitmap() const override;
diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
index 1b86f9c98f0e..edc1c0ace2cc 100644
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.cxx
@@ -74,7 +74,7 @@ namespace dxcanvas
         }
     };
 
-    uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle )  throw (uno::RuntimeException)
+    uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle )
     {
         uno::Any aRes;
         // 0 ... get BitmapEx
@@ -239,17 +239,17 @@ namespace dxcanvas
         return aRes;
     }
 
-    OUString SAL_CALL CanvasBitmap::getImplementationName(  ) throw (uno::RuntimeException)
+    OUString SAL_CALL CanvasBitmap::getImplementationName(  )
     {
         return OUString( "DXCanvas.CanvasBitmap" );
     }
 
-    sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
+    sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames(  ) throw (uno::RuntimeException)
+    uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames(  )
     {
         return { "com.sun.star.rendering.CanvasBitmap" };
     }
diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx
index 53c8b2b7a7f0..a547717e656d 100644
--- a/canvas/source/directx/dx_canvasbitmap.hxx
+++ b/canvas/source/directx/dx_canvasbitmap.hxx
@@ -70,15 +70,15 @@ namespace dxcanvas
         virtual void disposeThis() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // BitmapProvider
         virtual IBitmapSharedPtr getBitmap() const override { return mpBitmap; }
 
-        virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle)  throw (css::uno::RuntimeException) override;
-        virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&)  throw (css::uno::RuntimeException) override {}
+        virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override;
+        virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {}
 
     private:
         /** MUST hold here, too, since CanvasHelper only contains a
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index 148f2636b50d..b0e4b740ef67 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -81,17 +81,17 @@ namespace dxcanvas
         CanvasCustomSpriteBaseT::disposeThis();
     }
 
-    OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException )
+    OUString SAL_CALL CanvasCustomSprite::getImplementationName()
     {
         return OUString( "DXCanvas.CanvasCustomSprite" );
     }
 
-    sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
+    sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames()  throw( uno::RuntimeException )
+    uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames()
     {
         return { "com.sun.star.rendering.CanvasCustomSprite" };
     }
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index c53c84616788..a3b57917ed7b 100644
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.hxx
@@ -112,9 +112,9 @@ namespace dxcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // Sprite
         virtual void redraw() const override;
diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx
index d3274b03560c..58a22da907ef 100644
--- a/canvas/source/directx/dx_canvasfont.cxx
+++ b/canvas/source/directx/dx_canvasfont.cxx
@@ -84,49 +84,49 @@ namespace dxcanvas
 
     uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText,
                                                                                     sal_Int8                        nDirection,
-                                                                                    sal_Int64                       nRandomSeed ) throw (uno::RuntimeException)
+                                                                                    sal_Int64                       nRandomSeed )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return new TextLayout( aText, nDirection, nRandomSeed, ImplRef( this ) );
     }
 
-    uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes(  ) throw (uno::RuntimeException)
+    uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes(  )
     {
         // TODO
         return uno::Sequence< double >();
     }
 
-    uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties(  ) throw (uno::RuntimeException)
+    uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties(  )
     {
         // TODO
         return uno::Sequence< beans::PropertyValue >();
     }
 
-    rendering::FontRequest SAL_CALL CanvasFont::getFontRequest(  ) throw (uno::RuntimeException)
+    rendering::FontRequest SAL_CALL CanvasFont::getFontRequest(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return maFontRequest;
     }
 
-    rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics(  ) throw (uno::RuntimeException)
+    rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics(  )
     {
         // TODO
         return rendering::FontMetrics();
     }
 
-    OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException )
+    OUString SAL_CALL CanvasFont::getImplementationName()
     {
         return OUString( "DXCanvas::CanvasFont" );
     }
 
-    sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
+    sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames()  throw( uno::RuntimeException )
+    uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames()
     {
         return { "com.sun.star.rendering.CanvasFont" };
     }
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index 533f78c5eebb..7d463a386ae2 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -62,16 +62,16 @@ namespace dxcanvas
         virtual void SAL_CALL disposing() override;
 
         // XCanvasFont
-        virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException) override;
-        virtual css::rendering::FontRequest SAL_CALL getFontRequest(  ) throw (css::uno::RuntimeException) override;
-        virtual css::rendering::FontMetrics SAL_CALL getFontMetrics(  ) throw (css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes(  ) throw (css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) throw (css::uno::RuntimeException) override;
+        virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override;
+        virtual css::rendering::FontRequest SAL_CALL getFontRequest(  ) override;
+        virtual css::rendering::FontMetrics SAL_CALL getFontMetrics(  ) override;
+        virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes(  ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         double              getCellAscent() const;
         double              getEmHeight() const;
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 5c65c336e6a4..9fbd2d5dc154 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -116,7 +116,7 @@ namespace dxcanvas
         SpriteCanvasBaseT::disposeThis();
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+    sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -126,7 +126,7 @@ namespace dxcanvas
         return mbIsVisible && SpriteCanvasBaseT::showBuffer( bUpdateAll );
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+    sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -136,7 +136,7 @@ namespace dxcanvas
         return mbIsVisible && SpriteCanvasBaseT::switchBuffer( bUpdateAll );
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+    sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -149,7 +149,7 @@ namespace dxcanvas
             mbSurfaceDirty );
     }
 
-    OUString SAL_CALL SpriteCanvas::getServiceName(  ) throw (uno::RuntimeException)
+    OUString SAL_CALL SpriteCanvas::getServiceName(  )
     {
         return OUString( SPRITECANVAS_SERVICE_NAME );
     }
diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx
index 04471f8a509b..f57cbe5eee27 100644
--- a/canvas/source/directx/dx_spritecanvas.hxx
+++ b/canvas/source/directx/dx_spritecanvas.hxx
@@ -118,14 +118,14 @@ namespace dxcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XBufferController (partial)
-        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override;
-        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override;
+        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override;
+        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override;
 
         // XSpriteCanvas (partial)
-        virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override;
+        virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override;
 
         // XServiceName
-        virtual OUString SAL_CALL getServiceName(  ) throw (css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getServiceName(  ) override;
 
         /// Retrieve rendermodule object for this Canvas
         const IDXRenderModuleSharedPtr& getRenderModule() const;
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
index 84fa7181ef62..e96822a29b3c 100644
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.cxx
@@ -56,32 +56,32 @@ namespace dxcanvas
     }
 
     // XTextLayout
-    uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  ) throw (uno::RuntimeException)
+    uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  )
     {
         // TODO
         return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >();
     }
 
-    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  ) throw (uno::RuntimeException)
+    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  )
     {
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
-    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  ) throw (uno::RuntimeException)
+    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  )
     {
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
-    uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements(  ) throw (uno::RuntimeException)
+    uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return maLogicalAdvancements;
     }
 
-    void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException)
+    void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -94,7 +94,7 @@ namespace dxcanvas
         maLogicalAdvancements = aAdvancements;
     }
 
-    geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException)
+    geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -112,27 +112,27 @@ namespace dxcanvas
         return aBounds;
     }
 
-    double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException)
+    double SAL_CALL TextLayout::justify( double /*nSize*/ )
     {
         // TODO
         return 0.0;
     }
 
     double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/,
-                                                 double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException)
+                                                 double /*nSize*/ )
     {
         // TODO
         return 0.0;
     }
 
-    rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException)
+    rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ )
     {
         // TODO
         return rendering::TextHit();
     }
 
     rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/,
-                                                    sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+                                                    sal_Bool /*bExcludeLigatures*/ )
     {
         // TODO
         return rendering::Caret();
@@ -140,47 +140,47 @@ namespace dxcanvas
 
     sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/,
                                                           sal_Int32 /*nCaretAdvancement*/,
-                                                          sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+                                                          sal_Bool /*bExcludeLigatures*/ )
     {
         // TODO
         return 0;
     }
 
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/,
-                                                                                              sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+                                                                                              sal_Int32 /*nEndIndex*/ )
     {
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/,
-                                                                                               sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+                                                                                               sal_Int32 /*nEndIndex*/ )
     {
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
-    double SAL_CALL TextLayout::getBaselineOffset(  ) throw (uno::RuntimeException)
+    double SAL_CALL TextLayout::getBaselineOffset(  )
     {
         // TODO
         return 0.0;
     }
 
-    sal_Int8 SAL_CALL TextLayout::getMainTextDirection(  ) throw (uno::RuntimeException)
+    sal_Int8 SAL_CALL TextLayout::getMainTextDirection(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return mnTextDirection;
     }
 
-    uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont(  ) throw (uno::RuntimeException)
+    uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return mpFont.get();
     }
 
-    rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException)
+    rendering::StringContext SAL_CALL TextLayout::getText(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -213,17 +213,17 @@ namespace dxcanvas
         return true;
     }
 
-    OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException )
+    OUString SAL_CALL TextLayout::getImplementationName()
     {
         return OUString( "DXCanvas::TextLayout" );
     }
 
-    sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
+    sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames()  throw( uno::RuntimeException )
+    uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames()
     {
         return { "com.sun.star.rendering.TextLayout" };
     }
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
index 0cdea204431c..b24a1c8f00dc 100644
--- a/canvas/source/directx/dx_textlayout.hxx
+++ b/canvas/source/directx/dx_textlayout.hxx
@@ -57,28 +57,28 @@ namespace dxcanvas
         virtual void SAL_CALL disposing() override;
 
         // XTextLayout
-        virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes(  ) throw (css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures(  ) throw (css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures(  ) throw (css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements(  ) throw (css::uno::RuntimeException) override;
-        virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
-        virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds(  ) throw (css::uno::RuntimeException) override;
-        virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
-        virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
-        virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException) override;
-        virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
-        virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
-        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
-        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
-        virtual double SAL_CALL getBaselineOffset(  ) throw (css::uno::RuntimeException) override;
-        virtual sal_Int8 SAL_CALL getMainTextDirection(  ) throw (css::uno::RuntimeException) override;
-        virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException) override;
-        virtual css::rendering::StringContext SAL_CALL getText(  ) throw (css::uno::RuntimeException) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes(  ) override;
+        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures(  ) override;
+        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures(  ) override;
+        virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements(  ) override;
+        virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override;
+        virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds(  ) override;
+        virtual double SAL_CALL justify( double nSize ) override;
+        virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override;
+        virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override;
+        virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override;
+        virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override;
+        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual double SAL_CALL getBaselineOffset(  ) override;
+        virtual sal_Int8 SAL_CALL getMainTextDirection(  ) override;
+        virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont(  ) override;
+        virtual css::rendering::StringContext SAL_CALL getText(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         bool draw( const GraphicsSharedPtr&                              rGraphics,
                    const css::rendering::ViewState&         rViewState,
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index a174adaae6ee..f72785057e14 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -89,31 +89,26 @@ public:
     explicit CanvasFactory( Reference<XComponentContext> const & xContext );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override;
+    virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XMultiComponentFactory
-    virtual Sequence<OUString> SAL_CALL getAvailableServiceNames()
-        throw (RuntimeException, std::exception) override;
+    virtual Sequence<OUString> SAL_CALL getAvailableServiceNames() override;
     virtual Reference<XInterface> SAL_CALL createInstanceWithContext(
         OUString const & name,
-        Reference<XComponentContext> const & xContext ) throw (Exception, std::exception) override;
+        Reference<XComponentContext> const & xContext ) override;
     virtual Reference<XInterface> SAL_CALL
     createInstanceWithArgumentsAndContext(
         OUString const & name,
         Sequence<Any> const & args,
-        Reference<XComponentContext> const & xContext ) throw (Exception, std::exception) override;
+        Reference<XComponentContext> const & xContext ) override;
 
     // XMultiServiceFactory
     virtual Reference<XInterface> SAL_CALL createInstance(
-        OUString const & name )
-        throw (Exception, std::exception) override;
+        OUString const & name ) override;
     virtual Reference<XInterface> SAL_CALL createInstanceWithArguments(
-        OUString const & name, Sequence<Any> const & args )
-        throw (Exception, std::exception) override;
+        OUString const & name, Sequence<Any> const & args ) override;
 };
 
 CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
@@ -217,26 +212,23 @@ CanvasFactory::~CanvasFactory()
 
 
 // XServiceInfo
-OUString CanvasFactory::getImplementationName() throw (RuntimeException, std::exception)
+OUString CanvasFactory::getImplementationName()
 {
     return OUString("com.sun.star.comp.rendering.CanvasFactory");
 }
 
 sal_Bool CanvasFactory::supportsService( OUString const & serviceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 Sequence<OUString> CanvasFactory::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return { "com.sun.star.rendering.CanvasFactory" };
 }
 
 // XMultiComponentFactory
 Sequence<OUString> CanvasFactory::getAvailableServiceNames()
-    throw (RuntimeException, std::exception)
 {
     Sequence<OUString> aServiceNames(m_aAvailableImplementations.size());
     std::transform(m_aAvailableImplementations.begin(),
@@ -248,7 +240,6 @@ Sequence<OUString> CanvasFactory::getAvailableServiceNames()
 
 Reference<XInterface> CanvasFactory::createInstanceWithContext(
     OUString const & name, Reference<XComponentContext> const & xContext )
-    throw (Exception, std::exception)
 {
     return createInstanceWithArgumentsAndContext(
         name, Sequence<Any>(), xContext );
@@ -453,7 +444,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
 
 Reference<XInterface> CanvasFactory::createInstanceWithArgumentsAndContext(
     OUString const & preferredOne, Sequence<Any> const & args,
-    Reference<XComponentContext> const & xContext ) throw (Exception, std::exception)
+    Reference<XComponentContext> const & xContext )
 {
     Reference<XInterface> xCanvas(
         lookupAndUse( preferredOne, args, xContext ) );
@@ -467,7 +458,6 @@ Reference<XInterface> CanvasFactory::createInstanceWithArgumentsAndContext(
 // XMultiServiceFactory
 
 Reference<XInterface> CanvasFactory::createInstance( OUString const & name )
-    throw (Exception, std::exception)
 {
     return createInstanceWithArgumentsAndContext(
         name, Sequence<Any>(), m_xContext );
@@ -475,7 +465,7 @@ Reference<XInterface> CanvasFactory::createInstance( OUString const & name )
 
 
 Reference<XInterface> CanvasFactory::createInstanceWithArguments(
-    OUString const & name, Sequence<Any> const & args ) throw (Exception, std::exception)
+    OUString const & name, Sequence<Any> const & args )
 {
     return createInstanceWithArgumentsAndContext(
         name, args, m_xContext );
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 6b23d4504740..d16659896fc4 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -58,8 +58,7 @@ namespace oglcanvas
         CanvasCustomSpriteBaseT::disposeThis();
     }
 
-    void SAL_CALL CanvasCustomSprite::setAlpha( double alpha ) throw (lang::IllegalArgumentException,
-                                                                      uno::RuntimeException, std::exception)
+    void SAL_CALL CanvasCustomSprite::setAlpha( double alpha )
     {
         canvas::tools::verifyRange( alpha, 0.0, 1.0 );
 
@@ -69,8 +68,7 @@ namespace oglcanvas
 
     void SAL_CALL CanvasCustomSprite::move( const geometry::RealPoint2D&  aNewPos,
                                             const rendering::ViewState&   viewState,
-                                            const rendering::RenderState& renderState ) throw (lang::IllegalArgumentException,
-                                                                                               uno::RuntimeException, std::exception)
+                                            const rendering::RenderState& renderState )
     {
         canvas::tools::verifyArgs(aNewPos, viewState, renderState,
                                   OSL_THIS_FUNC,
@@ -87,39 +85,38 @@ namespace oglcanvas
         maPosition *= aTransform;
     }
 
-    void SAL_CALL CanvasCustomSprite::transform( const geometry::AffineMatrix2D& aTransformation ) throw (lang::IllegalArgumentException,
-                                                                                                          uno::RuntimeException, std::exception)
+    void SAL_CALL CanvasCustomSprite::transform( const geometry::AffineMatrix2D& aTransformation )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         maTransformation = aTransformation;
     }
 
-    void SAL_CALL CanvasCustomSprite::clip( const uno::Reference< rendering::XPolyPolygon2D >& xClip ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL CanvasCustomSprite::clip( const uno::Reference< rendering::XPolyPolygon2D >& xClip )
     {
         mxClip = xClip;
     }
 
-    void SAL_CALL CanvasCustomSprite::setPriority( double nPriority ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL CanvasCustomSprite::setPriority( double nPriority )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         mfPriority = nPriority;
     }
 
-    void SAL_CALL CanvasCustomSprite::show() throw (uno::RuntimeException, std::exception)
+    void SAL_CALL CanvasCustomSprite::show()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if( mpSpriteCanvas.is() )
             mpSpriteCanvas->show(this);
     }
 
-    void SAL_CALL CanvasCustomSprite::hide() throw (uno::RuntimeException, std::exception)
+    void SAL_CALL CanvasCustomSprite::hide()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if( mpSpriteCanvas.is() )
             mpSpriteCanvas->hide(this);
     }
 
-    uno::Reference< rendering::XCanvas > SAL_CALL CanvasCustomSprite::getContentCanvas() throw (uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XCanvas > SAL_CALL CanvasCustomSprite::getContentCanvas()
     {
         return this;
     }
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx
index bad063e19a71..c26d955c8ea6 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.hxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx
@@ -63,16 +63,16 @@ namespace oglcanvas
         virtual void disposeThis() override;
 
         // XSprite
-        virtual void SAL_CALL setAlpha( double alpha ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL move( const css::geometry::RealPoint2D&  aNewPos, const css::rendering::ViewState&  viewState, const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPriority( double nPriority ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL show() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL hide() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setAlpha( double alpha ) override;
+        virtual void SAL_CALL move( const css::geometry::RealPoint2D&  aNewPos, const css::rendering::ViewState&  viewState, const css::rendering::RenderState& renderState ) override;
+        virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) override;
+        virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) override;
+        virtual void SAL_CALL setPriority( double nPriority ) override;
+        virtual void SAL_CALL show() override;
+        virtual void SAL_CALL hide() override;
 
         // XCustomSprite
-        virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL getContentCanvas() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL getContentCanvas() override;
 
         double getPriority() const { return mfPriority; }
 
diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx
index e129a5c9e890..0434bb0856cb 100644
--- a/canvas/source/opengl/ogl_canvasfont.cxx
+++ b/canvas/source/opengl/ogl_canvasfont.cxx
@@ -31,33 +31,33 @@ namespace oglcanvas
 
     uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText,
                                                                                     sal_Int8                        nDirection,
-                                                                                    sal_Int64                       nRandomSeed ) throw (uno::RuntimeException, std::exception)
+                                                                                    sal_Int64                       nRandomSeed )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return new TextLayout( aText, nDirection, nRandomSeed, ImplRef( this ) );
     }
 
-    uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes(  )
     {
         // TODO
         return uno::Sequence< double >();
     }
 
-    uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties(  )
     {
         // TODO
         return uno::Sequence< beans::PropertyValue >();
     }
 
-    rendering::FontRequest SAL_CALL CanvasFont::getFontRequest(  ) throw (uno::RuntimeException, std::exception)
+    rendering::FontRequest SAL_CALL CanvasFont::getFontRequest(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return maFontRequest;
     }
 
-    rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics(  ) throw (uno::RuntimeException, std::exception)
+    rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics(  )
     {
         // TODO
         return rendering::FontMetrics();
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index 9aca57f7044a..1743bc3c985e 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -42,11 +42,11 @@ namespace oglcanvas
                     const css::geometry::Matrix2D&                                         fontMatrix );
 
         // XCanvasFont
-        virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::FontRequest SAL_CALL getFontRequest(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::FontMetrics SAL_CALL getFontMetrics(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override;
+        virtual css::rendering::FontRequest SAL_CALL getFontRequest(  ) override;
+        virtual css::rendering::FontMetrics SAL_CALL getFontMetrics(  ) override;
+        virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes(  ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) override;
 
         const css::geometry::Matrix2D& getFontMatrix() const { return maFontMatrix; }
 
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index 8e9cbb8636ff..17ae212764b7 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -88,7 +88,7 @@ namespace oglcanvas
         SpriteCanvasBaseT::disposeThis();
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -98,7 +98,7 @@ namespace oglcanvas
         return mbIsVisible && SpriteCanvasBaseT::showBuffer( bUpdateAll );
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -109,44 +109,38 @@ namespace oglcanvas
     }
 
     uno::Reference< rendering::XAnimatedSprite > SAL_CALL SpriteCanvas::createSpriteFromAnimation(
-        const uno::Reference< rendering::XAnimation >& /*animation*/ ) throw (lang::IllegalArgumentException,
-                                                                              uno::RuntimeException, std::exception)
+        const uno::Reference< rendering::XAnimation >& /*animation*/ )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
     }
 
     uno::Reference< rendering::XAnimatedSprite > SAL_CALL SpriteCanvas::createSpriteFromBitmaps(
         const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/,
-        ::sal_Int8 /*interpolationMode*/ ) throw (lang::IllegalArgumentException,
-                                                  rendering::VolatileContentDestroyedException,
-                                                  uno::RuntimeException, std::exception)
+        ::sal_Int8 /*interpolationMode*/ )
     {
         return uno::Reference< rendering::XAnimatedSprite >();
     }
 
     uno::Reference< rendering::XCustomSprite > SAL_CALL SpriteCanvas::createCustomSprite(
-        const geometry::RealSize2D& spriteSize ) throw (lang::IllegalArgumentException,
-                                                        uno::RuntimeException, std::exception)
+        const geometry::RealSize2D& spriteSize )
     {
         return uno::Reference< rendering::XCustomSprite >(
             new CanvasCustomSprite(spriteSize, this, maDeviceHelper) );
     }
 
     uno::Reference< rendering::XSprite > SAL_CALL SpriteCanvas::createClonedSprite(
-        const uno::Reference< rendering::XSprite >& /*original*/ ) throw (lang::IllegalArgumentException,
-                                                                          uno::RuntimeException, std::exception)
+        const uno::Reference< rendering::XSprite >& /*original*/ )
     {
         return uno::Reference< rendering::XSprite >();
     }
 
     sal_Bool SAL_CALL SpriteCanvas::updateScreen(sal_Bool bUpdateAll)
-        throw (uno::RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return maDeviceHelper.showBuffer(mbIsVisible, bUpdateAll);
     }
 
-    ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName(  ) throw (uno::RuntimeException, std::exception)
+    ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName(  )
     {
         return ::rtl::OUString( SPRITECANVAS_SERVICE_NAME );
     }
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index 47e58254100c..202370bfd844 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -85,20 +85,18 @@ namespace oglcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XBufferController (partial)
-        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override;
+        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override;
 
         // XSpriteCanvas
-        virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll )
-            throw (css::uno::RuntimeException,
-                   std::exception) override;
+        virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) override;
+        virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) override;
+        virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) override;
+        virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) override;
+        virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override;
 
         // XServiceName
-        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::rtl::OUString SAL_CALL getServiceName(  ) override;
 
         void show( const ::rtl::Reference< CanvasCustomSprite >& );
         void hide( const ::rtl::Reference< CanvasCustomSprite >& );
diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx
index c11815033586..0331c8c9d2ba 100644
--- a/canvas/source/opengl/ogl_textlayout.cxx
+++ b/canvas/source/opengl/ogl_textlayout.cxx
@@ -37,32 +37,32 @@ namespace oglcanvas
     }
 
     // XTextLayout
-    uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  )
     {
         // TODO
         return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >();
     }
 
-    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  )
     {
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
-    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  )
     {
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
-    uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return maLogicalAdvancements;
     }
 
-    void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -75,7 +75,7 @@ namespace oglcanvas
         maLogicalAdvancements = aAdvancements;
     }
 
-    geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds(  ) throw (uno::RuntimeException, std::exception)
+    geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -101,27 +101,27 @@ namespace oglcanvas
         }
     }
 
-    double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    double SAL_CALL TextLayout::justify( double /*nSize*/ )
     {
         // TODO
         return 0.0;
     }
 
     double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/,
-                                                 double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+                                                 double /*nSize*/ )
     {
         // TODO
         return 0.0;
     }
 
-    rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException, std::exception)
+    rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ )
     {
         // TODO
         return rendering::TextHit();
     }
 
     rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/,
-                                                    sal_Bool  /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+                                                    sal_Bool  /*bExcludeLigatures*/ )
     {
         // TODO
         return rendering::Caret();
@@ -129,47 +129,47 @@ namespace oglcanvas
 
     sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/,
                                                           sal_Int32 /*nCaretAdvancement*/,
-                                                          sal_Bool  /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+                                                          sal_Bool  /*bExcludeLigatures*/ )
     {
         // TODO
         return 0;
     }
 
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/,
-                                                                                              sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+                                                                                              sal_Int32 /*nEndIndex*/ )
     {
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/,
-                                                                                               sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+                                                                                               sal_Int32 /*nEndIndex*/ )
     {
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
-    double SAL_CALL TextLayout::getBaselineOffset(  ) throw (uno::RuntimeException, std::exception)
+    double SAL_CALL TextLayout::getBaselineOffset(  )
     {
         // TODO
         return 0.0;
     }
 
-    sal_Int8 SAL_CALL TextLayout::getMainTextDirection(  ) throw (uno::RuntimeException, std::exception)
+    sal_Int8 SAL_CALL TextLayout::getMainTextDirection(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return mnTextDirection;
     }
 
-    uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont(  ) throw (uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
         return mpFont.get();
     }
 
-    rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException, std::exception)
+    rendering::StringContext SAL_CALL TextLayout::getText(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx
index 168282adb1ff..c98cdcf5d465 100644
--- a/canvas/source/opengl/ogl_textlayout.hxx
+++ b/canvas/source/opengl/ogl_textlayout.hxx
@@ -43,23 +43,23 @@ namespace oglcanvas
         virtual void SAL_CALL disposing() override;
 
         // XTextLayout
-        virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getBaselineOffset(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getMainTextDirection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::StringContext SAL_CALL getText(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes(  ) override;
+        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures(  ) override;
+        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures(  ) override;
+        virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements(  ) override;
+        virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override;
+        virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds(  ) override;
+        virtual double SAL_CALL justify( double nSize ) override;
+        virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override;
+        virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override;
+        virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override;
+        virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override;
+        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual double SAL_CALL getBaselineOffset(  ) override;
+        virtual sal_Int8 SAL_CALL getMainTextDirection(  ) override;
+        virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont(  ) override;
+        virtual css::rendering::StringContext SAL_CALL getText(  ) override;
 
         bool draw( const css::rendering::ViewState&         rViewState,
                    const css::rendering::RenderState&       rRenderState,
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index 613724558734..8d632ec4886a 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -171,7 +171,7 @@ namespace
 
     private:
         // Ifc XServiceName
-        virtual OUString SAL_CALL getServiceName(  ) throw (uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getServiceName(  ) override
         {
             return OUString( SERVICE_NAME );
         }
@@ -180,7 +180,7 @@ namespace
         virtual void SAL_CALL selectFont( const OUString& sFontName,
                                           double                 size,
                                           sal_Bool             bold,
-                                          sal_Bool             italic ) throw (uno::RuntimeException, std::exception) override
+                                          sal_Bool             italic ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -192,31 +192,31 @@ namespace
                 italic ? rendering::PanoseLetterForm::OBLIQUE_CONTACT : rendering::PanoseLetterForm::ANYTHING;
         }
 
-        virtual void SAL_CALL setPenColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setPenColor( ::sal_Int32 nsRgbaColor ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             *(maRenderState.m_aPenColor) = nsRgbaColor;
         }
 
-        virtual void SAL_CALL setFillColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setFillColor( ::sal_Int32 nsRgbaColor ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             *(maRenderState.m_aFillColor) = nsRgbaColor;
         }
 
-        virtual void SAL_CALL setRectClip( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setRectClip( const geometry::RealRectangle2D& aRect ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             *(maRenderState.m_aRectClip) = aRect;
         }
 
-        virtual void SAL_CALL setTransformation( const geometry::AffineMatrix2D& aTransform ) throw (uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setTransformation( const geometry::AffineMatrix2D& aTransform ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             maRenderState.m_aTransformation = aTransform;
         }
 
-        virtual void SAL_CALL drawPixel( const geometry::RealPoint2D& aPoint ) throw (uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL drawPixel( const geometry::RealPoint2D& aPoint ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             mxCanvas->drawPoint(aPoint,
@@ -225,7 +225,7 @@ namespace
         }
 
         virtual void SAL_CALL drawLine( const geometry::RealPoint2D& aStartPoint,
-                                        const geometry::RealPoint2D& aEndPoint ) throw (uno::RuntimeException, std::exception) override
+                                        const geometry::RealPoint2D& aEndPoint ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             mxCanvas->drawLine(aStartPoint,
@@ -234,7 +234,7 @@ namespace
                                createStrokingRenderState());
         }
 
-        virtual void SAL_CALL drawRect( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL drawRect( const geometry::RealRectangle2D& aRect ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             uno::Reference< rendering::XPolyPolygon2D > xPoly(
@@ -251,8 +251,7 @@ namespace
                                           createStrokingRenderState());
         }
 
-        virtual void SAL_CALL drawPolyPolygon( const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon )
-            throw (uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL drawPolyPolygon( const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -268,7 +267,7 @@ namespace
 
         virtual void SAL_CALL drawText( const rendering::StringContext& aText,
                                         const geometry::RealPoint2D&    aOutPos,
-                                        ::sal_Int8                      nTextDirection ) throw (uno::RuntimeException, std::exception) override
+                                        ::sal_Int8                      nTextDirection ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             const basegfx::B2DHomMatrix offsetTransform(basegfx::tools::createTranslateB2DHomMatrix(aOutPos.X,aOutPos.Y));
@@ -283,8 +282,7 @@ namespace
         }
 
         virtual void SAL_CALL drawBitmap( const uno::Reference< rendering::XBitmap >& xBitmap,
-                                          const geometry::RealPoint2D&                aLeftTop )
-            throw (uno::RuntimeException, std::exception) override
+                                          const geometry::RealPoint2D&                aLeftTop ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             const basegfx::B2DHomMatrix offsetTransform(basegfx::tools::createTranslateB2DHomMatrix(aLeftTop.X,aLeftTop.Y));
@@ -294,61 +292,61 @@ namespace
             mxCanvas->drawBitmap(xBitmap,maViewState,aRenderState);
         }
 
-        virtual uno::Reference< rendering::XGraphicDevice > SAL_CALL getDevice(  ) throw (uno::RuntimeException, std::exception) override
+        virtual uno::Reference< rendering::XGraphicDevice > SAL_CALL getDevice(  ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             return mxCanvas->getDevice();
         }
 
-        virtual uno::Reference< rendering::XCanvas > SAL_CALL getCanvas(  ) throw (uno::RuntimeException, std::exception) override
+        virtual uno::Reference< rendering::XCanvas > SAL_CALL getCanvas(  ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             return mxCanvas;
         }
 
-        virtual rendering::FontMetrics SAL_CALL getFontMetrics(  ) throw (uno::RuntimeException, std::exception) override
+        virtual rendering::FontMetrics SAL_CALL getFontMetrics(  ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             return maFont.getOutValue()->getFontMetrics();
         }
 
-        virtual uno::Reference< rendering::XCanvasFont > SAL_CALL getCurrentFont(  ) throw (uno::RuntimeException, std::exception) override
+        virtual uno::Reference< rendering::XCanvasFont > SAL_CALL getCurrentFont(  ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             return maFont.getOutValue();
         }
 
-        virtual ::sal_Int32 SAL_CALL getCurrentPenColor(  ) throw (uno::RuntimeException, std::exception) override
+        virtual ::sal_Int32 SAL_CALL getCurrentPenColor(  ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             return maRenderState.m_aPenColor.getInValue();
         }
 
-        virtual ::sal_Int32 SAL_CALL getCurrentFillColor(  ) throw (uno::RuntimeException, std::exception) override
+        virtual ::sal_Int32 SAL_CALL getCurrentFillColor(  ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             return maRenderState.m_aFillColor.getInValue();
         }
 
-        virtual geometry::RealRectangle2D SAL_CALL getCurrentClipRect(  ) throw (uno::RuntimeException, std::exception) override
+        virtual geometry::RealRectangle2D SAL_CALL getCurrentClipRect(  ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             return maRenderState.m_aRectClip.getInValue();
         }
 
-        virtual geometry::AffineMatrix2D SAL_CALL getCurrentTransformation(  ) throw (uno::RuntimeException, std::exception) override
+        virtual geometry::AffineMatrix2D SAL_CALL getCurrentTransformation(  ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             return maRenderState.m_aTransformation;
         }
 
-        virtual rendering::ViewState SAL_CALL getCurrentViewState(  ) throw (uno::RuntimeException, std::exception) override
+        virtual rendering::ViewState SAL_CALL getCurrentViewState(  ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             return maViewState;
         }
 
-        virtual rendering::RenderState SAL_CALL getCurrentRenderState( sal_Bool bUseFillColor ) throw (uno::RuntimeException, std::exception) override
+        virtual rendering::RenderState SAL_CALL getCurrentRenderState( sal_Bool bUseFillColor ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             if( bUseFillColor )
diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx
index e185bf969a0e..d84e96495828 100644
--- a/canvas/source/tools/cachedprimitivebase.cxx
+++ b/canvas/source/tools/cachedprimitivebase.cxx
@@ -51,7 +51,7 @@ namespace canvas
         mxTarget.clear();
     }
 
-    sal_Int8 SAL_CALL CachedPrimitiveBase::redraw( const rendering::ViewState& aState ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    sal_Int8 SAL_CALL CachedPrimitiveBase::redraw( const rendering::ViewState& aState )
     {
         ::basegfx::B2DHomMatrix aUsedTransformation;
         ::basegfx::B2DHomMatrix aNewTransformation;
@@ -76,17 +76,17 @@ namespace canvas
                          bSameViewTransforms );
     }
 
-    OUString SAL_CALL CachedPrimitiveBase::getImplementationName(  ) throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL CachedPrimitiveBase::getImplementationName(  )
     {
         return OUString("canvas::CachedPrimitiveBase");
     }
 
-    sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames(  )
     {
         return { "com.sun.star.rendering.CachedBitmap" };
     }
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index fdf8ab7729a9..7ab36a8ed2e4 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -184,25 +184,24 @@ namespace canvas
                 uno::Sequence< sal_Int8 >  maComponentTags;
                 uno::Sequence< sal_Int32 > maBitCounts;
 
-                virtual ::sal_Int8 SAL_CALL getType(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int8 SAL_CALL getType(  ) override
                 {
                     return rendering::ColorSpaceType::RGB;
                 }
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) throw (uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) override
                 {
                     return maComponentTags;
                 }
-                virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) override
                 {
                     return rendering::RenderingIntent::PERCEPTUAL;
                 }
-                virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) throw (uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) override
                 {
                     return uno::Sequence< beans::PropertyValue >();
                 }
                 virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                      uno::RuntimeException, std::exception) override
+                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
                 {
                     // TODO(P3): if we know anything about target
                     // colorspace, this can be greatly sped up
@@ -210,7 +209,7 @@ namespace canvas
                         convertToARGB(deviceColor));
                     return targetColorSpace->convertFromARGB(aIntermediate);
                 }
-                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const std::size_t nLen( deviceColor.getLength() );
@@ -227,7 +226,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override
                 {
                     SAL_WARN_IF(deviceColor.getLength() == 0, "canvas", "empty deviceColor argument");
                     const double*  pIn( deviceColor.getConstArray() );
@@ -245,7 +244,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const std::size_t nLen( deviceColor.getLength() );
@@ -262,7 +261,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
                 {
                     const rendering::RGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t             nLen( rgbColor.getLength() );
@@ -279,7 +278,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
@@ -296,7 +295,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
@@ -315,21 +314,20 @@ namespace canvas
                 }
 
                 // XIntegerBitmapColorSpace
-                virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) override
                 {
                     return 32;
                 }
-                virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) throw (uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) override
                 {
                     return maBitCounts;
                 }
-                virtual ::sal_Int8 SAL_CALL getEndianness(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int8 SAL_CALL getEndianness(  ) override
                 {
                     return util::Endianness::LITTLE;
                 }
                 virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                     const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                               uno::RuntimeException, std::exception) override
+                                                                                     const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
                 {
                     if( dynamic_cast<StandardColorSpace*>(targetColorSpace.get()) )
                     {
@@ -360,8 +358,7 @@ namespace canvas
                     }
                 }
                 virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                         const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                                              uno::RuntimeException, std::exception) override
+                                                                                         const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override
                 {
                     if( dynamic_cast<StandardColorSpace*>(targetColorSpace.get()) )
                     {
@@ -377,7 +374,7 @@ namespace canvas
                         return targetColorSpace->convertIntegerFromARGB(aIntermediate);
                     }
                 }
-                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const std::size_t  nLen( deviceColor.getLength() );
@@ -398,7 +395,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const std::size_t  nLen( deviceColor.getLength() );
@@ -420,7 +417,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const std::size_t  nLen( deviceColor.getLength() );
@@ -443,7 +440,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
                 {
                     const rendering::RGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t             nLen( rgbColor.getLength() );
@@ -461,7 +458,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
@@ -479,7 +476,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
@@ -522,25 +519,24 @@ namespace canvas
                 uno::Sequence< sal_Int8 >  maComponentTags;
                 uno::Sequence< sal_Int32 > maBitCounts;
 
-                virtual ::sal_Int8 SAL_CALL getType(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int8 SAL_CALL getType(  ) override
                 {
                     return rendering::ColorSpaceType::RGB;
                 }
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) throw (uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) override
                 {
                     return maComponentTags;
                 }
-                virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) override
                 {
                     return rendering::RenderingIntent::PERCEPTUAL;
                 }
-                virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) throw (uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) override
                 {
                     return uno::Sequence< beans::PropertyValue >();
                 }
                 virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                      uno::RuntimeException, std::exception) override
+                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
                 {
                     // TODO(P3): if we know anything about target
                     // colorspace, this can be greatly sped up
@@ -548,7 +544,7 @@ namespace canvas
                         convertToARGB(deviceColor));
                     return targetColorSpace->convertFromARGB(aIntermediate);
                 }
-                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const std::size_t nLen( deviceColor.getLength() );
@@ -565,7 +561,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const std::size_t nLen( deviceColor.getLength() );
@@ -582,7 +578,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const std::size_t nLen( deviceColor.getLength() );
@@ -599,7 +595,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
                 {
                     const rendering::RGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t             nLen( rgbColor.getLength() );
@@ -616,7 +612,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
@@ -633,7 +629,7 @@ namespace canvas
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
@@ -652,21 +648,20 @@ namespace canvas
                 }
 
                 // XIntegerBitmapColorSpace
-                virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) override
                 {
                     return 32;
                 }
-                virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) throw (uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) override
                 {
                     return maBitCounts;
                 }
-                virtual ::sal_Int8 SAL_CALL getEndianness(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int8 SAL_CALL getEndianness(  ) override
                 {
                     return util::Endianness::LITTLE;
                 }
                 virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                     const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                               uno::RuntimeException, std::exception) override
+                                                                                     const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
                 {
                     if( dynamic_cast<StandardNoAlphaColorSpace*>(targetColorSpace.get()) )
                     {
@@ -697,8 +692,7 @@ namespace canvas
                     }
                 }
                 virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                         const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                                              uno::RuntimeException, std::exception) override
+                                                                                         const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override
                 {
                     if( dynamic_cast<StandardNoAlphaColorSpace*>(targetColorSpace.get()) )
                     {
@@ -714,7 +708,7 @@ namespace canvas
                         return targetColorSpace->convertIntegerFromARGB(aIntermediate);
                     }
                 }
-                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const std::size_t  nLen( deviceColor.getLength() );
@@ -735,7 +729,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const std::size_t  nLen( deviceColor.getLength() );
@@ -757,7 +751,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
                 {
                     const sal_Int8* pIn( deviceColor.getConstArray() );
                     const std::size_t  nLen( deviceColor.getLength() );
@@ -779,7 +773,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
                 {
                     const rendering::RGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t             nLen( rgbColor.getLength() );
@@ -797,7 +791,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
@@ -815,7 +809,7 @@ namespace canvas
                     return aRes;
                 }
 
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index 05697d8e2a8d..d5bed4381921 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -164,25 +164,25 @@ namespace canvas
         mxDevice.clear();
     }
 
-    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL ParametricPolyPolygon::getOutline( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL ParametricPolyPolygon::getOutline( double /*t*/ )
     {
         // TODO(F1): outline NYI
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
-    uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getColor( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getColor( double /*t*/ )
     {
         // TODO(F1): color NYI
         return uno::Sequence< double >();
     }
 
-    uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getPointColor( const geometry::RealPoint2D& /*point*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getPointColor( const geometry::RealPoint2D& /*point*/ )
     {
         // TODO(F1): point color NYI
         return uno::Sequence< double >();
     }
 
-    uno::Reference< rendering::XColorSpace > SAL_CALL ParametricPolyPolygon::getColorSpace() throw (uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XColorSpace > SAL_CALL ParametricPolyPolygon::getColorSpace()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -190,17 +190,17 @@ namespace canvas
     }
 
 
-    OUString SAL_CALL ParametricPolyPolygon::getImplementationName(  ) throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL ParametricPolyPolygon::getImplementationName(  )
     {
         return OUString( "Canvas::ParametricPolyPolygon" );
     }
 
-    sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames(  )
     {
         return { "com.sun.star.rendering.ParametricPolyPolygon" };
     }
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index bd3f89d7e21b..cb65127e4d37 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -129,7 +129,7 @@ namespace vclcanvas
         CanvasBaseT::disposeThis();
     }
 
-    OUString SAL_CALL Canvas::getServiceName(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL Canvas::getServiceName(  )
     {
         return OUString( CANVAS_SERVICE_NAME );
     }
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index d4ae09097002..225ca2a7f1f4 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -100,7 +100,7 @@ namespace vclcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas,   GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceName
-        virtual OUString SAL_CALL getServiceName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getServiceName(  ) override;
 
         // RepaintTarget
         virtual bool repaint( const GraphicObjectSharedPtr&                 rGrf,
diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx
index 84b3adc7ef0b..9126fc5c0666 100644
--- a/canvas/source/vcl/canvasbitmap.cxx
+++ b/canvas/source/vcl/canvasbitmap.cxx
@@ -74,17 +74,17 @@ namespace vclcanvas
     }
 
 
-    OUString SAL_CALL CanvasBitmap::getImplementationName(  ) throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL CanvasBitmap::getImplementationName(  )
     {
         return OUString( "VCLCanvas.CanvasBitmap" );
     }
 
-    sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames(  )
     {
         return { "com.sun.star.rendering.CanvasBitmap" };
     }
@@ -112,7 +112,7 @@ namespace vclcanvas
         return maCanvasHelper.repaint( rGrf, viewState, renderState, rPt, rSz, rAttr );
     }
 
-    uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException, std::exception)
+    uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle )
     {
         if( nHandle == 0 ) {
             BitmapEx* pBitmapEx = new BitmapEx( getBitmap() );
diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx
index 543d80e3fa1b..ca0cbaaa9bab 100644
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.hxx
@@ -82,9 +82,9 @@ namespace vclcanvas
                       const OutDevProviderSharedPtr&               rOutDevProvider );
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // RepaintTarget interface
         virtual bool repaint( const GraphicObjectSharedPtr&                   rGrf,
@@ -107,8 +107,8 @@ namespace vclcanvas
         //     1st a bool value: true - free the pixmap after used by XFreePixmap, false do nothing, the pixmap is used internally in the canvas
         //     2nd the pixmap handle
         //     3rd the pixmap depth
-        virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle)  throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&)  throw (css::uno::RuntimeException, std::exception) override {}
+        virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override;
+        virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {}
 
     private:
         /** MUST hold here, too, since CanvasHelper only contains a
diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx
index acff95a08810..e8ee7752cc0d 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -115,17 +115,17 @@ namespace vclcanvas
         maCanvasHelper.clear();
     }
 
-    OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL CanvasCustomSprite::getImplementationName()
     {
         return OUString( "VCLCanvas.CanvasCustomSprite" );
     }
 
-    sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception )
+    sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames()  throw( uno::RuntimeException, std::exception )
+    uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames()
     {
         return { "com.sun.star.rendering.CanvasCustomSprite" };
     }
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index 43283e2f8629..4075200328bf 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -99,9 +99,9 @@ namespace vclcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // Sprite
         virtual void redraw( OutputDevice& rOutDev,
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index da901cce4d97..94798710f829 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -92,7 +92,7 @@ namespace vclcanvas
         mpRefDevice.clear();
     }
 
-    uno::Reference< rendering::XTextLayout > SAL_CALL  CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XTextLayout > SAL_CALL  CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed )
     {
         SolarMutexGuard aGuard;
 
@@ -107,14 +107,14 @@ namespace vclcanvas
                                mpOutDevProvider);
     }
 
-    rendering::FontRequest SAL_CALL  CanvasFont::getFontRequest(  ) throw (uno::RuntimeException, std::exception)
+    rendering::FontRequest SAL_CALL  CanvasFont::getFontRequest(  )
     {
         SolarMutexGuard aGuard;
 
         return maFontRequest;
     }
 
-    rendering::FontMetrics SAL_CALL  CanvasFont::getFontMetrics(  ) throw (uno::RuntimeException, std::exception)
+    rendering::FontMetrics SAL_CALL  CanvasFont::getFontMetrics(  )
     {
         SolarMutexGuard aGuard;
 
@@ -133,29 +133,29 @@ namespace vclcanvas
             aMetric.GetAscent() / 2.0);
     }
 
-    uno::Sequence< double > SAL_CALL  CanvasFont::getAvailableSizes(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< double > SAL_CALL  CanvasFont::getAvailableSizes(  )
     {
         // TODO(F1)
         return uno::Sequence< double >();
     }
 
-    uno::Sequence< beans::PropertyValue > SAL_CALL  CanvasFont::getExtraFontProperties(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< beans::PropertyValue > SAL_CALL  CanvasFont::getExtraFontProperties(  )
     {
         // TODO(F1)
         return uno::Sequence< beans::PropertyValue >();
     }
 
-    OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL CanvasFont::getImplementationName()
     {
         return OUString( "VCLCanvas::CanvasFont" );
     }
 
-    sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception )
+    sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames()  throw( uno::RuntimeException, std::exception )
+    uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames()
     {
         return { "com.sun.star.rendering.CanvasFont" };
     }
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index b17126222b7d..83c37deeed34 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -64,16 +64,16 @@ namespace vclcanvas
         virtual void SAL_CALL disposing() override;
 
         // XCanvasFont
-        virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::FontRequest SAL_CALL getFontRequest(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::FontMetrics SAL_CALL getFontMetrics(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override;
+        virtual css::rendering::FontRequest SAL_CALL getFontRequest(  ) override;
+        virtual css::rendering::FontMetrics SAL_CALL getFontMetrics(  ) override;
+        virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes(  ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         vcl::Font getVCLFont() const;
 
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index 268ff3766981..11a6ca5e27c1 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -119,17 +119,17 @@ namespace vclcanvas
         SpriteCanvasBaseT::disposeThis();
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll )
     {
         return updateScreen( bUpdateAll );
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
+    sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll )
     {
         return updateScreen( bUpdateAll );
     }
 
-    sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll )
     {
         SolarMutexGuard aGuard;
 
@@ -140,7 +140,7 @@ namespace vclcanvas
                                                                   mbSurfaceDirty);
     }
 
-    OUString SAL_CALL SpriteCanvas::getServiceName(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL SpriteCanvas::getServiceName(  )
     {
         return OUString( SPRITECANVAS_SERVICE_NAME );
     }
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index f339eead496e..b6f2bd5c6db8 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -125,14 +125,14 @@ namespace vclcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XBufferController (partial)
-        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override;
+        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override;
+        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override;
 
         // XSpriteCanvas (partial)
-        virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override;
 
         // XServiceName
-        virtual OUString SAL_CALL getServiceName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getServiceName(  ) override;
 
         // RepaintTarget
         virtual bool repaint( const GraphicObjectSharedPtr&                   rGrf,
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 67520a399b15..bdab9f9a6fab 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -99,7 +99,7 @@ namespace vclcanvas
     }
 
     // XTextLayout
-    uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  )
     {
         SolarMutexGuard aGuard;
 
@@ -150,7 +150,7 @@ namespace vclcanvas
         return comphelper::containerToSequence(aOutlineSequence);
     }
 
-    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  )
     {
         SolarMutexGuard aGuard;
 
@@ -202,20 +202,20 @@ namespace vclcanvas
         return aBoundingBoxes;
     }
 
-    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  )
     {
         // TODO(F1)
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
-    uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements(  ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements(  )
     {
         SolarMutexGuard aGuard;
 
         return maLogicalAdvancements;
     }
 
-    void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements )
     {
         SolarMutexGuard aGuard;
 
@@ -225,7 +225,7 @@ namespace vclcanvas
         maLogicalAdvancements = aAdvancements;
     }
 
-    geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds(  ) throw (uno::RuntimeException, std::exception)
+    geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds(  )
     {
         SolarMutexGuard aGuard;
 
@@ -263,7 +263,7 @@ namespace vclcanvas
         }
     }
 
-    double SAL_CALL TextLayout::justify( double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+    double SAL_CALL TextLayout::justify( double nSize )
     {
         (void)nSize;
 
@@ -272,7 +272,7 @@ namespace vclcanvas
     }
 
     double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& aNextLayouts,
-                                                 double                                                           nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+                                                 double                                                           nSize )
     {
         (void)aNextLayouts;
         (void)nSize;
@@ -281,7 +281,7 @@ namespace vclcanvas
         return 0.0;
     }
 
-    rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& aHitPoint ) throw (uno::RuntimeException, std::exception)
+    rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& aHitPoint )
     {
         (void)aHitPoint;
 
@@ -289,7 +289,7 @@ namespace vclcanvas
         return rendering::TextHit();
     }
 
-    rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures )
     {
         (void)nInsertionIndex;
         (void)bExcludeLigatures;
@@ -298,7 +298,7 @@ namespace vclcanvas
         return rendering::Caret();
     }
 
-    sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures )
     {
         (void)nStartIndex;
         (void)nCaretAdvancement;
@@ -308,7 +308,7 @@ namespace vclcanvas
         return 0;
     }
 
-    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         (void)nStartIndex;
         (void)nEndIndex;
@@ -317,7 +317,7 @@ namespace vclcanvas
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
-    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         (void)nStartIndex;
         (void)nEndIndex;
@@ -326,27 +326,27 @@ namespace vclcanvas
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
-    double SAL_CALL TextLayout::getBaselineOffset(  ) throw (uno::RuntimeException, std::exception)
+    double SAL_CALL TextLayout::getBaselineOffset(  )
     {
         // TODO(F1)
         return 0.0;
     }
 
-    sal_Int8 SAL_CALL TextLayout::getMainTextDirection(  ) throw (uno::RuntimeException, std::exception)
+    sal_Int8 SAL_CALL TextLayout::getMainTextDirection(  )
     {
         SolarMutexGuard aGuard;
 
         return mnTextDirection;
     }
 
-    uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont(  ) throw (uno::RuntimeException, std::exception)
+    uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont(  )
     {
         SolarMutexGuard aGuard;
 
         return mpFont.get();
     }
 
-    rendering::StringContext SAL_CALL TextLayout::getText(  ) throw (uno::RuntimeException, std::exception)
+    rendering::StringContext SAL_CALL TextLayout::getText(  )
     {
         SolarMutexGuard aGuard;
 
@@ -441,17 +441,17 @@ namespace vclcanvas
                           OffsetTransformer( aMatrix ) );
     }
 
-    OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL TextLayout::getImplementationName()
     {
         return OUString( "VCLCanvas::TextLayout" );
     }
 
-    sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception )
+    sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService( this, ServiceName );
     }
 
-    uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames()  throw( uno::RuntimeException, std::exception )
+    uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames()
     {
         return { "com.sun.star.rendering.TextLayout" };
     }
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index 713397045644..9994ac70ff6d 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -60,28 +60,28 @@ namespace vclcanvas
         virtual void SAL_CALL disposing() override;
 
         // XTextLayout
-        virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getBaselineOffset(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getMainTextDirection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::StringContext SAL_CALL getText(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes(  ) override;
+        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures(  ) override;
+        virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures(  ) override;
+        virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements(  ) override;
+        virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override;
+        virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds(  ) override;
+        virtual double SAL_CALL justify( double nSize ) override;
+        virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override;
+        virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override;
+        virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override;
+        virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override;
+        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual double SAL_CALL getBaselineOffset(  ) override;
+        virtual sal_Int8 SAL_CALL getMainTextDirection(  ) override;
+        virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont(  ) override;
+        virtual css::rendering::StringContext SAL_CALL getText(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         bool draw( OutputDevice&                                   rOutDev,
                    const Point&                                    rOutpos,
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 0a0889138a40..05999229a296 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -180,21 +180,17 @@ private:
 
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::frame::XController >
-        impl_getCurrentController()
-                            throw( css::uno::RuntimeException);
+        impl_getCurrentController();
 
     /// @throws css::uno::RuntimeException
     void SAL_CALL
-        impl_notifyModifiedListeners()
-                            throw( css::uno::RuntimeException);
+        impl_notifyModifiedListeners();
     /// @throws css::uno::RuntimeException
     void SAL_CALL
-        impl_notifyCloseListeners()
-                            throw( css::uno::RuntimeException);
+        impl_notifyCloseListeners();
     /// @throws css::uno::RuntimeException
     void SAL_CALL
-        impl_notifyStorageChangeListeners()
-                            throw(css::uno::RuntimeException);
+        impl_notifyStorageChangeListeners();
 
     void impl_store(
         const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor,
@@ -223,349 +219,241 @@ public:
 
     // css::lang::XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::lang::XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-                throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // css::frame::XModel (required interface)
 
     virtual sal_Bool SAL_CALL
         attachResource( const OUString& rURL,
-                        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
-                            throw (css::uno::RuntimeException, std::exception) override;
+                        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
 
     virtual OUString SAL_CALL
-        getURL()            throw (css::uno::RuntimeException, std::exception) override;
+        getURL() override;
 
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-        getArgs()           throw (css::uno::RuntimeException, std::exception) override;
+        getArgs() override;
 
     virtual void SAL_CALL
-        connectController( const css::uno::Reference< css::frame::XController >& xController )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        connectController( const css::uno::Reference< css::frame::XController >& xController ) override;
 
     virtual void SAL_CALL
-        disconnectController( const css::uno::Reference< css::frame::XController >& xController )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        disconnectController( const css::uno::Reference< css::frame::XController >& xController ) override;
 
     virtual void SAL_CALL
-        lockControllers()   throw (css::uno::RuntimeException, std::exception) override;
+        lockControllers() override;
 
     virtual void SAL_CALL
-        unlockControllers() throw (css::uno::RuntimeException, std::exception) override;
+        unlockControllers() override;
 
     virtual sal_Bool SAL_CALL
-        hasControllersLocked()
-                            throw (css::uno::RuntimeException, std::exception) override;
+        hasControllersLocked() override;
 
     virtual css::uno::Reference< css::frame::XController > SAL_CALL
-        getCurrentController()
-                            throw (css::uno::RuntimeException, std::exception) override;
+        getCurrentController() override;
 
     virtual void SAL_CALL
-        setCurrentController( const css::uno::Reference< css::frame::XController >& xController )
-                            throw (css::container::NoSuchElementException
-                            , css::uno::RuntimeException, std::exception) override;
+        setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-        getCurrentSelection()
-                            throw (css::uno::RuntimeException, std::exception) override;
+        getCurrentSelection() override;
 
     // css::lang::XComponent (base of XModel)
     virtual void SAL_CALL
-        dispose()           throw (css::uno::RuntimeException, std::exception) override;
+        dispose() override;
 
     virtual void SAL_CALL
-        addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
 
     virtual void SAL_CALL
-        removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
 
     // css::util::XCloseable
     virtual void SAL_CALL
-        close( sal_Bool bDeliverOwnership )
-                            throw(css::util::CloseVetoException,
-                                  css::uno::RuntimeException, std::exception) override;
+        close( sal_Bool bDeliverOwnership ) override;
 
     // css::util::XCloseBroadcaster (base of XCloseable)
     virtual void SAL_CALL
-        addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) override;
 
     virtual void SAL_CALL
-        removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) override;
 
     // css::frame::XStorable2 (extension of XStorable)
     virtual void SAL_CALL storeSelf(
-        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
-        throw (css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
 
     // css::frame::XStorable (required interface)
     virtual sal_Bool SAL_CALL
-        hasLocation()       throw (css::uno::RuntimeException, std::exception) override;
+        hasLocation() override;
 
     virtual OUString SAL_CALL
-        getLocation()       throw (css::uno::RuntimeException, std::exception) override;
+        getLocation() override;
 
     virtual sal_Bool SAL_CALL
-        isReadonly()        throw (css::uno::RuntimeException, std::exception) override;
+        isReadonly() override;
 
     virtual void SAL_CALL
-        store()             throw (css::io::IOException
-                            , css::uno::RuntimeException, std::exception) override;
+        store() override;
 
     virtual void SAL_CALL
         storeAsURL( const OUString& rURL,
-                    const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
-                            throw (css::io::IOException
-                            , css::uno::RuntimeException, std::exception) override;
+                    const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
 
     virtual void SAL_CALL
         storeToURL( const OUString& rURL,
-                    const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
-                            throw (css::io::IOException
-                            , css::uno::RuntimeException, std::exception) override;
+                    const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
 
     // css::util::XModifiable (required interface)
     virtual sal_Bool SAL_CALL
-        isModified()        throw (css::uno::RuntimeException, std::exception) override;
+        isModified() override;
 
     virtual void SAL_CALL
-        setModified( sal_Bool bModified )
-                            throw (css::beans::PropertyVetoException
-                            , css::uno::RuntimeException, std::exception) override;
+        setModified( sal_Bool bModified ) override;
 
     // css::util::XModifyBroadcaster (base of XModifiable)
     virtual void SAL_CALL
-        addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override;
 
     virtual void SAL_CALL
-        removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ datatransferable::XTransferable ____
     virtual css::uno::Any SAL_CALL getTransferData(
-        const css::datatransfer::DataFlavor& aFlavor )
-        throw (css::datatransfer::UnsupportedFlavorException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::datatransfer::DataFlavor& aFlavor ) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() override;
     virtual sal_Bool SAL_CALL isDataFlavorSupported(
-        const css::datatransfer::DataFlavor& aFlavor )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::datatransfer::DataFlavor& aFlavor ) override;
 
     // lang::XTypeProvider (override method of WeakImplHelper)
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-        getTypes() throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     // ____ document::XDocumentPropertiesSupplier ____
     virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL
-        getDocumentProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
+        getDocumentProperties(  ) override;
 
     // ____ document::XUndoManagerSupplier ____
     virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL
-        getUndoManager(  ) throw (css::uno::RuntimeException, std::exception) override;
+        getUndoManager(  ) override;
 
     // css::chart2::XChartDocument
     virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL
-        getFirstDiagram() throw (css::uno::RuntimeException, std::exception) override;
+        getFirstDiagram() override;
     virtual void SAL_CALL setFirstDiagram(
-        const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
     virtual void SAL_CALL
-        createInternalDataProvider( sal_Bool bCloneExistingData )
-            throw (css::util::CloseVetoException,
-                   css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasInternalDataProvider()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createInternalDataProvider( sal_Bool bCloneExistingData ) override;
+    virtual sal_Bool SAL_CALL hasInternalDataProvider() override;
     virtual css::uno::Reference< css::chart2::data::XDataProvider > SAL_CALL
-        getDataProvider()
-            throw (css::uno::RuntimeException, std::exception) override;
+        getDataProvider() override;
     virtual void SAL_CALL
-        setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager )
-            throw (css::uno::RuntimeException, std::exception) override;
+        setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager ) override;
     virtual css::uno::Reference< css::chart2::XChartTypeManager > SAL_CALL
-        getChartTypeManager()
-            throw (css::uno::RuntimeException, std::exception) override;
+        getChartTypeManager() override;
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-        getPageBackground()
-            throw (css::uno::RuntimeException, std::exception) override;
+        getPageBackground() override;
 
-    virtual void SAL_CALL createDefaultChart() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL createDefaultChart() override;
 
-    virtual sal_Bool SAL_CALL isOpenGLChart() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isOpenGLChart() override;
 
     // ____ XDataReceiver (public API) ____
     virtual void SAL_CALL
-        attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider )
-            throw (css::uno::RuntimeException, std::exception) override;
+        attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider ) override;
     virtual void SAL_CALL setArguments(
-        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() override;
+    virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData() override;
     virtual void SAL_CALL attachNumberFormatsSupplier( const css::uno::Reference<
-        css::util::XNumberFormatsSupplier >& xSupplier )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::util::XNumberFormatsSupplier >& xSupplier ) override;
+    virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() override;
 
     // ____ XTitled ____
-    virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() override;
+    virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title ) override;
 
     // ____ XInterface (for old API wrapper) ____
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     // ____ XLoadable ____
-    virtual void SAL_CALL initNew()
-        throw (css::frame::DoubleInitializationException,
-               css::io::IOException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
-        throw (css::frame::DoubleInitializationException,
-               css::io::IOException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initNew() override;
+    virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XVisualObject ____
     virtual void SAL_CALL setVisualAreaSize(
         ::sal_Int64 nAspect,
-        const css::awt::Size& aSize )
-        throw (css::lang::IllegalArgumentException,
-               css::embed::WrongStateException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        const css::awt::Size& aSize ) override;
     virtual css::awt::Size SAL_CALL getVisualAreaSize(
-        ::sal_Int64 nAspect )
-        throw (css::lang::IllegalArgumentException,
-               css::embed::WrongStateException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        ::sal_Int64 nAspect ) override;
     virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation(
-        ::sal_Int64 nAspect )
-        throw (css::lang::IllegalArgumentException,
-               css::embed::WrongStateException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        ::sal_Int64 nAspect ) override;
     virtual ::sal_Int32 SAL_CALL getMapUnit(
-        ::sal_Int64 nAspect )
-        throw (css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        ::sal_Int64 nAspect ) override;
 
     // ____ XMultiServiceFactory ____
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-        createInstance( const OUString& aServiceSpecifier )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        createInstance( const OUString& aServiceSpecifier ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
         createInstanceWithArguments( const OUString& ServiceSpecifier
-                                   , const css::uno::Sequence< css::uno::Any >& Arguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+                                   , const css::uno::Sequence< css::uno::Any >& Arguments ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+        getAvailableServiceNames() override;
 
     // ____ XStorageBasedDocument ____
     virtual void SAL_CALL loadFromStorage(
         const css::uno::Reference< css::embed::XStorage >& xStorage,
-        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
-        throw (css::lang::IllegalArgumentException,
-               css::frame::DoubleInitializationException,
-               css::io::IOException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
     virtual void SAL_CALL storeToStorage(
         const css::uno::Reference< css::embed::XStorage >& xStorage,
-        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
-        throw (css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
     virtual void SAL_CALL switchToStorage(
-        const css::uno::Reference< css::embed::XStorage >& xStorage )
-        throw (css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage()
-        throw (css::io::IOException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
+    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() override;
     virtual void SAL_CALL addStorageChangeListener(
-        const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
     virtual void SAL_CALL removeStorageChangeListener(
-        const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
 
     // for SvNumberFormatsSupplierObj
     // ____ XUnoTunnel ___
-    virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier )
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override;
 
     // ____ XNumberFormatsSupplier ____
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings()
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats()
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() override;
+    virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats() override;
 
     // ____ XChild ____
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override;
     virtual void SAL_CALL setParent(
-        const css::uno::Reference< css::uno::XInterface >& Parent )
-        throw (css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     // ____ XDataSource ____ allows access to the currently used data and data ranges
-    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override;
 
     // X3DChartWindowProvider
-    virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) override;
 
     // XUpdatable
-    virtual void SAL_CALL update()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL update() override;
 
     // XDumper
-    virtual OUString SAL_CALL dump()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL dump() override;
 
     // normal methods
     css::uno::Reference< css::util::XNumberFormatsSupplier > const &
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index aa1e30949da1..a7b545f49af0 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -113,16 +113,12 @@ public:
     virtual ~ChartView() override;
 
     // ___lang::XServiceInfo___
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ___lang::XInitialization___
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-                throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // ___ExplicitValueProvider___
     virtual bool getExplicitValuesForAxis(
@@ -139,68 +135,56 @@ public:
     std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() override;
 
     // ___XTransferable___
-    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
-                throw (css::datatransfer::UnsupportedFlavorException
-                     , css::io::IOException
-                     , css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
-                throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
-                throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 
     // css::util::XEventListener (base of XCloseListener and XModifyListener)
     virtual void SAL_CALL
-        disposing( const css::lang::EventObject& Source )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        disposing( const css::lang::EventObject& Source ) override;
 
     // css::util::XModifyListener
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     //SfxListener
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
     // css::util::XModeChangeBroadcaster
 
-    virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override;
+    virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override;
+    virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override;
+    virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override;
 
     // css::util::XUpdatable
-    virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL update() override;
 
     // util::XUpdatable2
-    virtual void SAL_CALL updateSoft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateHard() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL updateSoft() override;
+    virtual void SAL_CALL updateHard() override;
 
     // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // css::lang::XMultiServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(
-        const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
     // for ExplicitValueProvider
     // ____ XUnoTunnel ___
-    virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier )
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override;
 
     // XDumper
-    virtual OUString SAL_CALL dump()
-            throw(css::uno::RuntimeException,
-                  std::exception) override;
+    virtual OUString SAL_CALL dump() override;
 
     void setViewDirty();
     void updateOpenGLWindow();
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 64fef563a974..4759754b95a3 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -100,7 +100,6 @@ AccessibleBase::~AccessibleBase()
 }
 
 bool AccessibleBase::CheckDisposeState( bool bThrowException /* default: true */ ) const
-    throw (lang::DisposedException)
 {
     if( bThrowException &&
         m_bIsDisposed )
@@ -188,7 +187,6 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId
 }
 
 void AccessibleBase::AddState( sal_Int16 aState )
-    throw (RuntimeException)
 {
     CheckDisposeState();
     OSL_ASSERT( m_xStateSetHelper.is() );
@@ -196,7 +194,6 @@ void AccessibleBase::AddState( sal_Int16 aState )
 }
 
 void AccessibleBase::RemoveState( sal_Int16 aState )
-    throw (RuntimeException)
 {
     CheckDisposeState();
     OSL_ASSERT( m_xStateSetHelper.is() );
@@ -473,14 +470,12 @@ void SAL_CALL AccessibleBase::disposing()
 
 // ________ XAccessible ________
 Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext()
-    throw (RuntimeException, std::exception)
 {
     return this;
 }
 
 // ________ AccessibleBase::XAccessibleContext ________
 sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
-    throw (RuntimeException, std::exception)
 {
     ClearableMutexGuard aGuard( GetMutex() );
     if( ! m_bMayHaveChildren ||
@@ -500,13 +495,11 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
 }
 
 sal_Int32 AccessibleBase::ImplGetAccessibleChildCount() const
-    throw (RuntimeException)
 {
     return m_aChildList.size();
 }
 
 Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 i )
-    throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     CheckDisposeState();
     Reference< XAccessible > xResult;
@@ -526,7 +519,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32
 }
 
 Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i ) const
-    throw (lang::IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessible > xResult;
 
@@ -550,7 +542,6 @@ Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i
 }
 
 Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent()
-    throw (RuntimeException, std::exception)
 {
     CheckDisposeState();
     Reference< XAccessible > aResult;
@@ -561,7 +552,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent()
 }
 
 sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent()
-    throw (RuntimeException, std::exception)
 {
     CheckDisposeState();
 
@@ -571,20 +561,17 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent()
 }
 
 sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole()
-    throw (RuntimeException, std::exception)
 {
     return AccessibleRole::SHAPE;
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet()
-    throw (RuntimeException, std::exception)
 {
     Reference< XAccessibleRelationSet > aResult;
     return aResult;
 }
 
 Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet()
-    throw (RuntimeException, std::exception)
 {
     if( ! m_bStateSetInitialized )
     {
@@ -605,7 +592,6 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet(
 }
 
 lang::Locale SAL_CALL AccessibleBase::getLocale()
-    throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
 {
     CheckDisposeState();
 
@@ -614,7 +600,6 @@ lang::Locale SAL_CALL AccessibleBase::getLocale()
 
 // ________ AccessibleBase::XAccessibleComponent ________
 sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint )
-    throw (RuntimeException, std::exception)
 {
     awt::Rectangle aRect( getBounds() );
 
@@ -629,7 +614,6 @@ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint )
 }
 
 Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const awt::Point& aPoint )
-    throw (RuntimeException, std::exception)
 {
     CheckDisposeState();
     Reference< XAccessible > aResult;
@@ -669,7 +653,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const aw
 }
 
 awt::Rectangle SAL_CALL AccessibleBase::getBounds()
-    throw (RuntimeException, std::exception)
 {
     ExplicitValueProvider *pExplicitValueProvider(
         ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView ));
@@ -705,7 +688,6 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
 }
 
 awt::Point SAL_CALL AccessibleBase::getLocation()
-    throw (RuntimeException, std::exception)
 {
     CheckDisposeState();
     awt::Rectangle aBBox( getBounds() );
@@ -713,7 +695,6 @@ awt::Point SAL_CALL AccessibleBase::getLocation()
 }
 
 awt::Point SAL_CALL AccessibleBase::getLocationOnScreen()
-    throw (RuntimeException, std::exception)
 {
     CheckDisposeState();
 
@@ -734,7 +715,6 @@ awt::Point SAL_CALL AccessibleBase::getLocationOnScreen()
 }
 
 awt::Size SAL_CALL AccessibleBase::getSize()
-    throw (RuntimeException, std::exception)
 {
     CheckDisposeState();
     awt::Rectangle aBBox( getBounds() );
@@ -742,7 +722,6 @@ awt::Size SAL_CALL AccessibleBase::getSize()
 }
 
 void SAL_CALL AccessibleBase::grabFocus()
-    throw (RuntimeException, std::exception)
 {
     CheckDisposeState();
 
@@ -754,13 +733,11 @@ void SAL_CALL AccessibleBase::grabFocus()
 }
 
 sal_Int32 SAL_CALL AccessibleBase::getForeground()
-    throw (RuntimeException, std::exception)
 {
     return getColor( ACC_BASE_FOREGROUND );
 }
 
 sal_Int32 SAL_CALL AccessibleBase::getBackground()
-    throw (RuntimeException, std::exception)
 {
     return getColor( ACC_BASE_BACKGROUND );
 }
@@ -859,19 +836,16 @@ sal_Int32 AccessibleBase::getColor( eColorType eColType )
 
 // ________ AccessibleBase::XServiceInfo ________
 OUString SAL_CALL AccessibleBase::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( "AccessibleBase" );
 }
 
 sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return {
         "com.sun.star.accessibility.Accessible",
@@ -881,13 +855,11 @@ uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames()
 
 // ________ AccessibleBase::XEventListener ________
 void SAL_CALL AccessibleBase::disposing( const lang::EventObject& /*Source*/ )
-    throw (RuntimeException, std::exception)
 {
 }
 
 // ________ XAccessibleEventBroadcasters ________
 void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
 
@@ -901,7 +873,6 @@ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAcce
 }
 
 void SAL_CALL AccessibleBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
 
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index d94233a76c2e..b231b030c56a 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -115,7 +115,6 @@ void AccessibleChartElement::InitTextEdit()
 
 // ________ AccessibleBase::XAccessibleContext ________
 Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal_Int32 i ) const
-    throw (lang::IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessible > xResult;
 
@@ -128,7 +127,6 @@ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal
 }
 
 sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const
-    throw (RuntimeException)
 {
     if( m_bHasText )
     {
@@ -142,14 +140,12 @@ sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const
 
 // ________ XServiceInfo ________
 OUString SAL_CALL AccessibleChartElement::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( "AccessibleChartElement" );
 }
 
 // ________ AccessibleChartElement::XAccessibleContext (override) ________
 OUString SAL_CALL AccessibleChartElement::getAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return ObjectNameProvider::getNameForCID(
         GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument );
@@ -157,14 +153,12 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName()
 
 // ________ AccessibleChartElement::XAccessibleContext (override) ________
 OUString SAL_CALL AccessibleChartElement::getAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return getToolTipText();
 }
 
 // ________ AccessibleChartElement::XAccessibleExtendedComponent ________
 Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont()
-    throw (uno::RuntimeException, std::exception)
 {
     CheckDisposeState();
 
@@ -185,13 +179,11 @@ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont()
 }
 
 OUString SAL_CALL AccessibleChartElement::getTitledBorderText()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString();
 }
 
 OUString SAL_CALL AccessibleChartElement::getToolTipText()
-    throw (css::uno::RuntimeException, std::exception)
 {
     CheckDisposeState();
 
@@ -201,55 +193,46 @@ OUString SAL_CALL AccessibleChartElement::getToolTipText()
 
 // ________ XAccessibleComponent ________
 sal_Bool SAL_CALL AccessibleChartElement::containsPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::containsPoint( aPoint );
 }
 
 Reference< XAccessible > SAL_CALL AccessibleChartElement::getAccessibleAtPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::getAccessibleAtPoint( aPoint );
 }
 
 awt::Rectangle SAL_CALL AccessibleChartElement::getBounds()
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::getBounds();
 }
 
 awt::Point SAL_CALL AccessibleChartElement::getLocation()
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::getLocation();
 }
 
 awt::Point SAL_CALL AccessibleChartElement::getLocationOnScreen()
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::getLocationOnScreen();
 }
 
 awt::Size SAL_CALL AccessibleChartElement::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::getSize();
 }
 
 void SAL_CALL AccessibleChartElement::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::grabFocus();
 }
 
 sal_Int32 SAL_CALL AccessibleChartElement::getForeground()
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::getForeground();
 }
 
 sal_Int32 SAL_CALL AccessibleChartElement::getBackground()
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::getBackground();
 }
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 58db7bd12501..a2e48d64ad87 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -75,44 +75,35 @@ public:
     // ________ AccessibleBase ________
     virtual bool ImplUpdateChildren() override;
     virtual css::uno::Reference< css::accessibility::XAccessible >
-        ImplGetAccessibleChildById( sal_Int32 i ) const
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException) override;
-    virtual sal_Int32 ImplGetAccessibleChildCount() const
-        throw (css::uno::RuntimeException) override;
+        ImplGetAccessibleChildById( sal_Int32 i ) const override;
+    virtual sal_Int32 ImplGetAccessibleChildCount() const override;
 
     // ________ XAccessibleContext ________
-    virtual OUString SAL_CALL getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName() override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
 
     // ________ XAccessibleExtendedComponent ________
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
+    virtual OUString SAL_CALL getTitledBorderText() override;
+    virtual OUString SAL_CALL getToolTipText() override;
 
     // the following interface is implemented in AccessibleBase, however it is
     // also a (non-virtual) base class of XAccessibleExtendedComponent Thus
     // these methods have to be overridden and forward to AccessibleBase
 
     // ________ XAccessibleComponent ________
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL grabFocus() override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     // ________ XServiceInfo ________
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 private:
     bool                m_bHasText;
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index 3139f9dd66d2..2757cef19cb2 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -75,14 +75,12 @@ AccessibleChartShape::~AccessibleChartShape()
 
 // ________ XServiceInfo ________
 OUString AccessibleChartShape::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( "AccessibleChartShape" );
 }
 
 // ________ XAccessibleContext ________
 sal_Int32 AccessibleChartShape::getAccessibleChildCount()
-    throw (RuntimeException, std::exception)
 {
     sal_Int32 nCount(0);
     if ( m_pAccShape.is() )
@@ -93,7 +91,6 @@ sal_Int32 AccessibleChartShape::getAccessibleChildCount()
 }
 
 Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i )
-    throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     Reference< XAccessible > xChild;
     if ( m_pAccShape.is() )
@@ -104,7 +101,6 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i )
 }
 
 sal_Int16 AccessibleChartShape::getAccessibleRole()
-    throw (RuntimeException, std::exception)
 {
     sal_Int16 nRole(0);
     if ( m_pAccShape.is() )
@@ -115,7 +111,6 @@ sal_Int16 AccessibleChartShape::getAccessibleRole()
 }
 
 OUString AccessibleChartShape::getAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString aDescription;
     if ( m_pAccShape.is() )
@@ -126,7 +121,6 @@ OUString AccessibleChartShape::getAccessibleDescription()
 }
 
 OUString AccessibleChartShape::getAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString aName;
     if ( m_pAccShape.is() )
@@ -138,7 +132,6 @@ OUString AccessibleChartShape::getAccessibleName()
 
 // ________ XAccessibleComponent ________
 sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bReturn = false;
     if ( m_pAccShape.is() )
@@ -149,7 +142,6 @@ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint )
 }
 
 Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< XAccessible > xResult;
     if ( m_pAccShape.is() )
@@ -160,7 +152,6 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt::
 }
 
 awt::Rectangle AccessibleChartShape::getBounds()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Rectangle aBounds;
     if ( m_pAccShape.is() )
@@ -171,7 +162,6 @@ awt::Rectangle AccessibleChartShape::getBounds()
 }
 
 awt::Point AccessibleChartShape::getLocation()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Point aLocation;
     if ( m_pAccShape.is() )
@@ -182,7 +172,6 @@ awt::Point AccessibleChartShape::getLocation()
 }
 
 awt::Point AccessibleChartShape::getLocationOnScreen()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Point aLocation;
     if ( m_pAccShape.is() )
@@ -193,7 +182,6 @@ awt::Point AccessibleChartShape::getLocationOnScreen()
 }
 
 awt::Size AccessibleChartShape::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Size aSize;
     if ( m_pAccShape.is() )
@@ -204,13 +192,11 @@ awt::Size AccessibleChartShape::getSize()
 }
 
 void AccessibleChartShape::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleBase::grabFocus();
 }
 
 sal_Int32 AccessibleChartShape::getForeground()
-    throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nColor(0);
     if ( m_pAccShape.is() )
@@ -221,7 +207,6 @@ sal_Int32 AccessibleChartShape::getForeground()
 }
 
 sal_Int32 AccessibleChartShape::getBackground()
-    throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nColor(0);
     if ( m_pAccShape.is() )
@@ -233,7 +218,6 @@ sal_Int32 AccessibleChartShape::getBackground()
 
 // ________ XAccessibleExtendedComponent ________
 Reference< awt::XFont > AccessibleChartShape::getFont()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< awt::XFont > xFont;
     if ( m_pAccShape.is() )
@@ -244,7 +228,6 @@ Reference< awt::XFont > AccessibleChartShape::getFont()
 }
 
 OUString AccessibleChartShape::getTitledBorderText()
-    throw (uno::RuntimeException, std::exception)
 {
     OUString aText;
     if ( m_pAccShape.is() )
@@ -255,7 +238,6 @@ OUString AccessibleChartShape::getTitledBorderText()
 }
 
 OUString AccessibleChartShape::getToolTipText()
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString aText;
     if ( m_pAccShape.is() )
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index 3108b18fd95d..6feaf9e295b9 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -48,41 +48,31 @@ public:
     virtual ~AccessibleChartShape() override;
 
     // ________ XServiceInfo ________
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     // ________ XAccessibleContext ________
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleChild( sal_Int32 i )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
+    virtual OUString SAL_CALL getAccessibleName() override;
 
     // ________ XAccessibleComponent ________
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL grabFocus() override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     // ________ XAccessibleExtendedComponent ________
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
+    virtual OUString SAL_CALL getTitledBorderText() override;
+    virtual OUString SAL_CALL getToolTipText() override;
 
 private:
     rtl::Reference<accessibility::AccessibleShape> m_pAccShape;
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index fac65a65c301..77c4457651a9 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -98,39 +98,33 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const
 
 // ________ XAccessibleContext ________
 OUString SAL_CALL AccessibleChartView::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     return SCH_RESSTR(STR_OBJECT_DIAGRAM);
 }
 
 OUString SAL_CALL AccessibleChartView::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     return getAccessibleName();
 }
 
 Reference< XAccessible > SAL_CALL AccessibleChartView::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     return Reference< XAccessible >( m_xParent );
 }
 
 sal_Int32 SAL_CALL AccessibleChartView::getAccessibleIndexInParent()
-    throw (uno::RuntimeException, std::exception)
 {
     // the document is always the only child of the window
     return 0;
 }
 
 sal_Int16 SAL_CALL AccessibleChartView::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleRole::DOCUMENT;
 }
 
 // ________ XAccessibleComponent ________
 awt::Rectangle SAL_CALL AccessibleChartView::getBounds()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Rectangle aResult( GetWindowPosSize());
     Reference< XAccessible > xParent( m_xParent );
@@ -148,7 +142,6 @@ awt::Rectangle SAL_CALL AccessibleChartView::getBounds()
 }
 
 awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Rectangle aBounds( getBounds());
     awt::Point aResult;
@@ -167,7 +160,6 @@ awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen()
 // lang::XInitialization
 
 void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments )
-                throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     //0: view::XSelectionSupplier offers notifications for selection changes and access to the selection itself
     //1: frame::XModel representing the chart model - offers access to object data
@@ -334,7 +326,6 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments
 // view::XSelectionChangeListener
 
 void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*rEvent*/ )
-                throw (uno::RuntimeException, std::exception)
 {
     Reference< view::XSelectionSupplier > xSelectionSupplier;
     {
@@ -359,7 +350,6 @@ void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*
 
 // XEventListener
 void SAL_CALL AccessibleChartView::disposing( const lang::EventObject& /*Source*/ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 367c098c73b9..6276daf18d2e 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -57,8 +57,6 @@ AccessibleTextHelper::~AccessibleTextHelper()
 
 // ____ XInitialization ____
 void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArguments )
-    throw (uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     OUString aCID;
     Reference< XAccessible > xEventSource;
@@ -100,7 +98,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
 
 // ____ XAccessibleContext ____
 ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_pTextHelper )
     {
@@ -111,8 +108,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
 }
 
 Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sal_Int32 i )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     if( m_pTextHelper )
     {
@@ -123,57 +118,48 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa
 }
 
 Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not implemented in this helper" );
     return Reference< XAccessible >();
 }
 
 ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not implemented in this helper" );
     return -1;
 }
 
 ::sal_Int16 SAL_CALL AccessibleTextHelper::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not implemented in this helper" );
     return AccessibleRole::UNKNOWN;
 }
 
 OUString SAL_CALL AccessibleTextHelper::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not implemented in this helper" );
     return OUString();
 }
 
 OUString SAL_CALL AccessibleTextHelper::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not implemented in this helper" );
     return OUString();
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL AccessibleTextHelper::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not implemented in this helper" );
     return Reference< XAccessibleRelationSet >();
 }
 
 Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not implemented in this helper" );
     return Reference< XAccessibleStateSet >();
 }
 
 lang::Locale SAL_CALL AccessibleTextHelper::getLocale()
-    throw (IllegalAccessibleComponentStateException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not implemented in this helper" );
     return lang::Locale();
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 69c9183bae25..d18d405eadf0 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -84,40 +84,33 @@ AreaWrapper::~AreaWrapper()
 
 // ____ XShape ____
 awt::Point SAL_CALL AreaWrapper::getPosition()
-    throw (uno::RuntimeException, std::exception)
 {
     return awt::Point(0,0);
 }
 
 void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "trying to set position of chart area" );
 }
 
 awt::Size SAL_CALL AreaWrapper::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_spChart2ModelContact->GetPageSize();
 }
 
 void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ )
-    throw (beans::PropertyVetoException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "trying to set size of chart area" );
 }
 
 // ____ XShapeDescriptor (base of XShape) ____
 OUString SAL_CALL AreaWrapper::getShapeType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.chart.ChartArea" );
 }
 
 // ____ XComponent ____
 void SAL_CALL AreaWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -128,14 +121,12 @@ void SAL_CALL AreaWrapper::dispose()
 
 void SAL_CALL AreaWrapper::addEventListener(
     const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL AreaWrapper::removeEventListener(
     const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
@@ -165,19 +156,16 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
 }
 
 OUString SAL_CALL AreaWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.Area");
 }
 
 sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.xml.UserDefinedAttributesSupplier",
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index de77aafe0472..bd5fad7298a1 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -51,37 +51,25 @@ public:
     virtual ~AreaWrapper() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XShape ____
-    virtual css::awt::Point SAL_CALL getPosition()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize )
-        throw (css::beans::PropertyVetoException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual OUString SAL_CALL getShapeType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener( const css::uno::Reference<
-                                            css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                            css::lang::XEventListener >& xListener ) override;
     virtual void SAL_CALL removeEventListener( const css::uno::Reference<
-                                               css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                               css::lang::XEventListener >& aListener ) override;
 
 protected:
     // ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index cfab846edcd3..a7b088083ff8 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -412,7 +412,7 @@ AxisWrapper::~AxisWrapper()
 }
 
 // ____ chart::XAxis ____
-Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException, std::exception)
+Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle()
 {
     if( !m_xAxisTitle.is() )
     {
@@ -441,7 +441,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno
     }
     return m_xAxisTitle;
 }
-Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException, std::exception)
+Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid()
 {
     if( !m_xMajorGrid.is() )
     {
@@ -464,7 +464,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno
     }
     return m_xMajorGrid;
 }
-Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException, std::exception)
+Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid()
 {
     if( !m_xMinorGrid.is() )
     {
@@ -490,42 +490,35 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno
 
 // ____ XShape ____
 awt::Point SAL_CALL AxisWrapper::getPosition()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Point aResult( m_spChart2ModelContact->GetAxisPosition( this->getAxis() ) );
     return aResult;
 }
 
 void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "trying to set position of Axis" );
 }
 
 awt::Size SAL_CALL AxisWrapper::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Size aSize( m_spChart2ModelContact->GetAxisSize( this->getAxis() ) );
     return aSize;
 }
 
 void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ )
-    throw (beans::PropertyVetoException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "trying to set size of Axis" );
 }
 
 // ____ XShapeDescriptor (base of XShape) ____
 OUString SAL_CALL AxisWrapper::getShapeType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.chart.ChartAxis");
 }
 
 // ____ XNumberFormatsSupplier ____
 uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSettings()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY );
     if( xNumSuppl.is() )
@@ -535,7 +528,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSetti
 }
 
 uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY );
     if( xNumSuppl.is() )
@@ -563,7 +555,6 @@ void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDim
 
 // ____ XComponent ____
 void SAL_CALL AxisWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -577,14 +568,12 @@ void SAL_CALL AxisWrapper::dispose()
 
 void SAL_CALL AxisWrapper::addEventListener(
     const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL AxisWrapper::removeEventListener(
     const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
@@ -691,19 +680,16 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
 }
 
 OUString SAL_CALL AxisWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.Axis");
 }
 
 sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.ChartAxis",
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 352778b8f0b3..4adc3b77ff36 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -67,12 +67,9 @@ public:
     static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis );
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //ReferenceSizePropertyProvider
     virtual void updateReferenceSize() override;
@@ -80,42 +77,31 @@ public:
     virtual css::awt::Size getCurrentSizeForReference() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener( const css::uno::Reference<
-                                            css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                            css::lang::XEventListener >& xListener ) override;
     virtual void SAL_CALL removeEventListener( const css::uno::Reference<
-                                               css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                               css::lang::XEventListener >& aListener ) override;
 
     // ____ chart::XAxis ____
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle(  ) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid(  ) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid(  ) override;
 
     // ____ XShape ____
-    virtual css::awt::Point SAL_CALL getPosition()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize )
-        throw (css::beans::PropertyVetoException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual OUString SAL_CALL getShapeType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // ____ XNumberFormatsSupplier ____
     virtual css::uno::Reference<
-                css::beans::XPropertySet > SAL_CALL getNumberFormatSettings()
-            throw (css::uno::RuntimeException, std::exception) override;
+                css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() override;
     virtual css::uno::Reference<
-                css::util::XNumberFormats > SAL_CALL getNumberFormats()
-            throw (css::uno::RuntimeException, std::exception) override;
+                css::util::XNumberFormats > SAL_CALL getNumberFormats() override;
 
 protected:
     // ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 2378a1d579bf..705f9fc2eb1e 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -413,7 +413,6 @@ ChartDataWrapper::~ChartDataWrapper()
 
 // ____ XChartDataArray (read)____
 Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData()
-    throw (uno::RuntimeException, std::exception)
 {
     initDataAccess();
     if( m_xDataAccess.is() )
@@ -421,7 +420,6 @@ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData()
     return Sequence< Sequence< double > >();
 }
 Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions()
-    throw (uno::RuntimeException, std::exception)
 {
     initDataAccess();
     if( m_xDataAccess.is() )
@@ -429,7 +427,6 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions()
     return Sequence< OUString >();
 }
 Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions()
-    throw (uno::RuntimeException, std::exception)
 {
     initDataAccess();
     if( m_xDataAccess.is() )
@@ -438,14 +435,14 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions()
 }
 
 // ____ XComplexDescriptionAccess (read) ____
-Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions()
 {
     initDataAccess();
     if( m_xDataAccess.is() )
         return m_xDataAccess->getComplexRowDescriptions();
     return Sequence< Sequence< OUString > >();
 }
-Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions()
 {
     initDataAccess();
     if( m_xDataAccess.is() )
@@ -454,14 +451,14 @@ Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDesc
 }
 
 // ____ XAnyDescriptionAccess (read) ____
-Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions()
 {
     initDataAccess();
     if( m_xDataAccess.is() )
         return m_xDataAccess->getAnyRowDescriptions();
     return Sequence< Sequence< uno::Any > >();
 }
-Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions()
 {
     initDataAccess();
     if( m_xDataAccess.is() )
@@ -470,7 +467,7 @@ Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescript
 }
 
 // ____ XDateCategories (read) ____
-Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException, std::exception)
+Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories()
 {
     initDataAccess();
     Reference< XDateCategories > xDateCategories( m_xDataAccess, uno::UNO_QUERY );
@@ -481,50 +478,47 @@ Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::Ru
 
 // ____ XChartDataArray (write)____
 void SAL_CALL ChartDataWrapper::setData( const Sequence< Sequence< double > >& rData )
-    throw (uno::RuntimeException, std::exception)
 {
     lcl_DataOperator aOperator( rData );
     applyData( aOperator );
 }
 void SAL_CALL ChartDataWrapper::setRowDescriptions( const Sequence< OUString >& rRowDescriptions )
-    throw (uno::RuntimeException, std::exception)
 {
     lcl_RowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() );
     applyData( aOperator );
 }
 void SAL_CALL ChartDataWrapper::setColumnDescriptions( const Sequence< OUString >& rColumnDescriptions )
-    throw (uno::RuntimeException, std::exception)
 {
     lcl_ColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() );
     applyData( aOperator );
 }
 
 // ____ XComplexDescriptionAccess (write) ____
-void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions )
 {
     lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() );
     applyData( aOperator );
 }
-void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions )
 {
     lcl_ComplexColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() );
     applyData( aOperator );
 }
 
 // ____ XAnyDescriptionAccess (write) ____
-void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions )
 {
     lcl_AnyRowDescriptionsOperator aOperator( rRowDescriptions );
     applyData( aOperator );
 }
-void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions )
 {
     lcl_AnyColumnDescriptionsOperator aOperator( rColumnDescriptions );
     applyData( aOperator );
 }
 
 // ____ XDateCategories (write) ____
-void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates )
 {
     Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
     ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY ));
@@ -536,26 +530,22 @@ void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDa
 // ____ XChartData (base of XChartDataArray) ____
 void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener(
     const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( aListener );
 }
 
 void SAL_CALL ChartDataWrapper::removeChartDataChangeEventListener(
     const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
 
 double SAL_CALL ChartDataWrapper::getNotANumber()
-    throw (uno::RuntimeException, std::exception)
 {
     return DBL_MIN;
 }
 
 sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber )
-    throw (uno::RuntimeException, std::exception)
 {
     return DBL_MIN == nNumber
         || ::rtl::math::isNan( nNumber )
@@ -564,7 +554,6 @@ sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber )
 
 // ____ XComponent ____
 void SAL_CALL ChartDataWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this )));
     m_xDataAccess=nullptr;
@@ -572,21 +561,18 @@ void SAL_CALL ChartDataWrapper::dispose()
 
 void SAL_CALL ChartDataWrapper::addEventListener(
     const uno::Reference< lang::XEventListener > & xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL ChartDataWrapper::removeEventListener(
     const uno::Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
 
 // ____ XEventListener ____
 void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
@@ -702,19 +688,16 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
 }
 
 OUString SAL_CALL ChartDataWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.ChartData");
 }
 
 sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.ChartDataArray",
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index 34a35ee7643b..a15a2d06ab70 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -54,77 +54,56 @@ public:
     virtual ~ChartDataWrapper() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     // ____ XDateCategories ____
-    virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override;
+    virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override;
 
     // ____ XAnyDescriptionAccess ____
     virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
-        getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+        getAnyRowDescriptions() override;
     virtual void SAL_CALL setAnyRowDescriptions(
-        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) override;
     virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
-        getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+        getAnyColumnDescriptions() override;
     virtual void SAL_CALL setAnyColumnDescriptions(
-        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) override;
 
     // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
     virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
-        getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+        getComplexRowDescriptions() override;
     virtual void SAL_CALL setComplexRowDescriptions(
-        const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override;
     virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
-        getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+        getComplexColumnDescriptions() override;
     virtual void SAL_CALL setComplexColumnDescriptions(
-        const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override;
 
     // ____ XChartDataArray (base of XComplexDescriptionAccess) ____
-    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override;
+    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override;
+    virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override;
+    virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) override;
 
     // ____ XChartData (base of XChartDataArray) ____
-    virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getNotANumber()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNotANumber( double nNumber )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual double SAL_CALL getNotANumber() override;
+    virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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;
 
     void fireChartDataChangeEvent( css::chart::ChartDataChangeEvent& aEvent );
 
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 4f46ea84cb16..f98a743814c4 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -273,14 +273,11 @@ class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty
 public:
     explicit WrappedDataSourceLabelsInFirstRowProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -296,7 +293,6 @@ WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProp
 }
 
 void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bLabelsInFirstRow = true;
     if( ! (rOuterValue >>= bLabelsInFirstRow) )
@@ -329,7 +325,6 @@ void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOu
 }
 
 Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OUString aRangeString;
     bool bUseColumns = true;
@@ -353,7 +348,6 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference
 }
 
 Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= true;
@@ -366,14 +360,11 @@ class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty
 public:
     explicit WrappedDataSourceLabelsInFirstColumnProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -389,7 +380,6 @@ WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColu
 }
 
 void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bLabelsInFirstRow = true;
     if( ! (rOuterValue >>= bLabelsInFirstRow) )
@@ -422,7 +412,6 @@ void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any&
 }
 
 Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OUString aRangeString;
     bool bUseColumns = true;
@@ -446,7 +435,6 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Refere
 }
 
 Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= true;
@@ -459,14 +447,11 @@ class WrappedHasLegendProperty : public WrappedProperty
 public:
     explicit WrappedHasLegendProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -479,7 +464,6 @@ WrappedHasLegendProperty::WrappedHasLegendProperty(const std::shared_ptr<Chart2M
 }
 
 void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNewValue = true;
     if( ! (rOuterValue >>= bNewValue) )
@@ -505,7 +489,6 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
 }
 
 Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     try
@@ -525,7 +508,6 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert
 }
 
 Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
@@ -538,14 +520,11 @@ class WrappedHasMainTitleProperty : public WrappedProperty
 public:
     explicit WrappedHasMainTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -558,7 +537,6 @@ WrappedHasMainTitleProperty::WrappedHasMainTitleProperty(const std::shared_ptr<C
 }
 
 void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNewValue = true;
     if( ! (rOuterValue >>= bNewValue) )
@@ -578,7 +556,6 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons
 }
 
 Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     try
@@ -593,7 +570,6 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp
 }
 
 Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
@@ -606,14 +582,11 @@ class WrappedHasSubTitleProperty : public WrappedProperty
 public:
     explicit WrappedHasSubTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -626,7 +599,6 @@ WrappedHasSubTitleProperty::WrappedHasSubTitleProperty(const std::shared_ptr<Cha
 }
 
 void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNewValue = true;
     if( ! (rOuterValue >>= bNewValue) )
@@ -646,7 +618,6 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const
 }
 
 Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     try
@@ -661,7 +632,6 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope
 }
 
 Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
@@ -683,7 +653,6 @@ ChartDocumentWrapper::~ChartDocumentWrapper()
 
 // ____ XInterface (for new interfaces) ____
 uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_xDelegator.is())
         // calls queryAggregation if the delegator doesn't know aType
@@ -694,7 +663,6 @@ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType )
 
 // ____ chart::XChartDocument (old API wrapper) ____
 Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_xTitle.is()  )
     {
@@ -705,7 +673,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle()
 }
 
 Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_xSubTitle.is() )
     {
@@ -716,7 +683,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle()
 }
 
 Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xLegend.is())
     {
@@ -728,7 +694,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend()
 }
 
 Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xArea.is())
     {
@@ -740,7 +705,6 @@ Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea()
 }
 
 Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_xDiagram.is()  )
     {
@@ -758,7 +722,6 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram()
 }
 
 void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDiagram )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< util::XRefreshable > xAddIn( xDiagram, uno::UNO_QUERY );
     if( xAddIn.is() )
@@ -791,7 +754,6 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi
 }
 
 Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_xChartData.is() )
     {
@@ -803,7 +765,6 @@ Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData()
 }
 
 void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& xNewData )
-    throw (uno::RuntimeException, std::exception)
 {
     if( !xNewData.is() )
         return;
@@ -816,7 +777,6 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& x
 sal_Bool SAL_CALL ChartDocumentWrapper::attachResource(
     const OUString& URL,
     const Sequence< beans::PropertyValue >& Arguments )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -825,7 +785,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource(
 }
 
 OUString SAL_CALL ChartDocumentWrapper::getURL()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -834,7 +793,6 @@ OUString SAL_CALL ChartDocumentWrapper::getURL()
 }
 
 Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -843,7 +801,6 @@ Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs()
 }
 
 void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::XController >& Controller )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -852,7 +809,6 @@ void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::X
 
 void SAL_CALL ChartDocumentWrapper::disconnectController(
     const Reference< frame::XController >& Controller )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -860,7 +816,6 @@ void SAL_CALL ChartDocumentWrapper::disconnectController(
 }
 
 void SAL_CALL ChartDocumentWrapper::lockControllers()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -868,7 +823,6 @@ void SAL_CALL ChartDocumentWrapper::lockControllers()
 }
 
 void SAL_CALL ChartDocumentWrapper::unlockControllers()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -876,7 +830,6 @@ void SAL_CALL ChartDocumentWrapper::unlockControllers()
 }
 
 sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -885,7 +838,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked()
 }
 
 Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentController()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -895,8 +847,6 @@ Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentControl
 
 void SAL_CALL ChartDocumentWrapper::setCurrentController(
     const Reference< frame::XController >& Controller )
-    throw (container::NoSuchElementException,
-           uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -904,7 +854,6 @@ void SAL_CALL ChartDocumentWrapper::setCurrentController(
 }
 
 Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -914,7 +863,6 @@ Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection(
 
 // ____ XComponent ____
 void SAL_CALL ChartDocumentWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_bIsDisposed )
         throw lang::DisposedException("ChartDocumentWrapper is disposed",
@@ -1074,7 +1022,6 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const
 }
 
 void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -1082,7 +1029,6 @@ void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEv
 }
 
 void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
     if( xModel.is() )
@@ -1091,13 +1037,11 @@ void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::
 
 // ____ XDrawPageSupplier ____
 uno::Reference< drawing::XDrawPage > SAL_CALL ChartDocumentWrapper::getDrawPage()
-    throw (uno::RuntimeException, std::exception)
 {
     return this->impl_getDrawPage();
 }
 
 uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() const
-    throw (uno::RuntimeException)
 {
     return m_spChart2ModelContact->getDrawPage();
 }
@@ -1123,8 +1067,6 @@ uno::Reference< lang::XMultiServiceFactory > getShapeFactory(const uno::Referenc
 // ____ XMultiServiceFactory ____
 uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
     const OUString& aServiceSpecifier )
-    throw (uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface > xResult;
 
@@ -1411,8 +1353,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
 uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceWithArguments(
     const OUString& ServiceSpecifier,
     const uno::Sequence< uno::Any >& Arguments )
-    throw (uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" );
     (void)(Arguments);
@@ -1421,7 +1361,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW
 }
 
 uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return comphelper::mapKeysToSequence( lcl_getStaticServiceNameMap() );
 }
@@ -1429,7 +1368,6 @@ uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceName
 // ____ XAggregation ____
 void SAL_CALL ChartDocumentWrapper::setDelegator(
     const uno::Reference< uno::XInterface >& rDelegator )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_bIsDisposed )
     {
@@ -1460,7 +1398,6 @@ void SAL_CALL ChartDocumentWrapper::setDelegator(
 }
 
 uno::Any SAL_CALL ChartDocumentWrapper::queryAggregation( const uno::Type& rType )
-    throw (uno::RuntimeException, std::exception)
 {
     return ChartDocumentWrapper_Base::queryInterface( rType );
 }
@@ -1516,19 +1453,16 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert
 }
 
 OUString SAL_CALL ChartDocumentWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.ChartDocument",
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index a480d30057df..f83bc35c5cc8 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -259,14 +259,11 @@ class WrappedAttachedAxisProperty : public ::chart::WrappedProperty
 public:
     explicit WrappedAttachedAxisProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 protected:
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -280,7 +277,6 @@ WrappedAttachedAxisProperty::WrappedAttachedAxisProperty(
 }
 
 Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= css::chart::ChartAxisAssign::PRIMARY_Y;
@@ -288,7 +284,6 @@ Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPr
 }
 
 Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
 
@@ -302,7 +297,6 @@ Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XProp
 }
 
 void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Reference< chart2::XDataSeries > xDataSeries( xInnerPropertySet, uno::UNO_QUERY );
 
@@ -364,14 +358,11 @@ class WrappedLineColorProperty : public WrappedSeriesAreaOrLineProperty
 public:
     explicit WrappedLineColorProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper );
 
-    virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+    virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 protected:
     DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
@@ -389,7 +380,6 @@ WrappedLineColorProperty::WrappedLineColorProperty(
 }
 
 void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
         m_aOuterValue = rOuterValue;
@@ -398,7 +388,6 @@ void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const R
 }
 
 void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
         m_aOuterValue = m_aDefaultValue;
@@ -407,7 +396,6 @@ void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPr
 }
 
 Any WrappedLineColorProperty::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if( m_pDataSeriesPointWrapper && !m_pDataSeriesPointWrapper->isSupportingAreaProperties() )
         return m_aDefaultValue;
@@ -420,11 +408,9 @@ class WrappedLineStyleProperty : public WrappedSeriesAreaOrLineProperty
 public:
     explicit WrappedLineStyleProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper );
 
-    virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+    virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 protected:
     DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
@@ -442,7 +428,6 @@ WrappedLineStyleProperty::WrappedLineStyleProperty(
 }
 
 void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aNewValue(rOuterValue);
     if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
@@ -454,7 +439,6 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R
 }
 
 void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
         m_aOuterValue = m_aDefaultValue;
@@ -482,7 +466,6 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr<Chart2Model
 }
 
 void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any >& aArguments )
-                throw ( uno::Exception, uno::RuntimeException, std::exception)
 {
     OSL_PRECOND(aArguments.getLength() >= 1,"need at least 1 argument to initialize the DataSeriesPointWrapper: series reference + optional datapoint index");
 
@@ -527,7 +510,6 @@ DataSeriesPointWrapper::~DataSeriesPointWrapper()
 
 // ____ XComponent ____
 void SAL_CALL DataSeriesPointWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -538,21 +520,18 @@ void SAL_CALL DataSeriesPointWrapper::dispose()
 
 void SAL_CALL DataSeriesPointWrapper::addEventListener(
     const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL DataSeriesPointWrapper::removeEventListener(
     const uno::Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
 
 // ____ XEventListener ____
 void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Source*/ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
@@ -623,7 +602,6 @@ awt::Size DataSeriesPointWrapper::getCurrentSizeForReference()
 
 //XPropertyState
 beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE );
     try
@@ -688,7 +666,6 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU
 }
 
 void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     if( m_eType == DATA_SERIES )
         WrappedPropertySet::setPropertyToDefault( rPropertyName );
@@ -699,7 +676,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPro
     }
 }
 Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Any aRet;
     try
@@ -800,7 +776,6 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
 }
 
 void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
-                                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if(rPropertyName == "Lines")
     {
@@ -861,7 +836,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert
 }
 
 Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rPropertyName )
-                throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( m_eType == DATA_POINT )
     {
@@ -890,19 +864,16 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty
 }
 
 OUString SAL_CALL DataSeriesPointWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.DataSeries");
 }
 
 sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.ChartDataRowProperties",
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index c2bcf4ea3cdc..6f3120b40502 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -73,16 +73,12 @@ public:
     bool isLinesForbidden() { return !m_bLinesAllowed;}
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ___lang::XInitialization___
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-                throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     //ReferenceSizePropertyProvider
     virtual void updateReferenceSize() override;
@@ -91,28 +87,24 @@ public:
 
 protected:
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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;
 
 protected:
     // ____ WrappedPropertySet ____
     virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override;
     virtual const std::vector< WrappedProperty* > createWrappedProperties() override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
     virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override;
 
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //own methods
     css::uno::Reference< css::chart2::XDataSeries > getDataSeries();
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 2d33bf349f8e..ffb4fd92f2ff 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -635,7 +635,6 @@ DiagramWrapper::~DiagramWrapper()
 
 // ____ XDiagram ____
 OUString SAL_CALL DiagramWrapper::getDiagramType()
-    throw (uno::RuntimeException, std::exception)
 {
     OUString aRet;
 
@@ -682,8 +681,6 @@ OUString SAL_CALL DiagramWrapper::getDiagramType()
 
 Reference<
     beans::XPropertySet > SAL_CALL DiagramWrapper::getDataRowProperties( sal_Int32 nRow )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     if( nRow < 0 )
         throw lang::IndexOutOfBoundsException("DataSeries index invalid",
@@ -703,8 +700,6 @@ Reference<
 
 Reference<
     beans::XPropertySet > SAL_CALL DiagramWrapper::getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     if( nCol < 0 || nRow < 0 )
         throw lang::IndexOutOfBoundsException("DataSeries index invalid",
@@ -727,14 +722,12 @@ Reference<
 
 // ____ XShape (base of XDiagram) ____
 awt::Point SAL_CALL DiagramWrapper::getPosition()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Point aPosition = ToPoint( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() );
     return aPosition;
 }
 
 void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
-    throw (uno::RuntimeException, std::exception)
 {
     ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
@@ -759,15 +752,12 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
 }
 
 awt::Size SAL_CALL DiagramWrapper::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Size aSize = ToSize( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() );
     return aSize;
 }
 
 void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize )
-    throw (beans::PropertyVetoException,
-           uno::RuntimeException, std::exception)
 {
     ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
@@ -794,14 +784,13 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize )
 
 // ____ XShapeDescriptor (base of XShape) ____
 OUString SAL_CALL DiagramWrapper::getShapeType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.chart.Diagram" );
 }
 
 // ____ XDiagramPositioning ____
 
-void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::RuntimeException, std::exception)
+void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning()
 {
     ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
     uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
@@ -811,7 +800,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::Runti
         xDiaProps->setPropertyValue( "RelativePosition", Any() );
     }
 }
-sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning(  )
 {
     uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
     if( xDiaProps.is() )
@@ -823,7 +812,7 @@ sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning(  ) throw (uno::
     }
     return true;
 }
-void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect )
 {
     ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
     DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
@@ -831,7 +820,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan
     if( xDiaProps.is() )
         xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(true) );
 }
-sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning()
 {
     uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
     if( xDiaProps.is() )
@@ -847,11 +836,11 @@ sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::Ru
     }
     return false;
 }
-awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes(  ) throw (uno::RuntimeException, std::exception)
+awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes(  )
 {
     return m_spChart2ModelContact->GetDiagramRectangleExcludingAxes();
 }
-void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect )
 {
     ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
     DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
@@ -859,24 +848,23 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan
     if( xDiaProps.is() )
         xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(false) );
 }
-awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes(  ) throw (uno::RuntimeException, std::exception)
+awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes(  )
 {
     return m_spChart2ModelContact->GetDiagramRectangleIncludingAxes();
 }
-void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect )
 {
     ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
     awt::Rectangle aRect( m_spChart2ModelContact->SubstractAxisTitleSizes(rPositionRect) );
     DiagramWrapper::setDiagramPositionIncludingAxes( aRect );
 }
-css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles(  ) throw (css::uno::RuntimeException, std::exception)
+css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles(  )
 {
     return m_spChart2ModelContact->GetDiagramRectangleIncludingTitle();
 }
 
 // ____ XAxisSupplier ____
 Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< XAxis > xAxis;
     if(!nDimensionIndex)
@@ -901,7 +889,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex )
 }
 
 Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensionIndex )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< XAxis > xAxis;
     if(!nDimensionIndex)
@@ -921,7 +908,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensi
 
 // ____ XAxisZSupplier ____
 Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< drawing::XShape > xRet;
     Reference< XAxis > xAxis( getAxis(2) );
@@ -931,7 +917,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle()
 }
 
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xRet;
     Reference< XAxis > xAxis( getAxis(2) );
@@ -941,7 +926,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid()
 }
 
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xRet;
     Reference< XAxis > xAxis( getAxis(2) );
@@ -951,7 +935,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid()
 }
 
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xZAxis.is())
         m_xZAxis = new AxisWrapper( AxisWrapper::Z_AXIS, m_spChart2ModelContact );
@@ -960,7 +943,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis()
 
 // ____ XTwoAxisXSupplier ____
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xSecondXAxis.is())
         m_xSecondXAxis = new AxisWrapper( AxisWrapper::SECOND_X_AXIS, m_spChart2ModelContact );
@@ -969,7 +951,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis()
 
 // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____
 Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< drawing::XShape > xRet;
     Reference< XAxis > xAxis( getAxis(0) );
@@ -979,7 +960,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle()
 }
 
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xXAxis.is())
         m_xXAxis = new AxisWrapper( AxisWrapper::X_AXIS, m_spChart2ModelContact );
@@ -987,7 +967,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis()
 }
 
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xRet;
     Reference< XAxis > xAxis( getAxis(0) );
@@ -997,7 +976,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid()
 }
 
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xRet;
     Reference< XAxis > xAxis( getAxis(0) );
@@ -1008,7 +986,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid()
 
 // ____ XTwoAxisYSupplier ____
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xSecondYAxis.is())
         m_xSecondYAxis = new AxisWrapper( AxisWrapper::SECOND_Y_AXIS, m_spChart2ModelContact );
@@ -1017,7 +994,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis()
 
 // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____
 Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< drawing::XShape > xRet;
     Reference< XAxis > xAxis( getAxis(1) );
@@ -1027,7 +1003,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle()
 }
 
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xYAxis.is())
         m_xYAxis = new AxisWrapper( AxisWrapper::Y_AXIS, m_spChart2ModelContact );
@@ -1035,7 +1010,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis()
 }
 
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xRet;
     Reference< XAxis > xAxis( getAxis(1) );
@@ -1045,7 +1019,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid()
 }
 
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xRet;
     Reference< XAxis > xAxis( getAxis(1) );
@@ -1056,7 +1029,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid()
 
 // ____ XSecondAxisTitleSupplier ____
 Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< drawing::XShape > xRet;
     Reference< XAxis > xAxis( getSecondaryAxis(0) );
@@ -1066,7 +1038,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle()
 }
 
 Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< drawing::XShape > xRet;
     Reference< XAxis > xAxis( getSecondaryAxis(1) );
@@ -1078,7 +1049,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle()
 // ____ XStatisticDisplay ____
 Reference<
     beans::XPropertySet > SAL_CALL DiagramWrapper::getUpBar()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_xUpBarWrapper.is() )
     {
@@ -1089,7 +1059,6 @@ Reference<
 
 Reference<
     beans::XPropertySet > SAL_CALL DiagramWrapper::getDownBar()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_xDownBarWrapper.is() )
     {
@@ -1100,7 +1069,6 @@ Reference<
 
 Reference<
     beans::XPropertySet > SAL_CALL DiagramWrapper::getMinMaxLine()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_xMinMaxLineWrapper.is() )
     {
@@ -1111,7 +1079,6 @@ Reference<
 
 // ____ X3DDisplay ____
 Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_xWall.is() )
     {
@@ -1122,7 +1089,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall()
 
 Reference<
     beans::XPropertySet > SAL_CALL DiagramWrapper::getFloor()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_xFloor.is() )
     {
@@ -1133,7 +1099,6 @@ Reference<
 
 // ____ X3DDefaultSetter ____
 void SAL_CALL DiagramWrapper::set3DSettingsToDefault()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY );
     if( x3DDefaultSetter.is() )
@@ -1141,7 +1106,6 @@ void SAL_CALL DiagramWrapper::set3DSettingsToDefault()
 }
 
 void SAL_CALL DiagramWrapper::setDefaultRotation()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY );
     if( x3DDefaultSetter.is() )
@@ -1149,7 +1113,6 @@ void SAL_CALL DiagramWrapper::setDefaultRotation()
 }
 
 void SAL_CALL DiagramWrapper::setDefaultIllumination()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY );
     if( x3DDefaultSetter.is() )
@@ -1158,7 +1121,6 @@ void SAL_CALL DiagramWrapper::setDefaultIllumination()
 
 // ____ XComponent ____
 void SAL_CALL DiagramWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this )));
 
@@ -1180,14 +1142,12 @@ void SAL_CALL DiagramWrapper::dispose()
 
 void SAL_CALL DiagramWrapper::addEventListener(
     const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL DiagramWrapper::removeEventListener(
     const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
@@ -1198,14 +1158,11 @@ class WrappedDataRowSourceProperty : public WrappedProperty
 public:
     explicit WrappedDataRowSourceProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -1221,7 +1178,6 @@ WrappedDataRowSourceProperty::WrappedDataRowSourceProperty(const std::shared_ptr
 }
 
 void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS;
     if( ! (rOuterValue >>= eChartDataRowSource) )
@@ -1257,7 +1213,6 @@ void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, con
 }
 
 Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OUString aRangeString;
     bool bUseColumns = true;
@@ -1280,7 +1235,6 @@ Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPro
 }
 
 Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= css::chart::ChartDataRowSource_COLUMNS;
@@ -1295,14 +1249,11 @@ class WrappedStackingProperty : public WrappedProperty
 public:
     WrappedStackingProperty(StackMode eStackMode, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 protected: //methods
     bool    detectInnerValue( StackMode& eInnerStackMode ) const;
@@ -1346,7 +1297,6 @@ bool WrappedStackingProperty::detectInnerValue( StackMode& eStackMode ) const
 }
 
 void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
@@ -1375,7 +1325,6 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re
 }
 
 Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     StackMode eInnerStackMode;
     if( detectInnerValue( eInnerStackMode ) )
@@ -1387,7 +1336,6 @@ Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XProperty
 }
 
 Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
@@ -1400,14 +1348,11 @@ class WrappedDim3DProperty : public WrappedProperty
 public:
     explicit WrappedDim3DProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -1423,7 +1368,6 @@ WrappedDim3DProperty::WrappedDim3DProperty(const std::shared_ptr<Chart2ModelCont
 }
 
 void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNew3D = false;
     if( ! (rOuterValue >>= bNew3D) )
@@ -1441,7 +1385,6 @@ void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Refer
 }
 
 Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     if( xDiagram.is() )
@@ -1453,7 +1396,6 @@ Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet
 }
 
 Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
@@ -1466,14 +1408,11 @@ class WrappedVerticalProperty : public WrappedProperty
 public:
     explicit WrappedVerticalProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -1489,7 +1428,6 @@ WrappedVerticalProperty::WrappedVerticalProperty(const std::shared_ptr<Chart2Mod
 }
 
 void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNewVertical = false;
     if( ! (rOuterValue >>= bNewVertical) )
@@ -1509,7 +1447,6 @@ void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Re
 }
 
 Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     if( xDiagram.is() )
@@ -1524,7 +1461,6 @@ Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XProperty
 }
 
 Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
@@ -1537,14 +1473,11 @@ class WrappedNumberOfLinesProperty : public WrappedProperty
 public:
     explicit WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 protected: //methods
     bool    detectInnerValue( uno::Any& rInnerValue ) const;
@@ -1597,7 +1530,6 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con
 }
 
 void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     sal_Int32 nNewValue;
     if( ! (rOuterValue >>= nNewValue) )
@@ -1664,7 +1596,6 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
 }
 
 Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     if( !detectInnerValue( aRet ) )
@@ -1673,7 +1604,6 @@ Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPro
 }
 
 Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= sal_Int32( 0 );
@@ -1686,14 +1616,11 @@ class WrappedAttributedDataPointsProperty : public WrappedProperty
 public:
     explicit WrappedAttributedDataPointsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -1709,7 +1636,6 @@ WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty(const s
 }
 
 void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Sequence< uno::Sequence< sal_Int32 > > aNewValue;
     if( ! (rOuterValue >>= aNewValue) )
@@ -1748,7 +1674,6 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal
 }
 
 Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Reference< chart2::XDiagram >    xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY );
@@ -1781,7 +1706,6 @@ Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< bean
 }
 
 Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     uno::Sequence< uno::Sequence< sal_Int32 > > aSeq;
@@ -1795,14 +1719,11 @@ class WrappedSolidTypeProperty : public WrappedProperty
 public:
     explicit WrappedSolidTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -1818,7 +1739,6 @@ WrappedSolidTypeProperty::WrappedSolidTypeProperty(const std::shared_ptr<Chart2M
 }
 
 void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     sal_Int32 nNewSolidType = css::chart::ChartSolidType::RECTANGULAR_SOLID;
     if( ! (rOuterValue >>= nNewSolidType) )
@@ -1838,7 +1758,6 @@ void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const R
 }
 
 Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     if( xDiagram.is() )
@@ -1853,7 +1772,6 @@ Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropert
 }
 
 Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return uno::makeAny( css::chart::ChartSolidType::RECTANGULAR_SOLID );
 }
@@ -1863,14 +1781,11 @@ class WrappedAutomaticSizeProperty : public WrappedProperty
 public:
     WrappedAutomaticSizeProperty();
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 };
 
 WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty()
@@ -1879,7 +1794,6 @@ WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty()
 }
 
 void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if( xInnerPropertySet.is() )
     {
@@ -1904,7 +1818,6 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con
 }
 
 Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
     if( xInnerPropertySet.is() )
@@ -1917,7 +1830,6 @@ Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPro
 }
 
 Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
@@ -1930,10 +1842,8 @@ class WrappedIncludeHiddenCellsProperty : public WrappedProperty
 public:
     explicit WrappedIncludeHiddenCellsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
-    virtual Any getPropertyValue(const Reference<beans::XPropertySet>& xInnerPropertySet) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
+    virtual Any getPropertyValue(const Reference<beans::XPropertySet>& xInnerPropertySet) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -1946,7 +1856,6 @@ WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty(const std::
 }
 
 void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
@@ -1956,7 +1865,6 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue
 }
 
 Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bValue = ChartModelHelper::isIncludeHiddenCells( m_spChart2ModelContact->getChartModel() );
     return uno::Any(bValue);
@@ -1964,14 +1872,12 @@ Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans:
 
 // ____ XDiagramProvider ____
 Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_spChart2ModelContact->getChart2Diagram();
 }
 
 void SAL_CALL DiagramWrapper::setDiagram(
     const Reference< chart2::XDiagram >& /*xDiagram*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     //@todo: remove this method from interface
     OSL_FAIL("DiagramWrapper::setDiagram is not implemented, should be removed and not be called" );
@@ -2022,19 +1928,16 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
 }
 
 OUString SAL_CALL DiagramWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.Diagram");
 }
 
 sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.Diagram",
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 24649f66bc0b..148e4705eb08 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -75,158 +75,116 @@ public:
     virtual ~DiagramWrapper() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener( const css::uno::Reference<
-                                            css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                            css::lang::XEventListener >& xListener ) override;
     virtual void SAL_CALL removeEventListener( const css::uno::Reference<
-                                               css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                               css::lang::XEventListener >& aListener ) override;
 
     // ____ XDiagram ____
-    virtual OUString SAL_CALL getDiagramType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDiagramType() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) override;
 
     // ____ XShape (base of XDiagram) ____
-    virtual css::awt::Point SAL_CALL getPosition()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize )
-        throw (css::beans::PropertyVetoException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual OUString SAL_CALL getShapeType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // ____ XAxisSupplier ____
     virtual css::uno::Reference<
-        css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) override;
     virtual css::uno::Reference<
-        css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) override;
 
     // ____ XAxisZSupplier ____
     virtual css::uno::Reference<
-        css::drawing::XShape > SAL_CALL getZAxisTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::drawing::XShape > SAL_CALL getZAxisTitle() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getZMainGrid()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getZMainGrid() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getZHelpGrid()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getZHelpGrid() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getZAxis()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getZAxis() override;
 
     // ____ XTwoAxisXSupplier ____
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getSecondaryXAxis()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getSecondaryXAxis() override;
 
     // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____
     virtual css::uno::Reference<
-        css::drawing::XShape > SAL_CALL getXAxisTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::drawing::XShape > SAL_CALL getXAxisTitle() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getXAxis()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getXAxis() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getXMainGrid()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getXMainGrid() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getXHelpGrid()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getXHelpGrid() override;
 
     // ____ XTwoAxisYSupplier ____
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getSecondaryYAxis()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getSecondaryYAxis() override;
 
     // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____
     virtual css::uno::Reference<
-        css::drawing::XShape > SAL_CALL getYAxisTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::drawing::XShape > SAL_CALL getYAxisTitle() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getYAxis()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getYAxis() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getYHelpGrid()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getYHelpGrid() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getYMainGrid()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getYMainGrid() override;
 
    // ____ XSecondAxisTitleSupplier ____
     virtual css::uno::Reference<
-        css::drawing::XShape > SAL_CALL getSecondXAxisTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::drawing::XShape > SAL_CALL getSecondXAxisTitle() override;
     virtual css::uno::Reference<
-        css::drawing::XShape > SAL_CALL getSecondYAxisTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::drawing::XShape > SAL_CALL getSecondYAxisTitle() override;
 
     // ____ XStatisticDisplay ____
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getUpBar()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getUpBar() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getDownBar()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getDownBar() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getMinMaxLine()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getMinMaxLine() override;
 
     // ____ X3DDisplay ____
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getWall()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getWall() override;
     virtual css::uno::Reference<
-        css::beans::XPropertySet > SAL_CALL getFloor()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::XPropertySet > SAL_CALL getFloor() override;
 
     // ____ X3DDefaultSetter ____
-    virtual void SAL_CALL set3DSettingsToDefault() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultRotation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultIllumination() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL set3DSettingsToDefault() override;
+    virtual void SAL_CALL setDefaultRotation() override;
+    virtual void SAL_CALL setDefaultIllumination() override;
 
     // ____ XDiagramPositioning ____
-    virtual void SAL_CALL setAutomaticDiagramPositioning(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isExcludingDiagramPositioning(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAutomaticDiagramPositioning(  ) override;
+    virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning(  ) override;
+    virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) override;
+    virtual sal_Bool SAL_CALL isExcludingDiagramPositioning(  ) override;
+    virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes(  ) override;
+    virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) override;
+    virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes(  ) override;
+    virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) override;
+    virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles(  ) override;
 
     // ____ XDiagramProvider ____
-    virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram() override;
+    virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
 
 protected:
     // ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index a1ee70db97f0..fb2fb8d7e8e2 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -109,7 +109,6 @@ void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDime
 
 // ____ XComponent ____
 void SAL_CALL GridWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -119,14 +118,12 @@ void SAL_CALL GridWrapper::dispose()
 
 void SAL_CALL GridWrapper::addEventListener(
     const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL GridWrapper::removeEventListener(
     const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
@@ -170,19 +167,16 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties()
 }
 
 OUString SAL_CALL GridWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.Grid");
 }
 
 sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.ChartGrid",
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
index 818b5fea65b6..2e7097e8e207 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
@@ -61,20 +61,14 @@ public:
     static void getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid );
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 protected:
     // ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 9d4f7ce0ba50..caa5bf8e1eaa 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -57,10 +57,8 @@ class WrappedLegendAlignmentProperty : public WrappedProperty
 public:
     WrappedLegendAlignmentProperty();
 
-    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override;
-    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
 
 protected:
     virtual Any convertInnerToOuterValue( const Any& rInnerValue ) const override;
@@ -73,7 +71,6 @@ WrappedLegendAlignmentProperty::WrappedLegendAlignmentProperty()
 }
 
 Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     if( xInnerPropertySet.is() )
@@ -94,7 +91,6 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP
 }
 
 void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if(xInnerPropertySet.is())
     {
@@ -280,13 +276,11 @@ LegendWrapper::~LegendWrapper()
 
 // ____ XShape ____
 awt::Point SAL_CALL LegendWrapper::getPosition()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_spChart2ModelContact->GetLegendPosition();
 }
 
 void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
     if( xProp.is() )
@@ -302,14 +296,11 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition )
 }
 
 awt::Size SAL_CALL LegendWrapper::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_spChart2ModelContact->GetLegendSize();
 }
 
 void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize )
-    throw (beans::PropertyVetoException,
-           uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
     if( xProp.is() )
@@ -327,14 +318,12 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize )
 
 // ____ XShapeDescriptor (base of XShape) ____
 OUString SAL_CALL LegendWrapper::getShapeType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.chart.ChartLegend" );
 }
 
 // ____ XComponent ____
 void SAL_CALL LegendWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -345,14 +334,12 @@ void SAL_CALL LegendWrapper::dispose()
 
 void SAL_CALL LegendWrapper::addEventListener(
     const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL LegendWrapper::removeEventListener(
     const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
@@ -415,19 +402,16 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties()
 }
 
 OUString SAL_CALL LegendWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.Legend");
 }
 
 sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.ChartLegend",
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 3c539c6aa779..c59bb25caddc 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -54,12 +54,9 @@ public:
     virtual ~LegendWrapper() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //ReferenceSizePropertyProvider
     virtual void updateReferenceSize() override;
@@ -67,29 +64,20 @@ public:
     virtual css::awt::Size getCurrentSizeForReference() override;
 
     // ____ XShape ____
-    virtual css::awt::Point SAL_CALL getPosition()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize )
-        throw (css::beans::PropertyVetoException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual OUString SAL_CALL getShapeType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener( const css::uno::Reference<
-                                            css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                            css::lang::XEventListener >& xListener ) override;
     virtual void SAL_CALL removeEventListener( const css::uno::Reference<
-                                               css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                               css::lang::XEventListener >& aListener ) override;
 
 protected:
     // ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 4b3f28773c2d..282fcdf5469a 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -130,7 +130,6 @@ MinMaxLineWrapper::~MinMaxLineWrapper()
 
 // ____ XComponent ____
 void SAL_CALL MinMaxLineWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -138,27 +137,23 @@ void SAL_CALL MinMaxLineWrapper::dispose()
 
 void SAL_CALL MinMaxLineWrapper::addEventListener(
     const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL MinMaxLineWrapper::removeEventListener(
     const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
 
 //XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo()
-                    throw (uno::RuntimeException, std::exception)
 {
     return *StaticMinMaxLineWrapperInfo::get();
 }
 
 void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue )
-                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xPropSet(nullptr);
 
@@ -195,7 +190,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName
     }
 }
 uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rPropertyName )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Any aRet;
 
@@ -237,22 +231,18 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rProperty
 }
 
 void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -260,7 +250,6 @@ void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& /
 //XMultiPropertySet
 //getPropertySetInfo() already declared in XPropertySet
 void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
-                    throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
     for(sal_Int32 nN=0; nN<nMinCount; nN++)
@@ -278,7 +267,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUStrin
     //todo: store unknown properties elsewhere
 }
 uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq )
-                    throw (uno::RuntimeException, std::exception)
 {
     Sequence< Any > aRetSeq;
     if( rNameSeq.getLength() )
@@ -295,27 +283,23 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const u
 void SAL_CALL MinMaxLineWrapper::addPropertiesChangeListener(
     const uno::Sequence< OUString >& /* aPropertyNames */,
     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener(
     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent(
     const uno::Sequence< OUString >& /* aPropertyNames */,
     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 //XPropertyState
 beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUString& rPropertyName )
-                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
         return beans::PropertyState_DEFAULT_VALUE;
@@ -329,7 +313,6 @@ beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUStrin
     return beans::PropertyState_DIRECT_VALUE;
 }
 uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq )
-                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     Sequence< beans::PropertyState > aRetSeq;
     if( rNameSeq.getLength() )
@@ -344,13 +327,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertySta
     return aRetSeq;
 }
 void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName )
-                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
 }
 
 uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rPropertyName )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticMinMaxLineWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) );
@@ -362,7 +343,6 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rProper
 //XMultiPropertyStates
 //getPropertyStates() already declared in XPropertyState
 void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     const Sequence< beans::Property >& rPropSeq = *StaticMinMaxLineWrapperPropertyArray::get();
     for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
@@ -372,7 +352,6 @@ void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault(  )
     }
 }
 void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq )
-                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
     {
@@ -381,7 +360,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OU
     }
 }
 uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Sequence< Any > aRetSeq;
     if( rNameSeq.getLength() )
@@ -397,19 +375,16 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const
 }
 
 OUString SAL_CALL MinMaxLineWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.ChartLine");
 }
 
 sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.ChartLine",
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 860e70e1923c..07687651e728 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -59,51 +59,45 @@ public:
     virtual ~MinMaxLineWrapper() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XMultiPropertySet
     //getPropertySetInfo() already declared in XPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //XMultiPropertyStates
     //getPropertyStates() already declared in XPropertyState
-    virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAllPropertiesToDefault(  ) override;
+    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index d70606fd28dd..3cbef7fb707d 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -51,12 +51,9 @@ class WrappedTitleStringProperty : public WrappedProperty
 public:
     explicit WrappedTitleStringProperty( const Reference< uno::XComponentContext >& xContext );
 
-    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override;
-    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
-    virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+    virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
 
 protected:
     Reference< uno::XComponentContext > m_xContext;
@@ -69,7 +66,6 @@ WrappedTitleStringProperty::WrappedTitleStringProperty( const Reference< uno::XC
 }
 
 void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY);
     if(xTitle.is())
@@ -80,7 +76,6 @@ void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const
     }
 }
 Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
     Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY);
@@ -98,7 +93,6 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope
     return aRet;
 }
 Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return uno::makeAny( OUString() );//default title is a empty String
 }
@@ -205,13 +199,11 @@ TitleWrapper::~TitleWrapper()
 
 // ____ XShape ____
 awt::Point SAL_CALL TitleWrapper::getPosition()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_spChart2ModelContact->GetTitlePosition( this->getTitleObject() );
 }
 
 void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xPropertySet( this->getInnerPropertySet() );
     if(xPropertySet.is())
@@ -227,28 +219,23 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition )
 }
 
 awt::Size SAL_CALL TitleWrapper::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_spChart2ModelContact->GetTitleSize( this->getTitleObject() );
 }
 
 void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ )
-    throw (beans::PropertyVetoException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "trying to set size of title" );
 }
 
 // ____ XShapeDescriptor (base of XShape) ____
 OUString SAL_CALL TitleWrapper::getShapeType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.chart.ChartTitle" );
 }
 
 // ____ XComponent ____
 void SAL_CALL TitleWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -259,14 +246,12 @@ void SAL_CALL TitleWrapper::dispose()
 
 void SAL_CALL TitleWrapper::addEventListener(
     const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL TitleWrapper::removeEventListener(
     const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
@@ -309,7 +294,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue
 }
 
 void TitleWrapper::setFastCharacterPropertyValue(
-    sal_Int32 nHandle, const Any& rValue ) throw (uno::Exception)
+    sal_Int32 nHandle, const Any& rValue )
 {
     OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle &&
                 nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP );
@@ -336,7 +321,6 @@ void TitleWrapper::setFastCharacterPropertyValue(
 // WrappedPropertySet
 
 void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
-                                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
     if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) )
@@ -348,7 +332,6 @@ void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, con
 }
 
 Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Any aRet;
     sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
@@ -360,7 +343,6 @@ Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName )
 }
 
 beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE );
 
@@ -383,7 +365,6 @@ beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rP
     return aState;
 }
 void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
     if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) )
@@ -395,7 +376,6 @@ void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName
         WrappedPropertySet::setPropertyToDefault( rPropertyName );
 }
 Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Any aRet;
 
@@ -419,7 +399,6 @@ Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName )
 }
 
 void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
     if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) )
@@ -432,7 +411,6 @@ void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rProperty
         WrappedPropertySet::addPropertyChangeListener( rPropertyName, xListener );
 }
 void SAL_CALL TitleWrapper::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
     if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) )
@@ -502,19 +480,16 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties()
 }
 
 OUString SAL_CALL TitleWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.Title");
 }
 
 sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.ChartTitle",
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index 4017385040b9..b986eb9a2c8c 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -53,12 +53,9 @@ public:
     virtual ~TitleWrapper() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //ReferenceSizePropertyProvider
     virtual void updateReferenceSize() override;
@@ -67,45 +64,35 @@ public:
 
 protected:
     // ____ XShape ____
-    virtual css::awt::Point SAL_CALL getPosition()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize )
-        throw (css::beans::PropertyVetoException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual OUString SAL_CALL getShapeType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // character properties have to be handled differently (via the XFormattedString elements)
     void getFastCharacterPropertyValue( sal_Int32 nHandle, css::uno::Any& rValue );
     /// @throws css::uno::Exception
-    void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw (css::uno::Exception);
+    void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue );
 
     // ____ WrappedPropertySet ____
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
 
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
 
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override;
 
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index ef048b1d945d..19bd0ba2ac1b 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -138,7 +138,6 @@ UpDownBarWrapper::~UpDownBarWrapper()
 
 // ____ XComponent ____
 void SAL_CALL UpDownBarWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -146,26 +145,22 @@ void SAL_CALL UpDownBarWrapper::dispose()
 
 void SAL_CALL UpDownBarWrapper::addEventListener(
     const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL UpDownBarWrapper::removeEventListener(
     const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
 
 //XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo()
-                    throw (uno::RuntimeException, std::exception)
 {
     return *StaticUpDownBarWrapperInfo::get();
 }
 void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue )
-                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xPropSet(nullptr);
 
@@ -187,7 +182,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName,
         xPropSet->setPropertyValue( rPropertyName, rValue );
 }
 uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyName )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Any aRet;
 
@@ -213,22 +207,18 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyN
 }
 
 void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -236,7 +226,6 @@ void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /*
 //XMultiPropertySet
 //getPropertySetInfo() already declared in XPropertySet
 void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
-                    throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
     for(sal_Int32 nN=0; nN<nMinCount; nN++)
@@ -254,7 +243,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString
     //todo: store unknown properties elsewhere
 }
 uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq )
-                    throw (uno::RuntimeException, std::exception)
 {
     Sequence< Any > aRetSeq;
     if( rNameSeq.getLength() )
@@ -269,24 +257,20 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un
     return aRetSeq;
 }
 void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 //XPropertyState
 beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName )
-                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     uno::Any aDefault( this->getPropertyDefault( rPropertyName ) );
     uno::Any aValue( this->getPropertyValue( rPropertyName ) );
@@ -297,7 +281,6 @@ beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString
     return beans::PropertyState_DIRECT_VALUE;
 }
 uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq )
-                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     Sequence< beans::PropertyState > aRetSeq;
     if( rNameSeq.getLength() )
@@ -312,13 +295,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat
     return aRetSeq;
 }
 void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName )
-                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
 }
 
 uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropertyName )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticUpDownBarWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) );
@@ -330,7 +311,6 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropert
 //XMultiPropertyStates
 //getPropertyStates() already declared in XPropertyState
 void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::get();
     for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
@@ -340,7 +320,6 @@ void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault(  )
     }
 }
 void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq )
-                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
     {
@@ -349,7 +328,6 @@ void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUS
     }
 }
 uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq )
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Sequence< Any > aRetSeq;
     if( rNameSeq.getLength() )
@@ -365,19 +343,16 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const
 }
 
 OUString SAL_CALL UpDownBarWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.ChartArea");
 }
 
 sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart.ChartArea",
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index dca66c5333fc..6e902d487062 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -58,53 +58,47 @@ public:
     virtual ~UpDownBarWrapper() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener( const css::uno::Reference<
-                                            css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                            css::lang::XEventListener >& xListener ) override;
     virtual void SAL_CALL removeEventListener( const css::uno::Reference<
-                                               css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                               css::lang::XEventListener >& aListener ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XMultiPropertySet
     //getPropertySetInfo() already declared in XPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //XMultiPropertyStates
     //getPropertyStates() already declared in XPropertyState
-    virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAllPropertiesToDefault(  ) override;
+    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 9610bb600392..f179264767fe 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -93,7 +93,6 @@ WallFloorWrapper::~WallFloorWrapper()
 
 // ____ XComponent ____
 void SAL_CALL WallFloorWrapper::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -104,14 +103,12 @@ void SAL_CALL WallFloorWrapper::dispose()
 
 void SAL_CALL WallFloorWrapper::addEventListener(
     const Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.addInterface( xListener );
 }
 
 void SAL_CALL WallFloorWrapper::removeEventListener(
     const Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aEventListenerContainer.removeInterface( aListener );
 }
@@ -153,19 +150,16 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties(
 }
 
 OUString SAL_CALL WallFloorWrapper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.WallOrFloor");
 }
 
 sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.xml.UserDefinedAttributesSupplier",
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
index 60cd15aff708..c49e6c9ccdbd 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
@@ -48,20 +48,14 @@ public:
     virtual ~WallFloorWrapper() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 protected:
     // ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index 241f716c09ca..ffd6baa83711 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -39,7 +39,6 @@ WrappedAddInProperty::~WrappedAddInProperty()
 }
 
 void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Reference< util::XRefreshable > xAddIn;
     if( ! (rOuterValue >>= xAddIn) )
@@ -49,7 +48,6 @@ void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Refer
 }
 
 Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return uno::makeAny( m_rChartDocumentWrapper.getAddIn() );
 }
@@ -64,7 +62,6 @@ WrappedBaseDiagramProperty::~WrappedBaseDiagramProperty()
 }
 
 void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OUString aBaseDiagram;
     if( ! (rOuterValue >>= aBaseDiagram) )
@@ -74,7 +71,6 @@ void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const
 }
 
 Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return uno::makeAny( m_rChartDocumentWrapper.getBaseDiagram() );
 }
@@ -89,13 +85,11 @@ WrappedAdditionalShapesProperty::~WrappedAdditionalShapesProperty()
 }
 
 void WrappedAdditionalShapesProperty::setPropertyValue( const Any& /*rOuterValue*/, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     throw lang::IllegalArgumentException( "AdditionalShapes is a read only property", nullptr, 0 );
 }
 
 Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return uno::makeAny( m_rChartDocumentWrapper.getAdditionalShapes() );
 }
@@ -110,7 +104,6 @@ WrappedRefreshAddInAllowedProperty::~WrappedRefreshAddInAllowedProperty()
 }
 
 void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
-                        throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bUpdateAddIn = true;
     if( ! (rOuterValue >>= bUpdateAddIn) )
@@ -120,7 +113,6 @@ void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValu
 }
 
 Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
-                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return uno::makeAny( m_rChartDocumentWrapper.getUpdateAddIn() );
 }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
index fc7ea946935b..a95bf97bc4f9 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
@@ -33,11 +33,9 @@ public:
     explicit WrappedAddInProperty( ChartDocumentWrapper& rChartDocumentWrapper );
     virtual ~WrappedAddInProperty() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
 private:
     ChartDocumentWrapper& m_rChartDocumentWrapper;
@@ -49,11 +47,9 @@ public:
     explicit WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper );
     virtual ~WrappedBaseDiagramProperty() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
 private:
     ChartDocumentWrapper& m_rChartDocumentWrapper;
@@ -65,11 +61,9 @@ public:
     explicit WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper );
     virtual ~WrappedAdditionalShapesProperty() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
 private:
     ChartDocumentWrapper& m_rChartDocumentWrapper;
@@ -81,11 +75,9 @@ public:
     explicit WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper );
     virtual ~WrappedRefreshAddInAllowedProperty() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
 private:
     ChartDocumentWrapper& m_rChartDocumentWrapper;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 605fd723cb86..39bcb5140f41 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -38,12 +38,9 @@ class WrappedAutomaticPositionProperty : public WrappedProperty
 public:
     WrappedAutomaticPositionProperty();
 
-    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override;
-    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
-    virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+    virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
 };
 
 WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
@@ -52,7 +49,6 @@ WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
 }
 
 void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if( xInnerPropertySet.is() )
     {
@@ -77,7 +73,6 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue,
 }
 
 Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
     if( xInnerPropertySet.is() )
@@ -90,7 +85,6 @@ Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans::
 }
 
 Any WrappedAutomaticPositionProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 8aebd9fb02cb..bd80bbd16009 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -38,14 +38,11 @@ public:
     WrappedAxisAndGridExistenceProperty( bool bAxis, bool bMain, sal_Int32 nDimensionIndex
         , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -139,7 +136,6 @@ WrappedAxisAndGridExistenceProperty::WrappedAxisAndGridExistenceProperty( bool b
 }
 
 void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
@@ -169,7 +165,6 @@ void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterVal
 }
 
 Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
@@ -187,7 +182,6 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< bean
 }
 
 Any WrappedAxisAndGridExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
@@ -200,14 +194,11 @@ public:
     WrappedAxisTitleExistenceProperty( sal_Int32 nTitleIndex
         , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -256,7 +247,6 @@ WrappedAxisTitleExistenceProperty::WrappedAxisTitleExistenceProperty(sal_Int32 n
 }
 
 void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
@@ -281,7 +271,6 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue
 }
 
 Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bHasTitle = false;
 
@@ -296,7 +285,6 @@ Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans:
 }
 
 Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
@@ -309,14 +297,11 @@ public:
     WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex
         , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -357,7 +342,6 @@ WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain,
 }
 
 void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
@@ -383,7 +367,6 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue
 }
 
 Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
@@ -396,7 +379,6 @@ Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans:
 }
 
 Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= true;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 78a0076f82f8..0a63ae3cb19a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -51,7 +51,6 @@ void WrappedCharacterHeightProperty::addWrappedProperties( std::vector< WrappedP
 }
 
 void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if(xInnerPropertySet.is())
     {
@@ -62,7 +61,6 @@ void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterVal
 }
 
 Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     if( xInnerPropertySet.is() )
@@ -87,7 +85,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< bean
 }
 
 Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     if( xInnerPropertyState.is() )
@@ -98,7 +95,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< be
 }
 
 beans::PropertyState WrappedCharacterHeightProperty_Base::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     return beans::PropertyState_DIRECT_VALUE;
 }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
index cd065de41d33..6902ebb91b86 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
@@ -36,17 +36,13 @@ public:
     WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider );
     virtual ~WrappedCharacterHeightProperty_Base() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
-    virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+    virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 protected:
     virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
index 9e135594fe82..93bbda452c22 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
@@ -55,9 +55,7 @@ public:
     WrappedGL3DProperty( const OUString& rInName, const OUString& rOutName, const uno::Any& rDefault, const std::shared_ptr<Chart2ModelContact>& pContact ) :
         WrappedProperty(rInName, rOutName), maDefault(rDefault), mpModelContact(pContact) {}
 
-    virtual uno::Any getPropertyValue( const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-               uno::RuntimeException) override
+    virtual uno::Any getPropertyValue( const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override
     {
         uno::Reference<chart2::XChartType> xCT = getChartType();
         if (!xCT.is())
@@ -74,10 +72,7 @@ public:
     };
 
     virtual void setPropertyValue(
-        const uno::Any& rOutValue, const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const
-            throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-                   lang::IllegalArgumentException, lang::WrappedTargetException,
-                   uno::RuntimeException) override
+        const uno::Any& rOutValue, const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override
     {
         uno::Reference<chart2::XChartType> xCT = getChartType();
         if (!xCT.is())
@@ -91,8 +86,7 @@ public:
         catch ( const uno::Exception& )  {}
     }
 
-    virtual void setPropertyToDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPropState*/ ) const
-        throw (beans::UnknownPropertyException, uno::RuntimeException) override
+    virtual void setPropertyToDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPropState*/ ) const override
     {
         uno::Reference<chart2::XChartType> xCT = getChartType();
         if (!xCT.is())
@@ -106,15 +100,12 @@ public:
         catch ( const uno::Exception& )  {}
     }
 
-    virtual uno::Any getPropertyDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-               uno::RuntimeException) override
+    virtual uno::Any getPropertyDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override
     {
         return maDefault;
     }
 
-    virtual beans::PropertyState getPropertyState( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const
-        throw (beans::UnknownPropertyException, uno::RuntimeException) override
+    virtual beans::PropertyState getPropertyState( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override
     {
         return beans::PropertyState_DIRECT_VALUE;
     }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 68d9681345e9..57fa2a3aa3c2 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -59,7 +59,6 @@ WrappedBarPositionProperty_Base::~WrappedBarPositionProperty_Base()
 }
 
 void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     sal_Int32 nNewValue = 0;
     if( ! (rOuterValue >>= nNewValue) )
@@ -109,7 +108,6 @@ void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue,
 }
 
 Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     if( xDiagram.is() )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
index 27b51f40a9a4..8838ed066d1a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
@@ -39,11 +39,9 @@ public:
             , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
     virtual ~WrappedBarPositionProperty_Base() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
     void setDimensionAndAxisIndex( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 966dead7aad7..0b41f8900c9a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -42,7 +42,6 @@ WrappedNumberFormatProperty::~WrappedNumberFormatProperty()
 }
 
 void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     sal_Int32 nFormat = 0;
     if( ! (rOuterValue >>= nFormat) )
@@ -53,7 +52,6 @@ void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, cons
 }
 
 Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if( !xInnerPropertySet.is() )
     {
@@ -78,7 +76,6 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp
 }
 
 Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return uno::makeAny( sal_Int32( 0 ) );
 }
@@ -93,7 +90,6 @@ WrappedLinkNumberFormatProperty::~WrappedLinkNumberFormatProperty()
 }
 
 void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if( !xInnerPropertySet.is() )
     {
@@ -105,7 +101,6 @@ void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue,
 }
 
 Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if( !xInnerPropertySet.is() )
     {
@@ -117,7 +112,6 @@ Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::X
 }
 
 Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     bool bLink = true;
     return uno::makeAny( bLink );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
index 567e9320c597..296e1fcc7262 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
@@ -37,14 +37,11 @@ public:
     explicit WrappedNumberFormatProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
     virtual ~WrappedNumberFormatProperty() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
     friend class WrappedLinkNumberFormatProperty;
 private:
@@ -57,14 +54,11 @@ public:
     explicit WrappedLinkNumberFormatProperty();
     virtual ~WrappedLinkNumberFormatProperty() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 };
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 2be350b47a0f..bd042609183e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -125,19 +125,16 @@ void WrappedScaleProperty::addWrappedProperties( std::vector< WrappedProperty* >
 }
 
 void WrappedScaleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     setPropertyValue( m_eScaleProperty, rOuterValue, xInnerPropertySet );
 }
 
 Any WrappedScaleProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return getPropertyValue( m_eScaleProperty, xInnerPropertySet );
 }
 
 void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aOuterValue = rOuterValue;
 
@@ -345,7 +342,6 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
 }
 
 Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet( m_aOuterValue );
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
index 164731da68ca..35bd6b30bcf7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
@@ -59,11 +59,9 @@ public:
 
     static void addWrappedProperties( std::vector< WrappedProperty* >& rList, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
 protected: //methods
     /// @throws css::beans::UnknownPropertyException
@@ -71,13 +69,11 @@ protected: //methods
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const;
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const;
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 6d19e2ef31c5..5bdd1404089c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -38,12 +38,9 @@ class WrappedScaleTextProperty : public WrappedProperty
 public:
     explicit WrappedScaleTextProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override;
-    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
-    virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+    virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+    virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
 
 private:
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -56,7 +53,6 @@ WrappedScaleTextProperty::WrappedScaleTextProperty(const std::shared_ptr<Chart2M
 }
 
 void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     static const char aRefSizeName[] = "ReferencePageSize";
 
@@ -87,7 +83,6 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R
 }
 
 Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
     if( xInnerPropertySet.is() )
@@ -102,7 +97,6 @@ Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropert
 }
 
 Any WrappedScaleTextProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     aRet <<= false;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index fb1fa0360d4d..0de7f6d77378 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -50,7 +50,6 @@ WrappedD3DTransformMatrixProperty::~WrappedD3DTransformMatrixProperty()
 }
 
 void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) )
     {
@@ -76,7 +75,6 @@ void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue
 }
 
 Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) )
     {
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
index 36564addd3c2..e587f417296c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
@@ -44,11 +44,9 @@ public:
         const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
     virtual ~WrappedD3DTransformMatrixProperty() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
 private:
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index 14bbb7d4fd5e..e5ba28c44b45 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -109,8 +109,7 @@ public:
             }
         }
     }
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                    throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override
     {
         PROPERTYTYPE aNewValue = PROPERTYTYPE();
         if( ! (rOuterValue >>= aNewValue) )
@@ -134,8 +133,7 @@ public:
         }
     }
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                            throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override
     {
         if( m_ePropertyType == DIAGRAM )
         {
@@ -158,8 +156,7 @@ public:
         }
     }
 
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const
-                            throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const override
     {
         return m_aDefaultValue;
     }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index e7af4fffaf94..9b1d869ee5e7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -93,8 +93,7 @@ public:
         }
         return bHasDetectableInnerValue;
     }
-    void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                    throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+    void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override
     {
         PROPERTYTYPE aNewValue;
         if( ! (rOuterValue >>= aNewValue) )
@@ -131,8 +130,7 @@ public:
         }
     }
 
-    css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                            throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+    css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override
     {
         bool bHasAmbiguousValue = false;
         PROPERTYTYPE aValue;
@@ -143,8 +141,7 @@ public:
         return m_aOuterValue;
     }
 
-    css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                            throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+    css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const override
     {
         return m_aDefaultValue;
     }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 1b95c37d9252..c7f16fe0d61b 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -42,11 +42,9 @@ public:
         , const css::uno::Any& rDefaulValue
         , const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
 
-    void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                    throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                            throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
     virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0;
 
@@ -67,7 +65,6 @@ WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName
 }
 
 void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
 {
     bool bNewValue = false;
     if( ! (rOuterValue >>= bNewValue) )
@@ -104,7 +101,6 @@ void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, c
 }
 
 css::uno::Any WrappedStockProperty::getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
 {
     return m_aDefaultValue;
 }
@@ -114,8 +110,7 @@ class WrappedVolumeProperty : public WrappedStockProperty
 public:
     explicit WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                            throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
     uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override;
 };
@@ -126,7 +121,6 @@ WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelCo
 }
 
 css::uno::Any WrappedVolumeProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
 {
     Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
@@ -181,8 +175,7 @@ class WrappedUpDownProperty : public WrappedStockProperty
 public:
     explicit WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
 
-    css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                            throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
     uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override;
 };
@@ -193,7 +186,6 @@ WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelCo
 }
 
 css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
 {
     Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 1f8a99eff6c5..ba107ea2e72b 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -55,10 +55,8 @@ public:
     virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
     virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const override;
 
-    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                            throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
-    virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException) override;
+    virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+    virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
 
     explicit WrappedSymbolTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
                                        tSeriesOrDiagramPropertyType ePropertyType);
@@ -79,8 +77,7 @@ class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty< awt::Si
 public:
     virtual awt::Size getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
     virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const awt::Size& aNewSize ) const override;
-    virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException) override;
+    virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
 
     explicit WrappedSymbolSizeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
                                        tSeriesOrDiagramPropertyType ePropertyType);
@@ -91,8 +88,7 @@ class WrappedSymbolAndLinesProperty : public WrappedSeriesOrDiagramProperty< boo
 public:
     virtual bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
     virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& bDrawLines ) const override;
-    virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException) override;
+    virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
 
     explicit WrappedSymbolAndLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
                                            tSeriesOrDiagramPropertyType ePropertyType);
@@ -242,7 +238,6 @@ void WrappedSymbolTypeProperty::setValueToSeries( const Reference< beans::XPrope
 }
 
 Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                            throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     //the old chart (< OOo 2.3) needs symbol-type="automatic" at the plot-area if any of the series should be able to have symbols
     if( m_ePropertyType == DIAGRAM )
@@ -274,7 +269,6 @@ Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XProper
 }
 
 beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     //the special situation for this property here is that the diagram default can be
     //different from the normal default and different from all singles series values
@@ -451,7 +445,6 @@ void WrappedSymbolSizeProperty::setValueToSeries(
 }
 
 beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     //only export symbol size if necessary
     if( m_ePropertyType == DIAGRAM )
@@ -511,7 +504,6 @@ void WrappedSymbolAndLinesProperty::setValueToSeries(
 }
 
 beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     //do not export this property anymore, instead use a linestyle none for no lines
     return beans::PropertyState_DEFAULT_VALUE;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index 9d496a3d9886..bd371b35b80e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -37,7 +37,6 @@ WrappedTextRotationProperty::~WrappedTextRotationProperty()
 }
 
 beans::PropertyState WrappedTextRotationProperty::getPropertyState( const uno::Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     if( m_bDirectState )
         return beans::PropertyState_DIRECT_VALUE;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
index 8525d61be525..faf102bb0b6e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
@@ -30,8 +30,7 @@ public:
     explicit WrappedTextRotationProperty( bool bDirectState=false );
     virtual ~WrappedTextRotationProperty() override;
 
-    virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+    virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 protected:
     virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override;
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index b9b82fc0705d..1d434d4f86e6 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -403,7 +403,7 @@ void ChartTypeDialogController::fillExtraControls( const ChartTypeParameter& /*r
                                                   , const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const
 {
 }
-void ChartTypeDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const throw (uno::RuntimeException)
+void ChartTypeDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const
 {
 }
 
@@ -1224,7 +1224,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar
     m_pMF_NumberOfLines->SetLast( nMaxLines );
     m_pMF_NumberOfLines->SetMax( nMaxLines );
 }
-void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& xTemplateProps ) const throw (uno::RuntimeException)
+void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& xTemplateProps ) const
 {
     if( xTemplateProps.is() )
     {
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 39647f97a580..0c40bd95087b 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -112,7 +112,7 @@ public:
                                      , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel
                                      , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const;
     /// @throws css::uno::RuntimeException
-    virtual void    setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException);
+    virtual void    setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const;
 
     bool                isSubType( const OUString& rServiceName );
     ChartTypeParameter  getChartTypeParameterForService( const OUString& rServiceName, const css::uno::Reference<
@@ -278,7 +278,7 @@ public:
                                      , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel
                                      , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const override;
 
-    virtual void    setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException) override;
+    virtual void    setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const override;
 
 private:
     DECL_LINK( ChangeLineCountHdl, Edit&, void );
diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
index a6860d374494..f3ffec17c85b 100644
--- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
@@ -40,21 +40,18 @@ RangeSelectionListener::~RangeSelectionListener()
 
 // ____ XRangeSelectionListener ____
 void SAL_CALL RangeSelectionListener::done( const sheet::RangeSelectionEvent& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aRange = aEvent.RangeDescriptor;
     m_rParent.listeningFinished( m_aRange );
 }
 
 void SAL_CALL RangeSelectionListener::aborted( const sheet::RangeSelectionEvent& /*aEvent*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     m_rParent.listeningFinished( m_aRange );
 }
 
 // ____ XEventListener ____
 void SAL_CALL RangeSelectionListener::disposing( const lang::EventObject& /*Source*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     m_rParent.disposingRangeSelection();
 }
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index fc1384d52e3f..71f5c00bd82a 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -41,16 +41,16 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg()
     }
 }
 // lang::XServiceInfo
-OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ChartTypeUnoDlg::getImplementationName()
 {
     return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME);
 }
 
-css::uno::Sequence<OUString> SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames()
 {
     return { CHART_TYPE_DIALOG_SERVICE_NAME };
 }
-uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception )
+uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -71,7 +71,7 @@ VclPtr<Dialog> ChartTypeUnoDlg::createDialog(vcl::Window* _pParent)
 {
     return VclPtr<ChartTypeDialog>::Create( _pParent, m_xChartModel );
 }
-uno::Reference<beans::XPropertySetInfo>  SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException, std::exception)
+uno::Reference<beans::XPropertySetInfo>  SAL_CALL ChartTypeUnoDlg::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() );
 }
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 065a511ea68d..096fecf0c1e5 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -58,25 +58,22 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg()
 }
 // lang::XServiceInfo
 OUString SAL_CALL CreationWizardUnoDlg::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL CreationWizardUnoDlg::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { CHART_WIZARD_DIALOG_SERVICE_NAME };
 }
 
 // XInterface
-uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType )
 {
     return OComponentHelper::queryInterface( aType );
 }
@@ -88,7 +85,7 @@ void SAL_CALL CreationWizardUnoDlg::release() throw ()
 {
     OComponentHelper::release();
 }
-uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType )
 {
     if (rType == cppu::UnoType<ui::dialogs::XExecutableDialog>::get())
     {
@@ -118,7 +115,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rTyp
     return OComponentHelper::queryAggregation( rType );
 }
 
-uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes()
 {
     static uno::Sequence< uno::Type > aTypeList;
 
@@ -141,28 +138,28 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
     return aTypeList;
 }
 
-uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception )
+uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XTerminateListener
-void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ )
 {
 }
 
-void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ )
 {
     // we are going down, so dispose us!
     dispose();
 }
 
-void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ )
 {
     //Listener should deregister himself and release all references to the closing object.
 }
 
-void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ )
 {
 }
 void CreationWizardUnoDlg::createDialogOnDemand()
@@ -203,7 +200,7 @@ IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void )
         m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog
 }
 
-sal_Int16 SAL_CALL CreationWizardUnoDlg::execute(  ) throw(uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL CreationWizardUnoDlg::execute(  )
 {
     sal_Int16 nRet = RET_CANCEL;
     {
@@ -219,7 +216,7 @@ sal_Int16 SAL_CALL CreationWizardUnoDlg::execute(  ) throw(uno::RuntimeException
     return nRet;
 }
 
-void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments )
 {
     const uno::Any* pArguments = aArguments.getConstArray();
     for(sal_Int32 i=0; i<aArguments.getLength(); ++i, ++pArguments)
@@ -263,7 +260,6 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
 
 //XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
     return nullptr;
@@ -271,8 +267,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getProp
 
 void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyName
                                                      , const uno::Any& rValue )
-    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException
-          , lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( rPropertyName == "Position" )
     {
@@ -307,7 +301,6 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyN
 }
 
 uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if( rPropertyName == "Position" )
@@ -347,25 +340,21 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
 
 void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener(
         const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ )
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener(
     const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index 07416aef68b4..f20c14d3f71e 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -116,7 +116,7 @@ protected:
                 false otherwise
         @throws css::lang::DisposedException
      */
-    bool             CheckDisposeState( bool bThrowException = true ) const throw (css::lang::DisposedException);
+    bool             CheckDisposeState( bool bThrowException = true ) const;
 
     /** Events coming from the core have to be processed in this methods.  The
         default implementation returns false, which indicates that the object is
@@ -137,14 +137,14 @@ protected:
 
         @throws css::uno::RuntimeException
     */
-    void             AddState( sal_Int16 aState ) throw (css::uno::RuntimeException);
+    void             AddState( sal_Int16 aState );
 
     /** Removes a state from the set if the set contains the state, otherwise
         nothing is done.
 
         @throws css::uno::RuntimeException
     */
-    void             RemoveState( sal_Int16 aState ) throw (css::uno::RuntimeException);
+    void             RemoveState( sal_Int16 aState );
 
     /** has to be overridden by derived classes that support child elements.
         With this method a rescan is initiated that should result in a correct
@@ -211,17 +211,14 @@ protected:
         @throws css::uno::RuntimeException
      */
     virtual css::uno::Reference< css::accessibility::XAccessible >
-        ImplGetAccessibleChildById( sal_Int32 i ) const
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException);
+        ImplGetAccessibleChildById( sal_Int32 i ) const;
 
     /** Is called from getAccessibleChildCount(). Before this method is called,
         an update of children is done if necessary.
 
         @throws css::uno::RuntimeException
      */
-    virtual sal_Int32 ImplGetAccessibleChildCount() const
-        throw (css::uno::RuntimeException);
+    virtual sal_Int32 ImplGetAccessibleChildCount() const;
 
     const AccessibleElementInfo& GetInfo() const { return m_aAccInfo;}
     void SetInfo( const AccessibleElementInfo & rNewInfo );
@@ -231,84 +228,58 @@ protected:
     virtual void SAL_CALL disposing() override;
 
     // ________ XAccessible ________
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override;
 
     // ________ XAccessibleContext ________
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleChild( sal_Int32 i )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild( sal_Int32 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent() override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
     /// @return AccessibleRole.SHAPE
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
     // has to be implemented by derived classes
 //     virtual OUString SAL_CALL getAccessibleName()
 //         throw (css::uno::RuntimeException);
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale()
-        throw (css::accessibility::IllegalAccessibleComponentStateException,
-               css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
     // has to be implemented by derived classes
 //     virtual OUString SAL_CALL getAccessibleDescription()
 //         throw (css::uno::RuntimeException);
 
     // ________ XAccessibleComponent ________
     virtual sal_Bool SAL_CALL containsPoint(
-        const css::awt::Point& aPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& aPoint ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleAtPoint( const css::awt::Point& aPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
     // has to be defined in derived classes
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL grabFocus() override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     // ________ 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(
-        const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ________ XEventListener ________
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ________ XAccessibleEventBroadcaster ________
     virtual void SAL_CALL addAccessibleEventListener(
-        const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
     virtual void SAL_CALL removeAccessibleEventListener(
-        const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
 private:
     enum eColorType
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index a82fc8bd64f0..5fce27f6be09 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -73,31 +73,24 @@ public:
     // 4: awt::XWindow representing the view's window (is a vcl Window)
     // all arguments are only valid until next initialization - don't keep them longer
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // ____ view::XSelectionChangeListener ____
-    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) 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;
 
     // ________ XAccessibleContext ________
-    virtual OUString SAL_CALL getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual OUString SAL_CALL getAccessibleName() override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     // ________ XAccessibleComponent ________
-    virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
 protected:
     // ________ AccessibleChartElement ________
diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx
index 27744de6d085..bd12ac349475 100644
--- a/chart2/source/controller/inc/AccessibleTextHelper.hxx
+++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx
@@ -65,34 +65,20 @@ public:
             text currently.
      */
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // ____ XAccessibleContext ____
-    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild(
-        ::sal_Int32 i )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale()
-        throw (css::accessibility::IllegalAccessibleComponentStateException,
-               css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override;
+    virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual ::sal_Int16 SAL_CALL getAccessibleRole() override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
+    virtual OUString SAL_CALL getAccessibleName() override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
 
 private:
     std::unique_ptr<::accessibility::AccessibleTextHelper> m_pTextHelper;
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx
index ab787002a155..24a7e412ab87 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -52,10 +52,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw( css::uno::Exception ) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw( css::uno::Exception ) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     ::std::vector< ItemConverter * >               m_aConverters;
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 82615553a34d..5c21d43c9365 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -46,10 +46,8 @@ public:
 protected:
     virtual const sal_uInt16* GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw (css::uno::Exception) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw (css::uno::Exception) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
     const css::uno::Reference<css::beans::XPropertySet>& GetRefSizePropertySet() const;
 
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index eb2ba8857696..40b31bc6ec00 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -112,225 +112,175 @@ public:
     OUString GetContextName();
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::frame::XController (required interface)
     virtual void SAL_CALL
-        attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) override;
 
     virtual sal_Bool SAL_CALL
-        attachModel( const css::uno::Reference< css::frame::XModel > & xModel )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) override;
 
     virtual css::uno::Reference< css::frame::XFrame > SAL_CALL
-        getFrame()          throw (css::uno::RuntimeException, std::exception) override;
+        getFrame() override;
 
     virtual css::uno::Reference< css::frame::XModel > SAL_CALL
-        getModel()          throw (css::uno::RuntimeException, std::exception) override;
+        getModel() override;
 
     virtual css::uno::Any SAL_CALL
-        getViewData()       throw (css::uno::RuntimeException, std::exception) override;
+        getViewData() override;
 
     virtual void SAL_CALL
-        restoreViewData( const css::uno::Any& rValue )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        restoreViewData( const css::uno::Any& rValue ) override;
 
     virtual sal_Bool SAL_CALL
-        suspend( sal_Bool bSuspend )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        suspend( sal_Bool bSuspend ) override;
 
     // css::lang::XComponent (base of XController)
     virtual void SAL_CALL
-        dispose()           throw (css::uno::RuntimeException, std::exception) override;
+        dispose() override;
 
     virtual void SAL_CALL
-        addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
 
     virtual void SAL_CALL
-        removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
 
     // css::frame::XDispatchProvider (required interface)
     virtual css::uno::Reference< css::frame::XDispatch> SAL_CALL
         queryDispatch( const css::util::URL& rURL
                             , const OUString& rTargetFrameName
-                            , sal_Int32 nSearchFlags)
-                            throw (css::uno::RuntimeException, std::exception) override;
+                            , sal_Int32 nSearchFlags) override;
 
     virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
-        queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor > & xDescripts)
-                            throw (css::uno::RuntimeException, std::exception) override;
+        queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor > & xDescripts) override;
 
     // css::view::XSelectionSupplier (optional interface)
     virtual sal_Bool SAL_CALL
-        select( const css::uno::Any& rSelection )
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception) override;
+        select( const css::uno::Any& rSelection ) override;
 
     virtual css::uno::Any  SAL_CALL
-        getSelection() throw (css::uno::RuntimeException, std::exception) override;
+        getSelection() override;
 
     virtual void SAL_CALL
-        addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) override;
 
     virtual void SAL_CALL
-        removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) override;
 
     // css::ui::XContextMenuInterception (optional interface)
     virtual void SAL_CALL
-        registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor)
-                            throw (css::uno::RuntimeException, std::exception) override;
+        registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) override;
 
     virtual void SAL_CALL
-        releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor)
-                            throw (css::uno::RuntimeException, std::exception) override;
+        releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) override;
 
     //additional interfaces
 
     // css::util::XCloseListener
     virtual void SAL_CALL
         queryClosing( const css::lang::EventObject& Source
-                            , sal_Bool GetsOwnership )
-                            throw (css::util::CloseVetoException
-                                 , css::uno::RuntimeException, std::exception) override;
+                            , sal_Bool GetsOwnership ) override;
 
     virtual void SAL_CALL
-        notifyClosing( const css::lang::EventObject& Source )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        notifyClosing( const css::lang::EventObject& Source ) override;
 
     // css::util::XEventListener (base of XCloseListener and XModifyListener)
     virtual void SAL_CALL
-        disposing( const css::lang::EventObject& Source )
-                            throw (css::uno::RuntimeException, std::exception) override;
+        disposing( const css::lang::EventObject& Source ) override;
 
     // css::frame::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;
+                    , 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 )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                    , const css::util::URL& aURL ) 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;
+                    , const css::util::URL& aURL ) override;
 
     // css::awt::XWindow
     virtual void SAL_CALL
         setPosSize( sal_Int32 X, sal_Int32 Y
-                    , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                    , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
 
     virtual css::awt::Rectangle SAL_CALL
-        getPosSize()
-                    throw (css::uno::RuntimeException, std::exception) override;
+        getPosSize() override;
 
     virtual void SAL_CALL
-        setVisible( sal_Bool Visible )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        setVisible( sal_Bool Visible ) override;
 
     virtual void SAL_CALL
-        setEnable( sal_Bool Enable )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        setEnable( sal_Bool Enable ) override;
 
     virtual void SAL_CALL
-        setFocus()  throw (css::uno::RuntimeException, std::exception) override;
+        setFocus() override;
 
     virtual void SAL_CALL
-        addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
 
     virtual void SAL_CALL
-        removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
 
     virtual void SAL_CALL
-        addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
 
     virtual void SAL_CALL
-        removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
 
     virtual void SAL_CALL
-        addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
 
     virtual void SAL_CALL
-        removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
 
     virtual void SAL_CALL
-        addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
 
     virtual void SAL_CALL
-        removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
 
     virtual void SAL_CALL
-        addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
 
     virtual void SAL_CALL
-        removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
 
     virtual void SAL_CALL
-        addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 
     virtual void SAL_CALL
-        removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener )
-                    throw (css::uno::RuntimeException, std::exception) override;
+        removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 
     // css::lang XMultiServiceFactory
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-        createInstance( const OUString& aServiceSpecifier )
-            throw (css::uno::Exception,
-                   css::uno::RuntimeException, std::exception) override;
+        createInstance( const OUString& aServiceSpecifier ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
         createInstanceWithArguments( const OUString& ServiceSpecifier,
                                      const css::uno::Sequence<
-                                         css::uno::Any >& Arguments )
-            throw (css::uno::Exception,
-                   css::uno::RuntimeException, std::exception) override;
+                                         css::uno::Any >& Arguments ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getAvailableServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        getAvailableServiceNames() override;
 
     // css::util::XModifyListener
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // css::util::XModeChangeListener
     virtual void SAL_CALL modeChanged(
-        const css::util::ModeChangeEvent& _rSource )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        const css::util::ModeChangeEvent& _rSource ) override;
 
     // css::frame::XLayoutManagerListener
     virtual void SAL_CALL layoutEvent(
         const css::lang::EventObject& aSource,
         ::sal_Int16 eLayoutEvent,
-        const css::uno::Any& aInfo )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& aInfo ) override;
 
     // WindowController stuff
     void PrePaint(vcl::RenderContext& rRenderContext);
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 3cf3aa7a8f99..eacf8d011936 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -62,12 +62,9 @@ public:
     virtual ~ChartDocumentWrapper() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     void setAddIn( const css::uno::Reference< css::util::XRefreshable >& xAddIn );
     const css::uno::Reference< css::util::XRefreshable >& getAddIn() const { return m_xAddIn;}
@@ -81,98 +78,65 @@ public:
     css::uno::Reference< css::drawing::XShapes > getAdditionalShapes() const;
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const
-        throw (css::uno::RuntimeException);
+    css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const;
 
 protected:
 
     // ____ chart::XChartDocument ____
-    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getSubTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getLegend()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getArea()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart::XDiagram > SAL_CALL getDiagram()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle() override;
+    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getSubTitle() override;
+    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getLegend() override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getArea() override;
+    virtual css::uno::Reference< css::chart::XDiagram > SAL_CALL getDiagram() override;
     virtual void SAL_CALL setDiagram( const css::uno::Reference<
-                                      css::chart::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart::XChartData > SAL_CALL getData()
-        throw (css::uno::RuntimeException, std::exception) override;
+                                      css::chart::XDiagram >& xDiagram ) override;
+    virtual css::uno::Reference< css::chart::XChartData > SAL_CALL getData() override;
     virtual void SAL_CALL attachData( const css::uno::Reference<
-                                      css::chart::XChartData >& xData )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                      css::chart::XChartData >& xData ) override;
 
     // ____ XModel ____
     virtual sal_Bool SAL_CALL attachResource( const OUString& URL,
-                                              const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getURL()
-        throw (css::uno::RuntimeException, std::exception) override;
+                                              const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
+    virtual OUString SAL_CALL getURL() override;
     virtual css::uno::Sequence<
-        css::beans::PropertyValue > SAL_CALL getArgs()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::PropertyValue > SAL_CALL getArgs() override;
     virtual void SAL_CALL connectController( const css::uno::Reference<
-                                             css::frame::XController >& Controller )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                             css::frame::XController >& Controller ) override;
     virtual void SAL_CALL disconnectController( const css::uno::Reference<
-                                                css::frame::XController >& Controller )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL lockControllers()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unlockControllers()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasControllersLocked()
-        throw (css::uno::RuntimeException, std::exception) override;
+                                                css::frame::XController >& Controller ) override;
+    virtual void SAL_CALL lockControllers() override;
+    virtual void SAL_CALL unlockControllers() override;
+    virtual sal_Bool SAL_CALL hasControllersLocked() override;
     virtual css::uno::Reference<
-        css::frame::XController > SAL_CALL getCurrentController()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::uno::XInterface > SAL_CALL getCurrentSelection()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::frame::XController > SAL_CALL getCurrentController() override;
+    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) override;
+    virtual css::uno::Reference<css::uno::XInterface > SAL_CALL getCurrentSelection() override;
 
     // ____ XComponent ____
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // ____ XInterface (for new interfaces) ____
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     // ____ ::utl::OEventListenerAdapter ____
     virtual void _disposing( const css::lang::EventObject& rSource ) override;
 
     // ____ XDrawPageSupplier ____
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() override;
 
     // ____ XMultiServiceFactory ____
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
-        throw (css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(
                 const OUString& ServiceSpecifier,
-                const css::uno::Sequence< css::uno::Any >& Arguments )
-        throw (css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+                const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
     // ____ XAggregation ____
     virtual void SAL_CALL setDelegator(
-        const css::uno::Reference< css::uno::XInterface >& rDelegator )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::uno::XInterface >& rDelegator ) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
 
     // ____ WrappedPropertySet ____
     virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override;
diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx b/chart2/source/controller/inc/ChartToolbarController.hxx
index 7a11bc5880fa..ad7d45ef5ba7 100644
--- a/chart2/source/controller/inc/ChartToolbarController.hxx
+++ b/chart2/source/controller/inc/ChartToolbarController.hxx
@@ -39,47 +39,35 @@ public:
     const ChartToolbarController& operator=(const ChartToolbarController&) = delete;
 
     // XToolbarContoller
-    virtual void SAL_CALL execute(sal_Int16 nKeyModifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL execute(sal_Int16 nKeyModifier) override;
 
-    virtual void SAL_CALL click()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL click() override;
 
-    virtual void SAL_CALL doubleClick()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL doubleClick() override;
 
-    virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createPopupWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createPopupWindow() override;
 
     virtual css::uno::Reference<css::awt::XWindow> SAL_CALL
-        createItemWindow(const css::uno::Reference<css::awt::XWindow>& rParent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        createItemWindow(const css::uno::Reference<css::awt::XWindow>& rParent) override;
 
     // 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;
+    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;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& rSource)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& rSource) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rAny)
-        throw (css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rAny) override;
 
     // XUpdatable
-    virtual void SAL_CALL update()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL update() override;
 
     using cppu::WeakComponentImplHelperBase::disposing;
 
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index e510748590f7..030a42f65dde 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -63,10 +63,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw (css::uno::Exception) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw (css::uno::Exception) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     ::std::vector< ItemConverter * >    m_aConverters;
diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
index 49491161b937..9c6990c8cfbb 100644
--- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
+++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
@@ -55,10 +55,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw( css::uno::Exception ) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw( css::uno::Exception ) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     std::shared_ptr< ItemConverter >  m_spGraphicConverter;
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 01f8012ef74b..0fafd00d6706 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -54,10 +54,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw (css::uno::Exception, std::exception) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw( css::uno::Exception ) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     eGraphicObjectType              m_eGraphicObjectType;
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 5763318669eb..2ddbab146bc2 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -148,8 +148,7 @@ protected:
 
         @throws css::uno::Exception
      */
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw (css::uno::Exception, std::exception);
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const;
 
     /** for items that can not be mapped directly to a property.
 
@@ -162,8 +161,7 @@ protected:
 
         @throws css::uno::Exception
      */
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw( css::uno::Exception );
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet );
 
     /// Returns the pool
     SfxItemPool & GetItemPool() const { return m_rItemPool;}
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index aa86a2889627..794fd1733cd8 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -51,10 +51,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw( css::uno::Exception ) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw( css::uno::Exception ) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     ::std::vector< ItemConverter * >    m_aConverters;
diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx
index c0b96e63ee10..dcd1d7f6a5a5 100644
--- a/chart2/source/controller/inc/RangeSelectionListener.hxx
+++ b/chart2/source/controller/inc/RangeSelectionListener.hxx
@@ -50,14 +50,11 @@ public:
 
 protected:
     // ____ XRangeSelectionListener ____
-    virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent ) override;
+    virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent ) 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;
 
 private:
     RangeSelectionListenerParent & m_rParent;
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index 66b09a51e97b..c61489a45ee5 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -52,10 +52,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw( css::uno::Exception ) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw( css::uno::Exception ) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     std::shared_ptr< ItemConverter >  m_spGraphicConverter;
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index 78a30541a579..03eaadd967b9 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -51,10 +51,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw( css::uno::Exception ) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw( css::uno::Exception ) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     ::std::vector< ItemConverter * >    m_aConverters;
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index 93550a6f4182..dd313a08de55 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -44,10 +44,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw( css::uno::Exception ) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw( css::uno::Exception ) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     css::uno::Reference< css::frame::XModel >  m_xChartModel;
diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx
index 86fb64566888..25897e34d0e0 100644
--- a/chart2/source/controller/inc/StatisticsItemConverter.hxx
+++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx
@@ -45,10 +45,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw( css::uno::Exception ) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw( css::uno::Exception ) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     css::uno::Reference< css::frame::XModel >  m_xModel;
diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx b/chart2/source/controller/inc/TextLabelItemConverter.hxx
index e89269fda315..3d13cc354f65 100644
--- a/chart2/source/controller/inc/TextLabelItemConverter.hxx
+++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx
@@ -51,10 +51,8 @@ protected:
     virtual const sal_uInt16* GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw (css::uno::Exception) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw (css::uno::Exception) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     std::vector<ItemConverter*> maConverters;
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx
index 6671c57ee4e5..fde086ec12c9 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -47,10 +47,8 @@ protected:
     virtual const sal_uInt16 * GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
-    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-        throw (css::uno::Exception) override;
-    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-        throw (css::uno::Exception) override;
+    virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+    virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
 
 private:
     ::std::vector< ItemConverter * >    m_aConverters;
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 826948c09697..76f7a15d790c 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -44,13 +44,13 @@ private:
     virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // OPropertyArrayUsageHelper
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 2c2684127065..7d08d0e6e502 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -53,44 +53,41 @@ public:
     virtual ~CreationWizardUnoDlg() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XExecutableDialog
-    virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XTerminateListener
-    virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override;
 
-    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;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     DECL_LINK( DialogEventHdl, VclWindowEvent&, void );
 
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 2ad5d630d917..fbb79d052b49 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -160,7 +160,6 @@ bool lcl_hasTimeIntervalValue( const uno::Any& rAny )
 }
 
 void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( uno::Exception )
 {
     if( !m_xAxis.is() )
         return;
@@ -462,7 +461,6 @@ bool lcl_isAutoMinor( const SfxItemSet & rItemSet )
 }
 
 bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     if( !m_xAxis.is() )
         return false;
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index ed16e0a501fa..503a588061dc 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -107,7 +107,6 @@ bool CharacterPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tPr
 
 void CharacterPropertyItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( uno::Exception )
 {
     switch( nWhichId )
     {
@@ -307,7 +306,6 @@ void CharacterPropertyItemConverter::FillSpecialItem(
 
 bool CharacterPropertyItemConverter::ApplySpecialItem(
     sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     bool bChanged = false;
     uno::Any aValue;
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 9f4ce523e8ec..6fc7aef87ba3 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -288,7 +288,6 @@ bool DataPointItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa
 
 bool DataPointItemConverter::ApplySpecialItem(
     sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     bool bChanged = false;
 
@@ -548,7 +547,6 @@ bool DataPointItemConverter::ApplySpecialItem(
 
 void DataPointItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( uno::Exception )
 {
     switch( nWhichId )
     {
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index d5cc3ada524b..d92889b596ad 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -138,7 +138,6 @@ bool ErrorBarItemConverter::GetItemProperty(
 
 bool ErrorBarItemConverter::ApplySpecialItem(
     sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     bool bChanged = false;
 
@@ -331,7 +330,6 @@ bool ErrorBarItemConverter::ApplySpecialItem(
 
 void ErrorBarItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( uno::Exception )
 {
     switch( nWhichId )
     {
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 463269467c9c..dffa2cde9337 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -222,7 +222,6 @@ bool GraphicPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tProp
 
 void GraphicPropertyItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw (uno::Exception, std::exception)
 {
     switch( nWhichId )
     {
@@ -432,7 +431,6 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 
 bool GraphicPropertyItemConverter::ApplySpecialItem(
     sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     bool bChanged = false;
     uno::Any aValue;
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 20746e7b3c1a..c889873d751f 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -152,14 +152,12 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
 
 void ItemConverter::FillSpecialItem(
     sal_uInt16 /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const
-    throw (uno::Exception, std::exception)
 {
     OSL_FAIL( "ItemConverter: Unhandled special item found!" );
 }
 
 bool ItemConverter::ApplySpecialItem(
     sal_uInt16 /*nWhichId*/, const SfxItemSet & /*rItemSet*/ )
-    throw( uno::Exception )
 {
     OSL_FAIL( "ItemConverter: Unhandled special item found!" );
     return false;
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 396d5425a6a6..6a7969639c40 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -95,7 +95,6 @@ bool LegendItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropertyN
 }
 
 bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet& rInItemSet )
-    throw( uno::Exception )
 {
     bool bChanged = false;
 
@@ -166,7 +165,6 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
 
 void LegendItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( uno::Exception )
 {
     switch( nWhichId )
     {
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 773d24e443b2..f946b3b179c9 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -138,7 +138,6 @@ bool RegressionCurveItemConverter::GetItemProperty(
 
 bool RegressionCurveItemConverter::ApplySpecialItem(
     sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     uno::Reference< chart2::XRegressionCurve > xCurve( GetPropertySet(), uno::UNO_QUERY );
     bool bChanged = false;
@@ -254,7 +253,6 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
 }
 
 void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const
-    throw( uno::Exception )
 {
     uno::Reference<chart2::XRegressionCurve> xCurve(GetPropertySet(), uno::UNO_QUERY);
     OSL_ASSERT(xCurve.is());
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 1047923c80dd..1ba39b2ea907 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -110,7 +110,6 @@ bool RegressionEquationItemConverter::GetItemProperty( tWhichIdType nWhichId, tP
 
 bool RegressionEquationItemConverter::ApplySpecialItem(
     sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     bool bChanged = false;
 
@@ -135,7 +134,6 @@ bool RegressionEquationItemConverter::ApplySpecialItem(
 
 void RegressionEquationItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( uno::Exception )
 {
     switch( nWhichId )
     {
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 48ecfda6250e..61efffaeeb1b 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -180,7 +180,6 @@ bool SeriesOptionsItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPr
 }
 
 bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     bool bChanged = false;
     switch( nWhichId )
@@ -359,7 +358,6 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
 
 void SeriesOptionsItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( uno::Exception )
 {
     switch( nWhichId )
     {
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 433b736fba40..15a8aa7c39fc 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -251,7 +251,6 @@ bool StatisticsItemConverter::GetItemProperty(
 
 bool StatisticsItemConverter::ApplySpecialItem(
     sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     bool bChanged = false;
 
@@ -615,7 +614,6 @@ bool StatisticsItemConverter::ApplySpecialItem(
 
 void StatisticsItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( uno::Exception )
 {
     switch( nWhichId )
     {
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index 69251ca802ee..1e7abf646beb 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -251,7 +251,6 @@ bool TextLabelItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa
 }
 
 bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet& rItemSet )
-    throw (uno::Exception)
 {
     bool bChanged = false;
 
@@ -500,7 +499,6 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
 }
 
 void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const
-    throw (uno::Exception)
 {
     switch (nWhichId)
     {
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 91d8e36edf01..79dcffcf1f2e 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -161,7 +161,6 @@ bool TitleItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWi
 
 bool TitleItemConverter::ApplySpecialItem(
     sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
-    throw( uno::Exception )
 {
     bool bChanged = false;
 
@@ -191,7 +190,6 @@ bool TitleItemConverter::ApplySpecialItem(
 
 void TitleItemConverter::FillSpecialItem(
     sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
-    throw( uno::Exception )
 {
     switch( nWhichId )
     {
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 2067180cb258..f9a5d76b7bde 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -341,19 +341,16 @@ bool ChartController::impl_isDisposedOrSuspended() const
 // lang::XServiceInfo
 
 OUString SAL_CALL ChartController::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ChartController::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART_CONTROLLER_SERVICE_NAME,
@@ -393,7 +390,6 @@ uno::Reference<ui::XSidebar> getSidebarFromModel(const uno::Reference<frame::XMo
 
 void SAL_CALL ChartController::attachFrame(
     const uno::Reference<frame::XFrame>& xFrame )
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -508,7 +504,6 @@ void SAL_CALL ChartController::attachFrame(
 
 //XModeChangeListener
 void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     //adjust controller to view status changes
 
@@ -572,7 +567,6 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
 }
 
 sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XModel > & xModel )
-        throw(uno::RuntimeException, std::exception)
 {
     impl_invalidateAccessible();
 
@@ -661,7 +655,6 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
 }
 
 uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame()
-    throw(uno::RuntimeException, std::exception)
 {
     //provides access to owner frame of this controller
     //return the frame containing this controller
@@ -670,7 +663,6 @@ uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame()
 }
 
 uno::Reference< frame::XModel > SAL_CALL ChartController::getModel()
-    throw(uno::RuntimeException, std::exception)
 {
     //provides access to currently attached model
     //returns the currently attached model
@@ -684,7 +676,6 @@ uno::Reference< frame::XModel > SAL_CALL ChartController::getModel()
 }
 
 uno::Any SAL_CALL ChartController::getViewData()
-    throw(uno::RuntimeException, std::exception)
 {
     //provides access to current view status
     //set of data that can be used to restore the current view status at later time
@@ -703,7 +694,6 @@ uno::Any SAL_CALL ChartController::getViewData()
 
 void SAL_CALL ChartController::restoreViewData(
     const uno::Any& /* Value */ )
-        throw(uno::RuntimeException, std::exception)
 {
     //restores the view status using the data gotten from a previous call to XController::getViewData()
 
@@ -715,7 +705,6 @@ void SAL_CALL ChartController::restoreViewData(
 }
 
 sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend )
-    throw(uno::RuntimeException, std::exception)
 {
     //is called to prepare the controller for closing the view
     //bSuspend==true: force the controller to suspend his work
@@ -774,7 +763,6 @@ void ChartController::impl_deleteDrawViewController()
 // XComponent (base of XController)
 
 void SAL_CALL ChartController::dispose()
-    throw(uno::RuntimeException, std::exception)
 {
     m_bDisposed = true;
 
@@ -892,7 +880,6 @@ void SAL_CALL ChartController::dispose()
 
 void SAL_CALL ChartController::addEventListener(
     const uno::Reference<lang::XEventListener>& xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode?
@@ -904,7 +891,6 @@ void SAL_CALL ChartController::addEventListener(
 
 void SAL_CALL ChartController::removeEventListener(
     const uno::Reference<lang::XEventListener>& xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( m_aLifeTimeManager.impl_isDisposed(false) )
@@ -918,7 +904,6 @@ void SAL_CALL ChartController::removeEventListener(
 void SAL_CALL ChartController::queryClosing(
     const lang::EventObject& rSource,
     sal_Bool /*bGetsOwnership*/ )
-        throw(util::CloseVetoException, uno::RuntimeException, std::exception)
 {
     //do not use the m_aControllerMutex here because this call is not allowed to block
 
@@ -938,7 +923,6 @@ void SAL_CALL ChartController::queryClosing(
 
 void SAL_CALL ChartController::notifyClosing(
     const lang::EventObject& rSource )
-        throw(uno::RuntimeException, std::exception)
 {
     //Listener should deregister himself and release all references to the closing object.
 
@@ -990,7 +974,6 @@ bool ChartController::impl_releaseThisModel(
 // util::XEventListener (base of XCloseListener)
 void SAL_CALL ChartController::disposing(
     const lang::EventObject& rSource )
-        throw(uno::RuntimeException, std::exception)
 {
     if( !impl_releaseThisModel( rSource.Source ))
     {
@@ -1003,7 +986,6 @@ void SAL_CALL ChartController::layoutEvent(
     const lang::EventObject& aSource,
     sal_Int16 eLayoutEvent,
     const uno::Any& /* aInfo */ )
-        throw (uno::RuntimeException, std::exception)
 {
     if( eLayoutEvent == frame::LayoutManagerEvents::MERGEDMENUBAR )
     {
@@ -1084,7 +1066,6 @@ uno::Reference<frame::XDispatch> SAL_CALL
         const util::URL& rURL,
         const OUString& rTargetFrameName,
         sal_Int32 /* nSearchFlags */)
-            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1099,7 +1080,6 @@ uno::Reference<frame::XDispatch> SAL_CALL
 uno::Sequence<uno::Reference<frame::XDispatch > >
     ChartController::queryDispatches(
         const uno::Sequence<frame::DispatchDescriptor>& xDescripts )
-            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1115,7 +1095,6 @@ uno::Sequence<uno::Reference<frame::XDispatch > >
 void SAL_CALL ChartController::dispatch(
     const util::URL& rURL,
     const uno::Sequence< beans::PropertyValue >& rArgs )
-        throw (uno::RuntimeException, std::exception)
 {
     OUString aCommand = rURL.Path;
 
@@ -1298,7 +1277,6 @@ void SAL_CALL ChartController::dispatch(
 void SAL_CALL ChartController::addStatusListener(
     const uno::Reference<frame::XStatusListener >& /* xControl */,
     const util::URL& /* aURL */ )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
 }
@@ -1306,7 +1284,6 @@ void SAL_CALL ChartController::addStatusListener(
 void SAL_CALL ChartController::removeStatusListener(
     const uno::Reference<frame::XStatusListener >& /* xControl */,
     const util::URL& /* aURL */ )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
 }
@@ -1314,14 +1291,12 @@ void SAL_CALL ChartController::removeStatusListener(
 // XContextMenuInterception (optional interface)
 void SAL_CALL ChartController::registerContextMenuInterceptor(
     const uno::Reference< ui::XContextMenuInterceptor >& /* xInterceptor */)
-        throw(uno::RuntimeException, std::exception)
 {
     //@todo
 }
 
 void SAL_CALL ChartController::releaseContextMenuInterceptor(
     const uno::Reference< ui::XContextMenuInterceptor > & /* xInterceptor */)
-        throw(uno::RuntimeException, std::exception)
 {
     //@todo
 }
@@ -1392,8 +1367,6 @@ void ChartController::executeDispatch_MoveSeries( bool bForward )
 // ____ XMultiServiceFactory ____
 uno::Reference< uno::XInterface > SAL_CALL
     ChartController::createInstance( const OUString& aServiceSpecifier )
-    throw (uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface > xResult;
 
@@ -1406,7 +1379,6 @@ uno::Reference< uno::XInterface > SAL_CALL
     ChartController::createInstanceWithArguments(
         const OUString& ServiceSpecifier,
         const uno::Sequence< uno::Any >& /* Arguments */ )
-            throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     // ignore Arguments
     return createInstance( ServiceSpecifier );
@@ -1414,7 +1386,6 @@ uno::Reference< uno::XInterface > SAL_CALL
 
 uno::Sequence< OUString > SAL_CALL
     ChartController::getAvailableServiceNames()
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aServiceNames { CHART_ACCESSIBLE_TEXT_SERVICE_NAME };
     return aServiceNames;
@@ -1423,7 +1394,6 @@ uno::Sequence< OUString > SAL_CALL
 // ____ XModifyListener ____
 void SAL_CALL ChartController::modified(
     const lang::EventObject& /* aEvent */ )
-        throw (uno::RuntimeException, std::exception)
 {
     // the source can also be a subobject of the ChartModel
     // @todo: change the source in ChartModel to always be the model itself ?
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 4e7a7912165d..5f37b989d208 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -222,7 +222,6 @@ void SAL_CALL ChartController::setPosSize(
     sal_Int32 Width,
     sal_Int32 Height,
     sal_Int16 Flags )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -270,7 +269,6 @@ void SAL_CALL ChartController::setPosSize(
 }
 
 awt::Rectangle SAL_CALL ChartController::getPosSize()
-    throw (uno::RuntimeException, std::exception)
 {
     //@todo
     awt::Rectangle aRet(0, 0, 0, 0);
@@ -283,7 +281,6 @@ awt::Rectangle SAL_CALL ChartController::getPosSize()
 }
 
 void SAL_CALL ChartController::setVisible( sal_Bool Visible )
-    throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -293,7 +290,6 @@ void SAL_CALL ChartController::setVisible( sal_Bool Visible )
 }
 
 void SAL_CALL ChartController::setEnable( sal_Bool Enable )
-    throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -303,7 +299,6 @@ void SAL_CALL ChartController::setEnable( sal_Bool Enable )
 }
 
 void SAL_CALL ChartController::setFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -314,7 +309,6 @@ void SAL_CALL ChartController::setFocus()
 
 void SAL_CALL ChartController::addWindowListener(
     const uno::Reference< awt::XWindowListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -325,7 +319,6 @@ void SAL_CALL ChartController::addWindowListener(
 
 void SAL_CALL ChartController::removeWindowListener(
     const uno::Reference< awt::XWindowListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -336,7 +329,6 @@ void SAL_CALL ChartController::removeWindowListener(
 
 void SAL_CALL ChartController::addFocusListener(
     const uno::Reference< awt::XFocusListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -347,7 +339,6 @@ void SAL_CALL ChartController::addFocusListener(
 
 void SAL_CALL ChartController::removeFocusListener(
     const uno::Reference< awt::XFocusListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -358,7 +349,6 @@ void SAL_CALL ChartController::removeFocusListener(
 
 void SAL_CALL ChartController::addKeyListener(
     const uno::Reference< awt::XKeyListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -369,7 +359,6 @@ void SAL_CALL ChartController::addKeyListener(
 
 void SAL_CALL ChartController::removeKeyListener(
     const uno::Reference< awt::XKeyListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -380,7 +369,6 @@ void SAL_CALL ChartController::removeKeyListener(
 
 void SAL_CALL ChartController::addMouseListener(
     const uno::Reference< awt::XMouseListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -391,7 +379,6 @@ void SAL_CALL ChartController::addMouseListener(
 
 void SAL_CALL ChartController::removeMouseListener(
     const uno::Reference< awt::XMouseListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -402,7 +389,6 @@ void SAL_CALL ChartController::removeMouseListener(
 
 void SAL_CALL ChartController::addMouseMotionListener(
     const uno::Reference< awt::XMouseMotionListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -413,7 +399,6 @@ void SAL_CALL ChartController::addMouseMotionListener(
 
 void SAL_CALL ChartController::removeMouseMotionListener(
     const uno::Reference< awt::XMouseMotionListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -424,7 +409,6 @@ void SAL_CALL ChartController::removeMouseMotionListener(
 
 void SAL_CALL ChartController::addPaintListener(
     const uno::Reference< awt::XPaintListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -435,7 +419,6 @@ void SAL_CALL ChartController::addPaintListener(
 
 void SAL_CALL ChartController::removePaintListener(
     const uno::Reference< awt::XPaintListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     //@todo
     uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -1560,7 +1543,6 @@ bool ChartController::requestQuickHelp(
 
 // XSelectionSupplier (optional interface)
 sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     bool bSuccess = false;
 
@@ -1612,7 +1594,6 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
 }
 
 uno::Any SAL_CALL ChartController::getSelection()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Any aReturn;
     if ( m_aSelection.hasSelection() )
@@ -1632,7 +1613,6 @@ uno::Any SAL_CALL ChartController::getSelection()
 }
 
 void SAL_CALL ChartController::addSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener> & xListener )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode?
@@ -1643,7 +1623,6 @@ void SAL_CALL ChartController::addSelectionChangeListener( const uno::Reference<
 }
 
 void SAL_CALL ChartController::removeSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener> & xListener )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( impl_isDisposedOrSuspended() ) //@todo? allow removing of listeners in suspend mode?
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index a8d506834150..8d153a1e07fe 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -57,19 +57,16 @@ bool ChartFrameLoader::impl_checkCancel()
 // lang::XServiceInfo
 
 OUString SAL_CALL ChartFrameLoader::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { CHART_FRAMELOADER_SERVICE_NAME };
 }
@@ -77,7 +74,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNam
 // frame::XFrameLoader
 
 sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor, const uno::Reference<frame::XFrame >& xFrame )
-    throw (uno::RuntimeException, std::exception)
 {
     //@todo ? need to add as terminate listener to desktop?
 
@@ -188,7 +184,6 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa
 }
 
 void SAL_CALL ChartFrameLoader::cancel()
-    throw (uno::RuntimeException, std::exception)
 {
     m_oCancelFinished.reset();
     m_bCancelRequired = true;
diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx
index 159375b21d36..a6911dd7710d 100644
--- a/chart2/source/controller/main/ChartFrameloader.hxx
+++ b/chart2/source/controller/main/ChartFrameloader.hxx
@@ -48,22 +48,18 @@ public:
     virtual ~ChartFrameLoader() override;
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::frame::XFrameLoader
 
     virtual sal_Bool SAL_CALL
         load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor
-                ,const css::uno::Reference< css::frame::XFrame >& xFrame )
-                            throw (css::uno::RuntimeException, std::exception) override;
+                ,const css::uno::Reference< css::frame::XFrame >& xFrame ) override;
 
     virtual void SAL_CALL
-        cancel()            throw (css::uno::RuntimeException, std::exception) override;
+        cancel() override;
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 851caa41c6ca..42beadb65f8d 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -75,11 +75,9 @@ void SAL_CALL CommandDispatch::disposing()
 
 // ____ XDispatch ____
 void SAL_CALL CommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ )
-    throw (uno::RuntimeException, std::exception)
 {}
 
 void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL )
-    throw (uno::RuntimeException, std::exception)
 {
     tListenerMap::iterator aIt( m_aListeners.find( URL.Complete ));
     if( aIt == m_aListeners.end())
@@ -95,7 +93,6 @@ void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatu
 }
 
 void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL )
-    throw (uno::RuntimeException, std::exception)
 {
     tListenerMap::iterator aIt( m_aListeners.find( URL.Complete ));
     if( aIt != m_aListeners.end())
@@ -104,14 +101,12 @@ void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XSt
 
 // ____ XModifyListener ____
 void SAL_CALL CommandDispatch::modified( const lang::EventObject& /* aEvent */ )
-    throw (uno::RuntimeException, std::exception)
 {
     fireAllStatusEvents( nullptr );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL CommandDispatch::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {}
 
 void CommandDispatch::fireAllStatusEvents(
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index e4775564ca95..18235c3f8862 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -98,16 +98,13 @@ protected:
     // ____ XDispatch ____
     virtual void SAL_CALL dispatch(
         const css::util::URL& URL,
-        const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
     virtual void SAL_CALL addStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& Control,
-        const css::util::URL& URL )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::util::URL& URL ) override;
     virtual void SAL_CALL removeStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& Control,
-        const css::util::URL& URL )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::util::URL& URL ) override;
 
     // ____ WeakComponentImplHelperBase ____
     /// is called when this is disposed
@@ -115,13 +112,11 @@ protected:
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
 protected:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 4175eb8404b7..ebe2b989e7bb 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -745,7 +745,6 @@ void ControllerCommandDispatch::fireStatusEvent(
 void SAL_CALL ControllerCommandDispatch::dispatch(
     const util::URL& URL,
     const Sequence< beans::PropertyValue >& Arguments )
-    throw (uno::RuntimeException, std::exception)
 {
     if( commandAvailable( URL.Complete ))
         m_xDispatch->dispatch( URL, Arguments );
@@ -762,7 +761,6 @@ void SAL_CALL ControllerCommandDispatch::disposing()
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xChartController.clear();
     m_xDispatch.clear();
@@ -771,7 +769,6 @@ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /*
 
 // ____ XModifyListener ____
 void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bUpdateCommandAvailability = false;
 
@@ -797,7 +794,6 @@ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEve
 
 // ____ XSelectionChangeListener ____
 void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     // Update the "ControllerState" Struct.
     if( m_apControllerState.get() && m_xChartController.is())
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx
index 8afbc619e68f..38d6a8c1e0ed 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.hxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx
@@ -69,8 +69,7 @@ protected:
     // ____ XDispatch ____
     virtual void SAL_CALL dispatch(
         const css::util::URL& URL,
-        const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
     // ____ WeakComponentImplHelperBase ____
     /// is called when this is disposed
@@ -78,8 +77,7 @@ protected:
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     virtual void fireStatusEvent(
         const OUString & rURL,
@@ -87,13 +85,11 @@ protected:
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XSelectionChangeListener ____
     virtual void SAL_CALL selectionChanged(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
 private:
     void fireStatusEventForURLImpl(
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index fc6e3bb2e123..6fe052ea3db0 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -228,7 +228,6 @@ void DrawCommandDispatch::disposing()
 
 // XEventListener
 void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx
index 435e4011edba..7df47171a79e 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.hxx
@@ -47,8 +47,7 @@ protected:
     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;
 
     // state of a feature
     virtual FeatureState getState( const OUString& rCommand ) override;
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 920658d9e6a1..d2499c243c31 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -244,19 +244,16 @@ Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible()
 }
 
 OUString SAL_CALL ElementSelectorToolbarController::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName);
 }
 
 sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.frame.ToolbarController" };
 }
@@ -267,7 +264,7 @@ ElementSelectorToolbarController::~ElementSelectorToolbarController()
 {
 }
 // XInterface
-Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType )
 {
     Any aReturn = ToolboxController::queryInterface(_rType);
     if (!aReturn.hasValue())
@@ -282,7 +279,7 @@ void SAL_CALL ElementSelectorToolbarController::release() throw ()
 {
     ToolboxController::release();
 }
-void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException, std::exception )
+void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent )
 {
     if( m_apSelectorListBox.get() )
     {
@@ -297,7 +294,6 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat
     }
 }
 uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent )
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< awt::XWindow > xItemWindow;
     if( !m_apSelectorListBox.get() )
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index b7dd5708d28f..928b360bc84a 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -73,22 +73,19 @@ public:
     virtual ~ElementSelectorToolbarController() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XInterface
-     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
      virtual void SAL_CALL acquire() throw () override;
      virtual void SAL_CALL release() throw () override;
 
      // XStatusListener
-     virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+     virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
      // XToolbarController
-     virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override;
+     virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
 
 private:
     VclPtr< SelectorListBox > m_apSelectorListBox;
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
index 8d02473ed58e..7e4b17fdd45f 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
@@ -75,7 +75,6 @@ void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL,
 // XDispatch
 void FeatureCommandDispatchBase::dispatch( const util::URL& URL,
     const Sequence< beans::PropertyValue >& Arguments )
-    throw (uno::RuntimeException, std::exception)
 {
     OUString aCommand( URL.Complete );
     if ( getState( aCommand ).bEnabled )
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
index 0d6ed195b710..8dca9c202dca 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
@@ -60,8 +60,7 @@ public:
 protected:
     // XDispatch
     virtual void SAL_CALL dispatch( const css::util::URL& URL,
-        const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
     virtual void fireStatusEvent( const OUString& rURL,
         const css::uno::Reference< css::frame::XStatusListener >& xSingleListener ) override;
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 58b70e6bfecc..478b0a18aa05 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -71,7 +71,6 @@ void ShapeController::disposing()
 
 // XEventListener
 void ShapeController::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx
index 34885a725283..70fcdecf9297 100644
--- a/chart2/source/controller/main/ShapeController.hxx
+++ b/chart2/source/controller/main/ShapeController.hxx
@@ -45,8 +45,7 @@ protected:
     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;
 
     // state of a feature
     virtual FeatureState getState( const OUString& rCommand ) override;
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 3fc479921fba..7b04bb4e4af4 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -89,7 +89,6 @@ void StatusBarCommandDispatch::fireStatusEvent(
 void SAL_CALL StatusBarCommandDispatch::dispatch(
     const util::URL& /* URL */,
     const Sequence< beans::PropertyValue >& /* Arguments */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing to do here
 }
@@ -104,7 +103,6 @@ void SAL_CALL StatusBarCommandDispatch::disposing()
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifiable.clear();
     m_xSelectionSupplier.clear();
@@ -112,7 +110,6 @@ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* S
 
 // ____ XModifyListener ____
 void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_xModifiable.is())
         m_bIsModified = m_xModifiable->isModified();
@@ -122,7 +119,6 @@ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEven
 
 // ____ XSelectionChangeListener ____
 void SAL_CALL StatusBarCommandDispatch::selectionChanged( const lang::EventObject& /* aEvent */ )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_xSelectionSupplier.is())
         m_aSelectedOID = ObjectIdentifier( m_xSelectionSupplier->getSelection() );
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
index 87537d902e98..137b8c27142b 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
@@ -58,8 +58,7 @@ protected:
     // ____ XDispatch ____
     virtual void SAL_CALL dispatch(
         const css::util::URL& URL,
-        const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
     // ____ WeakComponentImplHelperBase ____
     /// is called when this is disposed
@@ -67,13 +66,11 @@ protected:
 
     // ____ XModifyListener (override from CommandDispatch) ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     virtual void fireStatusEvent(
         const OUString & rURL,
@@ -81,8 +78,7 @@ protected:
 
     // ____ XSelectionChangeListener ____
     virtual void SAL_CALL selectionChanged(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
 private:
     css::uno::Reference< css::util::XModifiable > m_xModifiable;
diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx
index 072804b7eea2..54b1e9019903 100644
--- a/chart2/source/controller/main/ToolbarController.cxx
+++ b/chart2/source/controller/main/ToolbarController.cxx
@@ -44,12 +44,10 @@ ChartToolbarController::~ChartToolbarController()
 }
 
 void ChartToolbarController::execute(sal_Int16 /*nKeyModifier*/)
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void ChartToolbarController::click()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference<css::frame::XFrame> xActiveFrame = mxFramesSupplier->getActiveFrame();
     if (!xActiveFrame.is())
@@ -69,61 +67,51 @@ void ChartToolbarController::click()
 }
 
 void ChartToolbarController::doubleClick()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("chart2", "double clicked");
 }
 
 
 css::uno::Reference<css::awt::XWindow> ChartToolbarController::createPopupWindow()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Reference<css::awt::XWindow>();
 }
 
 css::uno::Reference<css::awt::XWindow> ChartToolbarController::createItemWindow(
         const css::uno::Reference<css::awt::XWindow>& /*rParent*/)
-        throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Reference<css::awt::XWindow>();
 }
 
 void ChartToolbarController::statusChanged(const css::frame::FeatureStateEvent& /*rEvent*/)
-        throw (css::uno::RuntimeException, std::exception)
 {
 
 }
 
 void ChartToolbarController::disposing(const css::lang::EventObject& /*rSource*/)
-        throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void ChartToolbarController::initialize(const css::uno::Sequence<css::uno::Any>& /*rAny*/)
-    throw (css::uno::Exception, std::exception)
 {
 }
 
 void ChartToolbarController::update()
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 
 OUString ChartToolbarController::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.chart2.Chart2ToolboxController");
 }
 
 sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> ChartToolbarController::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.frame.ToolbarController" };
 }
diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx
index dd02fb4232b8..1c7f9cc8bc70 100644
--- a/chart2/source/controller/main/UndoActions.cxx
+++ b/chart2/source/controller/main/UndoActions.cxx
@@ -64,7 +64,7 @@ void SAL_CALL UndoElement::disposing()
     m_xDocumentModel.clear();
 }
 
-OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException, std::exception)
+OUString SAL_CALL UndoElement::getTitle()
 {
     return m_sActionString;
 }
@@ -79,12 +79,12 @@ void UndoElement::impl_toggleModelState()
     m_pModelClone = pNewClone;
 }
 
-void SAL_CALL UndoElement::undo(  ) throw (UndoFailedException, RuntimeException, std::exception)
+void SAL_CALL UndoElement::undo(  )
 {
     impl_toggleModelState();
 }
 
-void SAL_CALL UndoElement::redo(  ) throw (UndoFailedException, RuntimeException, std::exception)
+void SAL_CALL UndoElement::redo(  )
 {
     impl_toggleModelState();
 }
@@ -102,21 +102,21 @@ ShapeUndoElement::~ShapeUndoElement()
 {
 }
 
-OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException, std::exception)
+OUString SAL_CALL ShapeUndoElement::getTitle()
 {
     if ( !m_pAction )
         throw DisposedException( OUString(), *this );
     return m_pAction->GetComment();
 }
 
-void SAL_CALL ShapeUndoElement::undo(  ) throw (UndoFailedException, RuntimeException, std::exception)
+void SAL_CALL ShapeUndoElement::undo(  )
 {
     if ( !m_pAction )
         throw DisposedException( OUString(), *this );
     m_pAction->Undo();
 }
 
-void SAL_CALL ShapeUndoElement::redo(  ) throw (UndoFailedException, RuntimeException, std::exception)
+void SAL_CALL ShapeUndoElement::redo(  )
 {
     if ( !m_pAction )
         throw DisposedException( OUString(), *this );
diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx
index ce63b94ea7da..f1ecf3ee131a 100644
--- a/chart2/source/controller/main/UndoActions.hxx
+++ b/chart2/source/controller/main/UndoActions.hxx
@@ -66,9 +66,9 @@ public:
     const UndoElement& operator=(const UndoElement&) = delete;
 
     // XUndoAction
-    virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL undo(  ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL redo(  ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getTitle() override;
+    virtual void SAL_CALL undo(  ) override;
+    virtual void SAL_CALL redo(  ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
@@ -94,9 +94,9 @@ public:
     explicit ShapeUndoElement( SdrUndoAction& i_sdrUndoAction );
 
     // XUndoAction
-    virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL undo(  ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL redo(  ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getTitle() override;
+    virtual void SAL_CALL undo(  ) override;
+    virtual void SAL_CALL redo(  ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index f170d04778ea..b7466c95c96a 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -83,7 +83,6 @@ void UndoCommandDispatch::fireStatusEvent(
 void SAL_CALL UndoCommandDispatch::dispatch(
     const util::URL& URL,
     const Sequence< beans::PropertyValue >& /* Arguments */ )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_xUndoManager.is() )
     {
@@ -125,7 +124,6 @@ void SAL_CALL UndoCommandDispatch::disposing()
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL UndoCommandDispatch::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xUndoManager.clear();
     m_xModel.clear();
diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx
index 603e493720fe..db6e299c0efd 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.hxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.hxx
@@ -44,8 +44,7 @@ protected:
     // ____ XDispatch ____
     virtual void SAL_CALL dispatch(
         const css::util::URL& URL,
-        const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
     // ____ WeakComponentImplHelperBase ____
     /// is called when this is disposed
@@ -53,8 +52,7 @@ protected:
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     virtual void fireStatusEvent(
         const OUString & rURL,
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index 1da8c639343e..18f327557fec 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -54,10 +54,6 @@ ChartPanelFactory::~ChartPanelFactory()
 Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement (
     const ::rtl::OUString& rsResourceURL,
     const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-    throw(
-        css::container::NoSuchElementException,
-        css::lang::IllegalArgumentException,
-        RuntimeException, std::exception)
 {
     Reference<css::ui::XUIElement> xElement;
 
@@ -125,19 +121,16 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement (
 }
 
 OUString ChartPanelFactory::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.chart2.sidebar.ChartPanelFactory");
 }
 
 sal_Bool ChartPanelFactory::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> ChartPanelFactory::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.ui.UIElementFactory" };
 }
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
index 6fe6b4afc209..14570c143a88 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
@@ -46,20 +46,13 @@ public:
     // XUIElementFactory
     virtual css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
         const ::rtl::OUString& rsResourceURL,
-        const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-        throw(
-            css::container::NoSuchElementException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception ) override;
+        const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) 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;
 };
 
 } } // end of namespace sc::sidebar
diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx
index fdf2dc14a460..b000e55c5aa6 100644
--- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx
+++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx
@@ -26,13 +26,11 @@ ChartSidebarModifyListener::~ChartSidebarModifyListener()
 }
 
 void ChartSidebarModifyListener::modified(const css::lang::EventObject& /*rEvent*/)
-        throw (::css::uno::RuntimeException, ::std::exception)
 {
     mpParent->updateData();
 }
 
 void ChartSidebarModifyListener::disposing(const css::lang::EventObject& /*rEvent*/)
-        throw (::css::uno::RuntimeException, ::std::exception)
 {
     mpParent->modelInvalid();
 }
diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
index 69b71d6157de..9efe382e2761 100644
--- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
+++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
@@ -33,11 +33,9 @@ public:
     explicit ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent);
     virtual ~ChartSidebarModifyListener() override;
 
-    virtual void SAL_CALL modified(const css::lang::EventObject& rEvent)
-        throw (::css::uno::RuntimeException, ::std::exception) override;
+    virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) override;
 
-    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;
 
 private:
     ChartSidebarModifyListenerParent* mpParent;
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
index 30a2e63bfccc..c94490f1dc1b 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
@@ -40,7 +40,6 @@ ChartSidebarSelectionListener::~ChartSidebarSelectionListener()
 }
 
 void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObject& rEvent)
-        throw (::css::uno::RuntimeException, ::std::exception)
 {
     bool bCorrectObjectSelected = false;
 
@@ -66,7 +65,6 @@ void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObjec
 }
 
 void ChartSidebarSelectionListener::disposing(const css::lang::EventObject& /*rEvent*/)
-        throw (::css::uno::RuntimeException, ::std::exception)
 {
     mpParent->SelectionInvalid();
 }
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
index 85df72231369..bf3bdbd2558a 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
@@ -40,11 +40,9 @@ public:
     ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent, ObjectType eType);
     virtual ~ChartSidebarSelectionListener() override;
 
-    virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent)
-        throw (::css::uno::RuntimeException, ::std::exception) override;
+    virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) override;
 
-    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;
 
     void setAcceptedTypes(const std::vector<ObjectType>& aTypes);
 
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 2cbe9c6bd048..2e4c6359550e 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -82,12 +82,9 @@ public:
     virtual ~CachedDataSequence() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
     DECLARE_XINTERFACE()
@@ -97,48 +94,38 @@ public:
 protected:
     // ____ XPropertySet ____
     /// @see css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
     /// @see ::comphelper::OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     /// @see ::comphelper::OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
 
     // ____ XDataSequence ____
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSourceRangeRepresentation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override;
+    virtual OUString SAL_CALL getSourceRangeRepresentation() override;
     virtual css::uno::Sequence< OUString > SAL_CALL generateLabel(
-        css::chart2::data::LabelOrigin nLabelOrigin )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        css::chart2::data::LabelOrigin nLabelOrigin ) override;
+    virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override;
 
     // ____ XNumericalDataSequence ____
     /// @see css::chart::data::XNumericalDataSequence
-    virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override;
 
     // ____ XTextualDataSequence ____
     /// @see css::chart::data::XTextualDataSequence
-    virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments)
-        throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
 
     // <properties>
     sal_Int32                                       m_nNumberFormatKey;
diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx
index a8feeb12b8a9..7fd695242bd4 100644
--- a/chart2/source/inc/ConfigColorScheme.hxx
+++ b/chart2/source/inc/ConfigColorScheme.hxx
@@ -49,20 +49,16 @@ public:
     virtual ~ConfigColorScheme() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ ConfigItemListener ____
     void notify( const OUString & rPropertyName );
 
 protected:
     // ____ XColorScheme ____
-    virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) override;
 
 private:
     void retrieveConfigColors();
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index f0d6eb851157..87fcd5693606 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -43,22 +43,17 @@ public:
     virtual ~DataSource() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     // ____ XDataSource ____
     virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL
-        getDataSequences()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getDataSequences() override;
 
     // ____ XDataSink ____
-    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override;
 
 private:
     css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 565e93d94af2..1436d436dd5f 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -83,72 +83,52 @@ public:
     virtual ~ErrorBar() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName )
-        throw (css::beans::UnknownPropertyException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(
-            const css::uno::Sequence< OUString >& rPropNames )
-        throw (css::beans::UnknownPropertyException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName )
-        throw (css::beans::UnknownPropertyException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName )
-        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
+            const css::uno::Sequence< OUString >& rPropNames ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) override;
 
 protected:
     ErrorBar( const ErrorBar & rOther );
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ XDataSink ____
-    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override;
 
     // ____ XDataSource ____
-    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override;
 
 private:
     typedef ::std::vector< css::uno::Reference<
diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
index f6400b090329..ba08bb13dfd1 100644
--- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
@@ -39,12 +39,9 @@ private:
     // ____ XRegressionCurveCalculator ____
     virtual void SAL_CALL recalculateRegression(
         const css::uno::Sequence<double>& aXValues,
-        const css::uno::Sequence<double>& aYValues )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<double>& aYValues ) override;
 
-    virtual double SAL_CALL getCurveValue( double x )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getCurveValue( double x ) override;
 
     virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
         double min,
@@ -52,9 +49,7 @@ private:
         sal_Int32 nPointCount,
         const css::uno::Reference<css::chart2::XScaling>& xScalingX,
         const css::uno::Reference<css::chart2::XScaling>& xScalingY,
-        sal_Bool bMaySkipPointsInCalculation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        sal_Bool bMaySkipPointsInCalculation ) override;
 
     // formula is: f(x) = m_fSign * exp(m_fLogIntercept) * exp( m_fLogSlope * x )
     // mathematical model f(x) = Intercept * Slope^x
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index 5142ef7ac6ce..183228250df4 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -80,143 +80,99 @@ public:
     virtual ~InternalDataProvider() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XInternalDataProvider ____
-    virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) override;
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL
-        getDataByRangeRepresentation( const OUString& aRange )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getDataByRangeRepresentation( const OUString& aRange ) override;
     virtual void SAL_CALL setDataByRangeRepresentation(
         const OUString& aRange,
-        const css::uno::Sequence< css::uno::Any >& aNewData )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL appendSequence()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aNewData ) override;
+    virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) override;
+    virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) override;
+    virtual void SAL_CALL appendSequence() override;
+    virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) override;
+    virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) override;
+    virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) override;
+    virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) override;
+    virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) override;
     virtual void SAL_CALL registerDataSequenceForChanges(
-        const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq ) override;
 
     // ____ XDataProvider (base of XInternalDataProvider) ____
     virtual sal_Bool SAL_CALL createDataSourcePossible(
-        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
     virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource(
-        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments(
-        const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) override;
     virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(
-        const OUString& aRangeRepresentation )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& aRangeRepresentation ) override;
     virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(
-        const OUString& aRangeRepresentation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& aRangeRepresentation ) override;
 
     virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL
-        createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) override;
 
-    virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() override;
 
     // ____ XRangeXMLConversion ____
     virtual OUString SAL_CALL convertRangeToXML(
-        const OUString& aRangeRepresentation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& aRangeRepresentation ) override;
     virtual OUString SAL_CALL convertRangeFromXML(
-        const OUString& aXMLRange )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& aXMLRange ) override;
 
     // ____ XDateCategories ____
-    virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override;
+    virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override;
 
     // ____ XAnyDescriptionAccess ____
     virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
-        getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+        getAnyRowDescriptions() override;
     virtual void SAL_CALL setAnyRowDescriptions(
-        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) override;
     virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
-        getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+        getAnyColumnDescriptions() override;
     virtual void SAL_CALL setAnyColumnDescriptions(
-        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) override;
 
     // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
     virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
-        getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+        getComplexRowDescriptions() override;
     virtual void SAL_CALL setComplexRowDescriptions(
-        const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override;
     virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
-        getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+        getComplexColumnDescriptions() override;
     virtual void SAL_CALL setComplexColumnDescriptions(
-        const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override;
 
     // ____ XChartDataArray (base of XComplexDescriptionAccess) ____
-    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override;
     virtual void SAL_CALL setData(
-        const css::uno::Sequence< css::uno::Sequence< double > >& aData )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override;
     virtual void SAL_CALL setRowDescriptions(
-        const css::uno::Sequence< OUString >& aRowDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< OUString >& aRowDescriptions ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override;
     virtual void SAL_CALL setColumnDescriptions(
-        const css::uno::Sequence< OUString >& aColumnDescriptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< OUString >& aColumnDescriptions ) override;
 
     // ____ XChartData (base of XChartDataArray) ____
     virtual void SAL_CALL addChartDataChangeEventListener(
-        const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
     virtual void SAL_CALL removeChartDataChangeEventListener(
-        const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getNotANumber()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual double SAL_CALL getNotANumber() override;
     virtual sal_Bool SAL_CALL isNotANumber(
-        double nNumber )
-        throw (css::uno::RuntimeException, std::exception) override;
+        double nNumber ) override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments)
-        throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
 
 private:
     void addDataSequenceToMap(
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index b36ba3298c3c..948b38898a0d 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -55,37 +55,27 @@ public:
     virtual ~LabeledDataSequence() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     // ____ XLabeledDataSequence ____
-    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues() override;
     virtual void SAL_CALL setValues(
-        const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel() override;
     virtual void SAL_CALL setLabel(
-        const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
 private:
     css::uno::Reference< css::chart2::data::XDataSequence > m_xData;
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index ba652671103f..c3a648d26819 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -44,7 +44,7 @@ public:
 
     bool        impl_isDisposed( bool bAssert=true );
     /// @throws css::uno::RuntimeException
-    bool    dispose() throw(css::uno::RuntimeException);
+    bool    dispose();
 
 public:
     ::cppu::OMultiTypeInterfaceContainerHelper      m_aListenerContainer;
@@ -91,16 +91,13 @@ OOO_DLLPUBLIC_CHARTTOOLS    virtual ~CloseableLifeTimeManager() override;
 
 OOO_DLLPUBLIC_CHARTTOOLS    bool        impl_isDisposedOrClosed( bool bAssert=true );
 /// @throws css::uno::Exception
-OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_startTryClose(bool bDeliverOwnership)
-                    throw ( css::uno::Exception );
+OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_startTryClose(bool bDeliverOwnership);
 /// @throws css::util::CloseVetoException
-OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex )
-                    throw ( css::util::CloseVetoException );
+OOO_DLLPUBLIC_CHARTTOOLS    bool    g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex );
 OOO_DLLPUBLIC_CHARTTOOLS    void        g_close_endTryClose(bool bDeliverOwnership, bool bMyVeto );
 OOO_DLLPUBLIC_CHARTTOOLS    void        g_close_endTryClose_doClose();
 /// @throws css::uno::RuntimeException
-OOO_DLLPUBLIC_CHARTTOOLS    void    g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener )
-                    throw(css::uno::RuntimeException);
+OOO_DLLPUBLIC_CHARTTOOLS    void    g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener );
 
 protected:
     virtual bool    impl_canStartApiCall() override;
diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
index df36c2d72d8d..11d323887b98 100644
--- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
@@ -36,8 +36,7 @@ private:
         sal_Int32 aDegree,
         sal_Bool  aForceIntercept,
         double    aInterceptValue,
-        sal_Int32 aPeriod)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Int32 aPeriod) override;
 
     virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
         double min,
@@ -45,9 +44,7 @@ private:
         sal_Int32 nPointCount,
         const css::uno::Reference<css::chart2::XScaling>& xScalingX,
         const css::uno::Reference<css::chart2::XScaling>& xScalingY,
-        sal_Bool bMaySkipPointsInCalculation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        sal_Bool bMaySkipPointsInCalculation ) override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
index ec16964566aa..522756afe139 100644
--- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
@@ -39,12 +39,9 @@ private:
     // ____ XRegressionCurveCalculator ____
     virtual void SAL_CALL recalculateRegression(
         const css::uno::Sequence<double>& aXValues,
-        const css::uno::Sequence<double>& aYValues )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<double>& aYValues ) override;
 
-    virtual double SAL_CALL getCurveValue( double x )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getCurveValue( double x ) override;
 
     virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
         double min,
@@ -52,9 +49,7 @@ private:
         sal_Int32 nPointCount,
         const css::uno::Reference<css::chart2::XScaling>& xScalingX,
         const css::uno::Reference<css::chart2::XScaling>& xScalingY,
-        sal_Bool bMaySkipPointsInCalculation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        sal_Bool bMaySkipPointsInCalculation ) override;
 
     // formula is: f(x) = m_fSlope * log( x ) + m_fIntercept
     double m_fSlope;
diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
index 4ccc817b4033..7c947bec4d8c 100644
--- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
@@ -39,12 +39,9 @@ private:
     // ____ XRegressionCurveCalculator ____
     virtual void SAL_CALL recalculateRegression(
         const css::uno::Sequence<double>& aXValues,
-        const css::uno::Sequence<double>& aYValues )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<double>& aYValues ) override;
 
-    virtual double SAL_CALL getCurveValue( double x )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getCurveValue( double x ) override;
 
     virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
         double min,
@@ -52,9 +49,7 @@ private:
         sal_Int32 nPointCount,
         const css::uno::Reference<css::chart2::XScaling>& xScalingX,
         const css::uno::Reference<css::chart2::XScaling>& xScalingY,
-        sal_Bool bMaySkipPointsInCalculation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        sal_Bool bMaySkipPointsInCalculation ) override;
 
     // formula is: f(x) = m_fMeanValue
     double m_fMeanValue;
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index 5f167233da00..d26bb258839c 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -67,21 +67,17 @@ public:
 protected:
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ WeakComponentImplHelperBase ____
     virtual void SAL_CALL disposing() override;
diff --git a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
index a43635a9cc06..fb6185098193 100644
--- a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
@@ -40,12 +40,9 @@ private:
     // ____ XRegressionCurveCalculator ____
     virtual void SAL_CALL recalculateRegression(
         const css::uno::Sequence<double>& aXValues,
-        const css::uno::Sequence<double>& aYValues )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<double>& aYValues ) override;
 
-    virtual double SAL_CALL getCurveValue( double x )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getCurveValue( double x ) override;
 
     virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
         double min,
@@ -53,9 +50,7 @@ private:
         sal_Int32 nPointCount,
         const css::uno::Reference<css::chart2::XScaling>& xScalingX,
         const css::uno::Reference<css::chart2::XScaling>& xScalingY,
-        sal_Bool bMaySkipPointsInCalculation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        sal_Bool bMaySkipPointsInCalculation ) override;
 
     std::vector<double> aYList;
     std::vector<double> aXList;
diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx
index 91c3a9970a33..268255bfc7c0 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -53,28 +53,28 @@ public:
     virtual ~NameContainer() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const  OUString& aName, const  css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const  OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const  OUString& aName, const  css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const  OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const  OUString& aName, const  css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const  OUString& aName, const  css::uno::Any& aElement ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const  OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<  OUString > SAL_CALL getElementNames(  ) throw( css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const  OUString& aName ) override;
+    virtual css::uno::Sequence<  OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) override;
 
     // XElementAccess
-    virtual sal_Bool SAL_CALL hasElements(  ) throw( css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
 private: //member
     const css::uno::Type           m_aType;
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 0d0f5fa02157..fd5ad5632366 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -68,9 +68,7 @@ protected:
         @throws css::beans::UnknownPropertyException
         @throws css::uno::RuntimeException
      */
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException) = 0;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const = 0;
 
     /** The InfoHelper table contains all property names and types of
         this object.
@@ -110,8 +108,7 @@ protected:
         ( css::uno::Any & rConvertedValue,
           css::uno::Any & rOldValue,
           sal_Int32 nHandle,
-          const css::uno::Any& rValue )
-        throw (css::lang::IllegalArgumentException) override;
+          const css::uno::Any& rValue ) override;
 
     /** The same as setFastProperyValue; nHandle is always valid.
         The changes must not be broadcasted in this method.
@@ -132,8 +129,7 @@ protected:
     */
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast
         ( sal_Int32 nHandle,
-          const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+          const css::uno::Any& rValue ) override;
 
     /**
        The same as getFastProperyValue, but return the value through rValue and
@@ -156,68 +152,45 @@ protected:
     // Interfaces
 
     // ____ XInterface ____
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     // ____ XTypeProvider ____
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
     // ____ XPropertyState ____
     virtual css::beans::PropertyState SAL_CALL
-        getPropertyState( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        getPropertyState( const OUString& PropertyName ) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
-        getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
     virtual void SAL_CALL
-        setPropertyToDefault( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        setPropertyToDefault( const OUString& PropertyName ) override;
     virtual css::uno::Any SAL_CALL
-        getPropertyDefault( const OUString& aPropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        getPropertyDefault( const OUString& aPropertyName ) override;
 
     // ____ XMultiPropertyStates ____
     // Note: getPropertyStates() is already implemented in XPropertyState with the
     // same signature
     virtual void SAL_CALL
-        setAllPropertiesToDefault()
-        throw (css::uno::RuntimeException, std::exception) override;
+        setAllPropertiesToDefault() override;
     virtual void SAL_CALL
-        setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL
-        getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     // ____ XStyleSupplier ____
-    virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle() override;
+    virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle ) override;
 
     // ____ XMultiPropertySet ____
     virtual void SAL_CALL setPropertyValues(
         const css::uno::Sequence< OUString >& PropertyNames,
-        const css::uno::Sequence< css::uno::Any >& Values )
-        throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& Values ) override;
 
     // ____ XFastPropertySet ____
-    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     // Note: it is assumed that the base class implements setPropertyValue by
     // using setFastPropertyValue
diff --git a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
index a6e08c6115f7..6037fc742a78 100644
--- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
@@ -36,16 +36,13 @@ protected:
         const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter,
         sal_Int32 nNumberFormatKey, sal_Int32* pFormulaMaxWidth = nullptr ) const override;
 
-    virtual double SAL_CALL getCurveValue( double x )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getCurveValue( double x ) override;
 
 private:
     // ____ XRegressionCurveCalculator ____
     virtual void SAL_CALL recalculateRegression(
         const css::uno::Sequence<double>& aXValues,
-        const css::uno::Sequence<double>& aYValues )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<double>& aYValues ) override;
 
     std::vector<double> mCoefficients;
 };
diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
index 7a890617ca2a..06cdc5080316 100644
--- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
@@ -40,12 +40,9 @@ private:
     // ____ XRegressionCurveCalculator ____
     virtual void SAL_CALL recalculateRegression(
         const css::uno::Sequence<double>& aXValues,
-        const css::uno::Sequence<double>& aYValues )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<double>& aYValues ) override;
 
-    virtual double SAL_CALL getCurveValue( double x )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getCurveValue( double x ) override;
 
     virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
         double min,
@@ -53,9 +50,7 @@ private:
         sal_Int32 nPointCount,
         const css::uno::Reference<css::chart2::XScaling>& xScalingX,
         const css::uno::Reference<css::chart2::XScaling>& xScalingY,
-        sal_Bool bMaySkipPointsInCalculation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        sal_Bool bMaySkipPointsInCalculation ) override;
 
     // formula is: f(x) = x ^ m_fSlope * m_fSign * m_fIntercept
     double m_fSlope;
diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx
index a7b67169fab8..01f408116bc8 100644
--- a/chart2/source/inc/RangeHighlighter.hxx
+++ b/chart2/source/inc/RangeHighlighter.hxx
@@ -55,24 +55,19 @@ public:
 
 protected:
     // ____ XRangeHighlighter ____
-    virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() override;
     virtual void SAL_CALL addSelectionChangeListener(
-        const css::uno::Reference< css::view::XSelectionChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
     virtual void SAL_CALL removeSelectionChangeListener(
-        const css::uno::Reference< css::view::XSelectionChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
     // ____ XSelectionChangeListener ____
     virtual void SAL_CALL selectionChanged(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XSelectionChangeListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ WeakComponentImplHelperBase ____
     // is called when dispose() is called at this component
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx
index ff063c8a8c96..aeab66d280fa 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -67,17 +67,13 @@ protected:
         sal_Int32 aDegree,
         sal_Bool  aForceIntercept,
         double    aInterceptValue,
-        sal_Int32 aPeriod)
-            throw (css::uno::RuntimeException, std::exception) override;
+        sal_Int32 aPeriod) override;
 
     virtual void SAL_CALL recalculateRegression(
         const css::uno::Sequence< double >& aXValues,
-        const css::uno::Sequence< double >& aYValues )
-        throw (css::uno::RuntimeException, std::exception) override = 0;
+        const css::uno::Sequence< double >& aYValues ) override = 0;
 
-    virtual double SAL_CALL getCurveValue( double x )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override = 0;
+    virtual double SAL_CALL getCurveValue( double x ) override = 0;
 
     virtual css::uno::Sequence< css::geometry::RealPoint2D > SAL_CALL getCurveValues(
         double min,
@@ -85,24 +81,18 @@ protected:
         sal_Int32 nPointCount,
         const css::uno::Reference< css::chart2::XScaling >& xScalingX,
         const css::uno::Reference< css::chart2::XScaling >& xScalingY,
-        sal_Bool bMaySkipPointsInCalculation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        sal_Bool bMaySkipPointsInCalculation ) override;
 
-    virtual double SAL_CALL getCorrelationCoefficient()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getCorrelationCoefficient() override;
 
-    virtual OUString SAL_CALL getRepresentation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getRepresentation() override;
 
     virtual OUString SAL_CALL getFormattedRepresentation(
         const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumFmtSupplier,
-        sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) override;
 
     virtual void SAL_CALL setXYNames(
-        const OUString& aXName, const OUString& aYName )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& aXName, const OUString& aYName ) override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index 3b1b4ef14b05..b04d48bc1d4c 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -45,24 +45,19 @@ public:
     virtual ~LogarithmicScaling() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XScaling ____
-    virtual double SAL_CALL doScaling( double value )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL doScaling( double value ) override;
 
     virtual css::uno::Reference<
         css::chart2::XScaling > SAL_CALL
-        getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+        getInverseScaling() override;
 
     // ____ XServiceName ____
-    virtual OUString SAL_CALL getServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
 private:
     const double m_fBase;
@@ -83,24 +78,19 @@ public:
     virtual ~ExponentialScaling() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XScaling ____
     virtual double SAL_CALL
-    doScaling( double value )
-        throw (css::uno::RuntimeException, std::exception) override;
+    doScaling( double value ) override;
 
     virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
-    getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+    getInverseScaling() override;
 
     // ____ XServiceName ____
-    virtual OUString SAL_CALL getServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
 private:
     const double m_fBase;
@@ -120,23 +110,18 @@ public:
     virtual ~LinearScaling() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XScaling ____
-    virtual double SAL_CALL doScaling( double value )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL doScaling( double value ) override;
 
     virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
-        getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+        getInverseScaling() override;
 
     // ____ XServiceName ____
-    virtual OUString SAL_CALL getServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
 private:
     const double m_fSlope;
@@ -156,24 +141,19 @@ public:
     virtual ~PowerScaling() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XScaling ____
         virtual double SAL_CALL
-    doScaling( double value )
-        throw (css::uno::RuntimeException, std::exception) override;
+    doScaling( double value ) override;
 
      virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
-    getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+    getInverseScaling() override;
 
     // ____ XServiceName ____
-    virtual OUString SAL_CALL getServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
 private:
     const double m_fExponent;
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index bea4028d36d9..3077586c3803 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -91,12 +91,9 @@ public:
     virtual ~UncachedDataSequence() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
     DECLARE_XINTERFACE()
@@ -106,78 +103,54 @@ public:
 protected:
     // ____ XPropertySet ____
     /// @see css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
     /// @see ::comphelper::OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     /// @see ::comphelper::OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
 
     // ____ XDataSequence ____
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSourceRangeRepresentation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override;
+    virtual OUString SAL_CALL getSourceRangeRepresentation() override;
     virtual css::uno::Sequence< OUString > SAL_CALL generateLabel(
-        css::chart2::data::LabelOrigin nLabelOrigin )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        css::chart2::data::LabelOrigin nLabelOrigin ) override;
+    virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override;
 
     // ____ XNumericalDataSequence ____
     /// @see css::chart::data::XNumericalDataSequence
-    virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override;
 
     // ____ XTextualDataSequence ____
     /// @see css::chart::data::XTextualDataSequence
-    virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override;
 
     // ____ XIndexReplace ____
-    virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element )
-        throw (css::lang::IllegalArgumentException,
-               css::lang::IndexOutOfBoundsException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
 
     // ____ XIndexAccess (base of XIndexReplace) ____
-    virtual ::sal_Int32 SAL_CALL getCount()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
 
     // ____ XElementAccess (base of XIndexAccess) ____
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // ____ XNamed (for setting a new range representation) ____
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifiable ____
-    virtual sal_Bool SAL_CALL isModified()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setModified( sal_Bool bModified )
-        throw (css::beans::PropertyVetoException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isModified() override;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override;
 
     // ____ XModifyBroadcaster (base of XModifiable) ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     void fireModifyEvent();
 
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx
index 9bbff96bc079..10b3b6357d94 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -56,8 +56,7 @@ public:
 protected:
     // ____ XEventListener (base of all listeners) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException) SAL_OVERRIDE
+        const css::lang::EventObject& Source ) SAL_OVERRIDE
     {
         css::uno::Reference< css::lang::XEventListener > xEventListener(
                   css::uno::Reference< Listener >( m_xListener), css::uno::UNO_QUERY );
@@ -84,8 +83,7 @@ public:
 
 protected:
     // ____ XModifyListener ____
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 };
 
 class WeakSelectionChangeListenerAdapter :
@@ -99,8 +97,7 @@ public:
 protected:
     // ____ XSelectionChangeListener ____
     virtual void SAL_CALL selectionChanged(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx
index f0a9fed217ed..a3632118171d 100644
--- a/chart2/source/inc/WrappedDefaultProperty.hxx
+++ b/chart2/source/inc/WrappedDefaultProperty.hxx
@@ -34,20 +34,13 @@ public:
     virtual ~WrappedDefaultProperty() override;
 
     virtual void setPropertyToDefault(
-        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException) override;
+        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
     virtual css::uno::Any getPropertyDefault(
-        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException) override;
+        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
     virtual css::beans::PropertyState getPropertyState(
-        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException) override;
+        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 private:
     css::uno::Any m_aOuterDefaultValue;
 };
diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx
index 1c97aa0a5cb8..ba2bc0aac459 100644
--- a/chart2/source/inc/WrappedDirectStateProperty.hxx
+++ b/chart2/source/inc/WrappedDirectStateProperty.hxx
@@ -34,9 +34,7 @@ public:
     virtual ~WrappedDirectStateProperty() override;
 
     virtual css::beans::PropertyState getPropertyState(
-        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException) override;
+        const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx
index 70f0c37c9862..14bf3ddf514d 100644
--- a/chart2/source/inc/WrappedIgnoreProperty.hxx
+++ b/chart2/source/inc/WrappedIgnoreProperty.hxx
@@ -33,20 +33,15 @@ public:
     WrappedIgnoreProperty( const OUString& rOuterName, const css::uno::Any& rDefaultValue );
     virtual ~WrappedIgnoreProperty() override;
 
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
 
-SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
-SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
-SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
 
 protected:
     css::uno::Any          m_aDefaultValue;
diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx
index c22a0cb828ef..d28b83e7c8a2 100644
--- a/chart2/source/inc/WrappedProperty.hxx
+++ b/chart2/source/inc/WrappedProperty.hxx
@@ -45,30 +45,25 @@ public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const;
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const;
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const;
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const;
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const;
 
 protected:
     virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const;
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index cd2c89937e84..5f9f703430d4 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -53,35 +53,35 @@ public:
 
 public:
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XMultiPropertySet
     //getPropertySetInfo() already declared in XPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //XMultiPropertyStates
     //getPropertyStates() already declared in XPropertyState
-    virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAllPropertiesToDefault(  ) override;
+    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
 protected: //methods
     /** give all the properties that should be visible to the outer side
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 019dd864a402..11e1a6bc57a0 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -195,7 +195,6 @@ XMLFilter::~XMLFilter()
 // ____ XFilter ____
 sal_Bool SAL_CALL XMLFilter::filter(
     const Sequence< beans::PropertyValue >& aDescriptor )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = false;
 
@@ -234,7 +233,6 @@ sal_Bool SAL_CALL XMLFilter::filter(
 }
 
 void SAL_CALL XMLFilter::cancel()
-    throw (uno::RuntimeException, std::exception)
 {
     // if mutex is locked set "cancel state"
     // note: is currently ignored in filter-method
@@ -247,8 +245,6 @@ void SAL_CALL XMLFilter::cancel()
 // ____ XImporter ____
 void SAL_CALL XMLFilter::setTargetDocument(
     const Reference< lang::XComponent >& Document )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( ! m_xSourceDoc.is(), "Setting target doc while source doc is set" );
@@ -259,8 +255,6 @@ void SAL_CALL XMLFilter::setTargetDocument(
 // ____ XExporter ____
 void SAL_CALL XMLFilter::setSourceDocument(
     const Reference< lang::XComponent >& Document )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     OSL_ENSURE( ! m_xTargetDoc.is(), "Setting source doc while target doc is set" );
@@ -744,19 +738,16 @@ OUString XMLFilter::getMediaType(bool _bOasis)
 }
 
 OUString SAL_CALL XMLFilter::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.XMLFilter");
 }
 
 sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.document.ImportFilter",
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index ab73022b468b..73d7bf87a7a7 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -61,15 +61,13 @@ public:
     virtual ~BaseCoordinateSystem() override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     /// merge XInterface implementations
      DECLARE_XINTERFACE()
@@ -78,55 +76,37 @@ public:
 
 protected:
     // ____ XCoordinateSystem ____
-    virtual ::sal_Int32 SAL_CALL getDimension()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getDimension() override;
     virtual void SAL_CALL setAxisByDimension(
         ::sal_Int32 nDimension,
         const css::uno::Reference< css::chart2::XAxis >& xAxis,
-        ::sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nIndex ) override;
     virtual css::uno::Reference< css::chart2::XAxis > SAL_CALL getAxisByDimension(
-        ::sal_Int32 nDimension, ::sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nDimension, ::sal_Int32 nIndex ) override;
+    virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) override;
 
     // ____ XChartTypeContainer ____
     virtual void SAL_CALL addChartType(
-        const css::uno::Reference< css::chart2::XChartType >& aChartType )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XChartType >& aChartType ) override;
     virtual void SAL_CALL removeChartType(
-        const css::uno::Reference< css::chart2::XChartType >& aChartType )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XChartType >& aChartType ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes() override;
     virtual void SAL_CALL setChartTypes(
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes ) override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index 79aac4c21bb1..75d9aa2288b7 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -34,22 +34,16 @@ public:
     virtual ~CartesianCoordinateSystem() override;
 
     // ____ XCoordinateSystem ____
-    virtual OUString SAL_CALL getCoordinateSystemType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getViewServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCoordinateSystemType() override;
+    virtual OUString SAL_CALL getViewServiceName() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XServiceInfo ____
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class CartesianCoordinateSystem2d : public CartesianCoordinateSystem
@@ -60,12 +54,9 @@ public:
     virtual ~CartesianCoordinateSystem2d() override;
 
     // ____ XServiceInfo ____
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class CartesianCoordinateSystem3d : public CartesianCoordinateSystem
@@ -77,12 +68,9 @@ public:
     virtual ~CartesianCoordinateSystem3d() override;
 
     // ____ XServiceInfo ____
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 }  // namespace chart
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index 30e2b24cffb1..2a49620e1dfd 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -45,29 +45,21 @@ public:
 
     virtual OUString SAL_CALL
         getImplementationName()
-            throw( css::uno::RuntimeException, std::exception )
         override;
     virtual sal_Bool SAL_CALL
         supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception )
         override;
     virtual css::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception )
         override;
 
 protected:
     // ____ XMultiServiceFactory ____
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
-        throw (css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(
             const OUString& ServiceSpecifier,
-            const css::uno::Sequence< css::uno::Any >& Arguments )
-        throw (css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
     // ____ XChartTypeManager ____
     // currently empty
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 7cac9977dfb7..3c477e0afefe 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -71,12 +71,9 @@ public:
     virtual ~DataSeries() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
     DECLARE_XINTERFACE()
@@ -92,41 +89,31 @@ protected:
     // ____ XDataSeries ____
     /// @see css::chart2::XDataSeries
     virtual css::uno::Reference< css::beans::XPropertySet >
-        SAL_CALL getDataPointByIndex( sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL resetAllDataPoints()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL resetAllDataPoints() override;
 
     // ____ XDataSink ____
     /// @see css::chart2::data::XDataSink
-    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override;
 
     // ____ XDataSource ____
     /// @see css::chart2::data::XDataSource
-    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast
         ( sal_Int32 nHandle,
-          const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+          const css::uno::Any& rValue ) override;
 
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     /// @see css::beans::XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     /// make original interface function visible again
     using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue;
@@ -134,40 +121,29 @@ protected:
     // ____ XRegressionCurveContainer ____
     /// @see css::chart2::XRegressionCurveContainer
     virtual void SAL_CALL addRegressionCurve(
-        const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) override;
     virtual void SAL_CALL removeRegressionCurve(
-        const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() override;
     virtual void SAL_CALL setRegressionCurves(
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > >& aRegressionCurves )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > >& aRegressionCurves ) override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index 7e724184ba1e..88023bb1f0d6 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -65,12 +65,9 @@ public:
     virtual ~Diagram() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
      DECLARE_XINTERFACE()
@@ -81,20 +78,17 @@ protected:
     explicit Diagram( const Diagram & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XFastPropertySet ____
-    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     /// make original interface function visible again
     using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue;
@@ -103,75 +97,54 @@ protected:
         css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
     // ____ XDiagram ____
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getWall()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFloor()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::XLegend > SAL_CALL getLegend()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getWall() override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFloor() override;
+    virtual css::uno::Reference< css::chart2::XLegend > SAL_CALL getLegend() override;
     virtual void SAL_CALL setLegend( const css::uno::Reference<
-                                     css::chart2::XLegend >& xLegend )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::XColorScheme > SAL_CALL getDefaultColorScheme()
-        throw (css::uno::RuntimeException, std::exception) override;
+                                     css::chart2::XLegend >& xLegend ) override;
+    virtual css::uno::Reference< css::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() override;
     virtual void SAL_CALL setDefaultColorScheme(
-        const css::uno::Reference< css::chart2::XColorScheme >& xColorScheme )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XColorScheme >& xColorScheme ) override;
     virtual void SAL_CALL setDiagramData(
         const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource,
-        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
-            throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
 
     // ____ XCoordinateSystemContainer ____
     virtual void SAL_CALL addCoordinateSystem(
-        const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) override;
     virtual void SAL_CALL removeCoordinateSystem(
-        const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() override;
     virtual void SAL_CALL setCoordinateSystems(
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > >& aCoordinateSystems )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > >& aCoordinateSystems ) override;
 
     // ____ XTitled ____
     virtual css::uno::Reference<
-        css::chart2::XTitle > SAL_CALL getTitleObject()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::chart2::XTitle > SAL_CALL getTitleObject() override;
     virtual void SAL_CALL setTitleObject( const css::uno::Reference<
-                                          css::chart2::XTitle >& Title )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                          css::chart2::XTitle >& Title ) override;
 
     // ____ X3DDefaultSetter ____
-    virtual void SAL_CALL set3DSettingsToDefault() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultRotation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultIllumination() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL set3DSettingsToDefault() override;
+    virtual void SAL_CALL setDefaultRotation() override;
+    virtual void SAL_CALL setDefaultIllumination() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index f886d066895f..f4d86ee18311 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -34,22 +34,16 @@ public:
     virtual ~PolarCoordinateSystem() override;
 
     // ____ XCoordinateSystem ____
-    virtual OUString SAL_CALL getCoordinateSystemType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getViewServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCoordinateSystemType() override;
+    virtual OUString SAL_CALL getViewServiceName() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XServiceInfo ____
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class PolarCoordinateSystem2d : public PolarCoordinateSystem
@@ -60,12 +54,9 @@ public:
     virtual ~PolarCoordinateSystem2d() override;
 
     // ____ XServiceInfo ____
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class PolarCoordinateSystem3d : public PolarCoordinateSystem
@@ -76,12 +67,9 @@ public:
     virtual ~PolarCoordinateSystem3d() override;
 
     // ____ XServiceInfo ____
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 }  // namespace chart
diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx
index 40cf1f2ac212..7401a98e4374 100644
--- a/chart2/source/model/inc/StockBar.hxx
+++ b/chart2/source/model/inc/StockBar.hxx
@@ -56,37 +56,30 @@ protected:
     explicit StockBar( const StockBar & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index bc8b75ee4a2d..00aa0279d970 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -62,32 +62,23 @@ public:
     virtual ~XMLFilter() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     // ____ XFilter ____
     virtual sal_Bool SAL_CALL filter(
-        const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+    virtual void SAL_CALL cancel() override;
 
     // ____ XImporter ____
     virtual void SAL_CALL setTargetDocument(
-        const css::uno::Reference< css::lang::XComponent >& Document )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::lang::XComponent >& Document ) override;
 
     // ____ XExporter ____
     virtual void SAL_CALL setSourceDocument(
-        const css::uno::Reference< css::lang::XComponent >& Document )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::lang::XComponent >& Document ) override;
 
     inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; }
 
@@ -151,16 +142,13 @@ public:
     {}
 protected:
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override
+        getImplementationName() override
     {
         return OUString( "com.sun.star.comp.chart2.report.XMLFilter" );
     }
     // ____ XImporter ____
     virtual void SAL_CALL setTargetDocument(
-        const css::uno::Reference< css::lang::XComponent >& Document )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override
+        const css::uno::Reference< css::lang::XComponent >& Document ) override
     {
         setDocumentHandler( "com.sun.star.comp.report.ImportDocumentHandler" );
         XMLFilter::setTargetDocument(Document);
@@ -168,9 +156,7 @@ protected:
 
     // ____ XExporter ____
     virtual void SAL_CALL setSourceDocument(
-        const css::uno::Reference< css::lang::XComponent >& Document )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override
+        const css::uno::Reference< css::lang::XComponent >& Document ) override
     {
         setDocumentHandler( "com.sun.star.comp.report.ExportDocumentHandler" );
         XMLFilter::setSourceDocument(Document);
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 8ba10b145626..b4ab8bd6389e 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -459,7 +459,6 @@ void Axis::AllocateSubGrids()
 
 // ____ XAxis ____
 void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< util::XModifyListener > xModifyEventForwarder;
     Reference< lang::XEventListener > xEventListener;
@@ -489,27 +488,23 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData )
 }
 
 chart2::ScaleData SAL_CALL Axis::getScaleData()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_aScaleData;
 }
 
 Reference< beans::XPropertySet > SAL_CALL Axis::getGridProperties()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_xGrid;
 }
 Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_aSubGridProperties;
 }
 
 Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not implemented yet" );
     return Sequence< Reference< beans::XPropertySet > >();
@@ -517,14 +512,12 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties
 
 // ____ XTitled ____
 Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return m_xTitle;
 }
 
 void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< util::XModifyListener > xModifyEventForwarder;
     Reference< chart2::XTitle > xOldTitle;
@@ -545,7 +538,6 @@ void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle
 
 // ____ XCloneable ____
 Reference< util::XCloneable > SAL_CALL Axis::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     Axis * pNewAxis( new Axis( *this ));
     // hold a reference to the clone
@@ -557,7 +549,6 @@ Reference< util::XCloneable > SAL_CALL Axis::createClone()
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -571,7 +562,6 @@ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >&
 }
 
 void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -586,14 +576,12 @@ void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener
 
 // ____ XModifyListener ____
 void SAL_CALL Axis::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL Axis::disposing( const lang::EventObject& Source )
-    throw (uno::RuntimeException, std::exception)
 {
     if( Source.Source == m_aScaleData.Categories )
         m_aScaleData.Categories = nullptr;
@@ -612,7 +600,6 @@ void Axis::fireModifyEvent()
 
 // ____ OPropertySet ____
 uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const
-    throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticAxisDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -628,7 +615,6 @@ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticAxisInfo::get();
 }
@@ -640,19 +626,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet )
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 OUString SAL_CALL Axis::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.Axis");
 }
 
 sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart2.Axis",
diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx
index 6758b92d45b4..5ec250fc36b2 100644
--- a/chart2/source/model/main/Axis.hxx
+++ b/chart2/source/model/main/Axis.hxx
@@ -58,12 +58,9 @@ public:
     virtual ~Axis() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
      DECLARE_XINTERFACE()
@@ -77,59 +74,44 @@ protected:
     void Init( const Axis & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XAxis ____
-    virtual void SAL_CALL setScaleData( const css::chart2::ScaleData& rScaleData )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::chart2::ScaleData SAL_CALL getScaleData()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getGridProperties()
-                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubGridProperties()
-                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubTickProperties()
-                    throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setScaleData( const css::chart2::ScaleData& rScaleData ) override;
+    virtual css::chart2::ScaleData SAL_CALL getScaleData() override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getGridProperties() override;
+    virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubGridProperties() override;
+    virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubTickProperties() override;
 
     // ____ XTitled ____
-    virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() override;
     virtual void SAL_CALL setTitleObject(
-        const css::uno::Reference< css::chart2::XTitle >& Title )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XTitle >& Title ) override;
 
     // ____ XCloneable ____
     // Note: the coordinate systems are not cloned!
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 6a10d8404327..04babbc036dd 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -191,7 +191,6 @@ BaseCoordinateSystem::~BaseCoordinateSystem()
 
 // ____ XCoordinateSystem ____
 sal_Int32 SAL_CALL BaseCoordinateSystem::getDimension()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_nDimensionCount;
 }
@@ -200,8 +199,6 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension(
     sal_Int32 nDimensionIndex,
     const Reference< chart2::XAxis >& xAxis,
     sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() )
         throw lang::IndexOutOfBoundsException();
@@ -226,8 +223,6 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension(
 
 Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension(
             sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() )
         throw lang::IndexOutOfBoundsException();
@@ -241,8 +236,6 @@ Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension(
 }
 
 sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex )
-        throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() )
         throw lang::IndexOutOfBoundsException();
@@ -258,8 +251,6 @@ sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int
 
 // ____ XChartTypeContainer ____
 void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChartType >& aChartType )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     if( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )
         != m_aChartTypes.end())
@@ -271,8 +262,6 @@ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChar
 }
 
 void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XChartType >& aChartType )
-    throw (container::NoSuchElementException,
-           uno::RuntimeException, std::exception)
 {
     ::std::vector< uno::Reference< chart2::XChartType > >::iterator
           aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ));
@@ -287,14 +276,11 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC
 }
 
 Sequence< Reference< chart2::XChartType > > SAL_CALL BaseCoordinateSystem::getChartTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     return comphelper::containerToSequence( m_aChartTypes );
 }
 
 void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< chart2::XChartType > >& aChartTypes )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     ModifyListenerHelper::removeListenerFromAllElements( m_aChartTypes, m_xModifyEventForwarder );
     m_aChartTypes = ContainerHelper::SequenceToVector( aChartTypes );
@@ -304,7 +290,6 @@ void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< ch
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -318,7 +303,6 @@ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XM
 }
 
 void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -333,14 +317,12 @@ void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util:
 
 // ____ XModifyListener ____
 void SAL_CALL BaseCoordinateSystem::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL BaseCoordinateSystem::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -358,7 +340,6 @@ void BaseCoordinateSystem::fireModifyEvent()
 
 // ____ OPropertySet ____
 uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticCooSysDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -375,7 +356,6 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL BaseCoordinateSystem::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticCooSysInfo::get();
 }
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 5befaffb9748..156b6cce6b53 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -55,39 +55,33 @@ CartesianCoordinateSystem::~CartesianCoordinateSystem()
 
 // ____ XCoordinateSystem ____
 OUString SAL_CALL CartesianCoordinateSystem::getCoordinateSystemType()
-    throw (RuntimeException, std::exception)
 {
     return OUString(CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME);
 }
 
 OUString SAL_CALL CartesianCoordinateSystem::getViewServiceName()
-    throw (RuntimeException, std::exception)
 {
     return OUString(CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME);
 }
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClone()
-    throw (RuntimeException, std::exception)
 {
     return Reference< util::XCloneable >( new CartesianCoordinateSystem( *this ));
 }
 
 // ____ XServiceInfo ____
 OUString SAL_CALL CartesianCoordinateSystem::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.CartesianCoordinateSystem");
 }
 
 sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME };
 }
@@ -104,19 +98,16 @@ CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d()
 
 // ____ XServiceInfo ____
 OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem2d");
 }
 
 sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME,
@@ -136,19 +127,16 @@ CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d()
 
 // ____ XServiceInfo ____
 OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem3d");
 }
 
 sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME,
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 65717729a221..738c8807fa2f 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -193,7 +193,6 @@ ChartModel::~ChartModel()
 }
 
 void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ )
-                throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     //#i113722# avoid duplicate creation
 
@@ -237,7 +236,7 @@ bool ChartModel::impl_isControllerConnected( const uno::Reference< frame::XContr
     return false;
 }
 
-uno::Reference< frame::XController > ChartModel::impl_getCurrentController() throw(uno::RuntimeException)
+uno::Reference< frame::XController > ChartModel::impl_getCurrentController()
 {
         //@todo? hold only weak references to controllers
 
@@ -257,7 +256,6 @@ uno::Reference< frame::XController > ChartModel::impl_getCurrentController() thr
 }
 
 void SAL_CALL ChartModel::impl_notifyCloseListeners()
-        throw( uno::RuntimeException)
 {
     ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer
         .getContainer( cppu::UnoType<util::XCloseListener>::get());
@@ -314,19 +312,16 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV
 // lang::XServiceInfo
 
 OUString SAL_CALL ChartModel::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(CHART_MODEL_SERVICE_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART_MODEL_SERVICE_NAME,
@@ -339,7 +334,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames()
 
 sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL
         , const uno::Sequence< beans::PropertyValue >& rMediaDescriptor )
-        throw(uno::RuntimeException, std::exception)
 {
     /*
     The method attachResource() is used by the frame loader implementations
@@ -363,12 +357,12 @@ sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL
     return true;
 }
 
-OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ChartModel::getURL()
 {
     return impl_g_getLocation();
 }
 
-uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno::RuntimeException, std::exception)
+uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs()
 {
     /*
     The method getArgs() returns a sequence of property values
@@ -385,7 +379,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno::
 }
 
 void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XController >& xController )
-        throw(uno::RuntimeException, std::exception)
 {
     //@todo? this method is declared as oneway -> ...?
 
@@ -399,7 +392,6 @@ void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XContr
 }
 
 void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XController >& xController )
-        throw(uno::RuntimeException, std::exception)
 {
     //@todo? this method is declared as oneway -> ...?
 
@@ -417,7 +409,7 @@ void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XCo
     DisposeHelper::DisposeAndClear( m_xRangeHighlighter );
 }
 
-void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ChartModel::lockControllers()
 {
     /*
     suspends some notifications to the controllers which are used for display updates.
@@ -435,7 +427,7 @@ void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException, std::ex
     ++m_nControllerLockCount;
 }
 
-void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ChartModel::unlockControllers()
 {
     /*
     resumes the notifications which were suspended by lockControllers() .
@@ -463,7 +455,7 @@ void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std::
     }
 }
 
-sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ChartModel::hasControllersLocked()
 {
     LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall())
@@ -471,7 +463,7 @@ sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException
     return ( m_nControllerLockCount != 0 ) ;
 }
 
-uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() throw(uno::RuntimeException, std::exception)
+uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController()
 {
     LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall())
@@ -483,7 +475,6 @@ uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController()
 }
 
 void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XController >& xController )
-        throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall())
@@ -502,7 +493,7 @@ void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XCo
     DisposeHelper::DisposeAndClear( m_xRangeHighlighter );
 }
 
-uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() throw(uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection()
 {
     LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall())
@@ -529,7 +520,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr
 }
 
 // lang::XComponent (base of XModel)
-void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ChartModel::dispose()
 {
     Reference< XInterface > xKeepAlive( *this );
 
@@ -579,7 +570,6 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventListener > & xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     if( m_aLifeTimeManager.impl_isDisposedOrClosed() )
         return; //behave passive if already disposed or closed
@@ -588,7 +578,6 @@ void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventLi
 }
 
 void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEventListener > & xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) )
         return; //behave passive if already disposed or closed
@@ -599,13 +588,11 @@ void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEven
 
 // util::XCloseBroadcaster (base of XCloseable)
 void SAL_CALL ChartModel::addCloseListener( const uno::Reference<   util::XCloseListener > & xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     m_aLifeTimeManager.g_addCloseListener( xListener );
 }
 
 void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XCloseListener > & xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) )
         return; //behave passive if already disposed or closed
@@ -616,8 +603,6 @@ void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XClos
 
 // util::XCloseable
 void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership )
-            throw( util::CloseVetoException,
-                   uno::RuntimeException, std::exception )
 {
     //hold no mutex
 
@@ -670,7 +655,6 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership )
 
 // lang::XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes()
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< lang::XTypeProvider > xAggTypeProvider;
     if( (m_xOldModelAgg->queryAggregation( cppu::UnoType<decltype(xAggTypeProvider)>::get()) >>= xAggTypeProvider)
@@ -692,7 +676,7 @@ uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes()
 
 // document::XDocumentPropertiesSupplier
 uno::Reference< document::XDocumentProperties > SAL_CALL
-        ChartModel::getDocumentProperties() throw (uno::RuntimeException, std::exception)
+        ChartModel::getDocumentProperties()
 {
     ::osl::MutexGuard aGuard( m_aModelMutex );
     if ( !m_xDocumentProperties.is() )
@@ -703,7 +687,7 @@ uno::Reference< document::XDocumentProperties > SAL_CALL
 }
 
 // document::XDocumentPropertiesSupplier
-Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager(  ) throw (RuntimeException, std::exception)
+Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager(  )
 {
     ::osl::MutexGuard aGuard( m_aModelMutex );
     if ( !m_pUndoManager.is() )
@@ -714,14 +698,12 @@ Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager(  ) thro
 // chart2::XChartDocument
 
 uno::Reference< chart2::XDiagram > SAL_CALL ChartModel::getFirstDiagram()
-            throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aModelMutex );
     return m_xDiagram;
 }
 
 void SAL_CALL ChartModel::setFirstDiagram( const uno::Reference< chart2::XDiagram >& xDiagram )
-            throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XDiagram > xOldDiagram;
     Reference< util::XModifyListener > xListener;
@@ -781,7 +763,6 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
 }
 
 void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingData )
-            throw (util::CloseVetoException, uno::RuntimeException, std::exception)
 {
     // don't lock the mutex, because this call calls out to code that tries to
     // lock the solar mutex. On the other hand, a paint locks the solar mutex
@@ -799,13 +780,11 @@ void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingDat
 }
 
 sal_Bool SAL_CALL ChartModel::hasInternalDataProvider()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_xDataProvider.is() && m_xInternalDataProvider.is();
 }
 
 uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvider()
-            throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aModelMutex );
     return m_xDataProvider;
@@ -814,7 +793,6 @@ uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvid
 // ____ XDataReceiver ____
 
 void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data::XDataProvider >& xDataProvider )
-            throw (uno::RuntimeException, std::exception)
 {
     {
         MutexGuard aGuard( m_aModelMutex );
@@ -840,7 +818,6 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data
 }
 
 void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& xNewSupplier )
-            throw (uno::RuntimeException, std::exception)
 {
     {
         MutexGuard aGuard( m_aModelMutex );
@@ -870,8 +847,6 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti
 }
 
 void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& aArguments )
-            throw (lang::IllegalArgumentException,
-                   uno::RuntimeException, std::exception)
 {
     {
         MutexGuard aGuard( m_aModelMutex );
@@ -909,19 +884,16 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >&
 }
 
 Sequence< OUString > SAL_CALL ChartModel::getUsedRangeRepresentations()
-            throw (uno::RuntimeException, std::exception)
 {
     return DataSourceHelper::getUsedDataRanges( Reference< frame::XModel >(this));
 }
 
 Reference< chart2::data::XDataSource > SAL_CALL ChartModel::getUsedData()
-            throw (uno::RuntimeException, std::exception)
 {
     return DataSourceHelper::getUsedData( Reference< chart2::XChartDocument >(this));
 }
 
 Reference< chart2::data::XRangeHighlighter > SAL_CALL ChartModel::getRangeHighlighter()
-            throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xRangeHighlighter.is())
     {
@@ -942,7 +914,6 @@ Reference< chart2::XChartTypeTemplate > ChartModel::impl_createDefaultChartTypeT
 }
 
 void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XChartTypeManager >& xNewManager )
-            throw (uno::RuntimeException, std::exception)
 {
     {
         MutexGuard aGuard( m_aModelMutex );
@@ -952,41 +923,35 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh
 }
 
 uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager()
-            throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aModelMutex );
     return m_xChartTypeManager;
 }
 
 uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aModelMutex );
     return m_xPageBackground;
 }
 
 void SAL_CALL ChartModel::createDefaultChart()
-    throw (css::uno::RuntimeException, std::exception)
 {
     insertDefaultChart();
 }
 
 sal_Bool SAL_CALL ChartModel::isOpenGLChart()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return ChartHelper::isGL3DDiagram(m_xDiagram);
 }
 
 // ____ XTitled ____
 uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aModelMutex );
     return m_xTitle;
 }
 
 void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >& xTitle )
-    throw (uno::RuntimeException, std::exception)
 {
     {
         MutexGuard aGuard( m_aModelMutex );
@@ -1000,7 +965,6 @@ void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >
 
 // ____ XInterface (for old API wrapper) ____
 uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aResult( impl::ChartModel_Base::queryInterface( aType ));
 
@@ -1023,17 +987,12 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType )
 
 // ____ XCloneable ____
 Reference< util::XCloneable > SAL_CALL ChartModel::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return Reference< util::XCloneable >( new ChartModel( *this ));
 }
 
 // ____ XVisualObject ____
 void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Size& aSize )
-    throw (lang::IllegalArgumentException,
-           embed::WrongStateException,
-           uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     if( nAspect == embed::Aspects::MSOLE_CONTENT )
     {
@@ -1059,10 +1018,6 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz
 }
 
 awt::Size SAL_CALL ChartModel::getVisualAreaSize( ::sal_Int64 nAspect )
-    throw (lang::IllegalArgumentException,
-           embed::WrongStateException,
-           uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT,
                 "No aspects other than content are supported" );
@@ -1073,10 +1028,6 @@ awt::Size SAL_CALL ChartModel::getVisualAreaSize( ::sal_Int64 nAspect )
 }
 
 embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentation( ::sal_Int64 nAspect )
-    throw (lang::IllegalArgumentException,
-           embed::WrongStateException,
-           uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT,
                 "No aspects other than content are supported" );
@@ -1115,8 +1066,6 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio
 }
 
 ::sal_Int32 SAL_CALL ChartModel::getMapUnit( ::sal_Int64 nAspect )
-    throw (uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT,
                 "No aspects other than content are supported" );
@@ -1126,9 +1075,6 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio
 
 // ____ datatransfer::XTransferable ____
 uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& aFlavor )
-    throw (datatransfer::UnsupportedFlavorException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     uno::Any aResult;
     if( this->isDataFlavorSupported( aFlavor ))
@@ -1159,7 +1105,6 @@ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& a
 }
 
 Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< datatransfer::DataFlavor > aRet(1);
 
@@ -1171,7 +1116,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors
 }
 
 sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
-    throw (uno::RuntimeException, std::exception)
 {
     return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast);
 }
@@ -1206,7 +1150,6 @@ tServiceNameMap & lcl_getStaticServiceNameMap()
 }
 // ____ XMultiServiceFactory ____
 Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString& rServiceSpecifier )
-            throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     uno::Reference< uno::XInterface > xResult;
     tServiceNameMap & rMap = lcl_getStaticServiceNameMap();
@@ -1260,7 +1203,6 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString
 
 Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments(
             const OUString& rServiceSpecifier , const Sequence< Any >& Arguments )
-            throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" );
     (void)(Arguments); // avoid warning in non-debug builds
@@ -1268,7 +1210,6 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments(
 }
 
 Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames()
-            throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aResult;
 
@@ -1301,7 +1242,6 @@ Reference< util::XNumberFormatsSupplier > const & ChartModel::getNumberFormatsSu
 
 // ____ XUnoTunnel ___
 ::sal_Int64 SAL_CALL ChartModel::getSomething( const Sequence< ::sal_Int8 >& aIdentifier )
-        throw( uno::RuntimeException, std::exception)
 {
     if( aIdentifier.getLength() == 16 && 0 == memcmp( SvNumberFormatsSupplierObj::getUnoTunnelId().getConstArray(),
                                                          aIdentifier.getConstArray(), 16 ) )
@@ -1315,7 +1255,6 @@ Reference< util::XNumberFormatsSupplier > const & ChartModel::getNumberFormatsSu
 
 // ____ XNumberFormatsSupplier ____
 uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettings()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() );
     if( xSupplier.is() )
@@ -1324,7 +1263,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettin
 }
 
 uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() );
     if( xSupplier.is() )
@@ -1334,14 +1272,11 @@ uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats()
 
 // ____ XChild ____
 Reference< uno::XInterface > SAL_CALL ChartModel::getParent()
-    throw (uno::RuntimeException, std::exception)
 {
     return Reference< uno::XInterface >(m_xParent,uno::UNO_QUERY);
 }
 
 void SAL_CALL ChartModel::setParent( const Reference< uno::XInterface >& Parent )
-    throw (lang::NoSupportException,
-           uno::RuntimeException, std::exception)
 {
     if( Parent != m_xParent )
         m_xParent.set( Parent, uno::UNO_QUERY );
@@ -1349,7 +1284,6 @@ void SAL_CALL ChartModel::setParent( const Reference< uno::XInterface >& Parent
 
 // ____ XDataSource ____
 uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartModel::getDataSequences()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::data::XDataSource > xSource(
         DataSourceHelper::getUsedData( uno::Reference< frame::XModel >(this) ) );
@@ -1361,7 +1295,6 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM
 
 //XDumper
 OUString SAL_CALL ChartModel::dump()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< qa::XDumper > xDumper(
             this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
@@ -1416,14 +1349,12 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd)
 }
 
 void ChartModel::setWindow( const sal_uInt64 nWindowPtr )
-    throw (uno::RuntimeException, std::exception)
 {
     OpenGLWindow* pWindow = reinterpret_cast<OpenGLWindow*>(nWindowPtr);
     mpOpenGLWindow = pWindow;
 }
 
 void ChartModel::update()
-    throw (uno::RuntimeException, std::exception)
 {
     if(!mxChartView.is())
     {
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index b2eb99f87453..bba125948d3a 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -202,9 +202,6 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
 // frame::XStorable2
 
 void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMediaDescriptor )
-    throw (lang::IllegalArgumentException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     // only some parameters are allowed (see also SfxBaseModel)
     // "VersionComment", "Author", "InteractionHandler", "StatusIndicator"
@@ -215,28 +212,23 @@ void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMe
 
 // frame::XStorable (base of XStorable2)
 sal_Bool SAL_CALL ChartModel::hasLocation()
-    throw(uno::RuntimeException, std::exception)
 {
     //@todo guard
     return !m_aResource.isEmpty();
 }
 
 OUString SAL_CALL ChartModel::getLocation()
-    throw(uno::RuntimeException, std::exception)
 {
     return impl_g_getLocation();
 }
 
 sal_Bool SAL_CALL ChartModel::isReadonly()
-    throw(uno::RuntimeException, std::exception)
 {
     //@todo guard
     return m_bReadOnly;
 }
 
 void SAL_CALL ChartModel::store()
-    throw(io::IOException,
-          uno::RuntimeException, std::exception)
 {
     apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall(true)) //start LongLastingCall
@@ -259,7 +251,6 @@ void SAL_CALL ChartModel::store()
 void SAL_CALL ChartModel::storeAsURL(
     const OUString& rURL,
     const uno::Sequence< beans::PropertyValue >& rMediaDescriptor )
-    throw(io::IOException, uno::RuntimeException, std::exception)
 {
     apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall(true)) //start LongLastingCall
@@ -285,8 +276,6 @@ void SAL_CALL ChartModel::storeAsURL(
 void SAL_CALL ChartModel::storeToURL(
     const OUString& rURL,
     const uno::Sequence< beans::PropertyValue >& rMediaDescriptor )
-    throw(io::IOException,
-          uno::RuntimeException, std::exception)
 {
     apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall(true)) //start LongLastingCall
@@ -481,19 +470,11 @@ void ChartModel::insertDefaultChart()
 
 // frame::XLoadable
 void SAL_CALL ChartModel::initNew()
-    throw (frame::DoubleInitializationException,
-           io::IOException,
-           uno::Exception,
-           uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ChartModel::load(
     const Sequence< beans::PropertyValue >& rMediaDescriptor )
-    throw (frame::DoubleInitializationException,
-           io::IOException,
-           uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     Reference< embed::XStorage > xStorage;
     OUString aURL;
@@ -652,7 +633,6 @@ void ChartModel::impl_loadGraphics(
 
 // util::XModifiable
 void SAL_CALL ChartModel::impl_notifyModifiedListeners()
-    throw( uno::RuntimeException)
 {
     {
         MutexGuard aGuard( m_aModelMutex );
@@ -678,15 +658,12 @@ void SAL_CALL ChartModel::impl_notifyModifiedListeners()
 }
 
 sal_Bool SAL_CALL ChartModel::isModified()
-    throw(uno::RuntimeException, std::exception)
 {
     //@todo guard
     return m_bModified;
 }
 
 void SAL_CALL ChartModel::setModified( sal_Bool bModified )
-    throw(beans::PropertyVetoException,
-          uno::RuntimeException, std::exception)
 {
     apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall())//@todo ? is this a long lasting call??
@@ -707,7 +684,6 @@ void SAL_CALL ChartModel::setModified( sal_Bool bModified )
 // util::XModifyBroadcaster (base of XModifiable)
 void SAL_CALL ChartModel::addModifyListener(
     const uno::Reference< util::XModifyListener >& xListener )
-    throw(uno::RuntimeException, std::exception)
 {
     if( m_aLifeTimeManager.impl_isDisposedOrClosed() )
         return; //behave passive if already disposed or closed
@@ -718,7 +694,6 @@ void SAL_CALL ChartModel::addModifyListener(
 
 void SAL_CALL ChartModel::removeModifyListener(
     const uno::Reference< util::XModifyListener >& xListener )
-    throw(uno::RuntimeException, std::exception)
 {
     if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) )
         return; //behave passive if already disposed or closed
@@ -729,7 +704,6 @@ void SAL_CALL ChartModel::removeModifyListener(
 
 // util::XModifyListener
 void SAL_CALL ChartModel::modified( const lang::EventObject& )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_nInLoad == 0 )
         setModified( true );
@@ -737,7 +711,6 @@ void SAL_CALL ChartModel::modified( const lang::EventObject& )
 
 // lang::XEventListener (base of util::XModifyListener)
 void SAL_CALL ChartModel::disposing( const lang::EventObject& )
-    throw (uno::RuntimeException, std::exception)
 {
     // child was disposed -- should not happen from outside
 }
@@ -746,11 +719,6 @@ void SAL_CALL ChartModel::disposing( const lang::EventObject& )
 void SAL_CALL ChartModel::loadFromStorage(
     const Reference< embed::XStorage >& xStorage,
     const Sequence< beans::PropertyValue >& rMediaDescriptor )
-    throw (lang::IllegalArgumentException,
-           frame::DoubleInitializationException,
-           io::IOException,
-           uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     attachResource( OUString(), rMediaDescriptor );
     impl_load( rMediaDescriptor, xStorage );
@@ -759,34 +727,22 @@ void SAL_CALL ChartModel::loadFromStorage(
 void SAL_CALL ChartModel::storeToStorage(
     const Reference< embed::XStorage >& xStorage,
     const Sequence< beans::PropertyValue >& rMediaDescriptor )
-    throw (lang::IllegalArgumentException,
-           io::IOException,
-           uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     impl_store( rMediaDescriptor, xStorage );
 }
 
 void SAL_CALL ChartModel::switchToStorage( const Reference< embed::XStorage >& xStorage )
-    throw (lang::IllegalArgumentException,
-           io::IOException,
-           uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     m_xStorage = xStorage;
     impl_notifyStorageChangeListeners();
 }
 
 Reference< embed::XStorage > SAL_CALL ChartModel::getDocumentStorage()
-    throw (io::IOException,
-           uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     return m_xStorage;
 }
 
 void SAL_CALL ChartModel::impl_notifyStorageChangeListeners()
-    throw( uno::RuntimeException)
 {
     ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer
           .getContainer( cppu::UnoType<document::XStorageChangeListener>::get());
@@ -803,7 +759,6 @@ void SAL_CALL ChartModel::impl_notifyStorageChangeListeners()
 }
 
 void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_aLifeTimeManager.impl_isDisposedOrClosed() )
         return; //behave passive if already disposed or closed
@@ -813,7 +768,6 @@ void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::X
 }
 
 void SAL_CALL ChartModel::removeStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) )
         return; //behave passive if already disposed or closed
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 0f359648f31f..ec5b6bc28d29 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -150,29 +150,24 @@ DataPoint::~DataPoint()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL DataPoint::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new DataPoint( *this ));
 }
 
 // ____ XChild ____
 Reference< uno::XInterface > SAL_CALL DataPoint::getParent()
-    throw (uno::RuntimeException, std::exception)
 {
     return Reference< uno::XInterface >( m_xParentProperties.get(), uno::UNO_QUERY );
 }
 
 void SAL_CALL DataPoint::setParent(
     const Reference< uno::XInterface >& Parent )
-    throw (lang::NoSupportException,
-           uno::RuntimeException, std::exception)
 {
     m_xParentProperties = Reference< beans::XPropertySet >( Parent, uno::UNO_QUERY );
 }
 
 // ____ OPropertySet ____
 uno::Any DataPoint::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     // the value set at the data series is the default
     uno::Reference< beans::XFastPropertySet > xFast( m_xParentProperties.get(), uno::UNO_QUERY );
@@ -187,7 +182,6 @@ uno::Any DataPoint::GetDefaultValue( sal_Int32 nHandle ) const
 
 void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast(
     sal_Int32 nHandle, const uno::Any& rValue )
-    throw (uno::Exception, std::exception)
 {
     if(    nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y
         || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X )
@@ -221,14 +215,12 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast(
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL DataPoint::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticDataPointInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -242,7 +234,6 @@ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyL
 }
 
 void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -257,14 +248,12 @@ void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModi
 
 // ____ XModifyListener ____
 void SAL_CALL DataPoint::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL DataPoint::disposing( const lang::EventObject& )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -282,19 +271,16 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertyS
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 OUString SAL_CALL DataPoint::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.DataPoint") ;
 }
 
 sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return Sequence< OUString >{
         "com.sun.star.drawing.FillProperties",
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index 8335509b8f8f..187c6350aaa7 100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -57,60 +57,46 @@ public:
     /// merge XInterface implementations
      DECLARE_XINTERFACE()
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     explicit DataPoint( const DataPoint & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast
         ( sal_Int32 nHandle,
-          const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+          const css::uno::Any& rValue ) override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
     // Note: m_xParentProperties are not cloned!
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XChild ____
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override;
     virtual void SAL_CALL setParent(
-        const css::uno::Reference< css::uno::XInterface >& Parent )
-        throw (css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 7d88338a308a..440634a1978e 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -219,7 +219,6 @@ DataSeries::~DataSeries()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     DataSeries * pNewSeries( new DataSeries( *this ));
     // hold a reference to the clone
@@ -232,8 +231,6 @@ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone()
 
 // ____ OPropertySet ____
 uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const
-    throw (beans::UnknownPropertyException,
-           uno::RuntimeException)
 {
     const tPropertyValueMap& rStaticDefaults = StaticDataSeriesDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -250,7 +247,6 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL DataSeries::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return StaticDataSeriesInfo::get();
 }
@@ -272,7 +268,6 @@ void SAL_CALL DataSeries::getFastPropertyValue
 
 void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast(
     sal_Int32 nHandle, const uno::Any& rValue )
-    throw (uno::Exception, std::exception)
 {
     if(    nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y
         || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X )
@@ -301,8 +296,6 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast(
 
 Reference< beans::XPropertySet >
     SAL_CALL DataSeries::getDataPointByIndex( sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xResult;
 
@@ -351,7 +344,6 @@ Reference< beans::XPropertySet >
 }
 
 void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex )
-        throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xDataPointProp;
     Reference< util::XModifyListener > xModifyEventForwarder;
@@ -376,7 +368,6 @@ void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex )
 }
 
 void SAL_CALL DataSeries::resetAllDataPoints()
-        throw (uno::RuntimeException, std::exception)
 {
     tDataPointAttributeContainer  aOldAttributedDataPoints;
     Reference< util::XModifyListener > xModifyEventForwarder;
@@ -392,7 +383,6 @@ void SAL_CALL DataSeries::resetAllDataPoints()
 
 // ____ XDataSink ____
 void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData )
-    throw (uno::RuntimeException, std::exception)
 {
     tDataSequenceContainer aOldDataSequences;
     tDataSequenceContainer aNewDataSequences;
@@ -415,7 +405,6 @@ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data:
 
 // ____ XDataSource ____
 Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries::getDataSequences()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return comphelper::containerToSequence( m_aDataSequences );
@@ -424,8 +413,6 @@ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries:
 // ____ XRegressionCurveContainer ____
 void SAL_CALL DataSeries::addRegressionCurve(
     const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     Reference< util::XModifyListener > xModifyEventForwarder;
     {
@@ -442,8 +429,6 @@ void SAL_CALL DataSeries::addRegressionCurve(
 
 void SAL_CALL DataSeries::removeRegressionCurve(
     const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve )
-    throw (container::NoSuchElementException,
-           uno::RuntimeException, std::exception)
 {
     if( !xRegressionCurve.is() )
         throw container::NoSuchElementException();
@@ -466,7 +451,6 @@ void SAL_CALL DataSeries::removeRegressionCurve(
 }
 
 uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries::getRegressionCurves()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return comphelper::containerToSequence( m_aRegressionCurves );
@@ -474,7 +458,6 @@ uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries:
 
 void SAL_CALL DataSeries::setRegressionCurves(
     const Sequence< Reference< chart2::XRegressionCurve > >& aRegressionCurves )
-    throw (uno::RuntimeException, std::exception)
 {
     tRegressionCurveContainerType aOldCurves;
     tRegressionCurveContainerType aNewCurves( ContainerHelper::SequenceToVector( aRegressionCurves ) );
@@ -492,7 +475,6 @@ void SAL_CALL DataSeries::setRegressionCurves(
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -506,7 +488,6 @@ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListe
 }
 
 void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -521,14 +502,12 @@ void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyLi
 
 // ____ XModifyListener ____
 void SAL_CALL DataSeries::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL DataSeries::disposing( const lang::EventObject& rEventObject )
-    throw (uno::RuntimeException, std::exception)
 {
     // forget disposed data sequences
     tDataSequenceContainer::iterator aIt(
@@ -556,19 +535,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet )
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 OUString SAL_CALL DataSeries::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.DataSeries");
 }
 
 sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart2.DataSeries",
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index f8323f06df61..47508e5d05f5 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -362,7 +362,6 @@ Diagram::~Diagram()
 
 // ____ XDiagram ____
 uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< beans::XPropertySet > xRet;
     bool bAddListener = false;
@@ -381,7 +380,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall()
 }
 
 uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< beans::XPropertySet > xRet;
     bool bAddListener = false;
@@ -400,14 +398,12 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor()
 }
 
 uno::Reference< chart2::XLegend > SAL_CALL Diagram::getLegend()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return m_xLegend;
 }
 
 void SAL_CALL Diagram::setLegend( const uno::Reference< chart2::XLegend >& xNewLegend )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XLegend > xOldLegend;
     {
@@ -425,7 +421,6 @@ void SAL_CALL Diagram::setLegend( const uno::Reference< chart2::XLegend >& xNewL
 }
 
 Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme()
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XColorScheme > xRet;
     {
@@ -443,7 +438,6 @@ Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme()
 }
 
 void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorScheme >& xColorScheme )
-    throw (uno::RuntimeException, std::exception)
 {
     {
         MutexGuard aGuard( GetMutex() );
@@ -455,7 +449,6 @@ void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorSch
 void SAL_CALL Diagram::setDiagramData(
     const Reference< chart2::data::XDataSource >& xDataSource,
     const Sequence< beans::PropertyValue >& aArguments )
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< lang::XMultiServiceFactory > xChartTypeManager( m_xContext->getServiceManager()->createInstanceWithContext(
             "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY );
@@ -470,14 +463,12 @@ void SAL_CALL Diagram::setDiagramData(
 
 // ____ XTitled ____
 uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return m_xTitle;
 }
 
 void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& xNewTitle )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XTitle > xOldTitle;
     {
@@ -496,19 +487,16 @@ void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& x
 
 // ____ X3DDefaultSetter ____
 void SAL_CALL Diagram::set3DSettingsToDefault()
-    throw (uno::RuntimeException, std::exception)
 {
     ThreeDHelper::set3DSettingsToDefault( this );
 }
 
 void SAL_CALL Diagram::setDefaultRotation()
-    throw (uno::RuntimeException, std::exception)
 {
     ThreeDHelper::setDefaultRotation( this );
 }
 
 void SAL_CALL Diagram::setDefaultIllumination()
-    throw (uno::RuntimeException, std::exception)
 {
     ThreeDHelper::setDefaultIllumination( this );
 }
@@ -516,8 +504,6 @@ void SAL_CALL Diagram::setDefaultIllumination()
 // ____ XCoordinateSystemContainer ____
 void SAL_CALL Diagram::addCoordinateSystem(
     const uno::Reference< chart2::XCoordinateSystem >& aCoordSys )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     {
         MutexGuard aGuard( GetMutex() );
@@ -538,8 +524,6 @@ void SAL_CALL Diagram::addCoordinateSystem(
 
 void SAL_CALL Diagram::removeCoordinateSystem(
     const uno::Reference< chart2::XCoordinateSystem >& aCoordSys )
-    throw (container::NoSuchElementException,
-           uno::RuntimeException, std::exception)
 {
     {
         MutexGuard aGuard( GetMutex() );
@@ -556,7 +540,6 @@ void SAL_CALL Diagram::removeCoordinateSystem(
 }
 
 uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::getCoordinateSystems()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return comphelper::containerToSequence( m_aCoordSystems );
@@ -564,8 +547,6 @@ uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::g
 
 void SAL_CALL Diagram::setCoordinateSystems(
     const Sequence< Reference< chart2::XCoordinateSystem > >& aCoordinateSystems )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     tCoordinateSystemContainerType aNew;
     tCoordinateSystemContainerType aOld;
@@ -586,7 +567,6 @@ void SAL_CALL Diagram::setCoordinateSystems(
 
 // ____ XCloneable ____
 Reference< util::XCloneable > SAL_CALL Diagram::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return Reference< util::XCloneable >( new Diagram( *this ));
@@ -594,7 +574,6 @@ Reference< util::XCloneable > SAL_CALL Diagram::createClone()
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -608,7 +587,6 @@ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener
 }
 
 void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -623,14 +601,12 @@ void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListe
 
 // ____ XModifyListener ____
 void SAL_CALL Diagram::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL Diagram::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -648,7 +624,6 @@ void Diagram::fireModifyEvent()
 
 // ____ OPropertySet ____
 uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticDiagramDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -665,17 +640,12 @@ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL Diagram::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticDiagramInfo::get();
 }
 
 // ____ XFastPropertySet ____
 void SAL_CALL Diagram::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
-    throw(beans::UnknownPropertyException,
-          beans::PropertyVetoException,
-          lang::IllegalArgumentException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     //special treatment for some 3D properties
     if( PROP_DIAGRAM_PERSPECTIVE == nHandle )
@@ -735,19 +705,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 OUString SAL_CALL Diagram::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.Diagram");
 }
 
 sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart2.Diagram",
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 4396a584b71a..bc0224d88b2e 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -113,21 +113,18 @@ FormattedString::~FormattedString()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new FormattedString( *this ));
 }
 
 // ____ XFormattedString ____
 OUString SAL_CALL FormattedString::getString()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex());
     return m_aString;
 }
 
 void SAL_CALL FormattedString::setString( const OUString& String )
-    throw (uno::RuntimeException, std::exception)
 {
     {
         MutexGuard aGuard( GetMutex());
@@ -140,7 +137,6 @@ void SAL_CALL FormattedString::setString( const OUString& String )
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -154,7 +150,6 @@ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XM
 }
 
 void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -169,14 +164,12 @@ void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util:
 
 // ____ XModifyListener ____
 void SAL_CALL FormattedString::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL FormattedString::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -194,7 +187,6 @@ void FormattedString::fireModifyEvent()
 
 // ____ OPropertySet ____
 uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const
-    throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticFormattedStringDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -211,7 +203,6 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL FormattedString::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticFormattedStringInfo::get();
 }
@@ -225,19 +216,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 OUString SAL_CALL FormattedString::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.FormattedString");
 }
 
 sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart2.FormattedString",
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 2eb5565bd64b..2a1ea0cf9cc2 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -54,74 +54,61 @@ public:
     virtual ~FormattedString() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
     DECLARE_XINTERFACE()
     /// merge XTypeProvider implementations
     DECLARE_XTYPEPROVIDER()
 
-    virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override
         { ::property::OPropertySet::setPropertyValue(p1, p2); }
-    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override
         { return ::property::OPropertySet::getPropertyValue(p1); }
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
         { ::property::OPropertySet::addPropertyChangeListener(p1, p2); }
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
         { ::property::OPropertySet::removePropertyChangeListener(p1, p2); }
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
         { ::property::OPropertySet::addVetoableChangeListener(p1, p2); }
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
         { ::property::OPropertySet::removeVetoableChangeListener(p1, p2); }
 
 protected:
     explicit FormattedString( const FormattedString & rOther );
 
     // ____ XFormattedString ____
-    virtual OUString SAL_CALL getString()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString( const OUString& String )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString( const OUString& String ) override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index 6c6dee23a355..4014cbd1dda6 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -149,7 +149,6 @@ GridProperties::~GridProperties()
 
 // ____ OPropertySet ____
 uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticGridDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -165,21 +164,18 @@ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL GridProperties::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticGridInfo::get();
 }
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL GridProperties::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new GridProperties( *this ));
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -193,7 +189,6 @@ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyL
 }
 
 void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -208,14 +203,12 @@ void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModi
 
 // ____ XModifyListener ____
 void SAL_CALL GridProperties::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL GridProperties::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -228,19 +221,16 @@ void GridProperties::firePropertyChangeEvent()
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 OUString SAL_CALL GridProperties::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.GridProperties");
 }
 
 sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL GridProperties::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart2.GridProperties",
diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx
index a38481edaf06..798ae0e8a3b7 100644
--- a/chart2/source/model/main/GridProperties.hxx
+++ b/chart2/source/model/main/GridProperties.hxx
@@ -56,12 +56,9 @@ public:
     virtual ~GridProperties() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
      DECLARE_XINTERFACE()
@@ -72,37 +69,30 @@ protected:
     explicit GridProperties( const GridProperties & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 3df5156c86b0..a3a80d642875 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -201,14 +201,12 @@ Legend::~Legend()
 
 // ____ XCloneable ____
 Reference< util::XCloneable > SAL_CALL Legend::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return Reference< util::XCloneable >( new Legend( *this ));
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -222,7 +220,6 @@ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener
 }
 
 void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -237,14 +234,12 @@ void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListen
 
 // ____ XModifyListener ____
 void SAL_CALL Legend::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL Legend::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -257,7 +252,6 @@ void Legend::firePropertyChangeEvent()
 
 // ____ OPropertySet ____
 Any Legend::GetDefaultValue( sal_Int32 nHandle ) const
-    throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticLegendDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -273,26 +267,22 @@ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticLegendInfo::get();
 }
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 OUString SAL_CALL Legend::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.Legend");
 }
 
 sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL Legend::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart2.Legend",
diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx
index 8b1a270f1412..044657195d00 100644
--- a/chart2/source/model/main/Legend.hxx
+++ b/chart2/source/model/main/Legend.hxx
@@ -55,12 +55,9 @@ public:
     virtual ~Legend() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
      DECLARE_XINTERFACE()
@@ -71,38 +68,31 @@ protected:
     explicit Legend( const Legend & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 0252c8c431ba..52308600f912 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -127,14 +127,12 @@ PageBackground::~PageBackground()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL PageBackground::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new PageBackground( *this ));
 }
 
 // ____ OPropertySet ____
 uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticPageBackgroundDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -150,14 +148,12 @@ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL PageBackground::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticPageBackgroundInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -171,7 +167,6 @@ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XMo
 }
 
 void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -186,14 +181,12 @@ void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util::
 
 // ____ XModifyListener ____
 void SAL_CALL PageBackground::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL PageBackground::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -205,19 +198,16 @@ void PageBackground::firePropertyChangeEvent()
 }
 
 OUString SAL_CALL PageBackground::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.PageBackground");
 }
 
 sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL PageBackground::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart2.PageBackground",
diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx
index 280ff9b9cde6..f83fd16c75d9 100644
--- a/chart2/source/model/main/PageBackground.hxx
+++ b/chart2/source/model/main/PageBackground.hxx
@@ -52,12 +52,9 @@ public:
     virtual ~PageBackground() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
      DECLARE_XINTERFACE()
@@ -66,38 +63,31 @@ protected:
     explicit PageBackground( const PageBackground & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index 6c26feb60da2..e4ae8792000d 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -55,39 +55,33 @@ PolarCoordinateSystem::~PolarCoordinateSystem()
 
 // ____ XCoordinateSystem ____
 OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType()
-    throw (RuntimeException, std::exception)
 {
     return OUString(CHART2_COOSYSTEM_POLAR_SERVICE_NAME);
 }
 
 OUString SAL_CALL PolarCoordinateSystem::getViewServiceName()
-    throw (RuntimeException, std::exception)
 {
     return OUString(CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME);
 }
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone()
-    throw (RuntimeException, std::exception)
 {
     return Reference< util::XCloneable >( new PolarCoordinateSystem( *this ));
 }
 
 // ____ XServiceInfo ____
 OUString SAL_CALL PolarCoordinateSystem::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.PolarCoordinateSystem");
 }
 
 sal_Bool SAL_CALL PolarCoordinateSystem::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME };
 }
@@ -104,19 +98,16 @@ PolarCoordinateSystem2d::~PolarCoordinateSystem2d()
 
 // ____ XServiceInfo ____
 OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem2d") ;
 }
 
 sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_COOSYSTEM_POLAR_SERVICE_NAME,
@@ -135,19 +126,16 @@ PolarCoordinateSystem3d::~PolarCoordinateSystem3d()
 
 // ____ XServiceInfo ____
 OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem3d");
 }
 
 sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_COOSYSTEM_POLAR_SERVICE_NAME,
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 206e48bd85d9..480cc29a41d0 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -138,14 +138,12 @@ StockBar::~StockBar()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL StockBar::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new StockBar( *this ));
 }
 
 // ____ OPropertySet ____
 uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticStockBarDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -161,14 +159,12 @@ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL StockBar::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticStockBarInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -182,7 +178,6 @@ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyLi
 }
 
 void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -197,14 +192,12 @@ void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModif
 
 // ____ XModifyListener ____
 void SAL_CALL StockBar::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL StockBar::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 621ec2b3143a..042b8ad18ec5 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -265,21 +265,18 @@ Title::~Title()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL Title::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new Title( *this ));
 }
 
 // ____ XTitle ____
 uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL Title::getText()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return m_aStrings;
 }
 
 void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& rNewStrings )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Reference< chart2::XFormattedString > > aOldStrings;
     {
@@ -297,7 +294,6 @@ void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XForm
 
 // ____ OPropertySet ____
 uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticTitleDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -313,14 +309,12 @@ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL Title::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticTitleInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -334,7 +328,6 @@ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListe
 }
 
 void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -349,14 +342,12 @@ void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyLi
 
 // ____ XModifyListener ____
 void SAL_CALL Title::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL Title::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -373,19 +364,16 @@ void Title::fireModifyEvent()
 }
 
 OUString SAL_CALL Title::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.Title");
 }
 
 sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL Title::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart2.Title",
diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx
index e6ff363c6019..95545cd8f8d7 100644
--- a/chart2/source/model/main/Title.hxx
+++ b/chart2/source/model/main/Title.hxx
@@ -53,12 +53,9 @@ public:
     virtual ~Title() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// merge XInterface implementations
      DECLARE_XINTERFACE()
@@ -69,44 +66,35 @@ protected:
     explicit Title( const Title & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XTitle ____
-    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& Strings )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& Strings ) override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 08095b2c77fc..664149926c26 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -197,31 +197,31 @@ namespace chart
         m_pImpl->disposing();
     }
 
-    void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard );
     }
 
-    void SAL_CALL UndoManager::enterHiddenUndoContext(  ) throw (EmptyUndoStackException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::enterHiddenUndoContext(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().enterHiddenUndoContext( aGuard );
     }
 
-    void SAL_CALL UndoManager::leaveUndoContext(  ) throw (InvalidStateException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::leaveUndoContext(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().leaveUndoContext( aGuard );
     }
 
-    void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().addUndoAction( i_action, aGuard );
     }
 
-    void SAL_CALL UndoManager::undo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::undo(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().undo( aGuard );
@@ -229,7 +229,7 @@ namespace chart
         ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) );
     }
 
-    void SAL_CALL UndoManager::redo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::redo(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().redo( aGuard );
@@ -237,110 +237,110 @@ namespace chart
         ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) );
     }
 
-    sal_Bool SAL_CALL UndoManager::isUndoPossible(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL UndoManager::isUndoPossible(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().isUndoPossible();
     }
 
-    sal_Bool SAL_CALL UndoManager::isRedoPossible(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL UndoManager::isRedoPossible(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().isRedoPossible();
     }
 
-    OUString SAL_CALL UndoManager::getCurrentUndoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException, std::exception)
+    OUString SAL_CALL UndoManager::getCurrentUndoActionTitle(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().getCurrentUndoActionTitle();
     }
 
-    OUString SAL_CALL UndoManager::getCurrentRedoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException, std::exception)
+    OUString SAL_CALL UndoManager::getCurrentRedoActionTitle(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().getCurrentRedoActionTitle();
     }
 
-    Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().getAllUndoActionTitles();
     }
 
-    Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().getAllRedoActionTitles();
     }
 
-    void SAL_CALL UndoManager::clear(  ) throw (UndoContextNotClosedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::clear(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().clear( aGuard );
     }
 
-    void SAL_CALL UndoManager::clearRedo(  ) throw (UndoContextNotClosedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::clearRedo(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().clearRedo( aGuard );
     }
 
-    void SAL_CALL UndoManager::reset(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::reset(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().reset( aGuard );
     }
 
-    void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().addUndoManagerListener( i_listener );
     }
 
-    void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().removeUndoManagerListener( i_listener );
     }
 
-    void SAL_CALL UndoManager::lock(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::lock(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().lock();
     }
 
-    void SAL_CALL UndoManager::unlock(  ) throw (NotLockedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::unlock(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().unlock();
     }
 
-    sal_Bool SAL_CALL UndoManager::isLocked(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL UndoManager::isLocked(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().isLocked();
     }
 
-    Reference< XInterface > SAL_CALL UndoManager::getParent(  ) throw (RuntimeException, std::exception)
+    Reference< XInterface > SAL_CALL UndoManager::getParent(  )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return *&m_pImpl->getParent();
     }
 
-    void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         (void)i_parent;
         throw NoSupportException( OUString(), m_pImpl->getThis() );
     }
 
-    void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().addModifyListener( i_listener );
     }
 
-    void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener )
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().removeModifyListener( i_listener );
diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx
index 8c07a8dcc9e9..47b4e82aca2b 100644
--- a/chart2/source/model/main/UndoManager.hxx
+++ b/chart2/source/model/main/UndoManager.hxx
@@ -53,36 +53,36 @@ namespace chart
         void disposing();
 
         // XUndoManager
-        virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL enterHiddenUndoContext(  ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL leaveUndoContext(  ) throw (css::util::InvalidStateException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL undo(  ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL redo(  ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isUndoPossible(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isRedoPossible(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCurrentUndoActionTitle(  ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCurrentRedoActionTitle(  ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clear(  ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearRedo(  ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL reset(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL enterUndoContext( const OUString& i_title ) override;
+        virtual void SAL_CALL enterHiddenUndoContext(  ) override;
+        virtual void SAL_CALL leaveUndoContext(  ) override;
+        virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) override;
+        virtual void SAL_CALL undo(  ) override;
+        virtual void SAL_CALL redo(  ) override;
+        virtual sal_Bool SAL_CALL isUndoPossible(  ) override;
+        virtual sal_Bool SAL_CALL isRedoPossible(  ) override;
+        virtual OUString SAL_CALL getCurrentUndoActionTitle(  ) override;
+        virtual OUString SAL_CALL getCurrentRedoActionTitle(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles(  ) override;
+        virtual void SAL_CALL clear(  ) override;
+        virtual void SAL_CALL clearRedo(  ) override;
+        virtual void SAL_CALL reset(  ) override;
+        virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override;
+        virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override;
 
         // XLockable (base of XUndoManager)
-        virtual void SAL_CALL lock(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL unlock(  ) throw (css::util::NotLockedException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLocked(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL lock(  ) override;
+        virtual void SAL_CALL unlock(  ) override;
+        virtual sal_Bool SAL_CALL isLocked(  ) override;
 
         // XChild (base of XUndoManager)
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
         // XModifyBroadcaster
-        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     private:
         std::unique_ptr< impl::UndoManager_Impl >   m_pImpl;
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index d47824fef502..dae09c4ac598 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -131,14 +131,12 @@ Wall::~Wall()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL Wall::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new Wall( *this ));
 }
 
 // ____ OPropertySet ____
 uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticWallDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -154,14 +152,12 @@ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL Wall::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticWallInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -175,7 +171,6 @@ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListen
 }
 
 void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -190,14 +185,12 @@ void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyLis
 
 // ____ XModifyListener ____
 void SAL_CALL Wall::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL Wall::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx
index 5a67938c1684..eede7dca5278 100644
--- a/chart2/source/model/main/Wall.hxx
+++ b/chart2/source/model/main/Wall.hxx
@@ -58,38 +58,31 @@ protected:
     explicit Wall( const Wall & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ OPropertySet ____
     virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx
index 21d96fac7e9d..163ba7863c7d 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -41,32 +41,27 @@ AreaChartType::~AreaChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new AreaChartType( *this ));
 }
 
 // ____ XChartType ____
 OUString SAL_CALL AreaChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_AREA);
 }
 
 OUString SAL_CALL AreaChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.AreaChartType");
 }
 
 sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_AREA,
diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx
index 2a9c99f5cd1d..9cbc090f8e3f 100644
--- a/chart2/source/model/template/AreaChartType.hxx
+++ b/chart2/source/model/template/AreaChartType.hxx
@@ -31,25 +31,20 @@ public:
     virtual ~AreaChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit AreaChartType( const AreaChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index d26bc1569ddc..3353d0d752f7 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -130,7 +130,6 @@ AreaChartTypeTemplate::~AreaChartTypeTemplate()
 
 // ____ OPropertySet ____
 uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticAreaChartTypeTemplateDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -146,7 +145,6 @@ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL AreaChartTypeTemplate::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticAreaChartTypeTemplateInfo::get();
 }
@@ -179,14 +177,12 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 nSeriesIndex,
     ::sal_Int32 nSeriesCount )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
     DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
 }
 
 void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::resetStyles( xDiagram );
     ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
@@ -227,7 +223,6 @@ Reference< chart2::XChartType > AreaChartTypeTemplate::getChartTypeForIndex( sal
 
 Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForNewSeries(
         const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
     ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult );
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx
index 83d73c1687e6..2fc2f9b0a0d4 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.hxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx
@@ -49,29 +49,24 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XChartTypeTemplate ____
     virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL
         getChartTypeForNewSeries( const css::uno::Sequence<
-            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes )
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeGroupIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
     virtual void SAL_CALL resetStyles(
-        const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
 
     // ____ ChartTypeTemplate ____
     virtual css::uno::Reference< css::chart2::XChartType >
diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx
index 3a61a04dc177..0a05980def8a 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -42,20 +42,17 @@ BarChartType::~BarChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new BarChartType( *this ));
 }
 
 // ____ XChartType ____
 OUString SAL_CALL BarChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BAR);
 }
 
 uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aPropRoles(2);
     aPropRoles[0] = "FillColor";
@@ -65,19 +62,16 @@ uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles()
 }
 
 OUString SAL_CALL BarChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.BarChartType");
 }
 
 sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_BAR,
diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx
index 6c79298d6609..0db8a8b7d5d5 100644
--- a/chart2/source/model/template/BarChartType.hxx
+++ b/chart2/source/model/template/BarChartType.hxx
@@ -31,28 +31,22 @@ public:
     virtual ~BarChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit BarChartType( const BarChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedPropertyRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedPropertyRoles() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 1296b5215b05..b06e7bb08746 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -162,7 +162,6 @@ bool BarChartTypeTemplate::isSwapXAndY() const
 sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate(
     const Reference< chart2::XDiagram >& xDiagram,
     sal_Bool bAdaptProperties )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
@@ -217,7 +216,6 @@ Reference< chart2::XChartType > BarChartTypeTemplate::getChartTypeForIndex( sal_
 
 Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNewSeries(
         const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
     ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult );
@@ -226,7 +224,6 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe
 
 // ____ OPropertySet ____
 uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticBarChartTypeTemplateDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -242,7 +239,6 @@ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL BarChartTypeTemplate::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticBarChartTypeTemplateInfo::get();
 }
@@ -252,7 +248,6 @@ void SAL_CALL BarChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 nSeriesIndex,
     ::sal_Int32 nSeriesCount )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
     DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
@@ -274,7 +269,6 @@ void SAL_CALL BarChartTypeTemplate::applyStyle(
 
 void SAL_CALL BarChartTypeTemplate::resetStyles(
     const Reference< chart2::XDiagram >& xDiagram )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::resetStyles( xDiagram );
     ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx
index 73b98fa1fe56..79b440548356 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.hxx
@@ -56,33 +56,27 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XChartTypeTemplate ____
     virtual sal_Bool SAL_CALL matchesTemplate(
         const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
-        sal_Bool bAdaptProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bAdaptProperties ) override;
     virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL
         getChartTypeForNewSeries( const css::uno::Sequence<
-            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes )
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeGroupIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
     virtual void SAL_CALL resetStyles(
-        const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
 
     // ____ ChartTypeTemplate ____
     virtual css::uno::Reference< css::chart2::XChartType >
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index ba23686d24d7..4af09ba28611 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -110,7 +110,6 @@ BubbleChartType::~BubbleChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new BubbleChartType( *this ));
 }
@@ -118,8 +117,6 @@ uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone()
 // ____ XChartType ____
 Reference< chart2::XCoordinateSystem > SAL_CALL
     BubbleChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     Reference< chart2::XCoordinateSystem > xResult(
         new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
@@ -149,13 +146,11 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 }
 
 OUString SAL_CALL BubbleChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE);
 }
 
 uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aMandRolesSeq(4);
     aMandRolesSeq[0] = "label";
@@ -166,7 +161,6 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles()
 }
 
 uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedPropertyRoles()
-    throw(css::uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aPropertyRoles(2);
     aPropertyRoles[0] = "FillColor";
@@ -175,14 +169,12 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedPropertyRoles()
 }
 
 OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("values-size");
 }
 
 // ____ OPropertySet ____
 uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticBubbleChartTypeDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -199,25 +191,21 @@ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticBubbleChartTypeInfo::get();
 }
 
 OUString SAL_CALL BubbleChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.BubbleChartType");
 }
 
 sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE,
diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx
index cc0e94406f45..c3248c0b1a4a 100644
--- a/chart2/source/model/template/BubbleChartType.hxx
+++ b/chart2/source/model/template/BubbleChartType.hxx
@@ -33,49 +33,37 @@ public:
     virtual ~BubbleChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit BubbleChartType( const BubbleChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedMandatoryRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedMandatoryRoles() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedPropertyRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedPropertyRoles() override;
     virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL
-        createCoordinateSystem( ::sal_Int32 DimensionCount )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createCoordinateSystem( ::sal_Int32 DimensionCount ) override;
+    virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index dfda9beab891..78a297305aa1 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -111,7 +111,6 @@ BubbleChartTypeTemplate::~BubbleChartTypeTemplate()
 
 // ____ OPropertySet ____
 uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticBubbleChartTypeTemplateDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -127,7 +126,6 @@ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartTypeTemplate::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticBubbleChartTypeTemplateInfo::get();
 }
@@ -147,7 +145,6 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 nSeriesIndex,
     ::sal_Int32 nSeriesCount )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
     DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) );
@@ -155,7 +152,6 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle(
 
 // ____ XChartTypeTemplate ____
 sal_Bool SAL_CALL BubbleChartTypeTemplate::supportsCategories()
-    throw (uno::RuntimeException, std::exception)
 {
     return false;
 }
@@ -181,7 +177,6 @@ Reference< chart2::XChartType > BubbleChartTypeTemplate::getChartTypeForIndex( s
 
 Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeForNewSeries(
         const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XChartType > xResult;
 
@@ -203,7 +198,6 @@ Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeFo
 }
 
 Reference< chart2::XDataInterpreter > SAL_CALL BubbleChartTypeTemplate::getDataInterpreter()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xDataInterpreter.is())
         m_xDataInterpreter.set( new BubbleDataInterpreter );
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
index e5e135726f5f..a57b6e4104e4 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
@@ -45,29 +45,23 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XChartTypeTemplate ____
-    virtual sal_Bool SAL_CALL supportsCategories()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsCategories() override;
     virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL
-        getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override;
+    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeGroupIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
 
     // ____ ChartTypeTemplate ____
     virtual css::uno::Reference< css::chart2::XChartType >
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index 76b202829e75..a43356152f7e 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -50,7 +50,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
     const Reference< chart2::data::XDataSource >& xSource,
     const Sequence< beans::PropertyValue >& aArguments,
     const Sequence< Reference< XDataSeries > >& aSeriesToReUse )
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! xSource.is())
         return InterpretedData();
@@ -159,7 +158,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
 
 chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries(
     const chart2::InterpretedData& aInterpretedData )
-    throw (uno::RuntimeException, std::exception)
 {
     InterpretedData aResult( aInterpretedData );
 
@@ -270,7 +268,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries(
 
 sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible(
     const chart2::InterpretedData& aInterpretedData )
-    throw (uno::RuntimeException, std::exception)
 {
     Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series ));
     for( sal_Int32 i=0; i<aSeries.getLength(); ++i )
diff --git a/chart2/source/model/template/BubbleDataInterpreter.hxx b/chart2/source/model/template/BubbleDataInterpreter.hxx
index 59ad9a821cc1..43921262ed2a 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.hxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.hxx
@@ -35,14 +35,11 @@ protected:
     virtual css::chart2::InterpretedData SAL_CALL interpretDataSource(
         const css::uno::Reference< css::chart2::data::XDataSource >& xSource,
         const css::uno::Sequence< css::beans::PropertyValue >& aArguments,
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override;
     virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries(
-        const css::chart2::InterpretedData& aInterpretedData )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::chart2::InterpretedData& aInterpretedData ) override;
     virtual sal_Bool SAL_CALL isDataCompatible(
-        const css::chart2::InterpretedData& aInterpretedData )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::chart2::InterpretedData& aInterpretedData ) override;
 };
 
 } // namespace chart
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 3062cc2151c7..22c74c5ff7ea 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -206,20 +206,17 @@ CandleStickChartType::~CandleStickChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new CandleStickChartType( *this ));
 }
 
 // ____ XChartType ____
 OUString SAL_CALL CandleStickChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK);
 }
 
 uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     bool bShowFirst = true;
     bool bShowHiLow = false;
@@ -244,7 +241,6 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo
 }
 
 Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     bool bShowFirst = true;
     bool bShowHiLow = false;
@@ -266,14 +262,12 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles()
 }
 
 OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("values-last");
 }
 
 // ____ OPropertySet ____
 uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticCandleStickChartTypeDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -290,14 +284,12 @@ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL CandleStickChartType::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticCandleStickChartTypeInfo::get();
 }
 
 void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
     sal_Int32 nHandle, const uno::Any& rValue )
-    throw (uno::Exception, std::exception)
 {
     if(    nHandle == PROP_CANDLESTICKCHARTTYPE_WHITE_DAY
         || nHandle == PROP_CANDLESTICKCHARTTYPE_BLACK_DAY )
@@ -325,19 +317,16 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
 }
 
 OUString SAL_CALL CandleStickChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.CandleStickChartType") ;
 }
 
 sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK,
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx
index 1bbca51d7814..2e9ae89256f7 100644
--- a/chart2/source/model/template/CandleStickChartType.hxx
+++ b/chart2/source/model/template/CandleStickChartType.hxx
@@ -32,33 +32,25 @@ public:
     virtual ~CandleStickChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit CandleStickChartType( const CandleStickChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedMandatoryRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedMandatoryRoles() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedOptionalRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedOptionalRoles() override;
+    virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
@@ -66,17 +58,14 @@ protected:
     // ____ OPropertySet ____
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast
         ( sal_Int32 nHandle,
-          const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+          const css::uno::Any& rValue ) override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 479e6c1a7190..e17a5344542d 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -71,8 +71,6 @@ ChartType::~ChartType()
 // ____ XChartType ____
 Reference< chart2::XCoordinateSystem > SAL_CALL
     ChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     Reference< chart2::XCoordinateSystem > xResult(
         new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
@@ -104,7 +102,6 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 }
 
 Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     Sequence< OUString > aDefaultSeq(2);
     aDefaultSeq[0] = "label";
@@ -113,19 +110,16 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles()
 }
 
 Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     return Sequence< OUString >();
 }
 
 Sequence< OUString > SAL_CALL ChartType::getSupportedPropertyRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     return Sequence< OUString >();
 }
 
 OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("values-y");
 }
@@ -143,8 +137,6 @@ void ChartType::impl_addDataSeriesWithoutNotification(
 
 // ____ XDataSeriesContainer ____
 void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >& xDataSeries )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -153,8 +145,6 @@ void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >&
 }
 
 void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries >& xDataSeries )
-    throw (container::NoSuchElementException,
-           uno::RuntimeException, std::exception)
 {
     if( !xDataSeries.is())
         throw container::NoSuchElementException();
@@ -175,7 +165,6 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries
 }
 
 Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartType::getDataSeries()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -183,8 +172,6 @@ Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartType::getDataSeries()
 }
 
 void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XDataSeries > >& aDataSeries )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -210,7 +197,6 @@ void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XData
 
 // ____ OPropertySet ____
 uno::Any ChartType::GetDefaultValue( sal_Int32 /* nHandle */ ) const
-    throw(beans::UnknownPropertyException)
 {
     return uno::Any();
 }
@@ -255,14 +241,12 @@ struct StaticChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans:
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL ChartType::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticChartTypeInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -276,7 +260,6 @@ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyL
 }
 
 void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -291,14 +274,12 @@ void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModi
 
 // ____ XModifyListener ____
 void SAL_CALL ChartType::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL ChartType::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index ef702bc71e46..f239f7f38824 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -67,63 +67,44 @@ protected:
 
     // ____ XChartType ____
     // still abstract ! implement !
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override = 0;
+    virtual OUString SAL_CALL getChartType() override = 0;
     virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL
-        createCoordinateSystem( ::sal_Int32 DimensionCount )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        createCoordinateSystem( ::sal_Int32 DimensionCount ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedMandatoryRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedMandatoryRoles() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedOptionalRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedOptionalRoles() override;
+    virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedPropertyRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedPropertyRoles() override;
 
     // ____ XDataSeriesContainer ____
     virtual void SAL_CALL addDataSeries(
-        const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) override;
     virtual void SAL_CALL removeDataSeries(
-        const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > SAL_CALL getDataSeries()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > SAL_CALL getDataSeries() override;
     virtual void SAL_CALL setDataSeries(
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aDataSeries )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aDataSeries ) override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     void fireModifyEvent();
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     virtual void firePropertyChangeEvent() override;
@@ -131,8 +112,7 @@ protected:
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     /// merge XTypeProvider implementations
      DECLARE_XTYPEPROVIDER()
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 664f3e2eeaa4..08eba875e4b0 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -235,8 +235,6 @@ ChartTypeManager::~ChartTypeManager()
 // ____ XMultiServiceFactory ____
 uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance(
     const OUString& aServiceSpecifier )
-    throw (uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface > xResult;
     TemplateId nId = lcl_GetTemplateIdForService( aServiceSpecifier );
@@ -558,15 +556,12 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance(
 uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithArguments(
     const OUString& ServiceSpecifier,
     const uno::Sequence< uno::Any >& /* Arguments */ )
-    throw (uno::Exception,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "createInstanceWithArguments: No arguments supported" );
     return createInstance( ServiceSpecifier );
 }
 
 uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     ::std::vector< OUString > aServices;
     const tTemplateMapType & rMap = lcl_DefaultChartTypeMap();
@@ -604,19 +599,16 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
 
 // ____ XServiceInfo ____
 OUString SAL_CALL ChartTypeManager::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.ChartTypeManager");
 }
 
 sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         "com.sun.star.chart2.ChartTypeManager",
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 06915bab71ec..da1cfefda6bf 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -139,7 +139,6 @@ ChartTypeTemplate::~ChartTypeTemplate()
 uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource(
     const uno::Reference< data::XDataSource >& xDataSource,
     const uno::Sequence< beans::PropertyValue >& aArguments )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< XDiagram > xDia;
 
@@ -178,13 +177,11 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource
 }
 
 sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories()
-    throw (css::uno::RuntimeException, ::std::exception)
 {
     return true;
 }
 
 void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >& xDiagram )
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! xDiagram.is())
         return;
@@ -262,7 +259,6 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData(
     const Reference< chart2::XDiagram >& xDiagram,
     const Reference< chart2::data::XDataSource >& xDataSource,
     const Sequence< beans::PropertyValue >& aArguments )
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! (xDiagram.is() &&
            xDataSource.is()) )
@@ -313,7 +309,6 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData(
 sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate(
     const Reference< chart2::XDiagram >& xDiagram,
     sal_Bool /* bAdaptProperties */ )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = false;
 
@@ -373,7 +368,6 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate(
 }
 
 Reference< chart2::XDataInterpreter > SAL_CALL ChartTypeTemplate::getDataInterpreter()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xDataInterpreter.is())
         m_xDataInterpreter.set( new DataInterpreter );
@@ -386,7 +380,6 @@ void SAL_CALL ChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 /* nSeriesIndex */,
     ::sal_Int32 /* nSeriesCount */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // sset stacking mode
     Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY );
@@ -424,7 +417,6 @@ void SAL_CALL ChartTypeTemplate::applyStyle(
 }
 
 void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram >& xDiagram )
-    throw (uno::RuntimeException)
 {
     // apply chart-type specific styles, like "symbols on" for example
     Sequence< Sequence< Reference< XDataSeries > > > aNewSeriesSeq(
@@ -441,7 +433,6 @@ void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram
 }
 
 void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram )
-    throw (uno::RuntimeException, std::exception)
 {
     // reset number format if we had percent stacking on
     bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
@@ -521,7 +512,6 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram
 
 // ____ XServiceName ____
     OUString SAL_CALL ChartTypeTemplate::getServiceName()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_aServiceName;
 }
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index 6bc9fae1efc6..c32fcbd7934a 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -82,46 +82,36 @@ protected:
     // ____ XChartTypeTemplate ____
     virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL createDiagramByDataSource(
         const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource,
-        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
     /// denotes if the chart needs categories at the first scale
-    virtual sal_Bool SAL_CALL supportsCategories()
-        throw (css::uno::RuntimeException, ::std::exception) override;
+    virtual sal_Bool SAL_CALL supportsCategories() override;
 
     virtual void SAL_CALL changeDiagram(
-        const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
     virtual void SAL_CALL changeDiagramData(
         const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
         const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource,
-        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
     virtual sal_Bool SAL_CALL matchesTemplate(
         const css::uno::Reference<
         css::chart2::XDiagram >& xDiagram,
-        sal_Bool bAdaptProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bAdaptProperties ) override;
     // still abstract: getChartTypeForNewSeries()
-    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
     virtual void SAL_CALL resetStyles(
-        const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
 
     /// @throws css::uno::RuntimeException
     void SAL_CALL applyStyles(
-        const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram );
 
     // ____ XServiceName ____
-    virtual OUString SAL_CALL getServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // Methods to override for automatic creation
 
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index 3b6f23cca403..84c6054badbd 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -140,20 +140,17 @@ ColumnChartType::~ColumnChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new ColumnChartType( *this ));
 }
 
 // ____ XChartType ____
 OUString SAL_CALL ColumnChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN);
 }
 
 uno::Sequence< OUString > ColumnChartType::getSupportedPropertyRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aPropRoles(2);
     aPropRoles[0] = "FillColor";
@@ -164,7 +161,6 @@ uno::Sequence< OUString > ColumnChartType::getSupportedPropertyRoles()
 
 // ____ OPropertySet ____
 uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticColumnChartTypeDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -180,25 +176,21 @@ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticColumnChartTypeInfo::get();
 }
 
 OUString SAL_CALL ColumnChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.ColumnChartType");
 }
 
 sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_COLUMN,
diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx
index f37f845c7ee4..5f2aaea15b14 100644
--- a/chart2/source/model/template/ColumnChartType.hxx
+++ b/chart2/source/model/template/ColumnChartType.hxx
@@ -31,38 +31,30 @@ public:
     virtual ~ColumnChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit ColumnChartType( const ColumnChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedPropertyRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedPropertyRoles() override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 4868df4d4754..9809cd0f0845 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -135,7 +135,6 @@ ColumnLineChartTypeTemplate::~ColumnLineChartTypeTemplate()
 
 // ____ OPropertySet ____
 uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticColumnLineChartTypeTemplateDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -151,7 +150,6 @@ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnLineChartTypeTemplate::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticColumnLineChartTypeTemplateInfo::get();
 }
@@ -239,7 +237,6 @@ void SAL_CALL ColumnLineChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 nSeriesIndex,
     ::sal_Int32 nSeriesCount )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
 
@@ -270,7 +267,6 @@ StackMode ColumnLineChartTypeTemplate::getStackMode( sal_Int32 nChartTypeIndex )
 sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate(
     const uno::Reference< XDiagram >& xDiagram,
     sal_Bool bAdaptProperties )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = false;
 
@@ -367,7 +363,6 @@ Reference< chart2::XChartType > ColumnLineChartTypeTemplate::getChartTypeForInde
 
 Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNewSeries(
         const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XChartType > xResult;
 
@@ -388,7 +383,6 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew
 }
 
 Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInterpreter()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xDataInterpreter.is())
     {
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
index 80a15444d598..8dcd13461fa6 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
@@ -49,32 +49,26 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XChartTypeTemplate ____
     virtual sal_Bool SAL_CALL matchesTemplate(
         const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
-        sal_Bool bAdaptProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bAdaptProperties ) override;
     virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL
         getChartTypeForNewSeries( const css::uno::Sequence<
-            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes )
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeGroupIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter()
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
+    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override;
 
     // ____ ChartTypeTemplate ____
     virtual void createChartTypes(
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 3f41a7016664..735ca0ba976d 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -54,7 +54,6 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource(
     const Reference< data::XDataSource >& xSource,
     const Sequence< beans::PropertyValue >& aArguments,
     const Sequence< Reference< XDataSeries > >& aSeriesToReUse )
-    throw (uno::RuntimeException, std::exception)
 {
     InterpretedData aResult(  DataInterpreter::interpretDataSource( xSource, aArguments, aSeriesToReUse ));
 
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx
index 5d113be6b029..e6956db4cd30 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx
@@ -36,8 +36,7 @@ protected:
     virtual css::chart2::InterpretedData SAL_CALL interpretDataSource(
         const css::uno::Reference< css::chart2::data::XDataSource >& xSource,
         const css::uno::Sequence< css::beans::PropertyValue >& aArguments,
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override;
 
 private:
     sal_Int32 m_nNumberOfLines;
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 052fe51ae75d..d3e7c85f5352 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -59,7 +59,6 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
     const Reference< data::XDataSource >& xSource,
     const Sequence< beans::PropertyValue >& aArguments,
     const Sequence< Reference< XDataSeries > >& aSeriesToReUse )
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! xSource.is())
         return InterpretedData();
@@ -134,7 +133,6 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
 
 InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries(
     const InterpretedData& aInterpretedData )
-    throw (uno::RuntimeException, std::exception)
 {
     InterpretedData aResult( aInterpretedData );
 
@@ -191,7 +189,6 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries(
 // criterion: all series must have exactly one data::XLabeledDataSequence
 sal_Bool SAL_CALL DataInterpreter::isDataCompatible(
     const chart2::InterpretedData& aInterpretedData )
-    throw (uno::RuntimeException, std::exception)
 {
     Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series ));
     for( sal_Int32 i=0; i<aSeries.getLength(); ++i )
@@ -267,7 +264,6 @@ private:
 
 Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData(
     const InterpretedData& aInterpretedData )
-    throw (uno::RuntimeException, std::exception)
 {
     vector< Reference< data::XLabeledDataSequence > > aResultVec;
     aResultVec.reserve( aInterpretedData.Series.getLength() +
@@ -378,19 +374,16 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > &
 }
 
 OUString SAL_CALL DataInterpreter::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.DataInterpreter");
 }
 
 sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.chart2.DataInterpreter" };
 }
diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx
index 15bd9589c3f2..5306146a6b34 100644
--- a/chart2/source/model/template/DataInterpreter.hxx
+++ b/chart2/source/model/template/DataInterpreter.hxx
@@ -36,12 +36,9 @@ public:
     virtual ~DataInterpreter() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // convenience methods
     static  OUString GetRole( const css::uno::Reference< css::chart2::data::XDataSequence > & xSeq );
@@ -66,17 +63,13 @@ protected:
     virtual css::chart2::InterpretedData SAL_CALL interpretDataSource(
         const css::uno::Reference< css::chart2::data::XDataSource >& xSource,
         const css::uno::Sequence< css::beans::PropertyValue >& aArguments,
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override;
     virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries(
-        const css::chart2::InterpretedData& aInterpretedData )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::chart2::InterpretedData& aInterpretedData ) override;
     virtual sal_Bool SAL_CALL isDataCompatible(
-        const css::chart2::InterpretedData& aInterpretedData )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::chart2::InterpretedData& aInterpretedData ) override;
     virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL mergeInterpretedData(
-        const css::chart2::InterpretedData& aInterpretedData )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::chart2::InterpretedData& aInterpretedData ) override;
 };
 
 } // namespace chart
diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx
index 661805a4a474..39e7b2f34c11 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -50,32 +50,27 @@ FilledNetChartType::~FilledNetChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new FilledNetChartType( *this ));
 }
 
 // ____ XChartType ____
 OUString SAL_CALL FilledNetChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET);
 }
 
 OUString SAL_CALL FilledNetChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.FilledNetChartType");
 }
 
 sal_Bool SAL_CALL FilledNetChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET,
diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx
index e308258426ae..49fc980d1078 100644
--- a/chart2/source/model/template/FilledNetChartType.hxx
+++ b/chart2/source/model/template/FilledNetChartType.hxx
@@ -31,25 +31,20 @@ public:
     virtual ~FilledNetChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit FilledNetChartType( const FilledNetChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx
index f18c9c941b23..0e45c8d8d6fe 100644
--- a/chart2/source/model/template/GL3DBarChartType.cxx
+++ b/chart2/source/model/template/GL3DBarChartType.cxx
@@ -102,19 +102,16 @@ GL3DBarChartType::GL3DBarChartType( const GL3DBarChartType& rOther ) :
 GL3DBarChartType::~GL3DBarChartType() {}
 
 OUString SAL_CALL GL3DBarChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.GL3DBarChartType");
 }
 
 sal_Bool SAL_CALL GL3DBarChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR,
@@ -123,13 +120,11 @@ css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNam
 }
 
 OUString SAL_CALL GL3DBarChartType::getChartType()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR);
 }
 
 uno::Sequence<OUString> GL3DBarChartType::getSupportedPropertyRoles()
-        throw (css::uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aPropRoles { "FillColor" };
 
@@ -138,13 +133,11 @@ uno::Sequence<OUString> GL3DBarChartType::getSupportedPropertyRoles()
 
 css::uno::Reference<css::util::XCloneable>
 GL3DBarChartType::createClone()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return uno::Reference<util::XCloneable>(new GL3DBarChartType(*this));
 }
 
 css::uno::Any GL3DBarChartType::GetDefaultValue( sal_Int32 nHandle ) const
-    throw (css::beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rDefaults = *Defaults::get();
     tPropertyValueMap::const_iterator it = rDefaults.find(nHandle);
@@ -157,7 +150,6 @@ cppu::IPropertyArrayHelper& GL3DBarChartType::getInfoHelper()
 }
 
 css::uno::Reference<css::beans::XPropertySetInfo> GL3DBarChartType::getPropertySetInfo()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return *ChartTypeInfo::get();
 }
diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx
index 939b9819516c..75a156988507 100644
--- a/chart2/source/model/template/GL3DBarChartType.hxx
+++ b/chart2/source/model/template/GL3DBarChartType.hxx
@@ -25,38 +25,30 @@ public:
     virtual ~GL3DBarChartType() override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedPropertyRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedPropertyRoles() override;
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     GL3DBarChartType( const GL3DBarChartType& rOther );
 
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
 
     virtual css::uno::Reference<css::util::XCloneable> SAL_CALL
-        createClone()
-            throw (css::uno::RuntimeException, std::exception) override;
+        createClone() override;
 
     // OPropertySet
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw (css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // XPropertySet
     virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL
-        getPropertySetInfo()
-            throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 };
 
 }
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
index 51ccde36f3e9..c8cf9b490efa 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
@@ -128,7 +128,6 @@ uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForInde
 sal_Bool SAL_CALL GL3DBarChartTypeTemplate::matchesTemplate(
     const css::uno::Reference<css::chart2::XDiagram>& xDiagram,
     sal_Bool bAdaptProperties )
-    throw (css::uno::RuntimeException, std::exception)
 {
     bool bResult = ChartTypeTemplate::matchesTemplate(xDiagram, bAdaptProperties);
 
@@ -148,7 +147,6 @@ sal_Bool SAL_CALL GL3DBarChartTypeTemplate::matchesTemplate(
 
 uno::Reference<chart2::XChartType>
 GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Reference<chart2::XChartType> >& /*xOldChartTypes*/ )
-    throw (css::uno::RuntimeException, ::std::exception)
 {
     uno::Reference<chart2::XChartType> xResult;
 
@@ -170,13 +168,11 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Ref
 }
 
 sal_Bool GL3DBarChartTypeTemplate::supportsCategories()
-    throw (css::uno::RuntimeException, ::std::exception)
 {
     return false;
 }
 
 css::uno::Any GL3DBarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
-    throw (css::beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rDefaults = *Defaults::get();
     tPropertyValueMap::const_iterator it = rDefaults.find(nHandle);
@@ -189,7 +185,6 @@ cppu::IPropertyArrayHelper& GL3DBarChartTypeTemplate::getInfoHelper()
 }
 
 css::uno::Reference<css::beans::XPropertySetInfo> GL3DBarChartTypeTemplate::getPropertySetInfo()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return *ChartTypeInfo::get();
 }
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
index baa781459d1a..6db19deb9989 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx
@@ -38,26 +38,21 @@ public:
 
     virtual sal_Bool SAL_CALL matchesTemplate(
         const css::uno::Reference<css::chart2::XDiagram>& xDiagram,
-        sal_Bool bAdaptProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bAdaptProperties ) override;
 
     virtual css::uno::Reference<css::chart2::XChartType> SAL_CALL
-        getChartTypeForNewSeries( const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes )
-            throw (css::uno::RuntimeException, ::std::exception) override;
+        getChartTypeForNewSeries( const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes ) override;
 
-    virtual sal_Bool SAL_CALL supportsCategories()
-        throw (css::uno::RuntimeException, ::std::exception) override;
+    virtual sal_Bool SAL_CALL supportsCategories() override;
 
     // OPropertySet
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw (css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // XPropertySet
     virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL
-        getPropertySetInfo()
-            throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 };
 
 }
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index db1a2bd2f748..c1af371763c5 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -151,21 +151,18 @@ LineChartType::~LineChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new LineChartType( *this ));
 }
 
 // ____ XChartType ____
 OUString SAL_CALL LineChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_LINE);
 }
 
 // ____ OPropertySet ____
 uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticLineChartTypeDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -181,25 +178,21 @@ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticLineChartTypeInfo::get();
 }
 
 OUString SAL_CALL LineChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.LineChartType");
 }
 
 sal_Bool SAL_CALL LineChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_LINE,
diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx
index fa7e2b405d4a..d001b72bf424 100644
--- a/chart2/source/model/template/LineChartType.hxx
+++ b/chart2/source/model/template/LineChartType.hxx
@@ -32,35 +32,28 @@ public:
     virtual ~LineChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit LineChartType( const LineChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 8c988c529190..759a5aa7fe86 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -164,7 +164,6 @@ LineChartTypeTemplate::~LineChartTypeTemplate()
 {}
 // ____ OPropertySet ____
 uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticLineChartTypeTemplateDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -180,7 +179,6 @@ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartTypeTemplate::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticLineChartTypeTemplateInfo::get();
 }
@@ -199,7 +197,6 @@ StackMode LineChartTypeTemplate::getStackMode( sal_Int32 /* nChartTypeIndex */ )
 sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate(
     const uno::Reference< chart2::XDiagram >& xDiagram,
     sal_Bool bAdaptProperties )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
@@ -317,7 +314,6 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal
 
 Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForNewSeries(
         const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XChartType > xResult;
 
@@ -354,7 +350,6 @@ void SAL_CALL LineChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 nSeriesIndex,
     ::sal_Int32 nSeriesCount )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
 
diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx
index 1a1364bfb8f2..55fc7797ec87 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.hxx
@@ -51,29 +51,24 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XChartTypeTemplate ____
     virtual sal_Bool SAL_CALL matchesTemplate(
         const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
-        sal_Bool bAdaptProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bAdaptProperties ) override;
     virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL
-        getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeGroupIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
 
     // ____ ChartTypeTemplate ____
     virtual css::uno::Reference< css::chart2::XChartType >
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index b079b87e7360..c3310f297f3b 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -54,8 +54,6 @@ NetChartType_Base::~NetChartType_Base()
 
 Reference< XCoordinateSystem > SAL_CALL
     NetChartType_Base::createCoordinateSystem( ::sal_Int32 DimensionCount )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     if( DimensionCount != 2 )
         throw lang::IllegalArgumentException(
@@ -89,7 +87,6 @@ Reference< XCoordinateSystem > SAL_CALL
 
 // ____ OPropertySet ____
 uno::Any NetChartType_Base::GetDefaultValue( sal_Int32 /*nHandle*/ ) const
-    throw(beans::UnknownPropertyException)
 {
     return uno::Any();
 }
@@ -134,7 +131,6 @@ struct StaticNetChartTypeInfo : public rtl::StaticAggregate< uno::Reference< bea
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL NetChartType_Base::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticNetChartTypeInfo::get();
 }
@@ -154,32 +150,27 @@ NetChartType::~NetChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new NetChartType( *this ));
 }
 
 // ____ XChartType ____
 OUString SAL_CALL NetChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_NET);
 }
 
 OUString SAL_CALL NetChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.NetChartType");
 }
 
 sal_Bool SAL_CALL NetChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_NET,
diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx
index b12a4cc3e78c..61a5d4fa184c 100644
--- a/chart2/source/model/template/NetChartType.hxx
+++ b/chart2/source/model/template/NetChartType.hxx
@@ -35,20 +35,16 @@ protected:
 
     // ____ XChartType ____
     virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL
-        createCoordinateSystem( ::sal_Int32 DimensionCount )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        createCoordinateSystem( ::sal_Int32 DimensionCount ) override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 };
 
 class NetChartType : public NetChartType_Base
@@ -58,25 +54,20 @@ public:
     virtual ~NetChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit NetChartType( const NetChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index 0b06f66c1b1f..a12dccf3a574 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -62,7 +62,6 @@ void SAL_CALL NetChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 nSeriesIndex,
     ::sal_Int32 nSeriesCount )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
 
@@ -84,7 +83,6 @@ void SAL_CALL NetChartTypeTemplate::applyStyle(
 sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate(
     const Reference< chart2::XDiagram >& xDiagram,
     sal_Bool bAdaptProperties )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
@@ -185,7 +183,6 @@ Reference< chart2::XChartType > NetChartTypeTemplate::getChartTypeForIndex( sal_
 
 Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNewSeries(
         const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) );
     ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult );
diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx
index f6eca07f400b..8ba47c2f9905 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.hxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.hxx
@@ -42,17 +42,14 @@ protected:
     // ____ XChartTypeTemplate ____
     virtual sal_Bool SAL_CALL matchesTemplate(
         const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
-        sal_Bool bAdaptProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bAdaptProperties ) override;
     virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL
-        getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeGroupIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
 
     // ____ ChartTypeTemplate ____
     virtual css::uno::Reference< css::chart2::XChartType >
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 70badb000b23..c758d67353ad 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -140,22 +140,18 @@ PieChartType::~PieChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new PieChartType( *this ));
 }
 
 // ____ XChartType ____
 OUString SAL_CALL PieChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_PIE);
 }
 
 Reference< chart2::XCoordinateSystem > SAL_CALL
     PieChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     Reference< chart2::XCoordinateSystem > xResult(
         new PolarCoordinateSystem( GetComponentContext(), DimensionCount ));
@@ -190,7 +186,6 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 }
 
 uno::Sequence< OUString > PieChartType::getSupportedPropertyRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aPropRoles(2);
     aPropRoles[0] = "FillColor";
@@ -201,7 +196,6 @@ uno::Sequence< OUString > PieChartType::getSupportedPropertyRoles()
 
 // ____ OPropertySet ____
 uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticPieChartTypeDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -218,25 +212,21 @@ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticPieChartTypeInfo::get();
 }
 
 OUString SAL_CALL PieChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.PieChartType");
 }
 
 sal_Bool SAL_CALL PieChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_PIE,
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index f67987073cba..86509405b313 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -32,44 +32,34 @@ public:
     virtual ~PieChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit PieChartType( const PieChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
     virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL
-        createCoordinateSystem( ::sal_Int32 DimensionCount )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        createCoordinateSystem( ::sal_Int32 DimensionCount ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedPropertyRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedPropertyRoles() override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index cd296affe968..0144b54a6924 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -170,7 +170,6 @@ PieChartTypeTemplate::~PieChartTypeTemplate()
 
 // ____ OPropertySet ____
 uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticPieChartTypeTemplateDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -186,7 +185,6 @@ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartTypeTemplate::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticPieChartTypeTemplateInfo::get();
 }
@@ -306,7 +304,6 @@ void PieChartTypeTemplate::createChartTypes(
 sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
     const uno::Reference< chart2::XDiagram >& xDiagram,
     sal_Bool bAdaptProperties )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
@@ -417,7 +414,6 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_
 
 Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNewSeries(
         const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XChartType > xResult;
 
@@ -449,7 +445,6 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 nSeriesIndex,
     ::sal_Int32 nSeriesCount )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
 
@@ -536,7 +531,6 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
 }
 
 void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram )
-    throw (uno::RuntimeException, std::exception)
 {
     // reset axes and grids
     Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY );
diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx
index 5940ba610b2a..640ba6c20b7e 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.hxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.hxx
@@ -50,33 +50,27 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XChartTypeTemplate ____
     virtual sal_Bool SAL_CALL matchesTemplate(
         const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
-        sal_Bool bAdaptProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bAdaptProperties ) override;
     virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL
         getChartTypeForNewSeries( const css::uno::Sequence<
-            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes )
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeGroupIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
     virtual void SAL_CALL resetStyles(
-        const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
 
     // ____ ChartTypeTemplate ____
     virtual sal_Int32 getDimension() const override;
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index f178d5383ebb..922dfb90f26f 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -168,7 +168,6 @@ ScatterChartType::~ScatterChartType()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new ScatterChartType( *this ));
 }
@@ -176,8 +175,6 @@ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone()
 // ____ XChartType ____
 Reference< chart2::XCoordinateSystem > SAL_CALL
     ScatterChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     Reference< chart2::XCoordinateSystem > xResult(
         new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
@@ -207,13 +204,11 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 }
 
 OUString SAL_CALL ScatterChartType::getChartType()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER);
 }
 
 uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aMandRolesSeq(3);
     aMandRolesSeq[0] = "label";
@@ -224,7 +219,6 @@ uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles(
 
 // ____ OPropertySet ____
 uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticScatterChartTypeDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -241,25 +235,21 @@ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticScatterChartTypeInfo::get();
 }
 
 OUString SAL_CALL ScatterChartType::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.ScatterChartType");
 }
 
 sal_Bool SAL_CALL ScatterChartType::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         CHART2_SERVICE_NAME_CHARTTYPE_SCATTER,
diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx
index 64ea32e308aa..a09a840224ab 100644
--- a/chart2/source/model/template/ScatterChartType.hxx
+++ b/chart2/source/model/template/ScatterChartType.hxx
@@ -36,44 +36,34 @@ public:
     virtual ~ScatterChartType() override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
     explicit ScatterChartType( const ScatterChartType & rOther );
 
     // ____ XChartType ____
-    virtual OUString SAL_CALL getChartType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getChartType() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedMandatoryRoles()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedMandatoryRoles() override;
     virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL
-        createCoordinateSystem( ::sal_Int32 DimensionCount )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        createCoordinateSystem( ::sal_Int32 DimensionCount ) override;
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 3f98f72fa2c7..bde601008446 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -165,7 +165,6 @@ ScatterChartTypeTemplate::~ScatterChartTypeTemplate()
 
 // ____ OPropertySet ____
 uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticScatterChartTypeTemplateDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -181,7 +180,6 @@ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartTypeTemplate::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticScatterChartTypeTemplateInfo::get();
 }
@@ -203,7 +201,6 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 nSeriesIndex,
     ::sal_Int32 nSeriesCount )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
 
@@ -225,7 +222,6 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle(
 
 // ____ XChartTypeTemplate ____
 sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories()
-    throw (uno::RuntimeException, std::exception)
 {
     return false;
 }
@@ -233,7 +229,6 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories()
 sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate(
     const Reference< chart2::XDiagram >& xDiagram,
     sal_Bool bAdaptProperties )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
 
@@ -351,7 +346,6 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex(
 
 Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeForNewSeries(
         const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XChartType > xResult;
 
@@ -384,7 +378,6 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF
 }
 
 Reference< chart2::XDataInterpreter > SAL_CALL ScatterChartTypeTemplate::getDataInterpreter()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xDataInterpreter.is())
         m_xDataInterpreter.set( new XYDataInterpreter );
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
index 65ae965bc284..18829d0ea5da 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
@@ -49,34 +49,27 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XChartTypeTemplate ____
-    virtual sal_Bool SAL_CALL supportsCategories()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsCategories() override;
     virtual sal_Bool SAL_CALL matchesTemplate(
         const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
-        sal_Bool bAdaptProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bAdaptProperties ) override;
     virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL
         getChartTypeForNewSeries( const css::uno::Sequence<
-            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter()
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override;
+    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeGroupIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
 
     // ____ ChartTypeTemplate ____
     virtual css::uno::Reference< css::chart2::XChartType >
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index aa4d41b48673..3b58a76aa969 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -178,7 +178,6 @@ StockChartTypeTemplate::~StockChartTypeTemplate()
 {}
 // ____ OPropertySet ____
 uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticStockChartTypeTemplateDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -194,7 +193,6 @@ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL StockChartTypeTemplate::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticStockChartTypeTemplateInfo::get();
 }
@@ -220,7 +218,6 @@ void SAL_CALL StockChartTypeTemplate::applyStyle(
     ::sal_Int32 nChartTypeIndex,
     ::sal_Int32 nSeriesIndex,
     ::sal_Int32 nSeriesCount )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount );
     try
@@ -265,7 +262,6 @@ void SAL_CALL StockChartTypeTemplate::applyStyle(
 
 void SAL_CALL StockChartTypeTemplate::resetStyles(
     const Reference< chart2::XDiagram >& xDiagram )
-    throw (uno::RuntimeException, std::exception)
 {
     ChartTypeTemplate::resetStyles( xDiagram );
     if( getDimension() == 3 )
@@ -403,7 +399,6 @@ void StockChartTypeTemplate::createChartTypes(
 sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate(
     const uno::Reference< XDiagram >& xDiagram,
     sal_Bool /* bAdaptProperties */ )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = false;
 
@@ -484,7 +479,6 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate(
 
 Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSeries(
         const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::XChartType > xResult;
 
@@ -505,7 +499,6 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie
 }
 
 Reference< XDataInterpreter > SAL_CALL StockChartTypeTemplate::getDataInterpreter()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xDataInterpreter.is())
         m_xDataInterpreter.set( new StockDataInterpreter( m_eStockVariant ) );
diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx
index 2a04ba2bec6a..f4884ac462e7 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.hxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.hxx
@@ -63,36 +63,29 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XChartTypeTemplate ____
     virtual sal_Bool SAL_CALL matchesTemplate(
         const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
-        sal_Bool bAdaptProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bAdaptProperties ) override;
     virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL
         getChartTypeForNewSeries( const css::uno::Sequence<
             css::uno::Reference<
-                css::chart2::XChartType > >& aFormerlyUsedChartTypes )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter()
-        throw (css::uno::RuntimeException, std::exception) override;
+                css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override;
+    virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override;
     virtual void SAL_CALL applyStyle(
         const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
         ::sal_Int32 nChartTypeIndex,
         ::sal_Int32 nSeriesIndex,
-        ::sal_Int32 nSeriesCount )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 nSeriesCount ) override;
     virtual void SAL_CALL resetStyles(
-        const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
 
     // ChartTypeTemplate
     virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ) override;
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index 2e2f5c0bbbd7..b1844f1da84a 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -54,7 +54,6 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource(
     const Reference< data::XDataSource >& xSource,
     const Sequence< beans::PropertyValue >& rArguments,
     const Sequence< Reference< XDataSeries > >& rSeriesToReUse )
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! xSource.is())
         return InterpretedData();
@@ -262,7 +261,6 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource(
 // volume to one with volume)
 sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
     const InterpretedData& aInterpretedData )
-    throw (uno::RuntimeException, std::exception)
 {
     // high/low/close
     sal_Int32 nNumberOfNecessarySequences = 3;
@@ -319,7 +317,6 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
 
 InterpretedData SAL_CALL StockDataInterpreter::reinterpretDataSeries(
     const InterpretedData& aInterpretedData )
-    throw (uno::RuntimeException, std::exception)
 {
     // prerequisite: StockDataInterpreter::isDataCompatible() returned true
     return aInterpretedData;
diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx
index 0fb4df9acd7f..2bd5b2b61976 100644
--- a/chart2/source/model/template/StockDataInterpreter.hxx
+++ b/chart2/source/model/template/StockDataInterpreter.hxx
@@ -38,14 +38,11 @@ protected:
     virtual css::chart2::InterpretedData SAL_CALL interpretDataSource(
         const css::uno::Reference< css::chart2::data::XDataSource >& xSource,
         const css::uno::Sequence< css::beans::PropertyValue >& aArguments,
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override;
     virtual sal_Bool SAL_CALL isDataCompatible(
-        const css::chart2::InterpretedData& aInterpretedData )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::chart2::InterpretedData& aInterpretedData ) override;
     virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries(
-        const css::chart2::InterpretedData& aInterpretedData )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::chart2::InterpretedData& aInterpretedData ) override;
 
 private:
     StockChartTypeTemplate::StockVariant m_eStockVariant;
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 1ecce05b21a2..c0d05a60ca98 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -50,7 +50,6 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
     const Reference< chart2::data::XDataSource >& xSource,
     const Sequence< beans::PropertyValue >& aArguments,
     const Sequence< Reference< XDataSeries > >& aSeriesToReUse )
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! xSource.is())
         return InterpretedData();
@@ -143,7 +142,6 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
 
 chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries(
     const chart2::InterpretedData& aInterpretedData )
-    throw (uno::RuntimeException, std::exception)
 {
     InterpretedData aResult( aInterpretedData );
 
@@ -232,7 +230,6 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries(
 // criterion: all series must have exactly two data::XLabeledDataSequences
 sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible(
     const chart2::InterpretedData& aInterpretedData )
-    throw (uno::RuntimeException, std::exception)
 {
     Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series ));
     for( sal_Int32 i=0; i<aSeries.getLength(); ++i )
diff --git a/chart2/source/model/template/XYDataInterpreter.hxx b/chart2/source/model/template/XYDataInterpreter.hxx
index 5b730c45e745..c57889ce880d 100644
--- a/chart2/source/model/template/XYDataInterpreter.hxx
+++ b/chart2/source/model/template/XYDataInterpreter.hxx
@@ -35,14 +35,11 @@ protected:
     virtual css::chart2::InterpretedData SAL_CALL interpretDataSource(
         const css::uno::Reference< css::chart2::data::XDataSource >& xSource,
         const css::uno::Sequence< css::beans::PropertyValue >& aArguments,
-        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override;
     virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries(
-        const css::chart2::InterpretedData& aInterpretedData )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::chart2::InterpretedData& aInterpretedData ) override;
     virtual sal_Bool SAL_CALL isDataCompatible(
-        const css::chart2::InterpretedData& aInterpretedData )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::chart2::InterpretedData& aInterpretedData ) override;
 };
 
 } // namespace chart
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 14792358c3b1..c702a1ab2489 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -226,7 +226,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( CachedDataSequence, CachedDataSequence_Base, O
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) );
 }
@@ -248,19 +247,16 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet
 }
 
 OUString SAL_CALL CachedDataSequence::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName);
 }
 
 sal_Bool SAL_CALL CachedDataSequence::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         lcl_aServiceName,
@@ -272,7 +268,6 @@ css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceN
 
 // ________ XNumericalDataSequence ________
 Sequence< double > SAL_CALL CachedDataSequence::getNumericalData()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
 
@@ -284,7 +279,6 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData()
 
 // ________ XTextualDataSequence ________
 Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
 
@@ -296,34 +290,28 @@ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData()
 
 // ________ XDataSequence  ________
 Sequence< Any > SAL_CALL CachedDataSequence::getData()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return Impl_getMixedData();
 }
 
 OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_sRole;
 }
 
 Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::LabelOrigin  /*eLabelOrigin*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     // return empty label, as we have no range representaions to determine something useful
     return Sequence< OUString >();
 }
 
 ::sal_Int32 SAL_CALL CachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 /*nIndex*/ )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     return 0;
 }
 
 Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     CachedDataSequence * pNewSeq = new CachedDataSequence( *this );
 
@@ -331,7 +319,6 @@ Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone()
 }
 
 void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -345,7 +332,6 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod
 }
 
 void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -359,7 +345,7 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X
 }
 
 // lang::XInitialization:
-void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception)
+void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments)
 {
     ::comphelper::SequenceAsHashMap aMap(_aArguments);
     m_aNumericalSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aNumericalSequence);
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index e1b842dda7ac..2926cc0eabf2 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -139,7 +139,6 @@ void ConfigColorScheme::retrieveConfigColors()
 
 // ____ XColorScheme ____
 ::sal_Int32 SAL_CALL ConfigColorScheme::getColorByIndex( ::sal_Int32 nIndex )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_bNeedsUpdate )
         retrieveConfigColors();
@@ -166,19 +165,16 @@ void ConfigColorScheme::notify( const OUString & rPropertyName )
 }
 
 OUString SAL_CALL ConfigColorScheme::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ;
 }
 
 sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.chart2.ColorScheme" };
 }
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index 16c18ddb8e2b..dc1122e6eca2 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -45,32 +45,27 @@ DataSource::~DataSource()
 
 // ____ XDataSource ____
 Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSource::getDataSequences()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_aDataSeq;
 }
 
 // ____ XDataSink ____
 void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aDataSeq = aData;
 }
 
 OUString SAL_CALL DataSource::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart.DataSource");
 }
 
 sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.chart2.data.DataSource" };
 }
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index aa4573df29df..d717d09dca98 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -129,14 +129,12 @@ ErrorBar::~ErrorBar()
 {}
 
 uno::Reference< util::XCloneable > SAL_CALL ErrorBar::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new ErrorBar( *this ));
 }
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL ErrorBar::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     static uno::Reference< beans::XPropertySetInfo > aRef (
             new SfxItemPropertySetInfo( GetErrorBarPropertySet()->getPropertyMap() ) );
@@ -144,8 +142,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ErrorBar::getPropertySetInfo(
 }
 
 void ErrorBar::setPropertyValue( const OUString& rPropName, const uno::Any& rAny )
-    throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-            lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -228,7 +224,6 @@ OUString getSourceRangeStrFromLabeledSequences( const uno::Sequence< uno::Refere
 }
 
 uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -293,7 +288,6 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
 }
 
 beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
-        throw (css::beans::UnknownPropertyException, std::exception)
 {
     if(rPropName == "ErrorBarStyle")
     {
@@ -364,7 +358,6 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
 }
 
 uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Sequence< OUString >& rPropNames )
-        throw (css::beans::UnknownPropertyException, std::exception)
 {
     uno::Sequence< beans::PropertyState > aRet( rPropNames.getLength() );
     for(sal_Int32 i = 0; i < rPropNames.getLength(); ++i)
@@ -375,41 +368,34 @@ uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Se
 }
 
 void ErrorBar::setPropertyToDefault( const OUString& )
-        throw (beans::UnknownPropertyException, std::exception)
 {
     //keep them unimplemented for now
 }
 
 uno::Any ErrorBar::getPropertyDefault( const OUString& )
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, std::exception)
 {
     //keep them unimplemented for now
     return uno::Any();
 }
 
 void ErrorBar::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-    throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
 void ErrorBar::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-    throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
 void ErrorBar::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-    throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
 void ErrorBar::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-    throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -423,7 +409,6 @@ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyLi
 }
 
 void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -438,21 +423,18 @@ void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModif
 
 // ____ XModifyListener ____
 void SAL_CALL ErrorBar::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL ErrorBar::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
 
 // ____ XDataSink ____
 void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >& aData )
-    throw (uno::RuntimeException, std::exception)
 {
     ModifyListenerHelper::removeListenerFromAllElements( m_aDataSequences, m_xModifyEventForwarder );
     EventListenerHelper::removeListenerFromAllElements( m_aDataSequences, this );
@@ -463,25 +445,21 @@ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::da
 
 // ____ XDataSource ____
 uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ErrorBar::getDataSequences()
-    throw (uno::RuntimeException, std::exception)
 {
     return comphelper::containerToSequence( m_aDataSequences );
 }
 
 OUString SAL_CALL ErrorBar::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName);
 }
 
 sal_Bool SAL_CALL ErrorBar::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ErrorBar::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         lcl_aServiceName,
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index d620576d3e30..b1439867a449 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -46,7 +46,6 @@ ExponentialRegressionCurveCalculator::~ExponentialRegressionCurveCalculator()
 void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression(
     const uno::Sequence< double >& aXValues,
     const uno::Sequence< double >& aYValues )
-    throw (uno::RuntimeException, std::exception)
 {
     RegressionCalculationHelper::tDoubleVectorPair aValues(
         RegressionCalculationHelper::cleanup(
@@ -113,8 +112,6 @@ void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression(
 }
 
 double SAL_CALL ExponentialRegressionCurveCalculator::getCurveValue( double x )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     double fResult;
     ::rtl::math::setNan( & fResult );
@@ -133,8 +130,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul
     const uno::Reference< chart2::XScaling >& xScalingX,
     const uno::Reference< chart2::XScaling >& xScalingY,
     sal_Bool bMaySkipPointsInCalculation )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     if( bMaySkipPointsInCalculation &&
         isLinearScaling( xScalingX ) &&
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 9f5f3187fd36..f14810a9e64b 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -653,7 +653,6 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::createDataSequenc
 
 // ____ XDataProvider ____
 sal_Bool SAL_CALL InternalDataProvider::createDataSourcePossible( const Sequence< beans::PropertyValue >& /* aArguments */ )
-    throw (uno::RuntimeException, std::exception)
 {
     return true;
 }
@@ -678,8 +677,6 @@ sal_Int32 lcl_getInnerLevelCount( const vector< vector< uno::Any > >& rLabels )
 
 Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createDataSource(
     const Sequence< beans::PropertyValue >& aArguments )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     OUString aRangeRepresentation;
     bool bUseColumns = true;
@@ -769,7 +766,6 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
 
 Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
     const Reference< chart2::data::XDataSource >& /* xDataSource */ )
-    throw (uno::RuntimeException, std::exception)
 {
     Sequence< beans::PropertyValue > aArguments( 4 );
     aArguments[0] = beans::PropertyValue(
@@ -794,15 +790,12 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
 }
 
 sal_Bool SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& /* aRangeRepresentation */ )
-    throw (uno::RuntimeException, std::exception)
 {
     return true;
 }
 
 Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentation(
     const OUString& aRangeRepresentation )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     if( aRangeRepresentation.match( lcl_aCategoriesRangeName ))
     {
@@ -836,13 +829,11 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa
 Reference<chart2::data::XDataSequence> SAL_CALL
 InternalDataProvider::createDataSequenceByValueArray(
     const OUString& aRole, const OUString& aRangeRepresentation )
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     return createDataSequenceFromArray(aRangeRepresentation, aRole);
 }
 
 Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelection()
-    throw (uno::RuntimeException, std::exception)
 {
     // there is no range selection component
     return Reference< sheet::XRangeSelection >();
@@ -850,7 +841,6 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec
 
 // ____ XInternalDataProvider ____
 sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUString& aRange )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = false;
 
@@ -874,7 +864,6 @@ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUSt
 }
 
 Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation( const OUString& aRange )
-    throw (uno::RuntimeException, std::exception)
 {
     Sequence< uno::Any > aResult;
 
@@ -948,7 +937,6 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
 
 void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
     const OUString& aRange, const Sequence< uno::Any >& aNewData )
-    throw (uno::RuntimeException, std::exception)
 {
     vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) );
     if( aRange.match( lcl_aLabelRangePrefix ) )
@@ -1014,7 +1002,6 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
 }
 
 void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_bDataInColumns )
     {
@@ -1029,7 +1016,6 @@ void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex )
 }
 
 void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex )
-    throw (uno::RuntimeException, std::exception)
 {
     deleteMapReferences( OUString::number( nAtIndex ));
     deleteMapReferences( lcl_aLabelRangePrefix + OUString::number( nAtIndex ));
@@ -1046,7 +1032,6 @@ void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex )
 }
 
 void SAL_CALL InternalDataProvider::appendSequence()
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_bDataInColumns )
         m_aInternalData.appendColumn();
@@ -1055,7 +1040,6 @@ void SAL_CALL InternalDataProvider::appendSequence()
 }
 
 void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel )
-        throw (uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( nLevel> 0, "you can only insert category levels > 0" );//the first categories level cannot be deleted, check the calling code for error
     if( nLevel>0 )
@@ -1072,7 +1056,6 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel
     }
 }
 void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel )
-        throw (uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( nLevel>0, "you can only delete category levels > 0" );//the first categories level cannot be deleted, check the calling code for error
     if( nLevel>0 )
@@ -1090,7 +1073,6 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel
 }
 
 void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 nAfterIndex )
-    throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nMaxRep = 0;
     if( m_bDataInColumns )
@@ -1114,7 +1096,6 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32
 }
 
 void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex )
-    throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nMaxRep = 0;
     if( m_bDataInColumns )
@@ -1138,7 +1119,6 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32
 }
 
 void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_bDataInColumns )
         m_aInternalData.swapRowWithNext( nAtIndex );
@@ -1158,7 +1138,6 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s
 }
 
 void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq )
-    throw (uno::RuntimeException, std::exception)
 {
     if( xSeq.is())
         addDataSequenceToMap( xSeq->getSourceRangeRepresentation(), xSeq );
@@ -1166,8 +1145,6 @@ void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Refere
 
 // ____ XRangeXMLConversion ____
 OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRangeRepresentation )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     XMLRangeHelper::CellRange aRange;
     aRange.aTableName = "local-table";
@@ -1244,8 +1221,6 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang
 }
 
 OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXMLRange )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     XMLRangeHelper::CellRange aRange( XMLRangeHelper::getCellRangeFromXMLString( aXMLRange ));
     if( aRange.aUpperLeft.bIsEmpty )
@@ -1372,7 +1347,7 @@ uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStr
 }//anonymous namespace
 
 // ____ XDateCategories ____
-Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException, std::exception)
+Sequence< double > SAL_CALL InternalDataProvider::getDateCategories()
 {
     double fNan = InternalDataProvider::getNotANumber();
     double fValue = fNan;
@@ -1390,7 +1365,7 @@ Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno
     return aDoubles;
 }
 
-void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates )
 {
     sal_Int32 nCount = rDates.getLength();
     vector< vector< uno::Any > > aNewCategories;
@@ -1410,56 +1385,53 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >&
 }
 
 // ____ XAnyDescriptionAccess ____
-Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions()
 {
     return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexRowLabels() );
 }
-void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions )
 {
     m_aInternalData.setComplexRowLabels( lcl_convertSequenceSequenceToVectorVector( aRowDescriptions ) );
 }
-Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions()
 {
     return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexColumnLabels() );
 }
-void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions )
 {
     m_aInternalData.setComplexColumnLabels( lcl_convertSequenceSequenceToVectorVector( aColumnDescriptions ) );
 }
 
 // ____ XComplexDescriptionAccess ____
-Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions()
 {
     return comphelper::containerToSequence(lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() ));
 }
-void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions )
 {
     m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) );
 }
-Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions()
 {
     return comphelper::containerToSequence(lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() ));
 }
-void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions )
 {
     m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) );
 }
 
 // ____ XChartDataArray ____
 Sequence< Sequence< double > > SAL_CALL InternalDataProvider::getData()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_aInternalData.getData();
 }
 
 void SAL_CALL InternalDataProvider::setData( const Sequence< Sequence< double > >& rDataInRows )
-    throw (uno::RuntimeException, std::exception)
 {
     return m_aInternalData.setData( rDataInRows );
 }
 
 void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString >& aRowDescriptions )
-    throw (uno::RuntimeException, std::exception)
 {
     vector< vector< uno::Any > > aComplexDescriptions( aRowDescriptions.getLength() );
     transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aRowDescriptions.getConstArray(),
@@ -1468,7 +1440,6 @@ void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString
 }
 
 void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUString >& aColumnDescriptions )
-    throw (uno::RuntimeException, std::exception)
 {
     vector< vector< uno::Any > > aComplexDescriptions( aColumnDescriptions.getLength() );
     transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aColumnDescriptions.getConstArray(),
@@ -1477,7 +1448,6 @@ void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUStr
 }
 
 Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions()
-    throw (uno::RuntimeException, std::exception)
 {
     vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexRowLabels() );
     SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels );
@@ -1485,7 +1455,6 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions()
 }
 
 Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions()
-    throw (uno::RuntimeException, std::exception)
 {
     vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexColumnLabels() );
     SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels );
@@ -1495,18 +1464,15 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions()
 // ____ XChartData (base of XChartDataArray) ____
 void SAL_CALL InternalDataProvider::addChartDataChangeEventListener(
     const Reference< css::chart::XChartDataChangeEventListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL InternalDataProvider::removeChartDataChangeEventListener(
     const Reference< css::chart::XChartDataChangeEventListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 double SAL_CALL InternalDataProvider::getNotANumber()
-    throw (uno::RuntimeException, std::exception)
 {
     double fNan;
     ::rtl::math::setNan( & fNan );
@@ -1514,13 +1480,12 @@ double SAL_CALL InternalDataProvider::getNotANumber()
 }
 
 sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber )
-    throw (uno::RuntimeException, std::exception)
 {
     return ::rtl::math::isNan( nNumber )
         || ::rtl::math::isInf( nNumber );
 }
 // lang::XInitialization:
-void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception)
+void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments)
 {
     comphelper::SequenceAsHashMap aArgs(_aArguments);
     if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData", false ) )
@@ -1529,26 +1494,22 @@ void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > &
 
 // ____ XCloneable ____
 Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return Reference< util::XCloneable >( new InternalDataProvider( *this ));
 }
 
 OUString SAL_CALL InternalDataProvider::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     // note: in xmloff this name is used to indicate usage of own data
     return OUString("com.sun.star.comp.chart.InternalDataProvider");
 }
 
 sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.chart2.data.DataProvider" };
 }
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index d5c45694d9c6..279db333e066 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -66,14 +66,12 @@ LabeledDataSequence::~LabeledDataSequence()
 
 // ____ XLabeledDataSequence ____
 uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getValues()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_xData;
 }
 
 void SAL_CALL LabeledDataSequence::setValues(
     const uno::Reference< chart2::data::XDataSequence >& xSequence )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_xData != xSequence )
     {
@@ -84,14 +82,12 @@ void SAL_CALL LabeledDataSequence::setValues(
 }
 
 uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getLabel()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_xLabel;
 }
 
 void SAL_CALL LabeledDataSequence::setLabel(
     const uno::Reference< chart2::data::XDataSequence >& xSequence )
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_xLabel != xSequence )
     {
@@ -103,7 +99,6 @@ void SAL_CALL LabeledDataSequence::setLabel(
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< chart2::data::XDataSequence > xNewValues( m_xData );
     uno::Reference< chart2::data::XDataSequence > xNewLabel( m_xLabel );
@@ -122,7 +117,6 @@ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone()
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -136,7 +130,6 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo
 }
 
 void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -150,19 +143,16 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::
 }
 
 OUString SAL_CALL LabeledDataSequence::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.LabeledDataSequence");
 }
 
 sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.chart2.data.LabeledDataSequence" };
 }
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 2dbb9ba7ece2..b04f0a82a548 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -110,7 +110,6 @@ void LifeTimeManager::impl_unregisterApiCall(bool bLongLastingCall)
 }
 
 bool LifeTimeManager::dispose()
-    throw(uno::RuntimeException)
 {
     //hold no mutex
     {
@@ -190,7 +189,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
 }
 
 bool CloseableLifeTimeManager::g_close_startTryClose(bool bDeliverOwnership)
-    throw ( uno::Exception )
 {
     //no mutex is allowed to be acquired
     {
@@ -263,7 +261,6 @@ void CloseableLifeTimeManager::g_close_endTryClose(bool bDeliverOwnership, bool
 }
 
 bool CloseableLifeTimeManager::g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, util::CloseVetoException& ex )
-    throw ( util::CloseVetoException )
 {
     //this method is called when no closelistener has had a veto during queryclosing
     //the method returns false, if nothing stands against closing anymore
@@ -369,7 +366,6 @@ void CloseableLifeTimeManager::impl_doClose()
 }
 
 void CloseableLifeTimeManager::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener )
-    throw(uno::RuntimeException)
 {
     osl::Guard< osl::Mutex > aGuard( m_aAccessMutex );
     //Mutex needs to be acquired exactly ones; will be released inbetween
diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index 05f6aefe66a1..7c6e5240d14e 100644
--- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -41,7 +41,6 @@ void LinearRegressionCurveCalculator::setRegressionProperties(
     sal_Bool  aForceIntercept,
     double    aInterceptValue,
     sal_Int32 aPeriod )
-        throw (uno::RuntimeException, std::exception)
 {
     PolynomialRegressionCurveCalculator::setRegressionProperties(
                                             1,
@@ -55,8 +54,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LinearRegressionCurveCalculator:
     const uno::Reference< chart2::XScaling >& xScalingX,
     const uno::Reference< chart2::XScaling >& xScalingY,
     sal_Bool bMaySkipPointsInCalculation )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     if( bMaySkipPointsInCalculation &&
         isLinearScaling( xScalingX ) &&
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index c50a8c361b24..a69d68ea4137 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -45,7 +45,6 @@ LogarithmicRegressionCurveCalculator::~LogarithmicRegressionCurveCalculator()
 void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression(
     const uno::Sequence< double >& aXValues,
     const uno::Sequence< double >& aYValues )
-    throw (uno::RuntimeException, std::exception)
 {
     RegressionCalculationHelper::tDoubleVectorPair aValues(
         RegressionCalculationHelper::cleanup(
@@ -90,8 +89,6 @@ void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression(
 }
 
 double SAL_CALL LogarithmicRegressionCurveCalculator::getCurveValue( double x )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     double fResult;
     ::rtl::math::setNan( & fResult );
@@ -110,8 +107,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LogarithmicRegressionCurveCalcul
     const uno::Reference< chart2::XScaling >& xScalingX,
     const uno::Reference< chart2::XScaling >& xScalingY,
     sal_Bool bMaySkipPointsInCalculation )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     if( bMaySkipPointsInCalculation &&
         isLogarithmicScaling( xScalingX ) &&
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 3835a46ccbef..592a2014e340 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -43,7 +43,6 @@ MeanValueRegressionCurveCalculator::~MeanValueRegressionCurveCalculator()
 void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression(
     const uno::Sequence< double >& /*aXValues*/,
     const uno::Sequence< double >& aYValues )
-    throw (uno::RuntimeException, std::exception)
 {
     const sal_Int32 nDataLength = aYValues.getLength();
     sal_Int32 nMax = nDataLength;
@@ -89,8 +88,6 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression(
 }
 
 double SAL_CALL MeanValueRegressionCurveCalculator::getCurveValue( double /*x*/ )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     return m_fMeanValue;
 }
@@ -100,8 +97,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MeanValueRegressionCurveCalculat
     const uno::Reference< chart2::XScaling >& xScalingX,
     const uno::Reference< chart2::XScaling >& xScalingY,
     sal_Bool bMaySkipPointsInCalculation )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     if( bMaySkipPointsInCalculation )
     {
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 7b4c26156e11..44fd89e248e8 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -157,27 +157,23 @@ void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSou
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL ModifyEventForwarder::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     AddListener( aListener );
 }
 
 void SAL_CALL ModifyEventForwarder::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     RemoveListener( aListener );
 }
 
 // ____ XModifyListener ____
 void SAL_CALL ModifyEventForwarder::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
    lcl_fireModifyEvent( m_aModifyListeners, Reference< uno::XWeak >(), &aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL ModifyEventForwarder::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index dac1616b7ab7..85406c9d62d4 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -41,7 +41,6 @@ MovingAverageRegressionCurveCalculator::~MovingAverageRegressionCurveCalculator(
 void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression(
     const uno::Sequence< double >& aXValues,
     const uno::Sequence< double >& aYValues )
-    throw (uno::RuntimeException, std::exception)
 {
     ::rtl::math::setNan( & m_fCorrelationCoeffitient );
 
@@ -73,8 +72,6 @@ void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression(
 }
 
 double SAL_CALL MovingAverageRegressionCurveCalculator::getCurveValue( double /*x*/ )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     double fResult;
     rtl::math::setNan(&fResult);
@@ -86,8 +83,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MovingAverageRegressionCurveCalc
     const uno::Reference< chart2::XScaling >& /*xScalingX*/,
     const uno::Reference< chart2::XScaling >& /*xScalingY*/,
     sal_Bool /*bMaySkipPointsInCalculation*/ )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     uno::Sequence< geometry::RealPoint2D > aResult( aYList.size() );
 
diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx
index ab2d48ec636b..58e9296a678b 100644
--- a/chart2/source/tools/NameContainer.cxx
+++ b/chart2/source/tools/NameContainer.cxx
@@ -59,26 +59,22 @@ NameContainer::~NameContainer()
 
 //XServiceInfo
 OUString SAL_CALL NameContainer::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return m_aImplementationName;
 }
 
 sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { m_aServicename };
 }
 
 // XNameContainer
 void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rElement )
-    throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     if( m_aMap.find( rName ) != m_aMap.end() )
         throw container::ElementExistException();
@@ -86,7 +82,6 @@ void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rEl
 }
 
 void SAL_CALL NameContainer::removeByName( const OUString& Name )
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     tContentMap::iterator aIt( m_aMap.find( Name ));
     if( aIt == m_aMap.end())
@@ -96,7 +91,6 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name )
 
 // XNameReplace
 void SAL_CALL NameContainer::replaceByName( const OUString& rName, const Any& rElement )
-    throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     tContentMap::iterator aIt( m_aMap.find( rName ));
     if( aIt == m_aMap.end() )
@@ -106,7 +100,6 @@ void SAL_CALL NameContainer::replaceByName( const OUString& rName, const Any& rE
 
 // XNameAccess
 Any SAL_CALL NameContainer::getByName( const OUString& rName )
-    throw( container::NoSuchElementException,  lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     tContentMap::iterator aIter( m_aMap.find( rName ) );
     if( aIter == m_aMap.end() )
@@ -115,7 +108,6 @@ Any SAL_CALL NameContainer::getByName( const OUString& rName )
 }
 
 Sequence< OUString > SAL_CALL NameContainer::getElementNames()
-    throw( uno::RuntimeException, std::exception )
 {
     sal_Int32 nCount = m_aMap.size();
     Sequence< OUString > aSeq(nCount);
@@ -126,27 +118,23 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames()
 }
 
 sal_Bool SAL_CALL NameContainer::hasByName( const OUString& rName )
-    throw( uno::RuntimeException, std::exception )
 {
     return ( m_aMap.find( rName ) != m_aMap.end() );
 }
 
 // XElementAccess
 sal_Bool SAL_CALL NameContainer::hasElements()
-    throw( uno::RuntimeException, std::exception )
 {
     return ! m_aMap.empty();
 }
 
 uno::Type SAL_CALL NameContainer::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_aType;
 }
 
 // XCloneable
 uno::Reference< util::XCloneable > SAL_CALL NameContainer::createClone()
-    throw ( uno::RuntimeException, std::exception )
 {
     return uno::Reference< util::XCloneable >( new NameContainer( *this ));
 }
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 0dcf03c0da1a..30a08c1ad283 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -70,7 +70,6 @@ OPropertySet::~OPropertySet()
 {}
 
 Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
-    throw (uno::RuntimeException, std::exception)
 {
     return ::cppu::queryInterface(
         aType,
@@ -86,7 +85,6 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
 //  ____ XTypeProvider ____
 Sequence< uno::Type > SAL_CALL
     OPropertySet::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     static const Sequence< uno::Type > aTypeList{
         cppu::UnoType<lang::XTypeProvider>::get(),
@@ -102,7 +100,6 @@ Sequence< uno::Type > SAL_CALL
 
 Sequence< sal_Int8 > SAL_CALL
     OPropertySet::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -110,8 +107,6 @@ Sequence< sal_Int8 > SAL_CALL
 // ____ XPropertyState ____
 beans::PropertyState SAL_CALL
     OPropertySet::getPropertyState( const OUString& PropertyName )
-    throw (beans::UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     cppu::IPropertyArrayHelper & rPH = getInfoHelper();
 
@@ -121,8 +116,6 @@ beans::PropertyState SAL_CALL
 
 Sequence< beans::PropertyState > SAL_CALL
     OPropertySet::getPropertyStates( const Sequence< OUString >& aPropertyName )
-    throw (beans::UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     cppu::IPropertyArrayHelper & rPH = getInfoHelper();
 
@@ -137,8 +130,6 @@ Sequence< beans::PropertyState > SAL_CALL
 
 void SAL_CALL
     OPropertySet::setPropertyToDefault( const OUString& PropertyName )
-    throw (beans::UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     cppu::IPropertyArrayHelper & rPH = getInfoHelper();
 
@@ -148,9 +139,6 @@ void SAL_CALL
 
 Any SAL_CALL
     OPropertySet::getPropertyDefault( const OUString& aPropertyName )
-    throw (beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     cppu::IPropertyArrayHelper & rPH = getInfoHelper();
 
@@ -164,7 +152,6 @@ Any SAL_CALL
 
 void SAL_CALL
     OPropertySet::setAllPropertiesToDefault()
-    throw (uno::RuntimeException, std::exception)
 {
     m_pImplProperties->SetAllPropertiesToDefault();
     firePropertyChangeEvent();
@@ -172,8 +159,6 @@ void SAL_CALL
 
 void SAL_CALL
     OPropertySet::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames )
-    throw (beans::UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     cppu::IPropertyArrayHelper & rPH = getInfoHelper();
 
@@ -188,9 +173,6 @@ void SAL_CALL
 
 Sequence< Any > SAL_CALL
     OPropertySet::getPropertyDefaults( const Sequence< OUString >& aPropertyNames )
-    throw (beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     ::cppu::IPropertyArrayHelper & rPH = getInfoHelper();
     const sal_Int32 nElements = aPropertyNames.getLength();
@@ -213,7 +195,6 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue
       Any & rOldValue,
       sal_Int32 nHandle,
       const Any& rValue )
-    throw (lang::IllegalArgumentException)
 {
     getFastPropertyValue( rOldValue, nHandle );
     //accept longs also for short values
@@ -245,7 +226,6 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue
 void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast
     ( sal_Int32 nHandle,
       const Any& rValue )
-    throw (uno::Exception, std::exception)
 {
 #if OSL_DEBUG_LEVEL > 0
     if( rValue.hasValue())
@@ -359,14 +339,11 @@ void OPropertySet::firePropertyChangeEvent()
 
 // ____ XStyleSupplier ____
 Reference< style::XStyle > SAL_CALL OPropertySet::getStyle()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_pImplProperties->GetStyle();
 }
 
 void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     if( ! m_pImplProperties->SetStyle( xStyle ))
         throw lang::IllegalArgumentException(
@@ -378,10 +355,6 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle )
 // ____ XMultiPropertySet ____
 void SAL_CALL OPropertySet::setPropertyValues(
     const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values )
-    throw(beans::PropertyVetoException,
-          lang::IllegalArgumentException,
-          lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     ::cppu::OPropertySetHelper::setPropertyValues( PropertyNames, Values );
 
@@ -390,10 +363,6 @@ void SAL_CALL OPropertySet::setPropertyValues(
 
 // ____ XFastPropertySet ____
 void SAL_CALL OPropertySet::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
-    throw(beans::UnknownPropertyException,
-          beans::PropertyVetoException,
-          lang::IllegalArgumentException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::cppu::OPropertySetHelper::setFastPropertyValue( nHandle, rValue );
 
diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index ef3ba7eb3014..2846dbecba09 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -42,7 +42,6 @@ PolynomialRegressionCurveCalculator::~PolynomialRegressionCurveCalculator()
 void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression(
     const uno::Sequence< double >& aXValues,
     const uno::Sequence< double >& aYValues )
-    throw (uno::RuntimeException, std::exception)
 {
     rtl::math::setNan(&m_fCorrelationCoeffitient);
 
@@ -199,8 +198,6 @@ void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression(
 }
 
 double SAL_CALL PolynomialRegressionCurveCalculator::getCurveValue( double x )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     double fResult;
     rtl::math::setNan(&fResult);
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index 512b3736cfaa..90a542af26d9 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -46,7 +46,6 @@ PotentialRegressionCurveCalculator::~PotentialRegressionCurveCalculator()
 void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression(
     const uno::Sequence< double >& aXValues,
     const uno::Sequence< double >& aYValues )
-    throw (uno::RuntimeException, std::exception)
 {
     RegressionCalculationHelper::tDoubleVectorPair aValues(
         RegressionCalculationHelper::cleanup(
@@ -102,8 +101,6 @@ void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression(
 }
 
 double SAL_CALL PotentialRegressionCurveCalculator::getCurveValue( double x )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     double fResult;
     ::rtl::math::setNan( & fResult );
@@ -122,8 +119,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PotentialRegressionCurveCalculat
     const uno::Reference< chart2::XScaling >& xScalingX,
     const uno::Reference< chart2::XScaling >& xScalingY,
     sal_Bool bMaySkipPointsInCalculation )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     if( bMaySkipPointsInCalculation &&
         isLogarithmicScaling( xScalingX ) &&
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 6bc788ec8b9e..13c107a6d2b2 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -75,7 +75,6 @@ RangeHighlighter::~RangeHighlighter()
 
 // ____ XRangeHighlighter ____
 Sequence< chart2::data::HighlightedRange > SAL_CALL RangeHighlighter::getSelectedRanges()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_aSelectedRanges;
 }
@@ -299,7 +298,6 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface
 }
 
 void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     if(!xListener.is())
         return;
@@ -315,7 +313,6 @@ void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< vie
 }
 
 void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
     --m_nAddedListenerCount;
@@ -325,7 +322,6 @@ void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference<
 
 // ____ XSelectionChangeListener ____
 void SAL_CALL RangeHighlighter::selectionChanged( const lang::EventObject& /*aEvent*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     determineRanges();
 
@@ -352,7 +348,6 @@ void RangeHighlighter::fireSelectionEvent()
 }
 
 void SAL_CALL RangeHighlighter::disposing( const lang::EventObject& Source )
-    throw (uno::RuntimeException, std::exception)
 {
     if( Source.Source == m_xSelectionSupplier )
     {
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index 429eeb002121..5174b3d79ffc 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -77,7 +77,6 @@ void RegressionCurveCalculator::setRegressionProperties(
     sal_Bool    aForceIntercept,
     double      aInterceptValue,
     sal_Int32   aPeriod )
-        throw (uno::RuntimeException, std::exception)
 {
     mDegree = aDegree;
     mForceIntercept = aForceIntercept;
@@ -136,7 +135,6 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa
     const Reference< chart2::XScaling >& xScalingX,
     const Reference< chart2::XScaling >& /* xScalingY */,
     sal_Bool /* bMaySkipPointsInCalculation */ )
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     if( nPointCount < 2 )
         throw lang::IllegalArgumentException();
@@ -172,13 +170,11 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa
 }
 
 double SAL_CALL RegressionCurveCalculator::getCorrelationCoefficient()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_fCorrelationCoeffitient;
 }
 
 OUString SAL_CALL RegressionCurveCalculator::getRepresentation()
-    throw (uno::RuntimeException, std::exception)
 {
     return ImplGetRepresentation( Reference< util::XNumberFormatter >(), 0 );
 }
@@ -186,7 +182,6 @@ OUString SAL_CALL RegressionCurveCalculator::getRepresentation()
 OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation(
     const Reference< util::XNumberFormatsSupplier > & xNumFmtSupplier,
     sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength )
-throw (uno::RuntimeException, std::exception)
 {
     // create and prepare a number formatter
     if( !xNumFmtSupplier.is())
@@ -213,7 +208,6 @@ void RegressionCurveCalculator::addStringToEquation(
 }
 
 void SAL_CALL RegressionCurveCalculator::setXYNames( const OUString& aXName, const OUString& aYName )
-    throw (uno::RuntimeException, std::exception)
 {
     if ( aXName.isEmpty() )
         mXName = OUString ("x");
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index bce0d5064e1f..bbfa82b2e689 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -206,19 +206,16 @@ RegressionCurveModel::~RegressionCurveModel()
 // ____ XRegressionCurve ____
 uno::Reference< chart2::XRegressionCurveCalculator > SAL_CALL
     RegressionCurveModel::getCalculator()
-    throw (uno::RuntimeException, std::exception)
 {
     return RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( getServiceName());
 }
 
 uno::Reference< beans::XPropertySet > SAL_CALL RegressionCurveModel::getEquationProperties()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_xEquationProperties;
 }
 
 void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< beans::XPropertySet >& xEquationProperties )
-    throw (uno::RuntimeException, std::exception)
 {
     if( xEquationProperties.is())
     {
@@ -233,7 +230,6 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference<
 
 // ____ XServiceName ____
 OUString SAL_CALL RegressionCurveModel::getServiceName()
-    throw (uno::RuntimeException, std::exception)
 {
     switch( m_eRegressionCurveType )
     {
@@ -258,7 +254,6 @@ OUString SAL_CALL RegressionCurveModel::getServiceName()
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -272,7 +267,6 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti
 }
 
 void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -287,14 +281,12 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference<
 
 // ____ XModifyListener ____
 void SAL_CALL RegressionCurveModel::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL RegressionCurveModel::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -312,7 +304,6 @@ void RegressionCurveModel::fireModifyEvent()
 
 // ____ OPropertySet ____
 uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const
-    throw(beans::UnknownPropertyException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticXXXDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -328,7 +319,6 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 uno::Reference< beans::XPropertySetInfo > SAL_CALL RegressionCurveModel::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticRegressionCurveInfo::get();
 }
@@ -352,25 +342,21 @@ MeanValueRegressionCurve::~MeanValueRegressionCurve()
 {}
 
 OUString SAL_CALL MeanValueRegressionCurve::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return lcl_aImplementationName_MeanValue;
 }
 
 sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL MeanValueRegressionCurve::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName, "com.sun.star.chart2.MeanValueRegressionCurve" };
 }
 
 uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new MeanValueRegressionCurve( *this ));
 }
@@ -386,25 +372,21 @@ LinearRegressionCurve::~LinearRegressionCurve()
 {}
 
 OUString SAL_CALL LinearRegressionCurve::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return lcl_aImplementationName_Linear;
 }
 
 sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL LinearRegressionCurve::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName, "com.sun.star.chart2.LinearRegressionCurve" };
 }
 
 uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new LinearRegressionCurve( *this ));
 }
@@ -420,25 +402,21 @@ LogarithmicRegressionCurve::~LogarithmicRegressionCurve()
 {}
 
 OUString SAL_CALL LogarithmicRegressionCurve::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return lcl_aImplementationName_Logarithmic;
 }
 
 sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL LogarithmicRegressionCurve::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName, "com.sun.star.chart2.LogarithmicRegressionCurve" };
 }
 
 uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new LogarithmicRegressionCurve( *this ));
 }
@@ -454,25 +432,21 @@ ExponentialRegressionCurve::~ExponentialRegressionCurve()
 {}
 
 OUString SAL_CALL ExponentialRegressionCurve::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return lcl_aImplementationName_Exponential;
 }
 
 sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ExponentialRegressionCurve::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName, "com.sun.star.chart2.ExponentialRegressionCurve" };
 }
 
 uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new ExponentialRegressionCurve( *this ));
 }
@@ -488,25 +462,21 @@ PotentialRegressionCurve::~PotentialRegressionCurve()
 {}
 
 OUString SAL_CALL PotentialRegressionCurve::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return lcl_aImplementationName_Potential;
 }
 
 sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL PotentialRegressionCurve::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName, "com.sun.star.chart2.PotentialRegressionCurve" };
 }
 
 uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new PotentialRegressionCurve( *this ));
 }
@@ -522,25 +492,21 @@ PolynomialRegressionCurve::~PolynomialRegressionCurve()
 {}
 
 OUString SAL_CALL PolynomialRegressionCurve::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return lcl_aImplementationName_Polynomial;
 }
 
 sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL PolynomialRegressionCurve::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName, "com.sun.star.chart2.PolynomialRegressionCurve" };
 }
 
 uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new PolynomialRegressionCurve( *this ));
 }
@@ -556,25 +522,21 @@ MovingAverageRegressionCurve::~MovingAverageRegressionCurve()
 {}
 
 OUString SAL_CALL MovingAverageRegressionCurve::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return lcl_aImplementationName_MovingAverage;
 }
 
 sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL MovingAverageRegressionCurve::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName, "com.sun.star.chart2.MovingAverageRegressionCurve" };
 }
 
 uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new MovingAverageRegressionCurve( *this ));
 }
diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx
index 4e7191a04177..3f9b6cbb46f5 100644
--- a/chart2/source/tools/RegressionCurveModel.hxx
+++ b/chart2/source/tools/RegressionCurveModel.hxx
@@ -76,47 +76,37 @@ public:
 
 protected:
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw(css::beans::UnknownPropertyException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     // ____ OPropertySet ____
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XRegressionCurve ____
-    virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties() override;
     virtual void SAL_CALL setEquationProperties(
-        const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties ) override;
 
     // ____ XServiceName ____
-    virtual OUString SAL_CALL getServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     using ::cppu::OPropertySetHelper::disposing;
 
@@ -143,16 +133,12 @@ public:
     virtual ~MeanValueRegressionCurve() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class LinearRegressionCurve : public RegressionCurveModel
@@ -163,16 +149,12 @@ public:
     virtual ~LinearRegressionCurve() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class LogarithmicRegressionCurve : public RegressionCurveModel
@@ -183,16 +165,12 @@ public:
     virtual ~LogarithmicRegressionCurve() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ExponentialRegressionCurve : public RegressionCurveModel
@@ -203,16 +181,12 @@ public:
     virtual ~ExponentialRegressionCurve() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class PotentialRegressionCurve : public RegressionCurveModel
@@ -223,16 +197,12 @@ public:
     virtual ~PotentialRegressionCurve() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class PolynomialRegressionCurve : public RegressionCurveModel
@@ -243,16 +213,12 @@ public:
     virtual ~PolynomialRegressionCurve() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class MovingAverageRegressionCurve : public RegressionCurveModel
@@ -263,16 +229,12 @@ public:
     virtual ~MovingAverageRegressionCurve() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     /// XServiceInfo declarations
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index ce759a3fb68f..ab13afc027a1 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -212,14 +212,12 @@ RegressionEquation::~RegressionEquation()
 
 // ____ XCloneable ____
 uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< util::XCloneable >( new RegressionEquation( *this ));
 }
 
 // ____ OPropertySet ____
 uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const
-    throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     const tPropertyValueMap& rStaticDefaults = *StaticRegressionEquationDefaults::get();
     tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
@@ -235,14 +233,12 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL RegressionEquation::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     return *StaticRegressionEquationInfo::get();
 }
 
 // ____ XModifyBroadcaster ____
 void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -256,7 +252,6 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util:
 }
 
 void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -271,14 +266,12 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut
 
 // ____ XModifyListener ____
 void SAL_CALL RegressionEquation::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xModifyEventForwarder->modified( aEvent );
 }
 
 // ____ XEventListener (base of XModifyListener) ____
 void SAL_CALL RegressionEquation::disposing( const lang::EventObject& /* Source */ )
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing
 }
@@ -296,14 +289,12 @@ void RegressionEquation::fireModifyEvent()
 
 // ____ XTitle ____
 uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     return m_aStrings;
 }
 
 void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& Strings )
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     ModifyListenerHelper::removeListenerFromAllElements(
@@ -315,19 +306,16 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference<
 }
 
 OUString SAL_CALL RegressionEquation::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.chart2.RegressionEquation");
 }
 
 sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL RegressionEquation::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.chart2.RegressionEquation",
              "com.sun.star.beans.PropertySet",
diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx
index 6dcdd605f2d8..e018061f8f33 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -58,15 +58,12 @@ public:
 
     virtual OUString SAL_CALL
         getImplementationName()
-            throw( css::uno::RuntimeException, std::exception )
         override;
     virtual sal_Bool SAL_CALL
         supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception )
         override;
     virtual css::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception )
         override;
 
     /// merge XInterface implementations
@@ -76,47 +73,37 @@ protected:
     explicit RegressionEquation( const RegressionEquation & rOther );
 
     // ____ OPropertySet ____
-    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException) override;
+    virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
 
     virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
     // ____ XPropertySet ____
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     // ____ XCloneable ____
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // ____ XModifyBroadcaster ____
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ XTitle ____
     virtual css::uno::Sequence<
-        css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() override;
     virtual void SAL_CALL setText( const css::uno::Sequence<
                                    css::uno::Reference<
-                                   css::chart2::XFormattedString > >& Strings )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                   css::chart2::XFormattedString > >& Strings ) override;
 
     using ::cppu::OPropertySetHelper::disposing;
 
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index 83084b9126ae..9edd475afdcb 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -54,7 +54,6 @@ LogarithmicScaling::~LogarithmicScaling()
 }
 
 double SAL_CALL LogarithmicScaling::doScaling( double value )
-    throw (uno::RuntimeException, std::exception)
 {
     double fResult;
     if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -65,31 +64,26 @@ double SAL_CALL LogarithmicScaling::doScaling( double value )
 }
 
 uno::Reference< XScaling > SAL_CALL LogarithmicScaling::getInverseScaling()
-    throw (uno::RuntimeException, std::exception)
 {
     return new ExponentialScaling( m_fBase );
 }
 
 OUString SAL_CALL LogarithmicScaling::getServiceName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(lcl_aServiceName_Logarithmic);
 }
 
 OUString SAL_CALL LogarithmicScaling::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName_Logarithmic);
 }
 
 sal_Bool SAL_CALL LogarithmicScaling::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL LogarithmicScaling::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName_Logarithmic };
 }
@@ -109,7 +103,6 @@ ExponentialScaling::~ExponentialScaling()
 }
 
 double SAL_CALL ExponentialScaling::doScaling( double value )
-    throw (uno::RuntimeException, std::exception)
 {
     double fResult;
     if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -120,31 +113,26 @@ double SAL_CALL ExponentialScaling::doScaling( double value )
 }
 
 uno::Reference< XScaling > SAL_CALL ExponentialScaling::getInverseScaling()
-    throw (uno::RuntimeException, std::exception)
 {
     return new LogarithmicScaling( m_fBase );
 }
 
 OUString SAL_CALL ExponentialScaling::getServiceName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(lcl_aServiceName_Exponential);
 }
 
 OUString SAL_CALL ExponentialScaling::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName_Exponential);
 }
 
 sal_Bool SAL_CALL ExponentialScaling::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ExponentialScaling::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName_Exponential };
 }
@@ -163,7 +151,6 @@ LinearScaling::~LinearScaling()
 {}
 
 double SAL_CALL LinearScaling::doScaling( double value )
-    throw (uno::RuntimeException, std::exception)
 {
     double fResult;
     if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -175,7 +162,6 @@ double SAL_CALL LinearScaling::doScaling( double value )
 
 uno::Reference< XScaling > SAL_CALL
     LinearScaling::getInverseScaling()
-    throw (uno::RuntimeException, std::exception)
 {
     // ToDo: ApproxEqual ?
     if( m_fSlope == 0 )
@@ -185,25 +171,21 @@ uno::Reference< XScaling > SAL_CALL
 }
 
 OUString SAL_CALL LinearScaling::getServiceName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(lcl_aServiceName_Linear);
 }
 
 OUString SAL_CALL LinearScaling::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName_Linear) ;
 }
 
 sal_Bool SAL_CALL LinearScaling::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL LinearScaling::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName_Linear };
 }
@@ -220,7 +202,6 @@ PowerScaling::~PowerScaling()
 {}
 
 double SAL_CALL PowerScaling::doScaling( double value )
-    throw (uno::RuntimeException, std::exception)
 {
     double fResult;
     if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -232,7 +213,6 @@ double SAL_CALL PowerScaling::doScaling( double value )
 
 uno::Reference< XScaling > SAL_CALL
     PowerScaling::getInverseScaling()
-    throw (uno::RuntimeException, std::exception)
 {
     // ToDo: ApproxEqual ?
     if( m_fExponent == 0 )
@@ -243,25 +223,21 @@ uno::Reference< XScaling > SAL_CALL
 
     OUString SAL_CALL
 PowerScaling::getServiceName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(lcl_aServiceName_Power);
 }
 
 OUString SAL_CALL PowerScaling::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName_Power);
 }
 
 sal_Bool SAL_CALL PowerScaling::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName_Power };
 }
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 67a99d72c361..c4d7290d6fee 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -125,7 +125,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Bas
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) );
 }
@@ -147,19 +146,16 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS
 }
 
 OUString SAL_CALL UncachedDataSequence::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName);
 }
 
 sal_Bool SAL_CALL UncachedDataSequence::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return {
         lcl_aServiceName,
@@ -171,7 +167,6 @@ css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServic
 
 // ________ XNumericalDataSequence ________
 Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
-    throw (uno::RuntimeException, std::exception)
 {
     Sequence< double > aResult;
     MutexGuard aGuard( GetMutex() );
@@ -187,7 +182,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
 
 // ________ XTextualDataSequence ________
 Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
-    throw (uno::RuntimeException, std::exception)
 {
     Sequence< OUString > aResult;
     MutexGuard aGuard( GetMutex() );
@@ -203,7 +197,6 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
 
 // ________ XDataSequence  ________
 Sequence< Any > SAL_CALL UncachedDataSequence::getData()
-    throw (uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     if( m_xDataProvider.is())
@@ -212,31 +205,23 @@ Sequence< Any > SAL_CALL UncachedDataSequence::getData()
 }
 
 OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation()
-    throw (uno::RuntimeException, std::exception)
 {
     return getName();
 }
 
 Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data::LabelOrigin )
-    throw (uno::RuntimeException, std::exception)
 {
     // auto-generated label is an empty string
     return Sequence< OUString >(1);
 }
 
 ::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     return m_nNumberFormatKey;
 }
 
 // ____ XIndexReplace ____
 void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
-    throw (lang::IllegalArgumentException,
-           lang::IndexOutOfBoundsException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetMutex() );
     Sequence< Any > aData( getData());
@@ -251,16 +236,12 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno
 
 // ____ XIndexAccess (base of XIndexReplace) ____
 ::sal_Int32 SAL_CALL UncachedDataSequence::getCount()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Implement!" );
     return 0;
 }
 
 uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 )
-    throw (lang::IndexOutOfBoundsException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Implement!" );
     return uno::Any();
@@ -268,13 +249,11 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 )
 
 // ____ XElementAccess (base of XIndexAccess) ____
 uno::Type SAL_CALL UncachedDataSequence::getElementType()
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<uno::Any>::get();
 }
 
 sal_Bool SAL_CALL UncachedDataSequence::hasElements()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xDataProvider.is())
         return false;
@@ -283,20 +262,17 @@ sal_Bool SAL_CALL UncachedDataSequence::hasElements()
 
 // ____ XNamed ____
 OUString SAL_CALL UncachedDataSequence::getName()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_aSourceRepresentation;
 }
 
 void SAL_CALL UncachedDataSequence::setName( const OUString& aName )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aSourceRepresentation = aName;
     fireModifyEvent();
 }
 
 Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     UncachedDataSequence * pNewSeq = new UncachedDataSequence( *this );
     return Reference< util::XCloneable >( pNewSeq );
@@ -304,14 +280,11 @@ Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone()
 
 // ____ XModifiable ____
 sal_Bool SAL_CALL UncachedDataSequence::isModified()
-    throw (uno::RuntimeException, std::exception)
 {
     return false;
 }
 
 void SAL_CALL UncachedDataSequence::setModified( sal_Bool bModified )
-    throw (beans::PropertyVetoException,
-           uno::RuntimeException, std::exception)
 {
     if( bModified )
         fireModifyEvent();
@@ -319,7 +292,6 @@ void SAL_CALL UncachedDataSequence::setModified( sal_Bool bModified )
 
 // ____ XModifyBroadcaster (base of XModifiable) ____
 void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -333,7 +305,6 @@ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XM
 }
 
 void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx
index 6a1b014a418d..12c616f2f72f 100644
--- a/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/chart2/source/tools/WeakListenerAdapter.cxx
@@ -35,7 +35,6 @@ WeakModifyListenerAdapter::~WeakModifyListenerAdapter()
 {}
 
 void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< util::XModifyListener > xModListener( getListener() );
     if( xModListener.is())
@@ -51,7 +50,6 @@ WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter()
 {}
 
 void SAL_CALL WeakSelectionChangeListenerAdapter::selectionChanged( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< view::XSelectionChangeListener > xSelChgListener( getListener() );
     if( xSelChgListener.is())
diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx
index b9ef06dcf4a1..ef74d61e9dee 100644
--- a/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -39,8 +39,6 @@ WrappedDefaultProperty::~WrappedDefaultProperty()
 
 void WrappedDefaultProperty::setPropertyToDefault(
     const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-    throw (beans::UnknownPropertyException,
-           uno::RuntimeException)
 {
     Reference< beans::XPropertySet > xInnerPropSet( xInnerPropertyState, uno::UNO_QUERY );
     if( xInnerPropSet.is())
@@ -49,17 +47,12 @@ void WrappedDefaultProperty::setPropertyToDefault(
 
 uno::Any WrappedDefaultProperty::getPropertyDefault(
     const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const
-    throw (beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException)
 {
     return m_aOuterDefaultValue;
 }
 
 beans::PropertyState WrappedDefaultProperty::getPropertyState(
     const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-    throw (beans::UnknownPropertyException,
-           uno::RuntimeException)
 {
     beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE;
     try
diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx
index ceef3bfc79cf..34941778926f 100644
--- a/chart2/source/tools/WrappedDirectStateProperty.cxx
+++ b/chart2/source/tools/WrappedDirectStateProperty.cxx
@@ -37,8 +37,6 @@ WrappedDirectStateProperty::~WrappedDirectStateProperty()
 
 beans::PropertyState WrappedDirectStateProperty::getPropertyState(
     const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const
-    throw (beans::UnknownPropertyException,
-           uno::RuntimeException)
 {
     return beans::PropertyState_DIRECT_VALUE;
 }
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index 6ac89266bd20..5a0cdef9a61c 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -46,31 +46,26 @@ WrappedIgnoreProperty::~WrappedIgnoreProperty()
 }
 
 void WrappedIgnoreProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aCurrentValue = rOuterValue;
 }
 
 Any WrappedIgnoreProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return m_aCurrentValue;
 }
 
 void WrappedIgnoreProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     m_aCurrentValue = m_aDefaultValue;
 }
 
 Any WrappedIgnoreProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return m_aDefaultValue;
 }
 
 beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     return ( m_aCurrentValue == m_aDefaultValue
              ? beans::PropertyState_DEFAULT_VALUE
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index c664a6ae92ea..0b7c93c70dc6 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -52,14 +52,12 @@ Any WrappedProperty::convertOuterToInnerValue( const Any& rOuterValue ) const
 }
 
 void WrappedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     if(xInnerPropertySet.is())
         xInnerPropertySet->setPropertyValue( this->getInnerName(), this->convertOuterToInnerValue( rOuterValue ) );
 }
 
 Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     if( xInnerPropertySet.is() )
@@ -71,7 +69,6 @@ Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& x
 }
 
 void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     if( xInnerPropertyState.is() && !this->getInnerName().isEmpty() )
         xInnerPropertyState->setPropertyToDefault(this->getInnerName());
@@ -83,7 +80,6 @@ void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertySta
 }
 
 Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
     if( xInnerPropertyState.is() )
@@ -95,7 +91,6 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState
 }
 
 beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
-                        throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE;
     OUString aInnerName( this->getInnerName() );
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index e7783e201a73..78c86c73852a 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -70,7 +70,6 @@ void WrappedPropertySet::clearWrappedPropertySet()
 
 //XPropertySet
 Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySetInfo(  )
-                                    throw (uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySetInfo > xInfo = m_xInfo;
     if( !xInfo.is() )
@@ -92,7 +91,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySet
 }
 
 void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
-                                    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     try
     {
@@ -137,7 +135,6 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
     }
 }
 Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Any aRet;
 
@@ -179,7 +176,6 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
 }
 
 void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
     if( xInnerPropertySet.is() )
@@ -192,7 +188,6 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr
     }
 }
 void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& aListener )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
     if( xInnerPropertySet.is() )
@@ -205,7 +200,6 @@ void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString&
     }
 }
 void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
     if( xInnerPropertySet.is() )
@@ -218,7 +212,6 @@ void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPr
     }
 }
 void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
     if( xInnerPropertySet.is() )
@@ -233,7 +226,6 @@ void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString&
 
 //XMultiPropertySet
 void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& rNameSeq, const Sequence< Any >& rValueSeq )
-                                    throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     bool bUnknownProperty = false;
     sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
@@ -257,7 +249,6 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >&
 //        throw beans::UnknownPropertyException();
 }
 Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< OUString >& rNameSeq )
-                                    throw (uno::RuntimeException, std::exception)
 {
     Sequence< Any > aRetSeq;
     if( rNameSeq.getLength() )
@@ -283,19 +274,16 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence<
     return aRetSeq;
 }
 void SAL_CALL WrappedPropertySet::addPropertiesChangeListener( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     //todo
 }
 void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     //todo
 }
 void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     //todo
@@ -303,7 +291,6 @@ void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUS
 
 //XPropertyState
 beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE );
 
@@ -334,7 +321,6 @@ const WrappedProperty* WrappedPropertySet::getWrappedProperty( sal_Int32 nHandle
 }
 
 Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( const Sequence< OUString >& rNameSeq )
-                                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     Sequence< beans::PropertyState > aRetSeq;
     if( rNameSeq.getLength() )
@@ -350,7 +336,6 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates(
 }
 
 void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() );
     if( xInnerPropertyState.is() )
@@ -363,7 +348,6 @@ void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropert
     }
 }
 Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyName )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Any aRet;
     Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() );
@@ -380,7 +364,6 @@ Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyNa
 
 //XMultiPropertyStates
 void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault(  )
-                                    throw (uno::RuntimeException, std::exception)
 {
     const Sequence< beans::Property >&  rPropSeq = getPropertySequence();
     for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
@@ -390,7 +373,6 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault(  )
     }
 }
 void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUString >& rNameSeq )
-                                    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
     {
@@ -399,7 +381,6 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri
     }
 }
 Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence< OUString >& rNameSeq )
-                                    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Sequence< Any > aRetSeq;
     if( rNameSeq.getLength() )
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index 2dd8e3427835..0a83e792b818 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -52,7 +52,6 @@ DateScaling::~DateScaling()
 }
 
 double SAL_CALL DateScaling::doScaling( double value )
-    throw (uno::RuntimeException, std::exception)
 {
     double fResult(value);
     if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -93,31 +92,26 @@ double SAL_CALL DateScaling::doScaling( double value )
 }
 
 uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling()
-    throw (uno::RuntimeException, std::exception)
 {
     return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted );
 }
 
 OUString SAL_CALL DateScaling::getServiceName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(lcl_aServiceName_DateScaling);
 }
 
 OUString SAL_CALL DateScaling::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName_DateScaling);
 }
 
 sal_Bool SAL_CALL DateScaling::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL DateScaling::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName_DateScaling };
 }
@@ -134,7 +128,6 @@ InverseDateScaling::~InverseDateScaling()
 }
 
 double SAL_CALL InverseDateScaling::doScaling( double value )
-    throw (uno::RuntimeException, std::exception)
 {
     double fResult(value);
     if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -182,31 +175,26 @@ double SAL_CALL InverseDateScaling::doScaling( double value )
 }
 
 uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling()
-    throw (uno::RuntimeException, std::exception)
 {
     return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted );
 }
 
 OUString SAL_CALL InverseDateScaling::getServiceName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString(lcl_aServiceName_InverseDateScaling);
 }
 
 OUString SAL_CALL InverseDateScaling::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(lcl_aServiceName_InverseDateScaling);
 }
 
 sal_Bool SAL_CALL InverseDateScaling::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL InverseDateScaling::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { lcl_aServiceName_InverseDateScaling };
 }
diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx
index 3ee7f22a8568..acbb5409e9ef 100644
--- a/chart2/source/view/axes/DateScaling.hxx
+++ b/chart2/source/view/axes/DateScaling.hxx
@@ -41,24 +41,19 @@ public:
     virtual ~DateScaling() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XScaling ____
-    virtual double SAL_CALL doScaling( double value )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL doScaling( double value ) override;
 
     virtual css::uno::Reference<
         css::chart2::XScaling > SAL_CALL
-        getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+        getInverseScaling() override;
 
     // ____ XServiceName ____
-    virtual OUString SAL_CALL getServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
 private:
     const Date m_aNullDate;
@@ -78,23 +73,18 @@ public:
     virtual ~InverseDateScaling() override;
 
     /// declare XServiceInfo methods
-    virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ____ XScaling ____
-    virtual double SAL_CALL doScaling( double value )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL doScaling( double value ) override;
 
     virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
-        getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+        getInverseScaling() override;
 
     // ____ XServiceName ____
-    virtual OUString SAL_CALL getServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
 private:
     const Date m_aNullDate;
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index e88785840de4..886b67e9edc2 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -144,7 +144,6 @@ bool VAxisBase::isAnythingToDraw()
 void VAxisBase::setExplicitScaleAndIncrement(
               const ExplicitScaleData& rScale
             , const ExplicitIncrementData& rIncrement )
-            throw (uno::RuntimeException)
 {
     m_bReCreateAllTickInfos = true;
     m_aScale = rScale;
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index 3599972e12b1..3f8f71cd8995 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -55,8 +55,7 @@ public:
 
     virtual void setExplicitScaleAndIncrement(
             const ExplicitScaleData& rScale
-          , const ExplicitIncrementData& rIncrement )
-                throw (css::uno::RuntimeException) override;
+          , const ExplicitIncrementData& rIncrement ) override;
 
     virtual sal_Int32 estimateMaximumAutoMainIncrementCount();
     virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos );
diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx
index be5eec08d880..52ddc16fdbcf 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.cxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.cxx
@@ -43,7 +43,6 @@ VAxisOrGridBase::~VAxisOrGridBase()
 void VAxisOrGridBase::setExplicitScaleAndIncrement(
               const ExplicitScaleData& rScale
             , const ExplicitIncrementData& rIncrement )
-            throw (uno::RuntimeException)
 {
     m_aScale = rScale;
     m_aIncrement = rIncrement;
diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx
index be81876a06de..44cd5e772a4f 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.hxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.hxx
@@ -43,8 +43,7 @@ public:
     /// @throws css::uno::RuntimeException
     virtual void setExplicitScaleAndIncrement(
             const ExplicitScaleData& rScale
-          , const ExplicitIncrementData& rIncrement )
-                throw (css::uno::RuntimeException);
+          , const ExplicitIncrementData& rIncrement );
     void set3DWallPositions( CuboidPlanePosition eLeftWallPos, CuboidPlanePosition eBackWallPos, CuboidPlanePosition eBottomPos );
 
     virtual TickFactory* createTickFactory();
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 5aceed61248b..934d17046ea3 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -43,8 +43,7 @@ public:
     }
 
     //XTextualDataSequence
-    virtual uno::Sequence< OUString > SAL_CALL getTextualData()
-        throw ( uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getTextualData() override
     {
         return m_aTextSequence;
     }
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 7cff69374e75..d9440207c956 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -99,7 +99,6 @@ void VCoordinateSystem::initPlottingTargets(  const Reference< drawing::XShapes
        , const Reference< drawing::XShapes >& xFinalTarget
        , const Reference< lang::XMultiServiceFactory >& xShapeFactory
        , Reference< drawing::XShapes >& xLogicTargetForSeriesBehindAxis )
-            throw (uno::RuntimeException, std::exception)
 {
     OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
     //is only allowed to be called once
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index a3b1b50c4123..5ebb65809dab 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -61,7 +61,6 @@ void VPolarRadiusAxis::setTransformationSceneToScreen( const drawing::HomogenMat
 void VPolarRadiusAxis::setExplicitScaleAndIncrement(
               const ExplicitScaleData& rScale
             , const ExplicitIncrementData& rIncrement )
-            throw (uno::RuntimeException)
 {
     VPolarAxis::setExplicitScaleAndIncrement( rScale, rIncrement );
     m_apAxisWithLabels->setExplicitScaleAndIncrement( rScale, rIncrement );
@@ -71,7 +70,6 @@ void VPolarRadiusAxis::initPlotter(  const uno::Reference< drawing::XShapes >& x
        , const uno::Reference< drawing::XShapes >& xFinalTarget
        , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
        , const OUString& rCID )
-            throw (uno::RuntimeException)
 {
     VPolarAxis::initPlotter(  xLogicTarget, xFinalTarget, xShapeFactory, rCID );
     m_apAxisWithLabels->initPlotter(  xLogicTarget, xFinalTarget, xShapeFactory, rCID );
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx
index b43c2b256cc3..e4f2d85da738 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.hxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx
@@ -43,7 +43,7 @@ public:
         , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget
         , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory
         , const OUString& rCID
-                ) throw (css::uno::RuntimeException ) override;
+                ) override;
 
     virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ) override;
 
@@ -51,8 +51,7 @@ public:
 
     virtual void setExplicitScaleAndIncrement(
             const ExplicitScaleData& rScale
-          , const ExplicitIncrementData& rIncrement )
-                throw (css::uno::RuntimeException) override;
+          , const ExplicitIncrementData& rIncrement ) override;
 
     virtual void initAxisLabelProperties(
                     const css::awt::Size& rFontReferenceSize
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 9336ea3a9732..fdfc059c11d9 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -2023,7 +2023,6 @@ double VSeriesPlotter::getTransformedDepth() const
 }
 
 void VSeriesPlotter::addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex )
-                throw (uno::RuntimeException)
 {
     if( nAxisIndex<1 )
         return;
diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx
index 396d1e57379f..3572caab7a7c 100644
--- a/chart2/source/view/inc/Linear3DTransformation.hxx
+++ b/chart2/source/view/inc/Linear3DTransformation.hxx
@@ -37,15 +37,11 @@ public:
     // ____ XTransformation ____
     /// @see css::chart2::XTransformation
     virtual css::uno::Sequence< double > SAL_CALL transform(
-        const css::uno::Sequence< double >& rSourceValues )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< double >& rSourceValues ) override;
     /// @see css::chart2::XTransformation
-    virtual sal_Int32 SAL_CALL getSourceDimension()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getSourceDimension() override;
     /// @see css::chart2::XTransformation
-    virtual sal_Int32 SAL_CALL getTargetDimension()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getTargetDimension() override;
 
 private:
     css::drawing::HomogenMatrix    m_Matrix;
diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index 1d12d8633e56..8c408328f419 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -54,7 +54,7 @@ public:
         , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget
         , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory
         , const OUString& rCID
-                ) throw (css::uno::RuntimeException, std::exception);
+                );
 
     virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
 
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index aac86229d1b9..97ceebd16050 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -55,8 +55,7 @@ public:
                   const css::uno::Reference< css::drawing::XShapes >& xLogicTarget
                 , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget
                 , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory
-                , css::uno::Reference< css::drawing::XShapes >& xLogicTargetForSeriesBehindAxis )
-                        throw (css::uno::RuntimeException, std::exception);
+                , css::uno::Reference< css::drawing::XShapes >& xLogicTargetForSeriesBehindAxis );
 
     void setParticle( const OUString& rCooSysParticle );
 
diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx
index a9b548e70d1e..af9404ffc1d5 100644
--- a/chart2/source/view/inc/VPolarTransformation.hxx
+++ b/chart2/source/view/inc/VPolarTransformation.hxx
@@ -37,15 +37,11 @@ public:
     // ____ XTransformation ____
     /// @see css::chart2::XTransformation
     virtual css::uno::Sequence< double > SAL_CALL transform(
-        const css::uno::Sequence< double >& rSourceValues )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< double >& rSourceValues ) override;
     /// @see css::chart2::XTransformation
-    virtual sal_Int32 SAL_CALL getSourceDimension()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getSourceDimension() override;
     /// @see css::chart2::XTransformation
-    virtual sal_Int32 SAL_CALL getTargetDimension()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getTargetDimension() override;
 
 private:
     PolarPlottingPositionHelper     m_aPositionHelper;
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 470de99d98cb..571d903843dd 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -156,8 +156,7 @@ public:
     @throws css::uno::RuntimeException
     */
 
-    void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex )
-                throw (css::uno::RuntimeException);
+    void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex );
 
     // MinimumAndMaximumSupplier
 
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 23023bdf26c4..c3ea04246c93 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1213,7 +1213,6 @@ void ChartView::init()
 }
 
 void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& )
-                throw ( uno::Exception, uno::RuntimeException, std::exception)
 {
     init();
 }
@@ -1315,7 +1314,6 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre
 }
 
 uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aFlavor )
-                throw (datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception)
 {
     bool bHighContrastMetaFile( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast));
     uno::Any aRet;
@@ -1349,7 +1347,6 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF
     return aRet;
 }
 uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFlavors()
-                throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< datatransfer::DataFlavor > aRet(2);
 
@@ -1363,7 +1360,6 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla
     return aRet;
 }
 sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
-                throw (uno::RuntimeException, std::exception)
 {
     return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) ||
              aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) );
@@ -1371,7 +1367,6 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlav
 
 // ____ XUnoTunnel ___
 ::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8 >& aIdentifier )
-        throw( uno::RuntimeException, std::exception)
 {
     if( aIdentifier.getLength() == 16 && 0 == memcmp( ExplicitValueProvider::getUnoTunnelId().getConstArray(),
                                                          aIdentifier.getConstArray(), 16 ) )
@@ -1385,19 +1380,16 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlav
 // lang::XServiceInfo
 
 OUString SAL_CALL ChartView::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString(CHART_VIEW_SERVICE_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL ChartView::supportsService( const OUString& rServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ChartView::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { CHART_VIEW_SERVICE_NAME };
 }
@@ -2691,7 +2683,6 @@ void ChartView::render()
 
 // util::XEventListener (base of XCloseListener)
 void SAL_CALL ChartView::disposing( const lang::EventObject& /* rSource */ )
-        throw(uno::RuntimeException, std::exception)
 {
 }
 
@@ -2772,7 +2763,6 @@ void ChartView::impl_updateView( bool bCheckLockedCtrler )
 
 // ____ XModifyListener ____
 void SAL_CALL ChartView::modified( const lang::EventObject& /* aEvent */ )
-    throw (uno::RuntimeException, std::exception)
 {
     m_bViewDirty = true;
     if( m_bInViewUpdate )
@@ -2870,30 +2860,26 @@ void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode )
 // ____ XModeChangeBroadcaster ____
 
 void SAL_CALL ChartView::addModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aListenerContainer.addInterface(
         cppu::UnoType<util::XModeChangeListener>::get(), xListener );
 }
 void SAL_CALL ChartView::removeModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_aListenerContainer.removeInterface(
         cppu::UnoType<util::XModeChangeListener>::get(), xListener );
 }
 void SAL_CALL ChartView::addModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ )
-    throw (lang::NoSupportException, uno::RuntimeException, std::exception)
 {
 
 }
 void SAL_CALL ChartView::removeModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ )
-    throw (lang::NoSupportException, uno::RuntimeException, std::exception)
 {
 
 }
 
 // ____ XUpdatable ____
-void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartView::update()
 {
     impl_updateView();
 
@@ -2906,19 +2892,18 @@ void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception)
         impl_updateView();
 }
 
-void SAL_CALL ChartView::updateSoft() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartView::updateSoft()
 {
     update();
 }
 
-void SAL_CALL ChartView::updateHard() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartView::updateHard()
 {
     impl_updateView(false);
 }
 
 // ____ XPropertySet ____
 Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
     return nullptr;
@@ -2926,8 +2911,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo()
 
 void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName
                                                      , const Any& rValue )
-    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException
-          , lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( rPropertyName == "Resolution" )
     {
@@ -2980,7 +2963,6 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName
 }
 
 Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     Any aRet;
     if( rPropertyName == "Resolution" )
@@ -2994,25 +2976,21 @@ Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName )
 
 void SAL_CALL ChartView::addPropertyChangeListener(
     const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ )
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL ChartView::removePropertyChangeListener(
     const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ChartView::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -3020,7 +2998,6 @@ void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* Proper
 // ____ XMultiServiceFactory ____
 
 Reference< uno::XInterface > ChartView::createInstance( const OUString& aServiceSpecifier )
-    throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
 
@@ -3081,14 +3058,13 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService
 }
 
 Reference< uno::XInterface > ChartView::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments )
-    throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( Arguments.getLength(), "ChartView::createInstanceWithArguments: arguments are ignored" );
     (void) Arguments; // avoid warning
     return createInstance( ServiceSpecifier );
 }
 
-uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > ChartView::getAvailableServiceNames()
 {
     uno::Sequence< OUString > aServiceNames( 6 );
 
@@ -3102,7 +3078,7 @@ uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::Runt
     return aServiceNames;
 }
 
-OUString ChartView::dump() throw (uno::RuntimeException, std::exception)
+OUString ChartView::dump()
 {
 #if HAVE_FEATURE_DESKTOP
     // Used for unit tests and in chartcontroller only, no need to drag in this when cross-compiling
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 579765ab18da..115654d66bd7 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -84,27 +84,22 @@ public:
     explicit DummyPropertySetInfo(const std::map<OUString, uno::Any>& rProps ):
         mrProperties(rProps) {}
 
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) override;
 
-    virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName )
-        throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) override;
+    virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) override;
 
-    virtual uno::Sequence< beans::Property > SAL_CALL getProperties()
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Sequence< beans::Property > SAL_CALL getProperties() override;
 
 private:
     const std::map<OUString, uno::Any>& mrProperties;
 };
 
 sal_Bool SAL_CALL DummyPropertySetInfo::hasPropertyByName( const OUString& rName )
-    throw(uno::RuntimeException, std::exception)
 {
     return mrProperties.find(rName) != mrProperties.end();
 }
 
 beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString& rName )
-    throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception)
 {
     beans::Property aRet;
     if(mrProperties.find(rName) == mrProperties.end())
@@ -118,7 +113,6 @@ beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString
 }
 
 uno::Sequence< beans::Property > SAL_CALL DummyPropertySetInfo::getProperties()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< beans::Property > aRet(mrProperties.size());
 
@@ -163,57 +157,46 @@ DummyXShape::DummyXShape()
 }
 
 OUString SAL_CALL DummyXShape::getName()
-    throw(uno::RuntimeException, std::exception)
 {
     return maName;
 }
 
 void SAL_CALL DummyXShape::setName( const OUString& rName )
-    throw(uno::RuntimeException, std::exception)
 {
     maName = rName;
 }
 
 awt::Point SAL_CALL DummyXShape::getPosition()
-    throw(uno::RuntimeException, std::exception)
 {
     return maPosition;
 }
 
 void SAL_CALL DummyXShape::setPosition( const awt::Point& rPoint )
-    throw(uno::RuntimeException, std::exception)
 {
     maPosition = rPoint;
 }
 
 awt::Size SAL_CALL DummyXShape::getSize()
-    throw(uno::RuntimeException, std::exception)
 {
     return maSize;
 }
 
 void SAL_CALL DummyXShape::setSize( const awt::Size& rSize )
-    throw(beans::PropertyVetoException, uno::RuntimeException, std::exception)
 {
     maSize = rSize;
 }
 
 OUString SAL_CALL DummyXShape::getShapeType()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("dummy shape");
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL DummyXShape::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     return new DummyPropertySetInfo(maProperties);
 }
 
 void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::Any& rValue)
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-            lang::IllegalArgumentException, lang::WrappedTargetException,
-            uno::RuntimeException, std::exception)
 {
     SAL_INFO("chart2", "DummyXShape::setProperty: " << rName << " Any");
     maProperties[rName] = rValue;
@@ -224,7 +207,6 @@ void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::A
 }
 
 uno::Any SAL_CALL DummyXShape::getPropertyValue( const OUString& rName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_INFO("chart2.opengl", "DummyXShape::getPropertyValue: " << rName);
     std::map<OUString, uno::Any>::iterator itr = maProperties.find(rName);
@@ -235,29 +217,23 @@ uno::Any SAL_CALL DummyXShape::getPropertyValue( const OUString& rName )
 }
 
 void SAL_CALL DummyXShape::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL DummyXShape::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL DummyXShape::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL DummyXShape::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL DummyXShape::setPropertyValues( const uno::Sequence< OUString >& rNames,
         const uno::Sequence< uno::Any >& rValues)
-throw (beans::PropertyVetoException, lang::IllegalArgumentException,
-        lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     size_t n = std::min<size_t>(rNames.getLength(), rValues.getLength());
     for(size_t i = 0; i < n; ++i)
@@ -268,7 +244,6 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException,
 
 uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues(
         const uno::Sequence< OUString >& rNames)
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Any > aValues(rNames.getLength());
     for(sal_Int32 i = 0; i < rNames.getLength(); ++i)
@@ -282,22 +257,20 @@ uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues(
     return aValues;
 }
 
-void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& )
 {
 }
 
-void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& )
 {
 }
 
 void SAL_CALL DummyXShape::firePropertiesChangeEvent( const uno::Sequence< OUString >& ,
         const uno::Reference< beans::XPropertiesChangeListener >& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 OUString SAL_CALL DummyXShape::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("DummyXShape");
 }
@@ -316,25 +289,21 @@ uno::Sequence< OUString > const & listSupportedServices()
 }
 
 uno::Sequence< OUString > SAL_CALL DummyXShape::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     return listSupportedServices();
 }
 
 sal_Bool SAL_CALL DummyXShape::supportsService( const OUString& rServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Reference< uno::XInterface > SAL_CALL DummyXShape::getParent()
-    throw(uno::RuntimeException, std::exception)
 {
     return mxParent;
 }
 
 void SAL_CALL DummyXShape::setParent( const uno::Reference< uno::XInterface >& xParent )
-    throw(lang::NoSupportException, uno::RuntimeException, std::exception)
 {
     mxParent = xParent;
 }
@@ -887,16 +856,12 @@ void DummyText::render()
 }
 
 void SAL_CALL DummyText::setPropertyValue( const OUString& rName, const uno::Any& rValue)
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-            lang::IllegalArgumentException, lang::WrappedTargetException,
-            uno::RuntimeException, std::exception)
 {
     SAL_INFO("chart2.opengl", "property value set after image has been created");
     DummyXShape::setPropertyValue(rName, rValue);
 }
 
 void SAL_CALL DummyText::setPosition(const awt::Point& rPosition )
-    throw(uno::RuntimeException, std::exception)
 {
     DummyXShape::setPosition(rPosition);
     if(maTrans.hasValue())
@@ -932,7 +897,6 @@ DummyGroup2D::DummyGroup2D(const OUString& rName)
 }
 
 awt::Point SAL_CALL DummyGroup2D::getPosition()
-    throw(uno::RuntimeException, std::exception)
 {
     long nTop = std::numeric_limits<long>::max();
     long nLeft = std::numeric_limits<long>::max();
@@ -951,7 +915,6 @@ awt::Point SAL_CALL DummyGroup2D::getPosition()
 }
 
 awt::Size SAL_CALL DummyGroup2D::getSize()
-    throw(uno::RuntimeException, std::exception)
 {
     long nTop = std::numeric_limits<long>::max();
     long nLeft = std::numeric_limits<long>::max();
@@ -972,7 +935,6 @@ awt::Size SAL_CALL DummyGroup2D::getSize()
 }
 
 void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos )
-    throw(uno::RuntimeException, std::exception)
 {
     for(std::vector<DummyXShape*>::const_iterator itr = maShapes.begin(),
             itrEnd = maShapes.end(); itr != itrEnd; ++itr)
@@ -984,7 +946,6 @@ void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos )
 }
 
 void SAL_CALL DummyGroup2D::setSize( const awt::Size& )
-    throw( beans::PropertyVetoException, uno::RuntimeException, std::exception )
 {
     SAL_WARN("chart2.opengl", "set size on group shape");
 }
@@ -1008,7 +969,6 @@ DummyChart* DummyChart::getRootShape()
 }
 
 uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rType == cppu::UnoType<drawing::XShapes>::get() )
         return uno::makeAny(uno::Reference<drawing::XShapes>(this));
@@ -1018,7 +978,6 @@ uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType )
 }
 
 uno::Any SAL_CALL DummyXShapes::queryAggregation( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rType == cppu::UnoType<drawing::XShapes>::get() )
         return uno::makeAny(uno::Reference< drawing::XShapes >(this));
@@ -1039,7 +998,6 @@ void DummyXShapes::release()
 }
 
 void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape )
-    throw(uno::RuntimeException, std::exception)
 {
     DummyXShape& rChild = dynamic_cast<DummyXShape&>(*xShape.get());
     maUNOShapes.push_back(xShape);
@@ -1048,7 +1006,6 @@ void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape
 }
 
 void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xShape )
-    throw(uno::RuntimeException, std::exception)
 {
     std::vector< uno::Reference<drawing::XShape> >::iterator itr = std::find(maUNOShapes.begin(), maUNOShapes.end(), xShape);
     if(itr != maUNOShapes.end())
@@ -1063,26 +1020,21 @@ void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xSha
 }
 
 uno::Type SAL_CALL DummyXShapes::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<drawing::XShape>::get();
 }
 
 sal_Bool SAL_CALL DummyXShapes::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     return !maUNOShapes.empty();
 }
 
 sal_Int32 SAL_CALL DummyXShapes::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     return maUNOShapes.size();
 }
 
 uno::Any SAL_CALL DummyXShapes::getByIndex(sal_Int32 nIndex)
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-            uno::RuntimeException, std::exception)
 {
     uno::Any aShape;
     aShape <<= maUNOShapes[nIndex];
@@ -1108,7 +1060,6 @@ DummyChart::DummyChart():
 }
 
 void SAL_CALL DummyChart::setPosition( const awt::Point& aPosition )
-    throw( uno::RuntimeException, std::exception )
 {
     DummyXShape::setPosition(aPosition);
 }
@@ -1118,7 +1069,6 @@ DummyChart::~DummyChart()
 }
 
 void SAL_CALL DummyChart::setSize( const awt::Size& aSize )
-    throw( beans::PropertyVetoException, uno::RuntimeException, std::exception )
 {
     SAL_INFO("chart2.opengl", "DummyChart::setSize()---aSize.Width = " << aSize.Width << ", aSize.Height = " << aSize.Height);
     int width = aSize.Width;
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index 1b3c634e52c8..fddf6a117f62 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -110,53 +110,49 @@ public:
     DummyXShape();
 
     // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XShape
-    virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // XShapeDescriptor
-    virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XMultiPropertySet
     virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames,
-            const css::uno::Sequence< css::uno::Any >& aValues )
-        throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::uno::Any >& aValues ) override;
 
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues(
-            const css::uno::Sequence< OUString >& aPropertyNames )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames,
-            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     // XChild
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
     // normal non UNO methods
 
@@ -311,9 +307,9 @@ public:
 
     virtual void render() override;
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
 
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
 
 private:
     void setTransformatAsProperty(const css::drawing::HomogenMatrix3& rMatrix);
@@ -328,22 +324,22 @@ class DummyXShapes : public DummyXShape, public css::drawing::XShapes
 {
 public:
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XShapes
-    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // normal methods
     virtual void render() override;
@@ -360,8 +356,8 @@ public:
     virtual ~DummyChart() override;
     virtual DummyChart* getRootShape() override;
 
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     virtual void render() override;
 
@@ -386,10 +382,10 @@ class DummyGroup2D : public DummyXShapes
 public:
     explicit DummyGroup2D(const OUString& rName);
 
-    virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 };
 
 class DummyGroup3D : public DummyXShapes
diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx
index 30597f83f578..302ce68f2a2f 100644
--- a/chart2/source/view/main/Linear3DTransformation.cxx
+++ b/chart2/source/view/main/Linear3DTransformation.cxx
@@ -39,8 +39,6 @@ Linear3DTransformation::~Linear3DTransformation()
 // ____ XTransformation ____
 Sequence< double > SAL_CALL Linear3DTransformation::transform(
                         const Sequence< double >& rSourceValues )
-    throw (RuntimeException,
-           lang::IllegalArgumentException, std::exception)
 {
     double fX = rSourceValues[0];
     double fY = rSourceValues[1];
@@ -82,13 +80,11 @@ Sequence< double > SAL_CALL Linear3DTransformation::transform(
 }
 
 sal_Int32 SAL_CALL Linear3DTransformation::getSourceDimension()
-    throw (RuntimeException, std::exception)
 {
     return 3;
 }
 
 sal_Int32 SAL_CALL Linear3DTransformation::getTargetDimension()
-    throw (RuntimeException, std::exception)
 {
     return 3;
 }
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 326d4086e9ce..65548cc4ace5 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -44,7 +44,6 @@ void PlotterBase::initPlotter(  const uno::Reference< drawing::XShapes >& xLogic
        , const uno::Reference< drawing::XShapes >& xFinalTarget
        , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
        , const OUString& rCID )
-            throw (uno::RuntimeException, std::exception)
 {
     OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
     //is only allowed to be called once
diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx
index e75e2a13b19d..93d6aa26f975 100644
--- a/chart2/source/view/main/VPolarTransformation.cxx
+++ b/chart2/source/view/main/VPolarTransformation.cxx
@@ -43,8 +43,6 @@ VPolarTransformation::~VPolarTransformation()
 // ____ XTransformation ____
 Sequence< double > SAL_CALL VPolarTransformation::transform(
                         const Sequence< double >& rSourceValues )
-    throw (RuntimeException,
-           lang::IllegalArgumentException, std::exception)
 {
     double fScaledLogicAngle  = rSourceValues[0];
     double fScaledLogicRadius = rSourceValues[1];
@@ -67,13 +65,11 @@ Sequence< double > SAL_CALL VPolarTransformation::transform(
 }
 
 sal_Int32 SAL_CALL VPolarTransformation::getSourceDimension()
-    throw (RuntimeException, std::exception)
 {
     return 3;
 }
 
 sal_Int32 SAL_CALL VPolarTransformation::getTargetDimension()
-    throw (RuntimeException, std::exception)
 {
     return 3;
 }
diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx
index 83d0b2fd5633..53560800fc1b 100644
--- a/codemaker/source/codemaker/options.cxx
+++ b/codemaker/source/codemaker/options.cxx
@@ -38,7 +38,6 @@ bool Options::isValid(const OString& option) const
 }
 
 const OString& Options::getOption(const OString& option) const
-    throw( IllegalArgument )
 {
     OptionMap::const_iterator i(m_options.find(option));
     if (i == m_options.end()) {
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 2f7724b6290a..3a0bdb5d0cd4 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -33,7 +33,6 @@ using ::rtl::OString;
 #endif
 
 bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
-    throw( IllegalArgument )
 {
     bool    ret = true;
     sal_uInt16  i=0;
diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx
index 9d5addf326e9..497fbd96402b 100644
--- a/codemaker/source/cppumaker/cppuoptions.hxx
+++ b/codemaker/source/cppumaker/cppuoptions.hxx
@@ -28,8 +28,7 @@ public:
     CppuOptions()
         : Options() {}
 
-    bool initOptions(int ac, char* av[], bool bCmdFile=false)
-            throw( IllegalArgument ) override;
+    bool initOptions(int ac, char* av[], bool bCmdFile=false) override;
 
     OString  prepareHelp() override;
 
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index bdfa4ebd78d1..97eef36b0e30 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -31,7 +31,6 @@
 #endif
 
 bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
-    throw( IllegalArgument )
 {
     bool    ret = true;
     sal_uInt16  i=0;
diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx
index 817d8805e123..e4eed6883849 100644
--- a/codemaker/source/javamaker/javaoptions.hxx
+++ b/codemaker/source/javamaker/javaoptions.hxx
@@ -28,8 +28,7 @@ public:
     JavaOptions()
         : Options() {}
 
-    bool initOptions(int ac, char* av[], bool bCmdFile=false)
-            throw( IllegalArgument ) override;
+    bool initOptions(int ac, char* av[], bool bCmdFile=false) override;
 
     OString  prepareHelp() override;
 
diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx
index 135adfdb9304..5a6cff89583d 100644
--- a/comphelper/qa/container/comphelper_ifcontainer.cxx
+++ b/comphelper/qa/container/comphelper_ifcontainer.cxx
@@ -47,8 +47,7 @@ public:
     explicit ContainerListener(ContainerStats *pStats)
         : m_pStats(pStats) { m_pStats->m_nAlive++; }
     virtual ~ContainerListener() override { m_pStats->m_nAlive--; }
-    virtual void SAL_CALL disposing( const EventObject& )
-        throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing( const EventObject& ) override
     {
         m_pStats->m_nDisposed++;
     }
diff --git a/comphelper/qa/container/testifcontainer.cxx b/comphelper/qa/container/testifcontainer.cxx
index e881f6739db6..b39eef1d5bd4 100644
--- a/comphelper/qa/container/testifcontainer.cxx
+++ b/comphelper/qa/container/testifcontainer.cxx
@@ -48,13 +48,12 @@ class TestListener : public cppu::WeakImplHelper< XVetoableChangeListener >
 {
 public:
     // Methods
-    virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) throw(css::uno::RuntimeException) override
+    virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) override
         {
 
         }
 
-    virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ )
-       throw(css::beans::PropertyVetoException, css::uno::RuntimeException) override
+    virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ ) override
         {
 
         }
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx
index 636c30587370..1180805542fa 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -89,29 +89,26 @@ class testCollator : public cppu::WeakImplHelper< i18n::XCollator >
 public:
     virtual sal_Int32 SAL_CALL compareSubstring(
         const OUString& str1, sal_Int32 off1, sal_Int32 len1,
-        const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException, std::exception) override
+        const OUString& str2, sal_Int32 off2, sal_Int32 len2) override
     {
         return str1.copy(off1, len1).compareTo(str2.copy(off2, len2));
     }
     virtual sal_Int32 SAL_CALL compareString(
         const OUString& str1,
-        const OUString& str2) throw(uno::RuntimeException, std::exception) override
+        const OUString& str2) override
     {
         return str1.compareTo(str2);
     }
-    virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32)
-        throw(uno::RuntimeException, std::exception) override {return 0;}
+    virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32) override {return 0;}
     virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const OUString&,
-        const lang::Locale&, sal_Int32) throw(uno::RuntimeException, std::exception) override {return 0;}
+        const lang::Locale&, sal_Int32) override {return 0;}
     virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const OUString&,
-        const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException, std::exception) override {}
-    virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&)
-        throw(uno::RuntimeException, std::exception) override
+        const lang::Locale&, const uno::Sequence< sal_Int32 >&) override {}
+    virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&) override
     {
         return uno::Sequence< OUString >();
     }
-    virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&)
-        throw(uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&) override
     {
         return uno::Sequence< sal_Int32 >();
     }
@@ -123,64 +120,59 @@ class testBreakIterator : public cppu::WeakImplHelper< i18n::XBreakIterator >
 {
 public:
     virtual sal_Int32 SAL_CALL nextCharacters( const OUString&, sal_Int32,
-        const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
-            throw(uno::RuntimeException, std::exception) override {return -1;}
+        const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) override {return -1;}
     virtual sal_Int32 SAL_CALL previousCharacters( const OUString&, sal_Int32,
-        const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
-            throw(uno::RuntimeException, std::exception) override {return -1;}
+        const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) override {return -1;}
 
     virtual i18n::Boundary SAL_CALL previousWord( const OUString&, sal_Int32,
-        const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) override
+        const lang::Locale&, sal_Int16) override
         { return i18n::Boundary(); }
     virtual i18n::Boundary SAL_CALL nextWord( const OUString&, sal_Int32,
-        const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) override
+        const lang::Locale&, sal_Int16) override
         { return i18n::Boundary(); }
     virtual i18n::Boundary SAL_CALL getWordBoundary( const OUString&, sal_Int32,
-        const lang::Locale&, sal_Int16, sal_Bool )
-        throw(uno::RuntimeException, std::exception) override
+        const lang::Locale&, sal_Int16, sal_Bool ) override
         { return i18n::Boundary(); }
 
     virtual sal_Bool SAL_CALL isBeginWord( const OUString&, sal_Int32,
-        const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override
+        const lang::Locale&, sal_Int16 ) override
         { return false; }
     virtual sal_Bool SAL_CALL isEndWord( const OUString&, sal_Int32,
-        const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException, std::exception) override
+        const lang::Locale& , sal_Int16 ) override
         { return false; }
     virtual sal_Int16 SAL_CALL getWordType( const OUString&, sal_Int32,
-        const lang::Locale& ) throw(uno::RuntimeException, std::exception) override
+        const lang::Locale& ) override
         { return 0; }
 
     virtual sal_Int32 SAL_CALL beginOfSentence( const OUString&, sal_Int32,
-        const lang::Locale& ) throw(uno::RuntimeException, std::exception) override
+        const lang::Locale& ) override
         { return 0; }
     virtual sal_Int32 SAL_CALL endOfSentence( const OUString& rText, sal_Int32,
-        const lang::Locale& ) throw(uno::RuntimeException, std::exception) override
+        const lang::Locale& ) override
         { return rText.getLength(); }
 
     virtual i18n::LineBreakResults SAL_CALL getLineBreak( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int32,
         const i18n::LineBreakHyphenationOptions&,
-        const i18n::LineBreakUserOptions&)
-        throw(uno::RuntimeException, std::exception) override
+        const i18n::LineBreakUserOptions&) override
     {
         return i18n::LineBreakResults();
     }
 
-    virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 )
-        throw(uno::RuntimeException, std::exception) override { return -1; }
+    virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 ) override { return -1; }
     virtual sal_Int32 SAL_CALL beginOfScript( const OUString&, sal_Int32,
-        sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+        sal_Int16 ) override { return -1; }
     virtual sal_Int32 SAL_CALL endOfScript( const OUString&, sal_Int32,
-        sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+        sal_Int16 ) override { return -1; }
     virtual sal_Int32 SAL_CALL previousScript( const OUString&, sal_Int32,
-        sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+        sal_Int16 ) override { return -1; }
     virtual sal_Int32 SAL_CALL nextScript( const OUString&, sal_Int32,
-        sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+        sal_Int16 ) override { return -1; }
 
     virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString&, sal_Int32,
-        const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+        const lang::Locale&, sal_Int16 ) override { return -1; }
     virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& rText, sal_Int32 nStartPos,
-        const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) override
+        const lang::Locale&, sal_Int16 CharType ) override
     {
         const sal_Unicode *pStr = rText.getStr()+nStartPos;
         for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI)
@@ -194,9 +186,9 @@ public:
         return -1;
     }
     virtual sal_Int32 SAL_CALL previousCharBlock( const OUString&, sal_Int32,
-        const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; }
+        const lang::Locale&, sal_Int16 ) override { return -1; }
     virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& rText, sal_Int32 nStartPos,
-        const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) override
+        const lang::Locale&, sal_Int16 CharType ) override
     {
         const sal_Unicode *pStr = rText.getStr()+nStartPos;
         for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI)
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index 4a0bbc3eeb72..c3df018c14ee 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -48,7 +48,7 @@ public:
                                           0 ); //???
     }
 
-    virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) throw(RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) override;
 };
 
 class AnyCompareFactory : public cppu::WeakImplHelper< XAnyCompareFactory, XInitialization, XServiceInfo >
@@ -62,19 +62,18 @@ public:
     {}
 
     // XAnyCompareFactory
-    virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
-            throw ( Exception, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
-sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw(css::uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 )
 {
     sal_Int16 aResult = 0;
 
@@ -89,7 +88,7 @@ sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw
     return aResult;
 }
 
-Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( const OUString& aPropertyName ) throw(css::uno::RuntimeException, std::exception)
+Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( const OUString& aPropertyName )
 {
     // for now only OUString properties compare is implemented
     // so no check for the property name is done
@@ -100,7 +99,7 @@ Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( con
     return Reference< XAnyCompare >();
 }
 
-void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments )
 {
     if( aArguments.getLength() )
     {
@@ -112,17 +111,17 @@ void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments )
     }
 }
 
-OUString SAL_CALL AnyCompareFactory::getImplementationName(  ) throw( RuntimeException, std::exception )
+OUString SAL_CALL AnyCompareFactory::getImplementationName(  )
 {
     return OUString( "AnyCompareFactory" );
 }
 
-sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames(  )
 {
     const OUString aServiceName( "com.sun.star.ucb.AnyCompareFactory" );
     const Sequence< OUString > aSeq( &aServiceName, 1 );
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 803b171dbf1e..9bc88a408d43 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -37,35 +37,24 @@ public:
     IndexedPropertyValuesContainer() throw();
 
     // XIndexContainer
-    virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByIndex( sal_Int32 nIndex )
-        throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) override;
 
     // XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex )
-        throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     IndexedPropertyValues maProperties;
@@ -77,8 +66,6 @@ IndexedPropertyValuesContainer::IndexedPropertyValuesContainer() throw()
 
 // XIndexContainer
 void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
-    throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nSize(maProperties.size());
     if ((nSize >= nIndex) && (nIndex >= 0))
@@ -119,8 +106,6 @@ void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, c
 }
 
 void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex )
-    throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nSize(maProperties.size());
     if ((nIndex < nSize) && (nIndex >= 0))
@@ -154,8 +139,6 @@ void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex )
 
 // XIndexReplace
 void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
-    throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nSize(maProperties.size());
     if ((nIndex < nSize) && (nIndex >= 0))
@@ -171,14 +154,11 @@ void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex,
 
 // XIndexAccess
 sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return maProperties.size();
 }
 
 css::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIndex )
-    throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nSize(maProperties.size());
     if (!((nIndex < nSize) && (nIndex >= 0)))
@@ -189,29 +169,27 @@ css::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIn
 
 // XElementAccess
 css::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
 }
 
 sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return !maProperties.empty();
 }
 
 //XServiceInfo
-OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName(  )
 {
     return OUString( "IndexedPropertyValuesContainer" );
 }
 
-sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames(  )
 {
     const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" );
     const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 4ac5b42fb5f5..7e72ccce808e 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -38,37 +38,25 @@ public:
     NamedPropertyValuesContainer() throw();
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException, css::container::ElementExistException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     NamedPropertyValues maProperties;
@@ -80,8 +68,6 @@ NamedPropertyValuesContainer::NamedPropertyValuesContainer() throw()
 
 // XNameContainer
 void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw(css::lang::IllegalArgumentException, css::container::ElementExistException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     if( maProperties.find( aName ) != maProperties.end() )
         throw container::ElementExistException();
@@ -94,8 +80,6 @@ void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName,
 }
 
 void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name )
-    throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     NamedPropertyValues::iterator aIter = maProperties.find( Name );
     if( aIter == maProperties.end() )
@@ -106,8 +90,6 @@ void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name )
 
 // XNameReplace
 void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const css::uno::Any& aElement )
-    throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     NamedPropertyValues::iterator aIter = maProperties.find( aName );
     if( aIter == maProperties.end() )
@@ -122,8 +104,6 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName
 
 // XNameAccess
 css::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName )
-    throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     NamedPropertyValues::iterator aIter = maProperties.find( aName );
     if( aIter == maProperties.end() )
@@ -137,13 +117,11 @@ css::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString&
 }
 
 css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return comphelper::mapKeysToSequence(maProperties);
 }
 
 sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     NamedPropertyValues::iterator aIter = maProperties.find( aName );
     return aIter != maProperties.end();
@@ -151,29 +129,27 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName
 
 // XElementAccess
 css::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
 }
 
 sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return !maProperties.empty();
 }
 
 //XServiceInfo
-OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName(  )
 {
     return OUString( "NamedPropertyValuesContainer" );
 }
 
-sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames(  )
 {
     const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" );
     const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx
index e80f550bb02e..ae37e3a311ef 100644
--- a/comphelper/source/container/containermultiplexer.cxx
+++ b/comphelper/source/container/containermultiplexer.cxx
@@ -44,25 +44,21 @@ namespace comphelper
 
 
     void OContainerListener::_elementInserted( const ContainerEvent& /*_rEvent*/ )
-        throw (RuntimeException, std::exception)
     {
     }
 
 
     void OContainerListener::_elementRemoved( const ContainerEvent& )
-        throw (RuntimeException, std::exception)
     {
     }
 
 
     void OContainerListener::_elementReplaced( const ContainerEvent& /*_rEvent*/ )
-        throw (RuntimeException, std::exception)
     {
     }
 
 
     void OContainerListener::_disposing(const EventObject& )
-        throw (RuntimeException, std::exception)
     {
     }
 
@@ -119,7 +115,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OContainerListenerAdapter::disposing( const  EventObject& _rSource) throw(RuntimeException, std::exception)
+    void SAL_CALL OContainerListenerAdapter::disposing( const  EventObject& _rSource)
     {
         if (m_pListener)
         {
@@ -135,21 +131,21 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+    void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent )
     {
         if (m_pListener)
             m_pListener->_elementInserted(_rEvent);
     }
 
 
-    void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+    void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent )
     {
         if (m_pListener)
             m_pListener->_elementRemoved(_rEvent);
     }
 
 
-    void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+    void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent )
     {
         if (m_pListener)
             m_pListener->_elementReplaced(_rEvent);
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 1dc23292d1e7..69e89760e531 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -155,31 +155,31 @@ namespace comphelper
         virtual ~EnumerableMap() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
         // XEnumerableMap
-        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool Isolated ) override;
+        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool Isolated ) override;
+        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool Isolated ) override;
 
         // XMap
-        virtual Type SAL_CALL getKeyType() throw (RuntimeException, std::exception) override;
-        virtual Type SAL_CALL getValueType() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL clear(  ) throw (NoSupportException, RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override;
-        virtual Any SAL_CALL get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
-        virtual Any SAL_CALL put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override;
-        virtual Any SAL_CALL remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
+        virtual Type SAL_CALL getKeyType() override;
+        virtual Type SAL_CALL getValueType() override;
+        virtual void SAL_CALL clear(  ) override;
+        virtual sal_Bool SAL_CALL containsKey( const Any& _key ) override;
+        virtual sal_Bool SAL_CALL containsValue( const Any& _value ) override;
+        virtual Any SAL_CALL get( const Any& _key ) override;
+        virtual Any SAL_CALL put( const Any& _key, const Any& _value ) override;
+        virtual Any SAL_CALL remove( const Any& _key ) override;
 
         // XElementAccess (base of XMap)
-        virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override;
+        virtual Type SAL_CALL getElementType() override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     public:
         // XServiceInfo, static version (used for component registration)
@@ -278,8 +278,8 @@ namespace comphelper
         }
 
         // XEnumeration
-        virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (RuntimeException, std::exception) override;
-        virtual Any SAL_CALL nextElement(  ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+        virtual Any SAL_CALL nextElement(  ) override;
 
     protected:
         virtual ~MapEnumeration() override
@@ -317,7 +317,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments )
     {
         ComponentMethodGuard aGuard( *this, ComponentMethodGuard::MethodType::WithoutInit );
         if ( impl_isInitialized_nothrow() )
@@ -496,42 +496,42 @@ namespace comphelper
     }
 
 
-    Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception)
+    Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool Isolated )
     {
         ComponentMethodGuard aGuard( *this );
         return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, Isolated );
     }
 
 
-    Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception)
+    Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool Isolated )
     {
         ComponentMethodGuard aGuard( *this );
         return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, Isolated );
     }
 
 
-    Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception)
+    Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool Isolated )
     {
         ComponentMethodGuard aGuard( *this );
         return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eBoth, Isolated );
     }
 
 
-    Type SAL_CALL EnumerableMap::getKeyType() throw (RuntimeException, std::exception)
+    Type SAL_CALL EnumerableMap::getKeyType()
     {
         ComponentMethodGuard aGuard( *this );
         return m_aData.m_aKeyType;
     }
 
 
-    Type SAL_CALL EnumerableMap::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL EnumerableMap::getValueType()
     {
         ComponentMethodGuard aGuard( *this );
         return m_aData.m_aValueType;
     }
 
 
-    void SAL_CALL EnumerableMap::clear(  ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL EnumerableMap::clear(  )
     {
         ComponentMethodGuard aGuard( *this );
         impl_checkMutable_throw();
@@ -542,7 +542,7 @@ namespace comphelper
     }
 
 
-    sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key )
     {
         ComponentMethodGuard aGuard( *this );
         impl_checkKey_throw( _key );
@@ -552,7 +552,7 @@ namespace comphelper
     }
 
 
-    sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value )
     {
         ComponentMethodGuard aGuard( *this );
         impl_checkValue_throw( _value );
@@ -569,7 +569,7 @@ namespace comphelper
     }
 
 
-    Any SAL_CALL EnumerableMap::get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+    Any SAL_CALL EnumerableMap::get( const Any& _key )
     {
         ComponentMethodGuard aGuard( *this );
         impl_checkKey_throw( _key );
@@ -582,7 +582,7 @@ namespace comphelper
     }
 
 
-    Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+    Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value )
     {
         ComponentMethodGuard aGuard( *this );
         impl_checkMutable_throw();
@@ -608,7 +608,7 @@ namespace comphelper
     }
 
 
-    Any SAL_CALL EnumerableMap::remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+    Any SAL_CALL EnumerableMap::remove( const Any& _key )
     {
         ComponentMethodGuard aGuard( *this );
         impl_checkMutable_throw();
@@ -629,31 +629,31 @@ namespace comphelper
     }
 
 
-    Type SAL_CALL EnumerableMap::getElementType() throw (RuntimeException, std::exception)
+    Type SAL_CALL EnumerableMap::getElementType()
     {
         return ::cppu::UnoType< Pair< Any, Any > >::get();
     }
 
 
-    sal_Bool SAL_CALL EnumerableMap::hasElements() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL EnumerableMap::hasElements()
     {
         ComponentMethodGuard aGuard( *this );
         return m_aData.m_pValues->empty();
     }
 
 
-    OUString SAL_CALL EnumerableMap::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL EnumerableMap::getImplementationName(  )
     {
         return getImplementationName_static();
     }
 
-    sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName )
     {
         return cppu::supportsService(this, _serviceName);
     }
 
 
-    Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_static();
     }
@@ -711,14 +711,14 @@ namespace comphelper
     }
 
 
-    sal_Bool SAL_CALL MapEnumeration::hasMoreElements(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL MapEnumeration::hasMoreElements(  )
     {
         ComponentMethodGuard aGuard( *this );
         return m_aEnumerator.hasMoreElements();
     }
 
 
-    Any SAL_CALL MapEnumeration::nextElement(  ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL MapEnumeration::nextElement(  )
     {
         ComponentMethodGuard aGuard( *this );
         return m_aEnumerator.nextElement();
diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index d501dd9dadd5..c5e49a6555c8 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.cxx
@@ -51,7 +51,7 @@ OEnumerationByName::~OEnumerationByName()
 }
 
 
-sal_Bool SAL_CALL OEnumerationByName::hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OEnumerationByName::hasMoreElements(  )
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -69,7 +69,6 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements(  ) throw(css::uno::Runtim
 
 
 css::uno::Any SAL_CALL OEnumerationByName::nextElement(  )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -91,7 +90,6 @@ css::uno::Any SAL_CALL OEnumerationByName::nextElement(  )
 
 
 void SAL_CALL OEnumerationByName::disposing(const css::lang::EventObject& aEvent)
-        throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -150,7 +148,7 @@ OEnumerationByIndex::~OEnumerationByIndex()
 }
 
 
-sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements(  )
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -168,7 +166,6 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements(  ) throw(css::uno::Runti
 
 
 css::uno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -190,7 +187,6 @@ css::uno::Any SAL_CALL OEnumerationByIndex::nextElement(  )
 
 
 void SAL_CALL OEnumerationByIndex::disposing(const css::lang::EventObject& aEvent)
-        throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -246,7 +242,7 @@ OAnyEnumeration::~OAnyEnumeration()
 }
 
 
-sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements(  )
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -255,7 +251,6 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements(  ) throw(css::uno::RuntimeEx
 
 
 css::uno::Any SAL_CALL OAnyEnumeration::nextElement(  )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     if ( ! hasMoreElements())
         throw css::container::NoSuchElementException();
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index 0332cd29f90c..ed10fbb72076 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -38,32 +38,20 @@ namespace comphelper
         explicit NameContainer( css::uno::Type aType );
 
         // XNameContainer
-        virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-            throw(css::lang::IllegalArgumentException, css::container::ElementExistException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByName( const OUString& Name )
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+        virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
         // XNameReplace
-        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-            throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
         // XElementAccess
-        virtual sal_Bool SAL_CALL hasElements(  )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getElementType(  )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
 
     private:
         SvGenericNameContainerMapImpl maProperties;
@@ -86,8 +74,6 @@ NameContainer::NameContainer( css::uno::Type aType )
 
 // XNameContainer
 void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, ElementExistException,
-        WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -101,8 +87,6 @@ void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aEl
 }
 
 void SAL_CALL NameContainer::removeByName( const OUString& Name )
-    throw(NoSuchElementException, WrappedTargetException,
-        RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -116,8 +100,6 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name )
 // XNameReplace
 
 void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, NoSuchElementException,
-        WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -134,8 +116,6 @@ void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aE
 // XNameAccess
 
 Any SAL_CALL NameContainer::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException,
-        RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -147,7 +127,6 @@ Any SAL_CALL NameContainer::getByName( const OUString& aName )
 }
 
 Sequence< OUString > SAL_CALL NameContainer::getElementNames(  )
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -155,7 +134,6 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames(  )
 }
 
 sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -164,7 +142,6 @@ sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName )
 }
 
 sal_Bool SAL_CALL NameContainer::hasElements(  )
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( maMutex );
 
@@ -172,7 +149,6 @@ sal_Bool SAL_CALL NameContainer::hasElements(  )
 }
 
 Type SAL_CALL NameContainer::getElementType()
-    throw( RuntimeException, std::exception )
 {
     return maType;
 }
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 6917380aa7b9..06b23432bbe9 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -98,37 +98,26 @@ public:
                               const Reference< XComponentContext >& rContext );
 
     // Methods of XEventAttacherManager
-    virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL registerScriptEvents(sal_Int32 Index, const Sequence< ScriptEventDescriptor >& ScriptEvents)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL revokeScriptEvent(sal_Int32 Index, const OUString& ListenerType, const OUString& EventMethod, const OUString& removeListenerParam)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL revokeScriptEvents(sal_Int32 Index)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL insertEntry(sal_Int32 Index)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeEntry(sal_Int32 Index)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual Sequence< ScriptEventDescriptor > SAL_CALL getScriptEvents(sal_Int32 Index)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL attach(sal_Int32 Index, const Reference< XInterface >& Object, const Any& Helper)
-        throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL detach(sal_Int32 nIndex, const Reference< XInterface >& xObject)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addScriptListener(const Reference< XScriptListener >& aListener)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeScriptListener(const Reference< XScriptListener >& Listener)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent) override;
+    virtual void SAL_CALL registerScriptEvents(sal_Int32 Index, const Sequence< ScriptEventDescriptor >& ScriptEvents) override;
+    virtual void SAL_CALL revokeScriptEvent(sal_Int32 Index, const OUString& ListenerType, const OUString& EventMethod, const OUString& removeListenerParam) override;
+    virtual void SAL_CALL revokeScriptEvents(sal_Int32 Index) override;
+    virtual void SAL_CALL insertEntry(sal_Int32 Index) override;
+    virtual void SAL_CALL removeEntry(sal_Int32 Index) override;
+    virtual Sequence< ScriptEventDescriptor > SAL_CALL getScriptEvents(sal_Int32 Index) override;
+    virtual void SAL_CALL attach(sal_Int32 Index, const Reference< XInterface >& Object, const Any& Helper) override;
+    virtual void SAL_CALL detach(sal_Int32 nIndex, const Reference< XInterface >& xObject) override;
+    virtual void SAL_CALL addScriptListener(const Reference< XScriptListener >& aListener) override;
+    virtual void SAL_CALL removeScriptListener(const Reference< XScriptListener >& Listener) override;
 
     // Methods of XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL write(const Reference< XObjectOutputStream >& OutStream) throw( IOException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) throw( IOException, RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL write(const Reference< XObjectOutputStream >& OutStream) override;
+    virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) override;
 
 private:
     /// @throws Exception
-    Reference< XIdlReflection > getReflection() throw( Exception );
+    Reference< XIdlReflection > getReflection();
 
     /** checks if <arg>_nIndex</arg> is a valid index, throws an <type>IllegalArgumentException</type> if not
     @param _nIndex
@@ -149,18 +138,17 @@ class AttacherAllListener_Impl : public WeakImplHelper< XAllListener >
     OUString                            aScriptCode;
 
     /// @throws CannotConvertException
-    void convertToEventReturn( Any & rRet, const Type & rRetType )
-        throw( CannotConvertException );
+    void convertToEventReturn( Any & rRet, const Type & rRetType );
 public:
     AttacherAllListener_Impl( ImplEventAttacherManager* pManager_, const OUString &rScriptType_,
                                 const OUString & rScriptCode_ );
 
     // Methods of XAllListener
-    virtual void SAL_CALL firing(const AllEventObject& Event) throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw( InvocationTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL firing(const AllEventObject& Event) override;
+    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) override;
 
     // Methods of XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const EventObject& Source) override;
 };
 
 
@@ -179,7 +167,6 @@ AttacherAllListener_Impl::AttacherAllListener_Impl
 
 // Methods of XAllListener
 void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event)
-    throw( RuntimeException, std::exception )
 {
     ScriptEvent aScriptEvent;
     aScriptEvent.Source         = static_cast<OWeakObject *>(mxManager.get()); // get correct XInterface
@@ -199,7 +186,6 @@ void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event)
 
 // Convert to the standard event return
 void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rRetType )
-    throw( CannotConvertException )
 {
     // no return value? Set to the specified values
     if( rRet.getValueType().getTypeClass() == TypeClass_VOID )
@@ -244,7 +230,6 @@ void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rR
 
 // Methods of XAllListener
 Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Event )
-    throw( InvocationTargetException, RuntimeException, std::exception )
 {
     ScriptEvent aScriptEvent;
     aScriptEvent.Source         = static_cast<OWeakObject *>(mxManager.get()); // get correct XInterface
@@ -340,14 +325,12 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even
 
 // Methods of XEventListener
 void SAL_CALL AttacherAllListener_Impl::disposing(const EventObject& )
-    throw( RuntimeException, std::exception )
 {
     // It is up to the container to release the object
 }
 
 // Constructor method for EventAttacherManager
 Reference< XEventAttacherManager > createEventAttacherManager( const Reference< XComponentContext > & rxContext )
-    throw( Exception )
 {
     Reference< XIntrospection > xIntrospection = theIntrospection::get( rxContext );
     return new ImplEventAttacherManager( xIntrospection, rxContext );
@@ -380,7 +363,7 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect
     }
 }
 
-Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exception )
+Reference< XIdlReflection > ImplEventAttacherManager::getReflection()
 {
     Guard< Mutex > aGuard( aLock );
     // Do we already have a service? If not, create one.
@@ -407,7 +390,6 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvent
     sal_Int32 nIndex,
     const ScriptEventDescriptor& ScriptEvent
 )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
 
@@ -445,7 +427,6 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents
     sal_Int32 nIndex,
     const Sequence< ScriptEventDescriptor >& ScriptEvents
 )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
 
@@ -471,7 +452,6 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
     const OUString& EventMethod,
     const OUString& ToRemoveListenerParam
 )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
 
@@ -506,7 +486,6 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
 
 
 void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
@@ -521,7 +500,6 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex )
 
 
 void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex)
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     if( nIndex < 0 )
@@ -536,7 +514,6 @@ void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex)
 
 
 void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex)
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
@@ -550,7 +527,6 @@ void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex)
 
 
 Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEvents(sal_Int32 nIndex)
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
@@ -559,7 +535,6 @@ Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEv
 
 
 void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any & Helper)
-    throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     if( nIndex < 0 || !xObject.is() )
@@ -621,7 +596,6 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference
 
 
 void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference< XInterface >& xObject)
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     //return;
@@ -659,14 +633,12 @@ void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference
 }
 
 void SAL_CALL ImplEventAttacherManager::addScriptListener(const Reference< XScriptListener >& aListener)
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     aScriptListeners.addInterface( aListener );
 }
 
 void SAL_CALL ImplEventAttacherManager::removeScriptListener(const Reference< XScriptListener >& aListener)
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     aScriptListeners.removeInterface( aListener );
@@ -675,13 +647,11 @@ void SAL_CALL ImplEventAttacherManager::removeScriptListener(const Reference< XS
 
 // Methods of XPersistObject
 OUString SAL_CALL ImplEventAttacherManager::getServiceName()
-    throw( RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.uno.script.EventAttacherManager" );
 }
 
 void SAL_CALL ImplEventAttacherManager::write(const Reference< XObjectOutputStream >& OutStream)
-    throw( IOException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     // Don't run without XMarkableStream
@@ -721,7 +691,6 @@ void SAL_CALL ImplEventAttacherManager::write(const Reference< XObjectOutputStre
 }
 
 void SAL_CALL ImplEventAttacherManager::read(const Reference< XObjectInputStream >& InStream)
-    throw( IOException, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( aLock );
     // Don't run without XMarkableStream
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx
index 15c2c9476b6e..8378304f6520 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -36,7 +36,6 @@ OSelectionChangeListener::~OSelectionChangeListener()
 
 
 void OSelectionChangeListener::_disposing(const EventObject&)
-    throw (RuntimeException, std::exception)
 {
     // nothing to do here
 }
@@ -82,7 +81,7 @@ void OSelectionChangeMultiplexer::unlock()
 
 // XEventListener
 
-void SAL_CALL OSelectionChangeMultiplexer::disposing( const  EventObject& _rSource) throw( RuntimeException, std::exception)
+void SAL_CALL OSelectionChangeMultiplexer::disposing( const  EventObject& _rSource)
 {
     if (m_pListener)
     {
@@ -101,7 +100,7 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const  EventObject& _rSour
 
 // XSelectionChangeListener
 
-void SAL_CALL OSelectionChangeMultiplexer::selectionChanged( const  EventObject& _rEvent ) throw( RuntimeException, std::exception)
+void SAL_CALL OSelectionChangeMultiplexer::selectionChanged( const  EventObject& _rEvent )
 {
     if (m_pListener && !locked())
         m_pListener->_selectionChanged(_rEvent);
diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx
index 4d97b8049984..a5211d6f3af9 100644
--- a/comphelper/source/misc/accessiblecomponenthelper.cxx
+++ b/comphelper/source/misc/accessiblecomponenthelper.cxx
@@ -40,7 +40,7 @@ namespace comphelper
     }
 
 
-    bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) throw (RuntimeException)
+    bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint )
     {
         OExternalLockGuard aGuard( this );
         Rectangle aBounds( implGetBounds() );
@@ -51,7 +51,7 @@ namespace comphelper
     }
 
 
-    Point SAL_CALL OCommonAccessibleComponent::getLocation(  ) throw (RuntimeException)
+    Point SAL_CALL OCommonAccessibleComponent::getLocation(  )
     {
         OExternalLockGuard aGuard( this );
         Rectangle aBounds( implGetBounds() );
@@ -59,7 +59,7 @@ namespace comphelper
     }
 
 
-    Point SAL_CALL OCommonAccessibleComponent::getLocationOnScreen(  ) throw (RuntimeException)
+    Point SAL_CALL OCommonAccessibleComponent::getLocationOnScreen(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -79,7 +79,7 @@ namespace comphelper
     }
 
 
-    Size SAL_CALL OCommonAccessibleComponent::getSize(  ) throw (RuntimeException)
+    Size SAL_CALL OCommonAccessibleComponent::getSize(  )
     {
         OExternalLockGuard aGuard( this );
         Rectangle aBounds( implGetBounds() );
@@ -87,7 +87,7 @@ namespace comphelper
     }
 
 
-    Rectangle SAL_CALL OCommonAccessibleComponent::getBounds(  ) throw (RuntimeException)
+    Rectangle SAL_CALL OCommonAccessibleComponent::getBounds(  )
     {
         OExternalLockGuard aGuard( this );
         return implGetBounds();
@@ -104,31 +104,31 @@ namespace comphelper
         // (order matters: the first is the class name, the second is the class doing the ref counting)
 
 
-    sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint( const Point& _rPoint )
     {
         return OCommonAccessibleComponent::containsPoint( _rPoint );
     }
 
 
-    Point SAL_CALL OAccessibleComponentHelper::getLocation(  ) throw (RuntimeException, std::exception)
+    Point SAL_CALL OAccessibleComponentHelper::getLocation(  )
     {
         return OCommonAccessibleComponent::getLocation( );
     }
 
 
-    Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen(  ) throw (RuntimeException, std::exception)
+    Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen(  )
     {
         return OCommonAccessibleComponent::getLocationOnScreen( );
     }
 
 
-    Size SAL_CALL OAccessibleComponentHelper::getSize(  ) throw (RuntimeException, std::exception)
+    Size SAL_CALL OAccessibleComponentHelper::getSize(  )
     {
         return OCommonAccessibleComponent::getSize( );
     }
 
 
-    Rectangle SAL_CALL OAccessibleComponentHelper::getBounds(  ) throw (RuntimeException, std::exception)
+    Rectangle SAL_CALL OAccessibleComponentHelper::getBounds(  )
     {
         return OCommonAccessibleComponent::getBounds( );
     }
@@ -144,31 +144,31 @@ namespace comphelper
         // (order matters: the first is the class name, the second is the class doing the ref counting)
 
 
-    sal_Bool SAL_CALL OAccessibleExtendedComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OAccessibleExtendedComponentHelper::containsPoint( const Point& _rPoint )
     {
         return OCommonAccessibleComponent::containsPoint( _rPoint );
     }
 
 
-    Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation(  ) throw (RuntimeException, std::exception)
+    Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation(  )
     {
         return OCommonAccessibleComponent::getLocation( );
     }
 
 
-    Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen(  ) throw (RuntimeException, std::exception)
+    Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen(  )
     {
         return OCommonAccessibleComponent::getLocationOnScreen( );
     }
 
 
-    Size SAL_CALL OAccessibleExtendedComponentHelper::getSize(  ) throw (RuntimeException, std::exception)
+    Size SAL_CALL OAccessibleExtendedComponentHelper::getSize(  )
     {
         return OCommonAccessibleComponent::getSize( );
     }
 
 
-    Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds(  ) throw (RuntimeException, std::exception)
+    Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds(  )
     {
         return OCommonAccessibleComponent::getBounds( );
     }
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index bbc4102c10a8..0fa19a2ef05c 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -119,7 +119,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener )
     {
         OMutexGuard aGuard( getExternalLock() );
             // don't use the OContextEntryGuard - it will throw an exception if we're not alive
@@ -142,7 +142,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener )
     {
         OMutexGuard aGuard( getExternalLock() );
             // don't use the OContextEntryGuard - it will throw an exception if we're not alive
@@ -223,7 +223,7 @@ namespace comphelper
     }
 
 
-    sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent(  )
     {
         OExternalLockGuard aGuard( this );
 
@@ -269,7 +269,7 @@ namespace comphelper
     }
 
 
-    Locale SAL_CALL OAccessibleContextHelper::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+    Locale SAL_CALL OAccessibleContextHelper::getLocale(  )
     {
         // simply ask the parent
         Reference< XAccessible > xParent = getAccessibleParent();
diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx
index 72fae780e79f..72ce3b74657c 100644
--- a/comphelper/source/misc/accessiblekeybindinghelper.cxx
+++ b/comphelper/source/misc/accessiblekeybindinghelper.cxx
@@ -50,7 +50,7 @@ namespace comphelper
     }
 
 
-    void OAccessibleKeyBindingHelper::AddKeyBinding( const Sequence< awt::KeyStroke >& rKeyBinding ) throw (RuntimeException)
+    void OAccessibleKeyBindingHelper::AddKeyBinding( const Sequence< awt::KeyStroke >& rKeyBinding )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -58,7 +58,7 @@ namespace comphelper
     }
 
 
-    void OAccessibleKeyBindingHelper::AddKeyBinding( const awt::KeyStroke& rKeyStroke ) throw (RuntimeException)
+    void OAccessibleKeyBindingHelper::AddKeyBinding( const awt::KeyStroke& rKeyStroke )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -71,7 +71,7 @@ namespace comphelper
     // XAccessibleKeyBinding
 
 
-    sal_Int32 OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount() throw (RuntimeException, std::exception)
+    sal_Int32 OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -79,7 +79,7 @@ namespace comphelper
     }
 
 
-    Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx
index 5daa1c2264d1..fe5f47b97482 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -36,31 +36,31 @@ namespace comphelper
     OCommonAccessibleSelection::~OCommonAccessibleSelection() {}
 
 
-    void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex )
     {
         implSelect( nChildIndex, true );
     }
 
 
-    bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex )
     {
         return implIsSelected( nChildIndex );
     }
 
 
-    void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection(  ) throw (RuntimeException)
+    void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection(  )
     {
         implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, false );
     }
 
 
-    void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren(  ) throw (RuntimeException)
+    void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren(  )
     {
         implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, true );
     }
 
 
-    sal_Int32 SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+    sal_Int32 SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChildCount(  )
     {
         sal_Int32                       nRet = 0;
         Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() );
@@ -78,7 +78,7 @@ namespace comphelper
     }
 
 
-    Reference< XAccessible > SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    Reference< XAccessible > SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         Reference< XAccessible >        xRet;
         Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() );
@@ -96,7 +96,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         implSelect( nSelectedChildIndex, false );
     }
@@ -111,55 +111,55 @@ namespace comphelper
     // (order matters: the first is the class name, the second is the class doing the ref counting)
 
 
-    Reference< XAccessibleContext > OAccessibleSelectionHelper::implGetAccessibleContext() throw ( RuntimeException )
+    Reference< XAccessibleContext > OAccessibleSelectionHelper::implGetAccessibleContext()
     {
         return this;
     }
 
 
-    void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex )
     {
         OExternalLockGuard aGuard( this );
         OCommonAccessibleSelection::selectAccessibleChild( nChildIndex );
     }
 
 
-    sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex )
     {
         OExternalLockGuard aGuard( this );
         return OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex );
     }
 
 
-    void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection(  )
     {
         OExternalLockGuard aGuard( this );
         OCommonAccessibleSelection::clearAccessibleSelection();
     }
 
 
-    void SAL_CALL OAccessibleSelectionHelper::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAccessibleSelectionHelper::selectAllAccessibleChildren(  )
     {
         OExternalLockGuard aGuard( this );
         OCommonAccessibleSelection::selectAllAccessibleChildren();
     }
 
 
-    sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount(  )
     {
         OExternalLockGuard aGuard( this );
         return OCommonAccessibleSelection::getSelectedAccessibleChildCount();
     }
 
 
-    Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         OExternalLockGuard aGuard( this );
         return OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex );
     }
 
 
-    void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         OExternalLockGuard aGuard( this );
         OCommonAccessibleSelection::deselectAccessibleChild( nSelectedChildIndex );
diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx
index 29ca9c6f8e38..2bb088dc2595 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.cxx
@@ -222,7 +222,7 @@ namespace comphelper
     }
 
 
-    sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex )
     {
         OUString sText( implGetText() );
 
@@ -233,13 +233,13 @@ namespace comphelper
     }
 
 
-    sal_Int32 OCommonAccessibleText::getCharacterCount() throw (RuntimeException)
+    sal_Int32 OCommonAccessibleText::getCharacterCount()
     {
         return implGetText().getLength();
     }
 
 
-    OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException)
+    OUString OCommonAccessibleText::getSelectedText()
     {
         OUString sText;
         sal_Int32 nStartIndex;
@@ -259,7 +259,7 @@ namespace comphelper
     }
 
 
-    sal_Int32 OCommonAccessibleText::getSelectionStart() throw (RuntimeException)
+    sal_Int32 OCommonAccessibleText::getSelectionStart()
     {
         sal_Int32 nStartIndex;
         sal_Int32 nEndIndex;
@@ -270,7 +270,7 @@ namespace comphelper
     }
 
 
-    sal_Int32 OCommonAccessibleText::getSelectionEnd() throw (RuntimeException)
+    sal_Int32 OCommonAccessibleText::getSelectionEnd()
     {
         sal_Int32 nStartIndex;
         sal_Int32 nEndIndex;
@@ -281,13 +281,13 @@ namespace comphelper
     }
 
 
-    OUString OCommonAccessibleText::getText() throw (RuntimeException)
+    OUString OCommonAccessibleText::getText()
     {
         return implGetText();
     }
 
 
-    OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         OUString sText( implGetText() );
 
@@ -301,7 +301,7 @@ namespace comphelper
     }
 
 
-    TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
+    TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         OUString sText( implGetText() );
         sal_Int32 nLength = sText.getLength();
@@ -405,7 +405,7 @@ namespace comphelper
     }
 
 
-    TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
+    TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         OUString sText( implGetText() );
         sal_Int32 nLength = sText.getLength();
@@ -529,7 +529,7 @@ namespace comphelper
     }
 
 
-    TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
+    TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         OUString sText( implGetText() );
         sal_Int32 nLength = sText.getLength();
@@ -772,7 +772,7 @@ namespace comphelper
     // XAccessibleText
 
 
-    sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex )
     {
         OExternalLockGuard aGuard( this );
 
@@ -780,7 +780,7 @@ namespace comphelper
     }
 
 
-    sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException, std::exception)
+    sal_Int32 OAccessibleTextHelper::getCharacterCount()
     {
         OExternalLockGuard aGuard( this );
 
@@ -788,7 +788,7 @@ namespace comphelper
     }
 
 
-    OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException, std::exception)
+    OUString OAccessibleTextHelper::getSelectedText()
     {
         OExternalLockGuard aGuard( this );
 
@@ -796,7 +796,7 @@ namespace comphelper
     }
 
 
-    sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException, std::exception)
+    sal_Int32 OAccessibleTextHelper::getSelectionStart()
     {
         OExternalLockGuard aGuard( this );
 
@@ -804,7 +804,7 @@ namespace comphelper
     }
 
 
-    sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException, std::exception)
+    sal_Int32 OAccessibleTextHelper::getSelectionEnd()
     {
         OExternalLockGuard aGuard( this );
 
@@ -812,7 +812,7 @@ namespace comphelper
     }
 
 
-    OUString OAccessibleTextHelper::getText() throw (RuntimeException, std::exception)
+    OUString OAccessibleTextHelper::getText()
     {
         OExternalLockGuard aGuard( this );
 
@@ -820,7 +820,7 @@ namespace comphelper
     }
 
 
-    OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         OExternalLockGuard aGuard( this );
 
@@ -828,7 +828,7 @@ namespace comphelper
     }
 
 
-    TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception)
+    TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         OExternalLockGuard aGuard( this );
 
@@ -836,7 +836,7 @@ namespace comphelper
     }
 
 
-    TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception)
+    TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         OExternalLockGuard aGuard( this );
 
@@ -844,7 +844,7 @@ namespace comphelper
     }
 
 
-    TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception)
+    TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         OExternalLockGuard aGuard( this );
 
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index 41fb4f540fed..a28fea7b7f11 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -235,7 +235,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OWrappedAccessibleChildrenManager::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OWrappedAccessibleChildrenManager::disposing( const EventObject& _rSource )
     {
         // this should come from one of the inner XAccessible's of our children
         Reference< XAccessible > xSource( _rSource.Source, UNO_QUERY );
@@ -295,7 +295,7 @@ namespace comphelper
     IMPLEMENT_FORWARD_REFCOUNT( OAccessibleWrapper, OComponentProxyAggregation )
 
 
-    Any OAccessibleWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+    Any OAccessibleWrapper::queryInterface( const Type& _rType )
     {
         // #111089# instead of the inner XAccessible the proxy XAccessible must be returned
         Any aReturn = OAccessibleWrapper_Base::queryInterface( _rType );
@@ -318,7 +318,7 @@ namespace comphelper
     }
 
 
-    Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext(  )
     {
         // see if the context is still alive (we cache it)
         Reference< XAccessibleContext > xContext = m_aContext;
@@ -383,7 +383,7 @@ namespace comphelper
     }
 
 
-    Any SAL_CALL OAccessibleContextWrapperHelper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+    Any SAL_CALL OAccessibleContextWrapperHelper::queryInterface( const Type& _rType )
     {
         Any aReturn = OComponentProxyAggregationHelper::queryInterface( _rType );
         if ( !aReturn.hasValue() )
@@ -395,13 +395,13 @@ namespace comphelper
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleContextWrapperHelper, OComponentProxyAggregationHelper, OAccessibleContextWrapperHelper_Base )
 
 
-    sal_Int32 OAccessibleContextWrapperHelper::baseGetAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 OAccessibleContextWrapperHelper::baseGetAccessibleChildCount(  )
     {
         return m_xInnerContext->getAccessibleChildCount();
     }
 
 
-    Reference< XAccessible > OAccessibleContextWrapperHelper::baseGetAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > OAccessibleContextWrapperHelper::baseGetAccessibleChild( sal_Int32 i )
     {
         // get the child of the wrapped component
         Reference< XAccessible > xInnerChild = m_xInnerContext->getAccessibleChild( i );
@@ -409,7 +409,7 @@ namespace comphelper
     }
 
 
-    Reference< XAccessibleRelationSet > OAccessibleContextWrapperHelper::baseGetAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > OAccessibleContextWrapperHelper::baseGetAccessibleRelationSet(  )
     {
         return m_xInnerContext->getAccessibleRelationSet();
             // TODO: if this relation set would contain relations to siblings, we would normally need
@@ -417,7 +417,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OAccessibleContextWrapperHelper::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAccessibleContextWrapperHelper::notifyEvent( const AccessibleEventObject& _rEvent )
     {
 #if OSL_DEBUG_LEVEL > 0
         if ( AccessibleEventId::STATE_CHANGED == _rEvent.EventId )
@@ -455,7 +455,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OAccessibleContextWrapperHelper::dispose() throw( RuntimeException, std::exception )
+    void SAL_CALL OAccessibleContextWrapperHelper::dispose()
     {
         ::osl::MutexGuard aGuard( m_rBHelper.rMutex );
 
@@ -473,7 +473,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OAccessibleContextWrapperHelper::disposing( const EventObject& _rEvent )  throw (RuntimeException, std::exception)
+    void SAL_CALL OAccessibleContextWrapperHelper::disposing( const EventObject& _rEvent )
     {
         // simply disambiguate this
         OComponentProxyAggregationHelper::disposing( _rEvent );
@@ -501,74 +501,74 @@ namespace comphelper
     }
 
 
-    sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount(  )
     {
         return baseGetAccessibleChildCount();
     }
 
 
-    Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i )
     {
         return baseGetAccessibleChild( i );
     }
 
 
-    Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleParent(  )
     {
         return m_xParentAccessible;
     }
 
 
-    sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent(  )
     {
         return m_xInnerContext->getAccessibleIndexInParent();
     }
 
 
-    sal_Int16 SAL_CALL OAccessibleContextWrapper::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL OAccessibleContextWrapper::getAccessibleRole(  )
     {
         return m_xInnerContext->getAccessibleRole();
     }
 
 
-    OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription(  )
     {
         return m_xInnerContext->getAccessibleDescription();
     }
 
 
-    OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName(  )
     {
         return m_xInnerContext->getAccessibleName();
     }
 
 
-    Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet(  )
     {
         return baseGetAccessibleRelationSet();
     }
 
 
-    Reference< XAccessibleStateSet > SAL_CALL OAccessibleContextWrapper::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleStateSet > SAL_CALL OAccessibleContextWrapper::getAccessibleStateSet(  )
     {
         return m_xInnerContext->getAccessibleStateSet();
     }
 
 
-    Locale SAL_CALL OAccessibleContextWrapper::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+    Locale SAL_CALL OAccessibleContextWrapper::getLocale(  )
     {
         return m_xInnerContext->getLocale();
     }
 
 
-    void OAccessibleContextWrapper::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException)
+    void OAccessibleContextWrapper::notifyTranslatedEvent( const AccessibleEventObject& _rEvent )
     {
         if ( m_nNotifierClient )
             AccessibleEventNotifier::addEvent( m_nNotifierClient, _rEvent );
     }
 
 
-    void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_nNotifierClient )
@@ -577,7 +577,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_nNotifierClient )
@@ -592,7 +592,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OAccessibleContextWrapper::disposing()  throw (RuntimeException)
+    void SAL_CALL OAccessibleContextWrapper::disposing()
     {
         AccessibleEventNotifier::TClientId nClientId( 0 );
 
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index 1c4096f38e08..1a546598d827 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -74,7 +74,7 @@ namespace comphelper
     }
 
 
-    sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw (RuntimeException, std::exception)
+    sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier )
     {
         sal_Int64 nReturn( 0 );
 
diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx
index 5d14d6772591..6847f2f7cc00 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -238,14 +238,12 @@ void comphelper::ConfigurationListener::dispose()
 }
 
 void SAL_CALL comphelper::ConfigurationListener::disposing(css::lang::EventObject const &)
-    throw (css::uno::RuntimeException, std::exception)
 {
     dispose();
 }
 
 void SAL_CALL comphelper::ConfigurationListener::propertyChange(
     css::beans::PropertyChangeEvent const &rEvt )
-    throw (css::uno::RuntimeException, std::exception)
 {
     // Code is commonly used inside the SolarMutexGuard
     // so to avoid concurrent writes to the property,
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index 3ebcde4e82f7..105956c1692d 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -46,7 +46,7 @@ namespace comphelper {
 class AbortContinuation : public ::cppu::WeakImplHelper< XInteractionAbort >
 {
 public:
-    virtual void SAL_CALL select() throw( RuntimeException, std::exception ) override {}
+    virtual void SAL_CALL select() override {}
 };
 
 
@@ -57,16 +57,16 @@ public:
 
     inline bool     isSelected() const { return mbSelected; }
 
-    virtual void SAL_CALL select() throw( RuntimeException, std::exception ) override { mbSelected = true; }
+    virtual void SAL_CALL select() override { mbSelected = true; }
 
-    virtual void SAL_CALL setPassword( const OUString& rPass ) throw( RuntimeException, std::exception ) override { maPassword = rPass; }
-    virtual OUString SAL_CALL getPassword() throw( RuntimeException, std::exception ) override { return maPassword; }
+    virtual void SAL_CALL setPassword( const OUString& rPass ) override { maPassword = rPass; }
+    virtual OUString SAL_CALL getPassword() override { return maPassword; }
 
-    virtual void SAL_CALL setPasswordToModify( const OUString& rPass ) throw( RuntimeException, std::exception ) override { maModifyPassword = rPass; }
-    virtual OUString SAL_CALL getPasswordToModify() throw( RuntimeException, std::exception ) override { return maModifyPassword; }
+    virtual void SAL_CALL setPasswordToModify( const OUString& rPass ) override { maModifyPassword = rPass; }
+    virtual OUString SAL_CALL getPasswordToModify() override { return maModifyPassword; }
 
-    virtual void SAL_CALL setRecommendReadOnly( sal_Bool bReadOnly ) throw( RuntimeException, std::exception ) override { mbReadOnly = bReadOnly; }
-    virtual sal_Bool SAL_CALL getRecommendReadOnly() throw( RuntimeException, std::exception ) override { return mbReadOnly; }
+    virtual void SAL_CALL setRecommendReadOnly( sal_Bool bReadOnly ) override { mbReadOnly = bReadOnly; }
+    virtual sal_Bool SAL_CALL getRecommendReadOnly() override { return mbReadOnly; }
 
 private:
     OUString            maPassword;
@@ -100,12 +100,12 @@ OUString SimplePasswordRequest::getPassword() const
     return mxPassword->getPassword();
 }
 
-Any SAL_CALL SimplePasswordRequest::getRequest() throw( RuntimeException, std::exception )
+Any SAL_CALL SimplePasswordRequest::getRequest()
 {
     return maRequest;
 }
 
-Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest::getContinuations() throw( RuntimeException, std::exception )
+Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest::getContinuations()
 {
     return { mxAbort.get(), mxPassword.get() };
 }
@@ -162,12 +162,12 @@ bool DocPasswordRequest::getRecommendReadOnly() const
     return mxPassword->getRecommendReadOnly();
 }
 
-Any SAL_CALL DocPasswordRequest::getRequest() throw( RuntimeException, std::exception )
+Any SAL_CALL DocPasswordRequest::getRequest()
 {
     return maRequest;
 }
 
-Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations() throw( RuntimeException, std::exception )
+Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations()
 {
     return { mxAbort.get(), mxPassword.get() };
 }
diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx
index 424f86c093df..e90cd95f0cf8 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.cxx
@@ -47,7 +47,7 @@ OSimpleLogRing::~OSimpleLogRing()
 
 // XSimpleLogRing
 
-void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -63,7 +63,7 @@ void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::
 }
 
 
-uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -82,7 +82,7 @@ uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno:
 
 // XInitialization
 
-void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bInitialized )
@@ -107,17 +107,17 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
 }
 
 // XServiceInfo
-OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OSimpleLogRing::getImplementationName()
 {
     return OUString("com.sun.star.comp.logging.SimpleLogRing");
 }
 
-sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName )
 {
     return cppu::supportsService(this, aServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames()
 {
     return { "com.sun.star.logging.SimpleLogRing" };
 }
diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx
index 9a7c7a957094..b4cffa8b85cf 100644
--- a/comphelper/source/misc/documentiologring.hxx
+++ b/comphelper/source/misc/documentiologring.hxx
@@ -49,16 +49,16 @@ public:
     virtual ~OSimpleLogRing() override;
 
 // XSimpleLogRing
-    virtual void SAL_CALL logString( const OUString& aMessage ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL logString( const OUString& aMessage ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getCollectedLog() override;
 
 // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 };
 
diff --git a/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx
index 0307e4c48283..2eac315808f0 100644
--- a/comphelper/source/misc/evtlistenerhlp.cxx
+++ b/comphelper/source/misc/evtlistenerhlp.cxx
@@ -25,7 +25,7 @@ namespace comphelper
             _rxListener) : m_xListener(_rxListener)
     {
     }
-    void SAL_CALL OEventListenerHelper::disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception)
+    void SAL_CALL OEventListenerHelper::disposing( const css::lang::EventObject& Source )
     {
         css::uno::Reference< css::lang::XEventListener> xRef = m_xListener;
         if(xRef.is())
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index e6a39e876c93..97671aca372c 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -67,7 +67,6 @@ OInstanceLocker::~OInstanceLocker()
 // XComponent
 
 void SAL_CALL OInstanceLocker::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -89,7 +88,6 @@ void SAL_CALL OInstanceLocker::dispose()
 
 
 void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -103,7 +101,6 @@ void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEv
 
 
 void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pListenersContainer )
@@ -113,7 +110,6 @@ void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang::
 // XInitialization
 
 void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArguments )
-    throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bInitialized )
@@ -181,19 +177,16 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg
 
 // XServiceInfo
 OUString SAL_CALL OInstanceLocker::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.embed.InstanceLocker" );
 }
 
 sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     const OUString aServiceName( "com.sun.star.embed.InstanceLocker" );
     return uno::Sequence< OUString >( &aServiceName, 1 );
@@ -262,7 +255,6 @@ void OLockListener::Dispose()
 // XEventListener
 
 void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
 
@@ -287,7 +279,6 @@ void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent )
 // XCloseListener
 
 void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_Bool )
-    throw (util::CloseVetoException, uno::RuntimeException, std::exception)
 {
     // GetsOwnership parameter is always ignored, the user of the service must close the object always
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
@@ -317,7 +308,6 @@ void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_
 
 
 void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
 
@@ -348,7 +338,6 @@ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent )
 // XTerminateListener
 
 void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent )
-    throw (frame::TerminationVetoException, uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
     if ( aEvent.Source == m_xInstance && ( m_nMode & embed::Actions::PREVENT_TERMINATION ) )
@@ -377,7 +366,6 @@ void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent )
 
 
 void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
 
diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx
index df6c39cedd7a..cb6d229fc2dd 100644
--- a/comphelper/source/misc/instancelocker.hxx
+++ b/comphelper/source/misc/instancelocker.hxx
@@ -57,17 +57,17 @@ public:
     virtual ~OInstanceLocker() override;
 
 // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 };
 
@@ -98,15 +98,15 @@ public:
     void Dispose();
 
 // 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;
 
 // XCloseListener
-    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) override;
 
 // XTerminateListener
-    virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override;
 
 };
 
diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx
index 62f5bd2b84a5..8f07dafb638f 100644
--- a/comphelper/source/misc/interaction.cxx
+++ b/comphelper/source/misc/interaction.cxx
@@ -28,13 +28,13 @@ namespace comphelper
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::task;
 
-    void SAL_CALL OInteractionPassword::setPassword( const OUString& Password ) throw (RuntimeException, std::exception)
+    void SAL_CALL OInteractionPassword::setPassword( const OUString& Password )
     {
         m_sPassword = Password;
     }
 
 
-    OUString SAL_CALL OInteractionPassword::getPassword(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OInteractionPassword::getPassword(  )
     {
         return m_sPassword;
     }
@@ -61,13 +61,13 @@ namespace comphelper
     }
 
 
-    Any SAL_CALL OInteractionRequest::getRequest(  ) throw(RuntimeException, std::exception)
+    Any SAL_CALL OInteractionRequest::getRequest(  )
     {
         return m_aRequest;
     }
 
 
-    Sequence< Reference< XInteractionContinuation > > SAL_CALL OInteractionRequest::getContinuations(  ) throw(RuntimeException, std::exception)
+    Sequence< Reference< XInteractionContinuation > > SAL_CALL OInteractionRequest::getContinuations(  )
     {
         return comphelper::containerToSequence(m_aContinuations);
     }
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index d0d86d751696..1faf639b16fb 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -63,8 +63,6 @@ void NumberedCollection::setUntitledPrefix(const OUString& sPrefix)
 
 
 ::sal_Int32 SAL_CALL NumberedCollection::leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent)
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException, std::exception         )
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -100,8 +98,6 @@ void NumberedCollection::setUntitledPrefix(const OUString& sPrefix)
 
 
 void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber)
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException, std::exception         )
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -139,8 +135,6 @@ void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber)
 
 
 void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent)
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException, std::exception         )
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -163,7 +157,6 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe
 
 
 OUString SAL_CALL NumberedCollection::getUntitledPrefix()
-    throw (css::uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index a8895285a0fb..37b1d0d02882 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -35,7 +35,6 @@ namespace comphelper
 // XRestartManager
 
 void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task::XInteractionHandler >& /* xInteractionHandler */ )
-    throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     if ( !m_xContext.is() )
         throw uno::RuntimeException();
@@ -77,7 +76,6 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task:
 
 
 sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( sal_Bool bOfficeInitialized )
-    throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -90,7 +88,6 @@ sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( sal_Bool bOfficeIni
 // XCallback
 
 void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
-    throw ( uno::RuntimeException, std::exception )
 {
     try
     {
@@ -132,17 +129,17 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
 
 // XServiceInfo
 
-OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OOfficeRestartManager::getImplementationName()
 {
     return OUString("com.sun.star.comp.task.OfficeRestartManager");
 }
 
-sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName )
 {
     return cppu::supportsService(this, aServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames()
 {
     return { "com.sun.star.comp.task.OfficeRestartManager" };
 }
diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx
index 02a65efd5f61..cfada99c858a 100644
--- a/comphelper/source/misc/officerestartmanager.hxx
+++ b/comphelper/source/misc/officerestartmanager.hxx
@@ -49,16 +49,16 @@ public:
     {}
 
 // XRestartManager
-    virtual void SAL_CALL requestRestart( const css::uno::Reference< css::task::XInteractionHandler >& xInteractionHandler ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isRestartRequested( sal_Bool bInitialized ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL requestRestart( const css::uno::Reference< css::task::XInteractionHandler >& xInteractionHandler ) override;
+    virtual sal_Bool SAL_CALL isRestartRequested( sal_Bool bInitialized ) override;
 
 // XCallback
-    virtual void SAL_CALL notify( const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notify( const css::uno::Any& aData ) override;
 
 // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 };
 
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx
index 1f2181f6c13c..764dc92d91f1 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.cxx
@@ -65,13 +65,13 @@ namespace comphelper
     }
 
 
-    Any SAL_CALL OProxyAggregation::queryAggregation( const Type& _rType ) throw (RuntimeException)
+    Any SAL_CALL OProxyAggregation::queryAggregation( const Type& _rType )
     {
         return m_xProxyAggregate.is() ? m_xProxyAggregate->queryAggregation( _rType ) : Any();
     }
 
 
-    Sequence< Type > SAL_CALL OProxyAggregation::getTypes(  ) throw (RuntimeException)
+    Sequence< Type > SAL_CALL OProxyAggregation::getTypes(  )
     {
         Sequence< Type > aTypes;
         if ( m_xProxyAggregate.is() )
@@ -122,7 +122,7 @@ namespace comphelper
     }
 
 
-    Any SAL_CALL OComponentProxyAggregationHelper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+    Any SAL_CALL OComponentProxyAggregationHelper::queryInterface( const Type& _rType )
     {
         Any aReturn( BASE::queryInterface( _rType ) );
         if ( !aReturn.hasValue() )
@@ -149,7 +149,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource )
     {
         if ( _rSource.Source == m_xInner )
         {   // it's our inner context which is dying -> dispose ourself
@@ -161,7 +161,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OComponentProxyAggregationHelper::dispose() throw( RuntimeException, std::exception )
+    void SAL_CALL OComponentProxyAggregationHelper::dispose()
     {
         ::osl::MutexGuard aGuard( m_rBHelper.rMutex );
 
@@ -204,7 +204,7 @@ namespace comphelper
     IMPLEMENT_GET_IMPLEMENTATION_ID( OComponentProxyAggregation )
 
 
-    Sequence< Type > SAL_CALL OComponentProxyAggregation::getTypes(  ) throw (RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL OComponentProxyAggregation::getTypes(  )
     {
         Sequence< Type > aTypes( OComponentProxyAggregationHelper::getTypes() );
 
@@ -217,7 +217,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource )
     {
         // Simply disambiguate---this is necessary for MSVC to distinguish
         // "disposing(EventObject)" from "disposing()"; but it is also a good
@@ -228,14 +228,14 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OComponentProxyAggregation::disposing()  throw (RuntimeException)
+    void SAL_CALL OComponentProxyAggregation::disposing()
     {
         // call the dispose-functionality of the base, which will dispose our aggregated component
         OComponentProxyAggregationHelper::dispose();
     }
 
 
-    void SAL_CALL OComponentProxyAggregation::dispose() throw( RuntimeException, std::exception )
+    void SAL_CALL OComponentProxyAggregation::dispose()
     {
         // simply disambiguate
         WeakComponentImplHelperBase::dispose();
diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx
index 906df93f12f9..6cdf7b41bf94 100644
--- a/comphelper/source/misc/servicedecl.cxx
+++ b/comphelper/source/misc/servicedecl.cxx
@@ -47,21 +47,16 @@ public:
     const Factory& operator=(const Factory&) = delete;
 
     // XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const& name )
-        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( OUString const& name ) override;
+    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
     // XSingleComponentFactory:
     virtual uno::Reference<uno::XInterface> SAL_CALL createInstanceWithContext(
-        uno::Reference<uno::XComponentContext> const& xContext )
-        throw (uno::Exception, std::exception) override;
+        uno::Reference<uno::XComponentContext> const& xContext ) override;
     virtual uno::Reference<uno::XInterface> SAL_CALL
     createInstanceWithArgumentsAndContext(
     uno::Sequence<uno::Any> const& args,
-    uno::Reference<uno::XComponentContext> const& xContext )
-        throw (uno::Exception, std::exception) override;
+    uno::Reference<uno::XComponentContext> const& xContext ) override;
 
 private:
     virtual ~Factory() override;
@@ -75,19 +70,16 @@ ServiceDecl::Factory::~Factory()
 
 // XServiceInfo:
 OUString ServiceDecl::Factory::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_rServiceDecl.getImplementationName();
 }
 
 sal_Bool ServiceDecl::Factory::supportsService( OUString const& name )
-    throw (uno::RuntimeException, std::exception)
 {
     return m_rServiceDecl.supportsService(name);
 }
 
 uno::Sequence<OUString> ServiceDecl::Factory::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_rServiceDecl.getSupportedServiceNames();
 }
@@ -95,7 +87,6 @@ uno::Sequence<OUString> ServiceDecl::Factory::getSupportedServiceNames()
 // XSingleComponentFactory:
 uno::Reference<uno::XInterface> ServiceDecl::Factory::createInstanceWithContext(
     uno::Reference<uno::XComponentContext> const& xContext )
-    throw (uno::Exception, std::exception)
 {
     return m_rServiceDecl.m_createFunc(
         m_rServiceDecl, uno::Sequence<uno::Any>(), xContext );
@@ -105,7 +96,6 @@ uno::Reference<uno::XInterface>
 ServiceDecl::Factory::createInstanceWithArgumentsAndContext(
     uno::Sequence<uno::Any > const& args,
     uno::Reference<uno::XComponentContext> const& xContext )
-    throw (uno::Exception, std::exception)
 {
     return m_rServiceDecl.m_createFunc(
         m_rServiceDecl, args, xContext );
diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx
index 838f4fec11eb..87f4c343c3f9 100644
--- a/comphelper/source/misc/serviceinfohelper.cxx
+++ b/comphelper/source/misc/serviceinfohelper.cxx
@@ -26,13 +26,13 @@ namespace comphelper
 {
 
 /** returns an empty UString(). most times sufficient */
-OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL ServiceInfoHelper::getImplementationName()
 {
     return OUString();
 }
 
 /** the base implementation has no supported services */
-css::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames()
 {
     css::uno::Sequence< OUString> aSeq(0);
     return aSeq;
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 394a0aab578f..b5fea9884aa4 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -53,7 +53,6 @@ namespace comphelper {
 
 uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory(
                             const uno::Reference< uno::XComponentContext >& rxContext )
-        throw ( uno::Exception )
 {
     uno::Reference< uno::XComponentContext> xContext = rxContext.is() ? rxContext : ::comphelper::getProcessComponentContext();
 
@@ -63,7 +62,6 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory(
 
 uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStorageFactory(
                             const uno::Reference< uno::XComponentContext >& rxContext )
-        throw ( uno::Exception )
 {
     uno::Reference< uno::XComponentContext> xContext = rxContext.is() ? rxContext : ::comphelper::getProcessComponentContext();
 
@@ -73,7 +71,6 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStora
 
 uno::Reference< embed::XStorage > OStorageHelper::GetTemporaryStorage(
             const uno::Reference< uno::XComponentContext >& rxContext )
-    throw ( uno::Exception )
 {
     uno::Reference< embed::XStorage > xTempStorage( GetStorageFactory( rxContext )->createInstance(),
                                                     uno::UNO_QUERY );
@@ -88,7 +85,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL(
             const OUString& aURL,
             sal_Int32 nStorageMode,
             const uno::Reference< uno::XComponentContext >& rxContext )
-    throw ( uno::Exception )
 {
     uno::Sequence< uno::Any > aArgs( 2 );
     aArgs[0] <<= aURL;
@@ -107,7 +103,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2(
             const OUString& aURL,
             sal_Int32 nStorageMode,
             const uno::Reference< uno::XComponentContext >& rxContext )
-    throw ( uno::Exception )
 {
     uno::Sequence< uno::Any > aArgs( 2 );
     aArgs[0] <<= aURL;
@@ -139,7 +134,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2(
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromInputStream(
             const uno::Reference < io::XInputStream >& xStream,
             const uno::Reference< uno::XComponentContext >& rxContext )
-        throw ( uno::Exception )
 {
     uno::Sequence< uno::Any > aArgs( 2 );
     aArgs[0] <<= xStream;
@@ -158,7 +152,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromStream(
             const uno::Reference < io::XStream >& xStream,
             sal_Int32 nStorageMode,
             const uno::Reference< uno::XComponentContext >& rxContext )
-        throw ( uno::Exception )
 {
     uno::Sequence< uno::Any > aArgs( 2 );
     aArgs[0] <<= xStream;
@@ -176,7 +169,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromStream(
 void OStorageHelper::CopyInputToOutput(
             const uno::Reference< io::XInputStream >& xInput,
             const uno::Reference< io::XOutputStream >& xOutput )
-    throw ( uno::Exception )
 {
     static const sal_Int32 nConstBufferSize = 32000;
 
@@ -201,7 +193,6 @@ void OStorageHelper::CopyInputToOutput(
 uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
             const OUString& aURL,
             const uno::Reference< uno::XComponentContext >& context )
-    throw ( uno::Exception )
 {
     uno::Reference< io::XInputStream > xInputStream = ucb::SimpleFileAccess::create(context)->openFileRead( aURL );
     if ( !xInputStream.is() )
@@ -214,7 +205,6 @@ uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
 void OStorageHelper::SetCommonStorageEncryptionData(
             const uno::Reference< embed::XStorage >& xStorage,
             const uno::Sequence< beans::NamedValue >& aEncryptionData )
-    throw ( uno::Exception )
 {
     uno::Reference< embed::XEncryptionProtectedSource2 > xEncrSet( xStorage, uno::UNO_QUERY );
     if ( !xEncrSet.is() )
@@ -226,7 +216,6 @@ void OStorageHelper::SetCommonStorageEncryptionData(
 
 sal_Int32 OStorageHelper::GetXStorageFormat(
             const uno::Reference< embed::XStorage >& xStorage )
-        throw ( uno::Exception, std::exception )
 {
     uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW );
 
@@ -293,7 +282,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL(
             const OUString& aURL,
             sal_Int32 nStorageMode,
             const uno::Reference< uno::XComponentContext >& rxContext )
-    throw ( uno::Exception )
 {
     uno::Sequence< beans::PropertyValue > aProps( 1 );
     aProps[0].Name = "StorageFormat";
@@ -318,7 +306,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStr
             const uno::Reference < io::XInputStream >& xStream,
             const uno::Reference< uno::XComponentContext >& rxContext,
             bool bRepairStorage, bool bUseBufferedStream )
-        throw ( uno::Exception )
 {
     uno::Sequence< beans::PropertyValue > aProps( 1 );
     sal_Int32 nPos = 0;
@@ -361,7 +348,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
             sal_Int32 nStorageMode,
             const uno::Reference< uno::XComponentContext >& rxContext,
             bool bRepairStorage, bool bUseBufferedStream )
-        throw ( uno::Exception )
 {
     uno::Sequence< beans::PropertyValue > aProps( 1 );
     sal_Int32 nPos = 0;
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index e8ccfedbac18..4f92aa15c319 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -100,7 +100,7 @@ bool getBOOL(const Any& _rAny)
 }
 
 
-sal_Int32 getEnumAsINT32(const Any& _rAny) throw(IllegalArgumentException)
+sal_Int32 getEnumAsINT32(const Any& _rAny)
 {
     sal_Int32 nReturn = 0;
     if (! ::cppu::enum2int(nReturn,_rAny) )
diff --git a/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx
index 9db7ba1a5fc3..1aadadaa6b7f 100644
--- a/comphelper/source/misc/weak.cxx
+++ b/comphelper/source/misc/weak.cxx
@@ -34,7 +34,7 @@ OWeakTypeObject::~OWeakTypeObject()
 {
 }
 
-Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType )   throw (RuntimeException, std::exception)
+Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType )
 {
     if( rType == cppu::UnoType<XTypeProvider>::get() )
         return Any( Reference< XTypeProvider >(this) );
@@ -52,12 +52,12 @@ void SAL_CALL OWeakTypeObject::release()    throw ()
     ::cppu::OWeakObject::release();
 }
 
-Sequence< Type > SAL_CALL OWeakTypeObject::getTypes(  ) throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OWeakTypeObject::getTypes(  )
 {
     return Sequence< Type >();
 }
 
-Sequence< ::sal_Int8 > SAL_CALL OWeakTypeObject::getImplementationId(  ) throw (RuntimeException, std::exception)
+Sequence< ::sal_Int8 > SAL_CALL OWeakTypeObject::getImplementationId(  )
 {
     return Sequence< ::sal_Int8 >();
 }
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 6342182b8c6b..6d6e1de7cf19 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -100,7 +100,6 @@ OfficeInstallationDirectories::~OfficeInstallationDirectories()
 // virtual
 OUString SAL_CALL
 OfficeInstallationDirectories::getOfficeInstallationDirectoryURL()
-    throw ( uno::RuntimeException, std::exception )
 {
     initDirs();
     return OUString( *m_pOfficeBrandDir );
@@ -110,7 +109,6 @@ OfficeInstallationDirectories::getOfficeInstallationDirectoryURL()
 // virtual
 OUString SAL_CALL
 OfficeInstallationDirectories::getOfficeUserDataDirectoryURL()
-    throw ( uno::RuntimeException, std::exception )
 {
     initDirs();
     return OUString( *m_pUserDir );
@@ -121,7 +119,6 @@ OfficeInstallationDirectories::getOfficeUserDataDirectoryURL()
 // virtual
 OUString SAL_CALL
 OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( !URL.isEmpty() )
     {
@@ -157,7 +154,6 @@ OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL )
 // virtual
 OUString SAL_CALL
 OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( !URL.isEmpty() )
     {
@@ -195,7 +191,6 @@ OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL )
 // virtual
 OUString SAL_CALL
 OfficeInstallationDirectories::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.util.OfficeInstallationDirectories");
 }
@@ -203,7 +198,6 @@ OfficeInstallationDirectories::getImplementationName()
 // virtual
 sal_Bool SAL_CALL
 OfficeInstallationDirectories::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -211,7 +205,6 @@ OfficeInstallationDirectories::supportsService( const OUString& ServiceName )
 // virtual
 uno::Sequence< OUString > SAL_CALL
 OfficeInstallationDirectories::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.util.OfficeInstallationDirectories" };
 }
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index 20fcc6b6ca92..b1b235622a73 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -49,28 +49,21 @@ public:
 
     // XOfficeInstallationDirectories
     virtual OUString SAL_CALL
-    getOfficeInstallationDirectoryURL()
-        throw (css::uno::RuntimeException, std::exception) override;
+    getOfficeInstallationDirectoryURL() override;
     virtual OUString SAL_CALL
-    getOfficeUserDataDirectoryURL()
-        throw (css::uno::RuntimeException, std::exception) override;
+    getOfficeUserDataDirectoryURL() override;
     virtual OUString SAL_CALL
-    makeRelocatableURL( const OUString& URL )
-        throw (css::uno::RuntimeException, std::exception) override;
+    makeRelocatableURL( const OUString& URL ) override;
     virtual OUString SAL_CALL
-    makeAbsoluteURL( const OUString& URL )
-        throw (css::uno::RuntimeException, std::exception) override;
+    makeAbsoluteURL( const OUString& URL ) override;
 
     // XServiceInfo
     virtual OUString SAL_CALL
-    getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    getImplementationName() override;
     virtual sal_Bool SAL_CALL
-    supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
 private:
     void initDirs();
diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx
index 1f7d8d92c992..846fa7acb87b 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.cxx
@@ -45,13 +45,11 @@ ChainablePropertySet::~ChainablePropertySet()
 
 // XPropertySet
 Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo(  )
-    throw(RuntimeException, std::exception)
 {
     return mxInfo.get();
 }
 
 void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
     std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
@@ -69,7 +67,6 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyN
 }
 
 Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyName )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
     std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
@@ -90,33 +87,27 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyNa
 }
 
 void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // todo
 }
 
 // XMultiPropertySet
 void SAL_CALL ChainablePropertySet::setPropertyValues(const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rValues)
-    throw (PropertyVetoException, IllegalArgumentException,
-           WrappedTargetException, RuntimeException, std::exception)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
     std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
@@ -150,7 +141,6 @@ void SAL_CALL ChainablePropertySet::setPropertyValues(const Sequence< OUString >
 }
 
 Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues(const Sequence< OUString >& rPropertyNames)
-    throw (RuntimeException, std::exception)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
     std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
@@ -184,26 +174,22 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues(const Sequence<
 }
 
 void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
-    throw(RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& )
-    throw(RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
-    throw(RuntimeException, std::exception)
 {
     // todo
 }
 
 // XPropertyState
 PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& PropertyName )
-    throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     PropertyInfoHash::const_iterator aIter =  mxInfo->maMap.find( PropertyName );
     if( aIter == mxInfo->maMap.end())
@@ -219,7 +205,6 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& P
 }
 
 Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames )
-    throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
 
@@ -245,7 +230,6 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons
 }
 
 void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPropertyName )
-    throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     PropertyInfoHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName );
 
@@ -255,7 +239,6 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPrope
 }
 
 Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rPropertyName )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     PropertyInfoHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName );
 
@@ -265,31 +248,26 @@ Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rProperty
 }
 
 void ChainablePropertySet::_preGetPropertyState ()
-    throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException )
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 void ChainablePropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& )
-    throw(UnknownPropertyException )
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 void ChainablePropertySet::_postGetPropertyState ()
-    throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException )
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 void ChainablePropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& )
-    throw(UnknownPropertyException )
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 Any ChainablePropertySet::_getPropertyDefault( const comphelper::PropertyInfo& )
-    throw(UnknownPropertyException, WrappedTargetException )
 {
     OSL_FAIL( "you have to implement this yourself!");
 
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index 4a2c34789810..00f6720324b0 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -52,7 +52,6 @@ void ChainablePropertySetInfo::remove( const OUString& aName )
 }
 
 Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties()
-    throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nSize = maMap.size();
     if( maProperties.getLength() != nSize )
@@ -74,7 +73,6 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties()
 }
 
 Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& rName )
-    throw(::UnknownPropertyException, css::uno::RuntimeException, std::exception)
 {
     PropertyInfoHash::iterator aIter = maMap.find( rName );
 
@@ -91,7 +89,6 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& r
 }
 
 sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return maMap.find ( rName ) != maMap.end();
 }
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index c6f1477480de..f3f3374851b1 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -75,7 +75,6 @@ MasterPropertySet::~MasterPropertySet()
 
 // XPropertySet
 Reference< XPropertySetInfo > SAL_CALL MasterPropertySet::getPropertySetInfo(  )
-    throw(RuntimeException, std::exception)
 {
     return mxInfo.get();
 }
@@ -88,7 +87,6 @@ void MasterPropertySet::registerSlave ( ChainablePropertySet *pNewSet )
 }
 
 void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
     std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
@@ -122,7 +120,6 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName
 }
 
 Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
     std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
@@ -158,32 +155,27 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName
 }
 
 void SAL_CALL MasterPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL MasterPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL MasterPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // todo
 }
 
 // XMultiPropertySet
 void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues )
-    throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
     std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
@@ -247,7 +239,6 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >&
 }
 
 Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames )
-    throw(RuntimeException, std::exception)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
     std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard;
@@ -311,26 +302,22 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O
 }
 
 void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
-    throw(RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& )
-    throw(RuntimeException, std::exception)
 {
     // todo
 }
 
 void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
-    throw(RuntimeException, std::exception)
 {
     // todo
 }
 
 // XPropertyState
 PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& PropertyName )
-    throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     PropertyDataHash::const_iterator aIter =  mxInfo->maMap.find( PropertyName );
     if( aIter == mxInfo->maMap.end())
@@ -366,7 +353,6 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& Prop
 }
 
 Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames )
-    throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
 
@@ -411,7 +397,6 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S
 }
 
 void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rPropertyName )
-    throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     PropertyDataHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName );
 
@@ -421,7 +406,6 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rProperty
 }
 
 Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyName )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     PropertyDataHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName );
 
@@ -431,31 +415,26 @@ Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyNam
 }
 
 void MasterPropertySet::_preGetPropertyState ()
-    throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException )
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 void MasterPropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& )
-    throw(UnknownPropertyException )
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 void MasterPropertySet::_postGetPropertyState ()
-    throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException )
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 void MasterPropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& )
-    throw(UnknownPropertyException )
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 Any MasterPropertySet::_getPropertyDefault( const comphelper::PropertyInfo& )
-    throw(UnknownPropertyException, WrappedTargetException )
 {
     OSL_FAIL( "you have to implement this yourself!");
     Any aAny;
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index 1db09060c317..35a9a5faee1d 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -61,7 +61,6 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId )
 }
 
 Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties()
-    throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nSize = maMap.size();
     if( maProperties.getLength() != nSize )
@@ -83,7 +82,6 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties()
 }
 
 Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rName )
-    throw(::UnknownPropertyException, css::uno::RuntimeException, std::exception)
 {
     PropertyDataHash::iterator aIter = maMap.find( rName );
 
@@ -101,7 +99,6 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rNam
 }
 
 sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return maMap.find ( rName ) != maMap.end();
 }
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index 6ee1da2bbd55..93ce85d3779a 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -58,30 +58,30 @@ namespace comphelper
         cppu::OMultiTypeInterfaceContainerHelperVar<OUString> m_aListener;
 
     protected:
-        virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const  Any* pValues ) throw( UnknownPropertyException,  PropertyVetoException,  IllegalArgumentException,  WrappedTargetException ) override;
-        virtual void _getPropertyValues( const PropertyMapEntry** ppEntries,  Any* pValue ) throw( UnknownPropertyException,  WrappedTargetException ) override;
+        virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const  Any* pValues ) override;
+        virtual void _getPropertyValues( const PropertyMapEntry** ppEntries,  Any* pValue ) override;
 
     public:
         explicit GenericPropertySet( PropertySetInfo* pInfo ) throw();
 
         // XInterface
-        virtual  Any SAL_CALL queryAggregation( const  Type & rType ) throw( RuntimeException, std::exception) override;
-        virtual  Any SAL_CALL queryInterface( const  Type & rType ) throw( RuntimeException, std::exception) override;
+        virtual  Any SAL_CALL queryAggregation( const  Type & rType ) override;
+        virtual  Any SAL_CALL queryInterface( const  Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
 
         // XTypeProvider
-        virtual  Sequence<  Type > SAL_CALL getTypes(  ) throw( RuntimeException, std::exception) override;
-        virtual  Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw( RuntimeException, std::exception) override;
+        virtual  Sequence<  Type > SAL_CALL getTypes(  ) override;
+        virtual  Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(  RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(  RuntimeException, std::exception ) override;
-        virtual  Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(  RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual  Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XPropertySet
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     };
 
 }
@@ -93,7 +93,7 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw()
 {
 }
 
-void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener )
 {
     Reference < XPropertySetInfo > xInfo = getPropertySetInfo(  );
     if ( xInfo.is() )
@@ -115,7 +115,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPr
     }
 }
 
-void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener )
 {
     ResettableMutexGuard aGuard( maMutex );
     Reference < XPropertySetInfo > xInfo = getPropertySetInfo(  );
@@ -140,7 +140,6 @@ void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString&
 }
 
 void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues )
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
 {
     ResettableMutexGuard aGuard( maMutex );
 
@@ -166,7 +165,6 @@ void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries,
 }
 
 void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, Any* pValue )
-    throw( UnknownPropertyException, WrappedTargetException )
 {
     MutexGuard aGuard( maMutex );
 
@@ -182,13 +180,11 @@ void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry*
 // XInterface
 
 Any SAL_CALL GenericPropertySet::queryInterface( const Type & rType )
-    throw( RuntimeException, std::exception )
 {
     return OWeakAggObject::queryInterface( rType );
 }
 
 Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType )
-    throw(RuntimeException, std::exception)
 {
     Any aAny;
 
@@ -217,7 +213,6 @@ void SAL_CALL GenericPropertySet::release() throw()
 }
 
 uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type > aTypes( 5 );
     uno::Type* pTypes = aTypes.getArray();
@@ -232,24 +227,22 @@ uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL GenericPropertySet::supportsService( const  OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL GenericPropertySet::supportsService( const  OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-OUString SAL_CALL GenericPropertySet::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL GenericPropertySet::getImplementationName()
 {
     return OUString( "com.sun.star.comp.comphelper.GenericPropertySet" );
 }
 
 Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames(  )
-    throw( RuntimeException, std::exception )
 {
     Sequence<OUString> aSNS { "com.sun.star.beans.XPropertySet" };
     return aSNS;
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index 066052b3f1d3..540c0a2f8dfc 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -74,7 +74,7 @@ namespace comphelper
     IMPLEMENT_FORWARD_XINTERFACE2( OPropertyBag, OPropertyBag_Base, OPropertyBag_PBase )
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyBag, OPropertyBag_Base, OPropertyBag_PBase )
 
-    void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments )
     {
         Sequence< Type > aTypes;
         bool AllowEmptyPropertyName(false);
@@ -112,17 +112,17 @@ namespace comphelper
         }
     }
 
-    OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL OPropertyBag::getImplementationName()
     {
         return OUString( "com.sun.star.comp.comphelper.OPropertyBag" );
     }
 
-    sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames(  )
     {
          return { "com.sun.star.beans.PropertyBag" };
     }
@@ -163,40 +163,36 @@ namespace comphelper
 
 
     sal_Bool SAL_CALL OPropertyBag::isModified()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_isModified;
     }
 
     void SAL_CALL OPropertyBag::setModified( sal_Bool bModified )
-        throw (PropertyVetoException, RuntimeException, std::exception)
     {
         setModifiedImpl(bModified, false);
     }
 
     void SAL_CALL OPropertyBag::addModifyListener(
         const Reference< XModifyListener > & xListener)
-        throw (RuntimeException, std::exception)
     {
         m_NotifyListeners.addInterface(xListener);
     }
 
     void SAL_CALL OPropertyBag::removeModifyListener(
         const Reference< XModifyListener > & xListener)
-        throw (RuntimeException, std::exception)
     {
         m_NotifyListeners.removeInterface(xListener);
     }
 
 
-    Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo(  )
     {
         return createPropertySetInfo( getInfoHelper() );
     }
 
 
-    sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ )
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
         // So, everything of XSet except insert is implemented empty
@@ -204,7 +200,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
+    void SAL_CALL OPropertyBag::insert( const Any& _element )
     {
         // This is a workaround for addProperty not being able to add default-void properties.
         // If we ever have a smarter XPropertyContainer::addProperty interface, we can remove this, ehm, well, hack.
@@ -231,7 +227,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+    void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ )
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
         // So, everything of XSet except insert is implemented empty
@@ -239,7 +235,7 @@ namespace comphelper
     }
 
 
-    Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration(  ) throw (RuntimeException, std::exception)
+    Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration(  )
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
         // So, everything of XSet except insert is implemented empty
@@ -247,7 +243,7 @@ namespace comphelper
     }
 
 
-    Type SAL_CALL OPropertyBag::getElementType(  ) throw (RuntimeException, std::exception)
+    Type SAL_CALL OPropertyBag::getElementType(  )
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
         // So, everything of XSet except insert is implemented empty
@@ -255,7 +251,7 @@ namespace comphelper
     }
 
 
-    sal_Bool SAL_CALL OPropertyBag::hasElements(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OPropertyBag::hasElements(  )
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
         // So, everything of XSet except insert is implemented empty
@@ -268,12 +264,12 @@ namespace comphelper
         m_aDynamicProperties.getFastPropertyValue( _nHandle, _rValue );
     }
 
-    sal_Bool SAL_CALL OPropertyBag::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException, UnknownPropertyException)
+    sal_Bool SAL_CALL OPropertyBag::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
     {
         return m_aDynamicProperties.convertFastPropertyValue( _nHandle, _rValue, _rConvertedValue, _rOldValue );
     }
 
-    void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+    void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
     {
         m_aDynamicProperties.setFastPropertyValue( nHandle, rValue );
     }
@@ -314,7 +310,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue )
     {
         ::osl::ClearableMutexGuard g( m_aMutex );
 
@@ -337,7 +333,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception)
+    void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName )
     {
         ::osl::ClearableMutexGuard g( m_aMutex );
 
@@ -380,7 +376,7 @@ namespace comphelper
     }
 
 
-    Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues(  ) throw (RuntimeException, std::exception)
+    Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -513,7 +509,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_setPropertyValues_throw( _rProps );
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index ca2df4a9fa0a..678c457b563f 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -100,64 +100,59 @@ namespace comphelper
 
         /** === begin UNO interface implementations == **/
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XModifiable:
-        virtual sal_Bool SAL_CALL isModified(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setModified( sal_Bool bModified )
-            throw (css::beans::PropertyVetoException,
-                    css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isModified(  ) override;
+        virtual void SAL_CALL setModified( sal_Bool bModified ) override;
 
         // XModifyBroadcaster
         virtual void SAL_CALL addModifyListener(
             const css::uno::Reference<
-                    css::util::XModifyListener > & xListener)
-            throw (css::uno::RuntimeException, std::exception) override;
+                    css::util::XModifyListener > & xListener) override;
         virtual void SAL_CALL removeModifyListener(
             const css::uno::Reference<
-                    css::util::XModifyListener > & xListener)
-            throw (css::uno::RuntimeException, std::exception) override;
+                    css::util::XModifyListener > & xListener) override;
 
         // XPropertyContainer
-        virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) override;
+        virtual void SAL_CALL removeProperty( const OUString& Name ) override;
 
         // XPropertyAccess
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) override;
+        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) override
            { OPropertyBag_PBase::setPropertyValue(p1, p2); }
-        virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) override
            { return OPropertyBag_PBase::getPropertyValue(p1); }
-        virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
            { OPropertyBag_PBase::addPropertyChangeListener(p1, p2); }
-        virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
            { OPropertyBag_PBase::removePropertyChangeListener(p1, p2); }
-        virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
            { OPropertyBag_PBase::addVetoableChangeListener(p1, p2); }
-        virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
            { OPropertyBag_PBase::removeVetoableChangeListener(p1, p2); }
 
         // XSet
-        virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL insert( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL remove( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) override;
+        virtual void SAL_CALL insert( const css::uno::Any& aElement ) override;
+        virtual void SAL_CALL remove( const css::uno::Any& aElement ) override;
 
         // XEnumerationAccess (base of XSet)
-        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
         // XElementAccess (base of XEnumerationAccess)
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
         // UNO interface implementations
 
         // XPropertyState
@@ -168,8 +163,8 @@ namespace comphelper
 
         // OPropertySetHelper
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException) override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // IEventNotificationHook
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index acc253b2ca17..35c6a5f9f917 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -141,7 +141,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper:
 }
 
 
-Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName ) throw( UnknownPropertyException )
+Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName )
 {
     const Property* pProperty = findPropertyByName( _rPropertyName );
 
@@ -273,7 +273,7 @@ namespace internal
         /// actually forwards a property value to the aggregate
         ///
         /// @throws Exception
-        void    doForward( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception );
+        void    doForward( sal_Int32 _nHandle, const Any& _rValue );
 
         sal_Int32 getCurrentlyForwardedProperty( ) const { return m_nCurrentlyForwarding; }
     };
@@ -298,7 +298,7 @@ namespace internal
     }
 
 
-    void PropertyForwarder::doForward( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception )
+    void PropertyForwarder::doForward( sal_Int32 _nHandle, const Any& _rValue )
     {
         OSL_ENSURE( m_rAggregationHelper.m_xAggregateSet.is(), "PropertyForwarder::doForward: no property set!" );
         if ( m_rAggregationHelper.m_xAggregateSet.is() )
@@ -339,7 +339,7 @@ OPropertySetAggregationHelper::~OPropertySetAggregationHelper()
 }
 
 
-css::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const  css::uno::Type& _rType) throw( css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const  css::uno::Type& _rType)
 {
     css::uno::Any aReturn = OPropertyStateHelper::queryInterface(_rType);
 
@@ -370,7 +370,7 @@ void OPropertySetAggregationHelper::disposing()
 }
 
 
-void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObject& _rSource) throw ( css::uno::RuntimeException, std::exception)
+void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObject& _rSource)
 {
     OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::disposing : don't have an aggregate anymore !");
     if (_rSource.Source == m_xAggregateSet)
@@ -378,7 +378,7 @@ void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObj
 }
 
 
-void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& _rEvents) throw( css::uno::RuntimeException, std::exception)
+void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& _rEvents)
 {
     OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::propertiesChange : have no aggregate !");
 
@@ -426,7 +426,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Se
 }
 
 
-void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::PropertyChangeEvent& _rEvent) throw( css::beans::PropertyVetoException,  css::uno::RuntimeException, std::exception)
+void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::PropertyChangeEvent& _rEvent)
 {
     OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::vetoableChange : have no aggregate !");
 
@@ -438,7 +438,6 @@ void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::Pr
 
 
 void OPropertySetAggregationHelper::setAggregation(const css::uno::Reference<  css::uno::XInterface >& _rxDelegate)
-        throw( css::lang::IllegalArgumentException )
 {
     osl::MutexGuard aGuard(rBHelper.rMutex);
 
@@ -478,7 +477,6 @@ void OPropertySetAggregationHelper::startListening()
 
 void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName,
                                                                        const  css::uno::Reference< css::beans::XVetoableChangeListener>& _rxListener)
-                                                                       throw( css::beans::UnknownPropertyException,  css::lang::WrappedTargetException,  css::uno::RuntimeException, std::exception)
 {
     OPropertySetHelper::addVetoableChangeListener(_rPropertyName, _rxListener);
     if (!m_bListening)
@@ -488,7 +486,6 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUS
 
 void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName,
                                                                        const css::uno::Reference< css::beans::XPropertyChangeListener>& _rxListener)
-                                                                       throw( css::beans::UnknownPropertyException,  css::lang::WrappedTargetException,  css::uno::RuntimeException, std::exception)
 {
     OPropertySetHelper::addPropertyChangeListener(_rPropertyName, _rxListener);
     if (!m_bListening)
@@ -498,7 +495,6 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUS
 
 void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const css::uno::Sequence< OUString >& _rPropertyNames,
                                                                          const css::uno::Reference< css::beans::XPropertiesChangeListener>& _rxListener)
-                                                                         throw( css::uno::RuntimeException, std::exception)
 {
     OPropertySetHelper::addPropertiesChangeListener(_rPropertyNames, _rxListener);
     if (!m_bListening)
@@ -525,9 +521,6 @@ OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) co
 
 
 void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const  css::uno::Any& _rValue)
-        throw( css::beans::UnknownPropertyException,  css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,  css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
     OUString aPropName;
@@ -567,9 +560,6 @@ void OPropertySetAggregationHelper::getFastPropertyValue( css::uno::Any& rValue,
 
 
 css::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle)
-        throw(   css::beans::UnknownPropertyException,
-                 css::lang::WrappedTargetException,
-                 css::uno::RuntimeException, std::exception)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
     OUString aPropName;
@@ -592,7 +582,6 @@ css::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_I
 
 void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
         const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues )
-    throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
 {
     OSL_ENSURE( !rBHelper.bInDispose, "OPropertySetAggregationHelper::setPropertyValues : do not use within the dispose call !");
     OSL_ENSURE( !rBHelper.bDisposed, "OPropertySetAggregationHelper::setPropertyValues : object is disposed" );
@@ -767,7 +756,6 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
 // XPropertyState
 
 css::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName)
-            throw( css::beans::UnknownPropertyException,  css::uno::RuntimeException, std::exception)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
     sal_Int32 nHandle = rPH.getHandleByName( _rPropertyName );
@@ -792,7 +780,6 @@ css::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertySta
 
 
 void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName)
-        throw( css::beans::UnknownPropertyException,  css::uno::RuntimeException, std::exception)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
     sal_Int32 nHandle = rPH.getHandleByName(_rPropertyName);
@@ -825,7 +812,6 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString
 
 
 css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName)
-        throw( css::beans::UnknownPropertyException,  css::lang::WrappedTargetException,  css::uno::RuntimeException, std::exception)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
     sal_Int32 nHandle = rPH.getHandleByName( aPropertyName );
@@ -846,7 +832,7 @@ css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const O
         return getPropertyDefaultByHandle(nHandle);
 }
 
-sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
 {
     bool bModified = false;
 
@@ -866,7 +852,7 @@ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any&
     return bModified;
 }
 
-void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception )
+void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
 {
     OSL_ENSURE( m_pForwarder->isResponsibleFor( _nHandle ), "OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast: this is no forwarded property - did you use declareForwardedProperty for it?" );
     if ( m_pForwarder->isResponsibleFor( _nHandle ) )
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index 813346270fc1..01674353465c 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -48,7 +48,7 @@ OPropertyContainer::~OPropertyContainer()
 }
 
 
-Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OPropertyContainer::getBaseTypes()
 {
     // just the types from our one and only base class
     ::cppu::OTypeCollection aTypes(
@@ -60,21 +60,20 @@ Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std
 }
 
 
-void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
 {
     OPropertySetHelper::setFastPropertyValue( nHandle, rValue );
 }
 
 
 sal_Bool OPropertyContainer::convertFastPropertyValue(
-    Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException)
+    Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
 {
     return OPropertyContainerHelper::convertFastPropertyValue( _rConvertedValue, _rOldValue, _nHandle, _rValue );
 }
 
 
 void OPropertyContainer::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
-    throw (Exception, std::exception)
 {
     OPropertyContainerHelper::setFastPropertyValue( _nHandle, _rValue );
 }
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index 614a035f9166..5005fb626653 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.cxx
@@ -74,12 +74,12 @@ PropertySetHelper::~PropertySetHelper() throw()
 }
 
 // XPropertySet
-Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo(  )
 {
     return mpImpl->mpInfo;
 }
 
-void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
 {
     PropertyMapEntry const * aEntries[2];
     aEntries[0] = mpImpl->find( aPropertyName );
@@ -92,7 +92,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName
     _setPropertyValues( aEntries, &aValue );
 }
 
-Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName )
 {
     PropertyMapEntry const * aEntries[2];
     aEntries[0] = mpImpl->find( PropertyName );
@@ -108,29 +108,28 @@ Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName )
     return aAny;
 }
 
-void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
 {
     // todo
 }
 
-void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
 {
     // todo
 }
 
-void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
 {
     // todo
 }
 
-void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
 {
     // todo
 }
 
 // XMultiPropertySet
 void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rValues )
-    throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
 
@@ -160,7 +159,6 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >&
 }
 
 Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues(const Sequence< OUString >& rPropertyNames)
-    throw (RuntimeException, std::exception)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
 
@@ -192,23 +190,23 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues(const Sequence< OU
     return aValues;
 }
 
-void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception)
+void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
 {
     // todo
 }
 
-void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception)
+void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& )
 {
     // todo
 }
 
-void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception)
+void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
 {
     // todo
 }
 
 // XPropertyState
-PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName )
 {
     PropertyMapEntry const * aEntries[2];
 
@@ -224,7 +222,7 @@ PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& Prop
     return aState;
 }
 
-Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName )
 {
     const sal_Int32 nCount = aPropertyName.getLength();
 
@@ -257,7 +255,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S
     return aStates;
 }
 
-void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName )
 {
     PropertyMapEntry const *pEntry  = mpImpl->find( PropertyName );
     if( nullptr == pEntry )
@@ -266,7 +264,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyN
     _setPropertyToDefault( pEntry );
 }
 
-Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName )
 {
     PropertyMapEntry const * pEntry = mpImpl->find( aPropertyName );
     if( nullptr == pEntry )
@@ -277,20 +275,17 @@ Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyNam
 
 void PropertySetHelper::_getPropertyStates(
         const comphelper::PropertyMapEntry**, PropertyState*)
-throw (UnknownPropertyException, RuntimeException)
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 void
 PropertySetHelper::_setPropertyToDefault(const comphelper::PropertyMapEntry*)
-throw (UnknownPropertyException, RuntimeException)
 {
     OSL_FAIL( "you have to implement this yourself!");
 }
 
 Any PropertySetHelper::_getPropertyDefault(const comphelper::PropertyMapEntry*)
-throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "you have to implement this yourself!");
 
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index 0673b6ffe93b..a77a32799c7d 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -44,7 +44,7 @@ public:
     const PropertyMap& getPropertyMap() const throw() { return maPropertyMap;}
 
         /// @throws UnknownPropertyException
-    Property getPropertyByName( const OUString& aName ) throw( UnknownPropertyException );
+    Property getPropertyByName( const OUString& aName );
     bool hasPropertyByName( const OUString& aName ) throw();
 
 private:
@@ -106,7 +106,7 @@ std::vector< Property > const & PropertyMapImpl::getProperties() throw()
 }
 
 
-Property PropertyMapImpl::getPropertyByName( const OUString& aName ) throw( UnknownPropertyException )
+Property PropertyMapImpl::getPropertyByName( const OUString& aName )
 {
     PropertyMap::iterator aIter = maPropertyMap.find( aName );
 
@@ -167,17 +167,17 @@ void PropertySetInfo::remove( const OUString& aName ) throw()
     mpImpl->remove( aName );
 }
 
-Sequence< css::beans::Property > SAL_CALL PropertySetInfo::getProperties() throw(css::uno::RuntimeException, std::exception)
+Sequence< css::beans::Property > SAL_CALL PropertySetInfo::getProperties()
 {
     return comphelper::containerToSequence(mpImpl->getProperties());
 }
 
-Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName )
 {
     return mpImpl->getPropertyByName( aName );
 }
 
-sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name )
 {
     return mpImpl->hasPropertyByName( Name );
 }
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index b315a6662520..063cc79e35b4 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -51,7 +51,7 @@ namespace comphelper
     }
 
 
-    Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+    Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType )
     {
         Any aReturn = OPropertyContainer::queryInterface( _rType );
         if ( !aReturn.hasValue() )
@@ -76,13 +76,13 @@ namespace comphelper
     }
 
 
-    PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName )
     {
         return getPropertyStateByHandle( getHandleForName( _rPropertyName ) );
     }
 
 
-    Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames )
     {
         sal_Int32 nProperties = _rPropertyNames.getLength();
         Sequence< PropertyState> aStates( nProperties );
@@ -135,13 +135,13 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName )
     {
         setPropertyToDefaultByHandle( getHandleForName( _rPropertyName ) );
     }
 
 
-    Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName )
     {
         Any aDefault;
         getPropertyDefaultByHandle( getHandleForName( _rPropertyName ), aDefault );
diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx
index e10d85a0c343..5508677396b3 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.cxx
@@ -37,7 +37,6 @@ OPropertyChangeListener::~OPropertyChangeListener()
 
 
 void OPropertyChangeListener::_disposing(const EventObject&)
-    throw (RuntimeException, std::exception)
 {
     // nothing to do here
 }
@@ -108,7 +107,7 @@ void OPropertyChangeMultiplexer::dispose()
 
 // XEventListener
 
-void SAL_CALL OPropertyChangeMultiplexer::disposing( const  EventObject& _rSource) throw( RuntimeException, std::exception)
+void SAL_CALL OPropertyChangeMultiplexer::disposing( const  EventObject& _rSource)
 {
     if (m_pListener)
     {
@@ -129,7 +128,7 @@ void SAL_CALL OPropertyChangeMultiplexer::disposing( const  EventObject& _rSourc
 
 // XPropertyChangeListener
 
-void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const  PropertyChangeEvent& _rEvent ) throw( RuntimeException, std::exception)
+void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const  PropertyChangeEvent& _rEvent )
 {
     if (m_pListener && !locked())
         m_pListener->_propertyChanged(_rEvent);
diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx
index 5272ebf725a1..e0830099b896 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.cxx
@@ -40,7 +40,7 @@ namespace comphelper
     // OPropertyStateHelper
 
 
-    css::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const  css::uno::Type& _rType) throw( css::uno::RuntimeException, std::exception)
+    css::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const  css::uno::Type& _rType)
     {
         css::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType);
         // our own ifaces
@@ -76,7 +76,7 @@ namespace comphelper
 
     // XPropertyState
 
-    css::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( css::beans::UnknownPropertyException,  css::uno::RuntimeException, std::exception)
+    css::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName)
     {
         cppu::IPropertyArrayHelper& rPH = getInfoHelper();
         sal_Int32 nHandle = rPH.getHandleByName(_rsName);
@@ -88,7 +88,7 @@ namespace comphelper
     }
 
 
-    void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( css::beans::UnknownPropertyException,  css::uno::RuntimeException, std::exception)
+    void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName)
     {
         cppu::IPropertyArrayHelper& rPH = getInfoHelper();
         sal_Int32 nHandle = rPH.getHandleByName(_rsName);
@@ -100,7 +100,7 @@ namespace comphelper
     }
 
 
-    css::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( css::beans::UnknownPropertyException,  css::lang::WrappedTargetException,  css::uno::RuntimeException, std::exception)
+    css::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName)
     {
         cppu::IPropertyArrayHelper& rPH = getInfoHelper();
         sal_Int32 nHandle = rPH.getHandleByName(_rsName);
@@ -112,7 +112,7 @@ namespace comphelper
     }
 
 
-    css::uno::Sequence< css::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const  css::uno::Sequence< OUString >& _rPropertyNames) throw( css::beans::UnknownPropertyException,  css::uno::RuntimeException, std::exception)
+    css::uno::Sequence< css::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const  css::uno::Sequence< OUString >& _rPropertyNames)
     {
         sal_Int32 nLen = _rPropertyNames.getLength();
         css::uno::Sequence< css::beans::PropertyState> aRet(nLen);
@@ -184,7 +184,7 @@ namespace comphelper
     }
 
 
-    Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() throw(RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes()
     {
         Sequence< Type > aOwnTypes( 2 );
         aOwnTypes[0] = cppu::UnoType<XWeak>::get();
@@ -196,13 +196,13 @@ namespace comphelper
         );
     }
 
-    Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException, std::exception)
+    Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId()
     {
         return css::uno::Sequence<sal_Int8>();
     }
 
 
-    Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+    Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType )
     {
         Any aReturn = OWeakObject::queryInterface( _rType );
         if ( !aReturn.hasValue() )
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index addb09306837..da162ef75c12 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.cxx
@@ -47,33 +47,33 @@ public:
     UNOMemoryStream();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XStream
-    virtual Reference< XInputStream > SAL_CALL getInputStream(  ) throw (RuntimeException, std::exception) override;
-    virtual Reference< XOutputStream > SAL_CALL getOutputStream(  ) throw (RuntimeException, std::exception) override;
+    virtual Reference< XInputStream > SAL_CALL getInputStream(  ) override;
+    virtual Reference< XOutputStream > SAL_CALL getOutputStream(  ) override;
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available() throw (NotConnectedException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition() throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength() throw (IOException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
     // XOutputStream
-    virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 
     // XTruncate
-    virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL truncate() override;
 
 private:
     std::vector< sal_Int8 > maData;
@@ -86,34 +86,34 @@ UNOMemoryStream::UNOMemoryStream()
 }
 
 // XServiceInfo
-OUString SAL_CALL UNOMemoryStream::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL UNOMemoryStream::getImplementationName()
 {
     return OUString("com.sun.star.comp.MemoryStream");
 }
 
-sal_Bool SAL_CALL UNOMemoryStream::supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UNOMemoryStream::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence<OUString> SAL_CALL UNOMemoryStream::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL UNOMemoryStream::getSupportedServiceNames()
 {
     return { "com.sun.star.comp.MemoryStream" };
 }
 
 // XStream
-Reference< XInputStream > SAL_CALL UNOMemoryStream::getInputStream(  ) throw (RuntimeException, std::exception)
+Reference< XInputStream > SAL_CALL UNOMemoryStream::getInputStream(  )
 {
     return this;
 }
 
-Reference< XOutputStream > SAL_CALL UNOMemoryStream::getOutputStream(  ) throw (RuntimeException, std::exception)
+Reference< XOutputStream > SAL_CALL UNOMemoryStream::getOutputStream(  )
 {
     return this;
 }
 
 // XInputStream
-sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
 {
     if( nBytesToRead < 0 )
         throw IOException();
@@ -133,12 +133,12 @@ sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_
     return nBytesToRead;
 }
 
-sal_Int32 SAL_CALL UNOMemoryStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL UNOMemoryStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
 {
     return readBytes( aData, nMaxBytesToRead );
 }
 
-void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
+void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip )
 {
     if( nBytesToSkip < 0 )
         throw IOException();
@@ -146,18 +146,18 @@ void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw (NotCon
     mnCursor += std::min( nBytesToSkip, available() );
 }
 
-sal_Int32 SAL_CALL UNOMemoryStream::available() throw (NotConnectedException, IOException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL UNOMemoryStream::available()
 {
     return static_cast< sal_Int32 >( maData.size() ) - mnCursor;
 }
 
-void SAL_CALL UNOMemoryStream::closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception)
+void SAL_CALL UNOMemoryStream::closeInput()
 {
     mnCursor = 0;
 }
 
 // XSeekable
-void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception)
+void SAL_CALL UNOMemoryStream::seek( sal_Int64 location )
 {
     if( (location < 0) || (location > SAL_MAX_INT32) )
         throw IllegalArgumentException("this implementation does not support more than 2GB!", static_cast<OWeakObject*>(this), 0 );
@@ -172,18 +172,18 @@ void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgument
     mnCursor = static_cast< sal_Int32 >( location );
 }
 
-sal_Int64 SAL_CALL UNOMemoryStream::getPosition() throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL UNOMemoryStream::getPosition()
 {
     return static_cast< sal_Int64 >( mnCursor );
 }
 
-sal_Int64 SAL_CALL UNOMemoryStream::getLength() throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL UNOMemoryStream::getLength()
 {
     return static_cast< sal_Int64 >( maData.size() );
 }
 
 // XOutputStream
-void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
+void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData )
 {
     const sal_Int32 nBytesToWrite( aData.getLength() );
     if( nBytesToWrite )
@@ -206,17 +206,17 @@ void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) t
     }
 }
 
-void SAL_CALL UNOMemoryStream::flush() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
+void SAL_CALL UNOMemoryStream::flush()
 {
 }
 
-void SAL_CALL UNOMemoryStream::closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
+void SAL_CALL UNOMemoryStream::closeOutput()
 {
     mnCursor = 0;
 }
 
 //XTruncate
-void SAL_CALL UNOMemoryStream::truncate() throw (IOException, RuntimeException, std::exception)
+void SAL_CALL UNOMemoryStream::truncate()
 {
     maData.resize( 0 );
     mnCursor = 0;
diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx
index 77e9ff6cfe31..defbdf3cc313 100644
--- a/comphelper/source/streaming/oslfile2streamwrap.cxx
+++ b/comphelper/source/streaming/oslfile2streamwrap.cxx
@@ -38,7 +38,6 @@ OSLInputStreamWrapper::~OSLInputStreamWrapper()
 
 
 sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
 {
     if (!m_pFile)
         throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
@@ -63,7 +62,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8
 }
 
 
-sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
 {
     if (!m_pFile)
         throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
@@ -75,7 +74,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_
 }
 
 
-void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_pFile)
@@ -93,7 +92,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( cs
 }
 
 
-sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL OSLInputStreamWrapper::available()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_pFile)
@@ -123,7 +122,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( css::io::NotConnect
 }
 
 
-void SAL_CALL OSLInputStreamWrapper::closeInput() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLInputStreamWrapper::closeInput()
 {
     if (!m_pFile)
         throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
@@ -143,7 +142,7 @@ OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile):
 
 OSLOutputStreamWrapper::~OSLOutputStreamWrapper() {}
 
-void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData)
 {
     sal_uInt64 nWritten;
     FileBase::RC eError = rFile.write(aData.getConstArray(),aData.getLength(), nWritten);
@@ -155,12 +154,12 @@ void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_I
 }
 
 
-void SAL_CALL OSLOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLOutputStreamWrapper::flush()
 {
 }
 
 
-void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OSLOutputStreamWrapper::closeOutput()
 {
     rFile.close();
 }
diff --git a/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx
index 7a39696f0497..2d14cd0aadb8 100644
--- a/comphelper/source/streaming/seekableinput.cxx
+++ b/comphelper/source/streaming/seekableinput.cxx
@@ -116,10 +116,6 @@ void OSeekableInputWrapper::PrepareCopy_Impl()
 // XInputStream
 
 sal_Int32 SAL_CALL OSeekableInputWrapper::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-    throw ( io::NotConnectedException,
-            io::BufferSizeExceededException,
-            io::IOException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -133,10 +129,6 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readBytes( uno::Sequence< sal_Int8 >&
 
 
 sal_Int32 SAL_CALL OSeekableInputWrapper::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-    throw ( io::NotConnectedException,
-            io::BufferSizeExceededException,
-            io::IOException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -150,10 +142,6 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readSomeBytes( uno::Sequence< sal_Int8
 
 
 void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip )
-    throw ( io::NotConnectedException,
-            io::BufferSizeExceededException,
-            io::IOException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -167,9 +155,6 @@ void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip )
 
 
 sal_Int32 SAL_CALL OSeekableInputWrapper::available()
-    throw ( io::NotConnectedException,
-            io::IOException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -183,9 +168,6 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::available()
 
 
 void SAL_CALL OSeekableInputWrapper::closeInput()
-    throw ( io::NotConnectedException,
-            io::IOException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -208,9 +190,6 @@ void SAL_CALL OSeekableInputWrapper::closeInput()
 // XSeekable
 
 void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -224,8 +203,6 @@ void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location )
 
 
 sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition()
-    throw ( io::IOException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -239,8 +216,6 @@ sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition()
 
 
 sal_Int64 SAL_CALL OSeekableInputWrapper::getLength()
-    throw ( io::IOException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx
index d9e372238637..9ed69589b730 100644
--- a/comphelper/source/streaming/seqinputstreamserv.cxx
+++ b/comphelper/source/streaming/seqinputstreamserv.cxx
@@ -53,24 +53,24 @@ public:
     const SequenceInputStreamService& operator=(const SequenceInputStreamService&) = delete;
 
     // css::lang::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;
 
     // css::io::XInputStream:
-    virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override;
-    virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override;
-    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override;
-    virtual ::sal_Int32 SAL_CALL available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) override;
-    virtual void SAL_CALL closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) override;
+    virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) override;
+    virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) override;
+    virtual ::sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 
     // css::io::XSeekable:
-    virtual void SAL_CALL seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception ) override;
-    virtual ::sal_Int64 SAL_CALL getPosition() throw ( uno::RuntimeException, io::IOException, std::exception ) override;
-    virtual ::sal_Int64 SAL_CALL getLength() throw ( uno::RuntimeException, io::IOException, std::exception ) override;
+    virtual void SAL_CALL seek( ::sal_Int64 location ) override;
+    virtual ::sal_Int64 SAL_CALL getPosition() override;
+    virtual ::sal_Int64 SAL_CALL getLength() override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize( const uno::Sequence< css::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) override;
+    virtual void SAL_CALL initialize( const uno::Sequence< css::uno::Any > & aArguments ) override;
 
 private:
     virtual ~SequenceInputStreamService() override {}
@@ -87,24 +87,24 @@ SequenceInputStreamService::SequenceInputStreamService()
 {}
 
 // com.sun.star.uno.XServiceInfo:
-OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException, std::exception )
+OUString SAL_CALL SequenceInputStreamService::getImplementationName()
 {
     return OUString ( "com.sun.star.comp.SequenceInputStreamService" );
 }
 
-sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
 
-uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames()
 {
     uno::Sequence<OUString> s { "com.sun.star.io.SequenceInputStream" };
     return s;
 }
 
 // css::io::XInputStream:
-::sal_Int32 SAL_CALL SequenceInputStreamService::readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception )
+::sal_Int32 SAL_CALL SequenceInputStreamService::readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xInputStream.is() )
@@ -113,7 +113,7 @@ uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServi
     return m_xInputStream->readBytes( aData, nBytesToRead );
 }
 
-::sal_Int32 SAL_CALL SequenceInputStreamService::readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception )
+::sal_Int32 SAL_CALL SequenceInputStreamService::readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xInputStream.is() )
@@ -122,7 +122,7 @@ uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServi
     return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead );
 }
 
-void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception )
+void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xInputStream.is() )
@@ -131,7 +131,7 @@ void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip )
     return m_xInputStream->skipBytes( nBytesToSkip );
 }
 
-::sal_Int32 SAL_CALL SequenceInputStreamService::available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception )
+::sal_Int32 SAL_CALL SequenceInputStreamService::available()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xInputStream.is() )
@@ -140,7 +140,7 @@ void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip )
     return m_xInputStream->available();
 }
 
-void SAL_CALL SequenceInputStreamService::closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception )
+void SAL_CALL SequenceInputStreamService::closeInput()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xInputStream.is() )
@@ -152,7 +152,7 @@ void SAL_CALL SequenceInputStreamService::closeInput() throw ( uno::RuntimeExcep
 }
 
 // css::io::XSeekable:
-void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception )
+void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xSeekable.is() )
@@ -161,7 +161,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u
     m_xSeekable->seek( location );
 }
 
-::sal_Int64 SAL_CALL SequenceInputStreamService::getPosition() throw ( uno::RuntimeException, io::IOException, std::exception )
+::sal_Int64 SAL_CALL SequenceInputStreamService::getPosition()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xSeekable.is() )
@@ -170,7 +170,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u
     return m_xSeekable->getPosition();
 }
 
-::sal_Int64 SAL_CALL SequenceInputStreamService::getLength() throw ( uno::RuntimeException, io::IOException, std::exception )
+::sal_Int64 SAL_CALL SequenceInputStreamService::getLength()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xSeekable.is() )
@@ -180,7 +180,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u
 }
 
 // css::lang::XInitialization:
-void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< css::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception )
+void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< css::uno::Any > & aArguments )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bInitialized )
diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx
index 461cbc5d2563..d722ff9c14aa 100644
--- a/comphelper/source/streaming/seqoutputstreamserv.cxx
+++ b/comphelper/source/streaming/seqoutputstreamserv.cxx
@@ -48,17 +48,17 @@ public:
     const SequenceOutputStreamService& operator=(const SequenceOutputStreamService&) = delete;
 
     // css::lang::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;
 
     // css::io::XOutputStream:
-    virtual void SAL_CALL writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override;
-    virtual void SAL_CALL closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override;
+    virtual void SAL_CALL writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 
     // css::io::XSequenceOutputStream:
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes(  ) throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override;
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes(  ) override;
 
 private:
     virtual ~SequenceOutputStreamService() override {};
@@ -74,24 +74,24 @@ SequenceOutputStreamService::SequenceOutputStreamService()
 }
 
 // com.sun.star.uno.XServiceInfo:
-OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException, std::exception )
+OUString SAL_CALL SequenceOutputStreamService::getImplementationName()
 {
     return OUString("com.sun.star.comp.SequenceOutputStreamService");
 }
 
-sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
 
-uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames()
 {
     uno::Sequence<OUString> s { "com.sun.star.io.SequenceOutputStream" };
     return s;
 }
 
 // css::io::XOutputStream:
-void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception )
+void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sal_Int8 > & aData )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xOutputStream.is() )
@@ -101,7 +101,7 @@ void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sa
     m_aSequence = aData;
 }
 
-void SAL_CALL SequenceOutputStreamService::flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception )
+void SAL_CALL SequenceOutputStreamService::flush()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xOutputStream.is() )
@@ -110,7 +110,7 @@ void SAL_CALL SequenceOutputStreamService::flush() throw ( uno::RuntimeException
     m_xOutputStream->flush();
 };
 
-void SAL_CALL SequenceOutputStreamService::closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception )
+void SAL_CALL SequenceOutputStreamService::closeOutput()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xOutputStream.is() )
@@ -121,7 +121,7 @@ void SAL_CALL SequenceOutputStreamService::closeOutput() throw ( uno::RuntimeExc
 }
 
 // css::io::XSequenceOutputStream:
-uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenBytes() throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception)
+uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenBytes()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xOutputStream.is() )
diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx
index d4672f602bfe..89625838132a 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.cxx
@@ -54,8 +54,6 @@ inline sal_Int32 SequenceInputStream::avail()
 // css::io::XInputStream
 
 sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead )
-    throw(NotConnectedException, BufferSizeExceededException,
-          IOException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -76,8 +74,6 @@ sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence<sal_Int8>& aData, sa
 
 
 sal_Int32 SAL_CALL SequenceInputStream::readSomeBytes( Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead )
-    throw(NotConnectedException, BufferSizeExceededException,
-          IOException, RuntimeException, std::exception)
 {
     // all data is available at once
     return readBytes(aData, nMaxBytesToRead);
@@ -85,8 +81,6 @@ sal_Int32 SAL_CALL SequenceInputStream::readSomeBytes( Sequence<sal_Int8>& aData
 
 
 void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip )
-    throw(NotConnectedException, BufferSizeExceededException,
-          IOException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -103,7 +97,6 @@ void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip )
 
 
 sal_Int32 SAL_CALL SequenceInputStream::available(  )
-    throw(NotConnectedException, IOException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -112,7 +105,6 @@ sal_Int32 SAL_CALL SequenceInputStream::available(  )
 
 
 void SAL_CALL SequenceInputStream::closeInput(  )
-    throw(NotConnectedException, IOException, RuntimeException, std::exception)
 {
     if (m_nPos == -1)
         throw NotConnectedException(OUString(), *this);
@@ -120,19 +112,19 @@ void SAL_CALL SequenceInputStream::closeInput(  )
     m_nPos = -1;
 }
 
-void SAL_CALL SequenceInputStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception)
+void SAL_CALL SequenceInputStream::seek( sal_Int64 location )
 {
     if ( location > m_aData.getLength() || location < 0 || location > SAL_MAX_INT32 )
         throw IllegalArgumentException();
     m_nPos = (sal_Int32) location;
 }
 
-sal_Int64 SAL_CALL SequenceInputStream::getPosition() throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL SequenceInputStream::getPosition()
 {
     return m_nPos;
 }
 
-sal_Int64 SAL_CALL SequenceInputStream::getLength(  ) throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL SequenceInputStream::getLength(  )
 {
     return m_aData.getLength();
 }
@@ -152,7 +144,7 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence< sal_Int8 >& _rSeq, double
 }
 
 
-void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
+void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rData )
 {
     MutexGuard aGuard(m_aMutex);
     if (!m_bConnected)
@@ -192,7 +184,7 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rD
 }
 
 
-void SAL_CALL OSequenceOutputStream::flush(  ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
+void SAL_CALL OSequenceOutputStream::flush(  )
 {
     MutexGuard aGuard(m_aMutex);
     if (!m_bConnected)
@@ -203,7 +195,7 @@ void SAL_CALL OSequenceOutputStream::flush(  ) throw(NotConnectedException, Buff
 }
 
 
-void SAL_CALL OSequenceOutputStream::closeOutput(  ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
+void SAL_CALL OSequenceOutputStream::closeOutput(  )
 {
     MutexGuard aGuard(m_aMutex);
     if (!m_bConnected)
diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx
index cefede87dfc9..64daa2a14320 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.cxx
@@ -53,17 +53,17 @@ struct AttributeList_Impl
     ::std::vector<struct TagAttribute_Impl> vecAttribute;
 };
 
-sal_Int16 SAL_CALL AttributeList::getLength() throw( css::uno::RuntimeException, std::exception )
+sal_Int16 SAL_CALL AttributeList::getLength()
 {
     return (sal_Int16)(m_pImpl->vecAttribute.size());
 }
 
-OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i)
 {
     return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size()) ) ? m_pImpl->vecAttribute[i].sName : OUString();
 }
 
-OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i)
 {
     if( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) {
         return m_pImpl->vecAttribute[i].sType;
@@ -71,12 +71,12 @@ OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( css::uno::Ru
     return OUString();
 }
 
-OUString SAL_CALL  AttributeList::getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL  AttributeList::getValueByIndex(sal_Int16 i)
 {
     return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) ? m_pImpl->vecAttribute[i].sValue : OUString();
 }
 
-OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName )
 {
     ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
 
@@ -88,7 +88,7 @@ OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( c
     return OUString();
 }
 
-OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL AttributeList::getValueByName(const OUString& sName)
 {
     ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
 
@@ -127,7 +127,7 @@ void AttributeList::Clear()
     m_pImpl->vecAttribute.clear();
 }
 
-css::uno::Reference< css::util::XCloneable > AttributeList::createClone() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::util::XCloneable > AttributeList::createClone()
 
 {
     AttributeList *p = new AttributeList( *this );
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index eebe3c2e6186..e1633fe3432b 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -72,14 +72,14 @@ public:
     explicit OFOPXMLHelper_Impl( sal_uInt16 nFormat ); // must not be created directly
 
     // XDocumentHandler
-    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement( const OUString& aName ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
+    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 };
 
 
@@ -89,14 +89,12 @@ namespace OFOPXMLHelper {
 static uno::Sequence<uno::Sequence< beans::StringPair>> ReadSequence_Impl(
     const uno::Reference<io::XInputStream>& xInStream,
     const OUString& aStringID, sal_uInt16 nFormat,
-    const uno::Reference<uno::XComponentContext>& xContext)
-throw (uno::Exception);
+    const uno::Reference<uno::XComponentContext>& xContext);
 
 uno::Sequence< uno::Sequence< beans::StringPair > > ReadRelationsInfoSequence(
         const uno::Reference< io::XInputStream >& xInStream,
         const OUString & aStreamName,
         const uno::Reference< uno::XComponentContext >& rContext )
-    throw( uno::Exception )
 {
     OUString aStringID = "_rels/" + aStreamName;
     return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, rContext );
@@ -106,7 +104,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadRelationsInfoSequence(
 uno::Sequence< uno::Sequence< beans::StringPair > > ReadContentTypeSequence(
         const uno::Reference< io::XInputStream >& xInStream,
         const uno::Reference< uno::XComponentContext >& rContext )
-    throw( uno::Exception )
 {
     OUString aStringID = "[Content_Types].xml";
     return ReadSequence_Impl( xInStream, aStringID, CONTENTTYPE_FORMAT, rContext );
@@ -117,7 +114,6 @@ void WriteRelationsInfoSequence(
         const uno::Reference< io::XOutputStream >& xOutStream,
         const uno::Sequence< uno::Sequence< beans::StringPair > >& aSequence,
         const uno::Reference< uno::XComponentContext >& rContext )
-    throw( uno::Exception )
 {
     if ( !xOutStream.is() )
         throw uno::RuntimeException();
@@ -178,7 +174,6 @@ void WriteContentSequence(
         const uno::Sequence< beans::StringPair >& aDefaultsSequence,
         const uno::Sequence< beans::StringPair >& aOverridesSequence,
         const uno::Reference< uno::XComponentContext >& rContext )
-    throw( uno::Exception )
 {
     if ( !xOutStream.is() )
         throw uno::RuntimeException();
@@ -239,7 +234,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadSequence_Impl(
         const uno::Reference< io::XInputStream >& xInStream,
         const OUString& aStringID, sal_uInt16 nFormat,
         const uno::Reference< uno::XComponentContext >& rContext )
-    throw( uno::Exception )
 {
     if ( !rContext.is() || !xInStream.is() || nFormat > FORMAT_MAX_ID )
         throw uno::RuntimeException();
@@ -287,19 +281,16 @@ uno::Sequence< uno::Sequence< beans::StringPair > > const & OFOPXMLHelper_Impl::
 
 
 void SAL_CALL OFOPXMLHelper_Impl::startDocument()
-        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL OFOPXMLHelper_Impl::endDocument()
-        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-        throw( css::xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     if ( m_nFormat == RELATIONINFO_FORMAT )
     {
@@ -442,7 +433,6 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno
 
 
 void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName )
-    throw( css::xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT )
     {
@@ -459,25 +449,21 @@ void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName )
 
 
 void SAL_CALL OFOPXMLHelper_Impl::characters( const OUString& /*aChars*/ )
-        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL OFOPXMLHelper_Impl::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
-        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL OFOPXMLHelper_Impl::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
-        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL OFOPXMLHelper_Impl::setDocumentLocator( const uno::Reference< css::xml::sax::XLocator >& /*xLocator*/ )
-        throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index d0fc33260225..cd4614aa4f8f 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -130,12 +130,10 @@ protected:
     Test const & test_;
 
 private:
-    virtual void SAL_CALL disposing(css::lang::EventObject const &)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(css::lang::EventObject const &) override;
 
     virtual void SAL_CALL propertyChange(
-        css::beans::PropertyChangeEvent const &)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::PropertyChangeEvent const &) override;
 
     int count_;
     bool * destroyed_;
@@ -167,14 +165,12 @@ RecursiveTest::~RecursiveTest()
 }
 
 void RecursiveTest::disposing(css::lang::EventObject const & Source)
-    throw (css::uno::RuntimeException, std::exception)
 {
     CPPUNIT_ASSERT(properties_.is() && Source.Source == properties_);
     properties_.clear();
 }
 
 void RecursiveTest::propertyChange(css::beans::PropertyChangeEvent const & evt)
-    throw (css::uno::RuntimeException, std::exception)
 {
     CPPUNIT_ASSERT( evt.Source == properties_ && evt.PropertyName == "Label" );
     if (count_ > 0) {
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 486a826e50e4..63ec79f04157 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -173,7 +173,6 @@ void Access::initBroadcaster(
 }
 
 css::uno::Sequence< css::uno::Type > Access::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -225,7 +224,6 @@ css::uno::Sequence< css::uno::Type > Access::getTypes()
 }
 
 css::uno::Sequence< sal_Int8 > Access::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -233,7 +231,7 @@ css::uno::Sequence< sal_Int8 > Access::getImplementationId()
     return css::uno::Sequence< sal_Int8 >();
 }
 
-OUString Access::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString Access::getImplementationName()
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -242,13 +240,11 @@ OUString Access::getImplementationName() throw (css::uno::RuntimeException, std:
 }
 
 sal_Bool Access::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< OUString > Access::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -279,7 +275,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames()
     return comphelper::containerToSequence(services);
 }
 
-void Access::dispose() throw (css::uno::RuntimeException, std::exception) {
+void Access::dispose() {
     assert(thisIs(IS_ANY));
     Broadcaster bc;
     {
@@ -302,7 +298,6 @@ void Access::dispose() throw (css::uno::RuntimeException, std::exception) {
 
 void Access::addEventListener(
     css::uno::Reference< css::lang::XEventListener > const & xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     {
@@ -325,7 +320,6 @@ void Access::addEventListener(
 
 void Access::removeEventListener(
     css::uno::Reference< css::lang::XEventListener > const & aListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -336,7 +330,7 @@ void Access::removeEventListener(
     }
 }
 
-css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std::exception) {
+css::uno::Type Access::getElementType() {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -359,7 +353,7 @@ css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std::
     }
 }
 
-sal_Bool Access::hasElements() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool Access::hasElements() {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -403,9 +397,6 @@ bool Access::getByNameFast(const OUString & name, css::uno::Any & value)
 }
 
 css::uno::Any Access::getByName(OUString const & aName)
-    throw (
-        css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -418,7 +409,6 @@ css::uno::Any Access::getByName(OUString const & aName)
 }
 
 css::uno::Sequence< OUString > Access::getElementNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -435,7 +425,6 @@ css::uno::Sequence< OUString > Access::getElementNames()
 }
 
 sal_Bool Access::hasByName(OUString const & aName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -444,7 +433,6 @@ sal_Bool Access::hasByName(OUString const & aName)
 }
 
 css::uno::Any Access::getByHierarchicalName(OUString const & aName)
-    throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -458,7 +446,6 @@ css::uno::Any Access::getByHierarchicalName(OUString const & aName)
 }
 
 sal_Bool Access::hasByHierarchicalName(OUString const & aName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -468,10 +455,6 @@ sal_Bool Access::hasByHierarchicalName(OUString const & aName)
 
 void Access::replaceByHierarchicalName(
     OUString const & aName, css::uno::Any const & aElement)
-    throw (
-        css::lang::IllegalArgumentException,
-        css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     //TODO: Actually support sets and combine with replaceByName:
     assert(thisIs(IS_UPDATE));
@@ -514,7 +497,6 @@ void Access::replaceByHierarchicalName(
 
 void Access::addContainerListener(
     css::uno::Reference< css::container::XContainerListener > const & xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     {
@@ -537,7 +519,6 @@ void Access::addContainerListener(
 
 void Access::removeContainerListener(
     css::uno::Reference< css::container::XContainerListener > const & xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -549,7 +530,6 @@ void Access::removeContainerListener(
 }
 
 OUString Access::getExactName(OUString const & aApproximateName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -558,7 +538,6 @@ OUString Access::getExactName(OUString const & aApproximateName)
 }
 
 css::uno::Sequence< css::beans::Property > Access::getProperties()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -574,7 +553,6 @@ css::uno::Sequence< css::beans::Property > Access::getProperties()
 }
 
 css::beans::Property Access::getPropertyByName(OUString const & aName)
-    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -587,14 +565,13 @@ css::beans::Property Access::getPropertyByName(OUString const & aName)
 }
 
 sal_Bool Access::hasPropertyByName(OUString const & Name)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
     return getChild(Name).is();
 }
 
-OUString Access::getHierarchicalName() throw (css::uno::RuntimeException, std::exception) {
+OUString Access::getHierarchicalName() {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -616,9 +593,6 @@ OUString Access::getHierarchicalName() throw (css::uno::RuntimeException, std::e
 
 OUString Access::composeHierarchicalName(
     OUString const & aRelativeName)
-    throw (
-        css::lang::IllegalArgumentException, css::lang::NoSupportException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -636,7 +610,7 @@ OUString Access::composeHierarchicalName(
     return path.makeStringAndClear();
 }
 
-OUString Access::getName() throw (css::uno::RuntimeException, std::exception) {
+OUString Access::getName() {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -644,7 +618,6 @@ OUString Access::getName() throw (css::uno::RuntimeException, std::exception) {
 }
 
 void Access::setName(OUString const & aName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     Broadcaster bc;
@@ -712,7 +685,7 @@ void Access::setName(OUString const & aName)
     bc.send();
 }
 
-css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException, std::exception)
+css::beans::Property Access::getAsProperty()
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -721,7 +694,6 @@ css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException,
 }
 
 css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     return this;
@@ -729,10 +701,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo()
 
 void Access::setPropertyValue(
     OUString const & aPropertyName, css::uno::Any const & aValue)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     Broadcaster bc;
@@ -754,9 +722,6 @@ void Access::setPropertyValue(
 }
 
 css::uno::Any Access::getPropertyValue(OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -772,9 +737,6 @@ void Access::addPropertyChangeListener(
     OUString const & aPropertyName,
     css::uno::Reference< css::beans::XPropertyChangeListener > const &
         xListener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     {
@@ -799,9 +761,6 @@ void Access::removePropertyChangeListener(
     OUString const & aPropertyName,
     css::uno::Reference< css::beans::XPropertyChangeListener > const &
         aListener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -823,9 +782,6 @@ void Access::addVetoableChangeListener(
     OUString const & PropertyName,
     css::uno::Reference< css::beans::XVetoableChangeListener > const &
         aListener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     {
@@ -851,9 +807,6 @@ void Access::removeVetoableChangeListener(
     OUString const & PropertyName,
     css::uno::Reference< css::beans::XVetoableChangeListener > const &
         aListener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -874,9 +827,6 @@ void Access::removeVetoableChangeListener(
 void Access::setPropertyValues(
     css::uno::Sequence< OUString > const & aPropertyNames,
     css::uno::Sequence< css::uno::Any > const & aValues)
-    throw (
-        css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     Broadcaster bc;
@@ -908,7 +858,6 @@ void Access::setPropertyValues(
 
 css::uno::Sequence< css::uno::Any > Access::getPropertyValues(
     css::uno::Sequence< OUString > const & aPropertyNames)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -929,7 +878,6 @@ void Access::addPropertiesChangeListener(
     css::uno::Sequence< OUString > const &,
     css::uno::Reference< css::beans::XPropertiesChangeListener > const &
         xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     {
@@ -952,7 +900,6 @@ void Access::addPropertiesChangeListener(
 void Access::removePropertiesChangeListener(
     css::uno::Reference< css::beans::XPropertiesChangeListener > const &
         xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -967,7 +914,6 @@ void Access::firePropertiesChangeEvent(
     css::uno::Sequence< OUString > const & aPropertyNames,
     css::uno::Reference< css::beans::XPropertiesChangeListener > const &
         xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     css::uno::Sequence< css::beans::PropertyChangeEvent > events(
@@ -982,7 +928,7 @@ void Access::firePropertiesChangeEvent(
 }
 
 css::uno::Reference< css::beans::XHierarchicalPropertySetInfo >
-Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException, std::exception) {
+Access::getHierarchicalPropertySetInfo() {
     assert(thisIs(IS_GROUP));
     return this;
 }
@@ -990,10 +936,6 @@ Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException, std:
 void Access::setHierarchicalPropertyValue(
     OUString const & aHierarchicalPropertyName,
     css::uno::Any const & aValue)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     Broadcaster bc;
@@ -1021,10 +963,6 @@ void Access::setHierarchicalPropertyValue(
 
 css::uno::Any Access::getHierarchicalPropertyValue(
     OUString const & aHierarchicalPropertyName)
-    throw (
-        css::beans::UnknownPropertyException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -1040,9 +978,6 @@ css::uno::Any Access::getHierarchicalPropertyValue(
 void Access::setHierarchicalPropertyValues(
     css::uno::Sequence< OUString > const & aHierarchicalPropertyNames,
     css::uno::Sequence< css::uno::Any > const & Values)
-    throw (
-        css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     Broadcaster bc;
@@ -1079,9 +1014,6 @@ void Access::setHierarchicalPropertyValues(
 
 css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
     css::uno::Sequence< OUString > const & aHierarchicalPropertyNames)
-    throw (
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -1103,7 +1035,6 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
 
 css::beans::Property Access::getPropertyByHierarchicalName(
     OUString const & aHierarchicalName)
-    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -1117,7 +1048,6 @@ css::beans::Property Access::getPropertyByHierarchicalName(
 
 sal_Bool Access::hasPropertyByHierarchicalName(
     OUString const & aHierarchicalName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -1126,10 +1056,6 @@ sal_Bool Access::hasPropertyByHierarchicalName(
 
 void Access::replaceByName(
     OUString const & aName, css::uno::Any const & aElement)
-    throw (
-        css::lang::IllegalArgumentException,
-        css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_UPDATE));
     Broadcaster bc;
@@ -1170,10 +1096,6 @@ void Access::replaceByName(
 
 void Access::insertByName(
     OUString const & aName, css::uno::Any const & aElement)
-    throw (
-        css::lang::IllegalArgumentException,
-        css::container::ElementExistException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_EXTENSIBLE|IS_UPDATE));
     Broadcaster bc;
@@ -1233,9 +1155,6 @@ void Access::insertByName(
 }
 
 void Access::removeByName(OUString const & aName)
-    throw (
-        css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_EXTENSIBLE|IS_UPDATE));
     Broadcaster bc;
@@ -1270,7 +1189,6 @@ void Access::removeByName(OUString const & aName)
 }
 
 css::uno::Reference< css::uno::XInterface > Access::createInstance()
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_SET|IS_UPDATE));
     OUString tmplName(
@@ -1290,7 +1208,6 @@ css::uno::Reference< css::uno::XInterface > Access::createInstance()
 
 css::uno::Reference< css::uno::XInterface > Access::createInstanceWithArguments(
     css::uno::Sequence< css::uno::Any > const & aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_SET|IS_UPDATE));
     if (aArguments.getLength() != 0) {
@@ -1386,7 +1303,6 @@ void Access::clearListeners() throw() {
 }
 
 css::uno::Any Access::queryInterface(css::uno::Type const & aType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any res(OWeakObject::queryInterface(aType));
     if (res.hasValue()) {
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 5bd3a74f89c3..5fc8d183f5be 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -134,295 +134,179 @@ public:
     using OWeakObject::release;
 
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes() throw (css::uno::RuntimeException, std::exception) override;
+    getTypes() override;
 
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    getImplementationId() 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;
+    getSupportedServiceNames() override;
 
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     virtual void SAL_CALL addEventListener(
         css::uno::Reference< css::lang::XEventListener >
-            const & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const & xListener) override;
 
     virtual void SAL_CALL removeEventListener(
         css::uno::Reference< css::lang::XEventListener >
-            const & aListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const & aListener) override;
 
-    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;
 
     virtual css::uno::Any SAL_CALL getByName(
-        OUString const & aName)
-        throw (
-            css::container::NoSuchElementException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aName) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getElementNames() throw (css::uno::RuntimeException, std::exception) override;
+    getElementNames() override;
 
-    virtual sal_Bool SAL_CALL hasByName(OUString const & aName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName(OUString const & aName) override;
 
     virtual css::uno::Any SAL_CALL getByHierarchicalName(
-        OUString const & aName)
-        throw (
-            css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aName) override;
 
-    virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override;
 
     virtual void SAL_CALL replaceByHierarchicalName(
-        OUString const & aName, css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aName, css::uno::Any const & aElement) override;
 
     virtual void SAL_CALL addContainerListener(
         css::uno::Reference<
-            css::container::XContainerListener > const & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::container::XContainerListener > const & xListener) override;
 
     virtual void SAL_CALL removeContainerListener(
         css::uno::Reference<
-            css::container::XContainerListener > const & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::container::XContainerListener > const & xListener) override;
 
     virtual OUString SAL_CALL getExactName(
-        OUString const & aApproximateName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        OUString const & aApproximateName) override;
 
     virtual css::uno::Sequence< css::beans::Property >
-    SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getProperties() override;
 
     virtual css::beans::Property SAL_CALL getPropertyByName(
-        OUString const & aName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aName) override;
 
-    virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name) override;
 
-    virtual OUString SAL_CALL getHierarchicalName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getHierarchicalName() override;
 
     virtual OUString SAL_CALL composeHierarchicalName(
-        OUString const & aRelativeName)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::lang::NoSupportException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aRelativeName) override;
 
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
 
-    virtual void SAL_CALL setName(OUString const & aName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setName(OUString const & aName) override;
 
-    virtual css::beans::Property SAL_CALL getAsProperty()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::Property SAL_CALL getAsProperty() override;
 
     virtual
     css::uno::Reference< css::beans::XPropertySetInfo >
-    SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getPropertySetInfo() override;
 
     virtual void SAL_CALL setPropertyValue(
         OUString const & aPropertyName,
-        css::uno::Any const & aValue)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Any const & aValue) override;
 
     virtual css::uno::Any SAL_CALL getPropertyValue(
-        OUString const & PropertyName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & PropertyName) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
         OUString const & aPropertyName,
         css::uno::Reference<
-            css::beans::XPropertyChangeListener > const & xListener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            css::beans::XPropertyChangeListener > const & xListener) override;
 
     virtual void SAL_CALL removePropertyChangeListener(
         OUString const & aPropertyName,
         css::uno::Reference<
-            css::beans::XPropertyChangeListener > const & aListener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            css::beans::XPropertyChangeListener > const & aListener) override;
 
     virtual void SAL_CALL addVetoableChangeListener(
         OUString const & PropertyName,
         css::uno::Reference<
-            css::beans::XVetoableChangeListener > const & aListener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            css::beans::XVetoableChangeListener > const & aListener) override;
 
     virtual void SAL_CALL removeVetoableChangeListener(
         OUString const & PropertyName,
         css::uno::Reference<
-            css::beans::XVetoableChangeListener > const & aListener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            css::beans::XVetoableChangeListener > const & aListener) override;
 
     virtual void SAL_CALL setPropertyValues(
         css::uno::Sequence< OUString > const & aPropertyNames,
         css::uno::Sequence< css::uno::Any > const &
-            aValues)
-        throw (
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            aValues) override;
 
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL
     getPropertyValues(
-        css::uno::Sequence< OUString > const & aPropertyNames)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< OUString > const & aPropertyNames) override;
 
     virtual void SAL_CALL addPropertiesChangeListener(
         css::uno::Sequence< OUString > const & aPropertyNames,
         css::uno::Reference<
             css::beans::XPropertiesChangeListener > const &
-                xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+                xListener) override;
 
     virtual void SAL_CALL removePropertiesChangeListener(
         css::uno::Reference<
             css::beans::XPropertiesChangeListener > const &
-                xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+                xListener) override;
 
     virtual void SAL_CALL firePropertiesChangeEvent(
         css::uno::Sequence< OUString > const & aPropertyNames,
         css::uno::Reference<
             css::beans::XPropertiesChangeListener > const &
-                xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+                xListener) override;
 
     virtual
     css::uno::Reference<
         css::beans::XHierarchicalPropertySetInfo > SAL_CALL
-    getHierarchicalPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+    getHierarchicalPropertySetInfo() override;
 
     virtual void SAL_CALL setHierarchicalPropertyValue(
         OUString const & aHierarchicalPropertyName,
-        css::uno::Any const & aValue)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Any const & aValue) override;
 
     virtual css::uno::Any SAL_CALL getHierarchicalPropertyValue(
-        OUString const & aHierarchicalPropertyName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aHierarchicalPropertyName) override;
 
     virtual void SAL_CALL setHierarchicalPropertyValues(
         css::uno::Sequence< OUString > const &
             aHierarchicalPropertyNames,
         css::uno::Sequence< css::uno::Any > const &
-            Values)
-        throw (
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            Values) override;
 
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL
     getHierarchicalPropertyValues(
         css::uno::Sequence< OUString > const &
-            aHierarchicalPropertyNames)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            aHierarchicalPropertyNames) override;
 
     virtual css::beans::Property SAL_CALL
-    getPropertyByHierarchicalName(OUString const & aHierarchicalName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::uno::RuntimeException, std::exception) override;
+    getPropertyByHierarchicalName(OUString const & aHierarchicalName) override;
 
     virtual sal_Bool SAL_CALL hasPropertyByHierarchicalName(
-        OUString const & aHierarchicalName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        OUString const & aHierarchicalName) override;
 
     virtual void SAL_CALL replaceByName(
-        OUString const & aName, css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aName, css::uno::Any const & aElement) override;
 
     virtual void SAL_CALL insertByName(
-        OUString const & aName, css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::ElementExistException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL removeByName(OUString const & aName)
-        throw (
-            css::container::NoSuchElementException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aName, css::uno::Any const & aElement) override;
+
+    virtual void SAL_CALL removeByName(OUString const & aName) override;
 
     virtual css::uno::Reference< css::uno::XInterface >
-    SAL_CALL createInstance()
-        throw (
-            css::uno::Exception,
-            css::uno::RuntimeException, std::exception) override;
+    SAL_CALL createInstance() override;
 
     virtual css::uno::Reference< css::uno::XInterface >
     SAL_CALL createInstanceWithArguments(
         css::uno::Sequence< css::uno::Any > const &
-            aArguments)
-        throw (
-            css::uno::Exception,
-            css::uno::RuntimeException, std::exception) override;
+            aArguments) override;
 
 protected:
     explicit Access(Components & components);
@@ -443,8 +327,7 @@ protected:
     virtual void clearListeners() throw ();
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & aType)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & aType) override;
 
     Components & getComponents() const { return components_;}
 
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 2cde81159b4a..c38e58a4cd43 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -151,7 +151,6 @@ void ChildAccess::release() throw () {
 }
 
 css::uno::Reference< css::uno::XInterface > ChildAccess::getParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -160,7 +159,6 @@ css::uno::Reference< css::uno::XInterface > ChildAccess::getParent()
 }
 
 void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
-    throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -171,7 +169,6 @@ void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
 
 sal_Int64 ChildAccess::getSomething(
     css::uno::Sequence< sal_Int8 > const & aIdentifier)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -344,7 +341,6 @@ void ChildAccess::addSupportedServiceNames(
 }
 
 css::uno::Any ChildAccess::queryInterface(css::uno::Type const & aType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index dd81b251bb8b..5a0ab480ec0d 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -82,18 +82,13 @@ public:
     virtual void SAL_CALL release() throw () override;
 
     virtual css::uno::Reference< css::uno::XInterface >
-    SAL_CALL getParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getParent() override;
 
     virtual void SAL_CALL setParent(
-        css::uno::Reference< css::uno::XInterface > const &)
-        throw (
-            css::lang::NoSupportException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uno::XInterface > const &) override;
 
     virtual sal_Int64 SAL_CALL getSomething(
-        css::uno::Sequence< sal_Int8 > const & aIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< sal_Int8 > const & aIdentifier) override;
 
     void bind(
         rtl::Reference< RootAccess > const & root,
@@ -127,8 +122,7 @@ private:
         std::vector<OUString> * services) override;
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & aType)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & aType) override;
 
     rtl::Reference< RootAccess > root_;
     rtl::Reference< Access > parent_; // null if free node
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index e4454a4c02a3..f093e9f684bc 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -117,20 +117,18 @@ private:
 
     virtual void SAL_CALL disposing() override { flushModifications(); }
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return default_
             ? default_provider::getImplementationName()
             : configuration_provider::getImplementationName();
     }
 
-    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
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     {
         return default_
             ? default_provider::getSupportedServiceNames()
@@ -138,43 +136,35 @@ private:
     }
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
-        OUString const & aServiceSpecifier)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        OUString const & aServiceSpecifier) override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithArguments(
         OUString const & ServiceSpecifier,
-        css::uno::Sequence< css::uno::Any > const & Arguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< css::uno::Any > const & Arguments) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    getAvailableServiceNames() override;
 
-    virtual void SAL_CALL refresh() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh() override;
 
     virtual void SAL_CALL addRefreshListener(
-        css::uno::Reference< css::util::XRefreshListener > const & l)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::util::XRefreshListener > const & l) override;
 
     virtual void SAL_CALL removeRefreshListener(
-        css::uno::Reference< css::util::XRefreshListener > const & l)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::util::XRefreshListener > const & l) override;
 
-    virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL flush() override;
 
     virtual void SAL_CALL addFlushListener(
-        css::uno::Reference< css::util::XFlushListener > const & l)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::util::XFlushListener > const & l) override;
 
     virtual void SAL_CALL removeFlushListener(
-        css::uno::Reference< css::util::XFlushListener > const & l)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::util::XFlushListener > const & l) override;
 
-    virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale) override;
 
-    virtual css::lang::Locale SAL_CALL getLocale()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
 
     void flushModifications() const;
 
@@ -186,7 +176,6 @@ private:
 
 css::uno::Reference< css::uno::XInterface > Service::createInstance(
     OUString const & aServiceSpecifier)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArguments(
         aServiceSpecifier, css::uno::Sequence< css::uno::Any >());
@@ -196,7 +185,6 @@ css::uno::Reference< css::uno::XInterface >
 Service::createInstanceWithArguments(
     OUString const & ServiceSpecifier,
     css::uno::Sequence< css::uno::Any > const & Arguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     OUString nodepath;
     OUString locale;
@@ -284,7 +272,6 @@ Service::createInstanceWithArguments(
 }
 
 css::uno::Sequence< OUString > Service::getAvailableServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > names(2);
     names[0] = accessServiceName;
@@ -292,7 +279,7 @@ css::uno::Sequence< OUString > Service::getAvailableServiceNames()
     return names;
 }
 
-void Service::refresh() throw (css::uno::RuntimeException, std::exception) {
+void Service::refresh() {
     //TODO
     cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer(
         cppu::UnoType< css::util::XRefreshListener >::get());
@@ -304,7 +291,6 @@ void Service::refresh() throw (css::uno::RuntimeException, std::exception) {
 
 void Service::addRefreshListener(
     css::uno::Reference< css::util::XRefreshListener > const & l)
-    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.addListener(
         cppu::UnoType< css::util::XRefreshListener >::get(), l);
@@ -312,13 +298,12 @@ void Service::addRefreshListener(
 
 void Service::removeRefreshListener(
     css::uno::Reference< css::util::XRefreshListener > const & l)
-    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener(
         cppu::UnoType< css::util::XRefreshListener >::get(), l);
 }
 
-void Service::flush() throw (css::uno::RuntimeException, std::exception) {
+void Service::flush() {
     flushModifications();
     cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer(
         cppu::UnoType< css::util::XFlushListener >::get());
@@ -330,27 +315,24 @@ void Service::flush() throw (css::uno::RuntimeException, std::exception) {
 
 void Service::addFlushListener(
     css::uno::Reference< css::util::XFlushListener > const & l)
-    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.addListener(cppu::UnoType< css::util::XFlushListener >::get(), l);
 }
 
 void Service::removeFlushListener(
     css::uno::Reference< css::util::XFlushListener > const & l)
-    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener(
         cppu::UnoType< css::util::XFlushListener >::get(), l);
 }
 
 void Service::setLocale(css::lang::Locale const & eLocale)
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(*lock_);
     locale_ = LanguageTag::convertToBcp47( eLocale, false);
 }
 
-css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException, std::exception) {
+css::lang::Locale Service::getLocale() {
     osl::MutexGuard guard(*lock_);
     css::lang::Locale loc;
     if (! locale_.isEmpty()) {
@@ -383,31 +365,26 @@ private:
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithContext(
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uno::XComponentContext > const & Context) override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithArgumentsAndContext(
         css::uno::Sequence< css::uno::Any > const & Arguments,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uno::XComponentContext > const & Context) override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return configuration_provider::getImplementationName(); }
 
-    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
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     { return configuration_provider::getSupportedServiceNames(); }
 };
 
 css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArgumentsAndContext(
         css::uno::Sequence< css::uno::Any >(), Context);
@@ -417,7 +394,6 @@ css::uno::Reference< css::uno::XInterface >
 Factory::createInstanceWithArgumentsAndContext(
     css::uno::Sequence< css::uno::Any > const & Arguments,
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     if (Arguments.getLength() == 0) {
         return css::configuration::theDefaultProvider::get(Context);
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 5370f036cde5..2f23577ba2ba 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -80,60 +80,41 @@ private:
 
     virtual ~Service() override {}
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return configuration_registry::getImplementationName(); }
 
-    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
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     { return configuration_registry::getSupportedServiceNames(); }
 
-    virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getURL() override;
 
     virtual void SAL_CALL open(
-        OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & rURL, sal_Bool bReadOnly, sal_Bool) override;
 
-    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isValid() override;
 
-    virtual void SAL_CALL close()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close() override;
 
-    virtual void SAL_CALL destroy()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL destroy() override;
 
     virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
-    getRootKey()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    getRootKey() override;
 
-    virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
 
-    virtual void SAL_CALL mergeKey(OUString const &, OUString const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::MergeConflictException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mergeKey(OUString const &, OUString const &) override;
 
-    virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL flush() override;
 
     virtual void SAL_CALL addFlushListener(
-        css::uno::Reference< css::util::XFlushListener > const &)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::util::XFlushListener > const &) override;
 
     virtual void SAL_CALL removeFlushListener(
-        css::uno::Reference< css::util::XFlushListener > const &)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::util::XFlushListener > const &) override;
 
     void checkValid();
 
@@ -163,155 +144,73 @@ private:
 
     virtual ~RegistryKey() override {}
 
-    virtual OUString SAL_CALL getKeyName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getKeyName() override;
 
-    virtual sal_Bool SAL_CALL isReadOnly()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
 
-    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isValid() override;
 
     virtual css::registry::RegistryKeyType SAL_CALL getKeyType(
-        OUString const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
-
-    virtual css::registry::RegistryValueType SAL_CALL getValueType()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Int32 SAL_CALL getLongValue()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL setLongValue(sal_Int32)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+        OUString const &) override;
+
+    virtual css::registry::RegistryValueType SAL_CALL getValueType() override;
+
+    virtual sal_Int32 SAL_CALL getLongValue() override;
+
+    virtual void SAL_CALL setLongValue(sal_Int32) override;
+
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() override;
 
     virtual void SAL_CALL setLongListValue(
-        css::uno::Sequence< sal_Int32 > const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL getAsciiValue()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL setAsciiValue(OUString const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< sal_Int32 > const &) override;
+
+    virtual OUString SAL_CALL getAsciiValue() override;
+
+    virtual void SAL_CALL setAsciiValue(OUString const &) override;
+
+    virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() override;
 
     virtual void SAL_CALL setAsciiListValue(
-        css::uno::Sequence< OUString > const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL getStringValue()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL setStringValue(OUString const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< OUString > const &) override;
+
+    virtual OUString SAL_CALL getStringValue() override;
+
+    virtual void SAL_CALL setStringValue(OUString const &) override;
+
+    virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() override;
 
     virtual void SAL_CALL setStringListValue(
-        css::uno::Sequence< OUString > const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< OUString > const &) override;
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() override;
 
-    virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &) override;
 
     virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey(
-        OUString const & aKeyName)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aKeyName) override;
 
     virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
-    createKey(OUString const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    createKey(OUString const &) override;
 
-    virtual void SAL_CALL closeKey()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL closeKey() override;
 
-    virtual void SAL_CALL deleteKey(OUString const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL deleteKey(OUString const &) override;
 
     virtual
     css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
-    SAL_CALL openKeys()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    SAL_CALL openKeys() override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() override;
 
     virtual sal_Bool SAL_CALL createLink(
-        OUString const &, OUString const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const &, OUString const &) override;
 
-    virtual void SAL_CALL deleteLink(OUString const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL deleteLink(OUString const &) override;
 
-    virtual OUString SAL_CALL getLinkTarget(OUString const &)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getLinkTarget(OUString const &) override;
 
     virtual OUString SAL_CALL getResolvedName(
-        OUString const & aKeyName)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aKeyName) override;
 
     Service & service_;
     css::uno::Any value_;
@@ -338,14 +237,13 @@ Service::Service(
     }
 }
 
-OUString Service::getURL() throw (css::uno::RuntimeException, std::exception) {
+OUString Service::getURL() {
     osl::MutexGuard g(mutex_);
     checkValid_RuntimeException();
     return url_;
 }
 
 void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     //TODO: bCreate
     osl::MutexGuard g(mutex_);
@@ -373,13 +271,12 @@ void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
     readOnly_ = bReadOnly;
 }
 
-sal_Bool Service::isValid() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool Service::isValid() {
     osl::MutexGuard g(mutex_);
     return access_.is();
 }
 
 void Service::close()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(mutex_);
     checkValid();
@@ -387,7 +284,6 @@ void Service::close()
 }
 
 void Service::destroy()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -395,30 +291,26 @@ void Service::destroy()
 }
 
 css::uno::Reference< css::registry::XRegistryKey > Service::getRootKey()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(mutex_);
     checkValid();
     return new RegistryKey(*this, css::uno::makeAny(access_));
 }
 
-sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool Service::isReadOnly() {
     osl::MutexGuard g(mutex_);
     checkValid_RuntimeException();
     return readOnly_;
 }
 
 void Service::mergeKey(OUString const &, OUString const &)
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::MergeConflictException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
         static_cast< cppu::OWeakObject * >(this));
 }
 
-void Service::flush() throw (css::uno::RuntimeException, std::exception)
+void Service::flush()
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -427,7 +319,6 @@ void Service::flush() throw (css::uno::RuntimeException, std::exception)
 
 void Service::addFlushListener(
     css::uno::Reference< css::util::XFlushListener > const &)
-    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -436,7 +327,6 @@ void Service::addFlushListener(
 
 void Service::removeFlushListener(
     css::uno::Reference< css::util::XFlushListener > const &)
-    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -463,7 +353,7 @@ void Service::doClose() {
     access_.clear();
 }
 
-OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException, std::exception) {
+OUString RegistryKey::getKeyName() {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
     css::uno::Reference< css::container::XNamed > named;
@@ -476,19 +366,17 @@ OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException, std::excep
 }
 
 sal_Bool RegistryKey::isReadOnly()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
     return service_.readOnly_; //TODO: read-only sub-nodes in update access?
 }
 
-sal_Bool RegistryKey::isValid() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool RegistryKey::isValid() {
     return service_.isValid();
 }
 
 css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -496,7 +384,6 @@ css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &)
 }
 
 css::registry::RegistryValueType RegistryKey::getValueType()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -524,9 +411,6 @@ css::registry::RegistryValueType RegistryKey::getValueType()
 }
 
 sal_Int32 RegistryKey::getLongValue()
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -540,7 +424,6 @@ sal_Int32 RegistryKey::getLongValue()
 }
 
 void RegistryKey::setLongValue(sal_Int32)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -548,9 +431,6 @@ void RegistryKey::setLongValue(sal_Int32)
 }
 
 css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue()
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -564,7 +444,6 @@ css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue()
 }
 
 void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -572,9 +451,6 @@ void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &)
 }
 
 OUString RegistryKey::getAsciiValue()
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -588,7 +464,6 @@ OUString RegistryKey::getAsciiValue()
 }
 
 void RegistryKey::setAsciiValue(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -596,9 +471,6 @@ void RegistryKey::setAsciiValue(OUString const &)
 }
 
 css::uno::Sequence< OUString > RegistryKey::getAsciiListValue()
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -612,7 +484,6 @@ css::uno::Sequence< OUString > RegistryKey::getAsciiListValue()
 }
 
 void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -620,9 +491,6 @@ void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &)
 }
 
 OUString RegistryKey::getStringValue()
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -636,7 +504,6 @@ OUString RegistryKey::getStringValue()
 }
 
 void RegistryKey::setStringValue(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -644,9 +511,6 @@ void RegistryKey::setStringValue(OUString const &)
 }
 
 css::uno::Sequence< OUString > RegistryKey::getStringListValue()
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -661,7 +525,6 @@ css::uno::Sequence< OUString > RegistryKey::getStringListValue()
 
 void RegistryKey::setStringListValue(
     css::uno::Sequence< OUString > const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -669,9 +532,6 @@ void RegistryKey::setStringListValue(
 }
 
 css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue()
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -685,7 +545,6 @@ css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue()
 }
 
 void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -694,7 +553,6 @@ void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
 
 css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey(
     OUString const & aKeyName)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
@@ -710,8 +568,6 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey(
 
 css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey(
     OUString const &)
-    throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -719,15 +575,12 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey(
 }
 
 void RegistryKey::closeKey()
-    throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
 }
 
 void RegistryKey::deleteKey(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -736,7 +589,6 @@ void RegistryKey::deleteKey(OUString const &)
 
 css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
 RegistryKey::openKeys()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -744,7 +596,6 @@ RegistryKey::openKeys()
 }
 
 css::uno::Sequence< OUString > RegistryKey::getKeyNames()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -752,7 +603,6 @@ css::uno::Sequence< OUString > RegistryKey::getKeyNames()
 }
 
 sal_Bool RegistryKey::createLink(OUString const &, OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
@@ -760,14 +610,12 @@ sal_Bool RegistryKey::createLink(OUString const &, OUString const &)
 }
 
 void RegistryKey::deleteLink(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
 }
 
 OUString RegistryKey::getLinkTarget(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
@@ -775,7 +623,6 @@ OUString RegistryKey::getLinkTarget(OUString const &)
 }
 
 OUString RegistryKey::getResolvedName(OUString const & aKeyName)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index 9ff6c10acfa7..b14ad3dc59b8 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -56,30 +56,24 @@ private:
 
     virtual ~Service() override {}
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return read_only_access::getImplementationName(); }
 
-    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
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     { return read_only_access::getSupportedServiceNames(); }
 
     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 css::uno::Any SAL_CALL getByHierarchicalName(
-        OUString const & aName)
-        throw (
-            css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override
+        OUString const & aName) override
     { return getRoot()->getByHierarchicalName(aName); }
 
-    virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override
     { return getRoot()->hasByHierarchicalName(aName); }
 
     rtl::Reference< RootAccess > getRoot();
@@ -91,7 +85,6 @@ private:
 };
 
 void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     OUString locale;
     if (aArguments.getLength() != 1 || !(aArguments[0] >>= locale)) {
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index 9ebf2f9dee65..422451c3e319 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -58,63 +58,46 @@ private:
 
     virtual ~Service() override {}
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return read_write_access::getImplementationName(); }
 
-    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
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     { return read_write_access::getSupportedServiceNames(); }
 
     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 css::uno::Any SAL_CALL getByHierarchicalName(
-        OUString const & aName)
-        throw (
-            css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override
+        OUString const & aName) override
     { return getRoot()->getByHierarchicalName(aName); }
 
-    virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override
     { return getRoot()->hasByHierarchicalName(aName); }
 
     virtual void SAL_CALL replaceByHierarchicalName(
-        OUString const & aName, css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        OUString const & aName, css::uno::Any const & aElement) override
     { getRoot()->replaceByHierarchicalName(aName, aElement); }
 
-    virtual void SAL_CALL commitChanges()
-        throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL commitChanges() override
     { getRoot()->commitChanges(); }
 
-    virtual sal_Bool SAL_CALL hasPendingChanges()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasPendingChanges() override
     { return getRoot()->hasPendingChanges(); }
 
-    virtual css::util::ChangesSet SAL_CALL getPendingChanges()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::util::ChangesSet SAL_CALL getPendingChanges() override
     { return getRoot()->getPendingChanges(); }
 
     css::beans::Property SAL_CALL getPropertyByHierarchicalName(
         OUString const & aHierarchicalName)
-        throw (
-            css::beans::UnknownPropertyException, css::uno::RuntimeException,
-            std::exception)
         override
     { return getRoot()->getPropertyByHierarchicalName(aHierarchicalName); }
 
     sal_Bool SAL_CALL hasPropertyByHierarchicalName(
-        OUString const & aHierarchicalName)
-        throw (css::uno::RuntimeException, std::exception) override
+        OUString const & aHierarchicalName) override
     { return getRoot()->hasPropertyByHierarchicalName(aHierarchicalName); }
 
     rtl::Reference< RootAccess > getRoot();
@@ -126,7 +109,6 @@ private:
 };
 
 void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     OUString locale;
     if (aArguments.getLength() != 1 || !(aArguments[0] >>= locale)) {
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 3d4bbd5b4345..ec47b20cb9b8 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -113,7 +113,6 @@ void RootAccess::setAlive(bool b) {
 
 void RootAccess::addChangesListener(
     css::uno::Reference< css::util::XChangesListener > const & aListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     {
@@ -136,7 +135,6 @@ void RootAccess::addChangesListener(
 
 void RootAccess::removeChangesListener(
     css::uno::Reference< css::util::XChangesListener > const & aListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -148,9 +146,6 @@ void RootAccess::removeChangesListener(
 }
 
 void RootAccess::commitChanges()
-    throw (css::lang::WrappedTargetException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     assert(thisIs(IS_UPDATE));
     if (!alive_)
@@ -176,7 +171,7 @@ void RootAccess::commitChanges()
     bc.send();
 }
 
-sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool RootAccess::hasPendingChanges() {
     assert(thisIs(IS_UPDATE));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -187,7 +182,6 @@ sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException, std:
 }
 
 css::util::ChangesSet RootAccess::getPendingChanges()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_UPDATE));
     osl::MutexGuard g(*lock_);
@@ -289,7 +283,6 @@ void RootAccess::clearListeners() throw() {
 }
 
 css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -311,7 +304,6 @@ css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
 }
 
 OUString RootAccess::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index b0efeeeab842..1f4203ba9803 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -80,25 +80,17 @@ public:
 
     virtual void SAL_CALL addChangesListener(
         css::uno::Reference< css::util::XChangesListener >
-            const & aListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const & aListener) override;
 
     virtual void SAL_CALL removeChangesListener(
         css::uno::Reference< css::util::XChangesListener >
-            const & aListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const & aListener) override;
 
-    virtual void SAL_CALL commitChanges()
-        throw (
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException,
-            std::exception) override;
+    virtual void SAL_CALL commitChanges() override;
 
-    virtual sal_Bool SAL_CALL hasPendingChanges()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasPendingChanges() override;
 
-    virtual css::util::ChangesSet SAL_CALL getPendingChanges()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::ChangesSet SAL_CALL getPendingChanges() override;
 
 private:
     virtual ~RootAccess() override;
@@ -128,11 +120,9 @@ private:
     virtual void clearListeners() throw () override;
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & aType)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & aType) override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     typedef
         std::multiset<
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 43cc4dd40430..a830dd616f73 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -74,23 +74,17 @@ private:
     virtual ~Service() override {}
 
     virtual void SAL_CALL insertExtensionXcsFile(
-        sal_Bool shared, OUString const & fileUri)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool shared, OUString const & fileUri) override;
 
     virtual void SAL_CALL insertExtensionXcuFile(
-        sal_Bool shared, OUString const & fileUri)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        sal_Bool shared, OUString const & fileUri) override;
 
-    virtual void SAL_CALL removeExtensionXcuFile(OUString const & fileUri)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL removeExtensionXcuFile(OUString const & fileUri) override;
 
     virtual void SAL_CALL insertModificationXcuFile(
         OUString const & fileUri,
         css::uno::Sequence< OUString > const & includedPaths,
-        css::uno::Sequence< OUString > const & excludedPaths)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< OUString > const & excludedPaths) override;
 
     std::shared_ptr<osl::Mutex> lock_;
     css::uno::Reference< css::uno::XComponentContext > context_;
@@ -98,7 +92,6 @@ private:
 
 void Service::insertExtensionXcsFile(
     sal_Bool shared, OUString const & fileUri)
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(*lock_);
     Components::getSingleton(context_).insertExtensionXcsFile(shared, fileUri);
@@ -106,8 +99,6 @@ void Service::insertExtensionXcsFile(
 
 void Service::insertExtensionXcuFile(
     sal_Bool shared, OUString const & fileUri)
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
     Broadcaster bc;
     {
@@ -122,7 +113,6 @@ void Service::insertExtensionXcuFile(
 }
 
 void Service::removeExtensionXcuFile(OUString const & fileUri)
-    throw (css::uno::RuntimeException, std::exception)
 {
     Broadcaster bc;
     {
@@ -140,7 +130,6 @@ void Service::insertModificationXcuFile(
     OUString const & fileUri,
     css::uno::Sequence< OUString > const & includedPaths,
     css::uno::Sequence< OUString > const & excludedPaths)
-    throw (css::uno::RuntimeException, std::exception)
 {
     Broadcaster bc;
     {
diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx
index 396e3567490f..05e047b9ec72 100644
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
@@ -29,19 +29,19 @@ BlobHelper::BlobHelper(const css::uno::Sequence< sal_Int8 >& _val) : m_aValue(_v
 {
 }
 
-::sal_Int64 SAL_CALL BlobHelper::length(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL BlobHelper::length(  )
 {
     return m_aValue.getLength();
 }
 
-css::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length )
 {
     if ( sal_Int32(pos + _length) > m_aValue.getLength() )
         throw css::sdbc::SQLException();
     return css::uno::Sequence< ::sal_Int8 >(m_aValue.getConstArray() + sal_Int32(pos),_length);
 }
 
-css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream(  )
 {
     return new ::comphelper::SequenceInputStream(m_aValue);
 }
@@ -53,13 +53,13 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStrea
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
-::sal_Int64 SAL_CALL BlobHelper::position( const css::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL BlobHelper::position( const css::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XBlob::position", *this );
     return 0;
 }
 
-::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XBlob::positionOfBlob", *this );
     return 0;
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index f28c0e8ab538..2e8be47952bf 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -105,13 +105,13 @@ OConnectionWrapper::~OConnectionWrapper()
 
 // XServiceInfo
 
-OUString SAL_CALL OConnectionWrapper::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OConnectionWrapper::getImplementationName(  )
 {
     return OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" );
 }
 
 
-css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames(  )
 {
     // first collect the services which are supported by our aggregate
     Sequence< OUString > aSupported;
@@ -132,19 +132,19 @@ css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceN
 }
 
 
-sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
 
-Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType )
 {
     Any aReturn = OConnection_BASE::queryInterface(_rType);
     return aReturn.hasValue() ? aReturn : (m_xProxyConnection.is() ? m_xProxyConnection->queryAggregation(_rType) : aReturn);
 }
 
-Sequence< Type > SAL_CALL OConnectionWrapper::getTypes(  ) throw (css::uno::RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OConnectionWrapper::getTypes(  )
 {
     return ::comphelper::concatSequences(
         OConnection_BASE::getTypes(),
@@ -153,7 +153,7 @@ Sequence< Type > SAL_CALL OConnectionWrapper::getTypes(  ) throw (css::uno::Runt
 }
 
 // css::lang::XUnoTunnel
-sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId )
 {
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast< sal_Int64 >( this );
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 1986adc5e08e..209332ebeb38 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -234,7 +234,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
                                 const OUString& rString,
                                 sal_Int32 nKey,
                                 sal_Int16 nFieldType,
-                                sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException)
+                                sal_Int16 nKeyType)
 {
     if (!rString.isEmpty())
     {
@@ -332,7 +332,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
 void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
                                 const Date& rNullDate,
                                 const double& rValue,
-                                sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException)
+                                sal_Int16 nKeyType)
 {
     switch (nKeyType & ~NumberFormat::DEFINED)
     {
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index f3192a1e4e4e..d8e847711f8d 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -141,13 +141,13 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
     ODatabaseMetaDataResultSet_BASE::release();
 }
 
-Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType )
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType);
 }
 
-Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
                                     cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -163,7 +163,7 @@ void ODatabaseMetaDataResultSet::setRows(const ORows& _rRows)
     m_bEOF = m_aRows.empty();
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -187,78 +187,78 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum
 #endif
 }
 
-void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException)
+void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex )
 {
     if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
         ::dbtools::throwInvalidIndexException(*this);
 }
 
-Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
-Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex )
 {
     return bool(getValue(columnIndex));
 }
 
 
-sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow(  )
 {
     return 0;
 }
 
 
-sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -270,60 +270,60 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData
     return m_xMetaData;
 }
 
-Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     return getValue(columnIndex).makeAny();
 }
 
 
-sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  )
 {
     return m_bEOF;
 }
@@ -331,13 +331,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
@@ -346,18 +346,18 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, Run
 SAL_WNOUNREACHABLE_CODE_POP
 
 
-void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
 }
 
 
-void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -370,32 +370,32 @@ void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeE
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
@@ -404,7 +404,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, R
 SAL_WNOUNREACHABLE_CODE_POP
 
 
-Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  )
 {
     return m_aStatement.get();
 }
@@ -412,19 +412,19 @@ Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  ) th
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  )
 {
     ::dbtools::throwFunctionSequenceException(*this);
     return false;
@@ -433,13 +433,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException,
 SAL_WNOUNREACHABLE_CODE_POP
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  )
 {
     return m_bBOF;
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -468,7 +468,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, Runti
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -480,20 +480,20 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, Ru
     return (*m_aRowsIter)[m_nColPos]->getValue().isNull();
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  )
 {
 }
 
 
-void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::cancel(  )
 {
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  )
 {
 }
 
-Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  )
 {
     return Any();
 }
@@ -638,7 +638,7 @@ void ODatabaseMetaDataResultSet::setImportedKeysMap()
     m_xMetaData = pMetaData;
 }
 
-Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
@@ -747,7 +747,7 @@ ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getQuoteValue()
     return aValueRef;
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aArguments )
 {
     if ( _aArguments.getLength() == 2 )
     {
@@ -845,28 +845,28 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
 // XServiceInfo
 
 
-    OUString ODatabaseMetaDataResultSet::getImplementationName_Static(  ) throw(RuntimeException)
+    OUString ODatabaseMetaDataResultSet::getImplementationName_Static(  )
     {
         return OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet");
     }
 
-    Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+    Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static(  )
     {
         Sequence<OUString> aSNS { "com.sun.star.sdbc.ResultSet" };
         return aSNS;
     }
 
-    OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName(  )
     {
         return getImplementationName_Static();
     }
 
-    sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_Static();
     }
@@ -874,7 +874,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
     namespace connectivity
     {
         /// @throws Exception
-        Reference< XInterface >  SAL_CALL ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& ) throw( Exception )
+        Reference< XInterface >  SAL_CALL ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& )
         {
             return *(new ODatabaseMetaDataResultSet());
         }
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 99479ca760f0..bfa88bd36c8d 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -34,7 +34,7 @@ ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData()
 {
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnDisplaySize();
@@ -42,99 +42,99 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnType();
     return 1;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  )
 {
     return m_mColumns.size();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isCaseSensitive();
     return true;
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnName();
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getTableName();
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnTypeName();
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnLabel();
     return getColumnName(column);
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnServiceName();
     return OUString();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isCurrency();
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isAutoIncrement();
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isSigned();
     return false;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getPrecision();
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getScale();
@@ -142,7 +142,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 colum
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isNullable();
@@ -150,24 +150,24 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col
     return sal_Int32(false);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isSearchable();
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column )
 {
     return isDefinitelyWritable(column);
 }
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 59d24110c09b..c44b8f34b808 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -31,7 +31,7 @@ namespace connectivity
     ParameterSubstitution::ParameterSubstitution(const css::uno::Reference< css::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext)
     {
     }
-    void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception)
+    void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments )
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         comphelper::SequenceAsHashMap aArgs(_aArguments);
@@ -40,27 +40,27 @@ namespace connectivity
         m_xConnection = xConnection;
     }
 
-    OUString ParameterSubstitution::getImplementationName_Static(  ) throw(RuntimeException)
+    OUString ParameterSubstitution::getImplementationName_Static(  )
     {
         return OUString("org.openoffice.comp.helper.ParameterSubstitution");
     }
 
-    OUString SAL_CALL ParameterSubstitution::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL ParameterSubstitution::getImplementationName(  )
     {
         return getImplementationName_Static();
     }
 
-    sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_Static();
     }
 
-    Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+    Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static(  )
     {
         Sequence<OUString> aSNS { "com.sun.star.sdb.ParameterSubstitution" };
         return aSNS;
@@ -72,7 +72,7 @@ namespace connectivity
         return *(new ParameterSubstitution(_xContext));
     }
 
-    OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ )
     {
         OUString sRet = _sText;
         uno::Reference< sdbc::XConnection > xConnection = m_xConnection;
@@ -99,12 +99,12 @@ namespace connectivity
         return sRet;
     }
 
-    OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText )
     {
         return _sText;
     }
 
-    OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ )
     {
         throw container::NoSuchElementException();
     }
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 6cf821be8110..1b13ea4a2d62 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -151,7 +151,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName)
 }
 
 
-void OColumnsHelper::impl_refresh() throw(RuntimeException)
+void OColumnsHelper::impl_refresh()
 {
     if ( m_pTable )
     {
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index 7e34c98116d0..6853a69fac63 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -56,7 +56,7 @@ void OMetaConnection::disposing()
     m_aStatements.clear();
 }
 //XUnoTunnel
-sal_Int64 SAL_CALL OMetaConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw (css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL OMetaConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         ? reinterpret_cast< sal_Int64 >( this )
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 4d8b74d7a583..d8d426b1182d 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -68,20 +68,20 @@ ODatabaseMetaDataBase::~ODatabaseMetaDataBase()
 }
 
 
-Sequence< PropertyValue > SAL_CALL ODatabaseMetaDataBase::getConnectionInfo(  ) throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL ODatabaseMetaDataBase::getConnectionInfo(  )
 {
     return m_aConnectionInfo;
 }
 
 
-void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ )
 {
     // cut off all references to the connection
 m_xConnection.clear();
 m_xListenerHelper.clear();
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_aTypeInfoRows.empty() )
@@ -169,33 +169,33 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getExportedKeys(
-        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys );
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getImportedKeys(
-        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys );
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getPrimaryKeys(
-        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys );
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getIndexInfo(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/,
-        sal_Bool /*unique*/, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException, std::exception)
+        sal_Bool /*unique*/, sal_Bool /*approximate*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo );
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getBestRowIdentifier(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, sal_Int32 /*scope*/,
-        sal_Bool /*nullable*/ ) throw(SQLException, RuntimeException, std::exception)
+        sal_Bool /*nullable*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier );
 }
@@ -203,120 +203,120 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getBestRowIdentifier(
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCrossReference(
         const Any& /*primaryCatalog*/, const OUString& /*primarySchema*/,
         const OUString& /*primaryTable*/, const Any& /*foreignCatalog*/,
-        const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/ ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference );
 }
 
-Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection(  )
 {
     return m_xConnection;
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedureColumns(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/,
-        const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns );
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedures(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/,
-        const OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& /*procedureNamePattern*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures );
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getVersionColumns(
-        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns );
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas(  )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas );
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getColumnPrivileges(
         const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/,
-        const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& /*columnNamePattern*/ )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges );
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTablePrivileges(
-        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/) throw(SQLException, RuntimeException, std::exception)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs(  )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs );
 }
 
-OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString(  )
 {
     return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart(  )
 {
     return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
 }
 
-OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator(  )
 {
     return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions(  )
 {
     return callImplMethod(m_supportsCatalogsInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw));
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions(  )
 {
     return callImplMethod(m_supportsSchemasInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw));
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation(  )
 {
     return callImplMethod(m_supportsCatalogsInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw));
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation(  )
 {
     return callImplMethod(m_supportsSchemasInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw));
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers(  )
 {
     return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw));
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn(  )
 {
     return callImplMethod(m_supportsAlterTableWithAddColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw));
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn(  )
 {
     return callImplMethod(m_supportsAlterTableWithDropColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw));
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements(  )
 {
     return callImplMethod(m_MaxStatements,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw));
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect(  )
 {
     return callImplMethod(m_MaxTablesInSelect,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw));
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers(  )
 {
     return callImplMethod(m_storesMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw));
 }
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 4aa37e197144..3d19c026ec1d 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -110,7 +110,7 @@ Reference< XPropertySet > OIndexColumns::createDescriptor()
     return new OIndexColumn(true);
 }
 
-void OIndexColumns::impl_refresh() throw(RuntimeException)
+void OIndexColumns::impl_refresh()
 {
     m_pIndex->refreshColumns();
 }
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 81858e3c433b..66a7ccb6078d 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -110,7 +110,7 @@ sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName)
     return xRet;
 }
 
-void OIndexesHelper::impl_refresh() throw(RuntimeException)
+void OIndexesHelper::impl_refresh()
 {
     m_pTable->refreshIndexes();
 }
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 6a71ff72088f..423529da466a 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -126,7 +126,7 @@ Reference< XPropertySet > OKeyColumnsHelper::createDescriptor()
     return new OKeyColumn(isCaseSensitive());
 }
 
-void OKeyColumnsHelper::impl_refresh() throw(css::uno::RuntimeException)
+void OKeyColumnsHelper::impl_refresh()
 {
     m_pKey->refreshColumns();
 }
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 03ddf7e2ca66..e9834d080387 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -68,7 +68,7 @@ sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName)
     return xRet;
 }
 
-void OKeysHelper::impl_refresh() throw(RuntimeException)
+void OKeysHelper::impl_refresh()
 {
     m_pTable->refreshKeys();
 }
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 96d1732f8c04..2d5e142d8eb2 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -114,7 +114,7 @@ m_xTables.clear();
 m_xRow.clear();
 }
 
-sal_Bool SAL_CALL OResultSetPrivileges::next(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetPrivileges::next(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index f6a45d4bacc1..7d20c75e7573 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -66,17 +66,17 @@ public:
     // noncopyable
     OTableContainerListener(const OTableContainerListener&) = delete;
     const OTableContainerListener& operator=(const OTableContainerListener&) = delete;
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& /*Event*/ ) override
     {
     }
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override
     {
         OUString sName;
         Event.Accessor  >>= sName;
         if ( m_aRefNames.find(sName) != m_aRefNames.end() )
             m_pComponent->refreshKeys();
     }
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override
     {
         OUString sOldComposedName,sNewComposedName;
         Event.ReplacedElement   >>= sOldComposedName;
@@ -85,7 +85,7 @@ public:
             m_pComponent->refreshKeys();
     }
     // XEventListener
-    virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) override
     {
     }
     void clear() { m_pComponent = nullptr; }
@@ -492,7 +492,7 @@ OUString OTableHelper::getRenameStart() const
 }
 
 // XRename
-void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL OTableHelper::rename( const OUString& newName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
@@ -542,7 +542,7 @@ Reference< XDatabaseMetaData> OTableHelper::getMetaData() const
     return m_pImpl->m_xMetaData;
 }
 
-void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
@@ -560,7 +560,7 @@ void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference
 }
 
 
-OUString SAL_CALL OTableHelper::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OTableHelper::getName()
 {
     OUString sComposedName;
     sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,false,::dbtools::EComposeRule::InDataManipulation);
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 5db4fbe0d518..03133dcf23e5 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -124,7 +124,7 @@ namespace dbtools
     }
 
 
-    void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent )
     {
         if ( _rEvent.PropertyName == ACTIVE_CONNECTION_PROPERTY_NAME )
         {   // somebody set a new ActiveConnection
@@ -176,7 +176,7 @@ namespace dbtools
     }
 
 
-    void SAL_CALL OAutoConnectionDisposer::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAutoConnectionDisposer::disposing( const EventObject& _rSource )
     {
         // the rowset is being disposed, and nobody has set a new ActiveConnection in the meantime
         if ( isRowSetListening() )
@@ -204,15 +204,15 @@ namespace dbtools
         }
     }
 
-    void SAL_CALL OAutoConnectionDisposer::cursorMoved( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL OAutoConnectionDisposer::cursorMoved( const css::lang::EventObject& /*event*/ )
     {
     }
 
-    void SAL_CALL OAutoConnectionDisposer::rowChanged( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL OAutoConnectionDisposer::rowChanged( const css::lang::EventObject& /*event*/ )
     {
     }
 
-    void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const css::lang::EventObject& /*event*/ )
     {
         stopRowSetListening();
         clearConnection();
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 133c543510cc..046b7537fe6e 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -344,7 +344,7 @@ void SQLExceptionIteratorHelper::next( SQLExceptionInfo& _out_rInfo )
 }
 
 
-void throwFunctionSequenceException(const Reference< XInterface >& Context, const Any& Next)  throw ( css::sdbc::SQLException )
+void throwFunctionSequenceException(const Reference< XInterface >& Context, const Any& Next)
 {
     ::connectivity::SharedResources aResources;
     throw SQLException(
@@ -357,7 +357,7 @@ void throwFunctionSequenceException(const Reference< XInterface >& Context, cons
 }
 
 void throwInvalidIndexException(const css::uno::Reference< css::uno::XInterface >& Context,
-        const css::uno::Any& Next)  throw ( css::sdbc::SQLException )
+        const css::uno::Any& Next)
 {
     ::connectivity::SharedResources aResources;
     throw SQLException(
@@ -370,7 +370,7 @@ void throwInvalidIndexException(const css::uno::Reference< css::uno::XInterface
 }
 
 void throwFunctionNotSupportedSQLException(const OUString& _rFunctionName,
-    const css::uno::Reference<css::uno::XInterface>& _rxContext) throw (css::sdbc::SQLException)
+    const css::uno::Reference<css::uno::XInterface>& _rxContext)
 {
     ::connectivity::SharedResources aResources;
     const OUString sError( aResources.getResourceStringWithSubstitution(
@@ -387,7 +387,7 @@ void throwFunctionNotSupportedSQLException(const OUString& _rFunctionName,
 }
 
 void throwFunctionNotSupportedRuntimeException(const OUString& _rFunctionName,
-    const css::uno::Reference<css::uno::XInterface>& _rxContext) throw (css::uno::RuntimeException)
+    const css::uno::Reference<css::uno::XInterface>& _rxContext)
 {
     ::connectivity::SharedResources aResources;
     const OUString sError( aResources.getResourceStringWithSubstitution(
@@ -401,20 +401,17 @@ void throwFunctionNotSupportedRuntimeException(const OUString& _rFunctionName,
 }
 
 void throwGenericSQLException(const OUString& _rMsg, const css::uno::Reference< css::uno::XInterface >& _rxSource)
-    throw (css::sdbc::SQLException)
 {
     throwGenericSQLException(_rMsg, _rxSource, Any());
 }
 
 
 void throwGenericSQLException(const OUString& _rMsg, const Reference< XInterface >& _rxSource, const Any& _rNextException)
-    throw (SQLException)
 {
     throw SQLException( _rMsg, _rxSource, getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 0, _rNextException);
 }
 
 void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName, const Reference< XInterface >& _rxContext )
-    throw (SQLException)
 {
     ::connectivity::SharedResources aResources;
     const OUString sError( aResources.getResourceStringWithSubstitution(
@@ -432,7 +429,6 @@ void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName, cons
 }
 
 void throwFeatureNotImplementedRuntimeException(const OUString& _rFeatureName, const Reference< XInterface >& _rxContext)
-    throw (RuntimeException)
 {
     ::connectivity::SharedResources aResources;
     const OUString sError( aResources.getResourceStringWithSubstitution(
@@ -444,7 +440,6 @@ void throwFeatureNotImplementedRuntimeException(const OUString& _rFeatureName, c
 }
 
 void throwInvalidColumnException( const OUString& _rColumnName, const Reference< XInterface >& _rxContext)
-    throw (SQLException)
 {
     ::connectivity::SharedResources aResources;
     OUString sErrorMessage( aResources.getResourceStringWithSubstitution(
@@ -454,7 +449,7 @@ void throwInvalidColumnException( const OUString& _rColumnName, const Reference<
 }
 
 void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState,
-        const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) throw (SQLException)
+        const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException )
 {
     throw SQLException(
         _rMessage,
@@ -467,7 +462,7 @@ void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState,
 
 
 void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState,
-        const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode ) throw (SQLException)
+        const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode )
 {
     throwSQLException( _rMessage, getStandardSQLState( _eSQLState ), _rxContext, _nErrorCode );
 }
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 0f4b0ad8a02e..94c9eaf3ecb6 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -329,7 +329,7 @@ Reference< XConnection> getConnection_withFeedback(const OUString& _rDataSourceN
     return xReturn;
 }
 
-Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) throw (RuntimeException)
+Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet)
 {
     Reference< XConnection> xReturn;
     Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY);
@@ -1635,24 +1635,24 @@ namespace
         OParameterWrapper(const ::std::vector<bool, std::allocator<bool> >& _aSet,const Reference<XIndexAccess>& _xSource) : m_aSet(_aSet),m_xSource(_xSource){}
     private:
         // css::container::XElementAccess
-        virtual Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override
+        virtual Type SAL_CALL getElementType() override
         {
             return m_xSource->getElementType();
         }
-        virtual sal_Bool SAL_CALL hasElements(  ) throw(RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasElements(  ) override
         {
             if ( m_aSet.empty() )
                 return m_xSource->hasElements();
             return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0;
         }
         // css::container::XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount(  ) throw(RuntimeException, std::exception) override
+        virtual sal_Int32 SAL_CALL getCount(  ) override
         {
             if ( m_aSet.empty() )
                 return m_xSource->getCount();
             return ::std::count(m_aSet.begin(),m_aSet.end(),false);
         }
-        virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override
+        virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override
         {
             if ( m_aSet.empty() )
                 return m_xSource->getByIndex(Index);
@@ -1775,7 +1775,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
                        sal_Int32 parameterIndex,
                        const Any& x,
                        sal_Int32 sqlType,
-                       sal_Int32 scale)  throw(SQLException, RuntimeException, std::exception)
+                       sal_Int32 scale)
 {
     ORowSetValue aVal;
     aVal.fill(x);
@@ -1786,7 +1786,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
                        sal_Int32 parameterIndex,
                        const ::connectivity::ORowSetValue& _rValue,
                        sal_Int32 sqlType,
-                       sal_Int32 scale)  throw(SQLException, RuntimeException, std::exception)
+                       sal_Int32 scale)
 {
     if ( _rValue.isNull() )
         _xParams->setNull(parameterIndex,sqlType);
@@ -2000,7 +2000,7 @@ void release(oslInterlockedCount& _refCount,
         osl_atomic_increment( &_refCount );
 }
 
-void checkDisposed(bool _bThrow) throw ( DisposedException )
+void checkDisposed(bool _bThrow)
 {
     if (_bThrow)
         throw DisposedException();
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 32c2cc0a520a..ad3bf0338f15 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -1096,7 +1096,7 @@ namespace dbtools
             m_xInnerParamUpdate->clearParameters( );
     }
 
-    void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw( RuntimeException, std::exception )
+    void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues )
     {
         m_aValues = _rValues;
     }
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 72e91a977e76..1f2466ca3774 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -97,7 +97,6 @@ namespace param
     IMPLEMENT_FORWARD_REFCOUNT( ParameterWrapper, UnoBase )
 
     css::uno::Any ParameterWrapper::queryInterface(css::uno::Type const & aType)
-        throw (css::uno::RuntimeException, std::exception)
     {
         css::uno::Any a(UnoBase::queryInterface(aType));
         if (!a.hasValue()) {
@@ -112,7 +111,7 @@ namespace param
     }
 
 
-    Sequence< Type > SAL_CALL ParameterWrapper::getTypes(   ) throw(RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL ParameterWrapper::getTypes(   )
     {
         Sequence< Type > aTypes( 5 );
         aTypes[ 0 ] = cppu::UnoType<XWeak>::get();
@@ -143,7 +142,7 @@ namespace param
     }
 
 
-    Reference< XPropertySetInfo > ParameterWrapper::getPropertySetInfo() throw( RuntimeException, std::exception )
+    Reference< XPropertySetInfo > ParameterWrapper::getPropertySetInfo()
     {
         return createPropertySetInfo( getInfoHelper() );
     }
@@ -177,7 +176,7 @@ namespace param
     }
 
 
-    sal_Bool ParameterWrapper::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw( IllegalArgumentException )
+    sal_Bool ParameterWrapper::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
     {
         OSL_ENSURE( PROPERTY_ID_VALUE == nHandle, "ParameterWrapper::convertFastPropertyValue: the only non-readonly prop should be our PROPERTY_VALUE!" );
         (void)nHandle;
@@ -189,7 +188,7 @@ namespace param
     }
 
 
-    void ParameterWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception, std::exception )
+    void ParameterWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
     {
         if ( nHandle == PROPERTY_ID_VALUE )
         {
@@ -283,7 +282,7 @@ namespace param
     }
 
 
-    Type SAL_CALL ParameterWrapperContainer::getElementType() throw( RuntimeException, std::exception )
+    Type SAL_CALL ParameterWrapperContainer::getElementType()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_checkDisposed_throw();
@@ -291,7 +290,7 @@ namespace param
     }
 
 
-    sal_Bool SAL_CALL ParameterWrapperContainer::hasElements() throw( RuntimeException, std::exception )
+    sal_Bool SAL_CALL ParameterWrapperContainer::hasElements()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_checkDisposed_throw();
@@ -299,7 +298,7 @@ namespace param
     }
 
 
-    sal_Int32 SAL_CALL ParameterWrapperContainer::getCount() throw( RuntimeException, std::exception )
+    sal_Int32 SAL_CALL ParameterWrapperContainer::getCount()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_checkDisposed_throw();
@@ -307,7 +306,7 @@ namespace param
     }
 
 
-    Any SAL_CALL ParameterWrapperContainer::getByIndex( sal_Int32 _nIndex ) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+    Any SAL_CALL ParameterWrapperContainer::getByIndex( sal_Int32 _nIndex )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_checkDisposed_throw();
@@ -319,7 +318,7 @@ namespace param
     }
 
 
-    Reference< XEnumeration > ParameterWrapperContainer::createEnumeration() throw( RuntimeException, std::exception )
+    Reference< XEnumeration > ParameterWrapperContainer::createEnumeration()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_checkDisposed_throw();
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 68fde8a548dc..a350993bd0e0 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -152,7 +152,7 @@ m_xDriverNode.clear();
 m_xDriver.clear();
 }
 
-Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -173,7 +173,7 @@ Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const
     return xConnection;
 }
 
-void SAL_CALL OConnectionPool::disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception)
+void SAL_CALL OConnectionPool::disposing( const css::lang::EventObject& Source )
 {
     Reference<XConnection> xConnection(Source.Source,UNO_QUERY);
     if(xConnection.is())
@@ -285,7 +285,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite
     return xConnection;
 }
 
-void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt )
 {
     if(TIMEOUT_NODENAME == evt.PropertyName)
     {
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index e598adbd3b0f..3430ee23c76c 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -139,11 +139,11 @@ namespace connectivity
         void clear(bool _bDispose);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info );
         // 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;
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
         void invalidatePooledConnections();
     };
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index d61c18fbfcd8..4b1157afa39e 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -52,7 +52,7 @@ OConnectionWeakWrapper::~OConnectionWeakWrapper()
 IMPLEMENT_SERVICE_INFO(OConnectionWeakWrapper, "com.sun.star.sdbc.drivers.OConnectionWeakWrapper", "com.sun.star.sdbc.Connection")
 
 
-Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -61,7 +61,7 @@ Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement(  ) thr
     return m_xConnection->createStatement();
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -70,7 +70,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatemen
     return m_xConnection->prepareStatement(sql);
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -79,7 +79,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( co
     return m_xConnection->prepareCall(sql);
 }
 
-OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -88,7 +88,7 @@ OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw
     return m_xConnection->nativeSQL(sql);
 }
 
-void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -96,7 +96,7 @@ void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw
     m_xConnection->setAutoCommit(autoCommit);
 }
 
-sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -105,7 +105,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit(  ) throw(SQLException,
     return m_xConnection->getAutoCommit();
 }
 
-void SAL_CALL OConnectionWeakWrapper::commit(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnectionWeakWrapper::commit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -114,7 +114,7 @@ void SAL_CALL OConnectionWeakWrapper::commit(  ) throw(SQLException, RuntimeExce
     m_xConnection->commit();
 }
 
-void SAL_CALL OConnectionWeakWrapper::rollback(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnectionWeakWrapper::rollback(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -123,14 +123,14 @@ void SAL_CALL OConnectionWeakWrapper::rollback(  ) throw(SQLException, RuntimeEx
     m_xConnection->rollback();
 }
 
-sal_Bool SAL_CALL OConnectionWeakWrapper::isClosed(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnectionWeakWrapper::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_xConnection->isClosed();
 }
 
-Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -139,7 +139,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData(  )
     return m_xConnection->getMetaData();
 }
 
-void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -148,7 +148,7 @@ void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQL
     m_xConnection->setReadOnly(readOnly);
 }
 
-sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -157,7 +157,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly(  ) throw(SQLException, Run
     return m_xConnection->isReadOnly();
 }
 
-void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -166,7 +166,7 @@ void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) thro
     m_xConnection->setCatalog(catalog);
 }
 
-OUString SAL_CALL OConnectionWeakWrapper::getCatalog(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OConnectionWeakWrapper::getCatalog(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -175,7 +175,7 @@ OUString SAL_CALL OConnectionWeakWrapper::getCatalog(  ) throw(SQLException, Run
     return m_xConnection->getCatalog();
 }
 
-void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -184,7 +184,7 @@ void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level )
     m_xConnection->setTransactionIsolation(level);
 }
 
-sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -193,7 +193,7 @@ sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation(  ) throw(SQL
     return m_xConnection->getTransactionIsolation();
 }
 
-Reference< css::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -202,7 +202,7 @@ Reference< css::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTyp
     return m_xConnection->getTypeMap();
 }
 
-void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< css::container::XNameAccess >& typeMap )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -212,7 +212,7 @@ void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< css::containe
 }
 
 // XCloseable
-void SAL_CALL OConnectionWeakWrapper::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnectionWeakWrapper::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -233,7 +233,7 @@ void OConnectionWeakWrapper::disposing()
 // css::lang::XUnoTunnel
 IMPLEMENT_FORWARD_REFCOUNT( OConnectionWeakWrapper, OConnectionWeakWrapper_BASE )
 
-css::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const css::uno::Type& _rType )
 {
     css::uno::Any aReturn = OConnectionWeakWrapper_BASE::queryInterface( _rType );
     if ( !aReturn.hasValue() )
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 7ce68a9a60ad..b74fb244662c 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -52,26 +52,26 @@ namespace connectivity
         DECLARE_XINTERFACE( )
 
         // XConnection
-        virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+        virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+        virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+        virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+        virtual void SAL_CALL commit(  ) override;
+        virtual void SAL_CALL rollback(  ) override;
+        virtual sal_Bool SAL_CALL isClosed(  ) override;
+        virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+        virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+        virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+        virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+        virtual OUString SAL_CALL getCatalog(  ) override;
+        virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+        virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+        virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
         // XCloseable
-        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close(  ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index d9df6fcb3a9d..811f103bc9a6 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -61,14 +61,14 @@ namespace connectivity
     }
 
 
-    Any SAL_CALL ODriverWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+    Any SAL_CALL ODriverWrapper::queryInterface( const Type& _rType )
     {
         Any aReturn = ODriverWrapper_BASE::queryInterface(_rType);
         return aReturn.hasValue() ? aReturn : (m_xDriverAggregate.is() ? m_xDriverAggregate->queryAggregation(_rType) : aReturn);
     }
 
 
-    Reference< XConnection > SAL_CALL ODriverWrapper::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XConnection > SAL_CALL ODriverWrapper::connect( const OUString& url, const Sequence< PropertyValue >& info )
     {
         Reference< XConnection > xConnection;
         if (m_pConnectionPool.is())
@@ -81,13 +81,13 @@ namespace connectivity
     }
 
 
-    sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url )
     {
         return m_xDriver.is() && m_xDriver->acceptsURL(url);
     }
 
 
-    Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception)
+    Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info )
     {
         Sequence< DriverPropertyInfo > aInfo;
         if (m_xDriver.is())
@@ -96,13 +96,13 @@ namespace connectivity
     }
 
 
-    sal_Int32 SAL_CALL ODriverWrapper::getMajorVersion(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL ODriverWrapper::getMajorVersion(  )
     {
         return m_xDriver.is() ? m_xDriver->getMajorVersion() : 0;
     }
 
 
-    sal_Int32 SAL_CALL ODriverWrapper::getMinorVersion(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL ODriverWrapper::getMinorVersion(  )
     {
         return m_xDriver.is() ? m_xDriver->getMinorVersion() : 0;
     }
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index 0d183d110fd4..c9b1d8d9362c 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -57,17 +57,17 @@ namespace connectivity
 
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     protected:
         /// dtor
         virtual ~ODriverWrapper() override;
         // XDriver
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+        virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+        virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+        virtual sal_Int32 SAL_CALL getMajorVersion(  ) override;
+        virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
     };
 
 
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index f502b5fdb2eb..e9983a151782 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -95,12 +95,12 @@ OPoolCollection::~OPoolCollection()
     clearConnectionPools(false);
 }
 
-Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL )
 {
     return getConnectionWithInfo(_rURL,Sequence< PropertyValue >());
 }
 
-Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo )
 {
     MutexGuard aGuard(m_aMutex);
     Reference< XConnection > xConnection;
@@ -120,30 +120,30 @@ Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const
     return xConnection;
 }
 
-void SAL_CALL OPoolCollection::setLoginTimeout( sal_Int32 seconds ) throw(RuntimeException, std::exception)
+void SAL_CALL OPoolCollection::setLoginTimeout( sal_Int32 seconds )
 {
     MutexGuard aGuard(m_aMutex);
     m_xManager->setLoginTimeout(seconds);
 }
 
-sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout(  )
 {
     MutexGuard aGuard(m_aMutex);
     return m_xManager->getLoginTimeout();
 }
 
-OUString SAL_CALL OPoolCollection::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OPoolCollection::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
 
-Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
@@ -155,19 +155,19 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference
 }
 
 
-OUString SAL_CALL OPoolCollection::getImplementationName_Static(  ) throw(RuntimeException)
+OUString SAL_CALL OPoolCollection::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.sdbc.OConnectionPool");
 }
 
 
-Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static(  )
 {
     Sequence< OUString > aSupported { "com.sun.star.sdbc.ConnectionPool" };
     return aSupported;
 }
 
-Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL ) throw(RuntimeException, std::exception)
+Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL )
 {
     // returns the original driver when no connection pooling is enabled else it returns the proxy
     MutexGuard aGuard(m_aMutex);
@@ -396,16 +396,16 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference<XInterf
     return aReturn;
 }
 
-void SAL_CALL OPoolCollection::queryTermination( const EventObject& /*Event*/ ) throw (css::frame::TerminationVetoException, RuntimeException, std::exception)
+void SAL_CALL OPoolCollection::queryTermination( const EventObject& /*Event*/ )
 {
 }
 
-void SAL_CALL OPoolCollection::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OPoolCollection::notifyTermination( const EventObject& /*Event*/ )
 {
     clearDesktop();
 }
 
-void SAL_CALL OPoolCollection::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+void SAL_CALL OPoolCollection::disposing( const EventObject& Source )
 {
     MutexGuard aGuard(m_aMutex);
     if ( m_xDesktop == Source.Source )
@@ -433,7 +433,7 @@ void SAL_CALL OPoolCollection::disposing( const EventObject& Source ) throw (Run
     }
 }
 
-void SAL_CALL OPoolCollection::propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
+void SAL_CALL OPoolCollection::propertyChange( const css::beans::PropertyChangeEvent& evt )
 {
     MutexGuard aGuard(m_aMutex);
     if(evt.Source == m_xConfigNode)
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 1f64980ae987..7e218a944e22 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -111,33 +111,33 @@ namespace connectivity
                                                         const css::uno::Reference< css::uno::XInterface>& _xTreeNode)throw();
 
     // XDriverManager
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getLoginTimeout(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+        virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) override;
+        virtual sal_Int32 SAL_CALL getLoginTimeout(  ) override;
 
     //XDriverAccess
-        virtual css::uno::Reference< css::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) override;
     // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XServiceInfo - static methods
         static css::uno::Reference< css::uno::XInterface > SAL_CALL CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
 
         // 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;
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
         // XTerminateListener
-        virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override;
+        virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLCOLLECTION_HXX
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index dc33e1765b94..c8fd83e39553 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -53,13 +53,13 @@ m_xComponent.clear();
 }
 
 // XEventListener
-void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ )
 {
 m_xComponent.clear();
 }
 
 //XPooledConnection
-Reference< XConnection > OPooledConnection::getConnection()  throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > OPooledConnection::getConnection()
 {
     if(!m_xComponent.is() && m_xRealConnection.is())
     {
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index ff108088efa0..839cffe7c2ee 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -49,10 +49,10 @@ namespace connectivity
                           const css::uno::Reference< css::reflection::XProxyFactory >& _rxProxyFactory);
 
         //XPooledConnection
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) 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;
     };
 
 }
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 969494858938..1eee379f800e 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -45,107 +45,107 @@ OCallableStatement::OCallableStatement( OConnection* _pConnection, const OUStrin
 }
 
 
-Any SAL_CALL OCallableStatement::queryInterface( const Type & rType ) throw(RuntimeException)
+Any SAL_CALL OCallableStatement::queryInterface( const Type & rType )
 {
     Any aRet = OPreparedStatement::queryInterface(rType);
     return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< XRow*>(this));
 }
 
 
-sal_Bool SAL_CALL OCallableStatement::wasNull(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OCallableStatement::wasNull(  )
 {
     return m_aValue.isNull();
 }
 
 
-sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getBool();
 }
 
-sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getInt8();
 }
 
-Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getByteSequence();
 }
 
-css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getDate();
 }
 
-double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getDouble();
 }
 
 
-float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getFloat();
 }
 
 
-sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getInt32();
 }
 
 
-sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return (sal_Int64)m_aValue.getCurrency().int64;
 }
 
 
-Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
+Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getObject", *this );
     return Any();
 }
 
 
-sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getInt16();
 }
 
 
-OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getString();
 }
 
 
- css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+ css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getTime();
 }
 
 
- css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+ css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex )
 {
     GET_PARAM()
     return m_aValue.getDateTime();
 }
 
 
-void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ )
 {
     ADOParameter* pParam = nullptr;
     m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam);
@@ -156,7 +156,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex
     }
 }
 
-void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
+void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale )
 {
     ADOParameter* pParam = nullptr;
     m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam);
@@ -169,40 +169,40 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet
 }
 
 
-Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBinaryStream", *this );
     return nullptr;
 }
 
-Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this );
     return nullptr;
 }
 
 
-Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *this );
     return nullptr;
 }
 
 
-Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this );
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBlob", *this );
     return nullptr;
 }
 
 
-Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/) throw(SQLException, RuntimeException)
+Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/)
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *this );
     return nullptr;
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 310ec678a112..1683f0d9dcfb 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -92,7 +92,7 @@ Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
+sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
@@ -107,7 +107,7 @@ void OAdoColumn::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN),   PROPERTY_ID_RELATEDCOLUMN,  nAttrib,&m_ReferencedColumn,    ::cppu::UnoType<OUString>::get());
 }
 
-void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
+void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     if(m_aColumn.IsValid())
     {
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 352ca9989257..b1395122343e 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -46,7 +46,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
 }
 
 
-void OColumns::impl_refresh() throw(RuntimeException)
+void OColumns::impl_refresh()
 {
     m_aCollection.Refresh();
 }
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 15432c3b4611..77daa121cac0 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -44,7 +44,7 @@ using namespace com::sun::star::sdbcx;
 
 IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.star.sdbc.Connection");
 
-OConnection::OConnection(ODriver*   _pDriver) throw(SQLException, RuntimeException)
+OConnection::OConnection(ODriver*   _pDriver)
                          : OSubComponent<OConnection, OConnection_BASE>(static_cast<cppu::OWeakObject*>(_pDriver), this),
                          m_xCatalog(nullptr),
                          m_pDriver(_pDriver),
@@ -158,7 +158,7 @@ void SAL_CALL OConnection::release() throw()
     release_ChildImpl();
 }
 
-Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException)
+Reference< XStatement > SAL_CALL OConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -169,7 +169,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     return pStmt;
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -181,7 +181,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     return xPStmt;
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -193,7 +193,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin
     return xPStmt;
 }
 
-OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -214,7 +214,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLExcept
     return sql;
 }
 
-void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -227,7 +227,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti
         m_pAdoConnection->RollbackTrans();
 }
 
-sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OConnection::getAutoCommit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -236,7 +236,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
     return m_bAutocommit;
 }
 
-void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::commit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -245,7 +245,7 @@ void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
     m_pAdoConnection->CommitTrans();
 }
 
-void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::rollback(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -254,14 +254,14 @@ void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
     m_pAdoConnection->RollbackTrans();
 }
 
-sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OConnection::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return OConnection_BASE::rBHelper.bDisposed && !m_pAdoConnection->get_State();
 }
 
-Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException)
+Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -277,7 +277,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
     return xMetaData;
 }
 
-void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -287,7 +287,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException,
     ADOS::ThrowException(*m_pAdoConnection,*this);
 }
 
-sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OConnection::isReadOnly(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -296,7 +296,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeExcepti
     return m_pAdoConnection->get_Mode() == adModeRead;
 }
 
-void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::setCatalog( const OUString& catalog )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -305,7 +305,7 @@ void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLExcept
     ADOS::ThrowException(*m_pAdoConnection,*this);
 }
 
-OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OConnection::getCatalog(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -313,7 +313,7 @@ OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeExcepti
     return m_pAdoConnection->GetDefaultDatabase();
 }
 
-void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -345,7 +345,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE
     ADOS::ThrowException(*m_pAdoConnection,*this);
 }
 
-sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -376,7 +376,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException,
     return nRet;
 }
 
-Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
+Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -385,13 +385,13 @@ Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) th
     return nullptr;
 }
 
-void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this );
 }
 
 // XCloseable
-void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -402,16 +402,16 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
 }
 
 // XWarningsSupplier
-Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException)
+Any SAL_CALL OConnection::getWarnings(  )
 {
     return Any();
 }
 
-void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::clearWarnings(  )
 {
 }
 
-void OConnection::buildTypeInfo() throw( SQLException)
+void OConnection::buildTypeInfo()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -495,7 +495,7 @@ void OConnection::disposing()
     dispose_ChildImpl();
 }
 
-sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw (css::uno::RuntimeException)
+sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ?
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index ab1f6cd5cc61..f0a6165f8e8b 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -46,7 +46,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
 {
 }
 
-sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty)  throw(css::sdbc::SQLException, css::uno::RuntimeException)
+sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty)
 {
     connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
     //  ADOS::ThrowException(*m_pADOConnection,*this);
@@ -59,7 +59,7 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty)  throw
 }
 
 
-bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty)  throw(css::sdbc::SQLException, css::uno::RuntimeException)
+bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty)
 {
     connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -68,7 +68,7 @@ bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty)  throw(css::
     return !aVar.isNull() && !aVar.isEmpty() && aVar.getBool();
 }
 
-OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty)  throw(css::sdbc::SQLException, css::uno::RuntimeException)
+OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty)
 {
     connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -92,7 +92,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
     return xRef;
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  )
 {
     OLEVariant  vtEmpty;
     vtEmpty.setNoArg();
@@ -115,7 +115,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
     return getLiteral(DBLITERAL_CATALOG_SEPARATOR);
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  )
 {
     OLEVariant  vtEmpty;
     vtEmpty.setNoArg();
@@ -134,7 +134,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLExce
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     const Any& catalog, const OUString& schema, const OUString& table,
-    const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const OUString& columnNamePattern )
 {
     ADORecordset *pRecordset = m_pADOConnection->getColumnPrivileges(catalog,schema,table,columnNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -149,7 +149,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern,
-    const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const OUString& columnNamePattern )
 {
     ADORecordset *pRecordset = m_pADOConnection->getColumns(catalog,schemaPattern,tableNamePattern,columnNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -165,7 +165,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     const Any& catalog, const OUString& schemaPattern,
-    const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException)
+    const OUString& tableNamePattern, const Sequence< OUString >& types )
 {
     ADORecordset *pRecordset = m_pADOConnection->getTables(catalog,schemaPattern,tableNamePattern,types);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -181,7 +181,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     const Any& catalog, const OUString& schemaPattern,
-    const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const OUString& procedureNamePattern, const OUString& columnNamePattern )
 {
     ADORecordset *pRecordset = m_pADOConnection->getProcedureColumns(catalog,schemaPattern,procedureNamePattern,columnNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -197,7 +197,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     const Any& catalog, const OUString& schemaPattern,
-    const OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
+    const OUString& procedureNamePattern )
 {
     // Create elements used in the array
     ADORecordset *pRecordset = m_pADOConnection->getProcedures(catalog,schemaPattern,procedureNamePattern);
@@ -212,57 +212,57 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     return xRef;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     return getMaxSize(DBLITERAL_BINARY_LITERAL);
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  )
 {
     return getInt32Property("Maximum Row Size");
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  )
 {
     return getMaxSize(DBLITERAL_CATALOG_NAME);
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  )
 {
     return getMaxSize(DBLITERAL_CHAR_LITERAL);
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  )
 {
     return getMaxSize(DBLITERAL_COLUMN_NAME);
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  )
 {
     return getMaxSize(DBLITERAL_CURSOR_NAME);
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  )
 {
     return getInt32Property("Active Sessions");
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  )
 {
     return getInt32Property("Max Columns in Table");
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  )
 {
     return getMaxSize(DBLITERAL_TEXT_COMMAND);
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  )
 {
     return getMaxSize(DBLITERAL_TABLE_NAME);
 }
@@ -273,7 +273,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     ADORecordset *pRecordset = m_pADOConnection->getExportedKeys(catalog,schema,table);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -287,7 +287,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     ADORecordset *pRecordset = m_pADOConnection->getImportedKeys(catalog,schema,table);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -302,7 +302,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     ADORecordset *pRecordset = m_pADOConnection->getPrimaryKeys(catalog,schema,table);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -318,7 +318,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     const Any& catalog, const OUString& schema, const OUString& table,
-    sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException)
+    sal_Bool unique, sal_Bool approximate )
 {
     ADORecordset *pRecordset = m_pADOConnection->getIndexInfo(catalog,schema,table,unique,approximate);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -333,7 +333,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
-    const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern )
 {
     Reference< XResultSet > xRef;
     if(!ADOS::isJetEngine(m_pConnection->getEngineType()))
@@ -388,7 +388,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     const Any& primaryCatalog, const OUString& primarySchema,
     const OUString& primaryTable, const Any& foreignCatalog,
-    const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException)
+    const OUString& foreignSchema, const OUString& foreignTable )
 {
     ADORecordset *pRecordset = m_pADOConnection->getCrossReference(primaryCatalog,primarySchema,primaryTable,foreignCatalog,foreignSchema,foreignTable);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -402,17 +402,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     return xRef;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     return getBoolProperty("Maximum Row Size Includes BLOB");
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  )
 {
     return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  )
 {
     return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
 }
@@ -422,17 +422,17 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
     return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  )
 {
     return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  )
 {
     return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  )
 {
     return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
 }
@@ -447,17 +447,17 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
     return true;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  )
 {
     return getInt32Property("Maximum Index Size");
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  )
 {
     return getInt32Property("NULL Concatenation Behavior") == DBPROPVAL_CB_NON_NULL;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  )
 {
     return getStringProperty("Catalog Term");
 }
@@ -468,12 +468,12 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 
 }
 
-OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  )
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     return isCapable(DBLITERAL_CORRELATION_NAME);
 }
@@ -483,57 +483,57 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
     return getInt32Property("Catalog Location") == DBPROPVAL_CL_START;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  )
 {
     return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DDL_IGNORE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  )
 {
     return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DDL_COMMIT;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  )
 {
     return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DML;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  )
 {
     return getInt32Property("Transaction DDL") == DBPROPVAL_TC_ALL;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  )
 {
     return getInt32Property("Prepare Abort Behavior") == DBPROPVAL_CB_PRESERVE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  )
 {
     return getInt32Property("Prepare Commit Behavior") == DBPROPVAL_CB_PRESERVE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  )
 {
     return (getInt32Property("Isolation Retention") & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  )
 {
     return (getInt32Property("Isolation Retention") & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level )
 {
     bool bValue(false);
 
@@ -557,25 +557,25 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
     return (getInt32Property("Schema Usage") & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  )
 {
     sal_Int32 nProp = getInt32Property("SQL Support");
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     sal_Int32 nProp = getInt32Property("SQL Support");
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     sal_Int32 nProp = getInt32Property("SQL Support");
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  )
 {
     return (getInt32Property("Schema Usage") & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION;
 }
@@ -590,7 +590,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  )
 {
     return false;
 }
@@ -600,14 +600,14 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  )
 {
     if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
         return true;
     return getBoolProperty("Outer Join Capabilities");
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  )
 {
     return new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
 }
@@ -617,132 +617,132 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  )
 {
     return getMaxSize(DBLITERAL_PROCEDURE_NAME);
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  )
 {
     return getMaxSize(DBLITERAL_SCHEMA_NAME);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  )
 {
     return getInt32Property("Transaction DDL") == DBPROPVAL_TC_NONE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  )
 {
     return getBoolProperty("Read-Only Data Source");
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     return getInt32Property("NULL Concatenation Behavior") == DBPROPVAL_CB_NULL;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  )
 {
     return isCapable(DBLITERAL_COLUMN_ALIAS);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  )
 {
     return isCapable(DBLITERAL_CORRELATION_NAME);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ )
 {
     return getBoolProperty("Rowset Conversions on Command");
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     return getBoolProperty("ORDER BY Columns in Select List");
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  )
 {
     return getInt32Property("GROUP BY Support") != DBPROPVAL_GB_NOT_SUPPORTED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     return getInt32Property("GROUP BY Support") != DBPROPVAL_GB_CONTAINS_SELECT;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  )
 {
     return getInt32Property("GROUP BY Support") == DBPROPVAL_GB_NO_RELATION;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  )
 {
     return isCapable(DBLITERAL_ESCAPE_PERCENT);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  )
 {
     return getBoolProperty("ORDER BY Columns in Select List");
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  )
 {
     return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
 }
@@ -752,123 +752,123 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
     return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_END) == DBPROPVAL_NC_END;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  )
 {
     return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_START) == DBPROPVAL_NC_START;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  )
 {
     return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  )
 {
     return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  )
 {
     return (getInt32Property("Schema Usage") & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  )
 {
     return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  )
 {
     return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     sal_Int32 nProp = getInt32Property("SQL Support");
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE);
 }
 
-OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getURL(  )
 {
     return "sdbc:ado:"+ m_pADOConnection->GetConnectionString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getUserName(  )
 {
     return getStringProperty("User Name");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDriverName(  )
 {
     return getStringProperty("Provider Friendly Name");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  )
 {
     return getStringProperty("Provider Version");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  )
 {
     return getStringProperty("DBMS Version");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  )
 {
     return getStringProperty("DBMS Name");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  )
 {
     return getStringProperty("Procedure Term");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  )
 {
     return getStringProperty("Schema Term");
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  )
 {
     sal_Int32 nRet = TransactionIsolation::NONE;
     switch(m_pADOConnection->get_IsolationLevel())
@@ -891,12 +891,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(S
     return nRet;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  )
 {
     return 0;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  )
 {
     ADORecordset *pRecordset = nullptr;
     OLEVariant  vtEmpty;
@@ -926,146 +926,146 @@ OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, Runt
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  )
 {
     return getLiteral(DBLITERAL_ESCAPE_PERCENT);
 }
 
-OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  )
 {
     OUString aValue;
     return aValue.copy(0,aValue.lastIndexOf(','));
 }
 
-OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  )
 {
     OUString aValue;
     return aValue.copy(0,aValue.lastIndexOf(','));
 }
 
-OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  )
 {
     OUString aValue;
     return aValue;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     sal_Int32 nProp = getInt32Property("SQL Support");
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  )
 {
     sal_Int32 nProp = getInt32Property("SQL Support");
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  )
 {
     sal_Int32 nProp = getInt32Property("SQL Support");
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  )
 {
     if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
         return true;
     return (getInt32Property("Outer Join Capabilities") & 0x00000004L) == 0x00000004L;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     return supportsFullOuterJoins(  );
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     return getInt32Property("Max Columns in GROUP BY");
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     return getInt32Property("Max Columns in ORDER BY");
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  )
 {
     return getMaxSize(DBLITERAL_USER_NAME);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType )
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType )
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType )
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType )
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType )
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType )
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType )
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType )
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType )
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  )
 {
     return true;
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XDatabaseMetaData::getUDTs", *this );
     return Reference< XResultSet >();
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 1a479721fe4e..381113c431fe 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -255,42 +255,42 @@ void ODatabaseMetaDataResultSetMetaData::setProceduresMap()
         DataType::VARCHAR);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column )
 {
     if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isSearchable();
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column )
 {
     if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isAutoIncrement();
     return false;
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column )
 {
     if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnServiceName();
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column )
 {
     if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getTableName();
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column )
 {
     if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getCatalogName();
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column )
 {
     if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnTypeName();
@@ -298,7 +298,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column )
 {
     if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isCaseSensitive();
@@ -306,7 +306,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32
 }
 
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column )
 {
     if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getSchemaName();
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 69269348dbbf..09ee0797e09c 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -93,13 +93,13 @@ void ODatabaseMetaDataResultSet::disposing()
 m_xMetaData.clear();
 }
 
-Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
+Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType )
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType);
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(css::uno::RuntimeException)
+css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
                                     cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -108,14 +108,14 @@ css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTyp
     return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
 }
 
-void ODatabaseMetaDataResultSet::checkRecordSet() throw(SQLException)
+void ODatabaseMetaDataResultSet::checkRecordSet()
 {
     if(!m_pRecordSet)
         throwFunctionSequenceException(*this);
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -137,7 +137,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum
 }
 #define BLOCK_SIZE 256
 
-Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -180,14 +180,14 @@ Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinar
     return new SequenceInputStream(m_aValue.getByteSequence());
 }
 
-Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this );
     return nullptr;
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -201,7 +201,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex
 }
 
 
-sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -220,31 +220,31 @@ sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) t
 }
 
 
-Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getByteSequence();
 }
 
 
-css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getDate();
 }
 
 
-double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getDouble();
 }
 
 
-float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getFloat();
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -264,21 +264,21 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) t
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow(  )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XResultSet::getRow", *this );
     return 0;
 }
 
 
-sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getLong", *this );
     return sal_Int64(0);
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
+Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -292,34 +292,34 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData
     return m_xMetaData;
 }
 
-Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this );
     return nullptr;
 }
 
 
-Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this );
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this );
     return nullptr;
 }
 
 
-Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this );
     return nullptr;
 }
 
 
-Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
+Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -332,7 +332,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const
 }
 
 
-sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -351,7 +351,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
 }
 
 
-OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -368,19 +368,19 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
 }
 
 
-css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getTime();
 }
 
 
-css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getDateTime();
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -393,7 +393,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException
     return bIsAtEOF == VARIANT_TRUE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -404,7 +404,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, Ru
     return m_nRowPos == 1;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -415,7 +415,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, Run
     return true;
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
+void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -427,7 +427,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, Ru
         previous();
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, RuntimeException)
+void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -441,7 +441,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, Runt
 }
 
 
-void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeException)
+void SAL_CALL ODatabaseMetaDataResultSet::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -452,7 +452,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeE
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -468,7 +468,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, Runt
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -477,7 +477,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, Runti
     return m_pRecordSet && SUCCEEDED(m_pRecordSet->MoveLast());
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -495,7 +495,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -512,7 +512,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ
     return bRet;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -527,13 +527,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, R
     return bRet;
 }
 
-Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  ) throw(SQLException, RuntimeException)
+Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  )
 {
     return m_aStatement.get();
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -546,7 +546,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException,
     return (RecordStatusEnum(eRec) & adRecDeleted) == adRecDeleted;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  )
 {   ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
 
@@ -558,7 +558,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException
     return (RecordStatusEnum(eRec) & adRecNew) == adRecNew;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -572,7 +572,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException,
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -587,7 +587,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLExcepti
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -606,7 +606,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, Runti
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -617,7 +617,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, Ru
     return m_aValue.isNull();
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
+void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -629,7 +629,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, Run
 }
 
 
-void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException)
+void SAL_CALL ODatabaseMetaDataResultSet::cancel(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -640,35 +640,31 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException)
     m_pRecordSet->Cancel();
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
+void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  )
 {
 }
 
-Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
+Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  )
 {
     return Any();
 }
 
 sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency()
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     return ResultSetConcurrency::READ_ONLY;
 }
 
 sal_Int32 ODatabaseMetaDataResultSet::getResultSetType()
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY;
 }
 
 sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection()
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     return FetchDirection::FORWARD;
 }
 
 sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     sal_Int32 nValue=-1;
     if(m_pRecordSet)
@@ -677,20 +673,17 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const
 }
 
 OUString ODatabaseMetaDataResultSet::getCursorName()
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     return OUString();
 }
 
 
 void ODatabaseMetaDataResultSet::setFetchDirection(sal_Int32 /*_par0*/)
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "ResultSet::FetchDirection", *this );
 }
 
 void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0)
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     if(m_pRecordSet)
         m_pRecordSet->put_CacheSize(_par0);
@@ -726,7 +719,6 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue(
                             Any & rOldValue,
                             sal_Int32 nHandle,
                             const Any& rValue )
-                                throw (css::lang::IllegalArgumentException)
 {
     switch(nHandle)
     {
@@ -748,7 +740,6 @@ void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& /*rValue*/
                                                  )
-                                                 throw (Exception)
 {
     switch(nHandle)
     {
@@ -1193,12 +1184,12 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
     ODatabaseMetaDataResultSet_BASE::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 4b35c93c6436..9a035e298993 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
@@ -36,7 +36,7 @@ ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData()
         m_pRecordSet->Release();
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 {
     sal_Int32 nSize = 0;
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
@@ -51,7 +51,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column )
 {
     sal_Int32  nType = 0;
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
@@ -65,7 +65,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  )
 {
     if(!m_pRecordSet)
         return 0;
@@ -83,7 +83,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  ) throw(
 }
 
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnName();
@@ -96,7 +96,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 c
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnLabel();
@@ -104,7 +104,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isCurrency();
@@ -119,7 +119,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 colu
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isSigned();
@@ -133,7 +133,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column
     return false;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getPrecision();
@@ -145,7 +145,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 c
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getScale();
@@ -160,7 +160,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 colum
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isNullable();
@@ -177,7 +177,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isReadOnly();
@@ -194,7 +194,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 colu
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isDefinitelyWritable();
@@ -211,7 +211,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_
 ;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column )
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isWritable();
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 7d14a58206ae..0494334904ec 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -78,12 +78,12 @@ void ODriver::disposing()
 }
 // static ServiceInfo
 
-OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.sdbc.ado.ODriver");
 }
 
-Sequence< OUString > ODriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > ODriver::getSupportedServiceNames_Static(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = "com.sun.star.sdbc.Driver";
@@ -91,30 +91,30 @@ Sequence< OUString > ODriver::getSupportedServiceNames_Static(  ) throw (Runtime
     return aSNS;
 }
 
-css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception )
+css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new ODriver(_rxFactory));
 }
 
 
-OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL ODriver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
 
-Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
 
-Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info )
 {
     if ( ! acceptsURL(url) )
         return nullptr;
@@ -130,7 +130,6 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S
 }
 
 sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
-        throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:ado:");
 }
@@ -145,7 +144,7 @@ void ODriver::impl_checkURL_throw(const OUString& _sUrl)
     } // if ( !acceptsURL(_sUrl) )
 }
 
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ )
 {
     impl_checkURL_throw(url);
     if ( acceptsURL(url) )
@@ -182,18 +181,18 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
     return Sequence< DriverPropertyInfo >();
 }
 
-sal_Int32 SAL_CALL ODriver::getMajorVersion(  ) throw(RuntimeException)
+sal_Int32 SAL_CALL ODriver::getMajorVersion(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL ODriver::getMinorVersion(  ) throw(RuntimeException)
+sal_Int32 SAL_CALL ODriver::getMinorVersion(  )
 {
     return 0;
 }
 
 // XDataDefinitionSupplier
-Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, RuntimeException)
+Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)
@@ -233,14 +232,14 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co
     return xTab;
 }
 
-Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(css::sdbc::SQLException, RuntimeException)
+Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info )
 {
     impl_checkURL_throw(url);
     return getDataDefinitionByConnection(connect(url,info));
 }
 
 
-void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
+void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& _xInterface)
 {
     ADOErrors *pErrors = nullptr;
     _pAdoCon->get_Errors(&pErrors);
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index ab1eb1f3a9c0..f8c61dee557a 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -99,7 +99,7 @@ Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
+sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
@@ -107,7 +107,7 @@ sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run
 }
 
 
-void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
+void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     if(m_aGroup.IsValid())
     {
@@ -139,12 +139,12 @@ void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 }
 
 
-sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, RuntimeException)
+sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType )
 {
     return MapRight(m_aGroup.GetPermissions(objName,MapObjectType(objType)));
 }
 
-sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, RuntimeException)
+sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType )
 {
     RightsEnum eNum = m_aGroup.GetPermissions(objName,MapObjectType(objType));
     if(eNum & adRightWithGrant)
@@ -152,12 +152,12 @@ sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, s
     return 0;
 }
 
-void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, RuntimeException)
+void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
 {
     m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessGrant,Map2Right(objPrivileges));
 }
 
-void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, RuntimeException)
+void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
 {
     m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessDeny,Map2Right(objPrivileges));
 }
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index cc3208e232bf..2611ace16372 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -44,7 +44,7 @@ sdbcx::ObjectType OGroups::createObject(const OUString& _rName)
     return new OAdoGroup(m_pCatalog,isCaseSensitive(),_rName);
 }
 
-void OGroups::impl_refresh() throw(RuntimeException)
+void OGroups::impl_refresh()
 {
     m_aCollection.Refresh();
 }
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index b907873cd443..b33f57ab3f6a 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -89,14 +89,14 @@ Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
+sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
                 : sdbcx::OIndex::getSomething(rId);
 }
 
-void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
+void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     if(m_aIndex.IsValid())
     {
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index b931984bd182..5bf8937af21f 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -43,7 +43,7 @@ sdbcx::ObjectType OIndexes::createObject(const OUString& _rName)
     return new OAdoIndex(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
 
-void OIndexes::impl_refresh() throw(RuntimeException)
+void OIndexes::impl_refresh()
 {
     m_aCollection.Refresh();
 }
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index cc1e13c1e5e8..2df0c8775a80 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -84,14 +84,14 @@ Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
+sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OKey_ADO::getSomething(rId);
 }
 
-void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
+void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     if(m_aKey.IsValid())
     {
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index 257c0be04602..4a48330d7f57 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -49,7 +49,7 @@ sdbcx::ObjectType OKeys::createObject(const OUString& _rName)
     return new OAdoKey(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
 
-void OKeys::impl_refresh() throw(RuntimeException)
+void OKeys::impl_refresh()
 {
     m_aCollection.Refresh();
 }
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index a29e00d79fb5..136c3a90b377 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -92,7 +92,7 @@ OPreparedStatement::~OPreparedStatement()
     }
 }
 
-Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException)
+Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType )
 {
     Any aRet = OStatement_Base::queryInterface(rType);
     return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType,
@@ -101,7 +101,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
                                         static_cast< XResultSetMetaDataSupplier*>(this));
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(css::uno::RuntimeException)
+css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
                                     cppu::UnoType<XParameters>::get(),
@@ -110,7 +110,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) t
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_Base::getTypes());
 }
 
-Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException)
+Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  )
 {
     if(!m_xMetaData.is() && m_RecordSet.IsValid())
         m_xMetaData = new OResultSetMetaData(m_RecordSet);
@@ -128,7 +128,7 @@ m_xMetaData.clear();
     OStatement_Base::disposing();
 }
 
-void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::close(  )
 {
 
     {
@@ -140,7 +140,7 @@ void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException
 
 }
 
-sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OPreparedStatement::execute(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -164,7 +164,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
     return m_RecordSet.IsValid();
 }
 
-sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -183,7 +183,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, Run
 }
 
 void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType,
-                                      sal_Int32 _nSize,const OLEVariant& Val) throw(SQLException, RuntimeException)
+                                      sal_Int32 _nSize,const OLEVariant& Val)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -236,12 +236,12 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn
     ADOS::ThrowException(*m_pConnection->getConnection(),*this);
 }
 
-void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x )
 {
     setParameter( parameterIndex, adLongVarWChar, ::std::numeric_limits< sal_Int32 >::max(), x );
 }
 
-Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -249,7 +249,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
     return static_cast<Reference< XConnection >>(m_pConnection);
 }
 
-Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -284,79 +284,79 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
     return xRs;
 }
 
-void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
 {
     setParameter(parameterIndex,adBoolean,sizeof(x),bool(x));
 }
 
-void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x )
 {
     setParameter(parameterIndex,adTinyInt,sizeof(x),x);
 }
 
-void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& x )
 {
     setParameter(parameterIndex,adDBDate,sizeof(x),x);
 }
 
-void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x )
 {
     setParameter(parameterIndex,adDBTime,sizeof(x),x);
 }
 
-void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& x )
 {
     setParameter(parameterIndex,adDBTimeStamp,sizeof(x),x);
 }
 
-void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x )
 {
     setParameter(parameterIndex,adDouble,sizeof(x),x);
 }
 
-void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
 {
     setParameter(parameterIndex,adSingle,sizeof(x),x);
 }
 
-void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x )
 {
     setParameter(parameterIndex,adInteger,sizeof(x),x);
 }
 
-void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x )
 {
     setParameter(parameterIndex,adBigInt,sizeof(x),x);
 }
 
-void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ )
 {
     OLEVariant aVal;
     aVal.setNull();
     setParameter(parameterIndex,adEmpty,0,aVal);
 }
 
-void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setClob", *this );
 }
 
-void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setBlob", *this );
 }
 
-void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setArray", *this );
 }
 
-void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setRef", *this );
 }
 
-void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale )
 {
     switch(sqlType)
     {
@@ -370,12 +370,12 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
     }
 }
 
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ )
 {
     setNull(parameterIndex,sqlType);
 }
 
-void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x )
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
@@ -387,22 +387,22 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
     }
 }
 
-void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x )
 {
     setParameter(parameterIndex,adSmallInt,sizeof(x),x);
 }
 
-void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x )
 {
     setParameter(parameterIndex,adVarBinary,sizeof(sal_Int8)*x.getLength(),x);
 }
 
-void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setCharacterStream", *this );
 }
 
-void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     if(x.is())
     {
@@ -412,7 +412,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con
     }
 }
 
-void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::clearParameters(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 46f1e86aca1c..1e2c5b76e44f 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -54,17 +54,17 @@ using namespace com::sun::star::sdbc;
 
 
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet");
-OUString SAL_CALL OResultSet::getImplementationName(  ) throw (css::uno::RuntimeException)
+OUString SAL_CALL OResultSet::getImplementationName(  )
 {
     return OUString("com.sun.star.sdbcx.ado.ResultSet");
 }
 
-css::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw(css::uno::RuntimeException)
+css::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  )
 {
     return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"};
 }
 
-sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException)
+sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -127,13 +127,13 @@ m_xStatement.clear();
 m_xMetaData.clear();
 }
 
-Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
+Any SAL_CALL OResultSet::queryInterface( const Type & rType )
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType);
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes(  ) throw(css::uno::RuntimeException)
+css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
                                     cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -143,7 +143,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes(  ) throw(css
 }
 
 
-sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -165,7 +165,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
 }
 #define BLOCK_SIZE 256
 
-Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -205,13 +205,13 @@ Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int
     return m_aValue.isNull() ? nullptr : new ::comphelper::SequenceInputStream(m_aValue.getByteSequence());
 }
 
-Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this );
     return nullptr;
 }
 
-OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OLEVariant OResultSet::getValue(sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -221,49 +221,49 @@ OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, Runt
     return m_aValue;
 }
 
-sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getBool();
 }
 
 
-sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getInt8();
 }
 
 
-Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getByteSequence();
 }
 
 
-css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getDate();
 }
 
 
-double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getDouble();
 }
 
 
-float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getFloat();
 }
 
 
-sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getInt32();
 }
 
 
-sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSet::getRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -276,14 +276,14 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 }
 
 
-sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getLong", *this );
     return sal_Int64(0);
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
+Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -294,64 +294,64 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
     return m_xMetaData;
 }
 
-Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *this );
     return nullptr;
 }
 
 
-Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this );
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBlob", *this );
     return nullptr;
 }
 
 
-Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *this );
     return nullptr;
 }
 
 
-Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
+Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     return getValue(columnIndex).makeAny();
 }
 
 
-sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getInt16();
 }
 
 
-OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getString();
 }
 
 
-css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getTime();
 }
 
 
-css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex )
 {
     return getValue(columnIndex).getDateTime();
 }
 
 
-sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::isAfterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -362,7 +362,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
     return bIsAtEOF == VARIANT_TRUE;
 }
 
-sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::isFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -371,7 +371,7 @@ sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
     return m_nRowPos == 1;
 }
 
-sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::isLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -380,7 +380,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
     return true;
 }
 
-void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::beforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -390,7 +390,7 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
         m_bOnFirstAfterOpen = !previous();
 }
 
-void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::afterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -402,7 +402,7 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 }
 
 
-void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -413,7 +413,7 @@ void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
 }
 
 
-sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::first(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -429,7 +429,7 @@ sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
 }
 
 
-sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::last(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -444,7 +444,7 @@ sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
     return bRet;
 }
 
-sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -477,7 +477,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt
     return bCheck;
 }
 
-sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -497,7 +497,7 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt
     return bRet;
 }
 
-sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::previous(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -511,7 +511,7 @@ sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
     return bRet;
 }
 
-Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException)
+Reference< XInterface > SAL_CALL OResultSet::getStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -519,7 +519,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException
 }
 
 
-sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::rowDeleted(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -533,7 +533,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeExceptio
     return bRet;
 }
 
-sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::rowInserted(  )
 {   ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
@@ -546,7 +546,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeExcepti
     return bRet;
 }
 
-sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::rowUpdated(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -558,7 +558,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
 }
 
 
-sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::isBeforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -575,7 +575,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeExcep
 }
 
 
-sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::next(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -606,7 +606,7 @@ sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 }
 
 
-sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::wasNull(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -616,7 +616,7 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 }
 
 
-void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
+void SAL_CALL OResultSet::cancel(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -625,16 +625,16 @@ void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
     m_pRecordSet->Cancel();
 }
 
-void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::clearWarnings(  )
 {
 }
 
-Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
+Any SAL_CALL OResultSet::getWarnings(  )
 {
     return Any();
 }
 
-void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::insertRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -645,7 +645,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
     m_pRecordSet->AddNew(aEmpty,aEmpty);
 }
 
-void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -656,7 +656,7 @@ void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
     m_pRecordSet->Update(aEmpty,aEmpty);
 }
 
-void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::deleteRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -667,7 +667,7 @@ void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException)
 }
 
 
-void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::cancelRowUpdates(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -677,7 +677,7 @@ void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeExcept
 }
 
 
-void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::moveToInsertRow(  )
 {
  //   ::osl::MutexGuard aGuard( m_aMutex );
     //checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -686,7 +686,7 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcepti
 }
 
 
-void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::moveToCurrentRow(  )
 {
 }
 
@@ -699,7 +699,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex,const OLEVariant& x)
     aField.PutValue(x);
 }
 
-void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex )
 {
     OLEVariant x;
     x.setNull();
@@ -707,72 +707,72 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
 }
 
 
-void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x )
 {
     updateValue(columnIndex,bool(x));
 }
 
-void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     if(!x.is())
         ::dbtools::throwFunctionSequenceException(*this);
@@ -782,7 +782,7 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     updateBytes(columnIndex,aSeq);
 }
 
-void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     if(!x.is())
         ::dbtools::throwFunctionSequenceException(*this);
@@ -792,7 +792,7 @@ void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Re
     updateBytes(columnIndex,aSeq);
 }
 
-void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::refreshRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -801,21 +801,21 @@ void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
     m_pRecordSet->Resync(adAffectCurrent);
 }
 
-void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x )
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
 
 
-void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ )
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
 
 // XRowLocate
-Any SAL_CALL OResultSet::getBookmark(  ) throw(SQLException, RuntimeException)
+Any SAL_CALL OResultSet::getBookmark(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -830,7 +830,7 @@ Any SAL_CALL OResultSet::getBookmark(  ) throw(SQLException, RuntimeException)
 
 }
 
-sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -845,7 +845,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLExc
     return SUCCEEDED(m_pRecordSet->Move(0,m_aBookmarks[nPos]));
 }
 
-sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -860,7 +860,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_I
     return SUCCEEDED(m_pRecordSet->Move(rows,m_aBookmarks[nPos]));
 }
 
-sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -879,7 +879,7 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any
     return ((sal_Int32)eNum) - 1;
 }
 
-sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -905,7 +905,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw(SQLException, Runtim
     return bValue;
 }
 
-sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -917,7 +917,7 @@ sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLExce
 }
 
 // XDeleteRows
-Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw(SQLException, RuntimeException)
+Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -966,7 +966,6 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro
 }
 
 sal_Int32 OResultSet::getResultSetConcurrency() const
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     sal_Int32 nValue=ResultSetConcurrency::READ_ONLY;
     LockTypeEnum eRet;
@@ -986,7 +985,6 @@ sal_Int32 OResultSet::getResultSetConcurrency() const
 }
 
 sal_Int32 OResultSet::getResultSetType() const
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     sal_Int32 nValue=0;
     CursorTypeEnum eRet;
@@ -1011,13 +1009,11 @@ sal_Int32 OResultSet::getResultSetType() const
 }
 
 sal_Int32 OResultSet::getFetchDirection()
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     return FetchDirection::FORWARD;
 }
 
 sal_Int32 OResultSet::getFetchSize() const
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     sal_Int32 nValue=-1;
     m_pRecordSet->get_CacheSize(&nValue);
@@ -1025,20 +1021,17 @@ sal_Int32 OResultSet::getFetchSize() const
 }
 
 OUString OResultSet::getCursorName()
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     return OUString();
 }
 
 
 void OResultSet::setFetchDirection(sal_Int32 /*_par0*/)
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "ResultSet::FetchDirection", *this );
 }
 
 void OResultSet::setFetchSize(sal_Int32 _par0)
-    throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     m_pRecordSet->put_CacheSize(_par0);
 }
@@ -1077,7 +1070,6 @@ sal_Bool OResultSet::convertFastPropertyValue(
                             Any & rOldValue,
                             sal_Int32 nHandle,
                             const Any& rValue )
-                                throw (css::lang::IllegalArgumentException)
 {
     switch(nHandle)
     {
@@ -1097,7 +1089,7 @@ sal_Bool OResultSet::convertFastPropertyValue(
     return false;
 }
 
-void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
+void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     switch(nHandle)
     {
@@ -1157,7 +1149,7 @@ void SAL_CALL OResultSet::release() throw()
     OResultSet_BASE::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index dc0b046c3552..37e7b2d2e3b2 100644
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
@@ -44,7 +44,7 @@ OResultSetMetaData::~OResultSetMetaData()
         m_pRecordSet->Release();
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid() && aField.GetActualSize() != -1)
@@ -53,14 +53,14 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     return ADOS::MapADOType2Jdbc(aField.GetADOType());
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  )
 {
     if(m_nColCount != -1 )
         return m_nColCount;
@@ -76,7 +76,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, Ru
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column )
 {
     bool bRet = false;
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
@@ -90,13 +90,13 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(
 }
 
 
-OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
 
-OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid())
@@ -105,7 +105,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ
     return OUString();
 }
 
-OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column )
 {
     OUString sTableName;
 
@@ -119,28 +119,28 @@ OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQL
     return sTableName;
 }
 
-OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column )
 {
     return getColumnName(column);
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid())
@@ -151,7 +151,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLEx
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column )
 {
     bool bRet = false;
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
@@ -167,7 +167,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid())
@@ -178,7 +178,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLExce
     return false;
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid())
@@ -186,7 +186,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ
     return 0;
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid())
@@ -195,7 +195,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::s
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid())
@@ -206,13 +206,13 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ )
 {
     return true;
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid())
@@ -223,7 +223,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid())
@@ -234,7 +234,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) t
 ;
 }
 
-sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column )
 {
     return isDefinitelyWritable(column);
 }
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 2afe88141be7..025be1b95b37 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -113,13 +113,13 @@ void SAL_CALL OStatement_Base::release() throw()
     release_ChildImpl();
 }
 
-Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException)
+Any SAL_CALL OStatement_Base::queryInterface( const Type & rType )
 {
     Any aRet = OStatement_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes(  ) throw(css::uno::RuntimeException)
+css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
                                     cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -129,7 +129,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes(  ) thro
 }
 
 
-void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
+void SAL_CALL OStatement_Base::cancel(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -139,7 +139,7 @@ void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
 }
 
 
-void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OStatement_Base::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -150,13 +150,13 @@ void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
 }
 
 
-void SAL_CALL OStatement::clearBatch(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OStatement::clearBatch(  )
 {
 
 }
 
 
-void OStatement_Base::reset() throw (SQLException)
+void OStatement_Base::reset()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -172,7 +172,7 @@ void OStatement_Base::reset() throw (SQLException)
 // If a ResultSet was created for this Statement, close it
 
 
-void OStatement_Base::clearMyResultSet () throw (SQLException)
+void OStatement_Base::clearMyResultSet ()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -189,7 +189,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException)
     m_xResultSet.clear();
 }
 
-sal_Int32 OStatement_Base::getRowCount () throw( SQLException)
+sal_Int32 OStatement_Base::getRowCount ()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -228,7 +228,7 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType)
 // Sets the warning
 
 
-void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException)
+void OStatement_Base::setWarning (const SQLWarning &ex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -249,7 +249,7 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS )
         m_RecordSet.PutRefDataSource( static_cast<IDispatch*>(m_Command) );
 }
 
-sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -279,7 +279,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep
     return m_RecordSet.IsValid();
 }
 
-Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -316,7 +316,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString&
 }
 
 
-Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -326,14 +326,14 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLEx
 }
 
 
-Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException)
+Any SAL_CALL OStatement::queryInterface( const Type & rType )
 {
     Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this));
     return aRet.hasValue() ? aRet : OStatement_Base::queryInterface(rType);
 }
 
 
-void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException)
+void SAL_CALL OStatement::addBatch( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -342,7 +342,7 @@ void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, Ru
     m_aBatchList.push_back(sql);
 }
 
-Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException, RuntimeException)
+Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -387,7 +387,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException,
 }
 
 
-sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -414,7 +414,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(S
 }
 
 
-Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -424,7 +424,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLExce
 }
 
 
-sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -437,7 +437,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  ) throw(SQLException, Runti
 }
 
 
-sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OStatement_Base::getMoreResults(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -470,7 +470,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, Runtim
 }
 
 
-Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeException)
+Any SAL_CALL OStatement_Base::getWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -480,7 +480,7 @@ Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeExcepti
 }
 
 
-void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OStatement_Base::clearWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -490,12 +490,12 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
 }
 
 
-sal_Int32 OStatement_Base::getQueryTimeOut() const  throw(SQLException, RuntimeException)
+sal_Int32 OStatement_Base::getQueryTimeOut() const
 {
     return m_Command.get_CommandTimeout();
 }
 
-sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeException)
+sal_Int32 OStatement_Base::getMaxRows() const
 {
     ADO_LONGPTR nRet=-1;
     if(!(m_RecordSet.IsValid() && m_RecordSet.get_MaxRecords(nRet)))
@@ -503,7 +503,7 @@ sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeExcepti
     return nRet;
 }
 
-sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, RuntimeException)
+sal_Int32 OStatement_Base::getResultSetConcurrency() const
 {
     sal_Int32 nValue;
 
@@ -520,7 +520,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, R
     return nValue;
 }
 
-sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeException)
+sal_Int32 OStatement_Base::getResultSetType() const
 {
     sal_Int32 nValue=0;
     switch(m_eCursorType)
@@ -540,27 +540,27 @@ sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeE
     return nValue;
 }
 
-sal_Int32 OStatement_Base::getFetchDirection() throw(SQLException, RuntimeException)
+sal_Int32 OStatement_Base::getFetchDirection()
 {
     return FetchDirection::FORWARD;
 }
 
-sal_Int32 OStatement_Base::getFetchSize() const throw(SQLException, RuntimeException)
+sal_Int32 OStatement_Base::getFetchSize() const
 {
     return m_nFetchSize;
 }
 
-sal_Int32 OStatement_Base::getMaxFieldSize() throw(SQLException, RuntimeException)
+sal_Int32 OStatement_Base::getMaxFieldSize()
 {
     return 0;
 }
 
-OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException)
+OUString OStatement_Base::getCursorName() const
 {
     return m_Command.GetName();
 }
 
-void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, RuntimeException)
+void OStatement_Base::setQueryTimeOut(sal_Int32 seconds)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -569,7 +569,7 @@ void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, Run
     m_Command.put_CommandTimeout(seconds);
 }
 
-void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void OStatement_Base::setMaxRows(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -577,7 +577,7 @@ void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeExc
     m_nMaxRows = _par0;
 }
 
-void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -593,7 +593,7 @@ void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLExceptio
     }
 }
 
-void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void OStatement_Base::setResultSetType(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -613,14 +613,14 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, Runt
     }
 }
 
-void OStatement_Base::setFetchDirection(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException)
+void OStatement_Base::setFetchDirection(sal_Int32 /*_par0*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedSQLException( "Statement::FetchDirection", *this );
 }
 
-void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void OStatement_Base::setFetchSize(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -629,14 +629,14 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeE
     m_nFetchSize = _par0;
 }
 
-void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException)
+void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedSQLException( "Statement::MaxFieldSize", *this );
 }
 
-void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException)
+void OStatement_Base::setCursorName(const OUString &_par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -685,7 +685,6 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
                             Any & rOldValue,
                             sal_Int32 nHandle,
                             const Any& rValue )
-                                throw (css::lang::IllegalArgumentException)
 {
     bool bModified = false;
 
@@ -734,7 +733,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
     return bModified;
 }
 
-void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
+void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     switch(nHandle)
     {
@@ -828,7 +827,7 @@ void SAL_CALL OStatement::release() throw()
     OStatement_Base::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(css::uno::RuntimeException)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index 23ddfff70979..6ef5fb391462 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -141,7 +141,7 @@ Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
+sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
@@ -149,7 +149,7 @@ sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run
 }
 
 // XRename
-void SAL_CALL OAdoTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
+void SAL_CALL OAdoTable::rename( const OUString& newName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -166,7 +166,7 @@ Reference< XDatabaseMetaData> OAdoTable::getMetaData() const
 }
 
 // XAlterTable
-void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
+void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -186,7 +186,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Refer
     refreshColumns();
 }
 
-void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException)
+void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -197,7 +197,7 @@ void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< X
         alterColumnByName(getString(xOld->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),descriptor);
 }
 
-void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
+void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     if(m_aTable.IsValid())
     {
@@ -229,7 +229,7 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV
     OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue);
 }
 
-OUString SAL_CALL OAdoTable::getName() throw(css::uno::RuntimeException)
+OUString SAL_CALL OAdoTable::getName()
 {
       return m_aTable.get_Name();
 }
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index bc3e9883578b..6f0a502642fb 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -49,7 +49,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
     return new OAdoTable(this,isCaseSensitive(),m_pCatalog,m_aCollection.GetItem(_rName));
 }
 
-void OTables::impl_refresh(  ) throw(RuntimeException)
+void OTables::impl_refresh(  )
 {
     OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
     m_aCollection.Refresh();
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index d874eb2638b6..447789f6a8fb 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -83,7 +83,7 @@ Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
+sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
@@ -91,7 +91,7 @@ sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (Runt
 }
 
 
-void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
+void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     if(m_aUser.IsValid())
     {
@@ -151,7 +151,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper()
     return *OUserExtend_PROP::getArrayHelper();
 }
 
-sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -159,7 +159,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 o
     return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType)));
 }
 
-sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -172,7 +172,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sa
     return nRights;
 }
 
-void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
+void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -180,7 +180,7 @@ void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objT
     ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this);
 }
 
-void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
+void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -189,7 +189,7 @@ void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 obj
 }
 
 // XUser
-void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword ) throw(SQLException, RuntimeException)
+void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index b136fe944d9a..74c22bd520d5 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -42,7 +42,7 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
     return new OAdoUser(m_pCatalog,isCaseSensitive(),_rName);
 }
 
-void OUsers::impl_refresh() throw(RuntimeException)
+void OUsers::impl_refresh()
 {
     m_aCollection.Refresh();
 }
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index 494e2dda8fc8..f39e93577597 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -58,7 +58,7 @@ Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
+sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index fb3336e2f2a3..d15fbf631657 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -45,7 +45,7 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName)
     return pView;
 }
 
-void OViews::impl_refresh(  ) throw(RuntimeException)
+void OViews::impl_refresh(  )
 {
     m_aCollection.Refresh();
 }
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index 51498dacfd24..f7e2667b3cdb 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -305,7 +305,7 @@ sal_Int32 ADOS::mapRights2Ado(sal_Int32 nRights)
     return eRights;
 }
 
-WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex)
 {
     if ( !_pRecordSet )
         return WpADOField();
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index c187256ecbda..04b37c071993 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -60,7 +60,6 @@ OCalcConnection::~OCalcConnection()
 }
 
 void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
-    throw(SQLException, RuntimeException, DeploymentException, std::exception)
 {
     //  open file
 
@@ -202,7 +201,7 @@ void OCalcConnection::disposing()
 IMPLEMENT_SERVICE_INFO(OCalcConnection, "com.sun.star.sdbc.drivers.calc.Connection", "com.sun.star.sdbc.Connection")
 
 
-Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -233,7 +232,7 @@ css::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog()
 }
 
 
-Reference< XStatement > SAL_CALL OCalcConnection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL OCalcConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -246,7 +245,6 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement(  ) throw(SQLE
 
 
 Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql )
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -261,7 +259,6 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons
 
 
 Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ )
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 47986d4119a4..795c72103152 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -138,7 +138,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
 
 Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
-        const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& columnNamePattern )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -232,7 +232,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
 }
 
 
-OUString SAL_CALL OCalcDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OCalcDatabaseMetaData::getURL(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -240,28 +240,28 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeE
 }
 
 
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     return SAL_MAX_INT32;
 }
 
 
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength(  )
 {
     return SAL_MAX_INT32;
 }
 
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength(  )
 {
     return SAL_MAX_INT32;
 }
 
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable(  )
 {
     return 256;
 }
@@ -341,7 +341,6 @@ static bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const OUSt
 Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/,
         const OUString& tableNamePattern, const Sequence< OUString >& types )
-        throw(SQLException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 2e207f841089..4ac9899e5042 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -36,12 +36,12 @@ using namespace ::com::sun::star::lang;
 
 // static ServiceInfo
 
-OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.sdbc.calc.ODriver");
 }
 
-OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL ODriver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
@@ -51,13 +51,13 @@ OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException, std
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL
     connectivity::calc::ODriver_CreateInstance(const css::uno::Reference<
-        css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception )
+        css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new ODriver( comphelper::getComponentContext(_rxFactory) ));
 }
 
 Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url,
-    const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception)
+    const Sequence< PropertyValue >& info )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)
@@ -75,12 +75,11 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url,
 }
 
 sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
-                throw(SQLException, RuntimeException, std::exception)
 {
     return url.startsWith("sdbc:calc:");
 }
 
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ )
 {
     if ( !acceptsURL(url) )
     {
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index dc175865151e..b13f14a037f0 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -43,12 +43,12 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                cppu::UnoType<bool>::get());
 }
 
-OUString SAL_CALL OCalcResultSet::getImplementationName(  ) throw ( RuntimeException, std::exception)
+OUString SAL_CALL OCalcResultSet::getImplementationName(  )
 {
     return OUString("com.sun.star.sdbcx.calc.ResultSet");
 }
 
-Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames(  ) throw( RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames(  )
 {
      Sequence< OUString > aSupported(2);
     aSupported[0] = "com.sun.star.sdbc.ResultSet";
@@ -56,25 +56,25 @@ Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames(  ) throw
     return aSupported;
 }
 
-sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception)
+sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType )
 {
     Any aRet = OResultSet::queryInterface(rType);
     return aRet.hasValue() ? aRet : OCalcResultSet_BASE::queryInterface(rType);
 }
 
- Sequence<  Type > SAL_CALL OCalcResultSet::getTypes(  ) throw( RuntimeException, std::exception)
+ Sequence<  Type > SAL_CALL OCalcResultSet::getTypes(  )
 {
     return ::comphelper::concatSequences(OResultSet::getTypes(),OCalcResultSet_BASE::getTypes());
 }
 
 
 // XRowLocate
-Any SAL_CALL OCalcResultSet::getBookmark(  ) throw( SQLException,  RuntimeException, std::exception)
+Any SAL_CALL OCalcResultSet::getBookmark(  )
 {
      ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -83,7 +83,7 @@ Any SAL_CALL OCalcResultSet::getBookmark(  ) throw( SQLException,  RuntimeExcept
     return makeAny((sal_Int32)(m_aRow->get())[0]->getValue());
 }
 
-sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const  Any& bookmark )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -94,7 +94,7 @@ sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const  Any& bookmark ) throw(
     return Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),true);
 }
 
-sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -108,17 +108,17 @@ sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const  Any& bookmark,
 }
 
 
-sal_Int32 SAL_CALL OCalcResultSet::compareBookmarks( const Any& lhs, const  Any& rhs ) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCalcResultSet::compareBookmarks( const Any& lhs, const  Any& rhs )
 {
     return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL;
 }
 
-sal_Bool SAL_CALL OCalcResultSet::hasOrderedBookmarks(  ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL OCalcResultSet::hasOrderedBookmarks(  )
 {
     return true;
 }
 
-sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const  Any& bookmark )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -128,7 +128,7 @@ sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const  Any& bookmark ) throw( S
 }
 
 // XDeleteRows
-Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const  Sequence<  Any >& /*rows*/ ) throw( SQLException,  RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const  Sequence<  Any >& /*rows*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -166,7 +166,7 @@ void SAL_CALL OCalcResultSet::release() throw()
     OCalcResultSet_BASE2::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index cae94275f944..97cf3fa98fcf 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -642,7 +642,7 @@ void SAL_CALL OCalcTable::disposing()
 
 }
 
-Sequence< Type > SAL_CALL OCalcTable::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OCalcTable::getTypes(  )
 {
     Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
     ::std::vector<Type> aOwnTypes;
@@ -665,7 +665,7 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes(  ) throw(RuntimeException, std::
 }
 
 
-Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OCalcTable::queryInterface( const Type & rType )
 {
     if( rType == cppu::UnoType<XKeysSupplier>::get()||
         rType == cppu::UnoType<XIndexesSupplier>::get()||
@@ -696,7 +696,7 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
+sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index 126514003ba3..c4730d75b6a8 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -46,7 +46,7 @@ sdbcx::ObjectType ODbaseColumns::createObject(const OUString& _rName)
 }
 
 
-void ODbaseColumns::impl_refresh() throw(RuntimeException)
+void ODbaseColumns::impl_refresh()
 {
     m_pTable->refreshColumns();
 }
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index 5c5c0d232fd9..0a56d952e49b 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -53,7 +53,7 @@ ODbaseConnection::~ODbaseConnection()
 IMPLEMENT_SERVICE_INFO(ODbaseConnection, "com.sun.star.sdbc.drivers.dbase.Connection", "com.sun.star.sdbc.Connection")
 
 
-Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -82,7 +82,7 @@ css::uno::Reference< XTablesSupplier > ODbaseConnection::createCatalog()
     return xTab;
 }
 
-Reference< XStatement > SAL_CALL ODbaseConnection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL ODbaseConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -93,7 +93,7 @@ Reference< XStatement > SAL_CALL ODbaseConnection::createStatement(  ) throw(SQL
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -106,7 +106,7 @@ Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( con
     return pStmt;
 }
 
-Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this );
     return nullptr;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 1293e9fa71fd..758f5a9d097a 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -154,7 +154,7 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
 
 Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
-        const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& columnNamePattern )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -254,7 +254,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
 
 Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     const Any& /*catalog*/, const OUString& /*schema*/, const OUString& table,
-        sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException, std::exception)
+        sal_Bool unique, sal_Bool /*approximate*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -328,48 +328,48 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     return xRef;
 }
 
-OUString SAL_CALL ODbaseDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODbaseDatabaseMetaData::getURL(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return "sdbc:dbase:" + m_pConnection->getURL();
 }
 
-sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     return SAL_MAX_INT32;
 }
 
-sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength(  )
 {
     return 254;
 }
 
-sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength(  )
 {
     return 10;
 }
 
-sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable(  )
 {
     return 128;
 }
 
-sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index cf0967fcc303..21ecbe05ac8c 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -35,24 +35,24 @@ using namespace ::com::sun::star::lang;
 
 // static ServiceInfo
 
-OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.sdbc.dbase.ODriver");
 }
 
 
-OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL ODriver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
 
-css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception )
+css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new ODriver( comphelper::getComponentContext(_rxFactory) ));
 }
 
-Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)
@@ -69,12 +69,12 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S
     return xCon;
 }
 
-sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
 {
     return url.startsWith("sdbc:dbase:");
 }
 
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ )
 {
     if ( acceptsURL(url) )
     {
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 416ad8d6653f..283700649dea 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -123,7 +123,7 @@ Sequence< sal_Int8 > ODbaseIndex::getUnoTunnelImplementationId()
 
 // XUnoTunnel
 
-sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
+sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 951c0982f41b..9a586b162edd 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -65,7 +65,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName)
 }
 
 
-void ODbaseIndexColumns::impl_refresh() throw(RuntimeException)
+void ODbaseIndexColumns::impl_refresh()
 {
     m_pIndex->refreshColumns();
 }
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index 34e98ec25e9b..f1a722615335 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -78,7 +78,7 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& _rName)
     return xRet;
 }
 
-void ODbaseIndexes::impl_refresh(  ) throw(RuntimeException)
+void ODbaseIndexes::impl_refresh(  )
 {
     if(m_pTable)
         m_pTable->refreshIndexes();
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index a93fde690981..cc133550114f 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -46,12 +46,12 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                cppu::UnoType<bool>::get());
 }
 
-OUString SAL_CALL ODbaseResultSet::getImplementationName(  ) throw ( RuntimeException, std::exception)
+OUString SAL_CALL ODbaseResultSet::getImplementationName(  )
 {
     return OUString("com.sun.star.sdbcx.dbase.ResultSet");
 }
 
-Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  ) throw( RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  )
 {
      Sequence< OUString > aSupported(2);
     aSupported[0] = "com.sun.star.sdbc.ResultSet";
@@ -59,25 +59,25 @@ Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  ) thro
     return aSupported;
 }
 
-sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception)
+sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType )
 {
     Any aRet = ODbaseResultSet_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OResultSet::queryInterface(rType);
 }
 
- Sequence<  Type > SAL_CALL ODbaseResultSet::getTypes(  ) throw( RuntimeException, std::exception)
+ Sequence<  Type > SAL_CALL ODbaseResultSet::getTypes(  )
 {
     return ::comphelper::concatSequences(OResultSet::getTypes(),ODbaseResultSet_BASE::getTypes());
 }
 
 
 // XRowLocate
-Any SAL_CALL ODbaseResultSet::getBookmark(  ) throw( SQLException,  RuntimeException, std::exception)
+Any SAL_CALL ODbaseResultSet::getBookmark(  )
 {
      ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -86,7 +86,7 @@ Any SAL_CALL ODbaseResultSet::getBookmark(  ) throw( SQLException,  RuntimeExcep
     return makeAny((sal_Int32)(m_aRow->get())[0]->getValue());
 }
 
-sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const  Any& bookmark )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -97,7 +97,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const  Any& bookmark ) throw(
     return m_pTable.is() && Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),true);
 }
 
-sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -111,7 +111,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const  Any& bookmark,
 }
 
 
-sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& rhs )
 {
     sal_Int32 nFirst(0),nSecond(0),nResult(0);
     if ( !( lhs  >>= nFirst ) || !( rhs >>= nSecond ) )
@@ -131,12 +131,12 @@ sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any&
     return  nResult;
 }
 
-sal_Bool SAL_CALL ODbaseResultSet::hasOrderedBookmarks(  ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL ODbaseResultSet::hasOrderedBookmarks(  )
 {
     return true;
 }
 
-sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const  Any& bookmark )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -146,7 +146,7 @@ sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const  Any& bookmark ) throw(
 }
 
 // XDeleteRows
-Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const  Sequence<  Any >& /*rows*/ ) throw( SQLException,  RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const  Sequence<  Any >& /*rows*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -207,7 +207,7 @@ void SAL_CALL ODbaseResultSet::release() throw()
     ODbaseResultSet_BASE2::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 0229fae7ee46..0408c7929f81 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -727,7 +727,7 @@ void SAL_CALL ODbaseTable::disposing()
     m_aColumns = nullptr;
 }
 
-Sequence< Type > SAL_CALL ODbaseTable::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL ODbaseTable::getTypes(  )
 {
     Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
     ::std::vector<Type> aOwnTypes;
@@ -748,7 +748,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes(  ) throw(RuntimeException, std:
 }
 
 
-Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL ODbaseTable::queryInterface( const Type & rType )
 {
     if( rType == cppu::UnoType<XKeysSupplier>::get()||
         rType == cppu::UnoType<XDataDescriptorFactory>::get())
@@ -776,7 +776,7 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
+sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
@@ -2146,7 +2146,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, std::size_t& rBlockNr
 
 
 // XAlterTable
-void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -2165,7 +2165,7 @@ void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Ref
     }
 }
 
-void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -2301,7 +2301,7 @@ Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const
     return getConnection()->getMetaData();
 }
 
-void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception)
+void SAL_CALL ODbaseTable::rename( const OUString& newName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -2357,7 +2357,7 @@ namespace
     }
 }
 
-void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception)
+void SAL_CALL ODbaseTable::renameImpl( const OUString& newName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 04211f521b5d..a2a5add764e3 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -56,7 +56,7 @@ sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName)
     return xRet;
 }
 
-void ODbaseTables::impl_refresh(  ) throw(RuntimeException)
+void ODbaseTables::impl_refresh(  )
 {
     static_cast<ODbaseCatalog*>(&m_rParent)->refreshTables();
 }
@@ -124,7 +124,7 @@ void ODbaseTables::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
     }
 }
 
-Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL ODbaseTables::queryInterface( const Type & rType )
 {
     typedef sdbcx::OCollection OTables_BASE;
     return OTables_BASE::queryInterface(rType);
diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index acc455a96e41..b0f9945b116d 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -61,7 +61,7 @@ void OEvoabCatalog::refreshTables()
         m_pTables = new OEvoabTables(m_xMetaData,*this,m_aMutex,aVector);
 }
 // XTablesSupplier
-Reference< XNameAccess > SAL_CALL  OEvoabCatalog::getTables(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL  OEvoabCatalog::getTables(  )
 {
         ::osl::MutexGuard aGuard(m_aMutex);
 
diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx
index 05afef5554d7..617a0cfe64f3 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
@@ -39,7 +39,7 @@ namespace connectivity
             virtual void refreshUsers() override {}
  // XTablesSupplier
             virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(
-                                        ) throw(css::uno::RuntimeException, std::exception) override;
+                                        ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index 812911e4e40e..46c42c69b137 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -81,7 +81,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName)
     return xRet;
 }
 
-void OEvoabColumns::impl_refresh() throw(RuntimeException)
+void OEvoabColumns::impl_refresh()
 {
     m_pTable->refreshColumns();
 }
diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx
index d405efb83b10..e7e2065a5ac5 100644
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
@@ -33,7 +33,7 @@ namespace connectivity
             OEvoabTable*    m_pTable;
 
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
 
         public:
             OEvoabColumns(  OEvoabTable* _pTable,
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index a9975170727c..fa6fd275e5b6 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -69,7 +69,7 @@ void SAL_CALL OEvoabConnection::release() throw()
 IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connection", "com.sun.star.sdbc.Connection")
 
 
-void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info)  throw(SQLException)
+void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info)
 {
     osl_atomic_increment( &m_refCount );
     SAL_INFO("connectivity.evoab2", "OEvoabConnection::construct()::url = " << url );
@@ -100,13 +100,13 @@ void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyVa
 }
 
 
-OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql )
 {
     // when you need to transform SQL92 to you driver specific you can do it here
     return _sSql;
 }
 
-Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -134,7 +134,7 @@ css::uno::Reference< XTablesSupplier > OEvoabConnection::createCatalog()
      return xTab;
 }
 
-Reference< XStatement > SAL_CALL OEvoabConnection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL OEvoabConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -146,7 +146,7 @@ Reference< XStatement > SAL_CALL OEvoabConnection::createStatement(  ) throw(SQL
     return xStmt;
 }
 
-Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -159,12 +159,12 @@ Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( con
     return xStmt;
 }
 
-Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) throw( SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this );
     return nullptr;
 }
-sal_Bool SAL_CALL OEvoabConnection::isClosed(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabConnection::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return OConnection_BASE::rBHelper.bDisposed;
@@ -172,7 +172,7 @@ sal_Bool SAL_CALL OEvoabConnection::isClosed(  ) throw(SQLException, RuntimeExce
 
 
 // XCloseable
-void SAL_CALL OEvoabConnection::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabConnection::close(  )
 {
     {  // we just dispose us
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -183,11 +183,11 @@ void SAL_CALL OEvoabConnection::close(  ) throw(SQLException, RuntimeException,
 
 
 // XWarningsSupplier
-Any SAL_CALL OEvoabConnection::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OEvoabConnection::getWarnings(  )
 {
     return m_aWarnings.getWarnings();
 }
-void SAL_CALL OEvoabConnection::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabConnection::clearWarnings(  )
 {
     m_aWarnings.clearWarnings();
 }
@@ -202,53 +202,53 @@ void OEvoabConnection::disposing()
 }
 
 // -------------------------------- stubbed methods ------------------------------------------------
-void SAL_CALL OEvoabConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabConnection::setAutoCommit( sal_Bool /*autoCommit*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setAutoCommit", *this );
 }
-sal_Bool SAL_CALL OEvoabConnection::getAutoCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabConnection::getAutoCommit(  )
 {
     return true;
 }
-void SAL_CALL OEvoabConnection::commit(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabConnection::commit(  )
 {
 }
-void SAL_CALL OEvoabConnection::rollback(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabConnection::rollback(  )
 {
 }
-void SAL_CALL OEvoabConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabConnection::setReadOnly( sal_Bool /*readOnly*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setReadOnly", *this );
 }
-sal_Bool SAL_CALL OEvoabConnection::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabConnection::isReadOnly(  )
 {
     return false;
 }
-void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setCatalog", *this );
 }
 
-OUString SAL_CALL OEvoabConnection::getCatalog(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabConnection::getCatalog(  )
 {
     return OUString();
 }
-void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTransactionIsolation", *this );
 }
 
-sal_Int32 SAL_CALL OEvoabConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabConnection::getTransactionIsolation(  )
 {
     return TransactionIsolation::NONE;
 }
 
-Reference< css::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap(  )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::getTypeMap", *this );
     return nullptr;
 }
-void SAL_CALL OEvoabConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this );
 }
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index bc1a39608f23..903d7255885a 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -66,7 +66,7 @@ namespace connectivity
         public:
             explicit OEvoabConnection( OEvoabDriver& _rDriver );
             /// @throws css::sdbc::SQLException
-            virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) throw( css::sdbc::SQLException);
+            virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo );
 
             inline OString const & getPassword() { return m_aPassword; }
             inline void         setPassword( OString const & aStr ) { m_aPassword = aStr; }
@@ -86,30 +86,30 @@ namespace connectivity
 
             // XConnection
             virtual css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog();
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+            virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+            virtual void SAL_CALL commit(  ) override;
+            virtual void SAL_CALL rollback(  ) override;
+            virtual sal_Bool SAL_CALL isClosed(  ) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+            virtual OUString SAL_CALL getCatalog(  ) override;
+            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 11fa505f6ee5..440a62b24d4f 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -322,47 +322,47 @@ OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw(  )
     return OUString();
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable(  )
 {
     return 0;// 0 means no limit
 }
@@ -372,7 +372,7 @@ sal_Int32 OEvoabDatabaseMetaData::impl_getMaxStatements_throw(  )
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength(  )
 {
     return 0;// 0 means no limit
 }
@@ -384,17 +384,17 @@ sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 }
 
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers(  )
 {
     return false;
 }
@@ -404,17 +404,17 @@ bool OEvoabDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesMixedCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseIdentifiers(  )
 {
     return false;
 }
@@ -429,17 +429,17 @@ bool OEvoabDatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
     return false;
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns(  )
 {
     return false;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm(  )
 {
     OUString aVal;
     return aVal;
@@ -452,13 +452,13 @@ OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
     return aVal;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters(  )
 {
     OUString aVal;
     return aVal;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     return false;
 }
@@ -468,57 +468,57 @@ bool OEvoabDatabaseMetaData::impl_isCatalogAtStart_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionIgnoredInTransactions(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionCausesTransactionCommit(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataManipulationTransactionsOnly(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedDelete(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ )
 {
     return false;
 }
@@ -528,22 +528,22 @@ bool OEvoabDatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92FullSQL(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     return true; // should be supported at least
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInIndexDefinitions(  )
 {
     return false;
 }
@@ -558,7 +558,7 @@ bool OEvoabDatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInIndexDefinitions(  )
 {
     return false;
 }
@@ -568,145 +568,145 @@ bool OEvoabDatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::allProceduresAreCallable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsStoredProcedures(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSelectForUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable(  )
 {
     // We allow you to select from any table.
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly(  )
 {
     // For now definitely read-only, no support for update/delete
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFiles(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFilePerTable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTypeConversion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsColumnAliasing(  )
 {
     // todo add Support for this.
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTableCorrelationNames(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleResultSets(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLikeEscapeClause(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOrderByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnionAll(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMixedCaseIdentifiers(  )
 {
     return false;
 }
@@ -717,271 +717,271 @@ bool OEvoabDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtStart(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedHigh(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedLow(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInExists(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInIns(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     return false;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getURL(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_pConnection->getURL();
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getUserName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion()
 {
     return OUString( "1" );
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion(  )
 {
     return OUString( "0" );
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm(  )
 {
     OUString aValue;
     return aValue;
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMajorVersion(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDefaultTransactionIsolation(  )
 {
     return TransactionIsolation::NONE;
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion(  )
 {
     return 0;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions(  )
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCoreSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMinimumSQLGrammar(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsFullOuterJoins(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates(  )
 {
     return false;
 }
@@ -991,7 +991,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates(  ) throw(SQLExce
 // of course you could implement it on your and you should do this because
 // the general way is more memory expensive
 
-Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes(  )
 {
     /* Don't need to change as evoab driver supports only table */
 
@@ -1069,7 +1069,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
 
 Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
-    const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& columnNamePattern )
 {
     // this returns an empty resultset where the column-names are already set
     // in special the metadata of the resultset already returns the right columns
@@ -1091,7 +1091,7 @@ bool isSourceBackend(ESource *pSource, const char *backendname)
 
 Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/,
-    const OUString& /*tableNamePattern*/, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& /*tableNamePattern*/, const Sequence< OUString >& types )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1227,7 +1227,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
     return xRef;
 }
 
-Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XDatabaseMetaDaza::getUDTs", *this );
     return nullptr;
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 5d2d7645b3cb..39a9b2adaa54 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -91,129 +91,129 @@ namespace connectivity
 
             // as I mentioned before this interface is really BIG
             // XDatabaseMetaData
-            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getUserName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-
-            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-
-            virtual OUString SAL_CALL getSQLKeywords(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getNumericFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getStringFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSystemFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSearchStringEscape(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSchemaTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getProcedureTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual OUString SAL_CALL getUserName(  ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductName(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductVersion(  ) override;
+            virtual OUString SAL_CALL getDriverName(  ) override;
+            virtual OUString SAL_CALL getDriverVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
+
+            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
+
+            virtual OUString SAL_CALL getSQLKeywords(  ) override;
+            virtual OUString SAL_CALL getNumericFunctions(  ) override;
+            virtual OUString SAL_CALL getStringFunctions(  ) override;
+            virtual OUString SAL_CALL getSystemFunctions(  ) override;
+            virtual OUString SAL_CALL getTimeDateFunctions(  ) override;
+            virtual OUString SAL_CALL getSearchStringEscape(  ) override;
+            virtual OUString SAL_CALL getExtraNameCharacters(  ) override;
+            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+            virtual OUString SAL_CALL getSchemaTerm(  ) override;
+            virtual OUString SAL_CALL getProcedureTerm(  ) override;
+            virtual OUString SAL_CALL getCatalogTerm(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index d4a7baa033cd..bc98a3f18fb3 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -79,7 +79,7 @@ void OEvoabDriver::disposing()
 
 // static ServiceInfo
 
-OUString OEvoabDriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString OEvoabDriver::getImplementationName_Static(  )
 {
     return OUString(EVOAB_DRIVER_IMPL_NAME);
     // this name is referenced in the configuration and in the evoab.xml
@@ -87,7 +87,7 @@ OUString OEvoabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 }
 
 
-Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static(  )
 {
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
@@ -95,28 +95,28 @@ Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static(  ) throw (Ru
     return aSNS;
 }
 
-OUString SAL_CALL OEvoabDriver::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OEvoabDriver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
 
-css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception )
+css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new OEvoabDriver(_rxFactory));
 }
 
-Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)
@@ -134,13 +134,12 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, co
 }
 
 sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const OUString& url )
-    throw(SQLException, RuntimeException, std::exception)
 {
     return acceptsURL_Stat(url);
 }
 
 
-Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception)
+Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ )
 {
     if ( ! acceptsURL(url) )
     {
@@ -154,12 +153,12 @@ Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUS
 }
 
 
-sal_Int32 SAL_CALL OEvoabDriver::getMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDriver::getMajorVersion(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion(  )
 {
     return 0;
 }
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index 952b9a060e5e..c0570e9186ce 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -34,7 +34,7 @@ namespace connectivity
     namespace evoab
     {
         /// @throws css::uno::Exception
-        css::uno::Reference< css::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception );
+        css::uno::Reference< css::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
 
         typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver,
@@ -58,22 +58,22 @@ namespace connectivity
 
             // XInterface
             /// @throws css::uno::RuntimeException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
             /// @throws css::uno::RuntimeException
-            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getImplementationName(  ) override;
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Int32 SAL_CALL getMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
 
         public:
             const css::uno::Reference< css::lang::XMultiServiceFactory >
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 4a11eb341ac2..f9448f098fe0 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -82,7 +82,7 @@ void SAL_CALL OEvoabPreparedStatement::release() throw()
 }
 
 
-Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType )
 {
     Any aRet = OCommonStatement::queryInterface(rType);
     if(!aRet.hasValue())
@@ -90,13 +90,13 @@ Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OEvoabPreparedStatement::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OEvoabPreparedStatement::getTypes(  )
 {
     return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes());
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -107,7 +107,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData(
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::close(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -125,7 +125,7 @@ void SAL_CALL OEvoabPreparedStatement::close(  ) throw(SQLException, RuntimeExce
 }
 
 
-sal_Bool SAL_CALL OEvoabPreparedStatement::execute(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabPreparedStatement::execute(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -135,7 +135,7 @@ sal_Bool SAL_CALL OEvoabPreparedStatement::execute(  ) throw(SQLException, Runti
 }
 
 
-sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -144,13 +144,13 @@ sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate(  ) throw(SQLException
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setString", *this );
 }
 
 
-Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -159,7 +159,7 @@ Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection(  ) thr
 }
 
 
-Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -168,103 +168,103 @@ Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery(  ) throw
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBoolean", *this );
 
 }
 
-void SAL_CALL OEvoabPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setByte", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setDate", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setTime", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setTimestamp", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setDouble", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setFloat", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setInt", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setLong", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setNull", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setClob", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBlob", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setArray", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setRef", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setObjectWithInfo", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setObjectNull", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x )
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
@@ -277,45 +277,45 @@ void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, cons
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setShort", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBytes", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setCharacterStream", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBinaryStream", *this );
 }
 
 
-void SAL_CALL OEvoabPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabPreparedStatement::clearParameters(  )
 {
 }
 
-Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::getResultSet(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::getResultSet(  )
 {
     return nullptr;
 }
 
-sal_Int32 SAL_CALL OEvoabPreparedStatement::getUpdateCount(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabPreparedStatement::getUpdateCount(  )
 {
     return 0;
 }
 
-sal_Bool SAL_CALL OEvoabPreparedStatement::getMoreResults(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabPreparedStatement::getMoreResults(  )
 {
     return false;
 }
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index 2c64888d3ee6..95cdc50d3176 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
@@ -80,49 +80,49 @@ namespace connectivity
         protected:
             DECLARE_SERVICE_INFO();
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPreparedStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) override;
+            virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
+            virtual sal_Bool SAL_CALL execute(  ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
             // XParameters
-            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+            virtual void SAL_CALL clearParameters(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XMultipleResults
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getUpdateCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getMoreResults(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+            virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+            virtual sal_Bool SAL_CALL getMoreResults(  ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index c01026062c4c..d33c8f2a4512 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -65,18 +65,18 @@ using namespace com::sun::star::io;
 namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
 
 
-OUString SAL_CALL OEvoabResultSet::getImplementationName(  ) throw ( RuntimeException, std::exception)
+OUString SAL_CALL OEvoabResultSet::getImplementationName(  )
 {
     return OUString("com.sun.star.sdbcx.evoab.ResultSet");
 }
 
- Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames(  ) throw( RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames(  )
 {
      Sequence< OUString > aSupported { "com.sun.star.sdbc.ResultSet" };
     return aSupported;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -720,7 +720,7 @@ void OEvoabResultSet::disposing()
     m_xMetaData.clear();
 }
 
-Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType )
 {
     Any aRet = ::comphelper::OPropertyContainer::queryInterface(rType);
     if(!aRet.hasValue())
@@ -728,7 +728,7 @@ Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(Runtime
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OEvoabResultSet::getTypes(  ) throw( RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OEvoabResultSet::getTypes(  )
 {
     return ::comphelper::concatSequences(
         OResultSet_BASE::getTypes(),
@@ -746,7 +746,7 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes(  ) throw( RuntimeException,
  * If the equivalent NResultSetMetaData.cxx marks the columntype of
  * nColumnNum as DataType::VARCHAR this accessor is used.
  */
-OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -761,7 +761,7 @@ OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLEx
     return aResult;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -777,103 +777,103 @@ sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLE
     return bResult;
 }
 
-sal_Int64 SAL_CALL OEvoabResultSet::getLong( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OEvoabResultSet::getLong( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getLong", *this );
     return sal_Int64();
 }
 
-Reference< XArray > SAL_CALL OEvoabResultSet::getArray( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL OEvoabResultSet::getArray( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getArray", *this );
     return nullptr;
 }
 
-Reference< XClob > SAL_CALL OEvoabResultSet::getClob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL OEvoabResultSet::getClob( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this );
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL OEvoabResultSet::getBlob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL OEvoabResultSet::getBlob( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBlob", *this );
     return nullptr;
 }
 
-Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getRef", *this );
     return nullptr;
 }
 
-Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getObject", *this );
     return Any();
 }
 
-sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getShort", *this );
     return 0;
 }
 
-css::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getTime", *this );
     return css::util::Time();
 }
 
-util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getTimestamp", *this );
     return css::util::DateTime();
 }
 
-Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBinaryStream", *this );
     return nullptr;
 }
 
-Reference< XInputStream > SAL_CALL OEvoabResultSet::getCharacterStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInputStream > SAL_CALL OEvoabResultSet::getCharacterStream( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getCharacterStream", *this );
     return nullptr;
 }
 
-sal_Int8 SAL_CALL OEvoabResultSet::getByte( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL OEvoabResultSet::getByte( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getByte", *this );
     return 0;
 }
 
-Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBytes", *this );
     return Sequence< sal_Int8 >();
 }
 
-css::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getDate", *this );
     return css::util::Date();
 }
 
-double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getDouble", *this );
     return 0;
 }
 
-float SAL_CALL OEvoabResultSet::getFloat( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL OEvoabResultSet::getFloat( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getFloat", *this );
     return 0;
 }
 
-sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getInt", *this );
     return 0;
@@ -882,7 +882,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQL
 
 
 // XResultSetMetaDataSupplier Interface
-Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -895,7 +895,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData(  ) throw(
 
 
 // XResultSet Interface
-sal_Bool SAL_CALL OEvoabResultSet::next(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::next(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -907,7 +907,7 @@ sal_Bool SAL_CALL OEvoabResultSet::next(  ) throw(SQLException, RuntimeException
         return false;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::wasNull(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -915,7 +915,7 @@ sal_Bool SAL_CALL OEvoabResultSet::wasNull(  ) throw(SQLException, RuntimeExcept
     return m_bWasNull;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -923,7 +923,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst(  ) throw(SQLException, Runtime
     return m_nIndex < 0;
 }
 
-sal_Int32 SAL_CALL OEvoabResultSet::getRow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabResultSet::getRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -931,7 +931,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::getRow(  ) throw(SQLException, RuntimeExcept
     return m_nIndex;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::isAfterLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::isAfterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -939,7 +939,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isAfterLast(  ) throw(SQLException, RuntimeEx
     return m_nIndex >= m_nLength;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::isFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::isFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -947,7 +947,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isFirst(  ) throw(SQLException, RuntimeExcept
     return m_nIndex == 0;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::isLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::isLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -955,7 +955,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isLast(  ) throw(SQLException, RuntimeExcepti
     return m_nIndex == m_nLength - 1;
 }
 
-void SAL_CALL OEvoabResultSet::beforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabResultSet::beforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -963,7 +963,7 @@ void SAL_CALL OEvoabResultSet::beforeFirst(  ) throw(SQLException, RuntimeExcept
     m_nIndex = -1;
 }
 
-void SAL_CALL OEvoabResultSet::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabResultSet::afterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -972,7 +972,7 @@ void SAL_CALL OEvoabResultSet::afterLast(  ) throw(SQLException, RuntimeExceptio
 }
 
 
-sal_Bool SAL_CALL OEvoabResultSet::first(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::first(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -982,7 +982,7 @@ sal_Bool SAL_CALL OEvoabResultSet::first(  ) throw(SQLException, RuntimeExceptio
 }
 
 
-sal_Bool SAL_CALL OEvoabResultSet::last(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::last(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -991,7 +991,7 @@ sal_Bool SAL_CALL OEvoabResultSet::last(  ) throw(SQLException, RuntimeException
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1003,7 +1003,7 @@ sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException,
         return false;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1016,7 +1016,7 @@ sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException,
         return false;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::previous(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::previous(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1029,7 +1029,7 @@ sal_Bool SAL_CALL OEvoabResultSet::previous(  ) throw(SQLException, RuntimeExcep
         return false;
 }
 
-Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1038,7 +1038,7 @@ css::uno::WeakReferenceHelper      aStatement(static_cast<OWeakObject*>(m_pState
 }
 
 
-sal_Bool SAL_CALL OEvoabResultSet::rowDeleted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::rowDeleted(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1046,7 +1046,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowDeleted(  ) throw(SQLException, RuntimeExc
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::rowInserted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::rowInserted(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1054,7 +1054,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowInserted(  ) throw(SQLException, RuntimeEx
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabResultSet::rowUpdated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSet::rowUpdated(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1062,7 +1062,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowUpdated(  ) throw(SQLException, RuntimeExc
     return false;
 }
 
-void SAL_CALL OEvoabResultSet::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabResultSet::refreshRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1071,14 +1071,14 @@ void SAL_CALL OEvoabResultSet::refreshRow(  ) throw(SQLException, RuntimeExcepti
 
 // XCancellable
 
-void SAL_CALL OEvoabResultSet::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OEvoabResultSet::cancel(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
 
 //XCloseable
-void SAL_CALL OEvoabResultSet::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabResultSet::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1089,18 +1089,18 @@ void SAL_CALL OEvoabResultSet::close(  ) throw(SQLException, RuntimeException, s
 
 // XWarningsSupplier
 
-void SAL_CALL OEvoabResultSet::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OEvoabResultSet::clearWarnings(  )
 {
     m_aWarnings.clearWarnings();
 }
 
-Any SAL_CALL OEvoabResultSet::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OEvoabResultSet::getWarnings(  )
 {
     return m_aWarnings.getWarnings();
 }
 
 //XColumnLocate Interface
-sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1147,7 +1147,7 @@ void SAL_CALL OEvoabResultSet::release() throw()
 }
 
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-OEvoabResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+OEvoabResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 422ef5ac7ee5..6d506dc238e9 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -131,64 +131,64 @@ namespace connectivity
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
             // XCancellable
-             virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+             virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 4f742a625899..8e0fda36dcbc 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -39,7 +39,7 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData()
 {
 }
 
-void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
+void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns)
 {
         OSQLColumns::Vector::const_iterator aIter;
         static const char aName[] = "Name";
@@ -64,45 +64,45 @@ void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity
 }
 
 
-sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnDisplaySize( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnDisplaySize( sal_Int32 /*nColumnNum*/ )
 {
     return 50;
 }
 
-sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnType( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnType( sal_Int32 nColumnNum )
 {
         sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     return evoab::getFieldType (nField);
 }
 
-sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnCount(  )
 {
     return m_aEvoabFields.size();
 }
 
-sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnNum*/ )
 {
     return true;
 }
 
-OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ )
 {
     return OUString();
 }
 
-OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum )
 {
     sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     return evoab::getFieldName( nField );
 }
 
-OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum )
 {
     sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     return evoab::getFieldTypeName( nField );
 }
 
-OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum )
 {
     sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     const ColumnProperty *pSpecs = getField(nField);
@@ -115,68 +115,68 @@ OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum
     return aLabel;
 }
 
-OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ )
 {
     return OUString();
 }
 
-OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ )
 {
     return m_aTableName;//OUString("TABLE");
 }
 
-OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ )
 {
     return OUString();
 }
 
 
-sal_Bool SAL_CALL OEvoabResultSetMetaData::isCurrency( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSetMetaData::isCurrency( sal_Int32 /*nColumnNum*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabResultSetMetaData::isAutoIncrement( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSetMetaData::isAutoIncrement( sal_Int32 /*nColumnNum*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabResultSetMetaData::isSigned( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSetMetaData::isSigned( sal_Int32 /*nColumnNum*/ )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL OEvoabResultSetMetaData::getPrecision( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabResultSetMetaData::getPrecision( sal_Int32 /*nColumnNum*/ )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL OEvoabResultSetMetaData::getScale( sal_Int32 /*nColumnNum*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabResultSetMetaData::getScale( sal_Int32 /*nColumnNum*/ )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL OEvoabResultSetMetaData::isNullable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OEvoabResultSetMetaData::isNullable( sal_Int32 /*nColumnNum*/ )
 {
     return 0;
 }
 
-sal_Bool SAL_CALL OEvoabResultSetMetaData::isSearchable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSetMetaData::isSearchable( sal_Int32 /*nColumnNum*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabResultSetMetaData::isReadOnly( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSetMetaData::isReadOnly( sal_Int32 /*nColumnNum*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL OEvoabResultSetMetaData::isDefinitelyWritable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSetMetaData::isDefinitelyWritable( sal_Int32 /*nColumnNum*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OEvoabResultSetMetaData::isWritable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OEvoabResultSetMetaData::isWritable( sal_Int32 /*nColumnNum*/ )
 {
     return false;
 }
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index eca3a00bcc2d..12accaf71d3e 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -44,7 +44,7 @@ namespace connectivity
         public:
           explicit OEvoabResultSetMetaData(const OUString& _aTableName);
           /// @throws css::sdbc::SQLException
-          void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException);
+          void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns);
           inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
                         { return m_aEvoabFields[columnIndex - 1]; }
           inline sal_Int32 getFieldSize() const
@@ -53,27 +53,27 @@ namespace connectivity
           inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw()
           { return this; }
 
-          virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-          virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+          virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+          virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+          virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+          virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+          virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+          virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+          virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+          virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+          virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+          virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+          virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+          virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+          virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+          virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+          virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+          virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+          virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+          virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+          virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+          virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+          virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 4cad191ccaa5..386952c0a265 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -135,7 +135,7 @@ void OCommonStatement::disposing()
     OCommonStatement_IBase::disposing();
 }
 
-Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OCommonStatement::queryInterface( const Type & rType )
 {
     Any aRet = OCommonStatement_IBase::queryInterface(rType);
     if(!aRet.hasValue())
@@ -143,7 +143,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OCommonStatement::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
                                     cppu::UnoType<XFastPropertySet>::get(),
@@ -161,7 +161,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException,
 //}
 
 
-void SAL_CALL OCommonStatement::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCommonStatement::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -490,7 +490,7 @@ void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData
 }
 
 
-Reference< XConnection > SAL_CALL OStatement::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OStatement::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -500,7 +500,7 @@ Reference< XConnection > SAL_CALL OStatement::getConnection(  ) throw(SQLExcepti
 }
 
 
-Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OCommonStatement::getWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -510,7 +510,7 @@ Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeExcept
 }
 
 
-void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCommonStatement::clearWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -590,7 +590,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUStrin
 }
 
 
-Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
 }
@@ -608,7 +608,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OCommonStatement, OStatement_IBase )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OCommonStatement, OStatement_IBase )
 
 
-sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatement::execute( const OUString& _sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -618,7 +618,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException
 }
 
 
-Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -627,7 +627,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql
 }
 
 
-sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index efdc5f2f124e..c5cc7ef510e0 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -211,19 +211,19 @@ namespace connectivity
             virtual void SAL_CALL release() throw() override;
             virtual void SAL_CALL acquire() throw() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
 
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
 
         protected:
             /** will return the EBookQuery representing the statement WHERE condition, or throw
@@ -262,7 +262,7 @@ namespace connectivity
             }
 
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
 
@@ -273,10 +273,10 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
 
             // XStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ;
+            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override ;
+            virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override ;
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 163b721eb7ff..587cdc632b05 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -75,7 +75,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName)
     return xRet;
 }
 
-void OEvoabTables::impl_refresh(  ) throw(RuntimeException)
+void OEvoabTables::impl_refresh(  )
 {
     static_cast<OEvoabCatalog&>(m_rParent).refreshTables();
 }
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx
index 1977863cb38c..b1acf94daac7 100644
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
@@ -30,7 +30,7 @@ namespace connectivity
             css::uno::Reference< css::sdbc::XDatabaseMetaData >       m_xMetaData;
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
         public:
             OEvoabTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,
                          ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index 12dd47a4076c..a5bcd71948c5 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -66,7 +66,7 @@ void OFileCatalog::refreshTables()
 }
 
 
-Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OFileCatalog::queryInterface( const Type & rType )
 {
     if( rType == cppu::UnoType<XGroupsSupplier>::get()||
         rType == cppu::UnoType<XUsersSupplier>::get()||
@@ -78,7 +78,7 @@ Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeExc
     return OFileCatalog_BASE::queryInterface(rType);
 }
 
-Sequence< Type > SAL_CALL OFileCatalog::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OFileCatalog::getTypes(  )
 {
     typedef sdbcx::OCatalog OFileCatalog_BASE;
 
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index 2956e5e0fed6..a380dc8e6f5f 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -75,7 +75,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
     return xRet;
 }
 
-void OColumns::impl_refresh() throw(RuntimeException)
+void OColumns::impl_refresh()
 {
     m_pTable->refreshColumns();
 }
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index d77f1b411b29..27d2b2d9ee03 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -94,10 +94,6 @@ bool OConnection::matchesExtension( const OUString& _rExt ) const
 
 
 void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
-    throw( css::sdbc::SQLException,
-           css::uno::RuntimeException,
-           css::uno::DeploymentException,
-           std::exception)
 {
     osl_atomic_increment( &m_refCount );
 
@@ -218,7 +214,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
 IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.file.Connection", "com.sun.star.sdbc.Connection")
 
 
-Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL OConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -229,7 +225,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -242,18 +238,18 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     return pStmt;
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ )
 {
     throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this );
     return nullptr;
 }
 
-OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OConnection::nativeSQL( const OUString& sql )
 {
     return sql;
 }
 
-void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -261,7 +257,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti
     m_bAutoCommit = autoCommit;
 }
 
-sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnection::getAutoCommit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -269,22 +265,22 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
     return m_bAutoCommit;
 }
 
-void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::commit(  )
 {
 }
 
-void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::rollback(  )
 {
 }
 
-sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnection::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return OConnection_BASE::rBHelper.bDisposed;
 }
 
-Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -300,7 +296,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
     return xMetaData;
 }
 
-void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -309,7 +305,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException,
     m_bReadOnly = readOnly;
 }
 
-sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnection::isReadOnly(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -318,37 +314,37 @@ sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeExcepti
     return m_bReadOnly;
 }
 
-void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ )
 {
     throwFeatureNotImplementedSQLException( "XConnection::setCatalog", *this );
 }
 
-OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OConnection::getCatalog(  )
 {
     return OUString();
 }
 
-void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ )
 {
     throwFeatureNotImplementedSQLException( "XConnection::setTransactionIsolation", *this );
 }
 
-sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  )
 {
     return 0;
 }
 
-Reference< XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OConnection::getTypeMap(  )
 {
     return nullptr;
 }
 
-void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ )
 {
 }
 
 // XCloseable
-void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -359,12 +355,12 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException, std::
 }
 
 // XWarningsSupplier
-Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OConnection::getWarnings(  )
 {
     return Any();
 }
 
-void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::clearWarnings(  )
 {
 }
 
@@ -409,7 +405,7 @@ Reference< XDynamicResultSet > OConnection::getDir() const
     return xContent;
 }
 
-sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId ) throw (RuntimeException, std::exception)
+sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         ? reinterpret_cast< sal_Int64 >( this )
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index e3bc0d7ae89f..05f2fc499154 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -64,7 +64,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
-        const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& /*columnNamePattern*/ )
 {
     SAL_WARN("connectivity.drivers", "ODatabaseMetaData::getColumns() should be overridden!");
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns );
@@ -156,7 +156,7 @@ namespace
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/,
-        const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& tableNamePattern, const Sequence< OUString >& types )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -308,47 +308,47 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     return xRef;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  )
 {
     return SAL_MAX_INT32;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  )
 {
     return 0;
 }
@@ -358,7 +358,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  )
 {
     return 0;
 }
@@ -369,7 +369,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
-        const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception)
+        const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -437,17 +437,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     return xRef;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  )
 {
     return false;
 }
@@ -457,17 +457,17 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  )
 {
     return false;
 }
@@ -482,17 +482,17 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
     return false;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  )
 {
     return 0;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  )
 {
     return false;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  )
 {
     return OUString();
 }
@@ -502,12 +502,12 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
     return OUString("\"");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  )
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     return true;
 }
@@ -517,57 +517,57 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ )
 {
     return false;
 }
@@ -577,22 +577,22 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  )
 {
     return false;
 }
@@ -607,7 +607,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  )
 {
     return false;
 }
@@ -617,12 +617,12 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  )
 {
     return false;
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -640,137 +640,137 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
     return xRef;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  )
 {
     return 0;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  )
 {
     return true;
 }
@@ -780,207 +780,207 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     return false;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getURL(  )
 {
     return OUString(  "sdbc:file:" );
 }
 
-OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getUserName(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDriverName(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  )
 {
     return OUString::number(1);
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  )
 {
     return OUString::number(0);
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  )
 {
     return OUString();
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  )
 {
     return 0;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  )
 {
     return OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  )
 {
     return OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  )
 {
     return OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS");
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  )
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  )
 {
     return 0;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType )
 {
     switch(setType)
     {
@@ -993,7 +993,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 /*concurrency*/ )
 {
     switch(setType)
     {
@@ -1006,57 +1006,57 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  )
 {
     return false;
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ )
 {
     return nullptr;
 }
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 15432f740523..a0a1427954e9 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -60,12 +60,12 @@ void OFileDriver::disposing()
 
 // static ServiceInfo
 
-OUString OFileDriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString OFileDriver::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.sdbc.driver.file.Driver");
 }
 
-Sequence< OUString > OFileDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > OFileDriver::getSupportedServiceNames_Static(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = "com.sun.star.sdbc.Driver";
@@ -74,24 +74,24 @@ Sequence< OUString > OFileDriver::getSupportedServiceNames_Static(  ) throw (Run
 }
 
 
-OUString SAL_CALL OFileDriver::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OFileDriver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
 
-Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
 
-Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODriver_BASE::rBHelper.bDisposed);
@@ -105,12 +105,11 @@ Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, con
 }
 
 sal_Bool SAL_CALL OFileDriver::acceptsURL( const OUString& url )
-                throw(SQLException, RuntimeException, std::exception)
 {
     return url.startsWith("sdbc:file:");
 }
 
-Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception)
+Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ )
 {
     if ( acceptsURL(url) )
     {
@@ -172,19 +171,19 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt
     return Sequence< DriverPropertyInfo >();
 }
 
-sal_Int32 SAL_CALL OFileDriver::getMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OFileDriver::getMajorVersion(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL OFileDriver::getMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OFileDriver::getMinorVersion(  )
 {
     return 0;
 }
 
 
 // XDataDefinitionSupplier
-Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODriver_BASE::rBHelper.bDisposed);
@@ -211,7 +210,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection
 }
 
 
-Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info )
 {
     if ( ! acceptsURL(url) )
     {
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index c59496af98f2..22f3449e4aaf 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -75,7 +75,7 @@ void OPreparedStatement::disposing()
     }
 }
 
-void OPreparedStatement::construct(const OUString& sql)  throw(SQLException, RuntimeException, std::exception)
+void OPreparedStatement::construct(const OUString& sql)
 {
     OStatement_Base::construct(sql);
 
@@ -108,7 +108,7 @@ rtl::Reference<OResultSet> OPreparedStatement::makeResultSet()
     return xResultSet;
 }
 
-Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType )
 {
     Any aRet = OStatement_BASE2::queryInterface(rType);
     return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType,
@@ -117,7 +117,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
                                         static_cast< XResultSetMetaDataSupplier*>(this));
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  )
 {
         ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
                                         cppu::UnoType<XParameters>::get(),
@@ -127,7 +127,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) t
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -139,7 +139,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
 }
 
 
-void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::close(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -148,7 +148,7 @@ void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException
 }
 
 
-sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OPreparedStatement::execute(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -162,7 +162,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
 }
 
 
-sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -180,13 +180,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, Run
 }
 
 
-void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x )
 {
     setParameter(parameterIndex,x);
 }
 
 
-Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -195,7 +195,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
 }
 
 
-Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -204,59 +204,59 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
 }
 
 
-void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
 {
     setParameter(parameterIndex,static_cast<bool>(x));
 }
 
-void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x )
 {
     setParameter(parameterIndex,x);
 }
 
 
-void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData )
 {
     setParameter(parameterIndex,DBTypeConversion::toDouble(aData));
 }
 
-void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal )
 {
     setParameter(parameterIndex,DBTypeConversion::toDouble(aVal));
 }
 
 
-void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal )
 {
     setParameter(parameterIndex,DBTypeConversion::toDouble(aVal));
 }
 
 
-void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x )
 {
     setParameter(parameterIndex,x);
 }
 
 
-void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
 {
     setParameter(parameterIndex,x);
 }
 
 
-void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x )
 {
     setParameter(parameterIndex,x);
 }
 
 
-void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ )
 {
     throwFeatureNotImplementedSQLException( "XParameters::setLong", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkAndResizeParameters(parameterIndex);
@@ -268,31 +268,31 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /
 }
 
 
-void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ )
 {
     throwFeatureNotImplementedSQLException( "XParameters::setClob", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ )
 {
     throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ )
 {
     throwFeatureNotImplementedSQLException( "XParameters::setArray", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ )
 {
     throwFeatureNotImplementedSQLException( "XParameters::setRef", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale )
 {
     switch(sqlType)
     {
@@ -307,13 +307,13 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
 }
 
 
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ )
 {
     setNull(parameterIndex,sqlType);
 }
 
 
-void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x )
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
@@ -327,25 +327,25 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
 }
 
 
-void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x )
 {
     setParameter(parameterIndex,x);
 }
 
 
-void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x )
 {
     setParameter(parameterIndex,x);
 }
 
 
-void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     setBinaryStream(parameterIndex,x,length );
 }
 
 
-void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     if(!x.is())
         ::dbtools::throwFunctionSequenceException(*this);
@@ -356,7 +356,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con
 }
 
 
-void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::clearParameters(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index fe4341152793..f1ef8644e27d 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -160,13 +160,13 @@ void OResultSet::disposing()
     m_aSkipDeletedSet.clear();
 }
 
-Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OResultSet::queryInterface( const Type & rType )
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType);
 }
 
-Sequence< Type > SAL_CALL OResultSet::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OResultSet::getTypes(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -178,7 +178,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes(  ) throw(RuntimeException, std::
 }
 
 
-sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -200,7 +200,6 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
 }
 
 const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex)
-    throw (css::sdbc::SQLException, css::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -212,67 +211,67 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex)
     return *(m_aSelectRow->get())[columnIndex];
 }
 
-void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException)
+void OResultSet::checkIndex(sal_Int32 columnIndex )
 {
     if (   columnIndex <= 0
             || columnIndex >= m_nColumnCount )
         ::dbtools::throwInvalidIndexException(*this);
 }
 
-Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
-Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex )
 {
     return bool(getValue(columnIndex));
 }
 
 
-sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::getRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -283,13 +282,13 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException,
 }
 
 
-sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -300,57 +299,57 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
     return m_xMetaData;
 }
 
-Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     return getValue(columnIndex).makeAny();
 }
 
 
-sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
-OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
-css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
-css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex )
 {
     return getValue(columnIndex);
 }
 
 
-sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isAfterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -359,7 +358,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
     return m_nRowPos == sal_Int32(m_pFileSet->get().size());
 }
 
-sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -368,7 +367,7 @@ sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException,
     return m_nRowPos == 0;
 }
 
-sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -377,7 +376,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException, s
     return m_nRowPos == sal_Int32(m_pFileSet->get().size() - 1);
 }
 
-void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::beforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -387,7 +386,7 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException,
         previous();
 }
 
-void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::afterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -399,13 +398,13 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException, st
 }
 
 
-void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::close(  )
 {
     dispose();
 }
 
 
-sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::first(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -413,7 +412,7 @@ sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException, st
 }
 
 
-sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::last(  )
 {
     // here I know definitely that I stand on the last record
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -421,28 +420,28 @@ sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException, std
     return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,true);
 }
 
-sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::ABSOLUTE1,row,true);
 }
 
-sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::RELATIVE1,row,true);
 }
 
-sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::previous(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::PRIOR,0,true);
 }
 
-Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OResultSet::getStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -452,7 +451,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException
 }
 
 
-sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowDeleted(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -461,7 +460,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeExceptio
     return m_bRowDeleted;
 }
 
-sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowInserted(  )
 {   ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
@@ -469,7 +468,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeExcepti
     return m_bRowInserted;
 }
 
-sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowUpdated(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -479,7 +478,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
 }
 
 
-sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isBeforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -488,7 +487,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeExcep
     return m_nRowPos == -1;
 }
 
-sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::next(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -497,7 +496,7 @@ sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException, std
 }
 
 
-sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::wasNull(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -506,20 +505,20 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException,
 }
 
 
-void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OResultSet::cancel(  )
 {
 }
 
-void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::clearWarnings(  )
 {
 }
 
-Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OResultSet::getWarnings(  )
 {
     return Any();
 }
 
-void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::insertRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -543,7 +542,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException, st
     }
 }
 
-void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -557,7 +556,7 @@ void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException, st
     clearInsertRow();
 }
 
-void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::deleteRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -579,7 +578,7 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std:
     }
 }
 
-void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::cancelRowUpdates(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -602,7 +601,7 @@ void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeExcept
 }
 
 
-void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::moveToInsertRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -621,11 +620,11 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcepti
 }
 
 
-void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::moveToCurrentRow(  )
 {
 }
 
-void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException)
+void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -638,79 +637,79 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw
 }
 
 
-void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex )
 {
     ORowSetValue aEmpty;
     updateValue(columnIndex,aEmpty);
 }
 
 
-void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x )
 {
     updateValue(columnIndex, static_cast<bool>(x));
 }
 
-void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::updateLong", *this );
 }
 
-void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -723,25 +722,25 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     updateValue(columnIndex,aSeq);
 }
 
-void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     updateBinaryStream(columnIndex,x,length);
 }
 
-void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::refreshRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x )
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
 
 
-void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ )
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
@@ -1420,7 +1419,7 @@ Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
+sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
@@ -1555,7 +1554,7 @@ void SAL_CALL OResultSet::release() throw()
     OResultSet_BASE::release();
 }
 
-Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
@@ -1615,7 +1614,7 @@ bool OResultSet::isRowDeleted() const
     return m_aRow->isDeleted();
 }
 
-void SAL_CALL OResultSet::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+void SAL_CALL OResultSet::disposing( const EventObject& Source )
 {
     Reference<XPropertySet> xProp = m_pTable.get();
     if(m_pTable.is() && Source.Source == xProp)
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index d1c612d50e70..070cd4492bc1 100644
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -49,44 +49,44 @@ OResultSetMetaData::~OResultSetMetaData()
     m_xColumns = nullptr;
 }
 
-void OResultSetMetaData::checkColumnIndex(sal_Int32 column)  throw(SQLException, RuntimeException)
+void OResultSetMetaData::checkColumnIndex(sal_Int32 column)
 {
     if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size())
         throwInvalidIndexException(*this);
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 {
     return getPrecision(column);
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  )
 {
     return (m_xColumns->get()).size();
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ )
 {
     return false;
 }
 
 
-OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
 
-OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column )
 {
     checkColumnIndex(column);
 
@@ -94,77 +94,77 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ
     return aName.hasValue() ? getString(aName) : getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
 }
 
-OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ )
 {
     return m_aTableName;
 }
 
-OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column )
 {
     return getColumnName(column);
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)));
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ )
 {
     return true;
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)));
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ )
 {
     return true;
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column )
 {
     checkColumnIndex(column);
     return m_pTable->isReadOnly() || (
@@ -173,12 +173,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
 {
     return !isReadOnly(column);
 }
 
-sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column )
 {
     return !isReadOnly(column);
 }
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 0bd256484117..6d91496c378f 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -143,13 +143,13 @@ void SAL_CALL OStatement_BASE2::release() throw()
     release_ChildImpl();
 }
 
-Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OStatement_Base::queryInterface( const Type & rType )
 {
     const Any aRet = OStatement_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
 
-Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OStatement_Base::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
                                     cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -159,11 +159,11 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException,
 }
 
 
-void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OStatement_Base::cancel(  )
 {
 }
 
-void SAL_CALL OStatement_Base::close() throw (SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatement_Base::close()
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -172,7 +172,7 @@ void SAL_CALL OStatement_Base::close() throw (SQLException, RuntimeException, st
     dispose();
 }
 
-void OStatement_Base::closeResultSet() throw (SQLException, RuntimeException, std::exception)
+void OStatement_Base::closeResultSet()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::clearMyResultSet " );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -192,7 +192,7 @@ void OStatement_Base::closeResultSet() throw (SQLException, RuntimeException, st
     m_xResultSet.clear();
 }
 
-Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OStatement_Base::getWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -200,7 +200,7 @@ Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeExcepti
     return makeAny(m_aLastWarning);
 }
 
-void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatement_Base::clearWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -239,7 +239,7 @@ void SAL_CALL OStatement::release() throw()
 }
 
 
-sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatement::execute( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -249,7 +249,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException,
 }
 
 
-Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -266,12 +266,12 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql )
     return xRS;
 }
 
-Reference< XConnection > SAL_CALL OStatement::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OStatement::getConnection(  )
 {
     return Reference< XConnection >(m_pConnection.get());
 }
 
-sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -297,12 +297,12 @@ void SAL_CALL OStatement_Base::disposing()
     OStatement_BASE::disposing();
 }
 
-Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OStatement::queryInterface( const Type & rType )
 {
     Any aRet = OStatement_XStatement::queryInterface( rType);
     return aRet.hasValue() ? aRet : OStatement_BASE2::queryInterface( rType);
@@ -369,7 +369,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
     m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? TAscendingOrder::DESC : TAscendingOrder::ASC);
 }
 
-void OStatement_Base::construct(const OUString& sql)  throw(SQLException, RuntimeException, std::exception)
+void OStatement_Base::construct(const OUString& sql)
 {
     OUString aErr;
     m_pParseTree = m_aParser.parseTree(aErr,sql);
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 88ffe4fe7e84..d97707183cac 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -103,7 +103,7 @@ void OFileTable::refreshIndexes()
 {
 }
 
-Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OFileTable::queryInterface( const Type & rType )
 {
     if( rType == cppu::UnoType<XKeysSupplier>::get()||
         rType == cppu::UnoType<XRename>::get()||
@@ -141,7 +141,7 @@ Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
+sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index d1402b2c3cd9..4858817601d9 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -40,7 +40,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& /*_rName*/)
     return sdbcx::ObjectType();
 }
 
-void OTables::impl_refresh(  ) throw(RuntimeException)
+void OTables::impl_refresh(  )
 {
     static_cast<OFileCatalog&>(m_rParent).refreshTables();
 }
@@ -51,7 +51,7 @@ m_xMetaData.clear();
     OCollection::disposing();
 }
 
-Any SAL_CALL OTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OTables::queryInterface( const Type & rType )
 {
     if( rType == cppu::UnoType<XColumnLocate>::get()||
         rType == cppu::UnoType<XDataDescriptorFactory>::get()||
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 018b57e4596f..befd56103e32 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -221,7 +221,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
 }
 
 
-void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)  throw(SQLException, RuntimeException)
+void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Fehler im Parse Tree");
 
@@ -267,7 +267,7 @@ void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)  throw(S
 }
 
 
-void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
+void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
     const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
@@ -315,7 +315,7 @@ void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(SQLEx
     m_aCodeList.push_back(pOperator);
 }
 
-void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException, std::exception)
+void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
 
@@ -392,7 +392,7 @@ void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQ
     m_aCodeList.push_back(pBoolOp);
 }
 
-void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
+void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
     const OSQLParseNode* pPart2 = pPredicateNode->getChild(1);
@@ -410,7 +410,7 @@ void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQL
     m_aCodeList.push_back(pOperator);
 }
 
-OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException, std::exception)
+OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode)
 {
     OOperand* pOperand = nullptr;
 
@@ -589,7 +589,7 @@ void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueD
         delete pOperand;
 }
 
-void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode)   throw(SQLException, RuntimeException)
+void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode)
 {
     DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree");
 
@@ -605,7 +605,7 @@ void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode)   throw(SQL
     m_aCodeList.push_back(pOperator);
 }
 
-void OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)    throw(SQLException, RuntimeException)
+void OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
 {
     OOperator* pOperator = nullptr;
 
diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx
index 2c6b95261c31..0677388f1610 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -45,7 +45,6 @@ Blob::Blob(isc_db_handle* pDatabaseHandle,
 }
 
 void Blob::ensureBlobIsOpened()
-    throw(SQLException)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -94,7 +93,6 @@ void Blob::ensureBlobIsOpened()
 }
 
 void Blob::closeBlob()
-    throw (SQLException)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -132,7 +130,6 @@ void SAL_CALL Blob::disposing()
 }
 
 sal_Int64 SAL_CALL Blob::length()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(Blob_BASE::rBHelper.bDisposed);
@@ -143,7 +140,6 @@ sal_Int64 SAL_CALL Blob::length()
 
 uno::Sequence< sal_Int8 > SAL_CALL  Blob::getBytes(sal_Int64 nPosition,
                                                    sal_Int32 nBytes)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(Blob_BASE::rBHelper.bDisposed);
@@ -172,14 +168,12 @@ uno::Sequence< sal_Int8 > SAL_CALL  Blob::getBytes(sal_Int64 nPosition,
 }
 
 uno::Reference< XInputStream > SAL_CALL  Blob::getBinaryStream()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return this;
 }
 
 sal_Int64 SAL_CALL  Blob::position(const uno::Sequence< sal_Int8 >& /*rPattern*/,
                                    sal_Int64 /*nStart*/)
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::dbtools::throwFeatureNotImplementedSQLException("Blob::position", *this);
     return 0;
@@ -187,7 +181,6 @@ sal_Int64 SAL_CALL  Blob::position(const uno::Sequence< sal_Int8 >& /*rPattern*/
 
 sal_Int64 SAL_CALL  Blob::positionOfBlob(const uno::Reference< XBlob >& /*rPattern*/,
                                          sal_Int64 /*aStart*/)
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::dbtools::throwFeatureNotImplementedSQLException("Blob::positionOfBlob", *this);
     return 0;
@@ -197,7 +190,6 @@ sal_Int64 SAL_CALL  Blob::positionOfBlob(const uno::Reference< XBlob >& /*rPatte
 
 sal_Int32 SAL_CALL Blob::readBytes(uno::Sequence< sal_Int8 >& rDataOut,
                                    sal_Int32 nBytes)
-    throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -263,7 +255,6 @@ sal_Int32 SAL_CALL Blob::readBytes(uno::Sequence< sal_Int8 >& rDataOut,
 
 sal_Int32 SAL_CALL Blob::readSomeBytes(uno::Sequence< sal_Int8 >& rDataOut,
                                 sal_Int32 nMaximumBytes)
-    throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     // We don't have any way of verifying how many bytes are immediately available,
     // hence we just pass through direct to readBytes
@@ -272,7 +263,6 @@ sal_Int32 SAL_CALL Blob::readSomeBytes(uno::Sequence< sal_Int8 >& rDataOut,
 }
 
 void SAL_CALL Blob::skipBytes(sal_Int32 nBytesToSkip)
-    throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     // There is no way of directly skipping, hence we have to pretend to skip
     // by reading & discarding the data.
@@ -281,7 +271,6 @@ void SAL_CALL Blob::skipBytes(sal_Int32 nBytesToSkip)
 }
 
 sal_Int32 SAL_CALL Blob::available()
-    throw (NotConnectedException,  IOException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -314,7 +303,6 @@ sal_Int32 SAL_CALL Blob::available()
 }
 
 void SAL_CALL Blob::closeInput()
-    throw(NotConnectedException, IOException, RuntimeException, std::exception)
 {
     try
     {
diff --git a/connectivity/source/drivers/firebird/Blob.hxx b/connectivity/source/drivers/firebird/Blob.hxx
index c8fd8c79e6f7..eb8e282bf911 100644
--- a/connectivity/source/drivers/firebird/Blob.hxx
+++ b/connectivity/source/drivers/firebird/Blob.hxx
@@ -46,16 +46,14 @@ namespace connectivity
             ISC_STATUS_ARRAY    m_statusVector;
 
             /// @throws css::sdbc::SQLException
-            void ensureBlobIsOpened()
-                throw(css::sdbc::SQLException);
+            void ensureBlobIsOpened();
             /**
              * Closes the blob and cleans up resources -- can be used to reset
              * the blob if we e.g. want to read from the beginning again.
              *
              * @throws css::sdbc::SQLException
              */
-            void closeBlob()
-                throw(css::sdbc::SQLException);
+            void closeBlob();
 
         public:
             Blob(isc_db_handle* pDatabaseHandle,
@@ -64,59 +62,31 @@ namespace connectivity
 
             // ---- XBlob ----------------------------------------------------
             virtual sal_Int64 SAL_CALL
-                length()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                length() override;
             virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-                getBytes(sal_Int64 aPosition, sal_Int32 aLength)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                getBytes(sal_Int64 aPosition, sal_Int32 aLength) override;
             virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-                getBinaryStream()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                getBinaryStream() override;
             virtual sal_Int64 SAL_CALL
                 position(const css::uno::Sequence< sal_Int8 >& rPattern,
-                         sal_Int64 aStart)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                         sal_Int64 aStart) override;
             virtual sal_Int64 SAL_CALL
                 positionOfBlob(const css::uno::Reference< css::sdbc::XBlob >& rPattern,
-                               sal_Int64 aStart)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                               sal_Int64 aStart) override;
 
             // ---- XInputStream ----------------------------------------------
             virtual sal_Int32 SAL_CALL
                 readBytes(css::uno::Sequence< sal_Int8 >& rDataOut,
-                          sal_Int32 nBytes)
-                throw(css::io::NotConnectedException,
-                      css::io::BufferSizeExceededException,
-                      css::io::IOException,
-                      css::uno::RuntimeException, std::exception) override;
+                          sal_Int32 nBytes) override;
             virtual sal_Int32 SAL_CALL
                 readSomeBytes(css::uno::Sequence< sal_Int8 >& rDataOut,
-                              sal_Int32 nMaximumBytes)
-                throw(css::io::NotConnectedException,
-                      css::io::BufferSizeExceededException,
-                        css::io::IOException,
-                      css::uno::RuntimeException, std::exception) override;
+                              sal_Int32 nMaximumBytes) override;
             virtual void SAL_CALL
-                skipBytes(sal_Int32 nBytes)
-                throw(css::io::NotConnectedException,
-                      css::io::BufferSizeExceededException,
-                      css::io::IOException,
-                      css::uno::RuntimeException, std::exception) override;
+                skipBytes(sal_Int32 nBytes) override;
             virtual sal_Int32 SAL_CALL
-                available()
-                throw(css::io::NotConnectedException,
-                      css::io::IOException,
-                      css::uno::RuntimeException, std::exception) override;
+                available() override;
             virtual void SAL_CALL
-                closeInput()
-                throw(css::io::NotConnectedException,
-                      css::io::IOException,
-                      css::uno::RuntimeException, std::exception) override;
+                closeInput() override;
 
             // ---- OComponentHelper ------------------------------------------
             virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/drivers/firebird/Clob.cxx b/connectivity/source/drivers/firebird/Clob.cxx
index 83d95797d4d9..4f70a000a242 100644
--- a/connectivity/source/drivers/firebird/Clob.cxx
+++ b/connectivity/source/drivers/firebird/Clob.cxx
@@ -40,7 +40,6 @@ void SAL_CALL Clob::disposing()
 }
 
 sal_Int64 SAL_CALL Clob::length()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(Clob_BASE::rBHelper.bDisposed);
@@ -56,7 +55,6 @@ sal_Int64 SAL_CALL Clob::length()
 
 OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition,
                                                sal_Int32 nLength)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(Clob_BASE::rBHelper.bDisposed);
@@ -76,7 +74,6 @@ OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition,
 }
 
 uno::Reference< XInputStream > SAL_CALL  Clob::getCharacterStream()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(Clob_BASE::rBHelper.bDisposed);
@@ -86,7 +83,6 @@ uno::Reference< XInputStream > SAL_CALL  Clob::getCharacterStream()
 
 sal_Int64 SAL_CALL Clob::position(const OUString& /*rPattern*/,
                                    sal_Int32 /*nStart*/)
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::dbtools::throwFeatureNotImplementedSQLException("Clob::position", *this);
     return 0;
@@ -94,7 +90,6 @@ sal_Int64 SAL_CALL Clob::position(const OUString& /*rPattern*/,
 
 sal_Int64 SAL_CALL Clob::positionOfClob(const Reference <XClob >& /*rPattern*/,
                                          sal_Int64 /*aStart*/)
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::dbtools::throwFeatureNotImplementedSQLException("Blob::positionOfBlob", *this);
     return 0;
diff --git a/connectivity/source/drivers/firebird/Clob.hxx b/connectivity/source/drivers/firebird/Clob.hxx
index dfa40dedd484..b71bec19fa51 100644
--- a/connectivity/source/drivers/firebird/Clob.hxx
+++ b/connectivity/source/drivers/firebird/Clob.hxx
@@ -45,27 +45,17 @@ namespace connectivity
 
             // ---- XClob ----------------------------------------------------
             virtual sal_Int64 SAL_CALL
-                length()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                length() override;
             virtual ::rtl::OUString SAL_CALL
-                getSubString(sal_Int64 aPosition, sal_Int32 aLength)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                getSubString(sal_Int64 aPosition, sal_Int32 aLength) override;
             virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-                getCharacterStream()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                getCharacterStream() override;
             virtual sal_Int64 SAL_CALL
                 position(const ::rtl::OUString& rPattern,
-                         sal_Int32 aStart)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                         sal_Int32 aStart) override;
             virtual sal_Int64 SAL_CALL
                 positionOfClob(const ::css::uno::Reference< ::css::sdbc::XClob >& rPattern,
-                               sal_Int64 aStart)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                               sal_Int64 aStart) override;
             // ---- OComponentHelper ------------------------------------------
             virtual void SAL_CALL disposing() override;
         };
diff --git a/connectivity/source/drivers/firebird/Column.cxx b/connectivity/source/drivers/firebird/Column.cxx
index 38c367cfcc43..78ea2534e1fc 100644
--- a/connectivity/source/drivers/firebird/Column.cxx
+++ b/connectivity/source/drivers/firebird/Column.cxx
@@ -45,7 +45,7 @@ void Column::construct()
     return *Column_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
 
-css::uno::Sequence< OUString > SAL_CALL Column::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL Column::getSupportedServiceNames(  )
 {
     css::uno::Sequence< OUString > aSupported { "com.sun.star.sdbc.Firebird" };
 
diff --git a/connectivity/source/drivers/firebird/Column.hxx b/connectivity/source/drivers/firebird/Column.hxx
index 0b1ea67c1544..33d49516b6d7 100644
--- a/connectivity/source/drivers/firebird/Column.hxx
+++ b/connectivity/source/drivers/firebird/Column.hxx
@@ -28,7 +28,7 @@ namespace connectivity
         public:
             Column();
             virtual void construct() 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;
         };
     }
 }
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 54ee5efdd7c9..7c39219943ee 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -145,7 +145,6 @@ struct ConnectionGuard
 };
 
 void Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info)
-    throw (SQLException, RuntimeException, std::exception)
 {
     ConnectionGuard aGuard(m_refCount);
 
@@ -360,7 +359,6 @@ IMPLEMENT_SERVICE_INFO(Connection, "com.sun.star.sdbc.drivers.firebird.Connectio
                                                     "com.sun.star.sdbc.Connection")
 
 Reference< XBlob> Connection::createBlob(ISC_QUAD* pBlobId)
-    throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -374,7 +372,6 @@ Reference< XBlob> Connection::createBlob(ISC_QUAD* pBlobId)
 }
 
 Reference< XClob> Connection::createClob(ISC_QUAD* pBlobId)
-    throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -390,7 +387,6 @@ Reference< XClob> Connection::createClob(ISC_QUAD* pBlobId)
 
 //----- XConnection ----------------------------------------------------------
 Reference< XStatement > SAL_CALL Connection::createStatement( )
-                                        throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -432,7 +428,6 @@ OUString Connection::transformPreparedStatement(const OUString& _sSQL)
 
 Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement(
             const OUString& _sSql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird", "prepareStatement() "
              "called with sql: " << _sSql);
@@ -452,7 +447,7 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement(
 }
 
 Reference< XPreparedStatement > SAL_CALL Connection::prepareCall(
-                const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception)
+                const OUString& _sSql )
 {
     SAL_INFO("connectivity.firebird", "prepareCall(). "
              "_sSql: " << _sSql);
@@ -467,7 +462,6 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareCall(
 }
 
 OUString SAL_CALL Connection::nativeSQL( const OUString& _sSql )
-                                        throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     // We do not need to adapt the SQL for Firebird atm.
@@ -475,7 +469,6 @@ OUString SAL_CALL Connection::nativeSQL( const OUString& _sSql )
 }
 
 void SAL_CALL Connection::setAutoCommit( sal_Bool autoCommit )
-                                        throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -488,7 +481,7 @@ void SAL_CALL Connection::setAutoCommit( sal_Bool autoCommit )
     }
 }
 
-sal_Bool SAL_CALL Connection::getAutoCommit() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL Connection::getAutoCommit()
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -497,7 +490,6 @@ sal_Bool SAL_CALL Connection::getAutoCommit() throw(SQLException, RuntimeExcepti
 }
 
 void Connection::setupTransaction()
-    throw (SQLException)
 {
     MutexGuard aGuard( m_aMutex );
     ISC_STATUS status_vector[20];
@@ -555,7 +547,6 @@ void Connection::setupTransaction()
 }
 
 isc_tr_handle& Connection::getTransaction()
-    throw (SQLException)
 {
     MutexGuard aGuard( m_aMutex );
     if (!m_aTransactionHandle)
@@ -565,7 +556,7 @@ isc_tr_handle& Connection::getTransaction()
     return m_aTransactionHandle;
 }
 
-void SAL_CALL Connection::commit() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL Connection::commit()
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -720,7 +711,7 @@ void Connection::runBackupService(const short nAction)
 }
 
 
-void SAL_CALL Connection::rollback() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL Connection::rollback()
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -733,7 +724,7 @@ void SAL_CALL Connection::rollback() throw(SQLException, RuntimeException, std::
     }
 }
 
-sal_Bool SAL_CALL Connection::isClosed(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL Connection::isClosed(  )
 {
     MutexGuard aGuard( m_aMutex );
 
@@ -741,7 +732,7 @@ sal_Bool SAL_CALL Connection::isClosed(  ) throw(SQLException, RuntimeException,
     return Connection_BASE::rBHelper.bDisposed;
 }
 
-Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData(  )
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -759,7 +750,6 @@ Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData(  ) throw(SQLExc
 }
 
 void SAL_CALL Connection::setReadOnly(sal_Bool readOnly)
-                                            throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -768,7 +758,7 @@ void SAL_CALL Connection::setReadOnly(sal_Bool readOnly)
     setupTransaction();
 }
 
-sal_Bool SAL_CALL Connection::isReadOnly() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL Connection::isReadOnly()
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -777,19 +767,17 @@ sal_Bool SAL_CALL Connection::isReadOnly() throw(SQLException, RuntimeException,
 }
 
 void SAL_CALL Connection::setCatalog(const OUString& /*catalog*/)
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setCatalog", *this);
 }
 
 OUString SAL_CALL Connection::getCatalog()
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("getCatalog", *this);
     return OUString();
 }
 
-void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level )
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -798,7 +786,7 @@ void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLEx
     setupTransaction();
 }
 
-sal_Int32 SAL_CALL Connection::getTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL Connection::getTransactionIsolation(  )
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(Connection_BASE::rBHelper.bDisposed);
@@ -806,21 +794,20 @@ sal_Int32 SAL_CALL Connection::getTransactionIsolation(  ) throw(SQLException, R
     return m_aTransactionIsolation;
 }
 
-Reference< XNameAccess > SAL_CALL Connection::getTypeMap() throw(SQLException, RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL Connection::getTypeMap()
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::getTypeMap", *this );
     return nullptr;
 }
 
 void SAL_CALL Connection::setTypeMap(const Reference< XNameAccess >& typeMap)
-                                            throw(SQLException, RuntimeException, std::exception)
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this );
     (void) typeMap;
 }
 
 //----- XCloseable -----------------------------------------------------------
-void SAL_CALL Connection::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL Connection::close(  )
 {
     // we just dispose us
     {
@@ -832,20 +819,19 @@ void SAL_CALL Connection::close(  ) throw(SQLException, RuntimeException, std::e
 }
 
 // XWarningsSupplier
-Any SAL_CALL Connection::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL Connection::getWarnings(  )
 {
     // when you collected some warnings -> return it
     return Any();
 }
 
-void SAL_CALL Connection::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL Connection::clearWarnings(  )
 {
     // you should clear your collected warnings here
 }
 
 // XDocumentEventListener
 void SAL_CALL Connection::documentEventOccured( const DocumentEvent& Event )
-                                                        throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -899,14 +885,13 @@ void SAL_CALL Connection::documentEventOccured( const DocumentEvent& Event )
 }
 // XEventListener
 void SAL_CALL Connection::disposing(const EventObject& /*rSource*/)
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
 
     m_xEmbeddedStorage.clear();
 }
 
-void Connection::buildTypeInfo() throw( SQLException)
+void Connection::buildTypeInfo()
 {
     MutexGuard aGuard( m_aMutex );
 
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index 9e8d917c4393..6c6df60beffd 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -157,8 +157,7 @@ namespace connectivity
             OWeakRefArray       m_aStatements;
 
             /// @throws css::sdbc::SQLException
-            void buildTypeInfo()
-                throw (css::sdbc::SQLException);
+            void buildTypeInfo();
 
             /**
              * Creates a new transaction with the desired parameters, if
@@ -167,8 +166,7 @@ namespace connectivity
              *
              * @throws css::sdbc::SQLException
              */
-            void setupTransaction()
-                throw(css::sdbc::SQLException);
+            void setupTransaction();
             void disposeStatements();
 
         /** transform named parameters into unnamed parameters
@@ -186,17 +184,13 @@ namespace connectivity
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void construct( const ::rtl::OUString& url,
-                                    const css::uno::Sequence< css::beans::PropertyValue >& info)
-            throw(css::sdbc::SQLException,
-                  css::uno::RuntimeException,
-                  std::exception);
+                                    const css::uno::Sequence< css::beans::PropertyValue >& info);
 
             const OUString& getConnectionURL()  const   {return m_sConnectionURL;}
             bool            isEmbedded()        const   {return m_bIsEmbedded;}
             isc_db_handle&  getDBHandle()               {return m_aDBHandle;}
             /// @throws css::sdbc::SQLException
-            isc_tr_handle&  getTransaction()
-                throw(css::sdbc::SQLException);
+            isc_tr_handle&  getTransaction();
 
             /**
               * Must be called anytime the underlying database is likely to have
@@ -217,15 +211,11 @@ namespace connectivity
              * @throws css::uno::RuntimeException
              */
             css::uno::Reference< css::sdbc::XBlob>
-                createBlob(ISC_QUAD* pBlobID)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException);
+                createBlob(ISC_QUAD* pBlobID);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             css::uno::Reference< css::sdbc::XClob>
-                createClob(ISC_QUAD* pBlobID)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException);
+                createClob(ISC_QUAD* pBlobID);
 
             /**
              * Create and/or connect to the sdbcx Catalog. This is completely
@@ -242,33 +232,33 @@ namespace connectivity
             // XServiceInfo
             DECLARE_SERVICE_INFO();
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) override;
+            virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) override;
+            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+            virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+            virtual void SAL_CALL commit(  ) override;
+            virtual void SAL_CALL rollback(  ) override;
+            virtual sal_Bool SAL_CALL isClosed(  ) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) override;
+            virtual ::rtl::OUString SAL_CALL getCatalog(  ) override;
+            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XDocumentEventListener
-            virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) override;
             // css.lang.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;
 
         };
     }
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index f774438e6335..66d9783ba9cd 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -55,103 +55,95 @@ ODatabaseMetaData::~ODatabaseMetaData()
 }
 
 //----- Catalog Info -- UNSUPPORTED -------------------------------------------
-OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator()
 {
     return OUString();
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength()
 {
     return -1;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm()
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart()
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions()
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions()
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation(  )
 {
     return false;
 }
 
-uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
 {
     OSL_FAIL("Not implemented yet!");
     // TODO implement
     return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCatalogs);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls()
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions()
 {
     return false;
 }
 
 //----- Schema Info -- UNSUPPORTED --------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInDataManipulation()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInTableDefinitions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return -1;
 }
 
 OUString SAL_CALL ODatabaseMetaData::getSchemaTerm()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return OUString();
 }
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
-    throw(SQLException, RuntimeException, std::exception)
 {
     OSL_FAIL("Not implemented yet!");
     // TODO implement
@@ -159,68 +151,68 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
 }
 
 //----- Max Sizes/Lengths -----------------------------------------------------
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength()
 {
     return 32767;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize()
 {
     return 32767;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength()
 {
     return 32767;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength()
 {
     return 31;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex()
 {
     // TODO: No idea.
     // See: http://www.firebirdsql.org/en/firebird-technical-specifications/
     return 16;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength()
 {
     return 32;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections()
 {
     return 100; // Arbitrary
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable()
 {
     // May however be smaller.
     // See: http://www.firebirdsql.org/en/firebird-technical-specifications/
     return 32767;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength()
 {
     return 32767;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength()
 {
     return 31;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     return false;
 }
@@ -228,25 +220,22 @@ sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLExc
 // ---- Identifiers -----------------------------------------------------------
 // Only quoted identifiers are case sensitive, unquoted are case insensitive
 OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString()
-    throw(SQLException, RuntimeException, std::exception)
 {
     OUString aVal('"');
     return aVal;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  )
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     // TODO: confirm this -- the documentation is highly ambiguous
     // However it seems this should be true as quoted identifiers ARE
@@ -255,7 +244,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers()
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
@@ -263,80 +251,67 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers()
 // ---- Unquoted Identifiers -------------------------------------------------
 // All unquoted identifiers are stored upper case.
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 // ---- SQL Feature Support ---------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithAddColumn()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithDropColumn()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable()
-    throw(SQLException, RuntimeException, std::exception)
 {
     // TODO: true if embedded, but unsure about remote server
     return true;
@@ -344,7 +319,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable()
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 fromType,
                                                      sal_Int32 toType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     (void) fromType;
     (void) toType;
@@ -352,109 +326,95 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 fromType,
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  )
 {
     return true;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  )
 {
     OUString aVal;
     return aVal;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     return false;
 }
 // ---- Data definition stuff -------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::
         supportsDataDefinitionAndDataManipulationTransactions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 //----- Transaction Support --------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel(
         sal_Int32 aLevel)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return  aLevel == TransactionIsolation::READ_UNCOMMITTED
            || aLevel == TransactionIsolation::READ_COMMITTED
@@ -463,290 +423,288 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel(
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return TransactionIsolation::REPEATABLE_READ;
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     return true; // should be supported at least
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     return true;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  )
 {
     sal_Int32 nValue = 31; // TODO: confirm
     return nValue;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  )
 {
     return m_pConnection->isReadOnly();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  )
 {
     return m_pConnection->isEmbedded();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     // Unsure
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  )
 {
     // Unsure
     return false;
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     return false;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getURL() throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getURL()
 {
     return m_pConnection->getConnectionURL();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getUserName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDriverName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion()
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  )
 {
     OUString aValue;
     return aValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  )
 {
     return 0;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  )
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  )
 {
     return 31;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     switch (setType)
     {
@@ -760,7 +718,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType)
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(
         sal_Int32 aResultSetType,
         sal_Int32 aConcurrency)
-    throw(SQLException, RuntimeException, std::exception)
 {
     if (aResultSetType == ResultSetType::FORWARD_ONLY
         && aConcurrency == ResultSetConcurrency::READ_ONLY)
@@ -769,69 +726,67 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(
         return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType )
 {
     (void) setType;
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType )
 {
     (void) setType;
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType )
 {
     (void) setType;
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType )
 {
     (void) setType;
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType )
 {
     (void) setType;
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType )
 {
     (void) setType;
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType )
 {
     (void) setType;
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType )
 {
     (void) setType;
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType )
 {
     (void) setType;
     return false;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates()
-    throw(SQLException, RuntimeException, std::exception)
 {
     // No batch support in firebird
     return false;
 }
 
 uno::Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return uno::Reference<XConnection>(m_pConnection.get());
 }
@@ -841,7 +796,7 @@ uno::Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection()
 // of course you could implement it on your and you should do this because
 // the general way is more memory expensive
 
-uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  )
 {
     ODatabaseMetaDataResultSet* pResultSet = new
         ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
@@ -869,7 +824,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw
 }
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird", "getTypeInfo()");
 
@@ -1077,7 +1031,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
         const OUString& /*sSchema*/,
         const OUString& sTable,
         const OUString& sColumnNamePattern)
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird", "getColumnPrivileges() with "
              "Table: " << sTable
@@ -1153,7 +1106,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
         const OUString& /*schemaPattern*/,
         const OUString& tableNamePattern,
         const OUString& columnNamePattern)
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird", "getColumns() with "
              "TableNamePattern: " << tableNamePattern <<
@@ -1343,7 +1295,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
         const OUString& /*schemaPattern*/,
         const OUString& tableNamePattern,
         const Sequence< OUString >& types)
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird", "getTables() with "
              "TableNamePattern: " << tableNamePattern);
@@ -1468,7 +1419,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     const Any& catalog, const OUString& schemaPattern,
-    const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& procedureNamePattern, const OUString& columnNamePattern )
 {
     SAL_WARN("connectivity.firebird", "Not yet implemented");
     (void) catalog;
@@ -1482,7 +1433,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     const Any& catalog, const OUString& schemaPattern,
-    const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& procedureNamePattern )
 {
     SAL_WARN("connectivity.firebird", "Not yet implemented");
     (void) catalog;
@@ -1494,7 +1445,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
 }
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     SAL_WARN("connectivity.firebird", "Not yet implemented");
     (void) catalog;
@@ -1506,7 +1457,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
 }
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     // List the columns in a table which are foreign keys. This is actually
     // never used anywhere in the LO codebase currently. Retrieval from firebird
@@ -1521,7 +1472,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
 }
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     (void) catalog;
     (void) schema;
@@ -1613,7 +1564,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
         const Any& /*aCatalog*/,
         const OUString& /*sSchema*/,
         const OUString& sTable)
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird", "getPrimaryKeys() with "
              "Table: " << sTable);
@@ -1676,7 +1626,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
         const OUString& sTable,
         sal_Bool bIsUnique,
         sal_Bool bIsApproximate)
-    throw(SQLException, RuntimeException, std::exception)
 {
     // Apparently this method can also return a "tableIndexStatistic"
     // However this is only mentioned in XDatabaseMetaData.idl (whose comments
@@ -1766,7 +1715,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
     const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope,
-    sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception)
+    sal_Bool nullable )
 {
     (void) catalog;
     (void) schema;
@@ -1782,7 +1731,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
         const Any& /*aCatalog*/,
         const OUString& /*sSchemaPattern*/,
         const OUString& sTableNamePattern)
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird", "getTablePrivileges() with "
              "TableNamePattern: " << sTableNamePattern);
@@ -1849,7 +1797,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     const Any& primaryCatalog, const OUString& primarySchema,
     const OUString& primaryTable, const Any& foreignCatalog,
-    const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& foreignSchema, const OUString& foreignTable )
 {
     (void) primaryCatalog;
     (void) primarySchema;
@@ -1862,7 +1810,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCrossReference);
 }
 
-uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types )
 {
     (void) catalog;
     (void) schemaPattern;
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
index fc9b1cfdb037..aeb7acab00d9 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
@@ -45,155 +45,155 @@ namespace connectivity
 
             // as I mentioned before this interface is really BIG
             // XDatabaseMetaData
-            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getUserName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getDatabaseProductName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getDriverName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getDriverVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getSQLKeywords(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getNumericFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getStringFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getSystemFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getTimeDateFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getSearchStringEscape(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getExtraNameCharacters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getSchemaTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getProcedureTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getCatalogTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCatalogAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getCatalogSeparator(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxStatements(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+            virtual ::rtl::OUString SAL_CALL getURL(  ) override;
+            virtual ::rtl::OUString SAL_CALL getUserName(  ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+            virtual ::rtl::OUString SAL_CALL getDatabaseProductName(  ) override;
+            virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion(  ) override;
+            virtual ::rtl::OUString SAL_CALL getDriverName(  ) override;
+            virtual ::rtl::OUString SAL_CALL getDriverVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) override;
+            virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString(  ) override;
+            virtual ::rtl::OUString SAL_CALL getSQLKeywords(  ) override;
+            virtual ::rtl::OUString SAL_CALL getNumericFunctions(  ) override;
+            virtual ::rtl::OUString SAL_CALL getStringFunctions(  ) override;
+            virtual ::rtl::OUString SAL_CALL getSystemFunctions(  ) override;
+            virtual ::rtl::OUString SAL_CALL getTimeDateFunctions(  ) override;
+            virtual ::rtl::OUString SAL_CALL getSearchStringEscape(  ) override;
+            virtual ::rtl::OUString SAL_CALL getExtraNameCharacters(  ) override;
+            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) override;
+            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) override;
+            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+            virtual ::rtl::OUString SAL_CALL getSchemaTerm(  ) override;
+            virtual ::rtl::OUString SAL_CALL getProcedureTerm(  ) override;
+            virtual ::rtl::OUString SAL_CALL getCatalogTerm(  ) override;
+            virtual sal_Bool SAL_CALL isCatalogAtStart(  ) override;
+            virtual ::rtl::OUString SAL_CALL getCatalogSeparator(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatements(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index ff63fbe114ea..9fe66357e010 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -49,7 +49,7 @@ namespace connectivity
     namespace firebird
     {
         Reference< XInterface >  SAL_CALL FirebirdDriver_CreateInstance(
-            const Reference< XMultiServiceFactory >& _rxFactory) throw( Exception, std::exception )
+            const Reference< XMultiServiceFactory >& _rxFactory)
         {
             SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" );
             return *(new FirebirdDriver(comphelper::getComponentContext(_rxFactory)));
@@ -143,12 +143,12 @@ void FirebirdDriver::disposing()
 }
 
 //----- static ServiceInfo ---------------------------------------------------
-rtl::OUString FirebirdDriver::getImplementationName_Static() throw(RuntimeException)
+rtl::OUString FirebirdDriver::getImplementationName_Static()
 {
     return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver");
 }
 
-Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (RuntimeException)
+Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = "com.sun.star.sdbc.Driver";
@@ -156,19 +156,17 @@ Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (Ru
     return aSNS;
 }
 
-OUString SAL_CALL FirebirdDriver::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL FirebirdDriver::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL FirebirdDriver::supportsService(const OUString& _rServiceName)
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
 Sequence< OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames()
-    throw(RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
@@ -176,7 +174,6 @@ Sequence< OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames()
 // ----  XDriver -------------------------------------------------------------
 Reference< XConnection > SAL_CALL FirebirdDriver::connect(
     const OUString& url, const Sequence< PropertyValue >& info )
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XConnection > xConnection;
 
@@ -202,7 +199,6 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect(
 }
 
 sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url )
-    throw(SQLException, RuntimeException, std::exception)
 {
     SvtMiscOptions aMiscOptions;
 
@@ -212,7 +208,6 @@ sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url )
 
 Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo(
     const OUString& url, const Sequence< PropertyValue >& info )
-    throw(SQLException, RuntimeException, std::exception)
 {
     (void) info;
     if ( ! acceptsURL(url) )
@@ -225,14 +220,14 @@ Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo(
     return Sequence< DriverPropertyInfo >();
 }
 
-sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion(  )
 {
     // The major and minor version are sdbc driver specific. Must begin with 1.0
     // as per http://api.libreoffice.org/docs/common/ref/com/sun/star/sdbc/XDriver.html
     return 1;
 }
 
-sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion(  )
 {
     return 0;
 }
@@ -240,7 +235,6 @@ sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion(  ) throw(RuntimeException, s
 //----- XDataDefinitionSupplier
 uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByConnection(
                                     const uno::Reference< XConnection >& rConnection)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Connection* pConnection = static_cast< Connection* >(rConnection.get());
     return uno::Reference< XTablesSupplier >(pConnection->createCatalog(), UNO_QUERY);
@@ -249,7 +243,6 @@ uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByCo
 uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByURL(
                     const OUString& rURL,
                     const uno::Sequence< PropertyValue >& rInfo)
-    throw(SQLException, RuntimeException, std::exception)
 {
     uno::Reference< XConnection > xConnection = connect(rURL, rInfo);
     return getDataDefinitionByConnection(xConnection);
@@ -295,7 +288,7 @@ namespace connectivity
                 osl_atomic_increment( &_refCount );
         }
 
-        void checkDisposed(bool _bThrow) throw ( DisposedException )
+        void checkDisposed(bool _bThrow)
         {
             if (_bThrow)
                 throw DisposedException();
diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx
index a48b13e11f53..c314fc69fe4f 100644
--- a/connectivity/source/drivers/firebird/Driver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -39,7 +39,7 @@ namespace connectivity
         static const int FIREBIRD_SQL_DIALECT = 3;
 
         /// @throws css::uno::Exception
-        css::uno::Reference< css::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception, std::exception );
+        css::uno::Reference< css::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
         typedef ::cppu::WeakComponentImplHelper<   css::sdbc::XDriver,
                                                    css::sdbcx::XDataDefinitionSupplier,
@@ -68,34 +68,30 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
             // XInterface
             /// @throws css::uno::RuntimeException
-            static ::rtl::OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static ::rtl::OUString getImplementationName_Static(  );
             /// @throws css::uno::RuntimeException
-            static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+            static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(  );
 
             // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual ::rtl::OUString SAL_CALL getImplementationName(  ) override;
+            virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
+            virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Int32 SAL_CALL getMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
 
             // XDataDefinitionSupplier
             virtual css::uno::Reference< css::sdbcx::XTablesSupplier >
                 SAL_CALL getDataDefinitionByConnection(
-                    const css::uno::Reference< css::sdbc::XConnection >& rxConnection)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                    const css::uno::Reference< css::sdbc::XConnection >& rxConnection) override;
             virtual css::uno::Reference< css::sdbcx::XTablesSupplier >
                 SAL_CALL getDataDefinitionByURL(
                     const OUString& rsURL,
-                    const css::uno::Sequence< css::beans::PropertyValue >& rInfo)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                    const css::uno::Sequence< css::beans::PropertyValue >& rInfo) override;
         };
     }
 
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index b427c5fe358c..970c24c2d924 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -63,7 +63,6 @@ OPreparedStatement::OPreparedStatement( Connection* _pConnection,
 }
 
 void OPreparedStatement::ensurePrepared()
-    throw (SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -128,7 +127,6 @@ void SAL_CALL OPreparedStatement::release() throw()
 }
 
 Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType)
-    throw(RuntimeException, std::exception)
 {
     Any aRet = OStatementCommonBase::queryInterface(rType);
     if(!aRet.hasValue())
@@ -137,14 +135,12 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType)
 }
 
 uno::Sequence< Type > SAL_CALL OPreparedStatement::getTypes()
-    throw(RuntimeException, std::exception)
 {
     return concatSequences(OPreparedStatement_Base::getTypes(),
                            OStatementCommonBase::getTypes());
 }
 
 Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData()
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -157,7 +153,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData()
     return m_xMetaData;
 }
 
-void SAL_CALL OPreparedStatement::close() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::close()
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -184,7 +180,6 @@ void SAL_CALL OPreparedStatement::disposing()
 
 void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex,
                                             const OUString& x)
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird",
              "setString(" << nParameterIndex << " , " << x << ")");
@@ -234,7 +229,6 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex,
 }
 
 Reference< XConnection > SAL_CALL OPreparedStatement::getConnection()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -243,7 +237,6 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection()
 }
 
 sal_Bool SAL_CALL OPreparedStatement::execute()
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird", "executeQuery(). "
         "Got called with sql: " <<  m_sSqlStatement);
@@ -296,14 +289,12 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
 }
 
 sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
-    throw(SQLException, RuntimeException, std::exception)
 {
     execute();
     return getStatementChangeCount();
 }
 
 Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery()
-    throw(SQLException, RuntimeException, std::exception)
 {
     execute();
     return m_xResultSet;
@@ -346,7 +337,6 @@ sal_Int64 toNumericWithoutDecimalPlace(const OUString& sSource)
 
 //----- XParameters -----------------------------------------------------------
 void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 /*nSqlType*/)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -356,14 +346,12 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 /*nSqlType
 }
 
 void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 nIndex, sal_Bool bValue)
-    throw(SQLException, RuntimeException, std::exception)
 {
     setValue< sal_Bool >(nIndex, bValue, SQL_BOOLEAN);
 }
 
 template <typename T>
 void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType)
-    throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -386,43 +374,36 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType)
 }
 
 void SAL_CALL OPreparedStatement::setByte(sal_Int32 /*nIndex*/, sal_Int8 /*nValue*/)
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("XParameters::setByte", *this);
 }
 
 void SAL_CALL OPreparedStatement::setShort(sal_Int32 nIndex, sal_Int16 nValue)
-    throw(SQLException, RuntimeException, std::exception)
 {
     setValue< sal_Int16 >(nIndex, nValue, SQL_SHORT);
 }
 
 void SAL_CALL OPreparedStatement::setInt(sal_Int32 nIndex, sal_Int32 nValue)
-    throw(SQLException, RuntimeException, std::exception)
 {
     setValue< sal_Int32 >(nIndex, nValue, SQL_LONG);
 }
 
 void SAL_CALL OPreparedStatement::setLong(sal_Int32 nIndex, sal_Int64 nValue)
-    throw(SQLException, RuntimeException, std::exception)
 {
     setValue< sal_Int64 >(nIndex, nValue, SQL_INT64);
 }
 
 void SAL_CALL OPreparedStatement::setFloat(sal_Int32 nIndex, float nValue)
-    throw(SQLException, RuntimeException, std::exception)
 {
     setValue< float >(nIndex, nValue, SQL_FLOAT);
 }
 
 void SAL_CALL OPreparedStatement::setDouble(sal_Int32 nIndex, double nValue)
-    throw(SQLException, RuntimeException, std::exception)
 {
     setValue< double >(nIndex, nValue, SQL_DOUBLE); // TODO: SQL_D_FLOAT?
 }
 
 void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex, const Date& rDate)
-    throw(SQLException, RuntimeException, std::exception)
 {
     struct tm aCTime;
     aCTime.tm_mday = rDate.Day;
@@ -436,7 +417,6 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex, const Date& rDate)
 }
 
 void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const css::util::Time& rTime)
-    throw(SQLException, RuntimeException, std::exception)
 {
     struct tm aCTime;
     aCTime.tm_sec = rTime.Seconds;
@@ -450,7 +430,6 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const css::util::Ti
 }
 
 void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 nIndex, const DateTime& rTimestamp)
-    throw(SQLException, RuntimeException, std::exception)
 {
     struct tm aCTime;
     aCTime.tm_sec = rTimestamp.Seconds;
@@ -504,7 +483,7 @@ void OPreparedStatement::closeBlobAfterWriting(isc_blob_handle& rBlobHandle)
     }
 }
 
-void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x )
 {
     (void) parameterIndex;
     (void) x;
@@ -515,7 +494,6 @@ void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Refer
 
 void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex,
                                           const Reference< XBlob >& xBlob)
-    throw (SQLException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -565,7 +543,7 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex,
 }
 
 
-void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x )
 {
     (void) parameterIndex;
     (void) x;
@@ -575,7 +553,7 @@ void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Refe
 }
 
 
-void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x )
 {
     (void) parameterIndex;
     (void) x;
@@ -585,7 +563,7 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Refere
 }
 
 
-void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale )
 {
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -669,7 +647,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
 }
 
 
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName )
 {
     (void) parameterIndex;
     (void) sqlType;
@@ -680,7 +658,7 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I
 }
 
 
-void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x )
 {
     (void) parameterIndex;
     (void) x;
@@ -691,7 +669,6 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
 
 void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex,
                                            const Sequence< sal_Int8 >& xBytes)
-    throw (SQLException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -738,7 +715,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex,
 }
 
 
-void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     (void) parameterIndex;
     (void) x;
@@ -749,7 +726,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex,
 }
 
 
-void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     (void) parameterIndex;
     (void) x;
@@ -760,31 +737,28 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con
 }
 
 
-void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::clearParameters(  )
 {
 }
 
 // ---- Batch methods -- unsupported -----------------------------------------
 void SAL_CALL OPreparedStatement::clearBatch()
-    throw(SQLException, RuntimeException, std::exception)
 {
     // Unsupported
 }
 
 void SAL_CALL OPreparedStatement::addBatch()
-    throw(SQLException, RuntimeException, std::exception)
 {
     // Unsupported by firebird
 }
 
 Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch()
-    throw(SQLException, RuntimeException, std::exception)
 {
     // Unsupported by firebird
     return Sequence< sal_Int32 >();
 }
 
-void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception)
+void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     switch(nHandle)
     {
@@ -802,7 +776,6 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
 }
 
 void OPreparedStatement::checkParameterIndex(sal_Int32 nParameterIndex)
-    throw(SQLException, RuntimeException)
 {
     ensurePrepared();
     if ((nParameterIndex == 0) || (nParameterIndex > m_pInSqlda->sqld))
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index 0062110899dd..986752cd66c1 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -55,9 +55,7 @@ namespace connectivity
             XSQLDA*         m_pInSqlda;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void checkParameterIndex(sal_Int32 nParameterIndex)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException);
+            void checkParameterIndex(sal_Int32 nParameterIndex);
 
             /**
              * Set a numeric value in the input SQLDA. If the destination
@@ -66,16 +64,12 @@ namespace connectivity
              * @throws css::sdbc::SQLException
              * @throws css::uno::RuntimeException
              */
-            template <typename T> void setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException);
+            template <typename T> void setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType);
             void setParameterNull(sal_Int32 nParameterIndex, bool bSetNull = true);
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void ensurePrepared()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException);
+            void ensurePrepared();
             /**
              * Assumes that all necessary mutexes have been taken.
              */
@@ -87,8 +81,7 @@ namespace connectivity
 
         protected:
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
-                                                                   const css::uno::Any& rValue)
-                                                                        throw (css::uno::Exception, std::exception) override;
+                                                                   const css::uno::Any& rValue) override;
             virtual ~OPreparedStatement() override;
         public:
             DECLARE_SERVICE_INFO();
@@ -97,90 +90,62 @@ namespace connectivity
                                 const ::rtl::OUString& sql);
 
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPreparedStatement
             virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
-                executeQuery()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                executeQuery() override;
             virtual sal_Int32 SAL_CALL
-                executeUpdate()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                executeUpdate() override;
             virtual sal_Bool SAL_CALL
-                execute()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                execute() override;
             virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL
-                getConnection()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                getConnection() override;
 
             // XParameters
-            virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setInt(sal_Int32 nIndex, sal_Int32 nValue)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) override;
+            virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) override;
+            virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) override;
+            virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue) override;
+            virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue) override;
+            virtual void SAL_CALL setInt(sal_Int32 nIndex, sal_Int32 nValue) override;
+            virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue) override;
+            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) override;
+            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+            virtual void SAL_CALL clearParameters(  ) override;
 
             // XPreparedBatchExecution -- UNSUPPORTED by firebird
             virtual void SAL_CALL
-                addBatch()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                addBatch() override;
             virtual void SAL_CALL
-                clearBatch()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                clearBatch() override;
             virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-                executeBatch()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+                executeBatch() override;
 
             // XCloseable
-            virtual void SAL_CALL close()
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close() override;
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
 
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
         };
     }
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index cc9dedc24cc0..4aebf25e810a 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -113,7 +113,7 @@ OResultSet::~OResultSet()
 }
 
 // ---- XResultSet -- Row retrieval methods ------------------------------------
-sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::getRow()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -121,7 +121,7 @@ sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException, st
     return m_currentRow;
 }
 
-sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::next()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -150,21 +150,21 @@ sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException, std::
     }
 }
 
-sal_Bool SAL_CALL OResultSet::previous() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::previous()
 {
     ::dbtools::throwFunctionNotSupportedSQLException("previous not supported in firebird",
                                                   *this);
     return false;
 }
 
-sal_Bool SAL_CALL OResultSet::isLast() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isLast()
 {
     ::dbtools::throwFunctionNotSupportedSQLException("isLast not supported in firebird",
                                                   *this);
     return false;
 }
 
-sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isBeforeFirst()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -172,7 +172,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeExcepti
     return m_currentRow == 0;
 }
 
-sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isAfterLast()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -180,7 +180,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException
     return m_bIsAfterLastRow;
 }
 
-sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isFirst()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -188,7 +188,7 @@ sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException, st
     return m_currentRow == 1 && !m_bIsAfterLastRow;
 }
 
-void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::beforeFirst()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -198,7 +198,7 @@ void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException, st
                                                       *this);
 }
 
-void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::afterLast()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -208,7 +208,7 @@ void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException, std:
                                                       *this);
 }
 
-sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::first()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -229,7 +229,7 @@ sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std:
     }
 }
 
-sal_Bool SAL_CALL OResultSet::last() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::last()
 {
     // We need to iterate past the last row to know when we've passed the last
     // row, hence we can't actually move to last.
@@ -238,7 +238,7 @@ sal_Bool SAL_CALL OResultSet::last() throw(SQLException, RuntimeException, std::
     return false;
 }
 
-sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow)
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -256,7 +256,7 @@ sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) throw(SQLException, Runti
     }
 }
 
-sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row)
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -279,7 +279,6 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) throw(SQLException, Runtim
 }
 
 void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex)
-    throw (SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -294,7 +293,6 @@ void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex)
 }
 
 void SAL_CALL OResultSet::checkRowIndex()
-    throw (SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -308,19 +306,18 @@ void SAL_CALL OResultSet::checkRowIndex()
     }
 }
 
-Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OResultSet::queryInterface( const Type & rType )
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType);
 }
 
- Sequence<  Type > SAL_CALL OResultSet::getTypes() throw( RuntimeException, std::exception)
+ Sequence<  Type > SAL_CALL OResultSet::getTypes()
 {
     return concatSequences(OPropertySetHelper::getTypes(), OResultSet_BASE::getTypes());
 }
 // ---- XColumnLocate ---------------------------------------------------------
 sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& rColumnName)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -342,7 +339,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& rColumnName)
     return 0; // Never reached
 }
 
-uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex )
 {
     (void) columnIndex;
     MutexGuard aGuard(m_rMutex);
@@ -351,7 +348,7 @@ uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 c
     return nullptr;
 }
 
-uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex )
 {
     (void) columnIndex;
     MutexGuard aGuard(m_rMutex);
@@ -633,7 +630,7 @@ T OResultSet::safelyRetrieveValue(const sal_Int32 nColumnIndex, const ISC_SHORT
 }
 
 // ---- XRow -----------------------------------------------------------------
-sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::wasNull()
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -643,20 +640,17 @@ sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException, st
 
 // ---- XRow: Simple Numerical types ------------------------------------------
 sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 nColumnIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< bool >(nColumnIndex, SQL_BOOLEAN);
 }
 
 sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 nColumnIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     // Not a native firebird type hence we always have to convert.
     return safelyRetrieveValue< ORowSetValue >(nColumnIndex);
 }
 
 Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 columnIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     (void) columnIndex;
     return Sequence< sal_Int8 >(); // TODO: implement
@@ -664,62 +658,53 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 columnIndex)
 }
 
 sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 columnIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< sal_Int16 >(columnIndex, SQL_SHORT);
 }
 
 sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 columnIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< sal_Int32 >(columnIndex, SQL_LONG);
 }
 
 sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 columnIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< sal_Int64 >(columnIndex, SQL_INT64);
 }
 
 float SAL_CALL OResultSet::getFloat(sal_Int32 columnIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< float >(columnIndex, SQL_FLOAT);
 }
 
 double SAL_CALL OResultSet::getDouble(sal_Int32 columnIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< double >(columnIndex, SQL_DOUBLE);
 }
 
 // ---- XRow: More complex types ----------------------------------------------
 OUString SAL_CALL OResultSet::getString(sal_Int32 nIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< OUString >(nIndex);
 }
 
 Date SAL_CALL OResultSet::getDate(sal_Int32 nIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< Date >(nIndex, SQL_TYPE_DATE);
 }
 
 Time SAL_CALL OResultSet::getTime(sal_Int32 nIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< css::util::Time >(nIndex, SQL_TYPE_TIME);
 }
 
 DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 nIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return safelyRetrieveValue< DateTime >(nIndex, SQL_TIMESTAMP);
 }
 
 
-uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  )
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -730,7 +715,7 @@ uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(
     return m_xMetaData;
 }
 
-uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex )
 {
     (void) columnIndex;
     MutexGuard aGuard(m_rMutex);
@@ -740,7 +725,7 @@ uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex )
 }
 
 
-uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex )
 {
     (void) columnIndex;
     MutexGuard aGuard(m_rMutex);
@@ -758,7 +743,6 @@ uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) th
 }
 
 uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -772,7 +756,7 @@ uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex)
 }
 
 
-uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex )
 {
     (void) columnIndex;
     MutexGuard aGuard(m_rMutex);
@@ -782,7 +766,7 @@ uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) thro
 }
 
 
-Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< css::container::XNameAccess >& typeMap )
 {
     (void) columnIndex;
     (void) typeMap;
@@ -793,7 +777,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference<
 }
 
 
-void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::close()
 {
     SAL_INFO("connectivity.firebird", "close().");
 
@@ -806,7 +790,6 @@ void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exc
 
 
 uno::Reference< XInterface > SAL_CALL OResultSet::getStatement()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -814,34 +797,34 @@ uno::Reference< XInterface > SAL_CALL OResultSet::getStatement()
     return m_xStatement;
 }
 //----- XResultSet: unsupported change detection methods ---------------------
-sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowDeleted()
 {
     ::dbtools::throwFunctionNotSupportedSQLException("rowDeleted not supported in firebird",
                                                   *this);
     return false;
 }
-sal_Bool SAL_CALL OResultSet::rowInserted() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowInserted()
 {
     ::dbtools::throwFunctionNotSupportedSQLException("rowInserted not supported in firebird",
                                                   *this);
     return false;
 }
 
-sal_Bool SAL_CALL OResultSet::rowUpdated() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowUpdated()
 {
     ::dbtools::throwFunctionNotSupportedSQLException("rowUpdated not supported in firebird",
                                                   *this);
     return false;
 }
 
-void SAL_CALL OResultSet::refreshRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::refreshRow()
 {
     ::dbtools::throwFunctionNotSupportedSQLException("refreshRow not supported in firebird",
                                                   *this);
 }
 
 
-void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OResultSet::cancel(  )
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -887,25 +870,23 @@ void SAL_CALL OResultSet::release() throw()
     OResultSet_BASE::release();
 }
 
-uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
 // ---- XServiceInfo -----------------------------------------------------------
-OUString SAL_CALL OResultSet::getImplementationName() throw ( RuntimeException, std::exception)
+OUString SAL_CALL OResultSet::getImplementationName()
 {
     return OUString("com.sun.star.sdbcx.firebird.ResultSet");
 }
 
 Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames()
-    throw( RuntimeException, std::exception)
 {
     return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"};
 }
 
 sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName)
-    throw( RuntimeException, std::exception)
 {
     return cppu::supportsService(this, _rServiceName);
 }
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index 7d2a7c40bfec..75b0d6fcd60d 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -115,14 +115,10 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void SAL_CALL checkColumnIndex( sal_Int32 index )
-                throw (css::sdbc::SQLException,
-                       css::uno::RuntimeException);
+            void SAL_CALL checkColumnIndex( sal_Int32 index );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void SAL_CALL checkRowIndex()
-                throw (css::sdbc::SQLException,
-                       css::uno::RuntimeException);
+            void SAL_CALL checkRowIndex();
 
             // you can't delete objects of this type
             virtual ~OResultSet() override;
@@ -138,60 +134,59 @@ namespace connectivity
 
             // XInterface
             virtual css::uno::Any SAL_CALL queryInterface(
-                    const css::uno::Type& rType)
-                throw (css::uno::RuntimeException, std::exception) override;
+                    const css::uno::Type& rType) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
 #if 0
             virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
@@ -199,9 +194,7 @@ namespace connectivity
 #endif
 
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName)
-                throw(css::sdbc::SQLException,
-                      css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) override;
 
         };
 
diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
index 7d2dd2f392a5..79262d8f1d70 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
@@ -40,25 +40,23 @@ OResultSetMetaData::~OResultSetMetaData()
 }
 
 void OResultSetMetaData::verifyValidColumn(sal_Int32 column)
-    throw(SQLException)
 {
     if (column>getColumnCount() || column < 1)
         throw SQLException("Invalid column specified", *this, OUString(), 0, Any());
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount()
 {
     return m_pSqlda->sqld;
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 {
     verifyValidColumn(column);
     return 32; // Hard limit for firebird
 }
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     verifyValidColumn(column);
 
@@ -69,7 +67,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     // Firebird is generally case sensitive when using quoted identifiers.
     // IF THIS CHANGES make ResultSet::findColumn to be case-insensitive as needed.
@@ -81,14 +78,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
 }
 
 OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     (void) column;
     return OUString(); // Schemas supported by firebird
 }
 
 OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     verifyValidColumn(column);
     OUString sRet(m_pSqlda->sqlvar[column-1].sqlname,
@@ -99,7 +94,6 @@ OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
 }
 
 OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     verifyValidColumn(column);
     return OUString(m_pSqlda->sqlvar[column-1].relname,
@@ -108,14 +102,12 @@ OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
 }
 
 OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     (void) column;
     return OUString(); // Catalogs not supported by firebird
 }
 
 OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     verifyValidColumn(column);
 
@@ -126,7 +118,6 @@ OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
 }
 
 OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     // aliasname
     verifyValidColumn(column);
@@ -138,7 +129,6 @@ OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
 }
 
 OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     // TODO: implement
     (void) column;
@@ -146,14 +136,12 @@ OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     (void) column;
     return false;
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     OUString sTable = getTableName(column);
     if( !sTable.isEmpty() )
@@ -190,7 +178,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column)
 
 
 sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     // Unsigned values aren't supported in firebird.
     (void) column;
@@ -198,7 +185,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column)
 }
 
 sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     sal_Int32 nType = getColumnType(column);
     if( nType == DataType::NUMERIC || nType == DataType::DECIMAL )
@@ -234,13 +220,11 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column)
 }
 
 sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column)
-    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return -(m_pSqlda->sqlvar[column-1].sqlscale); // fb stores negative number
 }
 
 sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     if (m_pSqlda->sqlvar[column-1].sqltype & 1)
         return ColumnValue::NULLABLE;
@@ -249,7 +233,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     // TODO: Can the column be used as part of a where clause? Assume yes
     (void) column;
@@ -257,20 +240,18 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     (void) column;
     return m_pConnection->isReadOnly(); // Readonly only available on db level
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     (void) column;
     return !m_pConnection->isReadOnly();
 }
 
-sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column )
 {
     (void) column;
     return !m_pConnection->isReadOnly();
diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
index a183e97cd70a..d6dffe0cd708 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
@@ -44,7 +44,7 @@ namespace connectivity
             virtual ~OResultSetMetaData() override;
 
             /// @throws css::sdbc::SQLException
-            void verifyValidColumn(sal_Int32 column) throw(css::sdbc::SQLException);
+            void verifyValidColumn(sal_Int32 column);
         public:
             // a constructor, which is required for returning objects:
             OResultSetMetaData(Connection* pConnection,
@@ -53,48 +53,27 @@ namespace connectivity
                 , m_pSqlda(pSqlda)
             {}
 
-            virtual sal_Int32 SAL_CALL getColumnCount()
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSearchable(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCurrency(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSigned(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getScale(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isWritable(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL getColumnCount() override;
+            virtual sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) override;
+            virtual sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) override;
+            virtual sal_Bool SAL_CALL isSearchable(sal_Int32 column) override;
+            virtual sal_Bool SAL_CALL isCurrency(sal_Int32 column) override;
+            virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column) override;
+            virtual sal_Bool SAL_CALL isSigned(sal_Int32 column) override;
+            virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) override;
+            virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) override;
+            virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) override;
+            virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) override;
+            virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column) override;
+            virtual sal_Int32 SAL_CALL getScale(sal_Int32 column) override;
+            virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) override;
+            virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override;
+            virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override;
+            virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override;
+            virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column) override;
+            virtual sal_Bool SAL_CALL isWritable(sal_Int32 column) override;
+            virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) override;
+            virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx
index a13414ca268e..8ec604760251 100644
--- a/connectivity/source/drivers/firebird/Statement.cxx
+++ b/connectivity/source/drivers/firebird/Statement.cxx
@@ -52,16 +52,15 @@ using namespace ::std;
 
 // ---- XBatchExecution - UNSUPPORTED ----------------------------------------
 void SAL_CALL OStatement::addBatch(const OUString& sql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     (void) sql;
 }
 
-void SAL_CALL OStatement::clearBatch() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatement::clearBatch()
 {
 }
 
-Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch()
 {
     return Sequence< sal_Int32 >();
 }
@@ -95,7 +94,6 @@ void OStatement::disposeResultSet()
 
 // ---- XStatement -----------------------------------------------------------
 sal_Int32 SAL_CALL OStatement::executeUpdate(const OUString& sql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     execute(sql);
     return getStatementChangeCount();
@@ -103,7 +101,6 @@ sal_Int32 SAL_CALL OStatement::executeUpdate(const OUString& sql)
 
 
 uno::Reference< XResultSet > SAL_CALL OStatement::executeQuery(const OUString& sql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -149,7 +146,6 @@ uno::Reference< XResultSet > SAL_CALL OStatement::executeQuery(const OUString& s
 }
 
 sal_Bool SAL_CALL OStatement::execute(const OUString& sql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     uno::Reference< XResultSet > xResults = executeQuery(sql);
     return xResults.is();
@@ -157,7 +153,6 @@ sal_Bool SAL_CALL OStatement::execute(const OUString& sql)
 }
 
 uno::Reference< XConnection > SAL_CALL OStatement::getConnection()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -165,7 +160,7 @@ uno::Reference< XConnection > SAL_CALL OStatement::getConnection()
     return uno::Reference<XConnection>(m_pConnection.get());
 }
 
-Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OStatement::queryInterface( const Type & rType )
 {
     Any aRet = OStatement_Base::queryInterface(rType);
     if(!aRet.hasValue())
@@ -176,7 +171,6 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep
 }
 
 uno::Sequence< Type > SAL_CALL OStatement::getTypes()
-    throw(RuntimeException, std::exception)
 {
     return concatSequences(OStatement_Base::getTypes(),
                            OStatementCommonBase::getTypes());
diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx
index 308d2f9ae478..248a2a65fb1a 100644
--- a/connectivity/source/drivers/firebird/Statement.hxx
+++ b/connectivity/source/drivers/firebird/Statement.hxx
@@ -58,31 +58,25 @@ namespace connectivity
 
             // XStatement
             virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
-                executeQuery(const ::rtl::OUString& sql)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                executeQuery(const ::rtl::OUString& sql) override;
+            virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn) override;
             virtual sal_Bool SAL_CALL
-                execute(const ::rtl::OUString& sql)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                execute(const ::rtl::OUString& sql) override;
             virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL
-                getConnection()
-                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                getConnection() override;
 
             // XBatchExecution - UNSUPPORTED
-            virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) override;
+            virtual void SAL_CALL clearBatch(  ) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) override;
 
             // XInterface
             virtual css::uno::Any SAL_CALL
-                queryInterface(const css::uno::Type & rType)
-                throw(css::uno::RuntimeException, std::exception) override;
+                queryInterface(const css::uno::Type & rType) override;
 
             //XTypeProvider
             virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-                getTypes()
-                throw(css::uno::RuntimeException, std::exception) override;
+                getTypes() override;
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
 
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index bd1c4b7f23d1..1cf44a849636 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -68,7 +68,6 @@ void OStatementCommonBase::disposeResultSet()
 }
 
 void OStatementCommonBase::freeStatementHandle()
-    throw (SQLException)
 {
     if (m_aStatementHandle)
     {
@@ -82,7 +81,7 @@ void OStatementCommonBase::freeStatementHandle()
 }
 
 
-Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType )
 {
     Any aRet = OStatementCommonBase_Base::queryInterface(rType);
     if(!aRet.hasValue())
@@ -90,7 +89,7 @@ Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(Ru
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OStatementCommonBase::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OStatementCommonBase::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes(
         ::cppu::UnoType<XMultiPropertySet>::get(),
@@ -101,7 +100,7 @@ Sequence< Type > SAL_CALL OStatementCommonBase::getTypes(  ) throw(RuntimeExcept
 }
 
 
-void SAL_CALL OStatementCommonBase::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OStatementCommonBase::cancel(  )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -109,7 +108,6 @@ void SAL_CALL OStatementCommonBase::cancel(  ) throw(RuntimeException, std::exce
 }
 
 void SAL_CALL OStatementCommonBase::close()
-    throw(SQLException, RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.firebird", "close");
 
@@ -126,7 +124,6 @@ void SAL_CALL OStatementCommonBase::close()
 void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql,
                                                       XSQLDA*& pOutSqlda,
                                                       XSQLDA* pInSqlda)
-    throw (SQLException)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -223,7 +220,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql,
 }
 
 // ---- XMultipleResults - UNSUPPORTED ----------------------------------------
-uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() throw(SQLException, RuntimeException, std::exception)
+uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet()
 {
     // TODO: verify we really can't support this
 //     return uno::Reference< XResultSet >();
@@ -233,7 +230,7 @@ uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() throw
     return m_xResultSet;
 }
 
-sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatementCommonBase::getMoreResults()
 {
     // TODO: verify we really can't support this
     return false;
@@ -241,7 +238,7 @@ sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() throw(SQLException, Run
 //     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 }
 
-sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount()
 {
     // TODO: verify we really can't support this
     return 0;
@@ -249,12 +246,12 @@ sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() throw(SQLException, Ru
 
 
 // ---- XWarningsSupplier - UNSUPPORTED ----------------------------------------
-Any SAL_CALL OStatementCommonBase::getWarnings() throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OStatementCommonBase::getWarnings()
 {
     return Any();
 }
 
-void SAL_CALL OStatementCommonBase::clearWarnings() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatementCommonBase::clearWarnings()
 {
 }
 
@@ -300,7 +297,6 @@ sal_Bool OStatementCommonBase::convertFastPropertyValue(
                             Any & rOldValue,
                             sal_Int32 nHandle,
                             const Any& rValue )
-    throw (IllegalArgumentException)
 {
     (void) rConvertedValue;
     (void) rOldValue;
@@ -311,7 +307,7 @@ sal_Bool OStatementCommonBase::convertFastPropertyValue(
     return bConverted;
 }
 
-void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception)
+void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     (void) rValue;
     // set the value to what ever is necessary
@@ -362,13 +358,12 @@ void SAL_CALL OStatementCommonBase::release() throw()
     OStatementCommonBase_Base::release();
 }
 
-uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
 short OStatementCommonBase::getSqlInfoItem(char aInfoItem)
-    throw (SQLException)
 {
     ISC_STATUS_ARRAY aStatusVector;
     ISC_STATUS aErr;
@@ -396,7 +391,6 @@ short OStatementCommonBase::getSqlInfoItem(char aInfoItem)
 }
 
 bool OStatementCommonBase::isDDLStatement()
-    throw (SQLException)
 {
     if (getSqlInfoItem(isc_info_sql_stmt_type) == isc_info_sql_stmt_ddl)
         return true;
@@ -405,7 +399,6 @@ bool OStatementCommonBase::isDDLStatement()
 }
 
 sal_Int32 OStatementCommonBase::getStatementChangeCount()
-    throw (SQLException)
 {
     const short aStatementType = getSqlInfoItem(isc_info_sql_stmt_type);
 
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
index 11d9c3dab52b..856ebc807ff9 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
@@ -66,8 +66,7 @@ namespace connectivity
         protected:
             virtual void disposeResultSet();
             /// @throws css::sdbc::SQLException
-            void freeStatementHandle()
-                throw (css::sdbc::SQLException);
+            void freeStatementHandle();
 
             // OPropertyArrayUsageHelper
             virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
@@ -78,11 +77,10 @@ namespace connectivity
                                                                 css::uno::Any & rConvertedValue,
                                                                 css::uno::Any & rOldValue,
                                                                 sal_Int32 nHandle,
-                                                                const css::uno::Any& rValue )
-                                                            throw (css::lang::IllegalArgumentException) override;
+                                                                const css::uno::Any& rValue ) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                                                 sal_Int32 nHandle,
-                                                                const css::uno::Any& rValue)   throw (css::uno::Exception, std::exception) override;
+                                                                const css::uno::Any& rValue) override;
             virtual void SAL_CALL getFastPropertyValue(
                                                                 css::uno::Any& rValue,
                                                                 sal_Int32 nHandle) const override;
@@ -91,18 +89,14 @@ namespace connectivity
             /// @throws css::sdbc::SQLException
             void prepareAndDescribeStatement(const OUString& sqlIn,
                                              XSQLDA*& pOutSqlda,
-                                             XSQLDA* pInSqlda=nullptr)
-                throw (css::sdbc::SQLException);
+                                             XSQLDA* pInSqlda=nullptr);
 
             /// @throws css::sdbc::SQLException
-            short getSqlInfoItem(char aInfoItem)
-                throw (css::sdbc::SQLException);
+            short getSqlInfoItem(char aInfoItem);
             /// @throws css::sdbc::SQLException
-            bool isDDLStatement()
-                throw (css::sdbc::SQLException);
+            bool isDDLStatement();
             /// @throws css::sdbc::SQLException
-            sal_Int32 getStatementChangeCount()
-                throw (css::sdbc::SQLException);
+            sal_Int32 getStatementChangeCount();
 
         public:
 
@@ -118,25 +112,25 @@ namespace connectivity
             virtual void SAL_CALL release() throw() override;
             virtual void SAL_CALL acquire() throw() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
             // XWarningsSupplier - UNSUPPORTED
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XMultipleResults - UNSUPPORTED
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getUpdateCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getMoreResults(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+            virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+            virtual sal_Bool SAL_CALL getMoreResults(  ) override;
 
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
 
         };
     }
diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx
index 9a6739e59a45..ea03c6512b6f 100644
--- a/connectivity/source/drivers/firebird/SubComponent.hxx
+++ b/connectivity/source/drivers/firebird/SubComponent.hxx
@@ -56,7 +56,7 @@ namespace connectivity
                      css::lang::XComponent* _pObject);
 
         /// @throws css::lang::DisposedException
-        void checkDisposed(bool _bThrow) throw ( css::lang::DisposedException );
+        void checkDisposed(bool _bThrow);
 
 
         template <class TYPE>
diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx
index fea904630ffb..7f71d1ebfbac 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -112,7 +112,6 @@ OCollection* Table::createIndexes(const TStringVector& rNames)
 //----- XAlterTable -----------------------------------------------------------
 void SAL_CALL Table::alterColumnByName(const OUString& rColName,
                                        const uno::Reference< XPropertySet >& rDescriptor)
-    throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_rMutex);
     checkDisposed(WeakComponentImplHelperBase::rBHelper.bDisposed);
@@ -223,7 +222,6 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName,
 
 // ----- XRename --------------------------------------------------------------
 void SAL_CALL Table::rename(const OUString& rName)
-    throw(SQLException, ElementExistException, RuntimeException, std::exception)
 {
     (void) rName;
     throw RuntimeException(); // Firebird doesn't support this.
@@ -231,7 +229,6 @@ void SAL_CALL Table::rename(const OUString& rName)
 
 // ----- XInterface -----------------------------------------------------------
 Any SAL_CALL Table::queryInterface(const Type& rType)
-    throw(RuntimeException, std::exception)
 {
     if (rType.getTypeName() == "com.sun.star.sdbcx.XRename")
         return Any();
@@ -241,7 +238,6 @@ Any SAL_CALL Table::queryInterface(const Type& rType)
 
 // ----- XTypeProvider --------------------------------------------------------
 uno::Sequence< Type > SAL_CALL Table::getTypes()
-    throw(RuntimeException, std::exception)
 {
     uno::Sequence< Type > aTypes = OTableHelper::getTypes();
 
diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx
index 7ea9f48734f8..c1bcc161674b 100644
--- a/connectivity/source/drivers/firebird/Table.hxx
+++ b/connectivity/source/drivers/firebird/Table.hxx
@@ -64,26 +64,18 @@ namespace connectivity
              */
             virtual void SAL_CALL alterColumnByName(
                     const ::rtl::OUString& rColName,
-                    const css::uno::Reference< css::beans::XPropertySet >& rDescriptor)
-                throw(css::sdbc::SQLException,
-                      css::container::NoSuchElementException,
-                      css::uno::RuntimeException, std::exception) override;
+                    const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) override;
 
             // XRename -- UNSUPPORTED
-            virtual void SAL_CALL rename(const ::rtl::OUString& sName)
-                throw(css::sdbc::SQLException,
-                      css::container::ElementExistException,
-                      css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL rename(const ::rtl::OUString& sName) override;
 
             //XInterface
             virtual css::uno::Any
-                    SAL_CALL queryInterface(const css::uno::Type & rType)
-                throw(css::uno::RuntimeException, std::exception) override;
+                    SAL_CALL queryInterface(const css::uno::Type & rType) override;
 
             //XTypeProvider
             virtual css::uno::Sequence< css::uno::Type >
-                    SAL_CALL getTypes()
-                throw(css::uno::RuntimeException, std::exception) override;
+                    SAL_CALL getTypes() override;
 
         };
 
diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx
index bc15f9040e46..2643a7aa7a0c 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno;
 
 //----- OCollection -----------------------------------------------------------
 void Tables::impl_refresh()
-    throw(RuntimeException)
 {
     static_cast<Catalog&>(m_rParent).refreshTables();
 }
diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx
index 1a0a3580efd7..e106b8b65c4d 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -32,8 +32,7 @@ namespace connectivity
             static OUString createStandardColumnPart(const css::uno::Reference< css::beans::XPropertySet >& xColProp,const css::uno::Reference< com::sun::star::sdbc::XConnection>& _xConnection);
 
             // OCollection
-            virtual void impl_refresh()
-                throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual ::connectivity::sdbcx::ObjectType createObject(
                                                 const ::rtl::OUString& rName) override;
             virtual css::uno::Reference< css::beans::XPropertySet >
diff --git a/connectivity/source/drivers/firebird/Users.cxx b/connectivity/source/drivers/firebird/Users.cxx
index 4316a5814039..832872c51e66 100644
--- a/connectivity/source/drivers/firebird/Users.cxx
+++ b/connectivity/source/drivers/firebird/Users.cxx
@@ -41,7 +41,6 @@ Users::Users(const uno::Reference< XDatabaseMetaData >& rMetaData,
 
 //----- OCollection -----------------------------------------------------------
 void Users::impl_refresh()
-    throw(RuntimeException)
 {
     // TODO: IMPLEMENT ME
 }
diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx
index 975bd1376263..75ba14499eb5 100644
--- a/connectivity/source/drivers/firebird/Users.hxx
+++ b/connectivity/source/drivers/firebird/Users.hxx
@@ -29,8 +29,7 @@ namespace connectivity
                 m_xMetaData;
 
             // OCollection
-            virtual void impl_refresh()
-                throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual ::connectivity::sdbcx::ObjectType createObject(
                                                 const ::rtl::OUString& rName) override;
             virtual css::uno::Reference< css::beans::XPropertySet >
diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx
index 7d72900a4788..bd84bba0c9a9 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -56,7 +56,6 @@ OUString firebird::StatusVectorToString(const ISC_STATUS_ARRAY& rStatusVector,
 void firebird::evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector,
                                     const OUString& rCause,
                                     const uno::Reference< XInterface >& _rxContext)
-    throw(SQLException)
 {
     if (IndicatesError(rStatusVector))
     {
diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx
index c66ecd7d1209..b37b8718e9b8 100644
--- a/connectivity/source/drivers/firebird/Util.hxx
+++ b/connectivity/source/drivers/firebird/Util.hxx
@@ -60,8 +60,7 @@ namespace connectivity
          */
         void evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector,
                                   const ::rtl::OUString& aCause,
-                                  const css::uno::Reference< css::uno::XInterface >& _rxContext)
-                throw (css::sdbc::SQLException);
+                                  const css::uno::Reference< css::uno::XInterface >& _rxContext);
 
         sal_Int32 getColumnTypeFromFBType(short aType, short aSubType);
         ::rtl::OUString getColumnTypeNameFromFBType(short aType, short aSubType);
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 748bdae64f54..dcd6e689b19f 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -60,7 +60,6 @@ IMPLEMENT_SERVICE_INFO(OFlatConnection, "com.sun.star.sdbc.drivers.flat.Connecti
 
 
 void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
-    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     osl_atomic_increment( &m_refCount );
 
@@ -105,7 +104,7 @@ void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValu
     m_bShowDeleted = true; // we do not supported rows for this type
 }
 
-Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_B::rBHelper.bDisposed);
@@ -134,7 +133,7 @@ css::uno::Reference< XTablesSupplier > OFlatConnection::createCatalog()
     return xTab;
 }
 
-Reference< XStatement > SAL_CALL OFlatConnection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL OFlatConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_B::rBHelper.bDisposed);
@@ -146,7 +145,7 @@ Reference< XStatement > SAL_CALL OFlatConnection::createStatement(  ) throw(SQLE
     return xStmt;
 }
 
-Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_B::rBHelper.bDisposed);
@@ -160,7 +159,7 @@ Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( cons
     return xStmt;
 }
 
-Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_B::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index fe5d88f64cab..a1a80ff0d14d 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -148,7 +148,7 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw(  )
 
 Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
-        const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& columnNamePattern )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -236,7 +236,7 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
     return xRef;
 }
 
-OUString SAL_CALL OFlatDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OFlatDatabaseMetaData::getURL(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return "sdbc:flat:" + m_pConnection->getURL();
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 6fdc55c73882..1219f46cf7b8 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -38,24 +38,24 @@ using namespace css::lang;
 
 // static ServiceInfo
 
-OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.sdbc.flat.ODriver");
 }
 
 
-OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL ODriver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
 
-css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception )
+css::uno::Reference< css::uno::XInterface >  SAL_CALL connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new ODriver( comphelper::getComponentContext(_rxFactory) ));
 }
 
-Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)
@@ -73,12 +73,11 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S
 }
 
 sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
-                throw(SQLException, RuntimeException, std::exception)
 {
     return url.startsWith("sdbc:flat:");
 }
 
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info )
 {
     if ( acceptsURL(url) )
     {
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 4a8c37900198..60e0e851e465 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -44,12 +44,12 @@ OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                cppu::UnoType<bool>::get());
 }
 
-OUString SAL_CALL OFlatResultSet::getImplementationName(  ) throw ( RuntimeException, std::exception)
+OUString SAL_CALL OFlatResultSet::getImplementationName(  )
 {
     return OUString("com.sun.star.sdbcx.flat.ResultSet");
 }
 
-Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames(  ) throw( RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames(  )
 {
      Sequence< OUString > aSupported(2);
     aSupported[0] = "com.sun.star.sdbc.ResultSet";
@@ -57,12 +57,12 @@ Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames(  ) throw
     return aSupported;
 }
 
-sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception)
+sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType )
 {
     if(rType == cppu::UnoType<XDeleteRows>::get()|| rType == cppu::UnoType<XResultSetUpdate>::get()
         || rType == cppu::UnoType<XRowUpdate>::get())
@@ -72,7 +72,7 @@ Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeE
     return aRet.hasValue() ? aRet : OFlatResultSet_BASE::queryInterface(rType);
 }
 
-Sequence<  Type > SAL_CALL OFlatResultSet::getTypes(  ) throw( RuntimeException, std::exception)
+Sequence<  Type > SAL_CALL OFlatResultSet::getTypes(  )
 {
     Sequence< Type > aTypes = OResultSet::getTypes();
     ::std::vector<Type> aOwnTypes;
@@ -94,7 +94,7 @@ Sequence<  Type > SAL_CALL OFlatResultSet::getTypes(  ) throw( RuntimeException,
 
 
 // XRowLocate
-Any SAL_CALL OFlatResultSet::getBookmark(  ) throw( SQLException,  RuntimeException, std::exception)
+Any SAL_CALL OFlatResultSet::getBookmark(  )
 {
      ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -102,7 +102,7 @@ Any SAL_CALL OFlatResultSet::getBookmark(  ) throw( SQLException,  RuntimeExcept
     return makeAny((sal_Int32)(m_aRow->get())[0]->getValue());
 }
 
-sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const  Any& bookmark )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -113,7 +113,7 @@ sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const  Any& bookmark ) throw(
     return Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),true);
 }
 
-sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -127,17 +127,17 @@ sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const  Any& bookmark,
 }
 
 
-sal_Int32 SAL_CALL OFlatResultSet::compareBookmarks( const Any& lhs, const  Any& rhs ) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL OFlatResultSet::compareBookmarks( const Any& lhs, const  Any& rhs )
 {
     return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL;
 }
 
-sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks(  ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks(  )
 {
     return true;
 }
 
-sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const  Any& bookmark )
 {
     return comphelper::getINT32(bookmark);
 }
@@ -164,7 +164,7 @@ void SAL_CALL OFlatResultSet::release() throw()
     OFlatResultSet_BASE2::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 21b20cbcb943..fea263b95ccf 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -516,7 +516,7 @@ void SAL_CALL OFlatTable::disposing()
     m_aColumns = nullptr;
 }
 
-Sequence< Type > SAL_CALL OFlatTable::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OFlatTable::getTypes(  )
 {
     Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
     vector<Type> aOwnTypes;
@@ -538,7 +538,7 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes(  ) throw(RuntimeException, std::
 }
 
 
-Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OFlatTable::queryInterface( const Type & rType )
 {
     if( rType == cppu::UnoType<XKeysSupplier>::get()||
         rType == cppu::UnoType<XIndexesSupplier>::get()||
@@ -569,7 +569,7 @@ Sequence< sal_Int8 > OFlatTable::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
+sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index a3baf0f021d5..a17eedd41f10 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -121,7 +121,7 @@ void OHCatalog::refreshUsers()
         m_pUsers = new OUsers(*this,m_aMutex,aVector,m_xConnection,this);
 }
 
-Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OHCatalog::queryInterface( const Type & rType )
 {
     if ( rType == cppu::UnoType<XGroupsSupplier>::get())
         return Any();
@@ -129,7 +129,7 @@ Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeExcept
     return OCatalog::queryInterface(rType);
 }
 
-Sequence< Type > SAL_CALL OHCatalog::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OHCatalog::getTypes(  )
 {
     Sequence< Type > aTypes = OCatalog::getTypes();
     ::std::vector<Type> aOwnTypes;
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index a63d829c9f9d..2aae09029ad9 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -67,7 +67,7 @@ void OHSQLColumn::construct()
     return *OHSQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
 
-Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSupported { "com.sun.star.sdbcx.Column" };
 
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index ff9a98c0e082..7f7032525ae5 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -121,7 +121,7 @@ namespace connectivity { namespace hsqldb
 
     // XFlushable
 
-    void SAL_CALL OHsqlConnection::flush(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL OHsqlConnection::flush(  )
     {
         MethodGuard aGuard( *this );
 
@@ -166,21 +166,21 @@ namespace connectivity { namespace hsqldb
    }
 
 
-    void SAL_CALL OHsqlConnection::addFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException, std::exception)
+    void SAL_CALL OHsqlConnection::addFlushListener( const Reference< XFlushListener >& l )
     {
         MethodGuard aGuard( *this );
         m_aFlushListeners.addInterface( l );
     }
 
 
-    void SAL_CALL OHsqlConnection::removeFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException, std::exception)
+    void SAL_CALL OHsqlConnection::removeFlushListener( const Reference< XFlushListener >& l )
     {
         MethodGuard aGuard( *this );
         m_aFlushListeners.removeInterface( l );
     }
 
 
-    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException, std::exception)
+    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& TableName, ::sal_Int32 /*_ColorMode*/ )
     {
         MethodGuard aGuard( *this );
 
@@ -192,7 +192,7 @@ namespace connectivity { namespace hsqldb
     }
 
 
-    Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+    Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName )
     {
         MethodGuard aGuard( *this );
 
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index af24d3190e4f..ba542ff972d0 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -75,7 +75,7 @@ namespace connectivity
 
     namespace hsqldb
     {
-        Reference< XInterface >  SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) throw( Exception )
+        Reference< XInterface >  SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac)
         {
             return *(new ODriverDelegator(comphelper::getComponentContext(_rxFac)));
         }
@@ -168,7 +168,7 @@ namespace connectivity
     }
 
 
-    Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info )
     {
         Reference< XConnection > xConnection;
         if ( acceptsURL(url) )
@@ -382,7 +382,7 @@ namespace connectivity
     }
 
 
-    sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url )
     {
         sal_Bool bEnabled = false;
         javaFrameworkError e = jfw_getEnabled(&bEnabled);
@@ -404,7 +404,7 @@ namespace connectivity
     }
 
 
-    Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException, std::exception)
+    Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ )
     {
         if ( !acceptsURL(url) )
             return Sequence< DriverPropertyInfo >();
@@ -434,19 +434,19 @@ namespace connectivity
     }
 
 
-    sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion(  )
     {
         return 1;
     }
 
 
-    sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion(  )
     {
         return 0;
     }
 
 
-    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed);
@@ -472,7 +472,7 @@ namespace connectivity
     }
 
 
-    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info )
     {
         if ( ! acceptsURL(url) )
         {
@@ -487,12 +487,12 @@ namespace connectivity
     // XServiceInfo
 
 
-    OUString ODriverDelegator::getImplementationName_Static(  ) throw(RuntimeException)
+    OUString ODriverDelegator::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.sdbcx.comp.hsqldb.Driver");
     }
 
-    Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+    Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSNS( 2 );
         aSNS[0] = "com.sun.star.sdbc.Driver";
@@ -500,22 +500,22 @@ namespace connectivity
         return aSNS;
     }
 
-    OUString SAL_CALL ODriverDelegator::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL ODriverDelegator::getImplementationName(  )
     {
         return getImplementationName_Static();
     }
 
-    sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_Static();
     }
 
-    void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, css::container::ElementExistException, RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ )
     {
         ::dbtools::throwFeatureNotImplementedSQLException( "XCreateCatalog::createCatalog", *this );
     }
@@ -555,7 +555,7 @@ namespace connectivity
             m_aConnections.erase(_aIter);
     }
 
-    void SAL_CALL ODriverDelegator::disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::disposing( const css::lang::EventObject& Source )
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         Reference<XConnection> xCon(Source.Source,UNO_QUERY);
@@ -625,7 +625,7 @@ namespace connectivity
         }
     }
 
-    void SAL_CALL ODriverDelegator::preCommit( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::preCommit( const css::lang::EventObject& aEvent )
     {
         ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -668,15 +668,15 @@ namespace connectivity
         }
     }
 
-    void SAL_CALL ODriverDelegator::commited( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::commited( const css::lang::EventObject& /*aEvent*/ )
     {
     }
 
-    void SAL_CALL ODriverDelegator::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::preRevert( const css::lang::EventObject& /*aEvent*/ )
     {
     }
 
-    void SAL_CALL ODriverDelegator::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL ODriverDelegator::reverted( const css::lang::EventObject& /*aEvent*/ )
     {
     }
 
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 8a2aea665be8..6bcecb57509a 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -143,7 +143,7 @@ Sequence< sal_Int8 > OHSQLTable::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
+sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
@@ -151,7 +151,7 @@ sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
 }
 
 // XAlterTable
-void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
@@ -338,7 +338,7 @@ void OHSQLTable::executeStatement(const OUString& _rStatement )
     }
 }
 
-Sequence< Type > SAL_CALL OHSQLTable::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OHSQLTable::getTypes(  )
 {
     if ( m_Type == "VIEW" )
     {
@@ -360,7 +360,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes(  ) throw(RuntimeException, std::
 }
 
 // XRename
-void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL OHSQLTable::rename( const OUString& newName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
@@ -396,7 +396,7 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException,
 }
 
 
-Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OHSQLTable::queryInterface( const Type & rType )
 {
     if( m_Type == "VIEW" && rType == cppu::UnoType<XRename>::get())
         return Any();
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 30ff90cea020..bdf01be13a1b 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -88,7 +88,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
     return xRet;
 }
 
-void OTables::impl_refresh(  ) throw(RuntimeException)
+void OTables::impl_refresh(  )
 {
     static_cast<OHCatalog&>(m_rParent).refreshTables();
 }
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 84c84fb5a273..6d1b5f1b254e 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -32,19 +32,16 @@ namespace connectivity
 
 // XEventListener
 void SAL_CALL OConnectionController::disposing( const EventObject& /*Source*/ )
-throw( RuntimeException, std::exception )
 {
 }
 
 // XTerminateListener
 void SAL_CALL OConnectionController::queryTermination( const EventObject& /*aEvent*/ )
-throw( TerminationVetoException, RuntimeException, std::exception )
 {
     m_pDriver->flushConnections();
 }
 
 void SAL_CALL OConnectionController::notifyTermination( const EventObject& /*aEvent*/ )
-throw( RuntimeException, std::exception )
 {
     m_pDriver->shutdownConnections();
 }
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index 5b5a86da9713..62e8ec79d660 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
@@ -39,14 +39,11 @@ namespace connectivity
                 explicit OConnectionController(ODriverDelegator* _pDriver) : m_pDriver(_pDriver){}
 
                 // 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;
         };
     }
 
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index e736830af6be..a73df49dec7a 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -77,7 +77,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper()
 }
 typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER;
 
-sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
@@ -87,7 +87,7 @@ sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32
     return nRights;
 }
 
-void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException)
+void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant)
 {
     nRightsWithGrant = nRights = 0;
     // first we need to create the sql stmt to select the privs
@@ -192,7 +192,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_In
     }
 }
 
-sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
@@ -202,7 +202,7 @@ sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, s
     return nRightsWithGrant;
 }
 
-void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
 {
     if ( objType != PrivilegeObject::TABLE )
     {
@@ -229,7 +229,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 obj
     }
 }
 
-void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
 {
     if ( objType != PrivilegeObject::TABLE )
     {
@@ -256,7 +256,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 ob
 }
 
 // XUser
-void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 771645269f9c..812d8edcd237 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -54,7 +54,7 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
     return new OHSQLUser(m_xConnection,_rName);
 }
 
-void OUsers::impl_refresh() throw(RuntimeException)
+void OUsers::impl_refresh()
 {
     m_pParent->refreshUsers();
 }
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index f98dcd57367a..e2ee450581e9 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -69,7 +69,7 @@ namespace connectivity { namespace hsqldb
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( HView, HView_Base, HView_IBASE )
 
 
-    void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException, std::exception)
+    void SAL_CALL HView::alterCommand( const OUString& _rNewCommand )
     {
         // not really atomic ... as long as we do not have something like
         //   ALTER VIEW <name> TO <command>
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index dc0dd69de886..54de4ebe9940 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -73,7 +73,7 @@ sdbcx::ObjectType HViews::createObject(const OUString& _rName)
 }
 
 
-void HViews::impl_refresh(  ) throw(RuntimeException)
+void HViews::impl_refresh(  )
 {
     static_cast<OHCatalog&>(m_rParent).refreshTables();
 }
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 87928d901fe2..445848483dd6 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -40,19 +40,19 @@ jclass java_sql_Array::getMyClass() const
     return theClass;
 }
 
-OUString SAL_CALL java_sql_Array::getBaseTypeName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+OUString SAL_CALL java_sql_Array::getBaseTypeName(  )
 {
     static jmethodID mID(nullptr);
     return callStringMethod("getBaseTypeName",mID);
 }
 
-sal_Int32 SAL_CALL java_sql_Array::getBaseType(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_Array::getBaseType(  )
 {
     static jmethodID mID(nullptr);
     return callIntMethod_ThrowSQL("getBaseType", mID);
 }
 
-css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     {
@@ -70,7 +70,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css
     return css::uno::Sequence< css::uno::Any >();
 }
 
-css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     {
@@ -88,7 +88,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sa
     return css::uno::Sequence< css::uno::Any >();
 }
 
-css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     {
@@ -108,7 +108,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS
     return nullptr;
 }
 
-css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     {
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index 9ec663127e77..7f0581104ada 100644
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
@@ -48,7 +48,7 @@ jclass java_sql_Blob::getMyClass() const
     return theClass;
 }
 
-sal_Int64 SAL_CALL java_sql_Blob::length(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL java_sql_Blob::length(  )
 {
     jlong out(0);
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -65,7 +65,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length(  ) throw(css::sdbc::SQLException, css:
     } //t.pEnv
     return (sal_Int64)out;
 }
-css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count )
 {
 
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -91,7 +91,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos,
     return  aSeq;
 }
 
-css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream(  )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -100,7 +100,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinarySt
     return out==nullptr ? nullptr : new java_io_InputStream( t.pEnv, out );
 }
 
-sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start )
 {
     jlong out(0);
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -130,7 +130,7 @@ sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >
     return (sal_Int64)out;
 }
 
-sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XBlob::positionOfBlob", *this );
     // this was put here in CWS warnings01. The previous implementation was defective, as it did ignore
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index c74ae7815552..f9c3d426bdbf 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -54,13 +54,13 @@ java_sql_CallableStatement::~java_sql_CallableStatement()
 }
 
 
-Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType )
 {
     Any aRet = java_sql_PreparedStatement::queryInterface(rType);
     return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< css::sdbc::XRow*>(this),static_cast< css::sdbc::XOutParameters*>(this));
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<css::sdbc::XRow>::get(),
                                     cppu::UnoType<css::sdbc::XOutParameters>::get());
@@ -68,7 +68,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTyp
     return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes());
 }
 
-sal_Bool SAL_CALL java_sql_CallableStatement::wasNull(  ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_CallableStatement::wasNull(  )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -76,14 +76,14 @@ sal_Bool SAL_CALL java_sql_CallableStatement::wasNull(  ) throw(css::sdbc::SQLEx
     return callBooleanMethod( "wasNull", mID );
 }
 
-sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex );
 }
-sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -91,7 +91,7 @@ sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) t
     jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod;
     return callMethodWithIntArg<jbyte>(pCallMethod,"getByte","(I)B",mID,columnIndex);
 }
-Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -110,7 +110,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co
     }
     return aSeq;
 }
-css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -118,7 +118,7 @@ css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIn
     jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex);
     return out ? static_cast <css::util::Date>(java_sql_Date( t.pEnv, out )) : css::util::Date();
 }
-double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -127,7 +127,7 @@ double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) t
     return callMethodWithIntArg<double>(pCallMethod,"getDouble","(I)D",mID,columnIndex);
 }
 
-float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -136,7 +136,7 @@ float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) thr
     return callMethodWithIntArg<jfloat>(pCallMethod,"getFloat","(I)F",mID,columnIndex);
 }
 
-sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -144,7 +144,7 @@ sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) t
     return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex);
 }
 
-sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -153,7 +153,7 @@ sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex )
     return callMethodWithIntArg<jlong>(pCallMethod,"getLong","(I)J",mID,columnIndex);
 }
 
-Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -163,7 +163,7 @@ Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const
     return Any();
 }
 
-sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -172,7 +172,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex )
     return callMethodWithIntArg<jshort>(pCallMethod,"getShort","(I)S",mID,columnIndex);
 }
 
-OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -182,7 +182,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex )
     return callStringMethodWithIntArg("getString",mID,columnIndex);
 }
 
- css::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+ css::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -192,7 +192,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex )
     return out ? static_cast <css::util::Time> (java_sql_Time( t.pEnv, out )) : css::util::Time();
 }
 
- css::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+ css::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -202,7 +202,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex )
     return out ? static_cast <css::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : css::util::DateTime();
 }
 
-void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -223,7 +223,7 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     }
 }
-void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -252,18 +252,18 @@ jclass java_sql_CallableStatement::getMyClass() const
     return theClass;
 }
 
-Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex )
 {
     Reference< css::sdbc::XBlob > xBlob = getBlob(columnIndex);
     return xBlob.is() ? xBlob->getBinaryStream() : Reference< css::io::XInputStream >();
 }
-Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex )
 {
     Reference< css::sdbc::XClob > xClob = getClob(columnIndex);
     return xClob.is() ? xClob->getCharacterStream() : Reference< css::io::XInputStream >();
 }
 
-Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -273,7 +273,7 @@ Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sa
     return out==nullptr ? nullptr : new java_sql_Array( t.pEnv, out );
 }
 
-Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -282,7 +282,7 @@ Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_
     // WARNING: the caller becomes the owner of the returned pointer
     return out==nullptr ? nullptr : new java_sql_Clob( t.pEnv, out );
 }
-Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -292,7 +292,7 @@ Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_
     return out==nullptr ? nullptr : new java_sql_Blob( t.pEnv, out );
 }
 
-Reference< css::sdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< css::sdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index 44424c9084ae..e309a32ffb52 100644
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
@@ -47,7 +47,7 @@ jclass java_sql_Clob::getMyClass() const
     return theClass;
 }
 
-sal_Int64 SAL_CALL java_sql_Clob::length(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL java_sql_Clob::length(  )
 {
     jlong out(0);
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -65,7 +65,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length(  ) throw(css::sdbc::SQLException, css:
     return (sal_Int64)out;
 }
 
-OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     OUString aStr;
@@ -84,7 +84,7 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin
     return  aStr;
 }
 
-css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream(  )
 {
     SDBThreadAttach t;
     static jmethodID mID(nullptr);
@@ -94,7 +94,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacte
     return out==nullptr ? nullptr : new java_io_Reader( t.pEnv, out );
 }
 
-sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start )
 {
     jlong out(0);
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -116,7 +116,7 @@ sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32
     return (sal_Int64)out;
 }
 
-sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const css::uno::Reference< css::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const css::uno::Reference< css::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XClob::positionOfClob", *this );
     // this was put here in CWS warnings01. The previous implementation was defective, as it did ignore
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index acc09749faa9..f0dcd168cbb7 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -69,7 +69,7 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_getTypeInfo_throw(  )
     return impl_callResultSetMethod( "getTypeInfo", mID );
 }
 
-Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs(  )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethod( "getCatalogs", mID );
@@ -81,21 +81,21 @@ OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw(  )
     return impl_callStringMethod( "getCatalogSeparator", mID );
 }
 
-Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas(  )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethod( "getSchemas", mID );
 }
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumnPrivileges(
-        const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+        const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethodWithStrings( "getColumnPrivileges", mID, catalog, schema, table, &columnNamePattern );
 }
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns(
-        const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+        const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethodWithStrings( "getColumns", mID, catalog, schemaPattern, tableNamePattern, &columnNamePattern );
@@ -103,7 +103,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns(
 
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
-        const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) throw(SQLException, RuntimeException, std::exception)
+        const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types )
 {
     static const char * const cMethodName = "getTables";
 
@@ -217,87 +217,87 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
 }
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedureColumns(
-        const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+        const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethodWithStrings( "getProcedureColumns", mID, catalog, schemaPattern, procedureNamePattern, &columnNamePattern );
 }
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedures( const Any&
-                catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception)
+                catalog, const OUString& schemaPattern, const OUString& procedureNamePattern )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethodWithStrings( "getProcedures", mID, catalog, schemaPattern, procedureNamePattern );
 }
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getVersionColumns(
-        const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+        const Any& catalog, const OUString& schema, const OUString& table )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethodWithStrings( "getVersionColumns", mID, catalog, schema, table );
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxBinaryLiteralLength", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxRowSize", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxCatalogNameLength", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxCharLiteralLength", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxColumnNameLength", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxColumnsInIndex", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxCursorNameLength", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxConnections", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxColumnsInTable", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxStatementLength", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxTableNameLength", mID);
@@ -310,21 +310,21 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 }
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getExportedKeys(
-        const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+        const Any& catalog, const OUString& schema, const OUString& table )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethodWithStrings( "getExportedKeys", mID, catalog, schema, table );
 }
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getImportedKeys(
-        const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+        const Any& catalog, const OUString& schema, const OUString& table )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethodWithStrings( "getImportedKeys", mID, catalog, schema, table );
 }
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys(
-        const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+        const Any& catalog, const OUString& schema, const OUString& table )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethodWithStrings( "getPrimaryKeys", mID, catalog, schema, table );
@@ -332,7 +332,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys(
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo(
         const Any& catalog, const OUString& schema, const OUString& table,
-        sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException, std::exception)
+        sal_Bool unique, sal_Bool approximate )
 {
     static const char * const cMethodName = "getIndexInfo";
 
@@ -373,7 +373,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo(
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier(
         const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope,
-        sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception)
+        sal_Bool nullable )
 {
     static const char * const cMethodName = "getBestRowIdentifier";
 
@@ -412,7 +412,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier
 }
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
-        const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception)
+        const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern )
 {
     if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() )
         return new OResultSetPrivileges(this,catalog,schemaPattern,tableNamePattern);
@@ -490,7 +490,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference(
         const Any& primaryCatalog, const OUString& primarySchema,
         const OUString& primaryTable, const Any& foreignCatalog,
-        const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& foreignSchema, const OUString& foreignTable )
 {
     static const char * const cMethodName = "getCrossReference";
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName );
@@ -669,19 +669,19 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS
 }
 
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "doesMaxRowSizeIncludeBlobs", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseQuotedIdentifiers(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "storesLowerCaseQuotedIdentifiers", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "storesLowerCaseIdentifiers", mID );
@@ -693,19 +693,19 @@ bool java_sql_DatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
     return impl_callBooleanMethod( "storesMixedCaseQuotedIdentifiers", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseIdentifiers(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "storesMixedCaseIdentifiers", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseQuotedIdentifiers(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "storesUpperCaseQuotedIdentifiers", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseIdentifiers(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "storesUpperCaseIdentifiers", mID );
@@ -723,19 +723,19 @@ bool java_sql_DatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
     return impl_callBooleanMethod( "supportsAlterTableWithDropColumn", mID );
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxIndexLength", mID);
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsNonNullableColumns", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getCatalogTerm", mID );
@@ -747,13 +747,13 @@ OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
     return impl_callStringMethod( "getIdentifierQuoteString", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getExtraNameCharacters", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsDifferentTableCorrelationNames", mID );
@@ -765,67 +765,67 @@ bool java_sql_DatabaseMetaData::impl_isCatalogAtStart_throw(  )
     return impl_callBooleanMethod( "isCatalogAtStart", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionIgnoredInTransactions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "dataDefinitionIgnoredInTransactions", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionCausesTransactionCommit(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "dataDefinitionCausesTransactionCommit", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataManipulationTransactionsOnly(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsDataManipulationTransactionsOnly", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsDataDefinitionAndDataManipulationTransactions", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedDelete(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsPositionedDelete", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedUpdate(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsPositionedUpdate", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossRollback(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsOpenStatementsAcrossRollback", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossCommit(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsOpenStatementsAcrossCommit", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossCommit(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsOpenCursorsAcrossCommit", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossRollback(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsOpenCursorsAcrossRollback", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "supportsTransactionIsolationLevel", mID, level );
@@ -837,25 +837,25 @@ bool java_sql_DatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
     return impl_callBooleanMethod( "supportsSchemasInDataManipulation", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92FullSQL(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsANSI92FullSQL", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsANSI92EntryLevelSQL", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsIntegrityEnhancementFacility", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsSchemasInIndexDefinitions", mID );
@@ -873,7 +873,7 @@ bool java_sql_DatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(
     return impl_callBooleanMethod( "supportsCatalogsInTableDefinitions", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsCatalogsInIndexDefinitions", mID );
@@ -885,13 +885,13 @@ bool java_sql_DatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(
     return impl_callBooleanMethod( "supportsCatalogsInDataManipulation", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOuterJoins(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsOuterJoins", mID );
 }
 
-Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes(  )
 {
     static jmethodID mID(nullptr);
     return impl_callResultSetMethod( "getTableTypes", mID );
@@ -903,92 +903,92 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxStatements_throw(  )
     return impl_callIntMethod_ThrowSQL("getMaxStatements", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxProcedureNameLength", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxSchemaNameLength", mID);
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsTransactions", mID );
 }
 
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "allProceduresAreCallable", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsStoredProcedures", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsSelectForUpdate", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "allTablesAreSelectable", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "isReadOnly", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "usesLocalFiles", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "usesLocalFilePerTable", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsTypeConversion", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "nullPlusNonNullIsNull", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsColumnAliasing", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsTableCorrelationNames", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType )
 {
     static const char* const pMethodName = "supportsConvert";
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG2, pMethodName, fromType, toType );
@@ -1007,67 +1007,67 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType
     return out;
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsExpressionsInOrderBy", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsGroupBy", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsGroupByBeyondSelect", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsGroupByUnrelated", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsMultipleTransactions", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsMultipleResultSets", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsLikeEscapeClause", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsOrderByUnrelated", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsUnion", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsUnionAll", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsMixedCaseIdentifiers", mID );
@@ -1079,91 +1079,91 @@ bool java_sql_DatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(
     return impl_callBooleanMethod( "supportsMixedCaseQuotedIdentifiers", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "nullsAreSortedAtEnd", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "nullsAreSortedAtStart", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "nullsAreSortedHigh", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "nullsAreSortedLow", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsSchemasInProcedureCalls", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsSchemasInPrivilegeDefinitions", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsCatalogsInProcedureCalls", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsCatalogsInPrivilegeDefinitions", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsCorrelatedSubqueries", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsSubqueriesInComparisons", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsSubqueriesInExists", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsSubqueriesInIns", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsSubqueriesInQuantifieds", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsANSI92IntermediateSQL", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getURL(  )
 {
     OUString sURL = m_pConnection->getURL();
     if ( sURL.isEmpty() )
@@ -1174,163 +1174,163 @@ OUString SAL_CALL java_sql_DatabaseMetaData::getURL(  ) throw(SQLException, Runt
     return sURL;
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getUserName(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getUserName", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getDriverName", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getDriverVersion", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getDatabaseProductVersion", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getDatabaseProductName", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getProcedureTerm", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getSchemaTerm", mID );
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowRuntime("getDriverMajorVersion", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getDefaultTransactionIsolation", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowRuntime("getDriverMinorVersion", mID);
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getSQLKeywords", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getSearchStringEscape", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getStringFunctions", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getTimeDateFunctions", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getSystemFunctions", mID );
 }
 
-OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions(  )
 {
     static jmethodID mID(nullptr);
     return impl_callStringMethod( "getNumericFunctions", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsExtendedSQLGrammar", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsCoreSQLGrammar", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsMinimumSQLGrammar", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsFullOuterJoins", mID );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsLimitedOuterJoins", mID );
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxColumnsInGroupBy", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxColumnsInOrderBy", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxColumnsInSelect", mID);
 }
 
-sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength(  )
 {
     static jmethodID mID(nullptr);
     return impl_callIntMethod_ThrowSQL("getMaxUserNameLength", mID);
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "supportsResultSetType", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency )
 {
     static const char* const pMethodName = "supportsResultSetConcurrency";
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG2, pMethodName, setType, concurrency );
@@ -1349,61 +1349,61 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_I
     return out;
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "ownUpdatesAreVisible", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "ownDeletesAreVisible", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "ownInsertsAreVisible", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "othersUpdatesAreVisible", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "othersDeletesAreVisible", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "othersInsertsAreVisible", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::updatesAreDetected( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "updatesAreDetected", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::deletesAreDetected( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "deletesAreDetected", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::insertsAreDetected( sal_Int32 setType )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethodWithIntArg( "insertsAreDetected", mID, setType );
 }
 
-sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates(  )
 {
     static jmethodID mID(nullptr);
     return impl_callBooleanMethod( "supportsBatchUpdates", mID );
@@ -1411,7 +1411,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates(  ) throw(SQLE
 
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs(
         const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern,
-        const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException, std::exception)
+        const Sequence< sal_Int32 >& types )
 {
     jobject out(nullptr);
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index c63a1e491168..c3f3c01f8f7e 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -54,30 +54,30 @@ jclass java_io_InputStream::getMyClass() const
 }
 
 
-sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
 {
     return readBytes(aData,nMaxBytesToRead);
 }
 
-void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip )
 {
     static jmethodID mID(nullptr);
     callIntMethodWithIntArg_ThrowRuntime("skip",mID,nBytesToSkip);
 }
 
-sal_Int32 SAL_CALL java_io_InputStream::available(  ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_io_InputStream::available(  )
 {
     static jmethodID mID(nullptr);
     return callIntMethod_ThrowRuntime("available", mID);
 }
 
-void SAL_CALL java_io_InputStream::closeInput(  ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_io_InputStream::closeInput(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowRuntime("close",mID);
 }
 
-sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
 {
     if (nBytesToRead < 0)
         throw css::io::BufferSizeExceededException( THROW_WHERE, *this );
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index b311573fa8d3..a93cd4a12202 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -322,7 +322,7 @@ jclass java_sql_Connection::getMyClass() const
 }
 
 
-OUString SAL_CALL java_sql_Connection::getCatalog(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_Connection::getCatalog(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -331,7 +331,7 @@ OUString SAL_CALL java_sql_Connection::getCatalog(  ) throw(SQLException, Runtim
     return callStringMethod("getCatalog",mID);
 }
 
-Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -353,18 +353,18 @@ Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData(  ) thr
     return xMetaData;
 }
 
-void SAL_CALL java_sql_Connection::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Connection::close(  )
 {
     dispose();
 }
 
-void SAL_CALL java_sql_Connection::commit(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Connection::commit(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("commit", mID);
 }
 
-sal_Bool SAL_CALL java_sql_Connection::isClosed(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_Connection::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -372,7 +372,7 @@ sal_Bool SAL_CALL java_sql_Connection::isClosed(  ) throw(SQLException, RuntimeE
     return callBooleanMethod( "isClosed", mID ) && java_sql_Connection_BASE::rBHelper.bDisposed;
 }
 
-sal_Bool SAL_CALL java_sql_Connection::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_Connection::isReadOnly(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -380,37 +380,37 @@ sal_Bool SAL_CALL java_sql_Connection::isReadOnly(  ) throw(SQLException, Runtim
     return callBooleanMethod( "isReadOnly", mID );
 }
 
-void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog )
 {
     static jmethodID mID(nullptr);
     callVoidMethodWithStringArg("setCatalog",mID,catalog);
 }
 
-void SAL_CALL java_sql_Connection::rollback(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Connection::rollback(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("rollback", mID);
 }
 
-sal_Bool SAL_CALL java_sql_Connection::getAutoCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_Connection::getAutoCommit(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "getAutoCommit", mID );
 }
 
-void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly )
 {
     static jmethodID mID(nullptr);
     callVoidMethodWithBoolArg_ThrowSQL("setReadOnly", mID, readOnly);
 }
 
-void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit )
 {
     static jmethodID mID(nullptr);
     callVoidMethodWithBoolArg_ThrowSQL("setAutoCommit", mID, autoCommit);
 }
 
-Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -422,7 +422,7 @@ Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMa
     return nullptr;
 }
 
-void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -431,7 +431,7 @@ void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container::
 }
 
 
-sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -440,7 +440,7 @@ sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation(  ) throw(SQLExc
     return callIntMethod_ThrowSQL("getTransactionIsolation", mID);
 }
 
-void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -449,7 +449,7 @@ void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) th
     callVoidMethodWithIntArg_ThrowSQL("setTransactionIsolation", mID, level);
 }
 
-Reference< XStatement > SAL_CALL java_sql_Connection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL java_sql_Connection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -490,7 +490,7 @@ OUString java_sql_Connection::transFormPreparedStatement(const OUString& _sSQL)
     return sSqlStatement;
 }
 
-Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -508,7 +508,7 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement(
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -526,7 +526,7 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const
     return xStmt;
 }
 
-OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -554,13 +554,13 @@ OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQ
     return aStr;
 }
 
-void SAL_CALL java_sql_Connection::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Connection::clearWarnings(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("clearWarnings", mID);
 }
 
-Any SAL_CALL java_sql_Connection::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL java_sql_Connection::getWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 5d69146d4a43..bb1d45337318 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -52,42 +52,42 @@ java_sql_Driver::~java_sql_Driver()
 
 // static ServiceInfo
 
-OUString java_sql_Driver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString java_sql_Driver::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.sdbc.JDBCDriver");
         // this name is referenced in the configuration and in the jdbc.xml
         // Please take care when changing it.
 }
 
-Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static(  )
 {
     Sequence<OUString> aSNS { "com.sun.star.sdbc.Driver" };
     return aSNS;
 }
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception )
+css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory)));
 }
 
-OUString SAL_CALL java_sql_Driver::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL java_sql_Driver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
 
-Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
 Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, const
-                                                         Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception)
+                                                         Sequence< PropertyValue >& info )
 {
     m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_CONNECTING_URL, url );
 
@@ -104,7 +104,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url,
     return xOut;
 }
 
-sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url )
 {
     // don't ask the real driver for the url
     // I feel responsible for all jdbc url's
@@ -127,7 +127,7 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLEx
 }
 
 Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const OUString& url,
-                                                                         const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception)
+                                                                         const Sequence< PropertyValue >& /*info*/ )
 {
     if ( acceptsURL(url) )
     {
@@ -236,12 +236,12 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const
     return Sequence< DriverPropertyInfo >();
 }
 
-sal_Int32 SAL_CALL java_sql_Driver::getMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_Driver::getMajorVersion(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion(  )
 {
     return 0;
 }
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 9154c5c07efc..87259c28dbbe 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -115,7 +115,7 @@ void SAL_CALL OStatement_BASE2::release() throw()
 }
 
 
-Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType )
 {
     if ( m_pConnection.is() && !m_pConnection->isAutoRetrievingEnabled() && rType == cppu::UnoType<XGeneratedResultSet>::get())
         return Any();
@@ -123,7 +123,7 @@ Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
 
-Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
                                     cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -140,7 +140,7 @@ Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes(  ) throw(RuntimeExc
     return ::comphelper::concatSequences(aTypes.getTypes(),aOldTypes);
 }
 
-Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues(  ) throw (SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues(  )
 {
     m_aLogger.log( LogLevel::FINE, STR_LOG_GENERATED_VALUES );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -182,7 +182,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues(  )
 }
 
 
-void SAL_CALL java_sql_Statement_Base::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL java_sql_Statement_Base::cancel(  )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -191,7 +191,7 @@ void SAL_CALL java_sql_Statement_Base::cancel(  ) throw(RuntimeException, std::e
 }
 
 
-void SAL_CALL java_sql_Statement_Base::close(  ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Statement_Base::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -202,7 +202,7 @@ void SAL_CALL java_sql_Statement_Base::close(  ) throw(css::sdbc::SQLException,
 }
 
 
-void SAL_CALL java_sql_Statement::clearBatch(  ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Statement::clearBatch(  )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     {
@@ -214,7 +214,7 @@ void SAL_CALL java_sql_Statement::clearBatch(  ) throw(css::sdbc::SQLException,
 }
 
 
-sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql )
 {
     m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_STATEMENT, sql );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -248,7 +248,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(
 }
 
 
-Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -283,7 +283,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OU
     return out==nullptr ? nullptr : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this );
 }
 
-Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -291,14 +291,14 @@ Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection(  ) thr
 }
 
 
-Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType )
 {
     Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this));
     return aRet.hasValue() ? aRet : java_sql_Statement_Base::queryInterface(rType);
 }
 
 
-void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Statement::addBatch( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -311,7 +311,7 @@ void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(css::sdb
 }
 
 
-Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch(  ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -331,7 +331,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch(  ) throw(css::s
 }
 
 
-sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -345,7 +345,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql )
 }
 
 
-Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet(  ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet(  )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -357,7 +357,7 @@ Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSe
 }
 
 
-sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount(  ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount(  )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     createStatement(t.pEnv);
@@ -368,14 +368,14 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount(  ) throw(css::sdbc::
 }
 
 
-sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults(  ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "getMoreResults", mID );
 }
 
 
-Any SAL_CALL java_sql_Statement_Base::getWarnings(  ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Any SAL_CALL java_sql_Statement_Base::getWarnings(  )
 {
     SDBThreadAttach t;
     createStatement(t.pEnv);
@@ -393,7 +393,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings(  ) throw(css::sdbc::SQLExcept
     return Any();
 }
 
-void SAL_CALL java_sql_Statement_Base::clearWarnings(  ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_Statement_Base::clearWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -406,26 +406,26 @@ void SAL_CALL java_sql_Statement_Base::clearWarnings(  ) throw(css::sdbc::SQLExc
     }
 }
 
-sal_Int32 java_sql_Statement_Base::getQueryTimeOut()  throw(SQLException, RuntimeException)
+sal_Int32 java_sql_Statement_Base::getQueryTimeOut()
 {
     static jmethodID mID(nullptr);
     return impl_getProperty("getQueryTimeOut",mID);
 }
 
-sal_Int32 java_sql_Statement_Base::getMaxRows() throw(SQLException, RuntimeException)
+sal_Int32 java_sql_Statement_Base::getMaxRows()
 {
     static jmethodID mID(nullptr);
     return impl_getProperty("getMaxRows",mID);
 }
 
-sal_Int32 java_sql_Statement_Base::getResultSetConcurrency() throw(SQLException, RuntimeException)
+sal_Int32 java_sql_Statement_Base::getResultSetConcurrency()
 {
     static jmethodID mID(nullptr);
     return impl_getProperty("getResultSetConcurrency",mID,m_nResultSetConcurrency);
 }
 
 
-sal_Int32 java_sql_Statement_Base::getResultSetType() throw(SQLException, RuntimeException)
+sal_Int32 java_sql_Statement_Base::getResultSetType()
 {
     static jmethodID mID(nullptr);
     return impl_getProperty("getResultSetType",mID,m_nResultSetType);
@@ -446,25 +446,25 @@ sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jm
     return callIntMethod_ThrowRuntime(_pMethodName, _inout_MethodID);
 }
 
-sal_Int32 java_sql_Statement_Base::getFetchDirection() throw(SQLException, RuntimeException)
+sal_Int32 java_sql_Statement_Base::getFetchDirection()
 {
     static jmethodID mID(nullptr);
     return impl_getProperty("getFetchDirection",mID);
 }
 
-sal_Int32 java_sql_Statement_Base::getFetchSize() throw(SQLException, RuntimeException)
+sal_Int32 java_sql_Statement_Base::getFetchSize()
 {
     static jmethodID mID(nullptr);
     return impl_getProperty("getFetchSize",mID);
 }
 
-sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, RuntimeException)
+sal_Int32 java_sql_Statement_Base::getMaxFieldSize()
 {
     static jmethodID mID(nullptr);
     return impl_getProperty("getMaxFieldSize",mID);
 }
 
-OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException)
+OUString java_sql_Statement_Base::getCursorName()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -481,7 +481,7 @@ OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeExc
     return OUString();
 }
 
-void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -492,7 +492,7 @@ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLExceptio
 }
 
 
-void java_sql_Statement_Base::setEscapeProcessing(bool _par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setEscapeProcessing(bool _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -505,7 +505,7 @@ void java_sql_Statement_Base::setEscapeProcessing(bool _par0) throw(SQLException
     callVoidMethodWithBoolArg_ThrowRuntime("setEscapeProcessing", mID, _par0);
 }
 
-void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -515,7 +515,7 @@ void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, Ru
     callVoidMethodWithIntArg_ThrowRuntime("setMaxRows", mID, _par0);
 }
 
-void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -525,7 +525,7 @@ void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQL
     clearObject();
 }
 
-void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -535,7 +535,7 @@ void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) throw(SQLExcepti
     clearObject();
 }
 
-void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -546,7 +546,7 @@ void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLExcept
     callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0);
 }
 
-void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -558,7 +558,7 @@ void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException,
     callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0);
 }
 
-void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -568,7 +568,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLExceptio
     callVoidMethodWithIntArg_ThrowRuntime("setMaxFieldSize", mID, _par0);
 }
 
-void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setCursorName(const OUString &_par0)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -622,7 +622,6 @@ sal_Bool java_sql_Statement_Base::convertFastPropertyValue(
                             Any & rOldValue,
                             sal_Int32 nHandle,
                             const Any& rValue )
-                                throw (css::lang::IllegalArgumentException)
 {
     try
     {
@@ -667,7 +666,6 @@ void java_sql_Statement_Base::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& rValue
                                                  )
-                                                 throw (Exception, std::exception)
 {
     switch(nHandle)
     {
@@ -823,7 +821,7 @@ void SAL_CALL java_sql_Statement::release() throw()
     OStatement_BASE2::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 526cda6c1c42..ee084a45a6b1 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -71,7 +71,7 @@ jclass java_sql_PreparedStatement::getMyClass() const
 }
 
 
-css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = OStatement_BASE2::queryInterface(rType);
     return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType,
@@ -81,7 +81,7 @@ css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::un
                                         static_cast< XPreparedBatchExecution*>(this));
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
                                     cppu::UnoType<XParameters>::get(),
@@ -92,7 +92,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTyp
 }
 
 
-sal_Bool SAL_CALL java_sql_PreparedStatement::execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_PreparedStatement::execute(  )
 {
     m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -105,7 +105,7 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute(  ) throw(css::sdbc::SQLEx
 }
 
 
-sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -118,7 +118,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate(  ) throw(css::sdbc
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -140,13 +140,13 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c
 }
 
 
-css::uno::Reference< css::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection(  )
 {
     return Reference< XConnection >(m_pConnection.get());
 }
 
 
-css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery(  )
 {
     m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_QUERY );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -161,7 +161,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex, bool(x) );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -174,7 +174,7 @@ void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex,
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_BYTE_PARAMETER, parameterIndex, (sal_Int32)x );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -187,7 +187,7 @@ void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_DATE_PARAMETER, parameterIndex, x );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -201,7 +201,7 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_TIME_PARAMETER, parameterIndex, x );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -215,7 +215,7 @@ void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, con
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_TIMESTAMP_PARAMETER, parameterIndex, x );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -228,7 +228,7 @@ void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex
     callVoidMethod_ThrowSQL("setTimestamp", "(ILjava/sql/Timestamp;)V", mID, parameterIndex, aD.getJavaObject());
 }
 
-void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_DOUBLE_PARAMETER, parameterIndex, x );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -241,7 +241,7 @@ void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, d
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_FLOAT_PARAMETER, parameterIndex, x );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -254,7 +254,7 @@ void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, fl
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_INT_PARAMETER, parameterIndex, x );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -267,7 +267,7 @@ void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_LONG_PARAMETER, parameterIndex, x );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -280,7 +280,7 @@ void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_NULL_PARAMETER, parameterIndex, sqlType );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -293,31 +293,31 @@ void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XClob >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XClob >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setClob", *this );
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XBlob >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XBlob >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this );
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XArray >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XArray >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setArray", *this );
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XRef >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XRef >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setRef", *this );
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -377,7 +377,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -390,7 +390,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterInde
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const css::uno::Any& x )
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
@@ -403,7 +403,7 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_SHORT_PARAMETER, parameterIndex, x );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -416,7 +416,7 @@ void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sa
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_BYTES_PARAMETER, parameterIndex );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -449,7 +449,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_CHARSTREAM_PARAMETER, parameterIndex );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -508,7 +508,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_BINARYSTREAM_PARAMETER, parameterIndex );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -567,7 +567,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::clearParameters(  )
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_CLEAR_PARAMETERS );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -582,7 +582,7 @@ void SAL_CALL java_sql_PreparedStatement::clearParameters(  ) throw(css::sdbc::S
     } //t.pEnv
 }
 
-void SAL_CALL java_sql_PreparedStatement::clearBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::clearBatch(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -595,7 +595,7 @@ void SAL_CALL java_sql_PreparedStatement::clearBatch(  ) throw(css::sdbc::SQLExc
 }
 
 
-void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_PreparedStatement::addBatch( )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -608,7 +608,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(css::sdbc::SQLExcept
 }
 
 
-css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -627,7 +627,7 @@ css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatc
     return aSeq;
 }
 
-css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 665caaf381d9..10c3e29341c2 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -45,12 +45,12 @@ jclass java_io_Reader::getMyClass() const
     return theClass;
 }
 
-sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
 {
     return readBytes(aData,nMaxBytesToRead);
 }
 
-void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip )
 {
     static jmethodID mID(nullptr);
     if(nBytesToSkip <= 0)
@@ -74,7 +74,7 @@ void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io:
     }
 }
 
-sal_Int32 SAL_CALL java_io_Reader::available(  ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_io_Reader::available(  )
 {
     if(m_buf != boost::none)
         return 1;
@@ -93,13 +93,13 @@ sal_Int32 SAL_CALL java_io_Reader::available(  ) throw(css::io::NotConnectedExce
     return (m_buf != boost::none ? 1 : 0) + (out ? 1 : 0); // no way to tell *how much* is ready
 }
 
-void SAL_CALL java_io_Reader::closeInput(  ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_io_Reader::closeInput(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowRuntime("close", mID);
 }
 
-sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
 {
     OSL_ENSURE(aData.getLength() >= nBytesToRead," Sequence is smaller than BytesToRead");
 
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index 84cf5f765457..c22001d6c477 100644
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
@@ -43,7 +43,7 @@ jclass java_sql_Ref::getMyClass() const
     return theClass;
 }
 
-OUString SAL_CALL java_sql_Ref::getBaseTypeName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+OUString SAL_CALL java_sql_Ref::getBaseTypeName(  )
 {
     static jmethodID mID(nullptr);
     return callStringMethod("getBaseTypeName",mID);
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 3550d736fbe1..ec446f973c5e 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -113,13 +113,13 @@ m_xMetaData.clear();
     SDBThreadAttach::releaseRef();
 }
 
-css::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : java_sql_ResultSet_BASE::queryInterface(rType);
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
                                     cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -129,13 +129,13 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes(  ) t
 }
 
 
-sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName )
 {
     static jmethodID mID(nullptr);
     return callIntMethodWithStringArg("findColumn",mID,columnName);
 }
 
-Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -145,7 +145,7 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream(
     return out==nullptr ? nullptr : new java_io_InputStream( t.pEnv, out );
 }
 
-Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -156,14 +156,14 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStre
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex );
 }
 
 
-sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex )
 {
     static jmethodID mID(nullptr);
     jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod;
@@ -171,7 +171,7 @@ sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQL
 }
 
 
-Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex )
 {
     Sequence< sal_Int8 > aSeq;
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -188,7 +188,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde
 }
 
 
-css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -198,7 +198,7 @@ css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) th
 }
 
 
-double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex )
 {
     static jmethodID mID(nullptr);
     jdouble (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallDoubleMethod;
@@ -206,7 +206,7 @@ double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQL
 }
 
 
-float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex )
 {
     static jmethodID mID(nullptr);
     jfloat (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallFloatMethod;
@@ -214,21 +214,21 @@ float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLEx
 }
 
 
-sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex )
 {
     static jmethodID mID(nullptr);
     return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex);
 }
 
 
-sal_Int32 SAL_CALL java_sql_ResultSet::getRow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_ResultSet::getRow(  )
 {
     static jmethodID mID(nullptr);
     return callIntMethod_ThrowSQL("getRow", mID);
 }
 
 
-sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex )
 {
     static jmethodID mID(nullptr);
     jlong (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallLongMethod;
@@ -236,7 +236,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ
 }
 
 
-css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData(  )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -245,7 +245,7 @@ css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet
     return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, *m_pConnection );
 }
 
-Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -256,7 +256,7 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex
 }
 
 
-Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -265,7 +265,7 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex )
     return out==nullptr ? nullptr : new java_sql_Clob( t.pEnv, out );
 }
 
-Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -275,7 +275,7 @@ Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex )
 }
 
 
-Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -286,7 +286,7 @@ Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) t
 }
 
 
-Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap )
 {
     jobject out(nullptr);
     Any aRet;
@@ -347,7 +347,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
 }
 
 
-sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex )
 {
     static jmethodID mID(nullptr);
     jshort (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallShortMethod;
@@ -355,14 +355,14 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S
 }
 
 
-OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex )
 {
     static jmethodID mID(nullptr);
     return callStringMethodWithIntArg("getString",mID,columnIndex);
 }
 
 
-css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -372,7 +372,7 @@ css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) th
 }
 
 
-css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex )
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     static jmethodID mID(nullptr);
@@ -382,131 +382,131 @@ css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnI
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "isAfterLast", mID );
 }
 
-sal_Bool SAL_CALL java_sql_ResultSet::isFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::isFirst(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "isFirst", mID );
 }
 
-sal_Bool SAL_CALL java_sql_ResultSet::isLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::isLast(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "isLast", mID );
 }
 
-void SAL_CALL java_sql_ResultSet::beforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::beforeFirst(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("beforeFirst", mID);
 }
 
-void SAL_CALL java_sql_ResultSet::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::afterLast(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("afterLast", mID);
 }
 
 
-void SAL_CALL java_sql_ResultSet::close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::close(  )
 {
     dispose();
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSet::first(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::first(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "first", mID );
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSet::last(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::last(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "last", mID );
 }
 
-sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "absolute", mID,row );
 }
 
-sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "relative", mID,row );
 }
 
-sal_Bool SAL_CALL java_sql_ResultSet::previous(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::previous(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "previous", mID );
 }
 
-Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement(  )
 {
     return m_xStatement;
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "rowDeleted", mID );
 }
 
-sal_Bool SAL_CALL java_sql_ResultSet::rowInserted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::rowInserted(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "rowInserted", mID );
 }
 
-sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "rowUpdated", mID );
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "isBeforeFirst", mID );
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSet::next(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::next(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "next", mID );
 }
 
-sal_Bool SAL_CALL java_sql_ResultSet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSet::wasNull(  )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethod( "wasNull", mID );
 }
 
-void SAL_CALL java_sql_ResultSet::cancel(  ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::cancel(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowRuntime("cancel", mID);
 }
 
-void SAL_CALL java_sql_ResultSet::clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::clearWarnings(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("clearWarnings", mID);
 }
 
-css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings(  )
 {
     SDBThreadAttach t;
     static jmethodID mID(nullptr);
@@ -524,100 +524,100 @@ css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings(  ) throw(css::sdbc::SQLE
 }
 
 
-void SAL_CALL java_sql_ResultSet::insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::insertRow(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("insertRow", mID);
 }
 
-void SAL_CALL java_sql_ResultSet::updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateRow(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("updateRow", mID);
 }
 
-void SAL_CALL java_sql_ResultSet::deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::deleteRow(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("deleteRow", mID);
 }
 
 
-void SAL_CALL java_sql_ResultSet::cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::cancelRowUpdates(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("cancelRowUpdates", mID);
 }
 
 
-void SAL_CALL java_sql_ResultSet::moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::moveToInsertRow(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("moveToInsertRow", mID);
 }
 
 
-void SAL_CALL java_sql_ResultSet::moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::moveToCurrentRow(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("moveToCurrentRow", mID);
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex )
 {
     static jmethodID mID(nullptr);
     callVoidMethodWithIntArg_ThrowSQL("updateNull", mID, columnIndex);
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("updateBoolean", "(IZ)V", mID, columnIndex, x);
 }
 
-void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("updateByte", "(IB)V", mID, columnIndex, x);
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("updateShort", "(IS)V", mID, columnIndex, x);
 }
 
-void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("updateInt", "(II)V", mID, columnIndex, x);
 }
 
-void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("updateLong", "(IJ)V", mID, columnIndex, x);
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("updateFloat", "(IF)V", mID, columnIndex, x);
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("updateDouble", "(ID)V", mID, columnIndex, x);
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x )
 {
     SDBThreadAttach t;
 
@@ -643,7 +643,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUS
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x )
 {
     SDBThreadAttach t;
 
@@ -679,7 +679,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css:
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x )
 {
     java_sql_Date aD(x);
     static jmethodID mID(nullptr);
@@ -687,7 +687,7 @@ void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css::
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x )
 {
     java_sql_Time aD(x);
     static jmethodID mID(nullptr);
@@ -695,7 +695,7 @@ void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css::
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x )
 {
     java_sql_Timestamp aD(x);
     static jmethodID mID(nullptr);
@@ -703,7 +703,7 @@ void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     try
     {
@@ -734,7 +734,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con
     }
 }
 
-void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     try
     {
@@ -765,7 +765,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex,
     }
 }
 
-void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css::uno::Any& x )
 {
     if(!::dbtools::implUpdateObject(this,columnIndex,x))
     {
@@ -779,7 +779,7 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css
 }
 
 
-void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale )
 {
     //  OSL_FAIL("java_sql_ResultSet::updateNumericObject: NYI");
     try
@@ -821,50 +821,50 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co
     }
 }
 
-sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException)
+sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const
 {
     static jmethodID mID(nullptr);
     return callIntMethod_ThrowRuntime("getConcurrency", mID);
 }
 
-sal_Int32 java_sql_ResultSet::getResultSetType() const throw(css::sdbc::SQLException, css::uno::RuntimeException)
+sal_Int32 java_sql_ResultSet::getResultSetType() const
 {
     static jmethodID mID(nullptr);
     return callIntMethod_ThrowRuntime("getType",mID);
 }
 
-sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(css::sdbc::SQLException, css::uno::RuntimeException)
+sal_Int32 java_sql_ResultSet::getFetchDirection() const
 {
     static jmethodID mID(nullptr);
     return callIntMethod_ThrowRuntime("getFetchDirection", mID);
 }
 
-sal_Int32 java_sql_ResultSet::getFetchSize() const throw(css::sdbc::SQLException, css::uno::RuntimeException)
+sal_Int32 java_sql_ResultSet::getFetchSize() const
 {
     static jmethodID mID(nullptr);
     return callIntMethod_ThrowRuntime("getFetchSize", mID);
 }
 
-OUString java_sql_ResultSet::getCursorName() const throw(css::sdbc::SQLException, css::uno::RuntimeException)
+OUString java_sql_ResultSet::getCursorName() const
 {
     static jmethodID mID(nullptr);
     return callStringMethod("getCursorName",mID);
 }
 
 
-void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0)
 {
     static jmethodID mID(nullptr);
     callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0);
 }
 
-void SAL_CALL java_sql_ResultSet::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL java_sql_ResultSet::refreshRow(  )
 {
     static jmethodID mID(nullptr);
     callVoidMethod_ThrowSQL("refreshRow",mID);
 }
 
-void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+void java_sql_ResultSet::setFetchSize(sal_Int32 _par0)
 {
     static jmethodID mID(nullptr);
     callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0);
@@ -903,7 +903,6 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue(
                             css::uno::Any & rOldValue,
                             sal_Int32 nHandle,
                             const css::uno::Any& rValue )
-                                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 {
     bool bRet = false;
     switch(nHandle)
@@ -929,7 +928,6 @@ void java_sql_ResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const css::uno::Any& rValue
                                                  )
-                                                 throw (css::uno::Exception, std::exception)
 {
     switch(nHandle)
     {
@@ -989,7 +987,7 @@ void SAL_CALL java_sql_ResultSet::release() throw()
     java_sql_ResultSet_BASE::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index c016717a7b32..4bc977b6bd54 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -54,21 +54,21 @@ jclass java_sql_ResultSetMetaData::getMyClass() const
 }
 
 
-sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callIntMethodWithIntArg_ThrowSQL("getColumnDisplaySize",mID,column);
 }
 
 
-sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callIntMethodWithIntArg_ThrowSQL("getColumnType",mID,column);
 }
 
 
-sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount(  )
 {
     if ( m_nColumnCount == -1 )
     {
@@ -80,57 +80,57 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount(  ) throw(SQLExcep
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "isCaseSensitive", mID,column );
 }
 
-OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callStringMethodWithIntArg("getSchemaName",mID,column);
 }
 
 
-OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callStringMethodWithIntArg("getColumnName",mID,column);
 }
 
-OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callStringMethodWithIntArg("getTableName",mID,column);
 }
 
-OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callStringMethodWithIntArg("getCatalogName",mID,column);
 }
 
-OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callStringMethodWithIntArg("getColumnTypeName",mID,column);
 }
 
-OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callStringMethodWithIntArg("getColumnLabel",mID,column);
 }
 
-OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callStringMethodWithIntArg("getColumnClassName",mID,column);
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column )
 {
     if ( m_pConnection->isIgnoreCurrencyEnabled() )
         return false;
@@ -139,59 +139,59 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) thr
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "isAutoIncrement", mID,column );
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "isSigned", mID,column );
 }
 
-sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callIntMethodWithIntArg_ThrowSQL("getPrecision",mID,column);
 }
 
-sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callIntMethodWithIntArg_ThrowSQL("getScale",mID,column);
 }
 
-sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callIntMethodWithIntArg_ThrowSQL("isNullable",mID,column);
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "isSearchable", mID,column );
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "isReadOnly", mID,column );
 }
 
 
-sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "isDefinitelyWritable", mID,column );
 }
 
-sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column )
 {
     static jmethodID mID(nullptr);
     return callBooleanMethodWithIntArg( "isWritable", mID,column );
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index f1759cd77eb4..58580ccc16d2 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -103,7 +103,7 @@ jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _r
 }
 
 
-java_util_Properties* connectivity::createStringPropertyArray(const Sequence< PropertyValue >& info )  throw(SQLException, RuntimeException)
+java_util_Properties* connectivity::createStringPropertyArray(const Sequence< PropertyValue >& info )
 {
     java_util_Properties* pProps = new java_util_Properties();
     const PropertyValue* pBegin = info.getConstArray();
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index 06cc13cface7..9d7926af2a8c 100644
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
@@ -78,7 +78,7 @@ void KabCatalog::refreshUsers()
 
 
 // XTablesSupplier
-Reference< XNameAccess > SAL_CALL KabCatalog::getTables(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL KabCatalog::getTables(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx
index c3c45faacdea..29b2580fc1b3 100644
--- a/connectivity/source/drivers/kab/KCatalog.hxx
+++ b/connectivity/source/drivers/kab/KCatalog.hxx
@@ -45,7 +45,7 @@ namespace connectivity
 
             // XTablesSupplier
             virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(
-                    ) throw(css::uno::RuntimeException, std::exception) override;
+                    ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index fe675ade9fcf..c94726d55001 100644
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
@@ -78,7 +78,7 @@ sdbcx::ObjectType KabColumns::createObject(const OUString& _rName)
     return xRet;
 }
 
-void KabColumns::impl_refresh() throw(RuntimeException)
+void KabColumns::impl_refresh()
 {
     m_pTable->refreshColumns();
 }
diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx
index 80145a8bd5f3..887048347d42 100644
--- a/connectivity/source/drivers/kab/KColumns.hxx
+++ b/connectivity/source/drivers/kab/KColumns.hxx
@@ -33,7 +33,7 @@ namespace connectivity
             KabTable*   m_pTable;
 
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
 
         public:
             KabColumns( KabTable* _pTable,
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index 2b40d1d8bd4c..d7945bb7d88b 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -71,7 +71,7 @@ void KabConnection::construct()
 }
 // XServiceInfo
 
-Reference< XStatement > SAL_CALL KabConnection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL KabConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -83,7 +83,7 @@ Reference< XStatement > SAL_CALL KabConnection::createStatement(  ) throw(SQLExc
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -95,7 +95,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -104,7 +104,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUStr
     return nullptr;
 }
 
-OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     // when you need to transform SQL92 to you driver specific you can do it here
@@ -112,14 +112,14 @@ OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLExc
     return _sSql;
 }
 
-void SAL_CALL KabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabConnection::setAutoCommit( sal_Bool )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
     // here you  have to set your commit mode please have a look at the jdbc documentation to get a clear explanation
 }
 
-sal_Bool SAL_CALL KabConnection::getAutoCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabConnection::getAutoCommit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -129,7 +129,7 @@ sal_Bool SAL_CALL KabConnection::getAutoCommit(  ) throw(SQLException, RuntimeEx
     return true;
 }
 
-void SAL_CALL KabConnection::commit(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabConnection::commit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -137,7 +137,7 @@ void SAL_CALL KabConnection::commit(  ) throw(SQLException, RuntimeException, st
     // when you database does support transactions you should commit here
 }
 
-void SAL_CALL KabConnection::rollback(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabConnection::rollback(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -145,7 +145,7 @@ void SAL_CALL KabConnection::rollback(  ) throw(SQLException, RuntimeException,
     // same as commit but for the other case
 }
 
-sal_Bool SAL_CALL KabConnection::isClosed(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabConnection::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -153,7 +153,7 @@ sal_Bool SAL_CALL KabConnection::isClosed(  ) throw(SQLException, RuntimeExcepti
     return KabConnection_BASE::rBHelper.bDisposed;
 }
 
-Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -170,7 +170,7 @@ Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData(  ) throw(SQL
     return xMetaData;
 }
 
-void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabConnection::setReadOnly( sal_Bool )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -178,7 +178,7 @@ void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, Runtime
     // set you connection to readonly
 }
 
-sal_Bool SAL_CALL KabConnection::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabConnection::isReadOnly(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -187,7 +187,7 @@ sal_Bool SAL_CALL KabConnection::isReadOnly(  ) throw(SQLException, RuntimeExcep
     return false;
 }
 
-void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabConnection::setCatalog( const OUString& )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -195,7 +195,7 @@ void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, R
     // if your database doesn't work with catalogs you go to next method otherwise you know what to do
 }
 
-OUString SAL_CALL KabConnection::getCatalog(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabConnection::getCatalog(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -205,7 +205,7 @@ OUString SAL_CALL KabConnection::getCatalog(  ) throw(SQLException, RuntimeExcep
     return OUString();
 }
 
-void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -214,7 +214,7 @@ void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLExcep
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
 }
 
-sal_Int32 SAL_CALL KabConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabConnection::getTransactionIsolation(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -224,7 +224,7 @@ sal_Int32 SAL_CALL KabConnection::getTransactionIsolation(  ) throw(SQLException
     return TransactionIsolation::NONE;
 }
 
-Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -234,13 +234,13 @@ Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap(  )
     return nullptr;
 }
 
-void SAL_CALL KabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabConnection::setTypeMap( const Reference< css::container::XNameAccess >& )
 {
     // the other way around
 }
 
 // XCloseable
-void SAL_CALL KabConnection::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabConnection::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -250,13 +250,13 @@ void SAL_CALL KabConnection::close(  ) throw(SQLException, RuntimeException, std
 }
 
 // XWarningsSupplier
-Any SAL_CALL KabConnection::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL KabConnection::getWarnings(  )
 {
     // when you collected some warnings -> return it
     return Any();
 }
 
-void SAL_CALL KabConnection::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabConnection::clearWarnings(  )
 {
     // you should clear your collected warnings here
 }
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index 1c6781ae070a..0958cc1d39cb 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -83,7 +83,7 @@ namespace connectivity
                 css::uno::Reference<css::sdbc::XDriver> const & driver);
             virtual ~KabConnection() override;
 
-            void closeAllStatements () throw( css::sdbc::SQLException);
+            void closeAllStatements ();
 
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
@@ -95,31 +95,31 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
 
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+            virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+            virtual void SAL_CALL commit(  ) override;
+            virtual void SAL_CALL rollback(  ) override;
+            virtual sal_Bool SAL_CALL isClosed(  ) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+            virtual OUString SAL_CALL getCatalog(  ) override;
+            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
 
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
 
             // needed for the SQL interpreter
             css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog();
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 644f97bc97b9..70bfea861bb4 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -55,7 +55,7 @@ const OUString & KabDatabaseMetaData::getAddressBookTableName()
     return aAddressBookTableName;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator(  )
 {
     OUString aVal;
     if (m_bUseCatalog)
@@ -65,73 +65,73 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLExceptio
     return aVal;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxRowSize(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCatalogNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCharLiteralLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInIndex(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCursorNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxConnections(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInTable(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatementLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTableNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect(  )
 {
     // MaxTablesInSelect describes how many tables can participate in the FROM part of a given SELECT statement,
     // currently, the resultset/statement implementations can cope with one table only
@@ -139,63 +139,63 @@ sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLExcept
     return nValue;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithAddColumn(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithAddColumn(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithDropColumn(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithDropColumn(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxIndexLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns(  )
 {
     return false;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm(  )
 {
     OUString aVal;
     if (m_bUseCatalog)
@@ -204,25 +204,25 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, Ru
     return aVal;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString(  )
 {
     // normally this is "
     OUString aVal("\"");
     return aVal;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters(  )
 {
     OUString aVal;
     return aVal;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart(  )
 {
     bool bValue = false;
     if (m_bUseCatalog)
@@ -231,326 +231,326 @@ sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart(  ) throw(SQLException,
     return bValue;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionIgnoredInTransactions(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionCausesTransactionCommit(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataManipulationTransactionsOnly(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedDelete(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInDataManipulation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInDataManipulation(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92FullSQL(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     return true; // should be supported at least
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInIndexDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInTableDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInTableDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInTableDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInTableDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInIndexDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInDataManipulation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInDataManipulation(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatements(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatements(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxProcedureNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxSchemaNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::allProceduresAreCallable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsStoredProcedures(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSelectForUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::allTablesAreSelectable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::isReadOnly(  )
 {
     // for the moment, we have read-only addresses, but this might change in the future
     return true;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFiles(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFilePerTable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsTypeConversion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsColumnAliasing(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsTableCorrelationNames(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleResultSets(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsLikeEscapeClause(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsOrderByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnionAll(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtStart(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedHigh(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedLow(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInExists(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInIns(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     return false;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getURL(  )
 {
     // if someday we support more than the default address book,
     // this method should return the URL which was used to create it
@@ -558,145 +558,145 @@ OUString SAL_CALL KabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeExc
     return aValue;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getUserName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getDriverName(  )
 {
     OUString aValue(  "kab" );
     return aValue;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getDriverVersion()
 {
     OUString aValue(KAB_DRIVER_VERSION);
     return aValue;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm(  )
 {
     OUString aValue;
     return aValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMajorVersion(  )
 {
     return KAB_DRIVER_VERSION_MAJOR;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getDefaultTransactionIsolation(  )
 {
     return TransactionIsolation::NONE;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion(  )
 {
     return KAB_DRIVER_VERSION_MINOR;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getStringFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions(  )
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsCoreSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsMinimumSQLGrammar(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsFullOuterJoins(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInSelect(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxUserNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType )
 {
     switch (setType)
     {
@@ -707,7 +707,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 )
 {
     switch (setType)
     {
@@ -718,62 +718,62 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 s
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::updatesAreDetected( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::deletesAreDetected( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::insertsAreDetected( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabDatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDatabaseMetaData::supportsBatchUpdates(  )
 {
     return false;
 }
 
-Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection(  )
 {
     return m_xConnection.get();
 }
 
-Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes(  )
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
     Reference< XResultSet > xRef = pResult;
@@ -791,7 +791,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes(  ) throw(SQ
     return xRef;
 }
 
-Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo(  )
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
     Reference< XResultSet > xRef = pResult;
@@ -828,19 +828,19 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo(  ) throw(SQLE
     return xRef;
 }
 
-Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs(  )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs );
 }
 
-Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas(  )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas );
 }
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges(
     const Any&, const OUString&, const OUString&,
-    const OUString& ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges );
 }
@@ -849,7 +849,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
     const Any&,
     const OUString&,
     const OUString& tableNamePattern,
-    const OUString& columnNamePattern) throw(SQLException, RuntimeException, std::exception)
+    const OUString& columnNamePattern)
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
     Reference< XResultSet > xRef = pResult;
@@ -919,7 +919,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables(
     const Any&,
     const OUString&,
     const OUString&,
-    const Sequence< OUString >& types) throw(SQLException, RuntimeException, std::exception)
+    const Sequence< OUString >& types)
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables);
     Reference< XResultSet > xRef = pResult;
@@ -968,20 +968,20 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables(
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns(
     const Any&, const OUString&,
-    const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception)
+    const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns );
 }
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures(
     const Any&, const OUString&,
-    const OUString& ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures );
 }
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns(
-    const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+    const Any&, const OUString&, const OUString& table )
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
 
@@ -1014,39 +1014,39 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns(
 }
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys(
-    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception)
+    const Any&, const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys );
 }
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys(
-    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception)
+    const Any&, const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys );
 }
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys(
-    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception)
+    const Any&, const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys );
 }
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo(
     const Any&, const OUString&, const OUString&,
-    sal_Bool, sal_Bool ) throw(SQLException, RuntimeException, std::exception)
+    sal_Bool, sal_Bool )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo );
 }
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier(
     const Any&, const OUString&, const OUString&, sal_Int32,
-    sal_Bool ) throw(SQLException, RuntimeException, std::exception)
+    sal_Bool )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier );
 }
 
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges(
-    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception)
+    const Any&, const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
 }
@@ -1054,12 +1054,12 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges(
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference(
     const Any&, const OUString&,
     const OUString&, const Any&,
-    const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception)
+    const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference );
 }
 
-Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& )
 {
     OSL_FAIL("Not implemented yet!");
     throw SQLException();
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index 69976d1aa95e..ac896c87d582 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
@@ -48,155 +48,155 @@ namespace connectivity
 
             // this interface is really BIG
             // XDatabaseMetaData
-            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getUserName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getIdentifierQuoteString(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSQLKeywords(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getNumericFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getStringFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSystemFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSearchStringEscape(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSchemaTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getProcedureTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCatalogAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogSeparator(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxStatements(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual OUString SAL_CALL getUserName(  ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductName(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductVersion(  ) override;
+            virtual OUString SAL_CALL getDriverName(  ) override;
+            virtual OUString SAL_CALL getDriverVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) override;
+            virtual OUString SAL_CALL getIdentifierQuoteString(  ) override;
+            virtual OUString SAL_CALL getSQLKeywords(  ) override;
+            virtual OUString SAL_CALL getNumericFunctions(  ) override;
+            virtual OUString SAL_CALL getStringFunctions(  ) override;
+            virtual OUString SAL_CALL getSystemFunctions(  ) override;
+            virtual OUString SAL_CALL getTimeDateFunctions(  ) override;
+            virtual OUString SAL_CALL getSearchStringEscape(  ) override;
+            virtual OUString SAL_CALL getExtraNameCharacters(  ) override;
+            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) override;
+            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) override;
+            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+            virtual OUString SAL_CALL getSchemaTerm(  ) override;
+            virtual OUString SAL_CALL getProcedureTerm(  ) override;
+            virtual OUString SAL_CALL getCatalogTerm(  ) override;
+            virtual sal_Bool SAL_CALL isCatalogAtStart(  ) override;
+            virtual OUString SAL_CALL getCatalogSeparator(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatements(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 52c849270be0..d169d66ff7b1 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -360,12 +360,12 @@ void KabDriver::disposing()
 }
 // static ServiceInfo
 
-OUString KabDriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString KabDriver::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.sdbc." KAB_SERVICE_NAME ".Driver");
 }
 
-Sequence< OUString > KabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > KabDriver::getSupportedServiceNames_Static(  )
 {
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
@@ -374,22 +374,22 @@ Sequence< OUString > KabDriver::getSupportedServiceNames_Static(  ) throw (Runti
     return aSNS;
 }
 
-OUString SAL_CALL KabDriver::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL KabDriver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
-Reference< XConnection > SAL_CALL KabDriver::connect( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL KabDriver::connect( const OUString&, const Sequence< PropertyValue >& )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -408,7 +408,6 @@ Reference< XConnection > SAL_CALL KabDriver::connect( const OUString&, const Seq
 }
 
 sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url )
-        throw(SQLException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -419,33 +418,33 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url )
     return url.startsWith("sdbc:address:" KAB_SERVICE_NAME);
 }
 
-Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException, std::exception)
+Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& )
 {
     // if you have something special to say, return it here :-)
     return Sequence< DriverPropertyInfo >();
 }
 
-sal_Int32 SAL_CALL KabDriver::getMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDriver::getMajorVersion(  )
 {
     return KAB_DRIVER_VERSION_MAJOR;
 }
 
-sal_Int32 SAL_CALL KabDriver::getMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabDriver::getMinorVersion(  )
 {
     return KAB_DRIVER_VERSION_MINOR;
 }
 
-void SAL_CALL KabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException, std::exception)
+void SAL_CALL KabDriver::queryTermination( const EventObject& )
 {
     // nothing to do, nothing to veto
 }
 
-void SAL_CALL KabDriver::notifyTermination( const EventObject& ) throw (RuntimeException, std::exception)
+void SAL_CALL KabDriver::notifyTermination( const EventObject& )
 {
     m_aImplModule.shutdown();
 }
 
-void SAL_CALL KabDriver::disposing( const EventObject& ) throw (RuntimeException, std::exception)
+void SAL_CALL KabDriver::disposing( const EventObject& )
 {
     // not interested in (this is the disposing of the desktop, if any)
 }
@@ -458,7 +457,7 @@ OUString KabDriver::impl_getConfigurationSettingsPath()
     return aPath.makeStringAndClear();
 }
 
-Reference< XInterface >  SAL_CALL KabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) throw( Exception )
+Reference< XInterface >  SAL_CALL KabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory )
 {
     return *(new KabDriver( comphelper::getComponentContext(_rxFactory)));
 }
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index b061b0040668..8a94db9ed180 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -144,11 +144,11 @@ namespace connectivity
             KabImplModule               m_aImplModule;
 
         public:
-            static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
             // XServiceInfo - static versions
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
-            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
+            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
 
             /** returns the path of our configuration settings
             */
@@ -161,23 +161,23 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getImplementationName(  ) override;
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMajorVersion() throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMinorVersion() throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Int32 SAL_CALL getMajorVersion() override;
+            virtual sal_Int32 SAL_CALL getMinorVersion() override;
 
             // XTerminateListener
-            virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override;
+            virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) 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;
 
         private:
             /** shuts down the library which contains the real implementations
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index b10cb8261356..5cf649696e4d 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star::util;
 
 IMPLEMENT_SERVICE_INFO(KabPreparedStatement, "com.sun.star.sdbc.drivers.KabPreparedStatement", "com.sun.star.sdbc.PreparedStatement");
 
-void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException)
+void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams)
 {
     if ( !m_aParameterRow.is() )
         m_aParameterRow = new OValueVector();
@@ -45,7 +45,7 @@ void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQL
         (m_aParameterRow->get()).resize(nParams);
 }
 
-void KabPreparedStatement::setKabFields() const throw(SQLException)
+void KabPreparedStatement::setKabFields() const
 {
     ::rtl::Reference<connectivity::OSQLColumns> xColumns;   // selected columns
 
@@ -61,12 +61,12 @@ void KabPreparedStatement::setKabFields() const throw(SQLException)
     m_xMetaData->setKabFields(xColumns);
 }
 
-void KabPreparedStatement::resetParameters() const throw(SQLException)
+void KabPreparedStatement::resetParameters() const
 {
     m_nParameterIndex = 0;
 }
 
-void KabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException)
+void KabPreparedStatement::getNextParameter(OUString &rParameter) const
 {
     if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size())
     {
@@ -108,7 +108,7 @@ void KabPreparedStatement::disposing()
     }
 }
 
-Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -122,7 +122,7 @@ Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() thr
     return xMetaData;
 }
 
-void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::close()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -140,7 +140,7 @@ void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException
     // list
 }
 
-sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabPreparedStatement::execute()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -150,7 +150,7 @@ sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeExc
     return xRS.is();
 }
 
-sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -159,7 +159,7 @@ sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, Run
     return 0;
 }
 
-Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -167,7 +167,7 @@ Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQ
     return m_pConnection;
 }
 
-Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -177,7 +177,7 @@ Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLE
     return rs;
 }
 
-void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -187,47 +187,47 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32)
     (m_aParameterRow->get())[parameterIndex - 1].setNull();
 }
 
-void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setBoolean", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setByte", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setShort", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setInt", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setFloat", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setDouble", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -237,38 +237,38 @@ void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OU
     (m_aParameterRow->get())[parameterIndex - 1] = x;
 }
 
-void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&)
 {
    ::dbtools::throwFunctionNotSupportedSQLException("setBytes", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&)
 {
    ::dbtools::throwFunctionNotSupportedSQLException("setDate", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const css::util::Time&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setTime", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&)
 {
 
    ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32)
 {
    ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x)
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
@@ -276,37 +276,37 @@ void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const An
     }
 }
 
-void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setRef", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setBlob", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setClob", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setArray", nullptr);
 }
 
-void SAL_CALL KabPreparedStatement::clearParameters() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabPreparedStatement::clearParameters()
 {
    ::dbtools::throwFunctionNotSupportedSQLException("clearParameters", nullptr);
 }
 
-void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception)
+void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     switch (nHandle)
     {
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx
index 2b4f801232df..28b22d8e77a3 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.hxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx
@@ -47,16 +47,16 @@ namespace connectivity
             mutable sal_Int32           m_nParameterIndex;
             OValueRow                   m_aParameterRow;
 
-            void checkAndResizeParameters(sal_Int32 nParams) throw(css::sdbc::SQLException);
-            void setKabFields() const throw(css::sdbc::SQLException);
+            void checkAndResizeParameters(sal_Int32 nParams);
+            void setKabFields() const;
 
         protected:
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                     sal_Int32 nHandle,
-                    const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override;
+                    const css::uno::Any& rValue) override;
 
-            virtual void resetParameters() const throw(css::sdbc::SQLException) override;
-            virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException) override;
+            virtual void resetParameters() const override;
+            virtual void getNextParameter(OUString &rParameter) const override;
             virtual ~KabPreparedStatement() override;
 
         public:
@@ -67,44 +67,44 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
 
             // XPreparedStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) override;
+            virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
+            virtual sal_Bool SAL_CALL execute(  ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
             using KabCommonStatement::executeQuery;
             using KabCommonStatement::executeUpdate;
             using KabCommonStatement::execute;
 
             // XParameters
-            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+            virtual void SAL_CALL clearParameters(  ) override;
 
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
 
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index 8babcb4714e3..5527b998923c 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -116,7 +116,7 @@ m_xStatement.clear();
 m_xMetaData.clear();
 }
 
-Any SAL_CALL KabResultSet::queryInterface(const Type & rType) throw(RuntimeException, std::exception)
+Any SAL_CALL KabResultSet::queryInterface(const Type & rType)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     if (!aRet.hasValue())
@@ -134,7 +134,7 @@ void SAL_CALL KabResultSet::release() throw()
     KabResultSet_BASE::release();
 }
 
-Sequence<  Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std::exception)
+Sequence<  Type > SAL_CALL KabResultSet::getTypes()
 {
     OTypeCollection aTypes(
         cppu::UnoType<css::beans::XMultiPropertySet>::get(),
@@ -144,12 +144,12 @@ Sequence<  Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std:
     return comphelper::concatSequences(aTypes.getTypes(), KabResultSet_BASE::getTypes());
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -169,7 +169,7 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQ
     return 0; // Never reached
 }
 
-OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -206,7 +206,7 @@ return aRet;
     return aRet;
 }
 
-sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -216,7 +216,7 @@ sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) throw(SQLException, Runtim
     return false;
 }
 
-sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -227,7 +227,7 @@ sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeEx
     return nRet;
 }
 
-sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -238,7 +238,7 @@ sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) throw(SQLException, Runtime
     return nRet;
 }
 
-sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -249,7 +249,7 @@ sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) throw(SQLException, RuntimeEx
     return nRet;
 }
 
-sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -259,7 +259,7 @@ sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) throw(SQLException, RuntimeE
     return sal_Int64();
 }
 
-float SAL_CALL KabResultSet::getFloat(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL KabResultSet::getFloat(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -270,7 +270,7 @@ float SAL_CALL KabResultSet::getFloat(sal_Int32) throw(SQLException, RuntimeExce
     return nVal;
 }
 
-double SAL_CALL KabResultSet::getDouble(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL KabResultSet::getDouble(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -281,7 +281,7 @@ double SAL_CALL KabResultSet::getDouble(sal_Int32) throw(SQLException, RuntimeEx
     return nRet;
 }
 
-Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -291,7 +291,7 @@ Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) throw(SQLExcepti
     return Sequence< sal_Int8 >();
 }
 
-cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -302,7 +302,7 @@ cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, Runtime
     return aRet;
 }
 
-cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -313,7 +313,7 @@ cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, Runtime
     return nRet;
 }
 
-cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLException, RuntimeException, std::exception)
+cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -352,7 +352,7 @@ cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw(
     return nRet;
 }
 
-Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -362,7 +362,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) thro
     return nullptr;
 }
 
-Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -372,7 +372,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) t
     return nullptr;
 }
 
-Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -382,7 +382,7 @@ Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container:
     return Any();
 }
 
-Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -392,7 +392,7 @@ Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, R
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -402,7 +402,7 @@ Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException,
     return nullptr;
 }
 
-Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -412,7 +412,7 @@ Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException,
     return nullptr;
 }
 
-Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -422,7 +422,7 @@ Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLExceptio
     return nullptr;
 }
 
-Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -434,7 +434,7 @@ Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLEx
     return xMetaData;
 }
 
-sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::isBeforeFirst()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -445,7 +445,7 @@ sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeExcep
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::isAfterLast()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -457,7 +457,7 @@ sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeExcepti
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::isFirst()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -468,7 +468,7 @@ sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException,
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::isLast()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -480,7 +480,7 @@ sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException, s
     return false;
 }
 
-void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::beforeFirst()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -489,7 +489,7 @@ void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException,
     m_nRowPos = -1;
 }
 
-void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::afterLast()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -499,7 +499,7 @@ void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException, st
     m_nRowPos = nAddressees;
 }
 
-void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::close()
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -508,7 +508,7 @@ void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException, std::e
     dispose();
 }
 
-sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::first()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -521,7 +521,7 @@ sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException, st
     return true;
 }
 
-sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::last()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -534,7 +534,7 @@ sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException, std
     return true;
 }
 
-sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSet::getRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -542,7 +542,7 @@ sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException,
     return m_nRowPos;
 }
 
-sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -556,7 +556,7 @@ sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) throw(SQLException, Runt
     return true;
 }
 
-sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -564,7 +564,7 @@ sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, Runt
     return absolute(m_nRowPos + row);
 }
 
-sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::next()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -572,7 +572,7 @@ sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException, std
     return absolute(m_nRowPos + 1);
 }
 
-sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::previous()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -580,7 +580,7 @@ sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException,
     return absolute(m_nRowPos - 1);
 }
 
-Reference< XInterface > SAL_CALL KabResultSet::getStatement() throw(SQLException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL KabResultSet::getStatement()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -589,7 +589,7 @@ Reference< XInterface > SAL_CALL KabResultSet::getStatement() throw(SQLException
     return xStatement;
 }
 
-sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::rowDeleted()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -597,7 +597,7 @@ sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeExceptio
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::rowInserted()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -605,7 +605,7 @@ sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeExcepti
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::rowUpdated()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -613,7 +613,7 @@ sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeExceptio
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::wasNull()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -621,22 +621,22 @@ sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException,
     return m_bWasNull;
 }
 
-void SAL_CALL KabResultSet::cancel() throw(RuntimeException, std::exception)
+void SAL_CALL KabResultSet::cancel()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::clearWarnings() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::clearWarnings()
 {
 }
 
-Any SAL_CALL KabResultSet::getWarnings() throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL KabResultSet::getWarnings()
 {
     return Any();
 }
 
-void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::insertRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -644,7 +644,7 @@ void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException, st
     // you only have to implement this if you want to insert new rows
 }
 
-void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -652,19 +652,19 @@ void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException, st
     // only when you allow updates
 }
 
-void SAL_CALL KabResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::deleteRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::cancelRowUpdates()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::moveToInsertRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -672,122 +672,122 @@ void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcepti
     // only when you allow inserts
 }
 
-void SAL_CALL KabResultSet::moveToCurrentRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::moveToCurrentRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateNull(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateBoolean(sal_Int32, sal_Bool)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateByte(sal_Int32, sal_Int8)
 {
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 }
 
-void SAL_CALL KabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateShort(sal_Int32, sal_Int16)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateInt(sal_Int32, sal_Int32)
 {
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 }
 
-void SAL_CALL KabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateLong(sal_Int32, sal_Int64)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateFloat(sal_Int32, float)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateDouble(sal_Int32, double)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateTime(sal_Int32, const cssu::Time&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateTime(sal_Int32, const cssu::Time&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::refreshRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::refreshRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateObject(sal_Int32, const Any&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL KabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 
 // XRowLocate
-Any SAL_CALL KabResultSet::getBookmark() throw( SQLException,  RuntimeException, std::exception)
+Any SAL_CALL KabResultSet::getBookmark()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -803,7 +803,7 @@ Any SAL_CALL KabResultSet::getBookmark() throw( SQLException,  RuntimeException,
     return Any();
 }
 
-sal_Bool SAL_CALL KabResultSet::moveToBookmark(const  Any& bookmark) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::moveToBookmark(const  Any& bookmark)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -825,7 +825,7 @@ sal_Bool SAL_CALL KabResultSet::moveToBookmark(const  Any& bookmark) throw( SQLE
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const  Any& bookmark, sal_Int32 rows) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const  Any& bookmark, sal_Int32 rows)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -846,7 +846,7 @@ sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const  Any& bookmark, sal
     return false;
 }
 
-sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const  Any& firstItem, const  Any& secondItem) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const  Any& firstItem, const  Any& secondItem)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -861,12 +861,12 @@ sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const  Any& firstItem, const
     return CompareBookmark::EQUAL;
 }
 
-sal_Bool SAL_CALL KabResultSet::hasOrderedBookmarks() throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSet::hasOrderedBookmarks()
 {
     return false;
 }
 
-sal_Int32 SAL_CALL KabResultSet::hashBookmark(const  Any& bookmark) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSet::hashBookmark(const  Any& bookmark)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -877,7 +877,7 @@ sal_Int32 SAL_CALL KabResultSet::hashBookmark(const  Any& bookmark) throw( SQLEx
 }
 
 // XDeleteRows
-Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const  Sequence<  Any >&) throw( SQLException,  RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const  Sequence<  Any >&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -921,7 +921,6 @@ sal_Bool KabResultSet::convertFastPropertyValue(
             Any &,
             sal_Int32 nHandle,
             const Any& )
-                throw (css::lang::IllegalArgumentException)
 {
     switch (nHandle)
     {
@@ -942,7 +941,6 @@ sal_Bool KabResultSet::convertFastPropertyValue(
 void KabResultSet::setFastPropertyValue_NoBroadcast(
             sal_Int32 nHandle,
             const Any& )
-                 throw (Exception, std::exception)
 {
     switch (nHandle)
     {
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index e448b710a73b..8edef8d9f5d4 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -74,12 +74,10 @@ namespace connectivity
                                 css::uno::Any & rConvertedValue,
                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue)
-                                    throw (css::lang::IllegalArgumentException) override;
+                                const css::uno::Any& rValue) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue)
-                                    throw (css::uno::Exception, std::exception) override;
+                                const css::uno::Any& rValue) override;
             virtual void SAL_CALL getFastPropertyValue(
                                 css::uno::Any& rValue,
                                 sal_Int32 nHandle) const override;
@@ -109,110 +107,110 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
 
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
 
             // XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
             // XResultSet
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
 
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
 
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL cancel(  ) override;
 
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
 
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
 
             // XResultSetUpdate
-            virtual void SAL_CALL insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL insertRow(  ) override;
+            virtual void SAL_CALL updateRow(  ) override;
+            virtual void SAL_CALL deleteRow(  ) override;
+            virtual void SAL_CALL cancelRowUpdates(  ) override;
+            virtual void SAL_CALL moveToInsertRow(  ) override;
+            virtual void SAL_CALL moveToCurrentRow(  ) override;
             // XRowUpdate
-            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
 
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
             // XRowLocate
-            virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) override;
+            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
 
             // XDeleteRows
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 35290e538d84..88669bd2d6fa 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
@@ -36,7 +36,7 @@ KabResultSetMetaData::~KabResultSetMetaData()
 {
 }
 
-void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
+void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns)
 {
     OSQLColumns::Vector::const_iterator aIter;
     static const char aName[] = "Name";
@@ -52,32 +52,32 @@ void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQ
     }
 }
 
-sal_Int32 SAL_CALL KabResultSetMetaData::getColumnDisplaySize(sal_Int32 column) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSetMetaData::getColumnDisplaySize(sal_Int32 column)
 {
     return m_aKabFields[column - 1] < KAB_DATA_FIELDS? 20: 50;
 }
 
-sal_Int32 SAL_CALL KabResultSetMetaData::getColumnType(sal_Int32 column) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSetMetaData::getColumnType(sal_Int32 column)
 {
     return m_aKabFields[column - 1] == KAB_FIELD_REVISION? DataType::TIMESTAMP: DataType::CHAR;
 }
 
-sal_Int32 SAL_CALL KabResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSetMetaData::getColumnCount()
 {
     return m_aKabFields.size();
 }
 
-sal_Bool SAL_CALL KabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSetMetaData::isCaseSensitive(sal_Int32)
 {
     return true;
 }
 
-OUString SAL_CALL KabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabResultSetMetaData::getSchemaName(sal_Int32)
 {
     return OUString();
 }
 
-OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column)
 {
     sal_uInt32 nFieldNumber = m_aKabFields[column - 1];
     ::KABC::Field::List aFields = ::KABC::Field::allFields();
@@ -96,79 +96,79 @@ OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQ
     return aName;
 }
 
-OUString SAL_CALL KabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabResultSetMetaData::getTableName(sal_Int32)
 {
     return KabDatabaseMetaData::getAddressBookTableName();
 }
 
-OUString SAL_CALL KabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabResultSetMetaData::getCatalogName(sal_Int32)
 {
     return OUString();
 }
 
-OUString SAL_CALL KabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabResultSetMetaData::getColumnTypeName(sal_Int32)
 {
     return OUString();
 }
 
-OUString SAL_CALL KabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabResultSetMetaData::getColumnLabel(sal_Int32)
 {
     return OUString();
 }
 
-OUString SAL_CALL KabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL KabResultSetMetaData::getColumnServiceName(sal_Int32)
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL KabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSetMetaData::isCurrency(sal_Int32)
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSetMetaData::isAutoIncrement(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSetMetaData::isAutoIncrement(sal_Int32)
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSetMetaData::isSigned(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSetMetaData::isSigned(sal_Int32)
 {
     return false;
 }
 
-sal_Int32 SAL_CALL KabResultSetMetaData::getPrecision(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSetMetaData::getPrecision(sal_Int32)
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL KabResultSetMetaData::getScale(sal_Int32) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSetMetaData::getScale(sal_Int32)
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL KabResultSetMetaData::isNullable(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabResultSetMetaData::isNullable(sal_Int32)
 {
     return (sal_Int32) true;
 // KDE address book currently does not use nullptr values.
 // But it might do it someday
 }
 
-sal_Bool SAL_CALL KabResultSetMetaData::isSearchable(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSetMetaData::isSearchable(sal_Int32)
 {
     return true;
 }
 
-sal_Bool SAL_CALL KabResultSetMetaData::isReadOnly(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSetMetaData::isReadOnly(sal_Int32)
 {
     return true;
 }
 
-sal_Bool SAL_CALL KabResultSetMetaData::isDefinitelyWritable(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSetMetaData::isDefinitelyWritable(sal_Int32)
 {
     return false;
 }
 
-sal_Bool SAL_CALL KabResultSetMetaData::isWritable(sal_Int32) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL KabResultSetMetaData::isWritable(sal_Int32)
 {
     return false;
 }
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index 557a289aa11f..f1e9348e55c6 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
@@ -50,31 +50,31 @@ namespace connectivity
                 { return this; }
 
             void setKabFields(
-                const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException);
+                const ::rtl::Reference<connectivity::OSQLColumns> &xColumns);
             inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
                 { return m_aKabFields[columnIndex - 1]; }
 
-            virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index f611f15bdd86..83e0bf26efee 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -75,17 +75,17 @@ KabCommonStatement::~KabCommonStatement()
 {
 }
 
-void KabCommonStatement::resetParameters() const throw(css::sdbc::SQLException)
+void KabCommonStatement::resetParameters() const
 {
     lcl_throwError(STR_PARA_ONLY_PREPARED);
 }
 
-void KabCommonStatement::getNextParameter(OUString &) const throw(css::sdbc::SQLException)
+void KabCommonStatement::getNextParameter(OUString &) const
 {
     lcl_throwError(STR_PARA_ONLY_PREPARED);
 }
 
-KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException)
+KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const
 {
     if (pParseNode->count() == 3)
     {
@@ -232,7 +232,7 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse
     return nullptr;
 }
 
-KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const throw(SQLException)
+KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const
 {
     if (SQL_ISRULE(pParseNode, ordering_spec_commalist))
     {
@@ -291,7 +291,7 @@ bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const
     return true;
 }
 
-void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLException)
+void KabCommonStatement::setKabFields(KabResultSet *pResult) const
 {
     ::rtl::Reference<connectivity::OSQLColumns> xColumns;   // selected columns
 
@@ -303,7 +303,7 @@ void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLExce
     pResult->getKabMetaData()->setKabFields(xColumns);
 }
 
-void KabCommonStatement::selectAddressees(KabResultSet *pResult) const throw(SQLException)
+void KabCommonStatement::selectAddressees(KabResultSet *pResult) const
 {
     const OSQLParseNode *pParseNode;
 
@@ -328,7 +328,7 @@ void KabCommonStatement::selectAddressees(KabResultSet *pResult) const throw(SQL
     pResult->allKabAddressees();
 }
 
-void KabCommonStatement::sortAddressees(KabResultSet *pResult) const throw(SQLException)
+void KabCommonStatement::sortAddressees(KabResultSet *pResult) const
 {
     const OSQLParseNode *pParseNode;
 
@@ -345,7 +345,7 @@ void KabCommonStatement::sortAddressees(KabResultSet *pResult) const throw(SQLEx
     }
 }
 
-Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType )
 {
     Any aRet = KabCommonStatement_BASE::queryInterface(rType);
     if (!aRet.hasValue())
@@ -353,7 +353,7 @@ Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(Runt
     return aRet;
 }
 
-Sequence< Type > SAL_CALL KabCommonStatement::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL KabCommonStatement::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
                                     cppu::UnoType<XFastPropertySet>::get(),
@@ -362,7 +362,7 @@ Sequence< Type > SAL_CALL KabCommonStatement::getTypes(  ) throw(RuntimeExceptio
     return comphelper::concatSequences(aTypes.getTypes(),KabCommonStatement_BASE::getTypes());
 }
 
-void SAL_CALL KabCommonStatement::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL KabCommonStatement::cancel(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -370,7 +370,7 @@ void SAL_CALL KabCommonStatement::cancel(  ) throw(RuntimeException, std::except
     // cancel the current sql statement
 }
 
-void SAL_CALL KabCommonStatement::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabCommonStatement::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -381,7 +381,7 @@ void SAL_CALL KabCommonStatement::close(  ) throw(SQLException, RuntimeException
 }
 
 sal_Bool SAL_CALL KabCommonStatement::execute(
-        const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -392,7 +392,7 @@ sal_Bool SAL_CALL KabCommonStatement::execute(
 }
 
 Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery(
-        const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+        const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -430,7 +430,7 @@ Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery(
     return xRS;
 }
 
-Reference< XConnection > SAL_CALL KabCommonStatement::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL KabCommonStatement::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -439,7 +439,7 @@ Reference< XConnection > SAL_CALL KabCommonStatement::getConnection(  ) throw(SQ
     return m_pConnection;
 }
 
-sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -448,7 +448,7 @@ sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQ
     return 0;
 }
 
-Any SAL_CALL KabCommonStatement::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL KabCommonStatement::getWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -456,7 +456,7 @@ Any SAL_CALL KabCommonStatement::getWarnings(  ) throw(SQLException, RuntimeExce
     return makeAny(m_aLastWarning);
 }
 
-void SAL_CALL KabCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL KabCommonStatement::clearWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
@@ -504,14 +504,14 @@ sal_Bool KabCommonStatement::convertFastPropertyValue(
         Any &,
         Any &,
         sal_Int32,
-        const Any&) throw (css::lang::IllegalArgumentException)
+        const Any&)
 {
     bool bConverted = false;
     // here we have to try to convert
     return bConverted;
 }
 
-void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception, std::exception)
+void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&)
 {
     // set the value to whatever is necessary
     switch (nHandle)
@@ -560,7 +560,7 @@ void SAL_CALL KabCommonStatement::release() throw()
     KabCommonStatement_BASE::release();
 }
 
-Reference< css::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index e76522ceb206..197b938f4266 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -60,13 +60,13 @@ namespace connectivity
 
         protected:
             class KabCondition *analyseWhereClause(
-                const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException);
+                const OSQLParseNode *pParseNode) const;
             class KabOrder *analyseOrderByClause(
-                const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException);
+                const OSQLParseNode *pParseNode) const;
             bool isTableKnown(class KabResultSet *pResult) const;
-            void setKabFields(class KabResultSet *pResult) const throw(css::sdbc::SQLException);
-            void selectAddressees(KabResultSet *pResult) const throw(css::sdbc::SQLException);
-            void sortAddressees(KabResultSet *pResult) const throw(css::sdbc::SQLException);
+            void setKabFields(class KabResultSet *pResult) const;
+            void selectAddressees(KabResultSet *pResult) const;
+            void sortAddressees(KabResultSet *pResult) const;
 
             // OPropertyArrayUsageHelper
             virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
@@ -77,17 +77,17 @@ namespace connectivity
                     css::uno::Any & rConvertedValue,
                     css::uno::Any & rOldValue,
                     sal_Int32 nHandle,
-                    const css::uno::Any& rValue) throw (css::lang::IllegalArgumentException) override;
+                    const css::uno::Any& rValue) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                     sal_Int32 nHandle,
-                    const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override;
+                    const css::uno::Any& rValue) override;
             virtual void SAL_CALL getFastPropertyValue(
                     css::uno::Any& rValue,
                     sal_Int32 nHandle) const override;
             using OPropertySetHelper::getFastPropertyValue;
 
-            virtual void resetParameters() const throw(css::sdbc::SQLException);
-            virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException);
+            virtual void resetParameters() const;
+            virtual void getNextParameter(OUString &rParameter) const;
             virtual ~KabCommonStatement() override;
 
         public:
@@ -104,39 +104,39 @@ namespace connectivity
             virtual void SAL_CALL acquire() throw() override;
             virtual css::uno::Any SAL_CALL queryInterface(
                     const css::uno::Type & rType
-                    ) throw(css::uno::RuntimeException, std::exception) override;
+                    ) override;
 
             // XTypeProvider
             virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(
-                    ) throw(css::uno::RuntimeException, std::exception) override;
+                    ) override;
 
             // XPropertySet
             virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(
-                    ) throw(css::uno::RuntimeException, std::exception) override;
+                    ) override;
 
             // XStatement
             virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(
-                    const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                    const OUString& sql ) override;
             virtual sal_Int32 SAL_CALL executeUpdate(
-                     const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                     const OUString& sql ) override;
             virtual sal_Bool SAL_CALL execute(
-                    const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                    const OUString& sql ) override;
             virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(
-                    ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                    ) override;
 
             // XWarningsSupplier
             virtual css::uno::Any SAL_CALL getWarnings(
-                    ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                    ) override;
             virtual void SAL_CALL clearWarnings(
-                    ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                    ) override;
 
             // XCancellable
             virtual void SAL_CALL cancel(
-                    ) throw(css::uno::RuntimeException, std::exception) override;
+                    ) override;
 
             // XCloseable
             virtual void SAL_CALL close(
-                    ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                    ) override;
         };
 
 
diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx
index 6d725e6101e8..d84601f44d89 100644
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
@@ -66,7 +66,7 @@ sdbcx::ObjectType KabTables::createObject(const OUString& _rName)
     return xRet;
 }
 
-void KabTables::impl_refresh(  ) throw(RuntimeException)
+void KabTables::impl_refresh(  )
 {
     static_cast<KabCatalog&>(m_rParent).refreshTables();
 }
diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx
index 5a9c9ad2a927..564ca3faba52 100644
--- a/connectivity/source/drivers/kab/KTables.hxx
+++ b/connectivity/source/drivers/kab/KTables.hxx
@@ -33,7 +33,7 @@ namespace connectivity
 
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
 
         public:
             KabTables(
diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx
index 5801a454a062..3721585e3109 100644
--- a/connectivity/source/drivers/kab/kcondition.cxx
+++ b/connectivity/source/drivers/kab/kcondition.cxx
@@ -50,7 +50,7 @@ bool KabConditionConstant::eval(const ::KABC::Addressee &) const
     return m_bValue;
 }
 
-KabConditionColumn::KabConditionColumn(const OUString &sColumnName) throw(SQLException)
+KabConditionColumn::KabConditionColumn(const OUString &sColumnName)
     : KabCondition(),
       m_nFieldNumber(findKabField(sColumnName))
 {
@@ -68,7 +68,7 @@ bool KabConditionColumn::isAlwaysFalse() const
     return false;
 }
 
-KabConditionNull::KabConditionNull(const OUString &sColumnName) throw(SQLException)
+KabConditionNull::KabConditionNull(const OUString &sColumnName)
     : KabConditionColumn(sColumnName)
 {
 }
@@ -82,7 +82,7 @@ bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const
 // But it might do it someday
 }
 
-KabConditionNotNull::KabConditionNotNull(const OUString &sColumnName) throw(SQLException)
+KabConditionNotNull::KabConditionNotNull(const OUString &sColumnName)
     : KabConditionColumn(sColumnName)
 {
 }
@@ -96,13 +96,13 @@ bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const
 // But it might do it someday
 }
 
-KabConditionCompare::KabConditionCompare(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
+KabConditionCompare::KabConditionCompare(const OUString &sColumnName, const OUString &sMatchString)
     : KabConditionColumn(sColumnName),
       m_sMatchString(sMatchString)
 {
 }
 
-KabConditionEqual::KabConditionEqual(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
+KabConditionEqual::KabConditionEqual(const OUString &sColumnName, const OUString &sMatchString)
     : KabConditionCompare(sColumnName, sMatchString)
 {
 }
@@ -121,7 +121,7 @@ bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const
     return sValue == m_sMatchString;
 }
 
-KabConditionDifferent::KabConditionDifferent(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
+KabConditionDifferent::KabConditionDifferent(const OUString &sColumnName, const OUString &sMatchString)
     : KabConditionCompare(sColumnName, sMatchString)
 {
 }
@@ -136,7 +136,7 @@ bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const
     return sValue != m_sMatchString;
 }
 
-KabConditionSimilar::KabConditionSimilar(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
+KabConditionSimilar::KabConditionSimilar(const OUString &sColumnName, const OUString &sMatchString)
     : KabConditionCompare(sColumnName, sMatchString)
 {
 }
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index a6b1cd8808b6..5225ffa573b4 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -59,7 +59,7 @@ class KabConditionColumn : public KabCondition
 
     public:
         explicit KabConditionColumn(
-            const OUString &sColumnName) throw(css::sdbc::SQLException);
+            const OUString &sColumnName);
         virtual bool isAlwaysTrue() const override;
         virtual bool isAlwaysFalse() const override;
 };
@@ -68,7 +68,7 @@ class KabConditionNull : public KabConditionColumn
 {
     public:
         explicit KabConditionNull(
-            const OUString &sColumnName) throw(css::sdbc::SQLException);
+            const OUString &sColumnName);
         virtual bool eval(const ::KABC::Addressee &aAddressee) const override;
 };
 
@@ -76,7 +76,7 @@ class KabConditionNotNull : public KabConditionColumn
 {
     public:
         explicit KabConditionNotNull(
-            const OUString &sColumnName) throw(css::sdbc::SQLException);
+            const OUString &sColumnName);
         virtual bool eval(const ::KABC::Addressee &aAddressee) const override;
 };
 
@@ -88,7 +88,7 @@ class KabConditionCompare : public KabConditionColumn
     public:
         KabConditionCompare(
             const OUString &sColumnName,
-            const OUString &sMatchString) throw(css::sdbc::SQLException);
+            const OUString &sMatchString);
 };
 
 class KabConditionEqual : public KabConditionCompare
@@ -96,7 +96,7 @@ class KabConditionEqual : public KabConditionCompare
     public:
         KabConditionEqual(
             const OUString &sColumnName,
-            const OUString &sMatchString) throw(css::sdbc::SQLException);
+            const OUString &sMatchString);
         virtual bool eval(const ::KABC::Addressee &aAddressee) const override;
 };
 
@@ -105,7 +105,7 @@ class KabConditionDifferent : public KabConditionCompare
     public:
         KabConditionDifferent(
             const OUString &sColumnName,
-            const OUString &sMatchString) throw(css::sdbc::SQLException);
+            const OUString &sMatchString);
         virtual bool eval(const ::KABC::Addressee &aAddressee) const override;
 };
 
@@ -114,7 +114,7 @@ class KabConditionSimilar : public KabConditionCompare
     public:
         KabConditionSimilar(
             const OUString &sColumnName,
-            const OUString &sMatchString) throw(css::sdbc::SQLException);
+            const OUString &sMatchString);
         virtual bool eval(const ::KABC::Addressee &aAddressee) const override;
 };
 
diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx
index 0ecc78ae5c23..e86ea64efa4d 100644
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
@@ -47,7 +47,7 @@ QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNum
 }
 
 // search the KDE address book field number of a given column name
-sal_uInt32 findKabField(const OUString& columnName) throw(SQLException)
+sal_uInt32 findKabField(const OUString& columnName)
 {
     QString aQtName;
     OUString aName;
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index 9b3a9273188b..02121deaf5c9 100644
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
@@ -32,7 +32,7 @@ namespace connectivity
     namespace kab
     {
         QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber);
-        sal_uInt32 findKabField(const OUString& columnName) throw(css::sdbc::SQLException);
+        sal_uInt32 findKabField(const OUString& columnName);
     }
 }
 
diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx
index 8af97351e022..91bec0a78a78 100644
--- a/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.cxx
@@ -85,7 +85,7 @@ const OUString& MacabCatalog::getDot()
 
 
 // XTablesSupplier
-Reference< XNameAccess > SAL_CALL MacabCatalog::getTables(  ) throw(RuntimeException)
+Reference< XNameAccess > SAL_CALL MacabCatalog::getTables(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx
index d893d3d283a7..cf79a19ea889 100644
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
@@ -47,7 +47,7 @@ namespace connectivity
 
             // XTablesSupplier
             virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(
-                    ) throw(css::uno::RuntimeException) override;
+                    ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index f74f952d88cd..df09ef9c7715 100644
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -78,7 +78,7 @@ sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName)
     return xRet;
 }
 
-void MacabColumns::impl_refresh() throw(RuntimeException)
+void MacabColumns::impl_refresh()
 {
     m_pTable->refreshColumns();
 }
diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx
index d2c7f502e2dc..45858d44657e 100644
--- a/connectivity/source/drivers/macab/MacabColumns.hxx
+++ b/connectivity/source/drivers/macab/MacabColumns.hxx
@@ -33,7 +33,7 @@ namespace connectivity
             MacabTable* m_pTable;
 
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
 
         public:
             MacabColumns(   MacabTable* _pTable,
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index 7b1d8dfc93bd..b966538b15e4 100644
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -59,7 +59,7 @@ void SAL_CALL MacabConnection::release() throw()
     release_ChildImpl();
 }
 
-void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >&) throw(SQLException)
+void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >&)
 {
     osl_atomic_increment( &m_refCount );
 
@@ -70,7 +70,7 @@ void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >
 }
 // XServiceInfo
 
-Reference< XStatement > SAL_CALL MacabConnection::createStatement(  ) throw(SQLException, RuntimeException)
+Reference< XStatement > SAL_CALL MacabConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -82,7 +82,7 @@ Reference< XStatement > SAL_CALL MacabConnection::createStatement(  ) throw(SQLE
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const OUString& _sSql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -94,7 +94,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( cons
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUString& )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -103,7 +103,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUS
     return nullptr;
 }
 
-OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     // when you need to transform SQL92 to you driver specific you can do it here
@@ -111,14 +111,14 @@ OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLE
     return _sSql;
 }
 
-void SAL_CALL MacabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabConnection::setAutoCommit( sal_Bool )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
     // here you  have to set your commit mode please have a look at the jdbc documentation to get a clear explanation
 }
 
-sal_Bool SAL_CALL MacabConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabConnection::getAutoCommit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -128,7 +128,7 @@ sal_Bool SAL_CALL MacabConnection::getAutoCommit(  ) throw(SQLException, Runtime
     return true;
 }
 
-void SAL_CALL MacabConnection::commit(  ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabConnection::commit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -136,7 +136,7 @@ void SAL_CALL MacabConnection::commit(  ) throw(SQLException, RuntimeException)
     // when you database does support transactions you should commit here
 }
 
-void SAL_CALL MacabConnection::rollback(  ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabConnection::rollback(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -144,7 +144,7 @@ void SAL_CALL MacabConnection::rollback(  ) throw(SQLException, RuntimeException
     // same as commit but for the other case
 }
 
-sal_Bool SAL_CALL MacabConnection::isClosed(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabConnection::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -152,7 +152,7 @@ sal_Bool SAL_CALL MacabConnection::isClosed(  ) throw(SQLException, RuntimeExcep
     return MacabConnection_BASE::rBHelper.bDisposed;
 }
 
-Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData(  ) throw(SQLException, RuntimeException)
+Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -169,7 +169,7 @@ Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData(  ) throw(S
     return xMetaData;
 }
 
-void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabConnection::setReadOnly( sal_Bool )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -177,7 +177,7 @@ void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) throw(SQLException, Runti
     // set you connection to readonly
 }
 
-sal_Bool SAL_CALL MacabConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabConnection::isReadOnly(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -186,7 +186,7 @@ sal_Bool SAL_CALL MacabConnection::isReadOnly(  ) throw(SQLException, RuntimeExc
     return false;
 }
 
-void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabConnection::setCatalog( const OUString& )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -194,7 +194,7 @@ void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException,
     // if your database doesn't work with catalogs you go to next method otherwise you know what to do
 }
 
-OUString SAL_CALL MacabConnection::getCatalog(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabConnection::getCatalog(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -204,7 +204,7 @@ OUString SAL_CALL MacabConnection::getCatalog(  ) throw(SQLException, RuntimeExc
     return OUString();
 }
 
-void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -213,7 +213,7 @@ void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLExc
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
 }
 
-sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -223,7 +223,7 @@ sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation(  ) throw(SQLExcepti
     return TransactionIsolation::NONE;
 }
 
-Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
+Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
@@ -233,13 +233,13 @@ Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap(
     return nullptr;
 }
 
-void SAL_CALL MacabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabConnection::setTypeMap( const Reference< css::container::XNameAccess >& )
 {
     // the other way around
 }
 
 // XCloseable
-void SAL_CALL MacabConnection::close(  ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabConnection::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -249,13 +249,13 @@ void SAL_CALL MacabConnection::close(  ) throw(SQLException, RuntimeException)
 }
 
 // XWarningsSupplier
-Any SAL_CALL MacabConnection::getWarnings(  ) throw(SQLException, RuntimeException)
+Any SAL_CALL MacabConnection::getWarnings(  )
 {
     // when you collected some warnings -> return it
     return Any();
 }
 
-void SAL_CALL MacabConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabConnection::clearWarnings(  )
 {
     // you should clear your collected warnings here
 }
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index 0c225861275a..93d395a28d0f 100644
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
@@ -66,14 +66,11 @@ namespace connectivity
 
         public:
             /// @throws css::sdbc::SQLException
-            virtual void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException);
+            virtual void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info);
 
             explicit MacabConnection(MacabDriver* _pDriver);
             virtual ~MacabConnection() override;
 
-            /// @throws css::sdbc::SQLException
-            void closeAllStatements () throw( css::sdbc::SQLException);
-
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
 
@@ -84,31 +81,31 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
 
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+            virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+            virtual void SAL_CALL commit(  ) override;
+            virtual void SAL_CALL rollback(  ) override;
+            virtual sal_Bool SAL_CALL isClosed(  ) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+            virtual OUString SAL_CALL getCatalog(  ) override;
+            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL close(  ) override;
 
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
 
             // needed for the SQL interpreter
             css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog();
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index fa3e9c927b5a..0dbeb5a4b328 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -54,7 +54,7 @@ MacabDatabaseMetaData::~MacabDatabaseMetaData()
 {
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator(  )
 {
     OUString aVal;
     if (m_bUseCatalog)
@@ -64,73 +64,73 @@ OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLExcept
     return aVal;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxRowSize(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCatalogNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCharLiteralLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInIndex(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCursorNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxConnections(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInTable(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatementLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTableNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect(  )
 {
     // MaxTablesInSelect describes how many tables can participate in the FROM part of a given SELECT statement,
     // currently, the resultset/statement implementations can cope with one table only
@@ -138,63 +138,63 @@ sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLExce
     return nValue;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithAddColumn(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithAddColumn(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithDropColumn(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithDropColumn(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxIndexLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns(  )
 {
     return false;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm(  )
 {
     OUString aVal;
     if (m_bUseCatalog)
@@ -203,25 +203,25 @@ OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException,
     return aVal;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString(  )
 {
     // normally this is "
     OUString aVal("\"");
     return aVal;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters(  )
 {
     OUString aVal;
     return aVal;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart(  )
 {
     bool bValue = false;
     if (m_bUseCatalog)
@@ -230,326 +230,326 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart(  ) throw(SQLException
     return bValue;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionIgnoredInTransactions(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionCausesTransactionCommit(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataManipulationTransactionsOnly(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedDelete(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInDataManipulation(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInDataManipulation(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92FullSQL(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     return true; // should be supported at least
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInIndexDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInTableDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInTableDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInTableDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInTableDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInIndexDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInDataManipulation(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInDataManipulation(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatements(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatements(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxProcedureNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxSchemaNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::allProceduresAreCallable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsStoredProcedures(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSelectForUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::allTablesAreSelectable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::isReadOnly(  )
 {
     // for the moment, we have read-only addresses, but this might change in the future
     return true;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFiles(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFilePerTable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTypeConversion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsColumnAliasing(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTableCorrelationNames(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleResultSets(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLikeEscapeClause(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOrderByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnionAll(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtStart(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedHigh(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedLow(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInExists(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInIns(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     return false;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getURL(  )
 {
     // if someday we support more than the default address book,
     // this method should return the URL which was used to create it
@@ -557,145 +557,145 @@ OUString SAL_CALL MacabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeE
     return aValue;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getUserName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getDriverName(  )
 {
     OUString aValue(  "macab" );
     return aValue;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion()
 {
     OUString aValue(MACAB_DRIVER_VERSION);
     return aValue;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm(  )
 {
     OUString aValue;
     return aValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMajorVersion(  )
 {
     return MACAB_DRIVER_VERSION_MAJOR;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getDefaultTransactionIsolation(  )
 {
     return TransactionIsolation::NONE;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMinorVersion(  )
 {
     return MACAB_DRIVER_VERSION_MINOR;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions(  )
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCoreSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMinimumSQLGrammar(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsFullOuterJoins(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInSelect(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxUserNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setType )
 {
     switch (setType)
     {
@@ -706,7 +706,7 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setTyp
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 )
 {
     switch (setType)
     {
@@ -717,62 +717,62 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::updatesAreDetected( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::deletesAreDetected( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::insertsAreDetected( sal_Int32 )
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabDatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabDatabaseMetaData::supportsBatchUpdates(  )
 {
     return false;
 }
 
-Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection(  ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection(  )
 {
     return m_xConnection.get();
 }
 
-Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  )
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
     Reference< XResultSet > xRef = pResult;
@@ -791,7 +791,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  ) throw(
     return xRef;
 }
 
-Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  )
 {
     ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo);
     Reference< XResultSet > xRef = pResult;
@@ -847,19 +847,19 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  ) throw(SQ
     return xRef;
 }
 
-Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCatalogs(  )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs );
 }
 
-Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas(  )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas );
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges(
     const Any&, const OUString&, const OUString&,
-    const OUString& ) throw(SQLException, RuntimeException)
+    const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges );
 }
@@ -868,7 +868,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns(
     const Any&,
     const OUString&,
     const OUString& tableNamePattern,
-    const OUString& columnNamePattern) throw(SQLException, RuntimeException)
+    const OUString& columnNamePattern)
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
     Reference< XResultSet > xRef = pResult;
@@ -955,7 +955,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
     const Any&,
     const OUString&,
     const OUString&,
-    const Sequence< OUString >& types) throw(SQLException, RuntimeException)
+    const Sequence< OUString >& types)
 {
     ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables);
     Reference< XResultSet > xRef = pResult;
@@ -1015,20 +1015,20 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns(
     const Any&, const OUString&,
-    const OUString&, const OUString& ) throw(SQLException, RuntimeException)
+    const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns );
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures(
     const Any&, const OUString&,
-    const OUString& ) throw(SQLException, RuntimeException)
+    const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures );
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns(
-    const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& table )
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
     Reference< XResultSet > xRef = pResult;
@@ -1059,39 +1059,39 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns(
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys(
-    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys );
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys(
-    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys );
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys(
-    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys );
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getIndexInfo(
     const Any&, const OUString&, const OUString&,
-    sal_Bool, sal_Bool ) throw(SQLException, RuntimeException)
+    sal_Bool, sal_Bool )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo );
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getBestRowIdentifier(
     const Any&, const OUString&, const OUString&, sal_Int32,
-    sal_Bool ) throw(SQLException, RuntimeException)
+    sal_Bool )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier );
 }
 
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges(
-    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
 }
@@ -1099,12 +1099,12 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges(
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference(
     const Any&, const OUString&,
     const OUString&, const Any&,
-    const OUString&, const OUString& ) throw(SQLException, RuntimeException)
+    const OUString&, const OUString& )
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference );
 }
 
-Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& )
 {
     OSL_FAIL("Not implemented yet!");
     throw SQLException();
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 56eb1fd3498e..3ba29cca3fc3 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
@@ -48,155 +48,155 @@ namespace connectivity
 
             // this interface is really BIG
             // XDatabaseMetaData
-            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getUserName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getDatabaseProductName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getDriverName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getDriverVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getIdentifierQuoteString(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSQLKeywords(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getNumericFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getStringFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSystemFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSearchStringEscape(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSchemaTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getProcedureTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getCatalogTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isCatalogAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getCatalogSeparator(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsUnion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxStatements(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual OUString SAL_CALL getUserName(  ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductName(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductVersion(  ) override;
+            virtual OUString SAL_CALL getDriverName(  ) override;
+            virtual OUString SAL_CALL getDriverVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) override;
+            virtual OUString SAL_CALL getIdentifierQuoteString(  ) override;
+            virtual OUString SAL_CALL getSQLKeywords(  ) override;
+            virtual OUString SAL_CALL getNumericFunctions(  ) override;
+            virtual OUString SAL_CALL getStringFunctions(  ) override;
+            virtual OUString SAL_CALL getSystemFunctions(  ) override;
+            virtual OUString SAL_CALL getTimeDateFunctions(  ) override;
+            virtual OUString SAL_CALL getSearchStringEscape(  ) override;
+            virtual OUString SAL_CALL getExtraNameCharacters(  ) override;
+            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) override;
+            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) override;
+            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+            virtual OUString SAL_CALL getSchemaTerm(  ) override;
+            virtual OUString SAL_CALL getProcedureTerm(  ) override;
+            virtual OUString SAL_CALL getCatalogTerm(  ) override;
+            virtual sal_Bool SAL_CALL isCatalogAtStart(  ) override;
+            virtual OUString SAL_CALL getCatalogSeparator(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatements(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 8fe1333ea8a7..3b64c4c5c1e3 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -215,12 +215,12 @@ void MacabDriver::disposing()
 }
 // static ServiceInfo
 
-OUString MacabDriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString MacabDriver::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.sdbc.macab.Driver");
 }
 
-Sequence< OUString > MacabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > MacabDriver::getSupportedServiceNames_Static(  )
 {
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
@@ -229,22 +229,22 @@ Sequence< OUString > MacabDriver::getSupportedServiceNames_Static(  ) throw (Run
     return aSNS;
 }
 
-OUString SAL_CALL MacabDriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL MacabDriver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL MacabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL MacabDriver::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > SAL_CALL MacabDriver::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL MacabDriver::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
-Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -268,7 +268,6 @@ Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, con
 }
 
 sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url )
-        throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -279,33 +278,33 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url )
     return url == "sdbc:address:macab";
 }
 
-Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& )
 {
     // if you have something special to say, return it here :-)
     return Sequence< DriverPropertyInfo >();
 }
 
-sal_Int32 SAL_CALL MacabDriver::getMajorVersion(  ) throw(RuntimeException)
+sal_Int32 SAL_CALL MacabDriver::getMajorVersion(  )
 {
     return MACAB_DRIVER_VERSION_MAJOR;
 }
 
-sal_Int32 SAL_CALL MacabDriver::getMinorVersion(  ) throw(RuntimeException)
+sal_Int32 SAL_CALL MacabDriver::getMinorVersion(  )
 {
     return MACAB_DRIVER_VERSION_MINOR;
 }
 
-void SAL_CALL MacabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException)
+void SAL_CALL MacabDriver::queryTermination( const EventObject& )
 {
     // nothing to do, nothing to veto
 }
 
-void SAL_CALL MacabDriver::notifyTermination( const EventObject& ) throw (RuntimeException)
+void SAL_CALL MacabDriver::notifyTermination( const EventObject& )
 {
     m_aImplModule.shutdown();
 }
 
-void SAL_CALL MacabDriver::disposing( const EventObject& ) throw (RuntimeException)
+void SAL_CALL MacabDriver::disposing( const EventObject& )
 {
     // not interested in (this is the disposing of the desktop, if any)
 }
@@ -318,7 +317,7 @@ OUString MacabDriver::impl_getConfigurationSettingsPath()
     return aPath.makeStringAndClear();
 }
 
-Reference< XInterface >  SAL_CALL MacabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) throw( Exception )
+Reference< XInterface >  SAL_CALL MacabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory )
 {
     return *(new MacabDriver(comphelper::getComponentContext(_rxFactory)));
 }
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index e150afcac2e4..71e8c88f6a2c 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -119,13 +119,13 @@ namespace connectivity
 
         public:
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
             // XServiceInfo - static versions
             /// @throws css::uno::RuntimeException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
             /// @throws css::uno::RuntimeException
-            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
 
             css::uno::Reference< css::uno::XComponentContext > const &
             getComponentContext() const { return m_xContext; }
@@ -141,23 +141,23 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException) override;
+            virtual OUString SAL_CALL getImplementationName(  ) override;
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMajorVersion() throw(css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMinorVersion() throw(css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Int32 SAL_CALL getMajorVersion() override;
+            virtual sal_Int32 SAL_CALL getMinorVersion() override;
 
             // XTerminateListener
-            virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException) override;
+            virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override;
+            virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override;
 
             // XEventListener
-            virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override;
+            virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
         private:
             /** shuts down the library which contains the real implementations
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index 2b4cbd01271a..e7e770d2a8fe 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star::util;
 
 IMPLEMENT_SERVICE_INFO(MacabPreparedStatement, "com.sun.star.sdbc.drivers.MacabPreparedStatement", "com.sun.star.sdbc.PreparedStatement");
 
-void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException)
+void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams)
 {
     if ( !m_aParameterRow.is() )
         m_aParameterRow = new OValueVector();
@@ -46,7 +46,7 @@ void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(S
         (m_aParameterRow->get()).resize(nParams);
 }
 
-void MacabPreparedStatement::setMacabFields() const throw(SQLException)
+void MacabPreparedStatement::setMacabFields() const
 {
     ::rtl::Reference<connectivity::OSQLColumns> xColumns;   // selected columns
 
@@ -62,12 +62,12 @@ void MacabPreparedStatement::setMacabFields() const throw(SQLException)
     m_xMetaData->setMacabFields(xColumns);
 }
 
-void MacabPreparedStatement::resetParameters() const throw(SQLException)
+void MacabPreparedStatement::resetParameters() const
 {
     m_nParameterIndex = 0;
 }
 
-void MacabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException)
+void MacabPreparedStatement::getNextParameter(OUString &rParameter) const
 {
     if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size())
     {
@@ -110,7 +110,7 @@ void MacabPreparedStatement::disposing()
     }
 }
 
-Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() throw(SQLException, RuntimeException)
+Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
@@ -135,7 +135,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() t
     return xMetaData;
 }
 
-void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::close()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
@@ -153,7 +153,7 @@ void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeExcepti
     // list
 }
 
-sal_Bool SAL_CALL MacabPreparedStatement::execute() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabPreparedStatement::execute()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
@@ -163,7 +163,7 @@ sal_Bool SAL_CALL MacabPreparedStatement::execute() throw(SQLException, RuntimeE
     return xRS.is();
 }
 
-sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
@@ -172,7 +172,7 @@ sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, R
     return 0;
 }
 
-Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
@@ -180,7 +180,7 @@ Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() throw(
     return m_pConnection;
 }
 
-Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
@@ -190,7 +190,7 @@ Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() throw(SQ
     return rs;
 }
 
-void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
@@ -200,47 +200,47 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3
     (m_aParameterRow->get())[parameterIndex - 1].setNull();
 }
 
-void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setBoolean", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setByte", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setShort", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setInt", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setLong", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setFloat", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setDouble", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
@@ -250,38 +250,38 @@ void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const
     (m_aParameterRow->get())[parameterIndex - 1] = x;
 }
 
-void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setBytes", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setDate", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const css::util::Time&)
 {
 
     ::dbtools::throwFunctionNotSupportedSQLException("setTime", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x)
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
@@ -293,37 +293,37 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const
     }
 }
 
-void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setRef", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setBlob", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setClob", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&)
 {
     ::dbtools::throwFunctionNotSupportedSQLException("setArray", nullptr);
 }
 
-void SAL_CALL MacabPreparedStatement::clearParameters() throw(SQLException, RuntimeException)
+void SAL_CALL MacabPreparedStatement::clearParameters()
 {
     ::dbtools::throwFunctionNotSupportedSQLException("clearParameters", nullptr);
 }
 
-void MacabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
+void MacabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     switch (nHandle)
     {
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
index 312326edef23..a37c1b29a8a4 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
@@ -48,17 +48,17 @@ namespace connectivity
             OValueRow                       m_aParameterRow;
 
             /// @throws css::sdbc::SQLException
-            void checkAndResizeParameters(sal_Int32 nParams) throw(css::sdbc::SQLException);
+            void checkAndResizeParameters(sal_Int32 nParams);
             /// @throws css::sdbc::SQLException
-            void setMacabFields() const throw(css::sdbc::SQLException);
+            void setMacabFields() const;
 
         protected:
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                     sal_Int32 nHandle,
-                    const css::uno::Any& rValue) throw (css::uno::Exception) override;
+                    const css::uno::Any& rValue) override;
 
-            virtual void resetParameters() const throw(css::sdbc::SQLException) override;
-            virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException) override;
+            virtual void resetParameters() const override;
+            virtual void getNextParameter(OUString &rParameter) const override;
             virtual ~MacabPreparedStatement() override;
 
         public:
@@ -73,41 +73,41 @@ namespace connectivity
             using MacabCommonStatement::executeUpdate;
             using MacabCommonStatement::execute;
 
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) override;
+            virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
+            virtual sal_Bool SAL_CALL execute(  ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
 
             // XParameters
-            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+            virtual void SAL_CALL clearParameters(  ) override;
 
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL close(  ) override;
 
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index e0e09aea6a9d..505208f1b6f6 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -147,7 +147,7 @@ m_xStatement.clear();
 m_xMetaData.clear();
 }
 
-Any SAL_CALL MacabResultSet::queryInterface(const Type & rType) throw(RuntimeException)
+Any SAL_CALL MacabResultSet::queryInterface(const Type & rType)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     if (!aRet.hasValue())
@@ -165,7 +165,7 @@ void SAL_CALL MacabResultSet::release() throw()
     MacabResultSet_BASE::release();
 }
 
-Sequence<  Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException)
+Sequence<  Type > SAL_CALL MacabResultSet::getTypes()
 {
     OTypeCollection aTypes(
         cppu::UnoType<css::beans::XMultiPropertySet>::get(),
@@ -175,12 +175,12 @@ Sequence<  Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException)
     return comphelper::concatSequences(aTypes.getTypes(), MacabResultSet_BASE::getTypes());
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL MacabResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL MacabResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -202,7 +202,7 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw(
     return 0; // Never reached
 }
 
-OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -229,7 +229,7 @@ OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLExce
     return aRet;
 }
 
-sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -239,7 +239,7 @@ sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) throw(SQLException, Runt
     return false;
 }
 
-sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException)
+sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -250,7 +250,7 @@ sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) throw(SQLException, Runtime
     return nRet;
 }
 
-sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) throw(SQLException, RuntimeException)
+sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -261,7 +261,7 @@ sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) throw(SQLException, Runti
     return nRet;
 }
 
-sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -290,7 +290,7 @@ sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) throw(SQLExcept
     return nRet;
 }
 
-sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
+sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -319,7 +319,7 @@ sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) throw(SQLExcep
     return nRet;
 }
 
-float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
+float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -348,7 +348,7 @@ float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) throw(SQLExceptio
     return nVal;
 }
 
-double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
+double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -377,7 +377,7 @@ double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) throw(SQLExcept
     return nVal;
 }
 
-Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) throw(SQLException, RuntimeException)
+Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -387,7 +387,7 @@ Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) throw(SQLExcep
     return Sequence< sal_Int8 >();
 }
 
-Date SAL_CALL MacabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeException)
+Date SAL_CALL MacabResultSet::getDate(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -398,7 +398,7 @@ Date SAL_CALL MacabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeExce
     return aRet;
 }
 
-Time SAL_CALL MacabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeException)
+Time SAL_CALL MacabResultSet::getTime(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -409,7 +409,7 @@ Time SAL_CALL MacabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeExce
     return nRet;
 }
 
-DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
+DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -436,7 +436,7 @@ DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLE
     return nRet;
 }
 
-Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) throw(SQLException, RuntimeException)
+Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -446,7 +446,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) th
     return nullptr;
 }
 
-Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException)
+Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -456,7 +456,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32)
     return nullptr;
 }
 
-Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) throw(SQLException, RuntimeException)
+Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -466,7 +466,7 @@ Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::containe
     return Any();
 }
 
-Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException)
+Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -476,7 +476,7 @@ Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) throw(SQLException,
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException)
+Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -486,7 +486,7 @@ Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) throw(SQLExceptio
     return nullptr;
 }
 
-Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException)
+Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -496,7 +496,7 @@ Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) throw(SQLExceptio
     return nullptr;
 }
 
-Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException)
+Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -506,7 +506,7 @@ Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) throw(SQLExcept
     return nullptr;
 }
 
-Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() throw(SQLException, RuntimeException)
+Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -518,7 +518,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() throw(SQL
     return xMetaData;
 }
 
-sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::isBeforeFirst()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -529,7 +529,7 @@ sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() throw(SQLException, RuntimeExc
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSet::isAfterLast() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::isAfterLast()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -541,7 +541,7 @@ sal_Bool SAL_CALL MacabResultSet::isAfterLast() throw(SQLException, RuntimeExcep
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSet::isFirst() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::isFirst()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -552,7 +552,7 @@ sal_Bool SAL_CALL MacabResultSet::isFirst() throw(SQLException, RuntimeException
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSet::isLast() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::isLast()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -564,7 +564,7 @@ sal_Bool SAL_CALL MacabResultSet::isLast() throw(SQLException, RuntimeException)
     return false;
 }
 
-void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::beforeFirst()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -573,7 +573,7 @@ void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException
     m_nRowPos = -1;
 }
 
-void SAL_CALL MacabResultSet::afterLast() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::afterLast()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -583,7 +583,7 @@ void SAL_CALL MacabResultSet::afterLast() throw(SQLException, RuntimeException)
     m_nRowPos = nRecords;
 }
 
-void SAL_CALL MacabResultSet::close() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::close()
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -592,7 +592,7 @@ void SAL_CALL MacabResultSet::close() throw(SQLException, RuntimeException)
     dispose();
 }
 
-sal_Bool SAL_CALL MacabResultSet::first() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::first()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -605,7 +605,7 @@ sal_Bool SAL_CALL MacabResultSet::first() throw(SQLException, RuntimeException)
     return true;
 }
 
-sal_Bool SAL_CALL MacabResultSet::last() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::last()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -618,7 +618,7 @@ sal_Bool SAL_CALL MacabResultSet::last() throw(SQLException, RuntimeException)
     return true;
 }
 
-sal_Int32 SAL_CALL MacabResultSet::getRow() throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSet::getRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -626,7 +626,7 @@ sal_Int32 SAL_CALL MacabResultSet::getRow() throw(SQLException, RuntimeException
     return m_nRowPos;
 }
 
-sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -640,7 +640,7 @@ sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) throw(SQLException, Ru
     return true;
 }
 
-sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -648,7 +648,7 @@ sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) throw(SQLException, Ru
     return absolute(m_nRowPos + row);
 }
 
-sal_Bool SAL_CALL MacabResultSet::next() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::next()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -656,7 +656,7 @@ sal_Bool SAL_CALL MacabResultSet::next() throw(SQLException, RuntimeException)
     return absolute(m_nRowPos + 1);
 }
 
-sal_Bool SAL_CALL MacabResultSet::previous() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::previous()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -664,7 +664,7 @@ sal_Bool SAL_CALL MacabResultSet::previous() throw(SQLException, RuntimeExceptio
     return absolute(m_nRowPos - 1);
 }
 
-Reference< XInterface > SAL_CALL MacabResultSet::getStatement() throw(SQLException, RuntimeException)
+Reference< XInterface > SAL_CALL MacabResultSet::getStatement()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -673,7 +673,7 @@ Reference< XInterface > SAL_CALL MacabResultSet::getStatement() throw(SQLExcepti
     return xStatement;
 }
 
-sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::rowDeleted()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -681,7 +681,7 @@ sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeExcept
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::rowInserted()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -689,7 +689,7 @@ sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeExcep
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSet::rowUpdated() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::rowUpdated()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -697,7 +697,7 @@ sal_Bool SAL_CALL MacabResultSet::rowUpdated() throw(SQLException, RuntimeExcept
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSet::wasNull() throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::wasNull()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -705,22 +705,22 @@ sal_Bool SAL_CALL MacabResultSet::wasNull() throw(SQLException, RuntimeException
     return m_bWasNull;
 }
 
-void SAL_CALL MacabResultSet::cancel() throw(RuntimeException)
+void SAL_CALL MacabResultSet::cancel()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::clearWarnings() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::clearWarnings()
 {
 }
 
-Any SAL_CALL MacabResultSet::getWarnings() throw(SQLException, RuntimeException)
+Any SAL_CALL MacabResultSet::getWarnings()
 {
     return Any();
 }
 
-void SAL_CALL MacabResultSet::insertRow() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::insertRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -728,7 +728,7 @@ void SAL_CALL MacabResultSet::insertRow() throw(SQLException, RuntimeException)
     // you only have to implement this if you want to insert new rows
 }
 
-void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -736,19 +736,19 @@ void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException)
     // only when you allow updates
 }
 
-void SAL_CALL MacabResultSet::deleteRow() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::deleteRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::cancelRowUpdates()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::moveToInsertRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -756,122 +756,122 @@ void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcep
     // only when you allow inserts
 }
 
-void SAL_CALL MacabResultSet::moveToCurrentRow() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::moveToCurrentRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateNull(sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateBoolean(sal_Int32, sal_Bool)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateByte(sal_Int32, sal_Int8)
 {
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 }
 
-void SAL_CALL MacabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateShort(sal_Int32, sal_Int16)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateInt(sal_Int32, sal_Int32)
 {
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 }
 
-void SAL_CALL MacabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateLong(sal_Int32, sal_Int64)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateFloat(sal_Int32, float)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateDouble(sal_Int32, double)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateString(sal_Int32, const OUString&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateDate(sal_Int32, const Date&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateDate(sal_Int32, const Date&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateTime(sal_Int32, const css::util::Time&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateTimestamp(sal_Int32, const DateTime&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::refreshRow() throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::refreshRow()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateObject(sal_Int32, const Any&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
-void SAL_CALL MacabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException)
+void SAL_CALL MacabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
 
 // XRowLocate
-Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException,  RuntimeException)
+Any SAL_CALL MacabResultSet::getBookmark()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -892,7 +892,7 @@ Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException,  RuntimeExceptio
     return Any();
 }
 
-sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const  Any& bookmark) throw( SQLException,  RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const  Any& bookmark)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -919,7 +919,7 @@ sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const  Any& bookmark) throw( SQ
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const  Any& bookmark, sal_Int32 rows) throw( SQLException,  RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const  Any& bookmark, sal_Int32 rows)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -940,7 +940,7 @@ sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const  Any& bookmark, s
     return false;
 }
 
-sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const  Any& firstItem, const  Any& secondItem) throw( SQLException,  RuntimeException)
+sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const  Any& firstItem, const  Any& secondItem)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -955,12 +955,12 @@ sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const  Any& firstItem, const
     return CompareBookmark::EQUAL;
 }
 
-sal_Bool SAL_CALL MacabResultSet::hasOrderedBookmarks() throw( SQLException,  RuntimeException)
+sal_Bool SAL_CALL MacabResultSet::hasOrderedBookmarks()
 {
     return false;
 }
 
-sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const  Any& bookmark) throw( SQLException,  RuntimeException)
+sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const  Any& bookmark)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -971,7 +971,7 @@ sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const  Any& bookmark) throw( SQL
 }
 
 // XDeleteRows
-Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const  Sequence<  Any >&) throw( SQLException,  RuntimeException)
+Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const  Sequence<  Any >&)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
@@ -1015,7 +1015,6 @@ sal_Bool MacabResultSet::convertFastPropertyValue(
             Any &,
             sal_Int32 nHandle,
             const Any& )
-                throw (css::lang::IllegalArgumentException)
 {
     switch (nHandle)
     {
@@ -1036,7 +1035,6 @@ sal_Bool MacabResultSet::convertFastPropertyValue(
 void MacabResultSet::setFastPropertyValue_NoBroadcast(
             sal_Int32 nHandle,
             const Any& )
-                 throw (Exception)
 {
     switch (nHandle)
     {
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 086588554fed..418a66c1f5b6 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
@@ -76,12 +76,10 @@ namespace connectivity
                                 css::uno::Any & rConvertedValue,
                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue)
-                                    throw (css::lang::IllegalArgumentException) override;
+                                const css::uno::Any& rValue) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue)
-                                    throw (css::uno::Exception) override;
+                                const css::uno::Any& rValue) override;
             virtual void SAL_CALL getFastPropertyValue(
                                 css::uno::Any& rValue,
                                 sal_Int32 nHandle) const override;
@@ -108,110 +106,110 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
 
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
 
             // XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
             // XResultSet
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
 
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
 
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException) override;
+            virtual void SAL_CALL cancel(  ) override;
 
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL close(  ) override;
 
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
 
             // XResultSetUpdate
-            virtual void SAL_CALL insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL insertRow(  ) override;
+            virtual void SAL_CALL updateRow(  ) override;
+            virtual void SAL_CALL deleteRow(  ) override;
+            virtual void SAL_CALL cancelRowUpdates(  ) override;
+            virtual void SAL_CALL moveToInsertRow(  ) override;
+            virtual void SAL_CALL moveToCurrentRow(  ) override;
             // XRowUpdate
-            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
 
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
             // XRowLocate
-            virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) override;
+            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
 
             // XDeleteRows
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 3436e3df0349..65ff01364635 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -41,7 +41,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData()
 {
 }
 
-void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
+void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns)
 {
     OSQLColumns::Vector::const_iterator aIter;
     static const char aName[] = "Name";
@@ -70,13 +70,13 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity:
 
 }
 
-sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 /* column */) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 /* column */)
 {
     // For now, all columns are the same size.
     return 50;
 }
 
-sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column)
 {
     MacabRecords *aRecords;
     MacabHeader *aHeader;
@@ -102,22 +102,22 @@ sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column) throw
     return ABTypeToDataType(aField->type);
 }
 
-sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnCount()
 {
     return m_aMacabFields.size();
 }
 
-sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32)
 {
     return true;
 }
 
-OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32)
 {
     return OUString();
 }
 
-OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column)
 {
     sal_uInt32 nFieldNumber = m_aMacabFields[column - 1];
     MacabRecords *aRecords;
@@ -137,77 +137,77 @@ OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(
     return aName;
 }
 
-OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32)
 {
     return m_sTableName;
 }
 
-OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32)
 {
     return OUString();
 }
 
-OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32)
 {
     return OUString();
 }
 
-OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32)
 {
     return OUString();
 }
 
-OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32)
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL MacabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSetMetaData::isCurrency(sal_Int32)
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSetMetaData::isAutoIncrement(sal_Int32) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSetMetaData::isAutoIncrement(sal_Int32)
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSetMetaData::isSigned(sal_Int32) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSetMetaData::isSigned(sal_Int32)
 {
     return false;
 }
 
-sal_Int32 SAL_CALL MacabResultSetMetaData::getPrecision(sal_Int32) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSetMetaData::getPrecision(sal_Int32)
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL MacabResultSetMetaData::getScale(sal_Int32) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+sal_Int32 SAL_CALL MacabResultSetMetaData::getScale(sal_Int32)
 {
     return 0;
 }
 
-sal_Int32 SAL_CALL MacabResultSetMetaData::isNullable(sal_Int32) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSetMetaData::isNullable(sal_Int32)
 {
     return (sal_Int32) true;
 }
 
-sal_Bool SAL_CALL MacabResultSetMetaData::isSearchable(sal_Int32) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSetMetaData::isSearchable(sal_Int32)
 {
     return true;
 }
 
-sal_Bool SAL_CALL MacabResultSetMetaData::isReadOnly(sal_Int32) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSetMetaData::isReadOnly(sal_Int32)
 {
     return true;
 }
 
-sal_Bool SAL_CALL MacabResultSetMetaData::isDefinitelyWritable(sal_Int32) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSetMetaData::isDefinitelyWritable(sal_Int32)
 {
     return false;
 }
 
-sal_Bool SAL_CALL MacabResultSetMetaData::isWritable(sal_Int32) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL MacabResultSetMetaData::isWritable(sal_Int32)
 {
     return false;
 }
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index cc7ccf38b36c..ac795313484a 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
@@ -55,31 +55,31 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             void setMacabFields(
-                const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException);
+                const ::rtl::Reference<connectivity::OSQLColumns> &xColumns);
             inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
                 { return m_aMacabFields[columnIndex - 1]; }
 
-            virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 40b0397d63b9..721bbe36c087 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -72,16 +72,16 @@ MacabCommonStatement::~MacabCommonStatement()
 {
 }
 
-void MacabCommonStatement::resetParameters() const throw(css::sdbc::SQLException)
+void MacabCommonStatement::resetParameters() const
 {
 }
 
-void MacabCommonStatement::getNextParameter(OUString &) const throw(css::sdbc::SQLException)
+void MacabCommonStatement::getNextParameter(OUString &) const
 {
     impl_throwError(STR_PARA_ONLY_PREPARED);
 }
 
-MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException)
+MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const
 {
     if (pParseNode->count() == 3)
     {
@@ -226,7 +226,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP
     return nullptr;
 }
 
-MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const throw(SQLException)
+MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const
 {
     if (SQL_ISRULE(pParseNode, ordering_spec_commalist))
     {
@@ -286,7 +286,7 @@ OUString MacabCommonStatement::getTableName() const
     return xTabs.begin()->first;
 }
 
-void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(SQLException)
+void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const
 {
     ::rtl::Reference<connectivity::OSQLColumns> xColumns;   // selected columns
     MacabResultSetMetaData *pMeta;              // meta information - holds the list of AddressBook fields
@@ -304,7 +304,7 @@ void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(S
     pMeta->setMacabFields(xColumns);
 }
 
-void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQLException)
+void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const
 {
     const OSQLParseNode *pParseNode;
 
@@ -329,7 +329,7 @@ void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQ
     pResult->allMacabRecords();
 }
 
-void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const throw(SQLException)
+void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const
 {
     const OSQLParseNode *pParseNode;
 
@@ -346,7 +346,7 @@ void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const throw(SQLE
     }
 }
 
-Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType )
 {
     Any aRet = MacabCommonStatement_BASE::queryInterface(rType);
     if (!aRet.hasValue())
@@ -354,7 +354,7 @@ Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(Ru
     return aRet;
 }
 
-Sequence< Type > SAL_CALL MacabCommonStatement::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL MacabCommonStatement::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
                                     cppu::UnoType<XFastPropertySet>::get(),
@@ -363,7 +363,7 @@ Sequence< Type > SAL_CALL MacabCommonStatement::getTypes(  ) throw(RuntimeExcept
     return comphelper::concatSequences(aTypes.getTypes(),MacabCommonStatement_BASE::getTypes());
 }
 
-void SAL_CALL MacabCommonStatement::cancel(  ) throw(RuntimeException)
+void SAL_CALL MacabCommonStatement::cancel(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -371,7 +371,7 @@ void SAL_CALL MacabCommonStatement::cancel(  ) throw(RuntimeException)
     // cancel the current sql statement
 }
 
-void SAL_CALL MacabCommonStatement::close(  ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabCommonStatement::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -382,7 +382,7 @@ void SAL_CALL MacabCommonStatement::close(  ) throw(SQLException, RuntimeExcepti
 }
 
 sal_Bool SAL_CALL MacabCommonStatement::execute(
-        const OUString& sql ) throw(SQLException, RuntimeException)
+        const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -393,7 +393,7 @@ sal_Bool SAL_CALL MacabCommonStatement::execute(
 }
 
 Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery(
-        const OUString& sql ) throw(SQLException, RuntimeException)
+        const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -450,7 +450,7 @@ Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery(
     return xRS;
 }
 
-Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection(  ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -459,7 +459,7 @@ Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection(  ) throw(
     return m_pConnection;
 }
 
-sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -468,7 +468,7 @@ sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw(
     return 0;
 }
 
-Any SAL_CALL MacabCommonStatement::getWarnings(  ) throw(SQLException, RuntimeException)
+Any SAL_CALL MacabCommonStatement::getWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -476,7 +476,7 @@ Any SAL_CALL MacabCommonStatement::getWarnings(  ) throw(SQLException, RuntimeEx
     return makeAny(m_aLastWarning);
 }
 
-void SAL_CALL MacabCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeException)
+void SAL_CALL MacabCommonStatement::clearWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -524,14 +524,14 @@ sal_Bool MacabCommonStatement::convertFastPropertyValue(
         Any &,
         Any &,
         sal_Int32,
-        const Any&) throw (css::lang::IllegalArgumentException)
+        const Any&)
 {
     bool bConverted = false;
     // here we have to try to convert
     return bConverted;
 }
 
-void MacabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception)
+void MacabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&)
 {
     // set the value to whatever is necessary
     switch (nHandle)
@@ -580,7 +580,7 @@ void SAL_CALL MacabCommonStatement::release() throw()
     MacabCommonStatement_BASE::release();
 }
 
-Reference< css::beans::XPropertySetInfo > SAL_CALL MacabCommonStatement::getPropertySetInfo(  ) throw(RuntimeException)
+Reference< css::beans::XPropertySetInfo > SAL_CALL MacabCommonStatement::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index 0d2f4c2e9664..ff80b2b4bf79 100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -66,17 +66,17 @@ namespace connectivity
         protected:
             /// @throws css::sdbc::SQLException
             class MacabCondition *analyseWhereClause(
-                const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException);
+                const OSQLParseNode *pParseNode) const;
             /// @throws css::sdbc::SQLException
             class MacabOrder *analyseOrderByClause(
-                const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException);
+                const OSQLParseNode *pParseNode) const;
             OUString getTableName( ) const;
             /// @throws css::sdbc::SQLException
-            void setMacabFields(class MacabResultSet *pResult) const throw(css::sdbc::SQLException);
+            void setMacabFields(class MacabResultSet *pResult) const;
             /// @throws css::sdbc::SQLException
-            void selectRecords(MacabResultSet *pResult) const throw(css::sdbc::SQLException);
+            void selectRecords(MacabResultSet *pResult) const;
             /// @throws css::sdbc::SQLException
-            void sortRecords(MacabResultSet *pResult) const throw(css::sdbc::SQLException);
+            void sortRecords(MacabResultSet *pResult) const;
 
             // OPropertyArrayUsageHelper
             virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
@@ -87,18 +87,18 @@ namespace connectivity
                     css::uno::Any & rConvertedValue,
                     css::uno::Any & rOldValue,
                     sal_Int32 nHandle,
-                    const css::uno::Any& rValue) throw (css::lang::IllegalArgumentException) override;
+                    const css::uno::Any& rValue) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                     sal_Int32 nHandle,
-                    const css::uno::Any& rValue) throw (css::uno::Exception) override;
+                    const css::uno::Any& rValue) override;
             virtual void SAL_CALL getFastPropertyValue(
                     css::uno::Any& rValue,
                     sal_Int32 nHandle) const override;
 
             /// @throws css::sdbc::SQLException
-            virtual void resetParameters() const throw(css::sdbc::SQLException);
+            virtual void resetParameters() const;
             /// @throws css::sdbc::SQLException
-            virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException);
+            virtual void getNextParameter(OUString &rParameter) const;
             virtual ~MacabCommonStatement() override;
 
         public:
@@ -115,39 +115,39 @@ namespace connectivity
             virtual void SAL_CALL acquire() throw() override;
             virtual css::uno::Any SAL_CALL queryInterface(
                     const css::uno::Type & rType
-                    ) throw(css::uno::RuntimeException, std::exception) override;
+                    ) override;
 
             // XTypeProvider
             virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(
-                    ) throw(css::uno::RuntimeException, std::exception) override;
+                    ) override;
 
             // XPropertySet
             virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(
-                    ) throw(css::uno::RuntimeException) override;
+                    ) override;
 
             // XStatement
             virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(
-                    const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+                    const OUString& sql ) override;
             virtual sal_Int32 SAL_CALL executeUpdate(
-                     const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+                     const OUString& sql ) override;
             virtual sal_Bool SAL_CALL execute(
-                    const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+                    const OUString& sql ) override;
             virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(
-                    ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+                    ) override;
 
             // XWarningsSupplier
             virtual css::uno::Any SAL_CALL getWarnings(
-                    ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+                    ) override;
             virtual void SAL_CALL clearWarnings(
-                    ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+                    ) override;
 
             // XCancellable
             virtual void SAL_CALL cancel(
-                    ) throw(css::uno::RuntimeException) override;
+                    ) override;
 
             // XCloseable
             virtual void SAL_CALL close(
-                    ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+                    ) override;
 
             // other methods
             inline MacabConnection* getOwnConnection() const { return m_pConnection; }
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index a97c034df9d1..5a6e37927365 100644
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -66,7 +66,7 @@ sdbcx::ObjectType MacabTables::createObject(const OUString& _rName)
     return xRet;
 }
 
-void MacabTables::impl_refresh(  ) throw(RuntimeException)
+void MacabTables::impl_refresh(  )
 {
     static_cast<MacabCatalog&>(m_rParent).refreshTables();
 }
diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx
index 926eec0d0370..849e3e0f2634 100644
--- a/connectivity/source/drivers/macab/MacabTables.hxx
+++ b/connectivity/source/drivers/macab/MacabTables.hxx
@@ -33,7 +33,7 @@ namespace connectivity
 
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
 
         public:
             MacabTables(
diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx
index c0f10a77b79f..0d1d20227a42 100644
--- a/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/connectivity/source/drivers/macab/macabcondition.cxx
@@ -51,7 +51,7 @@ bool MacabConditionConstant::eval(const MacabRecord *) const
     return m_bValue;
 }
 
-MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName) throw(SQLException)
+MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName)
     : MacabCondition(),
       m_nFieldNumber(header->getColumnNumber(sColumnName))
 {
@@ -69,7 +69,7 @@ bool MacabConditionColumn::isAlwaysFalse() const
     return false;
 }
 
-MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException)
+MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName)
     : MacabConditionColumn(header, sColumnName)
 {
 }
@@ -86,7 +86,7 @@ bool MacabConditionNull::eval(const MacabRecord *aRecord) const
         return false;
 }
 
-MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException)
+MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName)
     : MacabConditionColumn(header, sColumnName)
 {
 }
@@ -103,13 +103,13 @@ bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const
         return true;
 }
 
-MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
+MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString)
     : MacabConditionColumn(header, sColumnName),
       m_sMatchString(sMatchString)
 {
 }
 
-MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
+MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString)
     : MacabConditionCompare(header, sColumnName, sMatchString)
 {
 }
@@ -132,7 +132,7 @@ bool MacabConditionEqual::eval(const MacabRecord *aRecord) const
     return nReturn == 0;
 }
 
-MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
+MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString)
     : MacabConditionCompare(header, sColumnName, sMatchString)
 {
 }
@@ -155,7 +155,7 @@ bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const
     return nReturn != 0;
 }
 
-MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
+MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString)
     : MacabConditionCompare(header, sColumnName, sMatchString)
 {
 }
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
index 24a5a32c57cc..3f6ce867a801 100644
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
@@ -61,7 +61,7 @@ class MacabConditionColumn : public MacabCondition
         /// @throws css::sdbc::SQLException
         MacabConditionColumn(
             const MacabHeader *header,
-            const OUString &sColumnName) throw(css::sdbc::SQLException);
+            const OUString &sColumnName);
         virtual bool isAlwaysTrue() const override;
         virtual bool isAlwaysFalse() const override;
 };
@@ -72,7 +72,7 @@ class MacabConditionNull : public MacabConditionColumn
         /// @throws css::sdbc::SQLException
         MacabConditionNull(
             const MacabHeader *header,
-            const OUString &sColumnName) throw(css::sdbc::SQLException);
+            const OUString &sColumnName);
         virtual bool eval(const MacabRecord *aRecord) const override;
 };
 
@@ -82,7 +82,7 @@ class MacabConditionNotNull : public MacabConditionColumn
         /// @throws css::sdbc::SQLException
         MacabConditionNotNull(
             const MacabHeader *header,
-            const OUString &sColumnName) throw(css::sdbc::SQLException);
+            const OUString &sColumnName);
         virtual bool eval(const MacabRecord *aRecord) const override;
 };
 
@@ -96,7 +96,7 @@ class MacabConditionCompare : public MacabConditionColumn
         MacabConditionCompare(
             const MacabHeader *header,
             const OUString &sColumnName,
-            const OUString &sMatchString) throw(css::sdbc::SQLException);
+            const OUString &sMatchString);
 };
 
 class MacabConditionEqual : public MacabConditionCompare
@@ -106,7 +106,7 @@ class MacabConditionEqual : public MacabConditionCompare
         MacabConditionEqual(
             const MacabHeader *header,
             const OUString &sColumnName,
-            const OUString &sMatchString) throw(css::sdbc::SQLException);
+            const OUString &sMatchString);
         virtual bool eval(const MacabRecord *aRecord) const override;
 };
 
@@ -117,7 +117,7 @@ class MacabConditionDifferent : public MacabConditionCompare
         MacabConditionDifferent(
             const MacabHeader *header,
             const OUString &sColumnName,
-            const OUString &sMatchString) throw(css::sdbc::SQLException);
+            const OUString &sMatchString);
         virtual bool eval(const MacabRecord *aRecord) const override;
 };
 
@@ -128,7 +128,7 @@ class MacabConditionSimilar : public MacabConditionCompare
         MacabConditionSimilar(
             const MacabHeader *header,
             const OUString &sColumnName,
-            const OUString &sMatchString) throw(css::sdbc::SQLException);
+            const OUString &sMatchString);
         virtual bool eval(const MacabRecord *aRecord) const override;
 };
 
diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx
index d8b81ef270cd..c9f8d759b17b 100644
--- a/connectivity/source/drivers/mork/MCatalog.cxx
+++ b/connectivity/source/drivers/mork/MCatalog.cxx
@@ -76,7 +76,7 @@ void OCatalog::refreshUsers()
 
 
 // XTablesSupplier
-Reference< XNameAccess > SAL_CALL OCatalog::getTables(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OCatalog::getTables(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx
index 5f4b8245369f..5f5f817e78c8 100644
--- a/connectivity/source/drivers/mork/MCatalog.hxx
+++ b/connectivity/source/drivers/mork/MCatalog.hxx
@@ -38,7 +38,7 @@ namespace connectivity
             virtual void refreshViews() override ;
             virtual void refreshGroups() override;
             virtual void refreshUsers() override ;
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) override;
         public:
             explicit OCatalog(OConnection* _pCon);
 
diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx
index 8691376d1d70..b5f791f2bbb4 100644
--- a/connectivity/source/drivers/mork/MColumns.cxx
+++ b/connectivity/source/drivers/mork/MColumns.cxx
@@ -71,7 +71,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
 }
 
 
-void OColumns::impl_refresh() throw(RuntimeException)
+void OColumns::impl_refresh()
 {
     m_pTable->refreshColumns();
 }
diff --git a/connectivity/source/drivers/mork/MColumns.hxx b/connectivity/source/drivers/mork/MColumns.hxx
index b49d0266c8d0..4f828ead53f4 100644
--- a/connectivity/source/drivers/mork/MColumns.hxx
+++ b/connectivity/source/drivers/mork/MColumns.hxx
@@ -35,7 +35,7 @@ namespace connectivity
             OTable* m_pTable;
 
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
         public:
             OColumns(   OTable* _pTable,
                         ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 4a58a4ed257e..3dd4b2bef429 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -61,7 +61,7 @@ void SAL_CALL OConnection::release() throw()
 }
 
 
-void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
+void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
 {
     (void) info; // avoid warnings
     SAL_INFO("connectivity.mork", "=> OConnection::construct()" );
@@ -176,7 +176,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
 IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mork.OConnection", "com.sun.star.sdbc.Connection")
 
 
-Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL OConnection::createStatement(  )
 {
     SAL_INFO("connectivity.mork", "=> OConnection::createStatement()" );
 
@@ -190,7 +190,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql )
 {
     SAL_INFO("connectivity.mork", "=> OConnection::prepareStatement()" );
     SAL_INFO("connectivity.mork", "OConnection::prepareStatement( " << _sSql << " )");
@@ -209,7 +209,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql )
 {
     SAL_INFO("connectivity.mork", "=> OConnection::prepareCall()" );
     SAL_INFO("connectivity.mork", "sql: " << _sSql);
@@ -218,7 +218,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin
     return nullptr;
 }
 
-OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql )
 {
     SAL_INFO("connectivity.mork", "=> OConnection::nativeSQL()" );
     SAL_INFO("connectivity.mork", "sql: " << _sSql);
@@ -230,12 +230,12 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLExcep
     return _sSql;
 }
 
-void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setAutoCommit", *this );
 }
 
-sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnection::getAutoCommit(  )
 {
     // you have to distinguish which if you are in autocommit mode or not
     // at normal case true should be fine here
@@ -243,17 +243,17 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
     return true;
 }
 
-void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::commit(  )
 {
     // when you database does support transactions you should commit here
 }
 
-void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::rollback(  )
 {
     // same as commit but for the other case
 }
 
-sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnection::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -261,7 +261,7 @@ sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException
     return OConnection_BASE::rBHelper.bDisposed;
 }
 
-Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  )
 {
     SAL_INFO("connectivity.mork", "=> OConnection::getMetaData()" );
 
@@ -280,51 +280,51 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
     return xMetaData;
 }
 
-void SAL_CALL OConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setReadOnly( sal_Bool /*readOnly*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setReadOnly", *this );
 }
 
-sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnection::isReadOnly(  )
 {
     // return if your connection to readonly
     return false;
 }
 
-void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setCatalog", *this );
 }
 
-OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OConnection::getCatalog(  )
 {
     return OUString();
 }
 
-void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTransactionIsolation", *this );
 }
 
-sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  )
 {
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
     return TransactionIsolation::NONE;
 }
 
-Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  )
 {
     // if your driver has special database types you can return it here
     return nullptr;
 }
 
-void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this );
 }
 
 // XCloseable
-void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::close(  )
 {
     // we just dispose us
     {
@@ -336,13 +336,13 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException, std::
 }
 
 // XWarningsSupplier
-Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OConnection::getWarnings(  )
 {
     // when you collected some warnings -> return it
     return Any();
 }
 
-void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::clearWarnings(  )
 {
     // you should clear your collected warnings here
 }
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index d7364c3e908b..37606ea0387b 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -49,7 +49,7 @@ namespace connectivity
 
         public:
             /// @throws css::sdbc::SQLException
-            void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException);
+            void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info);
             explicit OConnection(MorkDriver* const driver);
             virtual ~OConnection() override;
 
@@ -64,29 +64,29 @@ namespace connectivity
             // XServiceInfo
             DECLARE_SERVICE_INFO();
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+            virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+            virtual void SAL_CALL commit(  ) override;
+            virtual void SAL_CALL rollback(  ) override;
+            virtual sal_Bool SAL_CALL isClosed(  ) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+            virtual OUString SAL_CALL getCatalog(  ) override;
+            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings() override;
 
             const OColumnAlias & getColumnAlias() const   { return m_aColumnAlias; }
 
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 9dfdcc364d43..5bb771428786 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -51,7 +51,7 @@ ODatabaseMetaData::~ODatabaseMetaData()
 
 ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
         const OUString& tableNamePattern,
-        const OUString& columnNamePattern ) throw(SQLException)
+        const OUString& columnNamePattern )
 {
     SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getColumnRows()" );
     SAL_INFO("connectivity.mork", "tableNamePattern: " << tableNamePattern);
@@ -143,55 +143,55 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
     return OUString();
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     sal_Int32 nValue = 65535; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  )
 {
     sal_Int32 nValue = 254; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  )
 {
     sal_Int32 nValue = 20; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
@@ -202,7 +202,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
@@ -215,17 +215,17 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  )
 {
     return false;
 }
@@ -235,17 +235,17 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  )
 {
     return false;
 }
@@ -260,18 +260,18 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
     return false;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  )
 {
     return false;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  )
 {
     OUString aVal;
     return aVal;
@@ -283,13 +283,13 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
     return OUString( "\"");
 }
 
-OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  )
 {
     OUString aVal;
     return aVal;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     return true;
 }
@@ -299,58 +299,58 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  )
 {
     //We support create table
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ )
 {
     return false;
 }
@@ -360,22 +360,22 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     return true; // should be supported at least
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  )
 {
     return false;
 }
@@ -390,7 +390,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  )
 {
     return false;
 }
@@ -400,55 +400,55 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  )
 {
     return 0;// 0 means no limit
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  )
 {
     // We allow you to select from any table.
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  )
 {
     //we support insert/update/delete now
     //But we have to set this to return sal_True otherwise the UI will add create "table/edit table"
@@ -456,93 +456,93 @@ sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeE
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  )
 {
     // Support added for this.
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  )
 {
     return true;
 }
@@ -553,277 +553,277 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     return false;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getURL(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_pConnection->getURL();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getUserName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDriverName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion()
 {
     OUString aValue = OUString::number(1);
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  )
 {
     OUString aValue = OUString::number(0);
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  )
 {
     OUString aValue;
     return aValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  )
 {
     return TransactionIsolation::NONE;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  )
 {
     return 0;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  )
 {
     OUString aValue;
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  )
 {
     return OUString();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  )
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  )
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ )
 {
     return true;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  )
 {
     return false;
 }
@@ -833,7 +833,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException
 // of course you could implement it on your and you should do this because
 // the general way is more memory expensive
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  )
 {
     // there exists no possibility to get table types so we have to check
     static const OUStringLiteral sTableTypes[] =
@@ -908,7 +908,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
-    const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& columnNamePattern )
 {
     // this returns an empty resultset where the column-names are already set
     // in special the metadata of the resultset already returns the right columns
@@ -920,7 +920,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/,
-    const OUString& tableNamePattern, const Sequence< OUString >& /*types*/ ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& tableNamePattern, const Sequence< OUString >& /*types*/ )
 {
     SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTables()" );
     // this returns an empty resultset where the column-names are already set
@@ -945,7 +945,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
-    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern )
 {
     SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTablePrivileges()" );
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges);
@@ -1003,7 +1003,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     return xRef;
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ )
 {
     return nullptr;
 }
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
index 10fb2c478a0e..7673227fad10 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
@@ -28,7 +28,7 @@ namespace connectivity
                                        m_pMetaDataHelper;
 
             /// @throws css::sdbc::SQLException
-            ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw( css::sdbc::SQLException );
+            ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern );
 
         protected:
             virtual ~ODatabaseMetaData() override;
@@ -55,131 +55,131 @@ namespace connectivity
 
             // as I mentioned before this interface is really BIG
             // XDatabaseMetaData
-            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getUserName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSQLKeywords(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getNumericFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getStringFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSystemFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSearchStringEscape(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSchemaTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getProcedureTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-
-            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual OUString SAL_CALL getUserName(  ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductName(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductVersion(  ) override;
+            virtual OUString SAL_CALL getDriverName(  ) override;
+            virtual OUString SAL_CALL getDriverVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
+            virtual OUString SAL_CALL getSQLKeywords(  ) override;
+            virtual OUString SAL_CALL getNumericFunctions(  ) override;
+            virtual OUString SAL_CALL getStringFunctions(  ) override;
+            virtual OUString SAL_CALL getSystemFunctions(  ) override;
+            virtual OUString SAL_CALL getTimeDateFunctions(  ) override;
+            virtual OUString SAL_CALL getSearchStringEscape(  ) override;
+            virtual OUString SAL_CALL getExtraNameCharacters(  ) override;
+            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+            virtual OUString SAL_CALL getSchemaTerm(  ) override;
+            virtual OUString SAL_CALL getProcedureTerm(  ) override;
+            virtual OUString SAL_CALL getCatalogTerm(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
+
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+
+            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
+
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx
index 16180de53257..a45f149f6a33 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -29,19 +29,16 @@ MorkDriver::MorkDriver(const css::uno::Reference< css::uno::XComponentContext >&
 }
 
 OUString SAL_CALL MorkDriver::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString(MORK_DRIVER_IMPL_NAME);
 }
 
 sal_Bool SAL_CALL MorkDriver::supportsService(const OUString& serviceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.sdbc.Driver" };
 }
@@ -49,7 +46,6 @@ css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames()
 css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect(
     OUString const & url,
     css::uno::Sequence< css::beans::PropertyValue > const & info)
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.mork", "=> MorkDriver::connect()" );
 
@@ -81,7 +77,6 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect(
 }
 
 sal_Bool MorkDriver::acceptsURL(OUString const & url)
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("connectivity.mork", "=> MorkDriver::acceptsURL()" );
     // Skip 'sdbc:mozab: part of URL
@@ -119,19 +114,18 @@ sal_Bool MorkDriver::acceptsURL(OUString const & url)
 css::uno::Sequence< css::sdbc::DriverPropertyInfo > MorkDriver::getPropertyInfo(
     OUString const & url,
     css::uno::Sequence< css::beans::PropertyValue > const & info)
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     //... TODO
     (void) url; (void) info; // avoid warnings
     return css::uno::Sequence< css::sdbc::DriverPropertyInfo >();
 }
 
-sal_Int32 MorkDriver::getMajorVersion() throw (css::uno::RuntimeException, std::exception) {
+sal_Int32 MorkDriver::getMajorVersion() {
     //... TODO
     return 0;
 }
 
-sal_Int32 MorkDriver::getMinorVersion() throw (css::uno::RuntimeException, std::exception) {
+sal_Int32 MorkDriver::getMinorVersion() {
     //... TODO
     return 0;
 }
diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx
index e17b5ed7950d..7d598f26ab04 100644
--- a/connectivity/source/drivers/mork/MDriver.hxx
+++ b/connectivity/source/drivers/mork/MDriver.hxx
@@ -44,35 +44,28 @@ private:
 
     virtual ~MorkDriver() 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;
+    getSupportedServiceNames() override;
 
     virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect(
         OUString const & url,
-        css::uno::Sequence< css::beans::PropertyValue > const & info)
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< css::beans::PropertyValue > const & info) override;
 
     virtual sal_Bool SAL_CALL acceptsURL(
-        OUString const & url)
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        OUString const & url) override;
 
     virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL
     getPropertyInfo(
         OUString const & url,
-        css::uno::Sequence< css::beans::PropertyValue > const & info)
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< css::beans::PropertyValue > const & info) override;
 
-    virtual sal_Int32 SAL_CALL getMajorVersion()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getMajorVersion() override;
 
-    virtual sal_Int32 SAL_CALL getMinorVersion()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getMinorVersion() override;
 
     css::uno::Reference< css::uno::XComponentContext > context_;
     css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 51f1dd2e8e5d..82a7a3aac69c 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -57,7 +57,6 @@ void SAL_CALL OPreparedStatement::disposing()
 }
 
 OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , bool bAdjusted )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     StatementType eStatementType = OCommonStatement::parseSql( sql, bAdjusted );
     if ( eStatementType != eSelect )
@@ -107,7 +106,7 @@ void SAL_CALL OPreparedStatement::release() throw()
     OCommonStatement::release();
 }
 
-Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType )
 {
     Any aRet = OCommonStatement::queryInterface(rType);
     if(!aRet.hasValue())
@@ -115,13 +114,13 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
     return aRet;
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  )
 {
     return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes());
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -139,7 +138,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
 }
 
 
-sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OPreparedStatement::execute(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -149,14 +148,14 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
 }
 
 
-sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XStatement::executeUpdate", *this );
     return 0;
 }
 
 
-void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -165,7 +164,7 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS
 }
 
 
-Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -174,7 +173,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
 }
 
 
-Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -185,60 +184,60 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
 }
 
 
-void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBoolean", *this );
 }
 
-void SAL_CALL OPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setByte", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setDate", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTime", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTimestamp", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setDouble", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setFloat", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setInt", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setLong", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -249,77 +248,77 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /
 }
 
 
-void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setClob", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setArray", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setRef", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setObjectWithInfo", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ )
 {
     setNull(parameterIndex,sqlType);
 }
 
 
-void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x )
 {
     ::dbtools::implSetObject(this,parameterIndex,x);
 }
 
 
-void SAL_CALL OPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setShort", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBytes", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setCharacterStream", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBinaryStream", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::clearParameters(  )
 {
 }
 
-void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception)
+void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     switch(nHandle)
     {
@@ -468,17 +467,17 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
 
-css::uno::Reference< css::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet(  )
 {
     return nullptr;
 }
 
-sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount(  )
 {
     return 0;
 }
 
-sal_Bool SAL_CALL OPreparedStatement::getMoreResults(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OPreparedStatement::getMoreResults(  )
 {
     return false;
 }
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index 3fa14ef8da0a..bb4d2772326f 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -50,15 +50,14 @@ namespace connectivity
 
         protected:
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
-                                                                   const css::uno::Any& rValue)
-                                                                        throw (css::uno::Exception, std::exception) override;
+                                                                   const css::uno::Any& rValue) override;
             virtual ~OPreparedStatement() override;
 
             virtual void SAL_CALL disposing() override;
 
             // OCommonStatement overridables
             virtual StatementType
-                            parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+                            parseSql( const OUString& sql , bool bAdjusted = false) override;
             virtual void    initializeResultSet( OResultSet* _pResult ) override;
             virtual void    clearCachedResultSet() override;
             virtual void    cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ) override;
@@ -80,47 +79,47 @@ namespace connectivity
             void lateInit();
 
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPreparedStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) override;
+            virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
+            virtual sal_Bool SAL_CALL execute(  ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
             // XParameters
-            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+            virtual void SAL_CALL clearParameters(  ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XMultipleResults
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getUpdateCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getMoreResults(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+            virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+            virtual sal_Bool SAL_CALL getMoreResults(  ) override;
 
         public:
             using OCommonStatement::executeQuery;
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 7ce0643280ca..e0211c3f0993 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -48,17 +48,17 @@ using namespace com::sun::star::util;
 
 
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
-OUString SAL_CALL OResultSet::getImplementationName(  ) throw ( RuntimeException, std::exception)
+OUString SAL_CALL OResultSet::getImplementationName(  )
 {
     return OUString("com.sun.star.sdbcx.mork.ResultSet");
 }
 
- Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw( RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  )
 {
    return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"};
 }
 
-sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -108,7 +108,7 @@ void OResultSet::disposing()
     m_xTable.clear();
 }
 
-Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OResultSet::queryInterface( const Type & rType )
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     if(!aRet.hasValue())
@@ -116,7 +116,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
     return aRet;
 }
 
- Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException, std::exception)
+ Sequence<  Type > SAL_CALL OResultSet::getTypes(  )
 {
     OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
                                                 cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -136,7 +136,7 @@ void OResultSet::methodEntry()
 }
 
 
-sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName )
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -156,18 +156,18 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
     return 0; // Never reached
 }
 
-Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
-Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     m_bWasNull = true;
@@ -175,49 +175,49 @@ sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLE
 }
 
 
-sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     return 0;
 }
 
 
-Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     return Sequence< sal_Int8 >();
 }
 
 
-Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     return Date();
 }
 
 
-double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     return 0.0;
 }
 
 
-float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     return 0;
 }
 
 
-sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     return 0;
 }
 
 
-sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::getRow(  )
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -226,14 +226,14 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException,
 }
 
 
-sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     return sal_Int64();
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  )
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -243,42 +243,42 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
     return m_xMetaData;
 }
 
-Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ )
 {
     return nullptr;
 }
 
 
-Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     return Any();
 }
 
 
-sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ )
 {
     return 0;
 }
 
 
-void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException)
+void OResultSet::checkIndex(sal_Int32 columnIndex )
 {
     if(columnIndex <= 0 || columnIndex > (sal_Int32)m_xColumns->get().size())
         ::dbtools::throwInvalidIndexException(*this);
@@ -294,14 +294,14 @@ sal_uInt32 OResultSet::currentRowCount()
 }
 
 
-bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException)
+bool OResultSet::fetchCurrentRow( )
 {
     SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos);
     return fetchRow(getCurrentCardNumber());
 }
 
 
-bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLException, RuntimeException)
+bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload)
 {
     SAL_INFO("connectivity.mork", "cardNumber = " << cardNumber);
     if (!bForceReload)
@@ -344,7 +344,7 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLExcep
 }
 
 
-const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex )
 {
     if ( !fetchRow( cardNumber ) )
     {
@@ -359,7 +359,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI
 }
 
 
-OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex )
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -373,21 +373,21 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept
 }
 
 
-Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     return Time();
 }
 
 
-DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ )
 {
     ResultSetEntryGuard aGuard( *this );
     return DateTime();
 }
 
 
-sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isBeforeFirst(  )
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -396,7 +396,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeExcep
     return( m_nRowPos < 1 );
 }
 
-sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isAfterLast(  )
 {
     SAL_WARN("connectivity.mork", "OResultSet::isAfterLast() NOT IMPLEMENTED!");
     ResultSetEntryGuard aGuard( *this );
@@ -405,14 +405,14 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
     return m_nRowPos > currentRowCount() && MQueryHelper::queryComplete();
 }
 
-sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isFirst(  )
 {
     ResultSetEntryGuard aGuard( *this );
 
     return m_nRowPos == 1;
 }
 
-sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isLast(  )
 {
     SAL_WARN("connectivity.mork", "OResultSet::isLast() NOT IMPLEMENTED!");
     ResultSetEntryGuard aGuard( *this );
@@ -421,7 +421,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException, s
     return m_nRowPos == currentRowCount() && MQueryHelper::queryComplete();
 }
 
-void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::beforeFirst(  )
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -430,7 +430,7 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException,
         previous();
 }
 
-void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::afterLast(  )
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -439,61 +439,61 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException, st
 }
 
 
-void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::close()
 {
     dispose();
 }
 
 
-sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::first(  )
 {
     return seekRow( FIRST_POS );
 }
 
 
-sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::last(  )
 {
     return seekRow( LAST_POS );
 }
 
-sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row )
 {
     return seekRow( ABSOLUTE_POS, row );
 }
 
-sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row )
 {
     return seekRow( RELATIVE_POS, row );
 }
 
-sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::previous(  )
 {
     ResultSetEntryGuard aGuard( *this );
     return seekRow( PRIOR_POS );
 }
 
-Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OResultSet::getStatement(  )
 {
     ResultSetEntryGuard aGuard( *this );
     return m_xStatement;
 }
 
 
-sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowDeleted(  )
 {
     SAL_WARN("connectivity.mork", "OResultSet::rowDeleted() NOT IMPLEMENTED!");
     ResultSetEntryGuard aGuard( *this );
     return true;//return ((m_RowStates & RowStates_Deleted) == RowStates_Deleted) ;
 }
 
-sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowInserted(  )
 {
     SAL_WARN("connectivity.mork", "OResultSet::rowInserted() NOT IMPLEMENTED!");
     ResultSetEntryGuard aGuard( *this );
     return true;//return ((m_RowStates & RowStates_Inserted) == RowStates_Inserted);
 }
 
-sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowUpdated(  )
 {
     SAL_WARN("connectivity.mork", "OResultSet::rowUpdated() NOT IMPLEMENTED!");
     ResultSetEntryGuard aGuard( *this );
@@ -501,13 +501,13 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
 }
 
 
-sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::next(  )
 {
     return seekRow( NEXT_POS );
 }
 
 
-sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::wasNull(  )
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -515,20 +515,20 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException,
 }
 
 
-void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OResultSet::cancel(  )
 {
 }
 
-void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::clearWarnings(  )
 {
 }
 
-Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OResultSet::getWarnings(  )
 {
     return Any();
 }
 
-void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::refreshRow(  )
 {
     if (fetchRow(getCurrentCardNumber(),true)) {
         //force fetch current row will cause we lose all change to the current row
@@ -569,7 +569,6 @@ sal_Bool OResultSet::convertFastPropertyValue(
                             Any & /*rOldValue*/,
                             sal_Int32 nHandle,
                             const Any& /*rValue*/ )
-                                throw (css::lang::IllegalArgumentException)
 {
     OSL_FAIL( "OResultSet::convertFastPropertyValue: not implemented!" );
     switch(nHandle)
@@ -590,7 +589,6 @@ void OResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& /*rValue*/
                                                  )
-                                                 throw (Exception, std::exception)
 {
     OSL_FAIL( "OResultSet::setFastPropertyValue_NoBroadcast: not implemented!" );
     switch(nHandle)
@@ -644,7 +642,7 @@ void SAL_CALL OResultSet::release() throw()
     OResultSet_BASE::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
@@ -955,7 +953,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
 }
 
 void OResultSet::fillRowData()
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( m_pStatement, "Require a statement" );
 
@@ -1057,9 +1054,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum)
     return 0;
 }
 
-void SAL_CALL OResultSet::executeQuery() throw(css::sdbc::SQLException,
-                                               css::uno::RuntimeException,
-                                               std::exception)
+void SAL_CALL OResultSet::executeQuery()
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -1451,7 +1446,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin
 }
 
 
-css::uno::Any OResultSet::getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Any OResultSet::getBookmark(  )
 {
     SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos);
     ResultSetEntryGuard aGuard( *this );
@@ -1462,7 +1457,7 @@ css::uno::Any OResultSet::getBookmark(  ) throw(css::sdbc::SQLException, css::un
     OSL_ENSURE((!m_aRow->isDeleted()),"getBookmark called for deleted row");
     return makeAny((sal_Int32)(m_aRow->get())[0]);
 }
-sal_Bool  OResultSet::moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Bool  OResultSet::moveToBookmark( const css::uno::Any& bookmark )
 {
     ResultSetEntryGuard aGuard( *this );
     SAL_INFO(
@@ -1472,7 +1467,7 @@ sal_Bool  OResultSet::moveToBookmark( const css::uno::Any& bookmark ) throw(css:
     fetchCurrentRow();
     return true;
 }
-sal_Bool  OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Bool  OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows )
 {
     ResultSetEntryGuard aGuard( *this );
     SAL_INFO(
@@ -1482,7 +1477,7 @@ sal_Bool  OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal
     m_nRowPos = getRowForCardNumber(nCardNum);
     return seekRow(RELATIVE_POS,rows );
 }
-sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno::Any& rhs ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno::Any& rhs )
 {
     ResultSetEntryGuard aGuard( *this );
     SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos);
@@ -1503,13 +1498,13 @@ sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno
 
     return  nResult;
 }
-sal_Bool OResultSet::hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Bool OResultSet::hasOrderedBookmarks(  )
 {
     ResultSetEntryGuard aGuard( *this );
     SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos);
     return true;
 }
-sal_Int32 OResultSet::hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 OResultSet::hashBookmark( const css::uno::Any& bookmark )
 {
     ResultSetEntryGuard aGuard( *this );
     SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos);
@@ -1524,7 +1519,7 @@ sal_Int32 OResultSet::getCurrentCardNumber()
         return 0;
     return (m_pKeySet->get())[m_nRowPos-1];
 }
-void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException)
+void OResultSet::checkPendingUpdate()
 {
     OSL_FAIL( "OResultSet::checkPendingUpdate() not implemented" );
 /*
@@ -1542,7 +1537,7 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException)
 */
 
 }
-void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException)
+void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x)
 {
     SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos);
     ResultSetEntryGuard aGuard( *this );
@@ -1562,7 +1557,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw
 }
 
 
-void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex )
 {
     SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos);
     ResultSetEntryGuard aGuard( *this );
@@ -1580,72 +1575,72 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
 }
 
 
-void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x )
 {
     updateValue(columnIndex, static_cast<bool>(x));
 }
 
-void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::updateLong", *this );
 }
 
-void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x )
 {
     updateValue(columnIndex,x);
 }
 
 
-void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     ResultSetEntryGuard aGuard( *this );
 
@@ -1657,12 +1652,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     updateValue(columnIndex,aSeq);
 }
 
-void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     updateBinaryStream(columnIndex,x,length);
 }
 
-void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x )
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
     {
@@ -1675,7 +1670,7 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th
  }
 
 
-void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ )
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
     {
@@ -1689,7 +1684,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any&
 
 // XResultSetUpdate
 
-void SAL_CALL OResultSet::insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OResultSet::insertRow(  )
 {
     ResultSetEntryGuard aGuard( *this );
     SAL_INFO("connectivity.mork", "in, m_nRowPos = " << m_nRowPos);
@@ -1699,27 +1694,27 @@ void SAL_CALL OResultSet::insertRow(  ) throw(css::sdbc::SQLException, css::uno:
     SAL_INFO("connectivity.mork", "out, m_nRowPos = " << m_nRowPos);
 }
 
-void SAL_CALL OResultSet::updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateRow(  )
 {
     OSL_FAIL( "OResultSet::updateRow(  ) not implemented" );
 }
 
-void SAL_CALL OResultSet::deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OResultSet::deleteRow(  )
 {
     OSL_FAIL( "OResultSet::deleteRow(  ) not implemented" );
 }
 
-void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OResultSet::cancelRowUpdates(  )
 {
     OSL_FAIL( "OResultSet::cancelRowUpdates(  ) not implemented" );
 }
 
-void SAL_CALL OResultSet::moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OResultSet::moveToInsertRow(  )
 {
     OSL_FAIL( "OResultSet::moveToInsertRow(  ) not implemented" );
 }
 
-void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OResultSet::moveToCurrentRow(  )
 {
     ResultSetEntryGuard aGuard( *this );
     SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos);
@@ -1761,7 +1756,7 @@ void OResultSet::setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrd
 {
     m_aOrderbyAscending = _aOrderbyAsc;
 }
-Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& /*rows*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XDeleteRows::deleteRows", *this );
     return Sequence< sal_Int32 >();
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 081352aba80a..c8fc79ef5104 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -97,13 +97,11 @@ namespace connectivity
                                 css::uno::Any & rConvertedValue,
                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue )
-                                    throw (css::lang::IllegalArgumentException) override;
+                                const css::uno::Any& rValue ) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                     )
-                                     throw (css::uno::Exception, std::exception) override;
+                                     ) override;
             virtual void SAL_CALL getFastPropertyValue(
                                     css::uno::Any& rValue,
                                     sal_Int32 nHandle
@@ -119,99 +117,99 @@ namespace connectivity
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
             // XResultSetUpdate
-            virtual void SAL_CALL insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL insertRow(  ) override;
+            virtual void SAL_CALL updateRow(  ) override;
+            virtual void SAL_CALL deleteRow(  ) override;
+            virtual void SAL_CALL cancelRowUpdates(  ) override;
+            virtual void SAL_CALL moveToInsertRow(  ) override;
+            virtual void SAL_CALL moveToCurrentRow(  ) override;
             // XRowUpdate
-            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
             // XRowLocate
-            virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
             // XDeleteRows
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override;
 
 protected:
             //MQuery                   m_aQuery;
@@ -241,7 +239,7 @@ protected:
             void parseParameter( const OSQLParseNode* pNode, OUString& rMatchString );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void fillRowData() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+            void fillRowData();
             void analyseWhereClause( const OSQLParseNode*                 parseTree,
                                      MQueryExpression                    &queryExpression);
 
@@ -257,12 +255,10 @@ protected:
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            bool fetchRow(sal_Int32 rowIndex,bool bForceReload=false) throw( css::sdbc::SQLException,
-                                                          css::uno::RuntimeException);
+            bool fetchRow(sal_Int32 rowIndex,bool bForceReload=false);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            bool fetchCurrentRow() throw( css::sdbc::SQLException,
-                                                          css::uno::RuntimeException);
+            bool fetchCurrentRow();
             static bool pushCard(sal_uInt32 ) { return true; }
             bool validRow( sal_uInt32 nRow );
             bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 );
@@ -271,15 +267,14 @@ protected:
             sal_Int32 getRowForCardNumber(sal_Int32 nCardNum);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex)
-                throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex);
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void updateValue(sal_Int32 columnIndex,const ORowSetValue& x );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static void checkPendingUpdate() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static void checkPendingUpdate();
             sal_Int32 getCurrentCardNumber();
 
 public:
@@ -287,9 +282,7 @@ public:
             // MozAddressbook Specific methods
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void SAL_CALL executeQuery() throw(css::sdbc::SQLException,
-                                               css::uno::RuntimeException,
-                                               std::exception);
+            void SAL_CALL executeQuery();
 
             void setTable(OTable* _rTable);
 
@@ -311,7 +304,7 @@ public:
             inline sal_Int32 mapColumn(sal_Int32 column);
 
             /// @throws css::sdbc::SQLException
-            void checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException);
+            void checkIndex(sal_Int32 columnIndex );
 
             static void setBoundedColumns(
                 const OValueRow& _rRow,
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
index 24990110bb57..707e51f4dd2c 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
@@ -41,43 +41,43 @@ OResultSetMetaData::~OResultSetMetaData()
 }
 
 
-void OResultSetMetaData::checkColumnIndex(sal_Int32 column)  throw(SQLException, RuntimeException)
+void OResultSetMetaData::checkColumnIndex(sal_Int32 column)
 {
     if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size())
         throwInvalidIndexException(*this);
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 {
     return getPrecision(column);
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ )
 {
     return DataType::VARCHAR; // at the moment there exists only this type
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  )
 {
     return static_cast<sal_Int32>((m_xColumns->get()).size());
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ )
 {
     return false;
 }
 
 
-OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
 
-OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column )
 {
     checkColumnIndex(column);
 
@@ -94,71 +94,71 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ
     return sColumnName;
 }
 
-OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ )
 {
     return m_aTableName;
 }
 
-OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column )
 {
     return getColumnName(column);
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)));
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column )
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)));
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ )
 {
     if ( !m_pTable || !m_pTable->getConnection() )
     {
@@ -170,7 +170,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column )
 {
     checkColumnIndex(column);
     bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) &&
@@ -180,12 +180,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
 {
     return !isReadOnly(column);
 }
 
-sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column )
 {
     return !isReadOnly(column);
 }
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx
index 78db8d3f3bb9..1e057ef7773e 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx
@@ -59,28 +59,28 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void checkColumnIndex(sal_Int32 column)  throw(css::sdbc::SQLException, css::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            void checkColumnIndex(sal_Int32 column);
+            virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
         };
     }
 }
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 14be8ae4df35..7f9ed80eb17f 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -87,7 +87,7 @@ void OCommonStatement::disposing()
     OCommonStatement_IBASE::disposing();
 }
 
-Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OCommonStatement::queryInterface( const Type & rType )
 {
     Any aRet = OCommonStatement_IBASE::queryInterface(rType);
     if(!aRet.hasValue())
@@ -95,7 +95,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OCommonStatement::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
                                     cppu::UnoType<XFastPropertySet>::get(),
@@ -104,7 +104,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException,
     return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes());
 }
 
-void SAL_CALL OCommonStatement::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCommonStatement::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -114,7 +114,6 @@ void SAL_CALL OCommonStatement::close(  ) throw(SQLException, RuntimeException,
 }
 
 OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , bool bAdjusted)
-    throw ( SQLException, RuntimeException, std::exception )
 {
     OUString aErr;
 
@@ -218,7 +217,7 @@ void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pR
 }
 
 
-sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -229,7 +228,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLExce
 }
 
 
-Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_ThreadMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -243,7 +242,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString&
 }
 
 
-Reference< XConnection > SAL_CALL OCommonStatement::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OCommonStatement::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -252,7 +251,7 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection(  ) throw(SQLE
     return Reference< XConnection >(m_pConnection.get());
 }
 
-Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OStatement::queryInterface( const Type & rType )
 {
     Any aRet = ::cppu::queryInterface(rType,static_cast< XServiceInfo*> (this));
     if(!aRet.hasValue())
@@ -260,14 +259,14 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep
     return aRet;
 }
 
-sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XStatement::executeUpdate", *this );
     return 0;
 
 }
 
-Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OCommonStatement::getWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -276,7 +275,7 @@ Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeExcept
 }
 
 
-void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCommonStatement::clearWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -325,14 +324,13 @@ sal_Bool OCommonStatement::convertFastPropertyValue(
                             Any & /*rOldValue*/,
                             sal_Int32 /*nHandle*/,
                             const Any& /*rValue*/ )
-                                throw (css::lang::IllegalArgumentException)
 {
     bool bConverted = false;
     // here we have to try to convert
     return bConverted;
 }
 
-void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) throw (Exception, std::exception)
+void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/)
 {
     // set the value to whatever is necessary
     switch(nHandle)
@@ -389,7 +387,7 @@ void SAL_CALL OStatement::release() throw()
     OCommonStatement::release();
 }
 
-Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index 3127bbb20a4e..ec88e19e1199 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -88,11 +88,10 @@ namespace connectivity
                                                                 css::uno::Any & rConvertedValue,
                                                                 css::uno::Any & rOldValue,
                                                                 sal_Int32 nHandle,
-                                                                const css::uno::Any& rValue )
-                                                            throw (css::lang::IllegalArgumentException) override;
+                                                                const css::uno::Any& rValue ) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                                                 sal_Int32 nHandle,
-                                                                const css::uno::Any& rValue)   throw (css::uno::Exception, std::exception) override;
+                                                                const css::uno::Any& rValue) override;
             virtual void SAL_CALL getFastPropertyValue(
                                                                 css::uno::Any& rValue,
                                                                 sal_Int32 nHandle) const override;
@@ -109,7 +108,7 @@ namespace connectivity
                 @throws css::uno::RuntimeException
             */
             virtual StatementType
-                            parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception );
+                            parseSql( const OUString& sql , bool bAdjusted = false);
             /** called to initialize a result set, according to a previously parsed SQL statement
             */
             virtual void    initializeResultSet( OResultSet* _pResult );
@@ -145,22 +144,22 @@ namespace connectivity
             virtual void SAL_CALL release() throw() override;
             virtual void SAL_CALL acquire() throw() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ;
+            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override ;
+            virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override ;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
 
         protected:
             using OPropertySetHelper::getFastPropertyValue;
@@ -176,7 +175,7 @@ namespace connectivity
             explicit OStatement( OConnection* _pConnection);
             DECLARE_SERVICE_INFO();
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
         };
diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx
index a5164e426fe9..1bc3ad5f3d39 100644
--- a/connectivity/source/drivers/mork/MTables.cxx
+++ b/connectivity/source/drivers/mork/MTables.cxx
@@ -53,7 +53,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
     return xRet;
 }
 
-void OTables::impl_refresh(  ) throw(RuntimeException)
+void OTables::impl_refresh(  )
 {
     static_cast<OCatalog&>(m_rParent).refreshTables();
 }
diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx
index 7a96a3d622fa..23a4b51361f6 100644
--- a/connectivity/source/drivers/mork/MTables.hxx
+++ b/connectivity/source/drivers/mork/MTables.hxx
@@ -30,7 +30,7 @@ namespace connectivity
             css::uno::Reference< css::sdbc::XDatabaseMetaData >       m_xMetaData;
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
         public:
             OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
                 const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index a1f073dd7dbb..505a23b1e376 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -70,17 +70,17 @@ void MozillaBootstrap::disposing()
     OMozillaBootstrap_BASE::disposing();
 }
 
-OUString SAL_CALL MozillaBootstrap::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL MozillaBootstrap::getImplementationName(  )
 {
     return OUString(MOZAB_MozillaBootstrap_IMPL_NAME);
 }
 
-sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(  )
 {
     // which service is supported
     // for more information @see com.sun.star.mozilla.MozillaBootstrap
@@ -89,55 +89,55 @@ Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(  ) thr
 
 
 // XProfileDiscover
-::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( css::mozilla::MozillaProductType product)
 {
     return m_ProfileAccess->getProfileCount(product);
 }
-::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list )
 {
     return m_ProfileAccess->getProfileList(product,list);
 }
-OUString SAL_CALL MozillaBootstrap::getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL MozillaBootstrap::getDefaultProfile( css::mozilla::MozillaProductType product )
 {
     return m_ProfileAccess->getDefaultProfile(product);
 }
-OUString SAL_CALL MozillaBootstrap::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL MozillaBootstrap::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName )
 {
     return m_ProfileAccess->getProfilePath(product,profileName);
 }
-sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName )
 {
     return m_ProfileAccess->isProfileLocked(product,profileName);
 }
-sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName )
 {
     return m_ProfileAccess->getProfileExists(product,profileName);
 }
 
 // XProfileManager
-::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName )
 {
     (void)product; /* avoid warning about unused parameter */
     (void)profileName; /* avoid warning about unused parameter */
         return -1;
 }
-::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile(  ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile(  )
 {
     return -1;
 }
-css::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct(  ) throw (css::uno::RuntimeException, std::exception)
+css::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct(  )
 {
     return css::mozilla::MozillaProductType_Default;
 }
-OUString SAL_CALL MozillaBootstrap::getCurrentProfile(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL MozillaBootstrap::getCurrentProfile(  )
 {
     return OUString();
 }
-sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked(  )
 {
     return true;
 }
-OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName )
 {
     (void)product; /* avoid warning about unused parameter */
     (void)profileName; /* avoid warning about unused parameter */
@@ -145,7 +145,7 @@ OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProd
 }
 
 // XProxyRunner
-::sal_Int32 SAL_CALL MozillaBootstrap::Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL MozillaBootstrap::Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode )
 {
     (void)aCode; /* avoid warning about unused parameter */
     return -1;
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 2a61d88d760b..9c75568e203f 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -51,30 +51,30 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getImplementationName(  ) override;
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
             // XMozillaBootstrap
 
             // XProfileDiscover
-            virtual ::sal_Int32 SAL_CALL getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException, std::exception) override;
-            virtual ::sal_Int32 SAL_CALL getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual ::sal_Int32 SAL_CALL getProfileCount( css::mozilla::MozillaProductType product) override;
+            virtual ::sal_Int32 SAL_CALL getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) override;
+            virtual OUString SAL_CALL getDefaultProfile( css::mozilla::MozillaProductType product ) override;
+            virtual OUString SAL_CALL getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) override;
+            virtual sal_Bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) override;
+            virtual sal_Bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) override;
 
             // XProfileManager
-            virtual ::sal_Int32 SAL_CALL bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual ::sal_Int32 SAL_CALL shutdownProfile(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::mozilla::MozillaProductType SAL_CALL getCurrentProduct(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCurrentProfile(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCurrentProfileLocked(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual ::sal_Int32 SAL_CALL bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) override;
+            virtual ::sal_Int32 SAL_CALL shutdownProfile(  ) override;
+            virtual css::mozilla::MozillaProductType SAL_CALL getCurrentProduct(  ) override;
+            virtual OUString SAL_CALL getCurrentProfile(  ) override;
+            virtual sal_Bool SAL_CALL isCurrentProfileLocked(  ) override;
+            virtual OUString SAL_CALL setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) override;
 
             // XProxyRunner
-            virtual ::sal_Int32 SAL_CALL Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual ::sal_Int32 SAL_CALL Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) override;
         };
     }
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index f859727eef3b..15f1dd1264b6 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
@@ -21,7 +21,7 @@
 #include <rtl/byteseq.hxx>
 #include <osl/diagnose.h>
 
-IniParser::IniParser(OUString const & rIniName) throw(css::io::IOException, std::exception)
+IniParser::IniParser(OUString const & rIniName)
 {
     OUString iniUrl;
     if (osl_File_E_None != osl_getFileURLFromSystemPath(rIniName.pData, &iniUrl.pData))
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index 9b44ffb2091b..120f47121915 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
@@ -52,7 +52,7 @@ class IniParser
 public:
     IniSectionMap& getAllSection() { return mAllSection; }
     /// @throws css::io::IOException
-    explicit IniParser(OUString const & rIniName) throw(css::io::IOException, std::exception);
+    explicit IniParser(OUString const & rIniName);
 };
 
 #endif
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 9f4ca1c9c1c2..1adb8993fde0 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -139,7 +139,7 @@ namespace connectivity
             }
         }
 
-        OUString ProfileAccess::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException)
+        OUString ProfileAccess::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName )
         {
             sal_Int32 index=product;
             ProductStruct &rProduct = m_ProductProfileList[index];
@@ -152,13 +152,13 @@ namespace connectivity
                 return rProduct.mProfileList[profileName]->getProfilePath();
         }
 
-        ::sal_Int32 ProfileAccess::getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException)
+        ::sal_Int32 ProfileAccess::getProfileCount( css::mozilla::MozillaProductType product)
         {
             sal_Int32 index=product;
             ProductStruct &rProduct = m_ProductProfileList[index];
             return static_cast< ::sal_Int32 >(rProduct.mProfileList.size());
         }
-        ::sal_Int32 ProfileAccess::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException)
+        ::sal_Int32 ProfileAccess::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list )
         {
             sal_Int32 index=product;
             ProductStruct &rProduct = m_ProductProfileList[index];
@@ -176,7 +176,7 @@ namespace connectivity
             return static_cast< ::sal_Int32 >(rProduct.mProfileList.size());
         }
 
-        OUString ProfileAccess::getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException)
+        OUString ProfileAccess::getDefaultProfile( css::mozilla::MozillaProductType product )
         {
             sal_Int32 index=product;
             ProductStruct &rProduct = m_ProductProfileList[index];
@@ -193,14 +193,14 @@ namespace connectivity
             ProfileStruct * aProfile = (*rProduct.mProfileList.begin()).second;
             return aProfile->getProfileName();
         }
-        bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException)
+        bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName )
         {
             (void)product; /* avoid warning about unused parameter */
             (void)profileName; /* avoid warning about unused parameter */
             return true;
         }
 
-        bool ProfileAccess::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException)
+        bool ProfileAccess::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName )
         {
             sal_Int32 index=product;
             ProductStruct &rProduct = m_ProductProfileList[index];
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 8de3f03d8e6b..8bd1021bf343 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -71,17 +71,17 @@ namespace connectivity
             ~ProfileAccess();
             ProfileAccess();
             /// @throws css::uno::RuntimeException
-            OUString getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException);
+            OUString getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName );
             /// @throws css::uno::RuntimeException
-            ::sal_Int32 getProfileCount( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException);
+            ::sal_Int32 getProfileCount( css::mozilla::MozillaProductType product );
             /// @throws css::uno::RuntimeException
-            ::sal_Int32 getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException);
+            ::sal_Int32 getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list );
             /// @throws css::uno::RuntimeException
-            OUString getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException);
+            OUString getDefaultProfile( css::mozilla::MozillaProductType product );
             /// @throws css::uno::RuntimeException
-            bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException);
+            bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName );
             /// @throws css::uno::RuntimeException
-            bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException);
+            bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName );
         private:
             ProductStruct m_ProductProfileList[4];
             void      LoadProductsInfo();
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index c98890c5f6d3..6d9e1c1b865c 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -112,7 +112,7 @@ void OMySQLCatalog::refreshUsers()
         m_pUsers = new OUsers(*this,m_aMutex,aVector,m_xConnection,this);
 }
 
-Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType )
 {
     if ( rType == cppu::UnoType<XGroupsSupplier>::get())
         return Any();
@@ -121,7 +121,7 @@ Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeEx
     return OCatalog::queryInterface(rType);
 }
 
-Sequence< Type > SAL_CALL OMySQLCatalog::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OMySQLCatalog::getTypes(  )
 {
     Sequence< Type > aTypes = OCatalog::getTypes();
     ::std::vector<Type> aOwnTypes;
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index 2864f5b92231..d8e0b75e3ce7 100644
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
@@ -67,7 +67,7 @@ void OMySQLColumn::construct()
     return *OMySQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
 
-Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSupported { "com.sun.star.sdbcx.Column" };
 
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 3655fa4f5a3d..491dd7a0d72e 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -44,7 +44,7 @@ namespace connectivity
 
     namespace mysql
     {
-        Reference< XInterface >  SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) throw( Exception )
+        Reference< XInterface >  SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac)
         {
             return *(new ODriverDelegator( comphelper::getComponentContext(_rxFac) ));
         }
@@ -248,7 +248,7 @@ namespace connectivity
     }
 
 
-    Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info )
     {
         Reference< XConnection > xConnection;
         if ( acceptsURL(url) )
@@ -310,7 +310,7 @@ namespace connectivity
     }
 
 
-    sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url )
     {
         Sequence< PropertyValue > info;
 
@@ -323,7 +323,7 @@ namespace connectivity
     }
 
 
-    Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception)
+    Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info )
     {
         ::std::vector< DriverPropertyInfo > aDriverInfo;
         if ( !acceptsURL(url) )
@@ -381,19 +381,19 @@ namespace connectivity
     }
 
 
-    sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion(  )
     {
         return 1;
     }
 
 
-    sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion(  )
     {
         return 0;
     }
 
 
-    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed);
@@ -443,7 +443,7 @@ namespace connectivity
     }
 
 
-    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info )
     {
         if ( ! acceptsURL(url) )
         {
@@ -458,12 +458,12 @@ namespace connectivity
     // XServiceInfo
 
 
-    OUString ODriverDelegator::getImplementationName_Static(  ) throw(RuntimeException)
+    OUString ODriverDelegator::getImplementationName_Static(  )
     {
         return OUString("org.openoffice.comp.drivers.MySQL.Driver");
     }
 
-    Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+    Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSNS( 2 );
         aSNS[0] = "com.sun.star.sdbc.Driver";
@@ -471,17 +471,17 @@ namespace connectivity
         return aSNS;
     }
 
-    OUString SAL_CALL ODriverDelegator::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL ODriverDelegator::getImplementationName(  )
     {
         return getImplementationName_Static();
     }
 
-    sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_Static();
     }
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 667e48af3c89..a83c82639559 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -162,7 +162,7 @@ Sequence< sal_Int8 > OMySQLTable::getUnoTunnelImplementationId()
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
+sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId )
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
@@ -170,7 +170,7 @@ sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R
 }
 
 // XAlterTable
-void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 3cad5360c033..a05bb0028873 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -93,7 +93,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
     return xRet;
 }
 
-void OTables::impl_refresh(  ) throw(RuntimeException)
+void OTables::impl_refresh(  )
 {
     static_cast<OMySQLCatalog&>(m_rParent).refreshTables();
 }
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index e386d9b385ed..977b5bb0ea50 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -77,7 +77,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper()
 }
 typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER;
 
-sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 objType )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
@@ -87,7 +87,7 @@ sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32
     return nRights;
 }
 
-void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException)
+void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant)
 {
     nRightsWithGrant = nRights = 0;
     // first we need to create the sql stmt to select the privs
@@ -192,7 +192,7 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_I
     }
 }
 
-sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
@@ -202,7 +202,7 @@ sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName,
     return nRightsWithGrant;
 }
 
-void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
 {
     if ( objType != PrivilegeObject::TABLE )
     {
@@ -228,7 +228,7 @@ void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 ob
     }
 }
 
-void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
 {
     if ( objType != PrivilegeObject::TABLE )
     {
@@ -255,7 +255,7 @@ void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 o
 }
 
 // XUser
-void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index 834c9461ff9a..db24a1d38976 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -54,7 +54,7 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
     return new OMySQLUser(m_xConnection,_rName);
 }
 
-void OUsers::impl_refresh() throw(RuntimeException)
+void OUsers::impl_refresh()
 {
     m_pParent->refreshUsers();
 }
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 0e45831c7ad2..db8619d7e287 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -66,7 +66,7 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName)
                             );
 }
 
-void OViews::impl_refresh(  ) throw(RuntimeException)
+void OViews::impl_refresh(  )
 {
     static_cast<OMySQLCatalog&>(m_rParent).refreshTables();
 }
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx
index 9e0b3d1eb374..eb8d58547650 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -176,7 +176,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr, sal_Int32 nTi
     return nSQLRETURN;
 }
 
-SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException, std::exception)
+SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info)
 {
     m_aConnectionHandle  = SQL_NULL_HANDLE;
     m_sURL  = url;
@@ -268,7 +268,7 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal
 IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.odbc.OConnection", "com.sun.star.sdbc.Connection")
 
 
-Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL OConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -278,7 +278,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -288,13 +288,13 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     return xReturn;
 }
 
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this );
     return nullptr;
 }
 
-OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OConnection::nativeSQL( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -305,7 +305,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLExcepti
     return OUString(pOut,nOutLen,getTextEncoding());
 }
 
-void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -317,7 +317,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti
                                    m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
 
-sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnection::getAutoCommit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -329,7 +329,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
     return nOption == SQL_AUTOCOMMIT_ON ;
 }
 
-void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::commit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -338,7 +338,7 @@ void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException, std:
     OTools::ThrowException(this,N3SQLEndTran(SQL_HANDLE_DBC,m_aConnectionHandle,SQL_COMMIT),m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
 
-void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::rollback(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -347,14 +347,14 @@ void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException, st
     OTools::ThrowException(this,N3SQLEndTran(SQL_HANDLE_DBC,m_aConnectionHandle,SQL_ROLLBACK),m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
 
-sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnection::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return OConnection_BASE::rBHelper.bDisposed;
 }
 
-Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -369,7 +369,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
     return xMetaData;
 }
 
-void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -380,13 +380,13 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException,
         m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
 
-sal_Bool SAL_CALL OConnection::isReadOnly() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnection::isReadOnly()
 {
     // const member which will initialized only once
     return m_bReadOnly;
 }
 
-void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setCatalog( const OUString& catalog )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -398,7 +398,7 @@ void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLExcept
         m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
 
-OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OConnection::getCatalog(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -413,7 +413,7 @@ OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeExcepti
     return OUString(pCat,nValueLen,getTextEncoding());
 }
 
-void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -425,7 +425,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE
                                    m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
 
-sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -439,7 +439,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException,
     return nTxn;
 }
 
-Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -448,13 +448,13 @@ Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) th
     return nullptr;
 }
 
-void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this );
 }
 
 // XCloseable
-void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -465,12 +465,12 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException, std::
 }
 
 // XWarningsSupplier
-Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OConnection::getWarnings(  )
 {
     return Any();
 }
 
-void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::clearWarnings(  )
 {
 }
 
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
index 65336c2095a2..2fe1f8bfeedc 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
@@ -81,7 +81,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
     return xRef;
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  )
 {
     Reference< XResultSet > xRef;
     if(!m_bUseCatalog)
@@ -114,7 +114,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
     return aVal;
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  )
 {
     Reference< XResultSet > xRef;
     try
@@ -132,7 +132,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLExce
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     const Any& catalog, const OUString& schema, const OUString& table,
-    const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& columnNamePattern )
 {
     Reference< XResultSet > xRef;
     try
@@ -150,7 +150,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern,
-    const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& columnNamePattern )
 {
     Reference< XResultSet > xRef;
     try
@@ -168,7 +168,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     const Any& catalog, const OUString& schemaPattern,
-    const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& tableNamePattern, const Sequence< OUString >& types )
 {
     Reference< XResultSet > xRef;
     try
@@ -186,7 +186,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     const Any& catalog, const OUString& schemaPattern,
-    const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& procedureNamePattern, const OUString& columnNamePattern )
 {
     Reference< XResultSet > xRef;
     try
@@ -204,7 +204,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     const Any& catalog, const OUString& schemaPattern,
-    const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& procedureNamePattern )
 {
     Reference< XResultSet > xRef;
     try
@@ -221,7 +221,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     Reference< XResultSet > xRef;
     bool bSuccess = false;
@@ -247,77 +247,77 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
     return xRef;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_BINARY_LITERAL_LEN,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_ROW_SIZE,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CATALOG_NAME_LEN,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CHAR_LITERAL_LEN,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMN_NAME_LEN,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_INDEX,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CURSOR_NAME_LEN,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_DRIVER_CONNECTIONS/*SQL_ACTIVE_CONNECTIONS*/,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_TABLE,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_STATEMENT_LEN,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_TABLE_NAME_LEN,nValue,*this);
@@ -332,7 +332,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     Reference< XResultSet > xRef;
     try
@@ -349,7 +349,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     Reference< XResultSet > xRef;
     try
@@ -366,7 +366,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
-    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception)
+    const Any& catalog, const OUString& schema, const OUString& table )
 {
     Reference< XResultSet > xRef;
     try
@@ -384,7 +384,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     const Any& catalog, const OUString& schema, const OUString& table,
-    sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException, std::exception)
+    sal_Bool unique, sal_Bool approximate )
 {
     Reference< XResultSet > xRef;
     try
@@ -402,7 +402,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
     const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope,
-    sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception)
+    sal_Bool nullable )
 {
     Reference< XResultSet > xRef;
     try
@@ -419,7 +419,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
-    const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception)
+    const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern )
 {
     if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() )
     {
@@ -434,7 +434,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     const Any& primaryCatalog, const OUString& primarySchema,
     const OUString& primaryTable, const Any& foreignCatalog,
-    const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception)
+    const OUString& foreignSchema, const OUString& foreignTable )
 {
     Reference< XResultSet > xRef;
     try
@@ -451,21 +451,21 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     return xRef;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     OUString aVal;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_ROW_SIZE_INCLUDES_LONG,aVal,*this,m_pConnection->getTextEncoding());
     return aVal.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_LOWER;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this);
@@ -479,21 +479,21 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
     return nValue == SQL_IC_MIXED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_MIXED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_UPPER;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this);
@@ -516,21 +516,21 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
             ((nValue & SQL_AT_DROP_COLUMN_RESTRICT) == SQL_AT_DROP_COLUMN_RESTRICT);
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_INDEX_SIZE,nValue,*this);
     return nValue;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NON_NULLABLE_COLUMNS,nValue,*this);
     return nValue == SQL_NNC_NON_NULL;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  )
 {
     OUString aVal;
     if(m_bUseCatalog)
@@ -545,14 +545,14 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
     return aVal;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  )
 {
     OUString aVal;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SPECIAL_CHARACTERS,aVal,*this,m_pConnection->getTextEncoding());
     return aVal;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this);
@@ -567,77 +567,77 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
     return nValue == SQL_CL_START;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue == SQL_TC_DDL_IGNORE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue == SQL_TC_DDL_COMMIT;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue == SQL_TC_DML;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue == SQL_TC_ALL;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this);
     return (nValue & SQL_CA1_POS_DELETE) == SQL_CA1_POS_DELETE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this);
     return (nValue & SQL_CA1_POS_UPDATE) == SQL_CA1_POS_UPDATE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_ROLLBACK_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_PRESERVE || nValue == SQL_CB_CLOSE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_COMMIT_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_PRESERVE || nValue == SQL_CB_CLOSE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_COMMIT_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_PRESERVE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_ROLLBACK_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_PRESERVE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_ISOLATION_OPTION,nValue,*this);
@@ -651,28 +651,28 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
     return (nValue & SQL_SU_DML_STATEMENTS) == SQL_SU_DML_STATEMENTS;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this);
     return static_cast<bool>(nValue & SQL_SC_SQL92_FULL);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this);
     return static_cast<bool>(nValue &SQL_SC_SQL92_ENTRY);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     OUString aStr;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_INTEGRITY,aStr,*this,m_pConnection->getTextEncoding());
     return aStr.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this);
@@ -694,7 +694,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
     return (nValue & SQL_CU_TABLE_DEFINITION) == SQL_CU_TABLE_DEFINITION;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  )
 {
     SQLUINTEGER nValue=0;
     if(m_bUseCatalog)
@@ -710,14 +710,14 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
     return (nValue & SQL_CU_DML_STATEMENTS) == SQL_CU_DML_STATEMENTS;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_OJ_CAPABILITIES,nValue,*this);
     return ((nValue & (SQL_OJ_FULL|SQL_OJ_LEFT|SQL_OJ_RIGHT|SQL_OJ_NESTED|SQL_OJ_NOT_ORDERED|SQL_OJ_ALL_COMPARISON_OPS|SQL_OJ_INNER)) != 0);
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  )
 {
     Reference< XResultSet > xRef;
     try
@@ -740,103 +740,103 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_PROCEDURE_NAME_LEN,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_SCHEMA_NAME_LEN,nValue,*this);
     return nValue;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue != SQL_TC_NONE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this);
     return (nValue & SQL_CA1_POSITIONED_UPDATE) == SQL_CA1_POSITIONED_UPDATE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_TABLES,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  )
 {
     return m_pConnection->isReadOnly();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_FILE_USAGE,nValue,*this);
     return nValue == SQL_FILE_CATALOG;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_FILE_USAGE,nValue,*this);
     return nValue == SQL_FILE_TABLE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONVERT_FUNCTIONS,nValue,*this);
     return (nValue & SQL_FN_CVT_CONVERT) == SQL_FN_CVT_CONVERT;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONCAT_NULL_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_NULL;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_COLUMN_ALIAS,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this);
     return nValue != SQL_CN_NONE;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType )
 {
     if(fromType == toType)
         return true;
@@ -992,77 +992,77 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In
     return bConvert;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_EXPRESSIONS_IN_ORDERBY,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this);
     return nValue != SQL_GB_NOT_SUPPORTED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this);
     return nValue != SQL_GB_GROUP_BY_CONTAINS_SELECT;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this);
     return nValue == SQL_GB_NO_RELATION;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULTIPLE_ACTIVE_TXN,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULT_RESULT_SETS,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_LIKE_ESCAPE_CLAUSE,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ORDER_BY_COLUMNS_IN_SELECT,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'N';
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_UNION,nValue,*this);
     return (nValue & SQL_U_UNION) == SQL_U_UNION;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_UNION,nValue,*this);
     return (nValue & SQL_U_UNION_ALL) == SQL_U_UNION_ALL;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this);
@@ -1076,49 +1076,49 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
     return nValue == SQL_IC_MIXED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this);
     return nValue == SQL_NC_END;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this);
     return nValue == SQL_NC_START;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this);
     return nValue == SQL_NC_HIGH;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this);
     return nValue == SQL_NC_LOW;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this);
     return (nValue & SQL_SU_PROCEDURE_INVOCATION) == SQL_SU_PROCEDURE_INVOCATION;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this);
     return (nValue & SQL_SU_PRIVILEGE_DEFINITION) == SQL_SU_PRIVILEGE_DEFINITION;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  )
 {
     SQLUINTEGER nValue=0;
     if(m_bUseCatalog)
@@ -1126,7 +1126,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(
     return (nValue & SQL_CU_PROCEDURE_INVOCATION) == SQL_CU_PROCEDURE_INVOCATION;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 {
     SQLUINTEGER nValue=0;
     if(m_bUseCatalog)
@@ -1134,42 +1134,42 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
     return (nValue & SQL_CU_PRIVILEGE_DEFINITION) == SQL_CU_PRIVILEGE_DEFINITION;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_CORRELATED_SUBQUERIES) == SQL_SQ_CORRELATED_SUBQUERIES;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_COMPARISON) == SQL_SQ_COMPARISON;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_EXISTS) == SQL_SQ_EXISTS;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_IN) == SQL_SQ_IN;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_QUANTIFIED) == SQL_SQ_QUANTIFIED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this);
@@ -1183,7 +1183,7 @@ OUString ODatabaseMetaData::getURLImpl()
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getURL(  )
 {
     OUString aValue = m_pConnection->getURL();
     if ( aValue.isEmpty() )
@@ -1193,56 +1193,56 @@ OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeExcep
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getUserName(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_USER_NAME,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDriverName(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_NAME,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion()
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_ODBC_VER,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DBMS_NAME,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURE_TERM,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_TERM,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException, std::exception) try
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) try
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding());
@@ -1253,7 +1253,7 @@ catch (const SQLException &)
     return 0;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  )
 {
     SQLUINTEGER nValue;
     sal_Int32 nValueTranslated;
@@ -1278,7 +1278,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(S
     return nValueTranslated;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException, std::exception) try
+sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) try
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding());
@@ -1289,21 +1289,21 @@ catch (const SQLException &)
     return 0;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_KEYWORDS,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  )
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SEARCH_PATTERN_ESCAPE,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
 
-OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  )
 {
     SQLUINTEGER nValue;
     OUStringBuffer aValue;
@@ -1364,7 +1364,7 @@ OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException,
     return aValue.makeStringAndClear();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  )
 {
     SQLUINTEGER nValue;
     OUStringBuffer aValue;
@@ -1419,7 +1419,7 @@ OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException
     return aValue.makeStringAndClear();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  )
 {
     SQLUINTEGER nValue;
     OUStringBuffer aValue;
@@ -1438,7 +1438,7 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException,
     return aValue.makeStringAndClear();
 }
 
-OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  )
 {
     SQLUINTEGER nValue;
     OUStringBuffer aValue;
@@ -1499,7 +1499,7 @@ OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException,
     return aValue.makeStringAndClear();
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     SQLUINTEGER nValue;
     // SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not seem te be any equivalent.
@@ -1510,7 +1510,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLExc
     return nValue == SQL_OSC_EXTENDED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  )
 {
     SQLUINTEGER nValue;
     // SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not seem te be any equivalent.
@@ -1521,7 +1521,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLExcepti
     return nValue == SQL_OSC_CORE || nValue == SQL_OSC_EXTENDED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  )
 {
     SQLUINTEGER nValue;
     // SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not seem te be any equivalent.
@@ -1532,54 +1532,54 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLExce
     return nValue == SQL_OSC_MINIMUM || nValue == SQL_OSC_CORE || nValue == SQL_OSC_EXTENDED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_OJ_CAPABILITIES,nValue,*this);
     return (nValue & SQL_OJ_FULL) == SQL_OJ_FULL;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     return supportsFullOuterJoins(  );
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_GROUP_BY,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_ORDER_BY,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_SELECT,nValue,*this);
     return nValue;
 }
 
-sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_USER_NAME_LEN,nValue,*this);
     return nValue;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_SENSITIVITY,nValue,*this);
     return (nValue & static_cast<SQLUINTEGER>(setType)) == static_cast<SQLUINTEGER>(setType);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency )
 {
     SQLUINTEGER nValue;
     SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 );
@@ -1611,7 +1611,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set
     return bRet;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType )
 {
     SQLUINTEGER nValue;
     SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 );
@@ -1633,7 +1633,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) t
     return (nValue & SQL_CA2_SENSITIVITY_UPDATES) == SQL_CA2_SENSITIVITY_UPDATES;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType )
 {
     SQLUINTEGER nValue;
     SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 );
@@ -1655,7 +1655,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) t
     return (nValue & SQL_CA2_SENSITIVITY_DELETIONS) != SQL_CA2_SENSITIVITY_DELETIONS;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType )
 {
     SQLUINTEGER nValue;
     SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 );
@@ -1677,42 +1677,42 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) t
     return (nValue & SQL_CA2_SENSITIVITY_ADDITIONS) == SQL_CA2_SENSITIVITY_ADDITIONS;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType )
 {
     return ownUpdatesAreVisible(setType);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType )
 {
     return ownDeletesAreVisible(setType);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType )
 {
     return ownInsertsAreVisible(setType);
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  )
 {
     return false;
 }
 
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ )
 {
     return nullptr;
 }
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index 91f4afd47252..bf3254aa2e6f 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -98,13 +98,13 @@ void ODatabaseMetaDataResultSet::disposing()
     m_pConnection.clear();
 }
 
-Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType )
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType);
 }
 
-Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
@@ -119,7 +119,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
     ODatabaseMetaDataResultSet_BASE::release();
 }
 
-Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
                                     cppu::UnoType<XFastPropertySet>::get(),
@@ -142,7 +142,7 @@ sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32  column)
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -189,20 +189,20 @@ template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::get
 }
 
 
-Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBinaryStream", *this );
     return nullptr;
 }
 
-Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getCharacterStream", *this );
     return nullptr;
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -231,13 +231,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex
 }
 
 
-sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex )
 {
     return getInteger<sal_Int8, SQL_C_STINYINT>( columnIndex );
 }
 
 
-Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -266,7 +266,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co
 }
 
 
-css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex )
 {
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -288,7 +288,7 @@ css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIn
 }
 
 
-double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -305,7 +305,7 @@ double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) t
 }
 
 
-float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -322,25 +322,25 @@ float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) thr
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex )
 {
     return getInteger<sal_Int32, SQL_C_SLONG>( columnIndex );
 }
 
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow(  )
 {
     return 0;
 }
 
 
-sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex )
 {
     return getInteger<sal_Int64, SQL_C_SBIGINT>( columnIndex );
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  )
 {
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -349,46 +349,46 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData
     return m_xMetaData;
 }
 
-Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getArray", *this );
     return nullptr;
 }
 
-Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this );
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBlob", *this );
     return nullptr;
 }
 
 
-Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getRef", *this );
     return nullptr;
 }
 
 
-Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getObject", *this );
     return Any();
 }
 
 
-sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
 {
     return getInteger<sal_Int16, SQL_C_SSHORT>( columnIndex );
 }
 
 
-OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -406,7 +406,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
 }
 
 
-css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -423,7 +423,7 @@ css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIn
 }
 
 
-css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -441,7 +441,7 @@ css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -451,7 +451,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException
     return m_nCurrentFetchState == SQL_NO_DATA;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -461,7 +461,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, Ru
     return m_nRowPos == 1;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -471,7 +471,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, Run
     return m_bEOF && m_nCurrentFetchState != SQL_NO_DATA;
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -483,7 +483,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, Ru
     m_nCurrentFetchState = SQL_SUCCESS;
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -495,7 +495,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, Runt
 }
 
 
-void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::close(  )
 {
     {
 
@@ -507,7 +507,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeE
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -524,7 +524,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, Runt
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  )
 {
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -539,7 +539,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, Runti
     return bRet;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -555,7 +555,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ
     return bRet;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -571,7 +571,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ
     return bRet;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -589,13 +589,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, R
     return bRet;
 }
 
-Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  )
 {
     return nullptr;
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -605,7 +605,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException,
     return m_pRowStatusArray[0] == SQL_ROW_DELETED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  )
 {
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -614,7 +614,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException
     return m_pRowStatusArray[0] == SQL_ROW_ADDED;
 }
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -625,7 +625,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException,
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -636,7 +636,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLExcepti
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -655,7 +655,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, Runti
 }
 
 
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -665,7 +665,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, Ru
     return m_bWasNull;
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -674,7 +674,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, Run
 }
 
 
-void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::cancel(  )
 {
 
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -684,22 +684,22 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException, std
     N3SQLCancel(m_aStatementHandle);
 }
 
-void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  )
 {
 }
 
-Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  )
 {
     return Any();
 }
 
-sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() throw(SQLException, RuntimeException)
+sal_Int32 ODatabaseMetaDataResultSet::getFetchSize()
 {
     sal_Int32 nValue=1;
     return nValue;
 }
 
-OUString ODatabaseMetaDataResultSet::getCursorName() throw(SQLException, RuntimeException)
+OUString ODatabaseMetaDataResultSet::getCursorName()
 {
     return OUString();
 }
@@ -735,9 +735,6 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue(
                             Any & rOldValue,
                             sal_Int32 nHandle,
                             const Any& rValue )
-                                throw (css::lang::IllegalArgumentException,
-                                       css::uno::RuntimeException,
-                                       std::exception)
 {
     switch(nHandle)
     {
@@ -755,7 +752,7 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue(
     return false;
 }
 
-void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) throw (Exception, std::exception)
+void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ )
 {
     switch(nHandle)
     {
@@ -792,7 +789,7 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nH
     }
 }
 
-void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeException)
+void ODatabaseMetaDataResultSet::openTypeInfo()
 {
     TInt2IntMap aMap;
     aMap[SQL_BIT]               = DataType::BIT;
@@ -836,7 +833,7 @@ void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeExcep
 
 void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString& schemaPattern,
                             const OUString& tableNamePattern,
-                            const Sequence< OUString >& types )  throw(SQLException, RuntimeException)
+                            const Sequence< OUString >& types )
 {
     OString aPKQ,aPKO,aPKN,aCOL;
     const OUString *pSchemaPat = nullptr;
@@ -883,7 +880,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString&
 
 }
 
-void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeException)
+void ODatabaseMetaDataResultSet::openTablesTypes( )
 {
     SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
                             nullptr,0,
@@ -899,7 +896,7 @@ void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeE
     checkColumnCount();
 }
 
-void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException, RuntimeException)
+void ODatabaseMetaDataResultSet::openCatalogs()
 {
     SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
                             reinterpret_cast<SDB_ODBC_CHAR *>(const_cast<char *>(SQL_ALL_CATALOGS)),SQL_NTS,
@@ -916,7 +913,7 @@ void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException, RuntimeExcep
     checkColumnCount();
 }
 
-void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeException)
+void ODatabaseMetaDataResultSet::openSchemas()
 {
     SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
                             reinterpret_cast<SDB_ODBC_CHAR *>(const_cast<char *>("")),SQL_NTS,
@@ -934,7 +931,6 @@ void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeExcept
 
 void ODatabaseMetaDataResultSet::openColumnPrivileges(  const Any& catalog, const OUString& schema,
                                         const OUString& table,   const OUString& columnNamePattern )
-                                        throw(SQLException, RuntimeException)
 {
     const OUString *pSchemaPat = nullptr;
 
@@ -969,7 +965,6 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges(  const Any& catalog, cons
 
 void ODatabaseMetaDataResultSet::openColumns(   const Any& catalog,             const OUString& schemaPattern,
                                 const OUString& tableNamePattern,    const OUString& columnNamePattern )
-                                throw(SQLException, RuntimeException)
 {
     const OUString *pSchemaPat = nullptr;
 
@@ -1037,7 +1032,6 @@ void ODatabaseMetaDataResultSet::openColumns(   const Any& catalog,
 
 void ODatabaseMetaDataResultSet::openProcedureColumns(  const Any& catalog,     const OUString& schemaPattern,
                                 const OUString& procedureNamePattern,const OUString& columnNamePattern )
-                                throw(SQLException, RuntimeException)
 {
     const OUString *pSchemaPat = nullptr;
 
@@ -1071,7 +1065,6 @@ void ODatabaseMetaDataResultSet::openProcedureColumns(  const Any& catalog,
 
 void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUString& schemaPattern,
                                 const OUString& procedureNamePattern)
-                                throw(SQLException, RuntimeException)
 {
     const OUString *pSchemaPat = nullptr;
 
@@ -1102,7 +1095,6 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUStri
 
 void ODatabaseMetaDataResultSet::openSpecialColumns(bool _bRowVer,const Any& catalog, const OUString& schema,
                                     const OUString& table,sal_Int32 scope,   bool nullable )
-                                    throw(SQLException, RuntimeException)
 {
     // Some ODBC drivers really don't like getting an empty string as tableName
     // E.g. psqlodbc up to at least version 09.01.0100 segfaults
@@ -1142,13 +1134,13 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(bool _bRowVer,const Any& cat
 }
 
 void ODatabaseMetaDataResultSet::openVersionColumns(const Any& catalog, const OUString& schema,
-                                    const OUString& table)  throw(SQLException, RuntimeException)
+                                    const OUString& table)
 {
     openSpecialColumns(true,catalog,schema,table,SQL_SCOPE_TRANSACTION,false);
 }
 
 void ODatabaseMetaDataResultSet::openBestRowIdentifier( const Any& catalog, const OUString& schema,
-                                        const OUString& table,sal_Int32 scope,bool nullable ) throw(SQLException, RuntimeException)
+                                        const OUString& table,sal_Int32 scope,bool nullable )
 {
     openSpecialColumns(false,catalog,schema,table,scope,nullable);
 }
@@ -1156,7 +1148,7 @@ void ODatabaseMetaDataResultSet::openBestRowIdentifier( const Any& catalog, cons
 void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const OUString* schema,
                                   const OUString* table,
                                   const Any& catalog2, const OUString* schema2,
-                                  const OUString* table2) throw(SQLException, RuntimeException)
+                                  const OUString* table2)
 {
     OString aPKQ, aPKO, aPKN, aFKQ, aFKO, aFKN;
     if ( catalog.hasValue() )
@@ -1185,20 +1177,20 @@ void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const OUSt
 }
 
 void ODatabaseMetaDataResultSet::openImportedKeys(const Any& catalog, const OUString& schema,
-                                  const OUString& table) throw(SQLException, RuntimeException)
+                                  const OUString& table)
 {
 
     openForeignKeys(Any(),nullptr,nullptr,catalog, schema == "%" ? &schema : nullptr, &table);
 }
 
 void ODatabaseMetaDataResultSet::openExportedKeys(const Any& catalog, const OUString& schema,
-                                  const OUString& table) throw(SQLException, RuntimeException)
+                                  const OUString& table)
 {
     openForeignKeys(catalog, schema == "%" ? &schema : nullptr, &table,Any(),nullptr,nullptr);
 }
 
 void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUString& schema,
-                                  const OUString& table) throw(SQLException, RuntimeException)
+                                  const OUString& table)
 {
     const OUString *pSchemaPat = nullptr;
 
@@ -1227,7 +1219,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUStr
 }
 
 void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const OUString& schemaPattern,
-                                  const OUString& tableNamePattern) throw(SQLException, RuntimeException)
+                                  const OUString& tableNamePattern)
 {
     const OUString *pSchemaPat = nullptr;
 
@@ -1257,7 +1249,6 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const O
 
 void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUString& schema,
                                 const OUString& table, bool unique, bool approximate )
-                                throw(SQLException, RuntimeException)
 {
     const OUString *pSchemaPat = nullptr;
 
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx
index aad846a8e753..c22db08d7226 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -57,7 +57,7 @@ void ODBCDriver::disposing()
 
 // static ServiceInfo
 
-OUString ODBCDriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODBCDriver::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.sdbc.ODBCDriver");
         // this name is referenced in the configuration and in the odbc.xml
@@ -65,31 +65,31 @@ OUString ODBCDriver::getImplementationName_Static(  ) throw(RuntimeException)
 }
 
 
-Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static(  )
 {
     Sequence<OUString> aSNS { "com.sun.star.sdbc.Driver" };
     return aSNS;
 }
 
 
-OUString SAL_CALL ODBCDriver::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL ODBCDriver::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
 
-Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
 
-Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info )
 {
     if ( ! acceptsURL(url) )
         return nullptr;
@@ -109,12 +109,11 @@ Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, cons
 }
 
 sal_Bool SAL_CALL ODBCDriver::acceptsURL( const OUString& url )
-        throw(SQLException, RuntimeException, std::exception)
 {
     return url.startsWith("sdbc:odbc:");
 }
 
-Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception)
+Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ )
 {
     if ( acceptsURL(url) )
     {
@@ -196,12 +195,12 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr
     return Sequence< DriverPropertyInfo >();
 }
 
-sal_Int32 SAL_CALL ODBCDriver::getMajorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODBCDriver::getMajorVersion(  )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL ODBCDriver::getMinorVersion(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODBCDriver::getMinorVersion(  )
 {
     return 0;
 }
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 6b33d555c7f2..545b7645c38c 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -99,19 +99,19 @@ void SAL_CALL OPreparedStatement::release() throw()
     OStatement_BASE2::release();
 }
 
-Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType )
 {
     Any aRet = OStatement_BASE2::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPreparedStatement_BASE::queryInterface(rType);
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes(  )
 {
     return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OStatement_BASE2::getTypes());
 }
 
 
-Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -125,7 +125,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
 }
 
 
-void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::close(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -150,7 +150,7 @@ void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException
 }
 
 
-sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OPreparedStatement::execute(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -213,7 +213,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
 }
 
 
-sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -236,13 +236,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, Run
 }
 
 
-void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x )
 {
     setParameter(parameterIndex, DataType::CHAR, invalid_scale, x);
 }
 
 
-Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -251,7 +251,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
 }
 
 
-Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -271,7 +271,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
 }
 
 
-void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
 {
     // Set the parameter as if it were an integer
     setInt (parameterIndex, x ? 1 : 0 );
@@ -412,18 +412,18 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_
     OTools::ThrowException(m_pConnection.get(), nRetcode, m_aStatementHandle, SQL_HANDLE_STMT, *this);
 }
 
-void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const sal_Int8 x )
 {
     setScalarParameter(parameterIndex, DataType::TINYINT, 3, 0, x);
 }
 
-void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData )
 {
     DATE_STRUCT x(OTools::DateToOdbcDate(aData));
     setScalarParameter<DATE_STRUCT&>(parameterIndex, DataType::DATE, 10, x);
 }
 
-void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal )
 {
     SQLULEN nColSize;
     if(aVal.NanoSeconds == 0)
@@ -451,7 +451,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::
 }
 
 
-void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal )
 {
     SQLULEN nColSize;
     if(aVal.NanoSeconds == 0)
@@ -485,25 +485,25 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const
 }
 
 
-void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x )
 {
     setScalarParameter(parameterIndex, DataType::DOUBLE, 15, x);
 }
 
 
-void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
 {
     setScalarParameter(parameterIndex, DataType::FLOAT, 15, x);
 }
 
 
-void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x )
 {
     setScalarParameter(parameterIndex, DataType::INTEGER, 10, 0, x);
 }
 
 
-void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x )
 {
     try
     {
@@ -516,7 +516,7 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x
 }
 
 
-void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_Int32 _nType ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_Int32 _nType )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     setParameterPre(parameterIndex);
@@ -550,32 +550,32 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_I
 }
 
 
-void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x )
 {
     if ( x.is() )
         setStream(parameterIndex, x->getCharacterStream(), x->length(), DataType::LONGVARCHAR);
 }
 
 
-void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x )
 {
     if ( x.is() )
         setStream(parameterIndex, x->getBinaryStream(), x->length(), DataType::LONGVARBINARY);
 }
 
 
-void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setArray", *this );
 }
 
 
-void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setRef", *this );
 }
 
-void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale )
 {
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -616,13 +616,13 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
 }
 
 
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ )
 {
     setNull(parameterIndex,sqlType);
 }
 
 
-void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x )
 {
     if (!::dbtools::implSetObject(this, parameterIndex, x))
     {   // there is no other setXXX call which can handle the value in x
@@ -631,19 +631,19 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
 }
 
 
-void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x )
 {
     setScalarParameter(parameterIndex, DataType::SMALLINT, 5, 0, x);
 }
 
 
-void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x )
 {
     setParameter(parameterIndex, DataType::BINARY, x);
 }
 
 
-void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     // LEM: It is quite unclear to me what the interface here is.
     // The XInputStream provides *bytes*, not characters.
@@ -651,13 +651,13 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex,
 }
 
 
-void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     setStream(parameterIndex, x, length, DataType::LONGVARBINARY);
 }
 
 
-void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::clearParameters(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     prepareStatement();
@@ -666,7 +666,7 @@ void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, Runtim
     N3SQLFreeStmt (m_aStatementHandle, SQL_UNBIND);
 }
 
-void SAL_CALL OPreparedStatement::clearBatch(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::clearBatch(  )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::clearBatch", *this );
     //  clearParameters(  );
@@ -674,13 +674,13 @@ void SAL_CALL OPreparedStatement::clearBatch(  ) throw(SQLException, RuntimeExce
 }
 
 
-void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::addBatch( )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::addBatch", *this );
 }
 
 
-Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch(  ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch(  )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::executeBatch", *this );
     // not reached, but keep -Werror happy
@@ -695,7 +695,7 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch(  ) throw(SQLExc
 // Initialize the bound parameter objects
 
 
-void OPreparedStatement::initBoundParam () throw(SQLException)
+void OPreparedStatement::initBoundParam ()
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     // Get the number of parameters
@@ -759,7 +759,6 @@ SQLLEN* OPreparedStatement::getLengthBuf (sal_Int32 index)
 // Puts parameter data from a previously bound input stream.  The
 // input stream was bound using SQL_LEN_DATA_AT_EXEC.
 void OPreparedStatement::putParamData (sal_Int32 index)
-    throw (SQLException, RuntimeException)
 {
     // Sanity check the parameter index
     if ((index < 1) ||
@@ -827,7 +826,6 @@ void OPreparedStatement::setStream(
                                     const Reference< XInputStream>& x,
                                     SQLLEN length,
                                     sal_Int32 _nType)
-                                    throw (SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -878,7 +876,7 @@ void OPreparedStatement::FreeParams()
     boundParams = nullptr;
 }
 
-void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception)
+void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     try
     {
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 7c88c3260243..9ad73f59038e 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -258,7 +258,7 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex)
 }
 
 
-css::uno::Reference< css::uno::XInterface >  SAL_CALL ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception )
+css::uno::Reference< css::uno::XInterface >  SAL_CALL ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
 {
     return *(new ORealObdcDriver(_rxFactory));
 }
diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx
index d015bb42c0bd..b4b092b87697 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.hxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.hxx
@@ -34,8 +34,7 @@ namespace connectivity { namespace odbc {
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
-ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory)
-    throw (css::uno::Exception);
+ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory);
 
 } }
 
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 3b2ffb848e99..9b9acd0681f2 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -62,12 +62,12 @@ namespace
 
 
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
-OUString SAL_CALL OResultSet::getImplementationName(  ) throw ( RuntimeException, std::exception)
+OUString SAL_CALL OResultSet::getImplementationName(  )
 {
     return OUString("com.sun.star.sdbcx.odbc.ResultSet");
 }
 
- Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw( RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  )
 {
      Sequence< OUString > aSupported(2);
     aSupported[0] = "com.sun.star.sdbc.ResultSet";
@@ -75,7 +75,7 @@ OUString SAL_CALL OResultSet::getImplementationName(  ) throw ( RuntimeException
     return aSupported;
 }
 
-sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -345,13 +345,13 @@ void OResultSet::releaseBuffer()
     m_aLengthVector.clear();
 }
 
-Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OResultSet::queryInterface( const Type & rType )
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType);
 }
 
- Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException, std::exception)
+ Sequence<  Type > SAL_CALL OResultSet::getTypes(  )
 {
     OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
                             cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -361,7 +361,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 }
 
 
-sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName )
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
@@ -413,7 +413,7 @@ void OResultSet::invalidateCache()
     }
 }
 
-Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -423,7 +423,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*colu
     return nullptr;
 }
 
-Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -443,7 +443,7 @@ template < typename T > T OResultSet::impl_getValue( const sal_Int32 _nColumnInd
 }
 
 // this function exists for the implicit conversion to sal_Bool (compared to a direct call to impl_getValue)
-bool OResultSet::impl_getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+bool OResultSet::impl_getBoolean( sal_Int32 columnIndex )
 {
     return impl_getValue<sal_Int8>(columnIndex, SQL_C_BIT);
 }
@@ -456,18 +456,18 @@ template < typename T > T OResultSet::getValue( sal_Int32 columnIndex )
     m_bWasNull = m_aRow[columnIndex].isNull();
     return m_aRow[columnIndex];
 }
-sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex )
 {
     return getValue<bool>( columnIndex );
 }
 
-sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex )
 {
     return getValue<sal_Int8>( columnIndex );
 }
 
 
-Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -491,7 +491,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro
     }
     return nRet;
 }
-Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex )
 {
     const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex);
 
@@ -512,7 +512,7 @@ Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) throw(SQ
     }
 }
 
-Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+Date OResultSet::impl_getDate( sal_Int32 columnIndex )
 {
     DATE_STRUCT aDate = impl_getValue< DATE_STRUCT> ( columnIndex,
                                                       m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_DATE : SQL_C_TYPE_DATE  );
@@ -520,38 +520,38 @@ Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, Runti
     return Date(aDate.day, aDate.month, aDate.year);
 }
 
-Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex )
 {
     return getValue<Date>( columnIndex );
 }
 
 
-double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex )
 {
     return getValue<double>( columnIndex );
 }
 
 
-float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex )
 {
     return getValue<float>( columnIndex );
 }
 
-sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex )
 {
     return getValue<sal_Int16>( columnIndex );
 }
 
-sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex )
 {
     return getValue<sal_Int32>( columnIndex );
 }
 
-sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex )
 {
     return getValue<sal_Int64>( columnIndex );
 }
-sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex )
 {
     try
     {
@@ -563,7 +563,7 @@ sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) throw(SQLException,
     }
 }
 
-sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::getRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -571,7 +571,7 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException,
     return m_pSkipDeletedSet ? m_pSkipDeletedSet->getMappedPosition(getDriverPos()) : getDriverPos();
 }
 
-Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -582,62 +582,62 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
     return m_xMetaData;
 }
 
-Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getArray", *this );
     return nullptr;
 }
 
 
-Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this );
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBlob", *this );
     return nullptr;
 }
 
 
-Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getRef", *this );
     return nullptr;
 }
 
 
-Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ )
 {
     return getValue<ORowSetValue>( columnIndex ).makeAny();
 }
 
-OUString OResultSet::impl_getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString OResultSet::impl_getString( sal_Int32 columnIndex )
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex);
     return OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,nColumnType,m_bWasNull,**this,m_nTextEncoding);
 }
-OUString OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString OResultSet::getString( sal_Int32 columnIndex )
 {
     return getValue<OUString>( columnIndex );
 }
 
-Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+Time OResultSet::impl_getTime( sal_Int32 columnIndex )
 {
     TIME_STRUCT aTime = impl_getValue< TIME_STRUCT > ( columnIndex,
                                                       m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_TIME : SQL_C_TYPE_TIME );
 
     return Time(0, aTime.second,aTime.minute,aTime.hour, false);
 }
-Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex )
 {
     return getValue<Time>( columnIndex );
 }
 
-DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex )
 {
     TIMESTAMP_STRUCT aTime = impl_getValue< TIMESTAMP_STRUCT > ( columnIndex,
                                                                  m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_TIMESTAMP : SQL_C_TYPE_TIMESTAMP );
@@ -651,19 +651,19 @@ DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex ) throw(SQLExcepti
                     aTime.year,
                     false);
 }
-DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex )
 {
     return getValue<DateTime>( columnIndex );
 }
 
-sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isBeforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_nRowPos == 0;
 }
 
-sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isAfterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -671,7 +671,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
     return m_nRowPos != 0 && m_nCurrentFetchState == SQL_NO_DATA;
 }
 
-sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -679,7 +679,7 @@ sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException,
     return m_nRowPos == 1;
 }
 
-sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::isLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -688,7 +688,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException, s
     return m_bEOF && m_nCurrentFetchState != SQL_NO_DATA;
 }
 
-void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::beforeFirst(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -699,7 +699,7 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException,
     m_nCurrentFetchState = SQL_SUCCESS;
 }
 
-void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::afterLast(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -710,7 +710,7 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException, st
 }
 
 
-void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -721,33 +721,33 @@ void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException, std::e
 }
 
 
-sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::first(  )
 {
     return moveImpl(IResultSetHelper::FIRST,0);
 }
 
 
-sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::last(  )
 {
     return moveImpl(IResultSetHelper::LAST,0);
 }
 
-sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row )
 {
     return moveImpl(IResultSetHelper::ABSOLUTE1,row);
 }
 
-sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row )
 {
     return moveImpl(IResultSetHelper::RELATIVE1,row);
 }
 
-sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::previous(  )
 {
     return moveImpl(IResultSetHelper::PRIOR,0);
 }
 
-Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OResultSet::getStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -755,7 +755,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException
 }
 
 
-sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowDeleted()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -766,7 +766,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException,
     return bRet;
 }
 
-sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowInserted(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -777,7 +777,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeExcepti
     return bInserted;
 }
 
-sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::rowUpdated(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -787,13 +787,13 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
 }
 
 
-sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::next(  )
 {
     return moveImpl(IResultSetHelper::NEXT,1);
 }
 
 
-sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::wasNull(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -802,7 +802,7 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException,
 }
 
 
-void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OResultSet::cancel(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -811,16 +811,16 @@ void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException, std::exception)
     N3SQLCancel(m_aStatementHandle);
 }
 
-void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::clearWarnings(  )
 {
 }
 
-Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OResultSet::getWarnings(  )
 {
     return Any();
 }
 
-void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::insertRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -896,7 +896,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException, st
 
 }
 
-void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -946,7 +946,7 @@ void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException, st
     }
 }
 
-void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::deleteRow(  )
 {
     SQLRETURN nRet = SQL_SUCCESS;
     sal_Int32 nPos = getDriverPos();
@@ -972,12 +972,12 @@ void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException, st
 }
 
 
-void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::cancelRowUpdates(  )
 {
 }
 
 
-void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::moveToInsertRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -991,12 +991,12 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcepti
 }
 
 
-void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::moveToCurrentRow(  )
 {
     invalidateCache();
 }
 
-void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(SQLException, RuntimeException)
+void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1017,7 +1017,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pVa
                         m_pStatement->getOwnConnection()->useOldDateFormat());
 }
 
-void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1028,44 +1028,44 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
 }
 
 
-void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x )
 {
     updateValue(columnIndex,SQL_BIT,&x);
 }
 
-void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x )
 {
     updateValue(columnIndex,SQL_CHAR,&x);
 }
 
 
-void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x )
 {
     updateValue(columnIndex,SQL_TINYINT,&x);
 }
 
-void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x )
 {
     updateValue(columnIndex,SQL_INTEGER,&x);
 }
 
-void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRowUpdate::updateLong", *this );
 }
 
-void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x )
 {
     updateValue(columnIndex,SQL_REAL,&x);
 }
 
 
-void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x )
 {
     updateValue(columnIndex,SQL_DOUBLE,&x);
 }
 
-void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x )
 {
     sal_Int32 nType = m_aRow[columnIndex].getTypeKind();
     SQLSMALLINT nOdbcType = OTools::jdbcTypeToOdbc(nType);
@@ -1075,7 +1075,7 @@ void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x
     updateValue(columnIndex,nOdbcType,const_cast<OUString *>(&x));
 }
 
-void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x )
 {
     sal_Int32 nType = m_aRow[columnIndex].getTypeKind();
     SQLSMALLINT nOdbcType = OTools::jdbcTypeToOdbc(nType);
@@ -1085,28 +1085,28 @@ void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sa
     updateValue(columnIndex,nOdbcType,const_cast<css::uno::Sequence<sal_Int8> *>(&x));
 }
 
-void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x )
 {
     DATE_STRUCT aVal = OTools::DateToOdbcDate(x);
     updateValue(columnIndex,SQL_DATE,&aVal);
 }
 
 
-void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x )
 {
     TIME_STRUCT aVal = OTools::TimeToOdbcTime(x);
     updateValue(columnIndex,SQL_TIME,&aVal);
 }
 
 
-void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime& x )
 {
     TIMESTAMP_STRUCT aVal = OTools::DateTimeToTimestamp(x);
     updateValue(columnIndex,SQL_TIMESTAMP,&aVal);
 }
 
 
-void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length )
 {
     if(!x.is())
         ::dbtools::throwFunctionSequenceException(*this);
@@ -1116,12 +1116,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     updateBytes(columnIndex,aSeq);
 }
 
-void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length )
 {
     updateBinaryStream(columnIndex,x,length);
 }
 
-void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::refreshRow(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1132,28 +1132,28 @@ void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException, s
     OTools::ThrowException(m_pStatement->getOwnConnection(),m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
 
-void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x )
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
 
 
-void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ )
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
 
 // XRowLocate
-Any SAL_CALL OResultSet::getBookmark(  ) throw( SQLException,  RuntimeException, std::exception)
+Any SAL_CALL OResultSet::getBookmark(  )
 {
     fillColumn(0);
     if(m_aRow[0].isNull())
         throw SQLException();
     return m_aRow[0].makeAny();
 }
-Sequence<sal_Int8> OResultSet::impl_getBookmark(  ) throw( SQLException,  RuntimeException)
+Sequence<sal_Int8> OResultSet::impl_getBookmark(  )
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
@@ -1182,7 +1182,7 @@ Sequence<sal_Int8> OResultSet::impl_getBookmark(  ) throw( SQLException,  Runtim
     }
 }
 
-sal_Bool SAL_CALL OResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::moveToBookmark( const  Any& bookmark )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1210,7 +1210,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLE
     return false;
 }
 
-sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1226,7 +1226,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_
     return m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO;
 }
 
-sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const  Any& rhs ) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const  Any& rhs )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1234,19 +1234,19 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const  Any& rhs
     return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL;
 }
 
-sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw( SQLException,  RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  )
 {
     return false;
 }
 
-sal_Int32 SAL_CALL OResultSet::hashBookmark( const  Any& /*bookmark*/ ) throw( SQLException,  RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSet::hashBookmark( const  Any& /*bookmark*/ )
 {
     ::dbtools::throwFunctionNotSupportedSQLException( "XRowLocate::hashBookmark", *this );
     return 0;
 }
 
 // XDeleteRows
-Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const  Sequence<  Any >& rows ) throw( SQLException,  RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const  Sequence<  Any >& rows )
 {
     Sequence< sal_Int32 > aRet(rows.getLength());
     sal_Int32 *pRet = aRet.getArray();
@@ -1434,7 +1434,6 @@ sal_Bool OResultSet::convertFastPropertyValue(
                             Any & rOldValue,
                             sal_Int32 nHandle,
                             const Any& rValue )
-                                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     switch(nHandle)
     {
@@ -1457,7 +1456,6 @@ void OResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& rValue
                                                  )
-                                                 throw (Exception, std::exception)
 {
     switch(nHandle)
     {
@@ -1633,7 +1631,7 @@ void SAL_CALL OResultSet::release() throw()
     OResultSet_BASE::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
index f8bccd491b90..087e94973518 100644
--- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
@@ -30,7 +30,7 @@ OResultSetMetaData::~OResultSetMetaData()
 {
 }
 
-OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident) throw(SQLException, RuntimeException)
+OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident)
 {
     sal_Int32 column = _column;
     if(_column <(sal_Int32) m_vMapping.size()) // use mapping
@@ -80,7 +80,7 @@ SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const css::uno::Reference< css::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
-                                              ,sal_Int32 _ident) throw(SQLException, RuntimeException)
+                                              ,sal_Int32 _ident)
 {
     SQLLEN nValue=0;
     OTools::ThrowException(_pConnection,(*reinterpret_cast<T3SQLColAttribute>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::ColAttribute)))(_aStatementHandle,
@@ -93,7 +93,7 @@ SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
     return nValue;
 }
 
-sal_Int32 OResultSetMetaData::getNumColAttrib(sal_Int32 _column,sal_Int32 ident) throw(SQLException, RuntimeException)
+sal_Int32 OResultSetMetaData::getNumColAttrib(sal_Int32 _column,sal_Int32 ident)
 {
     sal_Int32 column = _column;
     if(_column < (sal_Int32)m_vMapping.size()) // use mapping
@@ -102,7 +102,7 @@ sal_Int32 OResultSetMetaData::getNumColAttrib(sal_Int32 _column,sal_Int32 ident)
     return getNumColAttrib(m_pConnection,m_aStatementHandle,*this,column,ident);
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
 }
@@ -111,7 +111,6 @@ SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const css::uno::Reference< css::uno::XInterface >& _xInterface
                                               ,sal_Int32 column)
-                                               throw(css::sdbc::SQLException, css::uno::RuntimeException)
 {
     SQLSMALLINT nType = 0;
     try
@@ -128,7 +127,7 @@ SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
     return nType;
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column )
 {
     ::std::map<sal_Int32,sal_Int32>::iterator aFind = m_aColumnTypes.find(column);
     if ( aFind == m_aColumnTypes.end() )
@@ -159,7 +158,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(S
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  )
 {
     if(m_nColCount != -1)
         return m_nColCount;
@@ -169,67 +168,67 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, Ru
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_CASE_SENSITIVE) == SQL_TRUE;
 }
 
 
-OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column )
 {
     return getCharColAttrib(column,SQL_DESC_SCHEMA_NAME);
 }
 
 
-OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column )
 {
     return getCharColAttrib(column,SQL_DESC_NAME);
 }
 
-OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column )
 {
     return getCharColAttrib(column,SQL_DESC_TABLE_NAME);
 }
 
-OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column )
 {
     return getCharColAttrib(column,SQL_DESC_CATALOG_NAME);
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column )
 {
     return getCharColAttrib(column,SQL_DESC_TYPE_NAME);
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column )
 {
     return getCharColAttrib(column,SQL_DESC_LABEL);
 }
 
-OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ )
 {
     return OUString();
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_FIXED_PREC_SCALE) == SQL_TRUE;
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_AUTO_UNIQUE_VALUE) == SQL_TRUE;
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_UNSIGNED) == SQL_FALSE;
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column )
 {
     sal_Int32 nType = 0;
     try
@@ -244,7 +243,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ
     return nType;
 }
 
-sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column )
 {
     sal_Int32 nType = 0;
     try
@@ -260,30 +259,30 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::s
 }
 
 
-sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_NULLABLE);
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_SEARCHABLE) != SQL_PRED_NONE;
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_READONLY;
 }
 
 
-sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE;
 }
 
-sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column )
 {
     return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE;
 }
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 5a55ef84dcb2..ea21207d3e61 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -123,7 +123,7 @@ void SAL_CALL OStatement_BASE2::release() throw()
     release_ChildImpl();
 }
 
-Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OStatement_Base::queryInterface( const Type & rType )
 {
     if ( m_pConnection.is() && !m_pConnection->isAutoRetrievingEnabled() && rType == cppu::UnoType<XGeneratedResultSet>::get())
         return Any();
@@ -131,7 +131,7 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
 
-Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OStatement_Base::getTypes(  )
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
                                     cppu::UnoType<XFastPropertySet>::get(),
@@ -147,7 +147,7 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException,
     return ::comphelper::concatSequences(aTypes.getTypes(),aOldTypes);
 }
 
-Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues(  ) throw (SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues(  )
 {
     OSL_ENSURE( m_pConnection.is() && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!");
     Reference< XResultSet > xRes;
@@ -164,7 +164,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues(  ) throw (
     return xRes;
 }
 
-void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OStatement_Base::cancel(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -174,7 +174,7 @@ void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException, std::exception
 }
 
 
-void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatement_Base::close(  )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -185,13 +185,12 @@ void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException, s
 }
 
 
-void SAL_CALL OStatement::clearBatch(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatement::clearBatch(  )
 {
 
 }
 
 void OStatement_Base::reset()
-    throw (SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -212,7 +211,6 @@ void OStatement_Base::reset()
 // clearMyResultSet
 // If a ResultSet was created for this Statement, close it
 void OStatement_Base::clearMyResultSet()
-    throw (SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -230,7 +228,6 @@ void OStatement_Base::clearMyResultSet()
 }
 
 SQLLEN OStatement_Base::getRowCount()
-    throw (SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -251,7 +248,7 @@ SQLLEN OStatement_Base::getRowCount()
 // If the given SQL statement contains a 'FOR UPDATE' clause, change
 // the concurrency to lock so that the row can then be updated.  Returns
 // true if the concurrency has been changed
-bool OStatement_Base::lockIfNecessary (const OUString& sql) throw (SQLException, RuntimeException)
+bool OStatement_Base::lockIfNecessary (const OUString& sql)
 {
     bool rc = false;
 
@@ -290,7 +287,6 @@ bool OStatement_Base::lockIfNecessary (const OUString& sql) throw (SQLException,
 
 
 void OStatement_Base::setWarning (const SQLWarning &ex)
-    throw (SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -303,7 +299,6 @@ void OStatement_Base::setWarning (const SQLWarning &ex)
 // getColumnCount
 // Return the number of columns in the ResultSet
 sal_Int32 OStatement_Base::getColumnCount()
-    throw (SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -322,7 +317,7 @@ sal_Int32 OStatement_Base::getColumnCount()
 }
 
 
-sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -374,7 +369,6 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep
 // returns NULL if the current result is not a ResultSet.
 
 Reference< XResultSet > OStatement_Base::getResultSet(bool checkCount)
-    throw (SQLException, css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -433,7 +427,7 @@ template < typename T, SQLINTEGER BufferLength > SQLRETURN OStatement_Base::setS
 }
 
 
-Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -458,7 +452,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString&
 }
 
 
-Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -467,14 +461,14 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLEx
 }
 
 
-Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OStatement::queryInterface( const Type & rType )
 {
     Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this));
     return aRet.hasValue() ? aRet : OStatement_Base::queryInterface(rType);
 }
 
 
-void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatement::addBatch( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -483,7 +477,7 @@ void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, Ru
     m_aBatchList.push_back(sql);
 }
 
-Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -516,7 +510,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException,
 }
 
 
-sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -544,7 +538,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(S
 }
 
 
-Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -555,7 +549,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLExce
 }
 
 
-sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -573,7 +567,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  ) throw(SQLException, Runti
 }
 
 
-sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatement_Base::getMoreResults(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -624,7 +618,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, Runtim
 }
 
 
-Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OStatement_Base::getWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -634,7 +628,7 @@ Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeExcepti
 }
 
 
-void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatement_Base::clearWarnings(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -913,7 +907,6 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
                             Any & rOldValue,
                             sal_Int32 nHandle,
                             const Any& rValue )
-                                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     bool bConverted = false;
     try
@@ -969,7 +962,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
     return bConverted;
 }
 
-void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception)
+void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     try
     {
@@ -1083,7 +1076,7 @@ OResultSet* OStatement_Base::createResulSet()
     return new OResultSet(m_aStatementHandle,this);
 }
 
-Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index fafc3b8f4e95..1327d3892fe0 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -130,7 +130,7 @@ void OTools::getValue(  OConnection* _pConnection,
                         bool &_bWasNull,
                         const css::uno::Reference< css::uno::XInterface >& _xInterface,
                         void* _pValue,
-                        SQLLEN _nSize) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+                        SQLLEN _nSize)
 {
     const size_t properSize = sqlTypeLen(_nType);
     if ( properSize == static_cast<size_t>(-1) )
@@ -171,7 +171,7 @@ void OTools::bindValue( OConnection* _pConnection,
                         SQLLEN * const pLen,
                         const css::uno::Reference< css::uno::XInterface >& _xInterface,
                         rtl_TextEncoding _nTextEncoding,
-                        bool _bUseOldTimeDate) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+                        bool _bUseOldTimeDate)
 {
     SQLRETURN nRetcode;
     SQLSMALLINT   fSqlType;
@@ -307,7 +307,7 @@ void OTools::ThrowException(const OConnection* _pConnection,
                             const SQLSMALLINT _nHandleType,
                             const Reference< XInterface >& _xInterface,
                             const bool _bNoFound,
-                            const rtl_TextEncoding _nTextEncoding) throw(SQLException)
+                            const rtl_TextEncoding _nTextEncoding)
 {
     switch(_rRetCode)
     {
@@ -365,7 +365,7 @@ Sequence<sal_Int8> OTools::getBytesValue(const OConnection* _pConnection,
                                          const sal_Int32 columnIndex,
                                          const SQLSMALLINT _fSqlType,
                                          bool &_bWasNull,
-                                         const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
+                                         const Reference< XInterface >& _xInterface)
 {
     sal_Int8 aCharArray[2048];
     // First try to fetch the data with the little Buffer:
@@ -418,7 +418,7 @@ OUString OTools::getStringValue(OConnection* _pConnection,
                                        SQLSMALLINT _fSqlType,
                                        bool &_bWasNull,
                                        const Reference< XInterface >& _xInterface,
-                                       const rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
+                                       const rtl_TextEncoding _nTextEncoding)
 {
     OUStringBuffer aData;
     switch(_fSqlType)
@@ -527,7 +527,7 @@ void OTools::GetInfo(OConnection* _pConnection,
                      SQLUSMALLINT _nInfo,
                      OUString &_rValue,
                      const Reference< XInterface >& _xInterface,
-                     rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException)
+                     rtl_TextEncoding _nTextEncoding)
 {
     char aValue[512];
     SQLSMALLINT nValueLen=0;
@@ -542,7 +542,7 @@ void OTools::GetInfo(OConnection* _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
                      sal_Int32 &_rValue,
-                     const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
+                     const Reference< XInterface >& _xInterface)
 {
     SQLSMALLINT nValueLen;
     _rValue = 0;    // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION)
@@ -555,7 +555,7 @@ void OTools::GetInfo(OConnection* _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
                      SQLUINTEGER &_rValue,
-                     const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
+                     const Reference< XInterface >& _xInterface)
 {
     SQLSMALLINT nValueLen;
     _rValue = 0;    // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION)
@@ -568,7 +568,7 @@ void OTools::GetInfo(OConnection* _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
                      SQLUSMALLINT &_rValue,
-                     const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
+                     const Reference< XInterface >& _xInterface)
 {
     SQLSMALLINT nValueLen;
     _rValue = 0;    // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION)
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx
index 508174b18fb7..cf4b439527f2 100644
--- a/connectivity/source/drivers/postgresql/pq_array.cxx
+++ b/connectivity/source/drivers/postgresql/pq_array.cxx
@@ -55,20 +55,17 @@ namespace pq_sdbc_driver
 
 
 OUString Array::getBaseTypeName(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return OUString( "varchar" );
 }
 
 sal_Int32 Array::getBaseType(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return  css::sdbc::DataType::VARCHAR;
 }
 
 css::uno::Sequence< css::uno::Any > Array::getArray(
     const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return comphelper::containerToSequence(m_data);
 }
@@ -77,7 +74,6 @@ css::uno::Sequence< css::uno::Any > Array::getArrayAtIndex(
     sal_Int32 index,
     sal_Int32 count,
     const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     checkRange( index, count );
     return Sequence< Any > ( &m_data[index-1], count );
@@ -85,7 +81,6 @@ css::uno::Sequence< css::uno::Any > Array::getArrayAtIndex(
 
 css::uno::Reference< css::sdbc::XResultSet > Array::getResultSet(
     const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return getResultSetAtIndex( 0 , m_data.size() , typeMap );
 }
@@ -94,7 +89,6 @@ css::uno::Reference< css::sdbc::XResultSet > Array::getResultSetAtIndex(
     sal_Int32 index,
     sal_Int32 count,
     const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     checkRange( index, count );
     std::vector< std::vector< Any > > ret( count );
diff --git a/connectivity/source/drivers/postgresql/pq_array.hxx b/connectivity/source/drivers/postgresql/pq_array.hxx
index 26581c6dced3..41f5ee9f7056 100644
--- a/connectivity/source/drivers/postgresql/pq_array.hxx
+++ b/connectivity/source/drivers/postgresql/pq_array.hxx
@@ -67,32 +67,26 @@ public:
 public: // XArray
 
     // Methods
-    virtual OUString SAL_CALL getBaseTypeName(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getBaseTypeName(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBaseType(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBaseType(  ) override;
 
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArray(
-        const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArrayAtIndex(
         sal_Int32 index,
         sal_Int32 count,
-        const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
     getResultSet(
-        const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSetAtIndex(
         sal_Int32 index,
         sal_Int32 count,
-        const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
 private:
     void checkRange( sal_Int32 index, sal_Int32 count );
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 71cb91b0b4be..5336ef24188f 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -151,7 +151,7 @@ BaseResultSet::~BaseResultSet()
     POSTGRE_TRACE( "dtor BaseResultSet" );
 }
 
-Any BaseResultSet::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any BaseResultSet::queryInterface( const Type & rType )
 {
     Any aRet = BaseResultSet_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
@@ -173,7 +173,7 @@ Any BaseResultSet::queryInterface( const Type & rType ) throw (RuntimeException,
 //     }
 // }
 
-Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exception )
+Sequence<Type > BaseResultSet::getTypes()
 {
     static Sequence< Type > *pCollection;
     if( ! pCollection )
@@ -191,7 +191,7 @@ Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exceptio
     return *pCollection;
 }
 
-Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> BaseResultSet::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -203,7 +203,7 @@ Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException
 //     return new ResultSetMetaData( m_refMutex, this, &m_result );
 // }
 
-sal_Bool BaseResultSet::next(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::next(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -211,49 +211,49 @@ sal_Bool BaseResultSet::next(  ) throw (SQLException, RuntimeException, std::exc
     return m_row < m_rowCount;
 }
 
-sal_Bool BaseResultSet::isBeforeFirst(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::isBeforeFirst(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
     return m_row == -1;
 }
 
-sal_Bool BaseResultSet::isAfterLast(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::isAfterLast(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
     return m_row >= m_rowCount;
 }
 
-sal_Bool BaseResultSet::isFirst(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::isFirst(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
     return m_row == 0 && m_rowCount;
 }
 
-sal_Bool BaseResultSet::isLast(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::isLast(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
     return m_row >= 0 && m_row + 1 == m_rowCount;
 }
 
-void BaseResultSet::beforeFirst(  ) throw (SQLException, RuntimeException, std::exception)
+void BaseResultSet::beforeFirst(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
     m_row = -1;
 }
 
-void BaseResultSet::afterLast(  ) throw (SQLException, RuntimeException, std::exception)
+void BaseResultSet::afterLast(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
     m_row = m_rowCount;
 }
 
-sal_Bool BaseResultSet::first(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::first(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -263,7 +263,7 @@ sal_Bool BaseResultSet::first(  ) throw (SQLException, RuntimeException, std::ex
     return bRet;
 }
 
-sal_Bool BaseResultSet::last(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::last(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -273,14 +273,14 @@ sal_Bool BaseResultSet::last(  ) throw (SQLException, RuntimeException, std::exc
     return bRet;
 }
 
-sal_Int32 BaseResultSet::getRow(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 BaseResultSet::getRow(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
     return m_row +1;
 }
 
-sal_Bool BaseResultSet::absolute( sal_Int32 row ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::absolute( sal_Int32 row )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -299,7 +299,7 @@ sal_Bool BaseResultSet::absolute( sal_Int32 row ) throw (SQLException, RuntimeEx
     return true;
 }
 
-sal_Bool BaseResultSet::relative( sal_Int32 rows ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::relative( sal_Int32 rows )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -312,7 +312,7 @@ sal_Bool BaseResultSet::relative( sal_Int32 rows ) throw (SQLException, RuntimeE
     return true;
 }
 
-sal_Bool BaseResultSet::previous(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::previous(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -322,27 +322,27 @@ sal_Bool BaseResultSet::previous(  ) throw (SQLException, RuntimeException, std:
     return bRet;
 }
 
-void BaseResultSet::refreshRow(  ) throw (SQLException, RuntimeException, std::exception)
+void BaseResultSet::refreshRow(  )
 {
     // TODO: not supported for now
 }
 
-sal_Bool BaseResultSet::rowUpdated(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::rowUpdated(  )
 {
     return false;
 }
 
-sal_Bool BaseResultSet::rowInserted(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::rowInserted(  )
 {
     return false;
 }
 
-sal_Bool BaseResultSet::rowDeleted(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::rowDeleted(  )
 {
     return false;
 }
 
-Reference< XInterface > BaseResultSet::getStatement() throw (SQLException, RuntimeException, std::exception)
+Reference< XInterface > BaseResultSet::getStatement()
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -352,7 +352,7 @@ Reference< XInterface > BaseResultSet::getStatement() throw (SQLException, Runti
 
 //----------------- XRow interface ----------------------------------------------------
 
-sal_Bool BaseResultSet::wasNull(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::wasNull(  )
 {
     return m_wasNull;
 }
@@ -371,7 +371,7 @@ Any BaseResultSet::convertTo( const Any & val , const Type & type )
     return aRet;
 }
 
-sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -397,7 +397,6 @@ sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException,
 }
 
 sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -409,7 +408,6 @@ sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex )
 }
 
 sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -420,7 +418,7 @@ sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex )
     return i;
 }
 
-OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+OUString BaseResultSet::getString( sal_Int32 columnIndex )
 {
     MutexGuard guard(m_refMutex->mutex);
     checkClosed();
@@ -433,7 +431,6 @@ OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException,
 }
 
 sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -445,7 +442,6 @@ sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex )
 }
 
 sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -457,7 +453,6 @@ sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex )
 }
 
 float BaseResultSet::getFloat( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -469,7 +464,6 @@ float BaseResultSet::getFloat( sal_Int32 columnIndex )
 }
 
 double BaseResultSet::getDouble( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -480,7 +474,6 @@ double BaseResultSet::getDouble( sal_Int32 columnIndex )
 }
 
 Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -507,32 +500,27 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex )
 
 
 css::util::Date BaseResultSet::getDate( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return DBTypeConversion::toDate( getString( columnIndex ) );
 }
 
 css::util::Time BaseResultSet::getTime( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return DBTypeConversion::toTime( getString( columnIndex ) );
 }
 
 css::util::DateTime BaseResultSet::getTimestamp( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return DBTypeConversion::toDateTime( getString( columnIndex ) );
 }
 
   // LEM TODO: these look like they are missing an actual implementation
 Reference< css::io::XInputStream > BaseResultSet::getBinaryStream( sal_Int32 /* columnIndex */ )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return nullptr;
 }
 
 Reference< css::io::XInputStream > BaseResultSet::getCharacterStream( sal_Int32 /* columnIndex */ )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return nullptr;
 }
@@ -540,31 +528,26 @@ Reference< css::io::XInputStream > BaseResultSet::getCharacterStream( sal_Int32
 Any BaseResultSet::getObject(
         sal_Int32 /* columnIndex */,
         const Reference< css::container::XNameAccess >& /* typeMap */ )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return Any();
 }
 
 Reference< css::sdbc::XRef > BaseResultSet::getRef( sal_Int32 /* columnIndex */ )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return Reference< css::sdbc::XRef > ();
 }
 
 Reference< css::sdbc::XBlob > BaseResultSet::getBlob( sal_Int32 /* columnIndex */ )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return Reference< css::sdbc::XBlob > ();
 }
 
 Reference< css::sdbc::XClob > BaseResultSet::getClob( sal_Int32 /* columnIndex */ )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return Reference< css::sdbc::XClob > ();
 }
 
 Reference< css::sdbc::XArray > BaseResultSet::getArray( sal_Int32 columnIndex )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return new Array( m_refMutex, parseArray( getString( columnIndex ) ), *this, m_tc );
 }
@@ -576,7 +559,6 @@ Reference< css::sdbc::XArray > BaseResultSet::getArray( sal_Int32 columnIndex )
 
 sal_Bool BaseResultSet::convertFastPropertyValue(
         Any & /* rConvertedValue */, Any & /* rOldValue */, sal_Int32 nHandle, const Any& rValue )
-        throw (IllegalArgumentException)
 {
     bool bRet;
     switch( nHandle )
@@ -620,7 +602,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue(
 
 
 void BaseResultSet::setFastPropertyValue_NoBroadcast(
-    sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception)
+    sal_Int32 nHandle,const Any& rValue )
 {
     m_props[nHandle] = rValue;
 }
@@ -631,7 +613,6 @@ void BaseResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 }
 
 Reference < XPropertySetInfo >  BaseResultSet::getPropertySetInfo()
-        throw(RuntimeException, std::exception)
 {
     return OPropertySetHelper::createPropertySetInfo( getResultSetPropertyArrayHelper() );
 }
@@ -641,7 +622,7 @@ void BaseResultSet::disposing()
     close();
 }
 
-void BaseResultSet::checkColumnIndex(sal_Int32 index ) throw ( SQLException, RuntimeException )
+void BaseResultSet::checkColumnIndex(sal_Int32 index )
 {
     if( index < 1 || index > m_fieldCount )
     {
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
index caf3218b548f..2ac107c1925a 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
@@ -84,12 +84,10 @@ protected:
         @throws css::sdbc::SQLException
         @throws css::uno::RuntimeException
      */
-    virtual void checkClosed()
-        throw ( css::sdbc::SQLException, css::uno::RuntimeException ) = 0;
+    virtual void checkClosed() = 0;
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    void checkColumnIndex( sal_Int32 index )
-        throw ( css::sdbc::SQLException, css::uno::RuntimeException );
+    void checkColumnIndex( sal_Int32 index );
     void checkRowIndex();
 
     virtual css::uno::Any getValue( sal_Int32 columnIndex ) = 0;
@@ -109,18 +107,15 @@ public: // XInterface
     virtual void SAL_CALL acquire() throw() override { BaseResultSet_BASE::acquire(); }
     virtual void SAL_CALL release() throw() override { BaseResultSet_BASE::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
 public: // XCloseable
 //      virtual void SAL_CALL close(  )
 //          throw (css::sdbc::SQLException, css::uno::RuntimeException) = 0;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // XResultSetMetaDataSupplier
 //      virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  )
@@ -128,87 +123,49 @@ public: // XResultSetMetaDataSupplier
 
 public: // XResultSet
     // Methods
-    virtual sal_Bool SAL_CALL next(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isBeforeFirst(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAfterLast(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isFirst(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLast(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL beforeFirst(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL afterLast(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL first(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL last(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getRow(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL absolute( sal_Int32 row )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL relative( sal_Int32 rows )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL previous(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL refreshRow(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL rowUpdated(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL rowInserted(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL rowDeleted(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement()
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL next(  ) override;
+    virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+    virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+    virtual sal_Bool SAL_CALL isFirst(  ) override;
+    virtual sal_Bool SAL_CALL isLast(  ) override;
+    virtual void SAL_CALL beforeFirst(  ) override;
+    virtual void SAL_CALL afterLast(  ) override;
+    virtual sal_Bool SAL_CALL first(  ) override;
+    virtual sal_Bool SAL_CALL last(  ) override;
+    virtual sal_Int32 SAL_CALL getRow(  ) override;
+    virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+    virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+    virtual sal_Bool SAL_CALL previous(  ) override;
+    virtual void SAL_CALL refreshRow(  ) override;
+    virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+    virtual sal_Bool SAL_CALL rowInserted(  ) override;
+    virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() override;
 
 
 public: // XRow
-    virtual sal_Bool SAL_CALL wasNull(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getFloat( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getDouble( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL wasNull(  ) override;
+    virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+    virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+    virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+    virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+    virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+    virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+    virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+    virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+    virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+    virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+    virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
     virtual css::uno::Any SAL_CALL getObject(
         sal_Int32 columnIndex,
-        const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+    virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+    virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+    virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+    virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
 
 public: // XColumnLocate
 //      virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName )
@@ -221,13 +178,11 @@ public: // OPropertySetHelper
         css::uno::Any & rConvertedValue,
         css::uno::Any & rOldValue,
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::lang::IllegalArgumentException) override;
+        const css::uno::Any& rValue ) override;
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+        const css::uno::Any& rValue ) override;
 
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
@@ -236,8 +191,7 @@ public: // OPropertySetHelper
         sal_Int32 nHandle ) const override;
 
     // XPropertySet
-    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
 
 public: // OComponentHelper
     virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 0ae43eee2808..563345047368 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -105,7 +105,7 @@ public:
     {
     }
 
-    virtual void SAL_CALL dispose() throw (std::exception) override
+    virtual void SAL_CALL dispose() override
     {
         if( m_conn.is() )
         {
@@ -199,7 +199,7 @@ typedef ::std::list< css::uno::Reference< css::sdbc::XCloseable > > CloseableLis
 
 typedef ::std::list< css::uno::Reference< css::lang::XComponent > > DisposeableList;
 
-void Connection::close() throw ( SQLException, RuntimeException, std::exception )
+void Connection::close()
 {
     CloseableList lst;
     DisposeableList lstDispose;
@@ -253,7 +253,7 @@ void Connection::removeFromWeakMap( const ::rtl::ByteSequence & id )
         m_myStatements.erase( ii );
 }
 
-Reference< XStatement > Connection::createStatement() throw (SQLException, RuntimeException, std::exception)
+Reference< XStatement > Connection::createStatement()
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -268,7 +268,6 @@ Reference< XStatement > Connection::createStatement() throw (SQLException, Runti
 }
 
 Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sql )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -285,7 +284,6 @@ Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sq
 }
 
 Reference< XPreparedStatement > Connection::prepareCall( const OUString& )
-        throw (SQLException, RuntimeException, std::exception)
 {
     throw SQLException(
         "pq_driver: Callable statements not supported",
@@ -294,39 +292,37 @@ Reference< XPreparedStatement > Connection::prepareCall( const OUString& )
 
 
 OUString Connection::nativeSQL( const OUString& sql )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return sql;
 }
 
-void Connection::setAutoCommit( sal_Bool ) throw (SQLException, RuntimeException, std::exception)
+void Connection::setAutoCommit( sal_Bool )
 {
     // UNSUPPORTED
 }
 
-sal_Bool Connection::getAutoCommit() throw (SQLException, RuntimeException, std::exception)
+sal_Bool Connection::getAutoCommit()
 {
     // UNSUPPORTED
     return true;
 }
 
-void Connection::commit() throw (SQLException, RuntimeException, std::exception)
+void Connection::commit()
 {
     // UNSUPPORTED
 }
 
-void Connection::rollback() throw (SQLException, RuntimeException, std::exception)
+void Connection::rollback()
 {
     // UNSUPPORTED
 }
 
-sal_Bool Connection::isClosed() throw (SQLException, RuntimeException, std::exception)
+sal_Bool Connection::isClosed()
 {
     return m_settings.pConnection == nullptr;
 }
 
 Reference< XDatabaseMetaData > Connection::getMetaData()
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -335,25 +331,24 @@ Reference< XDatabaseMetaData > Connection::getMetaData()
     return m_meta;
 }
 
-void  Connection::setReadOnly( sal_Bool ) throw (SQLException, RuntimeException, std::exception)
+void  Connection::setReadOnly( sal_Bool )
 {
     // UNSUPPORTED
 
 }
 
-sal_Bool Connection::isReadOnly() throw (SQLException, RuntimeException, std::exception)
+sal_Bool Connection::isReadOnly()
 {
     // UNSUPPORTED
     return false;
 }
 
 void Connection::setCatalog( const OUString& )
-        throw (SQLException, RuntimeException, std::exception)
 {
     // UNSUPPORTED
 }
 
-OUString Connection::getCatalog() throw (SQLException, RuntimeException, std::exception)
+OUString Connection::getCatalog()
 {
     MutexGuard guard( m_refMutex->mutex );
     if( m_settings.pConnection == nullptr )
@@ -366,18 +361,17 @@ OUString Connection::getCatalog() throw (SQLException, RuntimeException, std::ex
 }
 
 void Connection::setTransactionIsolation( sal_Int32 )
-        throw (SQLException, RuntimeException, std::exception)
 {
     // UNSUPPORTED
 }
 
-sal_Int32 Connection::getTransactionIsolation() throw (SQLException, RuntimeException, std::exception)
+sal_Int32 Connection::getTransactionIsolation()
 {
     // UNSUPPORTED
     return 0;
 }
 
-Reference< XNameAccess > Connection::getTypeMap() throw (SQLException, RuntimeException, std::exception)
+Reference< XNameAccess > Connection::getTypeMap()
 {
     Reference< XNameAccess > t;
     {
@@ -388,17 +382,16 @@ Reference< XNameAccess > Connection::getTypeMap() throw (SQLException, RuntimeEx
 }
 
 void Connection::setTypeMap( const Reference< XNameAccess >& typeMap )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     m_typeMap = typeMap;
 }
-Any Connection::getWarnings() throw (SQLException, RuntimeException, std::exception)
+Any Connection::getWarnings()
 {
     return Any();
 }
 
-void Connection::clearWarnings() throw (SQLException, RuntimeException, std::exception)
+void Connection::clearWarnings()
 {
 }
 
@@ -484,7 +477,6 @@ static void properties2arrays( const Sequence< PropertyValue > & args,
 }
 
 void Connection::initialize( const Sequence< Any >& aArguments )
-        throw (Exception, RuntimeException, std::exception)
 {
     OUString url;
     Sequence< PropertyValue > args;
@@ -604,7 +596,7 @@ void Connection::disposing()
     close();
 }
 
-void Connection::checkClosed() throw ( SQLException, RuntimeException )
+void Connection::checkClosed()
 {
     if( !m_settings.pConnection )
         throw SQLException( "pq_connection: Connection already closed",
@@ -612,7 +604,6 @@ void Connection::checkClosed() throw ( SQLException, RuntimeException )
 }
 
 Reference< XNameAccess > Connection::getTables()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (isLog(&m_settings, LogLevel::Info))
     {
@@ -628,7 +619,6 @@ Reference< XNameAccess > Connection::getTables()
 }
 
 Reference< XNameAccess > Connection::getViews()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (isLog(&m_settings, LogLevel::Info))
     {
@@ -645,7 +635,6 @@ Reference< XNameAccess > Connection::getViews()
 
 
 Reference< XNameAccess > Connection::getUsers()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (isLog(&m_settings, LogLevel::Info))
     {
@@ -660,7 +649,7 @@ Reference< XNameAccess > Connection::getUsers()
 
 /// @throws Exception
 Reference< XInterface >  ConnectionCreateInstance(
-    const Reference< XComponentContext > & ctx ) throw (Exception, std::exception)
+    const Reference< XComponentContext > & ctx )
 {
     ::rtl::Reference< RefCountedMutex > ref = new RefCountedMutex();
     return * new Connection( ref, ctx );
diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx
index fe5cc2a31996..85f2a7e50f24 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.hxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.hxx
@@ -167,8 +167,7 @@ class Connection : public ConnectionBase
 private:
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    void checkClosed()
-        throw ( css::sdbc::SQLException, css::uno::RuntimeException );
+    void checkClosed();
 
 public:
     Connection(
@@ -178,70 +177,48 @@ public:
     virtual ~Connection( ) override;
 
 public: // XCloseable
-    virtual void SAL_CALL close()
-        throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL close() override;
 
 public: // XConnection
 
-    virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override ;
     virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement(
-        const OUString& sql )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const OUString& sql ) override;
     virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall(
-        const OUString& sql )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL nativeSQL( const OUString& sql )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoCommit(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL commit(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rollback(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isClosed(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setReadOnly( sal_Bool readOnly )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCatalog( const OUString& catalog )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCatalog(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTransactionIsolation( sal_Int32 level )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getTransactionIsolation(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const OUString& sql ) override;
+    virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+    virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+    virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+    virtual void SAL_CALL commit(  ) override;
+    virtual void SAL_CALL rollback(  ) override;
+    virtual sal_Bool SAL_CALL isClosed(  ) override;
+    virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+    virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+    virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+    virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+    virtual OUString SAL_CALL getCatalog(  ) override;
+    virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+    virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
     virtual void SAL_CALL setTypeMap(
-        const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
 public: // XWarningsSupplier
-    virtual css::uno::Any SAL_CALL getWarnings(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearWarnings(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+    virtual void SAL_CALL clearWarnings(  ) override;
 
 public: // XInitialization
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 public: // XTablesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) override;
 
 public: // XUsersSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers(  ) override;
 
 public: // XViewsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews(  ) override;
 
 public:
     virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index a99992655139..db26ab3abb9f 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -130,36 +130,36 @@ DatabaseMetaData::DatabaseMetaData(
     init_getPrivs_stmt();
 }
 
-sal_Bool DatabaseMetaData::allProceduresAreCallable(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::allProceduresAreCallable(  )
 {
     // TODO
     return false;
 }
 
-sal_Bool DatabaseMetaData::allTablesAreSelectable(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::allTablesAreSelectable(  )
 {
     return true;
 }
 
-OUString DatabaseMetaData::getURL(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getURL(  )
 {
     // TODO
     // LEM TODO: implement
     return OUString();
 }
 
-OUString DatabaseMetaData::getUserName(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getUserName(  )
 {
     return m_pSettings->user;
 }
 
-sal_Bool DatabaseMetaData::isReadOnly(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::isReadOnly(  )
 {
     return false;
 }
 
 
-sal_Bool DatabaseMetaData::nullsAreSortedHigh(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::nullsAreSortedHigh(  )
 {
     // Whether NULL values are considered, for sorting purposes, LARGER than any other value.
     // Specification: http://download.oracle.com/javase/6/docs/api/java/sql/DatabaseMetaData.html#nullsAreSortedHigh()
@@ -167,51 +167,51 @@ sal_Bool DatabaseMetaData::nullsAreSortedHigh(  ) throw (SQLException, RuntimeEx
     return true;
 }
 
-sal_Bool DatabaseMetaData::nullsAreSortedLow(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::nullsAreSortedLow(  )
 {
     return ! nullsAreSortedHigh();
 }
 
-sal_Bool DatabaseMetaData::nullsAreSortedAtStart(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::nullsAreSortedAtStart(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::nullsAreSortedAtEnd(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::nullsAreSortedAtEnd(  )
 {
     return false;
 }
 
-OUString DatabaseMetaData::getDatabaseProductName(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getDatabaseProductName(  )
 {
     return OUString("PostgreSQL");
 }
 
-OUString DatabaseMetaData::getDatabaseProductVersion(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getDatabaseProductVersion(  )
 {
     return OUString::createFromAscii( PQparameterStatus( m_pSettings->pConnection, "server_version" ) );
 }
-OUString DatabaseMetaData::getDriverName(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getDriverName(  )
 {
     return OUString("postgresql-sdbc");
 }
 
-OUString DatabaseMetaData::getDriverVersion(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getDriverVersion(  )
 {
     return OUString(PQ_SDBC_DRIVER_VERSION);
 }
 
-sal_Int32 DatabaseMetaData::getDriverMajorVersion(  ) throw (RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getDriverMajorVersion(  )
 {
     return PQ_SDBC_MAJOR;
 }
 
-sal_Int32 DatabaseMetaData::getDriverMinorVersion(  ) throw (RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getDriverMinorVersion(  )
 {
     return PQ_SDBC_MINOR;
 }
 
-sal_Bool DatabaseMetaData::usesLocalFiles(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::usesLocalFiles(  )
 {
     // LEM TODO:
     //           http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/XDatabaseMetaData_Interface
@@ -222,62 +222,62 @@ sal_Bool DatabaseMetaData::usesLocalFiles(  ) throw (SQLException, RuntimeExcept
     return false;
 }
 
-sal_Bool DatabaseMetaData::usesLocalFilePerTable(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::usesLocalFilePerTable(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsMixedCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::storesUpperCaseIdentifiers(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::storesUpperCaseIdentifiers(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::storesLowerCaseIdentifiers(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::storesLowerCaseIdentifiers(  )
 {
     return true;
 }
 
 
-sal_Bool DatabaseMetaData::storesMixedCaseIdentifiers(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::storesMixedCaseIdentifiers(  )
 {
     return false;
 }
 
 
-sal_Bool DatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::storesUpperCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
 
-sal_Bool DatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::storesLowerCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
 
-sal_Bool DatabaseMetaData::storesMixedCaseQuotedIdentifiers(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::storesMixedCaseQuotedIdentifiers(  )
 {
     return false;
 }
 
 
-OUString DatabaseMetaData::getIdentifierQuoteString(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getIdentifierQuoteString(  )
 {
     return OUString("\"");
 }
 
-OUString DatabaseMetaData::getSQLKeywords(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getSQLKeywords(  )
 {
     // In Java 6, this is all keywords that are not SQL:2003
     // In Java 2 v1.4 and as per LibreOffice SDK doc, this is all keywords that are not SQL92
@@ -312,7 +312,7 @@ OUString DatabaseMetaData::getSQLKeywords(  ) throw (SQLException, RuntimeExcept
         "WINDOW" //SQL:2003
  );
 }
-OUString DatabaseMetaData::getNumericFunctions(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getNumericFunctions(  )
 {
     // See http://www.postgresql.org/docs/9.1/static/functions-math.html
     // LEM TODO: Err... http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Support_Scalar_Functions
@@ -353,7 +353,7 @@ OUString DatabaseMetaData::getNumericFunctions(  ) throw (SQLException, RuntimeE
  );
 }
 
-OUString DatabaseMetaData::getStringFunctions(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getStringFunctions(  )
 {
     // See http://www.postgresql.org/docs/9.1/static/functions-string.html
     return OUString(
@@ -407,7 +407,7 @@ OUString DatabaseMetaData::getStringFunctions(  ) throw (SQLException, RuntimeEx
  );
 }
 
-OUString DatabaseMetaData::getSystemFunctions(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getSystemFunctions(  )
 {
     // See http://www.postgresql.org/docs/9.1/static/functions-info.html
     // and http://www.postgresql.org/docs/9.1/static/functions-admin.html
@@ -536,7 +536,7 @@ OUString DatabaseMetaData::getSystemFunctions(  ) throw (SQLException, RuntimeEx
         "pg_sleep"
  );
 }
-OUString DatabaseMetaData::getTimeDateFunctions(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getTimeDateFunctions(  )
 {
     // TODO
     return OUString(
@@ -565,112 +565,112 @@ OUString DatabaseMetaData::getTimeDateFunctions(  ) throw (SQLException, Runtime
         "transaction_timestamp,"
  );
 }
-OUString DatabaseMetaData::getSearchStringEscape(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getSearchStringEscape(  )
 {
     return OUString("\\");
 }
-OUString DatabaseMetaData::getExtraNameCharacters(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getExtraNameCharacters(  )
 {
     return OUString("$");
 }
 
-sal_Bool DatabaseMetaData::supportsAlterTableWithAddColumn(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsAlterTableWithAddColumn(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsAlterTableWithDropColumn(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsAlterTableWithDropColumn(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsColumnAliasing(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsColumnAliasing(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::nullPlusNonNullIsNull(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::nullPlusNonNullIsNull(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsTypeConversion(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsTypeConversion(  )
 {
     // LEM: this is specifically whether the "CONVERT" function is supported
     //      It seems that in PostgreSQL, that function is only for string encoding, so no.
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType )
 {
     (void) fromType; (void) toType;
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsTableCorrelationNames(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsTableCorrelationNames(  )
 {
     // LEM: A correlation name is "bar" in "SELECT foo FROM qux [AS] bar WHERE ..."
     return true;
 }
 
 
-sal_Bool DatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 {
     return false;
 }
-sal_Bool DatabaseMetaData::supportsExpressionsInOrderBy(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsExpressionsInOrderBy(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsOrderByUnrelated(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsOrderByUnrelated(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsGroupBy(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsGroupBy(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsGroupByUnrelated(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsGroupByUnrelated(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsGroupByBeyondSelect(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsGroupByBeyondSelect(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsLikeEscapeClause(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsLikeEscapeClause(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsMultipleResultSets(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsMultipleResultSets(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsMultipleTransactions(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsMultipleTransactions(  )
 {
     // Allows multiple transactions open at once (on different connections!)
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsNonNullableColumns(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsNonNullableColumns(  )
 {
     return true;
 }
 
 
-sal_Bool DatabaseMetaData::supportsMinimumSQLGrammar(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsMinimumSQLGrammar(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsCoreSQLGrammar(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsCoreSQLGrammar(  )
 {
     // LEM: jdbc driver says not, although the comments in it seem old
     //      fdo#45249 Base query design won't use any aggregate function
@@ -681,123 +681,123 @@ sal_Bool DatabaseMetaData::supportsCoreSQLGrammar(  ) throw (SQLException, Runti
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsExtendedSQLGrammar(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsExtendedSQLGrammar(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsANSI92EntryLevelSQL(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsANSI92IntermediateSQL(  )
 {
     // LEM: jdbc driver says not, although the comments in it seem old
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsANSI92FullSQL(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsANSI92FullSQL(  )
 {
     // LEM: jdbc driver says not, although the comments in it seem old
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsIntegrityEnhancementFacility(  )
 {
     // LEM: jdbc driver says yes, although comment says they are not sure what this means...
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsOuterJoins(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsOuterJoins(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsFullOuterJoins(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsFullOuterJoins(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsLimitedOuterJoins(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsLimitedOuterJoins(  )
 {
     return true;
 }
 
 
-OUString DatabaseMetaData::getSchemaTerm(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getSchemaTerm(  )
 {
     return OUString("SCHEMA");
 }
 
-OUString DatabaseMetaData::getProcedureTerm(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getProcedureTerm(  )
 {
     return OUString("function");
 }
 
-OUString DatabaseMetaData::getCatalogTerm(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getCatalogTerm(  )
 {
     return OUString("DATABASE");
 }
 
-sal_Bool DatabaseMetaData::isCatalogAtStart(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::isCatalogAtStart(  )
 {
     return true;
 }
 
-OUString DatabaseMetaData::getCatalogSeparator(  ) throw (SQLException, RuntimeException, std::exception)
+OUString DatabaseMetaData::getCatalogSeparator(  )
 {
     return OUString(".");
 }
 
-sal_Bool DatabaseMetaData::supportsSchemasInDataManipulation(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSchemasInDataManipulation(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSchemasInProcedureCalls(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsSchemasInTableDefinitions(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSchemasInTableDefinitions(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSchemasInIndexDefinitions(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsCatalogsInDataManipulation(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsCatalogsInDataManipulation(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsCatalogsInProcedureCalls(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsCatalogsInTableDefinitions(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsCatalogsInTableDefinitions(  )
 {
     return false;
 }
 
 
-sal_Bool DatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsCatalogsInIndexDefinitions(  )
 {
     return false;
 }
 
 
-sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 {
     return false;
 }
@@ -807,98 +807,97 @@ sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw (SQL
 // to be supported; see {UPDATE,DELETE} /table/ (...) WHERE CURRENT OF /cursor_name/" syntax
 // and http://www.postgresql.org/docs/9.1/static/view-pg-cursors.html
 // http://www.postgresql.org/docs/9.1/static/libpq-example.html actually uses a cursor :)
-sal_Bool DatabaseMetaData::supportsPositionedDelete(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsPositionedDelete(  )
 {
     // LEM: jdbc driver says not, although the comments in it seem old
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsPositionedUpdate(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsPositionedUpdate(  )
 {
     // LEM: jdbc driver says not, although the comments in it seem old
     return false;
 }
 
 
-sal_Bool DatabaseMetaData::supportsSelectForUpdate(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSelectForUpdate(  )
 {
     return true;
 }
 
 
-sal_Bool DatabaseMetaData::supportsStoredProcedures(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsStoredProcedures(  )
 {
     return true;
 }
 
 
-sal_Bool DatabaseMetaData::supportsSubqueriesInComparisons(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSubqueriesInComparisons(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsSubqueriesInExists(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSubqueriesInExists(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsSubqueriesInIns(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSubqueriesInIns(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsSubqueriesInQuantifieds(  )
 {
     // LEM: jdbc driver says yes, although comment says they don't know what this means...
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsCorrelatedSubqueries(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsCorrelatedSubqueries(  )
 {
     return true;
 }
-sal_Bool DatabaseMetaData::supportsUnion(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsUnion(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsUnionAll(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsUnionAll(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossCommit(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossRollback(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossCommit(  )
 {
     return true;
 }
-sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossRollback(  )
 {
     return true;
 }
 
-sal_Int32 DatabaseMetaData::getMaxBinaryLiteralLength(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxBinaryLiteralLength(  )
 {
     return 0;
 }
 
-sal_Int32 DatabaseMetaData::getMaxCharLiteralLength(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxCharLiteralLength(  )
 {
     return 0;
 }
 
 // Copied / adapted / simplified from JDBC driver
 sal_Int32 DatabaseMetaData::getIntSetting(const OUString& settingName)
-    throw (css::sdbc::SQLException, css::uno::RuntimeException)
 {
     MutexGuard guard( m_refMutex->mutex );
 
@@ -913,7 +912,6 @@ sal_Int32 DatabaseMetaData::getIntSetting(const OUString& settingName)
 }
 
 sal_Int32 DatabaseMetaData::getMaxNameLength()
-    throw (css::sdbc::SQLException, css::uno::RuntimeException)
 {
     if ( m_pSettings->maxNameLen == 0)
         m_pSettings->maxNameLen = getIntSetting( "max_identifier_length" );
@@ -922,7 +920,6 @@ sal_Int32 DatabaseMetaData::getMaxNameLength()
 }
 
 sal_Int32 DatabaseMetaData::getMaxIndexKeys()
-    throw (css::sdbc::SQLException, css::uno::RuntimeException)
 {
     if ( m_pSettings->maxIndexKeys == 0)
         m_pSettings->maxIndexKeys = getIntSetting("max_index_keys");
@@ -930,69 +927,69 @@ sal_Int32 DatabaseMetaData::getMaxIndexKeys()
     return m_pSettings->maxIndexKeys;
 }
 
-sal_Int32 DatabaseMetaData::getMaxColumnNameLength(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxColumnNameLength(  )
 {
     return getMaxNameLength();
 }
 
-sal_Int32 DatabaseMetaData::getMaxColumnsInGroupBy(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxColumnsInGroupBy(  )
 {
     return 0;
 }
 
-sal_Int32 DatabaseMetaData::getMaxColumnsInIndex(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxColumnsInIndex(  )
 {
     return getMaxIndexKeys();
 }
 
-sal_Int32 DatabaseMetaData::getMaxColumnsInOrderBy(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxColumnsInOrderBy(  )
 {
     return 0;
 }
 
-sal_Int32 DatabaseMetaData::getMaxColumnsInSelect(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxColumnsInSelect(  )
 {
     return 0;
 }
 
-sal_Int32 DatabaseMetaData::getMaxColumnsInTable(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxColumnsInTable(  )
 {
     return 1600;
 }
 
-sal_Int32 DatabaseMetaData::getMaxConnections(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxConnections(  )
 {
     // LEM: The JDBC driver returns an arbitrary 8192; truth is as much as OS / hardware supports
     return 0;
 }
 
-sal_Int32 DatabaseMetaData::getMaxCursorNameLength(  ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know
+sal_Int32 DatabaseMetaData::getMaxCursorNameLength(  ) //TODO, don't know
 {
     return getMaxNameLength();
 }
 
-sal_Int32 DatabaseMetaData::getMaxIndexLength(  ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know
+sal_Int32 DatabaseMetaData::getMaxIndexLength(  ) //TODO, don't know
 {
     // LEM: that's the index itself, not its name
     return 0;
 }
 
-sal_Int32 DatabaseMetaData::getMaxSchemaNameLength(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxSchemaNameLength(  )
 {
     return getMaxNameLength();
 }
 
-sal_Int32 DatabaseMetaData::getMaxProcedureNameLength(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxProcedureNameLength(  )
 {
     return getMaxNameLength();
 }
 
-sal_Int32 DatabaseMetaData::getMaxCatalogNameLength(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxCatalogNameLength(  )
 {
     return getMaxNameLength();
 }
 
-sal_Int32 DatabaseMetaData::getMaxRowSize(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxRowSize(  )
 {
     // jdbc driver says 1GB, but http://www.postgresql.org/about/ says 1.6TB
     // and that 1GB is the maximum _field_ size
@@ -1000,14 +997,14 @@ sal_Int32 DatabaseMetaData::getMaxRowSize(  ) throw (SQLException, RuntimeExcept
     return 0;
 }
 
-sal_Bool DatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::doesMaxRowSizeIncludeBlobs(  )
 {
     // LEM: Err... PostgreSQL basically does not do BLOBs well
     //      In any case, BLOBs do not change the maximal row length AFAIK
     return true;
 }
 
-sal_Int32 DatabaseMetaData::getMaxStatementLength(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxStatementLength(  )
 {
     // LEM: actually, that would be 2^sizeof(size_t)-1
     //      on the server? on the client (because of libpq)? minimum of the two? not sure
@@ -1015,37 +1012,37 @@ sal_Int32 DatabaseMetaData::getMaxStatementLength(  ) throw (SQLException, Runti
     return 0;
 }
 
-sal_Int32 DatabaseMetaData::getMaxStatements(  ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know
+sal_Int32 DatabaseMetaData::getMaxStatements(  ) //TODO, don't know
 {
     return 0;
 }
 
-sal_Int32 DatabaseMetaData::getMaxTableNameLength(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxTableNameLength(  )
 {
     return getMaxNameLength();
 }
 
-sal_Int32 DatabaseMetaData::getMaxTablesInSelect(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxTablesInSelect(  )
 {
     return 0;
 }
 
-sal_Int32 DatabaseMetaData::getMaxUserNameLength(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getMaxUserNameLength(  )
 {
     return getMaxNameLength();
 }
 
-sal_Int32 DatabaseMetaData::getDefaultTransactionIsolation(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Int32 DatabaseMetaData::getDefaultTransactionIsolation(  )
 {
     return css::sdbc::TransactionIsolation::READ_COMMITTED;
 }
 
-sal_Bool DatabaseMetaData::supportsTransactions(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsTransactions(  )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level )
 {
     if ( level == css::sdbc::TransactionIsolation::READ_COMMITTED
          || level == css::sdbc::TransactionIsolation::SERIALIZABLE
@@ -1057,22 +1054,21 @@ sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level )
 }
 
 sal_Bool DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsDataManipulationTransactionsOnly(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::dataDefinitionCausesTransactionCommit(  )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions(  )
 {
     return false;
 }
@@ -1080,7 +1076,7 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw (SQLExc
 css::uno::Reference< XResultSet > DatabaseMetaData::getProcedures(
     const css::uno::Any& catalog,
     const OUString& schemaPattern,
-    const OUString& procedureNamePattern ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& procedureNamePattern )
 {
     (void) catalog; (void) schemaPattern; (void) procedureNamePattern;
 //        1.  PROCEDURE_CAT string =&gt; procedure catalog (may be NULL )
@@ -1106,7 +1102,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getProcedureColumns(
     const css::uno::Any& catalog,
     const OUString& schemaPattern,
     const OUString& procedureNamePattern,
-    const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& columnNamePattern )
 {
     (void) catalog; (void) schemaPattern; (void) procedureNamePattern; (void) columnNamePattern;
     MutexGuard guard( m_refMutex->mutex );
@@ -1121,7 +1117,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getTables(
     const OUString& schemaPattern,
     const OUString& tableNamePattern,
     const css::uno::Sequence< OUString >& types )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) catalog; (void) types;
     Statics &statics = getStatics();
@@ -1256,7 +1251,6 @@ namespace
 }
 
 css::uno::Reference< XResultSet > DatabaseMetaData::getSchemas(  )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
 
@@ -1291,7 +1285,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getSchemas(  )
 }
 
 css::uno::Reference< XResultSet > DatabaseMetaData::getCatalogs(  )
-    throw (SQLException, RuntimeException, std::exception)
 {
     // LEM TODO: return the current catalog like JDBC driver?
     //           at least fake the columns, even if no content
@@ -1301,7 +1294,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getCatalogs(  )
 }
 
 css::uno::Reference< XResultSet > DatabaseMetaData::getTableTypes(  )
-    throw (SQLException, RuntimeException, std::exception)
 {
     // LEM TODO: this can be made dynamic, see JDBC driver
     MutexGuard guard( m_refMutex->mutex );
@@ -1457,7 +1449,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumns(
     const css::uno::Any& catalog,
     const OUString& schemaPattern,
     const OUString& tableNamePattern,
-    const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& columnNamePattern )
 {
     (void) catalog;
     // LEM TODO: review in comparison with JDBC driver
@@ -1643,7 +1635,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumnPrivileges(
     const css::uno::Any& catalog,
     const OUString& schema,
     const OUString& table,
-    const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& columnNamePattern )
 {
     (void) catalog;
 
@@ -1674,7 +1666,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumnPrivileges(
 css::uno::Reference< XResultSet > DatabaseMetaData::getTablePrivileges(
     const css::uno::Any&,
     const OUString& schemaPattern,
-    const OUString& tableNamePattern ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& tableNamePattern )
 {
     MutexGuard guard( m_refMutex->mutex );
 
@@ -1702,7 +1694,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getBestRowIdentifier(
     const OUString&,
     const OUString&,
     sal_Int32,
-    sal_Bool ) throw (SQLException, RuntimeException, std::exception)
+    sal_Bool )
 {
     //LEM TODO: implement! See JDBC driver
     MutexGuard guard( m_refMutex->mutex );
@@ -1713,7 +1705,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getBestRowIdentifier(
 css::uno::Reference< XResultSet > DatabaseMetaData::getVersionColumns(
     const css::uno::Any&,
     const OUString&,
-    const OUString& ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& )
 {
     //LEM TODO: implement! See JDBC driver
     MutexGuard guard( m_refMutex->mutex );
@@ -1724,7 +1716,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getVersionColumns(
 css::uno::Reference< XResultSet > DatabaseMetaData::getPrimaryKeys(
     const css::uno::Any&,
     const OUString& schema,
-    const OUString& table ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& table )
 {
     //LEM TODO: review
     MutexGuard guard( m_refMutex->mutex );
@@ -2075,7 +2067,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getImportedExportedKeys(
     const OUString& primaryTable,
     const Any& /* foreignCatalog */,
     const OUString& foreignSchema,
-    const OUString& foreignTable ) throw (SQLException, RuntimeException)
+    const OUString& foreignTable )
 {
     unsigned int i = 0;
     if ( ! primarySchema.isEmpty() )
@@ -2109,7 +2101,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getImportedExportedKeys(
 css::uno::Reference< XResultSet > DatabaseMetaData::getImportedKeys(
     const css::uno::Any& catalog,
     const OUString& schema,
-    const OUString& table ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& table )
 {
     return getImportedExportedKeys(Any(), OUString(), OUString(), catalog, schema, table);
 }
@@ -2117,7 +2109,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getImportedKeys(
 css::uno::Reference< XResultSet > DatabaseMetaData::getExportedKeys(
     const css::uno::Any& catalog,
     const OUString& schema,
-    const OUString& table ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& table )
 {
     return getImportedExportedKeys(catalog, schema, table, Any(), OUString(), OUString());
 }
@@ -2128,7 +2120,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getCrossReference(
     const OUString& primaryTable,
     const css::uno::Any& foreignCatalog,
     const OUString& foreignSchema,
-    const OUString& foreignTable ) throw (SQLException, RuntimeException, std::exception)
+    const OUString& foreignTable )
 {
     return getImportedExportedKeys( primaryCatalog, primarySchema, primaryTable, foreignCatalog, foreignSchema, foreignTable );
 }
@@ -2323,7 +2315,6 @@ namespace
 
 
 css::uno::Reference< XResultSet > DatabaseMetaData::getTypeInfo(  )
-    throw (SQLException, RuntimeException, std::exception)
 {
     // Note: Indexes start at 0 (in the API doc, they start at 1)
     MutexGuard guard( m_refMutex->mutex );
@@ -2378,7 +2369,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo(
     const OUString& schema,
     const OUString& table,
     sal_Bool unique,
-    sal_Bool ) throw (SQLException, RuntimeException, std::exception)
+    sal_Bool )
 {
     //LEM TODO: review
     MutexGuard guard( m_refMutex->mutex );
@@ -2499,7 +2490,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo(
 }
 
 sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType )
-    throw (SQLException, RuntimeException, std::exception)
 {
     if ( setType == css::sdbc::ResultSetType::SCROLL_SENSITIVE )
         return false;
@@ -2508,7 +2498,7 @@ sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType )
 }
 
 sal_Bool DatabaseMetaData::supportsResultSetConcurrency(
-    sal_Int32 setType, sal_Int32 concurrency ) throw (SQLException, RuntimeException, std::exception)
+    sal_Int32 setType, sal_Int32 concurrency )
 {
     (void) concurrency;
     if ( ! supportsResultSetType( setType ) )
@@ -2517,56 +2507,56 @@ sal_Bool DatabaseMetaData::supportsResultSetConcurrency(
         return true;
 }
 
-sal_Bool DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /* setType */ )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::ownDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::ownDeletesAreVisible( sal_Int32 /* setType */ )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::ownInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::ownInsertsAreVisible( sal_Int32 /* setType */ )
 {
     return true;
 }
 
-sal_Bool DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /* setType */ )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::othersDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::othersDeletesAreVisible( sal_Int32 /* setType */ )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::othersInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::othersInsertsAreVisible( sal_Int32 /* setType */ )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::updatesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::updatesAreDetected( sal_Int32 /* setType */ )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::deletesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::deletesAreDetected( sal_Int32 /* setType */ )
 {
     return false;
 }
-sal_Bool DatabaseMetaData::insertsAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::insertsAreDetected( sal_Int32 /* setType */ )
 {
     return false;
 }
 
-sal_Bool DatabaseMetaData::supportsBatchUpdates(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool DatabaseMetaData::supportsBatchUpdates(  )
 {
     return true;
 }
 
-css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any&, const OUString&, const OUString&, const css::uno::Sequence< sal_Int32 >& ) throw (SQLException, RuntimeException, std::exception)
+css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any&, const OUString&, const OUString&, const css::uno::Sequence< sal_Int32 >& )
 {
     //LEM TODO: implement! See JDBC driver
     MutexGuard guard( m_refMutex->mutex );
@@ -2575,7 +2565,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any
 }
 
 css::uno::Reference< css::sdbc::XConnection > DatabaseMetaData::getConnection()
-    throw (SQLException, RuntimeException, std::exception)
 {
     return m_origin;
 }
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
index 7087f20387c4..2bb4ce1a0ddf 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx
@@ -58,19 +58,18 @@ class DatabaseMetaData :
 
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    sal_Int32 getIntSetting(const OUString& settingName) throw (css::sdbc::SQLException, css::uno::RuntimeException);
+    sal_Int32 getIntSetting(const OUString& settingName);
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    sal_Int32 getMaxIndexKeys()  throw (css::sdbc::SQLException, css::uno::RuntimeException);
+    sal_Int32 getMaxIndexKeys();
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    sal_Int32 getMaxNameLength() throw (css::sdbc::SQLException, css::uno::RuntimeException);
+    sal_Int32 getMaxNameLength();
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::sdbc::XResultSet > getImportedExportedKeys(
         const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable,
-        const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException);
+        const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable );
     void init_getReferences_stmt ();
     void init_getPrivs_stmt ();
 
@@ -83,155 +82,155 @@ public:
 
 public:
     // Methods
-    virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getURL(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getUserName(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDatabaseProductName(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDriverName(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDriverVersion(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getIdentifierQuoteString(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSQLKeywords(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNumericFunctions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getStringFunctions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSystemFunctions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTimeDateFunctions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSearchStringEscape(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getExtraNameCharacters(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSchemaTerm(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getProcedureTerm(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCatalogTerm(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isCatalogAtStart(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCatalogSeparator(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsUnion(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxStatements(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsTransactions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+    virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+    virtual OUString SAL_CALL getURL(  ) override;
+    virtual OUString SAL_CALL getUserName(  ) override;
+    virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+    virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+    virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+    virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+    virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+    virtual OUString SAL_CALL getDatabaseProductName(  ) override;
+    virtual OUString SAL_CALL getDatabaseProductVersion(  ) override;
+    virtual OUString SAL_CALL getDriverName(  ) override;
+    virtual OUString SAL_CALL getDriverVersion(  ) override;
+    virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+    virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+    virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+    virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+    virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+    virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+    virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+    virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
+    virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) override;
+    virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+    virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
+    virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) override;
+    virtual OUString SAL_CALL getIdentifierQuoteString(  ) override;
+    virtual OUString SAL_CALL getSQLKeywords(  ) override;
+    virtual OUString SAL_CALL getNumericFunctions(  ) override;
+    virtual OUString SAL_CALL getStringFunctions(  ) override;
+    virtual OUString SAL_CALL getSystemFunctions(  ) override;
+    virtual OUString SAL_CALL getTimeDateFunctions(  ) override;
+    virtual OUString SAL_CALL getSearchStringEscape(  ) override;
+    virtual OUString SAL_CALL getExtraNameCharacters(  ) override;
+    virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) override;
+    virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) override;
+    virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+    virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+    virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+    virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+    virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+    virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+    virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+    virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+    virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+    virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+    virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+    virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+    virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+    virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+    virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+    virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+    virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+    virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+    virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+    virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+    virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+    virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+    virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+    virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+    virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+    virtual OUString SAL_CALL getSchemaTerm(  ) override;
+    virtual OUString SAL_CALL getProcedureTerm(  ) override;
+    virtual OUString SAL_CALL getCatalogTerm(  ) override;
+    virtual sal_Bool SAL_CALL isCatalogAtStart(  ) override;
+    virtual OUString SAL_CALL getCatalogSeparator(  ) override;
+    virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) override;
+    virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+    virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) override;
+    virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+    virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+    virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) override;
+    virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
+    virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) override;
+    virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+    virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+    virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+    virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+    virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+    virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+    virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+    virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+    virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+    virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+    virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+    virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+    virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+    virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+    virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+    virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+    virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+    virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxStatements(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) override;
+    virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+    virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+    virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+    virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+    virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+    virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+    virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+    virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override;
+    virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+    virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+    virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
 };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 5388f3409e50..21fa728448a0 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -81,7 +81,6 @@ Sequence< OUString > DriverGetSupportedServiceNames()
 
 Reference< XConnection > Driver::connect(
     const OUString& url,const Sequence< PropertyValue >& info )
-    throw (SQLException, RuntimeException, std::exception)
 {
     if( ! acceptsURL( url ) )  // XDriver spec tells me to do so ...
         return Reference< XConnection > ();
@@ -97,45 +96,40 @@ Reference< XConnection > Driver::connect(
 }
 
 sal_Bool Driver::acceptsURL( const OUString& url )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return url.startsWith( "sdbc:postgresql:" );
 }
 
 Sequence< DriverPropertyInfo > Driver::getPropertyInfo(
     const OUString& url,const Sequence< PropertyValue >& info )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void)url; (void)info;
     return Sequence< DriverPropertyInfo > ();
 }
 
-sal_Int32  Driver::getMajorVersion(  ) throw (RuntimeException, std::exception)
+sal_Int32  Driver::getMajorVersion(  )
 {
     return PQ_SDBC_MAJOR;
 }
 
 
-sal_Int32 Driver::getMinorVersion(  ) throw (RuntimeException, std::exception)
+sal_Int32 Driver::getMinorVersion(  )
 {
     return PQ_SDBC_MINOR;
 }
 
     // XServiceInfo
 OUString SAL_CALL Driver::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return DriverGetImplementationName();
 }
 
 sal_Bool Driver::supportsService(const OUString& ServiceName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > Driver::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return DriverGetSupportedServiceNames();
 }
@@ -149,14 +143,12 @@ void Driver::disposing()
 
 Reference< XTablesSupplier > Driver::getDataDefinitionByConnection(
     const Reference< XConnection >& connection )
-        throw (SQLException, RuntimeException, std::exception)
 {
      return Reference< XTablesSupplier >( connection , UNO_QUERY );
 }
 
 Reference< XTablesSupplier > Driver::getDataDefinitionByURL(
     const OUString& url, const Sequence< PropertyValue >& info )
-        throw (SQLException, RuntimeException, std::exception)
 {
     return Reference< XTablesSupplier > ( connect( url, info ), UNO_QUERY );
 }
@@ -189,29 +181,24 @@ public:
 
     // XSingleComponentFactory
     virtual Reference< XInterface > SAL_CALL createInstanceWithContext(
-        Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override;
+        Reference< XComponentContext > const & xContext ) override;
     virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
         Sequence< Any > const & rArguments,
-        Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override;
+        Reference< XComponentContext > const & xContext ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw(css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     {
         return m_implName;
     }
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw(css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override
     {
         for( int i = 0 ; i < m_serviceNames.getLength() ; i ++ )
             if( m_serviceNames[i] == ServiceName )
                 return true;
         return false;
     }
-    Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw(css::uno::RuntimeException, std::exception) override
+    Sequence< OUString > SAL_CALL getSupportedServiceNames() override
     {
         return m_serviceNames;
     }
@@ -229,7 +216,6 @@ private:
 
 Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgumentsAndContext(
     Sequence< Any > const &rArguments, const Reference< XComponentContext > & ctx )
-    throw( RuntimeException, Exception, std::exception )
 {
     (void)rArguments;
     return createInstanceWithContext( ctx );
@@ -237,7 +223,6 @@ Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgument
 
 Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithContext(
     const Reference< XComponentContext > & ctx )
-    throw( RuntimeException, Exception, std::exception )
 {
     if( ! m_theInstance.is() )
     {
diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx
index 9217b8825d27..91485855af39 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.hxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.hxx
@@ -82,40 +82,32 @@ public:
 public: // XDriver
     virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect(
         const OUString& url,
-        const css::uno::Sequence< css::beans::PropertyValue >& info )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
 
-    virtual sal_Bool SAL_CALL acceptsURL( const OUString& url )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
 
     virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(
         const OUString& url,
-        const css::uno::Sequence< css::beans::PropertyValue >& info )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
 
-    virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getMajorVersion(  ) override;
+    virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
 
 public: // XServiceInfo
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& 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;
 
 public: // XDataDefinitionSupplier
     virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL
     getDataDefinitionByConnection(
-        const css::uno::Reference< css::sdbc::XConnection >& connection )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::sdbc::XConnection >& connection ) override;
     virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL
     getDataDefinitionByURL(
         const OUString& url,
-        const css::uno::Sequence< css::beans::PropertyValue >& info )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
 
     // XComponent
     virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
index 5a91ad938cdc..b1c35a32c2b1 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
@@ -68,7 +68,6 @@ FakedUpdateableResultSet::FakedUpdateableResultSet(
 
 css::uno::Any  FakedUpdateableResultSet::queryInterface(
     const css::uno::Type & reqType )
-    throw (css::uno::RuntimeException, std::exception)
 {
     Any ret = ResultSet::queryInterface( reqType );
     if( ! ret.hasValue() )
@@ -81,7 +80,6 @@ css::uno::Any  FakedUpdateableResultSet::queryInterface(
 
 
 css::uno::Sequence< css::uno::Type > FakedUpdateableResultSet::getTypes()
-        throw( css::uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -101,123 +99,122 @@ css::uno::Sequence< css::uno::Type > FakedUpdateableResultSet::getTypes()
 }
 
 css::uno::Sequence< sal_Int8> FakedUpdateableResultSet::getImplementationId()
-        throw( css::uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-void FakedUpdateableResultSet::insertRow(  ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::insertRow(  )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateRow(  ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateRow(  )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::deleteRow(  ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::deleteRow(  )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
  }
 
-void FakedUpdateableResultSet::cancelRowUpdates(  ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::cancelRowUpdates(  )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::moveToInsertRow(  ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::moveToInsertRow(  )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::moveToCurrentRow(  ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::moveToCurrentRow(  )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
 
-void FakedUpdateableResultSet::updateNull( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateNull( sal_Int32 /* columnIndex */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateBoolean( sal_Int32 /* columnIndex */, sal_Bool /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateBoolean( sal_Int32 /* columnIndex */, sal_Bool /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateByte( sal_Int32 /* columnIndex */, sal_Int8 /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateByte( sal_Int32 /* columnIndex */, sal_Int8 /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateShort( sal_Int32 /* columnIndex */, sal_Int16 /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateShort( sal_Int32 /* columnIndex */, sal_Int16 /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateInt( sal_Int32 /* columnIndex */, sal_Int32 /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateInt( sal_Int32 /* columnIndex */, sal_Int32 /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateLong( sal_Int32 /* columnIndex */, sal_Int64 /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateLong( sal_Int32 /* columnIndex */, sal_Int64 /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateFloat( sal_Int32 /* columnIndex */, float /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateFloat( sal_Int32 /* columnIndex */, float /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateDouble( sal_Int32 /* columnIndex */, double /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateDouble( sal_Int32 /* columnIndex */, double /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const OUString& /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const OUString& /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateBytes( sal_Int32 /* columnIndex */, const css::uno::Sequence< sal_Int8 >& /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateBytes( sal_Int32 /* columnIndex */, const css::uno::Sequence< sal_Int8 >& /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateDate( sal_Int32 /* columnIndex */, const css::util::Date& /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateDate( sal_Int32 /* columnIndex */, const css::util::Date& /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateTime( sal_Int32 /* columnIndex */, const css::util::Time& /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateTime( sal_Int32 /* columnIndex */, const css::util::Time& /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateTimestamp( sal_Int32 /* columnIndex */, const css::util::DateTime& /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateTimestamp( sal_Int32 /* columnIndex */, const css::util::DateTime& /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
 
-void FakedUpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException, std::exception)
+void FakedUpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ )
 {
     throw SQLException( m_aReason, *this, OUString(),1,Any() );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
index 1830f4186678..74ed8c8415ee 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx
@@ -68,41 +68,38 @@ public: // XInterface
     virtual void SAL_CALL acquire() throw() override { ResultSet::acquire(); }
     virtual void SAL_CALL release() throw() override { ResultSet::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
 public: // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // XResultSetUpdate
-    virtual void SAL_CALL insertRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancelRowUpdates(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveToInsertRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveToCurrentRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertRow(  ) override;
+    virtual void SAL_CALL updateRow(  ) override;
+    virtual void SAL_CALL deleteRow(  ) override;
+    virtual void SAL_CALL cancelRowUpdates(  ) override;
+    virtual void SAL_CALL moveToInsertRow(  ) override;
+    virtual void SAL_CALL moveToCurrentRow(  ) override;
 
 public: // XRowUpdate
-    virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+    virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+    virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+    virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+    virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+    virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+    virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+    virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+    virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+    virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+    virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+    virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+    virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+    virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+    virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+    virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+    virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
 
 };
 }
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 27a931da2919..ee75cde78e12 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -223,7 +223,7 @@ void PreparedStatement::checkColumnIndex( sal_Int32 parameterIndex )
         throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any () );
     }
 }
-void PreparedStatement::checkClosed() throw (SQLException, RuntimeException )
+void PreparedStatement::checkClosed()
 {
     if( ! m_pSettings || ! m_pSettings->pConnection )
         throw SQLException(
@@ -231,14 +231,14 @@ void PreparedStatement::checkClosed() throw (SQLException, RuntimeException )
             *this, OUString(),1,Any());
 }
 
-Any PreparedStatement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any PreparedStatement::queryInterface( const Type & rType )
 {
     Any aRet = PreparedStatement_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
 
 
-Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > PreparedStatement::getTypes()
 {
     static Sequence< Type > *pCollection;
     if( ! pCollection )
@@ -256,12 +256,12 @@ Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::ex
     return *pCollection;
 }
 
-Sequence< sal_Int8> PreparedStatement::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8> PreparedStatement::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-void PreparedStatement::close(  ) throw (SQLException, RuntimeException, std::exception)
+void PreparedStatement::close(  )
 {
     // let the connection die without acquired mutex !
     Reference< XConnection > r;
@@ -282,7 +282,6 @@ void PreparedStatement::close(  ) throw (SQLException, RuntimeException, std::ex
 }
 
 void PreparedStatement::raiseSQLException( const char * errorMsg )
-    throw( SQLException )
 {
     OUStringBuffer buf(128);
     buf.append( "pq_driver: ");
@@ -297,7 +296,6 @@ void PreparedStatement::raiseSQLException( const char * errorMsg )
 }
 
 Reference< XResultSet > PreparedStatement::executeQuery( )
-        throw (SQLException, RuntimeException, std::exception)
 {
     Reference< XCloseable > lastResultSet = m_lastResultset;
     if( lastResultSet.is() )
@@ -311,7 +309,6 @@ Reference< XResultSet > PreparedStatement::executeQuery( )
 }
 
 sal_Int32 PreparedStatement::executeUpdate( )
-        throw (SQLException, RuntimeException, std::exception)
 {
     if( execute( ) )
     {
@@ -321,7 +318,6 @@ sal_Int32 PreparedStatement::executeUpdate( )
 }
 
 sal_Bool PreparedStatement::execute( )
-        throw (SQLException, RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
 
@@ -400,7 +396,6 @@ sal_Bool PreparedStatement::execute( )
 }
 
 Reference< XConnection > PreparedStatement::getConnection(  )
-        throw (SQLException, RuntimeException, std::exception)
 {
     Reference< XConnection > ret;
     {
@@ -413,7 +408,6 @@ Reference< XConnection > PreparedStatement::getConnection(  )
 
 
 void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void)sqlType;
     MutexGuard guard( m_refMutex->mutex );
@@ -424,7 +418,6 @@ void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType )
 
 void PreparedStatement::setObjectNull(
     sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) sqlType; (void) typeName;
     MutexGuard guard( m_refMutex->mutex );
@@ -435,7 +428,6 @@ void PreparedStatement::setObjectNull(
 
 
 void PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard(m_refMutex->mutex );
     checkClosed();
@@ -447,19 +439,16 @@ void PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
 }
 
 void PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     setInt(parameterIndex,x);
 }
 
 void PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     setInt(parameterIndex, x );
 }
 
 void PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x )
-    throw (SQLException, RuntimeException, std::exception)
 {
 //     printf( "setString %d %d\n ",  parameterIndex, x);
     MutexGuard guard(m_refMutex->mutex );
@@ -473,7 +462,6 @@ void PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x )
 }
 
 void PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard(m_refMutex->mutex );
     checkClosed();
@@ -486,7 +474,6 @@ void PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x )
 }
 
 void PreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard(m_refMutex->mutex );
     checkClosed();
@@ -499,7 +486,6 @@ void PreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
 }
 
 void PreparedStatement::setDouble( sal_Int32 parameterIndex, double x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard(m_refMutex->mutex );
     checkClosed();
@@ -512,7 +498,6 @@ void PreparedStatement::setDouble( sal_Int32 parameterIndex, double x )
 }
 
 void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
 //     printf( "setString %d %s\n ", parameterIndex,
 //             OUStringToOString( x , RTL_TEXTENCODING_ASCII_US ).getStr());
@@ -531,7 +516,6 @@ void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x )
 
 void PreparedStatement::setBytes(
     sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard(m_refMutex->mutex );
     checkClosed();
@@ -555,20 +539,17 @@ void PreparedStatement::setBytes(
 
 
 void PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     setString( parameterIndex, DBTypeConversion::toDateString( x ) );
 }
 
 void PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     setString( parameterIndex, DBTypeConversion::toTimeString( x ) );
 }
 
 void PreparedStatement::setTimestamp(
     sal_Int32 parameterIndex, const css::util::DateTime& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     setString( parameterIndex, DBTypeConversion::toDateTimeString( x ) );
 }
@@ -577,7 +558,6 @@ void PreparedStatement::setBinaryStream(
     sal_Int32 parameterIndex,
     const Reference< css::io::XInputStream >& x,
     sal_Int32 length )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) parameterIndex; (void)x; (void) length;
     throw SQLException(
@@ -589,7 +569,6 @@ void PreparedStatement::setCharacterStream(
     sal_Int32 parameterIndex,
     const Reference< css::io::XInputStream >& x,
     sal_Int32 length )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) parameterIndex; (void)x; (void) length;
     throw SQLException(
@@ -598,7 +577,6 @@ void PreparedStatement::setCharacterStream(
 }
 
 void PreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     if( ! implSetObject( this, parameterIndex, x ))
     {
@@ -614,7 +592,6 @@ void PreparedStatement::setObjectWithInfo(
     const Any& x,
     sal_Int32 targetSqlType,
     sal_Int32 scale )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) scale;
     if( css::sdbc::DataType::DECIMAL == targetSqlType ||
@@ -654,7 +631,6 @@ void PreparedStatement::setObjectWithInfo(
 void PreparedStatement::setRef(
     sal_Int32 parameterIndex,
     const Reference< XRef >& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) parameterIndex; (void)x;
     throw SQLException(
@@ -665,7 +641,6 @@ void PreparedStatement::setRef(
 void PreparedStatement::setBlob(
     sal_Int32 parameterIndex,
     const Reference< XBlob >& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) parameterIndex; (void)x;
     throw SQLException(
@@ -676,7 +651,6 @@ void PreparedStatement::setBlob(
 void PreparedStatement::setClob(
     sal_Int32 parameterIndex,
     const Reference< XClob >& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) parameterIndex; (void)x;
     throw SQLException(
@@ -687,31 +661,26 @@ void PreparedStatement::setClob(
 void PreparedStatement::setArray(
     sal_Int32 parameterIndex,
     const Reference< XArray >& x )
-    throw (SQLException, RuntimeException, std::exception)
 {
     setString( parameterIndex, array2String( x->getArray( nullptr ) ) );
 }
 
 void PreparedStatement::clearParameters(  )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard(m_refMutex->mutex );
     m_vars = OStringVector ( m_vars.size() );
 }
 
 Any PreparedStatement::getWarnings(  )
-        throw (SQLException,RuntimeException, std::exception)
 {
     return Any();
 }
 
 void PreparedStatement::clearWarnings(  )
-        throw (SQLException, RuntimeException, std::exception)
 {
 }
 
 Reference< css::sdbc::XResultSetMetaData > PreparedStatement::getMetaData()
-            throw (SQLException,RuntimeException, std::exception)
 {
     Reference< css::sdbc::XResultSetMetaData > ret;
     Reference< css::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY );
@@ -728,7 +697,6 @@ Reference< css::sdbc::XResultSetMetaData > PreparedStatement::getMetaData()
 
 sal_Bool PreparedStatement::convertFastPropertyValue(
         Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
-        throw (IllegalArgumentException)
 {
     bool bRet;
     rOldValue = m_props[nHandle];
@@ -775,7 +743,7 @@ sal_Bool PreparedStatement::convertFastPropertyValue(
 
 
 void PreparedStatement::setFastPropertyValue_NoBroadcast(
-    sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception)
+    sal_Int32 nHandle,const Any& rValue )
 {
     m_props[nHandle] = rValue;
 }
@@ -786,7 +754,6 @@ void PreparedStatement::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) c
 }
 
 Reference < XPropertySetInfo >  PreparedStatement::getPropertySetInfo()
-        throw(RuntimeException, std::exception)
 {
     return OPropertySetHelper::createPropertySetInfo( getPreparedStatementPropertyArrayHelper() );
 }
@@ -798,23 +765,19 @@ void PreparedStatement::disposing()
 
 
 Reference< XResultSet > PreparedStatement::getResultSet(  )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY );
 }
 sal_Int32 PreparedStatement::getUpdateCount(  )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return m_multipleResultUpdateCount;
 }
 sal_Bool PreparedStatement::getMoreResults(  )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return false;
 }
 
 Reference< XResultSet > PreparedStatement::getGeneratedValues(  )
-        throw (SQLException, RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     return getGeneratedValuesFromLastInsert(
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
index c3fc3c8d0be2..91e94bb85724 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx
@@ -105,102 +105,69 @@ public:
 public: // XInterface
     virtual void SAL_CALL acquire() throw() override { PreparedStatement_BASE::acquire(); }
     virtual void SAL_CALL release() throw() override { PreparedStatement_BASE::release(); }
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) override;
 
 public: // XCloseable
-    virtual void SAL_CALL close(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close(  ) override;
 
 public: // XPreparedStatement
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery()
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL executeUpdate(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL execute(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() override;
+    virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
+    virtual sal_Bool SAL_CALL execute(  ) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
 public: // XParameters
-    virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
     virtual void SAL_CALL setObjectNull(
-        sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+    virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+    virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+    virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+    virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+    virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+    virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+    virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+    virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
     virtual void SAL_CALL setBytes(
-        sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+    virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+    virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
     virtual void SAL_CALL setTimestamp(
-        sal_Int32 parameterIndex, const css::util::DateTime& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
     virtual void SAL_CALL setBinaryStream(
         sal_Int32 parameterIndex,
         const css::uno::Reference< css::io::XInputStream >& x,
-        sal_Int32 length )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 length ) override;
     virtual void SAL_CALL setCharacterStream(
         sal_Int32 parameterIndex,
         const css::uno::Reference< css::io::XInputStream >& x,
-        sal_Int32 length )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 length ) override;
+    virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
     virtual void SAL_CALL setObjectWithInfo(
         sal_Int32 parameterIndex,
         const css::uno::Any& x,
         sal_Int32 targetSqlType,
-        sal_Int32 scale )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 scale ) override;
     virtual void SAL_CALL setRef(
         sal_Int32 parameterIndex,
-        const css::uno::Reference< css::sdbc::XRef >& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::sdbc::XRef >& x ) override;
     virtual void SAL_CALL setBlob(
         sal_Int32 parameterIndex,
-        const css::uno::Reference< css::sdbc::XBlob >& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::sdbc::XBlob >& x ) override;
     virtual void SAL_CALL setClob(
         sal_Int32 parameterIndex,
-        const css::uno::Reference< css::sdbc::XClob >& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::sdbc::XClob >& x ) override;
     virtual void SAL_CALL setArray(
         sal_Int32 parameterIndex,
-        const css::uno::Reference< css::sdbc::XArray >& x )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearParameters(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::sdbc::XArray >& x ) override;
+    virtual void SAL_CALL clearParameters(  ) override;
 
 public: // XWarningsSupplier
-    virtual css::uno::Any SAL_CALL getWarnings(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearWarnings(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+    virtual void SAL_CALL clearWarnings(  ) override;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // OPropertySetHelper
     virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
@@ -209,13 +176,11 @@ public: // OPropertySetHelper
         css::uno::Any & rConvertedValue,
         css::uno::Any & rOldValue,
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::lang::IllegalArgumentException) override;
+        const css::uno::Any& rValue ) override;
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+        const css::uno::Any& rValue ) override;
 
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
@@ -224,26 +189,20 @@ public: // OPropertySetHelper
         sal_Int32 nHandle ) const override;
 
     // XPropertySet
-    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
 
 public: // XGeneratedResultSet
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
-    getGeneratedValues(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    getGeneratedValues(  ) override;
 
 public: // XMultipleResults
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getUpdateCount(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMoreResults(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+    virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+    virtual sal_Bool SAL_CALL getMoreResults(  ) override;
 
 public: // XResultSetMetaDataSupplier (is required by framework (see
         // dbaccess/source/core/api/preparedstatement.cxx::getMetaData() )
-    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
 public: // OComponentHelper
     virtual void SAL_CALL disposing() override;
@@ -252,10 +211,9 @@ private:
     void checkColumnIndex( sal_Int32 parameterIndex );
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    void checkClosed() throw (css::sdbc::SQLException, css::uno::RuntimeException);
+    void checkClosed();
     /// @throws css::sdbc::SQLException
-    void raiseSQLException( const char * errorMsg )
-        throw ( css::sdbc::SQLException );
+    void raiseSQLException( const char * errorMsg );
 //     PGresult *pgExecute( OString *pQuery );
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx
index e569b88da9c7..dafe25bd04f7 100644
--- a/connectivity/source/drivers/postgresql/pq_resultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx
@@ -61,7 +61,6 @@ namespace pq_sdbc_driver
 {
 
 void ResultSet::checkClosed()
-    throw ( css::sdbc::SQLException, css::uno::RuntimeException )
 {
     if( ! m_result )
     {
@@ -130,7 +129,7 @@ Any ResultSet::getValue( sal_Int32 columnIndex )
 ResultSet::~ResultSet()
 {}
 
-void ResultSet::close(  ) throw (SQLException, RuntimeException, std::exception)
+void ResultSet::close(  )
 {
     Reference< XInterface > owner;
     {
@@ -146,7 +145,7 @@ void ResultSet::close(  ) throw (SQLException, RuntimeException, std::exception)
     }
 }
 
-Reference< XResultSetMetaData > ResultSet::getMetaData(  ) throw (SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > ResultSet::getMetaData(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -155,7 +154,6 @@ Reference< XResultSetMetaData > ResultSet::getMetaData(  ) throw (SQLException,
 }
 
 sal_Int32 ResultSet::findColumn( const OUString& columnName )
-        throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
diff --git a/connectivity/source/drivers/postgresql/pq_resultset.hxx b/connectivity/source/drivers/postgresql/pq_resultset.hxx
index 5ccf50ed0902..40e4df23e547 100644
--- a/connectivity/source/drivers/postgresql/pq_resultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultset.hxx
@@ -61,8 +61,7 @@ protected:
 protected:
     /** mutex should be locked before called
      */
-    virtual void checkClosed()
-        throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override;
+    virtual void checkClosed() override;
 
     /** unchecked, acquire mutex before calling
      */
@@ -79,16 +78,13 @@ public:
     virtual ~ResultSet() override;
 
 public: // XCloseable
-    virtual void SAL_CALL close(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close(  ) override;
 
 public: // XResultSetMetaDataSupplier
-    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
 public: // XColumnLocate
-    virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
 public:
     sal_Int32 guessDataType( sal_Int32 column );
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 2a256a70fe14..a121354f753f 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -281,13 +281,11 @@ Reference< css::beans::XPropertySet > ResultSetMetaData::getColumnByIndex( int i
 
 // Methods
 sal_Int32 ResultSetMetaData::getColumnCount(  )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return m_colCount;
 }
 
 sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
 
     bool ret = getBoolColumnProperty( getStatics().IS_AUTO_INCREMENT, column, false );
@@ -295,39 +293,35 @@ sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column )
 }
 
 sal_Bool ResultSetMetaData::isCaseSensitive( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) column;
     return true; // ??? hmm, numeric types or
 }
 
-sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column )
 {
     (void) column;
     return true; // mmm, what types are not searchable ?
 }
 
-sal_Bool ResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool ResultSetMetaData::isCurrency( sal_Int32 column )
 {
     return getBoolColumnProperty( getStatics().IS_CURRENCY, column, false );
 }
 
 sal_Int32 ResultSetMetaData::isNullable( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return getIntColumnProperty(
         getStatics().IS_NULLABLE, column, css::sdbc::ColumnValue::NULLABLE_UNKNOWN );
 }
 
 sal_Bool ResultSetMetaData::isSigned( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) column;
     return true;
 }
 
 sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkColumnIndex( column );
@@ -335,12 +329,11 @@ sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 }
 
 OUString ResultSetMetaData::getColumnLabel( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return getColumnName( column);
 }
 
-OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception)
+OUString ResultSetMetaData::getColumnName( sal_Int32 column )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkColumnIndex( column );
@@ -348,14 +341,13 @@ OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLExceptio
     return m_colDesc[column-1].name;
 }
 
-OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception)
+OUString ResultSetMetaData::getSchemaName( sal_Int32 column )
 {
     (void) column;
     return m_schemaName;
 }
 
 sal_Int32 ResultSetMetaData::getPrecision( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkColumnIndex( column );
@@ -363,7 +355,6 @@ sal_Int32 ResultSetMetaData::getPrecision( sal_Int32 column )
 }
 
 sal_Int32 ResultSetMetaData::getScale( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     checkColumnIndex( column );
@@ -371,20 +362,17 @@ sal_Int32 ResultSetMetaData::getScale( sal_Int32 column )
 }
 
 OUString ResultSetMetaData::getTableName( sal_Int32 )
-    throw (SQLException, RuntimeException, std::exception)
 {
 // LEM TODO This is very fishy.. Should probably return the table to which that column belongs!
     return m_tableName;
 }
 
 OUString ResultSetMetaData::getCatalogName( sal_Int32 )
-    throw (SQLException, RuntimeException, std::exception)
 {
     // can do this through XConnection.getCatalog() !
     return OUString();
 }
 sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     int ret = getIntColumnProperty( getStatics().TYPE, column, -100 );
     if( -100 == ret )
@@ -398,7 +386,6 @@ sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column )
 }
 
 OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     OUString ret; // give defensive answers, when data is not available
     try
@@ -425,32 +412,27 @@ OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column )
 
 
 sal_Bool ResultSetMetaData::isReadOnly( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) column;
     return false;
 }
 
 sal_Bool ResultSetMetaData::isWritable( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return ! isReadOnly( column ); // what's the sense if this method ?
 }
 
 sal_Bool ResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return isWritable(column); // uhh, now it becomes really esoteric ....
 }
 OUString ResultSetMetaData::getColumnServiceName( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     (void) column;
     return OUString();
 }
 
 void ResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
-    throw (css::sdbc::SQLException, css::uno::RuntimeException)
 {
     if( columnIndex < 1 || columnIndex > m_colCount )
     {
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
index 077368751992..70ba16e5d3b6 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
@@ -80,8 +80,7 @@ class ResultSetMetaData :
 
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    void checkColumnIndex( sal_Int32 columnIndex )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException);
+    void checkColumnIndex( sal_Int32 columnIndex );
     void checkTable();
     void checkForTypes();
     css::uno::Reference< css::beans::XPropertySet > getColumnByIndex( int index );
@@ -101,27 +100,27 @@ public:
 
 public:
     // Methods
-    virtual sal_Int32 SAL_CALL getColumnCount(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+    virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+    virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+    virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+    virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+    virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+    virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+    virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+    virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+    virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+    virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+    virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+    virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+    virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+    virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+    virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+    virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+    virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+    virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+    virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+    virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
 };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
index 7f3556d8c003..0a0b06bb4e88 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
@@ -49,8 +49,6 @@ namespace pq_sdbc_driver
 {
 
 void SequenceResultSet::checkClosed()
-    throw ( css::sdbc::SQLException,
-            css::uno::RuntimeException )
 {
     // we never close :o)
 }
@@ -85,13 +83,11 @@ SequenceResultSet::~SequenceResultSet()
 }
 
 void SequenceResultSet::close(  )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     // a noop
 }
 
 Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData(  )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     if( ! m_meta.is() )
     {
@@ -109,7 +105,6 @@ Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData(  )
 
 sal_Int32 SAL_CALL SequenceResultSet::findColumn(
     const OUString& columnName )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     // no need to guard, as all members are readonly !
     for( int i = 0 ;i < m_fieldCount ; i ++ )
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
index 1f43cfa526d4..bf22e9de8d52 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx
@@ -62,8 +62,7 @@ protected:
 protected:
     /** mutex should be locked before called
      */
-    virtual void checkClosed()
-        throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override;
+    virtual void checkClosed() override;
 
     /** unchecked, acquire mutex before calling
      */
@@ -80,16 +79,13 @@ public:
     virtual ~SequenceResultSet() override;
 
 public: // XCloseable
-    virtual void SAL_CALL close(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close(  ) override;
 
 public: // XResultSetMetaDataSupplier
-    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
 public: // XColumnLocate
-    virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
index 9b4ed4d8a9de..bde1ac37ec92 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
@@ -58,69 +58,62 @@ SequenceResultSetMetaData::SequenceResultSetMetaData(
 
 // Methods
 sal_Int32 SequenceResultSetMetaData::getColumnCount(  )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return m_colCount;
 }
 
 sal_Bool SequenceResultSetMetaData::isAutoIncrement( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex( column );
     return m_columnData[column-1].isAutoIncrement;
 }
 
 sal_Bool SequenceResultSetMetaData::isCaseSensitive( sal_Int32 /* column */ )
-    throw (SQLException, RuntimeException, std::exception)
 {
 
     return true; // ??? hmm, numeric types or
 }
 
-sal_Bool SequenceResultSetMetaData::isSearchable( sal_Int32 /* column */ ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool SequenceResultSetMetaData::isSearchable( sal_Int32 /* column */ )
 {
     return true; // mmm, what types are not searchable ?
 }
 
-sal_Bool SequenceResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool SequenceResultSetMetaData::isCurrency( sal_Int32 column )
 {
     checkColumnIndex( column );
     return m_columnData[column-1].isCurrency;
 }
 
 sal_Int32 SequenceResultSetMetaData::isNullable( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex( column );
     return m_columnData[column-1].isNullable ? 1 : 0;
 }
 
 sal_Bool SequenceResultSetMetaData::isSigned( sal_Int32 /* column */ )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return true;
 }
 
 sal_Int32 SequenceResultSetMetaData::getColumnDisplaySize( sal_Int32 /* column */ )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return 50;
 }
 
 OUString SequenceResultSetMetaData::getColumnLabel( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex( column );
     return m_columnData[column-1].columnName;
 }
 
-OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception)
+OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column )
 {
     checkColumnIndex( column );
     return m_columnData[column-1].columnName;
 }
 
-OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception)
+OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column )
 {
     checkColumnIndex( column );
     return m_columnData[column-1].schemaTableName;
@@ -128,41 +121,35 @@ OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQL
 
 
 sal_Int32 SequenceResultSetMetaData::getPrecision( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex( column );
     return m_columnData[column-1].precision;
 }
 
 sal_Int32 SequenceResultSetMetaData::getScale( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex( column );
     return m_columnData[column-1].scale;
 }
 
 OUString SequenceResultSetMetaData::getTableName( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex( column );
     return m_columnData[column-1].tableName;
 }
 
 OUString SequenceResultSetMetaData::getCatalogName( sal_Int32 /* column */ )
-    throw (SQLException, RuntimeException, std::exception)
 {
     // can do this through XConnection.getCatalog() !
     return OUString();
 }
 sal_Int32 SequenceResultSetMetaData::getColumnType( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex( column );
     return m_columnData[column-1].type;
 }
 
 OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex( column );
     return m_columnData[column-1].typeName;
@@ -170,30 +157,25 @@ OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column )
 
 
 sal_Bool SequenceResultSetMetaData::isReadOnly( sal_Int32 /* column */ )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SequenceResultSetMetaData::isWritable( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return ! isReadOnly( column ); // what's the sense if this method ?
 }
 
 sal_Bool SequenceResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return isWritable(column); // uhh, now it becomes really esoteric ....
 }
 OUString SequenceResultSetMetaData::getColumnServiceName( sal_Int32 /* column */ )
-    throw (SQLException, RuntimeException, std::exception)
 {
     return OUString();
 }
 
 void SequenceResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
-    throw (css::sdbc::SQLException, css::uno::RuntimeException)
 {
     if( columnIndex < 1 || columnIndex > m_colCount )
     {
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
index d115b8f750c5..2bba06aa7d2f 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
@@ -53,8 +53,7 @@ namespace pq_sdbc_driver
 
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void checkColumnIndex( sal_Int32 columnIndex )
-            throw (css::sdbc::SQLException, css::uno::RuntimeException);
+        void checkColumnIndex( sal_Int32 columnIndex );
 
     public:
         SequenceResultSetMetaData(
@@ -63,27 +62,27 @@ namespace pq_sdbc_driver
 
     public:
         // Methods
-        virtual sal_Int32 SAL_CALL getColumnCount(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+        virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
     };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index e465fa254ed9..26910e33fc30 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -176,7 +176,7 @@ Statement::~Statement()
     POSTGRE_TRACE( "dtor Statement" );
 }
 
-void Statement::checkClosed() throw (SQLException, RuntimeException )
+void Statement::checkClosed()
 {
     if( ! m_pSettings || ! m_pSettings->pConnection )
         throw SQLException(
@@ -184,14 +184,14 @@ void Statement::checkClosed() throw (SQLException, RuntimeException )
             *this, OUString(),1,Any());
 }
 
-Any Statement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any Statement::queryInterface( const Type & rType )
 {
     Any aRet = Statement_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
 
 
-Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > Statement::getTypes()
 {
     static Sequence< Type > *pCollection;
     if( ! pCollection )
@@ -209,12 +209,12 @@ Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception
     return *pCollection;
 }
 
-Sequence< sal_Int8> Statement::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8> Statement::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-void Statement::close(  ) throw (SQLException, RuntimeException, std::exception)
+void Statement::close(  )
 {
     // let the connection die without acquired mutex !
     Reference< XConnection > r;
@@ -238,7 +238,6 @@ void Statement::close(  ) throw (SQLException, RuntimeException, std::exception)
 
 void Statement::raiseSQLException(
     const OUString & sql, const char * errorMsg )
-    throw( SQLException )
 {
     OUStringBuffer buf(128);
     buf.append( "pq_driver: ");
@@ -253,7 +252,6 @@ void Statement::raiseSQLException(
 }
 
 Reference< XResultSet > Statement::executeQuery(const OUString& sql )
-        throw (SQLException, RuntimeException, std::exception)
 {
     Reference< XCloseable > lastResultSetHolder = m_lastResultset;
     if( lastResultSetHolder.is() )
@@ -267,7 +265,6 @@ Reference< XResultSet > Statement::executeQuery(const OUString& sql )
 }
 
 sal_Int32 Statement::executeUpdate( const OUString& sql )
-        throw (SQLException, RuntimeException, std::exception)
 {
     if( execute( sql ) )
     {
@@ -283,7 +280,6 @@ static void raiseSQLException(
     const OString & sql,
     const char * errorMsg,
     const char *errorType = nullptr )
-    throw( SQLException )
 {
     OUStringBuffer buf(128);
     buf.append( "pq_driver: ");
@@ -824,7 +820,6 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert(
 }
 
 sal_Bool Statement::execute( const OUString& sql )
-        throw (SQLException, RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -850,7 +845,6 @@ sal_Bool Statement::execute( const OUString& sql )
 }
 
 Reference< XConnection > Statement::getConnection(  )
-        throw (SQLException, RuntimeException, std::exception)
 {
     Reference< XConnection > ret;
     {
@@ -863,18 +857,15 @@ Reference< XConnection > Statement::getConnection(  )
 
 
 Any Statement::getWarnings(  )
-        throw (SQLException,RuntimeException, std::exception)
 {
     return Any();
 }
 
 void Statement::clearWarnings(  )
-        throw (SQLException, RuntimeException, std::exception)
 {
 }
 
 Reference< css::sdbc::XResultSetMetaData > Statement::getMetaData()
-            throw (SQLException,RuntimeException, std::exception)
 {
     Reference< css::sdbc::XResultSetMetaData > ret;
     Reference< css::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY );
@@ -892,7 +883,6 @@ Reference< css::sdbc::XResultSetMetaData > Statement::getMetaData()
 
 sal_Bool Statement::convertFastPropertyValue(
         Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
-        throw (IllegalArgumentException)
 {
     rOldValue = m_props[nHandle];
     bool bRet;
@@ -939,7 +929,7 @@ sal_Bool Statement::convertFastPropertyValue(
 
 
 void Statement::setFastPropertyValue_NoBroadcast(
-    sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception)
+    sal_Int32 nHandle,const Any& rValue )
 {
     m_props[nHandle] = rValue;
 }
@@ -950,26 +940,22 @@ void Statement::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 }
 
 Reference < XPropertySetInfo >  Statement::getPropertySetInfo()
-        throw(RuntimeException, std::exception)
 {
     return OPropertySetHelper::createPropertySetInfo( getStatementPropertyArrayHelper() );
 }
 
 
 Reference< XResultSet > Statement::getResultSet(  )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY );
 }
 
 sal_Int32 Statement::getUpdateCount(  )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return m_multipleResultUpdateCount;
 }
 
 sal_Bool Statement::getMoreResults(  )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     return false;
 }
@@ -981,7 +967,6 @@ void Statement::disposing()
 }
 
 Reference< XResultSet > Statement::getGeneratedValues(  )
-        throw (SQLException, RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     return getGeneratedValuesFromLastInsert(
diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx
index 437eac12c0e6..0ac5e40a711e 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.hxx
@@ -98,35 +98,25 @@ public:
 public: // XInterface
     virtual void SAL_CALL acquire() throw() override { Statement_BASE::acquire(); }
     virtual void SAL_CALL release() throw() override { Statement_BASE::release(); }
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) override;
 
 public: // XCloseable
-    virtual void SAL_CALL close(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close(  ) override;
 
 public: // XStatement
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(
-        const OUString& sql )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL execute( const OUString& sql )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const OUString& sql ) override;
+    virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override;
+    virtual sal_Bool SAL_CALL execute( const OUString& sql ) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
 
 public: // XWarningsSupplier
-    virtual css::uno::Any SAL_CALL getWarnings(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearWarnings(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+    virtual void SAL_CALL clearWarnings(  ) override;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // OPropertySetHelper
     virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
@@ -135,13 +125,11 @@ public: // OPropertySetHelper
         css::uno::Any & rConvertedValue,
         css::uno::Any & rOldValue,
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::lang::IllegalArgumentException) override;
+        const css::uno::Any& rValue ) override;
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+        const css::uno::Any& rValue ) override;
 
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
@@ -150,37 +138,30 @@ public: // OPropertySetHelper
         sal_Int32 nHandle ) const override;
 
     // XPropertySet
-    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
 
 public: // XGeneratedResultSet
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
-    getGeneratedValues(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    getGeneratedValues(  ) override;
 
 public: // XMultipleResults
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getUpdateCount(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMoreResults(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+    virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+    virtual sal_Bool SAL_CALL getMoreResults(  ) override;
 
 public: // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 public: // XResultSetMetaDataSupplier (is required by framework (see
         // dbaccess/source/core/api/preparedstatement.cxx::getMetaData() )
-    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
 private:
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    void checkClosed() throw (css::sdbc::SQLException, css::uno::RuntimeException);
+    void checkClosed();
     /// @throws css::sdbc::SQLException
-    void raiseSQLException( const OUString & sql, const char * errorMsg )
-        throw ( css::sdbc::SQLException );
+    void raiseSQLException( const OUString & sql, const char * errorMsg );
 };
 
 
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index b5799eadfdad..efecdac1fad9 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -598,7 +598,7 @@ OUString array2String( const css::uno::Sequence< Any > &seq )
 }
 
 
-std::vector< Any > parseArray( const OUString & str ) throw( SQLException )
+std::vector< Any > parseArray( const OUString & str )
 {
     int len = str.getLength();
     bool doubleQuote = false;
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx
index cce2d5a640f4..ad642f724f8c 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -104,8 +104,7 @@ void tokenizeSQL( const OString & sql, OStringVector &vec  );
 void splitSQL( const OString & sql, OStringVector &vec  );
 std::vector< sal_Int32 > parseIntArray( const OUString & str );
 /// @throws css::sdbc::SQLException
-std::vector< css::uno::Any > parseArray( const OUString & str )
-    throw( css::sdbc::SQLException );
+std::vector< css::uno::Any > parseArray( const OUString & str );
 
 OUString array2String( const css::uno::Sequence< css::uno::Any > &seq );
 
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 64033eb9d647..3ec872e448de 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -134,7 +134,6 @@ css::uno::Reference< css::sdbc::XCloseable > UpdateableResultSet::createFromPGRe
 
 css::uno::Any  UpdateableResultSet::queryInterface(
     const css::uno::Type & reqType )
-    throw (css::uno::RuntimeException, std::exception)
 {
     Any ret = SequenceResultSet::queryInterface( reqType );
     if( ! ret.hasValue() )
@@ -147,7 +146,6 @@ css::uno::Any  UpdateableResultSet::queryInterface(
 
 
 css::uno::Sequence< css::uno::Type > UpdateableResultSet::getTypes()
-        throw( css::uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -167,7 +165,6 @@ css::uno::Sequence< css::uno::Type > UpdateableResultSet::getTypes()
 }
 
 css::uno::Sequence< sal_Int8> UpdateableResultSet::getImplementationId()
-        throw( css::uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -194,7 +191,7 @@ OUString UpdateableResultSet::buildWhereClause()
 }
 
 
-void UpdateableResultSet::insertRow(  ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::insertRow(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     if (isLog(*m_ppSettings, LogLevel::Info))
@@ -288,7 +285,7 @@ void UpdateableResultSet::insertRow(  ) throw (SQLException, RuntimeException, s
     m_updateableField = UpdateableFieldVector();
 }
 
-void UpdateableResultSet::updateRow(  ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateRow(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     if (isLog(*m_ppSettings, LogLevel::Info))
@@ -338,7 +335,7 @@ void UpdateableResultSet::updateRow(  ) throw (SQLException, RuntimeException, s
     m_updateableField = UpdateableFieldVector();
 }
 
-void UpdateableResultSet::deleteRow(  ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::deleteRow(  )
 {
     if (isLog(*m_ppSettings, LogLevel::Info))
     {
@@ -377,18 +374,18 @@ void UpdateableResultSet::deleteRow(  ) throw (SQLException, RuntimeException, s
     m_data.resize( m_rowCount );
  }
 
-void UpdateableResultSet::cancelRowUpdates(  ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::cancelRowUpdates(  )
 {
     MutexGuard guard( m_refMutex->mutex );
     m_updateableField = UpdateableFieldVector();
 }
 
-void UpdateableResultSet::moveToInsertRow(  ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::moveToInsertRow(  )
 {
     m_insertRow = true;
 }
 
-void UpdateableResultSet::moveToCurrentRow(  ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::moveToCurrentRow(  )
 {
     m_insertRow = false;
 }
@@ -401,7 +398,7 @@ void UpdateableResultSet::checkUpdate( sal_Int32 columnIndex)
     m_updateableField[columnIndex-1].isTouched = true;
 }
 
-void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateNull( sal_Int32 columnIndex )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -409,7 +406,7 @@ void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) throw (SQLExceptio
     m_updateableField[columnIndex-1].value = Any();
 }
 
-void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -420,17 +417,17 @@ void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) thr
 
 }
 
-void UpdateableResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x )
 {
     updateInt(columnIndex,x);
 }
 
-void UpdateableResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x )
 {
     updateInt( columnIndex, x );
 }
 
-void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x )
 {
     updateLong( columnIndex, x );
 //     MutexGuard guard( m_refMutex->mutex );
@@ -441,7 +438,7 @@ void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw
 
 }
 
-void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -454,7 +451,7 @@ void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw
     m_updateableField[columnIndex-1].value <<= OUString::number( x );
 }
 
-void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x )
 {
 
     MutexGuard guard( m_refMutex->mutex );
@@ -464,7 +461,7 @@ void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (S
     m_updateableField[columnIndex-1].value <<= OUString::number( x );
 }
 
-void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -473,7 +470,7 @@ void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw
     m_updateableField[columnIndex-1].value <<= OUString::number( x );
 }
 
-void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -482,7 +479,7 @@ void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x
     m_updateableField[columnIndex-1].value <<= x;
 }
 
-void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x )
 {
     MutexGuard guard( m_refMutex->mutex );
     checkClosed();
@@ -504,40 +501,39 @@ void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Se
     free( escapedString );
 }
 
-void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x )
 {
     updateString( columnIndex, DBTypeConversion::toDateString( x ) );
 }
 
-void UpdateableResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x )
 {
     updateString( columnIndex, DBTypeConversion::toTimeString( x ) );
 }
 
-void UpdateableResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x )
 {
     updateString( columnIndex, DBTypeConversion::toDateTimeString( x ) );
 }
 
-void UpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ )
 {
 }
 
-void UpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ )
 {
 }
 
-void UpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ )
 {
 }
 
-void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException, std::exception)
+void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ )
 {
 }
 
 
 Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable )
-    throw( css::uno::RuntimeException )
 {
     if( updateable )
     {
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
index 040281dec8fb..a1e5f5d44033 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
@@ -126,46 +126,42 @@ public: // XInterface
     virtual void SAL_CALL acquire() throw() override { SequenceResultSet::acquire(); }
     virtual void SAL_CALL release() throw() override { SequenceResultSet::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
 public: // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // XResultSetUpdate
-    virtual void SAL_CALL insertRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancelRowUpdates(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveToInsertRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveToCurrentRow(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertRow(  ) override;
+    virtual void SAL_CALL updateRow(  ) override;
+    virtual void SAL_CALL deleteRow(  ) override;
+    virtual void SAL_CALL cancelRowUpdates(  ) override;
+    virtual void SAL_CALL moveToInsertRow(  ) override;
+    virtual void SAL_CALL moveToCurrentRow(  ) override;
 
 public: // XRowUpdate
-    virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+    virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+    virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+    virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+    virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+    virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+    virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+    virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+    virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+    virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+    virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+    virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+    virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+    virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+    virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+    virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+    virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
 
 public:
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< css::uno::Type > getStaticTypes( bool updateable )
-        throw( css::uno::RuntimeException );
+    static css::uno::Sequence< css::uno::Type > getStaticTypes( bool updateable );
 
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index 45f37fe0430c..627e60fe4ca3 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -85,7 +85,6 @@ sal_Bool ReflectionBase::convertFastPropertyValue(
     css::uno::Any & rOldValue,
     sal_Int32 nHandle,
     const css::uno::Any& rValue )
-    throw (css::lang::IllegalArgumentException)
 {
 
     rOldValue = m_values[nHandle];
@@ -113,7 +112,6 @@ void ReflectionBase::setPropertyValue_NoBroadcast_public(
 void ReflectionBase::setFastPropertyValue_NoBroadcast(
     sal_Int32 nHandle,
     const css::uno::Any& rValue )
-    throw (css::uno::Exception, std::exception)
 {
 //     OUString s;
 //     rValue >>= s;
@@ -135,32 +133,27 @@ void ReflectionBase::getFastPropertyValue(
 }
 
 Reference < css::beans::XPropertySetInfo >  ReflectionBase::getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception)
 {
     return OPropertySetHelper::createPropertySetInfo( m_propsDesc );
 }
 
 OUString ReflectionBase::getImplementationName()
-        throw(css::uno::RuntimeException, std::exception)
 {
     return m_implName;
 }
 
 sal_Bool ReflectionBase::supportsService(const OUString& ServiceName)
-        throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > ReflectionBase::getSupportedServiceNames()
-        throw(css::uno::RuntimeException, std::exception)
 {
     return m_supportedServices;
 }
 
 
 Sequence< css::uno::Type > ReflectionBase::getTypes()
-        throw( css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     static Sequence< css::uno::Type > collection(
@@ -173,14 +166,13 @@ Sequence< css::uno::Type > ReflectionBase::getTypes()
 
 css::uno::Any ReflectionBase::queryInterface(
     const css::uno::Type & reqType )
-    throw (css::uno::RuntimeException, std::exception)
 {
     Any ret = ReflectionBase_BASE::queryInterface( reqType );
     return ret.hasValue() ? ret : OPropertySetHelper::queryInterface( reqType );
 
 }
 
-Sequence< sal_Int8> ReflectionBase::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> ReflectionBase::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -202,7 +194,7 @@ void ReflectionBase::copyValuesFrom( const Reference< XPropertySet > & set )
     }
 }
 
-OUString ReflectionBase::getName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString ReflectionBase::getName(  )
 {
     Statics & st = getStatics();
     if( getInfoHelper().hasPropertyByName( st.SCHEMA_NAME ) )
@@ -215,7 +207,6 @@ OUString ReflectionBase::getName(  ) throw (css::uno::RuntimeException, std::exc
 
 
 void ReflectionBase::setName( const OUString& /* aName */ )
-    throw (css::uno::RuntimeException, std::exception)
 {
     throw RuntimeException(
         "pq_sdbc::ReflectionBase::setName not implemented",
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx
index 17e2e0f70455..bf5359fe5fc4 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx
@@ -85,8 +85,7 @@ public: //XInterface
     virtual void SAL_CALL acquire() throw() override { ReflectionBase_BASE::acquire(); }
     virtual void SAL_CALL release() throw() override { ReflectionBase_BASE::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
 public: // OPropertySetHelper
     virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
@@ -95,13 +94,11 @@ public: // OPropertySetHelper
         css::uno::Any & rConvertedValue,
         css::uno::Any & rOldValue,
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::lang::IllegalArgumentException) override;
+        const css::uno::Any& rValue ) override;
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+        const css::uno::Any& rValue ) override;
 
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
@@ -110,30 +107,24 @@ public: // OPropertySetHelper
         sal_Int32 nHandle ) const override;
 
     // XPropertySet
-    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
 
 public: // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
+    createDataDescriptor(  ) override = 0;
 
 public: // XNamed
-    virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
index f8c3c2747aef..5caf2d0f88af 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
@@ -57,7 +57,7 @@ Column::Column( const ::rtl::Reference< RefCountedMutex > & refMutex,
         * getStatics().refl.column.pProps )
 {}
 
-Reference< XPropertySet > Column::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > Column::createDataDescriptor(  )
 {
     ColumnDescriptor * pColumn = new ColumnDescriptor(
         m_refMutex, m_conn, m_pSettings );
@@ -78,7 +78,7 @@ ColumnDescriptor::ColumnDescriptor(
         *getStatics().refl.columnDescriptor.pProps )
 {}
 
-Reference< XPropertySet > ColumnDescriptor::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > ColumnDescriptor::createDataDescriptor(  )
 {
     ColumnDescriptor * pColumn = new ColumnDescriptor(
         m_refMutex, m_conn, m_pSettings );
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx
index 3b833845f4f0..1a8d9ff30502 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx
@@ -58,7 +58,7 @@ public:
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
 };
 
@@ -72,7 +72,7 @@ public:
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 36f3a4f8744c..da43c62d7b36 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -276,7 +276,6 @@ OUString columnMetaData2SDBCX(
 // };
 
 void Columns::refresh()
-    throw (css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -461,9 +460,6 @@ void alterColumnByDescriptor(
 
 void Columns::appendByDescriptor(
     const css::uno::Reference< css::beans::XPropertySet >& future )
-    throw (css::sdbc::SQLException,
-           css::container::ElementExistException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     Statics & st = getStatics();
@@ -498,9 +494,6 @@ void Columns::appendByDescriptor(
 // }
 
 void Columns::dropByIndex( sal_Int32 index )
-    throw (css::sdbc::SQLException,
-           css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     if( index < 0 ||  index >= (sal_Int32)m_values.size() )
@@ -535,7 +528,6 @@ void Columns::dropByIndex( sal_Int32 index )
 
 
 css::uno::Reference< css::beans::XPropertySet > Columns::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new ColumnDescriptor( m_refMutex, m_origin, m_pSettings );
 }
@@ -566,7 +558,6 @@ ColumnDescriptors::ColumnDescriptors(
 
 
 Reference< css::beans::XPropertySet > ColumnDescriptors::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new ColumnDescriptor( m_refMutex, m_origin, m_pSettings );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
index d7d8e92d3ffe..d8ca464653ce 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx
@@ -83,27 +83,20 @@ protected:
 
 public: // XAppend
     virtual void SAL_CALL appendByDescriptor(
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
 // public: // XDrop
 //     virtual void SAL_CALL dropByName( const OUString& elementName )
 //         throw (css::sdbc::SQLException,
 //                css::container::NoSuchElementException,
 //                css::uno::RuntimeException);
-    virtual void SAL_CALL dropByIndex( sal_Int32 index )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
 public: // XRefreshable
-    virtual void SAL_CALL refresh(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 };
 
 
@@ -116,8 +109,7 @@ public:
         ConnectionSettings *pSettings );
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index cc46f7ae93ec..2710f8bf2748 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -146,7 +146,6 @@ Container::Container(
 }
 
 Any Container::getByName( const OUString& aName )
-    throw (NoSuchElementException,WrappedTargetException,RuntimeException, std::exception)
 {
     String2IntMap::const_iterator ii = m_name2index.find( aName );
     if( ii == m_name2index.end() )
@@ -164,7 +163,6 @@ Any Container::getByName( const OUString& aName )
 }
 
 Sequence< OUString > Container::getElementNames(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     Sequence< OUString > ret( m_values.size() );
     for( String2IntMap::const_iterator ii = m_name2index.begin();
@@ -179,27 +177,21 @@ Sequence< OUString > Container::getElementNames(  )
 }
 
 sal_Bool Container::hasByName( const OUString& aName )
-        throw (css::uno::RuntimeException, std::exception)
 {
     return m_name2index.find( aName ) != m_name2index.end();
 }
     // Methods
 Type Container::getElementType(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     return Type();
 }
 
 sal_Bool Container::hasElements(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     return ! m_name2index.empty();
 }
 
 Any Container::getByIndex( sal_Int32 Index )
-    throw (css::lang::IndexOutOfBoundsException,
-           css::lang::WrappedTargetException,
-           css::uno::RuntimeException, std::exception)
 {
     if( Index < 0 || Index >= (sal_Int32)m_values.size() )
     {
@@ -216,7 +208,6 @@ Any Container::getByIndex( sal_Int32 Index )
 }
 
 sal_Int32 Container::getCount()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return m_values.size();
 }
@@ -234,25 +225,17 @@ public:
 
 public:
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement(  )
-        throw (css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+    virtual css::uno::Any SAL_CALL nextElement(  ) override;
 
 };
 
 sal_Bool ContainerEnumeration::hasMoreElements()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return (int)m_vec.size() > m_index +1;
 }
 
 css::uno::Any ContainerEnumeration::nextElement()
-        throw (css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception)
 {
     if( ! hasMoreElements() )
     {
@@ -264,21 +247,18 @@ css::uno::Any ContainerEnumeration::nextElement()
 }
 
 Reference< XEnumeration > Container::createEnumeration(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return new ContainerEnumeration( m_values );
 }
 
 void Container::addRefreshListener(
     const css::uno::Reference< css::util::XRefreshListener >& l )
-    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.addListener( cppu::UnoType<decltype(l)>::get() , l );
 }
 
 void Container::removeRefreshListener(
     const css::uno::Reference< css::util::XRefreshListener >& l )
-    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener( cppu::UnoType<decltype(l)>::get() , l );
 }
@@ -307,9 +287,6 @@ void Container::rename( const OUString &oldName, const OUString &newName )
 }
 
 void Container::dropByName( const OUString& elementName )
-    throw (css::sdbc::SQLException,
-           css::container::NoSuchElementException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     String2IntMap::const_iterator ii = m_name2index.find( elementName );
@@ -332,9 +309,6 @@ void Container::dropByName( const OUString& elementName )
 }
 
 void Container::dropByIndex( sal_Int32 index )
-    throw (css::sdbc::SQLException,
-           css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     if( index < 0 ||  index >=(sal_Int32)m_values.size() )
@@ -387,7 +361,6 @@ void Container::dropByIndex( sal_Int32 index )
 void Container::append(
     const OUString & name,
     const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-    throw ( css::container::ElementExistException )
 
 {
     osl::MutexGuard guard( m_refMutex->mutex );
@@ -413,9 +386,6 @@ void Container::append(
 
 void Container::appendByDescriptor(
     const css::uno::Reference< css::beans::XPropertySet >& descriptor)
-    throw (css::sdbc::SQLException,
-           css::container::ElementExistException,
-           css::uno::RuntimeException, std::exception)
 {
     append( extractStringProperty( descriptor, getStatics().NAME ), descriptor );
 }
@@ -423,14 +393,12 @@ void Container::appendByDescriptor(
 
 void Container::addContainerListener(
         const css::uno::Reference< css::container::XContainerListener >& l )
-        throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.addListener( cppu::UnoType<decltype(l)>::get() , l );
 }
 
 void Container::removeContainerListener(
         const css::uno::Reference< css::container::XContainerListener >& l )
-        throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener( cppu::UnoType<decltype(l)>::get() , l );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
index 6c7a80c113f9..fd595c639e08 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx
@@ -123,81 +123,55 @@ public:
         );
 
 public: // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
 public: // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration >
-    SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL createEnumeration(  ) override;
 
 public: // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw (css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
     // Methods
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
 
 public: // XAppend
     // Must be overridden in Non-Descriptors. May be overridden in descriptors, when
     // PropertySet.NAME != container name
     virtual void SAL_CALL appendByDescriptor(
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
     // helper method !
     /// @throws css::container::ElementExistException
     void append(
         const OUString & str,
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw ( css::container::ElementExistException );
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor );
 
 
 public: // XDrop
-    virtual void SAL_CALL dropByName( const OUString& elementName )
-        throw (css::sdbc::SQLException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dropByIndex( sal_Int32 index )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropByName( const OUString& elementName ) override;
+    virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override = 0;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override = 0;
 
 public: // XRefreshable
-    virtual void SAL_CALL refresh(  ) throw (css::uno::RuntimeException, std::exception) override {}
+    virtual void SAL_CALL refresh(  ) override {}
     virtual void SAL_CALL addRefreshListener(
-        const css::uno::Reference< css::util::XRefreshListener >& l )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XRefreshListener >& l ) override;
     virtual void SAL_CALL removeRefreshListener(
-        const css::uno::Reference< css::util::XRefreshListener >& l )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XRefreshListener >& l ) override;
 
 public:
     // Methods
     virtual void SAL_CALL addContainerListener(
-        const css::uno::Reference< css::container::XContainerListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
     virtual void SAL_CALL removeContainerListener(
-        const css::uno::Reference< css::container::XContainerListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
 public:
     virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx
index 688d1d77a40c..60169554e9d6 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx
@@ -78,7 +78,7 @@ Index::Index( const ::rtl::Reference< RefCountedMutex > & refMutex,
       m_tableName( tableName )
 {}
 
-Reference< XPropertySet > Index::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > Index::createDataDescriptor(  )
 {
     IndexDescriptor * pIndex = new IndexDescriptor(
         m_refMutex, m_conn, m_pSettings );
@@ -87,7 +87,7 @@ Reference< XPropertySet > Index::createDataDescriptor(  ) throw (RuntimeExceptio
     return Reference< XPropertySet > ( pIndex );
 }
 
-Reference< XNameAccess > Index::getColumns(  ) throw (css::uno::RuntimeException, std::exception)
+Reference< XNameAccess > Index::getColumns(  )
 {
     if( ! m_indexColumns.is() )
     {
@@ -101,7 +101,7 @@ Reference< XNameAccess > Index::getColumns(  ) throw (css::uno::RuntimeException
     return m_indexColumns;
 }
 
-Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception )
+Sequence<Type > Index::getTypes()
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -118,12 +118,12 @@ Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception )
     return pCollection->getTypes();
 }
 
-Sequence< sal_Int8> Index::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> Index::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any Index::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
+Any Index::queryInterface( const Type & reqType )
 {
     Any ret;
 
@@ -149,7 +149,7 @@ IndexDescriptor::IndexDescriptor(
         * getStatics().refl.indexDescriptor.pProps )
 {}
 
-Reference< XPropertySet > IndexDescriptor::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > IndexDescriptor::createDataDescriptor(  )
 {
     IndexDescriptor * pIndex = new IndexDescriptor(
         m_refMutex, m_conn, m_pSettings );
@@ -157,7 +157,7 @@ Reference< XPropertySet > IndexDescriptor::createDataDescriptor(  ) throw (Runti
     return Reference< XPropertySet > ( pIndex );
 }
 
-Reference< XNameAccess > IndexDescriptor::getColumns(  ) throw (css::uno::RuntimeException, std::exception)
+Reference< XNameAccess > IndexDescriptor::getColumns(  )
 {
     if( ! m_indexColumns.is() )
     {
@@ -173,7 +173,7 @@ Reference< XNameAccess > IndexDescriptor::getColumns(  ) throw (css::uno::Runtim
     return m_indexColumns;
 }
 
-Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::exception )
+Sequence<Type > IndexDescriptor::getTypes()
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -190,12 +190,12 @@ Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::except
     return pCollection->getTypes();
 }
 
-Sequence< sal_Int8> IndexDescriptor::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> IndexDescriptor::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any IndexDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
+Any IndexDescriptor::queryInterface( const Type & reqType )
 {
     Any ret;
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx
index 89795324127c..7f22f1215575 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx
@@ -69,22 +69,19 @@ public: // XInterface
     virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); }
     virtual void SAL_CALL release() throw() override { ReflectionBase::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
 public: // XColumnsSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-    getColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getColumns(  ) override;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
 };
 
@@ -104,22 +101,19 @@ public: // XInterface
     virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); }
     virtual void SAL_CALL release() throw() override { ReflectionBase::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
 public: // XColumnsSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-    getColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getColumns(  ) override;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
index bb01c7f30423..ef2ceffebaa7 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
@@ -57,7 +57,7 @@ IndexColumn::IndexColumn( const ::rtl::Reference< RefCountedMutex > & refMutex,
         * getStatics().refl.indexColumn.pProps )
 {}
 
-Reference< XPropertySet > IndexColumn::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > IndexColumn::createDataDescriptor(  )
 {
     IndexColumnDescriptor * pIndexColumn = new IndexColumnDescriptor(
         m_refMutex, m_conn, m_pSettings  );
@@ -80,7 +80,7 @@ IndexColumnDescriptor::IndexColumnDescriptor(
         * getStatics().refl.indexColumnDescriptor.pProps )
 {}
 
-Reference< XPropertySet > IndexColumnDescriptor::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > IndexColumnDescriptor::createDataDescriptor(  )
 {
     IndexColumnDescriptor * pIndexColumn = new IndexColumnDescriptor(
         m_refMutex, m_conn, m_pSettings  );
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
index 42c249b64958..9dada6d18b10 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx
@@ -59,7 +59,7 @@ public:
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
 };
 
@@ -73,7 +73,7 @@ public:
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
index b8b4738a045a..09caf4829691 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
@@ -101,7 +101,6 @@ static sal_Int32 findInSequence( const Sequence< OUString > & seq , const OUStri
 }
 
 void IndexColumns::refresh()
-    throw (css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -157,9 +156,6 @@ void IndexColumns::refresh()
 
 void IndexColumns::appendByDescriptor(
     const css::uno::Reference< css::beans::XPropertySet >& /*future*/ )
-    throw (css::sdbc::SQLException,
-           css::container::ElementExistException,
-           css::uno::RuntimeException, std::exception)
 {
     throw css::sdbc::SQLException(
         "SDBC-POSTGRESQL: IndexesColumns.appendByDescriptor not yet implemented",
@@ -174,9 +170,6 @@ void IndexColumns::appendByDescriptor(
 }
 
 void IndexColumns::dropByName( const OUString& elementName )
-    throw (css::sdbc::SQLException,
-           css::container::NoSuchElementException,
-           css::uno::RuntimeException, std::exception)
 {
     (void) elementName;
     throw css::sdbc::SQLException(
@@ -200,9 +193,6 @@ void IndexColumns::dropByName( const OUString& elementName )
 }
 
 void IndexColumns::dropByIndex( sal_Int32 index )
-    throw (css::sdbc::SQLException,
-           css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     (void) index;
     throw css::sdbc::SQLException(
@@ -240,7 +230,6 @@ void IndexColumns::dropByIndex( sal_Int32 index )
 
 
 Reference< css::beans::XPropertySet > IndexColumns::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new IndexColumnDescriptor( m_refMutex, m_origin, m_pSettings );
 }
@@ -279,7 +268,6 @@ Reference< css::container::XNameAccess > IndexColumnDescriptors::create(
 }
 
 css::uno::Reference< css::beans::XPropertySet > IndexColumnDescriptors::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new IndexColumnDescriptor( m_refMutex, m_origin, m_pSettings );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
index 7134316a05e4..9c1b856dbfd4 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx
@@ -73,27 +73,17 @@ protected:
 
 public: // XAppend
     virtual void SAL_CALL appendByDescriptor(
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
 public: // XDrop
-    virtual void SAL_CALL dropByName( const OUString& elementName )
-        throw (css::sdbc::SQLException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dropByIndex( sal_Int32 index )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropByName( const OUString& elementName ) override;
+    virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
 public: // XRefreshable
-    virtual void SAL_CALL refresh(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 };
 
 
@@ -113,8 +103,7 @@ protected:
         ConnectionSettings *pSettings);
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
index b5f2c871eff0..19001cf040ea 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
@@ -90,7 +90,6 @@ Indexes::~Indexes()
 {}
 
 void Indexes::refresh()
-    throw (css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -190,9 +189,6 @@ void Indexes::refresh()
 
 void Indexes::appendByDescriptor(
     const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-    throw (css::sdbc::SQLException,
-           css::container::ElementExistException,
-           css::uno::RuntimeException, std::exception)
 {
     Statics & st = getStatics();
     OUString name = extractStringProperty( descriptor, st.NAME );
@@ -241,9 +237,6 @@ void Indexes::appendByDescriptor(
 }
 
 void Indexes::dropByIndex( sal_Int32 index )
-    throw (css::sdbc::SQLException,
-           css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
 
 
@@ -274,7 +267,6 @@ void Indexes::dropByIndex( sal_Int32 index )
 
 
 css::uno::Reference< css::beans::XPropertySet > Indexes::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new IndexDescriptor( m_refMutex, m_origin, m_pSettings );
 }
@@ -309,7 +301,6 @@ Reference< css::container::XNameAccess > IndexDescriptors::create(
 }
 
 css::uno::Reference< css::beans::XPropertySet > IndexDescriptors::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new IndexDescriptor( m_refMutex, m_origin, m_pSettings );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.hxx b/connectivity/source/drivers/postgresql/pq_xindexes.hxx
index 34d15b53df58..a4d0e48d9467 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.hxx
@@ -66,23 +66,16 @@ protected:
 
 public: // XAppend
     virtual void SAL_CALL appendByDescriptor(
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
 public: // XDrop
-    virtual void SAL_CALL dropByIndex( sal_Int32 index )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
 public: // XRefreshable
-    virtual void SAL_CALL refresh(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 };
 
 
@@ -101,8 +94,7 @@ protected:
         ConnectionSettings *pSettings );
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx
index ac15478a9282..0e3ab48782e4 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx
@@ -78,7 +78,7 @@ Key::Key( const ::rtl::Reference< RefCountedMutex > & refMutex,
       m_tableName( tableName )
 {}
 
-Reference< XPropertySet > Key::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > Key::createDataDescriptor(  )
 {
     KeyDescriptor * pKeyDescriptor = new KeyDescriptor(
         m_refMutex, m_conn, m_pSettings );
@@ -87,7 +87,7 @@ Reference< XPropertySet > Key::createDataDescriptor(  ) throw (RuntimeException,
     return Reference< XPropertySet > ( pKeyDescriptor );
 }
 
-Reference< XNameAccess > Key::getColumns(  ) throw (css::uno::RuntimeException, std::exception)
+Reference< XNameAccess > Key::getColumns(  )
 {
     // TODO: cash columns object !
     if( !m_keyColumns.is() )
@@ -103,7 +103,7 @@ Reference< XNameAccess > Key::getColumns(  ) throw (css::uno::RuntimeException,
     return m_keyColumns;
 }
 
-Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception )
+Sequence<Type > Key::getTypes()
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -120,12 +120,12 @@ Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception )
     return pCollection->getTypes();
 }
 
-Sequence< sal_Int8> Key::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> Key::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any Key::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
+Any Key::queryInterface( const Type & reqType )
 {
     Any ret;
 
@@ -151,7 +151,7 @@ KeyDescriptor::KeyDescriptor( const ::rtl::Reference< RefCountedMutex > & refMut
 {
 }
 
-Reference< XPropertySet > KeyDescriptor::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > KeyDescriptor::createDataDescriptor(  )
 {
     KeyDescriptor * pKeyDescriptor = new KeyDescriptor(
         m_refMutex, m_conn, m_pSettings );
@@ -160,7 +160,7 @@ Reference< XPropertySet > KeyDescriptor::createDataDescriptor(  ) throw (Runtime
     return Reference< XPropertySet > ( pKeyDescriptor );
 }
 
-Reference< XNameAccess > KeyDescriptor::getColumns(  ) throw (css::uno::RuntimeException, std::exception)
+Reference< XNameAccess > KeyDescriptor::getColumns(  )
 {
     // TODO: cash columns object !
     if( !m_keyColumns.is() )
@@ -170,7 +170,7 @@ Reference< XNameAccess > KeyDescriptor::getColumns(  ) throw (css::uno::RuntimeE
     return m_keyColumns;
 }
 
-Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exception )
+Sequence<Type > KeyDescriptor::getTypes()
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -187,12 +187,12 @@ Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exceptio
     return pCollection->getTypes();
 }
 
-Sequence< sal_Int8> KeyDescriptor::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> KeyDescriptor::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any KeyDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
+Any KeyDescriptor::queryInterface( const Type & reqType )
 {
     Any ret;
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx
index c416a9438b60..1b22047e89c4 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx
@@ -69,22 +69,19 @@ public: // XInterface
     virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); }
     virtual void SAL_CALL release() throw() override { ReflectionBase::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
 public: // XColumnsSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-    getColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getColumns(  ) override;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
 };
 
@@ -102,22 +99,19 @@ public: // XInterface
     virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); }
     virtual void SAL_CALL release() throw() override { ReflectionBase::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
 public: // XColumnsSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-    getColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getColumns(  ) override;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
index 4493bd8a91ae..57c4f400067a 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
@@ -57,7 +57,7 @@ KeyColumn::KeyColumn( const ::rtl::Reference< RefCountedMutex > & refMutex,
         * getStatics().refl.keycolumn.pProps )
 {}
 
-Reference< XPropertySet > KeyColumn::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > KeyColumn::createDataDescriptor(  )
 {
     KeyColumnDescriptor * pKeyColumn = new KeyColumnDescriptor(
         m_refMutex, m_conn, m_pSettings );
@@ -79,7 +79,7 @@ KeyColumnDescriptor::KeyColumnDescriptor(
         * getStatics().refl.keycolumnDescriptor.pProps )
 {}
 
-Reference< XPropertySet > KeyColumnDescriptor::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > KeyColumnDescriptor::createDataDescriptor(  )
 {
     KeyColumnDescriptor * pKeyColumn = new KeyColumnDescriptor(
         m_refMutex, m_conn, m_pSettings );
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
index 2c7ff37235a5..bf102777b730 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx
@@ -58,7 +58,7 @@ public:
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
 };
 
@@ -72,7 +72,7 @@ public:
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
index e5e1ddb748c8..47dd4d2442b0 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
@@ -87,7 +87,6 @@ KeyColumns::~KeyColumns()
 
 
 void KeyColumns::refresh()
-    throw (css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -159,9 +158,6 @@ void KeyColumns::refresh()
 
 void KeyColumns::appendByDescriptor(
     const css::uno::Reference< css::beans::XPropertySet >& future )
-    throw (css::sdbc::SQLException,
-           css::container::ElementExistException,
-           css::uno::RuntimeException, std::exception)
 {
     (void) future;
     throw css::sdbc::SQLException(
@@ -179,9 +175,6 @@ void KeyColumns::appendByDescriptor(
 
 
 void KeyColumns::dropByIndex( sal_Int32 index )
-    throw (css::sdbc::SQLException,
-           css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     (void) index;
     throw css::sdbc::SQLException(
@@ -219,7 +212,6 @@ void KeyColumns::dropByIndex( sal_Int32 index )
 
 
 Reference< css::beans::XPropertySet > KeyColumns::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new KeyColumnDescriptor( m_refMutex, m_origin, m_pSettings );
 }
@@ -250,7 +242,6 @@ KeyColumnDescriptors::KeyColumnDescriptors(
 {}
 
 Reference< css::beans::XPropertySet > KeyColumnDescriptors::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new KeyColumnDescriptor( m_refMutex, m_origin, m_pSettings );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
index 6d60413ab8ca..2c5d1a7c34a3 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx
@@ -73,23 +73,16 @@ protected:
 
 public: // XAppend
     virtual void SAL_CALL appendByDescriptor(
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
 public: // XDrop
-    virtual void SAL_CALL dropByIndex( sal_Int32 index )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
 public: // XRefreshable
-    virtual void SAL_CALL refresh(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 };
 
 
@@ -102,8 +95,7 @@ public:
         ConnectionSettings *pSettings);
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 };
 }
 #endif
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index ddfbdbca7d56..4fd0f3390544 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -106,7 +106,6 @@ static sal_Int32 string2keyrule( const OUString & rule )
 }
 
 void Keys::refresh()
-    throw (css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -207,9 +206,6 @@ void Keys::refresh()
 
 void Keys::appendByDescriptor(
     const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-    throw (css::sdbc::SQLException,
-           css::container::ElementExistException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
 
@@ -226,9 +222,6 @@ void Keys::appendByDescriptor(
 
 
 void Keys::dropByIndex( sal_Int32 index )
-    throw (css::sdbc::SQLException,
-           css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     if( index < 0 ||  index >= (sal_Int32)m_values.size() )
@@ -257,7 +250,6 @@ void Keys::dropByIndex( sal_Int32 index )
 
 
 css::uno::Reference< css::beans::XPropertySet > Keys::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new KeyDescriptor( m_refMutex, m_origin, m_pSettings );
 }
@@ -292,7 +284,6 @@ Reference< css::container::XIndexAccess > KeyDescriptors::create(
 }
 
 css::uno::Reference< css::beans::XPropertySet > KeyDescriptors::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new KeyDescriptor( m_refMutex, m_origin, m_pSettings );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.hxx b/connectivity/source/drivers/postgresql/pq_xkeys.hxx
index df0f21b7b619..27ec7c64ca62 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.hxx
@@ -66,23 +66,16 @@ protected:
 
 public: // XAppend
     virtual void SAL_CALL appendByDescriptor(
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
 public: // XDrop
-    virtual void SAL_CALL dropByIndex( sal_Int32 index )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
 public: // XRefreshable
-    virtual void SAL_CALL refresh(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 };
 
 
@@ -101,8 +94,7 @@ protected:
         ConnectionSettings *pSettings );
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index ddc96f61aaa8..8da4a6d4f406 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -88,7 +88,7 @@ Table::Table( const ::rtl::Reference< RefCountedMutex > & refMutex,
       m_pColumns( nullptr )
 {}
 
-Reference< XPropertySet > Table::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > Table::createDataDescriptor(  )
 {
     TableDescriptor * pTable = new TableDescriptor(
         m_refMutex, m_conn, m_pSettings );
@@ -97,7 +97,7 @@ Reference< XPropertySet > Table::createDataDescriptor(  ) throw (RuntimeExceptio
     return Reference< XPropertySet > ( pTable );
 }
 
-Reference< XNameAccess > Table::getColumns(  ) throw (css::uno::RuntimeException, std::exception)
+Reference< XNameAccess > Table::getColumns(  )
 {
     if( ! m_columns.is() )
     {
@@ -112,7 +112,7 @@ Reference< XNameAccess > Table::getColumns(  ) throw (css::uno::RuntimeException
     return m_columns;
 }
 
-Reference< XNameAccess > Table::getIndexes() throw (css::uno::RuntimeException, std::exception)
+Reference< XNameAccess > Table::getIndexes()
 {
     if( ! m_indexes.is() )
     {
@@ -126,7 +126,7 @@ Reference< XNameAccess > Table::getIndexes() throw (css::uno::RuntimeException,
     return m_indexes;
 }
 
-Reference< XIndexAccess > Table::getKeys(  ) throw (css::uno::RuntimeException, std::exception)
+Reference< XIndexAccess > Table::getKeys(  )
 {
     if( ! m_keys.is() )
     {
@@ -141,9 +141,6 @@ Reference< XIndexAccess > Table::getKeys(  ) throw (css::uno::RuntimeException,
 }
 
 void Table::rename( const OUString& newName )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
     Statics & st = getStatics();
@@ -229,7 +226,6 @@ void Table::rename( const OUString& newName )
 void Table::alterColumnByName(
     const OUString& colName,
     const Reference< XPropertySet >& descriptor )
-    throw (SQLException,NoSuchElementException,RuntimeException, std::exception)
 {
     Reference< css::container::XNameAccess > columns =
         Reference< css::container::XNameAccess > ( getColumns(), UNO_QUERY );
@@ -253,7 +249,6 @@ void Table::alterColumnByName(
 void Table::alterColumnByIndex(
     sal_Int32 index,
     const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-    throw (SQLException,IndexOutOfBoundsException,RuntimeException, std::exception)
 {
     Reference< css::container::XIndexAccess > columns =
         Reference< css::container::XIndexAccess>( getColumns(), UNO_QUERY );
@@ -268,7 +263,7 @@ void Table::alterColumnByIndex(
     m_pColumns->refresh();
 }
 
-Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception )
+Sequence<Type > Table::getTypes()
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -289,12 +284,12 @@ Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception )
     return pCollection->getTypes();
 }
 
-Sequence< sal_Int8> Table::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> Table::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any Table::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
+Any Table::queryInterface( const Type & reqType )
 {
     Any ret;
 
@@ -311,7 +306,7 @@ Any Table::queryInterface( const Type & reqType ) throw (RuntimeException, std::
     return ret;
 }
 
-OUString Table::getName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString Table::getName(  )
 {
     Statics & st = getStatics();
     return concatQualified(
@@ -319,7 +314,7 @@ OUString Table::getName(  ) throw (css::uno::RuntimeException, std::exception)
         extractStringProperty( this, st.NAME ) );
 }
 
-void Table::setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception)
+void Table::setName( const OUString& aName )
 {
     rename( aName );
 }
@@ -339,7 +334,7 @@ TableDescriptor::TableDescriptor(
 {
 }
 
-Reference< XNameAccess > TableDescriptor::getColumns(  ) throw (css::uno::RuntimeException, std::exception)
+Reference< XNameAccess > TableDescriptor::getColumns(  )
 {
     if( ! m_columns.is() )
     {
@@ -348,7 +343,7 @@ Reference< XNameAccess > TableDescriptor::getColumns(  ) throw (css::uno::Runtim
     return m_columns;
 }
 
-Reference< XNameAccess > TableDescriptor::getIndexes() throw (css::uno::RuntimeException, std::exception)
+Reference< XNameAccess > TableDescriptor::getIndexes()
 {
     if( ! m_indexes.is() )
     {
@@ -360,7 +355,7 @@ Reference< XNameAccess > TableDescriptor::getIndexes() throw (css::uno::RuntimeE
     return m_indexes;
 }
 
-Reference< XIndexAccess > TableDescriptor::getKeys(  ) throw (css::uno::RuntimeException, std::exception)
+Reference< XIndexAccess > TableDescriptor::getKeys(  )
 {
     if( ! m_keys.is() )
     {
@@ -373,7 +368,7 @@ Reference< XIndexAccess > TableDescriptor::getKeys(  ) throw (css::uno::RuntimeE
 }
 
 
-Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::exception )
+Sequence<Type > TableDescriptor::getTypes()
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -392,12 +387,12 @@ Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::except
     return pCollection->getTypes();
 }
 
-Sequence< sal_Int8> TableDescriptor::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> TableDescriptor::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
+Any TableDescriptor::queryInterface( const Type & reqType )
 {
     Any ret;
 
@@ -412,7 +407,7 @@ Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeExcept
 }
 
 
-Reference< XPropertySet > TableDescriptor::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > TableDescriptor::createDataDescriptor(  )
 {
     TableDescriptor * pTable = new TableDescriptor(
         m_refMutex, m_conn, m_pSettings );
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx
index 759dddad8a68..09fe3cbac88c 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx
@@ -77,55 +77,43 @@ public:
     virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); }
     virtual void SAL_CALL release() throw() override { ReflectionBase::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
     // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
     // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
     // XColumnsSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-    getColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getColumns(  ) override;
 
     // XIndexesSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-    getIndexes(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getIndexes(  ) override;
 
     // XKeysSupplier
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-    getKeys(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getKeys(  ) override;
 
     // XRename
-    virtual void SAL_CALL rename( const OUString& newName )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rename( const OUString& newName ) override;
 
     // XAlterTable
     virtual void SAL_CALL alterColumnByName(
         const OUString& colName,
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
     virtual void SAL_CALL alterColumnByIndex(
         sal_Int32 index,
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 };
 
 
@@ -149,30 +137,27 @@ public: // XInterface
     virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); }
     virtual void SAL_CALL release() throw() override { ReflectionBase::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // XColumnsSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-    getColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getColumns(  ) override;
 
 public: // XIndexesSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-    getIndexes(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getIndexes(  ) override;
 
 public: // XKeysSupplier
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-    getKeys(  ) throw (css::uno::RuntimeException, std::exception) override;
+    getKeys(  ) override;
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 };
 
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index cbd5c3f2b695..b5d39baa276d 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -82,7 +82,6 @@ Tables::~Tables()
 {}
 
 void Tables::refresh()
-    throw (css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -236,9 +235,6 @@ static void appendKeyList(
 
 void Tables::appendByDescriptor(
     const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-    throw (css::sdbc::SQLException,
-           css::container::ElementExistException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     Reference< XStatement > stmt =
@@ -313,9 +309,6 @@ void Tables::appendByDescriptor(
 }
 
 void Tables::dropByIndex( sal_Int32 index )
-    throw (css::sdbc::SQLException,
-           css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     if( index < 0 ||  index >= (sal_Int32)m_values.size() )
@@ -355,7 +348,6 @@ void Tables::dropByIndex( sal_Int32 index )
 
 
 css::uno::Reference< css::beans::XPropertySet > Tables::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new TableDescriptor( m_refMutex, m_origin, m_pSettings );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.hxx b/connectivity/source/drivers/postgresql/pq_xtables.hxx
index 9eb675e3f933..a3390cc2c1c3 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.hxx
@@ -62,27 +62,20 @@ protected:
 
 public: // XAppend
     virtual void SAL_CALL appendByDescriptor(
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
 public: // XDrop
 //     virtual void SAL_CALL dropByName( const OUString& elementName )
 //         throw (css::sdbc::SQLException,
 //                css::container::NoSuchElementException,
 //                css::uno::RuntimeException);
-    virtual void SAL_CALL dropByIndex( sal_Int32 index )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
 public: // XRefreshable
-    virtual void SAL_CALL refresh(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 
 protected:
     using Container::disposing;
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx
index 6b32bd667e72..e1471cb0a2ee 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx
@@ -74,7 +74,7 @@ User::User( const ::rtl::Reference< RefCountedMutex > & refMutex,
         * getStatics().refl.user.pProps )
 {}
 
-Reference< XPropertySet > User::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > User::createDataDescriptor(  )
 {
     UserDescriptor * pUser = new UserDescriptor( m_refMutex, m_conn, m_pSettings );
     pUser->copyValuesFrom( this );
@@ -83,7 +83,7 @@ Reference< XPropertySet > User::createDataDescriptor(  ) throw (RuntimeException
 }
 
 
-Sequence<Type > User::getTypes() throw( RuntimeException, std::exception )
+Sequence<Type > User::getTypes()
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -100,12 +100,12 @@ Sequence<Type > User::getTypes() throw( RuntimeException, std::exception )
     return pCollection->getTypes();
 }
 
-Sequence< sal_Int8> User::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> User::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any User::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
+Any User::queryInterface( const Type & reqType )
 {
     Any ret;
 
@@ -120,7 +120,6 @@ Any User::queryInterface( const Type & reqType ) throw (RuntimeException, std::e
 
 void User::changePassword(
     const OUString& oldPassword, const OUString& newPassword )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     (void) oldPassword;
     OUStringBuffer buf(128);
@@ -134,7 +133,6 @@ void User::changePassword(
 }
 
 sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     sal_Int32 ret = 0xffffffff;
     if (isLog(m_pSettings, LogLevel::Info))
@@ -152,7 +150,6 @@ sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType )
 }
 
 sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objType )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     (void) objName; (void) objType;
     // all privileges
@@ -160,7 +157,6 @@ sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objTy
 }
 
 void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     (void) objName; (void) objType; (void) objPrivileges;
     throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet",
@@ -168,7 +164,6 @@ void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int3
 }
 
 void User::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges )
-    throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     (void) objName; (void) objType; (void) objPrivileges;
     throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet",
@@ -189,7 +184,7 @@ UserDescriptor::UserDescriptor(
         * getStatics().refl.userDescriptor.pProps )
 {}
 
-Reference< XPropertySet > UserDescriptor::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > UserDescriptor::createDataDescriptor(  )
 {
     UserDescriptor * pUser = new UserDescriptor( m_refMutex, m_conn, m_pSettings );
     pUser->copyValuesFrom( this );
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx
index 68ee639201b2..445e6814ec0f 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx
@@ -62,25 +62,22 @@ public:
     virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); }
     virtual void SAL_CALL release() throw() override { ReflectionBase::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
     // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
     // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
     // XUser : XAuthorizable
-    virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override;
+    virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override;
+    virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
+    virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
+    virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) override;
 };
 
 class UserDescriptor : public ReflectionBase
@@ -93,7 +90,7 @@ public:
 
 public: // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx
index e92158e823d4..aae6c1b551f7 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx
@@ -72,7 +72,6 @@ Users::~Users()
 {}
 
 void Users::refresh()
-    throw (css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -118,9 +117,6 @@ void Users::refresh()
 
 void Users::appendByDescriptor(
     const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-    throw (css::sdbc::SQLException,
-           css::container::ElementExistException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
 
@@ -136,9 +132,6 @@ void Users::appendByDescriptor(
 }
 
 void Users::dropByName( const OUString& elementName )
-    throw (css::sdbc::SQLException,
-           css::container::NoSuchElementException,
-           css::uno::RuntimeException, std::exception)
 {
     String2IntMap::const_iterator ii = m_name2index.find( elementName );
     if( ii == m_name2index.end() )
@@ -154,9 +147,6 @@ void Users::dropByName( const OUString& elementName )
 }
 
 void Users::dropByIndex( sal_Int32 index )
-    throw (css::sdbc::SQLException,
-           css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
 
     osl::MutexGuard guard( m_refMutex->mutex );
@@ -188,7 +178,6 @@ void Users::dropByIndex( sal_Int32 index )
 
 
 css::uno::Reference< css::beans::XPropertySet > Users::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new UserDescriptor( m_refMutex, m_origin, m_pSettings  );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xusers.hxx b/connectivity/source/drivers/postgresql/pq_xusers.hxx
index 6ecddfe302ff..ef05a2b1307c 100644
--- a/connectivity/source/drivers/postgresql/pq_xusers.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xusers.hxx
@@ -61,27 +61,17 @@ protected:
 
 public: // XAppend
     virtual void SAL_CALL appendByDescriptor(
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
 public: // XDrop
-    virtual void SAL_CALL dropByName( const OUString& elementName )
-        throw (css::sdbc::SQLException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dropByIndex( sal_Int32 index )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropByName( const OUString& elementName ) override;
+    virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
 public: // XRefreshable
-    virtual void SAL_CALL refresh(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 
 protected:
     virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index c42f533a410f..3a85d52cc510 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -78,7 +78,7 @@ View::View( const ::rtl::Reference< RefCountedMutex > & refMutex,
         * getStatics().refl.view.pProps )
 {}
 
-Reference< XPropertySet > View::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > View::createDataDescriptor(  )
 {
     ViewDescriptor * pView = new ViewDescriptor(
         m_refMutex, m_conn, m_pSettings );
@@ -88,9 +88,6 @@ Reference< XPropertySet > View::createDataDescriptor(  ) throw (RuntimeException
 }
 
 void View::rename( const OUString& newName )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception)
 {
     MutexGuard guard( m_refMutex->mutex );
 
@@ -158,7 +155,7 @@ void View::rename( const OUString& newName )
     }
 }
 
-Sequence<Type > View::getTypes() throw( RuntimeException, std::exception )
+Sequence<Type > View::getTypes()
 {
     static cppu::OTypeCollection *pCollection;
     if( ! pCollection )
@@ -175,12 +172,12 @@ Sequence<Type > View::getTypes() throw( RuntimeException, std::exception )
     return pCollection->getTypes();
 }
 
-Sequence< sal_Int8> View::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8> View::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any View::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
+Any View::queryInterface( const Type & reqType )
 {
     Any ret;
 
@@ -193,7 +190,7 @@ Any View::queryInterface( const Type & reqType ) throw (RuntimeException, std::e
     return ret;
 }
 
-OUString View::getName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString View::getName(  )
 {
     Statics & st = getStatics();
     return concatQualified(
@@ -201,7 +198,7 @@ OUString View::getName(  ) throw (css::uno::RuntimeException, std::exception)
         extractStringProperty( this, st.NAME ) );
 }
 
-void View::setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception)
+void View::setName( const OUString& aName )
 {
     rename( aName );
 }
@@ -220,7 +217,7 @@ ViewDescriptor::ViewDescriptor(
         * getStatics().refl.viewDescriptor.pProps )
 {}
 
-Reference< XPropertySet > ViewDescriptor::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > ViewDescriptor::createDataDescriptor(  )
 {
     ViewDescriptor * pView = new ViewDescriptor(
         m_refMutex, m_conn, m_pSettings );
diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx
index 7b9270420b2c..39fdc0d7f69c 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.hxx
@@ -61,28 +61,22 @@ public:
     virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); }
     virtual void SAL_CALL release() throw() override { ReflectionBase::release(); }
     virtual css::uno::Any  SAL_CALL queryInterface(
-        const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type & reqType ) override;
 
     // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
     // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 
     // XRename
-    virtual void SAL_CALL rename( const OUString& newName )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rename( const OUString& newName ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
 };
 
@@ -96,7 +90,7 @@ public:
 
     // XDataDescriptorFactory
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-    createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+    createDataDescriptor(  ) override;
 };
 
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx
index cd12d586687c..311fb888494a 100644
--- a/connectivity/source/drivers/postgresql/pq_xviews.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx
@@ -73,7 +73,6 @@ Views::~Views()
 {}
 
 void Views::refresh()
-    throw (css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -132,9 +131,6 @@ void Views::refresh()
 
 void Views::appendByDescriptor(
     const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-    throw (css::sdbc::SQLException,
-           css::container::ElementExistException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
 
@@ -163,9 +159,6 @@ void Views::appendByDescriptor(
 }
 
 void Views::dropByName( const OUString& elementName )
-    throw (css::sdbc::SQLException,
-           css::container::NoSuchElementException,
-           css::uno::RuntimeException, std::exception)
 {
     String2IntMap::const_iterator ii = m_name2index.find( elementName );
     if( ii == m_name2index.end() )
@@ -179,9 +172,6 @@ void Views::dropByName( const OUString& elementName )
 }
 
 void Views::dropByIndex( sal_Int32 index )
-    throw (css::sdbc::SQLException,
-           css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     if( index < 0 ||  index >= (sal_Int32)m_values.size() )
@@ -210,7 +200,6 @@ void Views::dropByIndex( sal_Int32 index )
 
 
 css::uno::Reference< css::beans::XPropertySet > Views::createDataDescriptor()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return new ViewDescriptor( m_refMutex, m_origin, m_pSettings );
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xviews.hxx b/connectivity/source/drivers/postgresql/pq_xviews.hxx
index 1debff30d494..bfca9392529f 100644
--- a/connectivity/source/drivers/postgresql/pq_xviews.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xviews.hxx
@@ -62,27 +62,17 @@ protected:
 
 public: // XAppend
     virtual void SAL_CALL appendByDescriptor(
-        const css::uno::Reference< css::beans::XPropertySet >& descriptor )
-        throw (css::sdbc::SQLException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
 public: // XDrop
-    virtual void SAL_CALL dropByName( const OUString& elementName )
-        throw (css::sdbc::SQLException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dropByIndex( sal_Int32 index )
-        throw (css::sdbc::SQLException,
-               css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropByName( const OUString& elementName ) override;
+    virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
 public: // XRefreshable
-    virtual void SAL_CALL refresh(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
 
 public: // XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 
 protected:
     using Container::disposing;
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 808380563719..694c49b2ce72 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -123,7 +123,7 @@ namespace connectivity
 
         void construct();
         /// @throws css::sdbc::SQLException
-        void checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException);
+        void checkIndex(sal_Int32 columnIndex );
         void setType(MetaDataResultSetType _eType);
 
     protected:
@@ -155,76 +155,76 @@ namespace connectivity
         // XServiceInfo
 
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
 
     protected:
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
         // ::cppu::OComponentHelper
         virtual void SAL_CALL disposing() override;
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         //XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
         // XResultSet
-        virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL next(  ) override;
+        virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+        virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+        virtual sal_Bool SAL_CALL isFirst(  ) override;
+        virtual sal_Bool SAL_CALL isLast(  ) override;
+        virtual void SAL_CALL beforeFirst(  ) override;
+        virtual void SAL_CALL afterLast(  ) override;
+        virtual sal_Bool SAL_CALL first(  ) override;
+        virtual sal_Bool SAL_CALL last(  ) override;
+        virtual sal_Int32 SAL_CALL getRow(  ) override;
+        virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+        virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+        virtual sal_Bool SAL_CALL previous(  ) override;
+        virtual void SAL_CALL refreshRow(  ) override;
+        virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+        virtual sal_Bool SAL_CALL rowInserted(  ) override;
+        virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
         // XRow
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
         // XResultSetMetaDataSupplier
-        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
         // XCancellable
-        virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cancel(  ) override;
         // XCloseable
-        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close(  ) override;
         // XWarningsSupplier
-        virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+        virtual void SAL_CALL clearWarnings(  ) override;
         // XColumnLocate
-        virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         void setCatalogsMap();
         void setSchemasMap();
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index a564f891ead8..e714f6d63a7f 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -49,27 +49,27 @@ namespace connectivity
         {
         }
 
-        virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+        virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
 
         // methods to set the right column mapping
         void setColumnPrivilegesMap();
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index fa9d94bc30d2..6319c73c991f 100644
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
@@ -42,25 +42,25 @@ namespace connectivity
         ParameterSubstitution& operator=( const ParameterSubstitution& ) = delete;
     public:
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface > create( const css::uno::Reference< css::uno::XComponentContext >  & xContext);
     protected:
         ParameterSubstitution(const css::uno::Reference< css::uno::XComponentContext >& _rxContext );
         virtual ~ParameterSubstitution() override {}
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XStringSubstitution
-        virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) override;
+        virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) override;
+        virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) override;
     };
 
 } // connectivity
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index 28225476c830..5c5448011f8f 100644
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
@@ -73,7 +73,7 @@ namespace connectivity
         virtual void SAL_CALL disposing() override;
 
         //XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
         static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
     };
 }
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index 0ad1a0103f08..596a960ddfef 100644
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
@@ -93,41 +93,41 @@ namespace connectivity
             ODatabaseMetaDataBase(const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo);
 
             // XDatabaseMetaData2
-            virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getConnectionInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getConnectionInfo(  ) 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;
 
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override;
 
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
             // cached database information
-            virtual OUString SAL_CALL getIdentifierQuoteString(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCatalogAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogSeparator(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxStatements(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getIdentifierQuoteString(  ) override;
+            virtual sal_Bool SAL_CALL isCatalogAtStart(  ) override;
+            virtual OUString SAL_CALL getCatalogSeparator(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) override;
+            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatements(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTablesInSelect(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) override;
         };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_TDATABASEMETADATABASE_HXX
diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx
index 3755f75da140..d8f31194dc16 100644
--- a/connectivity/source/inc/TPrivilegesResultSet.hxx
+++ b/connectivity/source/inc/TPrivilegesResultSet.hxx
@@ -40,7 +40,7 @@ namespace connectivity
         // ::cppu::OComponentHelper
         virtual void SAL_CALL disposing() override;
         // XResultSet
-        virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL next(  ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_TPRIVILEGESRESULTSET_HXX
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx
index 726bf6929ee9..ecec87cec2d0 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -44,34 +44,34 @@ namespace connectivity
             // a Constructor, that is needed for when Returning the Object is needed:
             OCallableStatement( OConnection* _pConnection, const OUString& sql );
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
 
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
             // XOutParameters
-            virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+            virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx
index 6dda866cc052..4bb75b9ebf29 100644
--- a/connectivity/source/inc/ado/AColumn.hxx
+++ b/connectivity/source/inc/ado/AColumn.hxx
@@ -41,15 +41,14 @@ namespace connectivity
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                     )
-                                     throw (css::uno::Exception) override;
+                                     ) override;
         public:
             OAdoColumn(bool _bCase,OConnection* _pConnection,_ADOColumn* _pColumn);
             OAdoColumn(bool _bCase,OConnection* _pConnection);
             // ODescriptor
             virtual void construct() override;
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             WpADOColumn     getColumnImpl() const;
diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx
index 04488a5c835a..aac1d97a15fa 100644
--- a/connectivity/source/inc/ado/AColumns.hxx
+++ b/connectivity/source/inc/ado/AColumns.hxx
@@ -37,7 +37,7 @@ namespace connectivity
             OConnection*    m_pConnection;
 
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index 71e09885ad5f..74d6bd7750f3 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -71,20 +71,17 @@ namespace connectivity
 
         protected:
             /// @throws css::sdbc::SQLException
-            void buildTypeInfo() throw( css::sdbc::SQLException);
+            void buildTypeInfo();
         public:
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            OConnection(ODriver*        _pDriver) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            OConnection(ODriver*        _pDriver);
             //  OConnection(const SQLHANDLE _pConnectionHandle);
             ~OConnection() override;
             void construct(const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info);
 
-            /// @throws css::sdbc::SQLException
-            void closeAllStatements () throw( css::sdbc::SQLException);
-
             //XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
             // XServiceInfo
             DECLARE_SERVICE_INFO();
@@ -94,29 +91,29 @@ namespace connectivity
             virtual void SAL_CALL release() throw() override;
 
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+            virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+            virtual void SAL_CALL commit(  ) override;
+            virtual void SAL_CALL rollback(  ) override;
+            virtual sal_Bool SAL_CALL isClosed(  ) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+            virtual OUString SAL_CALL getCatalog(  ) override;
+            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
 
             WpADOConnection* getConnection() { return m_pAdoConnection; }
             void setCatalog(const css::uno::WeakReference< css::sdbcx::XTablesSupplier>& _xCat) { m_xCatalog = _xCat; }
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index 18b04531c3fe..5f3f7d616956 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
@@ -55,13 +55,13 @@ namespace connectivity
             // get info out of propertyst
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            OUString getStringProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            OUString getStringProperty(const OUString& _aProperty);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32       getInt32Property(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32       getInt32Property(const OUString& _aProperty);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            bool            getBoolProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            bool            getBoolProperty(const OUString& _aProperty);
 
             virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override;
             // cached database information
@@ -83,140 +83,140 @@ namespace connectivity
             ODatabaseMetaData(OConnection* _pCon);
 
             // XDatabaseMetaData
-            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getUserName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getDatabaseProductName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getDriverName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getDriverVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-
-            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-
-            virtual OUString SAL_CALL getSQLKeywords(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getNumericFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getStringFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSystemFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSearchStringEscape(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSchemaTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getProcedureTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getCatalogTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsUnion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual OUString SAL_CALL getUserName(  ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductName(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductVersion(  ) override;
+            virtual OUString SAL_CALL getDriverName(  ) override;
+            virtual OUString SAL_CALL getDriverVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
+
+            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
+
+            virtual OUString SAL_CALL getSQLKeywords(  ) override;
+            virtual OUString SAL_CALL getNumericFunctions(  ) override;
+            virtual OUString SAL_CALL getStringFunctions(  ) override;
+            virtual OUString SAL_CALL getSystemFunctions(  ) override;
+            virtual OUString SAL_CALL getTimeDateFunctions(  ) override;
+            virtual OUString SAL_CALL getSearchStringEscape(  ) override;
+            virtual OUString SAL_CALL getExtraNameCharacters(  ) override;
+            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+            virtual OUString SAL_CALL getSchemaTerm(  ) override;
+            virtual OUString SAL_CALL getProcedureTerm(  ) override;
+            virtual OUString SAL_CALL getCatalogTerm(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index c10bdeb6dce5..234e986b85c0 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -77,34 +77,34 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static sal_Int32 getResultSetConcurrency() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static sal_Int32 getResultSetConcurrency();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static sal_Int32 getResultSetType() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static sal_Int32 getResultSetType();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static sal_Int32 getFetchDirection() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static sal_Int32 getFetchDirection();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getFetchSize()            const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getFetchSize()            const;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static OUString getCursorName() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static OUString getCursorName();
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setFetchDirection(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setFetchDirection(sal_Int32 _par0);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setFetchSize(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setFetchSize(sal_Int32 _par0);
 
 
             inline sal_Int32 mapColumn (sal_Int32   column);
             /// @throws css::sdbc::SQLException
-            void checkRecordSet() throw(css::sdbc::SQLException);
+            void checkRecordSet();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            OLEVariant getValue(sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            OLEVariant getValue(sal_Int32 columnIndex );
 
         protected:
 
@@ -117,13 +117,11 @@ namespace connectivity
                                                                 css::uno::Any & rConvertedValue,
                                                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                                                const css::uno::Any& rValue )
-                                    throw (css::lang::IllegalArgumentException) override;
+                                                                const css::uno::Any& rValue ) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                                                         const css::uno::Any& rValue
-                                                     )
-                                                                                                         throw (css::uno::Exception) override;
+                                                     ) override;
             virtual void SAL_CALL getFastPropertyValue(
                                                                         css::uno::Any& rValue,
                                     sal_Int32 nHandle
@@ -136,64 +134,64 @@ namespace connectivity
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
             const ::std::vector<sal_Int32>& getColumnMapping() { return m_aColMapping; }
 
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index ba330c063ba1..cfe57f924f98 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -78,27 +78,27 @@ namespace connectivity
             inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw()
             { return this; }
 
-            virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx
index 00343531932c..508a49307e6d 100644
--- a/connectivity/source/inc/ado/ADriver.hxx
+++ b/connectivity/source/inc/ado/ADriver.hxx
@@ -34,8 +34,8 @@ namespace connectivity
 {
     namespace ado
     {
-
-        css::uno::Reference< css::uno::XInterface >  SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception );
+        /// @throws css::uno::Exception
+        css::uno::Reference< css::uno::XInterface >  SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
         typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver,
                                                  css::sdbcx::XDataDefinitionSupplier,
@@ -59,29 +59,29 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
             // XInterface
             /// @throws css::uno::RuntimeException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
             /// @throws css::uno::RuntimeException
-            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
             css::uno::Reference< css::lang::XMultiServiceFactory > getORB() const { return m_xORB; }
 
         private:
             void impl_checkURL_throw(const OUString& _sUrl);
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException) override;
+            virtual OUString SAL_CALL getImplementationName(  ) override;
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw(css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Int32 SAL_CALL getMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
 
             // XDataDefinitionSupplier
-            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) override;
+            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
         };
     }
 
diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx
index 2d3655f8556c..ae3a5dd60584 100644
--- a/connectivity/source/inc/ado/AGroup.hxx
+++ b/connectivity/source/inc/ado/AGroup.hxx
@@ -40,7 +40,7 @@ namespace connectivity
             static ObjectTypeEnum MapObjectType(sal_Int32 ObjType);
         protected:
             virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue,sal_Int32 nHandle) const override;
-            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception) override;
+            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override;
 
         public:
             virtual void refreshUsers() override;
@@ -49,14 +49,14 @@ namespace connectivity
             OAdoGroup(OCatalog* _pParent,bool _bCase, const OUString& Name);
 
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             // XAuthorizable
-            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
+            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
 
             WpADOGroup getImpl() const { return m_aGroup; }
         };
diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx
index 3a5543f63c77..42e5120d0edc 100644
--- a/connectivity/source/inc/ado/AGroups.hxx
+++ b/connectivity/source/inc/ado/AGroups.hxx
@@ -35,7 +35,7 @@ namespace connectivity
         protected:
 
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx
index f01f92bc94d1..ad9d26b056b0 100644
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
@@ -35,14 +35,14 @@ namespace connectivity
             OConnection*    m_pConnection;
         protected:
             void fillPropertyValues();
-            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception) override;
+            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override;
         public:
             virtual void refreshColumns() override;
         public:
             OAdoIndex(bool _bCase,  OConnection* _pConnection,ADOIndex* _pIndex);
             OAdoIndex(bool _bCase,  OConnection* _pConnection);
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             WpADOIndex      getImpl() const { return m_aIndex;}
diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx
index b5cc353322e5..7c2190b2b054 100644
--- a/connectivity/source/inc/ado/AIndexes.hxx
+++ b/connectivity/source/inc/ado/AIndexes.hxx
@@ -34,7 +34,7 @@ namespace connectivity
             OConnection*    m_pConnection;
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx
index 499e36c7695d..8f01928800f6 100644
--- a/connectivity/source/inc/ado/AKey.hxx
+++ b/connectivity/source/inc/ado/AKey.hxx
@@ -37,7 +37,7 @@ namespace connectivity
             OConnection*    m_pConnection;
         protected:
             void fillPropertyValues();
-            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception) override;
+            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override;
         public:
             virtual void refreshColumns() override;
         public:
@@ -45,7 +45,7 @@ namespace connectivity
             OAdoKey(bool _bCase,OConnection* _pConnection);
 
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             WpADOKey        getImpl() const { return m_aKey;}
diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx
index 15359bb0293a..d26da4fbc8f0 100644
--- a/connectivity/source/inc/ado/AKeys.hxx
+++ b/connectivity/source/inc/ado/AKeys.hxx
@@ -35,7 +35,7 @@ namespace connectivity
 
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index 3b25110bfc23..792ba22fb964 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -45,8 +45,7 @@ namespace connectivity
         {
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType, sal_Int32 _nSize,const OLEVariant& Val)
-                                        throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType, sal_Int32 _nSize,const OLEVariant& Val);
             void replaceParameterNodeName(  OSQLParseNode* _pNode,
                                             const OUString& _sDefaultName,
                                             sal_Int32& _nParameterCount);
@@ -66,46 +65,46 @@ namespace connectivity
 
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPreparedStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) override;
             using OStatement_Base::executeQuery;
-            virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
             using OStatement_Base::executeUpdate;
-            virtual sal_Bool SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL execute(  ) override;
             using OStatement_Base::execute;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
             // XParameters
-            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+            virtual void SAL_CALL clearParameters(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL close(  ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
         };
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index a54936aaa2ee..111e45885cb6 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -75,30 +75,30 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getResultSetConcurrency() const;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getResultSetType()        const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getResultSetType()        const;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static sal_Int32 getFetchDirection() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static sal_Int32 getFetchDirection();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getFetchSize()            const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getFetchSize()            const;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static OUString getCursorName() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static OUString getCursorName();
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setFetchDirection(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setFetchDirection(sal_Int32 _par0);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setFetchSize(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setFetchSize(sal_Int32 _par0);
             void updateValue(sal_Int32 columnIndex,const OLEVariant& x);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            OLEVariant getValue(sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            OLEVariant getValue(sal_Int32 columnIndex );
 
         protected:
 
@@ -110,13 +110,11 @@ namespace connectivity
                                                                 css::uno::Any & rConvertedValue,
                                                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                                                const css::uno::Any& rValue )
-                                    throw (css::lang::IllegalArgumentException) override;
+                                                                const css::uno::Any& rValue ) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                                     )
-                                                         throw (css::uno::Exception) override;
+                                                     ) override;
             virtual void SAL_CALL getFastPropertyValue(
                                     css::uno::Any& rValue,
                                     sal_Int32 nHandle
@@ -131,105 +129,105 @@ namespace connectivity
             void construct();
             inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}
 
-            virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException) override;
+            virtual OUString SAL_CALL getImplementationName(  ) override;
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XResultSetUpdate
-            virtual void SAL_CALL insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL insertRow(  ) override;
+            virtual void SAL_CALL updateRow(  ) override;
+            virtual void SAL_CALL deleteRow(  ) override;
+            virtual void SAL_CALL cancelRowUpdates(  ) override;
+            virtual void SAL_CALL moveToInsertRow(  ) override;
+            virtual void SAL_CALL moveToCurrentRow(  ) override;
             // XRowUpdate
-            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
             // XRowLocate
-            virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
             // XDeleteRows
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override;
 
         };
     }
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index b2268720e9d2..bb9d44446653 100644
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
@@ -55,27 +55,27 @@ namespace connectivity
             // a Constructor, that is needed for when Returning the Object is needed:
             OResultSetMetaData( ADORecordset* _pRecordSet);
 
-            virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index dee1d80fa0d5..e0c31099344f 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -84,68 +84,66 @@ namespace connectivity
         private:
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getQueryTimeOut()         const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getQueryTimeOut()         const;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static sal_Int32 getMaxFieldSize() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static sal_Int32 getMaxFieldSize();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getMaxRows()              const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getMaxRows()              const;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getResultSetConcurrency() const;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getResultSetType()        const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getResultSetType()        const;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static sal_Int32 getFetchDirection() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static sal_Int32 getFetchDirection();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getFetchSize()            const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getFetchSize()            const;
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            OUString getCursorName()     const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            OUString getCursorName()     const;
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setQueryTimeOut(sal_Int32 _par0)           throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setQueryTimeOut(sal_Int32 _par0);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setMaxFieldSize(sal_Int32 _par0)           throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setMaxFieldSize(sal_Int32 _par0);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setMaxRows(sal_Int32 _par0)                throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setMaxRows(sal_Int32 _par0);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setResultSetConcurrency(sal_Int32 _par0)   throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setResultSetConcurrency(sal_Int32 _par0);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setResultSetType(sal_Int32 _par0)          throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setResultSetType(sal_Int32 _par0);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setFetchDirection(sal_Int32 _par0)         throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setFetchDirection(sal_Int32 _par0);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setFetchSize(sal_Int32 _par0)              throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setFetchSize(sal_Int32 _par0);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setCursorName(const OUString &_par0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void setCursorName(const OUString &_par0);
 
         protected:
 
             void assignRecordSet( ADORecordset* _pRS );
 
             /// @throws css::sdbc::SQLException
-            void reset () throw( css::sdbc::SQLException);
+            void reset ();
             /// @throws css::sdbc::SQLException
-            void clearMyResultSet () throw( css::sdbc::SQLException);
+            void clearMyResultSet ();
             /// @throws css::sdbc::SQLException
-            void setWarning (const  css::sdbc::SQLWarning &ex) throw( css::sdbc::SQLException);
+            void setWarning (const  css::sdbc::SQLWarning &ex);
             /// @throws css::sdbc::SQLException
-            sal_Int32 getColumnCount () throw( css::sdbc::SQLException);
-            /// @throws css::sdbc::SQLException
-            sal_Int32 getRowCount () throw( css::sdbc::SQLException);
+            sal_Int32 getRowCount ();
             sal_Int32 getPrecision ( sal_Int32 sqlType);
 
             void disposeResultSet();
@@ -158,13 +156,11 @@ namespace connectivity
                                 css::uno::Any & rConvertedValue,
                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue )
-                                    throw (css::lang::IllegalArgumentException) override;
+                                const css::uno::Any& rValue ) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                    )
-                                    throw (css::uno::Exception) override;
+                                    ) override;
             virtual void SAL_CALL getFastPropertyValue(
                                     css::uno::Any& rValue,
                                     sal_Int32 nHandle
@@ -178,28 +174,28 @@ namespace connectivity
             // XInterface
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override;
+            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override;
+            virtual sal_Bool SAL_CALL execute( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL close(  ) override;
             // XMultipleResults
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getUpdateCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Bool SAL_CALL getMoreResults(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+            virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+            virtual sal_Bool SAL_CALL getMoreResults(  ) override;
         };
 
         class OStatement :  public OStatement_Base,
@@ -215,11 +211,11 @@ namespace connectivity
 
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             // XBatchExecution
-            virtual void SAL_CALL addBatch( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL clearBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL addBatch( const OUString& sql ) override;
+            virtual void SAL_CALL clearBatch(  ) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx
index 36b545332582..869c14cacd7e 100644
--- a/connectivity/source/inc/ado/ATable.hxx
+++ b/connectivity/source/inc/ado/ATable.hxx
@@ -38,7 +38,7 @@ namespace connectivity
 
         protected:
             void fillPropertyValues();
-            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception) override;
+            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override;
 
         public:
             virtual void refreshColumns() override;
@@ -53,23 +53,19 @@ namespace connectivity
             OAdoTable(sdbcx::OCollection* _pTables,bool _bCase,OCatalog* _pCatalog);
 
 
-            virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException) override;
+            virtual OUString SAL_CALL getName() override;
             OUString getSchema() const { return m_SchemaName; }
             virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const override;
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             // XRename
-            virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL rename( const OUString& newName ) override;
 
             // XAlterTable
-            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
-
-            /// @throws css::sdbc::SQLException
-            /// @throws css::uno::RuntimeException
-            bool create() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
             WpADOTable getImpl() const { return m_aTable;}
             OCatalog* getCatalog() const { return m_pCatalog; }
diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx
index 3433c723a0fb..28203af3fce3 100644
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
@@ -34,11 +34,8 @@ namespace connectivity
             OCatalog*   m_pCatalog;
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
-            /// @throws css::sdbc::SQLException
-            /// @throws css::uno::RuntimeException
-            void setComments(const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
         public:
diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx
index 5e29c3f6eb38..da92fc245414 100644
--- a/connectivity/source/inc/ado/AUser.hxx
+++ b/connectivity/source/inc/ado/AUser.hxx
@@ -40,8 +40,7 @@ namespace connectivity
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                             sal_Int32 nHandle,
                             const css::uno::Any& rValue
-                         )
-                         throw (css::uno::Exception) override;
+                         ) override;
             virtual void SAL_CALL getFastPropertyValue(
                                     css::uno::Any& rValue,
                                     sal_Int32 nHandle
@@ -53,15 +52,15 @@ namespace connectivity
             OAdoUser(OCatalog* _pParent,bool _bCase,  const OUString& Name);
 
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
             // XUser
-            virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) override;
             // XAuthorizable
-            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
+            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
 
             WpADOUser getImpl() const { return m_aUser;}
         };
diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx
index 351d25242327..d810cffb9f4f 100644
--- a/connectivity/source/inc/ado/AUsers.hxx
+++ b/connectivity/source/inc/ado/AUsers.hxx
@@ -36,7 +36,7 @@ namespace connectivity
         public:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
         public:
diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx
index cb7ce04c2aba..628fac387c5c 100644
--- a/connectivity/source/inc/ado/AView.hxx
+++ b/connectivity/source/inc/ado/AView.hxx
@@ -44,7 +44,7 @@ namespace connectivity
             OAdoView(bool _bCase, ADOView* _pView=nullptr);
 
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             WpADOView getImpl() const { return m_aView;}
diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx
index 747696adc200..d18b9df24e55 100644
--- a/connectivity/source/inc/ado/AViews.hxx
+++ b/connectivity/source/inc/ado/AViews.hxx
@@ -36,12 +36,9 @@ namespace connectivity
             OCatalog*   m_pCatalog;
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
-            /// @throws css::sdbc::SQLException
-            /// @throws css::uno::RuntimeException
-            void setComments(const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
             virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
         public:
             OViews(OCatalog* _pParent, ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx
index 0b6e52df14dc..6a7f8d418136 100644
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
@@ -74,7 +74,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static void ThrowException(ADOConnection* _pAdoCon,const css::uno::Reference< css::uno::XInterface >& _xInterface) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static void ThrowException(ADOConnection* _pAdoCon,const css::uno::Reference< css::uno::XInterface >& _xInterface);
             static sal_Int32 MapADOType2Jdbc(DataTypeEnum eType);
             static DataTypeEnum MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine);
             static bool isJetEngine(sal_Int32 _nEngineType);
@@ -86,7 +86,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static WpADOField       getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static WpADOField       getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex);
         };
 
 
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index adc523601388..75867541146e 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -79,13 +79,11 @@ namespace connectivity
                 }
 
                 // XTerminateListener
-                virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/)
-                    throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override
+                virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/) override
                 {
                 }
 
-                virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/)
-                    throw(css::uno::RuntimeException, std::exception) override
+                virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/) override
                 {
                     stop();
                 }
@@ -96,8 +94,7 @@ namespace connectivity
                     cppu::WeakComponentImplHelperBase::disposing();
                 }
 
-                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
                 {
                     const bool bShutDown = (rEvent.Source == m_xDesktop);
                     if (bShutDown)
@@ -112,11 +109,7 @@ namespace connectivity
             virtual ~OCalcConnection() override;
 
             virtual void construct(const OUString& _rUrl,
-                                   const css::uno::Sequence< css::beans::PropertyValue >& _rInfo )
-                throw( css::sdbc::SQLException,
-                       css::uno::RuntimeException,
-                       css::uno::DeploymentException,
-                       std::exception) override;
+                                   const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) override;
 
             // XServiceInfo
             DECLARE_SERVICE_INFO();
@@ -125,11 +118,11 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
 
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
             virtual css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog() override;
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
 
             // no interface methods
             css::uno::Reference< css::sheet::XSpreadsheetDocument> const & acquireDoc();
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index aeea9cfd2719..5c32627652fb 100644
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
@@ -33,14 +33,14 @@ namespace connectivity
         class OCalcDatabaseMetaData :   public file::ODatabaseMetaData
         {
             virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override;
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
         protected:
             virtual ~OCalcDatabaseMetaData() override;
         public:
diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx
index 2a5cb622e18e..32e23fe16ea0 100644
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
@@ -30,8 +30,7 @@ namespace connectivity
     {
         /// @throws css::uno::Exception
         css::uno::Reference< css::uno::XInterface > SAL_CALL
-            ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory)
-                    throw( css::uno::Exception );
+            ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
         class ODriver : public file::OFileDriver
         {
@@ -41,17 +40,15 @@ namespace connectivity
                 file::OFileDriver(_rxContext) {}
 
             /// @throws css::uno::RuntimeException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
-            OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
+            static OUString getImplementationName_Static(  );
+            OUString SAL_CALL getImplementationName(  ) override;
 
             // XDriver
             virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL
                     connect( const OUString& url, const css::uno::Sequence<
-                                css::beans::PropertyValue >& info )
-                        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url )
-                        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                                css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/calc/CResultSet.hxx b/connectivity/source/inc/calc/CResultSet.hxx
index aa8278a41417..32bc4aa11865 100644
--- a/connectivity/source/inc/calc/CResultSet.hxx
+++ b/connectivity/source/inc/calc/CResultSet.hxx
@@ -54,23 +54,23 @@ namespace connectivity
 
         private:
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
             // XRowLocate
-            virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
             // XDeleteRows
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override;
 
             virtual bool isRowDeleted() const override { return false; }
 
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index b11c1e92823c..717b298d58f3 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -76,13 +76,13 @@ namespace connectivity
             virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) override;
             virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override;
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             virtual void SAL_CALL disposing() override;
 
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             void construct() override;
diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx
index 9399af9d2dad..92e0858d54fa 100644
--- a/connectivity/source/inc/dbase/DColumns.hxx
+++ b/connectivity/source/inc/dbase/DColumns.hxx
@@ -30,7 +30,7 @@ namespace connectivity
         {
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx
index 5bdecab83ba8..19a837faf258 100644
--- a/connectivity/source/inc/dbase/DConnection.hxx
+++ b/connectivity/source/inc/dbase/DConnection.hxx
@@ -38,11 +38,11 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
 
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
             virtual css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog() override;
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index 944a18cdf23d..8576270c848c 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
@@ -33,19 +33,19 @@ namespace connectivity
         class ODbaseDatabaseMetaData :  public file::ODatabaseMetaData
         {
             virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-
-            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override;
+
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+
+            virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) override;
+            virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) override;
 
             virtual bool        impl_storesMixedCaseQuotedIdentifiers_throw(  ) override;
             virtual bool        impl_supportsMixedCaseQuotedIdentifiers_throw(  ) override;
diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index 79c7d560c765..8d792bf898ad 100644
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
@@ -29,7 +29,7 @@ namespace connectivity
     namespace dbase
     {
         /// @throws css::uno::Exception
-        css::uno::Reference< css::uno::XInterface > SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception );
+        css::uno::Reference< css::uno::XInterface > SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
         class ODriver : public file::OFileDriver
         {
@@ -38,14 +38,14 @@ namespace connectivity
 
             // XInterface
             /// @throws css::uno::RuntimeException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
             //  static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
 
-            OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
+            OUString SAL_CALL getImplementationName(  ) override;
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
         };
     }
 
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 0ddc28c523b9..9753c05a617c 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -97,7 +97,7 @@ namespace connectivity
             virtual void refreshColumns() override;
 
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             const ODbaseTable* getTable() const { return m_pTable; }
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index 9311fe96b739..636cb9d144c8 100644
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -33,7 +33,7 @@ namespace connectivity
             ODbaseIndex* m_pIndex;
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
         public:
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index a6a95083a540..aeac516534f8 100644
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -36,7 +36,7 @@ namespace connectivity
             ODbaseTable*    m_pTable;
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx
index 1f2e9fbfef41..9d9834656f32 100644
--- a/connectivity/source/inc/dbase/DResultSet.hxx
+++ b/connectivity/source/inc/dbase/DResultSet.hxx
@@ -53,23 +53,23 @@ namespace connectivity
             ODbaseResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator&  _aSQLIterator);
 
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
             // XRowLocate
-            virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
             // XDeleteRows
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override;
 
             // own methods
             sal_Int32 getCurrentFilePos() const;
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 7ea5d8516db9..72155a9685fb 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -117,7 +117,7 @@ namespace connectivity
             /// @throws css::sdbc::SQLException
             /// @throws css::container::ElementExistException
             /// @throws css::uno::RuntimeException
-            void SAL_CALL renameImpl( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception);
+            void SAL_CALL renameImpl( const OUString& newName );
             void throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName);
 
         protected:
@@ -144,19 +144,19 @@ namespace connectivity
             virtual bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) override;
             virtual bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, bool bRetrieveData) override;
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             virtual void SAL_CALL disposing() override;
 
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
             // XAlterTable
-            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             // XRename
-            virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL rename( const OUString& newName ) override;
 
             bool    DropImpl();
             bool    CreateImpl();
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index 7af7b6f9f468..d0c68bd3a5a0 100644
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
@@ -32,7 +32,7 @@ namespace connectivity
         {
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
@@ -41,7 +41,7 @@ namespace connectivity
                 const TStringVector &_rVector) : ODbaseTables_BASE(_rMetaData,_rParent,_rMutex,_rVector)
             {}
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index 917aa3468f3e..b45f3a04f1cc 100644
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
@@ -52,9 +52,9 @@ namespace connectivity
             OFileCatalog(OConnection* _pCon);
             OConnection*    getConnection() { return m_pConnection; }
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             // ::cppu::OComponentHelper
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             virtual void SAL_CALL disposing() override;
         };
     }
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index 8d879110800e..867dfe6e2b55 100644
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -36,7 +36,7 @@ namespace connectivity
             OFileTable* m_pTable;
 
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
         public:
             OColumns(   OFileTable* _pTable,
                         ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index e9ee85e9e235..c9a18d1100b6 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -79,11 +79,7 @@ namespace connectivity
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             /// @throws css::uno::DeploymentException
-            virtual void construct(const OUString& _rUrl, const css::uno::Sequence< css::beans::PropertyValue >& _rInfo )
-                throw( css::sdbc::SQLException,
-                       css::uno::RuntimeException,
-                       css::uno::DeploymentException,
-                       std::exception);
+            virtual void construct(const OUString& _rUrl, const css::uno::Sequence< css::beans::PropertyValue >& _rInfo );
 
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
@@ -94,31 +90,31 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
 
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+            virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+            virtual void SAL_CALL commit(  ) override;
+            virtual void SAL_CALL rollback(  ) override;
+            virtual sal_Bool SAL_CALL isClosed(  ) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+            virtual OUString SAL_CALL getCatalog(  ) override;
+            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             //XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             // no interface methods
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index ecc315ec5426..02dd7c70825c 100644
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
@@ -57,131 +57,131 @@ namespace connectivity
 
             ODatabaseMetaData(OConnection* _pCon);
             // XDatabaseMetaData
-            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getUserName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSQLKeywords(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getNumericFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getStringFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSystemFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSearchStringEscape(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSchemaTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getProcedureTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual OUString SAL_CALL getUserName(  ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductName(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductVersion(  ) override;
+            virtual OUString SAL_CALL getDriverName(  ) override;
+            virtual OUString SAL_CALL getDriverVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
+            virtual OUString SAL_CALL getSQLKeywords(  ) override;
+            virtual OUString SAL_CALL getNumericFunctions(  ) override;
+            virtual OUString SAL_CALL getStringFunctions(  ) override;
+            virtual OUString SAL_CALL getSystemFunctions(  ) override;
+            virtual OUString SAL_CALL getTimeDateFunctions(  ) override;
+            virtual OUString SAL_CALL getSearchStringEscape(  ) override;
+            virtual OUString SAL_CALL getExtraNameCharacters(  ) override;
+            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+            virtual OUString SAL_CALL getSchemaTerm(  ) override;
+            virtual OUString SAL_CALL getProcedureTerm(  ) override;
+            virtual OUString SAL_CALL getCatalogTerm(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
 
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
 
-            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
 
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index 0031644c664a..6fc0ccdd694a 100644
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
@@ -51,25 +51,25 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
             // XInterface
             /// @throws css::uno::DeploymentException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
             /// @throws css::uno::DeploymentException
-            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getImplementationName(  ) override;
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Int32 SAL_CALL getMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
 
             // XDataDefinitionSupplier
-            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) override;
+            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
 
             const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() const { return m_xContext; }
         };
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 825186000e10..e9511207207e 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -73,50 +73,50 @@ namespace connectivity
             // a Constructor, that is needed for when Returning the Object is needed:
             OPreparedStatement( OConnection* _pConnection);
 
-            virtual void construct(const OUString& sql)  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void construct(const OUString& sql) override;
 
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPreparedStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) override;
+            virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
+            virtual sal_Bool SAL_CALL execute(  ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
             // XParameters
-            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+            virtual void SAL_CALL clearParameters(  ) override;
             // XCloseable
-                        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+                        virtual void SAL_CALL close(  ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index e6fd70322a90..503198ac46dd 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -137,15 +137,14 @@ namespace connectivity
             // return true when the select statement is "select count(*) from table"
             inline bool isCount() const { return m_bIsCount; }
             /// @throws css::sdbc::SQLException
-            void checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException);
+            void checkIndex(sal_Int32 columnIndex );
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            const ORowSetValue& getValue(sal_Int32 columnIndex)
-                throw (css::sdbc::SQLException, css::uno::RuntimeException);
+            const ORowSetValue& getValue(sal_Int32 columnIndex);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void updateValue(sal_Int32 columnIndex,const ORowSetValue& x );
             // clear insert row
             void clearInsertRow();
             void sortRows();
@@ -170,94 +169,94 @@ namespace connectivity
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XResultSetUpdate
-            virtual void SAL_CALL insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL insertRow(  ) override;
+            virtual void SAL_CALL updateRow(  ) override;
+            virtual void SAL_CALL deleteRow(  ) override;
+            virtual void SAL_CALL cancelRowUpdates(  ) override;
+            virtual void SAL_CALL moveToInsertRow(  ) override;
+            virtual void SAL_CALL moveToCurrentRow(  ) override;
             // XRowUpdate
-            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
             //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;
 
             // special methods
             inline sal_Int32 mapColumn(sal_Int32    column);
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index aa7691edad2d..173026f0920a 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -45,34 +45,34 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void checkColumnIndex(sal_Int32 column) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void checkColumnIndex(sal_Int32 column);
         protected:
             virtual ~OResultSetMetaData() override;
         public:
             // a Constructor, that is needed for when Returning the Object is needed:
             OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const OUString& _aTableName,OFileTable* _pTable);
 
-            virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 257076f01626..cd2a5c8defcb 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -109,7 +109,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void closeResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+            void closeResultSet();
 
             void disposeResultSet();
             void GetAssignValues();
@@ -139,7 +139,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            virtual void construct(const OUString& sql)  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+            virtual void construct(const OUString& sql);
 
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
@@ -147,19 +147,19 @@ namespace connectivity
             //      virtual void SAL_CALL release() throw(css::uno::RuntimeException) = 0;
             virtual void SAL_CALL acquire() throw() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
         };
 
         class OOO_DLLPUBLIC_FILE OStatement_BASE2 :
@@ -190,15 +190,15 @@ namespace connectivity
             OStatement( OConnection* _pConnection) : OStatement_BASE2( _pConnection){}
             DECLARE_SERVICE_INFO();
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
 
             // XStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ;
+            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override ;
+            virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override ;
         };
     }
 }
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index e500849b69ab..637d15db09b9 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -64,7 +64,7 @@ namespace connectivity
                 );
 
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
 
@@ -83,13 +83,13 @@ namespace connectivity
             // refresh the header of file based tables to see changes done by someone
             virtual void refreshHeader();
 
-            OUString SAL_CALL getName() throw(std::exception) override { return m_Name; }
+            OUString SAL_CALL getName() override { return m_Name; }
 
             const OUString& getSchema() { return m_SchemaName; }
             bool isReadOnly() const { return !m_bWriteable; }
                 // m_pFileStream && !m_pFileStream->IsWritable(); }
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
 
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index 2b5f377ad31a..d3e620ff2bfe 100644
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -35,14 +35,14 @@ namespace connectivity
             css::uno::Reference< css::sdbc::XDatabaseMetaData >   m_xMetaData;
 
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
         public:
             OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
                 const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                 ,m_xMetaData(_rMetaData)
             {}
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
 
             // only the name is identical to ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 3f07487be100..a774b2f3c6f5 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -70,25 +70,25 @@ namespace connectivity
         protected:
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_COMPARE(connectivity::OSQLParseNode* pPredicateNode) throw( css::sdbc::SQLException, css::uno::RuntimeException);
+            void execute_COMPARE(connectivity::OSQLParseNode* pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_LIKE(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void execute_LIKE(connectivity::OSQLParseNode* pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_BETWEEN(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+            void execute_BETWEEN(connectivity::OSQLParseNode* pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_ISNULL(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void execute_ISNULL(connectivity::OSQLParseNode* pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            OOperand* execute_Operand(connectivity::OSQLParseNode* pPredicateNode) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+            OOperand* execute_Operand(connectivity::OSQLParseNode* pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void execute_Fold(OSQLParseNode* pPredicateNode) throw( css::sdbc::SQLException, css::uno::RuntimeException);
+            void execute_Fold(OSQLParseNode* pPredicateNode);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void executeFunction(OSQLParseNode* pPredicateNode) throw( css::sdbc::SQLException, css::uno::RuntimeException);
+            void executeFunction(OSQLParseNode* pPredicateNode);
         };
 
 
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index 69cd800481f4..57e36fc8f9c9 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -40,7 +40,7 @@ namespace connectivity
             OFlatConnection(ODriver*    _pDriver);
             virtual ~OFlatConnection() override;
 
-            virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) override;
 
             // own methods
             inline bool     isHeaderLine()          const { return m_bHeaderLine;       }
@@ -53,11 +53,11 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
 
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
             virtual css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog() override;
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
index bb43fe61c0a8..f369e5644b9d 100644
--- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx
+++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
@@ -38,8 +38,8 @@ namespace connectivity
         public:
             OFlatDatabaseMetaData(file::OConnection* _pCon);
 
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx
index ece686c5be74..ae9a13d8a102 100644
--- a/connectivity/source/inc/flat/EDriver.hxx
+++ b/connectivity/source/inc/flat/EDriver.hxx
@@ -29,7 +29,7 @@ namespace connectivity
     namespace flat
     {
         /// @throws css::uno::Exception
-        css::uno::Reference< css::uno::XInterface > SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception );
+        css::uno::Reference< css::uno::XInterface > SAL_CALL ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
         class ODriver : public file::OFileDriver
         {
@@ -38,14 +38,14 @@ namespace connectivity
 
             // XInterface
             /// @throws css::uno::RuntimeException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
             //  static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
 
-            OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
+            OUString SAL_CALL getImplementationName(  ) override;
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
         };
     }
 
diff --git a/connectivity/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx
index bf7a40e5095d..d0d7b0c67e06 100644
--- a/connectivity/source/inc/flat/EResultSet.hxx
+++ b/connectivity/source/inc/flat/EResultSet.hxx
@@ -51,21 +51,21 @@ namespace connectivity
             OFlatResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator&   _aSQLIterator);
 
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
             // XRowLocate
-            virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index b0f53a72defd..4b3bf72e6383 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -91,13 +91,13 @@ namespace connectivity
             virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override;
             virtual void refreshHeader() override;
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             virtual void SAL_CALL disposing() override;
 
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             OUString getEntry();
diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index 897a8878d952..68071ad4eeee 100644
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
@@ -54,9 +54,9 @@ namespace connectivity
             inline sdbcx::OCollection*      getPrivateViews()   const { return m_pViews; }
             const css::uno::Reference< css::sdbc::XConnection >& getConnection() const { return m_xConnection; }
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             // ::cppu::OComponentHelper
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index 72b3c8ec6ce0..3f8e8285de27 100644
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.hxx
@@ -52,7 +52,7 @@ namespace connectivity
             OHSQLColumn();
             virtual void construct() 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;
         };
     }
 }
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index b3535023d82c..19739437bf82 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -85,13 +85,13 @@ namespace connectivity
             virtual void            checkDisposed() const override;
 
             // XFlushable
-            virtual void SAL_CALL flush(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL flush(  ) override;
+            virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override;
+            virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override;
 
             // XTableUIProvider
-            virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getTableEditor( const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getTableEditor( const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) override;
 
         private:
 
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index a63e4734e3a1..d070347b15d1 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
@@ -39,7 +39,7 @@ namespace connectivity
     namespace hsqldb
     {
         /// @throws css::uno::Exception
-        css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception );
+        css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
         typedef ::cppu::WeakComponentImplHelper<   css::sdbc::XDriver
                                                  , css::sdbcx::XDataDefinitionSupplier
@@ -89,32 +89,32 @@ namespace connectivity
             // XServiceInfo
             DECLARE_SERVICE_INFO();
             /// @throws css::uno::RuntimeException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
             /// @throws css::uno::RuntimeException
-            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
 
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Int32 SAL_CALL getMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
 
             // XDataDefinitionSupplier
-            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) override;
+            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
 
             // XCreateCatalog
-            virtual void SAL_CALL createCatalog( const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL createCatalog( const css::uno::Sequence< css::beans::PropertyValue >& info ) 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;
 
             // XTransactionListener
-            virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) override;
+            virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) override;
+            virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) override;
+            virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) override;
 
             void shutdownConnections();
             void flushConnections();
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index 08ed2643a53d..4048ac845cac 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -86,17 +86,17 @@ namespace connectivity
             // ODescriptor
             virtual void construct() override;
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XAlterTable
-            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
             // XRename
-            virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL rename( const OUString& newName ) override;
 
             /**
                 returns the ALTER TABLE XXX COLUMN statement
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index ff8837359c19..29aa691a4d74 100644
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
@@ -31,7 +31,7 @@ namespace connectivity
 
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index 74f94aa44bc9..4e1e98c92290 100644
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
@@ -37,7 +37,7 @@ namespace connectivity
             // return the privileges and additional the grant rights
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant);
         public:
             virtual void refreshGroups() override;
         public:
@@ -45,12 +45,12 @@ namespace connectivity
             OHSQLUser(  const css::uno::Reference< css::sdbc::XConnection >& _xConnection,const OUString& Name);
 
             // XUser
-            virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) override;
             // XAuthorizable
-            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
+            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
         };
 
         class OUserExtend;
diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx
index 1fa314c127af..14d0bbea6306 100644
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ b/connectivity/source/inc/hsqldb/HUsers.hxx
@@ -37,7 +37,7 @@ namespace connectivity
         public:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
         public:
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index 1d83bc7de085..6e333bb1081d 100644
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
@@ -49,7 +49,7 @@ namespace connectivity { namespace hsqldb
         DECLARE_XTYPEPROVIDER()
 
         // XAlterView
-        virtual void SAL_CALL alterCommand( const OUString& NewCommand ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL alterCommand( const OUString& NewCommand ) override;
 
     protected:
         virtual ~HView() override;
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
index 1a2bde239df3..3759b1530b83 100644
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.hxx
@@ -33,7 +33,7 @@ namespace connectivity
 
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
         virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index c63013a796e9..e144931e97be 100644
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
@@ -41,11 +41,11 @@ namespace connectivity
         // a Constructor, that is needed for when Returning the Object is needed:
         java_io_InputStream( JNIEnv * pEnv, jobject myObj );
         // XInputStream
-        virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL available(  ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL closeInput(  ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+        virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+        virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+        virtual sal_Int32 SAL_CALL available(  ) override;
+        virtual void SAL_CALL closeInput(  ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_INPUTSTREAM_HXX
diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx
index 64b71e6f0c0b..5f754489d366 100644
--- a/connectivity/source/inc/java/io/Reader.hxx
+++ b/connectivity/source/inc/java/io/Reader.hxx
@@ -43,11 +43,11 @@ namespace connectivity
         // a Constructor, that is needed for when Returning the Object is needed:
         java_io_Reader( JNIEnv * pEnv, jobject myObj );
         // XInputStream
-        virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL available(  ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL closeInput(  ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+        virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+        virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+        virtual sal_Int32 SAL_CALL available(  ) override;
+        virtual void SAL_CALL closeInput(  ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_READER_HXX
diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx
index 70f4efeb8005..0e0826bfd6ab 100644
--- a/connectivity/source/inc/java/sql/Array.hxx
+++ b/connectivity/source/inc/java/sql/Array.hxx
@@ -42,12 +42,12 @@ namespace connectivity
         java_sql_Array( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
 
         // XArray
-        virtual OUString SAL_CALL getBaseTypeName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBaseType(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getBaseTypeName(  ) override;
+        virtual sal_Int32 SAL_CALL getBaseType(  ) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
     };
 }
diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx
index 42547795ac29..dcd6e5a9ef51 100644
--- a/connectivity/source/inc/java/sql/Blob.hxx
+++ b/connectivity/source/inc/java/sql/Blob.hxx
@@ -44,11 +44,11 @@ namespace connectivity
         java_sql_Blob( JNIEnv * pEnv, jobject myObj );
 
         // XBlob
-        virtual sal_Int64 SAL_CALL length(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int64 pos, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& pattern, sal_Int64 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL length(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int64 pos, sal_Int32 length ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(  ) override;
+        virtual sal_Int64 SAL_CALL position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) override;
+        virtual sal_Int64 SAL_CALL positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& pattern, sal_Int64 start ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_BLOB_HXX
diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx
index fba2958853e7..657d9da4bcb0 100644
--- a/connectivity/source/inc/java/sql/CallableStatement.hxx
+++ b/connectivity/source/inc/java/sql/CallableStatement.hxx
@@ -47,36 +47,36 @@ namespace connectivity
         // A ctor that is needed for returning the object
         java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const OUString& sql );
 
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
         //XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // XRow
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
         // XOutParameters
-        virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+        virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CALLABLESTATEMENT_HXX
diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx
index 9ccfd22866b0..f94a046aed28 100644
--- a/connectivity/source/inc/java/sql/Clob.hxx
+++ b/connectivity/source/inc/java/sql/Clob.hxx
@@ -44,11 +44,11 @@ namespace connectivity
         java_sql_Clob( JNIEnv * pEnv, jobject myObj );
 
         // XClob
-        virtual sal_Int64 SAL_CALL length(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSubString( sal_Int64 pos, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL position( const OUString& searchstr, sal_Int32 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL positionOfClob( const css::uno::Reference< css::sdbc::XClob >& pattern, sal_Int64 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL length(  ) override;
+        virtual OUString SAL_CALL getSubString( sal_Int64 pos, sal_Int32 length ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(  ) override;
+        virtual sal_Int64 SAL_CALL position( const OUString& searchstr, sal_Int32 start ) override;
+        virtual sal_Int64 SAL_CALL positionOfClob( const css::uno::Reference< css::sdbc::XClob >& pattern, sal_Int64 start ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CLOB_HXX
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index 8b77b5831a8f..b7fae0f296fe 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -115,29 +115,29 @@ namespace connectivity
         virtual void SAL_CALL release() throw() override;
 
         // XConnection
-        virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+        virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+        virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+        virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+        virtual void SAL_CALL commit(  ) override;
+        virtual void SAL_CALL rollback(  ) override;
+        virtual sal_Bool SAL_CALL isClosed(  ) override;
+        virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+        virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+        virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+        virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+        virtual OUString SAL_CALL getCatalog(  ) override;
+        virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+        virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+        virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
         // XCloseable
-        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close(  ) override;
         // XWarningsSupplier
-        virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+        virtual void SAL_CALL clearWarnings(  ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CONNECTION_HXX
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index 5484be5c099d..dc085c02d779 100644
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
@@ -64,140 +64,140 @@ namespace connectivity
         virtual sal_Int32   impl_getMaxTablesInSelect_throw(  ) override;
         virtual bool        impl_storesMixedCaseQuotedIdentifiers_throw(  ) override;
 
-        virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getUserName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDatabaseProductName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDriverName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDriverVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSQLKeywords(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNumericFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getStringFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSystemFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSearchStringEscape(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSchemaTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getProcedureTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCatalogTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsUnion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+        virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+        virtual OUString SAL_CALL getURL(  ) override;
+        virtual OUString SAL_CALL getUserName(  ) override;
+        virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+        virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+        virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+        virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+        virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+        virtual OUString SAL_CALL getDatabaseProductName(  ) override;
+        virtual OUString SAL_CALL getDatabaseProductVersion(  ) override;
+        virtual OUString SAL_CALL getDriverName(  ) override;
+        virtual OUString SAL_CALL getDriverVersion(  ) override;
+        virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+        virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+        virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+        virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+        virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+        virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+        virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+        virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
+        virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+        virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
+        virtual OUString SAL_CALL getSQLKeywords(  ) override;
+        virtual OUString SAL_CALL getNumericFunctions(  ) override;
+        virtual OUString SAL_CALL getStringFunctions(  ) override;
+        virtual OUString SAL_CALL getSystemFunctions(  ) override;
+        virtual OUString SAL_CALL getTimeDateFunctions(  ) override;
+        virtual OUString SAL_CALL getSearchStringEscape(  ) override;
+        virtual OUString SAL_CALL getExtraNameCharacters(  ) override;
+        virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+        virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+        virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+        virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+        virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+        virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+        virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+        virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+        virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+        virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+        virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+        virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+        virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+        virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+        virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+        virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+        virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+        virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+        virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+        virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+        virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+        virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+        virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+        virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+        virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+        virtual OUString SAL_CALL getSchemaTerm(  ) override;
+        virtual OUString SAL_CALL getProcedureTerm(  ) override;
+        virtual OUString SAL_CALL getCatalogTerm(  ) override;
+        virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+        virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+        virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+        virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
+        virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+        virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+        virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+        virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+        virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+        virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+        virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+        virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+        virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+        virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+        virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+        virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+        virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+        virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+        virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+        virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+        virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+        virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+        virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+        virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+        virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+        virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+        virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+        virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+        virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+        virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override;
+        virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+        virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+        virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
 
     private:
         bool        impl_callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID );
diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index 0eae2ffc06b1..8e1a20aa70b9 100644
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
@@ -30,7 +30,7 @@
 namespace connectivity
 {
     /// @throws css::uno::Exception
-    css::uno::Reference< css::uno::XInterface > SAL_CALL java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception );
+    css::uno::Reference< css::uno::XInterface > SAL_CALL java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
     class java_sql_Driver : public ::cppu::WeakImplHelper< css::sdbc::XDriver,css::lang::XServiceInfo>
     {
@@ -44,21 +44,21 @@ namespace connectivity
         java_sql_Driver(const css::uno::Reference< css::uno::XComponentContext >& _rxContext);
 
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XDriver
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-        virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-        virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-        virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override ;
-        virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override ;
+        virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override ;
+        virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override ;
+        virtual sal_Int32 SAL_CALL getMajorVersion(  ) override ;
+        virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
 
         const css::uno::Reference<css::uno::XComponentContext>& getContext() const { return m_aContext; }
         const ::comphelper::ResourceBasedEventLogger&   getLogger() const { return m_aLogger; }
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index f8a377a18a54..2ef95042a377 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -60,56 +60,56 @@ namespace connectivity
 
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getQueryTimeOut()             throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getQueryTimeOut();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getMaxFieldSize()             throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getMaxFieldSize();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getMaxRows()                  throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getMaxRows();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getResultSetConcurrency()     throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getResultSetConcurrency();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getResultSetType()            throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getResultSetType();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getFetchDirection()           throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getFetchDirection();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getFetchSize()                throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getFetchSize();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        OUString getCursorName()         throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        OUString getCursorName();
 
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setQueryTimeOut(sal_Int32 _par0)                   throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setQueryTimeOut(sal_Int32 _par0);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setMaxFieldSize(sal_Int32 _par0)                   throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setMaxFieldSize(sal_Int32 _par0);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setMaxRows(sal_Int32 _par0)                                throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setMaxRows(sal_Int32 _par0);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setResultSetConcurrency(sal_Int32 _par0)   throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setResultSetConcurrency(sal_Int32 _par0);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setResultSetType(sal_Int32 _par0)                  throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setResultSetType(sal_Int32 _par0);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setFetchDirection(sal_Int32 _par0)                 throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setFetchDirection(sal_Int32 _par0);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setFetchSize(sal_Int32 _par0)                              throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setFetchSize(sal_Int32 _par0);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setCursorName(const OUString &_par0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setCursorName(const OUString &_par0);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setEscapeProcessing(bool _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setEscapeProcessing(bool _par0);
 
     protected:
         css::uno::Reference< css::sdbc::XStatement>       m_xGeneratedStatement;
@@ -135,12 +135,12 @@ namespace connectivity
                                     css::uno::Any & rOldValue,
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                )   throw (css::lang::IllegalArgumentException) override;
+                                ) override;
 
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                )   throw (css::uno::Exception, std::exception) override;
+                                ) override;
 
         virtual void SAL_CALL getFastPropertyValue(
                                     css::uno::Any& rValue,
@@ -167,30 +167,30 @@ namespace connectivity
         // XInterface
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         //XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
         // XStatement
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-        virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-        virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ;
+        virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override ;
+        virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override ;
         // XWarningsSupplier
-        virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+        virtual void SAL_CALL clearWarnings(  ) override;
         // XCancellable
-        virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cancel(  ) override;
         // XCloseable
-        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close(  ) override;
         // XMultipleResults
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getUpdateCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getMoreResults(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+        virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+        virtual sal_Bool SAL_CALL getMoreResults(  ) override;
         //XGeneratedResultSet
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues(  ) override;
 
     public:
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
@@ -229,13 +229,13 @@ namespace connectivity
         // A ctor that is needed for returning the object
         java_sql_Statement( JNIEnv * pEnv, java_sql_Connection& _rCon ) : OStatement_BASE2( pEnv, _rCon){};
 
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
         // XBatchExecution
-        virtual void SAL_CALL addBatch( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addBatch( const OUString& sql ) override;
+        virtual void SAL_CALL clearBatch(  ) override;
+        virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_JSTATEMENT_HXX
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx
index 0a1721fd0c99..5423de35978f 100644
--- a/connectivity/source/inc/java/sql/PreparedStatement.hxx
+++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx
@@ -52,47 +52,47 @@ namespace connectivity
         // A ctor that is needed for returning the object
         java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const OUString& sql );
 
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
         //XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // XPreparedStatement
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) override;
+        virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
+        virtual sal_Bool SAL_CALL execute(  ) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
         // XParameters
-        virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+        virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+        virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+        virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+        virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+        virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+        virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+        virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+        virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+        virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+        virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+        virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+        virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+        virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+        virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+        virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+        virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+        virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+        virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+        virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+        virtual void SAL_CALL clearParameters(  ) override;
         // XPreparedBatchExecution
-        virtual void SAL_CALL addBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addBatch(  ) override;
+        virtual void SAL_CALL clearBatch(  ) override;
+        virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) override;
         // XResultSetMetaDataSupplier
-        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
     public:
         using java_sql_Statement_Base::executeQuery;
diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx
index 7d2ea6a0aad6..cf121eb493de 100644
--- a/connectivity/source/inc/java/sql/Ref.hxx
+++ b/connectivity/source/inc/java/sql/Ref.hxx
@@ -43,7 +43,7 @@ namespace connectivity
         java_sql_Ref( JNIEnv * pEnv, jobject myObj );
 
         // XRef
-        virtual OUString SAL_CALL getBaseTypeName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getBaseTypeName(  ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_REF_HXX
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 22cdb392fdc0..218d47c01a70 100644
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
@@ -67,26 +67,26 @@ namespace connectivity
 
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getResultSetConcurrency() const;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getResultSetType()        const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getResultSetType()        const;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getFetchDirection()       const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getFetchDirection()       const;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getFetchSize()            const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        sal_Int32 getFetchSize()            const;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        OUString getCursorName()     const throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        OUString getCursorName()     const;
 
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setFetchDirection(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setFetchDirection(sal_Int32 _par0);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void setFetchSize(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void setFetchSize(sal_Int32 _par0);
     protected:
         // Static data for the class
         static jclass theClass;
@@ -100,13 +100,11 @@ namespace connectivity
                                                         css::uno::Any & rConvertedValue,
                                                         css::uno::Any & rOldValue,
                             sal_Int32 nHandle,
-                                                        const css::uno::Any& rValue )
-                                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
+                                                        const css::uno::Any& rValue ) override;
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                                                 const css::uno::Any& rValue
-                                                 )
-                                                                                                 throw (css::uno::Exception, std::exception) override;
+                                                 ) override;
         virtual void SAL_CALL getFastPropertyValue(
                                                                 css::uno::Any& rValue,
                                 sal_Int32 nHandle
@@ -122,89 +120,89 @@ namespace connectivity
         // ::cppu::OComponentHelper
         virtual void SAL_CALL disposing() override;
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
         //XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
         // XResultSet
-        virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL next(  ) override;
+        virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+        virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+        virtual sal_Bool SAL_CALL isFirst(  ) override;
+        virtual sal_Bool SAL_CALL isLast(  ) override;
+        virtual void SAL_CALL beforeFirst(  ) override;
+        virtual void SAL_CALL afterLast(  ) override;
+        virtual sal_Bool SAL_CALL first(  ) override;
+        virtual sal_Bool SAL_CALL last(  ) override;
+        virtual sal_Int32 SAL_CALL getRow(  ) override;
+        virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+        virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+        virtual sal_Bool SAL_CALL previous(  ) override;
+        virtual void SAL_CALL refreshRow(  ) override;
+        virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+        virtual sal_Bool SAL_CALL rowInserted(  ) override;
+        virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
         // XRow
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
         // XResultSetMetaDataSupplier
-        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
         // XCancellable
-        virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cancel(  ) override;
         // XCloseable
-        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close(  ) override;
         // XWarningsSupplier
-        virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+        virtual void SAL_CALL clearWarnings(  ) override;
         // XResultSetUpdate
-        virtual void SAL_CALL insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertRow(  ) override;
+        virtual void SAL_CALL updateRow(  ) override;
+        virtual void SAL_CALL deleteRow(  ) override;
+        virtual void SAL_CALL cancelRowUpdates(  ) override;
+        virtual void SAL_CALL moveToInsertRow(  ) override;
+        virtual void SAL_CALL moveToCurrentRow(  ) override;
         // XRowUpdate
-        virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+        virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+        virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+        virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+        virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+        virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+        virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+        virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+        virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+        virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+        virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+        virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+        virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+        virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+        virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
         // XColumnLocate
-        virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
     public:
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index 9e830c10ad41..2a4e59d6f7e6 100644
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
@@ -46,27 +46,27 @@ namespace connectivity
         // A ctor that is needed for returning the object
         java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, java_sql_Connection& _rCon  );
 
-        virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+        virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+        virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+        virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+        virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
     };
 }
 #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_RESULTSETMETADATA_HXX
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index 9514bce98a4e..ed68a9e9498c 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -43,7 +43,7 @@ namespace connectivity
 
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    java_util_Properties* createStringPropertyArray(const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+    java_util_Properties* createStringPropertyArray(const css::uno::Sequence< css::beans::PropertyValue >& info );
 
     jobject convertTypeMapToJavaMap(JNIEnv *pEnv,const css::uno::Reference< css::container::XNameAccess > & _rMap);
 
diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index ea30a1175490..8fa7def05271 100644
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
@@ -54,9 +54,9 @@ namespace connectivity
             inline sdbcx::OCollection*      getPrivateViews()   const { return m_pViews; }
             const css::uno::Reference< css::sdbc::XConnection >& getConnection() const { return m_xConnection; }
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             // ::cppu::OComponentHelper
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index 3d11514c36d5..db7149cb5b92 100644
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/connectivity/source/inc/mysql/YColumns.hxx
@@ -52,7 +52,7 @@ namespace connectivity
             OMySQLColumn();
             virtual void construct() 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;
         };
     }
 }
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index 917e6f07b322..29667d0958db 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -43,7 +43,7 @@ namespace connectivity
     namespace mysql
     {
         /// @throws css::uno::Exception
-        css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxMSF) throw( css::uno::Exception );
+        css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxMSF);
 
         typedef ::cppu::WeakComponentImplHelper<   css::sdbc::XDriver
                                                ,   css::sdbcx::XDataDefinitionSupplier
@@ -88,20 +88,20 @@ namespace connectivity
             // XServiceInfo
             DECLARE_SERVICE_INFO();
             /// @throws css::uno::RuntimeException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
             /// @throws css::uno::RuntimeException
-            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
 
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Int32 SAL_CALL getMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
 
             // XDataDefinitionSupplier
-            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) override;
+            virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
         protected:
             /// dtor
             virtual ~ODriverDelegator() override;
diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index 8fca785f0104..9648d29411c6 100644
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
@@ -93,11 +93,11 @@ namespace connectivity
             // ODescriptor
             virtual void construct() override;
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             // XAlterTable
-            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             /** returns the ALTER TABLE XXX statement
             */
             OUString getAlterTableColumnPart();
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index d3a2824dbbe5..4295eddfa7d2 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -33,7 +33,7 @@ namespace connectivity
 
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index 07bdfc88cd37..58589f414c64 100644
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
@@ -37,7 +37,7 @@ namespace connectivity
             // return the privileges and additional the grant rights
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant);
         public:
             virtual void refreshGroups() override;
         public:
@@ -45,12 +45,12 @@ namespace connectivity
             OMySQLUser(  const css::uno::Reference< css::sdbc::XConnection >& _xConnection,const OUString& Name);
 
             // XUser
-            virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) override;
             // XAuthorizable
-            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
+            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
         };
 
         class OUserExtend;
diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx
index fb16d9e1ca02..ede63b853508 100644
--- a/connectivity/source/inc/mysql/YUsers.hxx
+++ b/connectivity/source/inc/mysql/YUsers.hxx
@@ -37,7 +37,7 @@ namespace connectivity
         public:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
         public:
diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx
index 3daf2e2e09e9..16ec6301687b 100644
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
@@ -32,7 +32,7 @@ namespace connectivity
             //  OCatalog*                                           m_pParent;
         protected:
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-            virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+            virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
             virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 83894821c103..c5269d249067 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -79,7 +79,7 @@ namespace connectivity
         public:
             oslGenericFunction  getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const;
             /// @throws css::sdbc::SQLException
-            SQLRETURN       Construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException, std::exception);
+            SQLRETURN       Construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info);
 
             OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver*  _pDriver);
             //  OConnection(const SQLHANDLE _pConnectionHandle);
@@ -93,29 +93,29 @@ namespace connectivity
             // XServiceInfo
             DECLARE_SERVICE_INFO();
             // XConnection
-            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+            virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+            virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+            virtual void SAL_CALL commit(  ) override;
+            virtual void SAL_CALL rollback(  ) override;
+            virtual sal_Bool SAL_CALL isClosed(  ) override;
+            virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+            virtual OUString SAL_CALL getCatalog(  ) override;
+            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+            virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
 
             SQLHANDLE       getConnection() { return m_aConnectionHandle; }
 
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index 781660f8b6e6..abd30c2636c5 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
@@ -63,144 +63,144 @@ namespace connectivity
             ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon);
 
             // XDatabaseMetaData
-            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getURL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getUserName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverName(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getDriverVersion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) override;
+            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) override;
+            virtual OUString SAL_CALL getURL(  ) override;
+            virtual OUString SAL_CALL getUserName(  ) override;
+            virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) override;
+            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductName(  ) override;
+            virtual OUString SAL_CALL getDatabaseProductVersion(  ) override;
+            virtual OUString SAL_CALL getDriverName(  ) override;
+            virtual OUString SAL_CALL getDriverVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFiles(  ) override;
+            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) override;
+            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) override;
 
-            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) override;
+            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) override;
 
-            virtual OUString SAL_CALL getSQLKeywords(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getNumericFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getStringFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSystemFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSearchStringEscape(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSchemaTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getProcedureTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogTerm(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getSQLKeywords(  ) override;
+            virtual OUString SAL_CALL getNumericFunctions(  ) override;
+            virtual OUString SAL_CALL getStringFunctions(  ) override;
+            virtual OUString SAL_CALL getSystemFunctions(  ) override;
+            virtual OUString SAL_CALL getTimeDateFunctions(  ) override;
+            virtual OUString SAL_CALL getSearchStringEscape(  ) override;
+            virtual OUString SAL_CALL getExtraNameCharacters(  ) override;
+            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) override;
+            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) override;
+            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) override;
+            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override;
+            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) override;
+            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupBy(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) override;
+            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) override;
+            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) override;
+            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) override;
+            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) override;
+            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) override;
+            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) override;
+            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) override;
+            virtual OUString SAL_CALL getSchemaTerm(  ) override;
+            virtual OUString SAL_CALL getProcedureTerm(  ) override;
+            virtual OUString SAL_CALL getCatalogTerm(  ) override;
 
-            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) override;
 
-            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnion(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) override;
+            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) override;
+            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) override;
+            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) override;
+            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnion(  ) override;
+            virtual sal_Bool SAL_CALL supportsUnionAll(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) override;
+            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxConnections(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) override;
+            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) override;
+            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override;
+            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) override;
+            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) override;
+            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override;
+            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override;
+            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 0040e80fd740..80fdfcabf7ef 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -86,10 +86,10 @@ namespace connectivity
             static sal_Int32 getFetchDirection()       { return css::sdbc::FetchDirection::FORWARD; }
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static sal_Int32 getFetchSize()     throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static sal_Int32 getFetchSize();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            static OUString getCursorName()     throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            static OUString getCursorName();
             SWORD                               impl_getColumnType_nothrow(sal_Int32 columnIndex);
 
             sal_Int32 mapColumn (sal_Int32  column);
@@ -105,10 +105,8 @@ namespace connectivity
                                                                 css::uno::Any & rConvertedValue,
                                                                 css::uno::Any & rOldValue,
                                                                 sal_Int32 nHandle,
-                                                                const css::uno::Any& rValue )
-                                    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-                                    throw (css::uno::Exception, std::exception) override;
+                                                                const css::uno::Any& rValue ) override;
+            virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
             virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
             virtual ~ODatabaseMetaDataResultSet() override;
             template < typename T, SQLSMALLINT sqlTypeId > T getInteger ( sal_Int32 columnIndex );
@@ -125,135 +123,134 @@ namespace connectivity
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             css::uno::Reference< css::uno::XInterface > operator *()
             {
                 return css::uno::Reference< css::uno::XInterface >(*static_cast<ODatabaseMetaDataResultSet_BASE*>(this));
             }
             // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void openTablesTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void openTablesTypes( );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void openTypeInfo() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void openTypeInfo();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void openCatalogs() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void openCatalogs();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void openSchemas() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void openSchemas();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openTables(const css::uno::Any& catalog, const OUString& schemaPattern,
-                                            const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types )
-                                            throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                            const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openColumnPrivileges(      const css::uno::Any& catalog,    const OUString& schema,
-                                                                    const OUString& table,   const OUString& columnNamePattern )throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                                    const OUString& table,   const OUString& columnNamePattern );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openColumns(       const css::uno::Any& catalog,                            const OUString& schemaPattern,
-                                                    const OUString& tableNamePattern,        const OUString& columnNamePattern )throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                    const OUString& tableNamePattern,        const OUString& columnNamePattern );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openProcedureColumns(      const css::uno::Any& catalog,            const OUString& schemaPattern,
-                                                            const OUString& procedureNamePattern,const OUString& columnNamePattern )throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                            const OUString& procedureNamePattern,const OUString& columnNamePattern );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openProcedures(    const css::uno::Any& catalog,            const OUString& schemaPattern,
-                                                            const OUString& procedureNamePattern)throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                            const OUString& procedureNamePattern);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openVersionColumns(const css::uno::Any& catalog, const OUString& schema,
-                                                            const OUString& table)throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                            const OUString& table);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema,
-                                                                    const OUString& table,sal_Int32 scope, bool nullable )throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                                    const OUString& table,sal_Int32 scope, bool nullable );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openForeignKeys( const css::uno::Any& catalog, const OUString* schema,const OUString* table,
-                                                              const css::uno::Any& catalog2, const OUString* schema2,const OUString* table2)throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                              const css::uno::Any& catalog2, const OUString* schema2,const OUString* table2);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void openExportedKeys(const css::uno::Any& catalog, const OUString& schema,const OUString& table)throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void openExportedKeys(const css::uno::Any& catalog, const OUString& schema,const OUString& table);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void openImportedKeys(const css::uno::Any& catalog, const OUString& schema,const OUString& table)throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void openImportedKeys(const css::uno::Any& catalog, const OUString& schema,const OUString& table);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void openPrimaryKeys(const css::uno::Any& catalog, const OUString& schema,const OUString& table)throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void openPrimaryKeys(const css::uno::Any& catalog, const OUString& schema,const OUString& table);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openTablePrivileges(const css::uno::Any& catalog, const OUString& schemaPattern,
-                                                              const OUString& tableNamePattern)throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                              const OUString& tableNamePattern);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openSpecialColumns(bool _bRowVer,const css::uno::Any& catalog, const OUString& schema,
-                                                                    const OUString& table,sal_Int32 scope,   bool nullable )throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                                    const OUString& table,sal_Int32 scope,   bool nullable );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void openIndexInfo( const css::uno::Any& catalog, const OUString& schema,
-                                                    const OUString& table,bool unique,bool approximate )throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                    const OUString& table,bool unique,bool approximate );
 
         protected:
             using OPropertySetHelper::getFastPropertyValue;
diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx
index 10751f94ac62..ef133f4daa76 100644
--- a/connectivity/source/inc/odbc/ODriver.hxx
+++ b/connectivity/source/inc/odbc/ODriver.hxx
@@ -60,21 +60,21 @@ namespace connectivity
             virtual void SAL_CALL disposing() override;
             // XInterface
             /// @throws css::uno::RuntimeException
-            static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+            static OUString getImplementationName_Static(  );
             /// @throws css::uno::RuntimeException
-            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException);
+            static css::uno::Sequence< OUString > getSupportedServiceNames_Static(  );
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getImplementationName(  ) override;
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
             // XDriver
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override;
+            virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+            virtual sal_Int32 SAL_CALL getMajorVersion(  ) override;
+            virtual sal_Int32 SAL_CALL getMinorVersion(  ) override;
 
             const css::uno::Reference< css::lang::XMultiServiceFactory >& getORB() const { return m_xORB; }
         };
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 764dccf03062..f01156615f98 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -61,16 +61,15 @@ namespace connectivity
             void FreeParams();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void putParamData (sal_Int32 index)
-                throw (css::sdbc::SQLException, css::uno::RuntimeException);
+            void putParamData (sal_Int32 index);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             void setStream (sal_Int32 ParameterIndex,const css::uno::Reference< css::io::XInputStream>& x,
-                                                        SQLLEN length,sal_Int32 SQLtype) throw (css::sdbc::SQLException, css::uno::RuntimeException);
+                                                        SQLLEN length,sal_Int32 SQLtype);
             SQLLEN* getLengthBuf (sal_Int32 index);
             void* allocBindBuf (    sal_Int32 index,    sal_Int32 bufLen);
             /// @throws css::sdbc::SQLException
-            void initBoundParam () throw(css::sdbc::SQLException);
+            void initBoundParam ();
             void setParameterPre(sal_Int32 parameterIndex);
             template <typename T> void setScalarParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, const T i_Value);
             template <typename T> void setScalarParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, const T i_Value);
@@ -90,57 +89,56 @@ namespace connectivity
 
         protected:
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
-                                                                   const css::uno::Any& rValue)
-                                                                        throw (css::uno::Exception, std::exception) override;
+                                                                   const css::uno::Any& rValue) override;
         public:
             DECLARE_SERVICE_INFO();
             // A ctor, needed to return the object
             OPreparedStatement( OConnection* _pConnection,const OUString& sql);
 
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPreparedStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) override;
+            virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
+            virtual sal_Bool SAL_CALL execute(  ) override;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
             // XParameters
-            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+            virtual void SAL_CALL clearParameters(  ) override;
             // XPreparedBatchExecution
-            virtual void SAL_CALL addBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL addBatch(  ) override;
+            virtual void SAL_CALL clearBatch(  ) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
         public:
             using OStatement_Base::executeQuery;
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 5c157d06006b..0a738d888596 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -169,7 +169,7 @@ namespace connectivity
             void releaseBuffer();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            void updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue);
             void fillNeededData(SQLRETURN _nRet);
             bool moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset);
             TVoidPtr allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex);
@@ -184,28 +184,28 @@ namespace connectivity
             // these cases need some special treatment
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            bool impl_getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            bool impl_getBoolean( sal_Int32 columnIndex );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            css::uno::Sequence< sal_Int8 > impl_getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            css::uno::Sequence< sal_Int8 > impl_getBytes( sal_Int32 columnIndex );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            css::util::Date impl_getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            css::util::Date impl_getDate( sal_Int32 columnIndex );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            css::util::Time impl_getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            css::util::Time impl_getTime( sal_Int32 columnIndex );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            css::util::DateTime impl_getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            css::util::DateTime impl_getTimestamp( sal_Int32 columnIndex );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int64 impl_getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int64 impl_getLong( sal_Int32 columnIndex );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            OUString impl_getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            OUString impl_getString( sal_Int32 columnIndex );
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            css::uno::Sequence<sal_Int8> impl_getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            css::uno::Sequence<sal_Int8> impl_getBookmark(  );
 
 
             // OPropertyArrayUsageHelper
@@ -217,15 +217,11 @@ namespace connectivity
                                 css::uno::Any & rConvertedValue,
                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue )
-                                    throw (css::lang::IllegalArgumentException,
-                                           css::uno::RuntimeException,
-                                           std::exception) override;
+                                const css::uno::Any& rValue ) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                     )
-                                     throw (css::uno::Exception, std::exception) override;
+                                     ) override;
             virtual void SAL_CALL getFastPropertyValue(
                                     css::uno::Any& rValue,
                                     sal_Int32 nHandle
@@ -253,98 +249,98 @@ namespace connectivity
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL next(  ) override;
+            virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+            virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+            virtual sal_Bool SAL_CALL isFirst(  ) override;
+            virtual sal_Bool SAL_CALL isLast(  ) override;
+            virtual void SAL_CALL beforeFirst(  ) override;
+            virtual void SAL_CALL afterLast(  ) override;
+            virtual sal_Bool SAL_CALL first(  ) override;
+            virtual sal_Bool SAL_CALL last(  ) override;
+            virtual sal_Int32 SAL_CALL getRow(  ) override;
+            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+            virtual sal_Bool SAL_CALL previous(  ) override;
+            virtual void SAL_CALL refreshRow(  ) override;
+            virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+            virtual sal_Bool SAL_CALL rowInserted(  ) override;
+            virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+            virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
             // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL wasNull(  ) override;
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+            virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+            virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+            virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+            virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+            virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+            virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+            virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
             // XResultSetMetaDataSupplier
-            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XResultSetUpdate
-            virtual void SAL_CALL insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL insertRow(  ) override;
+            virtual void SAL_CALL updateRow(  ) override;
+            virtual void SAL_CALL deleteRow(  ) override;
+            virtual void SAL_CALL cancelRowUpdates(  ) override;
+            virtual void SAL_CALL moveToInsertRow(  ) override;
+            virtual void SAL_CALL moveToCurrentRow(  ) override;
             // XRowUpdate
-            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
             // XRowLocate
-            virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+            virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+            virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+            virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
             // XDeleteRows
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override;
 
             // IResultSetHelper
             virtual bool move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData) override;
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index b496b7b63b70..388c7dded180 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -50,10 +50,10 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            OUString getCharColAttrib(sal_Int32 column,sal_Int32 ident) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            OUString getCharColAttrib(sal_Int32 column,sal_Int32 ident);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getNumColAttrib(sal_Int32 column,sal_Int32 ident) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getNumColAttrib(sal_Int32 column,sal_Int32 ident);
         public:
             // A ctor that is needed for returning the object
             OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt )
@@ -78,42 +78,41 @@ namespace connectivity
                                               ,SQLHANDLE _aStatementHandle
                                               ,const css::uno::Reference< css::uno::XInterface >& _xInterface
                                               ,sal_Int32 _column
-                                              ,sal_Int32 ident) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                              ,sal_Int32 ident);
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             static SQLSMALLINT getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const css::uno::Reference< css::uno::XInterface >& _xInterface
-                                              ,sal_Int32 column)
-                                               throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                              ,sal_Int32 column);
 
             inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex)  const
             {
                 return m_pConnection->getOdbcFunction(_nIndex);
             }
 
-            virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL getColumnCount(  ) override;
+            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getTableName( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override;
+            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override;
+            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override;
+            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 917187cc9b67..8863d048748d 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -104,20 +104,19 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void reset() throw (css::sdbc::SQLException, css::uno::RuntimeException);
+            void reset();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException);
+            void clearMyResultSet();
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            void setWarning (const css::sdbc::SQLWarning &ex)
-                throw (css::sdbc::SQLException, css::uno::RuntimeException);
+            void setWarning (const css::sdbc::SQLWarning &ex);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            bool lockIfNecessary (const OUString& sql) throw (css::sdbc::SQLException, css::uno::RuntimeException);
+            bool lockIfNecessary (const OUString& sql);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            sal_Int32 getColumnCount() throw (css::sdbc::SQLException, css::uno::RuntimeException);
+            sal_Int32 getColumnCount();
 
 
             // getResultSet
@@ -126,8 +125,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            css::uno::Reference<css::sdbc::XResultSet> getResultSet(bool checkCount)
-                throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+            css::uno::Reference<css::sdbc::XResultSet> getResultSet(bool checkCount);
             /**
                 creates the driver specific resultset (factory)
             */
@@ -135,7 +133,7 @@ namespace connectivity
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
-            SQLLEN getRowCount() throw (css::sdbc::SQLException, css::uno::RuntimeException);
+            SQLLEN getRowCount();
 
 
             void disposeResultSet();
@@ -148,13 +146,11 @@ namespace connectivity
                                 css::uno::Any & rConvertedValue,
                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue )
-                            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& rValue ) override;
             virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                                     )
-                                 throw (css::uno::Exception, std::exception) override;
+                                                     ) override;
             virtual void SAL_CALL getFastPropertyValue(
                                     css::uno::Any& rValue,
                                     sal_Int32 nHandle
@@ -175,30 +171,30 @@ namespace connectivity
             virtual void SAL_CALL release() throw() override;
             virtual void SAL_CALL acquire() throw() override;
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XStatement
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
-            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ;
+            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override ;
+            virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ;
+            virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override ;
             // XWarningsSupplier
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+            virtual void SAL_CALL clearWarnings(  ) override;
             // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL cancel(  ) override;
             // XCloseable
-            virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL close(  ) override;
             // XMultipleResults
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getUpdateCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL getMoreResults(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+            virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+            virtual sal_Bool SAL_CALL getMoreResults(  ) override;
             //XGeneratedResultSet
-            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues(  ) override;
 
             // other methods
             SQLHANDLE getConnectionHandle() { return m_pConnection->getConnection(); }
@@ -242,13 +238,13 @@ namespace connectivity
             OStatement( OConnection* _pConnection) : OStatement_BASE2( _pConnection){}
             DECLARE_SERVICE_INFO();
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             // XBatchExecution
-            virtual void SAL_CALL addBatch( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL addBatch( const OUString& sql ) override;
+            virtual void SAL_CALL clearBatch(  ) override;
+            virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) override;
         };
     }
 }
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index 919101e72ba5..8b0f473cf6a4 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -106,8 +106,7 @@ namespace connectivity
                                         SQLSMALLINT _nHandleType,
                                         const css::uno::Reference< css::uno::XInterface >& _xInterface,
                                         bool _bNoFound=true,
-                                        rtl_TextEncoding _nTextEncoding = RTL_TEXTENCODING_MS_1252)
-                                        throw(css::sdbc::SQLException);
+                                        rtl_TextEncoding _nTextEncoding = RTL_TEXTENCODING_MS_1252);
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
@@ -116,8 +115,7 @@ namespace connectivity
                                 SQLUSMALLINT _nInfo,
                                 OUString &_rValue,
                                 const css::uno::Reference< css::uno::XInterface >& _xInterface,
-                                rtl_TextEncoding _nTextEncoding)
-                                throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                rtl_TextEncoding _nTextEncoding);
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
@@ -125,7 +123,7 @@ namespace connectivity
                                 SQLHANDLE _aConnectionHandle,
                                 SQLUSMALLINT _nInfo,
                                 sal_Int32 &_rValue,
-                                const css::uno::Reference< css::uno::XInterface >& _xInterface) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                const css::uno::Reference< css::uno::XInterface >& _xInterface);
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
@@ -133,7 +131,7 @@ namespace connectivity
                                 SQLHANDLE _aConnectionHandle,
                                 SQLUSMALLINT _nInfo,
                                 SQLUSMALLINT &_rValue,
-                                const css::uno::Reference< css::uno::XInterface >& _xInterface) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                const css::uno::Reference< css::uno::XInterface >& _xInterface);
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
@@ -141,7 +139,7 @@ namespace connectivity
                                 SQLHANDLE _aConnectionHandle,
                                 SQLUSMALLINT _nInfo,
                                 SQLUINTEGER &_rValue,
-                                const css::uno::Reference< css::uno::XInterface >& _xInterface) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                const css::uno::Reference< css::uno::XInterface >& _xInterface);
 
             static sal_Int32 MapOdbcType2Jdbc(SQLSMALLINT _nType);
             static SQLSMALLINT jdbcTypeToOdbc(sal_Int32 jdbcType);
@@ -196,7 +194,7 @@ namespace connectivity
                                                     SQLSMALLINT _fSqlType,
                                                     bool &_bWasNull,
                                                     const css::uno::Reference< css::uno::XInterface >& _xInterface,
-                                                    rtl_TextEncoding _nTextEncoding) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                    rtl_TextEncoding _nTextEncoding);
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
@@ -205,7 +203,7 @@ namespace connectivity
                                                                             sal_Int32 columnIndex,
                                                                             SQLSMALLINT _fSqlType,
                                                                             bool &_bWasNull,
-                                                                            const css::uno::Reference< css::uno::XInterface >& _xInterface) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                                                            const css::uno::Reference< css::uno::XInterface >& _xInterface);
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
             static void getValue(   OConnection* _pConnection,
@@ -215,7 +213,7 @@ namespace connectivity
                                     bool &_bWasNull,
                                     const css::uno::Reference< css::uno::XInterface >& _xInterface,
                                     void* _pValue,
-                                    SQLLEN _nSize) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                    SQLLEN _nSize);
 
             /// @throws css::sdbc::SQLException
             /// @throws css::uno::RuntimeException
@@ -229,7 +227,7 @@ namespace connectivity
                                     SQLLEN *pLen,
                                     const css::uno::Reference< css::uno::XInterface >& _xInterface,
                                     rtl_TextEncoding _nTextEncoding,
-                                    bool _bUseOldTimeDate) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+                                    bool _bUseOldTimeDate);
         };
 
             /// @throws css::sdbc::SQLException
@@ -240,7 +238,7 @@ namespace connectivity
                                             SQLSMALLINT _nType,
                                             bool &_bWasNull,
                                             const css::uno::Reference< css::uno::XInterface >& _xInterface,
-                                            T& _rValue) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+                                            T& _rValue)
         {
             OTools::getValue(_pConnection,_aStatementHandle,columnIndex,_nType,_bWasNull,_xInterface,&_rValue,sizeof _rValue);
         }
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 3b3754e2c8bd..228e4b9b1c07 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -50,7 +50,7 @@ using namespace ::osl;
 #define SERVICE_SDBC_DRIVER     "com.sun.star.sdbc.Driver"
 
 /// @throws NoSuchElementException
-void throwNoSuchElementException() throw(NoSuchElementException)
+void throwNoSuchElementException()
 {
     throw NoSuchElementException();
 }
@@ -70,8 +70,8 @@ public:
     explicit ODriverEnumeration(const DriverArray& _rDriverSequence);
 
 // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements( ) throw(RuntimeException, std::exception) override;
-    virtual Any SAL_CALL nextElement( ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements( ) override;
+    virtual Any SAL_CALL nextElement( ) override;
 };
 
 
@@ -87,13 +87,13 @@ ODriverEnumeration::~ODriverEnumeration()
 }
 
 
-sal_Bool SAL_CALL ODriverEnumeration::hasMoreElements(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ODriverEnumeration::hasMoreElements(  )
 {
     return m_aPos != m_aDrivers.end();
 }
 
 
-Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL ODriverEnumeration::nextElement(  )
 {
     if ( !hasMoreElements() )
         throwNoSuchElementException();
@@ -395,7 +395,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
 }
 
 
-Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnection( const OUString& _rURL )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -421,7 +421,7 @@ Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnection( const OUStr
 }
 
 
-Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -447,21 +447,21 @@ Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnectionWithInfo( con
 }
 
 
-void SAL_CALL OSDBCDriverManager::setLoginTimeout( sal_Int32 seconds ) throw(RuntimeException, std::exception)
+void SAL_CALL OSDBCDriverManager::setLoginTimeout( sal_Int32 seconds )
 {
     MutexGuard aGuard(m_aMutex);
     m_nLoginTimeout = seconds;
 }
 
 
-sal_Int32 SAL_CALL OSDBCDriverManager::getLoginTimeout(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OSDBCDriverManager::getLoginTimeout(  )
 {
     MutexGuard aGuard(m_aMutex);
     return m_nLoginTimeout;
 }
 
 
-Reference< XEnumeration > SAL_CALL OSDBCDriverManager::createEnumeration(  ) throw(RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL OSDBCDriverManager::createEnumeration(  )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -490,31 +490,31 @@ Reference< XEnumeration > SAL_CALL OSDBCDriverManager::createEnumeration(  ) thr
 }
 
 
-css::uno::Type SAL_CALL OSDBCDriverManager::getElementType(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Type SAL_CALL OSDBCDriverManager::getElementType(  )
 {
     return cppu::UnoType<XDriver>::get();
 }
 
 
-sal_Bool SAL_CALL OSDBCDriverManager::hasElements(  ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSDBCDriverManager::hasElements(  )
 {
     MutexGuard aGuard(m_aMutex);
     return !(m_aDriversBS.empty() && m_aDriversRT.empty());
 }
 
 
-OUString SAL_CALL OSDBCDriverManager::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OSDBCDriverManager::getImplementationName(  )
 {
     return getImplementationName_static();
 }
 
-sal_Bool SAL_CALL OSDBCDriverManager::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OSDBCDriverManager::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
 
-Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_static();
 }
@@ -526,26 +526,26 @@ Reference< XInterface > SAL_CALL OSDBCDriverManager::Create( const Reference< XM
 }
 
 
-OUString SAL_CALL OSDBCDriverManager::getImplementationName_static(  ) throw(RuntimeException)
+OUString SAL_CALL OSDBCDriverManager::getImplementationName_static(  )
 {
     return OUString("com.sun.star.comp.sdbc.OSDBCDriverManager");
 }
 
 
-Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames_static(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames_static(  )
 {
     Sequence< OUString > aSupported { getSingletonName_static() };
     return aSupported;
 }
 
 
-OUString SAL_CALL OSDBCDriverManager::getSingletonName_static(  ) throw(RuntimeException)
+OUString SAL_CALL OSDBCDriverManager::getSingletonName_static(  )
 {
     return OUString(  "com.sun.star.sdbc.DriverManager"  );
 }
 
 
-Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const OUString& _rName ) throw(Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const OUString& _rName )
 {
     MutexGuard aGuard(m_aMutex);
     DriverCollection::const_iterator aSearch = m_aDriversRT.find(_rName);
@@ -556,7 +556,7 @@ Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const
 }
 
 
-void SAL_CALL OSDBCDriverManager::registerObject( const OUString& _rName, const Reference< XInterface >& _rxObject ) throw(Exception, RuntimeException, std::exception)
+void SAL_CALL OSDBCDriverManager::registerObject( const OUString& _rName, const Reference< XInterface >& _rxObject )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -584,7 +584,7 @@ void SAL_CALL OSDBCDriverManager::registerObject( const OUString& _rName, const
 }
 
 
-void SAL_CALL OSDBCDriverManager::revokeObject( const OUString& _rName ) throw(Exception, RuntimeException, std::exception)
+void SAL_CALL OSDBCDriverManager::revokeObject( const OUString& _rName )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -606,7 +606,7 @@ void SAL_CALL OSDBCDriverManager::revokeObject( const OUString& _rName ) throw(E
 }
 
 
-Reference< XDriver > SAL_CALL OSDBCDriverManager::getDriverByURL( const OUString& _rURL ) throw(RuntimeException, std::exception)
+Reference< XDriver > SAL_CALL OSDBCDriverManager::getDriverByURL( const OUString& _rURL )
 {
     m_aEventLogger.log( LogLevel::INFO,
         "driver requested for URL $1$",
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index fed7b9a26a75..fe8fa84f019f 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -84,39 +84,39 @@ namespace drivermanager
     public:
 
     // XDriverManager
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getLoginTimeout(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override;
+        virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) override;
+        virtual sal_Int32 SAL_CALL getLoginTimeout(  ) override;
 
     // XDriverAccess
-        virtual css::uno::Reference< css::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) override;
 
     // XEnumerationAccess
-        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
     // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XServiceInfo - static methods
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw(css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getSingletonName_static(  ) throw(css::uno::RuntimeException);
+        static OUString SAL_CALL getSingletonName_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxContext );
 
     // XNamingService
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL revokeObject( const OUString& Name ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) override;
+        virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) override;
+        virtual void SAL_CALL revokeObject( const OUString& Name ) override;
 
     protected:
         css::uno::Reference< css::sdbc::XDriver > implGetDriverForURL(const OUString& _rURL);
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 5ef47c408e54..2a0ee738e5de 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -261,7 +261,7 @@ void OOrderColumn::construct()
     return *OOrderColumn_PROP::getArrayHelper();
 }
 
-css::uno::Sequence< OUString > SAL_CALL OOrderColumn::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OOrderColumn::getSupportedServiceNames(  )
 {
     css::uno::Sequence< OUString > aSupported { "com.sun.star.sdb.OrderColumn" };
 
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index c05a50a09a72..53f23f4651ca 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -85,7 +85,7 @@ void SAL_CALL OCatalog::disposing()
 }
 
 // XTablesSupplier
-Reference< XNameAccess > SAL_CALL OCatalog::getTables(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OCatalog::getTables(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OCatalog_BASE::rBHelper.bDisposed);
@@ -109,7 +109,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getTables(  ) throw(RuntimeException
 }
 
 // XViewsSupplier
-Reference< XNameAccess > SAL_CALL OCatalog::getViews(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OCatalog::getViews(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OCatalog_BASE::rBHelper.bDisposed);
@@ -133,7 +133,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getViews(  ) throw(RuntimeException,
 }
 
 // XUsersSupplier
-Reference< XNameAccess > SAL_CALL OCatalog::getUsers(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OCatalog::getUsers(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OCatalog_BASE::rBHelper.bDisposed);
@@ -157,7 +157,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getUsers(  ) throw(RuntimeException,
 }
 
 // XGroupsSupplier
-Reference< XNameAccess > SAL_CALL OCatalog::getGroups(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OCatalog::getGroups(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OCatalog_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index f1eee6061e92..ec69010af880 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -239,7 +239,7 @@ OCollection::~OCollection()
 {
 }
 
-Any SAL_CALL OCollection::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL OCollection::queryInterface( const Type & rType )
 {
     if ( m_bUseIndexOnly && rType == cppu::UnoType<XNameAccess>::get() )
     {
@@ -248,7 +248,7 @@ Any SAL_CALL OCollection::queryInterface( const Type & rType ) throw (RuntimeExc
     return OCollectionBase::queryInterface( rType );
 }
 
-Sequence< Type > SAL_CALL OCollection::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OCollection::getTypes()
 {
     if ( m_bUseIndexOnly )
     {
@@ -290,7 +290,7 @@ void OCollection::disposing()
     m_pElements->swap();
 }
 
-Any SAL_CALL OCollection::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL OCollection::getByIndex( sal_Int32 Index )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     if (Index < 0 || Index >= m_pElements->size() )
@@ -299,7 +299,7 @@ Any SAL_CALL OCollection::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsEx
     return makeAny(getObject(Index));
 }
 
-Any SAL_CALL OCollection::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL OCollection::getByName( const OUString& aName )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
 
@@ -316,13 +316,13 @@ Any SAL_CALL OCollection::getByName( const OUString& aName ) throw(NoSuchElement
     return makeAny(getObject(m_pElements->findColumn(aName)));
 }
 
-Sequence< OUString > SAL_CALL OCollection::getElementNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OCollection::getElementNames(  )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return m_pElements->getElementNames();
 }
 
-void SAL_CALL OCollection::refresh(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OCollection::refresh(  )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
 
@@ -339,7 +339,7 @@ void OCollection::reFill(const TStringVector &_rVector)
 }
 
 // XDataDescriptorFactory
-Reference< XPropertySet > SAL_CALL OCollection::createDataDescriptor(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL OCollection::createDataDescriptor(  )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
 
@@ -355,7 +355,7 @@ OUString OCollection::getNameForObject(const ObjectType& _xObject)
 }
 
 // XAppend
-void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >& descriptor ) throw(SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >& descriptor )
 {
     ::osl::ClearableMutexGuard aGuard(m_rMutex);
 
@@ -383,7 +383,7 @@ void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >&
 }
 
 // XDrop
-void SAL_CALL OCollection::dropByName( const OUString& elementName ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL OCollection::dropByName( const OUString& elementName )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
 
@@ -393,7 +393,7 @@ void SAL_CALL OCollection::dropByName( const OUString& elementName ) throw(SQLEx
     dropImpl(m_pElements->findColumn(elementName));
 }
 
-void SAL_CALL OCollection::dropByIndex( sal_Int32 index ) throw(SQLException, IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL OCollection::dropByIndex( sal_Int32 index )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     if(index <0 || index >= getCount())
@@ -424,7 +424,7 @@ void OCollection::notifyElementRemoved(const OUString& _sName)
         static_cast<XContainerListener*>(aListenerLoop.next())->elementRemoved(aEvent);
 }
 
-sal_Int32 SAL_CALL OCollection::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCollection::findColumn( const OUString& columnName )
 {
     if ( !m_pElements->exists(columnName) )
     {
@@ -437,19 +437,19 @@ sal_Int32 SAL_CALL OCollection::findColumn( const OUString& columnName ) throw(S
     return m_pElements->findColumn(columnName) + 1; // because columns start at one
 }
 
-Reference< XEnumeration > SAL_CALL OCollection::createEnumeration(  ) throw(RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL OCollection::createEnumeration(  )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return new OEnumerationByIndex( static_cast< XIndexAccess*>(this));
 }
 
-void SAL_CALL OCollection::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception)
+void SAL_CALL OCollection::addContainerListener( const Reference< XContainerListener >& _rxListener )
 {
     m_aContainerListeners.addInterface(_rxListener);
 }
 
 
-void SAL_CALL OCollection::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception)
+void SAL_CALL OCollection::removeContainerListener( const Reference< XContainerListener >& _rxListener )
 {
     m_aContainerListeners.removeInterface(_rxListener);
 }
@@ -464,35 +464,35 @@ void SAL_CALL OCollection::release() throw()
     m_rParent.release();
 }
 
-Type SAL_CALL OCollection::getElementType(  ) throw(RuntimeException, std::exception)
+Type SAL_CALL OCollection::getElementType(  )
 {
     return cppu::UnoType<XPropertySet>::get();
 }
 
-sal_Bool SAL_CALL OCollection::hasElements(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OCollection::hasElements(  )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return !m_pElements->empty();
 }
 
-sal_Int32 SAL_CALL OCollection::getCount(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCollection::getCount(  )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return m_pElements->size();
 }
 
-sal_Bool SAL_CALL OCollection::hasByName( const OUString& aName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OCollection::hasByName( const OUString& aName )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return m_pElements->exists(aName);
 }
 
-void SAL_CALL OCollection::addRefreshListener( const Reference< XRefreshListener >& l ) throw(RuntimeException, std::exception)
+void SAL_CALL OCollection::addRefreshListener( const Reference< XRefreshListener >& l )
 {
     m_aRefreshListeners.addInterface(l);
 }
 
-void SAL_CALL OCollection::removeRefreshListener( const Reference< XRefreshListener >& l ) throw(RuntimeException, std::exception)
+void SAL_CALL OCollection::removeRefreshListener( const Reference< XRefreshListener >& l )
 {
     m_aRefreshListeners.removeInterface(l);
 }
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index f5e46fa637ae..1114f81ce9d6 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -33,14 +33,14 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
 
 
-OUString SAL_CALL OColumn::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OColumn::getImplementationName(  )
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VColumnDescription");
     return OUString("com.sun.star.sdbcx.VColumn");
 }
 
-css::uno::Sequence< OUString > SAL_CALL OColumn::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OColumn::getSupportedServiceNames(  )
 {
     css::uno::Sequence< OUString > aSupported(1);
     if(isNew())
@@ -51,7 +51,7 @@ css::uno::Sequence< OUString > SAL_CALL OColumn::getSupportedServiceNames(  ) th
     return aSupported;
 }
 
-sal_Bool SAL_CALL OColumn::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OColumn::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -130,7 +130,7 @@ void SAL_CALL OColumn::release() throw()
     OColumnDescriptor_BASE::release();
 }
 
-Any SAL_CALL OColumn::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OColumn::queryInterface( const Type & rType )
 {
     Any aRet = ODescriptor::queryInterface( rType);
     if(!aRet.hasValue())
@@ -143,7 +143,7 @@ Any SAL_CALL OColumn::queryInterface( const Type & rType ) throw(RuntimeExceptio
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OColumn::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OColumn::getTypes(  )
 {
     if(isNew())
         return ::comphelper::concatSequences(ODescriptor::getTypes(),OColumnDescriptor_BASE::getTypes());
@@ -181,7 +181,7 @@ void OColumn::disposing()
 
 }
 
-Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OColumnDescriptor_BASE::rBHelper.bDisposed);
@@ -206,18 +206,18 @@ Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor(  ) throw(Runti
     return pNewColumn;
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OColumn::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OColumn::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
 // XNamed
-OUString SAL_CALL OColumn::getName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OColumn::getName(  )
 {
     return m_Name;
 }
 
-void SAL_CALL OColumn::setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OColumn::setName( const OUString& aName )
 {
     m_Name = aName;
 }
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index 62b58e072756..34516329f731 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -45,7 +45,7 @@ namespace connectivity
 
 
         // css::lang::XUnoTunnel
-        sal_Int64 SAL_CALL ODescriptor::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
+        sal_Int64 SAL_CALL ODescriptor::getSomething( const Sequence< sal_Int8 >& rId )
         {
             return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
@@ -118,7 +118,7 @@ namespace connectivity
         }
 
 
-        Any SAL_CALL ODescriptor::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+        Any SAL_CALL ODescriptor::queryInterface( const Type & rType )
         {
             Any aRet = ::cppu::queryInterface(rType,static_cast< XUnoTunnel*> (this));
             return aRet.hasValue() ? aRet : ODescriptor_PBASE::queryInterface(rType);
@@ -131,7 +131,7 @@ namespace connectivity
         }
 
 
-        Sequence< Type > SAL_CALL ODescriptor::getTypes(  ) throw(RuntimeException, std::exception)
+        Sequence< Type > SAL_CALL ODescriptor::getTypes(  )
         {
             ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
                                             cppu::UnoType<XFastPropertySet>::get(),
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index e1f9ea34e20d..01059f70f023 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -54,13 +54,13 @@ OGroup::~OGroup()
 {
 }
 
-Any SAL_CALL OGroup::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OGroup::queryInterface( const Type & rType )
 {
     Any aRet = ODescriptor::queryInterface( rType);
     return aRet.hasValue() ? aRet : OGroup_BASE::queryInterface( rType);
 }
 
-Sequence< Type > SAL_CALL OGroup::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OGroup::getTypes(  )
 {
     return ::comphelper::concatSequences(ODescriptor::getTypes(),OGroup_BASE::getTypes());
 }
@@ -87,7 +87,7 @@ void OGroup::disposing()
     return *getArrayHelper();
 }
 
-Reference< XNameAccess > SAL_CALL OGroup::getUsers(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OGroup::getUsers(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OGroup_BASE::rBHelper.bDisposed);
@@ -111,7 +111,7 @@ Reference< XNameAccess > SAL_CALL OGroup::getUsers(  ) throw(RuntimeException, s
 }
 
 
-sal_Int32 SAL_CALL OGroup::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OGroup::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OGroup_BASE::rBHelper.bDisposed);
@@ -119,7 +119,7 @@ sal_Int32 SAL_CALL OGroup::getPrivileges( const OUString& /*objName*/, sal_Int32
     return 0;
 }
 
-sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OGroup_BASE::rBHelper.bDisposed);
@@ -127,31 +127,31 @@ sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const OUString& /*objName*/,
     return 0;
 }
 
-void SAL_CALL OGroup::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+void SAL_CALL OGroup::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OGroup_BASE::rBHelper.bDisposed);
     throwFeatureNotImplementedSQLException( "XAuthorizable::grantPrivileges", *this );
 }
 
-void SAL_CALL OGroup::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+void SAL_CALL OGroup::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OGroup_BASE::rBHelper.bDisposed);
     throwFeatureNotImplementedSQLException( "XAuthorizable::revokePrivileges", *this );
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-OUString SAL_CALL OGroup::getName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OGroup::getName(  )
 {
     return m_Name;
 }
 
-void SAL_CALL OGroup::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setName( const OUString& /*aName*/ )
 {
     throwFeatureNotImplementedRuntimeException( "XNamed::setName", *this );
 }
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 120222b9d1b4..51d49c2c14ce 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -38,14 +38,14 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 
-OUString SAL_CALL OIndex::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OIndex::getImplementationName(  )
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VIndexDescriptor");
     return OUString("com.sun.star.sdbcx.VIndex");
 }
 
-css::uno::Sequence< OUString > SAL_CALL OIndex::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OIndex::getSupportedServiceNames(  )
 {
     css::uno::Sequence< OUString > aSupported(1);
     if(isNew())
@@ -56,7 +56,7 @@ css::uno::Sequence< OUString > SAL_CALL OIndex::getSupportedServiceNames(  ) thr
     return aSupported;
 }
 
-sal_Bool SAL_CALL OIndex::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OIndex::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -100,7 +100,7 @@ OIndex::~OIndex( )
     return *OIndex_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
 
-Any SAL_CALL OIndex::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OIndex::queryInterface( const Type & rType )
 {
     Any aRet = ODescriptor::queryInterface( rType);
     if(!aRet.hasValue())
@@ -113,7 +113,7 @@ Any SAL_CALL OIndex::queryInterface( const Type & rType ) throw(RuntimeException
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OIndex::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OIndex::getTypes(  )
 {
     if(isNew())
         return ::comphelper::concatSequences(ODescriptor::getTypes(),ODescriptor_BASE::getTypes());
@@ -142,7 +142,7 @@ void OIndex::disposing()
         m_pColumns->disposing();
 }
 
-Reference< css::container::XNameAccess > SAL_CALL OIndex::getColumns(  ) throw(RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL OIndex::getColumns(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(ODescriptor_BASE::rBHelper.bDisposed);
@@ -165,7 +165,7 @@ Reference< css::container::XNameAccess > SAL_CALL OIndex::getColumns(  ) throw(R
     return m_pColumns.get();
 }
 
-Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(ODescriptor_BASE::rBHelper.bDisposed);
@@ -174,17 +174,17 @@ Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor(  ) throw(Runtim
     return this;
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OIndex::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OIndex::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-OUString SAL_CALL OIndex::getName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OIndex::getName(  )
 {
     return m_Name;
 }
 
-void SAL_CALL OIndex::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OIndex::setName( const OUString& /*aName*/ )
 {
 }
 
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 115382acf1a0..6de4ad4dbf9b 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -26,14 +26,14 @@ using namespace connectivity::sdbcx;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 
-OUString SAL_CALL OIndexColumn::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OIndexColumn::getImplementationName(  )
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VIndexColumnDescription");
     return OUString("com.sun.star.sdbcx.VIndex");
 }
 
-css::uno::Sequence< OUString > SAL_CALL OIndexColumn::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OIndexColumn::getSupportedServiceNames(  )
 {
     css::uno::Sequence< OUString > aSupported(1);
     if(isNew())
@@ -44,7 +44,7 @@ css::uno::Sequence< OUString > SAL_CALL OIndexColumn::getSupportedServiceNames(
     return aSupported;
 }
 
-sal_Bool SAL_CALL OIndexColumn::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OIndexColumn::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index a3c15cd83427..2f1de9327912 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -36,14 +36,14 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 
-OUString SAL_CALL OKey::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OKey::getImplementationName(  )
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VKeyDescription");
     return OUString("com.sun.star.sdbcx.VKey");
 }
 
-css::uno::Sequence< OUString > SAL_CALL OKey::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OKey::getSupportedServiceNames(  )
 {
     css::uno::Sequence< OUString > aSupported(1);
     if(isNew())
@@ -54,7 +54,7 @@ css::uno::Sequence< OUString > SAL_CALL OKey::getSupportedServiceNames(  ) throw
     return aSupported;
 }
 
-sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -94,7 +94,7 @@ OKey::~OKey( )
 {
 }
 
-Any SAL_CALL OKey::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OKey::queryInterface( const Type & rType )
 {
     Any aRet = ODescriptor::queryInterface( rType);
     if(!aRet.hasValue())
@@ -108,7 +108,7 @@ Any SAL_CALL OKey::queryInterface( const Type & rType ) throw(RuntimeException,
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OKey::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OKey::getTypes(  )
 {
     if(isNew())
         return ::comphelper::concatSequences(ODescriptor::getTypes(),ODescriptor_BASE::getTypes());
@@ -150,7 +150,7 @@ void SAL_CALL OKey::disposing()
     return *getArrayHelper(isNew() ? 1 : 0);
 }
 
-Reference< css::container::XNameAccess > SAL_CALL OKey::getColumns(  ) throw(RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL OKey::getColumns(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(ODescriptor_BASE::rBHelper.bDisposed);
@@ -173,7 +173,7 @@ Reference< css::container::XNameAccess > SAL_CALL OKey::getColumns(  ) throw(Run
     return m_pColumns.get();
 }
 
-Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(ODescriptor_BASE::rBHelper.bDisposed);
@@ -182,17 +182,17 @@ Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor(  ) throw(RuntimeE
     return this;
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OKey::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OKey::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-OUString SAL_CALL OKey::getName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OKey::getName(  )
 {
     return m_Name;
 }
 
-void SAL_CALL OKey::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OKey::setName( const OUString& /*aName*/ )
 {
 }
 
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 7693717178db..d06136bebd3b 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -27,14 +27,14 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 using namespace cppu;
 
-OUString SAL_CALL OKeyColumn::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OKeyColumn::getImplementationName(  )
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VKeyColumnDescription");
     return OUString("com.sun.star.sdbcx.VKeyColumn");
 }
 
-css::uno::Sequence< OUString > SAL_CALL OKeyColumn::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OKeyColumn::getSupportedServiceNames(  )
 {
     css::uno::Sequence< OUString > aSupported(1);
     if(isNew())
@@ -45,7 +45,7 @@ css::uno::Sequence< OUString > SAL_CALL OKeyColumn::getSupportedServiceNames(  )
     return aSupported;
 }
 
-sal_Bool SAL_CALL OKeyColumn::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OKeyColumn::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index de38f104c1f7..44edf0b3575e 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 
-OUString SAL_CALL OTable::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OTable::getImplementationName(  )
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VTableDescriptor");
@@ -48,7 +48,7 @@ OUString SAL_CALL OTable::getImplementationName(  ) throw (css::uno::RuntimeExce
 }
 
 
-css::uno::Sequence< OUString > SAL_CALL OTable::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OTable::getSupportedServiceNames(  )
 {
     css::uno::Sequence< OUString > aSupported(1);
     if(isNew())
@@ -59,7 +59,7 @@ css::uno::Sequence< OUString > SAL_CALL OTable::getSupportedServiceNames(  ) thr
     return aSupported;
 }
 
-sal_Bool SAL_CALL OTable::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OTable::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -123,7 +123,7 @@ void SAL_CALL OTable::release() throw()
 }
 
 
-Any SAL_CALL OTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OTable::queryInterface( const Type & rType )
 {
     Any aRet = ODescriptor::queryInterface( rType);
     if(!aRet.hasValue())
@@ -138,7 +138,7 @@ Any SAL_CALL OTable::queryInterface( const Type & rType ) throw(RuntimeException
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OTable::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OTable::getTypes(  )
 {
     if(isNew())
         return ::comphelper::concatSequences(ODescriptor::getTypes(),OTableDescriptor_BASE::getTypes());
@@ -162,7 +162,7 @@ void SAL_CALL OTable::disposing()
 }
 
 // XColumnsSupplier
-Reference< XNameAccess > SAL_CALL OTable::getColumns(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OTable::getColumns(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -187,7 +187,7 @@ Reference< XNameAccess > SAL_CALL OTable::getColumns(  ) throw(RuntimeException,
 
 
 // XKeysSupplier
-Reference< XIndexAccess > SAL_CALL OTable::getKeys(  ) throw(RuntimeException, std::exception)
+Reference< XIndexAccess > SAL_CALL OTable::getKeys(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -223,7 +223,7 @@ cppu::IPropertyArrayHelper & OTable::getInfoHelper()
     return *getArrayHelper(isNew() ? 1 : 0);
 }
 
-Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -234,7 +234,7 @@ Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor(  ) throw(Runtim
 }
 
 // XIndexesSupplier
-Reference< XNameAccess > SAL_CALL OTable::getIndexes(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OTable::getIndexes(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -258,7 +258,7 @@ Reference< XNameAccess > SAL_CALL OTable::getIndexes(  ) throw(RuntimeException,
 }
 
 // XRename
-void SAL_CALL OTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL OTable::rename( const OUString& newName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -279,22 +279,22 @@ Reference< XDatabaseMetaData> OTable::getMetaData() const
 }
 
 // XAlterTable
-void SAL_CALL OTable::alterColumnByName( const OUString& /*colName*/, const Reference< XPropertySet >& /*descriptor*/ ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL OTable::alterColumnByName( const OUString& /*colName*/, const Reference< XPropertySet >& /*descriptor*/ )
 {
     throwFeatureNotImplementedSQLException( "XAlterTable::alterColumnByName", *this );
 }
 
-void SAL_CALL OTable::alterColumnByIndex( sal_Int32 /*index*/, const Reference< XPropertySet >& /*descriptor*/ ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL OTable::alterColumnByIndex( sal_Int32 /*index*/, const Reference< XPropertySet >& /*descriptor*/ )
 {
     throwFeatureNotImplementedSQLException( "XAlterTable::alterColumnByIndex", *this );
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OTable::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OTable::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-OUString SAL_CALL OTable::getName() throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OTable::getName()
 {
     // this is only correct for tables who haven't a schema or catalog name
     OSL_ENSURE(m_CatalogName.isEmpty(),"getName(): forgot to override getName()!");
@@ -302,7 +302,7 @@ OUString SAL_CALL OTable::getName() throw(css::uno::RuntimeException, std::excep
     return m_Name;
 }
 
-void SAL_CALL OTable::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OTable::setName( const OUString& /*aName*/ )
 {
 }
 
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index e77b55b9509a..a4d5657df60b 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -63,13 +63,13 @@ void OUser::disposing()
         m_pGroups->disposing();
 }
 
-Any SAL_CALL OUser::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OUser::queryInterface( const Type & rType )
 {
     Any aRet = ODescriptor::queryInterface( rType);
     return aRet.hasValue() ? aRet : OUser_BASE::queryInterface( rType);
 }
 
-Sequence< Type > SAL_CALL OUser::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OUser::getTypes(  )
 {
     return ::comphelper::concatSequences(ODescriptor::getTypes(),OUser_BASE::getTypes());
 }
@@ -88,7 +88,7 @@ Sequence< Type > SAL_CALL OUser::getTypes(  ) throw(RuntimeException, std::excep
 }
 
 // XUser
-void SAL_CALL OUser::changePassword( const OUString& /*objPassword*/, const OUString& /*newPassword*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+void SAL_CALL OUser::changePassword( const OUString& /*objPassword*/, const OUString& /*newPassword*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
@@ -96,7 +96,7 @@ void SAL_CALL OUser::changePassword( const OUString& /*objPassword*/, const OUSt
 }
 
 // XGroupsSupplier
-Reference< XNameAccess > SAL_CALL OUser::getGroups(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OUser::getGroups(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
@@ -122,7 +122,7 @@ Reference< XNameAccess > SAL_CALL OUser::getGroups(  ) throw(RuntimeException, s
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
-sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
@@ -130,7 +130,7 @@ sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32
     return 0;
 }
 
-sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
@@ -141,31 +141,31 @@ sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, s
 SAL_WNOUNREACHABLE_CODE_POP
 
 
-void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedSQLException( "XAuthorizable::grantPrivileges", *this );
 }
 
-void SAL_CALL OUser::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OUser::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedSQLException( "XAuthorizable::revokePrivileges", *this );
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OUser::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OUser::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-OUString SAL_CALL OUser::getName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OUser::getName(  )
 {
     return m_Name;
 }
 
-void SAL_CALL OUser::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OUser::setName( const OUString& /*aName*/ )
 {
     OSL_FAIL( "OUser::setName: not implemented!" );
         // not allowed to throw an SQLException here ...
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 673b11d11f08..65b4c6c22d45 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -74,12 +74,12 @@ void OView::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION),     PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::cppu::UnoType<sal_Int32>::get());
 }
 
-Sequence< Type > SAL_CALL OView::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OView::getTypes(  )
 {
     return ::comphelper::concatSequences(ODescriptor::getTypes(),OView_BASE::getTypes());
 }
 
-Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OView::queryInterface( const Type & rType )
 {
     Any aRet = OView_BASE::queryInterface( rType);
     return aRet.hasValue() ? aRet : ODescriptor::queryInterface( rType);
@@ -95,7 +95,7 @@ Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException,
     return *getArrayHelper(isNew() ? 1 : 0);
 }
 
-OUString SAL_CALL OView::getName() throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OView::getName()
 {
     OUString sComposedName;
     if(m_xMetaData.is())
@@ -109,12 +109,12 @@ OUString SAL_CALL OView::getName() throw(css::uno::RuntimeException, std::except
     return sComposedName;
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OView::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OView::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-void SAL_CALL OView::setName( const OUString& ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OView::setName( const OUString& )
 {
 }
 
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx
index 503047f413df..a13b995e6e3a 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.cxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx
@@ -15,12 +15,12 @@
 
 using namespace ::com::sun::star;
 
-void MtfRenderer::setMetafile (const uno::Sequence< sal_Int8 >& /*rMtf*/) throw (uno::RuntimeException, std::exception)
+void MtfRenderer::setMetafile (const uno::Sequence< sal_Int8 >& /*rMtf*/)
 {
         // printf ("MtfRenderer::setMetafile unimplemented, use fast property set or implement me\n");
 }
 
-void MtfRenderer::draw (double fScaleX, double fScaleY) throw (uno::RuntimeException, std::exception)
+void MtfRenderer::draw (double fScaleX, double fScaleY)
 {
     if (mpMetafile && mxCanvas.get()) {
         cppcanvas::BitmapCanvasSharedPtr canvas = cppcanvas::VCLFactory::createBitmapCanvas (mxCanvas);
@@ -32,7 +32,7 @@ void MtfRenderer::draw (double fScaleX, double fScaleY) throw (uno::RuntimeExcep
     }
 }
 
-void MtfRenderer::setFastPropertyValue( sal_Int32 nHandle, const uno::Any& aAny)  throw (uno::RuntimeException, std::exception)
+void MtfRenderer::setFastPropertyValue( sal_Int32 nHandle, const uno::Any& aAny)
 {
     if (nHandle == 0) {
         mpMetafile = reinterpret_cast<GDIMetaFile*>( *o3tl::doAccess<sal_Int64>(aAny) );
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx
index c20a2486c449..5b2594fc8bf8 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.hxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.hxx
@@ -26,13 +26,13 @@ public:
                  css::uno::Reference<css::uno::XComponentContext> const&);
 
     // XMtfRenderer iface
-    void SAL_CALL setMetafile (const css::uno::Sequence< sal_Int8 >& rMtf) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL draw (double fScaleX, double fScaleY) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setMetafile (const css::uno::Sequence< sal_Int8 >& rMtf) override;
+    void SAL_CALL draw (double fScaleX, double fScaleY) override;
 
     // XFastPropertySet
     // setFastPropertyValue (0, GDIMetaFile*) is used to speedup the rendering
-    virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/)  throw (css::uno::RuntimeException, std::exception) override { return css::uno::Any(); }
-    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any&)  throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) override { return css::uno::Any(); }
+    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any&) override;
 
 private:
     GDIMetaFile* mpMetafile;
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index b6b69eaf9e6b..d76ffc0c3424 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -86,8 +86,7 @@ private:
 
 class Impl1: public Interface1, private Base {
 public:
-    virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) override
     {
         if (type == cppu::UnoType<css::uno::XInterface>::get()) {
             css::uno::Reference< css::uno::XInterface > ref(
@@ -112,8 +111,7 @@ public:
 
 class Impl2: public Interface2a, public Interface3, private Base {
 public:
-    virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) override
     {
         if (type == cppu::UnoType<css::uno::XInterface>::get()) {
             css::uno::Reference< css::uno::XInterface > ref(
@@ -145,8 +143,7 @@ public:
 
 class Impl2b: public Interface2b, private Base {
 public:
-    virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) override
     {
         if (type == cppu::UnoType<css::uno::XInterface>::get()) {
             css::uno::Reference< css::uno::XInterface > ref(
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index 436fb4512cfa..15a926f50a9a 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -49,8 +49,7 @@ public:
     Foo(const Foo&) = delete;
     const Foo& operator=(const Foo&) = delete;
 
-    virtual Any SAL_CALL queryInterface(const Type & _type)
-        throw (RuntimeException, std::exception) override
+    virtual Any SAL_CALL queryInterface(const Type & _type) override
     {
         if (_type == cppu::UnoType<XInterface>::get())
         {
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 0484eecbce7d..a535d3c7283c 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -49,8 +49,7 @@ public:
     explicit ContainerListener(ContainerStats *pStats)
         : m_pStats(pStats) { m_pStats->m_nAlive++; }
     virtual ~ContainerListener() override { m_pStats->m_nAlive--; }
-    virtual void SAL_CALL disposing( const EventObject& )
-        throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing( const EventObject& ) override
     {
         m_pStats->m_nDisposed++;
     }
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index 2a1d23e1c2a8..e37131c9f543 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -38,7 +38,7 @@ class Reference: public cppu::WeakImplHelper< css::uno::XReference > {
 public:
     Reference(): m_disposed(false) {}
 
-    void SAL_CALL dispose() throw (css::uno::RuntimeException) override {
+    void SAL_CALL dispose() override {
         m_disposed = true;
         handleDispose();
     }
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 17f799fc3c8c..aa8e68c7dfbb 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -47,11 +47,11 @@ OComponentHelper::~OComponentHelper()
 {
 }
 
-Any OComponentHelper::queryInterface( Type const & rType ) throw (RuntimeException, std::exception)
+Any OComponentHelper::queryInterface( Type const & rType )
 {
     return OWeakAggObject::queryInterface( rType );
 }
-Any OComponentHelper::queryAggregation( Type const & rType ) throw (RuntimeException, std::exception)
+Any OComponentHelper::queryAggregation( Type const & rType )
 {
     if (rType == cppu::UnoType<lang::XComponent>::get())
     {
@@ -112,7 +112,7 @@ void OComponentHelper::release() throw()
     OWeakAggObject::release();
 }
 
-Sequence< Type > OComponentHelper::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OComponentHelper::getTypes()
 {
     static OTypeCollection * s_pTypes = nullptr;
     if (! s_pTypes)
@@ -138,7 +138,6 @@ void OComponentHelper::disposing()
 
 // XComponent
 void OComponentHelper::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     // An frequently programming error is to release the last
     // reference to this object in the disposing message.
@@ -211,7 +210,6 @@ void OComponentHelper::dispose()
 // XComponent
 void OComponentHelper::addEventListener(
     const Reference<XEventListener > & rxListener )
-    throw(css::uno::RuntimeException, std::exception)
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
     if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -229,7 +227,6 @@ void OComponentHelper::addEventListener(
 // XComponent
 void OComponentHelper::removeEventListener(
     const Reference<XEventListener > & rxListener )
-    throw(css::uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener( cppu::UnoType<decltype(rxListener)>::get(), rxListener );
 }
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 3fb4b94b6432..8bc46d9281ef 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -93,8 +93,7 @@ public:
         Reference< lang::XComponent > const & xSource,
         Reference< lang::XComponent > const & xTarget );
 
-    virtual void SAL_CALL disposing( lang::EventObject const & rSource )
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( lang::EventObject const & rSource ) override;
 };
 
 inline void DisposingForwarder::listen(
@@ -108,7 +107,6 @@ inline void DisposingForwarder::listen(
 }
 
 void DisposingForwarder::disposing( lang::EventObject const & )
-    throw (RuntimeException, std::exception)
 {
     m_xTarget->dispose();
     m_xTarget.clear();
@@ -156,43 +154,29 @@ public:
     virtual ~ComponentContext() override;
 
     // XComponentContext
-    virtual Any SAL_CALL getValueByName( OUString const & rName )
-        throw (RuntimeException, std::exception) override;
-    virtual Reference<lang::XMultiComponentFactory> SAL_CALL getServiceManager()
-        throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getValueByName( OUString const & rName ) override;
+    virtual Reference<lang::XMultiComponentFactory> SAL_CALL getServiceManager() override;
 
     // XNameContainer
     virtual void SAL_CALL insertByName(
-        OUString const & name, Any const & element )
-        throw (lang::IllegalArgumentException, container::ElementExistException,
-               lang::WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( OUString const & name )
-        throw (container::NoSuchElementException,
-               lang::WrappedTargetException, RuntimeException, std::exception) override;
+        OUString const & name, Any const & element ) override;
+    virtual void SAL_CALL removeByName( OUString const & name ) override;
     // XNameReplace
     virtual void SAL_CALL replaceByName(
-        OUString const & name, Any const & element )
-        throw (lang::IllegalArgumentException,container::NoSuchElementException,
-               lang::WrappedTargetException, RuntimeException, std::exception) override;
+        OUString const & name, Any const & element ) override;
     // XNameAccess
-    virtual Any SAL_CALL getByName( OUString const & name )
-        throw (container::NoSuchElementException,
-               lang::WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Sequence<OUString> SAL_CALL getElementNames()
-        throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( OUString const & name )
-        throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getByName( OUString const & name ) override;
+    virtual Sequence<OUString> SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( OUString const & name ) override;
     // XElementAccess
-    virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override;
+    virtual Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 };
 
 // XNameContainer
 
 void ComponentContext::insertByName(
     OUString const & name, Any const & element )
-    throw (lang::IllegalArgumentException, container::ElementExistException,
-           lang::WrappedTargetException, RuntimeException, std::exception)
 {
     t_map::mapped_type entry(
         new ContextEntry(
@@ -211,8 +195,6 @@ void ComponentContext::insertByName(
 
 
 void ComponentContext::removeByName( OUString const & name )
-        throw (container::NoSuchElementException,
-               lang::WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     t_map::iterator iFind( m_map.find( name ) );
@@ -229,8 +211,6 @@ void ComponentContext::removeByName( OUString const & name )
 
 void ComponentContext::replaceByName(
     OUString const & name, Any const & element )
-    throw (lang::IllegalArgumentException,container::NoSuchElementException,
-           lang::WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     t_map::const_iterator const iFind( m_map.find( name ) );
@@ -254,15 +234,12 @@ void ComponentContext::replaceByName(
 // XNameAccess
 
 Any ComponentContext::getByName( OUString const & name )
-    throw (container::NoSuchElementException,
-           lang::WrappedTargetException, RuntimeException, std::exception)
 {
     return getValueByName( name );
 }
 
 
 Sequence<OUString> ComponentContext::getElementNames()
-    throw (RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     Sequence<OUString> ret( m_map.size() );
@@ -277,7 +254,6 @@ Sequence<OUString> ComponentContext::getElementNames()
 
 
 sal_Bool ComponentContext::hasByName( OUString const & name )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     return m_map.find( name ) != m_map.end();
@@ -285,13 +261,13 @@ sal_Bool ComponentContext::hasByName( OUString const & name )
 
 // XElementAccess
 
-Type ComponentContext::getElementType() throw (RuntimeException, std::exception)
+Type ComponentContext::getElementType()
 {
     return cppu::UnoType<void>::get();
 }
 
 
-sal_Bool ComponentContext::hasElements() throw (RuntimeException, std::exception)
+sal_Bool ComponentContext::hasElements()
 {
     MutexGuard guard( m_mutex );
     return ! m_map.empty();
@@ -395,7 +371,6 @@ Any ComponentContext::lookupMap( OUString const & rName )
 
 
 Any ComponentContext::getValueByName( OUString const & rName )
-    throw (RuntimeException, std::exception)
 {
     // to determine the root context:
     if ( rName == "_root" )
@@ -415,7 +390,6 @@ Any ComponentContext::getValueByName( OUString const & rName )
 }
 
 Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager()
-    throw (RuntimeException, std::exception)
 {
     if ( !m_xSMgr.is() )
     {
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 7d3e24b7344b..6bec68874031 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -53,14 +53,13 @@ struct ExceptionThrower : public uno_Interface, XExceptionThrower
     }
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( Type const & type )
-        throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( Type const & type ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XExceptionThrower
-    virtual void SAL_CALL throwException( Any const & exc ) throw (Exception, std::exception) override;
-    virtual void SAL_CALL rethrowException() throw (Exception, std::exception) override;
+    virtual void SAL_CALL throwException( Any const & exc ) override;
+    virtual void SAL_CALL rethrowException() override;
 };
 
 extern "C"
@@ -129,7 +128,6 @@ void SAL_CALL ExceptionThrower_dispatch(
 
 
 Any ExceptionThrower::queryInterface( Type const & type )
-    throw (RuntimeException, std::exception)
 {
     if (type.equals( cppu::UnoType<XInterface>::get() ) ||
         type.equals( ExceptionThrower::getCppuType() ))
@@ -150,14 +148,14 @@ void ExceptionThrower::release() throw ()
 }
 
 
-void ExceptionThrower::throwException( Any const & exc ) throw (Exception, std::exception)
+void ExceptionThrower::throwException( Any const & exc )
 {
     OSL_FAIL( "unexpected!" );
     cppu::throwException( exc );
 }
 
 
-void ExceptionThrower::rethrowException() throw (Exception, std::exception)
+void ExceptionThrower::rethrowException()
 {
     throw;
 }
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 49db5466f449..65f8553657b6 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -82,30 +82,22 @@ public:
     virtual ~OSingleFactoryHelper();
 
     // XInterface
-    Any SAL_CALL queryInterface( const Type & rType )
-        throw(css::uno::RuntimeException, std::exception) override;
+    Any SAL_CALL queryInterface( const Type & rType ) override;
 
     // XSingleServiceFactory
-    Reference<XInterface > SAL_CALL createInstance()
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments)
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    Reference<XInterface > SAL_CALL createInstance() override;
+    virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments) override;
     // XSingleComponentFactory
     virtual Reference< XInterface > SAL_CALL createInstanceWithContext(
-        Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override;
+        Reference< XComponentContext > const & xContext ) override;
     virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
         Sequence< Any > const & rArguments,
-        Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override;
+        Reference< XComponentContext > const & xContext ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw(css::uno::RuntimeException, std::exception) override;
-    Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     /**
@@ -116,8 +108,7 @@ protected:
      * @throw css::uno::RuntimeException
      */
     virtual Reference<XInterface >  createInstanceEveryTime(
-        Reference< XComponentContext > const & xContext )
-        throw(css::uno::Exception, css::uno::RuntimeException);
+        Reference< XComponentContext > const & xContext );
 
     Reference<XMultiServiceFactory > xSMgr;
     ComponentInstantiation           pCreateFunction;
@@ -131,7 +122,6 @@ OSingleFactoryHelper::~OSingleFactoryHelper()
 
 
 Any OSingleFactoryHelper::queryInterface( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return ::cppu::queryInterface(
         rType,
@@ -144,7 +134,6 @@ Any OSingleFactoryHelper::queryInterface( const Type & rType )
 // OSingleFactoryHelper
 Reference<XInterface > OSingleFactoryHelper::createInstanceEveryTime(
     Reference< XComponentContext > const & xContext )
-    throw(css::uno::Exception, css::uno::RuntimeException)
 {
     if (m_fptr)
     {
@@ -169,7 +158,6 @@ Reference<XInterface > OSingleFactoryHelper::createInstanceEveryTime(
 
 // XSingleServiceFactory
 Reference<XInterface > OSingleFactoryHelper::createInstance()
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithContext( Reference< XComponentContext >() );
 }
@@ -177,7 +165,6 @@ Reference<XInterface > OSingleFactoryHelper::createInstance()
 // XSingleServiceFactory
 Reference<XInterface > OSingleFactoryHelper::createInstanceWithArguments(
     const Sequence<Any>& Arguments )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArgumentsAndContext(
         Arguments, Reference< XComponentContext >() );
@@ -187,7 +174,6 @@ Reference<XInterface > OSingleFactoryHelper::createInstanceWithArguments(
 
 Reference< XInterface > OSingleFactoryHelper::createInstanceWithContext(
     Reference< XComponentContext > const & xContext )
-    throw (Exception, RuntimeException, std::exception)
 {
     return createInstanceEveryTime( xContext );
 }
@@ -195,7 +181,6 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithContext(
 Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndContext(
     Sequence< Any > const & rArguments,
     Reference< XComponentContext > const & xContext )
-    throw (Exception, RuntimeException, std::exception)
 {
     Reference< XInterface > xRet( createInstanceWithContext( xContext ) );
 
@@ -227,7 +212,6 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndCont
 
 // XServiceInfo
 OUString OSingleFactoryHelper::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return aImplementationName;
 }
@@ -235,14 +219,12 @@ OUString OSingleFactoryHelper::getImplementationName()
 // XServiceInfo
 sal_Bool OSingleFactoryHelper::supportsService(
     const OUString& ServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
 Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return aServiceNames;
 }
@@ -272,41 +254,34 @@ public:
         }
 
     // XInterface
-    Any SAL_CALL queryInterface( const Type & rType )
-        throw(css::uno::RuntimeException, std::exception) override;
+    Any SAL_CALL queryInterface( const Type & rType ) override;
     void SAL_CALL acquire() throw() override
         { OComponentHelper::acquire(); }
     void SAL_CALL release() throw() override
         { OComponentHelper::release(); }
 
     // XSingleServiceFactory
-    Reference<XInterface > SAL_CALL createInstance()
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    Reference<XInterface > SAL_CALL createInstanceWithArguments( const Sequence<Any>& Arguments )
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    Reference<XInterface > SAL_CALL createInstance() override;
+    Reference<XInterface > SAL_CALL createInstanceWithArguments( const Sequence<Any>& Arguments ) override;
     // XSingleComponentFactory
     virtual Reference< XInterface > SAL_CALL createInstanceWithContext(
-        Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override;
+        Reference< XComponentContext > const & xContext ) override;
     virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
         Sequence< Any > const & rArguments,
-        Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override;
+        Reference< XComponentContext > const & xContext ) override;
 
     // XTypeProvider
-    virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XAggregation
-    Any SAL_CALL queryAggregation( const Type & rType )
-        throw(css::uno::RuntimeException, std::exception) override;
+    Any SAL_CALL queryAggregation( const Type & rType ) override;
 
     // XUnloadingPreference
-    virtual sal_Bool SAL_CALL releaseOnNotification()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL releaseOnNotification() override;
 
     // OComponentHelper
-    void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose() override;
 
 private:
     Reference<XInterface >  xTheInstance;
@@ -319,7 +294,6 @@ protected:
 
 
 Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     if( rType == cppu::UnoType<XUnloadingPreference>::get() )
     {
@@ -332,7 +306,6 @@ Any SAL_CALL OFactoryComponentHelper::queryInterface( const Type & rType )
 
 // XAggregation
 Any OFactoryComponentHelper::queryAggregation( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Any aRet( OComponentHelper::queryAggregation( rType ) );
     return (aRet.hasValue() ? aRet : OSingleFactoryHelper::queryInterface( rType ));
@@ -340,7 +313,6 @@ Any OFactoryComponentHelper::queryAggregation( const Type & rType )
 
 // XTypeProvider
 Sequence< Type > OFactoryComponentHelper::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     Type ar[ 4 ];
     ar[ 0 ] = cppu::UnoType<XSingleServiceFactory>::get();
@@ -354,14 +326,12 @@ Sequence< Type > OFactoryComponentHelper::getTypes()
 }
 
 Sequence< sal_Int8 > OFactoryComponentHelper::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XSingleServiceFactory
 Reference<XInterface > OFactoryComponentHelper::createInstance()
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     if( bOneInstance )
     {
@@ -378,7 +348,6 @@ Reference<XInterface > OFactoryComponentHelper::createInstance()
 
 Reference<XInterface > OFactoryComponentHelper::createInstanceWithArguments(
     const Sequence<Any>& Arguments )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     if( bOneInstance )
     {
@@ -398,7 +367,6 @@ Reference<XInterface > OFactoryComponentHelper::createInstanceWithArguments(
 
 Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext(
     Reference< XComponentContext > const & xContext )
-    throw (Exception, RuntimeException, std::exception)
 {
     if( bOneInstance )
     {
@@ -417,7 +385,6 @@ Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext(
 Reference< XInterface > OFactoryComponentHelper::createInstanceWithArgumentsAndContext(
     Sequence< Any > const & rArguments,
     Reference< XComponentContext > const & xContext )
-    throw (Exception, RuntimeException, std::exception)
 {
     if( bOneInstance )
     {
@@ -436,7 +403,6 @@ Reference< XInterface > OFactoryComponentHelper::createInstanceWithArgumentsAndC
 
 // OComponentHelper
 void OFactoryComponentHelper::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     OComponentHelper::dispose();
 
@@ -460,7 +426,7 @@ void OFactoryComponentHelper::dispose()
 // one-instance factory: sal_False
 // single factory: sal_True
 // component factory: sal_True
-sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFactoryComponentHelper::releaseOnNotification()
 {
     if( bOneInstance)
         return false;
@@ -484,57 +450,46 @@ public:
         {}
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( Type const & type )
-        throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( Type const & type ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
     // XTypeProvider
-    virtual Sequence< Type > SAL_CALL getTypes()
-        throw (RuntimeException, std::exception) override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
     // XPropertySet
-    virtual Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (RuntimeException, std::exception) override;
+    virtual Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
     // OPropertySetHelper
     virtual IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
         Any & rConvertedValue, Any & rOldValue,
-        sal_Int32 nHandle, Any const & rValue )
-        throw (lang::IllegalArgumentException) override;
+        sal_Int32 nHandle, Any const & rValue ) override;
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-        sal_Int32 nHandle, Any const & rValue )
-        throw (Exception, std::exception) override;
+        sal_Int32 nHandle, Any const & rValue ) override;
     using OPropertySetHelper::getFastPropertyValue;
     virtual void SAL_CALL getFastPropertyValue(
         Any & rValue, sal_Int32 nHandle ) const override;
 
     // OSingleFactoryHelper
     Reference<XInterface > createInstanceEveryTime(
-        Reference< XComponentContext > const & xContext )
-        throw(css::uno::Exception, css::uno::RuntimeException) override;
+        Reference< XComponentContext > const & xContext ) override;
 
     // XSingleServiceFactory
-    Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments)
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments) override;
     // XSingleComponentFactory
     Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
         Sequence< Any > const & rArguments,
-        Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override;
+        Reference< XComponentContext > const & xContext ) override;
 
     // XServiceInfo
-    Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw(css::uno::RuntimeException, std::exception) override;
+    Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     // XUnloadingPreference
-    sal_Bool SAL_CALL releaseOnNotification()
-        throw( RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL releaseOnNotification() override;
 
 
 private:
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
-    Reference< XInterface > createModuleFactory()
-        throw(css::uno::Exception, css::uno::RuntimeException);
+    Reference< XInterface > createModuleFactory();
 
     /** The registry key of the implementation section */
     Reference<XRegistryKey >    xImplementationKey;
@@ -550,7 +505,7 @@ protected:
 // XInterface
 
 Any SAL_CALL ORegistryFactoryHelper::queryInterface(
-    Type const & type ) throw (RuntimeException, std::exception)
+    Type const & type )
 {
     Any ret( OFactoryComponentHelper::queryInterface( type ) );
     if (ret.hasValue())
@@ -573,7 +528,7 @@ void ORegistryFactoryHelper::release() throw ()
 
 // XTypeProvider
 
-Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > ORegistryFactoryHelper::getTypes()
 {
     Sequence< Type > types( OFactoryComponentHelper::getTypes() );
     sal_Int32 pos = types.getLength();
@@ -588,7 +543,7 @@ Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException, std
 // XPropertySet
 
 Reference< beans::XPropertySetInfo >
-ORegistryFactoryHelper::getPropertySetInfo() throw (RuntimeException, std::exception)
+ORegistryFactoryHelper::getPropertySetInfo()
 {
     ::osl::MutexGuard guard( aMutex );
     if (! m_xInfo.is())
@@ -618,7 +573,6 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper()
 
 sal_Bool ORegistryFactoryHelper::convertFastPropertyValue(
     Any &, Any &, sal_Int32, Any const & )
-    throw (lang::IllegalArgumentException)
 {
     OSL_FAIL( "unexpected!" );
     return false;
@@ -627,7 +581,6 @@ sal_Bool ORegistryFactoryHelper::convertFastPropertyValue(
 
 void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast(
     sal_Int32, Any const & )
-    throw (Exception, std::exception)
 {
     throw beans::PropertyVetoException(
         "unexpected: only readonly properties!",
@@ -653,7 +606,6 @@ void ORegistryFactoryHelper::getFastPropertyValue(
 
 Reference<XInterface > ORegistryFactoryHelper::createInstanceEveryTime(
     Reference< XComponentContext > const & xContext )
-    throw(css::uno::Exception, css::uno::RuntimeException)
 {
     if( !xModuleFactory.is() && !xModuleFactoryDepr.is() )
     {
@@ -682,7 +634,6 @@ Reference<XInterface > ORegistryFactoryHelper::createInstanceEveryTime(
 
 Reference<XInterface > SAL_CALL ORegistryFactoryHelper::createInstanceWithArguments(
     const Sequence<Any>& Arguments )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     if( !xModuleFactory.is() && !xModuleFactoryDepr.is() )
     {
@@ -713,7 +664,6 @@ Reference<XInterface > SAL_CALL ORegistryFactoryHelper::createInstanceWithArgume
 Reference< XInterface > ORegistryFactoryHelper::createInstanceWithArgumentsAndContext(
     Sequence< Any > const & rArguments,
     Reference< XComponentContext > const & xContext )
-    throw (Exception, RuntimeException, std::exception)
 {
     if( !xModuleFactory.is() && !xModuleFactoryDepr.is() )
     {
@@ -744,7 +694,6 @@ Reference< XInterface > ORegistryFactoryHelper::createInstanceWithArgumentsAndCo
 
 // OSingleFactoryHelper
 Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
-    throw(css::uno::Exception, css::uno::RuntimeException)
 {
     OUString aActivatorUrl;
     OUString aActivatorName;
@@ -807,7 +756,6 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory()
 
 // XServiceInfo
 Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( aMutex );
     if( aServiceNames.getLength() == 0 )
@@ -838,7 +786,7 @@ Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames()
     return aServiceNames;
 }
 
-sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification()
 {
     bool retVal= true;
     if( isOneInstance() && isInstance())
@@ -876,27 +824,20 @@ public:
         {}
 
     // XSingleServiceFactory
-    Reference<XInterface > SAL_CALL createInstance()
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments)
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    Reference<XInterface > SAL_CALL createInstance() override;
+    Reference<XInterface > SAL_CALL createInstanceWithArguments(const Sequence<Any>& Arguments) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw(css::uno::RuntimeException, std::exception) override;
-    Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     //XUnloadingPreference
-    sal_Bool SAL_CALL releaseOnNotification()
-        throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL releaseOnNotification() override;
 
 };
 
 // XSingleServiceFactory
 Reference<XInterface > OFactoryProxyHelper::createInstance()
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return xFactory->createInstance();
 }
@@ -906,14 +847,12 @@ Reference<XInterface > OFactoryProxyHelper::createInstanceWithArguments
 (
     const Sequence<Any>& Arguments
 )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return xFactory->createInstanceWithArguments( Arguments );
 }
 
 // XServiceInfo
 OUString OFactoryProxyHelper::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     Reference<XServiceInfo > xInfo( xFactory, UNO_QUERY  );
     if( xInfo.is() )
@@ -923,14 +862,12 @@ OUString OFactoryProxyHelper::getImplementationName()
 
 // XServiceInfo
 sal_Bool OFactoryProxyHelper::supportsService(const OUString& ServiceName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
 Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     Reference<XServiceInfo > xInfo( xFactory, UNO_QUERY  );
     if( xInfo.is() )
@@ -938,7 +875,7 @@ Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames()
     return Sequence< OUString >();
 }
 
-sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFactoryProxyHelper::releaseOnNotification()
 {
 
     Reference<XUnloadingPreference> pref( xFactory, UNO_QUERY);
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 32526450b8b8..6118ccb79fc1 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -49,7 +49,6 @@ void WeakComponentImplHelperBase::disposing()
 }
 
 Any WeakComponentImplHelperBase::queryInterface( Type const & rType )
-    throw (RuntimeException, std::exception)
 {
     if (rType == cppu::UnoType<lang::XComponent>::get())
     {
@@ -90,7 +89,6 @@ void WeakComponentImplHelperBase::release()
 }
 
 void WeakComponentImplHelperBase::dispose()
-    throw (RuntimeException, std::exception)
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
     if (!rBHelper.bDisposed && !rBHelper.bInDispose)
@@ -133,7 +131,6 @@ void WeakComponentImplHelperBase::dispose()
 
 void WeakComponentImplHelperBase::addEventListener(
     Reference< lang::XEventListener > const & xListener )
-    throw (RuntimeException, std::exception)
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
     if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -150,7 +147,6 @@ void WeakComponentImplHelperBase::addEventListener(
 
 void WeakComponentImplHelperBase::removeEventListener(
     Reference< lang::XEventListener > const & xListener )
-    throw (RuntimeException, std::exception)
 {
     rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
@@ -171,13 +167,11 @@ void WeakAggComponentImplHelperBase::disposing()
 }
 
 Any WeakAggComponentImplHelperBase::queryInterface( Type const & rType )
-    throw (RuntimeException, std::exception)
 {
     return OWeakAggObject::queryInterface( rType );
 }
 
 Any WeakAggComponentImplHelperBase::queryAggregation( Type const & rType )
-    throw (RuntimeException, std::exception)
 {
     if (rType == cppu::UnoType<lang::XComponent>::get())
     {
@@ -222,7 +216,6 @@ void WeakAggComponentImplHelperBase::release()
 }
 
 void WeakAggComponentImplHelperBase::dispose()
-    throw (RuntimeException, std::exception)
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
     if (!rBHelper.bDisposed && !rBHelper.bInDispose)
@@ -265,7 +258,6 @@ void WeakAggComponentImplHelperBase::dispose()
 
 void WeakAggComponentImplHelperBase::addEventListener(
     Reference< lang::XEventListener > const & xListener )
-    throw (RuntimeException, std::exception)
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
     if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -282,7 +274,6 @@ void WeakAggComponentImplHelperBase::addEventListener(
 
 void WeakAggComponentImplHelperBase::removeEventListener(
     Reference< lang::XEventListener > const & xListener )
-    throw (RuntimeException, std::exception)
 {
     // if we have disposed, then we have cleared the list already
     MutexGuard aGuard( rBHelper.rMutex );
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 923ee4d67dc8..8180065b2207 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -131,15 +131,11 @@ public:
         {}
 
     // XMacroExpander impl
-    virtual OUString SAL_CALL expandMacros( OUString const & exp )
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL expandMacros( OUString const & exp ) override;
     // XServiceInfo impl
-    virtual OUString SAL_CALL getImplementationName()
-        throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -149,19 +145,16 @@ void Bootstrap_MacroExpander::disposing()
 // XServiceInfo impl
 
 OUString Bootstrap_MacroExpander::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return s_impl_name();
 }
 
 sal_Bool Bootstrap_MacroExpander::supportsService( OUString const & serviceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return s_get_service_names();
 }
@@ -169,7 +162,6 @@ Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames()
 // XMacroExpander impl
 
 OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     return cppuhelper::detail::expandMacros( exp );
 }
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index 30aa0b90d822..c6de17a7d23b 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -279,23 +279,18 @@ class Info: public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {
 public:
     explicit Info(Data * data): m_data(data) {}
 
-    virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
 
     virtual css::beans::Property SAL_CALL getPropertyByName(
-        rtl::OUString const & name)
-        throw (
-            css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+        rtl::OUString const & name) override;
 
-    virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & name)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & name) override;
 
 private:
     rtl::Reference< Data > m_data;
 };
 
 css::uno::Sequence< css::beans::Property > Info::getProperties()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(m_data->properties.size() <= SAL_MAX_INT32);
     css::uno::Sequence< css::beans::Property > s(
@@ -313,14 +308,12 @@ css::uno::Sequence< css::beans::Property > Info::getProperties()
 }
 
 css::beans::Property Info::getPropertyByName(rtl::OUString const & name)
-    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
 {
     return m_data->get(static_cast< cppu::OWeakObject * >(this), name)->
         second.property;
 }
 
 sal_Bool Info::hasPropertyByName(rtl::OUString const & name)
-    throw (css::uno::RuntimeException, std::exception)
 {
     Data::PropertyMap::iterator i(m_data->properties.find(name));
     return i != m_data->properties.end() && i->second.present;
@@ -954,7 +947,6 @@ void PropertySetMixinImpl::dispose() {
 }
 
 css::uno::Any PropertySetMixinImpl::queryInterface(css::uno::Type const & type)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (((m_impl->implements & IMPLEMENTS_PROPERTY_SET) != 0
          && type == css::beans::XPropertySet::static_type()))
@@ -981,17 +973,12 @@ css::uno::Any PropertySetMixinImpl::queryInterface(css::uno::Type const & type)
 
 css::uno::Reference< css::beans::XPropertySetInfo >
 PropertySetMixinImpl::getPropertySetInfo()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return new Info(m_impl);
 }
 
 void PropertySetMixinImpl::setPropertyValue(
     rtl::OUString const & propertyName, css::uno::Any const & value)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     m_impl->setProperty(
         static_cast< css::beans::XPropertySet * >(this), propertyName, value,
@@ -1000,9 +987,6 @@ void PropertySetMixinImpl::setPropertyValue(
 
 css::uno::Any PropertySetMixinImpl::getPropertyValue(
     rtl::OUString const & propertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     return m_impl->getProperty(
         static_cast< css::beans::XPropertySet * >(this), propertyName, nullptr);
@@ -1011,9 +995,6 @@ css::uno::Any PropertySetMixinImpl::getPropertyValue(
 void PropertySetMixinImpl::addPropertyChangeListener(
     rtl::OUString const & propertyName,
     css::uno::Reference< css::beans::XPropertyChangeListener > const & listener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::beans::XPropertyChangeListener >(
         listener, css::uno::UNO_SET_THROW); // reject NULL listener
@@ -1036,9 +1017,6 @@ void PropertySetMixinImpl::addPropertyChangeListener(
 void PropertySetMixinImpl::removePropertyChangeListener(
     rtl::OUString const & propertyName,
     css::uno::Reference< css::beans::XPropertyChangeListener > const & listener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(listener.is());
     checkUnknown(propertyName);
@@ -1056,9 +1034,6 @@ void PropertySetMixinImpl::removePropertyChangeListener(
 void PropertySetMixinImpl::addVetoableChangeListener(
     rtl::OUString const & propertyName,
     css::uno::Reference< css::beans::XVetoableChangeListener > const & listener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::beans::XVetoableChangeListener >(
         listener, css::uno::UNO_SET_THROW); // reject NULL listener
@@ -1081,9 +1056,6 @@ void PropertySetMixinImpl::addVetoableChangeListener(
 void PropertySetMixinImpl::removeVetoableChangeListener(
     rtl::OUString const & propertyName,
     css::uno::Reference< css::beans::XVetoableChangeListener > const & listener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     assert(listener.is());
     checkUnknown(propertyName);
@@ -1099,10 +1071,6 @@ void PropertySetMixinImpl::removeVetoableChangeListener(
 
 void PropertySetMixinImpl::setFastPropertyValue(
     sal_Int32 handle, css::uno::Any const & value)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     m_impl->setProperty(
         static_cast< css::beans::XPropertySet * >(this),
@@ -1112,9 +1080,6 @@ void PropertySetMixinImpl::setFastPropertyValue(
 }
 
 css::uno::Any PropertySetMixinImpl::getFastPropertyValue(sal_Int32 handle)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     return m_impl->getProperty(
         static_cast< css::beans::XPropertySet * >(this),
@@ -1125,7 +1090,6 @@ css::uno::Any PropertySetMixinImpl::getFastPropertyValue(sal_Int32 handle)
 
 css::uno::Sequence< css::beans::PropertyValue >
 PropertySetMixinImpl::getPropertyValues()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< css::beans::PropertyValue > s(
         m_impl->handleMap.getLength());
@@ -1152,10 +1116,6 @@ PropertySetMixinImpl::getPropertyValues()
 
 void PropertySetMixinImpl::setPropertyValues(
     css::uno::Sequence< css::beans::PropertyValue > const & props)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     for (sal_Int32 i = 0; i < props.getLength(); ++i) {
         if (props[i].Handle != -1
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 1ada97639738..bb375dd2a42c 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -79,9 +79,9 @@ public:
     explicit OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ );
 
     // XPropertySetInfo-methods
-    virtual Sequence< Property > SAL_CALL getProperties() throw(css::uno::RuntimeException, std::exception) override;
-    virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(css::uno::RuntimeException, std::exception) override;
+    virtual Sequence< Property > SAL_CALL getProperties() override;
+    virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) override;
 };
 
 
@@ -97,7 +97,7 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl(
 /**
  * Return the sequence of properties, which are provided through the constructor.
  */
-Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(css::uno::RuntimeException, std::exception)
+Sequence< Property > OPropertySetHelperInfo_Impl::getProperties()
 {
     return aInfos;
 }
@@ -105,7 +105,7 @@ Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(css::uno
 /**
  * Return the sequence of properties, which are provided through the constructor.
  */
-Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName )
 {
     Property * pR;
     pR = static_cast<Property *>(bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(),
@@ -121,7 +121,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & Proper
 /**
  * Return the sequence of properties, which are provided through the constructor.
  */
-sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName )
 {
     Property * pR;
     pR = static_cast<Property *>(bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(),
@@ -207,7 +207,6 @@ OPropertySetHelper2::~OPropertySetHelper2()
 
 // XInterface
 Any OPropertySetHelper::queryInterface( const css::uno::Type & rType )
-    throw (RuntimeException, std::exception)
 {
     return ::cppu::queryInterface(
         rType,
@@ -217,7 +216,6 @@ Any OPropertySetHelper::queryInterface( const css::uno::Type & rType )
 }
 
 Any OPropertySetHelper2::queryInterface( const css::uno::Type & rType )
-    throw (RuntimeException, std::exception)
 {
     Any cnd(cppu::queryInterface(rType, static_cast< XPropertySetOption * >(this)));
     if ( cnd.hasValue() )
@@ -230,7 +228,6 @@ Any OPropertySetHelper2::queryInterface( const css::uno::Type & rType )
  * called from the derivee's XTypeProvider::getTypes implementation
  */
 css::uno::Sequence< css::uno::Type > OPropertySetHelper::getTypes()
-    throw (RuntimeException)
 {
     return css::uno::Sequence<css::uno::Type>({
         UnoType<css::beans::XPropertySet>::get(),
@@ -261,7 +258,6 @@ Reference < XPropertySetInfo > OPropertySetHelper::createPropertySetInfo(
 // XPropertySet
 void OPropertySetHelper::setPropertyValue(
     const OUString& rPropertyName, const Any& rValue )
-    throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     // get the map table
     IPropertyArrayHelper & rPH = getInfoHelper();
@@ -274,7 +270,6 @@ void OPropertySetHelper::setPropertyValue(
 // XPropertySet
 Any OPropertySetHelper::getPropertyValue(
     const OUString& rPropertyName )
-    throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     // get the map table
     IPropertyArrayHelper & rPH = getInfoHelper();
@@ -288,9 +283,6 @@ Any OPropertySetHelper::getPropertyValue(
 void OPropertySetHelper::addPropertyChangeListener(
     const OUString& rPropertyName,
     const Reference < XPropertyChangeListener > & rxListener )
-     throw(css::beans::UnknownPropertyException,
-           css::lang::WrappedTargetException,
-           css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( rBHelper.rMutex );
     OSL_ENSURE( !rBHelper.bInDispose, "do not addPropertyChangeListener in the dispose call" );
@@ -336,9 +328,6 @@ void OPropertySetHelper::addPropertyChangeListener(
 void OPropertySetHelper::removePropertyChangeListener(
     const OUString& rPropertyName,
     const Reference < XPropertyChangeListener >& rxListener )
-    throw(css::beans::UnknownPropertyException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( rBHelper.rMutex );
     OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -370,9 +359,6 @@ void OPropertySetHelper::removePropertyChangeListener(
 void OPropertySetHelper::addVetoableChangeListener(
     const OUString& rPropertyName,
     const Reference< XVetoableChangeListener > & rxListener )
-    throw(css::beans::UnknownPropertyException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( rBHelper.rMutex );
     OSL_ENSURE( !rBHelper.bInDispose, "do not addVetoableChangeListener in the dispose call" );
@@ -416,9 +402,6 @@ void OPropertySetHelper::addVetoableChangeListener(
 void OPropertySetHelper::removeVetoableChangeListener(
     const OUString& rPropertyName,
     const Reference < XVetoableChangeListener > & rxListener )
-    throw(css::beans::UnknownPropertyException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( rBHelper.rMutex );
     OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -500,11 +483,6 @@ void OPropertySetHelper::setDependentFastPropertyValue( sal_Int32 i_handle, cons
 
 // XFastPropertySet
 void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
-     throw(css::beans::UnknownPropertyException,
-           css::beans::PropertyVetoException,
-           css::lang::IllegalArgumentException,
-           css::lang::WrappedTargetException,
-           css::uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( !rBHelper.bInDispose, "do not setFastPropertyValue in the dispose call" );
     OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
@@ -570,9 +548,6 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
 
 // XFastPropertySet
 Any OPropertySetHelper::getFastPropertyValue( sal_Int32 nHandle )
-     throw(css::beans::UnknownPropertyException,
-           css::lang::WrappedTargetException,
-           css::uno::RuntimeException, std::exception)
 
 {
     IPropertyArrayHelper & rInfo = getInfoHelper();
@@ -897,7 +872,6 @@ void OPropertySetHelper::setFastPropertyValues(
 void OPropertySetHelper::setPropertyValues(
     const Sequence<OUString>& rPropertyNames,
     const Sequence<Any>& rValues )
-    throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
         sal_Int32   nSeqLen = rPropertyNames.getLength();
         std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ nSeqLen ]);
@@ -911,7 +885,6 @@ void OPropertySetHelper::setPropertyValues(
 
 // XMultiPropertySet
 Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& rPropertyNames )
-    throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32   nSeqLen = rPropertyNames.getLength();
     std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ nSeqLen ]);
@@ -936,7 +909,6 @@ Sequence<Any> OPropertySetHelper::getPropertyValues( const Sequence<OUString>& r
 void OPropertySetHelper::addPropertiesChangeListener(
     const Sequence<OUString> & ,
     const Reference < XPropertiesChangeListener > & rListener )
-    throw(css::uno::RuntimeException, std::exception)
 {
     rBHelper.addListener( cppu::UnoType<decltype(rListener)>::get(), rListener );
 }
@@ -944,7 +916,6 @@ void OPropertySetHelper::addPropertiesChangeListener(
 // XMultiPropertySet
 void OPropertySetHelper::removePropertiesChangeListener(
     const Reference < XPropertiesChangeListener > & rListener )
-    throw(css::uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener( cppu::UnoType<decltype(rListener)>::get(), rListener );
 }
@@ -953,7 +924,6 @@ void OPropertySetHelper::removePropertiesChangeListener(
 void OPropertySetHelper::firePropertiesChangeEvent(
     const Sequence<OUString>& rPropertyNames,
     const Reference < XPropertiesChangeListener >& rListener )
-    throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nLen = rPropertyNames.getLength();
     std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[nLen]);
@@ -995,7 +965,6 @@ void OPropertySetHelper::firePropertiesChangeEvent(
 }
 
 void OPropertySetHelper2::enableChangeListenerNotification( sal_Bool bEnable )
-    throw(css::uno::RuntimeException, std::exception)
 {
     m_pReserved->m_bFireEvents = bEnable;
 }
@@ -1111,7 +1080,6 @@ Sequence< Property > OPropertyArrayHelper::getProperties()
 
 
 Property OPropertyArrayHelper::getPropertyByName(const OUString& aPropertyName)
-        throw (UnknownPropertyException)
 {
     Property * pR;
     pR = static_cast<Property *>(bsearch( &aPropertyName, aInfos.getConstArray(), aInfos.getLength(),
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 6d2321c3b9b1..1fd8bba105c1 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -450,13 +450,9 @@ public:
 private:
     virtual ~ContentEnumeration() override {}
 
-    virtual sal_Bool SAL_CALL hasMoreElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
 
-    virtual css::uno::Any SAL_CALL nextElement()
-        throw (
-            css::container::NoSuchElementException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
     osl::Mutex mutex_;
     std::vector< css::uno::Any > factories_;
@@ -464,16 +460,12 @@ private:
 };
 
 sal_Bool ContentEnumeration::hasMoreElements()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(mutex_);
     return iterator_ != factories_.end();
 }
 
 css::uno::Any ContentEnumeration::nextElement()
-    throw (
-        css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(mutex_);
     if (iterator_ == factories_.end()) {
@@ -511,14 +503,12 @@ private:
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithContext(
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uno::XComponentContext > const & Context) override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithArgumentsAndContext(
         css::uno::Sequence< css::uno::Any > const & Arguments,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uno::XComponentContext > const & Context) override;
 
     rtl::Reference< cppuhelper::ServiceManager > manager_;
     std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation >
@@ -528,7 +518,6 @@ private:
 css::uno::Reference< css::uno::XInterface >
 SingletonFactory::createInstanceWithContext(
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     manager_->loadImplementation(Context, implementation_);
     return implementation_->createInstance(Context, true);
@@ -538,7 +527,6 @@ css::uno::Reference< css::uno::XInterface >
 SingletonFactory::createInstanceWithArgumentsAndContext(
     css::uno::Sequence< css::uno::Any > const & Arguments,
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     manager_->loadImplementation(Context, implementation_);
     return implementation_->createInstanceWithArguments(
@@ -567,31 +555,26 @@ private:
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithContext(
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uno::XComponentContext > const & Context) override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithArgumentsAndContext(
         css::uno::Sequence< css::uno::Any > const & Arguments,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uno::XComponentContext > const & Context) override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    createInstance() override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithArguments(
-        css::uno::Sequence< css::uno::Any > const & Arguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< css::uno::Any > const & Arguments) override;
 
-    virtual rtl::OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual rtl::OUString SAL_CALL getImplementationName() override;
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override;
 
     virtual css::uno::Sequence< rtl::OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
     rtl::Reference< cppuhelper::ServiceManager > manager_;
     std::weak_ptr< cppuhelper::ServiceManager::Data::Implementation >
@@ -601,7 +584,6 @@ private:
 css::uno::Reference< css::uno::XInterface >
 ImplementationWrapper::createInstanceWithContext(
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
     assert(impl);
@@ -613,7 +595,6 @@ css::uno::Reference< css::uno::XInterface >
 ImplementationWrapper::createInstanceWithArgumentsAndContext(
     css::uno::Sequence< css::uno::Any > const & Arguments,
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
     assert(impl);
@@ -624,7 +605,6 @@ ImplementationWrapper::createInstanceWithArgumentsAndContext(
 
 css::uno::Reference< css::uno::XInterface >
 ImplementationWrapper::createInstance()
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithContext(manager_->getContext());
 }
@@ -632,14 +612,12 @@ ImplementationWrapper::createInstance()
 css::uno::Reference< css::uno::XInterface >
 ImplementationWrapper::createInstanceWithArguments(
     css::uno::Sequence< css::uno::Any > const & Arguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArgumentsAndContext(
         Arguments, manager_->getContext());
 }
 
 rtl::OUString ImplementationWrapper::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
     assert(impl);
@@ -647,14 +625,12 @@ rtl::OUString ImplementationWrapper::getImplementationName()
 }
 
 sal_Bool ImplementationWrapper::supportsService(rtl::OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< rtl::OUString >
 ImplementationWrapper::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     std::shared_ptr< cppuhelper::ServiceManager::Data::Implementation > impl = implementation_.lock();
     assert(impl);
@@ -934,7 +910,6 @@ void cppuhelper::ServiceManager::disposing() {
 
 void cppuhelper::ServiceManager::initialize(
     css::uno::Sequence<css::uno::Any> const & aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     OUString arg;
     if (aArguments.getLength() == 1 && (aArguments[0] >>= arg)
@@ -949,7 +924,6 @@ void cppuhelper::ServiceManager::initialize(
 }
 
 rtl::OUString cppuhelper::ServiceManager::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return rtl::OUString(
         "com.sun.star.comp.cppuhelper.bootstrap.ServiceManager");
@@ -957,14 +931,12 @@ rtl::OUString cppuhelper::ServiceManager::getImplementationName()
 
 sal_Bool cppuhelper::ServiceManager::supportsService(
     rtl::OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< rtl::OUString >
 cppuhelper::ServiceManager::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< rtl::OUString > names(2);
     names[0] = "com.sun.star.lang.MultiServiceFactory";
@@ -975,7 +947,6 @@ cppuhelper::ServiceManager::getSupportedServiceNames()
 css::uno::Reference< css::uno::XInterface >
 cppuhelper::ServiceManager::createInstance(
     rtl::OUString const & aServiceSpecifier)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     assert(context_.is());
     return createInstanceWithContext(aServiceSpecifier, context_);
@@ -985,7 +956,6 @@ css::uno::Reference< css::uno::XInterface >
 cppuhelper::ServiceManager::createInstanceWithArguments(
     rtl::OUString const & ServiceSpecifier,
     css::uno::Sequence< css::uno::Any > const & Arguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     assert(context_.is());
     return createInstanceWithArgumentsAndContext(
@@ -994,7 +964,6 @@ cppuhelper::ServiceManager::createInstanceWithArguments(
 
 css::uno::Sequence< rtl::OUString >
 cppuhelper::ServiceManager::getAvailableServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(rBHelper.rMutex);
     if (isDisposed()) {
@@ -1021,7 +990,6 @@ css::uno::Reference< css::uno::XInterface >
 cppuhelper::ServiceManager::createInstanceWithContext(
     rtl::OUString const & aServiceSpecifier,
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     std::shared_ptr< Data::Implementation > impl(
         findServiceImplementation(Context, aServiceSpecifier));
@@ -1035,7 +1003,6 @@ cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext(
     rtl::OUString const & ServiceSpecifier,
     css::uno::Sequence< css::uno::Any > const & Arguments,
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     std::shared_ptr< Data::Implementation > impl(
         findServiceImplementation(Context, ServiceSpecifier));
@@ -1045,13 +1012,11 @@ cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext(
 }
 
 css::uno::Type cppuhelper::ServiceManager::getElementType()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Type();
 }
 
 sal_Bool cppuhelper::ServiceManager::hasElements()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(rBHelper.rMutex);
     return
@@ -1061,7 +1026,6 @@ sal_Bool cppuhelper::ServiceManager::hasElements()
 
 css::uno::Reference< css::container::XEnumeration >
 cppuhelper::ServiceManager::createEnumeration()
-    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "ServiceManager createEnumeration: method not supported",
@@ -1069,7 +1033,6 @@ cppuhelper::ServiceManager::createEnumeration()
 }
 
 sal_Bool cppuhelper::ServiceManager::has(css::uno::Any const &)
-    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "ServiceManager has: method not supported",
@@ -1077,9 +1040,6 @@ sal_Bool cppuhelper::ServiceManager::has(css::uno::Any const &)
 }
 
 void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement)
-    throw (
-        css::lang::IllegalArgumentException,
-        css::container::ElementExistException, css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< css::beans::NamedValue > args;
     if (aElement >>= args) {
@@ -1143,9 +1103,6 @@ void cppuhelper::ServiceManager::insert(css::uno::Any const & aElement)
 }
 
 void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
-    throw (
-        css::lang::IllegalArgumentException,
-        css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< css::beans::NamedValue > args;
     if (aElement >>= args) {
@@ -1190,7 +1147,6 @@ void cppuhelper::ServiceManager::remove(css::uno::Any const & aElement)
 css::uno::Reference< css::container::XEnumeration >
 cppuhelper::ServiceManager::createContentEnumeration(
     rtl::OUString const & aServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     std::vector< std::shared_ptr< Data::Implementation > > impls;
     {
@@ -1241,17 +1197,12 @@ cppuhelper::ServiceManager::createContentEnumeration(
 
 css::uno::Reference< css::beans::XPropertySetInfo >
 cppuhelper::ServiceManager::getPropertySetInfo()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return this;
 }
 
 void cppuhelper::ServiceManager::setPropertyValue(
     rtl::OUString const & aPropertyName, css::uno::Any const &)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if (aPropertyName == "DefaultContext") {
         throw css::beans::PropertyVetoException(
@@ -1264,9 +1215,6 @@ void cppuhelper::ServiceManager::setPropertyValue(
 
 css::uno::Any cppuhelper::ServiceManager::getPropertyValue(
     rtl::OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if (PropertyName != "DefaultContext") {
         throw css::beans::UnknownPropertyException(
@@ -1280,9 +1228,6 @@ void cppuhelper::ServiceManager::addPropertyChangeListener(
     rtl::OUString const & aPropertyName,
     css::uno::Reference< css::beans::XPropertyChangeListener > const &
         xListener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if (!aPropertyName.isEmpty() && aPropertyName != "DefaultContext") {
         throw css::beans::UnknownPropertyException(
@@ -1296,9 +1241,6 @@ void cppuhelper::ServiceManager::removePropertyChangeListener(
     rtl::OUString const & aPropertyName,
     css::uno::Reference< css::beans::XPropertyChangeListener > const &
         aListener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if (!aPropertyName.isEmpty() && aPropertyName != "DefaultContext") {
         throw css::beans::UnknownPropertyException(
@@ -1312,9 +1254,6 @@ void cppuhelper::ServiceManager::addVetoableChangeListener(
     rtl::OUString const & PropertyName,
     css::uno::Reference< css::beans::XVetoableChangeListener > const &
         aListener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if (!PropertyName.isEmpty() && PropertyName != "DefaultContext") {
         throw css::beans::UnknownPropertyException(
@@ -1328,9 +1267,6 @@ void cppuhelper::ServiceManager::removeVetoableChangeListener(
     rtl::OUString const & PropertyName,
     css::uno::Reference< css::beans::XVetoableChangeListener > const &
         aListener)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if (!PropertyName.isEmpty() && PropertyName != "DefaultContext") {
         throw css::beans::UnknownPropertyException(
@@ -1341,7 +1277,7 @@ void cppuhelper::ServiceManager::removeVetoableChangeListener(
 }
 
 css::uno::Sequence< css::beans::Property >
-cppuhelper::ServiceManager::getProperties() throw (css::uno::RuntimeException, std::exception) {
+cppuhelper::ServiceManager::getProperties() {
     css::uno::Sequence< css::beans::Property > props(1);
     props[0] = getDefaultContextProperty();
     return props;
@@ -1349,7 +1285,6 @@ cppuhelper::ServiceManager::getProperties() throw (css::uno::RuntimeException, s
 
 css::beans::Property cppuhelper::ServiceManager::getPropertyByName(
     rtl::OUString const & aName)
-    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
 {
     if (aName != "DefaultContext") {
         throw css::beans::UnknownPropertyException(
@@ -1360,7 +1295,6 @@ css::beans::Property cppuhelper::ServiceManager::getPropertyByName(
 
 sal_Bool cppuhelper::ServiceManager::hasPropertyByName(
     rtl::OUString const & Name)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return Name == "DefaultContext";
 }
@@ -1369,7 +1303,6 @@ cppuhelper::ServiceManager::~ServiceManager() {}
 
 void cppuhelper::ServiceManager::disposing(
     css::lang::EventObject const & Source)
-    throw (css::uno::RuntimeException, std::exception)
 {
     removeLegacyFactory(
         css::uno::Reference< css::lang::XServiceInfo >(
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index 5f6efd094dd5..1252b9dab37f 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -225,132 +225,91 @@ private:
 
     virtual void SAL_CALL disposing() override;
 
-    virtual rtl::OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual rtl::OUString SAL_CALL getImplementationName() override;
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override;
 
     virtual css::uno::Sequence< rtl::OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
-        rtl::OUString const & aServiceSpecifier)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        rtl::OUString const & aServiceSpecifier) override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithArguments(
         rtl::OUString const & ServiceSpecifier,
-        css::uno::Sequence< css::uno::Any > const & Arguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< css::uno::Any > const & Arguments) override;
 
     virtual css::uno::Sequence< rtl::OUString > SAL_CALL
-    getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    getAvailableServiceNames() override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithContext(
         rtl::OUString const & aServiceSpecifier,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uno::XComponentContext > const & Context) override;
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithArgumentsAndContext(
         rtl::OUString const & ServiceSpecifier,
         css::uno::Sequence< css::uno::Any > const & Arguments,
-        css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uno::XComponentContext > const & Context) override;
 
-    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;
 
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-    createEnumeration() throw (css::uno::RuntimeException, std::exception) override;
+    createEnumeration() override;
 
-    virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement) override;
 
-    virtual void SAL_CALL insert(css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insert(css::uno::Any const & aElement) override;
 
-    virtual void SAL_CALL remove(css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL remove(css::uno::Any const & aElement) override;
 
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-    createContentEnumeration(rtl::OUString const & aServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    createContentEnumeration(rtl::OUString const & aServiceName) override;
 
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
+    getPropertySetInfo() override;
 
     virtual void SAL_CALL setPropertyValue(
-        rtl::OUString const & aPropertyName, css::uno::Any const & aValue)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        rtl::OUString const & aPropertyName, css::uno::Any const & aValue) override;
 
     virtual css::uno::Any SAL_CALL getPropertyValue(
-        rtl::OUString const & PropertyName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        rtl::OUString const & PropertyName) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
         rtl::OUString const & aPropertyName,
         css::uno::Reference< css::beans::XPropertyChangeListener > const &
-            xListener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            xListener) override;
 
     virtual void SAL_CALL removePropertyChangeListener(
         rtl::OUString const & aPropertyName,
         css::uno::Reference< css::beans::XPropertyChangeListener > const &
-            aListener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            aListener) override;
 
     virtual void SAL_CALL addVetoableChangeListener(
         rtl::OUString const & PropertyName,
         css::uno::Reference< css::beans::XVetoableChangeListener > const &
-            aListener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            aListener) override;
 
     virtual void SAL_CALL removeVetoableChangeListener(
         rtl::OUString const & PropertyName,
         css::uno::Reference< css::beans::XVetoableChangeListener > const &
-            aListener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            aListener) override;
 
-    virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
 
     virtual css::beans::Property SAL_CALL getPropertyByName(
-        rtl::OUString const & aName)
-        throw (
-            css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+        rtl::OUString const & aName) override;
 
-    virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName(rtl::OUString const & Name) override;
 
-    virtual void SAL_CALL disposing(css::lang::EventObject const & Source)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(css::lang::EventObject const & Source) override;
 
     virtual void SAL_CALL initialize(
         css::uno::Sequence<css::uno::Any> const & aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
         override;
 
     // needs to be called with rBHelper.rMutex locked:
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 38c53759b3ed..02da05163732 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -615,12 +615,10 @@ public:
         {}
 
     // XEventListener
-    virtual void SAL_CALL disposing( lang::EventObject const & rEvt )
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( lang::EventObject const & rEvt ) override;
 };
 
 void EventListenerImpl::disposing( lang::EventObject const & rEvt )
-    throw (RuntimeException, std::exception)
 {
     if (rEvt.Source != m_xTDMgr) {
         OSL_ASSERT(false);
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index baa421996e05..54e5cd972301 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -91,11 +91,10 @@ public:
 private:
     virtual ~SimpleTypeDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return typeClass_; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     css::uno::TypeClass typeClass_;
@@ -115,15 +114,14 @@ public:
 private:
     virtual ~SequenceTypeDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_SEQUENCE; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getReferencedType() throw (css::uno::RuntimeException, std::exception) override
+    getReferencedType() override
     { return manager_->resolve(componentType_); }
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -140,7 +138,7 @@ protected:
     virtual ~PublishableDescription() override {}
 
 private:
-    virtual sal_Bool SAL_CALL isPublished() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isPublished() override
     { return published_; }
 
     bool published_;
@@ -160,17 +158,16 @@ public:
 private:
     virtual ~ModuleDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_MODULE; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getMembers() override;
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
     rtl::OUString name_;
@@ -178,7 +175,7 @@ private:
 };
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-ModuleDescription::getMembers() throw (css::uno::RuntimeException, std::exception) {
+ModuleDescription::getMembers() {
     try {
         std::vector< rtl::OUString > names(entity_->getMemberNames());
         assert(names.size() <= SAL_MAX_INT32);
@@ -212,29 +209,24 @@ public:
 private:
     virtual ~EnumTypeDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_ENUM; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
-    virtual sal_Int32 SAL_CALL getDefaultEnumValue()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getDefaultEnumValue() override
     { return entity_->getMembers()[0].value; }
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getEnumNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getEnumNames() override;
 
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getEnumValues()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getEnumValues() override;
 
     rtl::OUString name_;
     rtl::Reference< unoidl::EnumTypeEntity > entity_;
 };
 
 css::uno::Sequence< rtl::OUString > EnumTypeDescription::getEnumNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -246,7 +238,6 @@ css::uno::Sequence< rtl::OUString > EnumTypeDescription::getEnumNames()
 }
 
 css::uno::Sequence< sal_Int32 > EnumTypeDescription::getEnumValues()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -274,15 +265,14 @@ public:
 private:
     virtual ~PlainStructTypeDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_STRUCT; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getBaseType() throw (css::uno::RuntimeException, std::exception) override {
+    getBaseType() override {
         return entity_->getDirectBase().isEmpty()
             ? css::uno::Reference< css::reflection::XTypeDescription >()
             : manager_->resolve(entity_->getDirectBase());
@@ -291,19 +281,17 @@ private:
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getMemberTypes() override;
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override
     { return css::uno::Sequence< rtl::OUString >(); }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override {
+    SAL_CALL getTypeArguments() override {
         return css::uno::Sequence<
             css::uno::Reference< css::reflection::XTypeDescription > >();
     }
@@ -314,7 +302,7 @@ private:
 };
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-PlainStructTypeDescription::getMemberTypes() throw (css::uno::RuntimeException, std::exception)
+PlainStructTypeDescription::getMemberTypes()
 {
     assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
@@ -327,7 +315,6 @@ PlainStructTypeDescription::getMemberTypes() throw (css::uno::RuntimeException,
 }
 
 css::uno::Sequence< rtl::OUString > PlainStructTypeDescription::getMemberNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
@@ -350,11 +337,10 @@ public:
 private:
     virtual ~ParameterizedMemberTypeDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_UNKNOWN; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return typeParameterName_; }
 
     rtl::OUString typeParameterName_;
@@ -380,32 +366,29 @@ public:
 private:
     virtual ~PolymorphicStructTypeTemplateDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_STRUCT; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getBaseType() throw (css::uno::RuntimeException, std::exception) override
+    getBaseType() override
     { return css::uno::Reference< css::reflection::XTypeDescription >(); }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getMemberTypes() override;
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override {
+    SAL_CALL getTypeArguments() override {
         return css::uno::Sequence<
             css::uno::Reference< css::reflection::XTypeDescription > >();
     }
@@ -417,7 +400,6 @@ private:
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
 PolymorphicStructTypeTemplateDescription::getMemberTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -434,7 +416,6 @@ PolymorphicStructTypeTemplateDescription::getMemberTypes()
 
 css::uno::Sequence< rtl::OUString >
 PolymorphicStructTypeTemplateDescription::getMemberNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -447,7 +428,6 @@ PolymorphicStructTypeTemplateDescription::getMemberNames()
 
 css::uno::Sequence< rtl::OUString >
 PolymorphicStructTypeTemplateDescription::getTypeParameters()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getTypeParameters().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getTypeParameters().size());
@@ -478,33 +458,30 @@ public:
 private:
     virtual ~InstantiatedPolymorphicStructTypeDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_STRUCT; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getBaseType() throw (css::uno::RuntimeException, std::exception) override
+    getBaseType() override
     { return css::uno::Reference< css::reflection::XTypeDescription >(); }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getMemberTypes() override;
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getTypeParameters() override
     { return css::uno::Sequence< rtl::OUString >(); }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getTypeArguments() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getTypeArguments() override;
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
     rtl::OUString name_;
@@ -514,7 +491,6 @@ private:
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
 InstantiatedPolymorphicStructTypeDescription::getMemberTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -542,7 +518,6 @@ InstantiatedPolymorphicStructTypeDescription::getMemberTypes()
 
 css::uno::Sequence< rtl::OUString >
 InstantiatedPolymorphicStructTypeDescription::getMemberNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
@@ -554,7 +529,6 @@ InstantiatedPolymorphicStructTypeDescription::getMemberNames()
 }
 css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
 InstantiatedPolymorphicStructTypeDescription::getTypeArguments()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(arguments_.size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(arguments_.size());
@@ -583,15 +557,14 @@ public:
 private:
     virtual ~ExceptionTypeDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_EXCEPTION; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getBaseType() throw (css::uno::RuntimeException, std::exception) override {
+    getBaseType() override {
         return entity_->getDirectBase().isEmpty()
             ? css::uno::Reference< css::reflection::XTypeDescription >()
             : manager_->resolve(entity_->getDirectBase());
@@ -600,10 +573,9 @@ private:
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getMemberTypes() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getMemberTypes() override;
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getMemberNames() override;
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
     rtl::OUString name_;
@@ -611,7 +583,7 @@ private:
 };
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-ExceptionTypeDescription::getMemberTypes() throw (css::uno::RuntimeException, std::exception) {
+ExceptionTypeDescription::getMemberTypes() {
     assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
     css::uno::Sequence<
@@ -623,7 +595,6 @@ ExceptionTypeDescription::getMemberTypes() throw (css::uno::RuntimeException, st
 }
 
 css::uno::Sequence< rtl::OUString > ExceptionTypeDescription::getMemberNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getDirectMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getDirectMembers().size());
@@ -651,39 +622,37 @@ public:
 private:
     virtual ~AttributeDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_INTERFACE_ATTRIBUTE; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
-    virtual rtl::OUString SAL_CALL getMemberName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getMemberName() override
     { return attribute_.name; }
 
-    virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getPosition() override
     { return position_; }
 
-    virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isReadOnly() override
     { return attribute_.readOnly; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getType() throw (css::uno::RuntimeException, std::exception) override
+    getType() override
     { return manager_->resolve(attribute_.type); }
 
-    virtual sal_Bool SAL_CALL isBound() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isBound() override
     { return attribute_.bound; }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XCompoundTypeDescription > >
-    SAL_CALL getGetExceptions() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getGetExceptions() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XCompoundTypeDescription > >
-    SAL_CALL getSetExceptions() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getSetExceptions() override;
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
     rtl::OUString name_;
@@ -693,7 +662,7 @@ private:
 
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XCompoundTypeDescription > >
-AttributeDescription::getGetExceptions() throw (css::uno::RuntimeException, std::exception) {
+AttributeDescription::getGetExceptions() {
     assert(attribute_.getExceptions.size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(attribute_.getExceptions.size());
     css::uno::Sequence<
@@ -708,7 +677,7 @@ AttributeDescription::getGetExceptions() throw (css::uno::RuntimeException, std:
 
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XCompoundTypeDescription > >
-AttributeDescription::getSetExceptions() throw (css::uno::RuntimeException, std::exception) {
+AttributeDescription::getSetExceptions() {
     assert(attribute_.setExceptions.size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(attribute_.setExceptions.size());
     css::uno::Sequence<
@@ -735,14 +704,14 @@ public:
 private:
     virtual ~MethodParameter() override {}
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return parameter_.name; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getType() throw (css::uno::RuntimeException, std::exception) override
+    getType() override
     { return manager_->resolve(parameter_.type); }
 
-    virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) override {
+    virtual sal_Bool SAL_CALL isIn() override {
         return
             (parameter_.direction
              == unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_IN)
@@ -751,7 +720,7 @@ private:
                     DIRECTION_IN_OUT);
     }
 
-    virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) override {
+    virtual sal_Bool SAL_CALL isOut() override {
         return
             (parameter_.direction
              == unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_OUT)
@@ -760,7 +729,7 @@ private:
                     DIRECTION_IN_OUT);
     }
 
-    virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getPosition() override
     { return position_; }
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -783,36 +752,34 @@ public:
 private:
     virtual ~MethodDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_INTERFACE_METHOD; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
-    virtual rtl::OUString SAL_CALL getMemberName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getMemberName() override
     { return method_.name; }
 
-    virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getPosition() override
     { return position_; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getReturnType() throw (css::uno::RuntimeException, std::exception) override
+    getReturnType() override
     { return manager_->resolve(method_.returnType); }
 
-    virtual sal_Bool SAL_CALL isOneway() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isOneway() override
     { return false; }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XMethodParameter > >
-    SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getParameters() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getExceptions() override;
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
     rtl::OUString name_;
@@ -821,7 +788,7 @@ private:
 };
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XMethodParameter > >
-MethodDescription::getParameters() throw (css::uno::RuntimeException, std::exception) {
+MethodDescription::getParameters() {
     assert(method_.parameters.size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(method_.parameters.size());
     css::uno::Sequence<
@@ -833,7 +800,7 @@ MethodDescription::getParameters() throw (css::uno::RuntimeException, std::excep
 }
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-MethodDescription::getExceptions() throw (css::uno::RuntimeException, std::exception) {
+MethodDescription::getExceptions() {
     assert(method_.exceptions.size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(method_.exceptions.size());
     css::uno::Sequence<
@@ -918,38 +885,37 @@ public:
 private:
     virtual ~InterfaceTypeDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_INTERFACE; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getBaseType() throw (css::uno::RuntimeException, std::exception) override {
+    getBaseType() override {
         return entity_->getDirectMandatoryBases().empty()
             ? css::uno::Reference< css::reflection::XTypeDescription >()
             : manager_->resolve(entity_->getDirectMandatoryBases()[0].name);
     }
 
-    virtual css::uno::Uik SAL_CALL getUik() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Uik SAL_CALL getUik() override
     { return css::uno::Uik(); }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference<
              css::reflection::XInterfaceMemberTypeDescription > >
-    SAL_CALL getMembers() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getMembers() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getBaseTypes() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getBaseTypes() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
-    SAL_CALL getOptionalBaseTypes() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getOptionalBaseTypes() override;
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
     rtl::OUString name_;
@@ -958,7 +924,7 @@ private:
 
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XInterfaceMemberTypeDescription > >
-InterfaceTypeDescription::getMembers() throw (css::uno::RuntimeException, std::exception) {
+InterfaceTypeDescription::getMembers() {
     assert(
         entity_->getDirectAttributes().size() <= SAL_MAX_INT32
         && (entity_->getDirectMethods().size()
@@ -984,7 +950,7 @@ InterfaceTypeDescription::getMembers() throw (css::uno::RuntimeException, std::e
 }
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
-InterfaceTypeDescription::getBaseTypes() throw (css::uno::RuntimeException, std::exception) {
+InterfaceTypeDescription::getBaseTypes() {
     assert(entity_->getDirectMandatoryBases().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(
         entity_->getDirectMandatoryBases().size());
@@ -998,7 +964,6 @@ InterfaceTypeDescription::getBaseTypes() throw (css::uno::RuntimeException, std:
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
 InterfaceTypeDescription::getOptionalBaseTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getDirectOptionalBases().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(
@@ -1022,15 +987,13 @@ public:
 private:
     virtual ~ConstantDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_CONSTANT; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
-    virtual css::uno::Any SAL_CALL getConstantValue()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getConstantValue() override
     { return value_; }
 
     rtl::OUString name_;
@@ -1094,17 +1057,16 @@ public:
 private:
     virtual ~ConstantGroupDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_CONSTANTS; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XConstantTypeDescription > >
-    SAL_CALL getConstants() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getConstants() override;
 
     rtl::OUString name_;
     rtl::Reference< unoidl::ConstantGroupEntity > entity_;
@@ -1112,7 +1074,7 @@ private:
 
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XConstantTypeDescription > >
-ConstantGroupDescription::getConstants() throw (css::uno::RuntimeException, std::exception) {
+ConstantGroupDescription::getConstants() {
     assert(entity_->getMembers().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getMembers().size());
     css::uno::Sequence<
@@ -1140,15 +1102,14 @@ public:
 private:
     virtual ~TypedefDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_TYPEDEF; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getReferencedType() throw (css::uno::RuntimeException, std::exception) override
+    getReferencedType() override
     { return manager_->resolve(entity_->getType()); }
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1171,24 +1132,23 @@ public:
 private:
     virtual ~ConstructorParameter() override {}
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return parameter_.name; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getType() throw (css::uno::RuntimeException, std::exception) override
+    getType() override
     { return manager_->resolve(parameter_.type); }
 
-    virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isIn() override
     { return true; }
 
-    virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isOut() override
     { return false; }
 
-    virtual sal_Int32 SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getPosition() override
     { return position_; }
 
-    virtual sal_Bool SAL_CALL isRestParameter()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isRestParameter() override
     { return parameter_.rest; }
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1212,29 +1172,28 @@ public:
 private:
     virtual ~ConstructorDescription() override {}
 
-    virtual sal_Bool SAL_CALL isDefaultConstructor()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isDefaultConstructor() override
     { return constructor_.defaultConstructor; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return constructor_.name; }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XParameter > >
-    SAL_CALL getParameters() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getParameters() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XCompoundTypeDescription > >
-    SAL_CALL getExceptions() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getExceptions() override;
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
     unoidl::SingleInterfaceBasedServiceEntity::Constructor constructor_;
 };
 
 css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > >
-ConstructorDescription::getParameters() throw (css::uno::RuntimeException, std::exception) {
+ConstructorDescription::getParameters() {
     assert(constructor_.parameters.size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(constructor_.parameters.size());
     css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > > s(
@@ -1248,7 +1207,7 @@ ConstructorDescription::getParameters() throw (css::uno::RuntimeException, std::
 
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XCompoundTypeDescription > >
-ConstructorDescription::getExceptions() throw (css::uno::RuntimeException, std::exception) {
+ConstructorDescription::getExceptions() {
     assert(constructor_.exceptions.size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(constructor_.exceptions.size());
     css::uno::Sequence<
@@ -1281,17 +1240,16 @@ public:
 private:
     virtual ~SingleInterfaceBasedServiceDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_SERVICE; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XServiceTypeDescription > >
-    SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getMandatoryServices() override
     {
         return css::uno::Sequence<
             css::uno::Reference< css::reflection::XServiceTypeDescription > >();
@@ -1300,7 +1258,7 @@ private:
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XServiceTypeDescription > >
-    SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getOptionalServices() override
     {
         return css::uno::Sequence<
             css::uno::Reference< css::reflection::XServiceTypeDescription > >();
@@ -1309,7 +1267,7 @@ private:
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
-    SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getMandatoryInterfaces() override
     {
         return css::uno::Sequence<
             css::uno::Reference<
@@ -1319,7 +1277,7 @@ private:
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
-    SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getOptionalInterfaces() override
     {
         return css::uno::Sequence<
             css::uno::Reference<
@@ -1329,25 +1287,24 @@ private:
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XPropertyTypeDescription > >
-    SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getProperties() override
     {
         return css::uno::Sequence<
             css::uno::Reference<
                 css::reflection::XPropertyTypeDescription > >();
     }
 
-    virtual sal_Bool SAL_CALL isSingleInterfaceBased()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSingleInterfaceBased() override
     { return true; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getInterface() throw (css::uno::RuntimeException, std::exception) override
+    getInterface() override
     { return manager_->resolve(entity_->getBase()); }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XServiceConstructorDescription > >
-    SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getConstructors() override;
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
     rtl::OUString name_;
@@ -1357,7 +1314,6 @@ private:
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XServiceConstructorDescription > >
 SingleInterfaceBasedServiceDescription::getConstructors()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getConstructors().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(entity_->getConstructors().size());
@@ -1384,19 +1340,17 @@ public:
 private:
     virtual ~PropertyDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_PROPERTY; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return property_.name; }
 
-    virtual sal_Int16 SAL_CALL getPropertyFlags()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getPropertyFlags() override
     { return property_.attributes; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getPropertyTypeDescription() throw (css::uno::RuntimeException, std::exception) override
+    getPropertyTypeDescription() override
     { return manager_->resolve(property_.type); }
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1423,50 +1377,48 @@ public:
 private:
     virtual ~AccumulationBasedServiceDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_SERVICE; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XServiceTypeDescription > >
-    SAL_CALL getMandatoryServices() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getMandatoryServices() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XServiceTypeDescription > >
-    SAL_CALL getOptionalServices() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getOptionalServices() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
-    SAL_CALL getMandatoryInterfaces() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getMandatoryInterfaces() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
-    SAL_CALL getOptionalInterfaces() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getOptionalInterfaces() override;
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XPropertyTypeDescription > >
-    SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getProperties() override;
 
-    virtual sal_Bool SAL_CALL isSingleInterfaceBased()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSingleInterfaceBased() override
     { return false; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    getInterface() throw (css::uno::RuntimeException, std::exception) override
+    getInterface() override
     { return css::uno::Reference< css::reflection::XTypeDescription >(); }
 
     virtual
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XServiceConstructorDescription > >
-    SAL_CALL getConstructors() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getConstructors() override
     {
         return css::uno::Sequence<
             css::uno::Reference<
@@ -1481,7 +1433,6 @@ private:
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XServiceTypeDescription > >
 AccumulationBasedServiceDescription::getMandatoryServices()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getDirectMandatoryBaseServices().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(
@@ -1500,7 +1451,6 @@ AccumulationBasedServiceDescription::getMandatoryServices()
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XServiceTypeDescription > >
 AccumulationBasedServiceDescription::getOptionalServices()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getDirectOptionalBaseServices().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(
@@ -1518,7 +1468,6 @@ AccumulationBasedServiceDescription::getOptionalServices()
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
 AccumulationBasedServiceDescription::getMandatoryInterfaces()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getDirectMandatoryBaseInterfaces().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(
@@ -1539,7 +1488,6 @@ AccumulationBasedServiceDescription::getMandatoryInterfaces()
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XInterfaceTypeDescription > >
 AccumulationBasedServiceDescription::getOptionalInterfaces()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getDirectOptionalBaseInterfaces().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(
@@ -1560,7 +1508,6 @@ AccumulationBasedServiceDescription::getOptionalInterfaces()
 css::uno::Sequence<
     css::uno::Reference< css::reflection::XPropertyTypeDescription > >
 AccumulationBasedServiceDescription::getProperties()
-    throw (css::uno::RuntimeException, std::exception)
 {
     assert(entity_->getDirectProperties().size() <= SAL_MAX_INT32);
     sal_Int32 n = static_cast< sal_Int32 >(
@@ -1593,26 +1540,24 @@ public:
 private:
     virtual ~InterfaceBasedSingletonDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_SINGLETON; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual css::uno::Reference< css::reflection::XServiceTypeDescription >
-    SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getService() override
     {
         return
             css::uno::Reference< css::reflection::XServiceTypeDescription >();
     }
 
-    virtual sal_Bool SAL_CALL isInterfaceBased()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isInterfaceBased() override
     { return true; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription >
-    SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getInterface() override
     { return manager_->resolve(entity_->getBase()); }
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1639,26 +1584,24 @@ public:
 private:
     virtual ~ServiceBasedSingletonDescription() override {}
 
-    virtual css::uno::TypeClass SAL_CALL getTypeClass()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override
     { return css::uno::TypeClass_SINGLETON; }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override
+    virtual rtl::OUString SAL_CALL getName() override
     { return name_; }
 
     virtual css::uno::Reference< css::reflection::XServiceTypeDescription >
-    SAL_CALL getService() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getService() override
     {
         return css::uno::Reference< css::reflection::XServiceTypeDescription >(
             manager_->resolve(entity_->getBase()), css::uno::UNO_QUERY_THROW);
     }
 
-    virtual sal_Bool SAL_CALL isInterfaceBased()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isInterfaceBased() override
     { return false; }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription >
-    SAL_CALL getInterface() throw (css::uno::RuntimeException, std::exception) override
+    SAL_CALL getInterface() override
     { return css::uno::Reference< css::reflection::XTypeDescription >(); }
 
     rtl::Reference< cppuhelper::TypeManager > manager_;
@@ -1685,20 +1628,14 @@ public:
 private:
     virtual ~Enumeration() override {}
 
-    virtual sal_Bool SAL_CALL hasMoreElements()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements() override
     { return !positions_.empty(); }
 
-    virtual css::uno::Any SAL_CALL nextElement()
-        throw (
-            css::container::NoSuchElementException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL nextElement() override
     { return css::uno::makeAny(nextTypeDescription()); }
 
     virtual css::uno::Reference< css::reflection::XTypeDescription > SAL_CALL
-    nextTypeDescription()
-        throw (
-            css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    nextTypeDescription() override;
 
     bool matches(css::uno::TypeClass tc) const;
 
@@ -1746,7 +1683,6 @@ private:
 
 css::uno::Reference< css::reflection::XTypeDescription >
 Enumeration::nextTypeDescription()
-    throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
 {
     rtl::OUString name;
     {
@@ -1959,7 +1895,6 @@ cppuhelper::TypeManager::~TypeManager() throw () {}
 void cppuhelper::TypeManager::disposing() {} //TODO
 
 rtl::OUString cppuhelper::TypeManager::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return rtl::OUString(
         "com.sun.star.comp.cppuhelper.bootstrap.TypeManager");
@@ -1967,14 +1902,12 @@ rtl::OUString cppuhelper::TypeManager::getImplementationName()
 
 sal_Bool cppuhelper::TypeManager::supportsService(
     rtl::OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< rtl::OUString >
 cppuhelper::TypeManager::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<OUString> names { "com.sun.star.reflection.TypeDescriptionManager" }; //TODO
     return names;
@@ -1982,7 +1915,6 @@ cppuhelper::TypeManager::getSupportedServiceNames()
 
 css::uno::Any cppuhelper::TypeManager::getByHierarchicalName(
     rtl::OUString const & aName)
-    throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
 {
     css::uno::Any desc(find(aName));
     if (!desc.hasValue()) {
@@ -1994,19 +1926,16 @@ css::uno::Any cppuhelper::TypeManager::getByHierarchicalName(
 
 sal_Bool cppuhelper::TypeManager::hasByHierarchicalName(
     rtl::OUString const & aName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return find(aName).hasValue();
 }
 
 css::uno::Type cppuhelper::TypeManager::getElementType()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::UnoType< rtl::OUString >::get();
 }
 
 sal_Bool cppuhelper::TypeManager::hasElements()
-    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "TypeManager hasElements: method not supported",
@@ -2015,7 +1944,6 @@ sal_Bool cppuhelper::TypeManager::hasElements()
 
 css::uno::Reference< css::container::XEnumeration >
 cppuhelper::TypeManager::createEnumeration()
-    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "TypeManager createEnumeration: method not supported",
@@ -2023,7 +1951,6 @@ cppuhelper::TypeManager::createEnumeration()
 }
 
 sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &)
-    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "TypeManager has: method not supported",
@@ -2031,9 +1958,6 @@ sal_Bool cppuhelper::TypeManager::has(css::uno::Any const &)
 }
 
 void cppuhelper::TypeManager::insert(css::uno::Any const & aElement)
-    throw (
-        css::lang::IllegalArgumentException,
-        css::container::ElementExistException, css::uno::RuntimeException, std::exception)
 {
     rtl::OUString uri;
     if (!(aElement >>= uri)) {
@@ -2048,9 +1972,6 @@ void cppuhelper::TypeManager::insert(css::uno::Any const & aElement)
 }
 
 void cppuhelper::TypeManager::remove(css::uno::Any const & aElement)
-    throw (
-        css::lang::IllegalArgumentException,
-        css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
 {
     rtl::OUString uri;
     if (!(aElement >>= uri)) {
@@ -2067,10 +1988,6 @@ cppuhelper::TypeManager::createTypeDescriptionEnumeration(
     rtl::OUString const & moduleName,
     css::uno::Sequence< css::uno::TypeClass > const & types,
     css::reflection::TypeDescriptionSearchDepth depth)
-    throw (
-        css::reflection::NoSuchTypeNameException,
-        css::reflection::InvalidTypeNameException,
-        css::uno::RuntimeException, std::exception)
 {
     rtl::Reference< unoidl::MapCursor > cursor;
     try {
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx
index 3a8f6ad3fd56..2ad52f836ff3 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -68,53 +68,36 @@ private:
 
     virtual void SAL_CALL disposing() override;
 
-    virtual rtl::OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual rtl::OUString SAL_CALL getImplementationName() override;
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override;
 
     virtual css::uno::Sequence< rtl::OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
     virtual css::uno::Any SAL_CALL getByHierarchicalName(
-        rtl::OUString const & aName)
-        throw (
-            css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        rtl::OUString const & aName) override;
 
-    virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByHierarchicalName(rtl::OUString const & aName) override;
 
-    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;
 
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-    createEnumeration() throw (css::uno::RuntimeException, std::exception) override;
+    createEnumeration() override;
 
-    virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL has(css::uno::Any const & aElement) override;
 
-    virtual void SAL_CALL insert(css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insert(css::uno::Any const & aElement) override;
 
-    virtual void SAL_CALL remove(css::uno::Any const & aElement)
-        throw (
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL remove(css::uno::Any const & aElement) override;
 
     virtual css::uno::Reference< css::reflection::XTypeDescriptionEnumeration >
     SAL_CALL createTypeDescriptionEnumeration(
         rtl::OUString const & moduleName,
         css::uno::Sequence< css::uno::TypeClass > const & types,
-        css::reflection::TypeDescriptionSearchDepth depth)
-        throw (
-            css::reflection::NoSuchTypeNameException,
-            css::reflection::InvalidTypeNameException,
-            css::uno::RuntimeException, std::exception) override;
+        css::reflection::TypeDescriptionSearchDepth depth) override;
 
     void readRdbDirectory(rtl::OUString const & uri, bool optional);
 
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index a30700bdd691..b52634b26ecc 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -64,19 +64,19 @@ public:
     const OWeakConnectionPoint& operator=(const OWeakConnectionPoint&) = delete;
 
     // XInterface
-    Any SAL_CALL        queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    Any SAL_CALL        queryInterface( const Type & rType ) override;
     void SAL_CALL       acquire() throw() override;
     void SAL_CALL       release() throw() override;
 
     // XAdapter
-    css::uno::Reference< css::uno::XInterface > SAL_CALL queryAdapted() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::uno::XInterface > SAL_CALL queryAdapted() override;
+    void SAL_CALL addReference( const css::uno::Reference< css::uno::XReference >& xRef ) override;
+    void SAL_CALL removeReference( const css::uno::Reference< css::uno::XReference >& xRef ) override;
 
     /// Called from the weak object if the reference count goes to zero.
     ///
     /// @throws css::uno::RuntimeException
-    void SAL_CALL dispose() throw(css::uno::RuntimeException);
+    void SAL_CALL dispose();
 
 private:
     virtual ~OWeakConnectionPoint() {}
@@ -91,7 +91,6 @@ private:
 
 // XInterface
 Any SAL_CALL OWeakConnectionPoint::queryInterface( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return ::cppu::queryInterface(
         rType, static_cast< XAdapter * >( this ), static_cast< XInterface * >( this ) );
@@ -110,7 +109,7 @@ void SAL_CALL OWeakConnectionPoint::release() throw()
         delete this;
 }
 
-void SAL_CALL OWeakConnectionPoint::dispose() throw(css::uno::RuntimeException)
+void SAL_CALL OWeakConnectionPoint::dispose()
 {
     std::vector<Reference<XReference>> aCopy;
     { // only hold the mutex while we access the field
@@ -142,7 +141,7 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(css::uno::RuntimeException)
 }
 
 // XInterface
-Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted()
 {
     Reference< XInterface > ret;
 
@@ -171,7 +170,6 @@ Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(css:
 
 // XInterface
 void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >& rRef)
-    throw(css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard(getWeakMutex());
     m_aReferences.push_back( rRef );
@@ -179,7 +177,6 @@ void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >&
 
 // XInterface
 void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference >& rRef)
-    throw(css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard(getWeakMutex());
     // Search from end because the thing that last added a ref is most likely to be the
@@ -211,7 +208,7 @@ OWeakObject::OWeakObject()
 #endif
 
 // XInterface
-Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
+Any SAL_CALL OWeakObject::queryInterface( const Type & rType )
 {
     return ::cppu::queryInterface(
         rType,
@@ -261,7 +258,6 @@ OWeakObject::~OWeakObject()
 
 // XWeak
 Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!m_pWeakConnectionPoint)
     {
@@ -306,14 +302,14 @@ void OWeakAggObject::release() throw()
 }
 
 // XInterface
-Any OWeakAggObject::queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
+Any OWeakAggObject::queryInterface( const Type & rType )
 {
     Reference< XInterface > x( xDelegator ); // harden ref
     return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType ));
 }
 
 // XAggregation
-Any OWeakAggObject::queryAggregation( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
+Any OWeakAggObject::queryAggregation( const Type & rType )
 {
     return ::cppu::queryInterface(
         rType,
@@ -323,7 +319,7 @@ Any OWeakAggObject::queryAggregation( const Type & rType ) throw(css::uno::Runti
 }
 
 // XAggregation
-void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) throw(css::uno::RuntimeException, std::exception)
+void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator )
 {
     xDelegator = rDelegator;
 }
@@ -357,12 +353,12 @@ public:
     const OWeakRefListener& operator=(const OWeakRefListener&) = delete;
 
     // XInterface
-    Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException, std::exception) override;
+    Any SAL_CALL queryInterface( const Type & rType ) override;
     void SAL_CALL acquire() throw() override;
     void SAL_CALL release() throw() override;
 
     // XReference
-    void SAL_CALL   dispose() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL   dispose() override;
 
     /// The reference counter.
     oslInterlockedCount         m_aRefCount;
@@ -405,7 +401,7 @@ OWeakRefListener::~OWeakRefListener()
 }
 
 // XInterface
-Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType )
 {
     return ::cppu::queryInterface(
         rType, static_cast< XReference * >( this ), static_cast< XInterface * >( this ) );
@@ -425,7 +421,6 @@ void SAL_CALL OWeakRefListener::release() throw()
 }
 
 void SAL_CALL OWeakRefListener::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     Reference< XAdapter > xAdp;
     {
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index f6880fd8f560..ca9aaa85d171 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -87,7 +87,6 @@ static const char arUsingText[] =
 /// @throws RuntimeException
 static bool readOption( OUString * pValue, const sal_Char * pOpt,
                         sal_uInt32 * pnIndex, const OUString & aArg)
-    throw (RuntimeException)
 {
     const OUString dash("-");
     if(!aArg.startsWith(dash))
@@ -147,7 +146,6 @@ void createInstance(
     Reference< T > & rxOut,
     const Reference< XComponentContext > & xContext,
     const OUString & rServiceName )
-    throw (Exception)
 {
     Reference< XMultiComponentFactory > xMgr( xContext->getServiceManager() );
     Reference< XInterface > x( xMgr->createInstanceWithContext( rServiceName, xContext ) );
@@ -172,7 +170,6 @@ void createInstance(
 static Reference< XInterface > loadComponent(
     const Reference< XComponentContext > & xContext,
     const OUString & rImplName, const OUString & rLocation )
-    throw (Exception)
 {
     // determine loader to be used
     sal_Int32 nDot = rLocation.lastIndexOf( '.' );
@@ -255,7 +252,7 @@ class OInstanceProvider
     OUString                          _aInstanceName;
 
     /// @throws Exception
-    inline Reference< XInterface > createInstance() throw (Exception);
+    inline Reference< XInterface > createInstance();
 
 public:
     OInstanceProvider( const Reference< XComponentContext > & xContext,
@@ -272,12 +269,10 @@ public:
         {}
 
     // XInstanceProvider
-    virtual Reference< XInterface > SAL_CALL getInstance( const OUString & rName )
-        throw (NoSuchElementException, RuntimeException, std::exception) override;
+    virtual Reference< XInterface > SAL_CALL getInstance( const OUString & rName ) override;
 };
 
 inline Reference< XInterface > OInstanceProvider::createInstance()
-    throw (Exception)
 {
     Reference< XInterface > xRet;
     if (!_aImplName.isEmpty()) // manually via loader
@@ -294,7 +289,6 @@ inline Reference< XInterface > OInstanceProvider::createInstance()
 }
 
 Reference< XInterface > OInstanceProvider::getInstance( const OUString & rName )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     try
     {
@@ -341,14 +335,12 @@ struct ODisposingListener : public WeakImplHelper< XEventListener >
     Condition cDisposed;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const EventObject & rEvt )
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const EventObject & rEvt ) override;
 
     static void waitFor( const Reference< XComponent > & xComp );
 };
 
 void ODisposingListener::disposing( const EventObject & )
-    throw (RuntimeException, std::exception)
 {
     cDisposed.set();
 }
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 476dffe3a8f4..54b1e9d7ee4f 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1381,20 +1381,20 @@ public:
     explicit ColorPicker();
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XInitialization
-    virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XPropertyAccess
-    virtual Sequence< PropertyValue > SAL_CALL getPropertyValues(  ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual Sequence< PropertyValue > SAL_CALL getPropertyValues(  ) override;
+    virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) override;
 
     // XExecutableDialog
-    virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute(  ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
 private:
     OUString msTitle;
@@ -1415,7 +1415,7 @@ Reference< XInterface > SAL_CALL ColorPicker_createInstance( Reference< XCompone
     return static_cast<XWeak*>( new ColorPicker );
 }
 
-Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames()
 {
     Sequence< OUString > seq { "com.sun.star.ui.dialogs.ColorPicker" };
     return seq;
@@ -1431,7 +1431,7 @@ ColorPicker::ColorPicker()
 }
 
 // XInitialization
-void SAL_CALL ColorPicker::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL ColorPicker::initialize( const Sequence< Any >& aArguments )
 {
     if( aArguments.getLength() == 1 )
     {
@@ -1440,23 +1440,23 @@ void SAL_CALL ColorPicker::initialize( const Sequence< Any >& aArguments ) throw
 }
 
 // XInitialization
-OUString SAL_CALL ColorPicker::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL ColorPicker::getImplementationName(  )
 {
     return ColorPicker_getImplementationName();
 }
 
-sal_Bool SAL_CALL ColorPicker::supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ColorPicker::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-Sequence< OUString > SAL_CALL ColorPicker::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ColorPicker::getSupportedServiceNames(  )
 {
     return ColorPicker_getSupportedServiceNames();
 }
 
 // XPropertyAccess
-Sequence< PropertyValue > SAL_CALL ColorPicker::getPropertyValues(  ) throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL ColorPicker::getPropertyValues(  )
 {
     Sequence< PropertyValue > props(1);
     props[0].Name = msColorKey;
@@ -1464,7 +1464,7 @@ Sequence< PropertyValue > SAL_CALL ColorPicker::getPropertyValues(  ) throw (Run
     return props;
 }
 
-void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& aProps )
 {
     for( sal_Int32 n = 0; n < aProps.getLength(); n++ )
     {
@@ -1480,12 +1480,12 @@ void SAL_CALL ColorPicker::setPropertyValues( const Sequence< PropertyValue >& a
 }
 
 // XExecutableDialog
-void SAL_CALL ColorPicker::setTitle( const OUString& sTitle ) throw (RuntimeException, std::exception)
+void SAL_CALL ColorPicker::setTitle( const OUString& sTitle )
 {
     msTitle = sTitle;
 }
 
-sal_Int16 SAL_CALL ColorPicker::execute(  ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL ColorPicker::execute(  )
 {
     ScopedVclPtrInstance< ColorPickerDialog > aDlg( VCLUnoHelper::GetWindow( mxParent ), mnColor, mnMode );
     sal_Int16 ret = aDlg->Execute();
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 4b8bad46d825..b2cb31592be7 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -275,7 +275,6 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SvxThesaurusDialog::que
         OUString& rTerm,
         const lang::Locale& rLocale,
         const beans::PropertyValues& rProperties )
-    throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
     uno::Sequence< uno::Reference< linguistic2::XMeaning > > aMeanings(
             xThesaurus->queryMeanings( rTerm, rLocale, rProperties ) );
diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx
index 2936e944c0f3..b2b24ba0d7c0 100644
--- a/cui/source/inc/colorpicker.hxx
+++ b/cui/source/inc/colorpicker.hxx
@@ -42,8 +42,7 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL ColorPicker_createInstance(
     css::uno::Reference<css::uno::XComponentContext> const &);
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence<OUString> SAL_CALL ColorPicker_getSupportedServiceNames()
-    throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL ColorPicker_getSupportedServiceNames();
 }
 
 #endif
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 298c68f179de..2a43f980fe52 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -154,7 +154,7 @@ public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > >
-            queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties );
 
     bool    UpdateAlternativesBox_Impl();
     void    LookUp( const OUString &rText );
diff --git a/cui/source/options/personasdochandler.cxx b/cui/source/options/personasdochandler.cxx
index 9173aea8b550..90809abaa99d 100644
--- a/cui/source/options/personasdochandler.cxx
+++ b/cui/source/options/personasdochandler.cxx
@@ -15,19 +15,16 @@ using namespace ::com::sun::star::uno;
 // XDocumentHandler
 void SAL_CALL
 PersonasDocHandler::startDocument()
-throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL
 PersonasDocHandler::endDocument()
-throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL
 PersonasDocHandler::characters( const OUString & aChars)
-    throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
     if( m_isLearnmoreTag )
         m_vLearnmoreURLs.push_back( aChars );
@@ -35,29 +32,24 @@ PersonasDocHandler::characters( const OUString & aChars)
 
 void SAL_CALL
 PersonasDocHandler::ignorableWhitespace( const OUString & )
-    throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL
 PersonasDocHandler::processingInstruction(
     const OUString &, const OUString & )
-        throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL
 PersonasDocHandler::setDocumentLocator(
     const Reference< xml::sax::XLocator >& )
-        throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL
 PersonasDocHandler::startElement( const OUString& aName,
     const Reference< xml::sax::XAttributeList > &xAttribs )
-        throw ( xml::sax::SAXException,
-            RuntimeException, std::exception )
 {
     if( aName == "searchresults" )
     {
@@ -73,7 +65,6 @@ PersonasDocHandler::startElement( const OUString& aName,
 }
 
 void SAL_CALL PersonasDocHandler::endElement( const OUString & )
-   throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
diff --git a/cui/source/options/personasdochandler.hxx b/cui/source/options/personasdochandler.hxx
index 7875be68d4f3..3e3f58ef5d92 100644
--- a/cui/source/options/personasdochandler.hxx
+++ b/cui/source/options/personasdochandler.hxx
@@ -26,33 +26,24 @@ public:
     bool hasResults() { return m_hasResults; }
 
     // XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocument() override;
 
-    virtual void SAL_CALL endDocument()
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL endDocument() override;
 
     virtual void SAL_CALL startElement( const OUString& aName,
-        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs )
-        throw ( css::xml::sax::SAXException,
-            css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) override;
 
-    virtual void SAL_CALL endElement( const OUString & aName )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL endElement( const OUString & aName ) override;
 
-    virtual void SAL_CALL characters( const OUString & aChars )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL characters( const OUString & aChars ) override;
 
-    virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) override;
 
     virtual void SAL_CALL processingInstruction(
-        const OUString & aTarget, const OUString & aData )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+        const OUString & aTarget, const OUString & aData ) override;
 
     virtual void SAL_CALL setDocumentLocator(
-        const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 };
 
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_PERSONASDOCHANDLER_HXX
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index d37b285d6fe3..5bdabccf53e3 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -47,32 +47,32 @@ void OBookmarkSet::reset(const Reference< XResultSet>& _xDriverSet)
     construct(_xDriverSet, m_sRowSetFilter);
 }
 
-Any SAL_CALL OBookmarkSet::getBookmark() throw(SQLException, RuntimeException)
+Any SAL_CALL OBookmarkSet::getBookmark()
 {
     return m_xRowLocate->getBookmark();
 }
 
-bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark )
 {
     return m_xRowLocate->moveToBookmark(bookmark);
 }
 
-sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second )
 {
     return m_xRowLocate->compareBookmarks(_first,_second);
 }
 
-bool SAL_CALL OBookmarkSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OBookmarkSet::hasOrderedBookmarks(  )
 {
     return m_xRowLocate->hasOrderedBookmarks();
 }
 
-sal_Int32 SAL_CALL OBookmarkSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OBookmarkSet::hashBookmark( const Any& bookmark )
 {
     return m_xRowLocate->hashBookmark(bookmark);
 }
 
-void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
 {
     Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
     if(!xUpdRow.is())
@@ -96,7 +96,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
 }
 
-void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
 {
     Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
     if(!xUpdRow.is())
@@ -119,7 +119,7 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), StandardSQLState::GENERAL_ERROR, *this );
 }
 
-void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
+void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  )
 {
     Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY);
 
diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx
index ae4449372e52..8c34c2e0156b 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -42,15 +42,15 @@ namespace dbaccess
         virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
         virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override;
         // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual css::uno::Any SAL_CALL getBookmark() override;
+        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+        virtual bool SAL_CALL hasOrderedBookmarks(  ) override;
+        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_BOOKMARKSET_HXX
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index 01a01fa9f6ff..3912b16181ce 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -85,7 +85,7 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData
     return *static_cast< ::comphelper::OPropertyArrayUsageHelper< ORowSetColumn >* >(this)->getArrayHelper();
 }
 
-void SAL_CALL ORowSetColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue )throw (Exception, std::exception)
+void SAL_CALL ORowSetColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue )
 {
     OSL_ENSURE( nHandle != PROPERTY_ID_VALUE, "ORowSetColumn::setFastPropertyValue_NoBroadcast: hmm? This property is marked as READONLY!" );
     if ( nHandle != PROPERTY_ID_VALUE )
diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx
index 0218d769927a..25c4b3310705 100644
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.hxx
@@ -42,7 +42,7 @@ namespace dbaccess
 
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,const css::uno::Any& rValue )throw (css::uno::Exception, std::exception ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,const css::uno::Any& rValue ) override;
     };
 
 }
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 72767f2bf4eb..d36278cbbbdc 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -124,7 +124,7 @@ void SAL_CALL ORowSetDataColumn::getFastPropertyValue( Any& rValue, sal_Int32 nH
         ODataColumn::getFastPropertyValue( rValue, nHandle );
 }
 
-void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue )throw (Exception, std::exception)
+void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue )
 {
     switch( nHandle )
     {
@@ -147,7 +147,7 @@ void SAL_CALL ORowSetDataColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHan
 sal_Bool SAL_CALL ORowSetDataColumn::convertFastPropertyValue( Any & rConvertedValue,
                                                             Any & rOldValue,
                                                             sal_Int32 nHandle,
-                                                            const Any& rValue ) throw (IllegalArgumentException)
+                                                            const Any& rValue )
 {
     bool bModified = false;
     switch( nHandle )
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL ORowSetDataColumn::convertFastPropertyValue( Any & rConvertedV
     return bModified;
 }
 
-Sequence< sal_Int8 > ORowSetDataColumn::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > ORowSetDataColumn::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -231,7 +231,7 @@ void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColu
     reFill(_rVector);
 }
 
-void ORowSetDataColumns::impl_refresh() throw(css::uno::RuntimeException)
+void ORowSetDataColumns::impl_refresh()
 {
 }
 
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index 76cdcf3018e8..a09bc21230fc 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -56,7 +56,7 @@ namespace dbaccess
 
 
         // css::lang::XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
         // comphelper::OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
@@ -66,9 +66,9 @@ namespace dbaccess
         virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue,
                                                             css::uno::Any & rOldValue,
                                                             sal_Int32 nHandle,
-                                                            const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException) override;
+                                                            const css::uno::Any& rValue ) override;
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue )throw (css::uno::Exception, std::exception) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue ) override;
 
         virtual void fireValueChange(const ::connectivity::ORowSetValue& _rOldValue) override;
     protected:
@@ -81,7 +81,7 @@ namespace dbaccess
         ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns;
     protected:
         virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override;
-        virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+        virtual void impl_refresh() override;
     public:
         ORowSetDataColumns(
                         bool _bCase,
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 723e2925a4fd..ed1a12a4e8c8 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -133,7 +133,7 @@ OCacheSet::~OCacheSet()
 
 }
 
-void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable)  throw(SQLException, RuntimeException)
+void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable)
 {
     OSL_ENSURE(_xTable.is(),"OCacheSet::fillTableName: PropertySet is empty!");
     if(m_aComposedTableName.isEmpty() && _xTable.is() )
@@ -148,7 +148,7 @@ void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable)  throw(SQL
     }
 }
 
-void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -273,7 +273,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
     }
 }
 
-void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable  )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -317,7 +317,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
      m_bUpdated = xPrep->executeUpdate() > 0;
 }
 
-void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
+void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -396,159 +396,159 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
     }
 }
 
-sal_Bool SAL_CALL OCacheSet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OCacheSet::wasNull(  )
 {
     return m_xDriverRow->wasNull();
 }
 
-OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getString(columnIndex);
 }
 
-sal_Bool SAL_CALL OCacheSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OCacheSet::getBoolean( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getBoolean(columnIndex);
 }
 
-sal_Int8 SAL_CALL OCacheSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL OCacheSet::getByte( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getByte(columnIndex);
 }
 
-sal_Int16 SAL_CALL OCacheSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL OCacheSet::getShort( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getShort(columnIndex);
 }
 
-sal_Int32 SAL_CALL OCacheSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCacheSet::getInt( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getInt(columnIndex);
 }
 
-sal_Int64 SAL_CALL OCacheSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OCacheSet::getLong( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getLong(columnIndex);
 }
 
-float SAL_CALL OCacheSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL OCacheSet::getFloat( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getFloat(columnIndex);
 }
 
-double SAL_CALL OCacheSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL OCacheSet::getDouble( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getDouble(columnIndex);
 }
 
-Sequence< sal_Int8 > SAL_CALL OCacheSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL OCacheSet::getBytes( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getBytes(columnIndex);
 }
 
-css::util::Date SAL_CALL OCacheSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL OCacheSet::getDate( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getDate(columnIndex);
 }
 
-css::util::Time SAL_CALL OCacheSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL OCacheSet::getTime( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getTime(columnIndex);
 }
 
-css::util::DateTime SAL_CALL OCacheSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL OCacheSet::getTimestamp( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getTimestamp(columnIndex);
 }
 
-Reference< css::io::XInputStream > SAL_CALL OCacheSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OCacheSet::getBinaryStream( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getBinaryStream(columnIndex);
 }
 
-Reference< css::io::XInputStream > SAL_CALL OCacheSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OCacheSet::getCharacterStream( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getCharacterStream(columnIndex);
 }
 
-Any SAL_CALL OCacheSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OCacheSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap )
 {
     return m_xDriverRow->getObject(columnIndex,typeMap);
 }
 
-Reference< XRef > SAL_CALL OCacheSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL OCacheSet::getRef( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getRef(columnIndex);
 }
 
-Reference< XBlob > SAL_CALL OCacheSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL OCacheSet::getBlob( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getBlob(columnIndex);
 }
 
-Reference< XClob > SAL_CALL OCacheSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL OCacheSet::getClob( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getClob(columnIndex);
 }
 
-Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex )
 {
     return m_xDriverRow->getArray(columnIndex);
 }
 
 // XResultSet
-bool SAL_CALL OCacheSet::next() throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OCacheSet::next()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->next();
 }
 
-bool SAL_CALL OCacheSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::isBeforeFirst(  )
 {
     return m_xDriverSet->isBeforeFirst();
 }
 
-bool SAL_CALL OCacheSet::isAfterLast(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::isAfterLast(  )
 {
     return m_xDriverSet->isAfterLast();
 }
 
-void SAL_CALL OCacheSet::beforeFirst(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OCacheSet::beforeFirst(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_xDriverSet->beforeFirst();
 }
 
-void SAL_CALL OCacheSet::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCacheSet::afterLast(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_xDriverSet->afterLast();
 }
 
-bool SAL_CALL OCacheSet::first() throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OCacheSet::first()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->first();
 }
 
-bool SAL_CALL OCacheSet::last() throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OCacheSet::last()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->last();
 }
 
-sal_Int32 SAL_CALL OCacheSet::getRow(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OCacheSet::getRow(  )
 {
     return m_xDriverSet->getRow();
 }
 
-bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OCacheSet::absolute( sal_Int32 row )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->absolute(row);
 }
 
-bool SAL_CALL OCacheSet::previous(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::previous(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return m_xDriverSet->previous();
@@ -569,22 +569,22 @@ bool OCacheSet::absolute_checked( sal_Int32 row,bool /*i_bFetchRow*/ )
     return absolute(row);
 }
 
-void SAL_CALL OCacheSet::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCacheSet::refreshRow(  )
 {
     m_xDriverSet->refreshRow();
 }
 
-bool SAL_CALL OCacheSet::rowUpdated(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::rowUpdated(  )
 {
     return m_xDriverSet->rowUpdated();
 }
 
-bool SAL_CALL OCacheSet::rowInserted(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::rowInserted(  )
 {
     return m_xDriverSet->rowInserted();
 }
 
-bool SAL_CALL OCacheSet::rowDeleted(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OCacheSet::rowDeleted(  )
 {
     return m_xDriverSet->rowDeleted();
 }
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index f813114c9179..214f50986ea9 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -71,7 +71,7 @@ namespace dbaccess
                             ,::std::vector< sal_Int32>& _rOrgValues);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void fillTableName(const css::uno::Reference< css::beans::XPropertySet>& _xTable)  throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void fillTableName(const css::uno::Reference< css::beans::XPropertySet>& _xTable);
 
         OUString getIdentifierQuoteString() const;
     public:
@@ -81,95 +81,95 @@ namespace dbaccess
         virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition);
 
         // css::sdbc::XRow
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
         // css::sdbc::XResultSet
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        virtual bool SAL_CALL next();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        virtual bool SAL_CALL isBeforeFirst(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        virtual bool SAL_CALL isAfterLast(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        virtual void SAL_CALL beforeFirst(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        virtual void SAL_CALL afterLast(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        virtual bool SAL_CALL first();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        virtual bool SAL_CALL last();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getRow(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        virtual bool SAL_CALL absolute( sal_Int32 row );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        virtual bool SAL_CALL previous(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        virtual void SAL_CALL refreshRow(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        virtual bool SAL_CALL rowUpdated(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        virtual bool SAL_CALL rowInserted(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        virtual bool SAL_CALL rowDeleted(  );
         // css::sdbcx::XRowLocate
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        virtual css::uno::Any SAL_CALL getBookmark() = 0;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) = 0;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) = 0;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        virtual bool SAL_CALL hasOrderedBookmarks(  ) = 0;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) = 0;
         // css::sdbc::XResultSetUpdate
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+        virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) = 0;
 
         virtual bool isResultSetChanged() const;
         virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) = 0;
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 5b794a91955c..e0d61ef24136 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -390,7 +390,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
         m_bConstructed      = false;
     }
 
-    void OFilteredContainer::impl_refresh() throw(RuntimeException)
+    void OFilteredContainer::impl_refresh()
     {
         if ( m_pRefreshListener )
         {
diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
index 482d84c6ec0a..1f9bbb46e0d4 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.hxx
@@ -47,7 +47,7 @@ namespace dbaccess
         ::rtl::Reference< ::connectivity::OSQLColumns>  m_aColumns;
     protected:
         virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override;
-        virtual void impl_refresh() throw(RuntimeException) override {}
+        virtual void impl_refresh() override {}
         virtual Reference< XPropertySet > createDescriptor() override
         {
             return nullptr;
@@ -80,7 +80,7 @@ namespace dbaccess
         OSQLTables  m_aTables;
     protected:
         virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override;
-        virtual void impl_refresh() throw(RuntimeException) override {}
+        virtual void impl_refresh() override {}
         virtual Reference< XPropertySet > createDescriptor() override
         {
             return nullptr;
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 18724f60c20a..1a9dcff9df76 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -413,14 +413,14 @@ void OKeySet::invalidateRow()
     ::comphelper::disposeComponent(m_xSet);
 }
 
-Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException)
+Any SAL_CALL OKeySet::getBookmark()
 {
     OSL_ENSURE(m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(),
         "getBookmark is only possible when we stand on a valid row!");
     return makeAny(m_aKeyIter->first);
 }
 
-bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
@@ -428,7 +428,7 @@ bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException,
     return m_aKeyIter != m_aKeyMap.end();
 }
 
-sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _second )
 {
     sal_Int32 nFirst = 0, nSecond = 0;
     _first >>= nFirst;
@@ -437,18 +437,18 @@ sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _sec
     return (nFirst != nSecond) ? CompareBookmark::NOT_EQUAL : CompareBookmark::EQUAL;
 }
 
-bool SAL_CALL OKeySet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::hasOrderedBookmarks(  )
 {
     return true;
 }
 
-sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark )
 {
     return ::comphelper::getINT32(bookmark);
 }
 
 
-void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable  )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -617,7 +617,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
     }
 }
 
-void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -861,7 +861,7 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sa
     }
 }
 
-void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable   ) throw(SQLException, RuntimeException)
+void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable   )
 {
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
@@ -1003,7 +1003,7 @@ Reference<XNameAccess> OKeySet::getKeyColumns() const
     return xKeyColumns;
 }
 
-bool SAL_CALL OKeySet::next() throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OKeySet::next()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
 
@@ -1031,24 +1031,24 @@ bool SAL_CALL OKeySet::next() throw(SQLException, RuntimeException, std::excepti
     return !isAfterLast();
 }
 
-bool SAL_CALL OKeySet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::isBeforeFirst(  )
 {
     return m_aKeyIter == m_aKeyMap.begin();
 }
 
-bool SAL_CALL OKeySet::isAfterLast(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::isAfterLast(  )
 {
     return  m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end();
 }
 
-void SAL_CALL OKeySet::beforeFirst(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OKeySet::beforeFirst(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aKeyIter = m_aKeyMap.begin();
     invalidateRow();
 }
 
-void SAL_CALL OKeySet::afterLast(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OKeySet::afterLast(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     fillAllRows();
@@ -1056,7 +1056,7 @@ void SAL_CALL OKeySet::afterLast(  ) throw(SQLException, RuntimeException)
     invalidateRow();
 }
 
-bool SAL_CALL OKeySet::first() throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OKeySet::first()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aKeyIter = m_aKeyMap.begin();
@@ -1074,7 +1074,7 @@ bool SAL_CALL OKeySet::first() throw(SQLException, RuntimeException, std::except
     return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
 }
 
-bool SAL_CALL OKeySet::last(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::last(  )
 {
     return last_checked(true);
 }
@@ -1093,7 +1093,7 @@ bool OKeySet::last_checked( bool /* i_bFetchRow */ )
     return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin();
 }
 
-sal_Int32 SAL_CALL OKeySet::getRow(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OKeySet::getRow(  )
 {
     OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!");
     OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!");
@@ -1101,7 +1101,7 @@ sal_Int32 SAL_CALL OKeySet::getRow(  ) throw(SQLException, RuntimeException)
     return ::std::distance(m_aKeyMap.begin(),m_aKeyIter);
 }
 
-bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::absolute( sal_Int32 row )
 {
     return absolute_checked(row,true);
 }
@@ -1176,12 +1176,12 @@ bool OKeySet::previous_checked( bool /* i_bFetchRow */ )
     return m_aKeyIter != m_aKeyMap.begin();
 }
 
-bool SAL_CALL OKeySet::previous(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::previous(  )
 {
     return previous_checked(true);
 }
 
-bool OKeySet::doTryRefetch_throw()  throw(SQLException, RuntimeException, std::exception)
+bool OKeySet::doTryRefetch_throw()
 {
     ensureStatement( );
     // we just reassign the base members
@@ -1225,7 +1225,7 @@ bool OKeySet::doTryRefetch_throw()  throw(SQLException, RuntimeException, std::e
     return m_xSet->next();
 }
 
-void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OKeySet::refreshRow()
 {
     invalidateRow();
 
@@ -1333,7 +1333,7 @@ bool OKeySet::fillAllRows()
 }
 
 // XRow
-sal_Bool SAL_CALL OKeySet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OKeySet::wasNull(  )
 {
     if ( ! m_xRow.is() )
         throwGenericSQLException("Must call getFOO() for some FOO before wasNull()", *this);
@@ -1342,7 +1342,7 @@ sal_Bool SAL_CALL OKeySet::wasNull(  ) throw(SQLException, RuntimeException, std
     return m_xRow->wasNull();
 }
 
-inline void OKeySet::ensureRowForData( ) throw(SQLException, RuntimeException)
+inline void OKeySet::ensureRowForData( )
 {
     if (! m_xRow.is() )
         refreshRow();
@@ -1352,131 +1352,131 @@ inline void OKeySet::ensureRowForData( ) throw(SQLException, RuntimeException)
     OSL_ENSURE(m_xRow.is(),"m_xRow is null! I've called throwSQLException but execution continued?");
 }
 
-OUString SAL_CALL OKeySet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OKeySet::getString( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getString(columnIndex);
 }
 
-sal_Bool SAL_CALL OKeySet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OKeySet::getBoolean( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getBoolean(columnIndex);
 }
 
-sal_Int8 SAL_CALL OKeySet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL OKeySet::getByte( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getByte(columnIndex);
 }
 
-sal_Int16 SAL_CALL OKeySet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL OKeySet::getShort( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getShort(columnIndex);
 }
 
-sal_Int32 SAL_CALL OKeySet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OKeySet::getInt( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getInt(columnIndex);
 }
 
-sal_Int64 SAL_CALL OKeySet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OKeySet::getLong( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getLong(columnIndex);
 }
 
-float SAL_CALL OKeySet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL OKeySet::getFloat( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getFloat(columnIndex);
 }
 
-double SAL_CALL OKeySet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL OKeySet::getDouble( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getDouble(columnIndex);
 }
 
-Sequence< sal_Int8 > SAL_CALL OKeySet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL OKeySet::getBytes( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getBytes(columnIndex);
 }
 
-css::util::Date SAL_CALL OKeySet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL OKeySet::getDate( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getDate(columnIndex);
 }
 
-css::util::Time SAL_CALL OKeySet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL OKeySet::getTime( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getTime(columnIndex);
 }
 
-css::util::DateTime SAL_CALL OKeySet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL OKeySet::getTimestamp( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getTimestamp(columnIndex);
 }
 
-Reference< css::io::XInputStream > SAL_CALL OKeySet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OKeySet::getBinaryStream( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getBinaryStream(columnIndex);
 }
 
-Reference< css::io::XInputStream > SAL_CALL OKeySet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OKeySet::getCharacterStream( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getCharacterStream(columnIndex);
 }
 
-Any SAL_CALL OKeySet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OKeySet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap )
 {
     ensureRowForData();
     return m_xRow->getObject(columnIndex,typeMap);
 }
 
-Reference< XRef > SAL_CALL OKeySet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL OKeySet::getRef( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getRef(columnIndex);
 }
 
-Reference< XBlob > SAL_CALL OKeySet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL OKeySet::getBlob( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getBlob(columnIndex);
 }
 
-Reference< XClob > SAL_CALL OKeySet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL OKeySet::getClob( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getClob(columnIndex);
 }
 
-Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex )
 {
     ensureRowForData();
     return m_xRow->getArray(columnIndex);
 }
 
-bool SAL_CALL OKeySet::rowUpdated(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::rowUpdated(  )
 {
     return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 2;
 }
 
-bool SAL_CALL OKeySet::rowInserted(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::rowInserted(  )
 {
     return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 1;
 }
 
-bool SAL_CALL OKeySet::rowDeleted(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OKeySet::rowDeleted(  )
 {
     bool bDeleted = m_bDeleted;
     m_bDeleted = false;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 74a490e2a978..f8c65d78a426 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -139,7 +139,7 @@ namespace dbaccess
         OUStringBuffer createKeyFilter( );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        bool doTryRefetch_throw() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+        bool doTryRefetch_throw();
         void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch);
         void executeUpdate(const ORowSetRow& _rInsertRow, const ORowSetRow& _rOriginalRow, const OUString& i_sSQL, const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>());
         void executeInsert( const ORowSetRow& _rInsertRow, const OUString& i_sSQL, const OUString& i_sTableName, bool bRefetch = false);
@@ -160,61 +160,61 @@ namespace dbaccess
         virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override;
 
         // css::sdbc::XRow
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-
-
-        virtual bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
+
+
+        virtual bool SAL_CALL rowUpdated(  ) override;
+        virtual bool SAL_CALL rowInserted(  ) override;
+        virtual bool SAL_CALL rowDeleted(  ) override;
         // css::sdbc::XResultSet
-        virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual bool SAL_CALL next() override;
+        virtual bool SAL_CALL isBeforeFirst(  ) override;
+        virtual bool SAL_CALL isAfterLast(  ) override;
+        virtual void SAL_CALL beforeFirst(  ) override;
+        virtual void SAL_CALL afterLast(  ) override;
+        virtual bool SAL_CALL first() override;
+        virtual bool SAL_CALL last(  ) override;
+        virtual sal_Int32 SAL_CALL getRow(  ) override;
+        virtual bool SAL_CALL absolute( sal_Int32 row ) override;
+        virtual bool SAL_CALL previous(  ) override;
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void SAL_CALL ensureRowForData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
-        virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL ensureRowForData(  );
+        virtual void SAL_CALL refreshRow(  ) override;
         // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual css::uno::Any SAL_CALL getBookmark() override;
 
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
 
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
 
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual bool SAL_CALL hasOrderedBookmarks(  ) override;
 
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
 
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
 
 
         virtual bool previous_checked( bool i_bFetchRow ) override;
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 4deceec8f5e0..88eb6a1696d7 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -167,7 +167,7 @@ void OptimisticSet::makeNewStatement( )
     ::comphelper::disposeComponent(xAnalyzer);
 }
 
-void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
 {
     if ( m_aJoinedKeyColumns.empty() )
         throw SQLException();
@@ -236,7 +236,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
     }
 }
 
-void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
 {
     TSQLStatements aSql;
     TSQLStatements aParameter;
@@ -331,7 +331,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
     }
 }
 
-void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/   ) throw(SQLException, RuntimeException)
+void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/   )
 {
     OUString aQuote  = getIdentifierQuoteString();
     TSQLStatements aKeyConditions;
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
index 8d5f5e1beeea..92766fd8abe4 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -59,9 +59,9 @@ namespace dbaccess
         virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
 
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
 
         // CacheSet
         virtual bool isResultSetChanged() const override;
diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx
index c1b69fb4ffdf..22adc74f138a 100644
--- a/dbaccess/source/core/api/PrivateRow.cxx
+++ b/dbaccess/source/core/api/PrivateRow.cxx
@@ -30,101 +30,101 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star;
 
-sal_Bool SAL_CALL OPrivateRow::wasNull(  ) throw (SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OPrivateRow::wasNull(  )
     {
         return m_aRow[m_nPos].isNull();
     }
-    OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    sal_Bool SAL_CALL OPrivateRow::getBoolean( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL OPrivateRow::getBoolean( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return bool(m_aRow[m_nPos]);
     }
-    ::sal_Int8 SAL_CALL OPrivateRow::getByte( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    ::sal_Int8 SAL_CALL OPrivateRow::getByte( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    ::sal_Int16 SAL_CALL OPrivateRow::getShort( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    ::sal_Int16 SAL_CALL OPrivateRow::getShort( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    ::sal_Int32 SAL_CALL OPrivateRow::getInt( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL OPrivateRow::getInt( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    ::sal_Int64 SAL_CALL OPrivateRow::getLong( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    ::sal_Int64 SAL_CALL OPrivateRow::getLong( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    float SAL_CALL OPrivateRow::getFloat( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    float SAL_CALL OPrivateRow::getFloat( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    double SAL_CALL OPrivateRow::getDouble( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    double SAL_CALL OPrivateRow::getDouble( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    Sequence< ::sal_Int8 > SAL_CALL OPrivateRow::getBytes( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    Sequence< ::sal_Int8 > SAL_CALL OPrivateRow::getBytes( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    css::util::Date SAL_CALL OPrivateRow::getDate( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    css::util::Date SAL_CALL OPrivateRow::getDate( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    css::util::Time SAL_CALL OPrivateRow::getTime( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    css::util::Time SAL_CALL OPrivateRow::getTime( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    css::util::DateTime SAL_CALL OPrivateRow::getTimestamp( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    css::util::DateTime SAL_CALL OPrivateRow::getTimestamp( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos];
     }
-    Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getBinaryStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getBinaryStream( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return Reference< css::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
     }
-    Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getCharacterStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    Reference< css::io::XInputStream > SAL_CALL OPrivateRow::getCharacterStream( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return Reference< css::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
     }
-    Any SAL_CALL OPrivateRow::getObject( ::sal_Int32 columnIndex, const Reference< css::container::XNameAccess >&  ) throw (SQLException, RuntimeException, std::exception)
+    Any SAL_CALL OPrivateRow::getObject( ::sal_Int32 columnIndex, const Reference< css::container::XNameAccess >&  )
     {
         m_nPos = columnIndex;
         return m_aRow[m_nPos].makeAny();
     }
-    Reference< XRef > SAL_CALL OPrivateRow::getRef( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XRef > SAL_CALL OPrivateRow::getRef( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return Reference< XRef >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
     }
-    Reference< XBlob > SAL_CALL OPrivateRow::getBlob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XBlob > SAL_CALL OPrivateRow::getBlob( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return Reference< XBlob >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
     }
-    Reference< XClob > SAL_CALL OPrivateRow::getClob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XClob > SAL_CALL OPrivateRow::getClob( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return Reference< XClob >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
     }
-    Reference< XArray > SAL_CALL OPrivateRow::getArray( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception)
+    Reference< XArray > SAL_CALL OPrivateRow::getArray( ::sal_Int32 columnIndex )
     {
         m_nPos = columnIndex;
         return Reference< XArray >(m_aRow[m_nPos].makeAny(),UNO_QUERY);
diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx
index 439fbe984fb8..3f8edf0bc7b9 100644
--- a/dbaccess/source/core/api/PrivateRow.hxx
+++ b/dbaccess/source/core/api/PrivateRow.hxx
@@ -33,26 +33,26 @@ namespace dbaccess
         explicit OPrivateRow(const ORowSetValueVector::Vector& i_aRow) : m_aRow(i_aRow),m_nPos(0)
         {
         }
-        virtual sal_Bool SAL_CALL wasNull(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getInt( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int64 SAL_CALL getLong( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( ::sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( ::sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( ::sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) override;
+        virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) override;
+        virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) override;
+        virtual ::sal_Int32 SAL_CALL getInt( ::sal_Int32 columnIndex ) override;
+        virtual ::sal_Int64 SAL_CALL getLong( ::sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( ::sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( ::sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( ::sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( ::sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( ::sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( ::sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( ::sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( ::sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( ::sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( ::sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( ::sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( ::sal_Int32 columnIndex ) override;
     };
 } // dbaccess
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_PRIVATEROW_HXX
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 7eb40876718b..f8e26041972c 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -280,7 +280,7 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c
 }
 
 //  typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_Prop;
-void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception)
+void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     switch(nHandle)
     {
@@ -419,7 +419,7 @@ void SAL_CALL ORowSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 }
 
 // css::XTypeProvider
-Sequence< Type > SAL_CALL ORowSet::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL ORowSet::getTypes()
 {
     OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(),
                             cppu::UnoType<XFastPropertySet>::get(),
@@ -428,13 +428,13 @@ Sequence< Type > SAL_CALL ORowSet::getTypes() throw (RuntimeException, std::exce
     return aTypes.getTypes();
 }
 
-Sequence< sal_Int8 > SAL_CALL ORowSet::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL ORowSet::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // css::XInterface
-Any SAL_CALL ORowSet::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL ORowSet::queryInterface( const Type & rType )
 {
     return ORowSet_BASE1::queryInterface( rType);
 }
@@ -450,7 +450,7 @@ void SAL_CALL ORowSet::release() throw()
 }
 
 // css::XUnoTunnel
-sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId )
 {
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast<sal_Int64>(this);
@@ -474,7 +474,7 @@ Sequence< sal_Int8 > ORowSet::getUnoTunnelImplementationId()
 }
 
 // css::XAggregation
-Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL ORowSet::queryAggregation( const Type& rType )
 {
     Any aRet(ORowSetBase::queryInterface(rType));
     if (!aRet.hasValue())
@@ -483,17 +483,17 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeExcepti
 }
 
 // css::XServiceInfo
-OUString SAL_CALL ORowSet::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ORowSet::getImplementationName()
 {
     return OUString("com.sun.star.comp.dba.ORowSet");
 }
 
-sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames()
 {
     Sequence< OUString > aSNS( 5 );
     aSNS[0] = SERVICE_SDBC_RESULTSET;
@@ -644,7 +644,7 @@ void ORowSet::setActiveConnection( Reference< XConnection >& _rxNewConn, bool _b
 }
 
 // css::XEventListener
-void SAL_CALL ORowSet::disposing( const css::lang::EventObject& Source ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSet::disposing( const css::lang::EventObject& Source )
 {
     // close rowset because the connection is going to be deleted (someone told me :-)
     Reference<XConnection> xCon(Source.Source,UNO_QUERY);
@@ -660,7 +660,7 @@ void SAL_CALL ORowSet::disposing( const css::lang::EventObject& Source ) throw(R
 }
 
 // XCloseable
-void SAL_CALL ORowSet::close(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::close(  )
 {
     {
         MutexGuard aGuard( m_aMutex );
@@ -701,7 +701,7 @@ void ORowSet::updateValue(sal_Int32 columnIndex,const ORowSetValue& x)
 }
 
 // XRowUpdate
-void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -716,67 +716,67 @@ void SAL_CALL ORowSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, R
     aNotify.firePropertyChange();
 }
 
-void SAL_CALL ORowSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x )
 {
     updateValue(columnIndex, static_cast<bool>(x));
 }
 
-void SAL_CALL ORowSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateByte( sal_Int32 columnIndex, sal_Int8 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateShort( sal_Int32 columnIndex, sal_Int16 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateInt( sal_Int32 columnIndex, sal_Int32 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateLong( sal_Int32 columnIndex, sal_Int64 x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateFloat( sal_Int32 columnIndex, float x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateDouble( sal_Int32 columnIndex, double x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateString( sal_Int32 columnIndex, const OUString& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x )
 {
     updateValue(columnIndex,x);
 }
 
-void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
@@ -791,7 +791,7 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc
     }
 }
 
-void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
@@ -804,7 +804,7 @@ void SAL_CALL ORowSet::updateCharacterStream( sal_Int32 columnIndex, const Refer
     aNotify.firePropertyChange();
 }
 
-void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
@@ -849,7 +849,7 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw
     }
 }
 
-void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 scale )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
@@ -885,7 +885,7 @@ namespace
 }
 
 // XResultSetUpdate
-void SAL_CALL ORowSet::insertRow() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::insertRow()
 {
     ProtectFlag aFlagControl(m_bInsertingRow);
 
@@ -944,7 +944,7 @@ void SAL_CALL ORowSet::insertRow() throw(SQLException, RuntimeException, std::ex
     fireRowcount();
 }
 
-void SAL_CALL ORowSet::updateRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::updateRow(  )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
     // not allowed when standing on insert row
@@ -1003,7 +1003,7 @@ void SAL_CALL ORowSet::updateRow(  ) throw(SQLException, RuntimeException, std::
     }
 }
 
-void SAL_CALL ORowSet::deleteRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::deleteRow(  )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -1093,12 +1093,12 @@ void ORowSet::implCancelRowUpdates( bool _bNotifyModified )
     }
 }
 
-void SAL_CALL ORowSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::cancelRowUpdates(  )
 {
     implCancelRowUpdates( true );
 }
 
-void SAL_CALL ORowSet::addRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSet::addRowSetListener( const Reference< XRowSetListener >& listener )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -1107,7 +1107,7 @@ void SAL_CALL ORowSet::addRowSetListener( const Reference< XRowSetListener >& li
         m_aRowsetListeners.addInterface(listener);
 }
 
-void SAL_CALL ORowSet::removeRowSetListener( const Reference< XRowSetListener >& listener ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSet::removeRowSetListener( const Reference< XRowSetListener >& listener )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -1178,7 +1178,7 @@ void ORowSet::fireRowcount()
     }
 }
 
-void SAL_CALL ORowSet::moveToInsertRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::moveToInsertRow(  )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -1266,7 +1266,7 @@ void ORowSet::impl_restoreDataColumnsWriteable_throw()
     m_aReadOnlyDataColumns.clear();
 }
 
-void SAL_CALL ORowSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::moveToCurrentRow(  )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -1302,7 +1302,7 @@ void SAL_CALL ORowSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException
 }
 
 // XRow
-sal_Bool SAL_CALL ORowSet::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSet::wasNull(  )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -1320,80 +1320,80 @@ const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex)
     return getValue(columnIndex);
 }
 
-OUString SAL_CALL ORowSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ORowSet::getString( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-sal_Bool SAL_CALL ORowSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSet::getBoolean( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     // the extra cast is to recognise the "true" or "false" strings
     return static_cast<bool>(getInsertValue(columnIndex));
 }
 
-sal_Int8 SAL_CALL ORowSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL ORowSet::getByte( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-sal_Int16 SAL_CALL ORowSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL ORowSet::getShort( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-sal_Int32 SAL_CALL ORowSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ORowSet::getInt( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-sal_Int64 SAL_CALL ORowSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL ORowSet::getLong( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-float SAL_CALL ORowSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL ORowSet::getFloat( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-double SAL_CALL ORowSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL ORowSet::getDouble( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL ORowSet::getBytes( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-css::util::Date SAL_CALL ORowSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL ORowSet::getDate( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-css::util::Time SAL_CALL ORowSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL ORowSet::getTime( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-css::util::DateTime SAL_CALL ORowSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL ORowSet::getTimestamp( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex);
 }
 
-Reference< css::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     if ( m_pCache && isInsertRow() )
@@ -1405,7 +1405,7 @@ Reference< css::io::XInputStream > SAL_CALL ORowSet::getBinaryStream( sal_Int32
     return ORowSetBase::getBinaryStream(columnIndex);
 }
 
-Reference< css::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     if(m_pCache && isInsertRow() )
@@ -1417,18 +1417,18 @@ Reference< css::io::XInputStream > SAL_CALL ORowSet::getCharacterStream( sal_Int
     return ORowSetBase::getCharacterStream(columnIndex);
 }
 
-Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ORowSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getInsertValue(columnIndex).makeAny();
 }
 
-Reference< XRef > SAL_CALL ORowSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL ORowSet::getRef( sal_Int32 /*columnIndex*/ )
 {
     return Reference< XRef >();
 }
 
-Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex )
 {
     if ( m_pCache && isInsertRow() )
     {
@@ -1438,17 +1438,17 @@ Reference< XBlob > SAL_CALL ORowSet::getBlob( sal_Int32 columnIndex ) throw(SQLE
     return ORowSetBase::getBlob(columnIndex);
 }
 
-Reference< XClob > SAL_CALL ORowSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL ORowSet::getClob( sal_Int32 columnIndex )
 {
     return Reference< XClob >(getInsertValue(columnIndex).makeAny(),UNO_QUERY);
 }
 
-Reference< XArray > SAL_CALL ORowSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL ORowSet::getArray( sal_Int32 /*columnIndex*/ )
 {
     return Reference< XArray >();
 }
 
-void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler )
 {
     if (!_rxHandler.is())
         execute();
@@ -1504,7 +1504,7 @@ void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandl
     execute_NoApprove_NoNewConn(aGuard);
 }
 
-Reference< XIndexAccess > SAL_CALL ORowSet::getParameters(  ) throw (RuntimeException, std::exception)
+Reference< XIndexAccess > SAL_CALL ORowSet::getParameters(  )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
@@ -1533,7 +1533,7 @@ Reference< XIndexAccess > SAL_CALL ORowSet::getParameters(  ) throw (RuntimeExce
     return m_pParameters.get();
 }
 
-void ORowSet::approveExecution() throw (RowSetVetoException, RuntimeException)
+void ORowSet::approveExecution()
 {
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     EventObject aEvt(*this);
@@ -1562,7 +1562,7 @@ void ORowSet::approveExecution() throw (RowSetVetoException, RuntimeException)
 }
 
 // XRowSet
-void SAL_CALL ORowSet::execute(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::execute(  )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -2051,7 +2051,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
 }
 
 // XRowSetApproveBroadcaster
-void SAL_CALL ORowSet::addRowSetApproveListener( const Reference< XRowSetApproveListener >& listener ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSet::addRowSetApproveListener( const Reference< XRowSetApproveListener >& listener )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -2060,7 +2060,7 @@ void SAL_CALL ORowSet::addRowSetApproveListener( const Reference< XRowSetApprove
     m_aApproveListeners.addInterface(listener);
 }
 
-void SAL_CALL ORowSet::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& listener ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSet::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& listener )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -2070,7 +2070,7 @@ void SAL_CALL ORowSet::removeRowSetApproveListener( const Reference< XRowSetAppr
 }
 
 // XRowsChangeBroadcaster
-void SAL_CALL ORowSet::addRowsChangeListener( const Reference< XRowsChangeListener >& listener ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSet::addRowsChangeListener( const Reference< XRowsChangeListener >& listener )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -2079,7 +2079,7 @@ void SAL_CALL ORowSet::addRowsChangeListener( const Reference< XRowsChangeListen
     m_aRowsChangeListener.addInterface(listener);
 }
 
-void SAL_CALL ORowSet::removeRowsChangeListener( const Reference< XRowsChangeListener >& listener ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSet::removeRowsChangeListener( const Reference< XRowsChangeListener >& listener )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -2089,7 +2089,7 @@ void SAL_CALL ORowSet::removeRowsChangeListener( const Reference< XRowsChangeLis
 }
 
 // XResultSetAccess
-Reference< XResultSet > SAL_CALL ORowSet::createResultSet(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ORowSet::createResultSet(  )
 {
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
 
@@ -2104,13 +2104,13 @@ Reference< XResultSet > SAL_CALL ORowSet::createResultSet(  ) throw(SQLException
 }
 
 // css::util::XCancellable
-void SAL_CALL ORowSet::cancel(  ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSet::cancel(  )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 }
 
 // css::sdbcx::XDeleteRows
-Sequence< sal_Int32 > SAL_CALL ORowSet::deleteRows( const Sequence< Any >& rows ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL ORowSet::deleteRows( const Sequence< Any >& rows )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -2200,7 +2200,7 @@ void ORowSet::notifyRowSetAndClonesRowDeleted( const Any& _rBookmark, sal_Int32
     }
 }
 
-Reference< XConnection >  ORowSet::calcConnection(const Reference< XInteractionHandler >& _rxHandler) throw( SQLException, RuntimeException, std::exception )
+Reference< XConnection >  ORowSet::calcConnection(const Reference< XInteractionHandler >& _rxHandler)
 {
     MutexGuard aGuard(m_aMutex);
     if (!m_xActiveConnection.is())
@@ -2502,7 +2502,7 @@ ORowSetValue& ORowSet::getParameterStorage(sal_Int32 parameterIndex)
 }
 
 // XParameters
-void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ )
 {
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
 
@@ -2510,7 +2510,7 @@ void SAL_CALL ORowSet::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/
     m_bParametersDirty = true;
 }
 
-void SAL_CALL ORowSet::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ )
 {
     setNull( parameterIndex, sqlType );
 }
@@ -2523,67 +2523,67 @@ void ORowSet::setParameter(sal_Int32 parameterIndex, const ORowSetValue& x)
     m_bParametersDirty = true;
 }
 
-void SAL_CALL ORowSet::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
 {
     setParameter(parameterIndex, static_cast<bool>(x));
 }
 
-void SAL_CALL ORowSet::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setByte( sal_Int32 parameterIndex, sal_Int8 x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setShort( sal_Int32 parameterIndex, sal_Int16 x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setInt( sal_Int32 parameterIndex, sal_Int32 x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setLong( sal_Int32 parameterIndex, sal_Int64 x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setFloat( sal_Int32 parameterIndex, float x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setDouble( sal_Int32 parameterIndex, double x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setString( sal_Int32 parameterIndex, const OUString& x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setDate( sal_Int32 parameterIndex, const css::util::Date& x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setTime( sal_Int32 parameterIndex, const css::util::Time& x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x )
 {
     setParameter(parameterIndex,x);
 }
 
-void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     ORowSetValue& rParamValue( getParameterStorage( parameterIndex ) );
@@ -2602,7 +2602,7 @@ void SAL_CALL ORowSet::setBinaryStream( sal_Int32 parameterIndex, const Referenc
     }
 }
 
-void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     ORowSetValue& rParamValue( getParameterStorage( parameterIndex ) );
@@ -2625,7 +2625,7 @@ void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Refer
     }
 }
 
-void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x )
 {
     if ( ::dbtools::implSetObject( this, parameterIndex, x ) )
     {
@@ -2637,7 +2637,7 @@ void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) throw
     }
 }
 
-void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 /*scale*/ )
 {
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
     ORowSetValue& rParamValue( getParameterStorage( parameterIndex ) );
@@ -2645,27 +2645,27 @@ void SAL_CALL ORowSet::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x
     rParamValue.setTypeKind( targetSqlType );
 }
 
-void SAL_CALL ORowSet::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setRef", *this );
 }
 
-void SAL_CALL ORowSet::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this );
 }
 
-void SAL_CALL ORowSet::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setClob", *this );
 }
 
-void SAL_CALL ORowSet::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setArray", *this );
 }
 
-void SAL_CALL ORowSet::clearParameters(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::clearParameters(  )
 {
     ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed);
 
@@ -2677,12 +2677,12 @@ void SAL_CALL ORowSet::clearParameters(  ) throw(SQLException, RuntimeException,
     m_aParametersSet.clear();
 }
 
-Any SAL_CALL ORowSet::getWarnings(  ) throw (SQLException, RuntimeException, std::exception)
+Any SAL_CALL ORowSet::getWarnings(  )
 {
     return m_aWarnings.getWarnings();
 }
 
-void SAL_CALL ORowSet::clearWarnings(  ) throw (SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::clearWarnings(  )
 {
     m_aWarnings.clearWarnings();
 }
@@ -2745,7 +2745,7 @@ void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_INVALID_INDEX ), StandardSQLState::INVALID_DESCRIPTOR_INDEX, *this );
 }
 
-void SAL_CALL ORowSet::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSet::refreshRow(  )
 {
 
     ORowSetNotifier aNotifier( this );
@@ -2867,13 +2867,13 @@ ORowSetClone::~ORowSetClone()
 }
 
 // css::XTypeProvider
-Sequence< Type > ORowSetClone::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > ORowSetClone::getTypes()
 {
     return ::comphelper::concatSequences(OSubComponent::getTypes(),ORowSetBase::getTypes());
 }
 
 // css::XInterface
-Any ORowSetClone::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any ORowSetClone::queryInterface( const Type & rType )
 {
     Any aRet = ORowSetBase::queryInterface(rType);
     if(!aRet.hasValue())
@@ -2892,17 +2892,17 @@ void ORowSetClone::release() throw()
 }
 
 // XServiceInfo
-OUString ORowSetClone::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString ORowSetClone::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.ORowSetClone");
 }
 
-sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > ORowSetClone::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > ORowSetClone::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = SERVICE_SDBC_RESULTSET;
@@ -2922,7 +2922,7 @@ void ORowSetClone::disposing()
 }
 
 // XCloseable
-void ORowSetClone::close() throw( SQLException, RuntimeException, std::exception )
+void ORowSetClone::close()
 {
     {
         MutexGuard aGuard( m_aMutex );
@@ -2963,7 +2963,7 @@ Sequence< sal_Int8 > ORowSetClone::getUnoTunnelImplementationId()
 }
 
 // css::XUnoTunnel
-sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId )
 {
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast<sal_Int64>(this);
@@ -2971,7 +2971,7 @@ sal_Int64 SAL_CALL ORowSetClone::getSomething( const Sequence< sal_Int8 >& rId )
     return 0;
 }
 
-void SAL_CALL ORowSetClone::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception)
+void SAL_CALL ORowSetClone::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     if ( nHandle == PROPERTY_ID_FETCHSIZE )
     {
@@ -3001,17 +3001,17 @@ bool ORowSetClone::isNew( )
     return false;
 }
 
-void SAL_CALL ORowSetClone::execute(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSetClone::execute(  )
 {
     throwFunctionNotSupportedSQLException( "RowSetClone::XRowSet::execute", *this );
 }
 
-void SAL_CALL ORowSetClone::addRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSetClone::addRowSetListener( const Reference< XRowSetListener >& )
 {
     throwFunctionNotSupportedRuntimeException( "RowSetClone::XRowSet", *this );
 }
 
-void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListener >& ) throw(RuntimeException, std::exception)
+void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListener >& )
 {
     throwFunctionNotSupportedRuntimeException( "RowSetClone::XRowSet", *this );
 }
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 01a85fbfd1e9..0e92d1cc3391 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -197,7 +197,7 @@ namespace dbaccess
 
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::sdbc::XConnection >  calcConnection(const css::uno::Reference< css::task::XInteractionHandler >& _rxHandler) throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception );
+        css::uno::Reference< css::sdbc::XConnection >  calcConnection(const css::uno::Reference< css::task::XInteractionHandler >& _rxHandler);
         // free clones and ParseTree. Plus, if _bComplete is <TRUE/>, *all* other associated resources
         void freeResources( bool _bComplete );
 
@@ -222,7 +222,7 @@ namespace dbaccess
         void impl_restoreDataColumnsWriteable_throw();
 
     protected:
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override;
         virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue,sal_Int32 nHandle) const override;
         virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _rDefault ) const override;
 
@@ -245,34 +245,34 @@ namespace dbaccess
         explicit ORowSet(const css::uno::Reference<css::uno::XComponentContext>&);
 
         // css::lang::XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::uno::XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
 
     // css::lang::XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
         static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
     // css::uno::XAggregation
-        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // OComponentHelper
         virtual void SAL_CALL disposing() override;
 
     // css::lang::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;
 
     // css::sdbc::XCloseable
-        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close(  ) override;
 
     // comphelper::OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
@@ -281,113 +281,113 @@ namespace dbaccess
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // css::sdbc::XResultSet
-        virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL refreshRow(  ) override;
 
     // XCompletedExecution
-        virtual void SAL_CALL executeWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL executeWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) override;
 
     // XParametersSupplier
-        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters(  ) override;
 
     // css::sdbc::XRow
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
 
     // css::sdbc::XRowUpdate
-        virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+        virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+        virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+        virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+        virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+        virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+        virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+        virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+        virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+        virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+        virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+        virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+        virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+        virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+        virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
 
     // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertRow(  ) override;
+        virtual void SAL_CALL updateRow(  ) override;
+        virtual void SAL_CALL deleteRow(  ) override;
+        virtual void SAL_CALL cancelRowUpdates(  ) override;
+        virtual void SAL_CALL moveToInsertRow(  ) override;
+        virtual void SAL_CALL moveToCurrentRow(  ) override;
 
     // css::sdbc::XRowSet
-        virtual void SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute(  ) override;
+        virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override;
+        virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override;
 
     // css::sdb::XRowSetApproveBroadcaster
-        virtual void SAL_CALL addRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) override;
+        virtual void SAL_CALL removeRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) override;
 
     // css::sdb::XRowsChangeBroadcaster
-        virtual void SAL_CALL addRowsChangeListener( const css::uno::Reference< css::sdb::XRowsChangeListener >& listener ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeRowsChangeListener( const css::uno::Reference< css::sdb::XRowsChangeListener >& listener ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addRowsChangeListener( const css::uno::Reference< css::sdb::XRowsChangeListener >& listener ) override;
+        virtual void SAL_CALL removeRowsChangeListener( const css::uno::Reference< css::sdb::XRowsChangeListener >& listener ) override;
 
     // css::sdb::XResultSetAccess
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createResultSet(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createResultSet(  ) override;
 
     // css::util::XCancellable
-        virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cancel(  ) override;
 
     // css::sdbcx::XDeleteRows
-        virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override;
 
     // XParameters
-        virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+        virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+        virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+        virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+        virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+        virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+        virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+        virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+        virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+        virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+        virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+        virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+        virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+        virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+        virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+        virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+        virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+        virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+        virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+        virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+        virtual void SAL_CALL clearParameters(  ) override;
 
         // XWarningsSupplier
-        virtual css::uno::Any SAL_CALL getWarnings(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearWarnings(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+        virtual void SAL_CALL clearWarnings(  ) override;
 
     protected:
         /** implement the <method>execute</method>, without calling the approve listeners and without building a new
@@ -400,7 +400,7 @@ namespace dbaccess
             @throws css::sdb::RowSetVetoException if one of the listeners vetoed
             @throws css::uno::RuntimeException
         */
-        void    approveExecution() throw (css::sdb::RowSetVetoException, css::uno::RuntimeException);
+        void    approveExecution();
 
         /// set m_xActiveConnection, fire a PropertyChangeEvent if necessary, do the event listener handling etc
         void setActiveConnection( css::uno::Reference< css::sdbc::XConnection >& _rxNewConn, bool _bFireEvent = true );
@@ -466,48 +466,48 @@ namespace dbaccess
         virtual bool        isModified( ) override;
         virtual bool        isNew( ) override;
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override;
     public:
         ORowSetClone( const css::uno::Reference<css::uno::XComponentContext>& _rContext, ORowSet& rParent, ::osl::Mutex* _pMutex );
         virtual ~ORowSetClone() override;
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override
         {
             return css::uno::Sequence<sal_Int8>();
         }
 
     // css::uno::XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // css::lang::XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
         static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
     // OComponentHelper
         virtual void SAL_CALL disposing() override;
 
     // css::sdbc::XCloseable
-        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close(  ) override;
 
     // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override
         {
             return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
         }
 
     // css::sdbc::XRowSet
-        virtual void SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute(  ) override;
+        virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override;
+        virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override;
 
     // comphelper::OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 539557243bb0..0f37b643ff04 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -57,13 +57,13 @@ namespace dbaccess
 class OEmptyCollection : public sdbcx::OCollection
 {
 protected:
-    virtual void impl_refresh() throw(RuntimeException) override;
+    virtual void impl_refresh() override;
     virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override;
 public:
     OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent, true, _rMutex, ::std::vector< OUString>()){}
 };
 
-void OEmptyCollection::impl_refresh() throw(RuntimeException)
+void OEmptyCollection::impl_refresh()
 {
 }
 
@@ -115,13 +115,13 @@ ORowSetBase::~ORowSetBase()
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > ORowSetBase::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > ORowSetBase::getTypes()
 {
     return ::comphelper::concatSequences(ORowSetBase_BASE::getTypes(),OPropertyStateContainer::getTypes());
 }
 
 // css::uno::XInterface
-Any ORowSetBase::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any ORowSetBase::queryInterface( const Type & rType )
 {
     Any aRet = ORowSetBase_BASE::queryInterface(rType);
     if(!aRet.hasValue())
@@ -182,7 +182,7 @@ void SAL_CALL ORowSetBase::disposing()
 }
 
 // XRow
-sal_Bool SAL_CALL ORowSetBase::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::wasNull(  )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -247,79 +247,79 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
     return m_aEmptyValue;
 }
 
-OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-sal_Bool SAL_CALL ORowSetBase::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::getBoolean( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return bool(getValue(columnIndex));
 }
 
-sal_Int8 SAL_CALL ORowSetBase::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL ORowSetBase::getByte( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-sal_Int16 SAL_CALL ORowSetBase::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL ORowSetBase::getShort( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-sal_Int32 SAL_CALL ORowSetBase::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ORowSetBase::getInt( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-sal_Int64 SAL_CALL ORowSetBase::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL ORowSetBase::getLong( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-float SAL_CALL ORowSetBase::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL ORowSetBase::getFloat( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-double SAL_CALL ORowSetBase::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL ORowSetBase::getDouble( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-css::util::Date SAL_CALL ORowSetBase::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL ORowSetBase::getDate( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-css::util::Time SAL_CALL ORowSetBase::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL ORowSetBase::getTime( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-css::util::DateTime SAL_CALL ORowSetBase::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL ORowSetBase::getTimestamp( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
-Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -353,12 +353,12 @@ Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_In
     return Reference< css::io::XInputStream >();
 }
 
-Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ORowSetBase::getCharacterStream( sal_Int32 columnIndex )
 {
     return getBinaryStream(columnIndex);
 }
 
-Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -366,30 +366,30 @@ Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNa
     return getValue(columnIndex).makeAny();
 }
 
-Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *m_pMySelf );
     return nullptr;
 }
 
-Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex )
 {
     return Reference< XBlob >(getValue(columnIndex).makeAny(),UNO_QUERY);
 }
 
-Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex )
 {
     return Reference< XClob >(getValue(columnIndex).makeAny(),UNO_QUERY);
 }
 
-Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ )
 {
     ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *m_pMySelf );
     return nullptr;
 }
 
 // css::sdbcx::XRowLocate
-Any SAL_CALL ORowSetBase::getBookmark(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ORowSetBase::getBookmark(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::getBookmark() Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
@@ -406,7 +406,7 @@ Any SAL_CALL ORowSetBase::getBookmark(  ) throw(SQLException, RuntimeException,
     return m_aBookmark;
 }
 
-sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark )
 {
     SAL_INFO("dbaccess", "ORowSetBase::moveToBookmark(Any) Clone = " << m_bClone);
     OSL_ENSURE(bookmark.hasValue(),"ORowSetBase::moveToBookmark bookmark has no value!");
@@ -456,7 +456,7 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx
     return bRet;
 }
 
-sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows )
 {
     SAL_INFO("dbaccess", "ORowSetBase::moveRelativeToBookmark(Any," << rows << ") Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
@@ -499,21 +499,21 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_
     return bRet;
 }
 
-sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any& _second )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
     return m_pCache->compareBookmarks(_first,_second);
 }
 
-sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks(  )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
     return m_pCache->hasOrderedBookmarks();
 }
 
-sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -521,7 +521,7 @@ sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLExc
 }
 
 // XResultSetMetaDataSupplier
-Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData(  )
 {
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
@@ -533,7 +533,7 @@ Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData(  ) throw(SQLE
 }
 
 // XColumnLocate
-sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName )
 {
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
@@ -543,7 +543,7 @@ sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(S
 }
 
 // css::sdbcx::XColumnsSupplier
-Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns(  )
 {
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
@@ -559,7 +559,7 @@ Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns(  ) throw(RuntimeExcep
 }
 
 // XResultSet
-sal_Bool SAL_CALL ORowSetBase::next(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::next(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::next() Clone = " << m_bClone);
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -619,7 +619,7 @@ sal_Bool SAL_CALL ORowSetBase::next(  ) throw(SQLException, RuntimeException, st
     return bRet;
 }
 
-sal_Bool SAL_CALL ORowSetBase::isBeforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::isBeforeFirst(  )
 {
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
@@ -630,7 +630,7 @@ sal_Bool SAL_CALL ORowSetBase::isBeforeFirst(  ) throw(SQLException, RuntimeExce
     return m_bBeforeFirst;
 }
 
-sal_Bool SAL_CALL ORowSetBase::isAfterLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::isAfterLast(  )
 {
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
@@ -645,7 +645,7 @@ bool ORowSetBase::isOnFirst()
     return isFirst();
 }
 
-sal_Bool SAL_CALL ORowSetBase::isFirst(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::isFirst(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::isFirst() Clone = " << m_bClone);
 
@@ -671,7 +671,7 @@ bool ORowSetBase::isOnLast()
     return isLast();
 }
 
-sal_Bool SAL_CALL ORowSetBase::isLast(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::isLast(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::isLast() Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
@@ -696,7 +696,7 @@ sal_Bool SAL_CALL ORowSetBase::isLast(  ) throw(SQLException, RuntimeException,
     return bIsLast;
 }
 
-void SAL_CALL ORowSetBase::beforeFirst(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSetBase::beforeFirst(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::beforeFirst() Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
@@ -737,7 +737,7 @@ void SAL_CALL ORowSetBase::beforeFirst(  ) throw(SQLException, RuntimeException,
     SAL_INFO("dbaccess", "ORowSetBase::beforeFirst() Clone = " << m_bClone);
 }
 
-void SAL_CALL ORowSetBase::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSetBase::afterLast(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::afterLast() Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
@@ -823,7 +823,7 @@ bool SAL_CALL ORowSetBase::move(    ::std::mem_fun_t<bool,ORowSetBase>& _aCheckF
     return bRet;
 }
 
-sal_Bool SAL_CALL ORowSetBase::first(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::first(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::first() Clone = " << m_bClone);
     ::std::mem_fun_t<bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst);
@@ -831,7 +831,7 @@ sal_Bool SAL_CALL ORowSetBase::first(  ) throw(SQLException, RuntimeException, s
     return move(ioF_tmp,F_tmp);
 }
 
-sal_Bool SAL_CALL ORowSetBase::last(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::last(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::last() Clone = " << m_bClone);
     ::std::mem_fun_t<bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast);
@@ -839,7 +839,7 @@ sal_Bool SAL_CALL ORowSetBase::last(  ) throw(SQLException, RuntimeException, st
     return move(ioL_tmp,L_tmp);
 }
 
-sal_Int32 SAL_CALL ORowSetBase::getRow(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ORowSetBase::getRow(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::getRow() Clone = " << m_bClone);
     ::osl::MutexGuard aGuard( *m_pMutex );
@@ -868,7 +868,7 @@ sal_Int32 ORowSetBase::impl_getRow()
     return nPos;
 }
 
-sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row )
 {
     SAL_INFO("dbaccess", "ORowSetBase::absolute(" << row << ") Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
@@ -913,7 +913,7 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, Run
     return bRet;
 }
 
-sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows )
 {
     SAL_INFO("dbaccess", "ORowSetBase::relative(" << rows << ") Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
@@ -968,7 +968,7 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru
     return bRet;
 }
 
-sal_Bool SAL_CALL ORowSetBase::previous(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::previous(  )
 {
     SAL_INFO("dbaccess", "ORowSetBase::previous() Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
@@ -1071,18 +1071,18 @@ void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow
     SAL_INFO("dbaccess", "ORowSetBase::setCurrentRow() Clone = " << m_bClone);
 }
 
-void ORowSetBase::checkPositioningAllowed() throw( SQLException, RuntimeException )
+void ORowSetBase::checkPositioningAllowed()
 {
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
         throwFunctionSequenceException(*m_pMySelf);
 }
 
-Reference< XInterface >  ORowSetBase::getStatement() throw( SQLException, RuntimeException, std::exception )
+Reference< XInterface >  ORowSetBase::getStatement()
 {
     return nullptr;
 }
 
-void SAL_CALL ORowSetBase::refreshRow(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSetBase::refreshRow(  )
 {
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
@@ -1100,7 +1100,7 @@ void SAL_CALL ORowSetBase::refreshRow(  ) throw(SQLException, RuntimeException,
     }
 }
 
-sal_Bool SAL_CALL ORowSetBase::rowUpdated(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::rowUpdated(  )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -1111,7 +1111,7 @@ sal_Bool SAL_CALL ORowSetBase::rowUpdated(  ) throw(SQLException, RuntimeExcepti
     return m_pCache->rowUpdated();
 }
 
-sal_Bool SAL_CALL ORowSetBase::rowInserted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::rowInserted(  )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
 
@@ -1123,7 +1123,7 @@ sal_Bool SAL_CALL ORowSetBase::rowInserted(  ) throw(SQLException, RuntimeExcept
     return m_pCache->rowInserted();
 }
 
-sal_Bool SAL_CALL ORowSetBase::rowDeleted(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ORowSetBase::rowDeleted(  )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -1136,7 +1136,7 @@ bool ORowSetBase::impl_rowDeleted(  )
 }
 
 // XWarningsSupplier
-Any SAL_CALL ORowSetBase::getWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ORowSetBase::getWarnings(  )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
 
@@ -1150,7 +1150,7 @@ Any SAL_CALL ORowSetBase::getWarnings(  ) throw(SQLException, RuntimeException,
     return Any();
 }
 
-void SAL_CALL ORowSetBase::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ORowSetBase::clearWarnings(  )
 {
     ::osl::MutexGuard aGuard( *m_pMutex );
 
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 9078c9bee44d..ca2a425c4f32 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -185,7 +185,7 @@ namespace dbaccess
         void setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard);
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        void checkPositioningAllowed() throw(css::sdbc::SQLException, css::uno::RuntimeException);
+        void checkPositioningAllowed();
         // checks  if the cache is null
         void checkCache();
         // sets the bookmark to Any()
@@ -238,7 +238,7 @@ namespace dbaccess
         virtual void SAL_CALL disposing();
 
     // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override
         {
             return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
         }
@@ -250,78 +250,78 @@ namespace dbaccess
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // css::uno::XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
 
     // css::sdbc::XWarningsSupplier
-        virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+        virtual void SAL_CALL clearWarnings(  ) override;
 
     // css::sdbc::XResultSetMetaDataSupplier
-        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
     // css::sdbc::XColumnLocate
-        virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
     // css::sdbcx::XColumnsSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
 
     // css::sdbc::XRow
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
 
     // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+        virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+        virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+        virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
 
     // css::sdbc::XResultSet
-        virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL next(  ) override;
+        virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+        virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+        virtual sal_Bool SAL_CALL isFirst(  ) override;
+        virtual sal_Bool SAL_CALL isLast(  ) override;
+        virtual void SAL_CALL beforeFirst(  ) override;
+        virtual void SAL_CALL afterLast(  ) override;
+        virtual sal_Bool SAL_CALL first(  ) override;
+        virtual sal_Bool SAL_CALL last(  ) override;
+        virtual sal_Int32 SAL_CALL getRow(  ) override;
+        virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+        virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+        virtual sal_Bool SAL_CALL previous(  ) override;
+        virtual void SAL_CALL refreshRow(  ) override;
+        virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+        virtual sal_Bool SAL_CALL rowInserted(  ) override;
+        virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
 
     // css::sdbc::XRowSet
-        virtual void SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override = 0;
-        virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override = 0;
-        virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) throw(css::uno::RuntimeException, std::exception) override = 0;
+        virtual void SAL_CALL execute(  ) override = 0;
+        virtual void SAL_CALL addRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override = 0;
+        virtual void SAL_CALL removeRowSetListener( const css::uno::Reference< css::sdbc::XRowSetListener >& listener ) override = 0;
 
         // is called when the rowset is going to delete this bookmark _rBookmark
         void onDeleteRow( const css::uno::Any& _rBookmark );
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index f10dd6a36dcb..b580068d12b7 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -296,7 +296,6 @@ IMPLEMENT_FORWARD_XINTERFACE3(OSingleSelectQueryComposer,OSubComponent,OSingleSe
 IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,"org.openoffice.comp.dba.OSingleSelectQueryComposer",SERVICE_NAME_SINGLESELECTQUERYCOMPOSER)
 
 css::uno::Sequence<sal_Int8> OSingleSelectQueryComposer::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -305,7 +304,7 @@ IMPLEMENT_GETTYPES3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryC
 IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer)
 
 // XSingleSelectQueryAnalyzer
-OUString SAL_CALL OSingleSelectQueryComposer::getQuery(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OSingleSelectQueryComposer::getQuery(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -314,7 +313,7 @@ OUString SAL_CALL OSingleSelectQueryComposer::getQuery(  ) throw(RuntimeExceptio
     return getStatementPart(F_tmp,m_aSqlIterator);
 }
 
-void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -334,7 +333,7 @@ void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command ) th
         m_aElementaryParts[ eLoopParts ].clear();
 }
 
-void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sal_Int32 _nCommandType ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sal_Int32 _nCommandType )
 {
     OUStringBuffer sSQL;
     switch(_nCommandType)
@@ -414,25 +413,25 @@ void OSingleSelectQueryComposer::setQuery_Impl( const OUString& command )
     getTables();
 }
 
-Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredHavingClause(  ) throw (RuntimeException, std::exception)
+Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredHavingClause(  )
 {
     TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleHavingTree);
     return getStructuredCondition(F_tmp);
 }
 
-Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredFilter(  ) throw(RuntimeException, std::exception)
+Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredFilter(  )
 {
     TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleWhereTree);
     return getStructuredCondition(F_tmp);
 }
 
-void SAL_CALL OSingleSelectQueryComposer::appendHavingClauseByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (SQLException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::appendHavingClauseByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator )
 {
     ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause);
     setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
 }
 
-void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw(SQLException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator )
 {
     ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetFilter);
     setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
@@ -547,7 +546,7 @@ OUString OSingleSelectQueryComposer::impl_getColumnNameOrderBy_throw(const Refer
     return impl_getColumnRealName_throw(column, false);
 }
 
-void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     OUString sColumnName( impl_getColumnNameOrderBy_throw(column) );
@@ -561,7 +560,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference<
     setOrder(sOrder);
 }
 
-void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference< XPropertySet >& column) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference< XPropertySet >& column)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     OUString sColumnName( impl_getColumnRealName_throw(column, true) );
@@ -586,12 +585,12 @@ OUString OSingleSelectQueryComposer::composeStatementFromParts( const ::std::vec
     return aSql.makeStringAndClear();
 }
 
-OUString SAL_CALL OSingleSelectQueryComposer::getElementaryQuery() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OSingleSelectQueryComposer::getElementaryQuery()
 {
     return composeStatementFromParts( m_aElementaryParts );
 }
 
-void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _rElementary ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _rElementary )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -702,28 +701,28 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const
     }
 }
 
-void SAL_CALL OSingleSelectQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::setFilter( const OUString& filter )
 {
     setSingleAdditiveClause( Where, filter );
 }
 
-void SAL_CALL OSingleSelectQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::setOrder( const OUString& order )
 {
     setSingleAdditiveClause( Order, order );
 }
 
-void SAL_CALL OSingleSelectQueryComposer::setGroup( const OUString& group ) throw (SQLException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::setGroup( const OUString& group )
 {
     setSingleAdditiveClause( Group, group );
 }
 
-void SAL_CALL OSingleSelectQueryComposer::setHavingClause( const OUString& filter ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::setHavingClause( const OUString& filter )
 {
     setSingleAdditiveClause( Having, filter );
 }
 
 // XTablesSupplier
-Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -743,7 +742,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables(  ) thro
 }
 
 // XColumnsSupplier
-Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1228,28 +1227,28 @@ OUString OSingleSelectQueryComposer::getColumnName( ::connectivity::OSQLParseNod
     return aColumnName;
 }
 
-OUString SAL_CALL OSingleSelectQueryComposer::getFilter(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OSingleSelectQueryComposer::getFilter(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
     return getSQLPart(Where,m_aAdditiveIterator,false);
 }
 
-OUString SAL_CALL OSingleSelectQueryComposer::getOrder(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OSingleSelectQueryComposer::getOrder(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
     return getSQLPart(Order,m_aAdditiveIterator,false);
 }
 
-OUString SAL_CALL OSingleSelectQueryComposer::getGroup(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL OSingleSelectQueryComposer::getGroup(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
     return getSQLPart(Group,m_aAdditiveIterator,false);
 }
 
-OUString OSingleSelectQueryComposer::getHavingClause() throw (RuntimeException, std::exception)
+OUString OSingleSelectQueryComposer::getHavingClause()
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1329,7 +1328,7 @@ OUString OSingleSelectQueryComposer::getTableAlias(const Reference< XPropertySet
     return sReturn;
 }
 
-Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters(  ) throw(RuntimeException, std::exception)
+Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters(  )
 {
     // now set the Parameters
     if ( !m_aCurrentColumns[ParameterColumns] )
@@ -1397,17 +1396,17 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn
     return m_aCurrentColumns[_eType];
 }
 
-Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getGroupColumns(  ) throw(RuntimeException, std::exception)
+Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getGroupColumns(  )
 {
     return setCurrentColumns( GroupByColumns, m_aAdditiveIterator.getGroupColumns() );
 }
 
-Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getOrderColumns(  ) throw(RuntimeException, std::exception)
+Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getOrderColumns(  )
 {
     return setCurrentColumns( OrderColumns, m_aAdditiveIterator.getOrderColumns() );
 }
 
-OUString SAL_CALL OSingleSelectQueryComposer::getQueryWithSubstitution(  ) throw (SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OSingleSelectQueryComposer::getQueryWithSubstitution(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
@@ -1517,13 +1516,13 @@ namespace
     }
 }
 
-void SAL_CALL OSingleSelectQueryComposer::setStructuredFilter( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, css::lang::IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::setStructuredFilter( const Sequence< Sequence< PropertyValue > >& filter )
 {
     OPredicateInputController aPredicateInput(m_aContext, m_xConnection, &m_aParseContext);
     setFilter(lcl_getCondition(filter, aPredicateInput, getColumns(), m_xMetaData->getIdentifierQuoteString()));
 }
 
-void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, RuntimeException, std::exception)
+void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Sequence< Sequence< PropertyValue > >& filter )
 {
     OPredicateInputController aPredicateInput(m_aContext, m_xConnection);
     setHavingClause(lcl_getCondition(filter, aPredicateInput, getColumns(), m_xMetaData->getIdentifierQuoteString()));
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index e73c2bb6a7f1..5fc3a9276d32 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -44,18 +44,18 @@ void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/)
 }
 
 // css::sdbcx::XRowLocate
-Any SAL_CALL OStaticSet::getBookmark() throw(SQLException, RuntimeException)
+Any SAL_CALL OStaticSet::getBookmark()
 {
     return makeAny(getRow());
 }
 
-bool SAL_CALL OStaticSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::moveToBookmark( const Any& bookmark )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     return absolute(::comphelper::getINT32(bookmark));
 }
 
-sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _second )
 {
     sal_Int32 nFirst = 0, nSecond = 0;
     _first >>= nFirst;
@@ -63,12 +63,12 @@ sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _
     return (nFirst < nSecond) ? CompareBookmark::LESS : ((nFirst > nSecond) ? CompareBookmark::GREATER : CompareBookmark::EQUAL);
 }
 
-bool SAL_CALL OStaticSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::hasOrderedBookmarks(  )
 {
     return true;
 }
 
-sal_Int32 SAL_CALL OStaticSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OStaticSet::hashBookmark( const Any& bookmark )
 {
     return ::comphelper::getINT32(bookmark);
 }
@@ -108,7 +108,7 @@ void OStaticSet::fillAllRows()
 }
 
 // XResultSet
-bool SAL_CALL OStaticSet::next() throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OStaticSet::next()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
 
@@ -125,30 +125,30 @@ bool SAL_CALL OStaticSet::next() throw(SQLException, RuntimeException, std::exce
     return !isAfterLast();
 }
 
-bool SAL_CALL OStaticSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::isBeforeFirst(  )
 {
     return m_aSetIter == m_aSet.begin();
 }
 
-bool SAL_CALL OStaticSet::isAfterLast(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::isAfterLast(  )
 {
     return m_aSetIter == m_aSet.end() && m_bEnd;
 }
 
-void SAL_CALL OStaticSet::beforeFirst(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OStaticSet::beforeFirst(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aSetIter = m_aSet.begin();
 }
 
-void SAL_CALL OStaticSet::afterLast(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStaticSet::afterLast(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     fillAllRows();
     m_aSetIter = m_aSet.end();
 }
 
-bool SAL_CALL OStaticSet::first() throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OStaticSet::first()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     m_aSetIter = m_aSet.begin()+1;
@@ -158,7 +158,7 @@ bool SAL_CALL OStaticSet::first() throw(SQLException, RuntimeException, std::exc
     return m_aSetIter != m_aSet.end();
 }
 
-bool SAL_CALL OStaticSet::last() throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OStaticSet::last()
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     fillAllRows();
@@ -167,7 +167,7 @@ bool SAL_CALL OStaticSet::last() throw(SQLException, RuntimeException, std::exce
     return !isBeforeFirst() && !isAfterLast();
 }
 
-sal_Int32 SAL_CALL OStaticSet::getRow(  ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OStaticSet::getRow(  )
 {
     OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!");
     OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!");
@@ -177,7 +177,7 @@ sal_Int32 SAL_CALL OStaticSet::getRow(  ) throw(SQLException, RuntimeException)
     return nPos;
 }
 
-bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception)
+bool SAL_CALL OStaticSet::absolute( sal_Int32 row )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
     OSL_ENSURE(row,"OStaticSet::absolute: INVALID row number!");
@@ -217,7 +217,7 @@ bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeE
     return m_aSetIter != m_aSet.end() && m_aSetIter != m_aSet.begin();
 }
 
-bool SAL_CALL OStaticSet::previous(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::previous(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
 
@@ -227,26 +227,26 @@ bool SAL_CALL OStaticSet::previous(  ) throw(SQLException, RuntimeException)
     return m_aSetIter != m_aSet.begin();
 }
 
-void SAL_CALL OStaticSet::refreshRow(  ) throw(SQLException, RuntimeException)
+void SAL_CALL OStaticSet::refreshRow(  )
 {
 }
 
-bool SAL_CALL OStaticSet::rowUpdated(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::rowUpdated(  )
 {
     return m_bUpdated;
 }
 
-bool SAL_CALL OStaticSet::rowInserted(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::rowInserted(  )
 {
     return m_bInserted;
 }
 
-bool SAL_CALL OStaticSet::rowDeleted(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL OStaticSet::rowDeleted(  )
 {
     return m_bDeleted;
 }
 
-void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException)
+void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable )
 {
     OCacheSet::insertRow( _rInsertRow,_xTable);
     if(m_bInserted)
@@ -258,7 +258,7 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connect
     }
 }
 
-void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
+void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  )
 {
     OCacheSet::deleteRow(_rDeleteRow,_xTable);
     if(m_bDeleted)
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 20744419a731..064d789f3f7d 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -45,30 +45,30 @@ namespace dbaccess
 
         virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) override;
         // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual css::uno::Any SAL_CALL getBookmark() override;
+        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+        virtual bool SAL_CALL hasOrderedBookmarks(  ) override;
+        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
 
         // css::sdbc::XResultSet
-        virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual bool SAL_CALL next() override;
+        virtual bool SAL_CALL isBeforeFirst(  ) override;
+        virtual bool SAL_CALL isAfterLast(  ) override;
+        virtual void SAL_CALL beforeFirst(  ) override;
+        virtual void SAL_CALL afterLast(  ) override;
+        virtual bool SAL_CALL first() override;
+        virtual bool SAL_CALL last() override;
+        virtual sal_Int32 SAL_CALL getRow(  ) override;
+        virtual bool SAL_CALL absolute( sal_Int32 row ) override;
+        virtual bool SAL_CALL previous(  ) override;
+        virtual void SAL_CALL refreshRow(  ) override;
+        virtual bool SAL_CALL rowUpdated(  ) override;
+        virtual bool SAL_CALL rowInserted(  ) override;
+        virtual bool SAL_CALL rowDeleted(  ) override;
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable  ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_STATICSET_HXX
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 54c82bc8b542..267ca0527967 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -59,7 +59,7 @@ using namespace ::cppu;
 // ODBTableDecorator
 
 ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnection, const Reference< XColumnsSupplier >& _rxNewTable,
-        const Reference< XNumberFormatsSupplier >& _rxNumberFormats, const Reference< XNameAccess >& _xColumnDefinitions ) throw(SQLException)
+        const Reference< XNumberFormatsSupplier >& _rxNumberFormats, const Reference< XNameAccess >& _xColumnDefinitions )
     :OTableDescriptor_BASE(m_aMutex)
     ,ODataSettings(OTableDescriptor_BASE::rBHelper)
     ,m_xTable(_rxNewTable)
@@ -77,7 +77,7 @@ ODBTableDecorator::~ODBTableDecorator()
 {
 }
 
-Sequence< sal_Int8 > ODBTableDecorator::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > ODBTableDecorator::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -103,7 +103,6 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue(
                             Any & rOldValue,
                             sal_Int32 nHandle,
                             const Any& rValue )
-                                throw (css::lang::IllegalArgumentException)
 {
     bool bRet = true;
     switch(nHandle)
@@ -148,7 +147,7 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue(
     return bRet;
 }
 
-void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception, std::exception)
+void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
 {
     switch(_nHandle)
     {
@@ -361,7 +360,7 @@ void ODBTableDecorator::construct()
 // XServiceInfo
 IMPLEMENT_SERVICE_INFO1(ODBTableDecorator, "com.sun.star.sdb.dbaccess.ODBTableDecorator", SERVICE_SDBCX_TABLE)
 
-Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType )
 {
     Any aRet;
     if(m_xTable.is())
@@ -378,7 +377,7 @@ Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(Runti
     return aRet;
 }
 
-Sequence< Type > SAL_CALL ODBTableDecorator::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL ODBTableDecorator::getTypes(  )
 {
     Reference<XTypeProvider> xTypes(m_xTable,UNO_QUERY);
     OSL_ENSURE(xTypes.is(),"Table must be a TypePropvider!");
@@ -386,7 +385,7 @@ Sequence< Type > SAL_CALL ODBTableDecorator::getTypes(  ) throw(RuntimeException
 }
 
 // XRename,
-void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -400,7 +399,7 @@ void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLEx
 }
 
 // XAlterTable,
-void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -415,7 +414,7 @@ void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, cons
         m_pColumns->refresh();
 }
 
-void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Reference< XPropertySet >& _rxDescriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -430,21 +429,21 @@ void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Re
         throw SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_ALTER_BY_INDEX),*this,SQLSTATE_GENERAL,1000,Any() );
 }
 
-Reference< XNameAccess> ODBTableDecorator::getIndexes() throw (RuntimeException, std::exception)
+Reference< XNameAccess> ODBTableDecorator::getIndexes()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
     return Reference< XIndexesSupplier>(m_xTable,UNO_QUERY)->getIndexes();
 }
 
-Reference< XIndexAccess> ODBTableDecorator::getKeys() throw (RuntimeException, std::exception)
+Reference< XIndexAccess> ODBTableDecorator::getKeys()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
     return Reference< XKeysSupplier>(m_xTable,UNO_QUERY)->getKeys();
 }
 
-Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException, std::exception)
+Reference< XNameAccess> ODBTableDecorator::getColumns()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -455,7 +454,7 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException,
     return m_pColumns.get();
 }
 
-OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ODBTableDecorator::getName()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -464,7 +463,7 @@ OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException, std::exce
     return xName->getName();
 }
 
-sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& rId )
 {
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast<sal_Int64>(this);
@@ -521,7 +520,7 @@ void ODBTableDecorator::fillPrivileges() const
     }
 }
 
-Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -540,7 +539,7 @@ Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor(  ) t
     );
 }
 
-Reference< css::beans::XPropertySetInfo > SAL_CALL ODBTableDecorator::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL ODBTableDecorator::getPropertySetInfo(  )
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
@@ -638,7 +637,7 @@ void SAL_CALL ODBTableDecorator::release() throw()
     OTableDescriptor_BASE::release();
 }
 
-void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ )
 {
     throwFunctionNotSupportedRuntimeException( "XNamed::setName", *this );
 }
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
index 41e4800c69c9..024ea15608e4 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -71,7 +71,7 @@ namespace dbaccess
     IMPLEMENT_FORWARD_REFCOUNT( View, View_Base )
     IMPLEMENT_GET_IMPLEMENTATION_ID( View )
 
-    Any SAL_CALL View::queryInterface( const Type & _rType ) throw(RuntimeException, std::exception)
+    Any SAL_CALL View::queryInterface( const Type & _rType )
     {
         if(_rType == cppu::UnoType<XAlterView>::get()&& !m_xViewAccess.is() )
             return Any();
@@ -81,7 +81,7 @@ namespace dbaccess
         return aReturn;
     }
 
-    Sequence< Type > SAL_CALL View::getTypes(  ) throw(RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL View::getTypes(  )
     {
         Type aAlterType = cppu::UnoType<XAlterView>::get();
 
@@ -100,7 +100,7 @@ namespace dbaccess
         return Sequence< Type >(aOwnTypes.data(), aOwnTypes.size());
     }
 
-    void SAL_CALL View::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException, std::exception)
+    void SAL_CALL View::alterCommand( const OUString& _rNewCommand )
     {
         OSL_ENSURE(m_xViewAccess.is(),"Illegal call to AlterView!");
         m_xViewAccess->alterCommand(this,_rNewCommand);
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index 09fd80116228..77836d7746e2 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -49,7 +49,7 @@ void WrappedResultSet::reset(const Reference< XResultSet>& _xDriverSet)
     construct(_xDriverSet, m_sRowSetFilter);
 }
 
-Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeException)
+Any SAL_CALL WrappedResultSet::getBookmark()
 {
     if ( m_xRowLocate.is() )
     {
@@ -58,27 +58,27 @@ Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeExceptio
     return makeAny(m_xDriverSet->getRow());
 }
 
-bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark )
 {
     return m_xRowLocate->moveToBookmark( bookmark );
 }
 
-sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second )
 {
     return m_xRowLocate->compareBookmarks( _first,_second );
 }
 
-bool SAL_CALL WrappedResultSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
+bool SAL_CALL WrappedResultSet::hasOrderedBookmarks(  )
 {
     return m_xRowLocate->hasOrderedBookmarks();
 }
 
-sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark )
 {
     return m_xRowLocate->hashBookmark(bookmark);
 }
 
-void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ )
 {
     m_xUpd->moveToInsertRow();
     sal_Int32 i = 1;
@@ -92,7 +92,7 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c
     (*_rInsertRow->get().begin()) = getBookmark();
 }
 
-void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/  )
 {
     sal_Int32 i = 1;
     connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1;
@@ -105,7 +105,7 @@ void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const O
     m_xUpd->updateRow();
 }
 
-void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
+void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  )
 {
     m_xUpd->deleteRow();
 }
diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx
index c6ca18aa00bb..7d5608637c49 100644
--- a/dbaccess/source/core/api/WrappedResultSet.hxx
+++ b/dbaccess/source/core/api/WrappedResultSet.hxx
@@ -45,15 +45,15 @@ namespace dbaccess
         virtual void construct(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) override;
         virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) override;
         // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual css::uno::Any SAL_CALL getBookmark() override;
+        virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+        virtual bool SAL_CALL hasOrderedBookmarks(  ) override;
+        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
         // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+        virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) override;
+        virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable   ) override;
+        virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable   ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_WRAPPEDRESULTSET_HXX
diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx
index 9d92f275c5d5..050931dc76a6 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -34,7 +34,7 @@ using namespace ::cppu;
 using namespace ::osl;
 
 // css::lang::XTypeProvider
-Sequence< Type > OCallableStatement::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OCallableStatement::getTypes()
 {
     OTypeCollection aTypes(cppu::UnoType<XRow>::get(),
                            cppu::UnoType<XOutParameters>::get(),
@@ -43,13 +43,13 @@ Sequence< Type > OCallableStatement::getTypes() throw (RuntimeException, std::ex
     return aTypes.getTypes();
 }
 
-Sequence< sal_Int8 > OCallableStatement::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > OCallableStatement::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // css::uno::XInterface
-Any OCallableStatement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any OCallableStatement::queryInterface( const Type & rType )
 {
     Any aIface = OPreparedStatement::queryInterface( rType );
     if (!aIface.hasValue())
@@ -71,12 +71,12 @@ void OCallableStatement::release() throw ()
 }
 
 // XServiceInfo
-OUString OCallableStatement::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString OCallableStatement::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OCallableStatement");
 }
 
-Sequence< OUString > OCallableStatement::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OCallableStatement::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS.getArray()[0] = SERVICE_SDBC_CALLABLESTATEMENT;
@@ -85,7 +85,7 @@ Sequence< OUString > OCallableStatement::getSupportedServiceNames(  ) throw (Run
 }
 
 // XOutParameters
-void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -94,7 +94,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex
     Reference< XOutParameters >(m_xAggregateAsSet, UNO_QUERY)->registerOutParameter( parameterIndex, sqlType, typeName );
 }
 
-void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -103,7 +103,7 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet
 }
 
 // XRow
-sal_Bool SAL_CALL OCallableStatement::wasNull(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OCallableStatement::wasNull(  )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -111,7 +111,7 @@ sal_Bool SAL_CALL OCallableStatement::wasNull(  ) throw(SQLException, RuntimeExc
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->wasNull();
 }
 
-OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -119,7 +119,7 @@ OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(S
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getString( columnIndex );
 }
 
-sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -127,7 +127,7 @@ sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBoolean( columnIndex );
 }
 
-sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -135,63 +135,63 @@ sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQL
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getByte( columnIndex );
 }
 
-sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getShort( columnIndex );
 }
 
-sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getInt( columnIndex );
 }
 
-sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getLong( columnIndex );
 }
 
-float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getFloat( columnIndex );
 }
 
-double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDouble( columnIndex );
 }
 
-Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBytes( columnIndex );
 }
 
-css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDate( columnIndex );
 }
 
-css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getTime( columnIndex );
 }
 
-css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -199,7 +199,7 @@ css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnI
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getTimestamp( columnIndex );
 }
 
-Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -207,7 +207,7 @@ Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream(
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBinaryStream( columnIndex );
 }
 
-Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -215,7 +215,7 @@ Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStre
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getCharacterStream( columnIndex );
 }
 
-Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -223,28 +223,28 @@ Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Referen
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getObject( columnIndex, typeMap );
 }
 
-Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getRef( columnIndex );
 }
 
-Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBlob( columnIndex );
 }
 
-Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getClob( columnIndex );
 }
 
-Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 columnIndex )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index 2bc0b5d66c87..cab05f9f9f63 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -76,7 +76,7 @@ OColumn::~OColumn()
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > OColumn::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OColumn::getTypes()
 {
     return ::comphelper::concatSequences(
         OColumnBase::getTypes(),
@@ -88,17 +88,17 @@ Sequence< Type > OColumn::getTypes() throw (RuntimeException, std::exception)
 IMPLEMENT_FORWARD_XINTERFACE2( OColumn, OColumnBase, ::comphelper::OPropertyContainer )
 
 // css::lang::XServiceInfo
-OUString OColumn::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString OColumn::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OColumn");
 }
 
-sal_Bool OColumn::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool OColumn::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > OColumn::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OColumn::getSupportedServiceNames(  )
 {
     Sequence<OUString> aSNS { SERVICE_SDBCX_COLUMN };
     return aSNS;
@@ -111,17 +111,17 @@ void OColumn::disposing()
 }
 
 // css::beans::XPropertySet
-Reference< XPropertySetInfo > OColumn::getPropertySetInfo() throw (RuntimeException, std::exception)
+Reference< XPropertySetInfo > OColumn::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() ) ;
 }
 
-OUString SAL_CALL OColumn::getName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OColumn::getName(  )
 {
     return m_sName;
 }
 
-void SAL_CALL OColumn::setName( const OUString& _rName ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OColumn::setName( const OUString& _rName )
 {
     m_sName = _rName;
 }
@@ -186,17 +186,17 @@ OColumns::~OColumns()
 }
 
 // XServiceInfo
-OUString OColumns::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString OColumns::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OColumns");
 }
 
-sal_Bool OColumns::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool OColumns::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > OColumns::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OColumns::getSupportedServiceNames(  )
 {
     Sequence<OUString> aSNS { SERVICE_SDBCX_CONTAINER };
     return aSNS;
@@ -230,7 +230,7 @@ void SAL_CALL OColumns::disposing()
     OColumns_BASE::disposing();
 }
 
-void OColumns::impl_refresh() throw(css::uno::RuntimeException)
+void OColumns::impl_refresh()
 {
     if (m_pRefreshColumns)
         m_pRefreshColumns->refreshColumns();
@@ -270,7 +270,7 @@ Reference< XPropertySet > OColumns::createDescriptor()
         return Reference< XPropertySet >();
 }
 
-Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OColumns::queryInterface( const Type & rType )
 {
     Any aRet;
     if(m_xDrvColumns.is())
@@ -296,7 +296,7 @@ Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeExcepti
     return aRet;
 }
 
-Sequence< Type > SAL_CALL OColumns::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OColumns::getTypes(  )
 {
     bool bAppendFound = false,bDropFound = false;
 
@@ -410,13 +410,13 @@ void OColumns::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
     ::dbaccess::notifyDataSourceModified(m_xParent,true);
 }
 
-Reference< XInterface > SAL_CALL OColumns::getParent(  ) throw (RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OColumns::getParent(  )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return m_xParent;
 }
 
-void SAL_CALL OColumns::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL OColumns::setParent( const Reference< XInterface >& _xParent )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     m_xParent = _xParent;
diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx
index d83ea5c46791..4d131e74d319 100644
--- a/dbaccess/source/core/api/datacolumn.cxx
+++ b/dbaccess/source/core/api/datacolumn.cxx
@@ -57,7 +57,7 @@ ODataColumn::~ODataColumn()
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > ODataColumn::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > ODataColumn::getTypes()
 {
     OTypeCollection aTypes(cppu::UnoType<XColumn>::get(),
                            cppu::UnoType<XColumnUpdate>::get(),
@@ -65,12 +65,12 @@ Sequence< Type > ODataColumn::getTypes() throw (RuntimeException, std::exception
     return aTypes.getTypes();
 }
 
-Sequence< sal_Int8 > ODataColumn::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > ODataColumn::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL ODataColumn::queryInterface( const Type & _rType )
 {
     Any aReturn = OResultColumn::queryInterface(_rType);
     if (!aReturn.hasValue())
@@ -82,12 +82,12 @@ Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeEx
 }
 
 // XServiceInfo
-OUString ODataColumn::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString ODataColumn::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.ODataColumn");
 }
 
-Sequence< OUString > ODataColumn::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > ODataColumn::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSNS( 3 );
     aSNS[0] = SERVICE_SDBCX_COLUMN;
@@ -106,7 +106,7 @@ void ODataColumn::disposing()
 }
 
 // css::sdb::XColumn
-sal_Bool ODataColumn::wasNull() throw( SQLException, RuntimeException, std::exception )
+sal_Bool ODataColumn::wasNull()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -114,7 +114,7 @@ sal_Bool ODataColumn::wasNull() throw( SQLException, RuntimeException, std::exce
     return m_xRow->wasNull();
 }
 
-OUString ODataColumn::getString() throw( SQLException, RuntimeException, std::exception )
+OUString ODataColumn::getString()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -122,7 +122,7 @@ OUString ODataColumn::getString() throw( SQLException, RuntimeException, std::ex
     return m_xRow->getString(m_nPos);
 }
 
-sal_Bool ODataColumn::getBoolean() throw( SQLException, RuntimeException, std::exception )
+sal_Bool ODataColumn::getBoolean()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -130,7 +130,7 @@ sal_Bool ODataColumn::getBoolean() throw( SQLException, RuntimeException, std::e
     return m_xRow->getBoolean(m_nPos);
 }
 
-sal_Int8 ODataColumn::getByte() throw( SQLException, RuntimeException, std::exception )
+sal_Int8 ODataColumn::getByte()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -138,7 +138,7 @@ sal_Int8 ODataColumn::getByte() throw( SQLException, RuntimeException, std::exce
     return m_xRow->getByte(m_nPos);
 }
 
-sal_Int16 ODataColumn::getShort() throw( SQLException, RuntimeException, std::exception )
+sal_Int16 ODataColumn::getShort()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -146,7 +146,7 @@ sal_Int16 ODataColumn::getShort() throw( SQLException, RuntimeException, std::ex
     return m_xRow->getShort(m_nPos);
 }
 
-sal_Int32 ODataColumn::getInt() throw( SQLException, RuntimeException, std::exception )
+sal_Int32 ODataColumn::getInt()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -154,7 +154,7 @@ sal_Int32 ODataColumn::getInt() throw( SQLException, RuntimeException, std::exce
     return m_xRow->getInt(m_nPos);
 }
 
-sal_Int64 ODataColumn::getLong() throw( SQLException, RuntimeException, std::exception )
+sal_Int64 ODataColumn::getLong()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -162,7 +162,7 @@ sal_Int64 ODataColumn::getLong() throw( SQLException, RuntimeException, std::exc
     return m_xRow->getLong(m_nPos);
 }
 
-float ODataColumn::getFloat() throw( SQLException, RuntimeException, std::exception )
+float ODataColumn::getFloat()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -170,7 +170,7 @@ float ODataColumn::getFloat() throw( SQLException, RuntimeException, std::except
     return m_xRow->getFloat(m_nPos);
 }
 
-double ODataColumn::getDouble() throw( SQLException, RuntimeException, std::exception )
+double ODataColumn::getDouble()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -178,7 +178,7 @@ double ODataColumn::getDouble() throw( SQLException, RuntimeException, std::exce
     return m_xRow->getDouble(m_nPos);
 }
 
-Sequence< sal_Int8 > ODataColumn::getBytes() throw( SQLException, RuntimeException, std::exception )
+Sequence< sal_Int8 > ODataColumn::getBytes()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -186,7 +186,7 @@ Sequence< sal_Int8 > ODataColumn::getBytes() throw( SQLException, RuntimeExcepti
     return m_xRow->getBytes(m_nPos);
 }
 
-css::util::Date ODataColumn::getDate() throw( SQLException, RuntimeException, std::exception )
+css::util::Date ODataColumn::getDate()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -194,7 +194,7 @@ css::util::Date ODataColumn::getDate() throw( SQLException, RuntimeException, st
     return m_xRow->getDate(m_nPos);
 }
 
-css::util::Time ODataColumn::getTime() throw( SQLException, RuntimeException, std::exception )
+css::util::Time ODataColumn::getTime()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -202,7 +202,7 @@ css::util::Time ODataColumn::getTime() throw( SQLException, RuntimeException, st
     return m_xRow->getTime(m_nPos);
 }
 
-css::util::DateTime ODataColumn::getTimestamp() throw( SQLException, RuntimeException, std::exception )
+css::util::DateTime ODataColumn::getTimestamp()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -210,7 +210,7 @@ css::util::DateTime ODataColumn::getTimestamp() throw( SQLException, RuntimeExce
     return m_xRow->getTimestamp(m_nPos);
 }
 
-Reference< css::io::XInputStream >  ODataColumn::getBinaryStream() throw( SQLException, RuntimeException, std::exception )
+Reference< css::io::XInputStream >  ODataColumn::getBinaryStream()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -218,7 +218,7 @@ Reference< css::io::XInputStream >  ODataColumn::getBinaryStream() throw( SQLExc
     return m_xRow->getBinaryStream(m_nPos);
 }
 
-Reference< css::io::XInputStream >  ODataColumn::getCharacterStream() throw( SQLException, RuntimeException, std::exception )
+Reference< css::io::XInputStream >  ODataColumn::getCharacterStream()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -226,7 +226,7 @@ Reference< css::io::XInputStream >  ODataColumn::getCharacterStream() throw( SQL
     return m_xRow->getCharacterStream(m_nPos);
 }
 
-Any ODataColumn::getObject(const Reference< css::container::XNameAccess > & typeMap) throw( SQLException, RuntimeException, std::exception )
+Any ODataColumn::getObject(const Reference< css::container::XNameAccess > & typeMap)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -234,7 +234,7 @@ Any ODataColumn::getObject(const Reference< css::container::XNameAccess > & type
     return m_xRow->getObject(m_nPos, typeMap);
 }
 
-Reference< XRef >  ODataColumn::getRef() throw( SQLException, RuntimeException, std::exception )
+Reference< XRef >  ODataColumn::getRef()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -242,7 +242,7 @@ Reference< XRef >  ODataColumn::getRef() throw( SQLException, RuntimeException,
     return m_xRow->getRef(m_nPos);
 }
 
-Reference< XBlob >  ODataColumn::getBlob() throw( SQLException, RuntimeException, std::exception )
+Reference< XBlob >  ODataColumn::getBlob()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -250,7 +250,7 @@ Reference< XBlob >  ODataColumn::getBlob() throw( SQLException, RuntimeException
     return m_xRow->getBlob(m_nPos);
 }
 
-Reference< XClob >  ODataColumn::getClob() throw( SQLException, RuntimeException, std::exception )
+Reference< XClob >  ODataColumn::getClob()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -258,7 +258,7 @@ Reference< XClob >  ODataColumn::getClob() throw( SQLException, RuntimeException
     return m_xRow->getClob(m_nPos);
 }
 
-Reference< XArray >  ODataColumn::getArray() throw( SQLException, RuntimeException, std::exception )
+Reference< XArray >  ODataColumn::getArray()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(!m_xRow.is());
@@ -267,7 +267,7 @@ Reference< XArray >  ODataColumn::getArray() throw( SQLException, RuntimeExcepti
 }
 
 // css::sdb::XColumnUpdate
-void ODataColumn::updateNull() throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateNull()
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -275,7 +275,7 @@ void ODataColumn::updateNull() throw( SQLException, RuntimeException, std::excep
     m_xRowUpdate->updateNull(m_nPos);
 }
 
-void ODataColumn::updateBoolean(sal_Bool x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateBoolean(sal_Bool x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -283,7 +283,7 @@ void ODataColumn::updateBoolean(sal_Bool x) throw( SQLException, RuntimeExceptio
     m_xRowUpdate->updateBoolean(m_nPos, x);
 }
 
-void ODataColumn::updateByte(sal_Int8 x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateByte(sal_Int8 x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -291,7 +291,7 @@ void ODataColumn::updateByte(sal_Int8 x) throw( SQLException, RuntimeException,
     m_xRowUpdate->updateByte(m_nPos, x);
 }
 
-void ODataColumn::updateShort(sal_Int16 x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateShort(sal_Int16 x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -299,7 +299,7 @@ void ODataColumn::updateShort(sal_Int16 x) throw( SQLException, RuntimeException
     m_xRowUpdate->updateShort(m_nPos, x);
 }
 
-void ODataColumn::updateInt(sal_Int32 x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateInt(sal_Int32 x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -307,7 +307,7 @@ void ODataColumn::updateInt(sal_Int32 x) throw( SQLException, RuntimeException,
     m_xRowUpdate->updateInt(m_nPos, x);
 }
 
-void ODataColumn::updateLong(sal_Int64 x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateLong(sal_Int64 x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -315,7 +315,7 @@ void ODataColumn::updateLong(sal_Int64 x) throw( SQLException, RuntimeException,
     m_xRowUpdate->updateLong(m_nPos, x);
 }
 
-void ODataColumn::updateFloat(float x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateFloat(float x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -323,7 +323,7 @@ void ODataColumn::updateFloat(float x) throw( SQLException, RuntimeException, st
     m_xRowUpdate->updateFloat(m_nPos, x);
 }
 
-void ODataColumn::updateDouble(double x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateDouble(double x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -331,7 +331,7 @@ void ODataColumn::updateDouble(double x) throw( SQLException, RuntimeException,
     m_xRowUpdate->updateDouble(m_nPos, x);
 }
 
-void ODataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateString(const OUString& x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -339,7 +339,7 @@ void ODataColumn::updateString(const OUString& x) throw( SQLException, RuntimeEx
     m_xRowUpdate->updateString(m_nPos, x);
 }
 
-void ODataColumn::updateBytes(const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateBytes(const Sequence< sal_Int8 >& x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -347,7 +347,7 @@ void ODataColumn::updateBytes(const Sequence< sal_Int8 >& x) throw( SQLException
     m_xRowUpdate->updateBytes(m_nPos, x);
 }
 
-void ODataColumn::updateDate(const css::util::Date& x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateDate(const css::util::Date& x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -355,7 +355,7 @@ void ODataColumn::updateDate(const css::util::Date& x) throw( SQLException, Runt
     m_xRowUpdate->updateDate(m_nPos, x);
 }
 
-void ODataColumn::updateTime(const css::util::Time& x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateTime(const css::util::Time& x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -363,7 +363,7 @@ void ODataColumn::updateTime(const css::util::Time& x) throw( SQLException, Runt
     m_xRowUpdate->updateTime(m_nPos, x);
 }
 
-void ODataColumn::updateTimestamp(const css::util::DateTime& x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateTimestamp(const css::util::DateTime& x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -371,7 +371,7 @@ void ODataColumn::updateTimestamp(const css::util::DateTime& x) throw( SQLExcept
     m_xRowUpdate->updateTimestamp(m_nPos, x);
 }
 
-void ODataColumn::updateCharacterStream(const Reference< css::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateCharacterStream(const Reference< css::io::XInputStream > & x, sal_Int32 length)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -379,7 +379,7 @@ void ODataColumn::updateCharacterStream(const Reference< css::io::XInputStream >
     m_xRowUpdate->updateCharacterStream(m_nPos, x, length);
 }
 
-void ODataColumn::updateBinaryStream(const Reference< css::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateBinaryStream(const Reference< css::io::XInputStream > & x, sal_Int32 length)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -387,7 +387,7 @@ void ODataColumn::updateBinaryStream(const Reference< css::io::XInputStream > &
     m_xRowUpdate->updateBinaryStream(m_nPos, x, length);
 }
 
-void ODataColumn::updateNumericObject(const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateNumericObject(const Any& x, sal_Int32 scale)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
@@ -395,7 +395,7 @@ void ODataColumn::updateNumericObject(const Any& x, sal_Int32 scale) throw( SQLE
     m_xRowUpdate->updateNumericObject(m_nPos, x, scale);
 }
 
-void ODataColumn::updateObject(const Any& x) throw( SQLException, RuntimeException, std::exception )
+void ODataColumn::updateObject(const Any& x)
 {
     MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(!m_xRowUpdate.is());
diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx
index f4d32ebc5957..71063c834814 100644
--- a/dbaccess/source/core/api/datacolumn.hxx
+++ b/dbaccess/source/core/api/datacolumn.hxx
@@ -48,61 +48,61 @@ namespace dbaccess
                       const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxDBMeta);
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::uno::XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override { OResultColumn::acquire(); }
         virtual void SAL_CALL release() throw() override { OResultColumn::release(); }
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // cppu::OComponentHelper
         virtual void SAL_CALL disposing() override;
 
     // css::sdb::XColumn
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString(  ) override;
+        virtual sal_Bool SAL_CALL getBoolean(  ) override;
+        virtual sal_Int8 SAL_CALL getByte(  ) override;
+        virtual sal_Int16 SAL_CALL getShort(  ) override;
+        virtual sal_Int32 SAL_CALL getInt(  ) override;
+        virtual sal_Int64 SAL_CALL getLong(  ) override;
+        virtual float SAL_CALL getFloat(  ) override;
+        virtual double SAL_CALL getDouble(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(  ) override;
+        virtual css::util::Date SAL_CALL getDate(  ) override;
+        virtual css::util::Time SAL_CALL getTime(  ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp(  ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(  ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(  ) override;
+        virtual css::uno::Any SAL_CALL getObject( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef(  ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob(  ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob(  ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray(  ) override;
 
     // css::sdb::XColumnUpdate
-        virtual void SAL_CALL updateNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBoolean( sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateByte( sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateShort( sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateInt( sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateLong( sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateFloat( float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDouble( double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateString( const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBytes( const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDate( const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTime( const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTimestamp( const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBinaryStream( const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateCharacterStream( const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateObject( const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateNumericObject( const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateNull(  ) override;
+        virtual void SAL_CALL updateBoolean( sal_Bool x ) override;
+        virtual void SAL_CALL updateByte( sal_Int8 x ) override;
+        virtual void SAL_CALL updateShort( sal_Int16 x ) override;
+        virtual void SAL_CALL updateInt( sal_Int32 x ) override;
+        virtual void SAL_CALL updateLong( sal_Int64 x ) override;
+        virtual void SAL_CALL updateFloat( float x ) override;
+        virtual void SAL_CALL updateDouble( double x ) override;
+        virtual void SAL_CALL updateString( const OUString& x ) override;
+        virtual void SAL_CALL updateBytes( const css::uno::Sequence< sal_Int8 >& x ) override;
+        virtual void SAL_CALL updateDate( const css::util::Date& x ) override;
+        virtual void SAL_CALL updateTime( const css::util::Time& x ) override;
+        virtual void SAL_CALL updateTimestamp( const css::util::DateTime& x ) override;
+        virtual void SAL_CALL updateBinaryStream( const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL updateCharacterStream( const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL updateObject( const css::uno::Any& x ) override;
+        virtual void SAL_CALL updateNumericObject( const css::uno::Any& x, sal_Int32 scale ) override;
     };
 }
 
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index c8d7e9dc6e2f..477cd1cde9e6 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -84,12 +84,12 @@ void OTableColumnDescriptor::impl_registerProperties()
 IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptor )
 
 // css::lang::XServiceInfo
-OUString OTableColumnDescriptor::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString OTableColumnDescriptor::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OTableColumnDescriptor");
 }
 
-Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = m_bActAsDescriptor ? OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) : OUString(SERVICE_SDBCX_COLUMN);
@@ -111,19 +111,19 @@ Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames(  ) throw
     return *static_cast< ::comphelper::OPropertyArrayUsageHelper< OTableColumnDescriptor >* >(this)->getArrayHelper();
 }
 
-void OTableColumnDescriptor::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+void OTableColumnDescriptor::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     OColumn::setFastPropertyValue_NoBroadcast( nHandle, rValue );
     ::dbaccess::notifyDataSourceModified( m_xParent, true );
 }
 
-Reference< XInterface > SAL_CALL OTableColumnDescriptor::getParent(  ) throw (RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OTableColumnDescriptor::getParent(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xParent;
 }
 
-void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& _xParent )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_xParent = _xParent;
@@ -143,7 +143,7 @@ OTableColumn::~OTableColumn()
 
 IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn )
 
-OUString OTableColumn::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString OTableColumn::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OTableColumn");
 }
@@ -264,7 +264,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const
 
 IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn )
 
-OUString SAL_CALL OQueryColumn::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OQueryColumn::getImplementationName(  )
 {
     return OUString( "org.openoffice.comp.dbaccess.OQueryColumn"  );
 }
@@ -365,7 +365,7 @@ void OColumnWrapper::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
 }
 
 sal_Bool OColumnWrapper::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle,
-            const Any& rValue ) throw (IllegalArgumentException)
+            const Any& rValue )
 {
     bool bModified( false );
     if ( OColumn::isRegisteredProperty( nHandle ) )
@@ -384,7 +384,7 @@ sal_Bool OColumnWrapper::convertFastPropertyValue( Any & rConvertedValue, Any &
     return bModified;
 }
 
-void OColumnWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+void OColumnWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     if ( OColumn::isRegisteredProperty( nHandle ) )
     {
@@ -410,12 +410,12 @@ OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< X
 IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptorWrapper )
 
 // css::lang::XServiceInfo
-OUString OTableColumnDescriptorWrapper::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString OTableColumnDescriptorWrapper::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OTableColumnDescriptorWrapper");
 }
 
-Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = SERVICE_SDBCX_COLUMNDESCRIPTOR;
@@ -509,7 +509,7 @@ void OTableColumnDescriptorWrapper::getFastPropertyValue( Any& rValue, sal_Int32
     }
 }
 
-sal_Bool OTableColumnDescriptorWrapper::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException)
+sal_Bool OTableColumnDescriptorWrapper::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
 {
     bool bModified(false);
     if ( m_bPureWrap )
@@ -537,7 +537,6 @@ void OTableColumnDescriptorWrapper::setFastPropertyValue_NoBroadcast(
                                                 sal_Int32 nHandle,
                                                 const Any& rValue
                                                  )
-                                                 throw (Exception, std::exception)
 {
     if ( m_bPureWrap )
     {
@@ -575,12 +574,12 @@ OTableColumnWrapper::~OTableColumnWrapper()
 
 IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnWrapper )
 
-OUString OTableColumnWrapper::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString OTableColumnWrapper::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OTableColumnWrapper" );
 }
 
-Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = SERVICE_SDBCX_COLUMN;
diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index bf8ec3472f35..5874a33ea7eb 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -64,7 +64,7 @@ OPreparedStatement::~OPreparedStatement()
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > OPreparedStatement::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OPreparedStatement::getTypes()
 {
     OTypeCollection aTypes(cppu::UnoType<XServiceInfo>::get(),
                            cppu::UnoType<XPreparedStatement>::get(),
@@ -76,13 +76,13 @@ Sequence< Type > OPreparedStatement::getTypes() throw (RuntimeException, std::ex
     return aTypes.getTypes();
 }
 
-Sequence< sal_Int8 > OPreparedStatement::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > OPreparedStatement::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // css::uno::XInterface
-Any OPreparedStatement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any OPreparedStatement::queryInterface( const Type & rType )
 {
     Any aIface = OStatementBase::queryInterface( rType );
     if (!aIface.hasValue())
@@ -109,17 +109,17 @@ void OPreparedStatement::release() throw ()
 }
 
 // XServiceInfo
-OUString OPreparedStatement::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString OPreparedStatement::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OPreparedStatement");
 }
 
-sal_Bool OPreparedStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool OPreparedStatement::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > OPreparedStatement::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OPreparedStatement::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS.getArray()[0] = SERVICE_SDBC_PREPAREDSTATEMENT;
@@ -139,7 +139,7 @@ void OPreparedStatement::disposing()
 }
 
 // css::sdbcx::XColumnsSupplier
-Reference< css::container::XNameAccess > OPreparedStatement::getColumns() throw( RuntimeException, std::exception )
+Reference< css::container::XNameAccess > OPreparedStatement::getColumns()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -173,7 +173,7 @@ Reference< css::container::XNameAccess > OPreparedStatement::getColumns() throw(
 }
 
 // XResultSetMetaDataSupplier
-Reference< XResultSetMetaData > OPreparedStatement::getMetaData() throw( SQLException, RuntimeException, std::exception )
+Reference< XResultSetMetaData > OPreparedStatement::getMetaData()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -181,7 +181,7 @@ Reference< XResultSetMetaData > OPreparedStatement::getMetaData() throw( SQLExce
 }
 
 // XPreparedStatement
-Reference< XResultSet >  OPreparedStatement::executeQuery() throw( SQLException, RuntimeException, std::exception )
+Reference< XResultSet >  OPreparedStatement::executeQuery()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -200,7 +200,7 @@ Reference< XResultSet >  OPreparedStatement::executeQuery() throw( SQLException,
     return xResultSet;
 }
 
-sal_Int32 OPreparedStatement::executeUpdate() throw( SQLException, RuntimeException, std::exception )
+sal_Int32 OPreparedStatement::executeUpdate()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -210,7 +210,7 @@ sal_Int32 OPreparedStatement::executeUpdate() throw( SQLException, RuntimeExcept
     return Reference< XPreparedStatement >( m_xAggregateAsSet, UNO_QUERY_THROW )->executeUpdate();
 }
 
-sal_Bool OPreparedStatement::execute() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OPreparedStatement::execute()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -220,13 +220,13 @@ sal_Bool OPreparedStatement::execute() throw( SQLException, RuntimeException, st
     return Reference< XPreparedStatement >( m_xAggregateAsSet, UNO_QUERY_THROW )->execute();
 }
 
-Reference< XConnection > OPreparedStatement::getConnection() throw( SQLException, RuntimeException, std::exception )
+Reference< XConnection > OPreparedStatement::getConnection()
 {
     return Reference< XConnection > (m_xParent, UNO_QUERY);
 }
 
 // XParameters
-void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -234,7 +234,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s
     m_xAggregateAsParameters->setNull(parameterIndex, sqlType);
 }
 
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -242,7 +242,7 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I
     m_xAggregateAsParameters->setObjectNull(parameterIndex, sqlType, typeName);
 }
 
-void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -250,7 +250,7 @@ void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool
     m_xAggregateAsParameters->setBoolean(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -258,7 +258,7 @@ void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x
     m_xAggregateAsParameters->setByte(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -266,7 +266,7 @@ void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16
     m_xAggregateAsParameters->setShort(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -274,7 +274,7 @@ void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x
     m_xAggregateAsParameters->setInt(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -282,7 +282,7 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x
     m_xAggregateAsParameters->setLong(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -290,7 +290,7 @@ void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
     m_xAggregateAsParameters->setFloat(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -298,7 +298,7 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x
     m_xAggregateAsParameters->setDouble(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -306,7 +306,7 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS
     m_xAggregateAsParameters->setString(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -314,7 +314,7 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ
     m_xAggregateAsParameters->setBytes(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -322,7 +322,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const css::
     m_xAggregateAsParameters->setDate(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -330,7 +330,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::
     m_xAggregateAsParameters->setTime(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -338,7 +338,7 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const
     m_xAggregateAsParameters->setTimestamp(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -346,7 +346,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con
     m_xAggregateAsParameters->setBinaryStream(parameterIndex, x, length);
 }
 
-void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -354,7 +354,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex,
     m_xAggregateAsParameters->setCharacterStream(parameterIndex, x, length);
 }
 
-void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -362,7 +362,7 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
     m_xAggregateAsParameters->setObject(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -370,7 +370,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
     m_xAggregateAsParameters->setObjectWithInfo(parameterIndex, x, targetSqlType, scale);
 }
 
-void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -378,7 +378,7 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Refere
     m_xAggregateAsParameters->setRef(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -386,7 +386,7 @@ void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Refer
     m_xAggregateAsParameters->setBlob(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -394,7 +394,7 @@ void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Refer
     m_xAggregateAsParameters->setClob(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -402,7 +402,7 @@ void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Refe
     m_xAggregateAsParameters->setArray(parameterIndex, x);
 }
 
-void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OPreparedStatement::clearParameters(  )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 468c08f6ab6e..c9853f0fe967 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -108,7 +108,6 @@ OQuery::~OQuery()
 }
 
 css::uno::Sequence<sal_Int8> OQuery::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -218,7 +217,7 @@ void OQuery::rebuildColumns()
 IMPLEMENT_SERVICE_INFO3(OQuery, "com.sun.star.sdb.dbaccess.OQuery", SERVICE_SDB_DATASETTINGS, SERVICE_SDB_QUERY, "com.sun.star.sdb.QueryDefinition")
 
 // css::beans::XPropertyChangeListener
-void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) throw(RuntimeException, std::exception)
+void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource )
 {
     sal_Int32 nOwnHandle = -1;
     {
@@ -250,7 +249,7 @@ void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource ) thro
     fire(&nOwnHandle, &_rSource.NewValue, &_rSource.OldValue, 1, false);
 }
 
-void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+void SAL_CALL OQuery::disposing( const EventObject& _rSource )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -263,7 +262,7 @@ void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeExc
 }
 
 // XDataDescriptorFactory
-Reference< XPropertySet > SAL_CALL OQuery::createDataDescriptor(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL OQuery::createDataDescriptor(  )
 {
     return new OQueryDescriptor(*this);
 }
@@ -282,7 +281,7 @@ void SAL_CALL OQuery::disposing()
     m_pWarnings = nullptr;
 }
 
-void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception)
+void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
 {
     ODataSettings::setFastPropertyValue_NoBroadcast(_nHandle, _rValue);
     OUString sAggPropName;
@@ -302,7 +301,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r
     }
 }
 
-Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo(  )
 {
     return createPropertySetInfo( getInfoHelper() ) ;
 }
@@ -325,7 +324,7 @@ OColumn* OQuery::createColumn(const OUString& /*_rName*/) const
     return nullptr;
 }
 
-void SAL_CALL OQuery::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL OQuery::rename( const OUString& newName )
 {
     MutexGuard aGuard(m_aMutex);
     Reference<XRename> xRename(m_xCommandDefinition,UNO_QUERY);
diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx
index 16ce7a25463b..d30bd602e7ac 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -96,16 +96,14 @@ public:
             const css::uno::Reference< css::uno::XComponentContext >& _xORB
         );
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
 // css::uno::XInterface
     DECLARE_XINTERFACE( )
 
 // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
 // OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -114,26 +112,25 @@ public:
     DECLARE_SERVICE_INFO();
 
 // css::sdbcx::XDataDescriptorFactory
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 
 // css::beans::XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
 // css::lang::XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) override;
 
 // OPropertySetHelper
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                     sal_Int32 nHandle,
-                    const css::uno::Any& rValue )
-            throw (css::uno::Exception, std::exception) override;
+                    const css::uno::Any& rValue ) override;
 
 public:
     // the caller is responsible for the lifetime!
     void                            setWarningsContainer( ::dbtools::WarningsContainer* _pWarnings )   { m_pWarnings = _pWarnings; }
 
     // XRename
-    virtual void SAL_CALL rename( const OUString& newName ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rename( const OUString& newName ) override;
 
 protected:
     virtual void SAL_CALL disposing() override;
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 193f659b8a19..03f1b47901a9 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -83,17 +83,17 @@ void SAL_CALL OQueryComposer::disposing()
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > SAL_CALL OQueryComposer::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OQueryComposer::getTypes()
 {
     return ::comphelper::concatSequences(OSubComponent::getTypes(),OQueryComposer_BASE::getTypes());
 }
 
-Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OQueryComposer::queryInterface( const Type & rType )
 {
     Any aRet = OSubComponent::queryInterface(rType);
     if(!aRet.hasValue())
@@ -102,24 +102,24 @@ Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeE
 }
 
 // XServiceInfo
-OUString OQueryComposer::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString OQueryComposer::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.dbaccess.OQueryComposer");
 }
 
-sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > OQueryComposer::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OQueryComposer::getSupportedServiceNames(  )
 {
     Sequence<OUString> aSNS { SERVICE_SDB_SQLQUERYCOMPOSER };
     return aSNS;
 }
 
 // XSQLQueryComposer
-OUString SAL_CALL OQueryComposer::getQuery(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OQueryComposer::getQuery(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -131,7 +131,7 @@ OUString SAL_CALL OQueryComposer::getQuery(  ) throw(RuntimeException, std::exce
     return sQuery;
 }
 
-void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OQueryComposer::setQuery( const OUString& command )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -142,7 +142,7 @@ void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLExcep
     m_sOrgOrder = m_xComposer->getOrder();
 }
 
-OUString SAL_CALL OQueryComposer::getComposedQuery(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OQueryComposer::getComposedQuery(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -151,7 +151,7 @@ OUString SAL_CALL OQueryComposer::getComposedQuery(  ) throw(RuntimeException, s
     return m_xComposer->getQuery();
 }
 
-OUString SAL_CALL OQueryComposer::getFilter(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OQueryComposer::getFilter(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     MutexGuard aGuard(m_aMutex);
@@ -160,7 +160,7 @@ OUString SAL_CALL OQueryComposer::getFilter(  ) throw(RuntimeException, std::exc
     return aFilterCreator.getComposedAndClear();
 }
 
-Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilter(  ) throw(RuntimeException, std::exception)
+Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilter(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -168,7 +168,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilt
     return m_xComposer->getStructuredFilter();
 }
 
-OUString SAL_CALL OQueryComposer::getOrder(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OQueryComposer::getOrder(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -178,7 +178,7 @@ OUString SAL_CALL OQueryComposer::getOrder(  ) throw(RuntimeException, std::exce
     return aOrderCreator.getComposedAndClear();
 }
 
-void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -194,7 +194,7 @@ void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySe
     setFilter( aFilterCreator.getComposedAndClear() );
 }
 
-void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -210,7 +210,7 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet
     setOrder(aOrderCreator.getComposedAndClear());
 }
 
-void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OQueryComposer::setFilter( const OUString& filter )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -226,7 +226,7 @@ void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLExcep
     m_xComposer->setFilter( aFilterCreator.getComposedAndClear() );
 }
 
-void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OQueryComposer::setOrder( const OUString& order )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -244,7 +244,7 @@ void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLExcepti
 }
 
 // XTablesSupplier
-Reference< XNameAccess > SAL_CALL OQueryComposer::getTables(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OQueryComposer::getTables(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -253,7 +253,7 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getTables(  ) throw(RuntimeExc
 }
 
 // XColumnsSupplier
-Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -261,7 +261,7 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns(  ) throw(RuntimeEx
     return Reference<XColumnsSupplier>(m_xComposer,UNO_QUERY)->getColumns();
 }
 
-Reference< XIndexAccess > SAL_CALL OQueryComposer::getParameters(  ) throw(RuntimeException, std::exception)
+Reference< XIndexAccess > SAL_CALL OQueryComposer::getParameters(  )
 {
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index eec3aceb9b42..0c7ce3a7da9a 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -139,13 +139,13 @@ void OQueryContainer::disposing()
 IMPLEMENT_SERVICE_INFO2(OQueryContainer, "com.sun.star.sdb.dbaccess.OQueryContainer", SERVICE_SDBCX_CONTAINER, SERVICE_SDB_QUERIES)
 
 // XDataDescriptorFactory
-Reference< XPropertySet > SAL_CALL OQueryContainer::createDataDescriptor(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL OQueryContainer::createDataDescriptor(  )
 {
     return new OQueryDescriptor();
 }
 
 // XAppend
-void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet >& _rxDesc ) throw(SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet >& _rxDesc )
 {
     ResettableMutexGuard aGuard(m_aMutex);
     if ( !m_xCommandDefinitions.is() )
@@ -199,7 +199,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet
 }
 
 // XDrop
-void SAL_CALL OQueryContainer::dropByName( const OUString& _rName ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL OQueryContainer::dropByName( const OUString& _rName )
 {
     MutexGuard aGuard(m_aMutex);
     if ( !checkExistence(_rName) )
@@ -213,7 +213,7 @@ void SAL_CALL OQueryContainer::dropByName( const OUString& _rName ) throw(SQLExc
     m_xCommandDefinitions->removeByName(_rName);
 }
 
-void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLException, IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex )
 {
     MutexGuard aGuard(m_aMutex);
     if ((_nIndex<0) || (_nIndex>getCount()))
@@ -230,7 +230,7 @@ void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLExcepti
     dropByName(sName);
 }
 
-void SAL_CALL OQueryContainer::elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OQueryContainer::elementInserted( const css::container::ContainerEvent& _rEvent )
 {
     Reference< XContent > xNewElement;
     OUString sElementName;
@@ -252,7 +252,7 @@ void SAL_CALL OQueryContainer::elementInserted( const css::container::ContainerE
     insertByName(sElementName,makeAny(xNewElement));
 }
 
-void SAL_CALL OQueryContainer::elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OQueryContainer::elementRemoved( const css::container::ContainerEvent& _rEvent )
 {
     OUString sAccessor;
     _rEvent.Accessor >>= sAccessor;
@@ -265,7 +265,7 @@ void SAL_CALL OQueryContainer::elementRemoved( const css::container::ContainerEv
     removeByName(sAccessor);
 }
 
-void SAL_CALL OQueryContainer::elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OQueryContainer::elementReplaced( const css::container::ContainerEvent& _rEvent )
 {
     Reference< XPropertySet > xReplacedElement;
     Reference< XContent > xNewElement;
@@ -285,7 +285,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const css::container::ContainerE
     replaceByName(sAccessor,makeAny(xNewElement));
 }
 
-Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const ContainerEvent& Event ) throw (WrappedTargetException, RuntimeException, std::exception)
+Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const ContainerEvent& Event )
 {
     OUString sName;
     OSL_VERIFY( Event.Accessor >>= sName );
@@ -303,17 +303,17 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const Contain
     return xReturn;
 }
 
-Reference< XVeto > SAL_CALL OQueryContainer::approveReplaceElement( const ContainerEvent& /*Event*/ ) throw (WrappedTargetException, RuntimeException, std::exception)
+Reference< XVeto > SAL_CALL OQueryContainer::approveReplaceElement( const ContainerEvent& /*Event*/ )
 {
     return nullptr;
 }
 
-Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const ContainerEvent& /*Event*/ ) throw (WrappedTargetException, RuntimeException, std::exception)
+Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const ContainerEvent& /*Event*/ )
 {
     return nullptr;
 }
 
-void SAL_CALL OQueryContainer::disposing( const css::lang::EventObject& _rSource ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OQueryContainer::disposing( const css::lang::EventObject& _rSource )
 {
     if (_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinitions, UNO_QUERY).get())
     {   // our "master container" (with the command definitions) is being disposed
@@ -397,19 +397,19 @@ bool OQueryContainer::checkExistence(const OUString& _rName)
     return bRet;
 }
 
-sal_Bool SAL_CALL OQueryContainer::hasElements( ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL OQueryContainer::hasElements( )
 {
     MutexGuard aGuard(m_aMutex);
     return m_xCommandDefinitions->hasElements();
 }
 
-sal_Int32 SAL_CALL OQueryContainer::getCount(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OQueryContainer::getCount(  )
 {
     MutexGuard aGuard(m_aMutex);
     return Reference<XIndexAccess>(m_xCommandDefinitions,UNO_QUERY)->getCount();
 }
 
-Sequence< OUString > SAL_CALL OQueryContainer::getElementNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OQueryContainer::getElementNames(  )
 {
     MutexGuard aGuard(m_aMutex);
 
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index ef49745ed791..1f9c3a5ff25c 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -66,7 +66,6 @@ OQueryDescriptor::~OQueryDescriptor()
 }
 
 css::uno::Sequence<sal_Int8> OQueryDescriptor::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -100,7 +99,7 @@ void OQueryDescriptor::registerProperties()
                     &m_aLayoutInformation, cppu::UnoType<decltype(m_aLayoutInformation)>::get());
 }
 
-Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo(  )
 {
     return createPropertySetInfo( getInfoHelper() ) ;
 }
@@ -147,7 +146,7 @@ OQueryDescriptor_Base::~OQueryDescriptor_Base()
 
 }
 
-sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 >& _rIdentifier )
 {
     if (_rIdentifier.getLength() != 16)
         return 0;
@@ -179,7 +178,7 @@ void OQueryDescriptor_Base::clearColumns( )
     setColumnsOutOfDate();
 }
 
-Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( )
 {
     MutexGuard aGuard(m_rMutex);
 
@@ -209,17 +208,17 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (Ru
     return m_pColumns;
 }
 
-OUString SAL_CALL OQueryDescriptor_Base::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OQueryDescriptor_Base::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OQueryDescriptor");
 }
 
-sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSupported(2);
     aSupported.getArray()[0] = SERVICE_SDB_DATASETTINGS;
diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx
index da985b5d9368..4c175acb303b 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -74,18 +74,18 @@ public:
     OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSource,::cppu::OWeakObject& _rMySelf);
 
 // css::sdbcx::XColumnsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
 
 // css::lang::XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
     static css::uno::Sequence< sal_Int8 >  getUnoTunnelImplementationId();
 
 
 // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 protected:
 
@@ -129,16 +129,14 @@ public:
     OQueryDescriptor();
     explicit OQueryDescriptor(const OQueryDescriptor_Base& _rSource);
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
 // css::uno::XInterface
     DECLARE_XINTERFACE( )
 
     // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
 };
 }   // namespace dbaccess
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index cc5381a4f846..1de8449095fa 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -101,18 +101,18 @@ OResultColumn::~OResultColumn()
 }
 
 // css::lang::XTypeProvider
-Sequence< sal_Int8 > OResultColumn::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > OResultColumn::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo
-OUString OResultColumn::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString OResultColumn::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OResultColumn");
 }
 
-Sequence< OUString > OResultColumn::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OResultColumn::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = SERVICE_SDBCX_COLUMN;
diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx
index 3bd87d841020..400838008388 100644
--- a/dbaccess/source/core/api/resultcolumn.hxx
+++ b/dbaccess/source/core/api/resultcolumn.hxx
@@ -59,11 +59,11 @@ namespace dbaccess
             const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxDBMeta );
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // cppu::OComponentHelper
         virtual void SAL_CALL disposing() override;
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index eeab01fc6c5d..330aa38fadcc 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -101,7 +101,7 @@ OResultSet::~OResultSet()
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > OResultSet::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OResultSet::getTypes()
 {
     OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(),
                            OResultSetBase::getTypes());
@@ -109,13 +109,13 @@ Sequence< Type > OResultSet::getTypes() throw (RuntimeException, std::exception)
     return aTypes.getTypes();
 }
 
-Sequence< sal_Int8 > OResultSet::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > OResultSet::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // css::uno::XInterface
-Any OResultSet::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any OResultSet::queryInterface( const Type & rType )
 {
     Any aIface = OResultSetBase::queryInterface( rType );
     if (!aIface.hasValue())
@@ -158,7 +158,7 @@ void OResultSet::disposing()
 }
 
 // XCloseable
-void OResultSet::close() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::close()
 {
     {
         MutexGuard aGuard( m_aMutex );
@@ -168,17 +168,17 @@ void OResultSet::close() throw( SQLException, RuntimeException, std::exception )
 }
 
 // XServiceInfo
-OUString OResultSet::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString OResultSet::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OResultSet");
 }
 
-sal_Bool OResultSet::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool OResultSet::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > OResultSet::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OResultSet::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = SERVICE_SDBC_RESULTSET;
@@ -187,7 +187,7 @@ Sequence< OUString > OResultSet::getSupportedServiceNames(  ) throw (RuntimeExce
 }
 
 // css::beans::XPropertySet
-Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeException, std::exception)
+Reference< XPropertySetInfo > OResultSet::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() ) ;
 }
@@ -211,7 +211,7 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc
     return *getArrayHelper();
 }
 
-sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException  )
+sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
 {
     // be lazy ...
     rConvertedValue = rValue;
@@ -219,7 +219,7 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldV
     return true;
 }
 
-void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     // set it for the driver result set
     Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY);
@@ -260,14 +260,14 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 }
 
 // XWarningsSupplier
-Any OResultSet::getWarnings() throw( SQLException, RuntimeException, std::exception )
+Any OResultSet::getWarnings()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
     return m_aWarnings.getWarnings();
 }
 
-void OResultSet::clearWarnings() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::clearWarnings()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -275,7 +275,7 @@ void OResultSet::clearWarnings() throw( SQLException, RuntimeException, std::exc
 }
 
 // css::sdbc::XResultSetMetaDataSupplier
-Reference< XResultSetMetaData > OResultSet::getMetaData() throw( SQLException, RuntimeException, std::exception )
+Reference< XResultSetMetaData > OResultSet::getMetaData()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -284,7 +284,7 @@ Reference< XResultSetMetaData > OResultSet::getMetaData() throw( SQLException, R
 }
 
 // css::sdbc::XColumnLocate
-sal_Int32 OResultSet::findColumn(const OUString& columnName) throw( SQLException, RuntimeException, std::exception )
+sal_Int32 OResultSet::findColumn(const OUString& columnName)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -318,7 +318,7 @@ namespace
 }
 
 // css::sdbcx::XColumnsSupplier
-Reference< css::container::XNameAccess > OResultSet::getColumns() throw( RuntimeException, std::exception )
+Reference< css::container::XNameAccess > OResultSet::getColumns()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -388,7 +388,7 @@ Reference< css::container::XNameAccess > OResultSet::getColumns() throw( Runtime
 }
 
 // css::sdbc::XRow
-sal_Bool OResultSet::wasNull() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::wasNull()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -396,7 +396,7 @@ sal_Bool OResultSet::wasNull() throw( SQLException, RuntimeException, std::excep
     return m_xDelegatorRow->wasNull();
 }
 
-OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+OUString OResultSet::getString(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -404,7 +404,7 @@ OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, Runti
     return m_xDelegatorRow->getString(columnIndex);
 }
 
-sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -412,7 +412,7 @@ sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, Runt
     return m_xDelegatorRow->getBoolean(columnIndex);
 }
 
-sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+sal_Int8 OResultSet::getByte(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -420,7 +420,7 @@ sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, Runtime
     return m_xDelegatorRow->getByte(columnIndex);
 }
 
-sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+sal_Int16 OResultSet::getShort(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -428,7 +428,7 @@ sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, Runti
     return m_xDelegatorRow->getShort(columnIndex);
 }
 
-sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+sal_Int32 OResultSet::getInt(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -436,7 +436,7 @@ sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, Runtime
     return m_xDelegatorRow->getInt(columnIndex);
 }
 
-sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+sal_Int64 OResultSet::getLong(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -444,7 +444,7 @@ sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, Runtim
     return m_xDelegatorRow->getLong(columnIndex);
 }
 
-float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+float OResultSet::getFloat(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -452,7 +452,7 @@ float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeEx
     return m_xDelegatorRow->getFloat(columnIndex);
 }
 
-double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+double OResultSet::getDouble(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -460,7 +460,7 @@ double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, Runtime
     return m_xDelegatorRow->getDouble(columnIndex);
 }
 
-Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -468,7 +468,7 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep
     return m_xDelegatorRow->getBytes(columnIndex);
 }
 
-css::util::Date OResultSet::getDate(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+css::util::Date OResultSet::getDate(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -476,7 +476,7 @@ css::util::Date OResultSet::getDate(sal_Int32 columnIndex) throw( SQLException,
     return m_xDelegatorRow->getDate(columnIndex);
 }
 
-css::util::Time OResultSet::getTime(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+css::util::Time OResultSet::getTime(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -484,7 +484,7 @@ css::util::Time OResultSet::getTime(sal_Int32 columnIndex) throw( SQLException,
     return m_xDelegatorRow->getTime(columnIndex);
 }
 
-css::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+css::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -492,7 +492,7 @@ css::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex) throw( SQLEx
     return m_xDelegatorRow->getTimestamp(columnIndex);
 }
 
-Reference< css::io::XInputStream >  OResultSet::getBinaryStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+Reference< css::io::XInputStream >  OResultSet::getBinaryStream(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -500,7 +500,7 @@ Reference< css::io::XInputStream >  OResultSet::getBinaryStream(sal_Int32 column
     return m_xDelegatorRow->getBinaryStream(columnIndex);
 }
 
-Reference< css::io::XInputStream >  OResultSet::getCharacterStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+Reference< css::io::XInputStream >  OResultSet::getCharacterStream(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -508,7 +508,7 @@ Reference< css::io::XInputStream >  OResultSet::getCharacterStream(sal_Int32 col
     return m_xDelegatorRow->getCharacterStream(columnIndex);
 }
 
-Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< css::container::XNameAccess > & typeMap) throw( SQLException, RuntimeException, std::exception )
+Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< css::container::XNameAccess > & typeMap)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -516,7 +516,7 @@ Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< css::container
     return m_xDelegatorRow->getObject(columnIndex, typeMap);
 }
 
-Reference< XRef >  OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+Reference< XRef >  OResultSet::getRef(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -524,7 +524,7 @@ Reference< XRef >  OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException
     return m_xDelegatorRow->getRef(columnIndex);
 }
 
-Reference< XBlob >  OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+Reference< XBlob >  OResultSet::getBlob(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -532,7 +532,7 @@ Reference< XBlob >  OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLExcepti
     return m_xDelegatorRow->getBlob(columnIndex);
 }
 
-Reference< XClob >  OResultSet::getClob(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+Reference< XClob >  OResultSet::getClob(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -540,7 +540,7 @@ Reference< XClob >  OResultSet::getClob(sal_Int32 columnIndex) throw( SQLExcepti
     return m_xDelegatorRow->getClob(columnIndex);
 }
 
-Reference< XArray >  OResultSet::getArray(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+Reference< XArray >  OResultSet::getArray(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -549,7 +549,7 @@ Reference< XArray >  OResultSet::getArray(sal_Int32 columnIndex) throw( SQLExcep
 }
 
 // css::sdbc::XRowUpdate
-void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateNull(sal_Int32 columnIndex)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -559,7 +559,7 @@ void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeE
     m_xDelegatorRowUpdate->updateNull(columnIndex);
 }
 
-void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -569,7 +569,7 @@ void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLExce
     m_xDelegatorRowUpdate->updateBoolean(columnIndex, x);
 }
 
-void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -579,7 +579,7 @@ void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLExcepti
     m_xDelegatorRowUpdate->updateByte(columnIndex, x);
 }
 
-void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -589,7 +589,7 @@ void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLExcep
     m_xDelegatorRowUpdate->updateShort(columnIndex, x);
 }
 
-void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -599,7 +599,7 @@ void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLExcepti
     m_xDelegatorRowUpdate->updateInt(columnIndex, x);
 }
 
-void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -609,7 +609,7 @@ void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLExcept
     m_xDelegatorRowUpdate->updateLong(columnIndex, x);
 }
 
-void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateFloat(sal_Int32 columnIndex, float x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -619,7 +619,7 @@ void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException
     m_xDelegatorRowUpdate->updateFloat(columnIndex, x);
 }
 
-void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateDouble(sal_Int32 columnIndex, double x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -629,7 +629,7 @@ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLExcepti
     m_xDelegatorRowUpdate->updateDouble(columnIndex, x);
 }
 
-void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -639,7 +639,7 @@ void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( S
     m_xDelegatorRowUpdate->updateString(columnIndex, x);
 }
 
-void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -649,7 +649,7 @@ void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >&
     m_xDelegatorRowUpdate->updateBytes(columnIndex, x);
 }
 
-void OResultSet::updateDate(sal_Int32 columnIndex, const css::util::Date& x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateDate(sal_Int32 columnIndex, const css::util::Date& x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -659,7 +659,7 @@ void OResultSet::updateDate(sal_Int32 columnIndex, const css::util::Date& x) thr
     m_xDelegatorRowUpdate->updateDate(columnIndex, x);
 }
 
-void OResultSet::updateTime(sal_Int32 columnIndex, const css::util::Time& x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateTime(sal_Int32 columnIndex, const css::util::Time& x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -669,7 +669,7 @@ void OResultSet::updateTime(sal_Int32 columnIndex, const css::util::Time& x) thr
     m_xDelegatorRowUpdate->updateTime(columnIndex, x);
 }
 
-void OResultSet::updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -679,7 +679,7 @@ void OResultSet::updateTimestamp(sal_Int32 columnIndex, const css::util::DateTim
     m_xDelegatorRowUpdate->updateTimestamp(columnIndex, x);
 }
 
-void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream > & x, sal_Int32 length)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -689,7 +689,7 @@ void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< css:
     m_xDelegatorRowUpdate->updateBinaryStream(columnIndex, x, length);
 }
 
-void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream > & x, sal_Int32 length)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -699,7 +699,7 @@ void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< c
     m_xDelegatorRowUpdate->updateCharacterStream(columnIndex, x, length);
 }
 
-void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -709,7 +709,7 @@ void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_In
     m_xDelegatorRowUpdate->updateNumericObject(columnIndex, x, scale);
 }
 
-void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -720,7 +720,7 @@ void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLExc
 }
 
 // css::sdbc::XResultSet
-sal_Bool OResultSet::next() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::next()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -728,7 +728,7 @@ sal_Bool OResultSet::next() throw( SQLException, RuntimeException, std::exceptio
     return m_xDelegatorResultSet->next();
 }
 
-sal_Bool OResultSet::isBeforeFirst() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::isBeforeFirst()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -736,7 +736,7 @@ sal_Bool OResultSet::isBeforeFirst() throw( SQLException, RuntimeException, std:
     return m_xDelegatorResultSet->isBeforeFirst();
 }
 
-sal_Bool OResultSet::isAfterLast() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::isAfterLast()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -744,7 +744,7 @@ sal_Bool OResultSet::isAfterLast() throw( SQLException, RuntimeException, std::e
     return m_xDelegatorResultSet->isAfterLast();
 }
 
-sal_Bool OResultSet::isFirst() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::isFirst()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -752,7 +752,7 @@ sal_Bool OResultSet::isFirst() throw( SQLException, RuntimeException, std::excep
     return m_xDelegatorResultSet->isFirst();
 }
 
-sal_Bool OResultSet::isLast() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::isLast()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -760,7 +760,7 @@ sal_Bool OResultSet::isLast() throw( SQLException, RuntimeException, std::except
     return m_xDelegatorResultSet->isLast();
 }
 
-void OResultSet::beforeFirst() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::beforeFirst()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -768,7 +768,7 @@ void OResultSet::beforeFirst() throw( SQLException, RuntimeException, std::excep
     m_xDelegatorResultSet->beforeFirst();
 }
 
-void OResultSet::afterLast() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::afterLast()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -776,7 +776,7 @@ void OResultSet::afterLast() throw( SQLException, RuntimeException, std::excepti
     m_xDelegatorResultSet->afterLast();
 }
 
-sal_Bool OResultSet::first() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::first()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -784,7 +784,7 @@ sal_Bool OResultSet::first() throw( SQLException, RuntimeException, std::excepti
     return m_xDelegatorResultSet->first();
 }
 
-sal_Bool OResultSet::last() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::last()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -792,7 +792,7 @@ sal_Bool OResultSet::last() throw( SQLException, RuntimeException, std::exceptio
     return m_xDelegatorResultSet->last();
 }
 
-sal_Int32 OResultSet::getRow() throw( SQLException, RuntimeException, std::exception )
+sal_Int32 OResultSet::getRow()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -800,7 +800,7 @@ sal_Int32 OResultSet::getRow() throw( SQLException, RuntimeException, std::excep
     return m_xDelegatorResultSet->getRow();
 }
 
-sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::absolute(sal_Int32 row)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -808,7 +808,7 @@ sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeExcepti
     return m_xDelegatorResultSet->absolute(row);
 }
 
-sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::relative(sal_Int32 rows)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -816,7 +816,7 @@ sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeExcept
     return m_xDelegatorResultSet->relative(rows);
 }
 
-sal_Bool OResultSet::previous() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::previous()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -824,7 +824,7 @@ sal_Bool OResultSet::previous() throw( SQLException, RuntimeException, std::exce
     return m_xDelegatorResultSet->previous();
 }
 
-void OResultSet::refreshRow() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::refreshRow()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -832,7 +832,7 @@ void OResultSet::refreshRow() throw( SQLException, RuntimeException, std::except
     m_xDelegatorResultSet->refreshRow();
 }
 
-sal_Bool OResultSet::rowUpdated() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::rowUpdated()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -840,7 +840,7 @@ sal_Bool OResultSet::rowUpdated() throw( SQLException, RuntimeException, std::ex
     return m_xDelegatorResultSet->rowUpdated();
 }
 
-sal_Bool OResultSet::rowInserted() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::rowInserted()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -848,7 +848,7 @@ sal_Bool OResultSet::rowInserted() throw( SQLException, RuntimeException, std::e
     return m_xDelegatorResultSet->rowInserted();
 }
 
-sal_Bool OResultSet::rowDeleted() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::rowDeleted()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -856,7 +856,7 @@ sal_Bool OResultSet::rowDeleted() throw( SQLException, RuntimeException, std::ex
     return m_xDelegatorResultSet->rowDeleted();
 }
 
-Reference< XInterface > OResultSet::getStatement() throw( SQLException, RuntimeException, std::exception )
+Reference< XInterface > OResultSet::getStatement()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -865,7 +865,7 @@ Reference< XInterface > OResultSet::getStatement() throw( SQLException, RuntimeE
 }
 
 // css::sdbcx::XRowLocate
-Any OResultSet::getBookmark() throw( SQLException, RuntimeException, std::exception )
+Any OResultSet::getBookmark()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -875,7 +875,7 @@ Any OResultSet::getBookmark() throw( SQLException, RuntimeException, std::except
     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->getBookmark();
 }
 
-sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::moveToBookmark(const Any& bookmark)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -885,7 +885,7 @@ sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, Ru
     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->moveToBookmark(bookmark);
 }
 
-sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -895,7 +895,7 @@ sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows)
     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->moveRelativeToBookmark(bookmark, rows);
 }
 
-sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) throw( SQLException, RuntimeException, std::exception )
+sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -905,7 +905,7 @@ sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) th
     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->compareBookmarks(_first, _second);
 }
 
-sal_Bool OResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OResultSet::hasOrderedBookmarks()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -915,7 +915,7 @@ sal_Bool OResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException
     return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->hasOrderedBookmarks();
 }
 
-sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception )
+sal_Int32 OResultSet::hashBookmark(const Any& bookmark)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -926,7 +926,7 @@ sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, Run
 }
 
 // css::sdbc::XResultSetUpdate
-void OResultSet::insertRow() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::insertRow()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -936,7 +936,7 @@ void OResultSet::insertRow() throw( SQLException, RuntimeException, std::excepti
     m_xDelegatorResultSetUpdate->insertRow();
 }
 
-void OResultSet::updateRow() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::updateRow()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -946,7 +946,7 @@ void OResultSet::updateRow() throw( SQLException, RuntimeException, std::excepti
     m_xDelegatorResultSetUpdate->updateRow();
 }
 
-void OResultSet::deleteRow() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::deleteRow()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -956,7 +956,7 @@ void OResultSet::deleteRow() throw( SQLException, RuntimeException, std::excepti
     m_xDelegatorResultSetUpdate->deleteRow();
 }
 
-void OResultSet::cancelRowUpdates() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::cancelRowUpdates()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -966,7 +966,7 @@ void OResultSet::cancelRowUpdates() throw( SQLException, RuntimeException, std::
     m_xDelegatorResultSetUpdate->cancelRowUpdates();
 }
 
-void OResultSet::moveToInsertRow() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::moveToInsertRow()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -976,7 +976,7 @@ void OResultSet::moveToInsertRow() throw( SQLException, RuntimeException, std::e
     m_xDelegatorResultSetUpdate->moveToInsertRow();
 }
 
-void OResultSet::moveToCurrentRow() throw( SQLException, RuntimeException, std::exception )
+void OResultSet::moveToCurrentRow()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx
index ecb3c4a4878b..1d9d6e32be6a 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.hxx
@@ -84,27 +84,27 @@ namespace dbaccess
         virtual ~OResultSet() override;
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::uno::XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // ::cppu::OComponentHelper
         virtual void SAL_CALL disposing() override;
 
     // css::sdbc::XCloseable
-        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close(  ) override;
 
     // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // comphelper::OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
@@ -116,104 +116,102 @@ namespace dbaccess
                                 css::uno::Any & rConvertedValue,
                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue )
-                                    throw (css::lang::IllegalArgumentException) override;
+                                const css::uno::Any& rValue ) override;
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                                     )
-                                                     throw (css::uno::Exception, std::exception) override;
+                                                     ) override;
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
     // css::sdbc::XWarningsSupplier
-        virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+        virtual void SAL_CALL clearWarnings(  ) override;
 
     // css::sdbc::XResultSetMetaDataSupplier
-        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
     // css::sdbc::XColumnLocate
-        virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
 
     // css::sdbcx::XColumnsSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
 
     // css::sdbc::XRow
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
 
     // css::sdbc::XResultSet
-        virtual sal_Bool SAL_CALL next(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAfterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL beforeFirst(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL afterLast(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL first(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL last(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL previous(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL refreshRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowUpdated(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowInserted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowDeleted(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL next(  ) override;
+        virtual sal_Bool SAL_CALL isBeforeFirst(  ) override;
+        virtual sal_Bool SAL_CALL isAfterLast(  ) override;
+        virtual sal_Bool SAL_CALL isFirst(  ) override;
+        virtual sal_Bool SAL_CALL isLast(  ) override;
+        virtual void SAL_CALL beforeFirst(  ) override;
+        virtual void SAL_CALL afterLast(  ) override;
+        virtual sal_Bool SAL_CALL first(  ) override;
+        virtual sal_Bool SAL_CALL last(  ) override;
+        virtual sal_Int32 SAL_CALL getRow(  ) override;
+        virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override;
+        virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override;
+        virtual sal_Bool SAL_CALL previous(  ) override;
+        virtual void SAL_CALL refreshRow(  ) override;
+        virtual sal_Bool SAL_CALL rowUpdated(  ) override;
+        virtual sal_Bool SAL_CALL rowInserted(  ) override;
+        virtual sal_Bool SAL_CALL rowDeleted(  ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement(  ) override;
 
     // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getBookmark(  ) override;
+        virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override;
+        virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override;
+        virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override;
+        virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) override;
+        virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override;
 
     // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL insertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deleteRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancelRowUpdates(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL moveToInsertRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL moveToCurrentRow(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertRow(  ) override;
+        virtual void SAL_CALL updateRow(  ) override;
+        virtual void SAL_CALL deleteRow(  ) override;
+        virtual void SAL_CALL cancelRowUpdates(  ) override;
+        virtual void SAL_CALL moveToInsertRow(  ) override;
+        virtual void SAL_CALL moveToCurrentRow(  ) override;
 
     // css::sdbc::XRowUpdate
-        virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override;
+        virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override;
+        virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override;
+        virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override;
+        virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override;
+        virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override;
+        virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override;
+        virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override;
+        virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override;
+        virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+        virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override;
+        virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override;
+        virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override;
+        virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override;
+        virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override;
 
     protected:
         void checkReadOnly() const;
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index beb04efa4449..813fa8a450f1 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -61,7 +61,7 @@ OStatementBase::~OStatementBase()
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > OStatementBase::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OStatementBase::getTypes()
 {
     OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(),
                            cppu::UnoType<XWarningsSupplier>::get(),
@@ -80,7 +80,7 @@ Sequence< Type > OStatementBase::getTypes() throw (RuntimeException, std::except
 }
 
 // css::uno::XInterface
-Any OStatementBase::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any OStatementBase::queryInterface( const Type & rType )
 {
     Any aIface = OSubComponent::queryInterface( rType );
     if (!aIface.hasValue())
@@ -160,7 +160,7 @@ void OStatementBase::disposing()
 }
 
 // XCloseable
-void OStatementBase::close() throw( SQLException, RuntimeException, std::exception )
+void OStatementBase::close()
 {
     {
         MutexGuard aGuard( m_aMutex );
@@ -170,7 +170,7 @@ void OStatementBase::close() throw( SQLException, RuntimeException, std::excepti
 }
 
 // OPropertySetHelper
-Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (RuntimeException, std::exception)
+Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() ) ;
 }
@@ -198,7 +198,7 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim
     return *getArrayHelper();
 }
 
-sal_Bool OStatementBase::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool OStatementBase::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
 {
     bool bModified(false);
     switch (nHandle)
@@ -232,7 +232,7 @@ sal_Bool OStatementBase::convertFastPropertyValue(Any & rConvertedValue, Any & r
     return bModified;
 }
 
-void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     switch ( nHandle )
     {
@@ -287,7 +287,7 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
 }
 
 // XWarningsSupplier
-Any OStatementBase::getWarnings() throw( SQLException, RuntimeException, std::exception )
+Any OStatementBase::getWarnings()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -295,7 +295,7 @@ Any OStatementBase::getWarnings() throw( SQLException, RuntimeException, std::ex
     return Reference< XWarningsSupplier >(m_xAggregateAsSet, UNO_QUERY)->getWarnings();
 }
 
-void OStatementBase::clearWarnings() throw( SQLException, RuntimeException, std::exception )
+void OStatementBase::clearWarnings()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -304,7 +304,7 @@ void OStatementBase::clearWarnings() throw( SQLException, RuntimeException, std:
 }
 
 // css::util::XCancellable
-void OStatementBase::cancel() throw( RuntimeException, std::exception )
+void OStatementBase::cancel()
 {
     // no blocking as cancel is typically called from a different thread
     ClearableMutexGuard aCancelGuard(m_aCancelMutex);
@@ -314,7 +314,7 @@ void OStatementBase::cancel() throw( RuntimeException, std::exception )
 }
 
 // XMultipleResults
-Reference< XResultSet > SAL_CALL OStatementBase::getResultSet(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OStatementBase::getResultSet(  )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -327,7 +327,7 @@ Reference< XResultSet > SAL_CALL OStatementBase::getResultSet(  ) throw(SQLExcep
     return Reference< XMultipleResults >(m_xAggregateAsSet, UNO_QUERY)->getResultSet();
 }
 
-sal_Int32 SAL_CALL OStatementBase::getUpdateCount(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OStatementBase::getUpdateCount(  )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -340,7 +340,7 @@ sal_Int32 SAL_CALL OStatementBase::getUpdateCount(  ) throw(SQLException, Runtim
     return Reference< XMultipleResults >(m_xAggregateAsSet, UNO_QUERY)->getUpdateCount();
 }
 
-sal_Bool SAL_CALL OStatementBase::getMoreResults(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatementBase::getMoreResults(  )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -357,7 +357,7 @@ sal_Bool SAL_CALL OStatementBase::getMoreResults(  ) throw(SQLException, Runtime
 }
 
 // XPreparedBatchExecution
-void SAL_CALL OStatementBase::addBatch(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatementBase::addBatch(  )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -370,7 +370,7 @@ void SAL_CALL OStatementBase::addBatch(  ) throw(SQLException, RuntimeException,
     Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch();
 }
 
-void SAL_CALL OStatementBase::clearBatch(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OStatementBase::clearBatch(  )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -383,7 +383,7 @@ void SAL_CALL OStatementBase::clearBatch(  ) throw(SQLException, RuntimeExceptio
     Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->clearBatch();
 }
 
-Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch(  ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch(  )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -399,7 +399,7 @@ Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch(  ) throw(SQLExcepti
     return Reference< XPreparedBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->executeBatch();
 }
 
-Reference< XResultSet > SAL_CALL OStatementBase::getGeneratedValues(  ) throw (SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL OStatementBase::getGeneratedValues(  )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -424,24 +424,24 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OStatementBase, OStatement_IFACE );
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE );
 
 // XServiceInfo
-OUString OStatement::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString OStatement::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.OStatement");
 }
 
-sal_Bool OStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool OStatement::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > OStatement::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OStatement::getSupportedServiceNames(  )
 {
     Sequence<OUString> aSNS { SERVICE_SDBC_STATEMENT };
     return aSNS;
 }
 
 // XStatement
-Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception )
+Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -467,7 +467,7 @@ Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw(
     return xResultSet;
 }
 
-sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception )
+sal_Int32 OStatement::executeUpdate( const OUString& _rSQL )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -478,7 +478,7 @@ sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException
     return m_xAggregateStatement->executeUpdate( sSQL );
 }
 
-sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception )
+sal_Bool OStatement::execute( const OUString& _rSQL )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -489,7 +489,7 @@ sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, Runti
     return m_xAggregateStatement->execute( sSQL );
 }
 
-void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeException, std::exception )
+void OStatement::addBatch( const OUString& _rSQL )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -503,7 +503,7 @@ void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeE
     Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch( sSQL );
 }
 
-void OStatement::clearBatch( ) throw( SQLException, RuntimeException, std::exception )
+void OStatement::clearBatch( )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -515,7 +515,7 @@ void OStatement::clearBatch( ) throw( SQLException, RuntimeException, std::excep
     Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->clearBatch();
 }
 
-Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeException, std::exception )
+Sequence< sal_Int32 > OStatement::executeBatch( )
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -527,7 +527,7 @@ Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeEx
 }
 
 
-Reference< XConnection > OStatement::getConnection() throw( SQLException, RuntimeException, std::exception )
+Reference< XConnection > OStatement::getConnection()
 {
     return Reference< XConnection >( m_xParent, UNO_QUERY );
 }
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 85aeaea4ae20..a02c2f9b60b8 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -69,7 +69,7 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
         ,const OUString& _rName
         ,const OUString& _rType
         ,const OUString& _rDesc
-        ,const Reference< XNameAccess >& _xColumnDefinitions) throw(SQLException)
+        ,const Reference< XNameAccess >& _xColumnDefinitions)
     :OTable_Base(_pTables,_rxConn,_rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers(), _rName, _rType, _rDesc, _rSchema, _rCatalog )
     ,m_xColumnDefinitions(_xColumnDefinitions)
     ,m_nPrivileges(0)
@@ -84,7 +84,6 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
 
 ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
                    ,const Reference< XConnection >& _rxConn)
-                throw(SQLException)
     :OTable_Base(_pTables,_rxConn, _rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers())
     ,m_nPrivileges(-1)
 {
@@ -131,7 +130,7 @@ void ODBTable::columnDropped(const OUString& _sName)
     }
 }
 
-Sequence< sal_Int8 > ODBTable::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > ODBTable::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -248,7 +247,7 @@ void ODBTable::construct()
 // XServiceInfo
 IMPLEMENT_SERVICE_INFO1(ODBTable, "com.sun.star.sdb.dbaccess.ODBTable", SERVICE_SDBCX_TABLE)
 
-Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL ODBTable::queryInterface( const Type & rType )
 {
     if(rType == cppu::UnoType<XRename>::get()&& !getRenameService().is() )
         return Any();
@@ -257,7 +256,7 @@ Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeExcepti
     return OTable_Base::queryInterface( rType);
 }
 
-Sequence< Type > SAL_CALL ODBTable::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL ODBTable::getTypes(  )
 {
     Type aRenameType = cppu::UnoType<XRename>::get();
     Type aAlterType = cppu::UnoType<XAlterTable>::get();
@@ -278,7 +277,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes(  ) throw(RuntimeException, std::ex
 }
 
 // XRename,
-void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL ODBTable::rename( const OUString& _rNewName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -291,7 +290,7 @@ void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException,
 }
 
 // XAlterTable,
-void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -306,7 +305,7 @@ void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Referen
     m_pColumns->refresh();
 }
 
-sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet(0);
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 4ad8bb8727cd..6d6a5ab9c8de 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -406,7 +406,7 @@ void OTableContainer::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
     m_bInDrop = false;
 }
 
-void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     OUString sName;
@@ -424,11 +424,11 @@ void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) th
     }
 }
 
-void SAL_CALL OTableContainer::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OTableContainer::elementRemoved( const ContainerEvent& /*Event*/ )
 {
 }
 
-void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event )
 {
     // create a new config entry
     {
@@ -448,7 +448,7 @@ void SAL_CALL OTableContainer::disposing()
     m_pTableMediator = nullptr;
 }
 
-void SAL_CALL OTableContainer::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL OTableContainer::disposing( const css::lang::EventObject& /*Source*/ )
 {
 }
 
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 0832b2b9f395..85d72828f28e 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -202,7 +202,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos, const OUString& _sElementName)
     }
 }
 
-void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     OUString sName;
@@ -219,7 +219,7 @@ void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) thr
     }
 }
 
-void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     OUString sName;
@@ -239,11 +239,11 @@ void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) thro
     }
 }
 
-void SAL_CALL OViewContainer::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OViewContainer::disposing( const css::lang::EventObject& /*Source*/ )
 {
 }
 
-void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ )
 {
 }
 
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index ab2072118632..485104be0c6d 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -50,13 +50,13 @@ public:
     OColumnPropertyListener(const OColumnPropertyListener&) = delete;
     const OColumnPropertyListener& operator=(const OColumnPropertyListener&) = delete;
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) override
     {
         if ( m_pComponent )
             m_pComponent->notifyDataSourceModified();
     }
     // XEventListener
-    virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) override
     {
     }
     void clear() { m_pComponent = nullptr; }
@@ -73,7 +73,7 @@ OComponentDefinition_Impl::~OComponentDefinition_Impl()
 // OComponentDefinition
 
 
-void OComponentDefinition::initialize( const Sequence< Any >& aArguments ) throw(Exception, std::exception)
+void OComponentDefinition::initialize( const Sequence< Any >& aArguments )
 {
     OUString rName;
     if( (aArguments.getLength() == 1) && (aArguments[0] >>= rName) )
@@ -139,7 +139,6 @@ OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxCo
 }
 
 css::uno::Sequence<sal_Int8> OComponentDefinition::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -147,12 +146,12 @@ css::uno::Sequence<sal_Int8> OComponentDefinition::getImplementationId()
 IMPLEMENT_GETTYPES3(OComponentDefinition,ODataSettings,OContentHelper,OComponentDefinition_BASE);
 IMPLEMENT_FORWARD_XINTERFACE3( OComponentDefinition,OContentHelper,ODataSettings,OComponentDefinition_BASE)
 
-OUString SAL_CALL OComponentDefinition::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OComponentDefinition::getImplementationName()
 {
     return OUString("com.sun.star.comp.dba.OComponentDefinition");
 }
 
-Sequence< OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames()
 {
     return { "com.sun.star.sdb.TableDefinition", "com.sun.star.ucb.Content" };
 }
@@ -179,7 +178,7 @@ IPropertyArrayHelper* OComponentDefinition::createArrayHelper( ) const
     return new OPropertyArrayHelper(aProps);
 }
 
-Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo(  )
 {
     Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -192,7 +191,7 @@ OUString OComponentDefinition::determineContentType() const
         :   OUString( "application/vnd.org.openoffice.DatabaseCommandDefinition" );
 }
 
-Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeException, std::exception)
+Reference< XNameAccess> OComponentDefinition::getColumns()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OContentHelper::rBHelper.bDisposed);
@@ -234,7 +233,7 @@ Reference< XPropertySet > OComponentDefinition::createColumnDescriptor()
     return new OTableColumnDescriptor( true );
 }
 
-void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception)
+void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
 {
     ODataSettings::setFastPropertyValue_NoBroadcast(nHandle,rValue);
     notifyDataSourceModified();
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 84825edfc355..64a133a7a08d 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -110,26 +110,24 @@ public:
             ,bool _bTable = true
         );
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
 // css::uno::XInterface
     DECLARE_XINTERFACE( )
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( css::uno::Sequence< css::uno::Any > const & rArguments) throw (css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize( css::uno::Sequence< css::uno::Any > const & rArguments) override;
 
     // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // XColumnsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
 
     // OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -147,7 +145,7 @@ protected:
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
-                                    const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override;
+                                    const css::uno::Any& rValue) override;
 
     // OContentHelper overridables
     virtual OUString determineContentType() const override;
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index b3466dccf604..4eea9fec1dbb 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -88,7 +88,7 @@ IMPLEMENT_SERVICE_INFO1(OContentHelper,"com.sun.star.comp.sdb.Content","com.sun.
 IMPLEMENT_IMPLEMENTATION_ID(OContentHelper)
 
 // XContent
-Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier(  ) throw (RuntimeException, std::exception)
+Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     OUString aIdentifier( "private:" + impl_getHierarchicalName( true ) );
@@ -119,7 +119,7 @@ OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer
     return sHierarchicalName;
 }
 
-OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException, std::exception)
+OUString SAL_CALL OContentHelper::getContentType()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -131,14 +131,14 @@ OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException, std:
     return *m_pImpl->m_aProps.aContentType;
 }
 
-void SAL_CALL OContentHelper::addContentEventListener( const Reference< XContentEventListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL OContentHelper::addContentEventListener( const Reference< XContentEventListener >& _rxListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( _rxListener.is() )
         m_aContentListeners.addInterface(_rxListener);
 }
 
-void SAL_CALL OContentHelper::removeContentEventListener( const Reference< XContentEventListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL OContentHelper::removeContentEventListener( const Reference< XContentEventListener >& _rxListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if (_rxListener.is())
@@ -146,14 +146,14 @@ void SAL_CALL OContentHelper::removeContentEventListener( const Reference< XCont
 }
 
 // XCommandProcessor
-sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     // Just increase counter on every call to generate an identifier.
     return ++m_nCommandId;
 }
 
-Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*CommandId*/, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException, std::exception)
+Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*CommandId*/, const Reference< XCommandEnvironment >& Environment )
 {
     Any aRet;
     if ( aCommand.Name == "getPropertyValues" )
@@ -231,12 +231,12 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
     return aRet;
 }
 
-void SAL_CALL OContentHelper::abort( sal_Int32 /*CommandId*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OContentHelper::abort( sal_Int32 /*CommandId*/ )
 {
 }
 
 // XPropertiesChangeNotifier
-void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     sal_Int32 nCount = PropertyNames.getLength();
@@ -258,7 +258,7 @@ void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< OUStr
     }
 }
 
-void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     sal_Int32 nCount = PropertyNames.getLength();
@@ -281,18 +281,18 @@ void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< OU
 }
 
 // XPropertyContainer
-void SAL_CALL OContentHelper::addProperty( const OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OContentHelper::addProperty( const OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ )
 {
     OSL_FAIL( "OContentHelper::addProperty: not implemented!" );
 }
 
-void SAL_CALL OContentHelper::removeProperty( const OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception)
+void SAL_CALL OContentHelper::removeProperty( const OUString& /*Name*/ )
 {
     OSL_FAIL( "OContentHelper::removeProperty: not implemented!" );
 }
 
 // XInitialization
-void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) throw(Exception, RuntimeException, std::exception)
+void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments )
 {
     const Any* pBegin = _aArguments.getConstArray();
     const Any* pEnd = pBegin + _aArguments.getLength();
@@ -553,7 +553,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent
 }
 
 // css::lang::XUnoTunnel
-sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception)
+sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId )
 {
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast<sal_Int64>(this);
@@ -572,13 +572,13 @@ OContentHelper* OContentHelper::getImplementation( const Reference< XInterface >
     return pContent;
 }
 
-Reference< XInterface > SAL_CALL OContentHelper::getParent(  ) throw (RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OContentHelper::getParent(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xParentContainer;
 }
 
-void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_xParentContainer = _xParent;
@@ -613,7 +613,7 @@ void OContentHelper::impl_rename_throw(const OUString& _sNewName,bool _bNotify )
     }
 }
 
-void SAL_CALL OContentHelper::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL OContentHelper::rename( const OUString& newName )
 {
 
     impl_rename_throw(newName);
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index f76875ac5445..545b1c9e232b 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -138,17 +138,17 @@ public:
     void dispose();
 
     // XDocumentSubStorageSupplier
-    virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nMode ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getDocumentSubStoragesNames(  ) throw (IOException, RuntimeException, std::exception) override;
+    virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nMode ) override;
+    virtual Sequence< OUString > SAL_CALL getDocumentSubStoragesNames(  ) override;
 
     // XTransactionListener
-    virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) 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;
 
     /// disposes all storages managed by this instance
     void disposeStorages();
@@ -302,7 +302,7 @@ bool DocumentStorageAccess::commitEmbeddedStorage( bool _bPreventRootCommits )
 
 }
 
-Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException, std::exception)
+Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nDesiredMode )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     NamedStorages::const_iterator pos = m_aExposedStorages.find( aStorageName );
@@ -315,7 +315,7 @@ Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( con
     return pos->second;
 }
 
-Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames(  ) throw (IOException, RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames(  )
 {
     Reference< XStorage > xRootStor( m_pModelImplementation->getRootStorage() );
     if ( !xRootStor.is() )
@@ -334,12 +334,12 @@ Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames
         :  Sequence< OUString >( &aNames[0], aNames.size() );
 }
 
-void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ )
 {
     // not interested in
 }
 
-void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEvent )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -362,17 +362,17 @@ void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEv
     }
 }
 
-void SAL_CALL DocumentStorageAccess::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL DocumentStorageAccess::preRevert( const css::lang::EventObject& /*aEvent*/ )
 {
     // not interested in
 }
 
-void SAL_CALL DocumentStorageAccess::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL DocumentStorageAccess::reverted( const css::lang::EventObject& /*aEvent*/ )
 {
     // not interested in
 }
 
-void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& Source ) throw ( RuntimeException, std::exception )
+void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& Source )
 {
     OSL_ENSURE( Reference< XStorage >( Source.Source, UNO_QUERY ).is(), "DocumentStorageAccess::disposing: No storage? What's this?" );
 
@@ -620,7 +620,7 @@ void ODatabaseModelImpl::reset()
     }
 }
 
-void SAL_CALL ODatabaseModelImpl::disposing( const css::lang::EventObject& Source ) throw(RuntimeException)
+void SAL_CALL ODatabaseModelImpl::disposing( const css::lang::EventObject& Source )
 {
     Reference<XConnection> xCon(Source.Source,UNO_QUERY);
     if ( xCon.is() )
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 2c9511536d3b..71ecca9ed1c0 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -277,7 +277,7 @@ public:
 
     // XEventListener
     /// @throws css::uno::RuntimeException
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException);
+    void SAL_CALL disposing( const css::lang::EventObject& Source );
 
     void setModified( bool bModified );
 
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx
index 4326b22bcd01..90a38b981341 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
@@ -45,7 +45,7 @@ void SAL_CALL OSharedConnection::disposing()
     OConnectionWrapper::disposing();
 }
 
-Reference< XStatement > SAL_CALL OSharedConnection::createStatement(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XStatement > SAL_CALL OSharedConnection::createStatement(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -53,7 +53,7 @@ Reference< XStatement > SAL_CALL OSharedConnection::createStatement(  ) throw(SQ
     return m_xConnection->createStatement();
 }
 
-Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -61,7 +61,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( co
     return m_xConnection->prepareStatement(sql);
 }
 
-Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -69,7 +69,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const O
     return m_xConnection->prepareCall(sql);
 }
 
-OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -77,7 +77,7 @@ OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql ) throw(SQLE
     return m_xConnection->nativeSQL(sql);
 }
 
-sal_Bool SAL_CALL OSharedConnection::getAutoCommit(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OSharedConnection::getAutoCommit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -85,7 +85,7 @@ sal_Bool SAL_CALL OSharedConnection::getAutoCommit(  ) throw(SQLException, Runti
     return m_xConnection->getAutoCommit();
 }
 
-void SAL_CALL OSharedConnection::commit(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OSharedConnection::commit(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -93,7 +93,7 @@ void SAL_CALL OSharedConnection::commit(  ) throw(SQLException, RuntimeException
     m_xConnection->commit();
 }
 
-void SAL_CALL OSharedConnection::rollback(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OSharedConnection::rollback(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -101,7 +101,7 @@ void SAL_CALL OSharedConnection::rollback(  ) throw(SQLException, RuntimeExcepti
     m_xConnection->rollback();
 }
 
-sal_Bool SAL_CALL OSharedConnection::isClosed(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OSharedConnection::isClosed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_xConnection.is() )
@@ -110,7 +110,7 @@ sal_Bool SAL_CALL OSharedConnection::isClosed(  ) throw(SQLException, RuntimeExc
     return m_xConnection->isClosed();
 }
 
-Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -119,7 +119,7 @@ Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData(  ) throw
     return m_xConnection->getMetaData();
 }
 
-sal_Bool SAL_CALL OSharedConnection::isReadOnly(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OSharedConnection::isReadOnly(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -127,7 +127,7 @@ sal_Bool SAL_CALL OSharedConnection::isReadOnly(  ) throw(SQLException, RuntimeE
     return m_xConnection->isReadOnly();
 }
 
-OUString SAL_CALL OSharedConnection::getCatalog(  ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL OSharedConnection::getCatalog(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -135,7 +135,7 @@ OUString SAL_CALL OSharedConnection::getCatalog(  ) throw(SQLException, RuntimeE
     return m_xConnection->getCatalog();
 }
 
-sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
@@ -143,7 +143,7 @@ sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation(  ) throw(SQLExcep
     return m_xConnection->getTransactionIsolation();
 }
 
-Reference< css::container::XNameAccess > SAL_CALL OSharedConnection::getTypeMap(  ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL OSharedConnection::getTypeMap(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(rBHelper.bDisposed);
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index f4ae92491846..bfc5aa408f89 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
@@ -55,11 +55,11 @@ namespace dbaccess
     public:
         explicit OSharedConnection(css::uno::Reference< css::uno::XAggregation >& _rxProxyConnection);
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
         virtual void SAL_CALL acquire() throw() override { OSharedConnection_BASE::acquire(); }
         virtual void SAL_CALL release() throw() override { OSharedConnection_BASE::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override
         {
             return ::comphelper::concatSequences(
                 OSharedConnection_BASE::getTypes(),
@@ -67,7 +67,7 @@ namespace dbaccess
             );
         }
 
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override
         {
             css::uno::Any aReturn = OSharedConnection_BASE::queryInterface(_rType);
             if ( !aReturn.hasValue() )
@@ -76,7 +76,7 @@ namespace dbaccess
         }
 
         // XCloseable
-        virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL close(  ) override
         {
             {
                 ::osl::MutexGuard aGuard( m_aMutex );
@@ -86,40 +86,40 @@ namespace dbaccess
         }
 
         // XConnection
-        virtual void SAL_CALL setAutoCommit( sal_Bool /*autoCommit*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setAutoCommit( sal_Bool /*autoCommit*/ ) override
         {
             throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any());
         }
-        virtual void SAL_CALL setReadOnly( sal_Bool /*readOnly*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setReadOnly( sal_Bool /*readOnly*/ ) override
         {
             throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any());
         }
-        virtual void SAL_CALL setCatalog( const OUString& /*catalog*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setCatalog( const OUString& /*catalog*/ ) override
         {
             throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any());
         }
-        virtual void SAL_CALL setTransactionIsolation( sal_Int32 /*level*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setTransactionIsolation( sal_Int32 /*level*/ ) override
         {
             throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any());
         }
-        virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& /*typeMap*/ ) override
         {
             throw css::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,css::uno::Any());
         }
         // XConnection
-        virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+        virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+        virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+        virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+        virtual void SAL_CALL commit(  ) override;
+        virtual void SAL_CALL rollback(  ) override;
+        virtual sal_Bool SAL_CALL isClosed(  ) override;
+        virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+        virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+        virtual OUString SAL_CALL getCatalog(  ) override;
+        virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
     };
 
 }   // namespace dbaccess
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 3175df9bc65d..e45d54f34904 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -68,24 +68,24 @@ OBookmarkContainer::~OBookmarkContainer()
 }
 
 // XServiceInfo
-OUString SAL_CALL OBookmarkContainer::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL OBookmarkContainer::getImplementationName(  )
 {
     return OUString("com.sun.star.comp.dba.OBookmarkContainer");
 }
 
-sal_Bool SAL_CALL OBookmarkContainer::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL OBookmarkContainer::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames(  )
 {
     Sequence< OUString > aReturn { "com.sun.star.sdb.DefinitionContainer" };
     return aReturn;
 }
 
 // XNameContainer
-void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const Any& aElement )
 {
     MutexGuard aGuard(m_rMutex);
 
@@ -112,7 +112,7 @@ void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const An
     }
 }
 
-void SAL_CALL OBookmarkContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL OBookmarkContainer::removeByName( const OUString& _rName )
 {
     OUString sOldBookmark;
     {
@@ -143,7 +143,7 @@ void SAL_CALL OBookmarkContainer::removeByName( const OUString& _rName ) throw(N
 }
 
 // XNameReplace
-void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const Any& aElement )
 {
     ClearableMutexGuard aGuard(m_rMutex);
 
@@ -177,14 +177,14 @@ void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const A
     }
 }
 
-void SAL_CALL OBookmarkContainer::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception)
+void SAL_CALL OBookmarkContainer::addContainerListener( const Reference< XContainerListener >& _rxListener )
 {
     MutexGuard aGuard(m_rMutex);
     if (_rxListener.is())
         m_aContainerListeners.addInterface(_rxListener);
 }
 
-void SAL_CALL OBookmarkContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception)
+void SAL_CALL OBookmarkContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener )
 {
     MutexGuard aGuard(m_rMutex);
     if (_rxListener.is())
@@ -192,33 +192,33 @@ void SAL_CALL OBookmarkContainer::removeContainerListener( const Reference< XCon
 }
 
 // XElementAccess
-Type SAL_CALL OBookmarkContainer::getElementType( ) throw (RuntimeException, std::exception)
+Type SAL_CALL OBookmarkContainer::getElementType( )
 {
     MutexGuard aGuard(m_rMutex);
     return ::cppu::UnoType<OUString>::get();
 }
 
-sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL OBookmarkContainer::hasElements( )
 {
     MutexGuard aGuard(m_rMutex);
     return !m_aBookmarks.empty();
 }
 
 // XEnumerationAccess
-Reference< XEnumeration > SAL_CALL OBookmarkContainer::createEnumeration(  ) throw(RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL OBookmarkContainer::createEnumeration(  )
 {
     MutexGuard aGuard(m_rMutex);
     return new ::comphelper::OEnumerationByIndex(static_cast<XIndexAccess*>(this));
 }
 
 // XIndexAccess
-sal_Int32 SAL_CALL OBookmarkContainer::getCount(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL OBookmarkContainer::getCount(  )
 {
     MutexGuard aGuard(m_rMutex);
     return m_aBookmarks.size();
 }
 
-Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex )
 {
     MutexGuard aGuard(m_rMutex);
 
@@ -228,7 +228,7 @@ Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutO
     return makeAny(m_aBookmarksIndexed[_nIndex]->second);
 }
 
-Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName )
 {
     MutexGuard aGuard(m_rMutex);
 
@@ -238,7 +238,7 @@ Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName ) throw(NoSuc
     return makeAny(m_aBookmarks[_rName]);
 }
 
-Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames(  )
 {
     MutexGuard aGuard(m_rMutex);
 
@@ -256,7 +256,7 @@ Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames(  ) throw(Runt
     return aNames;
 }
 
-sal_Bool SAL_CALL OBookmarkContainer::hasByName( const OUString& _rName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OBookmarkContainer::hasByName( const OUString& _rName )
 {
     MutexGuard aGuard(m_rMutex);
 
@@ -308,12 +308,12 @@ void OBookmarkContainer::implReplace(const OUString& _rName, const OUString& _rN
     m_aBookmarks[_rName] = _rNewLink;
 }
 
-Reference< XInterface > SAL_CALL OBookmarkContainer::getParent(  ) throw (RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OBookmarkContainer::getParent(  )
 {
     return m_rParent;
 }
 
-void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Parent*/ ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Parent*/ )
 {
     throw NoSupportException();
 }
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
index 1e3b8646b391..1f0f453add87 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
@@ -88,40 +88,40 @@ public:
     virtual void SAL_CALL release(  ) throw() override;
 
 // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
 // css::container::XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
 // css::container::XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) override;
 
 // css::container::XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& _rName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& _rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& _rName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& _rName ) override;
 
 // css::container::XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& _rName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& _rName, const css::uno::Any& aElement ) override;
 
 // css::container::XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
 // css::container::XContainer
-    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
 // css::container::XChild
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
 protected:
     /** quickly checks if there already is an element with a given name. No access to the configuration occurs, i.e.
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx
index 243015b19bca..a089c9ddd976 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -57,7 +57,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( OCommandContainer,ODefinitionContainer,OCommandCo
 IMPLEMENT_GETTYPES2(OCommandContainer,ODefinitionContainer,OCommandContainer_BASE);
 
 css::uno::Sequence<sal_Int8> OCommandContainer::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -74,12 +73,12 @@ Reference< XContent > OCommandContainer::createObject( const OUString& _rName)
         return static_cast< css::sdb::XQueryDefinition * > ( new OCommandDefinition( *this, _rName, m_aContext, pElementContent ) );
 }
 
-Reference< XInterface > SAL_CALL OCommandContainer::createInstanceWithArguments(const Sequence< Any >& /*aArguments*/ ) throw (Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OCommandContainer::createInstanceWithArguments(const Sequence< Any >& /*aArguments*/ )
 {
     return createInstance( );
 }
 
-Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OCommandContainer::createInstance( )
 {
     if(m_bTables)
         return css::sdb::TableDefinition::createDefault( m_aContext );
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx
index 3ca33c979c82..a309f0ece37d 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx
@@ -50,14 +50,12 @@ public:
 
     DECLARE_XINTERFACE( )
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
     // XSingleServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 protected:
     virtual ~OCommandContainer() override;
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 10c767524d4c..8d34887c007a 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -78,7 +78,6 @@ OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContai
 }
 
 css::uno::Sequence<sal_Int8> OCommandDefinition::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -87,12 +86,12 @@ IMPLEMENT_GETTYPES2(OCommandDefinition,OCommandDefinition_Base,OComponentDefinit
 IMPLEMENT_FORWARD_XINTERFACE2( OCommandDefinition,OComponentDefinition,OCommandDefinition_Base)
 IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP)
 
-OUString SAL_CALL OCommandDefinition::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OCommandDefinition::getImplementationName()
 {
     return OUString("com.sun.star.comp.dba.OCommandDefinition");
 }
 
-css::uno::Sequence<OUString> SAL_CALL OCommandDefinition::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OCommandDefinition::getSupportedServiceNames()
 {
     return {
         "com.sun.star.sdb.QueryDefinition",
@@ -101,7 +100,7 @@ css::uno::Sequence<OUString> SAL_CALL OCommandDefinition::getSupportedServiceNam
     };
 }
 
-void SAL_CALL OCommandDefinition::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL OCommandDefinition::rename( const OUString& newName )
 {
     try
     {
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index 135ee3990a18..f8372035ebe9 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -70,52 +70,49 @@ public:
             ,const TContentPtr& _pImpl
         );
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
 // css::uno::XInterface
     DECLARE_XINTERFACE( )
 
 // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XRename
-    virtual void SAL_CALL rename( const OUString& newName ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rename( const OUString& newName ) override;
 
     // overrides to resolve ambiguity
-    virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override
         { OComponentDefinition::setPropertyValue(p1, p2); }
-    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override
         { return OComponentDefinition::getPropertyValue(p1); }
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
         { OComponentDefinition::addPropertyChangeListener(p1, p2); }
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
         { OComponentDefinition::removePropertyChangeListener(p1, p2); }
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
         { OComponentDefinition::addVetoableChangeListener(p1, p2); }
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
         { OComponentDefinition::removeVetoableChangeListener(p1, p2); }
-    virtual css::uno::Reference<css::ucb::XContentIdentifier> SAL_CALL getIdentifier() throw( css::uno::RuntimeException, std::exception ) override
+    virtual css::uno::Reference<css::ucb::XContentIdentifier> SAL_CALL getIdentifier() override
         { return OComponentDefinition::getIdentifier(); }
-    virtual OUString SAL_CALL getContentType() throw( css::uno::RuntimeException, std::exception ) override
+    virtual OUString SAL_CALL getContentType() override
         { return OComponentDefinition::getContentType(); }
-    virtual void SAL_CALL addContentEventListener(const css::uno::Reference<css::ucb::XContentEventListener>& p1) throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL addContentEventListener(const css::uno::Reference<css::ucb::XContentEventListener>& p1) override
         { OComponentDefinition::addContentEventListener(p1); }
-    virtual void SAL_CALL removeContentEventListener(const css::uno::Reference<css::ucb::XContentEventListener>& p1) throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL removeContentEventListener(const css::uno::Reference<css::ucb::XContentEventListener>& p1) override
         { OComponentDefinition::removeContentEventListener(p1); }
-     virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override
+     virtual void SAL_CALL dispose() override
         { OComponentDefinition::dispose(); }
-    virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override
         { OComponentDefinition::addEventListener(p1); }
-     virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw( css::uno::RuntimeException, std::exception ) override
+     virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override
         { OComponentDefinition::removeEventListener(p1); }
 
     // OPropertySetHelper
-    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
     virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     virtual cppu::IPropertyArrayHelper* createArrayHelper() const override;
 
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index c03734574d74..d3b928362293 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -76,17 +76,17 @@ namespace dbaccess
 {
 
 // XServiceInfo
-OUString OConnection::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString OConnection::getImplementationName(  )
 {
     return OUString("com.sun.star.comp.dbaccess.Connection");
 }
 
-sal_Bool OConnection::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool OConnection::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > OConnection::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > OConnection::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSupported = OConnectionWrapper::getSupportedServiceNames();
 
@@ -101,20 +101,20 @@ Sequence< OUString > OConnection::getSupportedServiceNames(  ) throw (RuntimeExc
 }
 
 // XCloseable
-void OConnection::close() throw( SQLException, RuntimeException, std::exception )
+void OConnection::close()
 {
     // being closed is the same as being disposed
     dispose();
 }
 
-sal_Bool OConnection::isClosed() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OConnection::isClosed()
 {
     MutexGuard aGuard(m_aMutex);
     return !m_xMasterConnection.is();
 }
 
 // XConnection
-Reference< XStatement >  OConnection::createStatement() throw( SQLException, RuntimeException, std::exception )
+Reference< XStatement >  OConnection::createStatement()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -129,7 +129,7 @@ Reference< XStatement >  OConnection::createStatement() throw( SQLException, Run
     return xStatement;
 }
 
-Reference< XPreparedStatement >  OConnection::prepareStatement(const OUString& sql) throw( SQLException, RuntimeException, std::exception )
+Reference< XPreparedStatement >  OConnection::prepareStatement(const OUString& sql)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -145,7 +145,7 @@ Reference< XPreparedStatement >  OConnection::prepareStatement(const OUString& s
     return xStatement;
 }
 
-Reference< XPreparedStatement >  OConnection::prepareCall(const OUString& sql) throw( SQLException, RuntimeException, std::exception )
+Reference< XPreparedStatement >  OConnection::prepareCall(const OUString& sql)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -160,98 +160,98 @@ Reference< XPreparedStatement >  OConnection::prepareCall(const OUString& sql) t
     return xStatement;
 }
 
-OUString OConnection::nativeSQL(const OUString& sql) throw( SQLException, RuntimeException, std::exception )
+OUString OConnection::nativeSQL(const OUString& sql)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->nativeSQL(sql);
 }
 
-void OConnection::setAutoCommit(sal_Bool autoCommit) throw( SQLException, RuntimeException, std::exception )
+void OConnection::setAutoCommit(sal_Bool autoCommit)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->setAutoCommit(autoCommit);
 }
 
-sal_Bool OConnection::getAutoCommit() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OConnection::getAutoCommit()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getAutoCommit();
 }
 
-void OConnection::commit() throw( SQLException, RuntimeException, std::exception )
+void OConnection::commit()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->commit();
 }
 
-void OConnection::rollback() throw( SQLException, RuntimeException, std::exception )
+void OConnection::rollback()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->rollback();
 }
 
-Reference< XDatabaseMetaData >  OConnection::getMetaData() throw( SQLException, RuntimeException, std::exception )
+Reference< XDatabaseMetaData >  OConnection::getMetaData()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getMetaData();
 }
 
-void OConnection::setReadOnly(sal_Bool readOnly) throw( SQLException, RuntimeException, std::exception )
+void OConnection::setReadOnly(sal_Bool readOnly)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->setReadOnly(readOnly);
 }
 
-sal_Bool OConnection::isReadOnly() throw( SQLException, RuntimeException, std::exception )
+sal_Bool OConnection::isReadOnly()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->isReadOnly();
 }
 
-void OConnection::setCatalog(const OUString& catalog) throw( SQLException, RuntimeException, std::exception )
+void OConnection::setCatalog(const OUString& catalog)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->setCatalog(catalog);
 }
 
-OUString OConnection::getCatalog() throw( SQLException, RuntimeException, std::exception )
+OUString OConnection::getCatalog()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getCatalog();
 }
 
-void OConnection::setTransactionIsolation(sal_Int32 level) throw( SQLException, RuntimeException, std::exception )
+void OConnection::setTransactionIsolation(sal_Int32 level)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->setTransactionIsolation(level);
 }
 
-sal_Int32 OConnection::getTransactionIsolation() throw( SQLException, RuntimeException, std::exception )
+sal_Int32 OConnection::getTransactionIsolation()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getTransactionIsolation();
 }
 
-Reference< XNameAccess >  OConnection::getTypeMap() throw( SQLException, RuntimeException, std::exception )
+Reference< XNameAccess >  OConnection::getTypeMap()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getTypeMap();
 }
 
-void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) throw( SQLException, RuntimeException, std::exception )
+void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -364,14 +364,14 @@ OConnection::~OConnection()
 }
 
 // XWarningsSupplier
-Any SAL_CALL OConnection::getWarnings() throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL OConnection::getWarnings()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_aWarnings.getWarnings();
 }
 
-void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnection::clearWarnings(  )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -397,7 +397,7 @@ namespace
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > OConnection::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OConnection::getTypes()
 {
     TypeBag aNormalizedTypes;
 
@@ -415,13 +415,13 @@ Sequence< Type > OConnection::getTypes() throw (RuntimeException, std::exception
     return comphelper::containerToSequence(aNormalizedTypes);
 }
 
-Sequence< sal_Int8 > OConnection::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > OConnection::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // css::uno::XInterface
-Any OConnection::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any OConnection::queryInterface( const Type & rType )
 {
     if ( !m_bSupportsViews && rType.equals( cppu::UnoType<XViewsSupplier>::get() ) )
         return Any();
@@ -496,20 +496,20 @@ void OConnection::disposing()
 }
 
 // XChild
-Reference< XInterface >  OConnection::getParent() throw( RuntimeException, std::exception )
+Reference< XInterface >  OConnection::getParent()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xParent;
 }
 
-void OConnection::setParent(const Reference< XInterface > & /*Parent*/) throw( NoSupportException, RuntimeException, std::exception )
+void OConnection::setParent(const Reference< XInterface > & /*Parent*/)
 {
     throw NoSupportException();
 }
 
 // XSQLQueryComposerFactory
-Reference< XSQLQueryComposer >  OConnection::createQueryComposer() throw( RuntimeException, std::exception )
+Reference< XSQLQueryComposer >  OConnection::createQueryComposer()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -567,7 +567,7 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
 }
 
 // XTablesSupplier
-Reference< XNameAccess >  OConnection::getTables() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  OConnection::getTables()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -577,7 +577,7 @@ Reference< XNameAccess >  OConnection::getTables() throw( RuntimeException, std:
     return m_pTables;
 }
 
-Reference< XNameAccess > SAL_CALL OConnection::getViews(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OConnection::getViews(  )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -588,7 +588,7 @@ Reference< XNameAccess > SAL_CALL OConnection::getViews(  ) throw(RuntimeExcepti
 }
 
 // XQueriesSupplier
-Reference< XNameAccess >  OConnection::getQueries() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  OConnection::getQueries()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -597,7 +597,7 @@ Reference< XNameAccess >  OConnection::getQueries() throw( RuntimeException, std
 }
 
 // css::sdb::XCommandPreparation
-Reference< XPreparedStatement >  SAL_CALL OConnection::prepareCommand( const OUString& command, sal_Int32 commandType ) throw(css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< XPreparedStatement >  SAL_CALL OConnection::prepareCommand( const OUString& command, sal_Int32 commandType )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -628,7 +628,7 @@ Reference< XPreparedStatement >  SAL_CALL OConnection::prepareCommand( const OUS
     return prepareStatement(aStatement);
 }
 
-Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _sServiceSpecifier ) throw (Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _sServiceSpecifier )
 {
     Reference< XServiceInfo > xRet;
     if ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier || _sServiceSpecifier == "com.sun.star.sdb.SingleSelectQueryAnalyzer" )
@@ -658,12 +658,12 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _s
     return Reference<XInterface>(xRet, UNO_QUERY);
 }
 
-Reference< XInterface > SAL_CALL OConnection::createInstanceWithArguments( const OUString& _sServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) throw (Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OConnection::createInstanceWithArguments( const OUString& _sServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
 {
     return createInstance(_sServiceSpecifier);
 }
 
-Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames(  )
 {
     Sequence< OUString > aRet { SERVICE_NAME_SINGLESELECTQUERYCOMPOSER };
     return aRet;
@@ -688,7 +688,7 @@ Reference< XTablesSupplier > const & OConnection::getMasterTables()
 }
 
 // XUsersSupplier
-Reference< XNameAccess > SAL_CALL OConnection::getUsers(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OConnection::getUsers(  )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -698,7 +698,7 @@ Reference< XNameAccess > SAL_CALL OConnection::getUsers(  ) throw(RuntimeExcepti
 }
 
 // XGroupsSupplier
-Reference< XNameAccess > SAL_CALL OConnection::getGroups(  ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL OConnection::getGroups(  )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -711,7 +711,7 @@ void OConnection::impl_loadConnectionTools_throw()
     m_xConnectionTools = css::sdb::tools::ConnectionTools::createWithConnection( m_aContext, this );
 }
 
-Reference< XTableName > SAL_CALL OConnection::createTableName(  ) throw (RuntimeException, std::exception)
+Reference< XTableName > SAL_CALL OConnection::createTableName(  )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -720,7 +720,7 @@ Reference< XTableName > SAL_CALL OConnection::createTableName(  ) throw (Runtime
     return m_xConnectionTools->createTableName();
 }
 
-Reference< XObjectNames > SAL_CALL OConnection::getObjectNames(  ) throw (RuntimeException, std::exception)
+Reference< XObjectNames > SAL_CALL OConnection::getObjectNames(  )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -729,7 +729,7 @@ Reference< XObjectNames > SAL_CALL OConnection::getObjectNames(  ) throw (Runtim
     return m_xConnectionTools->getObjectNames();
 }
 
-Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData(  ) throw (RuntimeException, std::exception)
+Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData(  )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -738,7 +738,7 @@ Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData(  )
     return m_xConnectionTools->getDataSourceMetaData();
 }
 
-Reference< css::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) throw (css::sdbc::SQLException, RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -747,7 +747,7 @@ Reference< css::container::XNameAccess > SAL_CALL OConnection::getFieldsByComman
     return m_xConnectionTools->getFieldsByCommandDescriptor(commandType,command,keepFieldsAlive);
 }
 
-Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (css::uno::RuntimeException, std::exception)
+Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const OUString& command )
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
@@ -790,7 +790,7 @@ void OConnection::impl_checkTableQueryNames_nothrow()
     }
 }
 
-Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (RuntimeException, std::exception)
+Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode )
 {
     Reference< XGraphic > xReturn;
 
@@ -806,7 +806,7 @@ Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& TableN
     return xReturn;
 }
 
-Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName )
 {
     Reference< XInterface > xReturn;
 
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index d1258f211467..35985fb42d73 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -111,11 +111,11 @@ public:
                 ,const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
 
 // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 // css::uno::XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw( ) override;
     virtual void SAL_CALL release() throw( ) override;
 
@@ -123,82 +123,82 @@ public:
     virtual void SAL_CALL disposing() override;
 
 // css::container::XChild
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
 // css::sdbcx::XTablesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) override;
 // css::sdbcx::XViewsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews(  ) override;
 
 // css::sdb::XQueriesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getQueries(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getQueries(  ) override;
 
 // css::sdb::XSQLQueryComposerFactory
-    virtual css::uno::Reference< css::sdb::XSQLQueryComposer > SAL_CALL createQueryComposer(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdb::XSQLQueryComposer > SAL_CALL createQueryComposer(  ) override;
 
 // css::sdb::XCommandPreparation
-    virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const OUString& command, sal_Int32 commandType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const OUString& command, sal_Int32 commandType ) override;
 
 // css::sdbc::XWarningsSupplier
-    virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+    virtual void SAL_CALL clearWarnings(  ) override;
 
 // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 // XConnection
-    virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL commit(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rollback(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isClosed(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCatalog(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
+    virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override;
+    virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override;
+    virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override;
+    virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override;
+    virtual sal_Bool SAL_CALL getAutoCommit(  ) override;
+    virtual void SAL_CALL commit(  ) override;
+    virtual void SAL_CALL rollback(  ) override;
+    virtual sal_Bool SAL_CALL isClosed(  ) override;
+    virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) override;
+    virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override;
+    virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+    virtual void SAL_CALL setCatalog( const OUString& catalog ) override;
+    virtual OUString SAL_CALL getCatalog(  ) override;
+    virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override;
+    virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap(  ) override;
+    virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
 // css::sdbc::XCloseable
-    virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close(  ) override;
 
     // XMultiServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
 
     // XUsersSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers(  ) override;
     // XGroupsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups(  ) override;
 
     // XConnectionTools
-    virtual css::uno::Reference< css::sdb::tools::XTableName > SAL_CALL createTableName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdb::tools::XObjectNames > SAL_CALL getObjectNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdb::tools::XTableName > SAL_CALL createTableName(  ) override;
+    virtual css::uno::Reference< css::sdb::tools::XObjectNames > SAL_CALL getObjectNames(  ) override;
+    virtual css::uno::Reference< css::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData(  ) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) override;
+    virtual css::uno::Reference< css::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) override;
 
     // XTableUIProvider
-    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getTableEditor( const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getTableEditor( const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) override;
 
     // IRefreshListener
     virtual void refresh(const css::uno::Reference< css::container::XNameAccess >& _rToBeRefreshed) override;
 
 protected:
     /// @throws css::lang::DisposedException
-    inline  void checkDisposed() throw (css::lang::DisposedException)
+    inline  void checkDisposed()
     {
         if ( rBHelper.bDisposed || !m_xConnection.is() )
             throw css::lang::DisposedException();
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index f1eec5faefcd..a3fc0f66a7db 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -75,16 +75,16 @@ namespace
         DECLARE_XTYPEPROVIDER()
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     protected:
         virtual ~DataAccessDescriptor() override;
 
     protected:
         // XPropertySet
-        virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override;
+        virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
@@ -164,23 +164,23 @@ namespace
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataAccessDescriptor, DataAccessDescriptor_TypeBase, DataAccessDescriptor_PropertyBase );
 
-    OUString SAL_CALL DataAccessDescriptor::getImplementationName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL DataAccessDescriptor::getImplementationName()
     {
         return OUString( "com.sun.star.comp.dba.DataAccessDescriptor" );
     }
 
-    sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL DataAccessDescriptor::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DataAccessDescriptor::getSupportedServiceNames(  )
     {
         Sequence< OUString > aServices { "com.sun.star.sdb.DataAccessDescriptor" };
         return aServices;
     }
 
-    Reference< XPropertySetInfo > SAL_CALL DataAccessDescriptor::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL DataAccessDescriptor::getPropertySetInfo()
     {
         Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
@@ -203,12 +203,12 @@ namespace
     {
     public:
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XDataAccessDescriptorFactory
-        virtual Reference< XPropertySet > SAL_CALL createDataAccessDescriptor(  ) throw (RuntimeException, std::exception) override;
+        virtual Reference< XPropertySet > SAL_CALL createDataAccessDescriptor(  ) override;
 
         DataAccessDescriptorFactory();
     };
@@ -217,23 +217,23 @@ namespace
     {
     }
 
-    OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName()
     {
         return OUString( "com.sun.star.comp.dba.DataAccessDescriptorFactory" );
     }
 
-    sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames()
     {
         Sequence< OUString > aServices { "com.sun.star.sdb.DataAccessDescriptorFactory" };
         return aServices;
     }
 
-    Reference< XPropertySet > SAL_CALL DataAccessDescriptorFactory::createDataAccessDescriptor(  ) throw (RuntimeException, std::exception)
+    Reference< XPropertySet > SAL_CALL DataAccessDescriptorFactory::createDataAccessDescriptor(  )
     {
         return new DataAccessDescriptor();
     }
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 28984584f66e..35de41f191d3 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -110,10 +110,10 @@ namespace dbaccess
 
         private:
             // XTerminateListener
-            virtual void SAL_CALL queryTermination( const lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) override;
-            virtual void SAL_CALL notifyTermination( const lang::EventObject& Event ) throw (RuntimeException, std::exception) override;
+            virtual void SAL_CALL queryTermination( const lang::EventObject& Event ) override;
+            virtual void SAL_CALL notifyTermination( const lang::EventObject& Event ) 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;
         };
 
         DatabaseDocumentLoader::DatabaseDocumentLoader( const Reference<XComponentContext> & rxContext )
@@ -130,7 +130,7 @@ namespace dbaccess
             }
         }
 
-        void SAL_CALL DatabaseDocumentLoader::queryTermination( const lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException, std::exception)
+        void SAL_CALL DatabaseDocumentLoader::queryTermination( const lang::EventObject& /*Event*/ )
         {
             ::std::list< const ODatabaseModelImpl* > aCpy(m_aDatabaseDocuments);
             for( const auto& pCopy : aCpy )
@@ -153,11 +153,11 @@ namespace dbaccess
             }
         }
 
-        void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ ) throw (RuntimeException, std::exception)
+        void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ )
         {
         }
 
-        void SAL_CALL DatabaseDocumentLoader::disposing( const lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+        void SAL_CALL DatabaseDocumentLoader::disposing( const lang::EventObject& /*Source*/ )
         {
         }
 
@@ -199,7 +199,7 @@ ODatabaseContext::~ODatabaseContext()
 }
 
 // Helper
-OUString ODatabaseContext::getImplementationName_static() throw( RuntimeException )
+OUString ODatabaseContext::getImplementationName_static()
 {
     return OUString("com.sun.star.comp.dba.ODatabaseContext");
 }
@@ -209,24 +209,24 @@ Reference< XInterface > ODatabaseContext::Create(const Reference< XComponentCont
     return *( new ODatabaseContext( _rxContext ) );
 }
 
-Sequence< OUString > ODatabaseContext::getSupportedServiceNames_static() throw( RuntimeException )
+Sequence< OUString > ODatabaseContext::getSupportedServiceNames_static()
 {
     Sequence<OUString> aSNS { "com.sun.star.sdb.DatabaseContext" };
     return aSNS;
 }
 
 // XServiceInfo
-OUString ODatabaseContext::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString ODatabaseContext::getImplementationName(  )
 {
     return getImplementationName_static();
 }
 
-sal_Bool ODatabaseContext::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool ODatabaseContext::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > ODatabaseContext::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > ODatabaseContext::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_static();
 }
@@ -239,14 +239,14 @@ Reference< XInterface > ODatabaseContext::impl_createNewDataSource()
     return xDataSource.get();
 }
 
-Reference< XInterface > SAL_CALL ODatabaseContext::createInstance(  ) throw (Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ODatabaseContext::createInstance(  )
 {
     // for convenience of the API user, we ensure the document is fully initialized (effectively: XLoadable::initNew
     // has been called at the DatabaseDocument).
     return impl_createNewDataSource();
 }
 
-Reference< XInterface > SAL_CALL ODatabaseContext::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ODatabaseContext::createInstanceWithArguments( const Sequence< Any >& _rArguments )
 {
     ::comphelper::NamedValueCollection aArgs( _rArguments );
     OUString sURL = aArgs.getOrDefault( INFO_POOLURL, OUString() );
@@ -286,7 +286,7 @@ void ODatabaseContext::disposing()
 }
 
 // XNamingService
-Reference< XInterface >  ODatabaseContext::getRegisteredObject(const OUString& _rName) throw( Exception, RuntimeException, std::exception )
+Reference< XInterface >  ODatabaseContext::getRegisteredObject(const OUString& _rName)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
@@ -421,7 +421,7 @@ void ODatabaseContext::setTransientProperties(const OUString& _sURL, ODatabaseMo
     }
 }
 
-void ODatabaseContext::registerObject(const OUString& _rName, const Reference< XInterface > & _rxObject) throw( Exception, RuntimeException, std::exception )
+void ODatabaseContext::registerObject(const OUString& _rName, const Reference< XInterface > & _rxObject)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
@@ -504,17 +504,17 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl
     }
 }
 
-void SAL_CALL ODatabaseContext::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::addContainerListener( const Reference< XContainerListener >& _rxListener )
 {
     m_aContainerListeners.addInterface(_rxListener);
 }
 
-void SAL_CALL ODatabaseContext::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::removeContainerListener( const Reference< XContainerListener >& _rxListener )
 {
     m_aContainerListeners.removeInterface(_rxListener);
 }
 
-void ODatabaseContext::revokeObject(const OUString& _rName) throw( Exception, RuntimeException, std::exception )
+void ODatabaseContext::revokeObject(const OUString& _rName)
 {
     ClearableMutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
@@ -540,58 +540,58 @@ void ODatabaseContext::revokeObject(const OUString& _rName) throw( Exception, Ru
     m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvent );
 }
 
-sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const OUString& Name )
 {
     return m_xDatabaseRegistrations->hasRegisteredDatabase( Name );
 }
 
-Sequence< OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ODatabaseContext::getRegistrationNames()
 {
     return m_xDatabaseRegistrations->getRegistrationNames();
 }
 
-OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const OUString& Name )
 {
     return m_xDatabaseRegistrations->getDatabaseLocation( Name );
 }
 
-void SAL_CALL ODatabaseContext::registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::registerDatabaseLocation( const OUString& Name, const OUString& Location )
 {
     m_xDatabaseRegistrations->registerDatabaseLocation( Name, Location );
 }
 
-void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const OUString& Name )
 {
     m_xDatabaseRegistrations->revokeDatabaseLocation( Name );
 }
 
-void SAL_CALL ODatabaseContext::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation )
 {
     m_xDatabaseRegistrations->changeDatabaseLocation( Name, NewLocation );
 }
 
-sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const OUString& Name )
 {
     return m_xDatabaseRegistrations->isDatabaseRegistrationReadOnly( Name );
 }
 
-void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener )
 {
     m_xDatabaseRegistrations->addDatabaseRegistrationsListener( Listener );
 }
 
-void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener )
 {
     m_xDatabaseRegistrations->removeDatabaseRegistrationsListener( Listener );
 }
 
 // css::container::XElementAccess
-Type ODatabaseContext::getElementType(  ) throw(RuntimeException, std::exception)
+Type ODatabaseContext::getElementType(  )
 {
     return cppu::UnoType<XDataSource>::get();
 }
 
-sal_Bool ODatabaseContext::hasElements() throw( RuntimeException, std::exception )
+sal_Bool ODatabaseContext::hasElements()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
@@ -600,15 +600,14 @@ sal_Bool ODatabaseContext::hasElements() throw( RuntimeException, std::exception
 }
 
 // css::container::XEnumerationAccess
-Reference< css::container::XEnumeration >  ODatabaseContext::createEnumeration() throw( RuntimeException, std::exception )
+Reference< css::container::XEnumeration >  ODatabaseContext::createEnumeration()
 {
     MutexGuard aGuard(m_aMutex);
     return new ::comphelper::OEnumerationByName(static_cast<XNameAccess*>(this));
 }
 
 // css::container::XNameAccess
-Any ODatabaseContext::getByName(const OUString& _rName) throw( NoSuchElementException,
-                                                          WrappedTargetException, RuntimeException, std::exception )
+Any ODatabaseContext::getByName(const OUString& _rName)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
@@ -657,7 +656,7 @@ Any ODatabaseContext::getByName(const OUString& _rName) throw( NoSuchElementExce
     }
 }
 
-Sequence< OUString > ODatabaseContext::getElementNames() throw( RuntimeException, std::exception )
+Sequence< OUString > ODatabaseContext::getElementNames()
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
@@ -665,7 +664,7 @@ Sequence< OUString > ODatabaseContext::getElementNames() throw( RuntimeException
     return getRegistrationNames();
 }
 
-sal_Bool ODatabaseContext::hasByName(const OUString& _rName) throw( RuntimeException, std::exception )
+sal_Bool ODatabaseContext::hasByName(const OUString& _rName)
 {
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed);
@@ -715,7 +714,7 @@ void ODatabaseContext::databaseDocumentURLChange( const OUString& _rOldURL, cons
     m_aDatabaseObjects.erase( oldPos );
 }
 
-sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >& rId )
 {
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast<sal_Int64>(this);
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index 14f4a0ba9568..b51425d3e312 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -117,56 +117,56 @@ public:
     virtual void SAL_CALL disposing() override;
 
     // XSingleServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(  ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& _rArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(  ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& _rArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XServiceInfo - static methods
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_static();
     static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XNamingService
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL revokeObject( const OUString& Name ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) override;
+    virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) override;
+    virtual void SAL_CALL revokeObject( const OUString& Name ) override;
 
     // XDatabaseRegistrations
-    virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getRegistrationNames() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addDatabaseRegistrationsListener( const css::uno::Reference< css::sdb::XDatabaseRegistrationsListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeDatabaseRegistrationsListener( const css::uno::Reference< css::sdb::XDatabaseRegistrationsListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getRegistrationNames() override;
+    virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) override;
+    virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) override;
+    virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) override;
+    virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) override;
+    virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) override;
+    virtual void SAL_CALL addDatabaseRegistrationsListener( const css::uno::Reference< css::sdb::XDatabaseRegistrationsListener >& Listener ) override;
+    virtual void SAL_CALL removeDatabaseRegistrationsListener( const css::uno::Reference< css::sdb::XDatabaseRegistrationsListener >& Listener ) override;
 
     // XContainer
-    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
     // css::lang::XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
     static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
     void registerDatabaseDocument( ODatabaseModelImpl& _rModelImpl);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index f067ed3185bd..8d92f735c12f 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -197,7 +197,7 @@ ODatabaseDocument::~ODatabaseDocument()
     m_pEventContainer = nullptr;
 }
 
-Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL ODatabaseDocument::queryInterface( const Type& _rType )
 {
     // strip XEmbeddedScripts and XScriptInvocationContext if we have any form/report
     // which already contains macros. In this case, the database document itself is not
@@ -225,7 +225,7 @@ void SAL_CALL ODatabaseDocument::release(  ) throw ()
     ODatabaseDocument_OfficeDocument::release();
 }
 
-Sequence< Type > SAL_CALL ODatabaseDocument::getTypes(  ) throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL ODatabaseDocument::getTypes(  )
 {
     Sequence< Type > aTypes = ::comphelper::concatSequences(
         ODatabaseDocument_OfficeDocument::getTypes(),
@@ -266,7 +266,7 @@ Sequence< Type > SAL_CALL ODatabaseDocument::getTypes(  ) throw (RuntimeExceptio
     return aTypes;
 }
 
-Sequence< sal_Int8 > SAL_CALL ODatabaseDocument::getImplementationId(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL ODatabaseDocument::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -372,7 +372,7 @@ static const char sPictures[] = "Pictures";
 // I could check anyway )
 
 /// @throws RuntimeException
-void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibraryContainer >& xDlgCont, const Reference< XStorage >& xStorage, const Reference< XModel >& rxModel, const Reference<XComponentContext >& rxContext ) throw ( RuntimeException )
+void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibraryContainer >& xDlgCont, const Reference< XStorage >& xStorage, const Reference< XModel >& rxModel, const Reference<XComponentContext >& rxContext )
 {
     Sequence< OUString > sLibraries = xDlgCont->getElementNames();
     Reference< XStorage > xTmpPic = xStorage->openStorageElement( "tempPictures", ElementModes::READWRITE  );
@@ -505,7 +505,7 @@ void ODatabaseDocument::impl_import_nolck_throw( const Reference< XComponentCont
         xStatusIndicator->end();
 }
 
-void SAL_CALL ODatabaseDocument::initNew(  ) throw (DoubleInitializationException, IOException, Exception, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::initNew(  )
 {
     // SYNCHRONIZED ->
     DocumentGuard aGuard( *this, DocumentGuard::InitMethod );
@@ -538,7 +538,7 @@ void SAL_CALL ODatabaseDocument::initNew(  ) throw (DoubleInitializationExceptio
     impl_notifyStorageChange_nolck_nothrow( xTempStor );
 }
 
-void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& Arguments ) throw (DoubleInitializationException, IOException, Exception, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& Arguments )
 {
     // SYNCHRONIZED ->
     DocumentGuard aGuard( *this, DocumentGuard::InitMethod );
@@ -615,7 +615,7 @@ namespace
     }
 }
 
-sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave()
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
@@ -653,7 +653,7 @@ sal_Bool SAL_CALL ODatabaseDocument::wasModifiedSinceLastSave() throw ( RuntimeE
     return false;
 }
 
-void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception )
+void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     ModifyLock aLock( *this );
@@ -689,7 +689,7 @@ void SAL_CALL ODatabaseDocument::storeToRecoveryFile( const OUString& i_TargetLo
     }
 }
 
-void SAL_CALL ODatabaseDocument::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception )
+void SAL_CALL ODatabaseDocument::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor )
 {
     try
     {
@@ -742,7 +742,7 @@ void SAL_CALL ODatabaseDocument::recoverFromFile( const OUString& i_SourceLocati
 }
 
 // XModel
-sal_Bool SAL_CALL ODatabaseDocument::attachResource( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseDocument::attachResource( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments )
 {
     if (_rURL.isEmpty() && _rArguments.getLength() == 1 && _rArguments[0].Name == "SetEmbedded")
     {
@@ -809,19 +809,19 @@ bool ODatabaseDocument::impl_attachResource( const OUString& i_rLogicalDocumentU
     return true;
 }
 
-OUString SAL_CALL ODatabaseDocument::getURL(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseDocument::getURL(  )
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
     return m_pImpl->getURL();
 }
 
-Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getArgs(  ) throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getArgs(  )
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
     return m_pImpl->getMediaDescriptor().getPropertyValues();
 }
 
-void SAL_CALL ODatabaseDocument::connectController( const Reference< XController >& _xController ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::connectController( const Reference< XController >& _xController )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
@@ -847,7 +847,7 @@ void SAL_CALL ODatabaseDocument::connectController( const Reference< XController
     m_pImpl->checkMacrosOnLoading();
 }
 
-void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XController >& _xController ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XController >& _xController )
 {
     bool bNotifyViewClosed = false;
     bool bLastControllerGone = false;
@@ -891,35 +891,35 @@ void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XControl
     }
 }
 
-void SAL_CALL ODatabaseDocument::lockControllers(  ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::lockControllers(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
     ++m_pImpl->m_nControllerLockCount;
 }
 
-void SAL_CALL ODatabaseDocument::unlockControllers(  ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::unlockControllers(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
     --m_pImpl->m_nControllerLockCount;
 }
 
-sal_Bool SAL_CALL ODatabaseDocument::hasControllersLocked(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseDocument::hasControllersLocked(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
     return m_pImpl->m_nControllerLockCount != 0;
 }
 
-Reference< XController > SAL_CALL ODatabaseDocument::getCurrentController() throw (RuntimeException, std::exception)
+Reference< XController > SAL_CALL ODatabaseDocument::getCurrentController()
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
     return m_xCurrentController.is() ? m_xCurrentController : ( m_aControllers.empty() ? Reference< XController >() : *m_aControllers.begin() );
 }
 
-void SAL_CALL ODatabaseDocument::setCurrentController( const Reference< XController >& _xController ) throw (NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::setCurrentController( const Reference< XController >& _xController )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
@@ -948,7 +948,7 @@ void SAL_CALL ODatabaseDocument::setCurrentController( const Reference< XControl
     }
 }
 
-Reference< XInterface > SAL_CALL ODatabaseDocument::getCurrentSelection(  ) throw (RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ODatabaseDocument::getCurrentSelection(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
@@ -961,12 +961,12 @@ Reference< XInterface > SAL_CALL ODatabaseDocument::getCurrentSelection(  ) thro
 }
 
 // XStorable
-sal_Bool SAL_CALL ODatabaseDocument::hasLocation(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseDocument::hasLocation(  )
 {
     return !getLocation().isEmpty();
 }
 
-OUString SAL_CALL ODatabaseDocument::getLocation(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseDocument::getLocation(  )
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
     return m_pImpl->getURL();
@@ -974,13 +974,13 @@ OUString SAL_CALL ODatabaseDocument::getLocation(  ) throw (RuntimeException, st
         // the location of the file which the document was possibly recovered from (which would be getDocFileLocation)
 }
 
-sal_Bool SAL_CALL ODatabaseDocument::isReadonly(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseDocument::isReadonly(  )
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
     return m_pImpl->m_bDocumentReadOnly;
 }
 
-void SAL_CALL ODatabaseDocument::store(  ) throw (IOException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::store(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
@@ -1029,7 +1029,7 @@ void ODatabaseDocument::impl_throwIOExceptionCausedBySave_throw( const Any& i_rE
 }
 
 void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comphelper::NamedValueCollection& _rArguments,
-    const StoreType _eType, DocumentGuard& _rGuard ) throw (IOException, RuntimeException, std::exception)
+    const StoreType _eType, DocumentGuard& _rGuard )
 {
     OSL_PRECOND( ( _eType == SAVE ) || ( _eType == SAVE_AS ),
         "ODatabaseDocument::impl_storeAs_throw: you introduced a new type which cannot be handled here!" );
@@ -1159,7 +1159,7 @@ Reference< XStorage > ODatabaseDocument::impl_createStorageFor_throw( const OUSt
     return Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aParam ), UNO_QUERY_THROW );
 }
 
-void SAL_CALL ODatabaseDocument::storeAsURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::storeAsURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments )
 {
     // SYNCHRONIZED ->
     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
@@ -1248,7 +1248,7 @@ void ODatabaseDocument::impl_storeToStorage_throw( const Reference< XStorage >&
     }
 }
 
-void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (IOException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequence< PropertyValue >& _rArguments )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     ModifyLock aLock( *this );
@@ -1290,27 +1290,27 @@ void SAL_CALL ODatabaseDocument::storeToURL( const OUString& _rURL, const Sequen
 }
 
 // XModifyBroadcaster
-void SAL_CALL ODatabaseDocument::addModifyListener( const Reference< XModifyListener >& _xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addModifyListener( const Reference< XModifyListener >& _xListener )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     m_aModifyListeners.addInterface(_xListener);
 }
 
-void SAL_CALL ODatabaseDocument::removeModifyListener( const Reference< XModifyListener >& _xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeModifyListener( const Reference< XModifyListener >& _xListener )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     m_aModifyListeners.removeInterface(_xListener);
 }
 
 // XModifiable
-sal_Bool SAL_CALL ODatabaseDocument::isModified(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseDocument::isModified(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
     return m_pImpl->m_bModified;
 }
 
-void SAL_CALL ODatabaseDocument::setModified( sal_Bool _bModified ) throw (PropertyVetoException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::setModified( sal_Bool _bModified )
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
     if ( impl_isInitialized() )
@@ -1341,27 +1341,27 @@ void ODatabaseDocument::impl_setModified_nothrow( bool _bModified, DocumentGuard
 }
 
 // css::document::XEventBroadcaster
-void SAL_CALL ODatabaseDocument::addEventListener(const uno::Reference< document::XEventListener >& Listener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addEventListener(const uno::Reference< document::XEventListener >& Listener )
 {
     m_aEventNotifier.addLegacyEventListener( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::removeEventListener( const uno::Reference< document::XEventListener >& Listener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeEventListener( const uno::Reference< document::XEventListener >& Listener )
 {
     m_aEventNotifier.removeLegacyEventListener( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::addDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addDocumentEventListener( const Reference< XDocumentEventListener >& Listener )
 {
     m_aEventNotifier.addDocumentEventListener( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< XDocumentEventListener >& Listener )
 {
     m_aEventNotifier.removeDocumentEventListener( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& EventName, const Reference< XController2 >& ViewController, const Any& Supplement ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& EventName, const Reference< XController2 >& ViewController, const Any& Supplement )
 {
     if ( EventName.isEmpty() )
         throw IllegalArgumentException( OUString(), *this, 1 );
@@ -1380,18 +1380,18 @@ void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& EventName,
     m_aEventNotifier.notifyDocumentEvent( EventName, ViewController, Supplement );
 }
 
-Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getPrinter(  ) throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL ODatabaseDocument::getPrinter(  )
 {
     OSL_FAIL( "ODatabaseDocument::getPrinter: not supported!" );
     return Sequence< PropertyValue >();
 }
 
-void SAL_CALL ODatabaseDocument::setPrinter( const Sequence< PropertyValue >& /*aPrinter*/ ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::setPrinter( const Sequence< PropertyValue >& /*aPrinter*/ )
 {
     OSL_FAIL( "ODatabaseDocument::setPrinter: not supported!" );
 }
 
-void SAL_CALL ODatabaseDocument::print( const Sequence< PropertyValue >& /*xOptions*/ ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::print( const Sequence< PropertyValue >& /*xOptions*/ )
 {
     OSL_FAIL( "ODatabaseDocument::print: not supported!" );
 }
@@ -1497,7 +1497,6 @@ void ODatabaseDocument::impl_disposeControllerFrames_nothrow()
 }
 
 void SAL_CALL ODatabaseDocument::close(sal_Bool bDeliverOwnership)
-throw (CloseVetoException, RuntimeException, std::exception)
 {
     // nearly everything below can/must be done without our mutex locked, the below is just for
     // the checks for being disposed and the like
@@ -1540,25 +1539,25 @@ throw (CloseVetoException, RuntimeException, std::exception)
     // <- SYNCHRONIZED
 }
 
-void SAL_CALL ODatabaseDocument::addCloseListener( const Reference< css::util::XCloseListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addCloseListener( const Reference< css::util::XCloseListener >& Listener )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     m_aCloseListener.addInterface(Listener);
 }
 
-void SAL_CALL ODatabaseDocument::removeCloseListener( const Reference< css::util::XCloseListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeCloseListener( const Reference< css::util::XCloseListener >& Listener )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     m_aCloseListener.removeInterface(Listener);
 }
 
-Reference< XNameAccess > SAL_CALL ODatabaseDocument::getFormDocuments(  ) throw (RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL ODatabaseDocument::getFormDocuments(  )
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
     return impl_getDocumentContainer_throw( ODatabaseModelImpl::E_FORM );
 }
 
-Reference< XNameAccess > SAL_CALL ODatabaseDocument::getReportDocuments(  ) throw (RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL ODatabaseDocument::getReportDocuments(  )
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
     return impl_getDocumentContainer_throw( ODatabaseModelImpl::E_REPORT );
@@ -1722,12 +1721,12 @@ void ODatabaseDocument::impl_writeStorage_throw( const Reference< XStorage >& _r
     m_pImpl->storeLibraryContainersTo( _rxTargetStorage );
 }
 
-Reference< XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurationManager(  ) throw (RuntimeException, std::exception)
+Reference< XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurationManager(  )
 {
     return Reference< XUIConfigurationManager >( getUIConfigurationManager2(), UNO_QUERY_THROW );
 }
 
-Reference< XUIConfigurationManager2 > const & ODatabaseDocument::getUIConfigurationManager2(  ) throw (RuntimeException)
+Reference< XUIConfigurationManager2 > const & ODatabaseDocument::getUIConfigurationManager2(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
@@ -1762,7 +1761,7 @@ Reference< XUIConfigurationManager2 > const & ODatabaseDocument::getUIConfigurat
     return m_xUIConfigurationManager;
 }
 
-Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (RuntimeException, std::exception)
+Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
@@ -1770,7 +1769,7 @@ Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentSubStorage( const O
     return xStorageAccess->getDocumentSubStorage( aStorageName, nMode );
 }
 
-Sequence< OUString > SAL_CALL ODatabaseDocument::getDocumentSubStoragesNames(  ) throw (css::io::IOException, RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ODatabaseDocument::getDocumentSubStoragesNames(  )
 {
     Reference< XDocumentSubStorageSupplier > xStorageAccess( m_pImpl->getDocumentSubStorageSupplier() );
     return xStorageAccess->getDocumentSubStoragesNames();
@@ -1867,38 +1866,38 @@ void ODatabaseDocument::disposing()
 }
 
 // XComponent
-void SAL_CALL ODatabaseDocument::dispose(  ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::dispose(  )
 {
     ::cppu::WeakComponentImplHelperBase::dispose();
 }
 
-void SAL_CALL ODatabaseDocument::addEventListener( const Reference< lang::XEventListener >& _xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addEventListener( const Reference< lang::XEventListener >& _xListener )
 {
     ::cppu::WeakComponentImplHelperBase::addEventListener( _xListener );
 }
 
-void SAL_CALL ODatabaseDocument::removeEventListener( const Reference< lang::XEventListener >& _xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeEventListener( const Reference< lang::XEventListener >& _xListener )
 {
     ::cppu::WeakComponentImplHelperBase::removeEventListener( _xListener );
 }
 
 // XServiceInfo
-OUString ODatabaseDocument::getImplementationName() throw(RuntimeException, std::exception)
+OUString ODatabaseDocument::getImplementationName()
 {
     return OUString("com.sun.star.comp.dba.ODatabaseDocument");
 }
 
-Sequence< OUString > ODatabaseDocument::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > ODatabaseDocument::getSupportedServiceNames()
 {
     return { "com.sun.star.sdb.OfficeDatabaseDocument", "com.sun.star.document.OfficeDocument" };
 }
 
-sal_Bool ODatabaseDocument::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool ODatabaseDocument::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Reference< XDataSource > SAL_CALL ODatabaseDocument::getDataSource() throw (RuntimeException, std::exception)
+Reference< XDataSource > SAL_CALL ODatabaseDocument::getDataSource()
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit );
     return m_pImpl->getOrCreateDataSource();
@@ -1916,7 +1915,7 @@ comphelper::PropertyMapEntry const aEmbeddedImportInfoMap[] =
 };
 }
 
-void SAL_CALL ODatabaseDocument::loadFromStorage(const Reference<XStorage>& xStorage, const Sequence<PropertyValue>& rMediaDescriptor) throw (IllegalArgumentException, DoubleInitializationException, IOException, Exception, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::loadFromStorage(const Reference<XStorage>& xStorage, const Sequence<PropertyValue>& rMediaDescriptor)
 {
     DocumentGuard aGuard(*this, DocumentGuard::InitMethod);
 
@@ -1945,13 +1944,13 @@ void SAL_CALL ODatabaseDocument::loadFromStorage(const Reference<XStorage>& xSto
     impl_setModified_nothrow(false, aGuard);
 }
 
-void SAL_CALL ODatabaseDocument::storeToStorage( const Reference< XStorage >& _rxStorage, const Sequence< PropertyValue >& _rMediaDescriptor ) throw (IllegalArgumentException, IOException, Exception, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::storeToStorage( const Reference< XStorage >& _rxStorage, const Sequence< PropertyValue >& _rMediaDescriptor )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     impl_storeToStorage_throw( _rxStorage, _rMediaDescriptor, aGuard );
 }
 
-void SAL_CALL ODatabaseDocument::switchToStorage( const Reference< XStorage >& _rxNewRootStorage ) throw (IllegalArgumentException, IOException, Exception, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::switchToStorage( const Reference< XStorage >& _rxNewRootStorage )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
@@ -1961,49 +1960,49 @@ void SAL_CALL ODatabaseDocument::switchToStorage( const Reference< XStorage >& _
     impl_notifyStorageChange_nolck_nothrow( xNewRootStorage );
 }
 
-Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentStorage(  ) throw (IOException, Exception, RuntimeException, std::exception)
+Reference< XStorage > SAL_CALL ODatabaseDocument::getDocumentStorage(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     return m_pImpl->getOrCreateRootStorage();
 }
 
-void SAL_CALL ODatabaseDocument::addStorageChangeListener( const Reference< XStorageChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addStorageChangeListener( const Reference< XStorageChangeListener >& Listener )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     m_aStorageListeners.addInterface( Listener );
 }
 
-void SAL_CALL ODatabaseDocument::removeStorageChangeListener( const Reference< XStorageChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeStorageChangeListener( const Reference< XStorageChangeListener >& Listener )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     m_aStorageListeners.addInterface( Listener );
 }
 
-Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getBasicLibraries() throw (RuntimeException, std::exception)
+Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getBasicLibraries()
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
     return m_pImpl->getLibraryContainer( true );
 }
 
-Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getDialogLibraries() throw (RuntimeException, std::exception)
+Reference< XStorageBasedLibraryContainer > SAL_CALL ODatabaseDocument::getDialogLibraries()
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     return m_pImpl->getLibraryContainer( false );
 }
 
-sal_Bool SAL_CALL ODatabaseDocument::getAllowMacroExecution() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseDocument::getAllowMacroExecution()
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     return m_pImpl->adjustMacroMode_AutoReject();
 }
 
-Reference< XEmbeddedScripts > SAL_CALL ODatabaseDocument::getScriptContainer() throw (RuntimeException, std::exception)
+Reference< XEmbeddedScripts > SAL_CALL ODatabaseDocument::getScriptContainer()
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     return this;
 }
 
-Reference< provider::XScriptProvider > SAL_CALL ODatabaseDocument::getScriptProvider(  ) throw (RuntimeException, std::exception)
+Reference< provider::XScriptProvider > SAL_CALL ODatabaseDocument::getScriptProvider(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
 
@@ -2024,7 +2023,7 @@ Reference< provider::XScriptProvider > SAL_CALL ODatabaseDocument::getScriptProv
     return xScriptProvider;
 }
 
-Reference< XNameReplace > SAL_CALL ODatabaseDocument::getEvents(  ) throw (RuntimeException, std::exception)
+Reference< XNameReplace > SAL_CALL ODatabaseDocument::getEvents(  )
 {
     DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
     return m_pEventContainer;
@@ -2044,7 +2043,7 @@ struct CreateAny : public ::std::unary_function< Reference<XController>, Any>
 };
 
 // XModel2
-Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers(  ) throw (RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers(  )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     uno::Sequence< Any> aController( m_aControllers.size() );
@@ -2052,18 +2051,18 @@ Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers(  ) throw (
     return new ::comphelper::OAnyEnumeration(aController);
 }
 
-Sequence< OUString > SAL_CALL ODatabaseDocument::getAvailableViewControllerNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ODatabaseDocument::getAvailableViewControllerNames(  )
 {
     Sequence< OUString > aNames { SERVICE_SDB_APPLICATIONCONTROLLER };
     return aNames;
 }
 
-Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewController( const Reference< XFrame >& Frame ) throw (IllegalArgumentException, Exception, RuntimeException, std::exception)
+Reference< XController2 > SAL_CALL ODatabaseDocument::createDefaultViewController( const Reference< XFrame >& Frame )
 {
     return createViewController( "Default", Sequence< PropertyValue >(), Frame);
 }
 
-Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const OUString& ViewName, const Sequence< PropertyValue >& Arguments, const Reference< XFrame >& Frame ) throw (IllegalArgumentException, Exception, RuntimeException, std::exception)
+Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( const OUString& ViewName, const Sequence< PropertyValue >& Arguments, const Reference< XFrame >& Frame )
 {
     if ( ViewName != "Default" && ViewName != "Preview" )
         throw IllegalArgumentException( OUString(), *this, 1 );
@@ -2137,7 +2136,6 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel
 
 // css.frame.XTitle
 OUString SAL_CALL ODatabaseDocument::getTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     DocumentGuard aGuard( *this, DocumentGuard::MethodUsedDuringInit );
@@ -2146,7 +2144,6 @@ OUString SAL_CALL ODatabaseDocument::getTitle()
 
 // css.frame.XTitle
 void SAL_CALL ODatabaseDocument::setTitle( const OUString& sTitle )
-    throw (uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
@@ -2157,7 +2154,6 @@ void SAL_CALL ODatabaseDocument::setTitle( const OUString& sTitle )
 
 // css.frame.XTitleChangeBroadcaster
 void SAL_CALL ODatabaseDocument::addTitleChangeListener( const uno::Reference< frame::XTitleChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
@@ -2168,7 +2164,6 @@ void SAL_CALL ODatabaseDocument::addTitleChangeListener( const uno::Reference< f
 
 // css.frame.XTitleChangeBroadcaster
 void SAL_CALL ODatabaseDocument::removeTitleChangeListener( const uno::Reference< frame::XTitleChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
@@ -2179,8 +2174,6 @@ void SAL_CALL ODatabaseDocument::removeTitleChangeListener( const uno::Reference
 
 // css.frame.XUntitledNumbers
 ::sal_Int32 SAL_CALL ODatabaseDocument::leaseNumber( const uno::Reference< uno::XInterface >& xComponent )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception         )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     return impl_getUntitledHelper_throw(xComponent)->leaseNumber (xComponent);
@@ -2188,8 +2181,6 @@ void SAL_CALL ODatabaseDocument::removeTitleChangeListener( const uno::Reference
 
 // css.frame.XUntitledNumbers
 void SAL_CALL ODatabaseDocument::releaseNumber( ::sal_Int32 nNumber )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception         )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     impl_getUntitledHelper_throw()->releaseNumber (nNumber);
@@ -2197,15 +2188,13 @@ void SAL_CALL ODatabaseDocument::releaseNumber( ::sal_Int32 nNumber )
 
 // css.frame.XUntitledNumbers
 void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference< uno::XInterface >& xComponent )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception         )
 {
     DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
     impl_getUntitledHelper_throw(xComponent)->releaseNumberForComponent (xComponent);
 }
 
 // css.frame.XUntitledNumbers
-OUString SAL_CALL ODatabaseDocument::getUntitledPrefix()    throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseDocument::getUntitledPrefix()
 {
     return OUString();
 }
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 1fd7d3c60765..80bd42913c61 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -218,10 +218,7 @@ class ODatabaseDocument :public ModelDependentComponent             // ModelDepe
             const ::comphelper::NamedValueCollection& _rArguments,
             const StoreType _eType,
             DocumentGuard& _rGuard
-         )
-         throw (css::io::IOException,
-                css::uno::RuntimeException,
-                std::exception);
+         );
 
     /** notifies our storage change listeners that our underlying storage changed
 
@@ -293,138 +290,138 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XInterface
-    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
     virtual void SAL_CALL acquire(  ) throw () override;
     virtual void SAL_CALL release(  ) throw () override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XModel
-    virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual OUString SAL_CALL getURL(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL lockControllers(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL unlockControllers(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw (css::uno::RuntimeException, std::exception) override ;
+    virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override ;
+    virtual OUString SAL_CALL getURL(  ) override ;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) override ;
+    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& Controller ) override ;
+    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& Controller ) override ;
+    virtual void SAL_CALL lockControllers(  ) override ;
+    virtual void SAL_CALL unlockControllers(  ) override ;
+    virtual sal_Bool SAL_CALL hasControllersLocked(  ) override ;
+    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) override ;
+    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) override ;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) override ;
 
     // XModel2
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController( const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController( const OUString& ViewName, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers(  ) override ;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames(  ) override ;
+    virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController( const css::uno::Reference< css::frame::XFrame >& Frame ) override ;
+    virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController( const OUString& ViewName, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XFrame >& Frame ) override ;
 
     // XStorable
-    virtual sal_Bool SAL_CALL hasLocation(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual OUString SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL isReadonly(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL store(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL storeAsURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL storeToURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override ;
+    virtual sal_Bool SAL_CALL hasLocation(  ) override ;
+    virtual OUString SAL_CALL getLocation(  ) override ;
+    virtual sal_Bool SAL_CALL isReadonly(  ) override ;
+    virtual void SAL_CALL store(  ) override ;
+    virtual void SAL_CALL storeAsURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override ;
+    virtual void SAL_CALL storeToURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override ;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // css::util::XModifiable
-    virtual sal_Bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override ;
+    virtual sal_Bool SAL_CALL isModified(  ) override ;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override ;
 
     // XEventBroadcaster
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) override;
 
     // XDocumentEventBroadcaster
-    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) override;
+    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) override;
+    virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) override;
 
     // XPrintable
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter(  ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& aPrinter ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter(  ) override ;
+    virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& aPrinter ) override ;
+    virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override ;
 
     // XFormDocumentsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFormDocuments(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFormDocuments(  ) override;
 
     // XReportDocumentsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReportDocuments(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReportDocuments(  ) override;
 
     // XCloseable
-    virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close( sal_Bool DeliverOwnership ) override;
+    virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
+    virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
     // XUIConfigurationManagerSupplier
-    virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager(  ) override;
 
     // XDocumentSubStorageSupplier
-    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames(  ) override;
 
     // XOfficeDatabaseDocument
-    virtual css::uno::Reference< css::sdbc::XDataSource > SAL_CALL getDataSource() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XDataSource > SAL_CALL getDataSource() override;
 
     // XStorageBasedDocument
-    virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage(  ) throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) override;
+    virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) override;
+    virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
+    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage(  ) override;
+    virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
 
     // XEmbeddedScripts
-    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() override;
+    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() override;
+    virtual sal_Bool SAL_CALL getAllowMacroExecution() override;
 
     // XScriptInvocationContext
-    virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() override;
 
     // XScriptProviderSupplier
-    virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider(  ) override;
 
     // XEventsSupplier
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) override;
 
     // XLoadable
-    virtual void SAL_CALL initNew(  ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initNew(  ) override;
+    virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
 
     // css.document.XDocumentRecovery
-    virtual sal_Bool SAL_CALL wasModifiedSinceLastSave() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, css::lang::WrappedTargetException, std::exception ) override;
-    virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, css::lang::WrappedTargetException, std::exception ) override;
+    virtual sal_Bool SAL_CALL wasModifiedSinceLastSave() override;
+    virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) override;
+    virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) override;
 
     // XTitle
-    virtual OUString SAL_CALL getTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getTitle(  ) override;
+    virtual void SAL_CALL setTitle( const OUString& sTitle ) override;
 
     // XTitleChangeBroadcaster
-    virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
 
     // XUntitledNumbers
-    virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getUntitledPrefix(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) override;
+    virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) override;
+    virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) override;
+    virtual OUString SAL_CALL getUntitledPrefix(  ) override;
 
     /** clears the given object container
 
@@ -469,7 +466,7 @@ public:
 
 private:
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::ui::XUIConfigurationManager2 > const & getUIConfigurationManager2() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::ui::XUIConfigurationManager2 > const & getUIConfigurationManager2();
 
     /** returns whether the model is currently being initialized
     */
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 85f656b1a28f..2841f6b6b0a8 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -73,15 +73,15 @@ namespace dbaccess
         virtual ~DatabaseRegistrations() override;
 
     public:
-        virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getRegistrationNames() throw (RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& Name ) override;
+        virtual Sequence< OUString > SAL_CALL getRegistrationNames() override;
+        virtual OUString SAL_CALL getDatabaseLocation( const OUString& Name ) override;
+        virtual void SAL_CALL registerDatabaseLocation( const OUString& Name, const OUString& Location ) override;
+        virtual void SAL_CALL revokeDatabaseLocation( const OUString& Name ) override;
+        virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) override;
+        virtual sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& Name ) override;
+        virtual void SAL_CALL addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) override;
+        virtual void SAL_CALL removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) override;
 
     private:
         void
@@ -236,14 +236,14 @@ namespace dbaccess
             throw IllegalArgumentException( OUString(), *this, 2 );
     }
 
-    sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const OUString& Name )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         ::utl::OConfigurationNode aNodeForName = impl_getNodeForName_nothrow( Name );
         return aNodeForName.isValid();
     }
 
-    Sequence< OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_aConfigurationRoot.isValid() )
@@ -265,7 +265,7 @@ namespace dbaccess
         return aDisplayNames;
     }
 
-    OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+    OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const OUString& Name )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -278,7 +278,7 @@ namespace dbaccess
         return sLocation;
     }
 
-    void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const OUString& Name, const OUString& Location )
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -296,7 +296,7 @@ namespace dbaccess
         m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::registeredDatabaseLocation, aEvent );
     }
 
-    void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const OUString& Name )
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -321,7 +321,7 @@ namespace dbaccess
         m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::revokedDatabaseLocation, aEvent );
     }
 
-    void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation )
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -346,20 +346,20 @@ namespace dbaccess
         m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::changedDatabaseLocation, aEvent );
     }
 
-    sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const OUString& Name )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw_must_exist(Name);
         return aDataSourceRegistration.isReadonly();
     }
 
-    void SAL_CALL DatabaseRegistrations::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener )
     {
         if ( Listener.is() )
             m_aRegistrationListeners.addInterface( Listener );
     }
 
-    void SAL_CALL DatabaseRegistrations::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DatabaseRegistrations::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener )
     {
         if ( Listener.is() )
             m_aRegistrationListeners.removeInterface( Listener );
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 6d6771c2be88..76bf0882b269 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -123,9 +123,9 @@ protected:
 
 protected:
     // XFlushListener
-    virtual void SAL_CALL flushed( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL flushed( const css::lang::EventObject& rEvent ) 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;
 };
 
 FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener )
@@ -159,7 +159,7 @@ void SAL_CALL FlushNotificationAdapter::impl_dispose()
     m_aBroadcaster.clear();
 }
 
-void SAL_CALL FlushNotificationAdapter::flushed( const EventObject& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL FlushNotificationAdapter::flushed( const EventObject& rEvent )
 {
     Reference< XFlushListener > xListener( m_aListener );
     if ( xListener.is() )
@@ -168,7 +168,7 @@ void SAL_CALL FlushNotificationAdapter::flushed( const EventObject& rEvent ) thr
         impl_dispose();
 }
 
-void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source )
 {
     Reference< XFlushListener > xListener( m_aListener );
     if ( xListener.is() )
@@ -183,61 +183,61 @@ OAuthenticationContinuation::OAuthenticationContinuation()
 {
 }
 
-sal_Bool SAL_CALL OAuthenticationContinuation::canSetRealm(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OAuthenticationContinuation::canSetRealm(  )
 {
     return false;
 }
 
-void SAL_CALL OAuthenticationContinuation::setRealm( const OUString& /*Realm*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL OAuthenticationContinuation::setRealm( const OUString& /*Realm*/ )
 {
     SAL_WARN("dbaccess","OAuthenticationContinuation::setRealm: not supported!");
 }
 
-sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName(  )
 {
     // we always allow this, even if the database document is read-only. In this case,
     // it's simply that the user cannot store the new user name.
     return m_bCanSetUserName;
 }
 
-void SAL_CALL OAuthenticationContinuation::setUserName( const OUString& _rUser ) throw(RuntimeException, std::exception)
+void SAL_CALL OAuthenticationContinuation::setUserName( const OUString& _rUser )
 {
     m_sUser = _rUser;
 }
 
-sal_Bool SAL_CALL OAuthenticationContinuation::canSetPassword(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OAuthenticationContinuation::canSetPassword(  )
 {
     return true;
 }
 
-void SAL_CALL OAuthenticationContinuation::setPassword( const OUString& _rPassword ) throw(RuntimeException, std::exception)
+void SAL_CALL OAuthenticationContinuation::setPassword( const OUString& _rPassword )
 {
     m_sPassword = _rPassword;
 }
 
-Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberPasswordModes( RememberAuthentication& _reDefault ) throw(RuntimeException, std::exception)
+Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberPasswordModes( RememberAuthentication& _reDefault )
 {
     Sequence< RememberAuthentication > aReturn(1);
     _reDefault = aReturn[0] = RememberAuthentication_SESSION;
     return aReturn;
 }
 
-void SAL_CALL OAuthenticationContinuation::setRememberPassword( RememberAuthentication _eRemember ) throw(RuntimeException, std::exception)
+void SAL_CALL OAuthenticationContinuation::setRememberPassword( RememberAuthentication _eRemember )
 {
     m_bRemberPassword = (RememberAuthentication_NO != _eRemember);
 }
 
-sal_Bool SAL_CALL OAuthenticationContinuation::canSetAccount(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OAuthenticationContinuation::canSetAccount(  )
 {
     return false;
 }
 
-void SAL_CALL OAuthenticationContinuation::setAccount( const OUString& ) throw(RuntimeException, std::exception)
+void SAL_CALL OAuthenticationContinuation::setAccount( const OUString& )
 {
     SAL_WARN("dbaccess","OAuthenticationContinuation::setAccount: not supported!");
 }
 
-Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberAccountModes( RememberAuthentication& _reDefault ) throw(RuntimeException, std::exception)
+Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberAccountModes( RememberAuthentication& _reDefault )
 {
     Sequence < RememberAuthentication > aReturn(1);
     aReturn[0] = RememberAuthentication_NO;
@@ -245,7 +245,7 @@ Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getReme
     return aReturn;
 }
 
-void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentication /*Remember*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentication /*Remember*/ )
 {
     SAL_WARN("dbaccess","OAuthenticationContinuation::setRememberAccount: not supported!");
 }
@@ -300,7 +300,7 @@ protected:
 public:
     explicit OSharedConnectionManager(const Reference< XComponentContext >& _rxContext);
 
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(RuntimeException, std::exception) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
     Reference<XConnection> getConnection(   const OUString& url,
                                             const OUString& user,
                                             const OUString& password,
@@ -318,7 +318,7 @@ OSharedConnectionManager::~OSharedConnectionManager()
 {
 }
 
-void SAL_CALL OSharedConnectionManager::disposing( const css::lang::EventObject& Source ) throw(RuntimeException, std::exception)
+void SAL_CALL OSharedConnectionManager::disposing( const css::lang::EventObject& Source )
 {
     MutexGuard aGuard(m_aMutex);
     Reference<XConnection> xConnection(Source.Source,UNO_QUERY);
@@ -499,7 +499,7 @@ void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocume
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > ODatabaseSource::getTypes()
 {
     OTypeCollection aPropertyHelperTypes(   cppu::UnoType<XFastPropertySet>::get(),
                                             cppu::UnoType<XPropertySet>::get(),
@@ -511,13 +511,13 @@ Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException, std::excep
     );
 }
 
-Sequence< sal_Int8 > ODatabaseSource::getImplementationId() throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > ODatabaseSource::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // css::uno::XInterface
-Any ODatabaseSource::queryInterface( const Type & rType ) throw (RuntimeException, std::exception)
+Any ODatabaseSource::queryInterface( const Type & rType )
 {
     Any aIface = ODatabaseSource_Base::queryInterface( rType );
     if ( !aIface.hasValue() )
@@ -535,24 +535,24 @@ void ODatabaseSource::release() throw ()
     ODatabaseSource_Base::release();
 }
 
-void SAL_CALL ODatabaseSource::disposing( const css::lang::EventObject& Source ) throw(RuntimeException, std::exception)
+void SAL_CALL ODatabaseSource::disposing( const css::lang::EventObject& Source )
 {
     if ( m_pImpl.is() )
         m_pImpl->disposing(Source);
 }
 
 // XServiceInfo
-OUString ODatabaseSource::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString ODatabaseSource::getImplementationName(  )
 {
     return OUString("com.sun.star.comp.dba.ODatabaseSource");
 }
 
-Sequence< OUString > ODatabaseSource::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > ODatabaseSource::getSupportedServiceNames(  )
 {
     return { SERVICE_SDB_DATASOURCE, "com.sun.star.sdb.DocumentDataSource" };
 }
 
-sal_Bool ODatabaseSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool ODatabaseSource::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -690,7 +690,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString
 }
 
 // OPropertySetHelper
-Reference< XPropertySetInfo >  ODatabaseSource::getPropertySetInfo() throw (RuntimeException, std::exception)
+Reference< XPropertySetInfo >  ODatabaseSource::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() ) ;
 }
@@ -721,7 +721,7 @@ Reference< XPropertySetInfo >  ODatabaseSource::getPropertySetInfo() throw (Runt
     return *getArrayHelper();
 }
 
-sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException, RuntimeException, std::exception )
+sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
 {
     bool bModified(false);
     if ( m_pImpl.is() )
@@ -864,7 +864,7 @@ namespace
     }
 }
 
-void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     if ( m_pImpl.is() )
     {
@@ -995,40 +995,40 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con
 }
 
 // XDataSource
-void ODatabaseSource::setLoginTimeout(sal_Int32 seconds) throw( SQLException, RuntimeException, std::exception )
+void ODatabaseSource::setLoginTimeout(sal_Int32 seconds)
 {
     ModelMethodGuard aGuard( *this );
     m_pImpl->m_nLoginTimeout = seconds;
 }
 
-sal_Int32 ODatabaseSource::getLoginTimeout() throw( SQLException, RuntimeException, std::exception )
+sal_Int32 ODatabaseSource::getLoginTimeout()
 {
     ModelMethodGuard aGuard( *this );
     return m_pImpl->m_nLoginTimeout;
 }
 
 // XCompletedConnection
-Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler )
 {
     return connectWithCompletion(_rxHandler,false);
 }
 
-Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password) throw( SQLException, RuntimeException, std::exception )
+Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password)
 {
     return getConnection(user,password,false);
 }
 
-Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnection( const OUString& user, const OUString& password ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnection( const OUString& user, const OUString& password )
 {
     return getConnection(user,password,true);
 }
 
-Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnectionWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnectionWithCompletion( const Reference< XInteractionHandler >& _rxHandler )
 {
     return connectWithCompletion(_rxHandler,true);
 }
 
-Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,bool _bIsolated ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,bool _bIsolated )
 {
     ModelMethodGuard aGuard( *this );
 
@@ -1128,7 +1128,7 @@ Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const OUString
     return xConn;
 }
 
-Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password,bool _bIsolated) throw( SQLException, RuntimeException, std::exception )
+Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password,bool _bIsolated)
 {
     ModelMethodGuard aGuard( *this );
 
@@ -1159,13 +1159,13 @@ Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, co
     return xConn;
 }
 
-Reference< XNameAccess > SAL_CALL ODatabaseSource::getBookmarks(  ) throw (RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL ODatabaseSource::getBookmarks(  )
 {
     ModelMethodGuard aGuard( *this );
     return static_cast< XNameContainer* >(m_xBookmarks.get());
 }
 
-Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(RuntimeException, std::exception)
+Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( )
 {
     ModelMethodGuard aGuard( *this );
 
@@ -1196,7 +1196,7 @@ Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(
 }
 
 // XTablesSupplier
-Reference< XNameAccess >  ODatabaseSource::getTables() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  ODatabaseSource::getTables()
 {
     ModelMethodGuard aGuard( *this );
 
@@ -1210,7 +1210,7 @@ Reference< XNameAccess >  ODatabaseSource::getTables() throw( RuntimeException,
     return xContainer;
 }
 
-void SAL_CALL ODatabaseSource::flush(  ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseSource::flush(  )
 {
     try
     {
@@ -1238,7 +1238,7 @@ void SAL_CALL ODatabaseSource::flush(  ) throw (RuntimeException, std::exception
     }
 }
 
-void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ )
 {
     ModelMethodGuard aGuard( *this );
 
@@ -1270,31 +1270,31 @@ void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (R
     m_pImpl->setModified( bWasModified );
 }
 
-void SAL_CALL ODatabaseSource::addFlushListener( const Reference< css::util::XFlushListener >& _xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseSource::addFlushListener( const Reference< css::util::XFlushListener >& _xListener )
 {
     m_aFlushListeners.addInterface(_xListener);
 }
 
-void SAL_CALL ODatabaseSource::removeFlushListener( const Reference< css::util::XFlushListener >& _xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseSource::removeFlushListener( const Reference< css::util::XFlushListener >& _xListener )
 {
     m_aFlushListeners.removeInterface(_xListener);
 }
 
-void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/ )
 {
     ModelMethodGuard aGuard( *this );
     if ( m_pImpl.is() )
         m_pImpl->setModified(true);
 }
 
-void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ )
 {
     ModelMethodGuard aGuard( *this );
     if ( m_pImpl.is() )
         m_pImpl->setModified(true);
 }
 
-void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ )
 {
     ModelMethodGuard aGuard( *this );
     if ( m_pImpl.is() )
@@ -1302,7 +1302,7 @@ void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/
 }
 
 // XDocumentDataSource
-Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocument() throw (RuntimeException, std::exception)
+Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocument()
 {
     ModelMethodGuard aGuard( *this );
 
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index 1ea921cfaa0f..8fa26c50cce1 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -109,33 +109,33 @@ public:
         );
 
     // XContainerListener
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
     // css::sdbcx::XTablesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) override;
 
 // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 // css::uno::XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw( ) override;
     virtual void SAL_CALL release() throw( ) override;
 
 // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 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;
 
 // comphelper::OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
@@ -147,43 +147,41 @@ public:
                             css::uno::Any & rConvertedValue,
                             css::uno::Any & rOldValue,
                             sal_Int32 nHandle,
-                            const css::uno::Any& rValue )
-                                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                            const css::uno::Any& rValue ) override;
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const css::uno::Any& rValue
-                                                 )
-                                                 throw (css::uno::Exception, std::exception) override;
+                                                 ) override;
     virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
 // css::sdb::XCompletedConnection
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) override;
 
 // css::sdbc::XDataSource
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getLoginTimeout(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password ) override;
+    virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) override;
+    virtual sal_Int32 SAL_CALL getLoginTimeout(  ) override;
 
 //::css::sdb::XBookmarksSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks(  ) override;
 
 //::css::sdb::XQueryDefinitionsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getQueryDefinitions(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getQueryDefinitions(  ) override;
 
 // css::sdbc::XIsolatedConnection
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getIsolatedConnection( const OUString& user, const OUString& password ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getIsolatedConnectionWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getIsolatedConnection( const OUString& user, const OUString& password ) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getIsolatedConnectionWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) override;
 
 // XFlushable
-    virtual void SAL_CALL flush(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL flush(  ) override;
+    virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override;
+    virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override;
 
     // XFlushListener
-    virtual void SAL_CALL flushed( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL flushed( const css::lang::EventObject& rEvent ) override;
 
     // XDocumentDataSource
-    virtual css::uno::Reference< css::sdb::XOfficeDatabaseDocument > SAL_CALL getDatabaseDocument() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdb::XOfficeDatabaseDocument > SAL_CALL getDatabaseDocument() override;
 
 protected:
     // ModelDependentComponent overridables
@@ -204,10 +202,10 @@ private:
 
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , bool _bIsolated) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+    css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , bool _bIsolated);
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+    css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated);
 
 protected:
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 6ad51b775129..69d3e3b82b97 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -147,18 +147,17 @@ IMPLEMENT_FORWARD_XINTERFACE2( ODefinitionContainer,OContentHelper,ODefinitionCo
 IMPLEMENT_GETTYPES2(ODefinitionContainer,OContentHelper,ODefinitionContainer_Base);
 
 css::uno::Sequence<sal_Int8> ODefinitionContainer::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo
-OUString SAL_CALL ODefinitionContainer::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL ODefinitionContainer::getImplementationName(  )
 {
     return OUString("com.sun.star.sdb.ODefinitionContainer");
 }
 
-Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames(  )
 {
     Sequence< OUString > aReturn(2);
     aReturn.getArray()[0] = "com.sun.star.sdb.DefinitionContainer";
@@ -167,7 +166,7 @@ Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames(  )
 }
 
 // XNameContainer
-void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const Any& aElement )
 {
     ResettableMutexGuard aGuard(m_aMutex);
 
@@ -180,7 +179,7 @@ void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const
     notifyByName( aGuard, _rName, xNewElement, nullptr, E_INSERTED, ContainerListemers );
 }
 
-void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName )
 {
     ResettableMutexGuard aGuard(m_aMutex);
 
@@ -204,7 +203,7 @@ void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) throw
 }
 
 // XNameReplace
-void SAL_CALL ODefinitionContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::replaceByName( const OUString& _rName, const Any& aElement )
 {
     ResettableMutexGuard aGuard(m_aMutex);
 
@@ -325,57 +324,57 @@ void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const OU
         _rGuard.reset();
 }
 
-void SAL_CALL ODefinitionContainer::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::addContainerListener( const Reference< XContainerListener >& _rxListener )
 {
     if (_rxListener.is())
         m_aContainerListeners.addInterface(_rxListener);
 }
 
-void SAL_CALL ODefinitionContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::removeContainerListener( const Reference< XContainerListener >& _rxListener )
 {
     if (_rxListener.is())
         m_aContainerListeners.removeInterface(_rxListener);
 }
 
-void SAL_CALL ODefinitionContainer::addContainerApproveListener( const Reference< XContainerApproveListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::addContainerApproveListener( const Reference< XContainerApproveListener >& Listener )
 {
     if ( Listener.is() )
         m_aApproveListeners.addInterface( Listener );
 }
 
-void SAL_CALL ODefinitionContainer::removeContainerApproveListener( const Reference< XContainerApproveListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::removeContainerApproveListener( const Reference< XContainerApproveListener >& Listener )
 {
     if ( Listener.is() )
         m_aApproveListeners.removeInterface( Listener );
 }
 
 // XElementAccess
-Type SAL_CALL ODefinitionContainer::getElementType( ) throw (RuntimeException, std::exception)
+Type SAL_CALL ODefinitionContainer::getElementType( )
 {
     return cppu::UnoType<XContent>::get();
 }
 
-sal_Bool SAL_CALL ODefinitionContainer::hasElements( ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ODefinitionContainer::hasElements( )
 {
     MutexGuard aGuard(m_aMutex);
     return !m_aDocuments.empty();
 }
 
 // XEnumerationAccess
-Reference< XEnumeration > SAL_CALL ODefinitionContainer::createEnumeration(  ) throw(RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL ODefinitionContainer::createEnumeration(  )
 {
     MutexGuard aGuard(m_aMutex);
     return new ::comphelper::OEnumerationByIndex(static_cast<XIndexAccess*>(this));
 }
 
 // XIndexAccess
-sal_Int32 SAL_CALL ODefinitionContainer::getCount(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODefinitionContainer::getCount(  )
 {
     MutexGuard aGuard(m_aMutex);
     return m_aDocuments.size();
 }
 
-Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -395,14 +394,14 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu
     return makeAny(xProp);
 }
 
-Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName )
 {
     MutexGuard aGuard(m_aMutex);
 
     return makeAny( implGetByName( _rName, true ) );
 }
 
-Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, bool _bReadIfNecessary) throw (NoSuchElementException)
+Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, bool _bReadIfNecessary)
 {
     Documents::iterator aMapPos = m_aDocumentMap.find(_rName);
     if (aMapPos == m_aDocumentMap.end())
@@ -423,7 +422,7 @@ Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName
     return xProp;
 }
 
-Sequence< OUString > SAL_CALL ODefinitionContainer::getElementNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ODefinitionContainer::getElementNames(  )
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -441,14 +440,14 @@ Sequence< OUString > SAL_CALL ODefinitionContainer::getElementNames(  ) throw(Ru
     return aNames;
 }
 
-sal_Bool SAL_CALL ODefinitionContainer::hasByName( const OUString& _rName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ODefinitionContainer::hasByName( const OUString& _rName )
 {
     MutexGuard aGuard(m_aMutex);
 
     return checkExistence(_rName);
 }
 
-void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) throw(RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource )
 {
     MutexGuard aGuard(m_aMutex);
     Reference< XContent > xSource(_rSource.Source, UNO_QUERY);
@@ -617,7 +616,7 @@ void ODefinitionContainer::approveNewObject(const OUString& _sName,const Referen
 }
 
 // XPropertyChangeListener
-void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt )
 {
     ClearableMutexGuard aGuard(m_aMutex);
     if( evt.PropertyName == PROPERTY_NAME || evt.PropertyName ==  "Title" )
@@ -643,7 +642,7 @@ void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& e
 }
 
 // XVetoableChangeListener
-void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& aEvent ) throw (PropertyVetoException, RuntimeException, std::exception)
+void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& aEvent )
 {
     MutexGuard aGuard(m_aMutex);
 
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 07f4d7458e5e..c7ddcb6686ac 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -113,7 +113,6 @@ ODocumentContainer::~ODocumentContainer()
 IMPLEMENT_FORWARD_XINTERFACE3( ODocumentContainer,ODefinitionContainer,ODocumentContainer_Base,OPropertyStateContainer)
 
 css::uno::Sequence<sal_Int8> ODocumentContainer::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -123,7 +122,7 @@ IMPLEMENT_SERVICE_INFO_IMPLNAME(ODocumentContainer, "com.sun.star.comp.dba.ODocu
 IMPLEMENT_SERVICE_INFO_SUPPORTS(ODocumentContainer);
 IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(ODocumentContainer)
 
-Sequence< OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSupported(1);
     aSupported[0] = m_bFormsContainer ? OUString(SERVICE_NAME_FORM_COLLECTION) : OUString(SERVICE_NAME_REPORT_COLLECTION);
@@ -145,7 +144,7 @@ Reference< XContent > ODocumentContainer::createObject( const OUString& _rName)
     return new ODocumentDefinition( *this, m_aContext, aFind->second, m_bFormsContainer );
 }
 
-Reference< XInterface > SAL_CALL ODocumentContainer::createInstance( const OUString& aServiceSpecifier ) throw (Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ODocumentContainer::createInstance( const OUString& aServiceSpecifier )
 {
     return createInstanceWithArguments( aServiceSpecifier, Sequence< Any >() );
 }
@@ -163,7 +162,7 @@ namespace
     }
 }
 
-Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& _aArguments )
 {
     Reference< XInterface > xRet;
     Reference< XContent > xContent;
@@ -383,7 +382,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
     return xRet;
 }
 
-Sequence< OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames(  )
 {
     Sequence< OUString > aSe(3);
     aSe[0] = SERVICE_SDB_DOCUMENTDEFINITION;
@@ -392,7 +391,7 @@ Sequence< OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames(  ) t
     return aSe;
 }
 
-Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException, std::exception)
+Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment )
 {
     Any aRet;
     if ( aCommand.Name == "open" )
@@ -506,7 +505,7 @@ namespace
 Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const OUString& _sURL
                                                                        , const OUString& /*TargetFrameName*/
                                                                        , sal_Int32 /*SearchFlags*/
-                                                                       , const Sequence< PropertyValue >& Arguments ) throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
+                                                                       , const Sequence< PropertyValue >& Arguments )
 {
     ::SolarMutexGuard aSolarGuard;
 
@@ -552,7 +551,7 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const
     return xComp;
 }
 
-Any SAL_CALL ODocumentContainer::getByHierarchicalName( const OUString& _sName ) throw (NoSuchElementException, RuntimeException, std::exception)
+Any SAL_CALL ODocumentContainer::getByHierarchicalName( const OUString& _sName )
 {
     MutexGuard aGuard(m_aMutex);
     Any aContent;
@@ -563,7 +562,7 @@ Any SAL_CALL ODocumentContainer::getByHierarchicalName( const OUString& _sName )
     throw NoSuchElementException(_sName,*this);
 }
 
-sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const OUString& _sName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const OUString& _sName )
 {
     MutexGuard aGuard(m_aMutex);
     Any aContent;
@@ -573,7 +572,7 @@ sal_Bool SAL_CALL ODocumentContainer::hasByHierarchicalName( const OUString& _sN
 }
 
 // XHierarchicalNameContainer
-void SAL_CALL ODocumentContainer::insertByHierarchicalName( const OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ODocumentContainer::insertByHierarchicalName( const OUString& _sName, const Any& _aElement )
 {
     Reference< XContent > xContent(_aElement,UNO_QUERY);
     if ( !xContent.is() )
@@ -598,7 +597,7 @@ void SAL_CALL ODocumentContainer::insertByHierarchicalName( const OUString& _sNa
     xNameContainer->insertByName(sName,_aElement);
 }
 
-void SAL_CALL ODocumentContainer::removeByHierarchicalName( const OUString& _sName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ODocumentContainer::removeByHierarchicalName( const OUString& _sName )
 {
     if ( _sName.isEmpty() )
         throw NoSuchElementException(_sName,*this);
@@ -614,7 +613,7 @@ void SAL_CALL ODocumentContainer::removeByHierarchicalName( const OUString& _sNa
 }
 
 // XHierarchicalNameReplace
-void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const OUString& _sName, const Any& _aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const OUString& _sName, const Any& _aElement )
 {
     Reference< XContent > xContent(_aElement,UNO_QUERY);
     if ( !xContent.is() )
@@ -630,13 +629,13 @@ void SAL_CALL ODocumentContainer::replaceByHierarchicalName( const OUString& _sN
     xNameContainer->replaceByName(sName,_aElement);
 }
 
-OUString SAL_CALL ODocumentContainer::getHierarchicalName() throw (RuntimeException, std::exception)
+OUString SAL_CALL ODocumentContainer::getHierarchicalName()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return impl_getHierarchicalName( false );
 }
 
-OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception)
+OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i_rRelativeName )
 {
     OUString aBuffer = getHierarchicalName() + "/" + i_rRelativeName;
     return aBuffer;
@@ -662,7 +661,7 @@ void ODocumentContainer::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any
     _rDefault.clear();
 }
 
-void SAL_CALL ODocumentContainer::commit(  ) throw (css::io::IOException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL ODocumentContainer::commit(  )
 {
     MutexGuard aGuard(m_aMutex);
     Documents::const_iterator aIter = m_aDocumentMap.begin();
@@ -678,7 +677,7 @@ void SAL_CALL ODocumentContainer::commit(  ) throw (css::io::IOException, css::l
         xTrans->commit();
 }
 
-void SAL_CALL ODocumentContainer::revert(  ) throw (css::io::IOException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL ODocumentContainer::revert(  )
 {
     MutexGuard aGuard(m_aMutex);
     Documents::const_iterator aIter = m_aDocumentMap.begin();
@@ -701,7 +700,7 @@ Reference< XStorage> ODocumentContainer::getContainerStorage() const
         :   Reference< XStorage>();
 }
 
-void SAL_CALL ODocumentContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ODocumentContainer::removeByName( const OUString& _rName )
 {
     ResettableMutexGuard aGuard(m_aMutex);
 
@@ -727,7 +726,7 @@ void SAL_CALL ODocumentContainer::removeByName( const OUString& _rName ) throw(N
     notifyByName( aGuard, _rName, nullptr, nullptr, E_REMOVED, ContainerListemers );
 }
 
-void SAL_CALL ODocumentContainer::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL ODocumentContainer::rename( const OUString& newName )
 {
     try
     {
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx
index 27edbf3f9fa9..f1b5483d5fd3 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx
@@ -60,52 +60,50 @@ public:
     // css::uno::XInterface
     DECLARE_XINTERFACE( )
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
     // css::lang::XServiceInfo
     DECLARE_SERVICE_INFO();
 
     // XComponentLoader
-    virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL( const OUString& URL, const OUString& TargetFrameName, sal_Int32 SearchFlags, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL( const OUString& URL, const OUString& TargetFrameName, sal_Int32 SearchFlags, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
     // css::lang::XMultiServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
 
     // XCommandProcessor
-    virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) throw (css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override ;
 
     // XHierarchicalNameAccess
-    virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& _sName ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& _sName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& _sName ) override;
+    virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& _sName ) override;
 
     // XHierarchicalNameContainer
-    virtual void SAL_CALL insertByHierarchicalName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByHierarchicalName( const OUString& Name ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByHierarchicalName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByHierarchicalName( const OUString& Name ) override;
 
     // XHierarchicalName
-    virtual OUString SAL_CALL getHierarchicalName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getHierarchicalName(  ) override;
+    virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) override;
 
     // XNameContainer
-    virtual void SAL_CALL removeByName( const OUString& _rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeByName( const OUString& _rName ) override;
 
     // XHierarchicalNameReplace
-    virtual void SAL_CALL replaceByHierarchicalName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByHierarchicalName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // XTransactedObject
-    virtual void SAL_CALL commit(  ) throw (css::io::IOException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL revert(  ) throw (css::io::IOException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL commit(  ) override;
+    virtual void SAL_CALL revert(  ) override;
 
     // XRename
-    virtual void SAL_CALL rename( const OUString& newName ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rename( const OUString& newName ) override;
 
     // OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index a0cdc67e12bd..8818e685be2c 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -182,9 +182,9 @@ namespace dbaccess
             osl_atomic_decrement( &m_refCount );
         }
 
-        virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+        virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+        virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
     };
 
     void SAL_CALL OEmbedObjectHolder::disposing()
@@ -195,11 +195,11 @@ namespace dbaccess
         m_pDefinition = nullptr;
     }
 
-    void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (embed::WrongStateException, uno::RuntimeException, std::exception)
+    void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ )
     {
     }
 
-    void SAL_CALL OEmbedObjectHolder::stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL OEmbedObjectHolder::stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState )
     {
         if ( !m_bInStateChange && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition )
         {
@@ -214,7 +214,7 @@ namespace dbaccess
         }
     }
 
-    void SAL_CALL OEmbedObjectHolder::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL OEmbedObjectHolder::disposing( const lang::EventObject& /*Source*/ )
     {
         m_xBroadCaster = nullptr;
     }
@@ -228,17 +228,17 @@ namespace dbaccess
     public:
         explicit OEmbeddedClientHelper(ODocumentDefinition* _pClient) :m_pClient(_pClient) {}
 
-        virtual void SAL_CALL saveObject(  ) throw (ObjectSaveVetoException, Exception, RuntimeException, std::exception) override
+        virtual void SAL_CALL saveObject(  ) override
         {
         }
         // XComponentSupplier
-        virtual Reference< util::XCloseable > SAL_CALL getComponent(  ) throw (RuntimeException, std::exception) override
+        virtual Reference< util::XCloseable > SAL_CALL getComponent(  ) override
         {
             return Reference< css::util::XCloseable >();
         }
 
         // XEmbeddedClient
-        virtual void SAL_CALL visibilityChanged( sal_Bool /*bVisible*/ ) throw (WrongStateException, RuntimeException, std::exception) override
+        virtual void SAL_CALL visibilityChanged( sal_Bool /*bVisible*/ ) override
         {
         }
         inline void resetClient() { m_pClient = nullptr; }
@@ -314,11 +314,11 @@ namespace dbaccess
             OSL_ENSURE( m_refCount, "LifetimeCoupler::LifetimeCoupler: the actor is not holding us by hard ref - this won't work!" );
         }
 
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
     protected:
     };
 
-    void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL LifetimeCoupler::disposing( const css::lang::EventObject& /*Source*/ )
     {
         m_xClient.clear();
     }
@@ -336,10 +336,10 @@ namespace dbaccess
         const OUString&       getName() const { return m_sName; }
 
         // XInteractionDocumentSave
-        virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) override;
     };
 
-    void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException, std::exception)
+    void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent)
     {
         m_sName = _sName;
         m_xParentContainer = _xParent;
@@ -478,7 +478,6 @@ void SAL_CALL ODocumentDefinition::disposing()
 }
 
 css::uno::Sequence<sal_Int8> ODocumentDefinition::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -520,7 +519,7 @@ void SAL_CALL ODocumentDefinition::getFastPropertyValue( Any& o_rValue, sal_Int3
     OPropertyStateContainer::getFastPropertyValue( o_rValue, i_nHandle );
 }
 
-Reference< XPropertySetInfo > SAL_CALL ODocumentDefinition::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL ODocumentDefinition::getPropertySetInfo(  )
 {
     Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -954,7 +953,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons
     return makeAny( xModel );
 }
 
-Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException, std::exception)
+Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment )
 {
     Any aRet;
 
@@ -1152,7 +1151,6 @@ namespace
 }
 
 void ODocumentDefinition::onCommandInsert( const OUString& _sURL, const Reference< XCommandEnvironment >& Environment )
-    throw( Exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1789,7 +1787,7 @@ Reference< util::XCloseable > ODocumentDefinition::impl_getComponent_throw( cons
     return xComp;
 }
 
-Reference< util::XCloseable > ODocumentDefinition::getComponent() throw (RuntimeException, std::exception)
+Reference< util::XCloseable > ODocumentDefinition::getComponent()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return impl_getComponent_throw();
@@ -1867,17 +1865,17 @@ bool ODocumentDefinition::impl_close_throw()
     return bSuccess;
 }
 
-Reference< XComponent > SAL_CALL ODocumentDefinition::open(  ) throw (WrappedTargetException, RuntimeException, std::exception)
+Reference< XComponent > SAL_CALL ODocumentDefinition::open(  )
 {
     return impl_openUI_nolck_throw( false );
 }
 
-Reference< XComponent > SAL_CALL ODocumentDefinition::openDesign(  ) throw (WrappedTargetException, RuntimeException, std::exception)
+Reference< XComponent > SAL_CALL ODocumentDefinition::openDesign(  )
 {
     return impl_openUI_nolck_throw( true );
 }
 
-void SAL_CALL ODocumentDefinition::store(  ) throw (WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ODocumentDefinition::store(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     try
@@ -1892,7 +1890,7 @@ void SAL_CALL ODocumentDefinition::store(  ) throw (WrappedTargetException, Runt
     }
 }
 
-sal_Bool SAL_CALL ODocumentDefinition::close(  ) throw (WrappedTargetException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODocumentDefinition::close(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1910,13 +1908,13 @@ sal_Bool SAL_CALL ODocumentDefinition::close(  ) throw (WrappedTargetException,
     return bSuccess;
 }
 
-OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException, std::exception)
+OUString SAL_CALL ODocumentDefinition::getHierarchicalName()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return impl_getHierarchicalName( false );
 }
 
-OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception)
+OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& i_rRelativeName )
 {
     OUStringBuffer aBuffer;
     aBuffer.append( getHierarchicalName() );
@@ -1925,7 +1923,7 @@ OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString&
     return aBuffer.makeStringAndClear();
 }
 
-void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName )
 {
     try
     {
@@ -2077,7 +2075,7 @@ void ODocumentDefinition::updateDocumentTitle()
         xTitle->setTitle(sName);
 }
 
-void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership )
 {
     (void) Source;
     (void) GetsOwnership;
@@ -2092,11 +2090,11 @@ void SAL_CALL ODocumentDefinition::queryClosing( const lang::EventObject& Source
     }
 }
 
-void SAL_CALL ODocumentDefinition::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ODocumentDefinition::notifyClosing( const lang::EventObject& /*Source*/ )
 {
 }
 
-void SAL_CALL ODocumentDefinition::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ODocumentDefinition::disposing( const lang::EventObject& /*Source*/ )
 {
 }
 
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index bef6c99c9485..8b8125535994 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -89,16 +89,14 @@ public:
                 const css::uno::Reference< css::sdbc::XConnection >& i_rConnection
             );
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
 // css::uno::XInterface
     DECLARE_XINTERFACE( )
 
 // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // OPropertySetHelper
     virtual void SAL_CALL getFastPropertyValue(
@@ -107,33 +105,33 @@ public:
                             ) const override;
 
     // XComponentSupplier
-    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent(  ) override;
 
     // XSubDocument
-    virtual css::uno::Reference< css::lang::XComponent > SAL_CALL open(  ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::lang::XComponent > SAL_CALL openDesign(  ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL store(  ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL close(  ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::lang::XComponent > SAL_CALL open(  ) override;
+    virtual css::uno::Reference< css::lang::XComponent > SAL_CALL openDesign(  ) override;
+    virtual void SAL_CALL store(  ) override;
+    virtual sal_Bool SAL_CALL close(  ) override;
 
     // XHierarchicalName
-    virtual OUString SAL_CALL getHierarchicalName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getHierarchicalName(  ) override;
+    virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) override;
 
 // OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // XCommandProcessor
-    virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) throw (css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override ;
 
     // XRename
-    virtual void SAL_CALL rename( const OUString& newName ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rename( const OUString& newName ) override;
 
     // XCloseListener
-    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) 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;
 
     /** returns the forms/reports container storage, depending on m_bForm. Our own storage
         inside this container storage is the one with the name as indicated by m_pImpl->m_aProps.sPersistentName.
@@ -320,7 +318,7 @@ private:
 
     void onCommandGetDocumentProperties( css::uno::Any& _rProps );
     /// @throws css::uno::Exception
-    void onCommandInsert( const OUString& _sURL, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) throw( css::uno::Exception );
+    void onCommandInsert( const OUString& _sURL, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
     void onCommandPreview( css::uno::Any& _rImage );
     css::uno::Any
         onCommandOpenSomething(
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index f9de2d7d4bca..30026d4b325b 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -138,7 +138,7 @@ namespace dbaccess
     {
     }
 
-    void SAL_CALL DocumentEventExecutor::documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentEventExecutor::documentEventOccured( const DocumentEvent& Event )
     {
         Reference< XEventsSupplier > xEventsSupplier( m_pData->xDocument.get(), UNO_QUERY );
         if ( !xEventsSupplier.is() )
@@ -190,7 +190,7 @@ namespace dbaccess
         }
     }
 
-    void SAL_CALL DocumentEventExecutor::disposing( const lang::EventObject& /*_Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentEventExecutor::disposing( const lang::EventObject& /*_Source*/ )
     {
         // not interested in
     }
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index ee3574ec023f..f60be3bd7aba 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -49,9 +49,9 @@ namespace dbaccess
         virtual ~DocumentEventExecutor() override;
 
         // css.document.XDocumentEventListener
-        virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) override;
         // css.lang.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;
 
     private:
         ::std::unique_ptr< DocumentEventExecutor_Data >   m_pData;
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 998d75426ec6..856a36396d9d 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -143,7 +143,7 @@ namespace dbaccess
         return false;
     }
 
-    void SAL_CALL DocumentEvents::replaceByName( const OUString& Name, const Any& Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL DocumentEvents::replaceByName( const OUString& Name, const Any& Element )
     {
         ::osl::MutexGuard aGuard( m_pData->rMutex );
 
@@ -176,7 +176,7 @@ namespace dbaccess
         elementPos->second = aEventDescriptor;
     }
 
-    Any SAL_CALL DocumentEvents::getByName( const OUString& Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL DocumentEvents::getByName( const OUString& Name )
     {
         ::osl::MutexGuard aGuard( m_pData->rMutex );
 
@@ -191,26 +191,26 @@ namespace dbaccess
         return aReturn;
     }
 
-    Sequence< OUString > SAL_CALL DocumentEvents::getElementNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DocumentEvents::getElementNames(  )
     {
         ::osl::MutexGuard aGuard( m_pData->rMutex );
 
         return comphelper::mapKeysToSequence( m_pData->rEventsData );
     }
 
-    sal_Bool SAL_CALL DocumentEvents::hasByName( const OUString& Name ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DocumentEvents::hasByName( const OUString& Name )
     {
         ::osl::MutexGuard aGuard( m_pData->rMutex );
 
         return m_pData->rEventsData.find( Name ) != m_pData->rEventsData.end();
     }
 
-    Type SAL_CALL DocumentEvents::getElementType(  ) throw (RuntimeException, std::exception)
+    Type SAL_CALL DocumentEvents::getElementType(  )
     {
         return ::cppu::UnoType< Sequence< PropertyValue > >::get();
     }
 
-    sal_Bool SAL_CALL DocumentEvents::hasElements(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DocumentEvents::hasElements(  )
     {
         ::osl::MutexGuard aGuard( m_pData->rMutex );
         return !m_pData->rEventsData.empty();
diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx
index 51ed81b1b406..dc2ab8ac5f85 100644
--- a/dbaccess/source/core/dataaccess/documentevents.hxx
+++ b/dbaccess/source/core/dataaccess/documentevents.hxx
@@ -56,16 +56,16 @@ namespace dbaccess
         virtual void SAL_CALL release() throw() override;
 
         // XNameReplace
-        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     private:
         ::std::unique_ptr< DocumentEvents_Data >  m_pData;
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index a768615455c0..b1f55958ffe1 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -55,7 +55,6 @@ using namespace ::cppu;
 // the OSL_ENSURE in CTOR has to be changed too, when adding new defines
 
 void SAL_CALL OInterceptor::dispose()
-    throw( RuntimeException )
 {
     EventObject aEvt( *this );
 
@@ -105,7 +104,7 @@ struct DispatchHelper
 };
 
 //XDispatch
-void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValue >& Arguments ) throw (RuntimeException, std::exception)
+void SAL_CALL OInterceptor::dispatch( const URL& URL,const Sequence<PropertyValue >& Arguments )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_pContentHolder )
@@ -200,9 +199,6 @@ void SAL_CALL OInterceptor::addStatusListener(
     const Reference<
     XStatusListener >& Control,
     const URL& URL )
-    throw (
-        RuntimeException, std::exception
-    )
 {
     if(!Control.is())
         return;
@@ -279,9 +275,6 @@ void SAL_CALL OInterceptor::removeStatusListener(
     const Reference<
     XStatusListener >& Control,
     const URL& URL )
-    throw (
-        RuntimeException, std::exception
-    )
 {
     if(!(Control.is() && m_pStatCL))
         return;
@@ -294,7 +287,7 @@ void SAL_CALL OInterceptor::removeStatusListener(
 
 
 //XInterceptorInfo
-Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs(  )   throw ( RuntimeException, std::exception    )
+Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs(  )
 {
     // now implemented as update
     return m_aInterceptedURL;
@@ -304,7 +297,6 @@ Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs(  )   throw ( Run
 // XDispatchProvider
 
 Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& URL,const OUString& TargetFrameName,sal_Int32 SearchFlags )
-    throw (RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     const OUString* pIter = m_aInterceptedURL.getConstArray();
@@ -321,7 +313,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& URL,cons
         return Reference<XDispatch>();
 }
 
-Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches(  const Sequence<DispatchDescriptor >& Requests ) throw (     RuntimeException, std::exception    )
+Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches(  const Sequence<DispatchDescriptor >& Requests )
 {
     Sequence< Reference< XDispatch > > aRet;
     osl::MutexGuard aGuard(m_aMutex);
@@ -350,7 +342,7 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches(  cons
 
 //XDispatchProviderInterceptor
 
-Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider(  )  throw ( RuntimeException, std::exception    )
+Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider(  )
 {
     osl::MutexGuard aGuard(m_aMutex);
     return m_xSlaveDispatchProvider;
@@ -358,7 +350,6 @@ Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider(
 
 void SAL_CALL
 OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider )
-    throw (     RuntimeException, std::exception    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_xSlaveDispatchProvider = NewDispatchProvider;
@@ -366,9 +357,6 @@ OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& Ne
 
 
 Reference< XDispatchProvider > SAL_CALL OInterceptor::getMasterDispatchProvider(  )
-    throw (
-        RuntimeException, std::exception
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     return m_xMasterDispatchProvider;
@@ -377,9 +365,6 @@ Reference< XDispatchProvider > SAL_CALL OInterceptor::getMasterDispatchProvider(
 
 void SAL_CALL OInterceptor::setMasterDispatchProvider(
     const Reference< XDispatchProvider >& NewSupplier )
-    throw (
-        RuntimeException, std::exception
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_xMasterDispatchProvider = NewSupplier;
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx
index 09abd00b694a..39ed7fc428e5 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -45,81 +45,53 @@ public:
     explicit OInterceptor( ODocumentDefinition* _pContentHolder );
 
     /// @throws css::uno::RuntimeException
-    void SAL_CALL dispose() throw(css::uno::RuntimeException);
+    void SAL_CALL dispose();
 
     //XDispatch
     virtual void SAL_CALL
     dispatch(
         const css::util::URL& URL,
-        const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
     virtual void SAL_CALL
     addStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& Control,
-        const css::util::URL& URL )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        const css::util::URL& URL ) override;
 
     virtual void SAL_CALL
     removeStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& Control,
-        const css::util::URL& URL )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        const css::util::URL& URL ) override;
 
     //XInterceptorInfo
     virtual css::uno::Sequence< OUString >
-    SAL_CALL getInterceptedURLs(  )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+    SAL_CALL getInterceptedURLs(  ) override;
 
     //XDispatchProvider ( inherited by XDispatchProviderInterceptor )
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
     queryDispatch(
         const css::util::URL& URL,
         const OUString& TargetFrameName,
-        sal_Int32 SearchFlags )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        sal_Int32 SearchFlags ) override;
 
     virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
     queryDispatches(
-        const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) override;
 
     //XDispatchProviderInterceptor
     virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
-    getSlaveDispatchProvider(  )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+    getSlaveDispatchProvider(  ) override;
 
     virtual void SAL_CALL
     setSlaveDispatchProvider(
-        const css::uno::Reference< css::frame::XDispatchProvider >& NewDispatchProvider )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        const css::uno::Reference< css::frame::XDispatchProvider >& NewDispatchProvider ) override;
 
     virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
-    getMasterDispatchProvider(  )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+    getMasterDispatchProvider(  ) override;
 
     virtual void SAL_CALL
     setMasterDispatchProvider(
-        const css::uno::Reference< css::frame::XDispatchProvider >& NewSupplier )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        const css::uno::Reference< css::frame::XDispatchProvider >& NewSupplier ) override;
 
 private:
 
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
index a9ea47f3ad9e..66bbef215ef8 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
@@ -339,7 +339,6 @@ void DataSupplier::close()
 }
 
 void DataSupplier::validate()
-    throw( ResultSetException )
 {
 }
 
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
index 948303594a54..c2e431d8c799 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
@@ -55,8 +55,7 @@ public:
 
     virtual void close() override;
 
-    virtual void validate()
-        throw( css::ucb::ResultSetException ) override;
+    virtual void validate() override;
 };
 
 }
diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx
index 30124d96cfe8..27bb127b4dad 100644
--- a/dbaccess/source/core/inc/ContainerMediator.hxx
+++ b/dbaccess/source/core/inc/ContainerMediator.hxx
@@ -54,10 +54,10 @@ namespace dbaccess
             const css::uno::Reference< css::container::XNameAccess >& _xSettings
        );
 
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& _rEvent ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& _rEvent ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
         void notifyElementCreated(const OUString& _sElementName
                                 ,const css::uno::Reference< css::beans::XPropertySet>& _xElement);
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 287e13bc332f..0ffd47de5cbc 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -134,45 +134,45 @@ namespace dbaccess
                     );
 
         // css::lang::XTypeProvider
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
         static css::uno::Sequence< sal_Int8 >  getUnoTunnelImplementationId();
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
 
         // XContent
-        virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL getIdentifier(  ) throw (css::uno::RuntimeException, std::exception) override ;
-        virtual OUString SAL_CALL getContentType(  ) throw (css::uno::RuntimeException, std::exception) override ;
-        virtual void SAL_CALL addContentEventListener( const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override ;
-        virtual void SAL_CALL removeContentEventListener( const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL getIdentifier(  ) override ;
+        virtual OUString SAL_CALL getContentType(  ) override ;
+        virtual void SAL_CALL addContentEventListener( const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override ;
+        virtual void SAL_CALL removeContentEventListener( const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override ;
 
         // XCommandProcessor
-        virtual sal_Int32 SAL_CALL createCommandIdentifier(  ) throw (css::uno::RuntimeException, std::exception) override ;
-        virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) throw (css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception) override ;
-        virtual void SAL_CALL abort( sal_Int32 CommandId ) throw (css::uno::RuntimeException, std::exception) override ;
+        virtual sal_Int32 SAL_CALL createCommandIdentifier(  ) override ;
+        virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override ;
+        virtual void SAL_CALL abort( sal_Int32 CommandId ) override ;
 
         // XPropertiesChangeNotifier
-        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override ;
-        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override ;
+        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override ;
+        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override ;
 
         // XPropertyContainer
-        virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override ;
-        virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override ;
+        virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, const css::uno::Any& DefaultValue ) override ;
+        virtual void SAL_CALL removeProperty( const OUString& Name ) override ;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // css::lang::XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
         static OContentHelper* getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxComponent );
 
         // css::container::XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
         // XRename
-        virtual void SAL_CALL rename( const OUString& newName ) throw (css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL rename( const OUString& newName ) override;
 
         inline const ContentProperties& getContentProperties() const { return m_pImpl->m_aProps; }
         css::uno::Reference< css::sdbc::XRow >
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index 5f7f0150bb30..5f405d9e7cb3 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -58,156 +58,155 @@ public:
 
     // css::lang::XServiceInfo - static methods
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(css::uno::Reference< css::uno::XComponentContext > const & context);
 
 private:
     // css::uno::XInterface:
-    virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) override;
     virtual void SAL_CALL acquire() throw () override
         { TDatabaseDataProvider::acquire(); }
     virtual void SAL_CALL release() throw () override
         { TDatabaseDataProvider::release(); }
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // css::chart2::data::XDataProvider:
-    virtual sal_Bool SAL_CALL createDataSourcePossible(const css::uno::Sequence< css::beans::PropertyValue > & aArguments) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource(const css::uno::Sequence< css::beans::PropertyValue > & aArguments) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments(const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const OUString & aRangeRepresentation) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const OUString & aRangeRepresentation) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
+    virtual sal_Bool SAL_CALL createDataSourcePossible(const css::uno::Sequence< css::beans::PropertyValue > & aArguments) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource(const css::uno::Sequence< css::beans::PropertyValue > & aArguments) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments(const css::uno::Reference< css::chart2::data::XDataSource > & xDataSource) override;
+    virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const OUString & aRangeRepresentation) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const OUString & aRangeRepresentation) override;
 
     virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL
         createDataSequenceByValueArray(
-            const OUString& aRole, const OUString & aRangeRepresentation)
-                throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
+            const OUString& aRole, const OUString & aRangeRepresentation) override;
 
-    virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() override;
 
     // css::chart2::data::XRangeXMLConversion:
-    virtual OUString SAL_CALL convertRangeToXML(const OUString & aRangeRepresentation) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual OUString SAL_CALL convertRangeFromXML(const OUString & aXMLRange) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
+    virtual OUString SAL_CALL convertRangeToXML(const OUString & aRangeRepresentation) override;
+    virtual OUString SAL_CALL convertRangeFromXML(const OUString & aXMLRange) override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
 
     // css::beans::XPropertySet:
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const css::uno::Any & aValue) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & xListener) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const css::uno::Any & aValue) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) override;
+    virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & xListener) override;
+    virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) override;
+    virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) override;
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) override;
 
     // css::chart2::data::XDatabaseDataProvider:
-    virtual css::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMasterFields(const css::uno::Sequence< OUString > & the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDetailFields(const css::uno::Sequence< OUString > & the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCommand() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCommand(const OUString & the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCommandType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCommandType(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFilter(const OUString & the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getApplyFilter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setApplyFilter( sal_Bool _applyfilter ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getHavingClause() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHavingClause( const OUString& _havingclause ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getGroupBy() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setGroupBy( const OUString& _groupby ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getOrder() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOrder( const OUString& _order ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getEscapeProcessing() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEscapeProcessing(sal_Bool the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getRowLimit() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRowLimit( ::sal_Int32 _rowlimit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActiveConnection(const css::uno::Reference< css::sdbc::XConnection > & the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual OUString SAL_CALL getDataSourceName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getMasterFields() override;
+    virtual void SAL_CALL setMasterFields(const css::uno::Sequence< OUString > & the_value) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getDetailFields() override;
+    virtual void SAL_CALL setDetailFields(const css::uno::Sequence< OUString > & the_value) override;
+    virtual OUString SAL_CALL getCommand() override;
+    virtual void SAL_CALL setCommand(const OUString & the_value) override;
+    virtual ::sal_Int32 SAL_CALL getCommandType() override;
+    virtual void SAL_CALL setCommandType(::sal_Int32 the_value) override;
+    virtual OUString SAL_CALL getFilter() override;
+    virtual void SAL_CALL setFilter(const OUString & the_value) override;
+    virtual sal_Bool SAL_CALL getApplyFilter() override;
+    virtual void SAL_CALL setApplyFilter( sal_Bool _applyfilter ) override;
+    virtual OUString SAL_CALL getHavingClause() override;
+    virtual void SAL_CALL setHavingClause( const OUString& _havingclause ) override;
+    virtual OUString SAL_CALL getGroupBy() override;
+    virtual void SAL_CALL setGroupBy( const OUString& _groupby ) override;
+    virtual OUString SAL_CALL getOrder() override;
+    virtual void SAL_CALL setOrder( const OUString& _order ) override;
+    virtual sal_Bool SAL_CALL getEscapeProcessing() override;
+    virtual void SAL_CALL setEscapeProcessing(sal_Bool the_value) override;
+    virtual ::sal_Int32 SAL_CALL getRowLimit() override;
+    virtual void SAL_CALL setRowLimit( ::sal_Int32 _rowlimit ) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() override;
+    virtual void SAL_CALL setActiveConnection(const css::uno::Reference< css::sdbc::XConnection > & the_value) override;
+    virtual OUString SAL_CALL getDataSourceName() override;
+    virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) override;
 
     // css::sdbc::XParameters
-    virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearParameters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) override;
+    virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) override;
+    virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) override;
+    virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) override;
+    virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) override;
+    virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) override;
+    virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) override;
+    virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) override;
+    virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) override;
+    virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) override;
+    virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) override;
+    virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) override;
+    virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) override;
+    virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) override;
+    virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) override;
+    virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) override;
+    virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) override;
+    virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) override;
+    virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef>& x) override;
+    virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob>& x) override;
+    virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob>& x) override;
+    virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray>& x) override;
+    virtual void SAL_CALL clearParameters() override;
 
     // css::sdbc::XRowSet
-    virtual void SAL_CALL execute() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL execute() override;
+    virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) override;
+    virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) override;
 
     // css::sdbc::XResultSet
-    virtual sal_Bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isBeforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAfterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL beforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL afterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL previous() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL refreshRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL rowUpdated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL rowInserted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL rowDeleted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL next() override;
+    virtual sal_Bool SAL_CALL isBeforeFirst() override;
+    virtual sal_Bool SAL_CALL isAfterLast() override;
+    virtual sal_Bool SAL_CALL isFirst() override;
+    virtual sal_Bool SAL_CALL isLast() override;
+    virtual void SAL_CALL beforeFirst() override;
+    virtual void SAL_CALL afterLast() override;
+    virtual sal_Bool SAL_CALL first() override;
+    virtual sal_Bool SAL_CALL last() override;
+    virtual sal_Int32 SAL_CALL getRow() override;
+    virtual sal_Bool SAL_CALL absolute(sal_Int32 row) override;
+    virtual sal_Bool SAL_CALL relative(sal_Int32 rows) override;
+    virtual sal_Bool SAL_CALL previous() override;
+    virtual void SAL_CALL refreshRow() override;
+    virtual sal_Bool SAL_CALL rowUpdated() override;
+    virtual sal_Bool SAL_CALL rowInserted() override;
+    virtual sal_Bool SAL_CALL rowDeleted() override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() override;
 
     // container::XChild
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     // ____ XComplexDescriptionAccess ____
-    virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL        getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setComplexRowDescriptions(        const css::uno::Sequence<        css::uno::Sequence< OUString > >& aRowDescriptions )        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL        getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setComplexColumnDescriptions(         const css::uno::Sequence<        css::uno::Sequence< OUString > >& aColumnDescriptions )        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL        getComplexRowDescriptions() override;
+    virtual void SAL_CALL setComplexRowDescriptions(        const css::uno::Sequence<        css::uno::Sequence< OUString > >& aRowDescriptions ) override;
+    virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL        getComplexColumnDescriptions() override;
+    virtual void SAL_CALL setComplexColumnDescriptions(         const css::uno::Sequence<        css::uno::Sequence< OUString > >& aColumnDescriptions ) override;
 
     // ____ XChartDataArray (base of XComplexDescriptionAccess) ____
-    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData()        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setData(        const css::uno::Sequence< css::uno::Sequence< double > >& aData )        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions()        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRowDescriptions(        const css::uno::Sequence< OUString >& aRowDescriptions )        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColumnDescriptions(        const css::uno::Sequence< OUString >& aColumnDescriptions )        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override;
+    virtual void SAL_CALL setData(        const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override;
+    virtual void SAL_CALL setRowDescriptions(        const css::uno::Sequence< OUString >& aRowDescriptions ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override;
+    virtual void SAL_CALL setColumnDescriptions(        const css::uno::Sequence< OUString >& aColumnDescriptions ) override;
 
     // ____ XChartData (base of XChartDataArray) ____
-    virtual void SAL_CALL addChartDataChangeEventListener(const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChartDataChangeEventListener(const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getNotANumber()throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNotANumber(double nNumber )throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChartDataChangeEventListener(const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual void SAL_CALL removeChartDataChangeEventListener(const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual double SAL_CALL getNotANumber() override;
+    virtual sal_Bool SAL_CALL isNotANumber(double nNumber ) override;
 private:
     DatabaseDataProvider(DatabaseDataProvider &) = delete;
     void operator =(DatabaseDataProvider &) = delete;
diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index 5089c53aa5aa..132f12f0c6b5 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.hxx
@@ -57,7 +57,7 @@ namespace dbaccess
         inline virtual void removeMasterContainerListener(){}
 
         // ::connectivity::sdbcx::OCollection
-        virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+        virtual void impl_refresh() override;
 
         virtual OUString getNameForObject(const ::connectivity::sdbcx::ObjectType& _xObject) override;
 
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index 8d9c070a9e14..9bb283e30819 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -56,10 +56,10 @@ namespace dbaccess
                          );
 
         // css::beans::XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
         // css::lang::XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) override;
 
         inline void setName( const OUString& _sName ) { m_sName = _sName; }
         void setDefinition( const css::uno::Reference< css::beans::XPropertySet >& _xDest);
diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
index 69943a81f363..4d7bd244247b 100644
--- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
+++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
@@ -206,10 +206,8 @@ namespace dbaccess
 
         void SAL_CALL disposing() override;
 
-        virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
         // css::uno::XInterface
         DECLARE_XINTERFACE( )
@@ -220,39 +218,39 @@ namespace dbaccess
         DECLARE_PROPERTYCONTAINER_DEFAULTS();
 
         // css::sdb::XSingleSelectQueryComposer
-        virtual OUString SAL_CALL getElementaryQuery() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setElementaryQuery( const OUString& _rElementary ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFilter( const OUString& filter ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setStructuredFilter( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& filter ) throw (css::sdbc::SQLException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL appendFilterByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (css::sdbc::SQLException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL appendGroupByColumn( const css::uno::Reference< css::beans::XPropertySet >& column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setGroup( const OUString& group ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHavingClause( const OUString& filter ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setStructuredHavingClause( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& filter ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL appendHavingClauseByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (css::sdbc::SQLException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL appendOrderByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool ascending ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setOrder( const OUString& order ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getElementaryQuery() override;
+        virtual void SAL_CALL setElementaryQuery( const OUString& _rElementary ) override;
+        virtual void SAL_CALL setFilter( const OUString& filter ) override;
+        virtual void SAL_CALL setStructuredFilter( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& filter ) override;
+        virtual void SAL_CALL appendFilterByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) override;
+        virtual void SAL_CALL appendGroupByColumn( const css::uno::Reference< css::beans::XPropertySet >& column ) override;
+        virtual void SAL_CALL setGroup( const OUString& group ) override;
+        virtual void SAL_CALL setHavingClause( const OUString& filter ) override;
+        virtual void SAL_CALL setStructuredHavingClause( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& filter ) override;
+        virtual void SAL_CALL appendHavingClauseByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) override;
+        virtual void SAL_CALL appendOrderByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool ascending ) override;
+        virtual void SAL_CALL setOrder( const OUString& order ) override;
 
         // XSingleSelectQueryAnalyzer
-        virtual OUString SAL_CALL getQuery(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setQuery( const OUString& command ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCommand( const OUString& command,sal_Int32 CommandType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getFilter(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredFilter(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getGroup(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getGroupColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getHavingClause(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredHavingClause(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getOrder(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getOrderColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getQueryWithSubstitution(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getQuery(  ) override;
+        virtual void SAL_CALL setQuery( const OUString& command ) override;
+        virtual void SAL_CALL setCommand( const OUString& command,sal_Int32 CommandType ) override;
+        virtual OUString SAL_CALL getFilter(  ) override;
+        virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredFilter(  ) override;
+        virtual OUString SAL_CALL getGroup(  ) override;
+        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getGroupColumns(  ) override;
+        virtual OUString SAL_CALL getHavingClause(  ) override;
+        virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredHavingClause(  ) override;
+        virtual OUString SAL_CALL getOrder(  ) override;
+        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getOrderColumns(  ) override;
+        virtual OUString SAL_CALL getQueryWithSubstitution(  ) override;
 
         // XColumnsSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
         // XTablesSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) override;
         // XParametersSupplier
-        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters(  ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_SINGLESELECTQUERYCOMPOSER_HXX
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index 1603f7ae8cb8..994d46d49ec3 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -91,15 +91,12 @@ namespace dbaccess
                             css::uno::Any & rConvertedValue,
                             css::uno::Any & rOldValue,
                             sal_Int32 nHandle,
-                            const css::uno::Any& rValue )
-                                throw (css::lang::IllegalArgumentException) override;
+                            const css::uno::Any& rValue ) override;
         virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const css::uno::Any& rValue
-                                                 )
-
-                                         throw (css::uno::Exception, std::exception) override;
+                                                 ) override;
 
         virtual ~ODBTableDecorator() override;
     public:
@@ -116,18 +113,18 @@ namespace dbaccess
             const css::uno::Reference< css::sdbcx::XColumnsSupplier >& _rxTable,
             const css::uno::Reference< css::util::XNumberFormatsSupplier >& _rxNumberFormats,
             const css::uno::Reference< css::container::XNameAccess >& _rxColumnDefinitions
-        )   throw(css::sdbc::SQLException);
+        );
 
         // ODescriptor
         void construct();
 
         //XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
         //XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // OComponentHelper
         virtual void SAL_CALL disposing() override;
@@ -135,29 +132,29 @@ namespace dbaccess
     // css::lang::XServiceInfo
         DECLARE_SERVICE_INFO();
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
     // css::sdbcx::XRename,
-        virtual void SAL_CALL rename( const OUString& _rNewName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL rename( const OUString& _rNewName ) override;
 
     // css::sdbcx::XAlterTable,
-        virtual void SAL_CALL alterColumnByName( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL alterColumnByName( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) override;
+        virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) override;
 
         // XNamed
-        virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName() override;
+        virtual void SAL_CALL setName( const OUString& aName ) override;
         // css::lang::XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
         static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
         // XColumnsSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
         // XKeysSupplier
-        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getKeys(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getKeys(  ) override;
         // XIndexesSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getIndexes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getIndexes(  ) override;
         // XDataDescriptorFactory
-        virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 
     protected:
         using ODataSettings::getFastPropertyValue;
diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx
index bc9739d4b202..104ffec65004 100644
--- a/dbaccess/source/core/inc/View.hxx
+++ b/dbaccess/source/core/inc/View.hxx
@@ -51,7 +51,7 @@ namespace dbaccess
         DECLARE_XTYPEPROVIDER()
 
         // XAlterView
-        virtual void SAL_CALL alterCommand( const OUString& NewCommand ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL alterCommand( const OUString& NewCommand ) override;
 
     protected:
         virtual ~View() override;
diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx
index 47bc6c57c862..2f862cf0a005 100644
--- a/dbaccess/source/core/inc/callablestatement.hxx
+++ b/dbaccess/source/core/inc/callablestatement.hxx
@@ -38,43 +38,43 @@ namespace dbaccess
             :OPreparedStatement(_xConn, _xStatement){}
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::uno::XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // css::sdbc::XOutParameters
-        virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+        virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) override;
 
     // css::sdbc::XRow
-        virtual sal_Bool SAL_CALL wasNull(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull(  ) override;
+        virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override;
+        virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override;
+        virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override;
+        virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override;
+        virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override;
+        virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override;
+        virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override;
+        virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override;
+        virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override;
+        virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override;
+        virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
+        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override;
+        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CALLABLESTATEMENT_HXX
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index 775c2bd14bde..37856c0e32ce 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -80,28 +80,28 @@ namespace dbaccess
         virtual ~OColumn() override;
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override = 0;
 
     // css::uno::XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
 
     // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // cppu::OComponentHelper
         virtual void SAL_CALL disposing() override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XNamed
-        virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setName( const OUString& _rName ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName(  ) override;
+        virtual void SAL_CALL setName( const OUString& _rName ) override;
 
         virtual void fireValueChange( const ::connectivity::ORowSetValue& _rOldValue );
 
@@ -159,7 +159,7 @@ namespace dbaccess
         bool                                    m_bAddColumn    : 1;
         bool                                    m_bDropColumn   : 1;
 
-        virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+        virtual void impl_refresh() override;
         virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override;
         virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
         virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
@@ -209,20 +209,20 @@ namespace dbaccess
         virtual ~OColumns() override;
 
         //XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override { OColumns_BASE::acquire(); }
         virtual void SAL_CALL release() throw() override { OColumns_BASE::release(); }
         //XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // css::container::XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
         void append(const OUString& rName, OColumn*);
         void clearColumns();
diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx
index e9ff214a1140..06cf36a1aa54 100644
--- a/dbaccess/source/core/inc/definitioncolumn.hxx
+++ b/dbaccess/source/core/inc/definitioncolumn.hxx
@@ -80,22 +80,22 @@ namespace dbaccess
         DECLARE_XINTERFACE( )
 
         // css::lang::XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
         // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // css::container::XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
         // ::comphelper::OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
 
         // ::cppu::OPropertySetHelper
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     private:
         void    impl_registerProperties();
@@ -116,10 +116,10 @@ namespace dbaccess
         OTableColumn(const OUString& _rName);
 
         // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
 
         // OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -155,10 +155,10 @@ namespace dbaccess
         );
 
         // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
 
         // *Property*
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -201,13 +201,11 @@ namespace dbaccess
                                 css::uno::Any & rConvertedValue,
                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue )
-                                    throw (css::lang::IllegalArgumentException) override;
+                                const css::uno::Any& rValue ) override;
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                                     )
-                                                     throw (css::uno::Exception, std::exception) override;
+                                                     ) override;
 
     protected:
         OUString impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const;
@@ -232,11 +230,11 @@ namespace dbaccess
             const bool _bPureWrap, const bool _bIsDescriptor );
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // OIdPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const override;
@@ -251,13 +249,11 @@ namespace dbaccess
                                 css::uno::Any & rConvertedValue,
                                 css::uno::Any & rOldValue,
                                 sal_Int32 nHandle,
-                                const css::uno::Any& rValue )
-                                    throw (css::lang::IllegalArgumentException) override;
+                                const css::uno::Any& rValue ) override;
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                     sal_Int32 nHandle,
                                     const css::uno::Any& rValue
-                                                     )
-                                                     throw (css::uno::Exception, std::exception) override;
+                                                     ) override;
 
     protected:
         using OColumnWrapper::getFastPropertyValue;
@@ -280,11 +276,11 @@ namespace dbaccess
                              const bool _bPureWrap );
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // OIdPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index 4d32d2055720..614a8023de65 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -164,53 +164,51 @@ public:
 // css::uno::XInterface
     DECLARE_XINTERFACE( )
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
 // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
 // css::container::XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
 // css::container::XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) override;
 
 // css::container::XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& _rName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& _rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& _rName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& _rName ) override;
 
 // css::container::XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& _rName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& _rName, const css::uno::Any& aElement ) override;
 
 // css::container::XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
 // css::container::XContainer
-    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
     // XContainerApproveBroadcaster
-    virtual void SAL_CALL addContainerApproveListener( const css::uno::Reference< css::container::XContainerApproveListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerApproveListener( const css::uno::Reference< css::container::XContainerApproveListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerApproveListener( const css::uno::Reference< css::container::XContainerApproveListener >& Listener ) override;
+    virtual void SAL_CALL removeContainerApproveListener( const css::uno::Reference< css::container::XContainerApproveListener >& Listener ) override;
 
 // css::lang::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;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
     // XVetoableChangeListener
-    virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) override;
 
 protected:
     // helper
@@ -232,7 +230,7 @@ protected:
         @see    createObject
     */
     css::uno::Reference< css::ucb::XContent >
-                implGetByName(const OUString& _rName, bool _bCreateIfNecessary) throw (css::container::NoSuchElementException);
+                implGetByName(const OUString& _rName, bool _bCreateIfNecessary);
 
     /** quickly checks if there already is an element with a given name. No access to the configuration occurs, i.e.
         if there is such an object which is not already loaded, it won't be loaded now.
diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx
index fe5397ffcbb7..2501a1bf5fdb 100644
--- a/dbaccess/source/core/inc/preparedstatement.hxx
+++ b/dbaccess/source/core/inc/preparedstatement.hxx
@@ -49,58 +49,58 @@ namespace dbaccess
         virtual ~OPreparedStatement() override;
 
     // css::lang::XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::uno::XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
 
     // css::lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // OComponentHelper
         virtual void SAL_CALL disposing() override;
 
     // css::sdbc::XPreparedStatement
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL execute(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(  ) override;
+        virtual sal_Int32 SAL_CALL executeUpdate(  ) override;
+        virtual sal_Bool SAL_CALL execute(  ) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
 
     // css::sdbcx::XColumnsSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
 
     // css::sdbc::XResultSetMetaDataSupplier
-        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
     // css::sdbc::XParameters
-        virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearParameters(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override;
+        virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
+        virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override;
+        virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override;
+        virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override;
+        virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override;
+        virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override;
+        virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override;
+        virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override;
+        virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override;
+        virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override;
+        virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override;
+        virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override;
+        virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override;
+        virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override;
+        virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override;
+        virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override;
+        virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override;
+        virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override;
+        virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override;
+        virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override;
+        virtual void SAL_CALL clearParameters(  ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_PREPAREDSTATEMENT_HXX
diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx
index 659f2c951e2c..2271cb408e34 100644
--- a/dbaccess/source/core/inc/querycomposer.hxx
+++ b/dbaccess/source/core/inc/querycomposer.hxx
@@ -61,35 +61,34 @@ namespace dbaccess
         OQueryComposer( const css::uno::Reference< css::sdbc::XConnection>& _xConnection );
 
         // css::lang::XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
         // css::uno::XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
         // XSQLQueryComposer
-        virtual OUString SAL_CALL getQuery(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setQuery( const OUString& command ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getComposedQuery(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getFilter(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredFilter(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getOrder(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL appendFilterByColumn( const css::uno::Reference< css::beans::XPropertySet >& column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL appendOrderByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool ascending ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFilter( const OUString& filter ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setOrder( const OUString& order ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getQuery(  ) override;
+        virtual void SAL_CALL setQuery( const OUString& command ) override;
+        virtual OUString SAL_CALL getComposedQuery(  ) override;
+        virtual OUString SAL_CALL getFilter(  ) override;
+        virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getStructuredFilter(  ) override;
+        virtual OUString SAL_CALL getOrder(  ) override;
+        virtual void SAL_CALL appendFilterByColumn( const css::uno::Reference< css::beans::XPropertySet >& column ) override;
+        virtual void SAL_CALL appendOrderByColumn( const css::uno::Reference< css::beans::XPropertySet >& column, sal_Bool ascending ) override;
+        virtual void SAL_CALL setFilter( const OUString& filter ) override;
+        virtual void SAL_CALL setOrder( const OUString& order ) override;
         // XTablesSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) override;
         // XColumnsSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
         // XParametersSupplier
-        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getParameters(  ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCOMPOSER_HXX
diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx
index ff60984f0d79..50def772615a 100644
--- a/dbaccess/source/core/inc/querycontainer.hxx
+++ b/dbaccess/source/core/inc/querycontainer.hxx
@@ -125,34 +125,34 @@ namespace dbaccess
         DECLARE_SERVICE_INFO();
 
     // css::container::XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
         // XContainerApproveListener
-        virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveInsertElement( const css::container::ContainerEvent& Event ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveReplaceElement( const css::container::ContainerEvent& Event ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveRemoveElement( const css::container::ContainerEvent& Event ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveInsertElement( const css::container::ContainerEvent& Event ) override;
+        virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveReplaceElement( const css::container::ContainerEvent& Event ) override;
+        virtual css::uno::Reference< css::util::XVeto > SAL_CALL approveRemoveElement( const css::container::ContainerEvent& Event ) override;
 
     // css::lang::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;
 
     // css::sdbcx::XDataDescriptorFactory
-        virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
 
     // css::sdbcx::XAppend
-        virtual void SAL_CALL appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
     // css::sdbcx::XDrop
-        virtual void SAL_CALL dropByName( const OUString& elementName ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dropByName( const OUString& elementName ) override;
+        virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
 
     // css::container::XElementAccess
-        virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
     // css::container::XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCount(  ) override;
     // css::container::XNameAccess
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
 
     private:
         // OContentHelper overridables
diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx
index 7d7b7f09ed68..0c5d0e4d243f 100644
--- a/dbaccess/source/core/inc/statement.hxx
+++ b/dbaccess/source/core/inc/statement.hxx
@@ -67,10 +67,10 @@ public:
 
 
 // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
 // css::uno::XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
@@ -78,7 +78,7 @@ public:
     virtual void SAL_CALL disposing() override;
 
 // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
 // comphelper::OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
@@ -90,38 +90,34 @@ public:
                             css::uno::Any & rConvertedValue,
                             css::uno::Any & rOldValue,
                             sal_Int32 nHandle,
-                            const css::uno::Any& rValue )
-                                throw (css::lang::IllegalArgumentException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                            const css::uno::Any& rValue ) override;
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const css::uno::Any& rValue
-                                                 )
-                                                 throw (css::uno::Exception, std::exception) override;
+                                                 ) override;
     virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
 // css::sdbc::XWarningsSupplier
-    virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+    virtual void SAL_CALL clearWarnings(  ) override;
 
 // css::util::XCancellable
-    virtual void SAL_CALL cancel(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel(  ) override;
 
 // css::sdbc::XCloseable
-    virtual void SAL_CALL close(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close(  ) override;
 
 // css::sdbc::XMultipleResults
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getUpdateCount(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMoreResults(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+    virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+    virtual sal_Bool SAL_CALL getMoreResults(  ) override;
 
 // css::sdbc::XPreparedBatchExecution
-    virtual void SAL_CALL addBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addBatch(  ) override;
+    virtual void SAL_CALL clearBatch(  ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) override;
 // css::sdbc::XGeneratedResultSet
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues(  ) override;
 
 // Helper
     void disposeResultSet();
@@ -153,23 +149,23 @@ public:
     DECLARE_XTYPEPROVIDER()
 
 // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 // css::sdbc::XStatement
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override;
+    virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override;
+    virtual sal_Bool SAL_CALL execute( const OUString& sql ) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XBatchExecution
-    virtual void SAL_CALL addBatch( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addBatch( const OUString& sql ) override;
+    virtual void SAL_CALL clearBatch(  ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) override;
 
     using OStatementBase::addBatch;
 
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 092202d36e4a..ff8279e9bd41 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -110,23 +110,21 @@ namespace dbaccess
                 , const OUString& _rName
                 ,const OUString& _rType
                 , const OUString& _rDesc
-                ,const css::uno::Reference< css::container::XNameAccess >& _rxColumnDefinitions)
-            throw(css::sdbc::SQLException);
+                ,const css::uno::Reference< css::container::XNameAccess >& _rxColumnDefinitions);
 
         /// @throws css::sdbc::SQLException
         ODBTable(connectivity::sdbcx::OCollection* _pTables
-                ,const css::uno::Reference< css::sdbc::XConnection >& _rxConn)
-                throw(css::sdbc::SQLException);
+                ,const css::uno::Reference< css::sdbc::XConnection >& _rxConn);
         virtual ~ODBTable() override;
 
         // ODescriptor
         virtual void construct() override;
 
         //XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         //XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
         static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
     // css::lang::XServiceInfo
@@ -136,13 +134,13 @@ namespace dbaccess
         virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
 
     // css::sdbcx::XRename,
-        virtual void SAL_CALL rename( const OUString& _rNewName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL rename( const OUString& _rNewName ) override;
 
     // css::sdbcx::XAlterTable,
-        virtual void SAL_CALL alterColumnByName( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL alterColumnByName( const OUString& _rName, const css::uno::Reference< css::beans::XPropertySet >& _rxDescriptor ) override;
 
         // css::lang::XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     private:
         using OTable_Base::createArrayHelper;
diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx
index f413ca467066..3f70afe41bc6 100644
--- a/dbaccess/source/core/inc/tablecontainer.hxx
+++ b/dbaccess/source/core/inc/tablecontainer.hxx
@@ -68,11 +68,11 @@ namespace dbaccess
         DECLARE_SERVICE_INFO();
 
         // 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;
         // XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
     public:
         /** ctor of the container. The parent has to support the <type scope="css::sdbc">XConnection</type>
diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx
index ce6277d24eb6..5d3f3bf5c8ca 100644
--- a/dbaccess/source/core/inc/veto.hxx
+++ b/dbaccess/source/core/inc/veto.hxx
@@ -41,8 +41,8 @@ namespace dbaccess
     public:
         Veto( const OUString& _rReason, const css::uno::Any& _rDetails );
 
-        virtual OUString SAL_CALL getReason() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getDetails() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getReason() override;
+        virtual css::uno::Any SAL_CALL getDetails() override;
 
     protected:
         virtual ~Veto() override;
diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx
index b8fd46b884c4..c6b212771222 100644
--- a/dbaccess/source/core/inc/viewcontainer.hxx
+++ b/dbaccess/source/core/inc/viewcontainer.hxx
@@ -79,11 +79,11 @@ namespace dbaccess
         DECLARE_SERVICE_INFO();
 
         // 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;
         // XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
         // ::connectivity::sdbcx::OCollection
         virtual ::connectivity::sdbcx::ObjectType       createObject(const OUString& _rName) override;
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index 802b802fc575..8490f3d288a6 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -95,7 +95,7 @@ void OContainerMediator::impl_cleanup_nothrow()
     }
 }
 
-void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( _rEvent.Source == m_xSettings && m_xSettings.is() )
@@ -111,7 +111,7 @@ void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent
     }
 }
 
-void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     Reference< XContainer > xContainer = m_xContainer;
@@ -133,7 +133,7 @@ void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent
     }
 }
 
-void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent )
 {
     Reference< XContainer > xContainer = m_xContainer;
     if ( _rEvent.Source == xContainer && xContainer.is() )
@@ -165,7 +165,7 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent
     }
 }
 
-void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index b7921916e576..21bbac3bd3f5 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -100,34 +100,34 @@ void SAL_CALL DatabaseDataProvider::disposing()
     m_xActiveConnection.clear();
 }
 
-uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type) throw (uno::RuntimeException, std::exception)
+uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type)
 {
     return TDatabaseDataProvider::queryInterface(type);
 }
 
-OUString DatabaseDataProvider::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString DatabaseDataProvider::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.dbaccess.DatabaseDataProvider");
 }
 
 // XServiceInfo
-OUString SAL_CALL DatabaseDataProvider::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL DatabaseDataProvider::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-uno::Sequence< OUString > DatabaseDataProvider::getSupportedServiceNames_Static(  ) throw (uno::RuntimeException)
+uno::Sequence< OUString > DatabaseDataProvider::getSupportedServiceNames_Static(  )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.chart2.data.DatabaseDataProvider" };
     return aSNS;
 }
 
-uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
@@ -138,7 +138,7 @@ uno::Reference< uno::XInterface > DatabaseDataProvider::Create(uno::Reference< u
 }
 
 // lang::XInitialization:
-void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception, std::exception)
+void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > & aArguments)
 {
     osl::MutexGuard g(m_aMutex);
     const uno::Any* pIter   = aArguments.getConstArray();
@@ -154,7 +154,7 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
 }
 
 // chart2::data::XDataProvider:
-sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequence< beans::PropertyValue > & _aArguments)
 {
     const beans::PropertyValue* pArgIter = _aArguments.getConstArray();
     const beans::PropertyValue* pArgEnd  = pArgIter + _aArguments.getLength();
@@ -185,7 +185,7 @@ sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequ
     return true;
 }
 
-uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::createDataSource(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
+uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::createDataSource(const uno::Sequence< beans::PropertyValue > & _aArguments)
 {
     osl::ResettableMutexGuard aClearForNotifies(m_aMutex);
     if ( createDataSourcePossible(_aArguments) )
@@ -239,7 +239,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat
     return m_xInternal->createDataSource(_aArguments);
 }
 
-uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArguments(const uno::Reference< chart2::data::XDataSource > & _xDataSource) throw (uno::RuntimeException, std::exception)
+uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArguments(const uno::Reference< chart2::data::XDataSource > & _xDataSource)
 {
     ::comphelper::NamedValueCollection aArguments;
     aArguments.put( "CellRangeRepresentation", uno::Any( OUString( "all" ) ) );
@@ -273,7 +273,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum
     return aArguments.getPropertyValues();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const OUString & /*aRangeRepresentation*/)
 {
     return true;
 }
@@ -286,7 +286,7 @@ uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString &
     return uno::makeAny(sal_Int32(0));
 }
 
-uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
+uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const OUString & _sRangeRepresentation)
 {
     osl::MutexGuard g(m_aMutex);
     uno::Reference< chart2::data::XDataSequence > xData = m_xInternal->createDataSequenceByRangeRepresentation(_sRangeRepresentation);
@@ -302,84 +302,83 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::cre
 uno::Reference<chart2::data::XDataSequence>
 SAL_CALL DatabaseDataProvider::createDataSequenceByValueArray(
     const OUString& /*aRole*/, const OUString& /*aRangeRepresentation*/ )
-        throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     return uno::Reference<chart2::data::XDataSequence>();
 }
 
-uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions()
 {
     return m_xComplexDescriptionAccess->getComplexRowDescriptions();
 }
 
-void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aRowDescriptions )
 {
     m_xComplexDescriptionAccess->setComplexRowDescriptions(aRowDescriptions);
 }
 
-uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions()
 {
     return m_xComplexDescriptionAccess->getComplexColumnDescriptions();
 }
 
-void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aColumnDescriptions )
 {
     m_xComplexDescriptionAccess->setComplexColumnDescriptions(aColumnDescriptions);
 }
 
 // ____ XChartDataArray ____
-uno::Sequence< uno::Sequence< double > > SAL_CALL DatabaseDataProvider::getData()    throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Sequence< double > > SAL_CALL DatabaseDataProvider::getData()
 {
     return m_xComplexDescriptionAccess->getData();
 }
 
-void SAL_CALL DatabaseDataProvider::setData( const uno::Sequence< uno::Sequence< double > >& rDataInRows )    throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setData( const uno::Sequence< uno::Sequence< double > >& rDataInRows )
 {
     m_xComplexDescriptionAccess->setData(rDataInRows);
 }
 
-void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< OUString >& aRowDescriptions )    throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< OUString >& aRowDescriptions )
 {
     m_xComplexDescriptionAccess->setRowDescriptions(aRowDescriptions);
 }
 
-void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< OUString >& aColumnDescriptions )    throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< OUString >& aColumnDescriptions )
 {
     m_xComplexDescriptionAccess->setColumnDescriptions(aColumnDescriptions);
 }
 
-uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions()    throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions()
 {
     return m_xComplexDescriptionAccess->getRowDescriptions();
 }
 
-uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions()    throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions()
 {
     return m_xComplexDescriptionAccess->getColumnDescriptions();
 }
 
 // ____ XChartData (base of XChartDataArray) ____
-void SAL_CALL DatabaseDataProvider::addChartDataChangeEventListener(const uno::Reference< css::chart::XChartDataChangeEventListener >& x)    throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::addChartDataChangeEventListener(const uno::Reference< css::chart::XChartDataChangeEventListener >& x)
 {
     m_xComplexDescriptionAccess->addChartDataChangeEventListener(x);
 }
 
-void SAL_CALL DatabaseDataProvider::removeChartDataChangeEventListener(const uno::Reference< css::chart::XChartDataChangeEventListener >& x)    throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::removeChartDataChangeEventListener(const uno::Reference< css::chart::XChartDataChangeEventListener >& x)
 {
     m_xComplexDescriptionAccess->removeChartDataChangeEventListener(x);
 }
 
-double SAL_CALL DatabaseDataProvider::getNotANumber()    throw (uno::RuntimeException, std::exception)
+double SAL_CALL DatabaseDataProvider::getNotANumber()
 {
     return m_xComplexDescriptionAccess->getNotANumber();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::isNotANumber( double nNumber )    throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DatabaseDataProvider::isNotANumber( double nNumber )
 {
     return m_xComplexDescriptionAccess->isNotANumber(nNumber);
 }
 
-uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRangeSelection() throw (uno::RuntimeException, std::exception)
+uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRangeSelection()
 {
     // TODO: Exchange the default return implementation for "getRangeSelection" !!!
     // Exchange the default return implementation.
@@ -390,85 +389,85 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRange
 }
 
 // chart2::data::XRangeXMLConversion:
-OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
+OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const OUString & _sRangeRepresentation)
 {
     osl::MutexGuard g(m_aMutex);
     return m_xRangeConversion->convertRangeToXML(_sRangeRepresentation);
 }
 
-OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
+OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const OUString & _sXMLRange)
 {
     osl::MutexGuard g(m_aMutex);
     return m_xRangeConversion->convertRangeFromXML(_sXMLRange);
 }
 
 // com.sun.star.beans.XPropertySet:
-uno::Reference< beans::XPropertySetInfo > SAL_CALL DatabaseDataProvider::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL DatabaseDataProvider::getPropertySetInfo()
 {
     return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertySetInfo();
 }
 
-void SAL_CALL DatabaseDataProvider::setPropertyValue(const OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, std::exception)
+void SAL_CALL DatabaseDataProvider::setPropertyValue(const OUString & aPropertyName, const uno::Any & aValue)
 {
     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::setPropertyValue(aPropertyName, aValue);
 }
 
-uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception)
+uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const OUString & aPropertyName)
 {
     return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertyValue(aPropertyName);
 }
 
-void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception)
+void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener)
 {
     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addPropertyChangeListener(aPropertyName, xListener);
 }
 
-void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception)
+void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener)
 {
     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removePropertyChangeListener(aPropertyName, xListener);
 }
 
-void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception)
+void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener)
 {
     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addVetoableChangeListener(aPropertyName, xListener);
 }
 
-void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException, std::exception)
+void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener)
 {
     ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removeVetoableChangeListener(aPropertyName, xListener);
 }
 
 // chart2::data::XDatabaseDataProvider:
-uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getMasterFields() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getMasterFields()
 {
     osl::MutexGuard g(m_aMutex);
     return m_MasterFields;
 }
 
-void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< OUString > & the_value)
 {
     impl_invalidateParameter_nothrow();
     set("MasterFields",the_value,m_MasterFields);
 }
 
-uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getDetailFields() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getDetailFields()
 {
     osl::MutexGuard g(m_aMutex);
     return m_DetailFields;
 }
 
-void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< OUString > & the_value)
 {
     set("DetailFields",the_value,m_DetailFields);
 }
 
-OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL DatabaseDataProvider::getCommand()
 {
     osl::MutexGuard g(m_aMutex);
     return m_Command;
 }
 
-void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value)
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -478,13 +477,13 @@ void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) throw
     set(PROPERTY_COMMAND,the_value,m_Command);
 }
 
-::sal_Int32 SAL_CALL DatabaseDataProvider::getCommandType() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL DatabaseDataProvider::getCommandType()
 {
     osl::MutexGuard g(m_aMutex);
     return m_CommandType;
 }
 
-void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value)
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -493,13 +492,13 @@ void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw
     set(PROPERTY_COMMAND_TYPE,the_value,m_CommandType);
 }
 
-OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL DatabaseDataProvider::getFilter()
 {
     osl::MutexGuard g(m_aMutex);
     return m_aFilterManager.getFilterComponent( dbtools::FilterManager::FilterComponent::PublicFilter );
 }
 
-void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value)
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -508,13 +507,13 @@ void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) throw
     set(PROPERTY_FILTER,the_value,m_Filter);
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::getApplyFilter() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL DatabaseDataProvider::getApplyFilter()
 {
     osl::MutexGuard g(m_aMutex);
     return m_ApplyFilter;
 }
 
-void SAL_CALL DatabaseDataProvider::setApplyFilter( sal_Bool the_value ) throw (RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setApplyFilter( sal_Bool the_value )
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -523,13 +522,13 @@ void SAL_CALL DatabaseDataProvider::setApplyFilter( sal_Bool the_value ) throw (
     set(PROPERTY_APPLYFILTER,(bool)the_value,m_ApplyFilter);
 }
 
-OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL DatabaseDataProvider::getHavingClause()
 {
     osl::MutexGuard g(m_aMutex);
     return m_HavingClause;
 }
 
-void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value )
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -538,13 +537,13 @@ void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value )
     set(PROPERTY_HAVING_CLAUSE,the_value,m_HavingClause);
 }
 
-OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL DatabaseDataProvider::getGroupBy()
 {
     osl::MutexGuard g(m_aMutex);
     return m_GroupBy;
 }
 
-void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value )
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -553,13 +552,13 @@ void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) thro
     set(PROPERTY_GROUP_BY,the_value,m_GroupBy);
 }
 
-OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL DatabaseDataProvider::getOrder()
 {
     osl::MutexGuard g(m_aMutex);
     return m_Order;
 }
 
-void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value )
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -568,48 +567,48 @@ void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value ) throw
     set(PROPERTY_ORDER,the_value,m_Order);
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::getEscapeProcessing() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DatabaseDataProvider::getEscapeProcessing()
 {
     osl::MutexGuard g(m_aMutex);
     return m_EscapeProcessing;
 }
 
-void SAL_CALL DatabaseDataProvider::setEscapeProcessing(sal_Bool the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setEscapeProcessing(sal_Bool the_value)
 {
     set(PROPERTY_ESCAPE_PROCESSING,(bool)the_value,m_EscapeProcessing);
 }
 
-::sal_Int32 SAL_CALL DatabaseDataProvider::getRowLimit() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL DatabaseDataProvider::getRowLimit()
 {
     osl::MutexGuard g(m_aMutex);
     return m_RowLimit;
 }
 
-void SAL_CALL DatabaseDataProvider::setRowLimit(::sal_Int32 the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setRowLimit(::sal_Int32 the_value)
 {
     set("RowLimit",the_value,m_RowLimit);
 }
 
-uno::Reference< sdbc::XConnection > SAL_CALL DatabaseDataProvider::getActiveConnection() throw (uno::RuntimeException, std::exception)
+uno::Reference< sdbc::XConnection > SAL_CALL DatabaseDataProvider::getActiveConnection()
 {
     osl::MutexGuard g(m_aMutex);
     return m_xActiveConnection;
 }
 
-void SAL_CALL DatabaseDataProvider::setActiveConnection(const uno::Reference< sdbc::XConnection > & the_value) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
+void SAL_CALL DatabaseDataProvider::setActiveConnection(const uno::Reference< sdbc::XConnection > & the_value)
 {
     if ( !the_value.is() )
         throw lang::IllegalArgumentException();
     set(PROPERTY_ACTIVE_CONNECTION,the_value,m_xActiveConnection);
 }
 
-OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL DatabaseDataProvider::getDataSourceName()
 {
     osl::MutexGuard g(m_aMutex);
     return m_DataSourceName;
 }
 
-void SAL_CALL DatabaseDataProvider::setDataSourceName(const OUString& the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setDataSourceName(const OUString& the_value)
 {
     set(PROPERTY_DATASOURCENAME,the_value,m_DataSourceName);
 }
@@ -845,237 +844,237 @@ bool DatabaseDataProvider::impl_fillParameters_nothrow( ::osl::ResettableMutexGu
 }
 
 // css::sdbc::XParameters
-void SAL_CALL DatabaseDataProvider::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType)
 {
     m_aParameterManager.setNull(parameterIndex, sqlType);
 }
 
-void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName)
 {
     m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName);
 }
 
-void SAL_CALL DatabaseDataProvider::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setBoolean(sal_Int32 parameterIndex, sal_Bool x)
 {
     m_aParameterManager.setBoolean(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setByte(sal_Int32 parameterIndex, sal_Int8 x)
 {
     m_aParameterManager.setByte(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setShort(sal_Int32 parameterIndex, sal_Int16 x)
 {
     m_aParameterManager.setShort(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setInt(sal_Int32 parameterIndex, sal_Int32 x)
 {
     m_aParameterManager.setInt(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setLong(sal_Int32 parameterIndex, sal_Int64 x)
 {
     m_aParameterManager.setLong(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setFloat(sal_Int32 parameterIndex, float x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setFloat(sal_Int32 parameterIndex, float x)
 {
     m_aParameterManager.setFloat(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setDouble(sal_Int32 parameterIndex, double x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setDouble(sal_Int32 parameterIndex, double x)
 {
     m_aParameterManager.setDouble(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const OUString& x)
 {
     m_aParameterManager.setString(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setBytes(sal_Int32 parameterIndex, const uno::Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setBytes(sal_Int32 parameterIndex, const uno::Sequence< sal_Int8 >& x)
 {
     m_aParameterManager.setBytes(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setDate(sal_Int32 parameterIndex, const util::Date& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setDate(sal_Int32 parameterIndex, const util::Date& x)
 {
     m_aParameterManager.setDate(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setTime(sal_Int32 parameterIndex, const util::Time& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setTime(sal_Int32 parameterIndex, const util::Time& x)
 {
     m_aParameterManager.setTime(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setTimestamp(sal_Int32 parameterIndex, const util::DateTime& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setTimestamp(sal_Int32 parameterIndex, const util::DateTime& x)
 {
     m_aParameterManager.setTimestamp(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setBinaryStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setBinaryStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length)
 {
     m_aParameterManager.setBinaryStream(parameterIndex, x, length);
 }
 
-void SAL_CALL DatabaseDataProvider::setCharacterStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setCharacterStream(sal_Int32 parameterIndex, const uno::Reference<io::XInputStream>& x, sal_Int32 length)
 {
     m_aParameterManager.setCharacterStream(parameterIndex, x, length);
 }
 
-void SAL_CALL DatabaseDataProvider::setObjectWithInfo(sal_Int32 parameterIndex, const uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setObjectWithInfo(sal_Int32 parameterIndex, const uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale)
 {
     m_aParameterManager.setObjectWithInfo(parameterIndex, x, targetSqlType, scale);
 }
 
-void SAL_CALL DatabaseDataProvider::setObject(sal_Int32 parameterIndex, const uno::Any& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setObject(sal_Int32 parameterIndex, const uno::Any& x)
 {
     m_aParameterManager.setObject(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setRef(sal_Int32 parameterIndex, const uno::Reference<sdbc::XRef>& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setRef(sal_Int32 parameterIndex, const uno::Reference<sdbc::XRef>& x)
 {
     m_aParameterManager.setRef(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setBlob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XBlob>& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setBlob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XBlob>& x)
 {
     m_aParameterManager.setBlob(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setClob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XClob>& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setClob(sal_Int32 parameterIndex, const uno::Reference<sdbc::XClob>& x)
 {
     m_aParameterManager.setClob(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::setArray(sal_Int32 parameterIndex, const Reference<sdbc::XArray>& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::setArray(sal_Int32 parameterIndex, const Reference<sdbc::XArray>& x)
 {
     m_aParameterManager.setArray(parameterIndex, x);
 }
 
-void SAL_CALL DatabaseDataProvider::clearParameters() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::clearParameters()
 {
     m_aParameterManager.clearParameters();
 }
 
 // css::sdbc::XRowSet
-void SAL_CALL DatabaseDataProvider::execute() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::execute()
 {
     uno::Sequence< beans::PropertyValue > aEmpty;
     createDataSource(aEmpty);
 }
 
-void SAL_CALL DatabaseDataProvider::addRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::addRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener)
 {
     if (m_xRowSet.is())
         m_xRowSet->addRowSetListener(_rListener);
 }
 
-void SAL_CALL DatabaseDataProvider::removeRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::removeRowSetListener(const uno::Reference<sdbc::XRowSetListener>& _rListener)
 {
     if (m_xRowSet.is())
         m_xRowSet->removeRowSetListener(_rListener);
 }
 
 // css::sdbc::XResultSet
-sal_Bool SAL_CALL DatabaseDataProvider::next() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::next()
 {
     return m_xRowSet->next();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::isBeforeFirst() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::isBeforeFirst()
 {
     return m_xRowSet->isBeforeFirst();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::isAfterLast() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::isAfterLast()
 {
     return m_xRowSet->isAfterLast();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::isFirst() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::isFirst()
 {
     return m_xRowSet->isFirst();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::isLast() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::isLast()
 {
     return m_xRowSet->isLast();
 }
 
-void SAL_CALL DatabaseDataProvider::beforeFirst() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::beforeFirst()
 {
     m_xRowSet->beforeFirst();
 }
 
-void SAL_CALL DatabaseDataProvider::afterLast() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::afterLast()
 {
     m_xRowSet->afterLast();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::first() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::first()
 {
     return m_xRowSet->first();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::last() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::last()
 {
     return m_xRowSet->last();
 }
 
-sal_Int32 SAL_CALL DatabaseDataProvider::getRow() throw( SQLException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL DatabaseDataProvider::getRow()
 {
     return m_xRowSet->getRow();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::absolute(sal_Int32 row) throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::absolute(sal_Int32 row)
 {
     return m_xRowSet->absolute(row);
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::relative(sal_Int32 rows) throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::relative(sal_Int32 rows)
 {
     return m_xRowSet->relative(rows);
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::previous() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::previous()
 {
     return m_xRowSet->previous();
 }
 
-void SAL_CALL DatabaseDataProvider::refreshRow() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL DatabaseDataProvider::refreshRow()
 {
     m_xRowSet->refreshRow();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::rowUpdated() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::rowUpdated()
 {
     return m_xRowSet->rowUpdated();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::rowInserted() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::rowInserted()
 {
     return m_xRowSet->rowInserted();
 }
 
-sal_Bool SAL_CALL DatabaseDataProvider::rowDeleted() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL DatabaseDataProvider::rowDeleted()
 {
     return m_xRowSet->rowDeleted();
 }
 
-uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getStatement() throw( SQLException, RuntimeException, std::exception )
+uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getStatement()
 {
     return m_xRowSet->getStatement();
 }
 
-uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL DatabaseDataProvider::getParent(  )
 {
     return m_xParent;
 }
 
-void SAL_CALL DatabaseDataProvider::setParent( const uno::Reference< uno::XInterface >& _xParent ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL DatabaseDataProvider::setParent( const uno::Reference< uno::XInterface >& _xParent )
 {
     osl::MutexGuard g(m_aMutex);
     m_xParent = _xParent;
diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx
index 94585ee04a6f..c128c2e1f6b6 100644
--- a/dbaccess/source/core/misc/PropertyForward.cxx
+++ b/dbaccess/source/core/misc/PropertyForward.cxx
@@ -70,7 +70,7 @@ namespace dbaccess
     {
     }
 
-    void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception)
+    void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& evt )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -112,7 +112,7 @@ namespace dbaccess
         }
     }
 
-    void SAL_CALL OPropertyForward::disposing( const css::lang::EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL OPropertyForward::disposing( const css::lang::EventObject& /*_rSource*/ )
     {
         ::osl::MutexGuard aGuard(m_aMutex);
 
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index d23a5d0b7cb1..879f86516e6a 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -43,7 +43,7 @@ OSubComponent::~OSubComponent()
 }
 
 // css::lang::XTypeProvider
-Sequence< Type > OSubComponent::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > OSubComponent::getTypes()
 {
     OTypeCollection aTypes(cppu::UnoType<XComponent>::get(),
                            cppu::UnoType<XTypeProvider>::get(),
@@ -103,7 +103,7 @@ void OSubComponent::release() throw ( )
     OWeakAggObject::release();
 }
 
-Any OSubComponent::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any OSubComponent::queryInterface( const Type & rType )
 {
     Any aReturn;
     if (!rType.equals(cppu::UnoType<XAggregation>::get()))
diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx
index 89a359ce2f91..81331252cfbc 100644
--- a/dbaccess/source/core/misc/veto.cxx
+++ b/dbaccess/source/core/misc/veto.cxx
@@ -36,12 +36,12 @@ namespace dbaccess
     {
     }
 
-    OUString SAL_CALL Veto::getReason() throw (RuntimeException, std::exception)
+    OUString SAL_CALL Veto::getReason()
     {
         return m_sReason;
     }
 
-    Any SAL_CALL Veto::getDetails() throw (RuntimeException, std::exception)
+    Any SAL_CALL Veto::getDetails()
     {
         return m_aDetails;
     }
diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
index fbb9d0b5f0f2..78c2ee85d2be 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
@@ -129,19 +129,19 @@ namespace dbaccess
         m_pData = nullptr;
     }
 
-    void SAL_CALL SubComponentLoader::windowResized( const WindowEvent& i_rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL SubComponentLoader::windowResized( const WindowEvent& i_rEvent )
     {
         // not interested in
         (void)i_rEvent;
     }
 
-    void SAL_CALL SubComponentLoader::windowMoved( const WindowEvent& i_rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL SubComponentLoader::windowMoved( const WindowEvent& i_rEvent )
     {
         // not interested in
         (void)i_rEvent;
     }
 
-    void SAL_CALL SubComponentLoader::windowShown( const EventObject& i_rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL SubComponentLoader::windowShown( const EventObject& i_rEvent )
     {
         (void)i_rEvent;
 
@@ -149,13 +149,13 @@ namespace dbaccess
         m_pData->xAppComponentWindow->removeWindowListener( this );
     }
 
-    void SAL_CALL SubComponentLoader::windowHidden( const EventObject& i_rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL SubComponentLoader::windowHidden( const EventObject& i_rEvent )
     {
         // not interested in
         (void)i_rEvent;
     }
 
-    void SAL_CALL SubComponentLoader::disposing( const EventObject& i_rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL SubComponentLoader::disposing( const EventObject& i_rEvent )
     {
         // not interested in
         (void)i_rEvent;
diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx
index 0ec0297847b1..c839d2384b43 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.hxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.hxx
@@ -53,13 +53,13 @@ namespace dbaccess
         );
 
         // XWindowListener
-        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override;
+        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override;
+        virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) 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;
 
     protected:
         virtual ~SubComponentLoader() override;
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 220964ab0d40..7e43408bc6f1 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -252,14 +252,14 @@ namespace dbaccess
 
     public:
         // XDocumentHandler
-        virtual void SAL_CALL startDocument(  ) throw (SAXException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL endDocument(  ) throw (SAXException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL endElement( const OUString& aName ) throw (SAXException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException, std::exception) override;
+        virtual void SAL_CALL startDocument(  ) override;
+        virtual void SAL_CALL endDocument(  ) override;
+        virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) override;
+        virtual void SAL_CALL endElement( const OUString& aName ) override;
+        virtual void SAL_CALL characters( const OUString& aChars ) override;
+        virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+        virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+        virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) override;
 
         const ::comphelper::NamedValueCollection&   getSettings() const { return m_aSettings; }
 
@@ -268,15 +268,15 @@ namespace dbaccess
         ::comphelper::NamedValueCollection                  m_aSettings;
     };
 
-    void SAL_CALL SettingsDocumentHandler::startDocument(  ) throw (SAXException, RuntimeException, std::exception)
+    void SAL_CALL SettingsDocumentHandler::startDocument(  )
     {
     }
 
-    void SAL_CALL SettingsDocumentHandler::endDocument(  ) throw (SAXException, RuntimeException, std::exception)
+    void SAL_CALL SettingsDocumentHandler::endDocument(  )
     {
     }
 
-    void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException, std::exception)
+    void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs )
     {
         ::rtl::Reference< SettingsImport >  pNewState;
 
@@ -307,7 +307,7 @@ namespace dbaccess
         m_aStates.push( pNewState );
     }
 
-    void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) throw (SAXException, RuntimeException, std::exception)
+    void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name )
     {
         ENSURE_OR_THROW( !m_aStates.empty(), "no active element" );
         (void)i_Name;
@@ -317,7 +317,7 @@ namespace dbaccess
         m_aStates.pop();
     }
 
-    void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) throw (SAXException, RuntimeException, std::exception)
+    void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars )
     {
         ENSURE_OR_THROW( !m_aStates.empty(), "no active element" );
 
@@ -325,20 +325,20 @@ namespace dbaccess
         pCurrentState->characters( i_Chars );
     }
 
-    void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException, std::exception)
+    void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces )
     {
         // ignore them - that's why they're called "ignorable"
         (void)aWhitespaces;
     }
 
-    void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) throw (SAXException, RuntimeException, std::exception)
+    void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data )
     {
         OSL_FAIL( "SettingsDocumentHandler::processingInstruction: unexpected ..." );
         (void)i_Target;
         (void)i_Data;
     }
 
-    void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) throw (SAXException, RuntimeException, std::exception)
+    void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator )
     {
         (void)i_Locator;
     }
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index e663add04934..d20e6246617e 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -61,17 +61,17 @@ namespace dbmm
         explicit MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext );
 
         // XTypeProvider
-        virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) override;
+        virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XPropertySet
-        virtual Reference< XPropertySetInfo >  SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override;
+        virtual Reference< XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
@@ -80,9 +80,9 @@ namespace dbmm
         // helper for factories
         static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext );
         /// @throws RuntimeException
-        static OUString SAL_CALL getImplementationName_static() throw(RuntimeException);
+        static OUString SAL_CALL getImplementationName_static();
         /// @throws RuntimeException
-        static Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw(RuntimeException);
+        static Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
 
     protected:
         virtual ~MacroMigrationDialogService() override;
@@ -123,33 +123,33 @@ namespace dbmm
         return VclPtr<MacroMigrationDialog>::Create( _pParent, m_aContext, m_xDocument );
     }
 
-    Sequence< sal_Int8 > SAL_CALL MacroMigrationDialogService::getImplementationId() throw(RuntimeException, std::exception)
+    Sequence< sal_Int8 > SAL_CALL MacroMigrationDialogService::getImplementationId()
     {
         return css::uno::Sequence<sal_Int8>();
     }
 
-    OUString SAL_CALL MacroMigrationDialogService::getImplementationName_static() throw(RuntimeException)
+    OUString SAL_CALL MacroMigrationDialogService::getImplementationName_static()
     {
         return OUString( "com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService" );
     }
 
-    Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames_static() throw(RuntimeException)
+    Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames_static()
     {
         Sequence< OUString > aServices { "com.sun.star.sdb.application.MacroMigrationWizard" };
         return aServices;
     }
 
-    OUString SAL_CALL MacroMigrationDialogService::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL MacroMigrationDialogService::getImplementationName()
     {
         return getImplementationName_static();
     }
 
-    Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames()
     {
         return getSupportedServiceNames_static();
     }
 
-    void SAL_CALL MacroMigrationDialogService::initialize( const Sequence< Any >& _rArguments ) throw(Exception, RuntimeException, std::exception)
+    void SAL_CALL MacroMigrationDialogService::initialize( const Sequence< Any >& _rArguments )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_bInitialized )
@@ -181,7 +181,7 @@ namespace dbmm
         m_bInitialized = true;
     }
 
-    Reference< XPropertySetInfo > SAL_CALL MacroMigrationDialogService::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL MacroMigrationDialogService::getPropertySetInfo()
     {
         return createPropertySetInfo( getInfoHelper() );
     }
diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx
index 37dc871b4c06..daaba9d2d26d 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.cxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.cxx
@@ -59,35 +59,35 @@ namespace dbmm
         m_pData->bDisposed = true;
     }
 
-    void SAL_CALL ProgressCapture::start( const OUString& _rText, ::sal_Int32 _nRange ) throw (RuntimeException, std::exception)
+    void SAL_CALL ProgressCapture::start( const OUString& _rText, ::sal_Int32 _nRange )
     {
         SolarMutexGuard aGuard;
         if ( !m_pData->bDisposed )
             m_pData->rMasterProgress.startObject( m_pData->sObjectName, _rText, _nRange );
     }
 
-    void SAL_CALL ProgressCapture::end(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL ProgressCapture::end(  )
     {
         SolarMutexGuard aGuard;
         if ( !m_pData->bDisposed )
             m_pData->rMasterProgress.endObject();
     }
 
-    void SAL_CALL ProgressCapture::setText( const OUString& _rText ) throw (RuntimeException, std::exception)
+    void SAL_CALL ProgressCapture::setText( const OUString& _rText )
     {
         SolarMutexGuard aGuard;
         if ( !m_pData->bDisposed )
             m_pData->rMasterProgress.setObjectProgressText( _rText );
     }
 
-    void SAL_CALL ProgressCapture::setValue( ::sal_Int32 _nValue ) throw (RuntimeException, std::exception)
+    void SAL_CALL ProgressCapture::setValue( ::sal_Int32 _nValue )
     {
         SolarMutexGuard aGuard;
         if ( !m_pData->bDisposed )
             m_pData->rMasterProgress.setObjectProgressValue( _nValue );
     }
 
-    void SAL_CALL ProgressCapture::reset(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL ProgressCapture::reset(  )
     {
         OSL_FAIL( "ProgressCapture::reset: not implemented!" );
     }
diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx
index e273e1a425b4..17cffd514eb0 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.hxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.hxx
@@ -45,11 +45,11 @@ namespace dbmm
         void    dispose();
 
         // XStatusIndicator
-        virtual void SAL_CALL start( const OUString& Text, ::sal_Int32 Range ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL end(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setText( const OUString& Text ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( ::sal_Int32 Value ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL reset(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL start( const OUString& Text, ::sal_Int32 Range ) override;
+        virtual void SAL_CALL end(  ) override;
+        virtual void SAL_CALL setText( const OUString& Text ) override;
+        virtual void SAL_CALL setValue( ::sal_Int32 Value ) override;
+        virtual void SAL_CALL reset(  ) override;
 
     protected:
         virtual ~ProgressCapture() override;
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index bade845ff55a..4a53e8377dc0 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -100,9 +100,9 @@ public:
     explicit DBTypeDetection(const Reference< XComponentContext >&);
 
     // XServiceInfo
-    OUString                        SAL_CALL getImplementationName() throw(std::exception  ) override;
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  ) override;
-    Sequence< OUString >            SAL_CALL getSupportedServiceNames() throw(std::exception  ) override;
+    OUString                        SAL_CALL getImplementationName() override;
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) override;
+    Sequence< OUString >            SAL_CALL getSupportedServiceNames() override;
 
     // static methods
     static OUString                 getImplementationName_Static() throw(  )
@@ -113,7 +113,7 @@ public:
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
-    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override;
 };
 
 DBTypeDetection::DBTypeDetection(const Reference< XComponentContext >& _rxContext)
@@ -121,7 +121,7 @@ DBTypeDetection::DBTypeDetection(const Reference< XComponentContext >& _rxContex
 {
 }
 
-OUString SAL_CALL DBTypeDetection::detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL DBTypeDetection::detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor )
 {
     try
     {
@@ -188,19 +188,19 @@ Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMult
 }
 
 // XServiceInfo
-OUString SAL_CALL DBTypeDetection::getImplementationName() throw(std::exception  )
+OUString SAL_CALL DBTypeDetection::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL DBTypeDetection::supportsService(const OUString& ServiceName) throw(std::exception  )
+sal_Bool SAL_CALL DBTypeDetection::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames() throw(std::exception  )
+Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -235,9 +235,9 @@ public:
     explicit DBContentLoader(const Reference< XComponentContext >&);
 
     // XServiceInfo
-    OUString                        SAL_CALL getImplementationName() throw(std::exception  ) override;
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  ) override;
-    Sequence< OUString >            SAL_CALL getSupportedServiceNames() throw(std::exception  ) override;
+    OUString                        SAL_CALL getImplementationName() override;
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) override;
+    Sequence< OUString >            SAL_CALL getSupportedServiceNames() override;
 
     // static methods
     static OUString                 getImplementationName_Static() throw(  )
@@ -251,8 +251,8 @@ public:
     // XLoader
     virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL,
                                 const Sequence< PropertyValue >& _rArgs,
-                                const Reference< XLoadEventListener > & _rListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel() throw(std::exception) override;
+                                const Reference< XLoadEventListener > & _rListener) override;
+    virtual void SAL_CALL cancel() override;
 
 private:
     bool impl_executeNewDatabaseWizard( Reference< XModel >& _rxModel, bool& _bShouldStartTableWizard );
@@ -272,19 +272,19 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult
 }
 
 // XServiceInfo
-OUString SAL_CALL DBContentLoader::getImplementationName() throw(std::exception  )
+OUString SAL_CALL DBContentLoader::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName) throw(std::exception  )
+sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames() throw(std::exception  )
+Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -367,7 +367,7 @@ bool DBContentLoader::impl_executeNewDatabaseWizard( Reference< XModel >& _rxMod
 
 void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OUString& _rURL,
         const Sequence< PropertyValue >& rArgs,
-        const Reference< XLoadEventListener > & rListener) throw(css::uno::RuntimeException, std::exception)
+        const Reference< XLoadEventListener > & rListener)
 {
     // first check if preview is true, if so return with out creating a controller. Preview is not supported
     ::comphelper::NamedValueCollection aMediaDesc( rArgs );
@@ -550,7 +550,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
         ::comphelper::disposeComponent(xModel);
 }
 
-void DBContentLoader::cancel() throw(std::exception)
+void DBContentLoader::cancel()
 {
 }
 
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 069e1a97b692..8f096cb437a6 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -68,18 +68,18 @@ namespace dbaxml
     {
     public:
         /// @throws RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws RuntimeException
-        static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(RuntimeException);
+        static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
     };
     class ODBFullExportHelper
     {
     public:
         /// @throws RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws RuntimeException
-        static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(RuntimeException);
+        static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
     };
 }
@@ -112,12 +112,12 @@ namespace dbaxml
         return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::SETTINGS | SvXMLExportFlags::PRETTY ));
     }
 
-    OUString SAL_CALL ODBExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+    OUString SAL_CALL ODBExportHelper::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.sdb.XMLSettingsExporter");
     }
 
-    Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+    Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
         return aSupported;
@@ -127,11 +127,11 @@ namespace dbaxml
     {
         return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::ALL));
     }
-    OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+    OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.sdb.XMLFullExporter");
     }
-    Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+    Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
         return aSupported;
@@ -253,13 +253,11 @@ ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext, OUString
 }
 
 OUString ODBExport::getImplementationName_Static()
-    throw (css::uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.sdb.DBExportFilter");
 }
 
 css::uno::Sequence<OUString> ODBExport::getSupportedServiceNames_Static()
-    throw (css::uno::RuntimeException)
 {
     css::uno::Sequence<OUString> s { "com.sun.star.document.ExportFilter" };
     return s;
@@ -1387,7 +1385,7 @@ SvXMLAutoStylePoolP* ODBExport::CreateAutoStylePool()
     return new OXMLAutoStylePoolP(*this);
 }
 
-void SAL_CALL ODBExport::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL ODBExport::setSourceDocument( const Reference< XComponent >& xDoc )
 {
     Reference<XOfficeDatabaseDocument> xOfficeDoc(xDoc,UNO_QUERY_THROW);
     m_xDataSource.set(xOfficeDoc->getDataSource(),UNO_QUERY_THROW);
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index c0c6904f85e1..840ea95c8f0a 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -172,12 +172,11 @@ public:
     ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::PRETTY | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::SCRIPTS );
 
     /// @throws css::uno::RuntimeException
-    static OUString SAL_CALL getImplementationName_Static()
-        throw (css::uno::RuntimeException);
+    static OUString SAL_CALL getImplementationName_Static();
 
     /// @throws css::uno::RuntimeException
     static css::uno::Sequence<OUString> SAL_CALL
-    getSupportedServiceNames_Static() throw (css::uno::RuntimeException);
+    getSupportedServiceNames_Static();
 
     static css::uno::Reference<css::uno::XInterface> SAL_CALL Create(
         css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB);
@@ -186,7 +185,7 @@ public:
     rtl::Reference < XMLPropertySetMapper > const & GetCellStylesPropertySetMapper() const;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     const Reference<XPropertySet>& getDataSource() const { return m_xDataSource; }
 };
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 134ad6492982..04197f605f34 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -224,14 +224,12 @@ ODBFilter::~ODBFilter() throw()
 
 
 OUString ODBFilter::getImplementationName_Static()
-    throw (css::uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.sdb.DBFilter");
 }
 
 
 css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static()
-    throw (css::uno::RuntimeException)
 {
     css::uno::Sequence<OUString> s { "com.sun.star.document.ImportFilter" };
     return s;
@@ -246,7 +244,6 @@ css::uno::Reference< css::uno::XInterface >
 
 
 sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor )
-    throw (RuntimeException, std::exception)
 {
     uno::Reference< css::awt::XWindow > xWindow;
     {
@@ -274,7 +271,6 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto
 
 
 bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
-    throw (RuntimeException, std::exception)
 {
     OUString sFileName;
     ::comphelper::NamedValueCollection aMediaDescriptor( rDescriptor );
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 133a61d33fa7..171320c6fac3 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -82,7 +82,7 @@ private:
     bool                                            m_bNewFormat;
 
     /// @throws RuntimeException
-    bool                            implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
+    bool                            implImport( const Sequence< PropertyValue >& rDescriptor );
 
     /** fills the map with the Properties
         @param  _rValue
@@ -107,15 +107,14 @@ public:
     explicit ODBFilter( const Reference< XComponentContext >& _rxContext );
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) override;
 
     /// @throws css::uno::RuntimeException
-    static OUString SAL_CALL getImplementationName_Static()
-        throw (css::uno::RuntimeException);
+    static OUString SAL_CALL getImplementationName_Static();
 
     /// @throws css::uno::RuntimeException
     static css::uno::Sequence<OUString> SAL_CALL
-    getSupportedServiceNames_Static() throw (css::uno::RuntimeException);
+    getSupportedServiceNames_Static();
 
     static css::uno::Reference<css::uno::XInterface> SAL_CALL Create(
         css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB);
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx
index cdb7b4055a31..1f6a9f236470 100644
--- a/dbaccess/source/inc/OAuthenticationContinuation.hxx
+++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx
@@ -44,18 +44,18 @@ class OOO_DLLPUBLIC_DBA OAuthenticationContinuation :
 public:
     OAuthenticationContinuation();
 
-    sal_Bool SAL_CALL canSetRealm(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setRealm( const OUString& Realm ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL canSetUserName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setUserName( const OUString& UserName ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL canSetPassword(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setPassword( const OUString& Password ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::ucb::RememberAuthentication > SAL_CALL getRememberPasswordModes( css::ucb::RememberAuthentication& Default ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setRememberPassword( css::ucb::RememberAuthentication Remember ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL canSetAccount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setAccount( const OUString& Account ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::ucb::RememberAuthentication > SAL_CALL getRememberAccountModes( css::ucb::RememberAuthentication& Default ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setRememberAccount( css::ucb::RememberAuthentication Remember ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL canSetRealm(  ) override;
+    void SAL_CALL setRealm( const OUString& Realm ) override;
+    sal_Bool SAL_CALL canSetUserName(  ) override;
+    void SAL_CALL setUserName( const OUString& UserName ) override;
+    sal_Bool SAL_CALL canSetPassword(  ) override;
+    void SAL_CALL setPassword( const OUString& Password ) override;
+    css::uno::Sequence< css::ucb::RememberAuthentication > SAL_CALL getRememberPasswordModes( css::ucb::RememberAuthentication& Default ) override;
+    void SAL_CALL setRememberPassword( css::ucb::RememberAuthentication Remember ) override;
+    sal_Bool SAL_CALL canSetAccount(  ) override;
+    void SAL_CALL setAccount( const OUString& Account ) override;
+    css::uno::Sequence< css::ucb::RememberAuthentication > SAL_CALL getRememberAccountModes( css::ucb::RememberAuthentication& Default ) override;
+    void SAL_CALL setRememberAccount( css::ucb::RememberAuthentication Remember ) override;
 
     void            setCanChangeUserName( bool bVal )  { m_bCanSetUserName = bVal; }
     const OUString& getUser() const             { return m_sUser; }
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 9561bb6d2d5c..e8f30cdd156f 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -45,11 +45,10 @@ public:
                   const css::uno::Reference< css::uno::XInterface >& _xParent);
 
 // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
 // css::uno::XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-            throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL release() throw() override;
 
     inline operator css::uno::Reference< css::uno::XInterface > () const
@@ -61,23 +60,23 @@ public:
 
 // (internal - not to be used outside - usually)
 #define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname)   \
-    OUString SAL_CALL classname::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)   \
+    OUString SAL_CALL classname::getImplementationName(  )   \
     {   \
         return OUString(implasciiname); \
     }   \
 
 #define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname)    \
-    OUString SAL_CALL classname::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)   \
+    OUString SAL_CALL classname::getImplementationName(  )   \
     {   \
         return getImplementationName_Static();  \
     }   \
-    OUString SAL_CALL classname::getImplementationName_Static(  ) throw (css::uno::RuntimeException)    \
+    OUString SAL_CALL classname::getImplementationName_Static(  )    \
     {   \
         return OUString(implasciiname); \
     }   \
 
 #define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
-    sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) \
+    sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) \
     {   \
         css::uno::Sequence< OUString > aSupported(getSupportedServiceNames());  \
         const OUString* pSupported = aSupported.getConstArray(); \
@@ -89,22 +88,22 @@ public:
     }   \
 
 #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname)    \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)  \
+    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  )  \
     {   \
         return getSupportedServiceNames_Static();   \
     }   \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException)   \
+    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static(  )   \
     {   \
         css::uno::Sequence< OUString > aSupported { serviceasciiname }; \
         return aSupported;  \
     }   \
 
 #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2)    \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)  \
+    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  )  \
     {   \
         return getSupportedServiceNames_Static();   \
     }   \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException)   \
+    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static(  )   \
     {   \
         css::uno::Sequence< OUString > aSupported(2);   \
         aSupported[0] = serviceasciiname1;    \
@@ -115,7 +114,7 @@ public:
 #define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
     IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname)   \
     IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)  \
+    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  )  \
     {   \
         return css::uno::Sequence< OUString > { serviceasciiname }; \
     }   \
@@ -124,7 +123,7 @@ public:
 #define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
     IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname)   \
     IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)  \
+    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  )  \
     {   \
         return css::uno::Sequence< OUString > { serviceasciiname1, serviceasciiname2 };    \
     }
@@ -144,7 +143,7 @@ public:
 #define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3)  \
     IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname)   \
     IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)  \
+    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  )  \
     {   \
         return css::uno::Sequence< OUString > { serviceasciiname1, serviceasciiname2, serviceasciiname3 };  \
     }   \
@@ -167,13 +166,13 @@ css::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \
     }   \
     return pId->getImplementationId();  \
 } \
-css::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (css::uno::RuntimeException, std::exception)    \
+css::uno::Sequence< sal_Int8 > classname::getImplementationId()    \
 {   \
     return css::uno::Sequence<sal_Int8>(); \
 }
 
 #define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 )    \
-    css::uno::Sequence< css::uno::Type > classname::getTypes() throw (css::uno::RuntimeException, std::exception)    \
+    css::uno::Sequence< css::uno::Type > classname::getTypes()    \
     {   \
         return  ::comphelper::concatSequences(  \
             baseclass1::getTypes( ),    \
@@ -182,7 +181,7 @@ css::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (css::uno:
     }
 
 #define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 )    \
-    css::uno::Sequence< css::uno::Type > classname::getTypes() throw (css::uno::RuntimeException, std::exception)    \
+    css::uno::Sequence< css::uno::Type > classname::getTypes()    \
     {   \
         return  ::comphelper::concatSequences(  \
             baseclass1::getTypes( ),    \
@@ -193,12 +192,12 @@ css::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (css::uno:
 
 // helper for declaring/implementing classes based on the OPropertyContainer and an OPropertyArrayUsageHelper
 #define DECLARE_PROPERTYCONTAINER_DEFAULTS( )   \
-    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; \
+    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override; \
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; \
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override
 
 #define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1)  \
-    css::uno::Reference< css::beans::XPropertySetInfo >  SAL_CALL classname::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception)  \
+    css::uno::Reference< css::beans::XPropertySetInfo >  SAL_CALL classname::getPropertySetInfo()  \
     {   \
         Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );    \
         return xInfo;   \
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 8884789149ae..cbc269aa6305 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -63,24 +63,24 @@ namespace sdbtools
     {
     }
 
-    Reference< XTableName > SAL_CALL ConnectionTools::createTableName() throw (RuntimeException, std::exception)
+    Reference< XTableName > SAL_CALL ConnectionTools::createTableName()
     {
         EntryGuard aGuard( *this );
         return new TableName( getContext(), getConnection() );
     }
 
-    Reference< XObjectNames > SAL_CALL ConnectionTools::getObjectNames() throw (RuntimeException, std::exception)
+    Reference< XObjectNames > SAL_CALL ConnectionTools::getObjectNames()
     {
         EntryGuard aGuard( *this );
         return new ObjectNames( getContext(), getConnection() );
     }
 
-    Reference< XDataSourceMetaData > SAL_CALL ConnectionTools::getDataSourceMetaData() throw (RuntimeException, std::exception)
+    Reference< XDataSourceMetaData > SAL_CALL ConnectionTools::getDataSourceMetaData()
     {
         EntryGuard aGuard( *this );
         return new DataSourceMetaData( getContext(), getConnection() );
     }
-    Reference< container::XNameAccess > SAL_CALL ConnectionTools::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, Reference< lang::XComponent >& keepFieldsAlive ) throw (sdbc::SQLException, RuntimeException, std::exception)
+    Reference< container::XNameAccess > SAL_CALL ConnectionTools::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, Reference< lang::XComponent >& keepFieldsAlive )
     {
         EntryGuard aGuard( *this );
         ::dbtools::SQLExceptionInfo aErrorInfo;
@@ -89,7 +89,7 @@ namespace sdbtools
             aErrorInfo.doThrow();
         return xRet;
     }
-    Reference< sdb::XSingleSelectQueryComposer > SAL_CALL ConnectionTools::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (css::uno::RuntimeException, std::exception)
+    Reference< sdb::XSingleSelectQueryComposer > SAL_CALL ConnectionTools::getComposer( ::sal_Int32 commandType, const OUString& command )
     {
         EntryGuard aGuard( *this );
         dbtools::StatementComposer aComposer(getConnection(), command, commandType, true );
@@ -97,17 +97,17 @@ namespace sdbtools
         return aComposer.getComposer();
     }
 
-    OUString SAL_CALL ConnectionTools::getImplementationName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL ConnectionTools::getImplementationName()
     {
         return getImplementationName_static();
     }
 
-    sal_Bool SAL_CALL ConnectionTools::supportsService(const OUString & ServiceName) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL ConnectionTools::supportsService(const OUString & ServiceName)
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames()
     {
         return getSupportedServiceNames_static();
     }
@@ -128,7 +128,7 @@ namespace sdbtools
         return *( new ConnectionTools( Reference<XComponentContext>( _rxContext ) ) );
     }
 
-    void SAL_CALL ConnectionTools::initialize(const Sequence< Any > & _rArguments) throw (RuntimeException, Exception, std::exception)
+    void SAL_CALL ConnectionTools::initialize(const Sequence< Any > & _rArguments)
     {
         ::osl::MutexGuard aGuard( getMutex() );
 
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx
index c1f630156232..4eb9ed23354b 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx
@@ -56,16 +56,16 @@ namespace sdbtools
         explicit ConnectionTools( const css::uno::Reference< css::uno::XComponentContext >& _rContext );
 
         // XConnectionTools
-        virtual css::uno::Reference< css::sdb::tools::XTableName > SAL_CALL createTableName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdb::tools::XObjectNames > SAL_CALL getObjectNames() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdb::tools::XTableName > SAL_CALL createTableName() override;
+        virtual css::uno::Reference< css::sdb::tools::XObjectNames > SAL_CALL getObjectNames() override;
+        virtual css::uno::Reference< css::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData() override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) override;
+        virtual css::uno::Reference< css::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XServiceInfo - static versions
         static OUString SAL_CALL getImplementationName_static();
@@ -74,7 +74,7 @@ namespace sdbtools
                         Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
         // XInitialization
-        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
 
     protected:
         virtual ~ConnectionTools() override;
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
index f15cb89416cc..cc63b014297e 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
@@ -41,7 +41,7 @@ namespace sdbtools
     {
     }
 
-    sal_Bool SAL_CALL DataSourceMetaData::supportsQueriesInFrom(  ) throw (RuntimeException, SQLException, std::exception)
+    sal_Bool SAL_CALL DataSourceMetaData::supportsQueriesInFrom(  )
     {
         EntryGuard aGuard( *this );
         ::dbtools::DatabaseMetaData aMeta( getConnection() );
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
index 9ebbb88e1c90..ba576b7539d4 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
@@ -55,7 +55,7 @@ namespace sdbtools
         );
 
         // XDataSourceMetaData
-        virtual sal_Bool SAL_CALL supportsQueriesInFrom() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsQueriesInFrom() override;
 
     protected:
         virtual ~DataSourceMetaData() override;
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index d48f14e3efc0..921c8a1b65bc 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -364,7 +364,7 @@ namespace sdbtools
     {
     }
 
-    OUString SAL_CALL ObjectNames::suggestName( ::sal_Int32 CommandType, const OUString& BaseName ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception)
+    OUString SAL_CALL ObjectNames::suggestName( ::sal_Int32 CommandType, const OUString& BaseName )
     {
         EntryGuard aGuard( *this );
 
@@ -393,14 +393,14 @@ namespace sdbtools
         return sName;
     }
 
-    OUString SAL_CALL ObjectNames::convertToSQLName( const OUString& Name ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL ObjectNames::convertToSQLName( const OUString& Name )
     {
         EntryGuard aGuard( *this );
         Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), UNO_QUERY_THROW );
         return ::dbtools::convertName2SQLName( Name, xMeta->getExtraNameCharacters() );
     }
 
-    sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 CommandType, const OUString& Name ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 CommandType, const OUString& Name )
     {
         EntryGuard aGuard( *this );
 
@@ -408,7 +408,7 @@ namespace sdbtools
         return !pNameCheck->validateName( Name );
     }
 
-    sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 CommandType, const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 CommandType, const OUString& Name )
     {
         EntryGuard aGuard( *this );
 
@@ -416,7 +416,7 @@ namespace sdbtools
         return pNameCheck->validateName( Name );
     }
 
-    void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 CommandType, const OUString& Name ) throw (SQLException, RuntimeException, std::exception)
+    void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 CommandType, const OUString& Name )
     {
         EntryGuard aGuard( *this );
 
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx
index 09919fc3a0e8..6a74c457aadc 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -60,11 +60,11 @@ namespace sdbtools
         );
 
         // XObjectNames
-        virtual OUString SAL_CALL suggestName( ::sal_Int32 CommandType, const OUString& BaseName ) throw (css::lang::IllegalArgumentException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL convertToSQLName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isNameUsed( ::sal_Int32 CommandType, const OUString& Name ) throw (css::lang::IllegalArgumentException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isNameValid( ::sal_Int32 CommandType, const OUString& Name ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL checkNameForCreate( ::sal_Int32 CommandType, const OUString& Name ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL suggestName( ::sal_Int32 CommandType, const OUString& BaseName ) override;
+        virtual OUString SAL_CALL convertToSQLName( const OUString& Name ) override;
+        virtual sal_Bool SAL_CALL isNameUsed( ::sal_Int32 CommandType, const OUString& Name ) override;
+        virtual sal_Bool SAL_CALL isNameValid( ::sal_Int32 CommandType, const OUString& Name ) override;
+        virtual void SAL_CALL checkNameForCreate( ::sal_Int32 CommandType, const OUString& Name ) override;
 
     protected:
         virtual ~ObjectNames() override;
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index f47331a2a8c6..08ea5adcb9bb 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -72,49 +72,49 @@ namespace sdbtools
     {
     }
 
-    OUString SAL_CALL TableName::getCatalogName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL TableName::getCatalogName()
     {
         EntryGuard aGuard( *this );
         return m_pImpl->sCatalog;
     }
 
-    void SAL_CALL TableName::setCatalogName( const OUString& _catalogName ) throw (RuntimeException, std::exception)
+    void SAL_CALL TableName::setCatalogName( const OUString& _catalogName )
     {
         EntryGuard aGuard( *this );
         m_pImpl->sCatalog = _catalogName;
     }
 
-    OUString SAL_CALL TableName::getSchemaName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL TableName::getSchemaName()
     {
         EntryGuard aGuard( *this );
         return m_pImpl->sSchema;
     }
 
-    void SAL_CALL TableName::setSchemaName( const OUString& _schemaName ) throw (RuntimeException, std::exception)
+    void SAL_CALL TableName::setSchemaName( const OUString& _schemaName )
     {
         EntryGuard aGuard( *this );
         m_pImpl->sSchema = _schemaName;
     }
 
-    OUString SAL_CALL TableName::getTableName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL TableName::getTableName()
     {
         EntryGuard aGuard( *this );
         return m_pImpl->sName;
     }
 
-    void SAL_CALL TableName::setTableName( const OUString& _tableName ) throw (RuntimeException, std::exception)
+    void SAL_CALL TableName::setTableName( const OUString& _tableName )
     {
         EntryGuard aGuard( *this );
         m_pImpl->sName = _tableName;
     }
 
-    OUString SAL_CALL TableName::getNameForSelect() throw (RuntimeException, std::exception)
+    OUString SAL_CALL TableName::getNameForSelect()
     {
         EntryGuard aGuard( *this );
         return composeTableNameForSelect( getConnection(), m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName );
     }
 
-    Reference< XPropertySet > SAL_CALL TableName::getTable() throw (NoSuchElementException, RuntimeException, std::exception)
+    Reference< XPropertySet > SAL_CALL TableName::getTable()
     {
         EntryGuard aGuard( *this );
 
@@ -141,7 +141,7 @@ namespace sdbtools
         return xTable;
     }
 
-    void SAL_CALL TableName::setTable( const Reference< XPropertySet >& _table ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL TableName::setTable( const Reference< XPropertySet >& _table )
     {
         EntryGuard aGuard( *this );
 
@@ -208,7 +208,7 @@ namespace sdbtools
         }
     }
 
-    OUString SAL_CALL TableName::getComposedName( ::sal_Int32 Type, sal_Bool Quote ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    OUString SAL_CALL TableName::getComposedName( ::sal_Int32 Type, sal_Bool Quote )
     {
         EntryGuard aGuard( *this );
 
@@ -218,7 +218,7 @@ namespace sdbtools
             lcl_translateCompositionType_throw( Type ) );
     }
 
-    void SAL_CALL TableName::setComposedName( const OUString& ComposedName, ::sal_Int32 Type ) throw (RuntimeException, std::exception)
+    void SAL_CALL TableName::setComposedName( const OUString& ComposedName, ::sal_Int32 Type )
     {
         EntryGuard aGuard( *this );
 
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx
index 1087b4ae5749..aec5f9c17d94 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -60,17 +60,17 @@ namespace sdbtools
         );
 
         // XTableName
-        virtual OUString SAL_CALL getCatalogName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCatalogName( const OUString& _catalogname ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSchemaName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setSchemaName( const OUString& _schemaname ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTableName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTableName( const OUString& _tablename ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNameForSelect() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getTable() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTable( const css::uno::Reference< css::beans::XPropertySet >& _table ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getComposedName( ::sal_Int32 Type, sal_Bool Quote ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setComposedName( const OUString& ComposedName, ::sal_Int32 Type ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getCatalogName() override;
+        virtual void SAL_CALL setCatalogName( const OUString& _catalogname ) override;
+        virtual OUString SAL_CALL getSchemaName() override;
+        virtual void SAL_CALL setSchemaName( const OUString& _schemaname ) override;
+        virtual OUString SAL_CALL getTableName() override;
+        virtual void SAL_CALL setTableName( const OUString& _tablename ) override;
+        virtual OUString SAL_CALL getNameForSelect() override;
+        virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getTable() override;
+        virtual void SAL_CALL setTable( const css::uno::Reference< css::beans::XPropertySet >& _table ) override;
+        virtual OUString SAL_CALL getComposedName( ::sal_Int32 Type, sal_Bool Quote ) override;
+        virtual void SAL_CALL setComposedName( const OUString& ComposedName, ::sal_Int32 Type ) override;
 
     protected:
         virtual ~TableName() override;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 9a8ae98fda57..e3533ddf65aa 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -155,23 +155,23 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
 namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
 namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
 
-OUString SAL_CALL OApplicationController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL OApplicationController::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString OApplicationController::getImplementationName_Static() throw( RuntimeException )
+OUString OApplicationController::getImplementationName_Static()
 {
     return OUString(SERVICE_SDB_APPLICATIONCONTROLLER);
 }
 
-Sequence< OUString> OApplicationController::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString> OApplicationController::getSupportedServiceNames_Static()
 {
     Sequence<OUString> aSupported { "com.sun.star.sdb.application.DefaultViewController" };
     return aSupported;
 }
 
-Sequence< OUString> SAL_CALL OApplicationController::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString> SAL_CALL OApplicationController::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -450,7 +450,7 @@ bool OApplicationController::Construct(vcl::Window* _pParent)
     return true;
 }
 
-void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) throw( RuntimeException, std::exception )
+void SAL_CALL OApplicationController::disposing(const EventObject& _rSource)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     Reference<XConnection> xCon(_rSource.Source, UNO_QUERY);
@@ -488,7 +488,7 @@ void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) thr
     }
 }
 
-sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend)
 {
     // notify the OnPrepareViewClosing event (before locking any mutex)
     Reference< XDocumentEventBroadcaster > xBroadcaster( m_xModel, UNO_QUERY );
@@ -1501,7 +1501,7 @@ OApplicationView*   OApplicationController::getContainer() const
 }
 
 // css::container::XContainerListener
-void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rEvent )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -1537,7 +1537,7 @@ void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rE
     }
 }
 
-void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEvent )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -1571,7 +1571,7 @@ void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEv
     }
 }
 
-void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rEvent )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -2478,7 +2478,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt )
     return DND_ACTION_NONE;
 }
 
-Reference< XModel >  SAL_CALL OApplicationController::getModel() throw( RuntimeException, std::exception )
+Reference< XModel >  SAL_CALL OApplicationController::getModel()
 {
     return m_xModel;
 }
@@ -2557,7 +2557,7 @@ void OApplicationController::OnFirstControllerConnected()
     return;
 }
 
-void SAL_CALL OApplicationController::attachFrame( const Reference< XFrame > & i_rxFrame ) throw( RuntimeException, std::exception )
+void SAL_CALL OApplicationController::attachFrame( const Reference< XFrame > & i_rxFrame )
 {
     SolarMutexGuard aSolarGuard; // avoid deadlock in XModel calls
     ::osl::MutexGuard aGuard( getMutex() );
@@ -2567,7 +2567,7 @@ void SAL_CALL OApplicationController::attachFrame( const Reference< XFrame > & i
         onAttachedFrame();
 }
 
-sal_Bool SAL_CALL OApplicationController::attachModel(const Reference< XModel > & _rxModel) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OApplicationController::attachModel(const Reference< XModel > & _rxModel)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     const Reference< XOfficeDatabaseDocument > xOfficeDoc( _rxModel, UNO_QUERY );
@@ -2694,17 +2694,17 @@ OUString OApplicationController::getCurrentlySelectedName(sal_Int32& _rnCommandT
     return sName;
 }
 
-void SAL_CALL OApplicationController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OApplicationController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener )
 {
     m_pSelectionNotifier->addListener( Listener );
 }
 
-void SAL_CALL OApplicationController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OApplicationController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener )
 {
     m_pSelectionNotifier->removeListener( Listener );
 }
 
-sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -2823,7 +2823,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) throw
     return true;
 }
 
-Any SAL_CALL OApplicationController::getSelection(  ) throw (RuntimeException, std::exception)
+Any SAL_CALL OApplicationController::getSelection(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index a66c08117709..d552e812f154 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -383,54 +383,54 @@ namespace dbaui
         DECLARE_XTYPEPROVIDER( )
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
         // need by registration
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // css::frame::XController
-        virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Reference< css::frame::XModel >  SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) override;
+        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) override;
+        virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) override;
+        virtual css::uno::Reference< css::frame::XModel >  SAL_CALL getModel() override;
 
         // css::container::XContainerListener
-        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) override;
+        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) override;
+        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
         // XDatabaseDocumentUI
-        virtual css::uno::Reference< css::sdbc::XDataSource > SAL_CALL getDataSource() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getApplicationMainWindow() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::lang::XComponent > > SAL_CALL getSubComponents() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isConnected(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XDataSource > SAL_CALL getDataSource() override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getApplicationMainWindow() override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() override;
+        virtual css::uno::Sequence< css::uno::Reference< css::lang::XComponent > > SAL_CALL getSubComponents() override;
+        virtual sal_Bool SAL_CALL isConnected(  ) override;
         // DO NOT CALL with getMutex() held!!
-        virtual void SAL_CALL connect(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::Pair< ::sal_Int32, OUString > SAL_CALL identifySubComponent( const css::uno::Reference< css::lang::XComponent >& SubComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL closeSubComponents(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponent( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentWithArguments( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponent( ::sal_Int32 ObjectType, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) throw (css::lang::IllegalArgumentException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponentWithArguments( ::sal_Int32 ObjectType, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL connect(  ) override;
+        virtual css::beans::Pair< ::sal_Int32, OUString > SAL_CALL identifySubComponent( const css::uno::Reference< css::lang::XComponent >& SubComponent ) override;
+        virtual sal_Bool SAL_CALL closeSubComponents(  ) override;
+        virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponent( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing ) override;
+        virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentWithArguments( ::sal_Int32 ObjectType, const OUString& ObjectName, sal_Bool ForEditing, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
+        virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponent( ::sal_Int32 ObjectType, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) override;
+        virtual css::uno::Reference< css::lang::XComponent > SAL_CALL createComponentWithArguments( ::sal_Int32 ObjectType, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, css::uno::Reference< css::lang::XComponent >& o_DocumentDefinition ) override;
 
         // XContextMenuInterception
-        virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) override;
+        virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) override;
 
         // XSelectionSupplier
-        virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) override;
+        virtual css::uno::Any SAL_CALL getSelection(  ) override;
+        virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+        virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
         /** retrieves the current connection, creates it if necessary
 
@@ -524,7 +524,7 @@ namespace dbaui
 
     protected:
         // 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;
 
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index cf150dda8e22..c4f7fc4bf020 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -238,7 +238,7 @@ void OApplicationController::refreshTables()
     }
 }
 
-void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
+void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent& evt )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -286,14 +286,14 @@ void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent&
     modified(aEvt);
 }
 
-Reference< XDataSource > SAL_CALL OApplicationController::getDataSource() throw (RuntimeException, std::exception)
+Reference< XDataSource > SAL_CALL OApplicationController::getDataSource()
 {
     ::osl::MutexGuard aGuard( getMutex() );
     Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY );
     return xDataSource;
 }
 
-Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow() throw (RuntimeException, std::exception)
+Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow()
 {
     ::osl::MutexGuard aGuard( getMutex() );
     Reference< XFrame > xFrame( getFrame(), UNO_QUERY_THROW );
@@ -301,25 +301,25 @@ Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow()
     return xWindow;
 }
 
-Sequence< Reference< XComponent > > SAL_CALL OApplicationController::getSubComponents() throw (RuntimeException, std::exception)
+Sequence< Reference< XComponent > > SAL_CALL OApplicationController::getSubComponents()
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return m_pSubComponentManager->getSubComponents();
 }
 
-Reference< XConnection > SAL_CALL OApplicationController::getActiveConnection() throw (RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL OApplicationController::getActiveConnection()
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return m_xDataSourceConnection.getTyped();
 }
 
-sal_Bool SAL_CALL OApplicationController::isConnected(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL OApplicationController::isConnected(  )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return m_xDataSourceConnection.is();
 }
 
-void SAL_CALL OApplicationController::connect(  ) throw (SQLException, RuntimeException, std::exception)
+void SAL_CALL OApplicationController::connect(  )
 {
     SQLExceptionInfo aError;
     SharedConnection xConnection = ensureConnection( &aError );
@@ -334,7 +334,7 @@ void SAL_CALL OApplicationController::connect(  ) throw (SQLException, RuntimeEx
     }
 }
 
-beans::Pair< ::sal_Int32, OUString > SAL_CALL OApplicationController::identifySubComponent( const Reference< XComponent >& i_rSubComponent ) throw (IllegalArgumentException, RuntimeException, std::exception)
+beans::Pair< ::sal_Int32, OUString > SAL_CALL OApplicationController::identifySubComponent( const Reference< XComponent >& i_rSubComponent )
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -352,7 +352,7 @@ beans::Pair< ::sal_Int32, OUString > SAL_CALL OApplicationController::identifySu
     return beans::Pair< ::sal_Int32, OUString >( nType, sName );
 }
 
-sal_Bool SAL_CALL OApplicationController::closeSubComponents(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL OApplicationController::closeSubComponents(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -426,13 +426,13 @@ void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int
 }
 
 Reference< XComponent > SAL_CALL OApplicationController::loadComponent( ::sal_Int32 ObjectType,
-    const OUString& ObjectName, sal_Bool ForEditing ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException, std::exception)
+    const OUString& ObjectName, sal_Bool ForEditing )
 {
     return loadComponentWithArguments( ObjectType, ObjectName, ForEditing, Sequence< PropertyValue >() );
 }
 
 Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArguments( ::sal_Int32 ObjectType,
-    const OUString& ObjectName, sal_Bool ForEditing, const Sequence< PropertyValue >& Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException, std::exception)
+    const OUString& ObjectName, sal_Bool ForEditing, const Sequence< PropertyValue >& Arguments )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -450,12 +450,12 @@ Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArgume
     return xComponent;
 }
 
-Reference< XComponent > SAL_CALL OApplicationController::createComponent( ::sal_Int32 i_nObjectType, Reference< XComponent >& o_DocumentDefinition  ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception)
+Reference< XComponent > SAL_CALL OApplicationController::createComponent( ::sal_Int32 i_nObjectType, Reference< XComponent >& o_DocumentDefinition  )
 {
     return createComponentWithArguments( i_nObjectType, Sequence< PropertyValue >(), o_DocumentDefinition );
 }
 
-Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArguments( ::sal_Int32 i_nObjectType, const Sequence< PropertyValue >& i_rArguments, Reference< XComponent >& o_DocumentDefinition ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException, std::exception)
+Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArguments( ::sal_Int32 i_nObjectType, const Sequence< PropertyValue >& i_rArguments, Reference< XComponent >& o_DocumentDefinition )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -471,13 +471,13 @@ Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArgu
     return xComponent;
 }
 
-void SAL_CALL OApplicationController::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL OApplicationController::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor )
 {
     if ( Interceptor.is() )
         m_aContextMenuInterceptors.addInterface( Interceptor );
 }
 
-void SAL_CALL OApplicationController::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL OApplicationController::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor )
 {
     m_aContextMenuInterceptors.removeInterface( Interceptor );
 }
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index 64d58c2c0a60..fbe1bdc05f54 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -330,7 +330,7 @@ namespace dbaui
         }
     }
 
-    void SAL_CALL SubComponentManager::propertyChange( const PropertyChangeEvent& i_rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL SubComponentManager::propertyChange( const PropertyChangeEvent& i_rEvent )
     {
         if ( i_rEvent.PropertyName != PROPERTY_NAME )
             // by definition, it's allowed to broadcast more than what we've registered for
@@ -360,7 +360,7 @@ namespace dbaui
         }
     }
 
-    void SAL_CALL SubComponentManager::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL SubComponentManager::disposing( const EventObject& _rSource )
     {
         ::osl::ClearableMutexGuard aGuard( m_pData->getMutex() );
 
diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx
index 788ec907b3ef..8572f2342e69 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.hxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.hxx
@@ -48,10 +48,10 @@ namespace dbaui
         void    disposing();
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) 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;
 
         // XDatabaseDocumentUI helpers
         css::uno::Sequence< css::uno::Reference< css::lang::XComponent> >
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 6582b37fad1f..ab51cbabe673 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -138,10 +138,10 @@ public:
     const Sequence< PropertyValue >&  getValues() const { return m_aValues; }
 
 // XInteractionSupplyParameters
-    virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) override;
 };
 
-void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception)
+void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues )
 {
     m_aValues = _rValues;
 }
@@ -161,82 +161,82 @@ public:
     explicit FormControllerImpl(SbaXDataBrowserController* pOwner);
 
     // XFormController
-    virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::XControl >  SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() override;
+    virtual css::uno::Reference< css::awt::XControl >  SAL_CALL getCurrentControl() override;
+    virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) override;
+    virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener > & l) override;
+    virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& ChildController ) override;
+    virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() override;
+    virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) override;
+    virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() override;
+    virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) override;
 
     // XChild, base of XFormController
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     // XComponent, base of XFormController
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XIndexAccess, base of XFormController
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
 
     // XElementAccess, base of XIndexAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XEnumerationAccess, base of XElementAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
     // XModifyBroadcaster, base of XFormController
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // XConfirmDeleteBroadcaster, base of XFormController
-    virtual void SAL_CALL addConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) override;
+    virtual void SAL_CALL removeConfirmDeleteListener( const css::uno::Reference< css::form::XConfirmDeleteListener >& aListener ) override;
 
     // XSQLErrorBroadcaster, base of XFormController
-    virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) override;
+    virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& Listener ) override;
 
     // XRowSetApproveBroadcaster, base of XFormController
-    virtual void SAL_CALL addRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) override;
+    virtual void SAL_CALL removeRowSetApproveListener( const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener ) override;
 
     // XDatabaseParameterBroadcaster2, base of XFormController
-    virtual void SAL_CALL addDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) override;
+    virtual void SAL_CALL removeDatabaseParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) override;
 
     // XDatabaseParameterBroadcaster, base of XDatabaseParameterBroadcaster2
-    virtual void SAL_CALL addParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) override;
+    virtual void SAL_CALL removeParameterListener( const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener ) override;
 
     // XModeSelector, base of XFormController
-    virtual void SAL_CALL setMode( const OUString& aMode ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getMode(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setMode( const OUString& aMode ) override;
+    virtual OUString SAL_CALL getMode(  ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes(  ) override;
+    virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) override;
 
     // XTabController, base of XFormController
-    virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel > & Model) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::awt::XTabControllerModel >  SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer > & Container) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::awt::XControlContainer >  SAL_CALL getContainer() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl >  > SAL_CALL getControls() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL autoTabOrder() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL activateTabOrder() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL activateFirst() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL activateLast() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel > & Model) override;
+    virtual css::uno::Reference< css::awt::XTabControllerModel >  SAL_CALL getModel() override;
+    virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer > & Container) override;
+    virtual css::uno::Reference< css::awt::XControlContainer >  SAL_CALL getContainer() override;
+    virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl >  > SAL_CALL getControls() override;
+    virtual void SAL_CALL autoTabOrder() override;
+    virtual void SAL_CALL activateTabOrder() override;
+    virtual void SAL_CALL activateFirst() override;
+    virtual void SAL_CALL activateLast() override;
 
     // XFrameActionListener
-    virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) 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;
 
 protected:
     virtual ~FormControllerImpl() override;
@@ -255,213 +255,213 @@ SbaXDataBrowserController::FormControllerImpl::~FormControllerImpl()
 
 }
 
-Reference< runtime::XFormOperations > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getFormOperations() throw (RuntimeException, std::exception)
+Reference< runtime::XFormOperations > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getFormOperations()
 {
     return FormOperations::createWithFormController( m_pOwner->m_xContext, this );
 }
 
-Reference< css::awt::XControl >  SbaXDataBrowserController::FormControllerImpl::getCurrentControl() throw( RuntimeException, std::exception )
+Reference< css::awt::XControl >  SbaXDataBrowserController::FormControllerImpl::getCurrentControl()
 {
     return m_pOwner->getBrowserView() ? m_pOwner->getBrowserView()->getGridControl() : Reference< css::awt::XControl > ();
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addActivateListener(const Reference< css::form::XFormControllerListener > & l) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addActivateListener(const Reference< css::form::XFormControllerListener > & l)
 {
     m_aActivateListeners.addInterface(l);
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeActivateListener(const Reference< css::form::XFormControllerListener > & l) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeActivateListener(const Reference< css::form::XFormControllerListener > & l)
 {
     m_aActivateListeners.removeInterface(l);
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addChildController( const Reference< runtime::XFormController >& ) throw( RuntimeException, IllegalArgumentException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addChildController( const Reference< runtime::XFormController >& )
 {
     // not supported
     throw IllegalArgumentException( OUString(), *this, 1 );
 }
 
-Reference< runtime::XFormControllerContext > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContext() throw (RuntimeException, std::exception)
+Reference< runtime::XFormControllerContext > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContext()
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getContext: no support!!" );
     return nullptr;
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContext( const Reference< runtime::XFormControllerContext >& /*_context*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContext( const Reference< runtime::XFormControllerContext >& /*_context*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::setContext: no support!!" );
 }
 
-Reference< XInteractionHandler > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getInteractionHandler() throw (RuntimeException, std::exception)
+Reference< XInteractionHandler > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getInteractionHandler()
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getInteractionHandler: no support!!" );
     return nullptr;
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setInteractionHandler( const Reference< XInteractionHandler >& /*_interactionHandler*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setInteractionHandler( const Reference< XInteractionHandler >& /*_interactionHandler*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::setInteractionHandler: no support!!" );
 }
 
-Reference< XInterface > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getParent(  ) throw (RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getParent(  )
 {
     // don't have any parent form controllers
     return nullptr;
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setParent( const Reference< XInterface >& /*Parent*/ ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setParent( const Reference< XInterface >& /*Parent*/ )
 {
     throw NoSupportException( OUString(), *this );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::dispose(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::dispose(  )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::dispose: no, you do *not* want to do this!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addEventListener( const Reference< XEventListener >& /*xListener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addEventListener( const Reference< XEventListener >& /*xListener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addEventListener: no support!!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeEventListener( const Reference< XEventListener >& /*aListener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeEventListener( const Reference< XEventListener >& /*aListener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeEventListener: no support!!" );
 }
 
-::sal_Int32 SAL_CALL SbaXDataBrowserController::FormControllerImpl::getCount(  ) throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SbaXDataBrowserController::FormControllerImpl::getCount(  )
 {
     // no sub controllers, never
     return 0;
 }
 
-Any SAL_CALL SbaXDataBrowserController::FormControllerImpl::getByIndex( ::sal_Int32 /*Index*/ ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SbaXDataBrowserController::FormControllerImpl::getByIndex( ::sal_Int32 /*Index*/ )
 {
     // no sub controllers, never
     throw IndexOutOfBoundsException( OUString(), *this );
 }
 
-Type SAL_CALL SbaXDataBrowserController::FormControllerImpl::getElementType(  ) throw (RuntimeException, std::exception)
+Type SAL_CALL SbaXDataBrowserController::FormControllerImpl::getElementType(  )
 {
     return ::cppu::UnoType< runtime::XFormController >::get();
 }
 
-sal_Bool SAL_CALL SbaXDataBrowserController::FormControllerImpl::hasElements(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SbaXDataBrowserController::FormControllerImpl::hasElements(  )
 {
     // no sub controllers, never
     return false;
 }
 
-Reference< XEnumeration > SAL_CALL SbaXDataBrowserController::FormControllerImpl::createEnumeration(  ) throw (RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL SbaXDataBrowserController::FormControllerImpl::createEnumeration(  )
 {
     return new ::comphelper::OEnumerationByIndex( this );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addModifyListener( const Reference< XModifyListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addModifyListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeModifyListener( const Reference< XModifyListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeModifyListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addParameterListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ )
 {
     SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeParameterListener: no support!" );
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setMode( const OUString& _rMode ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setMode( const OUString& _rMode )
 {
     if ( !supportsMode( _rMode ) )
         throw NoSupportException();
 }
 
-OUString SAL_CALL SbaXDataBrowserController::FormControllerImpl::getMode(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL SbaXDataBrowserController::FormControllerImpl::getMode(  )
 {
     return OUString( "DataMode" );
 }
 
-Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getSupportedModes(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getSupportedModes(  )
 {
     Sequence< OUString > aModes { "DataMode" };
     return aModes;
 }
 
-sal_Bool SAL_CALL SbaXDataBrowserController::FormControllerImpl::supportsMode( const OUString& aMode ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SbaXDataBrowserController::FormControllerImpl::supportsMode( const OUString& aMode )
 {
     return aMode == "DataMode";
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Reference< css::awt::XTabControllerModel > & /*Model*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Reference< css::awt::XTabControllerModel > & /*Model*/)
 {
     SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setModel : invalid call, can't change my model !");
 }
 
-Reference< css::awt::XTabControllerModel >  SAL_CALL SbaXDataBrowserController::FormControllerImpl::getModel() throw( RuntimeException, std::exception )
+Reference< css::awt::XTabControllerModel >  SAL_CALL SbaXDataBrowserController::FormControllerImpl::getModel()
 {
     return Reference< XTabControllerModel >(m_pOwner->getRowSet(), UNO_QUERY);
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const Reference< css::awt::XControlContainer > &) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const Reference< css::awt::XControlContainer > &)
 {
     SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setContainer : invalid call, can't change my container !");
 }
 
-Reference< css::awt::XControlContainer >  SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContainer() throw( RuntimeException, std::exception )
+Reference< css::awt::XControlContainer >  SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContainer()
 {
     if (m_pOwner->getBrowserView())
         return m_pOwner->getBrowserView()->getContainer();
     return Reference< css::awt::XControlContainer > ();
 }
 
-Sequence< Reference< css::awt::XControl > > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getControls() throw( RuntimeException, std::exception )
+Sequence< Reference< css::awt::XControl > > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getControls()
 {
     if (m_pOwner->getBrowserView())
     {
@@ -471,40 +471,40 @@ Sequence< Reference< css::awt::XControl > > SAL_CALL SbaXDataBrowserController::
     return Sequence< Reference< css::awt::XControl > >();
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::autoTabOrder() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::autoTabOrder()
 {
     SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::autoTabOrder : nothing to do (always have only one control) !");
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateTabOrder() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateTabOrder()
 {
     SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::activateTabOrder : nothing to do (always have only one control) !");
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateFirst() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateFirst()
 {
     if (m_pOwner->getBrowserView())
         m_pOwner->getBrowserView()->getVclControl()->ActivateCell();
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateLast() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateLast()
 {
     if (m_pOwner->getBrowserView())
         m_pOwner->getBrowserView()->getVclControl()->ActivateCell();
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::frameAction(const css::frame::FrameActionEvent& /*aEvent*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::frameAction(const css::frame::FrameActionEvent& /*aEvent*/)
 {
 }
 
-void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const css::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const css::lang::EventObject& /*Source*/)
 {
     // nothing to do
     // we don't add ourself as listener to any broadcasters, so we are not resposible for removing us
 }
 
 // SbaXDataBrowserController
-Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes(  ) throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes(  )
 {
     return ::comphelper::concatSequences(
         SbaXDataBrowserController_Base::getTypes(),
@@ -512,12 +512,12 @@ Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes(  ) throw (Runtime
     );
 }
 
-Sequence< sal_Int8 > SAL_CALL SbaXDataBrowserController::getImplementationId(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL SbaXDataBrowserController::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType)
 {
     // check for our additional interfaces
     Any aRet = SbaXDataBrowserController_Base::queryInterface(_rType);
@@ -929,7 +929,7 @@ void SbaXDataBrowserController::removeControlListeners(const Reference< css::awt
         xWindow->removeFocusListener(this);
 }
 
-void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/)
 {
     // notify our activate listeners (registered on the form controller aggregate)
     EventObject aEvt(*this);
@@ -938,7 +938,7 @@ void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) th
         static_cast<XFormControllerListener*>(aIter.next())->formActivated(aEvt);
 }
 
-void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e)
 {
     // some general checks
     if (!getBrowserView() || !getBrowserView()->getGridControl().is())
@@ -1003,7 +1003,7 @@ void SbaXDataBrowserController::disposingColumnModel(const css::lang::EventObjec
     RemoveColumnListener(Reference< XPropertySet > (Source.Source, UNO_QUERY));
 }
 
-void SbaXDataBrowserController::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::disposing(const EventObject& Source)
 {
     // if it's a component other than our aggregate, forward it to the aggregate
     if ( m_xFormControllerImpl != Source.Source )
@@ -1042,19 +1042,19 @@ void SbaXDataBrowserController::disposing(const EventObject& Source) throw( Runt
     SbaXDataBrowserController_Base::OGenericUnoController::disposing( Source );
 }
 
-void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& Identifier ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& Identifier )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     m_sModuleIdentifier = Identifier;
 }
 
-OUString SAL_CALL SbaXDataBrowserController::getIdentifier(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL SbaXDataBrowserController::getIdentifier(  )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return m_sModuleIdentifier;
 }
 
-void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) throw ( RuntimeException, std::exception )
+void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt)
 {
     Reference< XPropertySet >  xSource(evt.Source, UNO_QUERY);
     if (!xSource.is())
@@ -1104,12 +1104,12 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
     }
 }
 
-void SbaXDataBrowserController::modified(const css::lang::EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::modified(const css::lang::EventObject& /*aEvent*/)
 {
     setCurrentModified( true );
 }
 
-void SbaXDataBrowserController::elementInserted(const css::container::ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::elementInserted(const css::container::ContainerEvent& evt)
 {
     OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(),
         "SbaXDataBrowserController::elementInserted: where did this come from (not from the grid model)?!");
@@ -1118,7 +1118,7 @@ void SbaXDataBrowserController::elementInserted(const css::container::ContainerE
         AddColumnListener(xNewColumn);
 }
 
-void SbaXDataBrowserController::elementRemoved(const css::container::ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::elementRemoved(const css::container::ContainerEvent& evt)
 {
     OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(),
         "SbaXDataBrowserController::elementRemoved: where did this come from (not from the grid model)?!");
@@ -1127,7 +1127,7 @@ void SbaXDataBrowserController::elementRemoved(const css::container::ContainerEv
         RemoveColumnListener(xOldColumn);
 }
 
-void SbaXDataBrowserController::elementReplaced(const css::container::ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::elementReplaced(const css::container::ContainerEvent& evt)
 {
     OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(),
         "SbaXDataBrowserController::elementReplaced: where did this come from (not from the grid model)?!");
@@ -1140,7 +1140,7 @@ void SbaXDataBrowserController::elementReplaced(const css::container::ContainerE
         AddColumnListener(xNewColumn);
 }
 
-sal_Bool SbaXDataBrowserController::suspend(sal_Bool /*bSuspend*/) throw( RuntimeException, std::exception )
+sal_Bool SbaXDataBrowserController::suspend(sal_Bool /*bSuspend*/)
 {
     m_aAsyncGetCellFocus.CancelCall();
     m_aAsyncDisplayError.CancelCall();
@@ -1216,7 +1216,7 @@ void SbaXDataBrowserController::disposing()
         // don't dispose, just reset - it's owned by the RowSet
 }
 
-void SbaXDataBrowserController::frameAction(const css::frame::FrameActionEvent& aEvent) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::frameAction(const css::frame::FrameActionEvent& aEvent)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -1261,7 +1261,7 @@ IMPL_LINK_NOARG( SbaXDataBrowserController, OnAsyncDisplayError, void*, void )
     }
 }
 
-void SbaXDataBrowserController::errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::errorOccured(const css::sdb::SQLErrorEvent& aEvent)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -1281,7 +1281,7 @@ void SbaXDataBrowserController::errorOccured(const css::sdb::SQLErrorEvent& aEve
     }
 }
 
-sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabaseParameterEvent& aEvent) throw( RuntimeException, std::exception )
+sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabaseParameterEvent& aEvent)
 {
     if (aEvent.Source != getRowSet())
     {
@@ -1356,19 +1356,19 @@ sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabasePa
     return true;
 }
 
-sal_Bool SbaXDataBrowserController::approveReset(const css::lang::EventObject& /*rEvent*/) throw( RuntimeException, std::exception )
+sal_Bool SbaXDataBrowserController::approveReset(const css::lang::EventObject& /*rEvent*/)
 {
     return true;
 }
 
-void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent)
 {
     OSL_ENSURE(rEvent.Source == getControlModel(), "SbaXDataBrowserController::resetted : where did this come from ?");
     (void)rEvent;
     setCurrentModified( false );
 }
 
-sal_Bool SbaXDataBrowserController::confirmDelete(const css::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException, std::exception )
+sal_Bool SbaXDataBrowserController::confirmDelete(const css::sdb::RowChangeEvent& /*aEvent*/)
 {
     if (ScopedVclPtrInstance<MessageDialog>(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VclButtonsType::YesNo)->Execute() != RET_YES)
         return false;
@@ -2480,18 +2480,18 @@ void SbaXDataBrowserController::initializeParser() const
     }
 }
 
-void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/)
 {
     // not interested in
     // we're loading within an separate thread and have a handling for its "finished event"
 }
 
-void SbaXDataBrowserController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::unloading(const EventObject& /*aEvent*/)
 {
     // not interested in
 }
 
-void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/)
 {
     m_xParser.clear();
     InvalidateAll();
@@ -2502,12 +2502,12 @@ void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( R
         // bound-field-dependent slots ....
 }
 
-void SbaXDataBrowserController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::reloading(const EventObject& /*aEvent*/)
 {
     // not interested in
 }
 
-void SbaXDataBrowserController::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SbaXDataBrowserController::reloaded(const EventObject& /*aEvent*/)
 {
     InvalidateAll();
         // do this asynchronously, there are other listeners reacting on this message ...
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index f3bd8e7b5ca6..2edd7fda2975 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -209,7 +209,7 @@ namespace dbaui
         ODataAccessObjectTransferable::ObjectReleased( );
     }
 
-    void SAL_CALL ODataClipboard::disposing( const css::lang::EventObject& i_rSource ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL ODataClipboard::disposing( const css::lang::EventObject& i_rSource )
     {
         ODataAccessDescriptor& rDescriptor( getDescriptor() );
 
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 198b4a74941c..3f0769f462e0 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -73,9 +73,9 @@ public:
     explicit DBContentLoader(const Reference< XComponentContext >&);
 
     // XServiceInfo
-    OUString                 SAL_CALL getImplementationName() throw(std::exception  ) override;
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  ) override;
-    Sequence< OUString >     SAL_CALL getSupportedServiceNames() throw(std::exception  ) override;
+    OUString                 SAL_CALL getImplementationName() override;
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) override;
+    Sequence< OUString >     SAL_CALL getSupportedServiceNames() override;
 
     // static methods
     static OUString          getImplementationName_Static() throw(  )
@@ -89,8 +89,8 @@ public:
     // XLoader
     virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL,
                                 const Sequence< PropertyValue >& _rArgs,
-                                const Reference< XLoadEventListener > & _rListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel() throw(std::exception) override;
+                                const Reference< XLoadEventListener > & _rListener) override;
+    virtual void SAL_CALL cancel() override;
 };
 
 
@@ -111,19 +111,19 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult
 }
 
 // XServiceInfo
-OUString SAL_CALL DBContentLoader::getImplementationName() throw(std::exception  )
+OUString SAL_CALL DBContentLoader::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName) throw(std::exception  )
+sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames() throw(std::exception  )
+Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -139,7 +139,7 @@ Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static() throw(
 
 void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OUString& rURL,
         const Sequence< PropertyValue >& rArgs,
-        const Reference< XLoadEventListener > & rListener) throw(css::uno::RuntimeException, std::exception)
+        const Reference< XLoadEventListener > & rListener)
 {
     m_xFrame    = rFrame;
     m_xListener = rListener;
@@ -300,7 +300,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
             rListener->loadCancelled( this );
 }
 
-void DBContentLoader::cancel() throw(std::exception)
+void DBContentLoader::cancel()
 {
 }
 
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 69db7d2dc0fe..9b0b5590dec6 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -49,7 +49,7 @@ extern "C" void SAL_CALL createRegistryInfo_OFormGridView()
     static OMultiInstanceAutoRegistration< SbaExternalSourceBrowser > aAutoRegistration;
 }
 
-Any SAL_CALL SbaExternalSourceBrowser::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL SbaExternalSourceBrowser::queryInterface(const Type& _rType)
 {
     Any aRet = SbaXDataBrowserController::queryInterface(_rType);
     if(!aRet.hasValue())
@@ -74,17 +74,17 @@ SbaExternalSourceBrowser::~SbaExternalSourceBrowser()
 
 }
 
-css::uno::Sequence<OUString> SAL_CALL SbaExternalSourceBrowser::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL SbaExternalSourceBrowser::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-OUString SbaExternalSourceBrowser::getImplementationName_Static() throw(RuntimeException)
+OUString SbaExternalSourceBrowser::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.OFormGridView");
 }
 
-css::uno::Sequence<OUString> SbaExternalSourceBrowser::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString> SbaExternalSourceBrowser::getSupportedServiceNames_Static()
 {
     css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.FormGridView" };
     return aSupported;
@@ -95,7 +95,7 @@ Reference< XInterface > SAL_CALL SbaExternalSourceBrowser::Create(const Referenc
     return *(new SbaExternalSourceBrowser( comphelper::getComponentContext(_rxFactory)));
 }
 
-OUString SAL_CALL SbaExternalSourceBrowser::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL SbaExternalSourceBrowser::getImplementationName()
 {
     return getImplementationName_Static();
 }
@@ -118,7 +118,7 @@ bool SbaExternalSourceBrowser::LoadForm()
     return true;
 }
 
-void SbaExternalSourceBrowser::modified(const css::lang::EventObject& aEvent) throw( RuntimeException, std::exception )
+void SbaExternalSourceBrowser::modified(const css::lang::EventObject& aEvent)
 {
     SbaXDataBrowserController::modified(aEvent);
 
@@ -129,7 +129,7 @@ void SbaExternalSourceBrowser::modified(const css::lang::EventObject& aEvent) th
         static_cast< css::util::XModifyListener*>(aIt.next())->modified(aEvt);
 }
 
-void SAL_CALL SbaExternalSourceBrowser::dispatch(const css::util::URL& aURL, const Sequence< css::beans::PropertyValue>& aArgs) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL SbaExternalSourceBrowser::dispatch(const css::util::URL& aURL, const Sequence< css::beans::PropertyValue>& aArgs)
 {
     const css::beans::PropertyValue* pArguments = aArgs.getConstArray();
     if ( aURL.Complete == ".uno:FormSlots/AddGridColumn" )
@@ -239,7 +239,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const css::util::URL& aURL, con
         SbaXDataBrowserController::dispatch(aURL, aArgs);
 }
 
-Reference< css::frame::XDispatch >  SAL_CALL SbaExternalSourceBrowser::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception )
+Reference< css::frame::XDispatch >  SAL_CALL SbaExternalSourceBrowser::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags)
 {
     Reference< css::frame::XDispatch >  xReturn;
     if (m_bInQueryDispatch)
@@ -304,17 +304,17 @@ void SAL_CALL SbaExternalSourceBrowser::disposing()
     SbaXDataBrowserController::disposing();
 }
 
-void SAL_CALL SbaExternalSourceBrowser::addModifyListener(const Reference< css::util::XModifyListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaExternalSourceBrowser::addModifyListener(const Reference< css::util::XModifyListener > & aListener)
 {
     m_aModifyListeners.addInterface(aListener);
 }
 
-void SAL_CALL SbaExternalSourceBrowser::removeModifyListener(const Reference< css::util::XModifyListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaExternalSourceBrowser::removeModifyListener(const Reference< css::util::XModifyListener > & aListener)
 {
     m_aModifyListeners.removeInterface(aListener);
 }
 
-void SAL_CALL SbaExternalSourceBrowser::unloading(const css::lang::EventObject& aEvent) throw( RuntimeException, std::exception )
+void SAL_CALL SbaExternalSourceBrowser::unloading(const css::lang::EventObject& aEvent)
 {
     if (m_pDataSourceImpl && (m_pDataSourceImpl->getAttachedForm() == aEvent.Source))
     {
@@ -408,7 +408,7 @@ void SbaExternalSourceBrowser::ClearView()
         xColContainer->removeByIndex(0);
 }
 
-void SAL_CALL SbaExternalSourceBrowser::disposing(const css::lang::EventObject& Source) throw( RuntimeException, std::exception )
+void SAL_CALL SbaExternalSourceBrowser::disposing(const css::lang::EventObject& Source)
 {
     if (m_pDataSourceImpl && (m_pDataSourceImpl->getAttachedForm() == Source.Source))
     {
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index f66fb419840c..48423e910adf 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -61,7 +61,7 @@ SbaXFormAdapter::~SbaXFormAdapter()
 
 }
 
-Sequence< Type > SAL_CALL SbaXFormAdapter::getTypes(  ) throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL SbaXFormAdapter::getTypes(  )
 {
     return ::comphelper::concatSequences(
         SbaXFormAdapter_BASE1::getTypes(),
@@ -70,12 +70,12 @@ Sequence< Type > SAL_CALL SbaXFormAdapter::getTypes(  ) throw (RuntimeException,
     );
 }
 
-Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getImplementationId(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any SAL_CALL SbaXFormAdapter::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL SbaXFormAdapter::queryInterface(const Type& _rType)
 {
     Any aReturn = SbaXFormAdapter_BASE1::queryInterface( _rType );
 
@@ -196,7 +196,7 @@ void SbaXFormAdapter::AttachForm(const Reference< css::sdbc::XRowSet >& xNewMast
 }
 
 // css::sdbc::XCloseable
-void SAL_CALL SbaXFormAdapter::close() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::close()
 {
     Reference< css::sdbc::XCloseable >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -204,7 +204,7 @@ void SAL_CALL SbaXFormAdapter::close() throw( css::sdbc::SQLException, RuntimeEx
 }
 
 // css::sdbc::XResultSetMetaDataSupplier
-Reference< css::sdbc::XResultSetMetaData > SAL_CALL SbaXFormAdapter::getMetaData() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Reference< css::sdbc::XResultSetMetaData > SAL_CALL SbaXFormAdapter::getMetaData()
 {
     Reference< css::sdbc::XResultSetMetaDataSupplier >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -213,7 +213,7 @@ Reference< css::sdbc::XResultSetMetaData > SAL_CALL SbaXFormAdapter::getMetaData
 }
 
 // css::sdbc::XColumnLocate
-sal_Int32 SAL_CALL SbaXFormAdapter::findColumn(const OUString& columnName) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL SbaXFormAdapter::findColumn(const OUString& columnName)
 {
     Reference< css::sdbc::XColumnLocate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -225,7 +225,7 @@ sal_Int32 SAL_CALL SbaXFormAdapter::findColumn(const OUString& columnName) throw
 }
 
 // css::sdbcx::XColumnsSupplier
-Reference< css::container::XNameAccess > SAL_CALL SbaXFormAdapter::getColumns() throw( RuntimeException, std::exception )
+Reference< css::container::XNameAccess > SAL_CALL SbaXFormAdapter::getColumns()
 {
     Reference< css::sdbcx::XColumnsSupplier >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -234,7 +234,7 @@ Reference< css::container::XNameAccess > SAL_CALL SbaXFormAdapter::getColumns()
 }
 
 // css::sdbc::XRow
-sal_Bool SAL_CALL SbaXFormAdapter::wasNull() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::wasNull()
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -242,7 +242,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::wasNull() throw( css::sdbc::SQLException, Run
     return true;
 }
 
-OUString SAL_CALL SbaXFormAdapter::getString(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+OUString SAL_CALL SbaXFormAdapter::getString(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -250,7 +250,7 @@ OUString SAL_CALL SbaXFormAdapter::getString(sal_Int32 columnIndex) throw( css::
     return OUString();
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::getBoolean(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::getBoolean(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -258,7 +258,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::getBoolean(sal_Int32 columnIndex) throw( css:
     return false;
 }
 
-sal_Int8 SAL_CALL SbaXFormAdapter::getByte(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Int8 SAL_CALL SbaXFormAdapter::getByte(sal_Int32 columnIndex)
 
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
@@ -267,7 +267,7 @@ sal_Int8 SAL_CALL SbaXFormAdapter::getByte(sal_Int32 columnIndex) throw( css::sd
     return 0;
 }
 
-sal_Int16 SAL_CALL SbaXFormAdapter::getShort(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Int16 SAL_CALL SbaXFormAdapter::getShort(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -275,7 +275,7 @@ sal_Int16 SAL_CALL SbaXFormAdapter::getShort(sal_Int32 columnIndex) throw( css::
     return 0;
 }
 
-sal_Int32 SAL_CALL SbaXFormAdapter::getInt(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL SbaXFormAdapter::getInt(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -283,7 +283,7 @@ sal_Int32 SAL_CALL SbaXFormAdapter::getInt(sal_Int32 columnIndex) throw( css::sd
     return 0;
 }
 
-sal_Int64 SAL_CALL SbaXFormAdapter::getLong(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Int64 SAL_CALL SbaXFormAdapter::getLong(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -291,7 +291,7 @@ sal_Int64 SAL_CALL SbaXFormAdapter::getLong(sal_Int32 columnIndex) throw( css::s
     return 0;
 }
 
-float SAL_CALL SbaXFormAdapter::getFloat(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+float SAL_CALL SbaXFormAdapter::getFloat(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -299,7 +299,7 @@ float SAL_CALL SbaXFormAdapter::getFloat(sal_Int32 columnIndex) throw( css::sdbc
     return 0.0;
 }
 
-double SAL_CALL SbaXFormAdapter::getDouble(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+double SAL_CALL SbaXFormAdapter::getDouble(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -307,7 +307,7 @@ double SAL_CALL SbaXFormAdapter::getDouble(sal_Int32 columnIndex) throw( css::sd
     return 0.0;
 }
 
-Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -315,7 +315,7 @@ Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getBytes(sal_Int32 columnIndex) t
     return Sequence <sal_Int8> ();
 }
 
-css::util::Date SAL_CALL SbaXFormAdapter::getDate(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+css::util::Date SAL_CALL SbaXFormAdapter::getDate(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -323,7 +323,7 @@ css::util::Date SAL_CALL SbaXFormAdapter::getDate(sal_Int32 columnIndex) throw(
     return css::util::Date();
 }
 
-css::util::Time SAL_CALL SbaXFormAdapter::getTime(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+css::util::Time SAL_CALL SbaXFormAdapter::getTime(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -331,7 +331,7 @@ css::util::Time SAL_CALL SbaXFormAdapter::getTime(sal_Int32 columnIndex) throw(
     return css::util::Time();
 }
 
-css::util::DateTime SAL_CALL SbaXFormAdapter::getTimestamp(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+css::util::DateTime SAL_CALL SbaXFormAdapter::getTimestamp(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -339,7 +339,7 @@ css::util::DateTime SAL_CALL SbaXFormAdapter::getTimestamp(sal_Int32 columnIndex
     return css::util::DateTime();
 }
 
-Reference< css::io::XInputStream > SAL_CALL SbaXFormAdapter::getBinaryStream(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Reference< css::io::XInputStream > SAL_CALL SbaXFormAdapter::getBinaryStream(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -347,7 +347,7 @@ Reference< css::io::XInputStream > SAL_CALL SbaXFormAdapter::getBinaryStream(sal
     return Reference< css::io::XInputStream > ();
 }
 
-Reference< css::io::XInputStream > SAL_CALL SbaXFormAdapter::getCharacterStream(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Reference< css::io::XInputStream > SAL_CALL SbaXFormAdapter::getCharacterStream(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -355,7 +355,7 @@ Reference< css::io::XInputStream > SAL_CALL SbaXFormAdapter::getCharacterStream(
     return Reference< css::io::XInputStream > ();
 }
 
-Any SAL_CALL SbaXFormAdapter::getObject(sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Any SAL_CALL SbaXFormAdapter::getObject(sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -363,7 +363,7 @@ Any SAL_CALL SbaXFormAdapter::getObject(sal_Int32 columnIndex, const Reference<
     return Any();
 }
 
-Reference< css::sdbc::XRef > SAL_CALL SbaXFormAdapter::getRef(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Reference< css::sdbc::XRef > SAL_CALL SbaXFormAdapter::getRef(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -371,7 +371,7 @@ Reference< css::sdbc::XRef > SAL_CALL SbaXFormAdapter::getRef(sal_Int32 columnIn
     return Reference< css::sdbc::XRef > ();
 }
 
-Reference< css::sdbc::XBlob > SAL_CALL SbaXFormAdapter::getBlob(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Reference< css::sdbc::XBlob > SAL_CALL SbaXFormAdapter::getBlob(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -379,7 +379,7 @@ Reference< css::sdbc::XBlob > SAL_CALL SbaXFormAdapter::getBlob(sal_Int32 column
     return Reference< css::sdbc::XBlob > ();
 }
 
-Reference< css::sdbc::XClob > SAL_CALL SbaXFormAdapter::getClob(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Reference< css::sdbc::XClob > SAL_CALL SbaXFormAdapter::getClob(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -387,7 +387,7 @@ Reference< css::sdbc::XClob > SAL_CALL SbaXFormAdapter::getClob(sal_Int32 column
     return Reference< css::sdbc::XClob > ();
 }
 
-Reference< css::sdbc::XArray > SAL_CALL SbaXFormAdapter::getArray(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Reference< css::sdbc::XArray > SAL_CALL SbaXFormAdapter::getArray(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRow >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -396,7 +396,7 @@ Reference< css::sdbc::XArray > SAL_CALL SbaXFormAdapter::getArray(sal_Int32 colu
 }
 
 // css::sdbcx::XRowLocate
-Any SAL_CALL SbaXFormAdapter::getBookmark() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Any SAL_CALL SbaXFormAdapter::getBookmark()
 {
     Reference< css::sdbcx::XRowLocate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -404,7 +404,7 @@ Any SAL_CALL SbaXFormAdapter::getBookmark() throw( css::sdbc::SQLException, Runt
     return Any();
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::moveToBookmark(const Any& bookmark) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::moveToBookmark(const Any& bookmark)
 {
     Reference< css::sdbcx::XRowLocate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -412,7 +412,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::moveToBookmark(const Any& bookmark) throw( cs
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows)
 {
     Reference< css::sdbcx::XRowLocate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -420,7 +420,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::moveRelativeToBookmark(const Any& bookmark, s
     return false;
 }
 
-sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& _first, const Any& _second) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& _first, const Any& _second)
 {
     Reference< css::sdbcx::XRowLocate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -428,7 +428,7 @@ sal_Int32 SAL_CALL SbaXFormAdapter::compareBookmarks(const Any& _first, const An
     return 0;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::hasOrderedBookmarks() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::hasOrderedBookmarks()
 {
     Reference< css::sdbcx::XRowLocate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -436,7 +436,7 @@ sal_Bool SAL_CALL SbaXFormAdapter::hasOrderedBookmarks() throw( css::sdbc::SQLEx
     return false;
 }
 
-sal_Int32 SAL_CALL SbaXFormAdapter::hashBookmark(const Any& bookmark) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL SbaXFormAdapter::hashBookmark(const Any& bookmark)
 {
     Reference< css::sdbcx::XRowLocate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -445,119 +445,119 @@ sal_Int32 SAL_CALL SbaXFormAdapter::hashBookmark(const Any& bookmark) throw( css
 }
 
 // css::sdbc::XRowUpdate
-void SAL_CALL SbaXFormAdapter::updateNull(sal_Int32 columnIndex) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateNull(sal_Int32 columnIndex)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateNull(columnIndex);
 }
 
-void SAL_CALL SbaXFormAdapter::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateBoolean(sal_Int32 columnIndex, sal_Bool x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateBoolean(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateByte(sal_Int32 columnIndex, sal_Int8 x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateByte(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateShort(sal_Int32 columnIndex, sal_Int16 x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateShort(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateInt(sal_Int32 columnIndex, sal_Int32 x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateInt(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateLong(sal_Int32 columnIndex, sal_Int64 x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateLong(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateFloat(sal_Int32 columnIndex, float x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateFloat(sal_Int32 columnIndex, float x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateFloat(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateDouble(sal_Int32 columnIndex, double x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateDouble(sal_Int32 columnIndex, double x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateDouble(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateString(sal_Int32 columnIndex, const OUString& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateString(sal_Int32 columnIndex, const OUString& x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateString(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateBytes(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateDate(sal_Int32 columnIndex, const css::util::Date& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateDate(sal_Int32 columnIndex, const css::util::Date& x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateDate(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateTime(sal_Int32 columnIndex, const css::util::Time& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateTime(sal_Int32 columnIndex, const css::util::Time& x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateTime(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateTimestamp(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateBinaryStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateBinaryStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateBinaryStream(columnIndex, x, length);
 }
 
-void SAL_CALL SbaXFormAdapter::updateCharacterStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateCharacterStream(sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateCharacterStream(columnIndex, x, length);
 }
 
-void SAL_CALL SbaXFormAdapter::updateObject(sal_Int32 columnIndex, const Any& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateObject(sal_Int32 columnIndex, const Any& x)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateObject(columnIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale)
 {
     Reference< css::sdbc::XRowUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -565,123 +565,123 @@ void SAL_CALL SbaXFormAdapter::updateNumericObject(sal_Int32 columnIndex, const
 }
 
 // css::sdbc::XResultSet
-sal_Bool SAL_CALL SbaXFormAdapter::next() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::next()
 {
     if (m_xMainForm.is())
         return m_xMainForm->next();
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::isBeforeFirst() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::isBeforeFirst()
 {
     if (m_xMainForm.is())
         return m_xMainForm->isBeforeFirst();
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::isAfterLast() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::isAfterLast()
 {
     if (m_xMainForm.is())
         return m_xMainForm->isAfterLast();
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::isFirst() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::isFirst()
 {
     if (m_xMainForm.is())
         return m_xMainForm->isFirst();
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::isLast() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::isLast()
 {
     if (m_xMainForm.is())
         return m_xMainForm->isLast();
     return false;
 }
 
-void SAL_CALL SbaXFormAdapter::beforeFirst() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::beforeFirst()
 {
     if (m_xMainForm.is())
         m_xMainForm->beforeFirst();
 }
 
-void SAL_CALL SbaXFormAdapter::afterLast() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::afterLast()
 {
     if (m_xMainForm.is())
         m_xMainForm->afterLast();
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::first() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::first()
 {
     if (m_xMainForm.is())
         return m_xMainForm->first();
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::last() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::last()
 {
     if (m_xMainForm.is())
         return m_xMainForm->last();
     return false;
 }
 
-sal_Int32 SAL_CALL SbaXFormAdapter::getRow() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL SbaXFormAdapter::getRow()
 {
     if (m_xMainForm.is())
         return m_xMainForm->getRow();
     return 0;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::absolute(sal_Int32 row) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::absolute(sal_Int32 row)
 {
     if (m_xMainForm.is())
         return m_xMainForm->absolute(row);
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::relative(sal_Int32 rows) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::relative(sal_Int32 rows)
 {
     if (m_xMainForm.is())
         return m_xMainForm->relative(rows);
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::previous() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::previous()
 {
     if (m_xMainForm.is())
         return m_xMainForm->previous();
     return false;
 }
 
-void SAL_CALL SbaXFormAdapter::refreshRow() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::refreshRow()
 {
     if (m_xMainForm.is())
         m_xMainForm->refreshRow();
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::rowUpdated() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::rowUpdated()
 {
     if (m_xMainForm.is())
         return m_xMainForm->rowUpdated();
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::rowInserted() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::rowInserted()
 {
     if (m_xMainForm.is())
         return m_xMainForm->rowInserted();
     return false;
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::rowDeleted() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::rowDeleted()
 {
     if (m_xMainForm.is())
         return m_xMainForm->rowDeleted();
     return false;
 }
 
-Reference< XInterface > SAL_CALL SbaXFormAdapter::getStatement() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL SbaXFormAdapter::getStatement()
 {
     if (m_xMainForm.is())
         return m_xMainForm->getStatement();
@@ -689,42 +689,42 @@ Reference< XInterface > SAL_CALL SbaXFormAdapter::getStatement() throw( css::sdb
 }
 
 // css::sdbc::XResultSetUpdate
-void SAL_CALL SbaXFormAdapter::insertRow() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::insertRow()
 {
     Reference< css::sdbc::XResultSetUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->insertRow();
 }
 
-void SAL_CALL SbaXFormAdapter::updateRow() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::updateRow()
 {
     Reference< css::sdbc::XResultSetUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->updateRow();
 }
 
-void SAL_CALL SbaXFormAdapter::deleteRow() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::deleteRow()
 {
     Reference< css::sdbc::XResultSetUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->deleteRow();
 }
 
-void SAL_CALL SbaXFormAdapter::cancelRowUpdates() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::cancelRowUpdates()
 {
     Reference< css::sdbc::XResultSetUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->cancelRowUpdates();
 }
 
-void SAL_CALL SbaXFormAdapter::moveToInsertRow() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::moveToInsertRow()
 {
     Reference< css::sdbc::XResultSetUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->moveToInsertRow();
 }
 
-void SAL_CALL SbaXFormAdapter::moveToCurrentRow() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::moveToCurrentRow()
 {
     Reference< css::sdbc::XResultSetUpdate >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -732,7 +732,7 @@ void SAL_CALL SbaXFormAdapter::moveToCurrentRow() throw( css::sdbc::SQLException
 }
 
 // css::sdbc::XRowSet
-void SAL_CALL SbaXFormAdapter::execute() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::execute()
 {
     if (m_xMainForm.is())
         m_xMainForm->execute();
@@ -741,7 +741,7 @@ void SAL_CALL SbaXFormAdapter::execute() throw( css::sdbc::SQLException, Runtime
 IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdbc, RowSetListener, m_aRowSetListeners, css::sdbc::XRowSet, m_xMainForm)
 
 // css::sdbcx::XDeleteRows
-Sequence<sal_Int32> SAL_CALL SbaXFormAdapter::deleteRows(const Sequence< Any >& rows) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Sequence<sal_Int32> SAL_CALL SbaXFormAdapter::deleteRows(const Sequence< Any >& rows)
 {
     Reference< css::sdbcx::XDeleteRows >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -750,7 +750,7 @@ Sequence<sal_Int32> SAL_CALL SbaXFormAdapter::deleteRows(const Sequence< Any >&
 }
 
 // css::sdbc::XWarningsSupplier
-Any SAL_CALL SbaXFormAdapter::getWarnings() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Any SAL_CALL SbaXFormAdapter::getWarnings()
 {
     Reference< css::sdbc::XWarningsSupplier >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -758,7 +758,7 @@ Any SAL_CALL SbaXFormAdapter::getWarnings() throw( css::sdbc::SQLException, Runt
     return Any();
 }
 
-void SAL_CALL SbaXFormAdapter::clearWarnings() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::clearWarnings()
 {
     Reference< css::sdbc::XWarningsSupplier >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -772,7 +772,7 @@ IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdb, RowSetApproveListener, m
 IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, sdb, SQLErrorListener, m_aErrorListeners, css::sdb::XSQLErrorBroadcaster, m_xMainForm)
 
 // css::sdb::XResultSetAccess
-Reference< css::sdbc::XResultSet > SAL_CALL SbaXFormAdapter::createResultSet() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+Reference< css::sdbc::XResultSet > SAL_CALL SbaXFormAdapter::createResultSet()
 {
     Reference< css::sdb::XResultSetAccess >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -781,28 +781,28 @@ Reference< css::sdbc::XResultSet > SAL_CALL SbaXFormAdapter::createResultSet() t
 }
 
 // css::form::XLoadable
-void SAL_CALL SbaXFormAdapter::load() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::load()
 {
     Reference< css::form::XLoadable >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->load();
 }
 
-void SAL_CALL SbaXFormAdapter::unload() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::unload()
 {
     Reference< css::form::XLoadable >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->unload();
 }
 
-void SAL_CALL SbaXFormAdapter::reload() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::reload()
 {
     Reference< css::form::XLoadable >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->reload();
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::isLoaded() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::isLoaded()
 {
     Reference< css::form::XLoadable >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -813,161 +813,161 @@ sal_Bool SAL_CALL SbaXFormAdapter::isLoaded() throw( RuntimeException, std::exce
 IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, LoadListener, m_aLoadListeners, css::form::XLoadable, m_xMainForm)
 
 // css::sdbc::XParameters
-void SAL_CALL SbaXFormAdapter::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setNull(parameterIndex, sqlType);
 }
 
-void SAL_CALL SbaXFormAdapter::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setObjectNull(parameterIndex, sqlType, typeName);
 }
 
-void SAL_CALL SbaXFormAdapter::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setBoolean(sal_Int32 parameterIndex, sal_Bool x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setBoolean(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setByte(sal_Int32 parameterIndex, sal_Int8 x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setByte(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setShort(sal_Int32 parameterIndex, sal_Int16 x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setShort(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setInt(sal_Int32 parameterIndex, sal_Int32 x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setInt(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setLong(sal_Int32 parameterIndex, sal_Int64 x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setLong(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setFloat(sal_Int32 parameterIndex, float x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setFloat(sal_Int32 parameterIndex, float x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setFloat(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setDouble(sal_Int32 parameterIndex, double x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setDouble(sal_Int32 parameterIndex, double x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setDouble(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setString(sal_Int32 parameterIndex, const OUString& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setString(sal_Int32 parameterIndex, const OUString& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setString(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setBytes(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setDate(sal_Int32 parameterIndex, const css::util::Date& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setDate(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setTime(sal_Int32 parameterIndex, const css::util::Time& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setTime(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setTimestamp(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setBinaryStream(sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setBinaryStream(sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setBinaryStream(parameterIndex, x, length);
 }
 
-void SAL_CALL SbaXFormAdapter::setCharacterStream(sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setCharacterStream(sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setCharacterStream(parameterIndex, x, length);
 }
 
-void SAL_CALL SbaXFormAdapter::setObject(sal_Int32 parameterIndex, const Any& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setObject(sal_Int32 parameterIndex, const Any& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setObject(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setObjectWithInfo(parameterIndex, x, targetSqlType, scale);
 }
 
-void SAL_CALL SbaXFormAdapter::setRef(sal_Int32 parameterIndex, const Reference< css::sdbc::XRef >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setRef(sal_Int32 parameterIndex, const Reference< css::sdbc::XRef >& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setRef(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setBlob(sal_Int32 parameterIndex, const Reference< css::sdbc::XBlob >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setBlob(sal_Int32 parameterIndex, const Reference< css::sdbc::XBlob >& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setBlob(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setClob(sal_Int32 parameterIndex, const Reference< css::sdbc::XClob >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setClob(sal_Int32 parameterIndex, const Reference< css::sdbc::XClob >& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setClob(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::setArray(sal_Int32 parameterIndex, const Reference< css::sdbc::XArray >& x) throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setArray(sal_Int32 parameterIndex, const Reference< css::sdbc::XArray >& x)
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
         xIface->setArray(parameterIndex, x);
 }
 
-void SAL_CALL SbaXFormAdapter::clearParameters() throw( css::sdbc::SQLException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::clearParameters()
 {
     Reference< css::sdbc::XParameters >  xIface(m_xMainForm, UNO_QUERY);
     if (xIface.is())
@@ -975,7 +975,7 @@ void SAL_CALL SbaXFormAdapter::clearParameters() throw( css::sdbc::SQLException,
 }
 
 // css::form::XDatabaseParameterBroadcaster
-void SAL_CALL SbaXFormAdapter::addParameterListener(const Reference< css::form::XDatabaseParameterListener >& aListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::addParameterListener(const Reference< css::form::XDatabaseParameterListener >& aListener)
 {
     m_aParameterListeners.addInterface(aListener);
     if (m_aParameterListeners.getLength() == 1)
@@ -986,7 +986,7 @@ void SAL_CALL SbaXFormAdapter::addParameterListener(const Reference< css::form::
     }
 }
 
-void SAL_CALL SbaXFormAdapter::removeParameterListener(const Reference< css::form::XDatabaseParameterListener >& aListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::removeParameterListener(const Reference< css::form::XDatabaseParameterListener >& aListener)
 {
     if (m_aParameterListeners.getLength() == 1)
     {
@@ -998,18 +998,18 @@ void SAL_CALL SbaXFormAdapter::removeParameterListener(const Reference< css::for
 }
 
 // css::container::XChild
-Reference< XInterface > SAL_CALL SbaXFormAdapter::getParent() throw( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL SbaXFormAdapter::getParent()
 {
     return m_xParent;
 }
 
-void SAL_CALL SbaXFormAdapter::setParent(const Reference< XInterface >& Parent) throw( css::lang::NoSupportException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setParent(const Reference< XInterface >& Parent)
 {
     m_xParent = Parent;
 }
 
 // css::form::XSubmit
-void SAL_CALL SbaXFormAdapter::submit(const Reference< css::awt::XControl >& aControl, const css::awt::MouseEvent& aMouseEvt) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::submit(const Reference< css::awt::XControl >& aControl, const css::awt::MouseEvent& aMouseEvt)
 {
     Reference< css::form::XSubmit >  xSubmit(m_xMainForm, UNO_QUERY);
     if (xSubmit.is())
@@ -1019,51 +1019,51 @@ void SAL_CALL SbaXFormAdapter::submit(const Reference< css::awt::XControl >& aCo
 IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, SubmitListener, m_aSubmitListeners, css::form::XSubmit, m_xMainForm)
 
 // css::awt::XTabControllerModel
-sal_Bool SAL_CALL SbaXFormAdapter::getGroupControl() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::getGroupControl()
 {
     OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupControl : not supported !");
     return false;
 }
 
-void SAL_CALL SbaXFormAdapter::setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setGroupControl(sal_Bool /*GroupControl*/)
 {
     OSL_FAIL("SAL_CALL SbaXFormAdapter::setGroupControl : not supported !");
 }
 
-void SAL_CALL SbaXFormAdapter::setControlModels(const Sequence< Reference< css::awt::XControlModel >  >& /*Controls*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setControlModels(const Sequence< Reference< css::awt::XControlModel >  >& /*Controls*/)
 {
     OSL_FAIL("SAL_CALL SbaXFormAdapter::setControlModels : not supported !");
 }
 
-Sequence< Reference< css::awt::XControlModel > > SAL_CALL SbaXFormAdapter::getControlModels() throw( RuntimeException, std::exception )
+Sequence< Reference< css::awt::XControlModel > > SAL_CALL SbaXFormAdapter::getControlModels()
 {
     OSL_FAIL("SAL_CALL SbaXFormAdapter::getControlModels : not supported !");
     return Sequence< Reference< css::awt::XControlModel > >();
 }
 
-void SAL_CALL SbaXFormAdapter::setGroup(const Sequence< Reference< css::awt::XControlModel >  >& /*_rGroup*/, const OUString& /*GroupName*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setGroup(const Sequence< Reference< css::awt::XControlModel >  >& /*_rGroup*/, const OUString& /*GroupName*/)
 {
     OSL_FAIL("SAL_CALL SbaXFormAdapter::setGroup : not supported !");
 }
 
-sal_Int32 SAL_CALL SbaXFormAdapter::getGroupCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SbaXFormAdapter::getGroupCount()
 {
     OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupCount : not supported !");
     return 0;
 }
 
-void SAL_CALL SbaXFormAdapter::getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< css::awt::XControlModel >  >& /*_rGroup*/, OUString& /*Name*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< css::awt::XControlModel >  >& /*_rGroup*/, OUString& /*Name*/)
 {
     OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroup : not supported !");
 }
 
-void SAL_CALL SbaXFormAdapter::getGroupByName(const OUString& /*Name*/, Sequence< Reference< css::awt::XControlModel >  >& /*_rGroup*/) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::getGroupByName(const OUString& /*Name*/, Sequence< Reference< css::awt::XControlModel >  >& /*_rGroup*/)
 {
     OSL_FAIL("SAL_CALL SbaXFormAdapter::getGroupByName : not supported !");
 }
 
 // css::lang::XComponent
-void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::dispose()
 {
     // log off all multiplexers
     if (m_xMainForm.is())
@@ -1106,18 +1106,18 @@ void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException, std::exception
     m_aChildren.clear();
 }
 
-void SAL_CALL SbaXFormAdapter::addEventListener(const Reference< css::lang::XEventListener >& xListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::addEventListener(const Reference< css::lang::XEventListener >& xListener)
 {
     m_aDisposeListeners.addInterface(xListener);
 }
 
-void SAL_CALL SbaXFormAdapter::removeEventListener(const Reference< css::lang::XEventListener >& aListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::removeEventListener(const Reference< css::lang::XEventListener >& aListener)
 {
     m_aDisposeListeners.removeInterface(aListener);
 }
 
 // css::beans::XFastPropertySet
-void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any& aValue) throw( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any& aValue)
 {
     Reference< css::beans::XFastPropertySet >  xSet(m_xMainForm, UNO_QUERY);
     OSL_ENSURE(xSet.is(), "SAL_CALL SbaXFormAdapter::setFastPropertyValue : have no master form !");
@@ -1149,7 +1149,7 @@ void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any
     xSet->setFastPropertyValue(nHandle, aValue);
 }
 
-Any SAL_CALL SbaXFormAdapter::getFastPropertyValue(sal_Int32 nHandle) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL SbaXFormAdapter::getFastPropertyValue(sal_Int32 nHandle)
 {
     Reference< css::beans::XFastPropertySet >  xSet(m_xMainForm, UNO_QUERY);
     OSL_ENSURE(xSet.is(), "SAL_CALL SbaXFormAdapter::getFastPropertyValue : have no master form !");
@@ -1161,18 +1161,18 @@ Any SAL_CALL SbaXFormAdapter::getFastPropertyValue(sal_Int32 nHandle) throw( css
 }
 
 // css::container::XNamed
-OUString SAL_CALL SbaXFormAdapter::getName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SbaXFormAdapter::getName()
 {
     return ::comphelper::getString(getPropertyValue(PROPERTY_NAME));
 }
 
-void SAL_CALL SbaXFormAdapter::setName(const OUString& aName) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setName(const OUString& aName)
 {
     setPropertyValue(PROPERTY_NAME, makeAny(aName));
 }
 
 // css::io::XPersistObject
-OUString SAL_CALL SbaXFormAdapter::getServiceName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SbaXFormAdapter::getServiceName()
 {
     Reference< css::io::XPersistObject >  xPersist(m_xMainForm, UNO_QUERY);
     if (xPersist.is())
@@ -1180,14 +1180,14 @@ OUString SAL_CALL SbaXFormAdapter::getServiceName() throw( RuntimeException, std
     return OUString();
 }
 
-void SAL_CALL SbaXFormAdapter::write(const Reference< css::io::XObjectOutputStream >& _rxOutStream) throw( css::io::IOException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::write(const Reference< css::io::XObjectOutputStream >& _rxOutStream)
 {
     Reference< css::io::XPersistObject >  xPersist(m_xMainForm, UNO_QUERY);
     if (xPersist.is())
         xPersist->write(_rxOutStream);
 }
 
-void SAL_CALL SbaXFormAdapter::read(const Reference< css::io::XObjectInputStream >& _rxInStream) throw( css::io::IOException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::read(const Reference< css::io::XObjectInputStream >& _rxInStream)
 {
     Reference< css::io::XPersistObject >  xPersist(m_xMainForm, UNO_QUERY);
     if (xPersist.is())
@@ -1195,7 +1195,7 @@ void SAL_CALL SbaXFormAdapter::read(const Reference< css::io::XObjectInputStream
 }
 
 // css::beans::XMultiPropertySet
-Reference< css::beans::XPropertySetInfo > SAL_CALL SbaXFormAdapter::getPropertySetInfo() throw( RuntimeException, std::exception )
+Reference< css::beans::XPropertySetInfo > SAL_CALL SbaXFormAdapter::getPropertySetInfo()
 {
     Reference< css::beans::XMultiPropertySet >  xSet(m_xMainForm, UNO_QUERY);
     if (!xSet.is())
@@ -1220,14 +1220,14 @@ Reference< css::beans::XPropertySetInfo > SAL_CALL SbaXFormAdapter::getPropertyS
     return xReturn;
 }
 
-void SAL_CALL SbaXFormAdapter::setPropertyValues(const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values) throw( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setPropertyValues(const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values)
 {
     Reference< css::beans::XMultiPropertySet >  xSet(m_xMainForm, UNO_QUERY);
     if (xSet.is())
         xSet->setPropertyValues(PropertyNames, Values);
 }
 
-Sequence< Any > SAL_CALL SbaXFormAdapter::getPropertyValues(const Sequence< OUString >& aPropertyNames) throw( RuntimeException, std::exception )
+Sequence< Any > SAL_CALL SbaXFormAdapter::getPropertyValues(const Sequence< OUString >& aPropertyNames)
 {
     Reference< css::beans::XMultiPropertySet >  xSet(m_xMainForm, UNO_QUERY);
     if (!xSet.is())
@@ -1249,7 +1249,7 @@ Sequence< Any > SAL_CALL SbaXFormAdapter::getPropertyValues(const Sequence< OUSt
     return aReturn;
 }
 
-void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< OUString>& /*aPropertyNames*/, const Reference< css::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< OUString>& /*aPropertyNames*/, const Reference< css::beans::XPropertiesChangeListener >& xListener)
 {
     // we completely ignore the property names, _all_ changes of _all_ properties will be forwarded to _all_ listeners
     m_aPropertiesChangeListeners.addInterface(xListener);
@@ -1261,7 +1261,7 @@ void SAL_CALL SbaXFormAdapter::addPropertiesChangeListener(const Sequence< OUStr
     }
 }
 
-void SAL_CALL SbaXFormAdapter::removePropertiesChangeListener(const Reference< css::beans::XPropertiesChangeListener >& Listener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::removePropertiesChangeListener(const Reference< css::beans::XPropertiesChangeListener >& Listener)
 {
     if (m_aPropertiesChangeListeners.getLength() == 1)
     {
@@ -1272,7 +1272,7 @@ void SAL_CALL SbaXFormAdapter::removePropertiesChangeListener(const Reference< c
     m_aPropertiesChangeListeners.removeInterface(Listener);
 }
 
-void SAL_CALL SbaXFormAdapter::firePropertiesChangeEvent(const Sequence< OUString >& aPropertyNames, const Reference< css::beans::XPropertiesChangeListener >& xListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::firePropertiesChangeEvent(const Sequence< OUString >& aPropertyNames, const Reference< css::beans::XPropertiesChangeListener >& xListener)
 {
     Reference< css::beans::XMultiPropertySet >  xSet(m_xMainForm, UNO_QUERY);
     if (xSet.is())
@@ -1280,7 +1280,7 @@ void SAL_CALL SbaXFormAdapter::firePropertiesChangeEvent(const Sequence< OUStrin
 }
 
 // css::beans::XPropertySet
-void SAL_CALL SbaXFormAdapter::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setPropertyValue(const OUString& aPropertyName, const Any& aValue)
 {
     Reference< css::beans::XPropertySet >  xSet(m_xMainForm, UNO_QUERY);
     if (!xSet.is())
@@ -1293,7 +1293,7 @@ void SAL_CALL SbaXFormAdapter::setPropertyValue(const OUString& aPropertyName, c
     xSet->setPropertyValue(aPropertyName, aValue);
 }
 
-Any SAL_CALL SbaXFormAdapter::getPropertyValue(const OUString& PropertyName) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL SbaXFormAdapter::getPropertyValue(const OUString& PropertyName)
 {
     Reference< css::beans::XPropertySet >  xSet(m_xMainForm, UNO_QUERY);
     if (!xSet.is())
@@ -1310,7 +1310,7 @@ IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(SbaXFormAdapter, PropertyChangeListen
 IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(SbaXFormAdapter, VetoableChangeListener, m_aVetoablePropertyChangeListeners, css::beans::XPropertySet, m_xMainForm);
 
 // css::util::XCancellable
-void SAL_CALL SbaXFormAdapter::cancel() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::cancel()
 {
     Reference< css::util::XCancellable >  xCancel(m_xMainForm, UNO_QUERY);
     if (xCancel.is())
@@ -1319,7 +1319,7 @@ void SAL_CALL SbaXFormAdapter::cancel() throw( RuntimeException, std::exception
 }
 
 // css::beans::XPropertyState
-css::beans::PropertyState SAL_CALL SbaXFormAdapter::getPropertyState(const OUString& PropertyName) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception )
+css::beans::PropertyState SAL_CALL SbaXFormAdapter::getPropertyState(const OUString& PropertyName)
 {
     Reference< css::beans::XPropertyState >  xState(m_xMainForm, UNO_QUERY);
     if (xState.is())
@@ -1327,7 +1327,7 @@ css::beans::PropertyState SAL_CALL SbaXFormAdapter::getPropertyState(const OUStr
     return css::beans::PropertyState_DEFAULT_VALUE;
 }
 
-Sequence< css::beans::PropertyState> SAL_CALL SbaXFormAdapter::getPropertyStates(const Sequence< OUString >& aPropertyName) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception )
+Sequence< css::beans::PropertyState> SAL_CALL SbaXFormAdapter::getPropertyStates(const Sequence< OUString >& aPropertyName)
 {
     Reference< css::beans::XPropertyState >  xState(m_xMainForm, UNO_QUERY);
     if (xState.is())
@@ -1341,14 +1341,14 @@ Sequence< css::beans::PropertyState> SAL_CALL SbaXFormAdapter::getPropertyStates
     return aReturn;
 }
 
-void SAL_CALL SbaXFormAdapter::setPropertyToDefault(const OUString& PropertyName) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::setPropertyToDefault(const OUString& PropertyName)
 {
     Reference< css::beans::XPropertyState >  xState(m_xMainForm, UNO_QUERY);
     if (xState.is())
         xState->setPropertyToDefault(PropertyName);
 }
 
-Any SAL_CALL SbaXFormAdapter::getPropertyDefault(const OUString& aPropertyName) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL SbaXFormAdapter::getPropertyDefault(const OUString& aPropertyName)
 {
     Reference< css::beans::XPropertyState >  xState(m_xMainForm, UNO_QUERY);
     if (xState.is())
@@ -1357,7 +1357,7 @@ Any SAL_CALL SbaXFormAdapter::getPropertyDefault(const OUString& aPropertyName)
 }
 
 // css::form::XReset
-void SAL_CALL SbaXFormAdapter::reset() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::reset()
 {
     Reference< css::form::XReset >  xReset(m_xMainForm, UNO_QUERY);
     if (xReset.is())
@@ -1367,7 +1367,7 @@ void SAL_CALL SbaXFormAdapter::reset() throw( RuntimeException, std::exception )
 IMPLEMENT_LISTENER_ADMINISTRATION(SbaXFormAdapter, form, ResetListener, m_aResetListeners, css::form::XReset, m_xMainForm)
 
 // css::container::XNameContainer
-void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OUString* pNewElName) throw( css::lang::IllegalArgumentException )
+void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OUString* pNewElName)
 {
     // extract the form component
     if (aElement.getValueType().getTypeClass() != TypeClass_INTERFACE)
@@ -1438,12 +1438,12 @@ sal_Int32 SbaXFormAdapter::implGetPos(const OUString& rName)
     return -1;
 }
 
-void SAL_CALL SbaXFormAdapter::insertByName(const OUString& aName, const Any& aElement) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::insertByName(const OUString& aName, const Any& aElement)
 {
     implInsert(aElement, m_aChildren.size(), &aName);
 }
 
-void SAL_CALL SbaXFormAdapter::removeByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::removeByName(const OUString& Name)
 {
     sal_Int32 nPos = implGetPos(Name);
     if (-1 == nPos)
@@ -1454,7 +1454,7 @@ void SAL_CALL SbaXFormAdapter::removeByName(const OUString& Name) throw( css::co
 }
 
 // css::container::XNameReplace
-void SAL_CALL SbaXFormAdapter::replaceByName(const OUString& aName, const Any& aElement) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::replaceByName(const OUString& aName, const Any& aElement)
 {
     sal_Int32 nPos = implGetPos(aName);
     if (-1 == nPos)
@@ -1465,7 +1465,7 @@ void SAL_CALL SbaXFormAdapter::replaceByName(const OUString& aName, const Any& a
 }
 
 // css::container::XNameAccess
-Any SAL_CALL SbaXFormAdapter::getByName(const OUString& aName) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL SbaXFormAdapter::getByName(const OUString& aName)
 {
     sal_Int32 nPos = implGetPos(aName);
     if (-1 == nPos)
@@ -1475,36 +1475,36 @@ Any SAL_CALL SbaXFormAdapter::getByName(const OUString& aName) throw( css::conta
     return makeAny(m_aChildren[nPos]);
 }
 
-Sequence< OUString > SAL_CALL SbaXFormAdapter::getElementNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SbaXFormAdapter::getElementNames()
 {
     return Sequence< OUString >(m_aChildNames.data(), m_aChildNames.size());
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::hasByName(const OUString& aName) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SbaXFormAdapter::hasByName(const OUString& aName)
 {
     return (-1 != implGetPos(aName));
 }
 
 // css::container::XElementAccess
-Type SAL_CALL SbaXFormAdapter::getElementType() throw(RuntimeException, std::exception)
+Type SAL_CALL SbaXFormAdapter::getElementType()
 {
     return cppu::UnoType<css::form::XFormComponent>::get();
 }
 
-sal_Bool SAL_CALL SbaXFormAdapter::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SbaXFormAdapter::hasElements()
 {
     return m_aChildren.size() > 0;
 }
 
 // css::container::XIndexContainer
-void SAL_CALL SbaXFormAdapter::insertByIndex(sal_Int32 _rIndex, const Any& Element) throw( css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::insertByIndex(sal_Int32 _rIndex, const Any& Element)
 {
     if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) )
         throw css::lang::IndexOutOfBoundsException();
     implInsert(Element, _rIndex);
 }
 
-void SAL_CALL SbaXFormAdapter::removeByIndex(sal_Int32 _rIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::removeByIndex(sal_Int32 _rIndex)
 {
     if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) )
         throw css::lang::IndexOutOfBoundsException();
@@ -1533,7 +1533,7 @@ void SAL_CALL SbaXFormAdapter::removeByIndex(sal_Int32 _rIndex) throw( css::lang
 }
 
 // css::container::XIndexReplace
-void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Element) throw( css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Element)
 {
     if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) )
         throw css::lang::IndexOutOfBoundsException();
@@ -1595,12 +1595,12 @@ void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Elem
 }
 
 // css::container::XIndexAccess
-sal_Int32 SAL_CALL SbaXFormAdapter::getCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SbaXFormAdapter::getCount()
 {
     return m_aChildren.size();
 }
 
-Any SAL_CALL SbaXFormAdapter::getByIndex(sal_Int32 _rIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL SbaXFormAdapter::getByIndex(sal_Int32 _rIndex)
 {
     if ( ( _rIndex < 0 ) || ( (size_t)_rIndex >= m_aChildren.size() ) )
         throw css::lang::IndexOutOfBoundsException();
@@ -1610,24 +1610,24 @@ Any SAL_CALL SbaXFormAdapter::getByIndex(sal_Int32 _rIndex) throw( css::lang::In
 }
 
 // css::container::XContainer
-void SAL_CALL SbaXFormAdapter::addContainerListener(const Reference< css::container::XContainerListener >& xListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::addContainerListener(const Reference< css::container::XContainerListener >& xListener)
 {
     m_aContainerListeners.addInterface(xListener);
 }
 
-void SAL_CALL SbaXFormAdapter::removeContainerListener(const Reference< css::container::XContainerListener >& xListener) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::removeContainerListener(const Reference< css::container::XContainerListener >& xListener)
 {
     m_aContainerListeners.removeInterface(xListener);
 }
 
 // css::container::XEnumerationAccess
-Reference< css::container::XEnumeration > SAL_CALL SbaXFormAdapter::createEnumeration() throw( RuntimeException, std::exception )
+Reference< css::container::XEnumeration > SAL_CALL SbaXFormAdapter::createEnumeration()
 {
     return new ::comphelper::OEnumerationByName(this);
 }
 
 // css::beans::XPropertyChangeListener
-void SAL_CALL SbaXFormAdapter::propertyChange(const css::beans::PropertyChangeEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::propertyChange(const css::beans::PropertyChangeEvent& evt)
 {
     if (evt.PropertyName == PROPERTY_NAME)
     {
@@ -1645,7 +1645,7 @@ void SAL_CALL SbaXFormAdapter::propertyChange(const css::beans::PropertyChangeEv
 }
 
 // css::lang::XEventListener
-void SAL_CALL SbaXFormAdapter::disposing(const css::lang::EventObject& Source) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXFormAdapter::disposing(const css::lang::EventObject& Source)
 {
     // was it our main form ?
     if (Source.Source == m_xMainForm)
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index a997b5f7029d..f8c6113a5479 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -260,7 +260,7 @@ void OGenericUnoController::impl_initialize()
 {
 }
 
-void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception)
+void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArguments )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -339,14 +339,14 @@ void OGenericUnoController::stopFrameListening( const Reference< XFrame >& _rxFr
         _rxFrame->removeFrameActionListener( this );
 }
 
-void OGenericUnoController::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+void OGenericUnoController::disposing(const EventObject& Source)
 {
     // our frame ?
     if ( Source.Source == getFrame() )
         stopFrameListening( getFrame() );
 }
 
-void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeException, std::exception )
+void OGenericUnoController::modified(const EventObject& aEvent)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     if ( !isDataSourceReadOnly() )
@@ -361,30 +361,30 @@ void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeEx
     InvalidateFeature(ID_BROWSER_UNDO);
 }
 
-Reference< XWindow > SAL_CALL OGenericUnoController::getComponentWindow() throw (RuntimeException, std::exception)
+Reference< XWindow > SAL_CALL OGenericUnoController::getComponentWindow()
 {
     SolarMutexGuard g;
     return VCLUnoHelper::GetInterface( getView() );
 }
 
-Reference<XSidebarProvider> SAL_CALL OGenericUnoController::getSidebar() throw (RuntimeException, std::exception)
+Reference<XSidebarProvider> SAL_CALL OGenericUnoController::getSidebar()
 {
         return nullptr;
 }
 
-OUString SAL_CALL OGenericUnoController::getViewControllerName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OGenericUnoController::getViewControllerName()
 {
     return OUString( "Default" );
 }
 
-Sequence< PropertyValue > SAL_CALL OGenericUnoController::getCreationArguments() throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL OGenericUnoController::getCreationArguments()
 {
     // currently we do not support any creation args, so anything passed to XModel2::createViewController would be
     // lost, so we can equally return an empty sequence here
     return Sequence< PropertyValue >();
 }
 
-void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) throw( RuntimeException, std::exception )
+void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -627,7 +627,7 @@ void OGenericUnoController::InvalidateAll_Impl()
     }
 }
 
-Reference< XDispatch >  OGenericUnoController::queryDispatch(const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception )
+Reference< XDispatch >  OGenericUnoController::queryDispatch(const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags)
 {
     Reference< XDispatch > xReturn;
 
@@ -654,7 +654,7 @@ Reference< XDispatch >  OGenericUnoController::queryDispatch(const URL& aURL, co
     return xReturn;
 }
 
-Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const Sequence< DispatchDescriptor >& aDescripts) throw( RuntimeException, std::exception )
+Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const Sequence< DispatchDescriptor >& aDescripts)
 {
     Sequence< Reference< XDispatch > > aReturn;
     sal_Int32 nLen = aDescripts.getLength();
@@ -674,27 +674,27 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const
     return aReturn;
 }
 
-Reference< XDispatchProvider >  OGenericUnoController::getSlaveDispatchProvider() throw( RuntimeException, std::exception )
+Reference< XDispatchProvider >  OGenericUnoController::getSlaveDispatchProvider()
 {
     return m_xSlaveDispatcher;
 }
 
-void OGenericUnoController::setSlaveDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider) throw( RuntimeException, std::exception )
+void OGenericUnoController::setSlaveDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider)
 {
     m_xSlaveDispatcher = _xNewProvider;
 }
 
-Reference< XDispatchProvider >  OGenericUnoController::getMasterDispatchProvider() throw( RuntimeException, std::exception )
+Reference< XDispatchProvider >  OGenericUnoController::getMasterDispatchProvider()
 {
     return m_xMasterDispatcher;
 }
 
-void OGenericUnoController::setMasterDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider) throw( RuntimeException, std::exception )
+void OGenericUnoController::setMasterDispatchProvider(const Reference< XDispatchProvider > & _xNewProvider)
 {
     m_xMasterDispatcher = _xNewProvider;
 }
 
-void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyValue >& aArgs) throw(RuntimeException, std::exception)
+void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyValue >& aArgs)
 {
     SolarMutexGuard aSolarGuard;
     // The SolarMutex is not locked anymore when the framework calls into
@@ -706,7 +706,7 @@ void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyV
     executeChecked(_aURL,aArgs);
 }
 
-void OGenericUnoController::addStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) throw(RuntimeException, std::exception)
+void OGenericUnoController::addStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL)
 {
     // parse the URL now and here, this saves later parsing in each notification round
     URL aParsedURL( _rURL );
@@ -721,7 +721,7 @@ void OGenericUnoController::addStatusListener(const Reference< XStatusListener >
         // force the new state to be broadcast to the new listener
 }
 
-void OGenericUnoController::removeStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) throw(RuntimeException, std::exception)
+void OGenericUnoController::removeStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL)
 {
     Dispatch::iterator iterSearch = m_arrStatusListener.begin();
 
@@ -814,19 +814,19 @@ void OGenericUnoController::disposing()
     m_aInitParameters.clear();
 }
 
-void SAL_CALL OGenericUnoController::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL OGenericUnoController::addEventListener( const Reference< XEventListener >& xListener )
 {
     // disambiguate
     OGenericUnoController_Base::WeakComponentImplHelperBase::addEventListener( xListener );
 }
 
-void SAL_CALL OGenericUnoController::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL OGenericUnoController::removeEventListener( const Reference< XEventListener >& xListener )
 {
     // disambiguate
     OGenericUnoController_Base::WeakComponentImplHelperBase::removeEventListener( xListener );
 }
 
-void OGenericUnoController::frameAction(const FrameActionEvent& aEvent) throw( RuntimeException, std::exception )
+void OGenericUnoController::frameAction(const FrameActionEvent& aEvent)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     if ( aEvent.Frame == m_aCurrentFrame.getFrame() )
@@ -926,7 +926,7 @@ bool OGenericUnoController::isUserDefinedFeature( const OUString& _rFeatureURL )
     return ( pos != m_aSupportedFeatures.end() ) && isUserDefinedFeature( pos->second.nFeatureId );
 }
 
-sal_Bool SAL_CALL OGenericUnoController::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OGenericUnoController::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -1043,27 +1043,27 @@ IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask, void*, void)
     }
 }
 
-Any SAL_CALL OGenericUnoController::getViewData() throw( RuntimeException, std::exception )
+Any SAL_CALL OGenericUnoController::getViewData()
 {
     return Any();
 }
 
-void SAL_CALL OGenericUnoController::restoreViewData(const Any& /*Data*/) throw( RuntimeException, std::exception )
+void SAL_CALL OGenericUnoController::restoreViewData(const Any& /*Data*/)
 {
 }
 
-Reference< XModel > SAL_CALL OGenericUnoController::getModel() throw( RuntimeException, std::exception )
+Reference< XModel > SAL_CALL OGenericUnoController::getModel()
 {
     return Reference< XModel >();
 }
 
-Reference< XFrame > SAL_CALL OGenericUnoController::getFrame() throw( RuntimeException, std::exception )
+Reference< XFrame > SAL_CALL OGenericUnoController::getFrame()
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return m_aCurrentFrame.getFrame();
 }
 
-sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/)
 {
     SAL_WARN("dbaccess.ui", "OGenericUnoController::attachModel: not supported!" );
     return false;
@@ -1296,7 +1296,6 @@ Reference< XTitle > OGenericUnoController::impl_getTitleHelper_throw()
 
 // XTitle
 OUString SAL_CALL OGenericUnoController::getTitle()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     if ( m_bExternalTitle )
@@ -1306,7 +1305,6 @@ OUString SAL_CALL OGenericUnoController::getTitle()
 
 // XTitle
 void SAL_CALL OGenericUnoController::setTitle(const OUString& sTitle)
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -1316,7 +1314,6 @@ void SAL_CALL OGenericUnoController::setTitle(const OUString& sTitle)
 
 // XTitleChangeBroadcaster
 void SAL_CALL OGenericUnoController::addTitleChangeListener(const Reference< XTitleChangeListener >& xListener)
-    throw (RuntimeException, std::exception)
 {
     Reference< XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper_throw(), UNO_QUERY);
     if (xBroadcaster.is ())
@@ -1324,7 +1321,6 @@ void SAL_CALL OGenericUnoController::addTitleChangeListener(const Reference< XTi
 }
 
 void SAL_CALL OGenericUnoController::removeTitleChangeListener(const Reference< XTitleChangeListener >& xListener)
-    throw (RuntimeException, std::exception)
 {
     Reference< XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper_throw(), UNO_QUERY);
     if (xBroadcaster.is ())
@@ -1332,24 +1328,24 @@ void SAL_CALL OGenericUnoController::removeTitleChangeListener(const Reference<
 }
 
 // XUserInputInterception
-void SAL_CALL OGenericUnoController::addKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL OGenericUnoController::addKeyHandler( const Reference< XKeyHandler >& _rxHandler )
 {
     if ( _rxHandler.is() )
         m_pData->m_aUserInputInterception.addKeyHandler( _rxHandler );
 }
 
-void SAL_CALL OGenericUnoController::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL OGenericUnoController::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler )
 {
     m_pData->m_aUserInputInterception.removeKeyHandler( _rxHandler );
 }
 
-void SAL_CALL OGenericUnoController::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL OGenericUnoController::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler )
 {
     if ( _rxHandler.is() )
         m_pData->m_aUserInputInterception.addMouseClickHandler( _rxHandler );
 }
 
-void SAL_CALL OGenericUnoController::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL OGenericUnoController::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler )
 {
     m_pData->m_aUserInputInterception.removeMouseClickHandler( _rxHandler );
 }
@@ -1402,7 +1398,7 @@ bool OGenericUnoController::isDataSourceReadOnly() const
     return false;
 }
 
-Reference< XController > OGenericUnoController::getXController() throw( RuntimeException )
+Reference< XController > OGenericUnoController::getXController()
 {
     return this;
 }
@@ -1431,7 +1427,7 @@ bool OGenericUnoController::isCommandEnabled( const OUString& _rCompleteCommandU
     return bIsEnabled;
 }
 
-Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroups() throw (RuntimeException, std::exception)
+Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroups()
 {
     CommandHashMap aCmdHashMap;
     for (   SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin();
@@ -1454,7 +1450,7 @@ namespace
     };
 }
 
-Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (RuntimeException, std::exception)
+Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup )
 {
     ::std::list< DispatchInformation > aInformationList;
     DispatchInformation aDispatchInfo;
@@ -1491,7 +1487,7 @@ void OGenericUnoController::fillSupportedFeatures()
 #endif
 }
 
-void SAL_CALL OGenericUnoController::dispose() throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL OGenericUnoController::dispose()
 {
     SolarMutexGuard aSolarGuard;
     OGenericUnoController_Base::dispose();
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index ed1603953805..51f998e82da9 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -107,7 +107,7 @@ extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl()
     static OMultiInstanceAutoRegistration< SbaXGridControl > aAutoRegistration;
 }
 
-css::uno::Sequence<OUString> SAL_CALL SbaXGridControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL SbaXGridControl::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -119,17 +119,17 @@ Reference< XInterface > SAL_CALL SbaXGridControl::Create(const Reference<XMultiS
 
 // SbaXGridControl
 
-OUString SAL_CALL SbaXGridControl::getImplementationName() throw(std::exception)
+OUString SAL_CALL SbaXGridControl::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString SbaXGridControl::getImplementationName_Static() throw( RuntimeException )
+OUString SbaXGridControl::getImplementationName_Static()
 {
     return OUString("com.sun.star.comp.dbu.SbaXGridControl");
 }
 
-Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static()
 {
     Sequence< OUString> aSupported(3);
     aSupported[0] = "com.sun.star.form.control.InteractionGridControl";
@@ -171,13 +171,13 @@ FmXGridPeer* SbaXGridControl::imp_CreatePeer(vcl::Window* pParent)
     return pReturn;
 }
 
-Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType)
 {
     Any aRet = FmXGridControl::queryInterface(_rType);
     return aRet.hasValue() ? aRet : ::cppu::queryInterface(_rType,static_cast<css::frame::XDispatch*>(this));
 }
 
-Sequence< Type > SAL_CALL SbaXGridControl::getTypes(  ) throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL SbaXGridControl::getTypes(  )
 {
     Sequence< Type > aTypes = FmXGridControl::getTypes();
 
@@ -188,12 +188,12 @@ Sequence< Type > SAL_CALL SbaXGridControl::getTypes(  ) throw (RuntimeException,
     return aTypes;
 }
 
-Sequence< sal_Int8 > SAL_CALL SbaXGridControl::getImplementationId(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL SbaXGridControl::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-void SAL_CALL SbaXGridControl::createPeer(const Reference< css::awt::XToolkit > & rToolkit, const Reference< css::awt::XWindowPeer > & rParentPeer) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXGridControl::createPeer(const Reference< css::awt::XToolkit > & rToolkit, const Reference< css::awt::XWindowPeer > & rParentPeer)
 {
     FmXGridControl::createPeer(rToolkit, rParentPeer);
 
@@ -212,14 +212,14 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< css::awt::XToolkit >
         }
 }
 
-void SAL_CALL SbaXGridControl::dispatch(const css::util::URL& aURL, const Sequence< PropertyValue >& aArgs) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXGridControl::dispatch(const css::util::URL& aURL, const Sequence< PropertyValue >& aArgs)
 {
     Reference< css::frame::XDispatch >  xDisp(getPeer(), UNO_QUERY);
     if (xDisp.is())
         xDisp->dispatch(aURL, aArgs);
 }
 
-void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListener > & _rxListener, const URL& _rURL ) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListener > & _rxListener, const URL& _rURL )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     if ( _rxListener.is() )
@@ -246,7 +246,7 @@ void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListen
     }
 }
 
-void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< css::frame::XStatusListener > & _rxListener, const css::util::URL& _rURL) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< css::frame::XStatusListener > & _rxListener, const css::util::URL& _rURL)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
@@ -264,7 +264,7 @@ void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< css::frame:
     xMultiplexer->removeInterface( _rxListener );
 }
 
-void SAL_CALL SbaXGridControl::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXGridControl::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -297,7 +297,7 @@ SbaXGridPeer::~SbaXGridPeer()
 {
 }
 
-void SAL_CALL SbaXGridPeer::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL SbaXGridPeer::dispose()
 {
     EventObject aEvt(*this);
 
@@ -338,7 +338,7 @@ void SbaXGridPeer::NotifyStatusChanged(const css::util::URL& _rUrl, const Refere
     }
 }
 
-Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType)
 {
     Any aRet = ::cppu::queryInterface(_rType,static_cast<css::frame::XDispatch*>(this));
     if(aRet.hasValue())
@@ -346,7 +346,7 @@ Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeExce
     return FmXGridPeer::queryInterface(_rType);
 }
 
-Reference< css::frame::XDispatch >  SAL_CALL SbaXGridPeer::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception )
+Reference< css::frame::XDispatch >  SAL_CALL SbaXGridPeer::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags)
 {
     if  (   ( aURL.Complete == ".uno:GridSlots/BrowserAttribs" ) || ( aURL.Complete == ".uno:GridSlots/RowHeight" )
         ||  ( aURL.Complete == ".uno:GridSlots/ColumnAttribs" )  || ( aURL.Complete == ".uno:GridSlots/ColumnWidth" )
@@ -393,7 +393,7 @@ SbaXGridPeer::DispatchType SbaXGridPeer::classifyDispatchURL( const URL& _rURL )
     return eURLType;
 }
 
-void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyValue >& aArgs) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyValue >& aArgs)
 {
     VclPtr< SbaGridControl > pGrid = GetAs< SbaGridControl >();
     if (!pGrid)
@@ -491,7 +491,7 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa
     }
 }
 
-void SAL_CALL SbaXGridPeer::addStatusListener(const Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXGridPeer::addStatusListener(const Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL)
 {
     ::cppu::OInterfaceContainerHelper* pCont = m_aStatusListeners.getContainer(aURL);
     if (!pCont)
@@ -501,7 +501,7 @@ void SAL_CALL SbaXGridPeer::addStatusListener(const Reference< css::frame::XStat
     NotifyStatusChanged(aURL, xControl);
 }
 
-void SAL_CALL SbaXGridPeer::removeStatusListener(const Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( RuntimeException, std::exception )
+void SAL_CALL SbaXGridPeer::removeStatusListener(const Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL)
 {
     ::cppu::OInterfaceContainerHelper* pCont = m_aStatusListeners.getContainer(aURL);
     if ( pCont )
@@ -518,7 +518,7 @@ const Sequence< sal_Int8 > & SbaXGridPeer::getUnoTunnelId()
     return theSbaXGridPeerUnoTunnelId::get().getSeq();
 }
 
-Sequence< Type > SAL_CALL SbaXGridPeer::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL SbaXGridPeer::getTypes()
 {
     Sequence< Type > aTypes = FmXGridPeer::getTypes();
     sal_Int32 nOldLen = aTypes.getLength();
@@ -529,7 +529,7 @@ Sequence< Type > SAL_CALL SbaXGridPeer::getTypes() throw (RuntimeException, std:
 }
 
 // return implementation specific data
-sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast< sal_Int64 >( this );
diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx
index 2dfbe33e31fa..f6ae47d866a8 100644
--- a/dbaccess/source/ui/browser/sbamultiplex.cxx
+++ b/dbaccess/source/ui/browser/sbamultiplex.cxx
@@ -25,7 +25,7 @@ using namespace dbaui;
 // XStatusListener
 IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXStatusMultiplexer, css::frame::XStatusListener)
 
-void SAL_CALL SbaXStatusMultiplexer::statusChanged(const css::frame::FeatureStateEvent& e) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SbaXStatusMultiplexer::statusChanged(const css::frame::FeatureStateEvent& e)
 {
     m_aLastKnownStatus = e;
     m_aLastKnownStatus.Source = &m_rParent;
@@ -72,14 +72,14 @@ IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(SbaXResetMultiplexer, css::form::XRes
 IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(SbaXResetMultiplexer, css::form::XResetListener, resetted, css::lang::EventObject)
 
 // css::beans::XPropertyChangeListener
-IMPLEMENT_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, css::beans::XPropertyChangeListener, propertyChange, css::beans::PropertyChangeEvent, (css::uno::RuntimeException, std::exception))
+IMPLEMENT_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, css::beans::XPropertyChangeListener, propertyChange, css::beans::PropertyChangeEvent)
 
 // css::beans::XVetoableChangeListener
-IMPLEMENT_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, css::beans::XVetoableChangeListener, vetoableChange, css::beans::PropertyChangeEvent, (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception))
+IMPLEMENT_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, css::beans::XVetoableChangeListener, vetoableChange, css::beans::PropertyChangeEvent)
 
 // css::beans::XPropertiesChangeListener
 IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXPropertiesChangeMultiplexer, css::beans::XPropertiesChangeListener);
-void SbaXPropertiesChangeMultiplexer::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& aEvts) throw(css::uno::RuntimeException, std::exception)
+void SbaXPropertiesChangeMultiplexer::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& aEvts)
 {
     // the SbaXPropertiesChangeMultiplexer doesn't care about the property names a listener logs on for, it simply
     // forwards _all_ changes to _all_ listeners
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 7c05f3ef1d85..f13aee4edc59 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -180,22 +180,22 @@ void SafeRemovePropertyListener(const Reference< XPropertySet > & xSet, const OU
         xSet->removePropertyChangeListener(rPropName, pListener);
 }
 
-OUString SAL_CALL SbaTableQueryBrowser::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL SbaTableQueryBrowser::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-css::uno::Sequence<OUString> SAL_CALL SbaTableQueryBrowser::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL SbaTableQueryBrowser::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-OUString SbaTableQueryBrowser::getImplementationName_Static() throw(RuntimeException)
+OUString SbaTableQueryBrowser::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.ODatasourceBrowser");
 }
 
-css::uno::Sequence<OUString> SbaTableQueryBrowser::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString> SbaTableQueryBrowser::getSupportedServiceNames_Static()
 {
     css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.DataSourceBrowser" };
     return aSupported;
@@ -238,7 +238,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
     m_pSplitter.reset();
 }
 
-Any SAL_CALL SbaTableQueryBrowser::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL SbaTableQueryBrowser::queryInterface(const Type& _rType)
 {
     if ( _rType.equals( cppu::UnoType<XScriptInvocationContext>::get() ) )
     {
@@ -254,7 +254,7 @@ Any SAL_CALL SbaTableQueryBrowser::queryInterface(const Type& _rType) throw (Run
     return aReturn;
 }
 
-Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes(  ) throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes(  )
 {
     Sequence< Type > aTypes( ::comphelper::concatSequences(
         SbaXDataBrowserController::getTypes(),
@@ -276,7 +276,7 @@ Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes(  ) throw (RuntimeExcep
     return aTypes;
 }
 
-Sequence< sal_Int8 > SAL_CALL SbaTableQueryBrowser::getImplementationId(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL SbaTableQueryBrowser::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -845,7 +845,7 @@ void SbaTableQueryBrowser::transferChangedControlProperty(const OUString& _rProp
     }
 }
 
-void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt)
 {
     SbaXDataBrowserController::propertyChange(evt);
 
@@ -952,7 +952,7 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw(
     }
 }
 
-sal_Bool SbaTableQueryBrowser::suspend(sal_Bool bSuspend) throw( RuntimeException, std::exception )
+sal_Bool SbaTableQueryBrowser::suspend(sal_Bool bSuspend)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -975,7 +975,7 @@ sal_Bool SbaTableQueryBrowser::suspend(sal_Bool bSuspend) throw( RuntimeExceptio
     return bRet;
 }
 
-void SAL_CALL SbaTableQueryBrowser::statusChanged( const FeatureStateEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::statusChanged( const FeatureStateEvent& _rEvent )
 {
     // search the external dispatcher causing this call
     Reference< XDispatch > xSource(_rEvent.Source, UNO_QUERY);
@@ -1342,7 +1342,7 @@ void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId )
     InvalidateFeature( _nId );
 }
 
-void SAL_CALL SbaTableQueryBrowser::disposing( const css::lang::EventObject& _rSource ) throw(RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::disposing( const css::lang::EventObject& _rSource )
 {
     // our frame ?
     Reference< css::frame::XFrame >  xSourceFrame(_rSource.Source, UNO_QUERY);
@@ -1424,7 +1424,7 @@ void SbaTableQueryBrowser::implRemoveStatusListeners()
     m_aExternalFeatures.clear();
 }
 
-sal_Bool SAL_CALL SbaTableQueryBrowser::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL SbaTableQueryBrowser::select( const Any& _rSelection )
 {
     SolarMutexGuard aGuard;
         // doin' a lot of VCL stuff here -> lock the SolarMutex
@@ -1452,7 +1452,7 @@ sal_Bool SAL_CALL SbaTableQueryBrowser::select( const Any& _rSelection ) throw (
     return implSelect(aDescriptor,true);
 }
 
-Any SAL_CALL SbaTableQueryBrowser::getSelection(  ) throw (RuntimeException, std::exception)
+Any SAL_CALL SbaTableQueryBrowser::getSelection(  )
 {
     Any aReturn;
 
@@ -1478,17 +1478,17 @@ Any SAL_CALL SbaTableQueryBrowser::getSelection(  ) throw (RuntimeException, std
     return aReturn;
 }
 
-void SAL_CALL SbaTableQueryBrowser::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener )
 {
     m_aSelectionListeners.addInterface(_rxListener);
 }
 
-void SAL_CALL SbaTableQueryBrowser::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener )
 {
     m_aSelectionListeners.removeInterface(_rxListener);
 }
 
-void SbaTableQueryBrowser::attachFrame(const Reference< css::frame::XFrame > & _xFrame) throw( RuntimeException, std::exception )
+void SbaTableQueryBrowser::attachFrame(const Reference< css::frame::XFrame > & _xFrame)
 {
     implRemoveStatusListeners();
 
@@ -2734,7 +2734,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNa
     return pContainer;
 }
 
-void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEvent )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2779,7 +2779,7 @@ bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const OUString& _sName,Sv
             &&  m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed) == _sName;
 }
 
-void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEvent )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2831,7 +2831,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven
         SbaXDataBrowserController::elementRemoved(_rEvent);
 }
 
-void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEvent )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -3581,7 +3581,7 @@ bool SbaTableQueryBrowser::implGetQuerySignature( OUString& _rCommand, bool& _bE
     return false;
 }
 
-void SbaTableQueryBrowser::frameAction(const css::frame::FrameActionEvent& aEvent) throw( RuntimeException, std::exception )
+void SbaTableQueryBrowser::frameAction(const css::frame::FrameActionEvent& aEvent)
 {
     if (aEvent.Frame == m_xCurrentFrameParent)
     {
@@ -3688,7 +3688,7 @@ void SbaTableQueryBrowser::postReloadForm()
     LoadFinished(true);
 }
 
-Reference< XEmbeddedScripts > SAL_CALL SbaTableQueryBrowser::getScriptContainer() throw (RuntimeException, std::exception)
+Reference< XEmbeddedScripts > SAL_CALL SbaTableQueryBrowser::getScriptContainer()
 {
     // update our database document
     Reference< XModel > xDocument;
@@ -3713,19 +3713,19 @@ Reference< XEmbeddedScripts > SAL_CALL SbaTableQueryBrowser::getScriptContainer(
     return xScripts;
 }
 
-void SAL_CALL SbaTableQueryBrowser::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor )
 {
     if ( Interceptor.is() )
         m_aContextMenuInterceptors.addInterface( Interceptor );
 }
 
-void SAL_CALL SbaTableQueryBrowser::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::releaseContextMenuInterceptor( const Reference< XContextMenuInterceptor >& Interceptor )
 {
     if ( Interceptor.is() )
         m_aContextMenuInterceptors.removeInterface( Interceptor );
 }
 
-void SAL_CALL SbaTableQueryBrowser::registeredDatabaseLocation( const DatabaseRegistrationEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::registeredDatabaseLocation( const DatabaseRegistrationEvent& Event )
 {
     SolarMutexGuard aGuard;
     implAddDatasource( Event.Name, SharedConnection() );
@@ -3780,7 +3780,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSo
     m_pTreeModel->Remove( pDataSourceEntry );
 }
 
-void SAL_CALL SbaTableQueryBrowser::revokedDatabaseLocation( const DatabaseRegistrationEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::revokedDatabaseLocation( const DatabaseRegistrationEvent& Event )
 {
     SolarMutexGuard aGuard;
 
@@ -3790,7 +3790,7 @@ void SAL_CALL SbaTableQueryBrowser::revokedDatabaseLocation( const DatabaseRegis
     checkDocumentDataSource();
 }
 
-void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegistrationEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegistrationEvent& Event )
 {
     SolarMutexGuard aGuard;
 
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index f191ceee0ba8..0cab1f0b695b 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -514,10 +514,10 @@ namespace
         {
         }
 
-        virtual sal_Bool SAL_CALL select( const Any& xSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) override;
-        virtual Any SAL_CALL getSelection(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL select( const Any& xSelection ) override;
+        virtual Any SAL_CALL getSelection(  ) override;
+        virtual void SAL_CALL addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) override;
+        virtual void SAL_CALL removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) override;
 
     protected:
         virtual ~SelectionSupplier() override
@@ -528,24 +528,24 @@ namespace
         Any m_aSelection;
     };
 
-    sal_Bool SAL_CALL SelectionSupplier::select( const Any& /*_Selection*/ ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL SelectionSupplier::select( const Any& /*_Selection*/ )
     {
         throw IllegalArgumentException();
         // API bug: this should be a NoSupportException
     }
 
-    Any SAL_CALL SelectionSupplier::getSelection(  ) throw (RuntimeException, std::exception)
+    Any SAL_CALL SelectionSupplier::getSelection(  )
     {
         return m_aSelection;
     }
 
-    void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ )
     {
         OSL_FAIL( "SelectionSupplier::removeSelectionChangeListener: no support!" );
         // API bug: this should be a NoSupportException
     }
 
-    void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ )
     {
         OSL_FAIL( "SelectionSupplier::removeSelectionChangeListener: no support!" );
         // API bug: this should be a NoSupportException
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index fa80d16ce681..8f15819db3e8 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -47,16 +47,14 @@ public:
 private:
     virtual ~ChangesListener() override {}
 
-    virtual void SAL_CALL disposing(css::lang::EventObject const &)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing(css::lang::EventObject const &) override
     {
         osl::MutexGuard g(editor_.m_mutex);
         editor_.m_notifier.clear();
     }
 
     virtual void SAL_CALL propertiesChange(
-        css::uno::Sequence< css::beans::PropertyChangeEvent > const &)
-        throw (css::uno::RuntimeException, std::exception) override
+        css::uno::Sequence< css::beans::PropertyChangeEvent > const &) override
     {
         SolarMutexGuard g;
         editor_.ImplSetFont();
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 4e686720f169..39c001c39fb7 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -136,7 +136,7 @@ void OTableTreeListBox::implOnNewConnection( const Reference< XConnection >& _rx
     m_xImageProvider.reset( new ImageProvider( m_xConnection  ) );
 }
 
-void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConnection ) throw(SQLException, std::exception)
+void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConnection )
 {
     Sequence< OUString > sTables, sViews;
 
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index b6dd66a63996..997091e06cbb 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -79,9 +79,9 @@ private:
     virtual OUString  getSelectedName( OUString& _out_rAliasName ) const override;
     virtual bool    isLeafSelected() const override;
     // OContainerListener
-    virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) override;
+    virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) override;
+    virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
 };
 
 TableListFacade::~TableListFacade()
@@ -132,17 +132,17 @@ OUString TableListFacade::getSelectedName( OUString& _out_rAliasName ) const
     return aComposedName;
 }
 
-void TableListFacade::_elementInserted( const container::ContainerEvent& /*_rEvent*/ )  throw(css::uno::RuntimeException, std::exception)
+void TableListFacade::_elementInserted( const container::ContainerEvent& /*_rEvent*/ )
 {
     updateTableObjectList(m_bAllowViews);
 }
 
-void TableListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception)
+void TableListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ )
 {
     updateTableObjectList(m_bAllowViews);
 }
 
-void TableListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception)
+void TableListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ )
 {
 }
 
@@ -239,9 +239,9 @@ private:
     virtual OUString  getSelectedName( OUString& _out_rAliasName ) const override;
     virtual bool    isLeafSelected() const override;
     // OContainerListener
-    virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) override;
+    virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) override;
+    virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
 };
 
 QueryListFacade::~QueryListFacade()
@@ -250,19 +250,19 @@ QueryListFacade::~QueryListFacade()
         m_pContainerListener->dispose();
 }
 
-void QueryListFacade::_elementInserted( const container::ContainerEvent& _rEvent )  throw(css::uno::RuntimeException, std::exception)
+void QueryListFacade::_elementInserted( const container::ContainerEvent& _rEvent )
 {
     OUString sName;
     if ( _rEvent.Accessor >>= sName )
         m_rQueryList.InsertEntry( sName );
 }
 
-void QueryListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception)
+void QueryListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ )
 {
     updateTableObjectList(true);
 }
 
-void QueryListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception)
+void QueryListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ )
 {
 }
 
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index cede9081fa8f..f453a44cf2bf 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -880,10 +880,10 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             void doLoadAsync();
 
             // XTerminateListener
-            virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) override;
-            virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (RuntimeException, std::exception) override;
+            virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override;
+            virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) 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;
 
         private:
             DECL_LINK( OnOpenDocument, void*, void );
@@ -956,15 +956,15 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             release();
         }
 
-        void SAL_CALL AsyncLoader::queryTermination( const css::lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException, std::exception)
+        void SAL_CALL AsyncLoader::queryTermination( const css::lang::EventObject& /*Event*/ )
         {
             throw TerminationVetoException();
         }
 
-        void SAL_CALL AsyncLoader::notifyTermination( const css::lang::EventObject& /*Event*/ ) throw (RuntimeException, std::exception)
+        void SAL_CALL AsyncLoader::notifyTermination( const css::lang::EventObject& /*Event*/ )
         {
         }
-        void SAL_CALL AsyncLoader::disposing( const css::lang::EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+        void SAL_CALL AsyncLoader::disposing( const css::lang::EventObject& /*Source*/ )
         {
         }
     }
diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx
index bfd5250dc155..611119a0c574 100644
--- a/dbaccess/source/ui/dlg/finteraction.cxx
+++ b/dbaccess/source/ui/dlg/finteraction.cxx
@@ -38,7 +38,7 @@ namespace dbaui
     {
     }
 
-    void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException, std::exception)
+    void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest )
     {
         InteractiveIOException aIoException;
         if ( _rxRequest->getRequest() >>= aIoException )
diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx
index b022252f56a6..9c78f99ee8c1 100644
--- a/dbaccess/source/ui/dlg/finteraction.hxx
+++ b/dbaccess/source/ui/dlg/finteraction.hxx
@@ -46,7 +46,7 @@ namespace dbaui
 
     protected:
         // XInteractionHandler
-        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) override;
 
         virtual ~OFilePickerInteractionHandler() override;
     };
diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
index 4764f83c7da3..5fd37cdbf4bf 100644
--- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
@@ -46,7 +46,7 @@ namespace dbaui
         OConnectionLineAccess(OTableConnection* _pLine);
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire(  ) throw () override
         { // here inline is allowed because we do not use this class outside this dll
             VCLXAccessibleComponent::acquire(  );
@@ -57,34 +57,34 @@ namespace dbaui
         }
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
 
         // XAccessibleComponent
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+        virtual css::awt::Point SAL_CALL getLocation(  ) override;
+        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+        virtual css::awt::Size SAL_CALL getSize(  ) override;
 
         // XAccessibleRelationSet
-        virtual sal_Int32 SAL_CALL getRelationCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getRelationCount(  ) override;
+        virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) override;
+        virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) override;
+        virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEACCESS_HXX
diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx
index 17bd6407e4eb..8e8b2c6dccb3 100644
--- a/dbaccess/source/ui/inc/JAccess.hxx
+++ b/dbaccess/source/ui/inc/JAccess.hxx
@@ -44,15 +44,15 @@ namespace dbaui
         DECLARE_XINTERFACE( )
         DECLARE_XTYPEPROVIDER( )
 
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
         void notifyAccessibleEvent(
                     const sal_Int16 _nEventId,
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index 84cca22fc3da..15cabf9cd9fc 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -121,7 +121,7 @@ namespace dbaui
         // css::lang::XComponent
         virtual void    SAL_CALL disposing() override;
         // css::frame::XController
-        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) override;
 
         // misc
         /** only defines a method to save a SQLException in d&d methods to show the error at a later state
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx
index 8e16380d4954..c614f5802c74 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -46,12 +46,12 @@ namespace dbaui
 
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire(  ) throw() override;
         virtual void SAL_CALL release(  ) throw() override;
 
         // XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) override;
 
         void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener );
 
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index ffa45ffc6ef3..5f56b3d50212 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -55,13 +55,13 @@ namespace dbaui
         virtual bool Construct(vcl::Window* pParent) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
         // need by registration
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx
index 5e3ddc946317..54d779540c70 100644
--- a/dbaccess/source/ui/inc/RelationTableView.hxx
+++ b/dbaccess/source/ui/inc/RelationTableView.hxx
@@ -47,9 +47,9 @@ namespace dbaui
         virtual bool    allowQueries() const override;
 
         // OContainerListener
-        virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) override;
+        virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) override;
+        virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
 
     public:
         ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView );
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 9192616f2e82..bd543443a38d 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -59,9 +59,7 @@ namespace dbaui
         void loadData();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        bool checkColumns(bool _bNew)
-            throw (css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception);      // check if we have double column names
+        bool checkColumns(bool _bNew);      // check if we have double column names
         void appendColumns(css::uno::Reference< css::sdbcx::XColumnsSupplier>& _rxColSup, bool _bNew, bool _bKeyColumns = false);
         void appendPrimaryKey(css::uno::Reference< css::sdbcx::XKeysSupplier>& _rxSup, bool _bNew);
         void alterColumns();
@@ -115,22 +113,22 @@ namespace dbaui
 
         virtual bool                        Construct(vcl::Window* pParent) 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;
 
         // css::frame::XController
-        virtual sal_Bool SAL_CALL           suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL           suspend(sal_Bool bSuspend) override;
 
         // css::lang::XComponent
         virtual void        SAL_CALL disposing() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
         // need by registration
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index 30aec968dc65..082ac7085992 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -77,9 +77,9 @@ namespace dbaui
         bool                    m_bActive;
 
         // OContainerListener
-        virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) override;
+        virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) override;
+        virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
 
     protected:
         virtual void    Resize() override;
diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx
index 67dd6928c355..ff266f99b624 100644
--- a/dbaccess/source/ui/inc/TableWindowAccess.hxx
+++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx
@@ -49,7 +49,7 @@ namespace dbaui
         OTableWindowAccess( OTableWindow* _pTable);
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire(  ) throw () override
         { // here inline is allowed because we do not use this class outside this dll
             VCLXAccessibleComponent::acquire(  );
@@ -60,34 +60,34 @@ namespace dbaui
         }
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
 
         // XAccessibleComponent
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
 
         // XAccessibleExtendedComponent
-        virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTitledBorderText(  ) override;
 
         // XAccessibleRelationSet
-        virtual sal_Int32 SAL_CALL getRelationCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getRelationCount(  ) override;
+        virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) override;
+        virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) override;
+        virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWACCESS_HXX
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 9309a138d051..d97d3a84d2ea 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -113,7 +113,7 @@ namespace dbaui
         bool isCheckEnabled() const { return m_bCheckOnly; }
 
     private:
-        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;
         void impl_initFromDescriptor( const svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit );
     };
 
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index ad974c939816..bf59d4da692a 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -146,62 +146,62 @@ namespace dbaui
         virtual bool Construct(vcl::Window* pParent) override;
 
         // UNO
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
         // css::lang::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;
 
         // css::util::XModifyListener
-        virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override;
 
         // css::container::XContainerListener
-        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) override;
+        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) override;
+        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
         // XModule
-        virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getIdentifier(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setIdentifier( const OUString& Identifier ) override;
+        virtual OUString SAL_CALL getIdentifier(  ) override;
 
         // css::awt::XFocusListener
-        virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) override;
+        virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) override;
 
         // css::frame::XController
-        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) override;
 
         // css::lang::XComponent
         virtual void        SAL_CALL disposing() override;
 
         // css::frame::XFrameActionListener
-        virtual void        SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void        SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override;
 
         // css::sdb::XSQLErrorListener
-        virtual void        SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void        SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) override;
 
         // css::form::XDatabaseParameterListener
-        virtual sal_Bool    SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool    SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) override;
 
         // css::form::XConfirmDeleteListener
-        virtual sal_Bool    SAL_CALL confirmDelete(const css::sdb::RowChangeEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool    SAL_CALL confirmDelete(const css::sdb::RowChangeEvent& aEvent) override;
 
         // css::form::XLoadListener
-        virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) override;
+        virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) override;
+        virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) override;
+        virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) override;
+        virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) override;
 
         // css::form::XResetListener
-        virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) override;
+        virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) override;
 
         // SbaGridListener
         virtual void RowChanged() override;
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index 1d3a07c9534a..e757caf2af2b 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -72,7 +72,7 @@ namespace dbaui
         );
 
         // 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;
 
     protected:
         virtual void        AddSupportedFormats() override;
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx
index bfd3c5e0ef4d..f38683efc960 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -44,44 +44,44 @@ namespace dbaui
         SbaExternalSourceBrowser(const css::uno::Reference< css::uno::XComponentContext >& _rM);
 
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // UNO
         DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, SbaXDataBrowserController)
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
         //  virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > >  getIdlClasses();
 
         //  static css::uno::Reference< css::reflection::XIdlClass >  getStaticIdlClass();
 
         // css::frame::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 dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override;
 
         // css::frame::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;
+        virtual css::uno::Reference< css::frame::XDispatch >  SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) override;
 
         // css::util::XModifyListener
-        virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override;
 
         // css::util::XModifyBroadcaster
-        virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) override;
+        virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & aListener) override;
 
         // css::lang::XComponent
         virtual void SAL_CALL disposing() override;
 
         // css::form::XLoadListener
-        virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) override;
 
         // css::lang::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;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     protected:
         virtual ~SbaExternalSourceBrowser() override;
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 045accdf1ef0..d75ba04195dd 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -162,272 +162,272 @@ namespace dbaui
 
         // UNO
         DECLARE_UNO3_DEFAULTS(SbaXFormAdapter, SbaXFormAdapter_BASE1)
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // css::sdbc::XCloseable
-        virtual void SAL_CALL close() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close() override;
 
     // css::sdbc::XResultSetMetaDataSupplier
-        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() override;
 
     // css::sdbc::XColumnLocate
-        virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) override;
 
     // css::sdbcx::XColumnsSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns() override;
 
     // css::sdbc::XRow
-        virtual sal_Bool SAL_CALL wasNull() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getString(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBoolean(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int8 SAL_CALL getByte(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getShort(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getInt(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int64 SAL_CALL getLong(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual float SAL_CALL getFloat(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual double SAL_CALL getDouble(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Date SAL_CALL getDate(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTime(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::util::DateTime SAL_CALL getTimestamp(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream >  SAL_CALL getBinaryStream(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream >  SAL_CALL getCharacterStream(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getObject(sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XRef >  SAL_CALL getRef(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XBlob >  SAL_CALL getBlob(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XClob >  SAL_CALL getClob(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XArray >  SAL_CALL getArray(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL wasNull() override;
+        virtual OUString SAL_CALL getString(sal_Int32 columnIndex) override;
+        virtual sal_Bool SAL_CALL getBoolean(sal_Int32 columnIndex) override;
+        virtual sal_Int8 SAL_CALL getByte(sal_Int32 columnIndex) override;
+        virtual sal_Int16 SAL_CALL getShort(sal_Int32 columnIndex) override;
+        virtual sal_Int32 SAL_CALL getInt(sal_Int32 columnIndex) override;
+        virtual sal_Int64 SAL_CALL getLong(sal_Int32 columnIndex) override;
+        virtual float SAL_CALL getFloat(sal_Int32 columnIndex) override;
+        virtual double SAL_CALL getDouble(sal_Int32 columnIndex) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 columnIndex) override;
+        virtual css::util::Date SAL_CALL getDate(sal_Int32 columnIndex) override;
+        virtual css::util::Time SAL_CALL getTime(sal_Int32 columnIndex) override;
+        virtual css::util::DateTime SAL_CALL getTimestamp(sal_Int32 columnIndex) override;
+        virtual css::uno::Reference< css::io::XInputStream >  SAL_CALL getBinaryStream(sal_Int32 columnIndex) override;
+        virtual css::uno::Reference< css::io::XInputStream >  SAL_CALL getCharacterStream(sal_Int32 columnIndex) override;
+        virtual css::uno::Any SAL_CALL getObject(sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap) override;
+        virtual css::uno::Reference< css::sdbc::XRef >  SAL_CALL getRef(sal_Int32 columnIndex) override;
+        virtual css::uno::Reference< css::sdbc::XBlob >  SAL_CALL getBlob(sal_Int32 columnIndex) override;
+        virtual css::uno::Reference< css::sdbc::XClob >  SAL_CALL getClob(sal_Int32 columnIndex) override;
+        virtual css::uno::Reference< css::sdbc::XArray >  SAL_CALL getArray(sal_Int32 columnIndex) override;
 
     // css::sdbcx::XRowLocate
-        virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL moveToBookmark(const css::uno::Any& bookmark) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL moveRelativeToBookmark(const css::uno::Any& bookmark, sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL compareBookmarks(const css::uno::Any& first, const css::uno::Any& second) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasOrderedBookmarks() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL hashBookmark(const css::uno::Any& bookmark) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getBookmark() override;
+        virtual sal_Bool SAL_CALL moveToBookmark(const css::uno::Any& bookmark) override;
+        virtual sal_Bool SAL_CALL moveRelativeToBookmark(const css::uno::Any& bookmark, sal_Int32 rows) override;
+        virtual sal_Int32 SAL_CALL compareBookmarks(const css::uno::Any& first, const css::uno::Any& second) override;
+        virtual sal_Bool SAL_CALL hasOrderedBookmarks() override;
+        virtual sal_Int32 SAL_CALL hashBookmark(const css::uno::Any& bookmark) override;
 
     // css::sdbc::XRowUpdate
-        virtual void SAL_CALL updateNull(sal_Int32 columnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateByte(sal_Int32 columnIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateShort(sal_Int32 columnIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateInt(sal_Int32 columnIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateLong(sal_Int32 columnIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateFloat(sal_Int32 columnIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDouble(sal_Int32 columnIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateString(sal_Int32 columnIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBytes(sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateDate(sal_Int32 columnIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTime(sal_Int32 columnIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateBinaryStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateCharacterStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateObject(sal_Int32 columnIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateNumericObject(sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateNull(sal_Int32 columnIndex) override;
+        virtual void SAL_CALL updateBoolean(sal_Int32 columnIndex, sal_Bool x) override;
+        virtual void SAL_CALL updateByte(sal_Int32 columnIndex, sal_Int8 x) override;
+        virtual void SAL_CALL updateShort(sal_Int32 columnIndex, sal_Int16 x) override;
+        virtual void SAL_CALL updateInt(sal_Int32 columnIndex, sal_Int32 x) override;
+        virtual void SAL_CALL updateLong(sal_Int32 columnIndex, sal_Int64 x) override;
+        virtual void SAL_CALL updateFloat(sal_Int32 columnIndex, float x) override;
+        virtual void SAL_CALL updateDouble(sal_Int32 columnIndex, double x) override;
+        virtual void SAL_CALL updateString(sal_Int32 columnIndex, const OUString& x) override;
+        virtual void SAL_CALL updateBytes(sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x) override;
+        virtual void SAL_CALL updateDate(sal_Int32 columnIndex, const css::util::Date& x) override;
+        virtual void SAL_CALL updateTime(sal_Int32 columnIndex, const css::util::Time& x) override;
+        virtual void SAL_CALL updateTimestamp(sal_Int32 columnIndex, const css::util::DateTime& x) override;
+        virtual void SAL_CALL updateBinaryStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) override;
+        virtual void SAL_CALL updateCharacterStream(sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) override;
+        virtual void SAL_CALL updateObject(sal_Int32 columnIndex, const css::uno::Any& x) override;
+        virtual void SAL_CALL updateNumericObject(sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale) override;
 
     // css::sdbc::XResultSet
-        virtual sal_Bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isBeforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAfterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL beforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL afterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL previous() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL refreshRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowUpdated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowInserted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL rowDeleted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL getStatement() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL next() override;
+        virtual sal_Bool SAL_CALL isBeforeFirst() override;
+        virtual sal_Bool SAL_CALL isAfterLast() override;
+        virtual sal_Bool SAL_CALL isFirst() override;
+        virtual sal_Bool SAL_CALL isLast() override;
+        virtual void SAL_CALL beforeFirst() override;
+        virtual void SAL_CALL afterLast() override;
+        virtual sal_Bool SAL_CALL first() override;
+        virtual sal_Bool SAL_CALL last() override;
+        virtual sal_Int32 SAL_CALL getRow() override;
+        virtual sal_Bool SAL_CALL absolute(sal_Int32 row) override;
+        virtual sal_Bool SAL_CALL relative(sal_Int32 rows) override;
+        virtual sal_Bool SAL_CALL previous() override;
+        virtual void SAL_CALL refreshRow() override;
+        virtual sal_Bool SAL_CALL rowUpdated() override;
+        virtual sal_Bool SAL_CALL rowInserted() override;
+        virtual sal_Bool SAL_CALL rowDeleted() override;
+        virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL getStatement() override;
 
     // css::sdbc::XResultSetUpdate
-        virtual void SAL_CALL insertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deleteRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancelRowUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL moveToInsertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL moveToCurrentRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertRow() override;
+        virtual void SAL_CALL updateRow() override;
+        virtual void SAL_CALL deleteRow() override;
+        virtual void SAL_CALL cancelRowUpdates() override;
+        virtual void SAL_CALL moveToInsertRow() override;
+        virtual void SAL_CALL moveToCurrentRow() override;
 
     // css::sdbc::XRowSet
-        virtual void SAL_CALL execute() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute() override;
+        virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) override;
+        virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener >& listener) override;
 
     // css::sdbcx::XDeleteRows
-        virtual css::uno::Sequence<sal_Int32> SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any >& rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int32> SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any >& rows) override;
 
     // css::sdbc::XWarningsSupplier
-        virtual css::uno::Any SAL_CALL getWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getWarnings() override;
+        virtual void SAL_CALL clearWarnings() override;
 
     // css::sdb::XRowSetApproveBroadcaster
-        virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) override;
+        virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener >& listener) override;
 
     // css::sdbc::XSQLErrorBroadcaster
-        virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) override;
+        virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener) override;
 
     // css::sdb::XResultSetAccess
-        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createResultSet() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createResultSet() override;
 
     // css::form::XLoadable
-        virtual void SAL_CALL load() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL unload() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL reload() throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLoaded() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL load() override;
+        virtual void SAL_CALL unload() override;
+        virtual void SAL_CALL reload() override;
+        virtual sal_Bool SAL_CALL isLoaded() override;
+        virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) override;
+        virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener >& aListener) override;
 
     // css::sdbc::XParameters
-        virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearParameters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) override;
+        virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) override;
+        virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) override;
+        virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) override;
+        virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) override;
+        virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) override;
+        virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) override;
+        virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) override;
+        virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) override;
+        virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) override;
+        virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) override;
+        virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) override;
+        virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) override;
+        virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) override;
+        virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) override;
+        virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) override;
+        virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) override;
+        virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) override;
+        virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x) override;
+        virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x) override;
+        virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x) override;
+        virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x) override;
+        virtual void SAL_CALL clearParameters() override;
 
         // css::form::XDatabaseParameterBroadcaster
-        virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) override;
+        virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener >& aListener) override;
 
         // css::container::XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface >& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override;
+        virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface >& Parent) override;
 
         // css::form::XSubmit
-        virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl >& aControl, const css::awt::MouseEvent& aMouseEvt) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl >& aControl, const css::awt::MouseEvent& aMouseEvt) override;
+        virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) override;
+        virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener >& aListener) override;
 
         // css::awt::XTabControllerModel
-        virtual sal_Bool SAL_CALL getGroupControl() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setGroupControl(sal_Bool GroupControl) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  >& Controls) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  > SAL_CALL getControlModels() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  >& _rGroup, const OUString& GroupName) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getGroupCount() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL getGroup(sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  >& _rGroup, OUString& Name) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL getGroupByName(const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  >& _rGroup) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getGroupControl() override;
+        virtual void SAL_CALL setGroupControl(sal_Bool GroupControl) override;
+        virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  >& Controls) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  > SAL_CALL getControlModels() override;
+        virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  >& _rGroup, const OUString& GroupName) override;
+        virtual sal_Int32 SAL_CALL getGroupCount() override;
+        virtual void SAL_CALL getGroup(sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  >& _rGroup, OUString& Name) override;
+        virtual void SAL_CALL getGroupByName(const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel >  >& _rGroup) override;
 
         // css::lang::XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) override;
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) override;
 
         // css::beans::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;
+        virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue) override;
+        virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override;
 
         // css::container::XNamed
-        virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName() override;
+        virtual void SAL_CALL setName(const OUString& aName) override;
 
         // css::io::XPersistObject
-        virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream >& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream >& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getServiceName() override;
+        virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream >& _rxOutStream) override;
+        virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream >& _rxInStream) override;
 
         // css::beans::XMultiPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues(const css::uno::Sequence< OUString >& aPropertyNames) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertiesChangeListener(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertiesChangeListener(const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL firePropertiesChangeEvent(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
+        virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues(const css::uno::Sequence< OUString >& aPropertyNames) override;
+        virtual void SAL_CALL addPropertiesChangeListener(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override;
+        virtual void SAL_CALL removePropertiesChangeListener(const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener) override;
+        virtual void SAL_CALL firePropertiesChangeEvent(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override;
 
         // css::beans::XPropertySet
-        virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, 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 getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
+        virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
+        virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener) override;
+        virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) override;
+        virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) override;
 
         // css::util::XCancellable
-        virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cancel() override;
 
         // css::beans::XPropertyState
-        virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(const css::uno::Sequence< OUString >& aPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) override;
+        virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(const css::uno::Sequence< OUString >& aPropertyName) override;
+        virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) override;
+        virtual css::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) override;
 
         // css::form::XReset
-        virtual void SAL_CALL reset() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL reset() override;
+        virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) override;
+        virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& aListener) override;
 
         // css::container::XNameContainer
-        virtual void SAL_CALL insertByName(const OUString& aName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByName(const OUString& Name) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByName(const OUString& aName, const css::uno::Any& aElement) override;
+        virtual void SAL_CALL removeByName(const OUString& Name) override;
 
         // css::container::XNameReplace
-        virtual void SAL_CALL replaceByName(const OUString& aName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByName(const OUString& aName, const css::uno::Any& aElement) override;
 
         // css::container::XNameAccess
-        virtual css::uno::Any SAL_CALL getByName(const OUString& aName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName(const OUString& aName) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+        virtual sal_Bool SAL_CALL hasByName(const OUString& aName) override;
 
         // css::container::XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override ;
-        virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType() override ;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
         // css::container::XIndexContainer
-        virtual void SAL_CALL insertByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) override;
+        virtual void SAL_CALL removeByIndex(sal_Int32 _rIndex) override;
 
         // css::container::XIndexReplace
-        virtual void SAL_CALL replaceByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex(sal_Int32 _rIndex, const css::uno::Any& Element) override;
 
         // css::container::XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
+        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) override;
 
         // css::container::XContainer
-        virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) override;
+        virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& xListener) override;
 
         // css::container::XEnumerationAccess
-        virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() override;
 
         // css::lang::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;
 
         // css::beans::XPropertyChangeListener
-        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
     protected:
         // container handling
         /// @throws css::lang::IllegalArgumentException
-        void implInsert(const css::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = nullptr) throw(css::lang::IllegalArgumentException);
+        void implInsert(const css::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = nullptr);
         sal_Int32 implGetPos(const OUString& rName);
 
         void StopListening();
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 618f105045d4..b150b4bac473 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -164,28 +164,28 @@ namespace dbaui
         DECLARE_XINTERFACE( )
         DECLARE_XTYPEPROVIDER( )
         // XPropertySet
-        virtual css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() 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;
 
         // css::lang::XComponent
         virtual void        SAL_CALL disposing() override;
 
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
         // need by registration
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // XController
-        virtual css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL getViewData() override;
+        virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) override;
 
     private:
         virtual void    onLoadedMenu(const css::uno::Reference< css::frame::XLayoutManager >& _xLayoutManager) override;
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index e9f5c2283d3f..3647249b07ad 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -63,32 +63,32 @@ namespace dbaui
 
         // UNO
         DECLARE_UNO3_DEFAULTS(SbaXGridControl, FmXGridControl)
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
         // css::lang::XServiceInfo
-        OUString SAL_CALL getImplementationName() throw(std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+        OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
         // need by registration
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // css::frame::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;
 
         // css::lang::XComponent
-        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
-        virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit > & rToolkit, const css::uno::Reference< css::awt::XWindowPeer > & rParentPeer) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit > & rToolkit, const css::uno::Reference< css::awt::XWindowPeer > & rParentPeer) override;
 
     protected:
         virtual FmXGridPeer*    imp_CreatePeer(vcl::Window* pParent) override;
@@ -110,24 +110,24 @@ namespace dbaui
         // UNO
         virtual void SAL_CALL  acquire() throw() override { FmXGridPeer::acquire(); }
         virtual void SAL_CALL release() throw() override { FmXGridPeer::release(); }
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
         static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
-        sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 > & rId ) throw (css::uno::RuntimeException, std::exception) override;
+        sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 > & rId ) override;
         static SbaXGridPeer* getImplementation(const css::uno::Reference< css::uno::XInterface>& _rxIFace);
 
         // css::frame::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;
 
         // css::frame::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;
+        virtual css::uno::Reference< css::frame::XDispatch >  SAL_CALL queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) override;
 
         // css::lang::XComponent
-        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
     protected:
         virtual VclPtr<FmGridControl>  imp_CreateControl(vcl::Window* pParent, WinBits nStyle) override;
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx
index 58ed2c13d4f1..bc7a3f8d4c9b 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -72,16 +72,16 @@ namespace dbaui
             ::osl::Mutex& rMutex);                                                          \
         DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject)                                     \
         virtual css::uno::Any  SAL_CALL queryInterface(                        \
-            const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; \
+            const css::uno::Type& _rType) override; \
                                                                                             \
         /* css::lang::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;  \
 
     #define DECLARE_MULTIPLEXER_VOID_METHOD(methodname, eventtype)                          \
-        virtual void SAL_CALL methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) override; \
+        virtual void SAL_CALL methodname(const eventtype& e) override; \
 
     #define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype)                          \
-        virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) override;   \
+        virtual sal_Bool SAL_CALL methodname(const eventtype& e) override;   \
 
     #define END_DECLARE_LISTENER_MULTIPLEXER()                                              \
     /* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators */    \
@@ -100,7 +100,7 @@ namespace dbaui
     }                                                                                       \
                                                                                             \
     css::uno::Any  SAL_CALL classname::queryInterface(                         \
-        const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) \
+        const css::uno::Type& _rType) \
     {                                                                                       \
         css::uno::Any aReturn =                                                \
             OSbaWeakSubObject::queryInterface(_rType);                                          \
@@ -112,12 +112,12 @@ namespace dbaui
                                                                                             \
         return aReturn;                                                                     \
     }                                                                                       \
-    void SAL_CALL classname::disposing(const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)\
+    void SAL_CALL classname::disposing(const css::lang::EventObject& )\
     {                                                                                       \
     }                                                                                       \
 
     #define IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(classname, listenerclass, methodname, eventtype) \
-    void SAL_CALL classname::methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) \
+    void SAL_CALL classname::methodname(const eventtype& e) \
     {                                                                                       \
         eventtype aMulti(e);                                                                \
         aMulti.Source = &m_rParent;                                                         \
@@ -127,7 +127,7 @@ namespace dbaui
     }                                                                                       \
 
     #define IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(classname, listenerclass, methodname, eventtype) \
-    sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (css::uno::RuntimeException, std::exception) \
+    sal_Bool SAL_CALL classname::methodname(const eventtype& e) \
     {                                                                                       \
         eventtype aMulti(e);                                                                \
         aMulti.Source = &m_rParent;                                                         \
@@ -140,7 +140,7 @@ namespace dbaui
 
     // helper for classes which do event multiplexing
     #define IMPLEMENT_LISTENER_ADMINISTRATION(classname, listenernamespace, listenerdesc, multiplexer, braodcasterclass, broadcaster) \
-    void SAL_CALL classname::add##listenerdesc(const css::uno::Reference< css::listenernamespace::X##listenerdesc >& l) throw(css::uno::RuntimeException, std::exception)\
+    void SAL_CALL classname::add##listenerdesc(const css::uno::Reference< css::listenernamespace::X##listenerdesc >& l)\
     {                                                                                       \
         multiplexer.addInterface(l);                                                            \
         if (multiplexer.getLength() == 1)                                                   \
@@ -150,7 +150,7 @@ namespace dbaui
                 xBroadcaster->add##listenerdesc(&multiplexer);                              \
         }                                                                                   \
     }                                                                                       \
-    void SAL_CALL classname::remove##listenerdesc(const css::uno::Reference< css::listenernamespace::X##listenerdesc >& l) throw(css::uno::RuntimeException, std::exception)\
+    void SAL_CALL classname::remove##listenerdesc(const css::uno::Reference< css::listenernamespace::X##listenerdesc >& l)\
     {                                                                                       \
         if (multiplexer.getLength() == 1)                                                   \
         {                                                                                   \
@@ -180,7 +180,7 @@ namespace dbaui
     // declaration of property listener multiplexers
     // (with support for specialized and unspecialized property listeners)
 
-    #define DECLARE_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions)   \
+    #define DECLARE_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype)   \
     class classname                                                                         \
             :public OSbaWeakSubObject                                                           \
             ,public listenerclass                                                           \
@@ -193,12 +193,12 @@ namespace dbaui
         classname( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex );                    \
         DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject)                                     \
         virtual css::uno::Any  SAL_CALL queryInterface(                        \
-            const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; \
+            const css::uno::Type& _rType) override; \
                                                                                             \
         /* css::lang::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;  \
                                                                                             \
-        virtual void SAL_CALL methodname(const eventtype& e)  throw exceptions override;             \
+        virtual void SAL_CALL methodname(const eventtype& e) override;             \
                                                                                             \
     public:                                                                                 \
         void addInterface(const OUString& rName, const css::uno::Reference< css::uno::XInterface >& rListener);    \
@@ -216,7 +216,7 @@ namespace dbaui
     };                                                                                      \
 
     // implementation of property listener multiplexers
-    #define IMPLEMENT_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype, exceptions) \
+    #define IMPLEMENT_PROPERTY_MULTIPLEXER(classname, listenerclass, methodname, eventtype) \
     classname::classname(::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex)                \
             :OSbaWeakSubObject(rSource)                                                     \
             ,m_aListeners(rMutex)                                                           \
@@ -224,7 +224,7 @@ namespace dbaui
     }                                                                                       \
                                                                                             \
     css::uno::Any  SAL_CALL classname::queryInterface(                         \
-        const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) \
+        const css::uno::Type& _rType) \
     {                                                                                       \
         css::uno::Any aReturn =                                                \
             OSbaWeakSubObject::queryInterface(_rType);                                          \
@@ -236,11 +236,11 @@ namespace dbaui
                                                                                             \
         return aReturn;                                                                     \
     }                                                                                       \
-    void SAL_CALL classname::disposing(const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)\
+    void SAL_CALL classname::disposing(const css::lang::EventObject& )\
     {                                                                                       \
     }                                                                                       \
                                                                                             \
-    void SAL_CALL classname::methodname(const eventtype& e) throw exceptions                \
+    void SAL_CALL classname::methodname(const eventtype& e)                \
     {                                                                                       \
         ::cppu::OInterfaceContainerHelper* pListeners = m_aListeners.getContainer(e.PropertyName);  \
         if (pListeners)                                                                     \
@@ -296,7 +296,7 @@ namespace dbaui
 
     // helper for classes which do property event multiplexing
     #define IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(classname, listenerdesc, multiplexer, braodcasterclass, broadcaster) \
-    void SAL_CALL classname::add##listenerdesc(const OUString& rName, const css::uno::Reference< css::beans::X##listenerdesc >& l ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)\
+    void SAL_CALL classname::add##listenerdesc(const OUString& rName, const css::uno::Reference< css::beans::X##listenerdesc >& l )\
     {                                                                                       \
         multiplexer.addInterface(rName, l);                                                 \
         if (multiplexer.getOverallLen() == 1)                                               \
@@ -306,7 +306,7 @@ namespace dbaui
                 xBroadcaster->add##listenerdesc(OUString(), &multiplexer);                           \
         }                                                                                   \
     }                                                                                       \
-    void SAL_CALL classname::remove##listenerdesc(const OUString& rName, const css::uno::Reference< css::beans::X##listenerdesc >& l ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)\
+    void SAL_CALL classname::remove##listenerdesc(const OUString& rName, const css::uno::Reference< css::beans::X##listenerdesc >& l )\
     {                                                                                       \
         if (multiplexer.getOverallLen() == 1)                                               \
         {                                                                                   \
@@ -389,10 +389,10 @@ namespace dbaui
     END_DECLARE_LISTENER_MULTIPLEXER()
 
     // css::beans::XPropertyChangeListener
-    DECLARE_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, css::beans::XPropertyChangeListener, propertyChange, css::beans::PropertyChangeEvent, (css::uno::RuntimeException, std::exception))
+    DECLARE_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, css::beans::XPropertyChangeListener, propertyChange, css::beans::PropertyChangeEvent)
 
     // css::beans::XVetoableChangeListener
-    DECLARE_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, css::beans::XVetoableChangeListener, vetoableChange, css::beans::PropertyChangeEvent, (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception))
+    DECLARE_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, css::beans::XVetoableChangeListener, vetoableChange, css::beans::PropertyChangeEvent)
 
     // css::beans::XPropertiesChangeListener
     BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXPropertiesChangeMultiplexer, css::beans::XPropertiesChangeListener)
diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx
index f1d5212044be..99b4f993f197 100644
--- a/dbaccess/source/ui/inc/singledoccontroller.hxx
+++ b/dbaccess/source/ui/inc/singledoccontroller.hxx
@@ -64,7 +64,7 @@ namespace dbaui
         virtual void            Execute( sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs ) override;
 
         // XUndoManagerSupplier
-        virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager(  ) override;
 
         // XEventListener
         using OSingleDocumentController_Base::disposing;
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 9f27c2e73d70..d07a455db03e 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -71,7 +71,7 @@ public:
     */
     void    UpdateTableList(
                 const css::uno::Reference< css::sdbc::XConnection >& _rxConnection
-            )   throw(css::sdbc::SQLException, std::exception);
+            );
 
     /** fill the table list with the tables and views determined by the two given containers.
         The views sequence is used to determine which table is of type view.
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 09d4d31306d7..e633c9a6d980 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -139,9 +139,9 @@ namespace dbaui
 
         // need by registration
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
@@ -149,59 +149,59 @@ namespace dbaui
         // late construction
         virtual bool Construct(vcl::Window* pParent) override;
         // XInterface
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
         // css::beans::XPropertyChangeListener
-        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
         // css::frame::XController
-        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) override;
+        virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) override;
 
         // css::lang::XComponent
         virtual void        SAL_CALL disposing() override;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) 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;
 
         // XSelectionSupplier
-        virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) override;
+        virtual css::uno::Any SAL_CALL getSelection(  ) override;
+        virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+        virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
         // css::frame::XFrameActionListener
-        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override;
 
         //IController
         virtual void notifyHiContrastChanged() override;
 
         // XScriptInvocationContext
-        virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() override;
 
         // XContextMenuInterception
-        virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) override;
+        virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& Interceptor ) override;
 
         // XDatabaseRegistrationsListener
-        virtual void SAL_CALL registeredDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL revokedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL changedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registeredDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) override;
+        virtual void SAL_CALL revokedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) override;
+        virtual void SAL_CALL changedDatabaseLocation( const css::sdb::DatabaseRegistrationEvent& Event ) override;
 
     protected:
         // SbaXDataBrowserController overridables
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 183932a9d687..44e6250748ca 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -44,33 +44,33 @@ protected:
 
 public:
     // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XServiceInfo - static methods
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
-    virtual css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
 protected:
-    virtual void SAL_CALL initialize(css::uno::Sequence< css::uno::Any > const & args) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize(css::uno::Sequence< css::uno::Any > const & args) override;
 
 // OPropertySetHelper overridables
     // (overwriting these three, because we have some special handling for our property)
-    virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue) throw(css::lang::IllegalArgumentException) override;
+    virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue) override;
 
 // OGenericUnoDialog overridables
     virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 9399f1ea3db8..8b63406349aa 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -164,7 +164,7 @@ void ODatabaseImportExport::dispose()
     m_xFormatter.clear();
 }
 
-void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source )
 {
     Reference<XConnection> xCon(Source.Source,UNO_QUERY);
     if(m_xConnection.is() && m_xConnection == xCon)
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index 10402728abdb..9c885ee40fb9 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -75,16 +75,16 @@ namespace dbaui
         virtual ~FrameWindowActivationListener() override;
 
         // XTopWindowListener
-        virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) 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;
 
     private:
         void impl_checkDisposed_throw() const;
@@ -280,44 +280,44 @@ namespace dbaui
             throw DisposedException( OUString(), *const_cast< FrameWindowActivationListener* >( this ) );
     }
 
-    void SAL_CALL FrameWindowActivationListener::windowOpened( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FrameWindowActivationListener::windowOpened( const EventObject& /*_rEvent*/ )
     {
         // not interested in
     }
 
-    void SAL_CALL FrameWindowActivationListener::windowClosing( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FrameWindowActivationListener::windowClosing( const EventObject& /*_rEvent*/ )
     {
         // not interested in
     }
 
-    void SAL_CALL FrameWindowActivationListener::windowClosed( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FrameWindowActivationListener::windowClosed( const EventObject& /*_rEvent*/ )
     {
         // not interested in
     }
 
-    void SAL_CALL FrameWindowActivationListener::windowMinimized( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FrameWindowActivationListener::windowMinimized( const EventObject& /*_rEvent*/ )
     {
         // not interested in
     }
 
-    void SAL_CALL FrameWindowActivationListener::windowNormalized( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FrameWindowActivationListener::windowNormalized( const EventObject& /*_rEvent*/ )
     {
         // not interested in
     }
 
-    void SAL_CALL FrameWindowActivationListener::windowActivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FrameWindowActivationListener::windowActivated( const EventObject& /*_rEvent*/ )
     {
         impl_checkDisposed_throw();
         lcl_updateActive_nothrow( *m_pData, true );
     }
 
-    void SAL_CALL FrameWindowActivationListener::windowDeactivated( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FrameWindowActivationListener::windowDeactivated( const EventObject& /*_rEvent*/ )
     {
         impl_checkDisposed_throw();
         lcl_updateActive_nothrow( *m_pData, false );
     }
 
-    void SAL_CALL FrameWindowActivationListener::disposing( const EventObject& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FrameWindowActivationListener::disposing( const EventObject& /*_rEvent*/ )
     {
         dispose();
     }
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx
index 0f188150aee0..8981d060631f 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -182,31 +182,31 @@ namespace dbaui
         m_xImpl->aUndoHelper.disposing();
     }
 
-    void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.enterUndoContext( i_title, aGuard );
     }
 
-    void SAL_CALL UndoManager::enterHiddenUndoContext(  ) throw (EmptyUndoStackException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::enterHiddenUndoContext(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.enterHiddenUndoContext( aGuard );
     }
 
-    void SAL_CALL UndoManager::leaveUndoContext(  ) throw (InvalidStateException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::leaveUndoContext(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.leaveUndoContext( aGuard );
     }
 
-    void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.addUndoAction( i_action, aGuard );
     }
 
-    void SAL_CALL UndoManager::undo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::undo(  )
     {
         SolarMutexGuard aSolarGuard;
             // (all our UndoActions work directly on VCL code, usually, so ...)
@@ -214,7 +214,7 @@ namespace dbaui
         m_xImpl->aUndoHelper.undo( aGuard );
     }
 
-    void SAL_CALL UndoManager::redo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::redo(  )
     {
         SolarMutexGuard aSolarGuard;
             // (all our UndoActions work directly on VCL code, usually, so ...)
@@ -222,97 +222,97 @@ namespace dbaui
         m_xImpl->aUndoHelper.redo( aGuard );
     }
 
-    sal_Bool SAL_CALL UndoManager::isUndoPossible(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL UndoManager::isUndoPossible(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         return m_xImpl->aUndoHelper.isUndoPossible();
     }
 
-    sal_Bool SAL_CALL UndoManager::isRedoPossible(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL UndoManager::isRedoPossible(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         return m_xImpl->aUndoHelper.isRedoPossible();
     }
 
-    OUString SAL_CALL UndoManager::getCurrentUndoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException, std::exception)
+    OUString SAL_CALL UndoManager::getCurrentUndoActionTitle(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         return m_xImpl->aUndoHelper.getCurrentUndoActionTitle();
     }
 
-    OUString SAL_CALL UndoManager::getCurrentRedoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException, std::exception)
+    OUString SAL_CALL UndoManager::getCurrentRedoActionTitle(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         return m_xImpl->aUndoHelper.getCurrentRedoActionTitle();
     }
 
-    Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         return m_xImpl->aUndoHelper.getAllUndoActionTitles();
     }
 
-    Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         return m_xImpl->aUndoHelper.getAllRedoActionTitles();
     }
 
-    void SAL_CALL UndoManager::clear(  ) throw (UndoContextNotClosedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::clear(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.clear( aGuard );
     }
 
-    void SAL_CALL UndoManager::clearRedo(  ) throw (UndoContextNotClosedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::clearRedo(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.clearRedo( aGuard );
     }
 
-    void SAL_CALL UndoManager::reset(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::reset(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.reset( aGuard );
     }
 
-    void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.addUndoManagerListener( i_listener );
     }
 
-    void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.removeUndoManagerListener( i_listener );
     }
 
-    void SAL_CALL UndoManager::lock(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManager::lock(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.lock();
     }
 
-    void SAL_CALL UndoManager::unlock(  ) throw (NotLockedException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::unlock(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         m_xImpl->aUndoHelper.unlock();
     }
 
-    sal_Bool SAL_CALL UndoManager::isLocked(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL UndoManager::isLocked(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         return m_xImpl->aUndoHelper.isLocked();
     }
 
-    Reference< XInterface > SAL_CALL UndoManager::getParent(  ) throw (RuntimeException, std::exception)
+    Reference< XInterface > SAL_CALL UndoManager::getParent(  )
     {
         UndoManagerMethodGuard aGuard( *m_xImpl );
         return *&m_xImpl->rParent;
     }
 
-    void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent )
     {
         (void)i_parent;
         throw NoSupportException( OUString(), m_xImpl->getThis() );
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 260ced9e7320..9b4ea9eaf3f9 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -209,7 +209,7 @@ namespace dbaui
         }
     }
 
-    Any SAL_CALL DBSubComponentController::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+    Any SAL_CALL DBSubComponentController::queryInterface(const Type& _rType)
     {
         if ( _rType.equals( cppu::UnoType<XScriptInvocationContext>::get() ) )
         {
@@ -221,7 +221,7 @@ namespace dbaui
         return DBSubComponentController_Base::queryInterface( _rType );
     }
 
-    Sequence< Type > SAL_CALL DBSubComponentController::getTypes(  ) throw (RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL DBSubComponentController::getTypes(  )
     {
         Sequence< Type > aTypes( DBSubComponentController_Base::getTypes() );
         if ( !m_pImpl->documentHasScriptSupport() )
@@ -349,7 +349,7 @@ namespace dbaui
         m_pImpl->m_aDataSource.clear();
     }
 
-    void SAL_CALL DBSubComponentController::disposing(const EventObject& _rSource) throw( RuntimeException, std::exception )
+    void SAL_CALL DBSubComponentController::disposing(const EventObject& _rSource)
     {
         if ( _rSource.Source == getConnection() )
         {
@@ -398,7 +398,7 @@ namespace dbaui
         showError( m_pImpl->m_aCurrentError );
     }
 
-    sal_Bool SAL_CALL DBSubComponentController::suspend(sal_Bool bSuspend) throw( RuntimeException, std::exception )
+    sal_Bool SAL_CALL DBSubComponentController::suspend(sal_Bool bSuspend)
     {
         m_pImpl->m_bSuspended = bSuspend;
         if ( !bSuspend && !isConnected() )
@@ -407,7 +407,7 @@ namespace dbaui
         return true;
     }
 
-    sal_Bool SAL_CALL DBSubComponentController::attachModel( const Reference< XModel > & _rxModel) throw( RuntimeException, std::exception )
+    sal_Bool SAL_CALL DBSubComponentController::attachModel( const Reference< XModel > & _rxModel)
     {
         if ( !_rxModel.is() )
             return false;
@@ -529,7 +529,6 @@ namespace dbaui
     }
     // XTitle
     OUString SAL_CALL DBSubComponentController::getTitle()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( getMutex() );
         if ( m_bExternalTitle )
@@ -551,7 +550,7 @@ namespace dbaui
         return m_pImpl->m_nDocStartNumber;
     }
 
-    Reference< XEmbeddedScripts > SAL_CALL DBSubComponentController::getScriptContainer() throw (RuntimeException, std::exception)
+    Reference< XEmbeddedScripts > SAL_CALL DBSubComponentController::getScriptContainer()
     {
         ::osl::MutexGuard aGuard( getMutex() );
         if ( !m_pImpl->documentHasScriptSupport() )
@@ -560,25 +559,25 @@ namespace dbaui
         return Reference< XEmbeddedScripts >( getDatabaseDocument(), UNO_QUERY_THROW );
     }
 
-    void SAL_CALL DBSubComponentController::addModifyListener( const Reference< XModifyListener >& i_Listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DBSubComponentController::addModifyListener( const Reference< XModifyListener >& i_Listener )
     {
         ::osl::MutexGuard aGuard( getMutex() );
         m_pImpl->m_aModifyListeners.addInterface( i_Listener );
     }
 
-    void SAL_CALL DBSubComponentController::removeModifyListener( const Reference< XModifyListener >& i_Listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DBSubComponentController::removeModifyListener( const Reference< XModifyListener >& i_Listener )
     {
         ::osl::MutexGuard aGuard( getMutex() );
         m_pImpl->m_aModifyListeners.removeInterface( i_Listener );
     }
 
-    sal_Bool SAL_CALL DBSubComponentController::isModified(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DBSubComponentController::isModified(  )
     {
         ::osl::MutexGuard aGuard( getMutex() );
         return impl_isModified();
     }
 
-    void SAL_CALL DBSubComponentController::setModified( sal_Bool i_bModified ) throw (PropertyVetoException, RuntimeException, std::exception)
+    void SAL_CALL DBSubComponentController::setModified( sal_Bool i_bModified )
     {
         ::osl::ClearableMutexGuard aGuard( getMutex() );
 
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index 96497fd944b2..a76c75343ada 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -90,7 +90,7 @@ namespace dbaui
         InvalidateFeature( ID_BROWSER_REDO );
     }
 
-    Reference< XUndoManager > SAL_CALL OSingleDocumentController::getUndoManager(  ) throw (RuntimeException, std::exception)
+    Reference< XUndoManager > SAL_CALL OSingleDocumentController::getUndoManager(  )
     {
         return m_pData->m_xUndoManager.get();
     }
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 44cbd4b3a576..f5446d963dc2 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -47,29 +47,29 @@ namespace dbaui
         m_pLine = nullptr;
         VCLXAccessibleComponent::disposing();
     }
-    Any SAL_CALL OConnectionLineAccess::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+    Any SAL_CALL OConnectionLineAccess::queryInterface( const Type& aType )
     {
         Any aRet(VCLXAccessibleComponent::queryInterface( aType ));
         return aRet.hasValue() ? aRet : OConnectionLineAccess_BASE::queryInterface( aType );
     }
-    Sequence< Type > SAL_CALL OConnectionLineAccess::getTypes(  ) throw (RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL OConnectionLineAccess::getTypes(  )
     {
         return ::comphelper::concatSequences(VCLXAccessibleComponent::getTypes(),OConnectionLineAccess_BASE::getTypes());
     }
-    OUString SAL_CALL OConnectionLineAccess::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OConnectionLineAccess::getImplementationName()
     {
         return OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility");
     }
     // XAccessibleContext
-    sal_Int32 SAL_CALL OConnectionLineAccess::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OConnectionLineAccess::getAccessibleChildCount(  )
     {
         return 0;
     }
-    Reference< XAccessible > SAL_CALL OConnectionLineAccess::getAccessibleChild( sal_Int32 /*i*/ ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OConnectionLineAccess::getAccessibleChild( sal_Int32 /*i*/ )
     {
         return Reference< XAccessible >();
     }
-    sal_Int32 SAL_CALL OConnectionLineAccess::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OConnectionLineAccess::getAccessibleIndexInParent(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         sal_Int32 nIndex = -1;
@@ -86,54 +86,54 @@ namespace dbaui
         }
         return nIndex;
     }
-    sal_Int16 SAL_CALL OConnectionLineAccess::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL OConnectionLineAccess::getAccessibleRole(  )
     {
         return AccessibleRole::UNKNOWN; // ? or may be an AccessibleRole::WINDOW
     }
-    OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription(  )
     {
         return OUString("Relation");
     }
-    Reference< XAccessibleRelationSet > SAL_CALL OConnectionLineAccess::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > SAL_CALL OConnectionLineAccess::getAccessibleRelationSet(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         return this;
     }
     // XAccessibleComponent
-    Reference< XAccessible > SAL_CALL OConnectionLineAccess::getAccessibleAtPoint( const awt::Point& /*_aPoint*/ ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OConnectionLineAccess::getAccessibleAtPoint( const awt::Point& /*_aPoint*/ )
     {
         return Reference< XAccessible >();
     }
-    awt::Rectangle SAL_CALL OConnectionLineAccess::getBounds(  ) throw (RuntimeException, std::exception)
+    awt::Rectangle SAL_CALL OConnectionLineAccess::getBounds(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         Rectangle aRect(m_pLine ? m_pLine->GetBoundingRect() : Rectangle());
         return awt::Rectangle(aRect.getX(),aRect.getY(),aRect.getWidth(),aRect.getHeight());
     }
-    awt::Point SAL_CALL OConnectionLineAccess::getLocation(  ) throw (RuntimeException, std::exception)
+    awt::Point SAL_CALL OConnectionLineAccess::getLocation(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         Point aPoint(m_pLine ? m_pLine->GetBoundingRect().TopLeft() : Point());
         return awt::Point(aPoint.X(),aPoint.Y());
     }
-    awt::Point SAL_CALL OConnectionLineAccess::getLocationOnScreen(  ) throw (RuntimeException, std::exception)
+    awt::Point SAL_CALL OConnectionLineAccess::getLocationOnScreen(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         Point aPoint(m_pLine ? m_pLine->GetParent()->ScreenToOutputPixel(m_pLine->GetBoundingRect().TopLeft()) : Point());
         return awt::Point(aPoint.X(),aPoint.Y());
     }
-    awt::Size SAL_CALL OConnectionLineAccess::getSize(  ) throw (RuntimeException, std::exception)
+    awt::Size SAL_CALL OConnectionLineAccess::getSize(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         Size aSize(m_pLine ? m_pLine->GetBoundingRect().GetSize() : Size());
         return awt::Size(aSize.Width(),aSize.Height());
     }
     // XAccessibleRelationSet
-    sal_Int32 SAL_CALL OConnectionLineAccess::getRelationCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OConnectionLineAccess::getRelationCount(  )
     {
         return 1;
     }
-    AccessibleRelation SAL_CALL OConnectionLineAccess::getRelation( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    AccessibleRelation SAL_CALL OConnectionLineAccess::getRelation( sal_Int32 nIndex )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         if( nIndex < 0 || nIndex >= getRelationCount() )
@@ -148,11 +148,11 @@ namespace dbaui
 
         return AccessibleRelation(AccessibleRelationType::CONTROLLED_BY,aSeq);
     }
-    sal_Bool SAL_CALL OConnectionLineAccess::containsRelation( sal_Int16 aRelationType ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OConnectionLineAccess::containsRelation( sal_Int16 aRelationType )
     {
         return AccessibleRelationType::CONTROLLED_BY == aRelationType;
     }
-    AccessibleRelation SAL_CALL OConnectionLineAccess::getRelationByType( sal_Int16 aRelationType ) throw (RuntimeException, std::exception)
+    AccessibleRelation SAL_CALL OConnectionLineAccess::getRelationByType( sal_Int16 aRelationType )
     {
         if( AccessibleRelationType::CONTROLLED_BY == aRelationType )
             return getRelation(0);
@@ -173,7 +173,7 @@ namespace dbaui
         m_pParent.clear();
         vcl::Window::dispose();
     }
-    Reference< XAccessibleContext > SAL_CALL OConnectionLineAccess::getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception)
+    Reference< XAccessibleContext > SAL_CALL OConnectionLineAccess::getAccessibleContext(  )
     {
         return this;
     }
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx
index 01ce12d181e7..f167641174fd 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -37,7 +37,7 @@ namespace dbaui
         ,m_pTableView(_pTableView)
     {
     }
-    OUString SAL_CALL OJoinDesignViewAccess::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OJoinDesignViewAccess::getImplementationName()
     {
         return OUString("org.openoffice.comp.dbu.JoinViewAccessibility");
     }
@@ -47,7 +47,7 @@ namespace dbaui
         m_pTableView = nullptr;
     }
     // XAccessibleContext
-    sal_Int32 SAL_CALL OJoinDesignViewAccess::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OJoinDesignViewAccess::getAccessibleChildCount(  )
     {
         // TODO may be this will change to only visible windows
         // this is the same assumption mt implements
@@ -57,7 +57,7 @@ namespace dbaui
             nChildCount = m_pTableView->GetTabWinCount() + m_pTableView->getTableConnections().size();
         return nChildCount;
     }
-    Reference< XAccessible > SAL_CALL OJoinDesignViewAccess::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OJoinDesignViewAccess::getAccessibleChild( sal_Int32 i )
     {
         Reference< XAccessible > aRet;
         ::osl::MutexGuard aGuard( m_aMutex  );
@@ -79,11 +79,11 @@ namespace dbaui
             throw IndexOutOfBoundsException();
         return aRet;
     }
-    sal_Int16 SAL_CALL OJoinDesignViewAccess::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL OJoinDesignViewAccess::getAccessibleRole(  )
     {
         return AccessibleRole::VIEW_PORT;
     }
-    Reference< XAccessibleContext > SAL_CALL OJoinDesignViewAccess::getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception)
+    Reference< XAccessibleContext > SAL_CALL OJoinDesignViewAccess::getAccessibleContext(  )
     {
         return this;
     }
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index bdb72d6905a6..b2243bc4e505 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -314,7 +314,7 @@ void OJoinController::describeSupportedFeatures()
     implDescribeSupportedFeature( ".uno:EditDoc",   ID_BROWSER_EDITDOC, CommandGroup::EDIT );
 }
 
-sal_Bool SAL_CALL OJoinController::suspend(sal_Bool _bSuspend) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OJoinController::suspend(sal_Bool _bSuspend)
 {
     if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed )
         return true;
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index bca06aea7126..2214a4e8b8b0 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -96,7 +96,7 @@ namespace dbaui
         return pId->getImplementationId();
     }
 
-    sal_Int64 SAL_CALL OJoinExchObj::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException, std::exception)
+    sal_Int64 SAL_CALL OJoinExchObj::getSomething( const Sequence< sal_Int8 >& _rIdentifier )
     {
         if (_rIdentifier.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  _rIdentifier.getConstArray(), 16 ) )
             return reinterpret_cast<sal_Int64>(this);
@@ -123,7 +123,7 @@ namespace dbaui
         return false;
     }
 
-    Any SAL_CALL OJoinExchObj::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+    Any SAL_CALL OJoinExchObj::queryInterface( const Type& _rType )
     {
         Any aReturn = TransferableHelper::queryInterface(_rType);
         if (!aReturn.hasValue())
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 66fe9de949b6..c2ae87db31b6 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -740,17 +740,17 @@ OUString OTableWindow::getTitle() const
     return m_xTitle->GetText();
 }
 
-void OTableWindow::_elementInserted( const container::ContainerEvent& /*_rEvent*/ )  throw(css::uno::RuntimeException, std::exception)
+void OTableWindow::_elementInserted( const container::ContainerEvent& /*_rEvent*/ )
 {
     FillListBox();
 }
 
-void OTableWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception)
+void OTableWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ )
 {
     FillListBox();
 }
 
-void OTableWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception)
+void OTableWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ )
 {
     FillListBox();
 }
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 5616112c10c0..22cb3a79aa77 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -59,26 +59,26 @@ namespace dbaui
 
         VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
     }
-    Any SAL_CALL OTableWindowAccess::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+    Any SAL_CALL OTableWindowAccess::queryInterface( const Type& aType )
     {
         Any aRet(VCLXAccessibleComponent::queryInterface( aType ));
         return aRet.hasValue() ? aRet : OTableWindowAccess_BASE::queryInterface( aType );
     }
-    Sequence< Type > SAL_CALL OTableWindowAccess::getTypes(  ) throw (RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL OTableWindowAccess::getTypes(  )
     {
         return ::comphelper::concatSequences(VCLXAccessibleComponent::getTypes(),OTableWindowAccess_BASE::getTypes());
     }
-    OUString SAL_CALL OTableWindowAccess::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OTableWindowAccess::getImplementationName()
     {
         return OUString("org.openoffice.comp.dbu.TableWindowAccessibility");
     }
-    Sequence< OUString > SAL_CALL OTableWindowAccess::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OTableWindowAccess::getSupportedServiceNames()
     {
         return { "com.sun.star.accessibility.Accessible",
                  "com.sun.star.accessibility.AccessibleContext" };
     }
     // XAccessibleContext
-    sal_Int32 SAL_CALL OTableWindowAccess::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OTableWindowAccess::getAccessibleChildCount(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         sal_Int32 nCount = 0;
@@ -90,7 +90,7 @@ namespace dbaui
         }
         return nCount;
     }
-    Reference< XAccessible > SAL_CALL OTableWindowAccess::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OTableWindowAccess::getAccessibleChild( sal_Int32 i )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Reference< XAccessible > aRet;
@@ -118,7 +118,7 @@ namespace dbaui
         }
         return aRet;
     }
-    sal_Int32 SAL_CALL OTableWindowAccess::getAccessibleIndexInParent(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OTableWindowAccess::getAccessibleIndexInParent(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         sal_Int32 nIndex = -1;
@@ -134,17 +134,17 @@ namespace dbaui
         }
         return nIndex;
     }
-    sal_Int16 SAL_CALL OTableWindowAccess::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL OTableWindowAccess::getAccessibleRole(  )
     {
         return AccessibleRole::PANEL; // ? or may be an AccessibleRole::WINDOW
     }
-    Reference< XAccessibleRelationSet > SAL_CALL OTableWindowAccess::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > SAL_CALL OTableWindowAccess::getAccessibleRelationSet(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         return this;
     }
     // XAccessibleComponent
-    Reference< XAccessible > SAL_CALL OTableWindowAccess::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OTableWindowAccess::getAccessibleAtPoint( const awt::Point& _aPoint )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         Reference< XAccessible > aRet;
@@ -174,12 +174,12 @@ namespace dbaui
         return xReturn;
     }
 
-    sal_Int32 SAL_CALL OTableWindowAccess::getRelationCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OTableWindowAccess::getRelationCount(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         return m_pTable ? m_pTable->getTableView()->getConnectionCount(m_pTable) : sal_Int32(0);
     }
-    AccessibleRelation SAL_CALL OTableWindowAccess::getRelation( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    AccessibleRelation SAL_CALL OTableWindowAccess::getRelation( sal_Int32 nIndex )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         if( nIndex < 0 || nIndex >= getRelationCount() )
@@ -196,13 +196,13 @@ namespace dbaui
         }
         return aRet;
     }
-    sal_Bool SAL_CALL OTableWindowAccess::containsRelation( sal_Int16 aRelationType ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OTableWindowAccess::containsRelation( sal_Int16 aRelationType )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         return      AccessibleRelationType::CONTROLLER_FOR == aRelationType
                 &&  m_pTable && m_pTable->getTableView()->ExistsAConn(m_pTable);
     }
-    AccessibleRelation SAL_CALL OTableWindowAccess::getRelationByType( sal_Int16 aRelationType ) throw (RuntimeException, std::exception)
+    AccessibleRelation SAL_CALL OTableWindowAccess::getRelationByType( sal_Int16 aRelationType )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         if( AccessibleRelationType::CONTROLLER_FOR == aRelationType && m_pTable)
@@ -226,11 +226,11 @@ namespace dbaui
         }
         return AccessibleRelation();
     }
-    OUString SAL_CALL OTableWindowAccess::getTitledBorderText(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OTableWindowAccess::getTitledBorderText(  )
     {
         return getAccessibleName(  );
     }
-    OUString SAL_CALL OTableWindowAccess::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OTableWindowAccess::getAccessibleName(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
         OUString sAccessibleName;
@@ -238,7 +238,7 @@ namespace dbaui
             sAccessibleName = m_pTable->getTitle();
         return sAccessibleName;
     }
-    Reference< XAccessibleContext > SAL_CALL OTableWindowAccess::getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception)
+    Reference< XAccessibleContext > SAL_CALL OTableWindowAccess::getAccessibleContext(  )
     {
         return this;
     }
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 890c63f35f4b..d0b1943ae657 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -101,7 +101,6 @@ LimitBoxController::~LimitBoxController()
 
 /// XInterface
 uno::Any SAL_CALL LimitBoxController::queryInterface( const uno::Type& aType )
-throw (uno::RuntimeException, std::exception)
 {
     uno::Any a = ToolboxController::queryInterface( aType );
     if ( a.hasValue() )
@@ -134,7 +133,6 @@ uno::Reference< uno::XInterface >
 
 /// XComponent
 void SAL_CALL LimitBoxController::dispose()
-throw (uno::RuntimeException, std::exception)
 {
     svt::ToolboxController::dispose();
 
@@ -145,7 +143,6 @@ throw (uno::RuntimeException, std::exception)
 /// XStatusListener
 void SAL_CALL LimitBoxController::statusChanged(
     const frame::FeatureStateEvent& rEvent )
-throw ( uno::RuntimeException, std::exception )
 {
     if ( m_pLimitBox )
     {
@@ -169,29 +166,24 @@ throw ( uno::RuntimeException, std::exception )
 
 /// XToolbarController
 void SAL_CALL LimitBoxController::execute( sal_Int16 /*KeyModifier*/ )
-throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL LimitBoxController::click()
-throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL LimitBoxController::doubleClick()
-throw (uno::RuntimeException, std::exception)
 {
 }
 
 uno::Reference< awt::XWindow > SAL_CALL LimitBoxController::createPopupWindow()
-throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< awt::XWindow >();
 }
 
 uno::Reference< awt::XWindow > SAL_CALL LimitBoxController::createItemWindow(
     const uno::Reference< awt::XWindow >& xParent )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< awt::XWindow > xItemWindow;
 
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
index ecb79fdc60e1..c2a2adc14bf9 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
@@ -36,31 +36,31 @@ class LimitBoxController: public svt::ToolboxController,
         virtual ~LimitBoxController() override;
 
         /// XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         /// XServiceInfo
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         /// XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
 
         /// XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
         /// XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
+        virtual void SAL_CALL click() override;
+        virtual void SAL_CALL doubleClick() override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
 
         void dispatchCommand( const css::uno::Sequence< css::beans::PropertyValue >& rArgs );
         using svt::ToolboxController::dispatchCommand;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 3aed34554651..c328f1c2863b 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -99,11 +99,11 @@ namespace dbaui
 
     class OViewController : public OQueryController
     {
-        virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override
+        virtual OUString SAL_CALL getImplementationName() override
         {
             return getImplementationName_Static();
         }
-        virtual Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override
+        virtual Sequence< OUString> SAL_CALL getSupportedServiceNames() override
         {
             return getSupportedServiceNames_Static();
         }
@@ -113,12 +113,12 @@ namespace dbaui
 
         // need by registration
         /// @throws RuntimeException
-        static OUString getImplementationName_Static() throw( RuntimeException )
+        static OUString getImplementationName_Static()
         {
             return OUString("org.openoffice.comp.dbu.OViewDesign");
         }
         /// @throws RuntimeException
-        static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException )
+        static Sequence< OUString > getSupportedServiceNames_Static()
         {
             Sequence<OUString> aSupported { "com.sun.star.sdb.ViewDesign" };
             return aSupported;
@@ -295,23 +295,23 @@ namespace
     }
 }
 
-OUString SAL_CALL OQueryController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL OQueryController::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString OQueryController::getImplementationName_Static() throw( RuntimeException )
+OUString OQueryController::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.OQueryDesign");
 }
 
-Sequence< OUString> OQueryController::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString> OQueryController::getSupportedServiceNames_Static()
 {
     Sequence<OUString> aSupported { "com.sun.star.sdb.QueryDesign" };
     return aSupported;
 }
 
-Sequence< OUString> SAL_CALL OQueryController::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString> SAL_CALL OQueryController::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -357,7 +357,7 @@ OQueryController::~OQueryController()
 IMPLEMENT_FORWARD_XINTERFACE2( OQueryController, OJoinController, OQueryController_PBase )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( OQueryController, OJoinController, OQueryController_PBase )
 
-Reference< XPropertySetInfo > SAL_CALL OQueryController::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL OQueryController::getPropertySetInfo()
 {
     Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -1137,7 +1137,7 @@ void OQueryController::impl_onModifyChanged()
     InvalidateFeature(ID_BROWSER_QUERY_EXECUTE);
 }
 
-void SAL_CALL OQueryController::disposing( const EventObject& Source ) throw(RuntimeException, std::exception)
+void SAL_CALL OQueryController::disposing( const EventObject& Source )
 {
     SolarMutexGuard aGuard;
 
@@ -1954,7 +1954,7 @@ bool OQueryController::allowQueries() const
     return !bCreatingView;
 }
 
-Any SAL_CALL OQueryController::getViewData() throw( RuntimeException, std::exception )
+Any SAL_CALL OQueryController::getViewData()
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -1966,7 +1966,7 @@ Any SAL_CALL OQueryController::getViewData() throw( RuntimeException, std::excep
     return makeAny( aViewSettings.getPropertyValues() );
 }
 
-void SAL_CALL OQueryController::restoreViewData(const Any& /*Data*/) throw( RuntimeException, std::exception )
+void SAL_CALL OQueryController::restoreViewData(const Any& /*Data*/)
 {
     // TODO
 }
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 91df369e99b2..e42dc0df526e 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -92,23 +92,23 @@ using namespace ::dbaui;
 using namespace ::comphelper;
 using namespace ::osl;
 
-OUString SAL_CALL ORelationController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL ORelationController::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString ORelationController::getImplementationName_Static() throw( RuntimeException )
+OUString ORelationController::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.ORelationDesign");
 }
 
-Sequence< OUString> ORelationController::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString> ORelationController::getSupportedServiceNames_Static()
 {
     Sequence<OUString> aSupported { "com.sun.star.sdb.RelationDesign" };
     return aSupported;
 }
 
-Sequence< OUString> SAL_CALL ORelationController::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString> SAL_CALL ORelationController::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index f0dd20842eb6..d0af2765bb64 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -381,12 +381,12 @@ bool ORelationTableView::allowQueries() const
     return false;
 }
 
-void ORelationTableView::_elementInserted( const container::ContainerEvent& /*_rEvent*/ )  throw(css::uno::RuntimeException, std::exception)
+void ORelationTableView::_elementInserted( const container::ContainerEvent& /*_rEvent*/ )
 {
 
 }
 
-void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception)
+void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEvent )
 {
     m_bInRemove = true;
     OUString sName;
@@ -406,7 +406,7 @@ void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEve
     m_bInRemove = false;
 }
 
-void ORelationTableView::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception)
+void ORelationTableView::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ )
 {
 }
 
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 027facc933e3..7d5318942bc3 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -108,23 +108,23 @@ namespace
     }
 }
 
-OUString SAL_CALL OTableController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL OTableController::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString OTableController::getImplementationName_Static() throw( RuntimeException )
+OUString OTableController::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.OTableDesign");
 }
 
-Sequence< OUString> OTableController::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString> OTableController::getSupportedServiceNames_Static()
 {
     Sequence<OUString> aSupported { "com.sun.star.sdb.TableDesign" };
     return aSupported;
 }
 
-Sequence< OUString> SAL_CALL OTableController::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString> SAL_CALL OTableController::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -534,7 +534,7 @@ bool OTableController::Construct(vcl::Window* pParent)
     return true;
 }
 
-sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/)
 {
     if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed )
         return true;
@@ -620,7 +620,7 @@ void OTableController::impl_onModifyChanged()
     InvalidateFeature( SID_INDEXDESIGN );
 }
 
-void SAL_CALL OTableController::disposing( const EventObject& _rSource ) throw(RuntimeException, std::exception)
+void SAL_CALL OTableController::disposing( const EventObject& _rSource )
 {
     if ( _rSource.Source == m_xTable )
     {   // some deleted our table so we have a new one
@@ -900,8 +900,6 @@ Reference<XNameAccess> OTableController::getKeyColumns() const
 }
 
 bool OTableController::checkColumns(bool _bNew)
-    throw(css::sdbc::SQLException,
-          css::uno::RuntimeException, std::exception)
 {
     bool bOk = true;
     bool bFoundPKey = false;
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 6161774973e4..ff44ad7bea15 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -43,22 +43,22 @@ namespace dbaui
 
     public:
         // XTypeProvider
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // XServiceInfo - static methods
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
@@ -72,7 +72,7 @@ namespace dbaui
         :ODatabaseAdministrationDialog(_rxORB)
     {
     }
-    Sequence<sal_Int8> SAL_CALL OAdvancedSettingsDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+    Sequence<sal_Int8> SAL_CALL OAdvancedSettingsDialog::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -82,28 +82,28 @@ namespace dbaui
         return *(new OAdvancedSettingsDialog( comphelper::getComponentContext(_rxFactory) ));
     }
 
-    OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName()
     {
         return getImplementationName_Static();
     }
 
-    OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException)
+    OUString OAdvancedSettingsDialog::getImplementationName_Static()
     {
         return OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog");
     }
 
-    css::uno::Sequence<OUString> SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    css::uno::Sequence<OUString> SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames()
     {
         return getSupportedServiceNames_Static();
     }
 
-    css::uno::Sequence<OUString> OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+    css::uno::Sequence<OUString> OAdvancedSettingsDialog::getSupportedServiceNames_Static()
     {
         css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.AdvancedDatabaseSettingsDialog" };
         return aSupported;
     }
 
-    Reference<XPropertySetInfo>  SAL_CALL OAdvancedSettingsDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference<XPropertySetInfo>  SAL_CALL OAdvancedSettingsDialog::getPropertySetInfo()
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index 0fbe95b96031..e5b94f995e51 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -58,7 +58,7 @@ OUString OColumnControl::GetComponentServiceName()
     return OUString("com.sun.star.sdb.ColumnDescriptorControl");
 }
 
-void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer) throw( RuntimeException, std::exception )
+void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     if ( !getPeer().is() )
diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx
index 9e4f415f5b02..fbf070ca64fa 100644
--- a/dbaccess/source/ui/uno/ColumnControl.hxx
+++ b/dbaccess/source/ui/uno/ColumnControl.hxx
@@ -41,14 +41,14 @@ namespace dbaui
         // XServiceInfo
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
         // css::awt::XControl
-        virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) override;
     };
 }   // namespace dbaui
 
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index 51e538cf5bf0..c42af2059b46 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -102,13 +102,12 @@ void OColumnControlModel::registerProperties()
 }
 
 // XCloneable
-Reference< XCloneable > SAL_CALL OColumnControlModel::createClone( ) throw (RuntimeException, std::exception)
+Reference< XCloneable > SAL_CALL OColumnControlModel::createClone( )
 {
     return new OColumnControlModel( this, m_xORB );
 }
 
 css::uno::Sequence<sal_Int8> OColumnControlModel::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -117,13 +116,13 @@ IMPLEMENT_GETTYPES2(OColumnControlModel,OColumnControlModel_BASE,comphelper::OPr
 IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OColumnControlModel)
 IMPLEMENT_SERVICE_INFO2_STATIC(OColumnControlModel,"com.sun.star.comp.dbu.OColumnControlModel","com.sun.star.awt.UnoControlModel","com.sun.star.sdb.ColumnDescriptorControlModel")
 IMPLEMENT_FORWARD_REFCOUNT( OColumnControlModel, OColumnControlModel_BASE )
-Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType )
 {
     return OColumnControlModel_BASE::queryInterface( _rType );
 }
 
 // css::XAggregation
-Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType )
 {
     Any aRet(OColumnControlModel_BASE::queryAggregation(rType));
     if (!aRet.hasValue())
@@ -131,17 +130,17 @@ Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) throw(Ru
     return aRet;
 }
 
-OUString SAL_CALL OColumnControlModel::getServiceName() throw ( RuntimeException, std::exception)
+OUString SAL_CALL OColumnControlModel::getServiceName()
 {
     return OUString();
 }
 
-void OColumnControlModel::write(const Reference<XObjectOutputStream>& /*_rxOutStream*/) throw ( css::io::IOException, RuntimeException, std::exception)
+void OColumnControlModel::write(const Reference<XObjectOutputStream>& /*_rxOutStream*/)
 {
     // TODO
 }
 
-void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStream*/) throw ( css::io::IOException, RuntimeException, std::exception)
+void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStream*/)
 {
     // TODO
 }
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index f4a5b9aaaa27..59e4311ea16d 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -75,29 +75,27 @@ public:
 // css::lang::XServiceInfo
     DECLARE_SERVICE_INFO();
     /// @throws css::uno::RuntimeException
-    static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString SAL_CALL getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface >
     SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
 // css::uno::XAggregation
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
 
 //  css::io::XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
 // OPropertyArrayUsageHelper
     DECLARE_PROPERTYCONTAINER_DEFAULTS( );
 
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 5d0ac17d3c4e..3700aa5d7637 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -107,7 +107,7 @@ void OColumnPeer::setConnection(const Reference< XConnection>& _xCon)
         pFieldControl->setConnection(_xCon);
 }
 
-void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value) throw( RuntimeException, std::exception )
+void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -125,7 +125,7 @@ void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value)
         VCLXWindow::setProperty(_rPropertyName,Value);
 }
 
-Any OColumnPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException, std::exception )
+Any OColumnPeer::getProperty( const OUString& _rPropertyName )
 {
     Any aProp;
     VclPtr< OFieldDescControl > pFieldControl = GetAs< OFieldDescControl >();
diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx
index 1990c8f61829..91ebbdc7fc50 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.hxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.hxx
@@ -40,8 +40,8 @@ namespace dbaui
         void setConnection(const css::uno::Reference< css::sdbc::XConnection>& _xCon);
         void setEditWidth(sal_Int32 _nWidth);
         // VCLXWindow
-        virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+        virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
     };
 }   // namespace dbaui
 #endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNPEER_HXX
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index c8228a01f55a..b8a4d2acb29d 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -42,7 +42,7 @@ ODBTypeWizDialog::ODBTypeWizDialog(const Reference< XComponentContext >& _rxORB)
 {
 }
 
-Sequence<sal_Int8> SAL_CALL ODBTypeWizDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL ODBTypeWizDialog::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -52,28 +52,28 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMult
     return *(new ODBTypeWizDialog( comphelper::getComponentContext(_rxFactory) ));
 }
 
-OUString SAL_CALL ODBTypeWizDialog::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ODBTypeWizDialog::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException)
+OUString ODBTypeWizDialog::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.ODBTypeWizDialog");
 }
 
-css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialog::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-css::uno::Sequence<OUString> ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString> ODBTypeWizDialog::getSupportedServiceNames_Static()
 {
     css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.DataSourceTypeChangeDialog" };
     return aSupported;
 }
 
-Reference<XPropertySetInfo>  SAL_CALL ODBTypeWizDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference<XPropertySetInfo>  SAL_CALL ODBTypeWizDialog::getPropertySetInfo()
 {
     Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index 19c632562cce..4e21b345a994 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -35,22 +35,22 @@ protected:
 
 public:
     // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XServiceInfo - static methods
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // OPropertyArrayUsageHelper
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index 26f34a031b1b..a52a5ca4c6d6 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -56,7 +56,7 @@ ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XComponentContext
         &m_bStartTableWizard, cppu::UnoType<bool>::get());
 }
 
-Sequence<sal_Int8> SAL_CALL ODBTypeWizDialogSetup::getImplementationId(  ) throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL ODBTypeWizDialogSetup::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -67,28 +67,28 @@ Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference<
     return xDBWizard;
 }
 
-OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException)
+OUString ODBTypeWizDialogSetup::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup");
 }
 
-css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialogSetup::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialogSetup::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-css::uno::Sequence<OUString> ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString> ODBTypeWizDialogSetup::getSupportedServiceNames_Static()
 {
     css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.DatabaseWizardDialog" };
     return aSupported;
 }
 
-Reference<XPropertySetInfo>  SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference<XPropertySetInfo>  SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() );
 }
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index 15d888d2326c..f8145f788e9c 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -37,22 +37,22 @@ protected:
 
 public:
     // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XServiceInfo - static methods
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // OPropertyArrayUsageHelper
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index 4810894a97db..bd8a98c6b9a9 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -42,7 +42,7 @@ OTableFilterDialog::OTableFilterDialog(const Reference< XComponentContext >& _rx
 {
 }
 
-Sequence<sal_Int8> SAL_CALL OTableFilterDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL OTableFilterDialog::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -52,28 +52,28 @@ Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMu
     return *(new OTableFilterDialog( comphelper::getComponentContext(_rxFactory) ));
 }
 
-OUString SAL_CALL OTableFilterDialog::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OTableFilterDialog::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException)
+OUString OTableFilterDialog::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.OTableFilterDialog");
 }
 
-css::uno::Sequence<OUString> SAL_CALL OTableFilterDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OTableFilterDialog::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-css::uno::Sequence<OUString> OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString> OTableFilterDialog::getSupportedServiceNames_Static()
 {
     css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.TableFilterDialog" };
     return aSupported;
 }
 
-Reference<XPropertySetInfo>  SAL_CALL OTableFilterDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference<XPropertySetInfo>  SAL_CALL OTableFilterDialog::getPropertySetInfo()
 {
     Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 4fddd73b2d19..23c765ae528e 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -35,22 +35,22 @@ protected:
 
 public:
     // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XServiceInfo - static methods
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // OPropertyArrayUsageHelper
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index 96f4781c3643..9c12cd708bd8 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -42,7 +42,7 @@ OUserSettingsDialog::OUserSettingsDialog(const Reference< XComponentContext >& _
 {
 }
 
-Sequence<sal_Int8> SAL_CALL OUserSettingsDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL OUserSettingsDialog::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -52,28 +52,28 @@ Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XM
     return *(new OUserSettingsDialog( comphelper::getComponentContext(_rxFactory) ));
 }
 
-OUString SAL_CALL OUserSettingsDialog::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OUserSettingsDialog::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException)
+OUString OUserSettingsDialog::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.OUserSettingsDialog");
 }
 
-css::uno::Sequence<OUString> SAL_CALL OUserSettingsDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OUserSettingsDialog::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-css::uno::Sequence<OUString> OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString> OUserSettingsDialog::getSupportedServiceNames_Static()
 {
     css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.UserAdministrationDialog" };
     return aSupported;
 }
 
-Reference<XPropertySetInfo>  SAL_CALL OUserSettingsDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference<XPropertySetInfo>  SAL_CALL OUserSettingsDialog::getPropertySetInfo()
 {
     Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index 32514a67f69a..b4c6cf597150 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -35,22 +35,22 @@ protected:
 
 public:
     // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XServiceInfo - static methods
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // OPropertyArrayUsageHelper
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index 1366ed7e8f9c..bbbebc28f718 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -42,7 +42,7 @@ ODataSourcePropertyDialog::ODataSourcePropertyDialog(const Reference< XComponent
 {
 }
 
-Sequence<sal_Int8> SAL_CALL ODataSourcePropertyDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL ODataSourcePropertyDialog::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -52,28 +52,28 @@ Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Referen
     return *(new ODataSourcePropertyDialog( comphelper::getComponentContext(_rxFactory) ));
 }
 
-OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException)
+OUString ODataSourcePropertyDialog::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog");
 }
 
-css::uno::Sequence<OUString> SAL_CALL ODataSourcePropertyDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL ODataSourcePropertyDialog::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-css::uno::Sequence<OUString> ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString> ODataSourcePropertyDialog::getSupportedServiceNames_Static()
 {
     css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.DatasourceAdministrationDialog" };
     return aSupported;
 }
 
-Reference<XPropertySetInfo>  SAL_CALL ODataSourcePropertyDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference<XPropertySetInfo>  SAL_CALL ODataSourcePropertyDialog::getPropertySetInfo()
 {
     Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index da64c0c7ea83..8e4fb8b67f90 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -35,22 +35,22 @@ protected:
 
 public:
     // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XServiceInfo - static methods
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface >
             SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
     // OPropertyArrayUsageHelper
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index c18655155efd..1cdc2984e090 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -70,7 +70,6 @@ namespace dbaui
     }
 
     css::uno::Sequence<sal_Int8> ComposerDialog::getImplementationId()
-        throw (css::uno::RuntimeException, std::exception)
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -145,7 +144,7 @@ namespace dbaui
         return VclPtr<DlgFilterCrit>::Create( _pParent, m_aContext, _rxConnection, m_xComposer, _rxColumns );
     }
 
-    void SAL_CALL RowsetFilterDialog::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL RowsetFilterDialog::initialize( const Sequence< Any >& aArguments )
     {
         if( aArguments.getLength() == 3 )
         {
@@ -193,7 +192,7 @@ namespace dbaui
         return VclPtr<DlgOrderCrit>::Create( _pParent, _rxConnection, m_xComposer, _rxColumns );
     }
 
-    void SAL_CALL RowsetOrderDialog::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL RowsetOrderDialog::initialize( const Sequence< Any >& aArguments )
     {
         if( aArguments.getLength() == 2 )
         {
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index 2f6dd6eae4a5..4d59b432f596 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -55,8 +55,7 @@ namespace dbaui
         virtual ~ComposerDialog() override;
 
     public:
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
         DECLARE_PROPERTYCONTAINER_DEFAULTS( );
 
@@ -83,9 +82,9 @@ namespace dbaui
 
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
@@ -99,8 +98,7 @@ namespace dbaui
 
         // OGenericUnoDialog overridables
         virtual void executedDialog( sal_Int16 _nExecutionResult ) override;
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     };
 
@@ -114,9 +112,9 @@ namespace dbaui
 
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
@@ -130,8 +128,7 @@ namespace dbaui
 
         // OGenericUnoDialog overridables
         virtual void executedDialog( sal_Int16 _nExecutionResult ) override;
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
     };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 31f89eb4394d..d61bda15a8cd 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -146,37 +146,37 @@ namespace dbaui
     {
     public:
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() 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 css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // XServiceInfo - static methods
         /// @throws RuntimeException
-        static Sequence< OUString >  getSupportedServiceNames_Static() throw( RuntimeException );
+        static Sequence< OUString >  getSupportedServiceNames_Static();
         /// @throws RuntimeException
-        static OUString              getImplementationName_Static() throw( RuntimeException );
+        static OUString              getImplementationName_Static();
         static Reference< XInterface >      Create( const Reference< XMultiServiceFactory >& );
 
         // XCopyTableWizard
-        virtual ::sal_Int16 SAL_CALL getOperation() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setOperation( ::sal_Int16 _operation ) throw (IllegalArgumentException, RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDestinationTableName() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDestinationTableName( const OUString& _destinationTableName ) throw (RuntimeException, std::exception) override;
-        virtual Optional< OUString > SAL_CALL getCreatePrimaryKey() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getUseHeaderLineAsColumnNames() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL addCopyTableListener( const Reference< XCopyTableListener >& Listener ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeCopyTableListener( const Reference< XCopyTableListener >& Listener ) throw (RuntimeException, std::exception) override;
+        virtual ::sal_Int16 SAL_CALL getOperation() override;
+        virtual void SAL_CALL setOperation( ::sal_Int16 _operation ) override;
+        virtual OUString SAL_CALL getDestinationTableName() override;
+        virtual void SAL_CALL setDestinationTableName( const OUString& _destinationTableName ) override;
+        virtual Optional< OUString > SAL_CALL getCreatePrimaryKey() override;
+        virtual void SAL_CALL setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) override;
+        virtual sal_Bool SAL_CALL getUseHeaderLineAsColumnNames() override;
+        virtual void SAL_CALL setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) override;
+        virtual void SAL_CALL addCopyTableListener( const Reference< XCopyTableListener >& Listener ) override;
+        virtual void SAL_CALL removeCopyTableListener( const Reference< XCopyTableListener >& Listener ) override;
 
         // XCopyTableWizard::XExecutableDialog
-        virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL execute(  ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+        virtual ::sal_Int16 SAL_CALL execute(  ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
         // XPropertySet
-        virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override;
+        virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
@@ -411,40 +411,40 @@ Reference< XInterface > CopyTableWizard::Create( const Reference< XMultiServiceF
     return *( new CopyTableWizard( comphelper::getComponentContext(_rxFactory) ) );
 }
 
-OUString SAL_CALL CopyTableWizard::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL CopyTableWizard::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString CopyTableWizard::getImplementationName_Static() throw(RuntimeException)
+OUString CopyTableWizard::getImplementationName_Static()
 {
     return OUString( "org.openoffice.comp.dbu.CopyTableWizard" );
 }
 
-css::uno::Sequence<OUString> SAL_CALL CopyTableWizard::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL CopyTableWizard::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-css::uno::Sequence<OUString> CopyTableWizard::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString> CopyTableWizard::getSupportedServiceNames_Static()
 {
     css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.application.CopyTableWizard" };
     return aSupported;
 }
 
-Reference< XPropertySetInfo > SAL_CALL CopyTableWizard::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL CopyTableWizard::getPropertySetInfo()
 {
     Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
-::sal_Int16 SAL_CALL CopyTableWizard::getOperation() throw (RuntimeException, std::exception)
+::sal_Int16 SAL_CALL CopyTableWizard::getOperation()
 {
     CopyTableAccessGuard aGuard( *this );
     return m_nOperation;
 }
 
-void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation )
 {
     CopyTableAccessGuard aGuard( *this );
 
@@ -467,25 +467,25 @@ void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation ) throw (Ill
     m_nOperation = _operation;
 }
 
-OUString SAL_CALL CopyTableWizard::getDestinationTableName() throw (RuntimeException, std::exception)
+OUString SAL_CALL CopyTableWizard::getDestinationTableName()
 {
     CopyTableAccessGuard aGuard( *this );
     return m_sDestinationTable;
 }
 
-void SAL_CALL CopyTableWizard::setDestinationTableName( const OUString& _destinationTableName ) throw (RuntimeException, std::exception)
+void SAL_CALL CopyTableWizard::setDestinationTableName( const OUString& _destinationTableName )
 {
     CopyTableAccessGuard aGuard( *this );
     m_sDestinationTable = _destinationTableName;
 }
 
-Optional< OUString > SAL_CALL CopyTableWizard::getCreatePrimaryKey() throw (RuntimeException, std::exception)
+Optional< OUString > SAL_CALL CopyTableWizard::getCreatePrimaryKey()
 {
     CopyTableAccessGuard aGuard( *this );
     return m_aPrimaryKeyName;
 }
 
-void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) throw (IllegalArgumentException, SQLException, RuntimeException, std::exception)
+void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey )
 {
     CopyTableAccessGuard aGuard( *this );
 
@@ -499,39 +499,39 @@ void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >&
     m_aPrimaryKeyName = _newPrimaryKey;
 }
 
-sal_Bool SAL_CALL CopyTableWizard::getUseHeaderLineAsColumnNames() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL CopyTableWizard::getUseHeaderLineAsColumnNames()
 {
     CopyTableAccessGuard aGuard( *this );
     return m_bUseHeaderLineAsColumnNames;
 }
 
-void SAL_CALL CopyTableWizard::setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) throw (RuntimeException, std::exception)
+void SAL_CALL CopyTableWizard::setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames )
 {
     CopyTableAccessGuard aGuard( *this );
     m_bUseHeaderLineAsColumnNames = _bUseHeaderLineAsColumnNames;
 }
 
-void SAL_CALL CopyTableWizard::addCopyTableListener( const Reference< XCopyTableListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL CopyTableWizard::addCopyTableListener( const Reference< XCopyTableListener >& _rxListener )
 {
     CopyTableAccessGuard aGuard( *this );
     if ( _rxListener.is() )
         m_aCopyTableListeners.addInterface( _rxListener );
 }
 
-void SAL_CALL CopyTableWizard::removeCopyTableListener( const Reference< XCopyTableListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL CopyTableWizard::removeCopyTableListener( const Reference< XCopyTableListener >& _rxListener )
 {
     CopyTableAccessGuard aGuard( *this );
     if ( _rxListener.is() )
         m_aCopyTableListeners.removeInterface( _rxListener );
 }
 
-void SAL_CALL CopyTableWizard::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception)
+void SAL_CALL CopyTableWizard::setTitle( const OUString& _rTitle )
 {
     CopyTableAccessGuard aGuard( *this );
     CopyTableWizard_DialogBase::setTitle( _rTitle );
 }
 
-::sal_Int16 SAL_CALL CopyTableWizard::execute(  ) throw (RuntimeException, std::exception)
+::sal_Int16 SAL_CALL CopyTableWizard::execute(  )
 {
     CopyTableAccessGuard aGuard( *this );
 
@@ -1448,7 +1448,7 @@ OUString CopyTableWizard::impl_getServerSideCopyStatement_throw(const Reference<
     return sSql;
 }
 
-void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( isInitialized() )
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index 7bfab1306def..a41e1f730e79 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -66,12 +66,12 @@ namespace dbaui
             "BasicInteractionHandler::BasicInteractionHandler: enabling legacy behavior, there should be no clients of this anymore!" );
     }
 
-    sal_Bool SAL_CALL BasicInteractionHandler::handleInteractionRequest( const Reference< XInteractionRequest >& i_rRequest ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL BasicInteractionHandler::handleInteractionRequest( const Reference< XInteractionRequest >& i_rRequest )
     {
         return impl_handle_throw( i_rRequest );
     }
 
-    void SAL_CALL BasicInteractionHandler::handle( const Reference< XInteractionRequest >& i_rRequest ) throw(RuntimeException, std::exception)
+    void SAL_CALL BasicInteractionHandler::handle( const Reference< XInteractionRequest >& i_rRequest )
     {
         impl_handle_throw( i_rRequest );
     }
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 9e6184313974..5166a6bde184 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -74,10 +74,10 @@ namespace dbaui
         );
 
         // XInteractionHandler2
-        virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
 
         // XInteractionHandler
-        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
 
     protected:
         bool
@@ -135,9 +135,9 @@ namespace dbaui
         // XServiceInfo
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
     };
@@ -169,9 +169,9 @@ namespace dbaui
         // XServiceInfo
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
     };
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 3970604e9b49..7bbd6a749ee5 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -71,38 +71,37 @@ namespace dbaui
         virtual ~OTextConnectionSettingsDialog() override;
 
     public:
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
         DECLARE_PROPERTYCONTAINER_DEFAULTS( );
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception, std::exception) override;
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw(IllegalArgumentException) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) override;
         virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const override;
 
         // Overrides to resolve inheritance ambiguity
-        virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override
             { ODatabaseAdministrationDialog::setPropertyValue(p1, p2); }
-        virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override
             { return ODatabaseAdministrationDialog::getPropertyValue(p1); }
-        virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
             { ODatabaseAdministrationDialog::addPropertyChangeListener(p1, p2); }
-        virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
             { ODatabaseAdministrationDialog::removePropertyChangeListener(p1, p2); }
-        virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
             { ODatabaseAdministrationDialog::addVetoableChangeListener(p1, p2); }
-        virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
             { ODatabaseAdministrationDialog::removeVetoableChangeListener(p1, p2); }
-        virtual void SAL_CALL setTitle(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setTitle(const OUString& p1) override
             { ODatabaseAdministrationDialog::setTitle(p1); }
-        virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Int16 SAL_CALL execute() override
             { return ODatabaseAdministrationDialog::execute(); }
 
     protected:
@@ -124,7 +123,6 @@ namespace dbaui
 
     css::uno::Sequence<sal_Int8>
     OTextConnectionSettingsDialog::getImplementationId()
-        throw (css::uno::RuntimeException, std::exception)
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -139,7 +137,7 @@ namespace dbaui
         return static_cast< XServiceInfo* >(new OTextConnectionSettingsDialog( comphelper::getComponentContext(_rxORB)));
     }
 
-    Reference< XPropertySetInfo >  SAL_CALL OTextConnectionSettingsDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo >  SAL_CALL OTextConnectionSettingsDialog::getPropertySetInfo()
     {
         return createPropertySetInfo( getInfoHelper() );
     }
@@ -210,7 +208,7 @@ namespace dbaui
         return VclPtr<TextConnectionSettingsDialog>::Create( _pParent, *m_pDatasourceItems );
     }
 
-    void SAL_CALL OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw(Exception, std::exception)
+    void SAL_CALL OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         PropertyValues::const_iterator pos = m_aPropertyValues.find( _nHandle );
         if ( pos != m_aPropertyValues.end() )
@@ -223,7 +221,7 @@ namespace dbaui
         }
     }
 
-    sal_Bool SAL_CALL OTextConnectionSettingsDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw(IllegalArgumentException)
+    sal_Bool SAL_CALL OTextConnectionSettingsDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
     {
         bool bModified = false;
 
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 52a32ba81d79..1858bf9de2ce 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -61,7 +61,6 @@ namespace dbaui
     }
 
     css::uno::Sequence<sal_Int8> ODirectSQLDialog::getImplementationId()
-        throw (css::uno::RuntimeException, std::exception)
     {
         return css::uno::Sequence<sal_Int8>();
     }
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index eae08a0aa01c..96e198e8a34a 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -48,14 +48,13 @@ namespace dbaui
         virtual ~ODirectSQLDialog() override;
 
     public:
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
         DECLARE_SERVICE_INFO();
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
         static css::uno::Reference< css::uno::XInterface >
         SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 6638c82feaac..4494a2eedda3 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -53,7 +53,7 @@ OSQLMessageDialog::OSQLMessageDialog(const Reference< XComponentContext >& _rxOR
         &m_sHelpURL, cppu::UnoType<decltype(m_sHelpURL)>::get() );
 }
 
-Sequence<sal_Int8> SAL_CALL OSQLMessageDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL OSQLMessageDialog::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -63,28 +63,28 @@ Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMul
     return *(new OSQLMessageDialog( comphelper::getComponentContext(_rxFactory) ));
 }
 
-OUString SAL_CALL OSQLMessageDialog::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OSQLMessageDialog::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeException)
+OUString OSQLMessageDialog::getImplementationName_Static()
 {
     return OUString("org.openoffice.comp.dbu.OSQLMessageDialog");
 }
 
-css::uno::Sequence<OUString> SAL_CALL OSQLMessageDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OSQLMessageDialog::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-css::uno::Sequence<OUString> OSQLMessageDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+css::uno::Sequence<OUString> OSQLMessageDialog::getSupportedServiceNames_Static()
 {
     css::uno::Sequence<OUString> aSupported { "com.sun.star.sdb.ErrorMessageDialog" };
     return aSupported;
 }
 
-void OSQLMessageDialog::initialize(Sequence<Any> const & args) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void OSQLMessageDialog::initialize(Sequence<Any> const & args)
 {
     OUString title;
     Reference< css::awt::XWindow > parentWindow;
@@ -100,7 +100,7 @@ void OSQLMessageDialog::initialize(Sequence<Any> const & args) throw (css::uno::
     }
 }
 
-sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw(IllegalArgumentException)
+sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
 {
     switch (_nHandle)
     {
@@ -121,7 +121,7 @@ sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedV
     }
 }
 
-Reference<XPropertySetInfo>  SAL_CALL OSQLMessageDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference<XPropertySetInfo>  SAL_CALL OSQLMessageDialog::getPropertySetInfo()
 {
     Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index af195b29ecac..f7798d8a55cb 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -85,21 +85,18 @@ public:
 
     // XCommandEnvironment
     virtual uno::Reference<task::XInteractionHandler > SAL_CALL
-    getInteractionHandler() throw (uno::RuntimeException, std::exception) override;
+    getInteractionHandler() override;
     virtual uno::Reference<ucb::XProgressHandler >
-    SAL_CALL getProgressHandler() throw (uno::RuntimeException, std::exception) override;
+    SAL_CALL getProgressHandler() override;
 
     // XInteractionHandler
     virtual void SAL_CALL handle(
-        uno::Reference<task::XInteractionRequest > const & xRequest )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<task::XInteractionRequest > const & xRequest ) override;
 
     // XProgressHandler
-    virtual void SAL_CALL push( uno::Any const & Status )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL update( uno::Any const & Status )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL pop() throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL push( uno::Any const & Status ) override;
+    virtual void SAL_CALL update( uno::Any const & Status ) override;
+    virtual void SAL_CALL pop() override;
 };
 
 
@@ -120,14 +117,12 @@ SilentCommandEnv::~SilentCommandEnv()
 
 
 Reference<task::XInteractionHandler> SilentCommandEnv::getInteractionHandler()
-    throw (uno::RuntimeException, std::exception)
 {
     return this;
 }
 
 
 Reference<ucb::XProgressHandler> SilentCommandEnv::getProgressHandler()
-    throw (uno::RuntimeException, std::exception)
 {
     return this;
 }
@@ -135,7 +130,6 @@ Reference<ucb::XProgressHandler> SilentCommandEnv::getProgressHandler()
 
 // XInteractionHandler
 void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRequest )
-    throw (uno::RuntimeException, std::exception)
 {
     deployment::LicenseException licExc;
 
@@ -184,7 +178,6 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe
 
 // XProgressHandler
 void SilentCommandEnv::push( uno::Any const & rStatus )
-    throw (uno::RuntimeException, std::exception)
 {
     OUString sText;
     mnLevel += 1;
@@ -200,7 +193,6 @@ void SilentCommandEnv::push( uno::Any const & rStatus )
 
 
 void SilentCommandEnv::update( uno::Any const & rStatus )
-    throw (uno::RuntimeException, std::exception)
 {
     OUString sText;
     if ( rStatus.hasValue() && ( rStatus >>= sText) )
@@ -210,7 +202,7 @@ void SilentCommandEnv::update( uno::Any const & rStatus )
 }
 
 
-void SilentCommandEnv::pop() throw (uno::RuntimeException, std::exception)
+void SilentCommandEnv::pop()
 {
     mnLevel -= 1;
 }
diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx
index f587f9781b9f..2f2e1d4c4af4 100644
--- a/desktop/source/app/desktopcontext.cxx
+++ b/desktop/source/app/desktopcontext.cxx
@@ -36,7 +36,7 @@ DesktopContext::DesktopContext( const Reference< XCurrentContext > & ctx )
 {
 }
 
-Any SAL_CALL DesktopContext::getValueByName( const OUString& Name) throw (RuntimeException, std::exception)
+Any SAL_CALL DesktopContext::getValueByName( const OUString& Name)
 {
     Any retVal;
 
diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx
index fda7774c051a..0781993b7af5 100644
--- a/desktop/source/app/desktopcontext.hxx
+++ b/desktop/source/app/desktopcontext.hxx
@@ -31,8 +31,7 @@ namespace desktop
     explicit DesktopContext( const css::uno::Reference< css::uno::XCurrentContext > & ctx);
 
         // XCurrentContext
-        virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) override;
 
     private:
             css::uno::Reference< css::uno::XCurrentContext > m_xNextContext;
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 3bbb191da359..ef19db69bdd2 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -720,12 +720,11 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
 
 
 void SAL_CALL DispatchWatcher::disposing( const css::lang::EventObject& )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 
-void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& ) throw( RuntimeException, std::exception )
+void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& )
 {
     osl::ClearableMutexGuard aGuard(m_mutex);
     sal_Int16 nCount = --m_nRequestCount;
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 79f0858ee145..45f66201c83b 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -70,11 +70,10 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu
         virtual ~DispatchWatcher() 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;
 
         // XDispachResultListener
-        virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) override;
 
         // execute new dispatch request
         bool executeDispatchRequests( const std::vector<DispatchRequest>& aDispatches, bool bNoTerminate );
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 8b85258bf46e..0bda37217561 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -318,19 +318,17 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign
 
 // XServiceInfo
 OUString SAL_CALL RequestHandlerController::getImplementationName()
-throw ( RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.RequestHandlerController" );
 }
 
 sal_Bool RequestHandlerController::supportsService(
-    OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
+    OUString const & ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL RequestHandlerController::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
 {
     Sequence< OUString > aSeq( 0 );
     return aSeq;
@@ -338,13 +336,11 @@ throw ( RuntimeException, std::exception )
 
 // XEventListener
 void SAL_CALL RequestHandlerController::disposing( const EventObject& )
-throw( RuntimeException, std::exception )
 {
 }
 
 // XTerminateListener
 void SAL_CALL RequestHandlerController::queryTermination( const EventObject& )
-throw( TerminationVetoException, RuntimeException, std::exception )
 {
     // Desktop ask about pending request through our office ipc pipe. We have to
     // be sure that no pending request is waiting because framework is not able to
@@ -357,7 +353,6 @@ throw( TerminationVetoException, RuntimeException, std::exception )
 }
 
 void SAL_CALL RequestHandlerController::notifyTermination( const EventObject& )
-throw( RuntimeException, std::exception )
 {
 }
 
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 7c9372ca1558..d9d70050ded6 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -137,22 +137,16 @@ class RequestHandlerController : public ::cppu::WeakImplHelper<
         RequestHandlerController() {}
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw ( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw ( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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;
 };
 
 }
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 74a53eb3f4c8..d88defcc9897 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -57,9 +57,9 @@ public:
                      Reference<XComponentContext> const & xContext );
 
     // XProgressHandler
-    virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL pop() throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL push( Any const & Status ) override;
+    virtual void SAL_CALL update( Any const & Status ) override;
+    virtual void SAL_CALL pop() override;
 };
 
 
@@ -146,7 +146,6 @@ void ProgressLogImpl::log_write( OString const & text )
 // XProgressHandler
 
 void ProgressLogImpl::push( Any const & Status )
-    throw (RuntimeException, std::exception)
 {
     update( Status );
     OSL_ASSERT( m_log_level >= 0 );
@@ -155,7 +154,6 @@ void ProgressLogImpl::push( Any const & Status )
 
 
 void ProgressLogImpl::update( Any const & Status )
-    throw (RuntimeException, std::exception)
 {
     if (! Status.hasValue())
         return;
@@ -179,7 +177,7 @@ void ProgressLogImpl::update( Any const & Status )
 }
 
 
-void ProgressLogImpl::pop() throw (RuntimeException, std::exception)
+void ProgressLogImpl::pop()
 {
     OSL_ASSERT( m_log_level > 0 );
     --m_log_level;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e81ff2c6734e..b6ae76a39e96 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1452,12 +1452,12 @@ UpdateRequiredDialogService::UpdateRequiredDialogService( uno::Sequence< uno::An
 
 // XExecutableDialog
 
-void UpdateRequiredDialogService::setTitle( OUString const & ) throw ( uno::RuntimeException, std::exception )
+void UpdateRequiredDialogService::setTitle( OUString const & )
 {
 }
 
 
-sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException, std::exception )
+sal_Int16 UpdateRequiredDialogService::execute()
 {
     ::rtl::Reference< ::dp_gui::TheExtensionManager > xManager( TheExtensionManager::get(
                                                               m_xComponentContext) );
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 8019edc9d330..5b9a8cc403e3 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -265,8 +265,8 @@ public:
                                  css::uno::Reference< css::uno::XComponentContext> const & xComponentContext );
 
     // XExecutableDialog
-    virtual void SAL_CALL         setTitle( OUString const & title ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int16 SAL_CALL    execute() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL         setTitle( OUString const & title ) override;
+    virtual sal_Int16 SAL_CALL    execute() override;
 };
 
 } // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 623e5edbb728..fbdd34bba1d2 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -129,7 +129,7 @@ class ProgressCmdEnv
     void updateProgress();
 
     /// @throws uno::RuntimeException
-    void update_( uno::Any const & Status ) throw ( uno::RuntimeException );
+    void update_( uno::Any const & Status );
 
 public:
     /** When param bAskWhenInstalling = true, then the user is asked if he
@@ -158,21 +158,16 @@ public:
     inline void setWarnUser( bool bNewVal ) { m_bWarnUser = bNewVal; }
 
     // XCommandEnvironment
-    virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
-        throw ( uno::RuntimeException, std::exception ) override;
-    virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler()
-        throw ( uno::RuntimeException, std::exception ) override;
+    virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override;
+    virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() override;
 
     // XInteractionHandler
-    virtual void SAL_CALL handle( uno::Reference< task::XInteractionRequest > const & xRequest )
-        throw ( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL handle( uno::Reference< task::XInteractionRequest > const & xRequest ) override;
 
     // XProgressHandler
-    virtual void SAL_CALL push( uno::Any const & Status )
-        throw ( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL update( uno::Any const & Status )
-        throw ( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL pop() throw ( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL push( uno::Any const & Status ) override;
+    virtual void SAL_CALL update( uno::Any const & Status ) override;
+    virtual void SAL_CALL pop() override;
 };
 
 
@@ -310,14 +305,12 @@ void ProgressCmdEnv::updateProgress()
 // XCommandEnvironment
 
 uno::Reference< task::XInteractionHandler > ProgressCmdEnv::getInteractionHandler()
-    throw ( uno::RuntimeException, std::exception )
 {
     return this;
 }
 
 
 uno::Reference< ucb::XProgressHandler > ProgressCmdEnv::getProgressHandler()
-    throw ( uno::RuntimeException, std::exception )
 {
     return this;
 }
@@ -326,7 +319,6 @@ uno::Reference< ucb::XProgressHandler > ProgressCmdEnv::getProgressHandler()
 // XInteractionHandler
 
 void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & xRequest )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any request( xRequest->getRequest() );
     OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
@@ -534,14 +526,12 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
 // XProgressHandler
 
 void ProgressCmdEnv::push( uno::Any const & rStatus )
-    throw( uno::RuntimeException, std::exception )
 {
     update_( rStatus );
 }
 
 
 void ProgressCmdEnv::update_( uno::Any const & rStatus )
-    throw( uno::RuntimeException )
 {
     OUString text;
     if ( rStatus.hasValue() && !( rStatus >>= text) )
@@ -561,14 +551,12 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus )
 
 
 void ProgressCmdEnv::update( uno::Any const & rStatus )
-    throw( uno::RuntimeException, std::exception )
 {
     update_( rStatus );
 }
 
 
 void ProgressCmdEnv::pop()
-    throw( uno::RuntimeException, std::exception )
 {
     update_( uno::Any() ); // no message
 }
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index e162a5b87428..037c6f3c2e37 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -154,7 +154,6 @@ void Entry_Impl::checkDependencies()
 // ExtensionRemovedListener
 
 void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< deployment::XPackage > xPackage( rEvt.Source, uno::UNO_QUERY );
 
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index d28e248cce1e..e2a77abd3376 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -100,8 +100,7 @@ public:
 
 
     // XEventListener
-    virtual void SAL_CALL disposing(css::lang::EventObject const& evt)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(css::lang::EventObject const& evt) override;
 };
 
 
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index a2e2b596a792..3deb997c43cf 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -151,15 +151,12 @@ public:
                  Reference<XComponentContext> const & xComponentContext );
 
     // XAsynchronousExecutableDialog
-    virtual void SAL_CALL setDialogTitle( OUString const & aTitle )
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDialogTitle( OUString const & aTitle ) override;
     virtual void SAL_CALL startExecuteModal(
-        Reference< ui::dialogs::XDialogClosedListener > const & xListener )
-        throw (RuntimeException, std::exception) override;
+        Reference< ui::dialogs::XDialogClosedListener > const & xListener ) override;
 
     // XJobExecutor
-    virtual void SAL_CALL trigger( OUString const & event )
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL trigger( OUString const & event ) override;
 };
 
 
@@ -186,7 +183,6 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args,
 // XAsynchronousExecutableDialog
 
 void ServiceImpl::setDialogTitle( OUString const & title )
-    throw (RuntimeException, std::exception)
 {
     if ( dp_gui::TheExtensionManager::s_ExtMgr.is() )
     {
@@ -204,7 +200,6 @@ void ServiceImpl::setDialogTitle( OUString const & title )
 
 void ServiceImpl::startExecuteModal(
     Reference< ui::dialogs::XDialogClosedListener > const & xListener )
-    throw (RuntimeException, std::exception)
 {
     bool bCloseDialog = true;  // only used if m_bShowUpdateOnly is true
     ::std::unique_ptr<Application> app;
@@ -289,7 +284,7 @@ void ServiceImpl::startExecuteModal(
 
 // XJobExecutor
 
-void ServiceImpl::trigger( OUString const &rEvent ) throw (RuntimeException, std::exception)
+void ServiceImpl::trigger( OUString const &rEvent )
 {
     if ( rEvent == "SHOW_UPDATE_DIALOG" )
         m_bShowUpdateOnly = true;
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 3b1f0cb6dbc3..c2daf59e0227 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -412,7 +412,6 @@ bool TheExtensionManager::supportsOptions( const uno::Reference< deployment::XPa
 
 // XEventListener
 void TheExtensionManager::disposing( lang::EventObject const & rEvt )
-    throw ( uno::RuntimeException, std::exception )
 {
     bool shutDown = (rEvt.Source == m_xDesktop);
 
@@ -437,7 +436,6 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt )
 
 // XTerminateListener
 void TheExtensionManager::queryTermination( ::lang::EventObject const & )
-    throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception )
 {
     DialogHelper *pDialogHelper = getDialogHelper();
 
@@ -459,7 +457,6 @@ void TheExtensionManager::queryTermination( ::lang::EventObject const & )
 
 
 void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt )
-    throw ( uno::RuntimeException, std::exception )
 {
     disposing( rEvt );
 }
@@ -467,7 +464,6 @@ void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt )
 
 // XModifyListener
 void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
-    throw ( uno::RuntimeException, std::exception )
 {
     m_bModified = true;
     getDialogHelper()->prepareChecking();
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 794d9258c6f0..2a2f067ecb76 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -115,18 +115,14 @@ public:
         OUString const & view = OUString() );
 
     // XEventListener
-    virtual void SAL_CALL disposing( css::lang::EventObject const & evt )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) override;
 
     // XTerminateListener
-    virtual void SAL_CALL queryTermination( css::lang::EventObject const & evt )
-        throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyTermination( css::lang::EventObject const & evt )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryTermination( css::lang::EventObject const & evt ) override;
+    virtual void SAL_CALL notifyTermination( css::lang::EventObject const & evt ) override;
 
     // XModifyListener
-    virtual void SAL_CALL modified( css::lang::EventObject const & evt )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( css::lang::EventObject const & evt ) override;
 };
 
 } // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 4670e3b8f472..f6047d23eace 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -126,21 +126,18 @@ public:
 
     // XCommandEnvironment
     virtual cssu::Reference<css::task::XInteractionHandler > SAL_CALL
-    getInteractionHandler() throw (cssu::RuntimeException, std::exception) override;
+    getInteractionHandler() override;
     virtual cssu::Reference<css::ucb::XProgressHandler >
-    SAL_CALL getProgressHandler() throw (cssu::RuntimeException, std::exception) override;
+    SAL_CALL getProgressHandler() override;
 
     // XInteractionHandler
     virtual void SAL_CALL handle(
-        cssu::Reference<css::task::XInteractionRequest > const & xRequest )
-        throw (cssu::RuntimeException, std::exception) override;
+        cssu::Reference<css::task::XInteractionRequest > const & xRequest ) override;
 
     // XProgressHandler
-    virtual void SAL_CALL push( cssu::Any const & Status )
-        throw (cssu::RuntimeException, std::exception) override;
-    virtual void SAL_CALL update( cssu::Any const & Status )
-        throw (cssu::RuntimeException, std::exception) override;
-    virtual void SAL_CALL pop() throw (cssu::RuntimeException, std::exception) override;
+    virtual void SAL_CALL push( cssu::Any const & Status ) override;
+    virtual void SAL_CALL update( cssu::Any const & Status ) override;
+    virtual void SAL_CALL pop() override;
 };
 
 
@@ -632,13 +629,11 @@ UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > c
 
 // XCommandEnvironment
 cssu::Reference<css::task::XInteractionHandler> UpdateCommandEnv::getInteractionHandler()
-throw (cssu::RuntimeException, std::exception)
 {
     return this;
 }
 
 cssu::Reference<css::ucb::XProgressHandler> UpdateCommandEnv::getProgressHandler()
-throw (cssu::RuntimeException, std::exception)
 {
     return this;
 }
@@ -646,7 +641,6 @@ throw (cssu::RuntimeException, std::exception)
 // XInteractionHandler
 void UpdateCommandEnv::handle(
     cssu::Reference< css::task::XInteractionRequest> const & xRequest )
-    throw (cssu::RuntimeException, std::exception)
 {
     cssu::Any request( xRequest->getRequest() );
     OSL_ASSERT( request.getValueTypeClass() == cssu::TypeClass_EXCEPTION );
@@ -695,16 +689,14 @@ void UpdateCommandEnv::handle(
 
 // XProgressHandler
 void UpdateCommandEnv::push( cssu::Any const & /*Status*/ )
-throw (cssu::RuntimeException, std::exception)
 {
 }
 
 void UpdateCommandEnv::update( cssu::Any const & /*Status */)
-throw (cssu::RuntimeException, std::exception)
 {
 }
 
-void UpdateCommandEnv::pop() throw (cssu::RuntimeException, std::exception)
+void UpdateCommandEnv::pop()
 {
 }
 
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 142c85d6881e..52ddc8e11875 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -293,13 +293,13 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args,
 
 // XExecutableDialog
 
-void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException, std::exception)
+void LicenseDialog::setTitle( OUString const & )
 {
 
 }
 
 
-sal_Int16 LicenseDialog::execute() throw (RuntimeException, std::exception)
+sal_Int16 LicenseDialog::execute()
 {
     return vcl::solarthread::syncExecute(
         std::bind(&LicenseDialog::solar_execute, this));
diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx
index 11eab9de7bf0..85be01aac2e8 100644
--- a/desktop/source/deployment/gui/license_dialog.hxx
+++ b/desktop/source/deployment/gui/license_dialog.hxx
@@ -41,9 +41,8 @@ public:
                  css::uno::Reference<css::uno::XComponentContext> const & xComponentContext );
 
     // XExecutableDialog
-    virtual void SAL_CALL setTitle( OUString const & title )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( OUString const & title ) override;
+    virtual sal_Int16 SAL_CALL execute() override;
 };
 }
 #endif
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 22a287f66461..2cabec56d41a 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -118,7 +118,7 @@ public:
     inline bool isAborted() const { return m_aborted; }
 
     // XAbortChannel
-    virtual void SAL_CALL sendAbort() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL sendAbort() override;
 
     class SAL_DLLPRIVATE Chain
     {
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 1f7aa09079dd..cd93931e6de0 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -56,21 +56,18 @@ BaseCommandEnv::~BaseCommandEnv()
 // XCommandEnvironment
 
 Reference<task::XInteractionHandler> BaseCommandEnv::getInteractionHandler()
-throw (uno::RuntimeException, std::exception)
 {
     return this;
 }
 
 
 Reference<ucb::XProgressHandler> BaseCommandEnv::getProgressHandler()
-throw (uno::RuntimeException, std::exception)
 {
     return this;
 }
 
 void BaseCommandEnv::handle(
     Reference< task::XInteractionRequest> const & /*xRequest*/ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
@@ -120,16 +117,14 @@ void BaseCommandEnv::handle_(bool approve, bool abort,
 
 // XProgressHandler
 void BaseCommandEnv::push( uno::Any const & /*Status*/ )
-throw (uno::RuntimeException, std::exception)
 {
 }
 
 void BaseCommandEnv::update( uno::Any const & /*Status */)
-throw (uno::RuntimeException, std::exception)
 {
 }
 
-void BaseCommandEnv::pop() throw (uno::RuntimeException, std::exception)
+void BaseCommandEnv::pop()
 {
 }
 
@@ -146,7 +141,6 @@ TmpRepositoryCommandEnv::TmpRepositoryCommandEnv(
 // XInteractionHandler
 void TmpRepositoryCommandEnv::handle(
     Reference< task::XInteractionRequest> const & xRequest )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any request( xRequest->getRequest() );
     OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
@@ -180,7 +174,6 @@ LicenseCommandEnv::LicenseCommandEnv(
 // XInteractionHandler
 void LicenseCommandEnv::handle(
     Reference< task::XInteractionRequest> const & xRequest )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any request( xRequest->getRequest() );
     OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
@@ -216,7 +209,6 @@ NoLicenseCommandEnv::NoLicenseCommandEnv(
 // XInteractionHandler
 void NoLicenseCommandEnv::handle(
     Reference< task::XInteractionRequest> const & xRequest )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any request( xRequest->getRequest() );
     OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
@@ -239,7 +231,6 @@ SilentCheckPrerequisitesCommandEnv::SilentCheckPrerequisitesCommandEnv()
 
 void SilentCheckPrerequisitesCommandEnv::handle(
        Reference< task::XInteractionRequest> const & xRequest )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any request( xRequest->getRequest() );
     OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 5f4ab2429dcb..a9f810b3c728 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -47,21 +47,18 @@ public:
 
     // XCommandEnvironment
     virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL
-    getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override;
+    getInteractionHandler() override;
     virtual css::uno::Reference<css::ucb::XProgressHandler >
-    SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getProgressHandler() override;
 
     // XInteractionHandler
     virtual void SAL_CALL handle(
-        css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
 
     // XProgressHandler
-    virtual void SAL_CALL push( css::uno::Any const & Status )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL update( css::uno::Any const & Status )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL push( css::uno::Any const & Status ) override;
+    virtual void SAL_CALL update( css::uno::Any const & Status ) override;
+    virtual void SAL_CALL pop() override;
 };
 
 class TmpRepositoryCommandEnv : public BaseCommandEnv
@@ -72,8 +69,7 @@ public:
 
 // XInteractionHandler
     virtual void SAL_CALL handle(
-        css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
 
 };
 
@@ -94,8 +90,7 @@ public:
 
 // XInteractionHandler
     virtual void SAL_CALL handle(
-        css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
 
 };
 
@@ -111,8 +106,7 @@ public:
 
 // XInteractionHandler
     virtual void SAL_CALL handle(
-        css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
 
 };
 
@@ -130,8 +124,7 @@ public:
     SilentCheckPrerequisitesCommandEnv();
     // XInteractionHandler
     virtual void SAL_CALL handle(
-        css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
 
     // Set to true if a PlatformException or a DependencyException were handled.
     css::uno::Any m_Exception;
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 14ee844b3f6e..fc4832d8fe2c 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -199,14 +199,12 @@ Reference<css::deployment::XPackageManager>  ExtensionManager::getBakRepository(
 }
 
 Reference<task::XAbortChannel> ExtensionManager::createAbortChannel()
-    throw (uno::RuntimeException, std::exception)
 {
     return new dp_misc::AbortChannel;
 }
 
 css::uno::Reference<css::deployment::XPackageManager>
 ExtensionManager::getPackageManager(OUString const & repository)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 {
     Reference<css::deployment::XPackageManager> xPackageManager;
     if (repository == "user")
@@ -311,11 +309,6 @@ ExtensionManager::getExtensionsWithSameIdentifier(
         OUString const & identifier,
         OUString const & fileName,
         Reference< ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (
-            css::deployment::DeploymentException,
-            ucb::CommandFailedException,
-            lang::IllegalArgumentException,
-            uno::RuntimeException, std::exception)
 {
     try
     {
@@ -508,7 +501,6 @@ Reference<css::deployment::XPackage> ExtensionManager::backupExtension(
 //call to one of the repositories.
 uno::Sequence< Reference<css::deployment::XPackageTypeInfo> >
 ExtensionManager::getSupportedPackageTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     return getUserRepository()->getSupportedPackageTypes();
 }
@@ -524,11 +516,6 @@ bool ExtensionManager::doChecksForAddExtension(
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv,
     Reference<css::deployment::XPackage> & out_existingExtension )
-    throw (css::deployment::DeploymentException,
-           ucb::CommandFailedException,
-           ucb::CommandAbortedException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException)
 {
     try
     {
@@ -619,11 +606,6 @@ Reference<css::deployment::XPackage> ExtensionManager::addExtension(
     OUString const & repository,
         Reference<task::XAbortChannel> const & xAbortChannel,
         Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               ucb::CommandFailedException,
-               ucb::CommandAbortedException,
-               lang::IllegalArgumentException,
-               uno::RuntimeException, std::exception)
 {
     Reference<css::deployment::XPackage> xNewExtension;
     //Determine the repository to use
@@ -829,11 +811,6 @@ void ExtensionManager::removeExtension(
     OUString const & repository,
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (css::deployment::DeploymentException,
-           ucb::CommandFailedException,
-           ucb::CommandAbortedException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     uno::Any excOccurred1;
     Reference<css::deployment::XPackage> xExtensionBackup;
@@ -929,11 +906,6 @@ void ExtensionManager::enableExtension(
     Reference<css::deployment::XPackage> const & extension,
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv)
-    throw (css::deployment::DeploymentException,
-        ucb::CommandFailedException,
-        ucb::CommandAbortedException,
-        lang::IllegalArgumentException,
-        uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard guard(getMutex());
     bool bUserDisabled = false;
@@ -994,11 +966,6 @@ sal_Int32 ExtensionManager::checkPrerequisitesAndEnable(
     Reference<css::deployment::XPackage> const & extension,
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv)
-    throw (css::deployment::DeploymentException,
-        ucb::CommandFailedException,
-        ucb::CommandAbortedException,
-        lang::IllegalArgumentException,
-        uno::RuntimeException, std::exception)
 {
     try
     {
@@ -1043,11 +1010,6 @@ void ExtensionManager::disableExtension(
     Reference<css::deployment::XPackage> const & extension,
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (css::deployment::DeploymentException,
-           ucb::CommandFailedException,
-           ucb::CommandAbortedException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard guard(getMutex());
     uno::Any excOccurred;
@@ -1106,11 +1068,6 @@ uno::Sequence< Reference<css::deployment::XPackage> >
     OUString const & repository,
     Reference<task::XAbortChannel> const &xAbort,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (css::deployment::DeploymentException,
-        ucb::CommandFailedException,
-        ucb::CommandAbortedException,
-        lang::IllegalArgumentException,
-        uno::RuntimeException, std::exception)
 {
     return getPackageManager(repository)->getDeployedPackages(
         xAbort, xCmdEnv);
@@ -1122,10 +1079,6 @@ Reference<css::deployment::XPackage>
     OUString const & identifier,
     OUString const & filename,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (css::deployment::DeploymentException,
-        ucb::CommandFailedException,
-        lang::IllegalArgumentException,
-        uno::RuntimeException, std::exception)
 {
     return getPackageManager(repository)->getDeployedPackage(
         identifier, filename, xCmdEnv);
@@ -1135,11 +1088,6 @@ uno::Sequence< uno::Sequence<Reference<css::deployment::XPackage> > >
     ExtensionManager::getAllExtensions(
     Reference<task::XAbortChannel> const & xAbort,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (css::deployment::DeploymentException,
-        ucb::CommandFailedException,
-        ucb::CommandAbortedException,
-        lang::IllegalArgumentException,
-        uno::RuntimeException, std::exception)
 {
     try
     {
@@ -1203,9 +1151,6 @@ void ExtensionManager::reinstallDeployedExtensions(
     sal_Bool force, OUString const & repository,
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (css::deployment::DeploymentException,
-        ucb::CommandFailedException, ucb::CommandAbortedException,
-        lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     try
     {
@@ -1282,11 +1227,6 @@ void ExtensionManager::reinstallDeployedExtensions(
 sal_Bool ExtensionManager::synchronize(
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (css::deployment::DeploymentException,
-           ucb::CommandFailedException,
-           ucb::CommandAbortedException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     try
     {
@@ -1423,8 +1363,6 @@ uno::Sequence<Reference<css::deployment::XPackage> > SAL_CALL
 ExtensionManager::getExtensionsWithUnacceptedLicenses(
         OUString const & repository,
         Reference<ucb::XCommandEnvironment> const & xCmdEnv)
-        throw (css::deployment::DeploymentException,
-               uno::RuntimeException, std::exception)
 {
     Reference<css::deployment::XPackageManager>
         xPackageManager = getPackageManager(repository);
@@ -1433,7 +1371,6 @@ ExtensionManager::getExtensionsWithUnacceptedLicenses(
 }
 
 sal_Bool ExtensionManager::isReadOnlyRepository(OUString const & repository)
-        throw (uno::RuntimeException, std::exception)
 {
     return getPackageManager(repository)->isReadOnly();
 }
@@ -1451,7 +1388,6 @@ sdecl::ServiceDecl const serviceDecl(
 
 void ExtensionManager::addModifyListener(
     Reference<util::XModifyListener> const & xListener )
-    throw (uno::RuntimeException, std::exception)
 {
      check();
      rBHelper.addListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -1460,7 +1396,6 @@ void ExtensionManager::addModifyListener(
 
 void ExtensionManager::removeModifyListener(
     Reference<util::XModifyListener> const & xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     check();
     rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 40d217700638..9b113ce105fe 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -54,148 +54,86 @@ public:
 
 //    XModifyBroadcaster
     virtual void SAL_CALL addModifyListener(
-       css::uno::Reference<css::util::XModifyListener> const & xListener )
-       throw (css::uno::RuntimeException, std::exception) override;
+       css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
     virtual void SAL_CALL removeModifyListener(
-       css::uno::Reference<css::util::XModifyListener> const & xListener )
-       throw (css::uno::RuntimeException, std::exception) override;
+       css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
 
 //XExtensionManager
     virtual css::uno::Sequence<
         css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL
-        getSupportedPackageTypes()
-            throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedPackageTypes() override;
 
     virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL
-    createAbortChannel() throw (css::uno::RuntimeException, std::exception) override;
+    createAbortChannel() override;
 
     virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addExtension(
         OUString const & url,
         css::uno::Sequence<css::beans::NamedValue> const & properties,
         OUString const & repository,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual void SAL_CALL removeExtension(
         OUString const & identifier,
         OUString const & filename,
         OUString const & repository,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::ucb::CommandAbortedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual void SAL_CALL enableExtension(
         css::uno::Reference<css::deployment::XPackage> const & extension,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::ucb::CommandAbortedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual void SAL_CALL disableExtension(
         css::uno::Reference<css::deployment::XPackage> const & extension,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::ucb::CommandAbortedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual sal_Int32 SAL_CALL checkPrerequisitesAndEnable(
         css::uno::Reference<css::deployment::XPackage> const & extension,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::ucb::CommandAbortedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
         SAL_CALL getDeployedExtensions(
         OUString const & repository,
         css::uno::Reference<css::task::XAbortChannel> const &,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::ucb::CommandAbortedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual css::uno::Reference< css::deployment::XPackage>
         SAL_CALL getDeployedExtension(
         OUString const & repository,
         OUString const & identifier,
         OUString const & filename,
-        css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (
-            css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> >
     SAL_CALL getExtensionsWithSameIdentifier(
         OUString const & identifier,
         OUString const & filename,
-        css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (
-            css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual css::uno::Sequence< css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > >
         SAL_CALL getAllExtensions(
         css::uno::Reference<css::task::XAbortChannel> const &,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::ucb::CommandAbortedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual void SAL_CALL reinstallDeployedExtensions(
         sal_Bool force, OUString const & repository,
         css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (
-            css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::ucb::CommandAbortedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual sal_Bool SAL_CALL synchronize(
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
     getExtensionsWithUnacceptedLicenses(
         OUString const & repository,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
-        throw (css::deployment::DeploymentException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) override;
 
-    virtual sal_Bool SAL_CALL isReadOnlyRepository(OUString const & repository)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadOnlyRepository(OUString const & repository) override;
 
 private:
 
@@ -267,8 +205,7 @@ private:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     css::uno::Reference<css::deployment::XPackageManager>
-    getPackageManager(OUString const & repository)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    getPackageManager(OUString const & repository);
 
     /// @throws css::deployment::DeploymentException
     /// @throws css::ucb::CommandFailedException
@@ -281,12 +218,7 @@ private:
         css::uno::Reference<css::deployment::XPackage> const & xTmpExtension,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
-        css::uno::Reference<css::deployment::XPackage> & out_existingExtension )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException);
+        css::uno::Reference<css::deployment::XPackage> & out_existingExtension );
 
 };
 
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index af648647ae78..8634ecca4886 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -66,12 +66,9 @@ class PackageInformationProvider :
     explicit PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext);
 
     // XPackageInformationProvider
-    virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId )
-        throw ( uno::RuntimeException, std::exception ) override;
-    virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL isUpdateAvailable( const OUString& extensionId )
-        throw ( uno::RuntimeException, std::exception ) override;
-    virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList()
-        throw ( uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId ) override;
+    virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL isUpdateAvailable( const OUString& extensionId ) override;
+    virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList() override;
 
 private:
 
@@ -127,7 +124,6 @@ OUString PackageInformationProvider::getPackageLocation(
 
 OUString SAL_CALL
 PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
-    throw ( uno::RuntimeException, std::exception )
 {
     OUString aLocationURL = getPackageLocation( "user", _sExtensionId );
 
@@ -158,7 +154,6 @@ PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
 
 uno::Sequence< uno::Sequence< OUString > > SAL_CALL
 PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Sequence< uno::Sequence< OUString > > aList;
 
@@ -269,7 +264,6 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
 
 
 uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::getExtensionList()
-    throw ( uno::RuntimeException, std::exception )
 {
     const uno::Reference<deployment::XExtensionManager> mgr =
         deployment::ExtensionManager::get(mxContext);
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 70a441d26748..c47aad7bbbb8 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -463,7 +463,7 @@ void PackageManagerImpl::disposing()
 
 // XComponent
 
-void PackageManagerImpl::dispose() throw (RuntimeException, std::exception)
+void PackageManagerImpl::dispose()
 {
     //Do not call check here. We must not throw an exception here if the object
     //is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -472,7 +472,7 @@ void PackageManagerImpl::dispose() throw (RuntimeException, std::exception)
 
 
 void PackageManagerImpl::addEventListener(
-    Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception)
+    Reference<lang::XEventListener> const & xListener )
 {
     //Do not call check here. We must not throw an exception here if the object
     //is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -481,7 +481,7 @@ void PackageManagerImpl::addEventListener(
 
 
 void PackageManagerImpl::removeEventListener(
-    Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception)
+    Reference<lang::XEventListener> const & xListener )
 {
     //Do not call check here. We must not throw an exception here if the object
     //is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -490,7 +490,7 @@ void PackageManagerImpl::removeEventListener(
 
 // XPackageManager
 
-OUString PackageManagerImpl::getContext() throw (RuntimeException, std::exception)
+OUString PackageManagerImpl::getContext()
 {
     check();
     return m_context;
@@ -498,7 +498,7 @@ OUString PackageManagerImpl::getContext() throw (RuntimeException, std::exceptio
 
 
 Sequence< Reference<deployment::XPackageTypeInfo> >
-PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+PackageManagerImpl::getSupportedPackageTypes()
 {
     OSL_ASSERT( m_xRegistry.is() );
     return m_xRegistry->getSupportedPackageTypes();
@@ -506,7 +506,6 @@ PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException, std::exc
 
 
 Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel()
-    throw (RuntimeException, std::exception)
 {
     check();
     return new AbortChannel;
@@ -516,7 +515,6 @@ Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel()
 
 void PackageManagerImpl::addModifyListener(
     Reference<util::XModifyListener> const & xListener )
-    throw (RuntimeException, std::exception)
 {
     check();
     rBHelper.addListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -525,7 +523,6 @@ void PackageManagerImpl::addModifyListener(
 
 void PackageManagerImpl::removeModifyListener(
     Reference<util::XModifyListener> const & xListener )
-    throw (RuntimeException, std::exception)
 {
     check();
     rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -671,9 +668,6 @@ Reference<deployment::XPackage> PackageManagerImpl::importExtension(
     Reference<deployment::XPackage> const & extension,
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<XCommandEnvironment> const & xCmdEnv_ )
-    throw (deployment::DeploymentException, CommandFailedException,
-           CommandAbortedException, lang::IllegalArgumentException,
-           RuntimeException, std::exception)
 {
     return addPackage(extension->getURL(), Sequence<beans::NamedValue>(),
                       OUString(), xAbortChannel, xCmdEnv_);
@@ -688,9 +682,6 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage(
     OUString const & mediaType_,
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<XCommandEnvironment> const & xCmdEnv_ )
-    throw (deployment::DeploymentException, CommandFailedException,
-           CommandAbortedException, lang::IllegalArgumentException,
-           RuntimeException, std::exception)
 {
     check();
     if (m_readOnly)
@@ -842,9 +833,6 @@ void PackageManagerImpl::removePackage(
     OUString const & id, OUString const & fileName,
     Reference<task::XAbortChannel> const & /*xAbortChannel*/,
     Reference<XCommandEnvironment> const & xCmdEnv_ )
-    throw (deployment::DeploymentException, CommandFailedException,
-           CommandAbortedException, lang::IllegalArgumentException,
-           RuntimeException, std::exception)
 {
     check();
 
@@ -1034,8 +1022,6 @@ PackageManagerImpl::getDeployedPackages_(
 Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
     OUString const & id, OUString const & fileName,
     Reference<XCommandEnvironment> const & xCmdEnv_ )
-    throw (deployment::DeploymentException, CommandFailedException,
-           lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     check();
     Reference<XCommandEnvironment> xCmdEnv;
@@ -1078,9 +1064,6 @@ Sequence< Reference<deployment::XPackage> >
 PackageManagerImpl::getDeployedPackages(
     Reference<task::XAbortChannel> const &,
     Reference<XCommandEnvironment> const & xCmdEnv_ )
-    throw (deployment::DeploymentException, CommandFailedException,
-           CommandAbortedException, lang::IllegalArgumentException,
-           RuntimeException, std::exception)
 {
     check();
     Reference<XCommandEnvironment> xCmdEnv;
@@ -1124,9 +1107,6 @@ PackageManagerImpl::getDeployedPackages(
 void PackageManagerImpl::reinstallDeployedPackages(
     sal_Bool force, Reference<task::XAbortChannel> const &  /*xAbortChannel*/,
     Reference<XCommandEnvironment> const & xCmdEnv_ )
-    throw (deployment::DeploymentException,
-           CommandFailedException, CommandAbortedException,
-           lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     check();
     if (!force && office_is_running())
@@ -1181,7 +1161,6 @@ void PackageManagerImpl::reinstallDeployedPackages(
 
 
 sal_Bool SAL_CALL PackageManagerImpl::isReadOnly(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     return m_readOnly;
 }
@@ -1415,11 +1394,6 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
 sal_Bool PackageManagerImpl::synchronize(
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
-    throw (css::deployment::DeploymentException,
-           css::ucb::ContentCreationException,
-           css::ucb::CommandFailedException,
-           css::ucb::CommandAbortedException,
-           css::uno::RuntimeException, std::exception)
 {
     check();
     bool bModified = false;
@@ -1434,7 +1408,6 @@ sal_Bool PackageManagerImpl::synchronize(
 
 Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getExtensionsWithUnacceptedLicenses(
     Reference<ucb::XCommandEnvironment> const & xCmdEnv)
-    throw (deployment::DeploymentException, RuntimeException, std::exception)
 {
     ::std::vector<Reference<deployment::XPackage> > vec;
 
@@ -1496,11 +1469,6 @@ sal_Int32 PackageManagerImpl::checkPrerequisites(
     css::uno::Reference<css::deployment::XPackage> const & extension,
     css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
     css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (css::deployment::DeploymentException,
-           css::ucb::CommandFailedException,
-           css::ucb::CommandAbortedException,
-           css::lang::IllegalArgumentException,
-           css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -1575,7 +1543,6 @@ PackageManagerImpl::CmdEnvWrapperImpl::CmdEnvWrapperImpl(
 
 Reference<task::XInteractionHandler>
 PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler()
-    throw (RuntimeException, std::exception)
 {
     return m_xUserInteractionHandler;
 }
@@ -1583,7 +1550,6 @@ PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler()
 
 Reference<XProgressHandler>
 PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler()
-    throw (RuntimeException, std::exception)
 {
     return this;
 }
@@ -1591,7 +1557,6 @@ PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler()
 // XProgressHandler
 
 void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status )
-    throw (RuntimeException, std::exception)
 {
     if (m_xLogFile.is())
         m_xLogFile->push( Status );
@@ -1601,7 +1566,6 @@ void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status )
 
 
 void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status )
-    throw (RuntimeException, std::exception)
 {
     if (m_xLogFile.is())
         m_xLogFile->update( Status );
@@ -1610,7 +1574,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status )
 }
 
 
-void PackageManagerImpl::CmdEnvWrapperImpl::pop() throw (RuntimeException, std::exception)
+void PackageManagerImpl::CmdEnvWrapperImpl::pop()
 {
     if (m_xLogFile.is())
         m_xLogFile->pop();
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 841eb0b9d90f..cafd630e12c3 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -105,16 +105,14 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
 
         // XCommandEnvironment
         virtual css::uno::Reference<css::task::XInteractionHandler> SAL_CALL
-        getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override;
+        getInteractionHandler() override;
         virtual css::uno::Reference<css::ucb::XProgressHandler> SAL_CALL
-        getProgressHandler() throw (css::uno::RuntimeException, std::exception) override;
+        getProgressHandler() override;
 
         // XProgressHandler
-        virtual void SAL_CALL push( css::uno::Any const & Status )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL update( css::uno::Any const & Status )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL push( css::uno::Any const & Status ) override;
+        virtual void SAL_CALL update( css::uno::Any const & Status ) override;
+        virtual void SAL_CALL pop() override;
     };
 
 protected:
@@ -137,63 +135,43 @@ public:
         const & xComponentContext, OUString const & context );
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-        css::uno::Reference<css::lang::XEventListener> const & xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::lang::XEventListener> const & xListener ) override;
     virtual void SAL_CALL removeEventListener(
-        css::uno::Reference<css::lang::XEventListener> const & xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::lang::XEventListener> const & xListener ) override;
 
     // XModifyBroadcaster
     virtual void SAL_CALL addModifyListener(
-        css::uno::Reference<css::util::XModifyListener> const & xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        css::uno::Reference<css::util::XModifyListener> const & xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
 
     // XPackageManager
-    virtual OUString SAL_CALL getContext()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getContext() override;
     virtual css::uno::Sequence<
         css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL
-    getSupportedPackageTypes() throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedPackageTypes() override;
 
     virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL
-    createAbortChannel() throw (css::uno::RuntimeException, std::exception) override;
+    createAbortChannel() override;
 
     virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addPackage(
         OUString const & url,
         css::uno::Sequence<css::beans::NamedValue> const & properties,
         OUString const & mediaType,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL importExtension(
         css::uno::Reference<css::deployment::XPackage> const & extension,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::ucb::CommandAbortedException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual void SAL_CALL removePackage(
         OUString const & id, OUString const & fileName,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     OUString getDeployPath( ActivePackages::Data const & data );
     css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage_(
@@ -206,10 +184,7 @@ public:
     virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL
     getDeployedPackage(
         OUString const & id, OUString const & fileName,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
     getDeployedPackages_(
@@ -217,50 +192,27 @@ public:
     virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
     SAL_CALL getDeployedPackages(
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual void SAL_CALL reinstallDeployedPackages(
         sal_Bool force,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
-    virtual ::sal_Bool SAL_CALL isReadOnly(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Bool SAL_CALL isReadOnly(  ) override;
 
     virtual ::sal_Bool SAL_CALL synchronize(
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::ContentCreationException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL
     getExtensionsWithUnacceptedLicenses(
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv)
-        throw (css::deployment::DeploymentException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) override;
 
     virtual sal_Int32 SAL_CALL checkPrerequisites(
         css::uno::Reference<css::deployment::XPackage> const & extension,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
         };
 
 
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index db2b5f85350e..ab1cc4466f66 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -61,7 +61,7 @@ public:
 
     // XPackageManagerFactory
     virtual Reference<deployment::XPackageManager> SAL_CALL getPackageManager(
-        OUString const & context ) throw (RuntimeException, std::exception) override;
+        OUString const & context ) override;
 };
 
 
@@ -114,7 +114,6 @@ void PackageManagerFactoryImpl::disposing()
 
 Reference<deployment::XPackageManager>
 PackageManagerFactoryImpl::getPackageManager( OUString const & context )
-    throw (RuntimeException, std::exception)
 {
     Reference< deployment::XPackageManager > xRet;
     ::osl::ResettableMutexGuard guard( getMutex() );
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 48ae7154fddd..848fd3dc6603 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -65,20 +65,19 @@ public:
     EmptyNodeList(const EmptyNodeList&) = delete;
     const EmptyNodeList& operator=(const EmptyNodeList&) = delete;
 
-    virtual ::sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getLength() override;
 
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-    item(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override;
+    item(::sal_Int32 index) override;
 };
 
 EmptyNodeList::EmptyNodeList() {}
 
-::sal_Int32 EmptyNodeList::getLength() throw (css::uno::RuntimeException, std::exception) {
+::sal_Int32 EmptyNodeList::getLength() {
     return 0;
 }
 
 css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32)
-    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException("bad EmptyNodeList com.sun.star.xml.dom.XNodeList.item call",
         static_cast< ::cppu::OWeakObject * >(this));
@@ -146,14 +145,13 @@ public:
     bool exist() { return m_bExist;}
     // XCommandEnvironment
     virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL
-    getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override;
+    getInteractionHandler() override;
     virtual css::uno::Reference<css::ucb::XProgressHandler >
-    SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getProgressHandler() override;
 
     // XInteractionHandler
     virtual void SAL_CALL handle(
-        css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
 };
 
 ExtensionDescription::ExtensionDescription(
@@ -247,13 +245,13 @@ FileDoesNotExistFilter::FileDoesNotExistFilter(
 
     // XCommandEnvironment
 Reference<css::task::XInteractionHandler >
-    FileDoesNotExistFilter::getInteractionHandler() throw (css::uno::RuntimeException, std::exception)
+    FileDoesNotExistFilter::getInteractionHandler()
 {
     return static_cast<css::task::XInteractionHandler*>(this);
 }
 
 Reference<css::ucb::XProgressHandler >
-    FileDoesNotExistFilter::getProgressHandler() throw (css::uno::RuntimeException, std::exception)
+    FileDoesNotExistFilter::getProgressHandler()
 {
     return m_xCommandEnv.is()
         ? m_xCommandEnv->getProgressHandler()
@@ -265,7 +263,6 @@ Reference<css::ucb::XProgressHandler >
 //of FileDoesNotExistFilter, then we do nothing
 void  FileDoesNotExistFilter::handle(
         Reference<css::task::XInteractionRequest > const & xRequest )
-        throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any request( xRequest->getRequest() );
 
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index f6c35e80468e..cfcc5ba4903e 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -52,11 +52,10 @@ public:
     // XInterface
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
-    virtual Any SAL_CALL queryInterface( Type const & type )
-        throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( Type const & type ) override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select() throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL select() override;
 };
 
 // XInterface
@@ -74,7 +73,6 @@ void InteractionContinuationImpl::release() throw ()
 
 
 Any InteractionContinuationImpl::queryInterface( Type const & type )
-    throw (RuntimeException, std::exception)
 {
     if (type.isAssignableFrom( m_type )) {
         Reference<task::XInteractionContinuation> xThis(this);
@@ -86,7 +84,7 @@ Any InteractionContinuationImpl::queryInterface( Type const & type )
 
 // XInteractionContinuation
 
-void InteractionContinuationImpl::select() throw (RuntimeException, std::exception)
+void InteractionContinuationImpl::select()
 {
     *m_pselect = true;
 }
@@ -127,7 +125,7 @@ bool interactContinuation( Any const & request,
 
 // XAbortChannel
 
-void AbortChannel::sendAbort() throw (RuntimeException, std::exception)
+void AbortChannel::sendAbort()
 {
     m_aborted = true;
     if (m_xNext.is())
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index a6ddce438442..d00143157765 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -321,11 +321,9 @@ public:
 
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
-    getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
+    getSupportedPackageTypes() override;
 
-    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
 
     using PackageRegistryBackend::disposing;
 
@@ -585,14 +583,12 @@ void BackendImpl::revokeEntryFromDb(OUString const & url)
 // XPackageRegistry
 
 Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
 {
     return m_typeInfos;
 }
 
 void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception)
 {
     if (m_backendDb.get())
         m_backendDb->removeEntry(url);
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index dcd30b46c497..21bc2e49d976 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -150,10 +150,8 @@ public:
 
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
-    getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception) override;
+    getSupportedPackageTypes() override;
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
 
     using PackageRegistryBackend::disposing;
 };
@@ -284,13 +282,11 @@ bool BackendImpl::activateEntry(OUString const & url)
 // XPackageRegistry
 
 Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
 {
     return m_typeInfos;
 }
 void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception)
 {
     if (m_backendDb.get())
         m_backendDb->removeEntry(url);
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 122706966069..2c2ee723f43d 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -58,7 +58,6 @@ PackageRegistryBackend::~PackageRegistryBackend()
 
 
 void PackageRegistryBackend::disposing( lang::EventObject const & event )
-    throw (RuntimeException, std::exception)
 {
     Reference<deployment::XPackage> xPackage(
         event.Source, UNO_QUERY_THROW );
@@ -139,10 +138,6 @@ void PackageRegistryBackend::disposing()
 Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
     OUString const & url, OUString const & mediaType, sal_Bool  bRemoved,
     OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
-    throw (deployment::DeploymentException,
-           deployment::InvalidRemovedParameterException,
-           ucb::CommandFailedException,
-           lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard guard( getMutex() );
     check();
@@ -354,7 +349,7 @@ void Package::check() const
 
 // XComponent
 
-void Package::dispose() throw (RuntimeException, std::exception)
+void Package::dispose()
 {
     //Do not call check here. We must not throw an exception here if the object
     //is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -363,7 +358,7 @@ void Package::dispose() throw (RuntimeException, std::exception)
 
 
 void Package::addEventListener(
-    Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception)
+    Reference<lang::XEventListener> const & xListener )
 {
     //Do not call check here. We must not throw an exception here if the object
     //is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -372,7 +367,7 @@ void Package::addEventListener(
 
 
 void Package::removeEventListener(
-    Reference<lang::XEventListener> const & xListener ) throw (RuntimeException, std::exception)
+    Reference<lang::XEventListener> const & xListener )
 {
     //Do not call check here. We must not throw an exception here if the object
     //is being disposed or is already disposed. See com.sun.star.lang.XComponent
@@ -383,7 +378,6 @@ void Package::removeEventListener(
 
 void Package::addModifyListener(
     Reference<util::XModifyListener> const & xListener )
-    throw (RuntimeException, std::exception)
 {
     check();
     rBHelper.addListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -392,7 +386,6 @@ void Package::addModifyListener(
 
 void Package::removeModifyListener(
     Reference<util::XModifyListener> const & xListener )
-    throw (RuntimeException, std::exception)
 {
     check();
     rBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
@@ -411,14 +404,13 @@ void Package::checkAborted(
 // XPackage
 
 Reference<task::XAbortChannel> Package::createAbortChannel()
-    throw (RuntimeException, std::exception)
 {
     check();
     return new AbortChannel;
 }
 
 
-sal_Bool Package::isBundle() throw (RuntimeException, std::exception)
+sal_Bool Package::isBundle()
 {
     return false; // default
 }
@@ -428,11 +420,6 @@ sal_Bool Package::isBundle() throw (RuntimeException, std::exception)
         const css::uno::Reference< css::task::XAbortChannel >&,
         const css::uno::Reference< css::ucb::XCommandEnvironment >&,
         sal_Bool)
-        throw (css::deployment::DeploymentException,
-               css::deployment::ExtensionRemovedException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -442,10 +429,6 @@ sal_Bool Package::isBundle() throw (RuntimeException, std::exception)
 
 sal_Bool Package::checkDependencies(
         const css::uno::Reference< css::ucb::XCommandEnvironment >& )
-        throw (css::deployment::DeploymentException,
-               css::deployment::ExtensionRemovedException,
-               css::ucb::CommandFailedException,
-               css::uno::RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -456,20 +439,17 @@ sal_Bool Package::checkDependencies(
 Sequence< Reference<deployment::XPackage> > Package::getBundle(
     Reference<task::XAbortChannel> const &,
     Reference<XCommandEnvironment> const & )
-    throw (deployment::DeploymentException,
-           CommandFailedException, CommandAbortedException,
-           lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     return Sequence< Reference<deployment::XPackage> >();
 }
 
 
-OUString Package::getName() throw (RuntimeException, std::exception)
+OUString Package::getName()
 {
     return m_name;
 }
 
-beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException, std::exception)
+beans::Optional<OUString> Package::getIdentifier()
 {
     if (m_bRemoved)
         return beans::Optional<OUString>(true, m_identifier);
@@ -478,9 +458,7 @@ beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException, std:
 }
 
 
-OUString Package::getVersion() throw (
-    deployment::ExtensionRemovedException,
-    RuntimeException, std::exception)
+OUString Package::getVersion()
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -488,14 +466,13 @@ OUString Package::getVersion() throw (
 }
 
 
-OUString Package::getURL() throw (RuntimeException, std::exception)
+OUString Package::getURL()
 {
     return m_url;
 }
 
 
-OUString Package::getDisplayName() throw (
-    deployment::ExtensionRemovedException, RuntimeException, std::exception)
+OUString Package::getDisplayName()
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -503,8 +480,7 @@ OUString Package::getDisplayName() throw (
 }
 
 
-OUString Package::getDescription() throw (
-    deployment::ExtensionRemovedException,RuntimeException, std::exception)
+OUString Package::getDescription()
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -512,10 +488,7 @@ OUString Package::getDescription() throw (
 }
 
 
-OUString Package::getLicenseText()throw (
-    deployment::DeploymentException,
-    deployment::ExtensionRemovedException,
-    RuntimeException, std::exception)
+OUString Package::getLicenseText()
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -523,8 +496,7 @@ OUString Package::getLicenseText()throw (
 }
 
 
-Sequence<OUString> Package::getUpdateInformationURLs() throw (
-    deployment::ExtensionRemovedException, RuntimeException, std::exception)
+Sequence<OUString> Package::getUpdateInformationURLs()
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -532,8 +504,7 @@ Sequence<OUString> Package::getUpdateInformationURLs() throw (
 }
 
 
-css::beans::StringPair Package::getPublisherInfo() throw (
-    deployment::ExtensionRemovedException, RuntimeException, std::exception)
+css::beans::StringPair Package::getPublisherInfo()
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -543,7 +514,6 @@ css::beans::StringPair Package::getPublisherInfo() throw (
 
 
 uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContrast*/ )
-    throw (deployment::ExtensionRemovedException, RuntimeException, std::exception )
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -554,7 +524,6 @@ uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContr
 
 
 Reference<deployment::XPackageTypeInfo> Package::getPackageType()
-    throw (RuntimeException, std::exception)
 {
     return m_xPackageType;
 }
@@ -562,9 +531,6 @@ Reference<deployment::XPackageTypeInfo> Package::getPackageType()
 void Package::exportTo(
     OUString const & destFolderURL, OUString const & newTitle,
     sal_Int32 nameClashAction, Reference<XCommandEnvironment> const & xCmdEnv )
-    throw (deployment::ExtensionRemovedException,
-           CommandFailedException, CommandAbortedException, ContentCreationException,
-           RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -610,8 +576,6 @@ void Package::fireModified()
 beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered(
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<XCommandEnvironment> const & xCmdEnv )
-    throw (deployment::DeploymentException,
-           CommandFailedException, CommandAbortedException, RuntimeException, std::exception)
 {
     try {
         ::osl::ResettableMutexGuard guard( getMutex() );
@@ -722,10 +686,6 @@ void Package::registerPackage(
     sal_Bool startup,
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<XCommandEnvironment> const & xCmdEnv )
-    throw (deployment::DeploymentException,
-           deployment::ExtensionRemovedException,
-           CommandFailedException, CommandAbortedException,
-           lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -737,9 +697,6 @@ void Package::revokePackage(
     sal_Bool startup,
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<XCommandEnvironment> const & xCmdEnv )
-    throw (deployment::DeploymentException,
-           CommandFailedException, CommandAbortedException,
-           lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     processPackage_impl( false /* revoke */, startup, xAbortChannel, xCmdEnv );
 
@@ -761,16 +718,12 @@ PackageRegistryBackend * Package::getMyBackend() const
 }
 
 OUString Package::getRepositoryName()
-    throw (RuntimeException, std::exception)
 {
     PackageRegistryBackend * backEnd = getMyBackend();
     return backEnd->getContext();
 }
 
 beans::Optional< OUString > Package::getRegistrationDataURL()
-        throw (deployment::DeploymentException,
-               deployment::ExtensionRemovedException,
-               css::uno::RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -778,7 +731,6 @@ beans::Optional< OUString > Package::getRegistrationDataURL()
 }
 
 sal_Bool Package::isRemoved()
-    throw (RuntimeException, std::exception)
 {
     return m_bRemoved;
 }
@@ -789,32 +741,29 @@ Package::TypeInfo::~TypeInfo()
 
 // XPackageTypeInfo
 
-OUString Package::TypeInfo::getMediaType() throw (RuntimeException, std::exception)
+OUString Package::TypeInfo::getMediaType()
 {
     return m_mediaType;
 }
 
 
 OUString Package::TypeInfo::getDescription()
-    throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
 {
     return getShortDescription();
 }
 
 
 OUString Package::TypeInfo::getShortDescription()
-    throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
 {
     return m_shortDescr;
 }
 
-OUString Package::TypeInfo::getFileFilter() throw (RuntimeException, std::exception)
+OUString Package::TypeInfo::getFileFilter()
 {
     return m_fileFilter;
 }
 
 Any Package::TypeInfo::getIcon( sal_Bool /*highContrast*/, sal_Bool /*smallIcon*/ )
-    throw (RuntimeException, std::exception)
 {
     return Any();
 }
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index d1b77a020af9..7edf53fd2860 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -105,21 +105,15 @@ public:
         Reference<XComponentContext> const & xComponentContext );
 
     // XUpdatable
-    virtual void SAL_CALL update() throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL update() override;
 
     // XPackageRegistry
     virtual Reference<deployment::XPackage> SAL_CALL bindPackage(
         OUString const & url, OUString const & mediaType, sal_Bool bRemoved,
-        OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
-        throw (deployment::DeploymentException,
-               deployment::InvalidRemovedParameterException,
-               CommandFailedException,
-               lang::IllegalArgumentException, RuntimeException, std::exception) override;
+        OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) override;
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
-    getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
-                throw (deployment::DeploymentException,
-                RuntimeException, std::exception) override;
+    getSupportedPackageTypes() override;
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
 
 };
 
@@ -172,8 +166,6 @@ OUString normalizeMediaType( OUString const & mediaType )
 
 void PackageRegistryImpl::packageRemoved(
     OUString const & url, OUString const & mediaType)
-    throw (css::deployment::DeploymentException,
-           css::uno::RuntimeException, std::exception)
 {
     const t_string2registry::const_iterator i =
         m_mediaType2backend.find(mediaType);
@@ -437,7 +429,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create(
 
 // XUpdatable: broadcast to backends
 
-void PackageRegistryImpl::update() throw (RuntimeException, std::exception)
+void PackageRegistryImpl::update()
 {
     check();
     t_registryset::const_iterator iPos( m_allBackends.begin() );
@@ -454,9 +446,6 @@ void PackageRegistryImpl::update() throw (RuntimeException, std::exception)
 Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
     OUString const & url, OUString const & mediaType_, sal_Bool bRemoved,
     OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
-    throw (deployment::DeploymentException, deployment::InvalidRemovedParameterException,
-           CommandFailedException,
-           lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     check();
     OUString mediaType(mediaType_);
@@ -539,7 +528,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
 
 
 Sequence< Reference<deployment::XPackageTypeInfo> >
-PackageRegistryImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+PackageRegistryImpl::getSupportedPackageTypes()
 {
     return comphelper::containerToSequence(m_typesInfos);
 }
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 118210452ec5..50a14b9b9428 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -93,10 +93,8 @@ public:
 
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
-    getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception) override;
+    getSupportedPackageTypes() override;
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
 
 };
 
@@ -139,15 +137,13 @@ bool BackendImpl::hasActiveEntry(OUString const & url)
 
 // XPackageRegistry
 Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
 {
     return Sequence<Reference<deployment::XPackageTypeInfo> >(
         & m_xExecutableTypeInfo, 1);
 }
 
 void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception)
 {
     if (m_backendDb.get())
         m_backendDb->removeEntry(url);
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 4b5f78e8393d..6c29f8a43c84 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -84,9 +84,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
         bool extensionContainsCompiledHelp();
 
         //XPackage
-        virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL()
-            throw (deployment::DeploymentException, deployment::ExtensionRemovedException,
-                   css::uno::RuntimeException, std::exception) override;
+        virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() override;
     };
     friend class PackageImpl;
 
@@ -118,10 +116,8 @@ public:
 
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
-        getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception) override;
+        getSupportedPackageTypes() override;
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
 
 };
 
@@ -156,14 +152,12 @@ BackendImpl::BackendImpl(
 // XPackageRegistry
 
 Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
 {
     return m_typeInfos;
 }
 
 void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception)
 {
     if (m_backendDb.get())
         m_backendDb->removeEntry(url);
@@ -343,9 +337,6 @@ void BackendImpl::PackageImpl::processPackage_(
 }
 
 beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
-    throw (deployment::DeploymentException,
-           deployment::ExtensionRemovedException,
-           css::uno::RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index deba0dda93f2..ad717500c181 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -116,144 +116,78 @@ public:
               m_shortDescr(shortDescr)
             {}
         // XPackageTypeInfo
-        virtual OUString SAL_CALL getMediaType()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDescription()
-            throw (css::deployment::ExtensionRemovedException,
-                   css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getShortDescription()
-            throw (css::deployment::ExtensionRemovedException,
-                   css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getFileFilter()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getMediaType() override;
+        virtual OUString SAL_CALL getDescription() override;
+        virtual OUString SAL_CALL getShortDescription() override;
+        virtual OUString SAL_CALL getFileFilter() override;
         virtual css::uno::Any SAL_CALL getIcon( sal_Bool highContrast,
-                                                sal_Bool smallIcon )
-            throw (css::uno::RuntimeException, std::exception) override;
+                                                sal_Bool smallIcon ) override;
     };
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-        css::uno::Reference<css::lang::XEventListener> const & xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::lang::XEventListener> const & xListener ) override;
     virtual void SAL_CALL removeEventListener(
-        css::uno::Reference<css::lang::XEventListener> const & xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::lang::XEventListener> const & xListener ) override;
 
     // XModifyBroadcaster
     virtual void SAL_CALL addModifyListener(
-        css::uno::Reference<css::util::XModifyListener> const & xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        css::uno::Reference<css::util::XModifyListener> const & xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::util::XModifyListener> const & xListener ) override;
 
     // XPackage
     virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL
-    createAbortChannel() throw (css::uno::RuntimeException, std::exception) override;
+    createAbortChannel() override;
     virtual css::beans::Optional< css::beans::Ambiguous<sal_Bool> >
     SAL_CALL isRegistered(
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
     virtual ::sal_Int32 SAL_CALL checkPrerequisites(
         const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel,
         const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv,
-        sal_Bool noLicenseChecking)
-        throw (css::deployment::DeploymentException,
-               css::deployment::ExtensionRemovedException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception) override;
+        sal_Bool noLicenseChecking) override;
 
     virtual ::sal_Bool SAL_CALL checkDependencies(
-        const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::deployment::ExtensionRemovedException,
-               css::ucb::CommandFailedException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) override;
 
     virtual void SAL_CALL registerPackage(
         sal_Bool startup,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::deployment::ExtensionRemovedException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
     virtual void SAL_CALL revokePackage(
         sal_Bool startup,
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isBundle()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
+    virtual sal_Bool SAL_CALL isBundle() override;
     virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> >
     SAL_CALL getBundle(
         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::beans::Optional< OUString > SAL_CALL getIdentifier()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getVersion()
-        throw (css::deployment::ExtensionRemovedException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getURL()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDisplayName()
-        throw (css::deployment::ExtensionRemovedException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDescription()
-        throw (css::deployment::ExtensionRemovedException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLicenseText()
-        throw (css::deployment::DeploymentException,
-               css::deployment::ExtensionRemovedException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual css::beans::Optional< OUString > SAL_CALL getIdentifier() override;
+    virtual OUString SAL_CALL getVersion() override;
+    virtual OUString SAL_CALL getURL() override;
+    virtual OUString SAL_CALL getDisplayName() override;
+    virtual OUString SAL_CALL getDescription() override;
+    virtual OUString SAL_CALL getLicenseText() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getUpdateInformationURLs()
-        throw (css::deployment::ExtensionRemovedException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::beans::StringPair SAL_CALL getPublisherInfo()
-        throw (css::deployment::ExtensionRemovedException,
-               css::uno::RuntimeException, std::exception) override;
+    getUpdateInformationURLs() override;
+    virtual css::beans::StringPair SAL_CALL getPublisherInfo() override;
     virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL
-    getIcon( sal_Bool bHighContrast )
-        throw (css::deployment::ExtensionRemovedException,
-               css::uno::RuntimeException, std::exception) override;
+    getIcon( sal_Bool bHighContrast ) override;
     virtual css::uno::Reference<css::deployment::XPackageTypeInfo> SAL_CALL
-    getPackageType() throw (css::uno::RuntimeException, std::exception) override;
+    getPackageType() override;
     virtual void SAL_CALL exportTo(
         OUString const & destFolderURL,
         OUString const & newTitle,
         sal_Int32 nameClashAction,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::ExtensionRemovedException,
-               css::ucb::CommandFailedException, css::ucb::CommandAbortedException,
-               css::ucb::ContentCreationException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRepositoryName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL()
-        throw (css::deployment::DeploymentException,
-               css::deployment::ExtensionRemovedException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isRemoved()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
+    virtual OUString SAL_CALL getRepositoryName() override;
+    virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() override;
+    virtual sal_Bool SAL_CALL isRemoved() override;
 
 };
 
@@ -344,18 +278,13 @@ public:
     const OUString& getContext() const {return m_context; }
 
     // XEventListener
-    virtual void SAL_CALL disposing( css::lang::EventObject const & evt )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) override;
 
     // XPackageRegistry
     virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL bindPackage(
         OUString const & url, OUString const & mediaType,
         sal_Bool bRemoved, OUString const & identifier,
-        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-        throw (css::deployment::DeploymentException,
-               css::deployment::InvalidRemovedParameterException,
-               css::ucb::CommandFailedException,
-               css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
 //     virtual void SAL_CALL packageRemoved(
 //         OUString const & url, OUString const & mediaType)
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 174b4978ee18..08ba82f8cc8f 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -135,11 +135,7 @@ class BackendImpl : public ImplBaseT
         /// @throws RuntimeException
         bool checkLicense(
             Reference< ucb::XCommandEnvironment > const & xCmdEnv,
-            DescriptionInfoset const & description, bool bNoLicenseChecking)
-                throw (deployment::DeploymentException,
-                       ucb::CommandFailedException,
-                       ucb::CommandAbortedException,
-                       RuntimeException);
+            DescriptionInfoset const & description, bool bNoLicenseChecking);
         // @throws DeploymentException
         OUString getTextFromURL(
             const Reference< ucb::XCommandEnvironment >& xCmdEnv,
@@ -173,69 +169,40 @@ class BackendImpl : public ImplBaseT
             OUString const & identifier);
 
         // XPackage
-        virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isBundle() override;
 
         virtual Sequence< Reference<deployment::XPackage> > SAL_CALL getBundle(
             Reference<task::XAbortChannel> const & xAbortChannel,
-            Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-            throw (deployment::DeploymentException,
-                   ucb::CommandFailedException,
-                   ucb::CommandAbortedException,
-                   lang::IllegalArgumentException, RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDescription()
-            throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
-
-        virtual OUString SAL_CALL getLicenseText()
-            throw (deployment::DeploymentException,
-                   deployment::ExtensionRemovedException,
-                   RuntimeException, std::exception) override;
+            Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override;
+        virtual OUString SAL_CALL getDescription() override;
+
+        virtual OUString SAL_CALL getLicenseText() override;
 
         virtual void SAL_CALL exportTo(
             OUString const & destFolderURL, OUString const & newTitle,
             sal_Int32 nameClashAction,
-            Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-            throw (deployment::ExtensionRemovedException,
-                   ucb::CommandFailedException,
-                   ucb::CommandAbortedException,
-                   ucb::ContentCreationException,
-                   RuntimeException, std::exception) override;
+            Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override;
 
         virtual ::sal_Int32 SAL_CALL checkPrerequisites(
             const Reference< task::XAbortChannel >& xAbortChannel,
             const Reference< ucb::XCommandEnvironment >& xCmdEnv,
-            sal_Bool noLicenseChecking)
-            throw (deployment::ExtensionRemovedException,
-                   deployment::DeploymentException,
-                   ucb::CommandFailedException,
-                   ucb::CommandAbortedException,
-                   RuntimeException, std::exception) override;
+            sal_Bool noLicenseChecking) override;
 
         virtual sal_Bool SAL_CALL checkDependencies(
-            const Reference< ucb::XCommandEnvironment >& xCmdEnv )
-            throw (deployment::DeploymentException,
-                   deployment::ExtensionRemovedException,
-                   ucb::CommandFailedException,
-                   RuntimeException, std::exception) override;
+            const Reference< ucb::XCommandEnvironment >& xCmdEnv ) override;
 
-        virtual beans::Optional<OUString> SAL_CALL getIdentifier()
-            throw (RuntimeException, std::exception) override;
+        virtual beans::Optional<OUString> SAL_CALL getIdentifier() override;
 
-        virtual OUString SAL_CALL getVersion()
-            throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getVersion() override;
 
-        virtual Sequence<OUString> SAL_CALL getUpdateInformationURLs()
-            throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
+        virtual Sequence<OUString> SAL_CALL getUpdateInformationURLs() override;
 
-        virtual beans::StringPair SAL_CALL getPublisherInfo()
-            throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
+        virtual beans::StringPair SAL_CALL getPublisherInfo() override;
 
-        virtual OUString SAL_CALL getDisplayName()
-            throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getDisplayName() override;
 
         virtual Reference< graphic::XGraphic > SAL_CALL
-        getIcon( sal_Bool bHighContrast )
-            throw (deployment::ExtensionRemovedException,
-                   RuntimeException, std::exception) override;
+        getIcon( sal_Bool bHighContrast ) override;
     };
     friend class PackageImpl;
 
@@ -265,18 +232,14 @@ public:
         Reference<deployment::XPackageRegistry> const & xRootRegistry );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const& name )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( OUString const& name ) override;
+    virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
-    getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception) override;
+    getSupportedPackageTypes() override;
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
 
     using ImplBaseT::disposing;
 };
@@ -332,19 +295,17 @@ void BackendImpl::disposing()
 }
 
 // XServiceInfo
-OUString BackendImpl::getImplementationName() throw (RuntimeException, std::exception)
+OUString BackendImpl::getImplementationName()
 {
     return OUString("com.sun.star.comp.deployment.bundle.PackageRegistryBackend");
 }
 
 sal_Bool BackendImpl::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence<OUString> BackendImpl::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return { OUString(BACKEND_SERVICE_NAME) };
 }
@@ -352,14 +313,12 @@ Sequence<OUString> BackendImpl::getSupportedServiceNames()
 // XPackageRegistry
 
 Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
 {
     return m_typeInfos;
 }
 
 void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception)
 {
     //Notify the backend responsible for processing the different media
     //types that this extension was removed.
@@ -659,10 +618,6 @@ bool BackendImpl::PackageImpl::checkDependencies(
 bool BackendImpl::PackageImpl::checkLicense(
     css::uno::Reference< css::ucb::XCommandEnvironment > const & xCmdEnv,
     DescriptionInfoset const & info, bool alreadyInstalled)
-        throw (css::deployment::DeploymentException,
-            css::ucb::CommandFailedException,
-            css::ucb::CommandAbortedException,
-            css::uno::RuntimeException)
 {
     try
     {
@@ -731,11 +686,6 @@ bool BackendImpl::PackageImpl::checkLicense(
         const css::uno::Reference< css::task::XAbortChannel >&,
         const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv,
         sal_Bool alreadyInstalled)
-        throw (css::deployment::DeploymentException,
-               css::deployment::ExtensionRemovedException,
-               css::ucb::CommandFailedException,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -760,10 +710,6 @@ bool BackendImpl::PackageImpl::checkLicense(
 
 sal_Bool BackendImpl::PackageImpl::checkDependencies(
         const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv )
-        throw (deployment::DeploymentException,
-               deployment::ExtensionRemovedException,
-               ucb::CommandFailedException,
-               RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -775,7 +721,6 @@ sal_Bool BackendImpl::PackageImpl::checkDependencies(
 }
 
 beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier()
-    throw (RuntimeException, std::exception)
 {
     OUString identifier;
     if (m_bRemoved)
@@ -789,7 +734,6 @@ beans::Optional<OUString> BackendImpl::PackageImpl::getIdentifier()
 }
 
 OUString BackendImpl::PackageImpl::getVersion()
-    throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -797,7 +741,6 @@ OUString BackendImpl::PackageImpl::getVersion()
 }
 
 Sequence<OUString> BackendImpl::PackageImpl::getUpdateInformationURLs()
-    throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -805,7 +748,6 @@ Sequence<OUString> BackendImpl::PackageImpl::getUpdateInformationURLs()
 }
 
 beans::StringPair BackendImpl::PackageImpl::getPublisherInfo()
-    throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -816,7 +758,6 @@ beans::StringPair BackendImpl::PackageImpl::getPublisherInfo()
 
 
 uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool bHighContrast )
-    throw (deployment::ExtensionRemovedException, RuntimeException, std::exception )
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -976,7 +917,6 @@ void BackendImpl::PackageImpl::processPackage_(
 
 
 OUString BackendImpl::PackageImpl::getDescription()
-    throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -1004,9 +944,6 @@ OUString BackendImpl::PackageImpl::getDescription()
 
 
 OUString BackendImpl::PackageImpl::getLicenseText()
-    throw (deployment::DeploymentException,
-           deployment::ExtensionRemovedException,
-           RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -1033,9 +970,6 @@ OUString BackendImpl::PackageImpl::getLicenseText()
 void BackendImpl::PackageImpl::exportTo(
     OUString const & destFolderURL, OUString const & newTitle,
     sal_Int32 nameClashAction, Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (deployment::ExtensionRemovedException,
-           ucb::CommandFailedException, ucb::CommandAbortedException,
-           ucb::ContentCreationException, RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
@@ -1230,7 +1164,7 @@ void BackendImpl::PackageImpl::exportTo(
 }
 
 
-sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException, std::exception)
+sal_Bool BackendImpl::PackageImpl::isBundle()
 {
     return true;
 }
@@ -1239,9 +1173,6 @@ sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException, std::exce
 Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle(
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-    throw (deployment::DeploymentException,
-           ucb::CommandFailedException, ucb::CommandAbortedException,
-           lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     Sequence< Reference<deployment::XPackage> > * pBundle = m_pBundle;
     if (pBundle == nullptr)
@@ -1634,7 +1565,6 @@ void BackendImpl::PackageImpl::scanLegacyBundle(
 }
 
 OUString BackendImpl::PackageImpl::getDisplayName()
-    throw (deployment::ExtensionRemovedException, RuntimeException, std::exception)
 {
     if (m_bRemoved)
         throw deployment::ExtensionRemovedException();
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index c236af97fc9a..0f98bdded730 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -100,14 +100,12 @@ public:
                  Reference<XComponentContext> const & xComponentContext );
 
     // XUpdatable
-    virtual void SAL_CALL update() throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL update() override;
 
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
-    getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception) override;
+    getSupportedPackageTypes() override;
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
 
 };
 
@@ -184,7 +182,7 @@ bool BackendImpl::hasActiveEntry(OUString const & url)
 
 // XUpdatable
 
-void BackendImpl::update() throw (RuntimeException, std::exception)
+void BackendImpl::update()
 {
     // Nothing to do here after fixing i70283!?
 }
@@ -192,7 +190,7 @@ void BackendImpl::update() throw (RuntimeException, std::exception)
 // XPackageRegistry
 
 Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
 {
     return m_typeInfos;
 }
@@ -203,8 +201,6 @@ void BackendImpl::revokeEntryFromDb(OUString const & url)
 }
 
 void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception)
 {
     if (m_backendDb.get())
         m_backendDb->removeEntry(url);
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index 4b283fc61838..1c86b0983b95 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -36,49 +36,41 @@ namespace sfwk
 // XDocumentHandler
 void SAL_CALL
 ParcelDescDocHandler::startDocument()
-throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
     m_bIsParsed = false;
 }
 
 void SAL_CALL
 ParcelDescDocHandler::endDocument()
-throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
     m_bIsParsed = true;
 }
 
 void SAL_CALL
 ParcelDescDocHandler::characters( const OUString & )
-    throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL
 ParcelDescDocHandler::ignorableWhitespace( const OUString & )
-    throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL
 ParcelDescDocHandler::processingInstruction(
     const OUString &, const OUString & )
-        throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL
 ParcelDescDocHandler::setDocumentLocator(
     const Reference< xml::sax::XLocator >& )
-        throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL
 ParcelDescDocHandler::startElement( const OUString& aName,
     const Reference< xml::sax::XAttributeList > & xAttribs )
-        throw ( xml::sax::SAXException,
-            RuntimeException, std::exception )
 {
 
     dp_misc::TRACE("ParcelDescDocHandler::startElement() for " +
@@ -100,7 +92,6 @@ ParcelDescDocHandler::startElement( const OUString& aName,
 }
 
 void SAL_CALL ParcelDescDocHandler::endElement( const OUString & aName )
-   throw ( xml::sax::SAXException, RuntimeException, std::exception )
 {
     if ( skipIndex )
     {
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index d637116fefae..620e01b24c3c 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -48,33 +48,24 @@ public:
     const OUString& getParcelLanguage() { return m_sLang; }
     bool isParsed() { return m_bIsParsed; }
     // XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocument() override;
 
-    virtual void SAL_CALL endDocument()
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL endDocument() override;
 
     virtual void SAL_CALL startElement( const OUString& aName,
-        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs )
-        throw ( css::xml::sax::SAXException,
-            css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) override;
 
-    virtual void SAL_CALL endElement( const OUString & aName )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL endElement( const OUString & aName ) override;
 
-    virtual void SAL_CALL characters( const OUString & aChars )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL characters( const OUString & aChars ) override;
 
-    virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) override;
 
     virtual void SAL_CALL processingInstruction(
-        const OUString & aTarget, const OUString & aData )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+        const OUString & aTarget, const OUString & aData ) override;
 
     virtual void SAL_CALL setDocumentLocator(
-        const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-        throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 };
 }
 }
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index adf1f93e6cf4..8893e487522f 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -78,12 +78,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
             OUString const & url, OUString const & libType, bool bRemoved,
             OUString const & identifier);
         // XPackage
-        virtual OUString SAL_CALL getDescription()
-            throw (deployment::ExtensionRemovedException,
-                   RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getLicenseText()
-            throw (deployment::ExtensionRemovedException,
-                   RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getDescription() override;
+        virtual OUString SAL_CALL getLicenseText() override;
     };
     friend class PackageImpl;
 
@@ -103,10 +99,8 @@ public:
 
     // XPackageRegistry
     virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
-    getSupportedPackageTypes() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception) override;
+    getSupportedPackageTypes() override;
+    virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) override;
 };
 
 BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
@@ -124,8 +118,6 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
 }
 
 OUString BackendImpl::PackageImpl::getDescription()
-    throw (deployment::ExtensionRemovedException,
-           RuntimeException, std::exception)
 {
     if (m_descr.isEmpty())
         return Package::getDescription();
@@ -134,8 +126,6 @@ OUString BackendImpl::PackageImpl::getDescription()
 }
 
 OUString BackendImpl::PackageImpl::getLicenseText()
-    throw (deployment::ExtensionRemovedException,
-           RuntimeException, std::exception)
 {
     return Package::getDescription();
 }
@@ -185,14 +175,12 @@ BackendImpl::BackendImpl(
 // XPackageRegistry
 
 Sequence< Reference<deployment::XPackageTypeInfo> >
-BackendImpl::getSupportedPackageTypes() throw (RuntimeException, std::exception)
+BackendImpl::getSupportedPackageTypes()
 {
     return Sequence< Reference<deployment::XPackageTypeInfo> >(&m_xTypeInfo, 1);
 }
 
 void BackendImpl::packageRemoved(OUString const & /*url*/, OUString const & /*mediaType*/)
-        throw (deployment::DeploymentException,
-               uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 40fd4e54b34b..4d2dc02a6a0a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1901,7 +1901,7 @@ public:
         assert(mpCallback);
     }
 
-    virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent) override
     {
         boost::property_tree::ptree aTree;
         aTree.put("commandName", maCommand.getStr());
@@ -1920,7 +1920,7 @@ public:
         mpCallback->queue(LOK_CALLBACK_UNO_COMMAND_RESULT, aPayload.getStr());
     }
 
-    virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override {}
+    virtual void SAL_CALL disposing(const css::lang::EventObject&) override {}
 };
 
 static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pCommand, const char* pArguments, bool bNotifyWhenFinished)
diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx
index deab34f47445..d218e691c72a 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -13,19 +13,17 @@
 using namespace com::sun::star;
 
 uno::Reference<datatransfer::XTransferable> SAL_CALL LOKClipboard::getContents()
-throw (uno::RuntimeException, std::exception)
 {
     return m_xTransferable;
 }
 
 void SAL_CALL LOKClipboard::setContents(const uno::Reference<datatransfer::XTransferable>& xTransferable,
                                         const uno::Reference<datatransfer::clipboard::XClipboardOwner>& /*xClipboardOwner*/)
-throw (uno::RuntimeException, std::exception)
 {
     m_xTransferable = xTransferable;
 }
 
-OUString SAL_CALL LOKClipboard::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL LOKClipboard::getName()
 {
     return OUString();
 }
@@ -37,7 +35,6 @@ LOKTransferable::LOKTransferable(const char* pMimeType, const char* pData, std::
 }
 
 uno::Any SAL_CALL LOKTransferable::getTransferData(const datatransfer::DataFlavor& rFlavor)
-throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if (rFlavor.DataType == cppu::UnoType<OUString>::get())
@@ -70,13 +67,11 @@ std::vector<datatransfer::DataFlavor> LOKTransferable::getTransferDataFlavorsAsV
 }
 
 uno::Sequence<datatransfer::DataFlavor> SAL_CALL LOKTransferable::getTransferDataFlavors()
-throw(uno::RuntimeException, std::exception)
 {
     return comphelper::containerToSequence(getTransferDataFlavorsAsVector());
 }
 
 sal_Bool SAL_CALL LOKTransferable::isDataFlavorSupported(const datatransfer::DataFlavor& rFlavor)
-throw(uno::RuntimeException, std::exception)
 {
     const std::vector<datatransfer::DataFlavor> aFlavors = getTransferDataFlavorsAsVector();
     return std::find_if(aFlavors.begin(), aFlavors.end(), [&rFlavor](const datatransfer::DataFlavor& i)
diff --git a/desktop/source/lib/lokclipboard.hxx b/desktop/source/lib/lokclipboard.hxx
index 59b8cdf00ebf..d72da4066447 100644
--- a/desktop/source/lib/lokclipboard.hxx
+++ b/desktop/source/lib/lokclipboard.hxx
@@ -21,14 +21,12 @@ class LOKClipboard : public cppu::WeakImplHelper<css::datatransfer::clipboard::X
     css::uno::Reference<css::datatransfer::XTransferable> m_xTransferable;
 
 public:
-    virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getContents()
-    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getContents() override;
 
     virtual void SAL_CALL setContents(const css::uno::Reference<css::datatransfer::XTransferable>& xTransferable,
-                                      const css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner>& xClipboardOwner)
-    throw(css::uno::RuntimeException, std::exception) override;
+                                      const css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner>& xClipboardOwner) override;
 
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
 };
 
 /// Represents the contents of LOKClipboard.
@@ -43,14 +41,11 @@ class LOKTransferable : public cppu::WeakImplHelper<css::datatransfer::XTransfer
 public:
     LOKTransferable(const char* pMimeType, const char* pData, std::size_t nSize);
 
-    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor)
-    throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) override;
 
-    virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors()
-    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() override;
 
-    virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor)
-    throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor) override;
 };
 
 #endif
diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx
index 58d4052324d7..a491cb8457b4 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -64,17 +64,17 @@ LOKInteractionHandler::~LOKInteractionHandler()
 {
 }
 
-OUString SAL_CALL LOKInteractionHandler::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL LOKInteractionHandler::getImplementationName()
 {
     return OUString("com.sun.star.comp.uui.LOKInteractionHandler");
 }
 
-sal_Bool SAL_CALL LOKInteractionHandler::supportsService(OUString const & rServiceName) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL LOKInteractionHandler::supportsService(OUString const & rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL LOKInteractionHandler::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL LOKInteractionHandler::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aNames(3);
     aNames[0] = "com.sun.star.task.InteractionHandler";
@@ -85,13 +85,12 @@ uno::Sequence< OUString > SAL_CALL LOKInteractionHandler::getSupportedServiceNam
     return aNames;
 }
 
-void SAL_CALL LOKInteractionHandler::initialize(uno::Sequence<uno::Any> const & /*rArguments*/) throw (uno::Exception, std::exception)
+void SAL_CALL LOKInteractionHandler::initialize(uno::Sequence<uno::Any> const & /*rArguments*/)
 {
 }
 
 void SAL_CALL LOKInteractionHandler::handle(
         uno::Reference<task::XInteractionRequest> const & xRequest)
-throw (uno::RuntimeException, std::exception)
 {
     // just do the same thing in both cases
     handleInteractionRequest(xRequest);
@@ -325,7 +324,7 @@ bool LOKInteractionHandler::handlePasswordRequest(const uno::Sequence<uno::Refer
 }
 
 sal_Bool SAL_CALL LOKInteractionHandler::handleInteractionRequest(
-        const uno::Reference<task::XInteractionRequest>& xRequest) throw (uno::RuntimeException, std::exception)
+        const uno::Reference<task::XInteractionRequest>& xRequest)
 {
     uno::Sequence<uno::Reference<task::XInteractionContinuation>> const &rContinuations = xRequest->getContinuations();
     uno::Any const request(xRequest->getRequest());
diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx
index d6716eb51b2d..0a8defe53047 100644
--- a/desktop/source/lib/lokinteractionhandler.hxx
+++ b/desktop/source/lib/lokinteractionhandler.hxx
@@ -88,23 +88,17 @@ public:
 
     virtual ~LOKInteractionHandler() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
-    virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override;
 
-    virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
-    virtual void SAL_CALL initialize(com::sun::star::uno::Sequence<com::sun::star::uno::Any > const & rArguments)
-        throw (com::sun::star::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(com::sun::star::uno::Sequence<com::sun::star::uno::Any > const & rArguments) override;
 
-    virtual void SAL_CALL handle(com::sun::star::uno::Reference<com::sun::star::task::XInteractionRequest> const & rRequest)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL handle(com::sun::star::uno::Reference<com::sun::star::task::XInteractionRequest> const & rRequest) override;
 
-    virtual sal_Bool SAL_CALL handleInteractionRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request)
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL handleInteractionRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request) override;
 };
 
 #endif
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index a71ca5b0ebaf..bfe2e84df1d6 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -151,20 +151,19 @@ namespace migration
     // XServiceInfo
 
 
-    OUString BasicMigration::getImplementationName() throw (RuntimeException, std::exception)
+    OUString BasicMigration::getImplementationName()
     {
         return BasicMigration_getImplementationName();
     }
 
 
     sal_Bool BasicMigration::supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception)
     {
         return cppu::supportsService(this, ServiceName);
     }
 
 
-    Sequence< OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > BasicMigration::getSupportedServiceNames()
     {
         return BasicMigration_getSupportedServiceNames();
     }
@@ -173,7 +172,7 @@ namespace migration
     // XInitialization
 
 
-    void BasicMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+    void BasicMigration::initialize( const Sequence< Any >& aArguments )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -200,7 +199,6 @@ namespace migration
 
 
     Any BasicMigration::execute( const Sequence< beans::NamedValue >& )
-        throw (lang::IllegalArgumentException, Exception, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index 53791d64ba4b..f8d3d0a4a1df 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -66,22 +66,16 @@ namespace migration
         virtual ~BasicMigration() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XJob
         virtual css::uno::Any SAL_CALL execute(
-            const css::uno::Sequence< css::beans::NamedValue >& Arguments )
-            throw (css::lang::IllegalArgumentException, css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override;
     };
 
 
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index aa3e15deb494..907651433414 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -86,108 +86,65 @@ class JavaMigration : public ::cppu::WeakImplHelper<
 {
 public:
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     //XJob
     virtual css::uno::Any SAL_CALL execute(
-        const css::uno::Sequence<css::beans::NamedValue >& Arguments )
-        throw (css::lang::IllegalArgumentException, css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::NamedValue >& Arguments ) override;
 
         // XLayerHandler
-    virtual void SAL_CALL startLayer()
-        throw(css::lang::WrappedTargetException, std::exception) override;
+    virtual void SAL_CALL startLayer() override;
 
-    virtual void SAL_CALL endLayer()
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+    virtual void SAL_CALL endLayer() override;
 
     virtual void SAL_CALL overrideNode(
             const OUString& aName,
             sal_Int16 aAttributes,
-            sal_Bool bClear)
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+            sal_Bool bClear) override;
 
     virtual void SAL_CALL addOrReplaceNode(
             const OUString& aName,
-            sal_Int16 aAttributes)
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+            sal_Int16 aAttributes) override;
 
     virtual void SAL_CALL  addOrReplaceNodeFromTemplate(
             const OUString& aName,
             const css::configuration::backend::TemplateIdentifier& aTemplate,
-            sal_Int16 aAttributes )
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+            sal_Int16 aAttributes ) override;
 
-    virtual void SAL_CALL  endNode()
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+    virtual void SAL_CALL  endNode() override;
 
     virtual void SAL_CALL  dropNode(
-            const OUString& aName )
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+            const OUString& aName ) override;
 
     virtual void SAL_CALL  overrideProperty(
             const OUString& aName,
             sal_Int16 aAttributes,
             const css::uno::Type& aType,
-            sal_Bool bClear )
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+            sal_Bool bClear ) override;
 
     virtual void SAL_CALL  setPropertyValue(
-            const css::uno::Any& aValue )
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+            const css::uno::Any& aValue ) override;
 
     virtual void SAL_CALL setPropertyValueForLocale(
             const css::uno::Any& aValue,
-            const OUString& aLocale )
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+            const OUString& aLocale ) override;
 
-    virtual void SAL_CALL  endProperty()
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+    virtual void SAL_CALL  endProperty() override;
 
     virtual void SAL_CALL  addProperty(
             const OUString& aName,
             sal_Int16 aAttributes,
-            const css::uno::Type& aType )
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+            const css::uno::Type& aType ) override;
 
     virtual void SAL_CALL  addPropertyWithValue(
             const OUString& aName,
             sal_Int16 aAttributes,
-            const css::uno::Any& aValue )
-        throw(
-            css::configuration::backend::MalformedDataException,
-            css::lang::WrappedTargetException, std::exception ) override;
+            const css::uno::Any& aValue ) override;
 
 
     virtual ~JavaMigration() override;
@@ -221,26 +178,22 @@ css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames()
 
 // XServiceInfo
 OUString SAL_CALL JavaMigration::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return jvmfwk_getImplementationName();
 }
 
 sal_Bool JavaMigration::supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL JavaMigration::getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return jvmfwk_getSupportedServiceNames();
 }
 
 //XInitialization ----------------------------------------------------------------------
 void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     const css::uno::Any* pIter = aArguments.getConstArray();
     const css::uno::Any* pEnd = pIter + aArguments.getLength();
@@ -284,8 +237,6 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
 //XJob
 css::uno::Any SAL_CALL JavaMigration::execute(
         const css::uno::Sequence<css::beans::NamedValue >& )
-        throw (css::lang::IllegalArgumentException, css::uno::Exception,
-               css::uno::RuntimeException, std::exception)
 {
     migrateJavarc();
     if (m_xLayer.is())
@@ -330,15 +281,11 @@ void JavaMigration::migrateJavarc()
 
 // XLayerHandler
 void SAL_CALL JavaMigration::startLayer()
-    throw(css::lang::WrappedTargetException, std::exception)
 {
 }
 
 
 void SAL_CALL JavaMigration::endLayer()
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
 }
 
@@ -347,9 +294,6 @@ void SAL_CALL JavaMigration::overrideNode(
         const OUString&,
         sal_Int16,
         sal_Bool)
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 
 {
 
@@ -359,25 +303,16 @@ void SAL_CALL JavaMigration::overrideNode(
 void SAL_CALL JavaMigration::addOrReplaceNode(
         const OUString&,
         sal_Int16)
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
 
 }
 void SAL_CALL  JavaMigration::endNode()
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
 }
 
 
 void SAL_CALL  JavaMigration::dropNode(
         const OUString& )
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
 }
 
@@ -387,9 +322,6 @@ void SAL_CALL  JavaMigration::overrideProperty(
         sal_Int16,
         const Type&,
         sal_Bool )
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
     if ( aName == "Enable" )
         m_aStack.push(TElementStack::value_type(aName,ENABLE_JAVA));
@@ -400,9 +332,6 @@ void SAL_CALL  JavaMigration::overrideProperty(
 
 void SAL_CALL  JavaMigration::setPropertyValue(
         const Any& aValue )
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
     if ( !m_aStack.empty())
     {
@@ -446,17 +375,11 @@ void SAL_CALL  JavaMigration::setPropertyValue(
 void SAL_CALL JavaMigration::setPropertyValueForLocale(
         const Any&,
         const OUString& )
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
 }
 
 
 void SAL_CALL  JavaMigration::endProperty()
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
             if (!m_aStack.empty())
                 m_aStack.pop();
@@ -467,9 +390,6 @@ void SAL_CALL  JavaMigration::addProperty(
         const OUString&,
         sal_Int16,
         const Type& )
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
 }
 
@@ -478,9 +398,6 @@ void SAL_CALL  JavaMigration::addPropertyWithValue(
         const OUString&,
         sal_Int16,
         const Any& )
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
 }
 
@@ -488,9 +405,6 @@ void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate(
         const OUString&,
         const TemplateIdentifier&,
         sal_Int16 )
-    throw(
-        MalformedDataException,
-        WrappedTargetException, std::exception )
 {
 }
 
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index a0caafb4ea9a..182c50bf5e2f 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -293,20 +293,19 @@ void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir )
 // XServiceInfo
 
 
-OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException, std::exception)
+OUString OO3ExtensionMigration::getImplementationName()
 {
     return OO3ExtensionMigration_getImplementationName();
 }
 
 
 sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
-Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames()
 {
     return OO3ExtensionMigration_getSupportedServiceNames();
 }
@@ -315,7 +314,7 @@ Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (Ru
 // XInitialization
 
 
-void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -345,7 +344,6 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro
 }
 
 Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
-    throw (lang::IllegalArgumentException, Exception, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -385,14 +383,12 @@ TmpRepositoryCommandEnv::~TmpRepositoryCommandEnv()
 // XCommandEnvironment
 
 uno::Reference< task::XInteractionHandler > TmpRepositoryCommandEnv::getInteractionHandler()
-throw ( uno::RuntimeException, std::exception )
 {
     return this;
 }
 
 
 uno::Reference< ucb::XProgressHandler > TmpRepositoryCommandEnv::getProgressHandler()
-throw ( uno::RuntimeException, std::exception )
 {
     return this;
 }
@@ -400,7 +396,6 @@ throw ( uno::RuntimeException, std::exception )
 // XInteractionHandler
 void TmpRepositoryCommandEnv::handle(
     uno::Reference< task::XInteractionRequest> const & xRequest )
-    throw ( uno::RuntimeException, std::exception )
 {
     OSL_ASSERT( xRequest->getRequest().getValueTypeClass() == uno::TypeClass_EXCEPTION );
 
@@ -428,17 +423,15 @@ void TmpRepositoryCommandEnv::handle(
 
 // XProgressHandler
 void TmpRepositoryCommandEnv::push( uno::Any const & /*Status*/ )
-throw (uno::RuntimeException, std::exception)
 {
 }
 
 
 void TmpRepositoryCommandEnv::update( uno::Any const & /*Status */)
-throw (uno::RuntimeException, std::exception)
 {
 }
 
-void TmpRepositoryCommandEnv::pop() throw (uno::RuntimeException, std::exception)
+void TmpRepositoryCommandEnv::pop()
 {
 }
 
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 482dfe844909..f9722aa2edac 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -90,22 +90,16 @@ namespace migration
         virtual ~OO3ExtensionMigration() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XJob
         virtual css::uno::Any SAL_CALL execute(
-            const css::uno::Sequence< css::beans::NamedValue >& Arguments )
-            throw (css::lang::IllegalArgumentException, css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override;
     };
 
     class TmpRepositoryCommandEnv
@@ -119,21 +113,18 @@ namespace migration
 
         // XCommandEnvironment
         virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL
-        getInteractionHandler() throw ( css::uno::RuntimeException, std::exception ) override;
+        getInteractionHandler() override;
         virtual css::uno::Reference< css::ucb::XProgressHandler >
-        SAL_CALL getProgressHandler() throw ( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL getProgressHandler() override;
 
         // XInteractionHandler
         virtual void SAL_CALL handle(
-            css::uno::Reference< css::task::XInteractionRequest > const & xRequest )
-            throw (css::uno::RuntimeException, std::exception) override;
+            css::uno::Reference< css::task::XInteractionRequest > const & xRequest ) override;
 
         // XProgressHandler
-        virtual void SAL_CALL push( css::uno::Any const & Status )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL update( css::uno::Any const & Status )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL pop() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL push( css::uno::Any const & Status ) override;
+        virtual void SAL_CALL update( css::uno::Any const & Status ) override;
+        virtual void SAL_CALL pop() override;
     };
 
 
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 91950c4f49a7..8e607ac8b594 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -185,20 +185,19 @@ bool IsUserWordbook( const OUString& rFile )
     // XServiceInfo
 
 
-    OUString WordbookMigration::getImplementationName() throw (RuntimeException, std::exception)
+    OUString WordbookMigration::getImplementationName()
     {
         return WordbookMigration_getImplementationName();
     }
 
 
     sal_Bool WordbookMigration::supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception)
     {
         return cppu::supportsService(this, ServiceName);
     }
 
 
-    Sequence< OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > WordbookMigration::getSupportedServiceNames()
     {
         return WordbookMigration_getSupportedServiceNames();
     }
@@ -207,7 +206,7 @@ bool IsUserWordbook( const OUString& rFile )
     // XInitialization
 
 
-    void WordbookMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+    void WordbookMigration::initialize( const Sequence< Any >& aArguments )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -234,7 +233,6 @@ bool IsUserWordbook( const OUString& rFile )
 
 
     Any WordbookMigration::execute( const Sequence< beans::NamedValue >& )
-        throw (lang::IllegalArgumentException, Exception, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 86013ce36d89..ab89858ee109 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -66,22 +66,16 @@ namespace migration
         virtual ~WordbookMigration() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XJob
         virtual css::uno::Any SAL_CALL execute(
-            const css::uno::Sequence< css::beans::NamedValue >& Arguments )
-            throw (css::lang::IllegalArgumentException, css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override;
     };
 
 
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 2449a7fd4bb1..9f95f1a28ce8 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -129,7 +129,6 @@ void Acceptor::run()
 
 // XInitialize
 void Acceptor::initialize( const Sequence<Any>& aArguments )
-    throw( Exception, std::exception )
 {
     // prevent multiple initialization
     osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -185,7 +184,6 @@ OUString Acceptor::impl_getImplementationName()
     return OUString("com.sun.star.office.comp.Acceptor");
 }
 OUString Acceptor::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return Acceptor::impl_getImplementationName();
 }
@@ -195,13 +193,11 @@ Sequence<OUString> Acceptor::impl_getSupportedServiceNames()
     return aSequence;
 }
 Sequence<OUString> Acceptor::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return Acceptor::impl_getSupportedServiceNames();
 }
 
 sal_Bool Acceptor::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -229,7 +225,6 @@ AccInstanceProvider::~AccInstanceProvider()
 }
 
 Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName )
-        throw ( NoSuchElementException, std::exception )
 {
 
     Reference<XInterface> rInstance;
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index 0dc1889d0adb..bbafc03030f1 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -77,17 +77,13 @@ public:
 
     // XService info
     static OUString impl_getImplementationName();
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     static css::uno::Sequence<OUString> impl_getSupportedServiceNames();
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& aName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) override;
 
     // XInitialize
-    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;
 
     static css::uno::Reference<css::uno::XInterface> impl_getInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory );
 };
@@ -104,8 +100,7 @@ public:
     virtual ~AccInstanceProvider() override;
 
     // XInstanceProvider
-    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getInstance (const OUString& aName )
-        throw ( css::container::NoSuchElementException, std::exception ) override;
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getInstance (const OUString& aName ) override;
 };
 
 
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 822a1b9c4276..f18188349b79 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -131,18 +131,15 @@ public:
         : m_rDialogClosedCondition( rDialogClosedCondition ) {}
 
     // XEventListener (base of XDialogClosedListener)
-    virtual void SAL_CALL disposing( lang::EventObject const & Source )
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( lang::EventObject const & Source ) override;
 
     // XDialogClosedListener
     virtual void SAL_CALL dialogClosed(
-        ui::dialogs::DialogClosedEvent const & aEvent )
-        throw (RuntimeException, std::exception) override;
+        ui::dialogs::DialogClosedEvent const & aEvent ) override;
 };
 
 // XEventListener (base of XDialogClosedListener)
 void DialogClosedListenerImpl::disposing( lang::EventObject const & )
-    throw (RuntimeException, std::exception)
 {
     // nothing to do
 }
@@ -150,7 +147,6 @@ void DialogClosedListenerImpl::disposing( lang::EventObject const & )
 // XDialogClosedListener
 void DialogClosedListenerImpl::dialogClosed(
     ui::dialogs::DialogClosedEvent const & )
-    throw (RuntimeException, std::exception)
 {
     m_rDialogClosedCondition.set();
 }
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 2de8302b6020..a47d4b81761b 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -64,7 +64,7 @@ class CommandEnvironmentImpl
     Reference< XProgressHandler > m_xLogFile;
 
     /// @throws RuntimeException
-    void update_( Any const & Status ) throw (RuntimeException);
+    void update_( Any const & Status );
     void printLicense(const OUString & sName,const OUString& sLicense,
                       bool & accept, bool & decline);
 
@@ -79,19 +79,17 @@ public:
 
     // XCommandEnvironment
     virtual Reference< task::XInteractionHandler > SAL_CALL
-    getInteractionHandler() throw (RuntimeException, std::exception) override;
-    virtual Reference< XProgressHandler > SAL_CALL getProgressHandler()
-        throw (RuntimeException, std::exception) override;
+    getInteractionHandler() override;
+    virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override;
 
     // XInteractionHandler
     virtual void SAL_CALL handle(
-        Reference< task::XInteractionRequest > const & xRequest )
-        throw (RuntimeException, std::exception) override;
+        Reference< task::XInteractionRequest > const & xRequest ) override;
 
     // XProgressHandler
-    virtual void SAL_CALL push( Any const & Status ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL update( Any const & Status ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL pop() throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL push( Any const & Status ) override;
+    virtual void SAL_CALL update( Any const & Status ) override;
+    virtual void SAL_CALL pop() override;
 };
 
 
@@ -188,14 +186,13 @@ void CommandEnvironmentImpl::printLicense(
 // XCommandEnvironment
 
 Reference< task::XInteractionHandler >
-CommandEnvironmentImpl::getInteractionHandler() throw (RuntimeException, std::exception)
+CommandEnvironmentImpl::getInteractionHandler()
 {
     return this;
 }
 
 
 Reference< XProgressHandler > CommandEnvironmentImpl::getProgressHandler()
-    throw (RuntimeException, std::exception)
 {
     return this;
 }
@@ -204,7 +201,6 @@ Reference< XProgressHandler > CommandEnvironmentImpl::getProgressHandler()
 
 void CommandEnvironmentImpl::handle(
     Reference<task::XInteractionRequest> const & xRequest )
-    throw (RuntimeException, std::exception)
 {
     Any request( xRequest->getRequest() );
     OSL_ASSERT( request.getValueTypeClass() == TypeClass_EXCEPTION );
@@ -323,7 +319,6 @@ void CommandEnvironmentImpl::handle(
 // XProgressHandler
 
 void CommandEnvironmentImpl::push( Any const & Status )
-    throw (RuntimeException, std::exception)
 {
     update_( Status );
     OSL_ASSERT( m_logLevel >= 0 );
@@ -334,7 +329,6 @@ void CommandEnvironmentImpl::push( Any const & Status )
 
 
 void CommandEnvironmentImpl::update_( Any const & Status )
-    throw (RuntimeException)
 {
     if (! Status.hasValue())
         return;
@@ -376,7 +370,6 @@ void CommandEnvironmentImpl::update_( Any const & Status )
 
 
 void CommandEnvironmentImpl::update( Any const & Status )
-    throw (RuntimeException, std::exception)
 {
     update_( Status );
     if (m_xLogFile.is())
@@ -384,7 +377,7 @@ void CommandEnvironmentImpl::update( Any const & Status )
 }
 
 
-void CommandEnvironmentImpl::pop() throw (RuntimeException, std::exception)
+void CommandEnvironmentImpl::pop()
 {
     OSL_ASSERT( m_logLevel > 0 );
     --m_logLevel;
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 13c59c89c7dc..e809b4e786ad 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -107,26 +107,22 @@ public:
     SplashScreen();
 
     // XStatusIndicator
-    virtual void SAL_CALL end() throw ( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL reset() throw ( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setText(const OUString& aText) throw ( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setValue(sal_Int32 nValue) throw ( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw ( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL end() override;
+    virtual void SAL_CALL reset() override;
+    virtual void SAL_CALL setText(const OUString& aText) override;
+    virtual void SAL_CALL setValue(sal_Int32 nValue) override;
+    virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) override;
 
     // XInitialize
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments )
-        throw ( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return desktop::splash::getImplementationName(); }
 
-    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
     { return cppu::supportsService(this, ServiceName); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     { return desktop::splash::getSupportedServiceNames(); }
 };
 
@@ -194,7 +190,6 @@ SplashScreen::~SplashScreen()
 }
 
 void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
-    throw (RuntimeException, std::exception)
 {
     _iMax = nRange;
     if (_bVisible) {
@@ -208,7 +203,6 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
 }
 
 void SAL_CALL SplashScreen::end()
-    throw (RuntimeException, std::exception)
 {
     _iProgress = _iMax;
     if (_bVisible )
@@ -221,7 +215,6 @@ void SAL_CALL SplashScreen::end()
 }
 
 void SAL_CALL SplashScreen::reset()
-    throw (RuntimeException, std::exception)
 {
     _iProgress = 0;
     if (_bVisible && !_bProgressEnd )
@@ -234,7 +227,6 @@ void SAL_CALL SplashScreen::reset()
 }
 
 void SAL_CALL SplashScreen::setText(const OUString& rText)
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     if ( _sProgressText != rText )
@@ -252,7 +244,6 @@ void SAL_CALL SplashScreen::setText(const OUString& rText)
 }
 
 void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
-    throw (RuntimeException, std::exception)
 {
     SAL_INFO( "desktop.splash", "setValue: " << nValue );
 
@@ -272,7 +263,6 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
 // XInitialize
 void SAL_CALL
 SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments )
-    throw (RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard  aGuard( _aMutex );
     if (aArguments.getLength() > 0)
diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx
index ba22c3ec44db..c735f59fa30c 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -45,12 +45,10 @@ UnxSplashScreen::~UnxSplashScreen()
 }
 
 void SAL_CALL UnxSplashScreen::start( const OUString& /*aText*/, sal_Int32 /*nRange*/ )
-    throw ( uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL UnxSplashScreen::end()
-    throw ( uno::RuntimeException, std::exception )
 {
     SAL_INFO("desktop.splash", "UnxSplashScreen::end()");
     if( !m_pOutFd )
@@ -61,7 +59,6 @@ void SAL_CALL UnxSplashScreen::end()
 }
 
 void SAL_CALL UnxSplashScreen::reset()
-    throw ( uno::RuntimeException, std::exception )
 {
     SAL_INFO("desktop.splash", "UNXSplashScreen::reset()");
     if( !m_pOutFd )
@@ -72,13 +69,11 @@ void SAL_CALL UnxSplashScreen::reset()
 }
 
 void SAL_CALL UnxSplashScreen::setText( const OUString& /*aText*/ )
-    throw ( uno::RuntimeException, std::exception )
 {
     // TODO?
 }
 
 void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( m_pOutFd )
     {
@@ -90,7 +85,6 @@ void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
 // XInitialize
 void SAL_CALL
 UnxSplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& )
-    throw ( uno::RuntimeException, std::exception )
 {
     for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
     {
@@ -109,19 +103,16 @@ UnxSplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& )
 }
 
 OUString UnxSplashScreen::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return UnxSplash_getImplementationName();
 }
 
 sal_Bool UnxSplashScreen::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> UnxSplashScreen::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return UnxSplash_getSupportedServiceNames();
 }
@@ -133,7 +124,7 @@ using namespace desktop;
 // get service instance...
 static uno::Reference< uno::XInterface > m_xINSTANCE;
 
-uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > &  ) throw( uno::Exception )
+uno::Reference< uno::XInterface > UnxSplash_createInstance(const uno::Reference< uno::XComponentContext > &  )
 {
     static osl::Mutex s_aMutex;
     if ( !m_xINSTANCE.is() )
diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx
index 69b51c383385..faf4233a9bef 100644
--- a/desktop/source/splash/unxsplash.hxx
+++ b/desktop/source/splash/unxsplash.hxx
@@ -46,29 +46,26 @@ public:
     explicit UnxSplashScreen();
 
     // XStatusIndicator
-    virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL end() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL reset() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setText( const OUString& aText ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) override;
+    virtual void SAL_CALL end() override;
+    virtual void SAL_CALL reset() override;
+    virtual void SAL_CALL setText( const OUString& aText ) override;
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) override;
 
     // XInitialize
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& 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;
 };
 
 }
 
 /// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx ) throw( css::uno::Exception );
+css::uno::Reference< css::uno::XInterface > SAL_CALL UnxSplash_createInstance(const css::uno::Reference< css::uno::XComponentContext > & xCtx );
 OUString UnxSplash_getImplementationName();
 css::uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw ();
 
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 7cc3edbb0d7e..109d0b07b970 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -63,12 +63,12 @@ namespace drawinglayer
                 ::sal_uInt32 DPI_X,
                 ::sal_uInt32 DPI_Y,
                 const css::geometry::RealRectangle2D& Range,
-                ::sal_uInt32 MaximumQuadraticPixels) throw (uno::RuntimeException, std::exception) override;
+                ::sal_uInt32 MaximumQuadraticPixels) override;
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsService(const OUString&) 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&) override;
+            virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
         };
     } // end of namespace unorenderer
 } // end of namespace drawinglayer
@@ -112,7 +112,7 @@ namespace drawinglayer
             ::sal_uInt32 DPI_X,
             ::sal_uInt32 DPI_Y,
             const css::geometry::RealRectangle2D& Range,
-            ::sal_uInt32 MaximumQuadraticPixels) throw (uno::RuntimeException, std::exception)
+            ::sal_uInt32 MaximumQuadraticPixels)
         {
             uno::Reference< rendering::XBitmap > XBitmap;
 
@@ -181,17 +181,17 @@ namespace drawinglayer
             return XBitmap;
         }
 
-        OUString SAL_CALL XPrimitive2DRenderer::getImplementationName() throw(uno::RuntimeException, std::exception)
+        OUString SAL_CALL XPrimitive2DRenderer::getImplementationName()
         {
             return(XPrimitive2DRenderer_getImplementationName());
         }
 
-        sal_Bool SAL_CALL XPrimitive2DRenderer::supportsService(const OUString& rServiceName) throw(uno::RuntimeException, std::exception)
+        sal_Bool SAL_CALL XPrimitive2DRenderer::supportsService(const OUString& rServiceName)
         {
             return cppu::supportsService(this, rServiceName);
         }
 
-        uno::Sequence< OUString > SAL_CALL XPrimitive2DRenderer::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+        uno::Sequence< OUString > SAL_CALL XPrimitive2DRenderer::getSupportedServiceNames()
         {
             return XPrimitive2DRenderer_getSupportedServiceNames();
         }
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index 31f495c22a3b..02baa443667a 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -80,7 +80,7 @@ namespace drawinglayer
         {
         }
 
-        Primitive2DSequence SAL_CALL BasePrimitive2D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
+        Primitive2DSequence SAL_CALL BasePrimitive2D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters )
         {
             const geometry::ViewInformation2D aViewInformation(rViewParameters);
             Primitive2DContainer aContainer;
@@ -88,14 +88,13 @@ namespace drawinglayer
             return comphelper::containerToSequence(aContainer);
         }
 
-        css::geometry::RealRectangle2D SAL_CALL BasePrimitive2D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
+        css::geometry::RealRectangle2D SAL_CALL BasePrimitive2D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters )
         {
             const geometry::ViewInformation2D aViewInformation(rViewParameters);
             return basegfx::unotools::rectangle2DFromB2DRectangle(getB2DRange(aViewInformation));
         }
 
         sal_Int64 SAL_CALL BasePrimitive2D::estimateUsage()
-            throw (css::uno::RuntimeException)
         {
             return 0; // for now ignore the objects themselves
         }
diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
index db75ba5dc911..154791ab6e51 100644
--- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
@@ -59,7 +59,6 @@ namespace drawinglayer
         }
 
         sal_Int64 SAL_CALL BitmapPrimitive2D::estimateUsage()
-            throw (css::uno::RuntimeException)
         {
             return getBitmapEx().GetSizeBytes();
         }
diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
index 1b86f15caae0..5a646ec3ce39 100644
--- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx
@@ -57,7 +57,6 @@ namespace drawinglayer
         }
 
         sal_Int64 SAL_CALL GroupPrimitive2D::estimateUsage()
-            throw (css::uno::RuntimeException)
         {
             size_t nRet(0);
             for (auto& it : getChildren())
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 7484a1e00d32..cf07d115fa07 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -311,7 +311,6 @@ namespace drawinglayer
         }
 
         sal_Int64 SAL_CALL PatternFillPrimitive2D::estimateUsage()
-            throw (css::uno::RuntimeException)
         {
             size_t nRet(0);
             for (auto& it : getChildren())
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index c004cbaaa7a9..7180e73e992d 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -54,13 +54,13 @@ namespace drawinglayer
             return Primitive3DContainer();
         }
 
-        Primitive3DSequence SAL_CALL BasePrimitive3D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
+        Primitive3DSequence SAL_CALL BasePrimitive3D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters )
         {
             const geometry::ViewInformation3D aViewInformation(rViewParameters);
             return comphelper::containerToSequence(get3DDecomposition(aViewInformation));
         }
 
-        css::geometry::RealRectangle3D SAL_CALL BasePrimitive3D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
+        css::geometry::RealRectangle3D SAL_CALL BasePrimitive3D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters )
         {
             const geometry::ViewInformation3D aViewInformation(rViewParameters);
             return basegfx::unotools::rectangle3DFromB3DRectangle(getB3DRange(aViewInformation));
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index 7d289a6d3365..093fedc1842b 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.cxx
@@ -44,7 +44,6 @@ CMimeContentTypeFactory::CMimeContentTypeFactory()
 }
 
 Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( const OUString& aContentType )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     MutexGuard aGuard( m_aMutex );
     return Reference< XMimeContentType >( new CMimeContentType( aContentType ) );
@@ -53,19 +52,16 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co
 // XServiceInfo
 
 OUString SAL_CALL CMimeContentTypeFactory::getImplementationName(  )
-    throw( RuntimeException, std::exception )
 {
     return OUString( MIMECONTENTTYPEFACTORY_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& ServiceName )
-    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL CMimeContentTypeFactory::getSupportedServiceNames( )
-    throw( RuntimeException, std::exception )
 {
     return MimeContentTypeFactory_getSupportedServiceNames( );
 }
diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx
index 5eeb375accab..d79cd6063ff4 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/dtrans/source/cnttype/mcnttfactory.hxx
@@ -36,19 +36,15 @@ public:
 
     // XMimeContentTypeFactory
 
-    virtual css::uno::Reference< css::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType )
-        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType ) override;
 
     // 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( const OUString& ServiceName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 
 private:
     ::osl::Mutex                                                                           m_aMutex;
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 180c0c48b1c7..ccc1ccfe3353 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -35,22 +35,22 @@ CMimeContentType::CMimeContentType( const OUString& aCntType )
     init( aCntType );
 }
 
-OUString SAL_CALL CMimeContentType::getMediaType( ) throw(RuntimeException, std::exception)
+OUString SAL_CALL CMimeContentType::getMediaType( )
 {
     return m_MediaType;
 }
 
-OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException, std::exception)
+OUString SAL_CALL CMimeContentType::getMediaSubtype( )
 {
     return m_MediaSubtype;
 }
 
-OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException, std::exception)
+OUString SAL_CALL CMimeContentType::getFullMediaType( )
 {
     return m_MediaType + "/" + m_MediaSubtype;
 }
 
-Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL CMimeContentType::getParameters( )
 {
     MutexGuard aGuard( m_aMutex );
 
@@ -68,13 +68,13 @@ Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeEx
     return seqParams;
 }
 
-sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName )
 {
     MutexGuard aGuard( m_aMutex );
     return ( m_ParameterMap.end( ) != m_ParameterMap.find( aName ) );
 }
 
-OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) throw(NoSuchElementException, RuntimeException, std::exception)
+OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName )
 {
     MutexGuard aGuard( m_aMutex );
 
@@ -84,7 +84,7 @@ OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) t
     return m_ParameterMap.find( aName )->second;
 }
 
-void SAL_CALL CMimeContentType::init( const OUString& aCntType ) throw( IllegalArgumentException )
+void SAL_CALL CMimeContentType::init( const OUString& aCntType )
 {
     if ( aCntType.isEmpty( ) )
         throw IllegalArgumentException( );
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index 4ea11a55f4c9..45a80bbed66c 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -36,22 +36,19 @@ public:
 
     // XMimeContentType
 
-    virtual OUString SAL_CALL getMediaType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getMediaSubtype(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getFullMediaType(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getMediaType(  ) override;
+    virtual OUString SAL_CALL getMediaSubtype(  ) override;
+    virtual OUString SAL_CALL getFullMediaType(  ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getParameters(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getParameters(  ) override;
 
-    virtual sal_Bool SAL_CALL hasParameter( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasParameter( const OUString& aName ) override;
 
-    virtual OUString SAL_CALL getParameterValue( const OUString& aName )
-        throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getParameterValue( const OUString& aName ) override;
 
 private:
     /// @throws css::lang::IllegalArgumentException
-    void SAL_CALL init( const OUString& aCntType ) throw( css::lang::IllegalArgumentException );
+    void SAL_CALL init( const OUString& aCntType );
     void SAL_CALL getSym();
     void SAL_CALL acceptSym( const OUString& pSymTlb );
     void SAL_CALL skipSpaces();
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index 727724e347aa..12a8b11f9d50 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.cxx
@@ -44,25 +44,21 @@ ClipboardManager::~ClipboardManager()
 }
 
 OUString SAL_CALL ClipboardManager::getImplementationName(  )
-    throw(RuntimeException)
 {
     return OUString(CLIPBOARDMANAGER_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL ClipboardManager::supportsService( const OUString& ServiceName )
-    throw(RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL ClipboardManager::getSupportedServiceNames(  )
-    throw(RuntimeException)
 {
     return ClipboardManager_getSupportedServiceNames();
 }
 
 Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString& aName )
-    throw(NoSuchElementException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -81,7 +77,6 @@ Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString&
 }
 
 void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xClipboard )
-    throw(IllegalArgumentException, ElementExistException, RuntimeException)
 {
     OSL_ASSERT(xClipboard.is());
 
@@ -119,7 +114,6 @@ void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xCl
 }
 
 void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName )
-     throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     if (!rBHelper.bDisposed)
@@ -127,7 +121,6 @@ void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName )
 }
 
 Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
-    throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -142,7 +135,6 @@ Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
 }
 
 void SAL_CALL ClipboardManager::dispose()
-    throw(RuntimeException)
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
     if (!rBHelper.bDisposed && !rBHelper.bInDispose)
@@ -188,7 +180,6 @@ void SAL_CALL ClipboardManager::dispose()
 }
 
 void SAL_CALL  ClipboardManager::disposing( const EventObject& event )
-    throw(RuntimeException)
 {
     Reference < XClipboard > xClipboard(event.Source, UNO_QUERY);
 
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index 80b179712eda..9cbccb9dcc3d 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.hxx
@@ -56,47 +56,35 @@ namespace dtrans
          * XServiceInfo
          */
 
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw(css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
 
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw(css::uno::RuntimeException) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw(css::uno::RuntimeException) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /*
          * XComponent
          */
 
-        virtual void SAL_CALL dispose()
-            throw(css::uno::RuntimeException) override;
+        virtual void SAL_CALL dispose() override;
 
         /*
          * XEventListener
          */
 
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
-            throw(css::uno::RuntimeException) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
         /*
          * XClipboardManager
          */
 
-        virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName )
-            throw(css::container::NoSuchElementException,
-                  css::uno::RuntimeException) override;
+        virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& aName ) override;
 
-        virtual void SAL_CALL addClipboard( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard )
-            throw(css::lang::IllegalArgumentException,
-                  css::container::ElementExistException,
-                  css::uno::RuntimeException) override;
+        virtual void SAL_CALL addClipboard( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard ) override;
 
-        virtual void SAL_CALL removeClipboard( const OUString& aName )
-            throw(css::uno::RuntimeException) override;
+        virtual void SAL_CALL removeClipboard( const OUString& aName ) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL listClipboardNames(  )
-            throw(css::uno::RuntimeException) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL listClipboardNames(  ) override;
 
     };
 
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index ed26637cbf9b..c9477e068c7f 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.cxx
@@ -42,7 +42,6 @@ GenericClipboard::~GenericClipboard()
 }
 
 void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
-    throw(Exception, RuntimeException)
 {
     if (!m_bInitialized)
     {
@@ -56,25 +55,21 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
 }
 
 OUString SAL_CALL GenericClipboard::getImplementationName(  )
-    throw(RuntimeException)
 {
     return OUString(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL GenericClipboard::supportsService( const OUString& ServiceName )
-    throw(RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL GenericClipboard::getSupportedServiceNames(    )
-    throw(RuntimeException)
 {
     return GenericClipboard_getSupportedServiceNames();
 }
 
 Reference< XTransferable > SAL_CALL GenericClipboard::getContents()
-    throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     return m_aContents;
@@ -82,7 +77,6 @@ Reference< XTransferable > SAL_CALL GenericClipboard::getContents()
 
 void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xTrans,
                                       const Reference< XClipboardOwner >& xClipboardOwner )
-    throw(RuntimeException)
 {
     // remember old values for callbacks before setting the new ones.
     ClearableMutexGuard aGuard(m_aMutex);
@@ -117,19 +111,16 @@ void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xT
 }
 
 OUString SAL_CALL GenericClipboard::getName()
-    throw(RuntimeException)
 {
     return m_aName;
 }
 
 sal_Int8 SAL_CALL GenericClipboard::getRenderingCapabilities()
-    throw(RuntimeException)
 {
     return RenderingCapabilities::Delayed;
 }
 
 void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
-    throw(RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
     OSL_ENSURE( !rBHelper.bInDispose, "do not add listeners in the dispose call" );
@@ -139,7 +130,6 @@ void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboar
 }
 
 void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
-    throw(RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
     OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index c336cabef1e7..f245096e9c60 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.hxx
@@ -57,55 +57,45 @@ namespace dtrans
          * XInitialization
          */
 
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw(css::uno::Exception, css::uno::RuntimeException) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         /*
          * XServiceInfo
          */
 
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw(css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
 
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw(css::uno::RuntimeException) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw(css::uno::RuntimeException) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /*
          * XClipboard
          */
 
-        virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents()
-            throw(css::uno::RuntimeException) override;
+        virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override;
 
         virtual void SAL_CALL setContents(
             const css::uno::Reference< css::datatransfer::XTransferable >& xTrans,
-            const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-            throw(css::uno::RuntimeException) override;
+            const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override;
 
-        virtual OUString SAL_CALL getName()
-            throw(css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getName() override;
 
         /*
          * XClipboardEx
          */
 
-        virtual sal_Int8 SAL_CALL getRenderingCapabilities()
-            throw(css::uno::RuntimeException) override;
+        virtual sal_Int8 SAL_CALL getRenderingCapabilities() override;
 
         /*
          * XClipboardNotifier
          */
 
         virtual void SAL_CALL addClipboardListener(
-            const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-            throw(css::uno::RuntimeException) override;
+            const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
         virtual void SAL_CALL removeClipboardListener(
-            const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-            throw(css::uno::RuntimeException) override;
+            const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
     };
 
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 76d7b06c95c4..7abe063615ef 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -73,7 +73,7 @@ CWinClipbImpl::~CWinClipbImpl( )
     unregisterClipboardViewer( );
 }
 
-Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( RuntimeException )
+Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( )
 {
     // use the shortcut or create a transferable from
     // system clipboard
@@ -110,7 +110,6 @@ Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( Runtime
 void SAL_CALL CWinClipbImpl::setContents(
     const Reference< XTransferable >& xTransferable,
     const Reference< XClipboardOwner >& xClipboardOwner )
-    throw( RuntimeException )
 {
     IDataObjectPtr    pIDataObj;
 
@@ -132,17 +131,17 @@ void SAL_CALL CWinClipbImpl::setContents(
     m_MtaOleClipboard.setClipboard(pIDataObj.get());
 }
 
-OUString SAL_CALL CWinClipbImpl::getName(  ) throw( RuntimeException )
+OUString SAL_CALL CWinClipbImpl::getName(  )
 {
     return m_itsName;
 }
 
-sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities(  ) throw( RuntimeException )
+sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities(  )
 {
     return ( Delayed | Persistant );
 }
 
-void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
+void SAL_CALL CWinClipbImpl::flushClipboard( )
 {
     // actually it should be ClearableMutexGuard aGuard( m_ClipContentMutex );
     // but it does not work since FlushClipboard does a callback and frees DataObject
@@ -168,7 +167,7 @@ void SAL_CALL CWinClipbImpl::unregisterClipboardViewer( )
     m_MtaOleClipboard.registerClipViewer( nullptr );
 }
 
-void SAL_CALL CWinClipbImpl::dispose() throw( RuntimeException )
+void SAL_CALL CWinClipbImpl::dispose()
 {
     OSL_ENSURE( !m_pCurrentClipContent, "Clipboard was not flushed before shutdown!" );
 }
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index 64024db385ac..0b74185ec52d 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -49,27 +49,31 @@ public:
 protected:
     CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard );
 
-    css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents(  )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents(  );
 
+    /// @throws css::uno::RuntimeException
     void SAL_CALL setContents(
         const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable,
-        const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-        throw( css::uno::RuntimeException );
+        const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner );
 
-    OUString SAL_CALL getName(  ) throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    OUString SAL_CALL getName(  );
 
     // XClipboardEx
 
-    static sal_Int8 SAL_CALL getRenderingCapabilities(  ) throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    static sal_Int8 SAL_CALL getRenderingCapabilities(  );
 
     // XFlushableClipboard
 
-    void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    void SAL_CALL flushClipboard( );
 
     // XComponent
 
-    void SAL_CALL dispose( ) throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    void SAL_CALL dispose( );
 
     // member functions
 
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 1e960d4783fc..a0dd569fb091 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -61,7 +61,7 @@ CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, c
 // and so on, we simply return the original XTransferable instead of our
 // DOTransferable
 
-Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( RuntimeException )
+Reference< XTransferable > SAL_CALL CWinClipboard::getContents( )
 {
     MutexGuard aGuard( m_aMutex );
 
@@ -77,7 +77,6 @@ Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( Runtime
 
 void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTransferable,
                                           const Reference< XClipboardOwner >& xClipboardOwner )
-                                          throw( RuntimeException )
 {
     MutexGuard aGuard( m_aMutex );
 
@@ -89,7 +88,7 @@ void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTra
         m_pImpl->setContents( xTransferable, xClipboardOwner );
 }
 
-OUString SAL_CALL CWinClipboard::getName(  ) throw( RuntimeException )
+OUString SAL_CALL CWinClipboard::getName(  )
 {
     if ( rBHelper.bDisposed )
         throw DisposedException("object is already disposed",
@@ -103,7 +102,7 @@ OUString SAL_CALL CWinClipboard::getName(  ) throw( RuntimeException )
 
 // XFlushableClipboard
 
-void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException )
+void SAL_CALL CWinClipboard::flushClipboard( )
 {
     MutexGuard aGuard( m_aMutex );
 
@@ -117,7 +116,7 @@ void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException )
 
 // XClipboardEx
 
-sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities(  ) throw( RuntimeException )
+sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities(  )
 {
     if ( rBHelper.bDisposed )
         throw DisposedException("object is already disposed",
@@ -132,7 +131,6 @@ sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities(  ) throw( RuntimeExce
 // XClipboardNotifier
 
 void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
-    throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
         throw DisposedException("object is already disposed",
@@ -148,7 +146,6 @@ void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardLi
 }
 
 void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
-    throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
         throw DisposedException("object is already disposed",
@@ -225,19 +222,16 @@ void SAL_CALL CWinClipboard::disposing()
 // XServiceInfo
 
 OUString SAL_CALL CWinClipboard::getImplementationName(  )
-    throw(RuntimeException)
 {
     return OUString( WINCLIPBOARD_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL CWinClipboard::supportsService( const OUString& ServiceName )
-    throw(RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL CWinClipboard::getSupportedServiceNames(   )
-    throw(RuntimeException)
 {
     return WinClipboard_getSupportedServiceNames();
 }
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index b85a03e008b8..4e4ddc9a7c3d 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -71,34 +71,29 @@ public:
 
     // XClipboard
 
-    virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents(  ) override;
 
     virtual void SAL_CALL setContents(
         const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable,
-        const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-        throw( css::uno::RuntimeException ) override;
+        const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override;
 
-    virtual OUString SAL_CALL getName(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getName(  ) override;
 
     // XFlushableClipboard
 
-    virtual void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL flushClipboard( ) override;
 
     // XClipboardEx
 
-    virtual sal_Int8 SAL_CALL getRenderingCapabilities(  ) throw( css::uno::RuntimeException ) override;
+    virtual sal_Int8 SAL_CALL getRenderingCapabilities(  ) override;
 
     // XClipboardNotifier
 
     virtual void SAL_CALL addClipboardListener(
-        const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-        throw( css::uno::RuntimeException ) override;
+        const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
     virtual void SAL_CALL removeClipboardListener(
-        const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-        throw( css::uno::RuntimeException ) override;
+        const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
     // overwrite base class method, which is called
     // by base class dispose function
@@ -107,14 +102,11 @@ public:
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     void SAL_CALL notifyAllClipboardListener( );
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 85eb0d8c0d9f..39c0bc472f2c 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -137,7 +137,6 @@ void DragSource::StartDragImpl(
 // XInitialization
 /** aArguments contains a machine id */
 void SAL_CALL DragSource::initialize( const Sequence< Any >& aArguments )
-    throw(Exception, RuntimeException)
 {
     if( aArguments.getLength() >=2)
         m_hAppWindow= reinterpret_cast<HWND>(static_cast<sal_uIntPtr>(*o3tl::doAccess<sal_uInt64>(aArguments[1])));
@@ -146,13 +145,11 @@ void SAL_CALL DragSource::initialize( const Sequence< Any >& aArguments )
 
 /** XDragSource */
 sal_Bool SAL_CALL DragSource::isDragImageSupported(  )
-         throw(RuntimeException)
 {
     return false;
 }
 
 sal_Int32 SAL_CALL DragSource::getDefaultCursor( sal_Int8 /*dragAction*/ )
-          throw( IllegalArgumentException, RuntimeException)
 {
     return 0;
 }
@@ -165,7 +162,7 @@ void SAL_CALL DragSource::startDrag(
     sal_Int32 cursor,
     sal_Int32 image,
     const Reference<XTransferable >& trans,
-    const Reference<XDragSourceListener >& listener ) throw( RuntimeException)
+    const Reference<XDragSourceListener >& listener )
 {
     // Allow only one running dnd operation at a time,
     // see XDragSource documentation
@@ -287,17 +284,17 @@ dwEffect
 }
 
 // XServiceInfo
-OUString SAL_CALL DragSource::getImplementationName(  ) throw (RuntimeException)
+OUString SAL_CALL DragSource::getImplementationName(  )
 {
     return OUString(DNDSOURCE_IMPL_NAME);
 }
 // XServiceInfo
-sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) throw (RuntimeException)
+sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames(  ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames(  )
 {
     OUString names[1]= {OUString(DNDSOURCE_SERVICE_NAME)};
 
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index 47ab118b0a0a..52d4bab1982f 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -89,25 +89,22 @@ public:
     DragSource &operator= ( const DragSource&) = delete;
 
   // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
-        throw(Exception, RuntimeException) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XDragSource
-    virtual sal_Bool SAL_CALL isDragImageSupported(  ) throw(RuntimeException) override;
-    virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction )
-        throw( IllegalArgumentException, RuntimeException) override;
+    virtual sal_Bool SAL_CALL isDragImageSupported(  ) override;
+    virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction ) override;
     virtual void SAL_CALL startDrag( const DragGestureEvent& trigger,
                                      sal_Int8 sourceActions,
                                      sal_Int32 cursor,
                                      sal_Int32 image,
                                      const Reference<XTransferable >& trans,
-                                     const Reference<XDragSourceListener >& listener )
-                throw( RuntimeException) override;
+                                     const Reference<XDragSourceListener >& listener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(
             /* [in] */ REFIID riid,
diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx
index 3408c2913359..08adfaaea0cb 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/dtrans/source/win32/dnd/sourcecontext.cxx
@@ -42,34 +42,28 @@ SourceContext::~SourceContext()
 
 void SAL_CALL SourceContext::addDragSourceListener(
     const Reference<XDragSourceListener >& )
-    throw( RuntimeException)
 {
 }
 
 void SAL_CALL SourceContext::removeDragSourceListener(
      const Reference<XDragSourceListener >& )
-    throw( RuntimeException)
 {
 }
 
 sal_Int32 SAL_CALL SourceContext::getCurrentCursor(  )
-    throw( RuntimeException)
 {
     return 0;
 }
 
 void SAL_CALL SourceContext::setCursor( sal_Int32 /*cursorId*/ )
-    throw( RuntimeException)
 {
 }
 
 void SAL_CALL SourceContext::setImage( sal_Int32 /*imageId*/ )
-    throw( RuntimeException)
 {
 }
 
 void SAL_CALL SourceContext::transferablesFlavorsChanged(  )
-    throw( RuntimeException)
 {
 }
 
diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx
index b70a0cec8ead..8e76a36b3a36 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/dtrans/source/win32/dnd/sourcecontext.hxx
@@ -50,18 +50,14 @@ public:
     SourceContext(const SourceContext&) = delete;
     SourceContext &operator= (const SourceContext&) = delete;
 
-    virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl )
-        throw( RuntimeException);
-    virtual void SAL_CALL removeDragSourceListener( const Reference<XDragSourceListener >& dsl )
-        throw( RuntimeException);
-    virtual sal_Int32 SAL_CALL getCurrentCursor(  )
-        throw( RuntimeException) override;
-    virtual void SAL_CALL setCursor( sal_Int32 cursorId )
-        throw( RuntimeException) override;
-    virtual void SAL_CALL setImage( sal_Int32 imageId )
-        throw( RuntimeException) override;
-    virtual void SAL_CALL transferablesFlavorsChanged(  )
-        throw( RuntimeException) override;
+    /// @throws RuntimeException
+    virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl );
+    /// @throws RuntimeException
+    virtual void SAL_CALL removeDragSourceListener( const Reference<XDragSourceListener >& dsl );
+    virtual sal_Int32 SAL_CALL getCurrentCursor(  ) override;
+    virtual void SAL_CALL setCursor( sal_Int32 cursorId ) override;
+    virtual void SAL_CALL setImage( sal_Int32 imageId ) override;
+    virtual void SAL_CALL transferablesFlavorsChanged(  ) override;
 
     // non - interface functions
     void fire_dragDropEnd( bool success, sal_Int8 byte);
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index a9f6ae477226..b797d4e769d8 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -102,7 +102,6 @@ void SAL_CALL DropTarget::disposing()
 }
 
 void SAL_CALL DropTarget::initialize( const Sequence< Any >& aArguments )
-        throw(Exception, RuntimeException)
 {
     // The window must be registered for Dnd by RegisterDragDrop. We must ensure
     // that RegisterDragDrop is called from an STA ( OleInitialize) thread.
@@ -247,17 +246,17 @@ DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams)
 }
 
 // XServiceInfo
-OUString SAL_CALL DropTarget::getImplementationName(  ) throw (RuntimeException)
+OUString SAL_CALL DropTarget::getImplementationName(  )
 {
     return OUString(DNDTARGET_IMPL_NAME);
 }
 // XServiceInfo
-sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) throw (RuntimeException)
+sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames(  ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames(  )
 {
     OUString names[1]= {OUString(DNDTARGET_SERVICE_NAME)};
     return Sequence<OUString>(names, 1);
@@ -265,34 +264,32 @@ Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames(  ) throw (Ru
 
 // XDropTarget
 void SAL_CALL DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& dtl )
-        throw(RuntimeException)
 {
     rBHelper.addListener( cppu::UnoType<decltype(dtl)>::get(), dtl );
 }
 
 void SAL_CALL DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& dtl )
-        throw(RuntimeException)
 {
     rBHelper.removeListener( cppu::UnoType<decltype(dtl)>::get(), dtl );
 }
 
-sal_Bool SAL_CALL DropTarget::isActive(  ) throw(RuntimeException)
+sal_Bool SAL_CALL DropTarget::isActive(  )
 {
     return m_bActive; //m_bDropTargetRegistered;
 }
 
-void SAL_CALL DropTarget::setActive( sal_Bool _b ) throw(RuntimeException)
+void SAL_CALL DropTarget::setActive( sal_Bool _b )
 {
     MutexGuard g(m_mutex);
     m_bActive= _b;
 }
 
-sal_Int8 SAL_CALL DropTarget::getDefaultActions(  ) throw(RuntimeException)
+sal_Int8 SAL_CALL DropTarget::getDefaultActions(  )
 {
     return m_nDefaultActions;
 }
 
-void SAL_CALL DropTarget::setDefaultActions( sal_Int8 actions ) throw(RuntimeException)
+void SAL_CALL DropTarget::setDefaultActions( sal_Int8 actions )
 {
     OSL_ENSURE( actions < 8, "No valid default actions");
     m_nDefaultActions= actions;
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index ada9301a04f1..49fde8e0c914 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -117,24 +117,21 @@ public:
     // Must be called.
     virtual void SAL_CALL disposing() override;
    // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
-        throw(Exception, RuntimeException) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XDropTarget
-    virtual void SAL_CALL addDropTargetListener( const Reference< XDropTargetListener >& dtl )
-        throw(RuntimeException) override;
-    virtual void SAL_CALL removeDropTargetListener( const Reference< XDropTargetListener >& dtl )
-        throw(RuntimeException) override;
+    virtual void SAL_CALL addDropTargetListener( const Reference< XDropTargetListener >& dtl ) override;
+    virtual void SAL_CALL removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) override;
     // Default is not active
-    virtual sal_Bool SAL_CALL isActive(  ) throw(RuntimeException) override;
-    virtual void SAL_CALL setActive( sal_Bool isActive ) throw(RuntimeException) override;
-    virtual sal_Int8 SAL_CALL getDefaultActions(  ) throw(RuntimeException) override;
-    virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(RuntimeException) override;
+    virtual sal_Bool SAL_CALL isActive(  ) override;
+    virtual void SAL_CALL setActive( sal_Bool isActive ) override;
+    virtual sal_Int8 SAL_CALL getDefaultActions(  ) override;
+    virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // Functions called from the IDropTarget implementation ( m_pDropTarget)
     virtual HRESULT DragEnter(
diff --git a/dtrans/source/win32/dnd/targetdragcontext.cxx b/dtrans/source/win32/dnd/targetdragcontext.cxx
index 425f9d38707d..4ffd16123d9d 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.cxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.cxx
@@ -31,13 +31,11 @@ TargetDragContext::~TargetDragContext()
 }
 
 void SAL_CALL TargetDragContext::acceptDrag( sal_Int8 dragOperation )
-    throw( RuntimeException)
 {
     m_pDropTarget->_acceptDrag( dragOperation, static_cast<XDropTargetDragContext*>( this) );
 
 }
 void SAL_CALL TargetDragContext::rejectDrag( )
-    throw( RuntimeException)
 {
     m_pDropTarget->_rejectDrag( static_cast<XDropTargetDragContext*>( this) );
 }
diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx
index 00c3d40d2382..a8f48cad193e 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.hxx
@@ -43,10 +43,8 @@ public:
     TargetDragContext( const TargetDragContext&) = delete;
     TargetDragContext &operator= ( const TargetDragContext&) = delete;
 
-    virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation )
-        throw( RuntimeException) override;
-    virtual void SAL_CALL rejectDrag(  )
-        throw( RuntimeException) override;
+    virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) override;
+    virtual void SAL_CALL rejectDrag(  ) override;
 };
 
 #endif
diff --git a/dtrans/source/win32/dnd/targetdropcontext.cxx b/dtrans/source/win32/dnd/targetdropcontext.cxx
index 93705a2dba9d..9719664a9fbb 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.cxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.cxx
@@ -36,19 +36,16 @@ TargetDropContext::~TargetDropContext()
 }
 
 void SAL_CALL TargetDropContext::acceptDrop( sal_Int8 dropOperation )
-        throw( RuntimeException)
 {
     m_pDropTarget->_acceptDrop( dropOperation, static_cast<XDropTargetDropContext*>( this) );
 }
 
 void SAL_CALL TargetDropContext::rejectDrop( )
-        throw( RuntimeException)
 {
     m_pDropTarget->_rejectDrop(  static_cast<XDropTargetDropContext*>( this) );
 }
 
 void SAL_CALL TargetDropContext::dropComplete( sal_Bool success )
-        throw( RuntimeException)
 {
     m_pDropTarget->_dropComplete( success, static_cast<XDropTargetDropContext*>( this) );
 }
diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx
index f240e6897fbb..b7db849fe4e1 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.hxx
@@ -43,14 +43,11 @@ public:
     TargetDropContext &operator= ( const TargetDropContext&) = delete;
 
     // XDropTargetDragContext
-    virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation )
-        throw( RuntimeException) override;
-    virtual void SAL_CALL rejectDrop(  )
-        throw( RuntimeException) override;
+    virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) override;
+    virtual void SAL_CALL rejectDrop(  ) override;
 
     // XDropTargetDropContext (inherits XDropTargetDragContext)
-    virtual void SAL_CALL dropComplete( sal_Bool success )
-        throw(  RuntimeException) override;
+    virtual void SAL_CALL dropComplete( sal_Bool success ) override;
 };
 #endif
 
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index c6dd59fdb800..0feb5c12e8d8 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -191,7 +191,6 @@ CDOTransferable::CDOTransferable(
 }
 
 Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
-        throw( UnsupportedFlavorException, IOException, RuntimeException )
 {
     OSL_ASSERT( isValidFlavor( aFlavor ) );
 
@@ -248,7 +247,6 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
 // getTransferDataFlavors
 
 Sequence< DataFlavor > SAL_CALL CDOTransferable::getTransferDataFlavors(  )
-    throw( RuntimeException )
 {
     return m_FlavorList;
 }
@@ -258,7 +256,6 @@ Sequence< DataFlavor > SAL_CALL CDOTransferable::getTransferDataFlavors(  )
 // DataType
 
 sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
-    throw( RuntimeException )
 {
     OSL_ASSERT( isValidFlavor( aFlavor ) );
 
@@ -528,7 +525,6 @@ bool SAL_CALL CDOTransferable::compareDataFlavors(
 }
 
 css::uno::Any SAL_CALL CDOTransferable::getData( const Sequence< sal_Int8>& aProcessId  )
-        throw (css::uno::RuntimeException)
 {
     Any retVal;
 
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index ab08e22e286a..0099f3f4b4dd 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -45,19 +45,15 @@ public:
 
     // XTransferable
 
-    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
-        throw( css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException ) override;
+    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
 
-    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) override;
 
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 
     // XSystemTransferable
 
-    virtual css::uno::Any SAL_CALL getData( const css::uno::Sequence<sal_Int8>& aProcessId  ) throw
-    (css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL getData( const css::uno::Sequence<sal_Int8>& aProcessId  ) override;
 
 private:
     explicit CDOTransferable(
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 1c13d346aa5a..cc3c86de7d03 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -100,8 +100,7 @@ public:
         : maTransferable(rTransferable)
     {}
 
-    virtual void SAL_CALL notify(css::uno::Any const &)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL notify(css::uno::Any const &) override
     {
         maTransferable.set(nullptr);
     }
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 3350211d07d6..8b96cdd6c3dd 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -469,7 +469,6 @@ CDataFormatTranslatorUNO::CDataFormatTranslatorUNO( const Reference< XComponentC
 }
 
 Any SAL_CALL CDataFormatTranslatorUNO::getSystemDataTypeFromDataFlavor( const DataFlavor& aDataFlavor )
-    throw( RuntimeException )
 {
     Any aAny;
 
@@ -524,7 +523,6 @@ Any SAL_CALL CDataFormatTranslatorUNO::getSystemDataTypeFromDataFlavor( const Da
 }
 
 DataFlavor SAL_CALL CDataFormatTranslatorUNO::getDataFlavorFromSystemDataType( const Any& aSysDataType )
-    throw( RuntimeException )
 {
     OSL_PRECOND( aSysDataType.hasValue( ), "Empty system data type delivered" );
 
@@ -553,19 +551,16 @@ DataFlavor SAL_CALL CDataFormatTranslatorUNO::getDataFlavorFromSystemDataType( c
 // XServiceInfo
 
 OUString SAL_CALL CDataFormatTranslatorUNO::getImplementationName(  )
-    throw( RuntimeException )
 {
     return OUString( IMPL_NAME );
 }
 
 sal_Bool SAL_CALL CDataFormatTranslatorUNO::supportsService( const OUString& ServiceName )
-    throw( RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL CDataFormatTranslatorUNO::getSupportedServiceNames( )
-    throw( RuntimeException )
 {
     return DataFormatTranslator_getSupportedServiceNames( );
 }
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index 82d148f025ea..6859e0d53774 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -49,22 +49,17 @@ public:
 
     // XDataFormatTranslator
 
-    virtual css::uno::Any SAL_CALL getSystemDataTypeFromDataFlavor( const css::datatransfer::DataFlavor& aDataFlavor )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL getSystemDataTypeFromDataFlavor( const css::datatransfer::DataFlavor& aDataFlavor ) override;
 
-    virtual css::datatransfer::DataFlavor SAL_CALL getDataFlavorFromSystemDataType( const css::uno::Any& aSysDataType )
-        throw(css::uno::RuntimeException) override;
+    virtual css::datatransfer::DataFlavor SAL_CALL getDataFlavorFromSystemDataType( const css::uno::Any& aSysDataType ) override;
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     const css::uno::Reference< css::uno::XComponentContext >  m_xContext;
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 495f84f84eef..6a2cd65dd80f 100644
--- a/editeng/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -49,7 +49,6 @@ AccessibleComponentBase::~AccessibleComponentBase()
 
 sal_Bool SAL_CALL AccessibleComponentBase::containsPoint (
         const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception)
 {
     awt::Size aSize (getSize());
     return (aPoint.X >= 0)
@@ -62,21 +61,18 @@ sal_Bool SAL_CALL AccessibleComponentBase::containsPoint (
 uno::Reference<XAccessible > SAL_CALL
     AccessibleComponentBase::getAccessibleAtPoint (
         const awt::Point& /*aPoint*/)
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference<XAccessible>();
 }
 
 
 awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds()
-    throw (uno::RuntimeException, std::exception)
 {
     return awt::Rectangle();
 }
 
 
 awt::Point SAL_CALL AccessibleComponentBase::getLocation()
-    throw (css::uno::RuntimeException, std::exception)
 {
     awt::Rectangle aBBox (getBounds());
     return awt::Point (aBBox.X, aBBox.Y);
@@ -84,14 +80,12 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocation()
 
 
 awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return awt::Point();
 }
 
 
 css::awt::Size SAL_CALL AccessibleComponentBase::getSize()
-    throw (css::uno::RuntimeException, std::exception)
 {
     awt::Rectangle aBBox (getBounds());
     return awt::Size (aBBox.Width, aBBox.Height);
@@ -99,7 +93,6 @@ css::awt::Size SAL_CALL AccessibleComponentBase::getSize()
 
 
 void SAL_CALL AccessibleComponentBase::grabFocus()
-    throw (css::uno::RuntimeException, std::exception)
 {
     uno::Reference<XAccessibleContext> xContext (this, uno::UNO_QUERY);
     uno::Reference<XAccessibleSelection> xSelection (
@@ -114,14 +107,12 @@ void SAL_CALL AccessibleComponentBase::grabFocus()
 
 
 sal_Int32 SAL_CALL AccessibleComponentBase::getForeground()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return Color(COL_BLACK).GetColor();
 }
 
 
 sal_Int32 SAL_CALL AccessibleComponentBase::getBackground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return Color(COL_WHITE).GetColor();
 }
@@ -131,21 +122,18 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground()
 
 css::uno::Reference< css::awt::XFont > SAL_CALL
         AccessibleComponentBase::getFont()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return uno::Reference<awt::XFont>();
 }
 
 
 OUString SAL_CALL AccessibleComponentBase::getTitledBorderText()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return OUString();
 }
 
 
 OUString SAL_CALL AccessibleComponentBase::getToolTipText()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString();
 }
@@ -154,7 +142,6 @@ OUString SAL_CALL AccessibleComponentBase::getToolTipText()
 
 uno::Sequence<uno::Type> SAL_CALL
     AccessibleComponentBase::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     // Get list of types from the context base implementation...
     uno::Sequence<uno::Type> aTypeList (2);
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 7b80e9c8b178..8b00952cbfd0 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -145,7 +145,6 @@ bool AccessibleContextBase::GetState (sal_Int16 aState)
 
 void AccessibleContextBase::SetRelationSet (
     const uno::Reference<XAccessibleRelationSet>& rxNewRelationSet)
-    throw (css::uno::RuntimeException)
 {
     // Try to emit some meaningfull events indicating differing relations in
     // both sets.
@@ -171,7 +170,6 @@ void AccessibleContextBase::SetRelationSet (
 
 uno::Reference< XAccessibleContext> SAL_CALL
     AccessibleContextBase::getAccessibleContext()
-    throw (uno::RuntimeException, std::exception)
 {
     return this;
 }
@@ -183,7 +181,6 @@ uno::Reference< XAccessibleContext> SAL_CALL
 */
 sal_Int32 SAL_CALL
        AccessibleContextBase::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     return 0;
 }
@@ -194,7 +191,6 @@ sal_Int32 SAL_CALL
 */
 uno::Reference<XAccessible> SAL_CALL
     AccessibleContextBase::getAccessibleChild (sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     throw lang::IndexOutOfBoundsException (
@@ -205,7 +201,6 @@ uno::Reference<XAccessible> SAL_CALL
 
 uno::Reference<XAccessible> SAL_CALL
        AccessibleContextBase::getAccessibleParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     return mxParent;
@@ -214,7 +209,6 @@ uno::Reference<XAccessible> SAL_CALL
 
 sal_Int32 SAL_CALL
        AccessibleContextBase::getAccessibleIndexInParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     //  Use a simple but slow solution for now.  Optimize later.
@@ -248,7 +242,6 @@ sal_Int32 SAL_CALL
 
 sal_Int16 SAL_CALL
     AccessibleContextBase::getAccessibleRole()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     return maRole;
@@ -257,7 +250,6 @@ sal_Int16 SAL_CALL
 
 OUString SAL_CALL
        AccessibleContextBase::getAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -267,7 +259,6 @@ OUString SAL_CALL
 
 OUString SAL_CALL
        AccessibleContextBase::getAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -287,7 +278,6 @@ OUString SAL_CALL
 */
 uno::Reference<XAccessibleRelationSet> SAL_CALL
        AccessibleContextBase::getAccessibleRelationSet()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -312,7 +302,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
 */
 uno::Reference<XAccessibleStateSet> SAL_CALL
     AccessibleContextBase::getAccessibleStateSet()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::utl::AccessibleStateSetHelper* pStateSet = nullptr;
 
@@ -350,8 +339,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
 
 lang::Locale SAL_CALL
        AccessibleContextBase::getLocale()
-    throw (IllegalAccessibleComponentStateException,
-        css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     // Delegate request to parent.
@@ -373,7 +360,6 @@ lang::Locale SAL_CALL
 
 void SAL_CALL AccessibleContextBase::addAccessibleEventListener (
         const uno::Reference<XAccessibleEventListener >& rxListener)
-    throw (uno::RuntimeException, std::exception)
 {
     if (rxListener.is())
     {
@@ -394,7 +380,6 @@ void SAL_CALL AccessibleContextBase::addAccessibleEventListener (
 
 void SAL_CALL AccessibleContextBase::removeAccessibleEventListener (
         const uno::Reference<XAccessibleEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     if (rxListener.is() && mnClientId)
@@ -414,20 +399,17 @@ void SAL_CALL AccessibleContextBase::removeAccessibleEventListener (
 
 // XServiceInfo
 OUString SAL_CALL AccessibleContextBase::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessibleContextBase");
 }
 
 sal_Bool SAL_CALL AccessibleContextBase::supportsService (const OUString& sServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
        AccessibleContextBase::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return {
         "com.sun.star.accessibility.Accessible",
@@ -439,7 +421,6 @@ uno::Sequence< OUString > SAL_CALL
 
 uno::Sequence<sal_Int8> SAL_CALL
     AccessibleContextBase::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -464,7 +445,6 @@ void SAL_CALL AccessibleContextBase::disposing()
 void AccessibleContextBase::SetAccessibleDescription (
     const OUString& rDescription,
     StringOrigin eDescriptionOrigin)
-    throw (uno::RuntimeException)
 {
     if (eDescriptionOrigin < meDescriptionOrigin
         || (eDescriptionOrigin == meDescriptionOrigin && msDescription != rDescription))
@@ -487,7 +467,6 @@ void AccessibleContextBase::SetAccessibleDescription (
 void AccessibleContextBase::SetAccessibleName (
     const OUString& rName,
     StringOrigin eNameOrigin)
-    throw (uno::RuntimeException)
 {
     if (eNameOrigin < meNameOrigin
         || (eNameOrigin == meNameOrigin && msName != rName))
@@ -508,14 +487,12 @@ void AccessibleContextBase::SetAccessibleName (
 
 
 OUString AccessibleContextBase::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("Empty Description");
 }
 
 
 OUString AccessibleContextBase::CreateAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("Empty Name");
 }
@@ -550,7 +527,6 @@ void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent)
 
 
 void AccessibleContextBase::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 2216ecef38b9..1e5bdaa7e687 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -625,7 +625,7 @@ namespace accessibility
                                                    nIndex );
     }
 
-    uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType) throw (uno::RuntimeException, std::exception)
+    uno::Any SAL_CALL AccessibleEditableTextPara::queryInterface (const uno::Type & rType)
     {
         uno::Any aRet;
 
@@ -654,21 +654,21 @@ namespace accessibility
     }
 
     // XAccessible
-    uno::Reference< XAccessibleContext > SAL_CALL AccessibleEditableTextPara::getAccessibleContext() throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessibleContext > SAL_CALL AccessibleEditableTextPara::getAccessibleContext()
     {
         // We implement the XAccessibleContext interface in the same object
         return uno::Reference< XAccessibleContext > ( this );
     }
 
     // XAccessibleContext
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount()
     {
         SolarMutexGuard aGuard;
 
         return HaveChildren() ? 1 : 0;
     }
 
-    uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int32 i )
     {
         SolarMutexGuard aGuard;
 
@@ -699,24 +699,24 @@ namespace accessibility
         return aChild.get();
     }
 
-    uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleParent() throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleParent()
     {
         SAL_WARN_IF(!mxParent.is(), "editeng", "AccessibleEditableTextPara::getAccessibleParent: no frontend set, did somebody forgot to call AccessibleTextHelper::SetEventSource()?");
 
         return mxParent;
     }
 
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent()
     {
         return mnIndexInParent;
     }
 
-    sal_Int16 SAL_CALL AccessibleEditableTextPara::getAccessibleRole() throw (uno::RuntimeException, std::exception)
+    sal_Int16 SAL_CALL AccessibleEditableTextPara::getAccessibleRole()
     {
         return AccessibleRole::PARAGRAPH;
     }
 
-    OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription()
     {
         SolarMutexGuard aGuard;
 
@@ -760,13 +760,13 @@ namespace accessibility
         return OUString( sStr ) + aLine;
     }
 
-    OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName()
     {
         //See tdf#101003 before implementing a body
         return OUString();
     }
 
-    uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleEditableTextPara::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleEditableTextPara::getAccessibleRelationSet()
     {
         // #i27138# - provide relations CONTENT_FLOWS_FROM
         // and CONTENT_FLOWS_TO
@@ -938,7 +938,7 @@ namespace accessibility
         return OUString();
     }
 
-    uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleEditableTextPara::getAccessibleStateSet() throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleEditableTextPara::getAccessibleStateSet()
     {
         SolarMutexGuard aGuard;
 
@@ -960,20 +960,20 @@ namespace accessibility
         return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet) );
     }
 
-    lang::Locale SAL_CALL AccessibleEditableTextPara::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
+    lang::Locale SAL_CALL AccessibleEditableTextPara::getLocale()
     {
         SolarMutexGuard aGuard;
 
         return implGetLocale();
     }
 
-    void SAL_CALL AccessibleEditableTextPara::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleEditableTextPara::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     {
         if( getNotifierClientId() != -1 )
             ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
     }
 
-    void SAL_CALL AccessibleEditableTextPara::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleEditableTextPara::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     {
         if( getNotifierClientId() != -1 )
         {
@@ -992,7 +992,7 @@ namespace accessibility
     }
 
     // XAccessibleComponent
-    sal_Bool SAL_CALL AccessibleEditableTextPara::containsPoint( const awt::Point& aTmpPoint ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::containsPoint( const awt::Point& aTmpPoint )
     {
         SolarMutexGuard aGuard;
 
@@ -1006,7 +1006,7 @@ namespace accessibility
         return aRect.IsInside( aPoint );
     }
 
-    uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleAtPoint( const awt::Point& _aPoint )
     {
         SolarMutexGuard aGuard;
 
@@ -1039,7 +1039,7 @@ namespace accessibility
         return uno::Reference< XAccessible >();
     }
 
-    awt::Rectangle SAL_CALL AccessibleEditableTextPara::getBounds() throw (uno::RuntimeException, std::exception)
+    awt::Rectangle SAL_CALL AccessibleEditableTextPara::getBounds()
     {
         SolarMutexGuard aGuard;
 
@@ -1063,7 +1063,7 @@ namespace accessibility
                                aScreenRect.GetSize().Height() );
     }
 
-    awt::Point SAL_CALL AccessibleEditableTextPara::getLocation(  ) throw (uno::RuntimeException, std::exception)
+    awt::Point SAL_CALL AccessibleEditableTextPara::getLocation(  )
     {
         SolarMutexGuard aGuard;
 
@@ -1072,7 +1072,7 @@ namespace accessibility
         return awt::Point( aRect.X, aRect.Y );
     }
 
-    awt::Point SAL_CALL AccessibleEditableTextPara::getLocationOnScreen(  ) throw (uno::RuntimeException, std::exception)
+    awt::Point SAL_CALL AccessibleEditableTextPara::getLocationOnScreen(  )
     {
         SolarMutexGuard aGuard;
 
@@ -1116,7 +1116,7 @@ namespace accessibility
                                     ( static_cast< XAccessible* > (this) ) );   // disambiguate hierarchy
     }
 
-    awt::Size SAL_CALL AccessibleEditableTextPara::getSize(  ) throw (uno::RuntimeException, std::exception)
+    awt::Size SAL_CALL AccessibleEditableTextPara::getSize(  )
     {
         SolarMutexGuard aGuard;
 
@@ -1125,13 +1125,13 @@ namespace accessibility
         return awt::Size( aRect.Width, aRect.Height );
     }
 
-    void SAL_CALL AccessibleEditableTextPara::grabFocus(  ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleEditableTextPara::grabFocus(  )
     {
         // set cursor to this paragraph
         setSelection(0,0);
     }
 
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getForeground(  )
     {
         // #104444# Added to XAccessibleComponent interface
         svtools::ColorConfig aColorConfig;
@@ -1139,7 +1139,7 @@ namespace accessibility
         return static_cast<sal_Int32>(nColor);
     }
 
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getBackground(  )
     {
         // #104444# Added to XAccessibleComponent interface
         Color aColor( Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor() );
@@ -1151,7 +1151,7 @@ namespace accessibility
     }
 
     // XAccessibleText
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getCaretPosition() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getCaretPosition()
     {
         SolarMutexGuard aGuard;
 
@@ -1179,12 +1179,12 @@ namespace accessibility
         return -1;
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::setCaretPosition( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::setCaretPosition( sal_Int32 nIndex )
     {
         return setSelection(nIndex, nIndex);
     }
 
-    sal_Unicode SAL_CALL AccessibleEditableTextPara::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Unicode SAL_CALL AccessibleEditableTextPara::getCharacter( sal_Int32 nIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -1194,7 +1194,7 @@ namespace accessibility
         return OCommonAccessibleText::getCharacter( nIndex );
     }
 
-    uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& rRequestedAttributes ) throw (lang::IndexOutOfBoundsException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+    uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& rRequestedAttributes )
     {
         SolarMutexGuard aGuard;
 
@@ -1298,7 +1298,7 @@ namespace accessibility
         return aRes;
     }
 
-    awt::Rectangle SAL_CALL AccessibleEditableTextPara::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    awt::Rectangle SAL_CALL AccessibleEditableTextPara::getCharacterBounds( sal_Int32 nIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -1331,7 +1331,7 @@ namespace accessibility
                                aScreenRect.GetSize().Height() );
     }
 
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getCharacterCount() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getCharacterCount()
     {
         SolarMutexGuard aGuard;
 
@@ -1341,7 +1341,7 @@ namespace accessibility
         return OCommonAccessibleText::getCharacterCount();
     }
 
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getIndexAtPoint( const awt::Point& rPoint )
     {
         SolarMutexGuard aGuard;
 
@@ -1387,7 +1387,7 @@ namespace accessibility
         }
     }
 
-    OUString SAL_CALL AccessibleEditableTextPara::getSelectedText() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleEditableTextPara::getSelectedText()
     {
         SolarMutexGuard aGuard;
 
@@ -1400,7 +1400,7 @@ namespace accessibility
         return OCommonAccessibleText::getSelectedText();
     }
 
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionStart() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionStart()
     {
         SolarMutexGuard aGuard;
 
@@ -1413,7 +1413,7 @@ namespace accessibility
         return OCommonAccessibleText::getSelectionStart();
     }
 
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionEnd() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getSelectionEnd()
     {
         SolarMutexGuard aGuard;
 
@@ -1426,7 +1426,7 @@ namespace accessibility
         return OCommonAccessibleText::getSelectionEnd();
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -1446,7 +1446,7 @@ namespace accessibility
         }
     }
 
-    OUString SAL_CALL AccessibleEditableTextPara::getText() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleEditableTextPara::getText()
     {
         SolarMutexGuard aGuard;
 
@@ -1456,7 +1456,7 @@ namespace accessibility
         return OCommonAccessibleText::getText();
     }
 
-    OUString SAL_CALL AccessibleEditableTextPara::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleEditableTextPara::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -1697,7 +1697,7 @@ namespace accessibility
         }
     }
 
-    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aGuard;
 
@@ -1812,7 +1812,7 @@ namespace accessibility
         return aResult;
     }
 
-    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aGuard;
 
@@ -1977,7 +1977,7 @@ namespace accessibility
         return aResult;
     }
 
-    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aGuard;
 
@@ -2101,7 +2101,7 @@ namespace accessibility
         return aResult;
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -2145,7 +2145,7 @@ namespace accessibility
     }
 
     // XAccessibleEditableText
-    sal_Bool SAL_CALL AccessibleEditableTextPara::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
 
         SolarMutexGuard aGuard;
@@ -2182,7 +2182,7 @@ namespace accessibility
         }
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::pasteText( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::pasteText( sal_Int32 nIndex )
     {
 
         SolarMutexGuard aGuard;
@@ -2217,7 +2217,7 @@ namespace accessibility
         }
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
 
         SolarMutexGuard aGuard;
@@ -2258,7 +2258,7 @@ namespace accessibility
         }
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::insertText( const OUString& sText, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::insertText( const OUString& sText, sal_Int32 nIndex )
     {
 
         SolarMutexGuard aGuard;
@@ -2298,7 +2298,7 @@ namespace accessibility
         }
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement )
     {
 
         SolarMutexGuard aGuard;
@@ -2341,7 +2341,7 @@ namespace accessibility
         }
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const uno::Sequence< beans::PropertyValue >& aAttributeSet ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const uno::Sequence< beans::PropertyValue >& aAttributeSet )
     {
 
         SolarMutexGuard aGuard;
@@ -2400,7 +2400,7 @@ namespace accessibility
         }
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::setText( const OUString& sText ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::setText( const OUString& sText )
     {
 
         SolarMutexGuard aGuard;
@@ -2411,7 +2411,6 @@ namespace accessibility
     // XAccessibleTextAttributes
     uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getDefaultAttributes(
             const uno::Sequence< OUString >& rRequestedAttributes )
-        throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
     {
         SolarMutexGuard aGuard;
 
@@ -2508,8 +2507,6 @@ namespace accessibility
     uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleEditableTextPara::getRunAttributes(
             sal_Int32 nIndex,
             const uno::Sequence< OUString >& rRequestedAttributes )
-        throw (beans::UnknownPropertyException, lang::IndexOutOfBoundsException,
-               uno::RuntimeException, std::exception)
     {
 
         SolarMutexGuard aGuard;
@@ -2597,7 +2594,7 @@ namespace accessibility
     }
 
     // XAccessibleHypertext
-    ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkCount(  ) throw (css::uno::RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkCount(  )
     {
         SvxAccessibleTextAdapter& rT = GetTextForwarder();
         const sal_Int32 nPara = GetParagraphIndex();
@@ -2613,7 +2610,7 @@ namespace accessibility
         return nHyperLinks;
     }
 
-    css::uno::Reference< css::accessibility::XAccessibleHyperlink > SAL_CALL AccessibleEditableTextPara::getHyperLink( ::sal_Int32 nLinkIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    css::uno::Reference< css::accessibility::XAccessibleHyperlink > SAL_CALL AccessibleEditableTextPara::getHyperLink( ::sal_Int32 nLinkIndex )
     {
         css::uno::Reference< css::accessibility::XAccessibleHyperlink > xRef;
 
@@ -2644,7 +2641,7 @@ namespace accessibility
         return xRef;
     }
 
-    ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkIndex( ::sal_Int32 nCharIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL AccessibleEditableTextPara::getHyperLinkIndex( ::sal_Int32 nCharIndex )
     {
         const sal_Int32 nPara = GetParagraphIndex();
         SvxAccessibleTextAdapter& rT = GetTextForwarder();
@@ -2671,7 +2668,7 @@ namespace accessibility
     }
 
     // XAccessibleMultiLineText
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getLineNumberAtIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getLineNumberAtIndex( sal_Int32 nIndex )
     {
 
         sal_Int32 nRes = -1;
@@ -2692,7 +2689,7 @@ namespace accessibility
     }
 
     // XAccessibleMultiLineText
-    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineNumber( sal_Int32 nLineNo ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineNumber( sal_Int32 nLineNo )
     {
 
         css::accessibility::TextSegment aResult;
@@ -2728,7 +2725,7 @@ namespace accessibility
     }
 
     // XAccessibleMultiLineText
-    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineWithCaret(  ) throw (uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtLineWithCaret(  )
     {
 
         css::accessibility::TextSegment aResult;
@@ -2744,7 +2741,7 @@ namespace accessibility
     }
 
     // XAccessibleMultiLineText
-    sal_Int32 SAL_CALL AccessibleEditableTextPara::getNumberOfLineWithCaret(  ) throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleEditableTextPara::getNumberOfLineWithCaret(  )
     {
 
         sal_Int32 nRes = -1;
@@ -2761,19 +2758,19 @@ namespace accessibility
 
 
     // XServiceInfo
-    OUString SAL_CALL AccessibleEditableTextPara::getImplementationName() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleEditableTextPara::getImplementationName()
     {
 
         return OUString("AccessibleEditableTextPara");
     }
 
-    sal_Bool SAL_CALL AccessibleEditableTextPara::supportsService (const OUString& sServiceName) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleEditableTextPara::supportsService (const OUString& sServiceName)
     {
 
         return cppu::supportsService(this, sServiceName);
     }
 
-    uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+    uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames()
     {
         // #105185# Using correct service now
         return { OUString("com.sun.star.text.AccessibleParagraphView") };
diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx
index fd4443ccad76..e6e8138b51eb 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.cxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.cxx
@@ -52,12 +52,12 @@ namespace accessibility
     }
 
     // XAccessibleAction
-    sal_Int32 SAL_CALL AccessibleHyperlink::getAccessibleActionCount() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleHyperlink::getAccessibleActionCount()
     {
          return isValid() ? 1 : 0;
     }
 
-    sal_Bool SAL_CALL AccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex  ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex  )
     {
         bool bRet = false;
         if ( isValid() && ( nIndex == 0 ) )
@@ -68,7 +68,7 @@ namespace accessibility
         return bRet;
     }
 
-    OUString  SAL_CALL AccessibleHyperlink::getAccessibleActionDescription( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    OUString  SAL_CALL AccessibleHyperlink::getAccessibleActionDescription( sal_Int32 nIndex )
     {
         OUString aDesc;
 
@@ -78,7 +78,7 @@ namespace accessibility
         return aDesc;
     }
 
-    uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL AccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL AccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex )
     {
         uno::Reference< css::accessibility::XAccessibleKeyBinding > xKeyBinding;
 
@@ -99,27 +99,27 @@ namespace accessibility
     }
 
     // XAccessibleHyperlink
-    uno::Any SAL_CALL AccessibleHyperlink::getAccessibleActionAnchor( sal_Int32 /*nIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Any SAL_CALL AccessibleHyperlink::getAccessibleActionAnchor( sal_Int32 /*nIndex*/ )
     {
         return uno::Any();
     }
 
-    uno::Any SAL_CALL AccessibleHyperlink::getAccessibleActionObject( sal_Int32 /*nIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Any SAL_CALL AccessibleHyperlink::getAccessibleActionObject( sal_Int32 /*nIndex*/ )
     {
         return uno::Any();
     }
 
-    sal_Int32 SAL_CALL AccessibleHyperlink::getStartIndex() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleHyperlink::getStartIndex()
     {
         return nStartIdx;
     }
 
-    sal_Int32 SAL_CALL AccessibleHyperlink::getEndIndex() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleHyperlink::getEndIndex()
     {
         return nEndIdx;
     }
 
-    sal_Bool SAL_CALL AccessibleHyperlink::isValid(  ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleHyperlink::isValid(  )
     {
         return rTA.IsValid();
     }
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx
index 08201df3fc85..b1561693b365 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -53,17 +53,17 @@ namespace accessibility
         virtual ~AccessibleHyperlink() override;
 
         // XAccessibleAction
-        virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleActionCount() override;
+        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override;
+        virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
         // XAccessibleHyperlink
-        virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getStartIndex() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getEndIndex() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) override;
+        virtual css::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getStartIndex() override;
+        virtual sal_Int32 SAL_CALL getEndIndex() override;
+        virtual sal_Bool SAL_CALL isValid() override;
     };
 
 } // end of namespace accessibility
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 312a6b18ed06..92f82d7ff1e4 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -92,20 +92,20 @@ namespace accessibility
         }
     }
 
-    uno::Reference< XAccessibleContext > SAL_CALL AccessibleImageBullet::getAccessibleContext(  ) throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessibleContext > SAL_CALL AccessibleImageBullet::getAccessibleContext(  )
     {
 
         // We implement the XAccessibleContext interface in the same object
         return uno::Reference< XAccessibleContext > ( this );
     }
 
-    sal_Int32 SAL_CALL  AccessibleImageBullet::getAccessibleChildCount() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL  AccessibleImageBullet::getAccessibleChildCount()
     {
 
         return 0;
     }
 
-    uno::Reference< XAccessible > SAL_CALL  AccessibleImageBullet::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Reference< XAccessible > SAL_CALL  AccessibleImageBullet::getAccessibleChild( sal_Int32 i )
     {
         (void)i;
 
@@ -114,25 +114,25 @@ namespace accessibility
                                               ( static_cast< ::cppu::OWeakObject* > (this) ) ); // static_cast: disambiguate hierarchy
     }
 
-    uno::Reference< XAccessible > SAL_CALL  AccessibleImageBullet::getAccessibleParent() throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessible > SAL_CALL  AccessibleImageBullet::getAccessibleParent()
     {
 
         return mxParent;
     }
 
-    sal_Int32 SAL_CALL  AccessibleImageBullet::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL  AccessibleImageBullet::getAccessibleIndexInParent()
     {
 
         return mnIndexInParent;
     }
 
-    sal_Int16 SAL_CALL  AccessibleImageBullet::getAccessibleRole() throw (uno::RuntimeException, std::exception)
+    sal_Int16 SAL_CALL  AccessibleImageBullet::getAccessibleRole()
     {
 
         return AccessibleRole::GRAPHIC;
     }
 
-    OUString SAL_CALL  AccessibleImageBullet::getAccessibleDescription() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL  AccessibleImageBullet::getAccessibleDescription()
     {
 
         SolarMutexGuard aGuard;
@@ -141,7 +141,7 @@ namespace accessibility
         return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION);
     }
 
-    OUString SAL_CALL  AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL  AccessibleImageBullet::getAccessibleName()
     {
 
         SolarMutexGuard aGuard;
@@ -150,14 +150,14 @@ namespace accessibility
         return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_NAME);
     }
 
-    uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet()
     {
 
         // no relations, therefore empty
         return uno::Reference< XAccessibleRelationSet >();
     }
 
-    uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleImageBullet::getAccessibleStateSet() throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessibleStateSet > SAL_CALL AccessibleImageBullet::getAccessibleStateSet()
     {
 
         SolarMutexGuard aGuard;
@@ -171,7 +171,7 @@ namespace accessibility
         return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet) );
     }
 
-    lang::Locale SAL_CALL AccessibleImageBullet::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
+    lang::Locale SAL_CALL AccessibleImageBullet::getLocale()
     {
 
         SolarMutexGuard aGuard;
@@ -183,14 +183,14 @@ namespace accessibility
         return LanguageTag(GetTextForwarder().GetLanguage( GetParagraphIndex(), 0 )).getLocale();
     }
 
-    void SAL_CALL AccessibleImageBullet::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleImageBullet::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     {
 
         if( getNotifierClientId() != -1 )
             ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
     }
 
-    void SAL_CALL AccessibleImageBullet::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleImageBullet::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     {
 
         if( getNotifierClientId() != -1 )
@@ -209,7 +209,7 @@ namespace accessibility
         }
     }
 
-    sal_Bool SAL_CALL AccessibleImageBullet::containsPoint( const awt::Point& rPoint ) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleImageBullet::containsPoint( const awt::Point& rPoint )
     {
 
         SolarMutexGuard aGuard;
@@ -224,14 +224,14 @@ namespace accessibility
         return aRect.IsInside( aPoint );
     }
 
-    uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleAtPoint( const awt::Point& /*aPoint*/ ) throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleAtPoint( const awt::Point& /*aPoint*/ )
     {
 
         // as we have no children, empty reference
         return uno::Reference< XAccessible >();
     }
 
-    awt::Rectangle SAL_CALL AccessibleImageBullet::getBounds(  ) throw (uno::RuntimeException, std::exception)
+    awt::Rectangle SAL_CALL AccessibleImageBullet::getBounds(  )
     {
 
         SolarMutexGuard aGuard;
@@ -269,7 +269,7 @@ namespace accessibility
         return awt::Rectangle();
     }
 
-    awt::Point SAL_CALL AccessibleImageBullet::getLocation(  ) throw (uno::RuntimeException, std::exception)
+    awt::Point SAL_CALL AccessibleImageBullet::getLocation(  )
     {
 
         SolarMutexGuard aGuard;
@@ -279,7 +279,7 @@ namespace accessibility
         return awt::Point( aRect.X, aRect.Y );
     }
 
-    awt::Point SAL_CALL AccessibleImageBullet::getLocationOnScreen(  ) throw (uno::RuntimeException, std::exception)
+    awt::Point SAL_CALL AccessibleImageBullet::getLocationOnScreen(  )
     {
 
         SolarMutexGuard aGuard;
@@ -305,7 +305,7 @@ namespace accessibility
                                     ( static_cast< XAccessible* > (this) ) );   // disambiguate hierarchy
     }
 
-    awt::Size SAL_CALL AccessibleImageBullet::getSize(  ) throw (uno::RuntimeException, std::exception)
+    awt::Size SAL_CALL AccessibleImageBullet::getSize(  )
     {
 
         SolarMutexGuard aGuard;
@@ -315,7 +315,7 @@ namespace accessibility
         return awt::Size( aRect.Width, aRect.Height );
     }
 
-    void SAL_CALL AccessibleImageBullet::grabFocus(  ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleImageBullet::grabFocus(  )
     {
 
         throw uno::RuntimeException("Not focusable",
@@ -323,7 +323,7 @@ namespace accessibility
                                     ( static_cast< XAccessible* > (this) ) );   // disambiguate hierarchy
     }
 
-    sal_Int32 SAL_CALL AccessibleImageBullet::getForeground(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleImageBullet::getForeground(  )
     {
 
         // #104444# Added to XAccessibleComponent interface
@@ -332,7 +332,7 @@ namespace accessibility
         return static_cast<sal_Int32>(nColor);
     }
 
-    sal_Int32 SAL_CALL AccessibleImageBullet::getBackground(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleImageBullet::getBackground(  )
     {
 
         // #104444# Added to XAccessibleComponent interface
@@ -344,19 +344,19 @@ namespace accessibility
         return static_cast<sal_Int32>( aColor.GetColor() );
     }
 
-    OUString SAL_CALL AccessibleImageBullet::getImplementationName() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleImageBullet::getImplementationName()
     {
 
         return OUString("AccessibleImageBullet");
     }
 
-    sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const OUString& sServiceName) throw (uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const OUString& sServiceName)
     {
 
         return cppu::supportsService(this, sServiceName);
     }
 
-    uno::Sequence< OUString > SAL_CALL AccessibleImageBullet::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+    uno::Sequence< OUString > SAL_CALL AccessibleImageBullet::getSupportedServiceNames()
     {
 
         const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext");
diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx
index 900447fa8df5..b08aac51c420 100644
--- a/editeng/source/accessibility/AccessibleSelectionBase.cxx
+++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx
@@ -39,49 +39,49 @@ namespace accessibility
     }
 
 
-    void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int32 nChildIndex )
     {
         ::osl::MutexGuard aGuard( implGetMutex() );
         OCommonAccessibleSelection::selectAccessibleChild( nChildIndex );
     }
 
 
-    sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int32 nChildIndex )
     {
         ::osl::MutexGuard aGuard( implGetMutex() );
         return( OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ) );
     }
 
 
-    void SAL_CALL AccessibleSelectionBase::clearAccessibleSelection(  ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleSelectionBase::clearAccessibleSelection(  )
     {
         ::osl::MutexGuard aGuard( implGetMutex() );
         OCommonAccessibleSelection::clearAccessibleSelection();
     }
 
 
-    void SAL_CALL AccessibleSelectionBase::selectAllAccessibleChildren(  ) throw (uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleSelectionBase::selectAllAccessibleChildren(  )
     {
         ::osl::MutexGuard aGuard( implGetMutex() );
         OCommonAccessibleSelection::selectAllAccessibleChildren();
     }
 
 
-    sal_Int32 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount(  ) throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount(  )
     {
         ::osl::MutexGuard aGuard( implGetMutex() );
         return( OCommonAccessibleSelection::getSelectedAccessibleChildCount() );
     }
 
 
-    uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         ::osl::MutexGuard aGuard( implGetMutex() );
         return( OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ) );
     }
 
 
-    void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
     {
         ::osl::MutexGuard aGuard( implGetMutex() );
         OCommonAccessibleSelection::deselectAccessibleChild( nSelectedChildIndex );
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index c4804cf11f2a..3b5226d97115 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -476,26 +476,26 @@ namespace accessibility
     }
 
     // XAccessibleContext
-    sal_Int32 SAL_CALL AccessibleStaticTextBase::getAccessibleChildCount() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleStaticTextBase::getAccessibleChildCount()
     {
         // no children at all
         return 0;
     }
 
-    uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleChild( sal_Int32 /*i*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleChild( sal_Int32 /*i*/ )
     {
         // no children at all
         return uno::Reference< XAccessible >();
     }
 
-    uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleAtPoint( const awt::Point& /*_aPoint*/ ) throw (uno::RuntimeException, std::exception)
+    uno::Reference< XAccessible > SAL_CALL AccessibleStaticTextBase::getAccessibleAtPoint( const awt::Point& /*_aPoint*/ )
     {
         // no children at all
         return uno::Reference< XAccessible >();
     }
 
     // XAccessibleText
-    sal_Int32 SAL_CALL AccessibleStaticTextBase::getCaretPosition() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleStaticTextBase::getCaretPosition()
     {
         SolarMutexGuard aGuard;
 
@@ -509,12 +509,12 @@ namespace accessibility
         return nPos;
     }
 
-    sal_Bool SAL_CALL AccessibleStaticTextBase::setCaretPosition( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleStaticTextBase::setCaretPosition( sal_Int32 nIndex )
     {
         return setSelection(nIndex, nIndex);
     }
 
-    sal_Unicode SAL_CALL AccessibleStaticTextBase::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Unicode SAL_CALL AccessibleStaticTextBase::getCharacter( sal_Int32 nIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -523,7 +523,7 @@ namespace accessibility
         return mpImpl->GetParagraph( aPos.nPara ).getCharacter( aPos.nIndex );
     }
 
-    uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes )
     {
         SolarMutexGuard aGuard;
 
@@ -535,7 +535,7 @@ namespace accessibility
         return mpImpl->GetParagraph( aPos.nPara ).getCharacterAttributes( aPos.nIndex, aRequestedAttributes );
     }
 
-    awt::Rectangle SAL_CALL AccessibleStaticTextBase::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    awt::Rectangle SAL_CALL AccessibleStaticTextBase::getCharacterBounds( sal_Int32 nIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -553,7 +553,7 @@ namespace accessibility
         return aBounds;
     }
 
-    sal_Int32 SAL_CALL AccessibleStaticTextBase::getCharacterCount() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleStaticTextBase::getCharacterCount()
     {
         SolarMutexGuard aGuard;
 
@@ -565,7 +565,7 @@ namespace accessibility
         return nCount;
     }
 
-    sal_Int32 SAL_CALL AccessibleStaticTextBase::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleStaticTextBase::getIndexAtPoint( const awt::Point& rPoint )
     {
         SolarMutexGuard aGuard;
 
@@ -592,7 +592,7 @@ namespace accessibility
         return -1;
     }
 
-    OUString SAL_CALL AccessibleStaticTextBase::getSelectedText() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleStaticTextBase::getSelectedText()
     {
         SolarMutexGuard aGuard;
 
@@ -606,7 +606,7 @@ namespace accessibility
         return getTextRange( nStart, nEnd );
     }
 
-    sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionStart() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionStart()
     {
         SolarMutexGuard aGuard;
 
@@ -620,7 +620,7 @@ namespace accessibility
         return nPos;
     }
 
-    sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionEnd() throw (uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL AccessibleStaticTextBase::getSelectionEnd()
     {
         SolarMutexGuard aGuard;
 
@@ -634,7 +634,7 @@ namespace accessibility
         return nPos;
     }
 
-    sal_Bool SAL_CALL AccessibleStaticTextBase::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleStaticTextBase::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -645,7 +645,7 @@ namespace accessibility
                                      aEndIndex.nPara, aEndIndex.nIndex );
     }
 
-    OUString SAL_CALL AccessibleStaticTextBase::getText() throw (uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleStaticTextBase::getText()
     {
         SolarMutexGuard aGuard;
 
@@ -657,7 +657,7 @@ namespace accessibility
         return aRes;
     }
 
-    OUString SAL_CALL AccessibleStaticTextBase::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    OUString SAL_CALL AccessibleStaticTextBase::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -740,7 +740,7 @@ namespace accessibility
         return aRes;
     }
 
-    css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aGuard;
 
@@ -791,7 +791,7 @@ namespace accessibility
         return aResult;
     }
 
-    css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aGuard;
 
@@ -837,7 +837,7 @@ namespace accessibility
         return aResult;
     }
 
-    css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+    css::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
     {
         SolarMutexGuard aGuard;
 
@@ -878,7 +878,7 @@ namespace accessibility
         return aResult;
     }
 
-    sal_Bool SAL_CALL AccessibleStaticTextBase::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL AccessibleStaticTextBase::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
     {
         SolarMutexGuard aGuard;
 
@@ -893,7 +893,7 @@ namespace accessibility
     }
 
     // XAccessibleTextAttributes
-    uno::Sequence< beans::PropertyValue > AccessibleStaticTextBase::getDefaultAttributes( const uno::Sequence< OUString >& RequestedAttributes ) throw (uno::RuntimeException, std::exception)
+    uno::Sequence< beans::PropertyValue > AccessibleStaticTextBase::getDefaultAttributes( const uno::Sequence< OUString >& RequestedAttributes )
     {
         // get the intersection of the default attributes of all paragraphs
 
@@ -931,7 +931,7 @@ namespace accessibility
         return comphelper::containerToSequence(aDefAttrVec);
     }
 
-    uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& RequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+    uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getRunAttributes( sal_Int32 nIndex, const uno::Sequence< OUString >& RequestedAttributes )
     {
         // get those default attributes of the paragraph, which are not part
         // of the intersection of all paragraphs and add them to the run attributes
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index c72354e3bb16..e9a123afb5bd 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -41,14 +41,14 @@ EditDataObject::~EditDataObject()
 }
 
 // uno::XInterface
-uno::Any EditDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any EditDataObject::queryInterface( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
 // datatransfer::XTransferable
-uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception)
+uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor )
 {
     uno::Any aAny;
 
@@ -82,7 +82,7 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
     return aAny;
 }
 
-uno::Sequence< datatransfer::DataFlavor > EditDataObject::getTransferDataFlavors(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< datatransfer::DataFlavor > EditDataObject::getTransferDataFlavors(  )
 {
     uno::Sequence< datatransfer::DataFlavor > aDataFlavors(4);
     SotExchange::GetFormatDataFlavor( SotClipboardFormatId::EDITENGINE, aDataFlavors.getArray()[0] );
@@ -93,7 +93,7 @@ uno::Sequence< datatransfer::DataFlavor > EditDataObject::getTransferDataFlavors
     return aDataFlavors;
 }
 
-sal_Bool EditDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException, std::exception)
+sal_Bool EditDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor )
 {
     bool bSupported = false;
 
diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index 59bc1e9c77de..643ef453e34a 100644
--- a/editeng/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
@@ -47,14 +47,14 @@ public:
 
 
     // css::uno::XInterface
-    css::uno::Any                               SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                               SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::datatransfer::XTransferable
-    css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
+    css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) override;
+    sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 };
 
 #endif // INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 3d271bf3f666..27c28a3beb1f 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1721,8 +1721,6 @@ void ImpEditView::ShowDDCursor( const Rectangle& rRect )
 }
 
 void ImpEditView::dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& rDGE)
-     throw (css::uno::RuntimeException,
-            std::exception)
 {
     DBG_ASSERT( !pDragAndDropInfo, "dragGestureRecognized - DragAndDropInfo exist!" );
 
@@ -1805,8 +1803,6 @@ void ImpEditView::dragGestureRecognized(const css::datatransfer::dnd::DragGestur
 }
 
 void ImpEditView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE )
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aVclGuard;
 
@@ -1900,8 +1896,6 @@ void ImpEditView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent
 }
 
 void ImpEditView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE )
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aVclGuard;
 
@@ -1974,7 +1968,7 @@ void ImpEditView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE
     }
 }
 
-void ImpEditView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (css::uno::RuntimeException, std::exception)
+void ImpEditView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE )
 {
     SolarMutexGuard aVclGuard;
 
@@ -2001,7 +1995,7 @@ void ImpEditView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEv
     dragOver( rDTDEE );
 }
 
-void ImpEditView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception)
+void ImpEditView::dragExit( const css::datatransfer::dnd::DropTargetEvent& )
 {
     SolarMutexGuard aVclGuard;
 
@@ -2015,8 +2009,6 @@ void ImpEditView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) thr
 }
 
 void ImpEditView::dragOver(const css::datatransfer::dnd::DropTargetDragEvent& rDTDE)
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aVclGuard;
 
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 74a55ce39032..35121b5898c2 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -261,20 +261,12 @@ private:
 protected:
 
     // DragAndDropClient
-    void dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& dge)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    void drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) override;
-    void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) override;
-    void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    void dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& dge) override;
+    void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) override;
+    void drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde) override;
+    void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override;
+    void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) override;
+    void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde) override;
 
     void ShowDDCursor( const Rectangle& rRect );
     void HideDDCursor();
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index 9d061416c9c3..d9f52b236e90 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -60,7 +60,6 @@ SvXMLWordListContext::SvXMLWordListContext(
 
 css::uno::Reference<XFastContextHandler> SAL_CALL SvXMLWordListContext::createFastChildContext(
     sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception)
 {
     if ( Element == SvXMLAutoCorrectToken::BLOCK )
         return new SvXMLWordContext (rLocalRef, Element, xAttrList);
@@ -139,7 +138,6 @@ SvXMLExceptionListContext::SvXMLExceptionListContext(
 
 css::uno::Reference<xml::sax::XFastContextHandler> SAL_CALL SvXMLExceptionListContext::createFastChildContext(
     sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-    throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception)
 {
     if ( Element == SvXMLAutoCorrectToken::BLOCK )
         return new SvXMLExceptionContext (rLocalRef, Element, xAttrList);
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index c27219f70b7b..043fe7c048f9 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -56,8 +56,7 @@ public:
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
 
     virtual ~SvXMLWordListContext() override;
 };
@@ -101,8 +100,7 @@ public:
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
 
     virtual ~SvXMLExceptionListContext() override;
 };
diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
index caafb84fd495..e097f6621086 100644
--- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
@@ -35,13 +35,11 @@ SvXMLAutoCorrectTokenHandler::~SvXMLAutoCorrectTokenHandler()
 }
 
 sal_Int32 SAL_CALL SvXMLAutoCorrectTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& Identifier )
-     throw (css::uno::RuntimeException, std::exception)
 {
     return getTokenDirect( reinterpret_cast< const char* >( Identifier.getConstArray() ), Identifier.getLength() );
 }
 
 Sequence< sal_Int8 > SAL_CALL SvXMLAutoCorrectTokenHandler::getUTF8Identifier( sal_Int32 )
-     throw (css::uno::RuntimeException, std::exception)
 {
     return Sequence< sal_Int8 >();
 }
diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
index 9913a0dd9294..a6d858119ae0 100644
--- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
@@ -39,10 +39,8 @@ public:
     virtual ~SvXMLAutoCorrectTokenHandler() override;
 
     //XFastTokenHandler
-    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) override;
 
     // Much faster direct C++ shortcut to the method that matters
     virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override;
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index c0a446b4b8fb..f0eeb4e8aa25 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -87,20 +87,16 @@ public:
 
     // XSupportedLocales
     virtual css::uno::Sequence< css::lang::Locale > SAL_CALL
-        getLocales()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getLocales() override;
     virtual sal_Bool SAL_CALL
-        hasLocale( const css::lang::Locale& rLocale )
-            throw(css::uno::RuntimeException, std::exception) override;
+        hasLocale( const css::lang::Locale& rLocale ) override;
 
     // XThesaurus
     virtual css::uno::Sequence<
             css::uno::Reference< css::linguistic2::XMeaning > > SAL_CALL
         queryMeanings( const OUString& rTerm,
                 const css::lang::Locale& rLocale,
-                const css::beans::PropertyValues& rProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& rProperties ) override;
 };
 
 
@@ -141,7 +137,6 @@ void ThesDummy_Impl::GetThes_Impl()
 
 uno::Sequence< lang::Locale > SAL_CALL
         ThesDummy_Impl::getLocales()
-            throw(uno::RuntimeException, std::exception)
 {
     GetThes_Impl();
     if (xThes.is())
@@ -154,7 +149,6 @@ uno::Sequence< lang::Locale > SAL_CALL
 
 sal_Bool SAL_CALL
         ThesDummy_Impl::hasLocale( const lang::Locale& rLocale )
-            throw(uno::RuntimeException, std::exception)
 {
     GetThes_Impl();
     if (xThes.is())
@@ -180,8 +174,6 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
                 const OUString& rTerm,
                 const lang::Locale& rLocale,
                 const beans::PropertyValues& rProperties )
-            throw(lang::IllegalArgumentException,
-                  uno::RuntimeException, std::exception)
 {
     GetThes_Impl();
     uno::Sequence< uno::Reference< linguistic2::XMeaning > > aRes;
@@ -206,23 +198,17 @@ public:
 
     // XSupportedLanguages (for XSpellChecker1)
     virtual css::uno::Sequence< sal_Int16 > SAL_CALL
-        getLanguages()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getLanguages() override;
     virtual sal_Bool SAL_CALL
-        hasLanguage( sal_Int16 nLanguage )
-            throw(css::uno::RuntimeException, std::exception) override;
+        hasLanguage( sal_Int16 nLanguage ) override;
 
     // XSpellChecker1 (same as XSpellChecker but sal_Int16 for language)
     virtual sal_Bool SAL_CALL
         isValid( const OUString& rWord, sal_Int16 nLanguage,
-                const css::beans::PropertyValues& rProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& rProperties ) override;
     virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL
         spell( const OUString& rWord, sal_Int16 nLanguage,
-                const css::beans::PropertyValues& rProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& rProperties ) override;
 };
 
 
@@ -238,7 +224,6 @@ void SpellDummy_Impl::GetSpell_Impl()
 
 uno::Sequence< sal_Int16 > SAL_CALL
     SpellDummy_Impl::getLanguages()
-        throw(uno::RuntimeException, std::exception)
 {
     GetSpell_Impl();
     if (xSpell.is())
@@ -250,7 +235,6 @@ uno::Sequence< sal_Int16 > SAL_CALL
 
 sal_Bool SAL_CALL
     SpellDummy_Impl::hasLanguage( sal_Int16 nLanguage )
-        throw(uno::RuntimeException, std::exception)
 {
     GetSpell_Impl();
     bool bRes = false;
@@ -263,8 +247,6 @@ sal_Bool SAL_CALL
 sal_Bool SAL_CALL
     SpellDummy_Impl::isValid( const OUString& rWord, sal_Int16 nLanguage,
             const beans::PropertyValues& rProperties )
-        throw(lang::IllegalArgumentException,
-              uno::RuntimeException, std::exception)
 {
     GetSpell_Impl();
     bool bRes = true;
@@ -277,8 +259,6 @@ sal_Bool SAL_CALL
 uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL
     SpellDummy_Impl::spell( const OUString& rWord, sal_Int16 nLanguage,
             const beans::PropertyValues& rProperties )
-        throw(lang::IllegalArgumentException,
-              uno::RuntimeException, std::exception)
 {
     GetSpell_Impl();
     uno::Reference< linguistic2::XSpellAlternatives > xRes;
@@ -303,11 +283,9 @@ public:
     // XSupportedLocales
     virtual css::uno::Sequence<
             css::lang::Locale > SAL_CALL
-        getLocales()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getLocales() override;
     virtual sal_Bool SAL_CALL
-        hasLocale( const css::lang::Locale& rLocale )
-            throw(css::uno::RuntimeException, std::exception) override;
+        hasLocale( const css::lang::Locale& rLocale ) override;
 
     // XHyphenator
     virtual css::uno::Reference<
@@ -315,25 +293,19 @@ public:
         hyphenate( const OUString& rWord,
                 const css::lang::Locale& rLocale,
                 sal_Int16 nMaxLeading,
-                const css::beans::PropertyValues& rProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& rProperties ) override;
     virtual css::uno::Reference<
             css::linguistic2::XHyphenatedWord > SAL_CALL
         queryAlternativeSpelling( const OUString& rWord,
                 const css::lang::Locale& rLocale,
                 sal_Int16 nIndex,
-                const css::beans::PropertyValues& rProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& rProperties ) override;
     virtual css::uno::Reference<
             css::linguistic2::XPossibleHyphens > SAL_CALL
         createPossibleHyphens(
                 const OUString& rWord,
                 const css::lang::Locale& rLocale,
-                const css::beans::PropertyValues& rProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& rProperties ) override;
 };
 
 
@@ -349,7 +321,6 @@ void HyphDummy_Impl::GetHyph_Impl()
 
 uno::Sequence< lang::Locale > SAL_CALL
     HyphDummy_Impl::getLocales()
-        throw(uno::RuntimeException, std::exception)
 {
     GetHyph_Impl();
     if (xHyph.is())
@@ -361,7 +332,6 @@ uno::Sequence< lang::Locale > SAL_CALL
 
 sal_Bool SAL_CALL
     HyphDummy_Impl::hasLocale( const lang::Locale& rLocale )
-        throw(uno::RuntimeException, std::exception)
 {
     GetHyph_Impl();
     bool bRes = false;
@@ -377,8 +347,6 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL
             const lang::Locale& rLocale,
             sal_Int16 nMaxLeading,
             const beans::PropertyValues& rProperties )
-        throw(lang::IllegalArgumentException,
-              uno::RuntimeException, std::exception)
 {
     GetHyph_Impl();
     uno::Reference< linguistic2::XHyphenatedWord > xRes;
@@ -394,8 +362,6 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL
             const lang::Locale& rLocale,
             sal_Int16 nIndex,
             const PropertyValues& rProperties )
-        throw(lang::IllegalArgumentException,
-              uno::RuntimeException, std::exception)
 {
     GetHyph_Impl();
     uno::Reference< linguistic2::XHyphenatedWord > xRes;
@@ -410,8 +376,6 @@ uno::Reference< linguistic2::XPossibleHyphens > SAL_CALL
             const OUString& rWord,
             const lang::Locale& rLocale,
             const beans::PropertyValues& rProperties )
-        throw(lang::IllegalArgumentException,
-              uno::RuntimeException, std::exception)
 {
     GetHyph_Impl();
     uno::Reference< linguistic2::XPossibleHyphens > xRes;
@@ -431,8 +395,7 @@ public:
     virtual ~LinguMgrExitLstnr() override;
 
     // lang::XEventListener
-    virtual void    SAL_CALL disposing(const EventObject& rSource)
-            throw( RuntimeException, std::exception ) override;
+    virtual void    SAL_CALL disposing(const EventObject& rSource) override;
 };
 
 LinguMgrExitLstnr::LinguMgrExitLstnr()
@@ -456,7 +419,6 @@ LinguMgrExitLstnr::~LinguMgrExitLstnr()
 }
 
 void LinguMgrExitLstnr::disposing(const EventObject& rSource)
-        throw( RuntimeException, std::exception )
 {
     if (xDesktop.is()  &&  rSource.Source == xDesktop)
     {
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 31d30d5471fa..779603096655 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -44,7 +44,6 @@ void SvxUnoForbiddenCharsTable::onChange()
 }
 
 ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const lang::Locale& rLocale )
-    throw(NoSuchElementException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -60,7 +59,6 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const lan
 }
 
 sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const lang::Locale& rLocale )
-    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -74,7 +72,6 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const lang::Locale&
 }
 
 void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const lang::Locale& rLocale, const ForbiddenCharacters& rForbiddenCharacters )
-    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -88,7 +85,6 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const lang::Locale& rLoca
 }
 
 void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const lang::Locale& rLocale )
-    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -103,7 +99,6 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const lang::Locale& r
 
 // XSupportedLocales
 Sequence< lang::Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
-    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -126,7 +121,6 @@ Sequence< lang::Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
 }
 
 sal_Bool SAL_CALL SvxUnoForbiddenCharsTable::hasLocale( const lang::Locale& aLocale )
-    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 5a0dddd48186..b6d6b626dec4 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -228,7 +228,7 @@ const css::uno::Sequence< sal_Int8 > & SvxUnoTextField::getUnoTunnelId() throw()
     return theSvxUnoTextFieldUnoTunnelId::get().getSeq();
 }
 
-sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(),
                                                          rId.getConstArray(), 16 ) )
@@ -516,7 +516,6 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
 
 // uno::XInterface
 uno::Any SAL_CALL SvxUnoTextField::queryAggregation( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
 
@@ -534,7 +533,6 @@ uno::Any SAL_CALL SvxUnoTextField::queryAggregation( const uno::Type & rType )
 // XTypeProvider
 
 uno::Sequence< uno::Type > SAL_CALL SvxUnoTextField::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     if( maTypeSequence.getLength() == 0 )
     {
@@ -553,13 +551,11 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextField::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextField::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 uno::Any SAL_CALL SvxUnoTextField::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     return OComponentHelper::queryInterface(rType);
 }
@@ -576,7 +572,6 @@ void SAL_CALL SvxUnoTextField::release() throw( )
 
 // Interface text::XTextField
 OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (bShowCommand)
@@ -625,7 +620,6 @@ OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand )
 
 // Interface text::XTextContent
 void SAL_CALL SvxUnoTextField::attach( const uno::Reference< text::XTextRange >& xTextRange )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xTextRange );
     if(pRange == nullptr)
@@ -639,26 +633,22 @@ void SAL_CALL SvxUnoTextField::attach( const uno::Reference< text::XTextRange >&
 }
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextField::getAnchor()
-    throw(uno::RuntimeException, std::exception)
 {
     return mxAnchor;
 }
 
 // lang::XComponent
 void SAL_CALL SvxUnoTextField::dispose()
-    throw(uno::RuntimeException, std::exception)
 {
     OComponentHelper::dispose();
 }
 
 void SAL_CALL SvxUnoTextField::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw(uno::RuntimeException, std::exception)
 {
     OComponentHelper::addEventListener(xListener);
 }
 
 void SAL_CALL SvxUnoTextField::removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
-    throw(uno::RuntimeException, std::exception)
 {
     OComponentHelper::removeEventListener(aListener);
 }
@@ -666,14 +656,12 @@ void SAL_CALL SvxUnoTextField::removeEventListener( const uno::Reference< lang::
 
 // Interface beans::XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL SvxUnoTextField::getPropertySetInfo(  )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return mpPropSet->getPropertySetInfo();
 }
 
 void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -730,7 +718,6 @@ void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName,
 }
 
 uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -777,10 +764,10 @@ uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyNam
     return aValue;
 }
 
-void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
+void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) {}
+void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) {}
+void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) {}
+void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) {}
 
 // OComponentHelper
 void SvxUnoTextField::disposing()
@@ -789,13 +776,12 @@ void SvxUnoTextField::disposing()
 }
 
 // lang::XServiceInfo
-OUString SAL_CALL SvxUnoTextField::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SvxUnoTextField::getImplementationName()
 {
     return OUString("SvxUnoTextField");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence<OUString> aSeq(4);
     OUString* pServices = aSeq.getArray();
@@ -871,12 +857,12 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
     return aSeq;
 }
 
-sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException)
+uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier )
 {
     uno::Reference< uno::XInterface > xRet;
 
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 1970f5fb2c39..0c779fb2965b 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -93,7 +93,6 @@ SvxUnoNumberingRules::~SvxUnoNumberingRules() throw()
 
 //XIndexReplace
 void SAL_CALL SvxUnoNumberingRules::replaceByIndex( sal_Int32 Index, const uno::Any& Element )
-    throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -108,7 +107,7 @@ void SAL_CALL SvxUnoNumberingRules::replaceByIndex( sal_Int32 Index, const uno::
 }
 
 // XIndexAccess
-sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -116,7 +115,6 @@ sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() throw( RuntimeException, std
 }
 
 Any SAL_CALL SvxUnoNumberingRules::getByIndex( sal_Int32 Index )
-    throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -128,39 +126,38 @@ Any SAL_CALL SvxUnoNumberingRules::getByIndex( sal_Int32 Index )
 
 //XElementAccess
 Type SAL_CALL SvxUnoNumberingRules::getElementType()
-    throw( RuntimeException, std::exception )
 {
     return cppu::UnoType<Sequence< beans::PropertyValue >>::get();
 }
 
-sal_Bool SAL_CALL SvxUnoNumberingRules::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxUnoNumberingRules::hasElements()
 {
     return true;
 }
 
 // XAnyCompare
-sal_Int16 SAL_CALL SvxUnoNumberingRules::compare( const Any& rAny1, const Any& rAny2 ) throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvxUnoNumberingRules::compare( const Any& rAny1, const Any& rAny2 )
 {
     return SvxUnoNumberingRules::Compare( rAny1, rAny2 );
 }
 
 // XCloneable
-Reference< XCloneable > SAL_CALL SvxUnoNumberingRules::createClone(  ) throw (RuntimeException, std::exception)
+Reference< XCloneable > SAL_CALL SvxUnoNumberingRules::createClone(  )
 {
     return new SvxUnoNumberingRules(maRule);
 }
 
-OUString SAL_CALL SvxUnoNumberingRules::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL SvxUnoNumberingRules::getImplementationName(  )
 {
     return OUString( "SvxUnoNumberingRules" );
 }
 
-sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames(  )
 {
     OUString aService( "com.sun.star.text.NumberingRules" );
     Sequence< OUString > aSeq( &aService, 1 );
@@ -168,7 +165,6 @@ Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames(  )
 }
 
 Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal_Int32 nIndex) const
-    throw (RuntimeException, std::exception)
 {
     //  NumberingRule aRule;
     const SvxNumberFormat& rFmt = maRule.GetLevel((sal_uInt16) nIndex);
@@ -266,7 +262,6 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal
 }
 
 void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::PropertyValue >& rProperties, sal_Int32 nIndex)
-    throw (RuntimeException, IllegalArgumentException, std::exception)
 {
     SvxNumberFormat aFmt(maRule.GetLevel( (sal_uInt16)nIndex ));
     const beans::PropertyValue* pPropArray = rProperties.getConstArray();
@@ -466,7 +461,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert
     maRule.SetLevel( (sal_uInt16)nIndex, aFmt );
 }
 
-const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule ) throw( IllegalArgumentException )
+const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule )
 {
     SvxUnoNumberingRules* pRule = SvxUnoNumberingRules::getImplementation( xRule );
     if( pRule == nullptr )
@@ -492,10 +487,10 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( const Svx
 class SvxUnoNumberingRulesCompare : public ::cppu::WeakAggImplHelper1< XAnyCompare >
 {
 public:
-    virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) override;
 };
 
-sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 )
 {
     return SvxUnoNumberingRules::Compare( Any1, Any2 );
 }
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index bae44d0a982c..a26ddd2123a2 100644
--- a/editeng/source/uno/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -41,14 +41,13 @@ SvxAccessibleTextPropertySet::~SvxAccessibleTextPropertySet() throw()
 {
 }
 
-uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText() throw (uno::RuntimeException, std::exception)
+uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText()
 {
   // TODO (empty?)
   return uno::Reference< text::XText > ();
 }
 
 uno::Any SAL_CALL SvxAccessibleTextPropertySet::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     return OWeakObject::queryInterface(rType);
 }
@@ -66,7 +65,7 @@ void SAL_CALL SvxAccessibleTextPropertySet::release()
 }
 
 // XTypeProvider
-uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() throw ( uno::RuntimeException, std::exception )
+uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes()
 {
     static ::cppu::OTypeCollection* pTypeCollection = nullptr ;
 
@@ -95,18 +94,17 @@ uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() thr
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxAccessibleTextPropertySet::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo
-OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName()
 {
     return OUString("SvxAccessibleTextPropertySet");
 }
 
-sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const OUString& sServiceName) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const OUString& sServiceName)
 {
     return cppu::supportsService(this, sServiceName);
 }
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index d5d809eb1b8e..f3fe061c6f75 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -307,7 +307,6 @@ void SvxUnoTextRangeBase::SetSelection( const ESelection& rSelection ) throw()
 // Interface XTextRange ( XText )
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -336,7 +335,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart()
 }
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -364,7 +362,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd()
 }
 
 OUString SAL_CALL SvxUnoTextRangeBase::getString()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -382,7 +379,6 @@ OUString SAL_CALL SvxUnoTextRangeBase::getString()
 }
 
 void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString)
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -409,13 +405,11 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString)
 
 // Interface beans::XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL SvxUnoTextRangeBase::getPropertySetInfo()
-    throw( uno::RuntimeException, std::exception )
 {
     return mpPropSet->getPropertySetInfo();
 }
 
 void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName, const uno::Any& aValue)
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     if (PropertyName == UNO_TR_PROP_SELECTION)
     {
@@ -429,7 +423,6 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName
 }
 
 void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const uno::Any& aValue, sal_Int32 nPara )
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -488,7 +481,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyNa
     throw beans::UnknownPropertyException();
 }
 
-void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw( beans::UnknownPropertyException, lang::IllegalArgumentException )
+void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet )
 {
     if(!SetPropertyValueHelper( rOldSet, pMap, rValue, rNewSet, &rSelection, GetEditSource() ))
     {
@@ -588,7 +581,6 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxIt
 }
 
 uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& PropertyName)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     if (PropertyName == UNO_TR_PROP_SELECTION)
     {
@@ -605,7 +597,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& Property
 }
 
 uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sal_Int32 nPara )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -637,7 +628,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert
 }
 
 void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, uno::Any& rAny, const SfxItemSet& rSet )
-    throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     switch( pMap->nWID )
     {
@@ -683,7 +673,6 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM
 }
 
 bool SvxUnoTextRangeBase::GetPropertyValueHelper(  SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ )
-    throw( uno::RuntimeException )
 {
     switch( pMap->nWID )
     {
@@ -758,18 +747,18 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper(  SfxItemSet& rSet, const SfxIt
 }
 
 // is not (yet) supported
-void SAL_CALL SvxUnoTextRangeBase::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SvxUnoTextRangeBase::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
+void SAL_CALL SvxUnoTextRangeBase::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {}
+void SAL_CALL SvxUnoTextRangeBase::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {}
+void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {}
+void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {}
 
 // XMultiPropertySet
-void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues )
 {
     _setPropertyValues( aPropertyNames, aValues );
 }
 
-void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara )
 {
     SolarMutexGuard aGuard;
 
@@ -888,12 +877,12 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt
     }
 }
 
-uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames )
 {
     return _getPropertyValues( aPropertyNames );
 }
 
-uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) throw (uno::RuntimeException)
+uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara )
 {
     SolarMutexGuard aGuard;
 
@@ -932,21 +921,20 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( cons
     return aValues;
 }
 
-void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& )
 {
 }
 
-void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& )
 {
 }
 
-void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& )
 {
 }
 
 // beans::XPropertyState
 beans::PropertyState SAL_CALL SvxUnoTextRangeBase::getPropertyState( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     return _getPropertyState( PropertyName );
 }
@@ -956,7 +944,6 @@ static const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE
                                                   EE_CHAR_WLM, 0 };
 
 beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara)
-    throw( beans::UnknownPropertyException, uno::RuntimeException )
 {
     if ( pMap )
     {
@@ -1048,7 +1035,6 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt
 }
 
 beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUString& PropertyName, sal_Int32 nPara /* = -1 */)
-    throw( beans::UnknownPropertyException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -1056,13 +1042,11 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUStr
 }
 
 uno::Sequence< beans::PropertyState > SAL_CALL SvxUnoTextRangeBase::getPropertyStates( const uno::Sequence< OUString >& aPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     return _getPropertyStates( aPropertyName );
 }
 
 uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(const uno::Sequence< OUString >& PropertyName, sal_Int32 nPara /* = -1 */)
-    throw( beans::UnknownPropertyException, uno::RuntimeException )
 {
     const sal_Int32 nCount = PropertyName.getLength();
     const OUString* pNames = PropertyName.getConstArray();
@@ -1193,13 +1177,11 @@ bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const Sf
 }
 
 void SAL_CALL SvxUnoTextRangeBase::setPropertyToDefault( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     _setPropertyToDefault( PropertyName );
 }
 
 void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sal_Int32 nPara /* = -1 */)
-    throw( beans::UnknownPropertyException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -1220,7 +1202,6 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sa
 }
 
 void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara )
-    throw( beans::UnknownPropertyException, uno::RuntimeException )
 {
     do
     {
@@ -1262,7 +1243,6 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co
 }
 
 uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1309,7 +1289,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp
 
 // beans::XMultiPropertyStates
 void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1327,7 +1306,7 @@ void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault()
     }
 }
 
-void SAL_CALL SvxUnoTextRangeBase::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoTextRangeBase::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames )
 {
     sal_Int32 nCount = aPropertyNames.getLength();
     for( const OUString* pName = aPropertyNames.getConstArray(); nCount; pName++, nCount-- )
@@ -1336,7 +1315,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertiesToDefault( const uno::Sequence<
     }
 }
 
-uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames )
 {
     sal_Int32 nCount = aPropertyNames.getLength();
     uno::Sequence< uno::Any > ret( nCount );
@@ -1483,13 +1462,11 @@ void SvxUnoTextRangeBase::GotoEnd(bool Expand) throw()
 
 // lang::XServiceInfo
 sal_Bool SAL_CALL SvxUnoTextRangeBase::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
@@ -1504,7 +1481,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames
 }
 
 // XTextRangeCompare
-sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 )
 {
     SvxUnoTextRangeBase* pR1 = SvxUnoTextRangeBase::getImplementation( xR1 );
     SvxUnoTextRangeBase* pR2 = SvxUnoTextRangeBase::getImplementation( xR2 );
@@ -1528,7 +1505,7 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Referenc
     }
 }
 
-sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 )
 {
     SvxUnoTextRangeBase* pR1 = SvxUnoTextRangeBase::getImplementation( xR1 );
     SvxUnoTextRangeBase* pR2 = SvxUnoTextRangeBase::getImplementation( xR2 );
@@ -1564,7 +1541,6 @@ SvxUnoTextRange::~SvxUnoTextRange() throw()
 }
 
 uno::Any SAL_CALL SvxUnoTextRange::queryAggregation( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     QUERYINT( text::XTextRange );
     else if( rType == cppu::UnoType<beans::XMultiPropertyStates>::get())
@@ -1583,7 +1559,6 @@ uno::Any SAL_CALL SvxUnoTextRange::queryAggregation( const uno::Type & rType )
 }
 
 uno::Any SAL_CALL SvxUnoTextRange::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     return OWeakAggObject::queryInterface(rType);
 }
@@ -1630,27 +1605,23 @@ namespace
 }
 
 uno::Sequence< uno::Type > SAL_CALL SvxUnoTextRange::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     return theSvxUnoTextRangeTypes::get();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextRange::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XTextRange
 uno::Reference< text::XText > SAL_CALL SvxUnoTextRange::getText()
-    throw(uno::RuntimeException, std::exception)
 {
     return xParentText;
 }
 
 // lang::XServiceInfo
 OUString SAL_CALL SvxUnoTextRange::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SvxUnoTextRange");
 }
@@ -1690,7 +1661,6 @@ SvxUnoTextBase::~SvxUnoTextBase() throw()
 
 // XInterface
 uno::Any SAL_CALL SvxUnoTextBase::queryAggregation( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     QUERYINT( text::XText );
     QUERYINT( text::XSimpleText );
@@ -1751,13 +1721,11 @@ namespace
 }
 
 uno::Sequence< uno::Type > SAL_CALL SvxUnoTextBase::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     return theSvxUnoTextBaseTypes::get();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextBase::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1773,14 +1741,12 @@ uno::Reference< text::XTextCursor > SvxUnoTextBase::createTextCursorBySelection(
 // XSimpleText
 
 uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursor()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new SvxUnoTextCursor( *this );
 }
 
 uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursorByRange( const uno::Reference< text::XTextRange >& aTextPosition )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1797,7 +1763,6 @@ uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursorByR
 }
 
 void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1829,7 +1794,6 @@ void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRan
 }
 
 void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1917,7 +1881,6 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
 
 // XText
 void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTextRange >& xRange, const uno::Reference< text::XTextContent >& xContent, sal_Bool bAbsorb )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1953,14 +1916,13 @@ void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTe
     xPropSet->setPropertyValue(UNO_TR_PROP_SELECTION, uno::makeAny(aSel));
 }
 
-void SAL_CALL SvxUnoTextBase::removeTextContent( const uno::Reference< text::XTextContent >& ) throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoTextBase::removeTextContent( const uno::Reference< text::XTextContent >& )
 {
 }
 
 // XTextRange
 
 uno::Reference< text::XText > SAL_CALL SvxUnoTextBase::getText()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1975,23 +1937,21 @@ uno::Reference< text::XText > SAL_CALL SvxUnoTextBase::getText()
 }
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::getStart()
-    throw(uno::RuntimeException, std::exception)
 {
     return SvxUnoTextRangeBase::getStart();
 }
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::getEnd()
-    throw(uno::RuntimeException, std::exception)
 {
     return SvxUnoTextRangeBase::getEnd();
 }
 
-OUString SAL_CALL SvxUnoTextBase::getString() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoTextBase::getString()
 {
     return SvxUnoTextRangeBase::getString();
 }
 
-void SAL_CALL SvxUnoTextBase::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoTextBase::setString( const OUString& aString )
 {
     SvxUnoTextRangeBase::setString(aString);
 }
@@ -1999,7 +1959,6 @@ void SAL_CALL SvxUnoTextBase::setString( const OUString& aString ) throw(uno::Ru
 
 // XEnumerationAccess
 uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextBase::createEnumeration()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2012,12 +1971,12 @@ uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextBase::createEnumera
 }
 
 // XElementAccess ( container::XEnumerationAccess )
-uno::Type SAL_CALL SvxUnoTextBase::getElementType(  ) throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SvxUnoTextBase::getElementType(  )
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SAL_CALL SvxUnoTextBase::hasElements(  ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxUnoTextBase::hasElements(  )
 {
     SolarMutexGuard aGuard;
 
@@ -2033,7 +1992,6 @@ sal_Bool SAL_CALL SvxUnoTextBase::hasElements(  ) throw(uno::RuntimeException, s
 
 // text::XTextRangeMover
 void SAL_CALL SvxUnoTextBase::moveTextRange( const uno::Reference< text::XTextRange >&, sal_Int16 )
-    throw(uno::RuntimeException, std::exception)
 {
 }
 
@@ -2046,7 +2004,6 @@ void SvxPropertyValuesToItemSet(
         const SfxItemPropertySet *pPropSet,
         SvxTextForwarder *pForwarder /*needed for WID_NUMLEVEL*/,
         sal_Int32 nPara /*needed for WID_NUMLEVEL*/)
-    throw(lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     sal_Int32 nProps = rPropertyVaules.getLength();
     const beans::PropertyValue *pProps = rPropertyVaules.getConstArray();
@@ -2116,7 +2073,6 @@ void SvxPropertyValuesToItemSet(
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraphInsert(
         const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/,
         const uno::Reference< text::XTextRange >& /*rTextRange*/ )
-    throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     uno::Reference< text::XTextRange > xRet;
     return xRet;
@@ -2124,7 +2080,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraphInser
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph(
         const uno::Sequence< beans::PropertyValue >& rCharAndParaProps )
-    throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2156,7 +2111,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion(
         const OUString& /*rText*/,
         const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/,
         const uno::Reference< text::XTextRange>& /*rTextRange*/ )
-    throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     uno::Reference< text::XTextRange > xRet;
     return xRet;
@@ -2166,7 +2120,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion(
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
         const OUString& rText,
         const uno::Sequence< beans::PropertyValue >& rCharAndParaProps )
-    throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2203,7 +2156,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
 }
 
 void SvxUnoTextBase::copyText(
-    const uno::Reference< text::XTextCopy >& xSource ) throw ( uno::RuntimeException, std::exception )
+    const uno::Reference< text::XTextCopy >& xSource )
 {
     SolarMutexGuard aGuard;
     uno::Reference< lang::XUnoTunnel > xUT( xSource, uno::UNO_QUERY );
@@ -2235,13 +2188,11 @@ void SvxUnoTextBase::copyText(
 
 // lang::XServiceInfo
 OUString SAL_CALL SvxUnoTextBase::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SvxUnoTextBase");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames(  )
-    throw(uno::RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
@@ -2272,7 +2223,7 @@ SvxUnoTextBase* SvxUnoTextBase::getImplementation( const uno::Reference< uno::XI
         return nullptr;
 }
 
-sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(),
                                                          rId.getConstArray(), 16 ) )
@@ -2306,7 +2257,7 @@ SvxUnoText::~SvxUnoText() throw()
 }
 
 // uno::XInterface
-uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType )
 {
     uno::Any aAny( SvxUnoTextBase::queryAggregation( rType ) );
     if( !aAny.hasValue() )
@@ -2315,7 +2266,7 @@ uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType ) throw(
     return aAny;
 }
 
-uno::Any SAL_CALL SvxUnoText::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL SvxUnoText::queryInterface( const uno::Type & rType )
 {
     return OWeakAggObject::queryInterface( rType );
 }
@@ -2331,12 +2282,12 @@ void SAL_CALL SvxUnoText::release() throw( )
 }
 
 // lang::XTypeProvider
-uno::Sequence< uno::Type > SAL_CALL SvxUnoText::getTypes(  ) throw( uno::RuntimeException, std::exception )
+uno::Sequence< uno::Type > SAL_CALL SvxUnoText::getTypes(  )
 {
     return SvxUnoTextBase::getTypes();
 }
 
-uno::Sequence< sal_Int8 > SAL_CALL SvxUnoText::getImplementationId(  ) throw( uno::RuntimeException, std::exception )
+uno::Sequence< sal_Int8 > SAL_CALL SvxUnoText::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -2351,7 +2302,7 @@ const uno::Sequence< sal_Int8 > & SvxUnoText::getUnoTunnelId() throw()
     return theSvxUnoTextUnoTunnelId::get().getSeq();
 }
 
-sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(),
                                                          rId.getConstArray(), 16 ) )
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index e56443a1bea2..f1809e8dc25a 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -55,7 +55,6 @@ SvxUnoTextContentEnumeration::~SvxUnoTextContentEnumeration() throw()
 
 // container::XEnumeration
 sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if( mpEditSource && mpEditSource->GetTextForwarder() )
@@ -64,7 +63,7 @@ sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements()
         return false;
 }
 
-uno::Any SvxUnoTextContentEnumeration::nextElement() throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+uno::Any SvxUnoTextContentEnumeration::nextElement()
 {
     SolarMutexGuard aGuard;
 
@@ -127,7 +126,7 @@ SvxUnoTextContent::~SvxUnoTextContent() throw()
 }
 
 // uno::XInterface
-uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType )
 {
     QUERYINT( text::XTextRange );
     else QUERYINT( beans::XMultiPropertyStates );
@@ -146,7 +145,7 @@ uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType )
         return OWeakAggObject::queryAggregation( rType );
 }
 
-uno::Any SAL_CALL SvxUnoTextContent::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL SvxUnoTextContent::queryInterface( const uno::Type & rType )
 {
     return OWeakAggObject::queryInterface(rType);
 }
@@ -193,13 +192,11 @@ namespace
 }
 
 uno::Sequence< uno::Type > SAL_CALL SvxUnoTextContent::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     return theSvxUnoTextContentTypes::get();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextContent::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -207,18 +204,16 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextContent::getImplementationId()
 // text::XTextRange
 
 uno::Reference< text::XText > SAL_CALL SvxUnoTextContent::getText()
-    throw(uno::RuntimeException, std::exception)
 {
     return mxParentText;
 }
 
 // text::XTextContent
 void SAL_CALL SvxUnoTextContent::attach( const uno::Reference< text::XTextRange >& )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
 }
 
-uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor()
 {
     return uno::Reference< text::XTextRange >::query( mxParentText );
 }
@@ -226,7 +221,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw
 // XComponent
 
 void SAL_CALL SvxUnoTextContent::dispose()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -244,13 +238,11 @@ void SAL_CALL SvxUnoTextContent::dispose()
 }
 
 void SAL_CALL SvxUnoTextContent::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw(uno::RuntimeException, std::exception)
 {
     maDisposeListeners.addInterface(xListener);
 }
 
 void SAL_CALL SvxUnoTextContent::removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
-    throw(uno::RuntimeException, std::exception)
 {
    maDisposeListeners.removeInterface(aListener);
 }
@@ -258,7 +250,6 @@ void SAL_CALL SvxUnoTextContent::removeEventListener( const uno::Reference< lang
 // XEnumerationAccess
 
 uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextContent::createEnumeration(  )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -268,13 +259,11 @@ uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextContent::createEnum
 // XElementAccess ( container::XEnumerationAccess )
 
 uno::Type SAL_CALL SvxUnoTextContent::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
 sal_Bool SAL_CALL SvxUnoTextContent::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -294,24 +283,22 @@ sal_Bool SAL_CALL SvxUnoTextContent::hasElements()
 // XPropertySet
 
 void SAL_CALL SvxUnoTextContent::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     _setPropertyValue( aPropertyName, aValue, mnParagraph );
 }
 
 uno::Any SAL_CALL SvxUnoTextContent::getPropertyValue( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     return _getPropertyValue( PropertyName, mnParagraph );
 }
 
 // XMultiPropertySet
-void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues )
 {
     _setPropertyValues( aPropertyNames, aValues, mnParagraph );
 }
 
-uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames )
 {
     return _getPropertyValues( aPropertyNames, mnParagraph );
 }
@@ -335,19 +322,16 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SvxUnoTextConte
 
 // beans::XPropertyState
 beans::PropertyState SAL_CALL SvxUnoTextContent::getPropertyState( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     return _getPropertyState( PropertyName, mnParagraph );
 }
 
 uno::Sequence< beans::PropertyState > SAL_CALL SvxUnoTextContent::getPropertyStates( const uno::Sequence< OUString >& aPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     return _getPropertyStates( aPropertyName, mnParagraph );
 }
 
 void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     _setPropertyToDefault( PropertyName, mnParagraph );
 }
@@ -355,13 +339,11 @@ void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyN
 // lang::XServiceInfo
 
 OUString SAL_CALL SvxUnoTextContent::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SvxUnoTextContent");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() );
     comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.style.ParagraphProperties",
@@ -404,7 +386,6 @@ SvxUnoTextRangeEnumeration::~SvxUnoTextRangeEnumeration() throw()
 // container::XEnumeration
 
 sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -412,7 +393,6 @@ sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements()
 }
 
 uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement()
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -475,7 +455,6 @@ SvxUnoTextCursor::~SvxUnoTextCursor() throw()
 // Please use the XTypeProvider!
 //sal_Bool SvxUnoTextCursor::queryInterface( uno::Uik aUIK, Reference< uno::XInterface > & xRef)
 uno::Any SAL_CALL SvxUnoTextCursor::queryAggregation( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rType == cppu::UnoType<text::XTextRange>::get())
         return uno::makeAny(uno::Reference< text::XTextRange >(static_cast<SvxUnoTextRangeBase *>(this)));
@@ -493,7 +472,6 @@ uno::Any SAL_CALL SvxUnoTextCursor::queryAggregation( const uno::Type & rType )
 }
 
 uno::Any SAL_CALL SvxUnoTextCursor::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     return OWeakAggObject::queryInterface(rType);
 }
@@ -538,69 +516,59 @@ namespace
 
 // XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL SvxUnoTextCursor::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     return theSvxUnoTextCursorTypes::get();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextCursor::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // text::XTextCursor
 void SAL_CALL SvxUnoTextCursor::collapseToStart()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     CollapseToStart();
 }
 
 void SAL_CALL SvxUnoTextCursor::collapseToEnd()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     CollapseToEnd();
 }
 
 sal_Bool SAL_CALL SvxUnoTextCursor::isCollapsed()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return IsCollapsed();
 }
 
 sal_Bool SAL_CALL SvxUnoTextCursor::goLeft( sal_Int16 nCount, sal_Bool bExpand )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return GoLeft( nCount, bExpand );
 }
 
 sal_Bool SAL_CALL SvxUnoTextCursor::goRight( sal_Int16 nCount, sal_Bool bExpand )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return GoRight( nCount, bExpand );
 }
 
 void SAL_CALL SvxUnoTextCursor::gotoStart( sal_Bool bExpand )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GotoStart( bExpand );
 }
 
 void SAL_CALL SvxUnoTextCursor::gotoEnd( sal_Bool bExpand )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GotoEnd( bExpand );
 }
 
 void SAL_CALL SvxUnoTextCursor::gotoRange( const uno::Reference< text::XTextRange >& xRange, sal_Bool bExpand )
-    throw(uno::RuntimeException, std::exception)
 {
     if( !xRange.is() )
         return;
@@ -623,44 +591,42 @@ void SAL_CALL SvxUnoTextCursor::gotoRange( const uno::Reference< text::XTextRang
 }
 
 // text::XTextRange (rest in SvxTextRange)
-uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText()
 {
     return mxParentText;
 }
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextCursor::getStart()
-    throw(uno::RuntimeException, std::exception)
 {
     return SvxUnoTextRangeBase::getStart();
 }
 
 uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextCursor::getEnd()
-    throw(uno::RuntimeException, std::exception)
 {
     return SvxUnoTextRangeBase::getEnd();
 }
 
-OUString SAL_CALL SvxUnoTextCursor::getString() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoTextCursor::getString()
 {
     return SvxUnoTextRangeBase::getString();
 }
 
-void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString )
 {
     SvxUnoTextRangeBase::setString(aString);
 }
 // lang::XServiceInfo
-OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SvxUnoTextCursor::getImplementationName()
 {
     return OUString("SvxUnoTextCursor");
 }
 
-sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() );
     comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.style.ParagraphProperties",
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 710f0accd6c6..dfdba2f8c8a0 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -131,33 +131,33 @@ public:
     SvxSimpleUnoModel();
 
     // XMultiServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
 
     // XStyleFamiliesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(  ) override;
 
     // XAnyCompareFactory
-    virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) override;
 
     // XModel
-    virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getURL(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL lockControllers(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unlockControllers(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override;
+    virtual OUString SAL_CALL getURL(  ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) override;
+    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) override;
+    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) override;
+    virtual void SAL_CALL lockControllers(  ) override;
+    virtual void SAL_CALL unlockControllers(  ) override;
+    virtual sal_Bool SAL_CALL hasControllersLocked(  ) override;
+    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) override;
+    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 };
 
@@ -167,7 +167,6 @@ SvxSimpleUnoModel::SvxSimpleUnoModel()
 
 // XMultiServiceFactory ( SvxFmMSFactory )
 uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( const OUString& aServiceSpecifier )
-    throw(uno::Exception, uno::RuntimeException, std::exception)
 {
     if( aServiceSpecifier == "com.sun.star.text.NumberingRules" )
     {
@@ -185,12 +184,12 @@ uno::Reference< uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstance( co
 
 }
 
-uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& )
 {
     return createInstance( ServiceSpecifier );
 }
 
-Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames(  )
 {
     Sequence< OUString > aSeq;
     return aSeq;
@@ -198,7 +197,6 @@ Sequence< OUString > SAL_CALL SvxSimpleUnoModel::getAvailableServiceNames(  ) th
 
 // XAnyCompareFactory
 uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxSimpleUnoModel::createAnyCompareByName( const OUString& PropertyName )
-    throw(uno::RuntimeException, std::exception)
 {
     (void)PropertyName;
     return SvxCreateNumRuleCompare();
@@ -206,64 +204,63 @@ uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxSimpleUnoModel::createAnyCom
 
 // XStyleFamiliesSupplier
 uno::Reference< container::XNameAccess > SAL_CALL SvxSimpleUnoModel::getStyleFamilies(  )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Reference< container::XNameAccess > xStyles;
     return xStyles;
 }
 
 // XModel
-sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxSimpleUnoModel::attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
 {
     (void)aURL;
     (void)aArgs;
     return false;
 }
 
-OUString SAL_CALL SvxSimpleUnoModel::getURL(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL SvxSimpleUnoModel::getURL(  )
 {
     OUString aStr;
     return aStr;
 }
 
-css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SvxSimpleUnoModel::getArgs(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SvxSimpleUnoModel::getArgs(  )
 {
     Sequence< beans::PropertyValue > aSeq;
     return aSeq;
 }
 
-void SAL_CALL SvxSimpleUnoModel::connectController( const css::uno::Reference< css::frame::XController >& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxSimpleUnoModel::connectController( const css::uno::Reference< css::frame::XController >& )
 {
 }
 
-void SAL_CALL SvxSimpleUnoModel::disconnectController( const css::uno::Reference< css::frame::XController >& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxSimpleUnoModel::disconnectController( const css::uno::Reference< css::frame::XController >& )
 {
 }
 
-void SAL_CALL SvxSimpleUnoModel::lockControllers(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxSimpleUnoModel::lockControllers(  )
 {
 }
 
-void SAL_CALL SvxSimpleUnoModel::unlockControllers(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxSimpleUnoModel::unlockControllers(  )
 {
 }
 
-sal_Bool SAL_CALL SvxSimpleUnoModel::hasControllersLocked(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxSimpleUnoModel::hasControllersLocked(  )
 {
     return true;
 }
 
-css::uno::Reference< css::frame::XController > SAL_CALL SvxSimpleUnoModel::getCurrentController(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::frame::XController > SAL_CALL SvxSimpleUnoModel::getCurrentController(  )
 {
     uno::Reference< frame::XController > xRet;
     return xRet;
 }
 
-void SAL_CALL SvxSimpleUnoModel::setCurrentController( const css::uno::Reference< css::frame::XController >& ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxSimpleUnoModel::setCurrentController( const css::uno::Reference< css::frame::XController >& )
 {
 }
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::getCurrentSelection(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::getCurrentSelection(  )
 {
     uno::Reference< XInterface > xRet;
     return xRet;
@@ -271,15 +268,15 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL SvxSimpleUnoModel::getCurre
 
 
 // XComponent
-void SAL_CALL SvxSimpleUnoModel::dispose(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxSimpleUnoModel::dispose(  )
 {
 }
 
-void SAL_CALL SvxSimpleUnoModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxSimpleUnoModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& )
 {
 }
 
-void SAL_CALL SvxSimpleUnoModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxSimpleUnoModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& )
 {
 }
 
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 881a75b09dd0..8184d88ec9dc 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -417,10 +417,6 @@ uno::Sequence< sal_Int32 > const & OCommonEmbeddedObject::GetIntermediateStatesS
 
 
 void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
-        throw ( embed::UnreachableStateException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     {
         ::osl::ResettableMutexGuard aGuard( m_aMutex );
@@ -487,8 +483,6 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
 
 
 uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
@@ -502,8 +496,6 @@ uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates()
 
 
 sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
@@ -517,11 +509,6 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState()
 
 
 void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                embed::UnreachableStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
         //TODO: a gross hack to avoid deadlocks when this is called from the
@@ -564,8 +551,6 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID )
 
 
 uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSupportedVerbs()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
@@ -580,8 +565,6 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSuppor
 
 void SAL_CALL OCommonEmbeddedObject::setClientSite(
                 const uno::Reference< embed::XEmbeddedClient >& xClient )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -600,8 +583,6 @@ void SAL_CALL OCommonEmbeddedObject::setClientSite(
 
 
 uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClientSite()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
@@ -615,9 +596,6 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClie
 
 
 void SAL_CALL OCommonEmbeddedObject::update()
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -632,8 +610,6 @@ void SAL_CALL OCommonEmbeddedObject::update()
 
 
 void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -651,8 +627,6 @@ void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode )
 
 
 sal_Int64 SAL_CALL OCommonEmbeddedObject::getStatus( sal_Int64 )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
@@ -662,7 +636,6 @@ sal_Int64 SAL_CALL OCommonEmbeddedObject::getStatus( sal_Int64 )
 
 
 void SAL_CALL OCommonEmbeddedObject::setContainerName( const OUString& sName )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -671,12 +644,12 @@ void SAL_CALL OCommonEmbeddedObject::setContainerName( const OUString& sName )
     m_aContainerName = sName;
 }
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL OCommonEmbeddedObject::getParent() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::uno::XInterface > SAL_CALL OCommonEmbeddedObject::getParent()
 {
     return m_xParent;
 }
 
-void SAL_CALL OCommonEmbeddedObject::setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OCommonEmbeddedObject::setParent( const css::uno::Reference< css::uno::XInterface >& xParent )
 {
     m_xParent = xParent;
     if ( m_nObjectState != -1 && m_nObjectState != embed::EmbedStates::LOADED )
@@ -688,7 +661,7 @@ void SAL_CALL OCommonEmbeddedObject::setParent( const css::uno::Reference< css::
 }
 
 // XDefaultSizeTransmitter
-void SAL_CALL OCommonEmbeddedObject::setDefaultSize( const css::awt::Size& rSize_100TH_MM ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL OCommonEmbeddedObject::setDefaultSize( const css::awt::Size& rSize_100TH_MM )
 {
     //#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method
     m_aDefaultSizeForChart_In_100TH_MM = rSize_100TH_MM;
diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx
index 1b618553806c..42135a5cc0d4 100644
--- a/embeddedobj/source/commonembedding/inplaceobj.cxx
+++ b/embeddedobj/source/commonembedding/inplaceobj.cxx
@@ -36,9 +36,6 @@ bool RectanglesEqual( const awt::Rectangle& aRect1, const awt::Rectangle& aRect2
 
 void SAL_CALL OCommonEmbeddedObject::setObjectRectangles( const awt::Rectangle& aPosRect,
                                                            const awt::Rectangle& aClipRect )
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -62,17 +59,12 @@ void SAL_CALL OCommonEmbeddedObject::setObjectRectangles( const awt::Rectangle&
 }
 
 void SAL_CALL OCommonEmbeddedObject::enableModeless( sal_Bool /*bEnable*/ )
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // TODO: notify model that it can not use modal dialogs
 }
 
 void SAL_CALL OCommonEmbeddedObject::translateAccelerators(
                     const uno::Sequence< awt::KeyEvent >& /*aKeys*/ )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // TODO: UI activation related
 }
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index eb29ac43eff4..865ebd89cf23 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -350,7 +350,6 @@ void OCommonEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
 
 
 uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Any aReturn;
 
@@ -403,7 +402,6 @@ void SAL_CALL OCommonEmbeddedObject::release()
 
 
 uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID()
-        throw ( uno::RuntimeException, std::exception )
 {
     if ( m_bDisposed )
         throw lang::DisposedException();
@@ -412,7 +410,6 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID()
 }
 
 OUString SAL_CALL OCommonEmbeddedObject::getClassName()
-        throw ( uno::RuntimeException, std::exception )
 {
     if ( m_bDisposed )
         throw lang::DisposedException();
@@ -422,8 +419,6 @@ OUString SAL_CALL OCommonEmbeddedObject::getClassName()
 
 void SAL_CALL OCommonEmbeddedObject::setClassInfo(
                 const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ )
-        throw ( lang::NoSupportException,
-                uno::RuntimeException, std::exception )
 {
     // the object class info can not be changed explicitly
     throw lang::NoSupportException(); //TODO:
@@ -431,7 +426,6 @@ void SAL_CALL OCommonEmbeddedObject::setClassInfo(
 
 
 uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent()
-        throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( m_bDisposed )
@@ -450,7 +444,6 @@ uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent(
 
 
 void SAL_CALL OCommonEmbeddedObject::addStateChangeListener( const uno::Reference< embed::XStateChangeListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( m_bDisposed )
@@ -466,7 +459,6 @@ void SAL_CALL OCommonEmbeddedObject::addStateChangeListener( const uno::Referenc
 
 void SAL_CALL OCommonEmbeddedObject::removeStateChangeListener(
                     const uno::Reference< embed::XStateChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pInterfaceContainer )
@@ -476,8 +468,6 @@ void SAL_CALL OCommonEmbeddedObject::removeStateChangeListener(
 
 
 void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
-    throw ( util::CloseVetoException,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( m_bClosed )
@@ -579,7 +569,6 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
 
 
 void SAL_CALL OCommonEmbeddedObject::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( m_bDisposed )
@@ -593,7 +582,6 @@ void SAL_CALL OCommonEmbeddedObject::addCloseListener( const uno::Reference< uti
 
 
 void SAL_CALL OCommonEmbeddedObject::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pInterfaceContainer )
@@ -603,7 +591,6 @@ void SAL_CALL OCommonEmbeddedObject::removeCloseListener( const uno::Reference<
 
 
 void SAL_CALL OCommonEmbeddedObject::addEventListener( const uno::Reference< document::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( m_bDisposed )
@@ -617,7 +604,6 @@ void SAL_CALL OCommonEmbeddedObject::addEventListener( const uno::Reference< doc
 
 
 void SAL_CALL OCommonEmbeddedObject::removeEventListener( const uno::Reference< document::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( m_pInterfaceContainer )
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index d7dfd4ebe925..a711988631a2 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -928,11 +928,6 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
                     sal_Int32 nEntryConnectionMode,
                     const uno::Sequence< beans::PropertyValue >& lArguments,
                     const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // the type of the object must be already set
     // a kind of typedetection should be done in the factory
@@ -1154,11 +1149,6 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& lArguments,
                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1285,11 +1275,6 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& lArguments,
                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // TODO: use lObjArgs
 
@@ -1429,9 +1414,6 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
 
 
 void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1510,8 +1492,6 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
 
 
 sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1530,8 +1510,6 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry()
 
 
 OUString SAL_CALL OCommonEmbeddedObject::getEntryName()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1554,10 +1532,6 @@ OUString SAL_CALL OCommonEmbeddedObject::getEntryName()
 
 
 void SAL_CALL OCommonEmbeddedObject::storeOwn()
-        throw ( embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // during switching from Activated to Running and from Running to Loaded states the object will
     // ask container to store the object, the container has to make decision
@@ -1650,8 +1624,6 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
 
 
 sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1676,11 +1648,6 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly()
 void SAL_CALL OCommonEmbeddedObject::reload(
                 const uno::Sequence< beans::PropertyValue >& lArguments,
                 const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // TODO: use lObjArgs
     // for now this method is used only to switch readonly state
@@ -1796,7 +1763,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
     }
 }
 
-sal_Bool SAL_CALL OCommonEmbeddedObject::isStored() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OCommonEmbeddedObject::isStored()
 {
     uno::Reference<container::XNameAccess> xNA(m_xObjectStorage, uno::UNO_QUERY);
     if (!xNA.is())
@@ -1808,11 +1775,6 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isStored() throw (css::uno::RuntimeExce
 
 void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XStorage >& xStorage,
                                                 const OUString& sEntName )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1898,8 +1860,6 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
 
 
 sal_Bool SAL_CALL  OCommonEmbeddedObject::isLink()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1910,9 +1870,6 @@ sal_Bool SAL_CALL  OCommonEmbeddedObject::isLink()
 
 
 OUString SAL_CALL OCommonEmbeddedObject::getLinkURL()
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index 5de49e704d53..5f0e18e0b365 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -53,7 +53,6 @@ OSpecialEmbeddedObject::OSpecialEmbeddedObject( const uno::Reference< uno::XComp
 
 
 uno::Any SAL_CALL OSpecialEmbeddedObject::queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Any aReturn;
 
@@ -74,10 +73,6 @@ uno::Any SAL_CALL OSpecialEmbeddedObject::queryInterface( const uno::Type& rType
 
 
 embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 nAspect )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -100,10 +95,6 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR
 }
 
 void SAL_CALL OSpecialEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt::Size& aSize )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -119,10 +110,6 @@ void SAL_CALL OSpecialEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, cons
 }
 
 awt::Size SAL_CALL OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -142,8 +129,6 @@ awt::Size SAL_CALL OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect
 }
 
 sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect )
-        throw ( uno::Exception,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -159,10 +144,6 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect )
 }
 
 void SAL_CALL OSpecialEmbeddedObject::changeState( sal_Int32 nNewState )
-        throw ( css::embed::UnreachableStateException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception )
 {
     if ( nNewState == embed::EmbedStates::UI_ACTIVE )
         nNewState = embed::EmbedStates::INPLACE_ACTIVE;
@@ -170,11 +151,6 @@ void SAL_CALL OSpecialEmbeddedObject::changeState( sal_Int32 nNewState )
 }
 
 void SAL_CALL OSpecialEmbeddedObject::doVerb( sal_Int32 nVerbID )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                embed::UnreachableStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index 98ebda348dd3..8c7217d30256 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
@@ -30,10 +30,6 @@
 using namespace ::com::sun::star;
 
 void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt::Size& aSize )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -70,10 +66,6 @@ void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
 }
 
 awt::Size SAL_CALL OCommonEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -110,8 +102,6 @@ awt::Size SAL_CALL OCommonEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
 }
 
 sal_Int32 SAL_CALL OCommonEmbeddedObject::getMapUnit( sal_Int64 nAspect )
-        throw ( uno::Exception,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -151,10 +141,6 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getMapUnit( sal_Int64 nAspect )
 }
 
 embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 nAspect )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index 35738523bd66..8f09dcd42776 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -60,11 +60,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
                                                                     const OUString& sEntName,
                                                                     const uno::Sequence< beans::PropertyValue >& aMediaDescr,
                                                                     const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            container::NoSuchElementException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     if ( !xStorage.is() )
         throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -153,10 +148,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
         const OUString& sEntName,
         const uno::Sequence< beans::PropertyValue >& aMediaDescr,
         const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     if ( !xStorage.is() )
         throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -214,10 +205,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
                                             const uno::Reference< embed::XStorage >& xStorage,
                                             const OUString& sEntName,
                                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface > xResult;
 
@@ -263,10 +250,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
             sal_Int32 nEntryConnectionMode,
             const uno::Sequence< beans::PropertyValue >& lArguments,
             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     // the initialization is completely controlled by user
     if ( !xStorage.is() )
@@ -319,10 +302,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
                                             const OUString& /*sEntName*/,
                                             const uno::Sequence< beans::PropertyValue >& aMediaDescr,
                                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     uno::Reference< uno::XInterface > xResult;
 
@@ -371,11 +350,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
                                                 const OUString& sEntName,
                                                 const uno::Sequence< beans::PropertyValue >& lArguments,
                                                 const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException,
-                std::exception )
 {
     uno::Reference< uno::XInterface > xResult;
 
@@ -428,19 +402,16 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
 }
 
 OUString SAL_CALL OOoEmbeddedObjectFactory::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetImplementationName();
 }
 
 sal_Bool SAL_CALL OOoEmbeddedObjectFactory::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetSupportedServiceNames();
 }
@@ -472,10 +443,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::crea
             sal_Int32 /*nEntryConnectionMode*/,
             const uno::Sequence< beans::PropertyValue >& /*lArguments*/,
             const uno::Sequence< beans::PropertyValue >& /*lObjArgs*/ )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     uno::Sequence< beans::NamedValue > aObject = m_aConfigHelper.GetObjectPropsByClassID( aClassID );
     if ( !aObject.getLength() )
@@ -490,19 +457,16 @@ uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::crea
 }
 
 OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetImplementationName();
 }
 
 sal_Bool SAL_CALL OOoSpecialEmbeddedObjectFactory::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetSupportedServiceNames();
 }
diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx
index dc925ffaf24b..bfcfe2740ccf 100644
--- a/embeddedobj/source/commonembedding/xfactory.hxx
+++ b/embeddedobj/source/commonembedding/xfactory.hxx
@@ -55,23 +55,23 @@ public:
 
 
     // XEmbedObjectCreator
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XEmbedObjectFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XLinkCreator
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XLinkFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLinkUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -101,12 +101,12 @@ public:
             const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
     // XEmbedObjectFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 506ec44b6a4b..d06a690c437a 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -568,7 +568,6 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
 void DocumentHolder::FindConnectPoints(
         const uno::Reference< container::XIndexAccess >& xMenu,
         sal_Int32 nConnectPoints[2] )
-    throw ( uno::Exception )
 {
     nConnectPoints[0] = -1;
     nConnectPoints[1] = -1;
@@ -601,7 +600,6 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace(
         const OUString& aContModuleName,
         const uno::Reference< container::XIndexAccess >& xOwnMenu,
         const uno::Reference< frame::XDispatchProvider >& xOwnDisp )
-    throw ( uno::Exception )
 {
     // TODO/LATER: use dispatch providers on merge
 
@@ -1096,7 +1094,6 @@ awt::Rectangle DocumentHolder::AddBorderToArea( const awt::Rectangle& aRect )
 
 
 void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource )
-        throw (uno::RuntimeException, std::exception)
 {
     if ( m_xComponent.is() && m_xComponent == aSource.Source )
     {
@@ -1118,7 +1115,6 @@ void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource )
 
 
 void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource, sal_Bool /*bGetsOwnership*/ )
-        throw (util::CloseVetoException, uno::RuntimeException, std::exception)
 {
     if ( m_xComponent.is() && m_xComponent == aSource.Source && !m_bAllowClosing )
         throw util::CloseVetoException("To close an embedded document, close the document holder (document definition), not the document itself.", static_cast< ::cppu::OWeakObject*>(this));
@@ -1126,7 +1122,6 @@ void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource, sa
 
 
 void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
-        throw (uno::RuntimeException, std::exception)
 {
     if ( m_xComponent.is() && m_xComponent == aSource.Source )
     {
@@ -1148,7 +1143,6 @@ void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
 
 
 void SAL_CALL DocumentHolder::queryTermination( const lang::EventObject& )
-        throw (frame::TerminationVetoException, uno::RuntimeException, std::exception)
 {
     if ( m_bWaitForClose )
         throw frame::TerminationVetoException();
@@ -1156,7 +1150,6 @@ void SAL_CALL DocumentHolder::queryTermination( const lang::EventObject& )
 
 
 void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource )
-        throw (uno::RuntimeException, std::exception)
 {
     OSL_ENSURE( !m_xComponent.is(), "Just a disaster..." );
 
@@ -1168,7 +1161,6 @@ void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSourc
 
 
 void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent )
-    throw ( uno::RuntimeException, std::exception )
 {
     // if the component does not support document::XEventBroadcaster
     // the modify notifications are used as workaround, but only for running state
@@ -1178,7 +1170,6 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent )
 
 
 void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event )
-    throw ( uno::RuntimeException, std::exception )
 {
     if( m_pEmbedObj && Event.Source == m_xComponent )
     {
@@ -1195,7 +1186,6 @@ void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event )
 
 void SAL_CALL DocumentHolder::borderWidthsChanged( const uno::Reference< uno::XInterface >& aObject,
                                                     const frame::BorderWidths& aNewSize )
-    throw ( uno::RuntimeException, std::exception )
 {
     // TODO: may require mutex introduction ???
     if ( m_pEmbedObj && m_xFrame.is() && aObject == m_xFrame->getController() )
@@ -1214,7 +1204,6 @@ void SAL_CALL DocumentHolder::borderWidthsChanged( const uno::Reference< uno::XI
 
 
 void SAL_CALL DocumentHolder::requestPositioning( const awt::Rectangle& aRect )
-    throw (uno::RuntimeException, std::exception)
 {
     // TODO: may require mutex introduction ???
     if ( m_pEmbedObj )
@@ -1228,7 +1217,6 @@ void SAL_CALL DocumentHolder::requestPositioning( const awt::Rectangle& aRect )
 
 
 awt::Rectangle SAL_CALL DocumentHolder::calcAdjustedRectangle( const awt::Rectangle& aRect )
-    throw (uno::RuntimeException, std::exception)
 {
     // Solar mutex should be locked already since this is a call from HatchWindow with focus
     awt::Rectangle aResult( aRect );
@@ -1254,7 +1242,7 @@ awt::Rectangle SAL_CALL DocumentHolder::calcAdjustedRectangle( const awt::Rectan
     return aResult;
 }
 
-void SAL_CALL DocumentHolder::activated(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL DocumentHolder::activated(  )
 {
     if ( (m_pEmbedObj->getStatus(embed::Aspects::MSOLE_CONTENT)&embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE) ||
         svt::EmbeddedObjectRef::IsGLChart(m_pEmbedObj) )
@@ -1292,7 +1280,7 @@ void DocumentHolder::ResizeHatchWindow()
     xHatchWindow->setHatchBorderSize( awt::Size( HATCH_BORDER_WIDTH, HATCH_BORDER_WIDTH ) );
 }
 
-void SAL_CALL DocumentHolder::deactivated(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL DocumentHolder::deactivated(  )
 {
     // deactivation is too unspecific to be useful; usually we only trigger code from activation
     // so UIDeactivation is actively triggered by the container
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 8566ebbdca45..c48f62f49adc 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -96,10 +96,6 @@ ODummyEmbeddedObject::~ODummyEmbeddedObject()
 
 
 void SAL_CALL ODummyEmbeddedObject::changeState( sal_Int32 nNewState )
-        throw ( embed::UnreachableStateException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -112,8 +108,6 @@ void SAL_CALL ODummyEmbeddedObject::changeState( sal_Int32 nNewState )
 
 
 uno::Sequence< sal_Int32 > SAL_CALL ODummyEmbeddedObject::getReachableStates()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -126,8 +120,6 @@ uno::Sequence< sal_Int32 > SAL_CALL ODummyEmbeddedObject::getReachableStates()
 
 
 sal_Int32 SAL_CALL ODummyEmbeddedObject::getCurrentState()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -137,11 +129,6 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getCurrentState()
 
 
 void SAL_CALL ODummyEmbeddedObject::doVerb( sal_Int32 )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                embed::UnreachableStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -151,8 +138,6 @@ void SAL_CALL ODummyEmbeddedObject::doVerb( sal_Int32 )
 
 
 uno::Sequence< embed::VerbDescriptor > SAL_CALL ODummyEmbeddedObject::getSupportedVerbs()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -163,8 +148,6 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL ODummyEmbeddedObject::getSupport
 
 void SAL_CALL ODummyEmbeddedObject::setClientSite(
                 const uno::Reference< embed::XEmbeddedClient >& xClient )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -174,8 +157,6 @@ void SAL_CALL ODummyEmbeddedObject::setClientSite(
 
 
 uno::Reference< embed::XEmbeddedClient > SAL_CALL ODummyEmbeddedObject::getClientSite()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -185,9 +166,6 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL ODummyEmbeddedObject::getClien
 
 
 void SAL_CALL ODummyEmbeddedObject::update()
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -195,8 +173,6 @@ void SAL_CALL ODummyEmbeddedObject::update()
 
 
 void SAL_CALL ODummyEmbeddedObject::setUpdateMode( sal_Int32 )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -204,8 +180,6 @@ void SAL_CALL ODummyEmbeddedObject::setUpdateMode( sal_Int32 )
 
 
 sal_Int64 SAL_CALL ODummyEmbeddedObject::getStatus( sal_Int64 )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -215,7 +189,6 @@ sal_Int64 SAL_CALL ODummyEmbeddedObject::getStatus( sal_Int64 )
 
 
 void SAL_CALL ODummyEmbeddedObject::setContainerName( const OUString& )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_Runtime();
@@ -223,10 +196,6 @@ void SAL_CALL ODummyEmbeddedObject::setContainerName( const OUString& )
 
 
 void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt::Size& aSize )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -244,10 +213,6 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
 
 
 awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -268,8 +233,6 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
 
 
 sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect )
-        throw ( uno::Exception,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_Runtime();
@@ -285,10 +248,6 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect )
 
 
 embed::VisualRepresentation SAL_CALL ODummyEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -305,11 +264,6 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
                     sal_Int32 nEntryConnectionMode,
                     const uno::Sequence< beans::PropertyValue >& /* lArguments */,
                     const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -370,11 +324,6 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& /* lArguments */,
                             const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -392,11 +341,6 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& /* lArguments */,
                             const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -417,9 +361,6 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X
 
 
 void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -451,8 +392,6 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
 
 
 sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -470,8 +409,6 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
 
 
 OUString SAL_CALL ODummyEmbeddedObject::getEntryName()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -486,10 +423,6 @@ OUString SAL_CALL ODummyEmbeddedObject::getEntryName()
 
 
 void SAL_CALL ODummyEmbeddedObject::storeOwn()
-        throw ( embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -505,8 +438,6 @@ void SAL_CALL ODummyEmbeddedObject::storeOwn()
 
 
 sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -524,11 +455,6 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly()
 void SAL_CALL ODummyEmbeddedObject::reload(
                 const uno::Sequence< beans::PropertyValue >& /* lArguments */,
                 const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_WrongState();
@@ -543,7 +469,6 @@ void SAL_CALL ODummyEmbeddedObject::reload(
 
 
 uno::Sequence< sal_Int8 > SAL_CALL ODummyEmbeddedObject::getClassID()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_Runtime();
@@ -555,7 +480,6 @@ uno::Sequence< sal_Int8 > SAL_CALL ODummyEmbeddedObject::getClassID()
 
 
 OUString SAL_CALL ODummyEmbeddedObject::getClassName()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -567,15 +491,12 @@ OUString SAL_CALL ODummyEmbeddedObject::getClassName()
 
 void SAL_CALL ODummyEmbeddedObject::setClassInfo(
                 const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ )
-        throw ( lang::NoSupportException,
-                uno::RuntimeException, std::exception )
 {
     throw lang::NoSupportException();
 }
 
 
 uno::Reference< util::XCloseable > SAL_CALL ODummyEmbeddedObject::getComponent()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     CheckInit_Runtime();
@@ -585,7 +506,6 @@ uno::Reference< util::XCloseable > SAL_CALL ODummyEmbeddedObject::getComponent()
 
 
 void SAL_CALL ODummyEmbeddedObject::addStateChangeListener( const uno::Reference< embed::XStateChangeListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -601,7 +521,6 @@ void SAL_CALL ODummyEmbeddedObject::addStateChangeListener( const uno::Reference
 
 void SAL_CALL ODummyEmbeddedObject::removeStateChangeListener(
                     const uno::Reference< embed::XStateChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
@@ -611,8 +530,6 @@ void SAL_CALL ODummyEmbeddedObject::removeStateChangeListener(
 
 
 void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
-    throw ( util::CloseVetoException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -667,7 +584,6 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
 
 
 void SAL_CALL ODummyEmbeddedObject::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -681,7 +597,6 @@ void SAL_CALL ODummyEmbeddedObject::addCloseListener( const uno::Reference< util
 
 
 void SAL_CALL ODummyEmbeddedObject::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
@@ -691,7 +606,6 @@ void SAL_CALL ODummyEmbeddedObject::removeCloseListener( const uno::Reference< u
 
 
 void SAL_CALL ODummyEmbeddedObject::addEventListener( const uno::Reference< document::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -705,7 +619,6 @@ void SAL_CALL ODummyEmbeddedObject::addEventListener( const uno::Reference< docu
 
 
 void SAL_CALL ODummyEmbeddedObject::removeEventListener( const uno::Reference< document::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index 982ae51e9a24..1a8cce8212c0 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -69,7 +69,6 @@ Interceptor::dispatch(
     const util::URL& URL,
     const uno::Sequence<
     beans::PropertyValue >& Arguments )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     if( m_pDocHolder )
@@ -122,9 +121,6 @@ Interceptor::addStatusListener(
     const uno::Reference<
     frame::XStatusListener >& Control,
     const util::URL& URL )
-    throw (
-        uno::RuntimeException, std::exception
-    )
 {
     if(!Control.is())
         return;
@@ -201,9 +197,6 @@ Interceptor::removeStatusListener(
     const uno::Reference<
     frame::XStatusListener >& Control,
     const util::URL& URL )
-    throw (
-        uno::RuntimeException, std::exception
-    )
 {
     if(!(Control.is() && m_pStatCL))
         return;
@@ -218,9 +211,6 @@ Interceptor::removeStatusListener(
 uno::Sequence< OUString >
 SAL_CALL
 Interceptor::getInterceptedURLs(  )
-    throw (
-        uno::RuntimeException, std::exception
-    )
 {
     // now implemented as update
 
@@ -235,9 +225,6 @@ Interceptor::queryDispatch(
     const util::URL& URL,
     const OUString& TargetFrameName,
     sal_Int32 SearchFlags )
-    throw (
-        uno::RuntimeException, std::exception
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     if(URL.Complete == m_aInterceptedURL[0])
@@ -264,9 +251,6 @@ Interceptor::queryDispatch(
 uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL
 Interceptor::queryDispatches(
     const uno::Sequence<frame::DispatchDescriptor >& Requests )
-    throw (
-        uno::RuntimeException, std::exception
-    )
 {
     uno::Sequence< uno::Reference< frame::XDispatch > > aRet;
     osl::MutexGuard aGuard(m_aMutex);
@@ -297,9 +281,6 @@ Interceptor::queryDispatches(
 
 uno::Reference< frame::XDispatchProvider > SAL_CALL
 Interceptor::getSlaveDispatchProvider(  )
-    throw (
-        uno::RuntimeException, std::exception
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     return m_xSlaveDispatchProvider;
@@ -308,9 +289,6 @@ Interceptor::getSlaveDispatchProvider(  )
 void SAL_CALL
 Interceptor::setSlaveDispatchProvider(
     const uno::Reference< frame::XDispatchProvider >& NewDispatchProvider )
-    throw (
-        uno::RuntimeException, std::exception
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_xSlaveDispatchProvider = NewDispatchProvider;
@@ -319,9 +297,6 @@ Interceptor::setSlaveDispatchProvider(
 
 uno::Reference< frame::XDispatchProvider > SAL_CALL
 Interceptor::getMasterDispatchProvider(  )
-    throw (
-        uno::RuntimeException, std::exception
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     return m_xMasterDispatchProvider;
@@ -331,9 +306,6 @@ Interceptor::getMasterDispatchProvider(  )
 void SAL_CALL
 Interceptor::setMasterDispatchProvider(
     const uno::Reference< frame::XDispatchProvider >& NewSupplier )
-    throw (
-        uno::RuntimeException, std::exception
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_xMasterDispatchProvider = NewSupplier;
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 6e171f21ebc3..3dc498c1269d 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -68,10 +68,6 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
                                             const uno::Reference< embed::XStorage >& xStorage,
                                             const OUString& sEntName,
                                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface > xResult;
 
@@ -110,11 +106,6 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
                                                                     const OUString& sEntName,
                                                                     const uno::Sequence< beans::PropertyValue >& aMedDescr,
                                                                     const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            container::NoSuchElementException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     if ( !xStorage.is() )
         throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -234,10 +225,6 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
         const OUString& sEntName,
         const uno::Sequence< beans::PropertyValue >& aMediaDescr,
         const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     // TODO: use lObjArgs
 
@@ -297,10 +284,6 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
         sal_Int32 nEntryConnectionMode,
         const uno::Sequence< beans::PropertyValue >& aArgs,
         const uno::Sequence< beans::PropertyValue >& aObjectArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface > xResult;
 
@@ -336,10 +319,6 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
                                             const OUString& sEntName,
                                             const uno::Sequence< beans::PropertyValue >& aMediaDescr,
                                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     uno::Reference< uno::XInterface > xResult;
 
@@ -400,19 +379,16 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 }
 
 OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetImplementationName();
 }
 
 sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetSupportedServiceNames();
 }
diff --git a/embeddedobj/source/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx
index 5270a12999c8..009c8c7a133a 100644
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
@@ -25,10 +25,10 @@
 
 class OClosePreventer : public ::cppu::WeakImplHelper < css::util::XCloseListener >
 {
-    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) override;
 
-    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;
 };
 
 #endif
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index 3440a6187b77..52624c291775 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -250,8 +250,7 @@ public:
 
 // XInterface
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override ;
 
     virtual void SAL_CALL acquire()
         throw() override;
@@ -261,80 +260,39 @@ public:
 
 // XEmbeddedObject
 
-    virtual void SAL_CALL changeState( sal_Int32 nNewState )
-        throw ( css::embed::UnreachableStateException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL changeState( sal_Int32 nNewState ) override;
 
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates() override;
 
-    virtual sal_Int32 SAL_CALL getCurrentState()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCurrentState() override;
 
-    virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::embed::UnreachableStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) override;
 
-    virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs() override;
 
     virtual void SAL_CALL setClientSite(
-                const css::uno::Reference< css::embed::XEmbeddedClient >& xClient )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::embed::XEmbeddedClient >& xClient ) override;
 
-    virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite() override;
 
-    virtual void SAL_CALL update()
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL update() override;
 
-    virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setUpdateMode( sal_Int32 nMode ) override;
 
-    virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect ) override;
 
-    virtual void SAL_CALL setContainerName( const OUString& sName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setContainerName( const OUString& sName ) override;
 
 
 // XVisualObject
 
-    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize ) override;
 
-    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) override;
 
-    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) override;
 
-    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
-        throw ( css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) override;
 
 // XEmbedPersist
 
@@ -343,161 +301,98 @@ public:
                     const OUString& sEntName,
                     sal_Int32 nEntryConnectionMode,
                     const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                    const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                    const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+
+    virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     virtual void SAL_CALL storeAsEntry(
                 const css::uno::Reference< css::embed::XStorage >& xStorage,
                 const OUString& sEntName,
                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Bool SAL_CALL hasEntry()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual OUString SAL_CALL getEntryName()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+
+    virtual void SAL_CALL saveCompleted( sal_Bool bUseNew ) override;
+
+    virtual sal_Bool SAL_CALL hasEntry() override;
+
+    virtual OUString SAL_CALL getEntryName() override;
 
 // XLinkageSupport
 
     virtual void SAL_CALL breakLink( const css::uno::Reference< css::embed::XStorage >& xStorage,
-                                     const OUString& sEntName )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                                     const OUString& sEntName ) override;
 
-    virtual sal_Bool SAL_CALL isLink()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isLink() override;
 
-    virtual OUString SAL_CALL getLinkURL()
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getLinkURL() override;
 
 
 // XCommonEmbedPersist
 
-    virtual void SAL_CALL storeOwn()
-        throw ( css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL storeOwn() override;
 
-    virtual sal_Bool SAL_CALL isReadonly()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isReadonly() override;
 
     virtual void SAL_CALL reload(
                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
 // XEmbedPersist2
 
-    virtual sal_Bool SAL_CALL isStored()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isStored() override;
 
 // XInplaceObject
 
     virtual void SAL_CALL setObjectRectangles( const css::awt::Rectangle& aPosRect,
-                                          const css::awt::Rectangle& aClipRect )
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                                          const css::awt::Rectangle& aClipRect ) override;
 
-    virtual void SAL_CALL enableModeless( sal_Bool bEnable )
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL enableModeless( sal_Bool bEnable ) override;
 
     virtual void SAL_CALL translateAccelerators(
-                    const css::uno::Sequence< css::awt::KeyEvent >& aKeys )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+                    const css::uno::Sequence< css::awt::KeyEvent >& aKeys ) override;
 
 // XClassifiedObject
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID() override;
 
-    virtual OUString SAL_CALL getClassName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getClassName() override;
 
     virtual void SAL_CALL setClassInfo(
-                const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
-        throw ( css::lang::NoSupportException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) override;
 
 
 // XComponentSupplier
 
-    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent() override;
 
 // XStateChangeBroadcaster
-    virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) override;
 
 // XCloseable
 
-    virtual void SAL_CALL close( sal_Bool DeliverOwnership )
-        throw ( css::util::CloseVetoException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL close( sal_Bool DeliverOwnership ) override;
 
     virtual void SAL_CALL addCloseListener(
-                const css::uno::Reference< css::util::XCloseListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
     virtual void SAL_CALL removeCloseListener(
-                const css::uno::Reference< css::util::XCloseListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
 // XEventBroadcaster
     virtual void SAL_CALL addEventListener(
-                const css::uno::Reference< css::document::XEventListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::document::XEventListener >& Listener ) override;
 
     virtual void SAL_CALL removeEventListener(
-                const css::uno::Reference< css::document::XEventListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::document::XEventListener >& Listener ) override;
 
     // XChild
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     // XDefaultSizeTransmitter
     //#i103460# charts do not necessaryly have an own size within ODF files, in this case they need to use the size settings from the surrounding frame, which is made available with this method
-    virtual void SAL_CALL setDefaultSize( const css::awt::Size& rSize_100TH_MM ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDefaultSize( const css::awt::Size& rSize_100TH_MM ) override;
 };
 
 #endif
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 048680cda5bf..efbb664c6659 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -102,8 +102,7 @@ public:
     /// @throws css::uno::Exception
     static void FindConnectPoints(
         const css::uno::Reference< css::container::XIndexAccess >& xMenu,
-        sal_Int32 nConnectPoints[2] )
-            throw ( css::uno::Exception );
+        sal_Int32 nConnectPoints[2] );
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::container::XIndexAccess > MergeMenusForInplace(
@@ -111,8 +110,7 @@ public:
         const css::uno::Reference< css::frame::XDispatchProvider >& xContDisp,
         const OUString& aContModuleName,
         const css::uno::Reference< css::container::XIndexAccess >& xOwnMenu,
-        const css::uno::Reference< css::frame::XDispatchProvider >& xOwnDisp )
-            throw ( css::uno::Exception );
+        const css::uno::Reference< css::frame::XDispatchProvider >& xOwnDisp );
 
 
     DocumentHolder( const css::uno::Reference< css::uno::XComponentContext >& xContext,
@@ -169,30 +167,30 @@ public:
     const css::uno::Reference< css::util::XCloseable >& GetComponent() { return m_xComponent; }
 
 // 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;
 
 // XCloseListener
-    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) override;
 
 // XTerminateListener
-    virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override;
 
 // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 
 // XEventListener
-    virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) override;
 
 // XBorderResizeListener
-    virtual void SAL_CALL borderWidthsChanged( const css::uno::Reference< css::uno::XInterface >& aObject, const css::frame::BorderWidths& aNewSize ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL borderWidthsChanged( const css::uno::Reference< css::uno::XInterface >& aObject, const css::frame::BorderWidths& aNewSize ) override;
 
 // XHatchWindowController
-    virtual void SAL_CALL requestPositioning( const css::awt::Rectangle& aRect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL calcAdjustedRectangle( const css::awt::Rectangle& aRect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL activated(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deactivated(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL requestPositioning( const css::awt::Rectangle& aRect ) override;
+    virtual css::awt::Rectangle SAL_CALL calcAdjustedRectangle( const css::awt::Rectangle& aRect ) override;
+    virtual void SAL_CALL activated(  ) override;
+    virtual void SAL_CALL deactivated(  ) override;
 };
 
 #endif
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index afec254ff13f..30505a2b0244 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -91,80 +91,39 @@ public:
 
 // XEmbeddedObject
 
-    virtual void SAL_CALL changeState( sal_Int32 nNewState )
-        throw ( css::embed::UnreachableStateException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Int32 SAL_CALL getCurrentState()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::embed::UnreachableStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL changeState( sal_Int32 nNewState ) override;
+
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates() override;
+
+    virtual sal_Int32 SAL_CALL getCurrentState() override;
+
+    virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) override;
+
+    virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs() override;
 
     virtual void SAL_CALL setClientSite(
-                const css::uno::Reference< css::embed::XEmbeddedClient >& xClient )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::embed::XEmbeddedClient >& xClient ) override;
 
-    virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite() override;
 
-    virtual void SAL_CALL update()
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL update() override;
 
-    virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setUpdateMode( sal_Int32 nMode ) override;
 
-    virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect ) override;
 
-    virtual void SAL_CALL setContainerName( const OUString& sName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setContainerName( const OUString& sName ) override;
 
 
 // XVisualObject
 
-    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize ) override;
 
-    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) override;
 
-    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) override;
 
-    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
-        throw ( css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) override;
 
 // XEmbedPersist
 
@@ -173,112 +132,68 @@ public:
                     const OUString& sEntName,
                     sal_Int32 nEntryConnectionMode,
                     const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                    const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                    const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+
+    virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     virtual void SAL_CALL storeAsEntry(
                 const css::uno::Reference< css::embed::XStorage >& xStorage,
                 const OUString& sEntName,
                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
-    virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL saveCompleted( sal_Bool bUseNew ) override;
 
-    virtual sal_Bool SAL_CALL hasEntry()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasEntry() override;
 
-    virtual OUString SAL_CALL getEntryName()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getEntryName() override;
 
 
 // XCommonEmbedPersist
 
-    virtual void SAL_CALL storeOwn()
-        throw ( css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL storeOwn() override;
 
-    virtual sal_Bool SAL_CALL isReadonly()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isReadonly() override;
 
     virtual void SAL_CALL reload(
                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
 
 // XClassifiedObject
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID() override;
 
-    virtual OUString SAL_CALL getClassName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getClassName() override;
 
     virtual void SAL_CALL setClassInfo(
-                const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
-        throw ( css::lang::NoSupportException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) override;
 
 
 // XComponentSupplier
 
-    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent() override;
 
 // XStateChangeBroadcaster
-    virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) override;
 
 // XCloseable
 
-    virtual void SAL_CALL close( sal_Bool DeliverOwnership )
-        throw ( css::util::CloseVetoException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL close( sal_Bool DeliverOwnership ) override;
 
     virtual void SAL_CALL addCloseListener(
-                const css::uno::Reference< css::util::XCloseListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
     virtual void SAL_CALL removeCloseListener(
-                const css::uno::Reference< css::util::XCloseListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
 // XEventBroadcaster
     virtual void SAL_CALL addEventListener(
-                const css::uno::Reference< css::document::XEventListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::document::XEventListener >& Listener ) override;
 
     virtual void SAL_CALL removeEventListener(
-                const css::uno::Reference< css::document::XEventListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::document::XEventListener >& Listener ) override;
 
 };
 
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index 0eee7179dd02..987792c5431a 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -48,33 +48,23 @@ public:
     dispatch(
         const css::util::URL& URL,
         const css::uno::Sequence<
-        css::beans::PropertyValue >& Arguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::PropertyValue >& Arguments ) override;
 
     virtual void SAL_CALL
     addStatusListener(
         const css::uno::Reference<
         css::frame::XStatusListener >& Control,
-        const css::util::URL& URL )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        const css::util::URL& URL ) override;
 
     virtual void SAL_CALL
     removeStatusListener(
         const css::uno::Reference<
         css::frame::XStatusListener >& Control,
-        const css::util::URL& URL )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        const css::util::URL& URL ) override;
 
     //XInterceptorInfo
     virtual css::uno::Sequence< OUString >
-    SAL_CALL getInterceptedURLs(  )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+    SAL_CALL getInterceptedURLs(  ) override;
 
     //XDispatchProvider ( inherited by XDispatchProviderInterceptor )
     virtual css::uno::Reference<
@@ -82,52 +72,34 @@ public:
     queryDispatch(
         const css::util::URL& URL,
         const OUString& TargetFrameName,
-        sal_Int32 SearchFlags )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        sal_Int32 SearchFlags ) override;
 
     virtual css::uno::Sequence<
     css::uno::Reference<
     css::frame::XDispatch > > SAL_CALL
     queryDispatches(
         const css::uno::Sequence<
-        css::frame::DispatchDescriptor >& Requests )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        css::frame::DispatchDescriptor >& Requests ) override;
 
 
     //XDispatchProviderInterceptor
     virtual css::uno::Reference<
     css::frame::XDispatchProvider > SAL_CALL
-    getSlaveDispatchProvider(  )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+    getSlaveDispatchProvider(  ) override;
 
     virtual void SAL_CALL
     setSlaveDispatchProvider(
         const css::uno::Reference<
-        css::frame::XDispatchProvider >& NewDispatchProvider )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        css::frame::XDispatchProvider >& NewDispatchProvider ) override;
 
     virtual css::uno::Reference<
     css::frame::XDispatchProvider > SAL_CALL
-    getMasterDispatchProvider(  )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+    getMasterDispatchProvider(  ) override;
 
     virtual void SAL_CALL
     setMasterDispatchProvider(
         const css::uno::Reference<
-        css::frame::XDispatchProvider >& NewSupplier )
-        throw (
-            css::uno::RuntimeException, std::exception
-        ) override;
+        css::frame::XDispatchProvider >& NewSupplier ) override;
 
 
 private:
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 9fad90fc509a..2beb08e242fc 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -201,14 +201,12 @@ class OleEmbeddedObject : public ::cppu::WeakImplHelper
 protected:
     /// @throws css::uno::Exception
     css::uno::Reference< css::io::XStream > TryToGetAcceptableFormat_Impl(
-                                    const css::uno::Reference< css::io::XStream >& xStream )
-        throw ( css::uno::Exception );
+                                    const css::uno::Reference< css::io::XStream >& xStream );
 
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XStream > GetNewFilledTempStream_Impl(
-                                    const css::uno::Reference< css::io::XInputStream >& xInStream )
-        throw( css::io::IOException, css::uno::RuntimeException );
+                                    const css::uno::Reference< css::io::XInputStream >& xInStream );
 #ifdef _WIN32
     void SwitchComponentToRunningState_Impl();
 #endif
@@ -242,30 +240,25 @@ protected:
                             const css::uno::Reference< css::embed::XStorage >& xStorage,
                             const OUString& sEntName,
                             const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs,
-                            bool bSaveAs )
-        throw ( css::uno::Exception );
+                            bool bSaveAs );
 #ifdef _WIN32
     /// @throws css::uno::Exception
-    void StoreObjectToStream( css::uno::Reference< css::io::XOutputStream > const & xOutStream )
-        throw ( css::uno::Exception );
+    void StoreObjectToStream( css::uno::Reference< css::io::XOutputStream > const & xOutStream );
 #endif
     /// @throws css::uno::Exception
     void InsertVisualCache_Impl(
             const css::uno::Reference< css::io::XStream >& xTargetStream,
-            const css::uno::Reference< css::io::XStream >& xCachedVisualRepresentation )
-        throw ( css::uno::Exception );
+            const css::uno::Reference< css::io::XStream >& xCachedVisualRepresentation );
 
     /// @throws css::uno::Exception
-    void RemoveVisualCache_Impl( const css::uno::Reference< css::io::XStream >& xTargetStream )
-        throw ( css::uno::Exception );
+    void RemoveVisualCache_Impl( const css::uno::Reference< css::io::XStream >& xTargetStream );
 
     void SetVisReplInStream( bool bExists );
     bool HasVisReplInStream();
 
     /// @throws css::uno::Exception
     css::embed::VisualRepresentation GetVisualRepresentationInNativeFormat_Impl(
-                    const css::uno::Reference< css::io::XStream >& xCachedVisRepr )
-        throw ( css::uno::Exception );
+                    const css::uno::Reference< css::io::XStream >& xCachedVisRepr );
 
     css::uno::Reference< css::io::XStream > TryToRetrieveCachedVisualRepresentation_Impl(
                     const css::uno::Reference< css::io::XStream >& xStream,
@@ -313,80 +306,39 @@ public:
 
 // XEmbeddedObject
 
-    virtual void SAL_CALL changeState( sal_Int32 nNewState )
-        throw ( css::embed::UnreachableStateException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL changeState( sal_Int32 nNewState ) override;
 
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getReachableStates() override;
 
-    virtual sal_Int32 SAL_CALL getCurrentState()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCurrentState() override;
 
-    virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::embed::UnreachableStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) override;
 
-    virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::embed::VerbDescriptor > SAL_CALL getSupportedVerbs() override;
 
     virtual void SAL_CALL setClientSite(
-                const css::uno::Reference< css::embed::XEmbeddedClient >& xClient )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::embed::XEmbeddedClient >& xClient ) override;
 
-    virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::embed::XEmbeddedClient > SAL_CALL getClientSite() override;
 
-    virtual void SAL_CALL update()
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL update() override;
 
-    virtual void SAL_CALL setUpdateMode( sal_Int32 nMode )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setUpdateMode( sal_Int32 nMode ) override;
 
-    virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getStatus( sal_Int64 nAspect ) override;
 
-    virtual void SAL_CALL setContainerName( const OUString& sName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setContainerName( const OUString& sName ) override;
 
 
 // XVisualObject
 
-    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize ) override;
 
-    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) override;
 
-    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) override;
 
-    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
-        throw ( css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) override;
 
 
 // XEmbedPersist
@@ -396,150 +348,88 @@ public:
                     const OUString& sEntName,
                     sal_Int32 nEntryConnectionMode,
                     const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                    const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                    const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+
+    virtual void SAL_CALL storeToEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     virtual void SAL_CALL storeAsEntry(
                 const css::uno::Reference< css::embed::XStorage >& xStorage,
                 const OUString& sEntName,
                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL saveCompleted( sal_Bool bUseNew )
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Bool SAL_CALL hasEntry()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual OUString SAL_CALL getEntryName()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+
+    virtual void SAL_CALL saveCompleted( sal_Bool bUseNew ) override;
+
+    virtual sal_Bool SAL_CALL hasEntry() override;
+
+    virtual OUString SAL_CALL getEntryName() override;
 
 // XLinkageSupport
 
     virtual void SAL_CALL breakLink( const css::uno::Reference< css::embed::XStorage >& xStorage,
-                                     const OUString& sEntName )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Bool SAL_CALL isLink()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL getLinkURL()
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+                                     const OUString& sEntName ) override;
+
+    virtual sal_Bool SAL_CALL isLink() override;
+
+    virtual OUString SAL_CALL getLinkURL() override;
 
 // XCommonEmbedPersist
-    virtual void SAL_CALL storeOwn()
-        throw ( css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL storeOwn() override;
 
-    virtual sal_Bool SAL_CALL isReadonly()
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isReadonly() override;
 
     virtual void SAL_CALL reload(
                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
-                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
 // XClassifiedObject
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getClassID() override;
 
-    virtual OUString SAL_CALL getClassName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getClassName() override;
 
     virtual void SAL_CALL setClassInfo(
-                const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
-        throw ( css::lang::NoSupportException,
-                css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) override;
 
 // XStateChangeBroadcaster
-    virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeStateChangeListener( const css::uno::Reference< css::embed::XStateChangeListener >& xListener ) override;
 
 
 // XComponentSupplier
 
-    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::util::XCloseable > SAL_CALL getComponent() override;
 
 // XCloseable
 
-    virtual void SAL_CALL close( sal_Bool DeliverOwnership )
-        throw ( css::util::CloseVetoException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL close( sal_Bool DeliverOwnership ) override;
 
     virtual void SAL_CALL addCloseListener(
-                const css::uno::Reference< css::util::XCloseListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
     virtual void SAL_CALL removeCloseListener(
-                const css::uno::Reference< css::util::XCloseListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
 // XEventBroadcaster
     virtual void SAL_CALL addEventListener(
-                const css::uno::Reference< css::document::XEventListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::document::XEventListener >& Listener ) override;
 
     virtual void SAL_CALL removeEventListener(
-                const css::uno::Reference< css::document::XEventListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::document::XEventListener >& Listener ) override;
 
 // XInplaceObject ( only for wrapping scenario here )
 
     virtual void SAL_CALL setObjectRectangles( const css::awt::Rectangle& aPosRect,
-                                          const css::awt::Rectangle& aClipRect )
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                                          const css::awt::Rectangle& aClipRect ) override;
 
-    virtual void SAL_CALL enableModeless( sal_Bool bEnable )
-        throw ( css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL enableModeless( sal_Bool bEnable ) override;
 
     virtual void SAL_CALL translateAccelerators(
-                    const css::uno::Sequence< css::awt::KeyEvent >& aKeys )
-        throw ( css::embed::WrongStateException,
-                css::uno::RuntimeException, std::exception ) override;
+                    const css::uno::Sequence< css::awt::KeyEvent >& aKeys ) override;
 
     // XChild ( only for wrapping scenario here )
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
 };
 
diff --git a/embeddedobj/source/inc/specialobject.hxx b/embeddedobj/source/inc/specialobject.hxx
index d6c95f23235e..32ad61a7a582 100644
--- a/embeddedobj/source/inc/specialobject.hxx
+++ b/embeddedobj/source/inc/specialobject.hxx
@@ -34,44 +34,20 @@ public:
         const css::uno::Sequence< css::beans::NamedValue >& aObjectProps );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override ;
 
     // XVisualObject
-    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) override;
 
-    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize ) override;
 
-    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) override;
 
-    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
-        throw ( css::uno::Exception,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) override;
 
-    virtual void SAL_CALL changeState( sal_Int32 nNewState )
-        throw ( css::embed::UnreachableStateException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL changeState( sal_Int32 nNewState ) override;
 
-    virtual void SAL_CALL doVerb( sal_Int32 nVerbID )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::embed::UnreachableStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL doVerb( sal_Int32 nVerbID ) override;
 };
 
 #endif
diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx
index eef372928d69..4e0b3630c2b4 100644
--- a/embeddedobj/source/inc/xcreator.hxx
+++ b/embeddedobj/source/inc/xcreator.hxx
@@ -53,20 +53,20 @@ public:
 
 
     // XEmbedObjectCreator
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XEmbedObjectFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& sClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Sequence< css::beans::PropertyValue >& aObjectArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& sClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Sequence< css::beans::PropertyValue >& aObjectArgs ) override;
 
     // XLinkCreator
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx
index 4ffeb4d4d444..69cf44b0d6f1 100644
--- a/embeddedobj/source/msole/closepreventer.cxx
+++ b/embeddedobj/source/msole/closepreventer.cxx
@@ -22,20 +22,17 @@
 #include <osl/diagnose.h>
 
 void SAL_CALL OClosePreventer::queryClosing( const css::lang::EventObject&, sal_Bool  )
-        throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception)
 {
     throw css::util::CloseVetoException();
 }
 
 void SAL_CALL OClosePreventer::notifyClosing( const css::lang::EventObject& )
-        throw (css::uno::RuntimeException, std::exception)
 {
     // just a disaster
     OSL_FAIL( "The object can not be prevented from closing!\n" );
 }
 
 void SAL_CALL OClosePreventer::disposing( const css::lang::EventObject& )
-        throw (css::uno::RuntimeException, std::exception)
 {
     // just a disaster
     OSL_FAIL( "The object can not be prevented from closing!\n" );
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index e7d4848c4823..f27d7481fba3 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -102,7 +102,7 @@ MainThreadNotificationRequest::MainThreadNotificationRequest( const ::rtl::Refer
 , m_nAspect( nAspect )
 {}
 
-void SAL_CALL MainThreadNotificationRequest::notify (const uno::Any& ) throw (uno::RuntimeException)
+void SAL_CALL MainThreadNotificationRequest::notify (const uno::Any& )
 {
     if ( m_pObject )
     {
diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx
index 99f4feb7295e..f8746ad36329 100644
--- a/embeddedobj/source/msole/mtnotification.hxx
+++ b/embeddedobj/source/msole/mtnotification.hxx
@@ -41,8 +41,7 @@ class MainThreadNotificationRequest :  public cppu::WeakImplHelper< css::awt::XC
     sal_uInt32 m_nAspect;
 
 public:
-    virtual void SAL_CALL notify (const css::uno::Any& rUserData)
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notify (const css::uno::Any& rUserData) override;
     MainThreadNotificationRequest( const ::rtl::Reference< OleEmbeddedObject >& xObj, sal_uInt16 nNotificationType, sal_uInt32 nAspect = 0 );
     ~MainThreadNotificationRequest() override;
 };
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 2f06f0496cdd..140ad3dc073b 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1409,8 +1409,6 @@ void OleComponent::OnClose_Impl()
 // XCloseable
 
 void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
-    throw ( util::CloseVetoException,
-            uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1463,7 +1461,6 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
 
 
 void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
-    throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1477,7 +1474,6 @@ void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XClose
 
 
 void SAL_CALL OleComponent::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
-    throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1491,9 +1487,6 @@ void SAL_CALL OleComponent::removeCloseListener( const uno::Reference< util::XCl
 // XTransferable
 
 uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor& aFlavor )
-    throw ( datatransfer::UnsupportedFlavorException,
-            io::IOException,
-            uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1594,7 +1587,6 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
 
 
 uno::Sequence< datatransfer::DataFlavor > SAL_CALL OleComponent::getTransferDataFlavors()
-    throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1610,7 +1602,6 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OleComponent::getTransferData
 
 
 sal_Bool SAL_CALL OleComponent::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
-    throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1631,7 +1622,7 @@ sal_Bool SAL_CALL OleComponent::isDataFlavorSupported( const datatransfer::DataF
     return false;
 }
 
-void SAL_CALL OleComponent::dispose() throw (css::uno::RuntimeException)
+void SAL_CALL OleComponent::dispose()
 {
     try
     {
@@ -1643,7 +1634,6 @@ void SAL_CALL OleComponent::dispose() throw (css::uno::RuntimeException)
 }
 
 void SAL_CALL OleComponent::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1657,7 +1647,6 @@ void SAL_CALL OleComponent::addEventListener( const uno::Reference< lang::XEvent
 
 
 void SAL_CALL OleComponent::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1668,7 +1657,7 @@ void SAL_CALL OleComponent::removeEventListener( const uno::Reference< lang::XEv
                                                 xListener );
 }
 
-sal_Int64 SAL_CALL OleComponent::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException)
+sal_Int64 SAL_CALL OleComponent::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
 {
     try
     {
@@ -1701,13 +1690,12 @@ sal_Int64 SAL_CALL OleComponent::getSomething( const css::uno::Sequence< sal_Int
     return 0;
 }
 
-sal_Bool SAL_CALL OleComponent::isModified() throw (css::uno::RuntimeException)
+sal_Bool SAL_CALL OleComponent::isModified()
 {
     return m_bModified;
 }
 
 void SAL_CALL OleComponent::setModified( sal_Bool bModified )
-        throw (css::beans::PropertyVetoException, css::uno::RuntimeException)
 {
     m_bModified = bModified;
 
@@ -1734,7 +1722,7 @@ void SAL_CALL OleComponent::setModified( sal_Bool bModified )
     }
 }
 
-void SAL_CALL OleComponent::addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener ) throw(css::uno::RuntimeException)
+void SAL_CALL OleComponent::addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -1746,7 +1734,7 @@ void SAL_CALL OleComponent::addModifyListener( const css::uno::Reference < css::
     m_pInterfaceContainer->addInterface( cppu::UnoType<util::XModifyListener>::get(), xListener );
 }
 
-void SAL_CALL OleComponent::removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener) throw(css::uno::RuntimeException)
+void SAL_CALL OleComponent::removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index a8a2ea81c240..6665895c28e2 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -143,29 +143,28 @@ public:
     void OnClose_Impl();
 
     // XCloseable
-    virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException) override;
-    virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL close( sal_Bool DeliverOwnership ) override;
+    virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
+    virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
     // XTransferable
-    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) override;
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener >& aListener) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // XModifiable
-    virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setModified( sal_Bool bModified )
-        throw (css::beans::PropertyVetoException, css::uno::RuntimeException) override;
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener ) throw(css::uno::RuntimeException) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener) throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL isModified() override;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference < css::util::XModifyListener >& xListener) override;
 };
 
 #endif
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index a28786f05f9b..bb6bc4cea537 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -438,10 +438,6 @@ bool OleEmbeddedObject::TryToConvertToOOo()
 
 
 void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
-        throw ( embed::UnreachableStateException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -596,8 +592,6 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
 
 
 uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -638,8 +632,6 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
 
 
 sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -805,11 +797,6 @@ namespace
 
 
 void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                embed::UnreachableStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -941,8 +928,6 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
 
 
 uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedVerbs()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -982,8 +967,6 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV
 
 void SAL_CALL OleEmbeddedObject::setClientSite(
                 const uno::Reference< embed::XEmbeddedClient >& xClient )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1012,8 +995,6 @@ void SAL_CALL OleEmbeddedObject::setClientSite(
 
 
 uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSite()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1037,9 +1018,6 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSi
 
 
 void SAL_CALL OleEmbeddedObject::update()
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1072,8 +1050,6 @@ void SAL_CALL OleEmbeddedObject::update()
 
 
 void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1103,8 +1079,6 @@ void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode )
 sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
     nAspect
 )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -1144,7 +1118,6 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
 
 
 void SAL_CALL OleEmbeddedObject::setContainerName( const OUString& sName )
-        throw ( uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index a6d9a1a0b6e1..a5121aac9971 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -299,7 +299,6 @@ void OleEmbeddedObject::Dispose()
 
 
 uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID()
-        throw ( uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -319,7 +318,6 @@ uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID()
 
 
 OUString SAL_CALL OleEmbeddedObject::getClassName()
-        throw ( uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -340,8 +338,6 @@ OUString SAL_CALL OleEmbeddedObject::getClassName()
 
 void SAL_CALL OleEmbeddedObject::setClassInfo(
                 const uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
-        throw ( lang::NoSupportException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -359,7 +355,6 @@ void SAL_CALL OleEmbeddedObject::setClassInfo(
 
 
 uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
-        throw ( uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -396,7 +391,6 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
 
 
 void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< embed::XStateChangeListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -422,7 +416,6 @@ void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< e
 
 void SAL_CALL OleEmbeddedObject::removeStateChangeListener(
                     const uno::Reference< embed::XStateChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -442,8 +435,6 @@ void SAL_CALL OleEmbeddedObject::removeStateChangeListener(
 
 
 void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
-    throw ( util::CloseVetoException,
-            uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -506,7 +497,6 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
 
 
 void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -530,7 +520,6 @@ void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::X
 
 
 void SAL_CALL OleEmbeddedObject::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -553,7 +542,6 @@ void SAL_CALL OleEmbeddedObject::removeCloseListener( const uno::Reference< util
 
 
 void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< document::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -578,7 +566,6 @@ void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< documen
 
 void SAL_CALL OleEmbeddedObject::removeEventListener(
                 const uno::Reference< document::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -603,9 +590,6 @@ void SAL_CALL OleEmbeddedObject::removeEventListener(
 
 void SAL_CALL OleEmbeddedObject::setObjectRectangles( const awt::Rectangle& aPosRect,
                                                            const awt::Rectangle& aClipRect )
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XInplaceObject > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -622,9 +606,6 @@ void SAL_CALL OleEmbeddedObject::setObjectRectangles( const awt::Rectangle& aPos
 
 
 void SAL_CALL OleEmbeddedObject::enableModeless( sal_Bool bEnable )
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XInplaceObject > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -642,8 +623,6 @@ void SAL_CALL OleEmbeddedObject::enableModeless( sal_Bool bEnable )
 
 void SAL_CALL OleEmbeddedObject::translateAccelerators(
                     const uno::Sequence< awt::KeyEvent >& aKeys )
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XInplaceObject > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -659,7 +638,7 @@ void SAL_CALL OleEmbeddedObject::translateAccelerators(
 
 // XChild
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL OleEmbeddedObject::getParent() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::uno::XInterface > SAL_CALL OleEmbeddedObject::getParent()
 {
     // begin wrapping related part ====================
     uno::Reference< container::XChild > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -674,7 +653,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL OleEmbeddedObject::getParen
 }
 
 
-void SAL_CALL OleEmbeddedObject::setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OleEmbeddedObject::setParent( const css::uno::Reference< css::uno::XInterface >& xParent )
 {
     // begin wrapping related part ====================
     uno::Reference< container::XChild > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index d9bf6d92a647..036dd496157f 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -106,8 +106,6 @@ OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactor
 
 OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream,
                                       const uno::Reference< lang::XMultiServiceFactory >& xFactory )
-        throw ( io::IOException,
-                uno::RuntimeException )
 {
     OSL_ENSURE( xInStream.is() && xFactory.is(), "Wrong parameters are provided!\n" );
 
@@ -158,7 +156,6 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xI
 /// @throws io::IOException
 /// @throws uno::RuntimeException
 OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStorage >& xParentStorage, const OUString& aEntryName, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
-    throw( io::IOException, uno::RuntimeException )
 {
     OUString aResult;
 
@@ -266,7 +263,6 @@ void VerbExecutionController::UnlockNotification()
 
 
 uno::Reference< io::XStream > OleEmbeddedObject::GetNewFilledTempStream_Impl( const uno::Reference< io::XInputStream >& xInStream )
-        throw( io::IOException, uno::RuntimeException )
 {
     SAL_WARN_IF( !xInStream.is(), "embeddedobj.ole", "Wrong parameter is provided!" );
 
@@ -288,7 +284,6 @@ uno::Reference< io::XStream > OleEmbeddedObject::GetNewFilledTempStream_Impl( co
 
 
 uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl( const uno::Reference< io::XStream >& xStream )
-        throw ( uno::Exception )
 {
     // TODO/LATER: Actually this should be done by a centralized component ( may be a graphical filter )
     if ( !m_xFactory.is() )
@@ -371,7 +366,6 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl(
 
 void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream,
                                                 const uno::Reference< io::XStream >& xCachedVisualRepresentation )
-        throw ( uno::Exception )
 {
     OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid arguments!\n" );
 
@@ -522,7 +516,6 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
 
 
 void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream )
-        throw ( uno::Exception )
 {
     OSL_ENSURE( xTargetStream.is(), "Invalid argument!\n" );
     if ( !xTargetStream.is() )
@@ -1030,7 +1023,6 @@ uno::Reference< io::XOutputStream > OleEmbeddedObject::GetStreamForSaving()
 
 
 void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream > const & xOutStream )
-    throw ( uno::Exception )
 {
     // this method should be used only on windows
     if ( m_pOleComponent )
@@ -1073,7 +1065,6 @@ void OleEmbeddedObject::StoreToLocation_Impl(
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& lObjArgs,
                             bool bSaveAs )
-        throw ( uno::Exception )
 {
     // TODO: use lObjArgs
     // TODO: exchange StoreVisualReplacement by SO file format version?
@@ -1286,11 +1277,6 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
                     sal_Int32 nEntryConnectionMode,
                     const uno::Sequence< beans::PropertyValue >& lArguments,
                     const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1492,11 +1478,6 @@ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XSto
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& lArguments,
                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1524,11 +1505,6 @@ void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XSto
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& lArguments,
                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1553,9 +1529,6 @@ void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XSto
 
 
 void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1652,8 +1625,6 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
 
 
 sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1681,8 +1652,6 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
 
 
 OUString SAL_CALL OleEmbeddedObject::getEntryName()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1714,10 +1683,6 @@ OUString SAL_CALL OleEmbeddedObject::getEntryName()
 
 
 void SAL_CALL OleEmbeddedObject::storeOwn()
-        throw ( embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1832,8 +1797,6 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
 
 
 sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1867,11 +1830,6 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
 void SAL_CALL OleEmbeddedObject::reload(
                 const uno::Sequence< beans::PropertyValue >& lArguments,
                 const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbedPersist > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -1910,11 +1868,6 @@ void SAL_CALL OleEmbeddedObject::reload(
 
 void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorage >& xStorage,
                                                 const OUString& sEntName )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XLinkageSupport > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -2029,8 +1982,6 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
 
 
 sal_Bool SAL_CALL  OleEmbeddedObject::isLink()
-        throw ( embed::WrongStateException,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XLinkageSupport > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -2050,9 +2001,6 @@ sal_Bool SAL_CALL  OleEmbeddedObject::isLink()
 
 
 OUString SAL_CALL OleEmbeddedObject::getLinkURL()
-        throw ( embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XLinkageSupport > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
diff --git a/embeddedobj/source/msole/olepersist.hxx b/embeddedobj/source/msole/olepersist.hxx
index 51adb40d2843..d0edd1d8b23b 100644
--- a/embeddedobj/source/msole/olepersist.hxx
+++ b/embeddedobj/source/msole/olepersist.hxx
@@ -38,8 +38,7 @@ OUString GetNewTempFileURL_Impl( const css::uno::Reference< css::lang::XMultiSer
 /// @throws css::uno::RuntimeException
 OUString GetNewFilledTempFile_Impl(
     css::uno::Reference<css::io::XInputStream > const & xInStream,
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & xFactory)
-    throw (css::io::IOException, css::uno::RuntimeException);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & xFactory);
 
 bool KillFile_Impl( const OUString& aURL, const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
 
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 094c4bed034f..6b197b547d35 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -39,7 +39,6 @@ using namespace ::comphelper;
 
 embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFormat_Impl(
                     const uno::Reference< io::XStream >& xCachedVisRepr )
-        throw ( uno::Exception )
 {
     embed::VisualRepresentation aVisualRepr;
 
@@ -78,10 +77,6 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo
 }
 
 void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt::Size& aSize )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -156,10 +151,6 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
 }
 
 awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -321,10 +312,6 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
 }
 
 embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 nAspect )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
@@ -416,8 +403,6 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
 }
 
 sal_Int32 SAL_CALL OleEmbeddedObject::getMapUnit( sal_Int64 nAspect )
-        throw ( uno::Exception,
-                uno::RuntimeException, std::exception)
 {
     // begin wrapping related part ====================
     uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject;
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 5bd54df9155e..0ea4da053d50 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -54,13 +54,11 @@ class DummyHandler_Impl : public ::cppu::WeakImplHelper< task::XInteractionHandl
 public:
     DummyHandler_Impl() {}
 
-    virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& xRequest )
-            throw( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& xRequest ) override;
 };
 
 
 void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractionRequest >& )
-        throw( uno::RuntimeException, std::exception )
 {
     return;
 }
@@ -567,7 +565,6 @@ void OwnView_Impl::Close()
 
 
 void SAL_CALL OwnView_Impl::notifyEvent( const document::EventObject& aEvent )
-        throw ( uno::RuntimeException, std::exception )
 {
 
     uno::Reference< frame::XModel > xModel;
@@ -604,14 +601,11 @@ void SAL_CALL OwnView_Impl::notifyEvent( const document::EventObject& aEvent )
 
 
 void SAL_CALL OwnView_Impl::queryClosing( const lang::EventObject&, sal_Bool )
-        throw ( util::CloseVetoException,
-                uno::RuntimeException, std::exception )
 {
 }
 
 
 void SAL_CALL OwnView_Impl::notifyClosing( const lang::EventObject& Source )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( Source.Source == m_xModel )
@@ -620,7 +614,6 @@ void SAL_CALL OwnView_Impl::notifyClosing( const lang::EventObject& Source )
 
 
 void SAL_CALL OwnView_Impl::disposing( const lang::EventObject& Source )
-        throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( Source.Source == m_xModel )
diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 8878583bf5c7..4b437fea8d51 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -70,12 +70,12 @@ public:
 
     void Close();
 
-    virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) override;
 
-    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) override;
 
-    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;
 };
 
 #endif
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index 2b46d2f1099a..e7cc0216e938 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -130,10 +130,6 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
             const uno::Reference< embed::XStorage >& xStorage,
             const OUString& sEntName,
             const uno::Sequence< beans::PropertyValue >& aInObjArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException )
 {
     embed::InsertedObjectInfo aObjectInfo;
     uno::Sequence< beans::PropertyValue > aObjArgs( aInObjArgs );
@@ -282,10 +278,6 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
                 const uno::Reference< embed::XStorage >& xStorage,
                 const OUString& sEntryName,
                 const uno::Sequence< beans::PropertyValue >& aObjectArgs )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException )
 {
     embed::InsertedObjectInfo aObjectInfo;
 
@@ -331,21 +323,18 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
 
 
 OUString SAL_CALL MSOLEDialogObjectCreator::getImplementationName()
-    throw ( uno::RuntimeException )
 {
     return impl_staticGetImplementationName();
 }
 
 
 sal_Bool SAL_CALL MSOLEDialogObjectCreator::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
 uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::getSupportedServiceNames()
-    throw ( uno::RuntimeException )
 {
     return impl_staticGetSupportedServiceNames();
 }
diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx
index 714afeb1ddf1..5aec4daa17e7 100644
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
@@ -52,15 +52,15 @@ public:
 
 
     // XInsertObjectDialog
-    virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException) override;
+    virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceByDialog( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XEmbedObjectClipboardCreator
-    virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntryName, const css::uno::Sequence< css::beans::PropertyValue >& aObjectArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException) override;
+    virtual css::embed::InsertedObjectInfo SAL_CALL createInstanceInitFromClipboard( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntryName, const css::uno::Sequence< css::beans::PropertyValue >& aObjectArgs ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index 0653adde576c..81b0d04c8481 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -61,11 +61,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
                                                                     const OUString& sEntName,
                                                                     const uno::Sequence< beans::PropertyValue >& aMedDescr,
                                                                     const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            container::NoSuchElementException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     if ( !xStorage.is() )
         throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -132,10 +127,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
         const OUString& sEntName,
         const uno::Sequence< beans::PropertyValue >& aMediaDescr,
         const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     if ( !xStorage.is() )
         throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -172,10 +163,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
                                             const uno::Reference< embed::XStorage >& xStorage,
                                             const OUString& sEntName,
                                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception)
 {
     if ( !xStorage.is() )
         throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -211,10 +198,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
                                             const OUString& sEntName,
                                             const uno::Sequence< beans::PropertyValue >& aMediaDescr,
                                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::Exception,
-                uno::RuntimeException, std::exception )
 {
     if ( !xStorage.is() )
         throw lang::IllegalArgumentException( "No parent storage is provided!",
@@ -253,10 +236,6 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
             sal_Int32 /*nEntryConnectionMode*/,
             const uno::Sequence< beans::PropertyValue >& /*lArguments*/,
             const uno::Sequence< beans::PropertyValue >& lObjArgs )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     // the initialization is completely controlled by user
     if ( !xStorage.is() )
@@ -291,20 +270,17 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
 
 
 OUString SAL_CALL OleEmbeddedObjectFactory::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetImplementationName();
 }
 
 sal_Bool SAL_CALL OleEmbeddedObjectFactory::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
 uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetSupportedServiceNames();
 }
diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx
index cbc22773b32a..afe8165ffe64 100644
--- a/embeddedobj/source/msole/xolefactory.hxx
+++ b/embeddedobj/source/msole/xolefactory.hxx
@@ -52,20 +52,20 @@ public:
 
 
     // XEmbedObjectCreator
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitNew( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromEntry( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMedDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceInitFromMediaDescriptor( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XEmbedObjectFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceUserInit( const css::uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName, const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, sal_Int32 nEntryConnectionMode, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XLinkCreator
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceLink( const css::uno::Reference< css::embed::XStorage >& xStorage, const OUString& sEntName, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr, const css::uno::Sequence< css::beans::PropertyValue >& lObjArgs ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 650fe6675585..783ca2ef765e 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -1200,9 +1200,6 @@ HRESULT DocumentHolder::SetObjectRects(LPCRECT aRect, LPCRECT aClip)
 
 
 css::uno::Reference< css::awt::XWindow> SAL_CALL DocumentHolder::getContainerWindow()
-    throw (
-        css::uno::RuntimeException
-    )
 {
     if(m_xContainerWindow.is())
         return m_xContainerWindow;
@@ -1253,9 +1250,6 @@ css::uno::Reference< css::awt::XWindow> SAL_CALL DocumentHolder::getContainerWin
 
 
 sal_Bool SAL_CALL DocumentHolder::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace )
-    throw(
-        css::uno::RuntimeException
-    )
 {
     if(m_bOnDeactivate)
         return true;
@@ -1272,9 +1266,6 @@ sal_Bool SAL_CALL DocumentHolder::requestDockingAreaSpace( const css::awt::Recta
 
 
 void SAL_CALL DocumentHolder::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace )
-    throw (
-        css::uno::RuntimeException
-    )
 {
     if(m_bOnDeactivate)
         return;
@@ -1307,7 +1298,6 @@ void SAL_CALL DocumentHolder::setDockingAreaSpace( const css::awt::Rectangle& Bo
 
 
 void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource )
-        throw( uno::RuntimeException )
 {
     if ( m_xDocument.is() && m_xDocument == aSource.Source )
     {
@@ -1325,9 +1315,6 @@ DocumentHolder::queryClosing(
     const lang::EventObject& aSource,
     sal_Bool /*bGetsOwnership*/
 )
-    throw(
-        util::CloseVetoException
-    )
 {
     if (!m_bLink
         && ((m_xDocument.is() && m_xDocument == aSource.Source)
@@ -1339,7 +1326,6 @@ DocumentHolder::queryClosing(
 void SAL_CALL
 DocumentHolder::notifyClosing(
     const lang::EventObject& aSource )
-        throw( uno::RuntimeException )
 {
     try
     {
@@ -1369,9 +1355,6 @@ void SAL_CALL
 DocumentHolder::queryTermination(
     const lang::EventObject& /*aSource*/
 )
-    throw(
-        frame::TerminationVetoException
-    )
 {
     if ( m_xDocument.is() )
         throw frame::TerminationVetoException();
@@ -1381,7 +1364,6 @@ void SAL_CALL
 DocumentHolder::notifyTermination(
     const lang::EventObject& aSource
 )
-        throw( uno::RuntimeException )
 {
     OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." );
     uno::Reference< frame::XDesktop > xDesktop(
@@ -1393,7 +1375,6 @@ DocumentHolder::notifyTermination(
 
 
 void SAL_CALL DocumentHolder::modified( const lang::EventObject& /*aEvent*/ )
-    throw (uno::RuntimeException)
 {
     if ( m_xOleAccess.is() )
     {
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index 3bde41481447..8924d33d8ee0 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -45,7 +45,6 @@ public:
 void SAL_CALL
 Interceptor::addEventListener(
     const uno::Reference<lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -60,7 +59,6 @@ Interceptor::addEventListener(
 void SAL_CALL
 Interceptor::removeEventListener(
     const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -70,7 +68,6 @@ Interceptor::removeEventListener(
 
 
 void SAL_CALL Interceptor::dispose()
-    throw(css::uno::RuntimeException)
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast< frame::XDispatch* >( this );
@@ -140,7 +137,6 @@ Interceptor::dispatch(
     const util::URL& URL,
     const uno::Sequence<
     beans::PropertyValue >& Arguments )
-    throw (uno::RuntimeException)
 {
     ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl > xOleAccess;
     {
@@ -265,9 +261,6 @@ Interceptor::addStatusListener(
     const uno::Reference<
     frame::XStatusListener >& Control,
     const util::URL& URL )
-    throw (
-        uno::RuntimeException
-    )
 {
     if(!Control.is())
         return;
@@ -374,9 +367,6 @@ Interceptor::removeStatusListener(
     const uno::Reference<
     frame::XStatusListener >& Control,
     const util::URL& URL )
-    throw (
-        uno::RuntimeException
-    )
 {
     if(!(Control.is() && m_pStatCL))
         return;
@@ -391,9 +381,6 @@ Interceptor::removeStatusListener(
 uno::Sequence< OUString >
 SAL_CALL
 Interceptor::getInterceptedURLs(  )
-    throw (
-        uno::RuntimeException
-    )
 {
     // now implemented as update
     if ( m_bLink )
@@ -416,9 +403,6 @@ Interceptor::queryDispatch(
     const util::URL& URL,
     const OUString& TargetFrameName,
     sal_Int32 SearchFlags )
-    throw (
-        uno::RuntimeException
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     if( !m_bLink && URL.Complete == m_aInterceptedURL[0] )
@@ -445,9 +429,6 @@ Interceptor::queryDispatch(
 uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL
 Interceptor::queryDispatches(
     const uno::Sequence<frame::DispatchDescriptor >& Requests )
-    throw (
-        uno::RuntimeException
-    )
 {
     uno::Sequence< uno::Reference< frame::XDispatch > > aRet;
     osl::MutexGuard aGuard(m_aMutex);
@@ -478,9 +459,6 @@ Interceptor::queryDispatches(
 
 uno::Reference< frame::XDispatchProvider > SAL_CALL
 Interceptor::getSlaveDispatchProvider(  )
-    throw (
-        uno::RuntimeException
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     return m_xSlaveDispatchProvider;
@@ -489,9 +467,6 @@ Interceptor::getSlaveDispatchProvider(  )
 void SAL_CALL
 Interceptor::setSlaveDispatchProvider(
     const uno::Reference< frame::XDispatchProvider >& NewDispatchProvider )
-    throw (
-        uno::RuntimeException
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_xSlaveDispatchProvider = NewDispatchProvider;
@@ -500,9 +475,6 @@ Interceptor::setSlaveDispatchProvider(
 
 uno::Reference< frame::XDispatchProvider > SAL_CALL
 Interceptor::getMasterDispatchProvider(  )
-    throw (
-        uno::RuntimeException
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     return m_xMasterDispatchProvider;
@@ -512,9 +484,6 @@ Interceptor::getMasterDispatchProvider(  )
 void SAL_CALL
 Interceptor::setMasterDispatchProvider(
     const uno::Reference< frame::XDispatchProvider >& NewSupplier )
-    throw (
-        uno::RuntimeException
-    )
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_xMasterDispatchProvider = NewSupplier;
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index f6d10d564a46..bbe5f6b7f321 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -34,10 +34,9 @@
 
 using namespace ::com::sun::star;
 
-
+/// @throws uno::Exception
 uno::Reference<uno::XInterface> SAL_CALL EmbedServer_createInstance(
     const uno::Reference<lang::XMultiServiceFactory> & xSMgr)
-throw (uno::Exception)
 {
     uno::Reference<uno::XInterface > xService = *new EmbedServer_Impl( xSMgr );
     return xService;
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index 5afe6d33cf56..ae3d887ac11d 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -120,19 +120,16 @@ EmbedServer_Impl::~EmbedServer_Impl()
 }
 
 OUString EmbedServer_Impl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.ole.EmbedServer");
 }
 
 sal_Bool EmbedServer_Impl::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> EmbedServer_Impl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.document.OleEmbeddedServerRegistration"};
diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx
index e350b434d337..6a9f9b1a8541 100644
--- a/embedserv/source/inc/docholder.hxx
+++ b/embedserv/source/inc/docholder.hxx
@@ -197,75 +197,54 @@ public:
 
     // XEventListener
     virtual void SAL_CALL
-    disposing( const css::lang::EventObject& aSource )
-        throw( css::uno::RuntimeException ) override;
+    disposing( const css::lang::EventObject& aSource ) override;
 
     // XCloseListener
     virtual void SAL_CALL
     queryClosing(
         const css::lang::EventObject& aSource,
         sal_Bool bGetsOwnership
-    )
-        throw(
-            css::util::CloseVetoException
-        ) override;
+    ) override;
 
     virtual void SAL_CALL
     notifyClosing(
         const css::lang::EventObject& aSource
-    )
-        throw( css::uno::RuntimeException ) override;
+    ) override;
 
     // XTerminateListener
     virtual void SAL_CALL
     queryTermination(
         const css::lang::EventObject& aSource
-    )
-        throw(
-            css::frame::TerminationVetoException
-        ) override;
+    ) override;
 
     virtual void SAL_CALL
     notifyTermination(
         const css::lang::EventObject& aSource
-    )
-        throw( css::uno::RuntimeException ) override;
+    ) override;
 
 
     // XModifyListener
     virtual void SAL_CALL
     modified(
         const css::lang::EventObject& aEvent
-    )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+    ) override;
 
     // XDockingAreaAcceptor
 
     virtual css::uno::Reference<
         css::awt::XWindow> SAL_CALL
     getContainerWindow(
-    )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+    ) override;
 
     virtual sal_Bool SAL_CALL
     requestDockingAreaSpace(
         const css::awt::Rectangle& RequestedSpace
-    )
-        throw(
-            css::uno::RuntimeException
-        ) override;
+    ) override;
 
     virtual void SAL_CALL
     setDockingAreaSpace(
         const css::awt::Rectangle& BorderSpace
-    )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+    ) override;
 };
 
 #endif
diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx
index 739c9ae6320c..5fffcafa0f59 100644
--- a/embedserv/source/inc/intercept.hxx
+++ b/embedserv/source/inc/intercept.hxx
@@ -58,48 +58,39 @@ public:
 
 
     // XComponent
+    /// @throws css::uno::RuntimeException
     virtual void SAL_CALL
     addEventListener(
-        const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw( css::uno::RuntimeException );
+        const css::uno::Reference< css::lang::XEventListener >& xListener );
 
+    /// @throws css::uno::RuntimeException
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw( css::uno::RuntimeException );
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener );
 
+    /// @throws css::uno::RuntimeException
     void SAL_CALL
-    dispose() throw(css::uno::RuntimeException);
+    dispose();
 
 
     //XDispatch
     virtual void SAL_CALL
     dispatch(
         const css::util::URL& URL,
-        const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
-        throw (css::uno::RuntimeException) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
     virtual void SAL_CALL
     addStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& Control,
-        const css::util::URL& URL )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+        const css::util::URL& URL ) override;
 
     virtual void SAL_CALL
     removeStatusListener(
         const css::uno::Reference< css::frame::XStatusListener >& Control,
-        const css::util::URL& URL )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+        const css::util::URL& URL ) override;
 
     //XInterceptorInfo
     virtual css::uno::Sequence< OUString >
-    SAL_CALL getInterceptedURLs(  )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+    SAL_CALL getInterceptedURLs(  ) override;
 
 
     //XDispatchProvider ( inherited by XDispatchProviderInterceptor )
@@ -108,46 +99,28 @@ public:
     queryDispatch(
         const css::util::URL& URL,
         const OUString& TargetFrameName,
-        sal_Int32 SearchFlags )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+        sal_Int32 SearchFlags ) override;
 
     virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
     queryDispatches(
         const css::uno::Sequence<
-        css::frame::DispatchDescriptor >& Requests )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+        css::frame::DispatchDescriptor >& Requests ) override;
 
 
     //XDispatchProviderInterceptor
     virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
-    getSlaveDispatchProvider(  )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+    getSlaveDispatchProvider(  ) override;
 
     virtual void SAL_CALL
     setSlaveDispatchProvider(
-        const css::uno::Reference< css::frame::XDispatchProvider >& NewDispatchProvider )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+        const css::uno::Reference< css::frame::XDispatchProvider >& NewDispatchProvider ) override;
 
     virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
-    getMasterDispatchProvider(  )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+    getMasterDispatchProvider(  ) override;
 
     virtual void SAL_CALL
     setMasterDispatchProvider(
-        const css::uno::Reference< css::frame::XDispatchProvider >& NewSupplier )
-        throw (
-            css::uno::RuntimeException
-        ) override;
+        const css::uno::Reference< css::frame::XDispatchProvider >& NewSupplier ) override;
 
 
 private:
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx
index ab0c78d843ef..6d1d887da4c0 100644
--- a/embedserv/source/inc/servprov.hxx
+++ b/embedserv/source/inc/servprov.hxx
@@ -37,14 +37,11 @@ public:
     EmbedServer_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > &xFactory );
     virtual ~EmbedServer_Impl() override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 protected:
 
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 5ca8f94f74bd..79beb577e99a 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -65,14 +65,12 @@ public:
         const Reference< XAllListener >& AllListener, const Any& Helper );
 
     // XInvocation
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
-        throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value)
-        throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override;
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() override;
+    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) override;
+    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) override;
+    virtual Any SAL_CALL getValue(const OUString& PropertyName) override;
+    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) override;
+    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) override;
 
 private:
     Reference< XAllListener >    m_xAllListener;
@@ -115,7 +113,6 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper
 
 
 Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection()
-    throw( RuntimeException, std::exception )
 {
     return Reference< XIntrospectionAccess >();
 }
@@ -123,8 +120,6 @@ Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getInt
 
 Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, const Sequence< Any >& Params,
     Sequence< sal_Int16 >& , Sequence< Any >& )
-        throw( IllegalArgumentException, CannotConvertException,
-        InvocationTargetException, RuntimeException, std::exception )
 {
     Any aRet;
 
@@ -173,21 +168,17 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
 
 
 void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& , const Any& )
-    throw( UnknownPropertyException, CannotConvertException,
-           InvocationTargetException, RuntimeException, std::exception )
 {
 }
 
 
 Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& )
-    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     return Any();
 }
 
 
 sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name)
-    throw( RuntimeException, std::exception )
 {
     Reference< XIdlMethod > xMethod = m_xListenerType->getMethod( Name );
     return xMethod.is();
@@ -195,7 +186,6 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name)
 
 
 sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Name)
-    throw( RuntimeException, std::exception )
 {
     Reference< XIdlField > xField = m_xListenerType->getField( Name );
     return xField.is();
@@ -211,38 +201,33 @@ public:
     explicit EventAttacherImpl( const Reference< XComponentContext >& );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
-        throw( Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // Methoden von XEventAttacher
     virtual Reference< XEventListener > SAL_CALL attachListener(const Reference< XInterface >& xObject,
             const Reference< XAllListener >& AllListener, const Any& Helper,
-            const OUString& ListenerType, const OUString& AddListenerParam)
-        throw( IllegalArgumentException, ServiceNotRegisteredException, CannotCreateAdapterException, IntrospectionException, RuntimeException, std::exception ) override;
+            const OUString& ListenerType, const OUString& AddListenerParam) override;
     virtual Reference< XEventListener > SAL_CALL attachSingleEventListener(const Reference< XInterface >& xObject,
             const Reference< XAllListener >& AllListener, const Any& Helper,
             const OUString& ListenerType, const OUString& AddListenerParam,
-            const OUString& EventMethod)
-        throw( IllegalArgumentException, ServiceNotRegisteredException, CannotCreateAdapterException, IntrospectionException, RuntimeException, std::exception ) override;
+            const OUString& EventMethod) override;
     virtual void SAL_CALL removeListener(const Reference< XInterface >& xObject,
             const OUString& ListenerType, const OUString& AddListenerParam,
-            const Reference< XEventListener >& aToRemoveListener)
-        throw( IllegalArgumentException, IntrospectionException, RuntimeException, std::exception ) override;
+            const Reference< XEventListener >& aToRemoveListener) override;
 
     // XEventAttacher2
     virtual Sequence< Reference<XEventListener> > SAL_CALL attachMultipleEventListeners(
-        const Reference<XInterface>& xObject, const Sequence<css::script::EventListener>& aListeners )
-            throw( IllegalArgumentException, ServiceNotRegisteredException, CannotCreateAdapterException, IntrospectionException, RuntimeException, std::exception ) override;
+        const Reference<XInterface>& xObject, const Sequence<css::script::EventListener>& aListeners ) override;
 
     // used by FilterAllListener_Impl
     /// @throws Exception
-    Reference< XTypeConverter > getConverter() throw( Exception );
+    Reference< XTypeConverter > getConverter();
 
     friend class FilterAllListenerImpl;
 
@@ -273,11 +258,11 @@ private:
 
     // needed services
     /// @throws Exception
-    Reference< XIntrospection >             getIntrospection() throw( Exception );
+    Reference< XIntrospection >             getIntrospection();
     /// @throws Exception
-    Reference< XIdlReflection >             getReflection() throw( Exception );
+    Reference< XIdlReflection >             getReflection();
     /// @throws Exception
-    Reference< XInvocationAdapterFactory2 >  getInvocationAdapterService() throw( Exception );
+    Reference< XInvocationAdapterFactory2 >  getInvocationAdapterService();
 };
 
 
@@ -287,7 +272,7 @@ EventAttacherImpl::EventAttacherImpl( const Reference< XComponentContext >& rxCo
 }
 
 /// @throws Exception
-Reference< XInterface > SAL_CALL EventAttacherImpl_CreateInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( Exception )
+Reference< XInterface > SAL_CALL EventAttacherImpl_CreateInstance( const Reference< XMultiServiceFactory >& rSMgr )
 {
     XEventAttacher *pEventAttacher = static_cast<XEventAttacher*>(new EventAttacherImpl( comphelper::getComponentContext(rSMgr) ));
 
@@ -298,19 +283,16 @@ Reference< XInterface > SAL_CALL EventAttacherImpl_CreateInstance( const Referen
 
 
 OUString SAL_CALL EventAttacherImpl::getImplementationName(  )
-    throw(RuntimeException, std::exception)
 {
     return OUString(  IMPLNAME  );
 }
 
 sal_Bool SAL_CALL EventAttacherImpl::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence<OUString> SAL_CALL EventAttacherImpl::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
@@ -322,7 +304,7 @@ Sequence<OUString> SAL_CALL EventAttacherImpl::getSupportedServiceNames_Static(
     return Sequence< OUString >( &aStr, 1 );
 }
 
-void SAL_CALL EventAttacherImpl::initialize(const Sequence< Any >& Arguments) throw( Exception, RuntimeException, std::exception )
+void SAL_CALL EventAttacherImpl::initialize(const Sequence< Any >& Arguments)
 {
     // get services from the argument list
     const Any * pArray = Arguments.getConstArray();
@@ -372,7 +354,7 @@ void SAL_CALL EventAttacherImpl::initialize(const Sequence< Any >& Arguments) th
 
 
 //*** Private helper methods ***
-Reference< XIntrospection > EventAttacherImpl::getIntrospection() throw( Exception )
+Reference< XIntrospection > EventAttacherImpl::getIntrospection()
 {
     Guard< Mutex > aGuard( m_aMutex );
     if( !m_xIntrospection.is() )
@@ -384,7 +366,7 @@ Reference< XIntrospection > EventAttacherImpl::getIntrospection() throw( Excepti
 
 
 //*** Private helper methods ***
-Reference< XIdlReflection > EventAttacherImpl::getReflection() throw( Exception )
+Reference< XIdlReflection > EventAttacherImpl::getReflection()
 {
     Guard< Mutex > aGuard( m_aMutex );
     if( !m_xReflection.is() )
@@ -396,7 +378,7 @@ Reference< XIdlReflection > EventAttacherImpl::getReflection() throw( Exception
 
 
 //*** Private helper methods ***
-Reference< XInvocationAdapterFactory2 > EventAttacherImpl::getInvocationAdapterService() throw( Exception )
+Reference< XInvocationAdapterFactory2 > EventAttacherImpl::getInvocationAdapterService()
 {
     Guard< Mutex > aGuard( m_aMutex );
     if( !m_xInvocationAdapterFactory.is() )
@@ -408,7 +390,7 @@ Reference< XInvocationAdapterFactory2 > EventAttacherImpl::getInvocationAdapterS
 
 
 //*** Private helper methods ***
-Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception )
+Reference< XTypeConverter > EventAttacherImpl::getConverter()
 {
     Guard< Mutex > aGuard( m_aMutex );
     if( !m_xConverter.is() )
@@ -428,18 +410,17 @@ public:
                            const Reference< XAllListener >& AllListener_ );
 
     // XAllListener
-    virtual void SAL_CALL firing(const AllEventObject& Event) throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw( InvocationTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL firing(const AllEventObject& Event) override;
+    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const EventObject& Source) override;
 
 private:
     // convert
     /// @throws CannotConvertException
     /// @throws RuntimeException
-    void convertToEventReturn( Any & rRet, const Type& rRetType )
-            throw (CannotConvertException, RuntimeException);
+    void convertToEventReturn( Any & rRet, const Type& rRetType );
 
     EventAttacherImpl *         m_pEA;
     OUString                    m_EventMethod;
@@ -457,7 +438,6 @@ FilterAllListenerImpl::FilterAllListenerImpl( EventAttacherImpl * pEA_, const OU
 
 
 void SAL_CALL FilterAllListenerImpl::firing(const AllEventObject& Event)
-    throw( RuntimeException, std::exception )
 {
     if( Event.MethodName == m_EventMethod && m_AllListener.is() )
         m_AllListener->firing( Event );
@@ -465,7 +445,6 @@ void SAL_CALL FilterAllListenerImpl::firing(const AllEventObject& Event)
 
 // Convert to the standard event return
 void FilterAllListenerImpl::convertToEventReturn( Any & rRet, const Type & rRetType )
-    throw (CannotConvertException, RuntimeException)
 {
     // no return value? Set to the specified values
     if( rRet.getValueType().getTypeClass() == TypeClass_VOID )
@@ -509,7 +488,6 @@ void FilterAllListenerImpl::convertToEventReturn( Any & rRet, const Type & rRetT
 
 
 Any SAL_CALL FilterAllListenerImpl::approveFiring( const AllEventObject& Event )
-    throw( InvocationTargetException, RuntimeException, std::exception )
 {
     Any aRet;
 
@@ -540,7 +518,6 @@ Any SAL_CALL FilterAllListenerImpl::approveFiring( const AllEventObject& Event )
 
 
 void FilterAllListenerImpl::disposing(const EventObject& )
-    throw( RuntimeException, std::exception )
 {
     // TODO: ???
 }
@@ -554,7 +531,6 @@ Reference< XEventListener > EventAttacherImpl::attachListener
     const OUString& ListenerType,
     const OUString& AddListenerParam
 )
-    throw( IllegalArgumentException, ServiceNotRegisteredException, CannotCreateAdapterException, IntrospectionException, RuntimeException, std::exception )
 {
     if( !xObject.is() || !AllListener.is() )
         throw IllegalArgumentException();
@@ -748,7 +724,6 @@ Reference< XEventListener > EventAttacherImpl::attachSingleEventListener
     const OUString& AddListenerParam,
     const OUString& EventMethod
 )
-    throw( IllegalArgumentException, ServiceNotRegisteredException, CannotCreateAdapterException, IntrospectionException, RuntimeException, std::exception )
 {
     // Subscribe FilterListener
     Reference< XAllListener > aFilterListener = static_cast<XAllListener*>(
@@ -764,7 +739,6 @@ void EventAttacherImpl::removeListener
     const OUString& AddListenerParam,
     const Reference< XEventListener >& aToRemoveListener
 )
-    throw( IllegalArgumentException, IntrospectionException, RuntimeException, std::exception )
 {
     if( !xObject.is() || !aToRemoveListener.is() )
         throw IllegalArgumentException();
@@ -863,7 +837,6 @@ void EventAttacherImpl::removeListener
 
 Sequence< Reference<XEventListener> > EventAttacherImpl::attachMultipleEventListeners(
     const Reference<XInterface>& xObject, const Sequence<css::script::EventListener>& aListeners )
-        throw( IllegalArgumentException, ServiceNotRegisteredException, CannotCreateAdapterException, IntrospectionException, RuntimeException, std::exception )
 {
     sal_Int32 nCount = aListeners.getLength();
     Sequence< Reference<XAllListener> > aFilterListeners(nCount);
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index a767eb34121e..a1fb0295c00d 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -41,7 +41,7 @@ namespace abp
             &m_sDataSourceName, cppu::UnoType<decltype(m_sDataSourceName)>::get() );
     }
 
-    Any SAL_CALL OABSPilotUno::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+    Any SAL_CALL OABSPilotUno::queryInterface( const Type& aType )
     {
         Any aReturn = svt::OGenericUnoDialog::queryInterface( aType );
         return aReturn.hasValue() ? aReturn : OABSPilotUno_JBase::queryInterface( aType );
@@ -57,7 +57,7 @@ namespace abp
         svt::OGenericUnoDialog::release();
     }
 
-    Sequence< Type > SAL_CALL OABSPilotUno::getTypes(  ) throw (RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL OABSPilotUno::getTypes(  )
     {
         return ::comphelper::concatSequences(
             svt::OGenericUnoDialog::getTypes(),
@@ -65,22 +65,22 @@ namespace abp
         );
     }
 
-    Sequence<sal_Int8> SAL_CALL OABSPilotUno::getImplementationId(  ) throw(RuntimeException, std::exception)
+    Sequence<sal_Int8> SAL_CALL OABSPilotUno::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
 
-    OUString SAL_CALL OABSPilotUno::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OABSPilotUno::getImplementationName()
     {
         return OUString("org.openoffice.comp.abp.OAddressBookSourcePilot");
     }
 
-    css::uno::Sequence<OUString> SAL_CALL OABSPilotUno::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    css::uno::Sequence<OUString> SAL_CALL OABSPilotUno::getSupportedServiceNames()
     {
         return { "com.sun.star.ui.dialogs.AddressBookSourcePilot" };
     }
 
-    Reference<XPropertySetInfo>  SAL_CALL OABSPilotUno::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference<XPropertySetInfo>  SAL_CALL OABSPilotUno::getPropertySetInfo()
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
@@ -100,7 +100,7 @@ namespace abp
         return new ::cppu::OPropertyArrayHelper(aProps);
     }
 
-    void SAL_CALL OABSPilotUno::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception)
+    void SAL_CALL OABSPilotUno::initialize( const Sequence< Any >& aArguments )
     {
         Reference<awt::XWindow> xParentWindow;
         if (aArguments.getLength() == 1 && (aArguments[0] >>= xParentWindow) ) {
@@ -118,7 +118,7 @@ namespace abp
     }
 
 
-    Any SAL_CALL OABSPilotUno::execute( const Sequence< NamedValue >& /*lArgs*/ ) throw (IllegalArgumentException, Exception, RuntimeException, std::exception)
+    Any SAL_CALL OABSPilotUno::execute( const Sequence< NamedValue >& /*lArgs*/ )
     {
         // not interested in the context, not interested in the args
         // -> call the execute method of the XExecutableDialog
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index 7d5800d0ea7f..a2dafa18838f 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -45,30 +45,30 @@ namespace abp
 
     private:
         // XInterface (disambiguation)
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire(  ) throw () override;
         virtual void SAL_CALL release(  ) throw () override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
         // XJob
-        virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& lArgs ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& lArgs ) override;
 
         // XInitialisation
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         using svt::OGenericUnoDialog::execute;
         // OGenericUnoDialog overridables
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index af9a478a6e1b..f3fcf41b746f 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -97,9 +97,9 @@ public:
                             virtual ~BibliographyLoader() override;
 
     // XServiceInfo
-    OUString               SAL_CALL getImplementationName() throw(std::exception  ) override;
-    sal_Bool                    SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  ) override;
-    Sequence< OUString >   SAL_CALL getSupportedServiceNames() throw(std::exception  ) override;
+    OUString               SAL_CALL getImplementationName() override;
+    sal_Bool                    SAL_CALL supportsService(const OUString& ServiceName) override;
+    Sequence< OUString >   SAL_CALL getSupportedServiceNames() override;
     static OUString                getImplementationName_Static() throw(  )
 
                             {
@@ -109,33 +109,33 @@ public:
                             }
 
     //XNameAccess
-    virtual Any SAL_CALL getByName(const OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual Sequence< OUString > SAL_CALL getElementNames() throw ( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw ( RuntimeException, std::exception ) override;
+    virtual Any SAL_CALL getByName(const OUString& aName) override;
+    virtual Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& aName) override;
 
     //XElementAccess
-    virtual Type  SAL_CALL getElementType() throw ( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasElements() throw ( RuntimeException, std::exception ) override;
+    virtual Type  SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     //XPropertySet
-    virtual Reference< XPropertySetInfo >  SAL_CALL getPropertySetInfo() throw ( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual Reference< XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) override;
+    virtual Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) override;
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) override;
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) override;
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) override;
 
     static Sequence<OUString>  SAL_CALL getSupportedServiceNames_Static() throw(  );
 
     /// @throws Exception
-    friend  Reference< XInterface >     SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception );
+    friend  Reference< XInterface >     SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr );
 
     // XLoader
     virtual void            SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL,
                                 const Sequence< PropertyValue >& aArgs,
-                                const Reference< XLoadEventListener > & aListener) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void            SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override;
+                                const Reference< XLoadEventListener > & aListener) override;
+    virtual void            SAL_CALL cancel() override;
 };
 
 BibliographyLoader::BibliographyLoader() :
@@ -153,27 +153,27 @@ BibliographyLoader::~BibliographyLoader()
 }
 
 
-Reference< XInterface >  SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory >  & /*rSMgr*/ ) throw( Exception )
+Reference< XInterface >  SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory >  & /*rSMgr*/ )
 {
     return *(new BibliographyLoader);
 }
 
 
 // XServiceInfo
-OUString BibliographyLoader::getImplementationName() throw(std::exception  )
+OUString BibliographyLoader::getImplementationName()
 
 {
     return getImplementationName_Static();
 }
 
 // XServiceInfo
-sal_Bool BibliographyLoader::supportsService(const OUString& ServiceName) throw(std::exception  )
+sal_Bool BibliographyLoader::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > BibliographyLoader::getSupportedServiceNames() throw(std::exception  )
+Sequence< OUString > BibliographyLoader::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -213,7 +213,7 @@ extern "C"
 
 }
 
-void BibliographyLoader::cancel() throw (css::uno::RuntimeException, std::exception)
+void BibliographyLoader::cancel()
 {
     //!
     //!
@@ -221,7 +221,7 @@ void BibliographyLoader::cancel() throw (css::uno::RuntimeException, std::except
 
 void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString& rURL,
         const Sequence< PropertyValue >& rArgs,
-        const Reference< XLoadEventListener > & rListener) throw (css::uno::RuntimeException, std::exception)
+        const Reference< XLoadEventListener > & rListener)
 {
 
     SolarMutexGuard aGuard;
@@ -438,8 +438,7 @@ static OUString lcl_AddProperty(const Reference< XNameAccess >&  xColumns,
     return uRet;
 }
 
-Any BibliographyLoader::getByName(const OUString& rName) throw
-                        ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
+Any BibliographyLoader::getByName(const OUString& rName)
 {
     Any aRet;
     try
@@ -492,7 +491,7 @@ Any BibliographyLoader::getByName(const OUString& rName) throw
     return aRet;
 }
 
-Sequence< OUString > BibliographyLoader::getElementNames() throw ( RuntimeException, std::exception )
+Sequence< OUString > BibliographyLoader::getElementNames()
 {
     Sequence< OUString > aRet(10);
     int nRealNameCount = 0;
@@ -527,7 +526,7 @@ Sequence< OUString > BibliographyLoader::getElementNames() throw ( RuntimeExcept
     return aRet;
 }
 
-sal_Bool BibliographyLoader::hasByName(const OUString& rName) throw ( RuntimeException, std::exception )
+sal_Bool BibliographyLoader::hasByName(const OUString& rName)
 {
     bool bRet = false;
     try
@@ -556,20 +555,19 @@ sal_Bool BibliographyLoader::hasByName(const OUString& rName) throw ( RuntimeExc
     return bRet;
 }
 
-Type  BibliographyLoader::getElementType() throw ( RuntimeException, std::exception )
+Type  BibliographyLoader::getElementType()
 {
     return cppu::UnoType<Sequence<PropertyValue>>::get();
 }
 
-sal_Bool BibliographyLoader::hasElements() throw ( RuntimeException, std::exception )
+sal_Bool BibliographyLoader::hasElements()
 {
     Reference< XResultSet >  xCursor = GetDataCursor();
     Reference< XNameAccess >  xColumns = GetDataColumns();
     return xColumns.is() && (xColumns->getElementNames().getLength() != 0);
 }
 
-Reference< XPropertySetInfo >  BibliographyLoader::getPropertySetInfo() throw
-                                            ( RuntimeException, std::exception )
+Reference< XPropertySetInfo >  BibliographyLoader::getPropertySetInfo()
 {
     static const SfxItemPropertyMapEntry aBibProps_Impl[] =
     {
@@ -583,15 +581,12 @@ Reference< XPropertySetInfo >  BibliographyLoader::getPropertySetInfo() throw
 
 void BibliographyLoader::setPropertyValue(const OUString& /*PropertyName*/,
                                         const Any& /*aValue*/)
-    throw( UnknownPropertyException, PropertyVetoException,
-        IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     throw UnknownPropertyException();
     //no changeable properties
 }
 
 Any BibliographyLoader::getPropertyValue(const OUString& rPropertyName)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     Any aRet;
     static const sal_uInt16 aInternalMapping[] =
@@ -647,28 +642,24 @@ Any BibliographyLoader::getPropertyValue(const OUString& rPropertyName)
 
 void BibliographyLoader::addPropertyChangeListener(
         const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     //no bound properties
 }
 
 void BibliographyLoader::removePropertyChangeListener(
         const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     //no bound properties
 }
 
 void BibliographyLoader::addVetoableChangeListener(
     const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     //no vetoable properties
 }
 
 void BibliographyLoader::removeVetoableChangeListener(
     const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     //no vetoable properties
 }
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index eb8bf7994053..07bd926349ec 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -555,7 +555,7 @@ void BibInterceptorHelper::ReleaseInterceptor()
 }
 
 css::uno::Reference< css::frame::XDispatch > SAL_CALL
-    BibInterceptorHelper::queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (css::uno::RuntimeException, std::exception)
+    BibInterceptorHelper::queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
 {
     Reference< XDispatch > xReturn;
 
@@ -570,7 +570,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL
 }
 
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
-    BibInterceptorHelper::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw (css::uno::RuntimeException, std::exception)
+    BibInterceptorHelper::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts )
 {
     Sequence< Reference< XDispatch> > aReturn( aDescripts.getLength() );
     Reference< XDispatch >* pReturn = aReturn.getArray();
@@ -584,23 +584,23 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
 
 // XDispatchProviderInterceptor
 css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
-    BibInterceptorHelper::getSlaveDispatchProvider(  ) throw (css::uno::RuntimeException, std::exception)
+    BibInterceptorHelper::getSlaveDispatchProvider(  )
 {
     return xSlaveDispatchProvider;
 }
 
-void SAL_CALL BibInterceptorHelper::setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL BibInterceptorHelper::setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlaveDispatchProvider )
 {
     xSlaveDispatchProvider = xNewSlaveDispatchProvider;
 }
 
 css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
-    BibInterceptorHelper::getMasterDispatchProvider(  ) throw (css::uno::RuntimeException, std::exception)
+    BibInterceptorHelper::getMasterDispatchProvider(  )
 {
     return xMasterDispatchProvider;
 }
 
-void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMasterDispatchProvider )
 {
     xMasterDispatchProvider = xNewMasterDispatchProvider;
 }
@@ -1104,7 +1104,7 @@ void BibDataManager::setActiveDataTable(const OUString& rTable)
 }
 
 
-void SAL_CALL BibDataManager::load(  ) throw (RuntimeException, std::exception)
+void SAL_CALL BibDataManager::load(  )
 {
     if ( isLoaded() )
         // nothing to do
@@ -1123,7 +1123,7 @@ void SAL_CALL BibDataManager::load(  ) throw (RuntimeException, std::exception)
 }
 
 
-void SAL_CALL BibDataManager::unload(  ) throw (RuntimeException, std::exception)
+void SAL_CALL BibDataManager::unload(  )
 {
     if ( !isLoaded() )
         // nothing to do
@@ -1149,7 +1149,7 @@ void SAL_CALL BibDataManager::unload(  ) throw (RuntimeException, std::exception
 }
 
 
-void SAL_CALL BibDataManager::reload(  ) throw (RuntimeException, std::exception)
+void SAL_CALL BibDataManager::reload(  )
 {
     if ( !isLoaded() )
         // nothing to do
@@ -1174,7 +1174,7 @@ void SAL_CALL BibDataManager::reload(  ) throw (RuntimeException, std::exception
 }
 
 
-sal_Bool SAL_CALL BibDataManager::isLoaded(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL BibDataManager::isLoaded(  )
 {
     Reference< XLoadable >xFormAsLoadable( m_xForm, UNO_QUERY );
     DBG_ASSERT( xFormAsLoadable.is() || !m_xForm.is(), "BibDataManager::isLoaded: invalid form!");
@@ -1186,13 +1186,13 @@ sal_Bool SAL_CALL BibDataManager::isLoaded(  ) throw (RuntimeException, std::exc
 }
 
 
-void SAL_CALL BibDataManager::addLoadListener( const Reference< XLoadListener >& aListener ) throw (RuntimeException, std::exception)
+void SAL_CALL BibDataManager::addLoadListener( const Reference< XLoadListener >& aListener )
 {
     m_aLoadListeners.addInterface( aListener );
 }
 
 
-void SAL_CALL BibDataManager::removeLoadListener( const Reference< XLoadListener >& aListener ) throw (RuntimeException, std::exception)
+void SAL_CALL BibDataManager::removeLoadListener( const Reference< XLoadListener >& aListener )
 {
     m_aLoadListeners.removeInterface( aListener );
 }
@@ -1412,13 +1412,13 @@ void SAL_CALL BibDataManager::disposing()
 }
 
 
-void BibDataManager::disposing( const EventObject& /*Source*/ ) throw( css::uno::RuntimeException, std::exception )
+void BibDataManager::disposing( const EventObject& /*Source*/ )
 {
     // not interested in
 }
 
 
-void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw( RuntimeException, std::exception )
+void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt)
 {
     try
     {
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index c8d1b4c61595..d24e20170781 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -64,13 +64,13 @@ public:
     void ReleaseInterceptor();
 
     // 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;
-    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;
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL 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 ) 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 >& xNewSlaveDispatchProvider ) throw (css::uno::RuntimeException, std::exception) 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 >& xNewMasterDispatchProvider ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(  ) override;
+    virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) override;
+    virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(  ) override;
+    virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMasterDispatchProvider ) override;
 };
 
 typedef cppu::WeakComponentImplHelper  <   css::beans::XPropertyChangeListener
@@ -112,12 +112,12 @@ protected:
                                     createGridModel( const OUString& rName );
 
         // XLoadable
-        virtual void SAL_CALL load(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL unload(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL reload(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLoaded(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL load(  ) override;
+        virtual void SAL_CALL unload(  ) override;
+        virtual void SAL_CALL reload(  ) override;
+        virtual sal_Bool SAL_CALL isLoaded(  ) override;
+        virtual void SAL_CALL addLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) override;
+        virtual void SAL_CALL removeLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) override;
 
         virtual void SAL_CALL disposing() override;
 
@@ -126,10 +126,8 @@ public:
         BibDataManager();
         virtual ~BibDataManager() override;
 
-        virtual void                SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt)
-                                                                throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void                SAL_CALL disposing( const css::lang::EventObject& Source )
-                                                                throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void                SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
+        virtual void                SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
 
         css::uno::Reference< css::form::XForm >                   createDatabaseForm( BibDBDescriptor&    aDesc);
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 98160bfc4415..5f78a4254e77 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -144,16 +144,15 @@ public:
                                             , pController(nullptr)
                                         {}
 
-    virtual void                        SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) override;
-    virtual void                        SAL_CALL disposing( const lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void                        SAL_CALL frameAction(const FrameActionEvent& aEvent) override;
+    virtual void                        SAL_CALL disposing( const lang::EventObject& Source ) override;
 };
 
-void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& ) throw( uno::RuntimeException, std::exception )
+void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& )
 {
 }
 
 void BibFrameCtrl_Impl::disposing( const lang::EventObject& /*Source*/ )
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
     if ( pController )
@@ -180,17 +179,17 @@ BibFrameController_Impl::~BibFrameController_Impl()
         CloseBibModul(pBibMod);
 }
 
-OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL BibFrameController_Impl::getImplementationName()
 {
     return OUString("com.sun.star.comp.extensions.Bibliography");
 }
 
-sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService( this, sServiceName );
 }
 
-css::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames()
 {
     // return only top level services ...
     // base services are included there and should be asked by uno-rtti.
@@ -198,18 +197,18 @@ css::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedSer
     return lNames;
 }
 
-void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg ) throw (css::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg )
 {
     xFrame = xArg;
     xFrame->addFrameActionListener( mxImpl.get() );
 }
 
-sal_Bool BibFrameController_Impl::attachModel( const uno::Reference< XModel > & /*xModel*/ ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool BibFrameController_Impl::attachModel( const uno::Reference< XModel > & /*xModel*/ )
 {
     return false;
 }
 
-sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend )
 {
     if ( bSuspend )
         getFrame()->removeFrameActionListener( mxImpl.get() );
@@ -218,26 +217,26 @@ sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (css::uno::
     return true;
 }
 
-uno::Any BibFrameController_Impl::getViewData() throw (css::uno::RuntimeException, std::exception)
+uno::Any BibFrameController_Impl::getViewData()
 {
     return uno::Any();
 }
 
-void BibFrameController_Impl::restoreViewData( const uno::Any& /*Value*/ ) throw (css::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::restoreViewData( const uno::Any& /*Value*/ )
 {
 }
 
-uno::Reference< XFrame >  BibFrameController_Impl::getFrame() throw (css::uno::RuntimeException, std::exception)
+uno::Reference< XFrame >  BibFrameController_Impl::getFrame()
 {
     return xFrame;
 }
 
-uno::Reference< XModel >  BibFrameController_Impl::getModel() throw (css::uno::RuntimeException, std::exception)
+uno::Reference< XModel >  BibFrameController_Impl::getModel()
 {
     return uno::Reference< XModel > ();
 }
 
-void BibFrameController_Impl::dispose() throw (css::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::dispose()
 {
     bDisposing = true;
     lang::EventObject aObject;
@@ -247,17 +246,17 @@ void BibFrameController_Impl::dispose() throw (css::uno::RuntimeException, std::
     aStatusListeners.clear();
  }
 
-void BibFrameController_Impl::addEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::addEventListener( const uno::Reference< lang::XEventListener > & aListener )
 {
     mxImpl->aLC.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
 }
 
-void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::XEventListener > & aListener )
 {
     mxImpl->aLC.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
 }
 
-uno::Reference< frame::XDispatch >  BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (css::uno::RuntimeException, std::exception)
+uno::Reference< frame::XDispatch >  BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ )
 {
     if ( !bDisposing )
     {
@@ -274,7 +273,7 @@ uno::Reference< frame::XDispatch >  BibFrameController_Impl::queryDispatch( cons
     return uno::Reference< frame::XDispatch > ();
 }
 
-uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispatches( const uno::Sequence<DispatchDescriptor>& aDescripts ) throw (css::uno::RuntimeException, std::exception)
+uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispatches( const uno::Sequence<DispatchDescriptor>& aDescripts )
 {
     uno::Sequence< uno::Reference< XDispatch > > aDispatches( aDescripts.getLength() );
     for ( sal_Int32 i=0; i<aDescripts.getLength(); ++i )
@@ -283,7 +282,6 @@ uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispat
 }
 
 uno::Sequence< ::sal_Int16 > SAL_CALL BibFrameController_Impl::getSupportedCommandGroups()
-throw (css::uno::RuntimeException, std::exception)
 {
     uno::Sequence< ::sal_Int16 > aDispatchInfo( 4 );
 
@@ -296,7 +294,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 uno::Sequence< frame::DispatchInformation > SAL_CALL BibFrameController_Impl::getConfigurableDispatchInformation( ::sal_Int16 nCommandGroup )
-throw (css::uno::RuntimeException, std::exception)
 {
     const CmdToInfoCache& rCmdCache = GetCommandToInfoCache();
 
@@ -389,8 +386,6 @@ static vcl::Window* lcl_GetFocusChild( vcl::Window* pParent )
 
 //class XDispatch
 void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequence< beans::PropertyValue >& aArgs)
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
     if ( !bDisposing )
     {
@@ -622,8 +617,6 @@ IMPL_LINK_NOARG( BibFrameController_Impl, DisposeHdl, void*, void )
 void BibFrameController_Impl::addStatusListener(
     const uno::Reference< frame::XStatusListener > & aListener,
     const util::URL& aURL)
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
     BibConfig* pConfig = BibModul::GetConfig();
     // create a new Reference and insert into listener array
@@ -753,7 +746,6 @@ void BibFrameController_Impl::addStatusListener(
 
 void BibFrameController_Impl::removeStatusListener(
     const uno::Reference< frame::XStatusListener > & aObject, const util::URL& aURL)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // search listener array for given listener
     // for checking equality always "cast" to XInterface
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 5a51b04d8c70..7a46633c34db 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -82,40 +82,36 @@ public:
     void                        RemoveFilter();
 
                                 // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::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;
 
                                 // css::frame::XController
-    virtual void                SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool            SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool            SAL_CALL suspend( sal_Bool bSuspend ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any       SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void                SAL_CALL restoreViewData( const css::uno::Any& Value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void                SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) override;
+    virtual sal_Bool            SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) override;
+    virtual sal_Bool            SAL_CALL suspend( sal_Bool bSuspend ) override;
+    virtual css::uno::Any       SAL_CALL getViewData() override;
+    virtual void                SAL_CALL restoreViewData( const css::uno::Any& Value ) override;
+    virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() override;
+    virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() override;
 
                                 // css::lang::XComponent
-    virtual void                SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void                SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void                SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void                SAL_CALL dispose() override;
+    virtual void                SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) override;
+    virtual void                SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) override;
 
                                 // css::frame::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;
-    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;
+    virtual css::uno::Reference< css::frame::XDispatch >          SAL_CALL 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) override;
 
                                 //class css::frame::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;
 
                                 // css::frame::XDispatchInformationProvider
-    virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) 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 CommandGroup ) override;
  };
 
 #endif
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index c963356cc0be..0e1217823c15 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -75,12 +75,12 @@ public:
     explicit BibPosListener(BibGeneralPage* pParent);
 
     //XPositioningListener
-    virtual void SAL_CALL cursorMoved(const lang::EventObject& event) throw( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL rowChanged(const lang::EventObject& /*event*/) throw( uno::RuntimeException, std::exception ) override { /* not interested in */ }
-    virtual void SAL_CALL rowSetChanged(const lang::EventObject& /*event*/) throw( uno::RuntimeException, std::exception ) override { /* not interested in */ }
+    virtual void SAL_CALL cursorMoved(const lang::EventObject& event) override;
+    virtual void SAL_CALL rowChanged(const lang::EventObject& /*event*/) override { /* not interested in */ }
+    virtual void SAL_CALL rowSetChanged(const lang::EventObject& /*event*/) override { /* not interested in */ }
 
     //XEventListener
-    virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const lang::EventObject& Source) override;
 
 };
 
@@ -89,7 +89,7 @@ BibPosListener::BibPosListener(BibGeneralPage* pParent) :
 {
 }
 
-void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno::RuntimeException, std::exception )
+void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/)
 {
     try
     {
@@ -160,7 +160,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno
     }
 }
 
-void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno::RuntimeException, std::exception )
+void BibPosListener::disposing(const lang::EventObject& /*Source*/)
 {
 }
 
@@ -583,7 +583,7 @@ void BibGeneralPage::InitFixedTexts()
         aFixedTexts[ i ]->SetText( aFixedStrings[ i ] );
 }
 
-void BibGeneralPage::focusGained(const awt::FocusEvent& rEvent) throw( uno::RuntimeException, std::exception )
+void BibGeneralPage::focusGained(const awt::FocusEvent& rEvent)
 {
     Reference<awt::XWindow> xCtrWin(rEvent.Source, UNO_QUERY );
     if(xCtrWin.is())
@@ -605,7 +605,7 @@ void BibGeneralPage::focusGained(const awt::FocusEvent& rEvent) throw( uno::Runt
     }
 }
 
-void BibGeneralPage::focusLost(const awt::FocusEvent& ) throw( uno::RuntimeException, std::exception )
+void BibGeneralPage::focusLost(const awt::FocusEvent& )
 {
     CommitActiveControl();
 }
@@ -695,17 +695,17 @@ bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
 BibGeneralPageFocusListener::BibGeneralPageFocusListener(BibGeneralPage *pBibGeneralPage): mpBibGeneralPage(pBibGeneralPage)
 {}
 
-void BibGeneralPageFocusListener::focusGained( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception )
+void BibGeneralPageFocusListener::focusGained( const css::awt::FocusEvent& e )
 {
     mpBibGeneralPage->focusGained(e);
 }
 
-void BibGeneralPageFocusListener::focusLost( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception )
+void BibGeneralPageFocusListener::focusLost( const css::awt::FocusEvent& e )
 {
     mpBibGeneralPage->focusLost(e);
 }
 
-void BibGeneralPageFocusListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
+void BibGeneralPageFocusListener::disposing( const css::lang::EventObject& )
 {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index dfcaf52a1a9c..8c4beff41526 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -50,9 +50,9 @@ private:
     VclPtr<BibGeneralPage> mpBibGeneralPage;
 public:
     explicit BibGeneralPageFocusListener(BibGeneralPage *pBibGeneralPage);
-    virtual void SAL_CALL       focusGained( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL       focusLost( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL       disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL       focusGained( const css::awt::FocusEvent& e ) override;
+    virtual void SAL_CALL       focusLost( const css::awt::FocusEvent& e ) override;
+    virtual void SAL_CALL       disposing( const css::lang::EventObject& Source ) override;
 
 };
 
@@ -163,9 +163,9 @@ public:
     const rtl::Reference<BibGeneralPageFocusListener>& GetFocusListener() { return mxBibGeneralPageFocusListener; }
 
     /// @throws css::uno::RuntimeException
-    void focusGained(const css::awt::FocusEvent& rEvent) throw( css::uno::RuntimeException, std::exception );
+    void focusGained(const css::awt::FocusEvent& rEvent);
     /// @throws css::uno::RuntimeException
-    void focusLost(const css::awt::FocusEvent& rEvent) throw( css::uno::RuntimeException, std::exception );
+    void focusLost(const css::awt::FocusEvent& rEvent);
 
 };
 
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx
index 7b6f35ae02a2..7b5d4d61d29e 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -92,7 +92,7 @@ namespace bib
     // XEventListener
 
 
-    void SAL_CALL OComponentAdapterBase::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+    void SAL_CALL OComponentAdapterBase::disposing( const EventObject& )
     {
         if ( m_pListener )
         {
@@ -134,7 +134,7 @@ namespace bib
     }
 
 
-    void SAL_CALL OLoadListenerAdapter::disposing( const  EventObject& _rSource ) throw( RuntimeException, std::exception)
+    void SAL_CALL OLoadListenerAdapter::disposing( const  EventObject& _rSource )
     {
         OComponentAdapterBase::disposing( _rSource );
     }
@@ -148,35 +148,35 @@ namespace bib
     }
 
 
-    void SAL_CALL OLoadListenerAdapter::loaded( const EventObject& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OLoadListenerAdapter::loaded( const EventObject& _rEvent )
     {
         if ( getLoadListener( ) )
             getLoadListener( )->_loaded( _rEvent );
     }
 
 
-    void SAL_CALL OLoadListenerAdapter::unloading( const EventObject& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OLoadListenerAdapter::unloading( const EventObject& _rEvent )
     {
         if ( getLoadListener( ) )
             getLoadListener( )->_unloading( _rEvent );
     }
 
 
-    void SAL_CALL OLoadListenerAdapter::unloaded( const EventObject& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OLoadListenerAdapter::unloaded( const EventObject& _rEvent )
     {
         if ( getLoadListener( ) )
             getLoadListener( )->_unloaded( _rEvent );
     }
 
 
-    void SAL_CALL OLoadListenerAdapter::reloading( const EventObject& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OLoadListenerAdapter::reloading( const EventObject& _rEvent )
     {
         if ( getLoadListener( ) )
             getLoadListener( )->_reloading( _rEvent );
     }
 
 
-    void SAL_CALL OLoadListenerAdapter::reloaded( const EventObject& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OLoadListenerAdapter::reloaded( const EventObject& _rEvent )
     {
         if ( getLoadListener( ) )
             getLoadListener( )->_reloaded( _rEvent );
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index d61756c2356a..e0cceb66c3d4 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -95,7 +95,7 @@ namespace bib
     protected:
     // XEventListener
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL disposing( const  css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception);
+        virtual void SAL_CALL disposing( const  css::lang::EventObject& Source );
     };
 
     class OLoadListener : public OComponentListener
@@ -136,14 +136,14 @@ namespace bib
 
     protected:
     // XEventListener
-        virtual void SAL_CALL disposing( const  css::lang::EventObject& _rSource ) throw( css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const  css::lang::EventObject& _rSource ) override;
 
     // XLoadListener
-        virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) override;
+        virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) override;
+        virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) override;
+        virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) override;
+        virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) override;
     };
 
 
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 7afd21011ed4..1a0b71eae714 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -58,7 +58,7 @@ BibToolBarListener::~BibToolBarListener()
 {
 }
 
-void BibToolBarListener::statusChanged(const css::frame::FeatureStateEvent& rEvt)throw( css::uno::RuntimeException, std::exception )
+void BibToolBarListener::statusChanged(const css::frame::FeatureStateEvent& rEvt)
 {
     if(rEvt.FeatureURL.Complete == aCommand)
     {
@@ -84,7 +84,7 @@ BibTBListBoxListener::~BibTBListBoxListener()
 {
 }
 
-void BibTBListBoxListener::statusChanged(const css::frame::FeatureStateEvent& rEvt)throw( css::uno::RuntimeException, std::exception )
+void BibTBListBoxListener::statusChanged(const css::frame::FeatureStateEvent& rEvt)
 {
     if(rEvt.FeatureURL.Complete == GetCommand())
     {
@@ -122,7 +122,7 @@ BibTBQueryMenuListener::~BibTBQueryMenuListener()
 {
 }
 
-void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw( uno::RuntimeException, std::exception )
+void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt)
 {
     if(rEvt.FeatureURL.Complete == GetCommand())
     {
@@ -158,7 +158,7 @@ BibTBEditListener::~BibTBEditListener()
 {
 }
 
-void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw( uno::RuntimeException, std::exception )
+void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)
 {
     if(rEvt.FeatureURL.Complete == GetCommand())
     {
@@ -518,7 +518,6 @@ IMPL_LINK_NOARG( BibToolBar, MenuHdl, ToolBox*, void)
 }
 
 void    BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent)
-                                            throw( uno::RuntimeException )
 {
     for(uno::Reference<frame::XStatusListener> & rListener : aListenerArr)
     {
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 117de636d5f3..810445e85c7e 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -55,12 +55,10 @@ public:
 
     // css::lang::XEventListener
     // we do not hold References to dispatches, so there is nothing to do on disposal
-    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 {};
 
     // css::frame::XStatusListener
-    virtual void    SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event)
-                                            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void    SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override;
 
 };
 
@@ -71,8 +69,7 @@ public:
     BibTBListBoxListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
     virtual ~BibTBListBoxListener() override;
 
-    virtual void    SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event)
-                                            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void    SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override;
 
 };
 
@@ -83,8 +80,7 @@ public:
     BibTBEditListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
     virtual ~BibTBEditListener() override;
 
-    virtual void    SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event)
-                                            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void    SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override;
 
 };
 
@@ -95,8 +91,7 @@ public:
     BibTBQueryMenuListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
     virtual ~BibTBQueryMenuListener() override;
 
-    virtual void    SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event)
-                                            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void    SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override;
 
 };
 
@@ -176,8 +171,7 @@ class BibToolBar:   public ToolBox
         void    SelectFilterItem(sal_uInt16 nId);
 
         /// @throws css::uno::RuntimeException
-        void    statusChanged(const css::frame::FeatureStateEvent& Event)
-                                            throw( css::uno::RuntimeException );
+        void    statusChanged(const css::frame::FeatureStateEvent& Event);
 
         void    SetDatMan(BibDataManager& rDatMan) {pDatMan = &rDatMan;}
         void    SendDispatch(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue >& rArgs);
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 65ecc4e33dd5..a1a0fde40b64 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -95,7 +95,6 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
 }
 
 void  LdapConnection::connectSimple(const LdapDefinition& aDefinition)
-   throw (ldap::LdapConnectionException, ldap::LdapGenericException)
 {
     OSL_ENSURE(!isValid(), "Re-connecting to an LDAP connection that is already established");
     if (isValid()) disconnect();
@@ -105,7 +104,6 @@ void  LdapConnection::connectSimple(const LdapDefinition& aDefinition)
 }
 
 void  LdapConnection::connectSimple()
-   throw (ldap::LdapConnectionException, ldap::LdapGenericException)
 {
     if (!isValid())
     {
@@ -147,7 +145,6 @@ void  LdapConnection::connectSimple()
 }
 
 void LdapConnection::initConnection()
-    throw (ldap::LdapConnectionException)
 {
     if (mLdapDefinition.mServer.isEmpty())
     {
@@ -180,8 +177,6 @@ void LdapConnection::initConnection()
 
  void LdapConnection::getUserProfile(
      const OUString& aUser, LdapData * data)
-    throw (lang::IllegalArgumentException,
-            ldap::LdapConnectionException, ldap::LdapGenericException)
 {
     OSL_ASSERT(data != nullptr);
     if (!isValid()) { connectSimple(); }
@@ -238,8 +233,6 @@ void LdapConnection::initConnection()
 }
 
  OUString LdapConnection::findUserDn(const OUString& aUser)
-    throw (lang::IllegalArgumentException,
-            ldap::LdapConnectionException, ldap::LdapGenericException)
 {
     if (!isValid()) { connectSimple(); }
 
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index 7aa848910c90..4b101b371934 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -86,9 +86,7 @@ public:
         @throws ldap::LdapConnectionException
         @throws ldap::LdapGenericException
     */
-    void  connectSimple(const LdapDefinition& aDefinition)
-        throw (ldap::LdapConnectionException,
-                ldap::LdapGenericException);
+    void  connectSimple(const LdapDefinition& aDefinition);
 
     /**
         Gets LdapUserProfile from LDAP repository for specified user
@@ -99,10 +97,7 @@ public:
          @throws css::ldap::LdapGenericException
                   if an LDAP error occurs.
     */
-    void getUserProfile(const OUString& aUser, LdapData * data)
-         throw (lang::IllegalArgumentException,
-                 ldap::LdapConnectionException,
-                 ldap::LdapGenericException);
+    void getUserProfile(const OUString& aUser, LdapData * data);
 
     /** finds DN of user
         @return  DN of User
@@ -110,15 +105,11 @@ public:
         @throws ldap::LdapConnectionException
         @throws ldap::LdapGenericException
     */
-    OUString findUserDn(const OUString& aUser)
-        throw (lang::IllegalArgumentException,
-                ldap::LdapConnectionException,
-                ldap::LdapGenericException);
+    OUString findUserDn(const OUString& aUser);
 
 private:
     /// @throws ldap::LdapConnectionException
-    void initConnection()
-         throw (ldap::LdapConnectionException);
+    void initConnection();
     void disconnect();
     /**
       Indicates whether the connection is in a valid state.
@@ -128,9 +119,7 @@ private:
 
     /// @throws ldap::LdapConnectionException
     /// @throws ldap::LdapGenericException
-    void  connectSimple()
-        throw (ldap::LdapConnectionException,
-                ldap::LdapGenericException);
+    void  connectSimple();
 
     /** LDAP connection object */
     LDAP* mConnection ;
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index ee154bc6005e..f936358a5ec9 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -168,10 +168,6 @@ bool LdapUserProfileBe::getLdapStringParam(
 
 void LdapUserProfileBe::setPropertyValue(
     OUString const &, css::uno::Any const &)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     throw css::lang::IllegalArgumentException(
         OUString("setPropertyValue not supported"),
@@ -180,9 +176,6 @@ void LdapUserProfileBe::setPropertyValue(
 
 css::uno::Any LdapUserProfileBe::getPropertyValue(
     OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     for (sal_Int32 i = 0;;) {
         sal_Int32 j = PropertyName.indexOf(',', i);
@@ -214,7 +207,6 @@ OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName() {
 
 
 OUString SAL_CALL LdapUserProfileBe::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return getLdapUserProfileBeName() ;
 }
@@ -227,14 +219,12 @@ uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceN
 }
 
 sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const OUString& aServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, aServiceName);
 }
 
 uno::Sequence<OUString>
 SAL_CALL LdapUserProfileBe::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return getLdapUserProfileBeServiceNames() ;
 }
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index 2a50c44bfab7..89b1f034e086 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -59,66 +59,43 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase
 
         // XServiceInfo
         virtual OUString SAL_CALL
-            getImplementationName(  )
-                throw (uno::RuntimeException, std::exception) override ;
+            getImplementationName(  ) override ;
 
         virtual sal_Bool SAL_CALL
-            supportsService( const OUString& aServiceName )
-                throw (uno::RuntimeException, std::exception) override ;
+            supportsService( const OUString& aServiceName ) override ;
 
         virtual uno::Sequence<OUString> SAL_CALL
-            getSupportedServiceNames(  )
-                throw (uno::RuntimeException, std::exception) override ;
+            getSupportedServiceNames(  ) override ;
 
         // XPropertySet
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override
+        getPropertySetInfo() override
         { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
 
         virtual void SAL_CALL setPropertyValue(
-            OUString const &, css::uno::Any const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            OUString const &, css::uno::Any const &) override;
 
         virtual css::uno::Any SAL_CALL getPropertyValue(
-            OUString const & PropertyName)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            OUString const & PropertyName) override;
 
         virtual void SAL_CALL addPropertyChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
         {}
 
         virtual void SAL_CALL removePropertyChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
         {}
 
         virtual void SAL_CALL addVetoableChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
         {}
 
         virtual void SAL_CALL removeVetoableChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
         {}
 
          /**
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx
index 91187d78d661..e0d1ff000dc9 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -49,31 +49,31 @@ namespace dbp
 
     public:
         // XTypeProvider
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override
         {
             return css::uno::Sequence<sal_Int8>();
         }
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getImplementationName() override
         {
             return getImplementationName_Static();
         }
 
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
         {
             return getSupportedServiceNames_Static();
         }
 
         // XServiceInfo - static methods
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException )
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static()
         {
             return SERVICEINFO::getServiceNames();
         }
 
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException )
+        static OUString getImplementationName_Static()
         {
             return SERVICEINFO::getImplementationName();
         }
@@ -85,7 +85,7 @@ namespace dbp
         }
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override
         {
             css::uno::Reference< css::beans::XPropertySetInfo >  xInfo( createPropertySetInfo( getInfoHelper() ) );
             return xInfo;
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index ea6af6884ddd..8db97dd1b350 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -65,23 +65,23 @@ namespace logging
 
     private:
         // XConsoleHandler
-        virtual ::sal_Int32 SAL_CALL getThreshold() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getThreshold() override;
+        virtual void SAL_CALL setThreshold( ::sal_Int32 _threshold ) override;
 
         // XLogHandler
-        virtual OUString SAL_CALL getEncoding() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException, std::exception) override;
-        virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL flush(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getEncoding() override;
+        virtual void SAL_CALL setEncoding( const OUString& _encoding ) override;
+        virtual Reference< XLogFormatter > SAL_CALL getFormatter() override;
+        virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) override;
+        virtual ::sal_Int32 SAL_CALL getLevel() override;
+        virtual void SAL_CALL setLevel( ::sal_Int32 _level ) override;
+        virtual void SAL_CALL flush(  ) override;
+        virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
@@ -150,21 +150,21 @@ namespace logging
     }
 
 
-    ::sal_Int32 SAL_CALL ConsoleHandler::getThreshold() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL ConsoleHandler::getThreshold()
     {
         MethodGuard aGuard( *this );
         return m_nThreshold;
     }
 
 
-    void SAL_CALL ConsoleHandler::setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException, std::exception)
+    void SAL_CALL ConsoleHandler::setThreshold( ::sal_Int32 _threshold )
     {
         MethodGuard aGuard( *this );
         m_nThreshold = _threshold;
     }
 
 
-    OUString SAL_CALL ConsoleHandler::getEncoding() throw (RuntimeException, std::exception)
+    OUString SAL_CALL ConsoleHandler::getEncoding()
     {
         MethodGuard aGuard( *this );
         OUString sEncoding;
@@ -173,42 +173,42 @@ namespace logging
     }
 
 
-    void SAL_CALL ConsoleHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException, std::exception)
+    void SAL_CALL ConsoleHandler::setEncoding( const OUString& _rEncoding )
     {
         MethodGuard aGuard( *this );
         OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) );
     }
 
 
-    Reference< XLogFormatter > SAL_CALL ConsoleHandler::getFormatter() throw (RuntimeException, std::exception)
+    Reference< XLogFormatter > SAL_CALL ConsoleHandler::getFormatter()
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getFormatter();
     }
 
 
-    void SAL_CALL ConsoleHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException, std::exception)
+    void SAL_CALL ConsoleHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter )
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setFormatter( _rxFormatter );
     }
 
 
-    ::sal_Int32 SAL_CALL ConsoleHandler::getLevel() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL ConsoleHandler::getLevel()
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getLevel();
     }
 
 
-    void SAL_CALL ConsoleHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception)
+    void SAL_CALL ConsoleHandler::setLevel( ::sal_Int32 _nLevel )
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setLevel( _nLevel );
     }
 
 
-    void SAL_CALL ConsoleHandler::flush(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL ConsoleHandler::flush(  )
     {
         MethodGuard aGuard( *this );
         fflush( stdout );
@@ -216,7 +216,7 @@ namespace logging
     }
 
 
-    sal_Bool SAL_CALL ConsoleHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL ConsoleHandler::publish( const LogRecord& _rRecord )
     {
         MethodGuard aGuard( *this );
 
@@ -232,17 +232,17 @@ namespace logging
         return true;
     }
 
-    OUString SAL_CALL ConsoleHandler::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL ConsoleHandler::getImplementationName()
     {
         return OUString("com.sun.star.comp.extensions.ConsoleHandler");
     }
 
-    sal_Bool SAL_CALL ConsoleHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL ConsoleHandler::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames()
     {
         return { "com.sun.star.logging.ConsoleHandler" };
     }
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index f668c287fab8..98e64e1c454d 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -43,33 +43,33 @@ namespace logging
     class CsvFormatter : public cppu::WeakImplHelper<css::logging::XCsvLogFormatter, css::lang::XServiceInfo>
     {
     public:
-        virtual OUString SAL_CALL formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL formatMultiColumn(const Sequence< OUString>& column_data) override;
 
         CsvFormatter();
 
     private:
         // XCsvLogFormatter
-        virtual sal_Bool SAL_CALL getLogEventNo() throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getLogThread() throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getLogTimestamp() throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getLogSource() throw (RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getColumnnames() throw (RuntimeException, std::exception) override;
-
-        virtual void SAL_CALL setLogEventNo( sal_Bool log_event_no ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLogThread( sal_Bool log_thread ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLogTimestamp( sal_Bool log_timestamp ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLogSource( sal_Bool log_source ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setColumnnames( const Sequence< OUString>& column_names) throw (RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getLogEventNo() override;
+        virtual sal_Bool SAL_CALL getLogThread() override;
+        virtual sal_Bool SAL_CALL getLogTimestamp() override;
+        virtual sal_Bool SAL_CALL getLogSource() override;
+        virtual Sequence< OUString > SAL_CALL getColumnnames() override;
+
+        virtual void SAL_CALL setLogEventNo( sal_Bool log_event_no ) override;
+        virtual void SAL_CALL setLogThread( sal_Bool log_thread ) override;
+        virtual void SAL_CALL setLogTimestamp( sal_Bool log_timestamp ) override;
+        virtual void SAL_CALL setLogSource( sal_Bool log_source ) override;
+        virtual void SAL_CALL setColumnnames( const Sequence< OUString>& column_names) override;
 
         // XLogFormatter
-        virtual OUString SAL_CALL getHead(  ) throw (RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTail(  ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getHead(  ) override;
+        virtual OUString SAL_CALL format( const LogRecord& Record ) override;
+        virtual OUString SAL_CALL getTail(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& service_name ) throw(RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& service_name ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     private:
         bool m_LogEventNo;
@@ -136,58 +136,58 @@ namespace logging
         m_Columnnames({ "message" })
     { }
 
-    sal_Bool CsvFormatter::getLogEventNo() throw (RuntimeException, std::exception)
+    sal_Bool CsvFormatter::getLogEventNo()
     {
         return m_LogEventNo;
     }
 
-    sal_Bool CsvFormatter::getLogThread() throw (RuntimeException, std::exception)
+    sal_Bool CsvFormatter::getLogThread()
     {
         return m_LogThread;
     }
 
-    sal_Bool CsvFormatter::getLogTimestamp() throw (RuntimeException, std::exception)
+    sal_Bool CsvFormatter::getLogTimestamp()
     {
         return m_LogTimestamp;
     }
 
-    sal_Bool CsvFormatter::getLogSource() throw (RuntimeException, std::exception)
+    sal_Bool CsvFormatter::getLogSource()
     {
         return m_LogSource;
     }
 
-    Sequence< OUString > CsvFormatter::getColumnnames() throw (RuntimeException, std::exception)
+    Sequence< OUString > CsvFormatter::getColumnnames()
     {
         return m_Columnnames;
     }
 
-    void CsvFormatter::setLogEventNo(sal_Bool log_event_no) throw (RuntimeException, std::exception)
+    void CsvFormatter::setLogEventNo(sal_Bool log_event_no)
     {
         m_LogEventNo = log_event_no;
     }
 
-    void CsvFormatter::setLogThread(sal_Bool log_thread) throw (RuntimeException, std::exception)
+    void CsvFormatter::setLogThread(sal_Bool log_thread)
     {
         m_LogThread = log_thread;
     }
 
-    void CsvFormatter::setLogTimestamp(sal_Bool log_timestamp) throw (RuntimeException, std::exception)
+    void CsvFormatter::setLogTimestamp(sal_Bool log_timestamp)
     {
         m_LogTimestamp = log_timestamp;
     }
 
-    void CsvFormatter::setLogSource(sal_Bool log_source) throw (RuntimeException, std::exception)
+    void CsvFormatter::setLogSource(sal_Bool log_source)
     {
         m_LogSource = log_source;
     }
 
-    void CsvFormatter::setColumnnames(const Sequence< OUString >& columnnames) throw (RuntimeException, std::exception)
+    void CsvFormatter::setColumnnames(const Sequence< OUString >& columnnames)
     {
         m_Columnnames = Sequence< OUString>(columnnames);
         m_MultiColumn = (m_Columnnames.getLength()>1);
     }
 
-    OUString SAL_CALL CsvFormatter::getHead(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL CsvFormatter::getHead(  )
     {
         OUStringBuffer buf;
         if(m_LogEventNo)
@@ -209,7 +209,7 @@ namespace logging
         return buf.makeStringAndClear();
     }
 
-    OUString SAL_CALL CsvFormatter::format( const LogRecord& record ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL CsvFormatter::format( const LogRecord& record )
     {
         OUStringBuffer aLogEntry;
 
@@ -264,12 +264,12 @@ namespace logging
         return aLogEntry.makeStringAndClear();
     }
 
-    OUString SAL_CALL CsvFormatter::getTail(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL CsvFormatter::getTail(  )
     {
         return OUString();
     }
 
-    OUString SAL_CALL CsvFormatter::formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException, std::exception)
+    OUString SAL_CALL CsvFormatter::formatMultiColumn(const Sequence< OUString>& column_data)
     {
         sal_Int32 columns = column_data.getLength();
         OUStringBuffer buf;
@@ -282,17 +282,17 @@ namespace logging
         return buf.makeStringAndClear();
     }
 
-    sal_Bool SAL_CALL CsvFormatter::supportsService( const OUString& service_name ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL CsvFormatter::supportsService( const OUString& service_name )
     {
         return cppu::supportsService(this, service_name);
     }
 
-    OUString SAL_CALL CsvFormatter::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL CsvFormatter::getImplementationName()
     {
         return OUString("com.sun.star.comp.extensions.CsvFormatter");
     }
 
-    Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL CsvFormatter::getSupportedServiceNames()
     {
         return { "com.sun.star.logging.CsvFormatter" };
     }
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index c1bd711346cb..0096cad1f06c 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -87,19 +87,19 @@ namespace logging
 
     private:
         // XLogHandler
-        virtual OUString SAL_CALL getEncoding() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException, std::exception) override;
-        virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL flush(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getEncoding() override;
+        virtual void SAL_CALL setEncoding( const OUString& _encoding ) override;
+        virtual Reference< XLogFormatter > SAL_CALL getFormatter() override;
+        virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) override;
+        virtual ::sal_Int32 SAL_CALL getLevel() override;
+        virtual void SAL_CALL setLevel( ::sal_Int32 _level ) override;
+        virtual void SAL_CALL flush(  ) override;
+        virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
@@ -260,7 +260,7 @@ namespace logging
     }
 
 
-    OUString SAL_CALL FileHandler::getEncoding() throw (RuntimeException, std::exception)
+    OUString SAL_CALL FileHandler::getEncoding()
     {
         MethodGuard aGuard( *this );
         OUString sEncoding;
@@ -269,42 +269,42 @@ namespace logging
     }
 
 
-    void SAL_CALL FileHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException, std::exception)
+    void SAL_CALL FileHandler::setEncoding( const OUString& _rEncoding )
     {
         MethodGuard aGuard( *this );
         OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) );
     }
 
 
-    Reference< XLogFormatter > SAL_CALL FileHandler::getFormatter() throw (RuntimeException, std::exception)
+    Reference< XLogFormatter > SAL_CALL FileHandler::getFormatter()
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getFormatter();
     }
 
 
-    void SAL_CALL FileHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException, std::exception)
+    void SAL_CALL FileHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter )
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setFormatter( _rxFormatter );
     }
 
 
-    ::sal_Int32 SAL_CALL FileHandler::getLevel() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL FileHandler::getLevel()
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getLevel();
     }
 
 
-    void SAL_CALL FileHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception)
+    void SAL_CALL FileHandler::setLevel( ::sal_Int32 _nLevel )
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setLevel( _nLevel );
     }
 
 
-    void SAL_CALL FileHandler::flush(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL FileHandler::flush(  )
     {
         MethodGuard aGuard( *this );
         if(!m_pFile.get())
@@ -317,7 +317,7 @@ namespace logging
     }
 
 
-    sal_Bool SAL_CALL FileHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL FileHandler::publish( const LogRecord& _rRecord )
     {
         MethodGuard aGuard( *this );
 
@@ -332,17 +332,17 @@ namespace logging
         return true;
     }
 
-    OUString SAL_CALL FileHandler::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL FileHandler::getImplementationName()
     {
         return OUString("com.sun.star.comp.extensions.FileHandler");
     }
 
-    sal_Bool SAL_CALL FileHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL FileHandler::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames()
     {
         return { "com.sun.star.logging.FileHandler" };
     }
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index ff3d731879e7..f528c847701c 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -66,14 +66,14 @@ namespace logging
         EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName );
 
         // XLogger
-        virtual OUString SAL_CALL getName() throw (RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL addLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLoggable( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL log( ::sal_Int32 Level, const OUString& Message ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL logp( ::sal_Int32 Level, const OUString& SourceClass, const OUString& SourceMethod, const OUString& Message ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName() override;
+        virtual ::sal_Int32 SAL_CALL getLevel() override;
+        virtual void SAL_CALL setLevel( ::sal_Int32 _level ) override;
+        virtual void SAL_CALL addLogHandler( const Reference< XLogHandler >& LogHandler ) override;
+        virtual void SAL_CALL removeLogHandler( const Reference< XLogHandler >& LogHandler ) override;
+        virtual sal_Bool SAL_CALL isLoggable( ::sal_Int32 _nLevel ) override;
+        virtual void SAL_CALL log( ::sal_Int32 Level, const OUString& Message ) override;
+        virtual void SAL_CALL logp( ::sal_Int32 Level, const OUString& SourceClass, const OUString& SourceMethod, const OUString& Message ) override;
 
     protected:
         virtual ~EventLogger() override;
@@ -102,13 +102,13 @@ namespace logging
         explicit LoggerPool( const Reference< XComponentContext >& _rxContext );
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XLoggerPool
-        virtual Reference< XLogger > SAL_CALL getNamedLogger( const OUString& Name ) throw (RuntimeException, std::exception) override;
-        virtual Reference< XLogger > SAL_CALL getDefaultLogger(  ) throw (RuntimeException, std::exception) override;
+        virtual Reference< XLogger > SAL_CALL getNamedLogger( const OUString& Name ) override;
+        virtual Reference< XLogger > SAL_CALL getDefaultLogger(  ) override;
     };
 
     EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName )
@@ -152,42 +152,42 @@ namespace logging
             [] (Reference<XLogHandler> const& rxListener) { rxListener->flush(); } );
     }
 
-    OUString SAL_CALL EventLogger::getName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL EventLogger::getName()
     {
         return m_sName;
     }
 
-    ::sal_Int32 SAL_CALL EventLogger::getLevel() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL EventLogger::getLevel()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_nLogLevel;
     }
 
-    void SAL_CALL EventLogger::setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception)
+    void SAL_CALL EventLogger::setLevel( ::sal_Int32 _level )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_nLogLevel = _level;
     }
 
-    void SAL_CALL EventLogger::addLogHandler( const Reference< XLogHandler >& _rxLogHandler ) throw (RuntimeException, std::exception)
+    void SAL_CALL EventLogger::addLogHandler( const Reference< XLogHandler >& _rxLogHandler )
     {
         if ( _rxLogHandler.is() )
             m_aHandlers.addInterface( _rxLogHandler );
     }
 
-    void SAL_CALL EventLogger::removeLogHandler( const Reference< XLogHandler >& _rxLogHandler ) throw (RuntimeException, std::exception)
+    void SAL_CALL EventLogger::removeLogHandler( const Reference< XLogHandler >& _rxLogHandler )
     {
         if ( _rxLogHandler.is() )
             m_aHandlers.removeInterface( _rxLogHandler );
     }
 
-    sal_Bool SAL_CALL EventLogger::isLoggable( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL EventLogger::isLoggable( ::sal_Int32 _nLevel )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return impl_nts_isLoggable_nothrow( _nLevel );
     }
 
-    void SAL_CALL EventLogger::log( ::sal_Int32 _nLevel, const OUString& _rMessage ) throw (RuntimeException, std::exception)
+    void SAL_CALL EventLogger::log( ::sal_Int32 _nLevel, const OUString& _rMessage )
     {
         impl_ts_logEvent_nothrow( createLogRecord(
             m_sName,
@@ -197,7 +197,7 @@ namespace logging
         ) );
     }
 
-    void SAL_CALL EventLogger::logp( ::sal_Int32 _nLevel, const OUString& _rSourceClass, const OUString& _rSourceMethod, const OUString& _rMessage ) throw (RuntimeException, std::exception)
+    void SAL_CALL EventLogger::logp( ::sal_Int32 _nLevel, const OUString& _rSourceClass, const OUString& _rSourceMethod, const OUString& _rMessage )
     {
         impl_ts_logEvent_nothrow( createLogRecord(
             m_sName,
@@ -214,22 +214,22 @@ namespace logging
     {
     }
 
-    OUString SAL_CALL LoggerPool::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL LoggerPool::getImplementationName()
     {
         return OUString("com.sun.star.comp.extensions.LoggerPool");
     }
 
-    sal_Bool SAL_CALL LoggerPool::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL LoggerPool::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL LoggerPool::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL LoggerPool::getSupportedServiceNames()
     {
         return { "com.sun.star.logging.LoggerPool" };
     }
 
-    Reference< XLogger > SAL_CALL LoggerPool::getNamedLogger( const OUString& _rName ) throw (RuntimeException, std::exception)
+    Reference< XLogger > SAL_CALL LoggerPool::getNamedLogger( const OUString& _rName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -245,7 +245,7 @@ namespace logging
         return xLogger;
     }
 
-    Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger(  ) throw (RuntimeException, std::exception)
+    Reference< XLogger > SAL_CALL LoggerPool::getDefaultLogger(  )
     {
         return getNamedLogger( "org.openoffice.logging.DefaultLogger" );
     }
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 7e115dcb610f..40c7c7156c06 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -46,21 +46,21 @@ namespace logging
 
     private:
         // XLogFormatter
-        virtual OUString SAL_CALL getHead(  ) throw (RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTail(  ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getHead(  ) override;
+        virtual OUString SAL_CALL format( const LogRecord& Record ) override;
+        virtual OUString SAL_CALL getTail(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     };
 
     PlainTextFormatter::PlainTextFormatter()
     {
     }
 
-    OUString SAL_CALL PlainTextFormatter::getHead(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL PlainTextFormatter::getHead(  )
     {
         OUStringBuffer aHeader;
         aHeader.append( "  event no" );                 // column 1: the event number
@@ -77,7 +77,7 @@ namespace logging
     }
 
 
-    OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord )
     {
         char buffer[ 30 ];
         const int buffer_size = sizeof( buffer );
@@ -115,24 +115,24 @@ namespace logging
     }
 
 
-    OUString SAL_CALL PlainTextFormatter::getTail(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL PlainTextFormatter::getTail(  )
     {
         // no tail
         return OUString();
     }
 
-    sal_Bool SAL_CALL PlainTextFormatter::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL PlainTextFormatter::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
 
-    OUString SAL_CALL PlainTextFormatter::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL PlainTextFormatter::getImplementationName()
     {
         return OUString("com.sun.star.comp.extensions.PlainTextFormatter");
     }
 
-    Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames()
     {
         return { "com.sun.star.logging.PlainTextFormatter" };
     }
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 272491cc3bfe..851b8055f2c7 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -130,7 +130,6 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl()
 }
 
 Any IUnknownWrapper_Impl::queryInterface(const Type& t)
-    throw (RuntimeException)
 {
     if (t == cppu::UnoType<XDefaultMethod>::get() && !m_bHasDfltMethod )
         return Any();
@@ -149,14 +148,13 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t)
 }
 
 Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection()
-    throw (RuntimeException )
 {
     Reference<XIntrospectionAccess> ret;
 
     return ret;
 }
 
-Any SAL_CALL IUnknownWrapper_Impl::invokeGetProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException)
+Any SAL_CALL IUnknownWrapper_Impl::invokeGetProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
 {
     Any aResult;
     try
@@ -184,7 +182,7 @@ Any SAL_CALL IUnknownWrapper_Impl::invokeGetProperty( const OUString& aPropertyN
     return aResult;
 }
 
-Any SAL_CALL IUnknownWrapper_Impl::invokePutProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException)
+Any SAL_CALL IUnknownWrapper_Impl::invokePutProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
 {
     Any aResult;
     try
@@ -216,8 +214,6 @@ Any SAL_CALL IUnknownWrapper_Impl::invokePutProperty( const OUString& aPropertyN
 Any SAL_CALL IUnknownWrapper_Impl::invoke( const OUString& aFunctionName,
              const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex,
              Sequence< Any >& aOutParam )
-    throw(IllegalArgumentException, CannotConvertException, InvocationTargetException,
-          RuntimeException)
 {
     if ( ! m_spDispatch )
     {
@@ -277,8 +273,6 @@ Any SAL_CALL IUnknownWrapper_Impl::invoke( const OUString& aFunctionName,
 
 void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName,
                  const Any& aValue )
-    throw(UnknownPropertyException, CannotConvertException, InvocationTargetException,
-          RuntimeException)
 {
     if ( ! m_spDispatch )
     {
@@ -448,7 +442,6 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName,
 }
 
 Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName )
-        throw(UnknownPropertyException, RuntimeException)
 {
     if ( ! m_spDispatch )
     {
@@ -591,7 +584,6 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName )
 }
 
 sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMethod( const OUString& aName )
-        throw(RuntimeException)
 {
     if ( ! m_spDispatch )
     {
@@ -640,7 +632,6 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMethod( const OUString& aName )
 }
 
 sal_Bool SAL_CALL IUnknownWrapper_Impl::hasProperty( const OUString& aName )
-        throw(RuntimeException)
 {
     if ( ! m_spDispatch )
     {
@@ -693,7 +684,6 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasProperty( const OUString& aName )
 Any SAL_CALL IUnknownWrapper_Impl::createBridge( const Any& modelDepObject,
                 const Sequence< sal_Int8 >& /*aProcessId*/, sal_Int16 sourceModelType,
                  sal_Int16 destModelType )
-    throw( IllegalArgumentException, RuntimeException)
 {
     Any ret;
     o2u_attachCurrentThread();
@@ -1178,7 +1168,7 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
 
 
 // XInitialization
-void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException)
+void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArguments )
 {
     // 1.parameter is IUnknown
     // 2.parameter is a boolean which indicates if the COM pointer was a IUnknown or IDispatch
@@ -1261,7 +1251,6 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument
 
 // XDirectInvocation
 uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, const uno::Sequence< uno::Any >& aParams )
-    throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
 {
     Any aResult;
 
@@ -1508,7 +1497,6 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, con
 }
 
 sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const OUString& aName )
-    throw (uno::RuntimeException)
 {
     if ( ! m_spDispatch )
     {
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index dfafa4471b24..c8099a4655cb 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -69,28 +69,19 @@ public:
     ~IUnknownWrapper_Impl() override;
 
     //XInterface
-    Any SAL_CALL queryInterface(const Type& t)
-        throw (RuntimeException) override;
+    Any SAL_CALL queryInterface(const Type& t) override;
 
     // XInvokation
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(  )
-        throw(RuntimeException) override;
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(  ) override;
     virtual Any SAL_CALL invoke( const OUString& aFunctionName,
                                  const Sequence< Any >& aParams,
                                  Sequence< sal_Int16 >& aOutParamIndex,
-                                 Sequence< Any >& aOutParam )
-        throw(IllegalArgumentException, CannotConvertException,
-              InvocationTargetException, RuntimeException) override;
+                                 Sequence< Any >& aOutParam ) override;
     virtual void SAL_CALL setValue( const OUString& aPropertyName,
-                                    const Any& aValue )
-        throw(UnknownPropertyException, CannotConvertException,
-              InvocationTargetException, RuntimeException) override;
-    virtual Any SAL_CALL getValue( const OUString& aPropertyName )
-        throw(UnknownPropertyException, RuntimeException) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName )
-        throw(RuntimeException) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName )
-        throw(RuntimeException) override;
+                                    const Any& aValue ) override;
+    virtual Any SAL_CALL getValue( const OUString& aPropertyName ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override;
 
     // XBridgeSupplier2
     // This interface is implemented to provide a safe way to obtain the original
@@ -100,25 +91,23 @@ public:
     virtual Any SAL_CALL createBridge( const Any& modelDepObject,
                                        const Sequence< sal_Int8 >& aProcessId,
                                        sal_Int16 sourceModelType,
-                                       sal_Int16 destModelType )
-        throw(IllegalArgumentException, RuntimeException) override;
+                                       sal_Int16 destModelType ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
-        throw(Exception, RuntimeException) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XDefaultProperty
-    virtual OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) override { return m_sDefaultMember; }
+    virtual OUString SAL_CALL getDefaultPropertyName(  ) override { return m_sDefaultMember; }
 
     // XDefaultMethod
-    virtual OUString SAL_CALL getDefaultMethodName(  ) throw (css::uno::RuntimeException) override { return m_sDefaultMember; }
+    virtual OUString SAL_CALL getDefaultMethodName(  ) override { return m_sDefaultMember; }
 
-    virtual css::uno::Any SAL_CALL invokeGetProperty( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL invokePutProperty( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL invokeGetProperty( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) override;
+    virtual css::uno::Any SAL_CALL invokePutProperty( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) override;
 
     // XDirectInvocation
-    virtual css::uno::Any SAL_CALL directInvoke( const OUString& aName, const css::uno::Sequence< css::uno::Any >& aParams ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL hasMember( const OUString& aName ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL directInvoke( const OUString& aName, const css::uno::Sequence< css::uno::Any >& aParams ) override;
+    virtual sal_Bool SAL_CALL hasMember( const OUString& aName ) override;
 
 
     Any  invokeWithDispIdComTlb(FuncDesc& aFuncDesc,
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 71ce5dc21c3d..73bc1336153a 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -343,8 +343,6 @@ Any SAL_CALL OleConverter_Impl2::createBridge(const Any& modelDepObject,
                                        const Sequence< sal_Int8 >& ProcessId,
                                        sal_Int16 sourceModelType,
                                        sal_Int16 destModelType)
-                                       throw (IllegalArgumentException,
-                                                   RuntimeException )
 {
     Any ret;
     sal_uInt8 arId[16];
@@ -428,7 +426,6 @@ Any SAL_CALL OleConverter_Impl2::createBridge(const Any& modelDepObject,
 }
 
 OUString OleConverter_Impl2::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_nUnoWrapperClass == INTERFACE_OLE_WRAPPER_IMPL
         ? OUString("com.sun.star.comp.ole.OleConverter2")
@@ -436,13 +433,11 @@ OUString OleConverter_Impl2::getImplementationName()
 }
 
 sal_Bool OleConverter_Impl2::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> OleConverter_Impl2::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (m_nUnoWrapperClass == INTERFACE_OLE_WRAPPER_IMPL)
     {
@@ -457,7 +452,6 @@ css::uno::Sequence<OUString> OleConverter_Impl2::getSupportedServiceNames()
 // XInitialize ------------------------------------------------------------------------------
 // the first argument is an XMultiServiceFactory if at all
 void SAL_CALL OleConverter_Impl2::initialize( const Sequence< Any >& aArguments )
-                throw(Exception, RuntimeException)
 {
     if( aArguments.getLength() == 1 && aArguments[0].getValueTypeClass() == TypeClass_INTERFACE)
     {
@@ -517,7 +511,7 @@ OleClient_Impl::~OleClient_Impl()
 {
 }
 
-Sequence< OUString >    SAL_CALL OleClient_Impl::getAvailableServiceNames() throw( RuntimeException )
+Sequence< OUString >    SAL_CALL OleClient_Impl::getAvailableServiceNames()
 {
     Sequence< OUString > ret;
 
@@ -525,26 +519,23 @@ Sequence< OUString >    SAL_CALL OleClient_Impl::getAvailableServiceNames() thro
 }
 
 OUString OleClient_Impl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.ole.OleClient");
 }
 
 sal_Bool OleClient_Impl::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> OleClient_Impl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.bridge.OleObjectFactory",
         "com.sun.star.bridge.oleautomation.Factory"};
 }
 
-Reference<XInterface> SAL_CALL OleClient_Impl::createInstance(const OUString& ServiceSpecifier) throw (Exception, RuntimeException )
+Reference<XInterface> SAL_CALL OleClient_Impl::createInstance(const OUString& ServiceSpecifier)
 {
     Reference<XInterface>   ret;
     HRESULT         result;
@@ -591,7 +582,7 @@ Reference<XInterface> SAL_CALL OleClient_Impl::createInstance(const OUString& Se
     return ret;
 }
 
-Reference<XInterface> SAL_CALL OleClient_Impl::createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/) throw (Exception, RuntimeException)
+Reference<XInterface> SAL_CALL OleClient_Impl::createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/)
 {
     return createInstance( ServiceSpecifier);
 }
@@ -655,19 +646,16 @@ OleServer_Impl::~OleServer_Impl()
 }
 
 OUString OleServer_Impl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.ole.OleServer");
 }
 
 sal_Bool OleServer_Impl::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> OleServer_Impl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.bridge.OleApplicationRegistration",
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index adf8f26d8f94..dfccc74e03ca 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -33,16 +33,14 @@ using namespace std;
 
 namespace ole_adapter
 {
-Reference< XInterface> SAL_CALL ConverterProvider_CreateInstance(   const Reference<XMultiServiceFactory> & xSMgr)
-                            throw( Exception);
-Reference< XInterface> SAL_CALL ConverterProvider_CreateInstance2(  const Reference<XMultiServiceFactory> & xSMgr)
-                            throw( Exception);
-Reference< XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1(   const Reference<XMultiServiceFactory> & xSMgr)
-                            throw( Exception);
-Reference<XInterface> SAL_CALL OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr)
-                            throw( Exception);
-Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr)
-                            throw( Exception);
+/// @throws Exception
+Reference< XInterface> SAL_CALL ConverterProvider_CreateInstance2(  const Reference<XMultiServiceFactory> & xSMgr);
+/// @throws Exception
+Reference< XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1(   const Reference<XMultiServiceFactory> & xSMgr);
+/// @throws Exception
+Reference<XInterface> SAL_CALL OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr);
+/// @throws Exception
+Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr);
 /*****************************************************************************
 
     class declaration IClassFactoryWrapper
@@ -181,20 +179,16 @@ public:
     Any SAL_CALL createBridge(const Any& modelDepObject,
                                 const Sequence<sal_Int8>& ProcessId,
                                 sal_Int16 sourceModelType,
-                                sal_Int16 destModelType)
-            throw (IllegalArgumentException, RuntimeException) override;
+                                sal_Int16 destModelType) override;
 
     // XInitialization
-    void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) override;
+    void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // Abstract struct UnoConversionUtilities
     Reference< XInterface > createUnoWrapperInstance() override;
@@ -221,18 +215,15 @@ public:
     ~OleClient_Impl() override;
 
     // XMultiServiceFactory
-    Reference<XInterface> SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( Exception, RuntimeException) override;
-    Reference<XInterface> SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& Arguments) throw (Exception, RuntimeException) override;
-    Sequence< OUString >    SAL_CALL getAvailableServiceNames() throw (RuntimeException) override;
+    Reference<XInterface> SAL_CALL createInstance(const OUString& ServiceSpecifier) override;
+    Reference<XInterface> SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& Arguments) override;
+    Sequence< OUString >    SAL_CALL getAvailableServiceNames() override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // Abstract struct UnoConversionUtilities
     Reference< XInterface > createUnoWrapperInstance() override;
@@ -259,14 +250,11 @@ public:
     explicit OleServer_Impl( const Reference<XMultiServiceFactory> &smgr);
     ~OleServer_Impl() override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 protected:
 
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index d37e448fdad9..bb2b1f839464 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -30,28 +30,24 @@ namespace ole_adapter
 {
 
 Reference<XInterface> SAL_CALL ConverterProvider_CreateInstance2(   const Reference<XMultiServiceFactory> & xSMgr)
-                            throw(Exception)
 {
     Reference<XInterface> xService = *new OleConverter_Impl2( xSMgr);
     return xService;
 }
 
 Reference<XInterface> SAL_CALL ConverterProvider_CreateInstanceVar1(    const Reference<XMultiServiceFactory> & xSMgr)
-                            throw(Exception)
 {
     Reference<XInterface> xService = *new OleConverter_Impl2( xSMgr, UNO_OBJECT_WRAPPER_REMOTE_OPT, IUNKNOWN_WRAPPER_IMPL);
     return xService;
 }
 
 Reference<XInterface> SAL_CALL OleClient_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr)
-                            throw(Exception)
 {
     Reference<XInterface> xService = *new OleClient_Impl( xSMgr);
     return xService;
 }
 
 Reference<XInterface> SAL_CALL OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr)
-                            throw (Exception)
 {
     Reference<XInterface > xService = *new OleServer_Impl(xSMgr);
     return xService;
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 192a490cd35c..474b35ab6dd5 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -469,7 +469,6 @@ Any SAL_CALL InterfaceOleWrapper_Impl::createBridge(const Any& modelDepObject,
                                 const Sequence<sal_Int8>& /*ProcessId*/,
                                 sal_Int16 sourceModelType,
                                 sal_Int16 destModelType)
-            throw (IllegalArgumentException, RuntimeException)
 {
 
     Any retAny;
@@ -499,7 +498,6 @@ Any SAL_CALL InterfaceOleWrapper_Impl::createBridge(const Any& modelDepObject,
 
 // XInitialization --------------------------------------------------
 void SAL_CALL InterfaceOleWrapper_Impl::initialize( const Sequence< Any >& aArguments )
-        throw(Exception, RuntimeException)
 {
     switch( aArguments.getLength() )
     {
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index 170e2f2f9d3a..155f503f51cd 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -170,11 +170,10 @@ public:
     virtual Any SAL_CALL createBridge(const Any& modelDepObject,
                                 const Sequence<sal_Int8>& ProcessId,
                                 sal_Int16 sourceModelType,
-                                sal_Int16 destModelType)
-            throw (IllegalArgumentException, RuntimeException) override;
+                                sal_Int16 destModelType) override;
 
     //XInitialization -----------------------------------------------------
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // IUnoObjectWrapper
     STDMETHOD( getWrapperXInterface)( Reference<XInterface>* pXInt) override;
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index c8a7af329925..02cb66f53a5c 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -40,7 +40,7 @@ namespace pcr
     {
     }
 
-    Sequence<sal_Int8> SAL_CALL MasterDetailLinkDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+    Sequence<sal_Int8> SAL_CALL MasterDetailLinkDialog::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -52,32 +52,32 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL MasterDetailLinkDialog::getImplementationName()
     {
         return getImplementationName_static();
     }
 
 
-    OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException)
+    OUString MasterDetailLinkDialog::getImplementationName_static()
     {
         return OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog");
     }
 
 
-    css::uno::Sequence<OUString> SAL_CALL MasterDetailLinkDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    css::uno::Sequence<OUString> SAL_CALL MasterDetailLinkDialog::getSupportedServiceNames()
     {
         return getSupportedServiceNames_static();
     }
 
 
-    css::uno::Sequence<OUString> MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException)
+    css::uno::Sequence<OUString> MasterDetailLinkDialog::getSupportedServiceNames_static()
     {
         css::uno::Sequence<OUString> aSupported { "com.sun.star.form.MasterDetailLinkDialog" };
         return aSupported;
     }
 
 
-    Reference<XPropertySetInfo>  SAL_CALL MasterDetailLinkDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference<XPropertySetInfo>  SAL_CALL MasterDetailLinkDialog::getPropertySetInfo()
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
index 59f6b55aaba3..62422e21e873 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
@@ -38,21 +38,21 @@ namespace pcr
 
         // XServiceInfo - static methods
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&);
     private:
         // XTypeProvider
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index fca52d28af57..b5e0cffeddd6 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -163,10 +163,10 @@ namespace pcr
         virtual ~PropertyControlContext_Impl() override;
 
         // XPropertyControlObserver
-        virtual void SAL_CALL focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL focusGained( const Reference< XPropertyControl >& Control ) override;
+        virtual void SAL_CALL valueChanged( const Reference< XPropertyControl >& Control ) override;
         // XPropertyControlContext
-        virtual void SAL_CALL activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL activateNextControl( const Reference< XPropertyControl >& CurrentControl ) override;
 
         // IEventProcessor
         virtual void processEvent( const ::comphelper::AnyEvent& _rEvent ) override;
@@ -246,19 +246,19 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control )
     {
         impl_notify_throw( Control, FOCUS_GAINED );
     }
 
 
-    void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control )
     {
         impl_notify_throw( Control, VALUE_CHANGED );
     }
 
 
-    void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl )
     {
         impl_notify_throw( CurrentControl, ACTIVATE_NEXT );
     }
@@ -935,7 +935,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl ) throw (RuntimeException)
+    void SAL_CALL OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl )
     {
         DBG_TESTSOLARMUTEX();
 
@@ -951,7 +951,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl ) throw (RuntimeException)
+    void SAL_CALL OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl )
     {
         DBG_TESTSOLARMUTEX();
 
@@ -973,7 +973,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl ) throw (RuntimeException)
+    void SAL_CALL OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl )
     {
         DBG_TESTSOLARMUTEX();
 
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index fb2061dbcb13..be7425b2c54b 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -144,11 +144,11 @@ namespace pcr
         void                        CommitModified( );
 
         /// @throws css::uno::RuntimeException
-        void SAL_CALL               focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException);
+        void SAL_CALL               focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control );
         /// @throws css::uno::RuntimeException
-        void SAL_CALL               valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException);
+        void SAL_CALL               valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control );
         /// @throws css::uno::RuntimeException
-        void SAL_CALL               activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl ) throw (css::uno::RuntimeException);
+        void SAL_CALL               activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl );
 
     protected:
         // IButtonClickListener
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index c299604a98f3..077660cc9228 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -55,27 +55,27 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static(  )
     {
         return OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" );
     }
 
 
-    Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.form.inspection.ButtonNavigationHandler" };
         return aSupported;
     }
 
 
-    void SAL_CALL ButtonNavigationHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception)
+    void SAL_CALL ButtonNavigationHandler::inspect( const Reference< XInterface >& _rxIntrospectee )
     {
         ButtonNavigationHandler_Base::inspect( _rxIntrospectee );
         m_xSlaveHandler->inspect( _rxIntrospectee );
     }
 
 
-    PropertyState  SAL_CALL ButtonNavigationHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    PropertyState  SAL_CALL ButtonNavigationHandler::getPropertyState( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -104,7 +104,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -135,7 +135,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL ButtonNavigationHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL ButtonNavigationHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -189,7 +189,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( )
     {
         Sequence< OUString > aActuating( 2 );
         aActuating[0] = PROPERTY_BUTTONTYPE;
@@ -198,7 +198,7 @@ namespace pcr
     }
 
 
-    InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
+    InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -219,7 +219,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwRuntime( _rActuatingPropertyName ) );
@@ -245,7 +245,7 @@ namespace pcr
     }
 
 
-    LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
+    LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx
index 5a7bf0edb55b..a2f823d8e942 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.hxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx
@@ -41,9 +41,9 @@ namespace pcr
             const css::uno::Reference< css::uno::XComponentContext >& _rxContext
         );
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
 
     protected:
         virtual ~ButtonNavigationHandler() override;
@@ -52,15 +52,15 @@ namespace pcr
 
     protected:
         // XPropertyHandler overriables
-        virtual void                                    SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual css::uno::Any                           SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                    SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::PropertyState               SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >          SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void                                    SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override;
+        virtual css::uno::Any                           SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                                    SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
+        virtual css::beans::PropertyState               SAL_CALL getPropertyState( const OUString& _rPropertyName ) override;
+        virtual css::uno::Sequence< OUString >          SAL_CALL getActuatingProperties( ) override;
         virtual css::inspection::InteractiveSelectionResult
-                                                        SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                    SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual css::inspection::LineDescriptor         SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
+                                                        SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override;
+        virtual void                                    SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override;
+        virtual css::inspection::LineDescriptor         SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
 
         // PropertyHandler overridables
         virtual css::uno::Sequence< css::beans::Property >
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index 1134d12401cb..51fe0835e734 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -56,13 +56,13 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static(  )
     {
         return OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" );
     }
 
 
-    Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.form.inspection.CellBindingPropertyHandler" };
         return aSupported;
@@ -85,7 +85,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( )
     {
         Sequence< OUString > aInterestingProperties( 3 );
         aInterestingProperties[0] = PROPERTY_LIST_CELL_RANGE;
@@ -95,7 +95,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nActuatingPropId( impl_getPropertyId_throwRuntime( _rActuatingPropertyName ) );
@@ -223,7 +223,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -269,7 +269,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -341,7 +341,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Any aPropertyValue;
@@ -390,7 +390,7 @@ namespace pcr
 
 
     Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const OUString& _rPropertyName,
-        const Any& _rPropertyValue, const Type& /*_rControlValueType*/ ) throw (UnknownPropertyException, RuntimeException, std::exception)
+        const Any& _rPropertyValue, const Type& /*_rControlValueType*/ )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Any aControlValue;
diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx
index 96b80419eb30..93b3b84d5c00 100644
--- a/extensions/source/propctrlr/cellbindinghandler.hxx
+++ b/extensions/source/propctrlr/cellbindinghandler.hxx
@@ -49,21 +49,21 @@ namespace pcr
         );
 
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
 
     protected:
         virtual ~CellBindingPropertyHandler() override;
 
     protected:
         // XPropertyHandler overriables
-        virtual css::uno::Any                   SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                            SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                   SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                   SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >  SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void                            SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any                   SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                            SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
+        virtual css::uno::Any                   SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override;
+        virtual css::uno::Any                   SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override;
+        virtual css::uno::Sequence< OUString >  SAL_CALL getActuatingProperties( ) override;
+        virtual void                            SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override;
 
         // PropertyHandler overridables
         virtual css::uno::Sequence< css::beans::Property >
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index 6e9cb6be093d..c84593501edc 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -47,12 +47,12 @@ namespace pcr
     {
     }
 
-    void SAL_CALL CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) throw (RuntimeException)
+    void SAL_CALL CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext )
     {
         m_xContext = _controlcontext;
     }
 
-    void SAL_CALL CommonBehaviourControlHelper::notifyModifiedValue(  ) throw (RuntimeException)
+    void SAL_CALL CommonBehaviourControlHelper::notifyModifiedValue(  )
     {
         if ( isModified() && m_xContext.is() )
         {
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index f16cf2e93a9f..ed2261b598ba 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -75,15 +75,15 @@ namespace pcr
 
         // XPropertyControl
         /// @throws css::uno::RuntimeException
-        ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) { return m_nControlType; }
+        ::sal_Int16 SAL_CALL getControlType() { return m_nControlType; }
         /// @throws css::uno::RuntimeException
-        const css::uno::Reference< css::inspection::XPropertyControlContext >& SAL_CALL getControlContext() throw (css::uno::RuntimeException) { return m_xContext; }
+        const css::uno::Reference< css::inspection::XPropertyControlContext >& SAL_CALL getControlContext() { return m_xContext; }
         /// @throws css::uno::RuntimeException
-        void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ) throw (css::uno::RuntimeException);
+        void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext );
         /// @throws css::uno::RuntimeException
-        bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException) { return m_bModified; }
+        bool SAL_CALL isModified(  ) { return m_bModified; }
         /// @throws css::uno::RuntimeException
-        void SAL_CALL notifyModifiedValue(  ) throw (css::uno::RuntimeException);
+        void SAL_CALL notifyModifiedValue(  );
 
         /** (fail-safe) wrapper around calling our context's activateNextControl
         */
@@ -124,17 +124,17 @@ namespace pcr
         inline CommonBehaviourControl( sal_Int16 _nControlType, vcl::Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers = true );
 
         // XPropertyControl - delegated to ->m_aImplControl
-        virtual ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) override
+        virtual ::sal_Int16 SAL_CALL getControlType() override
             { return CommonBehaviourControlHelper::getControlType(); }
-        virtual css::uno::Reference< css::inspection::XPropertyControlContext > SAL_CALL getControlContext() throw (css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::inspection::XPropertyControlContext > SAL_CALL getControlContext() override
             { return CommonBehaviourControlHelper::getControlContext(); }
-        virtual void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ) override
             { CommonBehaviourControlHelper::setControlContext( _controlcontext ); }
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getControlWindow() throw (css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getControlWindow() override
             { return VCLUnoHelper::GetInterface( m_pControlWindow ); }
-        virtual sal_Bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException) override
+        virtual sal_Bool SAL_CALL isModified(  ) override
             { return CommonBehaviourControlHelper::isModified(); }
-        virtual void SAL_CALL notifyModifiedValue(  ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL notifyModifiedValue(  ) override
             { CommonBehaviourControlHelper::notifyModifiedValue(); }
 
         // XComponent
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index 4d84c4e6b2ae..97a8ec3fa440 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -133,16 +133,16 @@ namespace pcr
         void dispose();
 
         // XObjectInspectorUI overridables
-        virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException, std::exception) override;
-        virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (NoSupportException, RuntimeException, std::exception) override;
+        virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) override;
+        virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) override;
+        virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) override;
+        virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) override;
+        virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) override;
+        virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) override;
+        virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) override;
+        virtual void SAL_CALL registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) override;
+        virtual void SAL_CALL revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) override;
+        virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) override;
 
     protected:
         virtual ~CachedInspectorUI() override;
@@ -225,7 +225,7 @@ namespace pcr
     }
 
 
-    void CachedInspectorUI::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException, std::exception)
+    void CachedInspectorUI::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable )
     {
         MethodGuard aGuard( *this );
         if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) )
@@ -256,7 +256,7 @@ namespace pcr
     }
 
 
-    void CachedInspectorUI::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException, std::exception)
+    void CachedInspectorUI::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable )
     {
         MethodGuard aGuard( *this );
         if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) )
@@ -270,7 +270,7 @@ namespace pcr
     }
 
 
-    void CachedInspectorUI::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    void CachedInspectorUI::rebuildPropertyUI( const OUString& _rPropertyName )
     {
         MethodGuard aGuard( *this );
         if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) )
@@ -282,7 +282,7 @@ namespace pcr
     }
 
 
-    void CachedInspectorUI::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    void CachedInspectorUI::showPropertyUI( const OUString& _rPropertyName )
     {
         MethodGuard aGuard( *this );
         if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) )
@@ -296,7 +296,7 @@ namespace pcr
     }
 
 
-    void CachedInspectorUI::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    void CachedInspectorUI::hidePropertyUI( const OUString& _rPropertyName )
     {
         MethodGuard aGuard( *this );
         if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) )
@@ -307,7 +307,7 @@ namespace pcr
     }
 
 
-    void CachedInspectorUI::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException, std::exception)
+    void CachedInspectorUI::showCategory( const OUString& _rCategory, sal_Bool _bShow )
     {
         MethodGuard aGuard( *this );
 
@@ -316,7 +316,7 @@ namespace pcr
     }
 
 
-    Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const OUString& _rPropertyName )
     {
         MethodGuard aGuard( *this );
         if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) )
@@ -326,7 +326,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception)
+    void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& Observer )
     {
         OSL_FAIL( "CachedInspectorUI::registerControlObserver: not expected to be called!" );
             // CachedInspectorUI is used as context for the controls, and we don't expect them to
@@ -335,7 +335,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception)
+    void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer )
     {
         OSL_FAIL( "CachedInspectorUI::revokeControlObserver: not expected to be called!" );
             // CachedInspectorUI is used as context for the controls, and we don't expect them to
@@ -344,7 +344,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& HelpText ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& HelpText )
     {
         m_rMaster.getDelegatorUI()->setHelpSectionText( HelpText );
     }
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index 21157e3df012..f6170861424b 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -40,7 +40,7 @@ namespace pcr
     {
     public:
         /// @throws css::uno::RuntimeException
-        virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) = 0;
+        virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) = 0;
 
     protected:
         ~IPropertyExistenceCheck() {}
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 4ba8b5feaf25..a598665b29e2 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -65,7 +65,7 @@ namespace pcr
     }
 
 
-    Sequence<sal_Int8> SAL_CALL OControlFontDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+    Sequence<sal_Int8> SAL_CALL OControlFontDialog::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -77,31 +77,31 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OControlFontDialog::getImplementationName()
     {
         return getImplementationName_static();
     }
 
 
-    OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException)
+    OUString OControlFontDialog::getImplementationName_static()
     {
         return OUString("org.openoffice.comp.form.ui.OControlFontDialog");
     }
 
 
-    css::uno::Sequence<OUString> SAL_CALL OControlFontDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    css::uno::Sequence<OUString> SAL_CALL OControlFontDialog::getSupportedServiceNames()
     {
         return getSupportedServiceNames_static();
     }
 
 
-    css::uno::Sequence<OUString> OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException)
+    css::uno::Sequence<OUString> OControlFontDialog::getSupportedServiceNames_static()
     {
         css::uno::Sequence<OUString> aSupported { "com.sun.star.form.ControlFontDialog" };
         return aSupported;
     }
 
-    void OControlFontDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception)
+    void OControlFontDialog::initialize( const Sequence< Any >& aArguments )
     {
         Reference<XPropertySet> xGridModel;
         if (aArguments.getLength() == 1 && (aArguments[0] >>= xGridModel))
@@ -118,7 +118,7 @@ namespace pcr
     }
 
 
-    Reference<XPropertySetInfo>  SAL_CALL OControlFontDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference<XPropertySetInfo>  SAL_CALL OControlFontDialog::getPropertySetInfo()
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx
index 24e688eca00f..bbf1ffcc1818 100644
--- a/extensions/source/propctrlr/controlfontdialog.hxx
+++ b/extensions/source/propctrlr/controlfontdialog.hxx
@@ -55,25 +55,25 @@ namespace pcr
         virtual ~OControlFontDialog() override;
 
         // XTypeProvider
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // XServiceInfo - static methods
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
          // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 09a7eecab288..e01a3778b7c4 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -67,25 +67,25 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName(  )
     {
         return getImplementationName_static();
     }
 
 
-    Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_static();
     }
 
 
-    OUString DefaultFormComponentInspectorModel::getImplementationName_static(  ) throw(RuntimeException)
+    OUString DefaultFormComponentInspectorModel::getImplementationName_static(  )
     {
         return OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel");
     }
 
 
-    Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static(  ) throw(RuntimeException)
+    Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.form.inspection.DefaultFormComponentInspectorModel" };
         return aSupported;
@@ -98,7 +98,7 @@ namespace pcr
     }
 
 
-    Sequence< Any > SAL_CALL DefaultFormComponentInspectorModel::getHandlerFactories() throw (RuntimeException, std::exception)
+    Sequence< Any > SAL_CALL DefaultFormComponentInspectorModel::getHandlerFactories()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -153,7 +153,7 @@ namespace pcr
     }
 
 
-    Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultFormComponentInspectorModel::describeCategories(  ) throw (RuntimeException, std::exception)
+    Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultFormComponentInspectorModel::describeCategories(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -182,7 +182,7 @@ namespace pcr
     }
 
 
-    ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName )
     {
         sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) );
         if ( nPropertyId == -1 )
@@ -198,7 +198,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL DefaultFormComponentInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL DefaultFormComponentInspectorModel::initialize( const Sequence< Any >& _arguments )
     {
         if ( m_bConstructed )
             throw AlreadyInitializedException();
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index 897a74e6551f..23dee8a92409 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -43,23 +43,23 @@ namespace pcr
         virtual ~DefaultFormComponentInspectorModel() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XObjectInspectorModel
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHandlerFactories() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHandlerFactories() override;
+        virtual css::uno::Sequence< css::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories(  ) override;
+        virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     public:
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
                         Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index 776dabfab267..9af9b892ff23 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -67,13 +67,13 @@ namespace pcr
     }
 
 
-    OUString DefaultHelpProvider::getImplementationName_static(  ) throw(RuntimeException)
+    OUString DefaultHelpProvider::getImplementationName_static(  )
     {
         return OUString("org.openoffice.comp.extensions.DefaultHelpProvider");
     }
 
 
-    Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static(  ) throw(RuntimeException)
+    Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.inspection.DefaultHelpProvider" };
         return aSupported;
@@ -86,7 +86,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception)
+    void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& Control )
     {
         if ( !m_xInspectorUI.is() )
             throw RuntimeException( OUString(), *this );
@@ -102,13 +102,13 @@ namespace pcr
     }
 
 
-    void SAL_CALL DefaultHelpProvider::valueChanged( const Reference< XPropertyControl >& ) throw (RuntimeException, std::exception)
+    void SAL_CALL DefaultHelpProvider::valueChanged( const Reference< XPropertyControl >& )
     {
         // not interested in
     }
 
 
-    void SAL_CALL DefaultHelpProvider::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL DefaultHelpProvider::initialize( const Sequence< Any >& _arguments )
     {
         if ( m_bConstructed )
             throw AlreadyInitializedException();
diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx
index 5b2e0fbea200..c5181b1f2d24 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.hxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.hxx
@@ -51,9 +51,9 @@ namespace pcr
 
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
                         Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
@@ -61,11 +61,11 @@ namespace pcr
         virtual ~DefaultHelpProvider() override;
 
         // XPropertyControlObserver
-        virtual void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) override;
+        virtual void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     protected:
         // Service constructors
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 940abbaf9a59..5f3e3eb39633 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -61,20 +61,20 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL EditPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL EditPropertyHandler::getImplementationName_static(  )
     {
         return OUString( "com.sun.star.comp.extensions.EditPropertyHandler" );
     }
 
 
-    Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.form.inspection.EditPropertyHandler" };
         return aSupported;
     }
 
 
-    Any SAL_CALL EditPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL EditPropertyHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -130,7 +130,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL EditPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL EditPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -225,7 +225,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         ::std::vector< OUString > aSuperseded;
@@ -245,7 +245,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         ::std::vector< OUString > aInterestingActuatingProps;
@@ -256,7 +256,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx
index f0346f2a7515..15dbffa07521 100644
--- a/extensions/source/propctrlr/editpropertyhandler.hxx
+++ b/extensions/source/propctrlr/editpropertyhandler.hxx
@@ -41,20 +41,20 @@ namespace pcr
         );
 
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
 
     protected:
         virtual ~EditPropertyHandler() override;
 
     protected:
         // XPropertyHandler overriables
-        virtual css::uno::Any                   SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                            SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >  SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >  SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void                            SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any                   SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                            SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
+        virtual css::uno::Sequence< OUString >  SAL_CALL getSupersededProperties( ) override;
+        virtual css::uno::Sequence< OUString >  SAL_CALL getActuatingProperties( ) override;
+        virtual void                            SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) override;
 
         // PropertyHandler overridables
         virtual css::uno::Sequence< css::beans::Property >
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 29ba124e0626..c1bb1ee2144d 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -70,13 +70,13 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static(  )
     {
         return OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" );
     }
 
 
-    Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.form.inspection.XMLFormsPropertyHandler" };
         return aSupported;
@@ -92,7 +92,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -155,7 +155,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL EFormsPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL EFormsPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -313,7 +313,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Any aReturn;
@@ -346,7 +346,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Any aReturn;
@@ -379,7 +379,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_pHelper.get() )
@@ -392,7 +392,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_pHelper.get() )
@@ -405,7 +405,6 @@ namespace pcr
 
     LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
-        throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !_rxControlFactory.is() )
@@ -470,7 +469,7 @@ namespace pcr
     }
 
 
-    InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
+    InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
@@ -529,7 +528,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL EFormsPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL EFormsPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         EFormsPropertyHandler_Base::addPropertyChangeListener( _rxListener );
@@ -538,7 +537,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL EFormsPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL EFormsPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_pHelper.get() )
@@ -547,7 +546,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx
index 3b84b3e9c4da..7098811940bf 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.hxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.hxx
@@ -52,30 +52,30 @@ namespace pcr
         );
 
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
 
     protected:
         virtual ~EFormsPropertyHandler() override;
 
     protected:
         // XPropertyHandler overriables
-        virtual css::uno::Any                       SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any                       SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                                SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
         virtual css::uno::Sequence< OUString >
-                                                    SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL getActuatingProperties( ) override;
         virtual css::uno::Sequence< OUString >
-                                                    SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL getSupersededProperties( ) override;
         virtual css::inspection::LineDescriptor
-                                                    SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
         virtual css::inspection::InteractiveSelectionResult
-                                                    SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                       SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                       SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override;
+        virtual void                                SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) override;
+        virtual css::uno::Any                       SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override;
+        virtual css::uno::Any                       SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override;
+        virtual void                                SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual void                                SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
 
         // PropertyHandler overridables
         virtual css::uno::Sequence< css::beans::Property >
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index f314ad43c279..afe2a4063dcf 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -329,12 +329,12 @@ namespace pcr
         ScriptEventDescriptor getNormalizedDescriptorByName( const OUString& _rEventName ) const;
 
         // XNameReplace
-        virtual void SAL_CALL replaceByName( const OUString& _rName, const Any& aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
-        virtual Any SAL_CALL getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getElementNames(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& _rName ) throw (RuntimeException, std::exception) override;
-        virtual Type SAL_CALL getElementType(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByName( const OUString& _rName, const Any& aElement ) override;
+        virtual Any SAL_CALL getByName( const OUString& _rName ) override;
+        virtual Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& _rName ) override;
+        virtual Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     protected:
         virtual ~EventHolder( ) override;
@@ -375,7 +375,7 @@ namespace pcr
         return pos->second;
     }
 
-    void SAL_CALL EventHolder::replaceByName( const OUString& _rName, const Any& _rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL EventHolder::replaceByName( const OUString& _rName, const Any& _rElement )
     {
         EventMap::iterator pos = m_aEventNameAccess.find( _rName );
         if ( pos == m_aEventNameAccess.end() )
@@ -390,7 +390,7 @@ namespace pcr
         pos->second.ScriptCode = aExtractor.getOrDefault( "Script", OUString() );
     }
 
-    Any SAL_CALL EventHolder::getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL EventHolder::getByName( const OUString& _rName )
     {
         ScriptEventDescriptor aDescriptor( impl_getDescriptor_throw( _rName ) );
 
@@ -403,7 +403,7 @@ namespace pcr
         return makeAny( aScriptDescriptor );
     }
 
-    Sequence< OUString > SAL_CALL EventHolder::getElementNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL EventHolder::getElementNames(  )
     {
         Sequence< OUString > aReturn( m_aEventIndexAccess.size() );
         OUString* pReturn = aReturn.getArray();
@@ -425,18 +425,18 @@ namespace pcr
         return aReturn;
     }
 
-    sal_Bool SAL_CALL EventHolder::hasByName( const OUString& _rName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL EventHolder::hasByName( const OUString& _rName )
     {
         EventMap::const_iterator pos = m_aEventNameAccess.find( _rName );
         return pos != m_aEventNameAccess.end();
     }
 
-    Type SAL_CALL EventHolder::getElementType(  ) throw (RuntimeException, std::exception)
+    Type SAL_CALL EventHolder::getElementType(  )
     {
         return cppu::UnoType<Sequence< PropertyValue >>::get();
     }
 
-    sal_Bool SAL_CALL EventHolder::hasElements(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL EventHolder::hasElements(  )
     {
         return !m_aEventNameAccess.empty();
     }
@@ -456,27 +456,27 @@ namespace pcr
     {
     }
 
-    OUString SAL_CALL EventHandler::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL EventHandler::getImplementationName(  )
     {
         return getImplementationName_static();
     }
 
-    sal_Bool SAL_CALL EventHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL EventHandler::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_static();
     }
 
-    OUString SAL_CALL EventHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL EventHandler::getImplementationName_static(  )
     {
         return OUString(  "com.sun.star.comp.extensions.EventHandler"  );
     }
 
-    Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.form.inspection.EventHandler" };
         return aSupported;
@@ -487,7 +487,7 @@ namespace pcr
         return *( new EventHandler( _rxContext ) );
     }
 
-    void SAL_CALL EventHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception)
+    void SAL_CALL EventHandler::inspect( const Reference< XInterface >& _rxIntrospectee )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -526,7 +526,7 @@ namespace pcr
         }
     }
 
-    Any SAL_CALL EventHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL EventHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -550,7 +550,7 @@ namespace pcr
         return makeAny( aPropertyValue );
     }
 
-    void SAL_CALL EventHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL EventHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -580,7 +580,7 @@ namespace pcr
         m_aPropertyListeners.notify( aEvent, &XPropertyChangeListener::propertyChange );
     }
 
-    Any SAL_CALL EventHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL EventHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -607,7 +607,7 @@ namespace pcr
         return makeAny( aAssignedScript );
     }
 
-    Any SAL_CALL EventHandler::convertToControlValue( const OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL EventHandler::convertToControlValue( const OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -671,12 +671,12 @@ namespace pcr
         return makeAny( sScript );
     }
 
-    PropertyState SAL_CALL EventHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    PropertyState SAL_CALL EventHandler::getPropertyState( const OUString& /*_rPropertyName*/ )
     {
         return PropertyState_DIRECT_VALUE;
     }
 
-    void SAL_CALL EventHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL EventHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !_rxListener.is() )
@@ -684,13 +684,13 @@ namespace pcr
         m_aPropertyListeners.addListener( _rxListener );
     }
 
-    void SAL_CALL EventHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL EventHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_aPropertyListeners.removeListener( _rxListener );
     }
 
-    Sequence< Property > SAL_CALL EventHandler::getSupportedProperties() throw (RuntimeException, std::exception)
+    Sequence< Property > SAL_CALL EventHandler::getSupportedProperties()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_bEventsMapInitialized )
@@ -758,13 +758,13 @@ namespace pcr
         return comphelper::mapValuesToSequence( aOrderedProperties );
     }
 
-    Sequence< OUString > SAL_CALL EventHandler::getSupersededProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL EventHandler::getSupersededProperties( )
     {
         // none
         return Sequence< OUString >( );
     }
 
-    Sequence< OUString > SAL_CALL EventHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL EventHandler::getActuatingProperties( )
     {
         // none
         return Sequence< OUString >( );
@@ -772,7 +772,6 @@ namespace pcr
 
     LineDescriptor SAL_CALL EventHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
-        throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
     {
         if ( !_rxControlFactory.is() )
             throw NullPointerException();
@@ -793,12 +792,12 @@ namespace pcr
         return aDescriptor;
     }
 
-    sal_Bool SAL_CALL EventHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL EventHandler::isComposable( const OUString& /*_rPropertyName*/ )
     {
         return false;
     }
 
-    InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
+    InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
@@ -872,7 +871,7 @@ namespace pcr
         return InteractiveSelectionResult_Success;
     }
 
-    void SAL_CALL EventHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL EventHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ )
     {
         OSL_FAIL( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" );
     }
@@ -886,7 +885,7 @@ namespace pcr
         m_xComponent.clear();
     }
 
-    sal_Bool SAL_CALL EventHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL EventHandler::suspend( sal_Bool /*_bSuspend*/ )
     {
         return true;
     }
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index dba6b1979200..27b00b736e46 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -97,9 +97,9 @@ namespace pcr
     public:
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext );
 
     protected:
@@ -111,31 +111,31 @@ namespace pcr
 
     protected:
         // XPropertyHandler overridables
-        virtual void                                         SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                                SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                         SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                                SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                                SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::PropertyState                    SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                         SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                         SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::Property >   SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >               SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >               SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::inspection::LineDescriptor              SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool                                     SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::inspection::InteractiveSelectionResult  SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                         SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool                                     SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void                                         SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override;
+        virtual css::uno::Any                                SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                                         SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
+        virtual css::uno::Any                                SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override;
+        virtual css::uno::Any                                SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override;
+        virtual css::beans::PropertyState                    SAL_CALL getPropertyState( const OUString& _rPropertyName ) override;
+        virtual void                                         SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual void                                         SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual css::uno::Sequence< css::beans::Property >   SAL_CALL getSupportedProperties() override;
+        virtual css::uno::Sequence< OUString >               SAL_CALL getSupersededProperties( ) override;
+        virtual css::uno::Sequence< OUString >               SAL_CALL getActuatingProperties( ) override;
+        virtual css::inspection::LineDescriptor              SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
+        virtual sal_Bool                                     SAL_CALL isComposable( const OUString& _rPropertyName ) override;
+        virtual css::inspection::InteractiveSelectionResult  SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override;
+        virtual void                                         SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override;
+        virtual sal_Bool                                     SAL_CALL suspend( sal_Bool _bSuspend ) override;
 
         // XComponent
         DECLARE_XCOMPONENT()
         virtual void                                         SAL_CALL disposing() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     private:
         /** returns the script events associated with our introspectee
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 46af453d3bdf..862621107965 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -161,13 +161,13 @@ namespace pcr
 
     IMPLEMENT_FORWARD_XINTERFACE2(FormComponentPropertyHandler,FormComponentPropertyHandler_Base,::comphelper::OPropertyContainer)
 
-    OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static(  )
     {
         return OUString(  "com.sun.star.comp.extensions.FormComponentPropertyHandler"  );
     }
 
 
-    Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.form.inspection.FormComponentPropertyHandler" };
         return aSupported;
@@ -301,7 +301,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL FormComponentPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL FormComponentPropertyHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         if( _rPropertyName == PROPERTY_ROWSET )
             return ::comphelper::OPropertyContainer::getPropertyValue( _rPropertyName );
@@ -311,7 +311,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL FormComponentPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL FormComponentPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         if( _rPropertyName == PROPERTY_ROWSET )
         {
@@ -484,7 +484,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL FormComponentPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL FormComponentPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -618,7 +618,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL FormComponentPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL FormComponentPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         sal_Int32 nPropId = m_pInfoService->getPropertyId( _rPropertyName );
@@ -798,7 +798,7 @@ namespace pcr
     }
 
 
-    PropertyState SAL_CALL FormComponentPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    PropertyState SAL_CALL FormComponentPropertyHandler::getPropertyState( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_xPropertyState.is() )
@@ -807,7 +807,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL FormComponentPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL FormComponentPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         FormComponentPropertyHandler_Base::addPropertyChangeListener( _rxListener );
@@ -816,7 +816,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL FormComponentPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormComponentPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_xComponent.is() )
@@ -902,13 +902,13 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupersededProperties( )
     {
         return Sequence< OUString >( );
     }
 
 
-    Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getActuatingProperties( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         ::std::vector< OUString > aInterestingProperties;
@@ -940,7 +940,6 @@ namespace pcr
 
     LineDescriptor SAL_CALL FormComponentPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
-        throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
     {
         if ( !_rxControlFactory.is() )
             throw NullPointerException();
@@ -1388,7 +1387,7 @@ namespace pcr
     }
 
 
-    InteractiveSelectionResult SAL_CALL FormComponentPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
+    InteractiveSelectionResult SAL_CALL FormComponentPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
@@ -1491,7 +1490,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL FormComponentPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL FormComponentPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
@@ -1991,7 +1990,7 @@ namespace pcr
     }
 
 
-    sal_Bool SAL_CALL FormComponentPropertyHandler::suspend( sal_Bool _bSuspend ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL FormComponentPropertyHandler::suspend( sal_Bool _bSuspend )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( _bSuspend )
@@ -3289,7 +3288,7 @@ namespace pcr
         return *getArrayHelper();
     }
 
-    uno::Reference< beans::XPropertySetInfo > SAL_CALL FormComponentPropertyHandler::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+    uno::Reference< beans::XPropertySetInfo > SAL_CALL FormComponentPropertyHandler::getPropertySetInfo(  )
     {
         return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
     }
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index 6ca1de715068..d0afdf3c8c9a 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -101,12 +101,12 @@ namespace pcr
         DECLARE_XINTERFACE( )
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
 
     protected:
         virtual ~FormComponentPropertyHandler() override;
@@ -115,20 +115,20 @@ namespace pcr
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         // XPropertyHandler overridables
-        virtual css::uno::Any                          SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                   SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                          SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                          SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::PropertyState              SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                   SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                   SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >         SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >         SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::inspection::LineDescriptor        SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any                          SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                                   SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
+        virtual css::uno::Any                          SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override;
+        virtual css::uno::Any                          SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override;
+        virtual css::beans::PropertyState              SAL_CALL getPropertyState( const OUString& _rPropertyName ) override;
+        virtual void                                   SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual void                                   SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual css::uno::Sequence< OUString >         SAL_CALL getSupersededProperties() override;
+        virtual css::uno::Sequence< OUString >         SAL_CALL getActuatingProperties() override;
+        virtual css::inspection::LineDescriptor        SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
         virtual css::inspection::InteractiveSelectionResult
-                                                       SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                   SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool                               SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override;
+                                                       SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override;
+        virtual void                                   SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override;
+        virtual sal_Bool                               SAL_CALL suspend( sal_Bool _bSuspend ) override;
 
         // XComponent
         virtual void                                   SAL_CALL disposing() override;
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 13c5d8ae713d..0c06887c1fc9 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -92,7 +92,7 @@ namespace pcr
     IMPLEMENT_FORWARD_XINTERFACE2( FormController, OPropertyBrowserController, FormController_PropertyBase1 )
 
 
-    Sequence< Type > SAL_CALL FormController::getTypes(  ) throw(RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL FormController::getTypes(  )
     {
         ::cppu::OTypeCollection aTypes(
             cppu::UnoType<XPropertySet>::get(),
@@ -106,13 +106,13 @@ namespace pcr
     IMPLEMENT_GET_IMPLEMENTATION_ID( FormController )
 
 
-    OUString SAL_CALL FormController::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL FormController::getImplementationName(  )
     {
         return m_aServiceDescriptor.GetImplementationName();
     }
 
 
-    Sequence< OUString > SAL_CALL FormController::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL FormController::getSupportedServiceNames(  )
     {
         Sequence< OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() );
         aSupported.realloc( aSupported.getLength() + 1 );
@@ -121,13 +121,13 @@ namespace pcr
     }
 
 
-    OUString FormController::getImplementationName_static(  ) throw(RuntimeException)
+    OUString FormController::getImplementationName_static(  )
     {
         return OUString("org.openoffice.comp.extensions.FormController");
     }
 
 
-    Sequence< OUString > FormController::getSupportedServiceNames_static(  ) throw(RuntimeException)
+    Sequence< OUString > FormController::getSupportedServiceNames_static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.form.PropertyBrowserController" };
         return aSupported;
@@ -143,7 +143,7 @@ namespace pcr
     }
 
 
-    Reference< XPropertySetInfo > SAL_CALL FormController::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL FormController::getPropertySetInfo(  )
     {
         return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
     }
@@ -174,7 +174,7 @@ namespace pcr
     }
 
 
-    sal_Bool SAL_CALL FormController::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException)
+    sal_Bool SAL_CALL FormController::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
     {
         switch ( nHandle )
         {
@@ -194,7 +194,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL FormController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception, std::exception)
+    void SAL_CALL FormController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
     {
         switch ( _nHandle )
         {
@@ -248,13 +248,13 @@ namespace pcr
     //= DialogController
 
 
-    OUString DialogController::getImplementationName_static(  ) throw(RuntimeException)
+    OUString DialogController::getImplementationName_static(  )
     {
         return OUString("org.openoffice.comp.extensions.DialogController");
     }
 
 
-    Sequence< OUString > DialogController::getSupportedServiceNames_static(  ) throw(RuntimeException)
+    Sequence< OUString > DialogController::getSupportedServiceNames_static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.awt.PropertyBrowserController" };
         return aSupported;
diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx
index 73e75af72053..480e278b7ecc 100644
--- a/extensions/source/propctrlr/formcontroller.hxx
+++ b/extensions/source/propctrlr/formcontroller.hxx
@@ -69,9 +69,9 @@ namespace pcr
 
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
                         Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
@@ -82,20 +82,20 @@ namespace pcr
         DECLARE_XTYPEPROVIDER()
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XPropertySet and friends
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
         virtual sal_Bool SAL_CALL convertFastPropertyValue(
                 css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue
-            )   throw (css::lang::IllegalArgumentException) override;
+            ) override;
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
                 sal_Int32 nHandle, const css::uno::Any& rValue
-            ) throw (css::uno::Exception, std::exception) override;
+            ) override;
         virtual void SAL_CALL getFastPropertyValue(
                 css::uno::Any& rValue, sal_Int32 nHandle
             ) const override;
@@ -113,9 +113,9 @@ namespace pcr
     public:
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
                         Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index dfd2ee4031a0..778c6111a406 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -167,10 +167,10 @@ namespace pcr
         }
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const PropertyChangeEvent& _event ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const PropertyChangeEvent& _event ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& _event ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& _event ) override;
 
     protected:
         virtual ~ShapeGeometryChangeNotifier() override
@@ -210,22 +210,22 @@ namespace pcr
         );
 
         /// @throws RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws RuntimeException
-        static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (RuntimeException);
+        static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
 
     protected:
         virtual ~FormGeometryHandler() override;
 
     protected:
         // XPropertyHandler overriables
-        virtual Any                         SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) override;
-        virtual LineDescriptor              SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual Sequence< OUString >        SAL_CALL getActuatingProperties( ) throw (RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception) override;
+        virtual Any                         SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                        SAL_CALL setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) override;
+        virtual LineDescriptor              SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
+        virtual void                        SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual void                        SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual Sequence< OUString >        SAL_CALL getActuatingProperties( ) override;
+        virtual void                        SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override;
 
         // OComponentHandler overridables
         virtual void SAL_CALL disposing() override;
@@ -308,20 +308,20 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL FormGeometryHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL FormGeometryHandler::getImplementationName_static(  )
     {
         return OUString( "com.sun.star.comp.extensions.FormGeometryHandler" );
     }
 
 
-    Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.form.inspection.FormGeometryHandler" };
         return aSupported;
     }
 
 
-    Any SAL_CALL FormGeometryHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL FormGeometryHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -370,7 +370,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL FormGeometryHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL FormGeometryHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -438,7 +438,6 @@ namespace pcr
 
     LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const OUString& _rPropertyName,
             const Reference< XPropertyControlFactory >& _rxControlFactory )
-        throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -485,7 +484,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL FormGeometryHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormGeometryHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _listener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         OSL_PRECOND( m_xChangeNotifier.is(), "FormGeometryHandler::addPropertyChangeListener: no notified, implies no shape!?" );
@@ -494,7 +493,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL FormGeometryHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormGeometryHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _listener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         OSL_PRECOND( m_xChangeNotifier.is(), "FormGeometryHandler::removePropertyChangeListener: no notified, implies no shape!?" );
@@ -503,14 +502,14 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( )
     {
         Sequence< OUString > aInterestedIn { PROPERTY_TEXT_ANCHOR_TYPE };
         return aInterestedIn;
     }
 
 
-    void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
@@ -718,7 +717,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL ShapeGeometryChangeNotifier::propertyChange( const PropertyChangeEvent& _event ) throw (RuntimeException, std::exception)
+    void SAL_CALL ShapeGeometryChangeNotifier::propertyChange( const PropertyChangeEvent& _event )
     {
         ::comphelper::ComponentMethodGuard aGuard( *this );
 
@@ -762,7 +761,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL ShapeGeometryChangeNotifier::disposing( const EventObject& /*_event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL ShapeGeometryChangeNotifier::disposing( const EventObject& /*_event*/ )
     {
         ::comphelper::ComponentMethodGuard aGuard( *this );
         impl_dispose_nothrow();
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 175613312aa5..d0bb41ad5d6e 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -187,10 +187,10 @@ namespace pcr
         virtual ~UrlClickHandler() override;
 
         // XActionListener
-        virtual void SAL_CALL actionPerformed( const ActionEvent& rEvent ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL actionPerformed( const ActionEvent& rEvent ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
     protected:
         void impl_dispatch_throw( const OUString& _rURL );
@@ -216,7 +216,7 @@ namespace pcr
     {
     }
 
-    void SAL_CALL UrlClickHandler::actionPerformed( const ActionEvent& rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL UrlClickHandler::actionPerformed( const ActionEvent& rEvent )
     {
         Reference< XPropertyControl > xControl( rEvent.Source, UNO_QUERY_THROW );
         Any aControlValue( xControl->getValue() );
@@ -231,7 +231,7 @@ namespace pcr
         impl_dispatch_throw( sURL );
     }
 
-    void SAL_CALL UrlClickHandler::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL UrlClickHandler::disposing( const EventObject& /*Source*/ )
     {
         // not interested in
     }
@@ -266,27 +266,27 @@ namespace pcr
     {
     }
 
-    OUString SAL_CALL GenericPropertyHandler::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL GenericPropertyHandler::getImplementationName(  )
     {
         return getImplementationName_static();
     }
 
-    sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_static();
     }
 
-    OUString SAL_CALL GenericPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL GenericPropertyHandler::getImplementationName_static(  )
     {
         return OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" );
     }
 
-    Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.inspection.GenericPropertyHandler" };
         return aSupported;
@@ -297,7 +297,7 @@ namespace pcr
         return *( new GenericPropertyHandler( _rxContext ) );
     }
 
-    void SAL_CALL GenericPropertyHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception)
+    void SAL_CALL GenericPropertyHandler::inspect( const Reference< XInterface >& _rxIntrospectee )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -334,7 +334,7 @@ namespace pcr
             m_xComponent->addPropertyChangeListener( OUString(), static_cast< XPropertyChangeListener* >( iterReAdd.next() ) );
     }
 
-    Any SAL_CALL GenericPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL GenericPropertyHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_xComponent.is() )
@@ -343,7 +343,7 @@ namespace pcr
         return m_xComponent->getPropertyValue( _rPropertyName );
     }
 
-    void SAL_CALL GenericPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL GenericPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_xComponent.is() )
@@ -360,7 +360,7 @@ namespace pcr
         return rConverter;
     }
 
-    Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_ensurePropertyMap();
@@ -386,7 +386,7 @@ namespace pcr
         return aPropertyValue;
     }
 
-    Any SAL_CALL GenericPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL GenericPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_ensurePropertyMap();
@@ -409,7 +409,7 @@ namespace pcr
         return aControlValue;
     }
 
-    PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyState eState = PropertyState_DIRECT_VALUE;
@@ -419,7 +419,6 @@ namespace pcr
     }
 
     void SAL_CALL GenericPropertyHandler::addPropertyChangeListener(const Reference< XPropertyChangeListener >& _rxListener)
-        throw (NullPointerException, RuntimeException, std::exception)
     {
         if ( !_rxListener.is() )
             throw NullPointerException();
@@ -439,7 +438,7 @@ namespace pcr
         }
     }
 
-    void SAL_CALL GenericPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL GenericPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_xComponent.is() )
@@ -523,7 +522,7 @@ namespace pcr
         }
     }
 
-    Sequence< Property > SAL_CALL GenericPropertyHandler::getSupportedProperties() throw (RuntimeException, std::exception)
+    Sequence< Property > SAL_CALL GenericPropertyHandler::getSupportedProperties()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_ensurePropertyMap();
@@ -531,7 +530,7 @@ namespace pcr
         return comphelper::mapValuesToSequence( m_aProperties );
     }
 
-    Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( )
     {
         // no superseded properties at all. This handler offers the very basic PropertyHandler
         // functionality, so it's much more likely that other handlers want to supersede
@@ -539,7 +538,7 @@ namespace pcr
         return Sequence< OUString >( );
     }
 
-    Sequence< OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( )
     {
         // This basic PropertyHandler implementation is too dumb^Wgeneric to know
         // anything about property dependencies
@@ -548,7 +547,6 @@ namespace pcr
 
     LineDescriptor SAL_CALL GenericPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
-        throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
     {
         if ( !_rxControlFactory.is() )
             throw NullPointerException();
@@ -595,23 +593,23 @@ namespace pcr
         return aDescriptor;
     }
 
-    sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const OUString& /*_rPropertyName*/ )
     {
         return false;
     }
 
-    InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
+    InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ )
     {
         OSL_FAIL( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" );
         return InteractiveSelectionResult_Cancelled;
     }
 
-    void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ )
     {
         OSL_FAIL( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" );
     }
 
-    sal_Bool SAL_CALL GenericPropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL GenericPropertyHandler::suspend( sal_Bool /*_bSuspend*/ )
     {
         return true;
     }
diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx
index 58589a6b811c..c64ff2da0068 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.hxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.hxx
@@ -82,9 +82,9 @@ namespace pcr
     public:
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext );
 
     protected:
@@ -96,34 +96,34 @@ namespace pcr
 
     protected:
         // XPropertyHandler overridables
-        virtual void                                                SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                                       SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                                SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                                       SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                                       SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::PropertyState                           SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                                SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                                SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void                                                SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override;
+        virtual css::uno::Any                                       SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                                                SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
+        virtual css::uno::Any                                       SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override;
+        virtual css::uno::Any                                       SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override;
+        virtual css::beans::PropertyState                           SAL_CALL getPropertyState( const OUString& _rPropertyName ) override;
+        virtual void                                                SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual void                                                SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
         virtual css::uno::Sequence< css::beans::Property >
-                                                                    SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override;
+                                                                    SAL_CALL getSupportedProperties() override;
         virtual css::uno::Sequence< OUString >
-                                                                    SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >                      SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::inspection::LineDescriptor                     SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool                                            SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+                                                                    SAL_CALL getSupersededProperties() override;
+        virtual css::uno::Sequence< OUString >                      SAL_CALL getActuatingProperties() override;
+        virtual css::inspection::LineDescriptor                     SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
+        virtual sal_Bool                                            SAL_CALL isComposable( const OUString& _rPropertyName ) override;
         virtual css::inspection::InteractiveSelectionResult
-                                                                    SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                                SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool                                            SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override;
+                                                                    SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override;
+        virtual void                                                SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override;
+        virtual sal_Bool                                            SAL_CALL suspend( sal_Bool _bSuspend ) override;
 
         // XComponent
         DECLARE_XCOMPONENT()
         virtual void                                                SAL_CALL disposing() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     private:
         /** ensures that ->m_aProperties is initialized
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index d2e21a2dc5ac..7bdd98b4fe98 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -272,7 +272,7 @@ namespace pcr
         return xI;
     }
 
-    Reference< XInterface > PropertyHandlerHelper::getContextDocument_throw( const Reference<XComponentContext> & _rContext ) throw (RuntimeException)
+    Reference< XInterface > PropertyHandlerHelper::getContextDocument_throw( const Reference<XComponentContext> & _rContext )
     {
         Reference< XInterface > xI;
         Any aReturn = _rContext->getValueByName( "ContextDocument" );
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index 891aa05b290d..8e1f7f47f8ab 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -197,7 +197,7 @@ namespace pcr
         static css::uno::Reference< css::uno::XInterface > getContextDocument( const css::uno::Reference<css::uno::XComponentContext> & _rContext );
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Reference< css::uno::XInterface > getContextDocument_throw( const css::uno::Reference<css::uno::XComponentContext> & _rContext ) throw (css::uno::RuntimeException);
+        static css::uno::Reference< css::uno::XInterface > getContextDocument_throw( const css::uno::Reference<css::uno::XComponentContext> & _rContext );
 
         /** gets the window of the ObjectInspector in which an property handler lives
 
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index d4f8d9233276..31009a8e0682 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -173,7 +173,7 @@ namespace pcr
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ImplInspectorModel, ImplInspectorModel_Base, ImplInspectorModel_PBase )
 
 
-    Reference< XPropertySetInfo > SAL_CALL ImplInspectorModel::getPropertySetInfo(  ) throw (RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL ImplInspectorModel::getPropertySetInfo(  )
     {
         return m_pProperties->getPropertySetInfo();
     }
@@ -185,13 +185,13 @@ namespace pcr
     }
 
 
-    sal_Bool SAL_CALL ImplInspectorModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException)
+    sal_Bool SAL_CALL ImplInspectorModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
     {
         return m_pProperties->convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, rValue );
     }
 
 
-    void SAL_CALL ImplInspectorModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+    void SAL_CALL ImplInspectorModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
     {
         m_pProperties->setFastPropertyValue( nHandle, rValue );
     }
@@ -203,36 +203,36 @@ namespace pcr
     }
 
 
-    sal_Bool SAL_CALL ImplInspectorModel::getHasHelpSection() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL ImplInspectorModel::getHasHelpSection()
     {
         return m_pProperties->hasHelpSection();
     }
 
 
-    ::sal_Int32 SAL_CALL ImplInspectorModel::getMinHelpTextLines() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL ImplInspectorModel::getMinHelpTextLines()
     {
         return m_pProperties->getMinHelpTextLines();
     }
 
 
-    ::sal_Int32 SAL_CALL ImplInspectorModel::getMaxHelpTextLines() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL ImplInspectorModel::getMaxHelpTextLines()
     {
         return m_pProperties->getMaxHelpTextLines();
     }
 
 
-    sal_Bool SAL_CALL ImplInspectorModel::getIsReadOnly() throw (css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL ImplInspectorModel::getIsReadOnly()
     {
         return m_pProperties->isReadOnly();
     }
 
 
-    void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool IsReadOnly ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool IsReadOnly )
     {
         setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, makeAny( IsReadOnly ) );
     }
 
-    sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx
index 747fd7aabd0b..365740653002 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -66,21 +66,21 @@ namespace pcr
         DECLARE_XTYPEPROVIDER()
 
         // css::beans::XPropertySet and friends
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
         virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException) override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
         // css::inspection::XObjectInspectorModel
-        virtual sal_Bool SAL_CALL getHasHelpSection() throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getIsReadOnly() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setIsReadOnly( sal_Bool IsReadOnly ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getHasHelpSection() override;
+        virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() override;
+        virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() override;
+        virtual sal_Bool SAL_CALL getIsReadOnly() override;
+        virtual void SAL_CALL setIsReadOnly( sal_Bool IsReadOnly ) override;
 
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
     protected:
         void enableHelpSectionProperties( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines );
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index b2761372526a..06b30c914f22 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -59,22 +59,22 @@ namespace pcr
         ObjectInspectorModel();
 
         // XObjectInspectorModel
-        virtual Sequence< Any > SAL_CALL getHandlerFactories() throw (RuntimeException, std::exception) override;
-        virtual Sequence< PropertyCategoryDescriptor > SAL_CALL describeCategories(  ) throw (RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (RuntimeException, std::exception) override;
+        virtual Sequence< Any > SAL_CALL getHandlerFactories() override;
+        virtual Sequence< PropertyCategoryDescriptor > SAL_CALL describeCategories(  ) override;
+        virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XServiceInfo - static versions
         /// @throws RuntimeException
-        static OUString getImplementationName_static(  ) throw(RuntimeException);
+        static OUString getImplementationName_static(  );
         /// @throws RuntimeException
-        static Sequence< OUString > getSupportedServiceNames_static(  ) throw(RuntimeException);
+        static Sequence< OUString > getSupportedServiceNames_static(  );
         static Reference< XInterface > SAL_CALL
                         Create(const Reference< XComponentContext >&);
 
@@ -98,27 +98,27 @@ namespace pcr
     }
 
 
-    Sequence< Any > SAL_CALL ObjectInspectorModel::getHandlerFactories() throw (RuntimeException, std::exception)
+    Sequence< Any > SAL_CALL ObjectInspectorModel::getHandlerFactories()
     {
         return m_aFactories;
     }
 
 
-    Sequence< PropertyCategoryDescriptor > SAL_CALL ObjectInspectorModel::describeCategories(  ) throw (RuntimeException, std::exception)
+    Sequence< PropertyCategoryDescriptor > SAL_CALL ObjectInspectorModel::describeCategories(  )
     {
         // no category info provided by this default implementation
         return Sequence< PropertyCategoryDescriptor >( );
     }
 
 
-    ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const OUString& /*PropertyName*/ ) throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const OUString& /*PropertyName*/ )
     {
         // no ordering provided by this default implementation
         return 0;
     }
 
 
-    void SAL_CALL ObjectInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL ObjectInspectorModel::initialize( const Sequence< Any >& _arguments )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_aFactories.getLength() )
@@ -153,25 +153,25 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL ObjectInspectorModel::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL ObjectInspectorModel::getImplementationName(  )
     {
         return getImplementationName_static();
     }
 
 
-    Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_static();
     }
 
 
-    OUString ObjectInspectorModel::getImplementationName_static(  ) throw(RuntimeException)
+    OUString ObjectInspectorModel::getImplementationName_static(  )
     {
         return OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" );
     }
 
 
-    Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static(  ) throw(RuntimeException)
+    Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static(  )
     {
         OUString sService( "com.sun.star.inspection.ObjectInspectorModel" );
         return Sequence< OUString >( &sService, 1 );
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 0f4d7a661832..bfcaa0f7bbc3 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -102,20 +102,20 @@ namespace pcr
     //= UNO helpers
 
 #define DECLARE_XCOMPONENT() \
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override; \
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; \
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 #define IMPLEMENT_FORWARD_XCOMPONENT( classname, baseclass ) \
-    void SAL_CALL classname::dispose(  ) throw (css::uno::RuntimeException, std::exception) \
+    void SAL_CALL classname::dispose(  ) \
     { \
     baseclass::WeakComponentImplHelperBase::dispose(); \
     } \
-    void SAL_CALL classname::addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) \
+    void SAL_CALL classname::addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) \
     { \
         baseclass::WeakComponentImplHelperBase::addEventListener( Listener ); \
     } \
-    void SAL_CALL classname::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) \
+    void SAL_CALL classname::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) \
     { \
         baseclass::WeakComponentImplHelperBase::removeEventListener( Listener ); \
     } \
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index d14964f58416..d9569ec5c54e 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -70,7 +70,7 @@ namespace pcr
     }
 
 
-    Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+    Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -82,25 +82,25 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OTabOrderDialog::getImplementationName()
     {
         return getImplementationName_static();
     }
 
 
-    OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException)
+    OUString OTabOrderDialog::getImplementationName_static()
     {
         return OUString("org.openoffice.comp.form.ui.OTabOrderDialog");
     }
 
 
-    css::uno::Sequence<OUString> SAL_CALL OTabOrderDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    css::uno::Sequence<OUString> SAL_CALL OTabOrderDialog::getSupportedServiceNames()
     {
         return getSupportedServiceNames_static();
     }
 
 
-    css::uno::Sequence<OUString> OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException)
+    css::uno::Sequence<OUString> OTabOrderDialog::getSupportedServiceNames_static()
     {
         css::uno::Sequence<OUString> aSupported(2);
         aSupported.getArray()[0] = "com.sun.star.form.ui.TabOrderDialog";
@@ -109,7 +109,7 @@ namespace pcr
     }
 
 
-    Reference<XPropertySetInfo>  SAL_CALL OTabOrderDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference<XPropertySetInfo>  SAL_CALL OTabOrderDialog::getPropertySetInfo()
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
@@ -135,7 +135,7 @@ namespace pcr
         return VclPtr<TabOrderDialog>::Create( _pParent, m_xTabbingModel, m_xControlContext, m_aContext );
     }
 
-    void OTabOrderDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception)
+    void OTabOrderDialog::initialize( const Sequence< Any >& aArguments )
     {
         Reference<css::awt::XTabControllerModel> xTabbingModel;
         Reference<css::awt::XControlContainer> xControlContext;
diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx
index 91dfacfdd621..98c6a1342b5c 100644
--- a/extensions/source/propctrlr/pcrunodialogs.hxx
+++ b/extensions/source/propctrlr/pcrunodialogs.hxx
@@ -53,25 +53,25 @@ namespace pcr
         virtual ~OTabOrderDialog() override;
 
         // XTypeProvider
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // XServiceInfo - static methods
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_static();
         static css::uno::Reference< css::uno::XInterface >
                 SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 7ab004a9f10c..11e2b66d4656 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -109,7 +109,7 @@ namespace pcr
     IMPLEMENT_FORWARD_REFCOUNT( OPropertyBrowserController, OPropertyBrowserController_Base )
 
 
-    Any SAL_CALL OPropertyBrowserController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+    Any SAL_CALL OPropertyBrowserController::queryInterface( const Type& _rType )
     {
         Any aReturn = OPropertyBrowserController_Base::queryInterface( _rType );
         if ( !aReturn.hasValue() )
@@ -159,7 +159,7 @@ namespace pcr
     }
 
 
-    Reference< XObjectInspectorModel > SAL_CALL OPropertyBrowserController::getInspectorModel() throw (RuntimeException, std::exception)
+    Reference< XObjectInspectorModel > SAL_CALL OPropertyBrowserController::getInspectorModel()
     {
         return m_xModel;
     }
@@ -237,7 +237,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OPropertyBrowserController::setInspectorModel( const Reference< XObjectInspectorModel >& _inspectorModel ) throw (RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::setInspectorModel( const Reference< XObjectInspectorModel >& _inspectorModel )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -248,14 +248,14 @@ namespace pcr
     }
 
 
-    Reference< XObjectInspectorUI > SAL_CALL OPropertyBrowserController::getInspectorUI() throw (RuntimeException, std::exception)
+    Reference< XObjectInspectorUI > SAL_CALL OPropertyBrowserController::getInspectorUI()
     {
         // we're derived from this interface, though we do not expose it in queryInterface and getTypes.
         return this;
     }
 
 
-    void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) throw (css::util::VetoException, RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -276,14 +276,14 @@ namespace pcr
     }
 
 
-    Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException, std::exception)
+    Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ )
     {
         // we don't have any dispatches at all, right now
         return Reference< XDispatch >();
     }
 
 
-    Sequence< Reference< XDispatch > > SAL_CALL OPropertyBrowserController::queryDispatches( const Sequence< DispatchDescriptor >& Requests ) throw (RuntimeException, std::exception)
+    Sequence< Reference< XDispatch > > SAL_CALL OPropertyBrowserController::queryDispatches( const Sequence< DispatchDescriptor >& Requests )
     {
         Sequence< Reference< XDispatch > > aReturn;
         sal_Int32 nLen = Requests.getLength();
@@ -300,7 +300,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OPropertyBrowserController::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::initialize( const Sequence< Any >& _arguments )
     {
         if ( m_bConstructed )
             throw AlreadyInitializedException();
@@ -337,7 +337,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OPropertyBrowserController::attachFrame( const Reference< XFrame >& _rxFrame ) throw(RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::attachFrame( const Reference< XFrame >& _rxFrame )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -379,7 +379,7 @@ namespace pcr
     }
 
 
-    sal_Bool SAL_CALL OPropertyBrowserController::attachModel( const Reference< XModel >& _rxModel ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL OPropertyBrowserController::attachModel( const Reference< XModel >& _rxModel )
     {
         Reference< XObjectInspectorModel > xModel( _rxModel, UNO_QUERY );
         if ( !xModel.is() )
@@ -445,7 +445,7 @@ namespace pcr
     }
 
 
-    sal_Bool SAL_CALL OPropertyBrowserController::suspend( sal_Bool _bSuspend ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL OPropertyBrowserController::suspend( sal_Bool _bSuspend )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         OSL_ENSURE( haveView(), "OPropertyBrowserController::suspend: don't have a view anymore!" );
@@ -472,13 +472,13 @@ namespace pcr
     }
 
 
-    Any SAL_CALL OPropertyBrowserController::getViewData(  ) throw(RuntimeException, std::exception)
+    Any SAL_CALL OPropertyBrowserController::getViewData(  )
     {
         return makeAny( m_sPageSelection );
     }
 
 
-    void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data ) throw(RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data )
     {
         OUString sPageSelection;
         if ( ( Data >>= sPageSelection ) && !sPageSelection.isEmpty() )
@@ -489,20 +489,20 @@ namespace pcr
     }
 
 
-    Reference< XModel > SAL_CALL OPropertyBrowserController::getModel(  ) throw(RuntimeException, std::exception)
+    Reference< XModel > SAL_CALL OPropertyBrowserController::getModel(  )
     {
         // have no model
         return Reference< XModel >();
     }
 
 
-    Reference< XFrame > SAL_CALL OPropertyBrowserController::getFrame(  ) throw(RuntimeException, std::exception)
+    Reference< XFrame > SAL_CALL OPropertyBrowserController::getFrame(  )
     {
         return m_xFrame;
     }
 
 
-    void SAL_CALL OPropertyBrowserController::dispose(  ) throw(RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::dispose(  )
     {
         SolarMutexGuard aSolarGuard;
 
@@ -528,42 +528,42 @@ namespace pcr
     }
 
 
-    void SAL_CALL OPropertyBrowserController::addEventListener( const Reference< XEventListener >& _rxListener ) throw(RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::addEventListener( const Reference< XEventListener >& _rxListener )
     {
         m_aDisposeListeners.addInterface(_rxListener);
     }
 
 
-    void SAL_CALL OPropertyBrowserController::removeEventListener( const Reference< XEventListener >& _rxListener ) throw(RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::removeEventListener( const Reference< XEventListener >& _rxListener )
     {
         m_aDisposeListeners.removeInterface(_rxListener);
     }
 
 
-    OUString SAL_CALL OPropertyBrowserController::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL OPropertyBrowserController::getImplementationName(  )
     {
         return getImplementationName_static();
     }
 
-    sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
 
-    Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_static();
     }
 
 
-    OUString OPropertyBrowserController::getImplementationName_static(  ) throw(RuntimeException)
+    OUString OPropertyBrowserController::getImplementationName_static(  )
     {
         return OUString("org.openoffice.comp.extensions.ObjectInspector");
     }
 
 
-    Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static(  ) throw(RuntimeException)
+    Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.inspection.ObjectInspector" };
         return aSupported;
@@ -576,7 +576,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OPropertyBrowserController::focusGained( const FocusEvent& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::focusGained( const FocusEvent& _rSource )
     {
         Reference< XWindow > xSourceWindow(_rSource.Source, UNO_QUERY);
         Reference< XWindow > xContainerWindow;
@@ -591,13 +591,13 @@ namespace pcr
     }
 
 
-    void SAL_CALL OPropertyBrowserController::focusLost( const FocusEvent& /*_rSource*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::focusLost( const FocusEvent& /*_rSource*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL OPropertyBrowserController::disposing( const EventObject& _rSource ) throw(RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::disposing( const EventObject& _rSource )
     {
         if ( m_xView.is() && ( m_xView == _rSource.Source ) )
         {
@@ -704,7 +704,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OPropertyBrowserController::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::propertyChange( const PropertyChangeEvent& _rEvent )
     {
         if ( _rEvent.Source == m_xModel )
         {
@@ -748,7 +748,7 @@ namespace pcr
     }
 
 
-    Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1078,7 +1078,7 @@ namespace pcr
     }
 
 
-    css::awt::Size SAL_CALL OPropertyBrowserController::getMinimumSize() throw (css::uno::RuntimeException, std::exception)
+    css::awt::Size SAL_CALL OPropertyBrowserController::getMinimumSize()
     {
         css::awt::Size aSize;
         if( m_pView )
@@ -1088,13 +1088,13 @@ namespace pcr
     }
 
 
-    css::awt::Size SAL_CALL OPropertyBrowserController::getPreferredSize() throw (css::uno::RuntimeException, std::exception)
+    css::awt::Size SAL_CALL OPropertyBrowserController::getPreferredSize()
     {
         return getMinimumSize();
     }
 
 
-    css::awt::Size SAL_CALL OPropertyBrowserController::calcAdjustedSize( const css::awt::Size& _rNewSize ) throw (css::uno::RuntimeException, std::exception)
+    css::awt::Size SAL_CALL OPropertyBrowserController::calcAdjustedSize( const css::awt::Size& _rNewSize )
     {
         awt::Size aMinSize = getMinimumSize( );
         awt::Size aAdjustedSize( _rNewSize );
@@ -1328,7 +1328,7 @@ namespace pcr
     }
 
 
-    bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) throw (RuntimeException)
+    bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName )
     {
         for (   OrderedPropertyMap::const_iterator search = m_aProperties.begin();
                 search != m_aProperties.end();
@@ -1526,7 +1526,7 @@ namespace pcr
     }
 
 
-    void OPropertyBrowserController::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    void OPropertyBrowserController::rebuildPropertyUI( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !haveView() )
@@ -1550,7 +1550,7 @@ namespace pcr
    }
 
 
-    void OPropertyBrowserController::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException, std::exception)
+    void OPropertyBrowserController::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !haveView() )
@@ -1563,7 +1563,7 @@ namespace pcr
     }
 
 
-    void OPropertyBrowserController::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException, std::exception)
+    void OPropertyBrowserController::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !haveView() )
@@ -1576,7 +1576,7 @@ namespace pcr
     }
 
 
-    void OPropertyBrowserController::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    void OPropertyBrowserController::showPropertyUI( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !haveView() )
@@ -1626,7 +1626,7 @@ namespace pcr
     }
 
 
-    void OPropertyBrowserController::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    void OPropertyBrowserController::hidePropertyUI( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !haveView() )
@@ -1639,7 +1639,7 @@ namespace pcr
     }
 
 
-    void OPropertyBrowserController::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException, std::exception)
+    void OPropertyBrowserController::showCategory( const OUString& _rCategory, sal_Bool _bShow )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !haveView() )
@@ -1652,7 +1652,7 @@ namespace pcr
     }
 
 
-    Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !haveView() )
@@ -1663,19 +1663,19 @@ namespace pcr
     }
 
 
-    void SAL_CALL OPropertyBrowserController::registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::registerControlObserver( const Reference< XPropertyControlObserver >& Observer )
     {
         m_aControlObservers.addInterface( Observer );
     }
 
 
-    void SAL_CALL OPropertyBrowserController::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer )
     {
         m_aControlObservers.removeInterface( Observer );
     }
 
 
-    void SAL_CALL OPropertyBrowserController::setHelpSectionText( const OUString& _rHelpText ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL OPropertyBrowserController::setHelpSectionText( const OUString& _rHelpText )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index f17a17170ebf..23180e88d25e 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -144,42 +144,42 @@ namespace pcr
         DECLARE_XINTERFACE()
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XController
-        virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getViewData(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL restoreViewData( const css::uno::Any& Data ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) override;
+        virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) override;
+        virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) override;
+        virtual css::uno::Any SAL_CALL getViewData(  ) override;
+        virtual void SAL_CALL restoreViewData( const css::uno::Any& Data ) override;
+        virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel(  ) override;
+        virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame(  ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose(  ) override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
         // XFocusListener
-        virtual void SAL_CALL focusGained( const css::awt::FocusEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL focusLost( const css::awt::FocusEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL focusGained( const css::awt::FocusEvent& _rSource ) override;
+        virtual void SAL_CALL focusLost( const css::awt::FocusEvent& _rSource ) 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;
 
         // XLayoutConstrains
-        virtual css::awt::Size SAL_CALL getMinimumSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getPreferredSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::awt::Size SAL_CALL getMinimumSize(  ) override;
+        virtual css::awt::Size SAL_CALL getPreferredSize(  ) override;
+        virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
         // XPropertyChangeListener
-        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;
 
         /** XPropertyControlFactory
         */
-        virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) override;
 
     public:
         explicit OPropertyBrowserController(
@@ -191,9 +191,9 @@ namespace pcr
     public:
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
                         Create(const css::uno::Reference< css::uno::XComponentContext >&);
 
@@ -207,32 +207,32 @@ namespace pcr
         virtual void    valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) override;
 
         // IPropertyExistenceCheck
-        virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) override;
+        virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) override;
 
         // XObjectInspectorUI
-        virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL registerControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL revokeControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) override;
+        virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) override;
+        virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) override;
+        virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) override;
+        virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) override;
+        virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) override;
+        virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) override;
+        virtual void SAL_CALL registerControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) override;
+        virtual void SAL_CALL revokeControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) override;
+        virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) override;
 
         // XObjectInspector
-        virtual css::uno::Reference< css::inspection::XObjectInspectorModel > SAL_CALL getInspectorModel() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setInspectorModel( const css::uno::Reference< css::inspection::XObjectInspectorModel >& _inspectormodel ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::inspection::XObjectInspectorUI > SAL_CALL getInspectorUI() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL inspect( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects ) throw (css::util::VetoException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::inspection::XObjectInspectorModel > SAL_CALL getInspectorModel() override;
+        virtual void SAL_CALL setInspectorModel( const css::uno::Reference< css::inspection::XObjectInspectorModel >& _inspectormodel ) override;
+        virtual css::uno::Reference< css::inspection::XObjectInspectorUI > SAL_CALL getInspectorUI() override;
+        virtual void SAL_CALL inspect( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects ) override;
 
         // XDispatchProvider
-        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& URL, const OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& URL, const OUString& TargetFrameName, ::sal_Int32 SearchFlags ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     private:
         void UpdateUI();
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index dd3f24e78799..1ea3b7a00d7e 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -110,7 +110,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyComposer::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception)
+    void SAL_CALL PropertyComposer::inspect( const Reference< XInterface >& _rxIntrospectee )
     {
         MethodGuard aGuard( *this );
 
@@ -124,35 +124,35 @@ namespace pcr
     }
 
 
-    Any SAL_CALL PropertyComposer::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL PropertyComposer::getPropertyValue( const OUString& _rPropertyName )
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->getPropertyValue( _rPropertyName );
     }
 
 
-    void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, PropertyVetoException, std::exception)
+    void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         MethodGuard aGuard( *this );
         ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) );
     }
 
 
-    Any SAL_CALL PropertyComposer::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL PropertyComposer::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue )
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->convertToPropertyValue( _rPropertyName, _rControlValue );
     }
 
 
-    Any SAL_CALL PropertyComposer::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL PropertyComposer::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType )
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->convertToControlValue( _rPropertyName, _rPropertyValue, _rControlValueType );
     }
 
 
-    PropertyState SAL_CALL PropertyComposer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    PropertyState SAL_CALL PropertyComposer::getPropertyState( const OUString& _rPropertyName )
     {
         MethodGuard aGuard( *this );
 
@@ -191,21 +191,21 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyComposer::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyComposer::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         MethodGuard aGuard( *this );
         m_aPropertyListeners.addListener( _rxListener );
     }
 
 
-    void SAL_CALL PropertyComposer::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyComposer::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         MethodGuard aGuard( *this );
         m_aPropertyListeners.removeListener( _rxListener );
     }
 
 
-    Sequence< Property > SAL_CALL PropertyComposer::getSupportedProperties() throw (RuntimeException, std::exception)
+    Sequence< Property > SAL_CALL PropertyComposer::getSupportedProperties()
     {
         MethodGuard aGuard( *this );
 
@@ -278,7 +278,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL PropertyComposer::getSupersededProperties( )
     {
         MethodGuard aGuard( *this );
 
@@ -289,7 +289,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL PropertyComposer::getActuatingProperties( )
     {
         MethodGuard aGuard( *this );
 
@@ -302,21 +302,20 @@ namespace pcr
 
     LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
-        throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->describePropertyLine( _rPropertyName, _rxControlFactory );
     }
 
 
-    sal_Bool SAL_CALL PropertyComposer::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL PropertyComposer::isComposable( const OUString& _rPropertyName )
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->isComposable( _rPropertyName );
     }
 
 
-    InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
+    InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
@@ -377,7 +376,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyComposer::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL PropertyComposer::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
@@ -435,7 +434,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyComposer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyComposer::propertyChange( const PropertyChangeEvent& evt )
     {
         if ( !impl_isSupportedProperty_nothrow( evt.PropertyName ) )
             // A slave handler might fire events for more properties than we support. Ignore those.
@@ -454,14 +453,14 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyComposer::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyComposer::disposing( const EventObject& Source )
     {
         MethodGuard aGuard( *this );
         m_aPropertyListeners.disposing( Source );
     }
 
 
-    sal_Bool SAL_CALL PropertyComposer::suspend( sal_Bool _bSuspend ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL PropertyComposer::suspend( sal_Bool _bSuspend )
     {
         MethodGuard aGuard( *this );
         for ( PropertyComposer::HandlerArray::const_iterator loop = m_aSlaveHandlers.begin();
@@ -490,7 +489,7 @@ namespace pcr
     }
 
 
-    bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) throw (RuntimeException)
+    bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName )
     {
         return impl_isSupportedProperty_nothrow( _rName );
     }
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index f38870e9006d..248500e74919 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -75,41 +75,41 @@ namespace pcr
 
     public:
         // XPropertyHandler overridables
-        virtual void                                SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any                       SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+        virtual void                                SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override;
+        virtual css::uno::Any                       SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                                SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
+        virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override;
+        virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override;
         virtual css::beans::PropertyState
-                                                    SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void                                SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL getPropertyState( const OUString& _rPropertyName ) override;
+        virtual void                                SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual void                                SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
         virtual css::uno::Sequence< css::beans::Property >
-                                                    SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL getSupportedProperties() override;
         virtual css::uno::Sequence< OUString >
-                                                    SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL getSupersededProperties( ) override;
         virtual css::uno::Sequence< OUString >
-                                                    SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL getActuatingProperties( ) override;
         virtual css::inspection::LineDescriptor
-                                                    SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool                            SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
+        virtual sal_Bool                            SAL_CALL isComposable( const OUString& _rPropertyName ) override;
         virtual css::inspection::InteractiveSelectionResult
-                                                    SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                                SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool                            SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override;
+                                                    SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override;
+        virtual void                                SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override;
+        virtual sal_Bool                            SAL_CALL suspend( sal_Bool _bSuspend ) override;
 
         // XComponent
         DECLARE_XCOMPONENT()
         virtual void                                SAL_CALL disposing() override;
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) 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;
 
         // IPropertyExistenceCheck
-        virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) override;
+        virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) override;
 
     private:
         /** ensures that m_pUIRequestComposer exists
diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx
index fb935bced843..c48c7675164f 100644
--- a/extensions/source/propctrlr/propertycontrolextender.cxx
+++ b/extensions/source/propctrlr/propertycontrolextender.cxx
@@ -76,7 +76,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyControlExtender::keyPressed( const KeyEvent& _event ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyControlExtender::keyPressed( const KeyEvent& _event )
     {
         OSL_ENSURE( _event.Source == m_pData->xControlWindow, "PropertyControlExtender::keyPressed: where does this come from?" );
         if  (   ( _event.KeyFunc == KeyFunction::DELETE )
@@ -105,13 +105,13 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyControlExtender::keyReleased( const KeyEvent& /*_event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyControlExtender::keyReleased( const KeyEvent& /*_event*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL PropertyControlExtender::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyControlExtender::disposing( const EventObject& Source )
     {
         OSL_ENSURE( Source.Source == m_pData->xControlWindow, "PropertyControlExtender::disposing: where does this come from?" );
         (void)Source.Source;
diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx
index e0103d8bcbb2..5fb18c901cae 100644
--- a/extensions/source/propctrlr/propertycontrolextender.hxx
+++ b/extensions/source/propctrlr/propertycontrolextender.hxx
@@ -45,10 +45,10 @@ namespace pcr
         );
 
         // XKeyListener
-        virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) override;
+        virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) 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;
 
     protected:
         virtual ~PropertyControlExtender() override;
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index d42f0fbb8ec5..44352f1b3cad 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -66,7 +66,7 @@ namespace pcr
     {
     }
 
-    void SAL_CALL PropertyHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception)
+    void SAL_CALL PropertyHandler::inspect( const Reference< XInterface >& _rxIntrospectee )
     {
         if ( !_rxIntrospectee.is() )
             throw NullPointerException();
@@ -104,7 +104,7 @@ namespace pcr
         m_aSupportedProperties.realloc( 0 );
     }
 
-    Sequence< Property > SAL_CALL PropertyHandler::getSupportedProperties() throw (RuntimeException, std::exception)
+    Sequence< Property > SAL_CALL PropertyHandler::getSupportedProperties()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_bSupportedPropertiesAreKnown )
@@ -115,17 +115,17 @@ namespace pcr
         return m_aSupportedProperties;
     }
 
-    Sequence< OUString > SAL_CALL PropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL PropertyHandler::getSupersededProperties( )
     {
         return Sequence< OUString >();
     }
 
-    Sequence< OUString > SAL_CALL PropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL PropertyHandler::getActuatingProperties( )
     {
         return Sequence< OUString >();
     }
 
-    Any SAL_CALL PropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL PropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName );
@@ -151,7 +151,7 @@ namespace pcr
         return aPropertyValue;
     }
 
-    Any SAL_CALL PropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL PropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName );
@@ -170,14 +170,13 @@ namespace pcr
             m_xContext, m_xTypeConverter, _rPropertyValue, _rControlValueType );
     }
 
-    PropertyState SAL_CALL PropertyHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    PropertyState SAL_CALL PropertyHandler::getPropertyState( const OUString& /*_rPropertyName*/ )
     {
         return PropertyState_DIRECT_VALUE;
     }
 
     LineDescriptor SAL_CALL PropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
-        throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
     {
         if ( !_rxControlFactory.is() )
             throw NullPointerException();
@@ -206,24 +205,24 @@ namespace pcr
         return aDescriptor;
     }
 
-    sal_Bool SAL_CALL PropertyHandler::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL PropertyHandler::isComposable( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_pInfoService->isComposeable( _rPropertyName );
     }
 
-    InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
+    InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ )
     {
         OSL_FAIL( "PropertyHandler::onInteractivePropertySelection: not implemented!" );
         return InteractiveSelectionResult_Cancelled;
     }
 
-    void SAL_CALL PropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL PropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ )
     {
         OSL_FAIL( "PropertyHandler::actuatingPropertyChanged: not implemented!" );
     }
 
-    void SAL_CALL PropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL PropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !_rxListener.is() )
@@ -231,13 +230,13 @@ namespace pcr
         m_aPropertyListeners.addListener( _rxListener );
     }
 
-    void SAL_CALL PropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_aPropertyListeners.removeListener( _rxListener );
     }
 
-    sal_Bool SAL_CALL PropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL PropertyHandler::suspend( sal_Bool /*_bSuspend*/ )
     {
         return true;
     }
@@ -411,7 +410,7 @@ namespace pcr
     IMPLEMENT_FORWARD_XINTERFACE2( PropertyHandlerComponent, PropertyHandler, PropertyHandlerComponent_Base )
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( PropertyHandlerComponent, PropertyHandler, PropertyHandlerComponent_Base )
 
-    sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index a1b6a429db1d..a46cfc8d471c 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -103,20 +103,20 @@ namespace pcr
         virtual ~PropertyHandler() override;
 
         // default implementations for XPropertyHandler
-        virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::PropertyState  SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override;
+        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) override;
+        virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override;
+        virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override;
+        virtual css::beans::PropertyState  SAL_CALL getPropertyState( const OUString& _rPropertyName ) override;
+        virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
+        virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) override;
+        virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override;
+        virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) override;
 
         // XComponent
         DECLARE_XCOMPONENT()
@@ -363,9 +363,9 @@ namespace pcr
         DECLARE_XTYPEPROVIDER()
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual OUString SAL_CALL getImplementationName(  ) override = 0;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override = 0;
     };
 
 
@@ -404,8 +404,8 @@ namespace pcr
 
     protected:
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
         static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext );
 
     public:
@@ -416,14 +416,14 @@ namespace pcr
 
 
     template < class HANDLER >
-    OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName(  )
     {
         return HANDLER::getImplementationName_static();
     }
 
 
     template < class HANDLER >
-    css::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception)
+    css::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames(  )
     {
         return HANDLER::getSupportedServiceNames_static();
     }
diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx
index afb33a5be685..736c1e06fca2 100644
--- a/extensions/source/propctrlr/propeventtranslation.cxx
+++ b/extensions/source/propctrlr/propeventtranslation.cxx
@@ -48,7 +48,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyEventTranslation::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyEventTranslation::propertyChange( const PropertyChangeEvent& evt )
     {
         if ( !m_xDelegator.is() )
             throw DisposedException();
@@ -64,7 +64,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL PropertyEventTranslation::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL PropertyEventTranslation::disposing( const EventObject& Source )
     {
         if ( !m_xDelegator.is() )
             throw DisposedException();
diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx
index dcf52e4d10b2..8bd2f51b163d 100644
--- a/extensions/source/propctrlr/propeventtranslation.hxx
+++ b/extensions/source/propctrlr/propeventtranslation.hxx
@@ -55,9 +55,9 @@ namespace pcr
 
     protected:
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) 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;
 
     private:
         PropertyEventTranslation( const PropertyEventTranslation& ) = delete;
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index 643698543e55..4009eb583a5e 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -110,7 +110,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL SQLCommandDesigner::propertyChange( const PropertyChangeEvent& Event ) throw (RuntimeException, std::exception)
+    void SAL_CALL SQLCommandDesigner::propertyChange( const PropertyChangeEvent& Event )
     {
         OSL_ENSURE( m_xDesigner.is() && ( Event.Source == m_xDesigner ), "SQLCommandDesigner::propertyChange: where did this come from?" );
 
@@ -141,7 +141,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL SQLCommandDesigner::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL SQLCommandDesigner::disposing( const EventObject& Source )
     {
         if ( m_xDesigner.is() && ( Source.Source == m_xDesigner ) )
         {
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index 106b94617264..02b9632c7727 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -110,10 +110,10 @@ namespace pcr
 
     protected:
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) 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;
 
     protected:
         virtual ~SQLCommandDesigner() override;
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index e14086e66ab6..7bd5b4e2c0e8 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -76,7 +76,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OTimeControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OTimeControl::setValue( const Any& _rValue )
     {
         util::Time aUNOTime;
         if ( !( _rValue >>= aUNOTime ) )
@@ -91,7 +91,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL OTimeControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OTimeControl::getValue()
     {
         Any aPropValue;
         if ( !getTypedControlWindow()->GetText().isEmpty() )
@@ -102,7 +102,7 @@ namespace pcr
     }
 
 
-    Type SAL_CALL OTimeControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OTimeControl::getValueType()
     {
         return ::cppu::UnoType<util::Time>::get();
     }
@@ -127,7 +127,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL ODateControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL ODateControl::setValue( const Any& _rValue )
     {
         util::Date aUNODate;
         if ( !( _rValue >>= aUNODate ) )
@@ -143,7 +143,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL ODateControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL ODateControl::getValue()
     {
         Any aPropValue;
         if ( !getTypedControlWindow()->GetText().isEmpty() )
@@ -155,7 +155,7 @@ namespace pcr
     }
 
 
-    Type SAL_CALL ODateControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL ODateControl::getValueType()
     {
         return ::cppu::UnoType<util::Date>::get();
     }
@@ -174,7 +174,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OEditControl::setValue( const Any& _rValue )
     {
         OUString sText;
         if ( m_bIsPassword )
@@ -193,7 +193,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL OEditControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OEditControl::getValue()
     {
         Any aPropValue;
 
@@ -210,7 +210,7 @@ namespace pcr
     }
 
 
-    Type SAL_CALL OEditControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OEditControl::getValueType()
     {
         return m_bIsPassword ? ::cppu::UnoType<sal_Int16>::get() : ::cppu::UnoType<OUString>::get();
     }
@@ -266,7 +266,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL ODateTimeControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL ODateTimeControl::setValue( const Any& _rValue )
     {
         if ( !_rValue.hasValue() )
         {
@@ -286,7 +286,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL ODateTimeControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL ODateTimeControl::getValue()
     {
         Any aPropValue;
         if ( !getTypedControlWindow()->GetText().isEmpty() )
@@ -314,7 +314,7 @@ namespace pcr
     }
 
 
-    Type SAL_CALL ODateTimeControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL ODateTimeControl::getValueType()
     {
         return ::cppu::UnoType<util::DateTime>::get();
     }
@@ -416,14 +416,14 @@ namespace pcr
     }
 
 
-    Any SAL_CALL OHyperlinkControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OHyperlinkControl::getValue()
     {
         OUString sText = getTypedControlWindow()->GetText();
         return makeAny( sText );
     }
 
 
-    void SAL_CALL OHyperlinkControl::setValue( const Any& _value ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OHyperlinkControl::setValue( const Any& _value )
     {
         OUString sText;
         _value >>= sText;
@@ -431,20 +431,20 @@ namespace pcr
     }
 
 
-    Type SAL_CALL OHyperlinkControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OHyperlinkControl::getValueType()
     {
         return ::cppu::UnoType<OUString>::get();
     }
 
 
-    void SAL_CALL OHyperlinkControl::addActionListener( const Reference< XActionListener >& listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL OHyperlinkControl::addActionListener( const Reference< XActionListener >& listener )
     {
         if ( listener.is() )
             m_aActionListeners.addInterface( listener );
     }
 
 
-    void SAL_CALL OHyperlinkControl::removeActionListener( const Reference< XActionListener >& listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL OHyperlinkControl::removeActionListener( const Reference< XActionListener >& listener )
     {
         m_aActionListeners.removeInterface( listener );
     }
@@ -486,19 +486,19 @@ namespace pcr
     }
 
 
-    ::sal_Int16 SAL_CALL ONumericControl::getDecimalDigits() throw (RuntimeException, std::exception)
+    ::sal_Int16 SAL_CALL ONumericControl::getDecimalDigits()
     {
         return getTypedControlWindow()->GetDecimalDigits();
     }
 
 
-    void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 _decimaldigits ) throw (RuntimeException, std::exception)
+    void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 _decimaldigits )
     {
         getTypedControlWindow()->SetDecimalDigits( _decimaldigits );
     }
 
 
-    Optional< double > SAL_CALL ONumericControl::getMinValue() throw (RuntimeException, std::exception)
+    Optional< double > SAL_CALL ONumericControl::getMinValue()
     {
         Optional< double > aReturn( true, 0 );
 
@@ -512,7 +512,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL ONumericControl::setMinValue( const Optional< double >& _minvalue ) throw (RuntimeException, std::exception)
+    void SAL_CALL ONumericControl::setMinValue( const Optional< double >& _minvalue )
     {
         if ( !_minvalue.IsPresent )
             getTypedControlWindow()->SetMin( ::std::numeric_limits< sal_Int64 >::min() );
@@ -521,7 +521,7 @@ namespace pcr
     }
 
 
-    Optional< double > SAL_CALL ONumericControl::getMaxValue() throw (RuntimeException, std::exception)
+    Optional< double > SAL_CALL ONumericControl::getMaxValue()
     {
         Optional< double > aReturn( true, 0 );
 
@@ -535,7 +535,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL ONumericControl::setMaxValue( const Optional< double >& _maxvalue ) throw (RuntimeException, std::exception)
+    void SAL_CALL ONumericControl::setMaxValue( const Optional< double >& _maxvalue )
     {
         if ( !_maxvalue.IsPresent )
             getTypedControlWindow()->SetMax( ::std::numeric_limits< sal_Int64 >::max() );
@@ -544,13 +544,13 @@ namespace pcr
     }
 
 
-    ::sal_Int16 SAL_CALL ONumericControl::getDisplayUnit() throw (RuntimeException, std::exception)
+    ::sal_Int16 SAL_CALL ONumericControl::getDisplayUnit()
     {
         return VCLUnoHelper::ConvertToMeasurementUnit( getTypedControlWindow()->GetUnit(), 1 );
     }
 
 
-    void SAL_CALL ONumericControl::setDisplayUnit( ::sal_Int16 _displayunit ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL ONumericControl::setDisplayUnit( ::sal_Int16 _displayunit )
     {
         if ( ( _displayunit < MeasureUnit::MM_100TH ) || ( _displayunit > MeasureUnit::PERCENT ) )
             throw IllegalArgumentException();
@@ -573,13 +573,13 @@ namespace pcr
     }
 
 
-    ::sal_Int16 SAL_CALL ONumericControl::getValueUnit() throw (RuntimeException, std::exception)
+    ::sal_Int16 SAL_CALL ONumericControl::getValueUnit()
     {
         return VCLUnoHelper::ConvertToMeasurementUnit( m_eValueUnit, m_nFieldToUNOValueFactor );
     }
 
 
-    void SAL_CALL ONumericControl::setValueUnit( ::sal_Int16 _valueunit ) throw (RuntimeException, std::exception)
+    void SAL_CALL ONumericControl::setValueUnit( ::sal_Int16 _valueunit )
     {
         if ( ( _valueunit < MeasureUnit::MM_100TH ) || ( _valueunit > MeasureUnit::PERCENT ) )
             throw IllegalArgumentException();
@@ -587,7 +587,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL ONumericControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL ONumericControl::setValue( const Any& _rValue )
     {
         if ( !_rValue.hasValue() )
         {
@@ -620,7 +620,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL ONumericControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL ONumericControl::getValue()
     {
         Any aPropValue;
         if ( !getTypedControlWindow()->GetText().isEmpty() )
@@ -632,7 +632,7 @@ namespace pcr
     }
 
 
-    Type SAL_CALL ONumericControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL ONumericControl::getValueType()
     {
         return ::cppu::UnoType<double>::get();
     }
@@ -662,7 +662,7 @@ namespace pcr
     {
     }
 
-    void SAL_CALL OColorControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OColorControl::setValue( const Any& _rValue )
     {
         if ( _rValue.hasValue() )
         {
@@ -675,7 +675,7 @@ namespace pcr
             getTypedControlWindow()->SetNoSelection();
     }
 
-    Any SAL_CALL OColorControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OColorControl::getValue()
     {
         Any aPropValue;
         if (!getTypedControlWindow()->IsNoSelection())
@@ -686,7 +686,7 @@ namespace pcr
         return aPropValue;
     }
 
-    Type SAL_CALL OColorControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OColorControl::getValueType()
     {
         return ::cppu::UnoType<sal_Int32>::get();
     }
@@ -713,7 +713,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL OListboxControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OListboxControl::getValue()
     {
         OUString sControlValue( getTypedControlWindow()->GetSelectEntry() );
 
@@ -724,13 +724,13 @@ namespace pcr
     }
 
 
-    Type SAL_CALL OListboxControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OListboxControl::getValueType()
     {
         return ::cppu::UnoType<OUString>::get();
     }
 
 
-    void SAL_CALL OListboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OListboxControl::setValue( const Any& _rValue )
     {
         if ( !_rValue.hasValue() )
             getTypedControlWindow()->SetNoSelection();
@@ -751,24 +751,24 @@ namespace pcr
     }
 
 
-    void SAL_CALL OListboxControl::clearList() throw (RuntimeException, std::exception)
+    void SAL_CALL OListboxControl::clearList()
     {
         getTypedControlWindow()->Clear();
     }
 
 
-    void SAL_CALL OListboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListboxControl::prependListEntry( const OUString& NewEntry )
     {
         getTypedControlWindow()->InsertEntry( NewEntry, 0 );
     }
 
 
-    void SAL_CALL OListboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListboxControl::appendListEntry( const OUString& NewEntry )
     {
         getTypedControlWindow()->InsertEntry( NewEntry );
     }
 
-    Sequence< OUString > SAL_CALL OListboxControl::getListEntries(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OListboxControl::getListEntries(  )
     {
         const sal_Int32 nCount = getTypedControlWindow()->GetEntryCount();
         Sequence< OUString > aRet(nCount);
@@ -801,7 +801,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OComboboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OComboboxControl::setValue( const Any& _rValue )
     {
         OUString sText;
         _rValue >>= sText;
@@ -809,36 +809,36 @@ namespace pcr
     }
 
 
-    Any SAL_CALL OComboboxControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OComboboxControl::getValue()
     {
         return makeAny( OUString( getTypedControlWindow()->GetText() ) );
     }
 
 
-    Type SAL_CALL OComboboxControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OComboboxControl::getValueType()
     {
         return ::cppu::UnoType<OUString>::get();
     }
 
 
-    void SAL_CALL OComboboxControl::clearList() throw (RuntimeException, std::exception)
+    void SAL_CALL OComboboxControl::clearList()
     {
         getTypedControlWindow()->Clear();
     }
 
 
-    void SAL_CALL OComboboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException, std::exception)
+    void SAL_CALL OComboboxControl::prependListEntry( const OUString& NewEntry )
     {
         getTypedControlWindow()->InsertEntry( NewEntry, 0 );
     }
 
 
-    void SAL_CALL OComboboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException, std::exception)
+    void SAL_CALL OComboboxControl::appendListEntry( const OUString& NewEntry )
     {
         getTypedControlWindow()->InsertEntry( NewEntry );
     }
 
-    Sequence< OUString > SAL_CALL OComboboxControl::getListEntries(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OComboboxControl::getListEntries(  )
     {
         const sal_Int32 nCount = getTypedControlWindow()->GetEntryCount();
         Sequence< OUString > aRet(nCount);
@@ -1271,7 +1271,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OMultilineEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OMultilineEditControl::setValue( const Any& _rValue )
     {
         impl_checkDisposed_throw();
 
@@ -1297,7 +1297,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL OMultilineEditControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OMultilineEditControl::getValue()
     {
         impl_checkDisposed_throw();
 
@@ -1315,7 +1315,7 @@ namespace pcr
     }
 
 
-    Type SAL_CALL OMultilineEditControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OMultilineEditControl::getValueType()
     {
         if ( getTypedControlWindow()->getOperationMode() == eMultiLineText )
             return ::cppu::UnoType<OUString>::get();
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index d3f64e703276..b4fdb34e1196 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -86,9 +86,9 @@ namespace pcr
         OTimeControl( vcl::Window* pParent, WinBits nWinStyle );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
     };
 
 
@@ -101,9 +101,9 @@ namespace pcr
         ODateControl( vcl::Window* pParent, WinBits nWinStyle );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
     };
 
 
@@ -119,9 +119,9 @@ namespace pcr
         OEditControl( vcl::Window* _pParent, bool _bPassWord, WinBits nWinStyle );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
 
     protected:
         // CommonBehaviourControlHelper::modified
@@ -138,9 +138,9 @@ namespace pcr
         ODateTimeControl( vcl::Window* pParent,WinBits nWinStyle );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
     };
 
 
@@ -184,13 +184,13 @@ namespace pcr
         OHyperlinkControl( vcl::Window* _pParent, WinBits _nWinStyle );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
 
         // XHyperlinkControl
-        virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) override;
+        virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) override;
 
     protected:
         // XComponent
@@ -228,21 +228,21 @@ namespace pcr
         ONumericControl( vcl::Window* pParent, WinBits nWinStyle );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
 
         // XNumericControl
-        virtual ::sal_Int16 SAL_CALL getDecimalDigits() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDecimalDigits( ::sal_Int16 _decimaldigits ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::Optional< double > SAL_CALL getMinValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMinValue( const css::beans::Optional< double >& _minvalue ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::Optional< double > SAL_CALL getMaxValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMaxValue( const css::beans::Optional< double >& _maxvalue ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getDisplayUnit() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDisplayUnit( ::sal_Int16 _displayunit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getValueUnit() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValueUnit( ::sal_Int16 _valueunit ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int16 SAL_CALL getDecimalDigits() override;
+        virtual void SAL_CALL setDecimalDigits( ::sal_Int16 _decimaldigits ) override;
+        virtual css::beans::Optional< double > SAL_CALL getMinValue() override;
+        virtual void SAL_CALL setMinValue( const css::beans::Optional< double >& _minvalue ) override;
+        virtual css::beans::Optional< double > SAL_CALL getMaxValue() override;
+        virtual void SAL_CALL setMaxValue( const css::beans::Optional< double >& _maxvalue ) override;
+        virtual ::sal_Int16 SAL_CALL getDisplayUnit() override;
+        virtual void SAL_CALL setDisplayUnit( ::sal_Int16 _displayunit ) override;
+        virtual ::sal_Int16 SAL_CALL getValueUnit() override;
+        virtual void SAL_CALL setValueUnit( ::sal_Int16 _valueunit ) override;
 
     private:
         /** converts an API value (<code>double</code>, as passed into <code>set[Max|Min|]Value) into
@@ -270,9 +270,9 @@ namespace pcr
         OColorControl( vcl::Window* pParent, WinBits nWinStyle );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
 
     protected:
         // CommonBehaviourControlHelper::setModified
@@ -291,15 +291,15 @@ namespace pcr
         OListboxControl( vcl::Window* pParent, WinBits nWinStyle );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
 
         // XStringListControl
-        virtual void SAL_CALL clearList(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getListEntries(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL clearList(  ) override;
+        virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) override;
+        virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getListEntries(  ) override;
 
     protected:
         // CommonBehaviourControlHelper::setModified
@@ -316,15 +316,15 @@ namespace pcr
         OComboboxControl( vcl::Window* pParent, WinBits nWinStyle );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
 
         // XStringListControl
-        virtual void SAL_CALL clearList(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getListEntries(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL clearList(  ) override;
+        virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) override;
+        virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getListEntries(  ) override;
 
     protected:
         DECL_LINK( OnEntrySelected, ComboBox&, void );
@@ -395,9 +395,9 @@ namespace pcr
         OMultilineEditControl( vcl::Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle  );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
     };
 
 
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 39c57ccaabdf..9e32fe3ef4c4 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -74,16 +74,16 @@ public:
     StringRepresentation& operator=(const StringRepresentation&) = delete;
 
     // lang::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;
 
     // inspection::XStringRepresentation:
-    virtual OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception, std::exception) override;
-    virtual uno::Any SAL_CALL convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception, std::exception) override;
+    virtual OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) override;
+    virtual uno::Any SAL_CALL convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) override;
 
     // lang::XInitialization:
-    virtual void SAL_CALL initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(const uno::Sequence< uno::Any > & aArguments) override;
 
 private:
     virtual ~StringRepresentation() override {}
@@ -142,23 +142,23 @@ StringRepresentation::StringRepresentation(uno::Reference< uno::XComponentContex
 {}
 
 // com.sun.star.uno.XServiceInfo:
-OUString  SAL_CALL StringRepresentation::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString  SAL_CALL StringRepresentation::getImplementationName()
 {
     return comp_StringRepresentation::_getImplementationName();
 }
 
-sal_Bool SAL_CALL StringRepresentation::supportsService(OUString const & serviceName) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL StringRepresentation::supportsService(OUString const & serviceName)
 {
     return cppu::supportsService(this, serviceName);
 }
 
-uno::Sequence< OUString >  SAL_CALL StringRepresentation::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString >  SAL_CALL StringRepresentation::getSupportedServiceNames()
 {
     return comp_StringRepresentation::_getSupportedServiceNames();
 }
 
 // inspection::XStringRepresentation:
-OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception, std::exception)
+OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue)
 {
     OUString sReturn;
     if ( !convertGenericValueToString( PropertyValue, sReturn ) )
@@ -178,7 +178,7 @@ OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & P
     return sReturn;
 }
 
-uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception, std::exception)
+uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType)
 {
     uno::Any aReturn;
 
@@ -242,7 +242,7 @@ struct CompareConstants {
 }
 
 // lang::XInitialization:
-void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception, std::exception)
+void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & aArguments)
 {
     sal_Int32 nLength = aArguments.getLength();
     if ( nLength )
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index ed0b5d39a1d8..bb3f4a745420 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -103,20 +103,20 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static(  )
     {
         return OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" );
     }
 
 
-    Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.form.inspection.SubmissionPropertyHandler" };
         return aSupported;
     }
 
 
-    Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -165,7 +165,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -208,7 +208,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_pHelper.get() )
@@ -219,7 +219,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !m_pHelper.get() )
@@ -274,7 +274,6 @@ namespace pcr
 
     LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
-        throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !_rxControlFactory.is() )
@@ -313,7 +312,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
@@ -339,7 +338,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Any aPropertyValue;
@@ -378,7 +377,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         Any aControlValue;
@@ -419,7 +418,7 @@ namespace pcr
     }
 
 
-    void SubmissionPropertyHandler::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw(RuntimeException)
+    void SubmissionPropertyHandler::_propertyChanged( const PropertyChangeEvent& _rEvent )
     {
         if ( _rEvent.PropertyName == PROPERTY_BUTTONTYPE )
             firePropertyChange( PROPERTY_XFORMS_BUTTONTYPE, PROPERTY_ID_XFORMS_BUTTONTYPE, _rEvent.OldValue, _rEvent.NewValue );
diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx
index f0408e4d2c8b..0d8c035daf0d 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -78,25 +78,25 @@ namespace pcr
         );
 
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
 
         virtual ~SubmissionPropertyHandler() override;
 
     protected:
         // XPropertyHandler overriables
-        virtual css::uno::Any               SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any               SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                        SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
         virtual css::uno::Sequence< OUString >
-                                            SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+                                            SAL_CALL getActuatingProperties( ) override;
         virtual css::uno::Sequence< OUString >
-                                            SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+                                            SAL_CALL getSupersededProperties( ) override;
         virtual css::inspection::LineDescriptor
-                                            SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any               SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any               SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+                                            SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
+        virtual void                        SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) override;
+        virtual css::uno::Any               SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override;
+        virtual css::uno::Any               SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override;
 
         // PropertyHandler overridables
         virtual css::uno::Sequence< css::beans::Property >
@@ -105,7 +105,7 @@ namespace pcr
 
     private:
         // OPropertyChangeListener
-        virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException) override;
+        virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) override;
     };
 
 
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 32796b05e2cd..faae6af08fcf 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -94,14 +94,14 @@ namespace pcr
         }
 
         // XTabControllerModel
-        virtual void SAL_CALL setControlModels(const Sequence< Reference< XControlModel > >& rModels) throw( RuntimeException, std::exception ) override {m_aModels = rModels;}
-        virtual Sequence< Reference< XControlModel > > SAL_CALL getControlModels() throw( RuntimeException, std::exception ) override {return m_aModels;}
-        virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const OUString& /*GroupName*/) throw( RuntimeException, std::exception ) override {}
-        virtual sal_Int32 SAL_CALL getGroupCount() throw( RuntimeException, std::exception ) override {return 0;}
-        virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, OUString& /*Name*/) throw( RuntimeException, std::exception ) override {}
-        virtual void SAL_CALL getGroupByName(const OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException, std::exception ) override {}
-        virtual sal_Bool SAL_CALL getGroupControl() throw( RuntimeException, std::exception ) override {return false;} ;
-        virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException, std::exception ) override {};
+        virtual void SAL_CALL setControlModels(const Sequence< Reference< XControlModel > >& rModels) override {m_aModels = rModels;}
+        virtual Sequence< Reference< XControlModel > > SAL_CALL getControlModels() override {return m_aModels;}
+        virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const OUString& /*GroupName*/) override {}
+        virtual sal_Int32 SAL_CALL getGroupCount() override {return 0;}
+        virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, OUString& /*Name*/) override {}
+        virtual void SAL_CALL getGroupByName(const OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) override {}
+        virtual sal_Bool SAL_CALL getGroupControl() override {return false;} ;
+        virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) override {};
     };
 
 
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 7c9e2f277f78..143d3796c248 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -94,7 +94,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OFormatSampleControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OFormatSampleControl::setValue( const Any& _rValue )
     {
         sal_Int32 nFormatKey = 0;
         if ( _rValue >>= nFormatKey )
@@ -152,7 +152,7 @@ namespace pcr
         return nValue;
     }
 
-    Any SAL_CALL OFormatSampleControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OFormatSampleControl::getValue()
     {
         Any aPropValue;
         if ( !getTypedControlWindow()->GetText().isEmpty() )
@@ -161,7 +161,7 @@ namespace pcr
     }
 
 
-    Type SAL_CALL OFormatSampleControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OFormatSampleControl::getValueType()
     {
         return ::cppu::UnoType<sal_Int32>::get();
     }
@@ -184,7 +184,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OFormattedNumericControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OFormattedNumericControl::setValue( const Any& _rValue )
     {
         double nValue( 0 );
         if ( _rValue >>= nValue )
@@ -194,7 +194,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL OFormattedNumericControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OFormattedNumericControl::getValue()
     {
         Any aPropValue;
         if ( !getTypedControlWindow()->GetText().isEmpty() )
@@ -203,7 +203,7 @@ namespace pcr
     }
 
 
-    Type SAL_CALL OFormattedNumericControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OFormattedNumericControl::getValueType()
     {
         return ::cppu::UnoType<double>::get();
     }
@@ -275,7 +275,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL OFileUrlControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception)
+    void SAL_CALL OFileUrlControl::setValue( const Any& _rValue )
     {
         OUString sURL;
         if ( ( _rValue >>= sURL ) )
@@ -290,7 +290,7 @@ namespace pcr
     }
 
 
-    Any SAL_CALL OFileUrlControl::getValue() throw (RuntimeException, std::exception)
+    Any SAL_CALL OFileUrlControl::getValue()
     {
         Any aPropValue;
         if ( !getTypedControlWindow()->GetText().isEmpty() )
@@ -299,7 +299,7 @@ namespace pcr
     }
 
 
-    Type SAL_CALL OFileUrlControl::getValueType() throw (RuntimeException, std::exception)
+    Type SAL_CALL OFileUrlControl::getValueType()
     {
         return ::cppu::UnoType<OUString>::get();
     }
@@ -322,7 +322,7 @@ namespace pcr
     }
 
 
-    ::sal_Int16 SAL_CALL OTimeDurationControl::getControlType() throw (css::uno::RuntimeException)
+    ::sal_Int16 SAL_CALL OTimeDurationControl::getControlType()
     {
         // don't use the base class'es method, it would claim we're a standard control, which
         // we in fact aren't
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index 64daff191e42..f6bdffd3f00a 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -62,9 +62,9 @@ namespace pcr
         explicit OFormatSampleControl( vcl::Window* pParent );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
 
         inline void SetFormatSupplier( const SvNumberFormatsSupplierObj* _pSupplier )
         {
@@ -105,9 +105,9 @@ namespace pcr
         OFormattedNumericControl( vcl::Window* pParent, WinBits nWinStyle);
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
 
         void SetFormatDescription( const FormatDescription& rDesc );
 
@@ -131,9 +131,9 @@ namespace pcr
         explicit OFileUrlControl( vcl::Window* pParent );
 
         // XPropertyControl
-        virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue() override;
+        virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+        virtual css::uno::Type SAL_CALL getValueType() override;
 
     protected:
         virtual ~OFileUrlControl() override;
@@ -149,7 +149,7 @@ namespace pcr
         virtual ~OTimeDurationControl() override;
 
         // XPropertyControl
-        ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) override;
+        ::sal_Int16 SAL_CALL getControlType() override;
 
     private:
         DECL_LINK( OnCustomConvert, MetricFormatter&, void );
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 136915e2ede6..559c9a1f89c1 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -83,20 +83,20 @@ namespace pcr
     }
 
 
-    OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
+    OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static(  )
     {
         return OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" );
     }
 
 
-    Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static(  )
     {
         Sequence<OUString> aSupported { "com.sun.star.form.inspection.XSDValidationPropertyHandler" };
         return aSupported;
     }
 
 
-    Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -126,7 +126,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
@@ -221,7 +221,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -256,7 +256,7 @@ namespace pcr
     }
 
 
-    Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         ::std::vector< OUString > aInterestedInActuations;
@@ -283,7 +283,6 @@ namespace pcr
 
     LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
-        throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !_rxControlFactory.is() )
@@ -417,7 +416,7 @@ namespace pcr
     }
 
 
-    InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception)
+    InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
@@ -455,7 +454,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL XSDValidationPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL XSDValidationPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         XSDValidationPropertyHandler_Base::addPropertyChangeListener( _rxListener );
@@ -464,7 +463,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL XSDValidationPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL XSDValidationPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_pHelper.get() )
@@ -553,7 +552,7 @@ namespace pcr
     }
 
 
-    void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit )
     {
         if ( !_rxInspectorUI.is() )
             throw NullPointerException();
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
index a6779e3f5b30..c65f37a21b92 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
@@ -46,28 +46,28 @@ namespace pcr
         );
 
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  ) throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
 
     protected:
         virtual ~XSDValidationPropertyHandler() override;
 
     protected:
         // XPropertyHandler overriables
-        virtual css::uno::Any               SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any               SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override;
+        virtual void                        SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
         virtual css::uno::Sequence< OUString >
-                                            SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+                                            SAL_CALL getSupersededProperties( ) override;
         virtual css::uno::Sequence< OUString >
-                                            SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+                                            SAL_CALL getActuatingProperties( ) override;
         virtual css::inspection::LineDescriptor
-                                            SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
+                                            SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override;
         virtual css::inspection::InteractiveSelectionResult
-                                            SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void                        SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
+                                            SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override;
+        virtual void                        SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) override;
+        virtual void                        SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
+        virtual void                        SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override;
 
         // PropertyHandler overridables
         virtual css::uno::Sequence< css::beans::Property >
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index dfb918146833..31eb8f3a6329 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -47,13 +47,13 @@ namespace
             }
 
             // XIndexAccess
-            virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override
+            virtual ::sal_Int32 SAL_CALL getCount(  ) override
                 { return m_pResMgr.get() ? SAL_MAX_UINT16 : 0; };
-            virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
             // XElementAccess
-            virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override
+            virtual sal_Bool SAL_CALL hasElements(  ) override
                 { return static_cast<bool>(m_pResMgr.get()); };
-            virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override
+            virtual css::uno::Type SAL_CALL getElementType(  ) override
                 { return ::cppu::UnoType<OUString>::get(); };
         private:
             // m_pResMgr should never be NULL
@@ -66,7 +66,6 @@ ResourceIndexAccess::ResourceIndexAccess(Sequence<Any> const& rArgs, Reference<X
 {};
 
 Any SAL_CALL ResourceIndexAccess::getByName(const OUString& aName)
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     const Sequence<OUString> aNames(getElementNames());
     Reference<XIndexAccess> xResult;
@@ -82,7 +81,6 @@ Any SAL_CALL ResourceIndexAccess::getByName(const OUString& aName)
 }
 
 Sequence<OUString> SAL_CALL ResourceIndexAccess::getElementNames(  )
-    throw (RuntimeException, std::exception)
 {
     static Sequence<OUString> aResult;
     if( aResult.getLength() == 0)
@@ -94,14 +92,12 @@ Sequence<OUString> SAL_CALL ResourceIndexAccess::getElementNames(  )
 }
 
 sal_Bool SAL_CALL ResourceIndexAccess::hasByName(const OUString& aName)
-    throw (RuntimeException, std::exception)
 {
     const Sequence<OUString> aNames(getElementNames());
     return (::std::find(aNames.begin(), aNames.end(), aName) != aNames.end());
 }
 
 Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx)
-    throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
 {
     if(nIdx > SAL_MAX_UINT16 || nIdx < 0)
         throw IndexOutOfBoundsException();
diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx
index fb466f863122..6d89f1b90508 100644
--- a/extensions/source/resource/ResourceIndexAccess.hxx
+++ b/extensions/source/resource/ResourceIndexAccess.hxx
@@ -34,13 +34,13 @@ namespace extensions { namespace resource
             // XNameAccess
             // The XNameAccess provides access to one named elements:
             //    "String" returns a XIndexAccess to String resources
-            virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+            virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
             // XElementAccess
-            virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override
+            virtual css::uno::Type SAL_CALL getElementType(  ) override
                 { return cppu::UnoType<css::uno::XInterface>::get(); };
-            virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override
+            virtual sal_Bool SAL_CALL hasElements(  ) override
                 { return static_cast<bool>(m_pResMgr.get()); };
 
         private:
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx
index f50d22ebd624..461f8f1212e8 100644
--- a/extensions/source/resource/oooresourceloader.cxx
+++ b/extensions/source/resource/oooresourceloader.cxx
@@ -99,19 +99,19 @@ namespace extensions { namespace resource
 
     public:
         // XResourceBundle
-        virtual css::uno::Reference< css::resource::XResourceBundle > SAL_CALL getParent() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::resource::XResourceBundle >& _parent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getDirectElement( const OUString& key ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::resource::XResourceBundle > SAL_CALL getParent() override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::resource::XResourceBundle >& _parent ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
+        virtual css::uno::Any SAL_CALL getDirectElement( const OUString& key ) override;
 
         // XNameAccess (base of XResourceBundle)
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
         // XElementAccess (base of XNameAccess)
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     private:
         /** retrievs the element with the given key, without asking our parent bundle
@@ -147,13 +147,13 @@ namespace extensions { namespace resource
     }
 
 
-    Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const OUString& _baseName ) throw (MissingResourceException, RuntimeException, std::exception)
+    Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const OUString& _baseName )
     {
         return loadBundle( _baseName, Application::GetSettings().GetUILanguageTag().getLocale() );
     }
 
 
-    Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const OUString& _baseName, const Locale& _locale ) throw (MissingResourceException, RuntimeException, std::exception)
+    Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const OUString& _baseName, const Locale& _locale )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -194,19 +194,19 @@ namespace extensions { namespace resource
     {
     }
 
-    Reference< XResourceBundle > SAL_CALL OpenOfficeResourceBundle::getParent() throw (RuntimeException, std::exception)
+    Reference< XResourceBundle > SAL_CALL OpenOfficeResourceBundle::getParent()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_xParent;
     }
 
-    void SAL_CALL OpenOfficeResourceBundle::setParent( const Reference< XResourceBundle >& _parent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OpenOfficeResourceBundle::setParent( const Reference< XResourceBundle >& _parent )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_xParent = _parent;
     }
 
-    Locale SAL_CALL OpenOfficeResourceBundle::getLocale(  ) throw (RuntimeException, std::exception)
+    Locale SAL_CALL OpenOfficeResourceBundle::getLocale(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_aLocale;
@@ -246,7 +246,7 @@ namespace extensions { namespace resource
         return _out_Element.hasValue();
     }
 
-    Any SAL_CALL OpenOfficeResourceBundle::getDirectElement( const OUString& _key ) throw (RuntimeException, std::exception)
+    Any SAL_CALL OpenOfficeResourceBundle::getDirectElement( const OUString& _key )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -255,7 +255,7 @@ namespace extensions { namespace resource
         return aElement;
     }
 
-    Any SAL_CALL OpenOfficeResourceBundle::getByName( const OUString& _key ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL OpenOfficeResourceBundle::getByName( const OUString& _key )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -272,14 +272,14 @@ namespace extensions { namespace resource
         return aElement;
     }
 
-    Sequence< OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames(  )
     {
         OSL_FAIL( "OpenOfficeResourceBundle::getElementNames: not implemented!" );
             // the (Simple)ResManager does not provide an API to enumerate the resources
         return Sequence< OUString >( );
     }
 
-    sal_Bool SAL_CALL OpenOfficeResourceBundle::hasByName( const OUString& _key ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OpenOfficeResourceBundle::hasByName( const OUString& _key )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -294,12 +294,12 @@ namespace extensions { namespace resource
         return true;
     }
 
-    Type SAL_CALL OpenOfficeResourceBundle::getElementType(  ) throw (RuntimeException, std::exception)
+    Type SAL_CALL OpenOfficeResourceBundle::getElementType(  )
     {
         return ::cppu::UnoType< Any >::get();
     }
 
-    sal_Bool SAL_CALL OpenOfficeResourceBundle::hasElements(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OpenOfficeResourceBundle::hasElements(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         OSL_FAIL( "OpenOfficeResourceBundle::hasElements: not implemented!" );
diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx
index 4f0fa90e19e6..50656d514c04 100644
--- a/extensions/source/resource/oooresourceloader.hxx
+++ b/extensions/source/resource/oooresourceloader.hxx
@@ -59,8 +59,8 @@ namespace extensions { namespace resource
 
         OpenOfficeResourceLoader(css::uno::Reference< css::uno::XComponentContext> const&);
         // XResourceBundleLoader
-        virtual  css::uno::Reference< css::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
-        virtual  css::uno::Reference<  css::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const css::lang::Locale& aLocale ) throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
+        virtual  css::uno::Reference< css::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) override;
+        virtual  css::uno::Reference<  css::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const css::lang::Locale& aLocale ) override;
 
     private:
         OpenOfficeResourceLoader( const OpenOfficeResourceLoader& ) = delete;
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 327410e7d9c7..c642e91137ea 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -36,9 +36,9 @@ public:
                                         BitmapTransporter();
     virtual                             ~BitmapTransporter() override;
 
-    virtual css::awt::Size SAL_CALL          getSize() throw(std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL    getDIB() throw(std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL    getMaskDIB() throw(std::exception) override { return Sequence< sal_Int8 >(); }
+    virtual css::awt::Size SAL_CALL          getSize() override;
+    virtual Sequence< sal_Int8 > SAL_CALL    getDIB() override;
+    virtual Sequence< sal_Int8 > SAL_CALL    getMaskDIB() override { return Sequence< sal_Int8 >(); }
 
     // Misc
     void                                lock() { m_aProtector.acquire(); }
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index 5e4c5d6b0fce..46eac7ca64ad 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -22,7 +22,7 @@
 #include <cppuhelper/supportsservice.hxx>
 
 
-Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& /*rxFactory*/ ) throw ( Exception )
+Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& /*rxFactory*/ )
 {
     return *( new ScannerManager() );
 }
@@ -41,28 +41,25 @@ ScannerManager::~ScannerManager()
 }
 
 
-Sequence< sal_Int8 > SAL_CALL ScannerManager::getMaskDIB() throw(std::exception)
+Sequence< sal_Int8 > SAL_CALL ScannerManager::getMaskDIB()
 {
     return Sequence< sal_Int8 >();
 }
 
 
 OUString ScannerManager::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return getImplementationName_Static();
 }
 
 
 sal_Bool ScannerManager::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
 css::uno::Sequence<OUString> ScannerManager::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
@@ -82,7 +79,6 @@ Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw ()
 
 
 sal_Bool SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
-    throw( ScannerException, std::exception )
 {
     return configureScannerAndScan( rContext, nullptr );
 }
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index c0effbaaf363..878f6b201ddb 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -55,26 +55,23 @@ public:
     virtual                                 ~ScannerManager() override;
 
     // XScannerManager
-    virtual Sequence< ScannerContext > SAL_CALL  getAvailableScanners() throw(std::exception) override;
-    virtual sal_Bool SAL_CALL               configureScanner( ScannerContext& scanner_context ) throw( ScannerException, std::exception ) override;
-    virtual sal_Bool SAL_CALL               configureScannerAndScan( ScannerContext& scanner_context, const Reference< css::lang::XEventListener >& rxListener ) throw (ScannerException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL                   startScan( const ScannerContext& scanner_context, const Reference< css::lang::XEventListener >& rxListener ) throw( ScannerException, std::exception ) override;
-    virtual ScanError SAL_CALL              getError( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) override;
-    virtual Reference< css::awt::XBitmap > SAL_CALL    getBitmap( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) override;
+    virtual Sequence< ScannerContext > SAL_CALL  getAvailableScanners() override;
+    virtual sal_Bool SAL_CALL               configureScanner( ScannerContext& scanner_context ) override;
+    virtual sal_Bool SAL_CALL               configureScannerAndScan( ScannerContext& scanner_context, const Reference< css::lang::XEventListener >& rxListener ) override;
+    virtual void SAL_CALL                   startScan( const ScannerContext& scanner_context, const Reference< css::lang::XEventListener >& rxListener ) override;
+    virtual ScanError SAL_CALL              getError( const ScannerContext& scanner_context ) override;
+    virtual Reference< css::awt::XBitmap > SAL_CALL    getBitmap( const ScannerContext& scanner_context ) override;
 
     // XBitmap
-    virtual css::awt::Size SAL_CALL              getSize() throw(std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL        getDIB() throw(std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL        getMaskDIB() throw(std::exception) override;
+    virtual css::awt::Size SAL_CALL              getSize() override;
+    virtual Sequence< sal_Int8 > SAL_CALL        getDIB() override;
+    virtual Sequence< sal_Int8 > SAL_CALL        getMaskDIB() override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // Misc
     static OUString                         getImplementationName_Static() throw();
@@ -87,7 +84,7 @@ public:
  };
 
 /// @throws Exception
-Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& rxFactory ) throw( Exception );
+Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& rxFactory );
 
 #endif
 
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index bca0c194a35f..ba7a9ef97cfe 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -36,7 +36,7 @@ BitmapTransporter::~BitmapTransporter()
 }
 
 
-css::awt::Size BitmapTransporter::getSize() throw(std::exception)
+css::awt::Size BitmapTransporter::getSize()
 {
     osl::MutexGuard aGuard( m_aProtector );
     int         nPreviousPos = m_aStream.Tell();
@@ -59,7 +59,7 @@ css::awt::Size BitmapTransporter::getSize() throw(std::exception)
 }
 
 
-Sequence< sal_Int8 > BitmapTransporter::getDIB() throw(std::exception)
+Sequence< sal_Int8 > BitmapTransporter::getDIB()
 {
     osl::MutexGuard aGuard( m_aProtector );
     int         nPreviousPos = m_aStream.Tell();
@@ -199,7 +199,7 @@ void ScannerManager::ReleaseData()
 }
 
 
-css::awt::Size ScannerManager::getSize() throw(std::exception)
+css::awt::Size ScannerManager::getSize()
 {
     css::awt::Size aRet;
     aRet.Width = aRet.Height = 0;
@@ -207,13 +207,13 @@ css::awt::Size ScannerManager::getSize() throw(std::exception)
 }
 
 
-Sequence< sal_Int8 > ScannerManager::getDIB() throw(std::exception)
+Sequence< sal_Int8 > ScannerManager::getDIB()
 {
     return Sequence< sal_Int8 >();
 }
 
 
-Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exception)
+Sequence< ScannerContext > ScannerManager::getAvailableScanners()
 {
     osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
@@ -239,7 +239,6 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exc
 
 sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_context,
                                                   const Reference< css::lang::XEventListener >& listener )
-    throw (ScannerException, RuntimeException, std::exception)
 {
     bool bRet;
     bool bScan;
@@ -278,7 +277,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
 
 
 void ScannerManager::startScan( const ScannerContext& scanner_context,
-                                const Reference< css::lang::XEventListener >& listener ) throw( ScannerException, std::exception )
+                                const Reference< css::lang::XEventListener >& listener )
 {
     osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
@@ -305,7 +304,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
 }
 
 
-ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException, std::exception )
+ScanError ScannerManager::getError( const ScannerContext& scanner_context )
 {
     osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
@@ -323,7 +322,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
 }
 
 
-Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException, std::exception )
+Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& scanner_context )
 {
     osl::MutexGuard aGuard( theSaneProtector::get() );
     sanevec &rSanes = theSanes::get().m_aSanes;
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 0653359c8114..6075d0ba79d5 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -105,11 +105,11 @@ class ImpTwain : public ::cppu::WeakImplHelper< util::XCloseListener >
                                                 DECL_LINK( ImplDestroyHdl, void*, void );
 
     // from util::XCloseListener
-    virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException) override;
-    virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException) override;
+    virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) override;
 
     // from lang::XEventListener
-    virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
 
 public:
 
@@ -614,7 +614,7 @@ void ImpTwain::ImplDeregisterCloseListener()
     OSL_FAIL("ImpTwain::ImplDeregisterCloseListener: Could not deregister as close listener!");
 }
 
-void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException)
+void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_Bool GetsOwnership )
 {
     // shall we re-send the close query later on?
     mbCloseFrameOnExit = GetsOwnership;
@@ -623,13 +623,13 @@ void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_B
     throw util::CloseVetoException();
 }
 
-void SAL_CALL ImpTwain::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
+void SAL_CALL ImpTwain::notifyClosing( const lang::EventObject& /*Source*/ )
 {
     // should not happen
     OSL_FAIL("ImpTwain::notifyClosing called, but we vetoed the closing before!");
 }
 
-void SAL_CALL ImpTwain::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
+void SAL_CALL ImpTwain::disposing( const lang::EventObject& /*Source*/ )
 {
     // we're not holding any references to the frame, thus noop
 }
@@ -774,7 +774,7 @@ void ScannerManager::ReleaseData()
     }
 }
 
-awt::Size ScannerManager::getSize() throw(std::exception)
+awt::Size ScannerManager::getSize()
 {
     awt::Size   aRet;
     HGLOBAL     hDIB = static_cast<HGLOBAL>(mpData);
@@ -799,7 +799,7 @@ awt::Size ScannerManager::getSize() throw(std::exception)
     return aRet;
 }
 
-uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw(std::exception)
+uno::Sequence< sal_Int8 > ScannerManager::getDIB()
 {
     uno::Sequence< sal_Int8 > aRet;
 
@@ -859,7 +859,7 @@ uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw(std::exception)
     return aRet;
 }
 
-uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners() throw(std::exception)
+uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners()
 {
     osl::MutexGuard aGuard( maProtector );
     uno::Sequence< ScannerContext >   aRet( 1 );
@@ -871,7 +871,6 @@ uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners()
 }
 
 sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rContext, const uno::Reference< lang::XEventListener >& )
-    throw (ScannerException, RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( maProtector );
     uno::Reference< XScannerManager >   xThis( this );
@@ -885,7 +884,6 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rCont
 }
 
 void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener )
-    throw( ScannerException, std::exception )
 {
     osl::MutexGuard aGuard( maProtector );
     uno::Reference< XScannerManager >   xThis( this );
@@ -898,7 +896,6 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u
 }
 
 ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
-    throw( ScannerException, std::exception )
 {
     osl::MutexGuard aGuard( maProtector );
     uno::Reference< XScannerManager >   xThis( this );
@@ -910,7 +907,6 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
 }
 
 uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ )
-    throw( ScannerException, std::exception )
 {
     osl::MutexGuard aGuard( maProtector );
     return uno::Reference< awt::XBitmap >( this );
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 79a875b08a85..e3ba2ed972a4 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -294,8 +294,7 @@ public:
     explicit MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck);
 
     // XJob
-    virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&)
-        throw (lang::IllegalArgumentException, uno::Exception, std::exception) override;
+    virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) override;
 
 private:
     rtl::Reference< UpdateCheck > m_aUpdateCheck;
@@ -565,7 +564,6 @@ MenuBarButtonJob::MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateC
 
 uno::Any SAL_CALL
 MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& )
-    throw (lang::IllegalArgumentException, uno::Exception, std::exception)
 {
     if ( m_aUpdateCheck->shouldShowExtUpdDlg() )
         m_aUpdateCheck->showExtensionDialog();
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 35f5e60477e6..d98a90507fa1 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -449,20 +449,19 @@ UpdateCheckConfig::getImplName()
 }
 
 uno::Type SAL_CALL
-UpdateCheckConfig::getElementType() throw (uno::RuntimeException, std::exception)
+UpdateCheckConfig::getElementType()
 {
     return m_xContainer->getElementType();
 }
 
 sal_Bool SAL_CALL
-UpdateCheckConfig::hasElements() throw (uno::RuntimeException, std::exception)
+UpdateCheckConfig::hasElements()
 {
     return m_xContainer->hasElements();
 }
 
 uno::Any SAL_CALL
 UpdateCheckConfig::getByName( const OUString& aName )
-    throw (container::NoSuchElementException, lang::WrappedTargetException,  uno::RuntimeException, std::exception)
 {
     uno::Any aValue = m_xContainer->getByName( aName );
 
@@ -479,21 +478,19 @@ UpdateCheckConfig::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > SAL_CALL
-UpdateCheckConfig::getElementNames() throw (uno::RuntimeException, std::exception)
+UpdateCheckConfig::getElementNames()
 {
     return m_xContainer->getElementNames();
 }
 
 sal_Bool SAL_CALL
-UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception)
+UpdateCheckConfig::hasByName( const OUString& aName )
 {
     return m_xContainer->hasByName( aName );
 }
 
 void SAL_CALL
 UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw (lang::IllegalArgumentException, container::NoSuchElementException,
-           lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     return m_xContainer->replaceByName( aName, aElement );
 }
@@ -502,7 +499,6 @@ UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElemen
 
 void SAL_CALL
 UpdateCheckConfig::commitChanges()
-    throw (lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Reference< util::XChangesBatch > xChangesBatch(m_xContainer, uno::UNO_QUERY);
     if( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
@@ -545,7 +541,7 @@ UpdateCheckConfig::commitChanges()
 }
 
 sal_Bool SAL_CALL
-UpdateCheckConfig::hasPendingChanges(  ) throw (uno::RuntimeException, std::exception)
+UpdateCheckConfig::hasPendingChanges(  )
 {
     uno::Reference< util::XChangesBatch > xChangesBatch(m_xContainer, uno::UNO_QUERY);
     if( xChangesBatch.is() )
@@ -555,7 +551,7 @@ UpdateCheckConfig::hasPendingChanges(  ) throw (uno::RuntimeException, std::exce
 }
 
 uno::Sequence< util::ElementChange > SAL_CALL
-UpdateCheckConfig::getPendingChanges(  ) throw (uno::RuntimeException, std::exception)
+UpdateCheckConfig::getPendingChanges(  )
 {
     uno::Reference< util::XChangesBatch > xChangesBatch(m_xContainer, uno::UNO_QUERY);
     if( xChangesBatch.is() )
@@ -660,20 +656,19 @@ bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1,
 }
 
 OUString SAL_CALL
-UpdateCheckConfig::getImplementationName()  throw (uno::RuntimeException, std::exception)
+UpdateCheckConfig::getImplementationName()
 {
     return getImplName();
 }
 
 sal_Bool SAL_CALL
 UpdateCheckConfig::supportsService(OUString const & serviceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-UpdateCheckConfig::getSupportedServiceNames()  throw (uno::RuntimeException, std::exception)
+UpdateCheckConfig::getSupportedServiceNames()
 {
     return getServiceNames();
 }
diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx
index c819c90d1814..f130811c1581 100644
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -150,44 +150,26 @@ public:
                                 const OUString& rVersion );
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw (css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // XChangesBatch
-    virtual void SAL_CALL commitChanges(  )
-        throw (css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPendingChanges(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::util::ElementChange > SAL_CALL getPendingChanges(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL commitChanges(  ) override;
+    virtual sal_Bool SAL_CALL hasPendingChanges(  ) override;
+    virtual css::uno::Sequence< css::util::ElementChange > SAL_CALL getPendingChanges(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
 
@@ -203,7 +185,6 @@ private:
 /// @throws css::uno::RuntimeException
 template <typename T>
 T getValue( const css::uno::Sequence< css::beans::NamedValue >& rNamedValues, const sal_Char * pszName )
-    throw (css::uno::RuntimeException)
 {
     for( sal_Int32 n=0; n < rNamedValues.getLength(); n++ )
     {
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index e891f3189664..b10755903db6 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -79,26 +79,19 @@ public:
     static OUString getImplName();
 
     // XJob
-    virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&)
-        throw (lang::IllegalArgumentException, uno::Exception, std::exception) override;
+    virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(OUString const & 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(OUString const & serviceName) override;
+    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( css::lang::EventObject const & evt )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) override;
 
     // XTerminateListener
-    virtual void SAL_CALL queryTermination( lang::EventObject const & evt )
-        throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL notifyTermination( lang::EventObject const & evt )
-        throw ( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL queryTermination( lang::EventObject const & evt ) override;
+    virtual void SAL_CALL notifyTermination( lang::EventObject const & evt ) override;
 
 private:
     uno::Reference<uno::XComponentContext>  m_xContext;
@@ -171,7 +164,6 @@ UpdateCheckJob::getImplName()
 
 uno::Any
 UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
-    throw (lang::IllegalArgumentException, uno::Exception, std::exception)
 {
     for ( sal_Int32 n=namedValues.getLength(); n-- > 0; )
     {
@@ -251,20 +243,20 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa
 
 
 OUString SAL_CALL
-UpdateCheckJob::getImplementationName() throw (uno::RuntimeException, std::exception)
+UpdateCheckJob::getImplementationName()
 {
     return getImplName();
 }
 
 
 uno::Sequence< OUString > SAL_CALL
-UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+UpdateCheckJob::getSupportedServiceNames()
 {
     return getServiceNames();
 }
 
 sal_Bool SAL_CALL
-UpdateCheckJob::supportsService( OUString const & serviceName ) throw (uno::RuntimeException, std::exception)
+UpdateCheckJob::supportsService( OUString const & serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
@@ -272,7 +264,6 @@ UpdateCheckJob::supportsService( OUString const & serviceName ) throw (uno::Runt
 
 // XEventListener
 void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt )
-    throw ( uno::RuntimeException, std::exception )
 {
     bool shutDown = ( rEvt.Source == m_xDesktop );
 
@@ -287,7 +278,6 @@ void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt )
 
 // XTerminateListener
 void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & )
-    throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception )
 {
 }
 
@@ -302,7 +292,6 @@ void UpdateCheckJob::terminateAndJoinThread()
 }
 
 void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & )
-    throw ( uno::RuntimeException, std::exception )
 {
     terminateAndJoinThread();
 }
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 40939ec6042c..091b3516d781 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -300,7 +300,6 @@ OUString UpdateHandler::getDefaultInstErrMsg()
 // XActionListener
 
 void SAL_CALL UpdateHandler::disposing( const lang::EventObject& rEvt )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( rEvt.Source == mxUpdDlg )
         mxUpdDlg.clear();
@@ -308,7 +307,6 @@ void SAL_CALL UpdateHandler::disposing( const lang::EventObject& rEvt )
 
 
 void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent )
-    throw( uno::RuntimeException, std::exception )
 {
     DialogControls eButton = BUTTON_COUNT;
     for ( int i = 0; i < BUTTON_COUNT; i++ )
@@ -373,13 +371,11 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent )
 // XTopWindowListener
 
 void SAL_CALL UpdateHandler::windowOpened( const lang::EventObject& )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
 
 void SAL_CALL UpdateHandler::windowClosing( const lang::EventObject& e )
-    throw( uno::RuntimeException, std::exception )
 {
     awt::ActionEvent aActionEvt;
     aActionEvt.ActionCommand = COMMAND_CLOSE;
@@ -390,40 +386,34 @@ void SAL_CALL UpdateHandler::windowClosing( const lang::EventObject& e )
 
 
 void SAL_CALL UpdateHandler::windowClosed( const lang::EventObject& )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
 
 void SAL_CALL UpdateHandler::windowMinimized( const lang::EventObject& )
-    throw( uno::RuntimeException, std::exception )
 {
     mbMinimized = true;
 }
 
 
 void SAL_CALL UpdateHandler::windowNormalized( const lang::EventObject& )
-    throw( uno::RuntimeException, std::exception )
 {
     mbMinimized = false;
 }
 
 
 void SAL_CALL UpdateHandler::windowActivated( const lang::EventObject& )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
 
 void SAL_CALL UpdateHandler::windowDeactivated( const lang::EventObject& )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
 // XInteractionHandler
 
 void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > const & rRequest)
-    throw (uno::RuntimeException, std::exception)
 {
     if ( !mxInteractionHdl.is() )
     {
@@ -467,7 +457,6 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest >
 // XTerminateListener
 
 void SAL_CALL UpdateHandler::queryTermination( const lang::EventObject& )
-    throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception )
 {
     if ( mbShowsMessageBox )
     {
@@ -485,7 +474,6 @@ void SAL_CALL UpdateHandler::queryTermination( const lang::EventObject& )
 
 
 void SAL_CALL UpdateHandler::notifyTermination( const lang::EventObject& )
-    throw ( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( maMutex );
 
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index da93b1f9dc44..d8d500fc047e 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -183,25 +183,24 @@ public:
         { return const_cast< cppu::OWeakObject * > (static_cast< cppu::OWeakObject const * > (this)); };
 
     // XActionListener
-    virtual void SAL_CALL   disposing( const css::lang::EventObject &rObj ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL   actionPerformed( css::awt::ActionEvent const & rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL   disposing( const css::lang::EventObject &rObj ) override;
+    virtual void SAL_CALL   actionPerformed( css::awt::ActionEvent const & rEvent) override;
 
     // XTopWindowListener
-    virtual void SAL_CALL   windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   windowOpened( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL   windowClosing( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL   windowClosed( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL   windowMinimized( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL   windowNormalized( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL   windowActivated( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL   windowDeactivated( const css::lang::EventObject& e ) override;
 
     // XInteractionHandler
-    virtual void SAL_CALL   handle( const css::uno::Reference< css::task::XInteractionRequest >& Request )
-                                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL   handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
 
     // XTerminateListener
-    virtual void SAL_CALL queryTermination( const css::lang::EventObject& e ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryTermination( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& e ) override;
 };
 
 #endif // INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 38c434608312..9323b095b191 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -117,10 +117,8 @@ class ActiveDataSink : public ::cppu::WeakImplHelper< io::XActiveDataSink >
 public:
     ActiveDataSink() {};
 
-    virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream()
-        throw (uno::RuntimeException, std::exception) override { return m_xStream; };
-    virtual void SAL_CALL setInputStream( uno::Reference< io::XInputStream > const & rStream )
-        throw (uno::RuntimeException, std::exception) override { m_xStream = rStream; };
+    virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() override { return m_xStream; };
+    virtual void SAL_CALL setInputStream( uno::Reference< io::XInputStream > const & rStream ) override { m_xStream = rStream; };
 };
 
 
@@ -146,40 +144,32 @@ public:
     getUpdateInformation(
         uno::Sequence< OUString > const & repositories,
         OUString const & extensionId
-    ) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+    ) override;
 
-    virtual void SAL_CALL cancel()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel() override;
 
     virtual void SAL_CALL setInteractionHandler(
-        uno::Reference< task::XInteractionHandler > const & handler )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference< task::XInteractionHandler > const & handler ) override;
 
     virtual uno::Reference< container::XEnumeration > SAL_CALL
     getUpdateInformationEnumeration(
         uno::Sequence< OUString > const & repositories,
         OUString const & extensionId
-    ) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+    ) override;
 
     // XCommandEnvironment
-    virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler()
-        throw ( uno::RuntimeException, std::exception ) override;
+    virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override;
 
-    virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler()
-        throw ( uno::RuntimeException, std::exception ) override { return  uno::Reference< ucb::XProgressHandler >(); };
+    virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() override { return  uno::Reference< ucb::XProgressHandler >(); };
 
     // XWebDAVCommandEnvironment
     virtual uno::Sequence< beans::StringPair > SAL_CALL getUserRequestHeaders(
-        const OUString&,  ucb::WebDAVHTTPMethod )
-        throw ( uno::RuntimeException, std::exception ) override;
+        const OUString&,  ucb::WebDAVHTTPMethod ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(OUString const & 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(OUString const & serviceName) override;
+    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
 
@@ -230,8 +220,8 @@ public:
     };
 
     // XEnumeration
-    sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) override { return m_nCount < m_nNodes; };
-    uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL hasMoreElements() override { return m_nCount < m_nNodes; };
+    uno::Any SAL_CALL nextElement() override
     {
         OSL_ASSERT( m_xNodeList.is() );
         OSL_ASSERT( m_xUpdateInformationProvider.is() );
@@ -288,8 +278,8 @@ public:
         : m_nCount(0) { m_aEntry.UpdateDocument = xElement; };
 
     // XEnumeration
-    sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) override { return 0 == m_nCount; };
-    uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL hasMoreElements() override { return 0 == m_nCount; };
+    uno::Any SAL_CALL nextElement() override
     {
         if( m_nCount > 0 )
             throw container::NoSuchElementException(OUString::number(m_nCount), *this);
@@ -385,7 +375,6 @@ OUString UpdateInformationProvider::getUserAgent(bool bExtended)
 
 uno::Sequence< beans::StringPair > SAL_CALL UpdateInformationProvider::getUserRequestHeaders(
     const OUString &aURL, ucb::WebDAVHTTPMethod )
-    throw ( uno::RuntimeException, std::exception )
 {
     bool bExtendedUserAgent;
     uno::Sequence< beans::StringPair > aPair = m_aRequestHeaderList;
@@ -585,7 +574,7 @@ uno::Reference< container::XEnumeration > SAL_CALL
 UpdateInformationProvider::getUpdateInformationEnumeration(
     uno::Sequence< OUString > const & repositories,
     OUString const & extensionId
-) throw (uno::Exception, uno::RuntimeException, std::exception)
+)
 {
     OSL_ASSERT(m_xDocumentBuilder.is());
 
@@ -655,7 +644,7 @@ uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL
 UpdateInformationProvider::getUpdateInformation(
     uno::Sequence< OUString > const & repositories,
     OUString const & extensionId
-) throw (uno::Exception, uno::RuntimeException, std::exception)
+)
 {
     uno::Reference< container::XEnumeration > xEnumeration(
         getUpdateInformationEnumeration(repositories, extensionId)
@@ -694,7 +683,7 @@ UpdateInformationProvider::getUpdateInformation(
 
 
 void SAL_CALL
-UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception)
+UpdateInformationProvider::cancel()
 {
     m_bCancelled.set();
 
@@ -707,7 +696,6 @@ UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception
 void SAL_CALL
 UpdateInformationProvider::setInteractionHandler(
         uno::Reference< task::XInteractionHandler > const & handler )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_xInteractionHandler = handler;
@@ -716,7 +704,6 @@ UpdateInformationProvider::setInteractionHandler(
 
 uno::Reference< task::XInteractionHandler > SAL_CALL
 UpdateInformationProvider::getInteractionHandler()
-    throw ( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -762,20 +749,20 @@ UpdateInformationProvider::getImplName()
 
 
 OUString SAL_CALL
-UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException, std::exception)
+UpdateInformationProvider::getImplementationName()
 {
     return getImplName();
 }
 
 
 uno::Sequence< OUString > SAL_CALL
-UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+UpdateInformationProvider::getSupportedServiceNames()
 {
     return getServiceNames();
 }
 
 sal_Bool SAL_CALL
-UpdateInformationProvider::supportsService( OUString const & serviceName ) throw (uno::RuntimeException, std::exception)
+UpdateInformationProvider::supportsService( OUString const & serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 16bba2d55dbb..8fc5989dbf9b 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -157,39 +157,26 @@ public:
     virtual        ~UpdateCheckUI() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(OUString const & 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(OUString const & serviceName) override;
+    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XDocumentEventListener
-    virtual void SAL_CALL documentEventOccured(const document::DocumentEvent& Event)
-        throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing(const lang::EventObject& Event)
-        throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL documentEventOccured(const document::DocumentEvent& Event) override;
+    virtual void SAL_CALL disposing(const lang::EventObject& Event) override;
 
     //XPropertySet
-    virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw ( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const uno::Any& aValue)
-        throw( beans::UnknownPropertyException, beans::PropertyVetoException,
-               lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
-    virtual uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName)
-        throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
+    virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const uno::Any& aValue) override;
+    virtual uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName,
-                                                    const uno::Reference< beans::XPropertyChangeListener > & aListener)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
+                                                    const uno::Reference< beans::XPropertyChangeListener > & aListener) override;
     virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName,
-                                                       const uno::Reference< beans::XPropertyChangeListener > & aListener)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
+                                                       const uno::Reference< beans::XPropertyChangeListener > & aListener) override;
     virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName,
-                                                    const uno::Reference< beans::XVetoableChangeListener > & aListener)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
+                                                    const uno::Reference< beans::XVetoableChangeListener > & aListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,
-                                                       const uno::Reference< beans::XVetoableChangeListener > & aListener)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
+                                                       const uno::Reference< beans::XVetoableChangeListener > & aListener) override;
 };
 
 
@@ -231,19 +218,19 @@ UpdateCheckUI::~UpdateCheckUI()
 
 
 OUString SAL_CALL
-UpdateCheckUI::getImplementationName() throw (uno::RuntimeException, std::exception)
+UpdateCheckUI::getImplementationName()
 {
     return ::getImplementationName();
 }
 
 uno::Sequence< OUString > SAL_CALL
-UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+UpdateCheckUI::getSupportedServiceNames()
 {
     return ::getServiceNames();
 }
 
 sal_Bool SAL_CALL
-UpdateCheckUI::supportsService( OUString const & serviceName ) throw (uno::RuntimeException, std::exception)
+UpdateCheckUI::supportsService( OUString const & serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
@@ -357,7 +344,6 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl )
 
 
 void SAL_CALL UpdateCheckUI::documentEventOccured(const document::DocumentEvent& rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -369,13 +355,11 @@ void SAL_CALL UpdateCheckUI::documentEventOccured(const document::DocumentEvent&
 
 
 void SAL_CALL UpdateCheckUI::disposing(const lang::EventObject&)
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 
 uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo()
-    throw ( uno::RuntimeException, std::exception )
 {
     return nullptr;
 }
@@ -383,8 +367,6 @@ uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo()
 
 void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName,
                                      const uno::Any& rValue)
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException,
-           lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -448,7 +430,6 @@ void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName,
 
 
 uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -475,7 +456,6 @@ uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName)
 
 void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/,
                                                const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     //no bound properties
 }
@@ -483,7 +463,6 @@ void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/
 
 void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyName*/,
                                                   const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     //no bound properties
 }
@@ -491,7 +470,6 @@ void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyNam
 
 void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/,
                                                const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     //no vetoable properties
 }
@@ -499,7 +477,6 @@ void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/
 
 void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyName*/,
                                                   const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     //no vetoable properties
 }
diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index a19a2a5f8e84..65de2667e493 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -61,7 +61,7 @@ struct Listener : public ::cppu::WeakImplHelper<io::XStreamListener>
     virtual void SAL_CALL started() throw() override { m_bDone = false; }
     virtual void SAL_CALL closed() throw() override { m_bDone = true; }
     virtual void SAL_CALL terminated() throw() override { m_bDone = true; }
-    virtual void SAL_CALL error(const uno::Any& e) throw(uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL error(const uno::Any& e) override
     {
         m_bDone = true; // set on error too, otherwise main thread waits forever
         SAL_WARN("filter.xslt", "exception " << e);
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index 1869e75cb82b..ec73aaaf1a35 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -102,7 +102,6 @@ void BaseContainer::impl_loadOnDemand()
 
 
 void BaseContainer::impl_initFlushMode()
-    throw (css::uno::RuntimeException)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -128,20 +127,17 @@ FilterCache* BaseContainer::impl_getWorkingCache() const
 
 
 OUString SAL_CALL BaseContainer::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_sImplementationName;
 }
 
 
 sal_Bool SAL_CALL BaseContainer::supportsService(const OUString& sServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_lServiceNames;
 }
@@ -149,10 +145,6 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames(
 
 void SAL_CALL BaseContainer::insertByName(const OUString& sItem ,
                                           const css::uno::Any&   aValue)
-    throw (css::lang::IllegalArgumentException  ,
-           css::container::ElementExistException,
-           css::lang::WrappedTargetException    ,
-           css::uno::RuntimeException, std::exception           )
 {
     if (sItem.isEmpty())
         throw css::lang::IllegalArgumentException("empty value not allowed as item name.",
@@ -188,9 +180,6 @@ void SAL_CALL BaseContainer::insertByName(const OUString& sItem ,
 
 
 void SAL_CALL BaseContainer::removeByName(const OUString& sItem)
-    throw (css::container::NoSuchElementException,
-           css::lang::WrappedTargetException     ,
-           css::uno::RuntimeException, std::exception            )
 {
     impl_loadOnDemand();
 
@@ -210,10 +199,6 @@ void SAL_CALL BaseContainer::removeByName(const OUString& sItem)
 
 void SAL_CALL BaseContainer::replaceByName(const OUString& sItem ,
                                            const css::uno::Any&   aValue)
-    throw (css::lang::IllegalArgumentException   ,
-           css::container::NoSuchElementException,
-           css::lang::WrappedTargetException     ,
-           css::uno::RuntimeException, std::exception            )
 {
     if (sItem.isEmpty())
         throw css::lang::IllegalArgumentException("empty value not allowed as item name.",
@@ -249,9 +234,6 @@ void SAL_CALL BaseContainer::replaceByName(const OUString& sItem ,
 
 
 css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem)
-    throw (css::container::NoSuchElementException,
-           css::lang::WrappedTargetException     ,
-           css::uno::RuntimeException, std::exception            )
 {
     if (sItem.isEmpty())
         throw css::container::NoSuchElementException( "An empty item can't be part of this cache!",
@@ -289,7 +271,6 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem)
 
 
 css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > lNames;
 
@@ -317,7 +298,6 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames()
 
 
 sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem)
-    throw (css::uno::RuntimeException, std::exception)
 {
     bool bHasOne = false;
 
@@ -344,7 +324,6 @@ sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem)
 
 
 css::uno::Type SAL_CALL BaseContainer::getElementType()
-    throw (css::uno::RuntimeException, std::exception)
 {
     // no lock necessary - because the type of our items
     // is fix! no internal call or member needed ...
@@ -353,7 +332,6 @@ css::uno::Type SAL_CALL BaseContainer::getElementType()
 
 
 sal_Bool SAL_CALL BaseContainer::hasElements()
-    throw (css::uno::RuntimeException, std::exception)
 {
     bool bHasSome = false;
 
@@ -380,7 +358,6 @@ sal_Bool SAL_CALL BaseContainer::hasElements()
 
 
 css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const OUString& /* sQuery */ )
-    throw (css::uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not pure virtual ... but not really implemented .-)");
 
@@ -390,7 +367,6 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea
 
 
 css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::container::XEnumeration > xEnum;
     OUStringList                                        lKeys;
@@ -437,7 +413,6 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea
 
 
 void SAL_CALL BaseContainer::flush()
-    throw (css::uno::RuntimeException, std::exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -512,7 +487,6 @@ void SAL_CALL BaseContainer::flush()
 
 
 void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // no locks necessary
     // used helper lives if we live and is threadsafe by itself ...
@@ -521,7 +495,6 @@ void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::ut
 
 
 void SAL_CALL BaseContainer::removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // no locks necessary
     // used helper lives if we live and is threadsafe by itself ...
diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index fafe12fbed0e..75097f6abb85 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.hxx
@@ -174,8 +174,7 @@ class BaseContainer : public BaseLock
 
             @throws css::uno::RuntimeException
          */
-        void impl_initFlushMode()
-            throw (css::uno::RuntimeException);
+        void impl_initFlushMode();
 
 
         /** @short  returns a pointer to the current used cache member.
@@ -206,59 +205,38 @@ class BaseContainer : public BaseLock
 
         // 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(const OUString& sServiceName)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) 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;
 
 
         // XNameContainer
 
         virtual void SAL_CALL insertByName(const OUString& sItem ,
-                                           const css::uno::Any&   aValue)
-            throw (css::lang::IllegalArgumentException  ,
-                   css::container::ElementExistException,
-                   css::lang::WrappedTargetException    ,
-                   css::uno::RuntimeException, std::exception           ) override;
+                                           const css::uno::Any&   aValue) override;
 
-        virtual void SAL_CALL removeByName(const OUString& sItem)
-            throw (css::container::NoSuchElementException,
-                   css::lang::WrappedTargetException     ,
-                   css::uno::RuntimeException, std::exception            ) override;
+        virtual void SAL_CALL removeByName(const OUString& sItem) override;
 
 
         // XNameReplace
 
         virtual void SAL_CALL replaceByName(const OUString& sItem ,
-                                            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;
 
 
         // XElementAccess
 
-        virtual css::uno::Any SAL_CALL getByName(const OUString& sItem)
-            throw (css::container::NoSuchElementException,
-                   css::lang::WrappedTargetException     ,
-                   css::uno::RuntimeException, std::exception            ) override;
+        virtual css::uno::Any SAL_CALL getByName(const OUString& sItem) 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& sItem)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasByName(const OUString& sItem) override;
 
-        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
@@ -266,23 +244,18 @@ class BaseContainer : public BaseLock
         // must be implemented really by derived class ...
         // We implement return of an empty result here only!
         // But we show an assertion :-)
-        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;
 
 
         // XFlushable
 
-        virtual void SAL_CALL flush()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL flush() override;
 
-        virtual void SAL_CALL addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) override;
 
-        virtual void SAL_CALL removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) override;
 };
 
     } // namespace config
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index 4442a995b118..1698037791ea 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -80,7 +80,6 @@ void CacheUpdateListener::stopListening()
 
 
 void SAL_CALL  CacheUpdateListener::changesOccurred(const css::util::ChangesEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -179,7 +178,6 @@ void SAL_CALL  CacheUpdateListener::changesOccurred(const css::util::ChangesEven
 
 
 void SAL_CALL CacheUpdateListener::disposing(const css::lang::EventObject& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx
index a5385f86e409..163b27f14af7 100644
--- a/filter/source/config/cache/cacheupdatelistener.hxx
+++ b/filter/source/config/cache/cacheupdatelistener.hxx
@@ -103,13 +103,11 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante
 
         // XChangesListener
 
-        virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override;
 
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 };
 
     } // namespace config
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index fc220f2e7000..94f2d0959671 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -37,26 +37,22 @@ ConfigFlush::~ConfigFlush()
 }
 
 OUString SAL_CALL ConfigFlush::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return impl_getImplementationName();
     // <- SAFE
 }
 
 sal_Bool SAL_CALL ConfigFlush::supportsService(const OUString& sServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL ConfigFlush::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return impl_getSupportedServiceNames();
 }
 
 void SAL_CALL ConfigFlush::refresh()
-    throw(css::uno::RuntimeException, std::exception)
 {
     // notify listener outside the lock!
     // The used listener helper lives if we live
@@ -89,7 +85,6 @@ void SAL_CALL ConfigFlush::refresh()
 
 
 void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // no locks necessary
     // used helper lives if we live and is threadsafe by itself ...
@@ -99,7 +94,6 @@ void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::ut
 
 
 void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // no locks necessary
     // used helper lives if we live and is threadsafe by itself ...
diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx
index 0239334c8023..f2cd8bd9ee3e 100644
--- a/filter/source/config/cache/configflush.hxx
+++ b/filter/source/config/cache/configflush.hxx
@@ -76,26 +76,20 @@ class ConfigFlush : public BaseLock
 
         // 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(const OUString& sServiceName)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) 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;
 
 
         // XRefreshable
 
-        virtual void SAL_CALL refresh()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL refresh() override;
 
-        virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) override;
 
-        virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) override;
 
 
         // interface to register/create this instance as an UNO service
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index fd4d9e0b26e1..8ab5279e7ccf 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -49,8 +49,6 @@ ContentHandlerFactory::~ContentHandlerFactory()
 
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const OUString& sHandler)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArguments(sHandler, css::uno::Sequence< css::uno::Any >());
 }
@@ -58,8 +56,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const OUString&                     sHandler  ,
                                                                                                         const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::uno::XInterface > xHandler;
 
@@ -133,7 +129,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea
 
 
 css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     // must be the same list as ((XNameAccess*)this)->getElementNames() return!
     return BaseContainer::getElementNames();
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx
index eebd5b52eb0e..f684b4048667 100644
--- a/filter/source/config/cache/contenthandlerfactory.hxx
+++ b/filter/source/config/cache/contenthandlerfactory.hxx
@@ -66,17 +66,12 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine
 
         // XMultiServiceFactory
 
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler) override;
 
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString&                     sHandler  ,
-                                                                                                 const css::uno::Sequence< css::uno::Any >& lArguments)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+                                                                                                 const css::uno::Sequence< css::uno::Any >& lArguments) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
 
     // static uno helper!
@@ -122,21 +117,21 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine
 
 
       // Overrides to resolve ambiguity
-      virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) override
         { return BaseContainer::getByName(aName); }
-      virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() override
         { return BaseContainer::getElementNames(); }
-      virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) override
+      virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) override
         { return BaseContainer::hasByName(aName); }
 
-      virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Type SAL_CALL getElementType() override
         { return BaseContainer::getElementType(); }
-      virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override
+      virtual sal_Bool SAL_CALL hasElements() override
         { return BaseContainer::hasElements(); }
 
-      virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) override
         { return BaseContainer::createSubSetEnumerationByQuery(Query); }
-      virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) override
         { return BaseContainer::createSubSetEnumerationByProperties(Properties); }
 
 
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index c0867ede0db6..d01ec3792713 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -199,7 +199,6 @@ void FilterCache::takeOver(const FilterCache& rClone)
 }
 
 void FilterCache::load(EFillState eRequired)
-    throw(css::uno::Exception, std::exception)
 {
     // SAFE -> ----------------------------------
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -240,7 +239,6 @@ void FilterCache::load(EFillState eRequired)
 }
 
 bool FilterCache::isFillState(FilterCache::EFillState eState) const
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -252,7 +250,6 @@ bool FilterCache::isFillState(FilterCache::EFillState eState) const
 OUStringList FilterCache::getMatchingItemsByProps(      EItemType  eType  ,
                                                   const CacheItem& lIProps,
                                                   const CacheItem& lEProps) const
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -287,7 +284,6 @@ OUStringList FilterCache::getMatchingItemsByProps(      EItemType  eType  ,
 
 
 bool FilterCache::hasItems(EItemType eType) const
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -303,7 +299,6 @@ bool FilterCache::hasItems(EItemType eType) const
 
 
 OUStringList FilterCache::getItemNames(EItemType eType) const
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -327,7 +322,6 @@ OUStringList FilterCache::getItemNames(EItemType eType) const
 
 bool FilterCache::hasItem(      EItemType        eType,
                               const OUString& sItem)
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -360,7 +354,6 @@ bool FilterCache::hasItem(      EItemType        eType,
 
 CacheItem FilterCache::getItem(      EItemType        eType,
                                const OUString& sItem)
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -411,7 +404,6 @@ CacheItem FilterCache::getItem(      EItemType        eType,
 
 void FilterCache::removeItem(      EItemType        eType,
                              const OUString& sItem)
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -433,7 +425,6 @@ void FilterCache::removeItem(      EItemType        eType,
 void FilterCache::setItem(      EItemType        eType ,
                           const OUString& sItem ,
                           const CacheItem&       aValue)
-    throw(css::uno::Exception, std::exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -461,7 +452,6 @@ void FilterCache::setItem(      EItemType        eType ,
 
 void FilterCache::refreshItem(      EItemType        eType,
                               const OUString& sItem)
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -472,7 +462,6 @@ void FilterCache::refreshItem(      EItemType        eType,
 void FilterCache::addStatePropsToItem(      EItemType        eType,
                                       const OUString& sItem,
                                             CacheItem&       rItem)
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -566,7 +555,6 @@ void FilterCache::addStatePropsToItem(      EItemType        eType,
 
 
 void FilterCache::removeStatePropsFromItem(CacheItem& rItem)
-    throw(css::uno::Exception)
 {
     CacheItem::iterator pIt;
     pIt = rItem.find(PROPNAME_FINALIZED);
@@ -579,7 +567,6 @@ void FilterCache::removeStatePropsFromItem(CacheItem& rItem)
 
 
 void FilterCache::flush()
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -619,7 +606,6 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
                                          EItemType                                           eType ,
                                    const CacheItemList&                                      rCache,
                                    const OUStringList&                                       lItems)
-    throw(css::uno::Exception)
 {
     css::uno::Reference< css::container::XNameContainer >   xAddRemoveSet(xSet, css::uno::UNO_QUERY);
     css::uno::Reference< css::container::XNameReplace >     xReplaceeSet(xSet, css::uno::UNO_QUERY);
@@ -678,7 +664,6 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
 
 void FilterCache::detectFlatForURL(const css::util::URL& aURL      ,
                                          FlatDetection&  rFlatTypes) const
-    throw(css::uno::Exception)
 {
     // extract extension from URL, so it can be used directly as key into our hash map!
     // Note further: It must be converted to lower case, because the optimize hash
@@ -780,7 +765,6 @@ CacheItemList& FilterCache::impl_getItemList(EItemType eType)
 }
 
 css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfigProvider eProvider)
-    throw(css::uno::Exception)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
 
@@ -969,7 +953,6 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess
 
 
 void FilterCache::impl_validateAndOptimize()
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -1244,7 +1227,6 @@ void FilterCache::impl_validateAndOptimize()
 
 void FilterCache::impl_addItem2FlushList(      EItemType        eType,
                                          const OUString& sItem)
-    throw(css::uno::Exception)
 {
     OUStringList* pList = nullptr;
     switch(eType)
@@ -1276,7 +1258,6 @@ void FilterCache::impl_addItem2FlushList(      EItemType        eType,
 FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet ,
                                                                      const CacheItemList&                                      rList,
                                                                      const OUString&                                    sItem)
-    throw(css::uno::Exception)
 {
     bool bExistsInConfigLayer = xSet->hasByName(sItem);
     bool bExistsInMemory      = (rList.find(sItem) != rList.end());
@@ -1297,7 +1278,6 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::
 }
 
 void FilterCache::impl_load(EFillState eRequiredState)
-    throw(css::uno::Exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -1404,7 +1384,6 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
                                      EItemType                                           eType  ,
                                      EReadOption                                         eOption,
                                      CacheItemList*                                      pCache )
-    throw(css::uno::Exception, std::exception)
 {
     // get access to the right configuration set
     OUString sSetName;
@@ -1511,7 +1490,6 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
 
 void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::container::XNameAccess >& xNode,
                                               CacheItem&                                          rItem)
-    throw(css::uno::Exception, std::exception)
 {
 
     // SAFE -> ----------------------------------
@@ -1571,7 +1549,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
 
 void FilterCache::impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode,
                                         const CacheItem&                                           rItem)
-    throw(css::uno::Exception)
 {
     css::uno::Reference< css::container::XNameContainer > xAdd  (xNode, css::uno::UNO_QUERY);
     css::uno::Reference< css::container::XNameAccess >    xCheck(xNode, css::uno::UNO_QUERY);
@@ -1600,7 +1577,6 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
                                            EItemType                                           eType  ,
                                      const OUString&                                    sItem  ,
                                            EReadOption                                         eOption)
-    throw(css::uno::Exception, std::exception)
 {
     // try to get an API object, which points directly to the
     // requested item. If it fail an exception should occur and
@@ -1708,7 +1684,6 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
 
 CacheItemList::iterator FilterCache::impl_loadItemOnDemand(      EItemType        eType,
                                                            const OUString& sItem)
-    throw (css::uno::Exception, std::exception)
 {
     CacheItemList*                              pList   = nullptr;
     css::uno::Reference< css::uno::XInterface > xConfig    ;
@@ -1782,7 +1757,6 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand(      EItemType
 void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xItem,
                                       EItemType                                            eType,
                                 const CacheItem & aItem)
-    throw(css::uno::Exception)
 {
     // This function changes the properties of aItem one-by-one; but it also
     // listens to the configuration changes and reloads the whole item from the
@@ -2162,7 +2136,6 @@ void FilterCache::impl_readOldFormat()
 CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet ,
                                               EItemType                                           eType,
                                         const OUString&                                    sItem)
-    throw(css::uno::Exception, std::exception)
 {
     css::uno::Reference< css::container::XNameAccess > xItem;
     xSet->getByName(sItem) >>= xItem;
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 976d47ea8c24..b47252f0cfaa 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -317,8 +317,7 @@ class FilterCache : public BaseLock
                         at all if this method does nothing inside, because the cache
                         is already fully filled!
          */
-        void load(EFillState eRequired)
-            throw (css::uno::Exception, std::exception);
+        void load(EFillState eRequired);
 
 
         /** @short      return the current fill state of this cache.
@@ -334,8 +333,7 @@ class FilterCache : public BaseLock
 
             @throws css::uno::Exception
          */
-        bool isFillState(EFillState eRequired) const
-            throw(css::uno::Exception);
+        bool isFillState(EFillState eRequired) const;
 
 
         /** @short      return a list of key names for items, which match
@@ -371,8 +369,7 @@ class FilterCache : public BaseLock
          */
         OUStringList getMatchingItemsByProps(      EItemType  eType                ,
                                                      const CacheItem& lIProps              ,
-                                                     const CacheItem& lEProps = CacheItem()) const
-            throw(css::uno::Exception);
+                                                     const CacheItem& lEProps = CacheItem()) const;
 
 
         /** @short      indicates if the requested sub container
@@ -396,8 +393,7 @@ class FilterCache : public BaseLock
                         if some input parameter are wrong or the cache itself is not valid
                         any longer, because any operation before damage it.
          */
-        bool hasItems(EItemType eType) const
-            throw(css::uno::Exception);
+        bool hasItems(EItemType eType) const;
 
 
         /** @short      return a list of all key names, which represent
@@ -420,8 +416,7 @@ class FilterCache : public BaseLock
                         if some input parameter are wrong or the cache itself is not valid
                         any longer, because any operation before damage it.
          */
-        OUStringList getItemNames(EItemType eType) const
-            throw(css::uno::Exception);
+        OUStringList getItemNames(EItemType eType) const;
 
 
         /** @short      check if the required item exist inside this container.
@@ -444,8 +439,7 @@ class FilterCache : public BaseLock
                         any longer, because any operation before damage it.
          */
         bool hasItem(      EItemType        eType,
-                                 const OUString& sItem)
-            throw(css::uno::Exception);
+                                 const OUString& sItem);
 
 
         /** @short      return an item, which match the specified type and name.
@@ -473,8 +467,7 @@ class FilterCache : public BaseLock
                         any longer, because any operation before damage it.
          */
         CacheItem getItem(      EItemType        eType,
-                                  const OUString& sItem)
-            throw(css::uno::Exception);
+                                  const OUString& sItem);
 
 
         /** TODO document me ...
@@ -482,8 +475,7 @@ class FilterCache : public BaseLock
             @throws css::uno::Exception
          */
         void removeItem(      EItemType        eType,
-                                const OUString& sItem)
-            throw(css::uno::Exception);
+                                const OUString& sItem);
 
 
         /** TODO document me ...
@@ -492,8 +484,7 @@ class FilterCache : public BaseLock
          */
         void setItem(      EItemType        eType ,
                              const OUString& sItem ,
-                             const CacheItem&       aValue)
-            throw(css::uno::Exception, std::exception);
+                             const CacheItem&       aValue);
 
 
         /** TODO document me ...
@@ -501,8 +492,7 @@ class FilterCache : public BaseLock
             @throws css::uno::Exception
          */
         void refreshItem(      EItemType        eType,
-                                 const OUString& sItem)
-            throw(css::uno::Exception);
+                                 const OUString& sItem);
 
 
         /** @short      add some implicit properties to the given
@@ -542,16 +532,14 @@ class FilterCache : public BaseLock
          */
         void addStatePropsToItem(      EItemType        eType,
                                          const OUString& sItem,
-                                               CacheItem&       rItem)
-            throw(css::uno::Exception);
+                                               CacheItem&       rItem);
 
 
         /** TODO document me
 
             @throws css::uno::Exception
          */
-        static void removeStatePropsFromItem(CacheItem& aValue)
-            throw(css::uno::Exception);
+        static void removeStatePropsFromItem(CacheItem& aValue);
 
 
         /** @short      force writing of all changes (which was made after
@@ -563,8 +551,7 @@ class FilterCache : public BaseLock
                         if the cache itself is not valid
                         any longer, because any operation before damage it.
          */
-        void flush()
-            throw(css::uno::Exception);
+        void flush();
 
 
         /** @short      supports a flat type detection for given URL.
@@ -594,8 +581,7 @@ class FilterCache : public BaseLock
                         any longer, because any operation before damage it.
          */
         void detectFlatForURL(const css::util::URL& aURL      ,
-                                            FlatDetection&  rFlatTypes) const
-            throw(css::uno::Exception);
+                                            FlatDetection&  rFlatTypes) const;
 
 
     // private helper
@@ -640,8 +626,7 @@ class FilterCache : public BaseLock
                         all necessary listener connections will be established
                         too. So this cache will be informed about outside updates.
          */
-        css::uno::Reference< css::uno::XInterface > impl_openConfig(EConfigProvider eProvide)
-            throw(css::uno::Exception);
+        css::uno::Reference< css::uno::XInterface > impl_openConfig(EConfigProvider eProvide);
 
 
         /** @short      tries to open the requested configuration root
@@ -701,8 +686,7 @@ class FilterCache : public BaseLock
 
             @throws css::uno::Exception
          */
-        void impl_load(EFillState eRequiredState)
-            throw(css::uno::Exception);
+        void impl_load(EFillState eRequiredState);
 
 
         /** @short      validate the whole cache and create
@@ -721,8 +705,7 @@ class FilterCache : public BaseLock
             @throw      [css::uno::Exception]
                         if cache is invalid and could not be repaired.
          */
-        void impl_validateAndOptimize()
-            throw(css::uno::Exception);
+        void impl_validateAndOptimize();
 
     private:
 
@@ -755,8 +738,7 @@ class FilterCache : public BaseLock
         void impl_loadSet(const css::uno::Reference< css::container::XNameAccess >& xConfig,
                                 EItemType                                           eType  ,
                                 EReadOption                                         eOption,
-                                CacheItemList*                                      pCache )
-            throw (css::uno::Exception, std::exception);
+                                CacheItemList*                                      pCache );
 
 
         /** @short  read the specified container item from the given configuration set.
@@ -784,8 +766,7 @@ class FilterCache : public BaseLock
         CacheItem impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet   ,
                                       EItemType                                           eType  ,
                                 const OUString&                                    sItem  ,
-                                      EReadOption                                         eOption)
-            throw(css::uno::Exception, std::exception);
+                                      EReadOption                                         eOption);
 
 
         /** @short  try to load the requested item on demand from the underlying configuration
@@ -814,8 +795,7 @@ class FilterCache : public BaseLock
                     if an unrecoverable error occurs inside this operation.
          */
         CacheItemList::iterator impl_loadItemOnDemand(      EItemType        eType,
-                                                      const OUString& sItem)
-            throw (css::uno::Exception, std::exception);
+                                                      const OUString& sItem);
 
 
         /** TODO
@@ -824,8 +804,7 @@ class FilterCache : public BaseLock
         */
         static void impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xSet  ,
                                  EItemType                                            eType ,
-                           const CacheItem & aValue)
-            throw(css::uno::Exception);
+                           const CacheItem & aValue);
 
 
         /** TODO
@@ -833,8 +812,7 @@ class FilterCache : public BaseLock
             @throws css::uno::Exception
         */
         void impl_addItem2FlushList(      EItemType        eType,
-                                    const OUString& sItem)
-            throw(css::uno::Exception);
+                                    const OUString& sItem);
 
 
         /** TODO
@@ -844,8 +822,7 @@ class FilterCache : public BaseLock
         static void impl_flushByList(const css::uno::Reference< css::container::XNameAccess >& xSet  ,
                                     EItemType                                           eType ,
                               const CacheItemList&                                      rCache,
-                              const OUStringList&                                       lItems)
-            throw(css::uno::Exception);
+                              const OUStringList&                                       lItems);
 
 
         /** @short  specify, which save operation is necessary for the specified item.
@@ -877,8 +854,7 @@ class FilterCache : public BaseLock
          */
         static EItemFlushState impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet ,
                                                    const CacheItemList&                                      rList,
-                                                   const OUString&                                    sItem)
-            throw(css::uno::Exception);
+                                                   const OUString&                                    sItem);
 
 
         /** TODO
@@ -886,8 +862,7 @@ class FilterCache : public BaseLock
             @throws css::uno::Exception
         */
         void impl_readPatchUINames(const css::uno::Reference< css::container::XNameAccess >& xNode,
-                                         CacheItem&                                          rItem)
-            throw(css::uno::Exception, std::exception);
+                                         CacheItem&                                          rItem);
 
 
         /** TODO
@@ -895,8 +870,7 @@ class FilterCache : public BaseLock
             @throws css::uno::Exception
         */
         static void impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode,
-                                   const CacheItem&                                           rItem)
-            throw(css::uno::Exception);
+                                   const CacheItem&                                           rItem);
 
         /** TODO */
         void impl_readOldFormat();
@@ -907,8 +881,7 @@ class FilterCache : public BaseLock
         */
         CacheItem impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet ,
                                          EItemType                                           eType,
-                                   const OUString&                                    sItem)
-            throw(css::uno::Exception, std::exception);
+                                   const OUString&                                    sItem);
 
 
         /** TODO */
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 079bd648b5b3..e3e81d11bc17 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -67,8 +67,6 @@ FilterFactory::~FilterFactory()
 
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const OUString& sFilter)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArguments(sFilter, css::uno::Sequence< css::uno::Any >());
 }
@@ -76,8 +74,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const OUString&                     sFilter   ,
                                                                                                 const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -152,7 +148,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan
 
 
 css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     /* Attention: Instead of getElementNames() this method have to return only filter names,
                   which can be created as UNO Services really. Thats why we search for filters,
@@ -179,7 +174,6 @@ css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames(
 
 
 css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const OUString& sQuery)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // reject old deprecated queries ...
     if (sQuery.startsWith("_filterquery_"))
diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx
index 8007f85235ff..c0e9a34d5aa3 100644
--- a/filter/source/config/cache/filterfactory.hxx
+++ b/filter/source/config/cache/filterfactory.hxx
@@ -67,23 +67,17 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
 
         // XMultiServiceFactory
 
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter) override;
 
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString&                     sFilter   ,
-                                                                                                 const css::uno::Sequence< css::uno::Any >& lArguments)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+                                                                                                 const css::uno::Sequence< css::uno::Any >& lArguments) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() 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;
 
 
     // internal helper!
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index 09d545a366d2..c8a6ac03b69c 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -48,8 +48,6 @@ FrameLoaderFactory::~FrameLoaderFactory()
 
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const OUString& sLoader)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArguments(sLoader, css::uno::Sequence< css::uno::Any >());
 }
@@ -57,8 +55,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const OUString&                     sLoader  ,
                                                                                                      const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -130,7 +126,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI
 
 
 css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     // must be the same list as ((XNameAccess*)this)->getElementNames() return!
     return BaseContainer::getElementNames();
diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx
index 39772ad3f994..7dab5e02b0d9 100644
--- a/filter/source/config/cache/frameloaderfactory.hxx
+++ b/filter/source/config/cache/frameloaderfactory.hxx
@@ -66,17 +66,12 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
 
         // XMultiServiceFactory
 
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader) override;
 
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString&                     sLoader   ,
-                                                                                                 const css::uno::Sequence< css::uno::Any >& lArguments)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+                                                                                                 const css::uno::Sequence< css::uno::Any >& lArguments) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
 
     // static uno helper!
@@ -121,21 +116,21 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
         static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
 
       // Overrides to resolve ambiguity
-      virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) override
         { return BaseContainer::getByName(aName); }
-      virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() override
         { return BaseContainer::getElementNames(); }
-      virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) override
+      virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) override
         { return BaseContainer::hasByName(aName); }
 
-      virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Type SAL_CALL getElementType() override
         { return BaseContainer::getElementType(); }
-      virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override
+      virtual sal_Bool SAL_CALL hasElements() override
         { return BaseContainer::hasElements(); }
 
-      virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) override
         { return BaseContainer::createSubSetEnumerationByQuery(Query); }
-      virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override
+      virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) override
         { return BaseContainer::createSubSetEnumerationByProperties(Properties); }
 
 };
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 4638e290e17f..6e4ef616d230 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -64,7 +64,6 @@ TypeDetection::~TypeDetection()
 
 
 OUString SAL_CALL TypeDetection::queryTypeByURL(const OUString& sURL)
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString sType;
 
@@ -369,7 +368,6 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types)
 
 OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor,
                                                               sal_Bool                                         bAllowDeep )
-    throw (css::uno::RuntimeException, std::exception)
 {
     // make the descriptor more useable :-)
     utl::MediaDescriptor stlDescriptor(lDescriptor);
@@ -1129,7 +1127,6 @@ OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript
 
 
 void TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor)
-    throw (css::uno::Exception)
 {
     bool bSuccess = false;
     OUString sURL = rDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() );
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index c65a946dc05a..b8dfc1c48cff 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -213,8 +213,7 @@ private:
                     Note: If an interactionHandler is part of the given descriptor too, it was already used.
                     Means: let the exception pass through the top most interface method!
      */
-    void impl_openStream(utl::MediaDescriptor& rDescriptor)
-        throw (css::uno::Exception);
+    void impl_openStream(utl::MediaDescriptor& rDescriptor);
 
 
     /** @short      validate the specified type and its relationships
@@ -315,12 +314,10 @@ public:
 
     // XTypeDetection
 
-    virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL) override;
 
     virtual OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor,
-                                                           sal_Bool                                         bAllowDeep )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                                           sal_Bool                                         bAllowDeep ) override;
 
 
 // static uno helper!
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index d23f4de94a01..104fc60022c2 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -42,14 +42,12 @@ using namespace ::com::sun::star::document;
 
 
 OUString SWFDialog_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString ( SERVICE_NAME );
 }
 
 
 Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
-    throw (RuntimeException)
 {
     Sequence<OUString> aRet { SERVICE_NAME };
     return aRet;
@@ -57,7 +55,6 @@ Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
 
 
 Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new SWFDialog( comphelper::getComponentContext(rSMgr) ));
 }
@@ -76,7 +73,6 @@ SWFDialog::~SWFDialog()
 
 
 Any SAL_CALL SWFDialog::queryInterface( const Type& rType )
-    throw (RuntimeException, std::exception)
 {
     Any aReturn = OGenericUnoDialog::queryInterface( rType );
 
@@ -104,21 +100,18 @@ void SAL_CALL SWFDialog::release()
 
 
 Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId()
-    throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 
 OUString SAL_CALL SWFDialog::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return SWFDialog_getImplementationName();
 }
 
 
 Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return SWFDialog_getSupportedServiceNames();
 }
@@ -167,7 +160,6 @@ void SWFDialog::executedDialog( sal_Int16 nExecutionResult )
 
 
 Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
-    throw(RuntimeException, std::exception)
 {
     Reference< XPropertySetInfo >  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -189,7 +181,6 @@ Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
 
 
 Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
-    throw ( RuntimeException, std::exception )
 {
     sal_Int32 i, nCount;
 
@@ -210,7 +201,6 @@ Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
 
 
 void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
-    throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
 {
     maMediaDescriptor = rProps;
 
@@ -226,7 +216,6 @@ void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
 
 
 void SAL_CALL SWFDialog::setSourceDocument( const Reference< XComponent >& xDoc )
-    throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     mxSrcDoc = xDoc;
 }
diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx
index bcaefaf4c195..c659b51750cd 100644
--- a/filter/source/flash/swfdialog.hxx
+++ b/filter/source/flash/swfdialog.hxx
@@ -43,28 +43,28 @@ private:
     css::uno::Reference< css::lang::XComponent >      mxSrcDoc;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // OGenericUnoDialog
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) override;
     virtual void executedDialog( sal_Int16 nExecutionResult ) override;
-    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
     // XPropertyAccess
     using ::cppu::OPropertySetHelper::getPropertyValues;
     using ::cppu::OPropertySetHelper::setPropertyValues;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
 
        // XExporter
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
 public:
 
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 81ec8a03946d..5f04d8aa6336 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -71,12 +71,12 @@ public:
     }
 
     // css::io::XOutputStream
-    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
+    virtual void SAL_CALL flush(  ) override;
+    virtual void SAL_CALL closeOutput(  ) override;
 };
 
-void SAL_CALL OslOutputStreamWrapper::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OslOutputStreamWrapper::writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
 {
     sal_uInt64 uBytesToWrite = aData.getLength();
     sal_uInt64 uBytesWritten = 0;
@@ -110,11 +110,11 @@ void SAL_CALL OslOutputStreamWrapper::writeBytes( const css::uno::Sequence< sal_
     }
 }
 
-void SAL_CALL OslOutputStreamWrapper::flush(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OslOutputStreamWrapper::flush(  )
 {
 }
 
-void SAL_CALL OslOutputStreamWrapper::closeOutput(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OslOutputStreamWrapper::closeOutput(  )
 {
     osl::File::RC eRC = mrFile.close();
 
@@ -154,23 +154,23 @@ public:
     explicit FlashExportFilter( const Reference< XComponentContext > &rxContext);
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) override;
 
     bool ExportAsMultipleFiles( const Sequence< PropertyValue >& aDescriptor );
     bool ExportAsSingleFile( const Sequence< PropertyValue >& aDescriptor );
 
-    virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxContext)
@@ -227,7 +227,6 @@ TYPE findPropertyValue(const Sequence< PropertyValue >& aPropertySequence, const
 }
 
 sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-    throw (RuntimeException, std::exception)
 {
     mxStatusIndicator = findPropertyValue<Reference<XStatusIndicator> >(aDescriptor, "StatusIndicator", mxStatusIndicator);
 
@@ -466,14 +465,12 @@ bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDes
 
 
 void SAL_CALL FlashExportFilter::cancel(  )
-    throw (RuntimeException, std::exception)
 {
 }
 
 
 // XExporter
 void SAL_CALL FlashExportFilter::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-    throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     mxDoc = xDoc;
 }
@@ -481,44 +478,37 @@ void SAL_CALL FlashExportFilter::setSourceDocument( const css::uno::Reference< c
 
 // XInitialization
 void SAL_CALL FlashExportFilter::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ )
-    throw (Exception, RuntimeException, std::exception)
 {
 }
 
 OUString FlashExportFilter_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString ( "com.sun.star.comp.Impress.FlashExportFilter" );
 }
 
 Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames(  )
-    throw (RuntimeException)
 {
     Sequence<OUString> aRet { "com.sun.star.document.ExportFilter" };
     return aRet;
 }
 
 Reference< XInterface > SAL_CALL FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new FlashExportFilter( comphelper::getComponentContext(rSMgr) ));
 }
 
 // XServiceInfo
 OUString SAL_CALL FlashExportFilter::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return FlashExportFilter_getImplementationName();
 }
 
 sal_Bool SAL_CALL FlashExportFilter::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL FlashExportFilter::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return FlashExportFilter_getSupportedServiceNames();
 }
diff --git a/filter/source/flash/swfuno.hxx b/filter/source/flash/swfuno.hxx
index d9323e29ac56..e1a0fd7243e7 100644
--- a/filter/source/flash/swfuno.hxx
+++ b/filter/source/flash/swfuno.hxx
@@ -38,32 +38,28 @@ namespace com { namespace sun { namespace star {
 namespace swf {
 
 /// @throws css::uno::RuntimeException
-OUString FlashExportFilter_getImplementationName()
-    throw (css::uno::RuntimeException);
+OUString FlashExportFilter_getImplementationName();
 
 /// @throws css::uno::RuntimeException
 css::uno::Sequence<OUString> SAL_CALL
-FlashExportFilter_getSupportedServiceNames() throw (css::uno::RuntimeException);
+FlashExportFilter_getSupportedServiceNames();
 
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL
 FlashExportFilter_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 }
 
 /// @throws css::uno::RuntimeException
-OUString SWFDialog_getImplementationName () throw (css::uno::RuntimeException);
+OUString SWFDialog_getImplementationName ();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence<OUString> SAL_CALL SWFDialog_getSupportedServiceNames()
-    throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL SWFDialog_getSupportedServiceNames();
 
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SWFDialog_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw(css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 #endif
 
diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx
index a6f74f735688..1c86d6bc2588 100644
--- a/filter/source/graphic/GraphicExportDialog.cxx
+++ b/filter/source/graphic/GraphicExportDialog.cxx
@@ -47,11 +47,11 @@ GraphicExportDialog::~GraphicExportDialog()
 }
 
 // XInitialization
-void SAL_CALL GraphicExportDialog::initialize( const Sequence<Any>& ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL GraphicExportDialog::initialize( const Sequence<Any>& )
 {}
 
 // XPropertyAccess
-Sequence<PropertyValue> GraphicExportDialog::getPropertyValues() throw ( RuntimeException, std::exception )
+Sequence<PropertyValue> GraphicExportDialog::getPropertyValues()
 {
     sal_Int32 i;
     sal_Int32 nCount = maMediaDescriptor.getLength();
@@ -76,8 +76,6 @@ Sequence<PropertyValue> GraphicExportDialog::getPropertyValues() throw ( Runtime
 }
 
 void GraphicExportDialog::setPropertyValues( const Sequence<PropertyValue>& aProps )
-    throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException,
-            WrappedTargetException, RuntimeException, std::exception )
 {
     maMediaDescriptor = aProps;
 
@@ -97,12 +95,11 @@ void GraphicExportDialog::setPropertyValues( const Sequence<PropertyValue>& aPro
 
 // XExecutableDialog
 void GraphicExportDialog::setTitle( const OUString& aTitle )
-    throw ( uno::RuntimeException, std::exception )
 {
     maDialogTitle = aTitle;
 }
 
-sal_Int16 GraphicExportDialog::execute() throw ( RuntimeException, std::exception )
+sal_Int16 GraphicExportDialog::execute()
 {
     sal_Int16 nReturn = ui::dialogs::ExecutableDialogResults::CANCEL;
     ScopedVclPtrInstance< GraphicExportOptionsDialog > graphicExportOptionsDialog( Application::GetDefDialogParent(), mxSourceDocument );
@@ -116,7 +113,6 @@ sal_Int16 GraphicExportDialog::execute() throw ( RuntimeException, std::exceptio
 
 // XEmporter
 void GraphicExportDialog::setSourceDocument( const Reference<XComponent>& xDocument )
-    throw ( IllegalArgumentException, RuntimeException, std::exception )
 {
     mxSourceDocument = xDocument;
 
diff --git a/filter/source/graphic/GraphicExportDialog.hxx b/filter/source/graphic/GraphicExportDialog.hxx
index d6aead53f278..54e7117c8cce 100644
--- a/filter/source/graphic/GraphicExportDialog.hxx
+++ b/filter/source/graphic/GraphicExportDialog.hxx
@@ -56,21 +56,18 @@ public:
     virtual ~GraphicExportDialog() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw (Exception, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) override;
 
     // XPropertyAccess
-    virtual Sequence<PropertyValue> SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPropertyValues( const Sequence<PropertyValue>& aProps )
-        throw ( UnknownPropertyException, PropertyVetoException,
-                lang::IllegalArgumentException, lang::WrappedTargetException,
-                RuntimeException, std::exception ) override;
+    virtual Sequence<PropertyValue> SAL_CALL getPropertyValues() override;
+    virtual void SAL_CALL setPropertyValues( const Sequence<PropertyValue>& aProps ) override;
 
     // XExecuteDialog
-    virtual sal_Int16 SAL_CALL execute() throw ( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL execute() override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const Reference<lang::XComponent>& xDocument ) throw ( lang::IllegalArgumentException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setSourceDocument( const Reference<lang::XComponent>& xDocument ) override;
 };
 
 
diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx
index b4141f474f78..b161e0b5cd84 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -102,7 +102,6 @@ void GraphicExportFilter::gatherProperties( const Sequence<PropertyValue>& rProp
 }
 
 sal_Bool SAL_CALL GraphicExportFilter::filter( const Sequence<PropertyValue>& rDescriptor )
-    throw (RuntimeException, std::exception)
 {
     gatherProperties(rDescriptor);
 
@@ -146,18 +145,16 @@ sal_Bool SAL_CALL GraphicExportFilter::filter( const Sequence<PropertyValue>& rD
     return false;
 }
 
-void SAL_CALL GraphicExportFilter::cancel( ) throw (RuntimeException, std::exception)
+void SAL_CALL GraphicExportFilter::cancel( )
 {
 }
 
 void SAL_CALL GraphicExportFilter::setSourceDocument( const Reference<XComponent>& xDocument )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     mxDocument = xDocument;
 }
 
 void SAL_CALL GraphicExportFilter::initialize( const Sequence<Any>& )
-    throw (Exception, RuntimeException, std::exception)
 {
 }
 
diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx
index d998befe99ef..7c7d95c4431b 100644
--- a/filter/source/graphic/GraphicExportFilter.hxx
+++ b/filter/source/graphic/GraphicExportFilter.hxx
@@ -59,14 +59,14 @@ public:
     virtual ~GraphicExportFilter() override;
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const Sequence<PropertyValue>& rDescriptor ) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const Sequence<PropertyValue>& rDescriptor ) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDocument ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDocument ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw(Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) override;
 };
 
 #endif
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index e638dcd46815..d3830b93fa21 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -509,7 +509,7 @@ OUString VBAMacroResolver_getImplementationName()
     return OUString( "com.sun.star.comp.vba.VBAMacroResolver" );
 }
 
-uno::Reference< uno::XInterface > SAL_CALL VBAMacroResolver_createInstance( const uno::Reference< uno::XComponentContext >& ) throw (uno::Exception)
+uno::Reference< uno::XInterface > SAL_CALL VBAMacroResolver_createInstance( const uno::Reference< uno::XComponentContext >& )
 {
     return static_cast< ::cppu::OWeakObject* >( new VBAMacroResolver );
 }
@@ -526,24 +526,24 @@ VBAMacroResolver::~VBAMacroResolver()
 
 // com.sun.star.lang.XServiceInfo interface -----------------------------------
 
-OUString SAL_CALL VBAMacroResolver::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL VBAMacroResolver::getImplementationName()
 {
     return VBAMacroResolver_getImplementationName();
 }
 
-sal_Bool SAL_CALL VBAMacroResolver::supportsService( const OUString& rService ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VBAMacroResolver::supportsService( const OUString& rService )
 {
     return cppu::supportsService(this, rService);
 }
 
-uno::Sequence< OUString > SAL_CALL VBAMacroResolver::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL VBAMacroResolver::getSupportedServiceNames()
 {
     return VBAMacroResolver_getSupportedServiceNames();
 }
 
 // com.sun.star.lang.XInitialization interface --------------------------------
 
-void SAL_CALL VBAMacroResolver::initialize( const uno::Sequence< uno::Any >& rArgs ) throw (uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL VBAMacroResolver::initialize( const uno::Sequence< uno::Any >& rArgs )
 {
     OSL_ENSURE( rArgs.getLength() < 2, "VBAMacroResolver::initialize - missing arguments" );
     if( rArgs.getLength() < 2 )
@@ -563,7 +563,7 @@ void SAL_CALL VBAMacroResolver::initialize( const uno::Sequence< uno::Any >& rAr
 
 // com.sun.star.script.vba.XVBAMacroResolver interface ------------------------
 
-OUString SAL_CALL VBAMacroResolver::resolveVBAMacroToScriptURL( const OUString& rVBAMacroName ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+OUString SAL_CALL VBAMacroResolver::resolveVBAMacroToScriptURL( const OUString& rVBAMacroName )
 {
     if( !mpObjShell )
         throw uno::RuntimeException();
@@ -594,7 +594,7 @@ OUString SAL_CALL VBAMacroResolver::resolveVBAMacroToScriptURL( const OUString&
     return makeMacroURL( aInfo.msResolvedMacro );
 }
 
-OUString SAL_CALL VBAMacroResolver::resolveScriptURLtoVBAMacro( const OUString& /*rScriptURL*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+OUString SAL_CALL VBAMacroResolver::resolveScriptURLtoVBAMacro( const OUString& /*rScriptURL*/ )
 {
     OSL_ENSURE( false, "VBAMacroResolver::resolveScriptURLtoVBAMacro - not implemented" );
     throw uno::RuntimeException();
@@ -616,7 +616,7 @@ bool getModifier( char c, sal_uInt16& mod )
 }
 
 /// @throws uno::RuntimeException
-sal_uInt16 parseChar( char c ) throw ( uno::RuntimeException )
+sal_uInt16 parseChar( char c )
 {
     sal_uInt16 nVclKey = 0;
     // do we care about locale here for isupper etc. ? probably not
@@ -680,7 +680,7 @@ KeyCodeEntry const aMSKeyCodesData[] = {
     { "F15", KEY_F15 },
 };
 
-awt::KeyEvent parseKeyEvent( const OUString& Key ) throw ( uno::RuntimeException )
+awt::KeyEvent parseKeyEvent( const OUString& Key )
 {
     static std::map< OUString, sal_uInt16 > s_KeyCodes;
     if ( s_KeyCodes.empty() )
@@ -732,7 +732,7 @@ awt::KeyEvent parseKeyEvent( const OUString& Key ) throw ( uno::RuntimeException
     return aKeyEvent;
 }
 
-void applyShortCutKeyBinding ( const uno::Reference< frame::XModel >& rxModel, const awt::KeyEvent& rKeyEvent, const OUString& rMacroName ) throw (uno::RuntimeException, std::exception)
+void applyShortCutKeyBinding ( const uno::Reference< frame::XModel >& rxModel, const awt::KeyEvent& rKeyEvent, const OUString& rMacroName )
 {
     OUString MacroName( rMacroName );
     if ( !MacroName.isEmpty() )
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index f39fc00de811..685d6ebce9eb 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -70,27 +70,21 @@ namespace filter {
             virtual sal_Bool SAL_CALL
             importer(const Sequence< PropertyValue >& sourceData,
                      const Reference< XDocumentHandler >& docHandler,
-                     const Sequence< OUString >& userData)
-                throw (IllegalArgumentException, RuntimeException, std::exception) override;
+                     const Sequence< OUString >& userData) override;
 
             // XExportFilter
             virtual sal_Bool SAL_CALL
             exporter(
                      const Sequence< PropertyValue >& sourceData,
-                     const Sequence< OUString >& userData)
-                throw (IllegalArgumentException,
-                       RuntimeException, std::exception) override;
+                     const Sequence< OUString >& userData) override;
 
-            OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) override
+            OUString SAL_CALL getImplementationName() override
             { return OUString("com.sun.star.comp.filter.OdfFlatXml"); }
 
-            sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-                throw (css::uno::RuntimeException, std::exception) override
+            sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
             { return cppu::supportsService(this, ServiceName); }
 
-            css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-                throw (css::uno::RuntimeException, std::exception) override
+            css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
             {
                 return css::uno::Sequence<OUString>{
                     "com.sun.star.document.ImportFilter",
@@ -115,7 +109,6 @@ OdfFlatXml::importer(
                      const Sequence< PropertyValue >& sourceData,
                      const Reference< XDocumentHandler >& docHandler,
                      const Sequence< OUString >& /* userData */)
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     // Read InputStream to read from and an URL used for the system id
     // of the InputSource we create from the given sourceData sequence
@@ -170,7 +163,6 @@ OdfFlatXml::importer(
 sal_Bool
 OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData,
                      const Sequence< OUString >& /*msUserData*/)
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     OUString paramName;
     OUString targetURL;
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index a7aacde578da..47573daaaf60 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -34,14 +34,12 @@ using namespace ::com::sun::star::beans;
 
 
 OUString PDFDialog_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString ( "com.sun.star.comp.PDF.PDFDialog" );
 }
 
 
 Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
-    throw (RuntimeException)
 {
     Sequence<OUString> aRet { SERVICE_NAME };
     return aRet;
@@ -49,7 +47,6 @@ Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
 
 
 Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new PDFDialog( comphelper::getComponentContext(rSMgr) ));
 }
@@ -70,21 +67,18 @@ PDFDialog::~PDFDialog()
 
 
 Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId()
-    throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 
 OUString SAL_CALL PDFDialog::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return PDFDialog_getImplementationName();
 }
 
 
 Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return PDFDialog_getSupportedServiceNames();
 }
@@ -107,7 +101,6 @@ void PDFDialog::executedDialog( sal_Int16 nExecutionResult )
 
 
 Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo()
-    throw(RuntimeException, std::exception)
 {
     Reference< XPropertySetInfo >  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -129,7 +122,6 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo()
 
 
 Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues()
-    throw ( RuntimeException, std::exception )
 {
     sal_Int32 i, nCount;
 
@@ -150,7 +142,6 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues()
 
 
 void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
-    throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
 {
     maMediaDescriptor = rProps;
 
@@ -166,7 +157,6 @@ void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
 
 
 void SAL_CALL PDFDialog::setSourceDocument( const Reference< XComponent >& xDoc )
-    throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     mxSrcDoc = xDoc;
 }
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index a8ba2f2e9642..31316434882c 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -40,24 +40,23 @@ private:
     Reference< XComponent >     mxSrcDoc;
 
     // OGenericUnoDialog
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) override;
     virtual void executedDialog( sal_Int16 nExecutionResult ) override;
-    virtual Reference< XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override;
+    virtual Reference< XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
     // XPropertyAccess
     using OPropertySetHelper::getPropertyValues;
-    virtual Sequence< PropertyValue > SAL_CALL getPropertyValues(  ) throw (RuntimeException, std::exception) override;
+    virtual Sequence< PropertyValue > SAL_CALL getPropertyValues(  ) override;
     using OPropertySetHelper::setPropertyValues;
-    virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps )
-        throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw (IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) override;
 
 public:
 
@@ -66,11 +65,11 @@ public:
 };
 
 /// @throws RuntimeException
-OUString PDFDialog_getImplementationName () throw (RuntimeException);
+OUString PDFDialog_getImplementationName ();
 /// @throws RuntimeException
-Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames() throw (RuntimeException);
+Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames();
 /// @throws Exception
-Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
+Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr);
 
 #endif // INCLUDED_FILTER_SOURCE_PDF_PDFDIALOG_HXX
 
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index e36eb5c7ff47..219e1ad7d970 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -963,8 +963,8 @@ public:
     explicit PDFErrorRequest( const task::PDFExportException& i_rExc );
 
     // XInteractionRequest
-    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;
 };
 
 
@@ -975,7 +975,7 @@ PDFErrorRequest::PDFErrorRequest( const task::PDFExportException& i_rExc ) :
 }
 
 
-uno::Any SAL_CALL PDFErrorRequest::getRequest() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL PDFErrorRequest::getRequest()
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -985,7 +985,7 @@ uno::Any SAL_CALL PDFErrorRequest::getRequest() throw (uno::RuntimeException, st
 }
 
 
-uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL PDFErrorRequest::getContinuations() throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL PDFErrorRequest::getContinuations()
 {
     return uno::Sequence< uno::Reference< task::XInteractionContinuation > >();
 }
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 9150cfdada32..2a32408bb0c3 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -171,7 +171,6 @@ IMPL_LINK( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void )
 
 
 sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescriptor )
-    throw (RuntimeException, std::exception)
 {
     FocusWindowWaitCursor aCur;
 
@@ -181,59 +180,54 @@ sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescripto
 }
 
 
-void SAL_CALL PDFFilter::cancel( ) throw (RuntimeException, std::exception)
+void SAL_CALL PDFFilter::cancel( )
 {
 }
 
 
 void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     mxSrcDoc = xDoc;
 }
 
 
 void SAL_CALL PDFFilter::initialize( const css::uno::Sequence< css::uno::Any >& )
-    throw (Exception, RuntimeException, std::exception)
 {
 }
 
 
 OUString PDFFilter_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString ( "com.sun.star.comp.PDF.PDFFilter" );
 }
 
 
-Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames(  ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames(  )
 {
     Sequence<OUString> aRet { "com.sun.star.document.PDFFilter" };
     return aRet;
 }
 
 
-Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception )
+Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new PDFFilter( comphelper::getComponentContext(rSMgr) ));
 }
 
 
 OUString SAL_CALL PDFFilter::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return PDFFilter_getImplementationName();
 }
 
 
 sal_Bool SAL_CALL PDFFilter::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 
-css::uno::Sequence< OUString > SAL_CALL PDFFilter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL PDFFilter::getSupportedServiceNames(  )
 {
     return PDFFilter_getSupportedServiceNames();
 }
diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx
index 878e79f1f1eb..7fedeaffa4fe 100644
--- a/filter/source/pdf/pdffilter.hxx
+++ b/filter/source/pdf/pdffilter.hxx
@@ -61,19 +61,19 @@ private:
 protected:
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 public:
 
@@ -82,21 +82,14 @@ public:
 };
 
 /// @throws RuntimeException
-OUString PDFFilter_getImplementationName ()
-    throw ( RuntimeException );
+OUString PDFFilter_getImplementationName ();
 
 /// @throws RuntimeException
-bool SAL_CALL PDFFilter_supportsService( const OUString& ServiceName )
-    throw ( RuntimeException );
-
-/// @throws RuntimeException
-Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames(  )
-    throw ( RuntimeException );
+Sequence< OUString > SAL_CALL PDFFilter_getSupportedServiceNames(  );
 
 /// @throws Exception
 Reference< XInterface >
-SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
-    throw ( Exception );
+SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr);
 
 #endif // INCLUDED_FILTER_SOURCE_PDF_PDFFILTER_HXX
 
diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx
index 28c69e7437a2..febc5df6faf9 100644
--- a/filter/source/pdf/pdfinteract.cxx
+++ b/filter/source/pdf/pdfinteract.cxx
@@ -37,14 +37,12 @@ PDFInteractionHandler::~PDFInteractionHandler()
 
 
 void SAL_CALL PDFInteractionHandler::handle( const Reference< task::XInteractionRequest >& i_xRequest )
-    throw (RuntimeException, std::exception)
 {
     handleInteractionRequest( i_xRequest );
 }
 
 
 sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Reference< task::XInteractionRequest >& i_xRequest )
-    throw (RuntimeException, std::exception)
 {
     bool bHandled = false;
 
@@ -65,40 +63,37 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen
 
 
 OUString PDFInteractionHandler_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString ( "com.sun.star.comp.PDF.PDFExportInteractionHandler" );
 }
 
 
-Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames(  ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames(  )
 {
     Sequence<OUString> aRet { "com.sun.star.filter.pdfexport.PDFExportInteractionHandler" };
     return aRet;
 }
 
 
-Reference< XInterface > SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & ) throw( Exception )
+Reference< XInterface > SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & )
 {
     return static_cast<cppu::OWeakObject*>(new PDFInteractionHandler);
 }
 
 
 OUString SAL_CALL PDFInteractionHandler::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return PDFInteractionHandler_getImplementationName();
 }
 
 
 sal_Bool SAL_CALL PDFInteractionHandler::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 
-css::uno::Sequence< OUString > SAL_CALL PDFInteractionHandler::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL PDFInteractionHandler::getSupportedServiceNames(  )
 {
     return PDFInteractionHandler_getSupportedServiceNames();
 }
diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx
index 18ba5e67dc15..06bd82fb7262 100644
--- a/filter/source/pdf/pdfinteract.hxx
+++ b/filter/source/pdf/pdfinteract.hxx
@@ -36,15 +36,15 @@ class PDFInteractionHandler : public cppu::WeakImplHelper < task::XInteractionHa
 {
 protected:
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XIniteractionHandler
-    virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& ) override;
 
     // XIniteractionHandler2
-    virtual sal_Bool SAL_CALL handleInteractionRequest( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL handleInteractionRequest( const Reference< task::XInteractionRequest >& ) override;
 
 public:
 
@@ -53,21 +53,14 @@ public:
 };
 
 /// @throws RuntimeException
-OUString PDFInteractionHandler_getImplementationName ()
-    throw ( RuntimeException );
+OUString PDFInteractionHandler_getImplementationName ();
 
 /// @throws RuntimeException
-bool SAL_CALL PDFInteractionHandler_supportsService( const OUString& ServiceName )
-    throw ( RuntimeException );
-
-/// @throws RuntimeException
-Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames(  )
-    throw ( RuntimeException );
+Sequence< OUString > SAL_CALL PDFInteractionHandler_getSupportedServiceNames(  );
 
 /// @throws Exception
 Reference< XInterface >
-SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
-    throw ( Exception );
+SAL_CALL PDFInteractionHandler_createInstance( const Reference< XMultiServiceFactory > & rSMgr);
 
 #endif // INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX
 
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index 5c46dc03a73d..899dbff68d9c 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -98,7 +98,7 @@ PageEntry::PageEntry()
 }
 
 /// @throws css::uno::Exception
-static void encodeFile( osl::File& rSourceFile, Reference< XOutputStream > const & xOutputStream ) throw( css::uno::Exception )
+static void encodeFile( osl::File& rSourceFile, Reference< XOutputStream > const & xOutputStream )
 {
     if( xOutputStream.is() )
     {
@@ -174,7 +174,7 @@ static OString convertString( const OUString& aInput )
 }
 
 /// @throws css::uno::Exception
-static void createSlideFile( const Reference< XComponent >& xDoc, PlacewareZipFile& rZipFile, const OUString& rURL, std::vector< PageEntry* >& rPageEntries  ) throw( css::uno::Exception, std::exception )
+static void createSlideFile( const Reference< XComponent >& xDoc, PlacewareZipFile& rZipFile, const OUString& rURL, std::vector< PageEntry* >& rPageEntries  )
 {
     OString aInfo;
 
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index 5cac30c3d1f7..54f6d3539cd4 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -55,19 +55,19 @@ public:
     explicit PlaceWareExportFilter( const Reference< XComponentContext > &rxContext);
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -78,7 +78,6 @@ PlaceWareExportFilter::PlaceWareExportFilter(const Reference< XComponentContext
 
 
 sal_Bool SAL_CALL PlaceWareExportFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-    throw (RuntimeException, std::exception)
 {
     sal_Int32 nLength = aDescriptor.getLength();
     const PropertyValue * pValue = aDescriptor.getConstArray();
@@ -117,14 +116,12 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const css::uno::Sequence< css::
 
 
 void SAL_CALL PlaceWareExportFilter::cancel(  )
-    throw (RuntimeException, std::exception)
 {
 }
 
 
 // XExporter
 void SAL_CALL PlaceWareExportFilter::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-    throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     mxDoc = xDoc;
 }
@@ -132,44 +129,37 @@ void SAL_CALL PlaceWareExportFilter::setSourceDocument( const css::uno::Referenc
 
 // XInitialization
 void SAL_CALL PlaceWareExportFilter::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ )
-    throw (Exception, RuntimeException, std::exception)
 {
 }
 
 OUString PlaceWareExportFilter_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.Impress.PlaceWareExportFilter" );
 }
 
 Sequence< OUString > SAL_CALL PlaceWareExportFilter_getSupportedServiceNames(  )
-    throw (RuntimeException)
 {
     Sequence<OUString> aRet { "com.sun.star.document.ExportFilter" };
     return aRet;
 }
 
 Reference< XInterface > SAL_CALL PlaceWareExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new PlaceWareExportFilter( comphelper::getComponentContext(rSMgr) ));
 }
 
 // XServiceInfo
 OUString SAL_CALL PlaceWareExportFilter::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return PlaceWareExportFilter_getImplementationName();
 }
 
 sal_Bool SAL_CALL PlaceWareExportFilter::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL PlaceWareExportFilter::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return PlaceWareExportFilter_getSupportedServiceNames();
 }
diff --git a/filter/source/placeware/filter.hxx b/filter/source/placeware/filter.hxx
index 8772142eb555..fc807cc17205 100644
--- a/filter/source/placeware/filter.hxx
+++ b/filter/source/placeware/filter.hxx
@@ -37,19 +37,16 @@ namespace com { namespace sun { namespace star {
 namespace pwp {
 
 /// @throws css::uno::RuntimeException
-OUString PlaceWareExportFilter_getImplementationName()
-    throw (css::uno::RuntimeException);
+OUString PlaceWareExportFilter_getImplementationName();
 
 /// @throws css::uno::RuntimeException
 css::uno::Sequence<OUString> SAL_CALL
-PlaceWareExportFilter_getSupportedServiceNames()
-    throw (css::uno::RuntimeException);
+PlaceWareExportFilter_getSupportedServiceNames();
 
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL
 PlaceWareExportFilter_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 }
 
diff --git a/filter/source/storagefilterdetect/filterdetect.cxx b/filter/source/storagefilterdetect/filterdetect.cxx
index a549ec64f19a..fb40d64a06ab 100644
--- a/filter/source/storagefilterdetect/filterdetect.cxx
+++ b/filter/source/storagefilterdetect/filterdetect.cxx
@@ -82,7 +82,6 @@ StorageFilterDetect::StorageFilterDetect(const uno::Reference<uno::XComponentCon
 StorageFilterDetect::~StorageFilterDetect() {}
 
 OUString SAL_CALL StorageFilterDetect::detect(uno::Sequence<beans::PropertyValue>& rDescriptor)
-    throw (uno::RuntimeException, std::exception)
 {
     MediaDescriptor aMediaDesc( rDescriptor );
     OUString aTypeName;
@@ -164,8 +163,7 @@ OUString SAL_CALL StorageFilterDetect::detect(uno::Sequence<beans::PropertyValue
 }
 
 // XInitialization
-void SAL_CALL StorageFilterDetect::initialize(const uno::Sequence<uno::Any>& /*aArguments*/)
-    throw (uno::Exception, uno::RuntimeException, std::exception) {}
+void SAL_CALL StorageFilterDetect::initialize(const uno::Sequence<uno::Any>& /*aArguments*/) {}
 
 OUString StorageFilterDetect_getImplementationName()
 {
@@ -189,19 +187,16 @@ uno::Reference<uno::XInterface> StorageFilterDetect_createInstance(
 
 // XServiceInfo
 OUString SAL_CALL StorageFilterDetect::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return StorageFilterDetect_getImplementationName();
 }
 
 sal_Bool SAL_CALL StorageFilterDetect::supportsService(const OUString& rServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL StorageFilterDetect::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return StorageFilterDetect_getSupportedServiceNames();
 }
diff --git a/filter/source/storagefilterdetect/filterdetect.hxx b/filter/source/storagefilterdetect/filterdetect.hxx
index af2c7c53d7e3..b2959851964f 100644
--- a/filter/source/storagefilterdetect/filterdetect.hxx
+++ b/filter/source/storagefilterdetect/filterdetect.hxx
@@ -40,22 +40,17 @@ public:
     virtual ~StorageFilterDetect() override;
 
     // XExtendedFilterDetection
-    virtual OUString SAL_CALL detect(css::uno::Sequence<css::beans::PropertyValue>& rDescriptor)
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL detect(css::uno::Sequence<css::beans::PropertyValue>& rDescriptor) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments) override;
 
     // 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(const OUString& ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& 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;
 };
 
 OUString StorageFilterDetect_getImplementationName();
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index 1564a480d24e..e08ecf7280dd 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -43,14 +43,12 @@ using namespace ::com::sun::star::document;
 
 
 OUString SVGDialog_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString ( SVG_DIALOG_IMPLEMENTATION_NAME );
 }
 
 
 Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames()
-    throw (RuntimeException)
 {
     Sequence< OUString > aRet { SVG_DIALOG_SERVICE_NAME };
     return aRet;
@@ -58,7 +56,6 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames()
 
 
 Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr )
-    throw( Exception )
 {
     return static_cast< cppu::OWeakObject* >( new SVGDialog( comphelper::getComponentContext(rSMgr) ) );
 }
@@ -76,7 +73,6 @@ SVGDialog::~SVGDialog()
 
 
 Any SAL_CALL SVGDialog::queryInterface( const Type& rType )
-    throw (RuntimeException, std::exception)
 {
     Any aReturn( OGenericUnoDialog::queryInterface( rType ) );
 
@@ -105,21 +101,18 @@ void SAL_CALL SVGDialog::release()
 
 
 Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId()
-    throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 
 OUString SAL_CALL SVGDialog::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return SVGDialog_getImplementationName();
 }
 
 
 Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return SVGDialog_getSupportedServiceNames();
 }
@@ -144,7 +137,6 @@ void SVGDialog::executedDialog( sal_Int16 nExecutionResult )
 
 
 Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo()
-    throw(RuntimeException, std::exception)
 {
     return Reference< XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) );
 }
@@ -167,7 +159,6 @@ Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo()
 
 
 Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues()
-    throw ( RuntimeException, std::exception )
 {
     sal_Int32 i, nCount;
 
@@ -190,7 +181,6 @@ Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues()
 
 
 void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
-    throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
 {
     maMediaDescriptor = rProps;
 
@@ -206,7 +196,6 @@ void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
 
 
 void SAL_CALL SVGDialog::setSourceDocument( const Reference< XComponent >& xDoc )
-    throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     mxSrcDoc = xDoc;
 }
diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx
index 4a50ff4bed6b..812e6efa9a5f 100644
--- a/filter/source/svg/svgdialog.hxx
+++ b/filter/source/svg/svgdialog.hxx
@@ -43,28 +43,28 @@ private:
     css::uno::Reference< css::lang::XComponent >    mxSrcDoc;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // OGenericUnoDialog
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) override;
     virtual void executedDialog( sal_Int16 nExecutionResult ) override;
-    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
     // XPropertyAccess
     using cppu::OPropertySetHelper::getPropertyValues;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) override;
     using cppu::OPropertySetHelper::setPropertyValues;
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
 
        // XExporter
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
 public:
 
@@ -73,21 +73,14 @@ public:
 };
 
 /// @throws css::uno::RuntimeException
-OUString SVGDialog_getImplementationName ()
-    throw ( css::uno::RuntimeException );
+OUString SVGDialog_getImplementationName ();
 
 /// @throws css::uno::RuntimeException
-bool SAL_CALL SVGDialog_supportsService( const OUString& ServiceName )
-    throw ( css::uno::RuntimeException );
-
-/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
-    SAL_CALL SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-        throw ( css::uno::Exception );
+    SAL_CALL SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 
 #endif // INCLUDED_FILTER_SOURCE_SVG_SVGDIALOG_HXX
 
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 44c48635f19d..50cc5f7af164 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -485,7 +485,6 @@ bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1,
 
 
 bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
-    throw (RuntimeException, std::exception)
 {
     Reference< XComponentContext >        xContext( ::comphelper::getProcessComponentContext() ) ;
     Reference< XOutputStream >            xOStm;
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index c8480b137298..86cfc25c7c01 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -92,7 +92,6 @@ SVGFilter::~SVGFilter()
 }
 
 sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescriptor )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     vcl::Window*     pFocusWindow = Application::GetFocusWindow();
@@ -282,18 +281,16 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
     return bRet;
 }
 
-void SAL_CALL SVGFilter::cancel( ) throw (RuntimeException, std::exception)
+void SAL_CALL SVGFilter::cancel( )
 {
 }
 
 void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     mxSrcDoc = xDoc;
 }
 
 void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc )
-    throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     mxDstDoc = xDoc;
 }
@@ -341,7 +338,7 @@ bool SVGFilter::isStreamSvg(const uno::Reference<io::XInputStream>& xInput)
     return false;
 }
 
-OUString SAL_CALL SVGFilter::detect(Sequence<PropertyValue>& rDescriptor) throw (RuntimeException, std::exception)
+OUString SAL_CALL SVGFilter::detect(Sequence<PropertyValue>& rDescriptor)
 {
     utl::MediaDescriptor aMediaDescriptor(rDescriptor);
     uno::Reference<io::XInputStream> xInput(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()], UNO_QUERY);
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 215b9037a245..10574b2de7d5 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -235,10 +235,10 @@ private:
     Link<EditFieldInfo*,void>           maNewFieldHdl;
 
     /// @throws css::uno::RuntimeException
-    bool                            implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
+    bool                            implImport( const Sequence< PropertyValue >& rDescriptor );
 
     /// @throws css::uno::RuntimeException
-    bool                            implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
+    bool                            implExport( const Sequence< PropertyValue >& rDescriptor );
     static Reference< XWriter >     implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm );
 
     void                            implGetPagePropSet( const Reference< XDrawPage > & rxPage );
@@ -287,17 +287,17 @@ private:
 protected:
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) override;
 
     // XExtendedFilterDetection
-    virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) override;
 
 public:
 
diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
index 3ffcdd842549..445d233fe6d5 100644
--- a/filter/source/svg/svgimport.cxx
+++ b/filter/source/svg/svgimport.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star;
 using namespace ::svgi;
 
 bool SVGFilter::implImport(const Sequence< PropertyValue >& rDescriptor)
-    throw (RuntimeException, std::exception)
 {
     utl::MediaDescriptor aMediaDescriptor(rDescriptor);
     uno::Reference<io::XInputStream> xInputStream;
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index f5896e923bf5..1fed9900fc66 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -3779,7 +3779,7 @@ SVGWriter::~SVGWriter()
 
 
 void SAL_CALL SVGWriter::write( const Reference<XDocumentHandler>& rxDocHandler,
-                                const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception )
+                                const Sequence<sal_Int8>& rMtfSeq )
 {
     SvMemoryStream  aMemStm( const_cast<sal_Int8 *>(rMtfSeq.getConstArray()), rMtfSeq.getLength(), StreamMode::READ );
     GDIMetaFile     aMtf;
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 4158f3ffdde5..659d635d8ca7 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -402,8 +402,7 @@ public:
 
     // XSVGWriter
     virtual void SAL_CALL write( const Reference<XDocumentHandler>& rxDocHandler,
-                                 const Sequence<sal_Int8>& rMtfSeq )
-                               throw( RuntimeException, std::exception ) override;
+                                 const Sequence<sal_Int8>& rMtfSeq ) override;
 };
 
 #endif // INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX
diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx
index 30d7586c1214..48d5e1be759a 100644
--- a/filter/source/svg/test/odfserializer.cxx
+++ b/filter/source/svg/test/odfserializer.cxx
@@ -47,14 +47,14 @@ public:
     ODFSerializer(const ODFSerializer&) = delete;
     ODFSerializer& operator=(const ODFSerializer&) = delete;
 
-    virtual void SAL_CALL startDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument(  ) override;
+    virtual void SAL_CALL endDocument(  ) override;
+    virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+    virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) override;
 
 private:
     uno::Reference<io::XOutputStream> m_xOutStream;
@@ -62,7 +62,7 @@ private:
     uno::Sequence<sal_Int8>           m_aBuf;
 };
 
-void SAL_CALL ODFSerializer::startDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL ODFSerializer::startDocument(  )
 {
     OSL_PRECOND(m_xOutStream.is(), "ODFSerializer(): invalid output stream");
 
@@ -71,11 +71,11 @@ void SAL_CALL ODFSerializer::startDocument(  ) throw (xml::sax::SAXException, un
     characters(aElement.makeStringAndClear());
 }
 
-void SAL_CALL ODFSerializer::endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL ODFSerializer::endDocument()
 {}
 
 void SAL_CALL ODFSerializer::startElement( const OUString& aName,
-                                           const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+                                           const uno::Reference< xml::sax::XAttributeList >& xAttribs )
 {
     OUStringBuffer aElement("<" + aName + " ");
 
@@ -87,12 +87,12 @@ void SAL_CALL ODFSerializer::startElement( const OUString& aName,
     characters(aElement.makeStringAndClear() + ">");
 }
 
-void SAL_CALL ODFSerializer::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL ODFSerializer::endElement( const OUString& aName )
 {
     characters("</" + aName + ">");
 }
 
-void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL ODFSerializer::characters( const OUString& aChars )
 {
     const OString aStr = OUStringToOString(aChars,
                                                      RTL_TEXTENCODING_UTF8);
@@ -106,17 +106,17 @@ void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sa
     m_xOutStream->writeBytes(m_aLineFeed);
 }
 
-void SAL_CALL ODFSerializer::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL ODFSerializer::ignorableWhitespace( const OUString& aWhitespaces )
 {
     // TODO(F1): Make pretty printing configurable
     characters(aWhitespaces);
 }
 
 void SAL_CALL ODFSerializer::processingInstruction( const OUString&,
-                                                    const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+                                                    const OUString& )
 {}
 
-void SAL_CALL ODFSerializer::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL ODFSerializer::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& )
 {}
 
 uno::Reference< xml::sax::XDocumentHandler> createSerializer(const uno::Reference<io::XOutputStream>& xOut )
diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx
index 9406d32fdcbc..ba933327fd6e 100644
--- a/filter/source/svg/test/svg2odf.cxx
+++ b/filter/source/svg/test/svg2odf.cxx
@@ -46,18 +46,18 @@ namespace
             maFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write );
         }
 
-        virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) override
 
         {
             sal_uInt64 nBytesWritten(0);
             maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten);
         }
 
-        virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL flush() override
         {
         }
 
-        virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL closeOutput() override
         {
             maFile.close();
         }
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 924d475ce826..712e27a918bb 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -154,7 +154,6 @@ T602ImportFilter::~T602ImportFilter()
 
 // XExtendedTypeDetection
 OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor)
-    throw(RuntimeException, std::exception)
 {
     sal_Int32 nLength = Descriptor.getLength();
     const PropertyValue * pValue = Descriptor.getConstArray();
@@ -182,21 +181,18 @@ OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor)
 
 // XFilter
 sal_Bool SAL_CALL T602ImportFilter::filter( const Sequence< css::beans::PropertyValue >& aDescriptor )
-    throw (RuntimeException, std::exception)
 {
     return importImpl ( aDescriptor );
 }
 
 // XImporter
 void SAL_CALL T602ImportFilter::setTargetDocument( const Reference< css::lang::XComponent >& xDoc )
-    throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     mxDoc = xDoc;
 }
 
 // XInitialization
 void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& aArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     Sequence < PropertyValue > aAnySeq;
     sal_Int32 nLength = aArguments.getLength();
@@ -250,7 +246,6 @@ void T602ImportFilter::inschr(unsigned char ch)
 }
 
 bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
-    throw (RuntimeException)
 {
     Reset602();
 
@@ -873,31 +868,26 @@ void T602ImportFilter::Read602()
 
 // XServiceInfo
 OUString SAL_CALL T602ImportFilter::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return T602ImportFilter_getImplementationName();
 }
 
 sal_Bool SAL_CALL T602ImportFilter::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 Sequence< OUString > SAL_CALL T602ImportFilter::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return T602ImportFilter_getSupportedServiceNames();
 }
 
 OUString T602ImportFilter_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString ( "com.sun.star.comp.Writer.T602ImportFilter" );
 }
 
 Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames(  )
-    throw (RuntimeException)
 {
     Sequence < OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -907,7 +897,6 @@ Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames(  )
 }
 
 Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new T602ImportFilter( rSMgr ));
 }
@@ -922,14 +911,12 @@ T602ImportFilterDialog::~T602ImportFilterDialog()
 // XLocalizable
 
 void SAL_CALL T602ImportFilterDialog::setLocale( const Locale& eLocale )
-    throw(css::uno::RuntimeException, std::exception)
 {
     meLocale = eLocale;
     initLocale();
 }
 
 Locale SAL_CALL T602ImportFilterDialog::getLocale()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return meLocale;
 }
@@ -1128,12 +1115,10 @@ ResMgr* T602ImportFilterDialog::getResMgr()
 }
 
 void SAL_CALL T602ImportFilterDialog::setTitle( const OUString& )
-            throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 sal_Int16 SAL_CALL T602ImportFilterDialog::execute()
-            throw (css::uno::RuntimeException, std::exception)
 {
     if (OptionsDlg())
         return css::ui::dialogs::ExecutableDialogResults::OK;
@@ -1147,52 +1132,44 @@ OUString T602ImportFilterDialog::getResStr( sal_Int16 resid )
     return sStr;
 }
 
-uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues() throw(uno::RuntimeException, std::exception)
+uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues()
 {
     return uno::Sequence<beans::PropertyValue>();
 }
 
 void SAL_CALL T602ImportFilterDialog::setPropertyValues( const uno::Sequence<beans::PropertyValue>& )
-                    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                            lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 
 // XServiceInfo
 OUString SAL_CALL T602ImportFilterDialog::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return T602ImportFilterDialog_getImplementationName();
 }
 
 sal_Bool SAL_CALL T602ImportFilterDialog::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 Sequence< OUString > SAL_CALL T602ImportFilterDialog::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return T602ImportFilterDialog_getSupportedServiceNames();
 }
 
 OUString T602ImportFilterDialog_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString ( "com.sun.star.comp.Writer.T602ImportFilterDialog" );
 }
 
 Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames(  )
-    throw (RuntimeException)
 {
     Sequence<OUString> aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" };
     return aRet;
 }
 
 Reference< XInterface > SAL_CALL T602ImportFilterDialog_createInstance( const Reference< XMultiServiceFactory > & )
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new T602ImportFilterDialog);
 }
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 852fb8f33557..74fc56d5eef7 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -53,20 +53,6 @@ typedef enum {
 
 enum class tnode {START,READCH,EOL,POCMD,EXPCMD,SETCMD,SETCH,WRITE,EEND,QUIT};
 
-/// @throws css::uno::RuntimeException
-OUString getImplementationName()
-    throw ( css::uno::RuntimeException );
-
-/// @throws css::uno::RuntimeException
-css::uno::Sequence < OUString > getSupportedServiceNames()
-    throw ( css::uno::RuntimeException );
-
-/// @throws css::uno::Exception
-css::uno::Reference < css::uno::XInterface > SAL_CALL
-    CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &r)
-    throw ( css::uno::Exception );
-
-
 // class T602ImportFilter
 
 
@@ -106,35 +92,23 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper <
     virtual ~T602ImportFilterDialog() override;
 
     // XExecutableDialog
-       virtual void SAL_CALL setTitle( const OUString& aTitle )
-            throw (css::uno::RuntimeException, std::exception) override;
-       virtual sal_Int16 SAL_CALL execute()
-            throw (css::uno::RuntimeException, std::exception) override;
+       virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+       virtual sal_Int16 SAL_CALL execute() override;
 
     // XLocalizable
-        virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) override;
+        virtual css::lang::Locale SAL_CALL getLocale() override;
 
     // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XPropertyAccess
         virtual css::uno::Sequence< css::beans::PropertyValue >
-                            SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertyValues() override;
         virtual void SAL_CALL   setPropertyValues( const css::uno::Sequence<
-                                    css::beans::PropertyValue >& aProps )
-                                throw (css::beans::UnknownPropertyException,
-                                        css::beans::PropertyVetoException,
-                                        css::lang::IllegalArgumentException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                    css::beans::PropertyValue >& aProps ) override;
 
 public:
     explicit T602ImportFilterDialog();
@@ -250,8 +224,7 @@ private:
     void wrtfnt();
 
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-        throw (css::uno::RuntimeException);
+    bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
 
     public:
         explicit T602ImportFilter(const css::uno::Reference<css::lang::XMultiServiceFactory > &r );
@@ -259,68 +232,46 @@ private:
         virtual ~T602ImportFilter() override;
 
     // XFilter
-        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancel(  )
-            throw (css::uno::RuntimeException, std::exception) override {};
+        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+        virtual void SAL_CALL cancel(  ) override {};
 
     // XImporter
-        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     // XExtendedTypeDetection
         virtual OUString SAL_CALL detect(
-            css::uno::Sequence< css::beans::PropertyValue >& Descriptor )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override;
 
     // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         bool SAL_CALL test();
 };
 
 /// @throws css::uno::RuntimeException
-OUString T602ImportFilter_getImplementationName()
-    throw ( css::uno::RuntimeException );
-
-/// @throws css::uno::RuntimeException
-bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName )
-    throw ( css::uno::RuntimeException );
+OUString T602ImportFilter_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
-SAL_CALL T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-    throw ( css::uno::Exception );
-
-/// @throws css::uno::RuntimeException
-OUString T602ImportFilterDialog_getImplementationName()
-    throw ( css::uno::RuntimeException );
+SAL_CALL T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 
 /// @throws css::uno::RuntimeException
-bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName )
-    throw ( css::uno::RuntimeException );
+OUString T602ImportFilterDialog_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
-SAL_CALL T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-    throw ( css::uno::Exception );
+SAL_CALL T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 
 }
 
diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx
index b8f9cab62cba..554fbc8a2a63 100644
--- a/filter/source/textfilterdetect/filterdetect.cxx
+++ b/filter/source/textfilterdetect/filterdetect.cxx
@@ -120,7 +120,7 @@ PlainTextFilterDetect::PlainTextFilterDetect() {}
 
 PlainTextFilterDetect::~PlainTextFilterDetect() {}
 
-OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyValue>& lDescriptor) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyValue>& lDescriptor)
 {
     MediaDescriptor aMediaDesc(lDescriptor);
 
@@ -195,7 +195,6 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyVal
 // XInitialization
 
 void SAL_CALL PlainTextFilterDetect::initialize(const uno::Sequence<uno::Any>& /*aArguments*/)
-    throw (uno::Exception, uno::RuntimeException, std::exception)
 {
 }
 
@@ -215,19 +214,16 @@ uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames()
 
 // XServiceInfo
 OUString SAL_CALL PlainTextFilterDetect::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return PlainTextFilterDetect_getImplementationName();
 }
 
 sal_Bool SAL_CALL PlainTextFilterDetect::supportsService(const OUString& rServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL PlainTextFilterDetect::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return PlainTextFilterDetect_getSupportedServiceNames();
 }
diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx
index cb8090c555ba..6ae26db71043 100644
--- a/filter/source/textfilterdetect/filterdetect.hxx
+++ b/filter/source/textfilterdetect/filterdetect.hxx
@@ -39,24 +39,19 @@ public:
 
     // XExtendedFilterDetection
 
-    virtual OUString SAL_CALL detect(css::uno::Sequence<css::beans::PropertyValue>& lDescriptor)
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL detect(css::uno::Sequence<css::beans::PropertyValue>& lDescriptor) override;
 
     // XInitialization
 
-    virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) override;
 
     // 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(const OUString& ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& 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;
 };
 
 OUString PlainTextFilterDetect_getImplementationName();
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 13cfb4a27606..48d2141ada23 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -65,7 +65,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::task;
 
 bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
-    throw (RuntimeException, std::exception)
 {
     OUString udConvertClass    = msUserData[0];
     const OUString sXMLImportService = msUserData[2];
@@ -183,7 +182,6 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property
 }
 
 bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
-    throw (RuntimeException)
 {
 
     OUString udConvertClass = msUserData[0];
@@ -298,17 +296,14 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::Property
 }
 
 sal_Bool SAL_CALL XmlFilterAdaptor::filter( const Sequence< css::beans::PropertyValue >& aDescriptor )
-  throw (RuntimeException, std::exception)
 {
     return meType == FILTER_EXPORT ? exportImpl ( aDescriptor ) : importImpl ( aDescriptor );
 }
 void SAL_CALL XmlFilterAdaptor::cancel(  )
-    throw (RuntimeException, std::exception)
 {
 }
 // XExporter
 void SAL_CALL XmlFilterAdaptor::setSourceDocument( const Reference< css::lang::XComponent >& xDoc )
-    throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     meType = FILTER_EXPORT;
     mxDoc = xDoc;
@@ -316,14 +311,12 @@ void SAL_CALL XmlFilterAdaptor::setSourceDocument( const Reference< css::lang::X
 
 // XImporter
 void SAL_CALL XmlFilterAdaptor::setTargetDocument( const Reference< css::lang::XComponent >& xDoc )
-    throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     meType = FILTER_IMPORT;
     mxDoc = xDoc;
 }
 // XInitialization
 void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     Sequence < PropertyValue > aAnySeq;
     sal_Int32 nLength = aArguments.getLength();
@@ -339,13 +332,11 @@ void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments )
     }
 }
 OUString XmlFilterAdaptor_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.Writer.XmlFilterAdaptor" );
 }
 
 Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames(  )
-    throw (RuntimeException)
 {
     Sequence < OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -355,26 +346,22 @@ Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames(  )
 }
 
 Reference< XInterface > SAL_CALL XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new XmlFilterAdaptor( comphelper::getComponentContext(rSMgr) ));
 }
 
 // XServiceInfo
 OUString SAL_CALL XmlFilterAdaptor::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return XmlFilterAdaptor_getImplementationName();
 }
 
 sal_Bool SAL_CALL XmlFilterAdaptor::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 Sequence< OUString > SAL_CALL XmlFilterAdaptor::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return XmlFilterAdaptor_getSupportedServiceNames();
 }
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index 23a24060d96d..5bab49ee71e8 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -61,12 +61,10 @@ protected:
     FilterType meType;
 
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL exportImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-        throw (css::uno::RuntimeException);
+    bool SAL_CALL exportImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
 
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-        throw (css::uno::RuntimeException, std::exception);
+    bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
 
 
 public:
@@ -79,67 +77,46 @@ public:
 
     // XFilter
 
-    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
 
-    virtual void SAL_CALL cancel(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel(  ) override;
 
 
     // XExporter
 
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
 
     // XImporter
 
-    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
 
     // XInitialization
 
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName(  )
-
-        throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 
 };
 
 /// @throws css::uno::RuntimeException
-OUString XmlFilterAdaptor_getImplementationName()
-    throw ( css::uno::RuntimeException );
-
-/// @throws css::uno::RuntimeException
-bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName )
-    throw ( css::uno::RuntimeException );
+OUString XmlFilterAdaptor_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
 
-SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-
-    throw ( css::uno::Exception );
+SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 
 
 #endif
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index 8ce2522dfb2c..9916b2cee94d 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -51,7 +51,7 @@ OUString supportedByType( const OUString& clipBoardFormat,  const OUString& resu
 
 }
 
-OUString SAL_CALL FilterDetect::detect( css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL FilterDetect::detect( css::uno::Sequence< css::beans::PropertyValue >& aArguments )
 {
     OUString sTypeName;
     OUString sUrl;
@@ -175,7 +175,6 @@ OUString SAL_CALL FilterDetect::detect( css::uno::Sequence< css::beans::Property
 
 // XInitialization
 void SAL_CALL FilterDetect::initialize( const Sequence< Any >& /*aArguments*/ )
-    throw (Exception, RuntimeException, std::exception)
 {
 }
 
@@ -197,19 +196,16 @@ Reference< XInterface > FilterDetect_createInstance( const Reference< XComponent
 
 // XServiceInfo
 OUString SAL_CALL FilterDetect::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return FilterDetect_getImplementationName();
 }
 
 sal_Bool SAL_CALL FilterDetect::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return FilterDetect_getSupportedServiceNames();
 }
diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx
index aaacf0beebe7..886fb1c64f72 100644
--- a/filter/source/xmlfilterdetect/filterdetect.hxx
+++ b/filter/source/xmlfilterdetect/filterdetect.hxx
@@ -44,22 +44,17 @@ public:
         : mxCtx( rxCtx ) {}
 
     //XExtendedFilterDetection
-    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // 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( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 };
 
 OUString SAL_CALL FilterDetect_getImplementationName();
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index 37ac42852c50..c9eee6cb012a 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -207,17 +207,14 @@ filter_info_impl* TypeDetectionImporter::createFilterForNode( Node * pNode )
 }
 
 void SAL_CALL TypeDetectionImporter::startDocument(  )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL TypeDetectionImporter::endDocument(  )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     ImportState eNewState = e_Unknown;
 
@@ -274,7 +271,6 @@ void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const
     maStack.push( eNewState );
 }
 void SAL_CALL TypeDetectionImporter::endElement( const OUString& /* aName */ )
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if( !maStack.empty()  )
     {
@@ -310,7 +306,6 @@ void SAL_CALL TypeDetectionImporter::endElement( const OUString& /* aName */ )
     }
 }
 void SAL_CALL TypeDetectionImporter::characters( const OUString& aChars )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if( !maStack.empty() && maStack.top() == e_Value )
     {
@@ -318,15 +313,12 @@ void SAL_CALL TypeDetectionImporter::characters( const OUString& aChars )
     }
 }
 void SAL_CALL TypeDetectionImporter::ignorableWhitespace( const OUString& /* aWhitespaces */ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 void SAL_CALL TypeDetectionImporter::processingInstruction( const OUString& /* aTarget */, const OUString& /* aData */ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 void SAL_CALL TypeDetectionImporter::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /* xLocator */ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx
index 8118c2b7f6de..1af2b442c824 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -66,22 +66,14 @@ public:
 
     static void doImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference < css::io::XInputStream >& xOS, XMLFilterVector& rFilters );
 
-    virtual void SAL_CALL startDocument(  )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument(  )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement( const OUString& aName )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument(  ) override;
+    virtual void SAL_CALL endDocument(  ) override;
+    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 
 private:
     void fillFilterVector(  XMLFilterVector& rFilters );
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 829780180a30..16cd01cec4d9 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -71,31 +71,31 @@ public:
 
 protected:
     // XInterface
-    virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( const Type& aType ) override;
+    virtual Any SAL_CALL queryAggregation( Type const & rType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XTypeProvider
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) override;
-    virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception) override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XExecutableDialog
-    virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute(  ) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XTerminateListener
-    virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyTermination( const EventObject& Event ) 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& Event ) override;
+    virtual void SAL_CALL notifyTermination( const EventObject& Event ) override;
+    virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
     /** Called in dispose method after the listeners were notified.
     */
@@ -119,13 +119,13 @@ XMLFilterDialogComponent::XMLFilterDialogComponent( const css::uno::Reference< X
 }
 
 // XInterface
-Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType )
 {
     return OComponentHelper::queryInterface( aType );
 }
 
 
-Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType )
 {
     if (rType == cppu::UnoType<css::ui::dialogs::XExecutableDialog>::get())
     {
@@ -163,32 +163,32 @@ void SAL_CALL XMLFilterDialogComponent::release() throw ()
 }
 
 /// @throws RuntimeException
-OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeException )
+OUString XMLFilterDialogComponent_getImplementationName()
 {
     return OUString( "com.sun.star.comp.ui.XSLTFilterDialog" );
 }
 
 /// @throws RuntimeException
-Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames()  throw ( RuntimeException )
+Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames()
 {
     Sequence< OUString > aSupported { "com.sun.star.ui.dialogs.XSLTFilterDialog" };
     return aSupported;
 }
 
 /// @throws Exception
-Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw ( Exception )
+Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
 {
     return static_cast<OWeakObject*>(new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) ));
 }
 
-OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL XMLFilterDialogComponent::getImplementationName()
 {
     return XMLFilterDialogComponent_getImplementationName();
 }
 
 namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 
-Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -219,17 +219,17 @@ namespace
     struct theDialogComponentTypes : rtl::Static<DialogComponentTypes, theDialogComponentTypes> {};
 }
 
-Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > XMLFilterDialogComponent::getTypes()
 {
     return theDialogComponentTypes::get().getTypeCollection().getTypes();
 }
 
-Sequence< OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames()
 {
     return XMLFilterDialogComponent_getSupportedServiceNames();
 }
 
-sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService( this, ServiceName );
 }
@@ -245,7 +245,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing()
 
 
 // XTerminateListener
-void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* Event */ ) throw (TerminationVetoException, RuntimeException, std::exception)
+void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* Event */ )
 {
     ::SolarMutexGuard aGuard;
 
@@ -265,23 +265,23 @@ void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /*
 }
 
 
-void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& /* Event */ ) throw (RuntimeException, std::exception)
+void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& /* Event */ )
 {
     // we are going down, so dispose us!
     dispose();
 }
 
-void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source */ ) throw (RuntimeException, std::exception)
+void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source */ )
 {
 }
 
 
-void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ ) throw(RuntimeException, std::exception)
+void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ )
 {
 }
 
 
-sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  ) throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  )
 {
     ::SolarMutexGuard aGuard;
 
@@ -304,7 +304,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  ) throw(RuntimeException,
 }
 
 
-void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception)
+void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArguments )
 {
     const Any* pArguments = aArguments.getConstArray();
     for(sal_Int32 i=0; i<aArguments.getLength(); ++i, ++pArguments)
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index d4dbcae8fe59..da4357b32fe3 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -80,7 +80,7 @@ static OUString encodeZipUri( const OUString& rURI )
 }
 
 /// @throws Exception
-static Reference< XInterface > addFolder( Reference< XInterface >& xRootFolder, Reference< XSingleServiceFactory >& xFactory, const OUString& rName ) throw( Exception )
+static Reference< XInterface > addFolder( Reference< XInterface >& xRootFolder, Reference< XSingleServiceFactory >& xFactory, const OUString& rName )
 {
     if ( rName == ".." || rName == "." )
         throw lang::IllegalArgumentException();
@@ -103,7 +103,7 @@ static Reference< XInterface > addFolder( Reference< XInterface >& xRootFolder,
 }
 
 /// @throws Exception
-static void addFile_( Reference< XInterface > const & xRootFolder, Reference< XSingleServiceFactory > const & xFactory, Reference< XInputStream > const & xInput, const OUString& aName ) throw( Exception )
+static void addFile_( Reference< XInterface > const & xRootFolder, Reference< XSingleServiceFactory > const & xFactory, Reference< XInputStream > const & xInput, const OUString& aName )
 {
     Reference< XActiveDataSink > xSink( xFactory->createInstance(), UNO_QUERY );
     Reference< XUnoTunnel > xTunnel( xSink, UNO_QUERY );
@@ -115,7 +115,7 @@ static void addFile_( Reference< XInterface > const & xRootFolder, Reference< XS
     }
 }
 
-void XMLFilterJarHelper::addFile( Reference< XInterface > const & xRootFolder, Reference< XSingleServiceFactory > const & xFactory, const OUString& rSourceFile ) throw( Exception, std::exception )
+void XMLFilterJarHelper::addFile( Reference< XInterface > const & xRootFolder, Reference< XSingleServiceFactory > const & xFactory, const OUString& rSourceFile )
 {
     if( !rSourceFile.isEmpty() &&
         !rSourceFile.startsWith("http:") &&
diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx
index 24ec5dccc051..a71f89f9bb41 100644
--- a/filter/source/xsltdialog/xmlfilterjar.hxx
+++ b/filter/source/xsltdialog/xmlfilterjar.hxx
@@ -39,7 +39,7 @@ public:
 
 private:
     /// @throws css::uno::Exception
-    void addFile( css::uno::Reference< css::uno::XInterface > const & xRootFolder, css::uno::Reference< css::lang::XSingleServiceFactory > const & xFactory, const OUString& rSourceFile ) throw( css::uno::Exception, std::exception );
+    void addFile( css::uno::Reference< css::uno::XInterface > const & xRootFolder, css::uno::Reference< css::lang::XSingleServiceFactory > const & xFactory, const OUString& rSourceFile );
 
     bool copyFile( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xIfc, OUString& rURL, const OUString& rTargetURL );
     bool copyFiles( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xIfc, filter_info_impl* pFilter );
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index eb6900a2b661..5367bc1a39cc 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -74,10 +74,10 @@ public:
     explicit GlobalEventListenerImpl( XMLFilterTestDialog* pDialog );
 
     // XDocumentEventListener
-    virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) override;
 
     // lang::XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 private:
     VclPtr<XMLFilterTestDialog> mpDialog;
 };
@@ -87,7 +87,7 @@ GlobalEventListenerImpl::GlobalEventListenerImpl( XMLFilterTestDialog* pDialog )
 {
 }
 
-void SAL_CALL GlobalEventListenerImpl::documentEventOccured( const css::document::DocumentEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL GlobalEventListenerImpl::documentEventOccured( const css::document::DocumentEvent& Event )
 {
     ::SolarMutexGuard aGuard;
     if( Event.EventName == "OnFocus" || Event.EventName == "OnUnload" )
@@ -97,7 +97,7 @@ void SAL_CALL GlobalEventListenerImpl::documentEventOccured( const css::document
     }
 }
 
-void SAL_CALL GlobalEventListenerImpl::disposing( const css::lang::EventObject& /* Source */ ) throw (RuntimeException, std::exception)
+void SAL_CALL GlobalEventListenerImpl::disposing( const css::lang::EventObject& /* Source */ )
 {
 }
 
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index f3b8265f0625..d828cbd91991 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -374,13 +374,12 @@ namespace XSLT
     void
     LibXSLTTransformer::setInputStream(
             const css::uno::Reference<XInputStream>& inputStream)
-            throw (RuntimeException, std::exception)
     {
         m_rInputStream = inputStream;
     }
 
     css::uno::Reference<XInputStream>
-    LibXSLTTransformer::getInputStream() throw (RuntimeException, std::exception)
+    LibXSLTTransformer::getInputStream()
     {
         return m_rInputStream;
     }
@@ -388,20 +387,18 @@ namespace XSLT
     void
     LibXSLTTransformer::setOutputStream(
             const css::uno::Reference<XOutputStream>& outputStream)
-            throw (RuntimeException, std::exception)
     {
         m_rOutputStream = outputStream;
     }
 
     css::uno::Reference<XOutputStream>
-    LibXSLTTransformer::getOutputStream() throw (RuntimeException, std::exception)
+    LibXSLTTransformer::getOutputStream()
     {
         return m_rOutputStream;
     }
 
     void
     LibXSLTTransformer::addListener(const css::uno::Reference<XStreamListener>& listener)
-            throw (RuntimeException, std::exception)
     {
         m_listeners.insert(m_listeners.begin(), listener);
     }
@@ -409,13 +406,12 @@ namespace XSLT
     void
     LibXSLTTransformer::removeListener(
             const css::uno::Reference<XStreamListener>& listener)
-            throw (RuntimeException, std::exception)
     {
         m_listeners.remove(listener);
     }
 
     void
-    LibXSLTTransformer::start() throw (RuntimeException, std::exception)
+    LibXSLTTransformer::start()
     {
         ListenerList::iterator it;
         ListenerList* l = &m_listeners;
@@ -460,7 +456,7 @@ namespace XSLT
     }
 
     void
-    LibXSLTTransformer::terminate() throw (RuntimeException, std::exception)
+    LibXSLTTransformer::terminate()
     {
         if (m_Reader.is())
         {
@@ -474,7 +470,6 @@ namespace XSLT
 
     void
     LibXSLTTransformer::initialize(const Sequence<Any>& args)
-            throw (RuntimeException, std::exception)
     {
         Sequence<Any> params;
         if (!(args[0] >>= params))
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index 87f3225c86b7..beb500f7faa5 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -133,29 +133,25 @@ namespace XSLT
 
         // XActiveDataSink
         virtual void SAL_CALL
-        setInputStream(const css::uno::Reference<XInputStream>& inputStream)
-                throw (RuntimeException, std::exception) override;
+        setInputStream(const css::uno::Reference<XInputStream>& inputStream) override;
         virtual css::uno::Reference<XInputStream> SAL_CALL
-        getInputStream() throw (RuntimeException, std::exception) override;
+        getInputStream() override;
         // XActiveDataSource
         virtual void SAL_CALL
-        setOutputStream(const css::uno::Reference<XOutputStream>& outputStream)
-                throw (RuntimeException, std::exception) override;
+        setOutputStream(const css::uno::Reference<XOutputStream>& outputStream) override;
         virtual css::uno::Reference<XOutputStream> SAL_CALL
-        getOutputStream() throw (RuntimeException, std::exception) override;
+        getOutputStream() override;
         // XActiveDataControl
         virtual void SAL_CALL
-        addListener(const css::uno::Reference<XStreamListener>& listener)
-                throw (RuntimeException, std::exception) override;
+        addListener(const css::uno::Reference<XStreamListener>& listener) override;
         virtual void SAL_CALL
-        removeListener(const css::uno::Reference<XStreamListener>& listener)
-                throw (RuntimeException, std::exception) override;
+        removeListener(const css::uno::Reference<XStreamListener>& listener) override;
         virtual void SAL_CALL
-        start() throw (RuntimeException, std::exception) override;
+        start() override;
         virtual void SAL_CALL
-        terminate() throw (RuntimeException, std::exception) override;
+        terminate() override;
         virtual void SAL_CALL
-        initialize(const Sequence<Any>& params) throw (RuntimeException, std::exception) override;
+        initialize(const Sequence<Any>& params) override;
 
         void SAL_CALL
         done();
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 468757f05484..1adab3e15d01 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -131,32 +131,32 @@ namespace XSLT
 
         // XStreamListener
         virtual void SAL_CALL
-        error(const Any& a) throw (RuntimeException, std::exception) override;
+        error(const Any& a) override;
         virtual void SAL_CALL
-        closed() throw (RuntimeException, std::exception) override;
+        closed() override;
         virtual void SAL_CALL
-        terminated() throw (RuntimeException, std::exception) override;
+        terminated() override;
         virtual void SAL_CALL
-        started() throw (RuntimeException, std::exception) override;
+        started() override;
         virtual void SAL_CALL
-        disposing(const EventObject& e) throw (RuntimeException, std::exception) override;
+        disposing(const EventObject& e) override;
 
         // XImportFilter
         virtual sal_Bool SAL_CALL
         importer(const Sequence<PropertyValue>& aSourceData, const css::uno::Reference<
                 XDocumentHandler>& xHandler,
-                const Sequence<OUString>& msUserData) throw (RuntimeException, std::exception) override;
+                const Sequence<OUString>& msUserData) override;
 
         // XExportFilter
         virtual sal_Bool SAL_CALL
         exporter(const Sequence<PropertyValue>& aSourceData, const Sequence<
-                OUString>& msUserData) throw (RuntimeException, std::exception) override;
+                OUString>& msUserData) override;
 
         // XDocumentHandler
         virtual void SAL_CALL
-        startDocument() throw (SAXException, RuntimeException, std::exception) override;
+        startDocument() override;
         virtual void SAL_CALL
-        endDocument() throw (SAXException, RuntimeException, std::exception) override;
+        endDocument() override;
     };
 
     XSLTFilter::XSLTFilter(const css::uno::Reference<XComponentContext> &r):
@@ -164,7 +164,7 @@ namespace XSLT
     {}
 
     void
-    XSLTFilter::disposing(const EventObject&) throw (RuntimeException, std::exception)
+    XSLTFilter::disposing(const EventObject&)
     {
     }
 
@@ -223,12 +223,12 @@ namespace XSLT
     }
 
     void
-    XSLTFilter::started() throw (RuntimeException, std::exception)
+    XSLTFilter::started()
     {
         m_cTransformed.reset();
     }
     void
-    XSLTFilter::error(const Any& a) throw (RuntimeException, std::exception)
+    XSLTFilter::error(const Any& a)
     {
         Exception e;
         if (a >>= e)
@@ -239,12 +239,12 @@ namespace XSLT
         m_cTransformed.set();
     }
     void
-    XSLTFilter::closed() throw (RuntimeException, std::exception)
+    XSLTFilter::closed()
     {
         m_cTransformed.set();
     }
     void
-    XSLTFilter::terminated() throw (RuntimeException, std::exception)
+    XSLTFilter::terminated()
     {
         m_bTerminated = true;
         m_cTransformed.set();
@@ -268,7 +268,7 @@ namespace XSLT
     sal_Bool
     XSLTFilter::importer(const Sequence<PropertyValue>& aSourceData,
             const css::uno::Reference<XDocumentHandler>& xHandler, const Sequence<
-                    OUString>& msUserData) throw (RuntimeException, std::exception)
+                    OUString>& msUserData)
     {
         if (msUserData.getLength() < 5)
             return false;
@@ -414,7 +414,7 @@ namespace XSLT
 
     sal_Bool
     XSLTFilter::exporter(const Sequence<PropertyValue>& aSourceData,
-            const Sequence<OUString>& msUserData) throw (RuntimeException, std::exception)
+            const Sequence<OUString>& msUserData)
     {
         if (msUserData.getLength() < 6)
             return false;
@@ -514,14 +514,14 @@ namespace XSLT
     // events to the XML writer that we created upon the output stream
     // that was provided by the XMLFilterAdapter
     void
-    XSLTFilter::startDocument() throw (SAXException, RuntimeException, std::exception)
+    XSLTFilter::startDocument()
     {
         ExtendedDocumentHandlerAdapter::startDocument();
         m_tcontrol->start();
     }
 
     void
-    XSLTFilter::endDocument() throw (SAXException, RuntimeException, std::exception)
+    XSLTFilter::endDocument()
     {
         ExtendedDocumentHandlerAdapter::endDocument();
         // wait for the transformer to finish
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 15944189adb2..99d076c3096a 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -63,7 +63,7 @@ OButtonModel::OButtonModel(const Reference<XComponentContext>& _rxFactory)
 }
 
 
-Any SAL_CALL OButtonModel::queryAggregation( const Type& _type ) throw(RuntimeException, std::exception)
+Any SAL_CALL OButtonModel::queryAggregation( const Type& _type )
 {
     Any aReturn = OClickableImageBaseModel::queryAggregation( _type );
     if ( !aReturn.hasValue() )
@@ -114,7 +114,7 @@ IMPLEMENT_DEFAULT_CLONING( OButtonModel )
 
 // XServiceInfo
 
-css::uno::Sequence<OUString>  OButtonModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString>  OButtonModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OClickableImageBaseModel::getSupportedServiceNames();
     aSupported.realloc( aSupported.getLength() + 2 );
@@ -127,13 +127,13 @@ css::uno::Sequence<OUString>  OButtonModel::getSupportedServiceNames() throw(std
 }
 
 
-OUString OButtonModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString OButtonModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility !
 }
 
 
-void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception)
+void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     OClickableImageBaseModel::write(_rxOutStream);
 
@@ -154,7 +154,7 @@ void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) thr
 }
 
 
-void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception)
+void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     OClickableImageBaseModel::read(_rxInStream);
 
@@ -221,7 +221,7 @@ void SAL_CALL OButtonModel::disposing()
 }
 
 
-void SAL_CALL OButtonModel::reset() throw (RuntimeException, std::exception)
+void SAL_CALL OButtonModel::reset()
 {
     if ( !m_aResetHelper.approveReset() )
         return;
@@ -232,13 +232,13 @@ void SAL_CALL OButtonModel::reset() throw (RuntimeException, std::exception)
 }
 
 
-void SAL_CALL OButtonModel::addResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OButtonModel::addResetListener( const Reference< XResetListener >& _listener )
 {
     m_aResetHelper.addResetListener( _listener );
 }
 
 
-void SAL_CALL OButtonModel::removeResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OButtonModel::removeResetListener( const Reference< XResetListener >& _listener )
 {
     m_aResetHelper.removeResetListener( _listener );
 }
@@ -259,7 +259,7 @@ void SAL_CALL OButtonModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand
 }
 
 
-void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception)
+void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
 {
     switch ( _nHandle )
     {
@@ -279,7 +279,7 @@ void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle
 }
 
 
-sal_Bool SAL_CALL OButtonModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OButtonModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
 {
     bool bModified = false;
     switch ( _nHandle )
@@ -339,7 +339,7 @@ Sequence<Type> OButtonControl::_getTypes()
 }
 
 
-css::uno::Sequence<OUString>  OButtonControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString>  OButtonControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OClickableImageBaseControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -379,7 +379,7 @@ OButtonControl::~OButtonControl()
 
 // UNO binding
 
-Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType)
 {
     // if asked for the XTypeProvider, don't let OButtonControl_BASE do this
     Any aReturn;
@@ -405,7 +405,7 @@ void SAL_CALL OButtonControl::disposing()
 }
 
 
-void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( RuntimeException, std::exception )
+void SAL_CALL OButtonControl::disposing( const EventObject& _rSource )
 {
     OControl::disposing( _rSource );
     OFormNavigationHelper::disposing( _rSource );
@@ -413,7 +413,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru
 
 // ActionListener
 
-void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( css::uno::RuntimeException, std::exception)
+void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/)
 {
     // Asynchronous for css::util::URL-Button
     ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl, OnClick) );
@@ -503,7 +503,7 @@ void OButtonControl::actionPerformed_Impl( bool _bNotifyListener, const css::awt
 
 // XButton
 
-void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException, std::exception )
+void OButtonControl::setLabel(const OUString& Label)
 {
     Reference<XButton>  xButton;
     query_aggregation( m_xAggregate, xButton );
@@ -512,7 +512,7 @@ void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException, st
 }
 
 
-void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw( RuntimeException, std::exception )
+void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand)
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -526,13 +526,13 @@ void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw(
 }
 
 
-void SAL_CALL OButtonControl::addActionListener(const Reference<XActionListener>& _rxListener) throw( RuntimeException, std::exception )
+void SAL_CALL OButtonControl::addActionListener(const Reference<XActionListener>& _rxListener)
 {
     m_aActionListeners.addInterface(_rxListener);
 }
 
 
-void SAL_CALL OButtonControl::removeActionListener(const Reference<XActionListener>& _rxListener) throw( RuntimeException, std::exception )
+void SAL_CALL OButtonControl::removeActionListener(const Reference<XActionListener>& _rxListener)
 {
     m_aActionListeners.removeInterface(_rxListener);
 }
@@ -589,7 +589,7 @@ void OButtonControl::startOrStopModelPropertyListening( bool _bStart )
 }
 
 
-sal_Bool SAL_CALL OButtonControl::setModel( const Reference< XControlModel >& _rxModel ) throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL OButtonControl::setModel( const Reference< XControlModel >& _rxModel )
 {
     startOrStopModelPropertyListening( false );
     bool bResult = OClickableImageBaseControl::setModel( _rxModel );
@@ -621,7 +621,7 @@ void OButtonControl::modelFeatureUrlPotentiallyChanged( )
 }
 
 
-void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent ) throw ( RuntimeException, std::exception )
+void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent )
 {
     if  (   _rEvent.PropertyName == PROPERTY_TARGET_URL
         ||  _rEvent.PropertyName == PROPERTY_BUTTONTYPE
@@ -675,7 +675,7 @@ sal_Int16 OButtonControl::getModelUrlFeatureId( ) const
 }
 
 
-void SAL_CALL OButtonControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException, std::exception )
+void SAL_CALL OButtonControl::setDesignMode( sal_Bool _bOn )
 {
     OClickableImageBaseControl::setDesignMode( _bOn  );
 
@@ -734,14 +734,14 @@ bool OButtonControl::isEnabled( sal_Int16 _nFeatureId ) const
 }
 
 
-void SAL_CALL OButtonControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL OButtonControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
 {
     OClickableImageBaseControl::registerDispatchProviderInterceptor( _rxInterceptor );
     OFormNavigationHelper::registerDispatchProviderInterceptor( _rxInterceptor );
 }
 
 
-void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception)
+void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
 {
     OClickableImageBaseControl::releaseDispatchProviderInterceptor( _rxInterceptor );
     OFormNavigationHelper::releaseDispatchProviderInterceptor( _rxInterceptor );
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index d315c0f24043..eabc05286e13 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -50,26 +50,25 @@ public:
 
     // UNO
     DECLARE_UNO3_AGG_DEFAULTS( OButtonModel, OClickableImageBaseModel )
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
     css::uno::Sequence< css::uno::Type> _getTypes() override;
 
 // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OButtonModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 // css::io::XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // XReset
-    virtual void SAL_CALL reset(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reset(  ) override;
+    virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) override;
+    virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -78,18 +77,16 @@ public:
 
     // XPropertySet and friends
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-                throw (css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
     virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
 private:
     void    impl_resetNoBroadcast_nothrow();
@@ -134,37 +131,36 @@ public:
     virtual ~OButtonControl() override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OButtonControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // UNO binding
     DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl)
-    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
     // XActionListener
-    virtual void SAL_CALL actionPerformed(const css::awt::ActionEvent& rEvent) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL actionPerformed(const css::awt::ActionEvent& rEvent) override;
 
     // XButton
-    virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLabel(const OUString& Label) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) override;
+    virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) override;
+    virtual void SAL_CALL setLabel(const OUString& Label) override;
+    virtual void SAL_CALL setActionCommand(const OUString& _rCommand) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
 
     // XControl
-    virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& _rxModel ) throw ( css::uno::RuntimeException, std::exception ) override;
-    void SAL_CALL setDesignMode(sal_Bool bOn) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& _rxModel ) override;
+    void SAL_CALL setDesignMode(sal_Bool bOn) override;
 
 protected:
     // OFormNavigationHelper overriables
@@ -174,8 +170,8 @@ protected:
     virtual bool    isEnabled( sal_Int16 _nFeatureId ) const override;
 
     // XDispatchProviderInterception disambiguation
-    virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
+    virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
 
     // OImageControl overridables
     virtual void    actionPerformed_Impl( bool bNotifyListener, const css::awt::MouseEvent& _rEvt ) override;
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index 432899a67a8c..65178f68ddc4 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -45,7 +45,7 @@ OCheckBoxControl::OCheckBoxControl(const Reference<XComponentContext>& _rxFactor
 }
 
 
-css::uno::Sequence<OUString> SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OCheckBoxControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -84,7 +84,7 @@ IMPLEMENT_DEFAULT_CLONING( OCheckBoxModel )
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OCheckBoxModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OReferenceValueComponent::getSupportedServiceNames();
 
@@ -117,14 +117,13 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co
 }
 
 
-OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OCheckBoxModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_CHECKBOX);  // old (non-sun) name for compatibility !
 }
 
 
 void SAL_CALL OCheckBoxModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream)
-    throw(css::io::IOException, RuntimeException, std::exception)
 {
     OReferenceValueComponent::write(_rxOutStream);
 
@@ -139,7 +138,7 @@ void SAL_CALL OCheckBoxModel::write(const Reference<css::io::XObjectOutputStream
 }
 
 
-void SAL_CALL OCheckBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, RuntimeException, std::exception)
+void SAL_CALL OCheckBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream)
 {
     OReferenceValueComponent::read(_rxInStream);
     osl::MutexGuard aGuard(m_aMutex);
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx
index cfa6c0c8a3a2..98421e1599e9 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -35,18 +35,17 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OCheckBoxModel );
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OCheckBoxModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XPersistObject
-    virtual OUString SAL_CALL    getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getServiceName() override;
     virtual void SAL_CALL
-        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
     virtual void SAL_CALL
-        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -54,7 +53,7 @@ public:
     ) const override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     // OBoundControlModel overridables
     virtual css::uno::Any   translateDbColumnToControlValue( ) override;
@@ -67,11 +66,10 @@ public:
     explicit OCheckBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OCheckBoxControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index e87ea44684ab..c221024dd533 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -121,7 +121,7 @@ const Sequence<sal_Int8>& OGridColumn::getUnoTunnelImplementationId()
 }
 
 
-sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdentifier) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdentifier)
 {
     sal_Int64 nReturn(0);
 
@@ -141,13 +141,13 @@ sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdenti
 }
 
 
-Sequence<sal_Int8> SAL_CALL OGridColumn::getImplementationId() throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL OGridColumn::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 
-Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException, std::exception)
+Sequence<Type> SAL_CALL OGridColumn::getTypes()
 {
     TypeBag aTypes( OGridColumn_BASE::getTypes() );
     // erase the types which we do not support
@@ -171,7 +171,7 @@ Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException, std::exc
 }
 
 
-Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType )
 {
     Any aReturn;
     // some functionality at our aggregate cannot be reasonably fulfilled here.
@@ -269,7 +269,7 @@ OGridColumn::~OGridColumn()
 
 // XEventListener
 
-void SAL_CALL OGridColumn::disposing(const EventObject& _rSource) throw(RuntimeException, std::exception)
+void SAL_CALL OGridColumn::disposing(const EventObject& _rSource)
 {
     OPropertySetAggregationHelper::disposing(_rSource);
 
@@ -391,7 +391,6 @@ void OGridColumn::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) const
 
 sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
                                             sal_Int32 nHandle, const Any& rValue )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     bool bModified(false);
     switch (nHandle)
@@ -421,7 +420,7 @@ sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldV
 }
 
 
-void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (css::uno::Exception, std::exception)
+void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     switch (nHandle)
     {
@@ -460,7 +459,7 @@ Any OGridColumn::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
 
 // XCloneable
 
-Reference< XCloneable > SAL_CALL OGridColumn::createClone(  ) throw (RuntimeException, std::exception)
+Reference< XCloneable > SAL_CALL OGridColumn::createClone(  )
 {
     OGridColumn* pNewColumn = createCloneColumn();
     return pNewColumn;
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx
index ec52109711cd..0ea0b1bbc49f 100644
--- a/forms/source/component/Columns.hxx
+++ b/forms/source/component/Columns.hxx
@@ -68,21 +68,21 @@ public:
 
     // UNO binding
     DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OGridColumn_BASE)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelImplementationId();
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& _rIdentifier) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& _rIdentifier) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8>           SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type>   SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8>           SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type>   SAL_CALL getTypes() override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
 
     // XPersistObject
     void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream);
@@ -92,9 +92,8 @@ public:
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override = 0;
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue,
-                                          sal_Int32 nHandle, const css::uno::Any& rValue )
-                                        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override;
+                                          sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
     using OPropertySetAggregationHelper::getFastPropertyValue;
 
@@ -102,7 +101,7 @@ public:
     virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     const OUString& getModelName() const { return m_aModelName; }
 
@@ -122,7 +121,7 @@ public:
     explicit ClassName(const css::uno::Reference<css::uno::XComponentContext>& _rContext );                                            \
     explicit ClassName(const ClassName* _pCloneFrom);                                                                \
                                                                                                             \
-    virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;  \
+    virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;  \
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;                                         \
                                                                                                             \
     virtual void fillProperties(                                                                            \
@@ -143,7 +142,7 @@ ClassName::ClassName( const ClassName* _pCloneFrom ) \
     :OGridColumn( _pCloneFrom ) \
 { \
 } \
-css::uno::Reference< css::beans::XPropertySetInfo>  ClassName::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) \
+css::uno::Reference< css::beans::XPropertySetInfo>  ClassName::getPropertySetInfo() \
 { \
     css::uno::Reference< css::beans::XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) ); \
     return xInfo; \
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 0173e8a0ce03..57ff1e6b2122 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -82,7 +82,7 @@ Sequence<Type> OComboBoxModel::_getTypes()
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OComboBoxModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
 
@@ -107,7 +107,7 @@ css::uno::Sequence<OUString> SAL_CALL OComboBoxModel::getSupportedServiceNames()
 }
 
 
-Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType)
 {
     Any aReturn = OBoundControlModel::queryAggregation( _rType );
     if ( !aReturn.hasValue() )
@@ -200,7 +200,6 @@ void OComboBoxModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) cons
 
 
 void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
-                        throw (Exception, std::exception)
 {
     switch (_nHandle)
     {
@@ -255,7 +254,6 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const
 
 sal_Bool OComboBoxModel::convertFastPropertyValue(
                         Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
-                        throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     bool bModified(false);
     switch (_nHandle)
@@ -309,14 +307,13 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
 }
 
 
-OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OComboBoxModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_COMBOBOX);  // old (non-sun) name for compatibility !
 }
 
 
 void SAL_CALL OComboBoxModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream)
-        throw(css::io::IOException, RuntimeException, std::exception)
 {
     OBoundControlModel::write(_rxOutStream);
 
@@ -353,7 +350,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<css::io::XObjectOutputStream
 }
 
 
-void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, RuntimeException, std::exception)
+void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream)
 {
     OBoundControlModel::read(_rxInStream);
     ControlModelLock aLock( *this );
@@ -686,7 +683,7 @@ void OComboBoxModel::onDisconnectedDbColumn()
 }
 
 
-void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent )
 {
     OBoundControlModel::reloaded(aEvent);
 
@@ -843,7 +840,7 @@ void OComboBoxModel::refreshInternalEntryList()
 }
 
 
-void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException, std::exception )
+void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource )
 {
     if ( !OEntryListHelper::handleDisposing( _rSource ) )
         OBoundControlModel::disposing( _rSource );
@@ -858,7 +855,7 @@ OComboBoxControl::OComboBoxControl(const Reference<XComponentContext>& _rxContex
 }
 
 
-css::uno::Sequence<OUString> SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OComboBoxControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index ecc65a21bd57..776d5e9d4641 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -73,32 +73,29 @@ public:
 
     // OPropertySetHelper
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-                throw (css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
     // XLoadListener
-    virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OComboBoxModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // UNO
     DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
     // XPersistObject
-    virtual OUString SAL_CALL    getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getServiceName() override;
     virtual void SAL_CALL
-        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
     virtual void SAL_CALL
-        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -109,7 +106,7 @@ public:
     ) const 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;
 
     // prevent method hiding
     using OBoundControlModel::getFastPropertyValue;
@@ -135,7 +132,7 @@ protected:
 protected:
     void loadData( bool _bForce );
 
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 class OComboBoxControl : public OBoundControl
@@ -144,11 +141,10 @@ public:
     explicit OComboBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OComboBoxControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 552b94ef735b..c658edc98ada 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -45,7 +45,7 @@ OCurrencyControl::OCurrencyControl(const Reference<XComponentContext>& _rxFactor
 {
 }
 
-css::uno::Sequence<OUString> SAL_CALL OCurrencyControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL OCurrencyControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -133,7 +133,7 @@ IMPLEMENT_DEFAULT_CLONING( OCurrencyModel )
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL OCurrencyModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL OCurrencyModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
 
@@ -165,7 +165,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co
 }
 
 
-OUString SAL_CALL OCurrencyModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OCurrencyModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_CURRENCYFIELD); // old (non-sun) name for compatibility !
 }
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx
index e09c3f2cb78a..61e60ac00e2b 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -35,14 +35,13 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OCurrencyModel );
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OCurrencyModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // css::io::XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -59,7 +58,7 @@ protected:
     virtual void            resetNoBroadcast() override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     void implConstruct();
 };
@@ -69,11 +68,10 @@ class OCurrencyControl: public OBoundControl
 public:
     explicit OCurrencyControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OCurrencyControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 2cad1f8431fa..32bda101a149 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -191,13 +191,13 @@ void OFormSubmitResetThread::processEvent(
 
 //= ODatabaseForm
 
-Sequence<sal_Int8> SAL_CALL ODatabaseForm::getImplementationId() throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL ODatabaseForm::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 
-Sequence<Type> SAL_CALL ODatabaseForm::getTypes() throw(RuntimeException, std::exception)
+Sequence<Type> SAL_CALL ODatabaseForm::getTypes()
 {
     // ask the aggregate
     Sequence<Type> aAggregateTypes;
@@ -213,7 +213,7 @@ Sequence<Type> SAL_CALL ODatabaseForm::getTypes() throw(RuntimeException, std::e
 }
 
 
-Any SAL_CALL ODatabaseForm::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception)
+Any SAL_CALL ODatabaseForm::queryAggregation(const Type& _rType)
 {
     Any aReturn = ODatabaseForm_BASE1::queryInterface(_rType);
     // our own interfaces
@@ -1370,49 +1370,49 @@ Reference< XMultiPropertySet > ODatabaseForm::getPropertiesInterface()
 }
 
 
-Reference< XPropertySetInfo > ODatabaseForm::getPropertySetInfo() throw( RuntimeException, std::exception )
+Reference< XPropertySetInfo > ODatabaseForm::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() );
 }
 
 
-void SAL_CALL ODatabaseForm::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseForm::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue )
 {
     m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue );
 }
 
 
-void SAL_CALL ODatabaseForm::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseForm::removeProperty( const OUString& _rName )
 {
     m_aPropertyBagHelper.removeProperty( _rName );
 }
 
 
-Sequence< PropertyValue > SAL_CALL ODatabaseForm::getPropertyValues() throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL ODatabaseForm::getPropertyValues()
 {
     return m_aPropertyBagHelper.getPropertyValues();
 }
 
 
-void SAL_CALL ODatabaseForm::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseForm::setPropertyValues( const Sequence< PropertyValue >& _rProps )
 {
     m_aPropertyBagHelper.setPropertyValues( _rProps );
 }
 
 
-Any SAL_CALL ODatabaseForm::getWarnings(  ) throw (SQLException, RuntimeException, std::exception)
+Any SAL_CALL ODatabaseForm::getWarnings(  )
 {
     return m_aWarnings.getWarnings();
 }
 
 
-void SAL_CALL ODatabaseForm::clearWarnings(  ) throw (SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseForm::clearWarnings(  )
 {
     m_aWarnings.clearWarnings();
 }
 
 
-Reference< XCloneable > SAL_CALL ODatabaseForm::createClone(  ) throw (RuntimeException, std::exception)
+Reference< XCloneable > SAL_CALL ODatabaseForm::createClone(  )
 {
     ODatabaseForm* pClone = new ODatabaseForm( *this );
     osl_atomic_increment( &pClone->m_refCount );
@@ -1461,7 +1461,6 @@ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any
 
 
 Any SAL_CALL ODatabaseForm::getFastPropertyValue( sal_Int32 nHandle )
-       throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     if ((nHandle == PROPERTY_ID_ISMODIFIED) && (m_nResetsPending > 0))
         return css::uno::Any(false);
@@ -1553,7 +1552,6 @@ void ODatabaseForm::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 
 sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
                                                 sal_Int32 nHandle, const Any& rValue )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     bool bModified(false);
     switch (nHandle)
@@ -1635,7 +1633,7 @@ sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOl
     return bModified;
 }
 
-void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception, std::exception )
+void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     switch (nHandle)
     {
@@ -1890,7 +1888,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
 
 // css::form::XReset
 
-void SAL_CALL ODatabaseForm::reset() throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::reset()
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
 
@@ -2049,13 +2047,13 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
 }
 
 
-void SAL_CALL ODatabaseForm::addResetListener(const Reference<XResetListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::addResetListener(const Reference<XResetListener>& _rListener)
 {
     m_aResetListeners.addTypedListener( _rListener );
 }
 
 
-void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener>& _rListener)
 {
     m_aResetListeners.removeTypedListener( _rListener );
 }
@@ -2064,7 +2062,7 @@ void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener>
 // css::form::XSubmit
 
 void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control,
-                              const css::awt::MouseEvent& MouseEvt ) throw( RuntimeException, std::exception )
+                              const css::awt::MouseEvent& MouseEvt )
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -2263,13 +2261,13 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const css::a
 
 // XSubmit
 
-void SAL_CALL ODatabaseForm::addSubmitListener(const Reference<XSubmitListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::addSubmitListener(const Reference<XSubmitListener>& _rListener)
 {
     m_aSubmitListeners.addInterface(_rListener);
 }
 
 
-void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListener>& _rListener)
 {
     m_aSubmitListeners.removeInterface(_rListener);
 }
@@ -2277,13 +2275,13 @@ void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListene
 
 // css::sdbc::XSQLErrorBroadcaster
 
-void SAL_CALL ODatabaseForm::addSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::addSQLErrorListener(const Reference<XSQLErrorListener>& _rListener)
 {
     m_aErrorListeners.addInterface(_rListener);
 }
 
 
-void SAL_CALL ODatabaseForm::removeSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::removeSQLErrorListener(const Reference<XSQLErrorListener>& _rListener)
 {
     m_aErrorListeners.removeInterface(_rListener);
 }
@@ -2298,7 +2296,7 @@ void ODatabaseForm::invlidateParameters()
 
 // OChangeListener
 
-void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException )
+void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt)
 {
     if (evt.PropertyName == PROPERTY_ACTIVE_CONNECTION && !m_bForwardingConnection)
     {
@@ -2317,7 +2315,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt
 
 // smartXChild
 
-void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw ( css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
+void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInterface>& Parent)
 {
     // SYNCHRONIZED ----->
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -2378,7 +2376,7 @@ void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInte
 
 // smartXTabControllerModel
 
-sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseForm::getGroupControl()
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
 
@@ -2397,7 +2395,7 @@ sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(css::uno::RuntimeExcept
 }
 
 
-void SAL_CALL ODatabaseForm::setControlModels(const Sequence<Reference<XControlModel> >& rControls) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setControlModels(const Sequence<Reference<XControlModel> >& rControls)
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
 
@@ -2434,14 +2432,14 @@ void SAL_CALL ODatabaseForm::setControlModels(const Sequence<Reference<XControlM
 }
 
 
-Sequence<Reference<XControlModel> > SAL_CALL ODatabaseForm::getControlModels() throw( RuntimeException, std::exception )
+Sequence<Reference<XControlModel> > SAL_CALL ODatabaseForm::getControlModels()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pGroupManager->getControlModels();
 }
 
 
-void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const OUString& Name ) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const OUString& Name )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -2470,14 +2468,14 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >
 }
 
 
-sal_Int32 SAL_CALL ODatabaseForm::getGroupCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ODatabaseForm::getGroupCount()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pGroupManager->getGroupCount();
 }
 
 
-void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XControlModel> >& _rGroup, OUString& _rName ) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XControlModel> >& _rGroup, OUString& _rName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     _rGroup.realloc(0);
@@ -2489,7 +2487,7 @@ void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XCon
 }
 
 
-void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Reference<XControlModel>  >& _rGroup) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Reference<XControlModel>  >& _rGroup)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     _rGroup.realloc(0);
@@ -2499,7 +2497,7 @@ void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Refe
 
 // css::lang::XEventListener
 
-void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::disposing(const EventObject& Source)
 {
     // does the call come from the connection which we are sharing with our parent?
     if ( isSharingConnection() )
@@ -2540,7 +2538,7 @@ void ODatabaseForm::impl_createLoadTimer()
 
 // css::form::XLoadListener
 
-void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/)
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -2554,7 +2552,7 @@ void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( Runtim
 }
 
 
-void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/)
 {
     {
         // now stop the rowset listening if we are a subform
@@ -2572,13 +2570,13 @@ void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( Run
 }
 
 
-void SAL_CALL ODatabaseForm::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::unloaded(const EventObject& /*aEvent*/)
 {
     // nothing to do
 }
 
 
-void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/)
 {
     // now stop the rowset listening if we are a subform
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2591,7 +2589,7 @@ void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( Run
 }
 
 
-void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/)
 {
     reload_impl(true);
     {
@@ -2611,7 +2609,7 @@ IMPL_LINK_NOARG(ODatabaseForm, OnTimeout, Timer *, void)
 
 // css::form::XLoadable
 
-void SAL_CALL ODatabaseForm::load() throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::load()
 {
     load_impl(false);
 }
@@ -2799,7 +2797,7 @@ bool ODatabaseForm::implEnsureConnection()
 }
 
 
-void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) throw( RuntimeException, std::exception )
+void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
 
@@ -2848,7 +2846,7 @@ void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const
 }
 
 
-void SAL_CALL ODatabaseForm::unload() throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::unload()
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
     if (!isLoaded())
@@ -2895,13 +2893,13 @@ void SAL_CALL ODatabaseForm::unload() throw( RuntimeException, std::exception )
 }
 
 
-void SAL_CALL ODatabaseForm::reload() throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::reload()
 {
     reload_impl(true);
 }
 
 
-void ODatabaseForm::reload_impl(bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) throw( RuntimeException, std::exception )
+void ODatabaseForm::reload_impl(bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
     if (!isLoaded())
@@ -2956,26 +2954,26 @@ void ODatabaseForm::reload_impl(bool bMoveToFirst, const Reference< XInteraction
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::isLoaded() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::isLoaded()
 {
     return m_bLoaded;
 }
 
 
-void SAL_CALL ODatabaseForm::addLoadListener(const Reference<XLoadListener>& aListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::addLoadListener(const Reference<XLoadListener>& aListener)
 {
     m_aLoadListeners.addInterface(aListener);
 }
 
 
-void SAL_CALL ODatabaseForm::removeLoadListener(const Reference<XLoadListener>& aListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::removeLoadListener(const Reference<XLoadListener>& aListener)
 {
     m_aLoadListeners.removeInterface(aListener);
 }
 
 
 // css::sdbc::XCloseable
-void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::close()
 {
     // unload will close the aggregate
     unload();
@@ -2984,7 +2982,7 @@ void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException, std:
 
 // css::sdbc::XRowSetListener
 
-void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/)
 {
     // reload the subform with the new parameters of the parent
     // do this handling delayed to provide of execute too many SQL Statements
@@ -3002,13 +3000,13 @@ void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( Ru
 }
 
 
-void SAL_CALL ODatabaseForm::rowChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::rowChanged(const EventObject& /*event*/)
 {
     // ignore it
 }
 
 
-void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/)
 {
     // not interested in :
     // if our parent is an ODatabaseForm, too, then after this rowSetChanged we'll get a "reloaded"
@@ -3058,7 +3056,7 @@ bool ODatabaseForm::impl_approveRowChange_throw( const EventObject& _rEvent, con
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event)
 {
     // is our aggregate calling?
     if (event.Source == css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this)))
@@ -3107,7 +3105,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) thr
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event)
 {
     // is our aggregate calling?
     if (event.Source == css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this)))
@@ -3147,7 +3145,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) t
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event)
 {
     if (event.Source == css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this))) // ignore our aggregate as we handle this approve ourself
     {
@@ -3176,7 +3174,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) t
 
 // css::sdb::XRowSetApproveBroadcaster
 
-void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener)
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
     m_aRowSetApproveListeners.addInterface(_rListener);
@@ -3194,7 +3192,7 @@ void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApp
 }
 
 
-void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener)
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
     // do we have to remove the multiplex ?
@@ -3213,24 +3211,24 @@ void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference<XRowSet
 
 // com::sun:star::form::XDatabaseParameterBroadcaster
 
-void SAL_CALL ODatabaseForm::addDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::addDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener)
 {
     m_aParameterManager.addParameterListener( _rListener );
 }
 
-void SAL_CALL ODatabaseForm::removeDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::removeDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener)
 {
     m_aParameterManager.removeParameterListener( _rListener );
 }
 
 
-void SAL_CALL ODatabaseForm::addParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::addParameterListener(const Reference<XDatabaseParameterListener>& _rListener)
 {
     ODatabaseForm::addDatabaseParameterListener( _rListener );
 }
 
 
-void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabaseParameterListener>& _rListener)
 {
     ODatabaseForm::removeDatabaseParameterListener( _rListener );
 }
@@ -3238,7 +3236,7 @@ void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabasePa
 
 // css::sdb::XCompletedExecution
 
-void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler )
 {
     ::osl::ClearableMutexGuard aGuard(m_aMutex);
     // the difference between execute and load is, that we position on the first row in case of load
@@ -3262,7 +3260,7 @@ void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractio
 
 // css::sdbc::XRowSet
 
-void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::execute()
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
     // if somebody calls an execute and we're not loaded we reroute this call to our load method.
@@ -3286,14 +3284,14 @@ void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException, st
 }
 
 
-void SAL_CALL ODatabaseForm::addRowSetListener(const Reference<XRowSetListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::addRowSetListener(const Reference<XRowSetListener>& _rListener)
 {
     if (m_xAggregateAsRowSet.is())
         m_xAggregateAsRowSet->addRowSetListener(_rListener);
 }
 
 
-void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListener>& _rListener) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListener>& _rListener)
 {
     if (m_xAggregateAsRowSet.is())
         m_xAggregateAsRowSet->removeRowSetListener(_rListener);
@@ -3302,109 +3300,109 @@ void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListene
 
 // css::sdbc::XResultSet
 
-sal_Bool SAL_CALL ODatabaseForm::next() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::next()
 {
     return m_xAggregateAsRowSet->next();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::isBeforeFirst() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::isBeforeFirst()
 {
     return m_xAggregateAsRowSet->isBeforeFirst();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::isAfterLast() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::isAfterLast()
 {
     return m_xAggregateAsRowSet->isAfterLast();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::isFirst() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::isFirst()
 {
     return m_xAggregateAsRowSet->isFirst();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::isLast() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::isLast()
 {
     return m_xAggregateAsRowSet->isLast();
 }
 
 
-void SAL_CALL ODatabaseForm::beforeFirst() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::beforeFirst()
 {
     m_xAggregateAsRowSet->beforeFirst();
 }
 
 
-void SAL_CALL ODatabaseForm::afterLast() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::afterLast()
 {
     m_xAggregateAsRowSet->afterLast();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::first() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::first()
 {
     return m_xAggregateAsRowSet->first();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::last() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::last()
 {
     return m_xAggregateAsRowSet->last();
 }
 
 
-sal_Int32 SAL_CALL ODatabaseForm::getRow() throw( SQLException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL ODatabaseForm::getRow()
 {
     return m_xAggregateAsRowSet->getRow();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::absolute(sal_Int32 row) throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::absolute(sal_Int32 row)
 {
     return m_xAggregateAsRowSet->absolute(row);
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::relative(sal_Int32 rows) throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::relative(sal_Int32 rows)
 {
     return m_xAggregateAsRowSet->relative(rows);
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::previous() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::previous()
 {
     return m_xAggregateAsRowSet->previous();
 }
 
 
-void SAL_CALL ODatabaseForm::refreshRow() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::refreshRow()
 {
     m_xAggregateAsRowSet->refreshRow();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::rowUpdated() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::rowUpdated()
 {
     return m_xAggregateAsRowSet->rowUpdated();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::rowInserted() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::rowInserted()
 {
     return m_xAggregateAsRowSet->rowInserted();
 }
 
 
-sal_Bool SAL_CALL ODatabaseForm::rowDeleted() throw( SQLException, RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::rowDeleted()
 {
     return m_xAggregateAsRowSet->rowDeleted();
 }
 
 
-css::uno::Reference<css::uno::XInterface> SAL_CALL ODatabaseForm::getStatement() throw( SQLException, RuntimeException, std::exception )
+css::uno::Reference<css::uno::XInterface> SAL_CALL ODatabaseForm::getStatement()
 {
     return m_xAggregateAsRowSet->getStatement();
 }
@@ -3412,7 +3410,7 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL ODatabaseForm::getStatement()
 // css::sdbc::XResultSetUpdate
 // exceptions during insert update and delete will be forwarded to the errorlistener
 
-void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::insertRow()
 {
     try
     {
@@ -3432,7 +3430,7 @@ void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException,
 }
 
 
-void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::updateRow()
 {
     try
     {
@@ -3452,7 +3450,7 @@ void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException,
 }
 
 
-void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::deleteRow()
 {
     try
     {
@@ -3472,7 +3470,7 @@ void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException,
 }
 
 
-void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::cancelRowUpdates()
 {
     try
     {
@@ -3492,7 +3490,7 @@ void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeExce
 }
 
 
-void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::moveToInsertRow()
 {
     Reference<XResultSetUpdate>  xUpdate;
     if (query_aggregation( m_xAggregate, xUpdate))
@@ -3527,7 +3525,7 @@ void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeExcep
 }
 
 
-void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::moveToCurrentRow()
 {
     Reference<XResultSetUpdate>  xUpdate;
     if (query_aggregation( m_xAggregate, xUpdate))
@@ -3536,7 +3534,7 @@ void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeExce
 
 // css::sdbcx::XDeleteRows
 
-Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows) throw( SQLException, RuntimeException, std::exception )
+Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows)
 {
     try
     {
@@ -3559,145 +3557,145 @@ Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows
 
 // css::sdbc::XParameters
 
-void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType)
 {
     m_aParameterManager.setNull(parameterIndex, sqlType);
 }
 
 
-void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName)
 {
     m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName);
 }
 
 
-void SAL_CALL ODatabaseForm::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setBoolean(sal_Int32 parameterIndex, sal_Bool x)
 {
     m_aParameterManager.setBoolean(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setByte(sal_Int32 parameterIndex, sal_Int8 x)
 {
     m_aParameterManager.setByte(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setShort(sal_Int32 parameterIndex, sal_Int16 x)
 {
     m_aParameterManager.setShort(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setInt(sal_Int32 parameterIndex, sal_Int32 x)
 {
     m_aParameterManager.setInt(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setLong(sal_Int32 parameterIndex, sal_Int64 x)
 {
     m_aParameterManager.setLong(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setFloat(sal_Int32 parameterIndex, float x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setFloat(sal_Int32 parameterIndex, float x)
 {
     m_aParameterManager.setFloat(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setDouble(sal_Int32 parameterIndex, double x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setDouble(sal_Int32 parameterIndex, double x)
 {
     m_aParameterManager.setDouble(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const OUString& x)
 {
     m_aParameterManager.setString(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x)
 {
     m_aParameterManager.setBytes(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setDate(sal_Int32 parameterIndex, const css::util::Date& x)
 {
     m_aParameterManager.setDate(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setTime(sal_Int32 parameterIndex, const css::util::Time& x)
 {
     m_aParameterManager.setTime(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x)
 {
     m_aParameterManager.setTimestamp(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setBinaryStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setBinaryStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length)
 {
     m_aParameterManager.setBinaryStream(parameterIndex, x, length);
 }
 
 
-void SAL_CALL ODatabaseForm::setCharacterStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setCharacterStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length)
 {
     m_aParameterManager.setCharacterStream(parameterIndex, x, length);
 }
 
 
-void SAL_CALL ODatabaseForm::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale)
 {
     m_aParameterManager.setObjectWithInfo(parameterIndex, x, targetSqlType, scale);
 }
 
 
-void SAL_CALL ODatabaseForm::setObject(sal_Int32 parameterIndex, const Any& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setObject(sal_Int32 parameterIndex, const Any& x)
 {
     m_aParameterManager.setObject(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setRef(sal_Int32 parameterIndex, const Reference<XRef>& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setRef(sal_Int32 parameterIndex, const Reference<XRef>& x)
 {
     m_aParameterManager.setRef(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setBlob(sal_Int32 parameterIndex, const Reference<XBlob>& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setBlob(sal_Int32 parameterIndex, const Reference<XBlob>& x)
 {
     m_aParameterManager.setBlob(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setClob(sal_Int32 parameterIndex, const Reference<XClob>& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setClob(sal_Int32 parameterIndex, const Reference<XClob>& x)
 {
     m_aParameterManager.setClob(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::setArray(sal_Int32 parameterIndex, const Reference<XArray>& x) throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setArray(sal_Int32 parameterIndex, const Reference<XArray>& x)
 {
     m_aParameterManager.setArray(parameterIndex, x);
 }
 
 
-void SAL_CALL ODatabaseForm::clearParameters() throw( SQLException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::clearParameters()
 {
     m_aParameterManager.clearParameters();
 }
 
 
-void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt )
 {
     if ( evt.Source == m_xParent )
     {
@@ -3715,13 +3713,13 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th
 
 // css::lang::XServiceInfo
 
-OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL ODatabaseForm::getImplementationName()
 {
     return OUString( "com.sun.star.comp.forms.ODatabaseForm" );
 }
 
 
-Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames()
 {
     // the services of our aggregate
     Sequence< OUString > aServices;
@@ -3739,7 +3737,7 @@ Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( R
     );
 }
 
-sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -3748,12 +3746,12 @@ sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) th
 const sal_uInt16 CYCLE              = 0x0001;
 const sal_uInt16 DONTAPPLYFILTER    = 0x0002;
 
-OUString ODatabaseForm::getServiceName() throw( RuntimeException, std::exception )
+OUString ODatabaseForm::getServiceName()
 {
     return OUString(FRM_COMPONENT_FORM);  // old (non-sun) name for compatibility !
 }
 
-void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutStream) throw( IOException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     DBG_ASSERT(m_xAggregateSet.is(), "ODatabaseForm::write : only to be called if the aggregate exists !");
 
@@ -3868,7 +3866,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
 }
 
 
-void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStream) throw( IOException, RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     DBG_ASSERT(m_xAggregateSet.is(), "ODatabaseForm::read : only to be called if the aggregate exists !");
 
@@ -3991,7 +3989,7 @@ void ODatabaseForm::implRemoved(const css::uno::Reference<css::uno::XInterface>&
     }
 }
 
-void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent)
 {
     // give it to my own error listener
     onError(_rEvent);
@@ -4000,7 +3998,7 @@ void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( R
 }
 
 // css::container::XNamed
-OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException, std::exception )
+OUString SAL_CALL ODatabaseForm::getName()
 {
     OUString sReturn;
     try
@@ -4018,7 +4016,7 @@ OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException, std::excepti
     return sReturn;
 }
 
-void SAL_CALL ODatabaseForm::setName(const OUString& aName) throw( RuntimeException, std::exception )
+void SAL_CALL ODatabaseForm::setName(const OUString& aName)
 {
     setFastPropertyValue(PROPERTY_ID_NAME, makeAny(aName));
 }
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index f041f5139b7e..4f46a2dd3ce7 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -219,24 +219,23 @@ public:
 
     // UNO binding
     DECLARE_UNO3_AGG_DEFAULTS(ODatabaseForm, OFormComponents)
-    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
     // css::lang::XComponent
     virtual void SAL_CALL disposing() override;
 
     // property handling
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
-    virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception ) override;
+    virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
-    css::uno::Any  SAL_CALL getFastPropertyValue( sal_Int32 nHandle )
-       throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) override;
     void fire( sal_Int32 * pnHandles, const css::uno::Any * pNewValues, const css::uno::Any * pOldValues, sal_Int32 nCount );
 
     // IPropertyBagHelperContext
@@ -254,178 +253,178 @@ public:
     virtual css::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const override;
 
     // css::sdbc::XSQLErrorBroadcaster
-    virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) override;
+    virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) override;
 
     // css::form::XForm
     // nothing to implement
 
     // css::form::XReset
-    virtual void SAL_CALL reset() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reset() override;
+    virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override;
+    virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override;
 
     // css::form::XSubmit
-    virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl>& aControl, const css::awt::MouseEvent& aMouseEvt) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl>& aControl, const css::awt::MouseEvent& aMouseEvt) override;
+    virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) override;
+    virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) override;
 
     // css::container::XChild
-    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw ( css::uno::RuntimeException, std::exception) override { return OFormComponents::getParent(); }
-    virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw (::css::lang::NoSupportException , css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() override { return OFormComponents::getParent(); }
+    virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) override;
 
     // css::container::XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& aName) override;
 
     // css::awt::XTabControllerModel
-    virtual sal_Bool SAL_CALL getGroupControl() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) throw(css::uno::RuntimeException, std::exception) override { }
-    virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rControls) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, const OUString& _rGroupName) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getGroupCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL getGroup(sal_Int32 _nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup, OUString& _rName) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL getGroupByName(const OUString& _rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getGroupControl() override;
+    virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) override { }
+    virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rControls) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels() override;
+    virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, const OUString& _rGroupName) override;
+    virtual sal_Int32 SAL_CALL getGroupCount() override;
+    virtual void SAL_CALL getGroup(sal_Int32 _nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup, OUString& _rName) override;
+    virtual void SAL_CALL getGroupByName(const OUString& _rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup) override;
 
     // css::lang::XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
 
     // css::form::XLoadListener
-    virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) override;
+    virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) override;
+    virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) override;
+    virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) override;
+    virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) override;
 
     // css::form::XLoadable
-    virtual void SAL_CALL load() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unload() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL reload() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLoaded() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL load() override;
+    virtual void SAL_CALL unload() override;
+    virtual void SAL_CALL reload() override;
+    virtual sal_Bool SAL_CALL isLoaded() override;
+    virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) override;
+    virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) override;
 
     // css::sdbc::XCloseable
-    virtual void SAL_CALL close() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close() override;
 
     // css::sdbc::XRowSetListener
-    virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) override;
+    virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) override;
+    virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) override;
 
     // css::sdb::XRowSetApproveListener
-    virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL approveRowChange(const css::sdb::RowChangeEvent& event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) override;
+    virtual sal_Bool SAL_CALL approveRowChange(const css::sdb::RowChangeEvent& event) override;
+    virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) override;
 
     // css::sdb::XRowSetApproveBroadcaster
-    virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) override;
+    virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) override;
 
     // com::sun:star::form::XDatabaseParameterBroadcaster2
-    virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) override;
+    virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) override;
 
     // com::sun:star::form::XDatabaseParameterBroadcaster
-    virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) override;
+    virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) override;
 
     // css::sdbc::XRowSet
-    virtual void SAL_CALL execute() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL execute() override;
+    virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) override;
+    virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) override;
 
     // css::sdb::XCompletedExecution
-    virtual void SAL_CALL executeWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL executeWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) override;
 
     // css::sdbc::XResultSet
-    virtual sal_Bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isBeforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAfterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL beforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL afterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL previous() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL refreshRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL rowUpdated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL rowInserted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL rowDeleted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getStatement() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL next() override;
+    virtual sal_Bool SAL_CALL isBeforeFirst() override;
+    virtual sal_Bool SAL_CALL isAfterLast() override;
+    virtual sal_Bool SAL_CALL isFirst() override;
+    virtual sal_Bool SAL_CALL isLast() override;
+    virtual void SAL_CALL beforeFirst() override;
+    virtual void SAL_CALL afterLast() override;
+    virtual sal_Bool SAL_CALL first() override;
+    virtual sal_Bool SAL_CALL last() override;
+    virtual sal_Int32 SAL_CALL getRow() override;
+    virtual sal_Bool SAL_CALL absolute(sal_Int32 row) override;
+    virtual sal_Bool SAL_CALL relative(sal_Int32 rows) override;
+    virtual sal_Bool SAL_CALL previous() override;
+    virtual void SAL_CALL refreshRow() override;
+    virtual sal_Bool SAL_CALL rowUpdated() override;
+    virtual sal_Bool SAL_CALL rowInserted() override;
+    virtual sal_Bool SAL_CALL rowDeleted() override;
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getStatement() override;
 
     // css::sdbc::XResultSetUpdate
-    virtual void SAL_CALL insertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancelRowUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveToInsertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveToCurrentRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertRow() override;
+    virtual void SAL_CALL updateRow() override;
+    virtual void SAL_CALL deleteRow() override;
+    virtual void SAL_CALL cancelRowUpdates() override;
+    virtual void SAL_CALL moveToInsertRow() override;
+    virtual void SAL_CALL moveToCurrentRow() override;
 
     // css::sdbcx::XDeleteRows
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any>& rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any>& rows) override;
 
     // css::lang::XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)  throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getImplementationName()  throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::io::XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // css::sdbc::XSQLErrorListener
-    virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) override;
 
     // css::sdbc::XParameters
-    virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearParameters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) override;
+    virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) override;
+    virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) override;
+    virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) override;
+    virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) override;
+    virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) override;
+    virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) override;
+    virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) override;
+    virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) override;
+    virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) override;
+    virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) override;
+    virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) override;
+    virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) override;
+    virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) override;
+    virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) override;
+    virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) override;
+    virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) override;
+    virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) override;
+    virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef>& x) override;
+    virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob>& x) override;
+    virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob>& x) override;
+    virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray>& x) override;
+    virtual void SAL_CALL clearParameters() override;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
     // XPropertyContainer
-    virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) override;
+    virtual void SAL_CALL removeProperty( const OUString& Name ) override;
 
     // XPropertyAccess
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
     using OPropertySetAggregationHelper::setPropertyValues;
 
     // XWarningsSupplier
-    virtual css::uno::Any SAL_CALL getWarnings(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearWarnings(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+    virtual void SAL_CALL clearWarnings(  ) override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
 protected:
     // OPropertySetAggregationHelper overridables
@@ -437,7 +436,7 @@ protected:
     virtual void implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject) override;
 
     // OPropertyChangeListener
-    virtual void _propertyChanged( const css::beans::PropertyChangeEvent& ) throw(css::uno::RuntimeException) override;
+    virtual void _propertyChanged( const css::beans::PropertyChangeEvent& ) override;
 
 private:
     bool executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifies, bool bMoveToFirst,
@@ -450,12 +449,10 @@ private:
     // impl methods
     /// @throws css::uno::RuntimeException
     void    load_impl(bool bCausedByParentForm, bool bMoveToFirst = true,
-        const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >())
-        throw(css::uno::RuntimeException, std::exception);
+        const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >());
     /// @throws css::uno::RuntimeException
     void    reload_impl(bool bMoveToFirst,
-        const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >())
-        throw(css::uno::RuntimeException, std::exception);
+        const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >());
     void    submit_impl(const css::uno::Reference< css::awt::XControl>& Control, const css::awt::MouseEvent& MouseEvt);
     void    reset_impl(bool _bAproveByListeners);
 
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index e4f9874604be..5ef5a02284b4 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -56,7 +56,7 @@ Sequence<Type> ODateControl::_getTypes()
 }
 
 
-css::uno::Sequence<OUString> SAL_CALL ODateControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL ODateControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -120,7 +120,7 @@ IMPLEMENT_DEFAULT_CLONING( ODateModel )
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
 
@@ -145,7 +145,7 @@ css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames() thr
 }
 
 
-OUString SAL_CALL ODateModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ODateModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility !
 }
@@ -181,7 +181,7 @@ void SAL_CALL ODateModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle
 
 
 sal_Bool SAL_CALL ODateModel::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue,
-        sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, RuntimeException, std::exception)
+        sal_Int32 _nHandle, const Any& _rValue )
 {
     if (PROPERTY_ID_FORMATKEY == _nHandle)
         return convertFormatKeyPropertyValue(_rConvertedValue, _rOldValue, _rValue);
@@ -190,7 +190,7 @@ sal_Bool SAL_CALL ODateModel::convertFastPropertyValue(Any& _rConvertedValue, An
 }
 
 
-void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( css::uno::Exception, std::exception)
+void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
 {
     if (PROPERTY_ID_FORMATKEY == _nHandle)
         setFormatKeyPropertyValue(_rValue);
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index b819016a7396..59a4a94b8543 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -41,21 +41,19 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( ODateModel );
 
     // XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // css::beans::XPropertySet
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue,
-                                          sal_Int32 nHandle, const css::uno::Any& rValue )
-                                        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override;
+                                          sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.ODateModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XPropertySet
     using OEditBaseModel::getFastPropertyValue;
@@ -86,7 +84,7 @@ protected:
     virtual void            onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 class ODateControl: public OBoundControl
@@ -99,11 +97,10 @@ public:
     DECLARE_UNO3_AGG_DEFAULTS(ODateControl, OBoundControl)
 
 // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.ODateControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 76a2ceaee79b..fa4de8afddf3 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -72,7 +72,7 @@ Sequence<Type> OEditControl::_getTypes()
 }
 
 
-Any SAL_CALL OEditControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OEditControl::queryAggregation(const Type& _rType)
 {
     Any aReturn = OBoundControl::queryAggregation(_rType);
     if (!aReturn.hasValue())
@@ -116,13 +116,13 @@ OEditControl::~OEditControl()
 
 // XChangeBroadcaster
 
-void OEditControl::addChangeListener(const Reference<XChangeListener>& l) throw ( css::uno::RuntimeException, std::exception)
+void OEditControl::addChangeListener(const Reference<XChangeListener>& l)
 {
     m_aChangeListeners.addInterface( l );
 }
 
 
-void OEditControl::removeChangeListener(const Reference<XChangeListener>& l) throw ( css::uno::RuntimeException, std::exception)
+void OEditControl::removeChangeListener(const Reference<XChangeListener>& l)
 {
     m_aChangeListeners.removeInterface( l );
 }
@@ -139,7 +139,7 @@ void OEditControl::disposing()
 
 // XServiceInfo
 
-css::uno::Sequence<OUString>  OEditControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString>  OEditControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 3);
@@ -153,14 +153,14 @@ css::uno::Sequence<OUString>  OEditControl::getSupportedServiceNames() throw(std
 
 // XEventListener
 
-void OEditControl::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+void OEditControl::disposing(const EventObject& Source)
 {
     OBoundControl::disposing(Source);
 }
 
 // XFocusListener
 
-void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( css::uno::RuntimeException, std::exception)
+void OEditControl::focusGained( const FocusEvent& /*e*/ )
 {
     Reference<XPropertySet>  xSet(getModel(), UNO_QUERY);
     if (xSet.is())
@@ -168,7 +168,7 @@ void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( css::uno::Runt
 }
 
 
-void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( css::uno::RuntimeException, std::exception)
+void OEditControl::focusLost( const FocusEvent& /*e*/ )
 {
     Reference<XPropertySet>  xSet(getModel(), UNO_QUERY);
     if (xSet.is())
@@ -185,7 +185,7 @@ void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( css::uno::Runtim
 
 // XKeyListener
 
-void OEditControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception)
+void OEditControl::keyPressed(const css::awt::KeyEvent& e)
 {
     if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 )
         return;
@@ -242,7 +242,7 @@ void OEditControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::Run
 }
 
 
-void OEditControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css::uno::RuntimeException, std::exception)
+void OEditControl::keyReleased(const css::awt::KeyEvent& /*e*/)
 {
 }
 
@@ -307,14 +307,14 @@ void OEditModel::disposing()
 
 // XPersistObject
 
-OUString SAL_CALL OEditModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OEditModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_EDIT);  // old (non-sun) name for compatibility !
 }
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL OEditModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL OEditModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
 
@@ -393,7 +393,7 @@ bool OEditModel::implActsAsRichText( ) const
 }
 
 
-void SAL_CALL OEditModel::reset(  ) throw(RuntimeException, std::exception)
+void SAL_CALL OEditModel::reset(  )
 {
     // no reset if we currently act as rich text control
     if ( implActsAsRichText() )
@@ -514,7 +514,7 @@ void OEditModel::readAggregate( const Reference< XObjectInputStream >& _rxInStre
 }
 
 
-void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     Any aCurrentText;
     sal_Int16 nOldTextLen = 0;
@@ -544,7 +544,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw
 }
 
 
-void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     OEditBaseModel::read(_rxInStream);
 
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index 5430920ce335..97d7a4f1b755 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -57,22 +57,21 @@ public:
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
     // XPersistObject
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // XPropertySet
     using OBoundControlModel::getFastPropertyValue;
 
     // XReset
-    virtual void SAL_CALL reset(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reset(  ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OEditModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -104,7 +103,7 @@ protected:
 protected:
     virtual sal_uInt16 getPersistenceFlags() const override;
 
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
 private:
     bool    implActsAsRichText( ) const;
@@ -131,7 +130,7 @@ public:
     virtual ~OEditControl() override;
 
     DECLARE_UNO3_AGG_DEFAULTS(OEditControl, OBoundControl)
-    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
     virtual css::uno::Sequence< css::uno::Type> _getTypes() override;
 
@@ -139,26 +138,25 @@ public:
     virtual void SAL_CALL disposing() override;
 
 // css::lang::XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
 
 // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OEditControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 // css::form::XChangeBroadcaster
-    virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) override;
+    virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) override;
 
 // css::awt::XFocusListener
-    virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override;
+    virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override;
 
 // css::awt::XKeyListener
-    virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) override;
+    virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) override;
 
     // XControl
     using OBoundControl::createPeer;
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index 3cde33ea2b20..aedecc889582 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -85,7 +85,7 @@ OEditBaseModel::~OEditBaseModel( )
 
 // XPersist
 
-void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     OBoundControlModel::write(_rxOutStream);
 
@@ -159,7 +159,7 @@ sal_uInt16 OEditBaseModel::getPersistenceFlags() const
 }
 
 
-void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     OBoundControlModel::read(_rxInStream);
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -293,7 +293,6 @@ void OEditBaseModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
 
 sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
                                             sal_Int32 nHandle, const Any& rValue )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     bool bModified(false);
     switch (nHandle)
@@ -326,7 +325,7 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rO
     return bModified;
 }
 
-void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( css::uno::Exception, std::exception)
+void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     switch (nHandle)
     {
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 07605ac0e4ee..96e5560a7ee3 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -69,15 +69,14 @@ public:
     virtual ~OEditBaseModel() override;
 
     // XPersistObject
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // XPropertySet
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue,
-                                          sal_Int32 nHandle, const css::uno::Any& rValue )
-                                        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override;
+                                          sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
     // XPropertyState
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index f255dbb3868e..dd3e16c951bd 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -55,7 +55,7 @@ OComponentEventThread::~OComponentEventThread()
     impl_clearEventQueue();
 }
 
-Any SAL_CALL OComponentEventThread::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OComponentEventThread::queryInterface(const Type& _rType)
 {
     Any aReturn;
 
@@ -80,7 +80,7 @@ void OComponentEventThread::impl_clearEventQueue()
     m_aFlags.erase( m_aFlags.begin(), m_aFlags.end() );
 }
 
-void OComponentEventThread::disposing( const EventObject& evt ) throw ( css::uno::RuntimeException, std::exception)
+void OComponentEventThread::disposing( const EventObject& evt )
 {
     if( evt.Source == static_cast<XWeak*>(m_xComp.get()) )
     {
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index e83b3bbb9592..f6aa8d8799d7 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -84,7 +84,7 @@ public:
 
     // UNO Anbindung
     DECLARE_UNO3_DEFAULTS(OComponentEventThread, OWeakObject)
-    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
     explicit OComponentEventThread(::cppu::OComponentHelper* pCompImpl);
     virtual ~OComponentEventThread() override;
@@ -94,7 +94,7 @@ public:
                    bool bFlag = false );
 
     // css::lang::XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) override;
 
     // Resolve ambiguity: both OWeakObject and OObject have these memory operators
     void * SAL_CALL operator new( size_t size ) throw() { return osl::Thread::operator new(size); }
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 2a112313b8d0..4006e6cdea44 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -67,7 +67,7 @@ Sequence<Type> OFileControlModel::_getTypes()
 
 // XServiceInfo
 
-css::uno::Sequence<OUString>  OFileControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString>  OFileControlModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -109,7 +109,7 @@ OFileControlModel::~OFileControlModel()
 IMPLEMENT_DEFAULT_CLONING( OFileControlModel )
 
 
-Any SAL_CALL OFileControlModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OFileControlModel::queryAggregation(const Type& _rType)
 {
     Any aReturn = OControlModel::queryAggregation(_rType);
     if (!aReturn.hasValue())
@@ -153,7 +153,7 @@ void OFileControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) con
 }
 
 
-void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( css::uno::Exception, std::exception)
+void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
 {
     switch (nHandle)
     {
@@ -168,7 +168,6 @@ void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
 
 
 sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
-                            throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     switch (nHandle)
     {
@@ -189,13 +188,13 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps )
 }
 
 
-OUString SAL_CALL OFileControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OFileControlModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_FILECONTROL);   // old (non-sun) name for compatibility !
 }
 
 
-void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream)
 {
     OControlModel::write(_rxOutStream);
 
@@ -209,7 +208,7 @@ void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rx
 }
 
 
-void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream)
 {
     OControlModel::read(_rxInStream);
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -235,7 +234,7 @@ void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxIn
 }
 
 
-void SAL_CALL OFileControlModel::reset() throw ( css::uno::RuntimeException, std::exception)
+void SAL_CALL OFileControlModel::reset()
 {
     ::comphelper::OInterfaceIteratorHelper2 aIter(m_aResetListeners);
     EventObject aEvt(static_cast<XWeak*>(this));
@@ -254,13 +253,13 @@ void SAL_CALL OFileControlModel::reset() throw ( css::uno::RuntimeException, std
 }
 
 
-void OFileControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception)
+void OFileControlModel::addResetListener(const Reference<XResetListener>& _rxListener)
 {
     m_aResetListeners.addInterface(_rxListener);
 }
 
 
-void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception)
+void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rxListener)
 {
     m_aResetListeners.removeInterface(_rxListener);
 }
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index 2ac053d0ea1b..e0ba9d2f3381 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -40,36 +40,34 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OFileControlModel );
 
     DECLARE_UNO3_AGG_DEFAULTS(OFileControlModel, OControlModel)
-    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OFileControlModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XPropertySet and friends
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
-    virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const override;
 
     // XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( ::com ::sun::star::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( ::com ::sun::star::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // XReset
-    virtual void SAL_CALL reset() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reset() override;
+    virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override;
+    virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -81,7 +79,7 @@ public:
     using OControlModel::getFastPropertyValue;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index fd1ee7452bd8..96225e6cba06 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -131,7 +131,7 @@ namespace frm
     }
 
 
-    Any SAL_CALL OFilterControl::queryAggregation( const Type & rType ) throw(RuntimeException, std::exception)
+    Any SAL_CALL OFilterControl::queryAggregation( const Type & rType )
     {
         Any aRet = UnoControl::queryAggregation( rType);
         if(!aRet.hasValue())
@@ -169,7 +169,7 @@ namespace frm
 
     // XComponent
 
-    void OFilterControl::dispose() throw( RuntimeException, std::exception  )
+    void OFilterControl::dispose()
     {
         EventObject aEvt(*this);
         m_aTextListeners.disposeAndClear( aEvt );
@@ -177,7 +177,7 @@ namespace frm
     }
 
 
-    void OFilterControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException, std::exception)
+    void OFilterControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer )
     {
         UnoControl::createPeer( rxToolkit, rParentPeer );
 
@@ -267,14 +267,14 @@ namespace frm
 
     // XEventListener
 
-    void SAL_CALL OFilterControl::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+    void SAL_CALL OFilterControl::disposing(const EventObject& Source)
     {
         UnoControl::disposing(Source);
     }
 
     // XItemListener
 
-    void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent& rEvent ) throw(RuntimeException, std::exception)
+    void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent& rEvent )
     {
 #if !HAVE_FEATURE_DBCONNECTIVITY
         (void) rEvent;
@@ -481,7 +481,7 @@ namespace frm
 
     // XFocusListener
 
-    void SAL_CALL OFilterControl::focusGained(const FocusEvent& /*e*/)  throw( RuntimeException, std::exception  )
+    void SAL_CALL OFilterControl::focusGained(const FocusEvent& /*e*/)
     {
         // should we fill the combobox?
         if (m_bFilterList && !m_bFilterListFilled)
@@ -489,12 +489,12 @@ namespace frm
     }
 
 
-    void SAL_CALL OFilterControl::focusLost(const FocusEvent& /*e*/) throw( RuntimeException, std::exception )
+    void SAL_CALL OFilterControl::focusLost(const FocusEvent& /*e*/)
     {
     }
 
 
-    sal_Bool SAL_CALL OFilterControl::commit() throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL OFilterControl::commit()
     {
 #if HAVE_FEATURE_DBCONNECTIVITY
         if ( !ensureInitialized( ) )
@@ -547,19 +547,19 @@ namespace frm
 
     // XTextComponent
 
-    void SAL_CALL OFilterControl::addTextListener(const Reference< XTextListener > & l) throw(RuntimeException, std::exception)
+    void SAL_CALL OFilterControl::addTextListener(const Reference< XTextListener > & l)
     {
         m_aTextListeners.addInterface( l );
     }
 
 
-    void SAL_CALL OFilterControl::removeTextListener(const Reference< XTextListener > & l) throw(RuntimeException, std::exception)
+    void SAL_CALL OFilterControl::removeTextListener(const Reference< XTextListener > & l)
     {
         m_aTextListeners.removeInterface( l );
     }
 
 
-    void SAL_CALL OFilterControl::setText( const OUString& aText ) throw(RuntimeException, std::exception)
+    void SAL_CALL OFilterControl::setText( const OUString& aText )
     {
         if ( !ensureInitialized( ) )
             // already asserted in ensureInitialized
@@ -658,7 +658,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OFilterControl::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
+    void SAL_CALL OFilterControl::insertText( const css::awt::Selection& rSel, const OUString& aText )
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
         if (xText.is())
@@ -669,13 +669,13 @@ namespace frm
     }
 
 
-    OUString SAL_CALL OFilterControl::getText() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OFilterControl::getText()
     {
         return m_aText;
     }
 
 
-    OUString SAL_CALL OFilterControl::getSelectedText() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OFilterControl::getSelectedText()
     {
         OUString aSelected;
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
@@ -686,7 +686,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OFilterControl::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception)
+    void SAL_CALL OFilterControl::setSelection( const css::awt::Selection& aSelection )
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
         if (xText.is())
@@ -694,7 +694,7 @@ namespace frm
     }
 
 
-    css::awt::Selection SAL_CALL OFilterControl::getSelection() throw(css::uno::RuntimeException, std::exception)
+    css::awt::Selection SAL_CALL OFilterControl::getSelection()
     {
         css::awt::Selection aSel;
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
@@ -704,14 +704,14 @@ namespace frm
     }
 
 
-    sal_Bool SAL_CALL OFilterControl::isEditable() throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL OFilterControl::isEditable()
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
         return xText.is() && xText->isEditable();
     }
 
 
-    void SAL_CALL OFilterControl::setEditable( sal_Bool bEditable ) throw(RuntimeException, std::exception)
+    void SAL_CALL OFilterControl::setEditable( sal_Bool bEditable )
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
         if (xText.is())
@@ -719,14 +719,14 @@ namespace frm
     }
 
 
-    sal_Int16 SAL_CALL OFilterControl::getMaxTextLen() throw(RuntimeException, std::exception)
+    sal_Int16 SAL_CALL OFilterControl::getMaxTextLen()
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
         return xText.is() ? xText->getMaxTextLen() : 0;
     }
 
 
-    void SAL_CALL OFilterControl::setMaxTextLen( sal_Int16 nLength ) throw(RuntimeException, std::exception)
+    void SAL_CALL OFilterControl::setMaxTextLen( sal_Int16 nLength )
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
         if (xText.is())
@@ -748,7 +748,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OFilterControl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL OFilterControl::initialize( const Sequence< Any >& aArguments )
     {
         const Any* pArguments = aArguments.getConstArray();
         const Any* pArgumentsEnd = pArguments + aArguments.getLength();
@@ -871,17 +871,17 @@ namespace frm
 #endif
     }
 
-    OUString SAL_CALL OFilterControl::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OFilterControl::getImplementationName(  )
     {
         return OUString( "com.sun.star.comp.forms.OFilterControl" );
     }
 
-    sal_Bool SAL_CALL OFilterControl::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OFilterControl::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames(  )
     {
         return { "com.sun.star.form.control.FilterControl",
                  "com.sun.star.awt.UnoControl" };
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index 1267e1f55c91..a28ed7f1b199 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -82,50 +82,50 @@ namespace frm
         explicit OFilterControl( const css::uno::Reference< css::uno::XComponentContext >& _rxORB );
 
         DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject)
-        css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
 
         virtual OUString GetComponentServiceName() override;
-        virtual void SAL_CALL   createPeer( const css::uno::Reference< css::awt::XToolkit > & rxToolkit, const css::uno::Reference< css::awt::XWindowPeer >  & rParentPeer ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL   createPeer( const css::uno::Reference< css::awt::XToolkit > & rxToolkit, const css::uno::Reference< css::awt::XWindowPeer >  & rParentPeer ) override;
 
     // css::lang::XComponent
-        virtual void SAL_CALL   dispose() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL   dispose() override;
 
     // css::awt::XTextComponent
-        virtual void            SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void            SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void            SAL_CALL setText( const OUString& aText ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void            SAL_CALL insertText( const css::awt::Selection& rSel, const OUString& aText ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual OUString SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual OUString SAL_CALL getSelectedText() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void            SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::awt::Selection SAL_CALL getSelection() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool        SAL_CALL isEditable() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void            SAL_CALL setEditable( sal_Bool bEditable ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void            SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Int16       SAL_CALL getMaxTextLen() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void            SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) override;
+        virtual void            SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) override;
+        virtual void            SAL_CALL setText( const OUString& aText ) override;
+        virtual void            SAL_CALL insertText( const css::awt::Selection& rSel, const OUString& aText ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual void            SAL_CALL setSelection( const css::awt::Selection& aSelection ) override;
+        virtual css::awt::Selection SAL_CALL getSelection() override;
+        virtual sal_Bool        SAL_CALL isEditable() override;
+        virtual void            SAL_CALL setEditable( sal_Bool bEditable ) override;
+        virtual void            SAL_CALL setMaxTextLen( sal_Int16 nLength ) override;
+        virtual sal_Int16       SAL_CALL getMaxTextLen() override;
 
     // css::form::XBoundComponent
-        virtual void            SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) throw( css::uno::RuntimeException, std::exception ) override {}
-        virtual void            SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) throw( css::uno::RuntimeException, std::exception ) override {}
-        virtual sal_Bool        SAL_CALL commit() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void            SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) override {}
+        virtual void            SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) override {}
+        virtual sal_Bool        SAL_CALL commit() override;
 
     // css::lang::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;
 
     // css::awt::XFocusListener
-        virtual void            SAL_CALL focusGained(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void            SAL_CALL focusLost(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void            SAL_CALL focusGained(const css::awt::FocusEvent& e) override;
+        virtual void            SAL_CALL focusLost(const css::awt::FocusEvent& e) override;
 
     // css::awt::XItemListener
-        virtual void            SAL_CALL itemStateChanged(const css::awt::ItemEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void            SAL_CALL itemStateChanged(const css::awt::ItemEvent& rEvent) override;
 
     // css::util::XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     protected:
         virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) override;
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index 01315f980a09..3509a9d42c58 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -62,7 +62,7 @@ OFixedTextModel::~OFixedTextModel( )
 IMPLEMENT_DEFAULT_CLONING( OFixedTextModel )
 
 
-css::uno::Sequence<OUString> SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OFixedTextModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -81,14 +81,13 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre
 }
 
 
-OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OFixedTextModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_FIXEDTEXT); // old (non-sun) name for compatibility !
 }
 
 
 void SAL_CALL OFixedTextModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
-    throw(IOException, RuntimeException, std::exception)
 {
     OControlModel::write(_rxOutStream);
 
@@ -98,7 +97,7 @@ void SAL_CALL OFixedTextModel::write(const Reference<XObjectOutputStream>& _rxOu
 }
 
 
-void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception)
+void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     OControlModel::read(_rxInStream);
 
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx
index f3a6dd7ac5b1..eba1f531e9ca 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -33,18 +33,17 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OFixedTextModel );
 
 // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OFixedTextModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 // XPersistObject
-    virtual OUString SAL_CALL    getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getServiceName() override;
     virtual void SAL_CALL
-        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
     virtual void SAL_CALL
-        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // OControlModel's property handling
     virtual void describeAggregateProperties(
@@ -52,7 +51,7 @@ public:
     ) const override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 80e85758801c..caf486676148 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -150,7 +150,7 @@ void OControl::doSetDelegator()
 }
 
 // UNO Binding
-Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL OControl::queryAggregation( const Type& _rType )
 {
     // ask the base class
     Any aReturn( OComponentHelper::queryAggregation(_rType) );
@@ -166,12 +166,12 @@ Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeExcep
     return aReturn;
 }
 
-Sequence<sal_Int8> SAL_CALL OControl::getImplementationId() throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL OControl::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Sequence<Type> SAL_CALL OControl::getTypes() throw(RuntimeException, std::exception)
+Sequence<Type> SAL_CALL OControl::getTypes()
 {
     TypeBag aTypes( _getTypes() );
 
@@ -200,7 +200,7 @@ void OControl::disposing()
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL OControl::supportsService(const OUString& _rsServiceName) throw ( RuntimeException, std::exception)
+sal_Bool SAL_CALL OControl::supportsService(const OUString& _rsServiceName)
 {
     return cppu::supportsService(this, _rsServiceName);
 }
@@ -215,14 +215,14 @@ Sequence< OUString > OControl::getAggregateServiceNames()
     return aAggServices;
 }
 
-Sequence<OUString> SAL_CALL OControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence<OUString> SAL_CALL OControl::getSupportedServiceNames()
 {
     // no own supported service names
     return getAggregateServiceNames();
 }
 
 // XEventListener
-void SAL_CALL OControl::disposing(const css::lang::EventObject& _rEvent) throw (RuntimeException, std::exception)
+void SAL_CALL OControl::disposing(const css::lang::EventObject& _rEvent)
 {
     Reference< XInterface > xAggAsIface;
     query_aggregation(m_xAggregate, xAggAsIface);
@@ -237,13 +237,13 @@ void SAL_CALL OControl::disposing(const css::lang::EventObject& _rEvent) throw (
 }
 
 // XControl
-void SAL_CALL OControl::setContext(const Reference< XInterface >& Context) throw (RuntimeException, std::exception)
+void SAL_CALL OControl::setContext(const Reference< XInterface >& Context)
 {
     if (m_xControl.is())
         m_xControl->setContext(Context);
 }
 
-Reference< XInterface > SAL_CALL OControl::getContext() throw (RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OControl::getContext()
 {
     return m_xControl.is() ? m_xControl->getContext() : Reference< XInterface >();
 }
@@ -264,7 +264,7 @@ void OControl::impl_resetStateGuard_nothrow()
     m_aWindowStateGuard.attach( xWindow, xModel );
 }
 
-void SAL_CALL OControl::createPeer(const Reference<XToolkit>& _rxToolkit, const Reference<XWindowPeer>& _rxParent) throw (RuntimeException, std::exception)
+void SAL_CALL OControl::createPeer(const Reference<XToolkit>& _rxToolkit, const Reference<XWindowPeer>& _rxParent)
 {
     if ( m_xControl.is() )
     {
@@ -273,12 +273,12 @@ void SAL_CALL OControl::createPeer(const Reference<XToolkit>& _rxToolkit, const
     }
 }
 
-Reference<XWindowPeer> SAL_CALL OControl::getPeer() throw ( RuntimeException, std::exception)
+Reference<XWindowPeer> SAL_CALL OControl::getPeer()
 {
     return m_xControl.is() ? m_xControl->getPeer() : Reference<XWindowPeer>();
 }
 
-sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model) throw ( RuntimeException, std::exception)
+sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model)
 {
     if ( !m_xControl.is() )
         return false;
@@ -288,28 +288,28 @@ sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model) thro
     return bSuccess;
 }
 
-Reference<XControlModel> SAL_CALL OControl::getModel() throw ( RuntimeException, std::exception)
+Reference<XControlModel> SAL_CALL OControl::getModel()
 {
     return m_xControl.is() ? m_xControl->getModel() : Reference<XControlModel>();
 }
 
-Reference<XView> SAL_CALL OControl::getView() throw ( RuntimeException, std::exception)
+Reference<XView> SAL_CALL OControl::getView()
 {
     return m_xControl.is() ? m_xControl->getView() : Reference<XView>();
 }
 
-void SAL_CALL OControl::setDesignMode(sal_Bool bOn) throw ( RuntimeException, std::exception)
+void SAL_CALL OControl::setDesignMode(sal_Bool bOn)
 {
     if (m_xControl.is())
         m_xControl->setDesignMode(bOn);
 }
 
-sal_Bool SAL_CALL OControl::isDesignMode() throw ( RuntimeException, std::exception)
+sal_Bool SAL_CALL OControl::isDesignMode()
 {
     return !m_xControl.is() || m_xControl->isDesignMode();
 }
 
-sal_Bool SAL_CALL OControl::isTransparent() throw ( RuntimeException, std::exception)
+sal_Bool SAL_CALL OControl::isTransparent()
 {
     return !m_xControl.is() || m_xControl->isTransparent();
 }
@@ -330,7 +330,7 @@ Sequence< Type> OBoundControl::_getTypes()
     return TypeBag( OControl::_getTypes(), OBoundControl_BASE::getTypes() ).getTypes();
 }
 
-Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception)
+Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType)
 {
     Any aReturn;
 
@@ -350,12 +350,12 @@ Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeEx
     return aReturn;
 }
 
-sal_Bool SAL_CALL OBoundControl::getLock() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OBoundControl::getLock()
 {
     return m_bLocked;
 }
 
-void SAL_CALL OBoundControl::setLock(sal_Bool _bLock) throw(RuntimeException, std::exception)
+void SAL_CALL OBoundControl::setLock(sal_Bool _bLock)
 {
     if (m_bLocked == bool(_bLock))
         return;
@@ -382,12 +382,12 @@ void OBoundControl::_setLock(bool _bLock)
     }
 }
 
-sal_Bool SAL_CALL OBoundControl::setModel( const Reference< XControlModel >& _rxModel ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL OBoundControl::setModel( const Reference< XControlModel >& _rxModel )
 {
     return OControl::setModel( _rxModel );
 }
 
-void SAL_CALL OBoundControl::disposing(const EventObject& Source) throw (RuntimeException, std::exception)
+void SAL_CALL OBoundControl::disposing(const EventObject& Source)
 {
     // just disambiguate
     OControl::disposing(Source);
@@ -399,12 +399,12 @@ void OBoundControl::disposing()
 }
 
 // OControlModel
-Sequence<sal_Int8> SAL_CALL OControlModel::getImplementationId() throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL OControlModel::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Sequence<Type> SAL_CALL OControlModel::getTypes() throw(RuntimeException, std::exception)
+Sequence<Type> SAL_CALL OControlModel::getTypes()
 {
     TypeBag aTypes( _getTypes() );
 
@@ -424,7 +424,7 @@ Sequence<Type> OControlModel::_getTypes()
     ).getTypes();
 }
 
-Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OControlModel::queryAggregation(const Type& _rType)
 {
     // base class 1
     Any aReturn(OComponentHelper::queryAggregation(_rType));
@@ -596,12 +596,12 @@ void OControlModel::doSetDelegator()
 }
 
 // XChild
-Reference< XInterface > SAL_CALL OControlModel::getParent() throw(RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OControlModel::getParent()
 {
     return m_xParent;
 }
 
-void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) throw(css::lang::NoSupportException, RuntimeException, std::exception)
+void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent)
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -617,7 +617,7 @@ void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent)
 }
 
 // XNamed
-OUString SAL_CALL OControlModel::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OControlModel::getName()
 {
     OUString aReturn;
     try
@@ -636,7 +636,7 @@ OUString SAL_CALL OControlModel::getName() throw(RuntimeException, std::exceptio
     return aReturn;
 }
 
-void SAL_CALL OControlModel::setName(const OUString& _rName) throw(RuntimeException, std::exception)
+void SAL_CALL OControlModel::setName(const OUString& _rName)
 {
     try
     {
@@ -654,7 +654,7 @@ void SAL_CALL OControlModel::setName(const OUString& _rName) throw(RuntimeExcept
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL OControlModel::supportsService(const OUString& _rServiceName) throw ( RuntimeException, std::exception)
+sal_Bool SAL_CALL OControlModel::supportsService(const OUString& _rServiceName)
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -668,7 +668,7 @@ Sequence< OUString > OControlModel::getAggregateServiceNames()
     return aAggServices;
 }
 
-Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames()
 {
     return ::comphelper::concatSequences(
         getAggregateServiceNames(),
@@ -676,7 +676,7 @@ Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw(Runt
     );
 }
 
-Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static()
 {
     Sequence< OUString > aServiceNames( 2 );
     aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT;
@@ -685,7 +685,7 @@ Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() t
 }
 
 // XEventListener
-void SAL_CALL OControlModel::disposing(const css::lang::EventObject& _rSource) throw (RuntimeException, std::exception)
+void SAL_CALL OControlModel::disposing(const css::lang::EventObject& _rSource)
 {
     // release the parent
     if (_rSource.Source == m_xParent)
@@ -733,7 +733,6 @@ void OControlModel::readAggregate( const Reference< XObjectInputStream >& _rxInS
 }
 
 void SAL_CALL OControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream)
-                        throw(css::io::IOException, RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -777,7 +776,7 @@ void SAL_CALL OControlModel::write(const Reference<css::io::XObjectOutputStream>
     // EOIN!
 }
 
-void OControlModel::read(const Reference<css::io::XObjectInputStream>& InStream) throw (css::io::IOException, RuntimeException, std::exception)
+void OControlModel::read(const Reference<css::io::XObjectInputStream>& InStream)
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -929,7 +928,6 @@ void OControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) con
 
 sal_Bool OControlModel::convertFastPropertyValue(
                         Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
-                        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     bool bModified(false);
     switch (_nHandle)
@@ -967,7 +965,6 @@ sal_Bool OControlModel::convertFastPropertyValue(
 }
 
 void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
-                        throw (Exception, std::exception)
 {
     switch (_nHandle)
     {
@@ -1047,7 +1044,7 @@ Reference< XMultiPropertySet > OControlModel::getPropertiesInterface()
     return Reference< XMultiPropertySet >( *this, UNO_QUERY );
 }
 
-Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw( RuntimeException, std::exception)
+Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() );
 }
@@ -1057,22 +1054,22 @@ Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw(
     return m_aPropertyBagHelper.getInfoHelper();
 }
 
-void SAL_CALL OControlModel::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OControlModel::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue )
 {
     m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue );
 }
 
-void SAL_CALL OControlModel::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception)
+void SAL_CALL OControlModel::removeProperty( const OUString& _rName )
 {
     m_aPropertyBagHelper.removeProperty( _rName );
 }
 
-Sequence< PropertyValue > SAL_CALL OControlModel::getPropertyValues() throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL OControlModel::getPropertyValues()
 {
     return m_aPropertyBagHelper.getPropertyValues();
 }
 
-void SAL_CALL OControlModel::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL OControlModel::setPropertyValues( const Sequence< PropertyValue >& _rProps )
 {
     m_aPropertyBagHelper.setPropertyValues( _rProps );
 }
@@ -1104,7 +1101,7 @@ void OControlModel::firePropertyChanges( const std::vector< sal_Int32 >& _rHandl
 }
 
 // OBoundControlModel
-Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType )
 {
     Any aReturn( OControlModel::queryAggregation(_rType) );
     if (!aReturn.hasValue())
@@ -1400,7 +1397,7 @@ void OBoundControlModel::onValuePropertyChange( ControlModelLock& i_rControLock
         recheckValidity( true );
 }
 
-void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) throw ( RuntimeException, std::exception )
+void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt )
 {
     ControlModelLock aLock( *this );
     OSL_ENSURE( _rEvt.PropertyName == m_sValuePropertyName,
@@ -1445,7 +1442,7 @@ void OBoundControlModel::doFormListening( const bool _bStart )
 }
 
 // XChild
-void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxParent) throw(css::lang::NoSupportException, RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxParent)
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
@@ -1472,7 +1469,7 @@ void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxPare
 }
 
 // XEventListener
-void SAL_CALL OBoundControlModel::disposing(const css::lang::EventObject& _rEvent) throw (RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::disposing(const css::lang::EventObject& _rEvent)
 {
     ControlModelLock aLock( *this );
     if ( _rEvent.Source == getField() )
@@ -1504,7 +1501,7 @@ void SAL_CALL OBoundControlModel::disposing(const css::lang::EventObject& _rEven
 }
 
 // XServiceInfo
-css::uno::Sequence<OUString> SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OBoundControlModel::getSupportedServiceNames()
 {
     return ::comphelper::combineSequences(
         getAggregateServiceNames(),
@@ -1512,7 +1509,7 @@ css::uno::Sequence<OUString> SAL_CALL OBoundControlModel::getSupportedServiceNam
     );
 }
 
-Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static()
 {
     Sequence<OUString> aOwnServiceNames { "com.sun.star.form.DataAwareControlModel" };
     return ::comphelper::concatSequences(
@@ -1522,7 +1519,7 @@ Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Stati
 }
 
 // XPersist
-void SAL_CALL OBoundControlModel::write( const Reference<css::io::XObjectOutputStream>& _rxOutStream ) throw(css::io::IOException, RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::write( const Reference<css::io::XObjectOutputStream>& _rxOutStream )
 {
     OControlModel::write(_rxOutStream);
     osl::MutexGuard aGuard(m_aMutex);
@@ -1595,7 +1592,7 @@ void OBoundControlModel::writeCommonProperties(const Reference<css::io::XObjectO
     xMark->deleteMark(nMark);
 }
 
-void SAL_CALL OBoundControlModel::read( const Reference< css::io::XObjectInputStream >& _rxInStream ) throw(css::io::IOException, RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::read( const Reference< css::io::XObjectInputStream >& _rxInStream )
 {
     OControlModel::read(_rxInStream);
     osl::MutexGuard aGuard(m_aMutex);
@@ -1634,7 +1631,6 @@ sal_Bool OBoundControlModel::convertFastPropertyValue(
                                 Any& _rConvertedValue, Any& _rOldValue,
                 sal_Int32 _nHandle,
                                 const Any& _rValue)
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     bool bModified(false);
     switch (_nHandle)
@@ -1689,7 +1685,7 @@ Any OBoundControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     return aDefault;
 }
 
-void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     switch (nHandle)
     {
@@ -1768,7 +1764,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
 }
 
 // XPropertyChangeListener
-void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt )
 {
     // if the DBColumn value changed, transfer it to the control
     if ( evt.PropertyName == PROPERTY_VALUE )
@@ -1814,7 +1810,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt
     }
 }
 
-void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event*/ )
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
@@ -1834,17 +1830,17 @@ void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event*
 }
 
 // XBoundComponent
-void SAL_CALL OBoundControlModel::addUpdateListener(const Reference<XUpdateListener>& _rxListener) throw(RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::addUpdateListener(const Reference<XUpdateListener>& _rxListener)
 {
     m_aUpdateListeners.addInterface(_rxListener);
 }
 
-void SAL_CALL OBoundControlModel::removeUpdateListener(const Reference< XUpdateListener>& _rxListener) throw(RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::removeUpdateListener(const Reference< XUpdateListener>& _rxListener)
 {
     m_aUpdateListeners.removeInterface(_rxListener);
 }
 
-sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OBoundControlModel::commit()
 {
     ControlModelLock aLock( *this );
     OSL_PRECOND( m_bCommitable, "OBoundControlModel::commit: invalid call (I'm not commitable !) " );
@@ -2059,7 +2055,7 @@ void OBoundControlModel::impl_disconnectDatabaseColumn_noNotify()
 }
 
 // XLoadListener
-void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent )
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
@@ -2071,12 +2067,12 @@ void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) throw(Run
     impl_connectDatabaseColumn_noNotify( false );
 }
 
-void SAL_CALL OBoundControlModel::unloaded( const css::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::unloaded( const css::lang::EventObject& /*aEvent*/ )
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::unloaded: we should never reach this with an external value binding!" );
 }
 
-void SAL_CALL OBoundControlModel::reloading( const css::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::reloading( const css::lang::EventObject& /*aEvent*/ )
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::reloading: we should never reach this with an external value binding!" );
     if ( hasExternalValueBinding() )
@@ -2085,7 +2081,7 @@ void SAL_CALL OBoundControlModel::reloading( const css::lang::EventObject& /*aEv
     m_bForwardValueChanges = false;
 }
 
-void SAL_CALL OBoundControlModel::unloading(const css::lang::EventObject& /*aEvent*/) throw(RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::unloading(const css::lang::EventObject& /*aEvent*/)
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
@@ -2095,7 +2091,7 @@ void SAL_CALL OBoundControlModel::unloading(const css::lang::EventObject& /*aEve
     impl_disconnectDatabaseColumn_noNotify();
 }
 
-void SAL_CALL OBoundControlModel::reloaded( const EventObject& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::reloaded( const EventObject& _rEvent )
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
@@ -2214,17 +2210,17 @@ void OBoundControlModel::resetNoBroadcast()
     setControlValue( getDefaultForReset(), eOther );
 }
 
-void OBoundControlModel::addResetListener(const Reference<XResetListener>& l) throw (RuntimeException, std::exception)
+void OBoundControlModel::addResetListener(const Reference<XResetListener>& l)
 {
     m_aResetHelper.addResetListener( l );
 }
 
-void OBoundControlModel::removeResetListener(const Reference<XResetListener>& l) throw (RuntimeException, std::exception)
+void OBoundControlModel::removeResetListener(const Reference<XResetListener>& l)
 {
     m_aResetHelper.removeResetListener( l );
 }
 
-void OBoundControlModel::reset() throw (RuntimeException, std::exception)
+void OBoundControlModel::reset()
 {
     if ( !m_aResetHelper.approveReset() )
        return;
@@ -2475,7 +2471,7 @@ void OBoundControlModel::disconnectExternalValueBinding( )
         impl_connectDatabaseColumn_noNotify( false );
 }
 
-void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBinding >& _rxBinding ) throw (IncompatibleTypesException, RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBinding >& _rxBinding )
 {
     OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::setValueBinding: How did you reach this method?" );
     // the interface for this method should not have been exposed if we do not
@@ -2501,7 +2497,7 @@ void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBindin
         connectExternalValueBinding( _rxBinding, aLock );
 }
 
-Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding(  ) throw (RuntimeException, std::exception)
+Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::getValueBinding: How did you reach this method?" );
@@ -2510,7 +2506,7 @@ Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding(  ) thro
     return m_xExternalBinding;
 }
 
-void SAL_CALL OBoundControlModel::modified( const EventObject& _rEvent ) throw ( RuntimeException, std::exception )
+void SAL_CALL OBoundControlModel::modified( const EventObject& _rEvent )
 {
     ControlModelLock aLock( *this );
     OSL_PRECOND( hasExternalValueBinding(), "OBoundControlModel::modified: Where did this come from?" );
@@ -2693,7 +2689,7 @@ void OBoundControlModel::disconnectValidator( )
     onDisconnectedValidator( );
 }
 
-void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _rxValidator ) throw (VetoException,RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _rxValidator )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::setValidator: How did you reach this method?" );
@@ -2719,7 +2715,7 @@ void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _
         connectValidator( _rxValidator );
 }
 
-Reference< XValidator > SAL_CALL OBoundControlModel::getValidator(  ) throw (RuntimeException, std::exception)
+Reference< XValidator > SAL_CALL OBoundControlModel::getValidator(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::getValidator: How did you reach this method?" );
@@ -2729,7 +2725,7 @@ Reference< XValidator > SAL_CALL OBoundControlModel::getValidator(  ) throw (Run
     return m_xValidator;
 }
 
-void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject& /*Source*/ )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::validityConstraintChanged: How did you reach this method?" );
@@ -2739,7 +2735,7 @@ void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject&
     recheckValidity( false );
 }
 
-sal_Bool SAL_CALL OBoundControlModel::isValid(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL OBoundControlModel::isValid(  )
 {
     return m_bIsCurrentValueValid;
 }
@@ -2751,19 +2747,19 @@ css::uno::Any OBoundControlModel::getCurrentFormComponentValue() const
     return getControlValue();
 }
 
-Any SAL_CALL OBoundControlModel::getCurrentValue(  ) throw (RuntimeException, std::exception)
+Any SAL_CALL OBoundControlModel::getCurrentValue(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return getCurrentFormComponentValue();
 }
 
-void SAL_CALL OBoundControlModel::addFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::addFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener )
 {
     if ( Listener.is() )
         m_aFormComponentListeners.addInterface( Listener );
 }
 
-void SAL_CALL OBoundControlModel::removeFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException, std::exception)
+void SAL_CALL OBoundControlModel::removeFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener )
 {
     if ( Listener.is() )
         m_aFormComponentListeners.removeInterface( Listener );
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index ad6bfb4900e1..df531277fe5b 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -149,7 +149,7 @@ Sequence<Type> OFormattedControl::_getTypes()
         OBoundControl::_getTypes()
     );
 }
-Any SAL_CALL OFormattedControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OFormattedControl::queryAggregation(const Type& _rType)
 {
     Any aReturn = OBoundControl::queryAggregation(_rType);
     if (!aReturn.hasValue())
@@ -182,11 +182,11 @@ OFormattedControl::~OFormattedControl()
 }
 
 // XKeyListener
-void OFormattedControl::disposing(const EventObject& _rSource) throw(RuntimeException, std::exception)
+void OFormattedControl::disposing(const EventObject& _rSource)
 {
     OBoundControl::disposing(_rSource);
 }
-void OFormattedControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception)
+void OFormattedControl::keyPressed(const css::awt::KeyEvent& e)
 {
     if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 )
         return;
@@ -230,7 +230,7 @@ void OFormattedControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno
                                             OnKeyPressed) );
 }
 
-void OFormattedControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css::uno::RuntimeException, std::exception)
+void OFormattedControl::keyReleased(const css::awt::KeyEvent& /*e*/)
 {
 }
 
@@ -244,7 +244,7 @@ IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed, void*, void)
         xSubmit->submit( Reference<XControl> (), css::awt::MouseEvent() );
 }
 
-css::uno::Sequence<OUString>  OFormattedControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString>  OFormattedControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -300,7 +300,7 @@ void SAL_CALL OFormattedModel::disposing()
 }
 
 // XServiceInfo
-css::uno::Sequence<OUString> OFormattedModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> OFormattedModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OEditBaseModel::getSupportedServiceNames();
     sal_Int32 nOldLen = aSupported.getLength();
@@ -319,7 +319,7 @@ css::uno::Sequence<OUString> OFormattedModel::getSupportedServiceNames() throw(s
 }
 
 // XAggregation
-Any SAL_CALL OFormattedModel::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception)
+Any SAL_CALL OFormattedModel::queryAggregation(const Type& _rType)
 {
     Any aReturn = OEditBaseModel::queryAggregation( _rType );
     return aReturn.hasValue() ? aReturn : OErrorBroadcaster::queryInterface( _rType );
@@ -335,7 +335,7 @@ Sequence< Type > OFormattedModel::_getTypes()
 }
 
 // XPersistObject
-OUString SAL_CALL OFormattedModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OFormattedModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_EDIT);
 }
@@ -379,7 +379,7 @@ void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle)
         OEditBaseModel::setPropertyToDefaultByHandle(nHandle);
 }
 
-void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception )
+void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName)
 {
     OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper();
     sal_Int32 nHandle = rPH.getHandleByName( aPropertyName );
@@ -400,7 +400,7 @@ Any OFormattedModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
         return OEditBaseModel::getPropertyDefaultByHandle(nHandle);
 }
 
-Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception )
+Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName )
 {
     OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper();
     sal_Int32 nHandle = rPH.getHandleByName( aPropertyName );
@@ -410,7 +410,7 @@ Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName
         return OEditBaseModel::getPropertyDefault(aPropertyName);
 }
 
-void OFormattedModel::_propertyChanged( const css::beans::PropertyChangeEvent& evt ) throw(RuntimeException, std::exception)
+void OFormattedModel::_propertyChanged( const css::beans::PropertyChangeEvent& evt )
 {
     // TODO: check how this works with external bindings
     OSL_ENSURE( evt.Source == m_xAggregateSet, "OFormattedModel::_propertyChanged: where did this come from?" );
@@ -513,7 +513,7 @@ Reference< XNumberFormatsSupplier > OFormattedModel::calcDefaultFormatsSupplier(
 }
 
 // XBoundComponent
-void OFormattedModel::loaded(const EventObject& rEvent) throw ( css::uno::RuntimeException, std::exception)
+void OFormattedModel::loaded(const EventObject& rEvent)
 {
     // HACK: our onConnectedDbColumn accesses our NumberFormatter which locks the solar mutex (as it doesn't have
     // an own one). To prevent deadlocks with other threads which may request a property from us in an
@@ -626,7 +626,7 @@ void OFormattedModel::onDisconnectedDbColumn()
     m_aNullDate  = DBTypeConversion::getStandardDate();
 }
 
-void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     OEditBaseModel::write(_rxOutStream);
     _rxOutStream->writeShort(0x0003);
@@ -712,7 +712,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
     }
 }
 
-void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     OEditBaseModel::read(_rxInStream);
     sal_uInt16 nVersion = _rxInStream->readShort();
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 53fc2ffde260..b5bf605eaa1f 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -64,32 +64,31 @@ class OFormattedModel
         virtual css::uno::Sequence< css::uno::Type> _getTypes() override;
 
         // XAggregation
-        virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
 
         // XServiceInfo
-        OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override
+        OUString SAL_CALL getImplementationName() override
         { return OUString("com.sun.star.form.OFormattedModel"); }
 
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // XPersistObject
-        virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+        virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
+        virtual OUString SAL_CALL getServiceName() override;
 
         // XLoadListener
-        virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw ( css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) override;
 
         // XPropertyState
         void setPropertyToDefaultByHandle(sal_Int32 nHandle) override;
         css::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const override;
 
-        void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) override;
+        css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
         // OControlModel's property handling
         virtual void describeFixedProperties(
@@ -100,7 +99,7 @@ class OFormattedModel
         ) const override;
 
         // XPropertyChangeListener
-        virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override;
 
         // prevent method hiding
         using OEditBaseModel::disposing;
@@ -131,7 +130,7 @@ class OFormattedModel
         virtual void        onDisconnectedDbColumn() override;
 
     private:
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         void implConstruct();
 
@@ -149,23 +148,22 @@ class OFormattedModel
         virtual ~OFormattedControl() override;
 
         DECLARE_UNO3_AGG_DEFAULTS(OFormattedControl, OBoundControl)
-        virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
         virtual css::uno::Sequence< css::uno::Type> _getTypes() override;
 
         // css::lang::XServiceInfo
-        OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override
+        OUString SAL_CALL getImplementationName() override
         { return OUString("com.sun.star.form.OFormattedControl"); }
 
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // css::lang::XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
 
         // css::awt::XKeyListener
-        virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) override;
+        virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) override;
 
         // css::awt::XControl
         using OBoundControl::setDesignMode;
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index be4a3ae8d57d..812b58595586 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -82,7 +82,7 @@ css::uno::Reference<css::uno::XInterface> OFormattedFieldWrapper::createFormatte
     return xRef;
 }
 
-Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone() throw (RuntimeException, std::exception)
+Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone()
 {
     ensureAggregate();
 
@@ -126,7 +126,7 @@ OFormattedFieldWrapper::~OFormattedFieldWrapper()
 
 }
 
-Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType)
 {
     Any aReturn;
 
@@ -170,23 +170,23 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
     return aReturn;
 }
 
-OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OFormattedFieldWrapper::getServiceName()
 {
     // return the old compatibility name for an EditModel
     return OUString(FRM_COMPONENT_EDIT);
 }
 
-OUString SAL_CALL OFormattedFieldWrapper::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL OFormattedFieldWrapper::getImplementationName(  )
 {
     return OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted");
 }
 
-sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames(  )
 {
     DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::getSupportedServiceNames: should never have made it 'til here without an aggregate!");
     Reference< XServiceInfo > xSI;
@@ -194,7 +194,7 @@ Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames(
     return xSI->getSupportedServiceNames();
 }
 
-void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream>& _rxOutStream) throw( IOException, RuntimeException, std::exception )
+void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     // can't write myself
     ensureAggregate();
@@ -233,7 +233,7 @@ void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream>
     m_xFormattedPart->write(_rxOutStream);
 }
 
-void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>& _rxInStream) throw( IOException, RuntimeException, std::exception )
+void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     SolarMutexGuard g;
     if (m_xAggregate.is())
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index e780b0ed6d0a..d44ea9eee471 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -63,20 +63,20 @@ public:
 
     // UNO
     DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject)
-    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
 protected:
     /// ensure we're in a defined state, which means a FormattedModel _OR_ an EditModel
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 7e5bd1b4bf1b..b5302709667d 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -31,17 +31,17 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::util;
 
-OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OFormsCollection::getServiceName()
 {
     return OUString("com.sun.star.form.Forms");
 }
 
-Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId(  ) throw(RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Sequence<Type> SAL_CALL OFormsCollection::getTypes() throw(RuntimeException, std::exception)
+Sequence<Type> SAL_CALL OFormsCollection::getTypes()
 {
     return concatSequences(OInterfaceContainer::getTypes(), FormsCollectionComponentBase::getTypes(), OFormsCollection_BASE::getTypes());
 }
@@ -69,7 +69,7 @@ OFormsCollection::~OFormsCollection()
     }
 }
 
-Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception)
+Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType)
 {
     Any aReturn = OFormsCollection_BASE::queryInterface(_rType);
     if (!aReturn.hasValue())
@@ -83,17 +83,17 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim
     return aReturn;
 }
 
-OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OFormsCollection::getImplementationName()
 {
     return OUString("com.sun.star.form.OFormsCollection");
 }
 
-sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-css::uno::Sequence<OUString> SAL_CALL OFormsCollection::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OFormsCollection::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aReturn(2);
 
@@ -104,7 +104,7 @@ css::uno::Sequence<OUString> SAL_CALL OFormsCollection::getSupportedServiceNames
 }
 
 // XCloneable
-Reference< XCloneable > SAL_CALL OFormsCollection::createClone(  ) throw (RuntimeException, std::exception)
+Reference< XCloneable > SAL_CALL OFormsCollection::createClone(  )
 {
     OFormsCollection* pClone = new OFormsCollection( *this );
     osl_atomic_increment( &pClone->m_refCount );
@@ -127,13 +127,13 @@ void OFormsCollection::disposing()
 
 //XChild
 
-void OFormsCollection::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw( NoSupportException, RuntimeException, std::exception )
+void OFormsCollection::setParent(const css::uno::Reference<css::uno::XInterface>& Parent)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     m_xParent = Parent;
 }
 
-css::uno::Reference<css::uno::XInterface>  OFormsCollection::getParent() throw( RuntimeException, std::exception )
+css::uno::Reference<css::uno::XInterface>  OFormsCollection::getParent()
 {
     return m_xParent;
 }
diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx
index f0e64b3d4946..50e3f51a3864 100644
--- a/forms/source/component/FormsCollection.hxx
+++ b/forms/source/component/FormsCollection.hxx
@@ -56,126 +56,93 @@ public:
 public:
     DECLARE_UNO3_AGG_DEFAULTS(OFormsCollection, FormsCollectionComponentBase)
 
-    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames(  ) override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // css::container::XChild
-    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() override;
+    virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) override;
 
     // prevent method hiding
     using OInterfaceContainer::disposing;
 
     // inheritance ambiguity
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Type SAL_CALL getElementType() override
         { return OInterfaceContainer::getElementType(); }
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements() override
         { return OInterfaceContainer::hasElements(); }
-    virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& p1)
-        throw (css::container::NoSuchElementException,
-               css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& p1) override
         { return OInterfaceContainer::getByName(p1); }
-    virtual css::uno::Sequence<rtl::OUString> SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<rtl::OUString> SAL_CALL getElementNames() override
         { return OInterfaceContainer::getElementNames(); }
-    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) override
         { return OInterfaceContainer::hasByName(p1); }
-    virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const css::uno::Any& p2)
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const css::uno::Any& p2) override
         { OInterfaceContainer::replaceByName(p1, p2); }
-    virtual void SAL_CALL insertByName(const rtl::OUString& p1, const css::uno::Any& p2)
-        throw (css::lang::IllegalArgumentException,
-               css::container::ElementExistException,
-               css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL insertByName(const rtl::OUString& p1, const css::uno::Any& p2) override
         { OInterfaceContainer::insertByName(p1, p2); }
-    virtual void SAL_CALL removeByName(const rtl::OUString& p1)
-        throw (css::container::NoSuchElementException,
-               css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeByName(const rtl::OUString& p1) override
         { OInterfaceContainer::removeByName(p1); }
-    virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount() override
         { return OInterfaceContainer::getCount(); }
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 p1)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 p1) override
         { return OInterfaceContainer::getByIndex(p1); }
-    virtual void SAL_CALL replaceByIndex(sal_Int32 p1, const css::uno::Any& p2)
-        throw (css::lang::IllegalArgumentException,
-               css::lang::IndexOutOfBoundsException,
-               css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL replaceByIndex(sal_Int32 p1, const css::uno::Any& p2) override
         { return OInterfaceContainer::replaceByIndex(p1, p2); }
-    virtual void SAL_CALL insertByIndex(sal_Int32 p1, const css::uno::Any& p2)
-        throw (css::lang::IllegalArgumentException,
-               css::lang::IndexOutOfBoundsException,
-               css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL insertByIndex(sal_Int32 p1, const css::uno::Any& p2) override
         { return OInterfaceContainer::insertByIndex(p1, p2); }
-    virtual void SAL_CALL removeByIndex(sal_Int32 p1)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeByIndex(sal_Int32 p1) override
         { return OInterfaceContainer::removeByIndex(p1); }
-    virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() override
         { return OInterfaceContainer::createEnumeration(); }
-    virtual void SAL_CALL registerScriptEvent(sal_Int32 p1, const css::script::ScriptEventDescriptor& p2)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL registerScriptEvent(sal_Int32 p1, const css::script::ScriptEventDescriptor& p2) override
         { OInterfaceContainer::registerScriptEvent(p1, p2); }
-    virtual void SAL_CALL registerScriptEvents(sal_Int32 p1, const css::uno::Sequence<css::script::ScriptEventDescriptor>& p2)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL registerScriptEvents(sal_Int32 p1, const css::uno::Sequence<css::script::ScriptEventDescriptor>& p2) override
         { OInterfaceContainer::registerScriptEvents(p1, p2); }
-    virtual void SAL_CALL revokeScriptEvent(sal_Int32 p1, const rtl::OUString& p2, const rtl::OUString& p3, const rtl::OUString& p4)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL revokeScriptEvent(sal_Int32 p1, const rtl::OUString& p2, const rtl::OUString& p3, const rtl::OUString& p4) override
         { OInterfaceContainer::revokeScriptEvent(p1, p2, p3, p4); }
-    virtual void SAL_CALL revokeScriptEvents(sal_Int32 p1)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL revokeScriptEvents(sal_Int32 p1) override
         { OInterfaceContainer::revokeScriptEvents(p1); }
-    virtual void SAL_CALL insertEntry(sal_Int32 p1)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL insertEntry(sal_Int32 p1) override
         { OInterfaceContainer::insertEntry(p1); }
-    virtual void SAL_CALL removeEntry(sal_Int32 p1)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeEntry(sal_Int32 p1) override
         { OInterfaceContainer::removeEntry(p1); }
-    virtual css::uno::Sequence<css::script::ScriptEventDescriptor> SAL_CALL getScriptEvents(sal_Int32 p1)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<css::script::ScriptEventDescriptor> SAL_CALL getScriptEvents(sal_Int32 p1) override
         { return OInterfaceContainer::getScriptEvents(p1); }
-    virtual void SAL_CALL attach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2, const css::uno::Any& p3)
-        throw (css::lang::IllegalArgumentException,
-               css::lang::ServiceNotRegisteredException,
-               css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL attach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2, const css::uno::Any& p3) override
         { OInterfaceContainer::attach(p1, p2, p3); }
-    virtual void SAL_CALL detach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL detach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2) override
         { OInterfaceContainer::detach(p1, p2); }
-    virtual void SAL_CALL addScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1) override
         { OInterfaceContainer::addScriptListener(p1); }
-    virtual void SAL_CALL removeScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1) override
         { OInterfaceContainer::removeScriptListener(p1); }
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL dispose() override
         { FormsCollectionComponentBase::dispose(); }
-    virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override
         { FormsCollectionComponentBase::addEventListener(p1); }
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override
         { FormsCollectionComponentBase::removeEventListener(p1); }
-    virtual void SAL_CALL addContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) override
         { OInterfaceContainer::addContainerListener(p1); }
-    virtual void SAL_CALL removeContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) override
         { OInterfaceContainer::removeContainerListener(p1); }
 };
 
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 2b16c87705ae..c8128f3e8d9e 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -122,7 +122,7 @@ OGridControlModel::~OGridControlModel()
 }
 
 // XCloneable
-Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) throw (RuntimeException, std::exception)
+Reference< XCloneable > SAL_CALL OGridControlModel::createClone( )
 {
     OGridControlModel* pClone = new OGridControlModel( this, getContext() );
     osl_atomic_increment( &pClone->m_refCount );
@@ -166,7 +166,7 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain
 }
 
 // XServiceInfo
-css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 4);
@@ -176,7 +176,7 @@ css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames() throw
     aSupported[aSupported.getLength()-1] = FRM_COMPONENT_GRIDCONTROL;
     return aSupported;
 }
-Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType )
 {
     Any aReturn = OGridControlModel_BASE::queryInterface(_rType);
     if ( !aReturn.hasValue() )
@@ -193,36 +193,36 @@ Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (Ru
 }
 
 // XSQLErrorListener
-void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent )
 {
     // forward the errors which happened to my columns to my own listeners
     onError( _rEvent );
 }
 
 // XRowSetSupplier
-Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet(  ) throw (RuntimeException, std::exception)
+Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet(  )
 {
     return Reference< XRowSet >( getParent(), UNO_QUERY );
 }
 
-void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ )
 {
     OSL_FAIL( "OGridControlModel::setRowSet: not supported!" );
 }
 
-void SAL_CALL OGridControlModel::addRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OGridControlModel::addRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener )
 {
     if ( i_Listener.is() )
         m_aRowSetChangeListeners.addInterface( i_Listener );
 }
 
-void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener )
 {
     m_aRowSetChangeListeners.removeInterface( i_Listener );
 }
 
 // XChild
-void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno::XInterface>& i_Parent ) throw(NoSupportException, RuntimeException, std::exception)
+void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno::XInterface>& i_Parent )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     if ( i_Parent == getParent() )
@@ -232,7 +232,7 @@ void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno::
     aGuard.clear();
     m_aRowSetChangeListeners.notifyEach( &XRowSetChangeListener::onRowSetChanged, aEvent );
 }
-Sequence< Type > SAL_CALL OGridControlModel::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OGridControlModel::getTypes(  )
 {
     return concatSequences(
         concatSequences(
@@ -258,14 +258,14 @@ void OGridControlModel::disposing()
 }
 
 // XEventListener
-void OGridControlModel::disposing(const EventObject& _rEvent) throw( RuntimeException, std::exception )
+void OGridControlModel::disposing(const EventObject& _rEvent)
 {
     OControlModel::disposing( _rEvent );
     OInterfaceContainer::disposing( _rEvent );
 }
 
 // XSelectionSupplier
-sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     Reference<XPropertySet> xSel;
@@ -295,23 +295,23 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalAr
     }
     return false;
 }
-Any SAL_CALL OGridControlModel::getSelection() throw(RuntimeException, std::exception)
+Any SAL_CALL OGridControlModel::getSelection()
 {
     return makeAny(m_xSelection);
 }
 
-void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException, std::exception )
+void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener)
 {
     m_aSelectListeners.addInterface(_rxListener);
 }
 
-void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException, std::exception )
+void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener)
 {
     m_aSelectListeners.removeInterface(_rxListener);
 }
 
 // XGridColumnFactory
-Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw (::css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType)
 {
     SolarMutexGuard g;
     const Sequence< OUString >& rColumnTypes = frm::getColumnTypes();
@@ -338,13 +338,13 @@ Reference<XPropertySet>  OGridControlModel::createColumnById(sal_Int32 nTypeId)
     }
     return xReturn;
 }
-css::uno::Sequence<OUString> SAL_CALL OGridControlModel::getColumnTypes() throw ( css::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OGridControlModel::getColumnTypes()
 {
     return frm::getColumnTypes();
 }
 
 // XReset
-void SAL_CALL OGridControlModel::reset() throw ( css::uno::RuntimeException, std::exception)
+void SAL_CALL OGridControlModel::reset()
 {
     ::comphelper::OInterfaceIteratorHelper2 aIter(m_aResetListeners);
     EventObject aEvt(static_cast<XWeak*>(this));
@@ -357,11 +357,11 @@ void SAL_CALL OGridControlModel::reset() throw ( css::uno::RuntimeException, std
         m_aResetListeners.notifyEach( &XResetListener::resetted, aEvt );
     }
 }
-void SAL_CALL OGridControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception)
+void SAL_CALL OGridControlModel::addResetListener(const Reference<XResetListener>& _rxListener)
 {
     m_aResetListeners.addInterface(_rxListener);
 }
-void SAL_CALL OGridControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception)
+void SAL_CALL OGridControlModel::removeResetListener(const Reference<XResetListener>& _rxListener)
 {
     m_aResetListeners.removeInterface(_rxListener);
 }
@@ -488,7 +488,6 @@ void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) co
 
 sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
                                                     sal_Int32 nHandle, const Any& rValue )
-    throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     bool bModified(false);
     switch (nHandle)
@@ -574,7 +573,7 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any&
     }
     return bModified;
 }
-void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( css::uno::Exception, std::exception)
+void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     switch (nHandle)
     {
@@ -766,12 +765,12 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO
 }
 
 // XPersistObject
-OUString SAL_CALL OGridControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OGridControlModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_GRID);  // old (non-sun) name for compatibility!
 }
 
-void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     OControlModel::write(_rxOutStream);
     Reference<XMarkableStream>  xMark(_rxOutStream, UNO_QUERY);
@@ -863,7 +862,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream
         _rxOutStream->writeLong(getINT32(m_aBackgroundColor));
 }
 
-void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     SolarMutexGuard g;
     OControlModel::read(_rxInStream);
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 1a07ed0a0d52..63811a77812e 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -102,67 +102,65 @@ public:
 
     // UNO Binding
     DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OControlModel)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
     // XChild
-    virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OGridControlModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
 
     // XReset
-    virtual void SAL_CALL reset() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reset() override;
+    virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override;
+    virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override;
 
     // XSelectionSupplier
-    virtual sal_Bool SAL_CALL select(const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL select(const css::uno::Any& aElement) override;
+    virtual css::uno::Any SAL_CALL getSelection() override;
+    virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) override;
+    virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) override;
 
     // XGridColumnFactory
-    virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw (::css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getColumnTypes() throw ( css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getColumnTypes() override;
 
     // XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // XPropertySet
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue,
-                                          sal_Int32 nHandle, const css::uno::Any& rValue )
-                                        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override;
+                                          sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
     // XPropertyState
     virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override;
 
     // XSQLErrorListener
-    virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& _rEvent ) override;
 
     // XRowSetSupplier
-    virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getRowSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRowSet( const css::uno::Reference< css::sdbc::XRowSet >& xDataSource ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getRowSet(  ) override;
+    virtual void SAL_CALL setRowSet( const css::uno::Reference< css::sdbc::XRowSet >& xDataSource ) override;
 
     // XRowSetChangeBroadcaster
-    virtual void SAL_CALL addRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) override;
+    virtual void SAL_CALL removeRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -174,7 +172,7 @@ public:
     using OControlModel::getFastPropertyValue;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
 protected:
     virtual void approveNewElement(
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 6408e216cb94..6c696a20ca8d 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -57,7 +57,7 @@ OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Referenc
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OGroupBoxModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -85,14 +85,13 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
 }
 
 
-OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OGroupBoxModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_GROUPBOX);  // old (non-sun) name for compatibility !
 }
 
 
 void SAL_CALL OGroupBoxModel::write(const Reference< XObjectOutputStream>& _rxOutStream)
-    throw(IOException, RuntimeException, std::exception)
 {
     OControlModel::write(_rxOutStream);
 
@@ -102,7 +101,7 @@ void SAL_CALL OGroupBoxModel::write(const Reference< XObjectOutputStream>& _rxOu
 }
 
 
-void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception)
+void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInStream)
 {
     OControlModel::read( _rxInStream );
 
@@ -128,7 +127,7 @@ OGroupBoxControl::OGroupBoxControl(const Reference<XComponentContext>& _rxFactor
 }
 
 
-css::uno::Sequence<OUString> SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OGroupBoxControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx
index c47cbcdada55..2c76cfe6b20b 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -33,18 +33,17 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OGroupBoxModel );
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OGroupBoxModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XPersistObject
-    virtual OUString SAL_CALL    getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getServiceName() override;
     virtual void SAL_CALL
-        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
     virtual void SAL_CALL
-        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // OControlModel's property handling
     virtual void describeAggregateProperties(
@@ -52,7 +51,7 @@ public:
     ) const override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 
@@ -64,11 +63,10 @@ public:
     explicit OGroupBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OGroupBoxControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 615c0558274a..d3281221615d 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -208,7 +208,7 @@ OGroupManager::~OGroupManager()
 }
 
 // XPropertyChangeListener
-void OGroupManager::disposing(const EventObject& evt) throw( RuntimeException, std::exception )
+void OGroupManager::disposing(const EventObject& evt)
 {
     Reference<XContainer>  xContainer(evt.Source, UNO_QUERY);
     if (xContainer.get() == m_xContainer.get())
@@ -261,7 +261,7 @@ void OGroupManager::removeFromGroupMap(const OUString& _sGroupName,const Referen
         _xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this );
 }
 
-void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) throw ( css::uno::RuntimeException, std::exception)
+void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt)
 {
     Reference<XPropertySet>  xSet(evt.Source, UNO_QUERY);
 
@@ -292,7 +292,7 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro
 }
 
 // XContainerListener
-void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw ( css::uno::RuntimeException, std::exception)
+void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event)
 {
     Reference< XPropertySet > xProps;
     Event.Element >>= xProps;
@@ -300,7 +300,7 @@ void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw
         InsertElement( xProps );
 }
 
-void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( css::uno::RuntimeException, std::exception)
+void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event)
 {
     Reference<XPropertySet> xProps;
     Event.Element >>= xProps;
@@ -308,7 +308,7 @@ void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw (
         RemoveElement( xProps );
 }
 
-void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event) throw ( css::uno::RuntimeException, std::exception)
+void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event)
 {
     Reference<XPropertySet> xProps;
     Event.ReplacedElement >>= xProps;
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index ec6893081375..aea4379fd8be 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -178,15 +178,15 @@ public:
     virtual ~OGroupManager() override;
 
 // css::lang::XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
 
 // css::beans::XPropertyChangeListener
-    virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
 // css::container::XContainerListener
-    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& _rEvent) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& _rEvent) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& _rEvent) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& _rEvent) override;
+    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& _rEvent) override;
+    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& _rEvent) override;
 
 // Other functions
     sal_Int32 getGroupCount();
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index 92953dd9e2f9..739dbb9b1e3f 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -74,7 +74,7 @@ void OHiddenModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
 }
 
 
-void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (css::uno::Exception, std::exception)
+void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
 {
     switch (_nHandle)
     {
@@ -90,7 +90,6 @@ void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const An
 
 sal_Bool OHiddenModel::convertFastPropertyValue(
             Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
-            throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     bool bModified(false);
     switch (_nHandle)
@@ -118,7 +117,7 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames()
 {
     return css::uno::Sequence<OUString>{
         FRM_SUN_COMPONENT_HIDDENCONTROL, FRM_SUN_FORMCOMPONENT,
@@ -126,14 +125,13 @@ css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames() t
 }
 
 
-OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OHiddenModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_HIDDEN);    // old (non-sun) name for compatibility !
 }
 
 
 void SAL_CALL OHiddenModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
-    throw(IOException, RuntimeException, std::exception)
 {
     // Version
     _rxOutStream->writeShort(0x0002);
@@ -145,7 +143,7 @@ void SAL_CALL OHiddenModel::write(const Reference<XObjectOutputStream>& _rxOutSt
 }
 
 
-void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception)
+void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     // Version
     sal_uInt16 nVersion = _rxInStream->readShort();
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx
index 28952caebcf1..827355eed8ec 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -36,25 +36,22 @@ public:
 
     // OPropertySetHelper
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-                throw (css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OHiddenModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XPersistObject
-    virtual OUString SAL_CALL    getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getServiceName() override;
     virtual void SAL_CALL
-        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
     virtual void SAL_CALL
-        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -65,7 +62,7 @@ public:
     using OControlModel::getFastPropertyValue;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 #endif // INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 4b2fec5dd410..cb3979ecca88 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -61,7 +61,7 @@ OImageButtonModel::~OImageButtonModel()
 }
 
 // XServiceInfo
-css::uno::Sequence<OUString>  OImageButtonModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString>  OImageButtonModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OClickableImageBaseModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -83,12 +83,12 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
     END_DESCRIBE_PROPERTIES();
 }
 
-OUString OImageButtonModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString OImageButtonModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_IMAGEBUTTON);   // old (non-sun) name for compatibility !
 }
 
-void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     OControlModel::write(_rxOutStream);
 
@@ -102,7 +102,7 @@ void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream
     writeHelpTextCompatibly(_rxOutStream);
 }
 
-void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     OControlModel::read(_rxInStream);
 
@@ -150,7 +150,7 @@ Sequence<Type> OImageButtonControl::_getTypes()
     return aTypes;
 }
 
-css::uno::Sequence<OUString>  OImageButtonControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString>  OImageButtonControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OClickableImageBaseControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -176,7 +176,7 @@ OImageButtonControl::OImageButtonControl(const Reference<XComponentContext>& _rx
 }
 
 // UNO Binding
-Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType)
 {
     Any aReturn = OClickableImageBaseControl::queryAggregation(_rType);
     if (!aReturn.hasValue())
@@ -185,7 +185,7 @@ Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (Ru
     return aReturn;
 }
 
-void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception)
+void OImageButtonControl::mousePressed(const awt::MouseEvent& e)
 {
     SolarMutexGuard aSolarGuard;
 
@@ -208,15 +208,15 @@ void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( css::un
     }
 }
 
-void SAL_CALL OImageButtonControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception)
+void SAL_CALL OImageButtonControl::mouseReleased(const awt::MouseEvent& /*e*/)
 {
 }
 
-void SAL_CALL OImageButtonControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception)
+void SAL_CALL OImageButtonControl::mouseEntered(const awt::MouseEvent& /*e*/)
 {
 }
 
-void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception)
+void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/)
 {
 }
 
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx
index 0635d09dd10d..37d2ef3cb608 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -34,16 +34,15 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OImageButtonModel );
 
 // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OImageButtonModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 // css::io::XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -51,7 +50,7 @@ public:
     ) const override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 typedef ::cppu::ImplHelper1< css::awt::XMouseListener> OImageButtonControl_BASE;
@@ -66,25 +65,24 @@ public:
     explicit OImageButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OImageButtonControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // UNO Binding
     DECLARE_UNO3_AGG_DEFAULTS(OImageButtonControl, OClickableImageBaseControl)
-    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override
         { OControl::disposing(_rSource); }
 
     // XMouseListener
-    virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) override;
+    virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) override;
+    virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) override;
+    virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) override;
 
     // prevent method hiding
     using OClickableImageBaseControl::disposing;
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index a519f9c31724..fe677cd82845 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -185,7 +185,7 @@ IMPLEMENT_DEFAULT_CLONING( OImageControlModel )
 
 // XServiceInfo
 
-css::uno::Sequence<OUString>  OImageControlModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString>  OImageControlModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -197,7 +197,7 @@ css::uno::Sequence<OUString>  OImageControlModel::getSupportedServiceNames() thr
 }
 
 
-Any SAL_CALL OImageControlModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OImageControlModel::queryAggregation(const Type& _rType)
 {
     // Order matters: we want to "override" the XImageProducer interface of the aggregate without
     // own XImageProducer interface, thus we need to query OImageControlModel_Base first
@@ -239,7 +239,7 @@ void OImageControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) co
 }
 
 
-void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( css::uno::Exception, std::exception)
+void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
 {
     switch (nHandle)
     {
@@ -298,7 +298,6 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con
 
 
 sal_Bool OImageControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
-                                throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     switch (nHandle)
     {
@@ -342,13 +341,13 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [
 }
 
 
-OUString OImageControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString OImageControlModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_IMAGECONTROL);  // old (non-sun) name for compatibility !
 }
 
 
-void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     // Base class
     OBoundControlModel::write(_rxOutStream);
@@ -362,7 +361,7 @@ void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStrea
 }
 
 
-void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception)
+void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     OBoundControlModel::read(_rxInStream);
 
@@ -630,25 +629,25 @@ void OImageControlModel::resetNoBroadcast()
 }
 
 
-Reference< XImageProducer > SAL_CALL OImageControlModel::getImageProducer() throw ( RuntimeException, std::exception)
+Reference< XImageProducer > SAL_CALL OImageControlModel::getImageProducer()
 {
     return this;
 }
 
 
-void SAL_CALL OImageControlModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception)
+void SAL_CALL OImageControlModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer )
 {
     GetImageProducer()->addConsumer( _rxConsumer );
 }
 
 
-void SAL_CALL OImageControlModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception)
+void SAL_CALL OImageControlModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer )
 {
     GetImageProducer()->removeConsumer( _rxConsumer );
 }
 
 
-void SAL_CALL OImageControlModel::startProduction(  ) throw (RuntimeException, std::exception)
+void SAL_CALL OImageControlModel::startProduction(  )
 {
     GetImageProducer()->startProduction();
 }
@@ -697,7 +696,7 @@ OImageControlControl::OImageControlControl(const Reference<XComponentContext>& _
 }
 
 
-Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType)
 {
     Any aReturn = OBoundControl::queryAggregation( _rType );
     if ( !aReturn.hasValue() )
@@ -711,7 +710,7 @@ Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (R
 }
 
 
-css::uno::Sequence<OUString>  OImageControlControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString>  OImageControlControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -723,13 +722,13 @@ css::uno::Sequence<OUString>  OImageControlControl::getSupportedServiceNames() t
 }
 
 
-void SAL_CALL OImageControlControl::addModifyListener( const Reference< XModifyListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OImageControlControl::addModifyListener( const Reference< XModifyListener >& Listener )
 {
     m_aModifyListeners.addInterface( Listener );
 }
 
 
-void SAL_CALL OImageControlControl::removeModifyListener( const Reference< XModifyListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OImageControlControl::removeModifyListener( const Reference< XModifyListener >& Listener )
 {
     m_aModifyListeners.removeInterface( Listener );
 }
@@ -744,7 +743,7 @@ void SAL_CALL OImageControlControl::disposing()
 }
 
 
-void SAL_CALL OImageControlControl::disposing( const EventObject& Event ) throw(RuntimeException, std::exception)
+void SAL_CALL OImageControlControl::disposing( const EventObject& Event )
 {
     OBoundControl::disposing( Event );
 }
@@ -860,7 +859,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const
 
 // MouseListener
 
-void OImageControlControl::mousePressed(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception)
+void OImageControlControl::mousePressed(const css::awt::MouseEvent& e)
 {
     SolarMutexGuard aGuard;
 
@@ -959,17 +958,17 @@ void OImageControlControl::mousePressed(const css::awt::MouseEvent& e) throw ( c
 }
 
 
-void SAL_CALL OImageControlControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception )
+void SAL_CALL OImageControlControl::mouseReleased(const awt::MouseEvent& /*e*/)
 {
 }
 
 
-void SAL_CALL OImageControlControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception )
+void SAL_CALL OImageControlControl::mouseEntered(const awt::MouseEvent& /*e*/)
 {
 }
 
 
-void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception )
+void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/)
 {
 }
 
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 596cdb22a119..724d00429d65 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -65,34 +65,32 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OImageControlModel );
 
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
-    virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     // UNO Anbindung
     DECLARE_UNO3_AGG_DEFAULTS(OImageControlModel, OBoundControlModel)
-    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OImageControlModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // XImageProducerSupplier
-    virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() throw ( css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() override;
 
     // XImageProducer
-    virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startProduction(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) override;
+    virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) override;
+    virtual void SAL_CALL startProduction(  ) override;
 
     // OControlModel's property handling
     virtual void describeAggregateProperties(
@@ -121,7 +119,7 @@ protected:
     virtual void            resetNoBroadcast() override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     void implConstruct();
 
@@ -156,27 +154,26 @@ public:
 
     // UNO
     DECLARE_UNO3_AGG_DEFAULTS( OImageControlControl, OBoundControl )
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OImageControlControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XMouseListener
-    virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) override;
+    virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) override;
+    virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) override;
+    virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 6874feb25059..2b5426f23a6c 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -205,7 +205,7 @@ namespace frm
 
     // XServiceInfo
 
-    css::uno::Sequence<OUString> SAL_CALL OListBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    css::uno::Sequence<OUString> SAL_CALL OListBoxModel::getSupportedServiceNames()
     {
         css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
 
@@ -230,7 +230,7 @@ namespace frm
     }
 
 
-    Any SAL_CALL OListBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+    Any SAL_CALL OListBoxModel::queryAggregation(const Type& _rType)
     {
         Any aReturn = OBoundControlModel::queryAggregation( _rType );
         if ( !aReturn.hasValue() )
@@ -292,7 +292,7 @@ namespace frm
     }
 
 
-    void OListBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (css::uno::Exception, std::exception)
+    void OListBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
     {
         switch (_nHandle)
         {
@@ -390,7 +390,6 @@ namespace frm
 
     sal_Bool OListBoxModel::convertFastPropertyValue(
         Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
-        throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         bool bModified(false);
         switch (_nHandle)
@@ -442,7 +441,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues )
     {
         // if both SelectedItems and StringItemList are set, care for this
         // #i27024#
@@ -494,7 +493,7 @@ namespace frm
     }
 
 
-    void OListBoxModel::_propertyChanged( const PropertyChangeEvent& i_rEvent ) throw ( RuntimeException )
+    void OListBoxModel::_propertyChanged( const PropertyChangeEvent& i_rEvent )
     {
         if ( i_rEvent.PropertyName == PROPERTY_STRINGITEMLIST )
         {
@@ -519,14 +518,13 @@ namespace frm
     }
 
 
-    OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OListBoxModel::getServiceName()
     {
         return OUString(FRM_COMPONENT_LISTBOX);   // old (non-sun) name for compatibility !
     }
 
 
     void SAL_CALL OListBoxModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
-        throw(IOException, RuntimeException, std::exception)
     {
         OBoundControlModel::write(_rxOutStream);
 
@@ -562,7 +560,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OListBoxModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception)
+    void SAL_CALL OListBoxModel::read(const Reference<XObjectInputStream>& _rxInStream)
     {
         // We need to respect dependencies for certain variables.
         // Therefore, we need to set them explicitly via setPropertyValue().
@@ -1280,7 +1278,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OListBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException, std::exception )
+    void SAL_CALL OListBoxModel::disposing( const EventObject& _rSource )
     {
         if ( !OEntryListHelper::handleDisposing( _rSource ) )
             OBoundControlModel::disposing( _rSource );
@@ -1763,7 +1761,7 @@ namespace frm
     }
 
 
-    Any SAL_CALL OListBoxControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+    Any SAL_CALL OListBoxControl::queryAggregation(const Type& _rType)
     {
         Any aReturn = OListBoxControl_BASE::queryInterface( _rType );
 
@@ -1817,7 +1815,7 @@ namespace frm
     }
 
 
-    css::uno::Sequence<OUString> SAL_CALL OListBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    css::uno::Sequence<OUString> SAL_CALL OListBoxControl::getSupportedServiceNames()
     {
         css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
         aSupported.realloc(aSupported.getLength() + 2);
@@ -1831,7 +1829,7 @@ namespace frm
 
     // XFocusListener
 
-    void SAL_CALL OListBoxControl::focusGained(const FocusEvent& /*_rEvent*/) throw(RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::focusGained(const FocusEvent& /*_rEvent*/)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         if ( m_aChangeListeners.getLength() ) // only if there are listeners
@@ -1846,14 +1844,14 @@ namespace frm
     }
 
 
-    void SAL_CALL OListBoxControl::focusLost(const FocusEvent& /*_rEvent*/) throw(RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::focusLost(const FocusEvent& /*_rEvent*/)
     {
         m_aCurrentSelection.clear();
     }
 
     // XItemListener
 
-    void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw(RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent)
     {
         // forward this to our listeners
         Reference< XChild > xChild( getModel(), UNO_QUERY );
@@ -1923,20 +1921,20 @@ namespace frm
 
     // XEventListener
 
-    void SAL_CALL OListBoxControl::disposing(const EventObject& _rSource) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::disposing(const EventObject& _rSource)
     {
         OBoundControl::disposing(_rSource);
     }
 
     // XChangeBroadcaster
 
-    void SAL_CALL OListBoxControl::addChangeListener(const Reference<XChangeListener>& _rxListener) throw(RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::addChangeListener(const Reference<XChangeListener>& _rxListener)
     {
         m_aChangeListeners.addInterface( _rxListener );
     }
 
 
-    void SAL_CALL OListBoxControl::removeChangeListener(const Reference<XChangeListener>& _rxListener) throw(RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::removeChangeListener(const Reference<XChangeListener>& _rxListener)
     {
         m_aChangeListeners.removeInterface( _rxListener );
     }
@@ -1990,54 +1988,54 @@ namespace frm
     }
 
 
-    void SAL_CALL OListBoxControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::addItemListener( const Reference< XItemListener >& l )
     {
         m_aItemListeners.addInterface( l );
     }
 
 
-    void SAL_CALL OListBoxControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::removeItemListener( const Reference< XItemListener >& l )
     {
         m_aItemListeners.removeInterface( l );
     }
 
 
-    void SAL_CALL OListBoxControl::addActionListener( const Reference< XActionListener >& l ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::addActionListener( const Reference< XActionListener >& l )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->addActionListener( l );
     }
 
 
-    void SAL_CALL OListBoxControl::removeActionListener( const Reference< XActionListener >& l ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::removeActionListener( const Reference< XActionListener >& l )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->removeActionListener( l );
     }
 
 
-    void SAL_CALL OListBoxControl::addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::addItem( const OUString& aItem, ::sal_Int16 nPos )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->addItem( aItem, nPos );
     }
 
 
-    void SAL_CALL OListBoxControl::addItems( const Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::addItems( const Sequence< OUString >& aItems, ::sal_Int16 nPos )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->addItems( aItems, nPos );
     }
 
 
-    void SAL_CALL OListBoxControl::removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->removeItems( nPos, nCount );
     }
 
 
-    ::sal_Int16 SAL_CALL OListBoxControl::getItemCount(  ) throw (RuntimeException, std::exception)
+    ::sal_Int16 SAL_CALL OListBoxControl::getItemCount(  )
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->getItemCount();
@@ -2045,7 +2043,7 @@ namespace frm
     }
 
 
-    OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos )
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->getItem( nPos );
@@ -2053,7 +2051,7 @@ namespace frm
     }
 
 
-    Sequence< OUString > SAL_CALL OListBoxControl::getItems(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OListBoxControl::getItems(  )
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->getItems();
@@ -2061,7 +2059,7 @@ namespace frm
     }
 
 
-    ::sal_Int16 SAL_CALL OListBoxControl::getSelectedItemPos(  ) throw (RuntimeException, std::exception)
+    ::sal_Int16 SAL_CALL OListBoxControl::getSelectedItemPos(  )
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->getSelectedItemPos();
@@ -2069,7 +2067,7 @@ namespace frm
     }
 
 
-    Sequence< ::sal_Int16 > SAL_CALL OListBoxControl::getSelectedItemsPos(  ) throw (RuntimeException, std::exception)
+    Sequence< ::sal_Int16 > SAL_CALL OListBoxControl::getSelectedItemsPos(  )
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->getSelectedItemsPos();
@@ -2077,7 +2075,7 @@ namespace frm
     }
 
 
-    OUString SAL_CALL OListBoxControl::getSelectedItem(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OListBoxControl::getSelectedItem(  )
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->getSelectedItem();
@@ -2085,7 +2083,7 @@ namespace frm
     }
 
 
-    Sequence< OUString > SAL_CALL OListBoxControl::getSelectedItems(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OListBoxControl::getSelectedItems(  )
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->getSelectedItems();
@@ -2093,28 +2091,28 @@ namespace frm
     }
 
 
-    void SAL_CALL OListBoxControl::selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->selectItemPos( nPos, bSelect );
     }
 
 
-    void SAL_CALL OListBoxControl::selectItemsPos( const Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::selectItemsPos( const Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->selectItemsPos( aPositions, bSelect );
     }
 
 
-    void SAL_CALL OListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->selectItem( aItem, bSelect );
     }
 
 
-    sal_Bool SAL_CALL OListBoxControl::isMutipleMode(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OListBoxControl::isMutipleMode(  )
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->isMutipleMode();
@@ -2122,14 +2120,14 @@ namespace frm
     }
 
 
-    void SAL_CALL OListBoxControl::setMultipleMode( sal_Bool bMulti ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::setMultipleMode( sal_Bool bMulti )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->setMultipleMode( bMulti );
     }
 
 
-    ::sal_Int16 SAL_CALL OListBoxControl::getDropDownLineCount(  ) throw (RuntimeException, std::exception)
+    ::sal_Int16 SAL_CALL OListBoxControl::getDropDownLineCount(  )
     {
         if ( m_xAggregateListBox.is() )
             return m_xAggregateListBox->getDropDownLineCount();
@@ -2137,14 +2135,14 @@ namespace frm
     }
 
 
-    void SAL_CALL OListBoxControl::setDropDownLineCount( ::sal_Int16 nLines ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::setDropDownLineCount( ::sal_Int16 nLines )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->setDropDownLineCount( nLines );
     }
 
 
-    void SAL_CALL OListBoxControl::makeVisible( ::sal_Int16 nEntry ) throw (RuntimeException, std::exception)
+    void SAL_CALL OListBoxControl::makeVisible( ::sal_Int16 nEntry )
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->makeVisible( nEntry );
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index f12391e00817..f6f591b102e6 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -127,40 +127,37 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OListBoxModel );
 
 // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OListBoxModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 // UNO Anbindung
     DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // OPropertySetHelper
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-                throw (css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
 protected:
     static const ::connectivity::ORowSetValue s_aEmptyValue;
     static const ::connectivity::ORowSetValue s_aEmptyStringValue;
 
     // XMultiPropertySet
-    virtual void SAL_CALL   setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) override;
 
     // XPersistObject
-    virtual OUString SAL_CALL    getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getServiceName() override;
     virtual void SAL_CALL
-        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
     virtual void SAL_CALL
-        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -171,10 +168,10 @@ protected:
     ) const 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;
 
     // OPropertyChangeListener
-    virtual void    _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) throw ( css::uno::RuntimeException ) override;
+    virtual void    _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) override;
 
     // prevent method hiding
     using OBoundControlModel::getFastPropertyValue;
@@ -205,7 +202,7 @@ protected:
     virtual void    refreshInternalEntryList() override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     void init();
     css::uno::Any getCurrentSingleValue() const;
@@ -272,55 +269,54 @@ public:
 
     // UNO Anbindung
     DECLARE_UNO3_AGG_DEFAULTS(OListBoxControl, OBoundControl)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
 // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OListBoxControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 // XChangeBroadcaster
-        virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) override;
+    virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) override;
 
 // XFocusListener
-    virtual void SAL_CALL focusGained(const css::awt::FocusEvent& _rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL focusLost(const css::awt::FocusEvent& _rEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL focusGained(const css::awt::FocusEvent& _rEvent) override;
+    virtual void SAL_CALL focusLost(const css::awt::FocusEvent& _rEvent) override;
 
 // XItemListener
-    virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& _rEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& _rEvent) 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;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // XListBox
-    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getItemCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getItems(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getSelectedItemPos(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedItem(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectItemsPos( const css::uno::Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isMutipleMode(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getDropDownLineCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 nLines ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL makeVisible( ::sal_Int16 nEntry ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) override;
+    virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) override;
+    virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) override;
+    virtual ::sal_Int16 SAL_CALL getItemCount(  ) override;
+    virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getItems(  ) override;
+    virtual ::sal_Int16 SAL_CALL getSelectedItemPos(  ) override;
+    virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos(  ) override;
+    virtual OUString SAL_CALL getSelectedItem(  ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems(  ) override;
+    virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect ) override;
+    virtual void SAL_CALL selectItemsPos( const css::uno::Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect ) override;
+    virtual void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) override;
+    virtual sal_Bool SAL_CALL isMutipleMode(  ) override;
+    virtual void SAL_CALL setMultipleMode( sal_Bool bMulti ) override;
+    virtual ::sal_Int16 SAL_CALL getDropDownLineCount(  ) override;
+    virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 nLines ) override;
+    virtual void SAL_CALL makeVisible( ::sal_Int16 nEntry ) override;
 
 protected:
     // IEventProcessor
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index 9045f05f630f..ab9ab0c78c30 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -42,7 +42,7 @@ ONumericControl::ONumericControl(const Reference<XComponentContext>& _rxFactory)
 }
 
 
-css::uno::Sequence<OUString> ONumericControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> ONumericControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -81,7 +81,7 @@ IMPLEMENT_DEFAULT_CLONING( ONumericModel )
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> ONumericModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> ONumericModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
 
@@ -115,7 +115,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con
 }
 
 
-OUString SAL_CALL ONumericModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ONumericModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_NUMERICFIELD);  // old (non-sun) name for compatibility !
 }
diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx
index fff9bbc738bb..2175b5beb55c 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -36,14 +36,13 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( ONumericModel );
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.ONumericModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // css::io::XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -61,7 +60,7 @@ protected:
     virtual void            resetNoBroadcast() override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 class ONumericControl: public OBoundControl
@@ -70,11 +69,10 @@ public:
     explicit ONumericControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.ONumericControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 9c2778ea1807..bd0918061326 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -41,7 +41,7 @@ OPatternControl::OPatternControl(const Reference<XComponentContext>& _rxFactory)
 {
 }
 
-css::uno::Sequence<OUString> OPatternControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> OPatternControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -82,7 +82,7 @@ IMPLEMENT_DEFAULT_CLONING( OPatternModel )
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL OPatternModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL OPatternModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 3);
@@ -106,7 +106,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con
 }
 
 
-OUString SAL_CALL OPatternModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OPatternModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_PATTERNFIELD);  // old (non-sun) name for compatibility !
 }
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx
index 8c9b94c656c0..d1405f481909 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -42,14 +42,13 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OPatternModel );
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OPatternModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // css::io::XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -67,7 +66,7 @@ protected:
     virtual void            resetNoBroadcast() override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 class OPatternControl: public OBoundControl
@@ -76,11 +75,10 @@ public:
     explicit OPatternControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OPatternControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 863d0a21175e..4ba80eac0cc2 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::form::binding;
 
 
-css::uno::Sequence<OUString> SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL ORadioButtonControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -89,7 +89,7 @@ IMPLEMENT_DEFAULT_CLONING( ORadioButtonModel )
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL ORadioButtonModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OReferenceValueComponent::getSupportedServiceNames();
 
@@ -156,7 +156,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any&
 }
 
 
-void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw (Exception, std::exception)
+void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
 {
     OReferenceValueComponent::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 
@@ -248,14 +248,13 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
 }
 
 
-OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ORadioButtonModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_RADIOBUTTON);   // old (non-sun) name for compatibility !
 }
 
 
 void SAL_CALL ORadioButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
-    throw(IOException, RuntimeException, std::exception)
 {
     OReferenceValueComponent::write(_rxOutStream);
 
@@ -272,7 +271,7 @@ void SAL_CALL ORadioButtonModel::write(const Reference<XObjectOutputStream>& _rx
 }
 
 
-void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception)
+void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     OReferenceValueComponent::read(_rxInStream);
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -315,7 +314,7 @@ void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxIn
 }
 
 
-void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(RuntimeException)
+void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent)
 {
     if ( _rEvent.PropertyName == PROPERTY_STATE )
     {
diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx
index 0f148397e4d7..3a3a4a6e53dd 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -32,25 +32,23 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( ORadioButtonModel );
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.ORadioButtonModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // OPropertySetHelper
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-                throw (css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     // XPersistObject
-    virtual OUString SAL_CALL    getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getServiceName() override;
     virtual void SAL_CALL
-        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
     virtual void SAL_CALL
-        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     // OPropertyChangeListener
-    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override;
+    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -66,7 +64,7 @@ protected:
 protected:
     void SetSiblingPropsTo(const OUString& rPropName, const css::uno::Any& rValue);
 
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
 private:
     void setControlSource();
@@ -78,11 +76,10 @@ public:
     explicit ORadioButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.ORadioButtonControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index 317eaad4b7ae..f54e160c038c 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -56,7 +56,7 @@ Sequence<Type> OTimeControl::_getTypes()
 }
 
 
-css::uno::Sequence<OUString> SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL OTimeControl::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
@@ -72,7 +72,7 @@ css::uno::Sequence<OUString> SAL_CALL OTimeControl::getSupportedServiceNames() t
 
 // XServiceInfo
 
-css::uno::Sequence<OUString> SAL_CALL OTimeModel::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL OTimeModel::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
 
@@ -136,7 +136,7 @@ OTimeModel::~OTimeModel( )
 IMPLEMENT_DEFAULT_CLONING( OTimeModel )
 
 
-OUString SAL_CALL OTimeModel::getServiceName() throw ( css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OTimeModel::getServiceName()
 {
     return OUString(FRM_COMPONENT_TIMEFIELD); // old (non-sun) name for compatibility !
 }
@@ -172,7 +172,7 @@ void SAL_CALL OTimeModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle
 
 
 sal_Bool SAL_CALL OTimeModel::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue,
-        sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, RuntimeException, std::exception)
+        sal_Int32 _nHandle, const Any& _rValue )
 {
     if (PROPERTY_ID_FORMATKEY == _nHandle)
         return convertFormatKeyPropertyValue(_rConvertedValue, _rOldValue, _rValue);
@@ -181,7 +181,7 @@ sal_Bool SAL_CALL OTimeModel::convertFastPropertyValue(Any& _rConvertedValue, An
 }
 
 
-void SAL_CALL OTimeModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( css::uno::Exception, std::exception)
+void SAL_CALL OTimeModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
 {
     if (PROPERTY_ID_FORMATKEY == _nHandle)
         setFormatKeyPropertyValue(_rValue);
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 5a3f599f21b4..2c980e80f702 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -42,21 +42,19 @@ public:
     DECLARE_DEFAULT_LEAF_XTOR( OTimeModel );
 
     // css::io::XPersistObject
-    virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // css::beans::XPropertySet
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue,
-                                          sal_Int32 nHandle, const css::uno::Any& rValue )
-                                        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override;
+                                          sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OTimeModel"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // OControlModel's property handling
     virtual void describeFixedProperties(
@@ -85,7 +83,7 @@ protected:
     virtual void            onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) override;
 
 protected:
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
 class OTimeControl: public OBoundControl
@@ -98,11 +96,10 @@ public:
     DECLARE_UNO3_AGG_DEFAULTS(OTimeControl, OBoundControl)
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.OTimeControl"); }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 9bedc978d383..3484dacb0b89 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -102,7 +102,7 @@ namespace frm
 
     // UNO Binding
 
-    Any SAL_CALL OClickableImageBaseControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+    Any SAL_CALL OClickableImageBaseControl::queryAggregation(const Type& _rType)
     {
         Any aReturn = OControl::queryAggregation(_rType);
         if (!aReturn.hasValue())
@@ -113,26 +113,26 @@ namespace frm
     // XApproveActionBroadcaster
 
     void OClickableImageBaseControl::addApproveActionListener(
-            const Reference<XApproveActionListener>& l) throw( RuntimeException, std::exception )
+            const Reference<XApproveActionListener>& l)
     {
         m_aApproveActionListeners.addInterface(l);
     }
 
 
     void OClickableImageBaseControl::removeApproveActionListener(
-            const Reference<XApproveActionListener>& l) throw( RuntimeException, std::exception )
+            const Reference<XApproveActionListener>& l)
     {
         m_aApproveActionListeners.removeInterface(l);
     }
 
 
-    void SAL_CALL OClickableImageBaseControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
         m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor  );
     }
 
 
-    void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
         m_pFeatureInterception->releaseDispatchProviderInterceptor( _rxInterceptor  );
     }
@@ -340,31 +340,31 @@ namespace frm
     }
 
 
-    void SAL_CALL OClickableImageBaseControl::addSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseControl::addSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener )
     {
         m_aSubmissionVetoListeners.addInterface( listener );
     }
 
 
-    void SAL_CALL OClickableImageBaseControl::removeSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseControl::removeSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener )
     {
         m_aSubmissionVetoListeners.removeInterface( listener );
     }
 
 
-    void SAL_CALL OClickableImageBaseControl::submitWithInteraction( const Reference< XInteractionHandler >& _rxHandler ) throw (VetoException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseControl::submitWithInteraction( const Reference< XInteractionHandler >& _rxHandler )
     {
         implSubmit( MouseEvent(), _rxHandler );
     }
 
 
-    void SAL_CALL OClickableImageBaseControl::submit(  ) throw (VetoException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseControl::submit(  )
     {
         implSubmit( MouseEvent(), nullptr );
     }
 
 
-    Sequence< OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames(  )
     {
         Sequence< OUString > aSupported = OControl::getSupportedServiceNames();
         aSupported.realloc( aSupported.getLength() + 1 );
@@ -519,40 +519,40 @@ namespace frm
 
     // XImageProducer
 
-    void SAL_CALL OClickableImageBaseModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer )
     {
         ImageModelMethodGuard aGuard( *this );
         GetImageProducer()->addConsumer( _rxConsumer );
     }
 
 
-    void SAL_CALL OClickableImageBaseModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer )
     {
         ImageModelMethodGuard aGuard( *this );
         GetImageProducer()->removeConsumer( _rxConsumer );
     }
 
 
-    void SAL_CALL OClickableImageBaseModel::startProduction(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseModel::startProduction(  )
     {
         ImageModelMethodGuard aGuard( *this );
         GetImageProducer()->startProduction();
     }
 
 
-    Reference< submission::XSubmission > SAL_CALL OClickableImageBaseModel::getSubmission() throw (RuntimeException, std::exception)
+    Reference< submission::XSubmission > SAL_CALL OClickableImageBaseModel::getSubmission()
     {
         return m_xSubmissionDelegate;
     }
 
 
-    void SAL_CALL OClickableImageBaseModel::setSubmission( const Reference< submission::XSubmission >& _submission ) throw (RuntimeException, std::exception)
+    void SAL_CALL OClickableImageBaseModel::setSubmission( const Reference< submission::XSubmission >& _submission )
     {
         m_xSubmissionDelegate = _submission;
     }
 
 
-    Sequence< OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames(  )
     {
         Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames();
         aSupported.realloc( aSupported.getLength() + 1 );
@@ -578,7 +578,7 @@ namespace frm
     }
 
 
-    Any SAL_CALL OClickableImageBaseModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+    Any SAL_CALL OClickableImageBaseModel::queryAggregation(const Type& _rType)
     {
         // order matters:
         // we definitely want to "override" the XImageProducer interface of our aggregate,
@@ -610,7 +610,7 @@ namespace frm
     }
 
 
-    void OClickableImageBaseModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( Exception, std::exception)
+    void OClickableImageBaseModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
     {
         switch (nHandle)
         {
@@ -641,7 +641,6 @@ namespace frm
 
 
     sal_Bool OClickableImageBaseModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
-                                throw( IllegalArgumentException, RuntimeException, std::exception )
     {
         switch (nHandle)
         {
@@ -822,7 +821,6 @@ namespace frm
 
 
     void OClickableImageBaseModel::_propertyChanged( const PropertyChangeEvent& rEvt )
-        throw( RuntimeException, std::exception )
     {
         // If a URL was set, it needs to be passed onto the ImageProducer.
         ::osl::MutexGuard aGuard(m_aMutex);
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 5250f6bed786..539da5b2d518 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -100,41 +100,40 @@ namespace frm
 
         // UNO Binding
         DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseModel, OControlModel)
-        virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
     protected:
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
 
         // css::form::XImageProducerSupplier
-        virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() throw (css::uno::RuntimeException, std::exception) override { return m_xProducer.get(); }
+        virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() override { return m_xProducer.get(); }
 
         // OPropertySetHelper
         virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
-        virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue )
-            throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
         // OPropertyChangeListener
-        virtual void _propertyChanged(const css::beans::PropertyChangeEvent&) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void _propertyChanged(const css::beans::PropertyChangeEvent&) override;
 
         // XPropertyState
         virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override;
 
         // XImageProducer
-        virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL startProduction(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) override;
+        virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) override;
+        virtual void SAL_CALL startProduction(  ) override;
 
         // XSubmissionSupplier
-        virtual css::uno::Reference< css::form::submission::XSubmission > SAL_CALL getSubmission() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setSubmission( const css::uno::Reference< css::form::submission::XSubmission >& _submission ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::form::submission::XSubmission > SAL_CALL getSubmission() override;
+        virtual void SAL_CALL setSubmission( const css::uno::Reference< css::form::submission::XSubmission >& _submission ) override;
 
         // XServiceInfo
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XEventListener
         using OControlModel::disposing;
@@ -197,13 +196,13 @@ namespace frm
         OUString m_aActionCommand;
 
         // XSubmission
-        virtual void SAL_CALL submit(  ) throw (css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL submitWithInteraction( const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) throw (css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL submit(  ) override;
+        virtual void SAL_CALL submitWithInteraction( const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) override;
+        virtual void SAL_CALL addSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) override;
+        virtual void SAL_CALL removeSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) override;
 
         // XServiceInfo
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XEventListener
         using OControl::disposing;
@@ -217,20 +216,18 @@ namespace frm
     protected:
         // UNO Binding
         DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseControl, OControl)
-        virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
 
         // css::form::XApproveActionBroadcaster
-        virtual void SAL_CALL addApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener)
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener) override;
+        virtual void SAL_CALL removeApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener) override;
 
         // XDispatchProviderInterception
-        virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
+        virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
 
     protected:
         virtual void actionPerformed_Impl( bool bNotifyListener, const css::awt::MouseEvent& rEvt );
diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx
index 3d419b9ce5ab..b306256463f9 100644
--- a/forms/source/component/entrylisthelper.cxx
+++ b/forms/source/component/entrylisthelper.cxx
@@ -56,7 +56,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OEntryListHelper::setListEntrySource( const Reference< XListEntrySource >& _rxSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OEntryListHelper::setListEntrySource( const Reference< XListEntrySource >& _rxSource )
     {
         ControlModelLock aLock( m_rControlModel );
 
@@ -69,13 +69,13 @@ namespace frm
     }
 
 
-    Reference< XListEntrySource > SAL_CALL OEntryListHelper::getListEntrySource(  ) throw (RuntimeException, std::exception)
+    Reference< XListEntrySource > SAL_CALL OEntryListHelper::getListEntrySource(  )
     {
         return m_xListSource;
     }
 
 
-    void SAL_CALL OEntryListHelper::entryChanged( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OEntryListHelper::entryChanged( const ListEntryEvent& _rEvent )
     {
         ControlModelLock aLock( m_rControlModel );
 
@@ -97,7 +97,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OEntryListHelper::entryRangeInserted( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OEntryListHelper::entryRangeInserted( const ListEntryEvent& _rEvent )
     {
         ControlModelLock aLock( m_rControlModel );
 
@@ -118,7 +118,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OEntryListHelper::entryRangeRemoved( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OEntryListHelper::entryRangeRemoved( const ListEntryEvent& _rEvent )
     {
         ControlModelLock aLock( m_rControlModel );
 
@@ -139,7 +139,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OEntryListHelper::allEntriesChanged( const EventObject& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OEntryListHelper::allEntriesChanged( const EventObject& _rEvent )
     {
         ControlModelLock aLock( m_rControlModel );
 
@@ -155,21 +155,21 @@ namespace frm
 
     // XRefreshable
 
-    void SAL_CALL OEntryListHelper::addRefreshListener(const Reference<XRefreshListener>& _rxListener) throw(RuntimeException, std::exception)
+    void SAL_CALL OEntryListHelper::addRefreshListener(const Reference<XRefreshListener>& _rxListener)
     {
         if ( _rxListener.is() )
             m_aRefreshListeners.addInterface( _rxListener );
     }
 
 
-    void SAL_CALL OEntryListHelper::removeRefreshListener(const Reference<XRefreshListener>& _rxListener) throw(RuntimeException, std::exception)
+    void SAL_CALL OEntryListHelper::removeRefreshListener(const Reference<XRefreshListener>& _rxListener)
     {
         if ( _rxListener.is() )
             m_aRefreshListeners.removeInterface( _rxListener );
     }
 
 
-    void SAL_CALL OEntryListHelper::refresh() throw(RuntimeException, std::exception)
+    void SAL_CALL OEntryListHelper::refresh()
     {
         {
             ControlModelLock aLock( m_rControlModel );
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index d2f205a88d00..3ae722c92e3e 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -82,7 +82,7 @@ namespace frm
         void        disposing( );
 
         // prevent method hiding
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override = 0;
 
         /** helper for implementing convertFastPropertyValue( StringItemList )
 
@@ -131,19 +131,19 @@ namespace frm
 
     private:
         // XListEntrySink
-        virtual void SAL_CALL setListEntrySource( const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::form::binding::XListEntrySource > SAL_CALL getListEntrySource(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setListEntrySource( const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ) override;
+        virtual css::uno::Reference< css::form::binding::XListEntrySource > SAL_CALL getListEntrySource(  ) override;
 
         // XListEntryListener
-        virtual void SAL_CALL entryChanged( const css::form::binding::ListEntryEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL entryRangeInserted( const css::form::binding::ListEntryEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL entryRangeRemoved( const css::form::binding::ListEntryEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL allEntriesChanged( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL entryChanged( const css::form::binding::ListEntryEvent& _rSource ) override;
+        virtual void SAL_CALL entryRangeInserted( const css::form::binding::ListEntryEvent& _rSource ) override;
+        virtual void SAL_CALL entryRangeRemoved( const css::form::binding::ListEntryEvent& _rSource ) override;
+        virtual void SAL_CALL allEntriesChanged( const css::lang::EventObject& _rSource ) override;
 
         // XRefreshable
-        virtual void SAL_CALL refresh() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL refresh() override;
+        virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) override;
+        virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) override;
 
     private:
         /** disconnects from the active external list source, if present
diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx
index e619d0952401..f0602891adbf 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -82,13 +82,13 @@ namespace frm
     }
 
 
-    void SAL_CALL OErrorBroadcaster::addSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException, std::exception )
+    void SAL_CALL OErrorBroadcaster::addSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener )
     {
         m_aErrorListeners.addInterface( _rxListener );
     }
 
 
-    void SAL_CALL OErrorBroadcaster::removeSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException, std::exception )
+    void SAL_CALL OErrorBroadcaster::removeSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener )
     {
         m_aErrorListeners.removeInterface( _rxListener );
     }
diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx
index f5d036e0ef8c..0f445900a85f 100644
--- a/forms/source/component/errorbroadcaster.hxx
+++ b/forms/source/component/errorbroadcaster.hxx
@@ -51,8 +51,8 @@ namespace frm
 
     protected:
     // XSQLErrorBroadcaster
-        virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) override;
+        virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) override;
     };
 
 
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 00d5e855a731..cadf6c095a75 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -249,7 +249,7 @@ namespace frm
 
 
     bool FontControlModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue,
-                sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException, RuntimeException, std::exception )
+                sal_Int32 _nHandle, const Any& _rValue )
     {
         bool bModified = false;
         switch( _nHandle )
@@ -350,7 +350,7 @@ namespace frm
     /// @throws Exception
     static void setFastPropertyValue_NoBroadcast_implimpl(
             FontDescriptor & rFont,
-            sal_Int32 nHandle, const Any& rValue) throw (Exception)
+            sal_Int32 nHandle, const Any& rValue)
     {
         switch (nHandle)
         {
@@ -434,7 +434,7 @@ namespace frm
     void FontControlModel::setFastPropertyValue_NoBroadcast_impl(
             ::cppu::OPropertySetHelper & rBase,
             void (::cppu::OPropertySetHelper::*pSet)(sal_Int32, Any const&),
-            sal_Int32 nHandle, const Any& rValue) throw (Exception)
+            sal_Int32 nHandle, const Any& rValue)
     {
         if (isFontAggregateProperty(nHandle))
         {
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 945d45d719fa..dc18ff8edc76 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -176,7 +176,7 @@ ImageProducer::~ImageProducer()
 
 
 // XInterface
-css::uno::Any ImageProducer::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any ImageProducer::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::lang::XInitialization* >(this)),
@@ -186,8 +186,6 @@ css::uno::Any ImageProducer::queryInterface( const css::uno::Type & rType ) thro
 
 
 void ImageProducer::addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer )
-    throw(css::uno::RuntimeException,
-          std::exception)
 {
     DBG_ASSERT( rxConsumer.is(), "::AddConsumer(...): No consumer referenced!" );
     if( rxConsumer.is() )
@@ -195,7 +193,7 @@ void ImageProducer::addConsumer( const css::uno::Reference< css::awt::XImageCons
 }
 
 
-void ImageProducer::removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) throw(css::uno::RuntimeException, std::exception)
+void ImageProducer::removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer )
 {
     ConsumerList_t::reverse_iterator riter = std::find(maConsList.rbegin(),maConsList.rend(),rxConsumer);
 
@@ -257,7 +255,7 @@ void ImageProducer::NewDataAvailable()
 }
 
 
-void ImageProducer::startProduction() throw(css::uno::RuntimeException, std::exception)
+void ImageProducer::startProduction()
 {
     if( !maConsList.empty() || maDoneHdl.IsSet() )
     {
@@ -516,7 +514,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
 }
 
 
-void ImageProducer::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void ImageProducer::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     if ( aArguments.getLength() == 1 )
     {
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index ceb9bf35e047..6fe3625a4e83 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -71,7 +71,7 @@ public:
     void            SetDoneHdl( const Link<Graphic*,void>& i_rHdl ) { maDoneHdl = i_rHdl; }
 
     // css::uno::XInterface
-    css::uno::Any   SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any   SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void            SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void            SAL_CALL release() throw() override  { OWeakObject::release(); }
 
@@ -79,14 +79,12 @@ public:
     void            setImage( css::uno::Reference< css::io::XInputStream > & rStmRef );
 
     // css::awt::XImageProducer
-    void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer )
-        throw(css::uno::RuntimeException,
-              std::exception) override;
-    void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL startProduction(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) override;
+    void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) override;
+    void SAL_CALL startProduction(  ) override;
 
     // css::lang::XInitialization
-    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 };
 
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index a5ca482f7d75..4b617e2646eb 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -126,7 +126,7 @@ namespace frm
     }
 
 
-    Any SAL_CALL ONavigationBarModel::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception )
+    Any SAL_CALL ONavigationBarModel::queryAggregation( const Type& _rType )
     {
         Any aReturn = ONavigationBarModel_BASE::queryInterface( _rType );
 
@@ -143,13 +143,13 @@ namespace frm
     IMPLEMENT_DEFAULT_CLONING( ONavigationBarModel )
 
 
-    OUString SAL_CALL ONavigationBarModel::getImplementationName()  throw(RuntimeException, std::exception)
+    OUString SAL_CALL ONavigationBarModel::getImplementationName()
     {
         return OUString( "com.sun.star.comp.form.ONavigationBarModel" );
     }
 
 
-    Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames()  throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames()
     {
         Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames_Static();
         aSupported.realloc( aSupported.getLength() + 2 );
@@ -160,7 +160,7 @@ namespace frm
         return aSupported;
     }
 
-    OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException, std::exception )
+    OUString SAL_CALL ONavigationBarModel::getServiceName()
     {
         return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR);
     }
@@ -179,7 +179,7 @@ namespace frm
     #define PERSIST_SHOW_FILTERSORT 0x0040
 
 
-    void SAL_CALL ONavigationBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw ( IOException, RuntimeException, std::exception )
+    void SAL_CALL ONavigationBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream )
     {
         // open a section for compatibility - if we later on write additional members,
         // then older versions can skip them
@@ -252,7 +252,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ONavigationBarModel::read( const Reference< XObjectInputStream >& _rxInStream ) throw ( IOException, RuntimeException, std::exception )
+    void SAL_CALL ONavigationBarModel::read( const Reference< XObjectInputStream >& _rxInStream )
     {
         OStreamSection aEnsureBlockCompat( _rxInStream );
 
@@ -331,7 +331,7 @@ namespace frm
 
 
     sal_Bool SAL_CALL ONavigationBarModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue,
-        sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException, RuntimeException, std::exception )
+        sal_Int32 _nHandle, const Any& _rValue )
     {
         bool bModified = false;
 
@@ -352,7 +352,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ONavigationBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception )
+    void SAL_CALL ONavigationBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         if ( isRegisteredProperty( _nHandle ) )
         {
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index 862a2121cd83..29f9993e8e7d 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -70,26 +70,25 @@ namespace frm
     protected:
         // UNO
         DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarModel, OControlModel )
-        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()  throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XTypeProvider
         DECLARE_XTYPEPROVIDER()
 
         // XPersistObject
-        virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getServiceName() override;
+        virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
+        virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
         // XPropertySet
         virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
         virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue,
-                                              sal_Int32 nHandle, const css::uno::Any& rValue )
-                                            throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override;
+                                              sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
         // XPropertyState
         virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override;
@@ -104,7 +103,7 @@ namespace frm
         using OControlModel::getFastPropertyValue;
 
     protected:
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     private:
         void implInitPropertyContainer();
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index b931b7ded39f..fbb4aeed1ab6 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -84,7 +84,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OReferenceValueComponent::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception)
+    void SAL_CALL OReferenceValueComponent::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         switch ( _nHandle )
         {
@@ -119,7 +119,7 @@ namespace frm
     }
 
 
-    sal_Bool SAL_CALL OReferenceValueComponent::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL OReferenceValueComponent::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
     {
         bool bModified = false;
         switch ( _nHandle )
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx
index 72491bbac527..b6b9805a56ea 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -58,11 +58,9 @@ namespace frm
 
         // OPropertySet and friends
         virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-                    throw (css::uno::Exception, std::exception) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
         virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                    css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
-                    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                    css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
         virtual void describeFixedProperties(
             css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps
         ) const override;
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 1bc7a678bb5c..52cce8bc3522 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -106,7 +106,7 @@ namespace frm
     {
     }
 
-    OUString SAL_CALL OScrollBarModel::getImplementationName() throw ( RuntimeException, std::exception )
+    OUString SAL_CALL OScrollBarModel::getImplementationName()
     {
         return OUString( "com.sun.star.comp.forms.OScrollBarModel" );
     }
@@ -115,7 +115,7 @@ namespace frm
         // OBoundControlModel, our real base class, claims to support the DataAwareControlModel
         // service, which isn't really true for us. We only derive from this class
         // to benefit from the functionality for binding to spreadsheet cells
-    Sequence< OUString > SAL_CALL OScrollBarModel::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OScrollBarModel::getSupportedServiceNames()
     {
         Sequence< OUString > aOwnNames( 2 );
         aOwnNames[ 0 ] = FRM_SUN_COMPONENT_SCROLLBAR;
@@ -156,7 +156,7 @@ namespace frm
     }
 
 
-    void OScrollBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception )
+    void OScrollBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         switch ( _nHandle )
         {
@@ -173,7 +173,6 @@ namespace frm
 
     sal_Bool OScrollBarModel::convertFastPropertyValue(
                 Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
-                throw ( IllegalArgumentException, RuntimeException, std::exception )
     {
         bool bModified( false );
         switch ( _nHandle )
@@ -229,14 +228,13 @@ namespace frm
     }
 
 
-    OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException, std::exception )
+    OUString SAL_CALL OScrollBarModel::getServiceName()
     {
         return OUString(FRM_SUN_COMPONENT_SCROLLBAR);
     }
 
 
     void SAL_CALL OScrollBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream )
-        throw( IOException, RuntimeException, std::exception )
     {
         OBoundControlModel::write( _rxOutStream );
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -252,7 +250,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OScrollBarModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException, std::exception )
+    void SAL_CALL OScrollBarModel::read( const Reference< XObjectInputStream>& _rxInStream )
     {
         OBoundControlModel::read( _rxInStream );
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index 838c2974ced0..9d23b6351143 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.hxx
@@ -36,14 +36,14 @@ namespace frm
 
     protected:
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw (::css::uno::RuntimeException, std::exception) override;
-        virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XPersistObject
         DECLARE_XPERSISTOBJECT()
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         // XPropertyState
         virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const override;
@@ -55,10 +55,8 @@ namespace frm
 
         // OPropertySetHelper
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& _rValue, sal_Int32 _nHandle ) const override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue )
-            throw ( css::uno::Exception, std::exception ) override;
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
-            throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
         // OBoundControlModel
         virtual css::uno::Any   translateDbColumnToControlValue( ) override;
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 02fedc312ac2..7c257dd21544 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -59,7 +59,7 @@ namespace frm
     {
     }
 
-    OUString SAL_CALL OSpinButtonModel::getImplementationName() throw ( RuntimeException, std::exception )
+    OUString SAL_CALL OSpinButtonModel::getImplementationName()
     {
         return OUString( "com.sun.star.comp.forms.OSpinButtonModel" );
     }
@@ -68,7 +68,7 @@ namespace frm
         // OBoundControlModel, our real base class, claims to support the DataAwareControlModel
         // service, which isn't really true for us. We only derive from this class
         // to benefit from the functionality for binding to spreadsheet cells
-    Sequence< OUString > SAL_CALL OSpinButtonModel::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OSpinButtonModel::getSupportedServiceNames()
     {
         Sequence< OUString > aOwnNames( 2 );
         aOwnNames[ 0 ] = FRM_SUN_COMPONENT_SPINBUTTON;
@@ -110,7 +110,7 @@ namespace frm
     }
 
 
-    void OSpinButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception )
+    void OSpinButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         switch ( _nHandle )
         {
@@ -127,7 +127,6 @@ namespace frm
 
     sal_Bool OSpinButtonModel::convertFastPropertyValue(
                 Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
-                throw ( IllegalArgumentException, RuntimeException, std::exception )
     {
         bool bModified( false );
         switch ( _nHandle )
@@ -183,14 +182,13 @@ namespace frm
     }
 
 
-    OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException, std::exception )
+    OUString SAL_CALL OSpinButtonModel::getServiceName()
     {
         return OUString(FRM_SUN_COMPONENT_SPINBUTTON);
     }
 
 
     void SAL_CALL OSpinButtonModel::write( const Reference< XObjectOutputStream >& _rxOutStream )
-        throw( IOException, RuntimeException, std::exception )
     {
         OBoundControlModel::write( _rxOutStream );
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -206,7 +204,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OSpinButtonModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException, std::exception )
+    void SAL_CALL OSpinButtonModel::read( const Reference< XObjectInputStream>& _rxInStream )
     {
         OBoundControlModel::read( _rxInStream );
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index e680d2c03160..0a60ea52979f 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.hxx
@@ -37,14 +37,14 @@ namespace frm
 
     protected:
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (::css::uno::RuntimeException, std::exception) override;
-        virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XPersistObject
         DECLARE_XPERSISTOBJECT()
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         // XPropertyState
         virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const override;
@@ -56,10 +56,8 @@ namespace frm
 
         // OPropertySetHelper
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& _rValue, sal_Int32 _nHandle ) const override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue )
-            throw ( css::uno::Exception, std::exception ) override;
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
-            throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
         // OBoundControlModel
         virtual css::uno::Any   translateDbColumnToControlValue( ) override;
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index 4a3740f47f17..1196afd70742 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -37,7 +37,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException )
+    void SAL_CALL ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
         if ( !_rxInterceptor.is() )
         {
@@ -60,7 +60,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException )
+    void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
         if ( !_rxInterceptor.is() )
         {
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index e56f2f27b3b0..1a8cde45eaae 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -52,7 +52,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OFormNavigationHelper::dispose( ) throw( RuntimeException )
+    void SAL_CALL OFormNavigationHelper::dispose( )
     {
         m_pFeatureInterception->dispose();
         disconnectDispatchers();
@@ -77,21 +77,21 @@ namespace frm
     }
 
 
-    void SAL_CALL OFormNavigationHelper::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception)
+    void SAL_CALL OFormNavigationHelper::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
         m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor );
         interceptorsChanged();
     }
 
 
-    void SAL_CALL OFormNavigationHelper::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception)
+    void SAL_CALL OFormNavigationHelper::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
         m_pFeatureInterception->releaseDispatchProviderInterceptor( _rxInterceptor );
         interceptorsChanged();
     }
 
 
-    void SAL_CALL OFormNavigationHelper::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException, std::exception)
+    void SAL_CALL OFormNavigationHelper::statusChanged( const FeatureStateEvent& _rState )
     {
         for (   FeatureMap::iterator aFeature = m_aSupportedFeatures.begin();
                 aFeature != m_aSupportedFeatures.end();
@@ -119,7 +119,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OFormNavigationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OFormNavigationHelper::disposing( const EventObject& _rSource )
     {
         // was it one of our external dispatchers?
         if ( m_nConnectedFeatures )
diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx
index e2f17d705d93..b7c07f05484b 100644
--- a/forms/source/helper/windowstateguard.cxx
+++ b/forms/source/helper/windowstateguard.cxx
@@ -63,17 +63,17 @@ namespace frm
 
     protected:
         // XWindowListener2
-        virtual void SAL_CALL windowEnabled( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowDisabled( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL windowEnabled( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowDisabled( const css::lang::EventObject& e ) override;
 
         // XWindowListener
-        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override;
+        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override;
+        virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) 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;
 
     private:
         /** ensures that the window's Enabled state matches what is described at the model
@@ -140,43 +140,43 @@ namespace frm
     }
 
 
-    void SAL_CALL WindowStateGuard_Impl::windowEnabled( const EventObject& /*e*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStateGuard_Impl::windowEnabled( const EventObject& /*e*/ )
     {
         impl_ensureEnabledState_nothrow_nolck();
     }
 
 
-    void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ )
     {
         impl_ensureEnabledState_nothrow_nolck();
     }
 
 
-    void SAL_CALL WindowStateGuard_Impl::windowResized( const WindowEvent& /*e*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStateGuard_Impl::windowResized( const WindowEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL WindowStateGuard_Impl::windowMoved( const WindowEvent& /*e*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStateGuard_Impl::windowMoved( const WindowEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL WindowStateGuard_Impl::windowShown( const EventObject& /*e*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStateGuard_Impl::windowShown( const EventObject& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL WindowStateGuard_Impl::windowHidden( const EventObject& /*e*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStateGuard_Impl::windowHidden( const EventObject& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL WindowStateGuard_Impl::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStateGuard_Impl::disposing( const EventObject& Source )
     {
         OSL_ENSURE( Source.Source == m_xWindow, "WindowStateGuard_Impl::disposing: where does this come from?" );
         (void)Source;
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 934bd526d890..9009c305f334 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -82,9 +82,9 @@ namespace frm
 
     // macros for quickly declaring/implementing XServiceInfo
     #define DECLARE_XPERSISTOBJECT() \
-    virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;    \
-    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;    \
-    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;    \
+    virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;    \
+    virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
     class OControlModel;
 
@@ -208,42 +208,42 @@ protected:
 
 // UNO
     DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
 // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8>           SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type>   SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8>           SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type>   SAL_CALL getTypes() override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // XComponent (as base of XControl)
-    virtual void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL dispose(  ) override
         { OComponentHelper::dispose(); }
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) override
         { OComponentHelper::addEventListener(_rxListener); }
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) override
         { OComponentHelper::removeEventListener(_rxListener); }
 
 // 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;
 
 // XServiceInfo
-    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL     getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL    getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0;
+    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL     getSupportedServiceNames() override;
+    virtual OUString SAL_CALL    getImplementationName() override = 0;
 
 // XControl
-    virtual void                                        SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::uno::XInterface>   SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void                                        SAL_CALL createPeer(const css::uno::Reference<css::awt::XToolkit>& Toolkit, const css::uno::Reference<css::awt::XWindowPeer>& Parent) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::awt::XWindowPeer>  SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool                                    SAL_CALL setModel(const css::uno::Reference<css::awt::XControlModel>& Model) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::awt::XView>        SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void                                        SAL_CALL setDesignMode(sal_Bool bOn) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool                                    SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool                                    SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void                                        SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) override;
+    virtual css::uno::Reference<css::uno::XInterface>   SAL_CALL getContext() override;
+    virtual void                                        SAL_CALL createPeer(const css::uno::Reference<css::awt::XToolkit>& Toolkit, const css::uno::Reference<css::awt::XWindowPeer>& Parent) override;
+    virtual css::uno::Reference<css::awt::XWindowPeer>  SAL_CALL getPeer() override;
+    virtual sal_Bool                                    SAL_CALL setModel(const css::uno::Reference<css::awt::XControlModel>& Model) override;
+    virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() override;
+    virtual css::uno::Reference<css::awt::XView>        SAL_CALL getView() override;
+    virtual void                                        SAL_CALL setDesignMode(sal_Bool bOn) override;
+    virtual sal_Bool                                    SAL_CALL isDesignMode() override;
+    virtual sal_Bool                                    SAL_CALL isTransparent() override;
 
 protected:
     virtual css::uno::Sequence< css::uno::Type>   _getTypes();
@@ -274,18 +274,18 @@ public:
     virtual ~OBoundControl() override;
 
     DECLARE_UNO3_AGG_DEFAULTS(OBoundControl, OControl)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
     // XBoundControl
-    virtual sal_Bool SAL_CALL   getLock() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL       setLock(sal_Bool _bLock) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL   getLock() override;
+    virtual void SAL_CALL       setLock(sal_Bool _bLock) override;
         // default implementation just disables the controls, overwrite _setLock to change this behaviour
 
     // XControl
-    virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) 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;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
@@ -381,49 +381,47 @@ protected:
 
 public:
     DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
 // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8>           SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type>   SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8>           SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type>   SAL_CALL getTypes() override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // XNamed
-    virtual OUString SAL_CALL    getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL               setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getName() override;
+    virtual void SAL_CALL               setName(const OUString& aName) override;
 
 // XServiceInfo
-    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL     getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL    getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0;
+    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL     getSupportedServiceNames() override;
+    virtual OUString SAL_CALL    getImplementationName() override = 0;
 
 // XSericeInfo - static version(s)
     /// @throws css::uno::RuntimeException
-    static  css::uno::Sequence<OUString> SAL_CALL     getSupportedServiceNames_Static() throw(css::uno::RuntimeException);
+    static  css::uno::Sequence<OUString> SAL_CALL     getSupportedServiceNames_Static();
 
 // XPersistObject
-    virtual OUString SAL_CALL    getServiceName() throw(css::uno::RuntimeException, std::exception) override = 0;
+    virtual OUString SAL_CALL    getServiceName() override = 0;
     virtual void SAL_CALL
-        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override;
     virtual void SAL_CALL
-        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override;
 
 // XChild (base of XFormComponent)
-    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL   getParent() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL           setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL   getParent() override;
+    virtual void SAL_CALL           setParent(const css::uno::Reference<css::uno::XInterface>& Parent) 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;
 
 // XPropertySet
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-                throw (css::uno::Exception, std::exception) override;
+                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
 // css::beans::XPropertyState
@@ -432,15 +430,15 @@ public:
     virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override;
 
 // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override = 0;
 
 // XPropertyContainer
-    virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) override;
+    virtual void SAL_CALL removeProperty( const OUString& Name ) override;
 
 // XPropertyAccess
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(  ) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
 
 protected:
     using OPropertySetAggregationHelper::setPropertyValues;
@@ -452,7 +450,7 @@ protected:
 
 protected:
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
     // OPropertySetHelper
     virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
@@ -522,7 +520,7 @@ public:
 
 
 #define IMPLEMENT_DEFAULT_CLONING( classname ) \
-    css::uno::Reference< css::util::XCloneable > SAL_CALL classname::createClone( ) throw (css::uno::RuntimeException, std::exception) \
+    css::uno::Reference< css::util::XCloneable > SAL_CALL classname::createClone( ) \
     { \
         classname* pClone = new classname( this, getContext() ); \
         pClone->clonedFrom( this ); \
@@ -964,90 +962,88 @@ public:
 public:
     // UNO link
     DECLARE_UNO3_AGG_DEFAULTS(OBoundControlModel, OControlModel)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XReset
-    virtual void SAL_CALL reset(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reset(  ) override;
+    virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) override;
+    virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) override;
 
     // XServiceInfo
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames(  ) override;
 
     // XServiceInfo - static version
     /// @throws css::uno::RuntimeException
-    static  css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(css::uno::RuntimeException);
+    static  css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static();
 
     // XChild
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     // XPersistObject
-    virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) override;
+    virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) override;
 
     // XBoundComponent
-    virtual sal_Bool SAL_CALL commit() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL commit() override;
 
     // XUpdateBroadcaster (base of XBoundComponent)
-    virtual void SAL_CALL addUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) override;
+    virtual void SAL_CALL removeUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) override;
 
     // XPropertySet
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override;
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-                throw (css::uno::Exception, std::exception) override;
+                css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
 // css::beans::XPropertyState
     virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const 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;
 
 // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
     // XRowSetChangeListener
-    virtual void SAL_CALL onRowSetChanged( const css::lang::EventObject& i_Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL onRowSetChanged( const css::lang::EventObject& i_Event ) override;
 
 // XLoadListener
-    virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) override;
 
 protected:
     // XBindableValue
-    virtual void SAL_CALL setValueBinding( const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::form::binding::XValueBinding > SAL_CALL getValueBinding(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setValueBinding( const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) override;
+    virtual css::uno::Reference< css::form::binding::XValueBinding > SAL_CALL getValueBinding(  ) override;
 
     // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& _rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& _rEvent ) override;
 
     // XValidatable
-    virtual void SAL_CALL setValidator( const css::uno::Reference< css::form::validation::XValidator >& Validator ) throw (css::util::VetoException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::form::validation::XValidator > SAL_CALL getValidator(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setValidator( const css::uno::Reference< css::form::validation::XValidator >& Validator ) override;
+    virtual css::uno::Reference< css::form::validation::XValidator > SAL_CALL getValidator(  ) override;
 
     // XValidityConstraintListener
-    virtual void SAL_CALL validityConstraintChanged( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL validityConstraintChanged( const css::lang::EventObject& Source ) override;
 
     // XValidatableFormComponent
-    virtual sal_Bool SAL_CALL isValid(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getCurrentValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isValid(  ) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
+    virtual void SAL_CALL addFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) override;
+    virtual void SAL_CALL removeFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) override;
 
 protected:
     // OPropertyChangeListener
     virtual void
-                _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) throw ( css::uno::RuntimeException, std::exception ) override;
+                _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) override;
 
     /// checks whether we currently have an external value binding in place
     inline  bool    hasExternalValueBinding() const { return m_xExternalBinding.is(); }
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index fc3a5fbe4a6e..2b57d987951b 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -118,69 +118,69 @@ public:
 
     // late constructor for cloning
     /// @throws css::uno::RuntimeException
-    void clonedFrom(const OInterfaceContainer& _cloneSource) throw(css::uno::RuntimeException, std::exception);
+    void clonedFrom(const OInterfaceContainer& _cloneSource);
 
 protected:
     virtual ~OInterfaceContainer();
 
 public:
 // css::io::XPersistObject
-    virtual OUString SAL_CALL getServiceName(  ) throw(css::uno::RuntimeException, std::exception) override = 0;
-    virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName(  ) override = 0;
+    virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) override;
+    virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) override;
 
 // css::lang::XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override;
 
 // css::beans::XPropertyChangeListener
-    virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
 // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override ;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
 // css::container::XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() override;
 
 // css::container::XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getElementNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
 // css::container::XNameReplace
-    virtual void SAL_CALL replaceByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName(const OUString& Name, const css::uno::Any& _rElement) override;
 
 // css::container::XNameContainer
-    virtual void SAL_CALL insertByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName(const OUString& Name) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName(const OUString& Name, const css::uno::Any& _rElement) override;
+    virtual void SAL_CALL removeByName(const OUString& Name) override;
 
 // css::container::XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) override;
 
 // css::container::XIndexReplace
-    virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const css::uno::Any& _rElement) override;
 
 // css::container::XIndexContainer
-    virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const css::uno::Any& Element) override;
+    virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) override;
 
 // css::container::XContainer
-    virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) override;
+    virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) override;
 
 // css::script::XEventAttacherManager
-    virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const css::script::ScriptEventDescriptor& aScriptEvent ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const css::uno::Sequence< css::script::ScriptEventDescriptor >& aScriptEvents ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL attach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject, const css::uno::Any& aHelper ) throw(css::lang::IllegalArgumentException, css::lang::ServiceNotRegisteredException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL detach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addScriptListener( const css::uno::Reference< css::script::XScriptListener >& xListener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeScriptListener( const css::uno::Reference< css::script::XScriptListener >& Listener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const css::script::ScriptEventDescriptor& aScriptEvent ) override;
+    virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const css::uno::Sequence< css::script::ScriptEventDescriptor >& aScriptEvents ) override;
+    virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) override;
+    virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) override;
+    virtual void SAL_CALL attach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject, const css::uno::Any& aHelper ) override;
+    virtual void SAL_CALL detach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject ) override;
+    virtual void SAL_CALL addScriptListener( const css::uno::Reference< css::script::XScriptListener >& xListener ) override;
+    virtual void SAL_CALL removeScriptListener( const css::uno::Reference< css::script::XScriptListener >& Listener ) override;
 
 protected:
     // helper
@@ -218,7 +218,7 @@ protected:
                 bool _bEvents /* = sal_True */,
                 ElementDescription* _pApprovalResult /* = NULL */ ,
                 bool _bFire /* = sal_True */
-            ) throw(css::lang::IllegalArgumentException);
+            );
 
     // called after the object is inserted, but before the "real listeners" are notified
     virtual void implInserted( const ElementDescription* _pElement );
@@ -292,15 +292,15 @@ public:
 
     DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase)
 
-    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // css::form::XFormComponent
-    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() override;
+    virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) override;
 
     // XEventListener
     using OInterfaceContainer::disposing;
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index e17f45278e75..b757e20ca198 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -61,9 +61,9 @@ namespace frm
 
         // XDispatchProviderInterception
         /// @throws css::uno::RuntimeException
-        void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException );
+        void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
         /// @throws css::uno::RuntimeException
-        void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException );
+        void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor );
 
         // XComponent
         void SAL_CALL dispose();
diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx
index 0de0c449793d..67135d041a7f 100644
--- a/forms/source/inc/formcontrolfont.hxx
+++ b/forms/source/inc/formcontrolfont.hxx
@@ -75,13 +75,12 @@ namespace frm
         void     getFastPropertyValue            ( css::uno::Any& _rValue, sal_Int32 _nHandle ) const;
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        bool     convertFastPropertyValue        ( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception );
+        bool     convertFastPropertyValue        ( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue );
         /// @throws css::uno::Exception
         void     setFastPropertyValue_NoBroadcast_impl(
                      ::cppu::OPropertySetHelper & rBase,
                      void (::cppu::OPropertySetHelper::*pSet)( sal_Int32, css::uno::Any const&),
-                     sal_Int32 nHandle, const css::uno::Any& rValue)
-            throw ( css::uno::Exception );
+                     sal_Int32 nHandle, const css::uno::Any& rValue);
         css::uno::Any
                  getPropertyDefaultByHandle      ( sal_Int32 _nHandle ) const;
 
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index 32f8c8017d04..b0f8663075fe 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -79,17 +79,17 @@ namespace frm
 
         // XComponent
         /// @throws css::uno::RuntimeException
-        void SAL_CALL dispose(  ) throw( css::uno::RuntimeException );
+        void SAL_CALL dispose(  );
 
         // XDispatchProviderInterception
-        virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
+        virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) 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;
 
         // IFeatureDispatcher
         virtual void            dispatch( sal_Int16 _nFeatureId ) const override;
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index e8973e7d6000..19b98ea87e8e 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -199,7 +199,7 @@ OInterfaceContainer::OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfac
     impl_createEventAttacher_nothrow();
 }
 
-void OInterfaceContainer::clonedFrom(const OInterfaceContainer& _cloneSource) throw(RuntimeException, std::exception)
+void OInterfaceContainer::clonedFrom(const OInterfaceContainer& _cloneSource)
 {
     try
     {
@@ -450,7 +450,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream
 }
 
 
-void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >& _rxOutStream )
 {
     ::osl::MutexGuard aGuard( m_rMutex );
     sal_Int32 nLen = m_aItems.size();
@@ -508,7 +508,7 @@ namespace
 }
 
 
-void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& _rxInStream )
 {
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -597,20 +597,20 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
 
 // XContainer
 
-void SAL_CALL OInterfaceContainer::addContainerListener(const Reference<XContainerListener>& _rxListener) throw( RuntimeException, std::exception )
+void SAL_CALL OInterfaceContainer::addContainerListener(const Reference<XContainerListener>& _rxListener)
 {
     m_aContainerListeners.addInterface(_rxListener);
 }
 
 
-void SAL_CALL OInterfaceContainer::removeContainerListener(const Reference<XContainerListener>& _rxListener) throw( RuntimeException, std::exception )
+void SAL_CALL OInterfaceContainer::removeContainerListener(const Reference<XContainerListener>& _rxListener)
 {
     m_aContainerListeners.removeInterface(_rxListener);
 }
 
 // XEventListener
 
-void SAL_CALL OInterfaceContainer::disposing(const css::lang::EventObject& _rSource) throw( RuntimeException, std::exception )
+void SAL_CALL OInterfaceContainer::disposing(const css::lang::EventObject& _rSource)
 {
     ::osl::MutexGuard aGuard( m_rMutex );
 
@@ -655,8 +655,7 @@ void SAL_CALL OInterfaceContainer::disposing(const css::lang::EventObject& _rSou
 
 // XPropertyChangeListener
 
-void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt)
-throw (css::uno::RuntimeException, std::exception) {
+void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt) {
     if (evt.PropertyName == PROPERTY_NAME)
     {
         ::osl::MutexGuard aGuard( m_rMutex );
@@ -672,20 +671,20 @@ throw (css::uno::RuntimeException, std::exception) {
 
 // XElementAccess
 
-sal_Bool SAL_CALL OInterfaceContainer::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OInterfaceContainer::hasElements()
 {
     return !m_aMap.empty();
 }
 
 
-Type SAL_CALL OInterfaceContainer::getElementType() throw(RuntimeException, std::exception)
+Type SAL_CALL OInterfaceContainer::getElementType()
 {
     return m_aElementType;
 }
 
 // XEnumerationAccess
 
-Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw( RuntimeException, std::exception )
+Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration()
 {
     ::osl::MutexGuard aGuard( m_rMutex );
     return new ::comphelper::OEnumerationByIndex(static_cast<XIndexAccess*>(this));
@@ -693,7 +692,7 @@ Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw(
 
 // XNameAccess
 
-Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName )
 {
     ::std::pair <OInterfaceMap::iterator,
           OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName);
@@ -705,13 +704,13 @@ Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSu
 }
 
 
-css::uno::Sequence<OUString> SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL OInterfaceContainer::getElementNames()
 {
     return comphelper::mapKeysToSequence(m_aMap);
 }
 
 
-sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName )
 {
     ::std::pair <OInterfaceMap::iterator,
           OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName);
@@ -720,13 +719,13 @@ sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw
 
 // XIndexAccess
 
-sal_Int32 OInterfaceContainer::getCount() throw( RuntimeException, std::exception )
+sal_Int32 OInterfaceContainer::getCount()
 {
     return m_aItems.size();
 }
 
 
-Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex)
 {
     if (_nIndex < 0 || (_nIndex >= (sal_Int32)m_aItems.size()))
         throw IndexOutOfBoundsException();
@@ -770,7 +769,7 @@ void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _r
 
 
 void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XPropertySet >& _rxElement,
-    bool _bEvents, ElementDescription* _pApprovalResult, bool _bFire ) throw( IllegalArgumentException )
+    bool _bEvents, ElementDescription* _pApprovalResult, bool _bFire )
 {
     const bool bHandleEvents = _bEvents && m_xEventAttacher.is();
 
@@ -912,7 +911,7 @@ void OInterfaceContainer::impl_replacedElement( const ContainerEvent& _rEvent, :
 
 // XIndexContainer
 
-void SAL_CALL OInterfaceContainer::insertByIndex( sal_Int32 _nIndex, const Any& _rElement ) throw(IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::insertByIndex( sal_Int32 _nIndex, const Any& _rElement )
 {
     Reference< XPropertySet > xElement;
     _rElement >>= xElement;
@@ -1000,7 +999,7 @@ void OInterfaceContainer::implCheckIndex( const sal_Int32 _nIndex )
 }
 
 
-void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any& Element) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any& Element)
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
     // check the index
@@ -1053,7 +1052,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle
 }
 
 
-void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex)
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
     // check the index
@@ -1069,7 +1068,7 @@ ElementDescription* OInterfaceContainer::createElementMetaData( )
 }
 
 
-void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement)
 {
     Reference< XPropertySet > xElementProps;
 
@@ -1100,7 +1099,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An
 }
 
 
-void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element)
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
     ::std::pair <OInterfaceMap::iterator,
@@ -1128,7 +1127,7 @@ void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any
 }
 
 
-void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name)
 {
     ::osl::MutexGuard aGuard( m_rMutex );
     ::std::pair <OInterfaceMap::iterator,
@@ -1143,7 +1142,7 @@ void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoS
 
 // XEventAttacherManager
 
-void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent )
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
     if ( m_xEventAttacher.is() )
@@ -1155,7 +1154,7 @@ void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const
 }
 
 
-void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents )
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
     if ( m_xEventAttacher.is() )
@@ -1167,35 +1166,35 @@ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const
 }
 
 
-void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam )
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam );
 }
 
 
-void SAL_CALL OInterfaceContainer::revokeScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::revokeScriptEvents( sal_Int32 nIndex )
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->revokeScriptEvents( nIndex );
 }
 
 
-void SAL_CALL OInterfaceContainer::insertEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::insertEntry( sal_Int32 nIndex )
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->insertEntry( nIndex );
 }
 
 
-void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex )
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->removeEntry( nIndex );
 }
 
 
-Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception)
+Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex )
 {
     Sequence< ScriptEventDescriptor > aReturn;
     if ( m_xEventAttacher.is() )
@@ -1210,28 +1209,28 @@ Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents(
 }
 
 
-void SAL_CALL OInterfaceContainer::attach( sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any& aHelper ) throw(IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::attach( sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any& aHelper )
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->attach( nIndex, xObject, aHelper );
 }
 
 
-void SAL_CALL OInterfaceContainer::detach( sal_Int32 nIndex, const Reference< XInterface >& xObject ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::detach( sal_Int32 nIndex, const Reference< XInterface >& xObject )
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->detach( nIndex, xObject );
 }
 
 
-void SAL_CALL OInterfaceContainer::addScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::addScriptListener( const Reference< XScriptListener >& xListener )
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->addScriptListener( xListener );
 }
 
 
-void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScriptListener >& xListener )
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->removeScriptListener( xListener );
@@ -1241,7 +1240,7 @@ void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScrip
 //= OFormComponents
 
 
-Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception)
+Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType)
 {
     Any aReturn = OFormComponents_BASE::queryInterface(_rType);
     if (!aReturn.hasValue())
@@ -1256,7 +1255,7 @@ Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(Runtime
 }
 
 
-Sequence<Type> SAL_CALL OFormComponents::getTypes() throw(RuntimeException, std::exception)
+Sequence<Type> SAL_CALL OFormComponents::getTypes()
 {
     return ::comphelper::concatSequences(OInterfaceContainer::getTypes(), FormComponentsBase::getTypes(), OFormComponents_BASE::getTypes());
 }
@@ -1298,14 +1297,14 @@ void OFormComponents::disposing()
 
 //XChild
 
-void OFormComponents::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw( NoSupportException, RuntimeException, std::exception )
+void OFormComponents::setParent(const css::uno::Reference<css::uno::XInterface>& Parent)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     m_xParent = Parent;
 }
 
 
-css::uno::Reference<css::uno::XInterface> OFormComponents::getParent() throw( RuntimeException, std::exception )
+css::uno::Reference<css::uno::XInterface> OFormComponents::getParent()
 {
     return m_xParent;
 }
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index abc6ab789283..af06c8a26811 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -80,7 +80,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx
index a2e89f829be2..42a673209da1 100644
--- a/forms/source/richtext/attributedispatcher.hxx
+++ b/forms/source/richtext/attributedispatcher.hxx
@@ -58,7 +58,7 @@ namespace frm
         virtual ~OAttributeDispatcher( ) override;
 
         // XDispatch
-        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
         // ITextAttributeListener
         virtual void    onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& _rState ) override;
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 9d068b428f26..125e47bd0d2f 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -106,7 +106,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OClipboardDispatcher::dispatch( const URL& /*_rURL*/, const Sequence< PropertyValue >& /*Arguments*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL OClipboardDispatcher::dispatch( const URL& /*_rURL*/, const Sequence< PropertyValue >& /*Arguments*/ )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !getEditView() )
diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx
index 64ef645dc28f..914b9bc86640 100644
--- a/forms/source/richtext/clipboarddispatcher.hxx
+++ b/forms/source/richtext/clipboarddispatcher.hxx
@@ -49,7 +49,7 @@ namespace frm
 
     protected:
         // XDispatch
-        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
         // ORichTextFeatureDispatcher
         virtual void    invalidateFeatureState_Broadcast() override;
diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx
index 6da6c8d9ba85..d01571bff032 100644
--- a/forms/source/richtext/featuredispatcher.cxx
+++ b/forms/source/richtext/featuredispatcher.cxx
@@ -65,7 +65,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ORichTextFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException, std::exception)
+    void SAL_CALL ORichTextFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL )
     {
         OSL_ENSURE( !m_bDisposed, "ORichTextFeatureDispatcher::addStatusListener: already disposed!" );
         if ( m_bDisposed )
@@ -81,7 +81,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ )
     {
         m_aStatusListeners.removeInterface( _rxControl );
     }
diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx
index 4fc296272bd0..423f88bb5db0 100644
--- a/forms/source/richtext/featuredispatcher.hxx
+++ b/forms/source/richtext/featuredispatcher.hxx
@@ -79,8 +79,8 @@ namespace frm
                 );
 
         // XDispatch
-        virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) override;
+        virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) override;
     };
 
 
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 607cba973d84..c52f3cc93763 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -110,7 +110,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OParametrizedAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception)
+    void SAL_CALL OParametrizedAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OParametrizedAttributeDispatcher::dispatch: invalid URL!" );
diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx
index 0dbe9d48ca34..8fe9cfbc2187 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.hxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.hxx
@@ -41,7 +41,7 @@ namespace frm
         virtual ~OParametrizedAttributeDispatcher() override;
 
         // XDispatch
-        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
         // OAttributeDispatcher
         virtual void    fillFeatureEventFromAttributeState( css::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const override;
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 6d1aa2c708f5..5bdd44154c93 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -63,7 +63,7 @@ namespace frm
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextControl, UnoEditControl, ORichTextControl_Base )
 
 
-    Any SAL_CALL ORichTextControl::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception )
+    Any SAL_CALL ORichTextControl::queryAggregation( const Type& _rType )
     {
         Any aReturn = UnoEditControl::queryAggregation( _rType );
 
@@ -144,7 +144,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ORichTextControl::createPeer( const Reference< XToolkit >& _rToolkit, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException, std::exception )
+    void SAL_CALL ORichTextControl::createPeer( const Reference< XToolkit >& _rToolkit, const Reference< XWindowPeer >& _rParentPeer )
     {
         bool bReallyActAsRichText = false;
         try
@@ -215,19 +215,19 @@ namespace frm
         }
     }
 
-    OUString SAL_CALL ORichTextControl::getImplementationName()  throw( RuntimeException, std::exception )
+    OUString SAL_CALL ORichTextControl::getImplementationName()
     {
         return OUString( "com.sun.star.comp.form.ORichTextControl" );
     }
 
-    Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames()  throw( RuntimeException, std::exception )
+    Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames()
     {
         return { "com.sun.star.awt.UnoControl",
                  "com.sun.star.awt.UnoControlEdit",
                  FRM_SUN_CONTROL_RICHTEXTCONTROL };
     }
 
-    Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException, std::exception)
+    Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags )
     {
         Reference< XDispatch > aReturn;
         Reference< XDispatchProvider > xTypedPeer( getPeer(), UNO_QUERY );
@@ -238,7 +238,7 @@ namespace frm
         return aReturn;
     }
 
-    Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException, std::exception)
+    Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests )
     {
         Sequence< Reference< XDispatch > > aReturn;
         Reference< XDispatchProvider > xTypedPeer( getPeer(), UNO_QUERY );
@@ -290,7 +290,7 @@ namespace frm
     }
 
 
-    void ORichTextPeer::dispose( ) throw(RuntimeException, std::exception)
+    void ORichTextPeer::dispose( )
     {
         {
             SolarMutexGuard aGuard;
@@ -316,7 +316,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(css::uno::RuntimeException, std::exception)
+    void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY )
     {
         SolarMutexGuard aGuard;
 
@@ -344,8 +344,6 @@ namespace frm
 
 
     void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue )
-        throw (RuntimeException,
-               std::exception)
     {
         SolarMutexGuard g;
 
@@ -594,7 +592,7 @@ namespace frm
     }
 
 
-    Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const css::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException, std::exception)
+    Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const css::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ )
     {
         Reference< XDispatch > xReturn;
         if ( !GetWindow() )
@@ -631,7 +629,7 @@ namespace frm
     }
 
 
-    Sequence< Reference< XDispatch > > SAL_CALL ORichTextPeer::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException, std::exception)
+    Sequence< Reference< XDispatch > > SAL_CALL ORichTextPeer::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests )
     {
         Sequence< Reference< XDispatch > >  aReturn( _rRequests.getLength() );
         Reference< XDispatch >*             pReturn = aReturn.getArray();
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index f0b9cb66c775..e19d68b08d8e 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -53,21 +53,21 @@ namespace frm
 
         // UNO
         DECLARE_UNO3_AGG_DEFAULTS( ORichTextControl, UnoEditControl )
-        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
         // XControl
-        virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()  throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XTypeProvider
         DECLARE_XTYPEPROVIDER()
 
         // XDispatchProvider
-        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) override;
 
         // UnoControl
         virtual bool   requiresNewPeer( const OUString& _rPropertyName ) const override;
@@ -103,22 +103,20 @@ namespace frm
         virtual ~ORichTextPeer() override;
 
         // XView
-        void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
 
         // XVclWindowPeer
-        virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue )
-            throw (css::uno::RuntimeException,
-                   std::exception) override;
+        virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
 
         // XTypeProvider
         DECLARE_XTYPEPROVIDER( )
 
         // XComponent
-        virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose( ) override;
 
         // XDispatchProvider
-        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) override;
 
         // ITextSelectionListener
         virtual void    onSelectionChanged( const ESelection& _rSelection ) override;
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 928dfc3a4877..6c7c58f9ff78 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -212,7 +212,7 @@ namespace frm
     }
 
 
-    Any SAL_CALL ORichTextModel::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception )
+    Any SAL_CALL ORichTextModel::queryAggregation( const Type& _rType )
     {
         Any aReturn = ORichTextModel_BASE::queryInterface( _rType );
 
@@ -225,12 +225,12 @@ namespace frm
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextModel, OControlModel, ORichTextModel_BASE )
 
-    OUString SAL_CALL ORichTextModel::getImplementationName() throw ( RuntimeException, std::exception )
+    OUString SAL_CALL ORichTextModel::getImplementationName()
     {
         return OUString( "com.sun.star.comp.forms.ORichTextModel" );
     }
 
-    Sequence< OUString > SAL_CALL ORichTextModel::getSupportedServiceNames() throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ORichTextModel::getSupportedServiceNames()
     {
         Sequence< OUString > aOwnNames( 8 );
         aOwnNames[ 0 ] = FRM_SUN_COMPONENT_RICHTEXTCONTROL;
@@ -329,7 +329,7 @@ namespace frm
     }
 
 
-    sal_Bool SAL_CALL ORichTextModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException, RuntimeException, std::exception )
+    sal_Bool SAL_CALL ORichTextModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
     {
         bool bModified = false;
 
@@ -350,7 +350,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ORichTextModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception)
+    void SAL_CALL ORichTextModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         if ( isRegisteredProperty( _nHandle ) )
         {
@@ -494,7 +494,7 @@ namespace frm
     }
 
 
-    OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException, std::exception)
+    OUString SAL_CALL ORichTextModel::getServiceName()
     {
         return OUString(FRM_SUN_COMPONENT_RICHTEXTCONTROL);
     }
@@ -552,7 +552,7 @@ namespace frm
     }
 
 
-    sal_Int64 SAL_CALL ORichTextModel::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException, std::exception)
+    sal_Int64 SAL_CALL ORichTextModel::getSomething( const Sequence< sal_Int8 >& _rId )
     {
         Sequence< sal_Int8 > aEditEngineAccessId( getEditEngineTunnelId() );
         if  (   ( _rId.getLength() == aEditEngineAccessId.getLength() )
@@ -568,13 +568,13 @@ namespace frm
     }
 
 
-    void SAL_CALL ORichTextModel::addModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL ORichTextModel::addModifyListener( const Reference< XModifyListener >& _rxListener )
     {
         m_aModifyListeners.addInterface( _rxListener );
     }
 
 
-    void SAL_CALL ORichTextModel::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL ORichTextModel::removeModifyListener( const Reference< XModifyListener >& _rxListener )
     {
         m_aModifyListeners.removeInterface( _rxListener );
     }
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index 4325dd6f3bff..f8a141642f66 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -105,34 +105,33 @@ namespace frm
 
         // UNO
         DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, OControlModel )
-        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw (::css::uno::RuntimeException, std::exception) override;
-        virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XPersistObject
-        virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getServiceName() override;
 
         // XTypeProvider
         DECLARE_XTYPEPROVIDER()
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         // XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
         // XModifyBroadcaster
-        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
         // XPropertySet and friends
         virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override;
         virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue,
-                                            sal_Int32 nHandle, const css::uno::Any& rValue )
-                                        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override;
+                                            sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override;
         virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override;
 
         // OControlModel's property handling
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index a745bb45caf4..e40711e26f14 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -51,8 +51,6 @@ namespace frm
 
 
     void SAL_CALL OSelectAllDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ )
-        throw (RuntimeException,
-               std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OSelectAllDispatcher::dispatch: invalid URL!" );
@@ -107,7 +105,7 @@ namespace frm
     }
 
 
-    void SAL_CALL OTextDirectionDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL OTextDirectionDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OTextDirectionDispatcher::dispatch: invalid URL!" );
diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx
index f7b2e0f0a169..aa60816e11dd 100644
--- a/forms/source/richtext/specialdispatchers.hxx
+++ b/forms/source/richtext/specialdispatchers.hxx
@@ -35,9 +35,7 @@ namespace frm
         virtual ~OSelectAllDispatcher() override;
 
         // XDispatch
-        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
-            throw (css::uno::RuntimeException,
-                   std::exception) override;
+        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
         // ORichTextFeatureDispatcher
         virtual css::frame::FeatureStateEvent  buildStatusEvent() const override;
@@ -65,7 +63,7 @@ namespace frm
 
     protected:
         // XDispatch
-        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
 
         // ORichTextFeatureDispatcher
         virtual css::frame::FeatureStateEvent  buildStatusEvent() const override;
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 75c56f19aee0..cf0571314994 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -131,7 +131,7 @@ namespace frm
     {
     }
 
-    void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments )
     {
         if ( m_bConstructed )
             throw AlreadyInitializedException();
@@ -152,56 +152,56 @@ namespace frm
         throw IllegalArgumentException( OUString(), *this, 0 );
     }
 
-    OUString SAL_CALL FormOperations::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL FormOperations::getImplementationName(  )
     {
         return OUString( "com.sun.star.comp.forms.FormOperations" );
     }
 
-    sal_Bool SAL_CALL FormOperations::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL FormOperations::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames(  )
     {
         return { "com.sun.star.form.runtime.FormOperations" };
     }
 
-    Reference< XRowSet > SAL_CALL FormOperations::getCursor() throw (RuntimeException, std::exception)
+    Reference< XRowSet > SAL_CALL FormOperations::getCursor()
     {
         MethodGuard aGuard( *this );
         return m_xCursor;
     }
 
-    Reference< XResultSetUpdate > SAL_CALL FormOperations::getUpdateCursor() throw (RuntimeException, std::exception)
+    Reference< XResultSetUpdate > SAL_CALL FormOperations::getUpdateCursor()
     {
         MethodGuard aGuard( *this );
         return m_xUpdateCursor;
     }
 
 
-    Reference< XFormController > SAL_CALL FormOperations::getController() throw (RuntimeException, std::exception)
+    Reference< XFormController > SAL_CALL FormOperations::getController()
     {
         MethodGuard aGuard( *this );
         return m_xController;
     }
 
 
-    Reference< XFeatureInvalidation > SAL_CALL FormOperations::getFeatureInvalidation() throw (RuntimeException, std::exception)
+    Reference< XFeatureInvalidation > SAL_CALL FormOperations::getFeatureInvalidation()
     {
         MethodGuard aGuard( *this );
         return m_xFeatureInvalidation;
     }
 
 
-    void SAL_CALL FormOperations::setFeatureInvalidation( const Reference< XFeatureInvalidation > & _rxFeatureInvalidation ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormOperations::setFeatureInvalidation( const Reference< XFeatureInvalidation > & _rxFeatureInvalidation )
     {
         MethodGuard aGuard( *this );
         m_xFeatureInvalidation = _rxFeatureInvalidation;
     }
 
 
-    FeatureState SAL_CALL FormOperations::getState( ::sal_Int16 _nFeature ) throw (RuntimeException, std::exception)
+    FeatureState SAL_CALL FormOperations::getState( ::sal_Int16 _nFeature )
     {
         MethodGuard aGuard( *this );
 
@@ -384,7 +384,7 @@ namespace frm
     }
 
 
-    sal_Bool SAL_CALL FormOperations::isEnabled( ::sal_Int16 _nFeature ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL FormOperations::isEnabled( ::sal_Int16 _nFeature )
     {
         MethodGuard aGuard( *this );
 
@@ -538,7 +538,7 @@ namespace frm
         }
     }
 
-    void SAL_CALL FormOperations::execute( ::sal_Int16 _nFeature ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException, std::exception)
+    void SAL_CALL FormOperations::execute( ::sal_Int16 _nFeature )
     {
         SolarMutexGuard aSolarGuard;
         MethodGuard aGuard( *this );
@@ -797,7 +797,7 @@ namespace frm
     }
 
 
-    void SAL_CALL FormOperations::executeWithArguments( ::sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException, std::exception)
+    void SAL_CALL FormOperations::executeWithArguments( ::sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments )
     {
         if ( !lcl_requiresArguments( _nFeature ) )
         {
@@ -854,7 +854,7 @@ namespace frm
     }
 
 
-    sal_Bool SAL_CALL FormOperations::commitCurrentRecord( sal_Bool& _out_rRecordInserted ) throw (RuntimeException, SQLException, std::exception)
+    sal_Bool SAL_CALL FormOperations::commitCurrentRecord( sal_Bool& _out_rRecordInserted )
     {
         MethodGuard aGuard( *this );
         _out_rRecordInserted = false;
@@ -891,7 +891,7 @@ namespace frm
     }
 
 
-    sal_Bool SAL_CALL FormOperations::commitCurrentControl() throw (RuntimeException, SQLException, std::exception)
+    sal_Bool SAL_CALL FormOperations::commitCurrentControl()
     {
         MethodGuard aGuard( *this );
         return impl_commitCurrentControl_throw();
@@ -942,7 +942,7 @@ namespace frm
     }
 
 
-    sal_Bool SAL_CALL FormOperations::isInsertionRow() throw (RuntimeException, WrappedTargetException, std::exception)
+    sal_Bool SAL_CALL FormOperations::isInsertionRow()
     {
         bool bIs = false;
         try
@@ -958,7 +958,7 @@ namespace frm
     }
 
 
-    sal_Bool SAL_CALL FormOperations::isModifiedRow() throw (RuntimeException, WrappedTargetException, std::exception)
+    sal_Bool SAL_CALL FormOperations::isModifiedRow()
     {
         bool bIs = false;
         try
@@ -974,7 +974,7 @@ namespace frm
     }
 
 
-    void SAL_CALL FormOperations::cursorMoved( const EventObject& /*_Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormOperations::cursorMoved( const EventObject& /*_Event*/ )
     {
         MethodGuard aGuard( *this );
         m_bActiveControlModified = false;
@@ -983,19 +983,19 @@ namespace frm
     }
 
 
-    void SAL_CALL FormOperations::rowChanged( const EventObject& /*_Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormOperations::rowChanged( const EventObject& /*_Event*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL FormOperations::rowSetChanged( const EventObject& /*_Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormOperations::rowSetChanged( const EventObject& /*_Event*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL FormOperations::modified( const EventObject& /*_Source*/ ) throw( RuntimeException, std::exception )
+    void SAL_CALL FormOperations::modified( const EventObject& /*_Source*/ )
     {
         MethodGuard aGuard( *this );
 
@@ -1008,7 +1008,7 @@ namespace frm
     }
 
 
-    void SAL_CALL FormOperations::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormOperations::propertyChange( const PropertyChangeEvent& _rEvent )
     {
         MethodGuard aGuard( *this );
 
@@ -1056,7 +1056,7 @@ namespace frm
     }
 
 
-    void SAL_CALL FormOperations::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormOperations::disposing( const EventObject& /*_Source*/ )
     {
         // TODO: should we react on this? Or is this the responsibility of our owner to dispose us?
     }
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 1e43dcd58801..29b2e04d5b73 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -101,41 +101,41 @@ namespace frm
         virtual ~FormOperations() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XFormOperations
-        virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getCursor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XResultSetUpdate > SAL_CALL getUpdateCursor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getController() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::form::runtime::XFeatureInvalidation > SAL_CALL getFeatureInvalidation() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFeatureInvalidation(const css::uno::Reference< css::form::runtime::XFeatureInvalidation > & the_value) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::form::runtime::FeatureState SAL_CALL getState(::sal_Int16 Feature) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isEnabled(::sal_Int16 Feature) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL execute(::sal_Int16 Feature) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sdbc::SQLException, css::lang::WrappedTargetException, std::exception) override;
-        virtual void SAL_CALL executeWithArguments(::sal_Int16 Feature, const css::uno::Sequence< css::beans::NamedValue >& Arguments) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sdbc::SQLException, css::lang::WrappedTargetException, std::exception) override;
-        virtual sal_Bool SAL_CALL commitCurrentRecord(sal_Bool & RecordInserted) throw (css::uno::RuntimeException, css::sdbc::SQLException, std::exception) override;
-        virtual sal_Bool SAL_CALL commitCurrentControl() throw (css::uno::RuntimeException, css::sdbc::SQLException, std::exception) override;
-        virtual sal_Bool SAL_CALL isInsertionRow() throw (css::uno::RuntimeException, css::lang::WrappedTargetException, std::exception) override;
-        virtual sal_Bool SAL_CALL isModifiedRow() throw (css::uno::RuntimeException, css::lang::WrappedTargetException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getCursor() override;
+        virtual css::uno::Reference< css::sdbc::XResultSetUpdate > SAL_CALL getUpdateCursor() override;
+        virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getController() override;
+        virtual css::uno::Reference< css::form::runtime::XFeatureInvalidation > SAL_CALL getFeatureInvalidation() override;
+        virtual void SAL_CALL setFeatureInvalidation(const css::uno::Reference< css::form::runtime::XFeatureInvalidation > & the_value) override;
+        virtual css::form::runtime::FeatureState SAL_CALL getState(::sal_Int16 Feature) override;
+        virtual sal_Bool SAL_CALL isEnabled(::sal_Int16 Feature) override;
+        virtual void SAL_CALL execute(::sal_Int16 Feature) override;
+        virtual void SAL_CALL executeWithArguments(::sal_Int16 Feature, const css::uno::Sequence< css::beans::NamedValue >& Arguments) override;
+        virtual sal_Bool SAL_CALL commitCurrentRecord(sal_Bool & RecordInserted) override;
+        virtual sal_Bool SAL_CALL commitCurrentControl() override;
+        virtual sal_Bool SAL_CALL isInsertionRow() override;
+        virtual sal_Bool SAL_CALL isModifiedRow() override;
 
         // XRowSetListener
-        virtual void SAL_CALL cursorMoved( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rowChanged( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rowSetChanged( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cursorMoved( const css::lang::EventObject& event ) override;
+        virtual void SAL_CALL rowChanged( const css::lang::EventObject& event ) override;
+        virtual void SAL_CALL rowSetChanged( const css::lang::EventObject& event ) override;
 
         // XModifyListener
-        virtual void SAL_CALL modified( const css::lang::EventObject& _rSource ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL modified( const css::lang::EventObject& _rSource ) override;
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) 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;
 
         // XComponent/OComponentHelper
         virtual void SAL_CALL disposing() override;
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index cd0f1c33fe47..e6aca3a50d95 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -71,7 +71,7 @@ namespace frm
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ONavigationBarControl, UnoControl, ONavigationBarControl_Base )
 
 
-    Any SAL_CALL ONavigationBarControl::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception )
+    Any SAL_CALL ONavigationBarControl::queryAggregation( const Type& _rType )
     {
         Any aReturn = UnoControl::queryAggregation( _rType );
 
@@ -112,7 +112,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ONavigationBarControl::createPeer( const Reference< XToolkit >& /*_rToolkit*/, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException, std::exception )
+    void SAL_CALL ONavigationBarControl::createPeer( const Reference< XToolkit >& /*_rToolkit*/, const Reference< XWindowPeer >& _rParentPeer )
     {
         SolarMutexGuard aGuard;
 
@@ -163,32 +163,32 @@ namespace frm
     }
 
 
-    OUString SAL_CALL ONavigationBarControl::getImplementationName()  throw( RuntimeException, std::exception )
+    OUString SAL_CALL ONavigationBarControl::getImplementationName()
     {
         return OUString( "com.sun.star.comp.form.ONavigationBarControl" );
     }
 
 
-    Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames()  throw( RuntimeException, std::exception )
+    Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames()
     {
         return { "com.sun.star.awt.UnoControl",
         "com.sun.star.form.control.NavigationToolBar" };
     }
 
 
-    void SAL_CALL ONavigationBarControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception)
+    void SAL_CALL ONavigationBarControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
         FORWARD_TO_PEER_1( XDispatchProviderInterception, registerDispatchProviderInterceptor, _rxInterceptor );
     }
 
 
-    void SAL_CALL ONavigationBarControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception)
+    void SAL_CALL ONavigationBarControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor )
     {
         FORWARD_TO_PEER_1( XDispatchProviderInterception, releaseDispatchProviderInterceptor, _rxInterceptor );
     }
 
 
-    void SAL_CALL ONavigationBarControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException, std::exception )
+    void SAL_CALL ONavigationBarControl::setDesignMode( sal_Bool _bOn )
     {
         UnoControl::setDesignMode( _bOn );
         FORWARD_TO_PEER_1( XVclWindowPeer, setDesignMode, _bOn );
@@ -253,14 +253,14 @@ namespace frm
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ONavigationBarPeer, VCLXWindow, OFormNavigationHelper )
 
 
-    void SAL_CALL ONavigationBarPeer::dispose(  ) throw( RuntimeException, std::exception )
+    void SAL_CALL ONavigationBarPeer::dispose(  )
     {
         VCLXWindow::dispose();
         OFormNavigationHelper::dispose();
     }
 
 
-    void SAL_CALL ONavigationBarPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException, std::exception )
+    void SAL_CALL ONavigationBarPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue )
     {
         SolarMutexGuard aGuard;
 
@@ -340,7 +340,7 @@ namespace frm
     }
 
 
-    Any SAL_CALL ONavigationBarPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException, std::exception )
+    Any SAL_CALL ONavigationBarPeer::getProperty( const OUString& _rPropertyName )
     {
         SolarMutexGuard aGuard;
 
@@ -446,7 +446,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ONavigationBarPeer::setDesignMode( sal_Bool _bOn ) throw( RuntimeException, std::exception )
+    void SAL_CALL ONavigationBarPeer::setDesignMode( sal_Bool _bOn )
     {
         VCLXWindow::setDesignMode( _bOn  );
 
@@ -458,7 +458,7 @@ namespace frm
     }
 
 
-    void SAL_CALL ONavigationBarPeer::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL ONavigationBarPeer::disposing( const EventObject& _rSource )
     {
         VCLXWindow::disposing( _rSource );
         OFormNavigationHelper::disposing( _rSource );
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 8f73cbe53a93..b13995a6ee0c 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -53,24 +53,24 @@ namespace frm
 
         // UNO
         DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarControl, UnoControl )
-        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
         // XControl
-        virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()  throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XTypeProvider
         DECLARE_XTYPEPROVIDER()
 
         // XVclWindowPeer
-        virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) override;
 
         // XDispatchProviderInterception
-        virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
+        virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override;
     };
 
     class ONavigationBarPeer
@@ -99,7 +99,7 @@ namespace frm
         DECLARE_XINTERFACE( )
 
         // XVclWindowPeer
-        virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) override;
 
         // XWindow2
         using VCLXWindow::isEnabled;
@@ -109,14 +109,14 @@ namespace frm
         DECLARE_XTYPEPROVIDER( )
 
         // XComponent
-        void SAL_CALL dispose(  ) throw( css::uno::RuntimeException, std::exception ) override;
+        void SAL_CALL dispose(  ) override;
 
         // XVclWindowPeer
-        void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw( css::uno::RuntimeException, std::exception ) override;
-        css::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override;
+        css::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) 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;
 
         // OFormNavigationHelper overriables
         virtual void    interceptorsChanged( ) override;
diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx
index aa2a86c10535..f5aad0950ea2 100644
--- a/forms/source/xforms/NameContainer.hxx
+++ b/forms/source/xforms/NameContainer.hxx
@@ -83,14 +83,12 @@ public:
     // methods for XElementAccess
 
 
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual css::uno::Type SAL_CALL getElementType() override
     {
         return cppu::UnoType<T>::get();
     }
 
-    virtual sal_Bool SAL_CALL hasElements()
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasElements() override
     {
         return ! maItems.empty();
     }
@@ -100,10 +98,7 @@ public:
 
 
     virtual css::uno::Any SAL_CALL getByName(
-        const OUString& rName )
-        throw( css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override
+        const OUString& rName ) override
     {
         typename map_t::const_iterator aIter = findItem( rName );
         if( aIter == maItems.end() )
@@ -112,15 +107,13 @@ public:
             return css::uno::makeAny( aIter->second );
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getElementNames()
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override
     {
         return comphelper::mapKeysToSequence(maItems);
     }
 
     virtual sal_Bool SAL_CALL hasByName(
-        const OUString& rName )
-        throw( css::uno::RuntimeException, std::exception ) override
+        const OUString& rName ) override
     {
         return hasItem( rName );
     }
@@ -131,11 +124,7 @@ public:
 
     virtual void SAL_CALL replaceByName(
         const OUString& rName,
-        const css::uno::Any& aElement )
-        throw( css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override
+        const css::uno::Any& aElement ) override
     {
         T aItem;
         if( aElement >>= aItem )
@@ -153,11 +142,7 @@ public:
 
     virtual void SAL_CALL insertByName(
         const OUString& rName,
-        const css::uno::Any& aElement )
-        throw( css::lang::IllegalArgumentException,
-               css::container::ElementExistException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override
+        const css::uno::Any& aElement ) override
     {
         T aItem;
         if( aElement >>= aItem )
@@ -170,10 +155,7 @@ public:
     }
 
     virtual void SAL_CALL removeByName(
-        const OUString& rName )
-        throw( css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override
+        const OUString& rName ) override
     {
         if( hasByName( rName ) )
             remove( rName );
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 120cc66faebc..b2ffdeb1aba3 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -450,7 +450,6 @@ bool Binding::getExternalData() const
 
 
 void Binding::checkLive()
-    throw( RuntimeException )
 {
     if( ! isLive() )
         throw RuntimeException( EXCEPT("Binding not initialized") );
@@ -994,20 +993,16 @@ void Binding::_checkBindingID()
 
 
 css::uno::Sequence<css::uno::Type> Binding::getSupportedValueTypes()
-    throw( RuntimeException, std::exception )
 {
     return Convert::get().getTypes();
 }
 
 sal_Bool Binding::supportsType( const css::uno::Type& rType )
-    throw( RuntimeException, std::exception )
 {
     return Convert::get().hasType( rType );
 }
 
 css::uno::Any Binding::getValue( const css::uno::Type& rType )
-    throw( IncompatibleTypesException,
-           RuntimeException, std::exception )
 {
     // first, check for model
     checkLive();
@@ -1028,10 +1023,6 @@ css::uno::Any Binding::getValue( const css::uno::Type& rType )
 }
 
 void Binding::setValue( const css::uno::Any& aValue )
-    throw( IncompatibleTypesException,
-           InvalidBindingStateException,
-           NoSupportException,
-           RuntimeException, std::exception )
 {
     // first, check for model
     checkLive();
@@ -1062,7 +1053,6 @@ void Binding::setValue( const css::uno::Any& aValue )
 
 
 sal_Int32 Binding::getListEntryCount()
-    throw( RuntimeException, std::exception )
 {
     // first, check for model
     checkLive();
@@ -1097,8 +1087,6 @@ static OUString lcl_getString( const Reference<XNode>& xNode )
 }
 
 OUString Binding::getListEntry( sal_Int32 nPosition )
-    throw( IndexOutOfBoundsException,
-           RuntimeException, std::exception )
 {
     // first, check for model
     checkLive();
@@ -1111,7 +1099,6 @@ OUString Binding::getListEntry( sal_Int32 nPosition )
 }
 
 Sequence<OUString> Binding::getAllListEntries()
-    throw( RuntimeException, std::exception )
 {
     // first, check for model
     checkLive();
@@ -1129,8 +1116,6 @@ Sequence<OUString> Binding::getAllListEntries()
 }
 
 void Binding::addListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& xListener )
-    throw( NullPointerException,
-           RuntimeException, std::exception )
 {
     OSL_ENSURE( xListener.is(), "need listener!" );
     if( ::std::find( maListEntryListeners.begin(),
@@ -1141,8 +1126,6 @@ void Binding::addListEntryListener( const css::uno::Reference<css::form::binding
 }
 
 void Binding::removeListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& xListener )
-    throw( NullPointerException,
-           RuntimeException, std::exception )
 {
     XListEntryListeners_t::iterator aIter =
         ::std::find( maListEntryListeners.begin(), maListEntryListeners.end(),
@@ -1156,7 +1139,6 @@ void Binding::removeListEntryListener( const css::uno::Reference<css::form::bind
 
 
 sal_Bool Binding::isValid( const css::uno::Any& )
-    throw( RuntimeException, std::exception )
 {
     // first, check for model
     checkLive();
@@ -1167,7 +1149,6 @@ sal_Bool Binding::isValid( const css::uno::Any& )
 
 OUString Binding::explainInvalid(
     const css::uno::Any& /*Value*/ )
-    throw( RuntimeException, std::exception )
 {
     // first, check for model
     checkLive();
@@ -1178,8 +1159,6 @@ OUString Binding::explainInvalid(
 
 void Binding::addValidityConstraintListener(
     const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener )
-    throw( NullPointerException,
-           RuntimeException, std::exception )
 {
     OSL_ENSURE( xListener.is(), "need listener!" );
     if( ::std::find(maValidityListeners.begin(), maValidityListeners.end(), xListener)
@@ -1189,8 +1168,6 @@ void Binding::addValidityConstraintListener(
 
 void Binding::removeValidityConstraintListener(
     const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener )
-    throw( NullPointerException,
-           RuntimeException, std::exception )
 {
     XValidityConstraintListeners_t::iterator aIter =
         ::std::find( maValidityListeners.begin(), maValidityListeners.end(),
@@ -1204,7 +1181,6 @@ void Binding::removeValidityConstraintListener(
 
 
 void Binding::handleEvent( const css::uno::Reference<css::xml::dom::events::XEvent>& xEvent )
-    throw( RuntimeException, std::exception )
 {
     OUString sType(xEvent->getType());
     //OUString sEventMIPChanged("xforms-generic");
@@ -1236,7 +1212,6 @@ void Binding::handleEvent( const css::uno::Reference<css::xml::dom::events::XEve
 
 
 sal_Int64 Binding::getSomething( const css::uno::Sequence<sal_Int8>& xId )
-    throw( RuntimeException, std::exception )
 {
     return reinterpret_cast<sal_Int64>( ( xId == getUnoTunnelID() ) ? this : nullptr );
 }
@@ -1246,7 +1221,6 @@ sal_Int64 Binding::getSomething( const css::uno::Sequence<sal_Int8>& xId )
 
 
 css::uno::Reference<css::util::XCloneable> SAL_CALL Binding::createClone()
-    throw( RuntimeException, std::exception )
 {
     Reference< XPropertySet > xClone;
 
@@ -1302,7 +1276,6 @@ void Binding::initializePropertySet()
 
 void Binding::addModifyListener(
     const css::uno::Reference<css::util::XModifyListener>& xListener )
-    throw( RuntimeException, std::exception )
 {
     OSL_ENSURE( xListener.is(), "need listener!" );
     if( ::std::find( maModifyListeners.begin(), maModifyListeners.end(), xListener )
@@ -1317,7 +1290,6 @@ void Binding::addModifyListener(
 
 void Binding::removeModifyListener(
     const css::uno::Reference<css::util::XModifyListener>& xListener )
-    throw( RuntimeException, std::exception )
 {
     ModifyListeners_t::iterator aIter =
         ::std::find( maModifyListeners.begin(), maModifyListeners.end(), xListener );
@@ -1327,13 +1299,11 @@ void Binding::removeModifyListener(
 
 
 OUString Binding::getName()
-    throw( RuntimeException, std::exception )
 {
     return getBindingID();
 }
 
 void SAL_CALL Binding::setName( const OUString& rName )
-    throw( RuntimeException, std::exception )
 {
     // use the XPropertySet methods, so the change in the name is notified to the
     // property listeners
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index 6a75a7e9ea98..9f1220ff1618 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -266,7 +266,7 @@ private:
     /// (to be used be API methods before acting on the object)
     ///
     /// @throws css::uno::RuntimeException
-    void checkLive() throw( css::uno::RuntimeException );
+    void checkLive();
 
     /// determine whether object is live
     /// live: has model, and model has been initialized
@@ -321,65 +321,43 @@ private:
 
 public:
 
-    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getSupportedValueTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence<css::uno::Type> SAL_CALL getSupportedValueTypes() override;
 
-    virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) override;
 
-    virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType )
-        throw( css::form::binding::IncompatibleTypesException,
-               css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) override;
 
-    virtual void SAL_CALL setValue( const css::uno::Any& aValue )
-        throw( css::form::binding::IncompatibleTypesException,
-               css::form::binding::InvalidBindingStateException,
-               css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setValue( const css::uno::Any& aValue ) override;
 
 
     // XListEntry Source
 
 
-    virtual sal_Int32 SAL_CALL getListEntryCount()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getListEntryCount() override;
 
-    virtual OUString SAL_CALL getListEntry( sal_Int32 nPosition )
-        throw( css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getListEntry( sal_Int32 nPosition ) override;
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getAllListEntries()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getAllListEntries() override;
 
-    virtual void SAL_CALL addListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& )
-        throw( css::lang::NullPointerException,
-               css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL addListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& ) override;
 
-    virtual void SAL_CALL removeListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>&)
-        throw( css::lang::NullPointerException,
-               css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>&) override;
 
 
     // XValidator:
 
 
     virtual sal_Bool SAL_CALL isValid(
-        const css::uno::Any& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Any& ) override;
 
     virtual OUString SAL_CALL explainInvalid(
-        const css::uno::Any& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Any& ) override;
 
     virtual void SAL_CALL addValidityConstraintListener(
-        const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener )
-        throw( css::lang::NullPointerException,
-               css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) override;
 
     virtual void SAL_CALL removeValidityConstraintListener(
-        const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener )
-        throw( css::lang::NullPointerException,
-               css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) override;
 
 
     // XModifyBroadcaster & friends:
@@ -389,12 +367,10 @@ public:
 public:
 
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference<css::util::XModifyListener>& xListener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference<css::util::XModifyListener>& xListener ) override;
 
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference<css::util::XModifyListener>& xListener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference<css::util::XModifyListener>& xListener ) override;
 
 
     // XNamed:
@@ -403,11 +379,9 @@ public:
 
 public:
 
-    virtual OUString SAL_CALL getName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
 
-    virtual void SAL_CALL setName( const OUString& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setName( const OUString& ) override;
 
 
     // xml::dom::event::XEventListener
@@ -415,22 +389,19 @@ public:
 
 
     virtual void SAL_CALL handleEvent(
-        const css::uno::Reference<css::xml::dom::events::XEvent>& xEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference<css::xml::dom::events::XEvent>& xEvent ) override;
 
 
     // XUnoTunnel
 
 
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& ) override;
 
 
     // XCloneable
 
 
-    virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() override;
 };
 
 
diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx
index 4f860cc4b46e..fe40dc4c9633 100644
--- a/forms/source/xforms/collection.hxx
+++ b/forms/source/xforms/collection.hxx
@@ -144,29 +144,23 @@ protected:
 public:
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual css::uno::Type SAL_CALL getElementType() override
     {
         return cppu::UnoType<T>::get();
     }
 
-    virtual sal_Bool SAL_CALL hasElements()
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasElements() override
     {
         return hasItems();
     }
 
     // XIndexAccess : XElementAccess
-    virtual sal_Int32 SAL_CALL getCount()
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual sal_Int32 SAL_CALL getCount() override
     {
         return countItems();
     }
 
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex )
-        throw( css::lang::IndexOutOfBoundsException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override
     {
         if( isValidIndex( nIndex ) )
             return css::uno::makeAny( getItem( nIndex ) );
@@ -176,11 +170,7 @@ public:
 
     // XIndexReplace : XIndexAccess
     virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex,
-                                          const css::uno::Any& aElement )
-        throw( css::lang::IllegalArgumentException,
-               css::lang::IndexOutOfBoundsException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override
+                                          const css::uno::Any& aElement ) override
     {
         T t;
         if( isValidIndex( nIndex) )
@@ -193,25 +183,20 @@ public:
     }
 
     // XEnumerationAccess : XElementAccess
-    virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration()
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() override
     {
         return new Enumeration( this );
     }
 
 
     // XSet : XEnumerationAccess
-    virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement )
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) override
     {
         T t;
         return ( aElement >>= t ) && hasItem( t );
     }
 
-    virtual void SAL_CALL insert( const css::uno::Any& aElement )
-        throw( css::lang::IllegalArgumentException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL insert( const css::uno::Any& aElement ) override
     {
         T t;
         if( ( aElement >>= t )  &&  isValid( t ) )
@@ -223,10 +208,7 @@ public:
             throw css::lang::IllegalArgumentException();
     }
 
-    virtual void SAL_CALL remove( const css::uno::Any& aElement )
-        throw( css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL remove( const css::uno::Any& aElement ) override
     {
         T t;
         if( aElement >>= t )
@@ -241,8 +223,7 @@ public:
 
     // XContainer
     virtual void SAL_CALL addContainerListener(
-        const css::uno::Reference<css::container::XContainerListener>& xListener )
-        throw( css::uno::RuntimeException, std::exception ) override
+        const css::uno::Reference<css::container::XContainerListener>& xListener ) override
     {
         OSL_ENSURE( xListener.is(), "need listener!" );
         if( std::find( maListeners.begin(), maListeners.end(), xListener)
@@ -251,8 +232,7 @@ public:
     }
 
     virtual void SAL_CALL removeContainerListener(
-        const css::uno::Reference<css::container::XContainerListener>& xListener )
-        throw( css::uno::RuntimeException, std::exception ) override
+        const css::uno::Reference<css::container::XContainerListener>& xListener ) override
     {
         OSL_ENSURE( xListener.is(), "need listener!" );
         Listeners_t::iterator aIter =
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index 3bb4794344a9..e50b09de09e9 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -105,7 +105,7 @@ namespace xforms
     }
 
 
-    Reference< XDataType > SAL_CALL ODataTypeRepository::getBasicDataType( sal_Int16 dataTypeClass ) throw (NoSuchElementException, RuntimeException, std::exception)
+    Reference< XDataType > SAL_CALL ODataTypeRepository::getBasicDataType( sal_Int16 dataTypeClass )
     {
         Reference< XDataType > xReturn;
 
@@ -125,7 +125,7 @@ namespace xforms
     }
 
 
-    Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const OUString& sourceName, const OUString& newName ) throw (NoSuchElementException, ElementExistException, RuntimeException, std::exception)
+    Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const OUString& sourceName, const OUString& newName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -141,7 +141,7 @@ namespace xforms
     }
 
 
-    void SAL_CALL ODataTypeRepository::revokeDataType( const OUString& typeName ) throw (NoSuchElementException, VetoException, RuntimeException, std::exception)
+    void SAL_CALL ODataTypeRepository::revokeDataType( const OUString& typeName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -154,26 +154,26 @@ namespace xforms
     }
 
 
-    Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const OUString& typeName ) throw (NoSuchElementException, RuntimeException, std::exception)
+    Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const OUString& typeName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return implLocate( typeName )->second.get();
     }
 
 
-    Reference< XEnumeration > SAL_CALL ODataTypeRepository::createEnumeration(  ) throw (RuntimeException, std::exception)
+    Reference< XEnumeration > SAL_CALL ODataTypeRepository::createEnumeration(  )
     {
         return new ::comphelper::OEnumerationByName( this );
     }
 
 
-    Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName )
     {
         return makeAny( getDataType( aName ) );
     }
 
 
-    Sequence< OUString > SAL_CALL ODataTypeRepository::getElementNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ODataTypeRepository::getElementNames(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -181,20 +181,20 @@ namespace xforms
     }
 
 
-    sal_Bool SAL_CALL ODataTypeRepository::hasByName( const OUString& aName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL ODataTypeRepository::hasByName( const OUString& aName )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_aRepository.find( aName ) != m_aRepository.end();
     }
 
 
-    Type SAL_CALL ODataTypeRepository::getElementType(  ) throw (RuntimeException, std::exception)
+    Type SAL_CALL ODataTypeRepository::getElementType(  )
     {
         return cppu::UnoType<XDataType>::get();
     }
 
 
-    sal_Bool SAL_CALL ODataTypeRepository::hasElements(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL ODataTypeRepository::hasElements(  )
     {
         return !m_aRepository.empty();
     }
diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx
index 15c7702c19f3..9138a1a5e8d6 100644
--- a/forms/source/xforms/datatyperepository.hxx
+++ b/forms/source/xforms/datatyperepository.hxx
@@ -50,22 +50,22 @@ namespace xforms
         virtual ~ODataTypeRepository( ) override;
 
         // XDataTypeRepository
-        virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) throw (css::container::NoSuchElementException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL revokeDataType( const OUString& typeName ) throw (css::container::NoSuchElementException, css::util::VetoException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) override;
+        virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) override;
+        virtual void SAL_CALL revokeDataType( const OUString& typeName ) override;
+        virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) override;
 
         // XEnumerationAccess (base of XDataTypeRepository)
-        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
         // XNameAccess (base of XDataTypeRepository)
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
         // XElementAccess (base of XEnumerationAccess and XNameAccess)
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     private:
         ODataTypeRepository( const ODataTypeRepository& ) = delete;
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 90e307ab0b30..707dce52a2eb 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -108,62 +108,62 @@ namespace xforms
     SAL_WARN_IF( member != value, "forms.misc", "OXSDDataType::setFoo: inconsistency!" );
 
 
-    OUString SAL_CALL OXSDDataType::getName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OXSDDataType::getName(  )
     {
         return m_sName;
     }
 
 
-    void SAL_CALL OXSDDataType::setName( const OUString& aName ) throw (RuntimeException, VetoException, std::exception)
+    void SAL_CALL OXSDDataType::setName( const OUString& aName )
     {
         // TODO: check the name for conflicts in the repository
         SET_PROPERTY( NAME, aName, m_sName );
     }
 
 
-    OUString SAL_CALL OXSDDataType::getPattern() throw (RuntimeException, std::exception)
+    OUString SAL_CALL OXSDDataType::getPattern()
     {
         return m_sPattern;
     }
 
 
-    void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern ) throw (RuntimeException, std::exception)
+    void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern )
     {
         SET_PROPERTY( XSD_PATTERN, _pattern, m_sPattern );
     }
 
 
-    sal_Int16 SAL_CALL OXSDDataType::getWhiteSpaceTreatment() throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL OXSDDataType::getWhiteSpaceTreatment()
     {
         return m_nWST;
     }
 
 
-    void SAL_CALL OXSDDataType::setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (RuntimeException, IllegalArgumentException, std::exception)
+    void SAL_CALL OXSDDataType::setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment )
     {
         SET_PROPERTY( XSD_WHITESPACE, _whitespacetreatment, m_nWST );
     }
 
 
-    sal_Bool SAL_CALL OXSDDataType::getIsBasic() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OXSDDataType::getIsBasic()
     {
         return m_bIsBasic;
     }
 
 
-    sal_Int16 SAL_CALL OXSDDataType::getTypeClass() throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL OXSDDataType::getTypeClass()
     {
         return m_nTypeClass;
     }
 
 
-    sal_Bool OXSDDataType::validate( const OUString& sValue ) throw( RuntimeException, std::exception )
+    sal_Bool OXSDDataType::validate( const OUString& sValue )
     {
         return ( _validate( sValue ) == 0 );
     }
 
 
-  OUString OXSDDataType::explainInvalid( const OUString& sValue ) throw( RuntimeException, std::exception )
+  OUString OXSDDataType::explainInvalid( const OUString& sValue )
     {
         // get reason
         sal_uInt16 nReason = _validate( sValue );
@@ -237,7 +237,7 @@ namespace xforms
     }
 
 
-    sal_Bool OXSDDataType::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException)
+    sal_Bool OXSDDataType::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
     {
         // let the base class do the conversion
         if ( !OXSDDataType_PBase::convertFastPropertyValue( _rConvertedValue, _rOldValue, _nHandle, _rValue ) )
@@ -257,7 +257,7 @@ namespace xforms
     }
 
 
-    void SAL_CALL OXSDDataType::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception)
+    void SAL_CALL OXSDDataType::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         OXSDDataType_PBase::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
         if ( _nHandle == PROPERTY_ID_XSD_PATTERN )
@@ -285,37 +285,37 @@ namespace xforms
     }
 
 
-    void SAL_CALL OXSDDataType::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OXSDDataType::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
     {
         OXSDDataType_PBase::setPropertyValue( aPropertyName, aValue );
     }
 
 
-    Any SAL_CALL OXSDDataType::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL OXSDDataType::getPropertyValue( const OUString& PropertyName )
     {
         return OXSDDataType_PBase::getPropertyValue( PropertyName );
     }
 
 
-    void SAL_CALL OXSDDataType::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OXSDDataType::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener )
     {
         OXSDDataType_PBase::addPropertyChangeListener( aPropertyName, xListener );
     }
 
 
-    void SAL_CALL OXSDDataType::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OXSDDataType::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener )
     {
         OXSDDataType_PBase::removePropertyChangeListener( aPropertyName, aListener );
     }
 
 
-    void SAL_CALL OXSDDataType::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OXSDDataType::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener )
     {
         OXSDDataType_PBase::addVetoableChangeListener( PropertyName, aListener );
     }
 
 
-    void SAL_CALL OXSDDataType::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OXSDDataType::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener )
     {
         OXSDDataType_PBase::removeVetoableChangeListener( PropertyName, aListener );
     }
@@ -351,7 +351,7 @@ namespace xforms
 
 
     void SAL_CALL OValueLimitedType_Base::setFastPropertyValue_NoBroadcast(
-        sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception)
+        sal_Int32 _nHandle, const css::uno::Any& _rValue )
     {
         OXSDDataType::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
 
@@ -955,7 +955,7 @@ template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
 
 
 template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS >
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getPropertySetInfo() throw( css::uno::RuntimeException )
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getPropertySetInfo()
 {
         return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
 }
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index 5f1d40551535..db20dfb758c0 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -81,37 +81,36 @@ namespace xforms
         DECLARE_XINTERFACE()
         DECLARE_XTYPEPROVIDER()
 
-        virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, css::util::VetoException, std::exception) override;
-        virtual OUString SAL_CALL getPattern() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPattern( const OUString& _pattern ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-        virtual sal_Bool SAL_CALL getIsBasic() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override;
-
-        virtual sal_Bool SAL_CALL validate( const OUString& value ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL explainInvalid( const OUString& value ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName(  ) override;
+        virtual void SAL_CALL setName( const OUString& aName ) override;
+        virtual OUString SAL_CALL getPattern() override;
+        virtual void SAL_CALL setPattern( const OUString& _pattern ) override;
+        virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() override;
+        virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) override;
+        virtual sal_Bool SAL_CALL getIsBasic() override;
+        virtual sal_Int16 SAL_CALL getTypeClass() override;
+
+        virtual sal_Bool SAL_CALL validate( const OUString& value ) override;
+        virtual OUString SAL_CALL explainInvalid( const OUString& value ) override;
 
         // XPropertySet - is a base of XDataType and needs to be disambiguated
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     public:
         OXSDDataType* clone( const OUString& _rNewName ) const;
 
     protected:
         // XPropertySet and friends
-        virtual sal_Bool SAL_CALL   convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw(css::lang::IllegalArgumentException) override;
+        virtual sal_Bool SAL_CALL   convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
         virtual void SAL_CALL       setFastPropertyValue_NoBroadcast(
                                         sal_Int32 nHandle,
                                         const css::uno::Any& rValue
-                                    )
-                                    throw (css::uno::Exception, std::exception) override;
+                                    ) override;
 
         // --- own overridables ---
         // helper for implementing cloning of data types
@@ -174,8 +173,7 @@ namespace xforms
         virtual void SAL_CALL       setFastPropertyValue_NoBroadcast(
                                         sal_Int32 nHandle,
                                         const css::uno::Any& rValue
-                                    )
-                                    throw (css::uno::Exception, std::exception) override;
+                                    ) override;
 
         // OXSDDataType overridables
         virtual bool            _getValue( const OUString& value, double& fValue );
@@ -236,7 +234,7 @@ namespace xforms
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE;
 
         // XPropertySet
-        virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException) SAL_OVERRIDE;
+        virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() SAL_OVERRIDE;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
     };
 
diff --git a/forms/source/xforms/enumeration.cxx b/forms/source/xforms/enumeration.cxx
index 623666b7c686..ace7e3f5ae2b 100644
--- a/forms/source/xforms/enumeration.cxx
+++ b/forms/source/xforms/enumeration.cxx
@@ -43,7 +43,6 @@ Enumeration::Enumeration( XIndexAccess* pContainer )
 }
 
 sal_Bool Enumeration::hasMoreElements()
-    throw( RuntimeException, std::exception )
 {
     if( ! mxContainer.is() )
         throw RuntimeException();
@@ -52,9 +51,6 @@ sal_Bool Enumeration::hasMoreElements()
 }
 
 Any Enumeration::nextElement()
-    throw( NoSuchElementException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     if( ! mxContainer.is() )
         throw RuntimeException();
diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx
index 6b9b24b6041f..f5cc97ae0dd5 100644
--- a/forms/source/xforms/enumeration.hxx
+++ b/forms/source/xforms/enumeration.hxx
@@ -43,13 +43,9 @@ class Enumeration
 public:
     explicit Enumeration( css::container::XIndexAccess* );
 
-    virtual sal_Bool SAL_CALL hasMoreElements()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
 
-    virtual css::uno::Any SAL_CALL nextElement()
-        throw( css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 };
 
 #endif
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 5420394189a3..f90bf15c3553 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -399,21 +399,18 @@ bool Model::isValid() const
 
 
 OUString Model::getID()
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     return msID;
 }
 
 void Model::setID( const OUString& sID )
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     msID = sID;
 }
 
 void Model::initialize()
-    throw( RuntimeException, std::exception )
 {
     DBG_ASSERT( ! mbInitialized, "model already initialized" );
 
@@ -426,7 +423,6 @@ void Model::initialize()
 }
 
 void Model::rebuild()
-    throw( RuntimeException, std::exception )
 {
     if( ! mbInitialized )
         initialize();
@@ -435,19 +431,16 @@ void Model::rebuild()
 }
 
 void Model::recalculate()
-    throw( RuntimeException, std::exception )
 {
     rebind();
 }
 
 void Model::revalidate()
-    throw( RuntimeException, std::exception )
 {
     // do nothing. We don't validate anyways!
 }
 
 void Model::refresh()
-    throw( RuntimeException, std::exception )
 {
     rebind();
 }
@@ -456,9 +449,6 @@ void Model::refresh()
 void SAL_CALL Model::submitWithInteraction(
     const OUString& sID,
     const css::uno::Reference<css::task::XInteractionHandler>& _rxHandler )
-    throw( VetoException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     DBG_INVARIANT();
 
@@ -476,13 +466,11 @@ void SAL_CALL Model::submitWithInteraction(
 }
 
 void Model::submit( const OUString& sID )
-    throw( VetoException, WrappedTargetException, RuntimeException, std::exception )
 {
     submitWithInteraction( sID, nullptr );
 }
 
 css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL Model::getDataTypeRepository(  )
-    throw( RuntimeException, std::exception )
 {
     if ( !mxDataTypes.is() )
         mxDataTypes = new ODataTypeRepository;
@@ -495,13 +483,11 @@ css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL Model::getDataTyp
 
 
 css::uno::Reference<css::container::XSet> Model::getInstances()
-    throw( RuntimeException, std::exception )
 {
     return mxInstances.get();
 }
 
 css::uno::Reference<css::xml::dom::XDocument> Model::getInstanceDocument( const OUString& rName )
-    throw( RuntimeException, std::exception )
 {
     ensureAtLeastOneInstance();
     Reference<XDocument> aInstance;
@@ -513,7 +499,6 @@ css::uno::Reference<css::xml::dom::XDocument> Model::getInstanceDocument( const
 }
 
 css::uno::Reference<css::xml::dom::XDocument> SAL_CALL Model::getDefaultInstance()
-    throw( RuntimeException, std::exception )
 {
     ensureAtLeastOneInstance();
     DBG_ASSERT( mxInstances->countItems() > 0, "no instance?" );
@@ -527,14 +512,12 @@ css::uno::Reference<css::xml::dom::XDocument> SAL_CALL Model::getDefaultInstance
 
 
 Model::XPropertySet_t SAL_CALL Model::createBinding()
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     return new Binding();
 }
 
 Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding )
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     XPropertySet_t xNewBinding = createBinding();
@@ -543,14 +526,12 @@ Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding )
 }
 
 Model::XPropertySet_t Model::getBinding( const OUString& sId )
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     return mxBindings->hasItem( sId ) ? mxBindings->getItem( sId ) : nullptr;
 }
 
 css::uno::Reference<css::container::XSet> Model::getBindings()
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     return mxBindings.get();
@@ -561,14 +542,12 @@ css::uno::Reference<css::container::XSet> Model::getBindings()
 
 
 css::uno::Reference<css::xforms::XSubmission> Model::createSubmission()
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     return new Submission();
 }
 
 css::uno::Reference<css::xforms::XSubmission> Model::cloneSubmission(const XPropertySet_t& xSubmission)
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     css::uno::Reference<css::xforms::XSubmission> xNewSubmission = createSubmission();
@@ -578,7 +557,6 @@ css::uno::Reference<css::xforms::XSubmission> Model::cloneSubmission(const XProp
 }
 
 css::uno::Reference<css::xforms::XSubmission> Model::getSubmission( const OUString& sId )
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     css::uno::Reference<css::xforms::XSubmission> xSubmission;
@@ -588,7 +566,6 @@ css::uno::Reference<css::xforms::XSubmission> Model::getSubmission( const OUStri
 }
 
 css::uno::Reference<css::container::XSet> Model::getSubmissions()
-    throw( RuntimeException, std::exception )
 {
     DBG_INVARIANT();
     return mxSubmissions.get();
@@ -626,38 +603,32 @@ void Model::initializePropertySet()
 }
 
 void Model::update()
-    throw( RuntimeException, std::exception )
 {
     rebuild();
 }
 
 
 sal_Int64 Model::getSomething( const css::uno::Sequence<sal_Int8>& xId )
-    throw( RuntimeException, std::exception )
 {
     return reinterpret_cast<sal_Int64>( ( xId == getUnoTunnelID() ) ? this : nullptr );
 }
 
 Sequence<sal_Int8> Model::getImplementationId()
-    throw( RuntimeException )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 OUString Model::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.form.Model");
 }
 
 sal_Bool Model::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> Model::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{"com.sun.star.xforms.Model"};
 }
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 2b79153a22b5..cda182010041 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -182,106 +182,78 @@ public:
     //    implement the xforms::XModel implementation
 
 
-    virtual OUString SAL_CALL getID()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getID() override;
 
-    virtual void SAL_CALL setID( const OUString& sID )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setID( const OUString& sID ) override;
 
-    virtual void SAL_CALL initialize()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize() override;
 
-    virtual void SAL_CALL rebuild()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL rebuild() override;
 
-    virtual void SAL_CALL recalculate()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL recalculate() override;
 
-    virtual void SAL_CALL revalidate()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL revalidate() override;
 
-    virtual void SAL_CALL refresh()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL refresh() override;
 
-    virtual void SAL_CALL submit( const OUString& sID )
-        throw( css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL submit( const OUString& sID ) override;
 
-    virtual void SAL_CALL submitWithInteraction( const OUString& id, const css::uno::Reference<css::task::XInteractionHandler>& _rxHandler )
-        throw( css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL submitWithInteraction( const OUString& id, const css::uno::Reference<css::task::XInteractionHandler>& _rxHandler ) override;
 
-    virtual css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL getDataTypeRepository(  )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL getDataTypeRepository(  ) override;
 
 
     // XModel: instance management
 
-    virtual css::uno::Reference<css::container::XSet> SAL_CALL getInstances()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::container::XSet> SAL_CALL getInstances() override;
 
-    virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getInstanceDocument( const OUString& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getInstanceDocument( const OUString& ) override;
 
-    virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getDefaultInstance()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getDefaultInstance() override;
 
 
     // XModel: binding management
 
-    virtual XPropertySet_t SAL_CALL createBinding()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual XPropertySet_t SAL_CALL createBinding() override;
 
-    virtual XPropertySet_t SAL_CALL cloneBinding( const XPropertySet_t& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual XPropertySet_t SAL_CALL cloneBinding( const XPropertySet_t& ) override;
 
-    virtual XPropertySet_t SAL_CALL getBinding( const OUString& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual XPropertySet_t SAL_CALL getBinding( const OUString& ) override;
 
-    virtual css::uno::Reference<css::container::XSet> SAL_CALL getBindings()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::container::XSet> SAL_CALL getBindings() override;
 
 
     // XModel: submission management
 
-    virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL createSubmission()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL createSubmission() override;
 
-    virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL cloneSubmission( const XPropertySet_t& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL cloneSubmission( const XPropertySet_t& ) override;
 
-    virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL getSubmission( const OUString& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL getSubmission( const OUString& ) override;
 
-    virtual css::uno::Reference<css::container::XSet> SAL_CALL getSubmissions()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::container::XSet> SAL_CALL getSubmissions() override;
 
     // XPropertySet
 
-    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p)
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p) override
         { return PropertySetBase::getPropertyValue(p); }
 
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
-        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
         { PropertySetBase::addPropertyChangeListener(p1, p2); }
 
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
-        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
         { PropertySetBase::removePropertyChangeListener(p1, p2); }
 
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
-        throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
         { PropertySetBase::addVetoableChangeListener(p1, p2); }
 
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
-        throw( css::beans::UnknownPropertyException,  css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
         { PropertySetBase::removeVetoableChangeListener(p1, p2); }
 
-    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo()
-        throw( css::uno::RuntimeException, std::exception ) override
+    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override
         { return PropertySetBase::getPropertySetInfo(); }
 
-   virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2)
-        throw( css::uno::RuntimeException, std::exception ) override
+   virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override
         { PropertySetBase::setPropertyValue(p1, p2); }
 
 
@@ -291,10 +263,10 @@ public:
 
     /// determine a reasonable control service for a given node
     /// (based on data type MIP assigned to the node)
-    virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) override;
 
     /// call getDefaultBindingExpressionForNode with default evaluation context
-    virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) override;
 
     /// determine a reasonable default binding expression for a given node
     /// and a given evaluation context
@@ -304,122 +276,95 @@ public:
         const EvaluationContext& );
 
     virtual OUString SAL_CALL getNodeDisplayName( const XNode_t&,
-                                                       sal_Bool bDetail )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                                       sal_Bool bDetail ) override;
 
-    virtual OUString SAL_CALL getNodeName( const XNode_t& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getNodeName( const XNode_t& ) override;
 
     virtual OUString SAL_CALL getBindingName( const XPropertySet_t&,
-                                                   sal_Bool bDetail )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                                   sal_Bool bDetail ) override;
 
     virtual OUString SAL_CALL getSubmissionName( const XPropertySet_t&,
-                                                      sal_Bool bDetail )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                                      sal_Bool bDetail ) override;
 
-    virtual XPropertySet_t SAL_CALL cloneBindingAsGhost( const XPropertySet_t& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual XPropertySet_t SAL_CALL cloneBindingAsGhost( const XPropertySet_t& ) override;
 
-    virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& ) override;
 
     virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL newInstance( const OUString& sName,
                                               const OUString& sURL,
-                                              sal_Bool bURLOnce )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                              sal_Bool bURLOnce ) override;
 
     virtual void SAL_CALL renameInstance( const OUString& sFrom,
                                           const OUString& sTo,
                                           const OUString& sURL,
-                                          sal_Bool bURLOnce )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                          sal_Bool bURLOnce ) override;
 
-    virtual void SAL_CALL removeInstance( const OUString& sName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeInstance( const OUString& sName ) override;
 
 
     virtual css::uno::Reference<css::xforms::XModel> SAL_CALL newModel( const css::uno::Reference<css::frame::XModel>& xComponent,
-                                        const OUString& sName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                        const OUString& sName ) override;
     virtual void SAL_CALL renameModel( const css::uno::Reference<css::frame::XModel>& xComponent,
                                        const OUString& sFrom,
-                                       const OUString& sTo )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                       const OUString& sTo ) override;
 
     virtual void SAL_CALL removeModel( const css::uno::Reference<css::frame::XModel>& xComponent,
-                                       const OUString& sName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                       const OUString& sName ) override;
 
 
     virtual XNode_t SAL_CALL createElement( const XNode_t& xParent,
-                                            const OUString& sName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                            const OUString& sName ) override;
 
     virtual XNode_t SAL_CALL createAttribute( const XNode_t& xParent,
-                                              const OUString& sName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                              const OUString& sName ) override;
 
     virtual XNode_t SAL_CALL renameNode( const XNode_t& xNode,
-                                         const OUString& sName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                         const OUString& sName ) override;
 
     virtual XPropertySet_t SAL_CALL getBindingForNode( const XNode_t&,
-                                                       sal_Bool bCreate )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                                       sal_Bool bCreate ) override;
 
-    virtual void SAL_CALL removeBindingForNode( const XNode_t& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeBindingForNode( const XNode_t& ) override;
 
     virtual OUString SAL_CALL getResultForExpression(
         const XPropertySet_t& xBinding,
         sal_Bool bIsBindingExpression,
-        const OUString& sExpression )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const OUString& sExpression ) override;
 
-    virtual sal_Bool SAL_CALL isValidXMLName( const OUString& sName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isValidXMLName( const OUString& sName ) override;
 
-    virtual sal_Bool SAL_CALL isValidPrefixName( const OUString& sName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isValidPrefixName( const OUString& sName ) override;
 
     virtual void SAL_CALL setNodeValue(
         const XNode_t& xNode,
-        const OUString& sValue )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const OUString& sValue ) override;
 
 
     // XUpdatable
 
 
 public:
-    virtual void SAL_CALL update()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL update() override;
 
 
     // XUnoTunnel
 
 
 public:
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& ) override;
 
 
     // XTypeProvider::getImplementationId
 
 
 public:
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException ) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 } // namespace
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index b279301ad8fc..e5a899340836 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -68,7 +68,6 @@ using namespace com::sun::star::xml::xpath;
 
 
 OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode )
-    throw( RuntimeException, std::exception )
 {
     // determine service for control. string/text field is default.
     OUString sService = "com.sun.star.form.component.TextField";
@@ -250,7 +249,6 @@ OUString Model::getDefaultBindingExpressionForNode(
 
 
 OUString Model::getDefaultBindingExpressionForNode( const XNode_t& xNode )
-    throw( RuntimeException, std::exception )
 {
     return getDefaultBindingExpressionForNode( xNode, getEvaluationContext() );
 }
@@ -274,7 +272,6 @@ static bool lcl_isWhitespace( const OUString& rString )
 
 OUString Model::getNodeDisplayName( const XNode_t& xNode,
                                     sal_Bool bDetail )
-    throw( RuntimeException, std::exception )
 {
     OUStringBuffer aBuffer;
 
@@ -316,7 +313,6 @@ OUString Model::getNodeDisplayName( const XNode_t& xNode,
 }
 
 OUString Model::getNodeName( const XNode_t& xNode )
-    throw( RuntimeException, std::exception )
 {
     OUStringBuffer aBuffer;
 
@@ -340,7 +336,6 @@ OUString Model::getNodeName( const XNode_t& xNode )
 
 OUString Model::getBindingName( const XPropertySet_t& xBinding,
                                 sal_Bool /*bDetail*/ )
-    throw( RuntimeException, std::exception )
 {
     OUString sID;
     xBinding->getPropertyValue( "BindingID" ) >>= sID;
@@ -360,7 +355,6 @@ OUString Model::getBindingName( const XPropertySet_t& xBinding,
 
 OUString Model::getSubmissionName( const XPropertySet_t& xSubmission,
                                    sal_Bool /*bDetail*/ )
-    throw( RuntimeException, std::exception )
 {
     OUString sID;
     xSubmission->getPropertyValue( "ID" ) >>= sID;
@@ -368,7 +362,6 @@ OUString Model::getSubmissionName( const XPropertySet_t& xSubmission,
 }
 
 Model::XPropertySet_t Model::cloneBindingAsGhost( const XPropertySet_t &xBinding )
-    throw( RuntimeException, std::exception )
 {
     // Create a new binding instance first...
     Binding *pBinding = new Binding();
@@ -385,7 +378,6 @@ Model::XPropertySet_t Model::cloneBindingAsGhost( const XPropertySet_t &xBinding
 }
 
 void Model::removeBindingIfUseless( const XPropertySet_t& xBinding )
-    throw( RuntimeException, std::exception )
 {
     Binding* pBinding = Binding::getBinding( xBinding );
     if( pBinding != nullptr )
@@ -398,7 +390,6 @@ void Model::removeBindingIfUseless( const XPropertySet_t& xBinding )
 css::uno::Reference<css::xml::dom::XDocument> Model::newInstance( const OUString& sName,
                          const OUString& sURL,
                          sal_Bool bURLOnce )
-    throw( RuntimeException, std::exception )
 {
     // create a default instance with <instanceData> element
     css::uno::Reference<css::xml::dom::XDocument> xInstance = getDocumentBuilder()->newDocument();
@@ -449,7 +440,6 @@ void Model::renameInstance( const OUString& sFrom,
                             const OUString& sTo,
                             const OUString& sURL,
                             sal_Bool bURLOnce )
-    throw( RuntimeException, std::exception )
 {
     sal_Int32 nPos = lcl_findInstance( mxInstances.get(), sFrom );
     if( nPos != -1 )
@@ -487,7 +477,6 @@ void Model::renameInstance( const OUString& sFrom,
 }
 
 void Model::removeInstance( const OUString& sName )
-    throw( RuntimeException, std::exception )
 {
     sal_Int32 nPos = lcl_findInstance( mxInstances.get(), sName );
     if( nPos != -1 )
@@ -508,7 +497,6 @@ static Reference<XNameContainer> lcl_getModels(
 
 css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<css::frame::XModel>& xCmp,
                                  const OUString& sName )
-    throw( RuntimeException, std::exception )
 {
     css::uno::Reference<css::xforms::XModel> xModel;
     Reference<XNameContainer> xModels = lcl_getModels( xCmp );
@@ -530,7 +518,6 @@ css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<css::f
 void Model::renameModel( const Reference<css::frame::XModel>& xCmp,
                          const OUString& sFrom,
                          const OUString& sTo )
-    throw( RuntimeException, std::exception )
 {
     Reference<XNameContainer> xModels = lcl_getModels( xCmp );
     if( xModels.is()
@@ -546,7 +533,6 @@ void Model::renameModel( const Reference<css::frame::XModel>& xCmp,
 
 void Model::removeModel( const Reference<css::frame::XModel>& xCmp,
                          const OUString& sName )
-    throw( RuntimeException, std::exception )
 {
     Reference<XNameContainer> xModels = lcl_getModels( xCmp );
     if( xModels.is()
@@ -558,7 +544,6 @@ void Model::removeModel( const Reference<css::frame::XModel>& xCmp,
 
 Model::XNode_t Model::createElement( const XNode_t& xParent,
                                      const OUString& sName )
-    throw( RuntimeException, std::exception )
 {
     Reference<XNode> xNode;
     if( xParent.is()
@@ -573,7 +558,6 @@ Model::XNode_t Model::createElement( const XNode_t& xParent,
 
 Model::XNode_t Model::createAttribute( const XNode_t& xParent,
                                        const OUString& sName )
-    throw( RuntimeException, std::exception )
 {
     Reference<XNode> xNode;
     Reference<XElement> xElement( xParent, UNO_QUERY );
@@ -599,7 +583,6 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent,
 
 Model::XNode_t Model::renameNode( const XNode_t& xNode,
                                   const OUString& sName )
-    throw( RuntimeException, std::exception )
 {
     // early out if we don't have to change the name
     if( xNode->getNodeName() == sName )
@@ -683,7 +666,6 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode,
 
 Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode,
                                                 sal_Bool bCreate )
-    throw( RuntimeException, std::exception )
 {
     OSL_ENSURE( xNode.is(), "no node?" );
 
@@ -739,7 +721,6 @@ Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode,
 }
 
 void Model::removeBindingForNode( const XNode_t& )
-    throw( RuntimeException, std::exception )
 {
     // determine whether suitable binding is still used
 }
@@ -880,7 +861,6 @@ OUString Model::getResultForExpression(
     const XPropertySet_t& xBinding,
     sal_Bool bIsBindingExpression,
     const OUString& sExpression )
-    throw( RuntimeException, std::exception )
 {
     Binding* pBinding = Binding::getBinding( xBinding );
     if( pBinding == nullptr )
@@ -914,13 +894,11 @@ OUString Model::getResultForExpression(
 }
 
 sal_Bool Model::isValidXMLName( const OUString& sName )
-    throw( RuntimeException, std::exception )
 {
     return isValidQName( sName, nullptr );
 }
 
 sal_Bool Model::isValidPrefixName( const OUString& sName )
-    throw( RuntimeException, std::exception )
 {
     return ::isValidPrefixName( sName, nullptr );
 }
@@ -928,7 +906,6 @@ sal_Bool Model::isValidPrefixName( const OUString& sName )
 void Model::setNodeValue(
     const XNode_t& xNode,
     const OUString& sValue )
-    throw( RuntimeException, std::exception )
 {
     setSimpleContent( xNode, sValue );
 }
diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx
index 4cd629b54688..c0a31bd99b83 100644
--- a/forms/source/xforms/namedcollection.hxx
+++ b/forms/source/xforms/namedcollection.hxx
@@ -84,24 +84,19 @@ protected:
 public:
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw( css::uno::RuntimeException ) override
+    virtual css::uno::Type SAL_CALL getElementType() override
     {
         return Collection<T>::getElementType();
     }
 
-    virtual sal_Bool SAL_CALL hasElements()
-        throw( css::uno::RuntimeException ) override
+    virtual sal_Bool SAL_CALL hasElements() override
     {
         return Collection<T>::hasElements();
     }
 
     // XNameAccess : XElementAccess
     virtual css::uno::Any SAL_CALL getByName(
-        const OUString& aName )
-        throw( css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException ) override
+        const OUString& aName ) override
     {
         if( hasItem( aName ) )
             return css::uno::makeAny( getItem( aName ) );
@@ -110,15 +105,13 @@ public:
 
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getElementNames()
-        throw( css::uno::RuntimeException ) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override
     {
         return getNames();
     }
 
     virtual sal_Bool SAL_CALL hasByName(
-        const OUString& aName )
-        throw( css::uno::RuntimeException ) override
+        const OUString& aName ) override
     {
         return hasItem( aName );
     }
diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx
index db3c36cf1d22..cf0dfa62613e 100644
--- a/forms/source/xforms/propertysetbase.cxx
+++ b/forms/source/xforms/propertysetbase.cxx
@@ -63,7 +63,7 @@ cppu::IPropertyArrayHelper& SAL_CALL PropertySetBase::getInfoHelper()
     return *m_pProperties;
 }
 
-Reference< XPropertySetInfo > SAL_CALL PropertySetBase::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL PropertySetBase::getPropertySetInfo(  )
 {
     return cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
 }
@@ -139,7 +139,6 @@ PropertyAccessorBase& PropertySetBase::locatePropertyHandler( sal_Int32 nHandle
 
 sal_Bool SAL_CALL PropertySetBase::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle,
     const Any& rValue )
-    throw (IllegalArgumentException)
 {
     PropertyAccessorBase& rAccessor = locatePropertyHandler( nHandle );
     if ( !rAccessor.approveValue( rValue ) )
@@ -155,7 +154,6 @@ sal_Bool SAL_CALL PropertySetBase::convertFastPropertyValue( Any& rConvertedValu
 }
 
 void SAL_CALL PropertySetBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
-    throw (Exception, std::exception)
 {
     PropertyAccessorBase& rAccessor = locatePropertyHandler( nHandle );
     rAccessor.setValue( rValue );
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index 7d9f6b6a337c..a02a6a7e00bc 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -253,14 +253,12 @@ protected:
     void initializePropertyValueCache( sal_Int32 nHandle );
 
     /// OPropertysetHelper methods
-    virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw (css::lang::IllegalArgumentException) override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+    virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
     virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
 public:
     /// helper struct for granting selective access to some notification-related methods
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 7ad6dd810688..c2ebb3e23f14 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -284,7 +284,6 @@ Submission* Submission::getSubmission(
 
 
 void Submission::liveCheck()
-    throw( RuntimeException )
 {
     bool bValid = mxModel.is();
 
@@ -355,7 +354,6 @@ void Submission::initializePropertySet()
 
 sal_Bool SAL_CALL Submission::convertFastPropertyValue(
     Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue )
-    throw ( IllegalArgumentException )
 {
     if ( nHandle == HANDLE_IncludeNamespacePrefixes )
     {
@@ -378,13 +376,11 @@ sal_Bool SAL_CALL Submission::convertFastPropertyValue(
 }
 
 OUString SAL_CALL Submission::getName()
-    throw( RuntimeException, std::exception )
 {
     return getID();
 }
 
 void SAL_CALL Submission::setName( const OUString& sID )
-    throw( RuntimeException, std::exception )
 {
     setID( sID );
 }
@@ -392,7 +388,6 @@ void SAL_CALL Submission::setName( const OUString& sID )
 
 sal_Int64 SAL_CALL Submission::getSomething(
     const Sequence<sal_Int8>& aId )
-    throw( RuntimeException, std::exception )
 {
     return ( aId == getUnoTunnelID() ) ? reinterpret_cast<sal_Int64>(this) : 0;
 }
@@ -406,9 +401,6 @@ static OUString lcl_message( const OUString& rID, const OUString& rText )
 
 void SAL_CALL Submission::submitWithInteraction(
     const Reference<XInteractionHandler>& _rxHandler )
-    throw ( VetoException,
-            WrappedTargetException,
-            RuntimeException, std::exception )
 {
     // as long as this class is not really threadsafe, we need to copy
     // the members we're interested in
@@ -497,18 +489,18 @@ void SAL_CALL Submission::submitWithInteraction(
     }
 }
 
-void SAL_CALL Submission::submit( ) throw ( VetoException, WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL Submission::submit( )
 {
     submitWithInteraction( nullptr );
 }
 
-void SAL_CALL Submission::addSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL Submission::addSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ )
 {
     // TODO
     throw NoSupportException();
 }
 
-void SAL_CALL Submission::removeSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL Submission::removeSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ )
 {
     // TODO
     throw NoSupportException();
@@ -590,31 +582,31 @@ Reference< XDocumentFragment > Submission::createSubmissionDocument(const Refere
 
 // some forwarding: XPropertySet is implemented in our base class,
 // but also available as base of XSubmission
-Reference< css::beans::XPropertySetInfo > SAL_CALL Submission::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL Submission::getPropertySetInfo(  )
 {
     return PropertySetBase::getPropertySetInfo();
 }
-void SAL_CALL Submission::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Submission::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
 {
     PropertySetBase::setPropertyValue( aPropertyName, aValue );
 }
-Any SAL_CALL Submission::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL Submission::getPropertyValue( const OUString& PropertyName )
 {
     return PropertySetBase::getPropertyValue( PropertyName );
 }
-void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& xListener )
 {
     PropertySetBase::addPropertyChangeListener( aPropertyName, xListener );
 }
-void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& aListener )
 {
     PropertySetBase::removePropertyChangeListener( aPropertyName, aListener );
 }
-void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener )
 {
     PropertySetBase::addVetoableChangeListener( PropertyName, aListener );
 }
-void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener )
 {
     PropertySetBase::removeVetoableChangeListener( PropertyName, aListener );
 }
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index fac867fc753d..836e3a098c07 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -167,8 +167,7 @@ private:
     /// (to be used be API methods before acting on the object)
     ///
     /// @throws css::uno::RuntimeException
-    void liveCheck()
-        throw( css::uno::RuntimeException );
+    void liveCheck();
 
     /// get the model implementation
     xforms::Model* getModelImpl() const;
@@ -184,8 +183,7 @@ protected:
         css::uno::Any& rConvertedValue,
         css::uno::Any& rOldValue,
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw ( css::lang::IllegalArgumentException ) override;
+        const css::uno::Any& rValue ) override;
 
 private:
     void initializePropertySet();
@@ -198,51 +196,40 @@ public:
     //   get/set name
 
 
-    virtual OUString SAL_CALL getName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
 
-    virtual void SAL_CALL setName( const OUString& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setName( const OUString& ) override;
 
 
     // XUnoTunnel
 
 
     virtual sal_Int64 SAL_CALL getSomething(
-        const css::uno::Sequence<sal_Int8>& )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Sequence<sal_Int8>& ) override;
 
 
     // XSubmission
 
 
-    virtual void SAL_CALL submit(  )
-        throw ( css::util::VetoException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL submit(  ) override;
     virtual void SAL_CALL submitWithInteraction(
-        const css::uno::Reference< css::task::XInteractionHandler >& aHandler )
-        throw ( css::util::VetoException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) override;
     virtual void SAL_CALL addSubmissionVetoListener(
-        const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener )
-        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) override;
     virtual void SAL_CALL removeSubmissionVetoListener(
-        const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener )
-        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) override;
 
 
     // XPropertySet
     // (need to disambiguate this)
 
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 };
 
 
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index bfdb0922898d..facbc64d5be7 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -62,11 +62,11 @@ protected:
     css::uno::Reference< css::ucb::XProgressHandler >       m_aProgressHandler;
 
 public:
-    virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() override
     {
         return m_aInteractionHandler;
     }
-    virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() override
     {
         return m_aProgressHandler;
     }
@@ -85,16 +85,16 @@ public:
     CProgressHandlerHelper()
         : m_count(0)
     {}
-    virtual void SAL_CALL push( const css::uno::Any& /*aStatus*/) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL push( const css::uno::Any& /*aStatus*/) override
     {
         m_mLock.acquire();
         m_count++;
         m_mLock.release();
     }
-    virtual void SAL_CALL update(const css::uno::Any& /*aStatus*/) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL update(const css::uno::Any& /*aStatus*/) override
     {
     }
-    virtual void SAL_CALL pop() throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL pop() override
     {
         m_mLock.acquire();
         m_count--;
diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx
index 1ca4843f2bac..9c6081abe2af 100644
--- a/forms/source/xforms/xforms_services.cxx
+++ b/forms/source/xforms/xforms_services.cxx
@@ -35,16 +35,13 @@ class Implementation:
         NameContainer<css::uno::Reference<css::beans::XPropertySet>>,
         css::lang::XServiceInfo>
 {
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.form.XForms"); }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return css::uno::Sequence<OUString>{"com.sun.star.xforms.XForms"};
     }
diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx
index 63bcc482539d..c11664308295 100644
--- a/forms/source/xforms/xformsevent.cxx
+++ b/forms/source/xforms/xformsevent.cxx
@@ -29,57 +29,56 @@ using com::sun::star::uno::RuntimeException;
 
 void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg,
     sal_Bool canBubbleArg, sal_Bool cancelableArg)
-    throw (RuntimeException, std::exception)
 {
     initEvent(typeArg, canBubbleArg, cancelableArg);
 }
 
-OUString SAL_CALL XFormsEventConcrete::getType() throw (RuntimeException, std::exception)
+OUString SAL_CALL XFormsEventConcrete::getType()
 {
     return m_eventType;
 }
 
-css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getTarget() throw (RuntimeException, std::exception)
+css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getTarget()
 {
     return m_target;
 }
 
-css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getCurrentTarget() throw (RuntimeException, std::exception)
+css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getCurrentTarget()
 {
     return m_currentTarget;
 }
 
-css::xml::dom::events::PhaseType SAL_CALL XFormsEventConcrete::getEventPhase() throw (RuntimeException, std::exception)
+css::xml::dom::events::PhaseType SAL_CALL XFormsEventConcrete::getEventPhase()
 {
     return css::xml::dom::events::PhaseType_CAPTURING_PHASE;
 }
 
-sal_Bool SAL_CALL XFormsEventConcrete::getBubbles() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL XFormsEventConcrete::getBubbles()
 {
     return m_bubbles;
 }
 
-sal_Bool SAL_CALL XFormsEventConcrete::getCancelable() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL XFormsEventConcrete::getCancelable()
 {
     return m_cancelable;
 }
 
-css::util::Time SAL_CALL XFormsEventConcrete::getTimeStamp() throw (RuntimeException, std::exception)
+css::util::Time SAL_CALL XFormsEventConcrete::getTimeStamp()
 {
     return m_time;
 }
 
-void SAL_CALL XFormsEventConcrete::stopPropagation() throw (RuntimeException, std::exception)
+void SAL_CALL XFormsEventConcrete::stopPropagation()
 {
     if(m_cancelable)
         m_canceled = true;
 }
-void SAL_CALL XFormsEventConcrete::preventDefault() throw (RuntimeException, std::exception)
+void SAL_CALL XFormsEventConcrete::preventDefault()
 {
 }
 
 void SAL_CALL XFormsEventConcrete::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg,
-    sal_Bool cancelableArg) throw (RuntimeException, std::exception)
+    sal_Bool cancelableArg)
 {
     m_eventType = eventTypeArg;
     m_bubbles = canBubbleArg;
diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx
index 36bbcecddb94..3bdfb857cbe3 100644
--- a/forms/source/xforms/xformsevent.hxx
+++ b/forms/source/xforms/xformsevent.hxx
@@ -41,27 +41,25 @@ class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > {
         {
         }
 
-        virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getType() override;
+        virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override;
+        virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override;
+        virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override;
+        virtual sal_Bool SAL_CALL getBubbles() override;
+        virtual sal_Bool SAL_CALL getCancelable() override;
+        virtual css::util::Time SAL_CALL getTimeStamp() override;
+        virtual void SAL_CALL stopPropagation() override;
+        virtual void SAL_CALL preventDefault() override;
 
         virtual void SAL_CALL initXFormsEvent(
                             const OUString& typeArg,
                             sal_Bool canBubbleArg,
-                            sal_Bool cancelableArg )
-                            throw (css::uno::RuntimeException, std::exception) override;
+                            sal_Bool cancelableArg ) override;
 
         virtual void SAL_CALL initEvent(
             const OUString& eventTypeArg,
             sal_Bool canBubbleArg,
-            sal_Bool cancelableArg)
-            throw (css::uno::RuntimeException, std::exception) override;
+            sal_Bool cancelableArg) override;
 
     private:
 
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 5bf519918960..e171ac422328 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -30,7 +30,7 @@ using namespace com::sun::star::xforms;
 using namespace com::sun::star::xml::xpath;
 using namespace com::sun::star::beans;
 
-Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHandle() throw (RuntimeException, std::exception)
+Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHandle()
 {
     Libxml2ExtensionHandle aHandle;
     aHandle.functionLookupFunction = reinterpret_cast< sal_Int64 >( &xforms_lookupFunc );
@@ -40,7 +40,7 @@ Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHand
     return aHandle;
 }
 
-void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequence) throw (RuntimeException, std::exception)
+void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequence)
 {
     if (aSequence.getLength() == 2
         && (aSequence[0] >>= m_aModel)
diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx
index b364a9be1f5b..906b4b70de28 100644
--- a/forms/source/xforms/xpathlib/extension.hxx
+++ b/forms/source/xforms/xpathlib/extension.hxx
@@ -49,8 +49,8 @@ public:
     const css::uno::Reference< css::xforms::XModel >& getModel() { return m_aModel;}
     const css::uno::Reference< css::xml::dom::XNode >& getContextNode() { return m_aContextNode;}
 
-    virtual css::xml::xpath::Libxml2ExtensionHandle SAL_CALL getLibxml2ExtensionHandle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& aSequence) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::xml::xpath::Libxml2ExtensionHandle SAL_CALL getLibxml2ExtensionHandle() override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& aSequence) override;
 
 };
 
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index c034b640300e..24395386d0cf 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -32,7 +32,7 @@ namespace formula
 {
     using namespace ::com::sun::star;
 
-sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL FormulaOpCodeMapperObj::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -47,14 +47,12 @@ FormulaOpCodeMapperObj::~FormulaOpCodeMapperObj()
 }
 
 ::sal_Int32 SAL_CALL FormulaOpCodeMapperObj::getOpCodeExternal()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return ocExternal;
 }
 
 
 ::sal_Int32 SAL_CALL FormulaOpCodeMapperObj::getOpCodeUnknown()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return FormulaCompiler::OpCodeMap::getOpCodeUnknown();
 }
@@ -64,8 +62,6 @@ css::uno::Sequence< css::sheet::FormulaToken >
 SAL_CALL FormulaOpCodeMapperObj::getMappings(
         const css::uno::Sequence< OUString >& rNames,
         sal_Int32 nLanguage )
-    throw ( css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception)
 {
     FormulaCompiler::OpCodeMapPtr xMap = m_pCompiler->GetOpCodeMap( nLanguage);
     if (!xMap)
@@ -77,8 +73,6 @@ SAL_CALL FormulaOpCodeMapperObj::getMappings(
 css::uno::Sequence< css::sheet::FormulaOpCodeMapEntry >
 SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings(
         sal_Int32 nLanguage, sal_Int32 nGroups )
-    throw ( css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception)
 {
     FormulaCompiler::OpCodeMapPtr xMap = m_pCompiler->GetOpCodeMap( nLanguage);
     if (!xMap)
@@ -86,7 +80,7 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings(
     return xMap->createSequenceOfAvailableMappings( *m_pCompiler,nGroups);
 }
 
-OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
@@ -96,7 +90,7 @@ OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static()
     return OUString( "simple.formula.FormulaOpCodeMapperObj" );
 }
 
-uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index dc49f3534a9a..90c4604b01d2 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -83,23 +83,19 @@ public:
     //XFilterManager delegates
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter );
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    void SAL_CALL setCurrentFilter( const OUString& aTitle );
 
     /// @throws css::uno::RuntimeException
-    OUString SAL_CALL getCurrentFilter(  )
-        throw( css::uno::RuntimeException );
+    OUString SAL_CALL getCurrentFilter(  );
 
     //XFilterGroupManager delegates
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters );
 
 
     //accessor
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index 2e06025bc6ce..2eb54b0d94b9 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -261,7 +261,6 @@ void FilterHelper::SetFilters()
 }
 
 void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilterString)
-throw( css::lang::IllegalArgumentException, css::uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -279,13 +278,11 @@ throw( css::lang::IllegalArgumentException, css::uno::RuntimeException )
 }
 
 void FilterHelper::setCurrentFilter( const ::rtl::OUString& aTitle )
-throw( css::lang::IllegalArgumentException, css::uno::RuntimeException )
 {
     SetCurFilter(aTitle);
 }
 
 ::rtl::OUString SAL_CALL FilterHelper::getCurrentFilter(  )
-throw( css::uno::RuntimeException )
 {
     ::rtl::OUString sReturn = (m_aCurrentFilter);
 
@@ -293,7 +290,6 @@ throw( css::uno::RuntimeException )
 }
 
 void SAL_CALL FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
 
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 658fa7df259e..a4ffa6893e42 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -52,100 +52,74 @@ public:
 
     // XFilePickerNotifier
 
-    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) override;
-    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
+    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
     // XFilePicker functions
 
-    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override;
 
-    virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDefaultName( const OUString& aName ) override;
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( css::lang::IllegalArgumentException,
-               css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  ) override;
 
     // XFilterManager functions
 
-    virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) override;
 
-    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) override;
 
-    virtual OUString SAL_CALL getCurrentFilter(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getCurrentFilter(  ) override;
 
     // XFilterGroupManager functions
 
-    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
+    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) override;
 
     // XFilePickerControlAccess functions
 
-    virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& aValue )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& aValue ) override;
 
-    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) override;
 
-    virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-        throw(css::uno::RuntimeException ) override;
+    virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) override;
 
-    virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) override;
 
-    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
-        throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) override;
 
     // XInitialization
 
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw(css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XCancellable
 
-    virtual void SAL_CALL cancel( )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XEventListener
 
     using cppu::WeakComponentImplHelperBase::disposing;
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
-        throw(css::uno::RuntimeException);
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent );
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // FilePicker Event functions
 
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index d24682024aff..1e8de0e13113 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -94,14 +94,12 @@ SalAquaFilePicker::~SalAquaFilePicker()
 #pragma mark XFilePickerNotifier
 
 void SAL_CALL SalAquaFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
-    throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
     m_xListener = xListener;
 }
 
 void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& )
-    throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
     m_xListener.clear();
@@ -109,13 +107,13 @@ void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference<
 
 #pragma mark XAsynchronousExecutableDialog
 
-void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle )
 {
     SolarMutexGuard aGuard;
     implsetTitle(aTitle);
 }
 
-sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
+sal_Int16 SAL_CALL SalAquaFilePicker::execute()
 {
     SolarMutexGuard aGuard;
 
@@ -200,7 +198,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
 
 #pragma mark XFilePicker
 
-void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ )
 {
     SolarMutexGuard aGuard;
 
@@ -210,7 +208,6 @@ void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ ) t
 }
 
 void SAL_CALL SalAquaFilePicker::setDefaultName( const rtl::OUString& aName )
-throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -218,21 +215,20 @@ throw( uno::RuntimeException )
 }
 
 void SAL_CALL SalAquaFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
     implsetDisplayDirectory(rDirectory);
 }
 
-rtl::OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory() throw( uno::RuntimeException )
+rtl::OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory()
 {
     rtl::OUString retVal = implgetDisplayDirectory();
 
     return retVal;
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::RuntimeException )
+uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles()
 {
     uno::Sequence< rtl::OUString > aSelectedFiles = getSelectedFiles();
     // multiselection doesn't really work with getFiles
@@ -243,7 +239,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::
     return aSelectedFiles;
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() throw( uno::RuntimeException, std::exception )
+uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
 {
     SolarMutexGuard aGuard;
 
@@ -310,7 +306,6 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() thro
 #pragma mark XFilterManager
 
 void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -320,7 +315,6 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
 }
 
 void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -331,7 +325,7 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
     updateSaveFileNameExtension();
 }
 
-rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() throw( uno::RuntimeException )
+rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter()
 {
     SolarMutexGuard aGuard;
 
@@ -343,7 +337,6 @@ rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() throw( uno::Runtime
 #pragma mark XFilterGroupManager
 
 void SAL_CALL SalAquaFilePicker::appendFilterGroup( const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters )
-throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -355,7 +348,6 @@ throw( lang::IllegalArgumentException, uno::RuntimeException )
 #pragma mark XFilePickerControlAccess
 
 void SAL_CALL SalAquaFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue )
-throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -367,7 +359,6 @@ throw( uno::RuntimeException )
 }
 
 uno::Any SAL_CALL SalAquaFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction )
-throw( uno::RuntimeException )
 {
     uno::Any aValue = m_pControlHelper->getValue(nControlId, nControlAction);
 
@@ -375,13 +366,11 @@ throw( uno::RuntimeException )
 }
 
 void SAL_CALL SalAquaFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-throw( uno::RuntimeException )
 {
     m_pControlHelper->enableControl(nControlId, bEnable);
 }
 
 void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel )
-throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -390,7 +379,6 @@ throw( uno::RuntimeException )
 }
 
 rtl::OUString SAL_CALL SalAquaFilePicker::getLabel( sal_Int16 nControlId )
-throw( uno::RuntimeException )
 {
     return m_pControlHelper->getLabel(nControlId);
 }
@@ -398,7 +386,6 @@ throw( uno::RuntimeException )
 #pragma mark XInitialization
 
 void SAL_CALL SalAquaFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments )
-throw( uno::Exception, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -472,7 +459,7 @@ throw( uno::Exception, uno::RuntimeException )
 
 #pragma mark XCancellable
 
-void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException )
+void SAL_CALL SalAquaFilePicker::cancel()
 {
     SolarMutexGuard aGuard;
 
@@ -483,7 +470,7 @@ void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException )
 
 #pragma mark XEventListener
 
-void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -496,7 +483,6 @@ void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) th
 #pragma mark XServiceInfo
 
 rtl::OUString SAL_CALL SalAquaFilePicker::getImplementationName()
-throw( uno::RuntimeException )
 {
     rtl::OUString retVal( FILE_PICKER_IMPL_NAME );
 
@@ -504,13 +490,11 @@ throw( uno::RuntimeException )
 }
 
 sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const rtl::OUString& sServiceName )
-throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceNames()
-throw( uno::RuntimeException )
 {
     return FilePicker_getSupportedServiceNames();
 }
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index 547cae2f5f38..d827240fd4dd 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -51,54 +51,43 @@ public:
     // XExecutableDialog functions
 
 
-    virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
 
     // XFolderPicker functions
 
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual OUString SAL_CALL getDirectory( )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDirectory( ) override;
 
-    virtual void SAL_CALL setDescription( const OUString& rDescription )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDescription( const OUString& rDescription ) override;
 
 
     // XServiceInfo
 
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 
     // XCancellable
 
 
-    virtual void SAL_CALL cancel( )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL cancel( ) override;
 
 
     // XEventListener
 
 
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
-        throw(css::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
 private:
     SalAquaFolderPicker( const SalAquaFolderPicker& ) = delete;
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 24c1817c2084..ff1d519aba60 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -67,14 +67,14 @@ SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServi
 
 // XExecutableDialog
 
-void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle )
 {
     SolarMutexGuard aGuard;
 
     implsetTitle(aTitle);
 }
 
-sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
+sal_Int16 SAL_CALL SalAquaFolderPicker::execute()
 {
     SolarMutexGuard aGuard;
 
@@ -111,14 +111,13 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
 // XFolderPicker
 
 void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
     implsetDisplayDirectory(aDirectory);
 }
 
-rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory() throw( uno::RuntimeException )
+rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory()
 {
     SolarMutexGuard aGuard;
 
@@ -127,7 +126,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory() throw( uno::Ru
     return aDirectory;
 }
 
-rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeException )
+rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory()
 {
     SolarMutexGuard aGuard;
 
@@ -155,7 +154,6 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx
 }
 
 void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescription )
-    throw( uno::RuntimeException )
 {
     [m_pDialog setMessage:[NSString stringWithOUString:rDescription]];
 }
@@ -163,7 +161,6 @@ void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescrip
 // XServiceInfo
 
 rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
-    throw( uno::RuntimeException )
 {
     rtl::OUString retVal( FOLDER_PICKER_IMPL_NAME );
 
@@ -171,20 +168,18 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
 }
 
 sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const rtl::OUString& sServiceName )
-    throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 uno::Sequence<rtl::OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNames()
-    throw( uno::RuntimeException )
 {
     return FolderPicker_getSupportedServiceNames();
 }
 
 // XCancellable
 
-void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException )
+void SAL_CALL SalAquaFolderPicker::cancel()
 {
     SolarMutexGuard aGuard;
 
@@ -194,7 +189,6 @@ void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException )
 // XEventListener
 
 void SAL_CALL SalAquaFolderPicker::disposing( const lang::EventObject& )
-    throw( uno::RuntimeException )
 {
 }
 
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index c91cb32b70c4..fa0c8b959e63 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -73,17 +73,14 @@ protected:
     NavigationServices_DialogType m_nDialogType;
 
     /// @throws css::uno::RuntimeException
-    void implsetTitle( const OUString& aTitle )
-        throw( css::uno::RuntimeException );
+    void implsetTitle( const OUString& aTitle );
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void implsetDisplayDirectory( const OUString& rDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    void implsetDisplayDirectory( const OUString& rDirectory );
 
     /// @throws css::uno::RuntimeException
-    OUString const & implgetDisplayDirectory(  )
-        throw( css::uno::RuntimeException );
+    OUString const & implgetDisplayDirectory(  );
 
     void implInitialize( );
 
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index 4452f6506968..bb91affec99d 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -186,7 +186,6 @@ int SalAquaPicker::runandwaitforresult()
 }
 
 void SAL_CALL SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -195,12 +194,12 @@ void SAL_CALL SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDire
     }
 }
 
-rtl::OUString const & SAL_CALL SalAquaPicker::implgetDisplayDirectory() throw( uno::RuntimeException )
+rtl::OUString const & SAL_CALL SalAquaPicker::implgetDisplayDirectory()
 {
     return m_sDisplayDirectory;
 }
 
-void SAL_CALL SalAquaPicker::implsetTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalAquaPicker::implsetTitle( const rtl::OUString& aTitle )
 {
     SolarMutexGuard aGuard;
 
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 0177748a01fa..1022932c1042 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -492,13 +492,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( SvtRemoteFilePicker, SvtFilePicker, OCommonPic
 // XExecutableDialog functions
 
 
-void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle )
 {
     OCommonPicker::setTitle( _rTitle );
 }
 
 
-sal_Int16 SAL_CALL SvtFilePicker::execute(  ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvtFilePicker::execute(  )
 {
     return OCommonPicker::execute();
 }
@@ -507,15 +507,13 @@ sal_Int16 SAL_CALL SvtFilePicker::execute(  ) throw (RuntimeException, std::exce
 // XAsynchronousExecutableDialog functions
 
 
-void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle )
 {
     setTitle( _rTitle );
 }
 
 
 void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener )
-    throw (RuntimeException,
-           std::exception)
 {
     m_xDlgClosedListener = xListener;
     prepareDialog();
@@ -528,7 +526,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< css::ui::dialog
 // XFilePicker functions
 
 
-void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( RuntimeException, std::exception )
+void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode )
 {
     checkAlive();
 
@@ -536,7 +534,7 @@ void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( Runt
     m_bMultiSelection = bMode;
 }
 
-void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( RuntimeException, std::exception )
+void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName )
 {
     checkAlive();
 
@@ -545,7 +543,6 @@ void SAL_CALL SvtFilePicker::setDefaultName( const OUString& aName ) throw( Runt
 }
 
 void SAL_CALL SvtFilePicker::setDisplayDirectory( const OUString& aDirectory )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -553,7 +550,7 @@ void SAL_CALL SvtFilePicker::setDisplayDirectory( const OUString& aDirectory )
     m_aDisplayDirectory = aDirectory;
 }
 
-OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFilePicker::getDisplayDirectory()
 {
     checkAlive();
 
@@ -579,7 +576,7 @@ OUString SAL_CALL SvtFilePicker::getDisplayDirectory() throw( RuntimeException,
         return m_aDisplayDirectory;
 }
 
-Sequence< OUString > SAL_CALL SvtFilePicker::getSelectedFiles() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtFilePicker::getSelectedFiles()
 {
     checkAlive();
 
@@ -603,7 +600,7 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getSelectedFiles() throw( RuntimeEx
     return aFiles;
 }
 
-Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtFilePicker::getFiles()
 {
     Sequence< OUString > aFiles = getSelectedFiles();
     if (aFiles.getLength() > 1)
@@ -618,7 +615,6 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException,
 void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID,
                                        sal_Int16 nControlAction,
                                        const Any& rValue )
-    throw( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -661,7 +657,6 @@ void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID,
 
 
 Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAction )
-    throw( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -696,7 +691,6 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc
 
 
 void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValue )
-    throw ( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -736,7 +730,6 @@ void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValu
 
 
 OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )
-    throw ( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -769,7 +762,6 @@ OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )
 
 
 void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnable )
-    throw( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -811,7 +803,7 @@ void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnab
 // XFilePickerNotifier functions
 
 
-void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener ) throw ( RuntimeException, std::exception )
+void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener )
 {
     checkAlive();
 
@@ -820,7 +812,7 @@ void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePicker
 }
 
 
-void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& ) throw ( RuntimeException, std::exception )
+void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& )
 {
     checkAlive();
 
@@ -833,7 +825,6 @@ void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePic
 
 
 Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats()
-    throw ( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -846,7 +837,7 @@ Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats()
 }
 
 
-sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth()
 {
     checkAlive();
 
@@ -860,7 +851,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException
 }
 
 
-sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth()
 {
     checkAlive();
 
@@ -874,7 +865,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException,
 }
 
 
-sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight()
 {
     checkAlive();
 
@@ -889,7 +880,6 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException,
 
 
 void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage )
-    throw ( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -900,7 +890,6 @@ void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage
 
 
 sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool )
-    throw ( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -928,7 +917,7 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool )
 }
 
 
-sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtFilePicker::getShowState()
 {
     checkAlive();
 
@@ -947,7 +936,6 @@ sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException, std::e
 
 void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle,
                                                 const Sequence< StringPair >& aFilters )
-    throw ( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -975,7 +963,6 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle,
 
 void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle,
                                            const OUString& aFilter )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -994,7 +981,6 @@ void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle,
 
 
 void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -1010,7 +996,6 @@ void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle )
 
 
 OUString SAL_CALL SvtFilePicker::getCurrentFilter()
-    throw( RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -1025,7 +1010,6 @@ OUString SAL_CALL SvtFilePicker::getCurrentFilter()
 
 
 void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
-    throw ( Exception, RuntimeException, std::exception )
 {
     checkAlive();
 
@@ -1108,19 +1092,19 @@ bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, co
 
 
 /* XServiceInfo */
-OUString SAL_CALL SvtFilePicker::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFilePicker::getImplementationName()
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SvtFilePicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtFilePicker::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames()
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -1140,7 +1124,7 @@ OUString SvtFilePicker::impl_getStaticImplementationName()
 
 /* Helper for registry */
 Reference< XInterface > SAL_CALL SvtFilePicker::impl_createInstance(
-    const Reference< XComponentContext >& ) throw( Exception )
+    const Reference< XComponentContext >& )
 {
     return Reference< XInterface >( *new SvtFilePicker );
 }
@@ -1172,19 +1156,19 @@ VclPtr<SvtFileDialog_Base> SvtRemoteFilePicker::implCreateDialog( vcl::Window* _
 
 
 /* XServiceInfo */
-OUString SAL_CALL SvtRemoteFilePicker::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtRemoteFilePicker::getImplementationName()
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SvtRemoteFilePicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtRemoteFilePicker::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SvtRemoteFilePicker::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtRemoteFilePicker::getSupportedServiceNames()
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -1204,7 +1188,7 @@ OUString SvtRemoteFilePicker::impl_getStaticImplementationName()
 
 /* Helper for registry */
 Reference< XInterface > SAL_CALL SvtRemoteFilePicker::impl_createInstance(
-    const Reference< XComponentContext >& ) throw( Exception )
+    const Reference< XComponentContext >& )
 {
     return Reference< XInterface >( *new SvtRemoteFilePicker );
 }
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 0886b3ca1665..be50fc211e8f 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -98,97 +98,95 @@ public:
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& _rTitle ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
 
     // XAsynchronousExecutableDialog functions
 
-    virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) override;
+    virtual void SAL_CALL startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) override;
 
 
     // XFilePicker functions
 
 
-    virtual void SAL_CALL           setMultiSelectionMode( sal_Bool bMode ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setDefaultName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL    getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setMultiSelectionMode( sal_Bool bMode ) override;
+    virtual void SAL_CALL           setDefaultName( const OUString& aName ) override;
+    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) override;
+    virtual OUString SAL_CALL    getDisplayDirectory() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() override;
 
 
     // XFilePickerControlAccess functions
 
 
-    virtual void SAL_CALL           setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const css::uno::Any& value ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL           getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL    getLabel( sal_Int16 ElementID ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const css::uno::Any& value ) override;
+    virtual css::uno::Any SAL_CALL           getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) override;
+    virtual void SAL_CALL           setLabel( sal_Int16 ElementID, const OUString& aValue ) override;
+    virtual OUString SAL_CALL    getLabel( sal_Int16 ElementID ) override;
+    virtual void SAL_CALL           enableControl( sal_Int16 ElementID, sal_Bool bEnable ) override;
 
 
     // XFilePickerNotifier functions
 
 
-    virtual void SAL_CALL           addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
+    virtual void SAL_CALL           removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
 
 
     // XFilePreview functions
 
 
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL      getTargetColorDepth() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL      getAvailableWidth() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL      getAvailableHeight() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       setShowState( sal_Bool bShowState ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       getShowState() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() override;
+    virtual sal_Int32 SAL_CALL      getTargetColorDepth() override;
+    virtual sal_Int32 SAL_CALL      getAvailableWidth() override;
+    virtual sal_Int32 SAL_CALL      getAvailableHeight() override;
+    virtual void SAL_CALL           setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) override;
+    virtual sal_Bool SAL_CALL       setShowState( sal_Bool bShowState ) override;
+    virtual sal_Bool SAL_CALL       getShowState() override;
 
 
     // XFilterManager functions
 
 
-    virtual void SAL_CALL           appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setCurrentFilter( const OUString& aTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL       getCurrentFilter() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           appendFilter( const OUString& aTitle, const OUString& aFilter ) override;
+    virtual void SAL_CALL           setCurrentFilter( const OUString& aTitle ) override;
+    virtual OUString SAL_CALL       getCurrentFilter() override;
 
 
     // XFilterGroupManager functions
 
-    virtual void SAL_CALL           appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL           appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) override;
 
 
     // these methods are here because they're ambiguous
 
-    virtual void SAL_CALL           cancel() throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           cancel() override
      { ::svt::OCommonPicker::cancel(); }
-    virtual void SAL_CALL           dispose() throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           dispose() override
      { ::svt::OCommonPicker::dispose(); }
-    virtual void SAL_CALL           addEventListener(const css::uno::Reference<css::lang::XEventListener>& l) throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           addEventListener(const css::uno::Reference<css::lang::XEventListener>& l) override
      { ::svt::OCommonPicker::addEventListener(l); }
-    virtual void SAL_CALL           removeEventListener(const css::uno::Reference<css::lang::XEventListener>& l) throw( css::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           removeEventListener(const css::uno::Reference<css::lang::XEventListener>& l) override
      { ::svt::OCommonPicker::removeEventListener(l); }
 
 
     // XInitialization functions
 
 
-    virtual void SAL_CALL           initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 
     // XServiceInfo functions
 
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL       getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( css::uno::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() throw( css::uno::RuntimeException, std::exception ) override;
+                                    getSupportedServiceNames() override;
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence< OUString >
@@ -198,8 +196,7 @@ public:
     /* Helper for registry */
     /// @throws css::uno::Exception
     static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-        throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
 protected:
 
@@ -244,10 +241,10 @@ public:
     DECLARE_XTYPEPROVIDER( )
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::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() throw( css::uno::RuntimeException, std::exception ) override;
+                                    getSupportedServiceNames() override;
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
@@ -256,8 +253,7 @@ public:
     /* Helper for registry */
     /// @throws css::uno::Exception
     static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-        throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 };
 
 #endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index ec1f8a8e0f35..dd0b34c36b4c 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -43,22 +43,22 @@ SvtFolderPicker::~SvtFolderPicker()
 {
 }
 
-void SAL_CALL SvtFolderPicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFolderPicker::setTitle( const OUString& _rTitle )
 {
     OCommonPicker::setTitle( _rTitle );
 }
 
-sal_Int16 SAL_CALL SvtFolderPicker::execute(  ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvtFolderPicker::execute(  )
 {
     return OCommonPicker::execute();
 }
 
-void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle)
 {
     setTitle( _rTitle );
 }
 
-void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener )
 {
     m_xListener = xListener;
     prepareDialog();
@@ -108,12 +108,11 @@ IMPL_LINK( SvtFolderPicker, DialogClosedHdl, Dialog&, rDlg, void )
 }
 
 void SAL_CALL SvtFolderPicker::setDisplayDirectory( const OUString& aDirectory )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     m_aDisplayDirectory = aDirectory;
 }
 
-OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFolderPicker::getDisplayDirectory()
 {
     if ( ! getDialog() )
         return m_aDisplayDirectory;
@@ -126,7 +125,7 @@ OUString SAL_CALL SvtFolderPicker::getDisplayDirectory() throw( RuntimeException
     return OUString();
 }
 
-OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFolderPicker::getDirectory()
 {
     if ( ! getDialog() )
         return m_aDisplayDirectory;
@@ -140,30 +139,29 @@ OUString SAL_CALL SvtFolderPicker::getDirectory() throw( RuntimeException, std::
 }
 
 void SAL_CALL SvtFolderPicker::setDescription( const OUString& aDescription )
-    throw( RuntimeException, std::exception )
 {
     m_aDescription = aDescription;
 }
 
-void SvtFolderPicker::cancel() throw (RuntimeException, std::exception)
+void SvtFolderPicker::cancel()
 {
     OCommonPicker::cancel();
 }
 
 /* XServiceInfo */
-OUString SAL_CALL SvtFolderPicker::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtFolderPicker::getImplementationName()
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SvtFolderPicker::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtFolderPicker::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames()
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -183,7 +181,6 @@ OUString SvtFolderPicker::impl_getStaticImplementationName()
 
 /* Helper for registry */
 Reference< XInterface > SAL_CALL SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >&  )
-    throw( Exception )
 {
     return Reference< XInterface >( *new SvtFolderPicker );
 }
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 771bdf8b2790..3883bd6c46ba 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -56,35 +56,34 @@ public:
     // XFolderPicker2 functions
 
 
-    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL       getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL       getDirectory() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setDescription( const OUString& aDescription ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) override;
+    virtual OUString SAL_CALL       getDisplayDirectory() override;
+    virtual OUString SAL_CALL       getDirectory() override;
+    virtual void SAL_CALL           setDescription( const OUString& aDescription ) override;
 
-    virtual void SAL_CALL cancel()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel() override;
 
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& _rTitle ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
 
     // XAsynchronousExecutableDialog functions
 
-    virtual void SAL_CALL       setDialogTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL       startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL       setDialogTitle( const OUString& _rTitle ) override;
+    virtual void SAL_CALL       startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) override;
 
 
     // XServiceInfo functions
 
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL    getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( css::uno::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() throw( css::uno::RuntimeException, std::exception ) override;
+                                    getSupportedServiceNames() override;
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
@@ -93,8 +92,7 @@ public:
     /* Helper for registry */
     /// @throws css::uno::Exception
     static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-        throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
 protected:
 
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index f498a79c0d0a..1150ed51864e 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -137,7 +137,7 @@ namespace svt
 
     // XEventListener
 
-    void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource )
     {
         SolarMutexGuard aGuard;
         bool bDialogDying = _rSource.Source == m_xWindow;
@@ -178,13 +178,13 @@ namespace svt
     }
 
 
-    Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo(  )
     {
         return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
     }
 
 
-    void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception)
+    void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         OPropertyContainer::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
 
@@ -244,7 +244,7 @@ namespace svt
 
     // XControlAccess functions
 
-    void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue )
     {
         checkAlive();
 
@@ -257,7 +257,7 @@ namespace svt
     }
 
 
-    Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty )
     {
         checkAlive();
 
@@ -274,7 +274,7 @@ namespace svt
 
     // XControlInformation functions
 
-    Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls(  )
     {
         checkAlive();
 
@@ -289,7 +289,7 @@ namespace svt
     }
 
 
-    sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName )
     {
         checkAlive();
 
@@ -303,7 +303,7 @@ namespace svt
     }
 
 
-    Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName )
     {
         checkAlive();
 
@@ -318,7 +318,7 @@ namespace svt
     }
 
 
-    sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty )
     {
         checkAlive();
 
@@ -335,14 +335,14 @@ namespace svt
 
     // XExecutableDialog functions
 
-    void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle ) throw( RuntimeException, std::exception )
+    void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle )
     {
         SolarMutexGuard aGuard;
         m_aTitle = _rTitle;
     }
 
 
-    sal_Int16 OCommonPicker::execute() throw (RuntimeException, std::exception)
+    sal_Int16 OCommonPicker::execute()
     {
         SolarMutexGuard aGuard;
 
@@ -364,7 +364,7 @@ namespace svt
 
     // XCancellable functions
 
-    void SAL_CALL OCommonPicker::cancel(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCommonPicker::cancel(  )
     {
         {
             ::osl::MutexGuard aGuard( m_aMutex );
@@ -409,7 +409,6 @@ namespace svt
     // XInitialization functions
 
     void SAL_CALL OCommonPicker::initialize( const Sequence< Any >& _rArguments )
-        throw ( Exception, RuntimeException, std::exception )
     {
         checkAlive();
 
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 36bc38be5463..5212080433ef 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -114,14 +114,14 @@ namespace svt
 
         // XEventListner
 
-        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;
 
 
         // property set related methods
 
 
         // XPropertySet pure methods
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
         // OPropertySetHelper pure methods
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         // OPropertyArrayUsageHelper pure methods
@@ -129,40 +129,40 @@ namespace svt
 
         // OPropertySetHelper overridden methods
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-                sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception) override;
+                sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
 
         // XExecutableDialog functions
 
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL           setTitle( const OUString& _rTitle ) throw( css::uno::RuntimeException, std::exception );
+        virtual void SAL_CALL           setTitle( const OUString& _rTitle );
         /// @throws css::uno::RuntimeException
-        virtual sal_Int16 SAL_CALL      execute() throw( css::uno::RuntimeException, std::exception );
+        virtual sal_Int16 SAL_CALL      execute();
 
 
         // XControlAccess functions
 
-        virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const css::uno::Any& aValue ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) override;
 
 
         // XControlInformation functions
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControls(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControls(  ) override;
+        virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) override;
+        virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) override;
 
 
         // XCancellable functions
 
-        virtual void SAL_CALL cancel(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cancel(  ) override;
 
 
         // XInitialization functions
 
 
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 
         // misc
diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx
index 0ed85f4f9904..8da72d68d805 100644
--- a/fpicker/source/office/fpinteraction.cxx
+++ b/fpicker/source/office/fpinteraction.cxx
@@ -47,7 +47,7 @@ namespace svt
     }
 
 
-    void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException, std::exception)
+    void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest )
     {
         if (!_rxRequest.is())
             return;
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 26d82bc61151..f4ad88fb8122 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -69,7 +69,7 @@ namespace svt
 
     protected:
         // XInteractionHandler
-        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) override;
 
     private:
         virtual ~OFilePickerInteractionHandler() override;
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index bc8ab0821708..bcea58ada593 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -74,7 +74,6 @@ CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xSer
 // XFPEventListenerManager
 
 void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePickerListener>& xListener)
-    throw(uno::RuntimeException)
 {
     if ( rBHelper.bDisposed )
         throw lang::DisposedException(
@@ -86,7 +85,6 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke
 }
 
 void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePickerListener>& xListener )
-    throw(uno::RuntimeException)
 {
     if ( rBHelper.bDisposed )
         throw lang::DisposedException(
@@ -98,7 +96,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
 
 // XEventListener
 
-void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno::RuntimeException)
+void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent)
 {
     uno::Reference<XFilePickerListener> xFilePickerListener(aEvent.Source, css::uno::UNO_QUERY);
 
@@ -199,14 +197,14 @@ void CFilePicker::resumeEventNotification()
 
 // XFilePicker
 
-void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::RuntimeException)
+void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     m_pImpl->setMultiSelectionMode(bMode);
 }
 
-void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeException)
+void SAL_CALL CFilePicker::setTitle(const OUString& aTitle)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -214,7 +212,6 @@ void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeEx
 }
 
 void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& aFilter)
-    throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -222,14 +219,13 @@ void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString&
 }
 
 void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle)
-    throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     m_pImpl->setCurrentFilter(aTitle);
 }
 
-OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
+OUString SAL_CALL CFilePicker::getCurrentFilter()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -237,7 +233,6 @@ OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
 }
 
 void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -245,7 +240,6 @@ void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const
 }
 
 void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -253,28 +247,27 @@ void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)
 }
 
 void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory)
-    throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     m_pImpl->setDisplayDirectory(aDirectory);
 }
 
-OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException)
+OUString SAL_CALL CFilePicker::getDisplayDirectory()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->getDisplayDirectory();
 }
 
-uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException)
+uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->getFiles();
 }
 
-uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
     osl::MutexGuard aGuard(m_aMutex);
@@ -311,7 +304,7 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R
     return comphelper::containerToSequence(lTarget);
 }
 
-sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
+sal_Int16 SAL_CALL CFilePicker::execute()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -340,7 +333,6 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
 }
 
 void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlAction, const uno::Any& aValue)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -349,7 +341,6 @@ void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlActi
 }
 
 uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControlAction)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -358,7 +349,6 @@ uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControl
 }
 
 void SAL_CALL CFilePicker::enableControl(sal_Int16 aControlId, sal_Bool bEnable)
-throw(uno::RuntimeException)
 {
     OSL_ASSERT( nullptr != m_pImpl.get( ) );
 
@@ -367,7 +357,6 @@ throw(uno::RuntimeException)
 }
 
 void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel)
-    throw (uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -376,7 +365,6 @@ void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel
 }
 
 OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
-    throw (uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -384,7 +372,7 @@ OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
     return m_pImpl->getLabel(aControlId);
 }
 
-uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw (uno::RuntimeException)
+uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -392,7 +380,7 @@ uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw
     return m_pImpl->getSupportedImageFormats();
 }
 
-sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeException)
+sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -400,7 +388,7 @@ sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeExcepti
     return m_pImpl->getTargetColorDepth();
 }
 
-sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException)
+sal_Int32 SAL_CALL CFilePicker::getAvailableWidth()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -408,7 +396,7 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException
     return m_pImpl->getAvailableWidth();
 }
 
-sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeException)
+sal_Int32 SAL_CALL CFilePicker::getAvailableHeight()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -417,7 +405,6 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeExceptio
 }
 
 void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aImage)
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -425,7 +412,7 @@ void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aIma
     m_pImpl->setImage(aImageFormat, aImage);
 }
 
-sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::RuntimeException)
+sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState)
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -433,7 +420,7 @@ sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::Run
     return m_pImpl->setShowState(bShowState);
 }
 
-sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException)
+sal_Bool SAL_CALL CFilePicker::getShowState()
 {
     OSL_ASSERT(nullptr != m_pImpl.get());
 
@@ -442,7 +429,6 @@ sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException)
 }
 
 void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
-    throw( uno::Exception, uno::RuntimeException)
 {
     // parameter checking
     uno::Any aAny;
@@ -541,7 +527,6 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
 }
 
 void SAL_CALL CFilePicker::cancel()
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(m_pImpl.get());
 
@@ -552,19 +537,16 @@ void SAL_CALL CFilePicker::cancel()
 // XServiceInfo
 
 OUString SAL_CALL CFilePicker::getImplementationName()
-    throw(uno::RuntimeException)
 {
     return OUString(FILE_PICKER_IMPL_NAME);
 }
 
 sal_Bool SAL_CALL CFilePicker::supportsService(const OUString& ServiceName)
-    throw(uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL CFilePicker::getSupportedServiceNames()
-    throw(uno::RuntimeException)
 {
     return FilePicker_getSupportedServiceNames();
 }
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index aa4d12e25d56..23cddeafadd0 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -62,115 +62,91 @@ public:
 
     // XFilePickerNotifier
 
-    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) override;
-    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
+    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
     // XFilePicker functions
 
-    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override;
 
-    virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDefaultName( const OUString& aName ) override;
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  ) override;
 
     // XFilePicker2 functions
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  ) override;
 
     // XFilterManager functions
 
-    virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) override;
 
-    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) override;
 
-    virtual OUString SAL_CALL getCurrentFilter(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getCurrentFilter(  ) override;
 
     // XFilterGroupManager functions
 
-    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
+    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) override;
 
     // XFilePickerControlAccess functions
 
-    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue ) override;
 
-    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) override;
 
-    virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable )
-        throw(css::uno::RuntimeException ) override;
+    virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable ) override;
 
-    virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel ) override;
 
-    virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
-        throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getLabel( sal_Int16 aControlId ) override;
 
     // XFilePreview
 
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  ) override;
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth(  ) throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getTargetColorDepth(  ) override;
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth(  ) throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableWidth(  ) override;
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight(  ) throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableHeight(  ) override;
 
-    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) override;
 
-    virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw (css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) override;
 
-    virtual sal_Bool SAL_CALL getShowState(  ) throw (css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL getShowState(  ) override;
 
     // XInitialization
 
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw(css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XCancellable
 
-    virtual void SAL_CALL cancel( )
-        throw(css::uno::RuntimeException) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XEventListener
 
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
-        throw(css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent );
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // FilePicker Event functions
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index c3e95b51ac1b..43bbbdc7e9dd 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -83,7 +83,6 @@ VistaFilePicker::~VistaFilePicker()
 }
 
 void SAL_CALL VistaFilePicker::addFilePickerListener(const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener)
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_ADD_PICKER_LISTENER);
@@ -93,7 +92,6 @@ void SAL_CALL VistaFilePicker::addFilePickerListener(const css::uno::Reference<
 }
 
 void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_REMOVE_PICKER_LISTENER);
@@ -103,12 +101,10 @@ void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Referenc
 }
 
 void SAL_CALL VistaFilePicker::disposing(const css::lang::EventObject& /*aEvent*/)
-    throw(css::uno::RuntimeException)
 {
 }
 
 void SAL_CALL VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_MULTISELECTION_MODE);
@@ -118,7 +114,6 @@ void SAL_CALL VistaFilePicker::setMultiSelectionMode(sal_Bool bMode)
 }
 
 void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_TITLE);
@@ -129,8 +124,6 @@ void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
 
 void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
                                             const OUString& sFilter)
-    throw(css::lang::IllegalArgumentException,
-          css::uno::RuntimeException         )
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
@@ -141,8 +134,6 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
 }
 
 void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)
-    throw(css::lang::IllegalArgumentException,
-          css::uno::RuntimeException         )
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_CURRENT_FILTER);
@@ -152,7 +143,6 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)
 }
 
 OUString SAL_CALL VistaFilePicker::getCurrentFilter()
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_CURRENT_FILTER);
@@ -165,8 +155,6 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter()
 
 void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString&                              /*sGroupTitle*/,
                                                  const css::uno::Sequence< css::beans::StringPair >& rFilters   )
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException         )
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTERGROUP);
@@ -176,7 +164,6 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString&
 }
 
 void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_DEFAULT_NAME);
@@ -186,8 +173,6 @@ void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
 }
 
 void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException         )
 {
     bool bChanged = officecfg::Office::Common::Path::Info::WorkPathChanged::get(
         comphelper::getComponentContext(m_xSMGR));
@@ -210,7 +195,6 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
 }
 
 OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
@@ -222,7 +206,6 @@ OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
 
 // @deprecated can't be supported any longer ... see IDL description for further details
 css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()
-    throw(css::uno::RuntimeException)
 {
     css::uno::Sequence< OUString > lFiles = getSelectedFiles();
     // multiselection doesn't really work
@@ -234,7 +217,6 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()
 }
 
 css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
-    throw(css::uno::RuntimeException, std::exception)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_SELECTED_FILES);
@@ -247,7 +229,6 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
 }
 
 ::sal_Int16 SAL_CALL VistaFilePicker::execute()
-    throw(css::uno::RuntimeException)
 {
     bool bInitialized(false);
     {
@@ -283,7 +264,6 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
 void SAL_CALL VistaFilePicker::setValue(      ::sal_Int16    nControlId    ,
                                               ::sal_Int16    nControlAction,
                                         const css::uno::Any& aValue        )
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_CONTROL_VALUE);
@@ -296,7 +276,6 @@ void SAL_CALL VistaFilePicker::setValue(      ::sal_Int16    nControlId    ,
 
 css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId    ,
                                                  ::sal_Int16 nControlAction)
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_CONTROL_VALUE);
@@ -309,7 +288,6 @@ css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId    ,
 
 void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,
                                              sal_Bool  bEnable   )
-    throw(css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_ENABLE_CONTROL);
@@ -321,7 +299,6 @@ void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,
 
 void SAL_CALL VistaFilePicker::setLabel(      ::sal_Int16      nControlId,
                                          const OUString& sLabel    )
-    throw (css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_SET_CONTROL_LABEL);
@@ -332,7 +309,6 @@ void SAL_CALL VistaFilePicker::setLabel(      ::sal_Int16      nControlId,
 }
 
 OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
-    throw (css::uno::RuntimeException)
 {
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_CONTROL_LABEL);
@@ -344,51 +320,41 @@ OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
 }
 
 css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFormats()
-    throw (css::uno::RuntimeException)
 {
     return css::uno::Sequence< sal_Int16 >();
 }
 
 sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth()
-    throw (css::uno::RuntimeException)
 {
     return 0;
 }
 
 sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth()
-    throw (css::uno::RuntimeException)
 {
     return 0;
 }
 
 sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight()
-    throw (css::uno::RuntimeException)
 {
     return 0;
 }
 
 void SAL_CALL VistaFilePicker::setImage(      sal_Int16      /*nImageFormat*/,
                                          const css::uno::Any& /*aImage      */)
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException         )
 {
 }
 
 sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/)
-    throw (css::uno::RuntimeException)
 {
     return false;
 }
 
 sal_Bool SAL_CALL VistaFilePicker::getShowState()
-    throw (css::uno::RuntimeException)
 {
     return false;
 }
 
 void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException)
 {
     if (lArguments.getLength() < 1)
         throw css::lang::IllegalArgumentException(
@@ -528,26 +494,22 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An
 }
 
 void SAL_CALL VistaFilePicker::cancel()
-    throw(css::uno::RuntimeException)
 {
 }
 
 // XServiceInfo
 
 OUString SAL_CALL VistaFilePicker::getImplementationName()
-    throw(css::uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.fpicker.VistaFileDialog");
 }
 
 sal_Bool SAL_CALL VistaFilePicker::supportsService(const OUString& sServiceName)
-    throw(css::uno::RuntimeException )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSupportedServiceNames()
-    throw(css::uno::RuntimeException)
 {
     return VistaFilePicker_getSupportedServiceNames();
 }
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
index deb15ef6ee3e..946f66efdd6b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx
@@ -74,70 +74,52 @@ public:
     // XFilePickerNotifier
 
 
-    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
 
-    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
 
 
     // XExecutableDialog functions
 
 
-    virtual void SAL_CALL setTitle( const OUString& sTitle )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setTitle( const OUString& sTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
 
     // XFilePicker functions
 
 
-    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override;
 
-    virtual void SAL_CALL setDefaultName( const OUString& sName )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDefaultName( const OUString& sName ) override;
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& sDirectory )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException         ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& sDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  ) override;
 
     // XFilePicker2 functions
-    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  ) override;
 
 
     // XFilterManager functions
 
 
     virtual void SAL_CALL appendFilter( const OUString& sTitle  ,
-                                        const OUString& sFilter )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException         ) override;
+                                        const OUString& sFilter ) override;
 
-    virtual void SAL_CALL setCurrentFilter( const OUString& sTitle )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException         ) override;
+    virtual void SAL_CALL setCurrentFilter( const OUString& sTitle ) override;
 
-    virtual OUString SAL_CALL getCurrentFilter(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getCurrentFilter(  ) override;
 
 
     // XFilterGroupManager functions
 
 
     virtual void SAL_CALL appendFilterGroup( const OUString&                              sGroupTitle,
-                                             const css::uno::Sequence< css::beans::StringPair >& lFilters   )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException         ) override;
+                                             const css::uno::Sequence< css::beans::StringPair >& lFilters   ) override;
 
 
     // XFilePickerControlAccess functions
@@ -145,84 +127,65 @@ public:
 
     virtual void SAL_CALL setValue(       sal_Int16      nControlId    ,
                                           sal_Int16      nControlAction,
-                                    const css::uno::Any& aValue        )
-        throw (css::uno::RuntimeException) override;
+                                    const css::uno::Any& aValue        ) override;
 
     virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId     ,
-                                             sal_Int16 nControlAction )
-        throw (css::uno::RuntimeException) override;
+                                             sal_Int16 nControlAction ) override;
 
     virtual void SAL_CALL enableControl( sal_Int16 nControlId,
-                                         sal_Bool  bEnable   )
-        throw(css::uno::RuntimeException ) override;
+                                         sal_Bool  bEnable   ) override;
 
     virtual void SAL_CALL setLabel(       sal_Int16        nControlId,
-                                    const OUString& sLabel    )
-        throw (css::uno::RuntimeException) override;
+                                    const OUString& sLabel    ) override;
 
-    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
-        throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) override;
 
 
     // XFilePreview
 
 
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  ) override;
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth(  )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getTargetColorDepth(  ) override;
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth(  )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableWidth(  ) override;
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight(  )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableHeight(  ) override;
 
     virtual void SAL_CALL setImage(       sal_Int16      nImageFormat,
-                                    const css::uno::Any& aImage      )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
+                                    const css::uno::Any& aImage      ) override;
 
-    virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) override;
 
-    virtual sal_Bool SAL_CALL getShowState(  )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL getShowState(  ) override;
 
 
     // XInitialization
 
 
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments )
-        throw(css::uno::Exception       ,
-              css::uno::RuntimeException) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) override;
 
 
     // XCancellable
 
 
-    virtual void SAL_CALL cancel( )
-        throw(css::uno::RuntimeException) override;
+    virtual void SAL_CALL cancel( ) override;
 
 
     // XEventListener
 
-
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
-        throw(css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent );
 
 
     // XServiceInfo
 
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     /*
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index ff02fafd5ca2..6233f0e17693 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -205,14 +205,12 @@ STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomi
 
 
 void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-    throw( css::uno::RuntimeException )
 {
     m_lListener.addInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
 
 
 void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-    throw( css::uno::RuntimeException )
 {
     m_lListener.removeInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index 1fa0c6909519..329e7264c9c6 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -115,12 +115,11 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
 
         // XFilePickerNotifier
 
+        /// @throws css::uno::RuntimeException
+        virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
 
-        virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-            throw( css::uno::RuntimeException );
-
-        virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-            throw( css::uno::RuntimeException );
+        /// @throws css::uno::RuntimeException
+        virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener );
 
 
         // native interface
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 4ec7dd2c2183..30f20acfee94 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -94,7 +94,6 @@ CWinFileOpenImpl::~CWinFileOpenImpl()
 // we expect the directory in URL format
 
 void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)
-    throw( IllegalArgumentException, uno::RuntimeException )
 {
     OUString aSysDirectory;
     if( aDirectory.getLength() > 0)
@@ -121,13 +120,12 @@ void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)
 
 // we return the directory in URL format
 
-OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException)
+OUString CWinFileOpenImpl::getDisplayDirectory()
 {
     return m_FilePickerState->getDisplayDirectory(this);
 }
 
 void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)
-    throw( IllegalArgumentException, uno::RuntimeException )
 {
     // we don't set the default name directly
     // because this influences how the file open
@@ -146,14 +144,13 @@ void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)
 //    the first entry is the path url, all other entries are file names
 
 uno::Sequence<OUString> SAL_CALL CWinFileOpenImpl::getFiles()
-    throw(uno::RuntimeException)
 {
     return m_FilePickerState->getFiles(this);
 }
 
 // shows the FileOpen/FileSave dialog
 
-sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  ) throw(uno::RuntimeException)
+sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  )
 {
     sal_Int16 rc = CFileOpenDialog::doModal();
 
@@ -174,7 +171,6 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  ) throw(uno::RuntimeException)
 // empty
 
 void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUString& aFilter)
-    throw(IllegalArgumentException, uno::RuntimeException)
 {
     bool bRet = m_filterContainer->addFilter(aTitle, aFilter);
 
@@ -197,7 +193,6 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUStr
 // sets a current filter
 
 void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)
-    throw( IllegalArgumentException, uno::RuntimeException)
 {
     sal_Int32 filterPos = m_filterContainer->getFilterPos(aTitle);
 
@@ -212,7 +207,7 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)
 
 // returns the currently selected filter
 
-OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeException)
+OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter()
 {
     sal_uInt32 nIndex = getSelectedFilterIndex();
 
@@ -236,7 +231,6 @@ inline void SAL_CALL CWinFileOpenImpl::appendFilterGroupSeparator()
 // XFilterGroupManager
 
 void SAL_CALL CWinFileOpenImpl::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
-    throw (IllegalArgumentException, uno::RuntimeException)
 {
     (void) sGroupTitle; // avoid warning
     OSL_ENSURE(0 == sGroupTitle.getLength(), "appendFilterGroup: Parameter 'GroupTitle' currently ignored");
@@ -272,7 +266,6 @@ static bool filterControlCommand( sal_Int16 nControlId )
 }
 
 void SAL_CALL CWinFileOpenImpl::setValue(sal_Int16 aControlId, sal_Int16 aControlAction, const uno::Any& aValue)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( aControlId ))
@@ -283,7 +276,6 @@ void SAL_CALL CWinFileOpenImpl::setValue(sal_Int16 aControlId, sal_Int16 aContro
 // we assume that there are only checkboxes or comboboxes
 
 uno::Any SAL_CALL CWinFileOpenImpl::getValue(sal_Int16 aControlId, sal_Int16 aControlAction)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( aControlId ))
@@ -295,7 +287,6 @@ uno::Any SAL_CALL CWinFileOpenImpl::getValue(sal_Int16 aControlId, sal_Int16 aCo
 // enables a custom template element
 
 void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, bool bEnable)
-    throw(uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( ControlID ))
@@ -303,7 +294,6 @@ void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, bool bEnable)
 }
 
 void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& aLabel )
-    throw (uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( aControlId ))
@@ -311,7 +301,6 @@ void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString&
 }
 
 OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
-        throw (uno::RuntimeException)
 {
     OSL_ASSERT(m_FilePickerState);
     if ( !filterControlCommand( aControlId ))
@@ -321,43 +310,36 @@ OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
 }
 
 uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats()
-    throw (uno::RuntimeException)
 {
     return CPreviewAdapter::getSupportedImageFormats();
 }
 
 sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth()
-    throw (uno::RuntimeException)
 {
     return m_Preview->getTargetColorDepth();
 }
 
 sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth()
-        throw (uno::RuntimeException)
 {
     return m_Preview->getAvailableWidth();
 }
 
 sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight()
-    throw (uno::RuntimeException)
 {
     return m_Preview->getAvailableHeight();
 }
 
 void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& aImage)
-    throw (IllegalArgumentException, uno::RuntimeException)
 {
     m_Preview->setImage(aImageFormat,aImage);
 }
 
 bool SAL_CALL CWinFileOpenImpl::setShowState(bool bShowState)
-        throw (uno::RuntimeException)
 {
     return m_Preview->setShowState(bShowState);
 }
 
 bool SAL_CALL CWinFileOpenImpl::getShowState()
-    throw (uno::RuntimeException)
 {
     return m_Preview->getShowState();
 }
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index b6e78f50c850..634f2834fc58 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -55,76 +55,80 @@ public:
 
     // XExecutableDialog
 
-    virtual sal_Int16 SAL_CALL execute(  ) throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int16 SAL_CALL execute(  );
 
     // XFilePicker
 
-    virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDefaultName( const OUString& aName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw(css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  );
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory( ) throw ( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual OUString SAL_CALL getDisplayDirectory( );
 
     // XFilterManager
 
-    virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter );
 
-    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setCurrentFilter( const OUString& aTitle );
 
-    virtual OUString  SAL_CALL getCurrentFilter( )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual OUString  SAL_CALL getCurrentFilter( );
 
     // XFilterGroupManager
 
-    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters );
 
     // XFilePickerControlAccess
 
-    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue );
 
-    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction );
 
-    virtual void SAL_CALL enableControl( sal_Int16 aControlId, bool bEnable )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL enableControl( sal_Int16 aControlId, bool bEnable );
 
-    virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel );
 
-    virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
-        throw ( css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual OUString SAL_CALL getLabel( sal_Int16 aControlId );
 
     // XFilePreview
 
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  );
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth( )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getTargetColorDepth( );
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth( )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getAvailableWidth( );
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight( )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getAvailableHeight( );
 
-    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage );
 
-    virtual bool SAL_CALL setShowState( bool bShowState )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual bool SAL_CALL setShowState( bool bShowState );
 
-    virtual bool SAL_CALL getShowState( )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual bool SAL_CALL getShowState( );
 
     // XCancelable
 
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index 86201a438fb6..6db7df14a048 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -94,7 +94,7 @@ CDIBPreview::~CDIBPreview( )
 }
 
 
-sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException)
+sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth()
 {
     HDC hdc = GetDC(m_Hwnd);
     int clrRes = 0;
@@ -106,7 +106,7 @@ sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException)
 }
 
 
-sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException)
+sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth()
 {
     RECT rect;
     bool bRet = GetClientRect(m_Hwnd,&rect);
@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException)
 }
 
 
-sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException)
+sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight()
 {
     RECT rect;
     bool bRet = GetClientRect(m_Hwnd,&rect);
@@ -135,7 +135,6 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException)
 
 
 void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage)
-    throw (IllegalArgumentException, RuntimeException)
 {
     PreviewBase::setImage(aImageFormat,aImage);
 
@@ -154,7 +153,7 @@ void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage)
 }
 
 
-bool SAL_CALL CDIBPreview::setShowState(bool bShowState) throw (RuntimeException)
+bool SAL_CALL CDIBPreview::setShowState(bool bShowState)
 {
     PreviewBase::setShowState(bShowState);
     ShowWindow(m_Hwnd, m_bShowState ? SW_SHOW : SW_HIDE);
@@ -162,7 +161,7 @@ bool SAL_CALL CDIBPreview::setShowState(bool bShowState) throw (RuntimeException
 }
 
 
-bool SAL_CALL CDIBPreview::getShowState() throw (RuntimeException)
+bool SAL_CALL CDIBPreview::getShowState()
 {
     return bool(IsWindowVisible(m_Hwnd));
 }
diff --git a/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx
index 76f74bbb056c..fb34f911cbbf 100644
--- a/fpicker/source/win32/filepicker/dibpreview.hxx
+++ b/fpicker/source/win32/filepicker/dibpreview.hxx
@@ -54,23 +54,17 @@ public:
 
     // preview interface implementation
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth()
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getTargetColorDepth() override;
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth()
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableWidth() override;
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight()
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getAvailableHeight() override;
 
-    virtual void SAL_CALL setImage(sal_Int16 aImageFormat, const css::uno::Any& aImage)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
+    virtual void SAL_CALL setImage(sal_Int16 aImageFormat, const css::uno::Any& aImage) override;
 
-    virtual bool SAL_CALL setShowState(bool bShowState)
-        throw (css::uno::RuntimeException) override;
+    virtual bool SAL_CALL setShowState(bool bShowState) override;
 
-    virtual bool SAL_CALL getShowState()
-        throw (css::uno::RuntimeException) override;
+    virtual bool SAL_CALL getShowState() override;
 
     virtual HWND SAL_CALL getWindowHandle() const override;
 
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index 851f68b4c231..2eeb61da15b8 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -50,8 +50,9 @@ public:
 
     virtual sal_Int32 SAL_CALL getAvailableHeight();
 
-    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const Any& aImage )
-        throw (IllegalArgumentException,RuntimeException);
+    /// @throws IllegalArgumentException
+    /// @throws RuntimeException
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const Any& aImage );
 
     virtual bool SAL_CALL setShowState(bool bShowState);
 
@@ -76,7 +77,8 @@ protected:
 
     virtual void SAL_CALL rearrangeLayout();
 
-    void SAL_CALL initializeActivePreview() throw(std::runtime_error);
+    /// @throws std::runtime_error
+    void SAL_CALL initializeActivePreview();
 
     HWND SAL_CALL findFileListbox() const;
 
@@ -127,7 +129,6 @@ sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableHeight()
 
 
 void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any& aImage )
-    throw (IllegalArgumentException,RuntimeException)
 {
     m_Preview->setImage(aImageFormat,aImage);
 }
@@ -299,7 +300,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
 }
 
 
-void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_error)
+void SAL_CALL CPreviewAdapterImpl::initializeActivePreview()
 {
     bool bShowState = m_Preview->getImaginaryShowState();
 
@@ -411,7 +412,6 @@ sal_Int32 SAL_CALL CPreviewAdapter::getAvailableHeight()
 
 
 void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aImage )
-    throw (IllegalArgumentException, RuntimeException)
 {
     m_pImpl->setImage(aImageFormat,aImage);
 }
diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index 33f5ef54fa0d..1f14098ae849 100644
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
@@ -62,8 +62,9 @@ public:
 
     sal_Int32 SAL_CALL getAvailableHeight();
 
-    void SAL_CALL setImage(sal_Int16 aImageFormat, const css::uno::Any& aImage)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    void SAL_CALL setImage(sal_Int16 aImageFormat, const css::uno::Any& aImage);
 
     bool SAL_CALL setShowState(bool bShowState);
 
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 8c158b2df4fa..ade90668d016 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -38,26 +38,25 @@ PreviewBase::~PreviewBase()
 }
 
 
-sal_Int32 SAL_CALL PreviewBase::getTargetColorDepth() throw (RuntimeException)
+sal_Int32 SAL_CALL PreviewBase::getTargetColorDepth()
 {
     return 0;
 }
 
 
-sal_Int32 SAL_CALL PreviewBase::getAvailableWidth() throw (RuntimeException)
+sal_Int32 SAL_CALL PreviewBase::getAvailableWidth()
 {
     return 0;
 }
 
 
-sal_Int32 SAL_CALL PreviewBase::getAvailableHeight() throw (RuntimeException)
+sal_Int32 SAL_CALL PreviewBase::getAvailableHeight()
 {
     return 0;
 }
 
 
 void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
-    throw (IllegalArgumentException, RuntimeException)
 {
     if (aImageFormat != css::ui::dialogs::FilePreviewImageFormats::BITMAP)
         throw IllegalArgumentException(
@@ -80,14 +79,14 @@ void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,css::uno::Any& aImag
 }
 
 
-bool SAL_CALL PreviewBase::setShowState( bool bShowState ) throw (RuntimeException)
+bool SAL_CALL PreviewBase::setShowState( bool bShowState )
 {
     m_bShowState = bShowState;
     return true;
 }
 
 
-bool SAL_CALL PreviewBase::getShowState() throw (RuntimeException)
+bool SAL_CALL PreviewBase::getShowState()
 {
     return false;
 }
diff --git a/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx
index 20d04dc50db2..503b541457f5 100644
--- a/fpicker/source/win32/filepicker/previewbase.hxx
+++ b/fpicker/source/win32/filepicker/previewbase.hxx
@@ -45,23 +45,24 @@ public:
     // dtor
     virtual ~PreviewBase();
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth()
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getTargetColorDepth();
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth()
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getAvailableWidth();
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight()
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int32 SAL_CALL getAvailableHeight();
 
-    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::uno::RuntimeException
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage );
 
-    virtual bool SAL_CALL setShowState( bool bShowState )
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual bool SAL_CALL setShowState( bool bShowState );
 
-    virtual bool SAL_CALL getShowState()
-        throw (css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
+    virtual bool SAL_CALL getShowState();
 
     virtual void SAL_CALL getImage(sal_Int16& aImageFormat,css::uno::Any& aImage);
 
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 28f4a257e7fa..18bac1135913 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -51,7 +51,7 @@ CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceM
     m_pFolderPickerImpl = std::unique_ptr< CWinFolderPickerImpl > ( new CWinFolderPickerImpl( this ) );
 }
 
-void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeException )
+void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
@@ -59,7 +59,6 @@ void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeEx
 }
 
 void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory )
-    throw( IllegalArgumentException, RuntimeException )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
@@ -67,21 +66,20 @@ void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory )
 }
 
 OUString SAL_CALL CFolderPicker::getDisplayDirectory( )
-    throw( RuntimeException )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
     return m_pFolderPickerImpl->getDisplayDirectory( );
 }
 
-OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException )
+OUString SAL_CALL CFolderPicker::getDirectory( )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
     return m_pFolderPickerImpl->getDirectory( );
 }
 
-void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) throw( RuntimeException )
+void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
@@ -89,7 +87,6 @@ void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) thro
 }
 
 sal_Int16 SAL_CALL CFolderPicker::execute( )
-    throw( RuntimeException )
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
 
@@ -103,19 +100,16 @@ sal_Int16 SAL_CALL CFolderPicker::execute( )
 // XServiceInfo
 
 OUString SAL_CALL CFolderPicker::getImplementationName(  )
-    throw( RuntimeException )
 {
     return OUString( FOLDERPICKER_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL CFolderPicker::supportsService( const OUString& ServiceName )
-    throw( RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL CFolderPicker::getSupportedServiceNames(   )
-    throw( RuntimeException )
 {
     return FolderPicker_getSupportedServiceNames();
 }
@@ -123,7 +117,6 @@ Sequence< OUString > SAL_CALL CFolderPicker::getSupportedServiceNames(   )
 //  XCancellable
 
 void SAL_CALL CFolderPicker::cancel( )
-    throw(RuntimeException)
 {
     OSL_ASSERT( m_pFolderPickerImpl.get( ) );
     MutexGuard aGuard( m_aMutex );
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 8f64c889e5cb..2f25cc4a4ecf 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -49,47 +49,37 @@ public:
     // XExecutableDialog
 
 
-    virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
 
     // XFolderPicker functions
 
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-    virtual OUString SAL_CALL getDirectory( )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDirectory( ) override;
 
-    virtual void SAL_CALL setDescription( const OUString& aDescription )
-        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDescription( const OUString& aDescription ) override;
 
 
     // XServiceInfo
 
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 
     // XCancellable
 
 
-    virtual void SAL_CALL cancel( )
-        throw(css::uno::RuntimeException) override;
+    virtual void SAL_CALL cancel( ) override;
 
 
     // overwrite base class method, which is called
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index c5dd9b5ab6d5..5b427e3194c9 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -48,7 +48,6 @@ CWinFolderPickerImpl::CWinFolderPickerImpl( CFolderPicker* aFolderPicker ) :
 // OS the FolderPicker starts in the root of the file system hierarchy
 
 void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirectory )
-    throw( IllegalArgumentException, RuntimeException )
 {
     OUString sysDir;
 
@@ -82,7 +81,6 @@ void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirect
 // we return the directory in URL format
 
 OUString CWinFolderPickerImpl::getDisplayDirectory( )
-    throw( RuntimeException )
 {
     // call base class method to get the directory in system format
     OUString displayDirectory = CMtaFolderPicker::getDisplayDirectory( );
@@ -94,7 +92,7 @@ OUString CWinFolderPickerImpl::getDisplayDirectory( )
     return displayDirectoryURL;
 }
 
-OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException )
+OUString SAL_CALL CWinFolderPickerImpl::getDirectory( )
 {
     OUString sysDir = CMtaFolderPicker::getDirectory( );
     OUString dirURL;
@@ -105,7 +103,7 @@ OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException
     return dirURL;
 }
 
-sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException )
+sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( )
 {
     return m_nLastDlgResult = CMtaFolderPicker::browseForFolder( ) ?
         css::ui::dialogs::ExecutableDialogResults::OK :
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index b6b867865b29..ffed7e969342 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -38,22 +38,18 @@ public:
 
     // XExecutableDialog
 
-
-    virtual sal_Int16 SAL_CALL execute(  )
-        throw( css::uno::RuntimeException );
+    /// @throws css::uno::RuntimeException
+    virtual sal_Int16 SAL_CALL execute(  );
 
 
     // XFolderPicker
 
 
-    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-    virtual OUString SAL_CALL getDisplayDirectory( )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDisplayDirectory( ) override;
 
-    virtual OUString SAL_CALL getDirectory( )
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getDirectory( ) override;
 
 protected:
     virtual void SAL_CALL onSelChanged( const OUString& aNewPath ) override;
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index b81750a80173..105045e4e467 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -117,7 +117,6 @@ OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition )
 }
 
 void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -135,7 +134,6 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt
 }
 
 void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -157,7 +155,6 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
 }
 
 void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -185,7 +182,6 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
 }
 
 void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInterface >&, sal_Int16 )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -201,7 +197,6 @@ void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInter
 }
 
 void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
@@ -282,7 +277,6 @@ Any SAL_CALL CheckboxGetState( HWND hwnd )
 
 void SAL_CALL CheckboxSetState(
     HWND hwnd, const css::uno::Any& aState, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
 
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index a5ac793cef95..369e127bd48a 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -37,25 +37,25 @@
 bool SAL_CALL IsWindowsVistaOrNewer();
 
 // set actions
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxAddItem(
-    HWND hwnd, const css::uno::Any& aItem, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aItem, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxAddItems(
-    HWND hwnd, const css::uno::Any& aItemList, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang:: IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aItemList, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxDeleteItem(
-    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxDeleteItems(
-    HWND hwnd, const css::uno::Any& aUnused, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aUnused, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL ListboxSetSelectedItem(
-    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
 // get actions
 css::uno::Any SAL_CALL ListboxGetItems( HWND hwnd );
@@ -65,9 +65,9 @@ css::uno::Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd );
 // checkbox helper functions
 css::uno::Any SAL_CALL CheckboxGetState( HWND hwnd );
 
+/// @throws css::lang::IllegalArgumentException
 void SAL_CALL CheckboxSetState(
-    HWND hwnd, const css::uno::Any& aState, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( css::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aState, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos );
 
 // calculates the length of '\0' separated and '\0\0'
 // ending strings used in some Win32 functions
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 7408392e5a76..aa0b52a3ec6d 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -42,27 +42,23 @@ class FWE_DLLPUBLIC ActionTriggerContainer :    public PropertySetContainer,
         virtual ~ActionTriggerContainer() override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XMultiServiceFactory
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 }
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 6d472b64338e..65ab7c4f6611 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -50,19 +50,18 @@ class ActionTriggerPropertySet :  private cppu::BaseMutex,
         FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet() override;
 
         // XInterface
-        virtual FWE_DLLPUBLIC css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual FWE_DLLPUBLIC css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw () override;
         virtual FWE_DLLPUBLIC void SAL_CALL release() throw () override;
 
         // XServiceInfo
-        virtual FWE_DLLPUBLIC OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual FWE_DLLPUBLIC css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual FWE_DLLPUBLIC OUString SAL_CALL getImplementationName(  ) override;
+        virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual FWE_DLLPUBLIC css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XTypeProvider
-        virtual FWE_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual FWE_DLLPUBLIC css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual FWE_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual FWE_DLLPUBLIC css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     private:
 
@@ -71,19 +70,16 @@ class ActionTriggerPropertySet :  private cppu::BaseMutex,
         virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any&       aConvertedValue,
                                                             css::uno::Any&       aOldValue,
                                                             sal_Int32                       nHandle,
-                                                            const css::uno::Any& aValue          )
-            throw( css::lang::IllegalArgumentException ) override;
+                                                            const css::uno::Any& aValue          ) override;
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue )
-            throw( css::uno::Exception, std::exception ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) override;
 
         using cppu::OPropertySetHelper::getFastPropertyValue;
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue, sal_Int32 nHandle ) const override;
 
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
         static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
@@ -93,19 +89,19 @@ class ActionTriggerPropertySet :  private cppu::BaseMutex,
         bool impl_tryToChangeProperty(  const   OUString&            aCurrentValue   ,
                                         const   css::uno::Any&       aNewValue       ,
                                             css::uno::Any&           aOldValue       ,
-                                            css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException );
+                                            css::uno::Any&           aConvertedValue );
 
         /// @throws css::lang::IllegalArgumentException
         bool impl_tryToChangeProperty(  const   css::uno::Reference< css::awt::XBitmap >&  xBitmap,
                                         const   css::uno::Any&   aNewValue       ,
                                             css::uno::Any&           aOldValue       ,
-                                            css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException );
+                                            css::uno::Any&           aConvertedValue );
 
         /// @throws css::lang::IllegalArgumentException
         bool impl_tryToChangeProperty(  const   css::uno::Reference< css::uno::XInterface >& xInterface,
                                         const   css::uno::Any&   aNewValue       ,
                                             css::uno::Any&           aOldValue       ,
-                                            css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException );
+                                            css::uno::Any&           aConvertedValue );
 
         //  members
 
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 6b265635a927..917728f90c0e 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -48,19 +48,18 @@ class ActionTriggerSeparatorPropertySet :   private cppu::BaseMutex,
         virtual ~ActionTriggerSeparatorPropertySet() override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     private:
 
@@ -69,19 +68,16 @@ class ActionTriggerSeparatorPropertySet :   private cppu::BaseMutex,
         virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any&       aConvertedValue,
                                                             css::uno::Any&       aOldValue,
                                                             sal_Int32                       nHandle,
-                                                            const css::uno::Any& aValue          )
-            throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+                                                            const css::uno::Any& aValue          ) override;
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue )
-            throw( css::uno::Exception, std::exception ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) override;
 
         using cppu::OPropertySetHelper::getFastPropertyValue;
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue, sal_Int32 nHandle ) const override;
 
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
         static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
@@ -92,9 +88,7 @@ class ActionTriggerSeparatorPropertySet :   private cppu::BaseMutex,
         bool impl_tryToChangeProperty(  sal_Int16                           aCurrentValue   ,
                                             const   css::uno::Any&   aNewValue       ,
                                             css::uno::Any&           aOldValue       ,
-                                            css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException,
-                                                                                              css::uno::RuntimeException,
-                                                                                              std::exception );
+                                            css::uno::Any&           aConvertedValue );
 
         //  members
 
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 41b75fcd93ec..2c759f5afa64 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -46,12 +46,12 @@ class FWE_DLLPUBLIC ImageWrapper :
         static css::uno::Sequence< sal_Int8 > GetUnoTunnelId();
 
         // XBitmap
-        virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::awt::Size SAL_CALL getSize() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() override;
 
         // XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     private:
         Image   m_aImage;
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 131ead076040..0f32f39f04e7 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -46,59 +46,48 @@ class FWE_DLLPUBLIC RootActionTriggerContainer :  public PropertySetContainer,
         virtual ~RootActionTriggerContainer() override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XMultiServiceFactory
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
-            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
-        virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
-            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
         // XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
 
-        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) 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;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
         // XNamed
-        virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName(  ) override;
+        virtual void SAL_CALL setName( const OUString& aName ) override;
 
     private:
         void FillContainer();
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 9d2f33932612..30f181b09ae2 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -136,19 +136,19 @@ class CloseDispatcher : public  ::cppu::WeakImplHelper<
         // XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
 
         // XDispatch
         virtual void SAL_CALL dispatch            ( const css::util::URL&                                     aURL      ,
-                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments) throw(css::uno::RuntimeException, std::exception) override;
+                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments) override;
         virtual void SAL_CALL addStatusListener   ( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
-                                                    const css::util::URL&                                     aURL      ) throw(css::uno::RuntimeException, std::exception) override;
+                                                    const css::util::URL&                                     aURL      ) override;
         virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
-                                                    const css::util::URL&                                     aURL      ) throw(css::uno::RuntimeException, std::exception) override;
+                                                    const css::util::URL&                                     aURL      ) override;
 
         // XDispatchInformationProvider
-        virtual css::uno::Sequence< sal_Int16 >                       SAL_CALL getSupportedCommandGroups         (                         ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) 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 nCommandGroup ) override;
 
     // internal helper
 
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index b59c8785c1b8..fa3aa6fc52a2 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -54,11 +54,9 @@ class DispatchInformationProvider : public  ::cppu::WeakImplHelper< css::frame::
 
         virtual ~DispatchInformationProvider() 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 nCommandGroup)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) override;
 
     // helper
     private:
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index af0d9105145b..ab00668f55db 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -90,8 +90,8 @@ class DispatchProvider: public ::cppu::WeakImplHelper< css::frame::XDispatchProv
 
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL             ,
                                                                                                              const OUString&                                      sTargetFrameName ,
-                                                                                                                   sal_Int32                                             nSearchFlags     ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                                                                                   sal_Int32                                             nSearchFlags     ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) override;
 
     /* helper */
     protected:
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 7462303abb1f..ca276371a2b1 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -195,8 +195,7 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
          */
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL&  aURL            ,
                                                                                     const OUString& sTargetFrameName,
-                                                                                          sal_Int32        nSearchFlags    )
-            throw(css::uno::RuntimeException, std::exception) override;
+                                                                                          sal_Int32        nSearchFlags    ) override;
 
         // XDispatchProvider
 
@@ -211,8 +210,7 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
 
             @return A list of dispatch objects.
          */
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor) override;
 
         // XDispatchProviderInterception
 
@@ -229,8 +227,7 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
 
             @throw      A RuntimeException if the given reference is NULL!
          */
-        virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) override;
 
         // XDispatchProviderInterception
 
@@ -244,7 +241,7 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
 
             @throw      A RuntimeException if the given reference is NULL!
          */
-        virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) override;
 
         // XEventListener
 
@@ -253,8 +250,7 @@ class InterceptionHelper : public  ::cppu::WeakImplHelper<
             @descr      We have to release all references to him then.
                         Normally we will die by ref count too...
          */
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
 }; // class InterceptionHelper
 
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index 8ab0e242c76a..abe0d128c8e0 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -70,33 +70,33 @@ class MailToDispatcher : public  ::cppu::WeakImplHelper<
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,
                                                                                                              const OUString&                                      sTarget     ,
-                                                                                                                   sal_Int32                                             nFlags      ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                                                                                   sal_Int32                                             nFlags      ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) override;
 
         // XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
 
         // XDispatch
         virtual void SAL_CALL dispatch            ( const css::util::URL&                                     aURL       ,
-                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments ) override;
         virtual void SAL_CALL addStatusListener   ( const css::uno::Reference< css::frame::XStatusListener >& xListener  ,
-                                                    const css::util::URL&                                     aURL       ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const css::util::URL&                                     aURL       ) override;
         virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener  ,
-                                                    const css::util::URL&                                     aURL       ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const css::util::URL&                                     aURL       ) override;
 
     /* internal */
     private:
         /// @throws css::uno::RuntimeException
         bool implts_dispatch( const css::util::URL&                                  aURL       ,
-                                  const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException );
+                                  const css::uno::Sequence< css::beans::PropertyValue >& lArguments );
 
 };      //  class MailToDispatcher
 
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 99c5cfba9905..59501607f8b5 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -66,27 +66,27 @@ class Oxt_Handler  :    public  ::cppu::WeakImplHelper<
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         //  XNotifyingDispatch
 
         virtual void SAL_CALL dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                        const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                       const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                       const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
 
         //  XDispatch
 
         virtual void SAL_CALL dispatch              (  const css::util::URL&                                     aURL        ,
-                                                       const css::uno::Sequence< css::beans::PropertyValue >&    lArguments  ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                       const css::uno::Sequence< css::beans::PropertyValue >&    lArguments  ) override;
         // not supported !
         virtual void SAL_CALL addStatusListener     (  const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
-                                                       const css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException, std::exception ) override {};
+                                                       const css::util::URL&                                     /*aURL*/        ) override {};
         virtual void SAL_CALL removeStatusListener  (  const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
-                                                       const css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException, std::exception ) override {};
+                                                       const css::util::URL&                                     /*aURL*/        ) override {};
 
         //  XExtendedFilterDetection
-        virtual OUString SAL_CALL detect     (        css::uno::Sequence< css::beans::PropertyValue >&    lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL detect     (        css::uno::Sequence< css::beans::PropertyValue >&    lDescriptor ) override;
 
     private:
         osl::Mutex m_mutex;
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 25a6bb5f4d81..01cf4a6ca8b7 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -85,38 +85,35 @@ class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception       ,
-                                                                                                         css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) override;
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
             const css::util::URL&  aURL        ,
             const OUString& sTarget     ,
-            sal_Int32              nFlags      )
-        throw( css::uno::RuntimeException, std::exception ) override;
+            sal_Int32              nFlags      ) override;
 
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(
-            const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
-        throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) override;
 
         //  XDispatch
         virtual void SAL_CALL dispatch( const css::util::URL&                                  aURL,
-                                        const css::uno::Sequence< css::beans::PropertyValue >& seqProperties ) throw( css::uno::RuntimeException, std::exception ) override;
+                                        const css::uno::Sequence< css::beans::PropertyValue >& seqProperties ) 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;
+                                                 const css::util::URL&                                     aURL ) 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;
+                                                    const css::util::URL&                                     aURL  ) override;
 
         //   XFrameActionListener
-        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) override;
 
         //   XEventListener
-        void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+        void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
     //  protected methods
     protected:
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index cbec0bd46417..22c29de79ecd 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -74,33 +74,33 @@ class ServiceHandler : public  ::cppu::WeakImplHelper<
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,
                                                                                                              const OUString&                                      sTarget     ,
-                                                                                                                   sal_Int32                                             nFlags      ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                                                                                   sal_Int32                                             nFlags      ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) override;
 
         // XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
 
         // XDispatch
         virtual void SAL_CALL dispatch            ( const css::util::URL&                                     aURL       ,
-                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments ) override;
         virtual void SAL_CALL addStatusListener   ( const css::uno::Reference< css::frame::XStatusListener >& xListener  ,
-                                                    const css::util::URL&                                     aURL       ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const css::util::URL&                                     aURL       ) override;
         virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener  ,
-                                                    const css::util::URL&                                     aURL       ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const css::util::URL&                                     aURL       ) override;
 
     /* internal */
     private:
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::uno::XInterface > implts_dispatch( const css::util::URL&                                  aURL       ,
-                                                                     const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException );
+                                                                     const css::uno::Sequence< css::beans::PropertyValue >& lArguments );
 
 };      //  class ServiceHandler
 
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 3fbc3ee01618..44805ab1d34a 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -85,19 +85,19 @@ class StartModuleDispatcher : public  ::cppu::WeakImplHelper<
         // XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
 
         // XDispatch
         virtual void SAL_CALL dispatch            ( const css::util::URL&                                     aURL      ,
-                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments) throw(css::uno::RuntimeException, std::exception) override;
+                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments) override;
         virtual void SAL_CALL addStatusListener   ( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
-                                                    const css::util::URL&                                     aURL      ) throw(css::uno::RuntimeException, std::exception) override;
+                                                    const css::util::URL&                                     aURL      ) override;
         virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
-                                                    const css::util::URL&                                     aURL      ) throw(css::uno::RuntimeException, std::exception) override;
+                                                    const css::util::URL&                                     aURL      ) override;
 
         // XDispatchInformationProvider
-        virtual css::uno::Sequence< sal_Int16 >                       SAL_CALL getSupportedCommandGroups         (                         ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) 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 nCommandGroup ) override;
 
     // internal helper
 
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index 143c284e2602..4de848467fe1 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -72,27 +72,27 @@ class SystemExec :     public  ::cppu::WeakImplHelper<
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,
                                                                                                              const OUString&                                      sTarget     ,
-                                                                                                                   sal_Int32                                             nFlags      ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                                                                                   sal_Int32                                             nFlags      ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) override;
 
         // XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
 
         // XDispatch
         virtual void SAL_CALL dispatch            ( const css::util::URL&                                     aURL       ,
-                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const css::uno::Sequence< css::beans::PropertyValue >&    lArguments ) override;
         virtual void SAL_CALL addStatusListener   ( const css::uno::Reference< css::frame::XStatusListener >& xListener  ,
-                                                    const css::util::URL&                                     aURL       ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const css::util::URL&                                     aURL       ) override;
         virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener  ,
-                                                    const css::util::URL&                                     aURL       ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const css::util::URL&                                     aURL       ) override;
 
     /* internal */
     private:
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 9581c77f171b..b84e74196f89 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -56,9 +56,9 @@ class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper< css::ui::
 
         //  XDockingAreaAcceptor
 
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow() override;
+        virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) override;
+        virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) override;
 
     //  variables
     //  (should be private everyway!)
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index c8f5927682bd..47043b5a06bb 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -154,8 +154,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper<css::container::XCon
         }
 
         // container.XContainerListener
-        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent)
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override
         {
             css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -163,8 +162,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper<css::container::XCon
                 xOwner->elementInserted(rEvent);
         }
 
-        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent)
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override
         {
             css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -172,8 +170,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper<css::container::XCon
                 xOwner->elementRemoved(rEvent);
         }
 
-        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent)
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override
         {
             css::uno::Reference<css::container::XContainerListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -182,8 +179,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper<css::container::XCon
         }
 
         // 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::container::XContainerListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -205,8 +201,7 @@ class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesLis
         }
 
         // util.XChangesListener
-        virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& rEvent)
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& rEvent) override
         {
             css::uno::Reference<css::util::XChangesListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -215,8 +210,7 @@ class WeakChangesListener : public ::cppu::WeakImplHelper<css::util::XChangesLis
         }
 
         // 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::util::XChangesListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -237,8 +231,7 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::X
         {
         }
 
-        virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& rEvent)
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& rEvent) override
         {
             css::uno::Reference<css::document::XDocumentEventListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -248,8 +241,7 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper<css::document::X
         }
 
         // 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::document::XDocumentEventListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 31091927afdf..fb22500f6a0c 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -91,7 +91,7 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
                         An NULL-reference, other way.
         *//*-*****************************************************************************************************/
 
-        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
         //  XElementAccess
 
@@ -102,7 +102,7 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
             @return     The uno-type XComponent.
         *//*-*****************************************************************************************************/
 
-        virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Type SAL_CALL getElementType() override;
 
         /*-****************************************************************************************************
             @short      get state of componentlist of enumeration.
@@ -111,7 +111,7 @@ class OComponentAccess  :   public ::cppu::WeakImplHelper< css::container::XEnum
             @return     sal_False ,otherwise.
         *//*-*****************************************************************************************************/
 
-        virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
     //  protected methods
 
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index e833f4d211b7..af76786f8f2c 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -81,7 +81,7 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
             @param      "aEvent" describe the source of this event.
         *//*-*****************************************************************************************************/
 
-        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
         //  XEnumeration
 
@@ -98,7 +98,7 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
                         (List is empty and there no accessible elements ...)
         *//*-*****************************************************************************************************/
 
-        virtual sal_Bool SAL_CALL hasMoreElements() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL hasMoreElements() override;
 
         /*-****************************************************************************************************
             @short      give the next element, if some exist
@@ -110,9 +110,7 @@ class OComponentEnumeration :   public ::cppu::WeakImplHelper< css::container::X
             @onerror    If end of enumeration is arrived or there are no elements in list => a NoSuchElementException is thrown.
         *//*-*****************************************************************************************************/
 
-        virtual css::uno::Any SAL_CALL nextElement() throw( css::container::NoSuchElementException  ,
-                                                             css::lang::WrappedTargetException      ,
-                                                            css::uno::RuntimeException, std::exception              ) override;
+        virtual css::uno::Any SAL_CALL nextElement() override;
 
     //  protected methods
 
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 1a13ff553b50..a2e2dc42e074 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -72,7 +72,7 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
             @param      "xFrame", reference to an existing frame to append.
             @onerror    We do nothing in release or throw an assert in debug version.
         */
-        virtual void SAL_CALL append( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL append( const css::uno::Reference< css::frame::XFrame >& xFrame ) override;
 
         /**
             @short      remove frame from container
@@ -84,7 +84,7 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
             @param      "xFrame", reference to an existing frame to remove.
             @onerror    We do nothing in release or throw an assert in debug version.
         */
-        virtual void SAL_CALL remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) override;
 
         /**
             @short      return list of all applicable frames for given flags
@@ -94,7 +94,7 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
 
             @onerror    An empty list is returned.
         */
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > SAL_CALL queryFrames( sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > SAL_CALL queryFrames( sal_Int32 nSearchFlags ) override;
 
         //  XIndexAccess
 
@@ -109,7 +109,7 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
 
             @onerror    If a lock is set, we return 0 for prevent further access!
         */
-        virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
 
         /**
             @short      get specified container item by index
@@ -125,9 +125,7 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
             @onerror    If a lock is set, we return an empty Any!
             @onerror    If index out of range, an IndexOutOfBoundsException is thrown.
         */
-        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw(    css::lang::IndexOutOfBoundsException    ,
-                                                                                css::lang::WrappedTargetException       ,
-                                                                                css::uno::RuntimeException, std::exception              ) override;
+        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override;
 
         //  XElementAccess
 
@@ -137,7 +135,7 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
                         (container-lock is ignored)
             @return     A uno-type descriptor.
         */
-        virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Type SAL_CALL getElementType() override;
 
         /**
             @short      get fill state of current container
@@ -148,7 +146,7 @@ class OFrames   :   public ::cppu::WeakImplHelper< css::frame::XFrames >
 
             @onerror    We return sal_False.
         */
-        virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
     protected:
 
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 4e84cb5c12f8..efd6cebfd304 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -79,17 +79,13 @@ class PersistentWindowState :   public  ::cppu::WeakImplHelper<
         virtual ~PersistentWindowState(                                                                   ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) override;
 
         // XFrameActionListener
-        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
     // helper
 
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index b2248a45fe74..5ef5ed1880e0 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -40,38 +40,30 @@ class FWE_DLLPUBLIC PropertySetContainer : public css::container::XIndexContaine
         virtual ~PropertySetContainer() override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
-            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
-        virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
-            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
         // XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
 
-        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Type SAL_CALL getElementType() override
         {
             return cppu::UnoType<css::beans::XPropertySet>::get();
         }
 
-        virtual sal_Bool SAL_CALL hasElements()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
     private:
         typedef std::vector< css::uno::Reference< css::beans::XPropertySet > > PropertySetVector;
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index c1e39f90486a..3f2cbf11a53d 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -90,20 +90,15 @@ class StatusIndicator : public  ::cppu::WeakImplHelper< css::task::XStatusIndica
 
         // XStatusIndicator
         virtual void SAL_CALL start(const OUString& sText ,
-                                          sal_Int32        nRange)
-            throw(css::uno::RuntimeException, std::exception) override;
+                                          sal_Int32        nRange) override;
 
-        virtual void SAL_CALL end()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL end() override;
 
-        virtual void SAL_CALL reset()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL reset() override;
 
-        virtual void SAL_CALL setText(const OUString& sText)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setText(const OUString& sText) override;
 
-        virtual void SAL_CALL setValue(sal_Int32 nValue)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setValue(sal_Int32 nValue) override;
 
 }; // class StatusIndicator
 
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 21fa060c9134..10ca4539c65b 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -194,37 +194,30 @@ class StatusIndicatorFactory : public  ::cppu::WeakImplHelper<
     public:
         StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-        virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getImplementationName() override
         {
             return OUString("com.sun.star.comp.framework.StatusIndicatorFactory");
         }
 
-        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
         {
             return cppu::supportsService(this, ServiceName);
         }
 
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
         {
             css::uno::Sequence< OUString > aSeq { "com.sun.star.task.StatusIndicatorFactory" };
             return aSeq;
         }
 
         // XInitialization
-        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) override;
 
         // XStatusIndicatorFactory
-        virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator() override;
 
         // XUpdatable
-        virtual void SAL_CALL update()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL update() override;
 
         // similar (XStatusIndicator)
         void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index fdc26596c0d3..e3f390c92f79 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -76,21 +76,16 @@ class TagWindowAsModified :   public  ::cppu::WeakImplHelper<
         // XInterface, XTypeProvider
 
         // XInitialization
-        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) override;
 
         // XModifyListener
-        virtual void SAL_CALL modified(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override;
 
         // XFrameActionListener
-        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
     private:
 
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index 6fc4cb4c1be5..eaebcf8fb2d6 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -83,21 +83,16 @@ class TitleBarUpdate : public  ::cppu::WeakImplHelper<
         // XInterface, XTypeProvider
 
         // XInitialization
-        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-            throw(css::uno::Exception       ,
-                  css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) override;
 
         // XFrameActionListener
-        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override;
 
         // XTitleChangeListener
-        virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
     // helper
 
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 4813125d31ef..947fcab7efdd 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -66,41 +66,41 @@ class UIConfigElementWrapperBase : private cppu::BaseMutex,
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () override
             { OWeakObject::release(); }
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // XComponent
-        virtual  void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual  void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL dispose() override = 0;
+        virtual  void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual  void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
         // XInitialization
-        virtual  void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUIElementSettings
-        virtual  void SAL_CALL updateSettings() throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual  css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL setSettings( const css::uno::Reference< css::container::XIndexAccess >& UISettings ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL updateSettings() override = 0;
+        virtual  css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) override;
+        virtual  void SAL_CALL setSettings( const css::uno::Reference< css::container::XIndexAccess >& UISettings ) override;
 
         // XUIElement
-        virtual  css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw (css::uno::RuntimeException, std::exception) override;
-        virtual  OUString SAL_CALL getResourceURL() throw (css::uno::RuntimeException, std::exception) override;
-        virtual  ::sal_Int16 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-        virtual  css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual  css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() override;
+        virtual  OUString SAL_CALL getResourceURL() override;
+        virtual  ::sal_Int16 SAL_CALL getType() override;
+        virtual  css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() override = 0;
 
         // XUpdatable
-        virtual  void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL update() override;
 
         //  XUIConfigurationListener
-        virtual  void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) override;
+        virtual  void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) override;
+        virtual  void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) override;
 
         // XEventListener
         using cppu::OPropertySetHelper::disposing;
-        virtual  void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
     //  protected methods
 
@@ -110,14 +110,14 @@ class UIConfigElementWrapperBase : private cppu::BaseMutex,
         virtual  sal_Bool                                            SAL_CALL convertFastPropertyValue        ( css::uno::Any&        aConvertedValue ,
                                                                                                                css::uno::Any&        aOldValue       ,
                                                                                                                sal_Int32                        nHandle         ,
-                                                                                                               const css::uno::Any&  aValue          ) throw( css::lang::IllegalArgumentException ) override;
+                                                                                                               const css::uno::Any&  aValue          ) override;
         virtual  void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
-                                                                                                               const css::uno::Any&  aValue          ) throw( css::uno::Exception, std::exception                 ) override;
+                                                                                                               const css::uno::Any&  aValue          ) override;
         using cppu::OPropertySetHelper::getFastPropertyValue;
         virtual  void                                                SAL_CALL getFastPropertyValue( css::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const override;
         virtual  ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper() override;
-        virtual  css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
         virtual  void impl_fillNewData();
 
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index e856fbc35c94..c8a41bd192da 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -60,27 +60,27 @@ class UIElementWrapperBase : private cppu::BaseMutex,
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () override
             { OWeakObject::release(); }
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // XComponent
-        virtual  void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual  void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL dispose() override = 0;
+        virtual  void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual  void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
         // XInitialization
-        virtual  void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUpdatable
-        virtual  void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL update() override;
 
         // XUIElement
-        virtual  css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw (css::uno::RuntimeException, std::exception) override;
-        virtual  OUString SAL_CALL getResourceURL() throw (css::uno::RuntimeException, std::exception) override;
-        virtual  ::sal_Int16 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-        virtual  css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual  css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() override;
+        virtual  OUString SAL_CALL getResourceURL() override;
+        virtual  ::sal_Int16 SAL_CALL getType() override;
+        virtual  css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() override = 0;
 
     //  protected methods
 
@@ -90,14 +90,14 @@ class UIElementWrapperBase : private cppu::BaseMutex,
         virtual  sal_Bool                                            SAL_CALL convertFastPropertyValue        ( css::uno::Any&        aConvertedValue ,
                                                                                                                css::uno::Any&        aOldValue       ,
                                                                                                                sal_Int32                        nHandle         ,
-                                                                                                               const css::uno::Any&  aValue          ) throw( css::lang::IllegalArgumentException ) override;
+                                                                                                               const css::uno::Any&  aValue          ) override;
         virtual  void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
-                                                                                                               const css::uno::Any&  aValue          ) throw( css::uno::Exception, std::exception                 ) override;
+                                                                                                               const css::uno::Any&  aValue          ) override;
         using cppu::OPropertySetHelper::getFastPropertyValue;
         virtual  void                                                SAL_CALL getFastPropertyValue( css::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const override;
         virtual  ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper() override;
-        virtual  css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
+        virtual  css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
         static  const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index 6c4c389fca76..c7a05a9fb38f 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -74,20 +74,15 @@ class VCLStatusIndicator : public  ::cppu::WeakImplHelper< css::task::XStatusInd
 
         /// XStatusIndicator
         virtual void SAL_CALL start(const OUString& sText ,
-                                          sal_Int32        nRange)
-            throw(css::uno::RuntimeException, std::exception) override;
+                                          sal_Int32        nRange) override;
 
-        virtual void SAL_CALL reset()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL reset() override;
 
-        virtual void SAL_CALL end()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL end() override;
 
-        virtual void SAL_CALL setText(const OUString& sText)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setText(const OUString& sText) override;
 
-        virtual void SAL_CALL setValue(sal_Int32 nValue)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setValue(sal_Int32 nValue) override;
 
     // helper
 
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index fc9e9aad7ae2..04eb5169b459 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -72,7 +72,7 @@ class QuietInteraction : public  ::cppu::WeakImplHelper<
 
             @threadsafe yes
         */
-        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) override;
 
     // c++ interface
     public:
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index b1389ab50727..10f3daf1ff43 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -96,18 +96,14 @@ class HelpOnStartup : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // css.task.XJob
-        virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::Exception                ,
-                  css::uno::RuntimeException, std::exception         ) override;
+        virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) override;
 
         // css.lang.XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
     // helper
     private:
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 5f0a02d4bbaf..c4221cc06b09 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -192,21 +192,19 @@ class Job : public  ::cppu::WeakImplHelper<
 
         // XJobListener
         virtual void SAL_CALL jobFinished( const css::uno::Reference< css::task::XAsyncJob >& xJob,
-                                           const css::uno::Any&                               aResult ) throw(css::uno::RuntimeException, std::exception) override;
+                                           const css::uno::Any&                               aResult ) 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;
 
         // XCloseListener
         virtual void SAL_CALL queryClosing ( const css::lang::EventObject& aEvent         ,
-                                                   sal_Bool                bGetsOwnership ) throw(css::util::CloseVetoException,
-                                                                                                  css::uno::RuntimeException, std::exception   ) override;
-        virtual void SAL_CALL notifyClosing( const css::lang::EventObject& aEvent         ) throw(css::uno::RuntimeException, std::exception   ) override;
+                                                   sal_Bool                bGetsOwnership ) override;
+        virtual void SAL_CALL notifyClosing( const css::lang::EventObject& aEvent         ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 };
 
 } // namespace framework
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 13658a1c791e..766f6e54562c 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -80,14 +80,11 @@ class ShellJob : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::tas
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // css.task.XJob
-        virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::Exception                ,
-                  css::uno::RuntimeException, std::exception         ) override;
+        virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) override;
 
     // helper
     private:
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 0d85f59e0740..4a57c3d69f8c 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -66,7 +66,7 @@ ________________________________________________________________________________
 
 #define PRIVATE_DEFINE_XINTERFACE( CLASS, BASECLASS, INTERFACES )                                                                                           \
     PRIVATE_DEFINE_XINTERFACE_ACQUIRE_RELEASE( CLASS, BASECLASS )                                                                                           \
-    css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception )  \
+    css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType )  \
     {                                                                                                                                                       \
         /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */                                                              \
         /* Ask for my own supported interfaces ...                                          */                                                              \
@@ -128,7 +128,7 @@ ________________________________________________________________________________
 //  declaration of XInterface
 
 #define FWK_DECLARE_XINTERFACE                                                                                                                                      \
-    virtual css::uno::Any  SAL_CALL queryInterface( const css::uno::Type& aType   ) throw( css::uno::RuntimeException, std::exception ) override; \
+    virtual css::uno::Any  SAL_CALL queryInterface( const css::uno::Type& aType   ) override; \
     virtual void                        SAL_CALL acquire       (                                            ) throw() override;  \
     virtual void                        SAL_CALL release       (                                            ) throw() override;
 
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index a8d8b935d23d..8127651fabc0 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -49,17 +49,17 @@ namespace framework{
 
 #define PRIVATE_DEFINE_XSERVICEINFO_BASE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME )                                                  \
                                                                                                                                                     \
-    OUString SAL_CALL CLASS::getImplementationName() throw( css::uno::RuntimeException, std::exception )                                                            \
+    OUString SAL_CALL CLASS::getImplementationName()                                                            \
     {                                                                                                                                               \
         return impl_getStaticImplementationName();                                                                                                  \
     }                                                                                                                                               \
                                                                                                                                                     \
-    sal_Bool SAL_CALL CLASS::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception )                                    \
+    sal_Bool SAL_CALL CLASS::supportsService( const OUString& sServiceName )                                    \
     {                                                                                                                                               \
         return cppu::supportsService(this, sServiceName);                                                                                           \
     }                                                                                                                                               \
                                                                                                                                                     \
-    css::uno::Sequence< OUString > SAL_CALL CLASS::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )                                   \
+    css::uno::Sequence< OUString > SAL_CALL CLASS::getSupportedServiceNames()                                   \
     {                                                                                                                                               \
         return impl_getStaticSupportedServiceNames();                                                                                               \
     }                                                                                                                                               \
@@ -81,7 +81,7 @@ namespace framework{
     /*            use right EXTERNAL handling of them. That's why you should do nothing in your ctor, which could*/                                 \
     /*            work on your ref count! All other things are allowed. Do work with your own reference - please */                                 \
     /*            use "impl_initService()" method.                                                               */                                 \
-    css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception )  \
+    css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )  \
     {                                                                                                                                                                                              \
         /* create new instance of service */                                                                                                                                                       \
         CLASS* pClass = new CLASS( xServiceManager );                                                                                                                                              \
@@ -100,7 +100,6 @@ namespace framework{
     /*            work on your ref count! All other things are allowed. Do work with your own reference - please */                                 \
     /*            use "impl_initService()" method.                                                               */                                 \
     css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )\
-        throw( css::uno::Exception )                                                                                                                                \
     {                                                                                                                                                               \
         /* retrieve component context from the given service manager */                                                                                             \
         css::uno::Reference< css::uno::XComponentContext > xComponentContext(                                                                                       \
@@ -141,9 +140,9 @@ namespace framework{
 
 #define DECLARE_XSERVICEINFO_NOFACTORY                                                                                                                                                                                                  \
     /* interface XServiceInfo */                                                                                                                                                                                                        \
-    virtual OUString                                        SAL_CALL getImplementationName              (                                   ) throw( css::uno::RuntimeException, std::exception ) override;   \
-    virtual sal_Bool                                        SAL_CALL supportsService                    ( const OUString&   sServiceName    ) throw( css::uno::RuntimeException, std::exception ) override;   \
-    virtual css::uno::Sequence< OUString >                  SAL_CALL getSupportedServiceNames           (                                   ) throw( css::uno::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;   \
     /* Helper for XServiceInfo */                                                                                                                                                                                 \
     static css::uno::Sequence< OUString >                   SAL_CALL impl_getStaticSupportedServiceNames(                                   );                                                                    \
     static OUString                                         SAL_CALL impl_getStaticImplementationName   (                                   );                                                                    \
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index dfc97395813d..93b161a8576f 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -51,7 +51,7 @@ ________________________________________________________________________________
 //  implementation of XTypeProvider::getImplementationId()
 
 #define PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS )                                                                               \
-    css::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() throw( css::uno::RuntimeException, std::exception )          \
+    css::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId()          \
     {                                                                                                                                           \
         return css::uno::Sequence<sal_Int8>();                                                                                                  \
     }
@@ -83,7 +83,7 @@ ________________________________________________________________________________
 
 #define PRIVATE_DEFINE_XTYPEPROVIDER( CLASS, TYPES )                                                                                            \
     PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS )                                                                                   \
-    css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes() throw( css::uno::RuntimeException, std::exception )  \
+    css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes()  \
     {                                                                                                                                           \
         /* Optimize this method !                                       */                                                                      \
         /* We initialize a static variable only one time.               */                                                                      \
@@ -112,8 +112,8 @@ ________________________________________________________________________________
 //  declaration of XTypeProvider
 
 #define FWK_DECLARE_XTYPEPROVIDER                                                                                                                               \
-    virtual css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes           () throw( css::uno::RuntimeException, std::exception ) override;\
-    virtual css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes           () override;\
+    virtual css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
 //  public
 //  implementation of XTypeProvider
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 8d5b68365ca7..0cd37a826e2d 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -65,25 +65,25 @@ class DispatchRecorder
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchRecorder
-        virtual void SAL_CALL            startRecording         ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL            recordDispatch         ( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL            recordDispatchAsComment( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL            endRecording           () throw( css::uno::RuntimeException, std::exception ) override;
-        virtual OUString SAL_CALL getRecordedMacro       () throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL            startRecording         ( const css::uno::Reference< css::frame::XFrame >& xFrame ) override;
+        virtual void SAL_CALL            recordDispatch         ( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
+        virtual void SAL_CALL            recordDispatchAsComment( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
+        virtual void SAL_CALL            endRecording           () override;
+        virtual OUString SAL_CALL getRecordedMacro       () override;
 
-        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;
 
-        virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
 
-        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32)  throw (css::uno::RuntimeException, css::lang::WrappedTargetException, css::lang::IndexOutOfBoundsException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32) override;
 
-        virtual void SAL_CALL replaceByIndex(sal_Int32, const css::uno::Any&)  throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex(sal_Int32, const css::uno::Any&) override;
 
     // private functions
     private:
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index b194cc24e810..14b02b43ca4d 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -69,16 +69,16 @@ class DispatchRecorderSupplier  :   public  ::cppu::WeakImplHelper<
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchRecorderSupplier
 
-        virtual void                                                 SAL_CALL setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder   ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL getDispatchRecorder(                                                                         ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void                                                 SAL_CALL setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder   ) override;
+        virtual css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL getDispatchRecorder(                                                                         ) override;
         virtual void                                                 SAL_CALL dispatchAndRecord  ( const css::util::URL&                                       aURL        ,
                                                                                                    const css::uno::Sequence< css::beans::PropertyValue >&      lArguments  ,
-                                                                                                   const css::uno::Reference< css::frame::XDispatch >&         xDispatcher ) throw (css::uno::RuntimeException, std::exception) override;
+                                                                                                   const css::uno::Reference< css::frame::XDispatch >&         xDispatcher ) override;
 
     // native interface
 
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 9df5666b4fbe..ee2d5762d710 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -120,24 +120,21 @@ class Desktop : private cppu::BaseMutex,
         void constructorInit();
 
         //  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;
+        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;
 
         // XInterface
         virtual void SAL_CALL acquire() throw () override
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () override
             { OWeakObject::release(); }
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         /**
             @interface  XDesktop
@@ -167,8 +164,7 @@ class Desktop : private cppu::BaseMutex,
             @onerror    False will be returned.
             @threadsafe yes
          */
-        virtual sal_Bool SAL_CALL terminate()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL terminate() override;
 
         /**
             @interface  XDesktop
@@ -189,8 +185,7 @@ class Desktop : private cppu::BaseMutex,
 
             @threadsafe yes
          */
-        virtual void SAL_CALL addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) override;
 
         /**
             @interface  XDesktop
@@ -210,100 +205,89 @@ class Desktop : private cppu::BaseMutex,
 
             @threadsafe yes
          */
-        virtual void SAL_CALL removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) override;
 
-        virtual css::uno::Reference< css::container::XEnumerationAccess >           SAL_CALL getComponents              (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual css::uno::Reference< css::lang::XComponent >                        SAL_CALL getCurrentComponent        (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual css::uno::Reference< css::frame::XFrame >                           SAL_CALL getCurrentFrame            (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
+        virtual css::uno::Reference< css::container::XEnumerationAccess >           SAL_CALL getComponents              (                                                                                 ) override;
+        virtual css::uno::Reference< css::lang::XComponent >                        SAL_CALL getCurrentComponent        (                                                                                 ) override;
+        virtual css::uno::Reference< css::frame::XFrame >                           SAL_CALL getCurrentFrame            (                                                                                 ) override;
 
         //  XComponentLoader
         virtual css::uno::Reference< css::lang::XComponent >                        SAL_CALL loadComponentFromURL       ( const OUString&                                         sURL             ,
                                                                                                                           const OUString&                                         sTargetFrameName ,
                                                                                                                                 sal_Int32                                                nSearchFlags     ,
-                                                                                                                          const css::uno::Sequence< css::beans::PropertyValue >&         lArguments       ) throw( css::io::IOException                ,
-                                                                                                                                                                                                                   css::lang::IllegalArgumentException ,
-                                                                                                                                                                                                                   css::uno::RuntimeException, std::exception          ) override;
+                                                                                                                          const css::uno::Sequence< css::beans::PropertyValue >&         lArguments       ) override;
 
         //  XTasksSupplier
-        virtual css::uno::Reference< css::container::XEnumerationAccess >           SAL_CALL getTasks                   (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual css::uno::Reference< css::frame::XTask >                            SAL_CALL getActiveTask              (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
+        virtual css::uno::Reference< css::container::XEnumerationAccess >           SAL_CALL getTasks                   (                                                                                 ) override;
+        virtual css::uno::Reference< css::frame::XTask >                            SAL_CALL getActiveTask              (                                                                                 ) override;
 
         //  XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch >                        SAL_CALL queryDispatch              ( const css::util::URL&                                          aURL             ,
                                                                                                                           const OUString&                                         sTargetFrameName ,
-                                                                                                                                sal_Int32                                                nSearchFlags     ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >  SAL_CALL queryDispatches            ( const css::uno::Sequence< css::frame::DispatchDescriptor >&    lQueries         ) throw( css::uno::RuntimeException, std::exception          ) override;
+                                                                                                                                sal_Int32                                                nSearchFlags     ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >  SAL_CALL queryDispatches            ( const css::uno::Sequence< css::frame::DispatchDescriptor >&    lQueries         ) override;
 
         // XDispatchProviderInterception
-        virtual void                                                                SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw( css::uno::RuntimeException, std::exception) override;
-        virtual void                                                                SAL_CALL releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw( css::uno::RuntimeException, std::exception) override;
+        virtual void                                                                SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) override;
+        virtual void                                                                SAL_CALL releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) override;
 
         //  XFramesSupplier
-        virtual css::uno::Reference< css::frame::XFrames >                          SAL_CALL getFrames                  (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual css::uno::Reference< css::frame::XFrame >                           SAL_CALL getActiveFrame             (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL setActiveFrame             ( const css::uno::Reference< css::frame::XFrame >&               xFrame           ) throw( css::uno::RuntimeException, std::exception          ) override;
+        virtual css::uno::Reference< css::frame::XFrames >                          SAL_CALL getFrames                  (                                                                                 ) override;
+        virtual css::uno::Reference< css::frame::XFrame >                           SAL_CALL getActiveFrame             (                                                                                 ) override;
+        virtual void                                                                SAL_CALL setActiveFrame             ( const css::uno::Reference< css::frame::XFrame >&               xFrame           ) override;
 
         //   XFrame
         //  Attention: findFrame() is implemented only! Other methods make no sense for our desktop!
         virtual css::uno::Reference< css::frame::XFrame >                           SAL_CALL findFrame                  ( const OUString&                                         sTargetFrameName ,
-                                                                                                                                sal_Int32                                                nSearchFlags     ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL initialize                 ( const css::uno::Reference< css::awt::XWindow >&                xWindow          ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual css::uno::Reference< css::awt::XWindow >                            SAL_CALL getContainerWindow         (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL setCreator                 ( const css::uno::Reference< css::frame::XFramesSupplier >&      xCreator         ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual css::uno::Reference< css::frame::XFramesSupplier >                  SAL_CALL getCreator                 (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual OUString                                                     SAL_CALL getName                    (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL setName                    ( const OUString&                                         sName            ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual sal_Bool                                                            SAL_CALL isTop                      (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL activate                   (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL deactivate                 (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual sal_Bool                                                            SAL_CALL isActive                   (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
+                                                                                                                                sal_Int32                                                nSearchFlags     ) override;
+        virtual void                                                                SAL_CALL initialize                 ( const css::uno::Reference< css::awt::XWindow >&                xWindow          ) override;
+        virtual css::uno::Reference< css::awt::XWindow >                            SAL_CALL getContainerWindow         (                                                                                 ) override;
+        virtual void                                                                SAL_CALL setCreator                 ( const css::uno::Reference< css::frame::XFramesSupplier >&      xCreator         ) override;
+        virtual css::uno::Reference< css::frame::XFramesSupplier >                  SAL_CALL getCreator                 (                                                                                 ) override;
+        virtual OUString                                                     SAL_CALL getName                    (                                                                                 ) override;
+        virtual void                                                                SAL_CALL setName                    ( const OUString&                                         sName            ) override;
+        virtual sal_Bool                                                            SAL_CALL isTop                      (                                                                                 ) override;
+        virtual void                                                                SAL_CALL activate                   (                                                                                 ) override;
+        virtual void                                                                SAL_CALL deactivate                 (                                                                                 ) override;
+        virtual sal_Bool                                                            SAL_CALL isActive                   (                                                                                 ) override;
         virtual sal_Bool                                                            SAL_CALL setComponent               ( const css::uno::Reference< css::awt::XWindow >&                xComponentWindow ,
-                                                                                                                          const css::uno::Reference< css::frame::XController >&          xController      ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual css::uno::Reference< css::awt::XWindow >                            SAL_CALL getComponentWindow         (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual css::uno::Reference< css::frame::XController >                      SAL_CALL getController              (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL contextChanged             (                                                                                 ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL addFrameActionListener     ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener        ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL removeFrameActionListener  ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener        ) throw( css::uno::RuntimeException, std::exception          ) override;
+                                                                                                                          const css::uno::Reference< css::frame::XController >&          xController      ) override;
+        virtual css::uno::Reference< css::awt::XWindow >                            SAL_CALL getComponentWindow         (                                                                                 ) override;
+        virtual css::uno::Reference< css::frame::XController >                      SAL_CALL getController              (                                                                                 ) override;
+        virtual void                                                                SAL_CALL contextChanged             (                                                                                 ) override;
+        virtual void                                                                SAL_CALL addFrameActionListener     ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener        ) override;
+        virtual void                                                                SAL_CALL removeFrameActionListener  ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener        ) override;
 
         //   XComponent
-        virtual void SAL_CALL disposing() throw( css::uno::RuntimeException ) override;
-        virtual void                                                                SAL_CALL addEventListener           ( const css::uno::Reference< css::lang::XEventListener >&        xListener        ) throw( css::uno::RuntimeException, std::exception          ) override;
-        virtual void                                                                SAL_CALL removeEventListener        ( const css::uno::Reference< css::lang::XEventListener >&        xListener        ) throw( css::uno::RuntimeException, std::exception          ) override;
+        virtual void SAL_CALL disposing() override;
+        virtual void                                                                SAL_CALL addEventListener           ( const css::uno::Reference< css::lang::XEventListener >&        xListener        ) override;
+        virtual void                                                                SAL_CALL removeEventListener        ( const css::uno::Reference< css::lang::XEventListener >&        xListener        ) override;
 
         //   XDispatchResultListener
-        virtual void SAL_CALL dispatchFinished      ( const css::frame::DispatchResultEvent&                    aEvent     ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispatchFinished      ( const css::frame::DispatchResultEvent&                    aEvent     ) override;
 
         //   XEventListener
-        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;
 
         //   XInteractionHandler
-        virtual void                                                                SAL_CALL handle                     ( const css::uno::Reference< css::task::XInteractionRequest >&   xRequest         ) throw( css::uno::RuntimeException, std::exception          ) override;
+        virtual void                                                                SAL_CALL handle                     ( const css::uno::Reference< css::task::XInteractionRequest >&   xRequest         ) override;
 
         // css.frame.XUntitledNumbers
-        virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent )
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception         ) override;
+        virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) override;
 
         // css.frame.XUntitledNumbers
-        virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber )
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception         ) override;
+        virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) override;
 
         // css.frame.XUntitledNumbers
-        virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent )
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception         ) override;
+        virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) override;
 
         // css.frame.XUntitledNumbers
-        virtual OUString SAL_CALL getUntitledPrefix()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getUntitledPrefix() override;
 
         // we need this wrapped terminate()-call to terminate even the QuickStarter
         // non-virtual and non-UNO for now
         /// @throws css::uno::RuntimeException
-        bool SAL_CALL terminateQuickstarterToo()
-            throw( css::uno::RuntimeException );
+        bool SAL_CALL terminateQuickstarterToo();
 
     //  protected methods
 
@@ -313,14 +297,14 @@ class Desktop : private cppu::BaseMutex,
         virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        (       css::uno::Any&  aConvertedValue ,
                                                                                                                      css::uno::Any&  aOldValue       ,
                                                                                                                      sal_Int32       nHandle         ,
-                                                                                                               const css::uno::Any&  aValue          ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+                                                                                                               const css::uno::Any&  aValue          ) override;
         virtual void                                                SAL_CALL setFastPropertyValue_NoBroadcast(       sal_Int32       nHandle         ,
-                                                                                                               const css::uno::Any&  aValue          ) throw( css::uno::Exception, std::exception                 ) override;
+                                                                                                               const css::uno::Any&  aValue          ) override;
         using cppu::OPropertySetHelper::getFastPropertyValue;
         virtual void                                                SAL_CALL getFastPropertyValue            (       css::uno::Any&  aValue          ,
                                                                                                                      sal_Int32       nHandle         ) const override;
         virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper                   (                                       ) override;
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo              (                                       ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo              (                                       ) override;
 
 
     private:
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index ca122c39923c..7ddf501f3007 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -86,85 +86,81 @@ namespace framework
             /** declaration of XInterface, XTypeProvider, XServiceInfo */
             FWK_DECLARE_XINTERFACE
             FWK_DECLARE_XTYPEPROVIDER
-            virtual OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual OUString SAL_CALL getImplementationName() override
             {
                 return OUString("com.sun.star.comp.framework.LayoutManager");
             }
 
-            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
             {
                 return cppu::supportsService(this, ServiceName);
             }
 
-            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
             {
                 css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.LayoutManager" };
                 return aSeq;
             }
 
             // XLayoutManager
-            virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::awt::Rectangle SAL_CALL getCurrentDockingArea(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::ui::XDockingAreaAcceptor > SAL_CALL getDockingAreaAcceptor() throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDockingAreaAcceptor( const css::uno::Reference< css::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) throw (css::uno::RuntimeException, std::exception) final override;
-            virtual void SAL_CALL createElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL destroyElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL requestElement( const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL getElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::uno::Reference< css::ui::XUIElement > > SAL_CALL getElements(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL showElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hideElement( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dockWindow( const OUString& aName, css::ui::DockingArea DockingArea, const css::awt::Point& Pos ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL dockAllWindows( ::sal_Int16 nElementType ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL floatWindow( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL lockWindow( const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL unlockWindow( const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setElementSize( const OUString& aName, const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setElementPos( const OUString& aName, const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setElementPosSize( const OUString& aName, const css::awt::Point& aPos, const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isElementVisible( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isElementFloating( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isElementDocked( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isElementLocked( const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::awt::Size SAL_CALL getElementSize( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::awt::Point SAL_CALL getElementPos( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL lock(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL unlock(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL doLayout(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isVisible() throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& Frame ) override;
+            virtual void SAL_CALL reset() override;
+            virtual css::awt::Rectangle SAL_CALL getCurrentDockingArea(  ) override;
+            virtual css::uno::Reference< css::ui::XDockingAreaAcceptor > SAL_CALL getDockingAreaAcceptor() override;
+            virtual void SAL_CALL setDockingAreaAcceptor( const css::uno::Reference< css::ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) final override;
+            virtual void SAL_CALL createElement( const OUString& aName ) override;
+            virtual void SAL_CALL destroyElement( const OUString& aName ) override;
+            virtual sal_Bool SAL_CALL requestElement( const OUString& ResourceURL ) override;
+            virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL getElement( const OUString& aName ) override;
+            virtual css::uno::Sequence< css::uno::Reference< css::ui::XUIElement > > SAL_CALL getElements(  ) override;
+            virtual sal_Bool SAL_CALL showElement( const OUString& aName ) override;
+            virtual sal_Bool SAL_CALL hideElement( const OUString& aName ) override;
+            virtual sal_Bool SAL_CALL dockWindow( const OUString& aName, css::ui::DockingArea DockingArea, const css::awt::Point& Pos ) override;
+            virtual sal_Bool SAL_CALL dockAllWindows( ::sal_Int16 nElementType ) override;
+            virtual sal_Bool SAL_CALL floatWindow( const OUString& aName ) override;
+            virtual sal_Bool SAL_CALL lockWindow( const OUString& ResourceURL ) override;
+            virtual sal_Bool SAL_CALL unlockWindow( const OUString& ResourceURL ) override;
+            virtual void SAL_CALL setElementSize( const OUString& aName, const css::awt::Size& aSize ) override;
+            virtual void SAL_CALL setElementPos( const OUString& aName, const css::awt::Point& aPos ) override;
+            virtual void SAL_CALL setElementPosSize( const OUString& aName, const css::awt::Point& aPos, const css::awt::Size& aSize ) override;
+            virtual sal_Bool SAL_CALL isElementVisible( const OUString& aName ) override;
+            virtual sal_Bool SAL_CALL isElementFloating( const OUString& aName ) override;
+            virtual sal_Bool SAL_CALL isElementDocked( const OUString& aName ) override;
+            virtual sal_Bool SAL_CALL isElementLocked( const OUString& ResourceURL ) override;
+            virtual css::awt::Size SAL_CALL getElementSize( const OUString& aName ) override;
+            virtual css::awt::Point SAL_CALL getElementPos( const OUString& aName ) override;
+            virtual void SAL_CALL lock(  ) override;
+            virtual void SAL_CALL unlock(  ) override;
+            virtual void SAL_CALL doLayout(  ) override;
+            virtual void SAL_CALL setVisible( sal_Bool bVisible ) override;
+            virtual sal_Bool SAL_CALL isVisible() override;
 
             // XMenuBarMergingAcceptor
 
-            virtual sal_Bool SAL_CALL setMergedMenuBar( const css::uno::Reference< css::container::XIndexAccess >& xMergedMenuBar )
-                                                       throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeMergedMenuBar(  ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL setMergedMenuBar( const css::uno::Reference< css::container::XIndexAccess >& xMergedMenuBar ) override;
+            virtual void SAL_CALL removeMergedMenuBar(  ) override;
 
             //  XWindowListener
-            virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-            virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-            virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-            virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) override;
+            virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) override;
+            virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) override;
+            virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) override;
 
             //   XFrameActionListener
-            virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) override;
 
             //  XEventListener
             using cppu::OPropertySetHelper::disposing;
-            virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
             //  XUIConfigurationListener
-            virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) override;
+            virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) override;
+            virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) override;
 
             //  XLayoutManagerEventBroadcaster
-            virtual void SAL_CALL addLayoutManagerEventListener( const css::uno::Reference< css::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeLayoutManagerEventListener( const css::uno::Reference< css::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL addLayoutManagerEventListener( const css::uno::Reference< css::frame::XLayoutManagerListener >& aLayoutManagerListener ) override;
+            virtual void SAL_CALL removeLayoutManagerEventListener( const css::uno::Reference< css::frame::XLayoutManagerListener >& aLayoutManagerListener ) override;
 
             DECL_LINK( MenuBarClose, void *, void);
             DECL_LINK( WindowEventListener, VclWindowEvent&, void );
@@ -237,11 +233,9 @@ namespace framework
 
             /// @throws css::uno::RuntimeException
             void    implts_setInplaceMenuBar(
-                        const css::uno::Reference< css::container::XIndexAccess >& xMergedMenuBar )
-                            throw (css::uno::RuntimeException, std::exception);
+                        const css::uno::Reference< css::container::XIndexAccess >& xMergedMenuBar );
             /// @throws css::uno::RuntimeException
-            void    implts_resetInplaceMenuBar()
-                            throw (css::uno::RuntimeException);
+            void    implts_resetInplaceMenuBar();
 
             void    implts_setVisibleState( bool bShow );
             void    implts_updateUIElementsVisibleState( bool bShow );
@@ -251,9 +245,9 @@ namespace framework
             //  OPropertySetHelper
 
             virtual void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
-                                                                                                                const css::uno::Any&  aValue          ) throw( css::uno::Exception, std::exception                 ) override;
+                                                                                                                const css::uno::Any&  aValue          ) override;
             virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper() override;
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
             css::uno::Reference< css::uno::XComponentContext >             m_xContext; /** reference to factory, which has created this instance. */
             css::uno::Reference< css::util::XURLTransformer >              m_xURLTransformer;
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 9d59ad4e08e9..5db3416d50ec 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -72,7 +72,7 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper< css::util::XS
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         //  XStringMapping
@@ -80,8 +80,7 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper< css::util::XS
         /*-****************************************************************************************************
         *//*-*****************************************************************************************************/
 
-        virtual sal_Bool SAL_CALL mapStrings(css::uno::Sequence< OUString >& seqParameter)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL mapStrings(css::uno::Sequence< OUString >& seqParameter) override;
 
 };
 
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 815ebdb0f100..4194ba1dc8b1 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -42,11 +42,11 @@ public:
     DECLARE_XSERVICEINFO_NOFACTORY
     /* Helper for registry */
     /// @throws css::uno::Exception
-    static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+    static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
     static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
     // css::util::XStringAbbreviation:
-    virtual OUString SAL_CALL abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) override;
 
 private:
     UriAbbreviation(UriAbbreviation &) = delete;
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 260ec0ee07bc..481106b42332 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -72,40 +72,40 @@ class TabWindow :  public css::lang::XTypeProvider             ,
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
         //  XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         //  XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
         //  XSimpleTabController
-        virtual ::sal_Int32 SAL_CALL insertTab() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getActiveTabID(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL insertTab() override;
+        virtual void SAL_CALL removeTab( ::sal_Int32 ID ) override;
+        virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) override;
+        virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) override;
+        virtual void SAL_CALL activateTab( ::sal_Int32 ID ) override;
+        virtual ::sal_Int32 SAL_CALL getActiveTabID(  ) override;
+        virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) override;
+        virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) override;
 
         //  XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
         //  XTopWindowListener
-        virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) override;
 
         //  XWindowListener
-        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) override;
+        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) override;
+        virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) override;
+        virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) override;
 
     protected:
         DECL_LINK( Activate, TabControl*, void );
@@ -118,13 +118,13 @@ class TabWindow :  public css::lang::XTypeProvider             ,
         virtual sal_Bool                                            SAL_CALL convertFastPropertyValue( css::uno::Any&        aConvertedValue ,
                                                                                                        css::uno::Any&        aOldValue       ,
                                                                                                        sal_Int32                        nHandle         ,
-                                                                                                       const css::uno::Any&  aValue          ) throw( css::lang::IllegalArgumentException ) override;
+                                                                                                       const css::uno::Any&  aValue          ) override;
         virtual void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
-                                                                                                               const css::uno::Any&  aValue          ) throw( css::uno::Exception, std::exception                 ) override;
+                                                                                                               const css::uno::Any&  aValue          ) override;
         virtual void                                                SAL_CALL getFastPropertyValue( css::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const override;
         virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper() override;
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
         static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index 81c89d7907e6..8e9ddcae3174 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -49,12 +49,12 @@ class TabWinFactory :  public ::cppu::WeakImplHelper< css::lang::XSingleComponen
         DECLARE_XSERVICEINFO_NOFACTORY
         /* Helper for registry */
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XSingleComponentFactory
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
 
     private:
         css::uno::Reference< css::uno::XComponentContext >     m_xContext;
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index 1440816330b5..15391f6b5d9e 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -110,10 +110,10 @@ class FWI_DLLPUBLIC TransactionManager
         EWorkingMode       getWorkingMode               (                                              ) const;
         /// @throws css::uno::RuntimeException
         /// @throws css::lang::DisposedException
-        void               registerTransaction          ( EExceptionMode eMode ) throw( css::uno::RuntimeException, css::lang::DisposedException );
+        void               registerTransaction          ( EExceptionMode eMode );
         /// @throws css::uno::RuntimeException
         /// @throws css::lang::DisposedException
-        void               unregisterTransaction        (                                              ) throw( css::uno::RuntimeException, css::lang::DisposedException );
+        void               unregisterTransaction        (                                              );
 
     private:
 
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index 3bf7ce48c81b..b53a3de27796 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -37,19 +37,13 @@ namespace framework
             void addElement( const OUString& rName, const css::uno::Reference< css::graphic::XGraphic >& rElement );
 
             // XNameAccess
-            virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                throw(css::container::NoSuchElementException, css::lang::WrappedTargetException,
-                    css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+            virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
             // XElementAccess
-            virtual sal_Bool SAL_CALL hasElements()
-                throw(css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Type SAL_CALL getElementType(  )
-                throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL hasElements() override;
+            virtual css::uno::Type SAL_CALL getElementType(  ) override;
 
         private:
             typedef std::unordered_map<OUString, css::uno::Reference< css::graphic::XGraphic >, OUStringHash> NameGraphicHashMap;
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index b44194285639..07cb6166c385 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -54,59 +54,53 @@ namespace framework
             ImageManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
             virtual ~ImageManager() override;
 
-            virtual OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual OUString SAL_CALL getImplementationName() override
             {
                 return OUString("com.sun.star.comp.framework.ImageManager");
             }
 
-            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
             {
                 return cppu::supportsService(this, ServiceName);
             }
 
-            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
             {
                 css::uno::Sequence< OUString > aSeq { "com.sun.star.ui.ImageManager" };
                 return aSeq;
             }
 
             // XComponent
-            virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL dispose() override;
+            virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+            virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
             // XInitialization
-            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
             // XImageManager
-            virtual void SAL_CALL reset()
-                throw (css::lang::IllegalAccessException,
-                       css::uno::RuntimeException,
-                       std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL reset() override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) override;
+            virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) override;
+            virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) override;
+            virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) override;
+            virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) override;
+            virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) override;
 
             // XUIConfiguration
-            virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
+            virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
 
             // XUIConfigurationPersistence
-            virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL reload() override;
+            virtual void SAL_CALL store() override;
+            virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+            virtual sal_Bool SAL_CALL isModified() override;
+            virtual sal_Bool SAL_CALL isReadOnly() override;
 
             // Non-UNO methods
             /// @throws css::uno::RuntimeException
-            void setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException);
+            void setStorage( const css::uno::Reference< css::embed::XStorage >& Storage );
 
         private:
             ::std::unique_ptr<ImageManagerImpl> m_pImpl;
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index a5ddc372bb83..d2b5522c0ade 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -59,35 +59,32 @@ namespace framework
             virtual ~ModuleImageManager() override;
 
             // XComponent
-            virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL dispose() override;
+            virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+            virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
             // XInitialization
-            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
             // XImageManager
-            virtual void SAL_CALL reset()
-                throw (css::lang::IllegalAccessException,
-                       css::uno::RuntimeException,
-                       std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL reset() override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) override;
+            virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) override;
+            virtual css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) override;
+            virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) override;
+            virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) override;
+            virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) override;
 
             // XUIConfiguration
-            virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
+            virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
 
             // XUIConfigurationPersistence
-            virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL reload() override;
+            virtual void SAL_CALL store() override;
+            virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+            virtual sal_Bool SAL_CALL isModified() override;
+            virtual sal_Bool SAL_CALL isReadOnly() override;
 
         private:
             ::std::unique_ptr<ImageManagerImpl>                                               m_pImpl;
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index e86ae0fcb4ad..498bbbe3f0d8 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -50,7 +50,7 @@ class AddonsToolBarManager : public ToolBarManager
         virtual ~AddonsToolBarManager() override;
 
         // XComponent
-        void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        void SAL_CALL dispose() override;
 
         virtual void RefreshImages() override;
         using ToolBarManager::FillToolbar;
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx
index 7e8cc87bcb1a..a30e8e7db858 100644
--- a/framework/inc/uielement/addonstoolbarwrapper.hxx
+++ b/framework/inc/uielement/addonstoolbarwrapper.hxx
@@ -37,13 +37,13 @@ class AddonsToolBarWrapper : public UIElementWrapperBase
         virtual ~AddonsToolBarWrapper() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUIElement
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() override;
 
         // cf. ToolbarLayoutManager
         void populateImages();
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 570ffe483410..822841fce60a 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -56,33 +56,33 @@ class ButtonToolbarController : public css::frame::XStatusListener,
         virtual ~ButtonToolbarController() override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL update() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
+        virtual void SAL_CALL click() override;
+        virtual void SAL_CALL doubleClick() override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
 
     private:
         bool                                                   m_bInitialized : 1,
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 5b333fd3b70f..6b7b1a49595f 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -46,7 +46,7 @@ class ComboboxToolbarController : public ComplexToolbarController
         virtual ~ComboboxToolbarController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         // called from ComboBoxControl
         void Select();
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index e9d90d7d0d04..fad83e62a233 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -48,13 +48,13 @@ class ComplexToolbarController : public svt::ToolboxController
         virtual ~ComplexToolbarController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
         DECL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, void*, void );
         DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, void*, void);
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index f9740ae9279b..d1b983aee9cd 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -61,37 +61,33 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper<
         // XUnoTunnel
         static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
         static ConstItemContainer*                                  GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw();
-        sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
         // XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
 
-        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Type SAL_CALL getElementType() override
         {
             return cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get();
         }
 
-        virtual sal_Bool SAL_CALL hasElements()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) 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;
+        virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) override;
 
     private:
         ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index d45b0d943acd..423fb8bcc37f 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -48,7 +48,7 @@ class DropdownToolbarController : public ComplexToolbarController
         virtual ~DropdownToolbarController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         // called from ListBoxControl
         void Select();
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 3a4ee3897455..2397b6e73fcd 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -47,7 +47,7 @@ class EditToolbarController : public ComplexToolbarController
         virtual ~EditToolbarController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         // called from EditControl
         void Modify();
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index 6f2a2cba1fc8..b12ed5bd2e6b 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -51,20 +51,20 @@ namespace framework
             DECLARE_XSERVICEINFO_NOFACTORY
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
-            virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL updatePopupMenu() override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
             // XMenuListener
-            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) 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;
 
         private:
             virtual void impl_setPopupMenu() override;
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 942b5e63d68e..259fb7ddfedf 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -54,17 +54,17 @@ namespace framework
             DECLARE_XSERVICEINFO_NOFACTORY
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
-            virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL updatePopupMenu() override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) 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;
 
         private:
             virtual void impl_setPopupMenu() override;
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index eac91df289fd..cd952bb056c6 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -31,15 +31,15 @@ namespace framework
             virtual ~FooterMenuController() override;
 
             // XServiceInfo
-            virtual OUString                                        SAL_CALL getImplementationName              (                                                                               ) throw( css::uno::RuntimeException, std::exception ) override;
-            virtual sal_Bool                                               SAL_CALL supportsService                    ( const OUString&                                        sServiceName    ) throw( css::uno::RuntimeException, std::exception ) override;
-            virtual css::uno::Sequence< OUString >                  SAL_CALL getSupportedServiceNames           (                                                                               ) throw( css::uno::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;
             /* Helper for XServiceInfo */
             static css::uno::Sequence< OUString >                   SAL_CALL impl_getStaticSupportedServiceNames(                                                                               );
             static OUString                                         SAL_CALL impl_getStaticImplementationName   (                                                                               );
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
     };
 }
diff --git a/framework/inc/uielement/genericstatusbarcontroller.hxx b/framework/inc/uielement/genericstatusbarcontroller.hxx
index 3d2c11580cac..87c71a24a624 100644
--- a/framework/inc/uielement/genericstatusbarcontroller.hxx
+++ b/framework/inc/uielement/genericstatusbarcontroller.hxx
@@ -38,13 +38,13 @@ class GenericStatusbarController : public svt::StatusbarController
         virtual ~GenericStatusbarController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
         virtual void SAL_CALL paint( const css::uno::Reference< css::awt::XGraphics >& xGraphics,
                                      const css::awt::Rectangle& rOutputRectangle,
-                                     ::sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override;
+                                     ::sal_Int32 nStyle ) override;
 
     protected:
         bool                                              m_bEnabled;
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 96a8f9eadac6..88aa79832c11 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -42,13 +42,13 @@ class GenericToolbarController : public svt::ToolboxController
         virtual ~GenericToolbarController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
         DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, void*, void );
 
@@ -84,8 +84,8 @@ class MenuToolbarController : public GenericToolbarController
 
     virtual ~MenuToolbarController() override;
     // XToolbarController
-    virtual void SAL_CALL click() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL click() override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
 
 };
 
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index b532ce3d3c57..4039809326f0 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -53,17 +53,17 @@ namespace framework
             DECLARE_XSERVICEINFO_NOFACTORY
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
-            virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL updatePopupMenu() override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) 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;
 
         private:
             void fillPopupMenu( const css::uno::Reference< css::frame::XModel >& rModel, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index 511f51903672..74e04cae7ed5 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -44,7 +44,7 @@ class ImageButtonToolbarController : public ComplexToolbarController
         virtual ~ImageButtonToolbarController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
     protected:
         virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 3a673d0a088f..2d16b4f3f362 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -54,32 +54,25 @@ class FWI_DLLPUBLIC ItemContainer :   public ::cppu::WeakImplHelper< css::contai
         static ItemContainer*                                       GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw();
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
-            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
-        virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
-            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
         // XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
 
-        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Type SAL_CALL getElementType() override
         {
             return cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get();
         }
 
-        virtual sal_Bool SAL_CALL hasElements()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
     private:
         void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector, const ShareableMutex& rMutex );
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 09a144d938a7..e2f05aaefd23 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -54,20 +54,20 @@ namespace framework
             DECLARE_XSERVICEINFO_NOFACTORY
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
-            virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL updatePopupMenu() override;
 
             // XInitialization
-            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) 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;
 
         private:
             virtual void impl_setPopupMenu() override;
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index aa73ef550f8c..4fd1ab8c7403 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -54,14 +54,14 @@ namespace framework
             DECLARE_XSERVICEINFO_NOFACTORY
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) 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;
 
         private:
             void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index e8f1e65ae2c3..040bb06d625e 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -99,29 +99,29 @@ class MenuBarManager : public css::frame::XStatusListener                ,
         // XInterface
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
         // XFrameActionListener
-        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) 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;
 
         // XUIConfigurationListener
-        virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) override;
 
         // XSystemDependentMenuPeer
-        virtual css::uno::Any SAL_CALL getMenuHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getMenuHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) override;
 
         DECL_LINK( Select, Menu *, bool );
 
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 6b5c3eea89e8..877b28c668ef 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -49,25 +49,25 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
         MenuBarManager* GetMenuBarManager() const { return static_cast< MenuBarManager* >( m_xMenuBarManager.get() ); }
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUIElement
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() override;
 
         // XUIElementSettings
-        virtual void SAL_CALL updateSettings(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateSettings(  ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType() override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     private:
         virtual void impl_fillNewData() override;
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index fd8315fea038..81b679fd58e0 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -58,21 +58,21 @@ namespace framework
             DECLARE_XSERVICEINFO_NOFACTORY
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XInitialization
-            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
             // XMenuListener
-            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) override;
+            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) 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;
 
         private:
             virtual void impl_setPopupMenu() override;
diff --git a/framework/inc/uielement/notebookbarmenucontroller.hxx b/framework/inc/uielement/notebookbarmenucontroller.hxx
index 24a855b7c065..5de553cdf3cc 100644
--- a/framework/inc/uielement/notebookbarmenucontroller.hxx
+++ b/framework/inc/uielement/notebookbarmenucontroller.hxx
@@ -53,21 +53,21 @@ namespace framework
             DECLARE_XSERVICEINFO_NOFACTORY
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
             // XMenuListener
-            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) override;
+            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) 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;
 
             struct ExecuteInfo
             {
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index 02f24cb6bdab..62f53221a646 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -47,28 +47,28 @@ class ProgressBarWrapper : public UIElementWrapperBase
 
         // wrapped methods of css::task::XStatusIndicator
         /// @throws css::uno::RuntimeException
-        void start( const OUString& Text, ::sal_Int32 Range ) throw (css::uno::RuntimeException, std::exception);
+        void start( const OUString& Text, ::sal_Int32 Range );
         /// @throws css::uno::RuntimeException
-        void end() throw (css::uno::RuntimeException, std::exception);
+        void end();
         /// @throws css::uno::RuntimeException
-        void setText( const OUString& Text ) throw (css::uno::RuntimeException, std::exception);
+        void setText( const OUString& Text );
         /// @throws css::uno::RuntimeException
-        void setValue( ::sal_Int32 Value ) throw (css::uno::RuntimeException, std::exception);
+        void setValue( ::sal_Int32 Value );
         /// @throws css::uno::RuntimeException
-        void reset() throw (css::uno::RuntimeException, std::exception);
+        void reset();
 
         // UNO interfaces
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL update() override;
 
         // XUIElement
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() override;
 
     //  variables
     //  (should be private everyway!)
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index f58af322cb55..b6d120154009 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -65,61 +65,54 @@ class RootItemContainer :   private cppu::BaseMutex,
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () override
             { OWeakObject::release(); }
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // XUnoTunnel
         static FWI_DLLPUBLIC const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
         static FWI_DLLPUBLIC RootItemContainer*                                   GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw();
-        sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
-            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
-        virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
-            throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
         // XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
 
-        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-            throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Type SAL_CALL getElementType() override
         {
             return cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get();
         }
 
-        virtual sal_Bool SAL_CALL hasElements()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
         // XSingleComponentFactory
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
 
     protected:
         //  OPropertySetHelper
         virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        ( css::uno::Any&        aConvertedValue ,
                                                                                                                css::uno::Any&        aOldValue       ,
                                                                                                                sal_Int32                        nHandle         ,
-                                                                                                               const css::uno::Any&  aValue          ) throw( css::lang::IllegalArgumentException ) override;
+                                                                                                               const css::uno::Any&  aValue          ) override;
         virtual void                                                SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                        nHandle         ,
-                                                                                                               const css::uno::Any&  aValue          ) throw( css::uno::Exception, std::exception                 ) override;
+                                                                                                               const css::uno::Any&  aValue          ) override;
         using cppu::OPropertySetHelper::getFastPropertyValue;
         virtual void                                                SAL_CALL getFastPropertyValue( css::uno::Any&    aValue          ,
                                                                                                    sal_Int32                    nHandle         ) const override;
         virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper() override;
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
         static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index 5f66ccaa1f85..9fb8dee3b3b6 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -48,7 +48,7 @@ class SpinfieldToolbarController : public ComplexToolbarController
         virtual ~SpinfieldToolbarController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         // called from SpinfieldControl
         void Up();
diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx
index 6666fe600aa7..8f5ba552bd93 100644
--- a/framework/inc/uielement/statusbaritem.hxx
+++ b/framework/inc/uielement/statusbaritem.hxx
@@ -47,25 +47,25 @@ public:
     void SAL_CALL disposing() override;
 
     // css::ui::XStatusbarItem Attributes
-    virtual ::rtl::OUString SAL_CALL getCommand() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_uInt16 SAL_CALL getItemId() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_uInt32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_uInt16 SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getOffset() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getItemRect() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::rtl::OUString SAL_CALL getHelpText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpText( const rtl::OUString& rHelpText ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::rtl::OUString SAL_CALL getQuickHelpText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setQuickHelpText( const rtl::OUString& rQuickHelpText ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::rtl::OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAccessibleName( const rtl::OUString& rAccessibleName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::rtl::OUString SAL_CALL getCommand() override;
+    virtual ::sal_uInt16 SAL_CALL getItemId() override;
+    virtual ::sal_uInt32 SAL_CALL getWidth() override;
+    virtual ::sal_uInt16 SAL_CALL getStyle() override;
+    virtual ::sal_Int32 SAL_CALL getOffset() override;
+    virtual css::awt::Rectangle SAL_CALL getItemRect() override;
+    virtual ::rtl::OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const rtl::OUString& rText ) override;
+    virtual ::rtl::OUString SAL_CALL getHelpText() override;
+    virtual void SAL_CALL setHelpText( const rtl::OUString& rHelpText ) override;
+    virtual ::rtl::OUString SAL_CALL getQuickHelpText() override;
+    virtual void SAL_CALL setQuickHelpText( const rtl::OUString& rQuickHelpText ) override;
+    virtual ::rtl::OUString SAL_CALL getAccessibleName() override;
+    virtual void SAL_CALL setAccessibleName( const rtl::OUString& rAccessibleName ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) override;
 
     // css::ui::XStatusbarItem Methods
-    virtual void SAL_CALL repaint(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL repaint(  ) override;
 
 private:
     VclPtr<StatusBar>       m_pStatusBar;
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index f1633e8b4e3a..5170d6e70d61 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -60,20 +60,20 @@ class StatusBarManager final: public ::cppu::WeakImplHelper<
         StatusBar* GetStatusBar() const;
 
         // XFrameActionListener
-        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) 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;
 
         // XUIConfigurationListener
-        virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) override;
 
         // XComponent
-        void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
-        void SAL_CALL addEventListener( const css::uno::Reference< XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
-        void SAL_CALL removeEventListener( const css::uno::Reference< XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+        void SAL_CALL dispose() override;
+        void SAL_CALL addEventListener( const css::uno::Reference< XEventListener >& xListener ) override;
+        void SAL_CALL removeEventListener( const css::uno::Reference< XEventListener >& xListener ) override;
 
         void FillStatusBar( const css::uno::Reference< css::container::XIndexAccess >& rStatusBarData );
 
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index c8140a0708a0..e47a8d1034f4 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -38,16 +38,16 @@ class StatusBarWrapper : public UIConfigElementWrapperBase
         virtual ~StatusBarWrapper() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUIElement
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() override;
 
         // XUIElementSettings
-        virtual void SAL_CALL updateSettings() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateSettings() override;
 
     private:
         css::uno::Reference< css::lang::XComponent >             m_xStatusBarManager;
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index fc3566cc3079..4dd0b069a98a 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -44,11 +44,11 @@ class StatusIndicatorInterfaceWrapper :   public ::cppu::WeakImplHelper< css::ta
         //  XStatusIndicator
 
         virtual void SAL_CALL start   ( const OUString& sText  ,
-                                              sal_Int32        nRange ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL end     (                               ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL reset   (                               ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL setText ( const OUString& sText  ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL setValue(       sal_Int32        nValue ) throw( css::uno::RuntimeException, std::exception ) override;
+                                              sal_Int32        nRange ) override;
+        virtual void SAL_CALL end     (                               ) override;
+        virtual void SAL_CALL reset   (                               ) override;
+        virtual void SAL_CALL setText ( const OUString& sText  ) override;
+        virtual void SAL_CALL setValue(       sal_Int32        nValue ) override;
 
     private:
         css::uno::WeakReference< css::lang::XComponent > m_xStatusIndicatorImpl;
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index efddcf8d93bf..e057b0cca3eb 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -53,10 +53,10 @@ class ToggleButtonToolbarController : public ComplexToolbarController
         virtual ~ToggleButtonToolbarController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         // XToolbarController
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
 
     protected:
         virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 48722dec5acb..1ecbdfa293d2 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -77,20 +77,20 @@ class ToolBarManager : public ToolbarManager_Base
         ToolBox* GetToolBar() const;
 
         // XFrameActionListener
-        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) 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;
 
         // XUIConfigurationListener
-        virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) override;
 
         // XComponent
-        void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
-        void SAL_CALL addEventListener( const css::uno::Reference< XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
-        void SAL_CALL removeEventListener( const css::uno::Reference< XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+        void SAL_CALL dispose() override;
+        void SAL_CALL addEventListener( const css::uno::Reference< XEventListener >& xListener ) override;
+        void SAL_CALL removeEventListener( const css::uno::Reference< XEventListener >& xListener ) override;
 
         void CheckAndUpdateImages();
         virtual void RefreshImages();
diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx
index 60fa176a7c28..e4a526ed8460 100644
--- a/framework/inc/uielement/toolbarmodemenucontroller.hxx
+++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx
@@ -53,21 +53,21 @@ namespace framework
             DECLARE_XSERVICEINFO_NOFACTORY
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
             // XMenuListener
-            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) override;
+            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) 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;
 
             struct ExecuteInfo
             {
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index f88e98cc2ead..4f7b8085beea 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -58,24 +58,24 @@ namespace framework
             DECLARE_XSERVICEINFO_NOFACTORY
             /* Helper for registry */
             /// @throws css::uno::Exception
-            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;
 
             // XInitialization
-            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
             // XMenuListener
-            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) override;
+            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) 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;
 
             struct ExecuteInfo
             {
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index c5f5f2c6caf4..9bf9a8c62018 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -42,34 +42,34 @@ class ToolBarWrapper : public css::ui::XUIFunctionListener,
         // XInterface
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUIElement
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRealInterface() override;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL update() override;
 
         // XUIElementSettings
-        virtual void SAL_CALL updateSettings() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL updateSettings() override;
 
         // XUIFunctionListener
-        virtual void SAL_CALL functionExecute( const OUString& aUIElementName, const OUString& aCommand ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL functionExecute( const OUString& aUIElementName, const OUString& aCommand ) override;
 
         // XEventListener
         using cppu::OPropertySetHelper::disposing;
-        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
     //  protected methods
 
     protected:
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any&  aValue ) throw( css::uno::Exception, std::exception ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any&  aValue ) override;
         virtual void impl_fillNewData() override;
 
     private:
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index df7bf36388ad..c8e5ad01dc32 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -44,20 +44,17 @@ class UICommandDescription : private cppu::BaseMutex,
         UICommandDescription( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
         virtual ~UICommandDescription() override;
 
-        virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getImplementationName() override
         {
             return OUString("com.sun.star.comp.framework.UICommandDescription");
         }
 
-        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
         {
             return cppu::supportsService(this, ServiceName);
         }
 
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
         {
             css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.UICommandDescription" };
             return aSeq;
@@ -65,20 +62,15 @@ class UICommandDescription : private cppu::BaseMutex,
 
 private:
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-            throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType() override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
 public:
         typedef std::unordered_map< OUString,
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index 05ae5e8ecca0..dcdc60e58d09 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -49,12 +49,12 @@ namespace framework {
         css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >   getFactoriesDescription() const;
 
         // container.XContainerListener
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
     // lang.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;
 
     private:
         class FactoryManagerMap : public std::unordered_map<OUString,
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index f0d308d3d966..5128178b9613 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -58,12 +58,12 @@ public:
     void          removeServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule );
 
     // container.XContainerListener
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
     // lang.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;
 
 private:
     struct ControllerInfo
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index ca7d0ed44fc6..c5a7003a2787 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -42,27 +42,24 @@ typedef ::cppu::WeakImplHelper<
             MenuBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
             virtual ~MenuBarFactory() override;
 
-            virtual OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual OUString SAL_CALL getImplementationName() override
             {
                 return OUString("com.sun.star.comp.framework.MenuBarFactory");
             }
 
-            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
             {
                 return cppu::supportsService(this, ServiceName);
             }
 
-            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
             {
                 css::uno::Sequence< OUString > aSeq { "com.sun.star.ui.UIElementFactory" };
                 return aSeq;
             }
 
             // XUIElementFactory
-            virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+            virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) override;
 
             static void CreateUIElement(const OUString& ResourceURL
                         ,const css::uno::Sequence< css::beans::PropertyValue >& Args
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index cccdb1740286..ae0fb9019451 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -101,39 +101,23 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper< css::xml::
         virtual ~AcceleratorConfigurationReader() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-            throw(css::xml::sax::SAXException,
-                  css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
 
-        virtual void SAL_CALL endDocument()
-            throw(css::xml::sax::SAXException,
-                  css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endDocument() override;
 
         virtual void SAL_CALL startElement(const OUString&                                      sElement      ,
-                                           const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList)
-            throw(css::xml::sax::SAXException,
-                  css::uno::RuntimeException, std::exception ) override;
+                                           const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList) override;
 
-        virtual void SAL_CALL endElement(const OUString& sElement)
-            throw(css::xml::sax::SAXException,
-                  css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endElement(const OUString& sElement) override;
 
-        virtual void SAL_CALL characters(const OUString& sChars)
-            throw(css::xml::sax::SAXException,
-                  css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL characters(const OUString& sChars) override;
 
-        virtual void SAL_CALL ignorableWhitespace(const OUString& sWhitespaces)
-            throw(css::xml::sax::SAXException,
-                  css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL ignorableWhitespace(const OUString& sWhitespaces) override;
 
         virtual void SAL_CALL processingInstruction(const OUString& sTarget,
-                                                    const OUString& sData  )
-            throw(css::xml::sax::SAXException,
-                  css::uno::RuntimeException, std::exception ) override;
+                                                    const OUString& sData  ) override;
 
-        virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator >& xLocator)
-            throw(css::xml::sax::SAXException,
-                  css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator >& xLocator) override;
 
     // helper
 
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 76623815fbaa..d416f2f40e32 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -68,43 +68,25 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax:
         virtual ~OReadImagesDocumentHandler() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
 
-        virtual void SAL_CALL endDocument()
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endDocument() override;
 
         virtual void SAL_CALL startElement(
             const OUString& aName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs)
-        throw (css::xml::sax::SAXException,
-               css::uno::RuntimeException,
-               std::exception) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) override;
 
-        virtual void SAL_CALL endElement(const OUString& aName)
-        throw (css::xml::sax::SAXException,
-               css::uno::RuntimeException,
-               std::exception) override;
+        virtual void SAL_CALL endElement(const OUString& aName) override;
 
-        virtual void SAL_CALL characters(const OUString& aChars)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL characters(const OUString& aChars) override;
 
-        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
 
         virtual void SAL_CALL processingInstruction(const OUString& aTarget,
-                                                    const OUString& aData)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+                                                    const OUString& aData) override;
 
         virtual void SAL_CALL setDocumentLocator(
-            const css::uno::Reference< css::xml::sax::XLocator > &xLocator)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XLocator > &xLocator) override;
 
     private:
         OUString getErrorLineString();
@@ -141,34 +123,24 @@ class OWriteImagesDocumentHandler final
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteImagesDocument() throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteImagesDocument();
 
     private:
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteImageList( const ImageListItemDescriptor* ) throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteImageList( const ImageListItemDescriptor* );
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteExternalImageList( const ExternalImageItemListDescriptor* ) throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteExternalImageList( const ExternalImageItemListDescriptor* );
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteImage( const ImageItemDescriptor* ) throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteImage( const ImageItemDescriptor* );
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteExternalImage( const ExternalImageItemDescriptor* ) throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteExternalImage( const ExternalImageItemDescriptor* );
 
         const ImageListsDescriptor&                               m_aImageListsItems;
         css::uno::Reference< css::xml::sax::XDocumentHandler >    m_xWriteDocumentHandler;
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index d80b4b4d9dac..8469280cc481 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -42,41 +42,25 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
         virtual ~ReadMenuDocumentHandlerBase() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override = 0;
+        virtual void SAL_CALL startDocument() override = 0;
 
-        virtual void SAL_CALL endDocument()
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override = 0;
+        virtual void SAL_CALL endDocument() override = 0;
 
         virtual void SAL_CALL startElement(
             const OUString& aName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override = 0;
+            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) override = 0;
 
-        virtual void SAL_CALL endElement(const OUString& aName)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override = 0;
+        virtual void SAL_CALL endElement(const OUString& aName) override = 0;
 
-        virtual void SAL_CALL characters(const OUString& aChars)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override = 0;
+        virtual void SAL_CALL characters(const OUString& aChars) override = 0;
 
-        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
 
         virtual void SAL_CALL processingInstruction(const OUString& aTarget,
-                                                    const OUString& aData)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+                                                    const OUString& aData) override;
 
         virtual void SAL_CALL setDocumentLocator(
-            const css::uno::Reference< css::xml::sax::XLocator > &xLocator)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XLocator > &xLocator) override;
 
     protected:
         OUString getErrorLineString();
@@ -103,27 +87,17 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas
         virtual ~OReadMenuDocumentHandler() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
 
-        virtual void SAL_CALL endDocument()
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endDocument() override;
 
         virtual void SAL_CALL startElement(
             const OUString& aName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) override;
 
-        virtual void SAL_CALL endElement(const OUString& aName)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endElement(const OUString& aName) override;
 
-        virtual void SAL_CALL characters(const OUString& aChars)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL characters(const OUString& aChars) override;
 
     private:
           int       m_nElementDepth;
@@ -142,27 +116,17 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
         virtual ~OReadMenuBarHandler() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
 
-        virtual void SAL_CALL endDocument()
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endDocument() override;
 
         virtual void SAL_CALL startElement(
             const OUString& aName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) override;
 
-        virtual void SAL_CALL endElement(const OUString& aName)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endElement(const OUString& aName) override;
 
-        virtual void SAL_CALL characters(const OUString& aChars)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL characters(const OUString& aChars) override;
 
     private:
         int         m_nElementDepth;
@@ -179,27 +143,17 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
         virtual ~OReadMenuHandler() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
 
-        virtual void SAL_CALL endDocument()
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endDocument() override;
 
         virtual void SAL_CALL startElement(
             const OUString& aName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) override;
 
-        virtual void SAL_CALL endElement(const OUString& aName)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endElement(const OUString& aName) override;
 
-        virtual void SAL_CALL characters(const OUString& aChars)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL characters(const OUString& aChars) override;
 
     private:
         int                 m_nElementDepth;
@@ -216,28 +170,18 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
         virtual ~OReadMenuPopupHandler() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-            throw ( css::xml::sax::SAXException,
-                    css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
 
-        virtual void SAL_CALL endDocument()
-            throw ( css::xml::sax::SAXException,
-                    css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endDocument() override;
 
         virtual void SAL_CALL startElement(
             const OUString& aName,
             const css::uno::Reference<
-                css::xml::sax::XAttributeList > &xAttribs)
-            throw ( css::xml::sax::SAXException,
-                    css::uno::RuntimeException, std::exception ) override;
+                css::xml::sax::XAttributeList > &xAttribs) override;
 
-        virtual void SAL_CALL endElement(const OUString& aName)
-            throw ( css::xml::sax::SAXException,
-                    css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endElement(const OUString& aName) override;
 
-        virtual void SAL_CALL characters(const OUString& aChars)
-            throw ( css::xml::sax::SAXException,
-                    css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL characters(const OUString& aChars) override;
 
     private:
         enum NextElementClose { ELEM_CLOSE_NONE, ELEM_CLOSE_MENUITEM, ELEM_CLOSE_MENUSEPARATOR };
@@ -261,13 +205,11 @@ class FWE_DLLPUBLIC OWriteMenuDocumentHandler final
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteMenuDocument() throw
-            ( css::xml::sax::SAXException, css::uno::RuntimeException );
+        void WriteMenuDocument();
     private:
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteMenu( const css::uno::Reference< css::container::XIndexAccess >& rSubMenuContainer ) throw
-            ( css::xml::sax::SAXException, css::uno::RuntimeException );
+        void WriteMenu( const css::uno::Reference< css::container::XIndexAccess >& rSubMenuContainer );
 
         void WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle );
         void WriteMenuSeparator();
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index d137cf04db3c..3bea6c2380f8 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -40,41 +40,25 @@ class FWE_DLLPUBLIC SaxNamespaceFilter :
         virtual ~SaxNamespaceFilter() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
 
-        virtual void SAL_CALL endDocument()
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endDocument() override;
 
         virtual void SAL_CALL startElement(
             const OUString& aName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) override;
 
-        virtual void SAL_CALL endElement(const OUString& aName)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endElement(const OUString& aName) override;
 
-        virtual void SAL_CALL characters(const OUString& aChars)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL characters(const OUString& aChars) override;
 
-        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
 
         virtual void SAL_CALL processingInstruction(const OUString& aTarget,
-                                                    const OUString& aData)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+                                                    const OUString& aData) override;
 
         virtual void SAL_CALL setDocumentLocator(
-            const css::uno::Reference< css::xml::sax::XLocator > &xLocator)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XLocator > &xLocator) override;
 
     protected:
         typedef ::std::stack< XMLNamespaces > NamespaceStack;
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index d5085f2cc105..9fad56eda216 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -65,41 +65,25 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
         virtual ~OReadStatusBarDocumentHandler() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
 
-        virtual void SAL_CALL endDocument()
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endDocument() override;
 
         virtual void SAL_CALL startElement(
             const OUString& aName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) override;
 
-        virtual void SAL_CALL endElement(const OUString& aName)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endElement(const OUString& aName) override;
 
-        virtual void SAL_CALL characters(const OUString& aChars)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL characters(const OUString& aChars) override;
 
-        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
 
         virtual void SAL_CALL processingInstruction(const OUString& aTarget,
-                                                    const OUString& aData)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+                                                    const OUString& aData) override;
 
         virtual void SAL_CALL setDocumentLocator(
-            const css::uno::Reference< css::xml::sax::XLocator > &xLocator)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XLocator > &xLocator) override;
 
     private:
         OUString getErrorLineString();
@@ -127,9 +111,7 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler final
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteStatusBarDocument() throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteStatusBarDocument();
 
     private:
         /// @throws css::xml::sax::SAXException
@@ -139,9 +121,7 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler final
             const OUString& rHelpURL,
             sal_Int16            nOffset,
             sal_Int16            nStyle,
-            sal_Int16            nWidth ) throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+            sal_Int16            nWidth );
 
         css::uno::Reference< css::container::XIndexAccess >       m_aStatusBarItems;
         css::uno::Reference< css::xml::sax::XDocumentHandler >    m_xWriteDocumentHandler;
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 3e402b86072e..5e7488b3e5c2 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -65,41 +65,25 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
         virtual ~OReadToolBoxDocumentHandler() override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-        throw ( css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
 
-        virtual void SAL_CALL endDocument()
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endDocument() override;
 
         virtual void SAL_CALL startElement(
             const OUString& aName,
-            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs) override;
 
-        virtual void SAL_CALL endElement(const OUString& aName)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL endElement(const OUString& aName) override;
 
-        virtual void SAL_CALL characters(const OUString& aChars)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL characters(const OUString& aChars) override;
 
-        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
 
         virtual void SAL_CALL processingInstruction(const OUString& aTarget,
-                                                    const OUString& aData)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+                                                    const OUString& aData) override;
 
         virtual void SAL_CALL setDocumentLocator(
-            const css::uno::Reference< css::xml::sax::XLocator > &xLocator)
-        throw(  css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::xml::sax::XLocator > &xLocator) override;
 
     private:
         OUString getErrorLineString();
@@ -146,35 +130,25 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler final
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteToolBoxDocument() throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteToolBoxDocument();
 
     private:
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
         void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL,
-                               sal_Int16 nStyle, bool bVisible ) throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+                               sal_Int16 nStyle, bool bVisible );
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteToolBoxSpace() throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteToolBoxSpace();
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteToolBoxBreak() throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteToolBoxBreak();
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void WriteToolBoxSeparator() throw
-            ( css::xml::sax::SAXException,
-              css::uno::RuntimeException );
+        void WriteToolBoxSeparator();
 
         css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler;
         css::uno::Reference< css::xml::sax::XAttributeList >   m_xEmptyList;
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index bc075417fea1..101c3f4e1d34 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -36,22 +36,18 @@ class FWE_DLLPUBLIC XMLNamespaces final
         ~XMLNamespaces();
 
         /// @throws css::xml::sax::SAXException
-        void addNamespace( const OUString& aName, const OUString& aValue )
-            throw(  css::xml::sax::SAXException );
+        void addNamespace( const OUString& aName, const OUString& aValue );
 
         /// @throws css::xml::sax::SAXException
-        OUString applyNSToAttributeName( const OUString& ) const
-            throw(  css::xml::sax::SAXException, std::exception );
+        OUString applyNSToAttributeName( const OUString& ) const;
         /// @throws css::xml::sax::SAXException
-        OUString applyNSToElementName( const OUString& ) const
-            throw(  css::xml::sax::SAXException, std::exception );
+        OUString applyNSToElementName( const OUString& ) const;
 
     private:
         typedef ::std::map< OUString, OUString > NamespaceMap;
 
         /// @throws css::xml::sax::SAXException
-        OUString getNamespaceValue( const OUString& aNamespace ) const
-            throw( css::xml::sax::SAXException );
+        OUString getNamespaceValue( const OUString& aNamespace ) const;
 
         OUString        m_aDefaultNamespace;
         OUString        m_aXMLAttributeNamespace;
diff --git a/framework/qa/cppunit/dispatchtest.cxx b/framework/qa/cppunit/dispatchtest.cxx
index b6b98093b406..3dd995510d50 100644
--- a/framework/qa/cppunit/dispatchtest.cxx
+++ b/framework/qa/cppunit/dispatchtest.cxx
@@ -45,17 +45,17 @@ public:
     int getUnexpected();
 
     // frame::XInterceptorInfo
-    virtual uno::Sequence<OUString> SAL_CALL getInterceptedURLs() throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Sequence<OUString> SAL_CALL getInterceptedURLs() override;
 
     // frame::XDispatchProviderInterceptor
-    virtual void SAL_CALL setMasterDispatchProvider(const uno::Reference<frame::XDispatchProvider>& xNewSupplier) throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Reference<frame::XDispatchProvider> SAL_CALL getMasterDispatchProvider() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSlaveDispatchProvider(const uno::Reference<frame::XDispatchProvider>& xNewSupplier) throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Reference<frame::XDispatchProvider> SAL_CALL getSlaveDispatchProvider() throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setMasterDispatchProvider(const uno::Reference<frame::XDispatchProvider>& xNewSupplier) override;
+    virtual uno::Reference<frame::XDispatchProvider> SAL_CALL getMasterDispatchProvider() override;
+    virtual void SAL_CALL setSlaveDispatchProvider(const uno::Reference<frame::XDispatchProvider>& xNewSupplier) override;
+    virtual uno::Reference<frame::XDispatchProvider> SAL_CALL getSlaveDispatchProvider() override;
 
     // frame::XDispatchProvider
-    virtual uno::Sequence<uno::Reference<frame::XDispatch>> SAL_CALL queryDispatches(const uno::Sequence<frame::DispatchDescriptor>& xRequests) throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Reference<frame::XDispatch> SAL_CALL queryDispatch(const util::URL& rURL, const OUString& rTargetFrameName, sal_Int32 SearchFlags) throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Sequence<uno::Reference<frame::XDispatch>> SAL_CALL queryDispatches(const uno::Sequence<frame::DispatchDescriptor>& xRequests) override;
+    virtual uno::Reference<frame::XDispatch> SAL_CALL queryDispatch(const util::URL& rURL, const OUString& rTargetFrameName, sal_Int32 SearchFlags) override;
 };
 
 MyInterceptor::MyInterceptor()
@@ -80,32 +80,32 @@ int MyInterceptor::getUnexpected()
     return nRet;
 }
 
-uno::Sequence<OUString> MyInterceptor::getInterceptedURLs() throw (uno::RuntimeException, std::exception)
+uno::Sequence<OUString> MyInterceptor::getInterceptedURLs()
 {
     return m_aDisabledCommands;
 }
 
-void MyInterceptor::setMasterDispatchProvider(const uno::Reference<frame::XDispatchProvider>& xNewSupplier) throw (uno::RuntimeException, std::exception)
+void MyInterceptor::setMasterDispatchProvider(const uno::Reference<frame::XDispatchProvider>& xNewSupplier)
 {
     m_xMaster = xNewSupplier;
 }
 
-uno::Reference<frame::XDispatchProvider> MyInterceptor::getMasterDispatchProvider() throw (uno::RuntimeException, std::exception)
+uno::Reference<frame::XDispatchProvider> MyInterceptor::getMasterDispatchProvider()
 {
     return m_xMaster;
 }
 
-void MyInterceptor::setSlaveDispatchProvider(const uno::Reference<frame::XDispatchProvider>& xNewSupplier) throw (uno::RuntimeException, std::exception)
+void MyInterceptor::setSlaveDispatchProvider(const uno::Reference<frame::XDispatchProvider>& xNewSupplier)
 {
     m_xSlave = xNewSupplier;
 }
 
-uno::Reference<frame::XDispatchProvider> MyInterceptor::getSlaveDispatchProvider() throw (uno::RuntimeException, std::exception)
+uno::Reference<frame::XDispatchProvider> MyInterceptor::getSlaveDispatchProvider()
 {
     return m_xSlave;
 }
 
-uno::Sequence<uno::Reference<frame::XDispatch>> MyInterceptor::queryDispatches(const uno::Sequence<frame::DispatchDescriptor>& rRequests) throw (uno::RuntimeException, std::exception)
+uno::Sequence<uno::Reference<frame::XDispatch>> MyInterceptor::queryDispatches(const uno::Sequence<frame::DispatchDescriptor>& rRequests)
 {
     uno::Sequence<uno::Reference<frame::XDispatch>> aResult(rRequests.getLength());
 
@@ -118,7 +118,6 @@ uno::Sequence<uno::Reference<frame::XDispatch>> MyInterceptor::queryDispatches(c
 }
 
 uno::Reference<frame::XDispatch> MyInterceptor::queryDispatch(const util::URL& rURL, const OUString& /*rTargetFrameName*/, sal_Int32 /*SearchFlags*/)
-throw (uno::RuntimeException, std::exception)
 {
     if (std::find(m_aDisabledCommands.begin(), m_aDisabledCommands.end(), rURL.Complete) != m_aDisabledCommands.end())
         ++m_nExpected;
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index eae3a99704f9..a42c55ffbc26 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -87,7 +87,6 @@ XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration()
 }
 
 css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     AcceleratorCache&          rCache = impl_getCFG();
@@ -96,8 +95,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
 }
 
 OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
-    throw(css::container::NoSuchElementException,
-          css::uno::RuntimeException, std::exception            )
 {
     SolarMutexGuard g;
     AcceleratorCache& rCache = impl_getCFG();
@@ -110,8 +107,6 @@ OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const c
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
                                                     const OUString&    sCommand )
-                                                    throw(css::lang::IllegalArgumentException,
-                                                    css::uno::RuntimeException, std::exception         )
 {
     if (
         (aKeyEvent.KeyCode   == 0) &&
@@ -136,8 +131,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
-throw(css::container::NoSuchElementException,
-      css::uno::RuntimeException, std::exception            )
 {
     SolarMutexGuard g;
     AcceleratorCache& rCache = impl_getCFG(true); // true => force using of a writeable cache
@@ -149,9 +142,6 @@ throw(css::container::NoSuchElementException,
 }
 
 css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
-    throw(css::lang::IllegalArgumentException   ,
-          css::container::NoSuchElementException,
-          css::uno::RuntimeException, std::exception            )
 {
     if (sCommand.isEmpty())
         throw css::lang::IllegalArgumentException(
@@ -171,8 +161,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
 }
 
 css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
-    throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-           css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -205,9 +193,6 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
-    throw(css::lang::IllegalArgumentException   ,
-          css::container::NoSuchElementException,
-          css::uno::RuntimeException, std::exception            )
 {
     if (sCommand.isEmpty())
         throw css::lang::IllegalArgumentException(
@@ -225,8 +210,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
-    throw(css::uno::Exception       ,
-        css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::io::XStream > xStream;
     css::uno::Reference< css::io::XStream > xStreamNoLang;
@@ -268,8 +251,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::store()
-    throw(css::uno::Exception       ,
-        css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::io::XStream > xStream;
     {
@@ -296,8 +277,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::io::XStream > xStream = StorageHolder::openSubStreamWithFallback(
                                                             xStorage,
@@ -319,14 +298,12 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
 }
 
 sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return (m_pWriteCache != nullptr);
 }
 
 sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::io::XStream > xStream;
     {
@@ -342,32 +319,27 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
 }
 
 sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)");
     return false;
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::reset()
-throw(css::uno::RuntimeException, std::exception)
 {
     {
         SolarMutexGuard g;
@@ -378,13 +350,11 @@ throw(css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me");
 }
 
 void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me");
 }
@@ -534,7 +504,6 @@ XCUBasedAcceleratorConfiguration::~XCUBasedAcceleratorConfiguration()
 }
 
 css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getAllKeyEvents()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -551,8 +520,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
 }
 
 OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
-    throw(css::container::NoSuchElementException,
-          css::uno::RuntimeException, std::exception            )
 {
     SolarMutexGuard g;
 
@@ -572,9 +539,6 @@ OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const c
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
                                                     const OUString&    sCommand )
-                                                    throw (css::lang::IllegalArgumentException,
-                                                           css::container::NoSuchElementException,
-                                                           css::uno::RuntimeException, std::exception)
 {
     SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::setKeyEvent" );
 
@@ -654,8 +618,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
-    throw(css::container::NoSuchElementException,
-          css::uno::RuntimeException, std::exception            )
 {
     SolarMutexGuard g;
 
@@ -693,9 +655,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
 }
 
 css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
-    throw(css::lang::IllegalArgumentException   ,
-        css::container::NoSuchElementException,
-        css::uno::RuntimeException, std::exception            )
 {
     if (sCommand.isEmpty())
         throw css::lang::IllegalArgumentException(
@@ -742,8 +701,6 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator
 }
 
 css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
-    throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-          css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -780,9 +737,6 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
-    throw(css::lang::IllegalArgumentException   ,
-        css::container::NoSuchElementException,
-        css::uno::RuntimeException, std::exception            )
 {
     if (sCommand.isEmpty())
         throw css::lang::IllegalArgumentException(
@@ -807,8 +761,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
-    throw(css::uno::Exception       ,
-        css::uno::RuntimeException, std::exception)
 {
     SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::reload()" );
 
@@ -843,8 +795,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::store()
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::store()" );
 
@@ -867,8 +817,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store()
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-    throw(css::uno::Exception       ,
-      css::uno::RuntimeException, std::exception)
 {
     // use m_aCache + old AcceleratorXMLWriter to store data directly on storage given as parameter ...
     if (!xStorage.is())
@@ -931,44 +879,37 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
 }
 
 sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isModified()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return false;
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
 }
 
 sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)");
         return false;
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY);
     OUString sConfig = xNamed->getName();
@@ -989,19 +930,16 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me");
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me");
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::changesOccurred()" );
 
@@ -1052,24 +990,20 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::EventObject& /*aSource*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     // nop
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const css::uno::Reference< css::lang::XEventListener >& /*xListener*/ )
-    throw(css::uno::RuntimeException, std::exception)
 {
     // nop
 }
 
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& /*xListener*/ )
-    throw(css::uno::RuntimeException, std::exception)
 {
     // nop
 }
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index d9b05459fe85..0c306fbc81d0 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -72,30 +72,25 @@ public:
 
     virtual ~DocumentAcceleratorConfiguration() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.DocumentAcceleratorConfiguration");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.DocumentAcceleratorConfiguration"};
     }
 
     // XUIConfigurationStorage
-    virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
 
-    virtual sal_Bool SAL_CALL hasStorage()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasStorage() override;
 
     /** read all data into the cache. */
     void fillCache();
@@ -129,7 +124,6 @@ DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration()
 }
 
 void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // Attention! xStorage must be accepted too, if it's NULL !
 
@@ -149,7 +143,6 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer
 }
 
 sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_xDocumentRoot.is();
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 257802a9828f..5648c917653c 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -54,26 +54,23 @@ public:
      */
     explicit GlobalAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.GlobalAcceleratorConfiguration");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.GlobalAcceleratorConfiguration"};
     }
 
     // XComponent
-    virtual  void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual  void SAL_CALL dispose() override;
 
     /// This has to be called after when the instance is acquire()'d.
     void fillCache();
@@ -120,7 +117,6 @@ void GlobalAcceleratorConfiguration::fillCache()
 // XComponent.dispose(),  #i120029#, to release the cyclic reference
 
 void SAL_CALL GlobalAcceleratorConfiguration::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     try
     {
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index c2fbcb53431c..efbe78360d71 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -164,7 +164,6 @@ KeyMapping & KeyMapping::get() {
 }
 
 sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier)
-    throw(css::lang::IllegalArgumentException)
 {
     Identifier2CodeHash::const_iterator pIt = m_lIdentifierHash.find(sIdentifier);
     if (pIt != m_lIdentifierHash.end())
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 9d56890992d8..86d9c536acd9 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -68,26 +68,23 @@ public:
             const css::uno::Reference< css::uno::XComponentContext >& xContext,
             const css::uno::Sequence< css::uno::Any >& lArguments);
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.ModuleAcceleratorConfiguration");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.ModuleAcceleratorConfiguration"};
     }
 
     // XComponent
-    virtual  void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual  void SAL_CALL dispose() override;
 
     /// This has to be called after when the instance is acquire()'d.
     void SAL_CALL fillCache();
@@ -156,7 +153,6 @@ void ModuleAcceleratorConfiguration::fillCache()
 // XComponent.dispose(),  #i120029#, to release the cyclic reference
 
 void SAL_CALL ModuleAcceleratorConfiguration::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     try
     {
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 5b0a545154f5..a9ad77b8db7d 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -86,13 +86,11 @@ CloseDispatcher::~CloseDispatcher()
 
 void SAL_CALL CloseDispatcher::dispatch(const css::util::URL&                                  aURL      ,
                                         const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
-    throw(css::uno::RuntimeException, std::exception)
 {
     dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
 
 css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGroups()
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< sal_Int16 > lGroups(2);
     lGroups[0] = css::frame::CommandGroup::VIEW;
@@ -101,7 +99,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGro
 }
 
 css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (nCommandGroup == css::frame::CommandGroup::VIEW)
     {
@@ -126,20 +123,17 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::
 
 void SAL_CALL CloseDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                  const css::util::URL&                                     /*aURL*/     )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                     const css::util::URL&                                     /*aURL*/     )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
                                                         const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
-    throw(css::uno::RuntimeException, std::exception)
 {
     // SAFE -> ----------------------------------
     SolarMutexClearableGuard aWriteLock;
diff --git a/framework/source/dispatch/dispatchdisabler.cxx b/framework/source/dispatch/dispatchdisabler.cxx
index 016d3ad2cf65..725b2e7557fe 100644
--- a/framework/source/dispatch/dispatchdisabler.cxx
+++ b/framework/source/dispatch/dispatchdisabler.cxx
@@ -24,7 +24,6 @@ DispatchDisabler::DispatchDisabler(const uno::Reference< uno::XComponentContext
 
 // XInitialization
 void SAL_CALL DispatchDisabler::initialize( const uno::Sequence< uno::Any >& aArguments )
-        throw (uno::Exception, uno::RuntimeException, ::std::exception)
 {
     uno::Sequence< OUString > aDisabledURLs;
     if( aArguments.getLength() > 0 &&
@@ -40,7 +39,6 @@ uno::Reference< frame::XDispatch > SAL_CALL
 DispatchDisabler::queryDispatch( const util::URL& rURL,
                                  const OUString& rTargetFrameName,
                                  ::sal_Int32 nSearchFlags )
-    throw (uno::RuntimeException, ::std::exception)
 {
     // If present - disabled.
     if( maDisabledURLs.find(rURL.Complete) != maDisabledURLs.end() ||
@@ -52,7 +50,6 @@ DispatchDisabler::queryDispatch( const util::URL& rURL,
 
 uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL
 DispatchDisabler::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& rRequests )
-    throw (uno::RuntimeException, ::std::exception)
 {
     uno::Sequence< uno::Reference< frame::XDispatch > > aResult(rRequests.getLength());
     for( sal_Int32 i = 0; i < rRequests.getLength(); ++i )
@@ -64,25 +61,23 @@ DispatchDisabler::queryDispatches( const uno::Sequence< frame::DispatchDescripto
 
 // XDispatchProviderInterceptor
 uno::Reference< frame::XDispatchProvider > SAL_CALL
-DispatchDisabler::getSlaveDispatchProvider() throw (uno::RuntimeException, ::std::exception)
+DispatchDisabler::getSlaveDispatchProvider()
 {
     return mxSlave;
 }
 
 void SAL_CALL DispatchDisabler::setSlaveDispatchProvider( const uno::Reference< frame::XDispatchProvider >& xNewDispatchProvider )
-    throw (uno::RuntimeException, ::std::exception)
 {
     mxSlave = xNewDispatchProvider;
 }
 
 uno::Reference< frame::XDispatchProvider > SAL_CALL
-DispatchDisabler::getMasterDispatchProvider() throw (uno::RuntimeException, ::std::exception)
+DispatchDisabler::getMasterDispatchProvider()
 {
     return mxMaster;
 }
 void SAL_CALL
 DispatchDisabler::setMasterDispatchProvider( const uno::Reference< frame::XDispatchProvider >& xNewSupplier )
-        throw (uno::RuntimeException, ::std::exception)
 {
     mxMaster = xNewSupplier;
 }
@@ -90,7 +85,6 @@ DispatchDisabler::setMasterDispatchProvider( const uno::Reference< frame::XDispa
 // XInterceptorInfo
 uno::Sequence< OUString > SAL_CALL
     DispatchDisabler::getInterceptedURLs()
-    throw (uno::RuntimeException, ::std::exception)
 {
     uno::Sequence< OUString > aDisabledURLs(maDisabledURLs.size());
     sal_Int32 n = 0;
@@ -101,42 +95,34 @@ uno::Sequence< OUString > SAL_CALL
 
 // XElementAccess
 uno::Type SAL_CALL DispatchDisabler::getElementType()
-    throw (uno::RuntimeException, ::std::exception)
 {
     uno::Type aModuleType = cppu::UnoType<OUString>::get();
     return aModuleType;
 }
 
 ::sal_Bool SAL_CALL DispatchDisabler::hasElements()
-        throw (uno::RuntimeException, ::std::exception)
 {
     return maDisabledURLs.size() > 0;
 }
 
 // XNameAccess
 uno::Any SAL_CALL DispatchDisabler::getByName( const OUString& )
-        throw (container::NoSuchElementException, lang::WrappedTargetException,
-               uno::RuntimeException, ::std::exception)
 {
     return uno::Any();
 }
 
 uno::Sequence< OUString > SAL_CALL DispatchDisabler::getElementNames()
-        throw (uno::RuntimeException, ::std::exception)
 {
     return getInterceptedURLs();
 }
 
 sal_Bool SAL_CALL DispatchDisabler::hasByName( const OUString& rName )
-        throw (uno::RuntimeException, ::std::exception)
 {
     return maDisabledURLs.find(rName) != maDisabledURLs.end();
 }
 
 // XNameReplace
 void SAL_CALL DispatchDisabler::replaceByName( const OUString& rName, const uno::Any& aElement )
-        throw (lang::IllegalArgumentException, container::NoSuchElementException,
-               lang::WrappedTargetException, uno::RuntimeException, ::std::exception)
 {
     removeByName( rName );
     insertByName( rName, aElement );
@@ -144,15 +130,11 @@ void SAL_CALL DispatchDisabler::replaceByName( const OUString& rName, const uno:
 
 // XNameContainer
 void DispatchDisabler::insertByName( const OUString& rName, const uno::Any& )
-    throw (lang::IllegalArgumentException, container::ElementExistException,
-           lang::WrappedTargetException, uno::RuntimeException, ::std::exception)
 {
     maDisabledURLs.insert(rName);
 }
 
 void DispatchDisabler::removeByName( const OUString& rName )
-    throw (container::NoSuchElementException, lang::WrappedTargetException,
-           uno::RuntimeException, ::std::exception)
 {
     auto it = maDisabledURLs.find(rName);
     if( it != maDisabledURLs.end() )
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 86a86618867c..a35191893a60 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -41,7 +41,6 @@ DispatchInformationProvider::~DispatchInformationProvider()
 }
 
 css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupportedCommandGroups()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider = implts_getAllSubProvider();
     sal_Int32                                                                             c1        = lProvider.getLength();
@@ -73,7 +72,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport
 }
 
 css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformationProvider::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider = implts_getAllSubProvider();
     sal_Int32                                                                             c1        = lProvider.getLength();
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 397855fbb2c7..f368878e5d98 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -97,7 +97,7 @@ DispatchProvider::~DispatchProvider()
 */
 css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDispatch( const css::util::URL&  aURL             ,
                                                                                        const OUString& sTargetFrameName ,
-                                                                                             sal_Int32        nSearchFlags     ) throw( css::uno::RuntimeException, std::exception )
+                                                                                             sal_Int32        nSearchFlags     )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
 
@@ -128,7 +128,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDis
 
     @threadsafe yes
 */
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL DispatchProvider::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL DispatchProvider::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions )
 {
     // Create return list - which must have same size then the given descriptor
     // It's not allowed to pack it!
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index f3736dee80e5..2d80df72f0b0 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -39,7 +39,6 @@ InterceptionHelper::~InterceptionHelper()
 css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryDispatch(const css::util::URL&  aURL            ,
                                                                                         const OUString& sTargetFrameName,
                                                                                               sal_Int32        nSearchFlags    )
-    throw(css::uno::RuntimeException, std::exception)
 {
     // SAFE {
     SolarMutexClearableGuard aReadLock;
@@ -85,7 +84,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
 }
 
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL InterceptionHelper::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
-    throw(css::uno::RuntimeException, std::exception)
 {
           sal_Int32                                                          c           = lDescriptor.getLength();
           css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatches (c);
@@ -99,7 +97,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Inte
 }
 
 void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // reject incorrect calls of this interface method
     css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
@@ -163,7 +160,6 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
 }
 
 void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // reject wrong calling of this interface method
     css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
@@ -211,7 +207,6 @@ void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css::
 
 #define FORCE_DESTRUCTION_OF_INTERCEPTION_CHAIN
 void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     #ifdef FORCE_DESTRUCTION_OF_INTERCEPTION_CHAIN
     // SAFE ->
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index 4e90a3a846ca..f5d9d1465a37 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -43,34 +43,29 @@ LoadDispatcher::~LoadDispatcher()
 void SAL_CALL LoadDispatcher::dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                        const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
-    throw(css::uno::RuntimeException, std::exception)
 {
     impl_dispatch( aURL, lArguments, xListener );
 }
 
 void SAL_CALL LoadDispatcher::dispatch(const css::util::URL&                                  aURL      ,
                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
-    throw(css::uno::RuntimeException, std::exception)
 {
     impl_dispatch( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() );
 }
 
 css::uno::Any SAL_CALL LoadDispatcher::dispatchWithReturnValue( const css::util::URL& rURL,
                                                                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return impl_dispatch( rURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
 
 void SAL_CALL LoadDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                 const css::util::URL&                                     /*aURL*/     )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL LoadDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                    const css::util::URL&                                     /*aURL*/     )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 48d498e97174..ed3e099e7e81 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -76,7 +76,7 @@ MailToDispatcher::~MailToDispatcher()
 */
 css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDispatch( const css::util::URL&  aURL    ,
                                                                                        const OUString& /*sTarget*/ ,
-                                                                                             sal_Int32        /*nFlags*/  ) throw( css::uno::RuntimeException, std::exception )
+                                                                                             sal_Int32        /*nFlags*/  )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
     if (aURL.Complete.startsWith("mailto:"))
@@ -87,7 +87,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDis
 /**
     @short      do the same like dispatch() but for multiple requests at the same time
 */
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL MailToDispatcher::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL MailToDispatcher::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
 {
     sal_Int32 nCount = lDescriptor.getLength();
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
@@ -113,7 +113,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail
                     list of optional arguments for this mail request
 */
 void SAL_CALL MailToDispatcher::dispatch( const css::util::URL&                                  aURL       ,
-                                          const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+                                          const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
 {
     // dispatch() is an [oneway] call ... and may our user release his reference to us immediately.
     // So we should hold us self alive till this call ends.
@@ -136,7 +136,7 @@ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL&
 */
 void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                           const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                          const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+                                                          const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
 {
     // This class was designed to die by reference. And if user release his reference to us immediately after calling this method
     // we can run into some problems. So we hold us self alive till this method ends.
@@ -174,7 +174,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL&
                 <FALSE/> if necessary resource couldn't be created or an exception was thrown.
 */
 bool MailToDispatcher::implts_dispatch( const css::util::URL&                                  aURL       ,
-                                            const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) throw( css::uno::RuntimeException )
+                                            const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ )
 {
     bool bSuccess = false;
 
@@ -210,13 +210,13 @@ bool MailToDispatcher::implts_dispatch( const css::util::URL&
                     URL about listener will be informed, if something occurred
 */
 void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
-                                                   const css::util::URL&                                     /*aURL*/      ) throw( css::uno::RuntimeException, std::exception )
+                                                   const css::util::URL&                                     /*aURL*/      )
 {
     // not supported yet
 }
 
 void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
-                                                      const css::util::URL&                                     /*aURL*/      ) throw( css::uno::RuntimeException, std::exception )
+                                                      const css::util::URL&                                     /*aURL*/      )
 {
     // not supported yet
 }
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index bd19c85e3e4d..3781966bd11d 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -96,7 +96,6 @@ Oxt_Handler::~Oxt_Handler()
 void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
                                                      const css::uno::Sequence< css::beans::PropertyValue >&            /*lArguments*/,
                                                      const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard g(m_mutex);
 
@@ -121,7 +120,6 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
 
 void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&                                  aURL       ,
                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-    throw( css::uno::RuntimeException, std::exception )
 {
     dispatchWithNotification( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() );
 }
@@ -148,7 +146,6 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
     @threadsafe yes
 *//*-*************************************************************************************************************/
 OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor )
-    throw( css::uno::RuntimeException, std::exception )
 {
     // Our default is "nothing". So we can return it, if detection failed or file type is really unknown.
     OUString sTypeName;
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index c07f0bf26da2..c20043eb871b 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -72,19 +72,17 @@ PopupMenuDispatcher::~PopupMenuDispatcher()
     // and a dtor isn't the best place to do that!
 }
 
-OUString SAL_CALL PopupMenuDispatcher::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL PopupMenuDispatcher::getImplementationName()
 {
     return impl_getStaticImplementationName();
 }
 
 sal_Bool SAL_CALL PopupMenuDispatcher::supportsService( const OUString& sServiceName )
-  throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL PopupMenuDispatcher::getSupportedServiceNames()
-  throw( css::uno::RuntimeException, std::exception )
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -102,7 +100,6 @@ OUString PopupMenuDispatcher::impl_getStaticImplementationName()
 
 css::uno::Reference< css::uno::XInterface >
 SAL_CALL PopupMenuDispatcher::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )
-throw( css::uno::Exception )
 {
     /* create new instance of service */
     PopupMenuDispatcher* pClass = new PopupMenuDispatcher( comphelper::getComponentContext(xServiceManager) );
@@ -137,7 +134,6 @@ DEFINE_INIT_SERVICE(PopupMenuDispatcher,
 )
 
 void SAL_CALL PopupMenuDispatcher::initialize( const css::uno::Sequence< css::uno::Any >& lArguments )
-throw( css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::frame::XFrame > xFrame;
 
@@ -162,7 +158,6 @@ SAL_CALL PopupMenuDispatcher::queryDispatch(
     const css::util::URL&  rURL    ,
     const OUString& sTarget ,
     sal_Int32              nFlags  )
-throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatch;
 
@@ -225,7 +220,6 @@ throw( css::uno::RuntimeException, std::exception )
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
 PopupMenuDispatcher::queryDispatches(
     const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
-throw( css::uno::RuntimeException, std::exception )
 {
     sal_Int32 nCount = lDescriptor.getLength();
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
@@ -240,13 +234,11 @@ throw( css::uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL PopupMenuDispatcher::dispatch( const URL& /*aURL*/, const Sequence< PropertyValue >& /*seqProperties*/ )
-throw( RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl,
                                                       const URL& aURL )
-throw( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     // Safe impossible cases
@@ -256,7 +248,6 @@ throw( RuntimeException, std::exception )
 
 void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl,
                                                          const URL& aURL )
-throw( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     // Safe impossible cases
@@ -265,7 +256,6 @@ throw( RuntimeException, std::exception )
 }
 
 void SAL_CALL PopupMenuDispatcher::frameAction( const FrameActionEvent& aEvent )
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     if (( aEvent.Action == css::frame::FrameAction_COMPONENT_DETACHING ) ||
@@ -276,7 +266,7 @@ throw ( RuntimeException, std::exception )
     }
 }
 
-void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& )
 {
     SolarMutexGuard g;
     // Safe impossible cases
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 93acf4b4209f..3aac8a1f1489 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -78,7 +78,7 @@ ServiceHandler::~ServiceHandler()
 */
 css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispatch( const css::util::URL&  aURL    ,
                                                                                      const OUString& /*sTarget*/ ,
-                                                                                           sal_Int32        /*nFlags*/  ) throw( css::uno::RuntimeException, std::exception )
+                                                                                           sal_Int32        /*nFlags*/  )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
     if (aURL.Complete.startsWith(PROTOCOL_VALUE))
@@ -89,7 +89,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispa
 /**
     @short      do the same like dispatch() but for multiple requests at the same time
 */
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL ServiceHandler::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL ServiceHandler::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
 {
     sal_Int32 nCount = lDescriptor.getLength();
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
@@ -114,7 +114,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv
                     list of optional arguments for this request
 */
 void SAL_CALL ServiceHandler::dispatch( const css::util::URL&                                  aURL       ,
-                                    const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+                                    const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
 {
     // dispatch() is an [oneway] call ... and may our user release his reference to us immediately.
     // So we should hold us self alive till this call ends.
@@ -137,7 +137,7 @@ void SAL_CALL ServiceHandler::dispatch( const css::util::URL&
 */
 void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
 {
     // This class was designed to die by reference. And if user release his reference to us immediately after calling this method
     // we can run into some problems. So we hold us self alive till this method ends.
@@ -175,7 +175,7 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL&
                 if dispatch was successfully or not.
 */
 css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( const css::util::URL&                                  aURL       ,
-                                                                             const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) throw( css::uno::RuntimeException )
+                                                                             const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ )
 {
     if (!m_xFactory.is())
         return css::uno::Reference< css::uno::XInterface >();
@@ -240,13 +240,13 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
                     URL about listener will be informed, if something occurred
 */
 void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
-                                                 const css::util::URL&                                     /*aURL*/      ) throw( css::uno::RuntimeException, std::exception )
+                                                 const css::util::URL&                                     /*aURL*/      )
 {
     // not supported yet
 }
 
 void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
-                                                    const css::util::URL&                                     /*aURL*/      ) throw( css::uno::RuntimeException, std::exception )
+                                                    const css::util::URL&                                     /*aURL*/      )
 {
     // not supported yet
 }
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 945717afaa5b..8fb1006d4c27 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -58,7 +58,6 @@ StartModuleDispatcher::~StartModuleDispatcher()
 
 void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL&                                  aURL      ,
                                               const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
-    throw(css::uno::RuntimeException, std::exception)
 {
     dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
@@ -66,7 +65,6 @@ void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL&
 void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                               const css::uno::Sequence< css::beans::PropertyValue >&            /*lArguments*/,
                                                               const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW;
     if (isStartModuleDispatch(aURL))
@@ -83,26 +81,22 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U
 }
 
 css::uno::Sequence< ::sal_Int16 > SAL_CALL StartModuleDispatcher::getSupportedCommandGroups()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence< ::sal_Int16 >();
 }
 
 css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispatcher::getConfigurableDispatchInformation(::sal_Int16 /*nCommandGroup*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence< css::frame::DispatchInformation >();
 }
 
 void SAL_CALL StartModuleDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                        const css::util::URL&                                     /*aURL*/     )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                           const css::util::URL&                                     /*aURL*/     )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 91e058b9c7bb..764140af6d90 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -63,7 +63,7 @@ SystemExec::~SystemExec()
 
 css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL&  aURL    ,
                                                                                  const OUString&,
-                                                                                       sal_Int32 ) throw( css::uno::RuntimeException, std::exception )
+                                                                                       sal_Int32 )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
     if (aURL.Complete.startsWith(PROTOCOL_VALUE))
@@ -71,7 +71,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch(
     return xDispatcher;
 }
 
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
 {
     sal_Int32 nCount = lDescriptor.getLength();
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
@@ -86,14 +86,14 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst
 }
 
 void SAL_CALL SystemExec::dispatch( const css::util::URL&                                  aURL       ,
-                                    const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+                                    const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
 {
     dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
 
 void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                     const css::uno::Sequence< css::beans::PropertyValue >&,
-                                                    const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+                                                    const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
 {
     // convert "systemexec:file:///c:/temp/test.html" => "file:///c:/temp/test.html"
     sal_Int32 c = aURL.Complete.getLength()-PROTOCOL_LENGTH;
@@ -124,13 +124,13 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL&
 }
 
 void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >&,
-                                             const css::util::URL& ) throw( css::uno::RuntimeException, std::exception )
+                                             const css::util::URL& )
 {
     // not supported yet
 }
 
 void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >&,
-                                                const css::util::URL& ) throw( css::uno::RuntimeException, std::exception )
+                                                const css::util::URL& )
 {
     // not supported yet
 }
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index 8144dfec7d7a..71a6d4532047 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -43,7 +43,6 @@ ActionTriggerContainer::~ActionTriggerContainer()
 
 // XInterface
 Any SAL_CALL ActionTriggerContainer::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface(
                 aType ,
@@ -71,7 +70,6 @@ void ActionTriggerContainer::release() throw()
 
 // XMultiServiceFactory
 Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const OUString& aServiceSpecifier )
-throw ( css::uno::Exception, RuntimeException, std::exception)
 {
     if ( aServiceSpecifier == SERVICENAME_ACTIONTRIGGER )
         return static_cast<OWeakObject *>( new ActionTriggerPropertySet());
@@ -84,13 +82,11 @@ throw ( css::uno::Exception, RuntimeException, std::exception)
 }
 
 Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
-throw ( Exception, RuntimeException, std::exception)
 {
     return createInstance( ServiceSpecifier );
 }
 
 Sequence< OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames()
-throw ( RuntimeException, std::exception )
 {
     Sequence< OUString > aSeq( 3 );
 
@@ -103,26 +99,23 @@ throw ( RuntimeException, std::exception )
 
 // XServiceInfo
 OUString SAL_CALL ActionTriggerContainer::getImplementationName()
-throw ( RuntimeException, std::exception )
 {
     return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER );
 }
 
 sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL ActionTriggerContainer::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
 {
     Sequence< OUString > seqServiceNames { SERVICENAME_ACTIONTRIGGERCONTAINER };
     return seqServiceNames;
 }
 
 // XTypeProvider
-Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -152,7 +145,7 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce
     return pTypeCollection->getTypes();
 }
 
-Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 158429eef129..738a5ac5b1df 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -66,7 +66,6 @@ ActionTriggerPropertySet::~ActionTriggerPropertySet()
 
 // XInterface
 Any SAL_CALL ActionTriggerPropertySet::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface(
                 aType,
@@ -98,26 +97,23 @@ void SAL_CALL ActionTriggerPropertySet::release() throw ()
 
 // XServiceInfo
 OUString SAL_CALL ActionTriggerPropertySet::getImplementationName()
-throw ( RuntimeException, std::exception )
 {
     return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGER );
 }
 
 sal_Bool SAL_CALL ActionTriggerPropertySet::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL ActionTriggerPropertySet::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
 {
     Sequence<OUString> seqServiceNames { SERVICENAME_ACTIONTRIGGER };
     return seqServiceNames;
 }
 
 // XTypeProvider
-Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -148,7 +144,7 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx
     return pTypeCollection->getTypes();
 }
 
-Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -158,7 +154,6 @@ sal_Bool SAL_CALL ActionTriggerPropertySet::convertFastPropertyValue(
     Any&        aOldValue,
     sal_Int32   nHandle,
     const Any&  aValue  )
-throw( IllegalArgumentException )
 {
     //  Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
     //  Return sal_True, if changed - else return sal_False.
@@ -196,7 +191,6 @@ throw( IllegalArgumentException )
 
 void SAL_CALL ActionTriggerPropertySet::setFastPropertyValue_NoBroadcast(
     sal_Int32 nHandle, const Any& aValue )
-throw( Exception, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -280,7 +274,6 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue(
 }
 
 Reference< XPropertySetInfo > SAL_CALL ActionTriggerPropertySet::getPropertySetInfo()
-throw ( RuntimeException, std::exception )
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -326,7 +319,6 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty(
     const   Any&        aNewValue       ,
     Any&        aOldValue       ,
     Any&        aConvertedValue )
-throw( IllegalArgumentException )
 {
     // Set default return value if method failed.
     bool bReturn = false;
@@ -361,7 +353,6 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty(
     const Any&                  aNewValue       ,
     Any&                        aOldValue       ,
     Any&                        aConvertedValue )
-throw( IllegalArgumentException )
 {
     // Set default return value if method failed.
     bool bReturn = false;
@@ -396,7 +387,6 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty(
     const Any&                      aNewValue       ,
     Any&                            aOldValue       ,
     Any&                            aConvertedValue )
-throw( IllegalArgumentException )
 {
     // Set default return value if method failed.
     bool bReturn = false;
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index 53b3e0e559c8..7752d6caa9f6 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -59,7 +59,6 @@ ActionTriggerSeparatorPropertySet::~ActionTriggerSeparatorPropertySet()
 
 // XInterface
 Any SAL_CALL ActionTriggerSeparatorPropertySet::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface(
                 aType,
@@ -91,26 +90,23 @@ void ActionTriggerSeparatorPropertySet::release() throw()
 
 // XServiceInfo
 OUString SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationName()
-throw ( RuntimeException, std::exception )
 {
     return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR );
 }
 
 sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL ActionTriggerSeparatorPropertySet::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
 {
     Sequence<OUString> seqServiceNames { SERVICENAME_ACTIONTRIGGERSEPARATOR };
     return seqServiceNames;
 }
 
 // XTypeProvider
-Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -141,7 +137,7 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw (
     return pTypeCollection->getTypes();
 }
 
-Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -151,7 +147,6 @@ sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
     Any&        aOldValue,
     sal_Int32   nHandle,
     const Any&  aValue  )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     //  Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
     //  Return sal_True, if changed - else return sal_False.
@@ -173,7 +168,6 @@ sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
 
 void SAL_CALL ActionTriggerSeparatorPropertySet::setFastPropertyValue_NoBroadcast(
     sal_Int32 nHandle, const Any& aValue )
-throw( Exception, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -225,7 +219,6 @@ void SAL_CALL ActionTriggerSeparatorPropertySet::getFastPropertyValue(
 }
 
 Reference< XPropertySetInfo > SAL_CALL ActionTriggerSeparatorPropertySet::getPropertySetInfo()
-throw ( RuntimeException, std::exception )
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -267,7 +260,6 @@ bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty(
     const   Any&        aNewValue       ,
     Any&                aOldValue       ,
     Any&                aConvertedValue )
-throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     // Set default return value if method failed.
     bool bReturn = false;
diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index 98897e39149a..f475dd2bf7bb 100644
--- a/framework/source/fwe/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
@@ -53,7 +53,7 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId()
 }
 
 // XBitmap
-css::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::exception )
+css::awt::Size SAL_CALL ImageWrapper::getSize()
 {
     SolarMutexGuard aGuard;
 
@@ -63,7 +63,7 @@ css::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::e
     return css::awt::Size( aBitmapSize.Width(), aBitmapSize.Height() );
 }
 
-Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB()
 {
     SolarMutexGuard aGuard;
 
@@ -72,7 +72,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException, s
     return Sequence< sal_Int8 >( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
 }
 
-Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB()
 {
     SolarMutexGuard aGuard;
     BitmapEx    aBmpEx( m_aImage.GetBitmapEx() );
@@ -94,7 +94,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeExceptio
 }
 
 // XUnoTunnel
-sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception )
+sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier )
 {
     if ( aIdentifier == impl_getStaticIdentifier() )
         return reinterpret_cast< sal_Int64 >( this );
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 7c4312470c8b..c1306b33dfd5 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -60,7 +60,6 @@ RootActionTriggerContainer::~RootActionTriggerContainer()
 
 // XInterface
 Any SAL_CALL RootActionTriggerContainer::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface(
                 aType ,
@@ -90,7 +89,6 @@ void SAL_CALL RootActionTriggerContainer::release() throw ()
 
 // XMultiServiceFactory
 Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstance( const OUString& aServiceSpecifier )
-throw ( Exception,  RuntimeException, std::exception )
 {
     if ( aServiceSpecifier == SERVICENAME_ACTIONTRIGGER )
         return static_cast<OWeakObject *>( new ActionTriggerPropertySet());
@@ -103,13 +101,11 @@ throw ( Exception,  RuntimeException, std::exception )
 }
 
 Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
-throw ( Exception, RuntimeException, std::exception )
 {
     return createInstance( ServiceSpecifier );
 }
 
 Sequence< OUString > SAL_CALL RootActionTriggerContainer::getAvailableServiceNames()
-throw ( RuntimeException, std::exception )
 {
     Sequence< OUString > aSeq( 3 );
 
@@ -122,7 +118,6 @@ throw ( RuntimeException, std::exception )
 
 // XIndexContainer
 void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const Any& Element )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -135,7 +130,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
 }
 
 void SAL_CALL RootActionTriggerContainer::removeByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -149,7 +143,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
 
 // XIndexReplace
 void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const Any& Element )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -163,7 +156,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
 
 // XIndexAccess
 sal_Int32 SAL_CALL RootActionTriggerContainer::getCount()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -184,7 +176,6 @@ throw ( RuntimeException, std::exception )
 }
 
 Any SAL_CALL RootActionTriggerContainer::getByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -196,13 +187,11 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
 
 // XElementAccess
 Type SAL_CALL RootActionTriggerContainer::getElementType()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<XPropertySet>::get();
 }
 
 sal_Bool SAL_CALL RootActionTriggerContainer::hasElements()
-throw (css::uno::RuntimeException, std::exception)
 {
     if ( m_pMenu )
     {
@@ -215,26 +204,23 @@ throw (css::uno::RuntimeException, std::exception)
 
 // XServiceInfo
 OUString SAL_CALL RootActionTriggerContainer::getImplementationName()
-throw ( RuntimeException, std::exception )
 {
     return OUString( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER );
 }
 
 sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL RootActionTriggerContainer::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
 {
     Sequence< OUString > seqServiceNames { SERVICENAME_ACTIONTRIGGERCONTAINER };
     return seqServiceNames;
 }
 
 // XUnoTunnel
-sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception )
+sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier )
 {
     if ( aIdentifier == impl_getStaticIdentifier() )
         return reinterpret_cast< sal_Int64 >( this );
@@ -243,7 +229,7 @@ sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal
 }
 
 // XTypeProvider
-Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -275,7 +261,7 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime
     return pTypeCollection->getTypes();
 }
 
-Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -291,7 +277,7 @@ void RootActionTriggerContainer::FillContainer()
         m_pMenu );
     m_bInContainerCreation = false;
 }
-OUString RootActionTriggerContainer::getName() throw ( RuntimeException, std::exception )
+OUString RootActionTriggerContainer::getName()
 {
     OUString sRet;
     if( m_pMenuIdentifier )
@@ -299,7 +285,7 @@ OUString RootActionTriggerContainer::getName() throw ( RuntimeException, std::ex
     return sRet;
 }
 
-void RootActionTriggerContainer::setName( const OUString& ) throw ( RuntimeException, std::exception)
+void RootActionTriggerContainer::setName( const OUString& )
 {
     throw RuntimeException();
 }
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index a4a7fc2e2b0d..a9025aaef71b 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -53,8 +53,8 @@ class ContinuationFilterSelect : public comphelper::OInteraction< css::document:
 
     // uno interface
     public:
-        virtual void            SAL_CALL setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual OUString SAL_CALL getFilter(                                ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void            SAL_CALL setFilter( const OUString& sFilter ) override;
+        virtual OUString SAL_CALL getFilter(                                ) override;
 
     // member
     private:
@@ -71,14 +71,14 @@ ContinuationFilterSelect::ContinuationFilterSelect()
 
 // handler should use it after selection to set user specified filter for transport
 
-void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter )
 {
     m_sFilter = sFilter;
 }
 
 // read access to transported filter
 
-OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL ContinuationFilterSelect::getFilter()
 {
     return m_sFilter;
 }
@@ -91,8 +91,8 @@ public:
     OUString getFilter() const;
 
 public:
-    virtual css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getRequest() override;
+    virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() override;
 
 private:
     css::uno::Any                                                                       m_aRequest;
@@ -135,7 +135,7 @@ OUString RequestFilterSelect_Impl::getFilter() const
 // handler call it to get type of request
 // Is hard coded to "please select filter" here. see ctor for further information.
 
-css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest()
 {
     return m_aRequest;
 }
@@ -145,7 +145,7 @@ css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::R
 // After interaction we support read access on these continuations on our c++ interface to
 // return user decision.
 
-css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations()
 {
     return { m_xAbort.get(), m_xFilter.get() };
 }
@@ -193,18 +193,16 @@ public:
         m_lContinuations = lContinuations;
     }
 
-    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;
 };
 
-uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL InteractionRequest_Impl::getRequest()
 {
     return m_aRequest;
 }
 
 uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest_Impl::getContinuations()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_lContinuations;
 }
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 7fd256c133ee..ddf7c1d32a41 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -237,7 +237,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X
 // implementation helper ( ActionTrigger => menu )
 
 /// @throws RuntimeException
-Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer )
 {
     Reference< XPropertySet > xPropSet;
 
@@ -284,7 +284,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
 }
 
 /// @throws RuntimeException
-Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexContainer >& rActionTriggerContainer )
 {
     Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY );
     if ( xMultiServiceFactory.is() )
@@ -298,7 +298,7 @@ Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexC
 }
 
 /// @throws RuntimeException
-Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XIndexContainer >& rActionTriggerContainer )
 {
     Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY );
     if ( xMultiServiceFactory.is() )
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index 94e9b3fb14ba..b51b3e283f58 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -77,20 +77,20 @@ namespace framework
         }
 
         // XUndoManagerListener
-        virtual void SAL_CALL undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL undoActionAdded( const UndoManagerEvent& i_event ) override;
+        virtual void SAL_CALL actionUndone( const UndoManagerEvent& i_event ) override;
+        virtual void SAL_CALL actionRedone( const UndoManagerEvent& i_event ) override;
+        virtual void SAL_CALL allActionsCleared( const EventObject& i_event ) override;
+        virtual void SAL_CALL redoActionsCleared( const EventObject& i_event ) override;
+        virtual void SAL_CALL resetAll( const EventObject& i_event ) override;
+        virtual void SAL_CALL enteredContext( const UndoManagerEvent& i_event ) override;
+        virtual void SAL_CALL enteredHiddenContext( const UndoManagerEvent& i_event ) override;
+        virtual void SAL_CALL leftContext( const UndoManagerEvent& i_event ) override;
+        virtual void SAL_CALL leftHiddenContext( const UndoManagerEvent& i_event ) override;
+        virtual void SAL_CALL cancelledContext( const UndoManagerEvent& i_event ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& i_event ) override;
 
     private:
         Reference< XUndoManager > const m_xUndoManager;
@@ -98,73 +98,73 @@ namespace framework
         bool                            m_documentDisposed;
     };
 
-    void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event )
     {
         (void)i_event;
         // not interested in
     }
 
-    void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event )
     {
         (void)i_event;
         // not interested in
     }
 
-    void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event )
     {
         (void)i_event;
         // not interested in
     }
 
-    void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event )
     {
         (void)i_event;
         // not interested in
     }
 
-    void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event )
     {
         (void)i_event;
         // not interested in
     }
 
-    void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event )
     {
         (void)i_event;
         m_nRelativeContextDepth = 0;
     }
 
-    void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event )
     {
         (void)i_event;
         osl_atomic_increment( &m_nRelativeContextDepth );
     }
 
-    void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event )
     {
         (void)i_event;
         osl_atomic_increment( &m_nRelativeContextDepth );
     }
 
-    void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event )
     {
         (void)i_event;
         osl_atomic_decrement( &m_nRelativeContextDepth );
     }
 
-    void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event )
     {
         (void)i_event;
         osl_atomic_decrement( &m_nRelativeContextDepth );
     }
 
-    void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event )
     {
         (void)i_event;
         osl_atomic_decrement( &m_nRelativeContextDepth );
     }
 
-    void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event )
     {
         (void)i_event;
         m_documentDisposed = true;
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 7b867d1df361..641e98792324 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -55,7 +55,6 @@ void SAL_CALL PropertySetContainer::release() throw ()
 }
 
 Any SAL_CALL PropertySetContainer::queryInterface( const Type& rType )
-throw ( RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface(
                 rType ,
@@ -74,7 +73,6 @@ throw ( RuntimeException, std::exception )
 
 // XIndexContainer
 void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
-    throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -107,7 +105,6 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const css::u
 }
 
 void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex )
-    throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -121,7 +118,6 @@ void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex )
 
 // XIndexReplace
 void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
-    throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
 {
     if ( (sal_Int32)m_aPropertySetVector.size() > Index )
     {
@@ -144,7 +140,6 @@ void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const css::
 
 // XIndexAccess
 sal_Int32 SAL_CALL PropertySetContainer::getCount()
-    throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -152,7 +147,6 @@ sal_Int32 SAL_CALL PropertySetContainer::getCount()
 }
 
 Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
-    throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -169,7 +163,6 @@ Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
 
 // XElementAccess
 sal_Bool SAL_CALL PropertySetContainer::hasElements()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 16ad4b3dafb4..818a4595a4d4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -91,7 +91,6 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO
 }
 
 OUString SAL_CALL TitleHelper::getTitle()
-    throw (css::uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -125,7 +124,6 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr
 }
 
 void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -140,21 +138,18 @@ void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
 }
 
 void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // container is threadsafe by himself
     m_aListener.addInterface( cppu::UnoType<css::frame::XTitleChangeListener>::get(), xListener );
 }
 
 void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // container is threadsafe by himself
     m_aListener.removeInterface( cppu::UnoType<css::frame::XTitleChangeListener>::get(), xListener );
 }
 
 void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -171,7 +166,6 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv
 }
 
 void SAL_CALL TitleHelper::documentEventOccured(const css::document::DocumentEvent& aEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if ( ! aEvent.EventName.equalsIgnoreAsciiCase("OnSaveAsDone")
       && ! aEvent.EventName.equalsIgnoreAsciiCase("OnModeChanged")
@@ -198,7 +192,6 @@ void SAL_CALL TitleHelper::documentEventOccured(const css::document::DocumentEve
 }
 
 void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -225,7 +218,6 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven
 }
 
 void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 818fdfe2122a..a019094d1484 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -63,7 +63,6 @@ void PreventDuplicateInteraction::useDefaultUUIHandler()
 }
 
 css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType )
-    throw (css::uno::RuntimeException, std::exception)
 {
     if ( aType.equals( cppu::UnoType<XInteractionHandler2>::get() ) )
     {
@@ -76,7 +75,6 @@ css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::u
 }
 
 void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aRequest  = xRequest->getRequest();
     bool          bHandleIt = true;
@@ -130,7 +128,6 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css
 }
 
 sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
-            throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aRequest  = xRequest->getRequest();
     bool      bHandleIt = true;
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index fcda2ed2f1d4..9ed762ce2d59 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -54,7 +54,6 @@ MenuConfiguration::~MenuConfiguration()
 
 Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
     Reference< XInputStream >& rInputStream )
-        throw (WrappedTargetException, RuntimeException)
 {
     Reference< XParser > xParser = Parser::create( m_xContext );
 
@@ -102,7 +101,6 @@ Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
 void MenuConfiguration::StoreMenuBarConfigurationToXML(
     Reference< XIndexAccess >& rMenuBarConfiguration,
     Reference< XOutputStream >& rOutputStream, bool bIsMenuBar )
-    throw (WrappedTargetException, RuntimeException)
 {
     Reference< XWriter > xWriter = Writer::create(m_xContext);
     xWriter->setOutputStream( rOutputStream );
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 759244db6c54..485717088a00 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -163,19 +163,16 @@ ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase()
 
 void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace(
     const OUString& )
-throw( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction(
     const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator(
     const Reference< XLocator > &xLocator)
-throw(  SAXException, RuntimeException, std::exception )
 {
     m_xLocator = xLocator;
 }
@@ -226,12 +223,10 @@ OReadMenuDocumentHandler::~OReadMenuDocumentHandler()
 }
 
 void SAL_CALL OReadMenuDocumentHandler::startDocument()
-    throw ( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadMenuDocumentHandler::endDocument()
-    throw( SAXException, RuntimeException, std::exception )
 {
     if ( m_nElementDepth > 0 )
     {
@@ -243,7 +238,6 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument()
 
 void SAL_CALL OReadMenuDocumentHandler::startElement(
     const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
 {
     if ( m_eReaderMode != ReaderMode::None )
     {
@@ -268,12 +262,10 @@ throw( SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadMenuDocumentHandler::characters(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException, std::exception )
 {
     if ( m_eReaderMode != ReaderMode::None )
     {
@@ -315,18 +307,15 @@ OReadMenuBarHandler::~OReadMenuBarHandler()
 }
 
 void SAL_CALL OReadMenuBarHandler::startDocument()
-    throw ( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadMenuBarHandler::endDocument()
-    throw( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadMenuBarHandler::startElement(
     const OUString& rName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
 {
     if ( m_bMenuMode )
     {
@@ -413,12 +402,10 @@ throw( SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadMenuBarHandler::characters(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void OReadMenuBarHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException, std::exception )
 {
     if ( m_bMenuMode )
     {
@@ -455,18 +442,15 @@ OReadMenuHandler::~OReadMenuHandler()
 }
 
 void SAL_CALL OReadMenuHandler::startDocument()
-    throw ( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadMenuHandler::endDocument()
-    throw( SAXException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OReadMenuHandler::startElement(
     const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
 {
     if ( m_bMenuPopupMode )
     {
@@ -489,12 +473,10 @@ throw( SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadMenuHandler::characters(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadMenuHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException, std::exception )
 {
     if ( m_bMenuPopupMode )
     {
@@ -533,18 +515,15 @@ OReadMenuPopupHandler::~OReadMenuPopupHandler()
 }
 
 void SAL_CALL OReadMenuPopupHandler::startDocument()
-    throw ( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadMenuPopupHandler::endDocument()
-    throw( SAXException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OReadMenuPopupHandler::startElement(
     const OUString& rName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
 {
     ++m_nElementDepth;
 
@@ -682,12 +661,10 @@ throw( SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadMenuPopupHandler::characters(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException, std::exception )
 {
     --m_nElementDepth;
     if ( m_bMenuMode )
@@ -752,7 +729,6 @@ OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler()
 }
 
 void OWriteMenuDocumentHandler::WriteMenuDocument()
-throw ( SAXException, RuntimeException )
 {
     ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
     Reference< XAttributeList > rList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -793,7 +769,6 @@ throw ( SAXException, RuntimeException )
 }
 
 void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >& rMenuContainer )
-throw ( SAXException, RuntimeException )
 {
     sal_Int32  nItemCount = rMenuContainer->getCount();
     bool   bSeparator = false;
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 4e4b1bf122b7..f2f8169b3258 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -49,18 +49,15 @@ SaxNamespaceFilter::~SaxNamespaceFilter()
 
 // XDocumentHandler
 void SAL_CALL SaxNamespaceFilter::startDocument()
-    throw ( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL SaxNamespaceFilter::endDocument()
-    throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL SaxNamespaceFilter::startElement(
     const OUString& rName, const Reference< XAttributeList > &xAttribs )
-    throw(  SAXException, RuntimeException, std::exception )
 {
     XMLNamespaces aXMLNamespaces;
     if ( !m_aNamespaceStack.empty() )
@@ -119,7 +116,6 @@ void SAL_CALL SaxNamespaceFilter::startElement(
 }
 
 void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName)
-    throw(  SAXException, RuntimeException, std::exception )
 {
     XMLNamespaces& aXMLNamespaces = m_aNamespaceStack.top();
     OUString aNamespaceElementName;
@@ -139,27 +135,23 @@ void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName)
 }
 
 void SAL_CALL SaxNamespaceFilter::characters(const OUString& aChars)
-    throw(  SAXException, RuntimeException, std::exception )
 {
     xDocumentHandler->characters( aChars );
 }
 
 void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const OUString& aWhitespaces)
-    throw(  SAXException, RuntimeException, std::exception )
 {
     xDocumentHandler->ignorableWhitespace( aWhitespaces );
 }
 
 void SAL_CALL SaxNamespaceFilter::processingInstruction(
     const OUString& aTarget, const OUString& aData)
-    throw(  SAXException, RuntimeException, std::exception )
 {
     xDocumentHandler->processingInstruction( aTarget, aData );
 }
 
 void SAL_CALL SaxNamespaceFilter::setDocumentLocator(
     const Reference< XLocator > &xLocator)
-    throw(  SAXException, RuntimeException, std::exception )
 {
     m_xLocator = xLocator;
     xDocumentHandler->setDocumentLocator( xLocator );
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 4d7e66a06ca8..190877c78546 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -179,12 +179,10 @@ OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler()
 
 // XDocumentHandler
 void SAL_CALL OReadStatusBarDocumentHandler::startDocument()
-throw ( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadStatusBarDocumentHandler::endDocument()
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -198,7 +196,6 @@ throw(  SAXException, RuntimeException, std::exception )
 
 void SAL_CALL OReadStatusBarDocumentHandler::startElement(
     const OUString& aName, const Reference< XAttributeList > &xAttribs )
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -397,7 +394,6 @@ throw(  SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName)
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -439,24 +435,20 @@ throw(  SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadStatusBarDocumentHandler::characters(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadStatusBarDocumentHandler::ignorableWhitespace(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadStatusBarDocumentHandler::processingInstruction(
     const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadStatusBarDocumentHandler::setDocumentLocator(
     const Reference< XLocator > &xLocator)
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -496,8 +488,7 @@ OWriteStatusBarDocumentHandler::~OWriteStatusBarDocumentHandler()
 {
 }
 
-void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
-( SAXException, RuntimeException )
+void OWriteStatusBarDocumentHandler::WriteStatusBarDocument()
 {
     SolarMutexGuard g;
 
@@ -567,7 +558,6 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarItem(
     sal_Int16            nOffset,
     sal_Int16            nStyle,
     sal_Int16            nWidth )
-throw ( SAXException, RuntimeException )
 {
     ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
     Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index e31da549bfe8..fad320b13108 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -178,12 +178,10 @@ OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler()
 
 // XDocumentHandler
 void SAL_CALL OReadToolBoxDocumentHandler::startDocument()
-throw ( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadToolBoxDocumentHandler::endDocument()
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -197,7 +195,6 @@ throw(  SAXException, RuntimeException, std::exception )
 
 void SAL_CALL OReadToolBoxDocumentHandler::startElement(
     const OUString& aName, const Reference< XAttributeList > &xAttribs )
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -491,7 +488,6 @@ throw(  SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName)
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -572,24 +568,20 @@ throw(  SAXException, RuntimeException, std::exception )
 }
 
 void SAL_CALL OReadToolBoxDocumentHandler::characters(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadToolBoxDocumentHandler::ignorableWhitespace(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadToolBoxDocumentHandler::processingInstruction(
     const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator(
     const Reference< XLocator > &xLocator)
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -629,8 +621,7 @@ OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler()
 {
 }
 
-void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
 {
     SolarMutexGuard g;
 
@@ -718,7 +709,6 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem(
     const OUString& rHelpURL,
     sal_Int16       nStyle,
     bool        bVisible )
-throw ( SAXException, RuntimeException )
 {
     ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
     Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -777,8 +767,7 @@ throw ( SAXException, RuntimeException )
     m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARITEM );
 }
 
-void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxSpace()
 {
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
     m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSPACE, m_xEmptyList );
@@ -786,8 +775,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw
     m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARSPACE );
 }
 
-void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxBreak()
 {
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
     m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARBREAK, m_xEmptyList );
@@ -795,8 +783,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw
     m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARBREAK );
 }
 
-void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator()
 {
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
     m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSEPARATOR, m_xEmptyList );
diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index a208e440a3b4..7b103eae24c5 100644
--- a/framework/source/fwe/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
@@ -40,7 +40,7 @@ XMLNamespaces::~XMLNamespaces()
 {
 }
 
-void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue ) throw( SAXException )
+void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue )
 {
     NamespaceMap::iterator p;
     OUString aNamespaceName( aName );
@@ -93,7 +93,7 @@ void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue
     }
 }
 
-OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const throw( SAXException, std::exception )
+OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const
 {
     // xml draft: there is no default namespace for attributes!
 
@@ -118,7 +118,7 @@ OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const th
     return aName;
 }
 
-OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const   throw( SAXException, std::exception )
+OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const
 {
     // xml draft: element names can have a default namespace
 
@@ -156,7 +156,7 @@ OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const   th
     return aElementName;
 }
 
-OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const throw( SAXException )
+OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const
 {
     if ( aNamespace.isEmpty() )
         return m_aDefaultNamespace;
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index a6d8efc466a1..fa7847e5696f 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -153,7 +153,7 @@ EWorkingMode TransactionManager::getWorkingMode() const
 
     @param      "eMode"     ,used to enable/disable throwing exceptions automatically for rejected calls
 *//*-*****************************************************************************************************/
-void  TransactionManager::registerTransaction( EExceptionMode eMode ) throw( css::uno::RuntimeException, css::lang::DisposedException )
+void  TransactionManager::registerTransaction( EExceptionMode eMode )
 {
     ::osl::MutexGuard aAccessGuard( m_aAccessLock );
     switch( m_eWorkingMode )
@@ -198,7 +198,7 @@ void  TransactionManager::registerTransaction( EExceptionMode eMode ) throw( css
 
     @seealso    method registerTransaction()
 *//*-*****************************************************************************************************/
-void  TransactionManager::unregisterTransaction() throw( css::uno::RuntimeException, css::lang::DisposedException )
+void  TransactionManager::unregisterTransaction()
 {
     // This call could not rejected!
     // Safe access to internal member.
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 9653444f9126..6a1c6f696433 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -163,7 +163,7 @@ Reference< XIndexAccess > ConstItemContainer::deepCopyContainer( const Reference
 }
 
 // XUnoTunnel
-sal_Int64 ConstItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 ConstItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier )
 {
     if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ConstItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) )
     {
@@ -191,20 +191,17 @@ ConstItemContainer* ConstItemContainer::GetImplementation( const css::uno::Refer
 
 // XElementAccess
 sal_Bool SAL_CALL ConstItemContainer::hasElements()
-throw ( RuntimeException, std::exception )
 {
     return ( !m_aItemVector.empty() );
 }
 
 // XIndexAccess
 sal_Int32 SAL_CALL ConstItemContainer::getCount()
-throw ( RuntimeException, std::exception )
 {
     return m_aItemVector.size();
 }
 
 Any SAL_CALL ConstItemContainer::getByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     if ( sal_Int32( m_aItemVector.size()) > Index )
         return makeAny( m_aItemVector[Index] );
@@ -214,7 +211,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
 
 // XPropertySet
 Reference< XPropertySetInfo > SAL_CALL ConstItemContainer::getPropertySetInfo()
-throw (css::uno::RuntimeException, std::exception)
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -239,12 +235,10 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ConstItemContainer::setPropertyValue( const OUString&, const Any& )
-throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
 Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     if ( PropertyName == PROPNAME_UINAME )
         return makeAny( m_aUIName );
@@ -253,36 +247,30 @@ throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
 }
 
 void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ConstItemContainer::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     // Only read-only properties - do nothing
 }
 
 void SAL_CALL ConstItemContainer::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     // Only read-only properties - do nothing
 }
 
 void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     // Only read-only properties - do nothing
 }
 
 // XFastPropertySet
 void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const css::uno::Any& )
-throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
 }
 
 Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     if ( nHandle == PROPHANDLE_UINAME )
         return makeAny( m_aUIName );
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 239f4027acba..892947009ff3 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -148,7 +148,6 @@ ItemContainer* ItemContainer::GetImplementation( const css::uno::Reference< css:
 
 // XElementAccess
 sal_Bool SAL_CALL ItemContainer::hasElements()
-throw ( RuntimeException, std::exception )
 {
     ShareGuard aLock( m_aShareMutex );
     return ( !m_aItemVector.empty() );
@@ -156,14 +155,12 @@ throw ( RuntimeException, std::exception )
 
 // XIndexAccess
 sal_Int32 SAL_CALL ItemContainer::getCount()
-throw ( RuntimeException, std::exception )
 {
     ShareGuard aLock( m_aShareMutex );
     return m_aItemVector.size();
 }
 
 Any SAL_CALL ItemContainer::getByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     ShareGuard aLock( m_aShareMutex );
     if ( sal_Int32( m_aItemVector.size()) > Index )
@@ -174,7 +171,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
 
 // XIndexContainer
 void SAL_CALL ItemContainer::insertByIndex( sal_Int32 Index, const Any& aItem )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     Sequence< PropertyValue > aSeq;
     if ( aItem >>= aSeq )
@@ -197,7 +193,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
 }
 
 void SAL_CALL ItemContainer::removeByIndex( sal_Int32 nIndex )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     ShareGuard aLock( m_aShareMutex );
     if ( (sal_Int32)m_aItemVector.size() > nIndex )
@@ -209,7 +204,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
 }
 
 void SAL_CALL ItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     Sequence< PropertyValue > aSeq;
     if ( aItem >>= aSeq )
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 5974fd94c376..b6c2a6499aec 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -106,7 +106,7 @@ RootItemContainer::~RootItemContainer()
 {
 }
 
-Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType )
 {
     Any aRet = RootItemContainer_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
@@ -114,7 +114,7 @@ Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(Runti
     return aRet;
 }
 
-Sequence< Type > SAL_CALL RootItemContainer::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL RootItemContainer::getTypes(  )
 {
     return comphelper::concatSequences(
         RootItemContainer_BASE::getTypes(),
@@ -140,7 +140,7 @@ Reference< XIndexAccess > RootItemContainer::deepCopyContainer( const Reference<
 }
 
 // XUnoTunnel
-sal_Int64 RootItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 RootItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier )
 {
     if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( RootItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) )
         return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ));
@@ -166,7 +166,6 @@ RootItemContainer* RootItemContainer::GetImplementation( const css::uno::Referen
 
 // XElementAccess
 sal_Bool SAL_CALL RootItemContainer::hasElements()
-throw ( RuntimeException, std::exception )
 {
     ShareGuard aLock( m_aShareMutex );
     return ( !m_aItemVector.empty() );
@@ -174,14 +173,12 @@ throw ( RuntimeException, std::exception )
 
 // XIndexAccess
 sal_Int32 SAL_CALL RootItemContainer::getCount()
-throw ( RuntimeException, std::exception )
 {
     ShareGuard aLock( m_aShareMutex );
     return m_aItemVector.size();
 }
 
 Any SAL_CALL RootItemContainer::getByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     ShareGuard aLock( m_aShareMutex );
     if ( sal_Int32( m_aItemVector.size()) > Index )
@@ -192,7 +189,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
 
 // XIndexContainer
 void SAL_CALL RootItemContainer::insertByIndex( sal_Int32 Index, const Any& aItem )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     Sequence< PropertyValue > aSeq;
     if ( aItem >>= aSeq )
@@ -214,7 +210,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
 }
 
 void SAL_CALL RootItemContainer::removeByIndex( sal_Int32 nIndex )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     ShareGuard aLock( m_aShareMutex );
     if ( (sal_Int32)m_aItemVector.size() > nIndex )
@@ -226,7 +221,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
 }
 
 void SAL_CALL RootItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     Sequence< PropertyValue > aSeq;
     if ( aItem >>= aSeq )
@@ -242,13 +236,11 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
 }
 
 Reference< XInterface > SAL_CALL RootItemContainer::createInstanceWithContext( const Reference< XComponentContext >& )
-throw ( Exception, RuntimeException, std::exception)
 {
     return static_cast<OWeakObject *>(new ItemContainer( m_aShareMutex ));
 }
 
 Reference< XInterface > SAL_CALL RootItemContainer::createInstanceWithArgumentsAndContext( const Sequence< Any >&, const Reference< XComponentContext >& )
-throw (Exception, RuntimeException, std::exception)
 {
     return static_cast<OWeakObject *>(new ItemContainer( m_aShareMutex ));
 }
@@ -258,7 +250,6 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any&       aConve
                                                                Any&       aOldValue       ,
                                                                sal_Int32  nHandle         ,
                                                                const Any& aValue             )
-throw( css::lang::IllegalArgumentException )
 {
     //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
@@ -281,7 +272,6 @@ throw( css::lang::IllegalArgumentException )
 
 void SAL_CALL RootItemContainer::setFastPropertyValue_NoBroadcast( sal_Int32               nHandle ,
                                                                    const css::uno::Any&    aValue  )
-throw( css::uno::Exception, std::exception )
 {
     switch( nHandle )
     {
@@ -329,7 +319,6 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( css::uno::Any& aValue  ,
 }
 
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL RootItemContainer::getPropertySetInfo()
-throw (css::uno::RuntimeException, std::exception)
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index eef64d29da80..63d9fe0f1698 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -48,7 +48,7 @@ DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor()
 }
 
 //  XDockingAreaAcceptor
-css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow()
 {
     SolarMutexGuard g;
 
@@ -60,7 +60,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::ge
     return xContainerWindow;
 }
 
-sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace )
 {
     // Try to "lock" the frame for access to taskscontainer.
     css::uno::Reference< XFrame > xFrame( m_xOwner );
@@ -93,7 +93,7 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css
     return false;
 }
 
-void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace )
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index f120a79380f4..cb5eed5a9e18 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -49,7 +49,7 @@ OComponentAccess::~OComponentAccess()
 }
 
 //  XEnumerationAccess
-css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception )
+css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration()
 {
     SolarMutexGuard g;
 
@@ -76,7 +76,7 @@ css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration
 }
 
 //  XElementAccess
-Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::exception )
+Type SAL_CALL OComponentAccess::getElementType()
 {
     // Elements in list an enumeration are components!
     // Return the uno-type of XComponent.
@@ -84,7 +84,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e
 }
 
 //  XElementAccess
-sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OComponentAccess::hasElements()
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 9f4768c26b2f..673a0a3fc6df 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -45,7 +45,7 @@ OComponentEnumeration::~OComponentEnumeration()
 }
 
 //  XEventListener
-void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent )
 {
     SolarMutexGuard g;
 
@@ -59,7 +59,7 @@ void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) thro
 }
 
 //  XEnumeration
-sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements()
 {
     SolarMutexGuard g;
 
@@ -72,9 +72,7 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti
 
 //  XEnumeration
 
-Any SAL_CALL OComponentEnumeration::nextElement() throw(    NoSuchElementException  ,
-                                                             WrappedTargetException ,
-                                                            RuntimeException, std::exception        )
+Any SAL_CALL OComponentEnumeration::nextElement()
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index f243584b1e97..ee23298f99fc 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -57,7 +57,7 @@ OFrames::~OFrames()
 }
 
 //  XFrames
-void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
+void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame )
 {
     SolarMutexGuard g;
 
@@ -80,7 +80,7 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr
 }
 
 //  XFrames
-void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
+void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame )
 {
     SolarMutexGuard g;
 
@@ -104,7 +104,7 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr
 }
 
 //  XFrames
-Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception )
+Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags )
 {
     SolarMutexGuard g;
 
@@ -202,7 +202,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
 }
 
 //  XIndexAccess
-sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL OFrames::getCount()
 {
     SolarMutexGuard g;
 
@@ -224,9 +224,7 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
 
 //  XIndexAccess
 
-Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException   ,
-                                                            WrappedTargetException      ,
-                                                            RuntimeException, std::exception            )
+Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex )
 {
     SolarMutexGuard g;
 
@@ -253,14 +251,14 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
 }
 
 //  XElementAccess
-Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception )
+Type SAL_CALL OFrames::getElementType()
 {
     // This "container" support XFrame-interfaces only!
     return cppu::UnoType<XFrame>::get();
 }
 
 //  XElementAccess
-sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OFrames::hasElements()
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 6cfb1f075c00..537fa79fc81d 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -48,8 +48,6 @@ PersistentWindowState::~PersistentWindowState()
 }
 
 void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     // check arguments
     css::uno::Reference< css::frame::XFrame > xFrame;
@@ -76,7 +74,6 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u
 }
 
 void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // We don't want to do this stuff when being used through LibreOfficeKit
     if( comphelper::LibreOfficeKit::isActive() )
@@ -139,7 +136,6 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv
 }
 
 void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // nothing todo here - because we hold the frame as weak reference only
 }
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index fc0ecb7f2f85..134a6f5a2448 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -35,7 +35,6 @@ StatusIndicator::~StatusIndicator()
 
 void SAL_CALL StatusIndicator::start(const OUString& sText ,
                                      sal_Int32       nRange)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (comphelper::LibreOfficeKit::isActive())
     {
@@ -54,7 +53,6 @@ void SAL_CALL StatusIndicator::start(const OUString& sText ,
 }
 
 void SAL_CALL StatusIndicator::end()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (comphelper::LibreOfficeKit::isActive())
     {
@@ -70,7 +68,6 @@ void SAL_CALL StatusIndicator::end()
 }
 
 void SAL_CALL StatusIndicator::reset()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (comphelper::LibreOfficeKit::isActive())
         return;
@@ -84,7 +81,6 @@ void SAL_CALL StatusIndicator::reset()
 }
 
 void SAL_CALL StatusIndicator::setText(const OUString& sText)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (comphelper::LibreOfficeKit::isActive())
         return;
@@ -98,7 +94,6 @@ void SAL_CALL StatusIndicator::setText(const OUString& sText)
 }
 
 void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (comphelper::LibreOfficeKit::isActive())
     {
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 9f4d658ed2c4..bb385f0b70ed 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -67,8 +67,6 @@ StatusIndicatorFactory::~StatusIndicatorFactory()
 }
 
 void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     if (lArguments.getLength() > 0) {
         osl::MutexGuard g(m_mutex);
@@ -102,7 +100,6 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::
 }
 
 css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFactory::createStatusIndicator()
-    throw(css::uno::RuntimeException, std::exception)
 {
     StatusIndicator* pIndicator = new StatusIndicator(this);
     css::uno::Reference< css::task::XStatusIndicator > xIndicator(static_cast< ::cppu::OWeakObject* >(pIndicator), css::uno::UNO_QUERY_THROW);
@@ -111,7 +108,6 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFacto
 }
 
 void SAL_CALL StatusIndicatorFactory::update()
-    throw(css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_mutex);
     m_bAllowReschedule = true;
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index 47eb85bdedbb..a71b613f8d45 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -46,8 +46,6 @@ TagWindowAsModified::~TagWindowAsModified()
 }
 
 void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::frame::XFrame > xFrame;
 
@@ -67,7 +65,6 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno
 }
 
 void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::util::XModifiable > xModel;
     css::uno::Reference< css::awt::XWindow >      xWindow;
@@ -105,7 +102,6 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent
 }
 
 void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (
         (aEvent.Action != css::frame::FrameAction_COMPONENT_REATTACHED) &&
@@ -128,7 +124,6 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven
 }
 
 void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 0f600e5a01bd..15476a178ce2 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -60,8 +60,6 @@ TitleBarUpdate::~TitleBarUpdate()
 }
 
 void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     // check arguments
     css::uno::Reference< css::frame::XFrame > xFrame;
@@ -93,7 +91,6 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any
 }
 
 void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // we are interested on events only, which must trigger a title bar update
     // because component was changed.
@@ -108,13 +105,11 @@ void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aE
 }
 
 void SAL_CALL TitleBarUpdate::titleChanged(const css::frame::TitleChangedEvent& /* aEvent */)
-    throw (css::uno::RuntimeException, std::exception)
 {
     impl_forceUpdate ();
 }
 
 void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // nothing todo here - because we hold the frame as weak reference only
 }
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index a1ea8de92693..0a39baf25164 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -76,7 +76,7 @@ UIConfigElementWrapperBase::~UIConfigElementWrapperBase()
 {
 }
 
-Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType )
 {
     Any aRet = UIConfigElementWrapperBase_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
@@ -84,7 +84,7 @@ Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) th
     return aRet;
 }
 
-Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes(  )
 {
     return comphelper::concatSequences(
         UIConfigElementWrapperBase_BASE::getTypes(),
@@ -93,26 +93,24 @@ Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes(  ) throw(Runtime
 }
 
 // XComponent
-void SAL_CALL UIConfigElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
 {
     m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
 }
 
-void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), aListener );
 }
 
 // XEventListener
 void SAL_CALL UIConfigElementWrapperBase::disposing( const EventObject& )
-throw( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     m_xConfigSource.clear();
 }
 
 void SAL_CALL UIConfigElementWrapperBase::initialize( const Sequence< Any >& aArguments )
-throw ( Exception, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -145,22 +143,22 @@ throw ( Exception, RuntimeException, std::exception )
 }
 
 // XUpdatable
-void SAL_CALL UIConfigElementWrapperBase::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::update()
 {
     // can be implemented by derived class
 }
 
-void SAL_CALL UIConfigElementWrapperBase::elementInserted( const css::ui::ConfigurationEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::elementInserted( const css::ui::ConfigurationEvent& )
 {
     // can be implemented by derived class
 }
 
-void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const css::ui::ConfigurationEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const css::ui::ConfigurationEvent& )
 {
     // can be implemented by derived class
 }
 
-void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const css::ui::ConfigurationEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const css::ui::ConfigurationEvent& )
 {
     // can be implemented by derived class
 }
@@ -169,7 +167,7 @@ void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const css::ui::Config
 sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&       aConvertedValue ,
                                                                         Any&       aOldValue       ,
                                                                         sal_Int32  nHandle         ,
-                                                                        const Any& aValue             ) throw( css::lang::IllegalArgumentException )
+                                                                        const Any& aValue             )
 {
     //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
@@ -250,7 +248,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
 }
 
 void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast(   sal_Int32               nHandle ,
-                                                                        const css::uno::Any&    aValue  ) throw( css::uno::Exception, std::exception )
+                                                                        const css::uno::Any&    aValue  )
 {
     switch( nHandle )
     {
@@ -399,7 +397,7 @@ void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( css::uno::Any& a
     return(*pInfoHelper);
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -448,7 +446,7 @@ const css::uno::Sequence< css::beans::Property > UIConfigElementWrapperBase::imp
     // Return "PropertyDescriptor"
     return lPropertyDescriptor;
 }
-void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException, std::exception )
+void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings )
 {
     SolarMutexClearableGuard aLock;
 
@@ -486,7 +484,7 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc
 void UIConfigElementWrapperBase::impl_fillNewData()
 {
 }
-Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException, std::exception )
+Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable )
 {
     SolarMutexGuard g;
 
@@ -496,20 +494,20 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_
     return m_xConfigData;
 }
 
-Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException, std::exception)
+Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame()
 {
     SolarMutexGuard g;
     Reference< XFrame > xFrame( m_xWeakFrame );
     return xFrame;
 }
 
-OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException, std::exception)
+OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL()
 {
     SolarMutexGuard g;
     return m_aResourceURL;
 }
 
-::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException, std::exception)
+::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType()
 {
     SolarMutexGuard g;
     return m_nType;
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index e3def0119a1d..cfb48e553f37 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -57,7 +57,7 @@ UIElementWrapperBase::~UIElementWrapperBase()
 {
 }
 
-Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType )
 {
     Any aRet = UIElementWrapperBase_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
@@ -65,7 +65,7 @@ Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(Ru
     return aRet;
 }
 
-Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes(  )
 {
     return comphelper::concatSequences(
         UIElementWrapperBase_BASE::getTypes(),
@@ -73,18 +73,17 @@ Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes(  ) throw(RuntimeExcept
     );
 }
 
-void SAL_CALL UIElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
 {
     m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
 }
 
-void SAL_CALL UIElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
 }
 
 void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArguments )
-throw ( Exception, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -111,24 +110,24 @@ throw ( Exception, RuntimeException, std::exception )
 }
 
 // XUIElement
-css::uno::Reference< css::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame()
 {
     css::uno::Reference< css::frame::XFrame > xFrame( m_xWeakFrame );
     return xFrame;
 }
 
-OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL UIElementWrapperBase::getResourceURL()
 {
     return m_aResourceURL;
 }
 
-::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (css::uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL UIElementWrapperBase::getType()
 {
     return m_nType;
 }
 
 // XUpdatable
-void SAL_CALL UIElementWrapperBase::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIElementWrapperBase::update()
 {
     // can be implemented by derived class
 }
@@ -137,7 +136,7 @@ void SAL_CALL UIElementWrapperBase::update() throw (css::uno::RuntimeException,
 sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any&       /*aConvertedValue*/ ,
                                                                   Any&       /*aOldValue*/       ,
                                                                   sal_Int32  /*nHandle*/         ,
-                                                                  const Any& /*aValue*/             ) throw( css::lang::IllegalArgumentException )
+                                                                  const Any& /*aValue*/             )
 {
     //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
@@ -145,7 +144,7 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any&       /*a
 }
 
 void SAL_CALL UIElementWrapperBase::setFastPropertyValue_NoBroadcast(   sal_Int32               /*nHandle*/ ,
-                                                                        const css::uno::Any&    /*aValue*/  ) throw( css::uno::Exception, std::exception )
+                                                                        const css::uno::Any&    /*aValue*/  )
 {
 }
 
@@ -193,7 +192,7 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( css::uno::Any& aValue
     return(*pInfoHelper);
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo()
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 1ca763ed5cd7..5a83fe6d8776 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -42,7 +42,6 @@ VCLStatusIndicator::~VCLStatusIndicator()
 
 void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
                                               sal_Int32        nRange)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
 
@@ -67,7 +66,6 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
 }
 
 void SAL_CALL VCLStatusIndicator::reset()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     if (m_pStatusBar)
@@ -78,7 +76,6 @@ void SAL_CALL VCLStatusIndicator::reset()
 }
 
 void SAL_CALL VCLStatusIndicator::end()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
 
@@ -96,7 +93,6 @@ void SAL_CALL VCLStatusIndicator::end()
 }
 
 void SAL_CALL VCLStatusIndicator::setText(const OUString& sText)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     m_sText = sText;
@@ -105,7 +101,6 @@ void SAL_CALL VCLStatusIndicator::setText(const OUString& sText)
 }
 
 void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
 
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index ca2bae697177..bf141896591b 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -98,79 +98,49 @@ class XMLBasedAcceleratorConfiguration : public    ::cppu::WeakImplHelper<
     public:
 
         // XAcceleratorConfiguration
-        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() override;
 
-        virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
-            throw(css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception            ) override;
+        virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) override;
 
         virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
-            const OUString&    sCommand )
-            throw(css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception         ) override;
+            const OUString&    sCommand ) override;
 
-        virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
-            throw(css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception            ) override;
+        virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) override;
 
-        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
-            throw(css::lang::IllegalArgumentException   ,
-            css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception            ) override;
+        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) override;
 
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
-            throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-                   css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) override;
 
-        virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
-            throw(css::lang::IllegalArgumentException   ,
-            css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception            ) override;
+        virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) override;
 
         // XUIConfigurationPersistence
-        virtual void SAL_CALL reload()
-            throw(css::uno::Exception       ,
-            css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL reload() override;
 
-        virtual void SAL_CALL store()
-            throw(css::uno::Exception       ,
-            css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL store() override;
 
-        virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-            throw(css::uno::Exception       ,
-            css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
 
-        virtual sal_Bool SAL_CALL isModified()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isModified() override;
 
-        virtual sal_Bool SAL_CALL isReadOnly()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isReadOnly() override;
 
         // XUIConfigurationStorage
-        virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
 
-        virtual sal_Bool SAL_CALL hasStorage()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasStorage() override;
 
         // XUIConfiguration
-        virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) override;
 
-        virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) override;
 
         // XReset
         // TODO use XPresetHandler instead if available
-        virtual void SAL_CALL reset()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL reset() override;
 
-        virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) override;
 
-        virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) override;
 
         // called when changes occurred in the storage
         void changesOccurred();
@@ -267,92 +237,60 @@ class XCUBasedAcceleratorConfiguration : public  ::cppu::WeakImplHelper<
     public:
 
         // XAcceleratorConfiguration
-        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() override;
 
-        virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
-            throw(css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception            ) override;
+        virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) override;
 
         virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
-            const OUString&    sCommand )
-            throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-                   css::uno::RuntimeException, std::exception) override;
+            const OUString&    sCommand ) override;
 
-        virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
-            throw(css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception            ) override;
+        virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) override;
 
-        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
-            throw(css::lang::IllegalArgumentException   ,
-            css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception            ) override;
+        virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) override;
 
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
-            throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-                  css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) override;
 
-        virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
-            throw(css::lang::IllegalArgumentException   ,
-            css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception            ) override;
+        virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) override;
 
         // XUIConfigurationPersistence
-        virtual void SAL_CALL reload()
-            throw(css::uno::Exception       ,
-            css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL reload() override;
 
-        virtual void SAL_CALL store()
-            throw(css::uno::Exception       ,
-            css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL store() override;
 
-        virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-            throw(css::uno::Exception       ,
-            css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
 
-        virtual sal_Bool SAL_CALL isModified()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isModified() override;
 
-        virtual sal_Bool SAL_CALL isReadOnly()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isReadOnly() override;
 
         // XUIConfigurationStorage
-        virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
 
-        virtual sal_Bool SAL_CALL hasStorage()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasStorage() override;
 
         // XUIConfiguration
-        virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) override;
 
-        virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) override;
 
         // XReset
         // TODO use XPresetHandler instead if available
-        virtual void SAL_CALL reset()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL reset() override;
 
-        virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) override;
 
-        virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) override;
 
         // css.util.XChangesListener
-        virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override;
 
         // css.lang.XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
         // XComponent
-        virtual  void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual  void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual  void SAL_CALL dispose() override;
+        virtual  void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual  void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
         // helper for derived classes
 
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index d86917ead052..639d6e09a9d7 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -91,8 +91,7 @@ class KeyMapping
                     if the given identifier does not describe
                     a well known key code.
          */
-        sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier)
-            throw(css::lang::IllegalArgumentException);
+        sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier);
 
         /** @short  return a suitable key identifier
                     for the specified key code.
diff --git a/framework/source/inc/dispatch/dispatchdisabler.hxx b/framework/source/inc/dispatch/dispatchdisabler.hxx
index b41d7af00221..cbc7dffaf13c 100644
--- a/framework/source/inc/dispatch/dispatchdisabler.hxx
+++ b/framework/source/inc/dispatch/dispatchdisabler.hxx
@@ -48,67 +48,50 @@ public:
              DispatchDisabler(const css::uno::Reference< css::uno::XComponentContext >& rxContext);
 
     // XInitialization
-    virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments )
-        throw (::css::uno::Exception, ::css::uno::RuntimeException, ::std::exception) override;
+    virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments ) override;
 
     // XDispatchProvider
     virtual ::css::uno::Reference< ::css::frame::XDispatch > SAL_CALL
         queryDispatch( const ::css::util::URL& URL,
                const OUString& TargetFrameName,
-               ::sal_Int32 SearchFlags )
-           throw (::css::uno::RuntimeException, ::std::exception) override;
+               ::sal_Int32 SearchFlags ) override;
     virtual ::css::uno::Sequence< ::css::uno::Reference< ::css::frame::XDispatch > > SAL_CALL
-        queryDispatches( const ::css::uno::Sequence< ::css::frame::DispatchDescriptor >& Requests )
-           throw (::css::uno::RuntimeException, ::std::exception) override;
+        queryDispatches( const ::css::uno::Sequence< ::css::frame::DispatchDescriptor >& Requests ) override;
 
     // XDispatchProviderInterceptor
     virtual ::css::uno::Reference< ::css::frame::XDispatchProvider > SAL_CALL
-        getSlaveDispatchProvider() throw (::css::uno::RuntimeException, ::std::exception) override;
+        getSlaveDispatchProvider() override;
     virtual void SAL_CALL
-        setSlaveDispatchProvider( const ::css::uno::Reference< ::css::frame::XDispatchProvider >& NewDispatchProvider )
-            throw (::css::uno::RuntimeException, ::std::exception) override;
+        setSlaveDispatchProvider( const ::css::uno::Reference< ::css::frame::XDispatchProvider >& NewDispatchProvider ) override;
     virtual ::css::uno::Reference< ::css::frame::XDispatchProvider > SAL_CALL
-        getMasterDispatchProvider() throw (::css::uno::RuntimeException, ::std::exception) override;
+        getMasterDispatchProvider() override;
     virtual void SAL_CALL
-        setMasterDispatchProvider( const ::css::uno::Reference< ::css::frame::XDispatchProvider >& NewSupplier )
-            throw (::css::uno::RuntimeException, ::std::exception) override;
+        setMasterDispatchProvider( const ::css::uno::Reference< ::css::frame::XDispatchProvider >& NewSupplier ) override;
 
     // XInterceptorInfo
     virtual ::css::uno::Sequence< OUString > SAL_CALL
-        getInterceptedURLs() throw (::css::uno::RuntimeException, ::std::exception) override;
+        getInterceptedURLs() override;
 
     // XElementAccess
-    virtual ::css::uno::Type SAL_CALL getElementType()
-        throw (::css::uno::RuntimeException, ::std::exception) override;
-    virtual ::sal_Bool SAL_CALL hasElements()
-        throw (::css::uno::RuntimeException, ::std::exception) override;
+    virtual ::css::uno::Type SAL_CALL getElementType() override;
+    virtual ::sal_Bool SAL_CALL hasElements() override;
 
     // XNameAccess
-    virtual ::css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw (::css::container::NoSuchElementException, ::css::lang::WrappedTargetException,
-               ::css::uno::RuntimeException, ::std::exception) override;
-    virtual ::css::uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw (::css::uno::RuntimeException, ::std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw (::css::uno::RuntimeException, ::std::exception) override;
+    virtual ::css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual ::css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const ::css::uno::Any& aElement )
-        throw (::css::lang::IllegalArgumentException, ::css::container::NoSuchElementException,
-               ::css::lang::WrappedTargetException, ::css::uno::RuntimeException, ::std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const ::css::uno::Any& aElement ) override;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const ::css::uno::Any& aElement )
-        throw (::css::lang::IllegalArgumentException, ::css::container::ElementExistException,
-               ::css::lang::WrappedTargetException, ::css::uno::RuntimeException, ::std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw (::css::container::NoSuchElementException, ::css::lang::WrappedTargetException,
-               ::css::uno::RuntimeException, ::std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const ::css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     DECLARE_XSERVICEINFO_NOFACTORY
     /* Helper for registry */
     /// @throws css::uno::Exception
-    static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+    static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
     static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 };
 
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 9d49e46b711a..c368b37fb626 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -98,26 +98,21 @@ class LoadDispatcher : public  ::cppu::WeakImplHelper< css::frame::XNotifyingDis
         // XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                        const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
-                                                       const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override;
+                                                       const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
 
         // XDispatch
         virtual void SAL_CALL dispatch(const css::util::URL&                                  aURL      ,
-                                       const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
-            throw(css::uno::RuntimeException, std::exception) override;
+                                       const css::uno::Sequence< css::beans::PropertyValue >& lArguments) override;
 
         virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
-                                                const css::util::URL&                                     aURL     )
-            throw(css::uno::RuntimeException, std::exception) override;
+                                                const css::util::URL&                                     aURL     ) override;
 
         virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
-                                                   const css::util::URL&                                     aURL     )
-            throw(css::uno::RuntimeException, std::exception) override;
+                                                   const css::util::URL&                                     aURL     ) override;
 
         // XSynchronousDispatch
         virtual css::uno::Any SAL_CALL dispatchWithReturnValue( const css::util::URL&                                  aURL      ,
-                                                                const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-            throw( css::uno::RuntimeException, std::exception ) override;
+                                                                const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
 
     private:
         css::uno::Any impl_dispatch( const css::util::URL& rURL,
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index bf6dfc1ff32d..3597547675c1 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -206,8 +206,7 @@ public:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime can't be used any longer.
      */
-    LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext)
-        throw(LoadEnvException, css::uno::RuntimeException);
+    LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
     /** @short  deinitialize an instance of this class in the right way.
      */
@@ -221,10 +220,7 @@ public:
                                                                              const OUString&                                        sURL   ,
                                                                              const OUString&                                        sTarget,
                                                                                    sal_Int32                                               nFlags ,
-                                                                             const css::uno::Sequence< css::beans::PropertyValue >&        lArgs  )
-        throw(css::lang::IllegalArgumentException,
-              css::io::IOException               ,
-              css::uno::RuntimeException         );
+                                                                             const css::uno::Sequence< css::beans::PropertyValue >&        lArgs  );
 
     /** @short  set some changeable parameters for a new load request.
 
@@ -377,8 +373,7 @@ public:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime can't be used any longer.
      */
-    void impl_reactForLoadingState()
-        throw(LoadEnvException, css::uno::RuntimeException);
+    void impl_reactForLoadingState();
 
 private:
 
@@ -400,8 +395,7 @@ private:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime can't be used any longer.
      */
-    void impl_detectTypeAndFilter()
-        throw(LoadEnvException, css::uno::RuntimeException, std::exception);
+    void impl_detectTypeAndFilter();
 
     /** @short  tries to use ContentHandler objects for loading.
 
@@ -421,8 +415,7 @@ private:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime can't be used any longer.
      */
-    bool impl_handleContent()
-        throw(LoadEnvException, css::uno::RuntimeException, std::exception);
+    bool impl_handleContent();
 
     /** @short  tries to use FrameLoader objects for loading.
 
@@ -440,8 +433,7 @@ private:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime can't be used any longer.
      */
-    bool impl_loadContent()
-        throw(LoadEnvException, css::uno::RuntimeException, std::exception);
+    bool impl_loadContent();
 
     /** @short  checks if the specified content is already loaded.
 
@@ -466,8 +458,7 @@ private:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime can't be used any longer.
      */
-    css::uno::Reference< css::frame::XFrame > impl_searchAlreadyLoaded()
-        throw(LoadEnvException, css::uno::RuntimeException);
+    css::uno::Reference< css::frame::XFrame > impl_searchAlreadyLoaded();
 
     /** @short  search for any target frame, which seems to be useable
                 for this load request.
@@ -497,8 +488,7 @@ private:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime can't be used any longer.
      */
-    css::uno::Reference< css::frame::XFrame > impl_searchRecycleTarget()
-        throw(LoadEnvException, css::uno::RuntimeException, std::exception);
+    css::uno::Reference< css::frame::XFrame > impl_searchRecycleTarget();
 
     /** @short  because showing of a frame is needed more than once...
                 it's implemented as an separate method .-)
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index e25aa308986d..202a9ae18d49 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -39,7 +39,7 @@ QuietInteraction::QuietInteraction()
 {
 }
 
-void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
 {
     // safe the request for outside analyzing every time!
     css::uno::Any aRequest = xRequest->getRequest();
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 8acf25982587..8384ae363aa9 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -104,9 +104,6 @@ HelpOnStartup::~HelpOnStartup()
 
 // css.task.XJob
 css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
-    throw(css::lang::IllegalArgumentException,
-          css::uno::Exception                ,
-          css::uno::RuntimeException, std::exception         )
 {
     // Analyze the given arguments; try to locate a model there and
     // classify it's used application module.
@@ -150,7 +147,6 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea
 }
 
 void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_mutex);
     if (aEvent.Source == m_xModuleManager)
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 935c79c073c4..be7ab2137b3c 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -619,7 +619,7 @@ void Job::impl_stopListening()
                 its results
 */
 void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAsyncJob >& xJob    ,
-                                /*IN*/ const css::uno::Any&                               aResult ) throw(css::uno::RuntimeException, std::exception)
+                                /*IN*/ const css::uno::Any&                               aResult )
 {
     SolarMutexGuard g;
 
@@ -657,8 +657,7 @@ void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAs
     @throw  TerminateVetoException
                 if our internal wrapped job is still running.
  */
-void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) throw(css::frame::TerminationVetoException,
-                                                                                         css::uno::RuntimeException, std::exception          )
+void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& )
 {
     SolarMutexGuard g;
 
@@ -694,7 +693,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro
     @param  aEvent
                 describes the broadcaster and must be the desktop instance
  */
-void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& )
 {
     die();
     // Do nothing else here. Our internal resources was released ...
@@ -719,8 +718,7 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr
                 if our internal wrapped job is still running.
  */
 void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent         ,
-                                       sal_Bool                bGetsOwnership ) throw(css::util::CloseVetoException,
-                                                                                      css::uno::RuntimeException, std::exception   )
+                                       sal_Bool                bGetsOwnership )
 {
     SolarMutexGuard g;
 
@@ -788,7 +786,7 @@ void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent         ,
     @param  aEvent
             describes the broadcaster and must be the frame or model instance we know
  */
-void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL Job::notifyClosing( const css::lang::EventObject& )
 {
     die();
     // Do nothing else here. Our internal resources was released ...
@@ -802,7 +800,7 @@ void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno
     @param      aEvent
                 describe the broadcaster
 */
-void SAL_CALL Job::disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL Job::disposing( const css::lang::EventObject& aEvent )
 {
     /* SAFE { */
     SolarMutexClearableGuard aWriteLock;
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index e11c8228b6f8..bb67e08af31a 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -90,47 +90,43 @@ public:
                                const css::uno::Reference< css::frame::XDispatchResultListener >& xListener );
 
 public:
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.jobs.JobDispatch");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.ProtocolHandler" };
         return aSeq;
     }
 
     // Xinitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw(css::uno::Exception       ,
-                                                                                                    css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) override;
 
     // XDispatchProvider
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL             ,
                                                                                                          const OUString&                                      sTargetFrameName ,
-                                                                                                               sal_Int32                                             nSearchFlags     ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor      ) throw(css::uno::RuntimeException, std::exception) override;
+                                                                                                               sal_Int32                                             nSearchFlags     ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor      ) override;
 
     // XNotifyingDispatch
     virtual void SAL_CALL dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                     const css::uno::Sequence< css::beans::PropertyValue >&            lArgs     ,
-                                                    const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+                                                    const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
 
     // XDispatch
     virtual void SAL_CALL dispatch            ( const css::util::URL&                                     aURL      ,
-                                                const css::uno::Sequence< css::beans::PropertyValue >&    lArgs     ) throw(css::uno::RuntimeException, std::exception) override;
+                                                const css::uno::Sequence< css::beans::PropertyValue >&    lArgs     ) override;
     virtual void SAL_CALL addStatusListener   ( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
-                                                const css::util::URL&                                     aURL      ) throw(css::uno::RuntimeException, std::exception) override;
+                                                const css::util::URL&                                     aURL      ) override;
     virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
-                                                    const css::util::URL&                                     aURL      ) throw(css::uno::RuntimeException, std::exception) override;
+                                                    const css::util::URL&                                     aURL      ) override;
 };
 
 /**
@@ -165,8 +161,7 @@ JobDispatch::~JobDispatch()
                 the list of initialization arguments
                 First parameter should be the frame reference we need.
 */
-void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw(css::uno::Exception       ,
-                                                                                                     css::uno::RuntimeException, std::exception)
+void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >& lArguments )
 {
     SolarMutexGuard g;
 
@@ -207,7 +202,7 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >
 */
 css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch( /*IN*/ const css::util::URL&  aURL             ,
                                                                                   /*IN*/ const OUString& /*sTargetFrameName*/ ,
-                                                                                  /*IN*/       sal_Int32        /*nSearchFlags*/     ) throw(css::uno::RuntimeException, std::exception)
+                                                                                  /*IN*/       sal_Int32        /*nSearchFlags*/     )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatch;
 
@@ -230,7 +225,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch
             NULL references are not skipped. Every result
             match to one given descriptor item.
 */
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobDispatch::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobDispatch::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
 {
     // don't pack resulting list!
     sal_Int32 nCount = lDescriptor.getLength();
@@ -269,7 +264,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobD
 */
 void SAL_CALL JobDispatch::dispatchWithNotification( /*IN*/ const css::util::URL&                                             aURL      ,
                                                      /*IN*/ const css::uno::Sequence< css::beans::PropertyValue >&            lArgs     ,
-                                                     /*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception)
+                                                     /*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
 {
     JobURL aAnalyzedURL(aURL.Complete);
     if (aAnalyzedURL.isValid())
@@ -483,7 +478,7 @@ void JobDispatch::impl_dispatchAlias( /*IN*/ const OUString&
     @see    dispatchWithNotification()
 */
 void SAL_CALL JobDispatch::dispatch( /*IN*/ const css::util::URL&                                  aURL  ,
-                                     /*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) throw(css::uno::RuntimeException, std::exception)
+                                     /*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
 {
     dispatchWithNotification(aURL, lArgs, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
@@ -492,7 +487,7 @@ void SAL_CALL JobDispatch::dispatch( /*IN*/ const css::util::URL&
     @short  not supported
 */
 void SAL_CALL JobDispatch::addStatusListener( /*IN*/ const css::uno::Reference< css::frame::XStatusListener >&,
-                                              /*IN*/ const css::util::URL&                                      ) throw(css::uno::RuntimeException, std::exception)
+                                              /*IN*/ const css::util::URL&                                      )
 {
 }
 
@@ -500,7 +495,7 @@ void SAL_CALL JobDispatch::addStatusListener( /*IN*/ const css::uno::Reference<
     @short  not supported
 */
 void SAL_CALL JobDispatch::removeStatusListener( /*IN*/ const css::uno::Reference< css::frame::XStatusListener >&,
-                                                 /*IN*/ const css::util::URL&                                          ) throw(css::uno::RuntimeException, std::exception)
+                                                 /*IN*/ const css::util::URL&                                          )
 {
 }
 
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 462f47ca8973..11f5c9bfb6fd 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -86,40 +86,37 @@ public:
     explicit JobExecutor(const css::uno::Reference< css::uno::XComponentContext >& xContext);
     virtual ~JobExecutor() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.JobExecutor");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.task.JobExecutor"};
     }
 
     // task.XJobExecutor
-    virtual void SAL_CALL trigger( const OUString& sEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL trigger( const OUString& sEvent ) override;
 
     /// Initialization function after having acquire()'d.
     void initListeners();
 
     // document.XEventListener
-    virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) override;
 
     // container.XContainerListener
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& aEvent ) override;
+    virtual void SAL_CALL elementRemoved ( const css::container::ContainerEvent& aEvent ) override;
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& aEvent ) override;
 
     // lang.XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 };
 
 /**
@@ -200,7 +197,7 @@ void JobExecutor::disposing() {
     @param  sEvent
                 is used to locate registered jobs
  */
-void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::trigger( const OUString& sEvent )
 {
     SAL_INFO( "fwk", "JobExecutor::trigger()");
 
@@ -247,7 +244,7 @@ void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::Run
     }
 }
 
-void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent )
 {
     OUString EVENT_ON_DOCUMENT_OPENED("onDocumentOpened");   // Job UI  event : OnNew    or OnLoad
     OUString EVENT_ON_DOCUMENT_ADDED("onDocumentAdded");     // Job API event : OnCreate or OnLoadFinished
@@ -330,7 +327,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
     }
 }
 
-void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent )
 {
     OUString sValue;
     if (aEvent.Accessor >>= sValue)
@@ -345,7 +342,7 @@ void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent
     }
 }
 
-void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent& aEvent )
 {
     OUString sValue;
     if (aEvent.Accessor >>= sValue)
@@ -360,7 +357,7 @@ void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent
     }
 }
 
-void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent& ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent& )
 {
     // I'm not interested on changed items :-)
 }
@@ -379,7 +376,7 @@ void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent
                 reference ... SOLUTION => check the given event source and react only, if it's our internal
                 hold configuration object!
  */
-void SAL_CALL JobExecutor::disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::disposing( const css::lang::EventObject& aEvent )
 {
     /* SAFE { */
     osl::MutexGuard g(rBHelper.rMutex);
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index ebad3a570667..fc4a16158c7e 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -65,9 +65,6 @@ ShellJob::~ShellJob()
 }
 
 css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::NamedValue >& lJobArguments)
-    throw(css::lang::IllegalArgumentException,
-          css::uno::Exception                ,
-          css::uno::RuntimeException, std::exception         )
 {
     ::comphelper::SequenceAsHashMap lArgs  (lJobArguments);
     /** address job configuration inside argument set provided on method execute(). */
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 606b06d229b4..efec9ece7cef 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1135,7 +1135,6 @@ void LayoutManager::implts_setOffset( const sal_Int32 nBottomOffset )
 }
 
 void LayoutManager::implts_setInplaceMenuBar( const Reference< XIndexAccess >& xMergedMenuBar )
-throw (uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aWriteLock;
@@ -1180,7 +1179,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void LayoutManager::implts_resetInplaceMenuBar()
-throw (uno::RuntimeException)
 {
     SolarMutexGuard g;
     m_bInplaceMenuSet = false;
@@ -1211,14 +1209,12 @@ throw (uno::RuntimeException)
 }
 
 void SAL_CALL LayoutManager::attachFrame( const Reference< XFrame >& xFrame )
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     m_xFrame = xFrame;
 }
 
 void SAL_CALL LayoutManager::reset()
-throw (RuntimeException, std::exception)
 {
     implts_reset( true );
 }
@@ -1227,7 +1223,6 @@ throw (RuntimeException, std::exception)
 
 sal_Bool SAL_CALL LayoutManager::setMergedMenuBar(
     const Reference< XIndexAccess >& xMergedMenuBar )
-throw (uno::RuntimeException, std::exception)
 {
     implts_setInplaceMenuBar( xMergedMenuBar );
 
@@ -1237,27 +1232,23 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL LayoutManager::removeMergedMenuBar()
-throw (uno::RuntimeException, std::exception)
 {
     implts_resetInplaceMenuBar();
 }
 
 awt::Rectangle SAL_CALL LayoutManager::getCurrentDockingArea()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     return m_aDockingArea;
 }
 
 Reference< XDockingAreaAcceptor > SAL_CALL LayoutManager::getDockingAreaAcceptor()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_xDockingAreaAcceptor;
 }
 
 void SAL_CALL LayoutManager::setDockingAreaAcceptor( const Reference< ui::XDockingAreaAcceptor >& xDockingAreaAcceptor )
-throw ( RuntimeException, std::exception )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aWriteLock;
@@ -1417,7 +1408,6 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclWindowEvent&, rEvent, void )
 }
 
 void SAL_CALL LayoutManager::createElement( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::createElement" );
 
@@ -1551,7 +1541,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL LayoutManager::destroyElement( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::destroyElement" );
 
@@ -1620,7 +1609,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::requestElement( const OUString& rResourceURL )
-throw (uno::RuntimeException, std::exception)
 {
     bool            bResult( false );
     bool            bNotify( false );
@@ -1697,7 +1685,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 Reference< XUIElement > SAL_CALL LayoutManager::getElement( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     Reference< XUIElement > xUIElement = implts_findElement( aName );
     if ( !xUIElement.is() )
@@ -1714,7 +1701,6 @@ throw (RuntimeException, std::exception)
 }
 
 Sequence< Reference< ui::XUIElement > > SAL_CALL LayoutManager::getElements()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexClearableGuard aReadLock;
     uno::Reference< ui::XUIElement >  xMenuBar( m_xMenuBar );
@@ -1750,7 +1736,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::showElement( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::showElement" );
 
@@ -1828,7 +1813,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::hideElement( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::hideElement" );
 
@@ -1913,7 +1897,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::dockWindow( const OUString& aName, DockingArea DockingArea, const awt::Point& Pos )
-throw (RuntimeException, std::exception)
 {
     OUString aElementType;
     OUString aElementName;
@@ -1935,7 +1918,7 @@ throw (RuntimeException, std::exception)
     return false;
 }
 
-sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ )
 {
     SolarMutexClearableGuard aReadLock;
     bool bResult( false );
@@ -1952,7 +1935,6 @@ sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ )
 }
 
 sal_Bool SAL_CALL LayoutManager::floatWindow( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     bool bResult( false );
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -1972,7 +1954,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::lockWindow( const OUString& aName )
-throw (uno::RuntimeException, std::exception)
 {
     bool bResult( false );
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -1992,7 +1973,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::unlockWindow( const OUString& aName )
-throw (uno::RuntimeException, std::exception)
 {
     bool bResult( false );
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2012,7 +1992,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL LayoutManager::setElementSize( const OUString& aName, const awt::Size& aSize )
-throw (RuntimeException, std::exception)
 {
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
     {
@@ -2030,7 +2009,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL LayoutManager::setElementPos( const OUString& aName, const awt::Point& aPos )
-throw (RuntimeException, std::exception)
 {
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
     {
@@ -2048,7 +2026,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL LayoutManager::setElementPosSize( const OUString& aName, const awt::Point& aPos, const awt::Size& aSize )
-throw (RuntimeException, std::exception)
 {
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
     {
@@ -2066,7 +2043,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::isElementVisible( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     OUString aElementType;
     OUString aElementName;
@@ -2141,7 +2117,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::isElementFloating( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
     {
@@ -2157,7 +2132,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::isElementDocked( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
     {
@@ -2173,7 +2147,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::isElementLocked( const OUString& aName )
-throw (uno::RuntimeException, std::exception)
 {
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
     {
@@ -2189,7 +2162,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 awt::Size SAL_CALL LayoutManager::getElementSize( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
     {
@@ -2205,7 +2177,6 @@ throw (RuntimeException, std::exception)
 }
 
 awt::Point SAL_CALL LayoutManager::getElementPos( const OUString& aName )
-throw (RuntimeException, std::exception)
 {
     if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
     {
@@ -2221,7 +2192,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL LayoutManager::lock()
-throw (RuntimeException, std::exception)
 {
     implts_lock();
 
@@ -2243,7 +2213,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL LayoutManager::unlock()
-throw (RuntimeException, std::exception)
 {
     bool bDoLayout( implts_unlock() );
 
@@ -2274,7 +2243,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL LayoutManager::doLayout()
-throw (RuntimeException, std::exception)
 {
     implts_doLayout_notify( true );
 }
@@ -2457,7 +2425,6 @@ bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContainerSiz
 }
 
 void SAL_CALL LayoutManager::setVisible( sal_Bool bVisible )
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexClearableGuard aWriteLock;
     bool bWasVisible( m_bVisible );
@@ -2469,7 +2436,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL LayoutManager::isVisible()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_bVisible;
@@ -2619,13 +2585,11 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose, void*, void)
 //  XLayoutManagerEventBroadcaster
 
 void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener )
-throw (uno::RuntimeException, std::exception)
 {
     m_aListenerContainer.addInterface( cppu::UnoType<frame::XLayoutManagerListener>::get(), xListener );
 }
 
 void SAL_CALL LayoutManager::removeLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener )
-throw (uno::RuntimeException, std::exception)
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<frame::XLayoutManagerListener>::get(), xListener );
 }
@@ -2654,7 +2618,6 @@ void LayoutManager::implts_notifyListeners(short nEvent, const uno::Any& rInfoPa
 //      XWindowListener
 
 void SAL_CALL LayoutManager::windowResized( const awt::WindowEvent& aEvent )
-throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     Reference< awt::XWindow >         xContainerWindow( m_xContainerWindow );
@@ -2694,11 +2657,11 @@ throw( uno::RuntimeException, std::exception )
     }
 }
 
-void SAL_CALL LayoutManager::windowMoved( const awt::WindowEvent& ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL LayoutManager::windowMoved( const awt::WindowEvent& )
 {
 }
 
-void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent )
 {
     SolarMutexClearableGuard aReadLock;
     Reference< awt::XWindow >  xContainerWindow( m_xContainerWindow );
@@ -2718,7 +2681,7 @@ void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) thro
     }
 }
 
-void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent )
 {
     SolarMutexClearableGuard aReadLock;
     Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
@@ -2760,7 +2723,6 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl, Timer *, void)
 //      XFrameActionListener
 
 void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent )
-throw ( RuntimeException, std::exception )
 {
     if (( aEvent.Action == FrameAction_COMPONENT_ATTACHED ) || ( aEvent.Action == FrameAction_COMPONENT_REATTACHED ))
     {
@@ -2798,7 +2760,6 @@ throw ( RuntimeException, std::exception )
 }
 
 void SAL_CALL LayoutManager::disposing( const lang::EventObject& rEvent )
-throw( RuntimeException, std::exception )
 {
     bool bDisposeAndClear( false );
 
@@ -2904,7 +2865,7 @@ throw( RuntimeException, std::exception )
     }
 }
 
-void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Event )
 {
     SolarMutexClearableGuard aReadLock;
     Reference< XFrame > xFrame( m_xFrame );
@@ -2948,7 +2909,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even
     }
 }
 
-void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event )
 {
     SolarMutexClearableGuard aReadLock;
     Reference< frame::XFrame >                xFrame( m_xFrame );
@@ -3035,7 +2996,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event
     }
 }
 
-void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Event )
 {
     SolarMutexClearableGuard aReadLock;
     Reference< XFrame >                       xFrame( m_xFrame );
@@ -3085,7 +3046,7 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even
 }
 
 void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32       nHandle,
-                                                               const uno::Any& aValue  ) throw( uno::Exception, std::exception )
+                                                               const uno::Any& aValue  )
 {
     if ( nHandle != LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY )
         LayoutManager_PBase::setFastPropertyValue_NoBroadcast( nHandle, aValue );
@@ -3152,7 +3113,7 @@ namespace
     return theInfoHelper::get(*this).getHelper();
 }
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo()
 {
     static uno::Reference< beans::XPropertySetInfo >* pInfo = nullptr;
 
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 6b0114025574..6ef563206cda 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -91,7 +91,7 @@ void SAL_CALL ToolbarLayoutManager::release() throw()
     OWeakObject::release();
 }
 
-uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType )
 {
     uno::Any a = ::cppu::queryInterface( rType,
         (static_cast< awt::XDockableWindowListener* >(this)),
@@ -104,7 +104,7 @@ uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType
     return OWeakObject::queryInterface( rType );
 }
 
-void SAL_CALL ToolbarLayoutManager::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL ToolbarLayoutManager::disposing( const lang::EventObject& aEvent )
 {
     if ( aEvent.Source == m_xFrame )
     {
@@ -3193,7 +3193,6 @@ void ToolbarLayoutManager::implts_renumberRowColumnData(
 //  XWindowListener
 
 void SAL_CALL ToolbarLayoutManager::windowResized( const awt::WindowEvent& aEvent )
-throw( uno::RuntimeException, std::exception )
 {
     SolarMutexClearableGuard aWriteLock;
     bool bLocked( m_bDockingInProgress );
@@ -3243,24 +3242,20 @@ throw( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL ToolbarLayoutManager::windowMoved( const awt::WindowEvent& /*aEvent*/ )
-throw( uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL ToolbarLayoutManager::windowShown( const lang::EventObject& /*aEvent*/ )
-throw( uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL ToolbarLayoutManager::windowHidden( const lang::EventObject& /*aEvent*/ )
-throw( uno::RuntimeException, std::exception )
 {
 }
 
 //  XDockableWindowListener
 
 void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e )
-throw (uno::RuntimeException, std::exception)
 {
     bool bWinFound( false );
 
@@ -3311,7 +3306,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent& e )
-throw (uno::RuntimeException, std::exception)
 {
     const sal_Int32 MAGNETIC_DISTANCE_UNDOCK = 25;
     const sal_Int32 MAGNETIC_DISTANCE_DOCK   = 20;
@@ -3485,7 +3479,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e )
-throw (uno::RuntimeException, std::exception)
 {
     if (e.bCancelled)
         return;
@@ -3584,7 +3577,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL ToolbarLayoutManager::prepareToggleFloatingMode( const lang::EventObject& e )
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexClearableGuard aReadLock;
     bool bDockingInProgress = m_bDockingInProgress;
@@ -3625,7 +3617,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ToolbarLayoutManager::toggleFloatingMode( const lang::EventObject& e )
-throw (uno::RuntimeException, std::exception)
 {
     UIElement aUIDockingElement;
 
@@ -3756,7 +3747,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ToolbarLayoutManager::closed( const lang::EventObject& e )
-throw (uno::RuntimeException, std::exception)
 {
     OUString aName;
     UIElement     aUIElement;
@@ -3803,14 +3793,12 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ToolbarLayoutManager::endPopupMode( const awt::EndPopupModeEvent& /*e*/ )
-throw (uno::RuntimeException, std::exception)
 {
 }
 
 //  XUIConfigurationListener
 
 void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEvent& rEvent )
-throw (uno::RuntimeException, std::exception)
 {
     UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL );
 
@@ -3874,7 +3862,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ToolbarLayoutManager::elementRemoved( const ui::ConfigurationEvent& rEvent )
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexClearableGuard aReadLock;
     uno::Reference< awt::XWindow > xContainerWindow( m_xContainerWindow, uno::UNO_QUERY );
@@ -3922,7 +3909,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ToolbarLayoutManager::elementReplaced( const ui::ConfigurationEvent& rEvent )
-throw (uno::RuntimeException, std::exception)
 {
     UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL );
 
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 200ef47635d7..d3d1f4970149 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -137,30 +137,30 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW
 
         virtual void SAL_CALL acquire() throw() override;
         virtual void SAL_CALL release() throw() override;
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
         // XWindowListener
-        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) override;
+        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) override;
+        virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) override;
+        virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) override;
 
         // XDockableWindowListener
-        virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL closed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) override;
+        virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) override;
+        virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) override;
+        virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL closed( const css::lang::EventObject& e ) override;
+        virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) override;
 
         // XUIConfigurationListener
-        virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) override;
 
     private:
         enum DockingOperation
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index b0e65802db4d..b5af8ee4d62c 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -108,23 +108,18 @@ class LoadEnvListener : public ::cppu::WeakImplHelper< css::frame::XLoadEventLis
         }
 
         // frame.XLoadEventListener
-        virtual void SAL_CALL loadFinished(const css::uno::Reference< css::frame::XFrameLoader >& xLoader)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL loadFinished(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) override;
 
-        virtual void SAL_CALL loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >& xLoader)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) override;
 
         // frame.XDispatchResultListener
-        virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent) override;
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 };
 
 LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext)
-    throw(LoadEnvException, css::uno::RuntimeException)
     : m_xContext(xContext)
     , m_nSearchFlags(0)
     , m_eFeature(E_NO_FEATURE)
@@ -145,9 +140,6 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
                                                                            const OUString&                                        sTarget,
                                                                                  sal_Int32                                               nFlags ,
                                                                            const css::uno::Sequence< css::beans::PropertyValue >&        lArgs  )
-    throw(css::lang::IllegalArgumentException,
-          css::io::IOException               ,
-          css::uno::RuntimeException         )
 {
     css::uno::Reference< css::lang::XComponent > xComponent;
 
@@ -440,7 +432,6 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const
 }
 
 void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::frame::XFrameLoader >&)
-    throw(css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_mutex);
     if (m_bWaitingResult)
@@ -449,7 +440,6 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram
 }
 
 void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >&)
-    throw(css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_mutex);
     if (m_bWaitingResult)
@@ -458,7 +448,6 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra
 }
 
 void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_mutex);
 
@@ -483,7 +472,6 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult
 }
 
 void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&)
-    throw(css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_mutex);
     if (m_bWaitingResult)
@@ -711,7 +699,6 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip
 }
 
 void LoadEnv::impl_detectTypeAndFilter()
-    throw(LoadEnvException, css::uno::RuntimeException, std::exception)
 {
     static sal_Int32       FILTERFLAG_TEMPLATEPATH  = 16;
 
@@ -833,7 +820,6 @@ void LoadEnv::impl_detectTypeAndFilter()
 }
 
 bool LoadEnv::impl_handleContent()
-    throw(LoadEnvException, css::uno::RuntimeException, std::exception)
 {
     // SAFE -> -----------------------------------
     osl::ClearableMutexGuard aReadLock(m_mutex);
@@ -972,7 +958,6 @@ bool LoadEnv::impl_furtherDocsAllowed()
 }
 
 bool LoadEnv::impl_loadContent()
-    throw(LoadEnvException, css::uno::RuntimeException, std::exception)
 {
     // SAFE -> -----------------------------------
     osl::ClearableMutexGuard aWriteLock(m_mutex);
@@ -1201,7 +1186,6 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
 }
 
 css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
-    throw(LoadEnvException, css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_mutex);
 
@@ -1355,7 +1339,6 @@ bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::
 }
 
 css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
-    throw(LoadEnvException, css::uno::RuntimeException, std::exception)
 {
     // SAFE -> ..................................
     osl::ClearableMutexGuard aReadLock(m_mutex);
@@ -1487,7 +1470,6 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
 }
 
 void LoadEnv::impl_reactForLoadingState()
-    throw(LoadEnvException, css::uno::RuntimeException)
 {
     /*TODO reset action locks */
 
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index aca5335d6164..fad2881fb32f 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -100,14 +100,14 @@ DispatchRecorder::~DispatchRecorder()
 }
 
 // generate header
-void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::frame::XFrame >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::frame::XFrame >& )
 {
     /* SAFE{ */
     /* } */
 }
 
 void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL,
-                                                const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+                                                const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
 {
     OUString aTarget;
 
@@ -116,7 +116,7 @@ void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL,
 }
 
 void SAL_CALL  DispatchRecorder::recordDispatchAsComment( const css::util::URL& aURL,
-                                                          const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+                                                          const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
 {
     OUString aTarget;
 
@@ -125,13 +125,13 @@ void SAL_CALL  DispatchRecorder::recordDispatchAsComment( const css::util::URL&
     m_aStatements.push_back( aStatement );
 }
 
-void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL DispatchRecorder::endRecording()
 {
     SolarMutexGuard g;
     m_aStatements.clear();
 }
 
-OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL DispatchRecorder::getRecordedMacro()
 {
     SolarMutexGuard g;
 
@@ -374,22 +374,22 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL,
     /* } */
 }
 
-css::uno::Type SAL_CALL DispatchRecorder::getElementType() throw (css::uno::RuntimeException, std::exception)
+css::uno::Type SAL_CALL DispatchRecorder::getElementType()
 {
     return cppu::UnoType<css::frame::DispatchStatement>::get();
 }
 
-sal_Bool SAL_CALL DispatchRecorder::hasElements()  throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DispatchRecorder::hasElements()
 {
     return (! m_aStatements.empty());
 }
 
-sal_Int32 SAL_CALL DispatchRecorder::getCount() throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL DispatchRecorder::getCount()
 {
     return m_aStatements.size();
 }
 
-css::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx)  throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx)
 {
     if (idx >= (sal_Int32)m_aStatements.size()) {
         throw css::lang::IndexOutOfBoundsException( "Dispatch recorder out of bounds"  );
@@ -401,7 +401,7 @@ css::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx)  throw (css::
     return element;
 }
 
-void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const css::uno::Any& element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const css::uno::Any& element)
 {
     if (element.getValueType() !=
         cppu::UnoType<css::frame::DispatchStatement>::get()) {
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index e98b6ee6ccec..d78ca5440aea 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -83,7 +83,7 @@ DispatchRecorderSupplier::~DispatchRecorderSupplier()
 
     @change     09.04.2002 by Andreas Schluens
  */
-void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder )
 {
     SolarMutexGuard g;
     m_xDispatchRecorder=xRecorder;
@@ -103,7 +103,7 @@ void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Ref
 
     @change     09.04.2002 by Andreas Schluens
  */
-css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSupplier::getDispatchRecorder() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSupplier::getDispatchRecorder()
 {
     SolarMutexGuard g;
     return m_xDispatchRecorder;
@@ -124,7 +124,7 @@ css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSu
  */
 void SAL_CALL DispatchRecorderSupplier::dispatchAndRecord( const css::util::URL&                                  aURL        ,
                                                            const css::uno::Sequence< css::beans::PropertyValue >& lArguments  ,
-                                                           const css::uno::Reference< css::frame::XDispatch >&    xDispatcher ) throw (css::uno::RuntimeException, std::exception)
+                                                           const css::uno::Reference< css::frame::XDispatch >&    xDispatcher )
 {
     SolarMutexClearableGuard aReadLock;
     css::uno::Reference< css::frame::XDispatchRecorder > xRecorder = m_xDispatchRecorder;
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index fd695d110b4e..fedd333ba5a5 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -61,33 +61,25 @@ public:
     // XContextChangeEventMultiplexer
     virtual void SAL_CALL addContextChangeEventListener (
         const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
-        const cssu::Reference<cssu::XInterface>& rxEventFocus)
-        throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception) override;
+        const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
     virtual void SAL_CALL removeContextChangeEventListener (
         const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
-        const cssu::Reference<cssu::XInterface>& rxEventFocus)
-        throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception) override;
+        const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
     virtual void SAL_CALL removeAllContextChangeEventListeners (
-        const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener)
-        throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception) override;
+        const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener) override;
     virtual void SAL_CALL broadcastContextChangeEvent (
         const css::ui::ContextChangeEventObject& rContextChangeEventObject,
-        const cssu::Reference<cssu::XInterface>& rxEventFocus)
-        throw(cssu::RuntimeException, std::exception) override;
+        const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
-        throw (cssu::RuntimeException, std::exception) override;
+    virtual ::rtl::OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL supportsService  (
-        const ::rtl::OUString& rsServiceName)
-        throw (cssu::RuntimeException, std::exception) override;
-    virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames()
-        throw (cssu::RuntimeException, std::exception) override;
+        const ::rtl::OUString& rsServiceName) override;
+    virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XEventListener
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEvent)
-        throw (cssu::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
     typedef ::std::vector<cssu::Reference<css::ui::XContextChangeEventListener> > ListenerContainer;
     class FocusDescriptor
@@ -153,7 +145,6 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing()
 void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
     const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
     const cssu::Reference<cssu::XInterface>& rxEventFocus)
-    throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception)
 {
     if ( ! rxListener.is())
         throw css::lang::IllegalArgumentException(
@@ -190,7 +181,6 @@ void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
 void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener (
     const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
     const cssu::Reference<cssu::XInterface>& rxEventFocus)
-    throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception)
 {
     if ( ! rxListener.is())
         throw cssl::IllegalArgumentException(
@@ -216,7 +206,6 @@ void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener (
 
 void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListeners (
     const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener)
-    throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception)
 {
     if ( ! rxListener.is())
         throw cssl::IllegalArgumentException(
@@ -244,7 +233,6 @@ void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListener
 void SAL_CALL ContextChangeEventMultiplexer::broadcastContextChangeEvent (
     const css::ui::ContextChangeEventObject& rEventObject,
     const cssu::Reference<cssu::XInterface>& rxEventFocus)
-    throw(cssu::RuntimeException, std::exception)
 {
     // Remember the current context.
     if (rxEventFocus.is())
@@ -308,26 +296,22 @@ ContextChangeEventMultiplexer::FocusDescriptor* ContextChangeEventMultiplexer::G
 }
 
 OUString SAL_CALL ContextChangeEventMultiplexer::getImplementationName()
-    throw(cssu::RuntimeException, std::exception)
 {
     return OUString("org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer");
 }
 
 sal_Bool SAL_CALL ContextChangeEventMultiplexer::supportsService ( const ::rtl::OUString& rsServiceName)
-    throw (cssu::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rsServiceName);
 }
 
 css::uno::Sequence<OUString> SAL_CALL ContextChangeEventMultiplexer::getSupportedServiceNames()
-    throw (cssu::RuntimeException, std::exception)
 {
     // it's a singleton, not a service
     return css::uno::Sequence<OUString>();
 }
 
 void SAL_CALL ContextChangeEventMultiplexer::disposing ( const css::lang::EventObject& rEvent)
-    throw (cssu::RuntimeException, std::exception)
 {
     ListenerMap::iterator iDescriptor (maListeners.find(rEvent.Source));
 
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index cd74f30d07f0..a29ef9a37eba 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -439,20 +439,17 @@ public:
     explicit AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext);
     virtual ~AutoRecovery(                                                                   ) override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.AutoRecovery");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.AutoRecovery"};
     }
@@ -462,26 +459,23 @@ public:
         { OWeakObject::acquire(); }
     virtual void SAL_CALL release() throw () override
         { OWeakObject::release(); }
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
 
     /// Initialization function after having acquire()'d.
     void initListeners();
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     // css.frame.XDispatch
     virtual void SAL_CALL dispatch(const css::util::URL&                                  aURL      ,
-                                   const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
-        throw(css::uno::RuntimeException, std::exception) override;
+                                   const css::uno::Sequence< css::beans::PropertyValue >& lArguments) override;
 
     virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
-                                            const css::util::URL&                                     aURL     )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                            const css::util::URL&                                     aURL     ) override;
 
     virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
-                                               const css::util::URL&                                     aURL     )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                               const css::util::URL&                                     aURL     ) override;
 
     // css.document.XDocumentEventListener
     /** @short  informs about created/opened documents.
@@ -493,20 +487,16 @@ public:
         @param  aEvent
                 points to the new created/opened document.
      */
-    virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent) override;
 
     // css.util.XChangesListener
-    virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override;
 
     // css.util.XModifyListener
-    virtual void SAL_CALL modified(const css::lang::EventObject& aEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override;
 
     // css.lang.XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
 protected:
 
@@ -515,20 +505,17 @@ protected:
     virtual sal_Bool SAL_CALL convertFastPropertyValue(      css::uno::Any& aConvertedValue,
                                                              css::uno::Any& aOldValue      ,
                                                              sal_Int32      nHandle        ,
-                                                       const css::uno::Any& aValue         )
-        throw(css::lang::IllegalArgumentException) override;
+                                                       const css::uno::Any& aValue         ) override;
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(      sal_Int32      nHandle,
-                                                           const css::uno::Any& aValue )
-        throw(css::uno::Exception, std::exception) override;
+                                                           const css::uno::Any& aValue ) override;
     using cppu::OPropertySetHelper::getFastPropertyValue;
     virtual void SAL_CALL getFastPropertyValue(css::uno::Any& aValue ,
                                                sal_Int32      nHandle) const override;
 
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
 private:
     virtual void SAL_CALL disposing() final override;
@@ -1268,7 +1255,7 @@ void AutoRecovery::disposing()
     implts_stopTimer();
 }
 
-Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception)
+Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType )
 {
     Any aRet = AutoRecovery_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
@@ -1276,7 +1263,7 @@ Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(
     return aRet;
 }
 
-Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes(  )
 {
     return comphelper::concatSequences(
         AutoRecovery_BASE::getTypes(),
@@ -1286,7 +1273,6 @@ Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes(  ) throw(css::uno::R
 
 void SAL_CALL AutoRecovery::dispatch(const css::util::URL&                                  aURL      ,
                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("fwk.autorecovery", "AutoRecovery::dispatch() starts ..." << aURL.Complete);
 
@@ -1520,7 +1506,6 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
 
 void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
                                               const css::util::URL&                                     aURL     )
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (!xListener.is())
         throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this));
@@ -1553,7 +1538,6 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
 
 void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
                                                  const css::util::URL&                                     aURL     )
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (!xListener.is())
         throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this));
@@ -1562,7 +1546,6 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css:
 }
 
 void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY);
 
@@ -1630,7 +1613,6 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv
 }
 
 void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     const css::uno::Sequence< css::util::ElementChange > lChanges (aEvent.Changes);
     const css::util::ElementChange*                      pChanges = lChanges.getConstArray();
@@ -1683,7 +1665,6 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
 }
 
 void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY);
     if (! xDocument.is())
@@ -1693,7 +1674,6 @@ void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent)
 }
 
 void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     /* SAFE */ {
     osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -3977,7 +3957,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue(      css::uno::Any& /*
                                                                css::uno::Any& /*aOldValue*/      ,
                                                                sal_Int32      /*nHandle*/        ,
                                                          const css::uno::Any& /*aValue*/         )
-    throw(css::lang::IllegalArgumentException)
 {
     // not needed currently
     return false;
@@ -3985,7 +3964,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue(      css::uno::Any& /*
 
 void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast(      sal_Int32      /*nHandle*/,
                                                              const css::uno::Any& /*aValue*/ )
-    throw(css::uno::Exception, std::exception)
 {
     // not needed currently
 }
@@ -4065,7 +4043,6 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto
 }
 
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo()
-    throw(css::uno::RuntimeException, std::exception)
 {
     static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr;
     if(!pInfo)
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 434435d481fe..62df7dc047da 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -76,19 +76,16 @@ enum PropHandle {
     Title };
 
 OUString SAL_CALL Desktop::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.framework.Desktop");
 }
 
 sal_Bool SAL_CALL Desktop::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> SAL_CALL Desktop::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.frame.Desktop" };
 }
@@ -192,7 +189,7 @@ Desktop::~Desktop()
     SAL_WARN_IF( m_aTransactionManager.getWorkingMode()!=E_CLOSE, "fwk.desktop", "Desktop::~Desktop(): Who forgot to dispose this service?" );
 }
 
-css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType )
 {
     css::uno::Any aRet = Desktop_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
@@ -200,7 +197,7 @@ css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) t
     return aRet;
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes(  )
 {
     return comphelper::concatSequences(
         Desktop_BASE::getTypes(),
@@ -209,7 +206,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes(  ) throw(css::u
 }
 
 sal_Bool SAL_CALL Desktop::terminate()
-    throw( css::uno::RuntimeException, std::exception )
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
 
@@ -389,14 +385,12 @@ namespace
 }
 
 bool SAL_CALL Desktop::terminateQuickstarterToo()
-    throw( css::uno::RuntimeException )
 {
     QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
     return terminate();
 }
 
 void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
 
@@ -444,7 +438,6 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra
 }
 
 void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
 
@@ -509,7 +502,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::
     @onerror    We return a null-reference.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getComponents() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getComponents()
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -534,7 +527,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getC
     @onerror    We return a null-reference.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentComponent() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentComponent()
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -569,7 +562,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone
     @onerror    We return a null reference.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame()
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -610,9 +603,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th
 css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const OUString&                                 sURL            ,
                                                                                      const OUString&                                 sTargetFrameName,
                                                                                            sal_Int32                                        nSearchFlags    ,
-                                                                                     const css::uno::Sequence< css::beans::PropertyValue >& lArguments      ) throw(    css::io::IOException                ,
-                                                                                                                                                                        css::lang::IllegalArgumentException ,
-                                                                                                                                                                        css::uno::RuntimeException, std::exception          )
+                                                                                     const css::uno::Sequence< css::beans::PropertyValue >& lArguments      )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -643,7 +634,7 @@ But; Don't forget - you will be the owner of returned object and must release it
     @onerror    A null reference is returned.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks()
 {
     SAL_INFO("fwk.desktop", "Desktop::getTasks(): Use of obsolete interface XTaskSupplier");
     return nullptr;
@@ -665,7 +656,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
     @onerror    A null reference is returned.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask()
 {
     SAL_INFO("fwk.desktop", "Desktop::getActiveTask(): Use of obsolete interface XTaskSupplier");
     return nullptr;
@@ -692,7 +683,7 @@ css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw
 *//*-*************************************************************************************************************/
 css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( const css::util::URL&  aURL             ,
                                                                               const OUString& sTargetFrameName ,
-                                                                                    sal_Int32        nSearchFlags     ) throw( css::uno::RuntimeException, std::exception )
+                                                                                    sal_Int32        nSearchFlags     )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -718,7 +709,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
     }
 }
 
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desktop::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lQueries ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desktop::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lQueries )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -739,7 +730,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk
     @threadsafe yes
 *//*-*************************************************************************************************************/
 void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
-    throw( css::uno::RuntimeException, std::exception)
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
 
@@ -748,7 +738,6 @@ void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Refe
 }
 
 void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
-    throw( css::uno::RuntimeException, std::exception)
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
 
@@ -771,7 +760,7 @@ void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Refe
     @onerror    A null reference is returned.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames()
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -797,7 +786,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
     @onerror    A null reference is returned.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -819,7 +808,7 @@ void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XF
     }
 }
 
-css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame()
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -834,86 +823,86 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() thr
     @descr      Some method make no sense for our desktop! He has no window or parent or ...
                 So we should implement it empty and warn programmer, if he use it!
 */
-void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& )
 {
 }
 
-css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow()
 {
     return css::uno::Reference< css::awt::XWindow >();
 }
 
-void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ )
 {
 }
 
-css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator()
 {
     return css::uno::Reference< css::frame::XFramesSupplier >();
 }
 
-OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL Desktop::getName()
 {
     SolarMutexGuard g;
     return m_sName;
 }
 
-void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::setName( const OUString& sName )
 {
     SolarMutexGuard g;
     m_sName = sName;
 }
 
-sal_Bool SAL_CALL Desktop::isTop() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL Desktop::isTop()
 {
     return true;
 }
 
-void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::activate()
 {
     // Desktop is active always... but sometimes our frames try to activate
     // the complete path from bottom to top... And our desktop is the topest frame :-(
     // So - please don't show any assertions here. Do nothing!
 }
 
-void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::deactivate()
 {
     // Desktop is active always... but sometimes our frames try to deactivate
     // the complete path from bottom to top... And our desktop is the topest frame :-(
     // So - please don't show any assertions here. Do nothing!
 }
 
-sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL Desktop::isActive()
 {
     return true;
 }
 
 sal_Bool SAL_CALL Desktop::setComponent( const css::uno::Reference< css::awt::XWindow >&       /*xComponentWindow*/ ,
-                                         const css::uno::Reference< css::frame::XController >& /*xController*/      ) throw( css::uno::RuntimeException, std::exception )
+                                         const css::uno::Reference< css::frame::XController >& /*xController*/      )
 {
     return false;
 }
 
-css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow()
 {
     return css::uno::Reference< css::awt::XWindow >();
 }
 
-css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController()
 {
     return css::uno::Reference< css::frame::XController >();
 }
 
-void SAL_CALL Desktop::contextChanged() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::contextChanged()
 {
 }
 
-void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& )
 {
 }
 
 //   css::frame::XFrame
-void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& )
 {
 }
 
@@ -945,7 +934,7 @@ void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css
     @threadsafe yes
 *//*-*************************************************************************************************************/
 css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUString& sTargetFrameName ,
-                                                                             sal_Int32        nSearchFlags     ) throw( css::uno::RuntimeException, std::exception )
+                                                                             sal_Int32        nSearchFlags     )
 {
     css::uno::Reference< css::frame::XFrame > xTarget;
 
@@ -1067,7 +1056,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
 }
 
 void SAL_CALL Desktop::disposing()
-    throw( css::uno::RuntimeException )
 {
     // Safe impossible cases
     // It's an programming error if dispose is called before terminate!
@@ -1148,7 +1136,7 @@ void SAL_CALL Desktop::disposing()
     @param      "xListener", reference to valid listener. We don't accept invalid values!
     @threadsafe yes
 */
-void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Safe impossible cases
@@ -1160,7 +1148,7 @@ void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::X
     m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
 }
 
-void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Safe impossible cases
@@ -1185,7 +1173,7 @@ void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang
     @param      "aEvent", state event which (hopefully) valid information
     @threadsafe yes
 *//*-*************************************************************************************************************/
-void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& aEvent )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -1213,7 +1201,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent&
 
     @seealso    method loadComponentFromURL()
 *//*-*************************************************************************************************************/
-void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::disposing( const css::lang::EventObject& )
 {
     SAL_WARN( "fwk.desktop", "Desktop::disposing(): Algorithm error! Normally desktop is temp. listener ... not all the time. So this method shouldn't be called." );
 }
@@ -1238,7 +1226,7 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::un
     @param      "xRequest", request for interaction - normal a wrapped target exception from bottom services
     @threadsafe yes
 *//*-*************************************************************************************************************/
-void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -1307,31 +1295,24 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
 }
 
 ::sal_Int32 SAL_CALL Desktop::leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent )
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException, std::exception         )
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
     return m_xTitleNumberGenerator->leaseNumber (xComponent);
 }
 
 void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber )
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException, std::exception         )
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
     m_xTitleNumberGenerator->releaseNumber (nNumber);
 }
 
 void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent )
-    throw (css::lang::IllegalArgumentException,
-           css::uno::RuntimeException, std::exception         )
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
     m_xTitleNumberGenerator->releaseNumberForComponent (xComponent);
 }
 
 OUString SAL_CALL Desktop::getUntitledPrefix()
-    throw (css::uno::RuntimeException, std::exception)
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
     return m_xTitleNumberGenerator->getUntitledPrefix ();
@@ -1364,7 +1345,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix()
 sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aConvertedValue ,
                                                            css::uno::Any&   aOldValue       ,
                                                            sal_Int32        nHandle         ,
-                                                     const css::uno::Any&   aValue          ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
+                                                     const css::uno::Any&   aValue          )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -1418,7 +1399,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aCon
     @threadsafe yes
 *//*-*************************************************************************************************************/
 void SAL_CALL Desktop::setFastPropertyValue_NoBroadcast(       sal_Int32        nHandle ,
-                                                         const css::uno::Any&   aValue  ) throw( css::uno::Exception, std::exception )
+                                                         const css::uno::Any&   aValue  )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
@@ -1515,7 +1496,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue  ,
     @return     reference to object with information [XPropertySetInfo]
     @threadsafe yes
 *//*-*************************************************************************************************************/
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo()
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     // Register transaction and reject wrong calls.
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 73311778683b..da6bc9c52997 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -78,7 +78,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
                                 const OUString&                                      sTargetFrameName  ,
                                       sal_Int32                                             nSearchFlags      ,
                                 const css::uno::Sequence< css::beans::PropertyValue >&      lArguments        )
-    throw(css::uno::RuntimeException, std::exception)
 {
     // check for valid parameters
     if (
@@ -113,7 +112,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
                                  const  css::util::URL&                                 aURL        ,
                                  bool                                                   SyncronFlag ,
                                  const css::uno::Sequence< css::beans::PropertyValue >& lArguments  )
-                                 throw(css::uno::RuntimeException)
 {
     css::uno::Reference< css::uno::XInterface > xTHIS(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
     m_aResult.clear();
@@ -167,7 +165,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
                 describes the result of the dispatch operation
  */
 void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResultEvent& aResult )
-    throw(css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_mutex);
     m_aResult <<= aResult;
@@ -181,7 +178,6 @@ void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResult
                 describe the source of this event and MUST be our save broadcaster!
  */
 void SAL_CALL DispatchHelper::disposing( const css::lang::EventObject& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_mutex);
     m_aResult.clear();
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index cb6994a07b3e..1af055615b1f 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -123,20 +123,17 @@ public:
     /// Initialization function after having acquire()'d.
     void initListeners();
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.Frame");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.Frame"};
     }
@@ -147,251 +144,163 @@ public:
             const OUString& sURL,
             const OUString& sTargetFrameName,
             sal_Int32 nSearchFlags,
-            const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-        throw( css::io::IOException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
 
     //  XFramesSupplier
 
-    virtual css::uno::Reference < css::frame::XFrames > SAL_CALL getFrames()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference < css::frame::XFrame > SAL_CALL getActiveFrame()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActiveFrame(const css::uno::Reference < css::frame::XFrame > & xFrame)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference < css::frame::XFrames > SAL_CALL getFrames() override;
+    virtual css::uno::Reference < css::frame::XFrame > SAL_CALL getActiveFrame() override;
+    virtual void SAL_CALL setActiveFrame(const css::uno::Reference < css::frame::XFrame > & xFrame) override;
 
     //  XFrame
 
-    virtual void SAL_CALL initialize(const css::uno::Reference < css::awt::XWindow > & xWindow)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getContainerWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCreator(const css::uno::Reference < css::frame::XFramesSupplier > & xCreator)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference < css::frame::XFramesSupplier > SAL_CALL getCreator()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName(const OUString & sName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Reference < css::awt::XWindow > & xWindow) override;
+    virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getContainerWindow() override;
+    virtual void SAL_CALL setCreator(const css::uno::Reference < css::frame::XFramesSupplier > & xCreator) override;
+    virtual css::uno::Reference < css::frame::XFramesSupplier > SAL_CALL getCreator() override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString & sName) override;
     virtual css::uno::Reference < css::frame::XFrame > SAL_CALL findFrame(
             const OUString & sTargetFrameName,
-            sal_Int32 nSearchFlags)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isTop()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL activate()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deactivate()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isActive()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL contextChanged()
-        throw (css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nSearchFlags) override;
+    virtual sal_Bool SAL_CALL isTop() override;
+    virtual void SAL_CALL activate() override;
+    virtual void SAL_CALL deactivate() override;
+    virtual sal_Bool SAL_CALL isActive() override;
+    virtual void SAL_CALL contextChanged() override;
     virtual sal_Bool SAL_CALL setComponent(
             const css::uno::Reference < css::awt::XWindow > & xComponentWindow,
-            const css::uno::Reference < css::frame::XController > & xController)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getComponentWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference < css::frame::XController > SAL_CALL getController()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference < css::frame::XController > & xController) override;
+    virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getComponentWindow() override;
+    virtual css::uno::Reference < css::frame::XController > SAL_CALL getController() override;
+    virtual void SAL_CALL addFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener) override;
+    virtual void SAL_CALL removeFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener) override;
 
     //  XComponent
 
     virtual void SAL_CALL disposing() override;
-    virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener) override;
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener) override;
 
     //  XStatusIndicatorFactory
 
-    virtual css::uno::Reference < css::task::XStatusIndicator > SAL_CALL createStatusIndicator()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference < css::task::XStatusIndicator > SAL_CALL createStatusIndicator() override;
 
     //  XDispatchProvider
 
     virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL & aURL,
             const OUString & sTargetFrameName,
-            sal_Int32 nSearchFlags)
-        throw (css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nSearchFlags) override;
     virtual css::uno::Sequence < css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches(
-            const css::uno::Sequence < css::frame::DispatchDescriptor > & lDescriptor)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence < css::frame::DispatchDescriptor > & lDescriptor) override;
 
     //  XDispatchProviderInterception
 
     virtual void SAL_CALL registerDispatchProviderInterceptor(
-            const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor) override;
     virtual void SAL_CALL releaseDispatchProviderInterceptor(
-            const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor) override;
 
     //  XDispatchInformationProvider
 
-    virtual css::uno::Sequence < sal_Int16 > SAL_CALL getSupportedCommandGroups()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
-        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 nCommandGroup) override;
 
     //  XWindowListener
     //  Attention: windowResized() and windowShown() are implement only! All other are empty!
 
-    virtual void SAL_CALL windowResized(const css::awt::WindowEvent & aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowMoved(const css::awt::WindowEvent & /*aEvent*/ )
-        throw (css::uno::RuntimeException, std::exception) override {};
-    virtual void SAL_CALL windowShown(const css::lang::EventObject & aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowHidden(const css::lang::EventObject & aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized(const css::awt::WindowEvent & aEvent) override;
+    virtual void SAL_CALL windowMoved(const css::awt::WindowEvent & /*aEvent*/ ) override {};
+    virtual void SAL_CALL windowShown(const css::lang::EventObject & aEvent) override;
+    virtual void SAL_CALL windowHidden(const css::lang::EventObject & aEvent) override;
 
     //  XFocusListener
     //  Attention: focusLost() not implemented yet!
 
-    virtual void SAL_CALL focusGained(const css::awt::FocusEvent & aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL focusLost(const css::awt::FocusEvent & /*aEvent*/ )
-        throw (css::uno::RuntimeException, std::exception) override {};
+    virtual void SAL_CALL focusGained(const css::awt::FocusEvent & aEvent) override;
+    virtual void SAL_CALL focusLost(const css::awt::FocusEvent & /*aEvent*/ ) override {};
 
     //  XTopWindowListener
     //  Attention: windowActivated(), windowDeactivated() and windowClosing() are implement only! All other are empty!
 
-    virtual void SAL_CALL windowActivated(const css::lang::EventObject & aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowDeactivated(const css::lang::EventObject & aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowOpened(const css::lang::EventObject & /*aEvent*/ )
-        throw (css::uno::RuntimeException, std::exception) override {};
-    virtual void SAL_CALL windowClosing(const css::lang::EventObject & aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowClosed(const css::lang::EventObject & /*aEvent*/ )
-        throw (css::uno::RuntimeException, std::exception) override {};
-    virtual void SAL_CALL windowMinimized(const css::lang::EventObject & /*aEvent*/ )
-        throw (css::uno::RuntimeException, std::exception) override {};
-    virtual void SAL_CALL windowNormalized(const css::lang::EventObject & /*aEvent*/ )
-        throw (css::uno::RuntimeException, std::exception) override {};
+    virtual void SAL_CALL windowActivated(const css::lang::EventObject & aEvent) override;
+    virtual void SAL_CALL windowDeactivated(const css::lang::EventObject & aEvent) override;
+    virtual void SAL_CALL windowOpened(const css::lang::EventObject & /*aEvent*/ ) override {};
+    virtual void SAL_CALL windowClosing(const css::lang::EventObject & aEvent) override;
+    virtual void SAL_CALL windowClosed(const css::lang::EventObject & /*aEvent*/ ) override {};
+    virtual void SAL_CALL windowMinimized(const css::lang::EventObject & /*aEvent*/ ) override {};
+    virtual void SAL_CALL windowNormalized(const css::lang::EventObject & /*aEvent*/ ) override {};
 
     //  XEventListener
 
-    virtual void SAL_CALL disposing(const css::lang::EventObject & aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject & aEvent) override;
 
     //  XActionLockable
 
-    virtual sal_Bool SAL_CALL isActionLocked()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addActionLock()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeActionLock()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActionLocks(sal_Int16 nLock)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL resetActionLocks()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isActionLocked() override;
+    virtual void SAL_CALL addActionLock() override;
+    virtual void SAL_CALL removeActionLock() override;
+    virtual void SAL_CALL setActionLocks(sal_Int16 nLock) override;
+    virtual sal_Int16 SAL_CALL resetActionLocks() override;
 
     //  XCloseable
 
-    virtual void SAL_CALL close(sal_Bool bDeliverOwnership)
-        throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close(sal_Bool bDeliverOwnership) override;
 
     //  XCloseBroadcaster
 
-    virtual void SAL_CALL addCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener) override;
+    virtual void SAL_CALL removeCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener) override;
 
     //  XTitle
 
-    virtual OUString SAL_CALL getTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitle(const OUString & sTitle)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getTitle() override;
+    virtual void SAL_CALL setTitle(const OUString & sTitle) override;
 
     //  XTitleChangeBroadcaster
 
-    virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListenr)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListener) override;
+    virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListenr) override;
 
     //  XFrame2 attributes
 
-    virtual css::uno::Reference < css::container::XNameContainer > SAL_CALL getUserDefinedAttributes()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference < css::container::XNameContainer > SAL_CALL getUserDefinedAttributes() override;
 
-    virtual css::uno::Reference < css::frame::XDispatchRecorderSupplier > SAL_CALL getDispatchRecorderSupplier()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDispatchRecorderSupplier(const css::uno::Reference < css::frame::XDispatchRecorderSupplier > & )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference < css::frame::XDispatchRecorderSupplier > SAL_CALL getDispatchRecorderSupplier() override;
+    virtual void SAL_CALL setDispatchRecorderSupplier(const css::uno::Reference < css::frame::XDispatchRecorderSupplier > & ) override;
 
-    virtual css::uno::Reference < css::uno::XInterface > SAL_CALL getLayoutManager()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLayoutManager(const css::uno::Reference < css::uno::XInterface > & )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference < css::uno::XInterface > SAL_CALL getLayoutManager() override;
+    virtual void SAL_CALL setLayoutManager(const css::uno::Reference < css::uno::XInterface > & ) override;
 
     // XPropertySet
-    virtual css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
-    virtual void SAL_CALL setPropertyValue(const OUString & sProperty, 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 void SAL_CALL setPropertyValue(const OUString & sProperty, const css::uno::Any & aValue) override;
 
-    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & sProperty)
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & sProperty) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString & sProperty,
-            const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener)
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener) override;
 
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString & sProperty,
-            const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener)
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener) override;
 
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString & sProperty,
-            const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener)
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener) override;
 
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString & sProperty,
-            const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener)
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener) override;
 
     // XPropertySetInfo
-    virtual css::uno::Sequence < css::beans::Property > SAL_CALL getProperties()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence < css::beans::Property > SAL_CALL getProperties() override;
 
-    virtual css::beans::Property SAL_CALL getPropertyByName(const OUString & sName)
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::Property SAL_CALL getPropertyByName(const OUString & sName) override;
 
-    virtual sal_Bool SAL_CALL hasPropertyByName(const OUString & sName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName(const OUString & sName) override;
 
 
 private:
@@ -423,9 +332,7 @@ private:
      *          The owner of this class has to be sure, that every new property does
      *          not clash with any existing one.
      */
-    void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty)
-        throw(css::beans::PropertyExistException,
-              css::uno::Exception               );
+    void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty);
 
     /** mark the object as "dead".
      */
@@ -674,10 +581,6 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
         const OUString& sTargetFrameName,
         sal_Int32 nSearchFlags,
         const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-    throw( css::io::IOException,
-           css::lang::IllegalArgumentException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     checkDisposed();
 
@@ -697,7 +600,6 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
     @onerror    A null reference is returned.
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
 
@@ -721,7 +623,6 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames()
     @onerror    A null reference is returned.
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame()
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
 
@@ -744,7 +645,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame()
     @onerror    An assertion is thrown and element is ignored, if given frame isn't already a child of us.
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame )
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
 
@@ -848,7 +748,6 @@ void Frame::disableLayoutManager(const css::uno::Reference< css::frame::XLayoutM
     @onerror    We do nothing.
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& xWindow )
-    throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     if (!xWindow.is())
@@ -925,7 +824,6 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
     @onerror    A null reference is returned.
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow()
-    throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     return m_xContainerWindow;
@@ -949,7 +847,6 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow()
     @threadsafe yes
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator )
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
 
@@ -973,7 +870,6 @@ void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesS
     @onerror    A null reference is returned.
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
     SolarMutexGuard g;
@@ -990,7 +886,6 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
     @onerror    An empty string is returned.
 *//*-*****************************************************************************************************/
 OUString SAL_CALL Frame::getName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     return m_sName;
@@ -1009,7 +904,6 @@ OUString SAL_CALL Frame::getName()
     @onerror    We do nothing.
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::setName( const OUString& sName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     // Set new name... but look for invalid special target names!
@@ -1045,7 +939,6 @@ void SAL_CALL Frame::setName( const OUString& sName )
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUString& sTargetFrameName,
                                                                      sal_Int32 nSearchFlags )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Reference< css::frame::XFrame > xTarget;
 
@@ -1301,7 +1194,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
     @onerror    No error should occur!
 *//*-*****************************************************************************************************/
 sal_Bool SAL_CALL Frame::isTop()
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
     SolarMutexGuard g;
@@ -1321,7 +1213,6 @@ sal_Bool SAL_CALL Frame::isTop()
     @seealso    listener mechanism
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::activate()
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
 
@@ -1402,7 +1293,7 @@ void SAL_CALL Frame::activate()
     @seealso    enum EActiveState
     @seealso    listener mechanism
 *//*-*****************************************************************************************************/
-void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Frame::deactivate()
 {
     checkDisposed();
 
@@ -1476,7 +1367,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except
 
     @onerror    No error should occur.
 *//*-*****************************************************************************************************/
-sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL Frame::isActive()
 {
     checkDisposed();
     SolarMutexGuard g;
@@ -1486,7 +1377,7 @@ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exce
 /*-****************************************************************************************************
     @short      ???
 *//*-*****************************************************************************************************/
-void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Frame::contextChanged()
 {
     // Sometimes called during closing object...
     // Impl-method is threadsafe himself!
@@ -1524,7 +1415,6 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::ex
 *//*-*****************************************************************************************************/
 sal_Bool SAL_CALL Frame::setComponent(const css::uno::Reference< css::awt::XWindow >& xComponentWindow,
                                       const css::uno::Reference< css::frame::XController >& xController )
-    throw( css::uno::RuntimeException, std::exception )
 {
 
     // Ignore this HACK of sfx2!
@@ -1682,7 +1572,6 @@ sal_Bool SAL_CALL Frame::setComponent(const css::uno::Reference< css::awt::XWind
     @onerror    A null reference is returned.
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow()
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
     SolarMutexGuard g;
@@ -1706,7 +1595,6 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow()
     @onerror    A null reference is returned.
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController()
-    throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     return m_xController;
@@ -1722,14 +1610,12 @@ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController()
     @onerror    Listener is ignored.
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
     m_aListenerContainer.addInterface( cppu::UnoType<css::frame::XFrameActionListener>::get(), xListener );
 }
 
 void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<css::frame::XFrameActionListener>::get(), xListener );
 }
@@ -1754,7 +1640,6 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
     @threadsafe yes
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::close( sal_Bool bDeliverOwnership )
-    throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception   )
 {
     checkDisposed();
 
@@ -1845,20 +1730,17 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership )
     @threadsafe yes
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener )
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     m_aListenerContainer.addInterface( cppu::UnoType<css::util::XCloseListener>::get(), xListener );
 }
 
 void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener )
-    throw (css::uno::RuntimeException, std::exception)
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<css::util::XCloseListener>::get(), xListener );
 }
 
 OUString SAL_CALL Frame::getTitle()
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -1872,7 +1754,6 @@ OUString SAL_CALL Frame::getTitle()
 }
 
 void SAL_CALL Frame::setTitle( const OUString& sTitle )
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -1886,7 +1767,6 @@ void SAL_CALL Frame::setTitle( const OUString& sTitle )
 }
 
 void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -1900,7 +1780,6 @@ void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::fra
 }
 
 void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -1914,21 +1793,18 @@ void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::
 }
 
 css::uno::Reference<css::container::XNameContainer> SAL_CALL Frame::getUserDefinedAttributes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     // optional attribute
     return nullptr;
 }
 
 css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL Frame::getDispatchRecorderSupplier()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_xDispatchRecorderSupplier;
 }
 
 void SAL_CALL Frame::setDispatchRecorderSupplier(const css::uno::Reference<css::frame::XDispatchRecorderSupplier>& p)
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     SolarMutexGuard g;
@@ -1936,14 +1812,12 @@ void SAL_CALL Frame::setDispatchRecorderSupplier(const css::uno::Reference<css::
 }
 
 css::uno::Reference<css::uno::XInterface> SAL_CALL Frame::getLayoutManager()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_xLayoutManager;
 }
 
 void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInterface>& p1)
-    throw (css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     SolarMutexGuard g;
@@ -1951,7 +1825,6 @@ void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInter
 }
 
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Frame::getPropertySetInfo()
-    throw(css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
     css::uno::Reference< css::beans::XPropertySetInfo > xInfo(
@@ -1961,12 +1834,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Frame::getPropertyS
 
 void SAL_CALL Frame::setPropertyValue(const OUString& sProperty,
                                                   const css::uno::Any&   aValue   )
-    throw(css::beans::UnknownPropertyException,
-          css::beans::PropertyVetoException,
-          css::lang::IllegalArgumentException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException,
-          std::exception)
 {
     // TODO look for e.g. readonly props and reject setProp() call!
 
@@ -2004,10 +1871,6 @@ void SAL_CALL Frame::setPropertyValue(const OUString& sProperty,
 }
 
 css::uno::Any SAL_CALL Frame::getPropertyValue(const OUString& sProperty)
-    throw(css::beans::UnknownPropertyException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException,
-          std::exception)
 {
     checkDisposed();
 
@@ -2026,10 +1889,6 @@ css::uno::Any SAL_CALL Frame::getPropertyValue(const OUString& sProperty)
 void SAL_CALL Frame::addPropertyChangeListener(
         const OUString& sProperty,
         const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-    throw(css::beans::UnknownPropertyException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException,
-          std::exception)
 {
     checkDisposed();
 
@@ -2049,10 +1908,6 @@ void SAL_CALL Frame::addPropertyChangeListener(
 void SAL_CALL Frame::removePropertyChangeListener(
         const OUString& sProperty,
         const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-    throw(css::beans::UnknownPropertyException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException,
-          std::exception)
 {
     // SAFE ->
     SolarMutexClearableGuard aReadLock;
@@ -2070,10 +1925,6 @@ void SAL_CALL Frame::removePropertyChangeListener(
 void SAL_CALL Frame::addVetoableChangeListener(
         const OUString& sProperty,
         const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-    throw(css::beans::UnknownPropertyException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException,
-          std::exception)
 {
     checkDisposed();
 
@@ -2093,10 +1944,6 @@ void SAL_CALL Frame::addVetoableChangeListener(
 void SAL_CALL Frame::removeVetoableChangeListener(
         const OUString& sProperty,
         const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-    throw(css::beans::UnknownPropertyException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException,
-          std::exception)
 {
     // SAFE ->
     SolarMutexClearableGuard aReadLock;
@@ -2112,7 +1959,6 @@ void SAL_CALL Frame::removeVetoableChangeListener(
 }
 
 css::uno::Sequence< css::beans::Property > SAL_CALL Frame::getProperties()
-    throw(css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -2133,8 +1979,6 @@ css::uno::Sequence< css::beans::Property > SAL_CALL Frame::getProperties()
 }
 
 css::beans::Property SAL_CALL Frame::getPropertyByName(const OUString& sName)
-    throw(css::beans::UnknownPropertyException,
-          css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -2148,7 +1992,6 @@ css::beans::Property SAL_CALL Frame::getPropertyByName(const OUString& sName)
 }
 
 sal_Bool SAL_CALL Frame::hasPropertyByName(const OUString& sName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     checkDisposed();
 
@@ -2366,14 +2209,12 @@ void SAL_CALL Frame::disposing()
     @onerror    Listener is ignored.
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
     m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
 }
 
 void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
 }
@@ -2390,7 +2231,6 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::
     @onerror    We return a null reference.
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusIndicator()
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
 
@@ -2436,7 +2276,6 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI
 css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( const css::util::URL& aURL,
                                                                             const OUString& sTargetFrameName,
                                                                             sal_Int32 nSearchFlags)
-    throw( css::uno::RuntimeException, std::exception )
 {
     // Don't check incoming parameter here! Our helper do it for us and it is not a good idea to do it more than ones!
 
@@ -2480,7 +2319,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
 *//*-*****************************************************************************************************/
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Frame::queryDispatches(
         const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
-    throw( css::uno::RuntimeException, std::exception )
 {
     // Don't check incoming parameter here! Our helper do it for us and it is not a good idea to do it more than ones!
 
@@ -2510,7 +2348,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::registerDispatchProviderInterceptor(
         const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor )
-    throw( css::uno::RuntimeException, std::exception )
 {
     // We use a helper to support these interface and an interceptor mechanism.
     // This helper is threadsafe himself and check incoming parameter too.
@@ -2530,7 +2367,6 @@ void SAL_CALL Frame::registerDispatchProviderInterceptor(
 
 void SAL_CALL Frame::releaseDispatchProviderInterceptor(
         const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor )
-    throw( css::uno::RuntimeException, std::exception )
 {
     // We use a helper to support these interface and an interceptor mechanism.
     // This helper is threadsafe himself and check incoming parameter too.
@@ -2553,14 +2389,12 @@ void SAL_CALL Frame::releaseDispatchProviderInterceptor(
                 inside the current frame environment
 *//*-*****************************************************************************************************/
 css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return m_xDispatchInfoHelper->getSupportedCommandGroups();
 }
 
 css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigurableDispatchInformation(
         sal_Int16 nCommandGroup)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return m_xDispatchInfoHelper->getConfigurableDispatchInformation(nCommandGroup);
 }
@@ -2576,7 +2410,6 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigu
     @param      "aEvent" describe source of detected event
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& )
-    throw( css::uno::RuntimeException, std::exception )
 {
     // Part of dispose-mechanism
 
@@ -2587,7 +2420,6 @@ void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& )
 }
 
 void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& )
-    throw( css::uno::RuntimeException, std::exception )
 {
     // Part of dispose() mechanism
 
@@ -2616,7 +2448,6 @@ void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& )
     @param      "aEvent" describe source of detected event
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::windowActivated( const css::lang::EventObject& )
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
 
@@ -2635,7 +2466,6 @@ void SAL_CALL Frame::windowActivated( const css::lang::EventObject& )
 }
 
 void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& )
-    throw( css::uno::RuntimeException, std::exception )
 {
     // Sometimes called during dispose()
 
@@ -2680,7 +2510,6 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& )
 }
 
 void SAL_CALL Frame::windowClosing( const css::lang::EventObject& )
-    throw( css::uno::RuntimeException, std::exception )
 {
     checkDisposed();
 
@@ -2734,7 +2563,6 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& )
     @threadsafe yes
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::windowShown( const css::lang::EventObject& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     static bool bFirstVisibleTask = true;
     static osl::Mutex aFirstVisibleLock;
@@ -2765,7 +2593,6 @@ void SAL_CALL Frame::windowShown( const css::lang::EventObject& )
 }
 
 void SAL_CALL Frame::windowHidden( const css::lang::EventObject& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     /* SAFE { */
     SolarMutexClearableGuard aReadLock;
@@ -2787,7 +2614,6 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& )
     @seealso    XFocusListener
 *//*-*****************************************************************************************************/
 void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent )
-    throw( css::uno::RuntimeException, std::exception )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexResettableGuard aWriteLock;
@@ -2818,21 +2644,18 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent )
     @threadsafe yes
 *//*-*************************************************************************************************************/
 sal_Bool SAL_CALL Frame::isActionLocked()
-    throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     return( m_nExternalLockCount!=0);
 }
 
 void SAL_CALL Frame::addActionLock()
-    throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     ++m_nExternalLockCount;
 }
 
 void SAL_CALL Frame::removeActionLock()
-    throw( css::uno::RuntimeException, std::exception )
 {
     {
         SolarMutexGuard g;
@@ -2845,7 +2668,6 @@ void SAL_CALL Frame::removeActionLock()
 }
 
 void SAL_CALL Frame::setActionLocks( sal_Int16 nLock )
-    throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     // Attention: If somewhere called resetActionLocks() before and get e.g. 5 locks ...
@@ -2856,7 +2678,6 @@ void SAL_CALL Frame::setActionLocks( sal_Int16 nLock )
 }
 
 sal_Int16 SAL_CALL Frame::resetActionLocks()
-    throw( css::uno::RuntimeException, std::exception )
 {
     sal_Int16 nCurrentLocks = 0;
     {
@@ -2985,8 +2806,6 @@ void Frame::impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::un
 }
 
 void SAL_CALL Frame::impl_addPropertyInfo(const css::beans::Property& aProperty)
-    throw(css::beans::PropertyExistException,
-          css::uno::Exception               )
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 38fbb1d77838..ac8a1f2ea52d 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -52,7 +52,6 @@ DEFINE_INIT_SERVICE                 (   MediaTypeDetectionHelper,
 //   XStringMapping
 
 sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(uno::Sequence< OUString >& rSeq)
-    throw (uno::RuntimeException, std::exception)
 {
     bool bModified = false;
     for( sal_Int32 i = rSeq.getLength(); i--; )
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();
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index e4440da6e30b..bd4488e664af 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -185,170 +185,160 @@ public:
     /** free all used resources ... if it was not already done. */
     virtual ~PathSettings() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.PathSettings");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         css::uno::Sequence< OUString > aSeq { "com.sun.star.util.PathSettings" };
         return aSeq;
     }
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
     virtual void SAL_CALL acquire() throw () override
         { OWeakObject::acquire(); }
     virtual void SAL_CALL release() throw () override
         { OWeakObject::release(); }
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     // css::util::XChangesListener
-    virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override;
 
     // css::lang::XEventListener
-    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;
 
     /**
      * XPathSettings attribute methods
      */
-    virtual OUString SAL_CALL getAddin() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getAddin() override
         { return getStringProperty("Addin"); }
-    virtual void SAL_CALL setAddin(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setAddin(const OUString& p1) override
         { setStringProperty("Addin", p1); }
-    virtual OUString SAL_CALL getAutoCorrect() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getAutoCorrect() override
         { return getStringProperty("AutoCorrect"); }
-    virtual void SAL_CALL setAutoCorrect(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setAutoCorrect(const OUString& p1) override
         { setStringProperty("AutoCorrect", p1); }
-    virtual OUString SAL_CALL getAutoText() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getAutoText() override
         { return getStringProperty("AutoText"); }
-    virtual void SAL_CALL setAutoText(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setAutoText(const OUString& p1) override
         { setStringProperty("AutoText", p1); }
-    virtual OUString SAL_CALL getBackup() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getBackup() override
         { return getStringProperty("Backup"); }
-    virtual void SAL_CALL setBackup(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setBackup(const OUString& p1) override
         { setStringProperty("Backup", p1); }
-    virtual OUString SAL_CALL getBasic() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getBasic() override
         { return getStringProperty("Basic"); }
-    virtual void SAL_CALL setBasic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setBasic(const OUString& p1) override
         { setStringProperty("Basic", p1); }
-    virtual OUString SAL_CALL getBitmap() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getBitmap() override
         { return getStringProperty("Bitmap"); }
-    virtual void SAL_CALL setBitmap(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setBitmap(const OUString& p1) override
         { setStringProperty("Bitmap", p1); }
-    virtual OUString SAL_CALL getConfig() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getConfig() override
         { return getStringProperty("Config"); }
-    virtual void SAL_CALL setConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setConfig(const OUString& p1) override
         { setStringProperty("Config", p1); }
-    virtual OUString SAL_CALL getDictionary() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getDictionary() override
         { return getStringProperty("Dictionary"); }
-    virtual void SAL_CALL setDictionary(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setDictionary(const OUString& p1) override
         { setStringProperty("Dictionary", p1); }
-    virtual OUString SAL_CALL getFavorite() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getFavorite() override
         { return getStringProperty("Favorite"); }
-    virtual void SAL_CALL setFavorite(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setFavorite(const OUString& p1) override
         { setStringProperty("Favorite", p1); }
-    virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getFilter() override
         { return getStringProperty("Filter"); }
-    virtual void SAL_CALL setFilter(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setFilter(const OUString& p1) override
         { setStringProperty("Filter", p1); }
-    virtual OUString SAL_CALL getGallery() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getGallery() override
         { return getStringProperty("Gallery"); }
-    virtual void SAL_CALL setGallery(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setGallery(const OUString& p1) override
         { setStringProperty("Gallery", p1); }
-    virtual OUString SAL_CALL getGraphic() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getGraphic() override
         { return getStringProperty("Graphic"); }
-    virtual void SAL_CALL setGraphic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setGraphic(const OUString& p1) override
         { setStringProperty("Graphic", p1); }
-    virtual OUString SAL_CALL getHelp() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getHelp() override
         { return getStringProperty("Help"); }
-    virtual void SAL_CALL setHelp(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setHelp(const OUString& p1) override
         { setStringProperty("Help", p1); }
-    virtual OUString SAL_CALL getLinguistic() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLinguistic() override
         { return getStringProperty("Linguistic"); }
-    virtual void SAL_CALL setLinguistic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setLinguistic(const OUString& p1) override
         { setStringProperty("Linguistic", p1); }
-    virtual OUString SAL_CALL getModule() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getModule() override
         { return getStringProperty("Module"); }
-    virtual void SAL_CALL setModule(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setModule(const OUString& p1) override
         { setStringProperty("Module", p1); }
-    virtual OUString SAL_CALL getPalette() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPalette() override
         { return getStringProperty("Palette"); }
-    virtual void SAL_CALL setPalette(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setPalette(const OUString& p1) override
         { setStringProperty("Palette", p1); }
-    virtual OUString SAL_CALL getPlugin() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPlugin() override
         { return getStringProperty("Plugin"); }
-    virtual void SAL_CALL setPlugin(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setPlugin(const OUString& p1) override
         { setStringProperty("Plugin", p1); }
-    virtual OUString SAL_CALL getStorage() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getStorage() override
         { return getStringProperty("Storage"); }
-    virtual void SAL_CALL setStorage(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setStorage(const OUString& p1) override
         { setStringProperty("Storage", p1); }
-    virtual OUString SAL_CALL getTemp() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getTemp() override
         { return getStringProperty("Temp"); }
-    virtual void SAL_CALL setTemp(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setTemp(const OUString& p1) override
         { setStringProperty("Temp", p1); }
-    virtual OUString SAL_CALL getTemplate() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getTemplate() override
         { return getStringProperty("Template"); }
-    virtual void SAL_CALL setTemplate(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setTemplate(const OUString& p1) override
         { setStringProperty("Template", p1); }
-    virtual OUString SAL_CALL getUIConfig() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getUIConfig() override
         { return getStringProperty("UIConfig"); }
-    virtual void SAL_CALL setUIConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setUIConfig(const OUString& p1) override
         { setStringProperty("UIConfig", p1); }
-    virtual OUString SAL_CALL getUserConfig() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getUserConfig() override
         { return getStringProperty("UserConfig"); }
-    virtual void SAL_CALL setUserConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setUserConfig(const OUString& p1) override
         { setStringProperty("UserConfig", p1); }
-    virtual OUString SAL_CALL getUserDictionary() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getUserDictionary() override
         { return getStringProperty("UserDictionary"); }
-    virtual void SAL_CALL setUserDictionary(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setUserDictionary(const OUString& p1) override
         { setStringProperty("UserDictionary", p1); }
-    virtual OUString SAL_CALL getWork() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getWork() override
         { return getStringProperty("Work"); }
-    virtual void SAL_CALL setWork(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setWork(const OUString& p1) override
         { setStringProperty("Work", p1); }
-    virtual OUString SAL_CALL getBasePathShareLayer() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getBasePathShareLayer() override
         { return getStringProperty("UIConfig"); }
-    virtual void SAL_CALL setBasePathShareLayer(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setBasePathShareLayer(const OUString& p1) override
         { setStringProperty("UIConfig", p1); }
-    virtual OUString SAL_CALL getBasePathUserLayer() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getBasePathUserLayer() override
         { return getStringProperty("UserConfig"); }
-    virtual void SAL_CALL setBasePathUserLayer(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setBasePathUserLayer(const OUString& p1) override
         { setStringProperty("UserConfig", p1); }
 
     /**
      * overrides to resolve inheritance ambiguity
      */
-    virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2)
-        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override
         { ::cppu::OPropertySetHelper::setPropertyValue(p1, p2); }
-    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1)
-        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override
         { return ::cppu::OPropertySetHelper::getPropertyValue(p1); }
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
-        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
         { ::cppu::OPropertySetHelper::addPropertyChangeListener(p1, p2); }
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
-        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
         { ::cppu::OPropertySetHelper::removePropertyChangeListener(p1, p2); }
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
-        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
         { ::cppu::OPropertySetHelper::addVetoableChangeListener(p1, p2); }
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
-        throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
         { ::cppu::OPropertySetHelper::removeVetoableChangeListener(p1, p2); }
     /** read all configured paths and create all needed internal structures. */
     void impl_readAll();
@@ -357,12 +347,10 @@ private:
     virtual void SAL_CALL disposing() final override;
 
     /// @throws css::uno::RuntimeException
-    OUString getStringProperty(const OUString& p1)
-        throw(css::uno::RuntimeException);
+    OUString getStringProperty(const OUString& p1);
 
     /// @throws css::uno::RuntimeException
-    void setStringProperty(const OUString& p1, const OUString& p2)
-        throw(css::uno::RuntimeException);
+    void setStringProperty(const OUString& p1, const OUString& p2);
 
     /** read a path info using the old cfg schema.
         This is needed for "migration on demand" reasons only.
@@ -438,9 +426,9 @@ private:
     virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any&  aConvertedValue,
             css::uno::Any& aOldValue,
             sal_Int32 nHandle,
-            const css::uno::Any& aValue ) throw(css::lang::IllegalArgumentException) override;
+            const css::uno::Any& aValue ) override;
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
-            const css::uno::Any&  aValue ) throw(css::uno::Exception, std::exception) override;
+            const css::uno::Any&  aValue ) override;
     virtual void SAL_CALL getFastPropertyValue( css::uno::Any&  aValue,
             sal_Int32 nHandle ) const override;
     // Avoid:
@@ -448,7 +436,7 @@ private:
     // warning:   by ‘virtual void {anonymous}::PathSettings::getFastPropertyValue(css::uno::Any&, sal_Int32) const’ [-Woverloaded-virtual]
     using cppu::OPropertySetHelper::getFastPropertyValue;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
     /** factory methods to guarantee right (but on demand) initialized members ... */
     css::uno::Reference< css::util::XStringSubstitution > fa_getSubstitution();
@@ -489,7 +477,6 @@ void SAL_CALL PathSettings::disposing()
 }
 
 css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aRet = PathSettings_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
@@ -498,7 +485,6 @@ css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rTyp
 }
 
 css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return comphelper::concatSequences(
         PathSettings_BASE::getTypes(),
@@ -507,7 +493,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes(  )
 }
 
 void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_Int32 c                 = aEvent.Changes.getLength();
     sal_Int32 i                 = 0;
@@ -537,7 +522,6 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven
 }
 
 void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
-    throw(css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
 
@@ -546,7 +530,6 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
 }
 
 OUString PathSettings::getStringProperty(const OUString& p1)
-    throw(css::uno::RuntimeException)
 {
     css::uno::Any a = ::cppu::OPropertySetHelper::getPropertyValue(p1);
     OUString s;
@@ -555,7 +538,6 @@ OUString PathSettings::getStringProperty(const OUString& p1)
 }
 
 void PathSettings::setStringProperty(const OUString& p1, const OUString& p2)
-    throw(css::uno::RuntimeException)
 {
     ::cppu::OPropertySetHelper::setPropertyValue(p1, css::uno::Any(p2));
 }
@@ -1387,7 +1369,6 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue(      css::uno::Any& aC
                                                                css::uno::Any& aOldValue      ,
                                                                sal_Int32      nHandle        ,
                                                          const css::uno::Any& aValue         )
-    throw(css::lang::IllegalArgumentException)
 {
     // throws NoSuchElementException !
     css::uno::Any aCurrentVal = impl_getPathValue(nHandle);
@@ -1401,7 +1382,6 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue(      css::uno::Any& aC
 
 void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast(      sal_Int32      nHandle,
                                                              const css::uno::Any& aValue )
-    throw(css::uno::Exception, std::exception)
 {
     // throws NoSuchElement- and IllegalArgumentException !
     impl_setPathValue(nHandle, aValue);
@@ -1419,7 +1399,6 @@ void SAL_CALL PathSettings::getFastPropertyValue(css::uno::Any& aValue ,
 }
 
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPropertySetInfo()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return css::uno::Reference< css::beans::XPropertySetInfo >(
             ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()));
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 8723177494c2..89be517fe071 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -110,46 +110,37 @@ public:
 
     virtual ~SessionListener() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.frame.SessionListener");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.SessionListener"};
     }
 
-    virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject&) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any  >& args) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any  >& args) override;
 
     // XSessionManagerListener
-    virtual void SAL_CALL doSave( sal_Bool bShutdown, sal_Bool bCancelable )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL approveInteraction( sal_Bool bInteractionGranted )
-        throw (css::uno::RuntimeException, std::exception) override;
-   virtual void SAL_CALL shutdownCanceled()
-        throw (css::uno::RuntimeException, std::exception) override;
-   virtual sal_Bool SAL_CALL doRestore()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL doSave( sal_Bool bShutdown, sal_Bool bCancelable ) override;
+    virtual void SAL_CALL approveInteraction( sal_Bool bInteractionGranted ) override;
+   virtual void SAL_CALL shutdownCanceled() override;
+   virtual sal_Bool SAL_CALL doRestore() override;
 
     // XSessionManagerListener2
-    virtual void SAL_CALL doQuit()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL doQuit() override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& event)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& event) override;
 };
 
 SessionListener::SessionListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext )
@@ -229,7 +220,7 @@ void SessionListener::QuitSessionQuietly()
     }
 }
 
-void SAL_CALL SessionListener::disposing(const css::lang::EventObject& Source) throw (RuntimeException, std::exception)
+void SAL_CALL SessionListener::disposing(const css::lang::EventObject& Source)
 {
     SAL_INFO("fwk.session", "SessionListener::disposing");
     if (Source.Source == m_rSessionManager) {
@@ -238,7 +229,6 @@ void SAL_CALL SessionListener::disposing(const css::lang::EventObject& Source) t
 }
 
 void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
-    throw (RuntimeException, std::exception)
 {
     SAL_INFO("fwk.session", "SessionListener::initialize");
 
@@ -274,7 +264,6 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
 }
 
 void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& event)
-    throw (css::uno::RuntimeException, std::exception)
 {
    SAL_INFO("fwk.session", "SessionListener::statusChanged");
 
@@ -297,7 +286,6 @@ void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& eve
 }
 
 sal_Bool SAL_CALL SessionListener::doRestore()
-    throw (RuntimeException, std::exception)
 {
     SAL_INFO("fwk.session", "SessionListener::doRestore");
     osl::MutexGuard g(m_aMutex);
@@ -322,7 +310,6 @@ sal_Bool SAL_CALL SessionListener::doRestore()
 }
 
 void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelable*/ )
-    throw (RuntimeException, std::exception)
 {
     SAL_INFO("fwk.session", "SessionListener::doSave");
 
@@ -342,7 +329,6 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelabl
 }
 
 void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted )
-    throw (RuntimeException, std::exception)
 {
     SAL_INFO("fwk.session", "SessionListener::approveInteraction");
     // do AutoSave as the first step
@@ -396,7 +382,6 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted
 }
 
 void SessionListener::shutdownCanceled()
-    throw (RuntimeException, std::exception)
 {
     SAL_INFO("fwk.session", "SessionListener::shutdownCanceled");
     // set the state back
@@ -404,7 +389,6 @@ void SessionListener::shutdownCanceled()
 }
 
 void SessionListener::doQuit()
-    throw (RuntimeException, std::exception)
 {
     SAL_INFO("fwk.session", "SessionListener::doQuit");
     if ( m_bSessionStoreRequested && !m_bTerminated )
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 861c973a3f1d..2f38a872a094 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -137,31 +137,25 @@ class SubstitutePathVariables : private cppu::BaseMutex,
 public:
     explicit SubstitutePathVariables(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.PathSubstitution");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.util.PathSubstitution"};
     }
 
     // XStringSubstitution
-    virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
-        throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable )
-        throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) override;
+    virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) override;
+    virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) override;
 
 protected:
     void            SetPredefinedPathVariables();
@@ -177,15 +171,12 @@ protected:
     // XStringSubstitution implementation methods
     /// @throws css::container::NoSuchElementException
     /// @throws css::uno::RuntimeException
-    OUString impl_substituteVariable( const OUString& aText, bool bSustRequired )
-        throw (css::container::NoSuchElementException, css::uno::RuntimeException);
+    OUString impl_substituteVariable( const OUString& aText, bool bSustRequired );
     /// @throws css::uno::RuntimeException
-    OUString impl_reSubstituteVariables( const OUString& aText )
-        throw (css::uno::RuntimeException);
+    OUString impl_reSubstituteVariables( const OUString& aText );
     /// @throws css::container::NoSuchElementException
     /// @throws css::uno::RuntimeException
-    OUString const & impl_getSubstituteVariableValue( const OUString& variable )
-        throw (css::container::NoSuchElementException, css::uno::RuntimeException);
+    OUString const & impl_getSubstituteVariableValue( const OUString& variable );
 
 private:
     typedef std::unordered_map<OUString, PreDefVariable, OUStringHash>
@@ -234,21 +225,18 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentCon
 
 // XStringSubstitution
 OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
-throw ( NoSuchElementException, RuntimeException, std::exception )
 {
     osl::MutexGuard g(rBHelper.rMutex);
     return impl_substituteVariable( aText, bSubstRequired );
 }
 
 OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const OUString& aText )
-throw ( RuntimeException, std::exception )
 {
     osl::MutexGuard g(rBHelper.rMutex);
     return impl_reSubstituteVariables( aText );
 }
 
 OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const OUString& aVariable )
-throw ( NoSuchElementException, RuntimeException, std::exception )
 {
     osl::MutexGuard g(rBHelper.rMutex);
     return impl_getSubstituteVariableValue( aVariable );
@@ -326,7 +314,6 @@ OUString SubstitutePathVariables::GetPathVariableValue() const
 }
 
 OUString SubstitutePathVariables::impl_substituteVariable( const OUString& rText, bool bSubstRequired )
-throw ( NoSuchElementException, RuntimeException )
 {
     // This is maximal recursive depth supported!
     const sal_Int32 nMaxRecursiveDepth = 8;
@@ -513,7 +500,6 @@ throw ( NoSuchElementException, RuntimeException )
 }
 
 OUString SubstitutePathVariables::impl_reSubstituteVariables( const OUString& rURL )
-throw ( RuntimeException )
 {
     OUString aURL;
 
@@ -594,7 +580,6 @@ throw ( RuntimeException )
 
 // This method support both request schemes "$("<varname>")" or "<varname>".
 OUString const & SubstitutePathVariables::impl_getSubstituteVariableValue( const OUString& rVariable )
-throw ( NoSuchElementException, RuntimeException )
 {
     OUString aVariable;
 
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index ca41f84236e0..d66eff4fcb09 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -65,32 +65,25 @@ public:
 
     explicit TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.TaskCreator");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.TaskCreator"};
     }
 
     // XSingleServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance()
-        throw(css::uno::Exception       ,
-              css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() override;
 
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments)
-        throw(css::uno::Exception       ,
-              css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments) override;
 
 private:
 
@@ -119,15 +112,11 @@ TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XCom
 }
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstance()
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArguments(css::uno::Sequence< css::uno::Any >());
 }
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments)
-    throw(css::uno::Exception       ,
-          css::uno::RuntimeException, std::exception)
 {
     ::comphelper::SequenceAsHashMap lArgs(lArguments);
 
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 5c924f1ae5bc..b6707cff57b3 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -48,7 +48,7 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex
 }
 
 // css::util::XStringAbbreviation:
-OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString)
 {
     OUString aResult( aString );
     if ( xStringWidth.is() )
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 5078747a264f..d84f5b6180d3 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -37,35 +37,28 @@ class URLTransformer : public ::cppu::WeakImplHelper< css::util::XURLTransformer
 public:
     URLTransformer() {}
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.URLTransformer");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.util.URLTransformer"};
     }
 
-    virtual sal_Bool SAL_CALL parseStrict( css::util::URL& aURL )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL parseStrict( css::util::URL& aURL ) override;
 
-    virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL, const OUString& sSmartProtocol )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL, const OUString& sSmartProtocol ) override;
 
-    virtual sal_Bool SAL_CALL assemble( css::util::URL& aURL )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL assemble( css::util::URL& aURL ) override;
 
-    virtual OUString SAL_CALL getPresentation( const css::util::URL& aURL, sal_Bool bWithPassword )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getPresentation( const css::util::URL& aURL, sal_Bool bWithPassword ) override;
 };
 
 namespace
@@ -121,7 +114,7 @@ namespace
 }
 
 //  XURLTransformer
-sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL )
 {
     // Safe impossible cases.
     if ( aURL.Complete.isEmpty() )
@@ -173,7 +166,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css
 //  XURLTransformer
 
 sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
-                                                const   OUString&    sSmartProtocol  ) throw( css::uno::RuntimeException, std::exception )
+                                                const   OUString&    sSmartProtocol  )
 {
     // Safe impossible cases.
     if ( aURL.Complete.isEmpty() )
@@ -225,7 +218,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
 }
 
 //  XURLTransformer
-sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL )
 {
     // Initialize parser.
     INetURLObject aParser;
@@ -284,7 +277,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u
 //  XURLTransformer
 
 OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL,
-                                                            sal_Bool    bWithPassword   ) throw( css::uno::RuntimeException, std::exception )
+                                                            sal_Bool    bWithPassword   )
 {
     // Safe impossible cases.
     if  ( aURL.Complete.isEmpty() )
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index f92628f81597..6d92e2fcbde4 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -257,7 +257,6 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl, bool )
 // XInitialization
 
 void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     const OUString aTopWindowArgName( "TopWindow" );
     const OUString aSizeArgName( "Size" );
@@ -411,7 +410,7 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 
 //  XComponent
 
-void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL TabWindow::dispose()
 {
     // Send message to all listener and forget her references.
     css::uno::Reference< css::lang::XComponent > xThis(
@@ -451,7 +450,6 @@ void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException, std::excep
 }
 
 void SAL_CALL TabWindow::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aLock;
@@ -464,7 +462,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL TabWindow::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aLock;
@@ -479,25 +476,21 @@ throw (css::uno::RuntimeException, std::exception)
 // XEventListener
 
 void SAL_CALL TabWindow::disposing( const css::lang::EventObject& )
-throw( css::uno::RuntimeException, std::exception )
 {
 }
 
 // XWindowListener
 
 void SAL_CALL TabWindow::windowResized( const css::awt::WindowEvent& )
-throw( css::uno::RuntimeException, std::exception )
 {
     implts_LayoutWindows();
 }
 
 void SAL_CALL TabWindow::windowMoved( const css::awt::WindowEvent& )
-throw( css::uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL TabWindow::windowShown( const css::lang::EventObject& )
-throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -514,7 +507,6 @@ throw( css::uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL TabWindow::windowHidden( const css::lang::EventObject& )
-throw( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     if ( m_xContainerWindow.is() )
@@ -532,12 +524,10 @@ throw( css::uno::RuntimeException, std::exception )
 // XTopWindowListener
 
 void SAL_CALL TabWindow::windowOpened( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL TabWindow::windowClosing( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::lang::XComponent > xComponent( static_cast<OWeakObject *>(this), css::uno::UNO_QUERY );
     if ( xComponent.is() )
@@ -545,34 +535,28 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL TabWindow::windowClosed( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL TabWindow::windowMinimized( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL TabWindow::windowNormalized( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL TabWindow::windowActivated( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL TabWindow::windowDeactivated( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 //  XSimpleTabController
 
 ::sal_Int32 SAL_CALL TabWindow::insertTab()
-throw (css::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aLock;
@@ -595,7 +579,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL TabWindow::removeTab( ::sal_Int32 ID )
-throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aLock;
@@ -624,7 +607,6 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
 }
 
 void SAL_CALL TabWindow::setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties )
-throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aLock;
@@ -670,7 +652,6 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
 }
 
 css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindow::getTabProps( ::sal_Int32 ID )
-throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -703,7 +684,6 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
 }
 
 void SAL_CALL TabWindow::activateTab( ::sal_Int32 ID )
-throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aLock;
@@ -736,7 +716,6 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
 }
 
 ::sal_Int32 SAL_CALL TabWindow::getActiveTabID()
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -758,7 +737,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 void SAL_CALL TabWindow::addTabListener(
     const css::uno::Reference< css::awt::XTabListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aLock;
@@ -772,7 +750,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL TabWindow::removeTabListener( const css::uno::Reference< css::awt::XTabListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     SolarMutexClearableGuard aLock;
@@ -792,7 +769,6 @@ sal_Bool SAL_CALL TabWindow::convertFastPropertyValue( css::uno::Any&       aCon
                                                        css::uno::Any&       aOldValue       ,
                                                        sal_Int32            nHandle         ,
                                                        const css::uno::Any& aValue             )
-throw( css::lang::IllegalArgumentException )
 {
     //  Initialize state with sal_False !!!
     //  (Handle can be invalid)
@@ -823,7 +799,6 @@ throw( css::lang::IllegalArgumentException )
 
 void SAL_CALL TabWindow::setFastPropertyValue_NoBroadcast( sal_Int32,
                                                            const css::uno::Any&)
-throw( css::uno::Exception, std::exception )
 {
 }
 
@@ -868,7 +843,6 @@ void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue  ,
 }
 
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL TabWindow::getPropertySetInfo()
-throw ( css::uno::RuntimeException, std::exception )
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index e343a78b2a1d..87e3f23340f6 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -60,7 +60,6 @@ TabWinFactory::~TabWinFactory()
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL TabWinFactory::createInstanceWithContext(
     const css::uno::Reference< css::uno::XComponentContext >& xContext )
-throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     css::uno::Sequence< css::uno::Any > aArgs;
 
@@ -69,7 +68,6 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL TabWinFactory::createInstanceWithArgumentsAndContext(
     const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& )
-throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     const OUString aTopWindowArgName( "TopWindow");
 
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 214ff1f79322..c5e8e2b3710b 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -52,12 +52,12 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper<
         explicit GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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;
 
         // settings access
         bool HasStatesInfo( GlobalSettings::UIElementType eElementType );
@@ -90,7 +90,6 @@ GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::un
 
 // XComponent
 void SAL_CALL GlobalSettings_Access::dispose()
-throw ( css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard g(m_mutex);
     m_xConfigAccess.clear();
@@ -98,18 +97,15 @@ throw ( css::uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL GlobalSettings_Access::addEventListener( const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL GlobalSettings_Access::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 // XEventListener
 void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_mutex);
     m_xConfigAccess.clear();
diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx
index 2b12988f5c2e..029d34d05cd3 100644
--- a/framework/source/uiconfiguration/graphicnameaccess.cxx
+++ b/framework/source/uiconfiguration/graphicnameaccess.cxx
@@ -41,9 +41,6 @@ void GraphicNameAccess::addElement( const OUString& rName, const uno::Reference<
 
 // XNameAccess
 uno::Any SAL_CALL GraphicNameAccess::getByName( const OUString& aName )
-throw( container::NoSuchElementException,
-       lang::WrappedTargetException,
-       uno::RuntimeException, std::exception)
 {
     NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName );
     if ( pIter != m_aNameToElementMap.end() )
@@ -53,7 +50,6 @@ throw( container::NoSuchElementException,
 }
 
 uno::Sequence< OUString > SAL_CALL GraphicNameAccess::getElementNames()
-throw(css::uno::RuntimeException, std::exception)
 {
     if ( m_aSeq.getLength() == 0 )
     {
@@ -64,7 +60,6 @@ throw(css::uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL GraphicNameAccess::hasByName( const OUString& aName )
-throw(css::uno::RuntimeException, std::exception)
 {
     NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName );
     return ( pIter != m_aNameToElementMap.end() );
@@ -72,13 +67,11 @@ throw(css::uno::RuntimeException, std::exception)
 
 // XElementAccess
 sal_Bool SAL_CALL GraphicNameAccess::hasElements()
-throw( uno::RuntimeException, std::exception )
 {
     return ( !m_aNameToElementMap.empty() );
 }
 
 uno::Type SAL_CALL GraphicNameAccess::getElementType()
-throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<graphic::XGraphic>::get();
 }
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 045529ba03b4..00519550bfe5 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -66,17 +66,17 @@ ImageManager::~ImageManager()
 }
 
 // XComponent
-void SAL_CALL ImageManager::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ImageManager::dispose()
 {
     m_pImpl->dispose();
 }
 
-void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener )
 {
     m_pImpl->addEventListener(xListener);
 }
 
-void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_pImpl->removeEventListener(xListener);
@@ -84,7 +84,6 @@ void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventLis
 
 // Non-UNO methods
 void ImageManager::setStorage( const uno::Reference< XStorage >& Storage )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
@@ -93,29 +92,24 @@ throw (css::uno::RuntimeException)
 }
 
 // XInitialization
-void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments )
 {
     m_pImpl->initialize(aArguments);
 }
 
 // XImageManager
 void SAL_CALL ImageManager::reset()
-    throw (css::lang::IllegalAccessException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_pImpl->reset();
 }
 
 Sequence< OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType )
-throw (css::uno::RuntimeException, std::exception)
 {
     return m_pImpl->getAllImageNames( nImageType );
 }
 
 sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     return m_pImpl->hasImage(nImageType,aCommandURL);
 }
@@ -123,7 +117,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
 Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages(
     ::sal_Int16 nImageType,
     const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
     return m_pImpl->getImages(nImageType,aCommandURLSequence);
 }
@@ -132,39 +125,27 @@ void SAL_CALL ImageManager::replaceImages(
     ::sal_Int16 nImageType,
     const Sequence< OUString >& aCommandURLSequence,
     const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
-throw ( css::lang::IllegalArgumentException,
-        css::lang::IllegalAccessException,
-        css::uno::RuntimeException, std::exception)
 {
     m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
 }
 
 void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException,
-        css::lang::IllegalAccessException,
-        css::uno::RuntimeException, std::exception)
 {
     m_pImpl->removeImages(nImageType,aCommandURLSequence);
 }
 
 void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
-throw ( css::container::ElementExistException,
-        css::lang::IllegalArgumentException,
-        css::lang::IllegalAccessException,
-        css::uno::RuntimeException, std::exception)
 {
     m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence);
 }
 
 // XUIConfiguration
 void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
 {
     m_pImpl->addConfigurationListener(xListener);
 }
 
 void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_pImpl->removeConfigurationListener(xListener);
@@ -172,31 +153,26 @@ throw (css::uno::RuntimeException, std::exception)
 
 // XUIConfigurationPersistence
 void SAL_CALL ImageManager::reload()
-throw ( css::uno::Exception,
-        css::uno::RuntimeException, std::exception )
 {
     m_pImpl->reload();
 }
 
 void SAL_CALL ImageManager::store()
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     m_pImpl->store();
 }
 
 void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     m_pImpl->storeToStorage(Storage);
 }
 
 sal_Bool SAL_CALL ImageManager::isModified()
-throw (css::uno::RuntimeException, std::exception)
 {
     return m_pImpl->isModified();
 }
 
-sal_Bool SAL_CALL ImageManager::isReadOnly() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ImageManager::isReadOnly()
 {
     return m_pImpl->isReadOnly();
 }
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 33c6dd7abe9f..a479bac0498a 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -556,7 +556,7 @@ void ImageManagerImpl::dispose()
     }
 
 }
-void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException)
+void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener )
 {
     {
         SolarMutexGuard g;
@@ -569,7 +569,7 @@ void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >&
     m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
-void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException)
+void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener >& xListener )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
@@ -621,7 +621,6 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
 
 // XImageManagerImpl
 void ImageManagerImpl::reset()
-throw (css::uno::RuntimeException, lang::IllegalAccessException)
 {
     SolarMutexGuard g;
 
@@ -648,7 +647,6 @@ throw (css::uno::RuntimeException, lang::IllegalAccessException)
 }
 
 Sequence< OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
@@ -687,7 +685,6 @@ throw (css::uno::RuntimeException)
 }
 
 bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
@@ -728,7 +725,6 @@ namespace
 Sequence< uno::Reference< XGraphic > > ImageManagerImpl::getImages(
     ::sal_Int16 nImageType,
     const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException )
 {
     SolarMutexGuard g;
 
@@ -777,10 +773,6 @@ void ImageManagerImpl::replaceImages(
     ::sal_Int16 nImageType,
     const Sequence< OUString >& aCommandURLSequence,
     const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
-throw (css::lang::IllegalArgumentException,
-       css::lang::IllegalAccessException,
-       css::uno::RuntimeException,
-       std::exception)
 {
     CmdToXGraphicNameAccess* pInsertedImages( nullptr );
     CmdToXGraphicNameAccess* pReplacedImages( nullptr );
@@ -861,9 +853,6 @@ throw (css::lang::IllegalArgumentException,
 }
 
 void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException,
-        css::lang::IllegalAccessException,
-        css::uno::RuntimeException)
 {
     CmdToXGraphicNameAccess* pRemovedImages( nullptr );
     CmdToXGraphicNameAccess* pReplacedImages( nullptr );
@@ -964,19 +953,12 @@ throw ( css::lang::IllegalArgumentException,
 }
 
 void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
-throw ( css::container::ElementExistException,
-        css::lang::IllegalArgumentException,
-        css::lang::IllegalAccessException,
-        css::uno::RuntimeException)
 {
     replaceImages(nImageType,aCommandURLSequence,aGraphicSequence);
 }
 
 // XUIConfigurationPersistence
 void ImageManagerImpl::reload()
-    throw (css::uno::Exception,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexClearableGuard aGuard;
 
@@ -1126,9 +1108,6 @@ void ImageManagerImpl::reload()
 }
 
 void ImageManagerImpl::store()
-    throw (css::uno::Exception,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard g;
 
@@ -1161,9 +1140,6 @@ void ImageManagerImpl::store()
 }
 
 void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage )
-    throw (css::uno::Exception,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard g;
 
@@ -1194,20 +1170,18 @@ void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage
 }
 
 bool ImageManagerImpl::isModified()
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
     return m_bModified;
 }
 
-bool ImageManagerImpl::isReadOnly() throw (css::uno::RuntimeException)
+bool ImageManagerImpl::isReadOnly()
 {
     SolarMutexGuard g;
     return m_bReadOnly;
 }
 // XUIConfiguration
 void ImageManagerImpl::addConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException)
 {
     {
         SolarMutexGuard g;
@@ -1221,7 +1195,6 @@ throw (css::uno::RuntimeException)
 }
 
 void ImageManagerImpl::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException)
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_aListenerContainer.removeInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 7b439045b17e..746b0b68d323 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -95,62 +95,56 @@ namespace framework
             void dispose();
             void initialize( const css::uno::Sequence< css::uno::Any >& aArguments );
             /// @throws css::uno::RuntimeException
-            void addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException);
+            void addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener );
             /// @throws css::uno::RuntimeException
-            void removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException);
+            void removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener );
 
             // XImageManager
             /// @throws css::uno::RuntimeException
             /// @throws css::lang::IllegalAccessException
-            void reset() throw (css::uno::RuntimeException, css::lang::IllegalAccessException);
+            void reset();
             /// @throws css::uno::RuntimeException
-            css::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException);
+            css::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType );
             /// @throws css::lang::IllegalArgumentException
             /// @throws css::uno::RuntimeException
-            bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL );
             /// @throws css::lang::IllegalArgumentException
             /// @throws css::uno::RuntimeException
-            css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence );
             /// @throws css::lang::IllegalArgumentException
             /// @throws css::lang::IllegalAccessException
             /// @throws css::uno::RuntimeException
-            void replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception);
+            void replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence );
             /// @throws css::lang::IllegalArgumentException
             /// @throws css::lang::IllegalAccessException
             /// @throws css::uno::RuntimeException
-            void removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
+            void removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence );
             /// @throws css::container::ElementExistException
             /// @throws css::lang::IllegalArgumentException
             /// @throws css::lang::IllegalAccessException
             /// @throws css::uno::RuntimeException
-            void insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
+            void insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence );
 
             // XUIConfiguration
             /// @throws css::uno::RuntimeException
-            void addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException);
+            void addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener );
             /// @throws css::uno::RuntimeException
-            void removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException);
+            void removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener );
 
             // XUIConfigurationPersistence
             /// @throws css::uno::Exception
             /// @throws css::uno::RuntimeException
-            void reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
+            void reload();
             /// @throws css::uno::Exception
             /// @throws css::uno::RuntimeException
-            void store()
-                throw (css::uno::Exception,
-                       css::uno::RuntimeException,
-                       std::exception);
+            void store();
             /// @throws css::uno::Exception
             /// @throws css::uno::RuntimeException
-            void storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage )
-                throw (css::uno::Exception,
-                       css::uno::RuntimeException,
-                       std::exception);
+            void storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage );
             /// @throws css::uno::RuntimeException
-            bool isModified() throw (css::uno::RuntimeException);
+            bool isModified();
             /// @throws css::uno::RuntimeException
-            bool isReadOnly() throw (css::uno::RuntimeException);
+            bool isReadOnly();
 
             void clear();
 
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 323e9ab6417b..e5b6069d29fd 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -73,45 +73,40 @@ ModuleImageManager::~ModuleImageManager()
 }
 
 // XComponent
-void SAL_CALL ModuleImageManager::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleImageManager::dispose()
 {
     m_pImpl->dispose();
 }
 
-void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener )
 {
     m_pImpl->addEventListener(xListener);
 }
 
-void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_pImpl->removeEventListener(xListener);
 }
 
 // XInitialization
-void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments )
 {
     m_pImpl->initialize(aArguments);
 }
 
 // XImageManager
 void SAL_CALL ModuleImageManager::reset()
-    throw (css::lang::IllegalAccessException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     m_pImpl->reset();
 }
 
 Sequence< OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType )
-throw (css::uno::RuntimeException, std::exception)
 {
     return m_pImpl->getAllImageNames( nImageType );
 }
 
 sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     return m_pImpl->hasImage(nImageType,aCommandURL);
 }
@@ -119,7 +114,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
 Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages(
     ::sal_Int16 nImageType,
     const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
     SAL_INFO( "fwk", "framework: ModuleImageManager::getImages" );
     return m_pImpl->getImages(nImageType,aCommandURLSequence);
@@ -129,70 +123,53 @@ void SAL_CALL ModuleImageManager::replaceImages(
     ::sal_Int16 nImageType,
     const Sequence< OUString >& aCommandURLSequence,
     const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
-throw ( css::lang::IllegalArgumentException,
-        css::lang::IllegalAccessException,
-        css::uno::RuntimeException, std::exception)
 {
     m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
 }
 
 void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException,
-        css::lang::IllegalAccessException,
-        css::uno::RuntimeException, std::exception)
 {
     m_pImpl->removeImages(nImageType,aCommandURLSequence);
 }
 
 void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
-throw ( css::container::ElementExistException,
-        css::lang::IllegalArgumentException,
-        css::lang::IllegalAccessException,
-        css::uno::RuntimeException, std::exception)
 {
     m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence);
 }
 
 // XUIConfiguration
 void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
 {
     m_pImpl->addConfigurationListener(xListener);
 }
 
 void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
 {
     m_pImpl->removeConfigurationListener(xListener);
 }
 
 // XUIConfigurationPersistence
 void SAL_CALL ModuleImageManager::reload()
-throw ( css::uno::Exception,
-        css::uno::RuntimeException, std::exception )
 {
     m_pImpl->reload();
 }
 
 void SAL_CALL ModuleImageManager::store()
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     m_pImpl->store();
 }
 
 void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     m_pImpl->storeToStorage(Storage);
 }
 
 sal_Bool SAL_CALL ModuleImageManager::isModified()
-throw (css::uno::RuntimeException, std::exception)
 {
     return m_pImpl->isModified();
 }
 
-sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ModuleImageManager::isReadOnly()
 {
     return m_pImpl->isReadOnly();
 }
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 7fe50526c919..b4d1a0e6fffd 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -65,27 +65,23 @@ public:
     explicit ModuleUIConfigurationManagerSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~ModuleUIConfigurationManagerSupplier() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.ModuleUIConfigurationManagerSupplier"};
     }
 
     // XModuleUIConfigurationManagerSupplier
-    virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const OUString& ModuleIdentifier )
-        throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const OUString& ModuleIdentifier ) override;
 
 private:
     virtual void SAL_CALL disposing() final override;
@@ -142,7 +138,6 @@ void SAL_CALL ModuleUIConfigurationManagerSupplier::disposing()
 
 // XModuleUIConfigurationManagerSupplier
 Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const OUString& sModuleIdentifier )
-throw ( NoSuchElementException, RuntimeException, std::exception)
 {
     osl::MutexGuard g(rBHelper.rMutex);
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 5b57820985e4..dd6cf09050a9 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -80,56 +80,53 @@ public:
 
     virtual ~ModuleUIConfigurationManager() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManager");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.ModuleUIConfigurationManager"};
     }
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XUIConfiguration
-    virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
+    virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
 
     // XUIConfigurationManager
-    virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reset() override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) override;
+    virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings(  ) override;
+    virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) override;
+    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) override;
+    virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+    virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) override;
+    virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() override;
+    virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() override;
 
     // XModuleUIConfigurationManager
-    virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) override;
+    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) override;
 
     // XUIConfigurationPersistence
-    virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reload() override;
+    virtual void SAL_CALL store() override;
+    virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+    virtual sal_Bool SAL_CALL isModified() override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
 
 private:
     // private data types
@@ -927,7 +924,7 @@ ModuleUIConfigurationManager::~ModuleUIConfigurationManager()
 }
 
 // XComponent
-void SAL_CALL ModuleUIConfigurationManager::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -962,7 +959,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (css::uno::RuntimeEx
     }
 }
 
-void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener )
 {
     {
         SolarMutexGuard g;
@@ -975,14 +972,14 @@ void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< X
     m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
-void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 // XUIConfiguration
-void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
 {
     {
         SolarMutexGuard g;
@@ -995,14 +992,14 @@ void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Refe
     m_aListenerContainer.addInterface( cppu::UnoType<ui::XUIConfigurationListener>::get(), xListener );
 }
 
-void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_aListenerContainer.removeInterface( cppu::UnoType<ui::XUIConfigurationListener>::get(), xListener );
 }
 
 // XUIConfigurationManager
-void SAL_CALL ModuleUIConfigurationManager::reset() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::reset()
 {
     SolarMutexClearableGuard aGuard;
 
@@ -1090,7 +1087,6 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (css::uno::RuntimeExce
 }
 
 Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType )
-throw ( IllegalArgumentException, RuntimeException, std::exception )
 {
     if (( ElementType < 0 ) || ( ElementType >= css::ui::UIElementType::COUNT ))
         throw IllegalArgumentException();
@@ -1129,7 +1125,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception )
     return comphelper::containerToSequence(aElementInfoSeq);
 }
 
-Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (css::uno::RuntimeException, std::exception)
+Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings()
 {
     SolarMutexGuard g;
 
@@ -1141,7 +1137,6 @@ Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettin
 }
 
 sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const OUString& ResourceURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -1164,7 +1159,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
 }
 
 Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -1193,7 +1187,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
 }
 
 void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< css::container::XIndexAccess >& aNewData )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -1302,7 +1295,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
 }
 
 void SAL_CALL ModuleUIConfigurationManager::removeSettings( const OUString& ResourceURL )
-throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -1381,7 +1373,6 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException
 }
 
 void SAL_CALL ModuleUIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
-throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception )
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
 
@@ -1442,7 +1433,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException,
     }
 }
 
-Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
 {
     SolarMutexGuard g;
 
@@ -1473,7 +1464,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
     return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY );
 }
 
-Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (css::uno::RuntimeException, std::exception)
+Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager()
 {
     SolarMutexGuard g;
 
@@ -1494,14 +1485,13 @@ Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager
     return m_xModuleAcceleratorManager;
 }
 
-Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager()
 {
     return Reference< XInterface >();
 }
 
 // XModuleUIConfigurationManager
 sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const OUString& ResourceURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -1524,7 +1514,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
 }
 
 Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const OUString& ResourceURL )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -1557,7 +1546,7 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
 }
 
 // XUIConfigurationPersistence
-void SAL_CALL ModuleUIConfigurationManager::reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::reload()
 {
     SolarMutexClearableGuard aGuard;
 
@@ -1598,7 +1587,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (css::uno::Exception,
     }
 }
 
-void SAL_CALL ModuleUIConfigurationManager::store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::store()
 {
     SolarMutexGuard g;
 
@@ -1631,7 +1620,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (css::uno::Exception,
     }
 }
 
-void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage )
 {
     SolarMutexGuard g;
 
@@ -1664,14 +1653,14 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt
     }
 }
 
-sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified()
 {
     SolarMutexGuard g;
 
     return m_bModified;
 }
 
-sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly()
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 4efa5a8c2c9c..c121d1ab3e57 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -59,29 +59,24 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
         virtual                   ~ConfigurationAccess_UICategory() override;
 
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-            throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) 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;
 
         // container.XContainerListener
-        virtual void SAL_CALL     elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL     elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL     elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL     elementInserted( const ContainerEvent& aEvent ) override;
+        virtual void SAL_CALL     elementRemoved ( const ContainerEvent& aEvent ) override;
+        virtual void SAL_CALL     elementReplaced( const ContainerEvent& aEvent ) override;
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& aEvent ) override;
 
     protected:
         Any                       getUINameFromID( const OUString& rId );
@@ -133,7 +128,6 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory()
 
 // XNameAccess
 Any SAL_CALL ConfigurationAccess_UICategory::getByName( const OUString& rId )
-throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     osl::MutexGuard g(aMutex);
     if ( !m_bConfigAccessInitialized )
@@ -153,26 +147,22 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::e
 }
 
 Sequence< OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames()
-throw ( RuntimeException, std::exception )
 {
     return getAllIds();
 }
 
 sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const OUString& rId )
-throw (css::uno::RuntimeException, std::exception)
 {
     return getByName( rId ).hasValue();
 }
 
 // XElementAccess
 Type SAL_CALL ConfigurationAccess_UICategory::getElementType()
-throw ( RuntimeException, std::exception )
 {
     return( cppu::UnoType<OUString>::get());
 }
 
 sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements()
-throw ( RuntimeException, std::exception )
 {
     // There must be global categories!
     return true;
@@ -338,20 +328,20 @@ void ConfigurationAccess_UICategory::initializeConfigAccess()
 }
 
 // container.XContainerListener
-void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& )
 {
 }
 
-void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& )
 {
 }
 
-void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& )
 {
 }
 
 // lang.XEventListener
-void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent )
 {
     // SAFE
     // remove our reference to the config access
@@ -368,20 +358,17 @@ class UICategoryDescription :  public UICommandDescription
 public:
     explicit UICategoryDescription( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.UICategoryDescription");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.UICategoryDescription"};
     }
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index fa0ee57bdfd0..cf746c77faa5 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -65,20 +65,17 @@ class UIConfigurationManager :   public ::cppu::WeakImplHelper<
                                         css::ui::XUIConfigurationManager2 >
 {
 public:
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.UIConfigurationManager");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.UIConfigurationManager"};
     }
@@ -86,37 +83,37 @@ public:
     explicit UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext );
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XUIConfiguration
-    virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
+    virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
 
     // XUIConfigurationManager
-    virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reset() override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) override;
+    virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings(  ) override;
+    virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) override;
+    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) override;
+    virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+    virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) override;
+    virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() override;
+    virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() override;
 
     // XUIConfigurationPersistence
-    virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reload() override;
+    virtual void SAL_CALL store() override;
+    virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+    virtual sal_Bool SAL_CALL isModified() override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
 
     // XUIConfigurationStorage
-    virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasStorage() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+    virtual sal_Bool SAL_CALL hasStorage() override;
 
 private:
     // private data types
@@ -693,7 +690,7 @@ UIConfigurationManager::UIConfigurationManager( const css::uno::Reference< css::
 }
 
 // XComponent
-void SAL_CALL UIConfigurationManager::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -719,7 +716,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (css::uno::RuntimeExceptio
     }
 }
 
-void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener )
 {
     {
         SolarMutexGuard g;
@@ -732,14 +729,14 @@ void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventL
     m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
-void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 // XUIConfigurationManager
-void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
 {
     {
         SolarMutexGuard g;
@@ -752,13 +749,13 @@ void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference<
     m_aListenerContainer.addInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
 }
 
-void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_aListenerContainer.removeInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
 }
 
-void SAL_CALL UIConfigurationManager::reset() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::reset()
 {
     SolarMutexClearableGuard aGuard;
 
@@ -844,7 +841,6 @@ void SAL_CALL UIConfigurationManager::reset() throw (css::uno::RuntimeException,
 }
 
 Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType )
-throw ( IllegalArgumentException, RuntimeException, std::exception )
 {
     if (( ElementType < 0 ) || ( ElementType >= css::ui::UIElementType::COUNT ))
         throw IllegalArgumentException();
@@ -883,7 +879,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception )
     return comphelper::containerToSequence(aElementInfoSeq);
 }
 
-Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (css::uno::RuntimeException, std::exception)
+Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings()
 {
     SolarMutexGuard g;
 
@@ -895,7 +891,6 @@ Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() t
 }
 
 sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const OUString& ResourceURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -913,7 +908,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
 }
 
 Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -942,7 +936,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
 }
 
 void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< css::container::XIndexAccess >& aNewData )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -1001,7 +994,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
 }
 
 void SAL_CALL UIConfigurationManager::removeSettings( const OUString& ResourceURL )
-throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception)
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
 
@@ -1059,7 +1051,6 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException
 }
 
 void SAL_CALL UIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
-throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception )
 {
     sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
 
@@ -1132,7 +1123,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException,
     }
 }
 
-Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager()
 {
     if ( m_bDisposed )
         throw DisposedException();
@@ -1158,7 +1149,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw
     return Reference< XInterface >( m_xImageManager, UNO_QUERY );
 }
 
-Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager()
 {
     // SAFE ->
     SolarMutexGuard g;
@@ -1177,13 +1168,13 @@ Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShort
     return m_xAccConfig;
 }
 
-Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager()
 {
     return Reference< XInterface >();
 }
 
 // XUIConfigurationStorage
-void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage )
 {
     SolarMutexGuard g;
 
@@ -1243,7 +1234,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S
     impl_Initialize();
 }
 
-sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UIConfigurationManager::hasStorage()
 {
     SolarMutexGuard g;
 
@@ -1254,7 +1245,7 @@ sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (css::uno::RuntimeE
 }
 
 // XUIConfigurationPersistence
-void SAL_CALL UIConfigurationManager::reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::reload()
 {
     SolarMutexClearableGuard aGuard;
 
@@ -1293,7 +1284,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (css::uno::Exception, css::
     }
 }
 
-void SAL_CALL UIConfigurationManager::store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::store()
 {
     SolarMutexGuard g;
 
@@ -1326,7 +1317,7 @@ void SAL_CALL UIConfigurationManager::store() throw (css::uno::Exception, css::u
     }
 }
 
-void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage )
 {
     SolarMutexGuard g;
 
@@ -1359,14 +1350,14 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage
     }
 }
 
-sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UIConfigurationManager::isModified()
 {
     SolarMutexGuard g;
 
     return m_bModified;
 }
 
-sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UIConfigurationManager::isReadOnly()
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 614df9f71df0..9194f45ccdc6 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -107,40 +107,32 @@ class ConfigurationAccess_WindowState : public  ::cppu::WeakImplHelper< XNameCon
         virtual                   ~ConfigurationAccess_WindowState() override;
 
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-            throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
         // XNameContainer
-        virtual void SAL_CALL removeByName( const OUString& sName )
-            throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL removeByName( const OUString& sName ) override;
 
-        virtual void SAL_CALL insertByName( const OUString& sName, const css::uno::Any&   aPropertySet )
-            throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL insertByName( const OUString& sName, const css::uno::Any&   aPropertySet ) override;
 
         // XNameReplace
-        virtual void SAL_CALL replaceByName( const OUString& sName, const css::uno::Any& aPropertySet )
-            throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL replaceByName( const OUString& sName, const css::uno::Any& aPropertySet ) 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;
 
         // container.XContainerListener
-        virtual void SAL_CALL     elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL     elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL     elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL     elementInserted( const ContainerEvent& aEvent ) override;
+        virtual void SAL_CALL     elementRemoved ( const ContainerEvent& aEvent ) override;
+        virtual void SAL_CALL     elementReplaced( const ContainerEvent& aEvent ) override;
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& aEvent ) override;
 
     protected:
         enum WindowStateMask
@@ -251,7 +243,6 @@ ConfigurationAccess_WindowState::~ConfigurationAccess_WindowState()
 
 // XNameAccess
 Any SAL_CALL ConfigurationAccess_WindowState::getByName( const OUString& rResourceURL )
-throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     // SAFE
     osl::MutexGuard g(m_aMutex);
@@ -270,7 +261,6 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::e
 }
 
 Sequence< OUString > SAL_CALL ConfigurationAccess_WindowState::getElementNames()
-throw ( RuntimeException, std::exception )
 {
     // SAFE
     osl::MutexGuard g(m_aMutex);
@@ -288,7 +278,6 @@ throw ( RuntimeException, std::exception )
 }
 
 sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const OUString& rResourceURL )
-throw (css::uno::RuntimeException, std::exception)
 {
     // SAFE
     osl::MutexGuard g(m_aMutex);
@@ -308,13 +297,11 @@ throw (css::uno::RuntimeException, std::exception)
 
 // XElementAccess
 Type SAL_CALL ConfigurationAccess_WindowState::getElementType()
-throw ( RuntimeException, std::exception )
 {
     return( cppu::UnoType<Sequence< PropertyValue >>::get() );
 }
 
 sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasElements()
-throw ( RuntimeException, std::exception )
 {
     // SAFE
     osl::MutexGuard g(m_aMutex);
@@ -333,7 +320,6 @@ throw ( RuntimeException, std::exception )
 
 // XNameContainer
 void SAL_CALL ConfigurationAccess_WindowState::removeByName( const OUString& rResourceURL )
-throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
 {
     // SAFE
     osl::ResettableMutexGuard g(m_aMutex);
@@ -368,7 +354,6 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::ex
 }
 
 void SAL_CALL ConfigurationAccess_WindowState::insertByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet )
-throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception )
 {
     // SAFE
     osl::ResettableMutexGuard g(m_aMutex);
@@ -433,7 +418,6 @@ throw( IllegalArgumentException, ElementExistException, WrappedTargetException,
 
 // XNameReplace
 void SAL_CALL ConfigurationAccess_WindowState::replaceByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet )
-throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
 {
     // SAFE
     osl::ResettableMutexGuard g(m_aMutex);
@@ -504,21 +488,21 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException,
 }
 
 // container.XContainerListener
-void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerEvent& )
 {
     // do nothing - next time someone wants to retrieve this node we will find it in the configuration
 }
 
-void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& )
 {
 }
 
-void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& )
 {
 }
 
 // lang.XEventListener
-void SAL_CALL ConfigurationAccess_WindowState::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_WindowState::disposing( const EventObject& aEvent )
 {
     // SAFE
     // remove our reference to the config access
@@ -1269,39 +1253,31 @@ public:
     explicit WindowStateConfiguration( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~WindowStateConfiguration() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.WindowStateConfiguration");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.WindowStateConfiguration"};
     }
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     typedef std::unordered_map< OUString,
                                 OUString,
@@ -1372,7 +1348,6 @@ WindowStateConfiguration::~WindowStateConfiguration()
 }
 
 Any SAL_CALL WindowStateConfiguration::getByName( const OUString& aModuleIdentifier )
-throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
 
@@ -1404,7 +1379,6 @@ throw (css::container::NoSuchElementException, css::lang::WrappedTargetException
 }
 
 Sequence< OUString > SAL_CALL WindowStateConfiguration::getElementNames()
-throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
 
@@ -1412,7 +1386,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const OUString& aName )
-throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
 
@@ -1422,13 +1395,11 @@ throw (css::uno::RuntimeException, std::exception)
 
 // XElementAccess
 Type SAL_CALL WindowStateConfiguration::getElementType()
-throw (css::uno::RuntimeException, std::exception)
 {
     return( cppu::UnoType<XNameAccess>::get());
 }
 
 sal_Bool SAL_CALL WindowStateConfiguration::hasElements()
-throw (css::uno::RuntimeException, std::exception)
 {
     // We always have at least one module. So it is valid to return true!
     return true;
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index b3074486d898..9458d2f6e45f 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -136,7 +136,7 @@ static Image RetrieveImage( Reference< css::frame::XFrame >& rFrame,
 }
 
 // XComponent
-void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL AddonsToolBarManager::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 0214754d0dca..ce9c61ede525 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -63,7 +63,7 @@ AddonsToolBarWrapper::~AddonsToolBarWrapper()
 }
 
 // XComponent
-void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exception )
+void SAL_CALL AddonsToolBarWrapper::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -80,7 +80,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exc
 }
 
 // XInitialization
-void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments )
 {
     SolarMutexGuard g;
 
@@ -142,7 +142,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
 }
 
 // XUIElement interface
-Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface()
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index fef0d1da3c9e..f79eb470bfc6 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -73,7 +73,6 @@ ButtonToolbarController::~ButtonToolbarController()
 
         // XInterface
 uno::Any SAL_CALL ButtonToolbarController::queryInterface( const uno::Type& rType )
-throw (css::uno::RuntimeException, std::exception)
 {
     Any a = ::cppu::queryInterface(
                 rType ,
@@ -102,7 +101,6 @@ void SAL_CALL ButtonToolbarController::release() throw ()
 // XInitialization
 void SAL_CALL ButtonToolbarController::initialize(
     const css::uno::Sequence< css::uno::Any >& aArguments )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     bool bInitialized( true );
 
@@ -140,7 +138,7 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 }
 
 // XComponent
-void SAL_CALL ButtonToolbarController::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ButtonToolbarController::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -159,21 +157,18 @@ void SAL_CALL ButtonToolbarController::dispose() throw (css::uno::RuntimeExcepti
 
 void SAL_CALL ButtonToolbarController::addEventListener(
     const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
 {
     // do nothing
 }
 
 void SAL_CALL ButtonToolbarController::removeEventListener(
     const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
 {
     // do nothing
 }
 
 // XUpdatable
 void SAL_CALL ButtonToolbarController::update()
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarMutexGuard;
     if ( m_bDisposed )
@@ -183,7 +178,6 @@ throw (css::uno::RuntimeException, std::exception)
 // XEventListener
 void SAL_CALL ButtonToolbarController::disposing(
     const css::lang::EventObject& Source )
-throw ( css::uno::RuntimeException, std::exception )
 {
     uno::Reference< uno::XInterface > xSource( Source.Source );
 
@@ -198,7 +192,6 @@ throw ( css::uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL ButtonToolbarController::statusChanged( const css::frame::FeatureStateEvent& )
-throw ( css::uno::RuntimeException, std::exception )
 {
     // do nothing
     if ( m_bDisposed )
@@ -207,7 +200,6 @@ throw ( css::uno::RuntimeException, std::exception )
 
 // XToolbarController
 void SAL_CALL ButtonToolbarController::execute( sal_Int16 KeyModifier )
-throw (css::uno::RuntimeException, std::exception)
 {
     uno::Reference< frame::XDispatch >      xDispatch;
     uno::Reference< frame::XFrame >         xFrame;
@@ -264,7 +256,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ButtonToolbarController::click()
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -276,7 +267,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ButtonToolbarController::doubleClick()
-throw (css::uno::RuntimeException, std::exception)
 {
     // do nothing
     if ( m_bDisposed )
@@ -284,7 +274,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createPopupWindow()
-throw (css::uno::RuntimeException, std::exception)
 {
     if ( m_bDisposed )
         throw DisposedException();
@@ -294,7 +283,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow(
     const css::uno::Reference< css::awt::XWindow >& )
-throw (css::uno::RuntimeException, std::exception)
 {
     if ( m_bDisposed )
         throw DisposedException();
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 416c2f86e7da..d6d42b1fb75a 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -150,7 +150,6 @@ ComboboxToolbarController::~ComboboxToolbarController()
 }
 
 void SAL_CALL ComboboxToolbarController::dispose()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index fc8003ce58dd..6296fed95174 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -68,7 +68,6 @@ ComplexToolbarController::~ComplexToolbarController()
 }
 
 void SAL_CALL ComplexToolbarController::dispose()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -91,7 +90,6 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo
 }
 
 void SAL_CALL ComplexToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException, std::exception )
 {
     Reference< XDispatch >       xDispatch;
     Reference< XURLTransformer > xURLTransformer;
@@ -129,7 +127,6 @@ throw ( RuntimeException, std::exception )
 }
 
 void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index c90926447e25..0cd54b70c70b 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -137,38 +137,35 @@ public:
     explicit ControlMenuController( const uno::Reference< uno::XComponentContext >& xContext );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.ControlMenuController");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.PopupMenuController"};
     }
 
     // XPopupMenuController
-    virtual void SAL_CALL updatePopupMenu() throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL updatePopupMenu() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) override;
 
     // XMenuListener
-    virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
 
 private:
     virtual void impl_setPopupMenu() override;
@@ -232,7 +229,7 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP
 }
 
 // XEventListener
-void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL ControlMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -247,7 +244,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
 }
 
 // XStatusListener
-void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
 
@@ -301,7 +298,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
 }
 
 // XMenuListener
-void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& )
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
 
@@ -348,7 +345,7 @@ void ControlMenuController::impl_setPopupMenu()
     } // if ( m_pResPopupMenu == 0 )
 }
 
-void SAL_CALL ControlMenuController::updatePopupMenu() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ControlMenuController::updatePopupMenu()
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
 
@@ -378,7 +375,7 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (css::uno::RuntimeE
 }
 
 // XInitialization
-void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments )
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
     svt::PopupMenuControllerBase::initialize(aArguments);
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index dc66c3a93e03..b33049e2fcd6 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -142,7 +142,6 @@ DropdownToolbarController::~DropdownToolbarController()
 }
 
 void SAL_CALL DropdownToolbarController::dispose()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index ccd7a383e42f..c5dce26b90ed 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -139,7 +139,6 @@ EditToolbarController::~EditToolbarController()
 }
 
 void SAL_CALL EditToolbarController::dispose()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 10232221805e..ae090316b330 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -113,7 +113,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq
 }
 
 // XEventListener
-void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL FontMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -128,7 +128,7 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim
 }
 
 // XStatusListener
-void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     css::awt::FontDescriptor aFontDescriptor;
     Sequence< OUString >           aFontNameSeq;
@@ -147,7 +147,7 @@ void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event
 }
 
 // XMenuListener
-void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& )
 {
     osl::MutexGuard aLock( m_aMutex );
 
@@ -195,7 +195,7 @@ void FontMenuController::impl_setPopupMenu()
     m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 }
 
-void SAL_CALL FontMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FontMenuController::updatePopupMenu()
 {
     svt::PopupMenuControllerBase::updatePopupMenu();
 
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 8345f0f31a92..6977e827b3c1 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -235,7 +235,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
 }
 
 // XEventListener
-void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL FontSizeMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -249,7 +249,7 @@ void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( Ru
 }
 
 // XStatusListener
-void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     css::awt::FontDescriptor                 aFontDescriptor;
     css::frame::status::FontHeight   aFontHeight;
@@ -287,7 +287,7 @@ void FontSizeMenuController::impl_setPopupMenu()
     m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 }
 
-void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FontSizeMenuController::updatePopupMenu()
 {
     osl::ClearableMutexGuard aLock( m_aMutex );
 
diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx
index 2ab06947effc..b73648102971 100644
--- a/framework/source/uielement/genericstatusbarcontroller.cxx
+++ b/framework/source/uielement/genericstatusbarcontroller.cxx
@@ -70,7 +70,6 @@ GenericStatusbarController::~GenericStatusbarController()
 }
 
 void SAL_CALL GenericStatusbarController::dispose()
-throw ( RuntimeException, std::exception )
 {
     svt::StatusbarController::dispose();
 
@@ -83,7 +82,6 @@ throw ( RuntimeException, std::exception )
 
 void SAL_CALL GenericStatusbarController::statusChanged(
     const FeatureStateEvent& rEvent)
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -124,7 +122,6 @@ void SAL_CALL GenericStatusbarController::paint(
     const Reference< awt::XGraphics >& xGraphics,
     const awt::Rectangle& rOutputRectangle,
     ::sal_Int32 /*nStyle*/ )
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index fe601ab72f96..56d24bf95724 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -112,7 +112,6 @@ GenericToolbarController::~GenericToolbarController()
 }
 
 void SAL_CALL GenericToolbarController::dispose()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -123,7 +122,6 @@ throw ( RuntimeException, std::exception )
 }
 
 void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException, std::exception )
 {
     Reference< XDispatch >       xDispatch;
     Reference< XURLTransformer > xURLTransformer;
@@ -170,7 +168,6 @@ throw ( RuntimeException, std::exception )
 }
 
 void GenericToolbarController::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -333,13 +330,13 @@ void Toolbarmenu::dispose()
     ::PopupMenu::dispose();
 }
 
-void SAL_CALL MenuToolbarController::click() throw (RuntimeException, std::exception)
+void SAL_CALL MenuToolbarController::click()
 {
     createPopupWindow();
 }
 
 Reference< XWindow > SAL_CALL
-MenuToolbarController::createPopupWindow() throw (css::uno::RuntimeException, std::exception)
+MenuToolbarController::createPopupWindow()
 {
     if ( !pMenu )
     {
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 7a10e8572f43..030574b822f8 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -182,7 +182,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >&
 }
 
 // XEventListener
-void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL HeaderMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -196,7 +196,7 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt
 }
 
 // XStatusListener
-void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     Reference< css::frame::XModel > xModel;
 
@@ -210,7 +210,7 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even
 }
 
 // XMenuListener
-void SAL_CALL HeaderMenuController::updatePopupMenu() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL HeaderMenuController::updatePopupMenu()
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
 
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 39db8a0712ba..54762061bda9 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -82,7 +82,6 @@ ImageButtonToolbarController::~ImageButtonToolbarController()
 }
 
 void SAL_CALL ImageButtonToolbarController::dispose()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
     ComplexToolbarController::dispose();
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index a9c2a2239d6b..e524361c2834 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -83,7 +83,7 @@ LanguageSelectionMenuController::~LanguageSelectionMenuController()
 }
 
 // XEventListener
-void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -98,7 +98,7 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t
 }
 
 // XStatusListener
-void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -240,7 +240,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
     pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog );
 }
 
-void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL LanguageSelectionMenuController::updatePopupMenu()
 {
     svt::PopupMenuControllerBase::updatePopupMenu();
 
@@ -275,7 +275,7 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( css::un
 }
 
 // XInitialization
-void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments )
 {
     osl::MutexGuard aLock( m_aMutex );
 
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 93319bff9533..8b2e69d4f8f7 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -82,17 +82,17 @@ public:
     LangSelectionStatusbarController& operator=(const LangSelectionStatusbarController&) = delete;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
     // XStatusbarController
     virtual void SAL_CALL command( const css::awt::Point& aPos,
                                    ::sal_Int32 nCommand,
                                    sal_Bool bMouseEvent,
-                                   const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
+                                   const css::uno::Any& aData ) override;
+    virtual void SAL_CALL click( const css::awt::Point& aPos ) override;
 
 private:
     virtual ~LangSelectionStatusbarController() override {}
@@ -105,7 +105,7 @@ private:
     LanguageGuessingHelper      m_aLangGuessHelper;
 
     /// @throws css::uno::RuntimeException
-    void LangMenu( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception);
+    void LangMenu( const css::awt::Point& aPos );
 };
 
 LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::Reference< uno::XComponentContext >& xContext ) :
@@ -117,7 +117,6 @@ LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::R
 }
 
 void SAL_CALL LangSelectionStatusbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -132,7 +131,6 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 
 void LangSelectionStatusbarController::LangMenu(
     const css::awt::Point& aPos )
-throw (css::uno::RuntimeException, std::exception)
 {
     if (!m_bShowMenu)
         return;
@@ -267,7 +265,6 @@ void SAL_CALL LangSelectionStatusbarController::command(
     ::sal_Int32 nCommand,
     sal_Bool /*bMouseEvent*/,
     const css::uno::Any& /*aData*/ )
-throw (css::uno::RuntimeException, std::exception)
 {
     if ( nCommand & ::awt::Command::CONTEXTMENU )
     {
@@ -277,14 +274,12 @@ throw (css::uno::RuntimeException, std::exception)
 
 void SAL_CALL LangSelectionStatusbarController::click(
     const css::awt::Point& aPos )
-throw (css::uno::RuntimeException, std::exception)
 {
     LangMenu( aPos );
 }
 
 // XStatusListener
 void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
 {
     // This function will be called when observed data changes,
     // for example the selection or keyboard language.
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index bbfaf0ee8510..b8880b8e7321 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -92,7 +92,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo
 }
 
 // XEventListener
-void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL MacrosMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -109,7 +109,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt
 }
 
 // XStatusListener
-void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException, std::exception )
+void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& )
 {
     osl::MutexGuard aLock( m_aMutex );
     if ( m_xPopupMenu.is() )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index f9a5ebd24676..2d4137d6ea1f 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -162,7 +162,7 @@ MenuBarManager::MenuBarManager(
     Init(rFrame,pAddonMenu, popup);
 }
 
-Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( RuntimeException, std::exception )
+Any SAL_CALL MenuBarManager::queryInterface( const Type & rType )
 {
     Any a = ::cppu::queryInterface(
                 rType ,
@@ -189,7 +189,7 @@ void SAL_CALL MenuBarManager::release() throw()
     OWeakObject::release();
 }
 
-Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException, std::exception)
+Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -257,7 +257,7 @@ void MenuBarManager::Destroy()
 }
 
 // XComponent
-void SAL_CALL MenuBarManager::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL MenuBarManager::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -307,7 +307,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException, std::exception
     }
 }
 
-void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener )
 {
     SolarMutexGuard g;
 
@@ -318,7 +318,7 @@ void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener
     m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
-void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener )
 {
     SolarMutexGuard g;
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -326,7 +326,6 @@ void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListen
 }
 
 void SAL_CALL MenuBarManager::elementInserted( const css::ui::ConfigurationEvent& Event )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -342,20 +341,17 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL MenuBarManager::elementRemoved( const css::ui::ConfigurationEvent& Event )
-throw (RuntimeException, std::exception)
 {
     elementInserted(Event);
 }
 
 void SAL_CALL MenuBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event )
-throw (RuntimeException, std::exception)
 {
     elementInserted(Event);
 }
 
 // XFrameActionListener
 void SAL_CALL MenuBarManager::frameAction( const FrameActionEvent& Action )
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -376,7 +372,6 @@ throw ( RuntimeException, std::exception )
 
 // XStatusListener
 void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
 {
     OUString aFeatureURL = Event.FeatureURL.Complete;
 
@@ -603,7 +598,7 @@ void MenuBarManager::RemoveListener()
     m_xFrame = nullptr;
 }
 
-void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception )
+void SAL_CALL MenuBarManager::disposing( const EventObject& Source )
 {
     MenuItemHandler* pMenuItemDisposing = nullptr;
 
@@ -721,8 +716,7 @@ private:
     virtual ~QuietInteractionContext() override {}
 
     virtual css::uno::Any SAL_CALL getValueByName(
-        OUString const & Name)
-        throw (css::uno::RuntimeException, std::exception) override
+        OUString const & Name) override
     {
         return Name != JAVA_INTERACTION_HANDLER_NAME && context_.is()
             ? context_->getValueByName(Name)
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 3e45a3e02189..9fc4ccee6167 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -91,7 +91,7 @@ MenuBarWrapper::~MenuBarWrapper()
 {
 }
 
-void SAL_CALL MenuBarWrapper::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL MenuBarWrapper::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -110,7 +110,7 @@ void SAL_CALL MenuBarWrapper::dispose() throw (css::uno::RuntimeException, std::
 }
 
 // XInitialization
-void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments )
 {
     SolarMutexGuard g;
 
@@ -198,7 +198,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
 }
 
 // XUIElementSettings
-void SAL_CALL MenuBarWrapper::updateSettings() throw ( RuntimeException, std::exception )
+void SAL_CALL MenuBarWrapper::updateSettings()
 {
     SolarMutexGuard g;
 
@@ -250,13 +250,11 @@ void MenuBarWrapper::fillPopupControllerCache()
 
 // XElementAccess
 Type SAL_CALL MenuBarWrapper::getElementType()
-throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<XDispatchProvider>::get();
 }
 
 sal_Bool SAL_CALL MenuBarWrapper::hasElements()
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -270,9 +268,6 @@ throw (css::uno::RuntimeException, std::exception)
 // XNameAccess
 Any SAL_CALL MenuBarWrapper::getByName(
     const OUString& aName )
-throw ( container::NoSuchElementException,
-        lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -293,7 +288,6 @@ throw ( container::NoSuchElementException,
 }
 
 Sequence< OUString > SAL_CALL MenuBarWrapper::getElementNames()
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -307,7 +301,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 sal_Bool SAL_CALL MenuBarWrapper::hasByName(
     const OUString& aName )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -324,7 +317,7 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 // XUIElement
-Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface() throw ( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface()
 {
     if ( m_bDisposed )
         throw DisposedException();
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index e8963fd76e88..bde828e250c1 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -367,7 +367,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
 }
 
 // XEventListener
-void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL NewMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -382,12 +382,12 @@ void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( Runtime
 }
 
 // XStatusListener
-void SAL_CALL NewMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException, std::exception )
+void SAL_CALL NewMenuController::statusChanged( const FeatureStateEvent& )
 {
 }
 
 // XMenuListener
-void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
 {
     Reference< css::awt::XPopupMenu > xPopupMenu;
     Reference< XComponentContext >    xContext;
@@ -424,7 +424,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
     }
 }
 
-void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& )
 {
     SolarMutexGuard aSolarMutexGuard;
     if ( m_xFrame.is() && m_xPopupMenu.is() )
@@ -491,7 +491,7 @@ void NewMenuController::impl_setPopupMenu()
 }
 
 // XInitialization
-void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
 {
     osl::MutexGuard aLock( m_aMutex );
 
diff --git a/framework/source/uielement/notebookbarmenucontroller.cxx b/framework/source/uielement/notebookbarmenucontroller.cxx
index f1e85696af9b..af87f3132f4e 100644
--- a/framework/source/uielement/notebookbarmenucontroller.cxx
+++ b/framework/source/uielement/notebookbarmenucontroller.cxx
@@ -128,7 +128,7 @@ void NotebookbarMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
 }
 
 // XEventListener
-void SAL_CALL NotebookbarMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL NotebookbarMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -142,7 +142,7 @@ void SAL_CALL NotebookbarMenuController::disposing( const EventObject& ) throw (
 }
 
 // XStatusListener
-void SAL_CALL NotebookbarMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL NotebookbarMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     OUString aFeatureURL( Event.FeatureURL.Complete );
 
@@ -194,7 +194,7 @@ void SAL_CALL NotebookbarMenuController::statusChanged( const FeatureStateEvent&
 }
 
 // XMenuListener
-void SAL_CALL NotebookbarMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL NotebookbarMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
 {
     Reference< css::awt::XPopupMenu >   xPopupMenu;
     Reference< XURLTransformer >        xURLTransformer;
@@ -240,7 +240,7 @@ void SAL_CALL NotebookbarMenuController::itemSelected( const css::awt::MenuEvent
     }
 }
 
-void SAL_CALL NotebookbarMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL NotebookbarMenuController::itemActivated( const css::awt::MenuEvent& )
 {
     OUString aActive;
 
@@ -284,7 +284,7 @@ void SAL_CALL NotebookbarMenuController::itemActivated( const css::awt::MenuEven
 }
 
 // XPopupMenuController
-void SAL_CALL NotebookbarMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception )
+void SAL_CALL NotebookbarMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu )
 {
     osl::MutexGuard aLock( m_aMutex );
 
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 6404416913c5..1d03d0807739 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -59,29 +59,26 @@ public:
     explicit ObjectMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.ObjectMenuController");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.PopupMenuController"};
     }
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) 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;
 
 private:
     void fillPopupMenu( const css::uno::Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
@@ -127,7 +124,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< css::embed::VerbDescri
 }
 
 // XEventListener
-void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL ObjectMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -142,7 +139,7 @@ void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( Runt
 }
 
 // XStatusListener
-void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     Sequence < css::embed::VerbDescriptor > aVerbCommandSeq;
     if ( Event.State >>= aVerbCommandSeq )
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 98b6b47b735c..b04c831e7a12 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -74,13 +74,13 @@ class PopupMenuToolbarController : public ToolBarBase
 {
 public:
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
     // XToolbarController
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
 protected:
     PopupMenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -109,7 +109,6 @@ PopupMenuToolbarController::PopupMenuToolbarController(
 }
 
 void SAL_CALL PopupMenuToolbarController::dispose()
-throw ( css::uno::RuntimeException, std::exception )
 {
     svt::ToolboxController::dispose();
 
@@ -137,7 +136,6 @@ throw ( css::uno::RuntimeException, std::exception )
 
 void SAL_CALL PopupMenuToolbarController::initialize(
     const css::uno::Sequence< css::uno::Any >& aArguments )
-throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     ToolboxController::initialize( aArguments );
 
@@ -172,7 +170,6 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     ToolBox* pToolBox = nullptr;
     sal_uInt16 nItemId = 0;
@@ -187,7 +184,6 @@ void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::Featu
 
 css::uno::Reference< css::awt::XWindow > SAL_CALL
 PopupMenuToolbarController::createPopupWindow()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     css::uno::Reference< css::awt::XWindow > xRet;
 
@@ -270,17 +266,17 @@ public:
                                    const css::uno::Sequence< css::uno::Any >& rxArgs );
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
-    virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) throw (css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override;
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
     bool m_bSplitButton, m_bReplaceWithLast;
@@ -310,25 +306,21 @@ GenericPopupToolbarController::GenericPopupToolbarController(
 }
 
 OUString GenericPopupToolbarController::getImplementationName()
-    throw (css::uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.framework.GenericPopupToolbarController");
 }
 
 sal_Bool GenericPopupToolbarController::supportsService(OUString const & rServiceName)
-    throw (css::uno::RuntimeException)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 css::uno::Sequence<OUString> GenericPopupToolbarController::getSupportedServiceNames()
-    throw (css::uno::RuntimeException)
 {
     return {"com.sun.star.frame.ToolbarController"};
 }
 
 void GenericPopupToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& rxArgs )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     PopupMenuToolbarController::initialize( rxArgs );
     if ( m_bReplaceWithLast )
@@ -337,7 +329,6 @@ void GenericPopupToolbarController::initialize( const css::uno::Sequence< css::u
 }
 
 void GenericPopupToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -408,31 +399,31 @@ public:
     explicit SaveToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XSubToolbarController
     // Ugly HACK to cause ToolBarManager ask our controller for updated image, in case of icon theme change.
-    virtual sal_Bool SAL_CALL opensSubToolbar() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getSubToolbarName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL updateImage() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL opensSubToolbar() override;
+    virtual OUString SAL_CALL getSubToolbarName() override;
+    virtual void SAL_CALL functionSelected( const OUString& aCommand ) override;
+    virtual void SAL_CALL updateImage() override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
     // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& rEvent ) override;
 
     // 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;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const & rServiceName ) throw ( css::uno::RuntimeException ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( OUString const & rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     bool m_bReadOnly;
@@ -449,7 +440,6 @@ SaveToolbarController::SaveToolbarController( const css::uno::Reference< css::un
 }
 
 void SaveToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     PopupMenuToolbarController::initialize( aArguments );
 
@@ -480,24 +470,20 @@ void SaveToolbarController::initialize( const css::uno::Sequence< css::uno::Any
 }
 
 sal_Bool SaveToolbarController::opensSubToolbar()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return true;
 }
 
 OUString SaveToolbarController::getSubToolbarName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString();
 }
 
 void SaveToolbarController::functionSelected( const OUString& /*aCommand*/ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 void SaveToolbarController::updateImage()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ToolBox* pToolBox = nullptr;
@@ -527,7 +513,6 @@ void SaveToolbarController::updateImage()
 }
 
 void SaveToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     ToolBox* pToolBox = nullptr;
     sal_uInt16 nId = 0;
@@ -550,7 +535,6 @@ void SaveToolbarController::statusChanged( const css::frame::FeatureStateEvent&
 }
 
 void SaveToolbarController::modified( const css::lang::EventObject& /*rEvent*/ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     bool bLastModified = m_bModified;
     m_bModified = m_xModifiable->isModified();
@@ -559,7 +543,6 @@ void SaveToolbarController::modified( const css::lang::EventObject& /*rEvent*/ )
 }
 
 void SaveToolbarController::disposing( const css::lang::EventObject& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( rEvent.Source == m_xModifiable )
     {
@@ -571,7 +554,6 @@ void SaveToolbarController::disposing( const css::lang::EventObject& rEvent )
 }
 
 void SaveToolbarController::dispose()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     PopupMenuToolbarController::dispose();
     if ( m_xModifiable.is() )
@@ -583,19 +565,16 @@ void SaveToolbarController::dispose()
 }
 
 OUString SaveToolbarController::getImplementationName()
-    throw ( css::uno::RuntimeException )
 {
     return OUString("com.sun.star.comp.framework.SaveToolbarController");
 }
 
 sal_Bool SaveToolbarController::supportsService( OUString const & rServiceName )
-    throw ( css::uno::RuntimeException )
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 css::uno::Sequence< OUString > SaveToolbarController::getSupportedServiceNames()
-    throw ( css::uno::RuntimeException )
 {
     return {"com.sun.star.frame.ToolbarController"};
 }
@@ -606,20 +585,18 @@ public:
     explicit NewToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) throw (css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
-    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 private:
     void functionExecuted( const OUString &rCommand ) override;
-    void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
-    void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
+    void SAL_CALL execute( sal_Int16 KeyModifier ) override;
     void setItemImage( const OUString &rCommand );
 
     OUString m_aLastURL;
@@ -632,25 +609,21 @@ NewToolbarController::NewToolbarController(
 }
 
 OUString NewToolbarController::getImplementationName()
-    throw (css::uno::RuntimeException)
 {
     return OUString("org.apache.openoffice.comp.framework.NewToolbarController");
 }
 
 sal_Bool NewToolbarController::supportsService(OUString const & rServiceName)
-    throw (css::uno::RuntimeException)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 css::uno::Sequence<OUString> NewToolbarController::getSupportedServiceNames()
-    throw (css::uno::RuntimeException)
 {
     return {"com.sun.star.frame.ToolbarController"};
 }
 
 void SAL_CALL NewToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     PopupMenuToolbarController::initialize( aArguments );
 
@@ -659,7 +632,6 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( rEvent.IsEnabled )
     {
@@ -683,7 +655,6 @@ void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStat
 }
 
 void SAL_CALL NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
-throw ( css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
     if ( !m_aLastURL.getLength() )
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index c858484ad715..07f34520c5aa 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -84,7 +84,6 @@ uno::Reference< awt::XWindow > ProgressBarWrapper::getStatusBar() const
 
 // wrapped methods of css::task::XStatusIndicator
 void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< awt::XWindow > xWindow;
     sal_Int32                      nValue( 0 );
@@ -124,7 +123,6 @@ void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range )
 }
 
 void ProgressBarWrapper::end()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< awt::XWindow > xWindow;
 
@@ -153,7 +151,6 @@ void ProgressBarWrapper::end()
 }
 
 void ProgressBarWrapper::setText( const OUString& Text )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< awt::XWindow > xWindow;
     sal_Int32 nValue( 0 );
@@ -191,7 +188,6 @@ void ProgressBarWrapper::setText( const OUString& Text )
 }
 
 void ProgressBarWrapper::setValue( ::sal_Int32 nValue )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< awt::XWindow > xWindow;
     OUString aText;
@@ -237,7 +233,6 @@ void ProgressBarWrapper::setValue( ::sal_Int32 nValue )
 }
 
 void ProgressBarWrapper::reset()
-    throw (uno::RuntimeException, std::exception)
 {
     setText( OUString() );
     setValue( 0 );
@@ -245,21 +240,18 @@ void ProgressBarWrapper::reset()
 
 // XInitialization
 void SAL_CALL ProgressBarWrapper::initialize( const uno::Sequence< uno::Any >& )
-throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     // dummy - do nothing
 }
 
 // XUpdatable
 void SAL_CALL ProgressBarWrapper::update()
-throw (uno::RuntimeException, std::exception)
 {
     // dummy - do nothing
 }
 
 // XComponent
 void SAL_CALL ProgressBarWrapper::dispose()
-throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< lang::XComponent > xThis(
         static_cast< cppu::OWeakObject* >(this),
@@ -297,7 +289,6 @@ throw (uno::RuntimeException, std::exception)
 
 // XUIElement
 uno::Reference< uno::XInterface > SAL_CALL ProgressBarWrapper::getRealInterface()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index c7380cae9891..a4bf6e447b2b 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -56,39 +56,36 @@ public:
                                const uno::Sequence< uno::Any >& args );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.RecentFilesMenuController");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.PopupMenuController"};
     }
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) override;
 
     // XMenuListener
-    virtual void SAL_CALL itemSelected( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL itemSelected( const awt::MenuEvent& rEvent ) override;
+    virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) override;
 
     // XDispatchProvider
-    virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) override;
 
     // XDispatch
-    virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) throw( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
 private:
     virtual void impl_setPopupMenu() override;
@@ -262,7 +259,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
 }
 
 // XEventListener
-void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL RecentFilesMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -276,13 +273,13 @@ void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw (
 }
 
 // XStatusListener
-void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     osl::MutexGuard aLock( m_aMutex );
     m_bDisabled = !Event.IsEnabled;
 }
 
-void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
 {
     Reference< css::awt::XPopupMenu > xPopupMenu;
 
@@ -316,7 +313,7 @@ void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent
     }
 }
 
-void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& )
 {
     osl::MutexGuard aLock( m_aMutex );
     impl_setPopupMenu();
@@ -334,7 +331,6 @@ Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch(
     const URL& aURL,
     const OUString& /*sTarget*/,
     sal_Int32 /*nFlags*/ )
-throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aLock( m_aMutex );
 
@@ -350,7 +346,6 @@ throw( RuntimeException, std::exception )
 void SAL_CALL RecentFilesMenuController::dispatch(
     const URL& aURL,
     const Sequence< PropertyValue >& /*seqProperties*/ )
-throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aLock( m_aMutex );
 
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index 9633a7fa5bc0..735b5ae64d65 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -30,26 +30,26 @@ public:
                             const css::uno::Sequence< css::uno::Any >& rxArgs, bool bToolbarContainer );
 
     // XPopupMenuController
-    virtual void SAL_CALL updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL updatePopupMenu() override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
     // 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;
 
     // XUIConfigurationListener
-    virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& rEvent ) override;
+    virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& rEvent ) override;
+    virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& rEvent ) override;
 
     // XMenuListener
-    virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) override;
+    virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     OUString m_aMenuURL;
@@ -108,7 +108,6 @@ ResourceMenuController::ResourceMenuController( const css::uno::Reference< css::
 }
 
 void ResourceMenuController::updatePopupMenu()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( ( m_xMenuContainer.is() && !m_bContextMenu ) || m_aMenuURL.isEmpty() )
         return;
@@ -227,7 +226,6 @@ void ResourceMenuController::updatePopupMenu()
 }
 
 void ResourceMenuController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     css::uno::Sequence< css::embed::VerbDescriptor > aVerbs;
     if ( rEvent.IsEnabled && ( rEvent.State >>= aVerbs ) )
@@ -313,7 +311,6 @@ void ResourceMenuController::fillToolbarData()
 }
 
 void ResourceMenuController::itemActivated( const css::awt::MenuEvent& /*rEvent*/ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     // Must initialize MenuBarManager here, because we want to let the app do context menu interception before.
     if ( !m_xMenuBarManager.is() )
@@ -327,32 +324,27 @@ void ResourceMenuController::itemActivated( const css::awt::MenuEvent& /*rEvent*
 }
 
 void ResourceMenuController::itemSelected( const css::awt::MenuEvent& /*rEvent*/ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     // Must override this, because we are managed by MenuBarManager, so don't want the handler found in the base class.
 }
 
 void ResourceMenuController::elementInserted( const css::ui::ConfigurationEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( rEvent.ResourceURL == m_aMenuURL )
         m_xMenuContainer.clear();
 }
 
 void ResourceMenuController::elementRemoved( const css::ui::ConfigurationEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     elementInserted( rEvent );
 }
 
 void ResourceMenuController::elementReplaced( const css::ui::ConfigurationEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     elementInserted( rEvent );
 }
 
 void ResourceMenuController::disposing( const css::lang::EventObject& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( rEvent.Source == m_xConfigManager )
         m_xConfigManager.clear();
@@ -392,7 +384,6 @@ void ResourceMenuController::disposing()
 }
 
 OUString ResourceMenuController::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( m_bToolbarContainer )
         return OUString( "com.sun.star.comp.framework.ToolbarAsMenuController" );
@@ -401,7 +392,6 @@ OUString ResourceMenuController::getImplementationName()
 }
 
 css::uno::Sequence< OUString > ResourceMenuController::getSupportedServiceNames()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.frame.PopupMenuController" };
 }
@@ -413,7 +403,7 @@ public:
                           const css::uno::Sequence< css::uno::Any >& rArgs );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 private:
     virtual void impl_setPopupMenu() override;
@@ -446,7 +436,6 @@ void SaveAsMenuController::impl_setPopupMenu()
 }
 
 OUString SaveAsMenuController::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.framework.SaveAsMenuController" );
 }
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 799e44407c84..7b3750797712 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -183,7 +183,6 @@ SpinfieldToolbarController::~SpinfieldToolbarController()
 }
 
 void SAL_CALL SpinfieldToolbarController::dispose()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx
index 3c11376ca6b8..ddc25d37d0ff 100644
--- a/framework/source/uielement/statusbaritem.cxx
+++ b/framework/source/uielement/statusbaritem.cxx
@@ -90,21 +90,18 @@ void SAL_CALL StatusbarItem::disposing()
 }
 
 OUString SAL_CALL StatusbarItem::getCommand()
-throw (RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( m_aMutex );
     return m_aCommand;
 }
 
 ::sal_uInt16 SAL_CALL StatusbarItem::getItemId()
-throw (RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( m_aMutex );
     return m_nId;
 }
 
 ::sal_uInt32 SAL_CALL StatusbarItem::getWidth()
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -114,14 +111,12 @@ throw (RuntimeException, std::exception)
 }
 
 ::sal_uInt16 SAL_CALL StatusbarItem::getStyle()
-throw (RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( m_aMutex );
     return m_nStyle;
 }
 
 ::sal_Int32 SAL_CALL StatusbarItem::getOffset()
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -131,7 +126,6 @@ throw (RuntimeException, std::exception)
 }
 
 css::awt::Rectangle SAL_CALL StatusbarItem::getItemRect()
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     css::awt::Rectangle aAWTRect;
@@ -148,7 +142,6 @@ throw (RuntimeException, std::exception)
 }
 
 OUString SAL_CALL StatusbarItem::getText()
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -158,7 +151,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL StatusbarItem::setText( const OUString& rText )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -166,7 +158,6 @@ throw (RuntimeException, std::exception)
 }
 
 OUString SAL_CALL StatusbarItem::getHelpText()
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -176,7 +167,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL StatusbarItem::setHelpText( const OUString& rHelpText )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -184,7 +174,6 @@ throw (RuntimeException, std::exception)
 }
 
 OUString SAL_CALL StatusbarItem::getQuickHelpText()
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -194,7 +183,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL StatusbarItem::setQuickHelpText( const OUString& rQuickHelpText )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -202,7 +190,6 @@ throw (RuntimeException, std::exception)
 }
 
 OUString SAL_CALL StatusbarItem::getAccessibleName()
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -212,7 +199,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL StatusbarItem::setAccessibleName( const OUString& rAccessibleName )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -220,7 +206,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL StatusbarItem::getVisible()
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
@@ -230,7 +215,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL StatusbarItem::setVisible( sal_Bool bVisible )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( !m_pStatusBar )
@@ -246,7 +230,6 @@ throw (RuntimeException, std::exception)
 }
 
 void SAL_CALL StatusbarItem::repaint(  )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( m_pStatusBar )
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 0c0e0e6b87ee..1b63608a4d31 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -153,14 +153,13 @@ StatusBar* StatusBarManager::GetStatusBar() const
 }
 
 void StatusBarManager::frameAction( const frame::FrameActionEvent& Action )
-throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     if ( Action.Action == frame::FrameAction_CONTEXT_CHANGED )
         UpdateControllers();
 }
 
-void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source )
 {
     SolarMutexGuard g;
 
@@ -176,7 +175,7 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr
 }
 
 // XComponent
-void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::dispose()
 {
     uno::Reference< lang::XComponent > xThis(
         static_cast< OWeakObject* >(this), uno::UNO_QUERY );
@@ -221,7 +220,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException, std::exc
     }
 }
 
-void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
 {
     SolarMutexGuard g;
 
@@ -232,13 +231,13 @@ void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XE
     m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
 }
 
-void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
 }
 
 // XUIConfigurationListener
-void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& )
 {
     SolarMutexGuard g;
 
@@ -246,7 +245,7 @@ void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEve
         return;
 }
 
-void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& )
 {
     SolarMutexGuard g;
 
@@ -254,7 +253,7 @@ void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEven
         return;
 }
 
-void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& )
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 3456dc78e529..2cf60b555e1a 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -61,7 +61,7 @@ StatusBarWrapper::~StatusBarWrapper()
 {
 }
 
-void SAL_CALL StatusBarWrapper::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL StatusBarWrapper::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -85,7 +85,7 @@ void SAL_CALL StatusBarWrapper::dispose() throw (css::uno::RuntimeException, std
 }
 
 // XInitialization
-void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
 {
     SolarMutexGuard g;
 
@@ -133,7 +133,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
 }
 
 // XUIElementSettings
-void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException, std::exception )
+void SAL_CALL StatusBarWrapper::updateSettings()
 {
     SolarMutexGuard g;
 
@@ -158,7 +158,7 @@ void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException, std::
     }
 }
 
-Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface()
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index 1ff930941b19..69951565d352 100644
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
@@ -44,7 +44,6 @@ StatusIndicatorInterfaceWrapper::~StatusIndicatorInterfaceWrapper()
 void SAL_CALL StatusIndicatorInterfaceWrapper::start(
     const OUString& sText,
     sal_Int32              nRange )
-throw( css::uno::RuntimeException, std::exception )
 {
     Reference< XComponent > xComp( m_xStatusIndicatorImpl );
     if ( xComp.is() )
@@ -56,7 +55,6 @@ throw( css::uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL StatusIndicatorInterfaceWrapper::end()
-throw( css::uno::RuntimeException, std::exception )
 {
     Reference< XComponent > xComp( m_xStatusIndicatorImpl );
     if ( xComp.is() )
@@ -68,7 +66,6 @@ throw( css::uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL StatusIndicatorInterfaceWrapper::reset()
-throw( css::uno::RuntimeException, std::exception )
 {
     Reference< XComponent > xComp( m_xStatusIndicatorImpl );
     if ( xComp.is() )
@@ -81,7 +78,6 @@ throw( css::uno::RuntimeException, std::exception )
 
 void SAL_CALL StatusIndicatorInterfaceWrapper::setText(
     const OUString& sText )
-throw( css::uno::RuntimeException, std::exception )
 {
     Reference< XComponent > xComp( m_xStatusIndicatorImpl );
     if ( xComp.is() )
@@ -94,7 +90,6 @@ throw( css::uno::RuntimeException, std::exception )
 
 void SAL_CALL StatusIndicatorInterfaceWrapper::setValue(
     sal_Int32 nValue )
-throw( css::uno::RuntimeException, std::exception )
 {
     Reference< XComponent > xComp( m_xStatusIndicatorImpl );
     if ( xComp.is() )
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 36f679a11a79..de8dffd16875 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -51,40 +51,40 @@ public:
     virtual ~SubToolBarController() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
     // XToolbarController
-    virtual void SAL_CALL execute( sal_Int16 nKeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL execute( sal_Int16 nKeyModifier ) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
 
     // XSubToolbarController
-    virtual sal_Bool SAL_CALL opensSubToolbar() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getSubToolbarName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL functionSelected( const OUString& rCommand ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL updateImage() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL opensSubToolbar() override;
+    virtual OUString SAL_CALL getSubToolbarName() override;
+    virtual void SAL_CALL functionSelected( const OUString& rCommand ) override;
+    virtual void SAL_CALL updateImage() override;
 
     //  XDockableWindowListener
-    virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL closed( const css::lang::EventObject& e ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) override;
+    virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) override;
+    virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) override;
+    virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL closed( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& e ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& e ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw ( css::uno::RuntimeException ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 SubToolBarController::SubToolBarController( const css::uno::Sequence< css::uno::Any >& rxArgs )
@@ -122,7 +122,6 @@ void SubToolBarController::disposeUIElement()
 }
 
 void SubToolBarController::statusChanged( const css::frame::FeatureStateEvent& Event )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -176,7 +175,6 @@ void SubToolBarController::statusChanged( const css::frame::FeatureStateEvent& E
 }
 
 void SubToolBarController::execute( sal_Int16 nKeyModifier )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( !m_aLastCommand.isEmpty() )
     {
@@ -188,7 +186,6 @@ void SubToolBarController::execute( sal_Int16 nKeyModifier )
 }
 
 css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -258,19 +255,16 @@ css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow
 }
 
 sal_Bool SubToolBarController::opensSubToolbar()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return !m_aLastCommand.isEmpty();
 }
 
 OUString SubToolBarController::getSubToolbarName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return m_aSubTbName;
 }
 
 void SubToolBarController::functionSelected( const OUString& rCommand )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( !m_aLastCommand.isEmpty() && m_aLastCommand != rCommand )
     {
@@ -282,7 +276,6 @@ void SubToolBarController::functionSelected( const OUString& rCommand )
 }
 
 void SubToolBarController::updateImage()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( !m_aLastCommand.isEmpty() )
@@ -305,39 +298,32 @@ void SubToolBarController::updateImage()
 }
 
 void SubToolBarController::startDocking( const css::awt::DockingEvent& )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 css::awt::DockingData SubToolBarController::docking( const css::awt::DockingEvent& )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return css::awt::DockingData();
 }
 
 void SubToolBarController::endDocking( const css::awt::EndDockingEvent& )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 sal_Bool SubToolBarController::prepareToggleFloatingMode( const css::lang::EventObject& )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return false;
 }
 
 void SubToolBarController::toggleFloatingMode( const css::lang::EventObject& )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 void SubToolBarController::closed( const css::lang::EventObject& )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 void SubToolBarController::endPopupMode( const css::awt::EndPopupModeEvent& e )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -408,13 +394,11 @@ void SubToolBarController::endPopupMode( const css::awt::EndPopupModeEvent& e )
 }
 
 void SubToolBarController::disposing( const css::lang::EventObject& e )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     svt::ToolboxController::disposing( e );
 }
 
 void SubToolBarController::initialize( const css::uno::Sequence< css::uno::Any >& rxArgs )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::ToolboxController::initialize( rxArgs );
 
@@ -431,7 +415,6 @@ void SubToolBarController::initialize( const css::uno::Sequence< css::uno::Any >
 }
 
 void SubToolBarController::dispose()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( m_bDisposed )
         return;
@@ -442,19 +425,16 @@ void SubToolBarController::dispose()
 }
 
 OUString SubToolBarController::getImplementationName()
-    throw ( css::uno::RuntimeException )
 {
     return OUString( "com.sun.star.comp.framework.SubToolBarController" );
 }
 
 sal_Bool SubToolBarController::supportsService( const OUString& rServiceName )
-    throw ( css::uno::RuntimeException )
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 css::uno::Sequence< OUString > SubToolBarController::getSupportedServiceNames()
-    throw ( css::uno::RuntimeException )
 {
     return {"com.sun.star.frame.ToolbarController"};
 }
diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx
index 360fd2f5cb20..c6832fa714c1 100644
--- a/framework/source/uielement/thesaurusmenucontroller.cxx
+++ b/framework/source/uielement/thesaurusmenucontroller.cxx
@@ -32,11 +32,11 @@ public:
     explicit ThesaurusMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     void fillPopupMenu();
@@ -55,7 +55,6 @@ ThesaurusMenuController::ThesaurusMenuController( const css::uno::Reference< css
 }
 
 void ThesaurusMenuController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     rEvent.State >>= m_aLastWord;
     m_xPopupMenu->clear();
@@ -146,13 +145,11 @@ OUString ThesaurusMenuController::getThesImplName( const css::lang::Locale& rLoc
 }
 
 OUString ThesaurusMenuController::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.framework.ThesaurusMenuController" );
 }
 
 css::uno::Sequence< OUString > ThesaurusMenuController::getSupportedServiceNames()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.frame.PopupMenuController" };
 }
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index c0a19ff4a33c..4f822198c476 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -74,7 +74,6 @@ ToggleButtonToolbarController::~ToggleButtonToolbarController()
 }
 
 void SAL_CALL ToggleButtonToolbarController::dispose()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
     ComplexToolbarController::dispose();
@@ -93,7 +92,6 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16
 }
 
 uno::Reference< awt::XWindow > SAL_CALL ToggleButtonToolbarController::createPopupWindow()
-throw (css::uno::RuntimeException, std::exception)
 {
     uno::Reference< awt::XWindow > xWindow;
 
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 4b9768d88ab2..1dec71d4b763 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -395,7 +395,6 @@ void ToolBarManager::UpdateController( const css::uno::Reference< css::frame::XT
 }
 
 void ToolBarManager::frameAction( const FrameActionEvent& Action )
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     if ( Action.Action == FrameAction_CONTEXT_CHANGED && !m_bDisposed )
@@ -404,7 +403,7 @@ throw ( RuntimeException, std::exception )
     }
 }
 
-void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolBarManager::disposing( const EventObject& Source )
 {
     SolarMutexGuard g;
 
@@ -449,7 +448,7 @@ void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( Run
 }
 
 // XComponent
-void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL ToolBarManager::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -522,7 +521,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception
     }
 }
 
-void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener >& xListener )
 {
     SolarMutexGuard g;
 
@@ -533,18 +532,18 @@ void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener
     m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
-void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListener >& xListener )
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 // XUIConfigurationListener
-void SAL_CALL ToolBarManager::elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarManager::elementInserted( const css::ui::ConfigurationEvent& Event )
 {
     impl_elementChanged(false,Event);
 }
 
-void SAL_CALL ToolBarManager::elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarManager::elementRemoved( const css::ui::ConfigurationEvent& Event )
 {
     impl_elementChanged(true,Event);
 }
@@ -618,7 +617,7 @@ void ToolBarManager::setToolBarImage(const Image& rImage,
     }
 }
 
-void SAL_CALL ToolBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event )
 {
     impl_elementChanged(false,Event);
 }
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx
index c7eba87087a1..69aa1a6a027f 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -134,7 +134,7 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
 }
 
 // XEventListener
-void SAL_CALL ToolbarModeMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarModeMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -148,7 +148,7 @@ void SAL_CALL ToolbarModeMenuController::disposing( const EventObject& ) throw (
 }
 
 // XStatusListener
-void SAL_CALL ToolbarModeMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarModeMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     OUString aFeatureURL( Event.FeatureURL.Complete );
 
@@ -200,7 +200,7 @@ void SAL_CALL ToolbarModeMenuController::statusChanged( const FeatureStateEvent&
 }
 
 // XMenuListener
-void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
 {
     Reference< css::awt::XPopupMenu >   xPopupMenu;
     Reference< XURLTransformer >        xURLTransformer;
@@ -245,7 +245,7 @@ void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent
     }
 }
 
-void SAL_CALL ToolbarModeMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarModeMenuController::itemActivated( const css::awt::MenuEvent& )
 {
     const Reference<frame::XModuleManager> xModuleManager  = frame::ModuleManager::create( m_xContext );
     vcl::EnumContext::Application eApp = vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(m_xFrame));
@@ -283,7 +283,7 @@ void SAL_CALL ToolbarModeMenuController::itemActivated( const css::awt::MenuEven
 }
 
 // XPopupMenuController
-void SAL_CALL ToolbarModeMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarModeMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu )
 {
     osl::MutexGuard aLock( m_aMutex );
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 003c74c07723..d10ec62091f9 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -467,7 +467,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
 }
 
 // XEventListener
-void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarsMenuController::disposing( const EventObject& )
 {
     Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
 
@@ -484,7 +484,7 @@ void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( Ru
 }
 
 // XStatusListener
-void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Event )
 {
     OUString aFeatureURL( Event.FeatureURL.Complete );
 
@@ -536,7 +536,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
 }
 
 // XMenuListener
-void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
 {
     Reference< css::awt::XPopupMenu >   xPopupMenu;
     Reference< XComponentContext >      xContext;
@@ -695,7 +695,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r
     }
 }
 
-void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& )
 {
     std::vector< OUString >   aCmdVector;
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
@@ -736,7 +736,7 @@ void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent&
 }
 
 // XPopupMenuController
-void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu )
 {
     osl::MutexGuard aLock( m_aMutex );
 
@@ -754,7 +754,7 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X
 }
 
 // XInitialization
-void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments )
 {
     osl::MutexGuard aLock( m_aMutex );
     bool bInitalized( m_bInitialized );
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 288294ada9ac..1e3faaaef15d 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -74,7 +74,6 @@ void SAL_CALL ToolBarWrapper::release() throw()
 }
 
 uno::Any SAL_CALL ToolBarWrapper::queryInterface( const uno::Type & rType )
-throw( css::uno::RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface(
                 rType ,
@@ -87,7 +86,7 @@ throw( css::uno::RuntimeException, std::exception )
 }
 
 // XComponent
-void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException, std::exception )
+void SAL_CALL ToolBarWrapper::dispose()
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -112,7 +111,7 @@ void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException, std::exception
 }
 
 // XInitialization
-void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments )
 {
     SolarMutexGuard g;
 
@@ -192,13 +191,13 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
 }
 
 // XEventListener
-void SAL_CALL ToolBarWrapper::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarWrapper::disposing( const css::lang::EventObject& )
 {
     // nothing todo
 }
 
 // XUpdatable
-void SAL_CALL ToolBarWrapper::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarWrapper::update()
 {
     SolarMutexGuard g;
 
@@ -211,7 +210,7 @@ void SAL_CALL ToolBarWrapper::update() throw (css::uno::RuntimeException, std::e
 }
 
 // XUIElementSettings
-void SAL_CALL ToolBarWrapper::updateSettings() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarWrapper::updateSettings()
 {
     SolarMutexGuard g;
 
@@ -250,7 +249,7 @@ void ToolBarWrapper::impl_fillNewData()
 }
 
 // XUIElement interface
-Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface(  ) throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface(  )
 {
     SolarMutexGuard g;
 
@@ -271,7 +270,6 @@ Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface(  ) throw (css
 void SAL_CALL ToolBarWrapper::functionExecute(
     const OUString& aUIElementName,
     const OUString& aCommand )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -283,7 +281,7 @@ throw (css::uno::RuntimeException, std::exception)
     }
 }
 
-void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any&  aValue ) throw( css::uno::Exception, std::exception )
+void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any&  aValue )
 {
     SolarMutexResettableGuard aLock;
     bool bNoClose( m_bNoClose );
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 4d80ec0ceb02..b900f2c40176 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -71,29 +71,24 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
         virtual                   ~ConfigurationAccess_UICommand() override;
 
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-            throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) 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;
 
         // container.XContainerListener
-        virtual void SAL_CALL     elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL     elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL     elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL     elementInserted( const ContainerEvent& aEvent ) override;
+        virtual void SAL_CALL     elementRemoved ( const ContainerEvent& aEvent ) override;
+        virtual void SAL_CALL     elementReplaced( const ContainerEvent& aEvent ) override;
 
         // lang.XEventListener
-        virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& aEvent ) override;
 
     protected:
         css::uno::Any SAL_CALL getByNameImpl( const OUString& aName );
@@ -249,7 +244,6 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rComm
 }
 
 Any SAL_CALL ConfigurationAccess_UICommand::getByName( const OUString& rCommandURL )
-throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     Any aRet( getByNameImpl( rCommandURL ) );
     if( !aRet.hasValue() )
@@ -259,26 +253,22 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::e
 }
 
 Sequence< OUString > SAL_CALL ConfigurationAccess_UICommand::getElementNames()
-throw ( RuntimeException, std::exception )
 {
     return getAllCommands();
 }
 
 sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const OUString& rCommandURL )
-throw (css::uno::RuntimeException, std::exception)
 {
     return getByNameImpl( rCommandURL ).hasValue();
 }
 
 // XElementAccess
 Type SAL_CALL ConfigurationAccess_UICommand::getElementType()
-throw ( RuntimeException, std::exception )
 {
     return( cppu::UnoType<Sequence< PropertyValue >>::get() );
 }
 
 sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasElements()
-throw ( RuntimeException, std::exception )
 {
     // There must are global commands!
     return true;
@@ -558,21 +548,21 @@ void ConfigurationAccess_UICommand::initializeConfigAccess()
 }
 
 // container.XContainerListener
-void SAL_CALL ConfigurationAccess_UICommand::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICommand::elementInserted( const ContainerEvent& )
 {
     osl::MutexGuard g(m_aMutex);
     m_bCacheFilled = false;
     fillCache();
 }
 
-void SAL_CALL ConfigurationAccess_UICommand::elementRemoved( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICommand::elementRemoved( const ContainerEvent& )
 {
     osl::MutexGuard g(m_aMutex);
     m_bCacheFilled = false;
     fillCache();
 }
 
-void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEvent& )
 {
     osl::MutexGuard g(m_aMutex);
     m_bCacheFilled = false;
@@ -580,7 +570,7 @@ void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEve
 }
 
 // lang.XEventListener
-void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEvent )
 {
     // SAFE
     // remove our reference to the config access
@@ -662,7 +652,6 @@ void UICommandDescription::impl_fillElements(const sal_Char* _pName)
 }
 
 Any SAL_CALL UICommandDescription::getByName( const OUString& aName )
-throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     Any a;
 
@@ -703,7 +692,6 @@ throw (css::container::NoSuchElementException, css::lang::WrappedTargetException
 }
 
 Sequence< OUString > SAL_CALL UICommandDescription::getElementNames()
-throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(rBHelper.rMutex);
 
@@ -711,7 +699,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL UICommandDescription::hasByName( const OUString& aName )
-throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(rBHelper.rMutex);
 
@@ -721,13 +708,11 @@ throw (css::uno::RuntimeException, std::exception)
 
 // XElementAccess
 Type SAL_CALL UICommandDescription::getElementType()
-throw (css::uno::RuntimeException, std::exception)
 {
     return( cppu::UnoType<XNameAccess>::get());
 }
 
 sal_Bool SAL_CALL UICommandDescription::hasElements()
-throw (css::uno::RuntimeException, std::exception)
 {
     // generic UI commands are always available!
     return true;
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index c304859d7acc..b79357daa4ef 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -56,26 +56,23 @@ class AddonsToolBarFactory :  public ::cppu::WeakImplHelper< css::lang::XService
 public:
     explicit AddonsToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.AddonsToolBarFactory");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.ToolBarFactory"};
     }
 
     // XUIElementFactory
-    virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) override;
 
     bool hasButtonsInContext( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rPropSeq,
                                   const css::uno::Reference< css::frame::XFrame >& rFrame );
@@ -164,9 +161,6 @@ bool AddonsToolBarFactory::hasButtonsInContext(
 Reference< XUIElement > SAL_CALL AddonsToolBarFactory::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException,
-        css::lang::IllegalArgumentException,
-        css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index fdc06a6e4d0a..1a600b0ea75a 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -134,7 +134,7 @@ void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule(
 }
 
 // container.XContainerListener
-void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent )
 {
     OUString   aCommand;
     OUString   aModule;
@@ -154,7 +154,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont
     }
 }
 
-void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent )
 {
     OUString   aCommand;
     OUString   aModule;
@@ -172,13 +172,13 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const Cont
     }
 }
 
-void SAL_CALL ConfigurationAccess_ControllerFactory::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_ControllerFactory::elementReplaced( const ContainerEvent& aEvent )
 {
     elementInserted(aEvent);
 }
 
 // lang.XEventListener
-void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObject& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObject& )
 {
     // remove our reference to the config access
     osl::MutexGuard g(m_mutex);
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index e9d9f79ce5ab..05709675997a 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -56,7 +56,6 @@ MenuBarFactory::~MenuBarFactory()
 Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
     Reference< css::ui::XUIElement > xMenuBar(
             static_cast<OWeakObject *>(new MenuBarWrapper(m_xContext)), UNO_QUERY);
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 2e3361881d98..0fe245092540 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -42,26 +42,23 @@ class StatusBarFactory :  public MenuBarFactory
 public:
     explicit StatusBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.StatusBarFactory");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.StatusBarFactory"};
     }
 
     // XUIElementFactory
-    virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) override;
 };
 
 StatusBarFactory::StatusBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
@@ -73,7 +70,6 @@ StatusBarFactory::StatusBarFactory( const css::uno::Reference< css::uno::XCompon
 Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
     Reference< css::ui::XUIElement > xStatusBar(
             static_cast<OWeakObject *>(new StatusBarWrapper(m_xContext)), UNO_QUERY);
diff --git a/framework/source/uifactory/toolbarfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx
index 63811997c53a..3ccf7f16dcd9 100644
--- a/framework/source/uifactory/toolbarfactory.cxx
+++ b/framework/source/uifactory/toolbarfactory.cxx
@@ -40,28 +40,24 @@ class ToolBarFactory :  public MenuBarFactory
 public:
     explicit ToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.ToolBarFactory");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.ToolBarFactory"};
     }
 
     // XUIElementFactory
     virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement(
-            const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args )
-        throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+            const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) override;
 };
 
 ToolBarFactory::ToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
@@ -73,7 +69,6 @@ ToolBarFactory::ToolBarFactory( const css::uno::Reference< css::uno::XComponentC
 Reference< XUIElement > SAL_CALL ToolBarFactory::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
     Reference< css::ui::XUIElement > xToolBar(
            static_cast<OWeakObject *>(new ToolBarWrapper(m_xContext)), UNO_QUERY);
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index 25114ce32fb7..490cd92948be 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -50,14 +50,14 @@ public:
     virtual ~UIControllerFactory() override;
 
     // XMultiComponentFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const OUString& aServiceSpecifier, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const OUString& aServiceSpecifier, const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
     // XUIControllerRegistration
-    virtual sal_Bool SAL_CALL hasController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasController( const OUString& aCommandURL, const OUString& aModuleName ) override;
+    virtual void SAL_CALL registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) override;
+    virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) override;
 
 protected:
     UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString &rUINode  );
@@ -96,7 +96,6 @@ void SAL_CALL UIControllerFactory::disposing()
 Reference< XInterface > SAL_CALL UIControllerFactory::createInstanceWithContext(
     const OUString& aServiceSpecifier,
     const Reference< XComponentContext >& )
-throw (Exception, RuntimeException, std::exception)
 {
     // SAFE
     osl::MutexGuard g(rBHelper.rMutex);
@@ -119,7 +118,6 @@ Reference< XInterface > SAL_CALL UIControllerFactory::createInstanceWithArgument
     const OUString&                  ServiceSpecifier,
     const Sequence< Any >&                  Arguments,
     const Reference< XComponentContext >& )
-throw (Exception, RuntimeException, std::exception)
 {
     const OUString aPropModuleName( "ModuleIdentifier" );
     const OUString aPropValueName( "Value" );
@@ -179,7 +177,6 @@ throw (Exception, RuntimeException, std::exception)
 }
 
 Sequence< OUString > SAL_CALL UIControllerFactory::getAvailableServiceNames()
-throw (RuntimeException, std::exception)
 {
     return Sequence< OUString >();
 }
@@ -188,7 +185,6 @@ throw (RuntimeException, std::exception)
 sal_Bool SAL_CALL UIControllerFactory::hasController(
     const OUString& aCommandURL,
     const OUString& aModuleName )
-throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(rBHelper.rMutex);
 
@@ -205,7 +201,6 @@ void SAL_CALL UIControllerFactory::registerController(
     const OUString& aCommandURL,
     const OUString& aModuleName,
     const OUString& aControllerImplementationName )
-throw (RuntimeException, std::exception)
 {
     // SAFE
     osl::MutexGuard g(rBHelper.rMutex);
@@ -223,7 +218,6 @@ throw (RuntimeException, std::exception)
 void SAL_CALL UIControllerFactory::deregisterController(
     const OUString& aCommandURL,
     const OUString& aModuleName )
-throw (RuntimeException, std::exception)
 {
     // SAFE
     osl::MutexGuard g(rBHelper.rMutex);
@@ -243,20 +237,17 @@ class PopupMenuControllerFactory :  public UIControllerFactory
 public:
     explicit PopupMenuControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.PopupMenuControllerFactory");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.PopupMenuControllerFactory"};
     }
@@ -293,20 +284,17 @@ class ToolbarControllerFactory :  public UIControllerFactory
 public:
     explicit ToolbarControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.ToolBarControllerFactory");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.ToolbarControllerFactory"};
     }
@@ -343,20 +331,17 @@ class StatusbarControllerFactory :  public UIControllerFactory
 public:
     explicit StatusbarControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.StatusBarControllerFactory");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.frame.StatusbarControllerFactory"};
     }
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 747f1cf76f45..d908a359c4a3 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -188,7 +188,7 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac
 }
 
 // container.XContainerListener
-void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent )
 {
     OUString   aType;
     OUString   aName;
@@ -207,7 +207,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain
     }
 }
 
-void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent )
 {
     OUString   aType;
     OUString   aName;
@@ -226,7 +226,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain
     }
 }
 
-void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent )
 {
     OUString   aType;
     OUString   aName;
@@ -247,7 +247,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const Contain
 }
 
 // lang.XEventListener
-void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& )
 {
     // SAFE
     // remove our reference to the config access
@@ -353,32 +353,29 @@ class UIElementFactoryManager : private cppu::BaseMutex,
 public:
     explicit UIElementFactoryManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.UIElementFactoryManager");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.UIElementFactoryManager"};
     }
 
     // XUIElementFactory
-    virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) override;
 
     // XUIElementFactoryRegistration
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRegisteredFactories(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::ui::XUIElementFactory > SAL_CALL getFactory( const OUString& ResourceURL, const OUString& ModuleIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier, const OUString& aFactoryImplementationName ) throw (css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRegisteredFactories(  ) override;
+    virtual css::uno::Reference< css::ui::XUIElementFactory > SAL_CALL getFactory( const OUString& ResourceURL, const OUString& ModuleIdentifier ) override;
+    virtual void SAL_CALL registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier, const OUString& aFactoryImplementationName ) override;
+    virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) override;
 
 private:
     bool                                                  m_bConfigRead;
@@ -405,7 +402,6 @@ void SAL_CALL UIElementFactoryManager::disposing()
 Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
     Reference< XFrame > xFrame;
     OUString aModuleId;
@@ -455,7 +451,6 @@ throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentExcept
 
 // XUIElementFactoryRegistration
 Sequence< Sequence< PropertyValue > > SAL_CALL UIElementFactoryManager::getRegisteredFactories()
-throw ( RuntimeException, std::exception )
 {
     // SAFE
     osl::MutexGuard g(rBHelper.rMutex);
@@ -474,7 +469,6 @@ throw ( RuntimeException, std::exception )
 }
 
 Reference< XUIElementFactory > SAL_CALL UIElementFactoryManager::getFactory( const OUString& aResourceURL, const OUString& aModuleId )
-throw ( RuntimeException, std::exception )
 {
     OUString aServiceSpecifier;
     { // SAFE
@@ -514,7 +508,6 @@ throw ( RuntimeException, std::exception )
 }
 
 void SAL_CALL UIElementFactoryManager::registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId, const OUString& aFactoryImplementationName )
-throw ( ElementExistException, RuntimeException, std::exception )
 {
     // SAFE
     osl::MutexGuard g(rBHelper.rMutex);
@@ -534,7 +527,6 @@ throw ( ElementExistException, RuntimeException, std::exception )
 }
 
 void SAL_CALL UIElementFactoryManager::deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId )
-throw ( NoSuchElementException, RuntimeException, std::exception )
 {
     // SAFE
     osl::MutexGuard g(rBHelper.rMutex);
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index e41ea0af90de..15c478b89d61 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -51,27 +51,24 @@ class WindowContentFactoryManager : private cppu::BaseMutex,
 public:
     explicit WindowContentFactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.framework.WindowContentFactoryManager");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return {"com.sun.star.ui.WindowContentFactoryManager"};
     }
 
     // XSingleComponentFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
 
 private:
     virtual void SAL_CALL disposing() override;
@@ -99,7 +96,6 @@ void SAL_CALL WindowContentFactoryManager::disposing()
 // XSingleComponentFactory
 uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithContext(
     const uno::Reference< uno::XComponentContext >& /*xContext*/ )
-throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface > xWindow;
     return xWindow;
@@ -107,7 +103,6 @@ throw (uno::Exception, uno::RuntimeException, std::exception)
 
 uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithArgumentsAndContext(
     const uno::Sequence< uno::Any >& Arguments, const uno::Reference< uno::XComponentContext >& Context )
-throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface > xWindow;
     uno::Reference< frame::XFrame >   xFrame;
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index fe58cc78a529..b73f1f71f02e 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -69,14 +69,10 @@ AcceleratorConfigurationReader::~AcceleratorConfigurationReader()
 }
 
 void SAL_CALL AcceleratorConfigurationReader::startDocument()
-    throw(css::xml::sax::SAXException,
-          css::uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL AcceleratorConfigurationReader::endDocument()
-    throw(css::xml::sax::SAXException,
-          css::uno::RuntimeException, std::exception )
 {
     // The xml file seems to be corrupted.
     // Because we found no end-tags ... at least for
@@ -92,8 +88,6 @@ void SAL_CALL AcceleratorConfigurationReader::endDocument()
 
 void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString&                                      sElement      ,
                                                            const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList)
-    throw(css::xml::sax::SAXException,
-          css::uno::RuntimeException, std::exception )
 {
     EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement);
 
@@ -182,8 +176,6 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString&
 }
 
 void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElement)
-    throw(css::xml::sax::SAXException,
-          css::uno::RuntimeException, std::exception )
 {
     EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement);
 
@@ -205,27 +197,19 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElemen
 }
 
 void SAL_CALL AcceleratorConfigurationReader::characters(const OUString&)
-    throw(css::xml::sax::SAXException,
-          css::uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString&)
-    throw(css::xml::sax::SAXException,
-          css::uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/,
                                                                     const OUString& /*sData*/  )
-    throw(css::xml::sax::SAXException,
-          css::uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator >& xLocator)
-    throw(css::xml::sax::SAXException,
-          css::uno::RuntimeException, std::exception )
 {
     m_xLocator = xLocator;
 }
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 96ff940024ae..5a7e002446f9 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -139,12 +139,10 @@ OReadImagesDocumentHandler::~OReadImagesDocumentHandler()
 
 // XDocumentHandler
 void SAL_CALL OReadImagesDocumentHandler::startDocument()
-throw ( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadImagesDocumentHandler::endDocument()
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -159,9 +157,6 @@ throw(  SAXException, RuntimeException, std::exception )
 
 void SAL_CALL OReadImagesDocumentHandler::startElement(
     const OUString& aName, const Reference< XAttributeList > &xAttribs )
-        throw(SAXException,
-              RuntimeException,
-              std::exception)
 {
     SolarMutexGuard g;
 
@@ -486,9 +481,6 @@ void SAL_CALL OReadImagesDocumentHandler::startElement(
 }
 
 void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName)
-    throw(SAXException,
-          RuntimeException,
-          std::exception)
 {
     SolarMutexGuard g;
 
@@ -547,24 +539,20 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName)
 }
 
 void SAL_CALL OReadImagesDocumentHandler::characters(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const OUString&)
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadImagesDocumentHandler::processingInstruction(
     const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadImagesDocumentHandler::setDocumentLocator(
     const Reference< XLocator > &xLocator)
-throw(  SAXException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
     m_xLocator = xLocator;
@@ -605,8 +593,7 @@ OWriteImagesDocumentHandler::~OWriteImagesDocumentHandler()
 {
 }
 
-void OWriteImagesDocumentHandler::WriteImagesDocument() throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteImagesDocument()
 {
     SolarMutexGuard g;
 
@@ -658,8 +645,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw
 
 //  protected member functions
 
-void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList ) throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList )
 {
     ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
     Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -728,8 +714,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
 }
 
-void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage ) throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage )
 {
     ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
     Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -749,8 +734,7 @@ void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
 }
 
-void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageItemListDescriptor* pExternalImageList ) throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageItemListDescriptor* pExternalImageList )
 {
     m_xWriteDocumentHandler->startElement( ELEMENT_NS_EXTERNALIMAGES, m_xEmptyList );
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
@@ -766,8 +750,7 @@ void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageIte
     m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
 }
 
-void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDescriptor* pExternalImage ) throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDescriptor* pExternalImage )
 {
     ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
     Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index c0acdebff90b..e0c1b67823f1 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -220,7 +220,7 @@ public:
                 bool in_bExtensionMode);
     /// @throws HelpProcessingException
     /// @throws BasicCodeTagger::TaggerException
-    bool compile() throw (HelpProcessingException, BasicCodeTagger::TaggerException, std::exception);
+    bool compile();
 private:
     xmlDocPtr getSourceDocument(const fs::path &filePath);
     static void tagBasicCodeExamples(xmlDocPtr doc);
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index ddbe3480016b..051a20f04f2f 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -51,8 +51,7 @@ public:
     void main(std::vector<std::string> &args,
               std::string* pExtensionPath = nullptr,
               std::string* pDestination = nullptr,
-              const OUString* pOfficeHelpPath = nullptr )
-            throw( HelpProcessingException, std::exception );
+              const OUString* pOfficeHelpPath = nullptr );
 
     HelpLinker()
         : bExtensionMode(false)
@@ -85,7 +84,7 @@ private:
     void initIndexerPreProcessor();
     /// @throws HelpProcessingException
     /// @throws BasicCodeTagger::TaggerException
-    void link() throw(HelpProcessingException, BasicCodeTagger::TaggerException, std::exception);
+    void link();
     static void addBookmark( FILE* pFile_DBHelp, std::string thishid,
         const std::string& fileB, const std::string& anchorB,
         const std::string& jarfileB, const std::string& titleB );
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 67dbfcdc8ddb..0eb89533382b 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -432,7 +432,6 @@ void myparser::traverse( xmlNodePtr parentNode )
 }
 
 bool HelpCompiler::compile()
-    throw (HelpProcessingException, BasicCodeTagger::TaggerException, std::exception)
 {
     // we now have the jaroutputstream, which will contain the document.
     // now determine the document as a dom tree in variable docResolved
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index 1af6a58467a5..243a5fb2f4dc 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -273,7 +273,7 @@ void HelpLinker::initIndexerPreProcessor()
 /**
 *
 */
-void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerException, std::exception)
+void HelpLinker::link()
 {
 
     if( bExtensionMode )
@@ -535,7 +535,6 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx
 void HelpLinker::main( std::vector<std::string> &args,
                        std::string* pExtensionPath, std::string* pDestination,
                        const OUString* pOfficeHelpPath )
-    throw( HelpProcessingException, std::exception )
 {
     bExtensionMode = false;
     helpFiles.clear();
diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx
index c3683138f14c..a59850e51fca 100644
--- a/hwpfilter/source/attributes.cxx
+++ b/hwpfilter/source/attributes.cxx
@@ -46,7 +46,7 @@ struct AttributeListImpl_impl
     std::vector<struct TagAttribute> vecAttribute;
 };
 
-sal_Int16 SAL_CALL AttributeListImpl::getLength() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AttributeListImpl::getLength()
 {
     return (sal_Int16)m_pImpl->vecAttribute.size();
 }
@@ -60,7 +60,7 @@ AttributeListImpl::AttributeListImpl( const AttributeListImpl &r )
 }
 
 
-OUString AttributeListImpl::getNameByIndex(sal_Int16 i) throw (RuntimeException, std::exception)
+OUString AttributeListImpl::getNameByIndex(sal_Int16 i)
 {
     sal_uInt32 i2 = sal::static_int_cast<sal_Int16>(i);
     if( i >= 0 &&  i2 < m_pImpl->vecAttribute.size() )
@@ -71,7 +71,7 @@ OUString AttributeListImpl::getNameByIndex(sal_Int16 i) throw (RuntimeException,
 }
 
 
-OUString AttributeListImpl::getTypeByIndex(sal_Int16 i) throw (RuntimeException, std::exception)
+OUString AttributeListImpl::getTypeByIndex(sal_Int16 i)
 {
     sal_uInt32 i2 = sal::static_int_cast<sal_Int16>(i);
     if( i >= 0 &&  i2 < m_pImpl->vecAttribute.size() )
@@ -82,7 +82,7 @@ OUString AttributeListImpl::getTypeByIndex(sal_Int16 i) throw (RuntimeException,
 }
 
 
-OUString AttributeListImpl::getValueByIndex(sal_Int16 i) throw (RuntimeException, std::exception)
+OUString AttributeListImpl::getValueByIndex(sal_Int16 i)
 {
     sal_uInt32 i2 = sal::static_int_cast<sal_Int16>(i);
     if( i >= 0 &&  i2 < m_pImpl->vecAttribute.size() )
@@ -94,7 +94,7 @@ OUString AttributeListImpl::getValueByIndex(sal_Int16 i) throw (RuntimeException
 }
 
 
-OUString AttributeListImpl::getTypeByName( const OUString& sName ) throw (RuntimeException, std::exception)
+OUString AttributeListImpl::getTypeByName( const OUString& sName )
 {
     std::vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
 
@@ -109,7 +109,7 @@ OUString AttributeListImpl::getTypeByName( const OUString& sName ) throw (Runtim
 }
 
 
-OUString AttributeListImpl::getValueByName(const OUString& sName) throw (RuntimeException, std::exception)
+OUString AttributeListImpl::getValueByName(const OUString& sName)
 {
     std::vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
 
diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx
index 8d4c0cdce768..09dc26a03b1f 100644
--- a/hwpfilter/source/attributes.hxx
+++ b/hwpfilter/source/attributes.hxx
@@ -40,12 +40,12 @@ public:
     AttributeListImpl( const AttributeListImpl & );
 
 public:
-    virtual sal_Int16 SAL_CALL getLength() throw (RuntimeException, std::exception) override;
-    virtual OUString  SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException, std::exception) override;
-    virtual OUString  SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException, std::exception) override;
-    virtual OUString  SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException, std::exception) override;
-    virtual OUString  SAL_CALL getValueByIndex(sal_Int16 i) throw (RuntimeException, std::exception) override;
-    virtual OUString  SAL_CALL getValueByName(const OUString& aName) throw (RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getLength() override;
+    virtual OUString  SAL_CALL getNameByIndex(sal_Int16 i) override;
+    virtual OUString  SAL_CALL getTypeByIndex(sal_Int16 i) override;
+    virtual OUString  SAL_CALL getTypeByName(const OUString& aName) override;
+    virtual OUString  SAL_CALL getValueByIndex(sal_Int16 i) override;
+    virtual OUString  SAL_CALL getValueByName(const OUString& aName) override;
 
 public:
     void addAttribute( const OUString &sName , const OUString &sType , const OUString &sValue );
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 68388d12b3c4..deb3b267805d 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -137,7 +137,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHWP(const OUString &rURL
     return true;
 }
 
-sal_Bool HwpReader::filter(const Sequence< PropertyValue >& rDescriptor) throw(RuntimeException, std::exception)
+sal_Bool HwpReader::filter(const Sequence< PropertyValue >& rDescriptor)
 {
     utl::MediaDescriptor aDescriptor(rDescriptor);
     aDescriptor.addInputStream();
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index c44a0c37abd6..a0c7d0d8c0ee 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -84,8 +84,8 @@ public:
     /**
      * parseStream does Parser-startup initializations
      */
-    virtual sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel() throw(RuntimeException, std::exception) override {}
+    virtual sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) override;
+    virtual void SAL_CALL cancel() override {}
     void SAL_CALL setDocumentHandler(Reference< XDocumentHandler > const & xHandler)
     {
         m_rxDocumentHandler = xHandler;
@@ -162,21 +162,19 @@ public:
 
 public:
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor )
-        throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL cancel() throw(RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) override;
+    virtual void SAL_CALL cancel() override;
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override;
-    Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
 
     //XExtendedFilterDetection
-    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) override;
 
 public:
     Reference< XFilter > rFilter;
@@ -185,7 +183,7 @@ public:
 
 /// @throws Exception
 Reference< XInterface > HwpImportFilter_CreateInstance(
-    const Reference< XMultiServiceFactory >& rSMgr ) throw( Exception )
+    const Reference< XMultiServiceFactory >& rSMgr )
 {
     HwpImportFilter *p = new HwpImportFilter( rSMgr );
 
@@ -224,19 +222,17 @@ HwpImportFilter::~HwpImportFilter()
 }
 
 sal_Bool HwpImportFilter::filter( const Sequence< PropertyValue >& aDescriptor )
-    throw( RuntimeException, std::exception )
 {
     // delegate to IchitaroImpoter
     return rFilter->filter( aDescriptor );
 }
 
-void HwpImportFilter::cancel() throw(css::uno::RuntimeException, std::exception)
+void HwpImportFilter::cancel()
 {
     rFilter->cancel();
 }
 
 void HwpImportFilter::setTargetDocument( const Reference< XComponent >& xDoc )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
         // delegate
     rImporter->setTargetDocument( xDoc );
@@ -247,18 +243,18 @@ OUString HwpImportFilter::getImplementationName_Static() throw()
     return OUString( IMPLEMENTATION_NAME );
 }
 
-OUString HwpImportFilter::getImplementationName() throw(css::uno::RuntimeException, std::exception)
+OUString HwpImportFilter::getImplementationName()
 {
     return OUString( IMPLEMENTATION_NAME );
 }
 
-sal_Bool HwpImportFilter::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool HwpImportFilter::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 //XExtendedFilterDetection
-OUString HwpImportFilter::detect( css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) throw (css::uno::RuntimeException, std::exception)
+OUString HwpImportFilter::detect( css::uno::Sequence< css::beans::PropertyValue >& rDescriptor )
 {
     OUString sTypeName;
 
@@ -284,7 +280,7 @@ OUString HwpImportFilter::detect( css::uno::Sequence< css::beans::PropertyValue
     return sTypeName;
 }
 
-Sequence< OUString> HwpImportFilter::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+Sequence< OUString> HwpImportFilter::getSupportedServiceNames()
 {
     Sequence < OUString > aRet(2);
     OUString* pArray = aRet.getArray();
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 5168b9ae1a1b..499a4930684a 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -52,62 +52,57 @@ public:
 
     virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
-        sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32& nDone ) override;
     virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
-        sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32& nDone ) override;
 
     virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 WordType) override;
     virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 WordType) override;
     virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
-        const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) override;
 
     virtual sal_Bool SAL_CALL isBeginWord( const OUString& Text, sal_Int32 nPos,
-        const css::lang::Locale& nLocale, sal_Int16 WordType ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 WordType ) override;
     virtual sal_Bool SAL_CALL isEndWord( const OUString& Text, sal_Int32 nPos,
-        const css::lang::Locale& nLocale, sal_Int16 WordType ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 WordType ) override;
     virtual sal_Int16 SAL_CALL getWordType( const OUString& Text, sal_Int32 nPos,
-        const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale ) override;
 
     virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale ) override;
     virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale ) override;
 
     virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
 
-    virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos ) override;
     virtual sal_Int32 SAL_CALL beginOfScript( const OUString& Text, sal_Int32 nStartPos,
-        sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int16 ScriptType ) override;
     virtual sal_Int32 SAL_CALL endOfScript( const OUString& Text, sal_Int32 nStartPos,
-        sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int16 ScriptType ) override;
     virtual sal_Int32 SAL_CALL previousScript( const OUString& Text, sal_Int32 nStartPos,
-        sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int16 ScriptType ) override;
     virtual sal_Int32 SAL_CALL nextScript( const OUString& Text, sal_Int32 nStartPos,
-        sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int16 ScriptType ) override;
 
     virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 CharType ) override;
     virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 CharType ) override;
     virtual sal_Int32 SAL_CALL previousCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 CharType ) override;
     virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 CharType ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar);
 protected:
@@ -126,11 +121,9 @@ private:
     css::uno::Reference < css::uno::XComponentContext > m_xContext;
 
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName )
-        throw( css::uno::RuntimeException );
+    bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName );
     /// @throws css::uno::RuntimeException
-    css::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const css::lang::Locale& rLocale )
-        throw( css::uno::RuntimeException );
+    css::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const css::lang::Locale& rLocale );
 
 };
 
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index 9429176cd72e..1ec97dc7fae8 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -34,18 +34,14 @@ public:
     BreakIterator_CJK();
 
     Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
-            const css::lang::Locale& nLocale, sal_Int16 WordType)
-            throw(css::uno::RuntimeException, std::exception) override;
+            const css::lang::Locale& nLocale, sal_Int16 WordType) override;
     Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
-            const css::lang::Locale& nLocale, sal_Int16 WordType)
-            throw(css::uno::RuntimeException, std::exception) override;
+            const css::lang::Locale& nLocale, sal_Int16 WordType) override;
     Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
-            const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
-            throw(css::uno::RuntimeException, std::exception) override;
+            const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) override;
     LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
 
 protected:
     std::unique_ptr<xdictionary> m_xDict;
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index a9d3207f3d8b..24fec512af72 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -34,14 +34,13 @@ public:
     virtual ~BreakIterator_CTL() override;
     virtual sal_Int32 SAL_CALL previousCharacters(const OUString& text, sal_Int32 start,
         const lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
-        sal_Int32& nDone) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32& nDone) override;
     virtual sal_Int32 SAL_CALL nextCharacters(const OUString& text, sal_Int32 start,
         const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count,
-        sal_Int32& nDone) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32& nDone) override;
     virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
 protected:
     OUString cachedText; // for cell index
     sal_Int32* nextCellIndex;
@@ -49,7 +48,7 @@ protected:
     sal_Int32 cellIndexSize;
 
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos);
 };
 
 } } } }
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index 943c8f33cabb..5e2eddca019c 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -32,7 +32,7 @@ public:
     virtual ~BreakIterator_th() override;
 
 protected:
-    void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(css::uno::RuntimeException) override;
+    void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) override;
 };
 
 } } } }
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index a7581b5c577d..42dcb305777a 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -41,35 +41,31 @@ public:
 
     virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
-        sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32& nDone ) override;
     virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
-        sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32& nDone ) override;
 
     virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 WordType) override;
     virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 WordType) override;
     virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
-        const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) override;
 
     virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale ) override;
     virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& nLocale ) override;
 
     virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
-        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     const sal_Char *cBreakIterator, *lineRule;
@@ -94,7 +90,7 @@ protected:
 
     /// @throws css::uno::RuntimeException
     void SAL_CALL loadICUBreakIterator(const css::lang::Locale& rLocale,
-        sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText) throw(css::uno::RuntimeException);
+        sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText);
 };
 
 } } } }
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 8cca72220ff7..06fe9be6aaca 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -53,45 +53,45 @@ public:
 
 
     // Methods
-    virtual void SAL_CALL loadDefaultCalendar(const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
-    virtual Calendar SAL_CALL getLoadedCalendar() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < OUString > SAL_CALL getAllCalendars(const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getUniqueID() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDateTime(double fTimeInDays) throw(css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getDateTime() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL loadDefaultCalendar(const css::lang::Locale& rLocale) override;
+    virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) override;
+    virtual Calendar SAL_CALL getLoadedCalendar() override;
+    virtual css::uno::Sequence < OUString > SAL_CALL getAllCalendars(const css::lang::Locale& rLocale) override;
+    virtual OUString SAL_CALL getUniqueID() override;
+    virtual void SAL_CALL setDateTime(double fTimeInDays) override;
+    virtual double SAL_CALL getDateTime() override;
+    virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) override;
+    virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) override;
+    virtual sal_Bool SAL_CALL isValid() override;
+    virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) override;
+    virtual sal_Int16 SAL_CALL getFirstDayOfWeek() override;
+    virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) override;
+    virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) override;
+    virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() override;
+    virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() override;
+    virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() override;
+    virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() override;
+    virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() override;
+    virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) override;
 
     // Methods in XExtendedCalendar
-    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override;
 
     // XCalendar3
-    virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(css::uno::RuntimeException, std::exception) override;
+    virtual Calendar2 SAL_CALL getLoadedCalendar2() override;
+    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() override;
+    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() override;
+    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() override;
+    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() override;
 
     // XCalendar4
-    virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getLocalDateTime() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setLocalDateTime(double TimeInDays) override;
+    virtual double SAL_CALL getLocalDateTime() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     struct lookupTableItem {
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index bd036eccbdf8..a62f93da542b 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -59,43 +59,43 @@ public:
     virtual ~Calendar_gregorian() override;
 
     // Methods in XCalendar
-    virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDateTime(double fTimeInDays) throw(css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getDateTime() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
-    virtual Calendar SAL_CALL getLoadedCalendar() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getUniqueID() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) override;
+    virtual void SAL_CALL setDateTime(double fTimeInDays) override;
+    virtual double SAL_CALL getDateTime() override;
+    virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) override;
+    virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) override;
+    virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) override;
+    virtual sal_Bool SAL_CALL isValid() override;
+    virtual Calendar SAL_CALL getLoadedCalendar() override;
+    virtual OUString SAL_CALL getUniqueID() override;
+    virtual sal_Int16 SAL_CALL getFirstDayOfWeek() override;
+    virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) override;
+    virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) override;
+    virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() override;
+    virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() override;
+    virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() override;
+    virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() override;
+    virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() override;
+    virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) override;
 
     // Methods in XExtendedCalendar
-    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override;
 
     // XCalendar3
-    virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(css::uno::RuntimeException, std::exception) override;
+    virtual Calendar2 SAL_CALL getLoadedCalendar2() override;
+    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() override;
+    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() override;
+    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() override;
+    virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() override;
 
     // XCalendar4
-    virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getLocalDateTime() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setLocalDateTime(double TimeInDays) override;
+    virtual double SAL_CALL getLocalDateTime() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     const Era *eraArray;
@@ -108,14 +108,14 @@ protected:
     sal_Int16 fieldSetValue[FIELD_INDEX_COUNT];
 
     /// @throws css::uno::RuntimeException
-    virtual void mapToGregorian() throw(css::uno::RuntimeException);
+    virtual void mapToGregorian();
     /// @throws css::uno::RuntimeException
-    virtual void mapFromGregorian() throw(css::uno::RuntimeException);
+    virtual void mapFromGregorian();
     /// @throws css::uno::RuntimeException
-    void getValue() throw(css::uno::RuntimeException);
+    void getValue();
 
     /// @throws css::uno::RuntimeException
-    OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) throw (css::uno::RuntimeException);
+    OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode );
 
 private:
     Calendar2 aCalendar;
@@ -124,12 +124,12 @@ private:
 
         @throws css::uno::RuntimeException
     */
-    void submitFields() throw(css::uno::RuntimeException);
+    void submitFields();
     /** Set fields internally.
 
         @throws css::uno::RuntimeException
     */
-    void setValue() throw(css::uno::RuntimeException);
+    void setValue();
     /** Obtain combined field values for timezone offset (minutes+secondmillis)
         in milliseconds and whether fields were set. */
     bool getZoneOffset( sal_Int32 & o_nOffset ) const;
@@ -150,8 +150,8 @@ class Calendar_hanja : public Calendar_gregorian
 public:
     // Constructors
     Calendar_hanja();
-    virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) override;
+    virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) override;
 };
 
 
@@ -184,7 +184,7 @@ public:
     Calendar_buddhist();
 
     // Methods in XExtendedCalendar
-    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override;
 };
 
 } } } }
diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index b9bb93b1497a..71f96767c089 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.hxx
@@ -35,8 +35,8 @@ public:
     Calendar_hijri();
 
 protected:
-    void mapToGregorian() throw(css::uno::RuntimeException) override;
-    void mapFromGregorian() throw(css::uno::RuntimeException) override;
+    void mapToGregorian() override;
+    void mapFromGregorian() override;
 
     // radians per degree (pi/180)
     static const double RadPerDeg;
diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index a4242c296f13..db2ec2b1a8aa 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.hxx
@@ -34,11 +34,11 @@ public:
     Calendar_jewish();
 
     // Methods in XExtendedCalendar
-    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override;
 
 protected:
-    void mapToGregorian() throw(css::uno::RuntimeException) override;
-    void mapFromGregorian() throw(css::uno::RuntimeException) override;
+    void mapToGregorian() override;
+    void mapFromGregorian() override;
 };
 
 } } } }
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 122e1ee7136b..811e92b0ff05 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -42,31 +42,30 @@ public:
     virtual ~cclass_Unicode() override;
 
     virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
-        const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
     virtual OUString SAL_CALL toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
-        const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
     virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
-        const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos )  throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
+    virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) override;
+    virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) override;
+    virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) override;
     virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos,
-        const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
     virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos, sal_Int32 nCount,
-        const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
     virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
         const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
-        sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) override;
     virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text,
         sal_Int32 nPos, const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
         const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
-        const OUString& userDefinedCharactersCont ) throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& userDefinedCharactersCont ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     Transliteration_casemapping *trans;
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index 863e408598e0..ba890d5d3b6a 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -36,13 +36,13 @@ public:
     virtual ~ChapterCollator() override;
 
     sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
+    sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     // CharacterClassification Implementation
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 6533e792b1d6..2102c82dd7af 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -40,44 +40,31 @@ public:
     virtual ~CharacterClassificationImpl() override;
 
     virtual OUString SAL_CALL toUpper( const OUString& Text,
-        sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale )
-        throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale ) override;
     virtual OUString SAL_CALL toLower( const OUString& Text,
-        sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale )
-        throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale ) override;
     virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos,
-        sal_Int32 nCount, const css::lang::Locale& rLocale )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos )
-        throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nCount, const css::lang::Locale& rLocale ) override;
+    virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) override;
+    virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) override;
+    virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) override;
     virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos,
-        const css::lang::Locale& rLocale )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
     virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos,
-        sal_Int32 nCount, const css::lang::Locale& rLocale )
-        throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nCount, const css::lang::Locale& rLocale ) override;
     virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
         const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
         const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
-        const OUString& userDefinedCharactersCont )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& userDefinedCharactersCont ) override;
     virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType,
         const OUString& Text, sal_Int32 nPos, const css::lang::Locale& rLocale,
         sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
-        sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont )
-        throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     struct lookupTableItem {
@@ -100,8 +87,7 @@ private:
     css::uno::Reference < XCharacterClassification > xUCI;
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference < XCharacterClassification > const & SAL_CALL getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale)
-        throw(css::uno::RuntimeException);
+    css::uno::Reference < XCharacterClassification > const & SAL_CALL getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale);
     bool SAL_CALL createLocaleSpecificCharacterClassification(const OUString& serviceName, const css::lang::Locale& rLocale);
 
 };
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 9650ef479dc1..34ddfc70c565 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -48,30 +48,27 @@ public:
     virtual ~CollatorImpl() override;
 
     virtual sal_Int32 SAL_CALL compareSubstring(const OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
 
     virtual sal_Int32 SAL_CALL compareString( const OUString& s1,
-        const OUString& s2) throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& s2) override;
 
-    virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale,  sal_Int32 collatorOptions)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale,  sal_Int32 collatorOptions) override;
 
     virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(  const OUString& impl, const lang::Locale& rLocale,
-        sal_Int32 collatorOptions) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32 collatorOptions) override;
 
     virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString& impl, const lang::Locale& rLocale,
-        const css::uno::Sequence< sal_Int32 >& collatorOptions) throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< sal_Int32 >& collatorOptions) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale ) override;
 
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     lang::Locale nLocale;
@@ -100,10 +97,9 @@ private:
 
     /// @throws css::uno::RuntimeException
     bool SAL_CALL createCollator(const lang::Locale& rLocale, const OUString& serviceName,
-        const OUString& rSortAlgorithm) throw(css::uno::RuntimeException);
+        const OUString& rSortAlgorithm);
     /// @throws css::uno::RuntimeException
-    void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm)
-        throw(css::uno::RuntimeException);
+    void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm);
 };
 
 } } } }
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index ac76c215295a..3487b44b7600 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -41,29 +41,25 @@ public:
     virtual ~Collator_Unicode() override;
 
     sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
 
-    sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2)
-        throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) override;
 
     sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale,
-        sal_Int32 collatorOptions) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32 collatorOptions) override;
 
 
     // following 4 methods are implemented in collatorImpl.
-    sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&,  sal_Int32)
-        throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();}
+    sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&,  sal_Int32) override {throw css::uno::RuntimeException();}
     void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&, const lang::Locale&,
-        const css::uno::Sequence< sal_Int32 >&) throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();}
-    css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&)
-        throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();}
-    css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& )
-        throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();}
+        const css::uno::Sequence< sal_Int32 >&) override {throw css::uno::RuntimeException();}
+    css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&) override {throw css::uno::RuntimeException();}
+    css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& ) override {throw css::uno::RuntimeException();}
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     const sal_Char *implementationName;
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 3d06b6af1111..0fe3ae4b6a5e 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -49,49 +49,36 @@ public:
     //XDefaultNumberingProvider
     virtual css::uno::Sequence< css::uno::Reference<
         css::container::XIndexAccess > > SAL_CALL
-        getDefaultOutlineNumberings( const css::lang::Locale& aLocale )
-        throw(css::uno::RuntimeException, std::exception) override;
+        getDefaultOutlineNumberings( const css::lang::Locale& aLocale ) override;
 
     virtual css::uno::Sequence< css::uno::Sequence<
         css::beans::PropertyValue > > SAL_CALL
-        getDefaultContinuousNumberingLevels( const css::lang::Locale& aLocale )
-        throw(css::uno::RuntimeException, std::exception) override;
+        getDefaultContinuousNumberingLevels( const css::lang::Locale& aLocale ) override;
 
     //XNumberingFormatter
     virtual OUString SAL_CALL makeNumberingString(
         const css::uno::Sequence<
         css::beans::PropertyValue >& aProperties,
-        const css::lang::Locale& aLocale )
-        throw(css::lang::IllegalArgumentException,
-        css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& aLocale ) override;
 
     //XNumberingTypeInfo
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getNumberingType( const OUString& NumberingIdentifier )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasNumberingType( const OUString& NumberingIdentifier )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes(  ) override;
+    virtual sal_Int16 SAL_CALL getNumberingType( const OUString& NumberingIdentifier ) override;
+    virtual sal_Bool SAL_CALL hasNumberingType( const OUString& NumberingIdentifier ) override;
+    virtual OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 private:
     css::uno::Reference < css::uno::XComponentContext > m_xContext;
     css::uno::Reference < css::container::XHierarchicalNameAccess > xHierarchicalNameAccess;
     std::unique_ptr<TransliterationImpl> translit;
     /// @throws css::uno::RuntimeException
-    OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index )
-        throw(css::uno::RuntimeException, std::exception);
+    OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index );
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL isScriptFlagEnabled(const OUString& aName )
-        throw(css::uno::RuntimeException);
+    bool SAL_CALL isScriptFlagEnabled(const OUString& aName );
 };
 } } } }
 
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index b2501415b1c1..006b9fa47e87 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -39,60 +39,48 @@ public:
     IndexEntrySupplier( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
 
     // Methods
-    virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList() override;
 
     virtual css::uno::Sequence < OUString > SAL_CALL getAlgorithmList(
-        const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
 
     virtual sal_Bool SAL_CALL loadAlgorithm(
         const css::lang::Locale& rLocale,
-        const OUString& SortAlgorithm, sal_Int32 collatorOptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& SortAlgorithm, sal_Int32 collatorOptions ) override;
 
     virtual sal_Bool SAL_CALL usePhoneticEntry(
-        const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
 
     virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry,
-        const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
 
     virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
-        const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) override;
 
     virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
         const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,
         const OUString& IndexEntry2, const OUString& PhoneticEntry2,
-        const css::lang::Locale& rLocale2 )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale2 ) override;
 
     virtual OUString SAL_CALL getIndexCharacter( const OUString& IndexEntry,
-        const css::lang::Locale& rLocale, const OUString& SortAlgorithm )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale, const OUString& SortAlgorithm ) override;
 
     virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
-        const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > xIES;
     css::uno::Reference < css::uno::XComponentContext > m_xContext;
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( css::uno::RuntimeException );
+    bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name);
     /// @throws css::uno::RuntimeException
     css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL getLocaleSpecificIndexEntrySupplier(
-        const css::lang::Locale& rLocale, const OUString& rSortAlgorithm) throw (css::uno::RuntimeException);
+        const css::lang::Locale& rLocale, const OUString& rSortAlgorithm);
 
 protected:
     css::lang::Locale aLocale;
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index 1ae075046314..15194ac7a62c 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -35,20 +35,16 @@ public:
     virtual ~IndexEntrySupplier_asian() override;
 
     OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
-            const css::lang::Locale& rLocale, const OUString& rAlgorithm )
-            throw (css::uno::RuntimeException, std::exception) override;
+            const css::lang::Locale& rLocale, const OUString& rAlgorithm ) override;
     OUString SAL_CALL getIndexKey( const OUString& rIndexEntry,
-            const OUString& rPhoneticEntry, const css::lang::Locale& rLocale)
-            throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rPhoneticEntry, const css::lang::Locale& rLocale) override;
     sal_Int16 SAL_CALL compareIndexEntry(
             const OUString& rIndexEntry1, const OUString& rPhoneticEntry1,
             const css::lang::Locale& rLocale1,
             const OUString& rIndexEntry2, const OUString& rPhoneticEntry2,
-            const css::lang::Locale& rLocale2 )
-            throw (css::uno::RuntimeException, std::exception) override;
+            const css::lang::Locale& rLocale2 ) override;
     OUString SAL_CALL getPhoneticCandidate( const OUString& rIndexEntry,
-            const css::lang::Locale& rLocale )
-            throw (css::uno::RuntimeException, std::exception) override;
+            const css::lang::Locale& rLocale ) override;
 #ifndef DISABLE_DYNLOADING
 private:
     oslModule hModule;
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index fa5c87eeb22a..74983cb3708d 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -43,51 +43,39 @@ public:
     IndexEntrySupplier_Common( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
     virtual ~IndexEntrySupplier_Common() override;
 
-    virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList() override;
 
     virtual css::uno::Sequence < OUString > SAL_CALL getAlgorithmList(
-        const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
 
     virtual sal_Bool SAL_CALL usePhoneticEntry(
-        const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
 
     virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry,
-        const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
 
     virtual sal_Bool SAL_CALL loadAlgorithm(
         const css::lang::Locale& rLocale,
-        const OUString& SortAlgorithm, sal_Int32 collatorOptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& SortAlgorithm, sal_Int32 collatorOptions ) override;
 
     virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
-        const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) override;
 
     virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
         const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,
         const OUString& IndexEntry2, const OUString& PhoneticEntry2,
-        const css::lang::Locale& rLocale2 )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale2 ) override;
 
     virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
-        const css::lang::Locale& rLocale, const OUString& rSortAlgorithm )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) override;
 
     virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
-        const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     const sal_Char *   implementationName;
@@ -99,8 +87,7 @@ protected:
 
     /// @throws css::uno::RuntimeException
     const OUString& SAL_CALL getEntry( const OUString& IndexEntry,
-        const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException);
+        const OUString& PhoneticEntry, const css::lang::Locale& rLocale );
 };
 
 } } } }
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index ebdbcecacfac..e2a6be7fe7f7 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -37,22 +37,18 @@ public:
 
     virtual sal_Bool SAL_CALL loadAlgorithm(
         const css::lang::Locale& rLocale,
-        const OUString& SortAlgorithm, sal_Int32 collatorOptions )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& SortAlgorithm, sal_Int32 collatorOptions ) override;
 
     virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
-        const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) override;
 
     virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
         const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,
         const OUString& IndexEntry2, const OUString& PhoneticEntry2,
-        const css::lang::Locale& rLocale2 )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale2 ) override;
 
     virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
-        const css::lang::Locale& rLocale, const OUString& rSortAlgorithm )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) override;
 
 private:
     std::unique_ptr<Index> index;
@@ -87,10 +83,10 @@ public:
     ~Index();
 
     /// @throws css::uno::RuntimeException
-    void init(const css::lang::Locale& rLocale, const OUString& algorithm) throw (css::uno::RuntimeException, std::exception);
+    void init(const css::lang::Locale& rLocale, const OUString& algorithm);
 
     /// @throws css::uno::RuntimeException
-    void makeIndexKeys(const css::lang::Locale &rLocale, const OUString &algorithm) throw (css::uno::RuntimeException, std::exception);
+    void makeIndexKeys(const css::lang::Locale &rLocale, const OUString &algorithm);
     sal_Int16 getIndexWeight(const OUString& rIndexEntry);
     OUString getIndexDescription(const OUString& rIndexEntry);
 
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index 9d8956e77b8e..7749c867253f 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -34,16 +34,13 @@ public:
         implementationName = "com.sun.star.i18n.IndexEntrySupplier_ja_phonetic";
     };
     virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
-        const css::lang::Locale& rLocale, const OUString& rSortAlgorithm )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) override;
     virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
-        const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) override;
     virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
         const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,
         const OUString& IndexEntry2, const OUString& PhoneticEntry2,
-        const css::lang::Locale& rLocale2 )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale2 ) override;
 };
 
 #define INDEXENTRYSUPPLIER_JA_PHONETIC( algorithm ) \
@@ -54,8 +51,7 @@ public:\
     };\
     virtual sal_Bool SAL_CALL loadAlgorithm(\
         const css::lang::Locale& rLocale,\
-        const OUString& SortAlgorithm, sal_Int32 collatorOptions ) \
-        throw (css::uno::RuntimeException, std::exception) override;\
+        const OUString& SortAlgorithm, sal_Int32 collatorOptions ) override;\
 };
 
 INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_syllable )
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index cd2748ac8ab3..c92f10b927b7 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -44,17 +44,15 @@ public:
     virtual ~InputSequenceCheckerImpl() override;
 
     virtual sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
-        sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
 
     virtual sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
-        sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     const sal_Char *serviceName;
@@ -71,8 +69,7 @@ private:
     css::uno::Reference < css::uno::XComponentContext > m_xContext;
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char* rLanguage)
-        throw (css::uno::RuntimeException);
+    css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char* rLanguage);
     static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
 };
 
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index dbbe12129a4d..19918857498b 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.hxx
@@ -36,10 +36,10 @@ public:
     virtual ~InputSequenceChecker_hi() override;
 
     sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
-        sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
 
     sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
-        sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
 };
 
 } } } }
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index 8c288ec511f8..e0ae2a9d689c 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.hxx
@@ -33,10 +33,10 @@ public:
     virtual ~InputSequenceChecker_th() override;
 
     sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
-        sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
 
     sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
-        sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
 };
 
 } } } }
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index fb4f9f274805..c89710cc49b3 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -81,57 +81,57 @@ public:
         excluding the one obtained via getFirstLocaleServiceName() */
     static ::std::vector< OUString > getFallbackLocaleServiceNames( const css::lang::Locale & rLocale );
 
-    virtual LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual LocaleDataItem SAL_CALL getLocaleItem( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< Calendar2 > SAL_CALL getAllCalendars2( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< Calendar > SAL_CALL getAllCalendars( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< Currency > SAL_CALL getAllCurrencies( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const css::lang::Locale& rLocale ) override;
+    virtual LocaleDataItem SAL_CALL getLocaleItem( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< Calendar2 > SAL_CALL getAllCalendars2( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< Calendar > SAL_CALL getAllCalendars( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< Currency > SAL_CALL getAllCurrencies( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) override;
     /// @throws css::uno::RuntimeException
-    OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException, std::exception);
-    virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override ;
+    OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
+    virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) override;
+    virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) override ;
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) ;
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAllInstalledLocaleNames() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) ;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAllInstalledLocaleNames() override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) override;
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+    css::uno::Sequence< css::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+    css::uno::Sequence< css::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale );
 
     // XLocaleData4
-    virtual css::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const css::lang::Locale& rLocale ) override;
 
     // following methods are used by indexentry service
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException);
+    css::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const css::lang::Locale& rLocale );
     /// @throws css::uno::RuntimeException
-    OUString SAL_CALL getDefaultIndexAlgorithm( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException);
+    OUString SAL_CALL getDefaultIndexAlgorithm( const css::lang::Locale& rLocale );
     /// @throws css::uno::RuntimeException
-    OUString SAL_CALL getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException);
+    OUString SAL_CALL getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
     /// @throws css::uno::RuntimeException
-    OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException);
+    OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+    css::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+    css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale );
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException);
+    bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale );
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException);
+    bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm );
     /// @throws css::uno::RuntimeException
-    OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+    OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale );
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     ::std::unique_ptr< LocaleDataLookupTableItem > cachedItem;
@@ -139,7 +139,7 @@ private:
     OUString ref_name;
 
     /// @throws css::uno::RuntimeException
-    oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction ) throw( css::uno::RuntimeException, std::exception );
+    oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction );
     sal_Unicode ** SAL_CALL getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount);
     sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm);
     /// @throws css::uno::RuntimeException
@@ -147,7 +147,7 @@ private:
         getCalendarItemByName(const OUString& name,
         const css::lang::Locale& rLocale,
         const css::uno::Sequence< css::i18n::Calendar2 >& calendarsSeq,
-        sal_Int16 item) throw( css::uno::RuntimeException, std::exception );
+        sal_Int16 item);
 
     /// Helper to obtain a sequence of days, months, gmonths or eras.
     ///
@@ -158,8 +158,7 @@ private:
             const sal_Int16 nWhichItem,
             const sal_Int16 nCalendar,
             const css::lang::Locale & rLocale,
-            const css::uno::Sequence< css::i18n::Calendar2 > & calendarsSeq )
-        throw( css::uno::RuntimeException, std::exception );
+            const css::uno::Sequence< css::i18n::Calendar2 > & calendarsSeq );
 
 };
 
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index 9ec559a3b220..b162c284bb0c 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -41,39 +41,30 @@ public:
 
         // Methods
         virtual OUString SAL_CALL getNativeNumberString( const OUString& aNumberString,
-                const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
-                throw (css::uno::RuntimeException, std::exception) override;
+                const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) override;
 
         virtual sal_Bool SAL_CALL isValidNatNum( const css::lang::Locale& aLocale,
-                sal_Int16 nNativeNumberMode )
-                throw (css::uno::RuntimeException, std::exception) override;
+                sal_Int16 nNativeNumberMode ) override;
 
         virtual css::i18n::NativeNumberXmlAttributes SAL_CALL convertToXmlAttributes(
-                const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
-                throw (css::uno::RuntimeException, std::exception) override;
+                const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) override;
 
         virtual sal_Int16 SAL_CALL convertFromXmlAttributes(
-                const css::i18n::NativeNumberXmlAttributes& aAttr )
-                throw (css::uno::RuntimeException, std::exception) override;
+                const css::i18n::NativeNumberXmlAttributes& aAttr ) override;
 
         //XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-                throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-                throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // following methods are not for XNativeNumberSupplier, they are for calling from transliterations
         /// @throws css::uno::RuntimeException
         OUString SAL_CALL getNativeNumberString( const OUString& aNumberString,
                 const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode,
-                css::uno::Sequence< sal_Int32 >& offset  )
-                throw (css::uno::RuntimeException);
+                css::uno::Sequence< sal_Int32 >& offset  );
         /// @throws css::uno::RuntimeException
         sal_Unicode SAL_CALL getNativeNumberChar( const sal_Unicode inChar,
-                const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
-                throw(css::uno::RuntimeException) ;
+                const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) ;
 
 private:
         css::lang::Locale aLocale;
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index 765fa90abbaf..d74231fc1560 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -43,18 +43,15 @@ public:
                     css::uno::XComponentContext >& rxContext );
     virtual ~NumberFormatCodeMapper() override;
 
-    virtual css::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCode( sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) override;
+    virtual css::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCode( sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) override;
+    virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const css::lang::Locale& rLocale ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     osl::Mutex maMutex;
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index a62c28bef6d6..a7758911c375 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -39,12 +39,12 @@ class OrdinalSuffixService : public cppu::WeakImplHelper
         virtual ~OrdinalSuffixService() override;
 
         // XOrdinalSuffix
-        virtual css::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const css::lang::Locale &rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const css::lang::Locale &rLocale ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 } } } }
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index ed33fad20e51..fd880bc6e8d3 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -42,23 +42,18 @@ public:
         virtual ~TextToPronounce_zh() override;
 
         OUString SAL_CALL
-        folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 > & offset)
-        throw (css::uno::RuntimeException, std::exception) override;
+        folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 > & offset) override;
 
-        sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int16 SAL_CALL getType() override;
 
         sal_Bool SAL_CALL
-        equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2)
-        throw (css::uno::RuntimeException, std::exception) override;
+        equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2) override;
 
         OUString SAL_CALL
-        transliterateChar2String( sal_Unicode inChar)
-        throw(css::uno::RuntimeException, std::exception) override;
+        transliterateChar2String( sal_Unicode inChar) override;
 
         sal_Unicode SAL_CALL
-        transliterateChar2Char( sal_Unicode inChar)
-        throw(css::uno::RuntimeException,
-            css::i18n::MultipleCharsOutputException, std::exception) override;
+        transliterateChar2Char( sal_Unicode inChar) override;
 };
 
 #define TRANSLITERATION_TextToPronounce_zh( name ) \
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 5b1670b03c15..cca19aec5ca3 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -46,41 +46,26 @@ public:
         virtual css::i18n::TextConversionResult SAL_CALL
         getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override = 0;
+            sal_Int32 nTextConversionOptions ) override = 0;
         virtual OUString SAL_CALL
         getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override = 0;
+            sal_Int32 nTextConversionOptions ) override = 0;
         virtual OUString SAL_CALL
         getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override = 0;
+            sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) override = 0;
         virtual sal_Bool SAL_CALL
         interactiveConversion(const css::lang::Locale& aLocale,
-            sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override = 0;
+            sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) override = 0;
 
     //XServiceInfo
     OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     sal_Bool SAL_CALL
-        supportsService(const OUString& ServiceName)
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService(const OUString& ServiceName) override;
     css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 private:
     const sal_Char* implementationName;
 protected:
@@ -109,31 +94,19 @@ public:
         css::i18n::TextConversionResult SAL_CALL
         getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions ) override;
         OUString SAL_CALL
         getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions ) override;
         OUString SAL_CALL
         getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) override;
         sal_Bool SAL_CALL
         interactiveConversion(const css::lang::Locale& aLocale,
             sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions ) override;
 
 private:
         // Hangul/Hanja system dictionary
@@ -164,31 +137,19 @@ public:
         css::i18n::TextConversionResult SAL_CALL
         getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions ) override;
         OUString SAL_CALL
         getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions ) override;
         OUString SAL_CALL
         getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) override;
         sal_Bool SAL_CALL
         interactiveConversion(const css::lang::Locale& aLocale,
             sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions ) override;
 private:
         // user defined dictionary list
         css::uno::Reference < css::linguistic2::XConversionDictionaryList > xCDL;
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index 3284a9f7b655..b34429d6c253 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -43,49 +43,33 @@ public:
         css::i18n::TextConversionResult SAL_CALL
         getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions ) override;
         OUString SAL_CALL
         getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions ) override;
         OUString SAL_CALL
         getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
             const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
-            sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) override;
         sal_Bool SAL_CALL
         interactiveConversion( const css::lang::Locale& aLocale,
-            sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions )
-            throw(  css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::NoSupportException, std::exception ) override;
+            sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) override;
 
     //XServiceInfo
     OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
     sal_Bool SAL_CALL
-        supportsService(const OUString& ServiceName)
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService(const OUString& ServiceName) override;
     css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 private:
     css::lang::Locale aLocale;
     css::uno::Reference < css::i18n::XExtendedTextConversion > xTC;
     css::uno::Reference < css::uno::XComponentContext > m_xContext;
 
     /// @throws css::lang::NoSupportException
-    void SAL_CALL getLocaleSpecificTextConversion( const css::lang::Locale& rLocale )
-            throw( css::lang::NoSupportException );
+    void SAL_CALL getLocaleSpecificTextConversion( const css::lang::Locale& rLocale );
 };
 
 } // i18n
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index 2bdfd43b901d..e9990d1d8142 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -41,55 +41,45 @@ public:
     virtual ~TransliterationImpl() override;
 
     // Methods
-    virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Int16 SAL_CALL getType(  ) throw(css::uno::RuntimeException, std::exception) override ;
+    virtual OUString SAL_CALL getName(  ) override ;
+    virtual sal_Int16 SAL_CALL getType(  ) override ;
 
-    virtual void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale )
-        throw(css::uno::RuntimeException, std::exception) override ;
+    virtual void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) override ;
     virtual void SAL_CALL loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName,
-        const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override ;
+        const css::lang::Locale& rLocale ) override ;
     virtual void SAL_CALL loadModuleByImplName( const OUString& implName,
-        const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale ) override;
     virtual void SAL_CALL loadModulesByImplNames(const css::uno::Sequence< OUString >& modNamelist,
-        const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL getAvailableModules(
-        const css::lang::Locale& rLocale, sal_Int16 sType )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& rLocale, sal_Int16 sType ) override;
 
     virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        css::uno::Sequence< sal_Int32 >& offset  ) throw(css::uno::RuntimeException, std::exception) override ;
+        css::uno::Sequence< sal_Int32 >& offset  ) override ;
 
     virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        css::uno::Sequence< sal_Int32 >& offset ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< sal_Int32 >& offset ) override;
 
     // Methods in XExtendedTransliteration
-    virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
-        throw(css::uno::RuntimeException, std::exception) override ;
-    virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar )
-        throw(css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar )
-        throw(css::i18n::MultipleCharsOutputException,
-                css::uno::RuntimeException, std::exception) override ;
+    virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) override ;
+    virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar ) override ;
+    virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) override ;
 
     virtual sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1,
-        sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
-        throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1,
-        const OUString& str2 ) throw(css::uno::RuntimeException, std::exception) override ;
+        const OUString& str2 ) override ;
 
     virtual sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
 
-    virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
 #define maxCascade 27
@@ -102,21 +92,18 @@ private:
 
     /// @throws css::uno::RuntimeException
     bool SAL_CALL loadModuleByName( const OUString& implName,
-        css::uno::Reference<css::i18n::XExtendedTransliteration> & body, const css::lang::Locale& rLocale)
-        throw(css::uno::RuntimeException);
+        css::uno::Reference<css::i18n::XExtendedTransliteration> & body, const css::lang::Locale& rLocale);
 
     void clear();
 
     /// @throws css::uno::RuntimeException
     void loadBody( OUString &implName,
-        css::uno::Reference< css::i18n::XExtendedTransliteration >& body )
-        throw (css::uno::RuntimeException);
+        css::uno::Reference< css::i18n::XExtendedTransliteration >& body );
 
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< OUString > SAL_CALL getRange(
         const css::uno::Sequence< OUString > &inStrs,
-        sal_Int32 length, const sal_Int16 _nCascade)
-        throw(css::uno::RuntimeException);
+        sal_Int32 length, const sal_Int16 _nCascade);
 };
 
 } } } }
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index 24f147ac3fe4..28929c746c06 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -31,37 +31,30 @@ class transliteration_Ignore : public transliteration_commonclass
 {
 public:
         virtual OUString SAL_CALL
-        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset)
-            throw(css::uno::RuntimeException, std::exception) override;
+        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) override;
 
         // This method is shared.
         sal_Bool SAL_CALL
         equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-            const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
-            throw(css::uno::RuntimeException, std::exception) override;
+            const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override;
 
         // This method is implemented in sub class if needed. Otherwise, the method implemented in this class will be used.
         css::uno::Sequence< OUString > SAL_CALL
-        transliterateRange( const OUString& str1, const OUString& str2 )
-            throw(css::uno::RuntimeException, std::exception) override;
+        transliterateRange( const OUString& str1, const OUString& str2 ) override;
 
 
         // Methods which are shared.
-        sal_Int16 SAL_CALL getType(  ) throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int16 SAL_CALL getType(  ) override;
 
         OUString SAL_CALL
-        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  )
-            throw(css::uno::RuntimeException, std::exception) override;
+        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  ) override;
 
         virtual sal_Unicode SAL_CALL
-        transliterateChar2Char( sal_Unicode inChar)
-           throw(css::uno::RuntimeException,
-            css::i18n::MultipleCharsOutputException, std::exception) override;
+        transliterateChar2Char( sal_Unicode inChar) override;
 
         /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > SAL_CALL
-        transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 )
-            throw(css::uno::RuntimeException);
+        transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 );
 
         struct Mapping {
             sal_Unicode previousChar;
@@ -103,13 +96,10 @@ public:
     ignoreDiacritics_CTL();
 
     OUString SAL_CALL
-    folding(const OUString& rInStr, sal_Int32 nStartPos, sal_Int32 nCount, css::uno::Sequence<sal_Int32>& rOffset)
-        throw(css::uno::RuntimeException, std::exception) override;
+    folding(const OUString& rInStr, sal_Int32 nStartPos, sal_Int32 nCount, css::uno::Sequence<sal_Int32>& rOffset) override;
 
     sal_Unicode SAL_CALL
-    transliterateChar2Char(sal_Unicode nInChar)
-        throw(css::uno::RuntimeException,
-        css::i18n::MultipleCharsOutputException, std::exception) override;
+    transliterateChar2Char(sal_Unicode nInChar) override;
 };
 
 #undef TRANSLITERATION_IGNORE
@@ -125,7 +115,7 @@ public:\
             implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
         };\
         OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
-                css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override; \
+                css::uno::Sequence< sal_Int32 >& offset) override; \
 };
 
 TRANSLITERATION_IGNORE(KiKuFollowedBySa_ja_JP)
@@ -146,14 +136,13 @@ public:\
             implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
         };\
         OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
-                css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override; \
+                css::uno::Sequence< sal_Int32 >& offset) override; \
         using transliteration_Ignore::transliterateRange;\
         css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, \
-                const OUString& str2 ) throw(css::uno::RuntimeException, std::exception) override; \
+                const OUString& str2 ) override; \
         sal_Unicode SAL_CALL \
         transliterateChar2Char( sal_Unicode inChar) \
-            throw(css::uno::RuntimeException,\
-            css::i18n::MultipleCharsOutputException, std::exception) override;\
+             override;\
 };
 
 TRANSLITERATION_IGNORE(Kana)
diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index 4032478215a3..d8ae49cb3a7c 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.hxx
@@ -26,28 +26,22 @@ namespace com { namespace sun { namespace star { namespace i18n {
 class transliteration_Numeric : public transliteration_commonclass {
 public:
         virtual OUString SAL_CALL
-        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
-            throw(css::uno::RuntimeException, std::exception) override;
+        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
 
         virtual sal_Unicode SAL_CALL
-        transliterateChar2Char( sal_Unicode inChar)
-            throw(css::i18n::MultipleCharsOutputException,
-                css::uno::RuntimeException, std::exception) override;
+        transliterateChar2Char( sal_Unicode inChar) override;
 
         // Methods which are shared.
-        virtual sal_Int16 SAL_CALL getType(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int16 SAL_CALL getType(  ) override;
 
         virtual OUString SAL_CALL
-        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
-            throw(css::uno::RuntimeException, std::exception) override;
+        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
 
         virtual sal_Bool SAL_CALL
-        equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
-            throw(css::uno::RuntimeException, std::exception) override;
+        equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        transliterateRange( const OUString& str1, const OUString& str2 )
-            throw(css::uno::RuntimeException, std::exception) override;
+        transliterateRange( const OUString& str1, const OUString& str2 ) override;
 protected:
         sal_Int16 nNativeNumberMode;
         sal_Int16 tableSize;
@@ -57,8 +51,7 @@ private:
         /// @throws css::uno::RuntimeException
         OUString SAL_CALL
         transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-                             css::uno::Sequence< sal_Int32 >& offset )
-            throw(css::uno::RuntimeException);
+                             css::uno::Sequence< sal_Int32 >& offset );
 };
 
 } } } }
diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx
index 98b380aa8a14..dce55fb6ef8d 100644
--- a/i18npool/inc/transliteration_OneToOne.hxx
+++ b/i18npool/inc/transliteration_OneToOne.hxx
@@ -30,29 +30,23 @@ class transliteration_OneToOne : public transliteration_commonclass
 {
 public:
         OUString SAL_CALL
-        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  )
-            throw(css::uno::RuntimeException, std::exception) override;
+        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  ) override;
 
         sal_Unicode SAL_CALL
-        transliterateChar2Char( sal_Unicode inChar)
-           throw(css::uno::RuntimeException,
-                 css::i18n::MultipleCharsOutputException, std::exception) override;
+        transliterateChar2Char( sal_Unicode inChar) override;
 
         // Methods which are shared.
-        sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int16 SAL_CALL getType() override;
 
         OUString SAL_CALL
-        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset)
-            throw(css::uno::RuntimeException, std::exception) override;
+        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) override;
 
         sal_Bool SAL_CALL
         equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-                const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
-           throw(css::uno::RuntimeException, std::exception) override;
+                const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override;
 
         css::uno::Sequence< OUString > SAL_CALL
-        transliterateRange( const OUString& str1, const OUString& str2 )
-             throw(css::uno::RuntimeException, std::exception) override;
+        transliterateRange( const OUString& str1, const OUString& str2 ) override;
 
 protected:
         TransFunc func;
@@ -66,11 +60,10 @@ public: \
     name (); \
     OUString SAL_CALL \
     transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) \
-    throw(css::uno::RuntimeException, std::exception) override; \
+     override; \
     sal_Unicode SAL_CALL \
     transliterateChar2Char( sal_Unicode inChar) \
-    throw(css::uno::RuntimeException, \
-        css::i18n::MultipleCharsOutputException, std::exception) override; \
+     override; \
 };
 
 TRANSLITERATION_ONETOONE( fullwidthToHalfwidth )
@@ -82,24 +75,21 @@ class halfwidthToFullwidth : public transliteration_OneToOne
 public:
     halfwidthToFullwidth();
     OUString SAL_CALL
-    transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
-    throw(css::uno::RuntimeException, std::exception) override;
+    transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
 };
 class halfwidthKatakanaToFullwidthKatakana : public transliteration_OneToOne
 {
 public:
     halfwidthKatakanaToFullwidthKatakana();
     OUString SAL_CALL
-    transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
-    throw(css::uno::RuntimeException, std::exception) override;
+    transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
 };
 class halfwidthToFullwidthLikeJIS : public transliteration_OneToOne
 {
 public:
     halfwidthToFullwidthLikeJIS();
     OUString SAL_CALL
-    transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
-    throw(css::uno::RuntimeException, std::exception) override;
+    transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
 };
 
 #undef TRANSLITERATION_ONETOONE
diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index 55616997cdeb..c39ff58db308 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.hxx
@@ -30,30 +30,26 @@ public:
     Transliteration_body();
 
     // Methods which are shared.
-    sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int16 SAL_CALL getType() override;
 
     OUString SAL_CALL transliterate(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< sal_Int32 >& offset) override;
 
         OUString SAL_CALL
-        transliterateChar2String( sal_Unicode inChar)
-        throw(css::uno::RuntimeException, std::exception) override;
+        transliterateChar2String( sal_Unicode inChar) override;
 
         virtual sal_Unicode SAL_CALL
-        transliterateChar2Char( sal_Unicode inChar)
-        throw(css::uno::RuntimeException,
-        css::i18n::MultipleCharsOutputException, std::exception) override;
+        transliterateChar2Char( sal_Unicode inChar) override;
 
     OUString SAL_CALL folding(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< sal_Int32 >& offset) override;
 
     sal_Bool SAL_CALL equals(
         const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-        const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override;
 
     css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1,
-        const OUString& str2 ) throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& str2 ) override;
 
 protected:
     MappingType nMappingType;
@@ -89,7 +85,7 @@ class Transliteration_titlecase : public Transliteration_body
 public:
     Transliteration_titlecase();
 
-    virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  ) override;
 };
 
 class Transliteration_sentencecase : public Transliteration_body
@@ -97,7 +93,7 @@ class Transliteration_sentencecase : public Transliteration_body
 public:
     Transliteration_sentencecase();
 
-    virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  ) override;
 };
 
 } } } }
diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx
index e2f82514c3e1..93c91ea05703 100644
--- a/i18npool/inc/transliteration_caseignore.hxx
+++ b/i18npool/inc/transliteration_caseignore.hxx
@@ -29,29 +29,24 @@ public:
     Transliteration_caseignore();
 
     // Methods which are shared.
-    sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int16 SAL_CALL getType() override;
 
-    void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale )
-    throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) override;
 
     css::uno::Sequence< OUString > SAL_CALL transliterateRange(
-        const OUString& str1, const OUString& str2 )
-    throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& str1, const OUString& str2 ) override;
 
     sal_Bool SAL_CALL equals(
         const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-        const OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
-    throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) override;
 
     sal_Int32 SAL_CALL compareSubstring(
         const OUString& s1, sal_Int32 off1, sal_Int32 len1,
-        const OUString& s2, sal_Int32 off2, sal_Int32 len2)
-    throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
 
     sal_Int32 SAL_CALL compareString(
         const OUString& s1,
-        const OUString& s2)
-    throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& s2) override;
 
 protected:
     TransliterationModules moduleLoaded;
@@ -59,8 +54,7 @@ private:
     /// @throws css::uno::RuntimeException
     sal_Int32 SAL_CALL compare(
         const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-        const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
-    throw(css::uno::RuntimeException);
+        const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2);
 };
 
 } } } }
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index 1b2d1eed39fa..0a6249b33714 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.hxx
@@ -38,73 +38,55 @@ public:
 
         // Methods which are shared.
         void SAL_CALL
-        loadModule( TransliterationModules modName, const css::lang::Locale& rLocale )
-            throw(css::uno::RuntimeException, std::exception) override;
+        loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) override;
 
         void SAL_CALL
-        loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName, const css::lang::Locale& rLocale )
-            throw(css::uno::RuntimeException, std::exception) override;
+        loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName, const css::lang::Locale& rLocale ) override;
 
         void SAL_CALL
-        loadModuleByImplName( const OUString& implName, const css::lang::Locale& rLocale )
-            throw(css::uno::RuntimeException, std::exception) override;
+        loadModuleByImplName( const OUString& implName, const css::lang::Locale& rLocale ) override;
 
         void SAL_CALL
-        loadModulesByImplNames(const css::uno::Sequence< OUString >& modNamelist, const css::lang::Locale& rLocale)
-            throw(css::uno::RuntimeException, std::exception) override;
+        loadModulesByImplNames(const css::uno::Sequence< OUString >& modNamelist, const css::lang::Locale& rLocale) override;
 
         css::uno::Sequence< OUString > SAL_CALL
-        getAvailableModules( const css::lang::Locale& rLocale, sal_Int16 sType )
-            throw(css::uno::RuntimeException, std::exception) override;
+        getAvailableModules( const css::lang::Locale& rLocale, sal_Int16 sType ) override;
 
         // Methods which should be implemented in each transliteration module.
-        virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName() override;
 
-        virtual sal_Int16 SAL_CALL getType(  ) throw(css::uno::RuntimeException, std::exception) override = 0;
+        virtual sal_Int16 SAL_CALL getType(  ) override = 0;
 
         virtual OUString SAL_CALL
-        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  )
-            throw(css::uno::RuntimeException, std::exception) override = 0;
+        transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset  ) override = 0;
 
         virtual OUString SAL_CALL
-        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset)
-            throw(css::uno::RuntimeException, std::exception) override = 0;
+        folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) override = 0;
 
         // Methods in XExtendedTransliteration
         virtual OUString SAL_CALL
-        transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
-            throw(css::uno::RuntimeException, std::exception) override;
+        transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) override;
         virtual OUString SAL_CALL
-        transliterateChar2String( sal_Unicode inChar)
-            throw(css::uno::RuntimeException, std::exception) override;
+        transliterateChar2String( sal_Unicode inChar) override;
         virtual sal_Unicode SAL_CALL
-        transliterateChar2Char( sal_Unicode inChar )
-            throw(css::i18n::MultipleCharsOutputException,
-                css::uno::RuntimeException, std::exception) override = 0;
+        transliterateChar2Char( sal_Unicode inChar ) override = 0;
 
         virtual sal_Bool SAL_CALL
-        equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
-            throw(css::uno::RuntimeException, std::exception) override = 0;
+        equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override = 0;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        transliterateRange( const OUString& str1, const OUString& str2 )
-            throw(css::uno::RuntimeException, std::exception) override = 0;
+        transliterateRange( const OUString& str1, const OUString& str2 ) override = 0;
 
         virtual sal_Int32 SAL_CALL
-        compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, const OUString& s2, sal_Int32 off2, sal_Int32 len2)
-            throw(css::uno::RuntimeException, std::exception) override;
+        compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
 
         virtual sal_Int32 SAL_CALL
-        compareString( const OUString& s1, const OUString& s2)
-            throw(css::uno::RuntimeException, std::exception) override;
+        compareString( const OUString& s1, const OUString& s2) override;
 
         //XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-            throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 protected:
         css::lang::Locale   aLocale;
         const sal_Char* transliterationName;
diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx
index effbb23acdd3..099552fcf09d 100644
--- a/i18npool/inc/unoscripttypedetector.hxx
+++ b/i18npool/inc/unoscripttypedetector.hxx
@@ -35,21 +35,18 @@ class UnoScriptTypeDetector : public cppu::WeakImplHelper
 {
 public:
     // Methods
-    virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) override;
+    virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) override;
+    virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) override;
+    virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) override;
+    virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) override;
+    virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) override;
 
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 33ac5864a79c..3a8da9abe49a 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -48,7 +48,6 @@ BreakIteratorImpl::~BreakIteratorImpl()
 
 sal_Int32 SAL_CALL BreakIteratorImpl::nextCharacters( const OUString& Text, sal_Int32 nStartPos,
         const Locale &rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-        throw(RuntimeException, std::exception)
 {
     if (nCount < 0) throw RuntimeException();
 
@@ -57,7 +56,6 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextCharacters( const OUString& Text, sal_
 
 sal_Int32 SAL_CALL BreakIteratorImpl::previousCharacters( const OUString& Text, sal_Int32 nStartPos,
         const Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-        throw(RuntimeException, std::exception)
 {
     if (nCount < 0) throw RuntimeException();
 
@@ -96,7 +94,7 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len,
 }
 
 Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException, std::exception)
+        const Locale& rLocale, sal_Int16 rWordType )
 {
     sal_Int32 len = Text.getLength();
     if( nStartPos < 0 || len == 0 )
@@ -126,7 +124,7 @@ static inline bool SAL_CALL isCJK( const Locale& rLocale ) {
 }
 
 Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& rLocale, sal_Int16 rWordType) throw(RuntimeException, std::exception)
+        const Locale& rLocale, sal_Int16 rWordType)
 {
     sal_Int32 len = Text.getLength();
     if( nStartPos <= 0 || len == 0 ) {
@@ -152,7 +150,7 @@ Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int
 
 
 Boundary SAL_CALL BreakIteratorImpl::getWordBoundary( const OUString& Text, sal_Int32 nPos, const Locale& rLocale,
-        sal_Int16 rWordType, sal_Bool bDirection ) throw(RuntimeException, std::exception)
+        sal_Int16 rWordType, sal_Bool bDirection )
 {
     sal_Int32 len = Text.getLength();
     if( nPos < 0 || len == 0 )
@@ -185,7 +183,7 @@ Boundary SAL_CALL BreakIteratorImpl::getWordBoundary( const OUString& Text, sal_
 }
 
 sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int32 nPos,
-        const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException, std::exception)
+        const Locale& rLocale, sal_Int16 rWordType )
 {
     sal_Int32 len = Text.getLength();
 
@@ -201,7 +199,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int3
 }
 
 sal_Bool SAL_CALL BreakIteratorImpl::isEndWord( const OUString& Text, sal_Int32 nPos,
-        const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException, std::exception)
+        const Locale& rLocale, sal_Int16 rWordType )
 {
     sal_Int32 len = Text.getLength();
 
@@ -217,7 +215,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::isEndWord( const OUString& Text, sal_Int32
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const Locale &rLocale ) throw(RuntimeException, std::exception)
+        const Locale &rLocale )
 {
     if (nStartPos < 0 || nStartPos > Text.getLength())
         return -1;
@@ -226,7 +224,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfSentence( const OUString& Text, sal
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::endOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const Locale &rLocale ) throw(RuntimeException, std::exception)
+        const Locale &rLocale )
 {
     if (nStartPos < 0 || nStartPos > Text.getLength())
         return -1;
@@ -236,13 +234,12 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfSentence( const OUString& Text, sal_I
 
 LineBreakResults SAL_CALL BreakIteratorImpl::getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const Locale& rLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions,
-        const LineBreakUserOptions& bOptions ) throw(RuntimeException, std::exception)
+        const LineBreakUserOptions& bOptions )
 {
     return LBI->getLineBreak(Text, nStartPos, rLocale, nMinBreakPos, hOptions, bOptions);
 }
 
 sal_Int16 SAL_CALL BreakIteratorImpl::getScriptType( const OUString& Text, sal_Int32 nPos )
-        throw(RuntimeException, std::exception)
 {
     return (nPos < 0 || nPos >= Text.getLength()) ? ScriptType::WEAK :
         getScriptClass(Text.iterateCodePoints(&nPos, 0));
@@ -277,7 +274,7 @@ static sal_Int32 SAL_CALL iterateCodePoints(const OUString& Text, sal_Int32 &nSt
 
 
 sal_Int32 SAL_CALL BreakIteratorImpl::beginOfScript( const OUString& Text,
-        sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException, std::exception)
+        sal_Int32 nStartPos, sal_Int16 ScriptType )
 {
     if (nStartPos < 0 || nStartPos >= Text.getLength())
         return -1;
@@ -295,7 +292,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfScript( const OUString& Text,
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::endOfScript( const OUString& Text,
-        sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException, std::exception)
+        sal_Int32 nStartPos, sal_Int16 ScriptType )
 {
     if (nStartPos < 0 || nStartPos >= Text.getLength())
         return -1;
@@ -314,7 +311,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfScript( const OUString& Text,
 }
 
 sal_Int32  SAL_CALL BreakIteratorImpl::previousScript( const OUString& Text,
-        sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException, std::exception)
+        sal_Int32 nStartPos, sal_Int16 ScriptType )
 {
     if (nStartPos < 0)
         return -1;
@@ -335,7 +332,7 @@ sal_Int32  SAL_CALL BreakIteratorImpl::previousScript( const OUString& Text,
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::nextScript( const OUString& Text, sal_Int32 nStartPos,
-        sal_Int16 ScriptType ) throw(RuntimeException, std::exception)
+        sal_Int16 ScriptType )
 
 {
     if (nStartPos < 0)
@@ -357,7 +354,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextScript( const OUString& Text, sal_Int3
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception)
+        const Locale& /*rLocale*/, sal_Int16 CharType )
 {
     if (CharType == CharType::ANY_CHAR) return 0;
     if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
@@ -369,7 +366,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfCharBlock( const OUString& Text, sa
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::endOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception)
+        const Locale& /*rLocale*/, sal_Int16 CharType )
 {
     sal_Int32 strLen = Text.getLength();
 
@@ -383,7 +380,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfCharBlock( const OUString& Text, sal_
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::nextCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception)
+        const Locale& /*rLocale*/, sal_Int16 CharType )
 {
     if (CharType == CharType::ANY_CHAR) return -1;
     if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
@@ -400,7 +397,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextCharBlock( const OUString& Text, sal_I
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::previousCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception)
+        const Locale& /*rLocale*/, sal_Int16 CharType )
 {
     if(CharType == CharType::ANY_CHAR) return -1;
     if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
@@ -421,7 +418,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::previousCharBlock( const OUString& Text, s
 
 
 sal_Int16 SAL_CALL BreakIteratorImpl::getWordType( const OUString& /*Text*/,
-        sal_Int32 /*nPos*/, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception)
+        sal_Int32 /*nPos*/, const Locale& /*rLocale*/ )
 {
     return 0;
 }
@@ -523,7 +520,7 @@ sal_Int16  BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar)
     return nRet;
 }
 
-bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) throw( RuntimeException )
+bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName)
 {
     // to share service between same Language but different Country code, like zh_CN and zh_TW
     for (lookupTableItem* listItem : lookupTable) {
@@ -547,7 +544,7 @@ bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUStrin
 }
 
 Reference < XBreakIterator > SAL_CALL
-BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (RuntimeException)
+BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale)
 {
     if (xBI.is() && rLocale == aLocale)
         return xBI;
@@ -593,19 +590,19 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (
 }
 
 OUString SAL_CALL
-BreakIteratorImpl::getImplementationName() throw( RuntimeException, std::exception )
+BreakIteratorImpl::getImplementationName()
 {
     return OUString("com.sun.star.i18n.BreakIterator");
 }
 
 sal_Bool SAL_CALL
-BreakIteratorImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+BreakIteratorImpl::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-BreakIteratorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+BreakIteratorImpl::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.i18n.BreakIterator" };
     return aRet;
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 167b942e040e..5921a8774738 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx
@@ -39,7 +39,7 @@ BreakIterator_CJK::BreakIterator_CJK()
 
 Boundary SAL_CALL
 BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos,
-        const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException, std::exception)
+        const lang::Locale& nLocale, sal_Int16 wordType)
 {
     if (m_xDict) {
         result = m_xDict->previousWord(text, anyPos, wordType);
@@ -56,7 +56,7 @@ BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos,
 
 Boundary SAL_CALL
 BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos,
-        const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException, std::exception)
+        const lang::Locale& nLocale, sal_Int16 wordType)
 {
     if (m_xDict) {
         result = m_xDict->nextWord(text, anyPos, wordType);
@@ -74,7 +74,6 @@ BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos,
 Boundary SAL_CALL
 BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos,
         const lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection )
-        throw(RuntimeException, std::exception)
 {
     if (m_xDict) {
         result = m_xDict->getWordBoundary(text, anyPos, wordType, bDirection);
@@ -90,7 +89,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
         const OUString& Text, sal_Int32 nStartPos,
         const lang::Locale& /*rLocale*/, sal_Int32 /*nMinBreakPos*/,
         const LineBreakHyphenationOptions& /*hOptions*/,
-        const LineBreakUserOptions& bOptions ) throw(RuntimeException, std::exception)
+        const LineBreakUserOptions& bOptions )
 {
     LineBreakResults lbr;
 
diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index 02bc5c77f115..f641bc927ca1 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx
@@ -53,7 +53,6 @@ BreakIterator_CTL::~BreakIterator_CTL()
 sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text,
     sal_Int32 nStartPos, const lang::Locale& rLocale,
     sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-    throw(RuntimeException, std::exception)
 {
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) {
         nDone = 0;
@@ -80,7 +79,6 @@ sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text,
 sal_Int32 SAL_CALL BreakIterator_CTL::nextCharacters(const OUString& Text,
     sal_Int32 nStartPos, const lang::Locale& rLocale,
     sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone)
-    throw(RuntimeException, std::exception)
 {
     sal_Int32 len = Text.getLength();
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) {
@@ -107,7 +105,6 @@ sal_Int32 SAL_CALL BreakIterator_CTL::nextCharacters(const OUString& Text,
 
 // This method should be overwritten by derived language specific class.
 void SAL_CALL BreakIterator_CTL::makeIndex(const OUString& /*text*/, sal_Int32 /*pos*/)
-    throw(RuntimeException)
 {
     throw RuntimeException();
 }
@@ -117,7 +114,7 @@ LineBreakResults SAL_CALL BreakIterator_CTL::getLineBreak(
     const OUString& Text, sal_Int32 nStartPos,
     const lang::Locale& rLocale, sal_Int32 nMinBreakPos,
     const LineBreakHyphenationOptions& hOptions,
-    const LineBreakUserOptions& bOptions ) throw(RuntimeException, std::exception)
+    const LineBreakUserOptions& bOptions )
 {
     LineBreakResults lbr = BreakIterator_Unicode::getLineBreak(Text, nStartPos,
                     rLocale, nMinBreakPos, hOptions, bOptions );
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index 7c6f0eb3f374..b658dbdde0e1 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -105,7 +105,6 @@ static sal_Int32 SAL_CALL getACell(const sal_Unicode *text, sal_Int32 pos, sal_I
 #define is_Thai(c)  (0x0e00 <= c && c <= 0x0e7f) // Unicode definition for Thai
 
 void SAL_CALL BreakIterator_th::makeIndex(const OUString& Text, sal_Int32 const nStartPos)
-    throw(RuntimeException)
 {
     if (Text != cachedText) {
         cachedText = Text;
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 8c19096a0acd..35af12103962 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -79,7 +79,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
 
 // loading ICU breakiterator on demand.
 void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocale,
-        sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText) throw(uno::RuntimeException)
+        sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText)
 {
     bool bNewBreak = false;
     UErrorCode status = U_ZERO_ERROR;
@@ -217,7 +217,6 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
 sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
         sal_Int32 nStartPos, const lang::Locale &rLocale,
         sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-        throw(uno::RuntimeException, std::exception)
 {
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode
         loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
@@ -236,7 +235,6 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
 sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Text,
         sal_Int32 nStartPos, const lang::Locale& rLocale,
         sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-        throw(uno::RuntimeException, std::exception)
 {
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode
         loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
@@ -254,7 +252,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te
 
 
 Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int32 nStartPos,
-    const lang::Locale& rLocale, sal_Int16 rWordType ) throw(uno::RuntimeException, std::exception)
+    const lang::Locale& rLocale, sal_Int16 rWordType )
 {
     loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text);
 
@@ -277,7 +275,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
 
 
 Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_Int32 nStartPos,
-        const lang::Locale& rLocale, sal_Int16 rWordType) throw(uno::RuntimeException, std::exception)
+        const lang::Locale& rLocale, sal_Int16 rWordType)
 {
     loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text);
 
@@ -300,7 +298,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
 
 
 Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text, sal_Int32 nPos, const lang::Locale& rLocale,
-        sal_Int16 rWordType, sal_Bool bDirection ) throw(uno::RuntimeException, std::exception)
+        sal_Int16 rWordType, sal_Bool bDirection )
 {
     loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text);
     sal_Int32 len = Text.getLength();
@@ -334,7 +332,7 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text,
 
 
 sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const lang::Locale &rLocale ) throw(uno::RuntimeException, std::exception)
+        const lang::Locale &rLocale )
 {
     loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text);
 
@@ -353,7 +351,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text,
 }
 
 sal_Int32 SAL_CALL BreakIterator_Unicode::endOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const lang::Locale &rLocale ) throw(uno::RuntimeException, std::exception)
+        const lang::Locale &rLocale )
 {
     loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text);
 
@@ -372,7 +370,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
         const OUString& Text, sal_Int32 nStartPos,
         const lang::Locale& rLocale, sal_Int32 nMinBreakPos,
         const LineBreakHyphenationOptions& hOptions,
-        const LineBreakUserOptions& /*rOptions*/ ) throw(uno::RuntimeException, std::exception)
+        const LineBreakUserOptions& /*rOptions*/ )
 {
     LineBreakResults lbr;
 
@@ -456,19 +454,19 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
 }
 
 OUString SAL_CALL
-BreakIterator_Unicode::getImplementationName() throw( uno::RuntimeException, std::exception )
+BreakIterator_Unicode::getImplementationName()
 {
     return OUString::createFromAscii(cBreakIterator);
 }
 
 sal_Bool SAL_CALL
-BreakIterator_Unicode::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+BreakIterator_Unicode::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-BreakIterator_Unicode::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+BreakIterator_Unicode::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet { OUString::createFromAscii(cBreakIterator) };
     return aRet;
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index 89432a433cfa..94b72e2bf70d 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -42,7 +42,7 @@ CalendarImpl::~CalendarImpl()
 }
 
 void SAL_CALL
-CalendarImpl::loadDefaultCalendar( const Locale& rLocale ) throw(RuntimeException, std::exception)
+CalendarImpl::loadDefaultCalendar( const Locale& rLocale )
 {
     Sequence< Calendar2 > xC = LocaleDataImpl::get()->getAllCalendars2(rLocale);
     for (sal_Int32 i = 0; i < xC.getLength(); i++) {
@@ -55,7 +55,7 @@ CalendarImpl::loadDefaultCalendar( const Locale& rLocale ) throw(RuntimeExceptio
 }
 
 void SAL_CALL
-CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) throw (RuntimeException, std::exception)
+CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale )
 {
     Reference < XCalendar4 > xOldCalendar( xCalendar );  // backup
     sal_Int32 i;
@@ -109,7 +109,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr
 }
 
 Calendar2 SAL_CALL
-CalendarImpl::getLoadedCalendar2() throw(RuntimeException, std::exception)
+CalendarImpl::getLoadedCalendar2()
 {
     if (xCalendar.is())
         return xCalendar->getLoadedCalendar2();
@@ -118,7 +118,7 @@ CalendarImpl::getLoadedCalendar2() throw(RuntimeException, std::exception)
 }
 
 Calendar SAL_CALL
-CalendarImpl::getLoadedCalendar() throw(RuntimeException, std::exception)
+CalendarImpl::getLoadedCalendar()
 {
     if (xCalendar.is())
         return xCalendar->getLoadedCalendar();
@@ -127,7 +127,7 @@ CalendarImpl::getLoadedCalendar() throw(RuntimeException, std::exception)
 }
 
 Sequence< OUString > SAL_CALL
-CalendarImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, std::exception)
+CalendarImpl::getAllCalendars( const Locale& rLocale )
 {
     Sequence< Calendar2 > xC = LocaleDataImpl::get()->getAllCalendars2(rLocale);
     sal_Int32 nLen = xC.getLength();
@@ -138,7 +138,7 @@ CalendarImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, s
 }
 
 void SAL_CALL
-CalendarImpl::setDateTime( double fTimeInDays ) throw(RuntimeException, std::exception)
+CalendarImpl::setDateTime( double fTimeInDays )
 {
     if (xCalendar.is())
         xCalendar->setDateTime( fTimeInDays );
@@ -147,7 +147,7 @@ CalendarImpl::setDateTime( double fTimeInDays ) throw(RuntimeException, std::exc
 }
 
 double SAL_CALL
-CalendarImpl::getDateTime() throw(RuntimeException, std::exception)
+CalendarImpl::getDateTime()
 {
     if (xCalendar.is())
         return xCalendar->getDateTime();
@@ -156,7 +156,7 @@ CalendarImpl::getDateTime() throw(RuntimeException, std::exception)
 }
 
 void SAL_CALL
-CalendarImpl::setLocalDateTime( double fTimeInDays ) throw(RuntimeException, std::exception)
+CalendarImpl::setLocalDateTime( double fTimeInDays )
 {
     if (xCalendar.is())
         xCalendar->setLocalDateTime( fTimeInDays );
@@ -165,7 +165,7 @@ CalendarImpl::setLocalDateTime( double fTimeInDays ) throw(RuntimeException, std
 }
 
 double SAL_CALL
-CalendarImpl::getLocalDateTime() throw(RuntimeException, std::exception)
+CalendarImpl::getLocalDateTime()
 {
     if (xCalendar.is())
         return xCalendar->getLocalDateTime();
@@ -174,7 +174,7 @@ CalendarImpl::getLocalDateTime() throw(RuntimeException, std::exception)
 }
 
 OUString SAL_CALL
-CalendarImpl::getUniqueID() throw(RuntimeException, std::exception)
+CalendarImpl::getUniqueID()
 {
     if (xCalendar.is())
         return xCalendar->getUniqueID();
@@ -183,7 +183,7 @@ CalendarImpl::getUniqueID() throw(RuntimeException, std::exception)
 }
 
 void SAL_CALL
-CalendarImpl::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeException, std::exception)
+CalendarImpl::setValue( sal_Int16 fieldIndex, sal_Int16 value )
 {
     if (xCalendar.is())
         xCalendar->setValue( fieldIndex, value );
@@ -192,7 +192,7 @@ CalendarImpl::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeExc
 }
 
 sal_Int16 SAL_CALL
-CalendarImpl::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std::exception)
+CalendarImpl::getValue( sal_Int16 fieldIndex )
 {
     if (xCalendar.is())
         return xCalendar->getValue( fieldIndex );
@@ -201,7 +201,7 @@ CalendarImpl::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std::exce
 }
 
 void SAL_CALL
-CalendarImpl::addValue( sal_Int16 fieldIndex, sal_Int32 amount ) throw(RuntimeException, std::exception)
+CalendarImpl::addValue( sal_Int16 fieldIndex, sal_Int32 amount )
 {
     if (xCalendar.is())
         xCalendar->addValue( fieldIndex, amount);
@@ -210,7 +210,7 @@ CalendarImpl::addValue( sal_Int16 fieldIndex, sal_Int32 amount ) throw(RuntimeEx
 }
 
 sal_Int16 SAL_CALL
-CalendarImpl::getFirstDayOfWeek() throw(RuntimeException, std::exception)
+CalendarImpl::getFirstDayOfWeek()
 {
     if (xCalendar.is())
         return xCalendar->getFirstDayOfWeek();
@@ -220,7 +220,6 @@ CalendarImpl::getFirstDayOfWeek() throw(RuntimeException, std::exception)
 
 void SAL_CALL
 CalendarImpl::setFirstDayOfWeek( sal_Int16 day )
-throw(RuntimeException, std::exception)
 {
     if (xCalendar.is())
         xCalendar->setFirstDayOfWeek(day);
@@ -229,7 +228,7 @@ throw(RuntimeException, std::exception)
 }
 
 void SAL_CALL
-CalendarImpl::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(RuntimeException, std::exception)
+CalendarImpl::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days )
 {
     if (xCalendar.is())
         xCalendar->setMinimumNumberOfDaysForFirstWeek(days);
@@ -238,7 +237,7 @@ CalendarImpl::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(Runtime
 }
 
 sal_Int16 SAL_CALL
-CalendarImpl::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException, std::exception)
+CalendarImpl::getMinimumNumberOfDaysForFirstWeek()
 {
     if (xCalendar.is())
         return xCalendar->getMinimumNumberOfDaysForFirstWeek();
@@ -248,7 +247,7 @@ CalendarImpl::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException, std::
 
 
 OUString SAL_CALL
-CalendarImpl::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException, std::exception)
+CalendarImpl::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType )
 {
     if (xCalendar.is())
         return xCalendar->getDisplayName( displayIndex, idx, nameType );
@@ -257,7 +256,7 @@ CalendarImpl::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 n
 }
 
 sal_Int16 SAL_CALL
-CalendarImpl::getNumberOfMonthsInYear() throw(RuntimeException, std::exception)
+CalendarImpl::getNumberOfMonthsInYear()
 {
     if (xCalendar.is())
         return xCalendar->getNumberOfMonthsInYear();
@@ -267,7 +266,7 @@ CalendarImpl::getNumberOfMonthsInYear() throw(RuntimeException, std::exception)
 
 
 sal_Int16 SAL_CALL
-CalendarImpl::getNumberOfDaysInWeek() throw(RuntimeException, std::exception)
+CalendarImpl::getNumberOfDaysInWeek()
 {
     if (xCalendar.is())
         return xCalendar->getNumberOfDaysInWeek();
@@ -277,7 +276,7 @@ CalendarImpl::getNumberOfDaysInWeek() throw(RuntimeException, std::exception)
 
 
 Sequence< CalendarItem > SAL_CALL
-CalendarImpl::getDays() throw(RuntimeException, std::exception)
+CalendarImpl::getDays()
 {
     if (xCalendar.is())
         return xCalendar->getDays();
@@ -287,7 +286,7 @@ CalendarImpl::getDays() throw(RuntimeException, std::exception)
 
 
 Sequence< CalendarItem > SAL_CALL
-CalendarImpl::getMonths() throw(RuntimeException, std::exception)
+CalendarImpl::getMonths()
 {
     if (xCalendar.is())
         return xCalendar->getMonths();
@@ -297,7 +296,7 @@ CalendarImpl::getMonths() throw(RuntimeException, std::exception)
 
 
 Sequence< CalendarItem2 > SAL_CALL
-CalendarImpl::getDays2() throw(RuntimeException, std::exception)
+CalendarImpl::getDays2()
 {
     if (xCalendar.is())
         return xCalendar->getDays2();
@@ -307,7 +306,7 @@ CalendarImpl::getDays2() throw(RuntimeException, std::exception)
 
 
 Sequence< CalendarItem2 > SAL_CALL
-CalendarImpl::getMonths2() throw(RuntimeException, std::exception)
+CalendarImpl::getMonths2()
 {
     if (xCalendar.is())
         return xCalendar->getMonths2();
@@ -317,7 +316,7 @@ CalendarImpl::getMonths2() throw(RuntimeException, std::exception)
 
 
 Sequence< CalendarItem2 > SAL_CALL
-CalendarImpl::getGenitiveMonths2() throw(RuntimeException, std::exception)
+CalendarImpl::getGenitiveMonths2()
 {
     if (xCalendar.is())
         return xCalendar->getGenitiveMonths2();
@@ -327,7 +326,7 @@ CalendarImpl::getGenitiveMonths2() throw(RuntimeException, std::exception)
 
 
 Sequence< CalendarItem2 > SAL_CALL
-CalendarImpl::getPartitiveMonths2() throw(RuntimeException, std::exception)
+CalendarImpl::getPartitiveMonths2()
 {
     if (xCalendar.is())
         return xCalendar->getPartitiveMonths2();
@@ -337,7 +336,7 @@ CalendarImpl::getPartitiveMonths2() throw(RuntimeException, std::exception)
 
 
 sal_Bool SAL_CALL
-CalendarImpl::isValid() throw(RuntimeException, std::exception)
+CalendarImpl::isValid()
 {
     if (xCalendar.is())
         return xCalendar->isValid();
@@ -347,7 +346,6 @@ CalendarImpl::isValid() throw(RuntimeException, std::exception)
 
 OUString SAL_CALL
 CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode )
-    throw (RuntimeException, std::exception)
 {
     if (xCalendar.is())
         return xCalendar->getDisplayString(nCalendarDisplayCode, nNativeNumberMode);
@@ -356,19 +354,19 @@ CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativ
 }
 
 OUString SAL_CALL
-CalendarImpl::getImplementationName() throw( RuntimeException, std::exception )
+CalendarImpl::getImplementationName()
 {
     return OUString("com.sun.star.i18n.CalendarImpl");
 }
 
 sal_Bool SAL_CALL
-CalendarImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+CalendarImpl::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-CalendarImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+CalendarImpl::getSupportedServiceNames()
 {
     Sequence< OUString > aRet(2);
     aRet[0] = "com.sun.star.i18n.LocaleCalendar";
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index d7c6bad1d7be..a95c8676dda5 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -183,7 +183,7 @@ Calendar_hanja::Calendar_hanja()
 }
 
 OUString SAL_CALL
-Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException, std::exception)
+Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType )
 {
     if ( displayIndex == CalendarDisplayIndex::AM_PM ) {
         // Am/Pm string for Korean Hanja calendar will refer to Japanese locale
@@ -197,7 +197,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16
 }
 
 void SAL_CALL
-Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const css::lang::Locale& rLocale ) throw(RuntimeException, std::exception)
+Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const css::lang::Locale& rLocale )
 {
     // Since this class could be called by service name 'hanja_yoil', we have to
     // rename uniqueID to get right calendar defined in locale data.
@@ -235,7 +235,7 @@ Calendar_buddhist::Calendar_buddhist() : Calendar_gregorian(buddhist_eraArray)
 }
 
 void SAL_CALL
-Calendar_gregorian::loadCalendar( const OUString& uniqueID, const css::lang::Locale& rLocale ) throw(RuntimeException, std::exception)
+Calendar_gregorian::loadCalendar( const OUString& uniqueID, const css::lang::Locale& rLocale )
 {
     // init. fieldValue[]
     getValue();
@@ -268,25 +268,25 @@ Calendar_gregorian::loadCalendar( const OUString& uniqueID, const css::lang::Loc
 
 
 css::i18n::Calendar2 SAL_CALL
-Calendar_gregorian::getLoadedCalendar2() throw(RuntimeException, std::exception)
+Calendar_gregorian::getLoadedCalendar2()
 {
     return aCalendar;
 }
 
 css::i18n::Calendar SAL_CALL
-Calendar_gregorian::getLoadedCalendar() throw(RuntimeException, std::exception)
+Calendar_gregorian::getLoadedCalendar()
 {
     return LocaleDataImpl::downcastCalendar( aCalendar);
 }
 
 OUString SAL_CALL
-Calendar_gregorian::getUniqueID() throw(RuntimeException, std::exception)
+Calendar_gregorian::getUniqueID()
 {
     return aCalendar.Name;
 }
 
 void SAL_CALL
-Calendar_gregorian::setDateTime( double fTimeInDays ) throw(RuntimeException, std::exception)
+Calendar_gregorian::setDateTime( double fTimeInDays )
 {
     // ICU handles dates in milliseconds as double values and uses floor()
     // to obtain integer values, which may yield a date decremented by one
@@ -306,7 +306,7 @@ Calendar_gregorian::setDateTime( double fTimeInDays ) throw(RuntimeException, st
 }
 
 double SAL_CALL
-Calendar_gregorian::getDateTime() throw(RuntimeException, std::exception)
+Calendar_gregorian::getDateTime()
 {
     if (fieldSet) {
         setValue();
@@ -319,7 +319,7 @@ Calendar_gregorian::getDateTime() throw(RuntimeException, std::exception)
 }
 
 void SAL_CALL
-Calendar_gregorian::setLocalDateTime( double fTimeInDays ) throw(RuntimeException, std::exception)
+Calendar_gregorian::setLocalDateTime( double fTimeInDays )
 {
     // See setDateTime() for why the rounding.
     double fM = fTimeInDays * U_MILLIS_PER_DAY;
@@ -336,7 +336,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) throw(RuntimeExceptio
 }
 
 double SAL_CALL
-Calendar_gregorian::getLocalDateTime() throw(RuntimeException, std::exception)
+Calendar_gregorian::getLocalDateTime()
 {
     if (fieldSet) {
         setValue();
@@ -354,7 +354,7 @@ Calendar_gregorian::getLocalDateTime() throw(RuntimeException, std::exception)
 
 // map field value from gregorian calendar to other calendar, it can be overwritten by derived class.
 // By using eraArray, it can take care Japanese and Taiwan ROC calendar.
-void Calendar_gregorian::mapFromGregorian() throw(RuntimeException)
+void Calendar_gregorian::mapFromGregorian()
 {
     if (eraArray) {
         sal_Int16 e, y, m, d;
@@ -382,7 +382,7 @@ void Calendar_gregorian::mapFromGregorian() throw(RuntimeException)
 #define FIELDS  ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR))
 // map field value from other calendar to gregorian calendar, it can be overwritten by derived class.
 // By using eraArray, it can take care Japanese and Taiwan ROC calendar.
-void Calendar_gregorian::mapToGregorian() throw(RuntimeException)
+void Calendar_gregorian::mapToGregorian()
 {
     if (eraArray && (fieldSet & FIELDS)) {
         sal_Int16 y, e = fieldValue[CalendarFieldIndex::ERA];
@@ -398,7 +398,7 @@ void Calendar_gregorian::mapToGregorian() throw(RuntimeException)
 }
 
 /// @throws RuntimeException
-static UCalendarDateFields fieldNameConverter(sal_Int16 fieldIndex) throw(RuntimeException)
+static UCalendarDateFields fieldNameConverter(sal_Int16 fieldIndex)
 {
     UCalendarDateFields f;
 
@@ -424,7 +424,7 @@ static UCalendarDateFields fieldNameConverter(sal_Int16 fieldIndex) throw(Runtim
 }
 
 void SAL_CALL
-Calendar_gregorian::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeException, std::exception)
+Calendar_gregorian::setValue( sal_Int16 fieldIndex, sal_Int16 value )
 {
     if (fieldIndex < 0 || FIELD_INDEX_COUNT <= fieldIndex)
         throw ERROR;
@@ -465,7 +465,7 @@ bool Calendar_gregorian::getDSTOffset( sal_Int32 & o_nOffset ) const
             CalendarFieldIndex::DST_OFFSET_SECOND_MILLIS);
 }
 
-void Calendar_gregorian::submitFields() throw(css::uno::RuntimeException)
+void Calendar_gregorian::submitFields()
 {
     for (sal_Int16 fieldIndex = 0; fieldIndex < FIELD_INDEX_COUNT; fieldIndex++)
     {
@@ -491,7 +491,7 @@ void Calendar_gregorian::submitFields() throw(css::uno::RuntimeException)
         body->set( fieldNameConverter( CalendarFieldIndex::DST_OFFSET), nDSTOffset);
 }
 
-void Calendar_gregorian::setValue() throw(RuntimeException)
+void Calendar_gregorian::setValue()
 {
     // Copy fields before calling submitFields() directly or indirectly below.
     memcpy(fieldSetValue, fieldValue, sizeof(fieldSetValue));
@@ -517,7 +517,7 @@ void Calendar_gregorian::setValue() throw(RuntimeException)
 #endif
 }
 
-void Calendar_gregorian::getValue() throw(RuntimeException)
+void Calendar_gregorian::getValue()
 {
     DUMP_ICU_CAL_MSG(("%s\n","getValue()"));
     DUMP_I18N_CAL_MSG(("%s\n","getValue()"));
@@ -561,7 +561,7 @@ void Calendar_gregorian::getValue() throw(RuntimeException)
 }
 
 sal_Int16 SAL_CALL
-Calendar_gregorian::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std::exception)
+Calendar_gregorian::getValue( sal_Int16 fieldIndex )
 {
     if (fieldIndex < 0 || FIELD_INDEX_COUNT <= fieldIndex)
         throw ERROR;
@@ -575,7 +575,7 @@ Calendar_gregorian::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std
 }
 
 void SAL_CALL
-Calendar_gregorian::addValue( sal_Int16 fieldIndex, sal_Int32 value ) throw(RuntimeException, std::exception)
+Calendar_gregorian::addValue( sal_Int16 fieldIndex, sal_Int32 value )
 {
     // since ZONE and DST could not be add, we don't need to convert value here
     UErrorCode status;
@@ -585,7 +585,7 @@ Calendar_gregorian::addValue( sal_Int16 fieldIndex, sal_Int32 value ) throw(Runt
 }
 
 sal_Bool SAL_CALL
-Calendar_gregorian::isValid() throw(RuntimeException, std::exception)
+Calendar_gregorian::isValid()
 {
     if (fieldSet) {
         sal_Int32 tmp = fieldSet;
@@ -683,7 +683,7 @@ static sal_Int32 SAL_CALL DisplayCode2FieldIndex(sal_Int32 nCalendarDisplayCode)
 }
 
 sal_Int16 SAL_CALL
-Calendar_gregorian::getFirstDayOfWeek() throw(RuntimeException, std::exception)
+Calendar_gregorian::getFirstDayOfWeek()
 {
     // UCAL_SUNDAY == 1, Weekdays::SUNDAY == 0 => offset -1
     // Check for underflow just in case we're called "out of sync".
@@ -694,83 +694,82 @@ Calendar_gregorian::getFirstDayOfWeek() throw(RuntimeException, std::exception)
 
 void SAL_CALL
 Calendar_gregorian::setFirstDayOfWeek( sal_Int16 day )
-throw(RuntimeException, std::exception)
 {
     // Weekdays::SUNDAY == 0, UCAL_SUNDAY == 1 => offset +1
     body->setFirstDayOfWeek( static_cast<UCalendarDaysOfWeek>( day + 1));
 }
 
 void SAL_CALL
-Calendar_gregorian::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(RuntimeException, std::exception)
+Calendar_gregorian::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days )
 {
     aCalendar.MinimumNumberOfDaysForFirstWeek = days;
     body->setMinimalDaysInFirstWeek( static_cast<uint8_t>( days));
 }
 
 sal_Int16 SAL_CALL
-Calendar_gregorian::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException, std::exception)
+Calendar_gregorian::getMinimumNumberOfDaysForFirstWeek()
 {
     return aCalendar.MinimumNumberOfDaysForFirstWeek;
 }
 
 sal_Int16 SAL_CALL
-Calendar_gregorian::getNumberOfMonthsInYear() throw(RuntimeException, std::exception)
+Calendar_gregorian::getNumberOfMonthsInYear()
 {
     return (sal_Int16) aCalendar.Months.getLength();
 }
 
 
 sal_Int16 SAL_CALL
-Calendar_gregorian::getNumberOfDaysInWeek() throw(RuntimeException, std::exception)
+Calendar_gregorian::getNumberOfDaysInWeek()
 {
     return (sal_Int16) aCalendar.Days.getLength();
 }
 
 
 Sequence< CalendarItem > SAL_CALL
-Calendar_gregorian::getDays() throw(RuntimeException, std::exception)
+Calendar_gregorian::getDays()
 {
     return LocaleDataImpl::downcastCalendarItems( aCalendar.Days);
 }
 
 
 Sequence< CalendarItem > SAL_CALL
-Calendar_gregorian::getMonths() throw(RuntimeException, std::exception)
+Calendar_gregorian::getMonths()
 {
     return LocaleDataImpl::downcastCalendarItems( aCalendar.Months);
 }
 
 
 Sequence< CalendarItem2 > SAL_CALL
-Calendar_gregorian::getDays2() throw(RuntimeException, std::exception)
+Calendar_gregorian::getDays2()
 {
     return aCalendar.Days;
 }
 
 
 Sequence< CalendarItem2 > SAL_CALL
-Calendar_gregorian::getMonths2() throw(RuntimeException, std::exception)
+Calendar_gregorian::getMonths2()
 {
     return aCalendar.Months;
 }
 
 
 Sequence< CalendarItem2 > SAL_CALL
-Calendar_gregorian::getGenitiveMonths2() throw(RuntimeException, std::exception)
+Calendar_gregorian::getGenitiveMonths2()
 {
     return aCalendar.GenitiveMonths;
 }
 
 
 Sequence< CalendarItem2 > SAL_CALL
-Calendar_gregorian::getPartitiveMonths2() throw(RuntimeException, std::exception)
+Calendar_gregorian::getPartitiveMonths2()
 {
     return aCalendar.PartitiveMonths;
 }
 
 
 OUString SAL_CALL
-Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException, std::exception)
+Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType )
 {
     OUString aStr;
 
@@ -825,14 +824,12 @@ Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_I
 // Methods in XExtendedCalendar
 OUString SAL_CALL
 Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode )
-        throw (RuntimeException, std::exception)
 {
     return getDisplayStringImpl( nCalendarDisplayCode, nNativeNumberMode, false);
 }
 
 OUString
 Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode )
-        throw (RuntimeException)
 {
     sal_Int16 value = getValue(sal::static_int_cast<sal_Int16>( DisplayCode2FieldIndex(nCalendarDisplayCode) ));
     OUString aOUStr;
@@ -958,7 +955,6 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_In
 // Methods in XExtendedCalendar
 OUString SAL_CALL
 Calendar_buddhist::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode )
-        throw (RuntimeException, std::exception)
 {
     // make year and era in different order for year before and after 0.
     if ((nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR_AND_ERA ||
@@ -975,19 +971,19 @@ Calendar_buddhist::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 n
 }
 
 OUString SAL_CALL
-Calendar_gregorian::getImplementationName() throw( RuntimeException, std::exception )
+Calendar_gregorian::getImplementationName()
 {
     return OUString::createFromAscii(cCalendar);
 }
 
 sal_Bool SAL_CALL
-Calendar_gregorian::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+Calendar_gregorian::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-Calendar_gregorian::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Calendar_gregorian::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { OUString::createFromAscii(cCalendar) };
     return aRet;
diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx
index 1908ac492e11..11046f8e9cbf 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.cxx
@@ -64,7 +64,7 @@ Calendar_hijri::Calendar_hijri()
 #define FIELDS  ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR) | (1 << CalendarFieldIndex::MONTH) | (1 << CalendarFieldIndex::DAY_OF_MONTH))
 
 // map field value from hijri calendar to gregorian calendar
-void Calendar_hijri::mapToGregorian() throw(RuntimeException)
+void Calendar_hijri::mapToGregorian()
 {
     if (fieldSet & FIELDS) {
         sal_Int32 day = (sal_Int32)fieldSetValue[CalendarFieldIndex::DAY_OF_MONTH];
@@ -84,7 +84,7 @@ void Calendar_hijri::mapToGregorian() throw(RuntimeException)
 }
 
 // map field value from gregorian calendar to hijri calendar
-void Calendar_hijri::mapFromGregorian() throw(RuntimeException)
+void Calendar_hijri::mapFromGregorian()
 {
     sal_Int32 month, day, year;
 
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index a060aa9d5bf6..f9130450895e 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -245,7 +245,7 @@ public:
 };
 
 // map field value from gregorian calendar to other calendar, it can be overwritten by derived class.
-void Calendar_jewish::mapFromGregorian() throw(RuntimeException)
+void Calendar_jewish::mapFromGregorian()
 {
     int y = fieldValue[CalendarFieldIndex::YEAR];
     if (fieldValue[CalendarFieldIndex::ERA] == 0)
@@ -261,7 +261,7 @@ void Calendar_jewish::mapFromGregorian() throw(RuntimeException)
 
 #define FIELDS  ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR) | (1 << CalendarFieldIndex::MONTH) | (1 << CalendarFieldIndex::DAY_OF_MONTH))
 // map field value from other calendar to gregorian calendar, it should be implemented.
-void Calendar_jewish::mapToGregorian() throw(RuntimeException)
+void Calendar_jewish::mapToGregorian()
 {
     if (fieldSet & FIELDS) {
         sal_Int16 y = fieldSetValue[CalendarFieldIndex::YEAR];
@@ -281,7 +281,6 @@ void Calendar_jewish::mapToGregorian() throw(RuntimeException)
 // Methods in XExtendedCalendar
 OUString SAL_CALL
 Calendar_jewish::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode )
-    throw (RuntimeException, std::exception)
 {
     nNativeNumberMode = NativeNumberMode::NATNUM2;  // make Hebrew number for Jewish calendar
 
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx
index a67023f00c2a..a4582897bb9a 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -57,7 +57,7 @@ cclass_Unicode::~cclass_Unicode() {
 
 
 OUString SAL_CALL
-cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) {
+cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) {
     sal_Int32 len = Text.getLength();
     if (nPos >= len)
         return OUString();
@@ -69,7 +69,7 @@ cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
 }
 
 OUString SAL_CALL
-cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) {
+cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) {
     sal_Int32 len = Text.getLength();
     if (nPos >= len)
         return OUString();
@@ -81,7 +81,7 @@ cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
 }
 
 OUString SAL_CALL
-cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) {
+cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) {
     try
     {
         sal_Int32 len = Text.getLength();
@@ -120,20 +120,20 @@ cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
 }
 
 sal_Int16 SAL_CALL
-cclass_Unicode::getType( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException, std::exception) {
+cclass_Unicode::getType( const OUString& Text, sal_Int32 nPos ) {
     if ( nPos < 0 || Text.getLength() <= nPos ) return 0;
     return (sal_Int16) u_charType(Text.iterateCodePoints(&nPos, 0));
 }
 
 sal_Int16 SAL_CALL
-cclass_Unicode::getCharacterDirection( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException, std::exception) {
+cclass_Unicode::getCharacterDirection( const OUString& Text, sal_Int32 nPos ) {
     if ( nPos < 0 || Text.getLength() <= nPos ) return 0;
     return (sal_Int16) u_charDirection(Text.iterateCodePoints(&nPos, 0));
 }
 
 
 sal_Int16 SAL_CALL
-cclass_Unicode::getScript( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException, std::exception) {
+cclass_Unicode::getScript( const OUString& Text, sal_Int32 nPos ) {
     if ( nPos < 0 || Text.getLength() <= nPos ) return 0;
     // ICU Unicode script type UBlockCode starts from 1 for Basic Latin,
     // while OO.o enum UnicideScript starts from 0.
@@ -208,14 +208,14 @@ cclass_Unicode::getCharType( const OUString& Text, sal_Int32* nPos, sal_Int32 in
 }
 
 sal_Int32 SAL_CALL
-cclass_Unicode::getCharacterType( const OUString& Text, sal_Int32 nPos, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception) {
+cclass_Unicode::getCharacterType( const OUString& Text, sal_Int32 nPos, const Locale& /*rLocale*/ ) {
     if ( nPos < 0 || Text.getLength() <= nPos ) return 0;
     return getCharType(Text, &nPos, 0);
 
 }
 
 sal_Int32 SAL_CALL
-cclass_Unicode::getStringType( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception) {
+cclass_Unicode::getStringType( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& /*rLocale*/ ) {
     if ( nPos < 0 || Text.getLength() <= nPos ) return 0;
 
     sal_Int32 result = 0;
@@ -239,7 +239,6 @@ ParseResult SAL_CALL cclass_Unicode::parseAnyToken(
             const OUString& userDefinedCharactersStart,
             sal_Int32 contCharTokenType,
             const OUString& userDefinedCharactersCont )
-                throw(RuntimeException, std::exception)
 {
     ParseResult r;
     if ( Text.getLength() <= nPos )
@@ -263,7 +262,6 @@ ParseResult SAL_CALL cclass_Unicode::parsePredefinedToken(
             const OUString& userDefinedCharactersStart,
             sal_Int32 contCharTokenType,
             const OUString& userDefinedCharactersCont )
-                throw(RuntimeException, std::exception)
 {
     ParseResult r;
     if ( Text.getLength() <= nPos )
@@ -277,17 +275,17 @@ ParseResult SAL_CALL cclass_Unicode::parsePredefinedToken(
     return r;
 }
 
-OUString SAL_CALL cclass_Unicode::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL cclass_Unicode::getImplementationName()
 {
     return OUString("com.sun.star.i18n.CharacterClassification_Unicode");
 }
 
-sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.i18n.CharacterClassification_Unicode" };
     return aRet;
diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index 424f5ca994a6..cb3c4fb047eb 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -44,28 +44,27 @@ CharacterClassificationImpl::~CharacterClassificationImpl() {
 
 OUString SAL_CALL
 CharacterClassificationImpl::toUpper( const OUString& Text, sal_Int32 nPos,
-        sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception)
+        sal_Int32 nCount, const Locale& rLocale )
 {
     return getLocaleSpecificCharacterClassification(rLocale)->toUpper(Text, nPos, nCount, rLocale);
 }
 
 OUString SAL_CALL
 CharacterClassificationImpl::toLower( const OUString& Text, sal_Int32 nPos,
-        sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception)
+        sal_Int32 nCount, const Locale& rLocale )
 {
     return getLocaleSpecificCharacterClassification(rLocale)->toLower(Text, nPos, nCount, rLocale);
 }
 
 OUString SAL_CALL
 CharacterClassificationImpl::toTitle( const OUString& Text, sal_Int32 nPos,
-        sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception)
+        sal_Int32 nCount, const Locale& rLocale )
 {
     return getLocaleSpecificCharacterClassification(rLocale)->toTitle(Text, nPos, nCount, rLocale);
 }
 
 sal_Int16 SAL_CALL
 CharacterClassificationImpl::getType( const OUString& Text, sal_Int32 nPos )
-        throw(RuntimeException, std::exception)
 {
     if (xUCI.is())
         return xUCI->getType(Text, nPos);
@@ -74,7 +73,6 @@ CharacterClassificationImpl::getType( const OUString& Text, sal_Int32 nPos )
 
 sal_Int16 SAL_CALL
 CharacterClassificationImpl::getCharacterDirection( const OUString& Text, sal_Int32 nPos )
-        throw(RuntimeException, std::exception)
 {
     if (xUCI.is())
         return xUCI->getCharacterDirection(Text, nPos);
@@ -83,7 +81,6 @@ CharacterClassificationImpl::getCharacterDirection( const OUString& Text, sal_In
 
 sal_Int16 SAL_CALL
 CharacterClassificationImpl::getScript( const OUString& Text, sal_Int32 nPos )
-        throw(RuntimeException, std::exception)
 {
     if (xUCI.is())
         return xUCI->getScript(Text, nPos);
@@ -92,14 +89,14 @@ CharacterClassificationImpl::getScript( const OUString& Text, sal_Int32 nPos )
 
 sal_Int32 SAL_CALL
 CharacterClassificationImpl::getCharacterType( const OUString& Text, sal_Int32 nPos,
-        const Locale& rLocale ) throw(RuntimeException, std::exception)
+        const Locale& rLocale )
 {
     return getLocaleSpecificCharacterClassification(rLocale)->getCharacterType(Text, nPos, rLocale);
 }
 
 sal_Int32 SAL_CALL
 CharacterClassificationImpl::getStringType( const OUString& Text, sal_Int32 nPos,
-        sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception)
+        sal_Int32 nCount, const Locale& rLocale )
 {
     return getLocaleSpecificCharacterClassification(rLocale)->getStringType(Text, nPos, nCount, rLocale);
 }
@@ -108,7 +105,6 @@ ParseResult SAL_CALL CharacterClassificationImpl::parseAnyToken(
         const OUString& Text, sal_Int32 nPos, const Locale& rLocale,
         sal_Int32 startCharTokenType, const OUString& userDefinedCharactersStart,
         sal_Int32 contCharTokenType, const OUString& userDefinedCharactersCont )
-        throw(RuntimeException, std::exception)
 {
     return getLocaleSpecificCharacterClassification(rLocale)->parseAnyToken(Text, nPos, rLocale,
             startCharTokenType,userDefinedCharactersStart,
@@ -120,7 +116,7 @@ ParseResult SAL_CALL CharacterClassificationImpl::parsePredefinedToken(
         sal_Int32 nTokenType, const OUString& Text, sal_Int32 nPos,
         const Locale& rLocale, sal_Int32 startCharTokenType,
         const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType,
-        const OUString& userDefinedCharactersCont ) throw(RuntimeException, std::exception)
+        const OUString& userDefinedCharactersCont )
 {
     return getLocaleSpecificCharacterClassification(rLocale)->parsePredefinedToken(
             nTokenType, Text, nPos, rLocale, startCharTokenType, userDefinedCharactersStart,
@@ -154,7 +150,6 @@ bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassifi
 
 Reference < XCharacterClassification > const & SAL_CALL
 CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Locale& rLocale)
-        throw(RuntimeException)
 {
     // reuse instance if locale didn't change
     if (cachedItem && cachedItem->equals(rLocale))
@@ -193,20 +188,18 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca
 
 OUString SAL_CALL
 CharacterClassificationImpl::getImplementationName()
-                throw( RuntimeException, std::exception )
 {
     return OUString("com.sun.star.i18n.CharacterClassification");
 }
 
 sal_Bool SAL_CALL
 CharacterClassificationImpl::supportsService(const OUString& rServiceName)
-                throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-CharacterClassificationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+CharacterClassificationImpl::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.i18n.CharacterClassification" };
     return aRet;
diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx
index 48c5138c0a34..78749a18fff3 100644
--- a/i18npool/source/characterclassification/unoscripttypedetector.cxx
+++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx
@@ -24,58 +24,58 @@
 
 //      class UnoScriptTypeDetector
 sal_Int16 SAL_CALL
-UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (css::uno::RuntimeException, std::exception)
+UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection )
 {
     return ScriptTypeDetector::getScriptDirection(Text, nPos, defaultScriptDirection);
 }
 
 // return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range.
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (css::uno::RuntimeException, std::exception)
+UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction )
 {
     return ScriptTypeDetector::beginOfScriptDirection(Text, nPos, direction);
 }
 
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (css::uno::RuntimeException, std::exception)
+UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction )
 {
     return ScriptTypeDetector::endOfScriptDirection(Text, nPos, direction);
 }
 
 sal_Int16 SAL_CALL
-UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception)
+UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos )
 {
     return ScriptTypeDetector::getCTLScriptType(Text, nPos);
 }
 
 // Begin of Script Type is inclusive.
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception)
+UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos )
 {
     return ScriptTypeDetector::beginOfCTLScriptType(Text, nPos);
 }
 
 // End of the Script Type is exclusive, the return value pointing to the begin of next script type
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception)
+UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos )
 {
     return ScriptTypeDetector::endOfCTLScriptType(Text, nPos);
 }
 
 OUString SAL_CALL
-UnoScriptTypeDetector::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+UnoScriptTypeDetector::getImplementationName()
 {
     return OUString("com.sun.star.i18n.ScriptTypeDetector");
 }
 
 sal_Bool SAL_CALL
-UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception )
+UnoScriptTypeDetector::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL
-UnoScriptTypeDetector::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+UnoScriptTypeDetector::getSupportedServiceNames()
 {
     css::uno::Sequence< OUString > aRet { "com.sun.star.i18n.ScriptTypeDetector" };
     return aRet;
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index 68315bfb9c81..253404266976 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -40,7 +40,7 @@ ChapterCollator::~ChapterCollator()
 }
 
 sal_Int32 SAL_CALL
-ChapterCollator::compareString( const OUString& s1, const OUString& s2) throw(RuntimeException, std::exception)
+ChapterCollator::compareString( const OUString& s1, const OUString& s2)
 {
     return compareSubstring(s1, 0, s1.getLength(),  s2, 0, s2.getLength());
 }
@@ -49,7 +49,7 @@ ChapterCollator::compareString( const OUString& s1, const OUString& s2) throw(Ru
 
 sal_Int32 SAL_CALL
 ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1,
-    const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException, std::exception)
+    const OUString& str2, sal_Int32 off2, sal_Int32 len2)
 {
     if( len1 <= 1 || len2 <= 1 || ! cclass.is() )
         return CollatorImpl::compareSubstring( str1, off1,  len1, str2, off2, len2 );
@@ -76,19 +76,19 @@ ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int
 const sal_Char cChapCollator[] = "com.sun.star.i18n.ChapterCollator";
 
 OUString SAL_CALL
-ChapterCollator::getImplementationName() throw( RuntimeException, std::exception )
+ChapterCollator::getImplementationName()
 {
     return OUString(cChapCollator);
 }
 
 sal_Bool SAL_CALL
-ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+ChapterCollator::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-ChapterCollator::getSupportedServiceNames() throw( RuntimeException, std::exception )
+ChapterCollator::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { cChapCollator };
     return aRet;
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 8b4919a68400..245e9ff3771b 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -47,7 +47,7 @@ CollatorImpl::~CollatorImpl()
 
 sal_Int32 SAL_CALL
 CollatorImpl::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1,
-    const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException, std::exception)
+    const OUString& str2, sal_Int32 off2, sal_Int32 len2)
 {
     if (cachedItem)
         return cachedItem->xC->compareSubstring(str1, off1, len1, str2, off2, len2);
@@ -61,7 +61,7 @@ CollatorImpl::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32
 }
 
 sal_Int32 SAL_CALL
-CollatorImpl::compareString( const OUString& in_str1, const OUString& in_str2) throw(RuntimeException, std::exception)
+CollatorImpl::compareString( const OUString& in_str1, const OUString& in_str2)
 {
     if (cachedItem)
         return cachedItem->xC->compareString(in_str1, in_str2);
@@ -71,7 +71,7 @@ CollatorImpl::compareString( const OUString& in_str1, const OUString& in_str2) t
 
 
 sal_Int32 SAL_CALL
-CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException, std::exception)
+CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions)
 {
     const Sequence< Implementation > &imp = mxLocaleData->getCollatorImplementations(rLocale);
     for (sal_Int32 i = 0; i < imp.getLength(); i++)
@@ -84,7 +84,6 @@ CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collato
 
 sal_Int32 SAL_CALL
 CollatorImpl::loadCollatorAlgorithm(const OUString& impl, const lang::Locale& rLocale, sal_Int32 collatorOptions)
-    throw(RuntimeException, std::exception)
 {
     if (! cachedItem || ! cachedItem->equals(rLocale, impl))
         loadCachedCollator(rLocale, impl);
@@ -99,7 +98,7 @@ CollatorImpl::loadCollatorAlgorithm(const OUString& impl, const lang::Locale& rL
 
 void SAL_CALL
 CollatorImpl::loadCollatorAlgorithmWithEndUserOption(const OUString& impl, const lang::Locale& rLocale,
-    const Sequence< sal_Int32 >& collatorOptions) throw(RuntimeException, std::exception)
+    const Sequence< sal_Int32 >& collatorOptions)
 {
     sal_Int32 options = 0;
     for (sal_Int32 i = 0; i < collatorOptions.getLength(); i++)
@@ -108,7 +107,7 @@ CollatorImpl::loadCollatorAlgorithmWithEndUserOption(const OUString& impl, const
 }
 
 Sequence< OUString > SAL_CALL
-CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException, std::exception)
+CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale )
 {
     nLocale = rLocale;
     const Sequence< Implementation > &imp = mxLocaleData->getCollatorImplementations(rLocale);
@@ -127,7 +126,7 @@ CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(Runtim
 }
 
 Sequence< sal_Int32 > SAL_CALL
-CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) throw(RuntimeException, std::exception)
+CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ )
 {
     Sequence< OUString > option_str = mxLocaleData->getCollationOptions(nLocale);
     Sequence< sal_Int32 > option_int(option_str.getLength());
@@ -143,7 +142,6 @@ CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) t
 
 bool SAL_CALL
 CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& serviceName, const OUString& rSortAlgorithm)
-    throw(RuntimeException)
 {
     for (size_t l = 0; l < lookupTable.size(); l++) {
         cachedItem = lookupTable[l];
@@ -168,7 +166,6 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic
 
 void SAL_CALL
 CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm)
-    throw(RuntimeException)
 {
     for (lookupTableItem* i : lookupTable) {
         cachedItem = i;
@@ -212,19 +209,18 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS
     }
 }
 
-OUString SAL_CALL CollatorImpl::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL CollatorImpl::getImplementationName()
 {
     return OUString("com.sun.star.i18n.Collator");
 }
 
 sal_Bool SAL_CALL CollatorImpl::supportsService(const OUString& rServiceName)
-                throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-CollatorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+CollatorImpl::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.i18n.Collator" };
     return aRet;
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index a1022e49473c..dfba7ac57b1e 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -113,13 +113,13 @@ size_t get_collator_data_zh_zhuyin_length();
 
 sal_Int32 SAL_CALL
 Collator_Unicode::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1,
-    const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException, std::exception)
+    const OUString& str2, sal_Int32 off2, sal_Int32 len2)
 {
     return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()) + off1, len1, reinterpret_cast<const UChar *>(str2.getStr()) + off2, len2); // UChar != sal_Unicode in MinGW
 }
 
 sal_Int32 SAL_CALL
-Collator_Unicode::compareString( const OUString& str1, const OUString& str2) throw(RuntimeException, std::exception)
+Collator_Unicode::compareString( const OUString& str1, const OUString& str2)
 {
     return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()), reinterpret_cast<const UChar *>(str2.getStr()));   // UChar != sal_Unicode in MinGW
 }
@@ -132,7 +132,6 @@ extern "C" { static void SAL_CALL thisModule() {} }
 
 sal_Int32 SAL_CALL
 Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::Locale& rLocale, sal_Int32 options)
-    throw(RuntimeException, std::exception)
 {
     if (!collator) {
         UErrorCode status = U_ZERO_ERROR;
@@ -389,19 +388,19 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
 
 
 OUString SAL_CALL
-Collator_Unicode::getImplementationName() throw( RuntimeException, std::exception )
+Collator_Unicode::getImplementationName()
 {
     return OUString::createFromAscii(implementationName);
 }
 
 sal_Bool SAL_CALL
-Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+Collator_Unicode::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-Collator_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Collator_Unicode::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { OUString::createFromAscii(implementationName) };
     return aRet;
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 208358cba71b..7a42587bf6c3 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -276,13 +276,13 @@ DefaultNumberingProvider::~DefaultNumberingProvider()
 }
 
 Sequence< Reference<container::XIndexAccess> >
-DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale ) throw(RuntimeException, std::exception)
+DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale )
 {
      return LocaleDataImpl::get()->getOutlineNumberingLevels( rLocale );
 }
 
 Sequence< Sequence<beans::PropertyValue> >
-DefaultNumberingProvider::getDefaultContinuousNumberingLevels( const Locale& rLocale ) throw(RuntimeException, std::exception)
+DefaultNumberingProvider::getDefaultContinuousNumberingLevels( const Locale& rLocale )
 {
      return LocaleDataImpl::get()->getContinuousNumberingLevels( rLocale );
 }
@@ -394,7 +394,6 @@ void lcl_formatChars3( const sal_Unicode table_capital[], const sal_Unicode tabl
  */
 static
 void lcl_formatPersianWord( sal_Int32 nNumber, OUString& rsResult )
-    throw( IllegalArgumentException, RuntimeException )
 {
     OUStringBuffer aTemp(64);
     static const sal_Unicode asPersianWord_conjunction_data[] = {0x20,0x0648,0x20,0};
@@ -546,7 +545,6 @@ Any getPropertyByName( const Sequence<beans::PropertyValue>& aProperties,
 OUString
 DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyValue>& aProperties,
                                                const Locale& aLocale )
-     throw( IllegalArgumentException, RuntimeException, std::exception )
 {
      // the Sequence of PropertyValues is expected to have at least 4 elements:
      // elt Name              Type             purpose
@@ -952,7 +950,6 @@ static const Supported_NumberingType aSupportedTypes[] =
 static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType);
 
 OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
-                                throw(RuntimeException, std::exception)
 {
     if (index < 0 || index >= nSupported_NumberingTypes)
         throw RuntimeException();
@@ -977,7 +974,7 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
 }
 
 bool SAL_CALL
-DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(RuntimeException)
+DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName)
 {
     if (! xHierarchicalNameAccess.is()) {
         Reference< XMultiServiceFactory > xConfigProvider =
@@ -1011,7 +1008,6 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti
 }
 
 Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes(  )
-                                throw(RuntimeException, std::exception)
 {
     Sequence< sal_Int16 > aRet(nSupported_NumberingTypes );
     sal_Int16* pArray = aRet.getArray();
@@ -1029,7 +1025,6 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes(  )
 }
 
 sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumberingIdentifier )
-                                throw(RuntimeException, std::exception)
 {
     for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++)
         if(rNumberingIdentifier.equals(makeNumberingIdentifier(i)))
@@ -1038,7 +1033,6 @@ sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumbering
 }
 
 sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingIdentifier )
-                                throw(RuntimeException, std::exception)
 {
     for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++)
         if(rNumberingIdentifier.equals(makeNumberingIdentifier(i)))
@@ -1047,7 +1041,6 @@ sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingI
 }
 
 OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingType )
-                                throw(RuntimeException, std::exception)
 {
     for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++)
         if(nNumberingType == aSupportedTypes[i].nType)
@@ -1056,19 +1049,16 @@ OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingT
 }
 
 OUString DefaultNumberingProvider::getImplementationName()
-                throw( RuntimeException, std::exception )
 {
     return OUString("com.sun.star.text.DefaultNumberingProvider");
 }
 
 sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName)
-                throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames()
-                throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet { "com.sun.star.text.DefaultNumberingProvider" };
     return aRet;
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index cb06d7968329..cf6b633414dc 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.cxx
@@ -32,18 +32,18 @@ IndexEntrySupplier::IndexEntrySupplier( const Reference < XComponentContext >& r
 {
 }
 
-Sequence < Locale > SAL_CALL IndexEntrySupplier::getLocaleList() throw (RuntimeException, std::exception)
+Sequence < Locale > SAL_CALL IndexEntrySupplier::getLocaleList()
 {
     return LocaleDataImpl::get()->getAllInstalledLocaleNames();
 }
 
-Sequence < OUString > SAL_CALL IndexEntrySupplier::getAlgorithmList( const Locale& rLocale ) throw (RuntimeException, std::exception)
+Sequence < OUString > SAL_CALL IndexEntrySupplier::getAlgorithmList( const Locale& rLocale )
 {
     return LocaleDataImpl::get()->getIndexAlgorithm(rLocale);
 }
 
 sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, const OUString& SortAlgorithm,
-        sal_Int32 collatorOptions ) throw (RuntimeException, std::exception)
+        sal_Int32 collatorOptions )
 {
     Sequence < OUString > algorithmList = getAlgorithmList( rLocale );
     for (sal_Int32 i = 0; i < algorithmList.getLength(); i++) {
@@ -55,13 +55,13 @@ sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, cons
     return false;
 }
 
-sal_Bool SAL_CALL IndexEntrySupplier::usePhoneticEntry( const Locale& rLocale ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL IndexEntrySupplier::usePhoneticEntry( const Locale& rLocale )
 {
     return LocaleDataImpl::get()->hasPhonetic(rLocale);
 }
 
 OUString SAL_CALL IndexEntrySupplier::getPhoneticCandidate( const OUString& rIndexEntry,
-        const Locale& rLocale ) throw (RuntimeException, std::exception)
+        const Locale& rLocale )
 {
     if (getLocaleSpecificIndexEntrySupplier(rLocale, OUString()).is())
         return xIES->getPhoneticCandidate(rIndexEntry, rLocale);
@@ -70,7 +70,7 @@ OUString SAL_CALL IndexEntrySupplier::getPhoneticCandidate( const OUString& rInd
 }
 
 OUString SAL_CALL IndexEntrySupplier::getIndexKey( const OUString& rIndexEntry,
-        const OUString& rPhoneticEntry, const Locale& rLocale ) throw (RuntimeException, std::exception)
+        const OUString& rPhoneticEntry, const Locale& rLocale )
 {
     if (xIES.is())
         return xIES->getIndexKey(rIndexEntry, rPhoneticEntry, rLocale);
@@ -81,7 +81,6 @@ OUString SAL_CALL IndexEntrySupplier::getIndexKey( const OUString& rIndexEntry,
 sal_Int16 SAL_CALL IndexEntrySupplier::compareIndexEntry(
         const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const Locale& rLocale1,
         const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const Locale& rLocale2 )
-throw (css::uno::RuntimeException, std::exception)
 {
     if (xIES.is())
         return xIES->compareIndexEntry(rIndexEntry1, rPhoneticEntry1, rLocale1,
@@ -92,13 +91,12 @@ throw (css::uno::RuntimeException, std::exception)
 
 OUString SAL_CALL IndexEntrySupplier::getIndexCharacter( const OUString& rIndexEntry,
         const Locale& rLocale, const OUString& rSortAlgorithm )
-throw (RuntimeException, std::exception)
 {
     return getLocaleSpecificIndexEntrySupplier(rLocale, rSortAlgorithm)->
         getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm );
 }
 
-bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException )
+bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name)
 {
     Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
             "com.sun.star.i18n.IndexEntrySupplier_" + name, m_xContext);
@@ -111,7 +109,7 @@ bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const O
 }
 
 Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL
-IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, const OUString& rSortAlgorithm) throw (RuntimeException)
+IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, const OUString& rSortAlgorithm)
 {
     if (xIES.is() && rSortAlgorithm == aSortAlgorithm && rLocale.Language == aLocale.Language &&
             rLocale.Country == aLocale.Country && rLocale.Variant == aLocale.Variant)
@@ -165,7 +163,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c
 }
 
 OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePages,
-        const Locale& rLocale ) throw (RuntimeException, std::exception)
+        const Locale& rLocale )
 {
     Sequence< OUString > aFollowPageWords = LocaleDataImpl::get()->getFollowPageWords(rLocale);
 
@@ -177,19 +175,19 @@ OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePage
 #define implementationName "com.sun.star.i18n.IndexEntrySupplier"
 
 OUString SAL_CALL
-IndexEntrySupplier::getImplementationName() throw( RuntimeException, std::exception )
+IndexEntrySupplier::getImplementationName()
 {
     return OUString( implementationName );
 }
 
 sal_Bool SAL_CALL
-IndexEntrySupplier::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+IndexEntrySupplier::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-IndexEntrySupplier::getSupportedServiceNames() throw( RuntimeException, std::exception )
+IndexEntrySupplier::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { implementationName };
     return aRet;
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index 110c73000487..a6594c381b65 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -77,7 +77,7 @@ sal_uInt16** get_zh_zhuyin(sal_Int16*);
 
 OUString SAL_CALL
 IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry,
-    const Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException, std::exception)
+    const Locale& rLocale, const OUString& rAlgorithm )
 {
     sal_Int32 i=0;
     sal_uInt32 ch = rIndexEntry.iterateCodePoints(&i, 0);
@@ -135,7 +135,7 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry,
 
 OUString SAL_CALL
 IndexEntrySupplier_asian::getIndexKey( const OUString& rIndexEntry,
-    const OUString& rPhoneticEntry, const Locale& rLocale) throw (RuntimeException, std::exception)
+    const OUString& rPhoneticEntry, const Locale& rLocale)
 {
     return getIndexCharacter(getEntry(rIndexEntry, rPhoneticEntry, rLocale), rLocale, aAlgorithm);
 }
@@ -144,7 +144,6 @@ sal_Int16 SAL_CALL
 IndexEntrySupplier_asian::compareIndexEntry(
     const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const Locale& rLocale1,
     const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const Locale& rLocale2 )
-    throw (RuntimeException, std::exception)
 {
     sal_Int32 result = collator->compareString(getEntry(rIndexEntry1, rPhoneticEntry1, rLocale1),
                                     getEntry(rIndexEntry2, rPhoneticEntry2, rLocale2));
@@ -160,7 +159,7 @@ IndexEntrySupplier_asian::compareIndexEntry(
 
 OUString SAL_CALL
 IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
-        const Locale& rLocale ) throw (RuntimeException, std::exception)
+        const Locale& rLocale )
 {
     sal_uInt16 **(*func)(sal_Int16*)=nullptr;
 #ifndef DISABLE_DYNLOADING
diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx
index ee5d0d1b08c8..77135523966a 100644
--- a/i18npool/source/indexentry/indexentrysupplier_common.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx
@@ -38,29 +38,29 @@ IndexEntrySupplier_Common::~IndexEntrySupplier_Common()
 {
 }
 
-Sequence < lang::Locale > SAL_CALL IndexEntrySupplier_Common::getLocaleList() throw (RuntimeException, std::exception)
+Sequence < lang::Locale > SAL_CALL IndexEntrySupplier_Common::getLocaleList()
 {
     throw RuntimeException();
 }
 
-Sequence < OUString > SAL_CALL IndexEntrySupplier_Common::getAlgorithmList( const lang::Locale& ) throw (RuntimeException, std::exception)
+Sequence < OUString > SAL_CALL IndexEntrySupplier_Common::getAlgorithmList( const lang::Locale& )
 {
     throw RuntimeException();
 }
 
 OUString SAL_CALL IndexEntrySupplier_Common::getPhoneticCandidate( const OUString&,
-    const lang::Locale& ) throw (RuntimeException, std::exception)
+    const lang::Locale& )
 {
     return OUString();
 }
 
-sal_Bool SAL_CALL IndexEntrySupplier_Common::usePhoneticEntry( const lang::Locale& ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL IndexEntrySupplier_Common::usePhoneticEntry( const lang::Locale& )
 {
     throw RuntimeException();
 }
 
 sal_Bool SAL_CALL IndexEntrySupplier_Common::loadAlgorithm( const lang::Locale& rLocale,
-    const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException, std::exception)
+    const OUString& rAlgorithm, sal_Int32 collatorOptions )
 {
     usePhonetic = LocaleDataImpl::get()->isPhonetic(rLocale, rAlgorithm);
     collator->loadCollatorAlgorithm(rAlgorithm, rLocale, collatorOptions);
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL IndexEntrySupplier_Common::loadAlgorithm( const lang::Locale&
 }
 
 OUString SAL_CALL IndexEntrySupplier_Common::getIndexKey( const OUString& rIndexEntry,
-    const OUString&, const lang::Locale& ) throw (RuntimeException, std::exception)
+    const OUString&, const lang::Locale& )
 {
     sal_Int32 nPos=0;
     sal_uInt32 indexChar=rIndexEntry.iterateCodePoints(&nPos, 0);
@@ -80,7 +80,6 @@ OUString SAL_CALL IndexEntrySupplier_Common::getIndexKey( const OUString& rIndex
 sal_Int16 SAL_CALL IndexEntrySupplier_Common::compareIndexEntry(
     const OUString& rIndexEntry1, const OUString&, const lang::Locale&,
     const OUString& rIndexEntry2, const OUString&, const lang::Locale& )
-    throw (RuntimeException, std::exception)
 {
     return sal::static_int_cast< sal_Int16 >(
         collator->compareString(rIndexEntry1, rIndexEntry2));
@@ -88,20 +87,20 @@ sal_Int16 SAL_CALL IndexEntrySupplier_Common::compareIndexEntry(
 }
 
 OUString SAL_CALL IndexEntrySupplier_Common::getIndexCharacter( const OUString& rIndexEntry,
-    const lang::Locale& rLocale, const OUString& ) throw (RuntimeException, std::exception)
+    const lang::Locale& rLocale, const OUString& )
 {
     return getIndexKey(rIndexEntry, rIndexEntry, rLocale);
 }
 
 OUString SAL_CALL IndexEntrySupplier_Common::getIndexFollowPageWord( sal_Bool,
-    const lang::Locale& ) throw (RuntimeException, std::exception)
+    const lang::Locale& )
 {
     throw RuntimeException();
 }
 
 const OUString& SAL_CALL
 IndexEntrySupplier_Common::getEntry( const OUString& IndexEntry,
-    const OUString& PhoneticEntry, const lang::Locale& rLocale ) throw (RuntimeException)
+    const OUString& PhoneticEntry, const lang::Locale& rLocale )
 {
     // The condition for using phonetic entry is:
     // usePhonetic is set for the algorithm;
@@ -116,19 +115,19 @@ IndexEntrySupplier_Common::getEntry( const OUString& IndexEntry,
 }
 
 OUString SAL_CALL
-IndexEntrySupplier_Common::getImplementationName() throw( RuntimeException, std::exception )
+IndexEntrySupplier_Common::getImplementationName()
 {
     return OUString::createFromAscii( implementationName );
 }
 
 sal_Bool SAL_CALL
-IndexEntrySupplier_Common::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+IndexEntrySupplier_Common::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-IndexEntrySupplier_Common::getSupportedServiceNames() throw( RuntimeException, std::exception )
+IndexEntrySupplier_Common::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { OUString::createFromAscii( implementationName ) };
     return aRet;
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 8762e9e6c65d..8db03e04afef 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -40,14 +40,14 @@ IndexEntrySupplier_Unicode::~IndexEntrySupplier_Unicode()
 }
 
 sal_Bool SAL_CALL IndexEntrySupplier_Unicode::loadAlgorithm( const lang::Locale& rLocale,
-    const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException, std::exception)
+    const OUString& rAlgorithm, sal_Int32 collatorOptions )
 {
     index->init(rLocale, rAlgorithm);
     return IndexEntrySupplier_Common::loadAlgorithm(rLocale, rAlgorithm, collatorOptions);
 }
 
 OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexKey( const OUString& rIndexEntry,
-    const OUString& rPhoneticEntry, const lang::Locale& rLocale ) throw (RuntimeException, std::exception)
+    const OUString& rPhoneticEntry, const lang::Locale& rLocale )
 {
     return index->getIndexDescription(getEntry(rIndexEntry, rPhoneticEntry, rLocale));
 }
@@ -55,7 +55,6 @@ OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexKey( const OUString& rInde
 sal_Int16 SAL_CALL IndexEntrySupplier_Unicode::compareIndexEntry(
     const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const lang::Locale& rLocale1,
     const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const lang::Locale& rLocale2 )
-    throw (RuntimeException, std::exception)
 {
     sal_Int16 result =
             index->getIndexWeight(getEntry(rIndexEntry1, rPhoneticEntry1, rLocale1)) -
@@ -68,7 +67,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_Unicode::compareIndexEntry(
 }
 
 OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexCharacter( const OUString& rIndexEntry,
-    const lang::Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException, std::exception) {
+    const lang::Locale& rLocale, const OUString& rAlgorithm ) {
 
     if (loadAlgorithm( rLocale, rAlgorithm, CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT))
         return index->getIndexDescription(rIndexEntry);
@@ -163,7 +162,7 @@ OUString Index::getIndexDescription(const OUString& rIndexEntry)
 
 #define LOCALE_EN lang::Locale(OUString("en"), OUString(), OUString())
 
-void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) throw (RuntimeException, std::exception)
+void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm)
 {
     OUString keyStr = LocaleDataImpl::get()->getIndexKeysByAlgorithm(rLocale, algorithm);
 
@@ -249,7 +248,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm
     }
 }
 
-void Index::init(const lang::Locale &rLocale, const OUString& algorithm) throw (RuntimeException, std::exception)
+void Index::init(const lang::Locale &rLocale, const OUString& algorithm)
 {
     makeIndexKeys(rLocale, algorithm);
 
diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
index d7ccf35857fe..d9f6893ab6e0 100644
--- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
@@ -27,7 +27,6 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUString& rIndexEntry,
     const lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ )
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_Unicode ch=rIndexEntry.toChar();
     sal_uInt16 first = idx[ ch >> 8 ];
@@ -42,7 +41,6 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUStr
 
 OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& IndexEntry,
     const OUString& PhoneticEntry, const lang::Locale& rLocale )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return getIndexCharacter( PhoneticEntry.isEmpty() ? IndexEntry : PhoneticEntry , rLocale, OUString());
 }
@@ -50,7 +48,6 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& I
 sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry(
     const OUString& IndexEntry1, const OUString& PhoneticEntry1, const lang::Locale& rLocale1,
     const OUString& IndexEntry2, const OUString& PhoneticEntry2, const lang::Locale& rLocale2 )
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_Int16 result = sal::static_int_cast<sal_Int16>( collator->compareString(
         IndexEntrySupplier_ja_phonetic::getIndexKey(IndexEntry1, PhoneticEntry1, rLocale1),
@@ -66,13 +63,13 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry(
 static const sal_Char first[] = "ja_phonetic (alphanumeric first)";
 sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable::loadAlgorithm(
     const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/,
-    sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 collatorOptions )
 {
     return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) == 0;
 }
 sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant::loadAlgorithm(
     const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/,
-    sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 collatorOptions )
 {
     return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) == 0;
 }
@@ -80,13 +77,13 @@ sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant
 static const sal_Char last[] = "ja_phonetic (alphanumeric last)";
 sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable::loadAlgorithm(
     const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/,
-    sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 collatorOptions )
 {
     return collator->loadCollatorAlgorithm(last, rLocale, collatorOptions) == 0;
 }
 sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_consonant::loadAlgorithm(
     const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/,
-    sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 collatorOptions )
 {
     return collator->loadCollatorAlgorithm(last, rLocale, collatorOptions) == 0;
 }
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 69c8525985af..e3b72cd51413 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -51,7 +51,7 @@ InputSequenceCheckerImpl::~InputSequenceCheckerImpl()
 
 sal_Bool SAL_CALL
 InputSequenceCheckerImpl::checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
-        sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException, std::exception)
+        sal_Unicode inputChar, sal_Int16 inputCheckMode)
 {
     if (inputCheckMode == InputSequenceCheckMode::PASSTHROUGH)
         return true;
@@ -66,7 +66,7 @@ InputSequenceCheckerImpl::checkInputSequence(const OUString& Text, sal_Int32 nSt
 
 sal_Int32 SAL_CALL
 InputSequenceCheckerImpl::correctInputSequence(OUString& Text, sal_Int32 nStartPos,
-        sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException, std::exception)
+        sal_Unicode inputChar, sal_Int16 inputCheckMode)
 {
     if (inputCheckMode != InputSequenceCheckMode::PASSTHROUGH) {
         sal_Char* language = getLanguageByScripType(Text[nStartPos], inputChar);
@@ -105,7 +105,7 @@ InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode
 }
 
 Reference< XExtendedInputSequenceChecker >& SAL_CALL
-InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (RuntimeException)
+InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage)
 {
     if (cachedItem && cachedItem->aLanguage == rLanguage) {
         return cachedItem->xISC;
@@ -134,19 +134,19 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru
 }
 
 OUString SAL_CALL
-InputSequenceCheckerImpl::getImplementationName() throw( RuntimeException, std::exception )
+InputSequenceCheckerImpl::getImplementationName()
 {
     return OUString::createFromAscii(serviceName);
 }
 
 sal_Bool SAL_CALL
-InputSequenceCheckerImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+InputSequenceCheckerImpl::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-InputSequenceCheckerImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+InputSequenceCheckerImpl::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { OUString::createFromAscii(serviceName) };
     return aRet;
diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
index c6933bbd1c9c..52f8fae5a9bb 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
@@ -112,7 +112,6 @@ InputSequenceChecker_hi::checkInputSequence(const OUString& Text,
                                             sal_Int32       nStartPos,
                                             sal_Unicode     inputChar,
                                             sal_Int16       inputCheckMode)
-  throw(css::uno::RuntimeException, std::exception)
 {
     sal_Unicode currentChar = Text[nStartPos];
   sal_uInt16  ch1 = getCharType(inputChar);
@@ -126,7 +125,6 @@ InputSequenceChecker_hi::correctInputSequence(OUString& Text,
                                             sal_Int32       nStartPos,
                                             sal_Unicode     inputChar,
                                             sal_Int16       inputCheckMode)
-  throw(css::uno::RuntimeException, std::exception)
 {
     if (checkInputSequence(Text, nStartPos, inputChar, inputCheckMode))
         Text = Text.replaceAt(++nStartPos, 0, OUString(inputChar));
diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
index e16a16a6b74d..660f78be0998 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
@@ -78,7 +78,7 @@ static bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputChec
 
 sal_Bool SAL_CALL
 InputSequenceChecker_th::checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
-    sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception)
+    sal_Unicode inputChar, sal_Int16 inputCheckMode)
 {
     return check(Text[nStartPos], inputChar, inputCheckMode);
 }
@@ -88,7 +88,6 @@ InputSequenceChecker_th::correctInputSequence(OUString& Text,
                                             sal_Int32       nStartPos,
                                             sal_Unicode     inputChar,
                                             sal_Int16       inputCheckMode)
-  throw(css::uno::RuntimeException, std::exception)
 {
 /* 9 rules for input sequence correction, see issue i42661 for detail,
 
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index f3499f9de386..617ce25267ba 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -384,7 +384,7 @@ LocaleDataImpl::~LocaleDataImpl()
 
 
 LocaleDataItem SAL_CALL
-LocaleDataImpl::getLocaleItem( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getLocaleItem( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getLocaleItem" ));
 
@@ -602,7 +602,6 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
 
 Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const OUString& name,
         const Locale& rLocale, const Sequence< Calendar2 >& calendarsSeq, sal_Int16 item)
-        throw(RuntimeException, std::exception)
 {
     if (!ref_name.equals(name)) {
         OUString aLocStr, id;
@@ -662,7 +661,6 @@ Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems(
         sal_Unicode const * const * const allCalendars, sal_Int16 & rnOffset,
         const sal_Int16 nWhichItem, const sal_Int16 nCalendar,
         const Locale & rLocale, const Sequence< Calendar2 > & calendarsSeq )
-        throw(RuntimeException, std::exception)
 {
     Sequence< CalendarItem2 > aItems;
     if ( OUString( allCalendars[rnOffset] ) == "ref" )
@@ -707,7 +705,7 @@ Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems(
 }
 
 Sequence< Calendar2 > SAL_CALL
-LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getAllCalendars2( const Locale& rLocale )
 {
 
     sal_Unicode const * const * allCalendars = nullptr;
@@ -753,7 +751,7 @@ LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException
 
 
 Sequence< Calendar > SAL_CALL
-LocaleDataImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getAllCalendars( const Locale& rLocale )
 {
     const Sequence< Calendar2 > aCal2( getAllCalendars2( rLocale));
     sal_Int32 nLen = aCal2.getLength();
@@ -769,7 +767,7 @@ LocaleDataImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException,
 
 
 Sequence< Currency2 > SAL_CALL
-LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getAllCurrencies2( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getAllCurrencies" ));
 
@@ -801,7 +799,7 @@ LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeExceptio
 
 
 Sequence< Currency > SAL_CALL
-LocaleDataImpl::getAllCurrencies( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getAllCurrencies( const Locale& rLocale )
 {
     Sequence< Currency2 > aCur2( getAllCurrencies2( rLocale));
     sal_Int32 nLen = aCur2.getLength();
@@ -817,7 +815,7 @@ LocaleDataImpl::getAllCurrencies( const Locale& rLocale ) throw(RuntimeException
 
 
 Sequence< FormatElement > SAL_CALL
-LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getAllFormats( const Locale& rLocale )
 {
     const int SECTIONS = 2;
     struct FormatSection
@@ -868,7 +866,7 @@ LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException, s
 
 
 Sequence< OUString > SAL_CALL
-LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getDateAcceptancePatterns" ));
 
@@ -897,7 +895,7 @@ LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) throw(Runtime
 #define COLLATOR_ELEMENTS       3
 
 OUString SAL_CALL
-LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getCollatorImplementation" ));
     if ( func ) {
@@ -912,7 +910,7 @@ LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUStrin
 
 
 Sequence< Implementation > SAL_CALL
-LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getCollatorImplementations( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getCollatorImplementation" ));
 
@@ -934,7 +932,7 @@ LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) throw(Runtim
 }
 
 Sequence< OUString > SAL_CALL
-LocaleDataImpl::getCollationOptions( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getCollationOptions( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getCollationOptions" ));
 
@@ -954,7 +952,7 @@ LocaleDataImpl::getCollationOptions( const Locale& rLocale ) throw(RuntimeExcept
 }
 
 Sequence< OUString > SAL_CALL
-LocaleDataImpl::getSearchOptions( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getSearchOptions( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getSearchOptions" ));
 
@@ -984,7 +982,7 @@ LocaleDataImpl::getIndexArray(const Locale& rLocale, sal_Int16& indexCount)
 }
 
 Sequence< OUString > SAL_CALL
-LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) throw(RuntimeException)
+LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale )
 {
     sal_Int16 indexCount = 0;
     sal_Unicode **indexArray = getIndexArray(rLocale, indexCount);
@@ -1003,7 +1001,7 @@ LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) throw(RuntimeExceptio
 }
 
 OUString SAL_CALL
-LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) throw(RuntimeException)
+LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale )
 {
     sal_Int16 indexCount = 0;
     sal_Unicode **indexArray = getIndexArray(rLocale, indexCount);
@@ -1018,7 +1016,7 @@ LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) throw(RuntimeE
 }
 
 bool SAL_CALL
-LocaleDataImpl::hasPhonetic( const Locale& rLocale ) throw(RuntimeException)
+LocaleDataImpl::hasPhonetic( const Locale& rLocale )
 {
     sal_Int16 indexCount = 0;
     sal_Unicode **indexArray = getIndexArray(rLocale, indexCount);
@@ -1047,28 +1045,28 @@ LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString&
 }
 
 bool SAL_CALL
-LocaleDataImpl::isPhonetic( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException)
+LocaleDataImpl::isPhonetic( const Locale& rLocale, const OUString& algorithm )
 {
     sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm);
     return indexArray && indexArray[4][0];
 }
 
 OUString SAL_CALL
-LocaleDataImpl::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException)
+LocaleDataImpl::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm )
 {
     sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm);
     return indexArray ? "0-9"+OUString(indexArray[2]) : OUString();
 }
 
 OUString SAL_CALL
-LocaleDataImpl::getIndexModuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException)
+LocaleDataImpl::getIndexModuleByAlgorithm( const Locale& rLocale, const OUString& algorithm )
 {
     sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm);
     return indexArray ? OUString(indexArray[1]) : OUString();
 }
 
 Sequence< UnicodeScript > SAL_CALL
-LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getUnicodeScripts( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getUnicodeScripts" ));
 
@@ -1088,7 +1086,7 @@ LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeExceptio
 }
 
 Sequence< OUString > SAL_CALL
-LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getFollowPageWords( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getFollowPageWords" ));
 
@@ -1108,7 +1106,7 @@ LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) throw(RuntimeExcepti
 }
 
 Sequence< OUString > SAL_CALL
-LocaleDataImpl::getTransliterations( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getTransliterations( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getTransliterations" ));
 
@@ -1133,7 +1131,7 @@ LocaleDataImpl::getTransliterations( const Locale& rLocale ) throw(RuntimeExcept
 
 
 LanguageCountryInfo SAL_CALL
-LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getLCInfo" ));
 
@@ -1156,7 +1154,7 @@ LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeExc
 
 
 ForbiddenCharacters SAL_CALL
-LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getForbiddenCharacters" ));
 
@@ -1173,7 +1171,7 @@ LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeExc
 }
 
 OUString SAL_CALL
-LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getHangingCharacters( const Locale& rLocale )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getForbiddenCharacters" ));
 
@@ -1187,7 +1185,7 @@ LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) throw(RuntimeExcep
 }
 
 Sequence< OUString > SAL_CALL
-LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale  ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale  )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getBreakIteratorRules" ));
 
@@ -1209,7 +1207,7 @@ LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale  ) throw(RuntimeExc
 
 
 Sequence< OUString > SAL_CALL
-LocaleDataImpl::getReservedWord( const Locale& rLocale  ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getReservedWord( const Locale& rLocale  )
 {
     MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getReservedWords" ));
 
@@ -1231,7 +1229,7 @@ LocaleDataImpl::getReservedWord( const Locale& rLocale  ) throw(RuntimeException
 
 
 Sequence< Sequence<beans::PropertyValue> > SAL_CALL
-LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale )
 {
     // load symbol
     MyFunc_Type2 func = reinterpret_cast<MyFunc_Type2>(getFunctionSymbol( rLocale, "getContinuousNumberingLevels" ));
@@ -1329,17 +1327,16 @@ public:
     OutlineNumbering(const OutlineNumberingLevel_Impl* pOutlineLevels, int nLevels);
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index )
-        throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     //XElementAccess
-    virtual Type SAL_CALL getElementType(  ) throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(RuntimeException, std::exception) override;
+    virtual Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 };
 
 Sequence< Reference<container::XIndexAccess> > SAL_CALL
-LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException, std::exception)
+LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale )
 {
     // load symbol
     MyFunc_Type3 func = reinterpret_cast<MyFunc_Type3>(getFunctionSymbol( rLocale, "getOutlineNumberingLevels" ));
@@ -1411,7 +1408,6 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(R
 // helper functions
 
 oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction )
-        throw(RuntimeException, std::exception)
 {
     lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get();
 
@@ -1459,7 +1455,7 @@ oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLo
 }
 
 Sequence< Locale > SAL_CALL
-LocaleDataImpl::getAllInstalledLocaleNames() throw(RuntimeException, std::exception)
+LocaleDataImpl::getAllInstalledLocaleNames()
 {
     Sequence< lang::Locale > seq( nbOfLocales );
     sal_Int16 nInstalled = 0;
@@ -1497,13 +1493,12 @@ OutlineNumbering::OutlineNumbering(const OutlineNumberingLevel_Impl* pOutlnLevel
 {
 }
 
-sal_Int32 OutlineNumbering::getCount(  ) throw(RuntimeException, std::exception)
+sal_Int32 OutlineNumbering::getCount(  )
 {
     return m_nCount;
 }
 
 Any OutlineNumbering::getByIndex( sal_Int32 nIndex )
-        throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
 {
     if(nIndex < 0 || nIndex >= m_nCount)
         throw IndexOutOfBoundsException();
@@ -1541,30 +1536,29 @@ Any OutlineNumbering::getByIndex( sal_Int32 nIndex )
     return aRet;
 }
 
-Type OutlineNumbering::getElementType(  ) throw(RuntimeException, std::exception)
+Type OutlineNumbering::getElementType(  )
 {
     return cppu::UnoType<Sequence<PropertyValue>>::get();
 }
 
-sal_Bool OutlineNumbering::hasElements(  ) throw(RuntimeException, std::exception)
+sal_Bool OutlineNumbering::hasElements(  )
 {
     return m_nCount > 0;
 }
 
 OUString SAL_CALL
-LocaleDataImpl::getImplementationName() throw( RuntimeException, std::exception )
+LocaleDataImpl::getImplementationName()
 {
     return OUString("com.sun.star.i18n.LocaleDataImpl");
 }
 
 sal_Bool SAL_CALL LocaleDataImpl::supportsService(const OUString& rServiceName)
-        throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-LocaleDataImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+LocaleDataImpl::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.i18n.LocaleData" };
     return aRet;
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 26da63a5e69c..fd14c491e934 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -63,8 +63,7 @@ public:
     {}
 
 public:
-    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override
         {
             nBytesToRead = (nBytesToRead > m_seq.getLength() - nPos ) ?
                 m_seq.getLength() - nPos :
@@ -75,23 +74,19 @@ public:
         }
     virtual sal_Int32 SAL_CALL readSomeBytes(
         css::uno::Sequence< sal_Int8 >& aData,
-        sal_Int32 nMaxBytesToRead )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
+        sal_Int32 nMaxBytesToRead ) override
         {
             return readBytes( aData, nMaxBytesToRead );
         }
-    virtual void SAL_CALL skipBytes( sal_Int32 /*nBytesToSkip*/ )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL skipBytes( sal_Int32 /*nBytesToSkip*/ ) override
         {
             // not implemented
         }
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(NotConnectedException, IOException, RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL available(  ) override
         {
             return m_seq.getLength() - nPos;
         }
-    virtual void SAL_CALL closeInput(  )
-        throw(NotConnectedException, IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL closeInput(  ) override
         {
             // not needed
         }
@@ -168,7 +163,7 @@ public:
 
 
 public: // Error handler
-    virtual void SAL_CALL error(const Any& aSAXParseException) throw (SAXException, RuntimeException, std::exception) override
+    virtual void SAL_CALL error(const Any& aSAXParseException) override
     {
         ++nError;
         printf( "Error !\n" );
@@ -177,12 +172,12 @@ public: // Error handler
             Reference < XInterface >() ,
             aSAXParseException );
     }
-    virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) override
+    virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) override
     {
         ++nError;
         printf( "Fatal Error !\n" );
     }
-    virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) override
+    virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) override
     {
         printf( "Warning !\n" );
     }
@@ -194,7 +189,7 @@ public: // ExtendedDocumentHandler
     stack<LocaleNode *> currentNode ;
     LocaleNode * rootNode;
 
-    virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException, std::exception) override
+    virtual void SAL_CALL startDocument() override
     {
     printf( "parsing document %s started\n", theLocale);
     of.writeAsciiString("#include <sal/types.h>\n\n\n");
@@ -202,7 +197,7 @@ public: // ExtendedDocumentHandler
     of.writeAsciiString("extern \"C\" {\n\n");
     }
 
-    virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException, std::exception) override
+    virtual void SAL_CALL endDocument() override
     {
         if (rootNode)
         {
@@ -226,8 +221,7 @@ public: // ExtendedDocumentHandler
     }
 
     virtual void SAL_CALL startElement(const OUString& aName,
-                              const Reference< XAttributeList > & xAttribs)
-        throw (SAXException,RuntimeException, std::exception) override
+                              const Reference< XAttributeList > & xAttribs) override
     {
 
         LocaleNode * l =  LocaleNode::createNode (aName, xAttribs);
@@ -241,37 +235,35 @@ public: // ExtendedDocumentHandler
     }
 
 
-    virtual void SAL_CALL endElement(const OUString& /*aName*/) throw (SAXException,RuntimeException, std::exception) override
+    virtual void SAL_CALL endElement(const OUString& /*aName*/) override
     {
         currentNode.pop();
     }
 
-    virtual void SAL_CALL characters(const OUString& aChars) throw (SAXException,RuntimeException, std::exception) override
+    virtual void SAL_CALL characters(const OUString& aChars) override
     {
 
         LocaleNode * l = currentNode.top();
         l->setValue (aChars);
     }
 
-    virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (SAXException,RuntimeException, std::exception) override
+    virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) override
     {
     }
 
-    virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (SAXException,RuntimeException, std::exception) override
+    virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) override
     {
         // ignored
     }
 
-    virtual void SAL_CALL setDocumentLocator(const Reference< XLocator> & /*xLocator*/)
-        throw (SAXException,RuntimeException, std::exception) override
+    virtual void SAL_CALL setDocumentLocator(const Reference< XLocator> & /*xLocator*/) override
     {
         // ignored
     }
 
     virtual InputSource SAL_CALL resolveEntity(
         const OUString& sPublicId,
-        const OUString& sSystemId)
-        throw (RuntimeException, std::exception) override
+        const OUString& sSystemId) override
     {
         InputSource source;
         source.sSystemId = sSystemId;
@@ -283,20 +275,20 @@ public: // ExtendedDocumentHandler
         return source;
     }
 
-    virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException, std::exception) override
+    virtual void SAL_CALL startCDATA() override
     {
     }
-    virtual void SAL_CALL endCDATA() throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL endCDATA() override
     {
     }
-    virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException, std::exception) override
+    virtual void SAL_CALL comment(const OUString& /*sComment*/) override
     {
     }
-    virtual void SAL_CALL unknown(const OUString& /*sString*/) throw (SAXException,RuntimeException, std::exception) override
+    virtual void SAL_CALL unknown(const OUString& /*sString*/) override
     {
     }
 
-    virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException, std::exception ) override
+    virtual void SAL_CALL allowLineBreak() override
     {
 
     }
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index c1e4c14d9561..01ef7dc3000c 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -63,7 +63,7 @@ OUString SAL_CALL getCyrillicNativeNumberString(const OUString& aNumberString);
 
 /// @throws RuntimeException
 OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        Sequence< sal_Int32 >& offset, bool useOffset, sal_Int16 number ) throw(RuntimeException)
+        Sequence< sal_Int32 >& offset, bool useOffset, sal_Int16 number )
 {
     const sal_Unicode *src = inStr.getStr() + startPos;
     rtl_uString *newStr = rtl_uString_alloc(nCount);
@@ -164,7 +164,7 @@ bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin,
 
 /// @throws RuntimeException
 OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        Sequence< sal_Int32 >& offset, bool useOffset, const Number* number ) throw(RuntimeException)
+        Sequence< sal_Int32 >& offset, bool useOffset, const Number* number )
 {
     OUString aRet;
 
@@ -301,7 +301,7 @@ static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, co
 
 /// @throws RuntimeException
 static OUString SAL_CALL NativeToAscii(const OUString& inStr,
-        sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset ) throw(RuntimeException)
+        sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset )
 {
     OUString aRet;
 
@@ -524,7 +524,7 @@ static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale)
 }
 
 OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale,
-                sal_Int16 nNativeNumberMode, Sequence< sal_Int32 >& offset) throw (RuntimeException)
+                sal_Int16 nNativeNumberMode, Sequence< sal_Int32 >& offset)
 {
     if (!isValidNatNum(rLocale, nNativeNumberMode))
         return aNumberString;
@@ -609,13 +609,13 @@ OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUStr
 }
 
 OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale,
-                sal_Int16 nNativeNumberMode) throw (RuntimeException, std::exception)
+                sal_Int16 nNativeNumberMode)
 {
     Sequence< sal_Int32 > offset;
     return getNativeNumberString(aNumberString, rLocale, nNativeNumberMode, offset);
 }
 
-sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw(css::uno::RuntimeException)
+sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode )
 {
     if (nNativeNumberMode == NativeNumberMode::NATNUM0) { // Ascii
         for (const auto & i : NumberChar)
@@ -659,7 +659,7 @@ sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal
     return inChar;
 }
 
-sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLocale, sal_Int16 nNativeNumberMode )
 {
     sal_Int16 langnum = getLanguageNumber(rLocale);
 
@@ -687,7 +687,7 @@ sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLoc
     return false;
 }
 
-NativeNumberXmlAttributes SAL_CALL NativeNumberSupplierService::convertToXmlAttributes( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception)
+NativeNumberXmlAttributes SAL_CALL NativeNumberSupplierService::convertToXmlAttributes( const Locale& rLocale, sal_Int16 nNativeNumberMode )
 {
     static const sal_Int16 attShort         = 0;
     static const sal_Int16 attMedium        = 1;
@@ -766,7 +766,7 @@ static bool natNumIn(sal_Int16 num, const sal_Int16 natnum[], sal_Int16 len)
     return false;
 }
 
-sal_Int16 SAL_CALL NativeNumberSupplierService::convertFromXmlAttributes( const NativeNumberXmlAttributes& aAttr ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL NativeNumberSupplierService::convertFromXmlAttributes( const NativeNumberXmlAttributes& aAttr )
 {
     sal_Unicode numberChar[NumberChar_Count];
     for (sal_Int16 i = 0; i < NumberChar_Count; i++)
@@ -1035,19 +1035,19 @@ OUString SAL_CALL getCyrillicNativeNumberString(const OUString& aNumberString)
 
 static const sal_Char implementationName[] = "com.sun.star.i18n.NativeNumberSupplier";
 
-OUString SAL_CALL NativeNumberSupplierService::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL NativeNumberSupplierService::getImplementationName()
 {
     return OUString(implementationName);
 }
 
 sal_Bool SAL_CALL
-NativeNumberSupplierService::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+NativeNumberSupplierService::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-NativeNumberSupplierService::getSupportedServiceNames() throw( RuntimeException, std::exception )
+NativeNumberSupplierService::getSupportedServiceNames()
 {
     Sequence< OUString > aRet {implementationName};
     return aRet;
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx
index 9dab999da366..5fd2af898363 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.cxx
@@ -36,7 +36,7 @@ NumberFormatCodeMapper::~NumberFormatCodeMapper()
 
 
 css::i18n::NumberFormatCode SAL_CALL
-NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception)
+NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const css::lang::Locale& rLocale )
 {
 
     OUString elementType = mapElementTypeShortToString(formatType);
@@ -64,7 +64,7 @@ NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage,
 
 
 css::i18n::NumberFormatCode SAL_CALL
-NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception)
+NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const css::lang::Locale& rLocale )
 {
     osl::MutexGuard g(maMutex);
     const css::uno::Sequence< css::i18n::FormatElement > &aFormatSeq = getFormats( rLocale );
@@ -87,7 +87,7 @@ NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const css::lang::L
 
 
 css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL
-NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception)
+NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const css::lang::Locale& rLocale )
 {
     osl::MutexGuard g(maMutex);
     const css::uno::Sequence< css::i18n::FormatElement > &aFormatSeq = getFormats( rLocale );
@@ -120,7 +120,7 @@ NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const css::lang
 
 
 css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL
-NumberFormatCodeMapper::getAllFormatCodes( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception)
+NumberFormatCodeMapper::getAllFormatCodes( const css::lang::Locale& rLocale )
 {
     osl::MutexGuard g(maMutex);
     const css::uno::Sequence< css::i18n::FormatElement > &aFormatSeq = getFormats( rLocale );
@@ -246,19 +246,17 @@ NumberFormatCodeMapper::mapElementUsageStringToShort(const OUString& formatUsage
 
 OUString SAL_CALL
 NumberFormatCodeMapper::getImplementationName()
-                throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.i18n.NumberFormatCodeMapper");
 }
 
 sal_Bool SAL_CALL NumberFormatCodeMapper::supportsService(const OUString& rServiceName)
-                throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL
-NumberFormatCodeMapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+NumberFormatCodeMapper::getSupportedServiceNames()
 {
     css::uno::Sequence< OUString > aRet { "com.sun.star.i18n.NumberFormatMapper" };
     return aRet;
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index dbdb1a1542ca..4543bf2004b0 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -67,7 +67,7 @@ namespace
  * than english ones, ICU 4.2+ has to be used.
  */
 uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_Int32 nNumber,
-        const lang::Locale &rLocale ) throw( RuntimeException, std::exception )
+        const lang::Locale &rLocale )
 {
     uno::Sequence< OUString > retValue;
 
@@ -136,17 +136,17 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_I
 
 const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix";
 
-OUString SAL_CALL OrdinalSuffixService::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL OrdinalSuffixService::getImplementationName()
 {
     return OUString(cOrdinalSuffix);
 }
 
-sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { cOrdinalSuffix };
     return aRet;
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index da2c5a4c35bb..f1e09da1d075 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -130,7 +130,7 @@ TextSearch::~TextSearch()
     delete pJumpTable2;
 }
 
-void TextSearch::setOptions2( const SearchOptions2& rOptions ) throw( RuntimeException, std::exception )
+void TextSearch::setOptions2( const SearchOptions2& rOptions )
 {
     aSrchPara = rOptions;
 
@@ -259,7 +259,7 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions ) throw( RuntimeExc
     }
 }
 
-void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeException, std::exception )
+void TextSearch::setOptions( const SearchOptions& rOptions )
 {
     sal_Int16 nAlgorithmType2;
     switch (rOptions.algorithmType)
@@ -303,7 +303,6 @@ sal_Int32 FindPosInSeq_Impl( const Sequence <sal_Int32>& rOff, sal_Int32 nPos )
 }
 
 bool TextSearch::isCellStart(const OUString& searchStr, sal_Int32 nPos)
-        throw( RuntimeException )
 {
     sal_Int32 nDone;
     return nPos == xBreak->previousCharacters(searchStr, nPos+1,
@@ -311,7 +310,6 @@ bool TextSearch::isCellStart(const OUString& searchStr, sal_Int32 nPos)
 }
 
 SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos )
-        throw( RuntimeException, std::exception )
 {
     SearchResult sres;
 
@@ -427,7 +425,6 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta
 }
 
 SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos )
-        throw(RuntimeException, std::exception)
 {
     SearchResult sres;
 
@@ -678,7 +675,6 @@ sal_Int32 TextSearch::GetDiff( const sal_Unicode cChr ) const
 
 
 SearchResult TextSearch::NSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos )
-        throw(RuntimeException)
 {
     SearchResult aRet;
     aRet.subRegExpressions = 0;
@@ -749,7 +745,6 @@ SearchResult TextSearch::NSrchFrwrd( const OUString& searchStr, sal_Int32 startP
 }
 
 SearchResult TextSearch::NSrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos )
-        throw(RuntimeException)
 {
     SearchResult aRet;
     aRet.subRegExpressions = 0;
@@ -915,7 +910,6 @@ static bool lcl_findRegex( RegexMatcher * pRegexMatcher, sal_Int32 nStartPos, UE
 
 SearchResult TextSearch::RESrchFrwrd( const OUString& searchStr,
                                       sal_Int32 startPos, sal_Int32 endPos )
-            throw(RuntimeException)
 {
     SearchResult aRet;
     aRet.subRegExpressions = 0;
@@ -967,7 +961,6 @@ SearchResult TextSearch::RESrchFrwrd( const OUString& searchStr,
 
 SearchResult TextSearch::RESrchBkwrd( const OUString& searchStr,
                                       sal_Int32 startPos, sal_Int32 endPos )
-            throw(RuntimeException)
 {
     // NOTE: for backwards search callers provide startPos/endPos inverted!
     SearchResult aRet;
@@ -1040,7 +1033,6 @@ SearchResult TextSearch::RESrchBkwrd( const OUString& searchStr,
 // search for words phonetically
 SearchResult TextSearch::ApproxSrchFrwrd( const OUString& searchStr,
                                           sal_Int32 startPos, sal_Int32 endPos )
-            throw(RuntimeException)
 {
     SearchResult aRet;
     aRet.subRegExpressions = 0;
@@ -1085,7 +1077,6 @@ SearchResult TextSearch::ApproxSrchFrwrd( const OUString& searchStr,
 
 SearchResult TextSearch::ApproxSrchBkwrd( const OUString& searchStr,
                                           sal_Int32 startPos, sal_Int32 endPos )
-            throw(RuntimeException)
 {
     SearchResult aRet;
     aRet.subRegExpressions = 0;
@@ -1138,7 +1129,6 @@ void setWildcardMatch( css::util::SearchResult& rRes, sal_Int32 nStartOffset, sa
 }
 
 SearchResult TextSearch::WildcardSrchFrwrd( const OUString& searchStr, sal_Int32 nStartPos, sal_Int32 nEndPos )
-        throw(RuntimeException)
 {
     SearchResult aRes;
     aRes.subRegExpressions = 0;     // no match
@@ -1310,7 +1300,6 @@ SearchResult TextSearch::WildcardSrchFrwrd( const OUString& searchStr, sal_Int32
 }
 
 SearchResult TextSearch::WildcardSrchBkwrd( const OUString& searchStr, sal_Int32 nStartPos, sal_Int32 nEndPos )
-        throw(RuntimeException)
 {
     SearchResult aRes;
     aRes.subRegExpressions = 0;     // no match
@@ -1557,19 +1546,17 @@ static OUString getImplementationName_Static()
 
 OUString SAL_CALL
 TextSearch::getImplementationName()
-                throw( RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL TextSearch::supportsService(const OUString& rServiceName)
-                throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-TextSearch::getSupportedServiceNames() throw( RuntimeException, std::exception )
+TextSearch::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { getServiceName_Static() };
     return aRet;
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index cd8712b18a91..3ddc7cb8de61 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -75,26 +75,22 @@ class TextSearch: public cppu::WeakImplHelper
     /// @throws css::uno::RuntimeException
     css::util::SearchResult SAL_CALL
         NSrchFrwrd( const OUString& searchStr,
-                                sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException);
+                                sal_Int32 startPos, sal_Int32 endPos );
     /// @throws css::uno::RuntimeException
     css::util::SearchResult SAL_CALL
         NSrchBkwrd( const OUString& searchStr,
-                                sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException);
+                                sal_Int32 startPos, sal_Int32 endPos );
 
     // Members and methods for the regular expression search
     RegexMatcher* pRegexMatcher;
     /// @throws css::uno::RuntimeException
     css::util::SearchResult SAL_CALL
         RESrchFrwrd( const OUString& searchStr,
-                                sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException);
+                                sal_Int32 startPos, sal_Int32 endPos );
     /// @throws css::uno::RuntimeException
     css::util::SearchResult SAL_CALL
         RESrchBkwrd( const OUString& searchStr,
-                                sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException);
+                                sal_Int32 startPos, sal_Int32 endPos );
     void RESrchPrepare( const css::util::SearchOptions2&);
 
     // Members and methods for the "Weight Levenshtein-Distance" search
@@ -104,13 +100,11 @@ class TextSearch: public cppu::WeakImplHelper
     /// @throws css::uno::RuntimeException
     css::util::SearchResult SAL_CALL
         ApproxSrchFrwrd( const OUString& searchStr,
-                                sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException);
+                                sal_Int32 startPos, sal_Int32 endPos );
     /// @throws css::uno::RuntimeException
     css::util::SearchResult SAL_CALL
         ApproxSrchBkwrd( const OUString& searchStr,
-                                sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException);
+                                sal_Int32 startPos, sal_Int32 endPos );
 
     // Members and methods for the wildcard search
     OUString    maWildcardReversePattern;
@@ -120,20 +114,17 @@ class TextSearch: public cppu::WeakImplHelper
     /// @throws css::uno::RuntimeException
     css::util::SearchResult SAL_CALL
         WildcardSrchFrwrd( const OUString& searchStr,
-                                sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException);
+                                sal_Int32 startPos, sal_Int32 endPos );
     /// @throws css::uno::RuntimeException
     css::util::SearchResult SAL_CALL
         WildcardSrchBkwrd( const OUString& searchStr,
-                                sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException);
+                                sal_Int32 startPos, sal_Int32 endPos );
 
     bool IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const;
 
     bool checkCTLStart, checkCTLEnd;
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos)
-                            throw(css::uno::RuntimeException);
+    bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos);
 
 public:
     explicit TextSearch(
@@ -143,29 +134,22 @@ public:
 
     // XTextSearch
     virtual void SAL_CALL
-        setOptions( const css::util::SearchOptions& options )
-                            throw(css::uno::RuntimeException, std::exception) override;
+        setOptions( const css::util::SearchOptions& options ) override;
     virtual css::util::SearchResult SAL_CALL
         searchForward( const OUString& searchStr,
-                        sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException, std::exception) override;
+                        sal_Int32 startPos, sal_Int32 endPos ) override;
     virtual css::util::SearchResult SAL_CALL
         searchBackward( const OUString& searchStr,
-                        sal_Int32 startPos, sal_Int32 endPos )
-                            throw(css::uno::RuntimeException, std::exception) override;
+                        sal_Int32 startPos, sal_Int32 endPos ) override;
 
     // XTextSearch2
     virtual void SAL_CALL
-        setOptions2( const css::util::SearchOptions2& options )
-                            throw(css::uno::RuntimeException, std::exception) override;
+        setOptions2( const css::util::SearchOptions2& options ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index a72cdcbfac1e..7421c5dce776 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -71,19 +71,19 @@ TextConversionService::getFunctionBySymbol(const sal_Char* func)
 #endif
 
 OUString SAL_CALL
-TextConversionService::getImplementationName() throw( RuntimeException, std::exception )
+TextConversionService::getImplementationName()
 {
     return OUString::createFromAscii(implementationName);
 }
 
 sal_Bool SAL_CALL
-TextConversionService::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+TextConversionService::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-TextConversionService::getSupportedServiceNames() throw( RuntimeException, std::exception )
+TextConversionService::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { OUString::createFromAscii(implementationName) };
     return aRet;
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index 2386d44ccb63..0e05fd176b81 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.cxx
@@ -31,7 +31,6 @@ namespace com { namespace sun { namespace star { namespace i18n {
 TextConversionResult SAL_CALL
 TextConversionImpl::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
     const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     getLocaleSpecificTextConversion(rLocale);
 
@@ -44,7 +43,6 @@ TextConversionImpl::getConversions( const OUString& aText, sal_Int32 nStartPos,
 OUString SAL_CALL
 TextConversionImpl::getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
     const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     getLocaleSpecificTextConversion(rLocale);
 
@@ -57,7 +55,6 @@ TextConversionImpl::getConversion( const OUString& aText, sal_Int32 nStartPos, s
 OUString SAL_CALL
 TextConversionImpl::getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
     const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence< sal_Int32>& offset)
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     getLocaleSpecificTextConversion(rLocale);
 
@@ -69,7 +66,6 @@ TextConversionImpl::getConversionWithOffset( const OUString& aText, sal_Int32 nS
 
 sal_Bool SAL_CALL
 TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions )
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     getLocaleSpecificTextConversion(rLocale);
 
@@ -77,7 +73,7 @@ TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTex
 }
 
 void SAL_CALL
-TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw( NoSupportException )
+TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale)
 {
     if (rLocale != aLocale) {
         aLocale = rLocale;
@@ -107,20 +103,19 @@ TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw
 }
 
 OUString SAL_CALL
-TextConversionImpl::getImplementationName() throw( RuntimeException, std::exception )
+TextConversionImpl::getImplementationName()
 {
     return OUString("com.sun.star.i18n.TextConversion");
 }
 
 sal_Bool SAL_CALL
 TextConversionImpl::supportsService(const OUString& rServiceName)
-                throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-TextConversionImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+TextConversionImpl::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.i18n.TextConversion" };
     return aRet;
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index caef6cc78ffb..0acad9dbe0c9 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -218,7 +218,6 @@ static Sequence< OUString >& operator += (Sequence< OUString > &rSeq1, Sequence<
 TextConversionResult SAL_CALL
 TextConversion_ko::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
     const Locale& aLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     TextConversionResult result;
     Sequence <OUString> candidates;
@@ -308,7 +307,6 @@ TextConversion_ko::getConversions( const OUString& aText, sal_Int32 nStartPos, s
 OUString SAL_CALL
 TextConversion_ko::getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
     const Locale& aLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     sal_Int32 length = aText.getLength() - nStartPos;
 
@@ -342,7 +340,6 @@ TextConversion_ko::getConversion( const OUString& aText, sal_Int32 nStartPos, sa
 OUString SAL_CALL
 TextConversion_ko::getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
     const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset)
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     offset.realloc(0);
     return getConversion(aText, nStartPos, nLength, rLocale, nConversionType, nConversionOptions);
@@ -350,7 +347,6 @@ TextConversion_ko::getConversionWithOffset( const OUString& aText, sal_Int32 nSt
 
 sal_Bool SAL_CALL
 TextConversion_ko::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ )
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     return true;
 }
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 0482df603879..39468827b6c8 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -267,7 +267,6 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos,
 TextConversionResult SAL_CALL
 TextConversion_zh::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
     const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     TextConversionResult result;
 
@@ -282,7 +281,6 @@ TextConversion_zh::getConversions( const OUString& aText, sal_Int32 nStartPos, s
 OUString SAL_CALL
 TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
     const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) {
 
@@ -304,7 +302,6 @@ TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sa
 OUString SAL_CALL
 TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
     const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset)
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) {
 
@@ -327,7 +324,6 @@ TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nSt
 
 sal_Bool SAL_CALL
 TextConversion_zh::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ )
-    throw(  RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
 {
     return false;
 }
diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
index 1051576931da..e871c473cd88 100644
--- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
+++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
@@ -41,7 +41,6 @@ fullwidthToHalfwidth::fullwidthToHalfwidth()
  */
 OUString SAL_CALL
 fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     // Decomposition: GA --> KA + voice-mark
     const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
@@ -55,7 +54,6 @@ fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos,
 
 sal_Unicode SAL_CALL
 fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar)
-  throw(RuntimeException, MultipleCharsOutputException, std::exception)
 {
     sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
     if (newChar == 0xFFFF)
@@ -76,7 +74,6 @@ fullwidthKatakanaToHalfwidthKatakana::fullwidthKatakanaToHalfwidthKatakana()
  */
 OUString SAL_CALL
 fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     // Decomposition: GA --> KA + voice-mark
     const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
@@ -90,7 +87,6 @@ fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_
 
 sal_Unicode SAL_CALL
 fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar )
-  throw(RuntimeException, MultipleCharsOutputException, std::exception)
 {
     sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
     if (newChar == 0xFFFF)
@@ -111,7 +107,6 @@ fullwidthToHalfwidthLikeASC::fullwidthToHalfwidthLikeASC()
  */
 OUString SAL_CALL
 fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     // Decomposition: GA --> KA + voice-mark
     const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset);
@@ -126,7 +121,6 @@ fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 sta
 
 sal_Unicode SAL_CALL
 fullwidthToHalfwidthLikeASC::transliterateChar2Char( sal_Unicode inChar )
-  throw(RuntimeException, MultipleCharsOutputException, std::exception)
 {
     sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar);
     if (newChar == 0xFFFF)
diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
index f422dd387f85..c6aff7aa4870 100644
--- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx
+++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
@@ -37,7 +37,6 @@ halfwidthToFullwidth::halfwidthToFullwidth()
 
 OUString SAL_CALL
 halfwidthToFullwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     bool _useOffset = useOffset;
     // One to One mapping
@@ -59,7 +58,6 @@ halfwidthKatakanaToFullwidthKatakana::halfwidthKatakanaToFullwidthKatakana()
 
 OUString SAL_CALL
 halfwidthKatakanaToFullwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     bool _useOffset = useOffset;
     // One to One mapping
@@ -81,7 +79,6 @@ halfwidthToFullwidthLikeJIS::halfwidthToFullwidthLikeJIS()
 
 OUString SAL_CALL
 halfwidthToFullwidthLikeJIS::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     bool _useOffset = useOffset;
     // One to One mapping
diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
index 7f611bb007ef..8c83ed8f3ba9 100644
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
@@ -31,8 +31,6 @@ ignoreDiacritics_CTL::ignoreDiacritics_CTL()
 
 sal_Unicode SAL_CALL
 ignoreDiacritics_CTL::transliterateChar2Char(sal_Unicode nInChar)
-    throw(css::uno::RuntimeException,
-        css::i18n::MultipleCharsOutputException, std::exception)
 {
     if (!m_transliterator)
         throw css::uno::RuntimeException();
@@ -52,7 +50,6 @@ ignoreDiacritics_CTL::transliterateChar2Char(sal_Unicode nInChar)
 OUString SAL_CALL
 ignoreDiacritics_CTL::folding(const OUString& rInStr, sal_Int32 nStartPos,
     sal_Int32 nCount, css::uno::Sequence<sal_Int32>& rOffset)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (!m_transliterator)
         throw css::uno::RuntimeException();
diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
index 703db166f9be..642466c66185 100644
--- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
@@ -65,7 +65,6 @@ OneToOneMappingTable_t const IandE[] = {
 
 OUString SAL_CALL
 ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 1 now.
diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
index 6b01649e6290..08cdc76f1811 100644
--- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
@@ -81,7 +81,6 @@ OneToOneMappingTable_t const ignoreIterationMark_ja_JP_mappingTable[] = {
 
 OUString SAL_CALL
 ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     oneToOneMapping aTable(ignoreIterationMark_ja_JP_mappingTable, sizeof(ignoreIterationMark_ja_JP_mappingTable));
 
diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx
index 1e1707c1c6be..f73ebadabb61 100644
--- a/i18npool/source/transliteration/ignoreKana.cxx
+++ b/i18npool/source/transliteration/ignoreKana.cxx
@@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 OUString SAL_CALL
 ignoreKana::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     rtl::Reference< hiraganaToKatakana > t1(new hiraganaToKatakana);
     return t1->transliterate(inStr, startPos, nCount, offset);
@@ -38,7 +37,6 @@ ignoreKana::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount
 
 Sequence< OUString > SAL_CALL
 ignoreKana::transliterateRange( const OUString& str1, const OUString& str2 )
-  throw(RuntimeException, std::exception)
 {
     rtl::Reference< hiraganaToKatakana > t1(new hiraganaToKatakana);
     rtl::Reference< katakanaToHiragana > t2(new katakanaToHiragana);
@@ -47,7 +45,7 @@ ignoreKana::transliterateRange( const OUString& str1, const OUString& str2 )
 }
 
 sal_Unicode SAL_CALL
-ignoreKana::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception)
+ignoreKana::transliterateChar2Char( sal_Unicode inChar)
 {
     rtl::Reference< hiraganaToKatakana > t1(new hiraganaToKatakana);
     return t1->transliterateChar2Char(inChar);
diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
index f03af1054b3d..aae059ed95f9 100644
--- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
@@ -26,7 +26,6 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 OUString SAL_CALL
 ignoreKiKuFollowedBySa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 1 now.
diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
index a1ee6aaac9bb..11809b98251d 100644
--- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
@@ -288,7 +288,6 @@ static const sal_Unicode table_halfwidth[] = {
 
 OUString SAL_CALL
 ignoreProlongedSoundMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 1 now.
diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
index be2f4e84ee52..b463a2ae7c64 100644
--- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
@@ -28,7 +28,6 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 OUString SAL_CALL
 ignoreSize_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     rtl::Reference< smallToLarge_ja_JP > t1(new smallToLarge_ja_JP);
     return t1->transliterate(inStr, startPos, nCount, offset);
@@ -37,7 +36,6 @@ ignoreSize_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32
 
 Sequence< OUString > SAL_CALL
 ignoreSize_ja_JP::transliterateRange( const OUString& str1, const OUString& str2 )
-  throw(RuntimeException, std::exception)
 {
     rtl::Reference< smallToLarge_ja_JP > t1(new smallToLarge_ja_JP);
     rtl::Reference< largeToSmall_ja_JP > t2(new largeToSmall_ja_JP);
@@ -46,7 +44,7 @@ ignoreSize_ja_JP::transliterateRange( const OUString& str1, const OUString& str2
 }
 
 sal_Unicode SAL_CALL
-ignoreSize_ja_JP::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception)
+ignoreSize_ja_JP::transliterateChar2Char( sal_Unicode inChar)
 {
     rtl::Reference< smallToLarge_ja_JP > t1(new smallToLarge_ja_JP);
     return t1->transliterateChar2Char(inChar);
diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx
index 15f6815c2748..813f043f2050 100644
--- a/i18npool/source/transliteration/ignoreWidth.cxx
+++ b/i18npool/source/transliteration/ignoreWidth.cxx
@@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace i18n {
 
 OUString SAL_CALL
 ignoreWidth::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset )
-  throw(RuntimeException, std::exception)
 {
     rtl::Reference< fullwidthToHalfwidth > t1(new fullwidthToHalfwidth);
     return t1->transliterate(inStr, startPos, nCount, offset);
@@ -38,7 +37,6 @@ ignoreWidth::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCoun
 
 Sequence< OUString > SAL_CALL
 ignoreWidth::transliterateRange( const OUString& str1, const OUString& str2 )
-  throw(RuntimeException, std::exception)
 {
     rtl::Reference< fullwidthToHalfwidth > t1(new fullwidthToHalfwidth);
     rtl::Reference< halfwidthToFullwidth > t2(new halfwidthToFullwidth);
@@ -47,7 +45,7 @@ ignoreWidth::transliterateRange( const OUString& str1, const OUString& str2 )
 }
 
 sal_Unicode SAL_CALL
-ignoreWidth::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception)
+ignoreWidth::transliterateChar2Char( sal_Unicode inChar)
 {
     rtl::Reference< fullwidthToHalfwidth > t1(new fullwidthToHalfwidth);
     return t1->transliterateChar2Char(inChar);
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index d9f80f4a17f1..ee9a1534f4a5 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -26,7 +26,7 @@ using namespace com::sun::star::uno;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-sal_Int16 SAL_CALL TextToPronounce_zh::getType() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL TextToPronounce_zh::getType()
 {
     return TransliterationType::ONE_TO_ONE| TransliterationType::IGNORE;
 }
@@ -46,7 +46,7 @@ TextToPronounce_zh::getPronounce(const sal_Unicode ch)
 
 OUString SAL_CALL
 TextToPronounce_zh::folding(const OUString & inStr, sal_Int32 startPos,
-        sal_Int32 nCount, Sequence< sal_Int32 > & offset) throw (RuntimeException, std::exception)
+        sal_Int32 nCount, Sequence< sal_Int32 > & offset)
 {
     OUStringBuffer sb;
     const sal_Unicode * chArr = inStr.getStr() + startPos;
@@ -69,13 +69,13 @@ TextToPronounce_zh::folding(const OUString & inStr, sal_Int32 startPos,
 }
 
 OUString SAL_CALL
-TextToPronounce_zh::transliterateChar2String( sal_Unicode inChar) throw(RuntimeException, std::exception)
+TextToPronounce_zh::transliterateChar2String( sal_Unicode inChar)
 {
     return OUString(getPronounce(inChar));
 }
 
 sal_Unicode SAL_CALL
-TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception)
+TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar)
 {
     const sal_Unicode* pron=getPronounce(inChar);
     if (!pron || !pron[0])
@@ -88,7 +88,6 @@ TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeExc
 sal_Bool SAL_CALL
 TextToPronounce_zh::equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1,
         const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2)
-        throw (RuntimeException, std::exception)
 {
     sal_Int32 realCount;
     int i;  // loop variable
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index f9b58aed7637..0076f957a8e8 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -151,7 +151,7 @@ TransliterationImpl::~TransliterationImpl()
 
 // Methods
 OUString SAL_CALL
-TransliterationImpl::getName() throw(RuntimeException, std::exception)
+TransliterationImpl::getName()
 {
     if (numCascade == 1 && bodyCascade[0].is())
         return bodyCascade[0]->getName();
@@ -161,7 +161,7 @@ TransliterationImpl::getName() throw(RuntimeException, std::exception)
 }
 
 sal_Int16 SAL_CALL
-TransliterationImpl::getType() throw(RuntimeException, std::exception)
+TransliterationImpl::getType()
 {
     if (numCascade > 1)
         return (TransliterationType::CASCADE|TransliterationType::IGNORE);
@@ -172,7 +172,6 @@ TransliterationImpl::getType() throw(RuntimeException, std::exception)
 
 void SAL_CALL
 TransliterationImpl::loadModule( TransliterationModules modType, const Locale& rLocale )
-        throw(RuntimeException, std::exception)
 {
         clear();
     if (modType&TransliterationModules_IGNORE_MASK && modType&TransliterationModules_NON_IGNORE_MASK) {
@@ -212,7 +211,6 @@ TransliterationImpl::loadModule( TransliterationModules modType, const Locale& r
 
 void SAL_CALL
 TransliterationImpl::loadModuleNew( const Sequence < TransliterationModulesNew > & modType, const Locale& rLocale )
-  throw(RuntimeException, std::exception)
 {
     clear();
     sal_Int32 mask = 0, count = modType.getLength();
@@ -237,7 +235,6 @@ TransliterationImpl::loadModuleNew( const Sequence < TransliterationModulesNew >
 
 void SAL_CALL
 TransliterationImpl::loadModuleByImplName(const OUString& implName, const Locale& rLocale)
-  throw(RuntimeException, std::exception)
 {
     clear();
     if (loadModuleByName(implName, bodyCascade[numCascade], rLocale))
@@ -246,7 +243,7 @@ TransliterationImpl::loadModuleByImplName(const OUString& implName, const Locale
 
 
 void SAL_CALL
-TransliterationImpl::loadModulesByImplNames(const Sequence< OUString >& implNameList, const Locale& rLocale ) throw(RuntimeException, std::exception)
+TransliterationImpl::loadModulesByImplNames(const Sequence< OUString >& implNameList, const Locale& rLocale )
 {
     if (implNameList.getLength() > maxCascade || implNameList.getLength() <= 0)
         throw ERROR;
@@ -259,7 +256,7 @@ TransliterationImpl::loadModulesByImplNames(const Sequence< OUString >& implName
 
 
 Sequence<OUString> SAL_CALL
-TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException, std::exception)
+TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType )
 {
     const Sequence<OUString> &translist = mxLocaledata->getTransliterations(rLocale);
     Sequence<OUString> r(translist.getLength());
@@ -280,7 +277,7 @@ TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType
 
 OUString SAL_CALL
 TransliterationImpl::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-                    Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception)
+                    Sequence< sal_Int32 >& offset )
 {
     if (numCascade == 0)
         return inStr;
@@ -342,7 +339,7 @@ TransliterationImpl::transliterate( const OUString& inStr, sal_Int32 startPos, s
 
 OUString SAL_CALL
 TransliterationImpl::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception)
+        Sequence< sal_Int32 >& offset )
 {
     if (numCascade == 0)
         return inStr;
@@ -393,7 +390,7 @@ TransliterationImpl::folding( const OUString& inStr, sal_Int32 startPos, sal_Int
 }
 
 OUString SAL_CALL
-TransliterationImpl::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(RuntimeException, std::exception)
+TransliterationImpl::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
 {
     if (numCascade == 0)
         return inStr;
@@ -409,7 +406,7 @@ TransliterationImpl::transliterateString2String( const OUString& inStr, sal_Int3
 }
 
 OUString SAL_CALL
-TransliterationImpl::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException, std::exception)
+TransliterationImpl::transliterateChar2String( sal_Unicode inChar )
 {
     if (numCascade == 0)
         return OUString(&inChar, 1);
@@ -425,7 +422,7 @@ TransliterationImpl::transliterateChar2String( sal_Unicode inChar ) throw(Runtim
 }
 
 sal_Unicode SAL_CALL
-TransliterationImpl::transliterateChar2Char( sal_Unicode inChar ) throw(MultipleCharsOutputException, RuntimeException, std::exception)
+TransliterationImpl::transliterateChar2Char( sal_Unicode inChar )
 {
     sal_Unicode tmpChar = inChar;
     for (sal_Int32 i = 0; i < numCascade; i++)
@@ -438,7 +435,6 @@ sal_Bool SAL_CALL
 TransliterationImpl::equals(
     const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
     const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
-    throw(RuntimeException, std::exception)
 {
     // since this is an API function make it user fail safe
     if ( nCount1 < 0 ) {
@@ -499,7 +495,7 @@ TransliterationImpl::equals(
 
 Sequence< OUString > SAL_CALL
 TransliterationImpl::getRange(const Sequence< OUString > &inStrs,
-                const sal_Int32 length, sal_Int16 _numCascade) throw(RuntimeException)
+                const sal_Int32 length, sal_Int16 _numCascade)
 {
     if (_numCascade >= numCascade || ! bodyCascade[_numCascade].is())
         return inStrs;
@@ -522,7 +518,6 @@ TransliterationImpl::getRange(const Sequence< OUString > &inStrs,
 
 Sequence< OUString > SAL_CALL
 TransliterationImpl::transliterateRange( const OUString& str1, const OUString& str2 )
-throw(RuntimeException, std::exception)
 {
     if (numCascade == 1)
         return bodyCascade[0]->transliterateRange(str1, str2);
@@ -539,7 +534,6 @@ sal_Int32 SAL_CALL
 TransliterationImpl::compareSubstring(
     const OUString& str1, sal_Int32 off1, sal_Int32 len1,
     const OUString& str2, sal_Int32 off2, sal_Int32 len2)
-    throw(RuntimeException, std::exception)
 {
     if (caseignoreOnly && caseignore.is())
         return caseignore->compareSubstring(str1, off1, len1, str2, off2, len2);
@@ -564,7 +558,7 @@ TransliterationImpl::compareSubstring(
 
 
 sal_Int32 SAL_CALL
-TransliterationImpl::compareString(const OUString& str1, const OUString& str2 ) throw (RuntimeException, std::exception)
+TransliterationImpl::compareString(const OUString& str1, const OUString& str2 )
 {
     if (caseignoreOnly && caseignore.is())
         return caseignore->compareString(str1, str2);
@@ -596,7 +590,6 @@ namespace
 }
 
 void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTransliteration>& body )
-    throw (RuntimeException)
 {
     assert(!implName.isEmpty());
     ::osl::MutexGuard guard(theTransBodyMutex::get());
@@ -612,7 +605,7 @@ void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTrans
 
 bool SAL_CALL
 TransliterationImpl::loadModuleByName( const OUString& implName,
-        Reference<XExtendedTransliteration>& body, const Locale& rLocale) throw(RuntimeException)
+        Reference<XExtendedTransliteration>& body, const Locale& rLocale)
 {
     OUString cname = TRLT_IMPLNAME_PREFIX + implName;
     loadBody(cname, body);
@@ -640,19 +633,19 @@ TransliterationImpl::loadModuleByName( const OUString& implName,
 }
 
 OUString SAL_CALL
-TransliterationImpl::getImplementationName() throw( RuntimeException, std::exception )
+TransliterationImpl::getImplementationName()
 {
     return OUString("com.sun.star.i18n.Transliteration");
 }
 
 sal_Bool SAL_CALL
-TransliterationImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+TransliterationImpl::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-TransliterationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+TransliterationImpl::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.i18n.Transliteration" };
     return aRet;
diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx
index a0d9ebf8fab1..3d852afb8aea 100644
--- a/i18npool/source/transliteration/transliteration_Ignore.cxx
+++ b/i18npool/source/transliteration/transliteration_Ignore.cxx
@@ -27,7 +27,7 @@ inline sal_Int32 Min( sal_Int32 a, sal_Int32 b ) { return a > b ? b : a; }
 
 sal_Bool SAL_CALL
 transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
-        const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(RuntimeException, std::exception)
+        const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 )
 {
     Sequence< sal_Int32 > offset1;
     Sequence< sal_Int32 > offset2;
@@ -59,7 +59,7 @@ transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 n
 
 
 Sequence< OUString > SAL_CALL
-transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2 ) throw(RuntimeException, std::exception)
+transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2 )
 {
     if (str1.isEmpty() || str2.isEmpty())
         throw RuntimeException();
@@ -72,7 +72,7 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString
 
 
 sal_Int16 SAL_CALL
-transliteration_Ignore::getType() throw(RuntimeException, std::exception)
+transliteration_Ignore::getType()
 {
     // The type is also defined in com/sun/star/util/TransliterationType.hdl
     return TransliterationType::IGNORE;
@@ -81,7 +81,7 @@ transliteration_Ignore::getType() throw(RuntimeException, std::exception)
 
 OUString SAL_CALL
 transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        Sequence< sal_Int32 >& offset  ) throw(RuntimeException, std::exception)
+        Sequence< sal_Int32 >& offset  )
 {
     // The method folding is defined in a sub class.
     return this->folding( inStr, startPos, nCount, offset);
@@ -89,7 +89,7 @@ transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos
 
 Sequence< OUString > SAL_CALL
 transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2,
-        XTransliteration& t1, XTransliteration& t2 ) throw(RuntimeException)
+        XTransliteration& t1, XTransliteration& t2 )
 {
     if (str1.isEmpty() || str2.isEmpty())
         throw RuntimeException();
@@ -118,7 +118,6 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString
 OUString SAL_CALL
 transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos,
     sal_Int32 nCount, Sequence< sal_Int32 >& offset)
-    throw(RuntimeException, std::exception)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 1 now.
@@ -197,7 +196,7 @@ transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos,
 }
 
 sal_Unicode SAL_CALL
-transliteration_Ignore::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception)
+transliteration_Ignore::transliterateChar2Char( sal_Unicode inChar)
 {
     return func ? func( inChar) : table ? (*table)[ inChar ] : inChar;
 }
diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx
index 3ec34f92ed04..1d32fbae7805 100644
--- a/i18npool/source/transliteration/transliteration_Numeric.cxx
+++ b/i18npool/source/transliteration/transliteration_Numeric.cxx
@@ -29,28 +29,25 @@ using namespace com::sun::star::uno;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-sal_Int16 SAL_CALL transliteration_Numeric::getType() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL transliteration_Numeric::getType()
 {
     return TransliterationType::NUMERIC;
 }
 
 OUString SAL_CALL
     transliteration_Numeric::folding( const OUString& /*inStr*/, sal_Int32 /*startPos*/, sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/ )
-throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
 
 sal_Bool SAL_CALL
     transliteration_Numeric::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/ )
-throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
 
 Sequence< OUString > SAL_CALL
     transliteration_Numeric::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ )
-throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
@@ -61,7 +58,7 @@ throw(RuntimeException, std::exception)
 
 OUString SAL_CALL
 transliteration_Numeric::transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        Sequence< sal_Int32 >& offset ) throw(RuntimeException)
+        Sequence< sal_Int32 >& offset )
 {
     sal_Int32 number = -1, j = 0, endPos = startPos + nCount;
 
@@ -115,7 +112,7 @@ transliteration_Numeric::transliterateBullet( const OUString& inStr, sal_Int32 s
 
 OUString SAL_CALL
 transliteration_Numeric::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-        Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception)
+        Sequence< sal_Int32 >& offset )
 {
     if (tableSize)
         return transliterateBullet( inStr, startPos, nCount, offset);
@@ -124,7 +121,7 @@ transliteration_Numeric::transliterate( const OUString& inStr, sal_Int32 startPo
 }
 
 sal_Unicode SAL_CALL
-transliteration_Numeric::transliterateChar2Char( sal_Unicode inChar ) throw(RuntimeException, MultipleCharsOutputException, std::exception)
+transliteration_Numeric::transliterateChar2Char( sal_Unicode inChar )
 {
     if (tableSize) {
         if (isNumber(inChar)) {
diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx
index b6868a6941ca..978d7cf9cd7a 100644
--- a/i18npool/source/transliteration/transliteration_OneToOne.cxx
+++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx
@@ -23,7 +23,7 @@ using namespace com::sun::star::uno;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL transliteration_OneToOne::getType()
 {
         // This type is also defined in com/sun/star/util/TransliterationType.hdl
         return TransliterationType::ONE_TO_ONE;
@@ -31,7 +31,7 @@ sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException, s
 
 OUString SAL_CALL
 transliteration_OneToOne::folding( const OUString& /*inStr*/, sal_Int32 /*startPos*/,
-        sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/) throw(RuntimeException, std::exception)
+        sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/)
 {
         throw RuntimeException();
 }
@@ -39,14 +39,12 @@ transliteration_OneToOne::folding( const OUString& /*inStr*/, sal_Int32 /*startP
 sal_Bool SAL_CALL
 transliteration_OneToOne::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/,
         sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/ )
-        throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
 
 Sequence< OUString > SAL_CALL
 transliteration_OneToOne::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ )
-        throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
@@ -54,7 +52,6 @@ transliteration_OneToOne::transliterateRange( const OUString& /*str1*/, const OU
 OUString SAL_CALL
 transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startPos,
     sal_Int32 nCount, Sequence< sal_Int32 >& offset)
-    throw(RuntimeException, std::exception)
 {
     // Create a string buffer which can hold nCount + 1 characters.
     // The reference count is 1 now.
@@ -84,7 +81,7 @@ transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startP
 }
 
 sal_Unicode SAL_CALL
-transliteration_OneToOne::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception)
+transliteration_OneToOne::transliterateChar2Char( sal_Unicode inChar)
 {
     return func ? func( inChar) : (*table)[ inChar ];
 }
diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx
index b83539de36d9..8e8fa6bb56b1 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -46,7 +46,7 @@ Transliteration_body::Transliteration_body()
     implementationName = "com.sun.star.i18n.Transliteration.Transliteration_body";
 }
 
-sal_Int16 SAL_CALL Transliteration_body::getType() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL Transliteration_body::getType()
 {
     return TransliterationType::ONE_TO_ONE;
 }
@@ -54,14 +54,12 @@ sal_Int16 SAL_CALL Transliteration_body::getType() throw(RuntimeException, std::
 sal_Bool SAL_CALL Transliteration_body::equals(
     const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/,
     const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/)
-    throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
 
 Sequence< OUString > SAL_CALL
 Transliteration_body::transliterateRange( const OUString& str1, const OUString& str2 )
-    throw( RuntimeException, std::exception)
 {
     Sequence< OUString > ostr(2);
     ostr[0] = str1;
@@ -95,7 +93,6 @@ OUString SAL_CALL
 Transliteration_body::transliterate(
     const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
     Sequence< sal_Int32 >& offset)
-    throw(RuntimeException, std::exception)
 {
     const sal_Unicode *in = inStr.getStr() + startPos;
 
@@ -182,7 +179,7 @@ Transliteration_body::transliterate(
 }
 
 OUString SAL_CALL
-Transliteration_body::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException, std::exception)
+Transliteration_body::transliterateChar2String( sal_Unicode inChar )
 {
     const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType);
     rtl_uString* pStr = rtl_uString_alloc(map.nmap);
@@ -197,7 +194,7 @@ Transliteration_body::transliterateChar2String( sal_Unicode inChar ) throw(Runti
 }
 
 sal_Unicode SAL_CALL
-Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) throw(MultipleCharsOutputException, RuntimeException, std::exception)
+Transliteration_body::transliterateChar2Char( sal_Unicode inChar )
 {
     const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType);
     if (map.nmap > 1)
@@ -207,7 +204,7 @@ Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) throw(Multipl
 
 OUString SAL_CALL
 Transliteration_body::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
-    Sequence< sal_Int32 >& offset) throw(RuntimeException, std::exception)
+    Sequence< sal_Int32 >& offset)
 {
     return this->transliterate(inStr, startPos, nCount, offset);
 }
@@ -263,7 +260,6 @@ static OUString transliterate_titlecase_Impl(
     const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
     const Locale &rLocale,
     Sequence< sal_Int32 >& offset )
-    throw(RuntimeException)
 {
     const OUString aText( inStr.copy( startPos, nCount ) );
 
@@ -311,7 +307,6 @@ static OUString transliterate_titlecase_Impl(
 OUString SAL_CALL Transliteration_titlecase::transliterate(
     const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
     Sequence< sal_Int32 >& offset )
-    throw(RuntimeException, std::exception)
 {
     return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset );
 }
@@ -328,7 +323,6 @@ Transliteration_sentencecase::Transliteration_sentencecase()
 OUString SAL_CALL Transliteration_sentencecase::transliterate(
     const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
     Sequence< sal_Int32 >& offset )
-    throw(RuntimeException, std::exception)
 {
     return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset );
 }
diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx
index 77d5a80ea816..e6f0061efc8a 100644
--- a/i18npool/source/transliteration/transliteration_caseignore.cxx
+++ b/i18npool/source/transliteration/transliteration_caseignore.cxx
@@ -40,13 +40,12 @@ Transliteration_caseignore::Transliteration_caseignore()
 
 void SAL_CALL
 Transliteration_caseignore::loadModule( TransliterationModules modName, const Locale& rLocale )
-    throw(RuntimeException, std::exception)
 {
     moduleLoaded = (TransliterationModules) (moduleLoaded|modName);
     aLocale = rLocale;
 }
 
-sal_Int16 SAL_CALL Transliteration_caseignore::getType() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL Transliteration_caseignore::getType()
 {
     // It's NOT TransliterationType::ONE_TO_ONE because it's using casefolding
     return TransliterationType::IGNORE;
@@ -55,7 +54,6 @@ sal_Int16 SAL_CALL Transliteration_caseignore::getType() throw(RuntimeException,
 
 Sequence< OUString > SAL_CALL
 Transliteration_caseignore::transliterateRange( const OUString& str1, const OUString& str2 )
-    throw( RuntimeException, std::exception)
 {
     if (str1.getLength() != 1 || str2.getLength() != 1)
         throw RuntimeException();
@@ -90,7 +88,6 @@ sal_Bool SAL_CALL
 Transliteration_caseignore::equals(
     const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
     const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return (compare(str1, pos1, nCount1, nMatch1, str2, pos2, nCount2, nMatch2) == 0);
 }
@@ -99,7 +96,6 @@ sal_Int32 SAL_CALL
 Transliteration_caseignore::compareSubstring(
     const OUString& str1, sal_Int32 off1, sal_Int32 len1,
     const OUString& str2, sal_Int32 off2, sal_Int32 len2)
-    throw(RuntimeException, std::exception)
 {
     sal_Int32 nMatch1, nMatch2;
     return compare(str1, off1, len1, nMatch1, str2, off2, len2, nMatch2);
@@ -110,7 +106,6 @@ sal_Int32 SAL_CALL
 Transliteration_caseignore::compareString(
     const OUString& str1,
     const OUString& str2)
-    throw(RuntimeException, std::exception)
 {
     sal_Int32 nMatch1, nMatch2;
     return compare(str1, 0, str1.getLength(), nMatch1, str2, 0, str2.getLength(), nMatch2);
@@ -120,7 +115,6 @@ sal_Int32 SAL_CALL
 Transliteration_caseignore::compare(
     const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1,
     const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2)
-    throw(RuntimeException)
 {
     const sal_Unicode *unistr1 = const_cast<sal_Unicode*>(str1.getStr()) + pos1;
     const sal_Unicode *unistr2 = const_cast<sal_Unicode*>(str2.getStr()) + pos2;
diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx b/i18npool/source/transliteration/transliteration_commonclass.cxx
index e3895d48fa66..987f0f97f54a 100644
--- a/i18npool/source/transliteration/transliteration_commonclass.cxx
+++ b/i18npool/source/transliteration/transliteration_commonclass.cxx
@@ -33,13 +33,12 @@ transliteration_commonclass::transliteration_commonclass()
     useOffset = true;
 }
 
-OUString SAL_CALL transliteration_commonclass::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL transliteration_commonclass::getName()
 {
     return OUString::createFromAscii(transliterationName);
 }
 
 void SAL_CALL transliteration_commonclass::loadModule( TransliterationModules /*modName*/, const Locale& rLocale )
-throw(RuntimeException, std::exception)
 {
     aLocale = rLocale;
 }
@@ -47,7 +46,6 @@ throw(RuntimeException, std::exception)
 
 void SAL_CALL
 transliteration_commonclass::loadModuleNew( const Sequence < TransliterationModulesNew >& /*modName*/, const Locale& /*rLocale*/ )
-throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
@@ -55,21 +53,18 @@ throw(RuntimeException, std::exception)
 
 void SAL_CALL
 transliteration_commonclass::loadModuleByImplName( const OUString& /*implName*/, const Locale& /*rLocale*/ )
-throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
 
 void SAL_CALL
 transliteration_commonclass::loadModulesByImplNames(const Sequence< OUString >& /*modNamelist*/, const Locale& /*rLocale*/)
-throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
 
 Sequence< OUString > SAL_CALL
 transliteration_commonclass::getAvailableModules( const Locale& /*rLocale*/, sal_Int16 /*sType*/ )
-throw(RuntimeException, std::exception)
 {
     throw RuntimeException();
 }
@@ -78,7 +73,6 @@ sal_Int32 SAL_CALL
 transliteration_commonclass::compareSubstring(
         const OUString& str1, sal_Int32 off1, sal_Int32 len1,
         const OUString& str2, sal_Int32 off2, sal_Int32 len2)
-throw(RuntimeException, std::exception)
 {
     Sequence <sal_Int32> offset1(2*len1);
     Sequence <sal_Int32> offset2(2*len2);
@@ -105,13 +99,13 @@ throw(RuntimeException, std::exception)
 }
 
 sal_Int32 SAL_CALL
-transliteration_commonclass::compareString( const OUString& str1, const OUString& str2 ) throw ( RuntimeException, std::exception)
+transliteration_commonclass::compareString( const OUString& str1, const OUString& str2 )
 {
     return( this->compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength()));
 }
 
 OUString SAL_CALL
-transliteration_commonclass::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(RuntimeException, std::exception)
+transliteration_commonclass::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
 {
     Sequence < sal_Int32 > dummy_offset;
     useOffset = false;
@@ -121,22 +115,22 @@ transliteration_commonclass::transliterateString2String( const OUString& inStr,
 }
 
 OUString SAL_CALL
-transliteration_commonclass::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException, std::exception)
+transliteration_commonclass::transliterateChar2String( sal_Unicode inChar )
 {
     return transliteration_commonclass::transliterateString2String(OUString(&inChar, 1), 0, 1);
 }
 
-OUString SAL_CALL transliteration_commonclass::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL transliteration_commonclass::getImplementationName()
 {
     return OUString::createFromAscii(implementationName);
 }
 
-sal_Bool SAL_CALL transliteration_commonclass::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL transliteration_commonclass::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SAL_CALL transliteration_commonclass::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL transliteration_commonclass::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.i18n.Transliteration.l10n" };
     return aRet;
diff --git a/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx
index 88b32e3d3a68..22bce0925594 100644
--- a/i18nutil/source/utility/casefolding.cxx
+++ b/i18nutil/source/utility/casefolding.cxx
@@ -56,7 +56,7 @@ static bool cased_letter(sal_Unicode ch)
 // whenever there are more accents above.
 #define accent_above(ch) (((ch) >= 0x0300 && (ch) <= 0x0314) || ((ch) >= 0x033D && (ch) <= 0x0344) || (ch) == 0x0346 || ((ch) >= 0x034A && (ch) <= 0x034C))
 
-Mapping& casefolding::getConditionalValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, Locale& aLocale, MappingType nMappingType) throw (RuntimeException)
+Mapping& casefolding::getConditionalValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, Locale& aLocale, MappingType nMappingType)
 {
         switch(str[pos]) {
         case 0x03a3:
@@ -85,7 +85,7 @@ Mapping& casefolding::getConditionalValue(const sal_Unicode* str, sal_Int32 pos,
         throw RuntimeException();
 }
 
-Mapping& casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, Locale& aLocale, MappingType nMappingType) throw (RuntimeException)
+Mapping& casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, Locale& aLocale, MappingType nMappingType)
 {
     static Mapping dummy = { 0, 1, { 0, 0, 0 } };
     sal_Int16 address = CaseMappingIndex[str[pos] >> 8];
@@ -129,7 +129,7 @@ is_ja_voice_sound_mark(sal_Unicode& current, sal_Unicode next)
         return c != 0;
 }
 
-sal_Unicode casefolding::getNextChar(const sal_Unicode *str, sal_Int32& idx, sal_Int32 len, MappingElement& e, Locale& aLocale, MappingType nMappingType, TransliterationModules moduleLoaded) throw (RuntimeException)
+sal_Unicode casefolding::getNextChar(const sal_Unicode *str, sal_Int32& idx, sal_Int32 len, MappingElement& e, Locale& aLocale, MappingType nMappingType, TransliterationModules moduleLoaded)
 {
         if( idx >= len )
         {
diff --git a/idlc/inc/options.hxx b/idlc/inc/options.hxx
index 212faf3187d6..4c30bcc40db8 100644
--- a/idlc/inc/options.hxx
+++ b/idlc/inc/options.hxx
@@ -46,11 +46,9 @@ public:
     static bool checkCommandFile(std::vector< std::string > & rArgs, char const * filename);
 
     /// @throws IllegalArgument
-    bool initOptions(std::vector< std::string > & rArgs)
-        throw(IllegalArgument);
+    bool initOptions(std::vector< std::string > & rArgs);
     /// @throws IllegalArgument
-    static bool badOption(char const * reason, std::string const & rArg)
-        throw(IllegalArgument);
+    static bool badOption(char const * reason, std::string const & rArg);
     bool setOption(char const * option, std::string const & rArg);
 
     OString prepareHelp();
@@ -59,8 +57,7 @@ public:
     const OString&   getProgramName() const { return m_program;}
     bool                isValid(const OString& option);
     /// @throws IllegalArgument
-    const OString&   getOption(const OString& option)
-        throw( IllegalArgument );
+    const OString&   getOption(const OString& option);
 
     const std::vector< OString >& getInputFiles() const { return m_inputFiles; }
     bool readStdin() const { return m_stdin; }
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 0d02236cac47..794f7929ad33 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -174,7 +174,7 @@ bool Options::checkCommandFile (std::vector< std::string > & rArgs, char const *
     return (fclose(fp) == 0);
 }
 
-bool Options::badOption(char const * reason, std::string const & rArg) throw(IllegalArgument)
+bool Options::badOption(char const * reason, std::string const & rArg)
 {
   OStringBuffer message;
   if (reason != nullptr)
@@ -216,7 +216,7 @@ OString convertIncPathtoShortWindowsPath(const OString& incPath) {
 }
 #endif
 
-bool Options::initOptions(std::vector< std::string > & rArgs) throw(IllegalArgument)
+bool Options::initOptions(std::vector< std::string > & rArgs)
 {
   std::vector< std::string >::const_iterator first = rArgs.begin(), last = rArgs.end();
   for (; first != last; ++first)
@@ -427,7 +427,6 @@ bool Options::isValid(const OString& option)
 }
 
 const OString& Options::getOption(const OString& option)
-    throw( IllegalArgument )
 {
     if (!isValid(option))
     {
diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx
index 0d5b8b3b2d87..17a3d21143c3 100644
--- a/include/basegfx/tools/unopolypolygon.hxx
+++ b/include/basegfx/tools/unopolypolygon.hxx
@@ -46,30 +46,30 @@ namespace unotools
         explicit UnoPolyPolygon( const B2DPolyPolygon& );
 
         // XPolyPolygon2D
-        virtual void SAL_CALL addPolyPolygon( const css::geometry::RealPoint2D& position, const css::uno::Reference< css::rendering::XPolyPolygon2D >& polyPolygon ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getNumberOfPolygons(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getNumberOfPolygonPoints( ::sal_Int32 polygon ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::rendering::FillRule SAL_CALL getFillRule(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFillRule( css::rendering::FillRule fillRule ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isClosed( ::sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setClosed( ::sal_Int32 index, sal_Bool closedState ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addPolyPolygon( const css::geometry::RealPoint2D& position, const css::uno::Reference< css::rendering::XPolyPolygon2D >& polyPolygon ) override;
+        virtual ::sal_Int32 SAL_CALL getNumberOfPolygons(  ) override;
+        virtual ::sal_Int32 SAL_CALL getNumberOfPolygonPoints( ::sal_Int32 polygon ) override;
+        virtual css::rendering::FillRule SAL_CALL getFillRule(  ) override;
+        virtual void SAL_CALL setFillRule( css::rendering::FillRule fillRule ) override;
+        virtual sal_Bool SAL_CALL isClosed( ::sal_Int32 index ) override;
+        virtual void SAL_CALL setClosed( ::sal_Int32 index, sal_Bool closedState ) override;
 
         // XLinePolyPolygon2D
-        virtual css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > > SAL_CALL getPoints( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPoints( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points, ::sal_Int32 nPolygonIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::geometry::RealPoint2D SAL_CALL getPoint( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPoint( const css::geometry::RealPoint2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > > SAL_CALL getPoints( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) override;
+        virtual void SAL_CALL setPoints( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points, ::sal_Int32 nPolygonIndex ) override;
+        virtual css::geometry::RealPoint2D SAL_CALL getPoint( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) override;
+        virtual void SAL_CALL setPoint( const css::geometry::RealPoint2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) override;
 
         // XBezierPolyPolygon2D
-        virtual css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > > SAL_CALL getBezierSegments( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBezierSegments( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points, ::sal_Int32 nPolygonIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::geometry::RealBezierSegment2D SAL_CALL getBezierSegment( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBezierSegment( const css::geometry::RealBezierSegment2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > > SAL_CALL getBezierSegments( ::sal_Int32 nPolygonIndex, ::sal_Int32 nNumberOfPolygons, ::sal_Int32 nPointIndex, ::sal_Int32 nNumberOfPoints ) override;
+        virtual void SAL_CALL setBezierSegments( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points, ::sal_Int32 nPolygonIndex ) override;
+        virtual css::geometry::RealBezierSegment2D SAL_CALL getBezierSegment( ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) override;
+        virtual void SAL_CALL setBezierSegment( const css::geometry::RealBezierSegment2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         B2DPolyPolygon getPolyPolygon() const;
 
diff --git a/include/basegfx/tools/unotools.hxx b/include/basegfx/tools/unotools.hxx
index 8d28ec82aaf7..fe9d18f191b2 100644
--- a/include/basegfx/tools/unotools.hxx
+++ b/include/basegfx/tools/unotools.hxx
@@ -26,8 +26,7 @@ class B2DPolyPolygon;
 namespace unotools
 {
     /// @throws css::lang::IllegalArgumentException
-    BASEGFX_DLLPUBLIC B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const css::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon)
-        throw( css::lang::IllegalArgumentException );
+    BASEGFX_DLLPUBLIC B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const css::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon);
 
     BASEGFX_DLLPUBLIC void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
                                             css::drawing::PolyPolygonBezierCoords& rRetval );
diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx
index 2a6a304e0169..0aee5d237c0f 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -36,8 +36,8 @@ public:
 
 // UNO interface
 public:
-    virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override { return m_lContinuations; }
-    css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override
+    virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() override { return m_lContinuations; }
+    css::uno::Any SAL_CALL getRequest() override
     {
         return m_aRequest;
     }
diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx
index 7b73477b64cb..55d156edf474 100644
--- a/include/canvas/base/bitmapcanvasbase.hxx
+++ b/include/canvas/base/bitmapcanvasbase.hxx
@@ -68,20 +68,20 @@ namespace canvas
         typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >    BaseType;
 
         // XBitmap
-        virtual css::geometry::IntegerSize2D SAL_CALL getSize(  ) throw (css::uno::RuntimeException) override
+        virtual css::geometry::IntegerSize2D SAL_CALL getSize(  ) override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
             return BaseType::maCanvasHelper.getSize();
         }
 
-        virtual sal_Bool SAL_CALL hasAlpha(  ) throw (css::uno::RuntimeException) override
+        virtual sal_Bool SAL_CALL hasAlpha(  ) override
         {
             return true;
         }
 
         virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize,
-                                                                                                                   sal_Bool                                      beFast ) throw (css::uno::RuntimeException, std::exception) override
+                                                                                                                   sal_Bool                                      beFast ) override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
@@ -107,8 +107,7 @@ namespace canvas
                                         const css::rendering::RenderState&                                         sourceRenderState,
                                         const css::geometry::RealRectangle2D&                                      destRect,
                                         const css::rendering::ViewState&                                           destViewState,
-                                        const css::rendering::RenderState&                                         destRenderState ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                         css::uno::RuntimeException) override
+                                        const css::rendering::RenderState&                                         destRenderState ) override
         {
             tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState,
                               destRect, destViewState, destRenderState,
diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx
index fb63de688739..77df5197f89a 100644
--- a/include/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/include/canvas/base/bufferedgraphicdevicebase.hxx
@@ -93,34 +93,31 @@ namespace canvas
         }
 
         // XGraphicDevice
-        virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController(  ) throw (css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController(  ) override
         {
             return this;
         }
 
         // XBufferController
-        virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (css::lang::IllegalArgumentException,
-                                                                                  css::uno::RuntimeException) override
+        virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) override
         {
             tools::verifyRange( nBuffers, (sal_Int32)1 );
 
             return 1;
         }
 
-        virtual void SAL_CALL destroyBuffers(  ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL destroyBuffers(  ) override
         {
         }
 
-        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll )
-            throw (css::uno::RuntimeException,
-                   std::exception) override
+        virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
             return BaseType::maDeviceHelper.showBuffer( mbIsVisible, bUpdateAll );
         }
 
-        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
@@ -216,7 +213,7 @@ namespace canvas
         }
 
         // XWindowListener
-        virtual void disposeEventSource( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override
+        virtual void disposeEventSource( const css::lang::EventObject& Source ) override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
@@ -226,24 +223,24 @@ namespace canvas
             BaseType::disposeEventSource(Source);
         }
 
-        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override
         {
             boundsChanged( e );
         }
 
-        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override
         {
             boundsChanged( e );
         }
 
-        virtual void SAL_CALL windowShown( const css::lang::EventObject& ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL windowShown( const css::lang::EventObject& ) override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
             mbIsVisible = true;
         }
 
-        virtual void SAL_CALL windowHidden( const css::lang::EventObject& ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL windowHidden( const css::lang::EventObject& ) override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 8fb1ac04639c..65811c33e0e4 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -60,12 +60,12 @@ namespace canvas
         virtual void SAL_CALL disposing() override;
 
         // XCachedPrimitive
-        virtual ::sal_Int8 SAL_CALL redraw( const css::rendering::ViewState& aState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int8 SAL_CALL redraw( const css::rendering::ViewState& aState ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     protected:
         virtual ~CachedPrimitiveBase() override; // we're a ref-counted UNO class. _We_ destroy ourselves.
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index cf30aabc8c6a..ce9ea3fbccff 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -122,7 +122,7 @@ namespace canvas
         }
 
         // XCanvas
-        virtual void SAL_CALL clear() throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL clear() override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
@@ -133,10 +133,7 @@ namespace canvas
 
         virtual void SAL_CALL drawPoint(const css::geometry::RealPoint2D&     aPoint,
                                         const css::rendering::ViewState&      viewState,
-                                        const css::rendering::RenderState&    renderState)
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException,
-                   std::exception) override
+                                        const css::rendering::RenderState&    renderState) override
         {
             tools::verifyArgs(aPoint, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -150,10 +147,7 @@ namespace canvas
         virtual void SAL_CALL drawLine(const css::geometry::RealPoint2D&  aStartPoint,
                                        const css::geometry::RealPoint2D&  aEndPoint,
                                        const css::rendering::ViewState&   viewState,
-                                       const css::rendering::RenderState& renderState)
-                                            throw (css::lang::IllegalArgumentException,
-                                                   css::uno::RuntimeException,
-                                                   std::exception) override
+                                       const css::rendering::RenderState& renderState) override
         {
             tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -169,10 +163,7 @@ namespace canvas
         virtual void SAL_CALL drawBezier( const css::geometry::RealBezierSegment2D&    aBezierSegment,
                                           const css::geometry::RealPoint2D&            aEndPoint,
                                           const css::rendering::ViewState&             viewState,
-                                          const css::rendering::RenderState&           renderState )
-                                            throw (css::lang::IllegalArgumentException,
-                                                   css::uno::RuntimeException,
-                                                   std::exception) override
+                                          const css::rendering::RenderState&           renderState ) override
         {
             tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -188,10 +179,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
             drawPolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
                             const css::rendering::ViewState&                             viewState,
-                            const css::rendering::RenderState&                           renderState)
-                                throw (css::lang::IllegalArgumentException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override
+                            const css::rendering::RenderState&                           renderState) override
         {
             tools::verifyArgs(xPolyPolygon, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -208,10 +196,7 @@ namespace canvas
             strokePolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >&   xPolyPolygon,
                               const css::rendering::ViewState&                               viewState,
                               const css::rendering::RenderState&                             renderState,
-                              const css::rendering::StrokeAttributes&                        strokeAttributes)
-                                throw (css::lang::IllegalArgumentException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override
+                              const css::rendering::StrokeAttributes&                        strokeAttributes) override
         {
             tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
                               OSL_THIS_FUNC,
@@ -229,8 +214,7 @@ namespace canvas
                                        const css::rendering::ViewState&                               viewState,
                                        const css::rendering::RenderState&                             renderState,
                                        const css::uno::Sequence< css::rendering::Texture >&           textures,
-                                       const css::rendering::StrokeAttributes&                        strokeAttributes ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                          css::uno::RuntimeException) override
+                                       const css::rendering::StrokeAttributes&                        strokeAttributes ) override
         {
             tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
                               OSL_THIS_FUNC,
@@ -249,8 +233,7 @@ namespace canvas
                                             const css::rendering::RenderState&                            renderState,
                                             const css::uno::Sequence< css::rendering::Texture >&          textures,
                                             const css::uno::Reference< css::geometry::XMapping2D >&       xMapping,
-                                            const css::rendering::StrokeAttributes&                       strokeAttributes ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                              css::uno::RuntimeException) override
+                                            const css::rendering::StrokeAttributes&                       strokeAttributes ) override
         {
             tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes,
                               OSL_THIS_FUNC,
@@ -267,8 +250,7 @@ namespace canvas
             queryStrokeShapes( const css::uno::Reference< css::rendering::XPolyPolygon2D >&                xPolyPolygon,
                                const css::rendering::ViewState&                                            viewState,
                                const css::rendering::RenderState&                                          renderState,
-                               const css::rendering::StrokeAttributes&                                     strokeAttributes ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                  css::uno::RuntimeException) override
+                               const css::rendering::StrokeAttributes&                                     strokeAttributes ) override
         {
             tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
                               OSL_THIS_FUNC,
@@ -284,10 +266,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
             fillPolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >&               xPolyPolygon,
                              const css::rendering::ViewState&                                          viewState,
-                             const css::rendering::RenderState&                                        renderState)
-                                throw (css::lang::IllegalArgumentException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override
+                             const css::rendering::RenderState&                                        renderState) override
         {
             tools::verifyArgs(xPolyPolygon, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -304,10 +283,7 @@ namespace canvas
             fillTexturedPolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
                                     const css::rendering::ViewState&                             viewState,
                                     const css::rendering::RenderState&                           renderState,
-                                    const css::uno::Sequence< css::rendering::Texture >&         textures)
-                                        throw (css::lang::IllegalArgumentException,
-                                               css::uno::RuntimeException,
-                                               std::exception) override
+                                    const css::uno::Sequence< css::rendering::Texture >&         textures) override
         {
             tools::verifyArgs(xPolyPolygon, viewState, renderState, textures,
                               OSL_THIS_FUNC,
@@ -325,7 +301,7 @@ namespace canvas
                                           const css::rendering::ViewState&                                viewState,
                                           const css::rendering::RenderState&                              renderState,
                                           const css::uno::Sequence< css::rendering::Texture >&            textures,
-                                          const css::uno::Reference< css::geometry::XMapping2D >&         xMapping ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override
+                                          const css::uno::Reference< css::geometry::XMapping2D >&         xMapping ) override
         {
             tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping,
                               OSL_THIS_FUNC,
@@ -342,8 +318,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL
             createFont( const css::rendering::FontRequest&                                     fontRequest,
                         const css::uno::Sequence< css::beans::PropertyValue >&                 extraFontProperties,
-                        const css::geometry::Matrix2D&                                         fontMatrix ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                css::uno::RuntimeException) override
+                        const css::geometry::Matrix2D&                                         fontMatrix ) override
         {
             tools::verifyArgs(fontRequest,
                               // dummy, to keep argPos in sync
@@ -360,8 +335,7 @@ namespace canvas
 
         virtual css::uno::Sequence< css::rendering::FontInfo > SAL_CALL
             queryAvailableFonts( const css::rendering::FontInfo&                          aFilter,
-                                 const css::uno::Sequence< css::beans::PropertyValue >&   aFontProperties ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                             css::uno::RuntimeException) override
+                                 const css::uno::Sequence< css::beans::PropertyValue >&   aFontProperties ) override
         {
             tools::verifyArgs(aFilter,
                               OSL_THIS_FUNC,
@@ -378,10 +352,7 @@ namespace canvas
                      const css::uno::Reference< css::rendering::XCanvasFont >&                xFont,
                      const css::rendering::ViewState&                                         viewState,
                      const css::rendering::RenderState&                                       renderState,
-                     sal_Int8                                                                 textDirection)
-                throw (css::lang::IllegalArgumentException,
-                       css::uno::RuntimeException,
-                       std::exception) override
+                     sal_Int8                                                                 textDirection) override
         {
             tools::verifyArgs(xFont, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -401,10 +372,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
             drawTextLayout(const css::uno::Reference< css::rendering::XTextLayout >&               laidOutText,
                             const css::rendering::ViewState&                                       viewState,
-                            const css::rendering::RenderState&                                     renderState)
-                            throw (css::lang::IllegalArgumentException,
-                                   css::uno::RuntimeException,
-                                   std::exception) override
+                            const css::rendering::RenderState&                                     renderState) override
         {
             tools::verifyArgs(laidOutText, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -421,7 +389,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
             drawBitmap( const css::uno::Reference< css::rendering::XBitmap >&              xBitmap,
                         const css::rendering::ViewState&                                   viewState,
-                        const css::rendering::RenderState&                                 renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override
+                        const css::rendering::RenderState&                                 renderState ) override
         {
             tools::verifyArgs(xBitmap, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -437,7 +405,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
             drawBitmapModulated( const css::uno::Reference< css::rendering::XBitmap >&                 xBitmap,
                                  const css::rendering::ViewState&                                      viewState,
-                                 const css::rendering::RenderState&                                    renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override
+                                 const css::rendering::RenderState&                                    renderState ) override
         {
             tools::verifyArgs(xBitmap, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -451,7 +419,7 @@ namespace canvas
         }
 
         virtual css::uno::Reference< css::rendering::XGraphicDevice >   SAL_CALL
-            getDevice() throw (css::uno::RuntimeException) override
+            getDevice() override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index 4e4175c70287..470c3d8e2df5 100644
--- a/include/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
@@ -102,7 +102,7 @@ namespace canvas
         }
 
         // XCanvas: selectively override base's methods here, for opacity tracking
-        virtual void SAL_CALL clear() throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL clear() override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
@@ -115,8 +115,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
             drawBitmap( const css::uno::Reference< css::rendering::XBitmap >&              xBitmap,
                         const css::rendering::ViewState&                                   viewState,
-                        const css::rendering::RenderState&                                 renderState ) throw (css::lang::IllegalArgumentException,
-                                                                                                                             css::uno::RuntimeException) override
+                        const css::rendering::RenderState&                                 renderState ) override
         {
             tools::verifyArgs(xBitmap, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -140,8 +139,7 @@ namespace canvas
         // functionality provided at the baseclass.
 
         // XSprite
-        virtual void SAL_CALL setAlpha( double alpha ) throw (css::lang::IllegalArgumentException,
-                                                              css::uno::RuntimeException) override
+        virtual void SAL_CALL setAlpha( double alpha ) override
         {
             tools::verifyRange( alpha, 0.0, 1.0 );
 
@@ -152,8 +150,7 @@ namespace canvas
 
         virtual void SAL_CALL move( const css::geometry::RealPoint2D&  aNewPos,
                                     const css::rendering::ViewState&   viewState,
-                                    const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException,
-                                                                                                         css::uno::RuntimeException) override
+                                    const css::rendering::RenderState& renderState ) override
         {
             tools::verifyArgs(aNewPos, viewState, renderState,
                               OSL_THIS_FUNC,
@@ -164,8 +161,7 @@ namespace canvas
             maSpriteHelper.move( this, aNewPos, viewState, renderState );
         }
 
-        virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) throw (css::lang::IllegalArgumentException,
-                                                                                                                    css::uno::RuntimeException) override
+        virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) override
         {
             tools::verifyArgs(aTransformation,
                               OSL_THIS_FUNC,
@@ -176,7 +172,7 @@ namespace canvas
             maSpriteHelper.transform( this, aTransformation );
         }
 
-        virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) override
         {
             // NULL xClip explicitly allowed here (to clear clipping)
 
@@ -185,21 +181,21 @@ namespace canvas
             maSpriteHelper.clip( this, aClip );
         }
 
-        virtual void SAL_CALL setPriority( double nPriority ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL setPriority( double nPriority ) override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
             maSpriteHelper.setPriority( this, nPriority );
         }
 
-        virtual void SAL_CALL show() throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL show() override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
             maSpriteHelper.show( this );
         }
 
-        virtual void SAL_CALL hide() throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL hide() override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
@@ -208,7 +204,7 @@ namespace canvas
 
         // XCustomSprite
         virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL
-            getContentCanvas() throw (css::uno::RuntimeException) override
+            getContentCanvas() override
         {
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
 
diff --git a/include/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx
index ca9d36fa25fb..4a89d83e3525 100644
--- a/include/canvas/base/disambiguationhelper.hxx
+++ b/include/canvas/base/disambiguationhelper.hxx
@@ -62,7 +62,7 @@ namespace canvas
         virtual void disposeThis()
         {}
         /// @throws css::uno::RuntimeException
-        virtual void disposeEventSource( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
+        virtual void disposeEventSource( const css::lang::EventObject& )
         {}
 
         mutable ::osl::Mutex m_aMutex;
@@ -71,7 +71,7 @@ namespace canvas
         virtual void SAL_CALL disposing() override
         { disposeThis(); }
 
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override
         { disposeEventSource(Source); }
 
     };
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index 28c208a1d296..df7a2c4bc2e3 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -141,50 +141,47 @@ namespace canvas
         }
 
         // XGraphicDevice
-        virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController(  ) throw (css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController(  ) override
         {
             return css::uno::Reference< css::rendering::XBufferController >();
         }
 
-        virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getDeviceColorSpace(  ) throw (css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getDeviceColorSpace(  ) override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
             return maDeviceHelper.getColorSpace();
         }
 
-        virtual css::geometry::RealSize2D SAL_CALL getPhysicalResolution() throw (css::uno::RuntimeException, std::exception) override
+        virtual css::geometry::RealSize2D SAL_CALL getPhysicalResolution() override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
             return maDeviceHelper.getPhysicalResolution();
         }
 
-        virtual css::geometry::RealSize2D SAL_CALL getPhysicalSize() throw (css::uno::RuntimeException, std::exception) override
+        virtual css::geometry::RealSize2D SAL_CALL getPhysicalSize() override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
             return maDeviceHelper.getPhysicalSize();
         }
 
-        virtual css::uno::Reference< css::rendering::XLinePolyPolygon2D > SAL_CALL createCompatibleLinePolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points ) throw (css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XLinePolyPolygon2D > SAL_CALL createCompatibleLinePolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points ) override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
             return maDeviceHelper.createCompatibleLinePolyPolygon( this, points );
         }
 
-        virtual css::uno::Reference< css::rendering::XBezierPolyPolygon2D > SAL_CALL createCompatibleBezierPolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points ) throw (css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XBezierPolyPolygon2D > SAL_CALL createCompatibleBezierPolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points ) override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
             return maDeviceHelper.createCompatibleBezierPolyPolygon( this, points );
         }
 
-        virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const css::geometry::IntegerSize2D& size )
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException,
-                   std::exception) override
+        virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const css::geometry::IntegerSize2D& size ) override
         {
             tools::verifyBitmapSize(size,
                                     OSL_THIS_FUNC,
@@ -195,8 +192,7 @@ namespace canvas
             return maDeviceHelper.createCompatibleBitmap( this, size );
         }
 
-        virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                                                               css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const css::geometry::IntegerSize2D& size ) override
         {
             tools::verifyBitmapSize(size,
                                     OSL_THIS_FUNC,
@@ -207,10 +203,7 @@ namespace canvas
             return maDeviceHelper.createVolatileBitmap( this, size );
         }
 
-        virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size )
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException,
-                   std::exception) override
+        virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size ) override
         {
             tools::verifyBitmapSize(size,
                                     OSL_THIS_FUNC,
@@ -221,8 +214,7 @@ namespace canvas
             return maDeviceHelper.createCompatibleAlphaBitmap( this, size );
         }
 
-        virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                                                                    css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const css::geometry::IntegerSize2D& size ) override
         {
             tools::verifyBitmapSize(size,
                                     OSL_THIS_FUNC,
@@ -233,23 +225,23 @@ namespace canvas
             return maDeviceHelper.createVolatileAlphaBitmap( this, size );
         }
 
-        virtual css::uno::Reference< css::lang::XMultiServiceFactory > SAL_CALL getParametricPolyPolygonFactory(  ) throw (css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::lang::XMultiServiceFactory > SAL_CALL getParametricPolyPolygonFactory(  ) override
         {
             return this;
         }
 
-        virtual sal_Bool SAL_CALL hasFullScreenMode(  ) throw (css::uno::RuntimeException) override
+        virtual sal_Bool SAL_CALL hasFullScreenMode(  ) override
         {
             return false;
         }
 
-        virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool ) throw (css::uno::RuntimeException) override
+        virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool ) override
         {
             return false;
         }
 
         // XMultiServiceFactory
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override
         {
             return css::uno::Reference< css::rendering::XParametricPolyPolygon2D >(
                 ParametricPolyPolygon::create(this,
@@ -257,7 +249,7 @@ namespace canvas
                                               css::uno::Sequence< css::uno::Any >()));
         }
 
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& aServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& aServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override
         {
             return css::uno::Reference< css::rendering::XParametricPolyPolygon2D >(
                 ParametricPolyPolygon::create(this,
@@ -265,14 +257,14 @@ namespace canvas
                                               Arguments));
         }
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException) override
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override
         {
             return ParametricPolyPolygon::getAvailableServiceNames();
         }
 
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL update() override
         {
             MutexType aGuard( BaseType::m_aMutex );
 
@@ -282,37 +274,27 @@ namespace canvas
 
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override
         {
             MutexType aGuard( BaseType::m_aMutex );
             return maPropHelper.getPropertySetInfo();
         }
 
         virtual void SAL_CALL setPropertyValue( const OUString&                   aPropertyName,
-                                                const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException,
-                                                                                     css::beans::PropertyVetoException,
-                                                                                     css::lang::IllegalArgumentException,
-                                                                                     css::lang::WrappedTargetException,
-                                                                                     css::uno::RuntimeException,
-                                                                                     std::exception) override
+                                                const css::uno::Any& aValue ) override
         {
             MutexType aGuard( BaseType::m_aMutex );
             maPropHelper.setPropertyValue( aPropertyName, aValue );
         }
 
-        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException,
-                                                                                                css::lang::WrappedTargetException,
-                                                                                                css::uno::RuntimeException,
-                                                                                                std::exception) override
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& aPropertyName ) override
         {
             MutexType aGuard( BaseType::m_aMutex );
             return maPropHelper.getPropertyValue( aPropertyName );
         }
 
         virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName,
-                                                         const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
-                                                                                                                                                                        css::lang::WrappedTargetException,
-                                                                                                                                                                        css::uno::RuntimeException) override
+                                                         const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override
         {
             MutexType aGuard( BaseType::m_aMutex );
             maPropHelper.addPropertyChangeListener( aPropertyName,
@@ -320,16 +302,12 @@ namespace canvas
         }
 
         virtual void SAL_CALL removePropertyChangeListener( const OUString& ,
-                                                            const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw (css::beans::UnknownPropertyException,
-                                                                                                                                                                           css::lang::WrappedTargetException,
-                                                                                                                                                                           css::uno::RuntimeException) override
+                                                            const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override
         {
         }
 
         virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName,
-                                                         const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
-                                                                                                                                                                        css::lang::WrappedTargetException,
-                                                                                                                                                                        css::uno::RuntimeException) override
+                                                         const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener ) override
         {
             MutexType aGuard( BaseType::m_aMutex );
             maPropHelper.addVetoableChangeListener( aPropertyName,
@@ -337,9 +315,7 @@ namespace canvas
         }
 
         virtual void SAL_CALL removeVetoableChangeListener( const OUString& ,
-                                                            const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw (css::beans::UnknownPropertyException,
-                                                                                                                                                                           css::lang::WrappedTargetException,
-                                                                                                                                                                           css::uno::RuntimeException) override
+                                                            const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override
         {
         }
 
diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 4cc2af209cd7..ecebd5794a3f 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -42,7 +42,7 @@ namespace canvas
     public:
         // XIntegerBitmap
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout&     bitmapLayout,
-                                                                              const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
+                                                                              const css::geometry::IntegerRectangle2D& rect ) override
         {
             tools::verifyArgs(rect,
                               OSL_THIS_FUNC,
@@ -57,7 +57,7 @@ namespace canvas
 
         virtual void SAL_CALL setData( const css::uno::Sequence< sal_Int8 >&,
                                        const css::rendering::IntegerBitmapLayout& bitmapLayout,
-                                       const css::geometry::IntegerRectangle2D&   rect ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
+                                       const css::geometry::IntegerRectangle2D&   rect ) override
         {
             tools::verifyArgs(bitmapLayout, rect,
                               OSL_THIS_FUNC,
@@ -71,7 +71,7 @@ namespace canvas
 
         virtual void SAL_CALL setPixel( const css::uno::Sequence< sal_Int8 >&,
                                         const css::rendering::IntegerBitmapLayout& bitmapLayout,
-                                        const css::geometry::IntegerPoint2D&       pos ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
+                                        const css::geometry::IntegerPoint2D&       pos ) override
         {
             tools::verifyArgs(bitmapLayout, pos,
                               OSL_THIS_FUNC,
@@ -84,7 +84,7 @@ namespace canvas
         }
 
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout,
-                                                                  const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
+                                                                  const css::geometry::IntegerPoint2D& pos ) override
         {
             tools::verifyArgs(pos,
                               OSL_THIS_FUNC,
@@ -97,7 +97,7 @@ namespace canvas
                                                       pos );
         }
 
-        virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout(  ) throw (css::uno::RuntimeException) override
+        virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout(  ) override
         {
             typename Base::MutexType aGuard( Base::m_aMutex );
 
diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx
index 41c1c3880669..044a279c061e 100644
--- a/include/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
@@ -88,8 +88,7 @@ namespace canvas
         }
 
         // XSpriteCanvas
-        virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                                                                                                           css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) override
         {
             tools::verifyArgs(animation,
                               OSL_THIS_FUNC,
@@ -101,9 +100,7 @@ namespace canvas
         }
 
         virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps,
-                                                                                                                                   sal_Int8                                                                                                           interpolationMode ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                                                                                                                                                 css::rendering::VolatileContentDestroyedException,
-                                                                                                                                                                                                                                                                                 css::uno::RuntimeException) override
+                                                                                                                                   sal_Int8                                                                                                           interpolationMode ) override
         {
             tools::verifyArgs(animationBitmaps,
                               OSL_THIS_FUNC,
@@ -117,8 +114,7 @@ namespace canvas
             return BaseType::maCanvasHelper.createSpriteFromBitmaps(animationBitmaps, interpolationMode);
         }
 
-        virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                                                              css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) override
         {
             tools::verifySpriteSize(spriteSize,
                                     OSL_THIS_FUNC,
@@ -129,8 +125,7 @@ namespace canvas
             return BaseType::maCanvasHelper.createCustomSprite(spriteSize);
         }
 
-        virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) throw (css::lang::IllegalArgumentException,
-                                                                                                                                                                                                                        css::uno::RuntimeException) override
+        virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) override
         {
             tools::verifyArgs(original,
                               OSL_THIS_FUNC,
diff --git a/include/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx
index 10b563eb62fd..396b42094ede 100644
--- a/include/canvas/parametricpolypolygon.hxx
+++ b/include/canvas/parametricpolypolygon.hxx
@@ -100,15 +100,15 @@ namespace canvas
         virtual void SAL_CALL disposing() override;
 
         // XParametricPolyPolygon2D
-        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL getOutline( double t ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL getColor( double t ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL getPointColor( const css::geometry::RealPoint2D& point ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL getOutline( double t ) override;
+        virtual css::uno::Sequence< double > SAL_CALL getColor( double t ) override;
+        virtual css::uno::Sequence< double > SAL_CALL getPointColor( const css::geometry::RealPoint2D& point ) override;
+        virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// Query all defining values of this object atomically
         Values getValues() const;
diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx
index 019f09803b5e..06f026fc0532 100644
--- a/include/codemaker/options.hxx
+++ b/include/codemaker/options.hxx
@@ -46,16 +46,14 @@ public:
     virtual ~Options();
 
     /// @throws IllegalArgument
-    virtual bool initOptions(int ac, char* av[], bool bCmdFile=false)
-        throw( IllegalArgument ) = 0;
+    virtual bool initOptions(int ac, char* av[], bool bCmdFile=false) = 0;
 
     virtual ::rtl::OString  prepareHelp() = 0;
 
     const ::rtl::OString&   getProgramName() const { return m_program;}
     bool                isValid(const ::rtl::OString& option) const;
     /// @throws IllegalArgument
-    const OString&      getOption(const ::rtl::OString& option) const
-        throw( IllegalArgument );
+    const OString&      getOption(const ::rtl::OString& option) const;
 
     const StringVector& getInputFiles() { return m_inputFiles;}
 
diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx
index 8135a77d1aed..85a7f0b41828 100644
--- a/include/comphelper/ChainablePropertySet.hxx
+++ b/include/comphelper/ChainablePropertySet.hxx
@@ -68,84 +68,54 @@ namespace comphelper
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        virtual void _preSetValues ()
-            throw (css::beans::UnknownPropertyException,
-                   css::beans::PropertyVetoException,
-                   css::lang::IllegalArgumentException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException) = 0;
+        virtual void _preSetValues () = 0;
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        virtual void _setSingleValue(const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue)
-            throw (css::beans::UnknownPropertyException,
-                   css::beans::PropertyVetoException,
-                   css::lang::IllegalArgumentException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException,
-                   std::exception) = 0;
+        virtual void _setSingleValue(const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue) = 0;
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        virtual void _postSetValues ()
-            throw (css::beans::UnknownPropertyException,
-                   css::beans::PropertyVetoException,
-                   css::lang::IllegalArgumentException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException) = 0;
+        virtual void _postSetValues () = 0;
 
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        virtual void _preGetValues ()
-            throw (css::beans::UnknownPropertyException,
-                   css::beans::PropertyVetoException,
-                   css::lang::IllegalArgumentException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException) = 0;
+        virtual void _preGetValues () = 0;
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
-            throw (css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException) = 0;
+        virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) = 0;
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
-        virtual void _postGetValues ()
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0;
+        virtual void _postGetValues () = 0;
 
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
-        static void _preGetPropertyState ()
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException );
+        static void _preGetPropertyState ();
         /// @throws css::beans::UnknownPropertyException
-        static void _getPropertyState( const comphelper::PropertyInfo& rInfo, css::beans::PropertyState& rState )
-            throw(css::beans::UnknownPropertyException );
+        static void _getPropertyState( const comphelper::PropertyInfo& rInfo, css::beans::PropertyState& rState );
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
-        static void _postGetPropertyState ()
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException );
+        static void _postGetPropertyState ();
 
         /// @throws css::beans::UnknownPropertyException
-        static void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry )
-            throw(css::beans::UnknownPropertyException );
+        static void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry );
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::lang::WrappedTargetException
-        static css::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException );
+        static css::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry );
 
     public:
         ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, SolarMutex* pMutex = nullptr )
@@ -154,42 +124,26 @@ namespace comphelper
             throw();
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues )
-            throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
         // XPropertyState
-        virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
-            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
-            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
-            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+        virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+        virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+        virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
     };
 }
 #endif
diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx
index a5885e2cd8b9..b7807c74fec4 100644
--- a/include/comphelper/ChainablePropertySetInfo.hxx
+++ b/include/comphelper/ChainablePropertySetInfo.hxx
@@ -46,12 +46,9 @@ namespace comphelper
             throw() override;
 
         // XPropertySetInfo
-        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties()
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName )
-            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
+        virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+        virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
         PropertyInfoHash                            maMap;
         css::uno::Sequence < css::beans::Property > maProperties;
diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index 6c056bb376dd..c1203a35b257 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -70,67 +70,52 @@ namespace comphelper
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
-        virtual void _preSetValues ()
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0;
+        virtual void _preSetValues () = 0;
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
-            throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-                   css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) = 0;
+        virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) = 0;
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
-        virtual void _postSetValues ()
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0;
+        virtual void _postSetValues () = 0;
 
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
-        virtual void _preGetValues ()
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0;
+        virtual void _preGetValues () = 0;
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
-            throw (css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException) = 0;
+        virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) = 0;
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
-        virtual void _postGetValues ()
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) = 0;
+        virtual void _postGetValues () = 0;
 
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
-        static void _preGetPropertyState ()
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException );
+        static void _preGetPropertyState ();
         /// @throws css::beans::UnknownPropertyException
-        static void _getPropertyState( const comphelper::PropertyInfo& rInfo, css::beans::PropertyState& rState )
-            throw(css::beans::UnknownPropertyException );
+        static void _getPropertyState( const comphelper::PropertyInfo& rInfo, css::beans::PropertyState& rState );
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::PropertyVetoException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::WrappedTargetException
-        static void _postGetPropertyState ()
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException );
+        static void _postGetPropertyState ();
 
         /// @throws css::beans::UnknownPropertyException
-        static void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry )
-            throw(css::beans::UnknownPropertyException );
+        static void _setPropertyToDefault( const comphelper::PropertyInfo& rEntry );
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::lang::WrappedTargetException
-        static css::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException );
+        static css::uno::Any _getPropertyDefault( const comphelper::PropertyInfo& rEntry );
 
     public:
         MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, SolarMutex* pMutex = nullptr )
@@ -141,42 +126,26 @@ namespace comphelper
             throw();
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues )
-            throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
         // XPropertyState
-        virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
-            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
-            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
-            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+        virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+        virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+        virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
     };
 }
 #endif
diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx
index 55abed60a040..07416c79c633 100644
--- a/include/comphelper/MasterPropertySetInfo.hxx
+++ b/include/comphelper/MasterPropertySetInfo.hxx
@@ -39,12 +39,9 @@ namespace comphelper
         void add( PropertyInfoHash &rHash, sal_uInt8 nMapId );
 
         // XPropertySetInfo
-        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties()
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName )
-            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
+        virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+        virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
         PropertyDataHash                            maMap;
         css::uno::Sequence < css::beans::Property > maProperties;
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 552ce3bf76a4..8479ad7c4938 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -53,10 +53,9 @@ namespace comphelper
         virtual ~OSelectionChangeListener();
 
         /// @throws css::uno::RuntimeException
-        virtual void _selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException) = 0;
+        virtual void _selectionChanged( const css::lang::EventObject& aEvent ) = 0;
         /// @throws css::uno::RuntimeException
-        virtual void _disposing(const css::lang::EventObject& _rSource)
-            throw (css::uno::RuntimeException, std::exception);
+        virtual void _disposing(const css::lang::EventObject& _rSource);
 
     protected:
         // pseudo-private. Making it private now could break compatibility
@@ -82,10 +81,10 @@ namespace comphelper
         OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const  css::uno::Reference< css::view::XSelectionSupplier>& _rxSet);
 
     // 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;
 
     // XSelectionChangeListener
-        virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override;
 
         /// incremental lock
         void        lock();
diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx
index 09ae01c471ec..bd6103bdf9cb 100644
--- a/include/comphelper/SettingsHelper.hxx
+++ b/include/comphelper/SettingsHelper.hxx
@@ -43,7 +43,7 @@ namespace comphelper
         ChainableHelperNoState ( ChainablePropertySetInfo *pInfo, SolarMutex* pMutex = nullptr)
         : ChainablePropertySet ( pInfo, pMutex )
         {}
-        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override
         { return HelperBaseNoState::queryInterface( aType ); }
         void SAL_CALL acquire(  ) throw () override
         { HelperBaseNoState::acquire( ); }
@@ -51,43 +51,31 @@ namespace comphelper
         { HelperBaseNoState::release( ); }
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override
         { return ChainablePropertySet::getPropertySetInfo(); }
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override
         { ChainablePropertySet::setPropertyValue ( aPropertyName, aValue ); }
-        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override
         { return ChainablePropertySet::getPropertyValue ( PropertyName ); }
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override
         { ChainablePropertySet::addPropertyChangeListener ( aPropertyName, xListener ); }
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override
         { ChainablePropertySet::removePropertyChangeListener ( aPropertyName, aListener ); }
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override
         { ChainablePropertySet::addVetoableChangeListener ( PropertyName, aListener ); }
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override
         { ChainablePropertySet::removeVetoableChangeListener ( PropertyName, aListener ); }
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues )
-            throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override
         { ChainablePropertySet::setPropertyValues ( aPropertyNames, aValues ); }
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames )
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override
         { return ChainablePropertySet::getPropertyValues ( aPropertyNames ); }
-        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override
         { ChainablePropertySet::addPropertiesChangeListener ( aPropertyNames, xListener ); }
-        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override
         { ChainablePropertySet::removePropertiesChangeListener ( xListener ); }
-        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override
         { ChainablePropertySet::firePropertiesChangeEvent ( aPropertyNames, xListener ); }
     };
 }
diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx
index 5c895d437ae3..42a886a0a5a3 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -48,7 +48,7 @@ namespace comphelper
         /// implements the calculation of the bounding rectangle - still waiting to be overwritten
         ///
         /// @throws css::uno::RuntimeException
-        virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException, std::exception) = 0;
+        virtual css::awt::Rectangle implGetBounds(  ) = 0;
 
     protected:
         /** non-virtual versions of the methods which can be implemented using <method>implGetBounds</method>
@@ -57,15 +57,15 @@ namespace comphelper
 
             @throws css::uno::RuntimeException
         */
-        bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException);
+        bool SAL_CALL containsPoint( const css::awt::Point& aPoint );
         /// @throws css::uno::RuntimeException
-        css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException);
+        css::awt::Point SAL_CALL getLocation(  );
         /// @throws css::uno::RuntimeException
-        css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException);
+        css::awt::Point SAL_CALL getLocationOnScreen(  );
         /// @throws css::uno::RuntimeException
-        css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException);
+        css::awt::Size SAL_CALL getSize(  );
         /// @throws css::uno::RuntimeException
-        css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException);
+        css::awt::Rectangle SAL_CALL getBounds(  );
     };
 
 
@@ -96,11 +96,11 @@ namespace comphelper
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleComponent - default implementations
-        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+        virtual css::awt::Point SAL_CALL getLocation(  ) override;
+        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+        virtual css::awt::Size SAL_CALL getSize(  ) override;
+        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
     };
 
 
@@ -127,11 +127,11 @@ namespace comphelper
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleComponent - default implementations
-        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+        virtual css::awt::Point SAL_CALL getLocation(  ) override;
+        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+        virtual css::awt::Size SAL_CALL getSize(  ) override;
+        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
     };
 
 
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index 2143c7e2060a..504afb9dd59a 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -142,30 +142,30 @@ namespace comphelper
 
     public:
         // XAccessibleEventBroadcaster
-        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
         // XAccessibleContext - still waiting to be overwritten
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override = 0;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override = 0;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override = 0;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override = 0;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override = 0;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override = 0;
+        virtual OUString SAL_CALL getAccessibleName(  ) override = 0;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override = 0;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override = 0;
 
         // XAccessibleContext - default implementations
         /** default implementation for retrieving the index of this object within the parent
             <p>This basic implementation here returns the index <code>i</code> of the child for which
                 <code>&lt;parent&gt;.getAccessibleChild( i )</code> equals our creator.</p>
         */
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
         /** default implementation for retrieving the locale
             <p>This basic implementation returns the locale of the parent context,
             as retrieved via getAccessibleParent()->getAccessibleContext.</p>
         */
-        virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     public:
         // helper struct for granting selective access rights
diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx
index dd7d12a57daf..9710bb0d1192 100644
--- a/include/comphelper/accessiblekeybindinghelper.hxx
+++ b/include/comphelper/accessiblekeybindinghelper.hxx
@@ -58,13 +58,13 @@ namespace comphelper
         OAccessibleKeyBindingHelper( const OAccessibleKeyBindingHelper& rHelper );
 
         /// @throws css::uno::RuntimeException
-        void AddKeyBinding( const css::uno::Sequence< css::awt::KeyStroke >& rKeyBinding ) throw (css::uno::RuntimeException);
+        void AddKeyBinding( const css::uno::Sequence< css::awt::KeyStroke >& rKeyBinding );
         /// @throws css::uno::RuntimeException
-        void AddKeyBinding( const css::awt::KeyStroke& rKeyStroke ) throw (css::uno::RuntimeException);
+        void AddKeyBinding( const css::awt::KeyStroke& rKeyStroke );
 
         // XAccessibleKeyBinding
-        virtual sal_Int32 SAL_CALL getAccessibleKeyBindingCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::awt::KeyStroke > SAL_CALL getAccessibleKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleKeyBindingCount() override;
+        virtual css::uno::Sequence< css::awt::KeyStroke > SAL_CALL getAccessibleKeyBinding( sal_Int32 nIndex ) override;
     };
 
 
diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx
index 0b5140bc650e..0a67e48f498b 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -52,20 +52,17 @@ namespace comphelper
         // access to context - still waiting to be overwritten
         /// @throws css::uno::RuntimeException
         virtual css::uno::Reference< css::accessibility::XAccessibleContext >
-            implGetAccessibleContext()
-            throw ( css::uno::RuntimeException ) = 0;
+            implGetAccessibleContext() = 0;
 
         // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
         /// @throws css::uno::RuntimeException
         virtual bool
-            implIsSelected( sal_Int32 nAccessibleChildIndex )
-            throw (css::uno::RuntimeException) = 0;
+            implIsSelected( sal_Int32 nAccessibleChildIndex ) = 0;
 
         // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
         /// @throws css::uno::RuntimeException
         virtual void
-            implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect )
-            throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) = 0;
+            implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) = 0;
 
     protected:
 
@@ -74,22 +71,22 @@ namespace comphelper
             @throws css::lang::IndexOutOfBoundsException
             @throws css::uno::RuntimeException
         */
-        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+        bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex );
         /// @throws css::uno::RuntimeException
-        void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException);
+        void SAL_CALL clearAccessibleSelection(  );
         /// @throws css::uno::RuntimeException
-        void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException);
+        void SAL_CALL selectAllAccessibleChildren(  );
         /// @throws css::uno::RuntimeException
-        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException);
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex );
     };
 
 
@@ -111,7 +108,7 @@ namespace comphelper
         OAccessibleSelectionHelper( IMutex* _pExternalLock );
 
         // return ourself here by default
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > implGetAccessibleContext() throw ( css::uno::RuntimeException ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > implGetAccessibleContext() override;
 
     public:
 
@@ -120,13 +117,13 @@ namespace comphelper
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleSelection - default implementations
-        virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        virtual void SAL_CALL clearAccessibleSelection(  ) override;
+        virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
     };
 
 
diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index d01f5a7c142b..8083ba6ed211 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -67,32 +67,32 @@ namespace comphelper
             @throws css::lang::IndexOutOfBoundsException
             @throws css::uno::RuntimeException
         */
-        sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+        sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex );
         /// @throws css::uno::RuntimeException
-        sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException);
+        sal_Int32 SAL_CALL getCharacterCount();
         /// @throws css::uno::RuntimeException
-        OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException);
+        OUString SAL_CALL getSelectedText();
         /// @throws css::uno::RuntimeException
-        sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException);
+        sal_Int32 SAL_CALL getSelectionStart();
         /// @throws css::uno::RuntimeException
-        sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException);
+        sal_Int32 SAL_CALL getSelectionEnd();
         /// @throws css::uno::RuntimeException
-        OUString SAL_CALL getText() throw (css::uno::RuntimeException);
+        OUString SAL_CALL getText();
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+        OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException);
+        css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException);
+        css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException);
+        css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType );
 
     public:
 
@@ -139,16 +139,16 @@ namespace comphelper
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleText
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
     };
 
 
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index 2cfae97b6303..d7b0a006bad0 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -102,7 +102,7 @@ namespace comphelper
 
     protected:
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
-                    getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+                    getAccessibleContext(  ) override;
 
         const css::uno::Reference< css::accessibility::XAccessible >&
                     getParent() const { return m_xParentAccessible; }
@@ -193,28 +193,28 @@ namespace comphelper
 
     protected:
         // XInterface
-        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override;
 
         // XTypeProvider
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleContext
         /// @throws css::uno::RuntimeException
-        sal_Int32 baseGetAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception);
+        sal_Int32 baseGetAccessibleChildCount(  );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::accessibility::XAccessible > baseGetAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception);
+        css::uno::Reference< css::accessibility::XAccessible > baseGetAccessibleChild( sal_Int32 i );
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::accessibility::XAccessibleRelationSet > baseGetAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception);
+        css::uno::Reference< css::accessibility::XAccessibleRelationSet > baseGetAccessibleRelationSet(  );
 
         // XAccessibleEventListener
-        virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) 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;
 
         // XComponent/OComponentProxyAggregationHelper
-        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         // own overridables
         /** notify an accessible event which has been translated (if necessary)
@@ -227,7 +227,7 @@ namespace comphelper
 
             @throws css::uno::RuntimeException
         */
-        virtual void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) = 0;
+        virtual void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) = 0;
 
     protected:
         virtual ~OAccessibleContextWrapperHelper( ) override;
@@ -282,27 +282,27 @@ namespace comphelper
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleEventBroadcaster
-        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
         // OAccessibleContextWrapper
-        virtual void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) override;
+        virtual void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) override;
 
         // OComponentHelper
         using OAccessibleContextWrapperHelper::disposing;
-        virtual void SAL_CALL disposing()  throw (css::uno::RuntimeException) override;
+        virtual void SAL_CALL disposing() override;
 
     protected:
         virtual ~OAccessibleContextWrapper() override;
@@ -385,7 +385,7 @@ namespace comphelper
 
     protected:
         // 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;
 
     protected:
         void    implTranslateChildEventValue( const css::uno::Any& _rInValue, css::uno::Any& _rOutValue );
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index 5c048da5c186..6d5322548e13 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -81,7 +81,7 @@ namespace comphelper
         virtual ~OAccessibleImplementationAccess( );
 
         // XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) override;
 
     public:
 
diff --git a/include/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx
index 49216967c02c..91635a412765 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -49,22 +49,16 @@ public:
     void Clear();
 
     // css::xml::sax::XAttributeList
-    virtual sal_Int16 SAL_CALL getLength()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getNameByIndex(sal_Int16 i)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getTypeByName(const OUString& aName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getValueByIndex(sal_Int16 i)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getValueByName(const OUString& aName)
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL getLength() override;
+    virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) override;
+    virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) override;
+    virtual OUString SAL_CALL getTypeByName(const OUString& aName) override;
+    virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) override;
+    virtual OUString SAL_CALL getValueByName(const OUString& aName) override;
 
     // css::util::XCloneable
     virtual css::uno::Reference< XCloneable > SAL_CALL
-        createClone()   throw(css::uno::RuntimeException, std::exception) override;
+        createClone() override;
 };
 
 } // namespace comphelper
diff --git a/include/comphelper/configurationlistener.hxx b/include/comphelper/configurationlistener.hxx
index d8cc06971ea3..7dc39a308144 100644
--- a/include/comphelper/configurationlistener.hxx
+++ b/include/comphelper/configurationlistener.hxx
@@ -89,13 +89,11 @@ public:
     void dispose();
 
     // XPropertyChangeListener implementation
-    virtual void SAL_CALL disposing(css::lang::EventObject const &)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(css::lang::EventObject const &) override;
 
     /// Notify of the property change
     virtual void SAL_CALL propertyChange(
-        css::beans::PropertyChangeEvent const &rEvt )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::beans::PropertyChangeEvent const &rEvt ) override;
 };
 
 template< typename uno_type > ConfigurationListenerProperty< uno_type >::ConfigurationListenerProperty(const rtl::Reference< ConfigurationListener > &xListener, const OUString &rProp )
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index 07b044303dbf..0a3729a5809b 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -52,21 +52,13 @@ namespace comphelper
         virtual ~OContainerListener();
 
         /// @throws css::uno::RuntimeException
-        virtual void _elementInserted( const css::container::ContainerEvent& _rEvent )
-            throw (css::uno::RuntimeException,
-                   std::exception);
+        virtual void _elementInserted( const css::container::ContainerEvent& _rEvent );
         /// @throws css::uno::RuntimeException
-        virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent )
-            throw (css::uno::RuntimeException,
-                   std::exception);
+        virtual void _elementRemoved( const css::container::ContainerEvent& _rEvent );
         /// @throws css::uno::RuntimeException
-        virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent )
-            throw (css::uno::RuntimeException,
-                   std::exception);
+        virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent );
         /// @throws css::uno::RuntimeException
-        virtual void _disposing(const css::lang::EventObject& _rSource)
-            throw (css::uno::RuntimeException,
-                   std::exception);
+        virtual void _disposing(const css::lang::EventObject& _rSource);
 
     protected:
         void setAdapter(OContainerListenerAdapter* _pAdapter);
@@ -89,12 +81,12 @@ namespace comphelper
             const  css::uno::Reference< css::container::XContainer >& _rxContainer);
 
         // 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;
 
         // XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
         /// dispose the object. No multiplexing anymore
         void        dispose();
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index 708d11cc78d9..cd9f755c5295 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -56,8 +56,8 @@ private:
     SimplePasswordRequest& operator=(SimplePasswordRequest const&) = delete;
 
     // XInteractionRequest
-    virtual css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getRequest() override;
+    virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() override;
 
 private:
     css::uno::Any                         maRequest;
@@ -92,8 +92,8 @@ private:
     DocPasswordRequest& operator=(DocPasswordRequest const&) = delete;
 
     // XInteractionRequest
-    virtual css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getRequest() override;
+    virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() override;
 
 private:
     css::uno::Any                         maRequest;
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index 6e116af61cb5..67b21df92b0f 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -56,11 +56,10 @@ public:
                        const css::uno::Sequence< OUString >&             _aNames  );
     virtual ~OEnumerationByName() override;
 
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement(  )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+    virtual css::uno::Any SAL_CALL nextElement(  ) override;
 
-    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
 private:
     COMPHELPER_DLLPRIVATE void impl_startDisposeListening();
@@ -82,11 +81,10 @@ public:
     OEnumerationByIndex(const css::uno::Reference< css::container::XIndexAccess >& _rxAccess);
     virtual ~OEnumerationByIndex() override;
 
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement(  )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+    virtual css::uno::Any SAL_CALL nextElement(  ) override;
 
-    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
 private:
     COMPHELPER_DLLPRIVATE void impl_startDisposeListening();
@@ -111,9 +109,8 @@ public:
     OAnyEnumeration(const css::uno::Sequence< css::uno::Any >& lItems);
     virtual ~OAnyEnumeration() override;
 
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement(  )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+    virtual css::uno::Any SAL_CALL nextElement(  ) override;
 
 };
 
diff --git a/include/comphelper/eventattachermgr.hxx b/include/comphelper/eventattachermgr.hxx
index ec5071eed8d0..97e6dee6c1d5 100644
--- a/include/comphelper/eventattachermgr.hxx
+++ b/include/comphelper/eventattachermgr.hxx
@@ -43,8 +43,7 @@ namespace comphelper
 /// @throws css::uno::Exception
 COMPHELPER_DLLPUBLIC css::uno::Reference< css::script::XEventAttacherManager >
 createEventAttacherManager(
-        const css::uno::Reference< css::uno::XComponentContext > & rxContext )
-    throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext > & rxContext );
 
 }
 
diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx
index 57bbab6947a0..a640a79294bc 100644
--- a/include/comphelper/evtlistenerhlp.hxx
+++ b/include/comphelper/evtlistenerhlp.hxx
@@ -39,7 +39,7 @@ namespace comphelper
         css::uno::WeakReference< css::lang::XEventListener> m_xListener;
     public:
         OEventListenerHelper(const css::uno::Reference< css::lang::XEventListener>& _rxListener);
-        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;
     };
 
 }   // namespace comphelper
diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx
index 272c818c98ad..4f4072145e71 100644
--- a/include/comphelper/extract.hxx
+++ b/include/comphelper/extract.hxx
@@ -74,7 +74,6 @@ inline bool enum2int( sal_Int32 & rnEnum, const css::uno::Any & rAny )
  */
 template< typename E >
 inline void any2enum( E & eRet, const css::uno::Any & rAny )
-    throw( css::lang::IllegalArgumentException )
 {
     // check for typesafe enum
     if (! (rAny >>= eRet))
@@ -96,7 +95,6 @@ inline void any2enum( E & eRet, const css::uno::Any & rAny )
  * @throws css::lang::IllegalArgumentException
  */
 inline bool any2bool( const css::uno::Any & rAny )
-    throw( css::lang::IllegalArgumentException )
 {
     bool b;
     if (rAny >>= b)
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index 0dc42980786c..1a38662ea6cc 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -52,14 +52,14 @@ namespace comphelper
         bool    wasSelected() const { return m_bSelected; }
 
         // XInteractionContinuation
-        virtual void SAL_CALL select() throw(css::uno::RuntimeException) override;
+        virtual void SAL_CALL select() override;
     private:
         bool    m_bSelected : 1;    /// indicates if the select event occurred
     };
 
 
     template <class INTERACTION>
-    void SAL_CALL OInteraction< INTERACTION >::select(  ) throw(css::uno::RuntimeException)
+    void SAL_CALL OInteraction< INTERACTION >::select(  )
     {
         m_bSelected = true;
     }
@@ -96,8 +96,8 @@ namespace comphelper
         }
 
         // XInteractionPassword
-        virtual void SAL_CALL setPassword( const OUString& Password ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getPassword(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPassword( const OUString& Password ) override;
+        virtual OUString SAL_CALL getPassword(  ) override;
 
     private:
         OUString m_sPassword;
@@ -127,8 +127,8 @@ namespace comphelper
         void addContinuation(const css::uno::Reference< css::task::XInteractionContinuation >& _rxContinuation);
 
     // XInteractionRequest
-        virtual css::uno::Any SAL_CALL getRequest(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getRequest(  ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations(  ) override;
     };
 
 }   // namespace comphelper
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 7af2f9e68fda..a3429ac2862f 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -107,26 +107,19 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
 
 
         /** @see css.frame.XUntitledNumbers */
-        virtual ::sal_Int32 SAL_CALL leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent)
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception         ) override;
+        virtual ::sal_Int32 SAL_CALL leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent) override;
 
 
         /** @see css.frame.XUntitledNumbers */
-        virtual void SAL_CALL releaseNumber(::sal_Int32 nNumber)
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception         ) override;
+        virtual void SAL_CALL releaseNumber(::sal_Int32 nNumber) override;
 
 
         /** @see css.frame.XUntitledNumbers */
-        virtual void SAL_CALL releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent)
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception         ) override;
+        virtual void SAL_CALL releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent) override;
 
 
         /** @see css.frame.XUntitledNumbers */
-        virtual OUString SAL_CALL getUntitledPrefix()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getUntitledPrefix() override;
 
 
     // internal
diff --git a/include/comphelper/ofopxmlhelper.hxx b/include/comphelper/ofopxmlhelper.hxx
index d58268164feb..c0215a0d21d3 100644
--- a/include/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
@@ -42,8 +42,7 @@ namespace OFOPXMLHelper {
     ReadRelationsInfoSequence(
         const css::uno::Reference< css::io::XInputStream >& xInStream,
         const OUString & aStreamName,
-        const css::uno::Reference< css::uno::XComponentContext >& rContext )
-            throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rContext );
 
     // returns sequence containing two entries of type sequence<StringPair>
     // the first sequence describes "Default" elements, where each element is described
@@ -55,8 +54,7 @@ namespace OFOPXMLHelper {
     css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >
     ReadContentTypeSequence(
         const css::uno::Reference< css::io::XInputStream >& xInStream,
-        const css::uno::Reference< css::uno::XComponentContext >& rContext )
-            throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rContext );
 
     // writes sequence of elements, where each element is described by sequence of tags,
     // where each tag is described by StringPair ( First - name, Second - value )
@@ -66,8 +64,7 @@ namespace OFOPXMLHelper {
     void WriteRelationsInfoSequence(
         const css::uno::Reference< css::io::XOutputStream >& xOutStream,
         const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aSequence,
-        const css::uno::Reference< css::uno::XComponentContext >& rContext )
-            throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rContext );
 
     // writes two entries of type sequence<StringPair>
     // the first sequence describes "Default" elements, where each element is described
@@ -80,8 +77,7 @@ namespace OFOPXMLHelper {
         const css::uno::Reference< css::io::XOutputStream >& xOutStream,
         const css::uno::Sequence< css::beans::StringPair >& aDefaultsSequence,
         const css::uno::Sequence< css::beans::StringPair >& aOverridesSequence,
-        const css::uno::Reference< css::uno::XComponentContext >& rContext )
-            throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& rContext );
 
 } // namespace OFOPXMLHelper
 
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index 2e9db1a31295..7a5197a0d09b 100644
--- a/include/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.hxx
@@ -40,11 +40,11 @@ private:
     virtual ~OSLInputStreamWrapper() override;
 
 // css::io::XInputStream
-    virtual sal_Int32   SAL_CALL    readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32   SAL_CALL    readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual void        SAL_CALL    skipBytes(sal_Int32 nBytesToSkip) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32   SAL_CALL    available() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) override;
-    virtual void        SAL_CALL    closeInput() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32   SAL_CALL    readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override;
+    virtual sal_Int32   SAL_CALL    readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override;
+    virtual void        SAL_CALL    skipBytes(sal_Int32 nBytesToSkip) override;
+    virtual sal_Int32   SAL_CALL    available() override;
+    virtual void        SAL_CALL    closeInput() override;
 
     ::osl::Mutex    m_aMutex;
     ::osl::File*    m_pFile;
@@ -62,9 +62,9 @@ private:
     virtual ~OSLOutputStreamWrapper() override;
 
 // css::io::XOutputStream
-    virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 
     ::osl::File&        rFile;
 };
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index c28a5862f382..0779e4ed8f1b 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -131,8 +131,7 @@ public:
     /// inherited from IPropertyArrayHelper
     virtual css::uno::Sequence< css::beans::Property> SAL_CALL getProperties() override;
     /// inherited from IPropertyArrayHelper
-    virtual css::beans::Property SAL_CALL getPropertyByName(const OUString& _rPropertyName)
-                                throw(css::beans::UnknownPropertyException) override;
+    virtual css::beans::Property SAL_CALL getPropertyByName(const OUString& _rPropertyName) override;
 
     /// inherited from IPropertyArrayHelper
     virtual sal_Bool  SAL_CALL hasPropertyByName(const OUString& _rPropertyName) override ;
@@ -211,33 +210,33 @@ protected:
 public:
     OPropertySetAggregationHelper( ::cppu::OBroadcastHelper& rBHelper );
 
-    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& aType) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& aType) 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;
 
 // 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;
+    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue) override;
+    virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override;
 
 // XPropertySet
-    virtual void SAL_CALL           addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL           addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL           addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
+    virtual void SAL_CALL           addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) override;
 
 // XPropertiesChangeListener
-    virtual void SAL_CALL propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent >& evt) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent >& evt) override;
 
 // XVetoableChangeListener
-    virtual void SAL_CALL vetoableChange(const css::beans::PropertyChangeEvent& aEvent) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL vetoableChange(const css::beans::PropertyChangeEvent& aEvent) override;
 
 // XMultiPropertySet
-    virtual void SAL_CALL   setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   addPropertiesChangeListener(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) override;
+    virtual void SAL_CALL   addPropertiesChangeListener(const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override;
 
 // XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL                                   setPropertyToDefault(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL             getPropertyDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) override;
+    virtual void SAL_CALL                                   setPropertyToDefault(const OUString& PropertyName) override;
+    virtual css::uno::Any SAL_CALL             getPropertyDefault(const OUString& aPropertyName) override;
 
 // OPropertySetHelper
     /** still waiting to be overwritten ...
@@ -248,12 +247,12 @@ public:
     /** only implemented for "forwarded" properties, every other property must be handled
         in the derivee, and will assert if passed herein
     */
-    virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
     /** only implemented for "forwarded" properties, every other property must be handled
         in the derivee, and will assert if passed herein
     */
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw ( css::uno::Exception, std::exception ) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
 protected:
     virtual ~OPropertySetAggregationHelper() override;
@@ -314,7 +313,7 @@ protected:
     /// must be called before aggregation, if aggregation is used
     ///
     /// @throws css::lang::IllegalArgumentException
-    void setAggregation(const css::uno::Reference< css::uno::XInterface >&) throw( css::lang::IllegalArgumentException );
+    void setAggregation(const css::uno::Reference< css::uno::XInterface >&);
     void startListening();
 };
 
diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index 3e31eff11b92..75f259238089 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -51,22 +51,19 @@ protected:
     /// for scripting : the types of the interfaces supported by this class
     ///
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< css::uno::Type > getBaseTypes() throw (css::uno::RuntimeException, std::exception);
+    static css::uno::Sequence< css::uno::Type > getBaseTypes();
 
 // OPropertySetHelper overridables
     virtual sal_Bool SAL_CALL convertFastPropertyValue(
                             css::uno::Any & rConvertedValue,
                             css::uno::Any & rOldValue,
                             sal_Int32 nHandle,
-                            const css::uno::Any& rValue )
-                                throw (css::lang::IllegalArgumentException) override;
+                            const css::uno::Any& rValue ) override;
 
     virtual void SAL_CALL   setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const css::uno::Any& rValue
-                            )
-                            throw (css::uno::Exception,
-                                   std::exception) override;
+                            ) override;
 
     using OPropertySetHelper::getFastPropertyValue;
     virtual void SAL_CALL getFastPropertyValue(
@@ -75,8 +72,7 @@ protected:
                                      ) const override;
 
     // disambiguate a base class method (XFastPropertySet)
-    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 };
 
 
diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx
index 7cdf5ff966e4..f9f150cfaa9d 100644
--- a/include/comphelper/propertysethelper.hxx
+++ b/include/comphelper/propertysethelper.hxx
@@ -45,22 +45,22 @@ protected:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) = 0;
+    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) = 0;
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) = 0;
+    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) = 0;
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, css::beans::PropertyState* pStates ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException );
+    virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, css::beans::PropertyState* pStates );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry )  throw(css::beans::UnknownPropertyException, css::uno::RuntimeException );
+    virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException );
+    virtual css::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry );
 
 public:
     PropertySetHelper( comphelper::PropertySetInfo* pInfo ) throw();
@@ -68,27 +68,27 @@ public:
     virtual ~PropertySetHelper() throw();
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XMultiPropertySet
 //  virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     // XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 };
 
 }
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index 48f257009cad..7d3359370106 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -77,9 +77,9 @@ public:
     /** removes an already added PropertyMapEntry which string in mpName equals to aName */
     void remove( const OUString& aName ) throw();
 
-    virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
+    virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 };
 
 }
diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx
index c52bb4a240f4..1585f85c3ec6 100644
--- a/include/comphelper/propertystatecontainer.hxx
+++ b/include/comphelper/propertystatecontainer.hxx
@@ -58,10 +58,10 @@ namespace comphelper
 
 
         // XPropertyState
-        virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+        virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+        virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+        virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
 
         // own overridables
@@ -92,7 +92,7 @@ namespace comphelper
 
     protected:
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override;
         // XTypeProvider
         DECLARE_XTYPEPROVIDER( )
 
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index 94edcda9d196..d9eb59115b1b 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -52,11 +52,9 @@ namespace comphelper
         virtual ~OPropertyChangeListener();
 
         /// @throws css::uno::RuntimeException
-        virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent)
-            throw (css::uno::RuntimeException, std::exception) = 0;
+        virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) = 0;
         /// @throws css::uno::RuntimeException
-        virtual void _disposing(const css::lang::EventObject& _rSource)
-            throw( css::uno::RuntimeException, std::exception);
+        virtual void _disposing(const css::lang::EventObject& _rSource);
 
     protected:
         /** If the derivee also owns the mutex which we know as reference, then call this within your
@@ -88,10 +86,10 @@ namespace comphelper
         OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const  css::uno::Reference< css::beans::XPropertySet>& _rxSet, bool _bAutoReleaseSet = true);
 
     // 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;
 
     // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const  css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const  css::beans::PropertyChangeEvent& evt ) override;
 
         /// incremental lock
         void        lock();
diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx
index fbce94e7951a..697bb3560b8d 100644
--- a/include/comphelper/propstate.hxx
+++ b/include/comphelper/propstate.hxx
@@ -50,17 +50,17 @@ namespace comphelper
         OPropertyStateHelper(::cppu::OBroadcastHelper& rBHlp,
                              ::cppu::IEventNotificationHook *i_pFireEvents);
 
-        virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& aType) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& aType) override;
 
     // XPropertyState
         virtual css::beans::PropertyState SAL_CALL
-            getPropertyState(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+            getPropertyState(const OUString& PropertyName) override;
         virtual css::uno::Sequence< css::beans::PropertyState> SAL_CALL
-            getPropertyStates(const css::uno::Sequence< OUString >& aPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+            getPropertyStates(const css::uno::Sequence< OUString >& aPropertyName) override;
         virtual void SAL_CALL
-            setPropertyToDefault(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+            setPropertyToDefault(const OUString& PropertyName) override;
         virtual css::uno::Any SAL_CALL
-            getPropertyDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            getPropertyDefault(const OUString& aPropertyName) override;
 
     // access via handle
         virtual css::beans::PropertyState  getPropertyStateByHandle(sal_Int32 nHandle);
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 03ce2d9d4c1b..bf3c5d87233e 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -106,9 +106,9 @@ namespace comphelper
 
         // XInterface and XTypeProvider
         /// @throws css::uno::RuntimeException
-        css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException);
+        css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType );
         /// @throws css::uno::RuntimeException
-        css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException);
+        css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  );
 
     private:
         OProxyAggregation( const OProxyAggregation& ) = delete;
@@ -145,7 +145,7 @@ namespace comphelper
         using OProxyAggregation::getComponentContext;
 
         // XInterface
-        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override;
 
         // XTypeProvider
         DECLARE_XTYPEPROVIDER( )
@@ -165,11 +165,11 @@ namespace comphelper
         );
 
         // 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;
 
         // XComponent
         /// @throws css::uno::RuntimeException
-        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) = 0;
+        virtual void SAL_CALL dispose() = 0;
 
     private:
         OComponentProxyAggregationHelper( const OComponentProxyAggregationHelper& ) = delete;
@@ -197,13 +197,13 @@ namespace comphelper
         DECLARE_XTYPEPROVIDER()
 
         // OComponentHelper
-        virtual void SAL_CALL disposing()  throw (css::uno::RuntimeException) override;
+        virtual void SAL_CALL disposing() override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) override;
 
         // XComponent/OComponentProxyAggregationHelper
-        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
     private:
         OComponentProxyAggregation( const OComponentProxyAggregation& ) = delete;
diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx
index bbb566ade6f4..3544f0e6cc83 100644
--- a/include/comphelper/seekableinput.hxx
+++ b/include/comphelper/seekableinput.hxx
@@ -62,16 +62,16 @@ public:
                         const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
 // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available() throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput() throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 
 // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
 };
 
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index ab1f344c717b..6103af45f640 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -46,27 +46,19 @@ public:
     SequenceInputStream(css::uno::Sequence<sal_Int8> const & rData);
 
 // css::io::XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException,
-              css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead ) override;
 
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException,
-              css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead ) override;
 
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException,
-              css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
 
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
 
-    virtual void SAL_CALL closeInput(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL closeInput(  ) override;
 
-    virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition(  ) override;
+    virtual sal_Int64 SAL_CALL getLength(  ) override;
 
 private:
     inline sal_Int32 avail();
@@ -115,14 +107,14 @@ public:
         );
 
     /// same as XOutputStream::writeBytes (as expected :)
-    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
     /// this is a dummy in this implementation, no buffering is used
-    virtual void SAL_CALL flush(  ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL flush(  ) override;
     /** closes the output stream. In the case of this class, this means that the sequence used for writing is
         resized to the really used size and not used any further, every subsequent call to one of the XOutputStream
         methods will throw a <code>NotConnectedException</code>.
     */
-    virtual void SAL_CALL closeOutput(  ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL closeOutput(  ) override;
 };
 
 } // namespace comphelper
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index c5dd87ff9d57..40cb81c0dbeb 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -162,16 +162,14 @@ public:
         : BaseT(xContext), m_rServiceDecl(rServiceDecl) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException) override {
+    virtual OUString SAL_CALL getImplementationName() override {
         return m_rServiceDecl.getImplementationName();
     }
-    virtual sal_Bool SAL_CALL supportsService( OUString const& name )
-        throw (css::uno::RuntimeException) override {
+    virtual sal_Bool SAL_CALL supportsService( OUString const& name ) override {
         return m_rServiceDecl.supportsService(name);
     }
     virtual css::uno::Sequence< OUString>
-    SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) override {
+    SAL_CALL getSupportedServiceNames() override {
         return m_rServiceDecl.getSupportedServiceNames();
     }
 
diff --git a/include/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx
index e2161e32db86..d1519ed14026 100644
--- a/include/comphelper/servicehelper.hxx
+++ b/include/comphelper/servicehelper.hxx
@@ -53,7 +53,7 @@ public:
 #define UNO3_GETIMPLEMENTATION_DECL( classname ) \
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); \
     static classname* getImplementation( const css::uno::Reference< css::uno::XInterface >& xInt ); \
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
 #define UNO3_GETIMPLEMENTATION_BASE_IMPL( classname ) \
 namespace \
@@ -76,7 +76,7 @@ classname* classname::getImplementation( const uno::Reference< uno::XInterface >
 
 #define UNO3_GETIMPLEMENTATION_IMPL( classname )\
 UNO3_GETIMPLEMENTATION_BASE_IMPL(classname)\
-sal_Int64 SAL_CALL classname::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) \
+sal_Int64 SAL_CALL classname::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) \
 { \
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), \
                                                          rId.getConstArray(), 16 ) ) \
@@ -88,7 +88,7 @@ sal_Int64 SAL_CALL classname::getSomething( const css::uno::Sequence< sal_Int8 >
 
 #define UNO3_GETIMPLEMENTATION2_IMPL( classname, baseclass )\
 UNO3_GETIMPLEMENTATION_BASE_IMPL(classname)\
-sal_Int64 SAL_CALL classname::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) \
+sal_Int64 SAL_CALL classname::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) \
 { \
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), \
                                                          rId.getConstArray(), 16 ) ) \
diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx
index 9cd2076e5d95..527c09bbe75a 100644
--- a/include/comphelper/serviceinfohelper.hxx
+++ b/include/comphelper/serviceinfohelper.hxx
@@ -39,8 +39,8 @@ class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public css::lang::XServiceInfo
 {
 public:
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // helper
     static void addToSequence( css::uno::Sequence< OUString >& rSeq, std::initializer_list<OUString> services ) throw();
diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx
index fb58cf69f8ce..d852cb718f58 100644
--- a/include/comphelper/storagehelper.hxx
+++ b/include/comphelper/storagehelper.hxx
@@ -70,22 +70,19 @@ public:
     static css::uno::Reference< css::lang::XSingleServiceFactory >
         GetStorageFactory(
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
-                            = css::uno::Reference< css::uno::XComponentContext >() )
-        throw ( css::uno::Exception );
+                            = css::uno::Reference< css::uno::XComponentContext >() );
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::lang::XSingleServiceFactory >
         GetFileSystemStorageFactory(
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
-                            = css::uno::Reference< css::uno::XComponentContext >() )
-        throw ( css::uno::Exception );
+                            = css::uno::Reference< css::uno::XComponentContext >() );
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::embed::XStorage >
         GetTemporaryStorage(
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
-                            = css::uno::Reference< css::uno::XComponentContext >() )
-        throw ( css::uno::Exception );
+                            = css::uno::Reference< css::uno::XComponentContext >() );
 
     /// this one will only return Storage
     ///
@@ -95,8 +92,7 @@ public:
             const OUString& aURL,
             sal_Int32 nStorageMode,
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
-                            = css::uno::Reference< css::uno::XComponentContext >() )
-        throw ( css::uno::Exception );
+                            = css::uno::Reference< css::uno::XComponentContext >() );
 
     /// this one will return either Storage or FileSystemStorage
     ///
@@ -106,17 +102,14 @@ public:
             const OUString& aURL,
             sal_Int32 nStorageMode,
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
-                            = css::uno::Reference< css::uno::XComponentContext >() )
-
-        throw ( css::uno::Exception );
+                            = css::uno::Reference< css::uno::XComponentContext >() );
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::embed::XStorage >
         GetStorageFromInputStream(
             const css::uno::Reference < css::io::XInputStream >& xStream,
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
-                            = css::uno::Reference< css::uno::XComponentContext >() )
-        throw ( css::uno::Exception );
+                            = css::uno::Reference< css::uno::XComponentContext >() );
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::embed::XStorage >
@@ -124,33 +117,28 @@ public:
             const css::uno::Reference < css::io::XStream >& xStream,
             sal_Int32 nStorageMode = css::embed::ElementModes::READWRITE,
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
-                            = css::uno::Reference< css::uno::XComponentContext >() )
-        throw ( css::uno::Exception );
+                            = css::uno::Reference< css::uno::XComponentContext >() );
 
     /// @throws css::uno::Exception
     static void CopyInputToOutput(
             const css::uno::Reference< css::io::XInputStream >& xInput,
-            const css::uno::Reference< css::io::XOutputStream >& xOutput )
-        throw ( css::uno::Exception );
+            const css::uno::Reference< css::io::XOutputStream >& xOutput );
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::io::XInputStream >
         GetInputStreamFromURL(
             const OUString& aURL,
-            const css::uno::Reference< css::uno::XComponentContext >& context )
-        throw ( css::uno::Exception );
+            const css::uno::Reference< css::uno::XComponentContext >& context );
 
     /// @throws css::uno::Exception
     static void SetCommonStorageEncryptionData(
             const css::uno::Reference< css::embed::XStorage >& xStorage,
-            const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData )
-        throw ( css::uno::Exception );
+            const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData );
 
     // the following method supports only storages of OOo formats
     /// @throws css::uno::Exception
     static sal_Int32 GetXStorageFormat(
-            const css::uno::Reference< css::embed::XStorage >& xStorage )
-        throw ( css::uno::Exception, std::exception );
+            const css::uno::Reference< css::embed::XStorage >& xStorage );
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::embed::XStorage >
@@ -159,8 +147,7 @@ public:
             const OUString& aURL,
             sal_Int32 nStorageMode,
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
-                            = css::uno::Reference< css::uno::XComponentContext >() )
-        throw ( css::uno::Exception );
+                            = css::uno::Reference< css::uno::XComponentContext >() );
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::embed::XStorage >
@@ -170,8 +157,7 @@ public:
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
                             = css::uno::Reference< css::uno::XComponentContext >(),
             bool bRepairStorage = false,
-            bool bUseBufferedStream = false )
-        throw ( css::uno::Exception );
+            bool bUseBufferedStream = false );
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::embed::XStorage >
@@ -182,8 +168,7 @@ public:
             const css::uno::Reference< css::uno::XComponentContext >& rxContext
                             = css::uno::Reference< css::uno::XComponentContext >(),
             bool bRepairStorage = false,
-            bool bUseBufferedStream = false )
-        throw ( css::uno::Exception );
+            bool bUseBufferedStream = false );
 
     static css::uno::Sequence< css::beans::NamedValue >
         CreatePackageEncryptionData(
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index 16ced8746f96..a5b56219c295 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -91,7 +91,7 @@ namespace comphelper
     COMPHELPER_DLLPUBLIC bool           getBOOL(const css::uno::Any& _rAny);
 
     /// @throws css::lang::IllegalArgumentException
-    COMPHELPER_DLLPUBLIC sal_Int32      getEnumAsINT32(const css::uno::Any& _rAny) throw(css::lang::IllegalArgumentException);
+    COMPHELPER_DLLPUBLIC sal_Int32      getEnumAsINT32(const css::uno::Any& _rAny);
 
 }   // namespace comphelper
 
diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx
index c986b12e316f..1c4a8dce9fb3 100644
--- a/include/comphelper/unique_disposing_ptr.hxx
+++ b/include/comphelper/unique_disposing_ptr.hxx
@@ -104,8 +104,7 @@ private:
         }
 
         // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& rEvt )
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing( const css::lang::EventObject& rEvt ) override
         {
             bool shutDown = (rEvt.Source == m_xComponent);
 
@@ -124,20 +123,16 @@ private:
         }
 
         // XTerminateListener
-        virtual void SAL_CALL queryTermination( const css::lang::EventObject& )
-            throw(css::frame::TerminationVetoException,
-                  css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL queryTermination( const css::lang::EventObject& ) override
         {
         }
 
-        virtual void SAL_CALL notifyTermination( const css::lang::EventObject& rEvt )
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL notifyTermination( const css::lang::EventObject& rEvt ) override
         {
             disposing(rEvt);
         }
 
-        virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getImplementationName() override
         {
             if (mbComponentDLL)
                 return OUString("com.sun.star.comp.ComponentDLLListener");
@@ -145,14 +140,12 @@ private:
                 return OUString("com.sun.star.comp.DisposingTerminateListener");
         }
 
-        virtual sal_Bool SAL_CALL supportsService(const OUString& /*rName*/)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL supportsService(const OUString& /*rName*/) override
         {
             return false;
         }
 
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
         {
             return css::uno::Sequence<OUString>();
         }
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index 5b4cb63a3542..05756fe709b5 100644
--- a/include/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
@@ -41,7 +41,7 @@ namespace comphelper
     #define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \
         virtual void            SAL_CALL acquire() throw() override { baseclass::acquire(); } \
         virtual void            SAL_CALL release() throw() override { baseclass::release(); }    \
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override \
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override \
             { return baseclass::queryInterface(_rType); }
 
     /** Use this macro to forward XComponent methods to base class
@@ -69,19 +69,19 @@ namespace comphelper
     #define DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS(classname, baseclass, implhelper) \
         virtual void SAL_CALL acquire() throw() override { baseclass::acquire(); }   \
         virtual void SAL_CALL release() throw() override { baseclass::release(); }   \
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override \
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override \
             { return baseclass::queryInterface(_rType); }                               \
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override \
+        virtual void SAL_CALL dispose() override \
         {                                                                               \
             implhelper::dispose();                                                      \
         }                                                                               \
         virtual void SAL_CALL addEventListener(                                         \
-            css::uno::Reference< css::lang::XEventListener > const & xListener ) throw (css::uno::RuntimeException, std::exception) override \
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override \
         {                                                                               \
             implhelper::addEventListener(xListener);                                        \
         }                                                                               \
         virtual void SAL_CALL removeEventListener(                                      \
-            css::uno::Reference< css::lang::XEventListener > const & xListener ) throw (css::uno::RuntimeException, std::exception) override \
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override \
         {                                                                               \
             implhelper::removeEventListener(xListener);                                 \
         }
@@ -91,7 +91,7 @@ namespace comphelper
     //= forwarding/merging XInterface funtionality
 
     #define DECLARE_XINTERFACE( )   \
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; \
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; \
         virtual void SAL_CALL acquire() throw() override; \
         virtual void SAL_CALL release() throw() override;
 
@@ -101,7 +101,7 @@ namespace comphelper
 
     #define IMPLEMENT_FORWARD_XINTERFACE2( classname, refcountbase, baseclass2 ) \
         IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \
-        css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) \
+        css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) \
         { \
             css::uno::Any aReturn = refcountbase::queryInterface( _rType ); \
             if ( !aReturn.hasValue() ) \
@@ -111,7 +111,7 @@ namespace comphelper
 
     #define IMPLEMENT_FORWARD_XINTERFACE3( classname, refcountbase, baseclass2, baseclass3 ) \
         IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \
-        css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) \
+        css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) \
         { \
             css::uno::Any aReturn = refcountbase::queryInterface( _rType ); \
             if ( !aReturn.hasValue() ) \
@@ -127,17 +127,17 @@ namespace comphelper
     //= forwarding/merging XTypeProvider funtionality
 
     #define DECLARE_XTYPEPROVIDER( )    \
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override; \
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override; \
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     #define IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) \
-        css::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) \
+        css::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId(  ) \
         { \
             return css::uno::Sequence<sal_Int8>(); \
         }
 
     #define IMPLEMENT_FORWARD_XTYPEPROVIDER2( classname, baseclass1, baseclass2 ) \
-        css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes(  ) throw (css::uno::RuntimeException, std::exception) \
+        css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes(  ) \
         { \
             return ::comphelper::concatSequences( \
                 baseclass1::getTypes(), \
@@ -148,7 +148,7 @@ namespace comphelper
         IMPLEMENT_GET_IMPLEMENTATION_ID( classname )
 
     #define IMPLEMENT_FORWARD_XTYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \
-        css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes(  ) throw (css::uno::RuntimeException, std::exception) \
+        css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes(  ) \
         { \
             return ::comphelper::concatSequences( \
                 baseclass1::getTypes(), \
diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx
index 0d8d9d5b2965..1a9c99f2324d 100644
--- a/include/comphelper/weak.hxx
+++ b/include/comphelper/weak.hxx
@@ -40,11 +40,11 @@ public:
     OWeakTypeObject();
     virtual ~OWeakTypeObject() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & rType )  throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
 };
 
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index 4293262651ef..0fc4e588fb51 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -115,7 +115,7 @@ namespace comphelper
         }
 
         // XEventListener overridables
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     protected:
         // OComponentHelper overridables
@@ -163,7 +163,7 @@ namespace comphelper
 
 
     template< class BROADCASTER, class LISTENER >
-    void SAL_CALL OWeakListenerAdapter< BROADCASTER, LISTENER >::disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException)
+    void SAL_CALL OWeakListenerAdapter< BROADCASTER, LISTENER >::disposing( const css::lang::EventObject& _rSource )
     {
         css::uno::Reference< LISTENER > xListener( getListener() );
         if ( xListener.is() )
diff --git a/include/connectivity/BlobHelper.hxx b/include/connectivity/BlobHelper.hxx
index b05f3f527429..a890e6bc9550 100644
--- a/include/connectivity/BlobHelper.hxx
+++ b/include/connectivity/BlobHelper.hxx
@@ -31,11 +31,11 @@ namespace connectivity
     public:
         BlobHelper(const css::uno::Sequence< sal_Int8 >& _val);
     private:
-        virtual ::sal_Int64 SAL_CALL length(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int64 pos, ::sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(  ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int64 SAL_CALL position( const css::uno::Sequence< ::sal_Int8 >& pattern, ::sal_Int64 start ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int64 SAL_CALL positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& pattern, ::sal_Int64 start ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int64 SAL_CALL length(  ) override;
+        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int64 pos, ::sal_Int32 length ) override;
+        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(  ) override;
+        virtual ::sal_Int64 SAL_CALL position( const css::uno::Sequence< ::sal_Int8 >& pattern, ::sal_Int64 start ) override;
+        virtual ::sal_Int64 SAL_CALL positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& pattern, ::sal_Int64 start ) override;
     };
 }
 
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index ef69b80e420b..397e8b3faf8e 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -133,7 +133,7 @@ namespace connectivity
                                         const ::comphelper::UStringMixEqual& _rCase);
 
     /// @throws css::lang::DisposedException
-    OOO_DLLPUBLIC_DBTOOLS void checkDisposed(bool _bThrow) throw ( css::lang::DisposedException );
+    OOO_DLLPUBLIC_DBTOOLS void checkDisposed(bool _bThrow);
 
 #if HAVE_FEATURE_JAVA
     /** creates a java virtual machine
@@ -155,21 +155,21 @@ namespace connectivity
 }
 
 #define DECLARE_SERVICE_INFO()  \
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override; \
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; \
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override \
+    virtual OUString SAL_CALL getImplementationName(  ) override; \
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; \
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override \
 
 #define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname)  \
-    OUString SAL_CALL classname::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)   \
+    OUString SAL_CALL classname::getImplementationName(  )   \
     {   \
         return OUString(implasciiname); \
     }   \
-    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)  \
+    css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  )  \
     {   \
         css::uno::Sequence< OUString > aSupported { serviceasciiname }; \
         return aSupported;  \
     }   \
-    sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) \
+    sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) \
     {   \
         return cppu::supportsService(this, _rServiceName); \
     }   \
diff --git a/include/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx
index 3ae6b262823e..f09a2d702e4d 100644
--- a/include/connectivity/ConnectionWrapper.hxx
+++ b/include/connectivity/ConnectionWrapper.hxx
@@ -62,11 +62,11 @@ namespace connectivity
 
         // XServiceInfo
         DECLARE_SERVICE_INFO();
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // css::lang::XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
         static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
         /** method to create unique ids
             @param  _rURL
diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index 153b57a53054..90c40227fd4d 100644
--- a/include/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.hxx
@@ -139,7 +139,7 @@ namespace connectivity
 
             virtual void construct() 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;
         private:
             using OOrderColumn_BASE::createArrayHelper;
         };
diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx
index c2572ef8030b..10ca6da0f214 100644
--- a/include/connectivity/ParameterCont.hxx
+++ b/include/connectivity/ParameterCont.hxx
@@ -38,7 +38,7 @@ namespace dbtools
         const css::uno::Sequence< css::beans::PropertyValue >&   getValues() const { return m_aValues; }
 
         // XInteractionSupplyParameters
-        virtual void SAL_CALL setParameters( const css::uno::Sequence< css::beans::PropertyValue >& _rValues ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setParameters( const css::uno::Sequence< css::beans::PropertyValue >& _rValues ) override;
 
     protected:
         virtual ~OParameterContinuation() override { }
diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx
index 80de90eb10fc..4d9737c2cf20 100644
--- a/include/connectivity/TColumnsHelper.hxx
+++ b/include/connectivity/TColumnsHelper.hxx
@@ -38,7 +38,7 @@ namespace connectivity
         OTableHelper*   m_pTable;
 
         virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-        virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+        virtual void impl_refresh() override;
         virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
         virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
         virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
diff --git a/include/connectivity/TIndexColumns.hxx b/include/connectivity/TIndexColumns.hxx
index 363285565540..08b04b6bfb71 100644
--- a/include/connectivity/TIndexColumns.hxx
+++ b/include/connectivity/TIndexColumns.hxx
@@ -32,7 +32,7 @@ namespace connectivity
     protected:
         virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
         virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
-        virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+        virtual void impl_refresh() override;
     public:
         OIndexColumns(  OIndexHelper* _pIndex,
                         ::osl::Mutex& _rMutex,
diff --git a/include/connectivity/TIndexes.hxx b/include/connectivity/TIndexes.hxx
index 09a22737cff0..b08f65c8e7fc 100644
--- a/include/connectivity/TIndexes.hxx
+++ b/include/connectivity/TIndexes.hxx
@@ -32,7 +32,7 @@ namespace connectivity
         OTableHelper*   m_pTable;
     protected:
         virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-        virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+        virtual void impl_refresh() override;
         virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
         virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
         virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
diff --git a/include/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx
index a93bf43e57e2..c77a35cb32a9 100644
--- a/include/connectivity/TKeyColumns.hxx
+++ b/include/connectivity/TKeyColumns.hxx
@@ -32,7 +32,7 @@ namespace connectivity
     protected:
         virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
         virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
-        virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+        virtual void impl_refresh() override;
     public:
         OKeyColumnsHelper(  OTableKeyHelper* _pKey,
                         ::osl::Mutex& _rMutex,
diff --git a/include/connectivity/TKeys.hxx b/include/connectivity/TKeys.hxx
index b8d32a9217f8..fa7f66424efd 100644
--- a/include/connectivity/TKeys.hxx
+++ b/include/connectivity/TKeys.hxx
@@ -33,7 +33,7 @@ namespace connectivity
         OTableHelper*       m_pTable;
     protected:
         virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
-        virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+        virtual void impl_refresh() override;
         virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
         virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
         virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index 847094bf709b..15e13e0fc9f5 100644
--- a/include/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
@@ -139,12 +139,12 @@ namespace connectivity
         css::uno::Reference< css::sdbc::XConnection> getConnection() const;
 
         // XRename
-        virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL rename( const OUString& newName ) override;
 
         // XAlterTable
-        virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
         // XNamed
-        virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName() override;
 
         // helper method to get key properties
         std::shared_ptr<sdbcx::KeyProperties> getKeyProperties(const OUString& _sName) const;
diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx
index 7940a2ccb50e..9ef3d2af5aaa 100644
--- a/include/connectivity/conncleanup.hxx
+++ b/include/connectivity/conncleanup.hxx
@@ -58,15 +58,15 @@ namespace dbtools
 
     protected:
         // XPropertyChangeListener
-        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;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) override;
 
         // XRowSetListener
-        virtual void SAL_CALL cursorMoved( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rowChanged( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rowSetChanged( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cursorMoved( const css::lang::EventObject& event ) override;
+        virtual void SAL_CALL rowChanged( const css::lang::EventObject& event ) override;
+        virtual void SAL_CALL rowSetChanged( const css::lang::EventObject& event ) override;
 
     private:
         void clearConnection();
diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx
index 3223a7671f6e..2e67931cb3ad 100644
--- a/include/connectivity/dbconversion.hxx
+++ b/include/connectivity/dbconversion.hxx
@@ -75,13 +75,13 @@ namespace dbtools
                                     const OUString& rString,
                                     sal_Int32 nKey,
                                     sal_Int16 nFieldType,
-                                    sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException);
+                                    sal_Int16 nKeyType);
 
         /// @throws css::lang::IllegalArgumentException
         OOO_DLLPUBLIC_DBTOOLS void setValue(const css::uno::Reference< css::sdb::XColumnUpdate>& xVariant,
                              const css::util::Date& rNullDate,
                              const double& rValue,
-                             sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException);
+                             sal_Int16 nKeyType);
 
         OOO_DLLPUBLIC_DBTOOLS double getValue( const css::uno::Reference< css::sdb::XColumn>& xVariant, const css::util::Date& rNullDate );
 
diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx
index 4554c2d9e524..40c6066eddeb 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -216,15 +216,13 @@ OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState( StandardSQLState _eState );
 OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedSQLException(
         const OUString& _rFunctionName,
         const css::uno::Reference< css::uno::XInterface >& _rxContext
-    )
-    throw ( css::sdbc::SQLException );
+    );
 
 /// @throws css::uno::RuntimeException
 OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedRuntimeException(
         const OUString& _rFunctionName,
         const css::uno::Reference< css::uno::XInterface >& _rxContext
-    )
-    throw (css::uno::RuntimeException );
+    );
 
 /** throws a function sequence (HY010) exception
 
@@ -233,8 +231,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedRuntimeException(
 OOO_DLLPUBLIC_DBTOOLS void throwFunctionSequenceException(
         const css::uno::Reference< css::uno::XInterface >& Context,
         const css::uno::Any& Next = css::uno::Any()
-    )
-    throw ( css::sdbc::SQLException );
+    );
 
 
 /** throw a invalid index sqlexception
@@ -244,8 +241,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwFunctionSequenceException(
 OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException(
         const css::uno::Reference< css::uno::XInterface >& Context,
         const css::uno::Any& Next = css::uno::Any()
-    )
-    throw ( css::sdbc::SQLException );
+    );
 
 
 /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException
@@ -255,8 +251,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException(
 OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
         const OUString& _rMsg,
         const css::uno::Reference< css::uno::XInterface >& _rxSource
-    )
-    throw (css::sdbc::SQLException);
+    );
 
 
 /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException
@@ -267,8 +262,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
         const OUString& _rMsg,
         const css::uno::Reference< css::uno::XInterface >& _rxSource,
         const css::uno::Any& _rNextException
-    )
-    throw (css::sdbc::SQLException);
+    );
 
 
 /** throw a SQLException with SQLState HYC00 (Optional feature not implemented)
@@ -282,8 +276,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
 OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedSQLException(
         const OUString& _rFeatureName,
         const css::uno::Reference< css::uno::XInterface >& _rxContext
-    )
-    throw (css::sdbc::SQLException);
+    );
 
 /** throw a RuntimeException (Optional feature not implemented)
     @param _rFeatureName
@@ -296,8 +289,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedSQLException(
 OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedRuntimeException(
         const OUString& _rFeatureName,
         const css::uno::Reference< css::uno::XInterface >& _rxContext
-    )
-    throw (css::uno::RuntimeException);
+    );
 
 /** throw a SQLException with SQLState 42S22 (Column Not Found)
     @param _rColumnNameName
@@ -309,8 +301,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedRuntimeException(
 OOO_DLLPUBLIC_DBTOOLS void throwInvalidColumnException(
         const OUString& _rColumnName,
         const css::uno::Reference< css::uno::XInterface >& _rxContext
-    )
-    throw (css::sdbc::SQLException);
+    );
 
 
 /** @throws css::sdbc::SQLException
@@ -321,8 +312,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
         const css::uno::Reference< css::uno::XInterface >& _rxContext,
         const sal_Int32 _nErrorCode = 0,
         const css::uno::Any* _pNextException = nullptr
-    )
-    throw (css::sdbc::SQLException);
+    );
 
 
 /** @throws css::sdbc::SQLException
@@ -332,8 +322,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
         StandardSQLState _eSQLState,
         const css::uno::Reference< css::uno::XInterface >& _rxContext,
         const sal_Int32 _nErrorCode = 0
-    )
-    throw (css::sdbc::SQLException);
+    );
 
 
 }   // namespace dbtools
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 9cce10d6c49c..93fad78229a6 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -182,7 +182,7 @@ namespace dbtools
 
         @throws css::uno::RuntimeException
     */
-    OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::sdbc::XConnection> getConnection(const css::uno::Reference< css::sdbc::XRowSet>& _rxRowSet) throw (css::uno::RuntimeException);
+    OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::sdbc::XConnection> getConnection(const css::uno::Reference< css::sdbc::XRowSet>& _rxRowSet);
     OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::sdbc::XConnection> getConnection_withFeedback(
             const OUString& _rDataSourceName,
             const OUString& _rUser,
@@ -580,7 +580,7 @@ namespace dbtools
                             sal_Int32 parameterIndex,
                             const css::uno::Any& x,
                             sal_Int32 sqlType,
-                            sal_Int32 scale=0) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+                            sal_Int32 scale=0);
 
     /** call the appropriate set method for the specific sql type @see css::sdbc::DataType
         @param  _xParams        the parameters where to set the value
@@ -596,7 +596,7 @@ namespace dbtools
                             sal_Int32 parameterIndex,
                             const ::connectivity::ORowSetValue& x,
                             sal_Int32 sqlType,
-                            sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+                            sal_Int32 scale);
 
 
     /** implements <method scope="com.sun.star.sdb">XParameters::setObject</method>
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 2ccd288f87dd..cf2790a88ae6 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -91,16 +91,16 @@ namespace param
 
         DECLARE_XINTERFACE()
 
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertySetHelper
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) throw( css::lang::IllegalArgumentException ) override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw( css::uno::Exception, std::exception ) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
         // pseudo-XComponent
@@ -152,15 +152,15 @@ namespace param
         ParameterWrapperContainer( const css::uno::Reference< css::sdb::XSingleSelectQueryAnalyzer >& _rxComposer );
 
         // css::container::XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Type SAL_CALL getElementType() override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
         // css::container::XEnumerationAccess
-        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
         // css::container::XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
+        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) override;
 
     public:
         const Parameters& getParameters() { return m_aParameters; }
diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx
index 36b25ae65b16..3f7710e43630 100644
--- a/include/connectivity/sdbcx/VCatalog.hxx
+++ b/include/connectivity/sdbcx/VCatalog.hxx
@@ -107,13 +107,13 @@ namespace connectivity
             // XInterface
             void SAL_CALL release() throw() override;
             // XTablesSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) override;
             // XViewsSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews(  ) override;
             // XUsersSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers(  ) override;
             // XGroupsSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups(  ) override;
 
         };
     }
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index 8c5821901124..a801a1f1eba2 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -102,7 +102,7 @@ namespace connectivity
 
             // the implementing class should refresh their elements
             /// @throws css::uno::RuntimeException
-            virtual void impl_refresh() throw(css::uno::RuntimeException) = 0;
+            virtual void impl_refresh() = 0;
 
             // will be called when a object was requested by one of the accessing methods like getByIndex
             virtual ObjectType createObject(const OUString& _rName) = 0;
@@ -182,38 +182,38 @@ namespace connectivity
             virtual void SAL_CALL release() throw() override;
 
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
             // css::container::XElementAccess
-            virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Type SAL_CALL getElementType(  ) override;
+            virtual sal_Bool SAL_CALL hasElements(  ) override;
             // css::container::XIndexAccess
-            virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL getCount(  ) override;
+            virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                 // css::container::XNameAccess
-            virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+            virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
             // XEnumerationAccess
-            virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
                         // css::util::XRefreshable
-            virtual void SAL_CALL refresh(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL refresh(  ) override;
+            virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
+            virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
             // XDataDescriptorFactory
-            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
             // XAppend
-            virtual void SAL_CALL appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
             // XDrop
-            virtual void SAL_CALL dropByName( const OUString& elementName ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL dropByName( const OUString& elementName ) override;
+            virtual void SAL_CALL dropByIndex( sal_Int32 index ) override;
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override;
             // css::container::XContainer
-            virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+            virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
         private:
             void notifyElementRemoved(const OUString& _sName);
             void disposeElements();
diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx
index e28b01344d0b..68ad450c7fb3 100644
--- a/include/connectivity/sdbcx/VColumn.hxx
+++ b/include/connectivity/sdbcx/VColumn.hxx
@@ -95,20 +95,20 @@ namespace connectivity
 
             DECLARE_SERVICE_INFO();
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // ODescriptor
             virtual void construct() override;
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XNamed
-            virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getName(  ) override;
+            virtual void SAL_CALL setName( const OUString& aName ) override;
             // XDataDescriptorFactory
-            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
         };
     }
 }
diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx
index 7d89ad30e811..61b932c77729 100644
--- a/include/connectivity/sdbcx/VDescriptor.hxx
+++ b/include/connectivity/sdbcx/VDescriptor.hxx
@@ -69,12 +69,12 @@ namespace connectivity
             virtual void construct();
 
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             /// @throws css::uno::RuntimeException
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception);
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  );
 
             // css::lang::XUnoTunnel
-            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
             static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
             static ODescriptor* getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxSomeComp );
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index 06634a01b536..a18b4b21c153 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
@@ -74,25 +74,25 @@ namespace connectivity
             virtual void SAL_CALL release() throw() override;
 
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XUsersSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers(  ) override;
             // XAuthorizable
-            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
+            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
 
             // XNamed
-            virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getName(  ) override;
+            virtual void SAL_CALL setName( const OUString& aName ) override;
         };
     }
 }
diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx
index a7b75f7b9499..67560d192639 100644
--- a/include/connectivity/sdbcx/VIndex.hxx
+++ b/include/connectivity/sdbcx/VIndex.hxx
@@ -77,25 +77,25 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
 
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // ODescriptor
             virtual void construct() override;
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XColumnsSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
 
             // XNamed
-            virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getName(  ) override;
+            virtual void SAL_CALL setName( const OUString& aName ) override;
             // XDataDescriptorFactory
-            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
         };
     }
 }
diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index cabf0b5036ac..b3f72ecf961f 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
@@ -84,26 +84,26 @@ namespace connectivity
 
             DECLARE_SERVICE_INFO();
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // ODescriptor
             virtual void construct() override;
 
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XColumnsSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
 
             // XNamed
-            virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getName(  ) override;
+            virtual void SAL_CALL setName( const OUString& aName ) override;
             // XDataDescriptorFactory
-            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) override;
         };
     }
 }
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index 83047e6f31f4..ef6ed925cd67 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -100,9 +100,9 @@ namespace connectivity
             //XInterface
             virtual void    SAL_CALL acquire() throw() override;
             virtual void    SAL_CALL release() throw() override;
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
             // ODescriptor
             virtual void construct() override;
@@ -112,23 +112,23 @@ namespace connectivity
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XColumnsSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) override;
             // XKeysSupplier
-            virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getKeys(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getKeys(  ) override;
             // XNamed
-            virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getName() override;
+            virtual void SAL_CALL setName( const OUString& aName ) override;
             // XDataDescriptorFactory
-            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor() throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor() override;
             // XIndexesSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getIndexes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getIndexes(  ) override;
             // XRename
-            virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL rename( const OUString& newName ) override;
             // XAlterTable
-            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
 
             // helper method
             virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const;
diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx
index fd4cb5c03ac8..e434c0074ff9 100644
--- a/include/connectivity/sdbcx/VUser.hxx
+++ b/include/connectivity/sdbcx/VUser.hxx
@@ -71,26 +71,26 @@ namespace connectivity
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
             //XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XUser
-            virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) override;
             // XAuthorizable
-            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override;
+            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
+            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override;
             // XGroupsSupplier
-            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups(  ) override;
 
             // XNamed
-            virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getName(  ) override;
+            virtual void SAL_CALL setName( const OUString& aName ) override;
         };
     }
 }
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index 1f08aee8e66c..b81cccd27032 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -76,16 +76,16 @@ namespace connectivity
             virtual void construct() override;
 
             // XInterface
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
             virtual void SAL_CALL acquire() throw() override;
             virtual void SAL_CALL release() throw() override;
             //XTypeProvider
-            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
             // XPropertySet
-            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
             // XNamed
-            virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setName( const OUString& ) throw(css::uno::RuntimeException, std::exception) override;
+            virtual OUString SAL_CALL getName(  ) override;
+            virtual void SAL_CALL setName( const OUString& ) override;
         };
     }
 }
diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx
index 0b67044783cd..e7e196e9e2af 100644
--- a/include/cppuhelper/compbase.hxx
+++ b/include/cppuhelper/compbase.hxx
@@ -79,8 +79,7 @@ public:
     PartialWeakComponentImplHelper(osl::Mutex & mutex) throw ():
         WeakComponentImplHelperBase(mutex) {}
 
-    css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) SAL_OVERRIDE
     { return WeakComponentImplHelper_query(aType, cd::get(), this, this); }
 
     void SAL_CALL acquire() throw () SAL_OVERRIDE
@@ -89,16 +88,14 @@ public:
     void SAL_CALL release() throw () SAL_OVERRIDE
     { WeakComponentImplHelperBase::release(); }
 
-    void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL dispose()
         SAL_OVERRIDE
     { WeakComponentImplHelperBase::dispose(); }
 
-    css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() SAL_OVERRIDE
     { return WeakComponentImplHelper_getTypes(cd::get()); }
 
-    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() SAL_OVERRIDE
     { return css::uno::Sequence<sal_Int8>(); }
 };
 
@@ -122,13 +119,11 @@ public:
         PartialWeakComponentImplHelper<Ifc...>(mutex) {}
 
     void SAL_CALL addEventListener(
-        css::uno::Reference<css::lang::XEventListener> const & xListener)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        css::uno::Reference<css::lang::XEventListener> const & xListener) SAL_OVERRIDE
     { WeakComponentImplHelperBase::addEventListener(xListener); }
 
     void SAL_CALL removeEventListener(
-        css::uno::Reference<css::lang::XEventListener> const & aListener)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        css::uno::Reference<css::lang::XEventListener> const & aListener) SAL_OVERRIDE
     { WeakComponentImplHelperBase::removeEventListener(aListener); }
 };
 
diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx
index f60ba0c268c9..c43c57078720 100644
--- a/include/cppuhelper/compbase12.hxx
+++ b/include/cppuhelper/compbase12.hxx
@@ -50,21 +50,21 @@ namespace cppu
         inline WeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL dispose() SAL_OVERRIDE
             { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -88,15 +88,15 @@ namespace cppu
         inline PartialWeakComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -128,17 +128,17 @@ namespace cppu
         inline WeakAggComponentImplHelper12( ::osl::Mutex & rMutex ) throw ()
             : WeakAggComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx
index e82d1f688858..4804151f3df7 100644
--- a/include/cppuhelper/compbase2.hxx
+++ b/include/cppuhelper/compbase2.hxx
@@ -50,21 +50,21 @@ namespace cppu
         inline WeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL dispose() SAL_OVERRIDE
             { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -88,15 +88,15 @@ namespace cppu
         inline PartialWeakComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -129,17 +129,17 @@ namespace cppu
         inline WeakAggComponentImplHelper2( ::osl::Mutex & rMutex ) throw ()
             : WeakAggComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx
index d05183cee60b..674342073e31 100644
--- a/include/cppuhelper/compbase3.hxx
+++ b/include/cppuhelper/compbase3.hxx
@@ -50,21 +50,21 @@ namespace cppu
         inline WeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL dispose() SAL_OVERRIDE
             { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -88,15 +88,15 @@ namespace cppu
         inline PartialWeakComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -128,17 +128,17 @@ namespace cppu
         inline WeakAggComponentImplHelper3( ::osl::Mutex & rMutex ) throw ()
             : WeakAggComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx
index 888614adae93..b5e06502515b 100644
--- a/include/cppuhelper/compbase4.hxx
+++ b/include/cppuhelper/compbase4.hxx
@@ -50,21 +50,21 @@ namespace cppu
         inline WeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL dispose() SAL_OVERRIDE
             { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -88,15 +88,15 @@ namespace cppu
         inline PartialWeakComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -128,17 +128,17 @@ namespace cppu
         inline WeakAggComponentImplHelper4( ::osl::Mutex & rMutex ) throw ()
             : WeakAggComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx
index 66b5e9900811..1fe66f71254d 100644
--- a/include/cppuhelper/compbase5.hxx
+++ b/include/cppuhelper/compbase5.hxx
@@ -50,21 +50,21 @@ namespace cppu
         inline WeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL dispose() SAL_OVERRIDE
             { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -88,15 +88,15 @@ namespace cppu
         inline PartialWeakComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -128,17 +128,17 @@ namespace cppu
         inline WeakAggComponentImplHelper5( ::osl::Mutex & rMutex ) throw ()
             : WeakAggComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx
index f117badd98a5..e8cf7ad8a5b1 100644
--- a/include/cppuhelper/compbase6.hxx
+++ b/include/cppuhelper/compbase6.hxx
@@ -50,21 +50,21 @@ namespace cppu
         inline WeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL dispose() SAL_OVERRIDE
             { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -88,15 +88,15 @@ namespace cppu
         inline PartialWeakComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -128,17 +128,17 @@ namespace cppu
         inline WeakAggComponentImplHelper6( ::osl::Mutex & rMutex ) throw ()
             : WeakAggComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx
index f92d4e74d3b0..3690c9ce7d9b 100644
--- a/include/cppuhelper/compbase7.hxx
+++ b/include/cppuhelper/compbase7.hxx
@@ -50,21 +50,21 @@ namespace cppu
         inline WeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL dispose() SAL_OVERRIDE
             { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -88,15 +88,15 @@ namespace cppu
         inline PartialWeakComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -128,17 +128,17 @@ namespace cppu
         inline WeakAggComponentImplHelper7( ::osl::Mutex & rMutex ) throw ()
             : WeakAggComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx
index 9c45a53ddc5e..0e8600cdce3c 100644
--- a/include/cppuhelper/compbase8.hxx
+++ b/include/cppuhelper/compbase8.hxx
@@ -50,21 +50,21 @@ namespace cppu
         inline WeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL dispose() SAL_OVERRIDE
             { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -88,15 +88,15 @@ namespace cppu
         inline PartialWeakComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -128,17 +128,17 @@ namespace cppu
         inline WeakAggComponentImplHelper8( ::osl::Mutex & rMutex ) throw ()
             : WeakAggComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx
index aff4d567bdfd..730e63134dae 100644
--- a/include/cppuhelper/compbase9.hxx
+++ b/include/cppuhelper/compbase9.hxx
@@ -50,21 +50,21 @@ namespace cppu
         inline WeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual void SAL_CALL dispose()throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL dispose() SAL_OVERRIDE
             { WeakComponentImplHelperBase::dispose(); }
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::addEventListener(xListener); }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) SAL_OVERRIDE
             { WeakComponentImplHelperBase::removeEventListener(xListener); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -88,15 +88,15 @@ namespace cppu
         inline PartialWeakComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
             : WeakComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakComponentImplHelper_query( rType, cd::get(), this, static_cast<WeakComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 
@@ -127,17 +127,17 @@ namespace cppu
         inline WeakAggComponentImplHelper9( ::osl::Mutex & rMutex ) throw ()
             : WeakAggComponentImplHelperBase( rMutex )
             {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelperBase::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(), this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { WeakAggComponentImplHelperBase::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggComponentImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx
index 611d0a10541f..864dd3afa31f 100644
--- a/include/cppuhelper/compbase_ex.hxx
+++ b/include/cppuhelper/compbase_ex.hxx
@@ -68,20 +68,16 @@ public:
         {}
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Type const & rType ) SAL_OVERRIDE;
     virtual void SAL_CALL acquire()
         throw () SAL_OVERRIDE;
     virtual void SAL_CALL release()
         throw () SAL_OVERRIDE;
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL dispose() SAL_OVERRIDE;
     virtual void SAL_CALL addEventListener(
-        css::uno::Reference< css::lang::XEventListener > const & xListener )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Reference< css::lang::XEventListener > const & xListener ) SAL_OVERRIDE;
     virtual void SAL_CALL removeEventListener(
-        css::uno::Reference< css::lang::XEventListener > const & xListener )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Reference< css::lang::XEventListener > const & xListener ) SAL_OVERRIDE;
 };
 
 /** Implementation helper base class for components. Inherits from ::cppu::OWeakAggObject and
@@ -113,23 +109,18 @@ public:
         {}
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Type const & rType ) SAL_OVERRIDE;
     virtual css::uno::Any SAL_CALL queryAggregation(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Type const & rType ) SAL_OVERRIDE;
     virtual void SAL_CALL acquire()
         throw () SAL_OVERRIDE;
     virtual void SAL_CALL release()
         throw () SAL_OVERRIDE;
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL dispose() SAL_OVERRIDE;
     virtual void SAL_CALL addEventListener(
-        css::uno::Reference< css::lang::XEventListener > const & xListener )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Reference< css::lang::XEventListener > const & xListener ) SAL_OVERRIDE;
     virtual void SAL_CALL removeEventListener(
-        css::uno::Reference< css::lang::XEventListener > const & xListener )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Reference< css::lang::XEventListener > const & xListener ) SAL_OVERRIDE;
 };
 
 /** WeakComponentImplHelper
diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx
index e9a684f1b14c..d6b45a825222 100644
--- a/include/cppuhelper/component.hxx
+++ b/include/cppuhelper/component.hxx
@@ -61,11 +61,9 @@ public:
 
     // XAggregation
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Type const & rType ) SAL_OVERRIDE;
     virtual css::uno::Any SAL_CALL queryAggregation(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Type const & rType ) SAL_OVERRIDE;
     virtual void SAL_CALL acquire()
         throw () SAL_OVERRIDE;
     virtual void SAL_CALL release()
@@ -74,23 +72,18 @@ public:
     /** @attention
         XTypeProvider::getImplementationId() has to be implemented separately!
     */
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE = 0;
     /** @attention
         XTypeProvider::getTypes() has to be re-implemented!
     */
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL dispose() SAL_OVERRIDE;
     virtual void SAL_CALL addEventListener(
-        const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference< css::lang::XEventListener >& aListener ) SAL_OVERRIDE;
     virtual void SAL_CALL removeEventListener(
-        const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference< css::lang::XEventListener >& aListener ) SAL_OVERRIDE;
 
 protected:
     /** Called in dispose method after the listeners were notified.
diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx
index f8c8bae54d5f..7d46d47edd31 100644
--- a/include/cppuhelper/implbase.hxx
+++ b/include/cppuhelper/implbase.hxx
@@ -104,20 +104,17 @@ protected:
     virtual ~WeakImplHelper() override {}
 
 public:
-    css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType)
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) override
     { return WeakImplHelper_query(aType, cd::get(), this, this); }
 
     void SAL_CALL acquire() throw () override { OWeakObject::acquire(); }
 
     void SAL_CALL release() throw () override { OWeakObject::release(); }
 
-    css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override
     { return WeakImplHelper_getTypes(cd::get()); }
 
-    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override
     { return css::uno::Sequence<sal_Int8>(); }
 };
 
@@ -155,8 +152,7 @@ protected:
     virtual ~ImplInheritanceHelper() {}
 
 public:
-    css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType)
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) override
     {
         css::uno::Any ret(ImplHelper_queryNoXInterface(aType, cd::get(), this));
         return ret.hasValue() ? ret : BaseClass::queryInterface(aType);
@@ -166,12 +162,10 @@ public:
 
     void SAL_CALL release() throw () override { BaseClass::release(); }
 
-    css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override
     { return ImplInhHelper_getTypes(cd::get(), BaseClass::getTypes()); }
 
-    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override
     { return css::uno::Sequence<sal_Int8>(); }
 };
 
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index c79e30c37418..952387ef201f 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.hxx
@@ -69,11 +69,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1 < Ifc1, ImplHelper1<Ifc1> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -107,15 +107,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakImplHelper1< Ifc1 > > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -139,17 +139,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData1< Ifc1, WeakAggImplHelper1< Ifc1 > > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -203,7 +203,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper1() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -214,9 +214,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -271,9 +271,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper1() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -284,9 +284,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx
index 435cde9f5cf9..a4657a665874 100644
--- a/include/cppuhelper/implbase10.hxx
+++ b/include/cppuhelper/implbase10.hxx
@@ -79,11 +79,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, ImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -113,15 +113,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -145,17 +145,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, WeakAggImplHelper10<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -209,7 +209,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper10() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -220,9 +220,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -277,9 +277,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper10() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -290,9 +290,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx
index f3d72613ae11..43a02cf60fa2 100644
--- a/include/cppuhelper/implbase12.hxx
+++ b/include/cppuhelper/implbase12.hxx
@@ -81,11 +81,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, ImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -115,15 +115,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -147,17 +147,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData12< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, WeakAggImplHelper12<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -211,7 +211,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper12() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -222,9 +222,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -279,9 +279,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper12() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -292,9 +292,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx
index 8ad2593dbe34..995f0453a141 100644
--- a/include/cppuhelper/implbase13.hxx
+++ b/include/cppuhelper/implbase13.hxx
@@ -82,11 +82,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData13< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, ImplHelper13<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -116,15 +116,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData13< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, WeakImplHelper13<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -148,17 +148,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData13< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, WeakAggImplHelper13<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -212,7 +212,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper13() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -223,9 +223,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -280,9 +280,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper13() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -293,9 +293,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx
index 7c435f6ddc62..1d1b36fec1ef 100644
--- a/include/cppuhelper/implbase2.hxx
+++ b/include/cppuhelper/implbase2.hxx
@@ -70,11 +70,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, ImplHelper2<Ifc1, Ifc2> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -104,15 +104,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakImplHelper2<Ifc1, Ifc2> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -136,17 +136,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 < Ifc1, Ifc2, WeakAggImplHelper2<Ifc1, Ifc2> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -200,7 +200,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper2() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -211,9 +211,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -268,9 +268,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper2() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -281,9 +281,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx
index 54a8abbdb516..c9a0d35ba3c6 100644
--- a/include/cppuhelper/implbase3.hxx
+++ b/include/cppuhelper/implbase3.hxx
@@ -71,11 +71,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, ImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -105,15 +105,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -137,17 +137,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 < Ifc1, Ifc2, Ifc3, WeakAggImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -202,7 +202,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper3() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -213,9 +213,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -270,9 +270,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper3() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -283,9 +283,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx
index 639630d202bc..a4879760bea1 100644
--- a/include/cppuhelper/implbase4.hxx
+++ b/include/cppuhelper/implbase4.hxx
@@ -73,11 +73,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, ImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -107,15 +107,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -139,17 +139,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -203,7 +203,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper4() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -214,9 +214,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -271,9 +271,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper4() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -284,9 +284,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx
index 2f9920e8de1f..6540bfcf179f 100644
--- a/include/cppuhelper/implbase5.hxx
+++ b/include/cppuhelper/implbase5.hxx
@@ -74,11 +74,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, ImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -108,15 +108,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -140,17 +140,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData5 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, WeakAggImplHelper5<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -204,7 +204,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper5() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -215,9 +215,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -272,9 +272,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper5() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -285,9 +285,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx
index 457b7dc62164..c4d50dd04d17 100644
--- a/include/cppuhelper/implbase6.hxx
+++ b/include/cppuhelper/implbase6.hxx
@@ -75,11 +75,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, ImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -109,15 +109,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -141,17 +141,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData6 < Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, WeakAggImplHelper6<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -205,7 +205,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper6() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -216,9 +216,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -273,9 +273,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper6() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -286,9 +286,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx
index f18cf7dea7fd..01f500b74ae7 100644
--- a/include/cppuhelper/implbase7.hxx
+++ b/include/cppuhelper/implbase7.hxx
@@ -76,11 +76,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, ImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -110,15 +110,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -142,17 +142,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData7< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, WeakAggImplHelper7<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -206,7 +206,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper7() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -217,9 +217,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -274,9 +274,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper7() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -287,9 +287,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx
index 69ef371b239f..a09d28495e99 100644
--- a/include/cppuhelper/implbase8.hxx
+++ b/include/cppuhelper/implbase8.hxx
@@ -77,11 +77,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, ImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -111,15 +111,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -143,17 +143,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData8< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakAggImplHelper8<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -207,7 +207,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper8() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -218,9 +218,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -275,9 +275,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper8() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -288,9 +288,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx
index 0516d566f88d..6b82c2733be1 100644
--- a/include/cppuhelper/implbase9.hxx
+++ b/include/cppuhelper/implbase9.hxx
@@ -78,11 +78,11 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, ImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return ImplHelper_query( rType, cd::get(), this ); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
 
 #if !defined _MSC_VER // public -> protected changes mangled names there
@@ -112,15 +112,15 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakImplHelper_query( rType, cd::get(), this, static_cast<OWeakObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -144,17 +144,17 @@ namespace cppu
     {
         struct cd : public rtl::StaticAggregate< class_data, ImplClassData9< Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, WeakAggImplHelper9<Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9> > > {};
     public:
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return OWeakAggObject::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             { return WeakAggImplHelper_queryAgg( rType, cd::get(), this, static_cast<OWeakAggObject *>(this) ); }
         virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
             { OWeakAggObject::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { OWeakAggObject::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return WeakAggImplHelper_getTypes( cd::get() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -208,7 +208,7 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         ImplInheritanceHelper9() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -219,9 +219,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
     /** Implementation helper implementing interfaces css::lang::XTypeProvider and
@@ -276,9 +276,9 @@ namespace cppu
             BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
     public:
         AggImplInheritanceHelper9() {}
-        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE
             { return BaseClass::queryInterface( rType ); }
-        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE
             {
                 css::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
                 if (aRet.hasValue())
@@ -289,9 +289,9 @@ namespace cppu
             { BaseClass::acquire(); }
         virtual void SAL_CALL release() throw () SAL_OVERRIDE
             { BaseClass::release(); }
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE
             { return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException) SAL_OVERRIDE
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() SAL_OVERRIDE
             { return ImplHelper_getImplementationId( cd::get() ); }
     };
 }
diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx
index 0320da13cc21..fb112fea09cb 100644
--- a/include/cppuhelper/propertysetmixin.hxx
+++ b/include/cppuhelper/propertysetmixin.hxx
@@ -262,31 +262,19 @@ protected:
        object.
     */
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & type)
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Type const & type) SAL_OVERRIDE;
 
     // @see css::beans::XPropertySet::getPropertySetInfo
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() SAL_OVERRIDE;
 
     // @see css::beans::XPropertySet::setPropertyValue
     virtual void SAL_CALL setPropertyValue(
         rtl::OUString const & propertyName,
-        css::uno::Any const & value)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Any const & value) SAL_OVERRIDE;
 
     // @see css::beans::XPropertySet::getPropertyValue
     virtual css::uno::Any SAL_CALL getPropertyValue(
-        rtl::OUString const & propertyName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        rtl::OUString const & propertyName) SAL_OVERRIDE;
 
     /**
        @short Adds a
@@ -300,21 +288,13 @@ protected:
     virtual void SAL_CALL addPropertyChangeListener(
         rtl::OUString const & propertyName,
         css::uno::Reference<
-        css::beans::XPropertyChangeListener > const & listener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::beans::XPropertyChangeListener > const & listener) SAL_OVERRIDE;
 
     // @see css::beans::XPropertySet::removePropertyChangeListener
     virtual void SAL_CALL removePropertyChangeListener(
         rtl::OUString const & propertyName,
         css::uno::Reference<
-        css::beans::XPropertyChangeListener > const & listener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::beans::XPropertyChangeListener > const & listener) SAL_OVERRIDE;
 
     /**
        @short Adds a
@@ -328,53 +308,28 @@ protected:
     virtual void SAL_CALL addVetoableChangeListener(
         rtl::OUString const & propertyName,
         css::uno::Reference<
-        css::beans::XVetoableChangeListener > const & listener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::beans::XVetoableChangeListener > const & listener) SAL_OVERRIDE;
 
     // @see css::beans::XPropertySet::removeVetoableChangeListener
     virtual void SAL_CALL removeVetoableChangeListener(
         rtl::OUString const & propertyName,
         css::uno::Reference<
-        css::beans::XVetoableChangeListener > const & listener)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::beans::XVetoableChangeListener > const & listener) SAL_OVERRIDE;
 
     // @see css::beans::XFastPropertySet::setFastPropertyValue
     virtual void SAL_CALL setFastPropertyValue(
-        sal_Int32 handle, css::uno::Any const & value)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        sal_Int32 handle, css::uno::Any const & value) SAL_OVERRIDE;
 
     // @see css::beans::XFastPropertySet::getFastPropertyValue
     virtual css::uno::Any SAL_CALL getFastPropertyValue(
-        sal_Int32 handle)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        sal_Int32 handle) SAL_OVERRIDE;
 
     // @see css::beans::XPropertyAccess::getPropertyValues
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() SAL_OVERRIDE;
 
     // @see css::beans::XPropertyAccess::setPropertyValues
     virtual void SAL_CALL setPropertyValues(
-        css::uno::Sequence< css::beans::PropertyValue > const & props)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        css::uno::Sequence< css::beans::PropertyValue > const & props) SAL_OVERRIDE;
 
 private:
     PropertySetMixinImpl( const PropertySetMixinImpl&) SAL_DELETED_FUNCTION;
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index ecba58c6db34..2befe21adbc5 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -84,8 +84,7 @@ public:
        @exception UnknownPropertyException  thrown if the property name is unknown.
      */
     virtual css::beans::Property SAL_CALL getPropertyByName(
-        const ::rtl::OUString& rPropertyName )
-        throw (css::beans::UnknownPropertyException) = 0;
+        const ::rtl::OUString& rPropertyName ) = 0;
     /**
        Return true if the property with the name rPropertyName exist, otherwise false.
        @param rPropertyName the name of the property.
@@ -164,8 +163,7 @@ public:
        @exception UnknownPropertyException  thrown if the property name is unknown.
      */
     virtual css::beans::Property SAL_CALL getPropertyByName(
-        const ::rtl::OUString& rPropertyName )
-        throw (css::beans::UnknownPropertyException) SAL_OVERRIDE;
+        const ::rtl::OUString& rPropertyName ) SAL_OVERRIDE;
     /**
        Return true if the property with the name rPropertyName exist, otherwise false.
        @param rPropertyName the name of the property.
@@ -424,15 +422,13 @@ public:
        Only returns a reference to XMultiPropertySet, XFastPropertySet, XPropertySet and
        XEventListener.
      */
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) SAL_OVERRIDE;
 
     /** eases implementing XTypeProvider::getTypes, returns the types of XMultiPropertySet, XFastPropertySet, XPropertySet
 
         @throws css::uno::RuntimeException
      */
-    css::uno::Sequence< css::uno::Type > getTypes()
-        throw(css::uno::RuntimeException);
+    css::uno::Sequence< css::uno::Type > getTypes();
 
     /**
        Send a disposing notification to the listeners in the containers aBoundLC
@@ -447,37 +443,31 @@ public:
        rPropertyName does not exist or is readonly. Otherwise rPropertyName is changed to its handle
        value and setFastPropertyValue is called.
      */
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const css::uno::Any& aValue )
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& rPropertyName, const css::uno::Any& aValue ) SAL_OVERRIDE;
     /**
        Throw UnknownPropertyException if the property with the name
        rPropertyName does not exist.
      */
-    virtual css::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& aPropertyName) SAL_OVERRIDE;
     /** Ignored if the property is not bound. */
     virtual void SAL_CALL addPropertyChangeListener(
         const ::rtl::OUString& aPropertyName,
-        const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener) SAL_OVERRIDE;
 
     /** Ignored if the property is not bound. */
     virtual void SAL_CALL removePropertyChangeListener(
         const ::rtl::OUString& aPropertyName,
-        const css::uno::Reference < css::beans::XPropertyChangeListener >& aListener)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference < css::beans::XPropertyChangeListener >& aListener) SAL_OVERRIDE;
 
     /** Ignored if the property is not constrained. */
     virtual void SAL_CALL addVetoableChangeListener(
         const ::rtl::OUString& aPropertyName,
-        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener) SAL_OVERRIDE;
 
     /** Ignored if the property is not constrained. */
     virtual void SAL_CALL removeVetoableChangeListener(
         const ::rtl::OUString& aPropertyName,
-        const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener ) SAL_OVERRIDE;
 
     /**
        Throw UnknownPropertyException or PropertyVetoException if the property with the name
@@ -486,39 +476,32 @@ public:
        is changed with the setFastPropertyValue_NoBroadcast method and the bound listeners are
        notified.
       */
-    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) SAL_OVERRIDE;
 
     /**
        @exception css::beans::UnknownPropertyException
          if the property with the handle nHandle does not exist.
      */
-    virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) SAL_OVERRIDE;
 
     // XMultiPropertySet
     virtual void SAL_CALL setPropertyValues(
         const css::uno::Sequence< ::rtl::OUString >& PropertyNames,
-        const css::uno::Sequence< css::uno::Any >& Values )
-        throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Sequence< css::uno::Any >& Values ) SAL_OVERRIDE;
 
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues(
-        const css::uno::Sequence< ::rtl::OUString >& PropertyNames )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Sequence< ::rtl::OUString >& PropertyNames ) SAL_OVERRIDE;
 
     virtual void SAL_CALL addPropertiesChangeListener(
         const css::uno::Sequence< ::rtl::OUString >& PropertyNames,
-        const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) SAL_OVERRIDE;
 
     virtual void SAL_CALL removePropertiesChangeListener(
-        const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) SAL_OVERRIDE;
 
     virtual void SAL_CALL firePropertiesChangeEvent(
         const css::uno::Sequence< ::rtl::OUString >& PropertyNames,
-        const css::uno::Reference< css::beans::XPropertiesChangeListener > & Listener )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Reference< css::beans::XPropertiesChangeListener > & Listener ) SAL_OVERRIDE;
 
     /**
        The property sequence is created in the call. The interface isn't used after the call.
@@ -582,10 +565,7 @@ protected:
         css::uno::Any & rConvertedValue,
         css::uno::Any & rOldValue,
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::lang::IllegalArgumentException,
-               css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) = 0;
+        const css::uno::Any& rValue ) = 0;
 
     /** The same as setFastProperyValue; nHandle is always valid.
         The changes must not be broadcasted in this method.
@@ -608,9 +588,7 @@ protected:
     */
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-            throw (css::uno::Exception,
-                   std::exception) = 0;
+        const css::uno::Any& rValue ) = 0;
     /**
        The same as getFastProperyValue, but return the value through rValue and nHandle
        is always valid.
@@ -722,12 +700,10 @@ public:
         bool bIgnoreRuntimeExceptionsWhileFiring = false);
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) SAL_OVERRIDE;
 
     // XPropertySetOption
-    virtual void SAL_CALL enableChangeListenerNotification( sal_Bool bEnable )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL enableChangeListenerNotification( sal_Bool bEnable ) SAL_OVERRIDE;
 
 
 private:
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index fd797e021c88..0bc22a49e005 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -131,8 +131,7 @@ public:
         @return demanded type or empty any
     */
     virtual css::uno::Any SAL_CALL queryInterface(
-        const css::uno::Type & rType )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        const css::uno::Type & rType ) SAL_OVERRIDE;
     /** increasing m_refCount
     */
     virtual void SAL_CALL acquire()
@@ -146,8 +145,7 @@ public:
 
         @return a com::sun::star::uno::XAdapter reference
     */
-    virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter()
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter() SAL_OVERRIDE;
 
     /** Cast operator to XInterface reference.
 
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index 25a06875c3ba..b633c44ce26d 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.hxx
@@ -64,22 +64,19 @@ public:
         @return demanded type or empty any
         @see queryAggregation.
     */
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) SAL_OVERRIDE;
 
     /** Set the delegator.  The delegator member reference is a weak reference.
 
         @param Delegator the object that delegate its queryInterface to this aggregate.
     */
-    virtual void SAL_CALL setDelegator( const css::uno::Reference< css::uno::XInterface > & Delegator )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL setDelegator( const css::uno::Reference< css::uno::XInterface > & Delegator ) SAL_OVERRIDE;
     /** Called by the delegator or queryInterface. Re-implement this method instead of
         queryInterface.
 
         @see queryInterface
     */
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType )
-        throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) SAL_OVERRIDE;
 
 protected:
     /** Virtual dtor. Called when reference count is 0.
diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx
index f657fcf63852..2f3e0ba6ef3d 100644
--- a/include/dbaccess/IController.hxx
+++ b/include/dbaccess/IController.hxx
@@ -123,7 +123,7 @@ namespace dbaui
             @throws css::uno::RuntimeException
         */
         virtual css::uno::Reference< css::frame::XController >
-                getXController() throw( css::uno::RuntimeException ) = 0;
+                getXController() = 0;
 
         /** allows interception of user input, aka mouse clicks and key events
         */
diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx
index b855c0d682a0..421a01ec28ab 100644
--- a/include/dbaccess/dbaundomanager.hxx
+++ b/include/dbaccess/dbaundomanager.hxx
@@ -80,32 +80,32 @@ namespace dbaui
         void disposing();
 
         // XUndoManager
-        virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL enterHiddenUndoContext(  ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL leaveUndoContext(  ) throw (css::util::InvalidStateException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL undo(  ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL redo(  ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isUndoPossible(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isRedoPossible(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCurrentUndoActionTitle(  ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCurrentRedoActionTitle(  ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clear(  ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearRedo(  ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL reset(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL enterUndoContext( const OUString& i_title ) override;
+        virtual void SAL_CALL enterHiddenUndoContext(  ) override;
+        virtual void SAL_CALL leaveUndoContext(  ) override;
+        virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) override;
+        virtual void SAL_CALL undo(  ) override;
+        virtual void SAL_CALL redo(  ) override;
+        virtual sal_Bool SAL_CALL isUndoPossible(  ) override;
+        virtual sal_Bool SAL_CALL isRedoPossible(  ) override;
+        virtual OUString SAL_CALL getCurrentUndoActionTitle(  ) override;
+        virtual OUString SAL_CALL getCurrentRedoActionTitle(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles(  ) override;
+        virtual void SAL_CALL clear(  ) override;
+        virtual void SAL_CALL clearRedo(  ) override;
+        virtual void SAL_CALL reset(  ) override;
+        virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override;
+        virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override;
 
         // XLockable (base of XUndoManager)
-        virtual void SAL_CALL lock(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL unlock(  ) throw (css::util::NotLockedException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLocked(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL lock(  ) override;
+        virtual void SAL_CALL unlock(  ) override;
+        virtual sal_Bool SAL_CALL isLocked(  ) override;
 
         // XChild (base of XUndoManager)
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     private:
         std::unique_ptr< UndoManager_Impl > m_xImpl;
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx
index 4259fd5a193e..f4d84f12b99e 100644
--- a/include/dbaccess/dbsubcomponentcontroller.hxx
+++ b/include/dbaccess/dbsubcomponentcontroller.hxx
@@ -152,22 +152,22 @@ namespace dbaui
         css::uno::Reference< css::util::XNumberFormatter >    getNumberFormatter() const;
 
         // css::frame::XController
-        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) override;
+        virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) override;
 
         // XScriptInvocationContext
-        virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() override;
 
         // XModifiable
-        virtual sal_Bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isModified(  ) override;
+        virtual void SAL_CALL setModified( sal_Bool bModified ) override;
 
         // XModifyBroadcaster
-        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
         // XTitle
-        virtual OUString SAL_CALL getTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTitle(  ) override;
 
     protected:
         DBSubComponentController(const css::uno::Reference< css::uno::XComponentContext>& _rxORB);
@@ -187,16 +187,16 @@ namespace dbaui
 
     protected:
         // 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;
 
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
 
         // XInterface
-        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     protected:
         sal_Int32 getCurrentStartNumber() const;
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index 9998f495deff..bae36a23ec54 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -464,87 +464,87 @@ namespace dbaui
         virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) override;
         virtual void notifyHiContrastChanged() override;
         virtual bool isDataSourceReadOnly() const override;
-        virtual css::uno::Reference< css::frame::XController > getXController() throw( css::uno::RuntimeException ) override;
+        virtual css::uno::Reference< css::frame::XController > getXController() override;
         virtual bool interceptUserInput( const NotifyEvent& _rEvent ) override;
 
         // misc
         bool isCommandChecked(sal_uInt16 _nCommandId) const;
 
         // css::lang::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;
 
         // css::util::XModifyListener
-        virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override;
 
         // XInterface
         virtual void SAL_CALL acquire(  ) throw () override;
         virtual void SAL_CALL release(  ) throw () override;
 
         // css::frame::XController2
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() override;
+        virtual OUString SAL_CALL getViewControllerName() override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() override;
 
-        virtual css::uno::Reference< css::ui::XSidebarProvider > SAL_CALL getSidebar() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::ui::XSidebarProvider > SAL_CALL getSidebar() override;
 
 
         // css::frame::XController
-        virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override = 0;
-        virtual css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Reference< css::frame::XModel >  SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Reference< css::frame::XFrame >  SAL_CALL getFrame() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL attachFrame(const css::uno::Reference< css::frame::XFrame > & xFrame) override;
+        virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) override;
+        virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) override = 0;
+        virtual css::uno::Any SAL_CALL getViewData() override;
+        virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) override;
+        virtual css::uno::Reference< css::frame::XModel >  SAL_CALL getModel() override;
+        virtual css::uno::Reference< css::frame::XFrame >  SAL_CALL getFrame() override;
 
         // css::frame::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 > & aListener, const css::util::URL& aURL) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void        SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, 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 > & aListener, const css::util::URL& aURL) override;
+        virtual void        SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL) override;
 
         // css::frame::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 > & _xNewProvider) throw(css::uno::RuntimeException, std::exception) 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 > & _xNewProvider) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::frame::XDispatchProvider >  SAL_CALL getSlaveDispatchProvider() override;
+        virtual void SAL_CALL setSlaveDispatchProvider(const css::uno::Reference< css::frame::XDispatchProvider > & _xNewProvider) override;
+        virtual css::uno::Reference< css::frame::XDispatchProvider >  SAL_CALL getMasterDispatchProvider() override;
+        virtual void SAL_CALL setMasterDispatchProvider(const css::uno::Reference< css::frame::XDispatchProvider > & _xNewProvider) override;
 
         // css::frame::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;
-        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;
+        virtual css::uno::Reference< css::frame::XDispatch >  SAL_CALL 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) override;
 
         // css::lang::XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; //LLA: need solar mutex {OGenericUnoController_COMPBASE::dispose(); }
+        virtual void SAL_CALL dispose() override; //LLA: need solar mutex {OGenericUnoController_COMPBASE::dispose(); }
         virtual void SAL_CALL disposing() override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
 
         // css::frame::XFrameActionListener
-        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override;
         // lang::XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override = 0;
+        virtual OUString SAL_CALL getImplementationName() override = 0;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override = 0;
 
         // XDispatchInformationProvider
-        virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 ) 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 ) override;
 
         // XTitle
-        virtual OUString SAL_CALL getTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTitle(  ) override;
+        virtual void SAL_CALL setTitle( const OUString& sTitle ) override;
 
         // XTitleChangeBroadcaster
-        virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
+        virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
 
         // XUserInputInterception
-        virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) override;
+        virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) override;
+        virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) override;
+        virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) override;
 
     protected:
 #ifdef _MSC_VER
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 0bf92cef056a..4fc9b30a4ba1 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -211,15 +211,15 @@ namespace drawinglayer
             /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It
                 will construct a ViewInformation2D from the ViewParameters for that purpose
              */
-            virtual Primitive2DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual Primitive2DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
 
             /** The getRange implementation for UNO API will use getRange from this implementation. It
                 will construct a ViewInformation2D from the ViewParameters for that purpose
              */
-            virtual css::geometry::RealRectangle2D SAL_CALL getRange( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual css::geometry::RealRectangle2D SAL_CALL getRange( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
 
             // XAccounting
-            virtual sal_Int64 SAL_CALL estimateUsage() throw (css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL estimateUsage() override;
 
         };
     } // end of namespace primitive2d
diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
index a14fa68481f8..26f507896c98 100644
--- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
@@ -71,7 +71,7 @@ namespace drawinglayer
             DeclPrimitive2DIDBlock()
 
             // XAccounting
-            virtual sal_Int64 SAL_CALL estimateUsage() throw (css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL estimateUsage() override;
         };
     } // end of namespace primitive2d
 } // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
index f08e032ad96e..a38c28d4657c 100644
--- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
@@ -88,7 +88,7 @@ namespace drawinglayer
             DeclPrimitive2DIDBlock()
 
             // XAccounting
-            virtual sal_Int64 SAL_CALL estimateUsage() throw (css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL estimateUsage() override;
         };
     } // end of namespace primitive2d
 } // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
index 800c3778d0aa..c4a53dbf5d7b 100644
--- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx
@@ -89,7 +89,7 @@ namespace drawinglayer
             DeclPrimitive2DIDBlock()
 
             // XAccounting
-            virtual sal_Int64 SAL_CALL estimateUsage() throw (css::uno::RuntimeException) override;
+            virtual sal_Int64 SAL_CALL estimateUsage() override;
         };
     } // end of namespace primitive2d
 } // end of namespace drawinglayer
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index f9ba1b82f80a..e447004277a8 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -133,12 +133,12 @@ namespace drawinglayer
             /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It
                 will get the ViewInformation from the ViewParameters for that purpose
              */
-            virtual Primitive3DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual Primitive3DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
 
             /** the getRange default implementation will use getDecomposition to create the range information from merging
                 getRange results from the single local decomposition primitives.
              */
-            virtual css::geometry::RealRectangle3D SAL_CALL getRange( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual css::geometry::RealRectangle3D SAL_CALL getRange( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) override;
         };
     } // end of namespace primitive3d
 } // end of namespace drawinglayer
diff --git a/include/editeng/AccessibleComponentBase.hxx b/include/editeng/AccessibleComponentBase.hxx
index 55c5775e9de3..34bca5b9f2cc 100644
--- a/include/editeng/AccessibleComponentBase.hxx
+++ b/include/editeng/AccessibleComponentBase.hxx
@@ -54,70 +54,57 @@ public:
         inside this object.
     */
     virtual sal_Bool SAL_CALL containsPoint (
-        const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& aPoint) override;
 
     /** The default implementation returns an empty reference.
     */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
         getAccessibleAtPoint (
-            const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::awt::Point& aPoint) override;
 
     /** The default implementation returns an empty rectangle.
     */
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
     /** The default implementation uses the result of
         <member>getBounds</member> to determine the location.
     */
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
     /** The default implementation returns an empty position, i.e. the
     * result of the default constructor of css::awt::Point.
     */
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
     /** The default implementation uses the result of
         <member>getBounds</member> to determine the size.
     */
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
     /** The default implementation does nothing.
     */
-    virtual void SAL_CALL grabFocus()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() override;
 
     /** Returns black as the default foreground color.
     */
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
 
     /** Returns white as the default background color.
     */
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     //=====  XAccessibleExtendedComponent  ====================================
     virtual css::uno::Reference< css::awt::XFont > SAL_CALL
-        getFont()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getFont() override;
+    virtual OUString SAL_CALL getTitledBorderText() override;
+    virtual OUString SAL_CALL getToolTipText() override;
 
 
     //=====  XTypeProvider  ===================================================
 
     /// @throws css::uno::RuntimeException
     virtual css::uno::Sequence< css::uno::Type> SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception);
+        getTypes();
 
 };
 
diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx
index 5cb1fe7abc97..54ef0184c4a3 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -106,8 +106,7 @@ public:
     */
     void SetAccessibleDescription (
         const OUString& rsDescription,
-        StringOrigin eDescriptionOrigin)
-        throw (css::uno::RuntimeException);
+        StringOrigin eDescriptionOrigin);
 
     /** Set a new description and, provided that the new name differs from
         the old one, broadcast an accessibility event.
@@ -121,8 +120,7 @@ public:
     */
     void SetAccessibleName (
         const OUString& rsName,
-        StringOrigin eNameOrigin)
-        throw (css::uno::RuntimeException);
+        StringOrigin eNameOrigin);
 
     /** Set the specified state (turn it on) and send events to all
         listeners to inform them of the change.
@@ -168,82 +166,69 @@ public:
         @throws css::uno::RuntimeException
     */
     void SetRelationSet (
-        const css::uno::Reference< css::accessibility::XAccessibleRelationSet>& rxRelationSet)
-        throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::accessibility::XAccessibleRelationSet>& rxRelationSet);
 
 
     //=====  XAccessible  =====================================================
 
     /// Return the XAccessibleContext.
     virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
 
     //=====  XAccessibleContext  ==============================================
 
     /// Return the number of currently visible children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     /// Return the specified child or throw exception.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
     /// Return a reference to the parent.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent() override;
 
     /// Return this objects index among the parents children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleIndexInParent() override;
 
     /// Return this object's role.
     virtual sal_Int16 SAL_CALL
-        getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRole() override;
 
     /// Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     /// Return the object's current name.
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
     /// Return NULL to indicate that an empty relation set.
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     /// Return the set of current states.
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     /** Return the parents locale or throw exception if this object has no
         parent yet/anymore.
     */
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-        throw (css::uno::RuntimeException,
-            css::accessibility::IllegalAccessibleComponentStateException, std::exception) override;
+        getLocale() override;
 
     //=====  XAccessibleEventBroadcaster  ========================================
 
     virtual void SAL_CALL
         addAccessibleEventListener (
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override;
 
     virtual void SAL_CALL
         removeAccessibleEventListener (
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override;
 
 
     //=====  XServiceInfo  ====================================================
@@ -251,21 +236,18 @@ public:
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class.
     */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext service.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
 
     //=====  XTypeProvider  ===================================================
@@ -273,8 +255,7 @@ public:
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 protected:
     /** The state set.
@@ -296,8 +277,7 @@ protected:
             siblings) name.
         @throws css::uno::RuntimeException
     */
-    virtual OUString CreateAccessibleName()
-        throw (css::uno::RuntimeException, std::exception);
+    virtual OUString CreateAccessibleName();
 
     /** Create the accessible object's descriptive string.  May be called
         more than once.
@@ -306,8 +286,7 @@ protected:
         @throws css::uno::RuntimeException
     */
     virtual OUString
-        CreateAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception);
+        CreateAccessibleDescription();
 
     void FireEvent (const css::accessibility::AccessibleEventObject& aEvent);
 
@@ -317,8 +296,7 @@ protected:
         foul deed.
         @throws css::lang::DisposedException
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 
     /** Check whether or not the object has been disposed (or is in the
         state of being disposed).
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index a95aae696dd6..7a57582386ae 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -81,90 +81,90 @@ namespace accessibility
         virtual ~AccessibleEditableTextPara () override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface (const css::uno::Type & rType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface (const css::uno::Type & rType) override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole() override;
         /// Maximal length of text returned by getAccessibleDescription()
         enum { MaxDescriptionLen = 40 };
-        virtual OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale() throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getAccessibleDescription() override;
+        virtual OUString SAL_CALL getAccessibleName() override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override;
+        virtual css::lang::Locale SAL_CALL getLocale() override;
 
         // XAccessibleEventBroadcaster
-        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
         // XAccessibleComponent
-        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+        virtual css::awt::Point SAL_CALL getLocation(  ) override;
+        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+        virtual css::awt::Size SAL_CALL getSize(  ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
         // XAccessibleText (this comes implicitly inherited by XAccessibleEditableText AND by XAccessibleMultiLineText)
-        virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
         /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
         /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
         /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
         // XAccessibleEditableText
-        virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) override;
+        virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) override;
+        virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) override;
+        virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) override;
+        virtual sal_Bool SAL_CALL setText( const OUString& sText ) override;
 
         // XAccessibleTextAttributes
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& RequestedAttributes ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( ::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes ) throw (css::beans::UnknownPropertyException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& RequestedAttributes ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( ::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes ) override;
 
         // XAccessibleHypertext
-        virtual ::sal_Int32 SAL_CALL getHyperLinkCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( ::sal_Int32 nLinkIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getHyperLinkIndex( ::sal_Int32 nCharIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getHyperLinkCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( ::sal_Int32 nLinkIndex ) override;
+        virtual ::sal_Int32 SAL_CALL getHyperLinkIndex( ::sal_Int32 nCharIndex ) override;
 
         // XAccessibleMultiLineText
-        virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret(  ) override;
+        virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::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;
 
         /** Set the current index in the accessibility parent
 
diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx
index 6525995a4f79..2144d643009b 100644
--- a/include/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
@@ -54,41 +54,41 @@ namespace accessibility
         virtual ~AccessibleImageBullet  () override;
 
         // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole() override;
         /// Maximal length of text returned by getAccessibleDescription()
         enum { MaxDescriptionLen = 40 };
-        virtual OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::lang::Locale SAL_CALL getLocale() throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getAccessibleDescription() override;
+        virtual OUString SAL_CALL getAccessibleName() override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override;
+        virtual css::lang::Locale SAL_CALL getLocale() override;
 
         // XAccessibleEventBroadcaster
-        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+        virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
         // XAccessibleComponent
-        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+        virtual css::awt::Point SAL_CALL getLocation(  ) override;
+        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+        virtual css::awt::Size SAL_CALL getSize(  ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::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;
 
         /** Set the current index in the accessibility parent
 
diff --git a/include/editeng/AccessibleSelectionBase.hxx b/include/editeng/AccessibleSelectionBase.hxx
index 66bcf40ce653..25746ddc5ec7 100644
--- a/include/editeng/AccessibleSelectionBase.hxx
+++ b/include/editeng/AccessibleSelectionBase.hxx
@@ -46,13 +46,13 @@ namespace accessibility
     public:
 
         // XAccessibleSelection - default implementations
-        virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+        virtual void SAL_CALL clearAccessibleSelection(  ) override;
+        virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+        virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     public:
 
diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx
index 759597bc0411..fd34ba76639f 100644
--- a/include/editeng/AccessibleStaticTextBase.hxx
+++ b/include/editeng/AccessibleStaticTextBase.hxx
@@ -177,43 +177,43 @@ namespace accessibility
         void Dispose();
 
         // XAccessibleText interface implementation
-        virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCaretPosition() override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount() override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText() override;
+        virtual sal_Int32 SAL_CALL getSelectionStart() override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd() override;
         /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText() override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
         /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
         /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
         /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine)
-        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
         /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
         // XAccessibleTextAttributes
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& RequestedAttributes ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& RequestedAttributes ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes ) override;
 
         // child-related methods from XAccessibleContext
         /// @throws css::uno::RuntimeException
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception);
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount();
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception);
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i );
 
         // child-related methods from XAccessibleComponent
         /// @throws css::uno::RuntimeException
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception);
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint );
 
     protected:
         Rectangle GetParagraphBoundingBox() const;
diff --git a/include/editeng/UnoForbiddenCharsTable.hxx b/include/editeng/UnoForbiddenCharsTable.hxx
index bfe987e58a2e..924d9f7fa5f0 100644
--- a/include/editeng/UnoForbiddenCharsTable.hxx
+++ b/include/editeng/UnoForbiddenCharsTable.hxx
@@ -44,14 +44,14 @@ public:
     virtual ~SvxUnoForbiddenCharsTable() override;
 
     // XForbiddenCharacters
-    virtual css::i18n::ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasForbiddenCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setForbiddenCharacters( const css::lang::Locale& rLocale, const css::i18n::ForbiddenCharacters& rForbiddenCharacters ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeForbiddenCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::i18n::ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) override;
+    virtual sal_Bool SAL_CALL hasForbiddenCharacters( const css::lang::Locale& rLocale ) override;
+    virtual void SAL_CALL setForbiddenCharacters( const css::lang::Locale& rLocale, const css::i18n::ForbiddenCharacters& rForbiddenCharacters ) override;
+    virtual void SAL_CALL removeForbiddenCharacters( const css::lang::Locale& rLocale ) override;
 
     // XSupportedLocales
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasLocale( const css::lang::Locale& aLocale ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  ) override;
+    virtual sal_Bool SAL_CALL hasLocale( const css::lang::Locale& aLocale ) override;
 };
 
 #endif // INCLUDED_EDITENG_UNOFORBIDDENCHARSTABLE_HXX
diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx
index c9a6576a847d..31594e91bb77 100644
--- a/include/editeng/unofield.hxx
+++ b/include/editeng/unofield.hxx
@@ -41,7 +41,7 @@ class SvxFieldData;
 /// @throws css::uno::Exception
 /// @throws css::uno::RuntimeException
 css::uno::Reference< css::uno::XInterface > EDITENG_DLLPUBLIC SAL_CALL SvxUnoTextCreateTextField(
-    const OUString& ServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException);
+    const OUString& ServiceSpecifier );
 
 class EDITENG_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper,
                         public ::cppu::OComponentHelper,
@@ -68,46 +68,46 @@ public:
     SvxFieldData* CreateFieldData() const throw();
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // css::uno::XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XTextField
-    virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) override;
 
     // XTextContent
-    virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor(  ) override;
 
     // css::lang::XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/include/editeng/unonrule.hxx b/include/editeng/unonrule.hxx
index 5636b4a90ad1..307c56deb5d0 100644
--- a/include/editeng/unonrule.hxx
+++ b/include/editeng/unonrule.hxx
@@ -34,7 +34,7 @@
 EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw();
 EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule() throw();
 /// @throws css::lang::IllegalArgumentException
-const SvxNumRule& SvxGetNumRule( css::uno::Reference< css::container::XIndexReplace > const & xRule ) throw( css::lang::IllegalArgumentException );
+const SvxNumRule& SvxGetNumRule( css::uno::Reference< css::container::XIndexReplace > const & xRule );
 EDITENG_DLLPUBLIC css::uno::Reference< css::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw();
 
 class SvxUnoNumberingRules : public ::cppu::WeakAggImplHelper5< css::container::XIndexReplace, css::ucb::XAnyCompare,
@@ -49,37 +49,33 @@ public:
     UNO3_GETIMPLEMENTATION_DECL( SvxUnoNumberingRules )
 
     //XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(
-    css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XAnyCompare
-    virtual sal_Int16 SAL_CALL compare( const css::uno::Any& Any1, const css::uno::Any& Any2 ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL compare( const css::uno::Any& Any1, const css::uno::Any& Any2 ) override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // internal
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence<css::beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const
-        throw (css::uno::RuntimeException, std::exception);
+    css::uno::Sequence<css::beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const;
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void setNumberingRuleByIndex(const css::uno::Sequence<css::beans::PropertyValue>& rProperties, sal_Int32 nIndex)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
+    void setNumberingRuleByIndex(const css::uno::Sequence<css::beans::PropertyValue>& rProperties, sal_Int32 nIndex);
 
     static sal_Int16 Compare( const css::uno::Any& rAny1, const css::uno::Any& rAny2 );
 
diff --git a/include/editeng/unopracc.hxx b/include/editeng/unopracc.hxx
index 54910358c8aa..1bbffb04e5b1 100644
--- a/include/editeng/unopracc.hxx
+++ b/include/editeng/unopracc.hxx
@@ -40,19 +40,19 @@ public:
     virtual ~SvxAccessibleTextPropertySet() throw() override;
 
     // XTextRange
-    virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ) override;
 
     // lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
 #endif
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index c12203494195..a2cd5d206abc 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -261,47 +261,46 @@ protected:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, sal_Int32 nPara = -1 ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, sal_Int32 nPara = -1 );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 );
 
     /// @throws css::beans::PropertyVetoException
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, sal_Int32 nPara = -1 ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    void SAL_CALL _setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, sal_Int32 nPara = -1 );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Any > SAL_CALL _getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ) throw (css::uno::RuntimeException);
+    css::uno::Sequence< css::uno::Any > SAL_CALL _getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 );
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    css::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    css::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::beans::PropertyState > SAL_CALL _getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1  ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    css::uno::Sequence< css::beans::PropertyState > SAL_CALL _getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1  );
     // returns true if property found or false if unknown property
     static bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, css::beans::PropertyState& rState);
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException );
+    void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara );
     void SetEditSource( SvxEditSource* _pEditSource ) throw();
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, css::uno::Any& rAny, const SfxItemSet& rSet )
-        throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, css::uno::Any& rAny, const SfxItemSet& rSet );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::IllegalArgumentException
-    void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw(css::beans::UnknownPropertyException, css::lang::IllegalArgumentException );
+    void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet );
 
     SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw();
     SvxUnoTextRangeBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw();
@@ -327,55 +326,53 @@ public:
 
     static bool SetPropertyValueHelper( const SfxItemSet& rOldSet, const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = nullptr, SvxEditSource* pEditSource = nullptr );
     /// @throws css::uno::RuntimeException
-    static bool GetPropertyValueHelper(  SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, css::uno::Any& aAny, const ESelection* pSelection = nullptr,  SvxEditSource* pEditSource = nullptr  ) throw( css::uno::RuntimeException );
+    static bool GetPropertyValueHelper(  SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, css::uno::Any& aAny, const ESelection* pSelection = nullptr,  SvxEditSource* pEditSource = nullptr  );
 
     void attachField( const SvxFieldData* pData ) throw();
 
     UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextRangeBase )
 
     // css::text::XTextRange
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString( const OUString& aString ) override;
 
     // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XMultiPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     // css::beans::XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     // css::beans::XMultiPropertyStates
     //virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
-    virtual void SAL_CALL setAllPropertiesToDefault()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAllPropertiesToDefault() override;
+    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     // XTextRangeCompare
-    virtual ::sal_Int16 SAL_CALL compareRegionStarts( const css::uno::Reference< css::text::XTextRange >& xR1, const css::uno::Reference< css::text::XTextRange >& xR2 ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL compareRegionEnds( const css::uno::Reference< css::text::XTextRange >& xR1, const css::uno::Reference< css::text::XTextRange >& xR2 ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int16 SAL_CALL compareRegionStarts( const css::uno::Reference< css::text::XTextRange >& xR1, const css::uno::Reference< css::text::XTextRange >& xR2 ) override;
+    virtual ::sal_Int16 SAL_CALL compareRegionEnds( const css::uno::Reference< css::text::XTextRange >& xR1, const css::uno::Reference< css::text::XTextRange >& xR2 ) override;
 
     // css::lang::XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     static  css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( );
 };
 
@@ -395,20 +392,20 @@ public:
     virtual ~SvxUnoTextRange() throw() override;
 
     // css::uno::XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // css::text::XTextRange
-    virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override;
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 class EDITENG_DLLPUBLIC SvxUnoTextBase  : public SvxUnoTextRangeBase,
@@ -433,55 +430,55 @@ public:
 
     // css::uno::XInterface
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception);
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType );
 
     // css::text::XSimpleText
-    virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor(  ) override;
+    virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) override;
+    virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) override;
+    virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) override;
 
     // css::text::XText
-    virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) override;
+    virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString( const OUString& aString ) override;
 
     // css::text::XTextRange
-    virtual css::uno::Reference< css::text::XText > SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XText > SAL_CALL getText(  ) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override;
 
     // css::container::XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
     // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // css::text::XTextRangeMover
-    virtual void SAL_CALL moveTextRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Int16 nParagraphs ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL moveTextRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Int16 nParagraphs ) override;
 
     // css::text::XParagraphAppend (new import API)
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL finishParagraph( const css::uno::Sequence< css::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL finishParagraphInsert( const css::uno::Sequence< css::beans::PropertyValue >& CharacterAndParagraphProperties, const css::uno::Reference< css::text::XTextRange >& xInsertPosition ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL finishParagraph( const css::uno::Sequence< css::beans::PropertyValue >& CharacterAndParagraphProperties ) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL finishParagraphInsert( const css::uno::Sequence< css::beans::PropertyValue >& CharacterAndParagraphProperties, const css::uno::Reference< css::text::XTextRange >& xInsertPosition ) override;
 
     // css::text::XTextPortionAppend (new import API)
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL appendTextPortion( const OUString& Text, const css::uno::Sequence< css::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL appendTextPortion( const OUString& Text, const css::uno::Sequence< css::beans::PropertyValue >& CharacterAndParagraphProperties ) override;
 
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL insertTextPortion( const OUString& Text, const css::uno::Sequence< css::beans::PropertyValue >& CharacterAndParagraphProperties, const css::uno::Reference< css::text::XTextRange>& rTextRange ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL insertTextPortion( const OUString& Text, const css::uno::Sequence< css::beans::PropertyValue >& CharacterAndParagraphProperties, const css::uno::Reference< css::text::XTextRange>& rTextRange ) override;
 
     // css::text::XTextCopy
-    virtual void SAL_CALL copyText( const css::uno::Reference< css::text::XTextCopy >& xSource ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL copyText( const css::uno::Reference< css::text::XTextCopy >& xSource ) override;
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     static  css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( );
 
     // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 
@@ -496,17 +493,17 @@ public:
 
     // Internal
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // css::uno::XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 
@@ -523,8 +520,8 @@ public:
     virtual ~SvxUnoTextContentEnumeration() throw() override;
 
     // css::container::XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement(  ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+    virtual css::uno::Any SAL_CALL nextElement(  ) override;
 };
 
 
@@ -555,50 +552,50 @@ public:
     virtual ~SvxUnoTextContent() throw() override;
 
     // css::uno::XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // css::text::XTextRange
-    virtual css::uno::Reference< css::text::XText > SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XText > SAL_CALL getText(  ) override;
 
     // css::text::XTextContent -> css::lang::XComponent
-    virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor(  ) override;
 
     // css::lang::XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // css::container::XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
     // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // css::beans::XPropertySet
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
     // XMultiPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     // css::beans::XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 
@@ -617,8 +614,8 @@ public:
     virtual ~SvxUnoTextRangeEnumeration() throw() override;
 
     // css::container::XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement(  ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+    virtual css::uno::Any SAL_CALL nextElement(  ) override;
 };
 
 
@@ -636,36 +633,36 @@ public:
     virtual ~SvxUnoTextCursor() throw() override;
 
     // css::uno::XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // css::text::XTextRange
-    virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString( const OUString& aString ) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override;
 
     // css::text::XTextCursor -> css::text::XTextRange
-    virtual void SAL_CALL collapseToStart(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL collapseToEnd(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isCollapsed(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL collapseToStart(  ) override;
+    virtual void SAL_CALL collapseToEnd(  ) override;
+    virtual sal_Bool SAL_CALL isCollapsed(  ) override;
+    virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) override;
+    virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) override;
+    virtual void SAL_CALL gotoStart( sal_Bool bExpand ) override;
+    virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) override;
+    virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand ) override;
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::lang::XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
 };
 
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 09e70e376b41..002ee4dfa50e 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -64,9 +64,9 @@ MSFILTER_DLLPUBLIC OUString resolveVBAMacro( SfxObjectShell* pShell, const OUStr
 MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& rMacroName, bool bSearchGlobalTemplates = false );
 MSFILTER_DLLPUBLIC bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, css::uno::Sequence< css::uno::Any >& aArgs, css::uno::Any& aRet, const css::uno::Any& aCaller );
 /// @throws css::uno::RuntimeException
-MSFILTER_DLLPUBLIC css::awt::KeyEvent parseKeyEvent( const OUString& sKey ) throw (css::uno::RuntimeException);
+MSFILTER_DLLPUBLIC css::awt::KeyEvent parseKeyEvent( const OUString& sKey );
 /// @throws css::uno::RuntimeException
-MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const css::uno::Reference< css::frame::XModel >& rxDoc, const css::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (css::uno::RuntimeException, std::exception);
+MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const css::uno::Reference< css::frame::XModel >& rxDoc, const css::awt::KeyEvent& rKeyEvent, const OUString& sMacro );
 
 
 typedef ::cppu::WeakImplHelper<
@@ -83,30 +83,26 @@ public:
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
     virtual OUString SAL_CALL
-                        getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+                        getImplementationName() override;
 
     virtual sal_Bool SAL_CALL
-                        supportsService( const OUString& rService )
-                            throw (css::uno::RuntimeException, std::exception) override;
+                        supportsService( const OUString& rService ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-                        getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+                        getSupportedServiceNames() override;
 
     // com.sun.star.lang.XInitialization interface ----------------------------
 
     virtual void SAL_CALL initialize(
-                            const css::uno::Sequence< css::uno::Any >& rArgs )
-                            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+                            const css::uno::Sequence< css::uno::Any >& rArgs ) override;
 
     // com.sun.star.script.vba.XVBAMacroResolver interface --------------------
 
     virtual OUString SAL_CALL
-                        resolveVBAMacroToScriptURL( const OUString& rVBAMacroName )
-                            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                        resolveVBAMacroToScriptURL( const OUString& rVBAMacroName ) override;
 
     virtual OUString SAL_CALL
-                        resolveScriptURLtoVBAMacro( const OUString& rScriptURL )
-                            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                        resolveScriptURLtoVBAMacro( const OUString& rScriptURL ) override;
 
 private:
     css::uno::Reference< css::frame::XModel > mxModel;
@@ -122,8 +118,7 @@ VBAMacroResolver_getSupportedServiceNames();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL
 VBAMacroResolver_createInstance(
-    css::uno::Reference<css::uno::XComponentContext > const & rxContext)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::uno::XComponentContext > const & rxContext);
 
 } // namespace vba
 } // namespace ooo
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx
index 0bf31b4b0ba0..36099199e60a 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -63,26 +63,19 @@ protected:
 private:
                             // XFormulaOpCodeMapper
                             // Attributes
-    virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getOpCodeExternal() override;
+    virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() override;
                             // Methods
     virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getMappings(
                                     const css::uno::Sequence< OUString >& rNames,
-                                    sal_Int32 nLanguage )
-                                throw ( css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                    sal_Int32 nLanguage ) override;
     virtual css::uno::Sequence< css::sheet::FormulaOpCodeMapEntry > SAL_CALL getAvailableMappings(
-                                    sal_Int32 nLanguage, sal_Int32 nGroups )
-                                throw ( css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                    sal_Int32 nLanguage, sal_Int32 nGroups ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx
index df8ff3bfa8d8..c4f58b5a2976 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -73,9 +73,9 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X
         virtual ~DispatchHelper(                                                                    ) override;
 
         // XServiceInfo
-        virtual OUString                        SAL_CALL getImplementationName              (                                   ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool                        SAL_CALL supportsService                    ( const OUString&   sServiceName    ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString >  SAL_CALL getSupportedServiceNames           (                                   ) throw( css::uno::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;
 
         static css::uno::Sequence< OUString >   SAL_CALL impl_getStaticSupportedServiceNames(                                   );
         static OUString                         SAL_CALL impl_getStaticImplementationName   (                                   );
@@ -84,7 +84,7 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X
 
         // Helper for registry
         /// @throws css::uno::Exception
-        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
 
@@ -94,8 +94,7 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X
                                         const OUString&                                      sURL              ,
                                         const OUString&                                      sTargetFrameName  ,
                                               sal_Int32                                             nSearchFlags      ,
-                                        const css::uno::Sequence< css::beans::PropertyValue >&      lArguments        )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                        const css::uno::Sequence< css::beans::PropertyValue >&      lArguments        ) override;
 
         // not a public XDispatchHelper-method, need in sfx2/source/control/statcach.cxx for extensions
         /// @throws css::uno::RuntimeException
@@ -103,19 +102,16 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X
                                         const css::uno::Reference< css::frame::XDispatch >&  xDispatch      ,
                                         const  css::util::URL&                                  aURL        ,
                                         bool                                                    SyncronFlag ,
-                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments   )
-        throw(css::uno::RuntimeException);
+                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments   );
 
 
         // XDispatchResultListener
         virtual void SAL_CALL dispatchFinished(
-                                const css::frame::DispatchResultEvent& aResult )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                const css::frame::DispatchResultEvent& aResult ) override;
 
         // XEventListener
         virtual void SAL_CALL disposing(
-                                const css::lang::EventObject& aEvent )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                const css::lang::EventObject& aEvent ) override;
 };
 
 }
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 94de3ec59397..15cb3c768fe0 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -106,16 +106,14 @@ public:
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::container::XIndexAccess > CreateMenuBarConfigurationFromXML(
-            css::uno::Reference< css::io::XInputStream >& rInputStream )
-            throw (css::lang::WrappedTargetException, css::uno::RuntimeException);
+            css::uno::Reference< css::io::XInputStream >& rInputStream );
 
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
         void StoreMenuBarConfigurationToXML(
                       css::uno::Reference< css::container::XIndexAccess >& rMenuBarConfiguration,
                       css::uno::Reference< css::io::XOutputStream >& rOutputStream,
-                      bool bIsMenuBar )
-            throw (css::lang::WrappedTargetException, css::uno::RuntimeException);
+                      bool bIsMenuBar );
 
 private:
         css::uno::Reference< css::uno::XComponentContext> m_xContext;
diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx
index 33ed071cdd3c..ae5bafaaf28a 100644
--- a/include/framework/preventduplicateinteraction.hxx
+++ b/include/framework/preventduplicateinteraction.hxx
@@ -121,8 +121,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
 
             @threadsafe yes
         */
-        virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) override;
 
 
         /**
@@ -135,8 +134,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
 
             @threadsafe yes
         */
-        virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) override;
 
 
         /**
@@ -146,8 +144,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
 
             @threadsafe yes
         */
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     // c++ interface
     public:
diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx
index 5fe23b7d46d9..d2dd61b8c4f8 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -101,43 +101,35 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
 
 
         /** @see XTitle */
-        virtual OUString SAL_CALL getTitle()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTitle() override;
 
 
         /** @see XTitle */
-        virtual void SAL_CALL setTitle(const OUString& sTitle)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setTitle(const OUString& sTitle) override;
 
 
         /** @see XTitleChangeBroadcaster */
-        virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) override;
 
 
         /** @see XTitleChangeBroadcaster */
-        virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) override;
 
 
         /** @see XTitleChangeListener */
-        virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) override;
 
 
         /** @see css.document.XDocumentEventListener */
-        virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent) override;
 
 
         /** @see css.lang.XEventListener */
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
 
         /** @see css.frame.XFrameActionListener */
-        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override;
 
 
     // internal
diff --git a/include/i18nutil/casefolding.hxx b/include/i18nutil/casefolding.hxx
index 356ee6e6ab37..31a6d4ffe586 100644
--- a/include/i18nutil/casefolding.hxx
+++ b/include/i18nutil/casefolding.hxx
@@ -73,11 +73,11 @@ class I18NUTIL_DLLPUBLIC casefolding
 {
 public:
     /// @throws css::uno::RuntimeException
-    static Mapping& getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, css::lang::Locale& aLocale, MappingType nMappingType) throw (css::uno::RuntimeException);
+    static Mapping& getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, css::lang::Locale& aLocale, MappingType nMappingType);
     /// @throws css::uno::RuntimeException
-    static Mapping& getConditionalValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, css::lang::Locale& aLocale, MappingType nMappingType) throw (css::uno::RuntimeException);
+    static Mapping& getConditionalValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32 len, css::lang::Locale& aLocale, MappingType nMappingType);
     /// @throws css::uno::RuntimeException
-    static sal_Unicode getNextChar(const sal_Unicode *str, sal_Int32& idx, sal_Int32 len, MappingElement& e, css::lang::Locale& aLocale, MappingType nMappingtype, TransliterationModules moduleLoaded) throw (css::uno::RuntimeException);
+    static sal_Unicode getNextChar(const sal_Unicode *str, sal_Int32& idx, sal_Int32 len, MappingElement& e, css::lang::Locale& aLocale, MappingType nMappingtype, TransliterationModules moduleLoaded);
 
 };
 
diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index 2c7479bbc423..3fe0c76d4b69 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -48,23 +48,17 @@ public:
 
     // XHyphenatedWord
     virtual OUString SAL_CALL
-        getWord()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getWord() override;
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getLocale() override;
     virtual sal_Int16 SAL_CALL
-        getHyphenationPos()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getHyphenationPos() override;
     virtual OUString SAL_CALL
-        getHyphenatedWord()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getHyphenatedWord() override;
     virtual sal_Int16 SAL_CALL
-        getHyphenPos()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getHyphenPos() override;
     virtual sal_Bool SAL_CALL
-        isAlternativeSpelling()
-            throw(css::uno::RuntimeException, std::exception) override;
+        isAlternativeSpelling() override;
 
     static css::uno::Reference <css::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
         const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
@@ -94,17 +88,13 @@ public:
 
     // XPossibleHyphens
     virtual OUString SAL_CALL
-        getWord()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getWord() override;
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getLocale() override;
     virtual OUString SAL_CALL
-        getPossibleHyphens()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getPossibleHyphens() override;
     virtual css::uno::Sequence< sal_Int16 > SAL_CALL
-        getHyphenationPositions()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getHyphenationPositions() override;
 
     static css::uno::Reference < css::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
         (const OUString &rWord, sal_Int16 nLang,
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 7f97c516ca4f..065a1c920ff9 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -101,23 +101,19 @@ public:
 
     // XEventListener
     virtual void SAL_CALL
-        disposing( const css::lang::EventObject& rSource )
-            throw(css::uno::RuntimeException, std::exception) override;
+        disposing( const css::lang::EventObject& rSource ) override;
 
     // XPropertyChangeListener
     virtual void SAL_CALL
-        propertyChange( const css::beans::PropertyChangeEvent& rEvt )
-            throw(css::uno::RuntimeException, std::exception) override;
+        propertyChange( const css::beans::PropertyChangeEvent& rEvt ) override;
 
     // XLinguServiceEventBroadcaster
     virtual sal_Bool SAL_CALL
         addLinguServiceEventListener(
-                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException, std::exception) override;
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) override;
     virtual sal_Bool SAL_CALL
         removeLinguServiceEventListener(
-                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException, std::exception) override;
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener ) override;
 
     // non-UNO functions
     void    LNG_DLLPUBLIC AddAsPropListener();
@@ -147,8 +143,7 @@ public:
 
     // XPropertyChangeListener
     virtual void SAL_CALL
-        propertyChange( const css::beans::PropertyChangeEvent& rEvt )
-            throw(css::uno::RuntimeException, std::exception) override;
+        propertyChange( const css::beans::PropertyChangeEvent& rEvt ) override;
 };
 
 class LNG_DLLPUBLIC PropertyHelper_Thesaurus
@@ -205,8 +200,7 @@ public:
 
     // XPropertyChangeListener
     virtual void SAL_CALL
-        propertyChange( const css::beans::PropertyChangeEvent& rEvt )
-            throw(css::uno::RuntimeException, std::exception) override;
+        propertyChange( const css::beans::PropertyChangeEvent& rEvt ) override;
 
     static sal_Int16 GetDefaultNumberOfSuggestions() { return 16; }
 
@@ -239,12 +233,10 @@ public:
     bool    IsSpellCapitalization() const;
     /// @throws css::uno::RuntimeException
     bool addLinguServiceEventListener(
-                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException);
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener );
     /// @throws css::uno::RuntimeException
     bool removeLinguServiceEventListener(
-                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException);
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener );
 };
 
 
@@ -281,8 +273,7 @@ public:
 
     // XPropertyChangeListener
     virtual void SAL_CALL
-        propertyChange( const css::beans::PropertyChangeEvent& rEvt )
-            throw(css::uno::RuntimeException, std::exception) override;
+        propertyChange( const css::beans::PropertyChangeEvent& rEvt ) override;
 
     sal_Int16   GetMinLeading() const               { return nResHyphMinLeading; }
     sal_Int16   GetMinTrailing() const              { return nResHyphMinTrailing; }
@@ -312,12 +303,10 @@ public:
     sal_Int16   GetMinWordLength() const;
     /// @throws css::uno::RuntimeException
     bool addLinguServiceEventListener(
-                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException);
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener );
     /// @throws css::uno::RuntimeException
     bool removeLinguServiceEventListener(
-                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException);
+                const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener );
 };
 
 }   // namespace linguistic
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index 66ec2c7af435..b2a53bd3eadf 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -187,11 +187,11 @@ public:
     void            Deactivate();
 
     // 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;
 };
 
 }   // namespace linguistic
diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx
index 264be909b007..1edbf0381a0f 100644
--- a/include/linguistic/spelldta.hxx
+++ b/include/linguistic/spelldta.hxx
@@ -74,15 +74,15 @@ public:
     SpellAlternatives& operator=( const SpellAlternatives& ) = delete;
 
     // XSpellAlternatives
-    virtual OUString SAL_CALL getWord(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getFailureType(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getAlternativesCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAlternatives(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getWord(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
+    virtual ::sal_Int16 SAL_CALL getFailureType(  ) override;
+    virtual ::sal_Int16 SAL_CALL getAlternativesCount(  ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAlternatives(  ) override;
 
     // XSetSpellAlternatives
-    virtual void SAL_CALL setAlternatives( const css::uno::Sequence< OUString >& aAlternatives ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAlternatives( const css::uno::Sequence< OUString >& aAlternatives ) override;
+    virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) override;
 
     // non-interface specific functions
     void    LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, sal_Int16 nLang);
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index 68b72ad91042..73989fa1c2fc 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -80,13 +80,13 @@ public:
 
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
-    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) override;
+    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
 
     // record context interface -----------------------------------------------
 
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index 09ebd87c7dc9..b08dd937226f 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -238,23 +238,15 @@ public:
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
                         createFastChildContext(
                             sal_Int32 nElement,
-                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) final override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) final override;
 
     virtual void SAL_CALL startFastElement(
                             sal_Int32 nElement,
-                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) final override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) final override;
 
-    virtual void SAL_CALL characters( const OUString& rChars )
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) final override;
+    virtual void SAL_CALL characters( const OUString& rChars ) final override;
 
-    virtual void SAL_CALL endFastElement( sal_Int32 nElement )
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) final override;
+    virtual void SAL_CALL endFastElement( sal_Int32 nElement ) final override;
 
     // oox.core.ContextHandler interface --------------------------------------
 
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index d28e724e84b0..bbfd28dffa8b 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -58,8 +58,7 @@ class FastParser
 {
 public:
     /// @throws css::uno::RuntimeException
-    explicit            FastParser()
-                            throw( css::uno::RuntimeException );
+    explicit            FastParser();
 
                         FastParser(const FastParser&) = delete;
                         FastParser& operator=(const FastParser&) = delete;
@@ -70,15 +69,13 @@ public:
         @throws css::lang::IllegalArgumentException
         @throws css::uno::RuntimeException
     */
-    void                registerNamespace( sal_Int32 nNamespaceId )
-                            throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    void                registerNamespace( sal_Int32 nNamespaceId );
 
     /** Sets the passed document handler that will receive the SAX parser events.
         @throws css::uno::RuntimeException
     */
     void                setDocumentHandler(
-                            const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& rxDocHandler )
-                            throw( css::uno::RuntimeException );
+                            const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& rxDocHandler );
 
     /** Parses the passed SAX input source.
         @param bCloseStream  True = closes the stream in the input source after parsing.
@@ -86,8 +83,7 @@ public:
         @throws css::io::IOException
         @throws css::uno::RuntimeException
     */
-    void                parseStream( const css::xml::sax::InputSource& rInputSource, bool bCloseStream = false )
-                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception );
+    void                parseStream( const css::xml::sax::InputSource& rInputSource, bool bCloseStream = false );
 
     /** Parses the passed input stream.
         @param bCloseStream  True = closes the passed stream after parsing.
@@ -97,8 +93,7 @@ public:
     */
     void                parseStream(
                             const css::uno::Reference< css::io::XInputStream >& rxInStream,
-                            const OUString& rStreamName )
-                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception );
+                            const OUString& rStreamName );
 
     /** Parses a stream from the passed storage with the specified name.
         @param bCloseStream  True = closes the stream after parsing.
@@ -106,8 +101,7 @@ public:
         @throws css::io::IOException
         @throws css::uno::RuntimeException
     */
-    void                parseStream( StorageBase& rStorage, const OUString& rStreamName )
-                            throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception );
+    void                parseStream( StorageBase& rStorage, const OUString& rStreamName );
 
     const css::uno::Reference< css::xml::sax::XFastTokenHandler >&
                getTokenHandler() const { return mxTokenHandler; }
diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index 226eb9f5544a..6e8e457ca517 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -52,13 +52,13 @@ public:
     virtual             ~FastTokenHandler() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XFastTokenHandler
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) override;
+    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override;
 
     // Much faster direct C++ shortcut to the method that matters
     virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override;
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 76652a9e1a15..6c2ffb04fd15 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -97,8 +97,7 @@ class OOX_DLLPUBLIC FilterBase : public FilterBase_BASE, public ::cppu::BaseMute
 public:
     /// @throws css::uno::RuntimeException
     explicit            FilterBase(
-                            const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-                            throw( css::uno::RuntimeException );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     virtual             ~FilterBase() override;
 
@@ -202,12 +201,10 @@ public:
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
     virtual sal_Bool SAL_CALL
-                        supportsService( const OUString& rServiceName )
-                            throw( css::uno::RuntimeException, std::exception ) override;
+                        supportsService( const OUString& rServiceName ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-                        getSupportedServiceNames()
-                            throw( css::uno::RuntimeException, std::exception ) override;
+                        getSupportedServiceNames() override;
 
     // com.sun.star.lang.XInitialization interface ----------------------------
 
@@ -222,32 +219,24 @@ public:
             filter implementations may support different arguments.
      */
     virtual void SAL_CALL initialize(
-                            const css::uno::Sequence< css::uno::Any >& rArgs )
-                            throw(  css::uno::Exception,
-                                    css::uno::RuntimeException, std::exception ) override;
+                            const css::uno::Sequence< css::uno::Any >& rArgs ) override;
 
     // com.sun.star.document.XImporter interface ------------------------------
 
     virtual void SAL_CALL setTargetDocument(
-                            const css::uno::Reference< css::lang::XComponent >& rxDocument )
-                            throw(  css::lang::IllegalArgumentException,
-                                    css::uno::RuntimeException, std::exception ) override;
+                            const css::uno::Reference< css::lang::XComponent >& rxDocument ) override;
 
     // com.sun.star.document.XExporter interface ------------------------------
 
     virtual void SAL_CALL setSourceDocument(
-                            const css::uno::Reference< css::lang::XComponent >& rxDocument )
-                            throw(  css::lang::IllegalArgumentException,
-                                    css::uno::RuntimeException, std::exception ) override;
+                            const css::uno::Reference< css::lang::XComponent >& rxDocument ) override;
 
     // com.sun.star.document.XFilter interface --------------------------------
 
     virtual sal_Bool SAL_CALL filter(
-                            const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq )
-                            throw( css::uno::RuntimeException, std::exception ) override;
+                            const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq ) override;
 
-    virtual void SAL_CALL cancel()
-                            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL cancel() override;
 
     bool exportVBA() const;
 
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index f27e6059478c..ca717418be99 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -65,18 +65,18 @@ public:
     virtual             ~FilterDetectDocHandler() override;
 
     // XFastDocumentHandler
-    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 
     // XFastContextHandler
-    virtual void SAL_CALL startFastElement( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startFastElement( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL endFastElement( sal_Int32 Element ) override;
+    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) override;
+    virtual css::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual css::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
 
 private:
     void                parseRelationship( const AttributeList& rAttribs );
@@ -99,8 +99,7 @@ class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper<css::document::
 {
 public:
     /// @throws css::uno::RuntimeException
-    explicit            FilterDetect( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-                            throw( css::uno::RuntimeException );
+    explicit            FilterDetect( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual             ~FilterDetect() override;
 
     /** Tries to extract an unencrypted ZIP package from the passed media
@@ -131,9 +130,9 @@ public:
 
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // com.sun.star.document.XExtendedFilterDetection interface ---------------
 
@@ -154,8 +153,7 @@ public:
         property of the passed media descriptor.
      */
     virtual OUString SAL_CALL
-                        detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq )
-                            throw( css::uno::RuntimeException, std::exception ) override;
+                        detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq ) override;
 
 private:
     css::uno::Reference< css::uno::XComponentContext > mxContext;
diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index b1b14f5fd98f..7ab4261c5901 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -99,19 +99,19 @@ public:
 
     // com.sun.star.xml.sax.XFastDocumentHandler interface --------------------
 
-    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator ) override;
 
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
-    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) override;
+    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
 
     // XML stream handling ----------------------------------------------------
 
diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx
index 35f203df0ea4..9c728709bdee 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -79,33 +79,21 @@ public:
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
                         createFastChildContext(
                             sal_Int32 nElement,
-                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) final override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) final override;
 
     virtual void SAL_CALL startFastElement(
                             sal_Int32 nElement,
-                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) final override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) final override;
 
-    virtual void SAL_CALL characters( const OUString& rChars )
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) final override;
+    virtual void SAL_CALL characters( const OUString& rChars ) final override;
 
-    virtual void SAL_CALL endFastElement( sal_Int32 nElement )
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) final override;
+    virtual void SAL_CALL endFastElement( sal_Int32 nElement ) final override;
 
     // com.sun.star.xml.sax.XFastDocumentHandler interface --------------------
 
-    virtual void SAL_CALL startDocument()
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocument() override;
 
-    virtual void SAL_CALL endDocument()
-                            throw(  css::xml::sax::SAXException,
-                                    css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL endDocument() override;
 
     // oox.core.ContextHandler interface --------------------------------------
 
diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx
index da90180489fc..637890aa0361 100644
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -60,10 +60,7 @@ public:
     /// @throws css::xml::sax::SAXException
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void                parseStream( const RecordInputSource& rInputSource )
-                            throw(  css::xml::sax::SAXException,
-                                    css::io::IOException,
-                                    css::uno::RuntimeException );
+    void                parseStream( const RecordInputSource& rInputSource );
 
     const RecordInputSource& getInputSource() const { return maSource; }
 
diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx
index 46fe8871e096..314e95a29b39 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -49,8 +49,7 @@ public:
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
                         createFastChildContext(
                             sal_Int32 nElement,
-                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs )
-                        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+                            const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttribs ) override;
 
 private:
     RelationsRef        mxRelations;
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 51497836a885..7763fb3ba421 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -85,8 +85,7 @@ class OOX_DLLPUBLIC XmlFilterBase : public FilterBase
 public:
     /// @throws css::uno::RuntimeException
     explicit            XmlFilterBase(
-                            const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-                            throw( css::uno::RuntimeException );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     virtual             ~XmlFilterBase() override;
 
diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
index cac00b12c47e..2fca42918d1a 100644
--- a/include/oox/ppt/dgmimport.hxx
+++ b/include/oox/ppt/dgmimport.hxx
@@ -50,7 +50,7 @@ public:
     QuickDiagrammingImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // from FilterBase
-    virtual bool importDocument() throw (css::uno::RuntimeException, std::exception) override;
+    virtual bool importDocument() override;
     virtual bool exportDocument() throw() override;
 
     virtual const ::oox::drawingml::Theme* getCurrentTheme() const override;
@@ -60,7 +60,7 @@ public:
     virtual oox::drawingml::chart::ChartConverter* getChartConverter() override;
 
 private:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
 };
 
diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx
index a0735ea39a20..bfbf6013a6c5 100644
--- a/include/oox/ppt/dgmlayout.hxx
+++ b/include/oox/ppt/dgmlayout.hxx
@@ -51,7 +51,7 @@ public:
     QuickDiagrammingLayout( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // from FilterBase
-    virtual bool importDocument() throw (css::uno::RuntimeException) override;
+    virtual bool importDocument() override;
     virtual bool exportDocument() throw() override;
 
     virtual const ::oox::drawingml::Theme* getCurrentTheme() const override;
@@ -61,7 +61,7 @@ public:
     virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override;
 
 private:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
     drawingml::ThemePtr mpThemePtr;
 };
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 2976fe539a8e..24fa59621cc1 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -55,8 +55,7 @@ class PowerPointImport : public oox::core::XmlFilterBase
 {
 public:
     /// @throws css::uno::RuntimeException
-    PowerPointImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-        throw( css::uno::RuntimeException );
+    PowerPointImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~PowerPointImport() override;
 
     // from FilterBase
@@ -75,8 +74,7 @@ public:
     std::vector< SlidePersistPtr >&                         getMasterPages(){ return maMasterPages; };
     std::vector< SlidePersistPtr >&                         getNotesPages(){ return maNotesPages; };
 
-    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<   css::beans::PropertyValue >& rDescriptor )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<   css::beans::PropertyValue >& rDescriptor ) override;
 
     sal_Int32 getSchemeColor( sal_Int32 nToken ) const;
 
@@ -87,7 +85,7 @@ public:
 private:
     virtual GraphicHelper* implCreateGraphicHelper() const override;
     virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 private:
     OUString                                       maTableStyleListPath;
diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx
index 8966a41966df..ed5db08330f4 100644
--- a/include/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
@@ -68,27 +68,22 @@ public:
                             const css::uno::Reference< css::io::XInputStream >& rxInStrm );
     virtual             ~InputStream() override;
 
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
-                        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
-                        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-                        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available()
-                        throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput()
-                        throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 
 private:
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void                updateBuffer() throw (css::io::IOException, css::uno::RuntimeException);
+    void                updateBuffer();
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    OString      readToElementBegin() throw (css::io::IOException, css::uno::RuntimeException);
+    OString      readToElementBegin();
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    OString      readToElementEnd() throw (css::io::IOException, css::uno::RuntimeException);
+    OString      readToElementEnd();
 
 private:
     css::uno::Reference< css::io::XTextInputStream2 >
diff --git a/include/salhelper/condition.hxx b/include/salhelper/condition.hxx
index 3c2324ec976f..86e9223dad98 100644
--- a/include/salhelper/condition.hxx
+++ b/include/salhelper/condition.hxx
@@ -92,10 +92,7 @@ namespace salhelper
         };
 
         /// @throws timedout
-        ConditionWaiter(Condition& aCond,sal_uInt32 milliSec)
-            throw(
-                timedout
-            );
+        ConditionWaiter(Condition& aCond,sal_uInt32 milliSec);
 
 
         ~ConditionWaiter();
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 3b17dee8a02f..eeb4064e82fa 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -94,13 +94,13 @@ public:
     bool getAsChar( sal_Int32 nToken, const char*& rPos ) const;
 
     // XFastAttributeList
-    virtual sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getValueToken( ::sal_Int32 Token ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getValue( ::sal_Int32 Token ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::xml::Attribute > SAL_CALL getUnknownAttributes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::xml::FastAttribute > SAL_CALL getFastAttributes() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) override;
+    virtual ::sal_Int32 SAL_CALL getValueToken( ::sal_Int32 Token ) override;
+    virtual ::sal_Int32 SAL_CALL getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) override;
+    virtual OUString SAL_CALL getValue( ::sal_Int32 Token ) override;
+    virtual OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) override;
+    virtual css::uno::Sequence< css::xml::Attribute > SAL_CALL getUnknownAttributes(  ) override;
+    virtual css::uno::Sequence< css::xml::FastAttribute > SAL_CALL getFastAttributes() override;
 
 private:
     sal_Char *mpChunk; ///< buffer to store all attribute values - null terminated strings
diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx
index a238229e3f01..cb82dcf17210 100644
--- a/include/sax/fastparser.hxx
+++ b/include/sax/fastparser.hxx
@@ -56,23 +56,23 @@ public:
     virtual ~FastSaxParser() override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments) override;
 
     // XFastParser
-    virtual void SAL_CALL parseStream( const css::xml::sax::InputSource& aInputSource ) throw (css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLocale( const css::lang::Locale& rLocale ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNamespaceHandler( const css::uno::Reference< css::xml::sax::XFastNamespaceHandler >& Handler) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL parseStream( const css::xml::sax::InputSource& aInputSource ) override;
+    virtual void SAL_CALL setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) override;
+    virtual void SAL_CALL setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) override;
+    virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) override;
+    virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) override;
+    virtual void SAL_CALL setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) override;
+    virtual void SAL_CALL setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) override;
+    virtual void SAL_CALL setLocale( const css::lang::Locale& rLocale ) override;
+    virtual void SAL_CALL setNamespaceHandler( const css::uno::Reference< css::xml::sax::XFastNamespaceHandler >& Handler) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 }
diff --git a/include/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx
index 25e91a6fde62..dde4bce872ec 100644
--- a/include/sax/tools/documenthandleradapter.hxx
+++ b/include/sax/tools/documenthandleradapter.hxx
@@ -29,54 +29,48 @@ namespace sax
     public:
         // XDocumentHandler
         virtual void SAL_CALL
-        startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        startDocument() override
         {
             m_handler->startDocument();
         }
 
         virtual void SAL_CALL
-        endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        endDocument() override
         {
             m_handler->endDocument();
         }
 
         virtual void SAL_CALL
         startElement(const OUString& aName,
-                const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
-                throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+                const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override
         {
             m_handler->startElement(aName, xAttribs);
         }
 
         virtual void SAL_CALL
-        endElement(const OUString& aName) throw (css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception) override
+        endElement(const OUString& aName) override
         {
             m_handler->endElement(aName);
         }
 
         virtual void SAL_CALL
-        characters(const OUString& aChars) throw (css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception) override
+        characters(const OUString& aChars) override
         {
             m_handler->characters(aChars);
         }
 
         virtual void SAL_CALL
-        ignorableWhitespace(const OUString& aWhitespaces) throw (css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception) override
+        ignorableWhitespace(const OUString& aWhitespaces) override
         {
             m_handler->ignorableWhitespace(aWhitespaces);
         }
         virtual void SAL_CALL
-        processingInstruction(const OUString& aTarget, const OUString& aData)
-                throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        processingInstruction(const OUString& aTarget, const OUString& aData) override
         {
             m_handler->processingInstruction(aTarget, aData);
         }
         virtual void SAL_CALL
-        setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
-                throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override
         {
             m_handler->setDocumentLocator(xLocator);
         }
@@ -120,81 +114,74 @@ namespace sax
     public:
         // XDocumentHandler
         virtual void SAL_CALL
-        startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        startDocument() override
         {
             m_handler->startDocument();
         }
 
         virtual void SAL_CALL
-        endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        endDocument() override
         {
             m_handler->endDocument();
         }
 
         virtual void SAL_CALL
         startElement(const OUString& aName,
-                const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
-                throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+                const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override
         {
             m_handler->startElement(aName, xAttribs);
         }
 
         virtual void SAL_CALL
-        endElement(const OUString& aName) throw (css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception) override
+        endElement(const OUString& aName) override
         {
             m_handler->endElement(aName);
         }
 
         virtual void SAL_CALL
-        characters(const OUString& aChars) throw (css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception) override
+        characters(const OUString& aChars) override
         {
             m_handler->characters(aChars);
         }
 
         virtual void SAL_CALL
-        ignorableWhitespace(const OUString& aWhitespaces) throw (css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception) override
+        ignorableWhitespace(const OUString& aWhitespaces) override
         {
             m_handler->ignorableWhitespace(aWhitespaces);
         }
         virtual void SAL_CALL
-        processingInstruction(const OUString& aTarget, const OUString& aData)
-                throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        processingInstruction(const OUString& aTarget, const OUString& aData) override
         {
             m_handler->processingInstruction(aTarget, aData);
         }
         virtual void SAL_CALL
-        setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
-                throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override
         {
             m_handler->setDocumentLocator(xLocator);
         }
         // XExtendedDocumentHandler
         virtual void SAL_CALL
-        startCDATA() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        startCDATA() override
         {
             m_handler->startCDATA();
         }
         virtual void SAL_CALL
-        endCDATA() throw (css::uno::RuntimeException, std::exception) override
+        endCDATA() override
         {
             m_handler->endCDATA();
         }
         virtual void SAL_CALL
-        comment(const OUString& sComment) throw (css::xml::sax::SAXException,
-                css::uno::RuntimeException, std::exception) override
+        comment(const OUString& sComment) override
         {
             m_handler->comment(sComment);
         }
         virtual void SAL_CALL
-        unknown(const OUString& sString) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        unknown(const OUString& sString) override
         {
             m_handler->unknown(sString);
         }
         virtual void SAL_CALL
-        allowLineBreak() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override
+        allowLineBreak() override
         {
             m_handler->allowLineBreak();
         }
diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx
index 973808d0840e..31a61adebb01 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -84,68 +84,41 @@ public:
     virtual ~DocumentMetadataAccess() override;
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getStringValue() override;
 
     // css::rdf::XURI:
-    virtual OUString SAL_CALL getNamespace()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getNamespace() override;
+    virtual OUString SAL_CALL getLocalName() override;
 
     // css::rdf::XRepositorySupplier:
     virtual css::uno::Reference<
-        css::rdf::XRepository > SAL_CALL getRDFRepository()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::rdf::XRepository > SAL_CALL getRDFRepository() override;
 
     // css::rdf::XDocumentMetadataAccess:
     virtual css::uno::Reference<
                 css::rdf::XMetadatable > SAL_CALL
         getElementByMetadataReference(
-            const css::beans::StringPair & i_rReference)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::beans::StringPair & i_rReference) override;
     virtual css::uno::Reference< css::rdf::XMetadatable > SAL_CALL
-        getElementByURI(const css::uno::Reference< css::rdf::XURI > & i_xURI)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException, std::exception) override;
+        getElementByURI(const css::uno::Reference< css::rdf::XURI > & i_xURI) override;
     virtual css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > SAL_CALL getMetadataGraphsWithType(
-            const css::uno::Reference< css::rdf::XURI > & i_xType)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException, std::exception) override;
+            const css::uno::Reference< css::rdf::XURI > & i_xType) override;
     virtual css::uno::Reference< css::rdf::XURI> SAL_CALL
         addMetadataFile(const OUString & i_rFileName,
-            const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::container::ElementExistException, std::exception) override;
+            const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes) override;
     virtual css::uno::Reference< css::rdf::XURI> SAL_CALL
         importMetadataFile(::sal_Int16 i_Format,
             const css::uno::Reference< css::io::XInputStream > & i_xInStream,
             const OUString & i_rFileName,
             const css::uno::Reference< css::rdf::XURI > & i_xBaseURI,
-            const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::datatransfer::UnsupportedFlavorException,
-            css::container::ElementExistException,
-            css::rdf::ParseException,
-            css::io::IOException, std::exception) override;
+            const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes) override;
     virtual void SAL_CALL removeMetadataFile(
             const css::uno::Reference<
-                css::rdf::XURI > & i_xGraphName)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException, std::exception) override;
+                css::rdf::XURI > & i_xGraphName) override;
     virtual void SAL_CALL addContentOrStylesFile(
-            const OUString & i_rFileName)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::container::ElementExistException, std::exception) override;
+            const OUString & i_rFileName) override;
     virtual void SAL_CALL removeContentOrStylesFile(
-            const OUString & i_rFileName)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException, std::exception) override;
+            const OUString & i_rFileName) override;
 
     virtual void SAL_CALL loadMetadataFromStorage(
             const css::uno::Reference<
@@ -153,28 +126,16 @@ public:
             const css::uno::Reference<
                 css::rdf::XURI > & i_xBaseURI,
             const css::uno::Reference<
-                css::task::XInteractionHandler> & i_xHandler)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) override;
+                css::task::XInteractionHandler> & i_xHandler) override;
     virtual void SAL_CALL storeMetadataToStorage(
             const css::uno::Reference<
-                css::embed::XStorage > & i_xStorage)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) override;
+                css::embed::XStorage > & i_xStorage) override;
     virtual void SAL_CALL loadMetadataFromMedium(
             const css::uno::Sequence<
-                css::beans::PropertyValue > & i_rMedium)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) override;
+                css::beans::PropertyValue > & i_rMedium) override;
     virtual void SAL_CALL storeMetadataToMedium(
             const css::uno::Sequence<
-                css::beans::PropertyValue > & i_rMedium)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) override;
+                css::beans::PropertyValue > & i_rMedium) override;
 
 private:
     std::unique_ptr<DocumentMetadataAccess_Impl> m_pImpl;
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index f0289d9543ac..bd9f3bb659fe 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -142,24 +142,17 @@ public:
     MetadatableMixin() {};
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getStringValue() override;
 
     // css::rdf::XURI:
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNamespace()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getLocalName() override;
+    virtual OUString SAL_CALL getNamespace() override;
 
     // css::rdf::XMetadatable:
-    virtual css::beans::StringPair SAL_CALL getMetadataReference()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::StringPair SAL_CALL getMetadataReference() override;
     virtual void SAL_CALL setMetadataReference(
-        const css::beans::StringPair & i_rReference)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException, std::exception) override;
-    virtual void SAL_CALL ensureMetadataReference()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::beans::StringPair & i_rReference) override;
+    virtual void SAL_CALL ensureMetadataReference() override;
 
 protected:
     /// get the core object corresponding to this UNO object.
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index d00c1d193753..d4628b30027d 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -116,11 +116,7 @@ public:
     /// @throws css::uno::RuntimeException
     static OUString GetTypeFromStorage(
         const css::uno::Reference<css::embed::XStorage>& xStorage,
-        bool bTemplate = false )
-            throw ( css::beans::UnknownPropertyException,
-                    css::lang::WrappedTargetException,
-                    css::uno::RuntimeException,
-                    std::exception );
+        bool bTemplate = false );
 };
 
 #endif
diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx
index fa1a291d9916..56935e187aeb 100644
--- a/include/sfx2/docstoragemodifylistener.hxx
+++ b/include/sfx2/docstoragemodifylistener.hxx
@@ -63,10 +63,10 @@ namespace sfx2
         void dispose();
 
         // XModifyListener
-        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) 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;
 
     protected:
         virtual ~DocumentStorageModifyListener() override;
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index a8d979e12511..5eea0db2132c 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -95,33 +95,33 @@ public:
     SAL_DLLPRIVATE void ReleaseShell_Impl();
     SAL_DLLPRIVATE void BorderWidthsChanged_Impl();
 
-    css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator(  ) throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator(  ) override;
 
 
     //  XController2
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() override;
+    virtual OUString SAL_CALL getViewControllerName() override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() override;
 
-    virtual css::uno::Reference< css::ui::XSidebarProvider > SAL_CALL getSidebar() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::ui::XSidebarProvider > SAL_CALL getSidebar() override;
 
 
     //  XController
 
 
-    virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) override ;
 
-    virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) override ;
 
-    virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) override ;
 
-    css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) override ;
+    css::uno::Any SAL_CALL getViewData() override ;
 
-    void SAL_CALL restoreViewData( const css::uno::Any& aValue ) throw( css::uno::RuntimeException, std::exception ) override ;
+    void SAL_CALL restoreViewData( const css::uno::Any& aValue ) override ;
 
-    css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw( css::uno::RuntimeException, std::exception ) override ;
+    css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() override ;
 
-    css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override ;
+    css::uno::Reference< css::frame::XModel > SAL_CALL getModel() override ;
 
 
     //  XDispatchProvider
@@ -129,51 +129,51 @@ public:
 
     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 ;
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) override ;
 
 
     //  XControllerBorder
 
 
-    virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::frame::BorderWidths SAL_CALL getBorder() override;
+    virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) override;
+    virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) override;
+    virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) override;
 
 
     //  XComponent
 
 
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL dispose() override ;
 
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override ;
 
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) override ;
-    virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override ;
+    virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) override;
+    virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) override;
 
-    virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) override;
+    virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) override;
+    virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) override;
+    virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) override;
 
 
     //  XDispatchInformationProvider
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) 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 nCommandGroup ) override;
 
     // css::frame::XTitle
-    virtual OUString SAL_CALL getTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getTitle(  ) override;
+    virtual void SAL_CALL setTitle( const OUString& sTitle ) override;
 
     // css::frame::XTitleChangeBroadcaster
-    virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )     throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
 
     // css::lang::XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
     // either the _Impl name should vanish or there should be an "official" API
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index cc097c66014b..1188bef60028 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -193,7 +193,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override ;
 
     /**___________________________________________________________________________________________________
         @short      increment refcount
@@ -225,7 +225,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override ;
 
     /**___________________________________________________________________________________________________
         @short      get implementation id
@@ -238,7 +238,7 @@ public:
         @onerror    A RuntimeException is thrown.
     */
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override ;
 
 
     //  XStarBasicAccess
@@ -247,298 +247,230 @@ public:
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
-    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getLibraryContainer() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getLibraryContainer() override;
 
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
     virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password,
-        const OUString& ExternalSourceURL, const OUString& LinkTargetURL )
-            throw(css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+        const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) override;
 
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
     virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName,
-        const OUString& Language, const OUString& Source )
-            throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        const OUString& Language, const OUString& Source ) override;
 
     /**___________________________________________________________________________________________________
         @seealso    XStarBasicAccess
     */
     virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName,
-        const css::uno::Sequence< sal_Int8 >& Data )
-            throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< sal_Int8 >& Data ) override;
 
 
     //  XChild
 
 
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override ;
 
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw(css::lang::NoSupportException,
-                                                                                        css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) override;
 
 
     //  XComponent
 
 
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
-    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) override;
 
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XDocumentPropertiesSupplier
     virtual css::uno::Reference< css::document::XDocumentProperties >
-        SAL_CALL getDocumentProperties()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getDocumentProperties() override;
 
 
     //  XEventListener
 
 
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
 
     //  XModel
 
 
     virtual sal_Bool SAL_CALL attachResource(const OUString& sURL,
-                                             const css::uno::Sequence< css::beans::PropertyValue >& aArgs)
-        throw (css::uno::RuntimeException, std::exception) override;
+                                             const css::uno::Sequence< css::beans::PropertyValue >& aArgs) override;
 
-    virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getURL() override;
 
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs() override;
 
-    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) override;
 
-    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) override;
 
-    virtual void SAL_CALL lockControllers() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL lockControllers() override;
 
-    virtual void SAL_CALL unlockControllers() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL unlockControllers() override;
 
-    virtual sal_Bool SAL_CALL hasControllersLocked() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasControllersLocked() override;
 
-    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController() override;
 
-    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController )
-        throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) override;
 
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() override;
 
 
     //  XModel2
 
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers() override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames() override;
 
-    virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController(const css::uno::Reference< css::frame::XFrame >& Frame )
-        throw (css::uno::RuntimeException         ,
-               css::lang::IllegalArgumentException,
-               css::uno::Exception, std::exception                ) override;
+    virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController(const css::uno::Reference< css::frame::XFrame >& Frame ) override;
 
     virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController(const OUString&                                 ViewName       ,
                                                                                           const css::uno::Sequence< css::beans::PropertyValue >& Arguments      ,
-                                                                                          const css::uno::Reference< css::frame::XFrame >&       Frame          )
-        throw (css::uno::RuntimeException         ,
-               css::lang::IllegalArgumentException,
-               css::uno::Exception, std::exception                ) override;
+                                                                                          const css::uno::Reference< css::frame::XFrame >&       Frame          ) override;
 
 
     //  XModifiable2
 
 
-    virtual sal_Bool SAL_CALL disableSetModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL enableSetModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isSetModifiedEnabled(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL disableSetModified(  ) override;
+    virtual sal_Bool SAL_CALL enableSetModified(  ) override;
+    virtual sal_Bool SAL_CALL isSetModifiedEnabled(  ) override;
 
-    virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isModified() override;
 
-    virtual void SAL_CALL setModified( sal_Bool bModified )
-        throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override;
 
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override ;
 
-    virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) override ;
 
 
     //  XCloseable
 
 
-    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) override;
 
 
     //  XCloseBroadcaster
 
 
-    virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) override;
+    virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) override;
 
 
     //  XPrintJobBroadcaster
 
 
-    virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) override;
+    virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) override;
 
 
     //  XPrintable
 
 
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() override;
 
-    virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& seqPrinter )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& seqPrinter ) override;
+    virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions ) override;
 
 
     //  XStorable2
 
 
-    virtual void SAL_CALL storeSelf( const  css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
-        throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL storeSelf( const  css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    ) override;
 
 
     //  XStorable
 
 
-    virtual sal_Bool SAL_CALL hasLocation() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasLocation() override;
 
-    virtual OUString SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getLocation() override;
 
-    virtual sal_Bool SAL_CALL isReadonly() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadonly() override;
 
-    virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL store() override;
 
     virtual void SAL_CALL storeAsURL(   const   OUString& sURL,
-                                        const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override ;
+                                        const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    ) override ;
 
     virtual void SAL_CALL storeToURL(   const   OUString& sURL,
-                                        const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+                                        const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments    ) override;
 
 
     //  XLoadable
 
 
-    virtual void SAL_CALL initNew()
-        throw (css::frame::DoubleInitializationException,
-               css::io::IOException,
-               css::uno::RuntimeException,
-               css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initNew() override;
 
-    virtual void SAL_CALL load( const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments )
-        throw (css::frame::DoubleInitializationException,
-               css::io::IOException,
-               css::uno::RuntimeException,
-               css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL load( const   css::uno::Sequence< css::beans::PropertyValue >&   seqArguments ) override;
 
 
     //  XDocumentSubStorageSupplier
 
 
-    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames()
-        throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames() override;
 
 
     //  XStorageBasedDocument
 
 
     virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage,
-                                            const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor )
-        throw ( css::lang::IllegalArgumentException,
-                css::frame::DoubleInitializationException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                                            const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) override;
 
     virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage,
-                                            const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor )
-        throw ( css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage )
-        throw ( css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage()
-        throw ( css::io::IOException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+                                            const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) override;
+
+    virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
+
+    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() override;
 
     virtual void SAL_CALL addStorageChangeListener(
-            const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
 
     virtual void SAL_CALL removeStorageChangeListener(
-            const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
 
 
     //  XVisualObject
 
 
-    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setVisualAreaSize( sal_Int64 nAspect, const css::awt::Size& aSize ) override;
 
-    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) override;
 
-    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect )
-        throw ( css::lang::IllegalArgumentException,
-                css::embed::WrongStateException,
-                css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) override;
 
-    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect )
-        throw ( css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) override;
 
 
     //  XScriptProviderSupplier
 
 
-    virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() override;
 
 
     //  XUIConfigurationManagerSupplier
-    virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() override;
 
 
     //  XTransferable
 
 
-    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
-        throw (css::datatransfer::UnsupportedFlavorException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
 
-    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() override;
 
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 
 
     //  XEventsSupplier
@@ -550,21 +482,21 @@ public:
         @return     -   an Events object.
     */
 
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() override;
 
 
     //  XEmbeddedScripts
 
 
-    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() override;
+    virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() override;
+    virtual sal_Bool SAL_CALL getAllowMacroExecution() override;
 
 
     //  XScriptInvocationContext
 
 
-    virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() override;
 
 
     //  XEventBroadcaster
@@ -574,129 +506,97 @@ public:
         @descr      -   registers the given XEventListener.
     */
 
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) override;
 
     /**___________________________________________________________________________________________________
         @descr      -   unregisters the given XEventListener.
     */
 
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) override;
 
 
     //  XDocumentEventBroadcaster
 
 
-    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) override;
+    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) override;
+    virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) override;
 
 
     //  XUnoTunnel
 
 
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // css.frame.XModule
-    virtual void SAL_CALL setIdentifier(const OUString& sIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setIdentifier(const OUString& sIdentifier) override;
 
     // css.frame.XModule
-    virtual OUString SAL_CALL getIdentifier()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getIdentifier() override;
 
     // css.frame.XTitle
-    virtual OUString SAL_CALL getTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getTitle() override;
 
     // css.frame.XTitle
-    virtual void SAL_CALL setTitle( const OUString& sTitle )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& sTitle ) override;
 
     // css.frame.XTitleChangeBroadcaster
-    virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
 
     // css.frame.XTitleChangeBroadcaster
-    virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
 
     // css.frame.XUntitledNumbers
-    virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception         ) override;
+    virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) override;
 
     // css.frame.XUntitledNumbers
-    virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception         ) override;
+    virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) override;
 
     // css.frame.XUntitledNumbers
-    virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception         ) override;
+    virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) override;
 
     // css.frame.XUntitledNumbers
-    virtual OUString SAL_CALL getUntitledPrefix()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getUntitledPrefix() override;
 
     // css.document.XDocumentRecovery
-    virtual sal_Bool SAL_CALL wasModifiedSinceLastSave()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor )
-        throw ( css::uno::RuntimeException,
-                css::io::IOException,
-                css::lang::WrappedTargetException, std::exception ) override;
-    virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor )
-        throw ( css::uno::RuntimeException,
-                css::io::IOException,
-                css::lang::WrappedTargetException, std::exception ) override;
+    virtual sal_Bool SAL_CALL wasModifiedSinceLastSave() override;
+    virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) override;
+    virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) override;
 
     // css.document.XUndoManagerSupplier
-    virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager(  ) override;
 
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getStringValue() override;
 
     // css::rdf::XURI:
-    virtual OUString SAL_CALL getNamespace()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getNamespace() override;
+    virtual OUString SAL_CALL getLocalName() override;
 
     // css::rdf::XRepositorySupplier:
     virtual css::uno::Reference<
-        css::rdf::XRepository > SAL_CALL getRDFRepository()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::rdf::XRepository > SAL_CALL getRDFRepository() override;
 
     // css::rdf::XDocumentMetadataAccess:
     virtual css::uno::Reference<
                 css::rdf::XMetadatable > SAL_CALL
         getElementByMetadataReference(
-            const css::beans::StringPair & i_rReference)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::beans::StringPair & i_rReference) override;
     virtual css::uno::Reference<
                 css::rdf::XMetadatable > SAL_CALL
         getElementByURI(const css::uno::Reference<
-            css::rdf::XURI > & i_xURI)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException, std::exception) override;
+            css::rdf::XURI > & i_xURI) override;
     virtual css::uno::Sequence< css::uno::Reference<
             css::rdf::XURI > > SAL_CALL getMetadataGraphsWithType(
             const css::uno::Reference<
-                css::rdf::XURI > & i_xType)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException, std::exception) override;
+                css::rdf::XURI > & i_xType) override;
     virtual css::uno::Reference<
                 css::rdf::XURI> SAL_CALL
         addMetadataFile(const OUString & i_rFileName,
             const css::uno::Sequence<
                 css::uno::Reference< css::rdf::XURI >
-                > & i_rTypes)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::container::ElementExistException, std::exception) override;
+                > & i_rTypes) override;
     virtual css::uno::Reference<
                 css::rdf::XURI> SAL_CALL
         importMetadataFile(::sal_Int16 i_Format,
@@ -707,29 +607,14 @@ public:
                 css::rdf::XURI > & i_xBaseURI,
             const css::uno::Sequence<
                 css::uno::Reference< css::rdf::XURI >
-                > & i_rTypes)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::datatransfer::UnsupportedFlavorException,
-            css::container::ElementExistException,
-            css::rdf::ParseException,
-            css::io::IOException, std::exception) override;
+                > & i_rTypes) override;
     virtual void SAL_CALL removeMetadataFile(
             const css::uno::Reference<
-                css::rdf::XURI > & i_xGraphName)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException, std::exception) override;
+                css::rdf::XURI > & i_xGraphName) override;
     virtual void SAL_CALL addContentOrStylesFile(
-            const OUString & i_rFileName)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::container::ElementExistException, std::exception) override;
+            const OUString & i_rFileName) override;
     virtual void SAL_CALL removeContentOrStylesFile(
-            const OUString & i_rFileName)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::container::NoSuchElementException, std::exception) override;
+            const OUString & i_rFileName) override;
 
     virtual void SAL_CALL loadMetadataFromStorage(
             const css::uno::Reference<
@@ -737,59 +622,42 @@ public:
             const css::uno::Reference<
                 css::rdf::XURI > & i_xBaseURI,
             const css::uno::Reference<
-                css::task::XInteractionHandler> & i_xHandler)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) override;
+                css::task::XInteractionHandler> & i_xHandler) override;
     virtual void SAL_CALL storeMetadataToStorage(
             const css::uno::Reference<
-                css::embed::XStorage > & i_xStorage)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) override;
+                css::embed::XStorage > & i_xStorage) override;
     virtual void SAL_CALL loadMetadataFromMedium(
             const css::uno::Sequence<
-                css::beans::PropertyValue > & i_rMedium)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) override;
+                css::beans::PropertyValue > & i_rMedium) override;
     virtual void SAL_CALL storeMetadataToMedium(
             const css::uno::Sequence<
-                css::beans::PropertyValue > & i_rMedium)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, std::exception) override;
+                css::beans::PropertyValue > & i_rMedium) override;
 
     // XCmisDocument
 
     virtual css::uno::Sequence< css::document::CmisProperty >
-            SAL_CALL getCmisProperties()
-        throw (css::uno::RuntimeException, std::exception) override;
+            SAL_CALL getCmisProperties() override;
     virtual void SAL_CALL setCmisProperties(
             const css::uno::Sequence<
-                css::document::CmisProperty >& _cmisproperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+                css::document::CmisProperty >& _cmisproperties ) override;
 
     virtual void SAL_CALL updateCmisProperties(
             const css::uno::Sequence<
-                css::document::CmisProperty >& _cmisproperties )
-        throw (css::uno::RuntimeException, std::exception) override;
+                css::document::CmisProperty >& _cmisproperties ) override;
 
-    virtual css::uno::Sequence< css::document::CmisVersion > SAL_CALL getAllVersions ( )
-        throw (css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::document::CmisVersion > SAL_CALL getAllVersions ( ) override;
 
-    virtual void SAL_CALL checkOut(  ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL cancelCheckOut(  ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL checkIn( sal_Bool bIsMajor, const OUString & rMessage  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL checkOut(  ) override;
+    virtual void SAL_CALL cancelCheckOut(  ) override;
+    virtual void SAL_CALL checkIn( sal_Bool bIsMajor, const OUString & rMessage  ) override;
 
-    virtual sal_Bool SAL_CALL isVersionable( ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL canCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isVersionable( ) override;
+    virtual sal_Bool SAL_CALL canCheckOut( ) override;
+    virtual sal_Bool SAL_CALL canCancelCheckOut( ) override;
+    virtual sal_Bool SAL_CALL canCheckIn( ) override;
 
     /// @throws css::uno::RuntimeException
-    bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException );
+    bool getBoolPropertyValue( const OUString& rName );
 
 
     //  SfxListener
@@ -810,8 +678,8 @@ public:
     bool IsInitialized() const;
     void MethodEntryCheck( const bool i_mustBeInitialized ) const;
 
-    css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() override;
+    void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) override;
 
     /** calls all XEventListeners */
     void notifyEvent( const css::document::EventObject& aEvent ) const;
@@ -839,7 +707,7 @@ protected:
 
 private:
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::ui::XUIConfigurationManager2 > getUIConfigurationManager2() throw ( css::uno::RuntimeException );
+    css::uno::Reference< css::ui::XUIConfigurationManager2 > getUIConfigurationManager2();
     bool impl_getPrintHelper();
     SAL_DLLPRIVATE void ListenForStorage_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage );
     SAL_DLLPRIVATE OUString GetMediumFilterName_Impl();
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index c5a18e9515bd..0f261803bb68 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -49,15 +49,15 @@ class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
         virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 
         // XComponent
-        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override;
 
     private:
         SfxStatusListener( const SfxStatusListener& ) = delete;
diff --git a/include/sfx2/sidebar/Accessible.hxx b/include/sfx2/sidebar/Accessible.hxx
index 38c9fb7fdf7c..34e436972893 100644
--- a/include/sfx2/sidebar/Accessible.hxx
+++ b/include/sfx2/sidebar/Accessible.hxx
@@ -49,8 +49,7 @@ public:
 
     virtual void SAL_CALL disposing() override;
     // XAccessible
-    virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() override;
 
 private:
     css::uno::Reference<css::accessibility::XAccessibleContext> mxContext;
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index 519daef5da82..e648b2b3bb9a 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -86,24 +86,19 @@ public:
     static void unregisterSidebarForFrame(SidebarController* pController, const css::uno::Reference<css::frame::XController>& xFrame);
 
     // ui::XContextChangeEventListener
-    virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) override;
 
     // beans::XPropertyChangeListener
-    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;
 
     // frame::XStatusListener
-    virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) override;
 
     // ui::XSidebar
-    virtual void SAL_CALL requestLayout()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL requestLayout() override;
 
     void NotifyResize();
 
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 6fe46dcb7c46..e87014708cf1 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -59,39 +59,28 @@ public:
                                                            const css::ui::LayoutSize& rLayoutSize);
 
     // XContextChangeEventListener
-    virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent) override;
 
     // 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;
 
     // XUIElement
-    virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getResourceURL()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame() override;
+    virtual OUString SAL_CALL getResourceURL() override;
+    virtual sal_Int16 SAL_CALL getType() override;
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface() override;
 
     // XToolPanel
     virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible(
-                const css::uno::Reference<css::accessibility::XAccessible>& rxParentAccessible)
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow()
-        throw(css::uno::RuntimeException, std::exception) override;
+                const css::uno::Reference<css::accessibility::XAccessible>& rxParentAccessible) override;
+    virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() override;
 
     // XSidebarPanel
-    virtual css::ui::LayoutSize SAL_CALL getHeightForWidth(sal_Int32 nWidth)
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMinimalWidth()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::ui::LayoutSize SAL_CALL getHeightForWidth(sal_Int32 nWidth) override;
+    virtual sal_Int32 SAL_CALL getMinimalWidth() override;
 
     // XUpdateModel
-    virtual void SAL_CALL updateModel(const css::uno::Reference<css::frame::XModel>& xModel)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL updateModel(const css::uno::Reference<css::frame::XModel>& xModel) override;
 
 protected:
     css::uno::Reference<css::frame::XFrame> mxFrame;
@@ -102,8 +91,7 @@ protected:
     SidebarPanelBase(const SidebarPanelBase&) = delete;
     SidebarPanelBase& operator=( const SidebarPanelBase& ) = delete;
 
-    virtual void SAL_CALL disposing()
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing() override;
 
 private:
     VclPtr<vcl::Window> mpControl;
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index f457d740ed9c..6f0915e1c17a 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -153,52 +153,29 @@ public:
     static css::uno::Reference<css::beans::XPropertySet> GetPropertySet();
 
     // beans::XPropertySet
-    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue (
         const ::rtl::OUString& rsPropertyName,
-        const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException,
-               std::exception) override;
+        const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue (
-        const ::rtl::OUString& rsPropertyName)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const ::rtl::OUString& rsPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
         const ::rtl::OUString& rsPropertyName,
-        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
         const ::rtl::OUString& rsPropertyName,
-        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
         const ::rtl::OUString& rsPropertyName,
-        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
         const ::rtl::OUString& rsPropertyName,
-        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override;
 
     // beans::XPropertySetInfo
-    virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName)
-        throw(css::beans::UnknownPropertyException,
-            css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties() override;
+    virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName) override;
 
 private:
     static Theme& GetCurrentTheme();
diff --git a/include/sfx2/sidebar/UnoDeck.hxx b/include/sfx2/sidebar/UnoDeck.hxx
index 9e4d05255b15..b0e82e63f1da 100644
--- a/include/sfx2/sidebar/UnoDeck.hxx
+++ b/include/sfx2/sidebar/UnoDeck.hxx
@@ -30,34 +30,22 @@ public:
 
     SfxUnoDeck(const css::uno::Reference<css::frame::XFrame>& , const OUString&);
 
-    virtual OUString SAL_CALL getId()
-                                throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL  getTitle()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitle( const OUString& newTitle )
-                                throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Bool SAL_CALL isActive()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL activate( const sal_Bool bActivate )
-                                throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Reference<css::ui::XPanels> SAL_CALL getPanels()
-                                throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Int32 SAL_CALL getOrderIndex()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOrderIndex( const sal_Int32 newOrderIndex )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveFirst()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveLast()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveUp()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveDown()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getId() override;
+
+    virtual OUString SAL_CALL  getTitle() override;
+    virtual void SAL_CALL setTitle( const OUString& newTitle ) override;
+
+    virtual sal_Bool SAL_CALL isActive() override;
+    virtual void SAL_CALL activate( const sal_Bool bActivate ) override;
+
+    virtual css::uno::Reference<css::ui::XPanels> SAL_CALL getPanels() override;
+
+    virtual sal_Int32 SAL_CALL getOrderIndex() override;
+    virtual void SAL_CALL setOrderIndex( const sal_Int32 newOrderIndex ) override;
+    virtual void SAL_CALL moveFirst() override;
+    virtual void SAL_CALL moveLast() override;
+    virtual void SAL_CALL moveUp() override;
+    virtual void SAL_CALL moveDown() override;
 
 private:
 
diff --git a/include/sfx2/sidebar/UnoDecks.hxx b/include/sfx2/sidebar/UnoDecks.hxx
index 34cf6ff87521..3f7c623283e0 100644
--- a/include/sfx2/sidebar/UnoDecks.hxx
+++ b/include/sfx2/sidebar/UnoDecks.hxx
@@ -34,32 +34,21 @@ public:
 
 // XNameAccess
 
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
 // XIndexAccess
 
-    virtual sal_Int32 SAL_CALL getCount()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
 
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                      css::lang::WrappedTargetException,
-                                      css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
 // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
 private:
 
diff --git a/include/sfx2/sidebar/UnoPanel.hxx b/include/sfx2/sidebar/UnoPanel.hxx
index 8c308100af46..b77a0ab0fcec 100644
--- a/include/sfx2/sidebar/UnoPanel.hxx
+++ b/include/sfx2/sidebar/UnoPanel.hxx
@@ -33,36 +33,23 @@ public:
 
     SfxUnoPanel(const css::uno::Reference<css::frame::XFrame>& , const OUString&, const OUString&);
 
-    virtual OUString SAL_CALL getId()
-                                throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL  getTitle()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitle( const OUString& newTitle )
-                                throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Bool SAL_CALL isExpanded()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL expand( const sal_Bool bCollapseOther )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL collapse( )
-                                throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Int32 SAL_CALL getOrderIndex()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOrderIndex( const sal_Int32 newOrderIndex )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveFirst()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveLast()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveUp()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL moveDown()
-                                throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getDialog()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getId() override;
+
+    virtual OUString SAL_CALL  getTitle() override;
+    virtual void SAL_CALL setTitle( const OUString& newTitle ) override;
+
+    virtual sal_Bool SAL_CALL isExpanded() override;
+    virtual void SAL_CALL expand( const sal_Bool bCollapseOther ) override;
+    virtual void SAL_CALL collapse( ) override;
+
+    virtual sal_Int32 SAL_CALL getOrderIndex() override;
+    virtual void SAL_CALL setOrderIndex( const sal_Int32 newOrderIndex ) override;
+    virtual void SAL_CALL moveFirst() override;
+    virtual void SAL_CALL moveLast() override;
+    virtual void SAL_CALL moveUp() override;
+    virtual void SAL_CALL moveDown() override;
+
+    virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getDialog() override;
 
 private:
 
diff --git a/include/sfx2/sidebar/UnoPanels.hxx b/include/sfx2/sidebar/UnoPanels.hxx
index b9558b4efc34..71aa7d0431bd 100644
--- a/include/sfx2/sidebar/UnoPanels.hxx
+++ b/include/sfx2/sidebar/UnoPanels.hxx
@@ -31,37 +31,25 @@ public:
     SfxUnoPanels(const css::uno::Reference<css::frame::XFrame>& , const OUString&);
 
 // XPanels
-    virtual OUString SAL_CALL getDeckId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDeckId() override;
 
 // XNameAccess
 
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                      css::lang::WrappedTargetException,
-                                      css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
 // XIndexAccess
 
-    virtual sal_Int32 SAL_CALL getCount()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
 
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                      css::lang::WrappedTargetException,
-                                      css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
 // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
 private:
 
diff --git a/include/sfx2/sidebar/UnoSidebar.hxx b/include/sfx2/sidebar/UnoSidebar.hxx
index 515ba9648906..a60143b65f94 100644
--- a/include/sfx2/sidebar/UnoSidebar.hxx
+++ b/include/sfx2/sidebar/UnoSidebar.hxx
@@ -40,24 +40,18 @@ public:
 
     SfxUnoSidebar(const css::uno::Reference<css::frame::XFrame>&);
 
-    virtual void SAL_CALL showDecks (const sal_Bool bVisible)
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL showDecks (const sal_Bool bVisible) override;
 
 
-    virtual void SAL_CALL setVisible (const sal_Bool bVisible)
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setVisible (const sal_Bool bVisible) override;
 
-    virtual sal_Bool SAL_CALL isVisible()
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isVisible() override;
 
-    virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame()
-                                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame() override;
 
-    virtual css::uno::Reference<css::ui::XDecks> SAL_CALL getDecks()
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::ui::XDecks> SAL_CALL getDecks() override;
 
-    virtual css::uno::Reference<css::ui::XSidebar> SAL_CALL getSidebar()
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::ui::XSidebar> SAL_CALL getSidebar() override;
 
 };
 
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index d3cb43b59ffc..a98d66e8e949 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -75,22 +75,21 @@ protected:
     using svt::StatusbarController::dispose;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
     // XStatusbarController
-    virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) override;
+    virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) override;
+    virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) override;
     virtual void SAL_CALL command( const css::awt::Point& aPos,
                                     ::sal_Int32 nCommand,
                                     sal_Bool bMouseEvent,
-                                    const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aData ) override;
     virtual void SAL_CALL paint( const css::uno::Reference< css::awt::XGraphics >& xGraphics,
                                  const css::awt::Rectangle& rOutputRectangle,
-                                 ::sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
+                                 ::sal_Int32 nStyle ) override;
+    virtual void SAL_CALL click( const css::awt::Point& aPos ) override;
+    virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) override;
 
     // Old sfx2 interface
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 02783f47bbc1..caa0cfe9bfad 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -162,24 +162,18 @@ protected:
 
 public:
     // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     // new controller API
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
     // XToolbarController
-    virtual void SAL_CALL execute( sal_Int16 KeyModifier )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL click()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL doubleClick()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
+    virtual void SAL_CALL click() override;
+    virtual void SAL_CALL doubleClick() override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent ) override;
 
 public:
                                SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 2ca48340dc81..421cd607c08c 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -57,10 +57,10 @@ public:
     // XDispatch
     virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL,
                 const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
-                const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ) 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 ) 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;
+                const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ) 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;
 
     // Something else
     void                ReleaseAll();
@@ -86,17 +86,14 @@ public:
 
     virtual void SAL_CALL       dispatchWithNotification( const css::util::URL& aURL,
                                                           const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
-                                                          const css::uno::Reference< css::frame::XDispatchResultListener >& rListener )
-                                throw( css::uno::RuntimeException, std::exception ) override;
+                                                          const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ) override;
     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;
+                                          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)
-                                throw( css::uno::RuntimeException, std::exception ) override;
+                                                   const css::util::URL& aURL) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override ;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override ;
     static const css::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier();
 
     static bool             IsMasterUnoCommand( const css::util::URL& aURL );
@@ -144,10 +141,9 @@ public:
     /// @throws css::uno::RuntimeException
     void SAL_CALL       dispatch( const css::util::URL& aURL,
                                   const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
-                                  const css::uno::Reference< css::frame::XDispatchResultListener >& rListener )
-        throw (css::uno::RuntimeException, std::exception);
+                                  const css::uno::Reference< css::frame::XDispatchResultListener >& rListener );
     /// @throws css::uno::RuntimeException
-    void SAL_CALL       addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException );
+    void SAL_CALL       addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL);
     void                UnBindController();
     SfxDispatcher*      GetDispatcher();
     void                SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx
index 00db6f1d06eb..7105b7050154 100644
--- a/include/sfx2/userinputinterception.hxx
+++ b/include/sfx2/userinputinterception.hxx
@@ -51,13 +51,13 @@ namespace sfx2
 
         // delegator functions for your XUserInputInterception implementation
         /// @throws css::uno::RuntimeException
-        void    addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException);
+        void    addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler );
         /// @throws css::uno::RuntimeException
-        void    removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException);
+        void    removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler );
         /// @throws css::uno::RuntimeException
-        void    addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException);
+        void    addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler );
         /// @throws css::uno::RuntimeException
-        void    removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException);
+        void    removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler );
 
         // state
         bool    hasKeyHandlers() const;
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index 9bc67a7df466..8e1c44afa456 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -97,8 +97,7 @@ public:
     const SfxItemPropertySimpleEntry*  getByName( const OUString &rName ) const;
     css::uno::Sequence< css::beans::Property > getProperties() const;
     /// @throws css::beans::UnknownPropertyException
-    css::beans::Property getPropertyByName( const OUString & rName ) const
-        throw( css::beans::UnknownPropertyException );
+    css::beans::Property getPropertyByName( const OUString & rName ) const;
     bool hasPropertyByName( const OUString& rName ) const;
 
     void mergeProperties( const css::uno::Sequence< css::beans::Property >& rPropSeq );
@@ -120,43 +119,32 @@ public:
     /// @throws css::uno::RuntimeException
     void getPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
                                           const SfxItemSet& rSet,
-                                          css::uno::Any& rAny) const
-                                          throw(css::uno::RuntimeException);
+                                          css::uno::Any& rAny) const;
     /// @throws css::uno::RuntimeException
     /// @throws css::beans::UnknownPropertyException
     void getPropertyValue( const OUString &rName,
                                             const SfxItemSet& rSet,
-                                            css::uno::Any& rAny) const
-                                            throw(css::uno::RuntimeException,
-                                                    css::beans::UnknownPropertyException);
+                                            css::uno::Any& rAny) const;
     /// @throws css::uno::RuntimeException
     /// @throws css::beans::UnknownPropertyException
     css::uno::Any
         getPropertyValue( const OUString &rName,
-                                            const SfxItemSet& rSet ) const
-                                            throw(css::uno::RuntimeException,
-                                                    css::beans::UnknownPropertyException);
+                                            const SfxItemSet& rSet ) const;
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
     void                setPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
                                           const css::uno::Any& aVal,
-                                          SfxItemSet& rSet ) const
-                                          throw(css::uno::RuntimeException,
-                                                  css::lang::IllegalArgumentException);
+                                          SfxItemSet& rSet ) const;
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::beans::UnknownPropertyException
     void                  setPropertyValue( const OUString& rPropertyName,
                                             const css::uno::Any& aVal,
-                                            SfxItemSet& rSet ) const
-                                            throw(css::uno::RuntimeException,
-                                                    css::lang::IllegalArgumentException,
-                                                    css::beans::UnknownPropertyException);
+                                            SfxItemSet& rSet ) const;
 
     /// @throws css::beans::UnknownPropertyException
     css::beans::PropertyState
-        getPropertyState(const OUString& rName, const SfxItemSet& rSet)const
-                                    throw(css::beans::UnknownPropertyException);
+        getPropertyState(const OUString& rName, const SfxItemSet& rSet)const;
     css::beans::PropertyState
         getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const
                                     throw();
@@ -177,17 +165,13 @@ public:
     virtual ~SfxItemPropertySetInfo() override;
 
     virtual css::uno::Sequence< css::beans::Property > SAL_CALL
-        getProperties(  )
-            throw(css::uno::RuntimeException, std::exception) override;
+        getProperties(  ) override;
 
     virtual css::beans::Property SAL_CALL
-        getPropertyByName( const OUString& aName )
-            throw(css::beans::UnknownPropertyException,
-                    css::uno::RuntimeException, std::exception) override;
+        getPropertyByName( const OUString& aName ) override;
 
     virtual sal_Bool SAL_CALL
-        hasPropertyByName( const OUString& Name )
-            throw(css::uno::RuntimeException, std::exception) override;
+        hasPropertyByName( const OUString& Name ) override;
 
 };
 
@@ -201,16 +185,13 @@ public:
                             virtual ~SfxExtItemPropertySetInfo() override;
 
     virtual css::uno::Sequence< css::beans::Property > SAL_CALL
-        getProperties(  )
-            throw(css::uno::RuntimeException, std::exception) override;
+        getProperties(  ) override;
 
     virtual css::beans::Property SAL_CALL
-        getPropertyByName( const OUString& aName )
-            throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+        getPropertyByName( const OUString& aName ) override;
 
     virtual sal_Bool SAL_CALL
-        hasPropertyByName( const OUString& Name )
-            throw(css::uno::RuntimeException, std::exception) override;
+        hasPropertyByName( const OUString& Name ) override;
 };
 
 #endif
diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx
index 3a3aecc17065..58dce1dc66ec 100644
--- a/include/svl/numuno.hxx
+++ b/include/svl/numuno.hxx
@@ -55,15 +55,12 @@ public:
 
                                 // XNumberFormatsSupplier
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-                                getNumberFormatSettings()
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                getNumberFormatSettings() override;
     virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL
-                                getNumberFormats()
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                getNumberFormats() override;
 
                                 // XUnoTunnel
-    virtual sal_Int64 SAL_CALL  getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL  getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static SvNumberFormatsSupplierObj* getImplementation( const css::uno::Reference<
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 69bc70f0dbd2..0233ce053f30 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -326,7 +326,7 @@ public:
     static SfxUnoStyleSheet* getUnoStyleSheet( const css::uno::Reference< css::style::XStyle >& xStyle );
 
     // XUnoTunnel
-    virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override;
 
 private:
     static const css::uno::Sequence< ::sal_Int8 >& getIdentifier();
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index 174d02b13dbd..f4a52304078c 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -70,110 +70,107 @@ protected:
 public:
     /// @throws css::uno::RuntimeException
     bool SAL_CALL
-        isVisible() throw( css::uno::RuntimeException );
+        isVisible();
 
     //=====  XAccessible  =====================================================
 
     virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleContext() override;
 
     //=====  XAccessibleComponent  ============================================
 
     virtual sal_Bool SAL_CALL
-        containsPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
+        containsPoint( const css::awt::Point& rPoint ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     virtual css::awt::Rectangle SAL_CALL
-        getBounds() throw( css::uno::RuntimeException, std::exception ) override;
+        getBounds() override;
 
     virtual css::awt::Point SAL_CALL
-        getLocation() throw( css::uno::RuntimeException, std::exception ) override;
+        getLocation() override;
 
     virtual css::awt::Point SAL_CALL
-        getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override;
+        getLocationOnScreen() override;
 
     virtual css::awt::Size SAL_CALL
-        getSize() throw( css::uno::RuntimeException, std::exception ) override;
+        getSize() override;
 
     virtual void SAL_CALL
-        grabFocus() throw( css::uno::RuntimeException, std::exception ) override;
+        grabFocus() override;
 
     virtual sal_Int32 SAL_CALL
-        getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        getForeground(  ) override;
     virtual sal_Int32 SAL_CALL
-        getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        getBackground(  ) override;
 
     //=====  XAccessibleContext  ==============================================
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild( sal_Int32 nIndex )
-            throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
+        getAccessibleChild( sal_Int32 nIndex ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleParent() override;
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleIndexInParent() override;
 
     virtual sal_Int16 SAL_CALL
-        getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleRole() override;
 
     virtual ::rtl::OUString SAL_CALL
-        getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     virtual ::rtl::OUString SAL_CALL
-        getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
-        getAccessibleRelationSet() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleRelationSet() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-        getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleStateSet() override;
 
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-            throw(  css::uno::RuntimeException,
-                    css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override;
+        getLocale() override;
     //=====  XAccessibleEventBroadcaster  =====================================
 
     virtual void SAL_CALL
-        addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )throw( css::uno::RuntimeException, std::exception ) override;
+        addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     virtual void SAL_CALL
-        removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+        removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     //=====  XServiceInfo  ====================================================
 
     virtual ::rtl::OUString SAL_CALL
-        getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
 
     virtual sal_Bool SAL_CALL
-        supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const ::rtl::OUString& sServiceName ) override;
 
     virtual css::uno::Sequence< ::rtl::OUString> SAL_CALL
-        getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
     //=====  XTypeProvider  ===================================================
 
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationId() override;
 
 protected:
 
     /// @Return the object's current bounding box relative to the desktop.
     ///
     /// @throws css::uno::RuntimeException
-    Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException );
+    Rectangle GetBoundingBoxOnScreen();
 
     /// @Return the object's current bounding box relative to the parent object.
     ///
     /// @throws css::uno::RuntimeException
-    Rectangle GetBoundingBox() throw( css::uno::RuntimeException );
+    Rectangle GetBoundingBox();
 
 
     virtual void SAL_CALL disposing() override;
@@ -182,7 +179,7 @@ protected:
     inline bool IsAlive() const;
 
     /// @throws DisposedException if it's not alive
-    void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
+    void ThrowExceptionIfNotAlive();
 
 private:
     /** Description of this object.  This is not a constant because it can
diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx
index 3fdcf18c2ae5..5a1a45700904 100644
--- a/include/svtools/cliplistener.hxx
+++ b/include/svtools/cliplistener.hxx
@@ -45,11 +45,9 @@ public:
     void    ClearCallbackLink();
 
             // 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;
             // XClipboardListener
-    virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& event )
-                                            throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& event ) override;
 };
 
 #endif
diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx
index a4a2b7392e48..91ec525f110b 100644
--- a/include/svtools/dialogclosedlistener.hxx
+++ b/include/svtools/dialogclosedlistener.hxx
@@ -50,10 +50,10 @@ namespace svt
         inline void SetDialogClosedLink( const Link<css::ui::dialogs::DialogClosedEvent*,void>& rLink ) { m_aDialogClosedLink = rLink; }
 
         // XDialogClosedListener methods
-        virtual void SAL_CALL   dialogClosed( const css::ui::dialogs::DialogClosedEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL   dialogClosed( const css::ui::dialogs::DialogClosedEvent& aEvent ) override;
 
         // XEventListener methods
-        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;
     };
 
 
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index e64b1e9525b8..4b521e6e7c6e 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -52,23 +52,23 @@ class SVT_DLLPUBLIC FrameStatusListener : public css::frame::XStatusListener,
         void bindListener();
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override = 0;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override = 0;
 
         // XFrameActionListener
-        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) override;
 
     protected:
         struct Listener
diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx
index 9014fd977c5b..c309ec3956b4 100644
--- a/include/svtools/generictoolboxcontroller.hxx
+++ b/include/svtools/generictoolboxcontroller.hxx
@@ -39,13 +39,13 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController
         virtual ~GenericToolboxController() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dispose() override;
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
          DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, void*, void );
 
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 5116a14b04cf..2256a8614f15 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -91,27 +91,27 @@ namespace svt
     public:
         // UNO
         DECLARE_UNO3_DEFAULTS(OGenericUnoDialog, OGenericUnoDialogBase)
-        virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override = 0;
+        virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes(  ) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override = 0;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override = 0;
+        virtual OUString SAL_CALL getImplementationName() override = 0;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override = 0;
 
         // OPropertySetHelper
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::uno::Exception, std::exception) override;
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) throw(css::lang::IllegalArgumentException) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) override;
 
         // XExecutableDialog
-        virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL execute(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+        virtual sal_Int16 SAL_CALL execute(  ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     protected:
         /** create the concrete dialog instance. note that m_aMutex is not locked when this method get's called,
diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx
index b14e8230b835..1fa0f700a8c4 100644
--- a/include/svtools/javacontext.hxx
+++ b/include/svtools/javacontext.hxx
@@ -49,16 +49,14 @@ namespace svt
 
         // XInterface
         virtual css::uno::Any SAL_CALL queryInterface(
-            const css::uno::Type& aType )
-            throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Type& aType ) override;
 
         virtual void SAL_CALL acquire() throw () override;
 
         virtual void SAL_CALL release() throw () override;
 
         // XCurrentContext
-        virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) override;
 
     private:
         JavaContext(JavaContext&) = delete;
diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx
index d68210041cec..09bef97a0250 100644
--- a/include/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
@@ -43,16 +43,14 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface(
-        const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type& aType ) override;
 
     virtual void SAL_CALL acquire() throw() override;
 
     virtual void SAL_CALL release() throw() override;
 
     // XCurrentContext
-    virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
 
 private:
     oslInterlockedCount m_aRefCount;
diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index 1faf79af4b98..af00e9bc769c 100644
--- a/include/svtools/openfiledroptargetlistener.hxx
+++ b/include/svtools/openfiledroptargetlistener.hxx
@@ -54,14 +54,14 @@ class SVT_DLLPUBLIC OpenFileDropTargetListener : public cppu::WeakImplHelper< cs
 
     public:
         // 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;
 
         // XDropTargetListener
-        virtual void SAL_CALL drop             ( const css::datatransfer::dnd::DropTargetDropEvent&      dtde  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dragEnter        ( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dragExit         ( const css::datatransfer::dnd::DropTargetEvent&          dte   ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dragOver         ( const css::datatransfer::dnd::DropTargetDragEvent&      dtde  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent&      dtde  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL drop             ( const css::datatransfer::dnd::DropTargetDropEvent&      dtde  ) override;
+        virtual void SAL_CALL dragEnter        ( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override;
+        virtual void SAL_CALL dragExit         ( const css::datatransfer::dnd::DropTargetEvent&          dte   ) override;
+        virtual void SAL_CALL dragOver         ( const css::datatransfer::dnd::DropTargetDragEvent&      dtde  ) override;
+        virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent&      dtde  ) override;
 
     private:
         void     implts_BeginDrag( const css::uno::Sequence< css::datatransfer::DataFlavor >& rSupportedDataFlavors );
diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx
index d78aa34cd567..ac33169b2824 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -63,43 +63,43 @@ namespace svt
             virtual ~PopupMenuControllerBase() override;
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
-            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
+            virtual OUString SAL_CALL getImplementationName(  ) override = 0;
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+            virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override = 0;
 
             // XPopupMenuController
-            virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override;
+            virtual void SAL_CALL updatePopupMenu() override;
 
             // XInitialization
-            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
             // XStatusListener
-            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override = 0;
+            virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override = 0;
 
             // XMenuListener
-            virtual void SAL_CALL itemHighlighted( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL itemDeactivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL itemHighlighted( const css::awt::MenuEvent& rEvent ) override;
+            virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) override;
+            virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) override;
+            virtual void SAL_CALL itemDeactivated( const css::awt::MenuEvent& rEvent ) override;
 
             // XDispatchProvider
-            virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( css::uno::RuntimeException, std::exception ) override;
-            virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+            virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) override;
+            virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) override;
 
             // XDispatch
-            virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& seqProperties ) 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 >& seqProperties ) 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;
 
             // 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;
 
             void dispatchCommand( const OUString& sCommandURL, const css::uno::Sequence< css::beans::PropertyValue >& rArgs, const OUString& sTarget = OUString() );
 
     protected:
             /// @throws css::uno::RuntimeException
-            void throwIfDisposed() throw ( css::uno::RuntimeException );
+            void throwIfDisposed();
 
             /** helper method to cause statusChanged is called once for the given command url */
             void SAL_CALL updateCommand( const OUString& rCommandURL );
diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx
index 44794fa26691..6801e2a7514e 100644
--- a/include/svtools/popupwindowcontroller.hxx
+++ b/include/svtools/popupwindowcontroller.hxx
@@ -46,18 +46,18 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) = 0;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override = 0;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override = 0;
+    virtual OUString SAL_CALL getImplementationName() override = 0;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override = 0;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
     // XToolbarController
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
 
 private:
     std::unique_ptr< PopupWindowControllerImpl >  mxImpl;
diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx
index 5fb6b2693ea7..c9f403fd7265 100644
--- a/include/svtools/statusbarcontroller.hxx
+++ b/include/svtools/statusbarcontroller.hxx
@@ -56,40 +56,40 @@ class SVT_DLLPUBLIC StatusbarController :
         ::Rectangle getControlRect() const;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL update() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
         // XStatusbarController
-        virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) override;
+        virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) override;
+        virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) override;
         virtual void SAL_CALL command( const css::awt::Point& aPos,
                                        ::sal_Int32 nCommand,
                                        sal_Bool bMouseEvent,
-                                       const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override;
+                                       const css::uno::Any& aData ) override;
         virtual void SAL_CALL paint( const css::uno::Reference< css::awt::XGraphics >& xGraphics,
                                      const css::awt::Rectangle& rOutputRectangle,
-                                     ::sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
+                                     ::sal_Int32 nStyle ) override;
+        virtual void SAL_CALL click( const css::awt::Point& aPos ) override;
+        virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) override;
 
     protected:
         struct Listener
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 3fb12accb744..94aba0966a1c 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -61,7 +61,7 @@ protected:
 
     // Forwarded from XStatusListener (subclasses must override this one to get the status updates):
     /// @throws css::uno::RuntimeException
-    virtual void statusChanged(const css::frame::FeatureStateEvent& Event ) throw (css::uno::RuntimeException, std::exception);
+    virtual void statusChanged(const css::frame::FeatureStateEvent& Event );
 
 private:
     css::uno::Reference< css::frame::XFrame >  mxFrame;
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index eac72ecdbfa0..a0f3c6bbc8d1 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -75,41 +75,40 @@ class SVT_DLLPUBLIC ToolboxController :
         void updateStatus();
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
-        virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL update() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
         // XEventListener
         using cppu::OPropertySetHelper::disposing;
-        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;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override = 0;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override = 0;
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
+        virtual void SAL_CALL click() override;
+        virtual void SAL_CALL doubleClick() override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
         // OPropertySetHelper
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::uno::Exception, std::exception) override;
-        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) throw(css::lang::IllegalArgumentException) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) override;
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         // OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index f5e4c53a6027..4cfa47510020 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -138,11 +138,11 @@ private:
     private:
 
         // 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;
 
     public:
 
@@ -168,29 +168,28 @@ protected:
 private:
 
     // XTransferable
-    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) override;
 
     // Transferable2
     virtual css::uno::Any SAL_CALL getTransferData2(
-        const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc )
-            throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) 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;
 
     // XDragSourceListener
-    virtual void SAL_CALL dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DragSourceEvent& dse ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) override;
+    virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) override;
+    virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DragSourceEvent& dse ) override;
+    virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) override;
+    virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) override;
 
 private:
 
     // XClipboardOwner
-    virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) override;
 
 protected:
     // derivees need to access lostOwnership in case hey override it
@@ -255,7 +254,7 @@ public:
 
 public:
 
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
 };
 
 struct TransferableDataHelper_Impl;
@@ -378,10 +377,10 @@ private:
     private:
 
         // 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;
 
         // XDragGestureListener
-        virtual void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) override;
 
     public:
 
@@ -423,14 +422,14 @@ private:
         std::unique_ptr<AcceptDropEvent>   mpLastDragOverEvent;
 
         // 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;
 
         // XDropTargetListener
-        virtual void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) override;
+        virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override;
+        virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) override;
+        virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override;
+        virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override;
 
     public:
 
diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx
index 2dff69664efe..50044da03279 100644
--- a/include/svtools/unoevent.hxx
+++ b/include/svtools/unoevent.hxx
@@ -77,52 +77,38 @@ public:
     virtual void SAL_CALL replaceByName(
         const OUString& rName,                /// API name of event
         const css::uno::Any& rElement ) /// event (PropertyValues)
-            throw(
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+             override;
 
     // XNameAccess (via XNameReplace)
     /// calls getByName(sal_uInt16)
     virtual css::uno::Any SAL_CALL getByName(
         const OUString& rName )  /// API name of event
-            throw(
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+             override;
 
     // XNameAxcess (via XNameReplace)
     virtual css::uno::Sequence< OUString > SAL_CALL
-                                                        getElementNames()
-        throw(css::uno::RuntimeException, std::exception) override;
+                                                        getElementNames() override;
 
     // XNameAccess (via XNameReplace)
     virtual sal_Bool SAL_CALL hasByName(
-        const OUString& rName )
-            throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& rName ) override;
 
     // XElementAccess (via XNameReplace)
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
 
     // XElementAccess (via XNameReplace)
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XServiceInfo
     /// must be implemented in subclass
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override = 0;
+    virtual OUString SAL_CALL getImplementationName() override = 0;
 
     // XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
 
     // XServiceInfo
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 protected:
 
@@ -135,11 +121,7 @@ protected:
     virtual void replaceByName(
         const sal_uInt16 nEvent,        /// item ID of event
         const SvxMacro& rMacro)     /// event (will be copied)
-            throw(
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException) = 0;
+             = 0;
 
     /// Must be implemented in subclass.
     ///
@@ -148,11 +130,7 @@ protected:
     /// @throws css::uno::RuntimeException
     virtual void getByName(
         SvxMacro& rMacro,
-        const sal_uInt16 nEvent )
-            throw(
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException) = 0;
+        const sal_uInt16 nEvent ) = 0;
 
     /// convert an API event name to the event ID as used by SvxMacroItem
     sal_uInt16 mapNameToEventID(const OUString& rName) const;
@@ -195,20 +173,13 @@ protected:
     virtual void replaceByName(
         const sal_uInt16 nEvent,        /// item ID of event
         const SvxMacro& rMacro)     /// event (will be copied)
-            throw(
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException) override;
+             override;
 
     using SvBaseEventDescriptor::getByName;
     virtual void getByName(
         SvxMacro& rMacros,          /// macro to be filled with values
         const sal_uInt16 nEvent )       /// item ID of event
-            throw(
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException) override;
+             override;
 
 
     /// Get the SvxMacroItem from the parent.
@@ -242,8 +213,7 @@ public:
     virtual ~SvDetachedEventDescriptor() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 protected:
 
@@ -253,20 +223,13 @@ protected:
     virtual void replaceByName(
         const sal_uInt16 nEvent,        /// item ID of event
         const SvxMacro& rMacro)     /// event (will be copied)
-            throw(
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException) override;
+             override;
 
     using SvBaseEventDescriptor::getByName;
     virtual void getByName(
         SvxMacro& rMacro,           /// macro to be filled
         const sal_uInt16 nEvent )       /// item ID of event
-            throw(
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException) override;
+             override;
 
     /// do we have an event?
     /// return true: we have a macro for the event
@@ -274,8 +237,7 @@ protected:
     /// @throws css::lang::IllegalArgumentException if the event is not supported
     bool hasById(
         const sal_uInt16 nEvent ) const     /// item ID of event
-             throw(
-                css::lang::IllegalArgumentException);
+             ;
 
 };
 
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 86a583b359e8..3515fbdacbb9 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -65,15 +65,15 @@ protected:
 
     //---  XAccessibleComponent  -------------------------------
     /// forward the focus to the contained control(in alive mode)
-    virtual void SAL_CALL grabFocus( ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus( ) override;
 
     //---  XAccessibleContext  ---------------------------------
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
 
     //---  XServiceInfo  ---------------------------------------
-    virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName( ) override;
 
     //---  XInterface  -----------------------------------------
     DECLARE_XINTERFACE( )
@@ -82,27 +82,27 @@ protected:
     DECLARE_XTYPEPROVIDER( )
 
     //---  XPropertyChangeListener  ----------------------------
-    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;
 
     //---  XComponent  -----------------------------------------
     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;
 
     //---  XModeChangeListener  --------------------------------
-    virtual void SAL_CALL modeChanged( const css::util::ModeChangeEvent& _rSource ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modeChanged( const css::util::ModeChangeEvent& _rSource ) override;
 
     //---  XAccessibleEventListener ----------------------------
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //---  document::XEventListener ----------------------------
     using AccessibleShape::notifyEvent;
 
     // XVclContainerListener
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
 protected:
     /** Initialize a new shape.  See the documentation of the base' constructor
@@ -112,20 +112,17 @@ protected:
 
     /// Create a name string that contains the accessible name.
     virtual OUString
-        CreateAccessibleBaseName( )
-        throw(css::uno::RuntimeException) override;
+        CreateAccessibleBaseName( ) override;
 
     /** Create a unique name string that contains the accessible name.  The
         name consists of the base name and the index.
     */
     virtual OUString
-        CreateAccessibleName( )
-        throw(css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleName( ) override;
 
     /// Create a description string that contains the accessible description.
     virtual OUString
-        CreateAccessibleDescription( )
-        throw(css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription( ) override;
 
 #ifdef DBG_UTIL
     /// Set the specified state
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index a520a98e5176..b8f539b80f3f 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -45,20 +45,16 @@ public:
 
     //=====  XAccessibleImage  ================================================
 
-    OUString SAL_CALL getAccessibleImageDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getAccessibleImageDescription() override;
 
-    sal_Int32 SAL_CALL getAccessibleImageHeight()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getAccessibleImageHeight() override;
 
-    sal_Int32 SAL_CALL getAccessibleImageWidth()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getAccessibleImageWidth() override;
 
     //=====  XInterface  ======================================================
 
     virtual css::uno::Any SAL_CALL
-        queryInterface (const css::uno::Type & rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+        queryInterface (const css::uno::Type & rType) override;
 
     virtual void SAL_CALL
         acquire()
@@ -73,30 +69,25 @@ public:
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     //=====  XTypeProvider  ===================================================
 
     virtual css::uno::Sequence< css::uno::Type> SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 /// Return this object's role.
-    virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 protected:
     /// Create a name string that contains the accessible name.
     virtual OUString
-        CreateAccessibleBaseName ()
-        throw (css::uno::RuntimeException) override;
+        CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
     virtual OUString
-        CreateAccessibleDescription ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription () override;
 
 private:
     AccessibleGraphicShape (const AccessibleGraphicShape&) = delete;
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index 9b59fa15873a..fa06ef72a8f4 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -45,28 +45,20 @@ public:
 
     //=====  XAccessibleAction  ===============================================
 
-    sal_Int32 SAL_CALL getAccessibleActionCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getAccessibleActionCount() override;
 
-    sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex) override;
 
-    OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) override;
 
     css::uno::Reference<
         css::accessibility::XAccessibleKeyBinding> SAL_CALL getAccessibleActionKeyBinding (
-            sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nIndex) override;
 
     //=====  XInterface  ======================================================
 
     virtual css::uno::Any SAL_CALL
-        queryInterface (const css::uno::Type & rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+        queryInterface (const css::uno::Type & rType) override;
 
     virtual void SAL_CALL
         acquire()
@@ -79,30 +71,25 @@ public:
     //=====  XServiceInfo  ====================================================
 
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     //=====  XTypeProvider  ===================================================
 
     virtual css::uno::Sequence< css::uno::Type> SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 // ====== XAccessibleExtendedAttributes =====================================
-    virtual css::uno::Any SAL_CALL getExtendedAttributes() throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL getExtendedAttributes() override ;
 protected:
     /// Create a name string that contains the accessible name.
     virtual OUString
-        CreateAccessibleBaseName ()
-        throw (css::uno::RuntimeException) override;
+        CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
     virtual OUString
-        CreateAccessibleDescription ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription () override;
 
 private:
     AccessibleOLEShape (const AccessibleOLEShape&) = delete;
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index d6860526efa9..310751da3801 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -106,51 +106,37 @@ public:
         const AccessibleShapeInfo& rShapeInfo,
         const AccessibleShapeTreeInfo& rShapeTreeInfo);
      //Solution: Overwrite the object's current name.
-    virtual OUString SAL_CALL    getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL    getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getAccessibleName() override;
+    virtual OUString SAL_CALL    getAccessibleDescription() override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() override;
 //=====  XAccessibleSelection  ============================================
 
     virtual void SAL_CALL selectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
     virtual sal_Bool SAL_CALL isAccessibleChildSelected(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
-    virtual void SAL_CALL clearAccessibleSelection(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
 
-    virtual void SAL_CALL selectAllAccessibleChildren(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
 
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nSelectedChildIndex ) override;
 
     virtual void SAL_CALL deselectAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nSelectedChildIndex ) override;
 
     // ====== XAccessibleExtendedAttributes =====================================
-    virtual css::uno::Any SAL_CALL getExtendedAttributes()
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL getExtendedAttributes() override ;
     /// Return this object's role.
-    virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
     //=====  XAccessibleGroupPosition  =========================================
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-        getGroupPosition( const css::uno::Any& rAny )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getGroupPosition( const css::uno::Any& rAny ) override;
+    virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject ) override;
     /** The destructor releases its children manager and text engine if
         still existent.  These are responsible to send appropriate events.
     */
@@ -207,8 +193,7 @@ public:
 
     /// Return the number of currently visible children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     /** Return the specified child.
         @param nIndex
@@ -221,45 +206,35 @@ public:
     */
     virtual css::uno::Reference<
             css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
 
     /// Return the set of current states.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     /// Return this objects index among the parents children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleIndexInParent() override;
 
     //=====  XAccessibleComponent  ============================================
 
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-        getAccessibleAtPoint (const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleAtPoint (const css::awt::Point& aPoint) override;
 
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
 
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     //=====  XAccessibleEventBroadcaster  =====================================
 
@@ -272,8 +247,7 @@ public:
     virtual void SAL_CALL
         addAccessibleEventListener (
             const css::uno::Reference<
-            css::accessibility::XAccessibleEventListener >& rxListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::accessibility::XAccessibleEventListener >& rxListener) override;
 
     /** This call is forwarded to a) the base class and b) to the
         accessible edit engine if it is present.
@@ -285,15 +259,13 @@ public:
     virtual void SAL_CALL
         removeAccessibleEventListener (
             const css::uno::Reference<
-            css::accessibility::XAccessibleEventListener >& rxListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::accessibility::XAccessibleEventListener >& rxListener) override;
 
 
     //=====  XInterface  ======================================================
 
     virtual css::uno::Any SAL_CALL
-        queryInterface (const css::uno::Type & rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+        queryInterface (const css::uno::Type & rType) override;
 
     virtual void SAL_CALL
         acquire()
@@ -309,18 +281,15 @@ public:
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     //=====  XTypeProvider  ===================================================
 
     virtual css::uno::Sequence< css::uno::Type> SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     //=====  IAccessibleViewForwarderListener  ================================
     virtual void ViewForwarderChanged() override;
@@ -331,47 +300,43 @@ public:
         remains functional when this happens.
     */
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& Source)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& Source) override;
 
     //=====  document::XEventListener  ========================================
 
     virtual void SAL_CALL
-        notifyEvent (const css::document::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        notifyEvent (const css::document::EventObject& rEventObject) override;
 
 
     //===== XUnoTunnel ========================================================
 
     static const css::uno::Sequence< sal_Int8 >&   getUnoTunnelImplementationId() throw();
     static AccessibleShape*                                     getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) override;
 
     //===== XAccessibleHypertext ========================================================
-    virtual sal_Int32 SAL_CALL getHyperLinkCount()  throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getHyperLinkCount() override;
     virtual css::uno::Reference< css::accessibility::XAccessibleHyperlink >
-        SAL_CALL getHyperLink( sal_Int32 nLinkIndex )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) override;
+    virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) override;
     //=====  XAccesibleText  ==================================================
-        virtual sal_Int32 SAL_CALL getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32; change back to sal_Unicode
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSelectedText(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getText(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getCaretPosition(  ) override;
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32; change back to sal_Unicode
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+        virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+        virtual sal_Int32 SAL_CALL getCharacterCount(  ) override;
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+        virtual OUString SAL_CALL getSelectedText(  ) override;
+        virtual sal_Int32 SAL_CALL getSelectionStart(  ) override;
+        virtual sal_Int32 SAL_CALL getSelectionEnd(  ) override;
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual OUString SAL_CALL getText(  ) override;
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     //===== Misc ========================================================
 
@@ -427,24 +392,20 @@ protected:
         @throws css::uno::RuntimeException
     */
     virtual OUString
-        CreateAccessibleBaseName()
-        throw (css::uno::RuntimeException, std::exception);
+        CreateAccessibleBaseName();
 
     /** Create a unique name string that contains the accessible name.  The
         name consists of the base name and the index.
     */
     virtual OUString
-        CreateAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleName() override;
 
     /// Create a description string that contains the accessible description.
     virtual OUString
-        CreateAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription() override;
     /// @throws css::uno::RuntimeException
     OUString
-       GetFullAccessibleName(AccessibleShape *shape)
-       throw (css::uno::RuntimeException, std::exception);
+       GetFullAccessibleName(AccessibleShape *shape);
     virtual OUString GetStyle();
     /** Update the <const>OPAQUE</const> and <const>SELECTED</const> state.
     */
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index 0116909fda88..c9803116f703 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -123,16 +123,12 @@ public:
     */
     css::uno::Reference<
             css::accessibility::XAccessible>
-        GetChild (long nIndex)
-        throw (css::uno::RuntimeException,
-               css::lang::IndexOutOfBoundsException);
+        GetChild (long nIndex);
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::accessibility::XAccessible> GetChild (const css::uno::Reference< css::drawing::XShape>& xShape) throw (css::uno::RuntimeException);
+        css::uno::Reference< css::accessibility::XAccessible> GetChild (const css::uno::Reference< css::drawing::XShape>& xShape);
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::drawing::XShape> GetChildShape (long nIndex)
-            throw (css::lang::IndexOutOfBoundsException,
-                   css::uno::RuntimeException);
+        css::uno::Reference< css::drawing::XShape> GetChildShape (long nIndex);
 
     /** Update the child manager.  Take care of a modified set of children
         and modified visible area.  This method can optimize the update
diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx
index e54cb551a9c0..36d1cb848340 100644
--- a/include/svx/IAccessibleParent.hxx
+++ b/include/svx/IAccessibleParent.hxx
@@ -79,18 +79,16 @@ public:
         const css::uno::Reference< css::drawing::XShape >& _rxShape,
         const long _nIndex,
         const AccessibleShapeTreeInfo& _rShapeTreeInfo
-    )   throw (css::uno::RuntimeException, std::exception) = 0;
+    ) = 0;
     //Add this method to support Form Controls
     /// @throws css::uno::RuntimeException
     virtual AccessibleControlShape* GetAccControlShapeFromModel
-        (css::beans::XPropertySet*)
-        throw (css::uno::RuntimeException){return nullptr;};
+        (css::beans::XPropertySet*){return nullptr;};
     /// @throws css::uno::RuntimeException
     virtual  css::uno::Reference<
             css::accessibility::XAccessible>
         GetAccessibleCaption (const css::uno::Reference<
-            css::drawing::XShape>&)
-            throw (css::uno::RuntimeException){return nullptr;};
+            css::drawing::XShape>&){return nullptr;};
     virtual bool IsDocumentSelAll(){ return false; }
 };
 
diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx
index 17f46b4650f6..6efecb8b5289 100644
--- a/include/svx/ParaSpacingControl.hxx
+++ b/include/svx/ParaSpacingControl.hxx
@@ -50,24 +50,20 @@ public:
     ParaLRSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
     virtual ~ParaLRSpacingControl() override;
 
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
                               const SfxPoolItem* pState) override;
     virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
 
     // XContextChangeEventListener
-    virtual void SAL_CALL notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) override;
 
-    virtual ::css::uno::Any SAL_CALL queryInterface(const ::css::uno::Type& aType)
-        throw (::css::uno::RuntimeException, ::std::exception) override;
+    virtual ::css::uno::Any SAL_CALL queryInterface(const ::css::uno::Type& aType) override;
 
     virtual void SAL_CALL acquire() throw () override;
 
-    virtual void SAL_CALL disposing(const ::css::lang::EventObject&)
-        throw (::css::uno::RuntimeException, ::std::exception) override;
+    virtual void SAL_CALL disposing(const ::css::lang::EventObject&) override;
 
     virtual void SAL_CALL release() throw () override;
 
diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx
index b5254453da00..9a62f6141e38 100644
--- a/include/svx/ShapeTypeHandler.hxx
+++ b/include/svx/ShapeTypeHandler.hxx
@@ -139,8 +139,7 @@ public:
     ///
     /// @throws css::uno::RuntimeException
     static OUString CreateAccessibleBaseName (
-        const css::uno::Reference< css::drawing::XShape >& rxShape)
-            throw (css::uno::RuntimeException, std::exception);
+        const css::uno::Reference< css::drawing::XShape >& rxShape);
 
 private:
     // Declare default constructor, copy constructor, destructor, and
diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index 16950bbe2b2e..54e3a8a2ebbd 100644
--- a/include/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
@@ -216,13 +216,13 @@ public:
     const OUString& GetApplicationName() const { return maApplicationName; }
 
     // css::lang::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;
 
     // css::util::XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 
     // css::util::XChangesListener
-      virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+      virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override;
 };
 
 #endif
diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx
index e13a520ec538..4db840376a80 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -37,8 +37,7 @@ public:
     virtual ~TextUnderlinePopup() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
 };
diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx
index 4a9eb0d3430e..d05d2983598f 100644
--- a/include/svx/fmdmod.hxx
+++ b/include/svx/fmdmod.hxx
@@ -30,8 +30,8 @@ public:
 
     virtual ~SvxFmMSFactory() {}
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) SAL_OVERRIDE;
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_SVX_FMDMOD_HXX
diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index be32ea540bdd..0b8382fe3ce6 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -34,13 +34,11 @@ protected:
 
     // Creating a SdrObject based on a Description. Cann be used by derived classes to
     // support own css::drawing::Shapes (for example Controls)
-    virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape ) override;
 
     // The following method is called when a SvxShape object should be created.
     // Derived classes can create a derivation or an object aggregating SvxShape.
-    virtual css::uno::Reference< css::drawing::XShape >  CreateShape( SdrObject *pObj ) const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XShape >  CreateShape( SdrObject *pObj ) const override;
 
 public:
     SvxFmDrawPage( SdrPage* pPage );
@@ -49,16 +47,16 @@ public:
     // UNO connection
     DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage)
 
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     // XFormsSupplier
-    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getForms() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getForms() override;
 
     // XFormsSupplier2
-    virtual sal_Bool SAL_CALL hasForms() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasForms() override;
 };
 
 #endif // INCLUDED_SVX_FMDPAGE_HXX
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index fdc0131a8227..257503cee37e 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -74,13 +74,13 @@ class SAL_WARN_UNUSED FmXModifyMultiplexer  :public OWeakSubObject
 public:
     FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex );
     DECLARE_UNO3_DEFAULTS(FmXModifyMultiplexer,OWeakSubObject)
-    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
 // css::lang::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;
 
 // css::util::XModifyListener
-    virtual void SAL_CALL modified(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified(const css::lang::EventObject& Source) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
     void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
@@ -98,14 +98,14 @@ public:
     FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex );
     DECLARE_UNO3_DEFAULTS(FmXUpdateMultiplexer,OWeakSubObject)
 
-    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
 // css::lang::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;
 
 // css::form::XUpdateListener
-    virtual sal_Bool SAL_CALL approveUpdate(const css::lang::EventObject &) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updated(const css::lang::EventObject &) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL approveUpdate(const css::lang::EventObject &) override;
+    virtual void SAL_CALL updated(const css::lang::EventObject &) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
     void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
@@ -123,13 +123,13 @@ public:
     FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex );
     DECLARE_UNO3_DEFAULTS(FmXSelectionMultiplexer, OWeakSubObject)
 
-    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
 // css::lang::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;
 
 // css::view::XSelectionChangeListener
-    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
     void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
@@ -147,13 +147,13 @@ public:
     FmXGridControlMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex );
     DECLARE_UNO3_DEFAULTS( FmXGridControlMultiplexer, OWeakSubObject )
 
-    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
 // css::lang::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;
 
 // css::view::XSelectionChangeListener
-    virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
     void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
@@ -170,15 +170,15 @@ class SAL_WARN_UNUSED FmXContainerMultiplexer : public OWeakSubObject,
 public:
     FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex);
     DECLARE_UNO3_DEFAULTS(FmXContainerMultiplexer,OWeakSubObject)
-    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override;
 
 // css::lang::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;
 
 // css::container::XContainerListener
-    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) override;
+    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) override;
+    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
 
 // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper2 have these memory operators
     void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); }
@@ -221,86 +221,86 @@ public:
 
     // UNO connection
     DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl)
-    virtual css::uno::Any  SAL_CALL queryAggregation(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any  SAL_CALL queryAggregation(const css::uno::Type& _rType) override;
 
 // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
 // css::lang::XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
 // css::lang::XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
-    virtual OUString SAL_CALL getImplementationName() throw(std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 // css::awt::XControl
-    virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) override;
+    virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) override;
+    virtual void SAL_CALL setDesignMode(sal_Bool bOn) override;
 
 // css::awt::XView
-    virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) override;
 
 // css::form::XBoundComponent
-    virtual void SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL commit() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) override;
+    virtual void SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) override;
+    virtual sal_Bool SAL_CALL commit() override;
 
 // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
 // css::container::XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() override;
 
 // css::container::XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) override;
 
 // css::form::XGridControl
-    virtual void SAL_CALL addGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) override;
+    virtual void SAL_CALL removeGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) override;
 
 // css::form::XGrid (base of XGridControl)
-    virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getCurrentColumnPosition() override;
+    virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) override;
 
 // css::form::XGridFieldDataSupplier (base of XGridControl)
-    virtual css::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const css::uno::Type& xType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const css::uno::Type& xType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const css::uno::Type& xType ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const css::uno::Type& xType ) override;
 
 // UnoControl
     virtual OUString GetComponentServiceName() override;
 
 // css::util::XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) override;
+    virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) override;
 
 // css::util::XModeSelector
-    virtual void SAL_CALL setMode(const OUString& Mode) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getMode() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString> SAL_CALL getSupportedModes() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setMode(const OUString& Mode) override;
+    virtual OUString SAL_CALL getMode() override;
+    virtual css::uno::Sequence< OUString> SAL_CALL getSupportedModes() override;
+    virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) override;
 
 // css::container::XContainer
-    virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) override;
+    virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) override;
 
 // css::frame::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;
-    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;
+    virtual css::uno::Reference< css::frame::XDispatch >  SAL_CALL 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) override;
 
 // css::frame::XDispatchProviderInterception
-    virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) override;
+    virtual void SAL_CALL releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) override;
 
 // css::view::XSelectionSupplier
-    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) override;
+    virtual css::uno::Any SAL_CALL getSelection(  ) override;
+    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
 protected:
     virtual FmXGridPeer*    imp_CreatePeer(vcl::Window* pParent);
@@ -375,86 +375,86 @@ public:
 // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   getUnoTunnelImplementationId() throw();
     static FmXGridPeer*                                         getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxIFace ) throw();
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) override;
 
 // css::form::XGridPeer
-    virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColumns( const css::uno::Reference< css::container::XIndexContainer >& aColumns ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL getColumns(  ) override;
+    virtual void SAL_CALL setColumns( const css::uno::Reference< css::container::XIndexContainer >& aColumns ) override;
 
 // css::lang::XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
 // css::lang::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;
 
 // css::form::XBoundComponent
-    virtual void SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL commit() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) override;
+    virtual void SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener >& l) override;
+    virtual sal_Bool SAL_CALL commit() override;
 
 // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
 // css::container::XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
 // css::container::XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) override;
 
 // css::beans::XPropertyChangeListener
-    virtual void SAL_CALL SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
 // css::form::XLoadListener
-    virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unloaded(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) override;
+    virtual void SAL_CALL unloaded(const css::lang::EventObject& rEvent) override;
+    virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) override;
+    virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) override;
+    virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) override;
 
 // css::sdbc::XRowSetListener
-    virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) override;
+    virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) override;
+    virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) override;
 
 // css::container::XContainerListener
-    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) override;
+    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) override;
+    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
 
 // VCLXWindow
-    virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleContext >
                     CreateAccessibleContext() override;
 
 // css::form::XGridControl
-    virtual void SAL_CALL addGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) override;
+    virtual void SAL_CALL removeGridControlListener( const css::uno::Reference< css::form::XGridControlListener >& _listener ) override;
 
 // css::form::XGrid (base of XGridControl)
-    virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getCurrentColumnPosition() override;
+    virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) override;
 
 // css::form::XGridFieldDataSupplier (base of XGridControl)
-    virtual css::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const css::uno::Type& xType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const css::uno::Type& xType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const css::uno::Type& xType ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const css::uno::Type& xType ) override;
 
 // css::sdb::XRowSetSupplier
-    virtual css::uno::Reference< css::sdbc::XRowSet >  SAL_CALL getRowSet() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRowSet(const css::uno::Reference< css::sdbc::XRowSet >& xDataSource) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XRowSet >  SAL_CALL getRowSet() override;
+    virtual void SAL_CALL setRowSet(const css::uno::Reference< css::sdbc::XRowSet >& xDataSource) override;
 
 // css::util::XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) override;
+    virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) override;
 
 // UnoControl
-    virtual void SAL_CALL SAL_CALL setDesignMode(sal_Bool bOn) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDesignMode() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL SAL_CALL setDesignMode(sal_Bool bOn) override;
+    virtual sal_Bool SAL_CALL isDesignMode() override;
 
 // css::view::XSelectionChangeListener
-    virtual void SAL_CALL selectionChanged(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectionChanged(const css::lang::EventObject& aEvent) override;
 
     void CellModified();
 
@@ -464,41 +464,41 @@ public:
     void stopCursorListening();
 
 // css::util::XModeSelector
-    virtual void SAL_CALL setMode(const OUString& Mode) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getMode() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setMode(const OUString& Mode) override;
+    virtual OUString SAL_CALL getMode() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes() override;
+    virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) override;
 
 // css::container::XContainer
-    virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) override;
+    virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener >& l) override;
 
     void columnVisible(DbGridColumn* pColumn);
     void columnHidden(DbGridColumn* pColumn);
 
 // css::awt::XView
-    virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) override;
 
 // css::frame::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;
-    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;
+    virtual css::uno::Reference< css::frame::XDispatch >  SAL_CALL 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) override;
 
 // css::frame::XDispatchProviderInterception
-    virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) override;
+    virtual void SAL_CALL releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) override;
 
 // css::frame::XStatusListener
-    virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override;
 
 // css::form::XResetListener
-    virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) override;
+    virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) override;
 
 // css::view::XSelectionSupplier
-    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) override;
+    virtual css::uno::Any SAL_CALL getSelection(  ) override;
+    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
 protected:
     virtual VclPtr<FmGridControl>  imp_CreateControl(vcl::Window* pParent, WinBits nStyle);
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index 0d6951cfd949..5eaaf4eff01d 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -84,10 +84,10 @@ public:
     //  virtual sal_Bool queryInterface(css::uno::Uik aUik, css::uno::Reference< css::uno::XInterface >& rOut);
 
     // css::lang::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;
 
     // css::beans::XPropertyChangeListener
-    virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
     void DisConnect();
 
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index c1ff8387545f..2a330a2cc6e4 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -128,11 +128,10 @@ public:
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
     css::uno::Any getBookmark()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException )
     { return m_xBookmarkOperations->getBookmark(); }
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    bool moveToBookmark(const css::uno::Any& bookmark) throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->moveToBookmark(bookmark); }
+    bool moveToBookmark(const css::uno::Any& bookmark) { return m_xBookmarkOperations->moveToBookmark(bookmark); }
 
     // css::sdbc::XResultSet
     bool isBeforeFirst() const              { return m_xMoveOperations->isBeforeFirst(); }
@@ -151,7 +150,7 @@ public:
     bool rowDeleted()                       { return m_xMoveOperations->rowDeleted(); }
     // css::sdbcx::XColumnsSupplier
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::container::XNameAccess> getColumns() const throw( css::uno::RuntimeException ) { return m_xColumnsSupplier->getColumns(); }
+    css::uno::Reference< css::container::XNameAccess> getColumns() const { return m_xColumnsSupplier->getColumns(); }
 private:
     void ImplConstruct(const css::uno::Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned);
 };
@@ -169,7 +168,7 @@ public:
     virtual ~FmXDisposeListener();
 
     /// @throws css::uno::RuntimeException
-    virtual void disposing(const css::lang::EventObject& _rEvent, sal_Int16 _nId) throw( css::uno::RuntimeException ) = 0;
+    virtual void disposing(const css::lang::EventObject& _rEvent, sal_Int16 _nId) = 0;
 
 protected:
     void setAdapter(FmXDisposeMultiplexer* pAdapter);
@@ -185,7 +184,7 @@ public:
     FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const css::uno::Reference< css::lang::XComponent>& _rxObject);
 
 // css::lang::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;
 
     void dispose();
 };
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 3dcb3ffabdca..51c35259be89 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -352,7 +352,7 @@ protected:
     virtual void PostExecuteRowContextMenu(sal_uInt16 nRow, const PopupMenu& rMenu, sal_uInt16 nExecutionResult);
 
     /// @throws css::uno::RuntimeException
-    void DataSourcePropertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception);
+    void DataSourcePropertyChanged(const css::beans::PropertyChangeEvent& evt);
 
     void FieldValueChanged(sal_uInt16 _nId, const css::beans::PropertyChangeEvent& _evt);
     void FieldListenerDisposing(sal_uInt16 _nId);
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index e80b5e944b5d..deaa2581a9a2 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -50,14 +50,11 @@ public:
         const vcl::EnumContext::Context eDefaultContext);
     virtual ~SelectionChangeHandler() override;
 
-    virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent) override;
 
-    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;
 
-    virtual void SAL_CALL disposing()
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing() override;
 
     void Connect();
     void Disconnect();
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 3d923e1cee25..aae7ea71e214 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -173,16 +173,13 @@ public:
     DECL_LINK( VisibilityNotification, SvxStyleBox_Impl&, void );
 protected:
     // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments)
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments) override;
 
     // XUpdatable
-    virtual void SAL_CALL update()
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL update() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
 private:
 
@@ -221,16 +218,16 @@ public:
     virtual ~SvxColorToolBoxControl() override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
     virtual void Select(sal_uInt16 nSelectModifier) override;
 
     // XSubToolbarController
-    virtual sal_Bool SAL_CALL opensSubToolbar() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSubToolbarName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL functionSelected( const OUString& rCommand ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateImage() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL opensSubToolbar() override;
+    virtual OUString SAL_CALL getSubToolbarName() override;
+    virtual void SAL_CALL functionSelected( const OUString& rCommand ) override;
+    virtual void SAL_CALL updateImage() override;
 
     void setColorSelectFunction(const ColorSelectFunction& aColorSelectFunction);
 };
@@ -265,8 +262,7 @@ public:
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() 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;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override;
 };
 
 
diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index f53893070c67..14493c1f1f6d 100644
--- a/include/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
@@ -40,7 +40,7 @@ protected:
 public:
     SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     SFX_DECL_TOOLBOX_CONTROL();
 
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index d2bc9b62f820..a2df06bf2341 100644
--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -41,8 +41,7 @@ enum class SdrInventor : sal_uInt32;
  *
  * @throws css::uno::RuntimeException
  */
-SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer)
-    throw (css::uno::RuntimeException, std::exception);
+SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer);
 
 /** Returns a StarOffice API wrapper for the given SdrObject */
 SVX_DLLPUBLIC css::uno::Reference< css::drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw ();
@@ -81,7 +80,7 @@ SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const FieldUnit nVcl, short& eApi
  * @throws std::exception
 */
 SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
-    SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(std::exception);
+    SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName);
 
 /**
  * If the given name is a predefined API name it is replaced by the predefined name
@@ -90,7 +89,7 @@ SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
  * @throws std::exception
 */
 SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
-    SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(std::exception);
+    SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName);
 
 #endif // INCLUDED_SVX_UNOAPI_HXX
 
diff --git a/include/svx/unomaster.hxx b/include/svx/unomaster.hxx
index ee9ee03f59c4..42c801f5e920 100644
--- a/include/svx/unomaster.hxx
+++ b/include/svx/unomaster.hxx
@@ -36,44 +36,34 @@ public:
     virtual bool queryAggregation( const css::uno::Type & rType, css::uno::Any& aAny ) = 0;
 
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException) = 0;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) = 0;
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::beans::PropertyVetoException
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue )
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) = 0;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) = 0;
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) = 0;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) = 0;
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) = 0;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) = 0;
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) = 0;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) = 0;
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )  throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) = 0;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) = 0;
 
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException) = 0;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) = 0;
 
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException) = 0;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() = 0;
 
     virtual void dispose() = 0;
 
diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx
index 2b893b869718..7e727802e5dc 100644
--- a/include/svx/unomod.hxx
+++ b/include/svx/unomod.hxx
@@ -36,13 +36,13 @@ class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public css::lang::XMultiServiceFactory
 public:
     SvxUnoDrawMSFactory() throw() {};
 
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
 
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
-    static css::uno::Reference< css::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException);
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier );
     // internal
     static css::uno::Sequence< OUString >
         concatServiceNames( css::uno::Sequence< OUString >& rServices1,
diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx
index f771b8bdb908..ab9ab9ed2cec 100644
--- a/include/svx/unomodel.hxx
+++ b/include/svx/unomodel.hxx
@@ -60,33 +60,33 @@ public:
     SdrModel* GetDoc() const { return mpDoc; }
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XModel
-    virtual void SAL_CALL lockControllers(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unlockControllers(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL lockControllers(  ) override;
+    virtual void SAL_CALL unlockControllers(  ) override;
+    virtual sal_Bool SAL_CALL hasControllersLocked(  ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XDrawPagesSupplier
-    virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getDrawPages(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getDrawPages(  ) override;
 
     // XMultiServiceFactory ( SvxFmMSFactory )
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAnyCompareFactory
-    virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) override;
 };
 
 SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut );
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 5924620faa25..e91f2125afbf 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -94,17 +94,15 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin
     // Creating a SdrObject using it's Description.
     // Can be used by derived classes to support their owen Shapes (e.g. Controls).
     /// @throws css::uno::RuntimeException
-    virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape )
-        throw (css::uno::RuntimeException, std::exception);
+    virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape );
 
     /// @throws css::uno::RuntimeException
-    static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException);
+    static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() );
 
     // The following method is called if a SvxShape object is to be created.
     // Derived classes can create a derivation or an SvxShape aggregating object.
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const
-        throw (css::uno::RuntimeException, std::exception);
+    virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const;
 
     UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage )
 
@@ -112,36 +110,34 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin
     virtual void SAL_CALL release() throw() override;
 
     // XShapes
-    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // XShapes2
-    virtual void SAL_CALL addTop( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addBottom( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTop( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL addBottom( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XShapeGrouper
-    virtual css::uno::Reference< css::drawing::XShapeGroup > SAL_CALL group( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ungroup( const css::uno::Reference< css::drawing::XShapeGroup >& aGroup ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XShapeGroup > SAL_CALL group( const css::uno::Reference< css::drawing::XShapes >& xShapes ) override;
+    virtual void SAL_CALL ungroup( const css::uno::Reference< css::drawing::XShapeGroup >& aGroup ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 };
 
 #endif
diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx
index 67c03fb5f10d..5d42b2ddce34 100644
--- a/include/svx/unopool.hxx
+++ b/include/svx/unopool.hxx
@@ -53,37 +53,37 @@ public:
     virtual SfxItemPool* getModelPool( bool bReadOnly ) throw();
 
     // overriden helpers from comphelper::PropertySetHelper
-    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
-    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override;
+    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override;
+    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override;
 
-    virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, css::beans::PropertyState* pStates ) throw(css::beans::UnknownPropertyException ) override;
-    virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry )  throw(css::beans::UnknownPropertyException ) override;
-    virtual css::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override;
+    virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, css::beans::PropertyState* pStates ) override;
+    virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) override;
+    virtual css::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     void init();
 
     /// @throws css::beans::UnknownPropertyException
-    static void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException);
+    static void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, css::uno::Any& rValue );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+    virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const css::uno::Any& rValue );
 
 protected:
     SdrModel* mpModel;
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 0f374953ddea..5e2f6184afb5 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -169,25 +169,25 @@ protected:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty );
 
 public:
     /// @throws css::uno::RuntimeException
-    SvxShape( SdrObject* pObj ) throw (css::uno::RuntimeException);
+    SvxShape( SdrObject* pObj );
     /// @throws css::uno::RuntimeException
-    SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw (css::uno::RuntimeException);
+    SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet );
     /// @throws css::uno::RuntimeException
-    SvxShape() throw (css::uno::RuntimeException);
+    SvxShape();
     virtual ~SvxShape() throw () override;
 
     // Internals
@@ -207,8 +207,7 @@ public:
     SdrObject* GetSdrObject() const {return mpObj.get();}
     void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; }
     /// @throws css::uno::RuntimeException
-    css::uno::Any GetBitmap( bool bMetaFile = false ) const
-        throw (css::uno::RuntimeException, std::exception);
+    css::uno::Any GetBitmap( bool bMetaFile = false ) const;
 
     svx::PropertyChangeNotifier& getShapePropertyChangeNotifier();
 
@@ -228,34 +227,34 @@ public:
 
     // access methods for master objects
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL _getPropertySetInfo(  ) throw(css::uno::RuntimeException);
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL _getPropertySetInfo(  );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::beans::PropertyVetoException
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+    void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName );
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL _setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    void SAL_CALL _setPropertyToDefault( const OUString& PropertyName );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any SAL_CALL _getPropertyDefault( const OUString& aPropertyName )     throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    css::uno::Any SAL_CALL _getPropertyDefault( const OUString& aPropertyName );
 
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() throw(css::uno::RuntimeException);
+    css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
 
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Type > SAL_CALL _getTypes(  ) throw(css::uno::RuntimeException);
+    css::uno::Sequence< css::uno::Type > SAL_CALL _getTypes(  );
 
     void setMaster( SvxShapeMaster* pMaster );
 
@@ -263,86 +262,80 @@ public:
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override;
 
     // XAggregation
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XShapeDescriptor
-    virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // XShape
-    virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XMultiPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     // XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )  throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     // XMultiPropertyStates
-    virtual void SAL_CALL setAllPropertiesToDefault()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAllPropertiesToDefault() override;
     virtual void SAL_CALL setPropertiesToDefault(
         const css::uno::Sequence<
-        OUString >& aPropertyNames )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        OUString >& aPropertyNames ) override;
     virtual css::uno::Sequence< css::uno::Any >
     SAL_CALL getPropertyDefaults(
         const css::uno::Sequence<
-        OUString >& aPropertyNames )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        OUString >& aPropertyNames ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
     // XGluePointsSupplier
-    virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL getGluePoints(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL getGluePoints(  ) override;
 
     // XChild
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XActionLockable
-    virtual sal_Bool SAL_CALL isActionLocked(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addActionLock(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeActionLock(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL resetActionLocks(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isActionLocked(  ) override;
+    virtual void SAL_CALL addActionLock(  ) override;
+    virtual void SAL_CALL removeActionLock(  ) override;
+    virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) override;
+    virtual sal_Int16 SAL_CALL resetActionLocks(  ) override;
 
 private:
     /** initializes SdrObj-dependent members. Only to be called when GetSdrObject() != NULL
@@ -363,10 +356,10 @@ protected:
 
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
-    virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
+    virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) override;
+    virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) override;
 
 public:
     SvxShapeText( SdrObject* pObj ) throw ();
@@ -376,28 +369,28 @@ public:
     virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
     // css::text::XTextRange
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString( const OUString& aString ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 class SvxShapeRect : public SvxShapeText
@@ -407,13 +400,13 @@ public:
     virtual ~SvxShapeRect() throw () override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XServiceInfo
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 /***********************************************************************
@@ -436,42 +429,42 @@ public:
     virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XShapes
-    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // XShapes2
-    virtual void SAL_CALL addTop( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addBottom( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTop( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL addBottom( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XShapeDescriptor
-    virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // XShape
-    virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // XShapeGroup
-    virtual void SAL_CALL enterGroup(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL leaveGroup(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL enterGroup(  ) override;
+    virtual void SAL_CALL leaveGroup(  ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 /***********************************************************************
@@ -485,29 +478,29 @@ public:
     virtual ~SvxShapeConnector() throw() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XShapeDescriptor
-    virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // XShape
-    virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // XConnectorShape
-    virtual void SAL_CALL connectStart( const css::uno::Reference< css::drawing::XConnectableShape >& xShape, css::drawing::ConnectionType nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL connectEnd( const css::uno::Reference< css::drawing::XConnectableShape >& xShape, css::drawing::ConnectionType nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disconnectBegin( const css::uno::Reference< css::drawing::XConnectableShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disconnectEnd( const css::uno::Reference< css::drawing::XConnectableShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL connectStart( const css::uno::Reference< css::drawing::XConnectableShape >& xShape, css::drawing::ConnectionType nPos ) override;
+    virtual void SAL_CALL connectEnd( const css::uno::Reference< css::drawing::XConnectableShape >& xShape, css::drawing::ConnectionType nPos ) override;
+    virtual void SAL_CALL disconnectBegin( const css::uno::Reference< css::drawing::XConnectableShape >& xShape ) override;
+    virtual void SAL_CALL disconnectEnd( const css::uno::Reference< css::drawing::XConnectableShape >& xShape ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 /***********************************************************************
@@ -524,36 +517,36 @@ public:
     virtual ~SvxShapeControl() throw() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XPropertySet
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
     // XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )  throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     // XShapeDescriptor
-    virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     // XShape
-    virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     // XControlShape
-    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getControl() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setControl( const css::uno::Reference< css::awt::XControlModel >& xControl ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getControl() override;
+    virtual void SAL_CALL setControl( const css::uno::Reference< css::awt::XControlModel >& xControl ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 /***********************************************************************
@@ -585,8 +578,8 @@ class SVX_DLLPUBLIC SvxOle2Shape : public SvxShapeText
 {
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
     void resetModifiedState();
 
@@ -615,18 +608,18 @@ protected:
     using SvxUnoTextRangeBase::getPropertyValue;
 
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
 public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::beans::PropertyVetoException
-    SvxShapePolyPolygon( SdrObject* pObj , css::drawing::PolygonKind eNew ) throw(css::lang::IllegalArgumentException, css::beans::PropertyVetoException);
+    SvxShapePolyPolygon( SdrObject* pObj , css::drawing::PolygonKind eNew );
     virtual ~SvxShapePolyPolygon() throw() override;
 
     // Local support functions
     /// @throws css::uno::RuntimeException
-    void SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(css::uno::RuntimeException);
+    void SetPolygon(const basegfx::B2DPolyPolygon& rNew);
     basegfx::B2DPolyPolygon GetPolygon() const throw();
 };
 
@@ -645,15 +638,15 @@ protected:
 
 public:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
     SvxShapePolyPolygonBezier( SdrObject* pObj, css::drawing::PolygonKind eNew ) throw();
     virtual ~SvxShapePolyPolygonBezier() throw() override;
 
     // Local support functions
     /// @throws css::uno::RuntimeException
-    void SetPolygon(const basegfx::B2DPolyPolygon & rNew) throw(css::uno::RuntimeException);
+    void SetPolygon(const basegfx::B2DPolyPolygon & rNew);
     basegfx::B2DPolyPolygon GetPolygon() const throw();
 };
 
@@ -667,8 +660,8 @@ protected:
     using SvxUnoTextRangeBase::getPropertyValue;
 
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
 public:
     SvxGraphicObject( SdrObject* pObj, OUString const & referer ) throw();
@@ -693,39 +686,37 @@ protected:
 public:
     Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw();
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
     virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty,
-        css::uno::Any& rValue )
-            throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+        css::uno::Any& rValue ) override;
 
     virtual ~Svx3DSceneObject() throw() override;
 
     virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XShapes
-    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XServiceInfo
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 
 /***********************************************************************
@@ -735,15 +726,15 @@ class Svx3DCubeObject : public SvxShape
 {
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
 public:
     Svx3DCubeObject( SdrObject* pObj ) throw();
     virtual ~Svx3DCubeObject() throw() override;
 
     // XServiceInfo
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /***********************************************************************
@@ -755,13 +746,13 @@ public:
     Svx3DSphereObject( SdrObject* pObj ) throw();
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
     virtual ~Svx3DSphereObject() throw() override;
 
     // XServiceInfo
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /***********************************************************************
@@ -771,15 +762,15 @@ class Svx3DLatheObject : public SvxShape
 {
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
 public:
     Svx3DLatheObject( SdrObject* pObj ) throw();
     virtual ~Svx3DLatheObject() throw() override;
 
     // XServiceInfo
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /***********************************************************************
@@ -791,13 +782,13 @@ public:
     Svx3DExtrudeObject( SdrObject* pObj ) throw();
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
     virtual ~Svx3DExtrudeObject() throw() override;
 
     // XServiceInfo
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /***********************************************************************
@@ -807,15 +798,15 @@ class Svx3DPolygonObject : public SvxShape
 {
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
 public:
     Svx3DPolygonObject( SdrObject* pObj ) throw();
     virtual ~Svx3DPolygonObject() throw() override;
 
     // XServiceInfo
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /***********************************************************************
@@ -834,29 +825,29 @@ protected:
 public:
     SvxCustomShape( SdrObject* pObj ) throw ();
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
 
     virtual ~SvxCustomShape() throw () override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XShape
-    virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
 
     // XPropertySet
-    void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) override;
+    void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     //XEnhancedCustomShapeDefaulter
-    virtual void SAL_CALL createCustomShapeDefaults( const OUString& rShapeType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL createCustomShapeDefaults( const OUString& rShapeType ) override;
 };
 
 /***********************************************************************
@@ -871,8 +862,8 @@ public:
 
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
 private:
     OUString referer_;
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index 5755b9e6bc16..cb8183fb20a6 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -110,16 +110,16 @@ public:
     static void                 Destroy( SvXMLEmbeddedObjectHelper* pSvXMLEmbeddedObjectHelper );
 
     // XEmbeddedObjectResolver
-    virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XNameAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
 
     static void splitObjectURL(const OUString& aURLNoPar,
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 802997ce412d..aa3bb25949f5 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -102,12 +102,12 @@ public:
 public:
 
     // XGraphicObjectResolver
-    virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) override;
 
     // XBinaryStreamResolver
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( const OUString& rURL ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL createOutputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL resolveOutputStream( const css::uno::Reference< css::io::XOutputStream >& rxBinaryStream ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( const OUString& rURL ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL createOutputStream(  ) override;
+    virtual OUString SAL_CALL resolveOutputStream( const css::uno::Reference< css::io::XOutputStream >& rxBinaryStream ) override;
 };
 
 #endif
diff --git a/include/test/testinteractionhandler.hxx b/include/test/testinteractionhandler.hxx
index a8f4acc0fd67..df4316c18ef0 100644
--- a/include/test/testinteractionhandler.hxx
+++ b/include/test/testinteractionhandler.hxx
@@ -46,20 +46,17 @@ public:
         return mbPasswordRequested;
     }
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.uui.TestInteractionHandler");
     }
 
-    virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         css::uno::Sequence<OUString> aNames(3);
         aNames[0] = "com.sun.star.task.InteractionHandler";
@@ -70,18 +67,15 @@ public:
         return aNames;
     }
 
-    virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const & /*rArguments*/)
-        throw (css::uno::Exception, std::exception) override
+    virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const & /*rArguments*/) override
     {}
 
-    virtual void SAL_CALL handle(css::uno::Reference<css::task::XInteractionRequest> const & rRequest)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL handle(css::uno::Reference<css::task::XInteractionRequest> const & rRequest) override
     {
         handleInteractionRequest(rRequest);
     }
 
-    virtual sal_Bool SAL_CALL handleInteractionRequest(const css::uno::Reference<css::task::XInteractionRequest>& rRequest)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL handleInteractionRequest(const css::uno::Reference<css::task::XInteractionRequest>& rRequest) override
     {
         mbPasswordRequested = false;
 
diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index f328fce97927..ee8ce152caf1 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -52,27 +52,27 @@ namespace toolkit
 
     public:
         // XAnimation
-        virtual void SAL_CALL startAnimation(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL stopAnimation(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAnimationRunning(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL startAnimation(  ) override;
+        virtual void SAL_CALL stopAnimation(  ) override;
+        virtual sal_Bool SAL_CALL isAnimationRunning(  ) override;
 
         // VclWindowPeer
-        virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+        virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
         // XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) override;
 
         // XModifyListener
-        virtual void SAL_CALL modified( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL modified( const css::lang::EventObject& i_event ) override;
 
         // XComponent
-        void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL dispose(  ) override;
 
     protected:
         void ProcessWindowEvent( const VclWindowEvent& i_windowEvent ) override;
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 6adbc484bef8..8af1d702725c 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -94,37 +94,37 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::accessibility::XAccessibleContext
-    sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    OUString SAL_CALL getAccessibleDescription(  ) override;
+    OUString SAL_CALL getAccessibleName(  ) override;
+    css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // css::accessibility::XAccessibleComponent
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // css::accessibility::XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
 
 protected:
     // base class overridables
-    css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    css::awt::Rectangle implGetBounds(  ) override;
 
 private:
     /** we may be reparented (if external components use OAccessibleImplementationAccess base class),
diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx
index fdbbf3a1fe7e..891a8b42b536 100644
--- a/include/toolkit/awt/vclxbitmap.hxx
+++ b/include/toolkit/awt/vclxbitmap.hxx
@@ -52,23 +52,23 @@ public:
 
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
     static VCLXBitmap*                                          GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace );
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XBitmap
-    css::awt::Size                 SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size                 SAL_CALL getSize() override;
+    css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() override;
+    css::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() override;
 };
 
 
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index bcf7bbf4755f..6851b564f3aa 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -42,26 +42,26 @@ public:
                     virtual ~VCLXContainer() override;
 
     // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >        SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >        SAL_CALL getImplementationId() override;
 
     // css::awt::XVclContainer
-    void SAL_CALL addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > SAL_CALL getWindows(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) override;
+    void SAL_CALL removeVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) override;
+    css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > SAL_CALL getWindows(  ) override;
 
     // css::awt::XVclContainerPeer
-    void SAL_CALL enableDialogControl( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setTabOrder( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& WindowOrder, const css::uno::Sequence< css::uno::Any >& Tabs, sal_Bool GroupControl ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Windows ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL enableDialogControl( sal_Bool bEnable ) override;
+    void SAL_CALL setTabOrder( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& WindowOrder, const css::uno::Sequence< css::uno::Any >& Tabs, sal_Bool GroupControl ) override;
+    void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Windows ) override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 2b59cee62f3e..60f5ca019ffc 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -64,33 +64,33 @@ public:
     void                    SetCreatedWithToolkit( bool bCreatedWithToolkit );
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
     static VCLXDevice*                                          GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace );
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XDevice,
-    css::uno::Reference< css::awt::XGraphics >    SAL_CALL createGraphics(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XDevice >      SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::DeviceInfo                                       SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::awt::FontDescriptor > SAL_CALL getFontDescriptors(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XFont >        SAL_CALL getFont( const css::awt::FontDescriptor& aDescriptor ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XBitmap >      SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const css::uno::Reference< css::awt::XBitmap >& Bitmap ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::awt::XGraphics >    SAL_CALL createGraphics(  ) override;
+    css::uno::Reference< css::awt::XDevice >      SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) override;
+    css::awt::DeviceInfo                                       SAL_CALL getInfo() override;
+    css::uno::Sequence< css::awt::FontDescriptor > SAL_CALL getFontDescriptors(  ) override;
+    css::uno::Reference< css::awt::XFont >        SAL_CALL getFont( const css::awt::FontDescriptor& aDescriptor ) override;
+    css::uno::Reference< css::awt::XBitmap >      SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) override;
+    css::uno::Reference< css::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const css::uno::Reference< css::awt::XBitmap >& Bitmap ) override;
 
     // css::awt::XUnitConversion
-    css::awt::Point SAL_CALL convertPointToLogic( const css::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    css::awt::Point SAL_CALL convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    css::awt::Point SAL_CALL convertPointToLogic( const css::awt::Point& aPoint, ::sal_Int16 TargetUnit ) override;
+    css::awt::Point SAL_CALL convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit ) override;
+    css::awt::Size SAL_CALL convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit ) override;
+    css::awt::Size SAL_CALL convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit ) override;
 
 
 };
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index ebc09e7190c7..3887fbe2f187 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -57,30 +57,30 @@ public:
     const vcl::Font&     GetFont() const { return maFont; }
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
     static VCLXFont*                                            GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace );
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::lang::XFont
-    css::awt::FontDescriptor           SAL_CALL getFontDescriptor(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::SimpleFontMetric         SAL_CALL getFontMetric(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16                                       SAL_CALL getCharWidth( sal_Unicode c ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int16 >    SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32                                       SAL_CALL getStringWidth( const OUString& str ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32                                       SAL_CALL getStringWidthArray( const OUString& str, css::uno::Sequence< sal_Int32 >& rDXArray ) throw(css::uno::RuntimeException, std::exception) override;
-    void                                            SAL_CALL getKernPairs( css::uno::Sequence< sal_Unicode >& rnChars1, css::uno::Sequence< sal_Unicode >& rnChars2, css::uno::Sequence< sal_Int16 >& rnKerns ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::FontDescriptor           SAL_CALL getFontDescriptor(  ) override;
+    css::awt::SimpleFontMetric         SAL_CALL getFontMetric(  ) override;
+    sal_Int16                                       SAL_CALL getCharWidth( sal_Unicode c ) override;
+    css::uno::Sequence< sal_Int16 >    SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) override;
+    sal_Int32                                       SAL_CALL getStringWidth( const OUString& str ) override;
+    sal_Int32                                       SAL_CALL getStringWidthArray( const OUString& str, css::uno::Sequence< sal_Int32 >& rDXArray ) override;
+    void                                            SAL_CALL getKernPairs( css::uno::Sequence< sal_Unicode >& rnChars1, css::uno::Sequence< sal_Unicode >& rnChars2, css::uno::Sequence< sal_Int16 >& rnKerns ) override;
 
     // css::lang::XFont2
-    sal_Bool                                        SAL_CALL hasGlyphs( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool                                        SAL_CALL hasGlyphs( const OUString& aText ) override;
 };
 
 
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index 5f689db070c1..21a8609c00bf 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -85,53 +85,53 @@ public:
     OutputDevice*   GetOutputDevice() const { return mpOutputDevice; }
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
     static VCLXGraphics*                                        GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace );
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XGraphics Attributes
-    virtual css::uno::Reference< css::awt::XDevice > SAL_CALL getDevice() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRasterOp( css::awt::RasterOperation _rasterop ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFont( const css::uno::Reference< css::awt::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XDevice > SAL_CALL getDevice() override;
+    virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) override;
+    virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) override;
+    virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) override;
+    virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) override;
+    virtual void SAL_CALL setRasterOp( css::awt::RasterOperation _rasterop ) override;
+    virtual void SAL_CALL setFont( const css::uno::Reference< css::awt::XFont >& _font ) override;
+    virtual css::awt::SimpleFontMetric SAL_CALL getFontMetric() override;
 
     // css::awt::XGraphics Methods
-    virtual void SAL_CALL selectFont( const css::awt::FontDescriptor& aDescription ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setClipRegion( const css::uno::Reference< css::awt::XRegion >& Clipping ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL intersectClipRegion( const css::uno::Reference< css::awt::XRegion >& xClipping ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL push(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL pop(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clear( const css::awt::Rectangle& aRect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL copy( const css::uno::Reference< css::awt::XDevice >& xSource, ::sal_Int32 nSourceX, ::sal_Int32 nSourceY, ::sal_Int32 nSourceWidth, ::sal_Int32 nSourceHeight, ::sal_Int32 nDestX, ::sal_Int32 nDestY, ::sal_Int32 nDestWidth, ::sal_Int32 nDestHeight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL draw( const css::uno::Reference< css::awt::XDisplayBitmap >& xBitmapHandle, ::sal_Int32 SourceX, ::sal_Int32 SourceY, ::sal_Int32 SourceWidth, ::sal_Int32 SourceHeight, ::sal_Int32 DestX, ::sal_Int32 DestY, ::sal_Int32 DestWidth, ::sal_Int32 DestHeight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawPixel( ::sal_Int32 X, ::sal_Int32 Y ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawLine( ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawRoundedRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 nHorzRound, ::sal_Int32 nVertRound ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawPolyLine( const css::uno::Sequence< ::sal_Int32 >& DataX, const css::uno::Sequence< ::sal_Int32 >& DataY ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawPolygon( const css::uno::Sequence< ::sal_Int32 >& DataX, const css::uno::Sequence< ::sal_Int32 >& DataY ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawPolyPolygon( const css::uno::Sequence< css::uno::Sequence< ::sal_Int32 > >& DataX, const css::uno::Sequence< css::uno::Sequence< ::sal_Int32 > >& DataY ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawEllipse( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawArc( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawPie( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawChord( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int32 nX1, ::sal_Int32 nY1, ::sal_Int32 nX2, ::sal_Int32 nY2 ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawGradient( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 Height, const css::awt::Gradient& aGradient ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawText( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawTextArray( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text, const css::uno::Sequence< ::sal_Int32 >& Longs ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const css::uno::Reference< css::graphic::XGraphic >& aGraphic ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectFont( const css::awt::FontDescriptor& aDescription ) override;
+    virtual void SAL_CALL setClipRegion( const css::uno::Reference< css::awt::XRegion >& Clipping ) override;
+    virtual void SAL_CALL intersectClipRegion( const css::uno::Reference< css::awt::XRegion >& xClipping ) override;
+    virtual void SAL_CALL push(  ) override;
+    virtual void SAL_CALL pop(  ) override;
+    virtual void SAL_CALL clear( const css::awt::Rectangle& aRect ) override;
+    virtual void SAL_CALL copy( const css::uno::Reference< css::awt::XDevice >& xSource, ::sal_Int32 nSourceX, ::sal_Int32 nSourceY, ::sal_Int32 nSourceWidth, ::sal_Int32 nSourceHeight, ::sal_Int32 nDestX, ::sal_Int32 nDestY, ::sal_Int32 nDestWidth, ::sal_Int32 nDestHeight ) override;
+    virtual void SAL_CALL draw( const css::uno::Reference< css::awt::XDisplayBitmap >& xBitmapHandle, ::sal_Int32 SourceX, ::sal_Int32 SourceY, ::sal_Int32 SourceWidth, ::sal_Int32 SourceHeight, ::sal_Int32 DestX, ::sal_Int32 DestY, ::sal_Int32 DestWidth, ::sal_Int32 DestHeight ) override;
+    virtual void SAL_CALL drawPixel( ::sal_Int32 X, ::sal_Int32 Y ) override;
+    virtual void SAL_CALL drawLine( ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) override;
+    virtual void SAL_CALL drawRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) override;
+    virtual void SAL_CALL drawRoundedRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 nHorzRound, ::sal_Int32 nVertRound ) override;
+    virtual void SAL_CALL drawPolyLine( const css::uno::Sequence< ::sal_Int32 >& DataX, const css::uno::Sequence< ::sal_Int32 >& DataY ) override;
+    virtual void SAL_CALL drawPolygon( const css::uno::Sequence< ::sal_Int32 >& DataX, const css::uno::Sequence< ::sal_Int32 >& DataY ) override;
+    virtual void SAL_CALL drawPolyPolygon( const css::uno::Sequence< css::uno::Sequence< ::sal_Int32 > >& DataX, const css::uno::Sequence< css::uno::Sequence< ::sal_Int32 > >& DataY ) override;
+    virtual void SAL_CALL drawEllipse( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) override;
+    virtual void SAL_CALL drawArc( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) override;
+    virtual void SAL_CALL drawPie( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) override;
+    virtual void SAL_CALL drawChord( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int32 nX1, ::sal_Int32 nY1, ::sal_Int32 nX2, ::sal_Int32 nY2 ) override;
+    virtual void SAL_CALL drawGradient( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 Height, const css::awt::Gradient& aGradient ) override;
+    virtual void SAL_CALL drawText( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text ) override;
+    virtual void SAL_CALL drawTextArray( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text, const css::uno::Sequence< ::sal_Int32 >& Longs ) override;
+    virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const css::uno::Reference< css::graphic::XGraphic >& aGraphic ) override;
 };
 
 #endif // INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index 91d088ac492b..afdd52b94333 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -82,66 +82,66 @@ public:
     bool IsPopupMenu() const;
 
     // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
     static VCLXMenu* GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace );
-    sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::awt::XMenu
-    virtual void SAL_CALL addMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertItem( sal_Int16 nItemId, const OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItem( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clear( ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getItemCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getItemId( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getItemPos( sal_Int16 nId ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::MenuItemType SAL_CALL getItemType( ::sal_Int16 nItemPos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL enableItem( sal_Int16 nItemId, sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isItemEnabled( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL hideDisabledEntries( sal_Bool bHide ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL enableAutoMnemonics( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setItemText( sal_Int16 nItemId, const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getItemText( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCommand( sal_Int16 nItemId, const OUString& aCommand ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCommand( sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpCommand( sal_Int16 nItemId, const OUString& aHelp ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getHelpCommand( sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const OUString& sHelpText ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const OUString& sTipHelpText ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Bool SAL_CALL isPopupMenu(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPopupMenu( sal_Int16 nItemId, const css::uno::Reference< css::awt::XPopupMenu >& aPopupMenu ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::XPopupMenu > SAL_CALL getPopupMenu( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) override;
+    virtual void SAL_CALL removeMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) override;
+    virtual void SAL_CALL insertItem( sal_Int16 nItemId, const OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) override;
+    virtual void SAL_CALL removeItem( sal_Int16 nPos, sal_Int16 nCount ) override;
+    virtual void SAL_CALL clear( ) override;
+    virtual sal_Int16 SAL_CALL getItemCount(  ) override;
+    virtual sal_Int16 SAL_CALL getItemId( sal_Int16 nPos ) override;
+    virtual sal_Int16 SAL_CALL getItemPos( sal_Int16 nId ) override;
+    virtual css::awt::MenuItemType SAL_CALL getItemType( ::sal_Int16 nItemPos ) override;
+    virtual void SAL_CALL enableItem( sal_Int16 nItemId, sal_Bool bEnable ) override;
+    virtual sal_Bool SAL_CALL isItemEnabled( sal_Int16 nItemId ) override;
+    virtual void SAL_CALL hideDisabledEntries( sal_Bool bHide ) override;
+    virtual void SAL_CALL enableAutoMnemonics( sal_Bool bEnable ) override;
+    virtual void SAL_CALL setItemText( sal_Int16 nItemId, const OUString& aText ) override;
+    virtual OUString SAL_CALL getItemText( sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setCommand( sal_Int16 nItemId, const OUString& aCommand ) override;
+    virtual OUString SAL_CALL getCommand( sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setHelpCommand( sal_Int16 nItemId, const OUString& aHelp ) override;
+    virtual OUString SAL_CALL getHelpCommand( sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const OUString& sHelpText ) override;
+    virtual OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const OUString& sTipHelpText ) override;
+    virtual OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) override;
+
+    virtual sal_Bool SAL_CALL isPopupMenu(  ) override;
+    virtual void SAL_CALL setPopupMenu( sal_Int16 nItemId, const css::uno::Reference< css::awt::XPopupMenu >& aPopupMenu ) override;
+    virtual css::uno::Reference< css::awt::XPopupMenu > SAL_CALL getPopupMenu( sal_Int16 nItemId ) override;
 
     // css::awt::XPopupMenu
-    virtual void SAL_CALL insertSeparator( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultItem( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getDefaultItem(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL checkItem( sal_Int16 nItemId, sal_Bool bCheck ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isItemChecked( sal_Int16 nItemId ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Rectangle& Position, ::sal_Int16 Direction ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isInExecute(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endExecute(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const css::awt::KeyEvent& aKeyEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const css::uno::Reference< css::graphic::XGraphic >& xGraphic, sal_Bool bScale ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertSeparator( sal_Int16 nPos ) override;
+    virtual void SAL_CALL setDefaultItem( sal_Int16 nItemId ) override;
+    virtual sal_Int16 SAL_CALL getDefaultItem(  ) override;
+    virtual void SAL_CALL checkItem( sal_Int16 nItemId, sal_Bool bCheck ) override;
+    virtual sal_Bool SAL_CALL isItemChecked( sal_Int16 nItemId ) override;
+    virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Rectangle& Position, ::sal_Int16 Direction ) override;
+    virtual sal_Bool SAL_CALL isInExecute(  ) override;
+    virtual void SAL_CALL endExecute(  ) override;
+    virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const css::awt::KeyEvent& aKeyEvent ) override;
+    virtual css::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const css::uno::Reference< css::graphic::XGraphic >& xGraphic, sal_Bool bScale ) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) override;
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 class TOOLKIT_DLLPUBLIC VCLXMenuBar : public VCLXMenu
diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx
index dff64dae6115..23bcb1c122a0 100644
--- a/include/toolkit/awt/vclxpointer.hxx
+++ b/include/toolkit/awt/vclxpointer.hxx
@@ -52,20 +52,17 @@ public:
     // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
     static VCLXPointer*                                         GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace );
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
     // css::awt::XPointer
-    void SAL_CALL setType( sal_Int32 nType ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getType(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setType( sal_Int32 nType ) override;
+    sal_Int32 SAL_CALL getType(  ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index c9a80375c5f7..826104df32e5 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -76,27 +76,27 @@ public:
     DECLARE_XTYPEPROVIDER();
 
     // css::beans::XPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); }
-    css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return OPropertySetHelper::getPropertyValue( rPropertyName ); }
-    void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); }
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) override { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); }
+    css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) override { return OPropertySetHelper::getPropertyValue( rPropertyName ); }
+    void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); }
+    void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); }
+    void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); }
+    void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); }
 
     // ::cppu::OPropertySetHelper
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
-    sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException) override;
-    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+    sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     using cppu::OPropertySetHelper::getFastPropertyValue;
     void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
     // css::awt::XPrinterPropertySet
-    void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getFormDescriptions(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL selectForm( const OUString& aFormDescription ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setHorizontal( sal_Bool bHorizontal ) override;
+    css::uno::Sequence< OUString > SAL_CALL getFormDescriptions(  ) override;
+    void SAL_CALL selectForm( const OUString& aFormDescription ) override;
+    css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup(  ) override;
+    void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) override;
 };
 
 
@@ -115,27 +115,27 @@ public:
                     virtual ~VCLXPrinter() override;
 
     // css::beans::XPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); }
-    void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); }
-    css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); }
-    void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); }
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override { return VCLXPrinterPropertySet::getPropertySetInfo(); }
+    void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) override { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); }
+    css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); }
+    void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); }
+    void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); }
+    void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); }
+    void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); }
 
     // css::awt::XPrinterPropertySet
-    void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); }
-    css::uno::Sequence< OUString > SAL_CALL getFormDescriptions(  ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getFormDescriptions(); }
-    void SAL_CALL selectForm( const OUString& aFormDescription ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); }
-    css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup(  ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getBinarySetup(); }
-    void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setBinarySetup( data ); }
+    void SAL_CALL setHorizontal( sal_Bool bHorizontal ) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); }
+    css::uno::Sequence< OUString > SAL_CALL getFormDescriptions(  ) override { return VCLXPrinterPropertySet::getFormDescriptions(); }
+    void SAL_CALL selectForm( const OUString& aFormDescription ) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); }
+    css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup(  ) override { return VCLXPrinterPropertySet::getBinarySetup(); }
+    void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) override { VCLXPrinterPropertySet::setBinarySetup( data ); }
 
     // css::awt::XPrinter
-    sal_Bool SAL_CALL start( const OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) throw(css::awt::PrinterException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL end(  ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL terminate(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XDevice > SAL_CALL startPage(  ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL endPage(  ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL start( const OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) override;
+    void SAL_CALL end(  ) override;
+    void SAL_CALL terminate(  ) override;
+    css::uno::Reference< css::awt::XDevice > SAL_CALL startPage(  ) override;
+    void SAL_CALL endPage(  ) override;
 };
 
 
@@ -152,23 +152,23 @@ public:
                         virtual ~VCLXInfoPrinter() override;
 
     // css::beans::XPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertySetInfo(); }
-    void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); }
-    css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); }
-    void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); }
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override { return VCLXPrinterPropertySet::getPropertySetInfo(); }
+    void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) override { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); }
+    css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); }
+    void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); }
+    void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); }
+    void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); }
+    void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); }
 
     // css::awt::XPrinterPropertySet
-    void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); }
-    css::uno::Sequence< OUString > SAL_CALL getFormDescriptions(  ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getFormDescriptions(); }
-    void SAL_CALL selectForm( const OUString& aFormDescription ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); }
-    css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup(  ) throw(css::uno::RuntimeException, std::exception) override { return VCLXPrinterPropertySet::getBinarySetup(); }
-    void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override { VCLXPrinterPropertySet::setBinarySetup( data ); }
+    void SAL_CALL setHorizontal( sal_Bool bHorizontal ) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); }
+    css::uno::Sequence< OUString > SAL_CALL getFormDescriptions(  ) override { return VCLXPrinterPropertySet::getFormDescriptions(); }
+    void SAL_CALL selectForm( const OUString& aFormDescription ) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); }
+    css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup(  ) override { return VCLXPrinterPropertySet::getBinarySetup(); }
+    void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) override { VCLXPrinterPropertySet::setBinarySetup( data ); }
 
     // css::awt::XInfoPrinter
-    css::uno::Reference< css::awt::XDevice > SAL_CALL createDevice(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::awt::XDevice > SAL_CALL createDevice(  ) override;
 };
 
 
@@ -182,18 +182,15 @@ class VCLXPrinterServer : public VCLXPrinterServer_Base
 {
 public:
     // css::awt::XPrinterServer
-    css::uno::Sequence< OUString > SAL_CALL getPrinterNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< OUString > SAL_CALL getPrinterNames(  ) override;
+    css::uno::Reference< css::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) override;
+    css::uno::Reference< css::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif // INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX
diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx
index 81b6ba2256ef..86dc44d4eaca 100644
--- a/include/toolkit/awt/vclxregion.hxx
+++ b/include/toolkit/awt/vclxregion.hxx
@@ -52,32 +52,32 @@ public:
     const vcl::Region&   GetRegion() const                   { return maRegion; }
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
     static VCLXRegion*                                          GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace );
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XRegion
-     css::awt::Rectangle       SAL_CALL getBounds() throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL clear() throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL unionRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL intersectRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL excludeRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL xOrRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL unionRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL intersectRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL excludeRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) override;
-     void                                   SAL_CALL xOrRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception) override;
-     css::uno::Sequence< css::awt::Rectangle > SAL_CALL getRectangles() throw(css::uno::RuntimeException, std::exception) override;
+     css::awt::Rectangle       SAL_CALL getBounds() override;
+     void                                   SAL_CALL clear() override;
+     void                                   SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) override;
+     void                                   SAL_CALL unionRectangle( const css::awt::Rectangle& rRect ) override;
+     void                                   SAL_CALL intersectRectangle( const css::awt::Rectangle& rRect ) override;
+     void                                   SAL_CALL excludeRectangle( const css::awt::Rectangle& rRect ) override;
+     void                                   SAL_CALL xOrRectangle( const css::awt::Rectangle& rRect ) override;
+     void                                   SAL_CALL unionRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) override;
+     void                                   SAL_CALL intersectRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) override;
+     void                                   SAL_CALL excludeRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) override;
+     void                                   SAL_CALL xOrRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) override;
+     css::uno::Sequence< css::awt::Rectangle > SAL_CALL getRectangles() override;
 
 };
 
diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx
index 81fe3ae82736..b7237feee37f 100644
--- a/include/toolkit/awt/vclxspinbutton.hxx
+++ b/include/toolkit/awt/vclxspinbutton.hxx
@@ -54,26 +54,26 @@ namespace toolkit
         DECLARE_XTYPEPROVIDER()
 
         // XComponent
-        void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL dispose( ) override;
 
         // XSpinValue
-        virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( sal_Int32 n ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMinimum( sal_Int32 minValue ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMinimum(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getMaximum(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getSpinIncrement(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getOrientation(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) override;
+        virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) override;
+        virtual void SAL_CALL setValue( sal_Int32 n ) override;
+        virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) override;
+        virtual sal_Int32 SAL_CALL getValue(  ) override;
+        virtual void SAL_CALL setMinimum( sal_Int32 minValue ) override;
+        virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) override;
+        virtual sal_Int32 SAL_CALL getMinimum(  ) override;
+        virtual sal_Int32 SAL_CALL getMaximum(  ) override;
+        virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) override;
+        virtual sal_Int32 SAL_CALL getSpinIncrement(  ) override;
+        virtual void SAL_CALL setOrientation( sal_Int32 orientation ) override;
+        virtual sal_Int32 SAL_CALL getOrientation(  ) override;
 
         // VclWindowPeer
-        virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+        virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
         // VCLXWindow
         void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) override;
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index 3c6d19d75695..d136d50e35b5 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -40,16 +40,16 @@ public:
     virtual ~VCLXSystemDependentWindow() override;
 
     // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XSystemDependendtWindowPeer
-    css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) override;
 };
 
 
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
index 0e805375e501..d6467fed9893 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -45,30 +45,30 @@ public:
     virtual ~VCLXTabPageContainer() override;
 
     // css::awt::XView
-    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
 
     // css::awt::XDevice,
-    css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::DeviceInfo SAL_CALL getInfo() override;
 
     // css::awt::grid::XTabPageContainer
-    virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getTabPageCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int16 SAL_CALL getActiveTabPageID() override;
+    virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) override;
+    virtual ::sal_Int16 SAL_CALL getTabPageCount(  ) override;
+    virtual sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) override;
+    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) override;
+    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) override;
+    virtual void SAL_CALL addTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) override;
+    virtual void SAL_CALL removeTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) override;
 
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override;
 
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
 protected:
     virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
 private:
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index ba0ddafdb4fa..cd1ed4b42734 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -54,27 +54,27 @@ public:
     virtual ~VCLXTopWindow_Base();
 
     // XInterface equivalents
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     // XTypeProvider equivalents
-    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // css::awt::XSystemDependentWindowPeer
-    css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) override;
 
     // css::awt::XTopWindow
-    void SAL_CALL addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL toFront() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL toBack() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& xMenu ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) override;
+    void SAL_CALL removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) override;
+    void SAL_CALL toFront() override;
+    void SAL_CALL toBack() override;
+    void SAL_CALL setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& xMenu ) override;
 
     // XTopWindow2
-    virtual sal_Bool SAL_CALL getIsMaximized() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setIsMaximized( sal_Bool _ismaximized ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getIsMinimized() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setIsMinimized( sal_Bool _isminimized ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getDisplay() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsMaximized() override;
+    virtual void SAL_CALL setIsMaximized( sal_Bool _ismaximized ) override;
+    virtual sal_Bool SAL_CALL getIsMinimized() override;
+    virtual void SAL_CALL setIsMinimized( sal_Bool _isminimized ) override;
+    virtual ::sal_Int32 SAL_CALL getDisplay() override;
+    virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) override;
 };
 
 
@@ -93,13 +93,13 @@ public:
     virtual ~VCLXTopWindow() override;
 
     // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 7ee6ed5d0cb3..7c7913eadb56 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -141,97 +141,95 @@ public:
     // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
     static VCLXWindow*                                          GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace );
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
     // css::lang::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;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
+    void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) override;
+    void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) override;
 
     // css::awt::XWindow
-    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Rectangle SAL_CALL getPosSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setVisible( sal_Bool Visible ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEnable( sal_Bool Enable ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFocus(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& rrxListener ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+    css::awt::Rectangle SAL_CALL getPosSize(  ) override;
+    void SAL_CALL setVisible( sal_Bool Visible ) override;
+    void SAL_CALL setEnable( sal_Bool Enable ) override;
+    void SAL_CALL setFocus(  ) override;
+    void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rrxListener ) override;
+    void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rrxListener ) override;
+    void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rrxListener ) override;
+    void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rrxListener ) override;
+    void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rrxListener ) override;
+    void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rrxListener ) override;
+    void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rrxListener ) override;
+    void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rrxListener ) override;
+    void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rrxListener ) override;
+    void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rrxListener ) override;
+    void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& rrxListener ) override;
+    void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& rrxListener ) override;
 
     // css::awt::XWindowPeer
-    css::uno::Reference< css::awt::XToolkit > SAL_CALL getToolkit(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setPointer( const css::uno::Reference< css::awt::XPointer >& Pointer ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setBackground( sal_Int32 Color ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL invalidate( sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL invalidateRect( const css::awt::Rectangle& Rect, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::awt::XToolkit > SAL_CALL getToolkit(  ) override;
+    void SAL_CALL setPointer( const css::uno::Reference< css::awt::XPointer >& Pointer ) override;
+    void SAL_CALL setBackground( sal_Int32 Color ) override;
+    void SAL_CALL invalidate( sal_Int16 Flags ) override;
+    void SAL_CALL invalidateRect( const css::awt::Rectangle& Rect, sal_Int16 Flags ) override;
 
     // css::awt::XVclWindowPeer
-    sal_Bool SAL_CALL isChild( const css::uno::Reference< css::awt::XWindowPeer >& Peer ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDesignMode( sal_Bool bOn ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isDesignMode(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL enableClipSiblings( sal_Bool bClip ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setForeground( sal_Int32 Color ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setControlFont( const css::awt::FontDescriptor& aFont ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getStyles( sal_Int16 nType, css::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value )
-        throw(css::uno::RuntimeException,
-              std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isChild( const css::uno::Reference< css::awt::XWindowPeer >& Peer ) override;
+    void SAL_CALL setDesignMode( sal_Bool bOn ) override;
+    sal_Bool SAL_CALL isDesignMode(  ) override;
+    void SAL_CALL enableClipSiblings( sal_Bool bClip ) override;
+    void SAL_CALL setForeground( sal_Int32 Color ) override;
+    void SAL_CALL setControlFont( const css::awt::FontDescriptor& aFont ) override;
+    void SAL_CALL getStyles( sal_Int16 nType, css::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::awt::XView
-    sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& aDevice ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& aDevice ) override;
+    css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics(  ) override;
+    css::awt::Size SAL_CALL getSize(  ) override;
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
+    void SAL_CALL setZoom( float fZoomX, float fZoomY ) override;
 
     // css::accessibility::XAccessible
-    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // css::awt::XDockableWindow
-    void SAL_CALL addDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL enableDocking( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isFloating(  ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFloatingMode( sal_Bool bFloating ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL lock(  ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL unlock(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isLocked(  ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL startPopupMode( const css::awt::Rectangle& WindowRect ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isInPopupMode(  ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) override;
+    void SAL_CALL removeDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) override;
+    void SAL_CALL enableDocking( sal_Bool bEnable ) override;
+    sal_Bool SAL_CALL isFloating(  ) override;
+    void SAL_CALL setFloatingMode( sal_Bool bFloating ) override;
+    void SAL_CALL lock(  ) override;
+    void SAL_CALL unlock(  ) override;
+    sal_Bool SAL_CALL isLocked(  ) override;
+    void SAL_CALL startPopupMode( const css::awt::Rectangle& WindowRect ) override;
+    sal_Bool SAL_CALL isInPopupMode(  ) override;
 
     // css::awt::XWindow2
-    void SAL_CALL setOutputSize( const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getOutputSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isVisible(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isActive(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isEnabled(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL hasFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setOutputSize( const css::awt::Size& aSize ) override;
+    css::awt::Size SAL_CALL getOutputSize(  ) override;
+    sal_Bool SAL_CALL isVisible(  ) override;
+    sal_Bool SAL_CALL isActive(  ) override;
+    sal_Bool SAL_CALL isEnabled(  ) override;
+    sal_Bool SAL_CALL hasFocus(  ) override;
 
     // css::beans::XPropertySetInfo
-    css::uno::Sequence< css::beans::Property > SAL_CALL getProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
-    css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::beans::Property > SAL_CALL getProperties(  ) override;
+    css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
     // XStyleSettingsSupplier
-    virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL getStyleSettings() override;
 };
 
 #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index f0e814201572..6bd232f3c593 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -117,11 +117,11 @@ protected:
 
 protected:
     // css::awt::XWindow
-    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
 protected:
     /** forward our bitmap to our window
@@ -162,27 +162,27 @@ public:
     virtual ~VCLXButton() override;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XButton
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL setLabel( const OUString& Label ) override;
+    void SAL_CALL setActionCommand( const OUString& Command ) override;
 
     // css::awt::XToggleButton
     // css::awt::XItemEventBroadcaster
-    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -198,13 +198,13 @@ public:
                     virtual ~VCLXImageControl() override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -233,39 +233,39 @@ public:
                     VCLXCheckBox();
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XCheckBox
-    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getState(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setState( sal_Int16 n ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL enableTriState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    sal_Int16 SAL_CALL getState(  ) override;
+    void SAL_CALL setState( sal_Int16 n ) override;
+    void SAL_CALL setLabel( const OUString& Label ) override;
+    void SAL_CALL enableTriState( sal_Bool b ) override;
 
     // css::awt::XButton:
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL setActionCommand( const OUString& Command ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -292,37 +292,37 @@ public:
                     VCLXRadioButton();
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XRadioButton
-    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL getState(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    sal_Bool SAL_CALL getState(  ) override;
+    void SAL_CALL setState( sal_Bool b ) override;
+    void SAL_CALL setLabel( const OUString& Label ) override;
 
     // css::awt::XButton:
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL setActionCommand( const OUString& Command ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -340,24 +340,24 @@ public:
                         virtual ~VCLXMessageBox() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
 
     // css::awt::XMessageBox
-    void SAL_CALL setCaptionText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getCaptionText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMessageText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getMessageText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL execute(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setCaptionText( const OUString& aText ) override;
+    OUString SAL_CALL getCaptionText(  ) override;
+    void SAL_CALL setMessageText( const OUString& aText ) override;
+    OUString SAL_CALL getMessageText(  ) override;
+    sal_Int16 SAL_CALL execute(  ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize() override;
 
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override;
 };
@@ -379,17 +379,17 @@ public:
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XView
-    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
 
     // css::awt::XDevice,
-    css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::DeviceInfo SAL_CALL getInfo() override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -406,34 +406,34 @@ public:
                         virtual ~VCLXDialog() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XDialog2
-    virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpId( const OUString& Id ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDialog( ::sal_Int32 Result ) override;
+    virtual void SAL_CALL setHelpId( const OUString& Id ) override;
 
     // css::awt::XDialog
-    void SAL_CALL setTitle( const OUString& Title ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getTitle(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL execute(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL endExecute(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setTitle( const OUString& Title ) override;
+    OUString SAL_CALL getTitle(  ) override;
+    sal_Int16 SAL_CALL execute(  ) override;
+    void SAL_CALL endExecute(  ) override;
 
     // css::awt::XView
-    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
 
     // css::awt::XDevice,
-    css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::DeviceInfo SAL_CALL getInfo() override;
 
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
 
 };
 
@@ -451,20 +451,20 @@ public:
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XView
-    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
 
     // css::awt::XDevice,
-    css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::DeviceInfo SAL_CALL getInfo() override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
 
     /// @throws css::uno::RuntimeException
-    TabPage*  getTabPage() const throw ( css::uno::RuntimeException);
+    TabPage*  getTabPage() const;
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
 };
@@ -480,41 +480,41 @@ public:
     virtual ~VCLXMultiPage() override;
 
     // css::uno::XInterface
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
     void SAL_CALL release() throw() override { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XView
-    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
 
     // css::awt::XDevice,
-    css::awt::DeviceInfo SAL_CALL getInfo() throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::DeviceInfo SAL_CALL getInfo() override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
     // XSimpleTabController
-    virtual ::sal_Int32 SAL_CALL insertTab() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL insertTab() override;
+    virtual void SAL_CALL removeTab( ::sal_Int32 ID ) override;
 
-    virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) override;
+    virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) override;
 
-    virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL activateTab( ::sal_Int32 ID ) override;
+    virtual ::sal_Int32 SAL_CALL getActiveTabID() override;
 
-    virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) override;
+    virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) override;
     // C++
     /// @throws css::uno::RuntimeException
-    TabControl*  getTabControl() const throw ( css::uno::RuntimeException);
+    TabControl*  getTabControl() const;
     sal_uInt16 insertTab( TabPage*, OUString& sTitle );
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -541,35 +541,35 @@ public:
     virtual ~VCLXFixedHyperlink() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XFixedHyperlink
-    void SAL_CALL setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setURL( const OUString& URL ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getURL(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getAlignment(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setText( const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    void SAL_CALL setURL( const OUString& URL ) override;
+    OUString SAL_CALL getURL(  ) override;
+    void SAL_CALL setAlignment( sal_Int16 nAlign ) override;
+    sal_Int16 SAL_CALL getAlignment(  ) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -589,24 +589,24 @@ public:
                         virtual ~VCLXFixedText() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XFixedText
-    void SAL_CALL setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getAlignment(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setText( const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    void SAL_CALL setAlignment( sal_Int16 nAlign ) override;
+    sal_Int16 SAL_CALL getAlignment(  ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -628,49 +628,49 @@ protected:
 public:
                     VCLXScrollBar();
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XScrollbar
-    void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setValue( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getValue(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getMaximum(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getLineIncrement(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getBlockIncrement(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getVisibleSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setOrientation( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getOrientation(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) override;
+    void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) override;
+    void SAL_CALL setValue( sal_Int32 n ) override;
+    void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) override;
+    sal_Int32 SAL_CALL getValue(  ) override;
+    void SAL_CALL setMaximum( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getMaximum(  ) override;
+    void SAL_CALL setLineIncrement( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getLineIncrement(  ) override;
+    void SAL_CALL setBlockIncrement( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getBlockIncrement(  ) override;
+    void SAL_CALL setVisibleSize( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getVisibleSize(  ) override;
+    void SAL_CALL setOrientation( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getOrientation(  ) override;
 
     // why isn't this part of the XScrollbar?
     /// @throws css::uno::RuntimeException
-    void SAL_CALL setMinimum( sal_Int32 n ) throw(css::uno::RuntimeException);
+    void SAL_CALL setMinimum( sal_Int32 n );
     /// @throws css::uno::RuntimeException
-    sal_Int32 SAL_CALL getMinimum(  ) throw(css::uno::RuntimeException);
+    sal_Int32 SAL_CALL getMinimum(  );
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize() override;
     /// @throws css::uno::RuntimeException
-    static css::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p ) throw(css::uno::RuntimeException);
+    static css::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p );
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -698,47 +698,47 @@ public:
     TextListenerMultiplexer&    GetTextListeners() { return maTextListeners; }
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XTextComponent
-    void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getSelectedText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Selection SAL_CALL getSelection(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isEditable(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getMaxTextLen(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
+    void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
+    void SAL_CALL setText( const OUString& aText ) override;
+    void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    OUString SAL_CALL getSelectedText(  ) override;
+    void SAL_CALL setSelection( const css::awt::Selection& aSelection ) override;
+    css::awt::Selection SAL_CALL getSelection(  ) override;
+    sal_Bool SAL_CALL isEditable(  ) override;
+    void SAL_CALL setEditable( sal_Bool bEditable ) override;
+    void SAL_CALL setMaxTextLen( sal_Int16 nLen ) override;
+    sal_Int16 SAL_CALL getMaxTextLen(  ) override;
 
     // css::awt::XTextEditField:
-    void SAL_CALL setEchoChar( sal_Unicode cEcho ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setEchoChar( sal_Unicode cEcho ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
 
     // css::awt::XTextLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -768,54 +768,54 @@ public:
                         VCLXListBox();
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XListBox
-    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getItemCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getItems(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getSelectedItemPos(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getSelectedItem(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSelectedItems(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL selectItemsPos( const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isMutipleMode(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDropDownLineCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) override;
+    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) override;
+    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) override;
+    sal_Int16 SAL_CALL getItemCount(  ) override;
+    OUString SAL_CALL getItem( sal_Int16 nPos ) override;
+    css::uno::Sequence< OUString > SAL_CALL getItems(  ) override;
+    sal_Int16 SAL_CALL getSelectedItemPos(  ) override;
+    css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos(  ) override;
+    OUString SAL_CALL getSelectedItem(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSelectedItems(  ) override;
+    void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) override;
+    void SAL_CALL selectItemsPos( const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) override;
+    void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) override;
+    sal_Bool SAL_CALL isMutipleMode(  ) override;
+    void SAL_CALL setMultipleMode( sal_Bool bMulti ) override;
+    sal_Int16 SAL_CALL getDropDownLineCount(  ) override;
+    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) override;
+    void SAL_CALL makeVisible( sal_Int16 nEntry ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
 
     // css::awt::XTextLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     // XItemListListener
-    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -844,43 +844,43 @@ public:
     virtual ~VCLXComboBox() override;
 
      // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XComboBox
-    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getItemCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getItems(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDropDownLineCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) override;
+    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) override;
+    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) override;
+    sal_Int16 SAL_CALL getItemCount(  ) override;
+    OUString SAL_CALL getItem( sal_Int16 nPos ) override;
+    css::uno::Sequence< OUString > SAL_CALL getItems(  ) override;
+    sal_Int16 SAL_CALL getDropDownLineCount(  ) override;
+    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
 
     // css::awt::XTextLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     // XItemListListener
-    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) override;
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -902,23 +902,23 @@ public:
                     VCLXSpinField();
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
 
     // css::awt::XSpinField
-    void SAL_CALL addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL up(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL down(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL first(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL last(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) override;
+    void SAL_CALL removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) override;
+    void SAL_CALL up(  ) override;
+    void SAL_CALL down(  ) override;
+    void SAL_CALL first(  ) override;
+    void SAL_CALL last(  ) override;
+    void SAL_CALL enableRepeat( sal_Bool bRepeat ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -945,8 +945,8 @@ public:
     bool        isStrictFormat();
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -965,36 +965,36 @@ public:
                     virtual ~VCLXDateField() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
 
     // css::awt::XDateField
-    void SAL_CALL setDate( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getDate(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLongFormat( sal_Bool bLong ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isLongFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEmpty(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isEmpty(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setDate( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getDate(  ) override;
+    void SAL_CALL setMin( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getLast(  ) override;
+    void SAL_CALL setLongFormat( sal_Bool bLong ) override;
+    sal_Bool SAL_CALL isLongFormat(  ) override;
+    void SAL_CALL setEmpty(  ) override;
+    sal_Bool SAL_CALL isEmpty(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -1013,33 +1013,33 @@ public:
                     virtual ~VCLXTimeField() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XTimeField
-    void SAL_CALL setTime( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getTime(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEmpty(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isEmpty(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setTime( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getTime(  ) override;
+    void SAL_CALL setMin( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getLast(  ) override;
+    void SAL_CALL setEmpty(  ) override;
+    sal_Bool SAL_CALL isEmpty(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -1056,35 +1056,35 @@ public:
                     virtual ~VCLXNumericField() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XNumericField
-    void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getValue(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getSpinSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDecimalDigits(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setValue( double Value ) override;
+    double SAL_CALL getValue(  ) override;
+    void SAL_CALL setMin( double Value ) override;
+    double SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( double Value ) override;
+    double SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( double Value ) override;
+    double SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( double Value ) override;
+    double SAL_CALL getLast(  ) override;
+    void SAL_CALL setSpinSize( double Value ) override;
+    double SAL_CALL getSpinSize(  ) override;
+    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
+    sal_Int16 SAL_CALL getDecimalDigits(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -1099,46 +1099,46 @@ class VCLXMetricField : public css::awt::XMetricField,
                         public VCLXFormattedSpinField
 {
     /// @throws css::uno::RuntimeException
-    MetricFormatter *GetMetricFormatter() throw(css::uno::RuntimeException);
+    MetricFormatter *GetMetricFormatter();
     /// @throws css::uno::RuntimeException
-    MetricField     *GetMetricField() throw(css::uno::RuntimeException);
+    MetricField     *GetMetricField();
     void CallListeners();
 public:
     VCLXMetricField();
     virtual ~VCLXMetricField() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XMetricField
-    virtual void SAL_CALL setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int64 SAL_CALL getValue( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int64 SAL_CALL getCorrectedValue( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMin( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int64 SAL_CALL getMin( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMax( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int64 SAL_CALL getMax( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFirst( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int64 SAL_CALL getFirst( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLast( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int64 SAL_CALL getLast( ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSpinSize( ::sal_Int64 Value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int64 SAL_CALL getSpinSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDecimalDigits( ::sal_Int16 nDigits ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getDecimalDigits(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isStrictFormat(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) override;
+    virtual void SAL_CALL setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) override;
+    virtual ::sal_Int64 SAL_CALL getValue( ::sal_Int16 Unit ) override;
+    virtual ::sal_Int64 SAL_CALL getCorrectedValue( ::sal_Int16 Unit ) override;
+    virtual void SAL_CALL setMin( ::sal_Int64 Value, ::sal_Int16 Unit ) override;
+    virtual ::sal_Int64 SAL_CALL getMin( ::sal_Int16 Unit ) override;
+    virtual void SAL_CALL setMax( ::sal_Int64 Value, ::sal_Int16 Unit ) override;
+    virtual ::sal_Int64 SAL_CALL getMax( ::sal_Int16 Unit ) override;
+    virtual void SAL_CALL setFirst( ::sal_Int64 Value, ::sal_Int16 Unit ) override;
+    virtual ::sal_Int64 SAL_CALL getFirst( ::sal_Int16 Unit ) override;
+    virtual void SAL_CALL setLast( ::sal_Int64 Value, ::sal_Int16 Unit ) override;
+    virtual ::sal_Int64 SAL_CALL getLast( ::sal_Int16 Unit ) override;
+    virtual void SAL_CALL setSpinSize( ::sal_Int64 Value ) override;
+    virtual ::sal_Int64 SAL_CALL getSpinSize(  ) override;
+    virtual void SAL_CALL setDecimalDigits( ::sal_Int16 nDigits ) override;
+    virtual ::sal_Int16 SAL_CALL getDecimalDigits(  ) override;
+    virtual void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    virtual sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -1155,36 +1155,36 @@ public:
                     virtual ~VCLXCurrencyField() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
 
     // css::awt::XCurrencyField
-    void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getValue(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getSpinSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDecimalDigits(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setValue( double Value ) override;
+    double SAL_CALL getValue(  ) override;
+    void SAL_CALL setMin( double Value ) override;
+    double SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( double Value ) override;
+    double SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( double Value ) override;
+    double SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( double Value ) override;
+    double SAL_CALL getLast(  ) override;
+    void SAL_CALL setSpinSize( double Value ) override;
+    double SAL_CALL getSpinSize(  ) override;
+    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
+    sal_Int16 SAL_CALL getDecimalDigits(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -1201,26 +1201,26 @@ public:
                     virtual ~VCLXPatternField() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
 
     // css::awt::XPatternField
-    void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setString( const OUString& Str ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getString(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) override;
+    void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) override;
+    void SAL_CALL setString( const OUString& Str ) override;
+    OUString SAL_CALL getString(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index 4c977db4f336..cbd304a1334d 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -70,7 +70,7 @@ namespace toolkit
         );
 
         // OCommonAccessibleComponent overridables
-        virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+        virtual css::awt::Rectangle implGetBounds(  ) override;
 
     public:
         /** creates an accessible context for an uno control
@@ -88,24 +88,24 @@ namespace toolkit
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
 
         // XAccessibleComponent
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
         // XEventListener
         using comphelper::OAccessibleContextHelper::disposing;
-        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;
 
     private:
         // retrieves the value of a string property from the model, if the property is present
diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx
index 6b165b788dd6..28b323398039 100644
--- a/include/toolkit/controls/animatedimages.hxx
+++ b/include/toolkit/controls/animatedimages.hxx
@@ -45,38 +45,38 @@ namespace toolkit
         virtual UnoControlModel*        Clone() const override;
 
         // XPropertySet
-        css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
         // XPersistObject
-        OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getServiceName() override;
 
         // XServiceInfo
-        OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getImplementationName(  ) override;
+        css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XAnimatedImages
-        virtual ::sal_Int32 SAL_CALL getStepTime() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setStepTime( ::sal_Int32 _steptime ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getAutoRepeat() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setAutoRepeat( sal_Bool _autorepeat ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getScaleMode() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getImageSetCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getImageSet( ::sal_Int32 i_index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL insertImageSet( ::sal_Int32 i_index, const css::uno::Sequence< OUString >& i_imageURLs ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL replaceImageSet( ::sal_Int32 i_index, const css::uno::Sequence< OUString >& i_imageURLs ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeImageSet( ::sal_Int32 i_index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getStepTime() override;
+        virtual void SAL_CALL setStepTime( ::sal_Int32 _steptime ) override;
+        virtual sal_Bool SAL_CALL getAutoRepeat() override;
+        virtual void SAL_CALL setAutoRepeat( sal_Bool _autorepeat ) override;
+        virtual ::sal_Int16 SAL_CALL getScaleMode() override;
+        virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) override;
+        virtual ::sal_Int32 SAL_CALL getImageSetCount(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getImageSet( ::sal_Int32 i_index ) override;
+        virtual void SAL_CALL insertImageSet( ::sal_Int32 i_index, const css::uno::Sequence< OUString >& i_imageURLs ) override;
+        virtual void SAL_CALL replaceImageSet( ::sal_Int32 i_index, const css::uno::Sequence< OUString >& i_imageURLs ) override;
+        virtual void SAL_CALL removeImageSet( ::sal_Int32 i_index ) override;
 
         // XAnimatedImages::XContainer
-        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& i_listener ) override;
+        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& i_listener ) override;
 
     protected:
                                         virtual ~AnimatedImagesControlModel() override;
 
         css::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
         ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper() override;
-        void SAL_CALL                   setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+        void SAL_CALL                   setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     private:
         std::unique_ptr< AnimatedImagesControlModel_Data > m_xData;
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index eaa5c49da86b..16844fe81efb 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -102,7 +102,7 @@ protected:
     /// @throws css::container::ElementExistException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void updateUserFormChildren(  const css::uno::Reference< css::container::XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation,  const css::uno::Reference< css::awt::XControlModel >& xTarget ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    void updateUserFormChildren(  const css::uno::Reference< css::container::XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation,  const css::uno::Reference< css::awt::XControlModel >& xTarget );
 public:
                         ControlModelContainerBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
                         ControlModelContainerBase( const ControlModelContainerBase& rModel );
@@ -111,70 +111,69 @@ public:
     UnoControlModel*    Clone() const override;
 
     // css::container::XContainer
-    void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
     // css::container::XElementAcces
-    css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Type SAL_CALL getElementType(  ) override;
+    sal_Bool SAL_CALL hasElements(  ) override;
 
     // css::container::XNameContainer, XNameReplace, XNameAccess
-    void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
+    void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    void SAL_CALL removeByName( const OUString& Name ) override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XMultiServiceFactory
-    css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+    css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
 
     // XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // XTabControllerModel
-    virtual sal_Bool SAL_CALL getGroupControl(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getGroupCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, OUString& Name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL getGroupByName( const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getGroupControl(  ) override;
+    virtual void SAL_CALL setGroupControl( sal_Bool GroupControl ) override;
+    virtual void SAL_CALL setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels(  ) override;
+    virtual void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) override;
+    virtual sal_Int32 SAL_CALL getGroupCount(  ) override;
+    virtual void SAL_CALL getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, OUString& Name ) override;
+    virtual void SAL_CALL getGroupByName( const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group ) override;
 
     // XChangesNotifier
-    virtual void SAL_CALL addChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) override;
+    virtual void SAL_CALL removeChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) override;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
     // XEventListener
     using cppu::OPropertySetHelper::disposing;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& evt ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& evt ) override;
 
     // XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED(ControlModelContainerBase, ControlModel_Base, "toolkit.ControlModelContainerBase" )
 
     // XInitialization
-    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
     // css::awt::tab::XTabPageModel
-    virtual ::sal_Int16 SAL_CALL getTabPageID() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitle( const OUString& _title ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getImageURL() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTip() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setToolTip( const OUString& _tooltip ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int16 SAL_CALL getTabPageID() override;
+    virtual sal_Bool SAL_CALL getEnabled() override;
+    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) override;
+    virtual OUString SAL_CALL getTitle() override;
+    virtual void SAL_CALL setTitle( const OUString& _title ) override;
+    virtual OUString SAL_CALL getImageURL() override;
+    virtual void SAL_CALL setImageURL( const OUString& _imageurl ) override;
+    virtual OUString SAL_CALL getToolTip() override;
+    virtual void SAL_CALL setToolTip( const OUString& _tooltip ) override;
 
 protected:
     void startControlListening( const css::uno::Reference< css::awt::XControlModel >& _rxChildModel );
@@ -197,15 +196,15 @@ class ResourceListener  :public css::util::XModifyListener,
         void stopListening();
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XModifyListener
-        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) 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;
 
     private:
         css::uno::Reference< css::resource::XStringResourceResolver > m_xResource;
@@ -245,28 +244,28 @@ public:
 
     DECLIMPL_SERVICEINFO_DERIVED( ControlContainerBase, UnoControlBase, "toolkit.ControlContainerBase" )
 
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+    void SAL_CALL dispose() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
 
     // css::container::XContainerListener
-    void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+    void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
     // XChangesListener
-    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override;
 
     // css::awt::XControl
-    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& Model ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDesignMode( sal_Bool bOn ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& Model ) override;
+    void SAL_CALL setDesignMode( sal_Bool bOn ) override;
     // XModifyListener
     // Using a dummy/no-op implementation here, not sure if every container control needs
     // to implement this, certainly Dialog does, lets see about others
-    virtual void SAL_CALL modified( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) override {}
+    virtual void SAL_CALL modified( const css::lang::EventObject& ) override {}
 protected:
-    virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) override;
     virtual void removingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ) override;
     virtual void addingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ) override;
 };
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index aad4e977b9ab..11b72c551462 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -52,119 +52,116 @@ public:
                                 virtual ~UnoDialogControl() override;
     OUString             GetComponentServiceName() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+    void SAL_CALL dispose() override;
 
     // css::awt::XTopWindow
-    void SAL_CALL addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL toFront(  ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL toBack(  ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& xMenu ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& xListener ) override;
+    void SAL_CALL removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& xListener ) override;
+    void SAL_CALL toFront(  ) override;
+    void SAL_CALL toBack(  ) override;
+    void SAL_CALL setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& xMenu ) override;
 
     // css::awt::XWindowListener
-    virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override;
+    virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override;
+    virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) override;
 
     // css::awt::XDialog2
-    virtual void SAL_CALL endDialog( ::sal_Int32 Result ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpId( const OUString& Id ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDialog( ::sal_Int32 Result ) override;
+    virtual void SAL_CALL setHelpId( const OUString& Id ) override;
 
     // css::awt::XDialog
-    void SAL_CALL setTitle( const OUString& Title ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getTitle() throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL execute() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL endExecute() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setTitle( const OUString& Title ) override;
+    OUString SAL_CALL getTitle() override;
+    sal_Int16 SAL_CALL execute() override;
+    void SAL_CALL endExecute() override;
 
     // css::awt::XControl
-    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& Model ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& Model ) override;
 
     // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 
     // resolve some ambigous methods
-    virtual css::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() override
         { return UnoDialogControl_Base::ControlContainerBase::getPeer(); }
-    virtual void SAL_CALL addWindowListener(const css::uno::Reference<css::awt::XWindowListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addWindowListener(const css::uno::Reference<css::awt::XWindowListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::addWindowListener(p1); }
-    virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() override
         { return UnoDialogControl_Base::ControlContainerBase::getModel(); }
-    virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::addEventListener(p1); }
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::removeEventListener(p1); }
-    virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::setContext(p1); }
-    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() override
         { return UnoDialogControl_Base::ControlContainerBase::getContext(); }
-    virtual css::uno::Reference<css::awt::XView> SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference<css::awt::XView> SAL_CALL getView() override
         { return UnoDialogControl_Base::ControlContainerBase::getView(); }
-    virtual void SAL_CALL setDesignMode(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setDesignMode(sal_Bool p1) override
         { UnoDialogControl_Base::ControlContainerBase::setDesignMode(p1); }
-    virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isDesignMode() override
         { return UnoDialogControl_Base::ControlContainerBase::isDesignMode(); }
-    virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isTransparent() override
         { return UnoDialogControl_Base::ControlContainerBase::isTransparent(); }
-    virtual void SAL_CALL setPosSize(sal_Int32 p1, sal_Int32 p2, sal_Int32 p3, sal_Int32 p4, sal_Int16 p5) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setPosSize(sal_Int32 p1, sal_Int32 p2, sal_Int32 p3, sal_Int32 p4, sal_Int16 p5) override
         { UnoDialogControl_Base::ControlContainerBase::setPosSize(p1, p2, p3, p4, p5); }
-    virtual css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::awt::Rectangle SAL_CALL getPosSize() override
         { return UnoDialogControl_Base::ControlContainerBase::getPosSize(); }
-    virtual void SAL_CALL setVisible(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setVisible(sal_Bool p1) override
         { UnoDialogControl_Base::ControlContainerBase::setVisible(p1); }
-    virtual void SAL_CALL setEnable(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setEnable(sal_Bool p1) override
         { UnoDialogControl_Base::ControlContainerBase::setEnable(p1); }
-    virtual void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setFocus() override
         { UnoDialogControl_Base::ControlContainerBase::setFocus(); }
-    virtual void SAL_CALL removeWindowListener(const css::uno::Reference<css::awt::XWindowListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeWindowListener(const css::uno::Reference<css::awt::XWindowListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::removeWindowListener(p1); }
-    virtual void SAL_CALL addFocusListener(const css::uno::Reference<css::awt::XFocusListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addFocusListener(const css::uno::Reference<css::awt::XFocusListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::addFocusListener(p1); }
-    virtual void SAL_CALL removeFocusListener(const css::uno::Reference<css::awt::XFocusListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeFocusListener(const css::uno::Reference<css::awt::XFocusListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::removeFocusListener(p1); }
-    virtual void SAL_CALL addKeyListener(const css::uno::Reference<css::awt::XKeyListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addKeyListener(const css::uno::Reference<css::awt::XKeyListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::addKeyListener(p1); }
-    virtual void SAL_CALL removeKeyListener(const css::uno::Reference<css::awt::XKeyListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeKeyListener(const css::uno::Reference<css::awt::XKeyListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::removeKeyListener(p1); }
-    virtual void SAL_CALL addMouseListener(const css::uno::Reference<css::awt::XMouseListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addMouseListener(const css::uno::Reference<css::awt::XMouseListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::addMouseListener(p1); }
-    virtual void SAL_CALL removeMouseListener(const css::uno::Reference<css::awt::XMouseListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeMouseListener(const css::uno::Reference<css::awt::XMouseListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::removeMouseListener(p1); }
-    virtual void SAL_CALL addMouseMotionListener(const css::uno::Reference<css::awt::XMouseMotionListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addMouseMotionListener(const css::uno::Reference<css::awt::XMouseMotionListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::addMouseMotionListener(p1); }
-    virtual void SAL_CALL removeMouseMotionListener(const css::uno::Reference<css::awt::XMouseMotionListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeMouseMotionListener(const css::uno::Reference<css::awt::XMouseMotionListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::removeMouseMotionListener(p1); }
-    virtual void SAL_CALL addPaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addPaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::addPaintListener(p1); }
-    virtual void SAL_CALL removePaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removePaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::removePaintListener(p1); }
-    virtual void SAL_CALL setStatusText(const rtl::OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setStatusText(const rtl::OUString& p1) override
         { UnoDialogControl_Base::ControlContainerBase::setStatusText(p1); }
-    virtual css::uno::Sequence<css::uno::Reference<css::awt::XControl> > SAL_CALL getControls() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<css::uno::Reference<css::awt::XControl> > SAL_CALL getControls() override
         { return UnoDialogControl_Base::ControlContainerBase::getControls(); }
-    virtual css::uno::Reference<css::awt::XControl> SAL_CALL getControl(const rtl::OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference<css::awt::XControl> SAL_CALL getControl(const rtl::OUString& p1) override
         { return UnoDialogControl_Base::ControlContainerBase::getControl(p1); }
-    virtual void SAL_CALL addControl(const rtl::OUString& p1, const css::uno::Reference<css::awt::XControl>& p2) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addControl(const rtl::OUString& p1, const css::uno::Reference<css::awt::XControl>& p2) override
         { UnoDialogControl_Base::ControlContainerBase::addControl(p1, p2); }
-    virtual void SAL_CALL removeControl(const css::uno::Reference<css::awt::XControl>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeControl(const css::uno::Reference<css::awt::XControl>& p1) override
         { UnoDialogControl_Base::ControlContainerBase::removeControl(p1); }
 
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 protected:
     virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) override;
-    virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) override;
 protected:
 };
 
@@ -179,13 +176,13 @@ public:
 
     DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoMultiPageModel" )
 
-    virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
     // XNamedContainer
-    void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // Override the method of parent Class
-    virtual sal_Bool SAL_CALL getGroupControl(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getGroupControl(  ) override;
 protected:
     virtual css::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
     ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper() override;
@@ -205,35 +202,35 @@ public:
 
     // css::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, ControlContainerBase, "com.sun.star.awt.UnoControlMultiPage" )
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override { return ControlContainerBase::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return ControlContainerBase::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
     // css::awt::XSimpleTabController
-    virtual ::sal_Int32 SAL_CALL insertTab() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL insertTab() override;
+    virtual void SAL_CALL removeTab( ::sal_Int32 ID ) override;
 
-    virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) override;
+    virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) override;
 
-    virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL activateTab( ::sal_Int32 ID ) override;
+    virtual ::sal_Int32 SAL_CALL getActiveTabID() override;
 
-    virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) override;
+    virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) override;
     // XTabListener
-    virtual void SAL_CALL inserted( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removed( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL changed( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL activated( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deactivated( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& evt ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL inserted( ::sal_Int32 ID ) override;
+    virtual void SAL_CALL removed( ::sal_Int32 ID ) override;
+    virtual void SAL_CALL changed( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) override;
+    virtual void SAL_CALL activated( ::sal_Int32 ID ) override;
+    virtual void SAL_CALL deactivated( ::sal_Int32 ID ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& evt ) override;
     // XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
 protected:
     virtual void    impl_createControlPeerIfNecessary(
@@ -254,11 +251,11 @@ public:
 
     DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoPageModel" )
 
-    virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // Override the method of parent Class
-    virtual sal_Bool SAL_CALL getGroupControl(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getGroupControl(  ) override;
 protected:
     virtual css::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
     ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper() override;
@@ -288,8 +285,8 @@ public:
 
     DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, "com.sun.star.awt.UnoFrameModel" )
 
-    virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
 protected:
     virtual css::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx
index e41aaa02d78f..aba5ce9f3aa4 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -58,44 +58,24 @@ public:
     ScriptEventContainer();
 
     // Methods XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // Methods XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::ElementExistException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // Methods XContainer
-    void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener )
-        throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener )
-        throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 };
 
 }   // namespace toolkit_namecontainer
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index ed993d1911c2..0e9e87781ed5 100644
--- a/include/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
@@ -50,12 +50,12 @@ namespace toolkit
                     css::uno::Any& rOldValue,
                     sal_Int32 nPropId,
                     const css::uno::Any& rValue
-                ) throw (css::lang::IllegalArgumentException, std::exception) override;
+                ) override;
 
         void SAL_CALL setFastPropertyValue_NoBroadcast(
                     sal_Int32 nHandle,
                     const css::uno::Any& rValue
-                ) throw (css::uno::Exception, std::exception) override;
+                ) override;
 
     public:
         UnoControlFormattedFieldModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
@@ -69,27 +69,25 @@ namespace toolkit
         UnoControlModel*    Clone() const override { return new UnoControlFormattedFieldModel( *this ); }
 
         // css::io::XPersistObject
-        OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getServiceName() override;
 
         // css::beans::XMultiPropertySet
-        css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
 
         // css::lang::XServiceInfo
-        OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getImplementationName() override;
 
-        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     protected:
         virtual ~UnoControlFormattedFieldModel() override;
 
         // XComponent
-        void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL dispose(  ) override;
 
         // XPropertySet
-        void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) override;
 
         // UnoControlModel
         virtual void ImplNormalizePropertySequence(
@@ -114,14 +112,12 @@ namespace toolkit
         OUString     GetComponentServiceName() override;
 
         // css::awt::XTextListener
-        void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) override;
 
         // css::lang::XServiceInfo
-        OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getImplementationName() override;
 
-        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
     };
 
 
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index 49d21e24e158..16d8556bc7be 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -110,25 +110,23 @@ namespace com { namespace sun { namespace star {
         virtual ~OGeometryControlModel_Base() override;
 
         // XAggregation
-        css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _aType ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _aType ) override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire(  ) throw() override;
         virtual void SAL_CALL release(  ) throw() override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
         // OPropertySetHelper overridables
         virtual sal_Bool SAL_CALL convertFastPropertyValue(
                 css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue,
-                sal_Int32 _nHandle, const css::uno::Any& _rValue )
-            throw (css::lang::IllegalArgumentException) override;
+                sal_Int32 _nHandle, const css::uno::Any& _rValue ) override;
 
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-                sal_Int32 _nHandle, const css::uno::Any& _rValue)
-            throw (css::uno::Exception, std::exception) override;
+                sal_Int32 _nHandle, const css::uno::Any& _rValue) override;
 
         using comphelper::OPropertySetAggregationHelper::getFastPropertyValue;
         virtual void SAL_CALL getFastPropertyValue(
@@ -140,17 +138,17 @@ namespace com { namespace sun { namespace star {
         virtual css::uno::Any              getPropertyDefaultByHandle(sal_Int32 nHandle) const override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
 
         // OPropertySetAggregationHelper overridables
         using OPropertySetAggregationHelper::getInfoHelper;
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         //XScriptEventsSupplier
         virtual css::uno::Reference< css::container::XNameContainer >
-            SAL_CALL getEvents(  ) throw(css::uno::RuntimeException, std::exception) override;
+            SAL_CALL getEvents(  ) override;
 
         // XCloneable implementation - to be overwritten
         virtual OGeometryControlModel_Base* createClone_Impl(
@@ -204,7 +202,7 @@ namespace com { namespace sun { namespace star {
             css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
     };
 
 
@@ -244,12 +242,11 @@ namespace com { namespace sun { namespace star {
             css::uno::Reference< css::util::XCloneable >& _rxAggregateInstance) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     private:
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-                sal_Int32 _nHandle, const css::uno::Any& _rValue)
-            throw (css::uno::Exception, std::exception) override;
+                sal_Int32 _nHandle, const css::uno::Any& _rValue) override;
     };
 
 #include <toolkit/controls/geometrycontrolmodel_impl.hxx>
diff --git a/include/toolkit/controls/geometrycontrolmodel_impl.hxx b/include/toolkit/controls/geometrycontrolmodel_impl.hxx
index 40ba84b8fb59..f19e84327c22 100644
--- a/include/toolkit/controls/geometrycontrolmodel_impl.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel_impl.hxx
@@ -56,7 +56,7 @@ void OGeometryControlModel<CONTROLMODEL>::fillProperties(css::uno::Sequence< css
 
 
 template <class CONTROLMODEL>
-css::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx
index 6b97158a9e21..b2f5399561ab 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -104,41 +104,39 @@ namespace toolkit
 
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
-    sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
-    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any & Element) throw    (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any & Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any & Element) override;
+    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override;
+    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any & Element) override;
 
-    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoControlRoadmapModel_Base::queryInterface(rType); }
-    css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoControlRoadmapModel_Base::queryInterface(rType); }
+    css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void          SAL_CALL acquire() throw() override  { UnoControlRoadmapModel_Base::acquire(); }
     void          SAL_CALL release() throw() override  { UnoControlRoadmapModel_Base::release(); }
 
 
     // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
 
-    virtual css::uno::Reference< XInterface > SAL_CALL createInstance(  ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< XInterface > SAL_CALL createInstance(  ) override;
+    virtual css::uno::Reference< XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
-    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;
 
     };
 
@@ -154,35 +152,33 @@ namespace toolkit
                             UnoRoadmapControl();
         OUString     GetComponentServiceName() override;
 
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); }
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override { UnoControlBase::disposing( Source ); }
 
-    void SAL_CALL   dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL   dispose(  ) override;
 
 
-    sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw ( css::uno::RuntimeException, std::exception ) override;
+    sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) override;
 
-    void SAL_CALL elementInserted( const css::container::ContainerEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL elementRemoved( const css::container::ContainerEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL elementReplaced( const css::container::ContainerEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL elementInserted( const css::container::ContainerEvent& rEvent ) override;
+    void SAL_CALL elementRemoved( const css::container::ContainerEvent& rEvent ) override;
+    void SAL_CALL elementReplaced( const css::container::ContainerEvent& rEvent ) override;
 
-    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
 
 
-    virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) override;
 
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
     // XTypeProvider
     DECLARE_XTYPEPROVIDER( )
     DECLARE_XINTERFACE()
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
     };
 
 
diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx
index 87113442f6f2..64b95886798a 100644
--- a/include/toolkit/controls/roadmapentry.hxx
+++ b/include/toolkit/controls/roadmapentry.hxx
@@ -49,8 +49,7 @@ protected:
 
     /// @see css::beans::XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-        SAL_CALL getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getPropertySetInfo() override;
 
     // OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -58,9 +57,9 @@ protected:
     // OPropertyArrayUsageHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
 
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 
     // other stuff
diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx
index 7472b5d74deb..69ce7482196c 100644
--- a/include/toolkit/controls/stdtabcontroller.hxx
+++ b/include/toolkit/controls/stdtabcontroller.hxx
@@ -55,36 +55,33 @@ public:
     static css::uno::Reference< css::awt::XControl >  FindControl( css::uno::Sequence< css::uno::Reference< css::awt::XControl > >& rCtrls, const css::uno::Reference< css::awt::XControlModel > & rxCtrlModel );
 
     // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return OWeakAggObject::queryInterface(rType); }
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // XTabController
-    void SAL_CALL setModel( const css::uno::Reference< css::awt::XTabControllerModel >& Model ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XTabControllerModel > SAL_CALL getModel(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setContainer( const css::uno::Reference< css::awt::XControlContainer >& Container ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XControlContainer > SAL_CALL getContainer(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL autoTabOrder(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL activateTabOrder(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL activateFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL activateLast(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setModel( const css::uno::Reference< css::awt::XTabControllerModel >& Model ) override;
+    css::uno::Reference< css::awt::XTabControllerModel > SAL_CALL getModel(  ) override;
+    void SAL_CALL setContainer( const css::uno::Reference< css::awt::XControlContainer >& Container ) override;
+    css::uno::Reference< css::awt::XControlContainer > SAL_CALL getContainer(  ) override;
+    css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls(  ) override;
+    void SAL_CALL autoTabOrder(  ) override;
+    void SAL_CALL activateTabOrder(  ) override;
+    void SAL_CALL activateFirst(  ) override;
+    void SAL_CALL activateLast(  ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx
index e1a5b7446eaf..def33673d567 100644
--- a/include/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/include/toolkit/controls/stdtabcontrollermodel.hxx
@@ -102,40 +102,37 @@ public:
                             virtual ~StdTabControllerModel() override;
 
     // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return OWeakAggObject::queryInterface(rType); }
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XTabControllerModel
-    sal_Bool SAL_CALL getGroupControl(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setGroupControl( sal_Bool GroupControl ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getGroupCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, OUString& Name ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getGroupByName( const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL getGroupControl(  ) override;
+    void SAL_CALL setGroupControl( sal_Bool GroupControl ) override;
+    void SAL_CALL setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) override;
+    css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels(  ) override;
+    void SAL_CALL setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) override;
+    sal_Int32 SAL_CALL getGroupCount(  ) override;
+    void SAL_CALL getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, OUString& Name ) override;
+    void SAL_CALL getGroupByName( const OUString& Name, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName(  ) override;
+    void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) override;
+    void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx
index a4b934c6913a..8174acb203b6 100644
--- a/include/toolkit/controls/tabpagecontainer.hxx
+++ b/include/toolkit/controls/tabpagecontainer.hxx
@@ -48,7 +48,7 @@ protected:
     css::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
 public:
     UnoControlTabPageContainerModel( const css::uno::Reference< css::uno::XComponentContext >& i_factory );
@@ -57,38 +57,34 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlTabPageContainerModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainerModel, UnoControlModel, "com.sun.star.awt.tab.UnoControlTabPageContainerModel" )
 
     // XTabPageContainerModel
-    virtual css::uno::Reference< css::awt::tab::XTabPageModel > SAL_CALL createTabPage( ::sal_Int16 TabPageID ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tab::XTabPageModel > SAL_CALL loadTabPage( ::sal_Int16 TabPageID, const OUString& ResourceURL ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::tab::XTabPageModel > SAL_CALL createTabPage( ::sal_Int16 TabPageID ) override;
+    virtual css::uno::Reference< css::awt::tab::XTabPageModel > SAL_CALL loadTabPage( ::sal_Int16 TabPageID, const OUString& ResourceURL ) override;
 
     // XIndexContainer
-    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
-             throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-             throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
+    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override;
 
     // XIndexReplace
-     virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
-             throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+     virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
      // XIndexAccess
-     virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
+     virtual sal_Int32 SAL_CALL getCount() override;
 
-     virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-             throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+     virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
      // XElementAccess
-     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+     virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // css::container::XContainer
-    void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 };
 
 // = UnoControlTabPageContainer
@@ -103,22 +99,22 @@ public:
     OUString             GetComponentServiceName() override;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XControl
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
 
     // css::awt::tab::XTabPageContainer
-    virtual ::sal_Int16 SAL_CALL getActiveTabPageID() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getTabPageCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL addControl( const OUString& Name, const css::uno::Reference< css::awt::XControl >& Control ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int16 SAL_CALL getActiveTabPageID() override;
+    virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) override;
+    virtual ::sal_Int16 SAL_CALL getTabPageCount(  ) override;
+    virtual sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) override;
+    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) override;
+    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) override;
+    virtual void SAL_CALL addTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) override;
+    virtual void SAL_CALL removeTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) override;
+
+    virtual void SAL_CALL addControl( const OUString& Name, const css::uno::Reference< css::awt::XControl >& Control ) override;
     // css::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainer, UnoControlBase, "com.sun.star.awt.tab.UnoControlTabPageContainer" )
 
diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx
index b60371c92959..2b11f5c5ae5d 100644
--- a/include/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
@@ -41,18 +41,17 @@ public:
     UnoControlTabPageModel( css::uno::Reference< css::uno::XComponentContext > const & i_factory);
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) 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;
+    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -72,24 +71,21 @@ public:
     virtual ~UnoControlTabPage() override;
     OUString             GetComponentServiceName() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+    void SAL_CALL dispose() override;
 
      // css::awt::XWindowListener
-    virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override;
+    virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override;
+    virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) override;
     // css::lang::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;
+    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;
 };
 
 #endif // INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX
diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx
index e44a57059f3a..a0bbd0e2ddd3 100644
--- a/include/toolkit/controls/tkscrollbar.hxx
+++ b/include/toolkit/controls/tkscrollbar.hxx
@@ -47,17 +47,15 @@ namespace toolkit
         UnoControlModel*    Clone() const override { return new UnoControlScrollBarModel( *this ); }
 
         // css::beans::XMultiPropertySet
-        css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
         // css::io::XPersistObject
-        OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getServiceName() override;
 
         // XServiceInfo
-        OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getImplementationName() override;
 
-        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
     };
 
 
@@ -74,44 +72,42 @@ namespace toolkit
                                     UnoScrollBarControl();
         OUString             GetComponentServiceName() override;
 
-        css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); }
-        css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoControlBase::queryInterface(rType); }
+        css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
         void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
         void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
-        void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); }
-        void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+        void SAL_CALL disposing( const css::lang::EventObject& Source ) override { UnoControlBase::disposing( Source ); }
+        void SAL_CALL dispose(  ) override;
 
         // css::lang::XTypeProvider
-        css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-        css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+        css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
         // css::awt::XAdjustmentListener
-        void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) override;
 
         // css::awt::XScrollBar
-        void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL setValue( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception) override;
-        sal_Int32 SAL_CALL getValue(  ) throw(css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-        sal_Int32 SAL_CALL getMaximum(  ) throw(css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-        sal_Int32 SAL_CALL getLineIncrement(  ) throw(css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-        sal_Int32 SAL_CALL getBlockIncrement(  ) throw(css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-        sal_Int32 SAL_CALL getVisibleSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL setOrientation( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) override;
-        sal_Int32 SAL_CALL getOrientation(  ) throw(css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) override;
+        void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) override;
+        void SAL_CALL setValue( sal_Int32 n ) override;
+        void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) override;
+        sal_Int32 SAL_CALL getValue(  ) override;
+        void SAL_CALL setMaximum( sal_Int32 n ) override;
+        sal_Int32 SAL_CALL getMaximum(  ) override;
+        void SAL_CALL setLineIncrement( sal_Int32 n ) override;
+        sal_Int32 SAL_CALL getLineIncrement(  ) override;
+        void SAL_CALL setBlockIncrement( sal_Int32 n ) override;
+        sal_Int32 SAL_CALL getBlockIncrement(  ) override;
+        void SAL_CALL setVisibleSize( sal_Int32 n ) override;
+        sal_Int32 SAL_CALL getVisibleSize(  ) override;
+        void SAL_CALL setOrientation( sal_Int32 n ) override;
+        sal_Int32 SAL_CALL getOrientation(  ) override;
 
         // css::lang::XServiceInfo
-        OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getImplementationName() override;
 
-        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
     };
 
 
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index 72d81b6bd8d7..f5e10a5411f6 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -145,88 +145,88 @@ public:
     virtual OUString GetComponentServiceName();
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
+    void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XEventListener
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     // css::awt::XWindow2
-    virtual void SAL_CALL setOutputSize( const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getOutputSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isVisible(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isActive(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEnabled(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setOutputSize( const css::awt::Size& aSize ) override;
+    virtual css::awt::Size SAL_CALL getOutputSize(  ) override;
+    virtual sal_Bool SAL_CALL isVisible(  ) override;
+    virtual sal_Bool SAL_CALL isActive(  ) override;
+    virtual sal_Bool SAL_CALL isEnabled(  ) override;
+    virtual sal_Bool SAL_CALL hasFocus(  ) override;
 
     // css::awt::XWindow
-    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Rectangle SAL_CALL getPosSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setVisible( sal_Bool Visible ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEnable( sal_Bool Enable ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFocus(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+    css::awt::Rectangle SAL_CALL getPosSize(  ) override;
+    void SAL_CALL setVisible( sal_Bool Visible ) override;
+    void SAL_CALL setEnable( sal_Bool Enable ) override;
+    void SAL_CALL setFocus(  ) override;
+    void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 
     // css::awt::XView
-    sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& aDevice ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setZoom( float fZoomX, float fZoomY ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& aDevice ) override;
+    css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics(  ) override;
+    css::awt::Size SAL_CALL getSize(  ) override;
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
+    void SAL_CALL setZoom( float fZoomX, float fZoomY ) override;
 
     // css::awt::XControl
-    void SAL_CALL setContext( const css::uno::Reference< css::uno::XInterface >& Context ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::uno::XInterface > SAL_CALL getContext(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& Model ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XView > SAL_CALL getView(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDesignMode( sal_Bool bOn ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isDesignMode(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isTransparent(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setContext( const css::uno::Reference< css::uno::XInterface >& Context ) override;
+    css::uno::Reference< css::uno::XInterface > SAL_CALL getContext(  ) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer(  ) override;
+    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& Model ) override;
+    css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel(  ) override;
+    css::uno::Reference< css::awt::XView > SAL_CALL getView(  ) override;
+    void SAL_CALL setDesignMode( sal_Bool bOn ) override;
+    sal_Bool SAL_CALL isDesignMode(  ) override;
+    sal_Bool SAL_CALL isTransparent(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XModeChangeBroadcaster
-    virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override;
+    virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override;
+    virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override;
+    virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override;
 
     // XUnitConversion
-    virtual css::awt::Point SAL_CALL convertPointToLogic( const css::awt::Point& Point, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL convertPointToLogic( const css::awt::Point& Point, ::sal_Int16 TargetUnit ) override;
+    virtual css::awt::Point SAL_CALL convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit ) override;
+    virtual css::awt::Size SAL_CALL convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit ) override;
+    virtual css::awt::Size SAL_CALL convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit ) override;
 
     // XStyleSettingsSupplier
-    virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL getStyleSettings() override;
 
 private:
     // css::beans::XPropertiesChangeListener
-    void SAL_CALL propertiesChange( const css::uno::Sequence< css::beans::PropertyChangeEvent >& evt ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL propertiesChange( const css::uno::Sequence< css::beans::PropertyChangeEvent >& evt ) override;
 };
 
 
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx
index 37fd46db86f2..ca2a5a54555b 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -62,54 +62,52 @@ public:
 
 
     // css::lang::XComponent
-    void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose() override;
 
     // css::lang::XEventListener
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     // css::container::XContainer
-    void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
     // css::container::XIdentifierContainer
-    virtual ::sal_Int32 SAL_CALL insert( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL insert( const css::uno::Any& aElement ) override;
 
     // css::container::XIdentifierReplace
-    virtual void SAL_CALL removeByIdentifier( ::sal_Int32 Identifier ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL replaceByIdentifer( ::sal_Int32 Identifier, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeByIdentifier( ::sal_Int32 Identifier ) override;
+    virtual void SAL_CALL replaceByIdentifer( ::sal_Int32 Identifier, const css::uno::Any& aElement ) override;
 
     // css::container::XIdentifierAccess
-    virtual css::uno::Any SAL_CALL getByIdentifier( ::sal_Int32 Identifierr ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getIdentifiers(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByIdentifier( ::sal_Int32 Identifierr ) override;
+    virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getIdentifiers(  ) override;
 
     // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // css::awt::XControlContainer
-    void SAL_CALL setStatusText( const OUString& StatusText ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addControl( const OUString& Name, const css::uno::Reference< css::awt::XControl >& Control ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeControl( const css::uno::Reference< css::awt::XControl >& Control ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setStatusText( const OUString& StatusText ) override;
+    css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls(  ) override;
+    css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const OUString& aName ) override;
+    void SAL_CALL addControl( const OUString& Name, const css::uno::Reference< css::awt::XControl >& Control ) override;
+    void SAL_CALL removeControl( const css::uno::Reference< css::awt::XControl >& Control ) override;
 
     // css::awt::XUnoControlContainer
-    void SAL_CALL setTabControllers( const css::uno::Sequence< css::uno::Reference< css::awt::XTabController > >& TabControllers ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::uno::Reference< css::awt::XTabController > > SAL_CALL getTabControllers(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addTabController( const css::uno::Reference< css::awt::XTabController >& TabController ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeTabController( const css::uno::Reference< css::awt::XTabController >& TabController ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setTabControllers( const css::uno::Sequence< css::uno::Reference< css::awt::XTabController > >& TabControllers ) override;
+    css::uno::Sequence< css::uno::Reference< css::awt::XTabController > > SAL_CALL getTabControllers(  ) override;
+    void SAL_CALL addTabController( const css::uno::Reference< css::awt::XTabController >& TabController ) override;
+    void SAL_CALL removeTabController( const css::uno::Reference< css::awt::XTabController >& TabController ) override;
 
     // css::awt::XControl
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
 
     // css::awt::XWindow
-    void SAL_CALL setVisible( sal_Bool Visible ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setVisible( sal_Bool Visible ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 protected:
     virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) override;
diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx
index 46ee1cab2ecc..08ff38dac388 100644
--- a/include/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/include/toolkit/controls/unocontrolcontainermodel.hxx
@@ -41,17 +41,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlContainerModel( *this ); }
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index e83c9492ed08..8d9e99105411 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -119,59 +119,59 @@ public:
     virtual UnoControlModel*    Clone() const = 0;
 
     // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return OWeakAggObject::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return OWeakAggObject::queryInterface(rType); }
     void                        SAL_CALL acquire() throw() override;
     void                        SAL_CALL release() throw() override;
 
     // css::uno::XAggregation
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
 
     // css::lang::XUnoTunnel
     static const css::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
-    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64                                                   SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
     // css::util::XCloneable
-    css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // css::lang::XTypeProvider
     DECLARE_XTYPEPROVIDER()
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
+    void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // css::beans::XPropertyState
-    css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
+    void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) override;
+    void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // ::cppu::OPropertySetHelper
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override = 0;
-    sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, std::exception) override;
-    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+    sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     using cppu::OPropertySetHelper::getFastPropertyValue;
     void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
     // override setValue methods to handle properties of FontDescriptor
     // css::beans::XPropertySet
-    void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
     // css::beans::XFastPropertySet
-    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;
+    void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& aValue ) override;
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) override;
 };
 
 #define UNO_CONTROL_MODEL_REGISTER_PROPERTIES(a) \
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 84c602620fc2..54082d8324b6 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -91,18 +91,16 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlEditModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -137,50 +135,50 @@ public:
 
     void                        ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ) override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); }
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override { UnoControlBase::disposing( Source ); }
+    void SAL_CALL dispose(  ) override;
 
     // disambiguate XInterface
     DECLARE_XINTERFACE()
 
     // XAggregation
-    css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
 
     // XTypeProvider
     DECLARE_XTYPEPROVIDER()
 
     // XTextListener
-    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) override;
 
     // XTextComponent
-    void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getSelectedText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Selection SAL_CALL getSelection(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isEditable(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getMaxTextLen(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
+    void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
+    void SAL_CALL setText( const OUString& aText ) override;
+    void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    OUString SAL_CALL getSelectedText(  ) override;
+    void SAL_CALL setSelection( const css::awt::Selection& aSelection ) override;
+    css::awt::Selection SAL_CALL getSelection(  ) override;
+    sal_Bool SAL_CALL isEditable(  ) override;
+    void SAL_CALL setEditable( sal_Bool bEditable ) override;
+    void SAL_CALL setMaxTextLen( sal_Int16 nLen ) override;
+    sal_Int16 SAL_CALL getMaxTextLen(  ) override;
 
     // XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // XTextLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
-    sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw ( css::uno::RuntimeException, std::exception ) override;
+    sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) override;
 };
 
 
@@ -199,17 +197,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlFileControlModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -222,11 +218,9 @@ public:
     OUString     GetComponentServiceName() override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -248,7 +242,7 @@ protected:
     GraphicControlModel( const GraphicControlModel& _rSource ) : UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
 
     // ::cppu::OPropertySetHelper
-    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     // UnoControlModel
     css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
@@ -273,17 +267,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlButtonModel( *this ); }
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -307,37 +299,35 @@ public:
                         UnoButtonControl();
     OUString     GetComponentServiceName() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XButton
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL setLabel( const OUString& Label ) override;
+    void SAL_CALL setActionCommand( const OUString& Command ) override;
 
     // css::awt::XToggleButton
     // css::awt::XItemEventBroadcaster
-    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
 
     // css::lang::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;
 
     // XItemListener
-    virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -359,20 +349,18 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlImageControlModel( *this ); }
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // ::cppu::OPropertySetHelper
-    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 };
 
 
@@ -391,22 +379,20 @@ public:
                             UnoImageControlControl();
     OUString         GetComponentServiceName() override;
 
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XControl
-    sal_Bool SAL_CALL isTransparent(  ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isTransparent(  ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -426,17 +412,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlRadioButtonModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -460,39 +444,37 @@ public:
                             UnoRadioButtonControl();
     OUString         GetComponentServiceName() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); }
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL dispose(  ) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override { UnoControlBase::disposing( Source ); }
 
     // css::awt::XControl
-    sal_Bool SAL_CALL isTransparent(  ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isTransparent(  ) override;
 
     // css::awt::XButton
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL setActionCommand( const OUString& Command ) override;
 
     // css::awt::XRadioButton
-    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL getState(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    sal_Bool SAL_CALL getState(  ) override;
+    void SAL_CALL setState( sal_Bool b ) override;
+    void SAL_CALL setLabel( const OUString& Label ) override;
 
     // css::awt::XItemListener
-    void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -511,17 +493,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlCheckBoxModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -545,41 +525,39 @@ public:
                             UnoCheckBoxControl();
     OUString         GetComponentServiceName() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); }
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL dispose(  ) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override { UnoControlBase::disposing( Source ); }
 
     // css::awt::XControl
-    sal_Bool SAL_CALL isTransparent(  ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isTransparent(  ) override;
 
     // css::awt::XButton
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setActionCommand( const OUString& Command ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL setActionCommand( const OUString& Command ) override;
 
-    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
 
 
-    sal_Int16 SAL_CALL getState(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setState( sal_Int16 n ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLabel( const OUString& Label ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL enableTriState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int16 SAL_CALL getState(  ) override;
+    void SAL_CALL setState( sal_Int16 n ) override;
+    void SAL_CALL setLabel( const OUString& Label ) override;
+    void SAL_CALL enableTriState( sal_Bool b ) override;
 
     // css::awt::XItemListener
-    void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -598,10 +576,10 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlFixedHyperlinkModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedHyperlinkModel, UnoControlModel, "com.sun.star.awt.UnoControlFixedHyperlinkModel" )
@@ -622,35 +600,35 @@ public:
 
     OUString     GetComponentServiceName() override;
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoControlBase::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XControl
-    sal_Bool SAL_CALL isTransparent(  ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isTransparent(  ) override;
 
     // css::awt::XFixedHyperlink
-    void SAL_CALL setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setURL( const OUString& URL ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getURL(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getAlignment(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setText( const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    void SAL_CALL setURL( const OUString& URL ) override;
+    OUString SAL_CALL getURL(  ) override;
+    void SAL_CALL setAlignment( sal_Int16 nAlign ) override;
+    sal_Int16 SAL_CALL getAlignment(  ) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoFixedHyperlinkControl, UnoControlBase, "com.sun.star.awt.UnoControlFixedHyperlink" )
@@ -672,17 +650,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlFixedTextModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -696,35 +672,33 @@ public:
                         UnoFixedTextControl();
     OUString     GetComponentServiceName() override;
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoControlBase::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XControl
-    sal_Bool SAL_CALL isTransparent(  ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isTransparent(  ) override;
 
     // css::awt::XFixedText
-    void SAL_CALL setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setAlignment( sal_Int16 nAlign ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getAlignment(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setText( const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    void SAL_CALL setAlignment( sal_Int16 nAlign ) override;
+    sal_Int16 SAL_CALL getAlignment(  ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -743,17 +717,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlGroupBoxModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -765,14 +737,12 @@ public:
                         UnoGroupBoxControl();
     OUString     GetComponentServiceName() override;
 
-    sal_Bool SAL_CALL isTransparent(  ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isTransparent(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -809,36 +779,36 @@ public:
                         )   const override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::awt::XItemList
-    virtual ::sal_Int32 SAL_CALL getItemCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertItem( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItem( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAllItems(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setItemText( ::sal_Int32 Position, const OUString& ItemText ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setItemTextAndImage( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setItemData( ::sal_Int32 Position, const css::uno::Any& DataValue ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getItemText( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getItemImage( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::beans::Pair< OUString, OUString > SAL_CALL getItemTextAndImage( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getItemData( ::sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::Pair< OUString, OUString > > SAL_CALL getAllItems(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addItemListListener( const css::uno::Reference< css::awt::XItemListListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItemListListener( const css::uno::Reference< css::awt::XItemListListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getItemCount() override;
+    virtual void SAL_CALL insertItem( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) override;
+    virtual void SAL_CALL insertItemText( ::sal_Int32 Position, const OUString& ItemText ) override;
+    virtual void SAL_CALL insertItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) override;
+    virtual void SAL_CALL removeItem( ::sal_Int32 Position ) override;
+    virtual void SAL_CALL removeAllItems(  ) override;
+    virtual void SAL_CALL setItemText( ::sal_Int32 Position, const OUString& ItemText ) override;
+    virtual void SAL_CALL setItemImage( ::sal_Int32 Position, const OUString& ItemImageURL ) override;
+    virtual void SAL_CALL setItemTextAndImage( ::sal_Int32 Position, const OUString& ItemText, const OUString& ItemImageURL ) override;
+    virtual void SAL_CALL setItemData( ::sal_Int32 Position, const css::uno::Any& DataValue ) override;
+    virtual OUString SAL_CALL getItemText( ::sal_Int32 Position ) override;
+    virtual OUString SAL_CALL getItemImage( ::sal_Int32 Position ) override;
+    virtual css::beans::Pair< OUString, OUString > SAL_CALL getItemTextAndImage( ::sal_Int32 Position ) override;
+    virtual css::uno::Any SAL_CALL getItemData( ::sal_Int32 Position ) override;
+    virtual css::uno::Sequence< css::beans::Pair< OUString, OUString > > SAL_CALL getAllItems(  ) override;
+    virtual void SAL_CALL addItemListListener( const css::uno::Reference< css::awt::XItemListListener >& Listener ) override;
+    virtual void SAL_CALL removeItemListListener( const css::uno::Reference< css::awt::XItemListListener >& Listener ) override;
 
     // OPropertySetHelper
-    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
 protected:
     css::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
@@ -895,59 +865,59 @@ public:
                         UnoListBoxControl();
     OUString     GetComponentServiceName() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); }
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL dispose(  ) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override { UnoControlBase::disposing( Source ); }
 
     // css::awt::XListBox
-    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getItemCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getItems(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getSelectedItemPos(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getSelectedItem(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSelectedItems(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL selectItemsPos( const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isMutipleMode(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDropDownLineCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL makeVisible( sal_Int16 nEntry ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) override;
+    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) override;
+    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) override;
+    sal_Int16 SAL_CALL getItemCount(  ) override;
+    OUString SAL_CALL getItem( sal_Int16 nPos ) override;
+    css::uno::Sequence< OUString > SAL_CALL getItems(  ) override;
+    sal_Int16 SAL_CALL getSelectedItemPos(  ) override;
+    css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos(  ) override;
+    OUString SAL_CALL getSelectedItem(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSelectedItems(  ) override;
+    void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) override;
+    void SAL_CALL selectItemsPos( const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) override;
+    void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) override;
+    sal_Bool SAL_CALL isMutipleMode(  ) override;
+    void SAL_CALL setMultipleMode( sal_Bool bMulti ) override;
+    sal_Int16 SAL_CALL getDropDownLineCount(  ) override;
+    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) override;
+    void SAL_CALL makeVisible( sal_Int16 nEntry ) override;
 
     // css::awt::XItemListener
-    void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::awt::XTextLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
 
     // XUnoControl
-    sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw ( css::uno::RuntimeException, std::exception ) override;
+    sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) override;
 
     // XItemListListener
-    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     void                ImplUpdateSelectedItemsProperty();
@@ -975,16 +945,16 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlComboBoxModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
     // OPropertySetHelper
-    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -1005,50 +975,50 @@ public:
                         UnoComboBoxControl();
     OUString     GetComponentServiceName() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoEditControl::disposing( Source ); }
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override { UnoEditControl::disposing( Source ); }
+    void SAL_CALL dispose(  ) override;
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoEditControl::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoEditControl::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XComboBox
-    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getItemCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getItems(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDropDownLineCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) override;
+    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) override;
+    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) override;
+    sal_Int16 SAL_CALL getItemCount(  ) override;
+    OUString SAL_CALL getItem( sal_Int16 nPos ) override;
+    css::uno::Sequence< OUString > SAL_CALL getItems(  ) override;
+    sal_Int16 SAL_CALL getDropDownLineCount(  ) override;
+    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) override;
 
     // XUnoControl
-    virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) override;
 
     // XItemListListener
-    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) override;
 
     // XItemListener
-    virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 protected:
     virtual void        ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ) override;
     virtual void        updateFromModel() override;
@@ -1068,25 +1038,25 @@ private:
 public:
                                 UnoSpinFieldControl();
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoEditControl::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoEditControl::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
 
     // css::awt::XSpinField
-    void SAL_CALL addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL up() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL down() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL first() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL last() throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) override;
+    void SAL_CALL removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) override;
+    void SAL_CALL up() override;
+    void SAL_CALL down() override;
+    void SAL_CALL first() override;
+    void SAL_CALL last() override;
+    void SAL_CALL enableRepeat( sal_Bool bRepeat ) override;
 
 
     // css::lang::XServiceInfo
@@ -1109,17 +1079,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlDateFieldModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1136,44 +1104,42 @@ public:
                             UnoDateFieldControl();
     OUString         GetComponentServiceName() override;
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
 
     // css::awt::XTextListener
-    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) override;
 
     //XDateField
-    void SAL_CALL setDate( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getDate(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( const css::util::Date& Date ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Date SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLongFormat( sal_Bool bLong ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isLongFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEmpty(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isEmpty(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setDate( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getDate(  ) override;
+    void SAL_CALL setMin( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( const css::util::Date& Date ) override;
+    css::util::Date SAL_CALL getLast(  ) override;
+    void SAL_CALL setLongFormat( sal_Bool bLong ) override;
+    sal_Bool SAL_CALL isLongFormat(  ) override;
+    void SAL_CALL setEmpty(  ) override;
+    sal_Bool SAL_CALL isEmpty(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1192,17 +1158,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlTimeFieldModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1219,42 +1183,40 @@ public:
                         UnoTimeFieldControl();
     OUString     GetComponentServiceName() override;
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
 
     // css::awt::XTextListener
-    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) override;
 
     //XTimeField
-    void SAL_CALL setTime( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getTime(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( const css::util::Time& Time ) throw(css::uno::RuntimeException, std::exception) override;
-    css::util::Time SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEmpty(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isEmpty(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setTime( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getTime(  ) override;
+    void SAL_CALL setMin( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( const css::util::Time& Time ) override;
+    css::util::Time SAL_CALL getLast(  ) override;
+    void SAL_CALL setEmpty(  ) override;
+    sal_Bool SAL_CALL isEmpty(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1273,17 +1235,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlNumericFieldModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1300,44 +1260,42 @@ public:
                         UnoNumericFieldControl();
     OUString     GetComponentServiceName() override;
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XTextListener
-    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) override;
 
     // css::awt::XNumericField
-    void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getValue(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getSpinSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDecimalDigits(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setValue( double Value ) override;
+    double SAL_CALL getValue(  ) override;
+    void SAL_CALL setMin( double Value ) override;
+    double SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( double Value ) override;
+    double SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( double Value ) override;
+    double SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( double Value ) override;
+    double SAL_CALL getLast(  ) override;
+    void SAL_CALL setSpinSize( double Value ) override;
+    double SAL_CALL getSpinSize(  ) override;
+    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
+    sal_Int16 SAL_CALL getDecimalDigits(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1356,17 +1314,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlCurrencyFieldModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1383,44 +1339,42 @@ public:
                         UnoCurrencyFieldControl();
     OUString     GetComponentServiceName() override;
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XTextListener
-    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) override;
 
     // css::awt::XCurrencyField
-    void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getValue(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getSpinSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDecimalDigits(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setValue( double Value ) override;
+    double SAL_CALL getValue(  ) override;
+    void SAL_CALL setMin( double Value ) override;
+    double SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( double Value ) override;
+    double SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( double Value ) override;
+    double SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( double Value ) override;
+    double SAL_CALL getLast(  ) override;
+    void SAL_CALL setSpinSize( double Value ) override;
+    double SAL_CALL getSpinSize(  ) override;
+    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
+    sal_Int16 SAL_CALL getDecimalDigits(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1439,17 +1393,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlPatternFieldModel( *this ); }
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1465,29 +1417,27 @@ public:
                         UnoPatternFieldControl();
     OUString     GetComponentServiceName() override;
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoSpinFieldControl::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoSpinFieldControl::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XPatternField
-    void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setString( const OUString& Str ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getString(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) override;
+    void SAL_CALL getMasks( OUString& EditMask, OUString& LiteralMask ) override;
+    void SAL_CALL setString( const OUString& Str ) override;
+    OUString SAL_CALL getString(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1506,17 +1456,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlProgressBarModel( *this ); }
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1529,28 +1477,26 @@ public:
                                 UnoProgressBarControl();
     OUString             GetComponentServiceName() override;
 
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override { return UnoControlBase::queryInterface(rType); }
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override { return UnoControlBase::queryInterface(rType); }
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { OWeakAggObject::acquire(); }
     void                        SAL_CALL release() throw() override  { OWeakAggObject::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XProgressBar
-    void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception ) override;
-    sal_Int32 SAL_CALL getValue() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setForegroundColor( sal_Int32 nColor ) override;
+    void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override;
+    void SAL_CALL setValue( sal_Int32 nValue ) override;
+    void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) override;
+    sal_Int32 SAL_CALL getValue() override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1569,17 +1515,15 @@ public:
     UnoControlModel*    Clone() const override { return new UnoControlFixedLineModel( *this ); }
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -1591,14 +1535,12 @@ public:
                         UnoFixedLineControl();
     OUString     GetComponentServiceName() override;
 
-    sal_Bool SAL_CALL isTransparent(  ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isTransparent(  ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx
index ef1acc37759d..1e65d8b18743 100644
--- a/include/toolkit/helper/listenermultiplexer.hxx
+++ b/include/toolkit/helper/listenermultiplexer.hxx
@@ -68,7 +68,7 @@ public:
     virtual ~ListenerMultiplexerBase();
 
     // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                        SAL_CALL acquire() throw() override  { mrContext.acquire(); }
     void                        SAL_CALL release() throw() override  { mrContext.release(); }
 };
@@ -83,180 +83,180 @@ DECL_LISTENERMULTIPLEXER_END
 //  class FocusListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( FocusListenerMultiplexer, css::awt::XFocusListener )
-    void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override;
+    void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class WindowListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, css::awt::XWindowListener )
-    void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowShown( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override;
+    void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override;
+    void SAL_CALL windowShown( const css::lang::EventObject& e ) override;
+    void SAL_CALL windowHidden( const css::lang::EventObject& e ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class VclContainerListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, css::awt::XVclContainerListener )
-    void SAL_CALL windowAdded( const css::awt::VclContainerEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowRemoved( const css::awt::VclContainerEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL windowAdded( const css::awt::VclContainerEvent& e ) override;
+    void SAL_CALL windowRemoved( const css::awt::VclContainerEvent& e ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class KeyListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( KeyListenerMultiplexer, css::awt::XKeyListener )
-    void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) override;
+    void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class MouseListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseListenerMultiplexer, css::awt::XMouseListener )
-    void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) override;
+    void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) override;
+    void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) override;
+    void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class MouseMotionListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseMotionListenerMultiplexer, css::awt::XMouseMotionListener )
-    void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) override;
+    void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class PaintListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( PaintListenerMultiplexer, css::awt::XPaintListener )
-    void SAL_CALL windowPaint( const css::awt::PaintEvent& e ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL windowPaint( const css::awt::PaintEvent& e ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class TopWindowListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START( TopWindowListenerMultiplexer, css::awt::XTopWindowListener )
-    void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL windowOpened( const css::lang::EventObject& e ) override;
+    void SAL_CALL windowClosing( const css::lang::EventObject& e ) override;
+    void SAL_CALL windowClosed( const css::lang::EventObject& e ) override;
+    void SAL_CALL windowMinimized( const css::lang::EventObject& e ) override;
+    void SAL_CALL windowNormalized( const css::lang::EventObject& e ) override;
+    void SAL_CALL windowActivated( const css::lang::EventObject& e ) override;
+    void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class TextListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TextListenerMultiplexer, css::awt::XTextListener )
-    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL textChanged( const css::awt::TextEvent& rEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class ActionListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, css::awt::XActionListener )
-    void SAL_CALL actionPerformed( const css::awt::ActionEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL actionPerformed( const css::awt::ActionEvent& rEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class ItemListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, css::awt::XItemListener )
-    void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL itemStateChanged( const css::awt::ItemEvent& rEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class TabListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, css::awt::XTabListener )
-    void SAL_CALL inserted( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removed( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL changed( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL activated( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL deactivated( ::sal_Int32 ID ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL inserted( ::sal_Int32 ID ) override;
+    void SAL_CALL removed( ::sal_Int32 ID ) override;
+    void SAL_CALL changed( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) override;
+    void SAL_CALL activated( ::sal_Int32 ID ) override;
+    void SAL_CALL deactivated( ::sal_Int32 ID ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class ContainerListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, css::container::XContainerListener )
-    void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+    void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class SpinListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( SpinListenerMultiplexer, css::awt::XSpinListener )
-    void SAL_CALL up( const css::awt::SpinEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL down( const css::awt::SpinEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL first( const css::awt::SpinEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL last( const css::awt::SpinEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL up( const css::awt::SpinEvent& rEvent ) override;
+    void SAL_CALL down( const css::awt::SpinEvent& rEvent ) override;
+    void SAL_CALL first( const css::awt::SpinEvent& rEvent ) override;
+    void SAL_CALL last( const css::awt::SpinEvent& rEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class AdjustmentListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START( AdjustmentListenerMultiplexer, css::awt::XAdjustmentListener )
-    void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class MenuListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START( MenuListenerMultiplexer, css::awt::XMenuListener )
-    void SAL_CALL itemHighlighted( const css::awt::MenuEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL itemDeactivated( const css::awt::MenuEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL itemHighlighted( const css::awt::MenuEvent& rEvent ) override;
+    void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) override;
+    void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) override;
+    void SAL_CALL itemDeactivated( const css::awt::MenuEvent& rEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class TreeSelectionListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeSelectionListenerMultiplexer, css::view::XSelectionChangeListener )
-    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class TreeExpansionListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeExpansionListenerMultiplexer, css::awt::tree::XTreeExpansionListener )
-    virtual void SAL_CALL requestChildNodes( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL treeExpanding( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL treeCollapsing( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL treeExpanded( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL treeCollapsed( const css::awt::tree::TreeExpansionEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL requestChildNodes( const css::awt::tree::TreeExpansionEvent& aEvent ) override;
+    virtual void SAL_CALL treeExpanding( const css::awt::tree::TreeExpansionEvent& aEvent ) override;
+    virtual void SAL_CALL treeCollapsing( const css::awt::tree::TreeExpansionEvent& aEvent ) override;
+    virtual void SAL_CALL treeExpanded( const css::awt::tree::TreeExpansionEvent& aEvent ) override;
+    virtual void SAL_CALL treeCollapsed( const css::awt::tree::TreeExpansionEvent& aEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class TreeEditListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TreeEditListenerMultiplexer, css::awt::tree::XTreeEditListener )
-    virtual void SAL_CALL nodeEditing( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::uno::RuntimeException,css::util::VetoException, std::exception) override;
-    virtual void SAL_CALL nodeEdited( const css::uno::Reference< css::awt::tree::XTreeNode >& Node, const OUString& NewText ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL nodeEditing( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL nodeEdited( const css::uno::Reference< css::awt::tree::XTreeNode >& Node, const OUString& NewText ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class SelectionListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( SelectionListenerMultiplexer, css::awt::grid::XGridSelectionListener )
-    void SAL_CALL selectionChanged( const css::awt::grid::GridSelectionEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL selectionChanged( const css::awt::grid::GridSelectionEvent& aEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 
 //  class TabPageListenerMultiplexer
 
 DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabPageListenerMultiplexer, css::awt::tab::XTabPageContainerListener )
-    void SAL_CALL tabPageActivated( const css::awt::tab::TabPageActivatedEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL tabPageActivated( const css::awt::tab::TabPageActivatedEvent& aEvent ) override;
 DECL_LISTENERMULTIPLEXER_END
 
 #endif // INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index a3a0e04a8173..0bb97433cbfe 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -25,7 +25,7 @@
 #include <comphelper/servicehelper.hxx>
 
 #define IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \
-sal_Int64 ClassName::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) \
+sal_Int64 ClassName::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) \
 { \
     if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \
     { \
@@ -51,14 +51,14 @@ ClassName* ClassName::GetImplementation( const css::uno::Reference< css::uno::XI
 }
 
 #define IMPL_IMPLEMENTATION_ID( ClassName ) \
-css::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(css::uno::RuntimeException, std::exception) \
+css::uno::Sequence< sal_Int8 > ClassName::getImplementationId() \
 { \
     return css::uno::Sequence<sal_Int8>(); \
 }
 
 #define IMPL_XTYPEPROVIDER_START( ClassName )   \
 IMPL_IMPLEMENTATION_ID( ClassName ) \
-css::uno::Sequence< css::uno::Type > ClassName::getTypes() throw(css::uno::RuntimeException, std::exception) \
+css::uno::Sequence< css::uno::Type > ClassName::getTypes() \
 { \
     static ::cppu::OTypeCollection* pCollection = nullptr; \
     if( !pCollection ) \
@@ -84,10 +84,10 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \
 { \
 public: \
     ClassName( ::cppu::OWeakObject& rSource ); \
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; \
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override; \
     void                        SAL_CALL acquire() throw() override; \
     void                        SAL_CALL release() throw() override; \
-    void                        SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
+    void                        SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
 
 #define DECL_LISTENERMULTIPLEXER_START_DLLPUB( ClassName, InterfaceName ) \
@@ -95,10 +95,10 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter
 { \
 public: \
     ClassName( ::cppu::OWeakObject& rSource ); \
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; \
+    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override; \
     void                        SAL_CALL acquire() throw() override; \
     void                        SAL_CALL release() throw() override; \
-    void                        SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
+    void                        SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
 
 #define DECL_LISTENERMULTIPLEXER_END \
@@ -112,14 +112,14 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \
 } \
 void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \
 void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \
-css::uno::Any ClassName::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) \
+css::uno::Any ClassName::queryInterface( const css::uno::Type & rType ) \
 { \
     css::uno::Any aRet = ::cppu::queryInterface( rType, \
                                         (static_cast< css::lang::XEventListener* >(this)), \
                                         (static_cast< InterfaceName* >(this)) ); \
     return (aRet.hasValue() ? aRet : ListenerMultiplexerBase::queryInterface( rType )); \
 } \
-void ClassName::disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) \
+void ClassName::disposing( const css::lang::EventObject& ) \
 { \
 }
 
@@ -185,16 +185,16 @@ void ClassName::disposing( const css::lang::EventObject& ) throw(css::uno::Runti
 }
 
 #define IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_EXCEPTION( ClassName, InterfaceName, MethodName, EventType, Exception ) \
-void ClassName::MethodName( const EventType& evt ) throw(css::uno::RuntimeException, Exception, std::exception) \
+void ClassName::MethodName( const EventType& evt ) \
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodName, EventType )
 
 #define IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ClassName, InterfaceName, MethodName, EventType ) \
-void ClassName::MethodName( const EventType& evt ) throw(css::uno::RuntimeException, std::exception) \
+void ClassName::MethodName( const EventType& evt ) \
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodName, EventType )
 
 #define DECLIMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override { return OUString("stardiv.Toolkit." #ImplName ); } \
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override   \
+    OUString SAL_CALL getImplementationName(  ) override { return OUString("stardiv.Toolkit." #ImplName ); } \
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override   \
                             { \
                                 css::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \
                                 aNames.realloc( aNames.getLength() + 1 ); \
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index eda020653e04..24747523f947 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -130,7 +130,7 @@ public:
     static FieldUnit                                ConvertToFieldUnit( sal_Int16 _nMeasurementUnit, sal_Int16& _rFieldToUNOValueFactor );
 
     /// @throws css::lang::IllegalArgumentException
-    static MapUnit /* MapModeUnit */ ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit) throw (css::lang::IllegalArgumentException);
+    static MapUnit /* MapModeUnit */ ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit);
 
     static ::Size /* VCLSize */ ConvertToVCLSize(css::awt::Size const& _aSize);
     static css::awt::Size ConvertToAWTSize(::Size /* VCLSize */ const& _aSize);
diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx
index fda23bdce323..4cdc69a2b2c7 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -40,11 +40,9 @@ class UCBHELPER_DLLPUBLIC ActiveDataSink :
 
 public:
     // XActiveDataSink methods.
-    virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) override;
 
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream() override;
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx
index 618aaf73e172..aa00f361d854 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -40,12 +40,8 @@ class ActiveDataStreamer :
 
 public:
     // XActiveDataStreamer methods.
-    virtual void SAL_CALL setStream( const css::uno::Reference< css::io::XStream >& xStream )
-        throw( css::uno::RuntimeException,
-               std::exception ) override;
-    virtual css::uno::Reference< css::io::XStream > SAL_CALL getStream()
-        throw( css::uno::RuntimeException,
-               std::exception ) override;
+    virtual void SAL_CALL setStream( const css::uno::Reference< css::io::XStream >& xStream ) override;
+    virtual css::uno::Reference< css::io::XStream > SAL_CALL getStream() override;
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx
index 8cdeb7a7a7ee..381d63c27645 100644
--- a/include/ucbhelper/cancelcommandexecution.hxx
+++ b/include/ucbhelper/cancelcommandexecution.hxx
@@ -56,8 +56,7 @@ namespace ucbhelper
 UCBHELPER_DLLPUBLIC void cancelCommandExecution( const css::uno::Any & rException,
                              const css::uno::Reference<
                                 css::ucb::XCommandEnvironment > &
-                                    xEnv )
-    throw( css::uno::Exception );
+                                    xEnv );
 
 /** Cancel the execution of a command by throwing the appropriate exception.
     If an Interaction Handler is given with the command environment and the
@@ -94,8 +93,7 @@ UCBHELPER_DLLPUBLIC void cancelCommandExecution( const css::ucb::IOErrorCode eEr
                              const css::uno::Sequence< css::uno::Any > & rArgs,
                              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
                              const OUString & rMessage = OUString(),
-                             const css::uno::Reference< css::ucb::XCommandProcessor > & xContext = nullptr )
-    throw( css::uno::Exception );
+                             const css::uno::Reference< css::ucb::XCommandProcessor > & xContext = nullptr );
 }
 
 #endif // INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index c11e448aa1ff..919f49ca3a3a 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -60,13 +60,9 @@ public:
     virtual ~CommandEnvironment() override;
 
      // XCommandEnvironemnt
-    virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler()
-        throw ( css::uno::RuntimeException,
-                std::exception ) override;
+    virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() override;
 
-    virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler()
-        throw ( css::uno::RuntimeException,
-                std::exception ) override;
+    virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() override;
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index 5fa70c7783bc..4943fce10979 100644
--- a/include/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.hxx
@@ -101,10 +101,7 @@ protected:
     /// @throws css::uno::RuntimeException,
     /// @throws css::uno::Exception
     css::uno::Any createCursorAny( const css::uno::Sequence< OUString >& rPropertyNames,
-                                   ResultSetInclude eMode )
-            throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                                   ResultSetInclude eMode );
 
 public:
     /**
@@ -125,9 +122,7 @@ public:
       */
     Content( const OUString& rURL,
              const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv,
-             const css::uno::Reference< css::uno::XComponentContext >& rCtx )
-        throw ( css::ucb::ContentCreationException,
-                css::uno::RuntimeException );
+             const css::uno::Reference< css::uno::XComponentContext >& rCtx );
     /**
       * Constructor.
       *
@@ -141,9 +136,7 @@ public:
       */
     Content( const css::uno::Reference< css::ucb::XContent >& rContent,
              const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv,
-             const css::uno::Reference< css::uno::XComponentContext >& rCtx )
-        throw ( css::ucb::ContentCreationException,
-                css::uno::RuntimeException );
+             const css::uno::Reference< css::uno::XComponentContext >& rCtx );
     /**
       * Copy Constructor.
       *
@@ -253,10 +246,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Reference< css::ucb::XCommandInfo >
-    getCommands()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    getCommands();
     /**
       * This methods provides access to meta data of the properties supported
       * by this content.
@@ -268,10 +258,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Reference< css::beans::XPropertySetInfo >
-    getProperties()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    getProperties();
 
 
     // Access to property value(s).
@@ -288,10 +275,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Any
-    getPropertyValue( const OUString& rPropertyName )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    getPropertyValue( const OUString& rPropertyName );
     /**
       * This method can be used to set a single property value.
       *
@@ -321,10 +305,7 @@ public:
       */
     css::uno::Any
     setPropertyValue( const OUString& rPropertyName,
-                      const css::uno::Any& rValue )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                      const css::uno::Any& rValue );
     /**
       * This method can be used to read multiple property values.
       *
@@ -336,10 +317,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Sequence< css::uno::Any >
-    getPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    getPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames );
     /**
       * This method can be used to read multiple property values.
       *
@@ -351,10 +329,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Reference< css::sdbc::XRow >
-    getPropertyValuesInterface( const css::uno::Sequence< OUString >& rPropertyNames )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    getPropertyValuesInterface( const css::uno::Sequence< OUString >& rPropertyNames );
 
     /**
       * This method can be used to set multiple property values.
@@ -391,10 +366,7 @@ public:
       */
     css::uno::Sequence< css::uno::Any >
     setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames,
-                       const css::uno::Sequence< css::uno::Any >& rValues )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                       const css::uno::Sequence< css::uno::Any >& rValues );
 
 
     // General command execution.
@@ -415,10 +387,7 @@ public:
       */
     css::uno::Any
     executeCommand( const OUString& rCommandName,
-                    const css::uno::Any& rCommandArgument )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                    const css::uno::Any& rCommandArgument );
 
 
     // Special commands.
@@ -444,10 +413,7 @@ public:
       */
     css::uno::Reference< css::sdbc::XResultSet >
     createCursor( const css::uno::Sequence< OUString >& rPropertyNames,
-                  ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                  ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS );
     /**
       * This methods gives access to the children of a folder content.
       * Additionally, the result set returned provides efficient access to
@@ -468,10 +434,7 @@ public:
       */
     css::uno::Reference< css::ucb::XDynamicResultSet >
     createDynamicCursor( const css::uno::Sequence< OUString >& rPropertyNames,
-                         ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                         ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS );
 
     /// @throws css::ucb::CommandAbortedException
     /// @throws css::uno::RuntimeException
@@ -480,10 +443,7 @@ public:
     createSortedCursor( const css::uno::Sequence< OUString >& rPropertyNames,
                         const css::uno::Sequence< css::ucb::NumberedSortingInfo >& rSortInfo,
                         const css::uno::Reference< css::ucb::XAnyCompareFactory >& rAnyCompareFactory,
-                        ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                        ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS );
 
     /**
       * This methods gives read access to the content stream of a content (i.e
@@ -497,10 +457,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Reference< css::io::XInputStream >
-    openStream()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    openStream();
     /**
       * This methods gives read access to the content stream of a content (i.e
       * the content of a file located at the local file system).
@@ -514,10 +471,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Reference< css::io::XInputStream >
-    openStreamNoLock()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    openStreamNoLock();
 
     /**
       * This methods gives read/write access to the content stream of a content (i.e
@@ -531,10 +485,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Reference< css::io::XStream >
-    openWriteableStream()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    openWriteableStream();
     /**
       * This methods gives read/write access to the content stream of a content (i.e
       * the content of a file located at the local file system).
@@ -548,10 +499,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Reference< css::io::XStream >
-    openWriteableStreamNoLock()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    openWriteableStreamNoLock();
 
     /**
       * This methods gives read access to the content stream of a content (i.e
@@ -565,10 +513,7 @@ public:
       * @throws css::uno::Exception
       */
     bool
-    openStream( const css::uno::Reference< css::io::XActiveDataSink >& rSink )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    openStream( const css::uno::Reference< css::io::XActiveDataSink >& rSink );
     /**
       * This methods gives read access to the content stream of a content (i.e
       * the content of a file located at the local file system).
@@ -581,10 +526,7 @@ public:
       * @throws css::uno::Exception
       */
     bool
-    openStream( const css::uno::Reference< css::io::XOutputStream >& rStream )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    openStream( const css::uno::Reference< css::io::XOutputStream >& rStream );
     /**
       * This methods gives write access to the content stream of a content (i.e
       * the content of a file located at the local file system).
@@ -600,10 +542,7 @@ public:
       */
     void
     writeStream( const css::uno::Reference< css::io::XInputStream >& rStream,
-                 bool bReplaceExisting )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                 bool bReplaceExisting );
 
     /**
       * This method returns the different types of contents this content
@@ -616,10 +555,7 @@ public:
       * @throws css::uno::Exception
       */
     css::uno::Sequence< css::ucb::ContentInfo >
-    queryCreatableContentsInfo()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    queryCreatableContentsInfo();
 
     /**
       * This method creates, initializes and inserts ( commits ) a new content
@@ -651,10 +587,7 @@ public:
     insertNewContent( const OUString& rContentType,
                       const css::uno::Sequence< OUString >& rPropertyNames,
                       const css::uno::Sequence< css::uno::Any >& rPropertyValues,
-                      Content& rNewContent )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                      Content& rNewContent );
     /**
       * This method creates, initializes and inserts (commits) a new content
       * inside this (the target folder) content. For example, it can be used to
@@ -689,10 +622,7 @@ public:
                       const css::uno::Sequence< OUString >& rPropertyNames,
                       const css::uno::Sequence< css::uno::Any >& rPropertyValues,
                       const css::uno::Reference< css::io::XInputStream >& rStream,
-                      Content& rNewContent )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                      Content& rNewContent );
 
     /**
       * This method transfers (copies/moves) a content. It creates a new
@@ -735,10 +665,7 @@ public:
                      bool bMajorVersion = false,
                      const OUString & rCommentVersion = OUString( ),
                      OUString* pResultURL = nullptr,
-                     const OUString & rDocumentId = OUString( ) )
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+                     const OUString & rDocumentId = OUString( ) );
 
     /**
       *  This method lock the resource.
@@ -748,10 +675,7 @@ public:
       * @throws css::uno::Exception
       */
     void
-      lock()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+      lock();
 
     /**
       * This method unlock the resource.
@@ -761,10 +685,7 @@ public:
       * @throws css::uno::Exception
       */
     void
-      unlock()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+      unlock();
 
     // Required properties.
 
@@ -779,10 +700,7 @@ public:
       * @throws css::uno::Exception
       */
     bool
-    isFolder()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    isFolder();
     /**
       * This method returns the value of the content's property "IsDocument".
       *
@@ -793,10 +711,7 @@ public:
       * @throws css::uno::Exception
       */
     bool
-    isDocument()
-        throw( css::ucb::CommandAbortedException,
-               css::uno::RuntimeException,
-               css::uno::Exception );
+    isDocument();
 
 };
 
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 9645f7ef1f83..2eb9c7209b6a 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -309,8 +309,7 @@ public:
     virtual ~ContentImplHelper() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -318,86 +317,65 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL
-    getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override = 0;
+    getImplementationName() override = 0;
     virtual sal_Bool SAL_CALL
-    supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override = 0;
+    getSupportedServiceNames() override = 0;
 
     // XComponent
     virtual void SAL_CALL
-    dispose()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     // XContent
     virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-    getIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getIdentifier() override;
     virtual OUString SAL_CALL
-    getContentType()
-        throw( css::uno::RuntimeException, std::exception ) override = 0;
+    getContentType() override = 0;
     virtual void SAL_CALL
     addContentEventListener(
-        const css::uno::Reference< css::ucb::XContentEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override;
     virtual void SAL_CALL
     removeContentEventListener(
-        const css::uno::Reference< css::ucb::XContentEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override;
 
     // XCommandProcessor
     virtual sal_Int32 SAL_CALL
-    createCommandIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createCommandIdentifier() override;
     virtual css::uno::Any SAL_CALL
     execute( const css::ucb::Command& aCommand,
              sal_Int32 CommandId,
-             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception ) override = 0;
+             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override = 0;
     virtual void SAL_CALL
-    abort( sal_Int32 CommandId )
-        throw( css::uno::RuntimeException, std::exception ) override = 0;
+    abort( sal_Int32 CommandId ) override = 0;
 
     // XPropertiesChangeNotifier
     virtual void SAL_CALL
     addPropertiesChangeListener(
         const css::uno::Sequence< OUString >& PropertyNames,
-         const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+         const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override;
     virtual void SAL_CALL
     removePropertiesChangeListener(
         const css::uno::Sequence< OUString >& PropertyNames,
-        const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override;
 
     // XCommandInfoChangeNotifier
     virtual void SAL_CALL
     addCommandInfoChangeListener(
-        const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener ) override;
     virtual void SAL_CALL
     removeCommandInfoChangeListener(
-        const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener ) override;
 
     // XPropertyContainer
 
@@ -414,11 +392,7 @@ public:
     virtual void SAL_CALL
     addProperty( const OUString& Name,
                  sal_Int16 Attributes,
-                 const css::uno::Any& DefaultValue )
-        throw( css::beans::PropertyExistException,
-               css::beans::IllegalTypeException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception ) override;
+                 const css::uno::Any& DefaultValue ) override;
 
     /**
       * This method removes a property from the content according to the
@@ -431,20 +405,15 @@ public:
       * implementation of getPropertyInfoTable.
       */
     virtual void SAL_CALL
-    removeProperty( const OUString& Name )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::NotRemoveableException,
-               css::uno::RuntimeException, std::exception ) override;
+    removeProperty( const OUString& Name ) override;
 
     // XPropertySetInfoChangeNotifier
     virtual void SAL_CALL
     addPropertySetInfoChangeListener(
-        const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
     virtual void SAL_CALL
     removePropertySetInfoChangeListener(
-        const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
 
     // XChild
 
@@ -454,16 +423,13 @@ public:
       * implementation of getParentURL.
       */
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    getParent()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getParent() override;
 
     /**
       * The implementation of this method always throws a NoSupportException.
       */
     virtual void SAL_CALL
-    setParent( const css::uno::Reference< css::uno::XInterface >& Parent )
-        throw( css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception ) override;
+    setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
 
     // Non-interface methods.
diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 21616511ce2b..093544c2b6da 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -50,8 +50,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL
     acquire() throw() override;
     virtual void SAL_CALL
@@ -59,19 +58,15 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
 
     // XContentIdentifier
     virtual OUString SAL_CALL
-    getContentIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContentIdentifier() override;
     virtual OUString SAL_CALL
-    getContentProviderScheme()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContentProviderScheme() override;
 
 private:
     std::unique_ptr<ContentIdentifier_Impl> m_pImpl;
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 171479ca0e1f..7b2e9a2c0c8b 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -65,8 +65,7 @@ public:
     virtual ~PropertySetInfo() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -74,24 +73,18 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
 
     // XPropertySetInfo
     virtual css::uno::Sequence<
                 css::beans::Property > SAL_CALL
-    getProperties()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getProperties() override;
     virtual css::beans::Property SAL_CALL
-    getPropertyByName( const OUString& aName )
-        throw( css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception ) override;
+    getPropertyByName( const OUString& aName ) override;
     virtual sal_Bool SAL_CALL
-    hasPropertyByName( const OUString& Name )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    hasPropertyByName( const OUString& Name ) override;
 
     // Non-Interface methods.
     void reset();
@@ -130,8 +123,7 @@ public:
     virtual ~CommandProcessorInfo() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -139,31 +131,22 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
 
     // XCommandInfo
     virtual css::uno::Sequence<
                 css::ucb::CommandInfo > SAL_CALL
-    getCommands()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getCommands() override;
     virtual css::ucb::CommandInfo SAL_CALL
-    getCommandInfoByName( const OUString& Name )
-        throw( css::ucb::UnsupportedCommandException,
-        css::uno::RuntimeException, std::exception ) override;
+    getCommandInfoByName( const OUString& Name ) override;
     virtual css::ucb::CommandInfo SAL_CALL
-    getCommandInfoByHandle( sal_Int32 Handle )
-        throw( css::ucb::UnsupportedCommandException,
-        css::uno::RuntimeException, std::exception ) override;
+    getCommandInfoByHandle( sal_Int32 Handle ) override;
     virtual sal_Bool SAL_CALL
-    hasCommandByName( const OUString& Name )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    hasCommandByName( const OUString& Name ) override;
     virtual sal_Bool SAL_CALL
-    hasCommandByHandle( sal_Int32 Handle )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    hasCommandByHandle( sal_Int32 Handle ) override;
 
     // Non-Interface methods.
     void reset();
diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx
index a80d6615fcf4..da0aec5ac1e6 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -54,60 +54,35 @@ namespace ucbhelper
 
         virtual sal_Int32 SAL_CALL
         readBytes(css::uno::Sequence< sal_Int8 >& aData,
-                  sal_Int32 nBytesToRead)
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+                  sal_Int32 nBytesToRead) override;
 
         virtual sal_Int32 SAL_CALL
         readSomeBytes(css::uno::Sequence< sal_Int8 >& aData,
-                      sal_Int32 nMaxBytesToRead )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+                      sal_Int32 nMaxBytesToRead ) override;
 
         virtual void SAL_CALL
-        skipBytes(sal_Int32 nBytesToSkip)
-            throw(css::io::NotConnectedException,
-                  css::io::BufferSizeExceededException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception ) override;
+        skipBytes(sal_Int32 nBytesToSkip) override;
 
         virtual sal_Int32 SAL_CALL
-        available()
-            throw(css::io::NotConnectedException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception ) override;
+        available() override;
 
         virtual void SAL_CALL
-        closeInput()
-            throw(css::io::NotConnectedException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
+        closeInput() override;
 
 
         /** XSeekable
          */
 
         virtual void SAL_CALL
-        seek(sal_Int64 location)
-            throw(css::lang::IllegalArgumentException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
+        seek(sal_Int64 location) override;
 
 
         virtual sal_Int64 SAL_CALL
-        getPosition()
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
+        getPosition() override;
 
 
         virtual sal_Int64 SAL_CALL
-        getLength()
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
+        getLength() override;
 
     private:
         oslFileHandle m_tmpfl;
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index ff5eaaed539d..07cd1ad629a8 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -90,8 +90,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -99,19 +98,15 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XInteractionRequest
     virtual css::uno::Any SAL_CALL
-    getRequest()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getRequest() override;
     virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL
-    getContinuations()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContinuations() override;
 
     // Non-interface methods.
 
@@ -184,8 +179,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -193,15 +187,12 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL select() override;
 };
 
 
@@ -221,8 +212,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -230,15 +220,12 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL select() override;
 };
 
 
@@ -258,8 +245,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -267,15 +253,12 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL select() override;
 };
 
 
@@ -295,8 +278,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -304,15 +286,12 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL select() override;
 };
 
 
@@ -393,8 +372,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -402,67 +380,50 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL select() override;
 
     // XInteractionSupplyAuthentication
     virtual sal_Bool SAL_CALL
-    canSetRealm()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    canSetRealm() override;
     virtual void SAL_CALL
-    setRealm( const OUString& Realm )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    setRealm( const OUString& Realm ) override;
 
     virtual sal_Bool SAL_CALL
-    canSetUserName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    canSetUserName() override;
     virtual void SAL_CALL
-    setUserName( const OUString& UserName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    setUserName( const OUString& UserName ) override;
 
     virtual sal_Bool SAL_CALL
-    canSetPassword()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    canSetPassword() override;
     virtual void SAL_CALL
-    setPassword( const OUString& Password )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    setPassword( const OUString& Password ) override;
 
     virtual css::uno::Sequence<
                 css::ucb::RememberAuthentication > SAL_CALL
     getRememberPasswordModes(
-            css::ucb::RememberAuthentication& Default )
-        throw( css::uno::RuntimeException, std::exception ) override;
+            css::ucb::RememberAuthentication& Default ) override;
     virtual void SAL_CALL
-    setRememberPassword( css::ucb::RememberAuthentication Remember )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    setRememberPassword( css::ucb::RememberAuthentication Remember ) override;
 
     virtual sal_Bool SAL_CALL
-    canSetAccount()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    canSetAccount() override;
     virtual void SAL_CALL
-    setAccount( const OUString& Account )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    setAccount( const OUString& Account ) override;
 
     virtual css::uno::Sequence< css::ucb::RememberAuthentication > SAL_CALL
     getRememberAccountModes(
-            css::ucb::RememberAuthentication& Default )
-        throw( css::uno::RuntimeException, std::exception ) override;
+            css::ucb::RememberAuthentication& Default ) override;
     virtual void SAL_CALL
-    setRememberAccount( css::ucb::RememberAuthentication Remember )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    setRememberAccount( css::ucb::RememberAuthentication Remember ) override;
 
     // XInteractionSupplyAuthentication2
-    virtual sal_Bool SAL_CALL canUseSystemCredentials( sal_Bool& Default )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setUseSystemCredentials( sal_Bool UseSystemCredentials )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL canUseSystemCredentials( sal_Bool& Default ) override;
+    virtual void SAL_CALL setUseSystemCredentials( sal_Bool UseSystemCredentials ) override;
 
     // Non-interface methods.
 
@@ -549,8 +510,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -558,15 +518,12 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL select() override;
 };
 
 class UCBHELPER_DLLPUBLIC InteractionAuthFallback:
@@ -581,23 +538,19 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL select() override;
 
     // XAuthFallback
-    virtual void SAL_CALL setCode( const OUString& code )
-        throw (::css::uno::RuntimeException, ::std::exception) override;
+    virtual void SAL_CALL setCode( const OUString& code ) override;
     /// @throws css::uno::RuntimeException
-    const OUString& SAL_CALL getCode()
-        throw (::css::uno::RuntimeException, ::std::exception);
+    const OUString& SAL_CALL getCode();
 
 
 };
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index 6a723f541a9b..c940249a07b3 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -233,8 +233,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
             @param  xRequest
                     the interaction request, which should be intercepted.
          */
-        virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) override;
 
 
     // helper
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 6f9311e8657f..09dca56d5750 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -39,16 +39,14 @@
 
 #define XTYPEPROVIDER_COMMON_IMPL( Class )                                  \
 css::uno::Sequence< sal_Int8 > SAL_CALL                          \
-Class::getImplementationId()                                                \
-    throw( css::uno::RuntimeException, std::exception )          \
+Class::getImplementationId()          \
 {                                                                           \
       return css::uno::Sequence<sal_Int8>();                                \
 }
 
 #define GETTYPES_IMPL_START( Class )                                        \
 css::uno::Sequence< css::uno::Type > SAL_CALL         \
-Class::getTypes()                                                           \
-    throw( css::uno::RuntimeException, std::exception )          \
+Class::getTypes()          \
 {                                                                           \
     static cppu::OTypeCollection* pCollection = nullptr;                       \
       if ( !pCollection )                                                     \
@@ -161,7 +159,6 @@ GETTYPES_IMPL_END
 
 #define XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                         \
 OUString SAL_CALL Class::getImplementationName()                       \
-    throw( css::uno::RuntimeException, std::exception )          \
 {                                                                           \
     return getImplementationName_Static();                                  \
 }                                                                           \
@@ -173,14 +170,12 @@ OUString Class::getImplementationName_Static()                         \
                                                                             \
 sal_Bool SAL_CALL                                                           \
 Class::supportsService( const OUString& ServiceName )                  \
-    throw( css::uno::RuntimeException, std::exception )          \
 {                                                                           \
     return cppu::supportsService( this, ServiceName );                      \
 }                                                                           \
                                                                             \
 css::uno::Sequence< OUString > SAL_CALL                     \
 Class::getSupportedServiceNames()                                           \
-    throw( css::uno::RuntimeException, std::exception )          \
 {                                                                           \
     return getSupportedServiceNames_Static();                               \
 }
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index e475243be8a4..dcc48170e8a4 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -75,8 +75,7 @@ public:
     virtual ~PropertyValueSet() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -84,107 +83,63 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
 
     // XRow
     virtual sal_Bool SAL_CALL
-    wasNull()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    wasNull() override;
     virtual OUString SAL_CALL
-    getString( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getString( sal_Int32 columnIndex ) override;
     virtual sal_Bool SAL_CALL
-    getBoolean( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBoolean( sal_Int32 columnIndex ) override;
     virtual sal_Int8 SAL_CALL
-    getByte( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getByte( sal_Int32 columnIndex ) override;
     virtual sal_Int16 SAL_CALL
-    getShort( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getShort( sal_Int32 columnIndex ) override;
     virtual sal_Int32 SAL_CALL
-    getInt( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getInt( sal_Int32 columnIndex ) override;
     virtual sal_Int64 SAL_CALL
-    getLong( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getLong( sal_Int32 columnIndex ) override;
     virtual float SAL_CALL
-    getFloat( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getFloat( sal_Int32 columnIndex ) override;
     virtual double SAL_CALL
-    getDouble( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getDouble( sal_Int32 columnIndex ) override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getBytes( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBytes( sal_Int32 columnIndex ) override;
     virtual css::util::Date SAL_CALL
-    getDate( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getDate( sal_Int32 columnIndex ) override;
     virtual css::util::Time SAL_CALL
-    getTime( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getTime( sal_Int32 columnIndex ) override;
     virtual css::util::DateTime SAL_CALL
-    getTimestamp( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getTimestamp( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::io::XInputStream > SAL_CALL
-    getBinaryStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBinaryStream( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::io::XInputStream > SAL_CALL
-    getCharacterStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getCharacterStream( sal_Int32 columnIndex ) override;
     virtual css::uno::Any SAL_CALL
     getObject( sal_Int32 columnIndex,
                const css::uno::Reference<
-                   css::container::XNameAccess >& typeMap )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+                   css::container::XNameAccess >& typeMap ) override;
     virtual css::uno::Reference<
                 css::sdbc::XRef > SAL_CALL
-    getRef( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getRef( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::sdbc::XBlob > SAL_CALL
-    getBlob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBlob( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::sdbc::XClob > SAL_CALL
-    getClob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getClob( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::sdbc::XArray > SAL_CALL
-    getArray( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getArray( sal_Int32 columnIndex ) override;
 
     // XColumnLocate
     virtual sal_Int32 SAL_CALL
-    findColumn( const OUString& columnName )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    findColumn( const OUString& columnName ) override;
 
 
     // Non-interface methods
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index da10f4194817..8bff1126862f 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -137,8 +137,7 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -148,24 +147,19 @@ public:
 
 
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
 
     // XServiceInfo
 
 
     virtual OUString SAL_CALL
-    getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override = 0;
+    getImplementationName() override = 0;
     virtual sal_Bool SAL_CALL
-    supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override = 0;
+    getSupportedServiceNames() override = 0;
 
 
     // XContentProvider
@@ -183,13 +177,10 @@ public:
       *   content, otherwise
       */
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override = 0;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override = 0;
     virtual sal_Int32 SAL_CALL
     compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1,
-                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override;
 
 
     // Non-interface methods.
diff --git a/include/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx
index 4f0591fcaf43..536d21a0ab69 100644
--- a/include/ucbhelper/registerucb.hxx
+++ b/include/ucbhelper/registerucb.hxx
@@ -89,8 +89,7 @@ UCBHELPER_DLLPUBLIC bool registerAtUcb(
     css::uno::Reference< css::uno::XComponentContext > const & rxContext,
     OUString const & rName,
     OUString const & rArguments,
-    OUString const & rTemplate)
-    throw (css::uno::RuntimeException);
+    OUString const & rTemplate);
 
 }
 #endif // INCLUDED_UCBHELPER_REGISTERUCB_HXX
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index d7f831fa7b92..a71afddabb5f 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -102,8 +102,7 @@ public:
     virtual ~ResultSet() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -111,255 +110,143 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
     virtual void SAL_CALL
-    dispose()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     // XContentAccess
     virtual OUString SAL_CALL
-    queryContentIdentifierString()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentIdentifierString() override;
     virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-    queryContentIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentIdentifier() override;
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContent() override;
 
     // XResultSetMetaDataSupplier
     virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
-    getMetaData()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getMetaData() override;
 
     // XResultSet
     virtual sal_Bool SAL_CALL
-    next()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    next() override;
     virtual sal_Bool SAL_CALL
-    isBeforeFirst()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isBeforeFirst() override;
     virtual sal_Bool SAL_CALL
-    isAfterLast()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isAfterLast() override;
     virtual sal_Bool SAL_CALL
-    isFirst()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isFirst() override;
     virtual sal_Bool SAL_CALL
-    isLast()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isLast() override;
     virtual void SAL_CALL
-    beforeFirst()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    beforeFirst() override;
     virtual void SAL_CALL
-    afterLast()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    afterLast() override;
     virtual sal_Bool SAL_CALL
-    first()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    first() override;
     virtual sal_Bool SAL_CALL
-    last()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    last() override;
     virtual sal_Int32 SAL_CALL
-    getRow()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getRow() override;
     virtual sal_Bool SAL_CALL
-    absolute( sal_Int32 row )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    absolute( sal_Int32 row ) override;
     virtual sal_Bool SAL_CALL
-    relative( sal_Int32 rows )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    relative( sal_Int32 rows ) override;
     virtual sal_Bool SAL_CALL
-    previous()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    previous() override;
     virtual void SAL_CALL
-    refreshRow()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    refreshRow() override;
     virtual sal_Bool SAL_CALL
-    rowUpdated()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    rowUpdated() override;
     virtual sal_Bool SAL_CALL
-    rowInserted()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    rowInserted() override;
     virtual sal_Bool SAL_CALL
-    rowDeleted()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    rowDeleted() override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-    getStatement()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getStatement() override;
 
     // XRow
     virtual sal_Bool SAL_CALL
-    wasNull()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    wasNull() override;
     virtual OUString SAL_CALL
-    getString( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getString( sal_Int32 columnIndex ) override;
     virtual sal_Bool SAL_CALL
-    getBoolean( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBoolean( sal_Int32 columnIndex ) override;
     virtual sal_Int8 SAL_CALL
-    getByte( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getByte( sal_Int32 columnIndex ) override;
     virtual sal_Int16 SAL_CALL
-    getShort( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getShort( sal_Int32 columnIndex ) override;
     virtual sal_Int32 SAL_CALL
-    getInt( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getInt( sal_Int32 columnIndex ) override;
     virtual sal_Int64 SAL_CALL
-    getLong( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getLong( sal_Int32 columnIndex ) override;
     virtual float SAL_CALL
-    getFloat( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getFloat( sal_Int32 columnIndex ) override;
     virtual double SAL_CALL
-    getDouble( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getDouble( sal_Int32 columnIndex ) override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getBytes( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBytes( sal_Int32 columnIndex ) override;
     virtual css::util::Date SAL_CALL
-    getDate( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getDate( sal_Int32 columnIndex ) override;
     virtual css::util::Time SAL_CALL
-    getTime( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getTime( sal_Int32 columnIndex ) override;
     virtual css::util::DateTime SAL_CALL
-    getTimestamp( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getTimestamp( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::io::XInputStream > SAL_CALL
-    getBinaryStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBinaryStream( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::io::XInputStream > SAL_CALL
-    getCharacterStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getCharacterStream( sal_Int32 columnIndex ) override;
     virtual css::uno::Any SAL_CALL
     getObject( sal_Int32 columnIndex,
-               const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+               const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
     virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
-    getRef( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getRef( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::sdbc::XBlob > SAL_CALL
-    getBlob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBlob( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
-    getClob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getClob( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
-    getArray( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getArray( sal_Int32 columnIndex ) override;
 
     // XCloseable
     virtual void SAL_CALL
-    close()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    close() override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getPropertySetInfo() override;
     virtual void SAL_CALL
     setPropertyValue( const OUString& aPropertyName,
-                      const css::uno::Any& aValue )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                      const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL
-    getPropertyValue( const OUString& PropertyName )
-        throw( css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception ) override;
+    getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL
     addPropertyChangeListener( const OUString& aPropertyName,
-                               const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                               const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL
     removePropertyChangeListener( const OUString& aPropertyName,
-                                  const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                  const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL
     addVetoableChangeListener( const OUString& PropertyName,
-                               const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                               const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL
     removeVetoableChangeListener( const OUString& PropertyName,
-                                  const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                  const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 
     // Non-interface methods.
@@ -553,8 +440,7 @@ public:
      *
      * @exception ResultSetException thrown, if an error has occurred
      */
-    virtual void validate()
-        throw( css::ucb::ResultSetException ) = 0;
+    virtual void validate() = 0;
 };
 
 }
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 078b1cb21c75..da4618c3d6c9 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -129,8 +129,7 @@ public:
     virtual ~ResultSetImplHelper() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -138,54 +137,37 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent ( base class of XDynamicResultSet )
     virtual void SAL_CALL
-    dispose()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     // XDynamicResultSet
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
-    getStaticResultSet()
-        throw( css::ucb::ListenerAlreadySetException,
-        css::uno::RuntimeException, std::exception ) override;
+    getStaticResultSet() override;
     virtual void SAL_CALL
-    setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener )
-        throw( css::ucb::ListenerAlreadySetException,
-               css::uno::RuntimeException, std::exception ) override;
+    setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) override;
     virtual void SAL_CALL
-    connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache )
-        throw( css::ucb::ListenerAlreadySetException,
-               css::ucb::AlreadyInitializedException,
-               css::ucb::ServiceNotFoundException,
-               css::uno::RuntimeException, std::exception ) override;
+    connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) override;
 
     /**
       * The implementation of this method always returns 0. Override this
       * method, if necessary.
       */
     virtual sal_Int16 SAL_CALL
-    getCapabilities()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getCapabilities() override;
 
 };
 
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 5b397d6603f9..8474cf100433 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -143,8 +143,7 @@ public:
     virtual ~ResultSetMetaData() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -152,11 +151,9 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
 
     // XResultSetMetaData
 
@@ -166,9 +163,7 @@ public:
       * @return the length of the property sequence.
       */
     virtual sal_Int32 SAL_CALL
-    getColumnCount()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getColumnCount() override;
     /**
       * Checks whether column is automatically numbered, which makes it
       * read-only.
@@ -178,9 +173,7 @@ public:
       * @return true, if column is automatically numbered.
       */
     virtual sal_Bool SAL_CALL
-    isAutoIncrement( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isAutoIncrement( sal_Int32 column ) override;
     /**
       * Checks whether column is case sensitive.
       *
@@ -189,9 +182,7 @@ public:
       * @return true, if column is case sensitive.
       */
     virtual sal_Bool SAL_CALL
-    isCaseSensitive( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isCaseSensitive( sal_Int32 column ) override;
     /**
       * Checks whether the value stored in column can be used in a
       * WHERE clause.
@@ -201,9 +192,7 @@ public:
       * @return true, if the column is searchable.
       */
     virtual sal_Bool SAL_CALL
-    isSearchable( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isSearchable( sal_Int32 column ) override;
     /**
       * Checks whether column is a cash value.
       *
@@ -212,9 +201,7 @@ public:
       * @return true, if the column is a cash value.
       */
     virtual sal_Bool SAL_CALL
-    isCurrency( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isCurrency( sal_Int32 column ) override;
     /**
       * Checks whether a NULL can be stored in column.
       *
@@ -226,9 +213,7 @@ public:
       *         can be stored in the column.
       */
     virtual sal_Int32 SAL_CALL
-    isNullable( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isNullable( sal_Int32 column ) override;
     /**
       * Checks whether the value stored in column is a signed number.
       *
@@ -237,9 +222,7 @@ public:
       * @return true, if the value stored in column is a signed number.
       */
     virtual sal_Bool SAL_CALL
-    isSigned( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isSigned( sal_Int32 column ) override;
     /**
       * Gets the normal maximum width in characters for column.
       *
@@ -248,9 +231,7 @@ public:
       * @return the normal maximum width in characters for column.
       */
     virtual sal_Int32 SAL_CALL
-    getColumnDisplaySize( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getColumnDisplaySize( sal_Int32 column ) override;
     /**
       * Gets the suggested column title for column, to be used in print-
       * outs and displays.
@@ -260,9 +241,7 @@ public:
       * @return the column label.
       */
     virtual OUString SAL_CALL
-    getColumnLabel( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getColumnLabel( sal_Int32 column ) override;
     /**
       * Gets the name of column.
       *
@@ -271,9 +250,7 @@ public:
       * @return the name of the property that corresponds to column.
       */
     virtual OUString SAL_CALL
-    getColumnName( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getColumnName( sal_Int32 column ) override;
     /**
       * Gets the schema name for the table from which column of this
       * result set was derived.
@@ -285,9 +262,7 @@ public:
       * @return the schema name of column or an empty string.
       */
     virtual OUString SAL_CALL
-    getSchemaName( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getSchemaName( sal_Int32 column ) override;
     /**
       * For number types, getprecision gets the number of decimal digits
       * in column.
@@ -300,9 +275,7 @@ public:
       * @return the precision for the column.
       */
     virtual sal_Int32 SAL_CALL
-    getPrecision( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getPrecision( sal_Int32 column ) override;
     /**
       * Gets the number of digits to the right of the decimal point for
       * values in column.
@@ -312,9 +285,7 @@ public:
       * @return the scale of the column.
       */
     virtual sal_Int32 SAL_CALL
-    getScale( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getScale( sal_Int32 column ) override;
     /**
       * Gets the name of the table from which column of this result set
       * was derived or "" if there is none (for example, for a join).
@@ -326,9 +297,7 @@ public:
       * @return the table name for column or an empty string.
       */
     virtual OUString SAL_CALL
-    getTableName( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getTableName( sal_Int32 column ) override;
     virtual OUString SAL_CALL
     /**
       * Gets the catalog name for the table from which column of this
@@ -340,9 +309,7 @@ public:
       *         be returned. The first column is 1, the second is 2, ...
       * @return the catalog name for column or an empty string.
       */
-    getCatalogName( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getCatalogName( sal_Int32 column ) override;
     /**
       * Gets the JDBC type for the value stored in column. ... The STRUCT
       * and DISTINCT type codes are always returned for structured and
@@ -355,9 +322,7 @@ public:
       *         from UNO-Type to SQL-Type.
       */
     virtual sal_Int32 SAL_CALL
-    getColumnType( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getColumnType( sal_Int32 column ) override;
     /**
       * Gets the type name used by this particular data source for the
       * values stored in column. If the type code for the type of value
@@ -369,9 +334,7 @@ public:
       * @return the column type name.
       */
     virtual OUString SAL_CALL
-    getColumnTypeName( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getColumnTypeName( sal_Int32 column ) override;
     /**
       * Indicates whether a column is definitely not writable.
       *
@@ -380,9 +343,7 @@ public:
       * @return true, if the column is definetely not writable.
       */
     virtual sal_Bool SAL_CALL
-    isReadOnly( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isReadOnly( sal_Int32 column ) override;
     /**
       * Indicates whether it is possible for a write on the column to succeed.
       *
@@ -391,9 +352,7 @@ public:
       * @return true, if it is possible for a write to succeed.
       */
     virtual sal_Bool SAL_CALL
-    isWritable( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isWritable( sal_Int32 column ) override;
     /**
       * Indicates whether a write on the column will definitely succeed.
       *
@@ -402,9 +361,7 @@ public:
       * @return true, if a write on the column will definetely succeed.
       */
     virtual sal_Bool SAL_CALL
-    isDefinitelyWritable( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isDefinitelyWritable( sal_Int32 column ) override;
     /**
       * Returns the fully-qualified name of the service whose instances
       * are manufactured if the method
@@ -417,9 +374,7 @@ public:
       *         is applicable.
       */
     virtual OUString SAL_CALL
-    getColumnServiceName( sal_Int32 column )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getColumnServiceName( sal_Int32 column ) override;
 };
 
 } // namespace ucbhelper
diff --git a/include/unotools/ZipPackageHelper.hxx b/include/unotools/ZipPackageHelper.hxx
index 5d245bdc38fa..61c77668232f 100644
--- a/include/unotools/ZipPackageHelper.hxx
+++ b/include/unotools/ZipPackageHelper.hxx
@@ -40,13 +40,11 @@ public:
 
     /// @throws css::uno::Exception
     void addFile( css::uno::Reference< css::uno::XInterface >& xRootFolder,
-                  const OUString& rSourceFile )
-        throw( css::uno::Exception, std::exception );
+                  const OUString& rSourceFile );
 
     /// @throws css::uno::Exception
     css::uno::Reference< css::uno::XInterface > addFolder( css::uno::Reference< css::uno::XInterface >& xRootFolder,
-                                                           const OUString& rName )
-        throw( css::uno::Exception, std::exception );
+                                                           const OUString& rName );
 
     void addFolderWithContent( css::uno::Reference< css::uno::XInterface >& xRootFolder,
                                const OUString& rDirURL );
diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx
index 4daa4152da4b..d49e1dbb5ac7 100644
--- a/include/unotools/accessiblerelationsethelper.hxx
+++ b/include/unotools/accessiblerelationsethelper.hxx
@@ -62,8 +62,7 @@ public:
         @return
             Returns the number of relations or zero if there are none.
     */
-    virtual sal_Int32 SAL_CALL getRelationCount(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getRelationCount(  ) override;
 
     /** Returns the relation of this relation set that is specified by
         the given index.
@@ -79,9 +78,7 @@ public:
 
     */
     virtual css::accessibility::AccessibleRelation SAL_CALL
-        getRelation( sal_Int32 nIndex )
-            throw (css::lang::IndexOutOfBoundsException,
-                    css::uno::RuntimeException, std::exception) override;
+        getRelation( sal_Int32 nIndex ) override;
 
     /** Tests whether the relation set contains a relation matching the
         specified key.
@@ -95,8 +92,7 @@ public:
             Returns <TRUE/> if there is a (at least one) relation of the
             given type and <FALSE/> if there is no such relation in the set.
     */
-    virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) override;
 
     /** Retrieve and return the relation with the given relation type.
 
@@ -110,27 +106,23 @@ public:
             type INVALID is returned.
     */
     virtual css::accessibility::AccessibleRelation SAL_CALL
-        getRelationByType( sal_Int16 aRelationType )
-            throw (css::uno::RuntimeException, std::exception) override;
+        getRelationByType( sal_Int16 aRelationType ) override;
 
     /// @throws uno::RuntimeException
     void AddRelation(
-        const css::accessibility::AccessibleRelation& rRelation)
-            throw (css::uno::RuntimeException);
+        const css::accessibility::AccessibleRelation& rRelation);
 
     //=====  XTypeProvider  ===================================================
 
     /** Returns a sequence of all supported interfaces.
     */
     virtual css::uno::Sequence< css::uno::Type> SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 protected:
     /// Mutex guarding this object.
diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx
index 34133bebb888..a9cd22b9e282 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
@@ -74,8 +74,7 @@ public:
             Returns <TRUE/> if there is no state in this state set and
             <FALSE/> if there is at least one state set in it.
     */
-    virtual sal_Bool SAL_CALL isEmpty ()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isEmpty () override;
 
     /** Checks if the given state is a member of the state set of this
         object.
@@ -88,8 +87,7 @@ public:
             Returns <TRUE/> if the given state is a member of this object's
             state set and <FALSE/> otherwise.
     */
-    virtual sal_Bool SAL_CALL contains (sal_Int16 aState)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL contains (sal_Int16 aState) override;
 
     /** Checks if all of the given states are in this object's state
         set.
@@ -107,41 +105,35 @@ public:
             object's state set.
     */
     virtual sal_Bool SAL_CALL containsAll (
-        const css::uno::Sequence<sal_Int16>& rStateSet)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<sal_Int16>& rStateSet) override;
 
     /** Returns a sequence of all states.
     */
-    virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() override;
 
     /** Adds a state to the set.
 
         @throws css::uno::RuntimeException
     */
-    void    AddState(sal_Int16 aState)
-        throw (css::uno::RuntimeException);
+    void    AddState(sal_Int16 aState);
 
     /** Removes a state from the set if the set contains the state, otherwise nothing is done.
 
         @throws css::uno::RuntimeException
     */
-    void    RemoveState(sal_Int16 aState)
-        throw (css::uno::RuntimeException);
+    void    RemoveState(sal_Int16 aState);
 
     //=====  XTypeProvider  ===================================================
 
     /** Returns a sequence of all supported interfaces.
     */
     virtual css::uno::Sequence< css::uno::Type> SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 protected:
     /// Mutex guarding this object.
diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx
index a7fa9fd854cb..4a855994f552 100644
--- a/include/unotools/eventcfg.hxx
+++ b/include/unotools/eventcfg.hxx
@@ -70,13 +70,13 @@ class UNOTOOLS_DLLPUBLIC GlobalEventConfig:
         virtual ~GlobalEventConfig( ) override;
         static ::osl::Mutex& GetOwnStaticMutex();
 
-        css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw (css::uno::RuntimeException, std::exception) override;
-        void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-        sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-        css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) override;
+        void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
+        css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+        css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
+        css::uno::Type SAL_CALL getElementType(  ) override;
+        sal_Bool SAL_CALL hasElements(  ) override;
         static OUString GetEventName( GlobalEventId nID );
 
     private:
diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx
index 26f68cc6f855..9b0972b79050 100644
--- a/include/unotools/mediadescriptor.hxx
+++ b/include/unotools/mediadescriptor.hxx
@@ -282,7 +282,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap
          */
         SAL_DLLPRIVATE bool impl_openStreamWithPostData(
             const css::uno::Reference< css::io::XInputStream >& _rxPostData
-            )   throw(css::uno::RuntimeException);
+            );
 
         /** @short  tries to open a stream by using the given URL.
 
@@ -308,7 +308,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap
         SAL_DLLPRIVATE bool impl_openStreamWithURL(
             const OUString& sURL,
             bool bLockFile
-            ) throw(css::uno::RuntimeException);
+            );
 
         /** @short  it checks if the descriptor already has a valid
                     InputStream item and creates a new one, if not.
diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx
index 8ed4b7815d1f..35f71eddc71f 100644
--- a/include/unotools/progresshandlerwrap.hxx
+++ b/include/unotools/progresshandlerwrap.hxx
@@ -36,12 +36,9 @@ public:
     ProgressHandlerWrap( css::uno::Reference< css::task::XStatusIndicator > const & xSI );
 
     // XProgressHandler
-    virtual void SAL_CALL push( const css::uno::Any& Status )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL update( const css::uno::Any& Status )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL pop()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL push( const css::uno::Any& Status ) override;
+    virtual void SAL_CALL update( const css::uno::Any& Status ) override;
+    virtual void SAL_CALL pop() override;
 };
 
 }   // namespace utl
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx
index a98a682f8580..b6b573d1c66a 100644
--- a/include/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
@@ -53,15 +53,15 @@ public:
         ,m_nAvailable(_nAvailable){}
 
 // css::io::XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available(  ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  ) throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 
-    virtual void SAL_CALL seek( sal_Int64 location ) throw(css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition(  ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength(  ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition(  ) override;
+    virtual sal_Int64 SAL_CALL getLength(  ) override;
 };
 
 }   // namespace utl
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index 037aeee7b0f5..b50b92434fd8 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -56,11 +56,11 @@ public:
     virtual ~OInputStreamWrapper() override;
 
 // css::io::XInputStream
-    virtual sal_Int32   SAL_CALL    readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32   SAL_CALL    readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual void        SAL_CALL    skipBytes(sal_Int32 nBytesToSkip) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32   SAL_CALL    available() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) override;
-    virtual void        SAL_CALL    closeInput() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32   SAL_CALL    readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override;
+    virtual sal_Int32   SAL_CALL    readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override;
+    virtual void        SAL_CALL    skipBytes(sal_Int32 nBytesToSkip) override;
+    virtual sal_Int32   SAL_CALL    available() override;
+    virtual void        SAL_CALL    closeInput() override;
 
 protected:
     /// throws a NotConnectedException if the object is not connected anymore
@@ -86,9 +86,9 @@ public:
     OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner = false);
 
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 _nLocation ) override;
+    virtual sal_Int64 SAL_CALL getPosition(  ) override;
+    virtual sal_Int64 SAL_CALL getLength(  ) override;
 };
 
 //= OOutputStreamWrapper
@@ -102,9 +102,9 @@ protected:
     virtual ~OOutputStreamWrapper() override;
 
 // css::io::XOutputStream
-    virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 
     /// throws an exception according to the error flag of m_pSvStream
     void checkError() const;
@@ -131,14 +131,14 @@ private:
     virtual ~OSeekableOutputStreamWrapper() override;
 
     // disambiguate XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override;
     virtual void SAL_CALL acquire(  ) throw () override;
     virtual void SAL_CALL release(  ) throw () override;
 
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 _nLocation ) override;
+    virtual sal_Int64 SAL_CALL getPosition(  ) override;
+    virtual sal_Int64 SAL_CALL getLength(  ) override;
 };
 
 class UNOTOOLS_DLLPUBLIC OStreamWrapper
@@ -154,14 +154,14 @@ public:
     OStreamWrapper(SvStream& _rStream);
 
 // css::io::XStream
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) override;
 
 // css::io::XOutputStream
-    virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL truncate() throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
+    virtual void SAL_CALL truncate() override;
 };
 
 }
diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx
index 9881090cd783..177bcddc2906 100644
--- a/include/vbahelper/vbaaccesshelper.hxx
+++ b/include/vbahelper/vbaaccesshelper.hxx
@@ -53,7 +53,7 @@ namespace ooo
         }
 
         /// @throws css::uno::Exception
-        inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::Exception)
+        inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs )
         {
             OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" );
             OUString sVarName( OUString::createFromAscii( _pAsciiName ) );
diff --git a/include/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx
index 8743dea2290e..f322098e35de 100644
--- a/include/vbahelper/vbaapplicationbase.hxx
+++ b/include/vbahelper/vbaapplicationbase.hxx
@@ -57,29 +57,29 @@ protected:
     virtual ~VbaApplicationBase() override;
 
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) = 0;
+    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() = 0;
 public:
     // XHelperInterface ( parent is itself )
-    virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override { return this; }
+    virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) override { return this; }
 
-    virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getInteractive() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInteractive( sal_Bool bInteractive ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getVersion() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getVBE() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getScreenUpdating() override;
+    virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) override;
+    virtual sal_Bool SAL_CALL getDisplayStatusBar() override;
+    virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) override;
+    virtual sal_Bool SAL_CALL getInteractive() override;
+    virtual void SAL_CALL setInteractive( sal_Bool bInteractive ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) override;
+    virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) override;
+    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) override;
+    virtual OUString SAL_CALL getVersion() override;
+    virtual css::uno::Any SAL_CALL getVBE() override;
 
-    virtual css::uno::Any SAL_CALL Run( const OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL OnTime( const css::uno::Any& aEarliestTime, const OUString& aFunction, const css::uno::Any& aLatestTime, const css::uno::Any& aSchedule ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL CentimetersToPoints( float Centimeters ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Quit() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Run( const OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) override;
+    virtual void SAL_CALL OnTime( const css::uno::Any& aEarliestTime, const OUString& aFunction, const css::uno::Any& aLatestTime, const css::uno::Any& aSchedule ) override;
+    virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override;
+    virtual void SAL_CALL Undo() override;
+    virtual void SAL_CALL Quit() override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx
index a9f4f861444f..33727621a9ee 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -72,15 +72,15 @@ class VBAHELPER_DLLPUBLIC SimpleIndexAccessToEnumeration : public EnumerationHel
 public:
     /// @throws css::uno::RuntimeException
     explicit SimpleIndexAccessToEnumeration(
-            const css::uno::Reference< css::container::XIndexAccess >& rxIndexAccess ) throw (css::uno::RuntimeException) :
+            const css::uno::Reference< css::container::XIndexAccess >& rxIndexAccess ) :
         mxIndexAccess( rxIndexAccess ), mnIndex( 0 ) {}
 
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements() override
     {
         return mnIndex < mxIndexAccess->getCount();
     }
 
-    virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL nextElement() override
     {
         if( !hasMoreElements() )
             throw css::container::NoSuchElementException();
@@ -105,15 +105,15 @@ class VBAHELPER_DLLPUBLIC SimpleEnumerationBase : public EnumerationHelper_BASE
 public:
     /// @throws css::uno::RuntimeException
     explicit SimpleEnumerationBase(
-            const css::uno::Reference< css::container::XIndexAccess >& rxIndexAccess ) throw (css::uno::RuntimeException) :
+            const css::uno::Reference< css::container::XIndexAccess >& rxIndexAccess ) :
         mxEnumeration( new SimpleIndexAccessToEnumeration( rxIndexAccess ) ) {}
 
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements() override
     {
         return mxEnumeration->hasMoreElements();
     }
 
-    virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL nextElement() override
     {
         return createCollectionObject( mxEnumeration->nextElement() );
     }
@@ -136,8 +136,8 @@ protected:
     css::uno::Reference< css::container::XEnumeration > m_xEnumeration;
 public:
     /// @throws css::uno::RuntimeException
-    EnumerationHelperImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ),  m_xEnumeration( xEnumeration ) { }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException, std::exception) override { return m_xEnumeration->hasMoreElements(); }
+    EnumerationHelperImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) : m_xParent( xParent ), m_xContext( xContext ),  m_xEnumeration( xEnumeration ) { }
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override { return m_xEnumeration->hasMoreElements(); }
 };
 
 // a wrapper class for a providing a XIndexAccess, XNameAccess, XEnumerationAccess impl based on providing a vector of interfaces
@@ -160,12 +160,12 @@ private:
     public:
             XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {}
 
-            virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException, std::exception) override
+            virtual sal_Bool SAL_CALL hasMoreElements(  ) override
             {
             return ( mIt != mXNamedVec.end() );
             }
 
-            virtual css::uno::Any SAL_CALL nextElement(  ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+            virtual css::uno::Any SAL_CALL nextElement(  ) override
             {
                     if ( hasMoreElements() )
                 return css::uno::makeAny( *mIt++ );
@@ -179,16 +179,16 @@ protected:
 public:
     XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), cachePos(mXNamedVec.begin()) {}
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override { return cppu::UnoType< OneIfc >::get(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override { return ( mXNamedVec.size() > 0 ); }
+    virtual css::uno::Type SAL_CALL getElementType(  ) override { return cppu::UnoType< OneIfc >::get(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return ( mXNamedVec.size() > 0 ); }
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName(aName) )
             throw css::container::NoSuchElementException();
         return css::uno::makeAny( *cachePos );
     }
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         css::uno::Sequence< OUString > sNames( mXNamedVec.size() );
         OUString* pString = sNames.getArray();
@@ -202,7 +202,7 @@ public:
         }
         return sNames;
     }
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         cachePos = mXNamedVec.begin();
         typename XNamedVec::iterator it_end = mXNamedVec.end();
@@ -216,8 +216,8 @@ public:
     }
 
     // XElementAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override { return mXNamedVec.size(); }
-    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override { return mXNamedVec.size(); }
+    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw css::lang::IndexOutOfBoundsException();
@@ -226,7 +226,7 @@ public:
 
     }
     // XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new XNamedEnumerationHelper( mXNamedVec );
     }
@@ -243,7 +243,7 @@ protected:
     bool mbIgnoreCase;
 
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException)
+    virtual css::uno::Any getItemByStringIndex( const OUString& sIndex )
     {
         if ( !m_xNameAccess.is() )
             throw css::uno::RuntimeException("ScVbaCollectionBase string index access not supported by this object" );
@@ -265,7 +265,7 @@ protected:
 
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IndexOutOfBoundsException
-    virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException)
+    virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex )
     {
         if ( !m_xIndexAccess.is() )
             throw css::uno::RuntimeException("ScVbaCollectionBase numeric index access not supported by this object" );
@@ -289,13 +289,12 @@ public:
     ScVbaCollectionBase( const css::uno::Reference< ov::XHelperInterface >& xParent,   const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, bool bIgnoreCase = false ) : BaseColBase( xParent, xContext ), m_xIndexAccess( xIndexAccess ), mbIgnoreCase( bIgnoreCase ) { m_xNameAccess.set(m_xIndexAccess, css::uno::UNO_QUERY); }
 
     //XCollection
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override
+    virtual ::sal_Int32 SAL_CALL getCount() override
     {
         return m_xIndexAccess->getCount();
     }
 
-    virtual css::uno::Any SAL_CALL Item(const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/)
-         throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, css::uno::RuntimeException) override
+    virtual css::uno::Any SAL_CALL Item(const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/) override
     {
         if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING )
         {
@@ -314,17 +313,17 @@ public:
     }
 
     // XDefaultMethod
-    OUString SAL_CALL getDefaultMethodName(  ) throw (css::uno::RuntimeException) override
+    OUString SAL_CALL getDefaultMethodName(  ) override
     {
         return OUString("Item");
     }
     // XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override = 0;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override = 0;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override = 0;
+    virtual css::uno::Type SAL_CALL getElementType() override = 0;
     // XElementAccess
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException) override
+    virtual sal_Bool SAL_CALL hasElements() override
     {
         return ( m_xIndexAccess->getCount() > 0 );
     }
@@ -340,7 +339,7 @@ class VBAHELPER_DLLPUBLIC ScVbaCollectionBaseImpl : public CollImplBase
 {
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface > & xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : CollImplBase( xParent, xContext, xIndexAccess){}
+    ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface > & xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) : CollImplBase( xParent, xContext, xIndexAccess){}
 
 };
 
@@ -351,7 +350,7 @@ typedef ScVbaCollectionBase< ::cppu::WeakImplHelper< Ifc... >  > ImplBase;
 
 public:
     /// @throws css::uno::RuntimeException
-    CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,  const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, bool bIgnoreCase = false ) throw( css::uno::RuntimeException ) : ImplBase( xParent, xContext, xIndexAccess, bIgnoreCase ) {}
+    CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,  const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, bool bIgnoreCase = false ) : ImplBase( xParent, xContext, xIndexAccess, bIgnoreCase ) {}
 };
 
 
diff --git a/include/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx
index 81ef6613dc0d..c1f368293eba 100644
--- a/include/vbahelper/vbadialogbase.hxx
+++ b/include/vbahelper/vbadialogbase.hxx
@@ -52,7 +52,7 @@ public:
     virtual ~VbaDialogBase() override {}
 
     // Methods
-    virtual void SAL_CALL Show() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Show() override;
     virtual OUString mapIndexToName( sal_Int32 nIndex ) = 0;
 };
 
diff --git a/include/vbahelper/vbadialogsbase.hxx b/include/vbahelper/vbadialogsbase.hxx
index 5fc8255a6156..e5e13d169449 100644
--- a/include/vbahelper/vbadialogsbase.hxx
+++ b/include/vbahelper/vbadialogsbase.hxx
@@ -51,8 +51,8 @@ public:
     virtual ~VbaDialogsBase() override {}
 
     // XCollection
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) override;
 };
 
 #endif // INCLUDED_VBAHELPER_VBADIALOGSBASE_HXX
diff --git a/include/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx
index 00e8b55fdf84..7978ccc2f3df 100644
--- a/include/vbahelper/vbadocumentbase.hxx
+++ b/include/vbahelper/vbadocumentbase.hxx
@@ -59,22 +59,22 @@ public:
     virtual ~VbaDocumentBase() override {}
 
     // Attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getFullName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getVBProject() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual OUString SAL_CALL getPath() override;
+    virtual OUString SAL_CALL getFullName() override;
+    virtual sal_Bool SAL_CALL getSaved() override;
+    virtual void SAL_CALL setSaved( sal_Bool bSave ) override;
+    virtual css::uno::Any SAL_CALL getVBProject() override;
 
     // Methods
     virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges,
                                  const css::uno::Any &aFileName,
-                                 const css::uno::Any &bRouteWorkbook ) throw (css::uno::RuntimeException, std::exception) override;
+                                 const css::uno::Any &bRouteWorkbook ) override;
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL Protect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException);
-    virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Save() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Protect( const css::uno::Any &aPassword );
+    virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) override;
+    virtual void SAL_CALL Save() override;
+    virtual void SAL_CALL Activate() override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/include/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx
index 92036f3bd465..5ca030bf8855 100644
--- a/include/vbahelper/vbadocumentsbase.hxx
+++ b/include/vbahelper/vbadocumentsbase.hxx
@@ -60,21 +60,21 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    VbaDocumentsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, DOCUMENT_TYPE eDocType ) throw (css::uno::RuntimeException);
+    VbaDocumentsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, DOCUMENT_TYPE eDocType );
     virtual ~VbaDocumentsBase() override {}
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override = 0;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override = 0;
+    virtual css::uno::Type SAL_CALL getElementType() override = 0;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override = 0;
 
     // VbaDocumentsBase_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override = 0;
 
 protected:
     /// @throws css::uno::RuntimeException
-    css::uno::Any createDocument() throw (css::uno::RuntimeException, std::exception);
+    css::uno::Any createDocument();
     /// @throws css::uno::RuntimeException
-    css::uno::Any openDocument( const OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps ) throw (css::uno::RuntimeException);
+    css::uno::Any openDocument( const OUString& Filename, const css::uno::Any& ReadOnly, const css::uno::Sequence< css::beans::PropertyValue >& rProps );
 };
 
 #endif /* SC_ INCLUDED_VBAHELPER_VBADOCUMENTSBASE_HXX */
diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx
index 5194d07f186e..570a8d2a7a3d 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -66,20 +66,19 @@ public:
     virtual ~VbaEventsHelperBase() override;
 
     // script::vba::XVBAEventProcessor
-    virtual sal_Bool SAL_CALL hasVbaEventHandler( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL processVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::util::VetoException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasVbaEventHandler( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) override;
+    virtual sal_Bool SAL_CALL processVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) override;
 
     // document::XEventListener
-    virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) override;
 
     // util::XChangesListener
-    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& rEvent ) override;
 
     // 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;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
     // little helpers ---------------------------------------------------------
 
@@ -87,12 +86,12 @@ public:
     void processVbaEventNoThrow( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs );
 
     /** @throws css::lang::IllegalArgumentException if the passed sequence does not contain a value at the specified index. */
-    static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+    static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex )
         { if( (nIndex < 0) || (nIndex >= rArgs.getLength()) ) throw css::lang::IllegalArgumentException(); }
 
     /** @throws css::lang::IllegalArgumentException if the passed sequence does not contain a value of a specific at the specified index. */
     template< typename Type >
-    static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
+    static inline void checkArgumentType( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex )
         { checkArgument( rArgs, nIndex ); if( !rArgs[ nIndex ].has< Type >() ) throw css::lang::IllegalArgumentException(); }
 
 protected:
@@ -139,7 +138,7 @@ protected:
     virtual bool implPrepareEvent(
         EventQueue& rEventQueue,
         const EventHandlerInfo& rInfo,
-        const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) = 0;
+        const css::uno::Sequence< css::uno::Any >& rArgs ) = 0;
 
     /** Derived classes have to return the argument list for the specified VBA event handler.
 
@@ -148,7 +147,7 @@ protected:
     */
     virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList(
         const EventHandlerInfo& rInfo,
-        const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) = 0;
+        const css::uno::Sequence< css::uno::Any >& rArgs ) = 0;
 
     /** Derived classes may do additional postprocessing. Called even if the
         event handler does not exist, or if an error occurred during execution.
@@ -158,7 +157,7 @@ protected:
     virtual void implPostProcessEvent(
         EventQueue& rEventQueue,
         const EventHandlerInfo& rInfo,
-        bool bCancel ) throw (css::uno::RuntimeException) = 0;
+        bool bCancel ) = 0;
 
     /** Derived classes have to return the name of the Basic document module.
 
@@ -167,9 +166,7 @@ protected:
     */
     virtual OUString implGetDocumentModuleName(
         const EventHandlerInfo& rInfo,
-        const css::uno::Sequence< css::uno::Any >& rArgs ) const
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException) = 0;
+        const css::uno::Sequence< css::uno::Any >& rArgs ) const = 0;
 
 private:
     typedef ::std::map< sal_Int32, OUString > ModulePathMap;
@@ -184,7 +181,7 @@ private:
 
         @throws css::lang::IllegalArgumentException
     */
-    const EventHandlerInfo& getEventHandlerInfo( sal_Int32 nEventId ) const throw (css::lang::IllegalArgumentException);
+    const EventHandlerInfo& getEventHandlerInfo( sal_Int32 nEventId ) const;
 
     /** Searches the event handler in the document and returns its full script path.
 
@@ -194,25 +191,25 @@ private:
     */
     OUString getEventHandlerPath(
         const EventHandlerInfo& rInfo,
-        const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+        const css::uno::Sequence< css::uno::Any >& rArgs );
 
     /** On first call, accesses the Basic library containing the VBA source code.
 
         @throws css::uno::RuntimeException
     */
-    void ensureVBALibrary() throw (css::uno::RuntimeException);
+    void ensureVBALibrary();
 
     /** Returns the type of the Basic module with the specified name.
 
         @throws css::uno::RuntimeException
     */
-    sal_Int32 getModuleType( const OUString& rModuleName ) throw (css::uno::RuntimeException);
+    sal_Int32 getModuleType( const OUString& rModuleName );
 
     /** Updates the map containing paths to event handlers for a Basic module.
 
         @throws css::uno::RuntimeException
     */
-    ModulePathMap& updateModulePathMap( const OUString& rModuleName ) throw (css::uno::RuntimeException, std::exception);
+    ModulePathMap& updateModulePathMap( const OUString& rModuleName );
 
 protected:
     css::uno::Reference< css::frame::XModel > mxModel;
diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx
index 5e452e924f7d..8ea5195f55c7 100644
--- a/include/vbahelper/vbafontbase.hxx
+++ b/include/vbahelper/vbafontbase.hxx
@@ -79,32 +79,32 @@ public:
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const css::uno::Reference< css::container::XIndexAccess >& xPalette,
         const css::uno::Reference< css::beans::XPropertySet >& xPropertySet,
-        bool bFormControl = false ) throw ( css::uno::RuntimeException );
+        bool bFormControl = false );
     virtual ~VbaFontBase() override;// {}
 
     // Attributes
-    virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::uno::Any& _size ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBold( const css::uno::Any& _bold ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) override = 0;
-    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) override = 0;
-    virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStrikethrough( const css::uno::Any& _strikethrough ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShadow( const css::uno::Any& _shadow ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setItalic( const css::uno::Any& _italic ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const css::uno::Any& _name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::uno::Any& _size ) override;
+    virtual css::uno::Any SAL_CALL getColorIndex() override;
+    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override;
+    virtual css::uno::Any SAL_CALL getBold() override;
+    virtual void SAL_CALL setBold( const css::uno::Any& _bold ) override;
+    virtual css::uno::Any SAL_CALL getUnderline() override = 0;
+    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) override = 0;
+    virtual css::uno::Any SAL_CALL getStrikethrough() override;
+    virtual void SAL_CALL setStrikethrough( const css::uno::Any& _strikethrough ) override;
+    virtual css::uno::Any SAL_CALL getShadow() override;
+    virtual void SAL_CALL setShadow( const css::uno::Any& _shadow ) override;
+    virtual css::uno::Any SAL_CALL getItalic() override;
+    virtual void SAL_CALL setItalic( const css::uno::Any& _italic ) override;
+    virtual css::uno::Any SAL_CALL getSubscript() override;
+    virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) override;
+    virtual css::uno::Any SAL_CALL getSuperscript() override;
+    virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) override;
+    virtual css::uno::Any SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const css::uno::Any& _name ) override;
+    virtual css::uno::Any SAL_CALL getColor() override ;
+    virtual void SAL_CALL setColor( const css::uno::Any& _color ) override ;
 };
 
 #endif
diff --git a/include/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx
index 6f0de82796a6..9390f42d040a 100644
--- a/include/vbahelper/vbaglobalbase.hxx
+++ b/include/vbahelper/vbaglobalbase.hxx
@@ -57,9 +57,9 @@ public:
     VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& sDocCtxName );
     virtual ~VbaGlobalsBase() override;
     // XMultiServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
 };
 #endif
 
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index e24e1e70752e..2f27dc88f0a2 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -58,7 +58,7 @@ namespace ooo
     {
         /// @throws css::lang::IllegalArgumentException
         template < class T >
-        css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException)
+        css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true )
         {
             if ( args.getLength() < ( nPos + 1) )
                 throw css::lang::IllegalArgumentException();
@@ -74,23 +74,23 @@ namespace ooo
         VBAHELPER_DLLPUBLIC css::uno::Reference< XHelperInterface > getVBADocument( const css::uno::Reference< css::frame::XModel >& xModel );
         VBAHELPER_DLLPUBLIC css::uno::Reference< XHelperInterface > getUnoDocModule( const OUString& aModName, SfxObjectShell* pShell );
         /// @throws css::uno::RuntimeException
-        VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel );
 
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::frame::XModel > getCurrentDoc( const OUString& sKey ) throw (css::uno::RuntimeException);
+        css::uno::Reference< css::frame::XModel > getCurrentDoc( const OUString& sKey );
         /// @throws css::uno::RuntimeException
-        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getThisExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getThisExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext );
         /// @throws css::uno::RuntimeException
-        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getThisWordDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getThisWordDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext );
         /// @throws css::uno::RuntimeException
-        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext );
         /// @throws css::uno::RuntimeException
-        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentWordDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentWordDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
         /// @throws css::uno::RuntimeException
-        VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject );
         /// @throws css::uno::RuntimeException
-        VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > const & getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > const & getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
         VBAHELPER_DLLPUBLIC void dispatchRequests( const css::uno::Reference< css::frame::XModel>& xModel, const OUString& aUrl );
         VBAHELPER_DLLPUBLIC void dispatchRequests (const css::uno::Reference< css::frame::XModel>& xModel, const OUString & aUrl, const css::uno::Sequence< css::beans::PropertyValue >& sProps );
@@ -109,18 +109,18 @@ namespace ooo
 
         /** Extracts a boolean value from the passed Any, which may contain a Boolean or an integer or floating-point value.
             @throws css::uno::RuntimeException if the Any is empty or contains an incompatible type. */
-        VBAHELPER_DLLPUBLIC bool extractBoolFromAny( const css::uno::Any& rAny ) throw (css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC bool extractBoolFromAny( const css::uno::Any& rAny );
 
         /** Extracts a string from the passed Any, which may contain a Boolean, a value, or a string.
             @throws css::uno::RuntimeException if the Any is empty or contains an incompatible type. */
-        VBAHELPER_DLLPUBLIC OUString extractStringFromAny( const css::uno::Any& rAny, bool bUppercaseBool = false ) throw (css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC OUString extractStringFromAny( const css::uno::Any& rAny, bool bUppercaseBool = false );
         /** Extracts a string from the passed Any, which may contain a Boolean, a value, or a string.
             Returns rDefault, if rAny is empty.
             @throws css::uno::RuntimeException if the Any contains an incompatible type. */
-        VBAHELPER_DLLPUBLIC OUString extractStringFromAny( const css::uno::Any& rAny, const OUString& rDefault, bool bUppercaseBool ) throw (css::uno::RuntimeException);
+        VBAHELPER_DLLPUBLIC OUString extractStringFromAny( const css::uno::Any& rAny, const OUString& rDefault, bool bUppercaseBool );
 
         /// @throws css::uno::RuntimeException
-        VBAHELPER_DLLPUBLIC OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
+        VBAHELPER_DLLPUBLIC OUString getAnyAsString( const css::uno::Any& pvargItem );
         VBAHELPER_DLLPUBLIC OUString VBAToRegexp(const OUString &rIn); // needs to be in an uno service ( already this code is duplicated in basic )
         VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( const css::uno::Reference< css::awt::XDevice >& xDevice, bool bVertical);
         VBAHELPER_DLLPUBLIC double PointsToPixels( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, bool bVertical);
@@ -130,7 +130,7 @@ namespace ooo
         VBAHELPER_DLLPUBLIC PointerStyle getPointerStyle( const css::uno::Reference< css::frame::XModel >& );
         VBAHELPER_DLLPUBLIC void setCursorHelper( const css::uno::Reference< css::frame::XModel >& xModel, const Pointer& rPointer, bool bOverWrite );
         /// @throws css::uno::RuntimeException
-        VBAHELPER_DLLPUBLIC void setDefaultPropByIntrospection( const css::uno::Any& aObj, const css::uno::Any& aValue  ) throw ( css::uno::RuntimeException );
+        VBAHELPER_DLLPUBLIC void setDefaultPropByIntrospection( const css::uno::Any& aObj, const css::uno::Any& aValue  );
         VBAHELPER_DLLPUBLIC css::uno::Any getPropertyValue( const css::uno::Sequence< css::beans::PropertyValue >& aProp, const OUString& aName );
         VBAHELPER_DLLPUBLIC bool setPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const OUString& aName, const css::uno::Any& aValue );
         VBAHELPER_DLLPUBLIC void setOrAppendPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const OUString& aName, const css::uno::Any& aValue );
@@ -180,8 +180,7 @@ protected:
 public:
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape)
-        throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape);
 
     double getHeight() const;
     void setHeight(double _fheight);
@@ -263,16 +262,16 @@ class VBAHELPER_DLLPUBLIC DebugHelper
 {
 public:
     /// @throws css::script::BasicErrorException
-    static void basicexception( const OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException );
+    static void basicexception( const OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const OUString& /*additionalArgument*/ );
 
     /// @throws css::script::BasicErrorException
-    static void basicexception( int err,  const OUString& additionalArgument ) throw( css::script::BasicErrorException );
+    static void basicexception( int err,  const OUString& additionalArgument );
 
     /// @throws css::script::BasicErrorException
-    static void basicexception( const css::uno::Exception& ex ) throw( css::script::BasicErrorException );
+    static void basicexception( const css::uno::Exception& ex );
 
     /// @throws css::script::BasicErrorException
-    static void runtimeexception( int err,  const OUString& additionalArgument ) throw( css::uno::RuntimeException );
+    static void runtimeexception( int err,  const OUString& additionalArgument );
 };
 
     } // vba
diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx
index 39a460b7c5ee..458cbb9e13a8 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -75,13 +75,13 @@ public:
     virtual css::uno::Sequence<OUString> getServiceNames() = 0;
 
     // XHelperInterface Methods
-    virtual ::sal_Int32 SAL_CALL getCreator() throw (css::script::BasicErrorException, css::uno::RuntimeException) override
+    virtual ::sal_Int32 SAL_CALL getCreator() override
     {
         return 0x53756E4F;
     }
-    virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override { return mxParent; }
+    virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent(  ) override { return mxParent; }
 
-    virtual css::uno::Any SAL_CALL Application(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override {
+    virtual css::uno::Any SAL_CALL Application(  ) override {
             // The application could certainly be passed around in the context - seems
             // to make sense
             css::uno::Reference< css::container::XNameAccess > xNameAccess( mxContext, css::uno::UNO_QUERY_THROW );
@@ -89,8 +89,8 @@ public:
     }
 
     // XServiceInfo Methods
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException) override { return getServiceImplName(); }
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override
+    virtual OUString SAL_CALL getImplementationName(  ) override { return getServiceImplName(); }
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override
     {
         css::uno::Sequence< OUString > sServices = getSupportedServiceNames();
         const OUString* pStart = sServices.getConstArray();
@@ -100,7 +100,7 @@ public:
                 return true;
         return false;
     }
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override
     {
         css::uno::Sequence< OUString > aNames = getServiceNames();
         return aNames;
diff --git a/include/vbahelper/vbapagesetupbase.hxx b/include/vbahelper/vbapagesetupbase.hxx
index d052590929ce..ce921b9fa1a1 100644
--- a/include/vbahelper/vbapagesetupbase.hxx
+++ b/include/vbahelper/vbapagesetupbase.hxx
@@ -51,29 +51,29 @@ protected:
 
     /// @throws css::uno::RuntimeException
     VbaPageSetupBase( const css::uno::Reference< ov::XHelperInterface >& xParent,
-                    const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
+                    const css::uno::Reference< css::uno::XComponentContext >& xContext );
 public:
     virtual ~VbaPageSetupBase() override {}
 
     // Attribute
-    virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTopMargin( double margin ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getBottomMargin() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBottomMargin( double margin ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getRightMargin() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRightMargin( double margin ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getLeftMargin() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeftMargin( double margin ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getTopMargin() override;
+    virtual void SAL_CALL setTopMargin( double margin ) override;
+    virtual double SAL_CALL getBottomMargin() override;
+    virtual void SAL_CALL setBottomMargin( double margin ) override;
+    virtual double SAL_CALL getRightMargin() override;
+    virtual void SAL_CALL setRightMargin( double margin ) override;
+    virtual double SAL_CALL getLeftMargin() override;
+    virtual void SAL_CALL setLeftMargin( double margin ) override;
     /// @throws css::uno::RuntimeException
-    virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException);
+    virtual double SAL_CALL getHeaderMargin();
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL setHeaderMargin( double margin );
     /// @throws css::uno::RuntimeException
-    virtual double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException);
+    virtual double SAL_CALL getFooterMargin();
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException);
-    virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFooterMargin( double margin );
+    virtual sal_Int32 SAL_CALL getOrientation() override;
+    virtual void SAL_CALL setOrientation( sal_Int32 orientation ) override;
 };
 #endif
 
diff --git a/include/vbahelper/vbapropvalue.hxx b/include/vbahelper/vbapropvalue.hxx
index d420c77ef10a..23d9d3e743aa 100644
--- a/include/vbahelper/vbapropvalue.hxx
+++ b/include/vbahelper/vbapropvalue.hxx
@@ -50,10 +50,10 @@ public:
     ScVbaPropValue( PropListener* pListener );
 
     // Attributes
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
 
-    OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName() override { return OUString("Value"); }
 
 };
 #endif //SC_VBA_PROPVALULE_HXX
diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx
index b98e8296d284..47d74bc51530 100644
--- a/include/vbahelper/vbareturntypes.hxx
+++ b/include/vbahelper/vbareturntypes.hxx
@@ -37,9 +37,9 @@ namespace ooo
             T1 mnValue;
             public:
             DefaultReturnHelper( const T1& nValue ) : mnValue( nValue ) {}
-            virtual void  SAL_CALL setValue( T1 nValue ) throw (css::uno::RuntimeException) SAL_OVERRIDE { mnValue = nValue; }
-            virtual T1  SAL_CALL getValue() throw (css::uno::RuntimeException) SAL_OVERRIDE { return mnValue; }
-            OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) SAL_OVERRIDE { return OUString("Value"); }
+            virtual void  SAL_CALL setValue( T1 nValue ) SAL_OVERRIDE { mnValue = nValue; }
+            virtual T1  SAL_CALL getValue() SAL_OVERRIDE { return mnValue; }
+            OUString SAL_CALL getDefaultPropertyName(  ) SAL_OVERRIDE { return OUString("Value"); }
         };
 
         typedef DefaultReturnHelper< sal_Int32, ov::msforms::XReturnInteger > ReturnInteger_BASE;
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 8ded06cb573d..17f459fa4ad6 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -69,72 +69,67 @@ protected:
     css::uno::Any m_aRange;
     void addListeners();
     /// @throws css::uno::RuntimeException
-    void removeShapeListener() throw( css::uno::RuntimeException );
+    void removeShapeListener();
     /// @throws css::uno::RuntimeException
-    void removeShapesListener() throw( css::uno::RuntimeException );
+    void removeShapesListener();
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType );
     virtual ~ScVbaShape() override;
     void setRange( css::uno::Any aRange ) { m_aRange = aRange; };
 
     /// @throws css::uno::RuntimeException
-    static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape >& rShape ) throw (css::uno::RuntimeException);
+    static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape >& rShape );
 
     // Attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAlternativeText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAlternativeText( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeight(double _height)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidth(double _width)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getZOrderPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getRotation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRotation( double _rotation ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XPictureFormat > SAL_CALL getPictureFormat() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLockAspectRatio( sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLockAnchor( sal_Bool _lockanchor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRelativeHorizontalPosition(::sal_Int32 _relativehorizontalposition)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRelativeVerticalPosition(::sal_Int32 _relativeverticalposition)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& _name ) override;
+    virtual OUString SAL_CALL getAlternativeText() override;
+    virtual void SAL_CALL setAlternativeText( const OUString& _name ) override;
+    virtual double SAL_CALL getHeight() override;
+    virtual void SAL_CALL setHeight(double _height) override;
+    virtual double SAL_CALL getWidth() override;
+    virtual void SAL_CALL setWidth(double _width) override;
+    virtual double SAL_CALL getLeft() override;
+    virtual void SAL_CALL setLeft( double _left ) override;
+    virtual double SAL_CALL getTop() override;
+    virtual void SAL_CALL setTop( double _top ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+    virtual sal_Int32 SAL_CALL getZOrderPosition() override;
+    virtual sal_Int32 SAL_CALL getType() override;
+    virtual double SAL_CALL getRotation() override;
+    virtual void SAL_CALL setRotation( double _rotation ) override;
+    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() override;
+    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() override;
+    virtual css::uno::Reference< ov::msforms::XPictureFormat > SAL_CALL getPictureFormat() override;
+    virtual sal_Bool SAL_CALL getLockAspectRatio() override;
+    virtual void SAL_CALL setLockAspectRatio( sal_Bool _lockaspectratio ) override;
+    virtual sal_Bool SAL_CALL getLockAnchor() override;
+    virtual void SAL_CALL setLockAnchor( sal_Bool _lockanchor ) override;
+    virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() override;
+    virtual void SAL_CALL setRelativeHorizontalPosition(::sal_Int32 _relativehorizontalposition) override;
+    virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() override;
+    virtual void SAL_CALL setRelativeVerticalPosition(::sal_Int32 _relativeverticalposition) override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL SAL_CALL TextFrame(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ScaleHeight( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ScaleWidth( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL SAL_CALL TextFrame(  ) override;
+    virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat(  ) override;
+    virtual void SAL_CALL Delete() override;
+    virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) override;
+    virtual void SAL_CALL IncrementRotation( double Increment ) override;
+    virtual void SAL_CALL IncrementLeft( double Increment ) override;
+    virtual void SAL_CALL IncrementTop( double Increment ) override;
+    virtual void SAL_CALL ScaleHeight( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) override;
+    virtual void SAL_CALL ScaleWidth( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) override;
     // Replace??
-    virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL ShapeRange( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL Select( const css::uno::Any& Replace ) override;
+    virtual css::uno::Any SAL_CALL ShapeRange( const css::uno::Any& index ) override;
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) override;
 };
 #endif // INCLUDED_VBAHELPER_VBASHAPE_HXX
 
diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx
index 736f3cfcc2b0..9a6a798c4cb0 100644
--- a/include/vbahelper/vbashaperange.hxx
+++ b/include/vbahelper/vbashaperange.hxx
@@ -61,42 +61,42 @@ protected:
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::drawing::XShapes > const & getShapes() throw (css::uno::RuntimeException) ;
+    css::uno::Reference< css::drawing::XShapes > const & getShapes() ;
 public:
     ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape, const css::uno::Reference< css::frame::XModel >& xModel );
 
     // Methods
-    virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ::ooo::vba::msforms::XShape > SAL_CALL Group() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLockAspectRatio( sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLockAnchor( sal_Bool _lockanchor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL SAL_CALL TextFrame(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Select(  ) override;
+    virtual css::uno::Reference< ::ooo::vba::msforms::XShape > SAL_CALL Group() override;
+    virtual void SAL_CALL IncrementRotation( double Increment ) override;
+    virtual void SAL_CALL IncrementLeft( double Increment ) override ;
+    virtual void SAL_CALL IncrementTop( double Increment ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& _name ) override;
+    virtual double SAL_CALL getHeight() override;
+    virtual void SAL_CALL setHeight( double _height ) override;
+    virtual double SAL_CALL getWidth() override;
+    virtual void SAL_CALL setWidth( double _width ) override;
+    virtual double SAL_CALL getLeft() override;
+    virtual void SAL_CALL setLeft( double _left ) override;
+    virtual double SAL_CALL getTop() override;
+    virtual void SAL_CALL setTop( double _top ) override;
+    virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() override;
+    virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() override;
+    virtual sal_Bool SAL_CALL getLockAspectRatio() override;
+    virtual void SAL_CALL setLockAspectRatio( sal_Bool _lockaspectratio ) override;
+    virtual sal_Bool SAL_CALL getLockAnchor() override;
+    virtual void SAL_CALL setLockAnchor( sal_Bool _lockanchor ) override;
+    virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() override;
+    virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) override;
+    virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() override;
+    virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) override;
+    virtual css::uno::Any SAL_CALL SAL_CALL TextFrame(  ) override;
+    virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat(  ) override;
+    virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) override;
     //XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 };
diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx
index 34d5336dfbaf..118ac007c270 100644
--- a/include/vbahelper/vbashapes.hxx
+++ b/include/vbahelper/vbashapes.hxx
@@ -64,15 +64,15 @@ protected:
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
+    css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index );
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::drawing::XShape > createShape( const OUString& service ) throw (css::uno::RuntimeException);
+    css::uno::Reference< css::drawing::XShape > createShape( const OUString& service );
     /// @throws css::uno::RuntimeException
-    css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, const css::uno::Any& rRange ) throw (css::uno::RuntimeException);
+    css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, const css::uno::Any& rRange );
     /// @throws css::uno::RuntimeException
-    css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, const css::uno::Any& rRange ) throw (css::uno::RuntimeException);
+    css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, const css::uno::Any& rRange );
     /// @throws css::uno::RuntimeException
-    css::uno::Any AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException);
+    css::uno::Any AddTextboxInWriter( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight );
     OUString createName( const OUString& sName );
     //TODO helperapi using a writer document
     //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument );
@@ -80,20 +80,20 @@ protected:
 public:
     ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel );
     /// @throws css::uno::RuntimeException
-    static void setDefaultShapeProperties( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException);
+    static void setDefaultShapeProperties( const css::uno::Reference< css::drawing::XShape >& xShape );
     static void setShape_NameProperty( const css::uno::Reference< css::drawing::XShape >& xShape, const OUString& sName );
     //XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
-    virtual void SAL_CALL SelectAll() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL SelectAll() override;
     //helper::calc
-    virtual css::uno::Any SAL_CALL AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) override;
+    virtual css::uno::Any SAL_CALL AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) override;
+    virtual css::uno::Any SAL_CALL AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) override;
+    virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) override;
     // ScVbaCollectionBaseImpl
-    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 };
 
 #endif // INCLUDED_VBAHELPER_VBASHAPES_HXX
diff --git a/include/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx
index 675a52839c54..4fe32615b638 100644
--- a/include/vbahelper/vbatextframe.hxx
+++ b/include/vbahelper/vbatextframe.hxx
@@ -59,19 +59,19 @@ public:
     VbaTextFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext , css::uno::Reference< css::drawing::XShape > const & xShape);
     virtual ~VbaTextFrame() override {}
     // Attributes
-    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoSize( sal_Bool _autosize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getMarginBottom() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMarginBottom( float _marginbottom ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getMarginTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMarginTop( float _margintop ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getMarginLeft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMarginLeft( float _marginleft ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getMarginRight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMarginRight( float _marginright ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getAutoSize() override;
+    virtual void SAL_CALL setAutoSize( sal_Bool _autosize ) override;
+    virtual float SAL_CALL getMarginBottom() override;
+    virtual void SAL_CALL setMarginBottom( float _marginbottom ) override;
+    virtual float SAL_CALL getMarginTop() override;
+    virtual void SAL_CALL setMarginTop( float _margintop ) override;
+    virtual float SAL_CALL getMarginLeft() override;
+    virtual void SAL_CALL setMarginLeft( float _marginleft ) override;
+    virtual float SAL_CALL getMarginRight() override;
+    virtual void SAL_CALL setMarginRight( float _marginright ) override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL Characters(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Characters(  ) override;
 
 };
 
diff --git a/include/vbahelper/vbawindowbase.hxx b/include/vbahelper/vbawindowbase.hxx
index b91e63f06dd9..64f70b0edf35 100644
--- a/include/vbahelper/vbawindowbase.hxx
+++ b/include/vbahelper/vbawindowbase.hxx
@@ -56,25 +56,23 @@ public:
         const css::uno::Reference< ov::XHelperInterface >& xParent,
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const css::uno::Reference< css::frame::XModel >& xModel,
-        const css::uno::Reference< css::frame::XController >& xController )
-        throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::frame::XController >& xController );
     /// @throws css::uno::RuntimeException
     VbaWindowBase(
         css::uno::Sequence< css::uno::Any > const& aArgs,
-        css::uno::Reference< css::uno::XComponentContext > const& xContext )
-        throw (css::uno::RuntimeException);
+        css::uno::Reference< css::uno::XComponentContext > const& xContext );
 
     // XWindowBase
-    virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override ;
+    virtual sal_Int32 SAL_CALL getHeight() override ;
+    virtual void SAL_CALL setHeight( sal_Int32 _height ) override ;
+    virtual sal_Int32 SAL_CALL getLeft() override ;
+    virtual void SAL_CALL setLeft( sal_Int32 _left ) override ;
+    virtual sal_Int32 SAL_CALL getTop() override ;
+    virtual void SAL_CALL setTop( sal_Int32 _top ) override ;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+    virtual sal_Int32 SAL_CALL getWidth() override ;
+    virtual void SAL_CALL setWidth( sal_Int32 _width ) override ;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
@@ -82,17 +80,17 @@ public:
 
 protected:
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::frame::XController > getController() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::frame::XController > getController();
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::awt::XWindow > getWindow() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::awt::XWindow > getWindow();
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::awt::XWindow2 > getWindow2() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::awt::XWindow2 > getWindow2();
 
     css::uno::Reference< css::frame::XModel > m_xModel;
 
 private:
     /// @throws css::uno::RuntimeException
-    void construct( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException);
+    void construct( const css::uno::Reference< css::frame::XController >& xController );
 
     css::uno::WeakReference< css::frame::XController > m_xController;
     css::uno::WeakReference< css::awt::XWindow > m_xWindow;
diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx
index e9318a733273..57c941c2b8d0 100644
--- a/include/vcl/dndhelp.hxx
+++ b/include/vcl/dndhelp.hxx
@@ -57,33 +57,21 @@ public:
 
     // css::datatransfer::dnd::XDragGestureListener
     /// @throws css::uno::RuntimeException
-    virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge )
-        throw (css::uno::RuntimeException,
-               std::exception);
+    virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge );
 
     // css::datatransfer::dnd::XDragSourceListener
     /// @throws css::uno::RuntimeException
-    virtual void dragDropEnd(const css::datatransfer::dnd::DragSourceDropEvent& dsde )
-        throw (css::uno::RuntimeException,
-               std::exception);
+    virtual void dragDropEnd(const css::datatransfer::dnd::DragSourceDropEvent& dsde );
 
     // css::datatransfer::dnd::XDropTargetListener
     /// @throws css::uno::RuntimeException
-    virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde )
-        throw (css::uno::RuntimeException,
-               std::exception);
+    virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde );
     /// @throws css::uno::RuntimeException
-    virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee )
-        throw (css::uno::RuntimeException,
-               std::exception);
+    virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee );
     /// @throws css::uno::RuntimeException
-    virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte )
-        throw (css::uno::RuntimeException,
-               std::exception);
+    virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte );
     /// @throws css::uno::RuntimeException
-    virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde )
-        throw (css::uno::RuntimeException,
-               std::exception);
+    virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde );
 };
 
 class VCL_DLLPUBLIC DragAndDropWrapper :
@@ -100,29 +88,29 @@ public:
                     virtual ~DragAndDropWrapper() override;
 
     // css::uno::XInterface
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void          SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void          SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::lang::XEventListener
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     // css::datatransfer::dnd::XDragGestureListener
-    void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) override;
 
     // css::datatransfer::dnd::XDragSourceListener
-    void SAL_CALL dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dragExit( const css::datatransfer::dnd::DragSourceEvent& dse ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dragOver( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) override;
+    void SAL_CALL dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) override;
+    void SAL_CALL dragExit( const css::datatransfer::dnd::DragSourceEvent& dse ) override;
+    void SAL_CALL dragOver( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) override;
+    void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) override;
 
     // css::datatransfer::dnd::XDropTargetListener
-    void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) override;
+    void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override;
+    void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) override;
+    void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override;
+    void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override;
 };
 
 }}  // namespace vcl::unohelper
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 76aadfe83863..e0a0c91ee2a2 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -144,18 +144,12 @@ protected:
     using vcl::unohelper::DragAndDropClient::dragEnter;
     using vcl::unohelper::DragAndDropClient::dragExit;
     using vcl::unohelper::DragAndDropClient::dragOver;
-    virtual void dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& dge)
-                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void dragDropEnd(const css::datatransfer::dnd::DragSourceDropEvent& dsde)
-                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde)
-                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void dragEnter(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee)
-                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void dragExit(const css::datatransfer::dnd::DropTargetEvent& dte)
-                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde)
-                    throw (css::uno::RuntimeException, std::exception) override;
+    virtual void dragGestureRecognized(const css::datatransfer::dnd::DragGestureEvent& dge) override;
+    virtual void dragDropEnd(const css::datatransfer::dnd::DragSourceDropEvent& dsde) override;
+    virtual void drop(const css::datatransfer::dnd::DropTargetDropEvent& dtde) override;
+    virtual void dragEnter(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee) override;
+    virtual void dragExit(const css::datatransfer::dnd::DropTargetEvent& dte) override;
+    virtual void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde) override;
 
 protected:
     Edit(WindowType nType);
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index efb197eebc3f..5937e9066f44 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -90,12 +90,12 @@ protected:
     bool                ImplCheckTextLen( const OUString& rNewText );
 
     // DragAndDropClient
-    virtual void        dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void        dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void        drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void        dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void        dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void        dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void        dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) override;
+    virtual void        dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) override;
+    virtual void        drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) override;
+    virtual void        dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override;
+    virtual void        dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) override;
+    virtual void        dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override;
 
             using       DragAndDropClient::dragEnter;
             using       DragAndDropClient::dragExit;
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 0b33c1830e1f..e428d30a0110 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -44,14 +44,14 @@ namespace vcl { namespace unohelper {
                         virtual ~TextDataObject() override;
 
         // css::uno::XInterface
-        css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         void          SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
         void          SAL_CALL release() throw() override  { OWeakObject::release(); }
 
         // css::datatransfer::XTransferable
-        css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(css::uno::RuntimeException, std::exception) override;
-        sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
+        css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) override;
+        sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 
         /// copies a given string to a given clipboard
         static  void    CopyStringTo(
diff --git a/include/vcl/vclstatuslistener.hxx b/include/vcl/vclstatuslistener.hxx
index 87e0a02fd35d..ae461f8d9cb3 100644
--- a/include/vcl/vclstatuslistener.hxx
+++ b/include/vcl/vclstatuslistener.hxx
@@ -34,11 +34,9 @@ private:
     css::util::URL maCommandURL;
 
 public:
-    void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override;
 
-    void SAL_CALL disposing(const css::lang::EventObject& /*Source*/)
-        throw( css::uno::RuntimeException, std::exception ) override;
+    void SAL_CALL disposing(const css::lang::EventObject& /*Source*/) override;
 
     void dispose();
 };
@@ -71,14 +69,12 @@ VclStatusListener<T>::VclStatusListener(T* widget, const rtl::OUString& aCommand
 
 template<class T>
 void VclStatusListener<T>::statusChanged(const css::frame::FeatureStateEvent& rEvent)
-            throw(css::uno::RuntimeException, std::exception)
 {
     mWidget->statusChanged(rEvent);
 }
 
 template<class T>
 void VclStatusListener<T>::disposing(const css::lang::EventObject& /*Source*/)
-            throw( css::uno::RuntimeException, std::exception )
 {
     mxDispatch.clear();
 }
diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
index 57354bbe15ec..b8d5e7c0dfd5 100644
--- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
+++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
@@ -38,42 +38,31 @@ public:
     virtual ~XMLEmbeddedObjectExportFilter () throw() override;
 
     // css::xml::sax::XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endDocument()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL startElement(const OUString& aName,
-                              const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endElement(const OUString& aName)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL characters(const OUString& aChars)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+                              const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override;
+    virtual void SAL_CALL endElement(const OUString& aName) override;
+    virtual void SAL_CALL characters(const OUString& aChars) override;
+    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
     virtual void SAL_CALL processingInstruction(const OUString& aTarget,
-                                       const OUString& aData)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+                                       const OUString& aData) override;
+    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override;
 
     // css::xml::sax::XExtendedDocumentHandler
-    virtual void SAL_CALL startCDATA() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endCDATA() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL comment(const OUString& sComment)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL allowLineBreak()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL unknown(const OUString& sString)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startCDATA() override;
+    virtual void SAL_CALL endCDATA() override;
+    virtual void SAL_CALL comment(const OUString& sComment) override;
+    virtual void SAL_CALL allowLineBreak() override;
+    virtual void SAL_CALL unknown(const OUString& sString) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 };
 
diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx
index 7e53ece5eed5..5bd306400406 100644
--- a/include/xmloff/attrlist.hxx
+++ b/include/xmloff/attrlist.hxx
@@ -54,18 +54,18 @@ public:
     static SvXMLAttributeList* getImplementation( const css::uno::Reference< css::uno::XInterface >& ) throw();
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // css::xml::sax::XAttributeList
-    virtual sal_Int16 SAL_CALL getLength() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL getLength() override;
+    virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) override;
+    virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) override;
+    virtual OUString SAL_CALL getTypeByName(const OUString& aName) override;
+    virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) override;
+    virtual OUString SAL_CALL getValueByName(const OUString& aName) override;
 
     // css::util::XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()   throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // methods that are not contained in any interface
     void AddAttribute( const OUString &sName , const OUString &sValue );
diff --git a/include/xmloff/fasttokenhandler.hxx b/include/xmloff/fasttokenhandler.hxx
index 92ce6e199a21..4a514f568170 100644
--- a/include/xmloff/fasttokenhandler.hxx
+++ b/include/xmloff/fasttokenhandler.hxx
@@ -68,10 +68,8 @@ public:
     virtual ~FastTokenHandler() override;
 
     // XFastTokenHandler
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier )
-        throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) SAL_OVERRIDE;
+    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) SAL_OVERRIDE;
 
     // Much faster direct C++ shortcut to the method that matters
     virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const SAL_OVERRIDE;
diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx
index b3c5af7e76e6..54b2db7841ef 100644
--- a/include/xmloff/unoatrcn.hxx
+++ b/include/xmloff/unoatrcn.hxx
@@ -54,31 +54,28 @@ public:
     SvXMLAttrContainerData* GetContainerImpl() const { return mpContainer.get(); }
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // css::container::XElementAccess
-    virtual css::uno::Type  SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Type  SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // css::container::XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& aName) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& aName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& aName) override;
 
     // css::container::XNameReplace
-    virtual void SAL_CALL replaceByName(const OUString& aName, const css::uno::Any& aElement) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL replaceByName(const OUString& aName, const css::uno::Any& aElement) override;
 
     // css::container::XNameContainer
-    virtual void SAL_CALL insertByName(const OUString& aName, const css::uno::Any& aElement) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL insertByName(const OUString& aName, const css::uno::Any& aElement) override;
+    virtual void SAL_CALL removeByName(const OUString& Name) override;
 
     // css::lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-
-    /// @throws css::uno::Exception
-    friend  css::uno::Reference< css::uno::XInterface > SvUnoAttributeContainer_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
 };
 
 #endif
diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx
index 450961020616..3a7c2b20d256 100644
--- a/include/xmloff/xmlerror.hxx
+++ b/include/xmloff/xmlerror.hxx
@@ -132,8 +132,7 @@ public:
      * the given mask
      */
     /// @throws css::xml::sax::SAXParseException
-    void ThrowErrorAsSAXException( sal_Int32 nIdMask )
-        throw( css::xml::sax::SAXParseException );
+    void ThrowErrorAsSAXException( sal_Int32 nIdMask );
 };
 
 #endif
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 7fbcb4196cf4..eece9208a9be 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -289,26 +289,26 @@ public:
     static SvXMLExport* getImplementation( const css::uno::Reference< css::uno::XInterface >& ) throw();
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+    virtual void SAL_CALL cancel() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) final override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) final override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) final override;
+    virtual OUString SAL_CALL getImplementationName(  ) final override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) final override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) final override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     /** ensures that the given namespace is in scope at the next started
         element.
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index d7a1cafdfcc0..d68f6dd46109 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -95,30 +95,23 @@ public:
 
     // css::xml::sax::XFastContextHandler:
     virtual void SAL_CALL startFastElement (sal_Int32 Element,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs) override;
 
     virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void SAL_CALL endFastElement(sal_Int32 Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 Element) override;
 
-    virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) override;
 
     virtual css::uno::Reference< XFastContextHandler >  SAL_CALL createFastChildContext(sal_Int32 Element,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference<css::xml::sax::XFastAttributeList>& Attribs) override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext(
         const OUString & Namespace, const OUString & Name,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void SAL_CALL characters(const OUString & aChars)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL characters(const OUString & aChars) override;
 
     // #i124143# allow to copy evtl. useful data from another temporary import context, e.g. used to
     // support multiple images and to rescue evtl. GluePoints imported with one of the
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 0208b3daeda3..330e92a0da9a 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -129,10 +129,8 @@ public:
     void addNSDeclAttributes( rtl::Reference < comphelper::AttributeList >& rAttrList );
 
     //XFastNamespaceHandler
-    virtual void SAL_CALL registerNamespace( const OUString& rNamespacePrefix, const OUString& rNamespaceURI )
-                            throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNamespaceURI( const OUString& rNamespacePrefix )
-                            throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL registerNamespace( const OUString& rNamespacePrefix, const OUString& rNamespaceURI ) override;
+    virtual OUString SAL_CALL getNamespaceURI( const OUString& rNamespacePrefix ) override;
 };
 
 
@@ -257,92 +255,68 @@ public:
     virtual ~SvXMLImport() throw() override;
 
     // css::xml::sax::XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw (css::xml::sax::SAXException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL endDocument()
-        throw(css::xml::sax::SAXException,
-              css::uno::RuntimeException,
-              std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL startElement(const OUString& aName,
-        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endElement(const OUString& aName)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL characters(const OUString& aChars)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override;
+    virtual void SAL_CALL endElement(const OUString& aName) override;
+    virtual void SAL_CALL characters(const OUString& aChars) override;
+    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
     virtual void SAL_CALL processingInstruction(const OUString& aTarget,
-                                                const OUString& aData)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+                                                const OUString& aData) override;
+    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override;
 
     // ::css::xml::sax::XFastContextHandler
     virtual void SAL_CALL startFastElement(sal_Int32 Element,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
     virtual void SAL_CALL startUnknownElement(const OUString & Namespace,
         const OUString & Name,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL endFastElement(sal_Int32 Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 Element) override;
     virtual void SAL_CALL endUnknownElement(const OUString & Namespace,
-        const OUString & Name)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const OUString & Name) override;
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     createFastChildContext(sal_Int32 Element,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     createUnknownChildContext(const OUString & Namespace, const OUString & Name,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
     // css::xml::sax::XExtendedDocumentHandler
-    virtual void SAL_CALL startCDATA() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endCDATA() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL comment(const OUString& sComment)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL allowLineBreak()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL unknown(const OUString& sString)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startCDATA() override;
+    virtual void SAL_CALL endCDATA() override;
+    virtual void SAL_CALL comment(const OUString& sComment) override;
+    virtual void SAL_CALL allowLineBreak() override;
+    virtual void SAL_CALL unknown(const OUString& sString) override;
 
     // XFastParser
-    virtual void SAL_CALL parseStream( const css::xml::sax::InputSource& aInputSource ) throw (css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLocale( const css::lang::Locale& rLocale ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNamespaceHandler( const css::uno::Reference< css::xml::sax::XFastNamespaceHandler >& Handler) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL parseStream( const css::xml::sax::InputSource& aInputSource ) override;
+    virtual void SAL_CALL setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) override;
+    virtual void SAL_CALL setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) override;
+    virtual void SAL_CALL registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) override;
+    virtual OUString SAL_CALL getNamespaceURL( const OUString& rPrefix ) override;
+    virtual void SAL_CALL setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) override;
+    virtual void SAL_CALL setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) override;
+    virtual void SAL_CALL setLocale( const css::lang::Locale& rLocale ) override;
+    virtual void SAL_CALL setNamespaceHandler( const css::uno::Reference< css::xml::sax::XFastNamespaceHandler >& Handler) override;
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+    virtual void SAL_CALL cancel(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException, std::exception) final override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException, std::exception) final override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException, std::exception) final override;
+    virtual OUString SAL_CALL getImplementationName(  ) final override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) final override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) final override;
 
     // may be called by certain subclasses that handle document meta-data
     // override to provide customized handling of document statistics
diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx
index 684163f71cf1..c4f62f609684 100644
--- a/include/xmloff/xmlmetae.hxx
+++ b/include/xmloff/xmlmetae.hxx
@@ -80,36 +80,20 @@ public:
                         const css::util::DateTime& rDateTime );
 
     // css::xml::sax::XDocumentHandler:
-    virtual void SAL_CALL startDocument()
-        throw (css::uno::RuntimeException,
-               css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL endDocument()
-        throw (css::uno::RuntimeException,
-               css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL startElement(const OUString & i_rName,
         const css::uno::Reference<
-                css::xml::sax::XAttributeList > & i_xAttribs)
-        throw (css::uno::RuntimeException,
-               css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL endElement(const OUString & i_rName)
-        throw (css::uno::RuntimeException,
-               css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL characters(const OUString & i_rChars)
-        throw (css::uno::RuntimeException,
-               css::xml::sax::SAXException, std::exception) override;
+                css::xml::sax::XAttributeList > & i_xAttribs) override;
+    virtual void SAL_CALL endElement(const OUString & i_rName) override;
+    virtual void SAL_CALL characters(const OUString & i_rChars) override;
     virtual void SAL_CALL ignorableWhitespace(
-        const OUString & i_rWhitespaces)
-        throw (css::uno::RuntimeException,
-               css::xml::sax::SAXException, std::exception) override;
+        const OUString & i_rWhitespaces) override;
     virtual void SAL_CALL processingInstruction(
-        const OUString & i_rTarget, const OUString & i_rData)
-        throw (css::uno::RuntimeException,
-               css::xml::sax::SAXException, std::exception) override;
+        const OUString & i_rTarget, const OUString & i_rData) override;
     virtual void SAL_CALL setDocumentLocator(
         const css::uno::Reference<
-                css::xml::sax::XLocator > & i_xLocator)
-        throw (css::uno::RuntimeException,
-               css::xml::sax::SAXException, std::exception) override;
+                css::xml::sax::XLocator > & i_xLocator) override;
 
 };
 
diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index 0e05bb3b6a19..ba31f5c5f022 100644
--- a/include/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
@@ -80,18 +80,12 @@ public:
         css::uno::Reference< css::xml::sax::XDocumentHandler > const & xOut );
 
     // XAttributeList
-    virtual sal_Int16 SAL_CALL getLength()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNameByIndex( sal_Int16 nPos )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTypeByIndex( sal_Int16 nPos )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTypeByName( OUString const & rName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getValueByIndex( sal_Int16 nPos )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getValueByName( OUString const & rName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getLength() override;
+    virtual OUString SAL_CALL getNameByIndex( sal_Int16 nPos ) override;
+    virtual OUString SAL_CALL getTypeByIndex( sal_Int16 nPos ) override;
+    virtual OUString SAL_CALL getTypeByName( OUString const & rName ) override;
+    virtual OUString SAL_CALL getValueByIndex( sal_Int16 nPos ) override;
+    virtual OUString SAL_CALL getValueByName( OUString const & rName ) override;
 
 protected:
     ::std::vector< css::uno::Reference<
diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx
index d887f379c66b..e8b390ef85e1 100644
--- a/io/qa/textinputstream.cxx
+++ b/io/qa/textinputstream.cxx
@@ -42,19 +42,11 @@ private:
     virtual ~Input() override {}
 
     sal_Int32 SAL_CALL readBytes(css::uno::Sequence<sal_Int8> &, sal_Int32)
-        throw (
-            css::io::NotConnectedException,
-            css::io::BufferSizeExceededException, css::io::IOException,
-            css::uno::RuntimeException, std::exception)
         override
     { CPPUNIT_FAIL("readLine is supposed to call readSomeBytes instead"); return 0;}
 
     sal_Int32 SAL_CALL readSomeBytes(
-        css::uno::Sequence<sal_Int8 > & aData, sal_Int32 nMaxBytesToRead)
-        throw (
-            css::io::NotConnectedException,
-            css::io::BufferSizeExceededException, css::io::IOException,
-            css::uno::RuntimeException, ::std::exception) override
+        css::uno::Sequence<sal_Int8 > & aData, sal_Int32 nMaxBytesToRead) override
     {
         assert(nMaxBytesToRead >= 0);
         osl::MutexGuard g(mutex_);
@@ -70,11 +62,7 @@ private:
         return n;
     }
 
-    void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
-        throw (
-            css::io::NotConnectedException,
-            css::io::BufferSizeExceededException, css::io::IOException,
-            css::uno::RuntimeException, std::exception) override
+    void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) override
     {
         assert(nBytesToSkip >= 0);
         osl::MutexGuard g(mutex_);
@@ -84,10 +72,7 @@ private:
         assert(index_ >= 0 && index_ <= SIZE);
     }
 
-    sal_Int32 SAL_CALL available()
-        throw (
-            css::io::NotConnectedException, css::io::IOException,
-            css::uno::RuntimeException, std::exception) override
+    sal_Int32 SAL_CALL available() override
     {
         osl::MutexGuard g(mutex_);
         checkClosed();
@@ -95,10 +80,7 @@ private:
         return SIZE - index_;
     }
 
-    void SAL_CALL closeInput()
-        throw (
-            css::io::NotConnectedException, css::io::IOException,
-            css::uno::RuntimeException, std::exception) override
+    void SAL_CALL closeInput() override
     {
         osl::MutexGuard g(mutex_);
         checkClosed();
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 9ae0dcd65c1d..f948480b56ec 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -74,47 +74,36 @@ class OTextInputStream : public WeakImplHelper< XTextInputStream2, XServiceInfo
     /// @throws IOException
     /// @throws RuntimeException
     OUString implReadString( const Sequence< sal_Unicode >& Delimiters,
-        bool bRemoveDelimiter, bool bFindLineEnd )
-            throw(IOException, RuntimeException);
+        bool bRemoveDelimiter, bool bFindLineEnd );
     /// @throws IOException
     /// @throws RuntimeException
-    sal_Int32 implReadNext() throw(IOException, RuntimeException);
+    sal_Int32 implReadNext();
 
 public:
     OTextInputStream();
     virtual ~OTextInputStream() override;
 
     // Methods XTextInputStream
-    virtual OUString SAL_CALL readLine(  )
-        throw(IOException, RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter )
-        throw(IOException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEOF(  )
-        throw(IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL readLine(  ) override;
+    virtual OUString SAL_CALL readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter ) override;
+    virtual sal_Bool SAL_CALL isEOF(  ) override;
+    virtual void SAL_CALL setEncoding( const OUString& Encoding ) override;
 
     // Methods XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(NotConnectedException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  )
-        throw(NotConnectedException, IOException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 
     // Methods XActiveDataSink
-    virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream )
-        throw(RuntimeException, std::exception) override;
-    virtual Reference< XInputStream > SAL_CALL getInputStream()
-        throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) override;
+    virtual Reference< XInputStream > SAL_CALL getInputStream() override;
 
     // Methods XServiceInfo
-        virtual OUString              SAL_CALL getImplementationName() throw(std::exception) override;
-        virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames() throw(std::exception) override;
-        virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
+        virtual OUString              SAL_CALL getImplementationName() override;
+        virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames() override;
+        virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) override;
 };
 
 OTextInputStream::OTextInputStream()
@@ -154,20 +143,17 @@ void OTextInputStream::implResizeBuffer()
 // XTextInputStream
 
 OUString OTextInputStream::readLine(  )
-    throw(IOException, RuntimeException, std::exception)
 {
     static Sequence< sal_Unicode > aDummySeq;
     return implReadString( aDummySeq, true, true );
 }
 
 OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter )
-        throw(IOException, RuntimeException, std::exception)
 {
     return implReadString( Delimiters, bRemoveDelimiter, false );
 }
 
 sal_Bool OTextInputStream::isEOF()
-    throw(IOException, RuntimeException, std::exception)
 {
     bool bRet = false;
     if( mnCharsInBuffer == 0 && mbReachedEOF )
@@ -178,7 +164,6 @@ sal_Bool OTextInputStream::isEOF()
 
 OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimiters,
                                            bool bRemoveDelimiter, bool bFindLineEnd )
-        throw(IOException, RuntimeException)
 {
     OUString aRetStr;
     if( !mbEncodingInitialized )
@@ -283,7 +268,6 @@ OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimi
 
 
 sal_Int32 OTextInputStream::implReadNext()
-        throw(IOException, RuntimeException)
 {
     sal_Int32 nFreeBufferSize = mnBufferSize - mnCharsInBuffer;
     if( nFreeBufferSize < READ_BYTE_COUNT )
@@ -370,7 +354,6 @@ sal_Int32 OTextInputStream::implReadNext()
 }
 
 void OTextInputStream::setEncoding( const OUString& Encoding )
-    throw(RuntimeException, std::exception)
 {
     OString aOEncodingStr = OUStringToOString( Encoding, RTL_TEXTENCODING_ASCII_US );
     rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( aOEncodingStr.getStr() );
@@ -387,31 +370,26 @@ void OTextInputStream::setEncoding( const OUString& Encoding )
 // XInputStream
 
 sal_Int32 OTextInputStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     return mxStream->readBytes( aData, nBytesToRead );
 }
 
 sal_Int32 OTextInputStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     return mxStream->readSomeBytes( aData, nMaxBytesToRead );
 }
 
 void OTextInputStream::skipBytes( sal_Int32 nBytesToSkip )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     mxStream->skipBytes( nBytesToSkip );
 }
 
 sal_Int32 OTextInputStream::available(  )
-    throw(NotConnectedException, IOException, RuntimeException, std::exception)
 {
     return mxStream->available();
 }
 
 void OTextInputStream::closeInput(  )
-    throw(NotConnectedException, IOException, RuntimeException, std::exception)
 {
     mxStream->closeInput();
 }
@@ -420,13 +398,11 @@ void OTextInputStream::closeInput(  )
 // XActiveDataSink
 
 void OTextInputStream::setInputStream( const Reference< XInputStream >& aStream )
-    throw(RuntimeException, std::exception)
 {
     mxStream = aStream;
 }
 
 Reference< XInputStream > OTextInputStream::getInputStream()
-    throw(RuntimeException, std::exception)
 {
     return mxStream;
 }
@@ -449,17 +425,17 @@ Sequence< OUString > TextInputStream_getSupportedServiceNames()
     return seqNames;
 }
 
-OUString OTextInputStream::getImplementationName() throw(std::exception)
+OUString OTextInputStream::getImplementationName()
 {
     return TextInputStream_getImplementationName();
 }
 
-sal_Bool OTextInputStream::supportsService(const OUString& ServiceName) throw(std::exception)
+sal_Bool OTextInputStream::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > OTextInputStream::getSupportedServiceNames() throw(std::exception)
+Sequence< OUString > OTextInputStream::getSupportedServiceNames()
 {
     return TextInputStream_getSupportedServiceNames();
 }
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index bd2004e26a3d..323eb88e820b 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -62,36 +62,29 @@ class OTextOutputStream : public WeakImplHelper< XTextOutputStream2, XServiceInf
 
     Sequence<sal_Int8> implConvert( const OUString& rSource );
     /// @throws IOException
-    void checkOutputStream() throw(IOException);
+    void checkOutputStream();
 
 public:
     OTextOutputStream();
     virtual ~OTextOutputStream() override;
 
     // Methods XTextOutputStream
-    virtual void SAL_CALL writeString( const OUString& aString )
-        throw(IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEncoding( const OUString& Encoding )
-        throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeString( const OUString& aString ) override;
+    virtual void SAL_CALL setEncoding( const OUString& Encoding ) override;
 
     // Methods XOutputStream
-    virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush(  )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput(  )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) override;
+    virtual void SAL_CALL flush(  ) override;
+    virtual void SAL_CALL closeOutput(  ) override;
 
     // Methods XActiveDataSource
-    virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream )
-        throw(RuntimeException, std::exception) override;
-    virtual Reference< XOutputStream > SAL_CALL getOutputStream(  )
-        throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream ) override;
+    virtual Reference< XOutputStream > SAL_CALL getOutputStream(  ) override;
 
     // Methods XServiceInfo
-        virtual OUString              SAL_CALL getImplementationName() throw(std::exception) override;
-        virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames() throw(std::exception) override;
-        virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
+        virtual OUString              SAL_CALL getImplementationName() override;
+        virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames() override;
+        virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) override;
 };
 
 OTextOutputStream::OTextOutputStream()
@@ -162,7 +155,6 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource )
 // XTextOutputStream
 
 void OTextOutputStream::writeString( const OUString& aString )
-    throw(IOException, RuntimeException, std::exception)
 {
     checkOutputStream();
     if( !mbEncodingInitialized )
@@ -178,7 +170,6 @@ void OTextOutputStream::writeString( const OUString& aString )
 }
 
 void OTextOutputStream::setEncoding( const OUString& Encoding )
-    throw(RuntimeException, std::exception)
 {
     OString aOEncodingStr = OUStringToOString( Encoding, RTL_TEXTENCODING_ASCII_US );
     rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( aOEncodingStr.getStr() );
@@ -194,21 +185,18 @@ void OTextOutputStream::setEncoding( const OUString& Encoding )
 
 // XOutputStream
 void OTextOutputStream::writeBytes( const Sequence< sal_Int8 >& aData )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     checkOutputStream();
     mxStream->writeBytes( aData );
 }
 
 void OTextOutputStream::flush(  )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     checkOutputStream();
     mxStream->flush();
 }
 
 void OTextOutputStream::closeOutput(  )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     checkOutputStream();
     mxStream->closeOutput();
@@ -216,7 +204,6 @@ void OTextOutputStream::closeOutput(  )
 
 
 void OTextOutputStream::checkOutputStream()
-    throw(IOException)
 {
     if (! mxStream.is() )
         throw IOException("output stream is not initialized, you have to use setOutputStream first");
@@ -226,13 +213,11 @@ void OTextOutputStream::checkOutputStream()
 // XActiveDataSource
 
 void OTextOutputStream::setOutputStream( const Reference< XOutputStream >& aStream )
-    throw(RuntimeException, std::exception)
 {
     mxStream = aStream;
 }
 
 Reference< XOutputStream > OTextOutputStream::getOutputStream()
-    throw(RuntimeException, std::exception)
 {
     return mxStream;
 }
@@ -256,17 +241,17 @@ Sequence< OUString > TextOutputStream_getSupportedServiceNames()
     return seqNames;
 }
 
-OUString OTextOutputStream::getImplementationName() throw(std::exception)
+OUString OTextOutputStream::getImplementationName()
 {
     return TextOutputStream_getImplementationName();
 }
 
-sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) throw(std::exception)
+sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > OTextOutputStream::getSupportedServiceNames() throw(std::exception)
+Sequence< OUString > OTextOutputStream::getSupportedServiceNames()
 {
     return TextOutputStream_getSupportedServiceNames();
 }
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 1819ff5616b6..a7e02f8e2af4 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -44,20 +44,11 @@ namespace io_acceptor
     public:
         explicit PipeConnection( const OUString &sConnectionDescription);
 
-        virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL write( const Sequence< sal_Int8 >& aData )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL flush(  ) throw(
-            css::io::IOException,
-            css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL close(  )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDescription(  )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) override;
+        virtual void SAL_CALL write( const Sequence< sal_Int8 >& aData ) override;
+        virtual void SAL_CALL flush(  ) override;
+        virtual void SAL_CALL close(  ) override;
+        virtual OUString SAL_CALL getDescription(  ) override;
     public:
         ::osl::StreamPipe m_pipe;
         oslInterlockedCount m_nStatus;
@@ -77,8 +68,6 @@ namespace io_acceptor
     }
 
     sal_Int32 PipeConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
-        throw(css::io::IOException,
-              css::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -100,8 +89,6 @@ namespace io_acceptor
     }
 
     void PipeConnection::write( const Sequence < sal_Int8 > &seq )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -116,14 +103,10 @@ namespace io_acceptor
     }
 
     void PipeConnection::flush( )
-        throw(  css::io::IOException,
-                css::uno::RuntimeException, std::exception)
     {
     }
 
     void PipeConnection::close()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception)
     {
         if(  1 == osl_atomic_increment( (&m_nStatus) ) )
         {
@@ -132,7 +115,6 @@ namespace io_acceptor
     }
 
     OUString PipeConnection::getDescription()
-            throw(css::uno::RuntimeException, std::exception)
     {
         return m_sDescription;
     }
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 75764022c907..6d6a7b17bf5e 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -72,26 +72,15 @@ namespace io_acceptor {
         explicit SocketConnection( const OUString & sConnectionDescription );
 
         virtual sal_Int32 SAL_CALL read( css::uno::Sequence< sal_Int8 >& aReadBytes,
-                                         sal_Int32 nBytesToRead )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL flush(  ) throw(
-            css::io::IOException,
-            css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL close(  )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDescription(  )
-            throw(css::uno::RuntimeException, std::exception) override;
+                                         sal_Int32 nBytesToRead ) override;
+        virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData ) override;
+        virtual void SAL_CALL flush(  ) override;
+        virtual void SAL_CALL close(  ) override;
+        virtual OUString SAL_CALL getDescription(  ) override;
 
         // XConnectionBroadcaster
-        virtual void SAL_CALL addStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener)
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener) override;
+        virtual void SAL_CALL removeStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener) override;
 
     public:
         void completeConnectionString();
@@ -186,8 +175,6 @@ namespace io_acceptor {
     }
 
     sal_Int32 SocketConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -234,8 +221,6 @@ namespace io_acceptor {
     }
 
     void SocketConnection::write( const Sequence < sal_Int8 > &seq )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -270,15 +255,11 @@ namespace io_acceptor {
     }
 
     void SocketConnection::flush( )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
 
     }
 
     void SocketConnection::close()
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
         // ensure close is called only once
         if(  1 == osl_atomic_increment( (&m_nStatus) ) )
@@ -289,21 +270,20 @@ namespace io_acceptor {
     }
 
     OUString SocketConnection::getDescription()
-            throw( css::uno::RuntimeException, std::exception)
     {
         return m_sDescription;
     }
 
 
     // XConnectionBroadcaster
-    void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
+    void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener)
     {
         MutexGuard guard(_mutex);
 
         _listeners.insert(aListener);
     }
 
-    void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
+    void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener)
     {
         MutexGuard guard(_mutex);
 
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 61ad3c6879bd..c8871a814701 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -53,17 +53,13 @@ namespace io_acceptor
         virtual ~OAcceptor() override;
     public:
         // Methods
-        virtual Reference< XConnection > SAL_CALL accept( const OUString& sConnectionDescription )
-            throw( AlreadyAcceptingException,
-                   ConnectionSetupException,
-                   IllegalArgumentException,
-                   RuntimeException, std::exception) override;
-        virtual void SAL_CALL stopAccepting(  ) throw( RuntimeException, std::exception) override;
+        virtual Reference< XConnection > SAL_CALL accept( const OUString& sConnectionDescription ) override;
+        virtual void SAL_CALL stopAccepting(  ) override;
 
     public: // XServiceInfo
-                virtual OUString              SAL_CALL getImplementationName() throw(std::exception) override;
-                virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames() throw(std::exception) override;
-                virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
+                virtual OUString              SAL_CALL getImplementationName() override;
+                virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames() override;
+                virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) override;
 
     private:
         PipeAcceptor *m_pPipe;
@@ -101,7 +97,7 @@ namespace io_acceptor
     struct BeingInAccept
     {
         /// @throws AlreadyAcceptingException
-        BeingInAccept( bool *pFlag,const OUString & sConnectionDescription  ) throw( AlreadyAcceptingException)
+        BeingInAccept( bool *pFlag,const OUString & sConnectionDescription  )
             : m_pFlag( pFlag )
             {
                   if( *m_pFlag )
@@ -120,10 +116,6 @@ namespace io_acceptor
     };
 
     Reference< XConnection > OAcceptor::accept( const OUString &sConnectionDescription )
-        throw( AlreadyAcceptingException,
-               ConnectionSetupException,
-               IllegalArgumentException,
-               RuntimeException, std::exception)
     {
         // if there is a thread alread accepting in this object, throw an exception.
         struct BeingInAccept guard( &m_bInAccept, sConnectionDescription );
@@ -239,7 +231,7 @@ namespace io_acceptor
         return r;
     }
 
-    void SAL_CALL OAcceptor::stopAccepting(  ) throw( RuntimeException, std::exception)
+    void SAL_CALL OAcceptor::stopAccepting(  )
     {
         MutexGuard guard( m_mutex );
 
@@ -274,17 +266,17 @@ namespace io_acceptor
         return seqNames;
     }
 
-        OUString OAcceptor::getImplementationName() throw(std::exception)
+        OUString OAcceptor::getImplementationName()
     {
         return acceptor_getImplementationName();
     }
 
-        sal_Bool OAcceptor::supportsService(const OUString& ServiceName) throw(std::exception)
+        sal_Bool OAcceptor::supportsService(const OUString& ServiceName)
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-        Sequence< OUString > OAcceptor::getSupportedServiceNames() throw(std::exception)
+        Sequence< OUString > OAcceptor::getSupportedServiceNames()
     {
         return acceptor_getSupportedServiceNames();
     }
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index d12296295700..c5f9c7935044 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -56,13 +56,12 @@ namespace stoc_connector
 
         // Methods
         virtual Reference< XConnection > SAL_CALL connect(
-            const OUString& sConnectionDescription )
-            throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception) override;
+            const OUString& sConnectionDescription ) override;
 
     public: // XServiceInfo
-                virtual OUString              SAL_CALL getImplementationName() throw(std::exception) override;
-                virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames() throw(std::exception) override;
-                virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
+                virtual OUString              SAL_CALL getImplementationName() override;
+                virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames() override;
+                virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) override;
     };
 
     OConnector::OConnector(const Reference< XComponentContext > &xCtx)
@@ -71,7 +70,6 @@ namespace stoc_connector
     {}
 
     Reference< XConnection > SAL_CALL OConnector::connect( const OUString& sConnectionDescription )
-        throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception)
     {
         // split string into tokens
         try
@@ -174,17 +172,17 @@ namespace stoc_connector
         return OUString( IMPLEMENTATION_NAME );
     }
 
-        OUString OConnector::getImplementationName() throw(std::exception)
+        OUString OConnector::getImplementationName()
     {
         return connector_getImplementationName();
     }
 
-        sal_Bool OConnector::supportsService(const OUString& ServiceName) throw(std::exception)
+        sal_Bool OConnector::supportsService(const OUString& ServiceName)
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-        Sequence< OUString > OConnector::getSupportedServiceNames() throw(std::exception)
+        Sequence< OUString > OConnector::getSupportedServiceNames()
     {
         return connector_getSupportedServiceNames();
     }
diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx
index 3381cf0cdc22..1c5b585c5e68 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -64,20 +64,11 @@ namespace stoc_connector
         virtual ~PipeConnection() override;
 
         virtual sal_Int32 SAL_CALL read( css::uno::Sequence< sal_Int8 >& aReadBytes,
-                                         sal_Int32 nBytesToRead )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL flush(  ) throw(
-            css::io::IOException,
-            css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL close(  )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDescription(  )
-            throw(css::uno::RuntimeException, std::exception) override;
+                                         sal_Int32 nBytesToRead ) override;
+        virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData ) override;
+        virtual void SAL_CALL flush(  ) override;
+        virtual void SAL_CALL close(  ) override;
+        virtual OUString SAL_CALL getDescription(  ) override;
     public:
         ::osl::StreamPipe m_pipe;
         oslInterlockedCount m_nStatus;
@@ -93,27 +84,16 @@ namespace stoc_connector
         virtual ~SocketConnection() override;
 
         virtual sal_Int32 SAL_CALL read( css::uno::Sequence< sal_Int8 >& aReadBytes,
-                                         sal_Int32 nBytesToRead )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL flush(  ) throw(
-            css::io::IOException,
-            css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL close(  )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDescription(  )
-            throw(css::uno::RuntimeException, std::exception) override;
+                                         sal_Int32 nBytesToRead ) override;
+        virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData ) override;
+        virtual void SAL_CALL flush(  ) override;
+        virtual void SAL_CALL close(  ) override;
+        virtual OUString SAL_CALL getDescription(  ) override;
 
 
         // XConnectionBroadcaster
-        virtual void SAL_CALL addStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener)
-            throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener) override;
+        virtual void SAL_CALL removeStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener) override;
 
     public:
         void completeConnectionString();
diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx
index df1529173ba6..48aad0b39260 100644
--- a/io/source/connector/ctr_pipe.cxx
+++ b/io/source/connector/ctr_pipe.cxx
@@ -44,8 +44,6 @@ namespace stoc_connector {
     }
 
     sal_Int32 PipeConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -61,8 +59,6 @@ namespace stoc_connector {
     }
 
     void PipeConnection::write( const Sequence < sal_Int8 > &seq )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -77,15 +73,11 @@ namespace stoc_connector {
     }
 
     void PipeConnection::flush( )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
 
     }
 
     void PipeConnection::close()
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
         // ensure that close is called only once
         if(1 == osl_atomic_increment( (&m_nStatus) ) )
@@ -95,7 +87,6 @@ namespace stoc_connector {
     }
 
     OUString PipeConnection::getDescription()
-            throw( css::uno::RuntimeException, std::exception)
     {
         return m_sDescription;
     }
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index 00f35eb627f3..53ce96ae3131 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -116,8 +116,6 @@ namespace stoc_connector {
     }
 
     sal_Int32 SocketConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -162,8 +160,6 @@ namespace stoc_connector {
     }
 
     void SocketConnection::write( const Sequence < sal_Int8 > &seq )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -198,15 +194,11 @@ namespace stoc_connector {
     }
 
     void SocketConnection::flush( )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
 
     }
 
     void SocketConnection::close()
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception)
     {
             // ensure that close is called only once
         if( 1 == osl_atomic_increment( (&m_nStatus) ) )
@@ -217,21 +209,20 @@ namespace stoc_connector {
     }
 
     OUString SocketConnection::getDescription()
-            throw( css::uno::RuntimeException, std::exception)
     {
         return m_sDescription;
     }
 
 
     // XConnectionBroadcaster
-    void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
+    void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener)
     {
         MutexGuard guard(_mutex);
 
         _listeners.insert(aListener);
     }
 
-    void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
+    void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener)
     {
         MutexGuard guard(_mutex);
 
diff --git a/io/source/services.hxx b/io/source/services.hxx
index a81fd9422b5b..ff7d9ff0cb87 100644
--- a/io/source/services.hxx
+++ b/io/source/services.hxx
@@ -57,42 +57,42 @@ namespace io_TextOutputStream {
 
 namespace io_stm {
     /// @throws Exception
-    Reference< XInterface > SAL_CALL OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
+    Reference< XInterface > SAL_CALL OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr );
     OUString    OPipeImpl_getImplementationName();
     Sequence<OUString> OPipeImpl_getSupportedServiceNames();
 
     /// @throws Exception
-    Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
+    Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr );
     OUString    ODataInputStream_getImplementationName();
     Sequence<OUString> ODataInputStream_getSupportedServiceNames();
 
     /// @throws Exception
-    Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
+    Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr );
     OUString ODataOutputStream_getImplementationName();
     Sequence<OUString> ODataOutputStream_getSupportedServiceNames();
 
     /// @throws Exception
-    Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
+    Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr );
     OUString OMarkableOutputStream_getImplementationName();
     Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames();
 
     /// @throws Exception
-    Reference< XInterface > SAL_CALL OMarkableInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
+    Reference< XInterface > SAL_CALL OMarkableInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr );
     OUString    OMarkableInputStream_getImplementationName() ;
     Sequence<OUString> OMarkableInputStream_getSupportedServiceNames();
 
     /// @throws Exception
-    Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception);
+    Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr );
     OUString OObjectOutputStream_getImplementationName();
     Sequence<OUString> OObjectOutputStream_getSupportedServiceNames();
 
     /// @throws Exception
-    Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception);
+    Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr );
     OUString    OObjectInputStream_getImplementationName() ;
     Sequence<OUString> OObjectInputStream_getSupportedServiceNames();
 
     /// @throws Exception
-    Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception);
+    Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( const Reference< XComponentContext > & rSMgr );
     OUString OPumpImpl_getImplementationName();
     Sequence<OUString> OPumpImpl_getSupportedServiceNames();
 }
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 64e1800af279..ff2307bc91a7 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -63,50 +63,39 @@ public:
         }
 
 public: // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                                                            throw ( NotConnectedException,
-                                                                        BufferSizeExceededException,
-                                                                        RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-                                                            throw ( NotConnectedException,
-                                                                        BufferSizeExceededException,
-                                                                        RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)                 throw ( NotConnectedException,
-                                                                        BufferSizeExceededException,
-                                                                        RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available()                          throw ( NotConnectedException,
-                                                                        RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput()                          throw ( NotConnectedException,
-                                                                        RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override;
+    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 
 public: // XDataInputStream
-    virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) override;
-    virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) override;
-    virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) override;
+    virtual sal_Int8 SAL_CALL readBoolean() override;
+    virtual sal_Int8 SAL_CALL readByte() override;
+    virtual sal_Unicode SAL_CALL readChar() override;
+    virtual sal_Int16 SAL_CALL readShort() override;
+    virtual sal_Int32 SAL_CALL readLong() override;
+    virtual sal_Int64 SAL_CALL readHyper() override;
+    virtual float SAL_CALL readFloat() override;
+    virtual double SAL_CALL readDouble() override;
+    virtual OUString SAL_CALL readUTF() override;
 
 
 public: // XActiveDataSink
-    virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference< XInputStream > SAL_CALL getInputStream() throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream) override;
+    virtual Reference< XInputStream > SAL_CALL getInputStream() override;
 
 public: // XConnectable
-    virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception) override;
-    virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException, std::exception) override;
-    virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) override ;
+    virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) override;
+    virtual Reference < XConnectable > SAL_CALL getPredecessor() override;
+    virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) override;
+    virtual Reference < XConnectable > SAL_CALL getSuccessor() override ;
 
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw (std::exception) override;
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames() throw (std::exception) override;
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override;
+    OUString                     SAL_CALL getImplementationName() override;
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames() override;
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) override;
 
 protected:
 
@@ -118,9 +107,6 @@ protected:
 
 // XInputStream
 sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
      sal_Int32 nRead;
 
@@ -137,9 +123,6 @@ sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBy
 }
 
 sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
      sal_Int32 nRead;
      if( m_bValidStream ) {
@@ -152,9 +135,6 @@ sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32
      return nRead;
 }
 void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip)
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
      if( m_bValidStream ) {
          m_input->skipBytes( nBytesToSkip );
@@ -167,8 +147,6 @@ void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip)
 
 
 sal_Int32 ODataInputStream::available()
-    throw ( NotConnectedException,
-            RuntimeException, std::exception)
 {
      sal_Int32 nAvail;
 
@@ -184,8 +162,6 @@ sal_Int32 ODataInputStream::available()
 }
 
 void ODataInputStream::closeInput()
-    throw ( NotConnectedException,
-            RuntimeException, std::exception)
 {
      if( m_bValidStream ) {
          m_input->closeInput( );
@@ -204,12 +180,12 @@ void ODataInputStream::closeInput()
 //== XDataInputStream ===========================================
 
 // XDataInputStream
-sal_Int8 ODataInputStream::readBoolean() throw (IOException, RuntimeException, std::exception)
+sal_Int8 ODataInputStream::readBoolean()
 {
     return readByte();
 }
 
-sal_Int8 ODataInputStream::readByte()    throw (IOException, RuntimeException, std::exception)
+sal_Int8 ODataInputStream::readByte()
 {
     Sequence<sal_Int8> aTmp(1);
     if( 1 != readBytes( aTmp, 1 ) )
@@ -219,7 +195,7 @@ sal_Int8 ODataInputStream::readByte()    throw (IOException, RuntimeException, s
     return aTmp.getArray()[0];
 }
 
-sal_Unicode ODataInputStream::readChar() throw (IOException, RuntimeException, std::exception)
+sal_Unicode ODataInputStream::readChar()
 {
     Sequence<sal_Int8> aTmp(2);
     if( 2 != readBytes( aTmp, 2 ) )
@@ -231,7 +207,7 @@ sal_Unicode ODataInputStream::readChar() throw (IOException, RuntimeException, s
     return ((sal_Unicode)pBytes[0] << 8) + pBytes[1];
 }
 
-sal_Int16 ODataInputStream::readShort() throw (IOException, RuntimeException, std::exception)
+sal_Int16 ODataInputStream::readShort()
 {
     Sequence<sal_Int8> aTmp(2);
     if( 2 != readBytes( aTmp, 2 ) )
@@ -244,7 +220,7 @@ sal_Int16 ODataInputStream::readShort() throw (IOException, RuntimeException, st
 }
 
 
-sal_Int32 ODataInputStream::readLong() throw (IOException, RuntimeException, std::exception)
+sal_Int32 ODataInputStream::readLong()
 {
     Sequence<sal_Int8> aTmp(4);
     if( 4 != readBytes( aTmp, 4 ) )
@@ -257,7 +233,7 @@ sal_Int32 ODataInputStream::readLong() throw (IOException, RuntimeException, std
 }
 
 
-sal_Int64 ODataInputStream::readHyper() throw (IOException, RuntimeException, std::exception)
+sal_Int64 ODataInputStream::readHyper()
 {
     Sequence<sal_Int8> aTmp(8);
     if( 8 != readBytes( aTmp, 8 ) )
@@ -277,14 +253,14 @@ sal_Int64 ODataInputStream::readHyper() throw (IOException, RuntimeException, st
         pBytes[7];
 }
 
-float ODataInputStream::readFloat() throw (IOException, RuntimeException, std::exception)
+float ODataInputStream::readFloat()
 {
     union { float f; sal_uInt32 n; } a;
     a.n = readLong();
     return a.f;
 }
 
-double ODataInputStream::readDouble() throw (IOException, RuntimeException, std::exception)
+double ODataInputStream::readDouble()
 {
     union { double d; struct { sal_uInt32 n1; sal_uInt32 n2; } ad; } a;
 #if defined OSL_LITENDIAN
@@ -297,7 +273,7 @@ double ODataInputStream::readDouble() throw (IOException, RuntimeException, std:
     return a.d;
 }
 
-OUString ODataInputStream::readUTF() throw (IOException, RuntimeException, std::exception)
+OUString ODataInputStream::readUTF()
 {
     sal_uInt16              nShortLen = (sal_uInt16)readShort();
     sal_Int32               nUTFLen;
@@ -378,7 +354,6 @@ OUString ODataInputStream::readUTF() throw (IOException, RuntimeException, std::
 
 // XActiveDataSource
 void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream)
-    throw (RuntimeException, std::exception)
 {
 
     if( m_input != aStream ) {
@@ -391,14 +366,14 @@ void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream)
     m_bValidStream = m_input.is();
 }
 
-Reference< XInputStream > ODataInputStream::getInputStream() throw (RuntimeException, std::exception)
+Reference< XInputStream > ODataInputStream::getInputStream()
 {
     return m_input;
 }
 
 
 // XDataSink
-void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw (RuntimeException, std::exception)
+void ODataInputStream::setSuccessor( const Reference < XConnectable > &r )
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r ) {
@@ -413,7 +388,7 @@ void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw
      }
 }
 
-Reference < XConnectable > ODataInputStream::getSuccessor() throw (RuntimeException, std::exception)
+Reference < XConnectable > ODataInputStream::getSuccessor()
 {
     return m_succ;
 }
@@ -421,7 +396,6 @@ Reference < XConnectable > ODataInputStream::getSuccessor() throw (RuntimeExcept
 
 // XDataSource
 void ODataInputStream::setPredecessor( const Reference < XConnectable > &r )
-    throw (RuntimeException, std::exception)
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -431,25 +405,25 @@ void ODataInputStream::setPredecessor( const Reference < XConnectable > &r )
         }
     }
 }
-Reference < XConnectable > ODataInputStream::getPredecessor() throw (RuntimeException, std::exception)
+Reference < XConnectable > ODataInputStream::getPredecessor()
 {
     return m_pred;
 }
 
 // XServiceInfo
-OUString ODataInputStream::getImplementationName() throw (std::exception)
+OUString ODataInputStream::getImplementationName()
 {
     return ODataInputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool ODataInputStream::supportsService(const OUString& ServiceName) throw (std::exception)
+sal_Bool ODataInputStream::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > ODataInputStream::getSupportedServiceNames() throw (std::exception)
+Sequence< OUString > ODataInputStream::getSupportedServiceNames()
 {
     return ODataInputStream_getSupportedServiceNames();
 }
@@ -463,7 +437,6 @@ Sequence< OUString > ODataInputStream::getSupportedServiceNames() throw (std::ex
 
 Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance(
     SAL_UNUSED_PARAMETER const Reference < XComponentContext > & )
-    throw( Exception)
 {
     ODataInputStream *p = new ODataInputStream;
     return Reference< XInterface > ( static_cast<OWeakObject *>(p) );
@@ -495,49 +468,35 @@ public:
         }
 
 public: // XOutputStream
-    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush()
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput()
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 
 public: // XDataOutputStream
-    virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBoolean(sal_Bool Value) override;
+    virtual void SAL_CALL writeByte(sal_Int8 Value) override;
+    virtual void SAL_CALL writeChar(sal_Unicode Value) override;
+    virtual void SAL_CALL writeShort(sal_Int16 Value) override;
+    virtual void SAL_CALL writeLong(sal_Int32 Value) override;
+    virtual void SAL_CALL writeHyper(sal_Int64 Value) override;
+    virtual void SAL_CALL writeFloat(float Value) override;
+    virtual void SAL_CALL writeDouble(double Value) override;
+    virtual void SAL_CALL writeUTF(const OUString& Value) override;
 
 public: // XActiveDataSource
-    virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference < XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream) override;
+    virtual Reference < XOutputStream > SAL_CALL getOutputStream() override;
 
 public: // XConnectable
-    virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference < XConnectable > SAL_CALL getPredecessor()
-        throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference < XConnectable > SAL_CALL getSuccessor()
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) override;
+    virtual Reference < XConnectable > SAL_CALL getPredecessor() override;
+    virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) override;
+    virtual Reference < XConnectable > SAL_CALL getSuccessor() override;
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw (std::exception) override;
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames() throw (std::exception) override;
-    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override;
+    OUString                     SAL_CALL getImplementationName() override;
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames() override;
+    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) override;
 
 protected:
     Reference < XConnectable >  m_succ;
@@ -548,9 +507,6 @@ protected:
 
 // XOutputStream
 void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
     if( m_bValidStream )
     {
@@ -562,9 +518,6 @@ void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
 }
 
 void ODataOutputStream::flush()
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
     if( m_bValidStream )
     {
@@ -579,9 +532,6 @@ void ODataOutputStream::flush()
 
 
 void ODataOutputStream::closeOutput()
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
     if( m_bValidStream )
     {
@@ -598,8 +548,6 @@ void ODataOutputStream::closeOutput()
 
 // XDataOutputStream
 void ODataOutputStream::writeBoolean(sal_Bool Value)
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     if( Value )
     {
@@ -613,8 +561,6 @@ void ODataOutputStream::writeBoolean(sal_Bool Value)
 
 
 void ODataOutputStream::writeByte(sal_Int8 Value)
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 1 );
     aTmp.getArray()[0] = Value;
@@ -622,8 +568,6 @@ void ODataOutputStream::writeByte(sal_Int8 Value)
 }
 
 void ODataOutputStream::writeChar(sal_Unicode Value)
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 2 );
     sal_Int8 * pBytes = aTmp.getArray();
@@ -634,8 +578,6 @@ void ODataOutputStream::writeChar(sal_Unicode Value)
 
 
 void ODataOutputStream::writeShort(sal_Int16 Value)
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 2 );
     sal_Int8 * pBytes = aTmp.getArray();
@@ -645,8 +587,6 @@ void ODataOutputStream::writeShort(sal_Int16 Value)
 }
 
 void ODataOutputStream::writeLong(sal_Int32 Value)
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 4 );
     sal_Int8 * pBytes = aTmp.getArray();
@@ -658,8 +598,6 @@ void ODataOutputStream::writeLong(sal_Int32 Value)
 }
 
 void ODataOutputStream::writeHyper(sal_Int64 Value)
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 8 );
     sal_Int8 * pBytes = aTmp.getArray();
@@ -676,8 +614,6 @@ void ODataOutputStream::writeHyper(sal_Int64 Value)
 
 
 void ODataOutputStream::writeFloat(float Value)
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     union { float f; sal_uInt32 n; } a;
     a.f = Value;
@@ -685,8 +621,6 @@ void ODataOutputStream::writeFloat(float Value)
 }
 
 void ODataOutputStream::writeDouble(double Value)
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     union { double d; struct { sal_uInt32 n1; sal_uInt32 n2; } ad; } a;
     a.d = Value;
@@ -700,8 +634,6 @@ void ODataOutputStream::writeDouble(double Value)
 }
 
 void ODataOutputStream::writeUTF(const OUString& Value)
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     sal_Int32 nStrLen = Value.getLength();
     const sal_Unicode * pStr = Value.getStr();
@@ -760,7 +692,6 @@ void ODataOutputStream::writeUTF(const OUString& Value)
 
 // XActiveDataSource
 void ODataOutputStream::setOutputStream(const Reference< XOutputStream > & aStream)
-    throw (RuntimeException, std::exception)
 {
     if( m_output != aStream ) {
         m_output = aStream;
@@ -772,7 +703,6 @@ void ODataOutputStream::setOutputStream(const Reference< XOutputStream > & aStre
 }
 
 Reference< XOutputStream > ODataOutputStream::getOutputStream()
-    throw (RuntimeException, std::exception)
 {
     return m_output;
 }
@@ -780,7 +710,6 @@ Reference< XOutputStream > ODataOutputStream::getOutputStream()
 
 // XDataSink
 void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r )
-    throw (RuntimeException, std::exception)
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r )
@@ -796,14 +725,14 @@ void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r )
          }
      }
 }
-Reference < XConnectable > ODataOutputStream::getSuccessor()    throw (RuntimeException, std::exception)
+Reference < XConnectable > ODataOutputStream::getSuccessor()
 {
     return m_succ;
 }
 
 
 // XDataSource
-void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )   throw (RuntimeException, std::exception)
+void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -813,33 +742,32 @@ void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )
         }
     }
 }
-Reference < XConnectable > ODataOutputStream::getPredecessor()  throw (RuntimeException, std::exception)
+Reference < XConnectable > ODataOutputStream::getPredecessor()
 {
     return m_pred;
 }
 
 
 // XServiceInfo
-OUString ODataOutputStream::getImplementationName() throw (std::exception)
+OUString ODataOutputStream::getImplementationName()
 {
     return ODataOutputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool ODataOutputStream::supportsService(const OUString& ServiceName) throw (std::exception)
+sal_Bool ODataOutputStream::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > ODataOutputStream::getSupportedServiceNames() throw (std::exception)
+Sequence< OUString > ODataOutputStream::getSupportedServiceNames()
 {
     return ODataOutputStream_getSupportedServiceNames();
 }
 
 Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance(
     SAL_UNUSED_PARAMETER const Reference < XComponentContext > & )
-    throw(Exception)
 {
     ODataOutputStream *p = new ODataOutputStream;
     Reference< XInterface > xService = *p;
@@ -899,60 +827,50 @@ public:
 
 public:
     // XOutputStream
-    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override
+    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) override
         { ODataOutputStream::writeBytes( aData ); }
 
-    virtual void SAL_CALL flush()
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override
+    virtual void SAL_CALL flush() override
         { ODataOutputStream::flush(); }
 
-    virtual void SAL_CALL closeOutput()
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override
+    virtual void SAL_CALL closeOutput() override
         { ODataOutputStream::closeOutput(); }
 
 public:
     // XDataOutputStream
-    virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL writeBoolean(sal_Bool Value) override
                 { ODataOutputStream::writeBoolean( Value ); }
-    virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL writeByte(sal_Int8 Value) override
                 { ODataOutputStream::writeByte( Value ); }
-    virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL writeChar(sal_Unicode Value) override
                 { ODataOutputStream::writeChar( Value ); }
-    virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL writeShort(sal_Int16 Value) override
                 { ODataOutputStream::writeShort( Value ); }
-    virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL writeLong(sal_Int32 Value) override
                 { ODataOutputStream::writeLong( Value ); }
-    virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL writeHyper(sal_Int64 Value) override
                 { ODataOutputStream::writeHyper( Value ); }
-    virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL writeFloat(float Value) override
                 { ODataOutputStream::writeFloat( Value ); }
-    virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL writeDouble(double Value) override
                 { ODataOutputStream::writeDouble( Value ); }
-    virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL writeUTF(const OUString& Value) override
                 { ODataOutputStream::writeUTF( Value );}
 
     // XObjectOutputStream
-        virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) override;
 
 public: // XMarkableStream
-    virtual sal_Int32 SAL_CALL createMark()                 throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteMark(sal_Int32 Mark)            throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)       throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL jumpToFurthest()          throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
-        throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL createMark() override;
+    virtual void SAL_CALL deleteMark(sal_Int32 Mark) override;
+    virtual void SAL_CALL jumpToMark(sal_Int32 nMark) override;
+    virtual void SAL_CALL jumpToFurthest() override;
+    virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) override;
 
 public: // XServiceInfo
-    OUString                   SAL_CALL   getImplementationName() throw (std::exception) override;
-    Sequence< OUString >       SAL_CALL   getSupportedServiceNames() throw (std::exception) override;
-    sal_Bool                   SAL_CALL   supportsService(const OUString& ServiceName) throw (std::exception) override;
+    OUString                   SAL_CALL   getImplementationName() override;
+    Sequence< OUString >       SAL_CALL   getSupportedServiceNames() override;
+    sal_Bool                   SAL_CALL   supportsService(const OUString& ServiceName) override;
 
 private:
     void connectToMarkable();
@@ -963,7 +881,7 @@ private:
     bool                            m_bValidMarkable;
 };
 
-void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj ) throw (css::io::IOException, css::uno::RuntimeException, std::exception)
+void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj )
 {
 
     connectToMarkable();
@@ -1059,7 +977,6 @@ void OObjectOutputStream::connectToMarkable()
 
 
 sal_Int32 OObjectOutputStream::createMark()
-    throw (IOException, RuntimeException, std::exception)
 {
     connectToMarkable();    // throws an exception, if a markable is not connected !
 
@@ -1067,7 +984,6 @@ sal_Int32 OObjectOutputStream::createMark()
 }
 
 void OObjectOutputStream::deleteMark(sal_Int32 Mark)
-    throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1077,7 +993,6 @@ void OObjectOutputStream::deleteMark(sal_Int32 Mark)
 }
 
 void OObjectOutputStream::jumpToMark(sal_Int32 nMark)
-    throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1088,14 +1003,12 @@ void OObjectOutputStream::jumpToMark(sal_Int32 nMark)
 
 
 void OObjectOutputStream::jumpToFurthest()
-    throw (IOException, RuntimeException, std::exception)
 {
     connectToMarkable();
     m_rMarkable->jumpToFurthest();
 }
 
 sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark)
-    throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1107,7 +1020,6 @@ sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark)
 
 Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance(
     SAL_UNUSED_PARAMETER const Reference < XComponentContext > & )
-    throw(Exception)
 {
     OObjectOutputStream *p = new OObjectOutputStream;
     return  Reference< XInterface > ( (static_cast< OWeakObject *  >(p)) );
@@ -1125,19 +1037,19 @@ Sequence<OUString> OObjectOutputStream_getSupportedServiceNames()
 }
 
 // XServiceInfo
-OUString OObjectOutputStream::getImplementationName() throw (std::exception)
+OUString OObjectOutputStream::getImplementationName()
 {
     return OObjectOutputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OObjectOutputStream::supportsService(const OUString& ServiceName) throw (std::exception)
+sal_Bool OObjectOutputStream::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OObjectOutputStream::getSupportedServiceNames() throw (std::exception)
+Sequence< OUString > OObjectOutputStream::getSupportedServiceNames()
 {
     return OObjectOutputStream_getSupportedServiceNames();
 }
@@ -1156,70 +1068,55 @@ public:
         }
 
 public: // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override
         { return ODataInputStream::readBytes( aData , nBytesToRead ); }
 
-    virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override
         { return ODataInputStream::readSomeBytes( aData, nMaxBytesToRead ); }
 
-    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override
+    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) override
         { ODataInputStream::skipBytes( nBytesToSkip ); }
 
-    virtual sal_Int32 SAL_CALL available()
-        throw ( NotConnectedException,
-                RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL available() override
         { return ODataInputStream::available(); }
 
-    virtual void SAL_CALL closeInput()
-        throw ( NotConnectedException,
-                RuntimeException, std::exception) override
+    virtual void SAL_CALL closeInput() override
         { ODataInputStream::closeInput(); }
 
 public: // XDataInputStream
-    virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) override
+    virtual sal_Int8 SAL_CALL readBoolean() override
                 { return ODataInputStream::readBoolean(); }
-    virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) override
+    virtual sal_Int8 SAL_CALL readByte() override
                 { return ODataInputStream::readByte(); }
-    virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) override
+    virtual sal_Unicode SAL_CALL readChar() override
                 { return ODataInputStream::readChar(); }
-    virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL readShort() override
                 { return ODataInputStream::readShort(); }
-    virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL readLong() override
                 { return ODataInputStream::readLong(); }
-    virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) override
+    virtual sal_Int64 SAL_CALL readHyper() override
                 { return ODataInputStream::readHyper(); }
-    virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) override
+    virtual float SAL_CALL readFloat() override
                 { return ODataInputStream::readFloat(); }
-    virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) override
+    virtual double SAL_CALL readDouble() override
         { return ODataInputStream::readDouble(); }
-    virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) override
+    virtual OUString SAL_CALL readUTF() override
                 { return ODataInputStream::readUTF(); }
 
 public: // XObjectInputStream
-        virtual Reference< XPersistObject > SAL_CALL readObject( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        virtual Reference< XPersistObject > SAL_CALL readObject( ) override;
 
 public: // XMarkableStream
-    virtual sal_Int32 SAL_CALL createMark()
-        throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteMark(sal_Int32 Mark)            throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)       throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL jumpToFurthest()          throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
-        throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL createMark() override;
+    virtual void SAL_CALL deleteMark(sal_Int32 Mark) override;
+    virtual void SAL_CALL jumpToMark(sal_Int32 nMark) override;
+    virtual void SAL_CALL jumpToFurthest() override;
+    virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) override;
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw (std::exception) override;
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames() throw (std::exception) override;
-    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override;
+    OUString                     SAL_CALL getImplementationName() override;
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames() override;
+    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) override;
 
 private:
     void connectToMarkable();
@@ -1232,7 +1129,7 @@ private:
 
 };
 
-Reference< XPersistObject >  OObjectInputStream::readObject() throw (css::io::IOException, css::uno::RuntimeException, std::exception)
+Reference< XPersistObject >  OObjectInputStream::readObject()
 {
     // check if chain contains a XMarkableStream
     connectToMarkable();
@@ -1347,14 +1244,14 @@ void OObjectInputStream::connectToMarkable()
     }
 }
 
-sal_Int32 OObjectInputStream::createMark()              throw (IOException, RuntimeException, std::exception)
+sal_Int32 OObjectInputStream::createMark()
 {
     connectToMarkable();    // throws an exception, if a markable is not connected !
 
     return m_rMarkable->createMark();
 }
 
-void OObjectInputStream::deleteMark(sal_Int32 Mark)         throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
+void OObjectInputStream::deleteMark(sal_Int32 Mark)
 {
     if( ! m_bValidMarkable )
     {
@@ -1363,7 +1260,7 @@ void OObjectInputStream::deleteMark(sal_Int32 Mark)         throw (IOException,
     m_rMarkable->deleteMark( Mark );
 }
 
-void OObjectInputStream::jumpToMark(sal_Int32 nMark)        throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
+void OObjectInputStream::jumpToMark(sal_Int32 nMark)
 {
     if( ! m_bValidMarkable )
     {
@@ -1371,14 +1268,13 @@ void OObjectInputStream::jumpToMark(sal_Int32 nMark)        throw (IOException,
     }
     m_rMarkable->jumpToMark( nMark );
 }
-void OObjectInputStream::jumpToFurthest()           throw (IOException, RuntimeException, std::exception)
+void OObjectInputStream::jumpToFurthest()
 {
     connectToMarkable();
     m_rMarkable->jumpToFurthest();
 }
 
 sal_Int32 OObjectInputStream::offsetToMark(sal_Int32 nMark)
-    throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1388,24 +1284,24 @@ sal_Int32 OObjectInputStream::offsetToMark(sal_Int32 nMark)
 }
 
 // XServiceInfo
-OUString OObjectInputStream::getImplementationName() throw (std::exception)
+OUString OObjectInputStream::getImplementationName()
 {
     return OObjectInputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OObjectInputStream::supportsService(const OUString& ServiceName) throw (std::exception)
+sal_Bool OObjectInputStream::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OObjectInputStream::getSupportedServiceNames() throw (std::exception)
+Sequence< OUString > OObjectInputStream::getSupportedServiceNames()
 {
     return OObjectInputStream_getSupportedServiceNames();
 }
 
-Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference < XComponentContext > & rCtx ) throw(Exception)
+Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference < XComponentContext > & rCtx )
 {
     OObjectInputStream *p = new OObjectInputStream( rCtx );
     return Reference< XInterface> ( (static_cast< OWeakObject * >(p)) );
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index af4e9f248456..dc9fbb8b260a 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -78,61 +78,37 @@ public:
     OMarkableOutputStream(  );
 
 public: // XOutputStream
-    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush()
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput()
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 
 public: // XMarkable
-    virtual sal_Int32 SAL_CALL createMark()
-        throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteMark(sal_Int32 Mark)
-        throw (IOException,
-               IllegalArgumentException,
-               RuntimeException, std::exception) override;
-    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)
-        throw (IOException,
-               IllegalArgumentException,
-               RuntimeException, std::exception) override;
-    virtual void SAL_CALL jumpToFurthest()
-        throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
-        throw (IOException,
-               IllegalArgumentException,
-               RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL createMark() override;
+    virtual void SAL_CALL deleteMark(sal_Int32 Mark) override;
+    virtual void SAL_CALL jumpToMark(sal_Int32 nMark) override;
+    virtual void SAL_CALL jumpToFurthest() override;
+    virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) override;
 
 public: // XActiveDataSource
-    virtual void SAL_CALL setOutputStream(const Reference < XOutputStream > & aStream)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference < XOutputStream > SAL_CALL getOutputStream()
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setOutputStream(const Reference < XOutputStream > & aStream) override;
+    virtual Reference < XOutputStream > SAL_CALL getOutputStream() override;
 
 public: // XConnectable
-    virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference<  XConnectable >  SAL_CALL getSuccessor() throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor) override;
+    virtual Reference < XConnectable > SAL_CALL getPredecessor() override;
+    virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) override;
+    virtual Reference<  XConnectable >  SAL_CALL getSuccessor() override;
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw (std::exception) override;
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames() throw (std::exception) override;
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override;
+    OUString                     SAL_CALL getImplementationName() override;
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames() override;
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) override;
 
 private:
     // helper methods
     /// @throws NotConnectedException
     /// @throws BufferSizeExceededException
-    void checkMarksAndFlush() throw( NotConnectedException, BufferSizeExceededException);
+    void checkMarksAndFlush();
 
     Reference< XConnectable > m_succ;
     Reference< XConnectable > m_pred;
@@ -158,9 +134,6 @@ OMarkableOutputStream::OMarkableOutputStream( )
 
 // XOutputStream
 void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
     if( m_bValidStream ) {
         if( m_mapMarks.empty() && ( m_pBuffer->getSize() == 0 ) ) {
@@ -181,9 +154,6 @@ void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
 }
 
 void OMarkableOutputStream::flush()
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
     Reference< XOutputStream > output;
     {
@@ -201,9 +171,6 @@ void OMarkableOutputStream::flush()
 }
 
 void OMarkableOutputStream::closeOutput()
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
     if( m_bValidStream ) {
         MutexGuard guard( m_mutex );
@@ -229,8 +196,6 @@ void OMarkableOutputStream::closeOutput()
 
 
 sal_Int32 OMarkableOutputStream::createMark()
-    throw ( IOException,
-            RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     sal_Int32 nMark = m_nCurrentMark;
@@ -242,9 +207,6 @@ sal_Int32 OMarkableOutputStream::createMark()
 }
 
 void OMarkableOutputStream::deleteMark(sal_Int32 Mark)
-    throw( IOException,
-           IllegalArgumentException,
-           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark );
@@ -263,9 +225,6 @@ void OMarkableOutputStream::deleteMark(sal_Int32 Mark)
 }
 
 void OMarkableOutputStream::jumpToMark(sal_Int32 nMark)
-    throw (IOException,
-           IllegalArgumentException,
-           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark );
@@ -283,8 +242,6 @@ void OMarkableOutputStream::jumpToMark(sal_Int32 nMark)
 }
 
 void OMarkableOutputStream::jumpToFurthest()
-    throw (IOException,
-           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     m_nCurrentPos = m_pBuffer->getSize();
@@ -292,9 +249,6 @@ void OMarkableOutputStream::jumpToFurthest()
 }
 
 sal_Int32 OMarkableOutputStream::offsetToMark(sal_Int32 nMark)
-    throw (IOException,
-           IllegalArgumentException,
-           RuntimeException, std::exception)
 {
 
     MutexGuard guard( m_mutex );
@@ -314,7 +268,6 @@ sal_Int32 OMarkableOutputStream::offsetToMark(sal_Int32 nMark)
 
 // XActiveDataSource2
 void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& aStream)
-    throw (RuntimeException, std::exception)
 {
     if( m_output != aStream ) {
         m_output = aStream;
@@ -325,14 +278,13 @@ void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& a
     m_bValidStream = m_output.is();
 }
 
-Reference< XOutputStream > OMarkableOutputStream::getOutputStream() throw (RuntimeException, std::exception)
+Reference< XOutputStream > OMarkableOutputStream::getOutputStream()
 {
     return m_output;
 }
 
 
 void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r )
-    throw (RuntimeException, std::exception)
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r ) {
@@ -345,7 +297,7 @@ void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r )
          }
      }
 }
-Reference <XConnectable > OMarkableOutputStream::getSuccessor()     throw (RuntimeException, std::exception)
+Reference <XConnectable > OMarkableOutputStream::getSuccessor()
 {
     return m_succ;
 }
@@ -353,7 +305,6 @@ Reference <XConnectable > OMarkableOutputStream::getSuccessor()     throw (Runti
 
 // XDataSource
 void OMarkableOutputStream::setPredecessor( const Reference< XConnectable > &r )
-    throw (RuntimeException, std::exception)
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -363,7 +314,7 @@ void OMarkableOutputStream::setPredecessor( const Reference< XConnectable > &r )
         }
     }
 }
-Reference < XConnectable > OMarkableOutputStream::getPredecessor() throw (RuntimeException, std::exception)
+Reference < XConnectable > OMarkableOutputStream::getPredecessor()
 {
     return m_pred;
 }
@@ -371,8 +322,7 @@ Reference < XConnectable > OMarkableOutputStream::getPredecessor() throw (Runtim
 
 // private methods
 
-void OMarkableOutputStream::checkMarksAndFlush() throw(     NotConnectedException,
-                                                            BufferSizeExceededException)
+void OMarkableOutputStream::checkMarksAndFlush()
 {
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii;
 
@@ -406,19 +356,19 @@ void OMarkableOutputStream::checkMarksAndFlush() throw(     NotConnectedExceptio
 
 
 // XServiceInfo
-OUString OMarkableOutputStream::getImplementationName() throw (std::exception)
+OUString OMarkableOutputStream::getImplementationName()
 {
     return OMarkableOutputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OMarkableOutputStream::supportsService(const OUString& ServiceName) throw (std::exception)
+sal_Bool OMarkableOutputStream::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames() throw (std::exception)
+Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames()
 {
     return OMarkableOutputStream_getSupportedServiceNames();
 }
@@ -430,7 +380,6 @@ Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames() throw (st
 *------------------------*/
 Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance(
     SAL_UNUSED_PARAMETER const Reference < XComponentContext > & )
-    throw(Exception)
 {
     OMarkableOutputStream *p = new OMarkableOutputStream( );
 
@@ -469,55 +418,34 @@ public:
 
 
 public: // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override ;
-    virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
-        throw ( NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception) override;
-
-    virtual sal_Int32 SAL_CALL available()
-        throw ( NotConnectedException,
-                RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput() throw (NotConnectedException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override ;
+    virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override;
+    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) override;
+
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 
 public: // XMarkable
-    virtual sal_Int32 SAL_CALL createMark()
-        throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteMark(sal_Int32 Mark)
-        throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)
-        throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL jumpToFurthest()
-        throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
-        throw (IOException, IllegalArgumentException,RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL createMark() override;
+    virtual void SAL_CALL deleteMark(sal_Int32 Mark) override;
+    virtual void SAL_CALL jumpToMark(sal_Int32 nMark) override;
+    virtual void SAL_CALL jumpToFurthest() override;
+    virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) override;
 
 public: // XActiveDataSink
-    virtual void SAL_CALL setInputStream(const Reference < XInputStream > & aStream)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference < XInputStream > SAL_CALL getInputStream()
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setInputStream(const Reference < XInputStream > & aStream) override;
+    virtual Reference < XInputStream > SAL_CALL getInputStream() override;
 
 public: // XConnectable
-    virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference < XConnectable > SAL_CALL getPredecessor()
-        throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor)
-        throw (RuntimeException, std::exception) override;
-    virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor) override;
+    virtual Reference < XConnectable > SAL_CALL getPredecessor() override;
+    virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor) override;
+    virtual Reference < XConnectable > SAL_CALL getSuccessor() override;
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw (std::exception) override;
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames() throw (std::exception) override;
-    sal_Bool                         SAL_CALL  supportsService(const OUString& ServiceName) throw (std::exception) override;
+    OUString                     SAL_CALL getImplementationName() override;
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames() override;
+    sal_Bool                         SAL_CALL  supportsService(const OUString& ServiceName) override;
 
 private:
     void checkMarksAndFlush();
@@ -555,9 +483,6 @@ OMarkableInputStream::~OMarkableInputStream()
 // XInputStream
 
 sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
     sal_Int32 nBytesRead;
 
@@ -603,9 +528,6 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32
 
 
 sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
 
     sal_Int32 nBytesRead;
@@ -656,9 +578,6 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I
 
 
 void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
-    throw ( NotConnectedException,
-            BufferSizeExceededException,
-            RuntimeException, std::exception)
 {
     if ( nBytesToSkip < 0 )
         throw BufferSizeExceededException(
@@ -671,7 +590,7 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
     readBytes( seqDummy , nBytesToSkip );
 }
 
-sal_Int32 OMarkableInputStream::available() throw (NotConnectedException, RuntimeException, std::exception)
+sal_Int32 OMarkableInputStream::available()
 {
     sal_Int32 nAvail;
     if( m_bValidStream ) {
@@ -689,7 +608,7 @@ sal_Int32 OMarkableInputStream::available() throw (NotConnectedException, Runtim
 }
 
 
-void OMarkableInputStream::closeInput() throw (NotConnectedException, RuntimeException, std::exception)
+void OMarkableInputStream::closeInput()
 {
     if( m_bValidStream ) {
         MutexGuard guard( m_mutex );
@@ -714,7 +633,7 @@ void OMarkableInputStream::closeInput() throw (NotConnectedException, RuntimeExc
 
 // XMarkable
 
-sal_Int32 OMarkableInputStream::createMark()            throw (IOException, RuntimeException, std::exception)
+sal_Int32 OMarkableInputStream::createMark()
 {
     MutexGuard guard( m_mutex );
     sal_Int32 nMark = m_nCurrentMark;
@@ -725,7 +644,7 @@ sal_Int32 OMarkableInputStream::createMark()            throw (IOException, Runt
     return nMark;
 }
 
-void OMarkableInputStream::deleteMark(sal_Int32 Mark)       throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
+void OMarkableInputStream::deleteMark(sal_Int32 Mark)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark );
@@ -744,9 +663,6 @@ void OMarkableInputStream::deleteMark(sal_Int32 Mark)       throw (IOException,
 }
 
 void OMarkableInputStream::jumpToMark(sal_Int32 nMark)
-    throw (IOException,
-           IllegalArgumentException,
-           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark );
@@ -765,7 +681,7 @@ void OMarkableInputStream::jumpToMark(sal_Int32 nMark)
     }
 }
 
-void OMarkableInputStream::jumpToFurthest()         throw (IOException, RuntimeException, std::exception)
+void OMarkableInputStream::jumpToFurthest()
 {
     MutexGuard guard( m_mutex );
     m_nCurrentPos = m_pBuffer->getSize();
@@ -773,9 +689,6 @@ void OMarkableInputStream::jumpToFurthest()         throw (IOException, RuntimeE
 }
 
 sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark)
-     throw (IOException,
-           IllegalArgumentException,
-           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::const_iterator ii = m_mapMarks.find( nMark );
@@ -794,7 +707,6 @@ sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark)
 
 // XActiveDataSource
 void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStream)
-    throw (RuntimeException, std::exception)
 {
 
     if( m_input != aStream ) {
@@ -808,7 +720,7 @@ void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStr
 
 }
 
-Reference< XInputStream > OMarkableInputStream::getInputStream() throw (RuntimeException, std::exception)
+Reference< XInputStream > OMarkableInputStream::getInputStream()
 {
     return m_input;
 }
@@ -816,7 +728,6 @@ Reference< XInputStream > OMarkableInputStream::getInputStream() throw (RuntimeE
 
 // XDataSink
 void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r )
-    throw (RuntimeException, std::exception)
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r ) {
@@ -831,7 +742,7 @@ void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r )
      }
 }
 
-Reference < XConnectable >  OMarkableInputStream::getSuccessor() throw (RuntimeException, std::exception)
+Reference < XConnectable >  OMarkableInputStream::getSuccessor()
 {
     return m_succ;
 }
@@ -839,7 +750,6 @@ Reference < XConnectable >  OMarkableInputStream::getSuccessor() throw (RuntimeE
 
 // XDataSource
 void OMarkableInputStream::setPredecessor( const Reference < XConnectable >  &r )
-    throw (RuntimeException, std::exception)
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -849,7 +759,7 @@ void OMarkableInputStream::setPredecessor( const Reference < XConnectable >  &r
         }
     }
 }
-Reference< XConnectable >  OMarkableInputStream::getPredecessor() throw (RuntimeException, std::exception)
+Reference< XConnectable >  OMarkableInputStream::getPredecessor()
 {
     return m_pred;
 }
@@ -884,19 +794,19 @@ void OMarkableInputStream::checkMarksAndFlush()
 }
 
 // XServiceInfo
-OUString OMarkableInputStream::getImplementationName() throw (std::exception)
+OUString OMarkableInputStream::getImplementationName()
 {
     return OMarkableInputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) throw (std::exception)
+sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OMarkableInputStream::getSupportedServiceNames() throw (std::exception)
+Sequence< OUString > OMarkableInputStream::getSupportedServiceNames()
 {
     return OMarkableInputStream_getSupportedServiceNames();
 }
@@ -908,7 +818,6 @@ Sequence< OUString > OMarkableInputStream::getSupportedServiceNames() throw (std
 *------------------------*/
 Reference < XInterface > SAL_CALL OMarkableInputStream_CreateInstance(
     SAL_UNUSED_PARAMETER const Reference < XComponentContext > & )
-    throw(Exception)
 {
     OMarkableInputStream *p = new OMarkableInputStream( );
     return Reference< XInterface > ( static_cast<OWeakObject *>(p) );
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 4d70e6709ad3..abba00fa8bad 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -58,53 +58,29 @@ public:
     OPipeImpl( );
 
 public: // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-        throw(  NotConnectedException,
-                BufferSizeExceededException,
-                RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               RuntimeException, std::exception ) override;
-    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL available()
-        throw( NotConnectedException,
-               RuntimeException, std::exception ) override;
-    virtual void SAL_CALL closeInput()
-        throw( NotConnectedException,
-               RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override;
+    virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 
 public: // XOutputStream
 
-    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               RuntimeException, std::exception ) override;
-    virtual void SAL_CALL flush()
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               RuntimeException, std::exception ) override;
-    virtual void SAL_CALL closeOutput()
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               RuntimeException, std::exception ) override;
+    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 
 public: // XConnectable
-    virtual void SAL_CALL setPredecessor(const Reference< XConnectable >& aPredecessor)
-        throw( RuntimeException, std::exception ) override;
-    virtual Reference< XConnectable > SAL_CALL getPredecessor() throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor)
-        throw( RuntimeException, std::exception ) override;
-    virtual Reference < XConnectable > SAL_CALL getSuccessor() throw( RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL setPredecessor(const Reference< XConnectable >& aPredecessor) override;
+    virtual Reference< XConnectable > SAL_CALL getPredecessor() override;
+    virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor) override;
+    virtual Reference < XConnectable > SAL_CALL getSuccessor() override ;
 
 
 public: // XServiceInfo
-    OUString                    SAL_CALL getImplementationName() throw(std::exception  ) override;
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames() throw(std::exception  ) override;
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  ) override;
+    OUString                    SAL_CALL getImplementationName() override;
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames() override;
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) override;
 
 private:
 
@@ -133,7 +109,6 @@ OPipeImpl::OPipeImpl()
 
 
 sal_Int32 OPipeImpl::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-    throw( NotConnectedException, BufferSizeExceededException,RuntimeException, std::exception )
 {
     while( true )
     {
@@ -171,9 +146,6 @@ sal_Int32 OPipeImpl::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRe
 
 
 sal_Int32 OPipeImpl::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
-    throw( NotConnectedException,
-           BufferSizeExceededException,
-           RuntimeException, std::exception )
 {
     while( true ) {
         {
@@ -205,9 +177,6 @@ sal_Int32 OPipeImpl::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBy
 
 
 void OPipeImpl::skipBytes(sal_Int32 nBytesToSkip)
-    throw( NotConnectedException,
-           BufferSizeExceededException,
-           RuntimeException, std::exception )
 {
     MutexGuard guard( m_mutexAccess );
     if( m_bInputStreamClosed )
@@ -234,8 +203,6 @@ void OPipeImpl::skipBytes(sal_Int32 nBytesToSkip)
 
 
 sal_Int32 OPipeImpl::available()
-    throw( NotConnectedException,
-           RuntimeException, std::exception )
  {
     MutexGuard guard( m_mutexAccess );
     if( m_bInputStreamClosed )
@@ -248,8 +215,6 @@ sal_Int32 OPipeImpl::available()
 }
 
 void OPipeImpl::closeInput()
-    throw( NotConnectedException,
-           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutexAccess );
 
@@ -266,9 +231,6 @@ void OPipeImpl::closeInput()
 
 
 void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
-    throw( NotConnectedException,
-           BufferSizeExceededException,
-           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutexAccess );
 
@@ -313,18 +275,12 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
 
 
 void OPipeImpl::flush()
-    throw( NotConnectedException,
-           BufferSizeExceededException,
-           RuntimeException, std::exception)
 {
     // nothing to do for a pipe
     return;
 }
 
 void OPipeImpl::closeOutput()
-    throw( NotConnectedException,
-           BufferSizeExceededException,
-           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutexAccess );
 
@@ -336,7 +292,6 @@ void OPipeImpl::closeOutput()
 
 
 void OPipeImpl::setSuccessor( const Reference < XConnectable >  &r )
-    throw( RuntimeException, std::exception )
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r ) {
@@ -351,7 +306,7 @@ void OPipeImpl::setSuccessor( const Reference < XConnectable >  &r )
      }
 }
 
-Reference < XConnectable > OPipeImpl::getSuccessor()    throw( RuntimeException, std::exception )
+Reference < XConnectable > OPipeImpl::getSuccessor()
 {
     return m_succ;
 }
@@ -359,7 +314,6 @@ Reference < XConnectable > OPipeImpl::getSuccessor()    throw( RuntimeException,
 
 // XDataSource
 void OPipeImpl::setPredecessor( const Reference < XConnectable > &r )
-    throw( RuntimeException, std::exception )
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -370,26 +324,26 @@ void OPipeImpl::setPredecessor( const Reference < XConnectable > &r )
     }
 }
 
-Reference < XConnectable > OPipeImpl::getPredecessor() throw( RuntimeException, std::exception )
+Reference < XConnectable > OPipeImpl::getPredecessor()
 {
     return m_pred;
 }
 
 
 // XServiceInfo
-OUString OPipeImpl::getImplementationName() throw(std::exception  )
+OUString OPipeImpl::getImplementationName()
 {
     return OPipeImpl_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OPipeImpl::supportsService(const OUString& ServiceName) throw(std::exception  )
+sal_Bool OPipeImpl::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OPipeImpl::getSupportedServiceNames() throw(std::exception  )
+Sequence< OUString > OPipeImpl::getSupportedServiceNames()
 {
     return OPipeImpl_getSupportedServiceNames();
 }
@@ -402,7 +356,6 @@ Sequence< OUString > OPipeImpl::getSupportedServiceNames() throw(std::exception
 
 Reference < XInterface > SAL_CALL OPipeImpl_CreateInstance(
     SAL_UNUSED_PARAMETER const Reference < XComponentContext > & )
-    throw(Exception)
 {
     OPipeImpl *p = new OPipeImpl;
 
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 147ba94be334..26ecb927e497 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -80,29 +80,29 @@ namespace io_stm {
         virtual ~Pump() override;
 
         // XActiveDataSource
-        virtual void SAL_CALL setOutputStream( const Reference< css::io::XOutputStream >& xOutput ) throw(std::exception) override;
-        virtual Reference< css::io::XOutputStream > SAL_CALL getOutputStream() throw(std::exception) override;
+        virtual void SAL_CALL setOutputStream( const Reference< css::io::XOutputStream >& xOutput ) override;
+        virtual Reference< css::io::XOutputStream > SAL_CALL getOutputStream() override;
 
         // XActiveDataSink
-        virtual void SAL_CALL setInputStream( const Reference< css::io::XInputStream >& xStream ) throw(std::exception) override;
-        virtual Reference< css::io::XInputStream > SAL_CALL getInputStream() throw(std::exception) override;
+        virtual void SAL_CALL setInputStream( const Reference< css::io::XInputStream >& xStream ) override;
+        virtual Reference< css::io::XInputStream > SAL_CALL getInputStream() override;
 
         // XActiveDataControl
-        virtual void SAL_CALL addListener( const Reference< css::io::XStreamListener >& xListener ) throw(std::exception) override;
-        virtual void SAL_CALL removeListener( const Reference< css::io::XStreamListener >& xListener ) throw(std::exception) override;
-        virtual void SAL_CALL start() throw( RuntimeException, std::exception ) override;
-        virtual void SAL_CALL terminate() throw(std::exception) override;
+        virtual void SAL_CALL addListener( const Reference< css::io::XStreamListener >& xListener ) override;
+        virtual void SAL_CALL removeListener( const Reference< css::io::XStreamListener >& xListener ) override;
+        virtual void SAL_CALL start() override;
+        virtual void SAL_CALL terminate() override;
 
         // XConnectable
-        virtual void SAL_CALL setPredecessor( const Reference< css::io::XConnectable >& xPred ) throw(std::exception) override;
-        virtual Reference< css::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) override;
-        virtual void SAL_CALL setSuccessor( const Reference< css::io::XConnectable >& xSucc ) throw(std::exception) override;
-        virtual Reference< css::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) override;
+        virtual void SAL_CALL setPredecessor( const Reference< css::io::XConnectable >& xPred ) override;
+        virtual Reference< css::io::XConnectable > SAL_CALL getPredecessor() override;
+        virtual void SAL_CALL setSuccessor( const Reference< css::io::XConnectable >& xSucc ) override;
+        virtual Reference< css::io::XConnectable > SAL_CALL getSuccessor() override;
 
     public: // XServiceInfo
-        virtual OUString    SAL_CALL getImplementationName() throw(std::exception  ) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception  ) override;
-        virtual sal_Bool     SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  ) override;
+        virtual OUString    SAL_CALL getImplementationName() override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+        virtual sal_Bool     SAL_CALL supportsService(const OUString& ServiceName) override;
     };
 
 Pump::Pump() : m_aThread( nullptr ),
@@ -304,28 +304,28 @@ void Pump::run()
  * XConnectable
  */
 
-void Pump::setPredecessor( const Reference< XConnectable >& xPred ) throw(std::exception)
+void Pump::setPredecessor( const Reference< XConnectable >& xPred )
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xPred = xPred;
 }
 
 
-Reference< XConnectable > Pump::getPredecessor() throw(std::exception)
+Reference< XConnectable > Pump::getPredecessor()
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xPred;
 }
 
 
-void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw(std::exception)
+void Pump::setSuccessor( const Reference< XConnectable >& xSucc )
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xSucc = xSucc;
 }
 
 
-Reference< XConnectable > Pump::getSuccessor() throw(std::exception)
+Reference< XConnectable > Pump::getSuccessor()
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xSucc;
@@ -336,19 +336,19 @@ Reference< XConnectable > Pump::getSuccessor() throw(std::exception)
  * XActiveDataControl
  */
 
-void Pump::addListener( const Reference< XStreamListener >& xListener ) throw(std::exception)
+void Pump::addListener( const Reference< XStreamListener >& xListener )
 {
     m_cnt.addInterface( xListener );
 }
 
 
-void Pump::removeListener( const Reference< XStreamListener >& xListener ) throw(std::exception)
+void Pump::removeListener( const Reference< XStreamListener >& xListener )
 {
     m_cnt.removeInterface( xListener );
 }
 
 
-void Pump::start() throw( RuntimeException, std::exception )
+void Pump::start()
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_aThread = osl_createSuspendedThread(Pump::static_run,this);
@@ -367,7 +367,7 @@ void Pump::start() throw( RuntimeException, std::exception )
 }
 
 
-void Pump::terminate() throw(std::exception)
+void Pump::terminate()
 {
     close();
 
@@ -384,7 +384,7 @@ void Pump::terminate() throw(std::exception)
  * XActiveDataSink
  */
 
-void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw(std::exception)
+void Pump::setInputStream( const Reference< XInputStream >& xStream )
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xInput = xStream;
@@ -395,7 +395,7 @@ void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw(std:
 }
 
 
-Reference< XInputStream > Pump::getInputStream() throw(std::exception)
+Reference< XInputStream > Pump::getInputStream()
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xInput;
@@ -406,7 +406,7 @@ Reference< XInputStream > Pump::getInputStream() throw(std::exception)
  * XActiveDataSource
  */
 
-void Pump::setOutputStream( const Reference< XOutputStream >& xOut ) throw(std::exception)
+void Pump::setOutputStream( const Reference< XOutputStream >& xOut )
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xOutput = xOut;
@@ -416,26 +416,26 @@ void Pump::setOutputStream( const Reference< XOutputStream >& xOut ) throw(std::
     // data transfer starts in XActiveDataControl::start
 }
 
-Reference< XOutputStream > Pump::getOutputStream() throw(std::exception)
+Reference< XOutputStream > Pump::getOutputStream()
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xOutput;
 }
 
 // XServiceInfo
-OUString Pump::getImplementationName() throw(std::exception  )
+OUString Pump::getImplementationName()
 {
     return OPumpImpl_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool Pump::supportsService(const OUString& ServiceName) throw(std::exception  )
+sal_Bool Pump::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > Pump::getSupportedServiceNames() throw(std::exception  )
+Sequence< OUString > Pump::getSupportedServiceNames()
 {
     return OPumpImpl_getSupportedServiceNames();
 }
@@ -443,7 +443,6 @@ Sequence< OUString > Pump::getSupportedServiceNames() throw(std::exception  )
 
 Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance(
     SAL_UNUSED_PARAMETER const Reference< XComponentContext > & )
-    throw (Exception)
 {
     return Reference< XInterface >( *new Pump );
 }
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index ac06afae1529..efe53dcc42ab 100644
--- a/io/source/stm/streamhelper.cxx
+++ b/io/source/stm/streamhelper.cxx
@@ -33,18 +33,17 @@ using namespace ::com::sun::star::uno;
 namespace io_stm {
 
 void MemFIFO::write( const Sequence< sal_Int8 > &seq )
-    throw ( css::io::BufferSizeExceededException )
 {
     writeAt(getSize(), seq);
 }
 
-void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (css::io::BufferSizeExceededException)
+void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen )
 {
     readAt(0, seq , nBufferLen);
     forgetFromStart( nBufferLen );
 }
 
-void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( css::io::BufferSizeExceededException )
+void MemFIFO::skip( sal_Int32 nBytesToSkip )
 {
     forgetFromStart( nBytesToSkip );
 }
@@ -64,7 +63,7 @@ MemRingBuffer::~MemRingBuffer()
     }
 }
 
-void MemRingBuffer::resizeBuffer( sal_Int32 nMinSize ) throw(css::io::BufferSizeExceededException)
+void MemRingBuffer::resizeBuffer( sal_Int32 nMinSize )
 {
     sal_Int32 nNewLen = 1;
 
@@ -94,7 +93,6 @@ void MemRingBuffer::resizeBuffer( sal_Int32 nMinSize ) throw(css::io::BufferSize
 
 
 void MemRingBuffer::readAt( sal_Int32 nPos, Sequence<sal_Int8> &seq , sal_Int32 nBytesToRead ) const
-                                                        throw(css::io::BufferSizeExceededException)
 {
     if( nPos + nBytesToRead > m_nOccupiedBuffer ) {
         throw css::io::BufferSizeExceededException(
@@ -120,7 +118,6 @@ void MemRingBuffer::readAt( sal_Int32 nPos, Sequence<sal_Int8> &seq , sal_Int32
 
 
 void MemRingBuffer::writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &seq )
-                                                        throw (css::io::BufferSizeExceededException)
 {
     checkInvariants();
     sal_Int32 nLen = seq.getLength();
@@ -161,7 +158,7 @@ sal_Int32 MemRingBuffer::getSize()  const throw()
     return m_nOccupiedBuffer;
 }
 
-void MemRingBuffer::forgetFromStart( sal_Int32 nBytesToForget ) throw (css::io::BufferSizeExceededException)
+void MemRingBuffer::forgetFromStart( sal_Int32 nBytesToForget )
 {
     checkInvariants();
     if( nBytesToForget > m_nOccupiedBuffer ) {
diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index d175b46c9764..17d12210e32c 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -41,18 +41,16 @@ public:
     * data is written beyond end.
     ***/
     /// @throws css::io::BufferSizeExceededException
-    void    writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &)
-        throw(css::io::BufferSizeExceededException);
+    void    writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &);
     /// @throws css::io::BufferSizeExceededException
-    void    readAt( sal_Int32 nPos, Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) const
-        throw(css::io::BufferSizeExceededException);
+    void    readAt( sal_Int32 nPos, Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) const;
     sal_Int32   getSize() const throw();
     /// @throws css::io::BufferSizeExceededException
-    void    forgetFromStart(sal_Int32 nBytesToForget) throw(css::io::BufferSizeExceededException);
+    void    forgetFromStart(sal_Int32 nBytesToForget);
 
 private:
     /// @throws css::io::BufferSizeExceededException
-    void resizeBuffer(sal_Int32 nMinSize) throw(css::io::BufferSizeExceededException);
+    void resizeBuffer(sal_Int32 nMinSize);
     inline void checkInvariants() {
         assert( m_nBufferLen >= 0 );
         assert( m_nOccupiedBuffer >= 0 );
@@ -74,14 +72,11 @@ class MemFIFO :
 {
 public:
     /// @throws css::io::BufferSizeExceededException
-    void          write( const Sequence<sal_Int8> &)
-                  throw( css::io::BufferSizeExceededException );
+    void          write( const Sequence<sal_Int8> &);
     /// @throws css::io::BufferSizeExceededException
-    void          read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead )
-                  throw( css::io::BufferSizeExceededException );
+    void          read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead );
     /// @throws css::io::BufferSizeExceededException
-    void          skip( sal_Int32 nBytesToSkip )
-                  throw( css::io::BufferSizeExceededException );
+    void          skip( sal_Int32 nBytesToSkip );
     sal_Int32     getSize() const throw()
                   { return MemRingBuffer::getSize(); }
 
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index 794a1d51208c..4b42b5446cb9 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -54,11 +54,9 @@ public:
 
     // XSingleComponentFactory impl
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext(
-        css::uno::Reference< css::uno::XComponentContext > const & xContext )
-        throw (css::uno::Exception, std::exception) override;
+        css::uno::Reference< css::uno::XComponentContext > const & xContext ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
-        css::uno::Sequence< css::uno::Any > const & args, css::uno::Reference< css::uno::XComponentContext > const & xContext )
-        throw (css::uno::Exception, std::exception) override;
+        css::uno::Sequence< css::uno::Any > const & args, css::uno::Reference< css::uno::XComponentContext > const & xContext ) override;
 };
 
 void SingletonFactory::disposing()
@@ -68,7 +66,6 @@ void SingletonFactory::disposing()
 
 css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWithContext(
     css::uno::Reference< css::uno::XComponentContext > const & xContext )
-    throw (css::uno::Exception, std::exception)
 {
     sal_Int64 handle = reinterpret_cast< sal_Int64 >( m_vm_access.get() );
     css::uno::Any arg(
@@ -83,7 +80,6 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith
 
 css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWithArgumentsAndContext(
     css::uno::Sequence< css::uno::Any > const & args, css::uno::Reference< css::uno::XComponentContext > const & xContext )
-    throw (css::uno::Exception, std::exception)
 {
     return xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
         "com.sun.star.java.JavaVirtualMachine",
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index c363f3fd5170..4b1358392133 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -108,7 +108,6 @@ PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl()
 }
 
 Sequence< Locale > SAL_CALL Hyphenator::getLocales()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -228,7 +227,6 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
 }
 
 sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale)
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -253,7 +251,6 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo
        const css::lang::Locale& aLocale,
        sal_Int16 nMaxLeading,
        const css::beans::PropertyValues& aProperties )
-       throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
 {
     int k = 0;
 
@@ -499,7 +496,6 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling(
         const css::lang::Locale& aLocale,
         sal_Int16 nIndex,
         const css::beans::PropertyValues& aProperties )
-        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     // Firstly we allow only one plus character before the hyphen to avoid to miss the right break point:
     for (int extrachar = 1; extrachar <= 2; extrachar++)
@@ -537,7 +533,6 @@ static OString Win_GetShortPathName( const OUString &rLongPathName )
 Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString& aWord,
         const css::lang::Locale& aLocale,
         const css::beans::PropertyValues& aProperties )
-        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     PropertyHelper_Hyphenation& rHelper = GetPropHelper();
     rHelper.SetTmpPropVals(aProperties);
@@ -743,7 +738,6 @@ OUString SAL_CALL Hyphenator::makeInitCap(const OUString& aTerm, CharClass * pCC
 /// @throws Exception
 Reference< XInterface > SAL_CALL Hyphenator_CreateInstance(
         const Reference< XMultiServiceFactory > & /*rSMgr*/ )
-        throw(Exception)
 {
     Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new Hyphenator);
     return xService;
@@ -751,7 +745,6 @@ Reference< XInterface > SAL_CALL Hyphenator_CreateInstance(
 
 sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener(
         const Reference< XLinguServiceEventListener >& rxLstnr )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -765,7 +758,6 @@ sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener(
 
 sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener(
         const Reference< XLinguServiceEventListener >& rxLstnr )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -778,14 +770,12 @@ sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener(
 }
 
 OUString SAL_CALL Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return OUString( "Libhyphen Hyphenator" );
 }
 
 void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments )
-        throw(Exception, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -812,7 +802,6 @@ void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments )
 }
 
 void SAL_CALL Hyphenator::dispose()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -831,7 +820,6 @@ void SAL_CALL Hyphenator::dispose()
 }
 
 void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -840,7 +828,6 @@ void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& r
 }
 
 void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -850,19 +837,16 @@ void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener >
 
 // Service specific part
 OUString SAL_CALL Hyphenator::getImplementationName()
-        throw(RuntimeException, std::exception)
 {
     return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL Hyphenator::supportsService( const OUString& ServiceName )
-        throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL Hyphenator::getSupportedServiceNames()
-        throw(RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index a8d680a91400..94f6db85011d 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
@@ -88,33 +88,33 @@ public:
     virtual ~Hyphenator() override;
 
     // XSupportedLocales (for XHyphenator)
-    virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override;
+    virtual Sequence< Locale > SAL_CALL getLocales() override;
+    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override;
 
     // XHyphenator
-    virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) override;
+    virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) override;
+    virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override;
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override;
+    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override;
 
     // XServiceDisplayName
-    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) override;
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static inline OUString  getImplementationName_Static() throw();
     static Sequence< OUString > getSupportedServiceNames_Static() throw();
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index b2b283e2b171..23aeb4f62177 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -88,22 +88,22 @@ public:
     LangGuess_Impl& operator=(const LangGuess_Impl&) = delete;
 
     // XServiceInfo implementation
-    virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  );
 
     // XLanguageGuessing implementation
-    virtual css::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL enableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLanguages(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getEnabledLanguages(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDisabledLanguages(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) override;
+    virtual void SAL_CALL disableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) override;
+    virtual void SAL_CALL enableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLanguages(  ) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getEnabledLanguages(  ) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDisabledLanguages(  ) override;
 
     // implementation specific
     /// @throws RuntimeException
-    void SetFingerPrintsDB( const OUString &fileName ) throw (RuntimeException);
+    void SetFingerPrintsDB( const OUString &fileName );
 };
 
 LangGuess_Impl::LangGuess_Impl() :
@@ -167,7 +167,6 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage(
         const OUString& rText,
         ::sal_Int32 nStartPos,
         ::sal_Int32 nLen )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLangGuessMutex() );
 
@@ -191,7 +190,6 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage(
 
 void LangGuess_Impl::SetFingerPrintsDB(
         const OUString &filePath )
-    throw (RuntimeException)
 {
     //! text encoding for file name / path needs to be in the same encoding the OS uses
     OString path = OUStringToOString( filePath, osl_getThreadTextEncoding() );
@@ -203,7 +201,6 @@ void LangGuess_Impl::SetFingerPrintsDB(
 }
 
 uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages(  )
-        throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLangGuessMutex() );
 
@@ -226,7 +223,6 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages(  )
 }
 
 uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages(  )
-        throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLangGuessMutex() );
 
@@ -249,7 +245,6 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages(  )
 }
 
 uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages(  )
-        throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLangGuessMutex() );
 
@@ -273,7 +268,6 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages(  )
 
 void SAL_CALL LangGuess_Impl::disableLanguages(
         const uno::Sequence< Locale >& rLanguages )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLangGuessMutex() );
 
@@ -298,7 +292,6 @@ void SAL_CALL LangGuess_Impl::disableLanguages(
 
 void SAL_CALL LangGuess_Impl::enableLanguages(
         const uno::Sequence< Locale >& rLanguages )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLangGuessMutex() );
 
@@ -322,19 +315,16 @@ void SAL_CALL LangGuess_Impl::enableLanguages(
 }
 
 OUString SAL_CALL LangGuess_Impl::getImplementationName(  )
-    throw(RuntimeException, std::exception)
 {
     return OUString( IMPLNAME );
 }
 
 sal_Bool SAL_CALL LangGuess_Impl::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index ceb370d85394..58b28fd0a4fb 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -89,32 +89,32 @@ public:
     virtual ~MacSpellChecker() override;
 
     // XSupportedLocales (for XSpellChecker)
-    virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException) override;
-    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException) override;
+    virtual Sequence< Locale > SAL_CALL getLocales() override;
+    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override;
 
     // XSpellChecker
-    virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException) override;
-    virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException) override;
+    virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override;
+    virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override;
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) override;
-    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) override;
+    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override;
+    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override;
 
     // XServiceDisplayName
-    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException) override;
+    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(RuntimeException) override;
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) override;
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) override;
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static inline OUString  getImplementationName_Static() throw();
     static Sequence< OUString > getSupportedServiceNames_Static() throw();
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 7378beb15c55..e17240146d78 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -93,7 +93,6 @@ PropertyHelper_Spell & MacSpellChecker::GetPropHelper_Impl()
 
 
 Sequence< Locale > SAL_CALL MacSpellChecker::getLocales()
-        throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -187,7 +186,6 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales()
 
 
 sal_Bool SAL_CALL MacSpellChecker::hasLocale(const Locale& rLocale)
-        throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -272,7 +270,6 @@ sal_Int16 MacSpellChecker::GetSpellFailure( const OUString &rWord, const Locale
 sal_Bool SAL_CALL
     MacSpellChecker::isValid( const OUString& rWord, const Locale& rLocale,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -381,7 +378,6 @@ Reference< XSpellAlternatives >
 Reference< XSpellAlternatives > SAL_CALL
     MacSpellChecker::spell( const OUString& rWord, const Locale& rLocale,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -402,7 +398,6 @@ Reference< XSpellAlternatives > SAL_CALL
 /// @throws Exception
 Reference< XInterface > SAL_CALL MacSpellChecker_CreateInstance(
             const Reference< XMultiServiceFactory > & /*rSMgr*/ )
-        throw(Exception)
 {
 
     Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new MacSpellChecker);
@@ -413,7 +408,6 @@ Reference< XInterface > SAL_CALL MacSpellChecker_CreateInstance(
 sal_Bool SAL_CALL
     MacSpellChecker::addLinguServiceEventListener(
             const Reference< XLinguServiceEventListener >& rxLstnr )
-        throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -429,7 +423,6 @@ sal_Bool SAL_CALL
 sal_Bool SAL_CALL
     MacSpellChecker::removeLinguServiceEventListener(
             const Reference< XLinguServiceEventListener >& rxLstnr )
-        throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -445,7 +438,6 @@ sal_Bool SAL_CALL
 
 OUString SAL_CALL
     MacSpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ )
-        throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return OUString( "Mac OS X Spell Checker" );
@@ -454,7 +446,6 @@ OUString SAL_CALL
 
 void SAL_CALL
     MacSpellChecker::initialize( const Sequence< Any >& rArguments )
-        throw(Exception, RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -484,7 +475,6 @@ void SAL_CALL
 
 void SAL_CALL
     MacSpellChecker::dispose()
-        throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -499,7 +489,6 @@ void SAL_CALL
 
 void SAL_CALL
     MacSpellChecker::addEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -510,7 +499,6 @@ void SAL_CALL
 
 void SAL_CALL
     MacSpellChecker::removeEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -520,19 +508,16 @@ void SAL_CALL
 
 // Service specific part
 OUString SAL_CALL MacSpellChecker::getImplementationName()
-        throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL MacSpellChecker::supportsService( const OUString& ServiceName )
-        throw(RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL MacSpellChecker::getSupportedServiceNames()
-        throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index d93b093bb465..bb370e144c93 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -112,7 +112,6 @@ PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl()
 }
 
 Sequence< Locale > SAL_CALL SpellChecker::getLocales()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -256,7 +255,6 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
 }
 
 sal_Bool SAL_CALL SpellChecker::hasLocale(const Locale& rLocale)
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -409,7 +407,6 @@ sal_Int16 SpellChecker::GetSpellFailure(const OUString &rWord, const Locale &rLo
 
 sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rLocale,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -535,7 +532,6 @@ Reference< XSpellAlternatives >
 Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell(
         const OUString& rWord, const Locale& rLocale,
         const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -556,7 +552,6 @@ Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell(
 /// @throws Exception
 Reference< XInterface > SAL_CALL SpellChecker_CreateInstance(
         const Reference< XMultiServiceFactory > & /*rSMgr*/ )
-        throw(Exception)
 {
 
     Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new SpellChecker);
@@ -565,7 +560,6 @@ Reference< XInterface > SAL_CALL SpellChecker_CreateInstance(
 
 sal_Bool SAL_CALL SpellChecker::addLinguServiceEventListener(
         const Reference< XLinguServiceEventListener >& rxLstnr )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -579,7 +573,6 @@ sal_Bool SAL_CALL SpellChecker::addLinguServiceEventListener(
 
 sal_Bool SAL_CALL SpellChecker::removeLinguServiceEventListener(
         const Reference< XLinguServiceEventListener >& rxLstnr )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -592,13 +585,11 @@ sal_Bool SAL_CALL SpellChecker::removeLinguServiceEventListener(
 }
 
 OUString SAL_CALL SpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ )
-        throw(RuntimeException, std::exception)
 {
     return OUString( "Hunspell SpellChecker" );
 }
 
 void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments )
-        throw(Exception, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -625,7 +616,6 @@ void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments )
 }
 
 void SAL_CALL SpellChecker::dispose()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -644,7 +634,6 @@ void SAL_CALL SpellChecker::dispose()
 }
 
 void SAL_CALL SpellChecker::addEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -653,7 +642,6 @@ void SAL_CALL SpellChecker::addEventListener( const Reference< XEventListener >&
 }
 
 void SAL_CALL SpellChecker::removeEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -663,19 +651,16 @@ void SAL_CALL SpellChecker::removeEventListener( const Reference< XEventListener
 
 // Service specific part
 OUString SAL_CALL SpellChecker::getImplementationName()
-        throw(RuntimeException, std::exception)
 {
     return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL SpellChecker::supportsService( const OUString& ServiceName )
-        throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL SpellChecker::getSupportedServiceNames()
-        throw(RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 50f9578bf3d4..a1320bc6f597 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -82,32 +82,32 @@ public:
     virtual ~SpellChecker() override;
 
     // XSupportedLocales (for XSpellChecker)
-    virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override;
+    virtual Sequence< Locale > SAL_CALL getLocales() override;
+    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override;
 
     // XSpellChecker
-    virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
-    virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override;
+    virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override;
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override;
+    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override;
 
     // XServiceDisplayName
-    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) override;
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static inline OUString  getImplementationName_Static() throw();
     static Sequence< OUString > getSupportedServiceNames_Static() throw();
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
index f4e2f36f20a3..7e23f023c4e5 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
@@ -51,14 +51,12 @@ Meaning::~Meaning()
 }
 
 OUString SAL_CALL Meaning::getMeaning()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aTerm;
 }
 
 Sequence< OUString > SAL_CALL Meaning::querySynonyms()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
         return aSyn;
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index b544754da273..8e6cb7561a94 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -45,8 +45,8 @@ public:
     virtual ~Meaning() override;
 
     // XMeaning
-    virtual OUString SAL_CALL getMeaning() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL querySynonyms() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getMeaning() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL querySynonyms() override;
 
     // non-interface specific functions
     void    SetSynonyms( const css::uno::Sequence< OUString > &rSyn );
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index e5f342b78111..ea6aca5481ac 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -125,7 +125,6 @@ PropertyHelper_Thesaurus& Thesaurus::GetPropHelper_Impl()
 }
 
 Sequence< Locale > SAL_CALL Thesaurus::getLocales()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -251,7 +250,6 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
 }
 
 sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale)
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -274,7 +272,6 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale)
 Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryMeanings(
     const OUString& qTerm, const Locale& rLocale,
     const PropertyValues& rProperties)
-    throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard      aGuard( GetLinguMutex() );
 
@@ -514,20 +511,17 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM
 /// @throws Exception
 Reference< XInterface > SAL_CALL Thesaurus_CreateInstance(
             const Reference< XMultiServiceFactory > & /*rSMgr*/ )
-        throw(Exception)
 {
     Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new Thesaurus);
     return xService;
 }
 
 OUString SAL_CALL Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ )
-        throw(RuntimeException, std::exception)
 {
     return OUString( "Mythes Thesaurus" );
 }
 
 void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments )
-        throw(Exception, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -583,7 +577,6 @@ OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass * pCC)
 }
 
 void SAL_CALL Thesaurus::dispose()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -602,7 +595,6 @@ void SAL_CALL Thesaurus::dispose()
 }
 
 void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -611,7 +603,6 @@ void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rx
 }
 
 void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -621,19 +612,16 @@ void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >&
 
 // Service specific part
 OUString SAL_CALL Thesaurus::getImplementationName()
-        throw(RuntimeException, std::exception)
 {
     return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL Thesaurus::supportsService( const OUString& ServiceName )
-        throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL Thesaurus::getSupportedServiceNames()
-        throw(RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 8073aa58f1dc..1fc520e781e9 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -95,27 +95,27 @@ public:
     virtual ~Thesaurus() override;
 
     // XSupportedLocales (for XThesaurus)
-    virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override;
+    virtual Sequence< Locale > SAL_CALL getLocales() override;
+    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override;
 
     // XThesaurus
-    virtual Sequence< Reference < css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+    virtual Sequence< Reference < css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) override;
 
     // XServiceDisplayName
-    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) override;
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static inline OUString
         getImplementationName_Static() throw();
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index 390ceda80d9f..da467b3468f1 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -63,13 +63,13 @@ public:
     void        SetPropSet( css::uno::Reference< css::linguistic2::XLinguProperties > &rPS );
 
     //XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) override;
 
     // XDictionaryListEventListener
-    virtual void SAL_CALL processDictionaryListEvent( const css::linguistic2::DictionaryListEvent& rDicListEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL processDictionaryListEvent( const css::linguistic2::DictionaryListEvent& rDicListEvent ) override;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvt ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvt ) override;
 };
 
 
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 73953556b0fe..c140bb1bd957 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -344,7 +344,6 @@ void ConvDic::RemoveEntry( const OUString &rLeftText, const OUString &rRightText
 
 
 OUString SAL_CALL ConvDic::getName(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aName;
@@ -352,7 +351,6 @@ OUString SAL_CALL ConvDic::getName(  )
 
 
 Locale SAL_CALL ConvDic::getLocale(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return LanguageTag::convertToLocale( nLanguage );
@@ -360,7 +358,6 @@ Locale SAL_CALL ConvDic::getLocale(  )
 
 
 sal_Int16 SAL_CALL ConvDic::getConversionType(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return nConversionType;
@@ -368,7 +365,6 @@ sal_Int16 SAL_CALL ConvDic::getConversionType(  )
 
 
 void SAL_CALL ConvDic::setActive( sal_Bool bActivate )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     bIsActive = bActivate;
@@ -376,7 +372,6 @@ void SAL_CALL ConvDic::setActive( sal_Bool bActivate )
 
 
 sal_Bool SAL_CALL ConvDic::isActive(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return bIsActive;
@@ -384,7 +379,6 @@ sal_Bool SAL_CALL ConvDic::isActive(  )
 
 
 void SAL_CALL ConvDic::clear(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     aFromLeft .clear();
@@ -404,7 +398,6 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversions(
         sal_Int32 nLength,
         ConversionDirection eDirection,
         sal_Int32 /*nTextConversionOptions*/ )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -455,7 +448,6 @@ static bool lcl_SeqHasEntry(
 
 uno::Sequence< OUString > SAL_CALL ConvDic::getConversionEntries(
         ConversionDirection eDirection )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -491,7 +483,6 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversionEntries(
 void SAL_CALL ConvDic::addEntry(
         const OUString& aLeftText,
         const OUString& aRightText )
-    throw (IllegalArgumentException, container::ElementExistException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     if (bNeedEntries)
@@ -505,7 +496,6 @@ void SAL_CALL ConvDic::addEntry(
 void SAL_CALL ConvDic::removeEntry(
         const OUString& aLeftText,
         const OUString& aRightText )
-    throw (container::NoSuchElementException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     if (bNeedEntries)
@@ -517,7 +507,6 @@ void SAL_CALL ConvDic::removeEntry(
 
 
 sal_Int16 SAL_CALL ConvDic::getMaxCharCount( ConversionDirection eDirection )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -568,7 +557,6 @@ void SAL_CALL ConvDic::setPropertyType(
         const OUString& rLeftText,
         const OUString& rRightText,
         sal_Int16 nPropertyType )
-    throw (container::NoSuchElementException, IllegalArgumentException, RuntimeException, std::exception)
 {
     bool bHasElement = HasEntry( rLeftText, rRightText);
     if (!bHasElement)
@@ -585,7 +573,6 @@ void SAL_CALL ConvDic::setPropertyType(
 sal_Int16 SAL_CALL ConvDic::getPropertyType(
         const OUString& rLeftText,
         const OUString& rRightText )
-    throw (container::NoSuchElementException, RuntimeException, std::exception)
 {
     bool bHasElement = HasEntry( rLeftText, rRightText);
     if (!bHasElement)
@@ -605,7 +592,6 @@ sal_Int16 SAL_CALL ConvDic::getPropertyType(
 
 
 void SAL_CALL ConvDic::flush(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -623,7 +609,6 @@ void SAL_CALL ConvDic::flush(  )
 
 void SAL_CALL ConvDic::addFlushListener(
         const uno::Reference< util::XFlushListener >& rxListener )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     if (rxListener.is())
@@ -633,7 +618,6 @@ void SAL_CALL ConvDic::addFlushListener(
 
 void SAL_CALL ConvDic::removeFlushListener(
         const uno::Reference< util::XFlushListener >& rxListener )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     if (rxListener.is())
@@ -642,19 +626,16 @@ void SAL_CALL ConvDic::removeFlushListener(
 
 
 OUString SAL_CALL ConvDic::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.lingu2.ConvDic" );
 }
 
 sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL ConvDic::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return { SN_CONV_DICTIONARY };
 }
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index e5d28b2a9489..950df21b8099 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -96,31 +96,31 @@ public:
     virtual ~ConvDic() override;
 
     // XConversionDictionary
-    virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getConversionType(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActive( sal_Bool bActivate ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isActive(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clear(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getConversionEntries( css::linguistic2::ConversionDirection eDirection ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getMaxCharCount( css::linguistic2::ConversionDirection eDirection ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
+    virtual sal_Int16 SAL_CALL getConversionType(  ) override;
+    virtual void SAL_CALL setActive( sal_Bool bActivate ) override;
+    virtual sal_Bool SAL_CALL isActive(  ) override;
+    virtual void SAL_CALL clear(  ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getConversionEntries( css::linguistic2::ConversionDirection eDirection ) override;
+    virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) override;
+    virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) override;
+    virtual sal_Int16 SAL_CALL getMaxCharCount( css::linguistic2::ConversionDirection eDirection ) override;
 
     // XConversionPropertyType
-    virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) override;
+    virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) override;
 
     // XFlushable
-    virtual void SAL_CALL flush(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL flush(  ) override;
+    virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override;
+    virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     bool    HasEntry( const OUString &rLeftText, const OUString &rRightText );
     void    AddEntry( const OUString &rLeftText, const OUString &rRightText );
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 7bc413ca7559..3aecf316ec40 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -88,20 +88,20 @@ public:
     ConvDicNameContainer& operator=(const ConvDicNameContainer&) = delete;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // looks for conversion dictionaries with the specified extension
     // in the directory and adds them to the container
@@ -167,21 +167,18 @@ uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName(
 }
 
 uno::Type SAL_CALL ConvDicNameContainer::getElementType(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return uno::Type( cppu::UnoType<XConversionDictionary>::get());
 }
 
 sal_Bool SAL_CALL ConvDicNameContainer::hasElements(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return !aConvDics.empty();
 }
 
 uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName )
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     uno::Reference< XConversionDictionary > xRes( GetByName( rName ) );
@@ -191,7 +188,6 @@ uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName )
 }
 
 uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -204,7 +200,6 @@ uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames(  )
 }
 
 sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return GetByName( rName ).is();
@@ -213,7 +208,6 @@ sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName )
 void SAL_CALL ConvDicNameContainer::replaceByName(
         const OUString& rName,
         const uno::Any& rElement )
-    throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -230,7 +224,6 @@ void SAL_CALL ConvDicNameContainer::replaceByName(
 void SAL_CALL ConvDicNameContainer::insertByName(
         const OUString& rName,
         const Any& rElement )
-    throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -245,7 +238,6 @@ void SAL_CALL ConvDicNameContainer::insertByName(
 }
 
 void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -405,7 +397,7 @@ ConvDicNameContainer & ConvDicList::GetNameContainer()
     return *mxNameContainer;
 }
 
-uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryContainer(  ) throw (RuntimeException, std::exception)
+uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryContainer(  )
 {
     MutexGuard  aGuard( GetLinguMutex() );
     GetNameContainer();
@@ -417,7 +409,6 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary(
         const OUString& rName,
         const Locale& rLocale,
         sal_Int16 nConvDicType )
-    throw (NoSupportException, ElementExistException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -457,7 +448,6 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions(
         sal_Int16 nConversionDictionaryType,
         ConversionDirection eDirection,
         sal_Int32 nTextConversionOptions )
-    throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -496,7 +486,6 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount(
         const Locale& rLocale,
         sal_Int16 nConversionDictionaryType,
         ConversionDirection eDirection )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -519,7 +508,6 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount(
 }
 
 void SAL_CALL ConvDicList::dispose(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     if (!bDisposing)
@@ -534,7 +522,6 @@ void SAL_CALL ConvDicList::dispose(  )
 
 void SAL_CALL ConvDicList::addEventListener(
         const uno::Reference< XEventListener >& rxListener )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     if (!bDisposing && rxListener.is())
@@ -543,7 +530,6 @@ void SAL_CALL ConvDicList::addEventListener(
 
 void SAL_CALL ConvDicList::removeEventListener(
         const uno::Reference< XEventListener >& rxListener )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     if (!bDisposing && rxListener.is())
@@ -551,19 +537,16 @@ void SAL_CALL ConvDicList::removeEventListener(
 }
 
 OUString SAL_CALL ConvDicList::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL ConvDicList::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
@@ -578,7 +561,6 @@ uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static()
 /// @throws css::uno::Exception
 uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance(
         const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ )
-    throw(Exception)
 {
     return StaticConvDicList::get();
 }
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index 98af26e1b431..c11e60cb331a 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -67,20 +67,20 @@ public:
     virtual ~ConvDicList() override;
 
     // XConversionDictionaryList
-    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getDictionaryContainer(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (css::lang::NoSupportException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL queryMaxCharCount( const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getDictionaryContainer(  ) override;
+    virtual css::uno::Reference< css::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) override;
+    virtual sal_Int16 SAL_CALL queryMaxCharCount( const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 
     static inline OUString
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 3f364e1a32d2..36bf36679c30 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -370,7 +370,6 @@ void ConvDicXMLExport::ExportContent_()
 }
 
 void SAL_CALL ConvDicXMLImport::startDocument()
-    throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     // register namespace at first possible opportunity
     GetNamespaceMap().Add( "tcd",
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 3dd3182fcbe5..c806e1b9f9c7 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -86,7 +86,7 @@ public:
         nConversionType = -1;
     }
 
-    virtual void SAL_CALL startDocument() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocument() override;
 
     virtual SvXMLImportContext * CreateContext(
         sal_uInt16 nPrefix, const OUString &rLocalName,
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 96d3cb00a4c9..ad76249b8280 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -678,14 +678,12 @@ bool DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry >& xDic
 }
 
 OUString SAL_CALL DictionaryNeo::getName(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aDicName;
 }
 
 void SAL_CALL DictionaryNeo::setName( const OUString& aName )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -697,7 +695,6 @@ void SAL_CALL DictionaryNeo::setName( const OUString& aName )
 }
 
 DictionaryType SAL_CALL DictionaryNeo::getDictionaryType(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -705,7 +702,6 @@ DictionaryType SAL_CALL DictionaryNeo::getDictionaryType(  )
 }
 
 void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -737,14 +733,12 @@ void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate )
 }
 
 sal_Bool SAL_CALL DictionaryNeo::isActive(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return bIsActive;
 }
 
 sal_Int32 SAL_CALL DictionaryNeo::getCount(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -754,14 +748,12 @@ sal_Int32 SAL_CALL DictionaryNeo::getCount(  )
 }
 
 Locale SAL_CALL DictionaryNeo::getLocale(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return LanguageTag::convertToLocale( nLanguage );
 }
 
 void SAL_CALL DictionaryNeo::setLocale( const Locale& aLocale )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     sal_Int16 nLanguageP = LinguLocaleToLanguage( aLocale );
@@ -776,7 +768,6 @@ void SAL_CALL DictionaryNeo::setLocale( const Locale& aLocale )
 
 uno::Reference< XDictionaryEntry > SAL_CALL DictionaryNeo::getEntry(
             const OUString& aWord )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -793,7 +784,6 @@ uno::Reference< XDictionaryEntry > SAL_CALL DictionaryNeo::getEntry(
 
 sal_Bool SAL_CALL DictionaryNeo::addEntry(
             const uno::Reference< XDictionaryEntry >& xDicEntry )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -812,7 +802,6 @@ sal_Bool SAL_CALL DictionaryNeo::addEntry(
 sal_Bool SAL_CALL
     DictionaryNeo::add( const OUString& rWord, sal_Bool bIsNegative,
             const OUString& rRplcText )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -829,7 +818,6 @@ sal_Bool SAL_CALL
 }
 
 sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -864,7 +852,6 @@ sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord )
 }
 
 sal_Bool SAL_CALL DictionaryNeo::isFull(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -875,7 +862,6 @@ sal_Bool SAL_CALL DictionaryNeo::isFull(  )
 
 uno::Sequence< uno::Reference< XDictionaryEntry > >
     SAL_CALL DictionaryNeo::getEntries(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -886,7 +872,6 @@ uno::Sequence< uno::Reference< XDictionaryEntry > >
 
 
 void SAL_CALL DictionaryNeo::clear(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -904,7 +889,6 @@ void SAL_CALL DictionaryNeo::clear(  )
 
 sal_Bool SAL_CALL DictionaryNeo::addDictionaryEventListener(
             const uno::Reference< XDictionaryEventListener >& xListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -919,7 +903,6 @@ sal_Bool SAL_CALL DictionaryNeo::addDictionaryEventListener(
 
 sal_Bool SAL_CALL DictionaryNeo::removeDictionaryEventListener(
             const uno::Reference< XDictionaryEventListener >& xListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -934,21 +917,18 @@ sal_Bool SAL_CALL DictionaryNeo::removeDictionaryEventListener(
 
 
 sal_Bool SAL_CALL DictionaryNeo::hasLocation()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return !aMainURL.isEmpty();
 }
 
 OUString SAL_CALL DictionaryNeo::getLocation()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aMainURL;
 }
 
 sal_Bool SAL_CALL DictionaryNeo::isReadonly()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -956,7 +936,6 @@ sal_Bool SAL_CALL DictionaryNeo::isReadonly()
 }
 
 void SAL_CALL DictionaryNeo::store()
-        throw(io::IOException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -970,7 +949,6 @@ void SAL_CALL DictionaryNeo::store()
 void SAL_CALL DictionaryNeo::storeAsURL(
             const OUString& aURL,
             const uno::Sequence< beans::PropertyValue >& /*rArgs*/ )
-        throw(io::IOException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -985,7 +963,6 @@ void SAL_CALL DictionaryNeo::storeAsURL(
 void SAL_CALL DictionaryNeo::storeToURL(
             const OUString& aURL,
             const uno::Sequence< beans::PropertyValue >& /*rArgs*/ )
-        throw(io::IOException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     saveEntries(aURL);
@@ -1036,21 +1013,18 @@ void DicEntry::splitDicFileWord(const OUString &rDicFileWord,
 }
 
 OUString SAL_CALL DicEntry::getDictionaryWord(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aDicWord;
 }
 
 sal_Bool SAL_CALL DicEntry::isNegative(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return bIsNegativ;
 }
 
 OUString SAL_CALL DicEntry::getReplacementText(  )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aReplacement;
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 9435dbae0750..6bc7e7853306 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -83,86 +83,60 @@ public:
 
     // XNamed
     virtual OUString SAL_CALL
-        getName()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getName() override;
     virtual void SAL_CALL
-        setName( const OUString& aName )
-            throw(css::uno::RuntimeException, std::exception) override;
+        setName( const OUString& aName ) override;
 
     // XDictionary
     virtual css::linguistic2::DictionaryType SAL_CALL
-        getDictionaryType()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getDictionaryType() override;
     virtual void SAL_CALL
-        setActive( sal_Bool bActivate )
-            throw(css::uno::RuntimeException, std::exception) override;
+        setActive( sal_Bool bActivate ) override;
     virtual sal_Bool SAL_CALL
-        isActive()
-            throw(css::uno::RuntimeException, std::exception) override;
+        isActive() override;
     virtual sal_Int32 SAL_CALL
-        getCount()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getCount() override;
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getLocale() override;
     virtual void SAL_CALL
-        setLocale( const css::lang::Locale& aLocale )
-            throw(css::uno::RuntimeException, std::exception) override;
+        setLocale( const css::lang::Locale& aLocale ) override;
     virtual css::uno::Reference<
             css::linguistic2::XDictionaryEntry > SAL_CALL
-        getEntry( const OUString& aWord )
-            throw(css::uno::RuntimeException, std::exception) override;
+        getEntry( const OUString& aWord ) override;
     virtual sal_Bool SAL_CALL
         addEntry( const css::uno::Reference<
-                css::linguistic2::XDictionaryEntry >& xDicEntry )
-            throw(css::uno::RuntimeException, std::exception) override;
+                css::linguistic2::XDictionaryEntry >& xDicEntry ) override;
     virtual sal_Bool SAL_CALL
         add( const OUString& aWord, sal_Bool bIsNegative,
-                const OUString& aRplcText )
-            throw(css::uno::RuntimeException, std::exception) override;
+                const OUString& aRplcText ) override;
     virtual sal_Bool SAL_CALL
-        remove( const OUString& aWord )
-            throw(css::uno::RuntimeException, std::exception) override;
+        remove( const OUString& aWord ) override;
     virtual sal_Bool SAL_CALL
-        isFull()
-            throw(css::uno::RuntimeException, std::exception) override;
+        isFull() override;
     virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionaryEntry > > SAL_CALL
-        getEntries()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getEntries() override;
     virtual void SAL_CALL
-        clear()
-            throw(css::uno::RuntimeException, std::exception) override;
+        clear() override;
     virtual sal_Bool SAL_CALL
-        addDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override;
+        addDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener ) override;
     virtual sal_Bool SAL_CALL
-        removeDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener )
-            throw(css::uno::RuntimeException, std::exception) override;
+        removeDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener ) override;
 
     // XStorable
     virtual sal_Bool SAL_CALL
-        hasLocation()
-            throw(css::uno::RuntimeException, std::exception) override;
+        hasLocation() override;
     virtual OUString SAL_CALL
-        getLocation()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getLocation() override;
     virtual sal_Bool SAL_CALL
-        isReadonly()
-            throw(css::uno::RuntimeException, std::exception) override;
+        isReadonly() override;
     virtual void SAL_CALL
-        store()
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
+        store() override;
     virtual void SAL_CALL
         storeAsURL( const OUString& aURL,
-                const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override;
     virtual void SAL_CALL
         storeToURL( const OUString& aURL,
-                const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
-            throw(css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override;
 };
 
 
@@ -188,11 +162,11 @@ public:
 
     // XDictionaryEntry
     virtual OUString SAL_CALL
-        getDictionaryWord() throw(css::uno::RuntimeException, std::exception) override;
+        getDictionaryWord() override;
     virtual sal_Bool SAL_CALL
-        isNegative() throw(css::uno::RuntimeException, std::exception) override;
+        isNegative() override;
     virtual OUString SAL_CALL
-        getReplacementText() throw(css::uno::RuntimeException, std::exception) override;
+        getReplacementText() override;
 };
 
 
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 3780d4eccc27..05b6c81ee741 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -79,13 +79,11 @@ public:
 
     // XEventListener
     virtual void SAL_CALL
-        disposing( const EventObject& rSource )
-            throw(RuntimeException, std::exception) override;
+        disposing( const EventObject& rSource ) override;
 
     // XDictionaryEventListener
     virtual void SAL_CALL
-        processDictionaryEvent( const DictionaryEvent& rDicEvent )
-            throw(RuntimeException, std::exception) override;
+        processDictionaryEvent( const DictionaryEvent& rDicEvent ) override;
 
     // non-UNO functions
     void    DisposeAndClear( const EventObject &rEvtObj );
@@ -126,7 +124,6 @@ void DicEvtListenerHelper::DisposeAndClear( const EventObject &rEvtObj )
 
 
 void SAL_CALL DicEvtListenerHelper::disposing( const EventObject& rSource )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -149,7 +146,6 @@ void SAL_CALL DicEvtListenerHelper::disposing( const EventObject& rSource )
 
 void SAL_CALL DicEvtListenerHelper::processDictionaryEvent(
             const DictionaryEvent& rDicEvent )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -370,13 +366,12 @@ sal_Int32 DicList::GetDicPos(const uno::Reference< XDictionary > &xDic)
 /// @throws Exception
 uno::Reference< XInterface > SAL_CALL
     DicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ )
-            throw(Exception)
 {
     uno::Reference< XInterface > xService = static_cast<cppu::OWeakObject *>(new DicList);
     return xService;
 }
 
-sal_Int16 SAL_CALL DicList::getCount() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL DicList::getCount()
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
     return static_cast< sal_Int16 >(GetOrCreateDicList().size());
@@ -384,7 +379,6 @@ sal_Int16 SAL_CALL DicList::getCount() throw(RuntimeException, std::exception)
 
 uno::Sequence< uno::Reference< XDictionary > > SAL_CALL
         DicList::getDictionaries()
-            throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -395,7 +389,6 @@ uno::Sequence< uno::Reference< XDictionary > > SAL_CALL
 
 uno::Reference< XDictionary > SAL_CALL
         DicList::getDictionaryByName( const OUString& aDictionaryName )
-            throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -417,7 +410,6 @@ uno::Reference< XDictionary > SAL_CALL
 
 sal_Bool SAL_CALL DicList::addDictionary(
             const uno::Reference< XDictionary >& xDictionary )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -439,7 +431,6 @@ sal_Bool SAL_CALL DicList::addDictionary(
 
 sal_Bool SAL_CALL
     DicList::removeDictionary( const uno::Reference< XDictionary >& xDictionary )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -472,7 +463,6 @@ sal_Bool SAL_CALL
 sal_Bool SAL_CALL DicList::addDictionaryListEventListener(
             const uno::Reference< XDictionaryListEventListener >& xListener,
             sal_Bool bReceiveVerbose )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -492,7 +482,6 @@ sal_Bool SAL_CALL DicList::addDictionaryListEventListener(
 
 sal_Bool SAL_CALL DicList::removeDictionaryListEventListener(
             const uno::Reference< XDictionaryListEventListener >& xListener )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -507,19 +496,19 @@ sal_Bool SAL_CALL DicList::removeDictionaryListEventListener(
     return bRes;
 }
 
-sal_Int16 SAL_CALL DicList::beginCollectEvents() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL DicList::beginCollectEvents()
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
     return mxDicEvtLstnrHelper->BeginCollectEvents();
 }
 
-sal_Int16 SAL_CALL DicList::endCollectEvents() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL DicList::endCollectEvents()
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
     return mxDicEvtLstnrHelper->EndCollectEvents();
 }
 
-sal_Int16 SAL_CALL DicList::flushEvents() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL DicList::flushEvents()
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
     return mxDicEvtLstnrHelper->FlushEvents();
@@ -528,7 +517,6 @@ sal_Int16 SAL_CALL DicList::flushEvents() throw(RuntimeException, std::exception
 uno::Reference< XDictionary > SAL_CALL
     DicList::createDictionary( const OUString& rName, const Locale& rLocale,
             DictionaryType eDicType, const OUString& rURL )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -541,7 +529,6 @@ uno::Reference< XDictionary > SAL_CALL
 uno::Reference< XDictionaryEntry > SAL_CALL
     DicList::queryDictionaryEntry( const OUString& rWord, const Locale& rLocale,
             sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
     return SearchDicList( this, rWord, LinguLocaleToLanguage( rLocale ),
@@ -551,7 +538,6 @@ uno::Reference< XDictionaryEntry > SAL_CALL
 
 void SAL_CALL
     DicList::dispose()
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -599,7 +585,6 @@ void SAL_CALL
 
 void SAL_CALL
     DicList::addEventListener( const uno::Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -609,7 +594,6 @@ void SAL_CALL
 
 void SAL_CALL
     DicList::removeEventListener( const uno::Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -703,20 +687,18 @@ void DicList::SaveDics()
 
 // Service specific part
 
-OUString SAL_CALL DicList::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL DicList::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
 
 sal_Bool SAL_CALL DicList::supportsService( const OUString& ServiceName )
-        throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL DicList::getSupportedServiceNames(  )
-        throw(RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 3e9130b7d2d6..55030149af10 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -87,30 +87,30 @@ public:
     virtual ~DicList() override;
 
     // XDictionaryList
-    virtual ::sal_Int16 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > SAL_CALL getDictionaries(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL addDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL removeDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL addDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener, sal_Bool bReceiveVerbose ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL removeDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL beginCollectEvents(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL endCollectEvents(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL flushEvents(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const css::lang::Locale& aLocale, css::linguistic2::DictionaryType eDicType, const OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int16 SAL_CALL getCount(  ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > SAL_CALL getDictionaries(  ) override;
+    virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) override;
+    virtual sal_Bool SAL_CALL addDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) override;
+    virtual sal_Bool SAL_CALL removeDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) override;
+    virtual sal_Bool SAL_CALL addDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener, sal_Bool bReceiveVerbose ) override;
+    virtual sal_Bool SAL_CALL removeDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener ) override;
+    virtual ::sal_Int16 SAL_CALL beginCollectEvents(  ) override;
+    virtual ::sal_Int16 SAL_CALL endCollectEvents(  ) override;
+    virtual ::sal_Int16 SAL_CALL flushEvents(  ) override;
+    virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const css::lang::Locale& aLocale, css::linguistic2::DictionaryType eDicType, const OUString& aURL ) override;
 
     // XSearchableDictionaryList
-    virtual css::uno::Reference< css::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const css::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const css::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 
     static inline OUString getImplementationName_Static() throw();
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 8897122f1cd4..265f1b8fd9cd 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -652,7 +652,6 @@ void GrammarCheckingIterator::DequeueAndCheck()
 void SAL_CALL GrammarCheckingIterator::startProofreading(
     const uno::Reference< ::uno::XInterface > & xDoc,
     const uno::Reference< text::XFlatParagraphIteratorProvider > & xIteratorProvider )
-throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     // get paragraph to start checking with
     const bool bAutomatic = true;
@@ -682,7 +681,6 @@ linguistic2::ProofreadingResult SAL_CALL GrammarCheckingIterator::checkSentenceA
     sal_Int32 nStartOfSentencePos,
     sal_Int32 nSuggestedEndOfSentencePos,
     sal_Int32 nErrorPosInPara )
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     (void) rLocale;
 
@@ -806,7 +804,6 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence(
 
 
 void SAL_CALL GrammarCheckingIterator::resetIgnoreRules(  )
-throw (uno::RuntimeException, std::exception)
 {
     GCReferences_t::iterator aIt( m_aGCReferencesByService.begin() );
     while (aIt != m_aGCReferencesByService.end())
@@ -821,7 +818,6 @@ throw (uno::RuntimeException, std::exception)
 
 sal_Bool SAL_CALL GrammarCheckingIterator::isProofreading(
     const uno::Reference< uno::XInterface >& xDoc )
-throw (uno::RuntimeException, std::exception)
 {
     // ---- THREAD SAFE START ----
     ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() );
@@ -867,7 +863,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL GrammarCheckingIterator::processLinguServiceEvent(
     const linguistic2::LinguServiceEvent& rLngSvcEvent )
-throw (uno::RuntimeException, std::exception)
 {
     if (rLngSvcEvent.nEvent == linguistic2::LinguServiceEventFlags::PROOFREAD_AGAIN)
     {
@@ -894,7 +889,6 @@ throw (uno::RuntimeException, std::exception)
 
 sal_Bool SAL_CALL GrammarCheckingIterator::addLinguServiceEventListener(
     const uno::Reference< linguistic2::XLinguServiceEventListener >& xListener )
-throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -906,7 +900,6 @@ throw (uno::RuntimeException, std::exception)
 
 sal_Bool SAL_CALL GrammarCheckingIterator::removeLinguServiceEventListener(
     const uno::Reference< linguistic2::XLinguServiceEventListener >& xListener )
-throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -917,7 +910,6 @@ throw (uno::RuntimeException, std::exception)
 
 
 void SAL_CALL GrammarCheckingIterator::dispose()
-throw (uno::RuntimeException, std::exception)
 {
     lang::EventObject aEvt( static_cast<linguistic2::XProofreadingIterator *>(this) );
     m_aEventListeners.disposeAndClear( aEvt );
@@ -946,7 +938,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL GrammarCheckingIterator::addEventListener(
     const uno::Reference< lang::XEventListener >& xListener )
-throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -957,7 +948,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL GrammarCheckingIterator::removeEventListener(
     const uno::Reference< lang::XEventListener >& xListener )
-throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -967,7 +957,6 @@ throw (uno::RuntimeException, std::exception)
 
 
 void SAL_CALL GrammarCheckingIterator::disposing( const lang::EventObject &rSource )
-throw (uno::RuntimeException, std::exception)
 {
     // if the component (document) is disposing release all references
     //!! There is no need to remove entries from the queue that are from this document
@@ -1068,19 +1057,18 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl()
 
 sal_Bool SAL_CALL GrammarCheckingIterator::supportsService(
     const OUString & rServiceName )
-throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 
-OUString SAL_CALL GrammarCheckingIterator::getImplementationName(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL GrammarCheckingIterator::getImplementationName(  )
 {
     return GrammarCheckingIterator_getImplementationName();
 }
 
 
-uno::Sequence< OUString > SAL_CALL GrammarCheckingIterator::getSupportedServiceNames(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL GrammarCheckingIterator::getSupportedServiceNames(  )
 {
     return GrammarCheckingIterator_getSupportedServiceNames();
 }
@@ -1144,7 +1132,6 @@ static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceName
 /// @throws uno::Exception
 static uno::Reference< uno::XInterface > SAL_CALL GrammarCheckingIterator_createInstance(
     const uno::Reference< lang::XMultiServiceFactory > & /*rxSMgr*/ )
-throw(uno::Exception)
 {
     return static_cast< ::cppu::OWeakObject * >(new GrammarCheckingIterator());
 }
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index c114c80284f4..a4d6fc1672d3 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -149,30 +149,30 @@ public:
     virtual ~GrammarCheckingIterator() override;
 
     // XProofreadingIterator
-    virtual void SAL_CALL startProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const css::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL resetIgnoreRules(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) override;
+    virtual css::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const css::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) override;
+    virtual void SAL_CALL resetIgnoreRules(  ) override;
+    virtual sal_Bool SAL_CALL isProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument ) override;
 
     // XLinguServiceEventListener
-    virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& aLngSvcEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& aLngSvcEvent ) override;
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) override;
+    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // LinguDispatcher
     virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< OUString > &rSvcImplNames ) override;
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index f96c5bfc6253..12ec7cf9c8d5 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -57,7 +57,7 @@ using namespace i18n;
 
 // from i18npool/source/textconversion/textconversion_ko.cxx
 /// @throws RuntimeException
-sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) throw (RuntimeException)
+sal_Int16 SAL_CALL checkScriptType(sal_Unicode c)
 {
   UErrorCode status = U_ZERO_ERROR;
 
@@ -96,7 +96,6 @@ HHConvDic::~HHConvDic()
 void SAL_CALL HHConvDic::addEntry(
         const OUString& aLeftText,
         const OUString& aRightText )
-    throw (IllegalArgumentException, container::ElementExistException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -109,21 +108,18 @@ void SAL_CALL HHConvDic::addEntry(
 
 
 OUString SAL_CALL HHConvDic::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.lingu2.HHConvDic" );
 }
 
 
 sal_Bool SAL_CALL HHConvDic::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 
 uno::Sequence< OUString > SAL_CALL HHConvDic::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return { SN_CONV_DICTIONARY, SN_HH_CONV_DICTIONARY };
 }
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index e925c17d3dd8..5d6330a4ece3 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -41,12 +41,12 @@ public:
     virtual ~HHConvDic() override;
 
     // XConversionDictionary
-    virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 1a6db5efa4a6..c475db91d3a5 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -246,7 +246,6 @@ Reference< XPossibleHyphens > HyphenatorDispatcher::buildPossHyphens(
 
 
 Sequence< Locale > SAL_CALL HyphenatorDispatcher::getLocales()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -262,7 +261,6 @@ Sequence< Locale > SAL_CALL HyphenatorDispatcher::getLocales()
 
 
 sal_Bool SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale)
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     HyphSvcByLangMap_t::const_iterator aIt( aSvcMap.find( LinguLocaleToLanguage( rLocale ) ) );
@@ -274,7 +272,6 @@ Reference< XHyphenatedWord > SAL_CALL
     HyphenatorDispatcher::hyphenate(
             const OUString& rWord, const Locale& rLocale, sal_Int16 nMaxLeading,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -411,7 +408,6 @@ Reference< XHyphenatedWord > SAL_CALL
     HyphenatorDispatcher::queryAlternativeSpelling(
             const OUString& rWord, const Locale& rLocale, sal_Int16 nIndex,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -543,7 +539,6 @@ Reference< XPossibleHyphens > SAL_CALL
     HyphenatorDispatcher::createPossibleHyphens(
             const OUString& rWord, const Locale& rLocale,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index cf250664aaa0..fc91441beefa 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -83,35 +83,27 @@ public:
 
     // XSupportedLocales
     virtual css::uno::Sequence< css::lang::Locale > SAL_CALL
-        getLocales()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getLocales() override;
     virtual sal_Bool SAL_CALL
-        hasLocale( const css::lang::Locale& aLocale )
-            throw(css::uno::RuntimeException, std::exception) override;
+        hasLocale( const css::lang::Locale& aLocale ) override;
 
     // XHyphenator
     virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL
         hyphenate( const OUString& aWord,
                 const css::lang::Locale& aLocale,
                 sal_Int16 nMaxLeading,
-                const css::beans::PropertyValues& aProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& aProperties ) override;
     virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL
         queryAlternativeSpelling( const OUString& aWord,
                 const css::lang::Locale& aLocale,
                 sal_Int16 nIndex,
-                const css::beans::PropertyValues& aProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& aProperties ) override;
     virtual css::uno::Reference<
             css::linguistic2::XPossibleHyphens > SAL_CALL
         createPossibleHyphens(
                 const OUString& aWord,
                 const css::lang::Locale& aLocale,
-                const css::beans::PropertyValues& aProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& aProperties ) override;
 
     // LinguDispatcher
     virtual void
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index 69e6a5f0c101..bef72839a1b3 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -71,7 +71,6 @@ HyphenatedWord::~HyphenatedWord()
 
 
 OUString SAL_CALL HyphenatedWord::getWord()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aWord;
@@ -79,7 +78,6 @@ OUString SAL_CALL HyphenatedWord::getWord()
 
 
 Locale SAL_CALL HyphenatedWord::getLocale()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -88,7 +86,6 @@ Locale SAL_CALL HyphenatedWord::getLocale()
 
 
 sal_Int16 SAL_CALL HyphenatedWord::getHyphenationPos()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return nHyphenationPos;
@@ -96,7 +93,6 @@ sal_Int16 SAL_CALL HyphenatedWord::getHyphenationPos()
 
 
 OUString SAL_CALL HyphenatedWord::getHyphenatedWord()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aHyphenatedWord;
@@ -104,7 +100,6 @@ OUString SAL_CALL HyphenatedWord::getHyphenatedWord()
 
 
 sal_Int16 SAL_CALL HyphenatedWord::getHyphenPos()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return nHyphPos;
@@ -112,7 +107,6 @@ sal_Int16 SAL_CALL HyphenatedWord::getHyphenPos()
 
 
 sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return bIsAltSpelling;
@@ -136,7 +130,6 @@ PossibleHyphens::~PossibleHyphens()
 
 
 OUString SAL_CALL PossibleHyphens::getWord()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aWord;
@@ -144,7 +137,6 @@ OUString SAL_CALL PossibleHyphens::getWord()
 
 
 Locale SAL_CALL PossibleHyphens::getLocale()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return LanguageTag::convertToLocale( nLanguage );
@@ -152,7 +144,6 @@ Locale SAL_CALL PossibleHyphens::getLocale()
 
 
 OUString SAL_CALL PossibleHyphens::getPossibleHyphens()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aWordWithHyphens;
@@ -160,7 +151,6 @@ OUString SAL_CALL PossibleHyphens::getPossibleHyphens()
 
 
 Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aOrigHyphenPos;
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index e7989b2b8af6..8329ecd97265 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -132,7 +132,6 @@ void FlushListener::SetPropSet( Reference< XLinguProperties > &rPS )
 
 
 void SAL_CALL FlushListener::disposing( const EventObject& rSource )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -151,7 +150,6 @@ void SAL_CALL FlushListener::disposing( const EventObject& rSource )
 
 void SAL_CALL FlushListener::processDictionaryListEvent(
             const DictionaryListEvent& rDicListEvent )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -173,7 +171,6 @@ void SAL_CALL FlushListener::processDictionaryListEvent(
 
 void SAL_CALL FlushListener::propertyChange(
             const PropertyChangeEvent& rEvt )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index ba99a5a21a0f..96908dd1ac73 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -212,14 +212,12 @@ void LinguProps::launchEvent( const PropertyChangeEvent &rEvt ) const
 /// @throws Exception
 Reference< XInterface > SAL_CALL LinguProps_CreateInstance(
             const Reference< XMultiServiceFactory > & /*rSMgr*/ )
-        throw(Exception)
 {
     Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new LinguProps);
     return xService;
 }
 
 Reference< XPropertySetInfo > SAL_CALL LinguProps::getPropertySetInfo()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -230,8 +228,6 @@ Reference< XPropertySetInfo > SAL_CALL LinguProps::getPropertySetInfo()
 
 void SAL_CALL LinguProps::setPropertyValue(
             const OUString& rPropertyName, const Any& rValue )
-        throw(UnknownPropertyException, PropertyVetoException,
-              IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -249,7 +245,6 @@ void SAL_CALL LinguProps::setPropertyValue(
 }
 
 Any SAL_CALL LinguProps::getPropertyValue( const OUString& rPropertyName )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -267,7 +262,6 @@ Any SAL_CALL LinguProps::getPropertyValue( const OUString& rPropertyName )
 void SAL_CALL LinguProps::addPropertyChangeListener(
             const OUString& rPropertyName,
             const Reference< XPropertyChangeListener >& rxListener )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -282,7 +276,6 @@ void SAL_CALL LinguProps::addPropertyChangeListener(
 void SAL_CALL LinguProps::removePropertyChangeListener(
             const OUString& rPropertyName,
             const Reference< XPropertyChangeListener >& rxListener )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -297,21 +290,17 @@ void SAL_CALL LinguProps::removePropertyChangeListener(
 void SAL_CALL LinguProps::addVetoableChangeListener(
             const OUString& /*rPropertyName*/,
             const Reference< XVetoableChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL LinguProps::removeVetoableChangeListener(
             const OUString& /*rPropertyName*/,
             const Reference< XVetoableChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL LinguProps::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
-        throw(UnknownPropertyException, PropertyVetoException,
-              IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -326,7 +315,6 @@ void SAL_CALL LinguProps::setFastPropertyValue( sal_Int32 nHandle, const Any& rV
 
 
 Any SAL_CALL LinguProps::getFastPropertyValue( sal_Int32 nHandle )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -337,7 +325,6 @@ Any SAL_CALL LinguProps::getFastPropertyValue( sal_Int32 nHandle )
 
 Sequence< PropertyValue > SAL_CALL
     LinguProps::getPropertyValues()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -361,8 +348,6 @@ Sequence< PropertyValue > SAL_CALL
 
 void SAL_CALL
     LinguProps::setPropertyValues( const Sequence< PropertyValue >& rProps )
-        throw(UnknownPropertyException, PropertyVetoException,
-              IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -377,7 +362,6 @@ void SAL_CALL
 
 void SAL_CALL
     LinguProps::dispose()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -397,7 +381,6 @@ void SAL_CALL
 
 void SAL_CALL
     LinguProps::addEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -407,7 +390,6 @@ void SAL_CALL
 
 void SAL_CALL
     LinguProps::removeEventListener( const Reference< XEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -420,21 +402,18 @@ void SAL_CALL
 
 // XServiceInfo
 OUString SAL_CALL LinguProps::getImplementationName()
-        throw(RuntimeException, std::exception)
 {
     return getImplementationName_Static();
 }
 
 // XServiceInfo
 sal_Bool SAL_CALL LinguProps::supportsService( const OUString& ServiceName )
-        throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
 uno::Sequence< OUString > SAL_CALL LinguProps::getSupportedServiceNames()
-        throw(RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
@@ -447,7 +426,7 @@ uno::Sequence< OUString > LinguProps::getSupportedServiceNames_Static()
     return aSNS;
 }
 
-bool LinguProps::getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+bool LinguProps::getPropertyBool(const OUString& aPropertyName)
 {
    uno::Any any = getPropertyValue(aPropertyName);
    bool b = false;
@@ -455,7 +434,7 @@ bool LinguProps::getPropertyBool(const OUString& aPropertyName) throw (css::uno:
    return b;
 }
 
-sal_Int16 LinguProps::getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+sal_Int16 LinguProps::getPropertyInt16(const OUString& aPropertyName)
 {
    uno::Any any = getPropertyValue(aPropertyName);
    sal_Int16 b = 0;
@@ -463,7 +442,7 @@ sal_Int16 LinguProps::getPropertyInt16(const OUString& aPropertyName) throw (css
    return b;
 }
 
-Locale LinguProps::getPropertyLocale(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+Locale LinguProps::getPropertyLocale(const OUString& aPropertyName)
 {
    uno::Any any = getPropertyValue(aPropertyName);
    css::lang::Locale b;
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 5eb5b92925af..1efed14d4dc1 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -90,115 +90,115 @@ class LinguProps :
     void    launchEvent( const css::beans::PropertyChangeEvent &rEvt ) const;
 
     /// @throws css::uno::RuntimeException
-    bool getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException);
+    bool getPropertyBool(const OUString& aPropertyName);
     /// @throws css::uno::RuntimeException
-    sal_Int16 getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException);
+    sal_Int16 getPropertyInt16(const OUString& aPropertyName);
     /// @throws css::uno::RuntimeException
-    css::lang::Locale getPropertyLocale(const OUString& aPropertyName) throw (css::uno::RuntimeException);
+    css::lang::Locale getPropertyLocale(const OUString& aPropertyName);
     /// @throws css::uno::RuntimeException
-    void setProperty(const OUString& aPropertyName, bool p1) throw (css::uno::RuntimeException)
+    void setProperty(const OUString& aPropertyName, bool p1)
         { setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
     /// @throws css::uno::RuntimeException
-    void setProperty(const OUString& aPropertyName, sal_Int16 p1) throw (css::uno::RuntimeException)
+    void setProperty(const OUString& aPropertyName, sal_Int16 p1)
         { setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
     /// @throws css::uno::RuntimeException
-    void setProperty(const OUString& aPropertyName, css::lang::Locale p1) throw (css::uno::RuntimeException)
+    void setProperty(const OUString& aPropertyName, css::lang::Locale p1)
         { setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
 
 public:
     LinguProps();
 
-    virtual sal_Bool SAL_CALL getIsUseDictionaryList() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsUseDictionaryList() override
         { return getPropertyBool(UPN_IS_USE_DICTIONARY_LIST); }
-    virtual void SAL_CALL setIsUseDictionaryList(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsUseDictionaryList(sal_Bool p1) override
         { setProperty(UPN_IS_USE_DICTIONARY_LIST, (bool) p1); }
-    virtual sal_Bool SAL_CALL getIsIgnoreControlCharacters() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsIgnoreControlCharacters() override
         { return getPropertyBool(UPN_IS_IGNORE_CONTROL_CHARACTERS); }
-    virtual void SAL_CALL setIsIgnoreControlCharacters(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsIgnoreControlCharacters(sal_Bool p1) override
         { setProperty(UPN_IS_IGNORE_CONTROL_CHARACTERS, (bool) p1); }
-    virtual sal_Bool SAL_CALL getIsSpellUpperCase() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsSpellUpperCase() override
         { return getPropertyBool(UPN_IS_SPELL_UPPER_CASE); }
-    virtual void SAL_CALL setIsSpellUpperCase(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsSpellUpperCase(sal_Bool p1) override
         { setProperty(UPN_IS_SPELL_UPPER_CASE, (bool) p1); }
-    virtual sal_Bool SAL_CALL getIsSpellWithDigits() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsSpellWithDigits() override
         { return getPropertyBool(UPN_IS_SPELL_WITH_DIGITS); }
-    virtual void SAL_CALL setIsSpellWithDigits(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsSpellWithDigits(sal_Bool p1) override
         { setProperty(UPN_IS_SPELL_WITH_DIGITS, (bool) p1); }
-    virtual sal_Bool SAL_CALL getIsSpellCapitalization() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsSpellCapitalization() override
         { return getPropertyBool(UPN_IS_SPELL_CAPITALIZATION); }
-    virtual void SAL_CALL setIsSpellCapitalization(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsSpellCapitalization(sal_Bool p1) override
         { setProperty(UPN_IS_SPELL_CAPITALIZATION, (bool) p1); }
-    virtual sal_Int16 SAL_CALL getHyphMinLeading() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getHyphMinLeading() override
         { return getPropertyInt16(UPN_HYPH_MIN_LEADING); }
-    virtual void SAL_CALL setHyphMinLeading(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setHyphMinLeading(sal_Int16 p1) override
         { setProperty(UPN_HYPH_MIN_LEADING, p1); }
-    virtual sal_Int16 SAL_CALL getHyphMinTrailing() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getHyphMinTrailing() override
         { return getPropertyInt16(UPN_HYPH_MIN_TRAILING); }
-    virtual void SAL_CALL setHyphMinTrailing(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setHyphMinTrailing(sal_Int16 p1) override
         { setProperty(UPN_HYPH_MIN_TRAILING, p1); }
-    virtual sal_Int16 SAL_CALL getHyphMinWordLength() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getHyphMinWordLength() override
         { return getPropertyInt16(UPN_HYPH_MIN_WORD_LENGTH); }
-    virtual void SAL_CALL setHyphMinWordLength(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setHyphMinWordLength(sal_Int16 p1) override
         { setProperty(UPN_HYPH_MIN_WORD_LENGTH, p1); }
-    virtual css::lang::Locale SAL_CALL getDefaultLocale() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::lang::Locale SAL_CALL getDefaultLocale() override
         { return getPropertyLocale(UPN_DEFAULT_LOCALE); }
-    virtual void SAL_CALL setDefaultLocale(const css::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setDefaultLocale(const css::lang::Locale& p1) override
         { setProperty(UPN_DEFAULT_LOCALE, p1); }
-    virtual sal_Bool SAL_CALL getIsHyphAuto() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsHyphAuto() override
         { return getPropertyBool(UPN_IS_HYPH_AUTO); }
-    virtual void SAL_CALL setIsHyphAuto(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsHyphAuto(sal_Bool p1) override
         { setProperty(UPN_IS_HYPH_AUTO, (bool) p1); }
-    virtual sal_Bool SAL_CALL getIsHyphSpecial() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsHyphSpecial() override
         { return getPropertyBool(UPN_IS_HYPH_SPECIAL); }
-    virtual void SAL_CALL setIsHyphSpecial(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsHyphSpecial(sal_Bool p1) override
         { setProperty(UPN_IS_HYPH_SPECIAL, (bool) p1); }
-    virtual sal_Bool SAL_CALL getIsSpellAuto() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsSpellAuto() override
         { return getPropertyBool(UPN_IS_SPELL_AUTO); }
-    virtual void SAL_CALL setIsSpellAuto(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsSpellAuto(sal_Bool p1) override
         { setProperty(UPN_IS_SPELL_AUTO, (bool) p1); }
-    virtual sal_Bool SAL_CALL getIsSpellSpecial() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsSpellSpecial() override
         { return getPropertyBool(UPN_IS_SPELL_SPECIAL); }
-    virtual void SAL_CALL setIsSpellSpecial(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsSpellSpecial(sal_Bool p1) override
         { setProperty(UPN_IS_SPELL_SPECIAL, (bool) p1); }
-    virtual sal_Bool SAL_CALL getIsWrapReverse() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getIsWrapReverse() override
         { return getPropertyBool(UPN_IS_WRAP_REVERSE); }
-    virtual void SAL_CALL setIsWrapReverse(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setIsWrapReverse(sal_Bool p1) override
         { setProperty(UPN_IS_WRAP_REVERSE, (bool) p1); }
-    virtual css::lang::Locale SAL_CALL getDefaultLocale_CJK() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::lang::Locale SAL_CALL getDefaultLocale_CJK() override
         { return getPropertyLocale(UPN_DEFAULT_LOCALE_CJK); }
-    virtual void SAL_CALL setDefaultLocale_CJK(const css::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setDefaultLocale_CJK(const css::lang::Locale& p1) override
         { setProperty(UPN_DEFAULT_LOCALE_CJK, p1); }
-    virtual css::lang::Locale SAL_CALL getDefaultLocale_CTL() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::lang::Locale SAL_CALL getDefaultLocale_CTL() override
         { return getPropertyLocale(UPN_DEFAULT_LOCALE_CTL); }
-    virtual void SAL_CALL setDefaultLocale_CTL(const css::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setDefaultLocale_CTL(const css::lang::Locale& p1) override
         { setProperty(UPN_DEFAULT_LOCALE_CTL, p1); }
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) 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;
+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) override;
 
     // XPropertyAccess
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 
     static inline OUString getImplementationName_Static() throw();
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 0528f5ddcbc9..2846569b172b 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -216,7 +216,6 @@ bool PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
 
 void SAL_CALL
     PropertyChgHelper::propertyChange( const PropertyChangeEvent& rEvt )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     propertyChange_Impl( rEvt );
@@ -259,7 +258,6 @@ void PropertyChgHelper::LaunchEvent( const LinguServiceEvent &rEvt )
 
 
 void SAL_CALL PropertyChgHelper::disposing( const EventObject& rSource )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     if (rSource.Source == xPropSet)
@@ -274,7 +272,6 @@ void SAL_CALL PropertyChgHelper::disposing( const EventObject& rSource )
 sal_Bool SAL_CALL
     PropertyChgHelper::addLinguServiceEventListener(
             const Reference< XLinguServiceEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -291,7 +288,6 @@ sal_Bool SAL_CALL
 sal_Bool SAL_CALL
     PropertyChgHelper::removeLinguServiceEventListener(
             const Reference< XLinguServiceEventListener >& rxListener )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -322,7 +318,6 @@ PropertyHelper_Thes::~PropertyHelper_Thes()
 
 void SAL_CALL
     PropertyHelper_Thes::propertyChange( const PropertyChangeEvent& rEvt )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     PropertyChgHelper::propertyChange_Impl( rEvt );
@@ -467,7 +462,6 @@ bool PropertyHelper_Spell::propertyChange_Impl( const PropertyChangeEvent& rEvt
 
 void SAL_CALL
     PropertyHelper_Spell::propertyChange( const PropertyChangeEvent& rEvt )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     propertyChange_Impl( rEvt );
@@ -623,7 +617,6 @@ bool PropertyHelper_Hyphen::propertyChange_Impl( const PropertyChangeEvent& rEvt
 
 void SAL_CALL
     PropertyHelper_Hyphen::propertyChange( const PropertyChangeEvent& rEvt )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     propertyChange_Impl( rEvt );
@@ -735,14 +728,12 @@ sal_Int16 PropertyHelper_Hyphenation::GetMinWordLength() const
 
 bool PropertyHelper_Hyphenation::addLinguServiceEventListener(
                 const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException)
 {
     return pInst->addLinguServiceEventListener( rxListener );
 }
 
 bool PropertyHelper_Hyphenation::removeLinguServiceEventListener(
                 const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException)
 {
     return pInst->removeLinguServiceEventListener( rxListener );
 }
@@ -792,7 +783,6 @@ bool PropertyHelper_Spelling::IsSpellCapitalization() const
 bool PropertyHelper_Spelling::addLinguServiceEventListener(
                 const css::uno::Reference<
                     css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException)
 {
     return pInst->addLinguServiceEventListener( rxListener );
 }
@@ -800,7 +790,6 @@ bool PropertyHelper_Spelling::addLinguServiceEventListener(
 bool PropertyHelper_Spelling::removeLinguServiceEventListener(
                 const css::uno::Reference<
                     css::linguistic2::XLinguServiceEventListener >& rxListener )
-            throw(css::uno::RuntimeException)
 {
     return pInst->removeLinguServiceEventListener( rxListener );
 }
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 4cc4fa7c8b9f..0fcd7dfff492 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -199,19 +199,16 @@ public:
 
     // lang::XEventListener
     virtual void SAL_CALL
-        disposing( const lang::EventObject& rSource )
-            throw(uno::RuntimeException, std::exception) override;
+        disposing( const lang::EventObject& rSource ) override;
 
     // linguistic2::XLinguServiceEventListener
     virtual void SAL_CALL
-        processLinguServiceEvent( const linguistic2::LinguServiceEvent& aLngSvcEvent )
-            throw(uno::RuntimeException, std::exception) override;
+        processLinguServiceEvent( const linguistic2::LinguServiceEvent& aLngSvcEvent ) override;
 
     // linguistic2::XDictionaryListEventListener
     virtual void SAL_CALL
         processDictionaryListEvent(
-                const linguistic2::DictionaryListEvent& rDicListEvent )
-            throw(uno::RuntimeException, std::exception) override;
+                const linguistic2::DictionaryListEvent& rDicListEvent ) override;
 
     inline  bool    AddLngSvcMgrListener(
                         const uno::Reference< lang::XEventListener >& rxListener );
@@ -246,7 +243,6 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper(
 
 
 void SAL_CALL LngSvcMgrListenerHelper::disposing( const lang::EventObject& rSource )
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -291,7 +287,6 @@ void LngSvcMgrListenerHelper::AddLngSvcEvt( sal_Int16 nLngSvcEvt )
 void SAL_CALL
     LngSvcMgrListenerHelper::processLinguServiceEvent(
             const linguistic2::LinguServiceEvent& rLngSvcEvent )
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
     AddLngSvcEvt( rLngSvcEvent.nEvent );
@@ -301,7 +296,6 @@ void SAL_CALL
 void SAL_CALL
     LngSvcMgrListenerHelper::processDictionaryListEvent(
             const linguistic2::DictionaryListEvent& rDicListEvent )
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -472,7 +466,6 @@ LngSvcMgr::LngSvcMgr()
 
 // css::util::XModifyListener
 void LngSvcMgr::modified(const lang::EventObject&)
-    throw(uno::RuntimeException, std::exception)
 {
     {
         osl::MutexGuard aGuard(GetLinguMutex());
@@ -532,7 +525,6 @@ void LngSvcMgr::stopListening()
 }
 
 void LngSvcMgr::disposing(const lang::EventObject&)
-    throw (uno::RuntimeException, std::exception)
 {
     stopListening();
 }
@@ -1408,7 +1400,6 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp )
 
 uno::Reference< linguistic2::XSpellChecker > SAL_CALL
     LngSvcMgr::getSpellChecker()
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 #if OSL_DEBUG_LEVEL > 0
@@ -1428,7 +1419,6 @@ uno::Reference< linguistic2::XSpellChecker > SAL_CALL
 
 uno::Reference< linguistic2::XHyphenator > SAL_CALL
     LngSvcMgr::getHyphenator()
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 #if OSL_DEBUG_LEVEL > 0
@@ -1447,7 +1437,6 @@ uno::Reference< linguistic2::XHyphenator > SAL_CALL
 
 uno::Reference< linguistic2::XThesaurus > SAL_CALL
     LngSvcMgr::getThesaurus()
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 #if OSL_DEBUG_LEVEL > 0
@@ -1467,7 +1456,6 @@ uno::Reference< linguistic2::XThesaurus > SAL_CALL
 sal_Bool SAL_CALL
     LngSvcMgr::addLinguServiceManagerListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -1485,7 +1473,6 @@ sal_Bool SAL_CALL
 sal_Bool SAL_CALL
     LngSvcMgr::removeLinguServiceManagerListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -1505,8 +1492,6 @@ uno::Sequence< OUString > SAL_CALL
     LngSvcMgr::getAvailableServices(
             const OUString& rServiceName,
             const lang::Locale& rLocale )
-        throw(uno::RuntimeException,
-              std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -1565,7 +1550,6 @@ uno::Sequence< OUString > SAL_CALL
 uno::Sequence< lang::Locale > SAL_CALL
     LngSvcMgr::getAvailableLocales(
             const OUString& rServiceName )
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -1620,7 +1604,6 @@ void SAL_CALL
             const OUString& rServiceName,
             const lang::Locale& rLocale,
             const uno::Sequence< OUString >& rServiceImplNames )
-        throw(uno::RuntimeException, std::exception)
 {
     SAL_INFO( "linguistic", "linguistic: LngSvcMgr::setConfiguredServices" );
 
@@ -1847,7 +1830,6 @@ uno::Sequence< OUString > SAL_CALL
     LngSvcMgr::getConfiguredServices(
             const OUString& rServiceName,
             const lang::Locale& rLocale )
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -1913,7 +1895,6 @@ uno::Sequence< OUString > SAL_CALL
 
 void SAL_CALL
     LngSvcMgr::dispose()
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -1934,7 +1915,6 @@ void SAL_CALL
 void SAL_CALL
     LngSvcMgr::addEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -1948,7 +1928,6 @@ void SAL_CALL
 void SAL_CALL
     LngSvcMgr::removeEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw(uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( GetLinguMutex() );
 
@@ -1975,7 +1954,6 @@ bool LngSvcMgr::AddLngSvcEvtBroadcaster(
 
 OUString SAL_CALL
     LngSvcMgr::getImplementationName()
-        throw(uno::RuntimeException, std::exception)
 {
     return getImplementationName_Static();
 }
@@ -1983,7 +1961,6 @@ OUString SAL_CALL
 
 sal_Bool SAL_CALL
     LngSvcMgr::supportsService( const OUString& ServiceName )
-        throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -1991,7 +1968,6 @@ sal_Bool SAL_CALL
 
 uno::Sequence< OUString > SAL_CALL
     LngSvcMgr::getSupportedServiceNames()
-        throw(uno::RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
@@ -2007,7 +1983,6 @@ uno::Sequence< OUString > LngSvcMgr::getSupportedServiceNames_Static()
 /// @throws uno::Exception
 uno::Reference< uno::XInterface > SAL_CALL LngSvcMgr_CreateInstance(
             const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ )
-        throw(uno::Exception, std::exception)
 {
     uno::Reference< uno::XInterface > xService = static_cast<cppu::OWeakObject*>(new LngSvcMgr);
     return xService;
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 75b4c1ca1b1e..8a9f9ed91a41 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -134,35 +134,33 @@ public:
     virtual ~LngSvcMgr() override;
 
     // XLinguServiceManager
-    virtual css::uno::Reference< css::linguistic2::XSpellChecker > SAL_CALL getSpellChecker(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::linguistic2::XHyphenator > SAL_CALL getHyphenator(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::linguistic2::XThesaurus > SAL_CALL getThesaurus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL addLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL removeLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const css::lang::Locale& aLocale )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale, const css::uno::Sequence< OUString >& aServiceImplNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::linguistic2::XSpellChecker > SAL_CALL getSpellChecker(  ) override;
+    virtual css::uno::Reference< css::linguistic2::XHyphenator > SAL_CALL getHyphenator(  ) override;
+    virtual css::uno::Reference< css::linguistic2::XThesaurus > SAL_CALL getThesaurus(  ) override;
+    virtual sal_Bool SAL_CALL addLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual sal_Bool SAL_CALL removeLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const css::lang::Locale& aLocale ) override;
+    virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale, const css::uno::Sequence< OUString >& aServiceImplNames ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale ) override;
 
     // XAvailableLocales
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) override;
 
     // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& rEvent ) override;
 
     static inline OUString   getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index b8a3e7f6b507..392b2deec774 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -772,7 +772,6 @@ void AppExitListener::Deactivate()
 
 void SAL_CALL
     AppExitListener::disposing( const EventObject& rEvtSource )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -784,13 +783,11 @@ void SAL_CALL
 
 void SAL_CALL
     AppExitListener::queryTermination( const EventObject& /*rEvtSource*/ )
-        throw(frame::TerminationVetoException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL
     AppExitListener::notifyTermination( const EventObject& rEvtSource )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index cdcd95e0aab5..484dc1ec62cf 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -199,7 +199,6 @@ void SpellCheckerDispatcher::ClearSvcList()
 
 
 Sequence< Locale > SAL_CALL SpellCheckerDispatcher::getLocales()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -215,7 +214,6 @@ Sequence< Locale > SAL_CALL SpellCheckerDispatcher::getLocales()
 
 
 sal_Bool SAL_CALL SpellCheckerDispatcher::hasLocale( const Locale& rLocale )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     SpellSvcByLangMap_t::const_iterator aIt( aSvcMap.find( LinguLocaleToLanguage( rLocale ) ) );
@@ -226,7 +224,6 @@ sal_Bool SAL_CALL SpellCheckerDispatcher::hasLocale( const Locale& rLocale )
 sal_Bool SAL_CALL
     SpellCheckerDispatcher::isValid( const OUString& rWord, const Locale& rLocale,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return isValid_Impl( rWord, LinguLocaleToLanguage( rLocale ), rProperties );
@@ -236,7 +233,6 @@ sal_Bool SAL_CALL
 Reference< XSpellAlternatives > SAL_CALL
     SpellCheckerDispatcher::spell( const OUString& rWord, const Locale& rLocale,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return spell_Impl( rWord, LinguLocaleToLanguage( rLocale ), rProperties );
@@ -281,7 +277,6 @@ bool SpellCheckerDispatcher::isValid_Impl(
             const OUString& rWord,
             LanguageType nLanguage,
             const PropertyValues& rProperties)
-        throw( RuntimeException, IllegalArgumentException, std::exception )
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -445,7 +440,6 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
             const OUString& rWord,
             LanguageType nLanguage,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -750,7 +744,6 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
 }
 
 uno::Sequence< sal_Int16 > SAL_CALL SpellCheckerDispatcher::getLanguages(  )
-throw (uno::RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     uno::Sequence< Locale > aTmp( getLocales() );
@@ -761,7 +754,6 @@ throw (uno::RuntimeException, std::exception)
 
 sal_Bool SAL_CALL SpellCheckerDispatcher::hasLanguage(
     sal_Int16 nLanguage )
-throw (uno::RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return hasLocale( LanguageTag::convertToLocale( nLanguage) );
@@ -772,7 +764,6 @@ sal_Bool SAL_CALL SpellCheckerDispatcher::isValid(
     const OUString& rWord,
     sal_Int16 nLanguage,
     const uno::Sequence< beans::PropertyValue >& rProperties )
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return isValid( rWord, LanguageTag::convertToLocale( nLanguage ), rProperties);
@@ -783,7 +774,6 @@ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL SpellCheckerDispatche
     const OUString& rWord,
     sal_Int16 nLanguage,
     const uno::Sequence< beans::PropertyValue >& rProperties )
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return spell( rWord, LanguageTag::convertToLocale( nLanguage), rProperties);
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 26e75e82e05b..e02e4042cadf 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -77,36 +77,34 @@ class SpellCheckerDispatcher :
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
     bool    isValid_Impl(const OUString& aWord, LanguageType nLanguage,
-                    const css::beans::PropertyValues& aProperties)
-                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception );
+                    const css::beans::PropertyValues& aProperties);
 
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
     css::uno::Reference<
         css::linguistic2::XSpellAlternatives >
             spell_Impl(const OUString& aWord, LanguageType nLanguage,
-                    const css::beans::PropertyValues& aProperties)
-                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception );
+                    const css::beans::PropertyValues& aProperties);
 
 public:
     explicit SpellCheckerDispatcher( LngSvcMgr &rLngSvcMgr );
     virtual ~SpellCheckerDispatcher() override;
 
     // XSupportedLocales (for XSpellChecker)
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasLocale( const css::lang::Locale& aLocale ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales() override;
+    virtual sal_Bool SAL_CALL hasLocale( const css::lang::Locale& aLocale ) override;
 
     // XSpellChecker
-    virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override;
+    virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override;
 
     // XSupportedLanguages
-    virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages(  ) override;
+    virtual sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) override;
 
     // XSpellChecker1
-    virtual sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) override;
+    virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) override;
 
     // LinguDispatcher
     virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< OUString > &rSvcImplNames ) override;
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 7b97f500d9de..65b7c97fc6ef 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -195,7 +195,6 @@ SpellAlternatives::~SpellAlternatives()
 
 
 OUString SAL_CALL SpellAlternatives::getWord()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aWord;
@@ -203,7 +202,6 @@ OUString SAL_CALL SpellAlternatives::getWord()
 
 
 Locale SAL_CALL SpellAlternatives::getLocale()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return LanguageTag::convertToLocale( nLanguage );
@@ -211,7 +209,6 @@ Locale SAL_CALL SpellAlternatives::getLocale()
 
 
 sal_Int16 SAL_CALL SpellAlternatives::getFailureType()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return nType;
@@ -219,7 +216,6 @@ sal_Int16 SAL_CALL SpellAlternatives::getFailureType()
 
 
 sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return (sal_Int16) aAlt.getLength();
@@ -227,7 +223,6 @@ sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount()
 
 
 Sequence< OUString > SAL_CALL SpellAlternatives::getAlternatives()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     return aAlt;
@@ -235,7 +230,6 @@ Sequence< OUString > SAL_CALL SpellAlternatives::getAlternatives()
 
 
 void SAL_CALL SpellAlternatives::setAlternatives( const uno::Sequence< OUString >& rAlternatives )
-throw (uno::RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     aAlt = rAlternatives;
@@ -243,7 +237,6 @@ throw (uno::RuntimeException, std::exception)
 
 
 void SAL_CALL SpellAlternatives::setFailureType( sal_Int16 nFailureType )
-throw (uno::RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     nType = nFailureType;
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index bfd0875eb44e..a967745bc938 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -78,7 +78,6 @@ void ThesaurusDispatcher::ClearSvcList()
 
 Sequence< Locale > SAL_CALL
     ThesaurusDispatcher::getLocales()
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
@@ -95,7 +94,6 @@ Sequence< Locale > SAL_CALL
 
 sal_Bool SAL_CALL
     ThesaurusDispatcher::hasLocale( const Locale& rLocale )
-        throw(RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
     ThesSvcByLangMap_t::const_iterator aIt( aSvcMap.find( LinguLocaleToLanguage( rLocale ) ) );
@@ -107,7 +105,6 @@ Sequence< Reference< XMeaning > > SAL_CALL
     ThesaurusDispatcher::queryMeanings(
             const OUString& rTerm, const Locale& rLocale,
             const PropertyValues& rProperties )
-        throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index 6cb7e4be8b39..236bf960a078 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -67,19 +67,15 @@ public:
 
     // XSupportedLocales
     virtual css::uno::Sequence< css::lang::Locale > SAL_CALL
-        getLocales()
-            throw(css::uno::RuntimeException, std::exception) override;
+        getLocales() override;
     virtual sal_Bool SAL_CALL
-        hasLocale( const css::lang::Locale& aLocale )
-            throw(css::uno::RuntimeException, std::exception) override;
+        hasLocale( const css::lang::Locale& aLocale ) override;
 
     // XThesaurus
     virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > SAL_CALL
         queryMeanings( const OUString& aTerm,
                 const css::lang::Locale& aLocale,
-                const css::beans::PropertyValues& aProperties )
-            throw(css::lang::IllegalArgumentException,
-                  css::uno::RuntimeException, std::exception) override;
+                const css::beans::PropertyValues& aProperties ) override;
 
     // LinguDispatcher
     virtual void
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index ce78c60e5faa..1280da490ab1 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -49,7 +49,6 @@ using com::sun::star::xml::sax::XDocumentHandler;
 static const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
 
 bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor )
-    throw (RuntimeException, std::exception)
 {
 
     sal_Int32 nLength = aDescriptor.getLength();
@@ -86,25 +85,21 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportLWP(const OUString &rURL
 }
 
 sal_Bool SAL_CALL LotusWordProImportFilter::filter( const Sequence< css::beans::PropertyValue >& aDescriptor )
-    throw (RuntimeException, std::exception)
 {
     return importImpl ( aDescriptor );
 }
 void SAL_CALL LotusWordProImportFilter::cancel(  )
-    throw (RuntimeException, std::exception)
 {
 }
 
 // XImporter
 void SAL_CALL LotusWordProImportFilter::setTargetDocument( const uno::Reference< css::lang::XComponent >& xDoc )
-    throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     mxDoc = xDoc;
 }
 
 // XExtendedFilterDetection
 OUString SAL_CALL LotusWordProImportFilter::detect( css::uno::Sequence< PropertyValue >& Descriptor )
-    throw( css::uno::RuntimeException, std::exception )
 {
 
     OUString sTypeName( "writer_LotusWordPro_Document" );
@@ -150,7 +145,6 @@ OUString SAL_CALL LotusWordProImportFilter::detect( css::uno::Sequence< Property
 
 // XInitialization
 void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& aArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     Sequence < PropertyValue > aAnySeq;
     sal_Int32 nLength = aArguments.getLength();
@@ -171,19 +165,16 @@ void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& aArgu
 
 // XServiceInfo
 OUString SAL_CALL LotusWordProImportFilter::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Writer.LotusWordProImportFilter");
 }
 
 sal_Bool SAL_CALL LotusWordProImportFilter::supportsService(const OUString& rServiceName)
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence<OUString> SAL_CALL LotusWordProImportFilter::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
 }
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index acd446b6d820..59c028dc7360 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -50,8 +50,7 @@ protected:
     OUString msFilterName;
 
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-        throw (css::uno::RuntimeException, std::exception);
+    bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor );
 
 public:
     explicit LotusWordProImportFilter( const css::uno::Reference< css::uno::XComponentContext > &rxContext)
@@ -60,30 +59,22 @@ public:
     }
 
     // XFilter
-        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-        throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancel(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+        virtual void SAL_CALL cancel(  ) override;
 
     // XImporter
-        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     //XExtendedFilterDetection
-    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override;
 
     // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 };
 
diff --git a/oox/inc/services.hxx b/oox/inc/services.hxx
index 619f95550098..ae57c562839e 100644
--- a/oox/inc/services.hxx
+++ b/oox/inc/services.hxx
@@ -28,49 +28,49 @@ namespace oox {
         extern css::uno::Sequence< OUString > SAL_CALL FastTokenHandler_getSupportedServiceNames();
         /// @throws css::uno::Exception
         extern css::uno::Reference< css::uno::XInterface > SAL_CALL FastTokenHandler_createInstance(
-            const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception);
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     }
     namespace core {
         extern OUString SAL_CALL FilterDetect_getImplementationName();
         extern css::uno::Sequence< OUString > SAL_CALL FilterDetect_getSupportedServiceNames();
         /// @throws css::uno::Exception
         extern css::uno::Reference< css::uno::XInterface > SAL_CALL FilterDetect_createInstance(
-            const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception);
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     }
     namespace docprop {
         extern OUString SAL_CALL DocumentPropertiesImport_getImplementationName();
         extern css::uno::Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames();
         /// @throws css::uno::Exception
         extern css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentPropertiesImport_createInstance(
-            const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception);
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     }
     namespace ppt {
         extern OUString SAL_CALL PowerPointImport_getImplementationName();
         extern css::uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames();
         /// @throws css::uno::Exception
         extern css::uno::Reference< css::uno::XInterface > SAL_CALL PowerPointImport_createInstance(
-            const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception);
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     }
     namespace ppt {
         extern OUString SAL_CALL QuickDiagrammingImport_getImplementationName();
         extern css::uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNames();
         /// @throws css::uno::Exception
         extern css::uno::Reference< css::uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance(
-            const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception);
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     }
     namespace ppt {
         extern OUString SAL_CALL QuickDiagrammingLayout_getImplementationName();
         extern css::uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNames();
         /// @throws css::uno::Exception
         extern css::uno::Reference< css::uno::XInterface > SAL_CALL QuickDiagrammingLayout_createInstance(
-            const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception);
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     }
     namespace shape {
         extern OUString SAL_CALL ShapeContextHandler_getImplementationName();
         extern css::uno::Sequence< OUString > SAL_CALL ShapeContextHandler_getSupportedServiceNames();
         /// @throws css::uno::Exception
         extern css::uno::Reference< css::uno::XInterface > SAL_CALL ShapeContextHandler_createInstance(
-            const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::Exception);
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     }
 }
 
diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx
index 5527d9f58907..86aed09d5dd6 100644
--- a/oox/source/core/contexthandler.cxx
+++ b/oox/source/core/contexthandler.cxx
@@ -84,33 +84,33 @@ void ContextHandler::implSetLocator( const Reference< XLocator >& rxLocator )
 
 // com.sun.star.xml.sax.XFastContextHandler interface -------------------------
 
-void ContextHandler::startFastElement( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception )
+void ContextHandler::startFastElement( sal_Int32, const Reference< XFastAttributeList >& )
 {
 }
 
-void ContextHandler::startUnknownElement( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception )
+void ContextHandler::startUnknownElement( const OUString&, const OUString&, const Reference< XFastAttributeList >& )
 {
 }
 
-void ContextHandler::endFastElement( sal_Int32 ) throw( SAXException, RuntimeException, std::exception )
+void ContextHandler::endFastElement( sal_Int32 )
 {
 }
 
-void ContextHandler::endUnknownElement( const OUString&, const OUString& ) throw( SAXException, RuntimeException, std::exception )
+void ContextHandler::endUnknownElement( const OUString&, const OUString& )
 {
 }
 
-Reference< XFastContextHandler > ContextHandler::createFastChildContext( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception )
+Reference< XFastContextHandler > ContextHandler::createFastChildContext( sal_Int32, const Reference< XFastAttributeList >& )
 {
     return nullptr;
 }
 
-Reference< XFastContextHandler > ContextHandler::createUnknownChildContext( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception )
+Reference< XFastContextHandler > ContextHandler::createUnknownChildContext( const OUString&, const OUString&, const Reference< XFastAttributeList >& )
 {
     return nullptr;
 }
 
-void ContextHandler::characters( const OUString& ) throw( SAXException, RuntimeException, std::exception )
+void ContextHandler::characters( const OUString& )
 {
 }
 
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 60d5e1db41f5..4caf0f9364d8 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -188,23 +188,23 @@ ContextHandler2::~ContextHandler2()
 // com.sun.star.xml.sax.XFastContextHandler interface -------------------------
 
 Reference< XFastContextHandler > SAL_CALL ContextHandler2::createFastChildContext(
-        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException, std::exception )
+        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs )
 {
     return implCreateChildContext( nElement, rxAttribs );
 }
 
 void SAL_CALL ContextHandler2::startFastElement(
-        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException, std::exception )
+        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs )
 {
     implStartElement( nElement, rxAttribs );
 }
 
-void SAL_CALL ContextHandler2::characters( const OUString& rChars ) throw( SAXException, RuntimeException, std::exception )
+void SAL_CALL ContextHandler2::characters( const OUString& rChars )
 {
     implCharacters( rChars );
 }
 
-void SAL_CALL ContextHandler2::endFastElement( sal_Int32 nElement ) throw( SAXException, RuntimeException, std::exception )
+void SAL_CALL ContextHandler2::endFastElement( sal_Int32 nElement )
 {
     implEndElement( nElement );
 }
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index ce0a6c0a89f9..4ce9d9f37cf7 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -63,7 +63,7 @@ InputStreamCloseGuard::~InputStreamCloseGuard()
 
 } // namespace
 
-FastParser::FastParser() throw( RuntimeException ) :
+FastParser::FastParser() :
     mrNamespaceMap( StaticNamespaceMap::get() )
 {
     // create a fast parser instance
@@ -80,7 +80,7 @@ FastParser::~FastParser()
 {
 }
 
-void FastParser::registerNamespace( sal_Int32 nNamespaceId ) throw( IllegalArgumentException, RuntimeException )
+void FastParser::registerNamespace( sal_Int32 nNamespaceId )
 {
     if( !mxParser.is() )
         throw RuntimeException();
@@ -100,14 +100,14 @@ void FastParser::registerNamespace( sal_Int32 nNamespaceId ) throw( IllegalArgum
     }
 }
 
-void FastParser::setDocumentHandler( const Reference< XFastDocumentHandler >& rxDocHandler ) throw( RuntimeException )
+void FastParser::setDocumentHandler( const Reference< XFastDocumentHandler >& rxDocHandler )
 {
     if( !mxParser.is() )
         throw RuntimeException();
     mxParser->setFastDocumentHandler( rxDocHandler );
 }
 
-void FastParser::parseStream( const InputSource& rInputSource, bool bCloseStream ) throw( SAXException, IOException, RuntimeException, std::exception )
+void FastParser::parseStream( const InputSource& rInputSource, bool bCloseStream )
 {
     // guard closing the input stream also when exceptions are thrown
     InputStreamCloseGuard aGuard( rInputSource.aInputStream, bCloseStream );
@@ -116,7 +116,7 @@ void FastParser::parseStream( const InputSource& rInputSource, bool bCloseStream
     mxParser->parseStream( rInputSource );
 }
 
-void FastParser::parseStream( const Reference< XInputStream >& rxInStream, const OUString& rStreamName ) throw( SAXException, IOException, RuntimeException, std::exception )
+void FastParser::parseStream( const Reference< XInputStream >& rxInStream, const OUString& rStreamName )
 {
     InputSource aInputSource;
     aInputSource.sSystemId = rStreamName;
@@ -124,7 +124,7 @@ void FastParser::parseStream( const Reference< XInputStream >& rxInStream, const
     parseStream( aInputSource );
 }
 
-void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName ) throw( SAXException, IOException, RuntimeException, std::exception )
+void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName )
 {
     parseStream( rStorage.openInputStream( rStreamName ), rStreamName );
 }
diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx
index 38854405d43f..4c2dc0271807 100644
--- a/oox/source/core/fasttokenhandler.cxx
+++ b/oox/source/core/fasttokenhandler.cxx
@@ -42,7 +42,7 @@ Sequence< OUString > SAL_CALL FastTokenHandler_getSupportedServiceNames()
     return aServiceNames;
 }
 
-Reference< XInterface > SAL_CALL FastTokenHandler_createInstance( const Reference< XComponentContext >& /*rxContext*/ ) throw (Exception)
+Reference< XInterface > SAL_CALL FastTokenHandler_createInstance( const Reference< XComponentContext >& /*rxContext*/ )
 {
     return static_cast< ::cppu::OWeakObject* >( new FastTokenHandler );
 }
@@ -57,27 +57,27 @@ FastTokenHandler::~FastTokenHandler()
 }
 
 // XServiceInfo
-OUString SAL_CALL FastTokenHandler::getImplementationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL FastTokenHandler::getImplementationName()
 {
     return FastTokenHandler_getImplementationName();
 }
 
-sal_Bool SAL_CALL FastTokenHandler::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL FastTokenHandler::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SAL_CALL FastTokenHandler::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL FastTokenHandler::getSupportedServiceNames()
 {
     return FastTokenHandler_getSupportedServiceNames();
 }
 
-Sequence< sal_Int8 > FastTokenHandler::getUTF8Identifier( sal_Int32 nToken ) throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > FastTokenHandler::getUTF8Identifier( sal_Int32 nToken )
 {
     return mrTokenMap.getUtf8TokenName( nToken );
 }
 
-sal_Int32 FastTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& rIdentifier ) throw( RuntimeException, std::exception )
+sal_Int32 FastTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& rIdentifier )
 {
     return mrTokenMap.getTokenFromUtf8( rIdentifier );
 }
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index adaadfc09895..38c25ba312dc 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -152,15 +152,15 @@ struct FilterBaseImpl
     bool mbExportVBA;
 
     /// @throws RuntimeException
-    explicit            FilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException );
+    explicit            FilterBaseImpl( const Reference< XComponentContext >& rxContext );
 
     /// @throws IllegalArgumentException
-    void                setDocumentModel( const Reference< XComponent >& rxComponent ) throw( IllegalArgumentException );
+    void                setDocumentModel( const Reference< XComponent >& rxComponent );
 
     void                initializeFilter();
 };
 
-FilterBaseImpl::FilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
+FilterBaseImpl::FilterBaseImpl( const Reference< XComponentContext >& rxContext ) :
     meDirection( FILTERDIRECTION_UNKNOWN ),
     meVersion( ECMA_DIALECT ),
     mxComponentContext( rxContext, UNO_SET_THROW ),
@@ -168,7 +168,7 @@ FilterBaseImpl::FilterBaseImpl( const Reference< XComponentContext >& rxContext
 {
 }
 
-void FilterBaseImpl::setDocumentModel( const Reference< XComponent >& rxComponent ) throw( IllegalArgumentException )
+void FilterBaseImpl::setDocumentModel( const Reference< XComponent >& rxComponent )
 {
     try
     {
@@ -193,7 +193,7 @@ void FilterBaseImpl::initializeFilter()
     }
 }
 
-FilterBase::FilterBase( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
+FilterBase::FilterBase( const Reference< XComponentContext >& rxContext ) :
     mxImpl( new FilterBaseImpl( rxContext ) )
 {
 }
@@ -398,12 +398,12 @@ bool FilterBase::importBinaryData( StreamDataSequence& orDataSeq, const OUString
 
 // com.sun.star.lang.XServiceInfo interface
 
-sal_Bool SAL_CALL FilterBase::supportsService( const OUString& rServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FilterBase::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SAL_CALL FilterBase::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL FilterBase::getSupportedServiceNames()
 {
     Sequence< OUString > aServiceNames( 2 );
     aServiceNames[ 0 ] = "com.sun.star.document.ImportFilter";
@@ -413,7 +413,7 @@ Sequence< OUString > SAL_CALL FilterBase::getSupportedServiceNames() throw( Runt
 
 // com.sun.star.lang.XInitialization interface
 
-void SAL_CALL FilterBase::initialize( const Sequence< Any >& rArgs ) throw( Exception, RuntimeException, std::exception )
+void SAL_CALL FilterBase::initialize( const Sequence< Any >& rArgs )
 {
     if( rArgs.getLength() >= 2 ) try
     {
@@ -450,7 +450,7 @@ void SAL_CALL FilterBase::initialize( const Sequence< Any >& rArgs ) throw( Exce
 
 // com.sun.star.document.XImporter interface
 
-void SAL_CALL FilterBase::setTargetDocument( const Reference< XComponent >& rxDocument ) throw( IllegalArgumentException, RuntimeException, std::exception )
+void SAL_CALL FilterBase::setTargetDocument( const Reference< XComponent >& rxDocument )
 {
     mxImpl->setDocumentModel( rxDocument );
     mxImpl->meDirection = FILTERDIRECTION_IMPORT;
@@ -458,7 +458,7 @@ void SAL_CALL FilterBase::setTargetDocument( const Reference< XComponent >& rxDo
 
 // com.sun.star.document.XExporter interface
 
-void SAL_CALL FilterBase::setSourceDocument( const Reference< XComponent >& rxDocument ) throw( IllegalArgumentException, RuntimeException, std::exception )
+void SAL_CALL FilterBase::setSourceDocument( const Reference< XComponent >& rxDocument )
 {
     mxImpl->setDocumentModel( rxDocument );
     mxImpl->meDirection = FILTERDIRECTION_EXPORT;
@@ -466,7 +466,7 @@ void SAL_CALL FilterBase::setSourceDocument( const Reference< XComponent >& rxDo
 
 // com.sun.star.document.XFilter interface
 
-sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rMediaDescSeq ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rMediaDescSeq )
 {
     if( !mxImpl->mxModel.is() || !mxImpl->mxModelFactory.is() || (mxImpl->meDirection == FILTERDIRECTION_UNKNOWN) )
         throw RuntimeException();
@@ -501,7 +501,7 @@ sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rMediaDes
     return bRet;
 }
 
-void SAL_CALL FilterBase::cancel() throw( RuntimeException, std::exception )
+void SAL_CALL FilterBase::cancel()
 {
 }
 
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index c333db3fb25a..d397ae3a4b9b 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -64,23 +64,19 @@ FilterDetectDocHandler::~FilterDetectDocHandler()
 }
 
 void SAL_CALL FilterDetectDocHandler::startDocument()
-    throw (SAXException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL FilterDetectDocHandler::endDocument()
-    throw (SAXException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL FilterDetectDocHandler::setDocumentLocator( const Reference<XLocator>& /*xLocator*/ )
-    throw (SAXException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL FilterDetectDocHandler::startFastElement(
         sal_Int32 nElement, const Reference< XFastAttributeList >& rAttribs )
-    throw (SAXException,RuntimeException, std::exception)
 {
     AttributeList aAttribs( rAttribs );
     switch ( nElement )
@@ -110,37 +106,32 @@ void SAL_CALL FilterDetectDocHandler::startFastElement(
 
 void SAL_CALL FilterDetectDocHandler::startUnknownElement(
     const OUString& /*Namespace*/, const OUString& /*Name*/, const Reference<XFastAttributeList>& /*Attribs*/ )
-    throw (SAXException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL FilterDetectDocHandler::endFastElement( sal_Int32 /*nElement*/ )
-    throw (SAXException, RuntimeException, std::exception)
 {
     maContextStack.pop_back();
 }
 
 void SAL_CALL FilterDetectDocHandler::endUnknownElement(
-    const OUString& /*Namespace*/, const OUString& /*Name*/ ) throw (SAXException, RuntimeException, std::exception)
+    const OUString& /*Namespace*/, const OUString& /*Name*/ )
 {
 }
 
 Reference<XFastContextHandler> SAL_CALL FilterDetectDocHandler::createFastChildContext(
     sal_Int32 /*Element*/, const Reference<XFastAttributeList>& /*Attribs*/ )
-    throw (SAXException, RuntimeException, std::exception)
 {
     return this;
 }
 
 Reference<XFastContextHandler> SAL_CALL FilterDetectDocHandler::createUnknownChildContext(
     const OUString& /*Namespace*/, const OUString& /*Name*/, const Reference<XFastAttributeList>& /*Attribs*/)
-    throw (SAXException, RuntimeException, std::exception)
 {
     return this;
 }
 
 void SAL_CALL FilterDetectDocHandler::characters( const OUString& /*aChars*/ )
-    throw (SAXException, RuntimeException, std::exception)
 {
 }
 
@@ -240,12 +231,12 @@ OUString FilterDetect_getImplementationName()
 }
 
 /* Helper for registry */
-Reference< XInterface > SAL_CALL FilterDetect_createInstance( const Reference< XComponentContext >& rxContext ) throw( Exception )
+Reference< XInterface > SAL_CALL FilterDetect_createInstance( const Reference< XComponentContext >& rxContext )
 {
     return static_cast< ::cppu::OWeakObject* >( new FilterDetect( rxContext ) );
 }
 
-FilterDetect::FilterDetect( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
+FilterDetect::FilterDetect( const Reference< XComponentContext >& rxContext ) :
     mxContext( rxContext, UNO_SET_THROW )
 {
 }
@@ -366,24 +357,24 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript
 
 // com.sun.star.lang.XServiceInfo interface -----------------------------------
 
-OUString SAL_CALL FilterDetect::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL FilterDetect::getImplementationName()
 {
     return FilterDetect_getImplementationName();
 }
 
-sal_Bool SAL_CALL FilterDetect::supportsService( const OUString& rServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FilterDetect::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames()
 {
     return FilterDetect_getSupportedServiceNames();
 }
 
 // com.sun.star.document.XExtendedFilterDetection interface -------------------
 
-OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq ) throw( RuntimeException, std::exception )
+OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq )
 {
     OUString aFilterName;
     MediaDescriptor aMediaDescriptor( rMediaDescSeq );
diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx
index 97460260b328..564306e647fb 100644
--- a/oox/source/core/fragmenthandler.cxx
+++ b/oox/source/core/fragmenthandler.cxx
@@ -51,48 +51,48 @@ FragmentHandler::~FragmentHandler()
 
 // com.sun.star.xml.sax.XFastDocumentHandler interface ------------------------
 
-void FragmentHandler::startDocument() throw( SAXException, RuntimeException, std::exception )
+void FragmentHandler::startDocument()
 {
 }
 
-void FragmentHandler::endDocument() throw( SAXException, RuntimeException, std::exception )
+void FragmentHandler::endDocument()
 {
 }
 
-void FragmentHandler::setDocumentLocator( const Reference< XLocator >& rxLocator ) throw( SAXException, RuntimeException, std::exception )
+void FragmentHandler::setDocumentLocator( const Reference< XLocator >& rxLocator )
 {
     implSetLocator( rxLocator );
 }
 
 // com.sun.star.xml.sax.XFastContextHandler interface -------------------------
 
-void FragmentHandler::startFastElement( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception )
+void FragmentHandler::startFastElement( sal_Int32, const Reference< XFastAttributeList >& )
 {
 }
 
-void FragmentHandler::startUnknownElement( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception )
+void FragmentHandler::startUnknownElement( const OUString&, const OUString&, const Reference< XFastAttributeList >& )
 {
 }
 
-void FragmentHandler::endFastElement( sal_Int32 ) throw( SAXException, RuntimeException, std::exception )
+void FragmentHandler::endFastElement( sal_Int32 )
 {
 }
 
-void FragmentHandler::endUnknownElement( const OUString&, const OUString& ) throw( SAXException, RuntimeException, std::exception )
+void FragmentHandler::endUnknownElement( const OUString&, const OUString& )
 {
 }
 
-Reference< XFastContextHandler > FragmentHandler::createFastChildContext( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception )
+Reference< XFastContextHandler > FragmentHandler::createFastChildContext( sal_Int32, const Reference< XFastAttributeList >& )
 {
     return nullptr;
 }
 
-Reference< XFastContextHandler > FragmentHandler::createUnknownChildContext( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception )
+Reference< XFastContextHandler > FragmentHandler::createUnknownChildContext( const OUString&, const OUString&, const Reference< XFastAttributeList >& )
 {
     return nullptr;
 }
 
-void FragmentHandler::characters( const OUString& ) throw( SAXException, RuntimeException, std::exception )
+void FragmentHandler::characters( const OUString& )
 {
 }
 
diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx
index ba3f880cde60..fe9b827a6aae 100644
--- a/oox/source/core/fragmenthandler2.cxx
+++ b/oox/source/core/fragmenthandler2.cxx
@@ -43,12 +43,12 @@ FragmentHandler2::~FragmentHandler2()
 
 // com.sun.star.xml.sax.XFastDocumentHandler interface --------------------
 
-void SAL_CALL FragmentHandler2::startDocument() throw( SAXException, RuntimeException, std::exception )
+void SAL_CALL FragmentHandler2::startDocument()
 {
     initializeImport();
 }
 
-void SAL_CALL FragmentHandler2::endDocument() throw( SAXException, RuntimeException, std::exception )
+void SAL_CALL FragmentHandler2::endDocument()
 {
     finalizeImport();
 }
@@ -109,7 +109,7 @@ bool FragmentHandler2::prepareMceContext( sal_Int32 nElement, const AttributeLis
 // com.sun.star.xml.sax.XFastContextHandler interface -------------------------
 
 Reference< XFastContextHandler > SAL_CALL FragmentHandler2::createFastChildContext(
-        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException, std::exception )
+        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs )
 {
     if( getNamespace( nElement ) == NMSP_mce ) // TODO for checking 'Ignorable'
     {
@@ -121,17 +121,17 @@ Reference< XFastContextHandler > SAL_CALL FragmentHandler2::createFastChildConte
 }
 
 void SAL_CALL FragmentHandler2::startFastElement(
-        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException, std::exception )
+        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs )
 {
     implStartElement( nElement, rxAttribs );
 }
 
-void SAL_CALL FragmentHandler2::characters( const OUString& rChars ) throw( SAXException, RuntimeException, std::exception )
+void SAL_CALL FragmentHandler2::characters( const OUString& rChars )
 {
     implCharacters( rChars );
 }
 
-void SAL_CALL FragmentHandler2::endFastElement( sal_Int32 nElement ) throw( SAXException, RuntimeException, std::exception )
+void SAL_CALL FragmentHandler2::endFastElement( sal_Int32 nElement )
 {
     /* If MCE */
     switch( nElement )
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 988d8cd57f8b..3165626ab3b4 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -43,14 +43,14 @@ public:
 
     void                    dispose();
     /// @throws css::uno::RuntimeException
-    void                    checkDispose() throw( RuntimeException );
+    void                    checkDispose();
 
     // com.sun.star.sax.XLocator interface
 
-    virtual sal_Int32 SAL_CALL getColumnNumber() throw( RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL getLineNumber() throw( RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getPublicId() throw( RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getSystemId() throw( RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getColumnNumber() override;
+    virtual sal_Int32 SAL_CALL getLineNumber() override;
+    virtual OUString SAL_CALL getPublicId() override;
+    virtual OUString SAL_CALL getSystemId() override;
 
 private:
     RecordParser*           mpParser;
@@ -61,29 +61,29 @@ void Locator::dispose()
     mpParser = nullptr;
 }
 
-void Locator::checkDispose() throw( RuntimeException )
+void Locator::checkDispose()
 {
     if( !mpParser )
         throw DisposedException();
 }
 
-sal_Int32 SAL_CALL Locator::getColumnNumber() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL Locator::getColumnNumber()
 {
     return -1;
 }
 
-sal_Int32 SAL_CALL Locator::getLineNumber() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL Locator::getLineNumber()
 {
     return -1;
 }
 
-OUString SAL_CALL Locator::getPublicId() throw( RuntimeException, std::exception )
+OUString SAL_CALL Locator::getPublicId()
 {
     checkDispose();
     return mpParser->getInputSource().maPublicId;
 }
 
-OUString SAL_CALL Locator::getSystemId() throw( RuntimeException, std::exception )
+OUString SAL_CALL Locator::getSystemId()
 {
     checkDispose();
     return mpParser->getInputSource().maSystemId;
@@ -230,7 +230,7 @@ void RecordParser::setFragmentHandler( const ::rtl::Reference< FragmentHandler >
     }
 }
 
-void RecordParser::parseStream( const RecordInputSource& rInputSource ) throw( SAXException, IOException, RuntimeException )
+void RecordParser::parseStream( const RecordInputSource& rInputSource )
 {
     maSource = rInputSource;
 
diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx
index 65c9d46ed999..85d6ae96e304 100644
--- a/oox/source/core/relationshandler.cxx
+++ b/oox/source/core/relationshandler.cxx
@@ -58,7 +58,7 @@ RelationsFragment::RelationsFragment( XmlFilterBase& rFilter, RelationsRef xRela
 }
 
 Reference< XFastContextHandler > RelationsFragment::createFastChildContext(
-        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw (SAXException, RuntimeException, std::exception)
+        sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs )
 {
     Reference< XFastContextHandler > xRet;
     AttributeList aAttribs( rxAttribs );
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 7d1651c56780..5c5d5d80d083 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -182,10 +182,10 @@ struct XmlFilterBaseImpl
     const NamespaceMap&             mrNamespaceMap;
 
     /// @throws RuntimeException
-    explicit            XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException );
+    explicit            XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext );
 };
 
-XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
+XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) :
     mxContext(rxContext),
     maBinSuffix( ".bin" ),
     mrNamespaceMap(StaticNamespaceMap::get())
@@ -194,7 +194,7 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxCo
     registerNamespaces(maFastParser);
 }
 
-XmlFilterBase::XmlFilterBase( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
+XmlFilterBase::XmlFilterBase( const Reference< XComponentContext >& rxContext ) :
     FilterBase( rxContext ),
     mxImpl( new XmlFilterBaseImpl( rxContext ) ),
     mnRelId( 1 ),
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index 3fcbc571d3f1..ed1111e8a549 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -53,12 +53,12 @@ vector<sal_uInt8> convertToVector(Sequence<sal_Int8>& input)
 class AgileTokenHandler : public cppu::WeakImplHelper< XFastTokenHandler >
 {
 public:
-    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) override
     {
         return FastToken::DONTKNOW;
     }
 
-    virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) override
+    virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) override
     {
         return Sequence<sal_Int8>();
     }
@@ -73,21 +73,16 @@ public:
         mInfo(rInfo)
     {}
 
-    void SAL_CALL startDocument()
-        throw (RuntimeException, SAXException, std::exception) override
+    void SAL_CALL startDocument() override
     {}
-    void SAL_CALL endDocument()
-        throw (RuntimeException, SAXException, std::exception) override
+    void SAL_CALL endDocument() override
     {}
-    void SAL_CALL setDocumentLocator( const Reference< XLocator >& /*xLocator*/ )
-        throw (RuntimeException, SAXException, std::exception) override
+    void SAL_CALL setDocumentLocator( const Reference< XLocator >& /*xLocator*/ ) override
     {}
-    void SAL_CALL startFastElement( sal_Int32 /*Element*/, const Reference< XFastAttributeList >& /*Attribs*/ )
-        throw (RuntimeException, SAXException, std::exception) override
+    void SAL_CALL startFastElement( sal_Int32 /*Element*/, const Reference< XFastAttributeList >& /*Attribs*/ ) override
     {}
 
-    void SAL_CALL startUnknownElement( const OUString& /*aNamespace*/, const OUString& aName, const Reference< XFastAttributeList >& aAttributeList )
-        throw (RuntimeException, SAXException, std::exception) override
+    void SAL_CALL startUnknownElement( const OUString& /*aNamespace*/, const OUString& aName, const Reference< XFastAttributeList >& aAttributeList ) override
     {
         if(aName == "keyData")
         {
@@ -168,27 +163,22 @@ public:
         }
     }
 
-    void SAL_CALL endFastElement( sal_Int32 /*aElement*/ )
-        throw (RuntimeException, SAXException, std::exception) override
+    void SAL_CALL endFastElement( sal_Int32 /*aElement*/ ) override
     {}
-    void SAL_CALL endUnknownElement( const OUString& /*aNamespace*/, const OUString& /*aName*/ )
-        throw (RuntimeException, SAXException, std::exception) override
+    void SAL_CALL endUnknownElement( const OUString& /*aNamespace*/, const OUString& /*aName*/ ) override
     {}
 
-    Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 /*aElement*/, const Reference< XFastAttributeList >& /*aAttribs*/ )
-        throw (RuntimeException, SAXException, std::exception) override
+    Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 /*aElement*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) override
     {
         return nullptr;
     }
 
-    Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& /*aNamespace*/, const OUString& /*aName*/, const Reference< XFastAttributeList >& /*aAttribs*/ )
-        throw (RuntimeException, SAXException, std::exception) override
+    Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& /*aNamespace*/, const OUString& /*aName*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) override
     {
         return this;
     }
 
-    void SAL_CALL characters( const OUString& /*aChars*/ )
-        throw (RuntimeException, SAXException, std::exception) override
+    void SAL_CALL characters( const OUString& /*aChars*/ ) override
     {}
 };
 
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index d7a1e31c1ea8..2c28d8dcbc6f 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -266,25 +266,21 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
 // com.sun.star.xml.sax.XFastDocumentHandler
 
 void SAL_CALL OOXMLDocPropHandler::startDocument()
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OOXMLDocPropHandler::endDocument()
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     InitNew();
 }
 
 void SAL_CALL OOXMLDocPropHandler::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& )
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 // com.sun.star.xml.sax.XFastContextHandler
 
 void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& xAttribs )
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if ( !m_nInBlock && !m_nState )
     {
@@ -325,7 +321,6 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const
 }
 
 void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespace, const OUString& aName, const uno::Reference< xml::sax::XFastAttributeList >& )
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("oox", "Unknown element " << aNamespace << ":" << aName);
 
@@ -336,7 +331,6 @@ void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespa
 }
 
 void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 )
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if ( m_nInBlock )
     {
@@ -377,27 +371,23 @@ void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 )
 }
 
 void SAL_CALL OOXMLDocPropHandler::endUnknownElement( const OUString&, const OUString& )
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if ( m_nInBlock )
         m_nInBlock--;
 }
 
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createFastChildContext( ::sal_Int32, const uno::Reference< xml::sax::XFastAttributeList >& )
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     // Should the arguments be parsed?
     return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) );
 }
 
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createUnknownChildContext( const OUString&, const OUString&, const uno::Reference< xml::sax::XFastAttributeList >& )
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) );
 }
 
 void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars )
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     try
     {
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index 4bd4577a1503..0cf7dcf0a501 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -66,19 +66,19 @@ public:
 
     // com.sun.star.xml.sax.XFastDocumentHandler
 
-    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& rxLocator ) override;
 
     // com.sun.star.xml.sax.XFastContextHandler
 
-    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) override;
+    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
 
 };
 
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index 2d78d30517e3..638c7a0aa978 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -55,7 +55,7 @@ Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames(
     return aServices;
 }
 
-Reference< XInterface > SAL_CALL DocumentPropertiesImport_createInstance( const Reference< XComponentContext >& rxContext ) throw(Exception)
+Reference< XInterface > SAL_CALL DocumentPropertiesImport_createInstance( const Reference< XComponentContext >& rxContext )
 {
     return static_cast< ::cppu::OWeakObject* >( new DocumentPropertiesImport( rxContext ) );
 }
@@ -64,7 +64,7 @@ namespace {
 
 /// @throws RuntimeException
 /// @throws css::io::IOException
-Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxStorage, const OUString& rStreamType ) throw (RuntimeException, css::io::IOException)
+Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxStorage, const OUString& rStreamType )
 {
     Reference< XRelationshipAccess > xRelation( rxStorage, UNO_QUERY_THROW );
     Reference< XHierarchicalStorageAccess > xHierarchy( rxStorage, UNO_QUERY_THROW );
@@ -111,17 +111,17 @@ DocumentPropertiesImport::DocumentPropertiesImport( const Reference< XComponentC
 }
 
 // XServiceInfo
-OUString SAL_CALL DocumentPropertiesImport::getImplementationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL DocumentPropertiesImport::getImplementationName()
 {
     return DocumentPropertiesImport_getImplementationName();
 }
 
-sal_Bool SAL_CALL DocumentPropertiesImport::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL DocumentPropertiesImport::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SAL_CALL DocumentPropertiesImport::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL DocumentPropertiesImport::getSupportedServiceNames()
 {
     return DocumentPropertiesImport_getSupportedServiceNames();
 }
@@ -129,7 +129,6 @@ Sequence< OUString > SAL_CALL DocumentPropertiesImport::getSupportedServiceNames
 // XOOXMLDocumentPropertiesImporter
 void SAL_CALL DocumentPropertiesImport::importProperties(
         const Reference< XStorage >& rxSource, const Reference< XDocumentProperties >& rxDocumentProperties )
-        throw (RuntimeException, IllegalArgumentException, SAXException, Exception, std::exception)
 {
     if( !mxContext.is() )
         throw RuntimeException();
diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx
index e60df130c692..61a58eb9c7d9 100644
--- a/oox/source/docprop/ooxmldocpropimport.hxx
+++ b/oox/source/docprop/ooxmldocpropimport.hxx
@@ -39,15 +39,14 @@ public:
                             const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XOOXMLDocumentPropertiesImporter
     virtual void SAL_CALL importProperties(
                             const css::uno::Reference< css::embed::XStorage >& rxSource,
-                            const css::uno::Reference< css::document::XDocumentProperties >& rxDocumentProperties )
-                        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::xml::sax::SAXException, css::uno::Exception, std::exception) override;
+                            const css::uno::Reference< css::document::XDocumentProperties >& rxDocumentProperties ) override;
 
 private:
     css::uno::Reference< css::uno::XComponentContext > mxContext;
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
index 0ab6a6d01a9a..8094929fa571 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
@@ -47,7 +47,6 @@ DiagramDataFragmentHandler::~DiagramDataFragmentHandler( ) throw ()
 }
 
 void SAL_CALL DiagramDataFragmentHandler::endDocument()
-    throw (SAXException, RuntimeException, std::exception)
 {
 
 }
@@ -82,7 +81,6 @@ DiagramLayoutFragmentHandler::~DiagramLayoutFragmentHandler( ) throw ()
 }
 
 void SAL_CALL DiagramLayoutFragmentHandler::endDocument()
-    throw (SAXException, RuntimeException, std::exception)
 {
 
 }
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index 5e851f6424c6..5b34459b005a 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -31,7 +31,7 @@ public:
     DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) throw();
     virtual ~DiagramDataFragmentHandler() throw() override;
 
-    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
 private:
@@ -45,7 +45,7 @@ public:
     DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) throw();
     virtual ~DiagramLayoutFragmentHandler() throw() override;
 
-    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
 private:
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 7aa33617e371..65913bd426ba 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -158,8 +158,7 @@ public:
         {
         }
 
-    virtual ContextHandlerRef onCreateContext( ::sal_Int32 aElement, const AttributeList& rAttribs )
-        throw (SAXException, RuntimeException) override
+    virtual ContextHandlerRef onCreateContext( ::sal_Int32 aElement, const AttributeList& rAttribs ) override
         {
             sal_Int32 nIdx =  LayoutNodeContext::tagToVarIdx( getBaseToken( aElement ) );
             if( nIdx != -1 )
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index bab61b0d9199..4c1d9d842d2e 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -42,9 +42,9 @@ public:
 
 protected:
     // ____ XPropertySetInfo ____
-    virtual Sequence< Property > SAL_CALL getProperties()                throw (RuntimeException, std::exception) override;
-    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )  throw (RuntimeException, std::exception) override;
+    virtual Sequence< Property > SAL_CALL getProperties() override;
+    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
 private:
     OUString m_aColorPropName;
@@ -59,14 +59,12 @@ lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo( bool bFillColor ) :
 {}
 
 Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties()
-    throw (RuntimeException, std::exception)
 {
 
     return Sequence< Property >( & m_aColorProp, 1 );
 }
 
 Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& aName )
-    throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     if( aName.equals( m_aColorPropName ))
         return m_aColorProp;
@@ -74,7 +72,6 @@ Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& a
 }
 
 sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& Name )
-    throw (RuntimeException, std::exception)
 {
     return Name.equals( m_aColorPropName );
 }
@@ -100,7 +97,6 @@ ColorPropertySet::~ColorPropertySet()
 // ____ XPropertySet ____
 
 Reference< XPropertySetInfo > SAL_CALL ColorPropertySet::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xInfo.is())
         m_xInfo.set( new lcl_ColorPropertySetInfo( m_bIsFillColor ));
@@ -109,11 +105,6 @@ Reference< XPropertySetInfo > SAL_CALL ColorPropertySet::getPropertySetInfo()
 }
 
 void SAL_CALL ColorPropertySet::setPropertyValue( const OUString& rPropertyName, const uno::Any& aValue )
-    throw (UnknownPropertyException,
-           PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if (rPropertyName != m_aColorPropName)
     {
@@ -126,9 +117,6 @@ void SAL_CALL ColorPropertySet::setPropertyValue( const OUString& rPropertyName,
 }
 
 uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& aPropertyName )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "FillStyle" && m_bIsFillColor )
     {
@@ -142,36 +130,24 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& aPropertyN
 }
 
 void SAL_CALL ColorPropertySet::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not Implemented" );
     return;
 }
 
 void SAL_CALL ColorPropertySet::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* aListener */ )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not Implemented" );
     return;
 }
 
 void SAL_CALL ColorPropertySet::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not Implemented" );
     return;
 }
 
 void SAL_CALL ColorPropertySet::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not Implemented" );
     return;
@@ -180,32 +156,23 @@ void SAL_CALL ColorPropertySet::removeVetoableChangeListener( const OUString& /*
 // ____ XPropertyState ____
 
 PropertyState SAL_CALL ColorPropertySet::getPropertyState( const OUString& /* PropertyName */ )
-    throw (UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     return PropertyState_DIRECT_VALUE;
 }
 
 Sequence< PropertyState > SAL_CALL ColorPropertySet::getPropertyStates( const Sequence< OUString >& /* aPropertyName */ )
-    throw (UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     PropertyState aState = PropertyState_DIRECT_VALUE;
     return Sequence< PropertyState >( & aState, 1 );
 }
 
 void SAL_CALL ColorPropertySet::setPropertyToDefault( const OUString& PropertyName )
-    throw (UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     if( PropertyName.equals( m_aColorPropName ))
         m_nColor = m_nDefaultColor;
 }
 
 uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropertyName )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName.equals( m_aColorPropName ))
         return uno::makeAny( m_nDefaultColor );
diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx
index 88fc20d3c286..39bc41f22b6f 100644
--- a/oox/source/export/ColorPropertySet.hxx
+++ b/oox/source/export/ColorPropertySet.hxx
@@ -43,64 +43,34 @@ public:
 
 protected:
     // ____ XPropertySet ____
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
         const OUString& aPropertyName,
-        const css::uno::Any& aValue )
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-        const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& PropertyName ) override;
     virtual void SAL_CALL addPropertyChangeListener(
         const OUString& aPropertyName,
-        const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL removePropertyChangeListener(
         const OUString& aPropertyName,
-        const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL addVetoableChangeListener(
         const OUString& PropertyName,
-        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL removeVetoableChangeListener(
         const OUString& PropertyName,
-        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // ____ XPropertyState ____
     virtual css::beans::PropertyState SAL_CALL getPropertyState(
-        const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& PropertyName ) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(
-        const css::uno::Sequence< OUString >& aPropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< OUString >& aPropertyName ) override;
     virtual void SAL_CALL setPropertyToDefault(
-        const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& PropertyName ) override;
     virtual css::uno::Any SAL_CALL getPropertyDefault(
-        const OUString& aPropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& aPropertyName ) override;
 
 private:
     css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 4ff14e5f98f3..b6cde43ad93c 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -104,18 +104,18 @@ public:
     explicit            GenericPropertySet( const PropertyMap& rPropMap );
 
     // XPropertySet
-    virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) override;
+    virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) override;
 
     // XPropertySetInfo
-    virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception) override;
-    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception) override;
+    virtual Sequence< Property > SAL_CALL getProperties() override;
+    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
 private:
     osl::Mutex mMutex;
@@ -127,18 +127,18 @@ GenericPropertySet::GenericPropertySet( const PropertyMap& rPropMap )
     rPropMap.fillPropertyNameMap(maPropMap);
 }
 
-Reference< XPropertySetInfo > SAL_CALL GenericPropertySet::getPropertySetInfo() throw (RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL GenericPropertySet::getPropertySetInfo()
 {
     return this;
 }
 
-void SAL_CALL GenericPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL GenericPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
 {
     ::osl::MutexGuard aGuard( mMutex );
     maPropMap[ rPropertyName ] = rValue;
 }
 
-Any SAL_CALL GenericPropertySet::getPropertyValue( const OUString& rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL GenericPropertySet::getPropertyValue( const OUString& rPropertyName )
 {
     PropertyNameMap::iterator aIt = maPropMap.find( rPropertyName );
     if( aIt == maPropMap.end() )
@@ -147,13 +147,13 @@ Any SAL_CALL GenericPropertySet::getPropertyValue( const OUString& rPropertyName
 }
 
 // listeners are not supported by this implementation
-void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {}
-void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {}
-void SAL_CALL GenericPropertySet::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {}
-void SAL_CALL GenericPropertySet::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {}
+void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) {}
+void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) {}
+void SAL_CALL GenericPropertySet::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) {}
+void SAL_CALL GenericPropertySet::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) {}
 
 // XPropertySetInfo
-Sequence< Property > SAL_CALL GenericPropertySet::getProperties() throw (RuntimeException, std::exception)
+Sequence< Property > SAL_CALL GenericPropertySet::getProperties()
 {
     Sequence< Property > aSeq( static_cast< sal_Int32 >( maPropMap.size() ) );
     Property* pProperty = aSeq.getArray();
@@ -167,7 +167,7 @@ Sequence< Property > SAL_CALL GenericPropertySet::getProperties() throw (Runtime
     return aSeq;
 }
 
-Property SAL_CALL GenericPropertySet::getPropertyByName( const OUString& rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+Property SAL_CALL GenericPropertySet::getPropertyByName( const OUString& rPropertyName )
 {
     PropertyNameMap::iterator aIt = maPropMap.find( rPropertyName );
     if( aIt == maPropMap.end() )
@@ -180,7 +180,7 @@ Property SAL_CALL GenericPropertySet::getPropertyByName( const OUString& rProper
     return aProperty;
 }
 
-sal_Bool SAL_CALL GenericPropertySet::hasPropertyByName( const OUString& rPropertyName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL GenericPropertySet::hasPropertyByName( const OUString& rPropertyName )
 {
     return maPropMap.find( rPropertyName ) != maPropMap.end();
 }
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 70b657f59fdd..6159edee7a8b 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -43,20 +43,15 @@ class UnoBinaryInputStream : public UnoBinaryInputStream_BASE
 public:
     explicit            UnoBinaryInputStream( BinaryInputStream& rInStrm );
 
-    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
-                        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
-                        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-                        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available()
-                        throw (NotConnectedException, IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput()
-                        throw (NotConnectedException, IOException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 
 private:
     /// @throws NotConnectedException
-    void                ensureConnected() const throw (NotConnectedException);
+    void                ensureConnected() const;
 
 private:
     BinaryInputStream*  mpInStrm;
@@ -68,40 +63,37 @@ UnoBinaryInputStream::UnoBinaryInputStream( BinaryInputStream& rInStrm ) :
 }
 
 sal_Int32 SAL_CALL UnoBinaryInputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     ensureConnected();
     return mpInStrm->readData( rData, nBytesToRead );
 }
 
 sal_Int32 SAL_CALL UnoBinaryInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     ensureConnected();
     return mpInStrm->readData( rData, nMaxBytesToRead );
 }
 
 void SAL_CALL UnoBinaryInputStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     ensureConnected();
     mpInStrm->skip( nBytesToSkip );
 }
 
-sal_Int32 SAL_CALL UnoBinaryInputStream::available() throw (NotConnectedException, IOException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL UnoBinaryInputStream::available()
 {
     ensureConnected();
     throw RuntimeException( "Functionality not supported", Reference< XInputStream >() );
 }
 
-void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception)
+void SAL_CALL UnoBinaryInputStream::closeInput()
 {
     ensureConnected();
     mpInStrm->close();
     mpInStrm = nullptr;
 }
 
-void UnoBinaryInputStream::ensureConnected() const throw (NotConnectedException)
+void UnoBinaryInputStream::ensureConnected() const
 {
     if( !mpInStrm )
         throw NotConnectedException( "Stream closed" );
diff --git a/oox/source/mathml/import.cxx b/oox/source/mathml/import.cxx
index 172298600a1a..825ad9bb9bee 100644
--- a/oox/source/mathml/import.cxx
+++ b/oox/source/mathml/import.cxx
@@ -40,10 +40,10 @@ public:
 
     // com.sun.star.xml.sax.XFastContextHandler interface ---------------------
 
-    virtual void SAL_CALL startFastElement(::sal_Int32 Element, const uno::Reference<xml::sax::XFastAttributeList>& xAttribs) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endFastElement(::sal_Int32 Element) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual uno::Reference< xml::sax::XFastContextHandler> SAL_CALL createFastChildContext(::sal_Int32 Element, const uno::Reference<xml::sax::XFastAttributeList >& xAttribs) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters(const OUString& rChars) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startFastElement(::sal_Int32 Element, const uno::Reference<xml::sax::XFastAttributeList>& xAttribs) override;
+    virtual void SAL_CALL endFastElement(::sal_Int32 Element) override;
+    virtual uno::Reference< xml::sax::XFastContextHandler> SAL_CALL createFastChildContext(::sal_Int32 Element, const uno::Reference<xml::sax::XFastAttributeList >& xAttribs) override;
+    virtual void SAL_CALL characters(const OUString& rChars) override;
 
 };
 
@@ -58,7 +58,6 @@ LazyMathBufferingContext::LazyMathBufferingContext(
 void SAL_CALL LazyMathBufferingContext::startFastElement(
         sal_Int32 const nElement,
         uno::Reference<xml::sax::XFastAttributeList> const& xAttrs)
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if (0 < m_Counter) // ignore a14:m
     {   // ignore outer oMathPara
@@ -71,7 +70,6 @@ void SAL_CALL LazyMathBufferingContext::startFastElement(
 }
 
 void SAL_CALL LazyMathBufferingContext::endFastElement(sal_Int32 const nElement)
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     --m_Counter;
     if (0 < m_Counter) // ignore a14:m
@@ -86,13 +84,11 @@ void SAL_CALL LazyMathBufferingContext::endFastElement(sal_Int32 const nElement)
 uno::Reference<xml::sax::XFastContextHandler> SAL_CALL
 LazyMathBufferingContext::createFastChildContext(sal_Int32 const,
         uno::Reference<xml::sax::XFastAttributeList> const&)
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     return this;
 }
 
 void SAL_CALL LazyMathBufferingContext::characters(OUString const& rChars)
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if (0 < m_Counter) // ignore a14:m
     {
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 4e20a9dda1c7..7d282bfdf6f1 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -59,19 +59,19 @@ public:
                             const Reference< XNameContainer >& rxStorage,
                             const OUString& rElementName );
 
-    virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) override;
-    virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException, std::exception ) override;
-    virtual sal_Int64 SAL_CALL getLength() throw( IOException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL seek( sal_Int64 nPos ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
-    virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 
 private:
     /// @throws IOException
-    void                ensureSeekable() const throw( IOException );
+    void                ensureSeekable() const;
     /// @throws NotConnectedException
-    void                ensureConnected() const throw( NotConnectedException );
+    void                ensureConnected() const;
 
 private:
     Reference< XNameContainer > mxStorage;
@@ -97,37 +97,37 @@ OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContex
     }
 }
 
-void SAL_CALL OleOutputStream::seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception )
+void SAL_CALL OleOutputStream::seek( sal_Int64 nPos )
 {
     ensureSeekable();
     mxSeekable->seek( nPos );
 }
 
-sal_Int64 SAL_CALL OleOutputStream::getPosition() throw( IOException, RuntimeException, std::exception )
+sal_Int64 SAL_CALL OleOutputStream::getPosition()
 {
     ensureSeekable();
     return mxSeekable->getPosition();
 }
 
-sal_Int64 SAL_CALL OleOutputStream::getLength() throw( IOException, RuntimeException, std::exception )
+sal_Int64 SAL_CALL OleOutputStream::getLength()
 {
     ensureSeekable();
     return mxSeekable->getLength();
 }
 
-void SAL_CALL OleOutputStream::writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception )
+void SAL_CALL OleOutputStream::writeBytes( const Sequence< sal_Int8 >& rData )
 {
     ensureConnected();
     mxOutStrm->writeBytes( rData );
 }
 
-void SAL_CALL OleOutputStream::flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception )
+void SAL_CALL OleOutputStream::flush()
 {
     ensureConnected();
     mxOutStrm->flush();
 }
 
-void SAL_CALL OleOutputStream::closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception )
+void SAL_CALL OleOutputStream::closeOutput()
 {
     ensureConnected();
     ensureSeekable();
@@ -145,13 +145,13 @@ void SAL_CALL OleOutputStream::closeOutput() throw( NotConnectedException, Buffe
         throw IOException();
 }
 
-void OleOutputStream::ensureSeekable() const throw( IOException )
+void OleOutputStream::ensureSeekable() const
 {
     if( !mxSeekable.is() )
         throw IOException();
 }
 
-void OleOutputStream::ensureConnected() const throw( NotConnectedException )
+void OleOutputStream::ensureConnected() const
 {
     if( !mxOutStrm.is() )
         throw NotConnectedException();
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 57271291eb40..8ce77d115e38 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -48,7 +48,7 @@ uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNam
     return aSeq;
 }
 
-uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance( const Reference< XComponentContext >& rxContext ) throw( Exception )
+uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance( const Reference< XComponentContext >& rxContext )
 {
     return static_cast<cppu::OWeakObject*>(new QuickDiagrammingImport( rxContext ));
 }
@@ -57,7 +57,7 @@ QuickDiagrammingImport::QuickDiagrammingImport( const css::uno::Reference< css::
     : XmlFilterBase( rxContext )
 {}
 
-bool QuickDiagrammingImport::importDocument() throw (css::uno::RuntimeException, std::exception)
+bool QuickDiagrammingImport::importDocument()
 {
     /*  to activate the PPTX dumper, define the environment variable
         OOO_PPTXDUMPER and insert the full path to the file
@@ -113,7 +113,7 @@ oox::drawingml::chart::ChartConverter* QuickDiagrammingImport::getChartConverter
     return nullptr;
 }
 
-OUString QuickDiagrammingImport::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString QuickDiagrammingImport::getImplementationName()
 {
     return QuickDiagrammingImport_getImplementationName();
 }
diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx
index 9e35c8c8c335..6fd9c99d9790 100644
--- a/oox/source/ppt/dgmlayout.cxx
+++ b/oox/source/ppt/dgmlayout.cxx
@@ -55,7 +55,7 @@ uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNam
     return aSeq;
 }
 
-uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingLayout_createInstance( const Reference< XComponentContext >& rxContext ) throw( Exception )
+uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingLayout_createInstance( const Reference< XComponentContext >& rxContext )
 {
     return static_cast<cppu::OWeakObject*>(new QuickDiagrammingLayout( rxContext ));
 }
@@ -65,7 +65,7 @@ QuickDiagrammingLayout::QuickDiagrammingLayout( const Reference< XComponentConte
     mpThemePtr(new drawingml::Theme())
 {}
 
-bool QuickDiagrammingLayout::importDocument() throw (css::uno::RuntimeException)
+bool QuickDiagrammingLayout::importDocument()
 {
     Reference<drawing::XShape>  xParentShape(getParentShape(),
                                              UNO_QUERY_THROW);
@@ -165,7 +165,7 @@ const oox::drawingml::table::TableStyleListPtr QuickDiagrammingLayout::getTableS
     return nullptr;
 }
 
-OUString QuickDiagrammingLayout::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString QuickDiagrammingLayout::getImplementationName()
 {
     return QuickDiagrammingLayout_getImplementationName();
 }
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 140d3b665534..414a149adcdb 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -56,7 +56,7 @@ uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames()
     return aSeq;
 }
 
-uno::Reference< uno::XInterface > SAL_CALL PowerPointImport_createInstance( const Reference< XComponentContext >& rxContext ) throw( Exception )
+uno::Reference< uno::XInterface > SAL_CALL PowerPointImport_createInstance( const Reference< XComponentContext >& rxContext )
 {
     return static_cast< ::cppu::OWeakObject* >( new PowerPointImport( rxContext ) );
 }
@@ -65,7 +65,7 @@ uno::Reference< uno::XInterface > SAL_CALL PowerPointImport_createInstance( cons
 XmlFilterBase* PowerPointImport::mpDebugFilterBase = nullptr;
 #endif
 
-PowerPointImport::PowerPointImport( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
+PowerPointImport::PowerPointImport( const Reference< XComponentContext >& rxContext ) :
     XmlFilterBase( rxContext ),
     mxChartConv( new ::oox::drawingml::chart::ChartConverter )
 
@@ -144,7 +144,7 @@ const ::oox::drawingml::Theme* PowerPointImport::getCurrentTheme() const
     return mpActualSlidePersist ? mpActualSlidePersist->getTheme().get() : nullptr;
 }
 
-sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDescriptor ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDescriptor )
 {
     if( XmlFilterBase::filter( rDescriptor ) )
         return true;
@@ -228,7 +228,7 @@ GraphicHelper* PowerPointImport::implCreateGraphicHelper() const
     return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Impress" );
 }
 
-OUString PowerPointImport::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString PowerPointImport::getImplementationName()
 {
     return PowerPointImport_getImplementationName();
 }
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 44262e93488a..9af13d245f0c 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -57,7 +57,6 @@ ShapeContextHandler_getSupportedServiceNames()
 
 uno::Reference< uno::XInterface > SAL_CALL
 ShapeContextHandler_createInstance( const uno::Reference< uno::XComponentContext > & context)
-        throw (uno::Exception)
 {
     return static_cast< ::cppu::OWeakObject* >( new ShapeContextHandler(context) );
 }
@@ -276,7 +275,6 @@ ShapeContextHandler::getContextHandler(sal_Int32 nElement)
 void SAL_CALL ShapeContextHandler::startFastElement
 (::sal_Int32 Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     mxFilterBase->filter(maMediaDescriptor);
 
@@ -325,7 +323,6 @@ void SAL_CALL ShapeContextHandler::startFastElement
 void SAL_CALL ShapeContextHandler::startUnknownElement
 (const OUString & Namespace, const OUString & Name,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if ( getContextHandler() == getDrawingShapeContext() )
         mpDrawing->getShapes().pushMark();
@@ -337,7 +334,6 @@ void SAL_CALL ShapeContextHandler::startUnknownElement
 }
 
 void SAL_CALL ShapeContextHandler::endFastElement(::sal_Int32 Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
 
@@ -365,7 +361,6 @@ void SAL_CALL ShapeContextHandler::endFastElement(::sal_Int32 Element)
 void SAL_CALL ShapeContextHandler::endUnknownElement
 (const OUString & Namespace,
  const OUString & Name)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
 
@@ -377,7 +372,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 ShapeContextHandler::createFastChildContext
 (::sal_Int32 Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference< xml::sax::XFastContextHandler > xResult;
     uno::Reference< xml::sax::XFastContextHandler > xContextHandler(getContextHandler(Element));
@@ -394,7 +388,6 @@ ShapeContextHandler::createUnknownChildContext
 (const OUString & Namespace,
  const OUString & Name,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
 
@@ -406,7 +399,6 @@ ShapeContextHandler::createUnknownChildContext
 }
 
 void SAL_CALL ShapeContextHandler::characters(const OUString & aChars)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
 
@@ -416,7 +408,7 @@ void SAL_CALL ShapeContextHandler::characters(const OUString & aChars)
 
 // css::xml::sax::XFastShapeContextHandler:
 uno::Reference< drawing::XShape > SAL_CALL
-ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
+ShapeContextHandler::getShape()
 {
     uno::Reference< drawing::XShape > xResult;
     uno::Reference< drawing::XShapes > xShapes( mxDrawPage, uno::UNO_QUERY );
@@ -543,20 +535,19 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
 }
 
 css::uno::Reference< css::drawing::XDrawPage > SAL_CALL
-ShapeContextHandler::getDrawPage() throw (css::uno::RuntimeException, std::exception)
+ShapeContextHandler::getDrawPage()
 {
     return mxDrawPage;
 }
 
 void SAL_CALL ShapeContextHandler::setDrawPage
 (const css::uno::Reference< css::drawing::XDrawPage > & the_value)
-    throw (css::uno::RuntimeException, std::exception)
 {
     mxDrawPage = the_value;
 }
 
 css::uno::Reference< css::frame::XModel > SAL_CALL
-ShapeContextHandler::getModel() throw (css::uno::RuntimeException, std::exception)
+ShapeContextHandler::getModel()
 {
     if( !mxFilterBase.is() )
         throw uno::RuntimeException();
@@ -565,7 +556,6 @@ ShapeContextHandler::getModel() throw (css::uno::RuntimeException, std::exceptio
 
 void SAL_CALL ShapeContextHandler::setModel
 (const css::uno::Reference< css::frame::XModel > & the_value)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if( !mxFilterBase.is() )
         throw uno::RuntimeException();
@@ -574,76 +564,67 @@ void SAL_CALL ShapeContextHandler::setModel
 }
 
 OUString SAL_CALL ShapeContextHandler::getRelationFragmentPath()
-    throw (uno::RuntimeException, std::exception)
 {
     return msRelationFragmentPath;
 }
 
 void SAL_CALL ShapeContextHandler::setRelationFragmentPath(const OUString & the_value)
-    throw (uno::RuntimeException, std::exception)
 {
     msRelationFragmentPath = the_value;
 }
 
-::sal_Int32 SAL_CALL ShapeContextHandler::getStartToken() throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL ShapeContextHandler::getStartToken()
 {
     return mnStartToken;
 }
 
-void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken )
 {
     mnStartToken = _starttoken;
 }
 
-awt::Point SAL_CALL ShapeContextHandler::getPosition() throw (uno::RuntimeException, std::exception)
+awt::Point SAL_CALL ShapeContextHandler::getPosition()
 {
     return maPosition;
 }
 
-void SAL_CALL ShapeContextHandler::setPosition(const awt::Point& rPosition) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ShapeContextHandler::setPosition(const awt::Point& rPosition)
 {
     maPosition = rPosition;
 }
 
 void SAL_CALL ShapeContextHandler::setDocumentProperties(const uno::Reference<document::XDocumentProperties>& xDocProps)
-    throw (css::uno::RuntimeException, std::exception)
 {
     mxDocumentProperties = xDocProps;
     mxFilterBase->checkDocumentProperties(mxDocumentProperties);
 }
 
 uno::Reference<document::XDocumentProperties> SAL_CALL ShapeContextHandler::getDocumentProperties()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return mxDocumentProperties;
 }
 
 uno::Sequence<beans::PropertyValue> SAL_CALL ShapeContextHandler::getMediaDescriptor()
-    throw (uno::RuntimeException, std::exception)
 {
     return maMediaDescriptor;
 }
 
 void SAL_CALL ShapeContextHandler::setMediaDescriptor(const uno::Sequence<beans::PropertyValue>& rMediaDescriptor)
-    throw (uno::RuntimeException, std::exception)
 {
     maMediaDescriptor = rMediaDescriptor;
 }
 
 OUString ShapeContextHandler::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return ShapeContextHandler_getImplementationName();
 }
 
 uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return ShapeContextHandler_getSupportedServiceNames();
 }
 
 sal_Bool SAL_CALL ShapeContextHandler::supportsService(const OUString & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index c594288d4d80..3270034e2061 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -57,89 +57,70 @@ public:
     virtual ~ShapeContextHandler() override;
 
     // css::lang::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
-    (const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
+    (const OUString & ServiceName) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
     // css::xml::sax::XFastContextHandler:
     virtual void SAL_CALL startFastElement
     (::sal_Int32 Element,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
     virtual void SAL_CALL startUnknownElement
     (const OUString & Namespace,
      const OUString & Name,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void SAL_CALL endFastElement(::sal_Int32 Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(::sal_Int32 Element) override;
 
     virtual void SAL_CALL endUnknownElement
     (const OUString & Namespace,
-     const OUString & Name)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const OUString & Name) override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     createFastChildContext
     (::sal_Int32 Element,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     createUnknownChildContext
     (const OUString & Namespace,
      const OUString & Name,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void SAL_CALL characters(const OUString & aChars)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL characters(const OUString & aChars) override;
 
     // css::xml::sax::XFastShapeContextHandler:
-    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape() override;
 
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() override;
 
     virtual void SAL_CALL setDrawPage
-    (const css::uno::Reference< css::drawing::XDrawPage > & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
+    (const css::uno::Reference< css::drawing::XDrawPage > & the_value) override;
 
-    virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() override;
 
     virtual void SAL_CALL setModel
-    (const css::uno::Reference< css::frame::XModel > & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
+    (const css::uno::Reference< css::frame::XModel > & the_value) override;
 
-    virtual OUString SAL_CALL getRelationFragmentPath()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getRelationFragmentPath() override;
     virtual void SAL_CALL setRelationFragmentPath
-    (const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual ::sal_Int32 SAL_CALL getStartToken() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL setDocumentProperties(const css::uno::Reference<css::document::XDocumentProperties>& xDocProps)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::document::XDocumentProperties> SAL_CALL getDocumentProperties()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getMediaDescriptor()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMediaDescriptor(const css::uno::Sequence<css::beans::PropertyValue>& rMediaDescriptor)
-        throw (css::uno::RuntimeException, std::exception) override;
+    (const OUString & the_value) override;
+
+    virtual ::sal_Int32 SAL_CALL getStartToken() override;
+    virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) override;
+
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) override;
+
+    virtual void SAL_CALL setDocumentProperties(const css::uno::Reference<css::document::XDocumentProperties>& xDocProps) override;
+    virtual css::uno::Reference<css::document::XDocumentProperties> SAL_CALL getDocumentProperties() override;
+    virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getMediaDescriptor() override;
+    virtual void SAL_CALL setMediaDescriptor(const css::uno::Sequence<css::beans::PropertyValue>& rMediaDescriptor) override;
 
 private:
     ShapeContextHandler(ShapeContextHandler &) = delete;
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
index 32aa09c6d3b2..d6a7e96cc1cb 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
@@ -26,7 +26,7 @@ ShapeDrawingFragmentHandler::~ShapeDrawingFragmentHandler() throw()
 {
 }
 
-void SAL_CALL ShapeDrawingFragmentHandler::endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL ShapeDrawingFragmentHandler::endDocument()
 {
 }
 
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index b4e202b15694..7f894a50f62c 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -21,7 +21,7 @@ class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2
 public:
     ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr const & pGroupShapePtr ) throw();
     virtual ~ShapeDrawingFragmentHandler() throw() override;
-    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override;
 
 private:
diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx
index a307d5cb8cc4..1f8b78a93230 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -28,7 +28,7 @@ namespace shape {
 
 using namespace ::com::sun::star;
 
-ShapeFilterBase::ShapeFilterBase( const uno::Reference< uno::XComponentContext >& rxContext ) throw( uno::RuntimeException ) :
+ShapeFilterBase::ShapeFilterBase( const uno::Reference< uno::XComponentContext >& rxContext ) :
     XmlFilterBase( rxContext ),
     mxChartConv( new ::oox::drawingml::chart::ChartConverter )
 {
@@ -68,7 +68,7 @@ const ::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles
     return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Writer" );
 }
 
-OUString ShapeFilterBase::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString ShapeFilterBase::getImplementationName()
 {
     return OUString();
 }
diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx
index 5bb339b6e41c..64bc926770e2 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -37,8 +37,7 @@ public:
 
     /// @throws css::uno::RuntimeException
     explicit            ShapeFilterBase(
-                            const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-                            throw( css::uno::RuntimeException );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     virtual             ~ShapeFilterBase() override;
 
@@ -62,7 +61,7 @@ public:
 
 private:
     virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     virtual GraphicHelper* implCreateGraphicHelper() const override;
 
     std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 57204c3efbb1..0c413b15fc01 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -278,7 +278,6 @@ InputStream::~InputStream()
 }
 
 sal_Int32 SAL_CALL InputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     if( nBytesToRead < 0 )
         throw IOException();
@@ -304,13 +303,11 @@ sal_Int32 SAL_CALL InputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int3
 }
 
 sal_Int32 SAL_CALL InputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     return readBytes( rData, nMaxBytesToRead );
 }
 
 void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     if( nBytesToSkip < 0 )
         throw IOException();
@@ -324,20 +321,20 @@ void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip )
     }
 }
 
-sal_Int32 SAL_CALL InputStream::available() throw (NotConnectedException, IOException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL InputStream::available()
 {
     updateBuffer();
     return maBuffer.getLength() - mnBufferPos;
 }
 
-void SAL_CALL InputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception)
+void SAL_CALL InputStream::closeInput()
 {
     mxTextStrm->closeInput();
 }
 
 // private --------------------------------------------------------------------
 
-void InputStream::updateBuffer() throw (IOException, RuntimeException)
+void InputStream::updateBuffer()
 {
     while( (mnBufferPos >= maBuffer.getLength()) && !mxTextStrm->isEOF() )
     {
@@ -375,12 +372,12 @@ void InputStream::updateBuffer() throw (IOException, RuntimeException)
     }
 }
 
-OString InputStream::readToElementBegin() throw (IOException, RuntimeException)
+OString InputStream::readToElementBegin()
 {
     return OUStringToOString( mxTextStrm->readString( maOpeningBracket, false ), RTL_TEXTENCODING_ISO_8859_1 );
 }
 
-OString InputStream::readToElementEnd() throw (IOException, RuntimeException)
+OString InputStream::readToElementEnd()
 {
     OString aText = OUStringToOString( mxTextStrm->readString( maClosingBracket, false ), RTL_TEXTENCODING_ISO_8859_1 );
     OSL_ENSURE( aText.endsWith(">"), "InputStream::readToElementEnd - missing closing bracket of XML element" );
diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx
index a06800524a3b..7e1b07c6680f 100644
--- a/package/inc/ByteChucker.hxx
+++ b/package/inc/ByteChucker.hxx
@@ -46,13 +46,11 @@ public:
     /// @throws css::io::BufferSizeExceededException
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void WriteBytes( const css::uno::Sequence< sal_Int8 >& aData )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException);
+    void WriteBytes( const css::uno::Sequence< sal_Int8 >& aData );
 
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    sal_Int64 GetPosition()
-        throw(css::io::IOException, css::uno::RuntimeException);
+    sal_Int64 GetPosition();
 
     void WriteInt16(sal_Int16 nInt16)
     {
diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx
index ec27a6aee5bc..865e3486b489 100644
--- a/package/inc/ByteGrabber.hxx
+++ b/package/inc/ByteGrabber.hxx
@@ -52,22 +52,18 @@ public:
     /// @throws css::io::BufferSizeExceededException
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException);
+    sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead );
     // XSeekable
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL seek( sal_Int64 location )
-        throw(css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException);
+    void SAL_CALL seek( sal_Int64 location );
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    sal_Int64 SAL_CALL getPosition(  )
-        throw(css::io::IOException, css::uno::RuntimeException);
+    sal_Int64 SAL_CALL getPosition(  );
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    sal_Int64 SAL_CALL getLength(  )
-        throw(css::io::IOException, css::uno::RuntimeException);
+    sal_Int64 SAL_CALL getLength(  );
 
     sal_uInt16 ReadUInt16();
     sal_uInt32 ReadUInt32();
diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx
index b70c621c859a..4d616b3b04d7 100644
--- a/package/inc/CRC32.hxx
+++ b/package/inc/CRC32.hxx
@@ -34,20 +34,15 @@ public:
     ~CRC32();
 
     /// @throws css::uno::RuntimeException
-    sal_Int64 SAL_CALL updateStream (css::uno::Reference < css::io::XInputStream > & xStream)
-        throw(css::uno::RuntimeException);
+    sal_Int64 SAL_CALL updateStream (css::uno::Reference < css::io::XInputStream > & xStream);
     /// @throws css::uno::RuntimeException
-    void SAL_CALL updateSegment(const css::uno::Sequence< sal_Int8 > &b, sal_Int32 len)
-        throw(css::uno::RuntimeException);
+    void SAL_CALL updateSegment(const css::uno::Sequence< sal_Int8 > &b, sal_Int32 len);
     /// @throws css::uno::RuntimeException
-    void SAL_CALL update(const css::uno::Sequence< sal_Int8 > &b)
-        throw(css::uno::RuntimeException);
+    void SAL_CALL update(const css::uno::Sequence< sal_Int8 > &b);
     /// @throws css::uno::RuntimeException
-    sal_Int32 SAL_CALL getValue()
-        throw(css::uno::RuntimeException);
+    sal_Int32 SAL_CALL getValue();
     /// @throws css::uno::RuntimeException
-    void SAL_CALL reset()
-        throw(css::uno::RuntimeException);
+    void SAL_CALL reset();
 };
 
 #endif
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 67adc1a7222d..34fdc6b7426f 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -51,21 +51,17 @@ public:
 
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void writeLOC( ZipEntry *pEntry, bool bEncrypt = false )
-        throw(css::io::IOException, css::uno::RuntimeException);
+    void writeLOC( ZipEntry *pEntry, bool bEncrypt = false );
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void rawWrite( const css::uno::Sequence< sal_Int8 >& rBuffer )
-        throw(css::io::IOException, css::uno::RuntimeException);
+    void rawWrite( const css::uno::Sequence< sal_Int8 >& rBuffer );
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void rawCloseEntry( bool bEncrypt = false )
-        throw(css::io::IOException, css::uno::RuntimeException);
+    void rawCloseEntry( bool bEncrypt = false );
 
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void finish()
-        throw(css::io::IOException, css::uno::RuntimeException, std::exception);
+    void finish();
     const css::uno::Reference< css::io::XOutputStream >& getStream();
 
     static sal_uInt32 getCurrentDosTime();
@@ -74,16 +70,13 @@ public:
 private:
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void writeEND(sal_uInt32 nOffset, sal_uInt32 nLength)
-        throw(css::io::IOException, css::uno::RuntimeException);
+    void writeEND(sal_uInt32 nOffset, sal_uInt32 nLength);
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void writeCEN( const ZipEntry &rEntry )
-        throw(css::io::IOException, css::uno::RuntimeException);
+    void writeCEN( const ZipEntry &rEntry );
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void writeEXT( const ZipEntry &rEntry )
-        throw(css::io::IOException, css::uno::RuntimeException);
+    void writeEXT( const ZipEntry &rEntry );
 
     // ScheduledThread handling helpers
     void consumeScheduledThreadEntry(ZipOutputEntry* pCandidate);
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 7dc01a9965cc..42f04801b643 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -132,54 +132,34 @@ public:
     const css::uno::Sequence< sal_Int8 > GetEncryptionKey();
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
     // XHierarchicalNameAccess
-    virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& aName )
-        throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName ) override;
     // XSingleServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(  )
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(  ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
     // XChangesBatch
-    virtual void SAL_CALL commitChanges(  )
-        throw(css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPendingChanges(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::util::ElementChange > SAL_CALL getPendingChanges(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL commitChanges(  ) override;
+    virtual sal_Bool SAL_CALL hasPendingChanges(  ) override;
+    virtual css::uno::Sequence< css::util::ElementChange > SAL_CALL getPendingChanges(  ) override;
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId()
-        throw(css::uno::RuntimeException);
+    static css::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId();
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // Uno componentiseralation
     static OUString static_getImplementationName();
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index daac93d7c17f..8e3408800fc6 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -43,30 +43,19 @@ public:
     const css::uno::Sequence < sal_Int8>& getSequence () const { return m_aBuffer; }
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
     // XOutputStream
-    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush(  )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput(  )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
+    virtual void SAL_CALL flush(  ) override;
+    virtual void SAL_CALL closeOutput(  ) override;
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location )
-        throw(css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition(  )
-        throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength(  )
-        throw(css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition(  ) override;
+    virtual sal_Int64 SAL_CALL getLength(  ) override;
 };
 #endif
 
diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx
index 1dc3539e234d..8860b832f479 100644
--- a/package/inc/ZipPackageEntry.hxx
+++ b/package/inc/ZipPackageEntry.hxx
@@ -77,33 +77,21 @@ public:
         mpParent = nullptr;
     }
     // XNamed
-    virtual OUString SAL_CALL getName(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
     // XChild
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent )
-        throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-        throw(css::uno::RuntimeException, std::exception) override = 0;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override = 0;
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue )
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override = 0;
-    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override = 0;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override = 0;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override = 0;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 };
 #endif
 
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index 603fc3b94c22..fb6a072751ea 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -60,8 +60,7 @@ public:
     /// @throws css::container::ElementExistException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent )
-        throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    void doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent );
 
     ZipContentInfo& doGetByName( const OUString& aName );
 
@@ -84,54 +83,38 @@ public:
             std::vector < css::uno::Sequence < css::beans::PropertyValue > > &rManList,
             ZipOutputStream & rZipOut,
             const css::uno::Sequence< sal_Int8 > &rEncryptionKey,
-            const rtlRandomPool & rRandomPool) const
-        throw(css::uno::RuntimeException);
+            const rtlRandomPool & rRandomPool) const;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // XPropertySet
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 #endif
 
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 806e4089d2c6..ed0799779273 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -74,8 +74,7 @@ private:
     /// Check that m_xStream implements io::XSeekable and return it
     css::uno::Reference< css::io::XInputStream > const & GetOwnSeekStream();
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData()
-        throw(css::uno::RuntimeException);
+    css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData();
 
 public:
     bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}
@@ -140,51 +139,29 @@ public:
     static css::uno::Sequence < sal_Int8 > static_getImplementationId();
 
     // XActiveDataSink
-    virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) override;
 
     // XDataSinkEncrSupport
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getDataStream()
-        throw ( css::packages::WrongPasswordException, css::packages::zip::ZipException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getRawStream()
-        throw ( css::packages::NoEncryptionException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getDataStream() override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getRawStream() override;
     virtual void SAL_CALL setDataStream(
-                    const css::uno::Reference< css::io::XInputStream >& aStream )
-        throw ( css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+                    const css::uno::Reference< css::io::XInputStream >& aStream ) override;
     virtual void SAL_CALL setRawStream(
-                    const css::uno::Reference< css::io::XInputStream >& aStream )
-        throw ( css::packages::EncryptionNotAllowedException,
-                css::packages::NoRawFormatException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getPlainRawStream()
-        throw ( css::io::IOException, css::packages::NoEncryptionException,
-                css::uno::RuntimeException, std::exception ) override;
+                    const css::uno::Reference< css::io::XInputStream >& aStream ) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getPlainRawStream() override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // XPropertySet
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 #endif
 
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index a073acf58106..b4c32af3e182 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -70,27 +70,27 @@ public:
             const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMSF );
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XZipFileAccess
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getStreamByPattern( const OUString& aPattern ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, css::packages::WrongPasswordException, css::packages::zip::ZipException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getStreamByPattern( const OUString& aPattern ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 };
 
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 1b171bc6ffe3..ebf93bff36f0 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -96,17 +96,14 @@ ManifestImport::~ManifestImport()
 }
 
 void SAL_CALL ManifestImport::startDocument(  )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL ManifestImport::endDocument(  )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
 }
 
 void ManifestImport::doFileEntry(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
 {
     aSequence.resize(PKG_SIZE_ENCR_MNFST);
 
@@ -130,7 +127,6 @@ throw( uno::RuntimeException )
 }
 
 void ManifestImport::doEncryptionData(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
 {
     // If this element exists, then this stream is encrypted and we need
     // to import the initialisation vector, salt and iteration count used
@@ -157,7 +153,6 @@ throw( uno::RuntimeException )
 }
 
 void ManifestImport::doAlgorithm(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
 {
     if ( !bIgnoreEncryptData ) {
         OUString aString = rConvertedAttribs[sAlgorithmNameAttribute];
@@ -193,7 +188,6 @@ throw( uno::RuntimeException )
 }
 
 void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
 {
     if ( !bIgnoreEncryptData ) {
         OUString aString = rConvertedAttribs[sKeyDerivationNameAttribute];
@@ -226,7 +220,6 @@ throw( uno::RuntimeException )
 }
 
 void ManifestImport::doStartKeyAlg(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
 {
     OUString aString = rConvertedAttribs[sStartKeyAlgNameAttribute];
     if (aString.equals(sSHA256_URL) || aString.equals(sSHA256_URL_ODF12)) {
@@ -240,7 +233,6 @@ throw( uno::RuntimeException )
 }
 
 void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     StringHashMap aConvertedAttribs;
     OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs );
@@ -305,7 +297,6 @@ bool isEmpty(const css::beans::PropertyValue &rProp)
 }
 
 void SAL_CALL ManifestImport::endElement( const OUString& aName )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     OUString aConvertedName = ConvertName( aName );
     if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) ) {
@@ -325,22 +316,18 @@ throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL ManifestImport::characters( const OUString& /*aChars*/ )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL ManifestImport::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL ManifestImport::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
 }
 
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 1263af34a577..094e7d70d103 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -117,33 +117,25 @@ protected:
 public:
     ManifestImport( std::vector < css::uno::Sequence < css::beans::PropertyValue > > & rNewVector );
     virtual ~ManifestImport() override;
-    virtual void SAL_CALL startDocument(  )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument(  )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement( const OUString& aName )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-        throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument(  ) override;
+    virtual void SAL_CALL endDocument(  ) override;
+    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 private:
     /// @throws css::uno::RuntimeException
-    void doFileEntry(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+    void doFileEntry(StringHashMap &rConvertedAttribs);
     /// @throws css::uno::RuntimeException
-    void doEncryptionData(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+    void doEncryptionData(StringHashMap &rConvertedAttribs);
     /// @throws css::uno::RuntimeException
-    void doAlgorithm(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+    void doAlgorithm(StringHashMap &rConvertedAttribs);
     /// @throws css::uno::RuntimeException
-    void doKeyDerivation(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+    void doKeyDerivation(StringHashMap &rConvertedAttribs);
     /// @throws css::uno::RuntimeException
-    void doStartKeyAlg(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+    void doStartKeyAlg(StringHashMap &rConvertedAttribs);
 };
 #endif
 
diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx
index 7ca27786d194..f1661d12a6dc 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -47,7 +47,6 @@ ManifestReader::~ManifestReader()
 {
 }
 Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSequence( const Reference< XInputStream >& rStream )
-    throw (css::uno::RuntimeException, std::exception)
 {
     Sequence < Sequence < PropertyValue > > aManifestSequence;
     Reference < XParser > xParser  = Parser::create(m_xContext);
@@ -95,19 +94,16 @@ Sequence < OUString > ManifestReader::static_getSupportedServiceNames()
 }
 
 OUString ManifestReader::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return static_getImplementationName();
 }
 
 sal_Bool SAL_CALL ManifestReader::supportsService(OUString const & rServiceName)
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName );
 }
 
 Sequence < OUString > ManifestReader::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return static_getSupportedServiceNames();
 }
diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx
index ba9221d5a77e..ba3ad1a1bef2 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -43,16 +43,12 @@ public:
     virtual ~ManifestReader() override;
 
     // XManifestReader
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL readManifestSequence( const css::uno::Reference< css::io::XInputStream >& rStream )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL readManifestSequence( const css::uno::Reference< css::io::XInputStream >& rStream ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // Component constructor
     static OUString static_getImplementationName();
diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx
index 0e40d999356f..aa73e2c9e092 100644
--- a/package/source/manifest/ManifestWriter.cxx
+++ b/package/source/manifest/ManifestWriter.cxx
@@ -55,7 +55,6 @@ ManifestWriter::~ManifestWriter()
 
 // XManifestWriter methods
 void SAL_CALL ManifestWriter::writeManifestSequence( const Reference< XOutputStream >& rStream, const Sequence< Sequence< PropertyValue > >& rSequence )
-        throw (RuntimeException, std::exception)
 {
     Reference < XWriter > xSource = Writer::create( m_xContext );
     xSource->setOutputStream ( rStream );
@@ -86,18 +85,15 @@ Sequence < OUString > ManifestWriter::static_getSupportedServiceNames()
 }
 
 OUString ManifestWriter::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return static_getImplementationName();
 }
 
 sal_Bool SAL_CALL ManifestWriter::supportsService(OUString const & rServiceName)
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 Sequence < OUString > ManifestWriter::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return static_getSupportedServiceNames();
 }
diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx
index 0a63befb89f5..ef16d311b6ba 100644
--- a/package/source/manifest/ManifestWriter.hxx
+++ b/package/source/manifest/ManifestWriter.hxx
@@ -43,16 +43,12 @@ public:
     virtual ~ManifestWriter() override;
 
     // XManifestWriter
-    virtual void SAL_CALL writeManifestSequence( const css::uno::Reference< css::io::XOutputStream >& rStream, const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeManifestSequence( const css::uno::Reference< css::io::XOutputStream >& rStream, const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // Component constructor
     static OUString static_getImplementationName();
diff --git a/package/source/xstor/disposelistener.cxx b/package/source/xstor/disposelistener.cxx
index 6ffafe946d7a..f8436971ada8 100644
--- a/package/source/xstor/disposelistener.cxx
+++ b/package/source/xstor/disposelistener.cxx
@@ -36,7 +36,6 @@ void OChildDispListener_Impl::OwnerIsDisposed()
 }
 
 void SAL_CALL OChildDispListener_Impl::disposing( const lang::EventObject& Source )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     // ObjectIsDisposed must not contain any locking!
diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx
index 75d81c8913c3..5abb727cdbff 100644
--- a/package/source/xstor/disposelistener.hxx
+++ b/package/source/xstor/disposelistener.hxx
@@ -36,7 +36,7 @@ public:
 
     void OwnerIsDisposed();
 
-    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;
 };
 
 #endif
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index c94d16c277b9..63bc7dc6eca4 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -75,7 +75,6 @@ OInputCompStream::~OInputCompStream()
 }
 
 uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Any aReturn;
 
@@ -105,10 +104,6 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType )
 }
 
 sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -121,10 +116,6 @@ sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData
 }
 
 sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -138,10 +129,6 @@ sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& a
 }
 
 void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -155,9 +142,6 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 sal_Int32 SAL_CALL OInputCompStream::available(  )
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -171,15 +155,11 @@ sal_Int32 SAL_CALL OInputCompStream::available(  )
 }
 
 void SAL_CALL OInputCompStream::closeInput(  )
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     dispose();
 }
 
 uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -192,7 +172,6 @@ uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream()
 }
 
 uno::Reference< io::XOutputStream > SAL_CALL OInputCompStream::getOutputStream()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -233,7 +212,6 @@ void OInputCompStream::InternalDispose()
 }
 
 void SAL_CALL OInputCompStream::dispose(  )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -260,7 +238,6 @@ void SAL_CALL OInputCompStream::dispose(  )
 }
 
 void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -276,7 +253,6 @@ void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XE
 }
 
 void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -290,8 +266,6 @@ void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang:
 }
 
 sal_Bool SAL_CALL OInputCompStream::hasByID(  const OUString& sID )
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -316,9 +290,6 @@ sal_Bool SAL_CALL OInputCompStream::hasByID(  const OUString& sID )
 }
 
 OUString SAL_CALL OInputCompStream::getTargetByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -340,9 +311,6 @@ OUString SAL_CALL OInputCompStream::getTargetByID(  const OUString& sID  )
 }
 
 OUString SAL_CALL OInputCompStream::getTypeByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -364,9 +332,6 @@ OUString SAL_CALL OInputCompStream::getTypeByID(  const OUString& sID  )
 }
 
 uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -394,8 +359,6 @@ uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByI
 }
 
 uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getRelationshipsByType(  const OUString& sType  )
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -429,7 +392,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
 }
 
 uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getAllRelationships()
-        throw (io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -457,9 +419,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
 }
 
 void SAL_CALL OInputCompStream::insertRelationshipByID(  const OUString& /*sID*/, const uno::Sequence< beans::StringPair >& /*aEntry*/, sal_Bool /*bReplace*/  )
-        throw ( container::ElementExistException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -476,9 +435,6 @@ void SAL_CALL OInputCompStream::insertRelationshipByID(  const OUString& /*sID*/
 }
 
 void SAL_CALL OInputCompStream::removeRelationshipByID(  const OUString& /*sID*/  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -495,9 +451,6 @@ void SAL_CALL OInputCompStream::removeRelationshipByID(  const OUString& /*sID*/
 }
 
 void SAL_CALL OInputCompStream::insertRelationships(  const uno::Sequence< uno::Sequence< beans::StringPair > >& /*aEntries*/, sal_Bool /*bReplace*/  )
-        throw ( container::ElementExistException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -514,8 +467,6 @@ void SAL_CALL OInputCompStream::insertRelationships(  const uno::Sequence< uno::
 }
 
 void SAL_CALL OInputCompStream::clearRelationships()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -532,7 +483,6 @@ void SAL_CALL OInputCompStream::clearRelationships()
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getPropertySetInfo()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -547,11 +497,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getProperty
 }
 
 void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& /*aValue*/ )
-        throw ( beans::UnknownPropertyException,
-                beans::PropertyVetoException,
-                lang::IllegalArgumentException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -574,9 +519,6 @@ void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName,
 }
 
 uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -610,9 +552,6 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
 void SAL_CALL OInputCompStream::addPropertyChangeListener(
     const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -628,9 +567,6 @@ void SAL_CALL OInputCompStream::addPropertyChangeListener(
 void SAL_CALL OInputCompStream::removePropertyChangeListener(
     const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -646,9 +582,6 @@ void SAL_CALL OInputCompStream::removePropertyChangeListener(
 void SAL_CALL OInputCompStream::addVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -664,9 +597,6 @@ void SAL_CALL OInputCompStream::addVetoableChangeListener(
 void SAL_CALL OInputCompStream::removeVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx
index 36c91a54c190..3c37aaf0975e 100644
--- a/package/source/xstor/ocompinstream.hxx
+++ b/package/source/xstor/ocompinstream.hxx
@@ -63,50 +63,44 @@ public:
     void InternalDispose();
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 
     //XStream
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) override;
 
     //XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     //XRelationshipAccess
-    virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearRelationships(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) override;
+    virtual OUString SAL_CALL getTargetByID( const OUString& sID ) override;
+    virtual OUString SAL_CALL getTypeByID( const OUString& sID ) override;
+    virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships(  ) override;
+    virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) override;
+    virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) override;
+    virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) override;
+    virtual void SAL_CALL clearRelationships(  ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 };
 
diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index a173f7990406..d3730a90c670 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -259,7 +259,6 @@ void OHierarchyElement_Impl::TestForClosing()
 }
 
 void SAL_CALL OHierarchyElement_Impl::disposing( const lang::EventObject& Source )
-        throw ( uno::RuntimeException, std::exception )
 {
     try
     {
@@ -303,12 +302,10 @@ void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference< OHierarchyEl
 
 // XTransactionListener
 void SAL_CALL OHierarchyElement_Impl::preCommit( const css::lang::EventObject& /*aEvent*/ )
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OHierarchyElement_Impl::commited( const css::lang::EventObject& /*aEvent*/ )
-    throw (css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -324,12 +321,10 @@ void SAL_CALL OHierarchyElement_Impl::commited( const css::lang::EventObject& /*
 }
 
 void SAL_CALL OHierarchyElement_Impl::preRevert( const css::lang::EventObject& /*aEvent*/ )
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL OHierarchyElement_Impl::reverted( const css::lang::EventObject& /*aEvent*/ )
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx
index 4887d49438cc..219391311ae8 100644
--- a/package/source/xstor/ohierarchyholder.hxx
+++ b/package/source/xstor/ohierarchyholder.hxx
@@ -92,18 +92,13 @@ public:
     void RemoveStreamHierarchically( OStringList_Impl& aListPath );
 
     // 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;
 
     // XTransactionListener
-    virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL commited( const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) override;
 
 };
 
diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx
index 95137f4d836b..8ded31612130 100644
--- a/package/source/xstor/oseekinstream.cxx
+++ b/package/source/xstor/oseekinstream.cxx
@@ -51,7 +51,6 @@ OInputSeekStream::~OInputSeekStream()
 }
 
 uno::Sequence< uno::Type > SAL_CALL OInputSeekStream::getTypes()
-        throw ( uno::RuntimeException, std::exception )
 {
     static ::cppu::OTypeCollection* pTypeCollection = nullptr ;
 
@@ -73,7 +72,6 @@ uno::Sequence< uno::Type > SAL_CALL OInputSeekStream::getTypes()
 }
 
 uno::Any SAL_CALL OInputSeekStream::queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -102,9 +100,6 @@ void SAL_CALL OInputSeekStream::release()
 }
 
 void SAL_CALL OInputSeekStream::seek( sal_Int64 location )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -123,8 +118,6 @@ void SAL_CALL OInputSeekStream::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL OInputSeekStream::getPosition()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
@@ -143,8 +136,6 @@ sal_Int64 SAL_CALL OInputSeekStream::getPosition()
 }
 
 sal_Int64 SAL_CALL OInputSeekStream::getLength()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
     if ( m_bDisposed )
diff --git a/package/source/xstor/oseekinstream.hxx b/package/source/xstor/oseekinstream.hxx
index 803f4c7fc783..b8de87c29579 100644
--- a/package/source/xstor/oseekinstream.hxx
+++ b/package/source/xstor/oseekinstream.hxx
@@ -42,17 +42,17 @@ public:
 
     virtual ~OInputSeekStream() override;
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     //XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
 };
 
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 8506f7e352a7..c4e5822c493e 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -1422,7 +1422,6 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetRawInStream()
 }
 
 ::comphelper::SequenceAsHashMap OWriteStream_Impl::GetCommonRootEncryptionData()
-    throw ( packages::NoEncryptionException )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
@@ -1861,7 +1860,6 @@ void OWriteStream::ModifyParentUnlockMutex_Impl( ::osl::ResettableMutexGuard& aG
 }
 
 uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Any aReturn;
 
@@ -1923,7 +1921,6 @@ void SAL_CALL OWriteStream::release() throw()
 }
 
 uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
-        throw( uno::RuntimeException, std::exception )
 {
     if (! m_pData->m_pTypeCollection)
     {
@@ -2036,16 +2033,11 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
 namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 
 uno::Sequence< sal_Int8 > SAL_CALL OWriteStream::getImplementationId()
-        throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2064,10 +2056,6 @@ sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sa
 }
 
 sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2086,10 +2074,6 @@ sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData
 }
 
 void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2108,9 +2092,6 @@ void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 sal_Int32 SAL_CALL OWriteStream::available(  )
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2130,9 +2111,6 @@ sal_Int32 SAL_CALL OWriteStream::available(  )
 }
 
 void SAL_CALL OWriteStream::closeInput(  )
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2156,7 +2134,6 @@ void SAL_CALL OWriteStream::closeInput(  )
 }
 
 uno::Reference< io::XInputStream > SAL_CALL OWriteStream::getInputStream()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2173,7 +2150,6 @@ uno::Reference< io::XInputStream > SAL_CALL OWriteStream::getInputStream()
 }
 
 uno::Reference< io::XOutputStream > SAL_CALL OWriteStream::getOutputStream()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2200,10 +2176,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OWriteStream::getOutputStream()
 }
 
 void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2267,10 +2239,6 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
 }
 
 void SAL_CALL OWriteStream::flush()
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     // In case stream is flushed its current version becomes visible
     // to the parent storage. Usually parent storage flushes the stream
@@ -2318,10 +2286,6 @@ void OWriteStream::CloseOutput_Impl()
 }
 
 void SAL_CALL OWriteStream::closeOutput()
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2343,9 +2307,6 @@ void SAL_CALL OWriteStream::closeOutput()
 }
 
 void SAL_CALL OWriteStream::seek( sal_Int64 location )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2364,8 +2325,6 @@ void SAL_CALL OWriteStream::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL OWriteStream::getPosition()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2384,8 +2343,6 @@ sal_Int64 SAL_CALL OWriteStream::getPosition()
 }
 
 sal_Int64 SAL_CALL OWriteStream::getLength()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2404,8 +2361,6 @@ sal_Int64 SAL_CALL OWriteStream::getLength()
 }
 
 void SAL_CALL OWriteStream::truncate()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2436,7 +2391,6 @@ void SAL_CALL OWriteStream::truncate()
 }
 
 void SAL_CALL OWriteStream::dispose()
-        throw ( uno::RuntimeException, std::exception )
 {
     // should be an internal method since it can be called only from parent storage
     {
@@ -2500,7 +2454,6 @@ void SAL_CALL OWriteStream::dispose()
 
 void SAL_CALL OWriteStream::addEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2516,7 +2469,6 @@ void SAL_CALL OWriteStream::addEventListener(
 
 void SAL_CALL OWriteStream::removeEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2531,8 +2483,6 @@ void SAL_CALL OWriteStream::removeEventListener(
 }
 
 void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass )
-    throw ( uno::RuntimeException,
-            io::IOException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2552,8 +2502,6 @@ void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass )
 }
 
 void SAL_CALL OWriteStream::removeEncryption()
-    throw ( uno::RuntimeException,
-            io::IOException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2573,7 +2521,6 @@ void SAL_CALL OWriteStream::removeEncryption()
 }
 
 void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::NamedValue >& aEncryptionData )
-    throw (io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2593,7 +2540,6 @@ void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::Named
 }
 
 sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2630,8 +2576,6 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
 }
 
 sal_Bool SAL_CALL OWriteStream::hasByID(  const OUString& sID )
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2659,9 +2603,6 @@ sal_Bool SAL_CALL OWriteStream::hasByID(  const OUString& sID )
 }
 
 OUString SAL_CALL OWriteStream::getTargetByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2683,9 +2624,6 @@ OUString SAL_CALL OWriteStream::getTargetByID(  const OUString& sID  )
 }
 
 OUString SAL_CALL OWriteStream::getTypeByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2707,9 +2645,6 @@ OUString SAL_CALL OWriteStream::getTypeByID(  const OUString& sID  )
 }
 
 uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2737,8 +2672,6 @@ uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(
 }
 
 uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRelationshipsByType(  const OUString& sType  )
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2772,7 +2705,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRe
 }
 
 uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getAllRelationships()
-        throw (io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2789,9 +2721,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getAl
 }
 
 void SAL_CALL OWriteStream::insertRelationshipByID(  const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, sal_Bool bReplace  )
-        throw ( container::ElementExistException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2852,9 +2781,6 @@ void SAL_CALL OWriteStream::insertRelationshipByID(  const OUString& sID, const
 }
 
 void SAL_CALL OWriteStream::removeRelationshipByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2893,9 +2819,6 @@ void SAL_CALL OWriteStream::removeRelationshipByID(  const OUString& sID  )
 }
 
 void SAL_CALL OWriteStream::insertRelationships(  const uno::Sequence< uno::Sequence< beans::StringPair > >& aEntries, sal_Bool bReplace  )
-        throw ( container::ElementExistException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2975,8 +2898,6 @@ void SAL_CALL OWriteStream::insertRelationships(  const uno::Sequence< uno::Sequ
 }
 
 void SAL_CALL OWriteStream::clearRelationships()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2995,7 +2916,6 @@ void SAL_CALL OWriteStream::clearRelationships()
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OWriteStream::getPropertySetInfo()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3004,11 +2924,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OWriteStream::getPropertySetI
 }
 
 void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-        throw ( beans::UnknownPropertyException,
-                beans::PropertyVetoException,
-                lang::IllegalArgumentException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3131,9 +3046,6 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
 }
 
 uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3193,9 +3105,6 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp )
 void SAL_CALL OWriteStream::addPropertyChangeListener(
     const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3211,9 +3120,6 @@ void SAL_CALL OWriteStream::addPropertyChangeListener(
 void SAL_CALL OWriteStream::removePropertyChangeListener(
     const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3229,9 +3135,6 @@ void SAL_CALL OWriteStream::removePropertyChangeListener(
 void SAL_CALL OWriteStream::addVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3247,9 +3150,6 @@ void SAL_CALL OWriteStream::addVetoableChangeListener(
 void SAL_CALL OWriteStream::removeVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3310,9 +3210,6 @@ void OWriteStream::BroadcastTransaction( sal_Int8 nMessage )
     }
 }
 void SAL_CALL OWriteStream::commit()
-        throw ( io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::commit" );
 
@@ -3374,9 +3271,6 @@ void SAL_CALL OWriteStream::commit()
 }
 
 void SAL_CALL OWriteStream::revert()
-        throw ( io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::revert" );
 
@@ -3441,7 +3335,6 @@ void SAL_CALL OWriteStream::revert()
 //  XTransactionBroadcaster
 
 void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3459,7 +3352,6 @@ void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed:
 }
 
 void SAL_CALL OWriteStream::removeTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index dd6fd0471df9..fab951b32c69 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -133,7 +133,7 @@ private:
                                                                                         bool bHierarchyAccess );
 
     /// @throws css::packages::NoEncryptionException
-    ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( css::packages::NoEncryptionException );
+    ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData();
 
     css::uno::Sequence< css::beans::PropertyValue > ReadPackageStreamProperties();
     css::uno::Sequence< css::beans::PropertyValue > InsertOwnProps(
@@ -279,100 +279,81 @@ public:
     void DeInit();
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     //  XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 
     // XOutputStream
-    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
+    virtual void SAL_CALL flush(  ) override;
+    virtual void SAL_CALL closeOutput(  ) override;
 
     //XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
     //XStream
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) override;
 
     // XTruncate
-    virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL truncate() override;
 
     //XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     //XEncryptionProtectedSource
-    virtual void SAL_CALL setEncryptionPassword( const OUString& aPass )
-        throw ( css::uno::RuntimeException,
-                css::io::IOException, std::exception ) override;
-    virtual void SAL_CALL removeEncryption()
-        throw ( css::uno::RuntimeException,
-                css::io::IOException, std::exception ) override;
+    virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) override;
+    virtual void SAL_CALL removeEncryption() override;
 
     //XEncryptionProtectedSource2
-    virtual void SAL_CALL setEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasEncryptionData() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override;
+    virtual sal_Bool SAL_CALL hasEncryptionData() override;
 
     //XRelationshipAccess
-    virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearRelationships(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) override;
+    virtual OUString SAL_CALL getTargetByID( const OUString& sID ) override;
+    virtual OUString SAL_CALL getTypeByID( const OUString& sID ) override;
+    virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships(  ) override;
+    virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) override;
+    virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) override;
+    virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) override;
+    virtual void SAL_CALL clearRelationships(  ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XTransactedObject
-    virtual void SAL_CALL commit()
-        throw ( css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL revert()
-        throw ( css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL commit() override;
+    virtual void SAL_CALL revert() override;
 
     // XTransactionBroadcaster
     virtual void SAL_CALL addTransactionListener(
-            const css::uno::Reference< css::embed::XTransactionListener >& aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::embed::XTransactionListener >& aListener ) override;
     virtual void SAL_CALL removeTransactionListener(
-            const css::uno::Reference< css::embed::XTransactionListener >& aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::embed::XTransactionListener >& aListener ) override;
 
 };
 
diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx
index 7575a18988cd..9ee3673ffd10 100644
--- a/package/source/xstor/selfterminatefilestream.cxx
+++ b/package/source/xstor/selfterminatefilestream.cxx
@@ -63,66 +63,41 @@ void OSelfTerminateFileStream::CloseStreamDeleteFile()
 }
 
 sal_Int32 SAL_CALL OSelfTerminateFileStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     return m_xInputStream->readBytes( aData, nBytesToRead );
 }
 
 sal_Int32 SAL_CALL OSelfTerminateFileStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead );
 }
 
 void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     return m_xInputStream->skipBytes( nBytesToSkip );
 }
 
 sal_Int32 SAL_CALL OSelfTerminateFileStream::available(  )
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     return m_xInputStream->available();
 }
 
 void SAL_CALL OSelfTerminateFileStream::closeInput(  )
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     CloseStreamDeleteFile();
 }
 
 void SAL_CALL OSelfTerminateFileStream::seek( sal_Int64 location )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     m_xSeekable->seek( location );
 }
 
 sal_Int64 SAL_CALL OSelfTerminateFileStream::getPosition()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception)
 {
     return m_xSeekable->getPosition();
 }
 
 sal_Int64 SAL_CALL OSelfTerminateFileStream::getLength()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     return m_xSeekable->getLength();
 }
diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx
index abd60c4676d1..661cbcf2fc68 100644
--- a/package/source/xstor/selfterminatefilestream.hxx
+++ b/package/source/xstor/selfterminatefilestream.hxx
@@ -46,21 +46,16 @@ public:
     void CloseStreamDeleteFile();
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available()
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput()
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 
     //XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
 };
 
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx
index fbada20a77f5..cd325742016c 100644
--- a/package/source/xstor/switchpersistencestream.cxx
+++ b/package/source/xstor/switchpersistencestream.cxx
@@ -206,7 +206,6 @@ void SwitchablePersistenceStream::CloseAll_Impl()
 
 // css::io::XStream
 uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInputStream(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -216,7 +215,6 @@ uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInpu
 }
 
 uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOutputStream(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -227,7 +225,6 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut
 
 // css::io::XInputStream
 ::sal_Int32 SAL_CALL SwitchablePersistenceStream::readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -242,7 +239,6 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut
 }
 
 ::sal_Int32 SAL_CALL SwitchablePersistenceStream::readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -257,7 +253,6 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut
 }
 
 void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -272,7 +267,6 @@ void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip )
 }
 
 ::sal_Int32 SAL_CALL SwitchablePersistenceStream::available(  )
-    throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -287,7 +281,6 @@ void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip )
 }
 
 void SAL_CALL SwitchablePersistenceStream::closeInput()
-    throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -301,7 +294,6 @@ void SAL_CALL SwitchablePersistenceStream::closeInput()
 
 // css::io::XOutputStream
 void SAL_CALL SwitchablePersistenceStream::writeBytes( const uno::Sequence< ::sal_Int8 >& aData )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -319,7 +311,6 @@ void SAL_CALL SwitchablePersistenceStream::writeBytes( const uno::Sequence< ::sa
 }
 
 void SAL_CALL SwitchablePersistenceStream::flush(  )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -340,7 +331,6 @@ void SAL_CALL SwitchablePersistenceStream::flush(  )
 }
 
 void SAL_CALL SwitchablePersistenceStream::closeOutput(  )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -354,7 +344,6 @@ void SAL_CALL SwitchablePersistenceStream::closeOutput(  )
 
 // css::io::XTruncate
 void SAL_CALL SwitchablePersistenceStream::truncate(  )
-    throw (io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -373,7 +362,6 @@ void SAL_CALL SwitchablePersistenceStream::truncate(  )
 
 // css::io::XSeekable
 void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location )
-    throw (lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -388,7 +376,6 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location )
 }
 
 ::sal_Int64 SAL_CALL SwitchablePersistenceStream::getPosition(  )
-    throw (io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -403,7 +390,6 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location )
 }
 
 ::sal_Int64 SAL_CALL SwitchablePersistenceStream::getLength(  )
-    throw (io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -418,7 +404,6 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location )
 }
 
 void SAL_CALL SwitchablePersistenceStream::waitForCompletion()
-    throw (css::io::IOException, css::uno::RuntimeException, std::exception)
 {
     if ( !m_pStreamData )
         throw io::NotConnectedException();
diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx
index dacb28ad805d..a42ca023e227 100644
--- a/package/source/xstor/switchpersistencestream.hxx
+++ b/package/source/xstor/switchpersistencestream.hxx
@@ -77,31 +77,31 @@ public:
     void CopyAndSwitchPersistenceTo( const css::uno::Reference< css::io::XStream >& xStream );
 
 // css::io::XStream
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) override;
 
 // css::io::XInputStream
-    virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL available(  ) throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  ) throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) override;
+    virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) override;
+    virtual ::sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 
 // css::io::XOutputStream
-    virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) override;
+    virtual void SAL_CALL flush(  ) override;
+    virtual void SAL_CALL closeOutput(  ) override;
 
 // css::io::XTruncate
-    virtual void SAL_CALL truncate(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL truncate(  ) override;
 
 // css::io::XSeekable
-    virtual void SAL_CALL seek( ::sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int64 SAL_CALL getPosition(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int64 SAL_CALL getLength(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( ::sal_Int64 location ) override;
+    virtual ::sal_Int64 SAL_CALL getPosition(  ) override;
+    virtual ::sal_Int64 SAL_CALL getLength(  ) override;
 
 // css::io::XAsyncOutputMonitor
-    virtual void SAL_CALL waitForCompletion(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL waitForCompletion(  ) override;
 
 };
 
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index d5031b4dbc03..a7b5c462167d 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -84,8 +84,6 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::impl_staticCreateSel
 }
 
 uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance()
-    throw ( uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     // TODO: reimplement TempStream service to support XStream interface
     uno::Reference < io::XStream > xTempStream(
@@ -103,8 +101,6 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance()
 
 uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithArguments(
             const uno::Sequence< uno::Any >& aArguments )
-    throw ( uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     // The request for storage can be done with up to three arguments
 
@@ -285,19 +281,16 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
 }
 
 OUString SAL_CALL OStorageFactory::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetImplementationName();
 }
 
 sal_Bool SAL_CALL OStorageFactory::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OStorageFactory::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetSupportedServiceNames();
 }
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index 13c55e85003d..1e07f4e492af 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/package/source/xstor/xfactory.hxx
@@ -47,13 +47,13 @@ public:
             const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
     // XSingleServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index e43241b40b95..98b6ac22c229 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -1324,7 +1324,6 @@ void OStorage_Impl::Revert()
 }
 
 ::comphelper::SequenceAsHashMap OStorage_Impl::GetCommonRootEncryptionData()
-    throw ( packages::NoEncryptionException )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
@@ -1631,14 +1630,6 @@ void OStorage_Impl::CloneStreamElement( const OUString& aStreamName,
                                         bool bEncryptionDataProvided,
                                         const ::comphelper::SequenceAsHashMap& aEncryptionData,
                                         uno::Reference< io::XStream >& xTargetStream )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::WrongPasswordException,
-                packages::NoEncryptionException,
-                container::NoSuchElementException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException )
 {
     SotElement_Impl *pElement = FindElement( aStreamName );
     if ( !pElement )
@@ -2149,7 +2140,6 @@ void OStorage::MakeLinkToSubComponent_Impl( const uno::Reference< lang::XCompone
 //  XInterface
 
 uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Any aReturn;
 
@@ -2222,7 +2212,6 @@ void SAL_CALL OStorage::release() throw()
 
 //  XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes()
-        throw( uno::RuntimeException, std::exception )
 {
     if (! m_pData->m_pTypeCollection)
     {
@@ -2290,18 +2279,12 @@ uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes()
 namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 
 uno::Sequence< sal_Int8 > SAL_CALL OStorage::getImplementationId()
-        throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 //  XStorage
 void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >& xDest )
-        throw ( embed::InvalidStorageException,
-                io::IOException,
-                lang::IllegalArgumentException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2361,12 +2344,6 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >&
 
 uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
     const OUString& aStreamName, sal_Int32 nOpenMode )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2460,24 +2437,12 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
 
 uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement(
     const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     return openEncryptedStream( aStreamName, nOpenMode, ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
 }
 
 uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
             const OUString& aStorName, sal_Int32 nStorageMode )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2623,12 +2588,6 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
 }
 
 uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUString& aStreamName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2703,24 +2662,12 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUStr
 uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStreamElement(
     const OUString& aStreamName,
     const OUString& aPass )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     return cloneEncryptedStream( aStreamName, ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
 }
 
 void SAL_CALL OStorage::copyLastCommitTo(
             const uno::Reference< embed::XStorage >& xTargetStorage )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2780,11 +2727,6 @@ void SAL_CALL OStorage::copyLastCommitTo(
 void SAL_CALL OStorage::copyStorageElementLastCommitTo(
             const OUString& aStorName,
             const uno::Reference< embed::XStorage >& xTargetStorage )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2873,10 +2815,6 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo(
 }
 
 sal_Bool SAL_CALL OStorage::isStreamElement( const OUString& aElementName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -2940,10 +2878,6 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const OUString& aElementName )
 }
 
 sal_Bool SAL_CALL OStorage::isStorageElement( const OUString& aElementName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3007,12 +2941,6 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const OUString& aElementName )
 }
 
 void SAL_CALL OStorage::removeElement( const OUString& aElementName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3096,13 +3024,6 @@ void SAL_CALL OStorage::removeElement( const OUString& aElementName )
 }
 
 void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUString& aNewName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3198,13 +3119,6 @@ void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUStr
 void SAL_CALL OStorage::copyElementTo(  const OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
                                         const OUString& aNewName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3297,13 +3211,6 @@ void SAL_CALL OStorage::copyElementTo(  const OUString& aElementName,
 void SAL_CALL OStorage::moveElementTo(  const OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
                                         const OUString& aNewName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3407,13 +3314,6 @@ void SAL_CALL OStorage::moveElementTo(  const OUString& aElementName,
 //  XStorage2
 uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
     const OUString& aStreamName, sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3514,13 +3414,6 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
 uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
     const OUString& aStreamName,
     const uno::Sequence< beans::NamedValue >& aEncryptionData )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3601,12 +3494,6 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
 //  XStorageRawAccess
 uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
             const OUString& sStreamName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3705,13 +3592,6 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement(
 
 uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
             const OUString& sStreamName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                container::NoSuchElementException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3820,13 +3700,6 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement(
 
 void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName,
                                 const uno::Reference< io::XInputStream >& xInStream )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoRawFormatException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -3912,9 +3785,6 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName,
 
 //  XTransactedObject
 void SAL_CALL OStorage::commit()
-        throw ( io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     uno::Reference< util::XModifiable > xParentModif;
 
@@ -3975,9 +3845,6 @@ void SAL_CALL OStorage::commit()
 }
 
 void SAL_CALL OStorage::revert()
-        throw ( io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     // the method removes all the changes done after last commit
 
@@ -4046,7 +3913,6 @@ void SAL_CALL OStorage::revert()
 
 //  XTransactionBroadcaster
 void SAL_CALL OStorage::addTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4061,7 +3927,6 @@ void SAL_CALL OStorage::addTransactionListener( const uno::Reference< embed::XTr
 }
 
 void SAL_CALL OStorage::removeTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4081,7 +3946,6 @@ void SAL_CALL OStorage::removeTransactionListener( const uno::Reference< embed::
 //        to the service back.
 
 sal_Bool SAL_CALL OStorage::isModified()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4095,8 +3959,6 @@ sal_Bool SAL_CALL OStorage::isModified()
 }
 
 void SAL_CALL OStorage::setModified( sal_Bool bModified )
-        throw ( beans::PropertyVetoException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4122,7 +3984,6 @@ void SAL_CALL OStorage::setModified( sal_Bool bModified )
 
 void SAL_CALL OStorage::addModifyListener(
             const uno::Reference< util::XModifyListener >& aListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4139,7 +4000,6 @@ void SAL_CALL OStorage::addModifyListener(
 
 void SAL_CALL OStorage::removeModifyListener(
             const uno::Reference< util::XModifyListener >& aListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4157,9 +4017,6 @@ void SAL_CALL OStorage::removeModifyListener(
 //  XNameAccess
 
 uno::Any SAL_CALL OStorage::getByName( const OUString& aName )
-        throw ( container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4220,7 +4077,6 @@ uno::Any SAL_CALL OStorage::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > SAL_CALL OStorage::getElementNames()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4253,7 +4109,6 @@ uno::Sequence< OUString > SAL_CALL OStorage::getElementNames()
 }
 
 sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4295,7 +4150,6 @@ sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName )
 }
 
 uno::Type SAL_CALL OStorage::getElementType()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4310,7 +4164,6 @@ uno::Type SAL_CALL OStorage::getElementType()
 }
 
 sal_Bool SAL_CALL OStorage::hasElements()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4344,7 +4197,6 @@ sal_Bool SAL_CALL OStorage::hasElements()
 
 //  XComponent
 void SAL_CALL OStorage::dispose()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4378,7 +4230,6 @@ void SAL_CALL OStorage::dispose()
 
 void SAL_CALL OStorage::addEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4394,7 +4245,6 @@ void SAL_CALL OStorage::addEventListener(
 
 void SAL_CALL OStorage::removeEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4411,15 +4261,11 @@ void SAL_CALL OStorage::removeEventListener(
 //  XEncryptionProtectedSource
 
 void SAL_CALL OStorage::setEncryptionPassword( const OUString& aPass )
-    throw ( uno::RuntimeException,
-            io::IOException, std::exception )
 {
     setEncryptionData( ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
 }
 
 void SAL_CALL OStorage::removeEncryption()
-    throw ( uno::RuntimeException,
-            io::IOException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4489,8 +4335,6 @@ void SAL_CALL OStorage::removeEncryption()
 //  XEncryptionProtectedSource2
 
 void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValue >& aEncryptionData )
-    throw ( io::IOException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4550,7 +4394,6 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu
 }
 
 sal_Bool SAL_CALL OStorage::hasEncryptionData()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4560,7 +4403,6 @@ sal_Bool SAL_CALL OStorage::hasEncryptionData()
 //  XEncryptionProtectedStorage
 
 void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::NamedValue >& aAlgorithms )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4625,7 +4467,6 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam
 }
 
 uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4691,7 +4532,6 @@ uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms()
 //  XPropertySet
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OStorage::getPropertySetInfo()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4706,11 +4546,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OStorage::getPropertySetInfo(
 }
 
 void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-        throw ( beans::UnknownPropertyException,
-                beans::PropertyVetoException,
-                lang::IllegalArgumentException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4813,9 +4648,6 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u
 }
 
 uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4919,9 +4751,6 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName )
 void SAL_CALL OStorage::addPropertyChangeListener(
     const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4937,9 +4766,6 @@ void SAL_CALL OStorage::addPropertyChangeListener(
 void SAL_CALL OStorage::removePropertyChangeListener(
     const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4955,9 +4781,6 @@ void SAL_CALL OStorage::removePropertyChangeListener(
 void SAL_CALL OStorage::addVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4973,9 +4796,6 @@ void SAL_CALL OStorage::addVetoableChangeListener(
 void SAL_CALL OStorage::removeVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4993,8 +4813,6 @@ void SAL_CALL OStorage::removeVetoableChangeListener(
 // TODO/LATER: the storage and stream implementations of this interface are very similar, they could use a helper class
 
 sal_Bool SAL_CALL OStorage::hasByID(  const OUString& sID )
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5022,9 +4840,6 @@ sal_Bool SAL_CALL OStorage::hasByID(  const OUString& sID )
 }
 
 OUString SAL_CALL OStorage::getTargetByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5046,9 +4861,6 @@ OUString SAL_CALL OStorage::getTargetByID(  const OUString& sID  )
 }
 
 OUString SAL_CALL OStorage::getTypeByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5070,9 +4882,6 @@ OUString SAL_CALL OStorage::getTypeByID(  const OUString& sID  )
 }
 
 uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5100,8 +4909,6 @@ uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID(  cons
 }
 
 uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getRelationshipsByType(  const OUString& sType  )
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5136,7 +4943,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getRelati
 }
 
 uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getAllRelationships()
-        throw (io::IOException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5174,9 +4980,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getAllRel
 }
 
 void SAL_CALL OStorage::insertRelationshipByID(  const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, sal_Bool bReplace  )
-        throw ( container::ElementExistException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5237,9 +5040,6 @@ void SAL_CALL OStorage::insertRelationshipByID(  const OUString& sID, const uno:
 }
 
 void SAL_CALL OStorage::removeRelationshipByID(  const OUString& sID  )
-        throw ( container::NoSuchElementException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5278,9 +5078,6 @@ void SAL_CALL OStorage::removeRelationshipByID(  const OUString& sID  )
 }
 
 void SAL_CALL OStorage::insertRelationships(  const uno::Sequence< uno::Sequence< beans::StringPair > >& aEntries, sal_Bool bReplace  )
-        throw ( container::ElementExistException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5360,8 +5157,6 @@ void SAL_CALL OStorage::insertRelationships(  const uno::Sequence< uno::Sequence
 }
 
 void SAL_CALL OStorage::clearRelationships()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5383,13 +5178,6 @@ void SAL_CALL OStorage::clearRelationships()
 void SAL_CALL OStorage::insertRawNonEncrStreamElementDirect(
             const OUString& /*sStreamName*/,
             const uno::Reference< io::XInputStream >& /*xInStream*/ )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoRawFormatException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     // not implemented currently because there is still no demand
     // might need to be implemented if direct copying of compressed streams is used
@@ -5400,12 +5188,6 @@ void SAL_CALL OStorage::insertStreamElementDirect(
             const OUString& aStreamName,
             const uno::Reference< io::XInputStream >& xInStream,
             const uno::Sequence< beans::PropertyValue >& aProps )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5488,13 +5270,6 @@ void SAL_CALL OStorage::copyElementDirectlyTo(
             const OUString& aElementName,
             const uno::Reference< embed::XOptimizedStorage >& xDest,
             const OUString& aNewName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5586,11 +5361,6 @@ void SAL_CALL OStorage::copyElementDirectlyTo(
 }
 
 void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStream >& xStream )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5655,11 +5425,6 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea
 
 void SAL_CALL OStorage::attachToURL( const OUString& sURL,
                                     sal_Bool bReadOnly )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5734,14 +5499,6 @@ void SAL_CALL OStorage::attachToURL( const OUString& sURL,
 }
 
 uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementName, const OUString& aPropertyName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                io::IOException,
-                beans::UnknownPropertyException,
-                beans::PropertyVetoException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5837,12 +5594,6 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementNam
 }
 
 void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, const uno::Reference< io::XStream >& xTargetStream )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5921,12 +5672,6 @@ void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, cons
 
 // XHierarchicalStorageAccess
 uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamElementByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -5985,24 +5730,11 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamEle
 }
 
 uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamElementByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode, const OUString& sPassword )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     return openEncryptedStreamByHierarchicalName( aStreamPath, nOpenMode, ::comphelper::OStorageHelper::CreatePackageEncryptionData( sPassword ) );
 }
 
 void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const OUString& aStreamPath )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -6030,14 +5762,6 @@ void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const OUString& a
 
 // XHierarchicalStorageAccess2
 uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                packages::WrongPasswordException,
-                container::NoSuchElementException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index a8a84ecdff60..6bb5bc65919b 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -222,7 +222,7 @@ struct OStorage_Impl
     void Revert();
 
     /// @throws css::packages::NoEncryptionException
-    ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( css::packages::NoEncryptionException );
+    ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData();
 
     void CopyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest,
                         bool bDirect );
@@ -260,15 +260,7 @@ struct OStorage_Impl
                     const OUString& aStreamName,
                     bool bPassProvided,
                     const ::comphelper::SequenceAsHashMap& aEncryptionData,
-                    css::uno::Reference< css::io::XStream >& xTargetStream )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::packages::NoEncryptionException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException );
+                    css::uno::Reference< css::io::XStream >& xTargetStream );
 
     void RemoveStreamRelInfo( const OUString& aOriginalName );
     void CreateRelStorage();
@@ -337,8 +329,7 @@ public:
 
     //  XInterface
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
     virtual void SAL_CALL acquire() throw() override;
 
@@ -346,466 +337,201 @@ public:
 
     //  XTypeProvider
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     //  XStorage
 
-    virtual void SAL_CALL copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) override;
 
     virtual css::uno::Reference< css::io::XStream > SAL_CALL openStreamElement(
-            const OUString& aStreamName, sal_Int32 nOpenMode )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStreamName, sal_Int32 nOpenMode ) override;
 
     virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStreamElement(
-            const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) override;
 
     virtual css::uno::Reference< css::embed::XStorage > SAL_CALL openStorageElement(
-            const OUString& aStorName, sal_Int32 nStorageMode )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStorName, sal_Int32 nStorageMode ) override;
 
     virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneStreamElement(
-            const OUString& aStreamName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStreamName ) override;
 
     virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStreamElement(
-            const OUString& aStreamName, const OUString& aPass )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStreamName, const OUString& aPass ) override;
 
     virtual void SAL_CALL copyLastCommitTo(
-            const css::uno::Reference< css::embed::XStorage >& xTargetStorage )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) override;
 
     virtual void SAL_CALL copyStorageElementLastCommitTo(
             const OUString& aStorName,
-            const css::uno::Reference< css::embed::XStorage >& xTargetStorage )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::IllegalArgumentException,
-                css::embed::InvalidStorageException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::IllegalArgumentException,
-                css::embed::InvalidStorageException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL removeElement( const OUString& aElementName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) override;
+
+    virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) override;
+
+    virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) override;
+
+    virtual void SAL_CALL removeElement( const OUString& aElementName ) override;
+
+    virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) override;
 
     virtual void SAL_CALL copyElementTo(    const OUString& aElementName,
                                         const css::uno::Reference< css::embed::XStorage >& xDest,
-                                        const OUString& aNewName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                                        const OUString& aNewName ) override;
 
     virtual void SAL_CALL moveElementTo(    const OUString& aElementName,
                                         const css::uno::Reference< css::embed::XStorage >& xDest,
-                                        const OUString& rNewName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                                        const OUString& rNewName ) override;
 
     //  XStorage2
 
-    virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStream( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStream( const OUString& sStreamName, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStream( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override;
+
+    virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStream( const OUString& sStreamName, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override;
 
     //  XStorageRawAccess
 
     virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getPlainRawStreamElement(
-            const OUString& sStreamName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& sStreamName ) override;
 
     virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getRawEncrStreamElement(
-            const OUString& sStreamName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& sStreamName ) override;
 
     virtual void SAL_CALL insertRawEncrStreamElement( const OUString& aStreamName,
-                                const css::uno::Reference< css::io::XInputStream >& xInStream )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoRawFormatException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Reference< css::io::XInputStream >& xInStream ) override;
 
     // XTransactedObject
-    virtual void SAL_CALL commit()
-        throw ( css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL commit() override;
 
-    virtual void SAL_CALL revert()
-        throw ( css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL revert() override;
 
     // XTransactionBroadcaster
     virtual void SAL_CALL addTransactionListener(
-            const css::uno::Reference< css::embed::XTransactionListener >& aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::embed::XTransactionListener >& aListener ) override;
 
     virtual void SAL_CALL removeTransactionListener(
-            const css::uno::Reference< css::embed::XTransactionListener >& aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::embed::XTransactionListener >& aListener ) override;
 
     //  XModifiable
 
-    virtual sal_Bool SAL_CALL isModified()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isModified() override;
 
-    virtual void SAL_CALL setModified( sal_Bool bModified )
-        throw ( css::beans::PropertyVetoException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override;
 
     virtual void SAL_CALL addModifyListener(
-            const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     virtual void SAL_CALL removeModifyListener(
-            const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     //  XNameAccess
 
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
-    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;
 
     //  XComponent
 
-    virtual void SAL_CALL dispose()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
     //  XEncryptionProtectedSource
 
-    virtual void SAL_CALL setEncryptionPassword( const OUString& aPass )
-        throw ( css::uno::RuntimeException,
-                css::io::IOException, std::exception ) override;
+    virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) override;
 
-    virtual void SAL_CALL removeEncryption()
-        throw ( css::uno::RuntimeException,
-                css::io::IOException, std::exception ) override;
+    virtual void SAL_CALL removeEncryption() override;
 
     //  XEncryptionProtectedSource2
 
     virtual void SAL_CALL setEncryptionData(
-            const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData )
-        throw ( css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override;
 
-    virtual sal_Bool SAL_CALL hasEncryptionData()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasEncryptionData() override;
 
     //  XEncryptionProtectedStorage
 
-    virtual void SAL_CALL setEncryptionAlgorithms( const css::uno::Sequence< css::beans::NamedValue >& aAlgorithms ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setEncryptionAlgorithms( const css::uno::Sequence< css::beans::NamedValue >& aAlgorithms ) override;
 
-    virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getEncryptionAlgorithms() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getEncryptionAlgorithms() override;
 
     //  XPropertySet
 
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
 
-    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
 
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
 
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //  XOptimizedStorage
-    virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoRawFormatException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL insertStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream, const css::uno::Sequence< css::beans::PropertyValue >& aProps )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL copyElementDirectlyTo( const OUString& sSourceName, const css::uno::Reference< css::embed::XOptimizedStorage >& xTargetStorage, const OUString& sTargetName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL writeAndAttachToStream( const css::uno::Reference< css::io::XStream >& xStream )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL attachToURL( const OUString& sURL, sal_Bool bReadOnly )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual css::uno::Any SAL_CALL getElementPropertyValue( const OUString& sElementName, const OUString& sPropertyName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL copyStreamElementData( const OUString& sStreamName, const css::uno::Reference< css::io::XStream >& xTargetStream )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream ) override;
+
+    virtual void SAL_CALL insertStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream, const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
+
+    virtual void SAL_CALL copyElementDirectlyTo( const OUString& sSourceName, const css::uno::Reference< css::embed::XOptimizedStorage >& xTargetStorage, const OUString& sTargetName ) override;
+
+    virtual void SAL_CALL writeAndAttachToStream( const css::uno::Reference< css::io::XStream >& xStream ) override;
+
+    virtual void SAL_CALL attachToURL( const OUString& sURL, sal_Bool bReadOnly ) override;
+
+    virtual css::uno::Any SAL_CALL getElementPropertyValue( const OUString& sElementName, const OUString& sPropertyName ) override;
+
+    virtual void SAL_CALL copyStreamElementData( const OUString& sStreamName, const css::uno::Reference< css::io::XStream >& xTargetStream ) override;
 
     // XRelationshipAccess
-    virtual sal_Bool SAL_CALL hasByID( const OUString& sID )
-        throw ( css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL getTargetByID( const OUString& sID )
-        throw ( css::container::NoSuchElementException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL getTypeByID( const OUString& sID )
-        throw ( css::container::NoSuchElementException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID )
-        throw ( css::container::NoSuchElementException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType )
-        throw ( css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships(  )
-        throw ( css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace )
-        throw ( css::container::ElementExistException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL removeRelationshipByID( const OUString& sID )
-        throw ( css::container::NoSuchElementException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace )
-        throw ( css::container::ElementExistException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL clearRelationships(  )
-        throw ( css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) override;
+
+    virtual OUString SAL_CALL getTargetByID( const OUString& sID ) override;
+
+    virtual OUString SAL_CALL getTypeByID( const OUString& sID ) override;
+
+    virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) override;
+
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) override;
+
+    virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships(  ) override;
+
+    virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) override;
+
+    virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) override;
+
+    virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) override;
+
+    virtual void SAL_CALL clearRelationships(  ) override;
 
     // XHierarchicalStorageAccess
-    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) override;
+
+    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) override;
+
+    virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) override;
 
     // XHierarchicalStorageAccess2
-    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override;
 };
 
 StorageHolder_Impl::StorageHolder_Impl( OStorage* pStorage )
diff --git a/package/source/zipapi/ByteChucker.cxx b/package/source/zipapi/ByteChucker.cxx
index 5fc449529b78..bc7443b68968 100644
--- a/package/source/zipapi/ByteChucker.cxx
+++ b/package/source/zipapi/ByteChucker.cxx
@@ -43,13 +43,11 @@ ByteChucker::~ByteChucker()
 }
 
 void ByteChucker::WriteBytes( const Sequence< sal_Int8 >& aData )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
 {
     xStream->writeBytes(aData);
 }
 
 sal_Int64 ByteChucker::GetPosition(  )
-        throw(IOException, RuntimeException)
 {
     return xSeek->getPosition();
 }
diff --git a/package/source/zipapi/ByteGrabber.cxx b/package/source/zipapi/ByteGrabber.cxx
index ba0dd42b7728..0818f1ecd09e 100644
--- a/package/source/zipapi/ByteGrabber.cxx
+++ b/package/source/zipapi/ByteGrabber.cxx
@@ -55,7 +55,6 @@ void ByteGrabber::setInputStream (const uno::Reference < io::XInputStream >& xNe
 // XInputStream chained
 sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData,
                                         sal_Int32 nBytesToRead )
-    throw(io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return xStream->readBytes(aData, nBytesToRead );
@@ -63,7 +62,6 @@ sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData,
 
 // XSeekable chained...
 void SAL_CALL ByteGrabber::seek( sal_Int64 location )
-    throw(lang::IllegalArgumentException, io::IOException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (xSeek.is() )
@@ -80,7 +78,6 @@ void SAL_CALL ByteGrabber::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL ByteGrabber::getPosition(  )
-        throw(io::IOException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (xSeek.is() )
@@ -90,7 +87,6 @@ sal_Int64 SAL_CALL ByteGrabber::getPosition(  )
 }
 
 sal_Int64 SAL_CALL ByteGrabber::getLength(  )
-        throw(io::IOException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (xSeek.is() )
diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx
index 39b4f4cccbdc..c121b220de0d 100644
--- a/package/source/zipapi/CRC32.cxx
+++ b/package/source/zipapi/CRC32.cxx
@@ -36,32 +36,27 @@ CRC32::~CRC32()
 {
 }
 void SAL_CALL CRC32::reset()
-    throw(RuntimeException)
 {
     nCRC=0;
 }
 sal_Int32 SAL_CALL CRC32::getValue()
-    throw(RuntimeException)
 {
     return nCRC & 0xFFFFFFFFL;
 }
 /** Update CRC32 with specified sequence of bytes
  */
 void SAL_CALL CRC32::updateSegment(const Sequence< sal_Int8 > &b, sal_Int32 len)
-        throw(RuntimeException)
 {
     nCRC = rtl_crc32(nCRC, b.getConstArray(), len );
 }
 /** Update CRC32 with specified sequence of bytes
  */
 void SAL_CALL CRC32::update(const Sequence< sal_Int8 > &b)
-        throw(RuntimeException)
 {
     nCRC = rtl_crc32(nCRC, b.getConstArray(),b.getLength());
 }
 
 sal_Int64 SAL_CALL CRC32::updateStream( Reference < XInputStream > & xStream )
-    throw ( RuntimeException )
 {
     sal_Int32 nLength;
     sal_Int64 nTotal = 0;
diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx
index 548f7f635896..c5436c2a34f0 100644
--- a/package/source/zipapi/MemoryByteGrabber.hxx
+++ b/package/source/zipapi/MemoryByteGrabber.hxx
@@ -46,7 +46,6 @@ public:
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
     void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException)
     {
         mnCurrent += nBytesToSkip;
     }
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index e04bfc1b40ba..527238d0a23f 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -151,7 +151,6 @@ XUnbufferedStream::~XUnbufferedStream()
 }
 
 sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( maMutexHolder->GetMutex() );
 
@@ -295,12 +294,10 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
 }
 
 sal_Int32 SAL_CALL XUnbufferedStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     return readBytes ( aData, nMaxBytesToRead );
 }
 void SAL_CALL XUnbufferedStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     if ( nBytesToSkip )
     {
@@ -310,13 +307,11 @@ void SAL_CALL XUnbufferedStream::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 sal_Int32 SAL_CALL XUnbufferedStream::available(  )
-        throw( NotConnectedException, IOException, RuntimeException, std::exception)
 {
     return static_cast < sal_Int32 > ( mnZipSize - mnMyCurrent );
 }
 
 void SAL_CALL XUnbufferedStream::closeInput(  )
-        throw( NotConnectedException, IOException, RuntimeException, std::exception)
 {
 }
 
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index a22124a5cd02..02fe87f598de 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -83,16 +83,11 @@ public:
     virtual ~XUnbufferedStream() override;
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 };
 #endif
 
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 76eea853f7c4..695caff3ee10 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -554,8 +554,7 @@ public:
             readAndCopy(nRemaining);
     }
 
-    virtual sal_Int32 SAL_CALL readBytes( uno::Sequence<sal_Int8>& rData, sal_Int32 nBytesToRead )
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL readBytes( uno::Sequence<sal_Int8>& rData, sal_Int32 nBytesToRead ) override
     {
         if (!hasBytes())
             return 0;
@@ -572,14 +571,12 @@ public:
         return nReadSize;
     }
 
-    virtual sal_Int32 SAL_CALL readSomeBytes( ::css::uno::Sequence<sal_Int8>& rData, sal_Int32 nMaxBytesToRead )
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL readSomeBytes( ::css::uno::Sequence<sal_Int8>& rData, sal_Int32 nMaxBytesToRead ) override
     {
         return readBytes(rData, nMaxBytesToRead);
     }
 
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override
     {
         if (!hasBytes())
             return;
@@ -587,8 +584,7 @@ public:
         mnPos += nBytesToSkip;
     }
 
-    virtual sal_Int32 SAL_CALL available()
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL available() override
     {
         if (!hasBytes())
             return 0;
@@ -596,8 +592,7 @@ public:
         return remainingSize();
     }
 
-    virtual void SAL_CALL closeInput()
-        throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override
+    virtual void SAL_CALL closeInput() override
     {
     }
 };
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index d0fce8951ed9..29dca80b6e92 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -76,13 +76,11 @@ void ZipOutputStream::addDeflatingThread( ZipOutputEntry *pEntry, comphelper::Th
 }
 
 void ZipOutputStream::rawWrite( const Sequence< sal_Int8 >& rBuffer )
-    throw(IOException, RuntimeException)
 {
     m_aChucker.WriteBytes( rBuffer );
 }
 
 void ZipOutputStream::rawCloseEntry( bool bEncrypt )
-    throw(IOException, RuntimeException)
 {
     assert(m_pCurrentEntry && "Forgot to call writeLOC()?");
     if ( m_pCurrentEntry->nMethod == DEFLATED && ( m_pCurrentEntry->nFlag & 8 ) )
@@ -164,7 +162,6 @@ void ZipOutputStream::reduceScheduledThreadsToGivenNumberOrLess(sal_Int32 nThrea
 }
 
 void ZipOutputStream::finish()
-    throw(IOException, RuntimeException, std::exception)
 {
     assert(!m_aZipList.empty() && "Zip file must have at least one entry!");
 
@@ -201,7 +198,6 @@ const css::uno::Reference< css::io::XOutputStream >& ZipOutputStream::getStream(
 }
 
 void ZipOutputStream::writeEND(sal_uInt32 nOffset, sal_uInt32 nLength)
-    throw(IOException, RuntimeException)
 {
     m_aChucker.WriteInt32( ENDSIG );
     m_aChucker.WriteInt16( 0 );
@@ -225,7 +221,6 @@ static sal_uInt32 getTruncated( sal_Int64 nNum, bool *pIsTruncated )
 }
 
 void ZipOutputStream::writeCEN( const ZipEntry &rEntry )
-    throw(IOException, RuntimeException)
 {
     if ( !::comphelper::OStorageHelper::IsValidZipEntryFileName( rEntry.sPath, true ) )
         throw IOException("Unexpected character is used in file name." );
@@ -265,7 +260,6 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry )
 }
 
 void ZipOutputStream::writeEXT( const ZipEntry &rEntry )
-    throw(IOException, RuntimeException)
 {
     bool bWrite64Header = false;
 
@@ -284,7 +278,6 @@ void ZipOutputStream::writeEXT( const ZipEntry &rEntry )
 }
 
 void ZipOutputStream::writeLOC( ZipEntry *pEntry, bool bEncrypt )
-    throw(IOException, RuntimeException)
 {
     assert(!m_pCurrentEntry && "Forgot to close an entry with rawCloseEntry()?");
     m_pCurrentEntry = pEntry;
diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/zipapi/blowfishcontext.cxx
index fd45712fce7e..f572692c0366 100644
--- a/package/source/zipapi/blowfishcontext.cxx
+++ b/package/source/zipapi/blowfishcontext.cxx
@@ -58,7 +58,6 @@ BlowfishCFB8CipherContext::~BlowfishCFB8CipherContext()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherContext( const uno::Sequence< ::sal_Int8 >& aData )
-    throw( lang::IllegalArgumentException, lang::DisposedException, uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_pCipher )
@@ -93,7 +92,6 @@ uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherC
 }
 
 uno::Sequence< ::sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::finalizeCipherContextAndDispose()
-    throw( lang::DisposedException, uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_pCipher )
diff --git a/package/source/zipapi/blowfishcontext.hxx b/package/source/zipapi/blowfishcontext.hxx
index 9f368a5cc117..11f44eed10ba 100644
--- a/package/source/zipapi/blowfishcontext.hxx
+++ b/package/source/zipapi/blowfishcontext.hxx
@@ -42,8 +42,8 @@ public:
     static css::uno::Reference< css::xml::crypto::XCipherContext >
         Create( const css::uno::Sequence< sal_Int8 >& aDerivedKey, const css::uno::Sequence< sal_Int8 >& aInitVector, bool bEncrypt );
 
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::IllegalArgumentException, css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose(  ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose(  ) override;
 };
 
 #endif // INCLUDED_PACKAGE_SOURCE_ZIPAPI_BLOWFISHCONTEXT_HXX
diff --git a/package/source/zipapi/sha1context.cxx b/package/source/zipapi/sha1context.cxx
index 58bda903a5ee..c7bc6312c669 100644
--- a/package/source/zipapi/sha1context.cxx
+++ b/package/source/zipapi/sha1context.cxx
@@ -45,7 +45,6 @@ SHA1DigestContext::~SHA1DigestContext()
 }
 
 void SAL_CALL SHA1DigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& aData )
-    throw( lang::DisposedException, uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_pDigest )
@@ -61,7 +60,6 @@ void SAL_CALL SHA1DigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >
 }
 
 uno::Sequence< ::sal_Int8 > SAL_CALL SHA1DigestContext::finalizeDigestAndDispose()
-    throw( lang::DisposedException, uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !m_pDigest )
diff --git a/package/source/zipapi/sha1context.hxx b/package/source/zipapi/sha1context.hxx
index 3be983d31913..ef9c433082d3 100644
--- a/package/source/zipapi/sha1context.hxx
+++ b/package/source/zipapi/sha1context.hxx
@@ -39,8 +39,8 @@ public:
 
     static css::uno::Reference< css::xml::crypto::XDigestContext > Create();
 
-    virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() override;
 
 };
 
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 83b3a82c37c1..a28507852493 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -110,35 +110,28 @@ class ActiveDataStreamer : public ::cppu::WeakImplHelper< XActiveDataStreamer >
     uno::Reference< XStream > mStream;
 public:
 
-    virtual uno::Reference< XStream > SAL_CALL getStream()
-            throw( RuntimeException, std::exception ) override
+    virtual uno::Reference< XStream > SAL_CALL getStream() override
             { return mStream; }
 
-    virtual void SAL_CALL setStream( const uno::Reference< XStream >& stream )
-            throw( RuntimeException, std::exception ) override
+    virtual void SAL_CALL setStream( const uno::Reference< XStream >& stream ) override
             { mStream = stream; }
 };
 
 class DummyInputStream : public ::cppu::WeakImplHelper< XInputStream >
 {
-    virtual sal_Int32 SAL_CALL readBytes( uno::Sequence< sal_Int8 >&, sal_Int32 )
-            throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+    virtual sal_Int32 SAL_CALL readBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) override
         { return 0; }
 
-    virtual sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< sal_Int8 >&, sal_Int32 )
-            throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+    virtual sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) override
         { return 0; }
 
-    virtual void SAL_CALL skipBytes( sal_Int32 )
-            throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+    virtual void SAL_CALL skipBytes( sal_Int32 ) override
         {}
 
-    virtual sal_Int32 SAL_CALL available()
-            throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+    virtual sal_Int32 SAL_CALL available() override
         { return 0; }
 
-    virtual void SAL_CALL closeInput()
-            throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override
+    virtual void SAL_CALL closeInput() override
         {}
 };
 
@@ -555,7 +548,6 @@ void ZipPackage::getZipFileContents()
 }
 
 void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
-        throw( Exception, RuntimeException, std::exception )
 {
     uno::Reference< XProgressHandler > xProgressHandler;
     beans::NamedValue aNamedValue;
@@ -771,7 +763,6 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments )
 }
 
 Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
-        throw( NoSuchElementException, RuntimeException, std::exception )
 {
     OUString sTemp, sDirName;
     sal_Int32 nOldIndex, nStreamIndex;
@@ -865,7 +856,6 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
 }
 
 sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName )
-        throw( RuntimeException, std::exception )
 {
     OUString sTemp, sDirName;
     sal_Int32 nOldIndex, nStreamIndex;
@@ -959,14 +949,12 @@ sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName )
 }
 
 uno::Reference< XInterface > SAL_CALL ZipPackage::createInstance()
-        throw( Exception, RuntimeException, std::exception )
 {
     uno::Reference < XInterface > xRef = *( new ZipPackageStream( *this, m_xContext, m_nFormat, m_bAllowRemoveOnInsert ) );
     return xRef;
 }
 
 uno::Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( const uno::Sequence< Any >& aArguments )
-        throw( Exception, RuntimeException, std::exception )
 {
     bool bArg = false;
     uno::Reference < XInterface > xRef;
@@ -1372,7 +1360,6 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
 }
 
 void SAL_CALL ZipPackage::commitChanges()
-        throw( WrappedTargetException, RuntimeException, std::exception )
 {
     // lock the component for the time of committing
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
@@ -1610,12 +1597,10 @@ const uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey()
 }
 
 sal_Bool SAL_CALL ZipPackage::hasPendingChanges()
-        throw( RuntimeException, std::exception )
 {
     return false;
 }
 Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges()
-        throw( RuntimeException, std::exception )
 {
     return uno::Sequence < ElementChange > ();
 }
@@ -1642,19 +1627,16 @@ Sequence< OUString > ZipPackage::static_getSupportedServiceNames()
 }
 
 OUString ZipPackage::getImplementationName()
-    throw ( RuntimeException, std::exception )
 {
     return static_getImplementationName();
 }
 
 Sequence< OUString > ZipPackage::getSupportedServiceNames()
-    throw ( RuntimeException, std::exception )
 {
     return static_getSupportedServiceNames();
 }
 
 sal_Bool SAL_CALL ZipPackage::supportsService( OUString const & rServiceName )
-    throw ( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
@@ -1670,14 +1652,12 @@ uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno::
 namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
 
 Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId()
-    throw ( RuntimeException )
 {
     ::cppu::OImplementationId &rId = lcl_ImplId::get();
     return rId.getImplementationId();
 }
 
 sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier )
-    throw( RuntimeException, std::exception )
 {
     if ( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelImplementationId().getConstArray(),  aIdentifier.getConstArray(), 16 ) )
         return reinterpret_cast < sal_Int64 > ( this );
@@ -1685,13 +1665,11 @@ sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aI
 }
 
 uno::Reference< XPropertySetInfo > SAL_CALL ZipPackage::getPropertySetInfo()
-        throw( RuntimeException, std::exception )
 {
     return uno::Reference < XPropertySetInfo > ();
 }
 
 void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
-        throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
 {
     if ( m_nFormat != embed::StorageFormats::PACKAGE )
         throw UnknownPropertyException(THROW_WHERE );
@@ -1787,7 +1765,6 @@ void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const
 }
 
 Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     // TODO/LATER: Activate the check when zip-ucp is ready
     // if ( m_nFormat != embed::StorageFormats::PACKAGE )
@@ -1828,19 +1805,15 @@ Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName )
     throw UnknownPropertyException(THROW_WHERE );
 }
 void SAL_CALL ZipPackage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
 }
 void SAL_CALL ZipPackage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*aListener*/ )
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
 }
 void SAL_CALL ZipPackage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
 }
 void SAL_CALL ZipPackage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
 }
 
diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx
index 904c3957a916..cb5f80c1c052 100644
--- a/package/source/zippackage/ZipPackageBuffer.cxx
+++ b/package/source/zippackage/ZipPackageBuffer.cxx
@@ -44,7 +44,6 @@ ZipPackageBuffer::~ZipPackageBuffer()
 }
 
 sal_Int32 SAL_CALL ZipPackageBuffer::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     if (nBytesToRead < 0)
         throw BufferSizeExceededException(THROW_WHERE, *this );
@@ -59,12 +58,10 @@ sal_Int32 SAL_CALL ZipPackageBuffer::readBytes( Sequence< sal_Int8 >& aData, sal
 }
 
 sal_Int32 SAL_CALL ZipPackageBuffer::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     return readBytes(aData, nMaxBytesToRead);
 }
 void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     if (nBytesToSkip < 0)
         throw BufferSizeExceededException(THROW_WHERE, *this );
@@ -75,16 +72,13 @@ void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip )
     m_nCurrent+=nBytesToSkip;
 }
 sal_Int32 SAL_CALL ZipPackageBuffer::available(  )
-        throw(NotConnectedException, IOException, RuntimeException, std::exception)
 {
     return static_cast < sal_Int32 > (m_nEnd - m_nCurrent);
 }
 void SAL_CALL ZipPackageBuffer::closeInput(  )
-        throw(NotConnectedException, IOException, RuntimeException, std::exception)
 {
 }
 void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     sal_Int64 nDataLen = aData.getLength(), nCombined = m_nEnd + nDataLen;
 
@@ -107,27 +101,22 @@ void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData )
         m_nEnd = m_nCurrent;
 }
 void SAL_CALL ZipPackageBuffer::flush(  )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
 }
 void SAL_CALL ZipPackageBuffer::closeOutput(  )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
 }
 void SAL_CALL ZipPackageBuffer::seek( sal_Int64 location )
-        throw( IllegalArgumentException, IOException, RuntimeException, std::exception)
 {
     if ( location > m_nEnd || location < 0 )
         throw IllegalArgumentException(THROW_WHERE, uno::Reference< uno::XInterface >(), 1 );
     m_nCurrent = location;
 }
 sal_Int64 SAL_CALL ZipPackageBuffer::getPosition(  )
-        throw(IOException, RuntimeException, std::exception)
 {
     return m_nCurrent;
 }
 sal_Int64 SAL_CALL ZipPackageBuffer::getLength(  )
-        throw(IOException, RuntimeException, std::exception)
 {
     return m_nEnd;
 }
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index 327292f8b894..727add5b07a3 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -56,12 +56,10 @@ ZipPackageEntry::~ZipPackageEntry()
 
 // XChild
 OUString SAL_CALL ZipPackageEntry::getName(  )
-    throw(RuntimeException, std::exception)
 {
     return msName;
 }
 void SAL_CALL ZipPackageEntry::setName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     if ( mpParent && !msName.isEmpty() && mpParent->hasByName ( msName ) )
         mpParent->removeByName ( msName );
@@ -77,7 +75,6 @@ void SAL_CALL ZipPackageEntry::setName( const OUString& aName )
         mpParent->doInsertByName ( this, false );
 }
 uno::Reference< XInterface > SAL_CALL ZipPackageEntry::getParent(  )
-        throw(RuntimeException, std::exception)
 {
     // return uno::Reference< XInterface >( xParent, UNO_QUERY );
     return uno::Reference< XInterface >( static_cast< ::cppu::OWeakObject* >( mpParent ), UNO_QUERY );
@@ -92,7 +89,6 @@ void ZipPackageEntry::doSetParent ( ZipPackageFolder * pNewParent )
 }
 
 void SAL_CALL ZipPackageEntry::setParent( const uno::Reference< XInterface >& xNewParent )
-        throw(NoSupportException, RuntimeException, std::exception)
 {
     sal_Int64 nTest(0);
     uno::Reference < XUnoTunnel > xTunnel ( xNewParent, UNO_QUERY );
@@ -110,24 +106,19 @@ void SAL_CALL ZipPackageEntry::setParent( const uno::Reference< XInterface >& xN
 }
     //XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL ZipPackageEntry::getPropertySetInfo(  )
-        throw(RuntimeException, std::exception)
 {
     return uno::Reference < beans::XPropertySetInfo > ();
 }
 void SAL_CALL ZipPackageEntry::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-        throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 void SAL_CALL ZipPackageEntry::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
-        throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 void SAL_CALL ZipPackageEntry::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 void SAL_CALL ZipPackageEntry::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 22d18ce42839..8bf0a8885d82 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -181,7 +181,6 @@ css::uno::Sequence < sal_Int8 > ZipPackageFolder::static_getImplementationId()
 
     // XNameContainer
 void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const uno::Any& aElement )
-        throw(IllegalArgumentException, ElementExistException, WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if (hasByName(aName))
         throw ElementExistException(THROW_WHERE );
@@ -215,7 +214,6 @@ void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const uno::
     }
 }
 void SAL_CALL ZipPackageFolder::removeByName( const OUString& Name )
-        throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ContentHash::iterator aIter = maContents.find ( Name );
     if ( aIter == maContents.end() )
@@ -224,18 +222,15 @@ void SAL_CALL ZipPackageFolder::removeByName( const OUString& Name )
 }
     // XEnumerationAccess
 uno::Reference< XEnumeration > SAL_CALL ZipPackageFolder::createEnumeration(  )
-        throw(uno::RuntimeException, std::exception)
 {
     return uno::Reference < XEnumeration> (new ZipPackageFolderEnumeration(maContents));
 }
     // XElementAccess
 uno::Type SAL_CALL ZipPackageFolder::getElementType(  )
-        throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<XUnoTunnel>::get();
 }
 sal_Bool SAL_CALL ZipPackageFolder::hasElements(  )
-        throw(uno::RuntimeException, std::exception)
 {
     return maContents.size() > 0;
 }
@@ -249,12 +244,10 @@ ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName )
 }
 
 uno::Any SAL_CALL ZipPackageFolder::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception)
 {
     return uno::makeAny ( doGetByName ( aName ).xTunnel );
 }
 uno::Sequence< OUString > SAL_CALL ZipPackageFolder::getElementNames(  )
-        throw(uno::RuntimeException, std::exception)
 {
     sal_uInt32 i=0, nSize = maContents.size();
     uno::Sequence < OUString > aSequence ( nSize );
@@ -265,13 +258,11 @@ uno::Sequence< OUString > SAL_CALL ZipPackageFolder::getElementNames(  )
     return aSequence;
 }
 sal_Bool SAL_CALL ZipPackageFolder::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     return maContents.find ( aName ) != maContents.end ();
 }
     // XNameReplace
 void SAL_CALL ZipPackageFolder::replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if ( hasByName( aName ) )
         removeByName( aName );
@@ -323,7 +314,6 @@ void ZipPackageFolder::saveContents(
         ZipOutputStream & rZipOut,
         const uno::Sequence < sal_Int8 >& rEncryptionKey,
         const rtlRandomPool &rRandomPool ) const
-    throw( uno::RuntimeException )
 {
     bool bWritingFailed = false;
 
@@ -393,7 +383,6 @@ void ZipPackageFolder::saveContents(
 }
 
 sal_Int64 SAL_CALL ZipPackageFolder::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier )
-    throw(uno::RuntimeException, std::exception)
 {
     sal_Int64 nMe = 0;
     if ( aIdentifier.getLength() == 16 &&
@@ -402,7 +391,6 @@ sal_Int64 SAL_CALL ZipPackageFolder::getSomething( const uno::Sequence< sal_Int8
     return nMe;
 }
 void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-        throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if ( aPropertyName == "MediaType" )
     {
@@ -420,7 +408,6 @@ void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName,
         throw UnknownPropertyException(THROW_WHERE );
 }
 uno::Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyName )
-        throw(UnknownPropertyException, WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if ( PropertyName == "MediaType" )
     {
@@ -439,7 +426,6 @@ uno::Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyNa
 }
 
 void ZipPackageFolder::doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent )
-        throw(IllegalArgumentException, ElementExistException, WrappedTargetException, uno::RuntimeException)
 {
     try
     {
@@ -457,20 +443,17 @@ void ZipPackageFolder::doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent
         pEntry->setParent ( *this );
 }
 OUString ZipPackageFolder::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("ZipPackageFolder");
 }
 
 uno::Sequence< OUString > ZipPackageFolder::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aNames { "com.sun.star.packages.PackageFolder" };
     return aNames;
 }
 
 sal_Bool SAL_CALL ZipPackageFolder::supportsService( OUString const & rServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
index a759793dbaa2..adcbb9296dd5 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
@@ -40,12 +40,10 @@ ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration()
 }
 
 sal_Bool SAL_CALL ZipPackageFolderEnumeration::hasMoreElements(  )
-        throw(uno::RuntimeException, std::exception)
 {
     return (aIterator != rContents.end() );
 }
 uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement(  )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
     if (aIterator == rContents.end() )
@@ -56,20 +54,17 @@ uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement(  )
 }
 
 OUString ZipPackageFolderEnumeration::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString ("ZipPackageFolderEnumeration");
 }
 
 uno::Sequence< OUString > ZipPackageFolderEnumeration::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aNames { "com.sun.star.packages.PackageFolderEnumeration" };
     return aNames;
 }
 
 sal_Bool SAL_CALL ZipPackageFolderEnumeration::supportsService( OUString const & rServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
index 6befe8c6f18f..d4f8b8b1cdba 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx
@@ -39,18 +39,13 @@ public:
     virtual ~ZipPackageFolderEnumeration() override;
 
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement(  )
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+    virtual css::uno::Any SAL_CALL nextElement(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 };
 #endif
diff --git a/package/source/zippackage/ZipPackageSink.cxx b/package/source/zippackage/ZipPackageSink.cxx
index b3db349c59a7..6725c8aa2802 100644
--- a/package/source/zippackage/ZipPackageSink.cxx
+++ b/package/source/zippackage/ZipPackageSink.cxx
@@ -27,12 +27,10 @@ ZipPackageSink::~ZipPackageSink()
 {
 }
 void SAL_CALL ZipPackageSink::setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream )
-    throw(css::uno::RuntimeException, std::exception)
 {
     xStream = aStream;
 }
 css::uno::Reference< css::io::XInputStream > SAL_CALL ZipPackageSink::getInputStream(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return xStream;
 }
diff --git a/package/source/zippackage/ZipPackageSink.hxx b/package/source/zippackage/ZipPackageSink.hxx
index 6ece3eb528f7..e7e4cdbef192 100644
--- a/package/source/zippackage/ZipPackageSink.hxx
+++ b/package/source/zippackage/ZipPackageSink.hxx
@@ -29,10 +29,8 @@ protected:
 public:
     ZipPackageSink();
     virtual ~ZipPackageSink() override;
-    virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) override;
 };
 #endif
 
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 2222f7b1f166..971263859fd5 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -935,7 +935,6 @@ void ZipPackageStream::SetPackageMember( bool bNewValue )
 
 // XActiveDataSink
 void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInputStream >& aStream )
-        throw( RuntimeException, std::exception )
 {
     // if seekable access is required the wrapping will be done on demand
     m_xStream = aStream;
@@ -947,7 +946,6 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput
 }
 
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
-        throw( RuntimeException )
 {
     try
     {
@@ -975,7 +973,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
 }
 
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream()
-        throw( RuntimeException, std::exception )
 {
     try
     {
@@ -1006,9 +1003,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream()
 
 // XDataSinkEncrSupport
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream()
-        throw ( packages::WrongPasswordException, ZipException,
-                io::IOException,
-                RuntimeException, std::exception )
 {
     // There is no stream attached to this object
     if ( m_nStreamMode == PACKAGE_STREAM_NOTSET )
@@ -1073,9 +1067,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream()
 }
 
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream()
-        throw ( packages::NoEncryptionException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     // There is no stream attached to this object
     if ( m_nStreamMode == PACKAGE_STREAM_NOTSET )
@@ -1106,18 +1097,12 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream()
 }
 
 void SAL_CALL ZipPackageStream::setDataStream( const uno::Reference< io::XInputStream >& aStream )
-        throw ( io::IOException,
-                RuntimeException, std::exception )
 {
     setInputStream( aStream );
     m_nStreamMode = PACKAGE_STREAM_DATA;
 }
 
 void SAL_CALL ZipPackageStream::setRawStream( const uno::Reference< io::XInputStream >& aStream )
-        throw ( packages::EncryptionNotAllowedException,
-                packages::NoRawFormatException,
-                io::IOException,
-                RuntimeException, std::exception )
 {
     // wrap the stream in case it is not seekable
     uno::Reference< io::XInputStream > xNewStream = ::comphelper::OSeekableInputWrapper::CheckSeekableCanWrap( aStream, m_xContext );
@@ -1143,8 +1128,6 @@ void SAL_CALL ZipPackageStream::setRawStream( const uno::Reference< io::XInputSt
 }
 
 uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getPlainRawStream()
-        throw ( io::IOException, packages::NoEncryptionException,
-                uno::RuntimeException, std::exception )
 {
     // There is no stream attached to this object
     if ( m_nStreamMode == PACKAGE_STREAM_NOTSET )
@@ -1175,7 +1158,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getPlainRawStream(
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ZipPackageStream::getSomething( const Sequence< sal_Int8 >& aIdentifier )
-    throw( RuntimeException, std::exception )
 {
     sal_Int64 nMe = 0;
     if ( aIdentifier.getLength() == 16 &&
@@ -1186,7 +1168,6 @@ sal_Int64 SAL_CALL ZipPackageStream::getSomething( const Sequence< sal_Int8 >& a
 
 // XPropertySet
 void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
-        throw( beans::UnknownPropertyException, beans::PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
 {
     if ( aPropertyName == "MediaType" )
     {
@@ -1344,7 +1325,6 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName,
 }
 
 Any SAL_CALL ZipPackageStream::getPropertyValue( const OUString& PropertyName )
-        throw( beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     if ( PropertyName == "MediaType" )
     {
@@ -1385,20 +1365,17 @@ void ZipPackageStream::setSize ( const sal_Int64 nNewSize )
     aEntry.nSize = nNewSize;
 }
 OUString ZipPackageStream::getImplementationName()
-    throw ( RuntimeException, std::exception )
 {
     return OUString ("ZipPackageStream");
 }
 
 Sequence< OUString > ZipPackageStream::getSupportedServiceNames()
-    throw ( RuntimeException, std::exception )
 {
     Sequence<OUString> aNames { "com.sun.star.packages.PackageStream" };
     return aNames;
 }
 
 sal_Bool SAL_CALL ZipPackageStream::supportsService( OUString const & rServiceName )
-    throw ( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
diff --git a/package/source/zippackage/wrapstreamforshare.cxx b/package/source/zippackage/wrapstreamforshare.cxx
index f97c213b4709..2065454c78c7 100644
--- a/package/source/zippackage/wrapstreamforshare.cxx
+++ b/package/source/zippackage/wrapstreamforshare.cxx
@@ -49,10 +49,6 @@ WrapStreamForShare::~WrapStreamForShare()
 
 // XInputStream
 sal_Int32 SAL_CALL WrapStreamForShare::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     if ( !m_xInStream.is() )
         throw io::IOException(THROW_WHERE );
@@ -66,10 +62,6 @@ sal_Int32 SAL_CALL WrapStreamForShare::readBytes( uno::Sequence< sal_Int8 >& aDa
 }
 
 sal_Int32 SAL_CALL WrapStreamForShare::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     if ( !m_xInStream.is() )
         throw io::IOException(THROW_WHERE );
@@ -83,10 +75,6 @@ sal_Int32 SAL_CALL WrapStreamForShare::readSomeBytes( uno::Sequence< sal_Int8 >&
 }
 
 void SAL_CALL WrapStreamForShare::skipBytes( sal_Int32 nBytesToSkip )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -100,9 +88,6 @@ void SAL_CALL WrapStreamForShare::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 sal_Int32 SAL_CALL WrapStreamForShare::available()
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -113,9 +98,6 @@ sal_Int32 SAL_CALL WrapStreamForShare::available()
 }
 
 void SAL_CALL WrapStreamForShare::closeInput()
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -130,9 +112,6 @@ void SAL_CALL WrapStreamForShare::closeInput()
 
 // XSeekable
 void SAL_CALL WrapStreamForShare::seek( sal_Int64 location )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -146,8 +125,6 @@ void SAL_CALL WrapStreamForShare::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL WrapStreamForShare::getPosition()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -158,8 +135,6 @@ sal_Int64 SAL_CALL WrapStreamForShare::getPosition()
 }
 
 sal_Int64 SAL_CALL WrapStreamForShare::getLength()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
diff --git a/package/source/zippackage/wrapstreamforshare.hxx b/package/source/zippackage/wrapstreamforshare.hxx
index 8fc51001755e..d96c6ffeb696 100644
--- a/package/source/zippackage/wrapstreamforshare.hxx
+++ b/package/source/zippackage/wrapstreamforshare.hxx
@@ -42,21 +42,16 @@ public:
     virtual ~WrapStreamForShare() override;
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 
     //XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
 };
 
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index b6875eee9e23..f7c40f29a012 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -164,8 +164,6 @@ bool OZipFileAccess::StringGoodForPattern_Impl( const OUString& aString,
 
 // XInitialization
 void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArguments )
-    throw ( uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -258,9 +256,6 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu
 
 // XNameAccess
 uno::Any SAL_CALL OZipFileAccess::getByName( const OUString& aName )
-    throw ( container::NoSuchElementException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -308,7 +303,6 @@ uno::Any SAL_CALL OZipFileAccess::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -342,7 +336,6 @@ uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames()
 }
 
 sal_Bool SAL_CALL OZipFileAccess::hasByName( const OUString& aName )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -358,7 +351,6 @@ sal_Bool SAL_CALL OZipFileAccess::hasByName( const OUString& aName )
 }
 
 uno::Type SAL_CALL OZipFileAccess::getElementType()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -372,7 +364,6 @@ uno::Type SAL_CALL OZipFileAccess::getElementType()
 }
 
 sal_Bool SAL_CALL OZipFileAccess::hasElements()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -387,9 +378,6 @@ sal_Bool SAL_CALL OZipFileAccess::hasElements()
 
 // XZipFileAccess
 uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( const OUString& aPatternString )
-    throw ( container::NoSuchElementException,
-            io::IOException, packages::WrongPasswordException, packages::zip::ZipException,
-            uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -422,7 +410,6 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern(
 
 // XComponent
 void SAL_CALL OZipFileAccess::dispose()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -449,7 +436,6 @@ void SAL_CALL OZipFileAccess::dispose()
 }
 
 void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -462,7 +448,6 @@ void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEve
 }
 
 void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
 
@@ -493,19 +478,16 @@ uno::Reference< uno::XInterface > SAL_CALL OZipFileAccess::impl_staticCreateSelf
 }
 
 OUString SAL_CALL OZipFileAccess::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetImplementationName();
 }
 
 sal_Bool SAL_CALL OZipFileAccess::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OZipFileAccess::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetSupportedServiceNames();
 }
diff --git a/pyuno/inc/pyuno.hxx b/pyuno/inc/pyuno.hxx
index 84e97646121a..f09cbd051089 100644
--- a/pyuno/inc/pyuno.hxx
+++ b/pyuno/inc/pyuno.hxx
@@ -193,7 +193,7 @@ public:
         @throw RuntimeException in case the runtime has not been
                initialized before
      */
-    Runtime() throw( css::uno::RuntimeException );
+    Runtime();
 
     Runtime( const Runtime & );
     Runtime & operator = ( const Runtime & );
@@ -211,14 +211,13 @@ public:
                                 has not been initialized.
     */
     static void SAL_CALL initialize(
-        const css::uno::Reference< css::uno::XComponentContext > & ctx )
-        throw ( css::uno::RuntimeException, std::exception );
+        const css::uno::Reference< css::uno::XComponentContext > & ctx );
 
     /** Checks, whether the uno runtime is already initialized in the current python interpreter.
 
         @throws css::uno::RuntimeException
      */
-    static bool SAL_CALL isInitialized() throw (css::uno::RuntimeException);
+    static bool SAL_CALL isInitialized();
 
     /** converts something contained in an UNO Any to a Python object
 
@@ -230,10 +229,7 @@ public:
         @throws css::lang::IllegalArgumentException
         @throws css::uno::RuntimeException
     */
-    PyRef any2PyObject (const css::uno::Any &source ) const
-        throw ( css::script::CannotConvertException,
-                css::lang::IllegalArgumentException,
-                css::uno::RuntimeException );
+    PyRef any2PyObject (const css::uno::Any &source ) const;
 
     /** converts a Python object to a UNO any
 
@@ -244,8 +240,7 @@ public:
         @throws css::uno::RuntimeException
     */
     css::uno::Any pyObject2Any (
-        const PyRef & source , enum ConversionMode mode = REJECT_UNO_ANY ) const
-        throw ( css::uno::RuntimeException);
+        const PyRef & source , enum ConversionMode mode = REJECT_UNO_ANY ) const;
 
     /** extracts a proper uno exception from a given python exception
      */
@@ -297,7 +292,7 @@ public:
         @throws css::uno::RuntimeException
              in case no pythread state could be created
      */
-    PyThreadAttach( PyInterpreterState *interp) throw ( css::uno::RuntimeException );
+    PyThreadAttach( PyInterpreterState *interp);
 
 
     /** Releases the global interpreter lock and destroys the thread state.
@@ -324,7 +319,7 @@ public:
 
        @throws css::uno::RuntimeException
     */
-    PyThreadDetach() throw ( css::uno::RuntimeException );
+    PyThreadDetach();
     /** Acquires the global interpreter lock again
     */
     ~PyThreadDetach();
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index f37e2c45fce3..01878630353d 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -64,7 +64,7 @@ namespace pyuno_loader
 {
 
 /// @throws RuntimeException
-static void raiseRuntimeExceptionWhenNeeded() throw ( RuntimeException )
+static void raiseRuntimeExceptionWhenNeeded()
 {
     if( PyErr_Occurred() )
     {
@@ -81,7 +81,7 @@ static void raiseRuntimeExceptionWhenNeeded() throw ( RuntimeException )
 }
 
 /// @throws RuntimeException
-static PyRef getLoaderModule() throw( RuntimeException )
+static PyRef getLoaderModule()
 {
     PyRef module(
         PyImport_ImportModule( "pythonloader" ),
@@ -96,7 +96,6 @@ static PyRef getLoaderModule() throw( RuntimeException )
 
 /// @throws RuntimeException
 static PyRef getObjectFromLoaderModule( const char * func )
-    throw ( RuntimeException )
 {
     PyRef object( PyDict_GetItemString(getLoaderModule().get(), func ) );
     if( !object.is() )
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index f43d2785797e..65a317b39e7e 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -70,7 +70,7 @@ Sequence<sal_Int8> Adapter::getUnoTunnelImplementationId()
     return g_id.getImplementationId();
 }
 
-sal_Int64 Adapter::getSomething( const Sequence< sal_Int8 > &id) throw (RuntimeException, std::exception)
+sal_Int64 Adapter::getSomething( const Sequence< sal_Int8 > &id)
 {
     if( id == g_id.getImplementationId() )
         return reinterpret_cast<sal_Int64>(this);
@@ -78,7 +78,6 @@ sal_Int64 Adapter::getSomething( const Sequence< sal_Int8 > &id) throw (RuntimeE
 }
 
 void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime )
-    throw ( InvocationTargetException, RuntimeException )
 {
     if( !Py_IsInitialized() )
         throw InvocationTargetException();
@@ -95,7 +94,6 @@ void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime )
 }
 
 Reference< XIntrospectionAccess > Adapter::getIntrospection()
-    throw ( RuntimeException, std::exception )
 {
     // not supported
     return Reference< XIntrospectionAccess > ();
@@ -179,7 +177,6 @@ Any Adapter::invoke( const OUString &aFunctionName,
                      const Sequence< Any >& aParams,
                      Sequence< sal_Int16 > &aOutParamIndex,
                      Sequence< Any > &aOutParam)
-    throw (IllegalArgumentException,CannotConvertException,InvocationTargetException,RuntimeException, std::exception)
 {
     Any ret;
 
@@ -354,7 +351,6 @@ Any Adapter::invoke( const OUString &aFunctionName,
 }
 
 void Adapter::setValue( const OUString & aPropertyName, const Any & value )
-    throw( UnknownPropertyException, CannotConvertException, InvocationTargetException,RuntimeException, std::exception)
 {
     if( !hasProperty( aPropertyName ) )
     {
@@ -389,7 +385,6 @@ void Adapter::setValue( const OUString & aPropertyName, const Any & value )
 }
 
 Any Adapter::getValue( const OUString & aPropertyName )
-    throw ( UnknownPropertyException, RuntimeException, std::exception )
 {
     Any ret;
     PyThreadAttach guard( mInterpreter );
@@ -416,13 +411,11 @@ Any Adapter::getValue( const OUString & aPropertyName )
 }
 
 sal_Bool Adapter::hasMethod( const OUString & aMethodName )
-    throw ( RuntimeException, std::exception )
 {
     return hasProperty( aMethodName );
 }
 
 sal_Bool Adapter::hasProperty( const OUString & aPropertyName )
-    throw ( RuntimeException, std::exception )
 {
     bool bRet = false;
     PyThreadAttach guard( mInterpreter );
diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx
index a0673696f00f..643f3aaacd7c 100644
--- a/pyuno/source/module/pyuno_except.cxx
+++ b/pyuno/source/module/pyuno_except.cxx
@@ -76,7 +76,6 @@ void raisePyExceptionWithAny( const css::uno::Any &anyExc )
 
 /// @throws RuntimeException
 static PyRef createClass( const OUString & name, const Runtime &runtime )
-    throw ( RuntimeException )
 {
     // assuming that this is never deleted !
     // note I don't have the knowledge how to initialize these type objects correctly !
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index f38c69aaceca..3f87ad7a9309 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -262,8 +262,7 @@ OUString pyString2ustring( PyObject *str );
 
 /// @throws css::reflection::InvocationTargetException
 /// @throws css::uno::RuntimeException
-void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime )
-    throw (css::reflection::InvocationTargetException, css::uno::RuntimeException);
+void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime );
 
 PyRef PyUNO_callable_new (
     const css::uno::Reference<css::script::XInvocation2> &xInv,
@@ -286,21 +285,17 @@ PyRef getAnyClass( const Runtime &);
 PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args );
 
 /// @throws css::uno::RuntimeException
-css::uno::Any PyEnum2Enum( PyObject *obj )
-    throw ( css::uno::RuntimeException );
+css::uno::Any PyEnum2Enum( PyObject *obj );
 /// @throws css::uno::RuntimeException
-sal_Unicode PyChar2Unicode( PyObject *o )
-    throw ( css::uno::RuntimeException );
+sal_Unicode PyChar2Unicode( PyObject *o );
 /// @throws css::uno::RuntimeException
-css::uno::Type PyType2Type( PyObject * o )
-    throw( css::uno::RuntimeException );
+css::uno::Type PyType2Type( PyObject * o );
 
 void raisePyExceptionWithAny( const css::uno::Any &a );
 const char *typeClassToString( css::uno::TypeClass t );
 
 /// @throws css::uno::RuntimeException
-PyRef getObjectFromUnoModule( const Runtime &runtime, const char * object )
-    throw ( css::uno::RuntimeException );
+PyRef getObjectFromUnoModule( const Runtime &runtime, const char * object );
 
 bool isInterfaceClass( const Runtime &, PyObject *obj );
 bool isInstanceOfStructOrException( PyObject *obj);
@@ -335,8 +330,7 @@ public:
 
     /// @throws css::uno::RuntimeException
     static PyRef create(
-        const css::uno::Reference< css::uno::XComponentContext > & xContext )
-        throw ( css::uno::RuntimeException, std::exception );
+        const css::uno::Reference< css::uno::XComponentContext > & xContext );
 };
 
 
@@ -363,37 +357,24 @@ public:
 
     // XInvocation
     virtual css::uno::Reference< css::beans::XIntrospectionAccess >
-           SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException, std::exception) override;
+           SAL_CALL getIntrospection(  ) override;
     virtual css::uno::Any SAL_CALL invoke(
         const OUString& aFunctionName,
         const css::uno::Sequence< css::uno::Any >& aParams,
         css::uno::Sequence< sal_Int16 >& aOutParamIndex,
-        css::uno::Sequence< css::uno::Any >& aOutParam )
-        throw (css::lang::IllegalArgumentException,
-               css::script::CannotConvertException,
-               css::reflection::InvocationTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< css::uno::Any >& aOutParam ) override;
 
     virtual void SAL_CALL setValue(
         const OUString& aPropertyName,
-        const css::uno::Any& aValue )
-        throw (css::beans::UnknownPropertyException,
-               css::script::CannotConvertException,
-               css::reflection::InvocationTargetException,
-               css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& aValue ) override;
+
+    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override;
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-        const css::uno::Sequence< sal_Int8 >& aIdentifier )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 };
 
 
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 094c7f1ed848..83888802d0ee 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -144,7 +144,7 @@ void fillStruct(
     PyObject *initializer,
     PyObject *kwinitializer,
     fillStructState &state,
-    const Runtime &runtime) throw ( RuntimeException )
+    const Runtime &runtime)
 {
     if( pCompType->pBaseTypeDescription )
         fillStruct( inv, pCompType->pBaseTypeDescription, initializer, kwinitializer, state, runtime );
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index e77376f6aaac..b14cbde39a57 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -130,7 +130,6 @@ static PyTypeObject RuntimeImpl_Type =
  -----------------------------------------------------------------------*/
 /// @throws css::uno::RuntimeException
 static void getRuntimeImpl( PyRef & globalDict, PyRef &runtimeImpl )
-    throw ( css::uno::RuntimeException )
 {
     PyThreadState * state = PyThreadState_Get();
     if( ! state )
@@ -155,7 +154,7 @@ static void getRuntimeImpl( PyRef & globalDict, PyRef &runtimeImpl )
 }
 
 /// @throws RuntimeException
-static PyRef importUnoModule( ) throw ( RuntimeException )
+static PyRef importUnoModule( )
 {
     // import the uno module
     PyRef module( PyImport_ImportModule( "uno" ), SAL_NO_ACQUIRE, NOT_NULL );
@@ -251,7 +250,6 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile )
  RuntimeImpl implementations
  *-------------------------------------------------------------------*/
 PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx )
-    throw( css::uno::RuntimeException, std::exception )
 {
     RuntimeImpl *me = PyObject_New (RuntimeImpl, &RuntimeImpl_Type);
     if( ! me )
@@ -303,7 +301,6 @@ void  stRuntimeImpl::del(PyObject* self)
 
 
 void Runtime::initialize( const Reference< XComponentContext > & ctx )
-    throw ( RuntimeException, std::exception )
 {
     PyRef globalDict, runtime;
     getRuntimeImpl( globalDict , runtime );
@@ -319,7 +316,7 @@ void Runtime::initialize( const Reference< XComponentContext > & ctx )
 }
 
 
-bool Runtime::isInitialized() throw ( RuntimeException )
+bool Runtime::isInitialized()
 {
     PyRef globalDict, runtime;
     getRuntimeImpl( globalDict , runtime );
@@ -327,7 +324,7 @@ bool Runtime::isInitialized() throw ( RuntimeException )
     return runtime.is() && impl->cargo->valid;
 }
 
-Runtime::Runtime() throw(  RuntimeException )
+Runtime::Runtime()
     : impl( nullptr )
 {
     PyRef globalDict, runtime;
@@ -363,9 +360,6 @@ Runtime & Runtime::operator = ( const Runtime & r )
 }
 
 PyRef Runtime::any2PyObject (const Any &a ) const
-    throw ( css::script::CannotConvertException,
-            css::lang::IllegalArgumentException,
-            RuntimeException)
 {
     if( ! impl->cargo->valid )
     {
@@ -640,7 +634,6 @@ bool Runtime::pyIterUnpack( PyObject *const pObj, Any &a ) const
 }
 
 Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) const
-    throw ( css::uno::RuntimeException )
 {
     if( ! impl->cargo->valid )
     {
@@ -998,7 +991,6 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
 
 
 PyThreadAttach::PyThreadAttach( PyInterpreterState *interp)
-    throw ( css::uno::RuntimeException )
 {
     tstate = PyThreadState_New( interp );
     if( !tstate  )
@@ -1013,7 +1005,7 @@ PyThreadAttach::~PyThreadAttach()
     PyThreadState_Delete( tstate );
 }
 
-PyThreadDetach::PyThreadDetach() throw ( css::uno::RuntimeException )
+PyThreadDetach::PyThreadDetach()
 {
     tstate = PyThreadState_Get();
     PyEval_ReleaseThread( tstate );
diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
index b522b8d93aff..2de1b90ef323 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -126,7 +126,7 @@ PyRef getAnyClass( const Runtime & r )
 }
 
 
-sal_Unicode PyChar2Unicode( PyObject *obj ) throw ( RuntimeException )
+sal_Unicode PyChar2Unicode( PyObject *obj )
 {
     PyRef value( PyObject_GetAttrString( obj, "value" ), SAL_NO_ACQUIRE );
     if( ! PyUnicode_Check( value.get() ) )
@@ -145,7 +145,7 @@ sal_Unicode PyChar2Unicode( PyObject *obj ) throw ( RuntimeException )
     return c;
 }
 
-Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
+Any PyEnum2Enum( PyObject *obj )
 {
     Any ret;
     PyRef typeName( PyObject_GetAttrString( obj,"typeName" ), SAL_NO_ACQUIRE);
@@ -202,7 +202,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException )
 }
 
 
-Type PyType2Type( PyObject * o ) throw(RuntimeException )
+Type PyType2Type( PyObject * o )
 {
     PyRef pyName( PyObject_GetAttrString( o, "typeName" ), SAL_NO_ACQUIRE);
     if( !PyStr_Check( pyName.get() ) )
diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
index 1fd282053b80..4f5901e67806 100644
--- a/pyuno/source/module/pyuno_util.cxx
+++ b/pyuno/source/module/pyuno_util.cxx
@@ -103,7 +103,6 @@ OUString pyString2ustring( PyObject *pystr )
 }
 
 PyRef getObjectFromUnoModule( const Runtime &runtime, const char * func )
-    throw ( RuntimeException )
 {
     PyRef object(PyDict_GetItemString( runtime.getImpl()->cargo->getUnoModule().get(), func ) );
     if( !object.is() )
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index 7327e08fea50..b7a208f0892e 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -67,13 +67,12 @@ public:
     explicit ResolverImpl( const Reference< XComponentContext > & xSMgr );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XUnoUrlResolver
-    virtual Reference< XInterface > SAL_CALL resolve( const OUString & rUnoUrl )
-        throw (NoConnectException, ConnectionSetupException, RuntimeException, std::exception) override;
+    virtual Reference< XInterface > SAL_CALL resolve( const OUString & rUnoUrl ) override;
 };
 
 ResolverImpl::ResolverImpl( const Reference< XComponentContext > & xCtx )
@@ -83,26 +82,22 @@ ResolverImpl::ResolverImpl( const Reference< XComponentContext > & xCtx )
 
 // XServiceInfo
 OUString ResolverImpl::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return resolver_getImplementationName();
 }
 
 sal_Bool ResolverImpl::supportsService( const OUString & rServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > ResolverImpl::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return resolver_getSupportedServiceNames();
 }
 
 // XUnoUrlResolver
 Reference< XInterface > ResolverImpl::resolve( const OUString & rUnoUrl )
-    throw (NoConnectException, ConnectionSetupException, RuntimeException, std::exception)
 {
     OUString aProtocolDescr;
     OUString aConnectDescr;
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index 87a18b059b16..9e5ed089d0df 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -63,10 +63,10 @@ namespace rptui
                         ,bool _bReverse = false);
 
         // css::beans::XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
         // css::lang::XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) override;
 
         /** stop the listening mode.
          */
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index d0987e38283f..f09433a216aa 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -178,9 +178,9 @@ namespace reportdesign
                                   ,css::uno::Reference< css::drawing::XShape >& _xShape);
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 
@@ -191,58 +191,58 @@ namespace reportdesign
         DECLARE_XINTERFACE( )
         DECLARE_XTYPEPROVIDER( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XReportDefinition
-        virtual OUString SAL_CALL getMimeType() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMimeType( const OUString& _mimetype ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getGroupKeepTogether() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getPageHeaderOption() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getPageFooterOption() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCommand() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCommand( const OUString& _command ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getCommandType() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCommandType( ::sal_Int32 _commandtype ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFilter( const OUString& _filter ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getEscapeProcessing() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setEscapeProcessing( sal_Bool _escapeprocessing ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setActiveConnection( const css::uno::Reference< css::sdbc::XConnection >& _activeconnection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDataSourceName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getReportHeaderOn() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setReportHeaderOn( sal_Bool _reportheaderon ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getReportFooterOn() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setReportFooterOn( sal_Bool _reportfooteron ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getPageHeaderOn() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPageHeaderOn( sal_Bool _pageheaderon ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getPageFooterOn() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPageFooterOn( sal_Bool _pagefooteron ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XGroups > SAL_CALL getGroups() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XSection > SAL_CALL getReportHeader() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XSection > SAL_CALL getPageHeader() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XSection > SAL_CALL getDetail() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XSection > SAL_CALL getPageFooter() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XSection > SAL_CALL getReportFooter() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::document::XEventBroadcaster > SAL_CALL getEventBroadcaster(  ) throw (css::lang::DisposedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableMimeTypes(  ) throw (css::lang::DisposedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getMimeType() override;
+        virtual void SAL_CALL setMimeType( const OUString& _mimetype ) override;
+        virtual OUString SAL_CALL getCaption() override;
+        virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+        virtual ::sal_Int16 SAL_CALL getGroupKeepTogether() override;
+        virtual void SAL_CALL setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) override;
+        virtual ::sal_Int16 SAL_CALL getPageHeaderOption() override;
+        virtual void SAL_CALL setPageHeaderOption( ::sal_Int16 _pageheaderoption ) override;
+        virtual ::sal_Int16 SAL_CALL getPageFooterOption() override;
+        virtual void SAL_CALL setPageFooterOption( ::sal_Int16 _pagefooteroption ) override;
+        virtual OUString SAL_CALL getCommand() override;
+        virtual void SAL_CALL setCommand( const OUString& _command ) override;
+        virtual ::sal_Int32 SAL_CALL getCommandType() override;
+        virtual void SAL_CALL setCommandType( ::sal_Int32 _commandtype ) override;
+        virtual OUString SAL_CALL getFilter() override;
+        virtual void SAL_CALL setFilter( const OUString& _filter ) override;
+        virtual sal_Bool SAL_CALL getEscapeProcessing() override;
+        virtual void SAL_CALL setEscapeProcessing( sal_Bool _escapeprocessing ) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() override;
+        virtual void SAL_CALL setActiveConnection( const css::uno::Reference< css::sdbc::XConnection >& _activeconnection ) override;
+        virtual OUString SAL_CALL getDataSourceName() override;
+        virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) override;
+        virtual sal_Bool SAL_CALL getReportHeaderOn() override;
+        virtual void SAL_CALL setReportHeaderOn( sal_Bool _reportheaderon ) override;
+        virtual sal_Bool SAL_CALL getReportFooterOn() override;
+        virtual void SAL_CALL setReportFooterOn( sal_Bool _reportfooteron ) override;
+        virtual sal_Bool SAL_CALL getPageHeaderOn() override;
+        virtual void SAL_CALL setPageHeaderOn( sal_Bool _pageheaderon ) override;
+        virtual sal_Bool SAL_CALL getPageFooterOn() override;
+        virtual void SAL_CALL setPageFooterOn( sal_Bool _pagefooteron ) override;
+        virtual css::uno::Reference< css::report::XGroups > SAL_CALL getGroups() override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getReportHeader() override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getPageHeader() override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getDetail() override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getPageFooter() override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getReportFooter() override;
+        virtual css::uno::Reference< css::document::XEventBroadcaster > SAL_CALL getEventBroadcaster(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableMimeTypes(  ) override;
 
         // XReportComponent
         REPORTCOMPONENT_HEADER()
@@ -251,144 +251,144 @@ namespace reportdesign
         SHAPE_HEADER()
 
         // XShapeDescriptor
-        virtual OUString SAL_CALL getShapeType(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getShapeType(  ) override;
 
         //XFunctionsSupplier
-        virtual css::uno::Reference< css::report::XFunctions > SAL_CALL getFunctions() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XFunctions > SAL_CALL getFunctions() override;
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
 
         // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
         // XCloseBroadcaster
-        virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
+        virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) override;
 
         // XCloseable
-        virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close( sal_Bool DeliverOwnership ) override;
 
         // XModel
-        virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getURL(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL lockControllers(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL unlockControllers(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
+        virtual OUString SAL_CALL getURL(  ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) override;
+        virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& Controller ) override;
+        virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& Controller ) override;
+        virtual void SAL_CALL lockControllers(  ) override;
+        virtual void SAL_CALL unlockControllers(  ) override;
+        virtual sal_Bool SAL_CALL hasControllersLocked(  ) override;
+        virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) override;
+        virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) override;
 
         // XStorageBasedDocument
-        virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage(  ) throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) override;
+        virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) override;
+        virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
+        virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage(  ) override;
+        virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
+        virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
 
         // XViewDataSupplier
-        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getViewData(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setViewData( const css::uno::Reference< css::container::XIndexAccess >& Data ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getViewData(  ) override;
+        virtual void SAL_CALL setViewData( const css::uno::Reference< css::container::XIndexAccess >& Data ) override;
 
         // XLoadable
-        virtual void SAL_CALL initNew(  ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initNew(  ) override;
+        virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
 
         // XVisualObject
-        virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const css::awt::Size& aSize ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const css::awt::Size& aSize ) override;
+        virtual css::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) override;
+        virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) override;
+        virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) override;
 
         // XModifiable2
-        virtual sal_Bool SAL_CALL disableSetModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL enableSetModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isSetModifiedEnabled(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL disableSetModified(  ) override;
+        virtual sal_Bool SAL_CALL enableSetModified(  ) override;
+        virtual sal_Bool SAL_CALL isSetModifiedEnabled(  ) override;
 
         // XModifiable
-        virtual sal_Bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isModified(  ) override;
+        virtual void SAL_CALL setModified( sal_Bool bModified ) override;
 
         // XModifyBroadcaster
-        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
         // document::XEventBroadcaster
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) override;
 
         // document::XDocumentEventBroadcaster
-        virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& rListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& rListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL notifyDocumentEvent( const OUString& rEventName, const css::uno::Reference< css::frame::XController2 >& rViewController, const css::uno::Any& rSupplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& rListener ) override;
+        virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& rListener ) override;
+        virtual void SAL_CALL notifyDocumentEvent( const OUString& rEventName, const css::uno::Reference< css::frame::XController2 >& rViewController, const css::uno::Any& rSupplement ) override;
 
         // XUIConfigurationManagerSupplier
-        virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager(  ) override;
 
         // XDocumentSubStorageSupplier
-        virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames(  ) override;
 
         // css::lang::XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
         static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
         // SvxUnoDrawMSFactory
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+        css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
         // XStyleFamiliesSupplier
-        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(  ) override;
 
         // XModule
-        virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getIdentifier(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setIdentifier( const OUString& Identifier ) override;
+        virtual OUString SAL_CALL getIdentifier(  ) override;
 
         // XNumberFormatsSupplier
-        virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings(  ) override;
+        virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats(  ) override;
 
         // XTitle
-        virtual OUString SAL_CALL getTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTitle(  ) override;
+        virtual void SAL_CALL setTitle( const OUString& sTitle ) override;
 
         // XTitleChangeBroadcaster
-        virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
+        virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) override;
 
         // XUntitledNumbers
-        virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getUntitledPrefix(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) override;
+        virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) override;
+        virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) override;
+        virtual OUString SAL_CALL getUntitledPrefix(  ) override;
 
         // XDocumentPropertiesSupplier
-        virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL getDocumentProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL getDocumentProperties(  ) override;
 
         // XTransferable
-        virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
+        virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) override;
+        virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 
         // XUndoManagerSupplier
-        virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager(  ) override;
 
         // comphelper::IEmbeddedHelper
         virtual css::uno::Reference < css::embed::XStorage > getStorage() const override;
@@ -398,7 +398,7 @@ namespace reportdesign
         virtual OUString getDocumentBaseURL() const override;
 
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::ui::XUIConfigurationManager2 > getUIConfigurationManager2(  ) throw (css::uno::RuntimeException);
+        css::uno::Reference< css::ui::XUIConfigurationManager2 > getUIConfigurationManager2(  );
       };
 
 } // namespace reportdesign
diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx
index c67ad1a4bc28..86f5c7a18e2c 100644
--- a/reportdesign/inc/ReportHelperDefines.hxx
+++ b/reportdesign/inc/ReportHelperDefines.hxx
@@ -20,166 +20,166 @@
 #define INCLUDED_REPORTDESIGN_INC_REPORTHELPERDEFINES_HXX
 
 #define REPORTCONTROLMODEL_HEADER()  \
-    virtual OUString SAL_CALL getDataField() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setDataField(const OUString & the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual sal_Bool SAL_CALL getPrintWhenGroupChange() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setPrintWhenGroupChange(sal_Bool the_value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual OUString SAL_CALL getConditionalPrintExpression() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setConditionalPrintExpression(const OUString & the_value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual css::uno::Reference< css::report::XFormatCondition > SAL_CALL createFormatCondition() throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual OUString SAL_CALL getDataField() override; \
+    virtual void SAL_CALL setDataField(const OUString & the_value) override; \
+    virtual sal_Bool SAL_CALL getPrintWhenGroupChange() override; \
+    virtual void SAL_CALL setPrintWhenGroupChange(sal_Bool the_value) override; \
+    virtual OUString SAL_CALL getConditionalPrintExpression() override; \
+    virtual void SAL_CALL setConditionalPrintExpression(const OUString & the_value) override; \
+    virtual css::uno::Reference< css::report::XFormatCondition > SAL_CALL createFormatCondition() override;
 
 #define SHAPE_HEADER()  \
-    virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setPosition(const css::awt::Point & aPosition) throw (css::uno::RuntimeException, std::exception) override; \
-    virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setSize(const css::awt::Size & aSize) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() override; \
+    virtual void SAL_CALL setPosition(const css::awt::Point & aPosition) override; \
+    virtual css::awt::Size SAL_CALL getSize() override; \
+    virtual void SAL_CALL setSize(const css::awt::Size & aSize) override;
 
 #define REPORTCOMPONENT_HEADER()  \
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setName(const OUString & the_value) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setHeight(::sal_Int32 the_value) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getPositionX() throw (css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setPositionX(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getPositionY() throw (css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setPositionY(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; \
-    virtual ::sal_Int16 SAL_CALL getControlBorder() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setControlBorder(::sal_Int16 the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getControlBorderColor() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setControlBorderColor(::sal_Int32 the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual sal_Bool SAL_CALL getPrintRepeatedValues() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setPrintRepeatedValues(sal_Bool the_value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
-    virtual css::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setMasterFields( const css::uno::Sequence< OUString >& _masterfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \
-    virtual css::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setDetailFields( const css::uno::Sequence< OUString >& _detailfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \
-    virtual css::uno::Reference< css::report::XSection > SAL_CALL getSection() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override; \
+    virtual void SAL_CALL setName(const OUString & the_value) override; \
+    virtual ::sal_Int32 SAL_CALL getHeight() override; \
+    virtual void SAL_CALL setHeight(::sal_Int32 the_value) override; \
+    virtual ::sal_Int32 SAL_CALL getPositionX() override; \
+    virtual void SAL_CALL setPositionX(::sal_Int32 the_value) override; \
+    virtual ::sal_Int32 SAL_CALL getPositionY() override; \
+    virtual void SAL_CALL setPositionY(::sal_Int32 the_value) override; \
+    virtual ::sal_Int32 SAL_CALL getWidth() override; \
+    virtual void SAL_CALL setWidth(::sal_Int32 the_value) override; \
+    virtual ::sal_Int16 SAL_CALL getControlBorder() override; \
+    virtual void SAL_CALL setControlBorder(::sal_Int16 the_value) override; \
+    virtual ::sal_Int32 SAL_CALL getControlBorderColor() override; \
+    virtual void SAL_CALL setControlBorderColor(::sal_Int32 the_value) override; \
+    virtual sal_Bool SAL_CALL getPrintRepeatedValues() override; \
+    virtual void SAL_CALL setPrintRepeatedValues(sal_Bool the_value) override; \
+    virtual css::uno::Sequence< OUString > SAL_CALL getMasterFields() override; \
+    virtual void SAL_CALL setMasterFields( const css::uno::Sequence< OUString >& _masterfields ) override; \
+    virtual css::uno::Sequence< OUString > SAL_CALL getDetailFields() override; \
+    virtual void SAL_CALL setDetailFields( const css::uno::Sequence< OUString >& _detailfields ) override; \
+    virtual css::uno::Reference< css::report::XSection > SAL_CALL getSection() override;
 
 #define REPORTCONTROLFORMAT_HEADER()  \
-    virtual ::sal_Int32 SAL_CALL getControlBackground() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setControlBackground( ::sal_Int32 _controlbackground ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getControlBackgroundTransparent() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getParaAdjust() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setParaAdjust( ::sal_Int16 _paraadjust ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::awt::FontDescriptor SAL_CALL getFontDescriptor() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setFontDescriptor( const css::awt::FontDescriptor& _fontdescriptor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::awt::FontDescriptor SAL_CALL getFontDescriptorAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setFontDescriptorAsian( const css::awt::FontDescriptor& _fontdescriptor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::awt::FontDescriptor SAL_CALL getFontDescriptorComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setFontDescriptorComplex( const css::awt::FontDescriptor& _fontdescriptor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getControlTextEmphasis() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setControlTextEmphasis( ::sal_Int16 _controltextemphasis ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharEmphasis() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharEmphasis( ::sal_Int16 _charemphasis ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharCombineIsOn() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharCombineIsOn( sal_Bool _charcombineison ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharCombinePrefix() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharCombinePrefix( const OUString& _charcombineprefix ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharCombineSuffix() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharCombineSuffix( const OUString& _charcombinesuffix ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharHidden() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharHidden( sal_Bool _charhidden ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharShadowed() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharShadowed( sal_Bool _charshadowed ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharContoured() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharContoured( sal_Bool _charcontoured ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharCaseMap() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharCaseMap( ::sal_Int16 _charcasemap ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::lang::Locale SAL_CALL getCharLocale() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharLocale( const css::lang::Locale& _charlocale ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharEscapement() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharEscapement( ::sal_Int16 _charescapement ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int8 SAL_CALL getCharEscapementHeight() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharEscapementHeight( ::sal_Int8 _charescapementheight ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharAutoKerning() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharAutoKerning( sal_Bool _charautokerning ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharKerning() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharKerning( ::sal_Int16 _charkerning ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharFlash() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFlash( sal_Bool _charflash ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharRelief() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharRelief( ::sal_Int16 _charrelief ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontName( const OUString& _charfontname ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontStyleName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontStyleName( const OUString& _charfontstylename ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontFamily() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontFamily( ::sal_Int16 _charfontfamily ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontCharSet() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontCharSet( ::sal_Int16 _charfontcharset ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontPitch() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontPitch( ::sal_Int16 _charfontpitch ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int32 SAL_CALL getCharColor() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharColor( ::sal_Int32 _charcolor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int32 SAL_CALL getCharUnderlineColor() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharUnderlineColor( ::sal_Int32 _charunderlinecolor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharHeight() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharHeight( float _charheight ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharUnderline() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharUnderline( ::sal_Int16 _charunderline ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharWeight() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharWeight( float _charweight ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::awt::FontSlant SAL_CALL getCharPosture() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharPosture( css::awt::FontSlant _charposture ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharStrikeout() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharStrikeout( ::sal_Int16 _charstrikeout ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharWordMode() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharWordMode( sal_Bool _charwordmode ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharRotation() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharRotation( ::sal_Int16 _charrotation ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharScaleWidth() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharScaleWidth( ::sal_Int16 _charscalewidth ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::style::VerticalAlignment SAL_CALL getVerticalAlign() throw (css::beans::UnknownPropertyException,css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setVerticalAlign( css::style::VerticalAlignment _paravertalignment ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getHyperLinkURL() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setHyperLinkURL( const OUString& _hyperlinkurl ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getHyperLinkTarget() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setHyperLinkTarget( const OUString& _hyperlinktarget ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getHyperLinkName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setHyperLinkName( const OUString& _hyperlinkname ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getVisitedCharStyleName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setVisitedCharStyleName( const OUString& _visitedcharstylename ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getUnvisitedCharStyleName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setUnvisitedCharStyleName( const OUString& _unvisitedcharstylename ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharHeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharHeightAsian( float _charheightasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharWeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharWeightAsian( float _charweightasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontNameAsian( const OUString& _charfontnameasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontStyleNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontStyleNameAsian( const OUString& _charfontstylenameasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontFamilyAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontFamilyAsian( ::sal_Int16 _charfontfamilyasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontCharSetAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontCharSetAsian( ::sal_Int16 _charfontcharsetasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontPitchAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontPitchAsian( ::sal_Int16 _charfontpitchasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::awt::FontSlant SAL_CALL getCharPostureAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharPostureAsian( css::awt::FontSlant _charpostureasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::lang::Locale SAL_CALL getCharLocaleAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharLocaleAsian( const css::lang::Locale& _charlocaleasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharHeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharHeightComplex( float _charheightcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharWeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharWeightComplex( float _charweightcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontNameComplex( const OUString& _charfontnamecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontStyleNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontStyleNameComplex( const OUString& _charfontstylenamecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontFamilyComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontFamilyComplex( ::sal_Int16 _charfontfamilycomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontCharSetComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontCharSetComplex( ::sal_Int16 _charfontcharsetcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontPitchComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontPitchComplex( ::sal_Int16 _charfontpitchcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::awt::FontSlant SAL_CALL getCharPostureComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharPostureComplex( css::awt::FontSlant _charposturecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual css::lang::Locale SAL_CALL getCharLocaleComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharLocaleComplex( const css::lang::Locale& _charlocalecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getControlBackground() override;\
+    virtual void SAL_CALL setControlBackground( ::sal_Int32 _controlbackground ) override;\
+    virtual sal_Bool SAL_CALL getControlBackgroundTransparent() override;\
+    virtual void SAL_CALL setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent ) override;\
+    virtual ::sal_Int16 SAL_CALL getParaAdjust() override;\
+    virtual void SAL_CALL setParaAdjust( ::sal_Int16 _paraadjust ) override;\
+    virtual css::awt::FontDescriptor SAL_CALL getFontDescriptor() override;\
+    virtual void SAL_CALL setFontDescriptor( const css::awt::FontDescriptor& _fontdescriptor ) override;\
+    virtual css::awt::FontDescriptor SAL_CALL getFontDescriptorAsian() override;\
+    virtual void SAL_CALL setFontDescriptorAsian( const css::awt::FontDescriptor& _fontdescriptor ) override;\
+    virtual css::awt::FontDescriptor SAL_CALL getFontDescriptorComplex() override;\
+    virtual void SAL_CALL setFontDescriptorComplex( const css::awt::FontDescriptor& _fontdescriptor ) override;\
+    virtual ::sal_Int16 SAL_CALL getControlTextEmphasis() override;\
+    virtual void SAL_CALL setControlTextEmphasis( ::sal_Int16 _controltextemphasis ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharEmphasis() override;\
+    virtual void SAL_CALL setCharEmphasis( ::sal_Int16 _charemphasis ) override;\
+    virtual sal_Bool SAL_CALL getCharCombineIsOn() override;\
+    virtual void SAL_CALL setCharCombineIsOn( sal_Bool _charcombineison ) override;\
+    virtual OUString SAL_CALL getCharCombinePrefix() override;\
+    virtual void SAL_CALL setCharCombinePrefix( const OUString& _charcombineprefix ) override;\
+    virtual OUString SAL_CALL getCharCombineSuffix() override;\
+    virtual void SAL_CALL setCharCombineSuffix( const OUString& _charcombinesuffix ) override;\
+    virtual sal_Bool SAL_CALL getCharHidden() override;\
+    virtual void SAL_CALL setCharHidden( sal_Bool _charhidden ) override;\
+    virtual sal_Bool SAL_CALL getCharShadowed() override;\
+    virtual void SAL_CALL setCharShadowed( sal_Bool _charshadowed ) override;\
+    virtual sal_Bool SAL_CALL getCharContoured() override;\
+    virtual void SAL_CALL setCharContoured( sal_Bool _charcontoured ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharCaseMap() override;\
+    virtual void SAL_CALL setCharCaseMap( ::sal_Int16 _charcasemap ) override;\
+    virtual css::lang::Locale SAL_CALL getCharLocale() override;\
+    virtual void SAL_CALL setCharLocale( const css::lang::Locale& _charlocale ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharEscapement() override;\
+    virtual void SAL_CALL setCharEscapement( ::sal_Int16 _charescapement ) override;\
+    virtual ::sal_Int8 SAL_CALL getCharEscapementHeight() override;\
+    virtual void SAL_CALL setCharEscapementHeight( ::sal_Int8 _charescapementheight ) override;\
+    virtual sal_Bool SAL_CALL getCharAutoKerning() override;\
+    virtual void SAL_CALL setCharAutoKerning( sal_Bool _charautokerning ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharKerning() override;\
+    virtual void SAL_CALL setCharKerning( ::sal_Int16 _charkerning ) override;\
+    virtual sal_Bool SAL_CALL getCharFlash() override;\
+    virtual void SAL_CALL setCharFlash( sal_Bool _charflash ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharRelief() override;\
+    virtual void SAL_CALL setCharRelief( ::sal_Int16 _charrelief ) override;\
+    virtual OUString SAL_CALL getCharFontName() override;\
+    virtual void SAL_CALL setCharFontName( const OUString& _charfontname ) override;\
+    virtual OUString SAL_CALL getCharFontStyleName() override;\
+    virtual void SAL_CALL setCharFontStyleName( const OUString& _charfontstylename ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontFamily() override;\
+    virtual void SAL_CALL setCharFontFamily( ::sal_Int16 _charfontfamily ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontCharSet() override;\
+    virtual void SAL_CALL setCharFontCharSet( ::sal_Int16 _charfontcharset ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontPitch() override;\
+    virtual void SAL_CALL setCharFontPitch( ::sal_Int16 _charfontpitch ) override;\
+    virtual ::sal_Int32 SAL_CALL getCharColor() override;\
+    virtual void SAL_CALL setCharColor( ::sal_Int32 _charcolor ) override;\
+    virtual ::sal_Int32 SAL_CALL getCharUnderlineColor() override;\
+    virtual void SAL_CALL setCharUnderlineColor( ::sal_Int32 _charunderlinecolor ) override;\
+    virtual float SAL_CALL getCharHeight() override;\
+    virtual void SAL_CALL setCharHeight( float _charheight ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharUnderline() override;\
+    virtual void SAL_CALL setCharUnderline( ::sal_Int16 _charunderline ) override;\
+    virtual float SAL_CALL getCharWeight() override;\
+    virtual void SAL_CALL setCharWeight( float _charweight ) override;\
+    virtual css::awt::FontSlant SAL_CALL getCharPosture() override;\
+    virtual void SAL_CALL setCharPosture( css::awt::FontSlant _charposture ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharStrikeout() override;\
+    virtual void SAL_CALL setCharStrikeout( ::sal_Int16 _charstrikeout ) override;\
+    virtual sal_Bool SAL_CALL getCharWordMode() override;\
+    virtual void SAL_CALL setCharWordMode( sal_Bool _charwordmode ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharRotation() override;\
+    virtual void SAL_CALL setCharRotation( ::sal_Int16 _charrotation ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharScaleWidth() override;\
+    virtual void SAL_CALL setCharScaleWidth( ::sal_Int16 _charscalewidth ) override;\
+    virtual css::style::VerticalAlignment SAL_CALL getVerticalAlign() override;\
+    virtual void SAL_CALL setVerticalAlign( css::style::VerticalAlignment _paravertalignment ) override;\
+    virtual OUString SAL_CALL getHyperLinkURL() override;\
+    virtual void SAL_CALL setHyperLinkURL( const OUString& _hyperlinkurl ) override;\
+    virtual OUString SAL_CALL getHyperLinkTarget() override;\
+    virtual void SAL_CALL setHyperLinkTarget( const OUString& _hyperlinktarget ) override;\
+    virtual OUString SAL_CALL getHyperLinkName() override;\
+    virtual void SAL_CALL setHyperLinkName( const OUString& _hyperlinkname ) override;\
+    virtual OUString SAL_CALL getVisitedCharStyleName() override;\
+    virtual void SAL_CALL setVisitedCharStyleName( const OUString& _visitedcharstylename ) override;\
+    virtual OUString SAL_CALL getUnvisitedCharStyleName() override;\
+    virtual void SAL_CALL setUnvisitedCharStyleName( const OUString& _unvisitedcharstylename ) override;\
+    virtual float SAL_CALL getCharHeightAsian() override;\
+    virtual void SAL_CALL setCharHeightAsian( float _charheightasian ) override;\
+    virtual float SAL_CALL getCharWeightAsian() override;\
+    virtual void SAL_CALL setCharWeightAsian( float _charweightasian ) override;\
+    virtual OUString SAL_CALL getCharFontNameAsian() override;\
+    virtual void SAL_CALL setCharFontNameAsian( const OUString& _charfontnameasian ) override;\
+    virtual OUString SAL_CALL getCharFontStyleNameAsian() override;\
+    virtual void SAL_CALL setCharFontStyleNameAsian( const OUString& _charfontstylenameasian ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontFamilyAsian() override;\
+    virtual void SAL_CALL setCharFontFamilyAsian( ::sal_Int16 _charfontfamilyasian ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontCharSetAsian() override;\
+    virtual void SAL_CALL setCharFontCharSetAsian( ::sal_Int16 _charfontcharsetasian ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontPitchAsian() override;\
+    virtual void SAL_CALL setCharFontPitchAsian( ::sal_Int16 _charfontpitchasian ) override;\
+    virtual css::awt::FontSlant SAL_CALL getCharPostureAsian() override;\
+    virtual void SAL_CALL setCharPostureAsian( css::awt::FontSlant _charpostureasian ) override;\
+    virtual css::lang::Locale SAL_CALL getCharLocaleAsian() override;\
+    virtual void SAL_CALL setCharLocaleAsian( const css::lang::Locale& _charlocaleasian ) override;\
+    virtual float SAL_CALL getCharHeightComplex() override;\
+    virtual void SAL_CALL setCharHeightComplex( float _charheightcomplex ) override;\
+    virtual float SAL_CALL getCharWeightComplex() override;\
+    virtual void SAL_CALL setCharWeightComplex( float _charweightcomplex ) override;\
+    virtual OUString SAL_CALL getCharFontNameComplex() override;\
+    virtual void SAL_CALL setCharFontNameComplex( const OUString& _charfontnamecomplex ) override;\
+    virtual OUString SAL_CALL getCharFontStyleNameComplex() override;\
+    virtual void SAL_CALL setCharFontStyleNameComplex( const OUString& _charfontstylenamecomplex ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontFamilyComplex() override;\
+    virtual void SAL_CALL setCharFontFamilyComplex( ::sal_Int16 _charfontfamilycomplex ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontCharSetComplex() override;\
+    virtual void SAL_CALL setCharFontCharSetComplex( ::sal_Int16 _charfontcharsetcomplex ) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontPitchComplex() override;\
+    virtual void SAL_CALL setCharFontPitchComplex( ::sal_Int16 _charfontpitchcomplex ) override;\
+    virtual css::awt::FontSlant SAL_CALL getCharPostureComplex() override;\
+    virtual void SAL_CALL setCharPostureComplex( css::awt::FontSlant _charposturecomplex ) override;\
+    virtual css::lang::Locale SAL_CALL getCharLocaleComplex() override;\
+    virtual void SAL_CALL setCharLocaleComplex( const css::lang::Locale& _charlocalecomplex ) override;
 
 
 #endif // INCLUDED_REPORTDESIGN_INC_REPORTHELPERDEFINES_HXX
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 8d7b93e82514..53e5db51992b 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -102,7 +102,7 @@ public:
     void EndListening(bool bRemoveListener = true);
     // PropertyChangeListener
     /// @throws css::uno::RuntimeException
-    virtual void _propertyChange( const  css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException);
+    virtual void _propertyChange( const  css::beans::PropertyChangeEvent& evt );
     virtual void initializeOle() {}
 
     bool        supportsService( const OUString& _sServiceName ) const;
@@ -235,7 +235,7 @@ protected:
 
 public:
 
-    virtual void _propertyChange( const  css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException) override;
+    virtual void _propertyChange( const  css::beans::PropertyChangeEvent& evt ) override;
 
     /** creates the m_xMediator when it doesn't already exist.
         @param  _bReverse   when set to <TRUE/> then the properties from the uno control will be copied into report control
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index 42563f437094..b36ebea50f44 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -110,18 +110,18 @@ namespace rptui
 
     protected:
         // 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;
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
         // XContainerListener
-        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override;
+        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override;
+        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override;
 
         // XModifyListener
-        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 
         void ModeChanged();
 
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index 2824b489326e..0058a43f86db 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -188,7 +188,7 @@ OFixedLine::~OFixedLine()
 
 IMPLEMENT_FORWARD_REFCOUNT( OFixedLine, FixedLineBase )
 
-uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType )
 {
     uno::Any aReturn = FixedLineBase::queryInterface(_rType);
     if ( !aReturn.hasValue() )
@@ -199,24 +199,24 @@ uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw (u
     return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn);
 }
 
-void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::dispose()
 {
     FixedLinePropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
 
-OUString OFixedLine::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString OFixedLine::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.OFixedLine");
 }
 
 
-OUString SAL_CALL OFixedLine::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OFixedLine::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-uno::Sequence< OUString > OFixedLine::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OFixedLine::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { SERVICE_FIXEDLINE };
 
@@ -229,12 +229,12 @@ uno::Reference< uno::XInterface > OFixedLine::create(uno::Reference< uno::XCompo
 }
 
 
-uno::Sequence< OUString > SAL_CALL OFixedLine::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OFixedLine::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
-sal_Bool SAL_CALL OFixedLine::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OFixedLine::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -243,114 +243,114 @@ sal_Bool SAL_CALL OFixedLine::supportsService(const OUString& ServiceName) throw
 REPORTCOMPONENT_IMPL3(OFixedLine,m_aProps.aComponent)
 REPORTCOMPONENT_NOMASTERDETAIL(OFixedLine)
 
-::sal_Int16  SAL_CALL OFixedLine::getControlBorder( ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+::sal_Int16  SAL_CALL OFixedLine::getControlBorder( )
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OFixedLine::setControlBorder( ::sal_Int16 /*_border*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setControlBorder( ::sal_Int16 /*_border*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
-::sal_Int32 SAL_CALL OFixedLine::getControlBorderColor() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFixedLine::getControlBorderColor()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OFixedLine::setControlBorderColor( ::sal_Int32 /*_bordercolor*/ ) throw (beans::UnknownPropertyException,lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setControlBorderColor( ::sal_Int32 /*_bordercolor*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedLine::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedLine::getPropertySetInfo(  )
 {
     return FixedLinePropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OFixedLine::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     FixedLinePropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OFixedLine::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFixedLine::getPropertyValue( const OUString& PropertyName )
 {
     return FixedLinePropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OFixedLine::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     FixedLinePropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OFixedLine::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     FixedLinePropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OFixedLine::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FixedLinePropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OFixedLine::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FixedLinePropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
 
 // XReportControlModel
-OUString SAL_CALL OFixedLine::getDataField() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OFixedLine::getDataField()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OFixedLine::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setDataField( const OUString& /*_datafield*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
-::sal_Int32 SAL_CALL OFixedLine::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFixedLine::getControlBackground()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OFixedLine::setControlBackground( ::sal_Int32 /*_backgroundcolor*/ ) throw (uno::RuntimeException,beans::UnknownPropertyException, std::exception)
+void SAL_CALL OFixedLine::setControlBackground( ::sal_Int32 /*_backgroundcolor*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
-sal_Bool SAL_CALL OFixedLine::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFixedLine::getControlBackgroundTransparent()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OFixedLine::setControlBackgroundTransparent( sal_Bool /*_controlbackgroundtransparent*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setControlBackgroundTransparent( sal_Bool /*_controlbackgroundtransparent*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
-sal_Bool SAL_CALL OFixedLine::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFixedLine::getPrintWhenGroupChange()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OFixedLine::setPrintWhenGroupChange( sal_Bool /*_printwhengroupchange*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setPrintWhenGroupChange( sal_Bool /*_printwhengroupchange*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
-OUString SAL_CALL OFixedLine::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OFixedLine::getConditionalPrintExpression()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OFixedLine::setConditionalPrintExpression( const OUString& /*_conditionalprintexpression*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setConditionalPrintExpression( const OUString& /*_conditionalprintexpression*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
 // XCloneable
-uno::Reference< util::XCloneable > SAL_CALL OFixedLine::createClone(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< util::XCloneable > SAL_CALL OFixedLine::createClone(  )
 {
     uno::Reference< report::XReportComponent> xSource = this;
     uno::Reference< report::XFixedLine> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FIXEDLINE),uno::UNO_QUERY_THROW);
@@ -360,156 +360,156 @@ uno::Reference< util::XCloneable > SAL_CALL OFixedLine::createClone(  ) throw (u
 
 // XFixedLine
 
-::sal_Int32 SAL_CALL OFixedLine::getOrientation() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFixedLine::getOrientation()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_nOrientation;
 }
 
-void SAL_CALL OFixedLine::setOrientation( ::sal_Int32 _orientation ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setOrientation( ::sal_Int32 _orientation )
 {
     set(PROPERTY_ORIENTATION,_orientation,m_nOrientation);
 }
 
-drawing::LineStyle SAL_CALL OFixedLine::getLineStyle() throw (uno::RuntimeException, std::exception)
+drawing::LineStyle SAL_CALL OFixedLine::getLineStyle()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineStyle;
 }
 
-void SAL_CALL OFixedLine::setLineStyle( drawing::LineStyle _linestyle ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setLineStyle( drawing::LineStyle _linestyle )
 {
     set(PROPERTY_LINESTYLE,_linestyle,m_LineStyle);
 }
 
-drawing::LineDash SAL_CALL OFixedLine::getLineDash() throw (uno::RuntimeException, std::exception)
+drawing::LineDash SAL_CALL OFixedLine::getLineDash()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineDash;
 }
 
-void SAL_CALL OFixedLine::setLineDash( const drawing::LineDash& _linedash ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setLineDash( const drawing::LineDash& _linedash )
 {
     set(PROPERTY_LINEDASH,_linedash,m_LineDash);
 }
 
-::sal_Int32 SAL_CALL OFixedLine::getLineColor() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFixedLine::getLineColor()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineColor;
 }
 
-void SAL_CALL OFixedLine::setLineColor( ::sal_Int32 _linecolor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setLineColor( ::sal_Int32 _linecolor )
 {
     set(PROPERTY_LINECOLOR,_linecolor,m_LineColor);
 }
 
-::sal_Int16 SAL_CALL OFixedLine::getLineTransparence() throw (uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL OFixedLine::getLineTransparence()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineTransparence;
 }
 
-void SAL_CALL OFixedLine::setLineTransparence( ::sal_Int16 _linetransparence ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setLineTransparence( ::sal_Int16 _linetransparence )
 {
     set(PROPERTY_LINETRANSPARENCE,_linetransparence,m_LineTransparence);
 }
 
-::sal_Int32 SAL_CALL OFixedLine::getLineWidth() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFixedLine::getLineWidth()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineWidth;
 }
 
-void SAL_CALL OFixedLine::setLineWidth( ::sal_Int32 _linewidth ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setLineWidth( ::sal_Int32 _linewidth )
 {
     set(PROPERTY_LINEWIDTH,_linewidth,m_LineWidth);
 }
 
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OFixedLine::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OFixedLine::getParent(  )
 {
     return OShapeHelper::getParent(this);
 }
 
-void SAL_CALL OFixedLine::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setParent( const uno::Reference< uno::XInterface >& Parent )
 {
     OShapeHelper::setParent(Parent,this);
 }
 
-uno::Reference< report::XFormatCondition > SAL_CALL OFixedLine::createFormatCondition(  ) throw (uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< report::XFormatCondition > SAL_CALL OFixedLine::createFormatCondition(  )
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
 
 // XContainer
-void SAL_CALL OFixedLine::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::addContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.addContainerListener(xListener);
 }
 
-void SAL_CALL OFixedLine::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.removeContainerListener(xListener);
 }
 
 // XElementAccess
-uno::Type SAL_CALL OFixedLine::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL OFixedLine::getElementType(  )
 {
     return cppu::UnoType<report::XFormatCondition>::get();
 }
 
-sal_Bool SAL_CALL OFixedLine::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFixedLine::hasElements(  )
 {
     return m_aProps.hasElements();
 }
 
 // XIndexContainer
-void SAL_CALL OFixedLine::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::insertByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.insertByIndex(Index,Element);
 }
 
-void SAL_CALL OFixedLine::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::removeByIndex( ::sal_Int32 Index )
 {
     m_aProps.removeByIndex(Index);
 }
 
 // XIndexReplace
-void SAL_CALL OFixedLine::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.replaceByIndex(Index,Element);
 }
 
 // XIndexAccess
-::sal_Int32 SAL_CALL OFixedLine::getCount(  ) throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFixedLine::getCount(  )
 {
     return m_aProps.getCount();
 }
 
-uno::Any SAL_CALL OFixedLine::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFixedLine::getByIndex( ::sal_Int32 Index )
 {
     return m_aProps.getByIndex( Index );
 }
 
 // XShape
-awt::Point SAL_CALL OFixedLine::getPosition(  ) throw (uno::RuntimeException, std::exception)
+awt::Point SAL_CALL OFixedLine::getPosition(  )
 {
     return OShapeHelper::getPosition(this);
 }
 
-void SAL_CALL OFixedLine::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setPosition( const awt::Point& aPosition )
 {
     OShapeHelper::setPosition(aPosition,this);
 }
 
-awt::Size SAL_CALL OFixedLine::getSize(  ) throw (uno::RuntimeException, std::exception)
+awt::Size SAL_CALL OFixedLine::getSize(  )
 {
     return OShapeHelper::getSize(this);
 }
 
-void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setSize( const awt::Size& aSize )
 {
     const char hundredthmmC[] = "0\xe2\x80\x89\xC2\xB5""m"; // in UTF-8: 0, thin space, µ (micro), m (meter)
     const OUString hundredthmm(hundredthmmC, sizeof(hundredthmmC)-1, RTL_TEXTENCODING_UTF8);
@@ -521,7 +521,7 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper
 }
 
 // XShapeDescriptor
-OUString SAL_CALL OFixedLine::getShapeType(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OFixedLine::getShapeType(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( m_aProps.aComponent.m_xShape.is() )
@@ -529,38 +529,38 @@ OUString SAL_CALL OFixedLine::getShapeType(  ) throw (uno::RuntimeException, std
     return OUString("com.sun.star.drawing.ControlShape");
 }
 
-OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+OUString SAL_CALL OFixedLine::getHyperLinkURL()
 {
     throw beans::UnknownPropertyException();
 }
-void SAL_CALL OFixedLine::setHyperLinkURL(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+void SAL_CALL OFixedLine::setHyperLinkURL(const OUString & /*the_value*/)
 {
     throw beans::UnknownPropertyException();
 }
-OUString SAL_CALL OFixedLine::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+OUString SAL_CALL OFixedLine::getHyperLinkTarget()
 {
     throw beans::UnknownPropertyException();
 }
-void SAL_CALL OFixedLine::setHyperLinkTarget(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+void SAL_CALL OFixedLine::setHyperLinkTarget(const OUString & /*the_value*/)
 {
     throw beans::UnknownPropertyException();
 }
-OUString SAL_CALL OFixedLine::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+OUString SAL_CALL OFixedLine::getHyperLinkName()
 {
     throw beans::UnknownPropertyException();
 }
-void SAL_CALL OFixedLine::setHyperLinkName(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+void SAL_CALL OFixedLine::setHyperLinkName(const OUString & /*the_value*/)
 {
     throw beans::UnknownPropertyException();
 }
 
 NO_REPORTCONTROLFORMAT_IMPL(OFixedLine)
 
-sal_Bool SAL_CALL OFixedLine::getPrintRepeatedValues() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFixedLine::getPrintRepeatedValues()
 {
     throw beans::UnknownPropertyException();
 }
-void SAL_CALL OFixedLine::setPrintRepeatedValues( sal_Bool /*_printrepeatedvalues*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedLine::setPrintRepeatedValues( sal_Bool /*_printrepeatedvalues*/ )
 {
     throw beans::UnknownPropertyException();
 }
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index c0fbb05383b2..9d4a11d611f5 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -75,7 +75,7 @@ OFixedText::~OFixedText()
 
 IMPLEMENT_FORWARD_REFCOUNT( OFixedText, FixedTextBase )
 
-uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType )
 {
     uno::Any aReturn = FixedTextBase::queryInterface(_rType);
     if ( !aReturn.hasValue() )
@@ -87,25 +87,25 @@ uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (u
 }
 
 
-void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::dispose()
 {
     FixedTextPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
     uno::Reference< report::XFixedText> xHoldAlive = this;
 }
 
-OUString OFixedText::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString OFixedText::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.OFixedText");
 }
 
 
-OUString SAL_CALL OFixedText::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OFixedText::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-uno::Sequence< OUString > OFixedText::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OFixedText::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { SERVICE_FIXEDTEXT };
 
@@ -118,12 +118,12 @@ uno::Reference< uno::XInterface > OFixedText::create(uno::Reference< uno::XCompo
 }
 
 
-uno::Sequence< OUString > SAL_CALL OFixedText::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OFixedText::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
-sal_Bool SAL_CALL OFixedText::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OFixedText::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -134,78 +134,78 @@ REPORTCOMPONENT_IMPL2(OFixedText,m_aProps.aComponent)
 REPORTCOMPONENT_NOMASTERDETAIL(OFixedText)
 REPORTCONTROLFORMAT_IMPL(OFixedText,m_aProps.aFormatProperties)
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedText::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedText::getPropertySetInfo(  )
 {
     return FixedTextPropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OFixedText::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     FixedTextPropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OFixedText::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFixedText::getPropertyValue( const OUString& PropertyName )
 {
     return FixedTextPropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OFixedText::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     FixedTextPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OFixedText::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     FixedTextPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OFixedText::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FixedTextPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OFixedText::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FixedTextPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
 
 // XReportControlModel
-OUString SAL_CALL OFixedText::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OFixedText::getDataField()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OFixedText::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::setDataField( const OUString& /*_datafield*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
 
-sal_Bool SAL_CALL OFixedText::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFixedText::getPrintWhenGroupChange()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.bPrintWhenGroupChange;
 }
 
-void SAL_CALL OFixedText::setPrintWhenGroupChange( sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::setPrintWhenGroupChange( sal_Bool _printwhengroupchange )
 {
     set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
 }
 
-OUString SAL_CALL OFixedText::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OFixedText::getConditionalPrintExpression()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aConditionalPrintExpression;
 }
 
-void SAL_CALL OFixedText::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::setConditionalPrintExpression( const OUString& _conditionalprintexpression )
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
 }
 
 
 // XCloneable
-uno::Reference< util::XCloneable > SAL_CALL OFixedText::createClone(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< util::XCloneable > SAL_CALL OFixedText::createClone(  )
 {
     uno::Reference< report::XReportComponent> xSource = this;
     uno::Reference< report::XFixedText> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FIXEDTEXT),uno::UNO_QUERY_THROW);
@@ -214,107 +214,107 @@ uno::Reference< util::XCloneable > SAL_CALL OFixedText::createClone(  ) throw (u
 
 
 // XFixedText
-OUString SAL_CALL OFixedText::getLabel() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OFixedText::getLabel()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_sLabel;
 }
 
-void SAL_CALL OFixedText::setLabel( const OUString& _label ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::setLabel( const OUString& _label )
 {
     set(PROPERTY_LABEL,_label,m_sLabel);
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OFixedText::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OFixedText::getParent(  )
 {
     return OShapeHelper::getParent(this);
 }
 
-void SAL_CALL OFixedText::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::setParent( const uno::Reference< uno::XInterface >& Parent )
 {
     OShapeHelper::setParent(Parent,this);
 }
 
-uno::Reference< report::XFormatCondition > SAL_CALL OFixedText::createFormatCondition(  ) throw (uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< report::XFormatCondition > SAL_CALL OFixedText::createFormatCondition(  )
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
 
 // XContainer
-void SAL_CALL OFixedText::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::addContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.addContainerListener(xListener);
 }
 
-void SAL_CALL OFixedText::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.removeContainerListener(xListener);
 }
 
 // XElementAccess
-uno::Type SAL_CALL OFixedText::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL OFixedText::getElementType(  )
 {
     return cppu::UnoType<report::XFormatCondition>::get();
 }
 
-sal_Bool SAL_CALL OFixedText::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFixedText::hasElements(  )
 {
     return m_aProps.hasElements();
 }
 
 // XIndexContainer
-void SAL_CALL OFixedText::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::insertByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.insertByIndex(Index,Element);
 }
 
-void SAL_CALL OFixedText::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::removeByIndex( ::sal_Int32 Index )
 {
     m_aProps.removeByIndex(Index);
 }
 
 // XIndexReplace
-void SAL_CALL OFixedText::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.replaceByIndex(Index,Element);
 }
 
 // XIndexAccess
-::sal_Int32 SAL_CALL OFixedText::getCount(  ) throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFixedText::getCount(  )
 {
     return m_aProps.getCount();
 }
 
-uno::Any SAL_CALL OFixedText::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFixedText::getByIndex( ::sal_Int32 Index )
 {
     return m_aProps.getByIndex( Index );
 }
 
 // XShape
-awt::Point SAL_CALL OFixedText::getPosition(  ) throw (uno::RuntimeException, std::exception)
+awt::Point SAL_CALL OFixedText::getPosition(  )
 {
     return OShapeHelper::getPosition(this);
 }
 
-void SAL_CALL OFixedText::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::setPosition( const awt::Point& aPosition )
 {
     OShapeHelper::setPosition(aPosition,this);
 }
 
-awt::Size SAL_CALL OFixedText::getSize(  ) throw (uno::RuntimeException, std::exception)
+awt::Size SAL_CALL OFixedText::getSize(  )
 {
     return OShapeHelper::getSize(this);
 }
 
-void SAL_CALL OFixedText::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL OFixedText::setSize( const awt::Size& aSize )
 {
     OShapeHelper::setSize(aSize,this);
 }
 
 
 // XShapeDescriptor
-OUString SAL_CALL OFixedText::getShapeType(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OFixedText::getShapeType(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( m_aProps.aComponent.m_xShape.is() )
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index 92835ea2d82a..9e9aa0d5d3d7 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -53,94 +53,94 @@ OFormatCondition::~OFormatCondition()
 
 IMPLEMENT_FORWARD_XINTERFACE2(OFormatCondition,FormatConditionBase,FormatConditionPropertySet)
 
-void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OFormatCondition::dispose()
 {
     FormatConditionPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
 
-OUString OFormatCondition::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString OFormatCondition::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.OFormatCondition");
 }
 
 
-OUString SAL_CALL OFormatCondition::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OFormatCondition::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-uno::Sequence< OUString > OFormatCondition::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OFormatCondition::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { SERVICE_FORMATCONDITION };
 
     return aServices;
 }
 
-uno::Sequence< OUString > SAL_CALL OFormatCondition::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OFormatCondition::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
-sal_Bool SAL_CALL OFormatCondition::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OFormatCondition::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormatCondition::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormatCondition::getPropertySetInfo(  )
 {
     return FormatConditionPropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OFormatCondition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormatCondition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     FormatConditionPropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OFormatCondition::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFormatCondition::getPropertyValue( const OUString& PropertyName )
 {
     return FormatConditionPropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OFormatCondition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormatCondition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     FormatConditionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OFormatCondition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormatCondition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     FormatConditionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OFormatCondition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormatCondition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FormatConditionPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OFormatCondition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormatCondition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FormatConditionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
 
 // XFormatCondition
-sal_Bool SAL_CALL OFormatCondition::getEnabled() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFormatCondition::getEnabled()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bEnabled;
 }
 
-void SAL_CALL OFormatCondition::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFormatCondition::setEnabled( sal_Bool _enabled )
 {
     set(PROPERTY_ENABLED,_enabled,m_bEnabled);
 }
 
-OUString SAL_CALL OFormatCondition::getFormula() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OFormatCondition::getFormula()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_sFormula;
 }
 
-void SAL_CALL OFormatCondition::setFormula( const OUString& _formula ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFormatCondition::setFormula( const OUString& _formula )
 {
     set(PROPERTY_FORMULA,_formula,m_sFormula);
 }
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index 4f4056aaebfb..1644561a8ff1 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -81,7 +81,7 @@ OFormattedField::~OFormattedField()
 
 IMPLEMENT_FORWARD_REFCOUNT( OFormattedField, FormattedFieldBase )
 
-uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType )
 {
     uno::Any aReturn = FormattedFieldBase::queryInterface(_rType);
     if ( !aReturn.hasValue() )
@@ -93,7 +93,7 @@ uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) thr
 }
 
 
-void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::dispose()
 {
     FormattedFieldPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
@@ -101,18 +101,18 @@ void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException, std::excep
     m_xFunction.clear();
 }
 
-OUString OFormattedField::getImplementationName_Static(  ) throw(uno::RuntimeException, std::exception)
+OUString OFormattedField::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.OFormattedField");
 }
 
 
-OUString SAL_CALL OFormattedField::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OFormattedField::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices(2);
     aServices[0] = SERVICE_FORMATTEDFIELD;
@@ -121,12 +121,12 @@ uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static(  ) t
     return aServices;
 }
 
-uno::Sequence< OUString > SAL_CALL OFormattedField::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OFormattedField::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
-sal_Bool SAL_CALL OFormattedField::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OFormattedField::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -138,12 +138,12 @@ REPORTCOMPONENT_NOMASTERDETAIL(OFormattedField)
 REPORTCONTROLFORMAT_IMPL(OFormattedField,m_aProps.aFormatProperties)
 
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormattedField::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormattedField::getPropertySetInfo(  )
 {
     return FormattedFieldPropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OFormattedField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     // special case here /// TODO check
     if ( !aValue.hasValue() && aPropertyName == PROPERTY_FORMATKEY )
@@ -152,68 +152,68 @@ void SAL_CALL OFormattedField::setPropertyValue( const OUString& aPropertyName,
         FormattedFieldPropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OFormattedField::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFormattedField::getPropertyValue( const OUString& PropertyName )
 {
     return FormattedFieldPropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OFormattedField::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     FormattedFieldPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OFormattedField::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     FormattedFieldPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OFormattedField::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FormattedFieldPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OFormattedField::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FormattedFieldPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
 
 // XReportControlModel
-OUString SAL_CALL OFormattedField::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OFormattedField::getDataField()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aDataField;
 }
 
-void SAL_CALL OFormattedField::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::setDataField( const OUString& _datafield )
 {
     set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField);
 }
 
-sal_Bool SAL_CALL OFormattedField::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFormattedField::getPrintWhenGroupChange()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.bPrintWhenGroupChange;
 }
 
-void SAL_CALL OFormattedField::setPrintWhenGroupChange( sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::setPrintWhenGroupChange( sal_Bool _printwhengroupchange )
 {
     set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
 }
 
-OUString SAL_CALL OFormattedField::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OFormattedField::getConditionalPrintExpression()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aConditionalPrintExpression;
 }
 
-void SAL_CALL OFormattedField::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::setConditionalPrintExpression( const OUString& _conditionalprintexpression )
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
 }
 
 
 // XCloneable
-uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone(  )
 {
     uno::Reference< report::XReportComponent> xSource = this;
     uno::Reference< report::XFormattedField> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FORMATTEDFIELD),uno::UNO_QUERY_THROW);
@@ -234,18 +234,18 @@ uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone(  ) thr
 
 // XFormattedField
 
-::sal_Int32 SAL_CALL OFormattedField::getFormatKey() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFormattedField::getFormatKey()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_nFormatKey;
 }
 
-void SAL_CALL OFormattedField::setFormatKey(::sal_Int32 _formatkey) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::setFormatKey(::sal_Int32 _formatkey)
 {
     set(PROPERTY_FORMATKEY,_formatkey,m_nFormatKey);
 }
 
-uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getFormatsSupplier() throw (uno::RuntimeException, std::exception)
+uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getFormatsSupplier()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( !m_xFormatsSupplier.is() )
@@ -263,101 +263,101 @@ uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getForm
     return m_xFormatsSupplier;
 }
 
-void SAL_CALL OFormattedField::setFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& _formatssupplier ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::setFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& _formatssupplier )
 {
     set(PROPERTY_FORMATSSUPPLIER,_formatssupplier,m_xFormatsSupplier);
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OFormattedField::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OFormattedField::getParent(  )
 {
     return OShapeHelper::getParent(this);
 }
 
-void SAL_CALL OFormattedField::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::setParent( const uno::Reference< uno::XInterface >& Parent )
 {
     OShapeHelper::setParent(Parent,this);
 }
 
-uno::Reference< report::XFormatCondition > SAL_CALL OFormattedField::createFormatCondition(  ) throw (uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< report::XFormatCondition > SAL_CALL OFormattedField::createFormatCondition(  )
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
 
 // XContainer
-void SAL_CALL OFormattedField::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::addContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.addContainerListener(xListener);
 }
 
-void SAL_CALL OFormattedField::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.removeContainerListener(xListener);
 }
 
 // XElementAccess
-uno::Type SAL_CALL OFormattedField::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL OFormattedField::getElementType(  )
 {
     return cppu::UnoType<report::XFormatCondition>::get();
 }
 
-sal_Bool SAL_CALL OFormattedField::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFormattedField::hasElements(  )
 {
     return m_aProps.hasElements();
 }
 
 // XIndexContainer
-void SAL_CALL OFormattedField::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::insertByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.insertByIndex(Index,Element);
 }
 
-void SAL_CALL OFormattedField::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::removeByIndex( ::sal_Int32 Index )
 {
     m_aProps.removeByIndex(Index);
 }
 
 // XIndexReplace
-void SAL_CALL OFormattedField::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.replaceByIndex(Index,Element);
 }
 
 // XIndexAccess
-::sal_Int32 SAL_CALL OFormattedField::getCount(  ) throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFormattedField::getCount(  )
 {
     return m_aProps.getCount();
 }
 
-uno::Any SAL_CALL OFormattedField::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFormattedField::getByIndex( ::sal_Int32 Index )
 {
     return m_aProps.getByIndex( Index );
 }
 
 // XShape
-awt::Point SAL_CALL OFormattedField::getPosition(  ) throw (uno::RuntimeException, std::exception)
+awt::Point SAL_CALL OFormattedField::getPosition(  )
 {
     return OShapeHelper::getPosition(this);
 }
 
-void SAL_CALL OFormattedField::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::setPosition( const awt::Point& aPosition )
 {
     OShapeHelper::setPosition(aPosition,this);
 }
 
-awt::Size SAL_CALL OFormattedField::getSize(  ) throw (uno::RuntimeException, std::exception)
+awt::Size SAL_CALL OFormattedField::getSize(  )
 {
     return OShapeHelper::getSize(this);
 }
 
-void SAL_CALL OFormattedField::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL OFormattedField::setSize( const awt::Size& aSize )
 {
     OShapeHelper::setSize(aSize,this);
 }
 
 
 // XShapeDescriptor
-OUString SAL_CALL OFormattedField::getShapeType(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OFormattedField::getShapeType(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( m_aProps.aComponent.m_xShape.is() )
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index 839c6a41952f..e734be1d89ab 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -52,143 +52,143 @@ OFunction::~OFunction()
 
 IMPLEMENT_FORWARD_XINTERFACE2(OFunction,FunctionBase,FunctionPropertySet)
 
-void SAL_CALL OFunction::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::dispose()
 {
     FunctionPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
 
-OUString OFunction::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString OFunction::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.OFunction");
 }
 
 
-OUString SAL_CALL OFunction::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OFunction::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-uno::Sequence< OUString > OFunction::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OFunction::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { SERVICE_FUNCTION };
 
     return aServices;
 }
 
-uno::Sequence< OUString > SAL_CALL OFunction::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OFunction::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
-sal_Bool SAL_CALL OFunction::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OFunction::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OFunction::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OFunction::getPropertySetInfo(  )
 {
     return FunctionPropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OFunction::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     FunctionPropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OFunction::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFunction::getPropertyValue( const OUString& PropertyName )
 {
     return FunctionPropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OFunction::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     FunctionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OFunction::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     FunctionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OFunction::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FunctionPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OFunction::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     FunctionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
 
 // report::XFunction:
-sal_Bool SAL_CALL OFunction::getPreEvaluated() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFunction::getPreEvaluated()
 {
     osl::MutexGuard g(m_aMutex);
     return m_bPreEvaluated;
 }
 
 
-void SAL_CALL OFunction::setPreEvaluated(sal_Bool the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::setPreEvaluated(sal_Bool the_value)
 {
     set(PROPERTY_PREEVALUATED,the_value,m_bPreEvaluated);
 }
 
-sal_Bool SAL_CALL OFunction::getDeepTraversing() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFunction::getDeepTraversing()
 {
     osl::MutexGuard g(m_aMutex);
     return m_bDeepTraversing;
 }
 
 
-void SAL_CALL OFunction::setDeepTraversing(sal_Bool the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::setDeepTraversing(sal_Bool the_value)
 {
     set(PROPERTY_DEEPTRAVERSING,the_value,m_bDeepTraversing);
 }
 
 
-OUString SAL_CALL OFunction::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OFunction::getName()
 {
     osl::MutexGuard g(m_aMutex);
     return m_sName;
 }
 
 
-void SAL_CALL OFunction::setName(const OUString & the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::setName(const OUString & the_value)
 {
     set(PROPERTY_NAME,the_value,m_sName);
 }
 
-OUString SAL_CALL OFunction::getFormula() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OFunction::getFormula()
 {
     osl::MutexGuard g(m_aMutex);
     return m_sFormula;
 }
 
-void SAL_CALL OFunction::setFormula(const OUString & the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::setFormula(const OUString & the_value)
 {
     set(PROPERTY_FORMULA,the_value,m_sFormula);
 }
 
-beans::Optional< OUString> SAL_CALL OFunction::getInitialFormula() throw (uno::RuntimeException, std::exception)
+beans::Optional< OUString> SAL_CALL OFunction::getInitialFormula()
 {
     osl::MutexGuard g(m_aMutex);
     return m_sInitialFormula;
 }
 
-void SAL_CALL OFunction::setInitialFormula(const beans::Optional< OUString> & the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::setInitialFormula(const beans::Optional< OUString> & the_value)
 {
     set(PROPERTY_INITIALFORMULA,the_value,m_sInitialFormula);
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OFunction::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OFunction::getParent(  )
 {
     osl::MutexGuard g(m_aMutex);
     return m_xParent;
 }
 
-void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Parent )
 {
     osl::MutexGuard g(m_aMutex);
     if ( Parent.is() )
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index 50f041f10998..2748244fd8d8 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -43,7 +43,7 @@ OFunctions::~OFunctions()
 {
 }
 
-void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OFunctions::dispose()
 {
     cppu::WeakComponentImplHelperBase::dispose();
 }
@@ -62,13 +62,13 @@ void SAL_CALL OFunctions::disposing()
 
 // XFunctionsSupplier
 
-uno::Reference< report::XFunction > SAL_CALL OFunctions::createFunction(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XFunction > SAL_CALL OFunctions::createFunction(  )
 {
     return new OFunction(m_xContext);
 }
 
 // XIndexContainer
-void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement )
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -95,7 +95,7 @@ void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aEle
 }
 
 
-void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index )
 {
     uno::Reference< report::XFunction > xFunction;
     {
@@ -112,7 +112,7 @@ void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexO
 }
 
 // XIndexReplace
-void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     uno::Any aOldElement;
     {
@@ -132,13 +132,13 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele
 }
 
 // XIndexAccess
-::sal_Int32 SAL_CALL OFunctions::getCount(  ) throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OFunctions::getCount(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aFunctions.size();
 }
 
-uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkIndex(Index);
@@ -148,35 +148,35 @@ uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index ) throw (lang::Index
 }
 
 // XElementAccess
-uno::Type SAL_CALL OFunctions::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL OFunctions::getElementType(  )
 {
     return cppu::UnoType<report::XFunction>::get();
 }
 
-sal_Bool SAL_CALL OFunctions::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OFunctions::hasElements(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return !m_aFunctions.empty();
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OFunctions::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OFunctions::getParent(  )
 {
     return m_xParent;
 }
 
-void SAL_CALL OFunctions::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OFunctions::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ )
 {
     throw lang::NoSupportException();
 }
 
 // XContainer
-void SAL_CALL OFunctions::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFunctions::addContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aContainerListeners.addInterface(xListener);
 }
 
-void SAL_CALL OFunctions::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OFunctions::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aContainerListeners.removeInterface(xListener);
 }
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index c25a8dc39be7..0694c9ad0ccc 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -59,28 +59,28 @@ OGroup::~OGroup()
 
 IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet)
 
-OUString SAL_CALL OGroup::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OGroup::getImplementationName(  )
 {
     return OUString("com.sun.star.comp.report.Group");
 }
 
-uno::Sequence< OUString> OGroup::getSupportedServiceNames_Static() throw( uno::RuntimeException )
+uno::Sequence< OUString> OGroup::getSupportedServiceNames_Static()
 {
     uno::Sequence<OUString> aSupported { SERVICE_GROUP };
     return aSupported;
 }
 
-uno::Sequence< OUString> SAL_CALL OGroup::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString> SAL_CALL OGroup::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-sal_Bool SAL_CALL OGroup::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGroup::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-void SAL_CALL OGroup::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::dispose()
 {
     GroupPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
@@ -97,24 +97,24 @@ void SAL_CALL OGroup::disposing()
 }
 
 // XGroup
-sal_Bool SAL_CALL OGroup::getSortAscending() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGroup::getSortAscending()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_eSortAscending;
 }
 
-void SAL_CALL OGroup::setSortAscending( sal_Bool _sortascending ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setSortAscending( sal_Bool _sortascending )
 {
     set(PROPERTY_SORTASCENDING,_sortascending,m_aProps.m_eSortAscending);
 }
 
-sal_Bool SAL_CALL OGroup::getHeaderOn() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGroup::getHeaderOn()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xHeader.is();
 }
 
-void SAL_CALL OGroup::setHeaderOn( sal_Bool _headeron ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setHeaderOn( sal_Bool _headeron )
 {
     if ( bool(_headeron) != m_xHeader.is() )
     {
@@ -123,13 +123,13 @@ void SAL_CALL OGroup::setHeaderOn( sal_Bool _headeron ) throw (uno::RuntimeExcep
     }
 }
 
-sal_Bool SAL_CALL OGroup::getFooterOn() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGroup::getFooterOn()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xFooter.is();
 }
 
-void SAL_CALL OGroup::setFooterOn( sal_Bool _footeron ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setFooterOn( sal_Bool _footeron )
 {
     if ( bool(_footeron) != m_xFooter.is() )
     {
@@ -138,7 +138,7 @@ void SAL_CALL OGroup::setFooterOn( sal_Bool _footeron ) throw (uno::RuntimeExcep
     }
 }
 
-uno::Reference< report::XSection > SAL_CALL OGroup::getHeader() throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+uno::Reference< report::XSection > SAL_CALL OGroup::getHeader()
 {
     uno::Reference< report::XSection > xRet;
     {
@@ -151,7 +151,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getHeader() throw (container
     return xRet;
 }
 
-uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+uno::Reference< report::XSection > SAL_CALL OGroup::getFooter()
 {
     uno::Reference< report::XSection > xRet;
     {
@@ -164,13 +164,13 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container
     return xRet;
 }
 
-::sal_Int16 SAL_CALL OGroup::getGroupOn() throw (uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL OGroup::getGroupOn()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_nGroupOn;
 }
 
-void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon )
 {
     if ( _groupon < report::GroupOn::DEFAULT || _groupon > report::GroupOn::INTERVAL )
         throwIllegallArgumentException("css::report::GroupOn"
@@ -179,24 +179,24 @@ void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArg
     set(PROPERTY_GROUPON,_groupon,m_aProps.m_nGroupOn);
 }
 
-::sal_Int32 SAL_CALL OGroup::getGroupInterval() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OGroup::getGroupInterval()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_nGroupInterval;
 }
 
-void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval )
 {
     set(PROPERTY_GROUPINTERVAL,_groupinterval,m_aProps.m_nGroupInterval);
 }
 
-::sal_Int16 SAL_CALL OGroup::getKeepTogether() throw (uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL OGroup::getKeepTogether()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_nKeepTogether;
 }
 
-void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether )
 {
     if ( _keeptogether < report::KeepTogether::NO || _keeptogether > report::KeepTogether::WITH_FIRST_DETAIL )
         throwIllegallArgumentException("css::report::KeepTogether"
@@ -205,87 +205,87 @@ void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::
     set(PROPERTY_KEEPTOGETHER,_keeptogether,m_aProps.m_nKeepTogether);
 }
 
-uno::Reference< report::XGroups > SAL_CALL OGroup::getGroups() throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XGroups > SAL_CALL OGroup::getGroups()
 {
     return m_xParent;
 }
 
-OUString SAL_CALL OGroup::getExpression() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OGroup::getExpression()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_sExpression;
 }
 
-void SAL_CALL OGroup::setExpression( const OUString& _expression ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setExpression( const OUString& _expression )
 {
     set(PROPERTY_EXPRESSION,_expression,m_aProps.m_sExpression);
 }
 
-sal_Bool SAL_CALL OGroup::getStartNewColumn() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGroup::getStartNewColumn()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_bStartNewColumn;
 }
 
-void SAL_CALL OGroup::setStartNewColumn( sal_Bool _startnewcolumn ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setStartNewColumn( sal_Bool _startnewcolumn )
 {
     set(PROPERTY_STARTNEWCOLUMN,_startnewcolumn,m_aProps.m_bStartNewColumn);
 }
 
 
-sal_Bool SAL_CALL OGroup::getResetPageNumber() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGroup::getResetPageNumber()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_bResetPageNumber;
 }
 
-void SAL_CALL OGroup::setResetPageNumber( sal_Bool _resetpagenumber ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setResetPageNumber( sal_Bool _resetpagenumber )
 {
     set(PROPERTY_RESETPAGENUMBER,_resetpagenumber,m_aProps.m_bResetPageNumber);
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OGroup::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OGroup::getParent(  )
 {
     return m_xParent;
 }
 
-void SAL_CALL OGroup::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ )
 {
     throw lang::NoSupportException();
 }
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo(  )
 {
     return GroupPropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OGroup::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     GroupPropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OGroup::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OGroup::getPropertyValue( const OUString& PropertyName )
 {
     return GroupPropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OGroup::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     GroupPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OGroup::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     GroupPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OGroup::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     GroupPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     GroupPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
@@ -306,7 +306,7 @@ void OGroup::setSection(     const OUString& _sProperty
     l.notify();
 }
 
-uno::Reference< report::XFunctions > SAL_CALL OGroup::getFunctions() throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XFunctions > SAL_CALL OGroup::getFunctions()
 {
     return m_xFunctions;
 }
diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx
index e8e5c3dbc5f4..2e20af80fc4c 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -42,7 +42,7 @@ OGroups::~OGroups()
 {
 }
 
-void SAL_CALL OGroups::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OGroups::dispose()
 {
     cppu::WeakComponentImplHelperBase::dispose();
 }
@@ -60,18 +60,18 @@ void SAL_CALL OGroups::disposing()
 }
 
 // XGroups
-uno::Reference< report::XReportDefinition > SAL_CALL OGroups::getReportDefinition() throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XReportDefinition > SAL_CALL OGroups::getReportDefinition()
 {
     return m_xParent;
 }
 
-uno::Reference< report::XGroup > SAL_CALL OGroups::createGroup(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XGroup > SAL_CALL OGroups::createGroup(  )
 {
     return new OGroup(this,m_xContext);
 }
 
 // XIndexContainer
-void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement )
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -97,7 +97,7 @@ void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElemen
 }
 
 
-void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index )
 {
     uno::Reference< report::XGroup > xGroup;
     {
@@ -113,7 +113,7 @@ void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutO
 }
 
 // XIndexReplace
-void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     uno::Any aOldElement;
     {
@@ -133,13 +133,13 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Elemen
 }
 
 // XIndexAccess
-::sal_Int32 SAL_CALL OGroups::getCount(  ) throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OGroups::getCount(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aGroups.size();
 }
 
-uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkIndex(Index);
@@ -149,35 +149,35 @@ uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOut
 }
 
 // XElementAccess
-uno::Type SAL_CALL OGroups::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL OGroups::getElementType(  )
 {
     return cppu::UnoType<report::XGroup>::get();
 }
 
-sal_Bool SAL_CALL OGroups::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGroups::hasElements(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return !m_aGroups.empty();
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OGroups::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OGroups::getParent(  )
 {
     return m_xParent;
 }
 
-void SAL_CALL OGroups::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OGroups::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ )
 {
     throw lang::NoSupportException();
 }
 
 // XContainer
-void SAL_CALL OGroups::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGroups::addContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aContainerListeners.addInterface(xListener);
 }
 
-void SAL_CALL OGroups::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGroups::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aContainerListeners.removeInterface(xListener);
 }
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index e020fad66980..1dceb29ae5d1 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -148,7 +148,7 @@ OImageControl::~OImageControl()
 //IMPLEMENT_FORWARD_XINTERFACE2(OImageControl,ImageControlBase,ImageControlPropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OImageControl, ImageControlBase )
 
-uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType )
 {
     uno::Any aReturn = ImageControlBase::queryInterface(_rType);
     if ( !aReturn.hasValue() )
@@ -161,24 +161,24 @@ uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType ) throw
 }
 
 
-void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::dispose()
 {
     ImageControlPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
 
-OUString OImageControl::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString OImageControl::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.OImageControl");
 }
 
 
-OUString SAL_CALL OImageControl::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OImageControl::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-uno::Sequence< OUString > OImageControl::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OImageControl::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { SERVICE_IMAGECONTROL };
 
@@ -191,12 +191,12 @@ uno::Reference< uno::XInterface > OImageControl::create(uno::Reference< uno::XCo
 }
 
 
-uno::Sequence< OUString > SAL_CALL OImageControl::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OImageControl::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
-sal_Bool SAL_CALL OImageControl::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OImageControl::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -206,42 +206,42 @@ REPORTCOMPONENT_IMPL(OImageControl,m_aProps.aComponent)
 REPORTCOMPONENT_IMPL2(OImageControl,m_aProps.aComponent)
 REPORTCOMPONENT_NOMASTERDETAIL(OImageControl)
 NO_REPORTCONTROLFORMAT_IMPL(OImageControl)
-OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+OUString SAL_CALL OImageControl::getHyperLinkURL()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aFormatProperties.sHyperLinkURL;
 }
-void SAL_CALL OImageControl::setHyperLinkURL(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+void SAL_CALL OImageControl::setHyperLinkURL(const OUString & the_value)
 {
     set(PROPERTY_HYPERLINKURL,the_value,m_aProps.aFormatProperties.sHyperLinkURL);
 }
-OUString SAL_CALL OImageControl::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+OUString SAL_CALL OImageControl::getHyperLinkTarget()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aFormatProperties.sHyperLinkTarget;
 }
-void SAL_CALL OImageControl::setHyperLinkTarget(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+void SAL_CALL OImageControl::setHyperLinkTarget(const OUString & the_value)
 {
     set(PROPERTY_HYPERLINKTARGET,the_value,m_aProps.aFormatProperties.sHyperLinkTarget);
 }
-OUString SAL_CALL OImageControl::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+OUString SAL_CALL OImageControl::getHyperLinkName()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aFormatProperties.sHyperLinkName;
 }
-void SAL_CALL OImageControl::setHyperLinkName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+void SAL_CALL OImageControl::setHyperLinkName(const OUString & the_value)
 {
     set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName);
 }
 
 
-::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OImageControl::getControlBackground()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aFormatProperties.m_bBackgroundTransparent ? COL_TRANSPARENT : m_aProps.aFormatProperties.nBackgroundColor;
 }
 
-void SAL_CALL OImageControl::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+void SAL_CALL OImageControl::setControlBackground( ::sal_Int32 _backgroundcolor )
 {
     bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT);
     setControlBackgroundTransparent(bTransparent);
@@ -249,13 +249,13 @@ void SAL_CALL OImageControl::setControlBackground( ::sal_Int32 _backgroundcolor
         set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,m_aProps.aFormatProperties.nBackgroundColor);
 }
 
-sal_Bool SAL_CALL OImageControl::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OImageControl::getControlBackgroundTransparent()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aFormatProperties.m_bBackgroundTransparent;
 }
 
-void SAL_CALL OImageControl::setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent )
 {
     set(PROPERTY_CONTROLBACKGROUNDTRANSPARENT,_controlbackgroundtransparent,m_aProps.aFormatProperties.m_bBackgroundTransparent);
     if ( _controlbackgroundtransparent )
@@ -263,79 +263,79 @@ void SAL_CALL OImageControl::setControlBackgroundTransparent( sal_Bool _controlb
 }
 
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OImageControl::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OImageControl::getPropertySetInfo(  )
 {
     return ImageControlPropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OImageControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     ImageControlPropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OImageControl::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OImageControl::getPropertyValue( const OUString& PropertyName )
 {
     return ImageControlPropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OImageControl::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     ImageControlPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OImageControl::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     ImageControlPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OImageControl::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     ImageControlPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OImageControl::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     ImageControlPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
 
 // XReportControlModel
-OUString SAL_CALL OImageControl::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OImageControl::getDataField()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aDataField;
 }
 
-void SAL_CALL OImageControl::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setDataField( const OUString& _datafield )
 {
     set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField);
 }
 
 
-sal_Bool SAL_CALL OImageControl::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OImageControl::getPrintWhenGroupChange()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.bPrintWhenGroupChange;
 }
 
-void SAL_CALL OImageControl::setPrintWhenGroupChange( sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setPrintWhenGroupChange( sal_Bool _printwhengroupchange )
 {
     set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
 }
 
-OUString SAL_CALL OImageControl::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OImageControl::getConditionalPrintExpression()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aConditionalPrintExpression;
 }
 
-void SAL_CALL OImageControl::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setConditionalPrintExpression( const OUString& _conditionalprintexpression )
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
 }
 
 
 // XCloneable
-uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone(  )
 {
     uno::Reference< report::XReportComponent> xSource = this;
     uno::Reference< report::XImageControl> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_IMAGECONTROL),uno::UNO_QUERY_THROW);
@@ -345,112 +345,112 @@ uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone(  ) throw
 
 // XImageControl
 
-OUString SAL_CALL OImageControl::getImageURL() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OImageControl::getImageURL()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aImageURL;
 }
 
-void SAL_CALL OImageControl::setImageURL( const OUString& _imageurl ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setImageURL( const OUString& _imageurl )
 {
     set(PROPERTY_IMAGEURL,_imageurl,m_aImageURL);
 }
 
-uno::Reference< awt::XImageProducer > SAL_CALL OImageControl::getImageProducer(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< awt::XImageProducer > SAL_CALL OImageControl::getImageProducer(  )
 {
     return uno::Reference< awt::XImageProducer >();
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OImageControl::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OImageControl::getParent(  )
 {
     return OShapeHelper::getParent(this);
 }
 
-void SAL_CALL OImageControl::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setParent( const uno::Reference< uno::XInterface >& Parent )
 {
     OShapeHelper::setParent(Parent,this);
 }
-uno::Reference< report::XFormatCondition > SAL_CALL OImageControl::createFormatCondition(  ) throw (uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< report::XFormatCondition > SAL_CALL OImageControl::createFormatCondition(  )
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
 
 // XContainer
-void SAL_CALL OImageControl::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::addContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.addContainerListener(xListener);
 }
 
-void SAL_CALL OImageControl::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.removeContainerListener(xListener);
 }
 
 // XElementAccess
-uno::Type SAL_CALL OImageControl::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL OImageControl::getElementType(  )
 {
     return cppu::UnoType<report::XFormatCondition>::get();
 }
 
-sal_Bool SAL_CALL OImageControl::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OImageControl::hasElements(  )
 {
     return m_aProps.hasElements();
 }
 
 // XIndexContainer
-void SAL_CALL OImageControl::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::insertByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.insertByIndex(Index,Element);
 }
 
-void SAL_CALL OImageControl::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::removeByIndex( ::sal_Int32 Index )
 {
     m_aProps.removeByIndex(Index);
 }
 
 // XIndexReplace
-void SAL_CALL OImageControl::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.replaceByIndex(Index,Element);
 }
 
 // XIndexAccess
-::sal_Int32 SAL_CALL OImageControl::getCount(  ) throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OImageControl::getCount(  )
 {
     return m_aProps.getCount();
 }
 
-uno::Any SAL_CALL OImageControl::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OImageControl::getByIndex( ::sal_Int32 Index )
 {
     return m_aProps.getByIndex( Index );
 }
 
 
 // XShape
-awt::Point SAL_CALL OImageControl::getPosition(  ) throw (uno::RuntimeException, std::exception)
+awt::Point SAL_CALL OImageControl::getPosition(  )
 {
     return OShapeHelper::getPosition(this);
 }
 
-void SAL_CALL OImageControl::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setPosition( const awt::Point& aPosition )
 {
     OShapeHelper::setPosition(aPosition,this);
 }
 
-awt::Size SAL_CALL OImageControl::getSize(  ) throw (uno::RuntimeException, std::exception)
+awt::Size SAL_CALL OImageControl::getSize(  )
 {
     return OShapeHelper::getSize(this);
 }
 
-void SAL_CALL OImageControl::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setSize( const awt::Size& aSize )
 {
     OShapeHelper::setSize(aSize,this);
 }
 
 
 // XShapeDescriptor
-OUString SAL_CALL OImageControl::getShapeType(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OImageControl::getShapeType(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( m_aProps.aComponent.m_xShape.is() )
@@ -458,26 +458,26 @@ OUString SAL_CALL OImageControl::getShapeType(  ) throw (uno::RuntimeException,
     return OUString("com.sun.star.drawing.ControlShape");
 }
 
-::sal_Int16 SAL_CALL OImageControl::getScaleMode() throw (uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL OImageControl::getScaleMode()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_nScaleMode;
 }
 
-void SAL_CALL OImageControl::setScaleMode( ::sal_Int16 _scalemode ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setScaleMode( ::sal_Int16 _scalemode )
 {
     if ( _scalemode < awt::ImageScaleMode::NONE ||_scalemode > awt::ImageScaleMode::ANISOTROPIC )
         throw lang::IllegalArgumentException();
     set(PROPERTY_SCALEMODE,_scalemode,m_nScaleMode);
 }
 
-sal_Bool SAL_CALL OImageControl::getPreserveIRI() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OImageControl::getPreserveIRI()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bPreserveIRI;
 }
 
-void SAL_CALL OImageControl::setPreserveIRI( sal_Bool _preserveiri ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OImageControl::setPreserveIRI( sal_Bool _preserveiri )
 {
     set(PROPERTY_PRESERVEIRI,_preserveiri,m_bPreserveIRI);
 }
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx
index 3f9d20307fc3..46cef2f88ed4 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -25,24 +25,24 @@ using namespace com::sun::star;
 using namespace comphelper;
 
 // XContainer
-void OReportControlModel::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
+void OReportControlModel::addContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     aContainerListeners.addInterface(xListener);
 }
 
-void OReportControlModel::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
+void OReportControlModel::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     aContainerListeners.removeInterface(xListener);
 }
 
-bool OReportControlModel::hasElements(  ) throw (uno::RuntimeException)
+bool OReportControlModel::hasElements(  )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return !m_aFormatConditions.empty();
 }
 
 // XIndexContainer
-void OReportControlModel::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
+void OReportControlModel::insertByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     uno::Reference<report::XFormatCondition> xElement(Element,uno::UNO_QUERY);
     if ( !xElement.is() )
@@ -63,7 +63,7 @@ void OReportControlModel::insertByIndex( ::sal_Int32 Index, const uno::Any& Elem
     aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent);
 }
 
-void OReportControlModel::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
+void OReportControlModel::removeByIndex( ::sal_Int32 Index )
 {
     uno::Any Element;
     uno::Reference< container::XContainer > xBroadcaster;
@@ -79,7 +79,7 @@ void OReportControlModel::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexO
 }
 
 // XIndexReplace
-void OReportControlModel::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
+void OReportControlModel::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     uno::Reference<report::XFormatCondition> xElement(Element,uno::UNO_QUERY);
     if ( !xElement.is() )
@@ -96,13 +96,13 @@ void OReportControlModel::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele
 }
 
 // XIndexAccess
-::sal_Int32 OReportControlModel::getCount(  ) throw (uno::RuntimeException)
+::sal_Int32 OReportControlModel::getCount(  )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return m_aFormatConditions.size();
 }
 
-uno::Any OReportControlModel::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
+uno::Any OReportControlModel::getByIndex( ::sal_Int32 Index )
 {
     uno::Any aElement;
     {
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 2c2bb456e5db..84fcc9fec93d 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -252,28 +252,28 @@ public:
     DECLARE_XINTERFACE( )
 
     // XPropertySet
-    css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
     ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
     // XStyle
-    sal_Bool SAL_CALL isUserDefined(  ) throw (uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isInUse(  ) throw (uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getParentStyle(  ) throw (uno::RuntimeException, std::exception) override;
-    void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw (container::NoSuchElementException, uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isUserDefined(  ) override;
+    sal_Bool SAL_CALL isInUse(  ) override;
+    OUString SAL_CALL getParentStyle(  ) override;
+    void SAL_CALL setParentStyle( const OUString& aParentStyle ) override;
 
     // XNamed
-    OUString SAL_CALL getName(  ) throw (uno::RuntimeException, std::exception) override;
-    void SAL_CALL setName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getName(  ) override;
+    void SAL_CALL setName( const OUString& aName ) override;
 
     // XMultiPropertyState
-    uno::Sequence< beans::PropertyState > SAL_CALL getPropertyStates( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) override
+    uno::Sequence< beans::PropertyState > SAL_CALL getPropertyStates( const uno::Sequence< OUString >& aPropertyNames ) override
     {
         return OStyle_PBASE::getPropertyStates(aPropertyNames);
     }
-    void SAL_CALL setAllPropertiesToDefault(  ) throw (uno::RuntimeException, std::exception) override;
-    void SAL_CALL setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) override;
-    uno::Sequence< uno::Any > SAL_CALL getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL setAllPropertiesToDefault(  ) override;
+    void SAL_CALL setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) override;
+    uno::Sequence< uno::Any > SAL_CALL getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) override;
 };
 
 OStyle::OStyle()
@@ -376,7 +376,7 @@ OStyle::OStyle()
 
 IMPLEMENT_FORWARD_XINTERFACE2(OStyle,TStyleBASE,OStyle_PBASE)
 
-uno::Reference< beans::XPropertySetInfo>  SAL_CALL OStyle::getPropertySetInfo() throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo>  SAL_CALL OStyle::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() );
 }
@@ -398,43 +398,43 @@ void OStyle::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, uno::Any& /*_rD
 }
 
 // XStyle
-sal_Bool SAL_CALL OStyle::isUserDefined(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OStyle::isUserDefined(  )
 {
     return false;
 }
 
-sal_Bool SAL_CALL OStyle::isInUse(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OStyle::isInUse(  )
 {
     return true;
 }
 
-OUString SAL_CALL OStyle::getParentStyle(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OStyle::getParentStyle(  )
 {
     return OUString();
 }
 
-void SAL_CALL OStyle::setParentStyle( const OUString& /*aParentStyle*/ ) throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+void SAL_CALL OStyle::setParentStyle( const OUString& /*aParentStyle*/ )
 {
 }
 
 // XNamed
-OUString SAL_CALL OStyle::getName(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OStyle::getName(  )
 {
     OUString sName;
     getPropertyValue(PROPERTY_NAME) >>= sName;
     return sName;
 }
 
-void SAL_CALL OStyle::setName( const OUString& aName ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OStyle::setName( const OUString& aName )
 {
     setPropertyValue(PROPERTY_NAME,uno::makeAny(aName));
 }
 
-void SAL_CALL OStyle::setAllPropertiesToDefault(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OStyle::setAllPropertiesToDefault(  )
 {
 }
 
-void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames )
 {
     const OUString* pIter = aPropertyNames.getConstArray();
     const OUString* pEnd   = pIter + aPropertyNames.getLength();
@@ -442,7 +442,7 @@ void SAL_CALL OStyle::setPropertiesToDefault( const uno::Sequence< OUString >& a
         setPropertyToDefault(*pIter);
 }
 
-uno::Sequence< uno::Any > SAL_CALL OStyle::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Sequence< uno::Any > SAL_CALL OStyle::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames )
 {
     uno::Sequence< uno::Any > aRet(aPropertyNames.getLength());
     const OUString* pIter = aPropertyNames.getConstArray();
@@ -614,7 +614,7 @@ void OReportDefinition::init()
     }
 }
 
-void SAL_CALL OReportDefinition::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::dispose()
 {
     ReportDefinitionPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
@@ -676,24 +676,24 @@ void SAL_CALL OReportDefinition::disposing()
 }
 
 
-OUString OReportDefinition::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString OReportDefinition::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.OReportDefinition");
 }
 
-OUString SAL_CALL OReportDefinition::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportDefinition::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-uno::Sequence< OUString > OReportDefinition::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OReportDefinition::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { SERVICE_REPORTDEFINITION };
 
     return aServices;
 }
 
-uno::Sequence< OUString > SAL_CALL OReportDefinition::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OReportDefinition::getSupportedServiceNames(  )
 {
     // first collect the services which are supported by our aggregate
     uno::Sequence< OUString > aSupported;
@@ -712,12 +712,12 @@ uno::Sequence< OUString > SAL_CALL OReportDefinition::getSupportedServiceNames(
     return aSupported;
 }
 
-sal_Bool SAL_CALL OReportDefinition::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-uno::Any SAL_CALL OReportDefinition::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OReportDefinition::queryInterface( const uno::Type& _rType )
 {
     uno::Any aReturn = ReportDefinitionBase::queryInterface(_rType);
     if ( !aReturn.hasValue() )
@@ -725,7 +725,7 @@ uno::Any SAL_CALL OReportDefinition::queryInterface( const uno::Type& _rType ) t
 
     return aReturn.hasValue() ? aReturn : (m_aProps->m_xProxy.is() ? m_aProps->m_xProxy->queryAggregation(_rType) : aReturn);
 }
-uno::Sequence< uno::Type > SAL_CALL OReportDefinition::getTypes(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL OReportDefinition::getTypes(  )
 {
     if ( m_aProps->m_xTypeProvider.is() )
         return ::comphelper::concatSequences(
@@ -741,24 +741,24 @@ uno::Reference< uno::XInterface > OReportDefinition::create(uno::Reference< uno:
 }
 
 // XReportDefinition
-OUString SAL_CALL OReportDefinition::getCaption() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportDefinition::getCaption()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_sCaption;
 }
 
-void SAL_CALL OReportDefinition::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setCaption( const OUString& _caption )
 {
     set(PROPERTY_CAPTION,_caption,m_pImpl->m_sCaption);
 }
 
-::sal_Int16 SAL_CALL OReportDefinition::getGroupKeepTogether() throw (uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL OReportDefinition::getGroupKeepTogether()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_nGroupKeepTogether;
 }
 
-void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptogether )
 {
     if ( _groupkeeptogether < report::GroupKeepTogether::PER_PAGE || _groupkeeptogether > report::GroupKeepTogether::PER_COLUMN )
         throwIllegallArgumentException("css::report::GroupKeepTogether"
@@ -767,13 +767,13 @@ void SAL_CALL OReportDefinition::setGroupKeepTogether( ::sal_Int16 _groupkeeptog
     set(PROPERTY_GROUPKEEPTOGETHER,_groupkeeptogether,m_pImpl->m_nGroupKeepTogether);
 }
 
-::sal_Int16 SAL_CALL OReportDefinition::getPageHeaderOption() throw (uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL OReportDefinition::getPageHeaderOption()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_nPageHeaderOption;
 }
 
-void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderoption )
 {
     if ( _pageheaderoption < report::ReportPrintOption::ALL_PAGES || _pageheaderoption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER )
         throwIllegallArgumentException("css::report::ReportPrintOption"
@@ -782,13 +782,13 @@ void SAL_CALL OReportDefinition::setPageHeaderOption( ::sal_Int16 _pageheaderopt
     set(PROPERTY_PAGEHEADEROPTION,_pageheaderoption,m_pImpl->m_nPageHeaderOption);
 }
 
-::sal_Int16 SAL_CALL OReportDefinition::getPageFooterOption() throw (uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL OReportDefinition::getPageFooterOption()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_nPageFooterOption;
 }
 
-void SAL_CALL OReportDefinition::setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setPageFooterOption( ::sal_Int16 _pagefooteroption )
 {
     if ( _pagefooteroption < report::ReportPrintOption::ALL_PAGES || _pagefooteroption > report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER )
         throwIllegallArgumentException("css::report::ReportPrintOption"
@@ -797,24 +797,24 @@ void SAL_CALL OReportDefinition::setPageFooterOption( ::sal_Int16 _pagefooteropt
     set(PROPERTY_PAGEFOOTEROPTION,_pagefooteroption,m_pImpl->m_nPageFooterOption);
 }
 
-OUString SAL_CALL OReportDefinition::getCommand() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportDefinition::getCommand()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_sCommand;
 }
 
-void SAL_CALL OReportDefinition::setCommand( const OUString& _command ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setCommand( const OUString& _command )
 {
     set(PROPERTY_COMMAND,_command,m_pImpl->m_sCommand);
 }
 
-::sal_Int32 SAL_CALL OReportDefinition::getCommandType() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OReportDefinition::getCommandType()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_nCommandType;
 }
 
-void SAL_CALL OReportDefinition::setCommandType( ::sal_Int32 _commandtype ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setCommandType( ::sal_Int32 _commandtype )
 {
     if ( _commandtype < sdb::CommandType::TABLE || _commandtype > sdb::CommandType::COMMAND )
         throwIllegallArgumentException("css::sdb::CommandType"
@@ -823,35 +823,35 @@ void SAL_CALL OReportDefinition::setCommandType( ::sal_Int32 _commandtype ) thro
     set(PROPERTY_COMMANDTYPE,_commandtype,m_pImpl->m_nCommandType);
 }
 
-OUString SAL_CALL OReportDefinition::getFilter() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportDefinition::getFilter()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_sFilter;
 }
 
-void SAL_CALL OReportDefinition::setFilter( const OUString& _filter ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setFilter( const OUString& _filter )
 {
     set(PROPERTY_FILTER,_filter,m_pImpl->m_sFilter);
 }
 
-sal_Bool SAL_CALL OReportDefinition::getEscapeProcessing() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::getEscapeProcessing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_bEscapeProcessing;
 }
 
-void SAL_CALL OReportDefinition::setEscapeProcessing( sal_Bool _escapeprocessing ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setEscapeProcessing( sal_Bool _escapeprocessing )
 {
     set(PROPERTY_ESCAPEPROCESSING,_escapeprocessing,m_pImpl->m_bEscapeProcessing);
 }
 
-sal_Bool SAL_CALL OReportDefinition::getReportHeaderOn() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::getReportHeaderOn()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_xReportHeader.is();
 }
 
-void SAL_CALL OReportDefinition::setReportHeaderOn( sal_Bool _reportheaderon ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setReportHeaderOn( sal_Bool _reportheaderon )
 {
     if ( bool(_reportheaderon) != m_pImpl->m_xReportHeader.is() )
     {
@@ -859,13 +859,13 @@ void SAL_CALL OReportDefinition::setReportHeaderOn( sal_Bool _reportheaderon ) t
     }
 }
 
-sal_Bool SAL_CALL OReportDefinition::getReportFooterOn() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::getReportFooterOn()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_xReportFooter.is();
 }
 
-void SAL_CALL OReportDefinition::setReportFooterOn( sal_Bool _reportfooteron ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setReportFooterOn( sal_Bool _reportfooteron )
 {
     if ( bool(_reportfooteron) != m_pImpl->m_xReportFooter.is() )
     {
@@ -873,13 +873,13 @@ void SAL_CALL OReportDefinition::setReportFooterOn( sal_Bool _reportfooteron ) t
     }
 }
 
-sal_Bool SAL_CALL OReportDefinition::getPageHeaderOn() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::getPageHeaderOn()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_xPageHeader.is();
 }
 
-void SAL_CALL OReportDefinition::setPageHeaderOn( sal_Bool _pageheaderon ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setPageHeaderOn( sal_Bool _pageheaderon )
 {
     if ( bool(_pageheaderon) != m_pImpl->m_xPageHeader.is() )
     {
@@ -887,13 +887,13 @@ void SAL_CALL OReportDefinition::setPageHeaderOn( sal_Bool _pageheaderon ) throw
     }
 }
 
-sal_Bool SAL_CALL OReportDefinition::getPageFooterOn() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::getPageFooterOn()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_xPageFooter.is();
 }
 
-void SAL_CALL OReportDefinition::setPageFooterOn( sal_Bool _pagefooteron ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setPageFooterOn( sal_Bool _pagefooteron )
 {
     if ( bool(_pagefooteron) != m_pImpl->m_xPageFooter.is() )
     {
@@ -901,13 +901,13 @@ void SAL_CALL OReportDefinition::setPageFooterOn( sal_Bool _pagefooteron ) throw
     }
 }
 
-uno::Reference< report::XGroups > SAL_CALL OReportDefinition::getGroups() throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XGroups > SAL_CALL OReportDefinition::getGroups()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_xGroups;
 }
 
-uno::Reference< report::XSection > SAL_CALL OReportDefinition::getReportHeader() throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+uno::Reference< report::XSection > SAL_CALL OReportDefinition::getReportHeader()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( !m_pImpl->m_xReportHeader.is() )
@@ -915,7 +915,7 @@ uno::Reference< report::XSection > SAL_CALL OReportDefinition::getReportHeader()
     return m_pImpl->m_xReportHeader;
 }
 
-uno::Reference< report::XSection > SAL_CALL OReportDefinition::getPageHeader() throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+uno::Reference< report::XSection > SAL_CALL OReportDefinition::getPageHeader()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( !m_pImpl->m_xPageHeader.is() )
@@ -923,13 +923,13 @@ uno::Reference< report::XSection > SAL_CALL OReportDefinition::getPageHeader() t
     return m_pImpl->m_xPageHeader;
 }
 
-uno::Reference< report::XSection > SAL_CALL OReportDefinition::getDetail() throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XSection > SAL_CALL OReportDefinition::getDetail()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_xDetail;
 }
 
-uno::Reference< report::XSection > SAL_CALL OReportDefinition::getPageFooter() throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+uno::Reference< report::XSection > SAL_CALL OReportDefinition::getPageFooter()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( !m_pImpl->m_xPageFooter.is() )
@@ -937,7 +937,7 @@ uno::Reference< report::XSection > SAL_CALL OReportDefinition::getPageFooter() t
     return m_pImpl->m_xPageFooter;
 }
 
-uno::Reference< report::XSection > SAL_CALL OReportDefinition::getReportFooter() throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+uno::Reference< report::XSection > SAL_CALL OReportDefinition::getReportFooter()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( !m_pImpl->m_xReportFooter.is() )
@@ -945,7 +945,7 @@ uno::Reference< report::XSection > SAL_CALL OReportDefinition::getReportFooter()
     return m_pImpl->m_xReportFooter;
 }
 
-uno::Reference< document::XEventBroadcaster > SAL_CALL OReportDefinition::getEventBroadcaster(  ) throw (lang::DisposedException, uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< document::XEventBroadcaster > SAL_CALL OReportDefinition::getEventBroadcaster(  )
 {
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return this;
@@ -956,43 +956,43 @@ REPORTCOMPONENT_MASTERDETAIL(OReportDefinition,*m_aProps)
 REPORTCOMPONENT_IMPL(OReportDefinition,*m_aProps)
 REPORTCOMPONENT_IMPL2(OReportDefinition,*m_aProps)
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportDefinition::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportDefinition::getPropertySetInfo(  )
 {
     return ReportDefinitionPropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OReportDefinition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     ReportDefinitionPropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OReportDefinition::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OReportDefinition::getPropertyValue( const OUString& PropertyName )
 {
     return ReportDefinitionPropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OReportDefinition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     ReportDefinitionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OReportDefinition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     ReportDefinitionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OReportDefinition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     ReportDefinitionPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OReportDefinition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     ReportDefinitionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::getParent(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     uno::Reference< container::XChild > xChild;
@@ -1002,7 +1002,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::getParent(  ) thro
     return m_pImpl->m_xParent;
 }
 
-void SAL_CALL OReportDefinition::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setParent( const uno::Reference< uno::XInterface >& Parent )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps->m_xParent = uno::Reference< container::XChild >(Parent,uno::UNO_QUERY);
@@ -1014,7 +1014,7 @@ void SAL_CALL OReportDefinition::setParent( const uno::Reference< uno::XInterfac
 }
 
 // XCloneable
-uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone(  )
 {
     OSL_FAIL("Not yet implemented correctly");
     uno::Reference< report::XReportComponent> xSource = this;
@@ -1039,14 +1039,14 @@ void OReportDefinition::setSection(  const OUString& _sProperty
 }
 
 // XCloseBroadcaster
-void SAL_CALL OReportDefinition::addCloseListener( const uno::Reference< util::XCloseListener >& _xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::addCloseListener( const uno::Reference< util::XCloseListener >& _xListener )
 {
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     if ( _xListener.is() )
         m_pImpl->m_aCloseListener.addInterface(_xListener);
 }
 
-void SAL_CALL OReportDefinition::removeCloseListener( const uno::Reference< util::XCloseListener >& _xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::removeCloseListener( const uno::Reference< util::XCloseListener >& _xListener )
 {
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     m_pImpl->m_aCloseListener.removeInterface(_xListener);
@@ -1054,7 +1054,6 @@ void SAL_CALL OReportDefinition::removeCloseListener( const uno::Reference< util
 
 // XCloseable
 void SAL_CALL OReportDefinition::close(sal_Bool bDeliverOwnership)
-throw (util::CloseVetoException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
 
@@ -1099,7 +1098,7 @@ throw (util::CloseVetoException, uno::RuntimeException, std::exception)
 }
 
 // XModel
-sal_Bool SAL_CALL OReportDefinition::attachResource( const OUString& /*_rURL*/, const uno::Sequence< beans::PropertyValue >& _aArguments ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::attachResource( const OUString& /*_rURL*/, const uno::Sequence< beans::PropertyValue >& _aArguments )
 {
     // LLA: we had a deadlock problem in our context, so we get the SolarMutex earlier.
     SolarMutexGuard aSolarGuard;
@@ -1143,19 +1142,19 @@ void OReportDefinition::fillArgs(utl::MediaDescriptor& _aDescriptor)
     setCaption(sCaption);
 }
 
-OUString SAL_CALL OReportDefinition::getURL(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportDefinition::getURL(  )
 {
     return OUString();
 }
 
-uno::Sequence< beans::PropertyValue > SAL_CALL OReportDefinition::getArgs(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< beans::PropertyValue > SAL_CALL OReportDefinition::getArgs(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_aArgs;
 }
 
-void SAL_CALL OReportDefinition::connectController( const uno::Reference< frame::XController >& _xController ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::connectController( const uno::Reference< frame::XController >& _xController )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1167,7 +1166,7 @@ void SAL_CALL OReportDefinition::connectController( const uno::Reference< frame:
     }
 }
 
-void SAL_CALL OReportDefinition::disconnectController( const uno::Reference< frame::XController >& _xController ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::disconnectController( const uno::Reference< frame::XController >& _xController )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1178,35 +1177,35 @@ void SAL_CALL OReportDefinition::disconnectController( const uno::Reference< fra
         m_pImpl->m_xCurrentController.clear();
 }
 
-void SAL_CALL OReportDefinition::lockControllers(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::lockControllers(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     m_pImpl->m_bControllersLocked = true;
 }
 
-void SAL_CALL OReportDefinition::unlockControllers(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::unlockControllers(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     m_pImpl->m_bControllersLocked = false;
 }
 
-sal_Bool SAL_CALL OReportDefinition::hasControllersLocked(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::hasControllersLocked(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_bControllersLocked;
 }
 
-uno::Reference< frame::XController > SAL_CALL OReportDefinition::getCurrentController(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< frame::XController > SAL_CALL OReportDefinition::getCurrentController(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_xCurrentController;
 }
 
-void SAL_CALL OReportDefinition::setCurrentController( const uno::Reference< frame::XController >& _xController ) throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setCurrentController( const uno::Reference< frame::XController >& _xController )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1215,7 +1214,7 @@ void SAL_CALL OReportDefinition::setCurrentController( const uno::Reference< fra
     m_pImpl->m_xCurrentController = _xController;
 }
 
-uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::getCurrentSelection(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::getCurrentSelection(  )
 {
     return uno::Reference< uno::XInterface >();
 }
@@ -1265,7 +1264,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference<
 
 // XStorageBasedDocument
 void SAL_CALL OReportDefinition::loadFromStorage( const uno::Reference< embed::XStorage >& _xStorageToLoadFrom
-                                                 , const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor ) throw (lang::IllegalArgumentException, frame::DoubleInitializationException, io::IOException, uno::Exception, uno::RuntimeException, std::exception)
+                                                 , const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1273,7 +1272,7 @@ void SAL_CALL OReportDefinition::loadFromStorage( const uno::Reference< embed::X
     impl_loadFromStorage_nolck_throw( _xStorageToLoadFrom, _aMediaDescriptor );
 }
 
-void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XStorage >& _xStorageToSaveTo, const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor ) throw (lang::IllegalArgumentException, io::IOException, uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XStorage >& _xStorageToSaveTo, const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor )
 {
     if ( !_xStorageToSaveTo.is() )
         throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,1);
@@ -1433,7 +1432,6 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
 
 void SAL_CALL OReportDefinition::switchToStorage(
         const uno::Reference< embed::XStorage >& xStorage)
-throw (lang::IllegalArgumentException, io::IOException, uno::Exception, uno::RuntimeException, std::exception)
 {
     if (!xStorage.is())
         throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,1);
@@ -1451,14 +1449,14 @@ throw (lang::IllegalArgumentException, io::IOException, uno::Exception, uno::Run
         });
 }
 
-uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage(  ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_xStorage;
 }
 
-void SAL_CALL OReportDefinition::addStorageChangeListener( const uno::Reference< document::XStorageChangeListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::addStorageChangeListener( const uno::Reference< document::XStorageChangeListener >& xListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1466,7 +1464,7 @@ void SAL_CALL OReportDefinition::addStorageChangeListener( const uno::Reference<
         m_pImpl->m_aStorageChangeListeners.addInterface(xListener);
 }
 
-void SAL_CALL OReportDefinition::removeStorageChangeListener( const uno::Reference< document::XStorageChangeListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::removeStorageChangeListener( const uno::Reference< document::XStorageChangeListener >& xListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1569,13 +1567,13 @@ bool OReportDefinition::WriteThroughComponent(
 }
 
 // XLoadable
-void SAL_CALL OReportDefinition::initNew(  ) throw (frame::DoubleInitializationException, io::IOException, uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::initNew(  )
 {
      setPageHeaderOn( true );
      setPageFooterOn( true );
 }
 
-void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue >& _rArguments ) throw (frame::DoubleInitializationException, io::IOException, uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue >& _rArguments )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1678,7 +1676,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue
 }
 
 // XVisualObject
-void SAL_CALL OReportDefinition::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1691,14 +1689,14 @@ void SAL_CALL OReportDefinition::setVisualAreaSize( ::sal_Int64 _nAspect, const
     m_pImpl->m_nAspect = _nAspect;
 }
 
-awt::Size SAL_CALL OReportDefinition::getVisualAreaSize( ::sal_Int64 /*_nAspect*/ ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception)
+awt::Size SAL_CALL OReportDefinition::getVisualAreaSize( ::sal_Int64 /*_nAspect*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_aVisualAreaSize;
 }
 
-embed::VisualRepresentation SAL_CALL OReportDefinition::getPreferredVisualRepresentation( ::sal_Int64 /*_nAspect*/ ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception)
+embed::VisualRepresentation SAL_CALL OReportDefinition::getPreferredVisualRepresentation( ::sal_Int64 /*_nAspect*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1719,13 +1717,13 @@ embed::VisualRepresentation SAL_CALL OReportDefinition::getPreferredVisualRepres
     return aResult;
 }
 
-::sal_Int32 SAL_CALL OReportDefinition::getMapUnit( ::sal_Int64 /*nAspect*/ ) throw (uno::Exception, uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OReportDefinition::getMapUnit( ::sal_Int64 /*nAspect*/ )
 {
     return embed::EmbedMapUnits::ONE_100TH_MM;
 }
 
 // XModifiable
-sal_Bool SAL_CALL OReportDefinition::disableSetModified(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::disableSetModified(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed( ReportDefinitionBase::rBHelper.bDisposed );
@@ -1735,7 +1733,7 @@ sal_Bool SAL_CALL OReportDefinition::disableSetModified(  ) throw (uno::RuntimeE
     return bWasEnabled;
 }
 
-sal_Bool SAL_CALL OReportDefinition::enableSetModified(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::enableSetModified(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed( ReportDefinitionBase::rBHelper.bDisposed );
@@ -1745,7 +1743,7 @@ sal_Bool SAL_CALL OReportDefinition::enableSetModified(  ) throw (uno::RuntimeEx
     return bWasEnabled;
 }
 
-sal_Bool SAL_CALL OReportDefinition::isSetModifiedEnabled(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::isSetModifiedEnabled(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed( ReportDefinitionBase::rBHelper.bDisposed );
@@ -1754,14 +1752,14 @@ sal_Bool SAL_CALL OReportDefinition::isSetModifiedEnabled(  ) throw (uno::Runtim
 }
 
 // XModifiable
-sal_Bool SAL_CALL OReportDefinition::isModified(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::isModified(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_bModified;
 }
 
-void SAL_CALL OReportDefinition::setModified( sal_Bool _bModified ) throw (beans::PropertyVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setModified( sal_Bool _bModified )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1785,7 +1783,7 @@ void SAL_CALL OReportDefinition::setModified( sal_Bool _bModified ) throw (beans
 }
 
 // XModifyBroadcaster
-void SAL_CALL OReportDefinition::addModifyListener( const uno::Reference< util::XModifyListener >& _xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::addModifyListener( const uno::Reference< util::XModifyListener >& _xListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1793,7 +1791,7 @@ void SAL_CALL OReportDefinition::addModifyListener( const uno::Reference< util::
         m_pImpl->m_aModifyListeners.addInterface(_xListener);
 }
 
-void SAL_CALL OReportDefinition::removeModifyListener( const uno::Reference< util::XModifyListener >& _xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::removeModifyListener( const uno::Reference< util::XModifyListener >& _xListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1818,7 +1816,7 @@ void OReportDefinition::notifyEvent(const OUString& _sEventName)
 }
 
 // document::XDocumentEventBroadcaster
-void SAL_CALL OReportDefinition::notifyDocumentEvent( const OUString& rEventName, const uno::Reference< frame::XController2 >& rViewController, const uno::Any& rSupplement ) throw (lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::notifyDocumentEvent( const OUString& rEventName, const uno::Reference< frame::XController2 >& rViewController, const uno::Any& rSupplement )
 {
     try
     {
@@ -1833,7 +1831,7 @@ void SAL_CALL OReportDefinition::notifyDocumentEvent( const OUString& rEventName
     }
 }
 
-void SAL_CALL OReportDefinition::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& rListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& rListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1841,7 +1839,7 @@ void SAL_CALL OReportDefinition::addDocumentEventListener( const uno::Reference<
         m_pImpl->m_aDocEventListeners.addInterface(rListener);
 }
 
-void SAL_CALL OReportDefinition::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& rListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& rListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1849,7 +1847,7 @@ void SAL_CALL OReportDefinition::removeDocumentEventListener( const uno::Referen
 }
 
 // document::XEventBroadcaster
-void SAL_CALL OReportDefinition::addEventListener(const uno::Reference< document::XEventListener >& _xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::addEventListener(const uno::Reference< document::XEventListener >& _xListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1857,7 +1855,7 @@ void SAL_CALL OReportDefinition::addEventListener(const uno::Reference< document
         m_pImpl->m_aLegacyEventListeners.addInterface(_xListener);
 }
 
-void SAL_CALL OReportDefinition::removeEventListener( const uno::Reference< document::XEventListener >& _xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::removeEventListener( const uno::Reference< document::XEventListener >& _xListener )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1865,7 +1863,7 @@ void SAL_CALL OReportDefinition::removeEventListener( const uno::Reference< docu
 }
 
 // document::XViewDataSupplier
-uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewData(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewData(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1893,26 +1891,26 @@ uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewDat
     return m_pImpl->m_xViewData;
 }
 
-void SAL_CALL OReportDefinition::setViewData( const uno::Reference< container::XIndexAccess >& Data ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setViewData( const uno::Reference< container::XIndexAccess >& Data )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     m_pImpl->m_xViewData = Data;
 }
 
-uno::Reference< report::XFunctions > SAL_CALL OReportDefinition::getFunctions() throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XFunctions > SAL_CALL OReportDefinition::getFunctions()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_xFunctions;
 }
 
-uno::Reference< ui::XUIConfigurationManager > SAL_CALL OReportDefinition::getUIConfigurationManager(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< ui::XUIConfigurationManager > SAL_CALL OReportDefinition::getUIConfigurationManager(  )
 {
     return uno::Reference< ui::XUIConfigurationManager >( getUIConfigurationManager2(), uno::UNO_QUERY_THROW );
 }
 
-uno::Reference< ui::XUIConfigurationManager2 > OReportDefinition::getUIConfigurationManager2(  ) throw (uno::RuntimeException)
+uno::Reference< ui::XUIConfigurationManager2 > OReportDefinition::getUIConfigurationManager2(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1929,14 +1927,14 @@ uno::Reference< ui::XUIConfigurationManager2 > OReportDefinition::getUIConfigura
     return m_pImpl->m_xUIConfigurationManager;
 }
 
-uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (uno::RuntimeException, std::exception)
+uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_xStorage->openStorageElement(aStorageName, nMode);
 }
 
-uno::Sequence< OUString > SAL_CALL OReportDefinition::getDocumentSubStoragesNames(  ) throw (io::IOException, uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OReportDefinition::getDocumentSubStoragesNames(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1944,14 +1942,14 @@ uno::Sequence< OUString > SAL_CALL OReportDefinition::getDocumentSubStoragesName
     return xNameAccess.is() ? xNameAccess->getElementNames() : uno::Sequence< OUString >();
 }
 
-OUString SAL_CALL OReportDefinition::getMimeType() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportDefinition::getMimeType()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_sMimeType;
 }
 
-void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -1964,7 +1962,7 @@ void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype ) throw
     set(PROPERTY_MIMETYPE,_mimetype,m_pImpl->m_sMimeType);
 }
 
-uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableMimeTypes(  ) throw (lang::DisposedException, uno::Exception, uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableMimeTypes(  )
 {
     uno::Sequence< OUString > s_aList(2);
     s_aList[0] = MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII;
@@ -1973,7 +1971,7 @@ uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableMimeTypes(  )
 }
 
 // css::XUnoTunnel
-sal_Int64 SAL_CALL OReportDefinition::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL OReportDefinition::getSomething( const uno::Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet = 0;
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
@@ -1995,7 +1993,7 @@ sal_Int64 SAL_CALL OReportDefinition::getSomething( const uno::Sequence< sal_Int
     return nRet;
 }
 
-uno::Sequence< sal_Int8 > SAL_CALL OReportDefinition::getImplementationId(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int8 > SAL_CALL OReportDefinition::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -2035,7 +2033,6 @@ std::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel(const uno::R
 }
 
 uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWithArguments( const OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& _aArgs)
-    throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2059,7 +2056,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith
     return xRet;
 }
 
-uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( const OUString& aServiceSpecifier ) throw(uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( const OUString& aServiceSpecifier )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2179,7 +2176,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
     return m_pImpl->m_pReportModel->createShape(aServiceSpecifier,xShape);
 }
 
-uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames()
 {
     static const OUStringLiteral aSvxComponentServiceNameList[] =
     {
@@ -2216,7 +2213,7 @@ uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames()
 }
 
 // XShape
-awt::Point SAL_CALL OReportDefinition::getPosition(  ) throw (uno::RuntimeException, std::exception)
+awt::Point SAL_CALL OReportDefinition::getPosition(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2225,7 +2222,7 @@ awt::Point SAL_CALL OReportDefinition::getPosition(  ) throw (uno::RuntimeExcept
     return awt::Point(m_aProps->m_nPosX,m_aProps->m_nPosY);
 }
 
-void SAL_CALL OReportDefinition::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setPosition( const awt::Point& aPosition )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2235,7 +2232,7 @@ void SAL_CALL OReportDefinition::setPosition( const awt::Point& aPosition ) thro
     set(PROPERTY_POSITIONY,aPosition.Y,m_aProps->m_nPosY);
 }
 
-awt::Size SAL_CALL OReportDefinition::getSize(  ) throw (uno::RuntimeException, std::exception)
+awt::Size SAL_CALL OReportDefinition::getSize(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2244,7 +2241,7 @@ awt::Size SAL_CALL OReportDefinition::getSize(  ) throw (uno::RuntimeException,
     return awt::Size(m_aProps->m_nWidth,m_aProps->m_nHeight);
 }
 
-void SAL_CALL OReportDefinition::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setSize( const awt::Size& aSize )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2256,7 +2253,7 @@ void SAL_CALL OReportDefinition::setSize( const awt::Size& aSize ) throw (beans:
 
 
 // XShapeDescriptor
-OUString SAL_CALL OReportDefinition::getShapeType(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportDefinition::getShapeType(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2284,23 +2281,23 @@ public:
     OStylesHelper& operator=(const OStylesHelper&) = delete;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override;
 
     // container::XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
     // container::XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // container::XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 };
 
 OStylesHelper::OStylesHelper(const uno::Type& rType)
@@ -2311,25 +2308,25 @@ OStylesHelper::OStylesHelper(const uno::Type& rType)
 ;
 
 // container::XElementAccess
-uno::Type SAL_CALL OStylesHelper::getElementType(  ) throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL OStylesHelper::getElementType(  )
 {
     return m_aType;
 }
 
-sal_Bool SAL_CALL OStylesHelper::hasElements(  ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OStylesHelper::hasElements(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return !m_aElementsPos.empty();
 }
 
 // container::XIndexAccess
-sal_Int32 SAL_CALL OStylesHelper::getCount(  ) throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL OStylesHelper::getCount(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aElementsPos.size();
 }
 
-uno::Any SAL_CALL OStylesHelper::getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OStylesHelper::getByIndex( sal_Int32 Index )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( Index < 0 || Index >= static_cast<sal_Int32>(m_aElementsPos.size()) )
@@ -2338,7 +2335,7 @@ uno::Any SAL_CALL OStylesHelper::getByIndex( sal_Int32 Index ) throw(lang::Index
 }
 
 // container::XNameAccess
-uno::Any SAL_CALL OStylesHelper::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OStylesHelper::getByName( const OUString& aName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     TStyleElements::const_iterator aFind = m_aElements.find(aName);
@@ -2347,7 +2344,7 @@ uno::Any SAL_CALL OStylesHelper::getByName( const OUString& aName ) throw(contai
     return aFind->second;
 }
 
-uno::Sequence< OUString > SAL_CALL OStylesHelper::getElementNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OStylesHelper::getElementNames(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     uno::Sequence< OUString > aNameList(m_aElementsPos.size());
@@ -2360,14 +2357,14 @@ uno::Sequence< OUString > SAL_CALL OStylesHelper::getElementNames(  ) throw(uno:
     return aNameList;
 }
 
-sal_Bool SAL_CALL OStylesHelper::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OStylesHelper::hasByName( const OUString& aName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aElements.find(aName) != m_aElements.end();
 }
 
 // XNameContainer
-void SAL_CALL OStylesHelper::insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OStylesHelper::insertByName( const OUString& aName, const uno::Any& aElement )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( m_aElements.find(aName) != m_aElements.end() )
@@ -2379,7 +2376,7 @@ void SAL_CALL OStylesHelper::insertByName( const OUString& aName, const uno::Any
     m_aElementsPos.push_back(m_aElements.insert(TStyleElements::value_type(aName,aElement)).first);
 }
 
-void SAL_CALL OStylesHelper::removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException, std::exception)
+void SAL_CALL OStylesHelper::removeByName( const OUString& aName )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     TStyleElements::const_iterator aFind = m_aElements.find(aName);
@@ -2390,7 +2387,7 @@ void SAL_CALL OStylesHelper::removeByName( const OUString& aName ) throw(contain
 }
 
 // XNameReplace
-void SAL_CALL OStylesHelper::replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OStylesHelper::replaceByName( const OUString& aName, const uno::Any& aElement )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     TStyleElements::iterator aFind = m_aElements.find(aName);
@@ -2401,7 +2398,7 @@ void SAL_CALL OStylesHelper::replaceByName( const OUString& aName, const uno::An
     aFind->second = aElement;
 }
 
-uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFamilies(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFamilies(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2427,14 +2424,14 @@ uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFam
     }
     return m_pImpl->m_xStyles;
 }
-OUString SAL_CALL  OReportDefinition::getIdentifier(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL  OReportDefinition::getIdentifier(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     return m_pImpl->m_sIdentifier;
 }
 
-void SAL_CALL OReportDefinition::setIdentifier( const OUString& Identifier ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setIdentifier( const OUString& Identifier )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2442,7 +2439,7 @@ void SAL_CALL OReportDefinition::setIdentifier( const OUString& Identifier ) thr
 }
 
 // XNumberFormatsSupplier
-uno::Reference< beans::XPropertySet > SAL_CALL OReportDefinition::getNumberFormatSettings(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySet > SAL_CALL OReportDefinition::getNumberFormatSettings(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( m_pImpl->m_xNumberFormatsSupplier.is() )
@@ -2450,7 +2447,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL OReportDefinition::getNumberForma
     return uno::Reference< beans::XPropertySet >();
 }
 
-uno::Reference< util::XNumberFormats > SAL_CALL OReportDefinition::getNumberFormats(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< util::XNumberFormats > SAL_CALL OReportDefinition::getNumberFormats(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( m_pImpl->m_xNumberFormatsSupplier.is() )
@@ -2475,26 +2472,26 @@ uno::Reference< task::XInteractionHandler > OReportDefinition::getInteractionHan
     return xRet;
 }
 
-uno::Reference< sdbc::XConnection > SAL_CALL OReportDefinition::getActiveConnection() throw (uno::RuntimeException, std::exception)
+uno::Reference< sdbc::XConnection > SAL_CALL OReportDefinition::getActiveConnection()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pImpl->m_xActiveConnection;
 }
 
-void SAL_CALL OReportDefinition::setActiveConnection( const uno::Reference< sdbc::XConnection >& _activeconnection ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setActiveConnection( const uno::Reference< sdbc::XConnection >& _activeconnection )
 {
     if ( !_activeconnection.is() )
         throw lang::IllegalArgumentException();
     set(PROPERTY_ACTIVECONNECTION,_activeconnection,m_pImpl->m_xActiveConnection);
 }
 
-OUString SAL_CALL OReportDefinition::getDataSourceName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportDefinition::getDataSourceName()
 {
     osl::MutexGuard g(m_aMutex);
     return m_pImpl->m_sDataSourceName;
 }
 
-void SAL_CALL OReportDefinition::setDataSourceName(const OUString& the_value) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportDefinition::setDataSourceName(const OUString& the_value)
 {
     set(PROPERTY_DATASOURCENAME,the_value,m_pImpl->m_sDataSourceName);
 }
@@ -2568,7 +2565,6 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel
 
 // css.frame.XTitle
 OUString SAL_CALL OReportDefinition::getTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
@@ -2581,7 +2577,6 @@ OUString SAL_CALL OReportDefinition::getTitle()
 
 // css.frame.XTitle
 void SAL_CALL OReportDefinition::setTitle( const OUString& sTitle )
-    throw (uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
@@ -2594,7 +2589,6 @@ void SAL_CALL OReportDefinition::setTitle( const OUString& sTitle )
 
 // css.frame.XTitleChangeBroadcaster
 void SAL_CALL OReportDefinition::addTitleChangeListener( const uno::Reference< frame::XTitleChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
@@ -2609,7 +2603,6 @@ void SAL_CALL OReportDefinition::addTitleChangeListener( const uno::Reference< f
 
 // css.frame.XTitleChangeBroadcaster
 void SAL_CALL OReportDefinition::removeTitleChangeListener( const uno::Reference< frame::XTitleChangeListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
@@ -2624,8 +2617,6 @@ void SAL_CALL OReportDefinition::removeTitleChangeListener( const uno::Reference
 
 // css.frame.XUntitledNumbers
 ::sal_Int32 SAL_CALL OReportDefinition::leaseNumber( const uno::Reference< uno::XInterface >& xComponent )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception         )
 {
     // object already disposed?
     SolarMutexGuard aSolarGuard;
@@ -2637,8 +2628,6 @@ void SAL_CALL OReportDefinition::removeTitleChangeListener( const uno::Reference
 
 // css.frame.XUntitledNumbers
 void SAL_CALL OReportDefinition::releaseNumber( ::sal_Int32 nNumber )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception         )
 {
     // object already disposed?
     SolarMutexGuard aSolarGuard;
@@ -2650,8 +2639,6 @@ void SAL_CALL OReportDefinition::releaseNumber( ::sal_Int32 nNumber )
 
 // css.frame.XUntitledNumbers
 void SAL_CALL OReportDefinition::releaseNumberForComponent( const uno::Reference< uno::XInterface >& xComponent )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception         )
 {
     // object already disposed?
     SolarMutexGuard aSolarGuard;
@@ -2663,7 +2650,6 @@ void SAL_CALL OReportDefinition::releaseNumberForComponent( const uno::Reference
 
 // css.frame.XUntitledNumbers
 OUString SAL_CALL OReportDefinition::getUntitledPrefix()
-    throw (uno::RuntimeException, std::exception)
 {
     // object already disposed?
     SolarMutexGuard aSolarGuard;
@@ -2673,7 +2659,7 @@ OUString SAL_CALL OReportDefinition::getUntitledPrefix()
     return impl_getUntitledHelper_throw()->getUntitledPrefix ();
 }
 
-uno::Reference< document::XDocumentProperties > SAL_CALL OReportDefinition::getDocumentProperties(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< document::XDocumentProperties > SAL_CALL OReportDefinition::getDocumentProperties(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
@@ -2684,7 +2670,7 @@ uno::Reference< document::XDocumentProperties > SAL_CALL OReportDefinition::getD
     return m_pImpl->m_xDocumentProperties;
 }
 
-uno::Any SAL_CALL OReportDefinition::getTransferData( const datatransfer::DataFlavor& aFlavor ) throw (datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OReportDefinition::getTransferData( const datatransfer::DataFlavor& aFlavor )
 {
     uno::Any aResult;
     if( isDataFlavorSupported( aFlavor ) )
@@ -2706,7 +2692,7 @@ uno::Any SAL_CALL OReportDefinition::getTransferData( const datatransfer::DataFl
     return aResult;
 }
 
-uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransferDataFlavors(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransferDataFlavors(  )
 {
     uno::Sequence< datatransfer::DataFlavor > aRet(1);
 
@@ -2717,13 +2703,13 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransfe
     return aRet;
 }
 
-sal_Bool SAL_CALL OReportDefinition::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportDefinition::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
 {
     return aFlavor.MimeType == "image/png";
 }
 
 
-uno::Reference< document::XUndoManager > SAL_CALL OReportDefinition::getUndoManager(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< document::XUndoManager > SAL_CALL OReportDefinition::getUndoManager(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_pImpl->m_pUndoManager.get();
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 7db938913c2b..d7c4e18720b9 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -77,25 +77,25 @@ OReportEngineJFree::~OReportEngineJFree()
 
 IMPLEMENT_FORWARD_XINTERFACE2(OReportEngineJFree,ReportEngineBase,ReportEnginePropertySet)
 
-void SAL_CALL OReportEngineJFree::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::dispose()
 {
     ReportEnginePropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
     m_xActiveConnection.clear();
 }
 
-OUString OReportEngineJFree::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString OReportEngineJFree::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.OReportEngineJFree");
 }
 
 
-OUString SAL_CALL OReportEngineJFree::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportEngineJFree::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { "com.sun.star.report.ReportEngine" };
 
@@ -108,25 +108,25 @@ uno::Reference< uno::XInterface > OReportEngineJFree::create(uno::Reference< uno
 }
 
 
-uno::Sequence< OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_Static();
 }
 
-sal_Bool SAL_CALL OReportEngineJFree::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OReportEngineJFree::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XReportEngine
     // Attributes
-uno::Reference< report::XReportDefinition > SAL_CALL OReportEngineJFree::getReportDefinition() throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XReportDefinition > SAL_CALL OReportEngineJFree::getReportDefinition()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xReport;
 }
 
-void SAL_CALL OReportEngineJFree::setReportDefinition( const uno::Reference< report::XReportDefinition >& _report ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::setReportDefinition( const uno::Reference< report::XReportDefinition >& _report )
 {
     if ( !_report.is() )
         throw lang::IllegalArgumentException();
@@ -142,13 +142,13 @@ void SAL_CALL OReportEngineJFree::setReportDefinition( const uno::Reference< rep
     l.notify();
 }
 
-uno::Reference< task::XStatusIndicator > SAL_CALL OReportEngineJFree::getStatusIndicator() throw (uno::RuntimeException, std::exception)
+uno::Reference< task::XStatusIndicator > SAL_CALL OReportEngineJFree::getStatusIndicator()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_StatusIndicator;
 }
 
-void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task::XStatusIndicator >& _statusindicator ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task::XStatusIndicator >& _statusindicator )
 {
     set(PROPERTY_STATUSINDICATOR,_statusindicator,m_StatusIndicator);
 }
@@ -263,17 +263,17 @@ OUString OReportEngineJFree::getNewOutputName()
 }
 
 // Methods
-uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentModel( ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentModel( )
 {
     return createDocumentAlive(nullptr,true);
 }
 
-uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame )
 {
     return createDocumentAlive(_frame,false);
 }
 
-uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden )
 {
     uno::Reference< frame::XModel > xModel;
     OUString sOutputName = getNewOutputName(); // starts implicite the report generator
@@ -320,7 +320,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive
     return xModel;
 }
 
-util::URL SAL_CALL OReportEngineJFree::createDocument( ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException, std::exception)
+util::URL SAL_CALL OReportEngineJFree::createDocument( )
 {
     util::URL aRet;
     uno::Reference< frame::XModel > xModel = createDocumentModel();
@@ -332,7 +332,7 @@ util::URL SAL_CALL OReportEngineJFree::createDocument( ) throw (lang::DisposedEx
     return aRet;
 }
 
-void SAL_CALL OReportEngineJFree::interrupt(  ) throw (lang::DisposedException, uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::interrupt(  )
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -340,60 +340,60 @@ void SAL_CALL OReportEngineJFree::interrupt(  ) throw (lang::DisposedException,
     }
 }
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportEngineJFree::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportEngineJFree::getPropertySetInfo(  )
 {
     return ReportEnginePropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OReportEngineJFree::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     ReportEnginePropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OReportEngineJFree::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OReportEngineJFree::getPropertyValue( const OUString& PropertyName )
 {
     return ReportEnginePropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OReportEngineJFree::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     ReportEnginePropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OReportEngineJFree::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     ReportEnginePropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OReportEngineJFree::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     ReportEnginePropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OReportEngineJFree::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     ReportEnginePropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
 
-uno::Reference< sdbc::XConnection > SAL_CALL OReportEngineJFree::getActiveConnection() throw (uno::RuntimeException, std::exception)
+uno::Reference< sdbc::XConnection > SAL_CALL OReportEngineJFree::getActiveConnection()
 {
     return m_xActiveConnection;
 }
 
-void SAL_CALL OReportEngineJFree::setActiveConnection( const uno::Reference< sdbc::XConnection >& _activeconnection ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::setActiveConnection( const uno::Reference< sdbc::XConnection >& _activeconnection )
 {
     if ( !_activeconnection.is() )
         throw lang::IllegalArgumentException();
     set(PROPERTY_ACTIVECONNECTION,_activeconnection,m_xActiveConnection);
 }
 
-::sal_Int32 SAL_CALL OReportEngineJFree::getMaxRows() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OReportEngineJFree::getMaxRows()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_nMaxRows;
 }
 
-void SAL_CALL OReportEngineJFree::setMaxRows( ::sal_Int32 MaxRows ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OReportEngineJFree::setMaxRows( ::sal_Int32 MaxRows )
 {
     set(PROPERTY_MAXROWS,MaxRows,m_nMaxRows);
 }
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index a6e228ca05ad..082518936f2d 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -136,7 +136,7 @@ OSection::~OSection()
 //IMPLEMENT_FORWARD_XINTERFACE2(OSection,SectionBase,SectionPropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OSection, SectionBase )
 
-uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType )
 {
     uno::Any aReturn = SectionBase::queryInterface(_rType);
     if ( !aReturn.hasValue() )
@@ -149,7 +149,7 @@ uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType ) throw (uno
 }
 
 
-void SAL_CALL OSection::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OSection::dispose()
 {
     OSL_ENSURE(!rBHelper.bDisposed,"Already disposed!");
     SectionPropertySet::dispose();
@@ -172,23 +172,23 @@ void SAL_CALL OSection::disposing()
     m_xContext.clear();
 }
 
-OUString SAL_CALL OSection::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OSection::getImplementationName(  )
 {
     return OUString("com.sun.star.comp.report.Section");
 }
 
-uno::Sequence< OUString> OSection::getSupportedServiceNames_Static() throw( uno::RuntimeException )
+uno::Sequence< OUString> OSection::getSupportedServiceNames_Static()
 {
     uno::Sequence<OUString> aSupported { SERVICE_SECTION };
     return aSupported;
 }
 
-uno::Sequence< OUString> SAL_CALL OSection::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString> SAL_CALL OSection::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
-sal_Bool SAL_CALL OSection::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSection::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -219,46 +219,46 @@ void OSection::init()
 
 // XSection
 
-sal_Bool SAL_CALL OSection::getVisible() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSection::getVisible()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bVisible;
 }
 
-void SAL_CALL OSection::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setVisible( sal_Bool _visible )
 {
     set(PROPERTY_VISIBLE,_visible,m_bVisible);
 }
 
-OUString SAL_CALL OSection::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OSection::getName()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_sName;
 }
 
-void SAL_CALL OSection::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setName( const OUString& _name )
 {
     set(PROPERTY_NAME,_name,m_sName);
 }
 
-::sal_uInt32 SAL_CALL OSection::getHeight() throw (uno::RuntimeException, std::exception)
+::sal_uInt32 SAL_CALL OSection::getHeight()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_nHeight;
 }
 
-void SAL_CALL OSection::setHeight( ::sal_uInt32 _height ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setHeight( ::sal_uInt32 _height )
 {
     set(PROPERTY_HEIGHT,_height,m_nHeight);
 }
 
-::sal_Int32 SAL_CALL OSection::getBackColor() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OSection::getBackColor()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bBacktransparent ? COL_TRANSPARENT : m_nBackgroundColor;
 }
 
-void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor )
 {
     bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT);
     setBackTransparent(bTransparent);
@@ -266,26 +266,26 @@ void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor ) throw (uno:
         set(PROPERTY_BACKCOLOR,_backgroundcolor,m_nBackgroundColor);
 }
 
-sal_Bool SAL_CALL OSection::getBackTransparent() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSection::getBackTransparent()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bBacktransparent;
 }
 
-void SAL_CALL OSection::setBackTransparent( sal_Bool _backtransparent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setBackTransparent( sal_Bool _backtransparent )
 {
     set(PROPERTY_BACKTRANSPARENT,_backtransparent,m_bBacktransparent);
     if ( _backtransparent )
         set(PROPERTY_BACKCOLOR,static_cast<sal_Int32>(COL_TRANSPARENT),m_nBackgroundColor);
 }
 
-OUString SAL_CALL OSection::getConditionalPrintExpression() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OSection::getConditionalPrintExpression()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_sConditionalPrintExpression;
 }
 
-void SAL_CALL OSection::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setConditionalPrintExpression( const OUString& _conditionalprintexpression )
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_sConditionalPrintExpression);
 }
@@ -303,7 +303,7 @@ void OSection::checkNotPageHeaderFooter()
     }
 }
 
-::sal_Int16 SAL_CALL OSection::getForceNewPage() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL OSection::getForceNewPage()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -311,7 +311,7 @@ void OSection::checkNotPageHeaderFooter()
     return m_nForceNewPage;
 }
 
-void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage )
 {
     if ( _forcenewpage < report::ForceNewPage::NONE || _forcenewpage > report::ForceNewPage::BEFORE_AFTER_SECTION )
         throwIllegallArgumentException("css::report::ForceNewPage"
@@ -321,14 +321,14 @@ void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang
     set(PROPERTY_FORCENEWPAGE,_forcenewpage,m_nForceNewPage);
 }
 
-::sal_Int16 SAL_CALL OSection::getNewRowOrCol() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL OSection::getNewRowOrCol()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkNotPageHeaderFooter();
     return m_nNewRowOrCol;
 }
 
-void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol )
 {
     if ( _newroworcol < report::ForceNewPage::NONE || _newroworcol > report::ForceNewPage::BEFORE_AFTER_SECTION )
         throwIllegallArgumentException("css::report::ForceNewPage"
@@ -339,14 +339,14 @@ void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::
     set(PROPERTY_NEWROWORCOL,_newroworcol,m_nNewRowOrCol);
 }
 
-sal_Bool SAL_CALL OSection::getKeepTogether() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSection::getKeepTogether()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkNotPageHeaderFooter();
     return m_bKeepTogether;
 }
 
-void SAL_CALL OSection::setKeepTogether( sal_Bool _keeptogether ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setKeepTogether( sal_Bool _keeptogether )
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -356,27 +356,27 @@ void SAL_CALL OSection::setKeepTogether( sal_Bool _keeptogether ) throw (lang::I
     set(PROPERTY_KEEPTOGETHER,_keeptogether,m_bKeepTogether);
 }
 
-sal_Bool SAL_CALL OSection::getCanGrow() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSection::getCanGrow()
 {
     throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment
 }
 
-void SAL_CALL OSection::setCanGrow( sal_Bool /*_cangrow*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setCanGrow( sal_Bool /*_cangrow*/ )
 {
     throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment
 }
 
-sal_Bool SAL_CALL OSection::getCanShrink() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSection::getCanShrink()
 {
     throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment
 }
 
-void SAL_CALL OSection::setCanShrink( sal_Bool /*_canshrink*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setCanShrink( sal_Bool /*_canshrink*/ )
 {
     throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment
 }
 
-sal_Bool SAL_CALL OSection::getRepeatSection() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSection::getRepeatSection()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     uno::Reference< report::XGroup > xGroup = m_xGroup;
@@ -385,7 +385,7 @@ sal_Bool SAL_CALL OSection::getRepeatSection() throw (beans::UnknownPropertyExce
     return m_bRepeatSection;
 }
 
-void SAL_CALL OSection::setRepeatSection( sal_Bool _repeatsection ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setRepeatSection( sal_Bool _repeatsection )
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -396,13 +396,13 @@ void SAL_CALL OSection::setRepeatSection( sal_Bool _repeatsection ) throw (lang:
     set(PROPERTY_REPEATSECTION,_repeatsection,m_bRepeatSection);
 }
 
-uno::Reference< report::XGroup > SAL_CALL OSection::getGroup() throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XGroup > SAL_CALL OSection::getGroup()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xGroup;
 }
 
-uno::Reference< report::XReportDefinition > SAL_CALL OSection::getReportDefinition() throw (uno::RuntimeException, std::exception)
+uno::Reference< report::XReportDefinition > SAL_CALL OSection::getReportDefinition()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     uno::Reference< report::XReportDefinition > xRet = m_xReportDefinition;
@@ -418,7 +418,7 @@ uno::Reference< report::XReportDefinition > SAL_CALL OSection::getReportDefiniti
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OSection::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OSection::getParent(  )
 {
     uno::Reference< uno::XInterface > xRet;
     {
@@ -430,90 +430,90 @@ uno::Reference< uno::XInterface > SAL_CALL OSection::getParent(  ) throw (uno::R
     return  xRet;
 }
 
-void SAL_CALL OSection::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ )
 {
     throw lang::NoSupportException();
 }
 
 // XContainer
-void SAL_CALL OSection::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::addContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aContainerListeners.addInterface(xListener);
 }
 
-void SAL_CALL OSection::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aContainerListeners.removeInterface(xListener);
 }
 
 // XElementAccess
-uno::Type SAL_CALL OSection::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL OSection::getElementType(  )
 {
     return cppu::UnoType<report::XReportComponent>::get();
 }
 
-sal_Bool SAL_CALL OSection::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSection::hasElements(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xDrawPage.is() && m_xDrawPage->hasElements();
 }
 
 // XIndexAccess
-::sal_Int32 SAL_CALL OSection::getCount(  ) throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OSection::getCount(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xDrawPage.is() ? m_xDrawPage->getCount() : 0;
 }
 
-uno::Any SAL_CALL OSection::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OSection::getByIndex( ::sal_Int32 Index )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xDrawPage.is() ? m_xDrawPage->getByIndex(Index) : uno::Any();
 }
 
 // XEnumerationAccess
-uno::Reference< container::XEnumeration > SAL_CALL OSection::createEnumeration(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< container::XEnumeration > SAL_CALL OSection::createEnumeration(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return new ::comphelper::OEnumerationByIndex(static_cast<XSection*>(this));
 }
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OSection::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OSection::getPropertySetInfo(  )
 {
     return SectionPropertySet::getPropertySetInfo();
 }
 
-void SAL_CALL OSection::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     SectionPropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OSection::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OSection::getPropertyValue( const OUString& PropertyName )
 {
     return SectionPropertySet::getPropertyValue( PropertyName);
 }
 
-void SAL_CALL OSection::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     SectionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OSection::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     SectionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OSection::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     SectionPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OSection::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OSection::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     SectionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OSection::add( const uno::Reference< drawing::XShape >& xShape ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::add( const uno::Reference< drawing::XShape >& xShape )
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -525,7 +525,7 @@ void SAL_CALL OSection::add( const uno::Reference< drawing::XShape >& xShape ) t
     notifyElementAdded(xShape);
 }
 
-void SAL_CALL OSection::remove( const uno::Reference< drawing::XShape >& xShape ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OSection::remove( const uno::Reference< drawing::XShape >& xShape )
 {
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -540,7 +540,6 @@ void SAL_CALL OSection::remove( const uno::Reference< drawing::XShape >& xShape
 // XShapeGrouper
 uno::Reference< drawing::XShapeGroup > SAL_CALL
 OSection::group(uno::Reference< drawing::XShapes > const& xShapes)
-    throw (uno::RuntimeException, std::exception)
 {
     // no lock because m_xDrawPage_ShapeGrouper is const
     return (m_xDrawPage_ShapeGrouper.is())
@@ -549,7 +548,6 @@ OSection::group(uno::Reference< drawing::XShapes > const& xShapes)
 }
 void SAL_CALL
 OSection::ungroup(uno::Reference<drawing::XShapeGroup> const& xGroup)
-    throw (uno::RuntimeException, std::exception)
 {
     // no lock because m_xDrawPage_ShapeGrouper is const
     if (m_xDrawPage_ShapeGrouper.is()) {
@@ -559,7 +557,6 @@ OSection::ungroup(uno::Reference<drawing::XShapeGroup> const& xGroup)
 
 // XFormsSupplier
 uno::Reference<container::XNameContainer> SAL_CALL OSection::getForms()
-    throw (uno::RuntimeException, std::exception)
 {
     // no lock because m_xDrawPage_FormSupplier is const
     return (m_xDrawPage_FormSupplier.is())
@@ -567,7 +564,7 @@ uno::Reference<container::XNameContainer> SAL_CALL OSection::getForms()
         : nullptr;
 }
 // XFormsSupplier2
-sal_Bool SAL_CALL OSection::hasForms() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OSection::hasForms()
 {
     // no lock because m_xDrawPage_FormSupplier is const
     return (m_xDrawPage_FormSupplier.is())
@@ -577,7 +574,7 @@ sal_Bool SAL_CALL OSection::hasForms() throw (uno::RuntimeException, std::except
 
 // css::lang::XUnoTunnel
 
-sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw (uno::RuntimeException, std::exception)
+sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId )
 {
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast<sal_Int64>(this);
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index bfbe296ae6b0..bc3a29c7acad 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -95,7 +95,7 @@ OShape::~OShape()
 //IMPLEMENT_FORWARD_XINTERFACE2(OShape,ShapeBase,ShapePropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OShape, ShapeBase )
 
-uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType )
 {
     uno::Any aReturn = ShapeBase::queryInterface(_rType);
     if ( !aReturn.hasValue() )
@@ -108,7 +108,7 @@ uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType ) throw (uno::
 }
 
 
-void SAL_CALL OShape::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL OShape::dispose()
 {
     ShapePropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
@@ -120,25 +120,25 @@ uno::Reference< uno::XInterface > OShape::create(uno::Reference< uno::XComponent
 }
 
 
-OUString OShape::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString OShape::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.Shape");
 }
 
 
-OUString SAL_CALL OShape::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL OShape::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-uno::Sequence< OUString > OShape::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > OShape::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { SERVICE_SHAPE };
 
     return aServices;
 }
 
-uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames(  )
 {
     if(m_sServiceName.isEmpty())
     {
@@ -154,7 +154,7 @@ uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames(  ) throw(un
     }
 }
 
-sal_Bool SAL_CALL OShape::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OShape::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -165,27 +165,27 @@ REPORTCOMPONENT_IMPL2(OShape,m_aProps.aComponent)
 REPORTCOMPONENT_MASTERDETAIL(OShape,m_aProps.aComponent)
 REPORTCONTROLFORMAT_IMPL2(OShape,m_aProps.aFormatProperties)
 
-::sal_Int32 SAL_CALL OShape::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OShape::getControlBackground()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OShape::setControlBackground( ::sal_Int32 /*_backgroundcolor*/ ) throw (uno::RuntimeException,beans::UnknownPropertyException, std::exception)
+void SAL_CALL OShape::setControlBackground( ::sal_Int32 /*_backgroundcolor*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
-sal_Bool SAL_CALL OShape::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OShape::getControlBackgroundTransparent()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OShape::setControlBackgroundTransparent( sal_Bool /*_controlbackgroundtransparent*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setControlBackgroundTransparent( sal_Bool /*_controlbackgroundtransparent*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL OShape::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL OShape::getPropertySetInfo(  )
 {
 
     //return ShapePropertySet::getPropertySetInfo();
@@ -205,7 +205,7 @@ cppu::IPropertyArrayHelper& OShape::getInfoHelper()
 }
 
 
-void SAL_CALL OShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     getInfoHelper();
     if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::PropertyOrigin::Aggregate )
@@ -215,7 +215,7 @@ void SAL_CALL OShape::setPropertyValue( const OUString& aPropertyName, const uno
         ShapePropertySet::setPropertyValue( aPropertyName, aValue );
 }
 
-uno::Any SAL_CALL OShape::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OShape::getPropertyValue( const OUString& PropertyName )
 {
     getInfoHelper();
     if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::PropertyOrigin::Aggregate )
@@ -226,7 +226,7 @@ uno::Any SAL_CALL OShape::getPropertyValue( const OUString& PropertyName ) throw
     return uno::Any();
 }
 
-void SAL_CALL OShape::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener )
 {
     getInfoHelper();
     if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::PropertyOrigin::Aggregate || aPropertyName.isEmpty() )
@@ -236,7 +236,7 @@ void SAL_CALL OShape::addPropertyChangeListener( const OUString& aPropertyName,
         ShapePropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL OShape::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener )
 {
     getInfoHelper();
     if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::PropertyOrigin::Aggregate || aPropertyName.isEmpty() )
@@ -246,7 +246,7 @@ void SAL_CALL OShape::removePropertyChangeListener( const OUString& aPropertyNam
         ShapePropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL OShape::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     getInfoHelper();
     if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::PropertyOrigin::Aggregate || PropertyName.isEmpty() )
@@ -256,7 +256,7 @@ void SAL_CALL OShape::addVetoableChangeListener( const OUString& PropertyName, c
         ShapePropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL OShape::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener )
 {
     getInfoHelper();
     if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::PropertyOrigin::Aggregate || PropertyName.isEmpty() )
@@ -267,41 +267,41 @@ void SAL_CALL OShape::removeVetoableChangeListener( const OUString& PropertyName
 }
 
 // XReportControlModel
-OUString SAL_CALL OShape::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OShape::getDataField()
 {
     throw beans::UnknownPropertyException();
 }
 
-void SAL_CALL OShape::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setDataField( const OUString& /*_datafield*/ )
 {
     throw beans::UnknownPropertyException();
 }
 
-sal_Bool SAL_CALL OShape::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OShape::getPrintWhenGroupChange()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.bPrintWhenGroupChange;
 }
 
-void SAL_CALL OShape::setPrintWhenGroupChange( sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setPrintWhenGroupChange( sal_Bool _printwhengroupchange )
 {
     set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
 }
 
-OUString SAL_CALL OShape::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+OUString SAL_CALL OShape::getConditionalPrintExpression()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aConditionalPrintExpression;
 }
 
-void SAL_CALL OShape::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setConditionalPrintExpression( const OUString& _conditionalprintexpression )
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
 }
 
 
 // XCloneable
-uno::Reference< util::XCloneable > SAL_CALL OShape::createClone(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< util::XCloneable > SAL_CALL OShape::createClone(  )
 {
     uno::Reference< report::XReportComponent> xSource = this;
     uno::Reference< report::XReportComponent> xSet;
@@ -329,95 +329,95 @@ uno::Reference< util::XCloneable > SAL_CALL OShape::createClone(  ) throw (uno::
 }
 
 // XChild
-uno::Reference< uno::XInterface > SAL_CALL OShape::getParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL OShape::getParent(  )
 {
     return OShapeHelper::getParent(this);
 }
 
-void SAL_CALL OShape::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setParent( const uno::Reference< uno::XInterface >& Parent )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xParent = uno::Reference< container::XChild >(Parent,uno::UNO_QUERY);
 }
-uno::Reference< report::XFormatCondition > SAL_CALL OShape::createFormatCondition(  ) throw (uno::Exception, uno::RuntimeException, std::exception)
+uno::Reference< report::XFormatCondition > SAL_CALL OShape::createFormatCondition(  )
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
 
 // XContainer
-void SAL_CALL OShape::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OShape::addContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.addContainerListener(xListener);
 }
 
-void SAL_CALL OShape::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OShape::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener )
 {
     m_aProps.removeContainerListener(xListener);
 }
 
 // XElementAccess
-uno::Type SAL_CALL OShape::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL OShape::getElementType(  )
 {
     return cppu::UnoType<report::XFormatCondition>::get();
 }
 
-sal_Bool SAL_CALL OShape::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OShape::hasElements(  )
 {
     return m_aProps.hasElements();
 }
 
 // XIndexContainer
-void SAL_CALL OShape::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::insertByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.insertByIndex(Index,Element);
 }
 
-void SAL_CALL OShape::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::removeByIndex( ::sal_Int32 Index )
 {
     m_aProps.removeByIndex(Index);
 }
 
 // XIndexReplace
-void SAL_CALL OShape::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element )
 {
     m_aProps.replaceByIndex(Index,Element);
 }
 
 // XIndexAccess
-::sal_Int32 SAL_CALL OShape::getCount(  ) throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OShape::getCount(  )
 {
     return m_aProps.getCount();
 }
 
-uno::Any SAL_CALL OShape::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL OShape::getByIndex( ::sal_Int32 Index )
 {
     return m_aProps.getByIndex( Index );
 }
 
 // XShape
-awt::Point SAL_CALL OShape::getPosition(  ) throw (uno::RuntimeException, std::exception)
+awt::Point SAL_CALL OShape::getPosition(  )
 {
     return OShapeHelper::getPosition(this);
 }
 
-void SAL_CALL OShape::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setPosition( const awt::Point& aPosition )
 {
     OShapeHelper::setPosition(aPosition,this);
 }
 
-awt::Size SAL_CALL OShape::getSize(  ) throw (uno::RuntimeException, std::exception)
+awt::Size SAL_CALL OShape::getSize(  )
 {
     return OShapeHelper::getSize(this);
 }
 
-void SAL_CALL OShape::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setSize( const awt::Size& aSize )
 {
     OShapeHelper::setSize(aSize,this);
 }
 
 
 // XShapeDescriptor
-OUString SAL_CALL OShape::getShapeType(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OShape::getShapeType(  )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( m_aProps.aComponent.m_xShape.is() )
@@ -425,46 +425,46 @@ OUString SAL_CALL OShape::getShapeType(  ) throw (uno::RuntimeException, std::ex
     return OUString("com.sun.star.drawing.CustomShape");
 }
 
-::sal_Int32 SAL_CALL OShape::getZOrder() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OShape::getZOrder()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_ZORDER) >>= m_nZOrder;
     return m_nZOrder;
 }
 
-void SAL_CALL OShape::setZOrder( ::sal_Int32 _zorder ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setZOrder( ::sal_Int32 _zorder )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_ZORDER,uno::makeAny(_zorder));
     set(PROPERTY_ZORDER,_zorder,m_nZOrder);
 }
 
-sal_Bool SAL_CALL OShape::getOpaque() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OShape::getOpaque()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bOpaque;
 }
 
-void SAL_CALL OShape::setOpaque( sal_Bool _opaque ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setOpaque( sal_Bool _opaque )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     set(PROPERTY_OPAQUE,_opaque,m_bOpaque);
 }
 
-drawing::HomogenMatrix3 SAL_CALL OShape::getTransformation() throw (uno::RuntimeException, std::exception)
+drawing::HomogenMatrix3 SAL_CALL OShape::getTransformation()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_TRANSFORMATION) >>= m_Transformation;
     return m_Transformation;
 }
 
-void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transformation ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transformation )
 {
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_TRANSFORMATION,uno::makeAny(_transformation));
     set(PROPERTY_TRANSFORMATION,_transformation,m_Transformation);
 }
 
-OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OShape::getCustomShapeEngine()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEENGINE) >>= m_CustomShapeEngine;
@@ -472,33 +472,33 @@ OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException, s
     return m_CustomShapeEngine;
 }
 
-void SAL_CALL OShape::setCustomShapeEngine( const OUString& _customshapeengine ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setCustomShapeEngine( const OUString& _customshapeengine )
 {
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEENGINE,uno::makeAny(_customshapeengine));
     set(PROPERTY_CUSTOMSHAPEENGINE,_customshapeengine,m_CustomShapeEngine);
 }
 
-OUString SAL_CALL OShape::getCustomShapeData() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OShape::getCustomShapeData()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEDATA) >>= m_CustomShapeData;
     return m_CustomShapeData;
 }
 
-void SAL_CALL OShape::setCustomShapeData( const OUString& _customshapedata ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setCustomShapeData( const OUString& _customshapedata )
 {
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEDATA,uno::makeAny(_customshapedata));
     set(PROPERTY_CUSTOMSHAPEDATA,_customshapedata,m_CustomShapeData);
 }
 
-uno::Sequence< beans::PropertyValue > SAL_CALL OShape::getCustomShapeGeometry() throw (uno::RuntimeException, std::exception)
+uno::Sequence< beans::PropertyValue > SAL_CALL OShape::getCustomShapeGeometry()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEGEOMETRY) >>= m_CustomShapeGeometry;
     return m_CustomShapeGeometry;
 }
 
-void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence< beans::PropertyValue >& _customshapegeometry ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence< beans::PropertyValue >& _customshapegeometry )
 {
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEGEOMETRY,uno::makeAny(_customshapegeometry));
     set(PROPERTY_CUSTOMSHAPEGEOMETRY,_customshapegeometry,m_CustomShapeGeometry);
diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx
index df58de53bcc9..2315c6443f3f 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -78,24 +78,24 @@ namespace reportdesign
 
         DECLARE_XINTERFACE( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XReportComponent
         REPORTCOMPONENT_HEADER()
@@ -104,64 +104,64 @@ namespace reportdesign
         SHAPE_HEADER()
 
         // XShapeDescriptor
-        virtual OUString SAL_CALL getShapeType(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getShapeType(  ) override;
 
         // XReportControlModel
         REPORTCONTROLMODEL_HEADER()
 
         // XFixedLine
-        virtual ::sal_Int32 SAL_CALL getOrientation() throw (css::beans::UnknownPropertyException,css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setOrientation( ::sal_Int32 _orientation ) throw (css::beans::UnknownPropertyException,css::uno::RuntimeException, std::exception) override;
-        virtual css::drawing::LineStyle SAL_CALL getLineStyle() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLineStyle( css::drawing::LineStyle _linestyle ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::drawing::LineDash SAL_CALL getLineDash() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLineDash( const css::drawing::LineDash& _linedash ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getLineColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getLineTransparence() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLineTransparence( ::sal_Int16 _linetransparence ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getLineWidth() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLineWidth( ::sal_Int32 _linewidth ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getOrientation() override;
+        virtual void SAL_CALL setOrientation( ::sal_Int32 _orientation ) override;
+        virtual css::drawing::LineStyle SAL_CALL getLineStyle() override;
+        virtual void SAL_CALL setLineStyle( css::drawing::LineStyle _linestyle ) override;
+        virtual css::drawing::LineDash SAL_CALL getLineDash() override;
+        virtual void SAL_CALL setLineDash( const css::drawing::LineDash& _linedash ) override;
+        virtual ::sal_Int32 SAL_CALL getLineColor() override;
+        virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) override;
+        virtual ::sal_Int16 SAL_CALL getLineTransparence() override;
+        virtual void SAL_CALL setLineTransparence( ::sal_Int16 _linetransparence ) override;
+        virtual ::sal_Int32 SAL_CALL getLineWidth() override;
+        virtual void SAL_CALL setLineWidth( ::sal_Int32 _linewidth ) override;
 
         // css::report::XReportControlFormat
         REPORTCONTROLFORMAT_HEADER()
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
 
         // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
         // XContainer
-        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
+        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) override;
 
         // XIndexAccess
-        virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
     };
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDLINE_HXX
diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx
index 3f481422ba49..1c46659cb032 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -90,24 +90,24 @@ namespace reportdesign
 
         DECLARE_XINTERFACE( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XReportComponent
         REPORTCOMPONENT_HEADER()
@@ -115,53 +115,53 @@ namespace reportdesign
         SHAPE_HEADER()
 
         // XShapeDescriptor
-        virtual OUString SAL_CALL getShapeType(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getShapeType(  ) override;
 
         // XReportControlModel
         REPORTCONTROLMODEL_HEADER()
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         // XFixedText
-        virtual OUString SAL_CALL getLabel() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLabel( const OUString& _label ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getLabel() override;
+        virtual void SAL_CALL setLabel( const OUString& _label ) override;
 
         // css::report::XReportControlFormat
         REPORTCONTROLFORMAT_HEADER()
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
 
         // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
         // XContainer
-        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
+        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) override;
 
         // XIndexAccess
-        virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
     };
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FIXEDTEXT_HXX
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index 861fd59ffc94..3227f48fc938 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -80,40 +80,40 @@ namespace reportdesign
 
         DECLARE_XINTERFACE( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XFormatCondition
-        virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFormula( const OUString& _formula ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getEnabled() override;
+        virtual void SAL_CALL setEnabled( sal_Bool _enabled ) override;
+        virtual OUString SAL_CALL getFormula() override;
+        virtual void SAL_CALL setFormula( const OUString& _formula ) override;
 
         // XReportControlFormat
         REPORTCONTROLFORMAT_HEADER()
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx
index 9f0bc96afb00..3e157b7448aa 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -95,43 +95,43 @@ namespace reportdesign
 
         DECLARE_XINTERFACE( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException, std::exception );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException, std::exception );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XContainer
-        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
+        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) override;
 
         // XIndexAccess
-        virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
 
         // XReportComponent
         REPORTCOMPONENT_HEADER()
@@ -140,7 +140,7 @@ namespace reportdesign
         SHAPE_HEADER()
 
         // XShapeDescriptor
-        virtual OUString SAL_CALL getShapeType(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getShapeType(  ) override;
 
         // XReportControlModel
         REPORTCONTROLMODEL_HEADER()
@@ -149,28 +149,28 @@ namespace reportdesign
         REPORTCONTROLFORMAT_HEADER()
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         // XFormattedField
-        virtual ::sal_Int32 SAL_CALL getFormatKey() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFormatKey(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::util::XNumberFormatsSupplier > SAL_CALL getFormatsSupplier() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFormatsSupplier( const css::uno::Reference< css::util::XNumberFormatsSupplier >& _formatssupplier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getFormatKey() override;
+        virtual void SAL_CALL setFormatKey(::sal_Int32 the_value) override;
+        virtual css::uno::Reference< css::util::XNumberFormatsSupplier > SAL_CALL getFormatsSupplier() override;
+        virtual void SAL_CALL setFormatsSupplier( const css::uno::Reference< css::util::XNumberFormatsSupplier >& _formatssupplier ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
 
         // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
     };
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FORMATTEDFIELD_HXX
diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx
index ebf2ed99e0bd..fc9878b355f5 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -81,51 +81,51 @@ namespace reportdesign
 
         DECLARE_XINTERFACE( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // css::report::XFunction:
-        virtual sal_Bool SAL_CALL getPreEvaluated() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPreEvaluated(sal_Bool the_value) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getDeepTraversing() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDeepTraversing(sal_Bool the_value) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setName(const OUString & the_value) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFormula(const OUString & the_value) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::beans::Optional< OUString> SAL_CALL getInitialFormula() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setInitialFormula(const css::beans::Optional< OUString> & the_value) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getPreEvaluated() override;
+        virtual void SAL_CALL setPreEvaluated(sal_Bool the_value) override;
+        virtual sal_Bool SAL_CALL getDeepTraversing() override;
+        virtual void SAL_CALL setDeepTraversing(sal_Bool the_value) override;
+        virtual OUString SAL_CALL getName() override;
+        virtual void SAL_CALL setName(const OUString & the_value) override;
+        virtual OUString SAL_CALL getFormula() override;
+        virtual void SAL_CALL setFormula(const OUString & the_value) override;
+        virtual css::beans::Optional< OUString> SAL_CALL getInitialFormula() override;
+        virtual void SAL_CALL setInitialFormula(const css::beans::Optional< OUString> & the_value) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
 
         // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
     };
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_FUNCTION_HXX
diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx
index b83db5690dc6..0eb61ea04037 100644
--- a/reportdesign/source/core/inc/Functions.hxx
+++ b/reportdesign/source/core/inc/Functions.hxx
@@ -63,32 +63,32 @@ namespace reportdesign
 
     // XFunctions
         // Methods
-        virtual css::uno::Reference< css::report::XFunction > SAL_CALL createFunction(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XFunction > SAL_CALL createFunction(  ) override;
     // XIndexContainer
-        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
+        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) override;
     // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
     // XIndexAccess
-        virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
     // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
     // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
     // XContainer
-        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index 0a9c6dc21734..7f49e80a52a8 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -104,59 +104,59 @@ namespace reportdesign
 
         DECLARE_XINTERFACE( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XGroup
-        virtual sal_Bool SAL_CALL getSortAscending() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setSortAscending( sal_Bool _sortascending ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getHeaderOn() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHeaderOn( sal_Bool _headeron ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getFooterOn() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFooterOn( sal_Bool _footeron ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XSection > SAL_CALL getHeader() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XSection > SAL_CALL getFooter() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getGroupOn() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setGroupOn( ::sal_Int16 _groupon ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getGroupInterval() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setGroupInterval( ::sal_Int32 _groupinterval ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setKeepTogether( ::sal_Int16 _keeptogether ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XGroups > SAL_CALL getGroups() throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getExpression() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setExpression( const OUString& _expression ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getStartNewColumn() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setStartNewColumn( sal_Bool _startnewcolumn ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getResetPageNumber() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setResetPageNumber( sal_Bool _resetpagenumber ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getSortAscending() override;
+        virtual void SAL_CALL setSortAscending( sal_Bool _sortascending ) override;
+        virtual sal_Bool SAL_CALL getHeaderOn() override;
+        virtual void SAL_CALL setHeaderOn( sal_Bool _headeron ) override;
+        virtual sal_Bool SAL_CALL getFooterOn() override;
+        virtual void SAL_CALL setFooterOn( sal_Bool _footeron ) override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getHeader() override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getFooter() override;
+        virtual ::sal_Int16 SAL_CALL getGroupOn() override;
+        virtual void SAL_CALL setGroupOn( ::sal_Int16 _groupon ) override;
+        virtual ::sal_Int32 SAL_CALL getGroupInterval() override;
+        virtual void SAL_CALL setGroupInterval( ::sal_Int32 _groupinterval ) override;
+        virtual ::sal_Int16 SAL_CALL getKeepTogether() override;
+        virtual void SAL_CALL setKeepTogether( ::sal_Int16 _keeptogether ) override;
+        virtual css::uno::Reference< css::report::XGroups > SAL_CALL getGroups() override;
+        virtual OUString SAL_CALL getExpression() override;
+        virtual void SAL_CALL setExpression( const OUString& _expression ) override;
+        virtual sal_Bool SAL_CALL getStartNewColumn() override;
+        virtual void SAL_CALL setStartNewColumn( sal_Bool _startnewcolumn ) override;
+        virtual sal_Bool SAL_CALL getResetPageNumber() override;
+        virtual void SAL_CALL setResetPageNumber( sal_Bool _resetpagenumber ) override;
 
         //XFunctionsSupplier
-        virtual css::uno::Reference< css::report::XFunctions > SAL_CALL getFunctions() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XFunctions > SAL_CALL getFunctions() override;
 
         // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx
index 298c83ef2620..248dd725f515 100644
--- a/reportdesign/source/core/inc/Groups.hxx
+++ b/reportdesign/source/core/inc/Groups.hxx
@@ -62,34 +62,34 @@ namespace reportdesign
 
     // XGroups
         // Attributes
-        virtual css::uno::Reference< css::report::XReportDefinition > SAL_CALL getReportDefinition() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XReportDefinition > SAL_CALL getReportDefinition() override;
         // Methods
-        virtual css::uno::Reference< css::report::XGroup > SAL_CALL createGroup(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XGroup > SAL_CALL createGroup(  ) override;
     // XIndexContainer
-        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
+        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) override;
     // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
     // XIndexAccess
-        virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
     // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
     // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
     // XContainer
-        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index ba451e268538..7152df9cda23 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -84,24 +84,24 @@ namespace reportdesign
 
         DECLARE_XINTERFACE( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XReportComponent
         REPORTCOMPONENT_HEADER()
@@ -109,7 +109,7 @@ namespace reportdesign
         SHAPE_HEADER()
 
         // XShapeDescriptor
-        virtual OUString SAL_CALL getShapeType(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getShapeType(  ) override;
 
         // XReportControlModel
         REPORTCONTROLMODEL_HEADER()
@@ -118,51 +118,51 @@ namespace reportdesign
         REPORTCONTROLFORMAT_HEADER()
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         // XImageControl
-        virtual OUString SAL_CALL getImageURL() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setImageURL( const OUString& _imageurl ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getPreserveIRI() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPreserveIRI( sal_Bool _preserveiri ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getScaleMode() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImageURL() override;
+        virtual void SAL_CALL setImageURL( const OUString& _imageurl ) override;
+        virtual sal_Bool SAL_CALL getPreserveIRI() override;
+        virtual void SAL_CALL setPreserveIRI( sal_Bool _preserveiri ) override;
+        virtual ::sal_Int16 SAL_CALL getScaleMode() override;
+        virtual void SAL_CALL setScaleMode( ::sal_Int16 _scalemode ) override;
 
         // XImageProducerSupplier
-        virtual css::uno::Reference< css::awt::XImageProducer > SAL_CALL getImageProducer(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XImageProducer > SAL_CALL getImageProducer(  ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
 
         // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
         // XContainer
-        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
+        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) override;
 
         // XIndexAccess
-        virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
     };
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_IMAGECONTROL_HXX
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index 803e03f3f14a..6df1c5a25484 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -97,39 +97,39 @@ namespace reportdesign
 
         // XContainer
         /// @throws css::uno::RuntimeException
-        void addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException);
+        void addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener );
         /// @throws css::uno::RuntimeException
-        void removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException);
+        void removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener );
 
         // XElementAccess
         /// @throws css::uno::RuntimeException
-        bool hasElements(  ) throw (css::uno::RuntimeException);
+        bool hasElements(  );
 
         // XIndexReplace
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        void replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+        void replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element );
 
         // XIndexContainer
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        void insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+        void insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        void removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+        void removeByIndex( ::sal_Int32 Index );
 
         // XIndexAccess
         /// @throws css::uno::RuntimeException
-        ::sal_Int32 getCount(  ) throw (css::uno::RuntimeException);
+        ::sal_Int32 getCount(  );
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::WrappedTargetException
         /// @throws css::uno::RuntimeException
-        css::uno::Any getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+        css::uno::Any getByIndex( ::sal_Int32 Index );
 
         static bool isInterfaceForbidden(const css::uno::Type& _rType);
     };
diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx
index da3ba3b46280..e1b432247e0d 100644
--- a/reportdesign/source/core/inc/ReportDrawPage.hxx
+++ b/reportdesign/source/core/inc/ReportDrawPage.hxx
@@ -31,9 +31,8 @@ namespace reportdesign
         OReportDrawPage(const OReportDrawPage&) = delete;
         void operator =(const OReportDrawPage&) = delete;
     protected:
-        virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::drawing::XShape >  CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
+        virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape ) override;
+        virtual css::uno::Reference< css::drawing::XShape >  CreateShape( SdrObject *pObj ) const override;
     public:
         OReportDrawPage(SdrPage* pPage,const css::uno::Reference< css::report::XSection >& _xSection);
     };
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index acf3d39ea2c7..e2d76c9c5bf6 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -84,54 +84,54 @@ namespace reportdesign
 
         DECLARE_XINTERFACE( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
     private:
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XReportEngine
             // Attributes
-        virtual css::uno::Reference< css::report::XReportDefinition > SAL_CALL getReportDefinition() throw (css::uno::RuntimeException, std::exception) override ;
-        virtual void SAL_CALL setReportDefinition( const css::uno::Reference< css::report::XReportDefinition >& _reportdefinition ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setActiveConnection( const css::uno::Reference< css::sdbc::XConnection >& _activeconnection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator() throw (css::uno::RuntimeException, std::exception) override ;
-        virtual void SAL_CALL setStatusIndicator( const css::uno::Reference< css::task::XStatusIndicator >& _statusindicator ) throw (css::uno::RuntimeException, std::exception) override ;
-        virtual ::sal_Int32 SAL_CALL getMaxRows() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMaxRows( ::sal_Int32 MaxRows ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XReportDefinition > SAL_CALL getReportDefinition() override ;
+        virtual void SAL_CALL setReportDefinition( const css::uno::Reference< css::report::XReportDefinition >& _reportdefinition ) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() override;
+        virtual void SAL_CALL setActiveConnection( const css::uno::Reference< css::sdbc::XConnection >& _activeconnection ) override;
+        virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator() override ;
+        virtual void SAL_CALL setStatusIndicator( const css::uno::Reference< css::task::XStatusIndicator >& _statusindicator ) override ;
+        virtual ::sal_Int32 SAL_CALL getMaxRows() override;
+        virtual void SAL_CALL setMaxRows( ::sal_Int32 MaxRows ) override;
             // Methods
-        virtual css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentModel(  ) throw (css::lang::DisposedException, css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ;
-        virtual css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentAlive( const css::uno::Reference< css::frame::XFrame >& _frame ) throw (css::lang::DisposedException, css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentModel(  ) override ;
+        virtual css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentAlive( const css::uno::Reference< css::frame::XFrame >& _frame ) override ;
         /// @throws css::lang::DisposedException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentAlive( const css::uno::Reference< css::frame::XFrame >& _frame ,bool _bHidden) throw (css::lang::DisposedException, css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) ;
-        virtual css::util::URL SAL_CALL createDocument(  ) throw (css::lang::DisposedException, css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ;
-        virtual void SAL_CALL interrupt(  ) throw (css::lang::DisposedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override ;
+        css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentAlive( const css::uno::Reference< css::frame::XFrame >& _frame ,bool _bHidden) ;
+        virtual css::util::URL SAL_CALL createDocument(  ) override ;
+        virtual void SAL_CALL interrupt(  ) override ;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx b/reportdesign/source/core/inc/ReportHelperImpl.hxx
index 0575c81b6dea..bc92f1167ae7 100644
--- a/reportdesign/source/core/inc/ReportHelperImpl.hxx
+++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx
@@ -20,56 +20,56 @@
 #define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTHELPERIMPL_HXX
 // css::report::XReportComponent:
 #define REPORTCOMPONENT_IMPL3(clazz,arg) \
-OUString SAL_CALL clazz::getName() throw (uno::RuntimeException, std::exception) \
+OUString SAL_CALL clazz::getName() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return (arg).m_sName; \
 } \
-void SAL_CALL clazz::setName( const OUString& _name ) throw (uno::RuntimeException,beans::PropertyVetoException, std::exception) \
+void SAL_CALL clazz::setName( const OUString& _name ) \
 { \
     set(PROPERTY_NAME,_name,(arg).m_sName); \
 } \
-::sal_Int32 SAL_CALL clazz::getHeight() throw (uno::RuntimeException, std::exception) \
+::sal_Int32 SAL_CALL clazz::getHeight() \
 { \
     return getSize().Height; \
 } \
-void SAL_CALL clazz::setHeight( ::sal_Int32 _height ) throw (uno::RuntimeException,beans::PropertyVetoException, std::exception) \
+void SAL_CALL clazz::setHeight( ::sal_Int32 _height ) \
 { \
     awt::Size aSize = getSize(); \
     aSize.Height = _height; \
     setSize(aSize); \
 } \
-::sal_Int32 SAL_CALL clazz::getPositionX() throw (uno::RuntimeException, std::exception) \
+::sal_Int32 SAL_CALL clazz::getPositionX() \
 { \
     return getPosition().X; \
 } \
-void SAL_CALL clazz::setPositionX( ::sal_Int32 _positionx ) throw (uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setPositionX( ::sal_Int32 _positionx ) \
 { \
     awt::Point aPos = getPosition(); \
     aPos.X = _positionx; \
     setPosition(aPos); \
 } \
-::sal_Int32 SAL_CALL clazz::getPositionY() throw (uno::RuntimeException, std::exception) \
+::sal_Int32 SAL_CALL clazz::getPositionY() \
 { \
     return getPosition().Y; \
 } \
-void SAL_CALL clazz::setPositionY( ::sal_Int32 _positiony ) throw (uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setPositionY( ::sal_Int32 _positiony ) \
 { \
     awt::Point aPos = getPosition(); \
     aPos.Y = _positiony; \
     setPosition(aPos); \
 } \
-::sal_Int32 SAL_CALL clazz::getWidth() throw (uno::RuntimeException, std::exception) \
+::sal_Int32 SAL_CALL clazz::getWidth() \
 { \
     return getSize().Width; \
 } \
-void SAL_CALL clazz::setWidth( ::sal_Int32 _width ) throw (uno::RuntimeException,beans::PropertyVetoException, std::exception) \
+void SAL_CALL clazz::setWidth( ::sal_Int32 _width ) \
 { \
     awt::Size aSize = getSize(); \
     aSize.Width = _width; \
     setSize(aSize); \
 } \
-uno::Reference< report::XSection > SAL_CALL clazz::getSection() throw (uno::RuntimeException, std::exception) \
+uno::Reference< report::XSection > SAL_CALL clazz::getSection() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     uno::Reference< container::XChild > xParent(getParent(  ),uno::UNO_QUERY); \
@@ -78,85 +78,85 @@ uno::Reference< report::XSection > SAL_CALL clazz::getSection() throw (uno::Runt
 
 #define REPORTCOMPONENT_IMPL(clazz,arg) \
 REPORTCOMPONENT_IMPL3(clazz,arg)\
-sal_Bool SAL_CALL clazz::getPrintRepeatedValues() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+sal_Bool SAL_CALL clazz::getPrintRepeatedValues() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return (arg).m_bPrintRepeatedValues; \
 } \
-void SAL_CALL clazz::setPrintRepeatedValues( sal_Bool _printrepeatedvalues ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setPrintRepeatedValues( sal_Bool _printrepeatedvalues ) \
 { \
     set(PROPERTY_PRINTREPEATEDVALUES,_printrepeatedvalues,(arg).m_bPrintRepeatedValues); \
 }
 
 #define REPORTCOMPONENT_IMPL2(clazz,arg) \
-::sal_Int16  SAL_CALL clazz::getControlBorder() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+::sal_Int16  SAL_CALL clazz::getControlBorder() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return (arg).m_nBorder; \
 } \
-void SAL_CALL clazz::setControlBorder( ::sal_Int16 _border ) throw (uno::RuntimeException,lang::IllegalArgumentException,beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setControlBorder( ::sal_Int16 _border )\
 { \
     set(PROPERTY_CONTROLBORDER,_border,(arg).m_nBorder); \
 } \
-::sal_Int32 SAL_CALL clazz::getControlBorderColor() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+::sal_Int32 SAL_CALL clazz::getControlBorderColor() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return (arg).m_nBorderColor; \
 } \
-void SAL_CALL clazz::setControlBorderColor( ::sal_Int32 _bordercolor ) throw (uno::RuntimeException, lang::IllegalArgumentException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setControlBorderColor( ::sal_Int32 _bordercolor ) \
 { \
     set(PROPERTY_CONTROLBORDERCOLOR,_bordercolor,(arg).m_nBorderColor); \
 }
 
 #define REPORTCOMPONENT_MASTERDETAIL(clazz,arg) \
-css::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) \
+css::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return (arg).m_aMasterFields; \
 } \
-void SAL_CALL clazz::setMasterFields( const css::uno::Sequence< OUString >& _masterfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setMasterFields( const css::uno::Sequence< OUString >& _masterfields )\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     set(PROPERTY_MASTERFIELDS,_masterfields,(arg).m_aMasterFields); \
 } \
-css::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+css::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return (arg).m_aDetailFields; \
 } \
-void SAL_CALL clazz::setDetailFields( const css::uno::Sequence< OUString >& _detailfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setDetailFields( const css::uno::Sequence< OUString >& _detailfields )\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     set(PROPERTY_DETAILFIELDS,_detailfields,(arg).m_aDetailFields); \
 }
 
 #define REPORTCOMPONENT_NOMASTERDETAIL(clazz) \
-css::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) \
+css::uno::Sequence< OUString > SAL_CALL clazz::getMasterFields() \
 { \
     throw css::beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setMasterFields( const css::uno::Sequence< OUString >& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setMasterFields( const css::uno::Sequence< OUString >& )\
 { \
     throw css::beans::UnknownPropertyException();\
 } \
-css::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+css::uno::Sequence< OUString > SAL_CALL clazz::getDetailFields()\
 { \
     throw css::beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setDetailFields( const css::uno::Sequence< OUString >&  ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setDetailFields( const css::uno::Sequence< OUString >&  )\
 { \
     throw css::beans::UnknownPropertyException();\
 }
 
 // css::report::XReportControlFormat:
 #define REPORTCONTROLFORMAT_IMPL1(clazz,varName)  \
-::sal_Int32 SAL_CALL clazz::getControlBackground() throw (css::beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+::sal_Int32 SAL_CALL clazz::getControlBackground() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.m_bBackgroundTransparent ? COL_TRANSPARENT : varName.nBackgroundColor; \
 } \
  \
-void SAL_CALL clazz::setControlBackground( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setControlBackground( ::sal_Int32 _backgroundcolor )\
 { \
     bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT);\
     setControlBackgroundTransparent(bTransparent);\
@@ -164,13 +164,13 @@ void SAL_CALL clazz::setControlBackground( ::sal_Int32 _backgroundcolor ) throw
         set(PROPERTY_CONTROLBACKGROUND,_backgroundcolor,varName.nBackgroundColor);\
 } \
  \
-sal_Bool SAL_CALL clazz::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+sal_Bool SAL_CALL clazz::getControlBackgroundTransparent() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.m_bBackgroundTransparent; \
 } \
  \
-void SAL_CALL clazz::setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent ) \
 { \
     set(PROPERTY_CONTROLBACKGROUNDTRANSPARENT,_controlbackgroundtransparent,varName.m_bBackgroundTransparent);\
     if ( _controlbackgroundtransparent )\
@@ -178,289 +178,289 @@ void SAL_CALL clazz::setControlBackgroundTransparent( sal_Bool _controlbackgroun
 }
 
 #define REPORTCONTROLFORMAT_IMPL2(clazz,varName)  \
-::sal_Int16 SAL_CALL clazz::getCharStrikeout() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharStrikeout() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.Strikeout; \
 } \
  \
-void SAL_CALL clazz::setCharStrikeout(::sal_Int16 the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharStrikeout(::sal_Int16 the_value) \
 { \
     set(PROPERTY_CHARSTRIKEOUT,the_value,varName.aFontDescriptor.Strikeout); \
 } \
  \
-sal_Bool SAL_CALL clazz::getCharWordMode() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+sal_Bool SAL_CALL clazz::getCharWordMode() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.WordLineMode; \
 } \
  \
-void SAL_CALL clazz::setCharWordMode(sal_Bool the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharWordMode(sal_Bool the_value) \
 { \
     set(PROPERTY_CHARWORDMODE,the_value,varName.aFontDescriptor.WordLineMode); \
 } \
  \
-::sal_Int16 SAL_CALL clazz::getCharRotation() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharRotation() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return static_cast<sal_Int16>(varName.aFontDescriptor.Orientation); \
 } \
  \
-void SAL_CALL clazz::setCharRotation(::sal_Int16 the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharRotation(::sal_Int16 the_value) \
 { \
     float newValue = the_value; \
     set(PROPERTY_CHARROTATION,newValue,varName.aFontDescriptor.Orientation); \
 } \
  \
-::sal_Int16 SAL_CALL clazz::getCharScaleWidth() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharScaleWidth() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return static_cast<sal_Int16>(varName.aFontDescriptor.CharacterWidth); \
 } \
  \
-void SAL_CALL clazz::setCharScaleWidth(::sal_Int16 the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharScaleWidth(::sal_Int16 the_value) \
 { \
     float newValue = the_value; \
     set(PROPERTY_CHARSCALEWIDTH,newValue,varName.aFontDescriptor.CharacterWidth); \
 } \
-sal_Int16 SAL_CALL clazz::getParaAdjust() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+sal_Int16 SAL_CALL clazz::getParaAdjust() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.nAlign; \
 } \
  \
-void SAL_CALL clazz::setParaAdjust( sal_Int16 _align ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setParaAdjust( sal_Int16 _align ) \
 { \
     set(PROPERTY_PARAADJUST,_align,varName.nAlign); \
 } \
  \
-awt::FontDescriptor SAL_CALL clazz::getFontDescriptor() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+awt::FontDescriptor SAL_CALL clazz::getFontDescriptor() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor; \
 } \
  \
-void SAL_CALL clazz::setFontDescriptor( const awt::FontDescriptor& _fontdescriptor ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setFontDescriptor( const awt::FontDescriptor& _fontdescriptor ) \
 { \
     set(PROPERTY_FONTDESCRIPTOR,_fontdescriptor,varName.aFontDescriptor); \
 } \
-awt::FontDescriptor SAL_CALL clazz::getFontDescriptorAsian() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+awt::FontDescriptor SAL_CALL clazz::getFontDescriptorAsian() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aAsianFontDescriptor; \
 } \
  \
-void SAL_CALL clazz::setFontDescriptorAsian( const awt::FontDescriptor& _fontdescriptor ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setFontDescriptorAsian( const awt::FontDescriptor& _fontdescriptor ) \
 { \
     set(PROPERTY_FONTDESCRIPTORASIAN,_fontdescriptor,varName.aAsianFontDescriptor); \
 } \
-awt::FontDescriptor SAL_CALL clazz::getFontDescriptorComplex() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+awt::FontDescriptor SAL_CALL clazz::getFontDescriptorComplex() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aComplexFontDescriptor; \
 } \
  \
-void SAL_CALL clazz::setFontDescriptorComplex( const awt::FontDescriptor& _fontdescriptor ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setFontDescriptorComplex( const awt::FontDescriptor& _fontdescriptor ) \
 { \
     set(PROPERTY_FONTDESCRIPTORCOMPLEX,_fontdescriptor,varName.aComplexFontDescriptor); \
 } \
  \
-::sal_Int16 SAL_CALL clazz::getControlTextEmphasis() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getControlTextEmphasis() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.nFontEmphasisMark; \
 } \
  \
-void SAL_CALL clazz::setControlTextEmphasis( ::sal_Int16 _fontemphasismark ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setControlTextEmphasis( ::sal_Int16 _fontemphasismark ) \
 { \
     set(PROPERTY_CONTROLTEXTEMPHASISMARK,_fontemphasismark,varName.nFontEmphasisMark); \
 } \
  \
-::sal_Int16 SAL_CALL clazz::getCharRelief() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharRelief() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.nFontRelief; \
 } \
  \
-void SAL_CALL clazz::setCharRelief( ::sal_Int16 _fontrelief ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharRelief( ::sal_Int16 _fontrelief ) \
 { \
     set(PROPERTY_CHARRELIEF,_fontrelief,varName.nFontRelief); \
 } \
  \
-::sal_Int32 SAL_CALL clazz::getCharColor() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+::sal_Int32 SAL_CALL clazz::getCharColor() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.nTextColor; \
 } \
  \
-void SAL_CALL clazz::setCharColor( ::sal_Int32 _textcolor ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharColor( ::sal_Int32 _textcolor ) \
 { \
     set(PROPERTY_CHARCOLOR,_textcolor,varName.nTextColor); \
 } \
  \
-::sal_Int32 SAL_CALL clazz::getCharUnderlineColor() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+::sal_Int32 SAL_CALL clazz::getCharUnderlineColor() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.nTextLineColor; \
 } \
  \
-void SAL_CALL clazz::setCharUnderlineColor( ::sal_Int32 _textlinecolor ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharUnderlineColor( ::sal_Int32 _textlinecolor ) \
 { \
     set(PROPERTY_CHARUNDERLINECOLOR,_textlinecolor,varName.nTextLineColor); \
 } \
  \
-style::VerticalAlignment SAL_CALL clazz::getVerticalAlign() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+style::VerticalAlignment SAL_CALL clazz::getVerticalAlign() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aVerticalAlignment; \
 } \
  \
-void SAL_CALL clazz::setVerticalAlign( style::VerticalAlignment _verticalalign ) throw (lang::IllegalArgumentException,beans::UnknownPropertyException,uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setVerticalAlign( style::VerticalAlignment _verticalalign ) \
 { \
     set(PROPERTY_VERTICALALIGN,_verticalalign,varName.aVerticalAlignment); \
 } \
  \
-::sal_Int16 SAL_CALL clazz::getCharEmphasis() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharEmphasis() \
 { \
     return getControlTextEmphasis(); \
 } \
  \
-void SAL_CALL clazz::setCharEmphasis( ::sal_Int16 _charemphasis ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharEmphasis( ::sal_Int16 _charemphasis ) \
 { \
     set(PROPERTY_CHAREMPHASIS,_charemphasis,varName.nFontEmphasisMark); \
 } \
  \
-OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+OUString SAL_CALL clazz::getCharFontName() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.Name; \
 } \
  \
-void SAL_CALL clazz::setCharFontName( const OUString& _charfontname ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharFontName( const OUString& _charfontname ) \
 { \
     set(PROPERTY_CHARFONTNAME,_charfontname,varName.aFontDescriptor.Name); \
 } \
  \
-OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+OUString SAL_CALL clazz::getCharFontStyleName() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.StyleName; \
 } \
  \
-void SAL_CALL clazz::setCharFontStyleName( const OUString& _charfontstylename ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharFontStyleName( const OUString& _charfontstylename ) \
 { \
     set(PROPERTY_CHARFONTSTYLENAME,_charfontstylename,varName.aFontDescriptor.StyleName); \
 } \
  \
-::sal_Int16 SAL_CALL clazz::getCharFontFamily() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharFontFamily() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.Family; \
 } \
  \
-void SAL_CALL clazz::setCharFontFamily( ::sal_Int16 _charfontfamily ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharFontFamily( ::sal_Int16 _charfontfamily ) \
 { \
     set(PROPERTY_CHARFONTFAMILY,_charfontfamily,varName.aFontDescriptor.Family); \
 } \
  \
-::sal_Int16 SAL_CALL clazz::getCharFontCharSet() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharFontCharSet() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.CharSet; \
 } \
  \
-void SAL_CALL clazz::setCharFontCharSet( ::sal_Int16 _charfontcharset ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharFontCharSet( ::sal_Int16 _charfontcharset ) \
 { \
     set(PROPERTY_CHARFONTCHARSET,_charfontcharset,varName.aFontDescriptor.CharSet); \
 } \
  \
-::sal_Int16 SAL_CALL clazz::getCharFontPitch() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharFontPitch() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.Pitch; \
 } \
  \
-void SAL_CALL clazz::setCharFontPitch( ::sal_Int16 _charfontpitch ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharFontPitch( ::sal_Int16 _charfontpitch ) \
 { \
     set(PROPERTY_CHARFONTPITCH,_charfontpitch,varName.aFontDescriptor.Pitch); \
 } \
  \
-float SAL_CALL clazz::getCharHeight() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+float SAL_CALL clazz::getCharHeight() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.Height; \
 } \
  \
-void SAL_CALL clazz::setCharHeight( float _charheight ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharHeight( float _charheight ) \
 { \
     set(PROPERTY_CHARHEIGHT,static_cast<sal_Int16>(_charheight),varName.aFontDescriptor.Height); \
 } \
  \
-::sal_Int16 SAL_CALL clazz::getCharUnderline() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharUnderline() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.Underline; \
 } \
  \
-void SAL_CALL clazz::setCharUnderline( ::sal_Int16 _charunderline ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharUnderline( ::sal_Int16 _charunderline ) \
 { \
     set(PROPERTY_CHARUNDERLINE,_charunderline,varName.aFontDescriptor.Underline); \
 } \
  \
-float SAL_CALL clazz::getCharWeight() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+float SAL_CALL clazz::getCharWeight() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.Weight; \
 } \
  \
-void SAL_CALL clazz::setCharWeight( float _charweight ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharWeight( float _charweight ) \
 { \
     set(PROPERTY_CHARWEIGHT,_charweight,varName.aFontDescriptor.Weight); \
 } \
  \
-awt::FontSlant SAL_CALL clazz::getCharPosture() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+awt::FontSlant SAL_CALL clazz::getCharPosture() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aFontDescriptor.Slant; \
 } \
  \
-void SAL_CALL clazz::setCharPosture( awt::FontSlant _charposture ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) \
+void SAL_CALL clazz::setCharPosture( awt::FontSlant _charposture ) \
 { \
     set(PROPERTY_CHARPOSTURE,_charposture,varName.aFontDescriptor.Slant); \
 }\
-sal_Bool SAL_CALL clazz::getCharFlash() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+sal_Bool SAL_CALL clazz::getCharFlash()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.bCharFlash; \
 } \
-void SAL_CALL clazz::setCharFlash(sal_Bool the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharFlash(sal_Bool the_value)\
 { \
     set(PROPERTY_CHARFLASH,the_value,varName.bCharFlash); \
 }\
-sal_Bool SAL_CALL clazz::getCharAutoKerning() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+sal_Bool SAL_CALL clazz::getCharAutoKerning()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.bCharAutoKerning; \
 } \
-void SAL_CALL clazz::setCharAutoKerning(sal_Bool the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharAutoKerning(sal_Bool the_value)\
 { \
     set(PROPERTY_CHARAUTOKERNING,the_value,varName.bCharAutoKerning); \
 }\
-::sal_Int8 SAL_CALL clazz::getCharEscapementHeight() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+::sal_Int8 SAL_CALL clazz::getCharEscapementHeight() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.nCharEscapementHeight; \
 } \
-void SAL_CALL clazz::setCharEscapementHeight(::sal_Int8 the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharEscapementHeight(::sal_Int8 the_value) \
 { \
     set(PROPERTY_CHARESCAPEMENTHEIGHT,the_value,varName.nCharEscapementHeight); \
 }\
-lang::Locale SAL_CALL clazz::getCharLocale() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+lang::Locale SAL_CALL clazz::getCharLocale() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aCharLocale; \
 } \
-void SAL_CALL clazz::setCharLocale(const lang::Locale & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharLocale(const lang::Locale & the_value) \
 { \
     BoundListeners l; \
     { \
@@ -475,210 +475,210 @@ void SAL_CALL clazz::setCharLocale(const lang::Locale & the_value) throw (uno::R
     } \
     l.notify(); \
 }\
-::sal_Int16 SAL_CALL clazz::getCharEscapement() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharEscapement() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.nCharEscapement; \
 } \
-void SAL_CALL clazz::setCharEscapement(::sal_Int16 the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharEscapement(::sal_Int16 the_value) \
 { \
     set(PROPERTY_CHARESCAPEMENT,the_value,varName.nCharEscapement); \
 }\
-::sal_Int16 SAL_CALL clazz::getCharCaseMap() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharCaseMap() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.nCharCaseMap; \
 } \
-void SAL_CALL clazz::setCharCaseMap(::sal_Int16 the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharCaseMap(::sal_Int16 the_value) \
 { \
     set(PROPERTY_CHARCASEMAP,the_value,varName.nCharCaseMap); \
 }\
-sal_Bool SAL_CALL clazz::getCharCombineIsOn() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+sal_Bool SAL_CALL clazz::getCharCombineIsOn() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.bCharCombineIsOn; \
 } \
-void SAL_CALL clazz::setCharCombineIsOn(sal_Bool the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharCombineIsOn(sal_Bool the_value) \
 { \
     set(PROPERTY_CHARCOMBINEISON,the_value,varName.bCharCombineIsOn); \
 }\
-OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getCharCombinePrefix() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.sCharCombinePrefix; \
 } \
-void SAL_CALL clazz::setCharCombinePrefix(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharCombinePrefix(const OUString & the_value) \
 { \
     set(PROPERTY_CHARCOMBINEPREFIX,the_value,varName.sCharCombinePrefix); \
 }\
-OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getCharCombineSuffix() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.sCharCombineSuffix; \
 } \
-void SAL_CALL clazz::setCharCombineSuffix(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharCombineSuffix(const OUString & the_value) \
 { \
     set(PROPERTY_CHARCOMBINESUFFIX,the_value,varName.sCharCombineSuffix); \
 }\
-sal_Bool SAL_CALL clazz::getCharHidden() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+sal_Bool SAL_CALL clazz::getCharHidden() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.bCharHidden; \
 } \
-void SAL_CALL clazz::setCharHidden(sal_Bool the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharHidden(sal_Bool the_value) \
 { \
     set(PROPERTY_CHARHIDDEN,the_value,varName.bCharHidden); \
 }\
-sal_Bool SAL_CALL clazz::getCharShadowed() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+sal_Bool SAL_CALL clazz::getCharShadowed() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.bCharShadowed; \
 } \
-void SAL_CALL clazz::setCharShadowed(sal_Bool the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharShadowed(sal_Bool the_value) \
 { \
     set(PROPERTY_CHARSHADOWED,the_value,varName.bCharShadowed); \
 }\
-sal_Bool SAL_CALL clazz::getCharContoured() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+sal_Bool SAL_CALL clazz::getCharContoured() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.bCharContoured; \
 } \
-void SAL_CALL clazz::setCharContoured(sal_Bool the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharContoured(sal_Bool the_value) \
 { \
     set(PROPERTY_CHARCONTOURED,the_value,varName.bCharContoured); \
 }\
-OUString SAL_CALL clazz::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getHyperLinkURL() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.sHyperLinkURL; \
 } \
-void SAL_CALL clazz::setHyperLinkURL(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setHyperLinkURL(const OUString & the_value) \
 { \
     set(PROPERTY_HYPERLINKURL,the_value,varName.sHyperLinkURL); \
 }\
-OUString SAL_CALL clazz::getHyperLinkTarget() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getHyperLinkTarget() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.sHyperLinkTarget; \
 } \
-void SAL_CALL clazz::setHyperLinkTarget(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setHyperLinkTarget(const OUString & the_value) \
 { \
     set(PROPERTY_HYPERLINKTARGET,the_value,varName.sHyperLinkTarget); \
 }\
-OUString SAL_CALL clazz::getHyperLinkName() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getHyperLinkName() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.sHyperLinkName; \
 } \
-void SAL_CALL clazz::setHyperLinkName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setHyperLinkName(const OUString & the_value) \
 { \
     set(PROPERTY_HYPERLINKNAME,the_value,varName.sHyperLinkName); \
 }\
-OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getVisitedCharStyleName() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.sVisitedCharStyleName; \
 } \
-void SAL_CALL clazz::setVisitedCharStyleName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setVisitedCharStyleName(const OUString & the_value) \
 { \
     set(PROPERTY_VISITEDCHARSTYLENAME,the_value,varName.sVisitedCharStyleName); \
 }\
-OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getUnvisitedCharStyleName() \
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.sUnvisitedCharStyleName; \
 } \
-void SAL_CALL clazz::setUnvisitedCharStyleName(const OUString & the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setUnvisitedCharStyleName(const OUString & the_value) \
 { \
     set(PROPERTY_UNVISITEDCHARSTYLENAME,the_value,varName.sUnvisitedCharStyleName); \
 }\
-::sal_Int16 SAL_CALL clazz::getCharKerning() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharKerning()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.nCharKerning; \
 }\
-void SAL_CALL clazz::setCharKerning(::sal_Int16 the_value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharKerning(::sal_Int16 the_value)\
 { \
     set(PROPERTY_CHARKERNING,the_value,varName.nCharKerning); \
 }\
-float SAL_CALL clazz::getCharHeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+float SAL_CALL clazz::getCharHeightAsian()\
     { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aAsianFontDescriptor.Height; \
 }\
-void SAL_CALL clazz::setCharHeightAsian( float the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharHeightAsian( float the_value )\
 { \
     set(PROPERTY_CHARHEIGHTASIAN,static_cast<sal_Int16>(the_value),varName.aAsianFontDescriptor.Height); \
 }\
-float SAL_CALL clazz::getCharWeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+float SAL_CALL clazz::getCharWeightAsian()\
     { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aAsianFontDescriptor.Weight; \
 }\
-void SAL_CALL clazz::setCharWeightAsian( float the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharWeightAsian( float the_value )\
 { \
     set(PROPERTY_CHARWEIGHTASIAN,the_value,varName.aAsianFontDescriptor.Weight); \
 }\
-OUString SAL_CALL clazz::getCharFontNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+OUString SAL_CALL clazz::getCharFontNameAsian()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aAsianFontDescriptor.Name; \
 }\
-void SAL_CALL clazz::setCharFontNameAsian( const OUString& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontNameAsian( const OUString& the_value )\
 { \
     set(PROPERTY_CHARFONTNAMEASIAN,the_value,varName.aAsianFontDescriptor.Name); \
 }\
-OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+OUString SAL_CALL clazz::getCharFontStyleNameAsian()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aAsianFontDescriptor.StyleName; \
 }\
-void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& the_value )\
 { \
     set(PROPERTY_CHARFONTSTYLENAMEASIAN,the_value,varName.aAsianFontDescriptor.StyleName); \
 }\
-::sal_Int16 SAL_CALL clazz::getCharFontFamilyAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharFontFamilyAsian()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aAsianFontDescriptor.Family; \
 }\
-void SAL_CALL clazz::setCharFontFamilyAsian( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontFamilyAsian( ::sal_Int16 the_value )\
 { \
     set(PROPERTY_CHARFONTFAMILYASIAN,the_value,varName.aAsianFontDescriptor.Family); \
 }\
-::sal_Int16 SAL_CALL clazz::getCharFontCharSetAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharFontCharSetAsian()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aAsianFontDescriptor.CharSet; \
 }\
-void SAL_CALL clazz::setCharFontCharSetAsian( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontCharSetAsian( ::sal_Int16 the_value )\
 { \
     set(PROPERTY_CHARFONTCHARSETASIAN,the_value,varName.aAsianFontDescriptor.CharSet); \
 }\
-::sal_Int16 SAL_CALL clazz::getCharFontPitchAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharFontPitchAsian()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aAsianFontDescriptor.Pitch; \
 }\
-void SAL_CALL clazz::setCharFontPitchAsian( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontPitchAsian( ::sal_Int16 the_value )\
 { \
     set(PROPERTY_CHARFONTPITCHASIAN,the_value,varName.aAsianFontDescriptor.Pitch); \
 }\
-css::awt::FontSlant SAL_CALL clazz::getCharPostureAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+css::awt::FontSlant SAL_CALL clazz::getCharPostureAsian()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aAsianFontDescriptor.Slant; \
 }\
-void SAL_CALL clazz::setCharPostureAsian( css::awt::FontSlant the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharPostureAsian( css::awt::FontSlant the_value )\
 { \
     set(PROPERTY_CHARPOSTUREASIAN,the_value,varName.aAsianFontDescriptor.Slant); \
 }\
-css::lang::Locale SAL_CALL clazz::getCharLocaleAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+css::lang::Locale SAL_CALL clazz::getCharLocaleAsian()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aCharLocaleAsian; \
 }\
-void SAL_CALL clazz::setCharLocaleAsian( const css::lang::Locale& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharLocaleAsian( const css::lang::Locale& the_value )\
 { \
     BoundListeners l; \
     { \
@@ -693,84 +693,84 @@ void SAL_CALL clazz::setCharLocaleAsian( const css::lang::Locale& the_value ) th
     } \
     l.notify(); \
 }\
-float SAL_CALL clazz::getCharHeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+float SAL_CALL clazz::getCharHeightComplex()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aComplexFontDescriptor.Height; \
 }\
-void SAL_CALL clazz::setCharHeightComplex( float the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharHeightComplex( float the_value )\
 { \
     set(PROPERTY_CHARHEIGHTCOMPLEX,static_cast<sal_Int16>(the_value),varName.aComplexFontDescriptor.Height); \
 }\
-float SAL_CALL clazz::getCharWeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+float SAL_CALL clazz::getCharWeightComplex()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aComplexFontDescriptor.Weight; \
 }\
-void SAL_CALL clazz::setCharWeightComplex( float the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharWeightComplex( float the_value )\
 { \
     set(PROPERTY_CHARWEIGHTCOMPLEX,the_value,varName.aComplexFontDescriptor.Weight); \
 }\
-OUString SAL_CALL clazz::getCharFontNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+OUString SAL_CALL clazz::getCharFontNameComplex()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aComplexFontDescriptor.Name; \
 }\
-void SAL_CALL clazz::setCharFontNameComplex( const OUString& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontNameComplex( const OUString& the_value )\
 { \
     set(PROPERTY_CHARFONTNAMECOMPLEX,the_value,varName.aComplexFontDescriptor.Name); \
 }\
-OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+OUString SAL_CALL clazz::getCharFontStyleNameComplex()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aComplexFontDescriptor.StyleName; \
 }\
-void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& the_value )\
 { \
     set(PROPERTY_CHARFONTSTYLENAMECOMPLEX,the_value,varName.aComplexFontDescriptor.StyleName); \
 }\
-::sal_Int16 SAL_CALL clazz::getCharFontFamilyComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharFontFamilyComplex()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aComplexFontDescriptor.Family; \
 }\
-void SAL_CALL clazz::setCharFontFamilyComplex( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontFamilyComplex( ::sal_Int16 the_value )\
 { \
     set(PROPERTY_CHARFONTFAMILYCOMPLEX,the_value,varName.aComplexFontDescriptor.Family); \
 }\
-::sal_Int16 SAL_CALL clazz::getCharFontCharSetComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharFontCharSetComplex()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aComplexFontDescriptor.CharSet; \
 }\
-void SAL_CALL clazz::setCharFontCharSetComplex( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontCharSetComplex( ::sal_Int16 the_value )\
 { \
     set(PROPERTY_CHARFONTCHARSETCOMPLEX,the_value,varName.aComplexFontDescriptor.CharSet); \
 }\
-::sal_Int16 SAL_CALL clazz::getCharFontPitchComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharFontPitchComplex()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aComplexFontDescriptor.Pitch; \
 }\
-void SAL_CALL clazz::setCharFontPitchComplex( ::sal_Int16 the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontPitchComplex( ::sal_Int16 the_value )\
 { \
     set(PROPERTY_CHARFONTPITCHCOMPLEX,the_value,varName.aComplexFontDescriptor.Pitch); \
 }\
-css::awt::FontSlant SAL_CALL clazz::getCharPostureComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+css::awt::FontSlant SAL_CALL clazz::getCharPostureComplex()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aComplexFontDescriptor.Slant; \
 }\
-void SAL_CALL clazz::setCharPostureComplex( css::awt::FontSlant the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharPostureComplex( css::awt::FontSlant the_value )\
 { \
     set(PROPERTY_CHARPOSTURECOMPLEX,the_value,varName.aComplexFontDescriptor.Slant); \
 }\
-css::lang::Locale SAL_CALL clazz::getCharLocaleComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+css::lang::Locale SAL_CALL clazz::getCharLocaleComplex()\
 { \
     ::osl::MutexGuard aGuard(m_aMutex); \
     return varName.aCharLocaleComplex; \
 }\
-void SAL_CALL clazz::setCharLocaleComplex( const css::lang::Locale& the_value ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharLocaleComplex( const css::lang::Locale& the_value )\
 { \
     BoundListeners l; \
     { \
@@ -788,486 +788,486 @@ void SAL_CALL clazz::setCharLocaleComplex( const css::lang::Locale& the_value )
 
 
 #define NO_REPORTCONTROLFORMAT_IMPL(clazz)  \
-sal_Int16 SAL_CALL clazz::getParaAdjust() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+sal_Int16 SAL_CALL clazz::getParaAdjust()\
 {\
     throw beans::UnknownPropertyException();\
 }\
-void SAL_CALL clazz::setParaAdjust(sal_Int16 /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setParaAdjust(sal_Int16 /*the_value*/)\
 {\
     throw beans::UnknownPropertyException();\
 }\
-::sal_Int16 SAL_CALL clazz::getCharStrikeout() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharStrikeout()\
 {\
     throw beans::UnknownPropertyException();\
 }\
-void SAL_CALL clazz::setCharStrikeout(::sal_Int16 /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharStrikeout(::sal_Int16 /*the_value*/)\
 {\
     throw beans::UnknownPropertyException();\
 }\
-sal_Bool SAL_CALL clazz::getCharWordMode() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+sal_Bool SAL_CALL clazz::getCharWordMode()\
 {\
     throw beans::UnknownPropertyException();\
 }\
-void SAL_CALL clazz::setCharWordMode(sal_Bool /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharWordMode(sal_Bool /*the_value*/)\
 {\
     throw beans::UnknownPropertyException();\
 }\
-::sal_Int16 SAL_CALL clazz::getCharRotation() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharRotation()\
 {\
     throw beans::UnknownPropertyException();\
 }\
-void SAL_CALL clazz::setCharRotation(::sal_Int16 /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharRotation(::sal_Int16 /*the_value*/)\
 {\
     throw beans::UnknownPropertyException();\
 }\
-::sal_Int16 SAL_CALL clazz::getCharScaleWidth() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharScaleWidth()\
 {\
     throw beans::UnknownPropertyException();\
 }\
-void SAL_CALL clazz::setCharScaleWidth(::sal_Int16 /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharScaleWidth(::sal_Int16 /*the_value*/)\
 {\
     throw beans::UnknownPropertyException();\
 }\
-sal_Bool SAL_CALL clazz::getCharFlash() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+sal_Bool SAL_CALL clazz::getCharFlash()\
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharFlash(sal_Bool /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharFlash(sal_Bool /*the_value*/)\
 { \
     throw beans::UnknownPropertyException();\
 }\
-sal_Bool SAL_CALL clazz::getCharAutoKerning() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+sal_Bool SAL_CALL clazz::getCharAutoKerning()\
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharAutoKerning(sal_Bool /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharAutoKerning(sal_Bool /*the_value*/)\
 { \
     throw beans::UnknownPropertyException();\
 }\
-::sal_Int8 SAL_CALL clazz::getCharEscapementHeight() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+::sal_Int8 SAL_CALL clazz::getCharEscapementHeight() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharEscapementHeight(::sal_Int8 /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharEscapementHeight(::sal_Int8 /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-lang::Locale SAL_CALL clazz::getCharLocale() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+lang::Locale SAL_CALL clazz::getCharLocale() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharLocale(const lang::Locale & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharLocale(const lang::Locale & /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-::sal_Int16 SAL_CALL clazz::getCharEscapement() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharEscapement() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharEscapement(::sal_Int16 /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharEscapement(::sal_Int16 /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-::sal_Int16 SAL_CALL clazz::getCharCaseMap() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+::sal_Int16 SAL_CALL clazz::getCharCaseMap() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharCaseMap(::sal_Int16 /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharCaseMap(::sal_Int16 /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-sal_Bool SAL_CALL clazz::getCharCombineIsOn() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+sal_Bool SAL_CALL clazz::getCharCombineIsOn() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharCombineIsOn(sal_Bool /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharCombineIsOn(sal_Bool /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-OUString SAL_CALL clazz::getCharCombinePrefix() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getCharCombinePrefix() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharCombinePrefix(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharCombinePrefix(const OUString & /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-OUString SAL_CALL clazz::getCharCombineSuffix() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getCharCombineSuffix() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharCombineSuffix(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharCombineSuffix(const OUString & /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-sal_Bool SAL_CALL clazz::getCharHidden() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+sal_Bool SAL_CALL clazz::getCharHidden() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharHidden(sal_Bool /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharHidden(sal_Bool /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-sal_Bool SAL_CALL clazz::getCharShadowed() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+sal_Bool SAL_CALL clazz::getCharShadowed() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharShadowed(sal_Bool /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharShadowed(sal_Bool /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-sal_Bool SAL_CALL clazz::getCharContoured() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+sal_Bool SAL_CALL clazz::getCharContoured() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setCharContoured(sal_Bool /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setCharContoured(sal_Bool /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-OUString SAL_CALL clazz::getVisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getVisitedCharStyleName() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setVisitedCharStyleName(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setVisitedCharStyleName(const OUString & /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-OUString SAL_CALL clazz::getUnvisitedCharStyleName() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+OUString SAL_CALL clazz::getUnvisitedCharStyleName() \
 { \
     throw beans::UnknownPropertyException();\
 } \
-void SAL_CALL clazz::setUnvisitedCharStyleName(const OUString & /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception) \
+void SAL_CALL clazz::setUnvisitedCharStyleName(const OUString & /*the_value*/) \
 { \
     throw beans::UnknownPropertyException();\
 }\
-::sal_Int16 SAL_CALL clazz::getCharKerning() throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharKerning()\
 { \
     throw beans::UnknownPropertyException();\
 }\
-void SAL_CALL clazz::setCharKerning(::sal_Int16 /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)\
+void SAL_CALL clazz::setCharKerning(::sal_Int16 /*the_value*/)\
 { \
     throw beans::UnknownPropertyException();\
 }\
 \
-awt::FontDescriptor SAL_CALL clazz::getFontDescriptor() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+awt::FontDescriptor SAL_CALL clazz::getFontDescriptor()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setFontDescriptor( const awt::FontDescriptor& /*_fontdescriptor*/ ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setFontDescriptor( const awt::FontDescriptor& /*_fontdescriptor*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
-awt::FontDescriptor SAL_CALL clazz::getFontDescriptorAsian() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+awt::FontDescriptor SAL_CALL clazz::getFontDescriptorAsian()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setFontDescriptorAsian( const awt::FontDescriptor& /*_fontdescriptor*/ ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setFontDescriptorAsian( const awt::FontDescriptor& /*_fontdescriptor*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
-awt::FontDescriptor SAL_CALL clazz::getFontDescriptorComplex() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+awt::FontDescriptor SAL_CALL clazz::getFontDescriptorComplex()\
 {\
 throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setFontDescriptorComplex( const awt::FontDescriptor& /*_fontdescriptor*/ ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setFontDescriptorComplex( const awt::FontDescriptor& /*_fontdescriptor*/ )\
 {\
 throw beans::UnknownPropertyException();\
 }\
 \
-::sal_Int16 SAL_CALL clazz::getControlTextEmphasis() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getControlTextEmphasis()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setControlTextEmphasis( ::sal_Int16 /*_fontemphasismark*/ ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setControlTextEmphasis( ::sal_Int16 /*_fontemphasismark*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-::sal_Int16 SAL_CALL clazz::getCharRelief() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharRelief()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharRelief( ::sal_Int16 /*_fontrelief*/ ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharRelief( ::sal_Int16 /*_fontrelief*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-::sal_Int32 SAL_CALL clazz::getCharColor() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+::sal_Int32 SAL_CALL clazz::getCharColor()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharColor( ::sal_Int32 /*_textcolor*/ ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharColor( ::sal_Int32 /*_textcolor*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-::sal_Int32 SAL_CALL clazz::getCharUnderlineColor() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+::sal_Int32 SAL_CALL clazz::getCharUnderlineColor()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharUnderlineColor( ::sal_Int32 /*_textlinecolor*/ ) throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharUnderlineColor( ::sal_Int32 /*_textlinecolor*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-style::VerticalAlignment SAL_CALL clazz::getVerticalAlign() throw (beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+style::VerticalAlignment SAL_CALL clazz::getVerticalAlign()\
 {\
     ::osl::MutexGuard aGuard(m_aMutex);\
     return m_aProps.aFormatProperties.aVerticalAlignment;\
 }\
 \
-void SAL_CALL clazz::setVerticalAlign( style::VerticalAlignment _verticalalign ) throw (lang::IllegalArgumentException,beans::UnknownPropertyException,uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setVerticalAlign( style::VerticalAlignment _verticalalign )\
 {\
     set(PROPERTY_VERTICALALIGN,_verticalalign,m_aProps.aFormatProperties.aVerticalAlignment);\
 }\
 \
-::sal_Int16 SAL_CALL clazz::getCharEmphasis() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharEmphasis()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharEmphasis( ::sal_Int16 /*_charemphasis*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharEmphasis( ::sal_Int16 /*_charemphasis*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-OUString SAL_CALL clazz::getCharFontName() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+OUString SAL_CALL clazz::getCharFontName()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharFontName( const OUString& /*_charfontname*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontName( const OUString& /*_charfontname*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-OUString SAL_CALL clazz::getCharFontStyleName() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+OUString SAL_CALL clazz::getCharFontStyleName()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharFontStyleName( const OUString& /*_charfontstylename*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontStyleName( const OUString& /*_charfontstylename*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-::sal_Int16 SAL_CALL clazz::getCharFontFamily() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharFontFamily()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharFontFamily( ::sal_Int16 /*_charfontfamily*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontFamily( ::sal_Int16 /*_charfontfamily*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-::sal_Int16 SAL_CALL clazz::getCharFontCharSet() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharFontCharSet()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharFontCharSet( ::sal_Int16 /*_charfontcharset*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontCharSet( ::sal_Int16 /*_charfontcharset*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-::sal_Int16 SAL_CALL clazz::getCharFontPitch() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharFontPitch()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharFontPitch( ::sal_Int16 /*_charfontpitch*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharFontPitch( ::sal_Int16 /*_charfontpitch*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-float SAL_CALL clazz::getCharHeight() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+float SAL_CALL clazz::getCharHeight()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharHeight( float /*_charheight*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharHeight( float /*_charheight*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-::sal_Int16 SAL_CALL clazz::getCharUnderline() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+::sal_Int16 SAL_CALL clazz::getCharUnderline()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharUnderline( ::sal_Int16 /*_charunderline*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharUnderline( ::sal_Int16 /*_charunderline*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-float SAL_CALL clazz::getCharWeight() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+float SAL_CALL clazz::getCharWeight()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharWeight( float /*_charweight*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharWeight( float /*_charweight*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-awt::FontSlant SAL_CALL clazz::getCharPosture() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+awt::FontSlant SAL_CALL clazz::getCharPosture()\
 {\
     throw beans::UnknownPropertyException();\
 }\
 \
-void SAL_CALL clazz::setCharPosture( awt::FontSlant /*_charposture*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)\
+void SAL_CALL clazz::setCharPosture( awt::FontSlant /*_charposture*/ )\
 {\
     throw beans::UnknownPropertyException();\
 }\
- float SAL_CALL clazz::getCharHeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ float SAL_CALL clazz::getCharHeightAsian()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharHeightAsian( float  ) throw (beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharHeightAsian( float  )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- float SAL_CALL clazz::getCharWeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ float SAL_CALL clazz::getCharWeightAsian()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharWeightAsian( float  ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharWeightAsian( float  )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- OUString SAL_CALL clazz::getCharFontNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ OUString SAL_CALL clazz::getCharFontNameAsian()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontNameAsian( const OUString& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontNameAsian( const OUString& )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- OUString SAL_CALL clazz::getCharFontStyleNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ OUString SAL_CALL clazz::getCharFontStyleNameAsian()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontStyleNameAsian( const OUString& )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- ::sal_Int16 SAL_CALL clazz::getCharFontFamilyAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ ::sal_Int16 SAL_CALL clazz::getCharFontFamilyAsian()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontFamilyAsian( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontFamilyAsian( ::sal_Int16 )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- ::sal_Int16 SAL_CALL clazz::getCharFontCharSetAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ ::sal_Int16 SAL_CALL clazz::getCharFontCharSetAsian()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontCharSetAsian( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontCharSetAsian( ::sal_Int16 )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- ::sal_Int16 SAL_CALL clazz::getCharFontPitchAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ ::sal_Int16 SAL_CALL clazz::getCharFontPitchAsian()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontPitchAsian( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontPitchAsian( ::sal_Int16 )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- css::awt::FontSlant SAL_CALL clazz::getCharPostureAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ css::awt::FontSlant SAL_CALL clazz::getCharPostureAsian()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharPostureAsian( css::awt::FontSlant ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharPostureAsian( css::awt::FontSlant )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- css::lang::Locale SAL_CALL clazz::getCharLocaleAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ css::lang::Locale SAL_CALL clazz::getCharLocaleAsian()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharLocaleAsian( const css::lang::Locale& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharLocaleAsian( const css::lang::Locale& )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- float SAL_CALL clazz::getCharHeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ float SAL_CALL clazz::getCharHeightComplex()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharHeightComplex( float ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharHeightComplex( float )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- float SAL_CALL clazz::getCharWeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ float SAL_CALL clazz::getCharWeightComplex()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharWeightComplex( float ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharWeightComplex( float )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- OUString SAL_CALL clazz::getCharFontNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ OUString SAL_CALL clazz::getCharFontNameComplex()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontNameComplex( const OUString& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontNameComplex( const OUString& )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- OUString SAL_CALL clazz::getCharFontStyleNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ OUString SAL_CALL clazz::getCharFontStyleNameComplex()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontStyleNameComplex( const OUString& )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- ::sal_Int16 SAL_CALL clazz::getCharFontFamilyComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ ::sal_Int16 SAL_CALL clazz::getCharFontFamilyComplex()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontFamilyComplex( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontFamilyComplex( ::sal_Int16 )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- ::sal_Int16 SAL_CALL clazz::getCharFontCharSetComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ ::sal_Int16 SAL_CALL clazz::getCharFontCharSetComplex()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontCharSetComplex( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontCharSetComplex( ::sal_Int16 )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- ::sal_Int16 SAL_CALL clazz::getCharFontPitchComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ ::sal_Int16 SAL_CALL clazz::getCharFontPitchComplex()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharFontPitchComplex( ::sal_Int16 ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharFontPitchComplex( ::sal_Int16 )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- css::awt::FontSlant SAL_CALL clazz::getCharPostureComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ css::awt::FontSlant SAL_CALL clazz::getCharPostureComplex()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharPostureComplex( css::awt::FontSlant ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharPostureComplex( css::awt::FontSlant )\
  {\
     throw beans::UnknownPropertyException();\
 }\
- css::lang::Locale SAL_CALL clazz::getCharLocaleComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ css::lang::Locale SAL_CALL clazz::getCharLocaleComplex()\
  {\
     throw beans::UnknownPropertyException();\
 }\
- void SAL_CALL clazz::setCharLocaleComplex( const css::lang::Locale& ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)\
+ void SAL_CALL clazz::setCharLocaleComplex( const css::lang::Locale& )\
  {\
     throw beans::UnknownPropertyException();\
 }
diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx
index b3c0bf2acdc6..d6f3676b0239 100644
--- a/reportdesign/source/core/inc/RptObjectListener.hxx
+++ b/reportdesign/source/core/inc/RptObjectListener.hxx
@@ -40,10 +40,10 @@ public:
     OObjectListener(OObjectBase* _pObject);
 
     // 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;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const  css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const  css::beans::PropertyChangeEvent& evt ) override;
 };
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_RPTOBJECTLISTENER_HXX
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index 8b7c1d98c0ab..2ce22531c13d 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -144,89 +144,89 @@ namespace reportdesign
         DECLARE_XINTERFACE( )
 
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XSection
-        virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_uInt32 SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHeight( ::sal_uInt32 _height ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBackColor( ::sal_Int32 _backgroundcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getBackTransparent() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setBackTransparent( sal_Bool _backtransparent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getConditionalPrintExpression() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getForceNewPage() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setForceNewPage( ::sal_Int16 _forcenewpage ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getNewRowOrCol() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getKeepTogether() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setKeepTogether( sal_Bool _keeptogether ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getCanGrow() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCanGrow( sal_Bool _cangrow ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getCanShrink() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCanShrink( sal_Bool _canshrink ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getRepeatSection() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setRepeatSection( sal_Bool _repeatsection ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XGroup > SAL_CALL getGroup() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::report::XReportDefinition > SAL_CALL getReportDefinition() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getVisible() override;
+        virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+        virtual OUString SAL_CALL getName() override;
+        virtual void SAL_CALL setName( const OUString& _name ) override;
+        virtual ::sal_uInt32 SAL_CALL getHeight() override;
+        virtual void SAL_CALL setHeight( ::sal_uInt32 _height ) override;
+        virtual ::sal_Int32 SAL_CALL getBackColor() override;
+        virtual void SAL_CALL setBackColor( ::sal_Int32 _backgroundcolor ) override;
+        virtual sal_Bool SAL_CALL getBackTransparent() override;
+        virtual void SAL_CALL setBackTransparent( sal_Bool _backtransparent ) override;
+        virtual OUString SAL_CALL getConditionalPrintExpression() override;
+        virtual void SAL_CALL setConditionalPrintExpression( const OUString& _conditionalprintexpression ) override;
+        virtual ::sal_Int16 SAL_CALL getForceNewPage() override;
+        virtual void SAL_CALL setForceNewPage( ::sal_Int16 _forcenewpage ) override;
+        virtual ::sal_Int16 SAL_CALL getNewRowOrCol() override;
+        virtual void SAL_CALL setNewRowOrCol( ::sal_Int16 _newroworcol ) override;
+        virtual sal_Bool SAL_CALL getKeepTogether() override;
+        virtual void SAL_CALL setKeepTogether( sal_Bool _keeptogether ) override;
+        virtual sal_Bool SAL_CALL getCanGrow() override;
+        virtual void SAL_CALL setCanGrow( sal_Bool _cangrow ) override;
+        virtual sal_Bool SAL_CALL getCanShrink() override;
+        virtual void SAL_CALL setCanShrink( sal_Bool _canshrink ) override;
+        virtual sal_Bool SAL_CALL getRepeatSection() override;
+        virtual void SAL_CALL setRepeatSection( sal_Bool _repeatsection ) override;
+        virtual css::uno::Reference< css::report::XGroup > SAL_CALL getGroup() override;
+        virtual css::uno::Reference< css::report::XReportDefinition > SAL_CALL getReportDefinition() override;
 
         // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
         // XContainer
-        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
         // XShapes
-        virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+        virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
         // XShapeGrouper
-        virtual css::uno::Reference< css::drawing::XShapeGroup > SAL_CALL group( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL ungroup( const css::uno::Reference< css::drawing::XShapeGroup >& aGroup ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::drawing::XShapeGroup > SAL_CALL group( const css::uno::Reference< css::drawing::XShapes >& xShapes ) override;
+        virtual void SAL_CALL ungroup( const css::uno::Reference< css::drawing::XShapeGroup >& aGroup ) override;
 
         // XFormsSupplier
-        virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getForms() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getForms() override;
         // XFormsSupplier2
-        virtual sal_Bool SAL_CALL hasForms() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasForms() override;
 
         // XIndexAccess
-        virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
         // XEnumerationAccess
-        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
 
         // css::lang::XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
         static OSection* getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxComponent );
         static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index 9603e316ae8e..327e30f6f118 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -95,24 +95,24 @@ namespace reportdesign
 
         DECLARE_XINTERFACE( )
         // css::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XReportComponent
         REPORTCOMPONENT_HEADER()
@@ -120,18 +120,18 @@ namespace reportdesign
         // XShape
         SHAPE_HEADER()
 
-        virtual OUString SAL_CALL getCustomShapeEngine() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCustomShapeEngine( const OUString& _customshapeengine ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCustomShapeData() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCustomShapeData( const OUString& _customshapedata ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCustomShapeGeometry() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCustomShapeGeometry( const css::uno::Sequence< css::beans::PropertyValue >& _customshapegeometry ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getCustomShapeEngine() override;
+        virtual void SAL_CALL setCustomShapeEngine( const OUString& _customshapeengine ) override;
+        virtual OUString SAL_CALL getCustomShapeData() override;
+        virtual void SAL_CALL setCustomShapeData( const OUString& _customshapedata ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCustomShapeGeometry() override;
+        virtual void SAL_CALL setCustomShapeGeometry( const css::uno::Sequence< css::beans::PropertyValue >& _customshapegeometry ) override;
 
-        virtual sal_Bool SAL_CALL getOpaque() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setOpaque( sal_Bool _opaque ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getOpaque() override;
+        virtual void SAL_CALL setOpaque( sal_Bool _opaque ) override;
 
         // XShapeDescriptor
-        virtual OUString SAL_CALL getShapeType(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getShapeType(  ) override;
 
         // XReportControlModel
         REPORTCONTROLMODEL_HEADER()
@@ -139,47 +139,47 @@ namespace reportdesign
         // XReportControlFormat
         REPORTCONTROLFORMAT_HEADER()
         // XShape
-        virtual ::sal_Int32 SAL_CALL getZOrder() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setZOrder( ::sal_Int32 _zorder ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::drawing::HomogenMatrix3 SAL_CALL getTransformation() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTransformation( const css::drawing::HomogenMatrix3& _transformation ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getZOrder() override;
+        virtual void SAL_CALL setZOrder( ::sal_Int32 _zorder ) override;
+        virtual css::drawing::HomogenMatrix3 SAL_CALL getTransformation() override;
+        virtual void SAL_CALL setTransformation( const css::drawing::HomogenMatrix3& _transformation ) override;
 
         // XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
 
         // XChild
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
         // XContainer
-        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+        virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
         // XIndexReplace
-        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
 
         // XIndexContainer
-        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
+        virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) override;
 
         // XIndexAccess
-        virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+        virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
     };
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_SHAPE_HXX
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 05db20fe59ec..84946e8f7b82 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -89,7 +89,7 @@ OPropertyMediator::~OPropertyMediator()
 {
 }
 
-void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception)
+void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if ( !m_bInChange )
@@ -153,7 +153,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
     }
 }
 
-void SAL_CALL OPropertyMediator::disposing( const css::lang::EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OPropertyMediator::disposing( const css::lang::EventObject& /*_rSource*/ )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     disposing();
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index a88c940c46f8..328b9e279e49 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -47,7 +47,6 @@ OReportDrawPage::OReportDrawPage(SdrPage* _pPage
 }
 
 SdrObject* OReportDrawPage::CreateSdrObject_(const uno::Reference< drawing::XShape > & xDescr)
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< report::XReportComponent> xReportComponent(xDescr,uno::UNO_QUERY);
     if ( xReportComponent.is() )
@@ -56,7 +55,6 @@ SdrObject* OReportDrawPage::CreateSdrObject_(const uno::Reference< drawing::XSha
 }
 
 uno::Reference< drawing::XShape >  OReportDrawPage::CreateShape( SdrObject *pObj ) const
-    throw (uno::RuntimeException, std::exception)
 {
     OObjectBase* pBaseObj = dynamic_cast<OObjectBase*>(pObj);
     if ( !pBaseObj )
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index fda99cebfab8..7a99c39c3518 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -404,7 +404,7 @@ void OObjectBase::SetPropsFromRect(const Rectangle& _rRect)
     }
 }
 
-void OObjectBase::_propertyChange( const  beans::PropertyChangeEvent& /*evt*/ ) throw( uno::RuntimeException)
+void OObjectBase::_propertyChange( const  beans::PropertyChangeEvent& /*evt*/ )
 {
 }
 
@@ -789,7 +789,7 @@ OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
 }
 
 
-void OUnoObject::_propertyChange( const  beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException)
+void OUnoObject::_propertyChange( const  beans::PropertyChangeEvent& evt )
 {
     OObjectBase::_propertyChange(evt);
     if (isListening())
diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx
index 563a9fcf5d98..32a742b281e8 100644
--- a/reportdesign/source/core/sdr/RptObjectListener.cxx
+++ b/reportdesign/source/core/sdr/RptObjectListener.cxx
@@ -39,14 +39,14 @@ OObjectListener::~OObjectListener()
 // XEventListener
 
 
-void SAL_CALL OObjectListener::disposing( const  css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception)
+void SAL_CALL OObjectListener::disposing( const  css::lang::EventObject& )
 {
 }
 
 // XPropertyChangeListener
 
 
-void SAL_CALL OObjectListener::propertyChange( const  css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException, std::exception)
+void SAL_CALL OObjectListener::propertyChange( const  css::beans::PropertyChangeEvent& evt )
 {
     m_pObject->_propertyChange( evt );
 }
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index ecf834aa70a2..3042c04c55a2 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -197,7 +197,7 @@ void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 
 //  XEventListener
 
-void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException, std::exception )
+void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e)
 {
     // check if it's an object we have cached information about
     Reference< XPropertySet > xSourceSet(e.Source, UNO_QUERY);
@@ -213,7 +213,7 @@ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeE
 
 // XPropertyChangeListener
 
-void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEvent ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEvent )
 {
 
     ::osl::ClearableMutexGuard aGuard( m_pImpl->m_aMutex );
@@ -356,7 +356,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv
 }
 // XContainerListener
 
-void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
@@ -413,7 +413,7 @@ void OXUndoEnvironment::implSetModified()
 }
 
 
-void SAL_CALL OXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OXUndoEnvironment::elementReplaced(const ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
@@ -429,7 +429,7 @@ void SAL_CALL OXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thro
 }
 
 
-void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
@@ -474,7 +474,7 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw
 }
 
 
-void SAL_CALL OXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL OXUndoEnvironment::modified( const EventObject& /*aEvent*/ )
 {
     implSetModified();
 }
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index a86216389262..957f37500ad4 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -44,7 +44,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon
 {
 }
 
-OUString SAL_CALL ORptTypeDetection::detect( Sequence< css::beans::PropertyValue >& Descriptor ) throw (RuntimeException, std::exception)
+OUString SAL_CALL ORptTypeDetection::detect( Sequence< css::beans::PropertyValue >& Descriptor )
 {
 
     ::comphelper::SequenceAsHashMap aTemp(Descriptor);
@@ -84,26 +84,26 @@ Reference< XInterface > SAL_CALL
 }
 
 // XServiceInfo
-OUString SAL_CALL ORptTypeDetection::getImplementationName() throw(std::exception  )
+OUString SAL_CALL ORptTypeDetection::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
 
 // XServiceInfo
-sal_Bool SAL_CALL ORptTypeDetection::supportsService(const OUString& ServiceName) throw(std::exception  )
+sal_Bool SAL_CALL ORptTypeDetection::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames() throw(std::exception  )
+Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
 // ORegistryServiceManager_Static
-Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static()
 {
     Sequence<OUString> aSNS { "com.sun.star.document.ExtendedTypeDetection" };
     return aSNS;
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index 61f7d88b20bf..08fd8fb6f560 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -71,22 +71,22 @@ public:
     explicit ORptTypeDetection(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 
     // XServiceInfo
-    OUString                                     SAL_CALL getImplementationName() throw(std::exception  ) override;
-    sal_Bool                                            SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  ) override;
-    css::uno::Sequence< OUString >  SAL_CALL getSupportedServiceNames() throw(std::exception  ) override;
+    OUString                                     SAL_CALL getImplementationName() override;
+    sal_Bool                                            SAL_CALL supportsService(const OUString& ServiceName) override;
+    css::uno::Sequence< OUString >  SAL_CALL getSupportedServiceNames() override;
 
     // static methods
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException )
+    static OUString getImplementationName_Static()
     {
         return OUString("com.sun.star.comp.report.ORptTypeDetection");
     }
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
     create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 
-    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) override;
 };
 }
 #endif
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index f4cb39528786..25151dd9c0dc 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -76,12 +76,12 @@ namespace rptxml
         return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), SvXMLExportFlags::SETTINGS ));
     }
 
-    OUString ORptExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+    OUString ORptExportHelper::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.report.XMLSettingsExporter");
     }
 
-    Sequence< OUString > ORptExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+    Sequence< OUString > ORptExportHelper::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
         return aSupported;
@@ -92,12 +92,12 @@ namespace rptxml
         return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), SvXMLExportFlags::CONTENT ));
     }
 
-    OUString ORptContentExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+    OUString ORptContentExportHelper::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.report.XMLContentExporter");
     }
 
-    Sequence< OUString > ORptContentExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+    Sequence< OUString > ORptContentExportHelper::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
         return aSupported;
@@ -110,12 +110,12 @@ namespace rptxml
             SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS ));
     }
 
-    OUString ORptStylesExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+    OUString ORptStylesExportHelper::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.report.XMLStylesExporter");
     }
 
-    Sequence< OUString > ORptStylesExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+    Sequence< OUString > ORptStylesExportHelper::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
         return aSupported;
@@ -127,12 +127,12 @@ namespace rptxml
         return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), SvXMLExportFlags::META ));
     }
 
-    OUString ORptMetaExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+    OUString ORptMetaExportHelper::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.report.XMLMetaExporter");
     }
 
-    Sequence< OUString > ORptMetaExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+    Sequence< OUString > ORptMetaExportHelper::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
         return aSupported;
@@ -144,12 +144,12 @@ namespace rptxml
         return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), SvXMLExportFlags::ALL));
     }
 
-    OUString ODBFullExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+    OUString ODBFullExportHelper::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.report.XMLFullExporter");
     }
 
-    Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+    Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.document.ExportFilter" };
         return aSupported;
@@ -310,13 +310,13 @@ Reference< XInterface > ORptExport::create(Reference< XComponentContext > const
 }
 
 
-OUString ORptExport::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString ORptExport::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.ExportFilter");
 }
 
 
-uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { "com.sun.star.document.ExportFilter" };
 
@@ -1377,7 +1377,7 @@ SvXMLAutoStylePoolP* ORptExport::CreateAutoStylePool()
     return new OXMLAutoStylePoolP(*this);
 }
 
-void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >& xDoc )
 {
     m_xReportDefinition.set(xDoc,UNO_QUERY_THROW);
     OSL_ENSURE(m_xReportDefinition.is(),"DataSource is NULL!");
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index bcb4715fe6c3..ad4e972d872c 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -158,14 +158,14 @@ public:
     ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag);
 
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
         create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     const Reference<XReportDefinition>& getReportDefinition() const { return m_xReportDefinition; }
 
@@ -180,9 +180,9 @@ class ORptExportHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static Sequence< OUString > getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
         create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 };
@@ -195,9 +195,9 @@ class ORptContentExportHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static Sequence< OUString > getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
         create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 };
@@ -210,9 +210,9 @@ class ORptStylesExportHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static Sequence< OUString > getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
         create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 };
@@ -225,9 +225,9 @@ class ORptMetaExportHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static Sequence< OUString > getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
         create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 };
@@ -239,9 +239,9 @@ class ODBFullExportHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static Sequence< OUString > getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
         create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 };
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 7a56abb2e8db..a4ec3461b545 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -89,17 +89,17 @@ ExportDocumentHandler::~ExportDocumentHandler()
 }
 IMPLEMENT_GET_IMPLEMENTATION_ID(ExportDocumentHandler)
 
-OUString SAL_CALL ExportDocumentHandler::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ExportDocumentHandler::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNames(  )
 {
     uno::Sequence< OUString > aSupported;
     if ( m_xServiceInfo.is() )
@@ -107,13 +107,13 @@ uno::Sequence< OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNam
     return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported);
 }
 
-OUString ExportDocumentHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString ExportDocumentHandler::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.ExportDocumentHandler");
 }
 
 
-uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static(  )
 {
     uno::Sequence< OUString > aSupported { "com.sun.star.report.ExportDocumentHandler" };
     return aSupported;
@@ -125,17 +125,17 @@ uno::Reference< uno::XInterface > SAL_CALL ExportDocumentHandler::create( const
     return *(new ExportDocumentHandler( _rxContext ));
 }
 // xml::sax::XDocumentHandler:
-void SAL_CALL ExportDocumentHandler::startDocument() throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ExportDocumentHandler::startDocument()
 {
     m_xDelegatee->startDocument();
 }
 
-void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ExportDocumentHandler::endDocument()
 {
     m_xDelegatee->endDocument();
 }
 
-void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs)
 {
     bool bExport = true;
     if ( _sName == "office:chart" )
@@ -233,7 +233,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const
         m_xDelegatee->startElement(_sName,xAttribs);
 }
 
-void SAL_CALL ExportDocumentHandler::endElement(const OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ExportDocumentHandler::endElement(const OUString & _sName)
 {
     bool bExport = true;
     OUString sNewName = _sName;
@@ -266,7 +266,7 @@ void SAL_CALL ExportDocumentHandler::endElement(const OUString & _sName) throw (
         m_xDelegatee->endElement(sNewName);
 }
 
-void SAL_CALL ExportDocumentHandler::characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ExportDocumentHandler::characters(const OUString & aChars)
 {
     if ( !(m_bTableRowsStarted || m_bFirstRowExported) )
     {
@@ -274,21 +274,21 @@ void SAL_CALL ExportDocumentHandler::characters(const OUString & aChars) throw (
     }
 }
 
-void SAL_CALL ExportDocumentHandler::ignorableWhitespace(const OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ExportDocumentHandler::ignorableWhitespace(const OUString & aWhitespaces)
 {
     m_xDelegatee->ignorableWhitespace(aWhitespaces);
 }
 
-void SAL_CALL ExportDocumentHandler::processingInstruction(const OUString & aTarget, const OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ExportDocumentHandler::processingInstruction(const OUString & aTarget, const OUString & aData)
 {
     m_xDelegatee->processingInstruction(aTarget,aData);
 }
 
-void SAL_CALL ExportDocumentHandler::setDocumentLocator(const uno::Reference< xml::sax::XLocator > & xLocator) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ExportDocumentHandler::setDocumentLocator(const uno::Reference< xml::sax::XLocator > & xLocator)
 {
     m_xDelegatee->setDocumentLocator(xLocator);
 }
-void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >& _aArguments )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     comphelper::SequenceAsHashMap aArgs(_aArguments);
@@ -334,13 +334,13 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >
     }
 }
 
-uno::Any SAL_CALL ExportDocumentHandler::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ExportDocumentHandler::queryInterface( const uno::Type& _rType )
 {
     uno::Any aReturn = ExportDocumentHandler_BASE::queryInterface(_rType);
     return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? m_xProxy->queryAggregation(_rType) : aReturn);
 }
 
-uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes(  )
 {
     if ( m_xTypeProvider.is() )
         return ::comphelper::concatSequences(
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
index d7e944c8bccf..b411b475fcdd 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
@@ -45,9 +45,9 @@ class ExportDocumentHandler : public ExportDocumentHandler_BASE
 public:
     // XServiceInfo - static versions
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+    static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
                     create(const css::uno::Reference< css::uno::XComponentContext >&);
 public:
@@ -55,25 +55,25 @@ public:
 
 private:
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     DECLARE_XTYPEPROVIDER( )
 
     // css::xml::sax::XDocumentHandler:
-    virtual void SAL_CALL startDocument() throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL startElement(const OUString & aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL endElement(const OUString & aName) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
+    virtual void SAL_CALL startElement(const OUString & aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override;
+    virtual void SAL_CALL endElement(const OUString & aName) override;
+    virtual void SAL_CALL characters(const OUString & aChars) override;
+    virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) override;
+    virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) override;
+    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override;
+
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     void exportTableRows();
 private:
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index f204ecb5cf84..7d9c13a593b7 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -63,17 +63,17 @@ ImportDocumentHandler::~ImportDocumentHandler()
 }
 IMPLEMENT_GET_IMPLEMENTATION_ID(ImportDocumentHandler)
 
-OUString SAL_CALL ImportDocumentHandler::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ImportDocumentHandler::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL ImportDocumentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ImportDocumentHandler::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNames(  )
 {
     uno::Sequence< OUString > aSupported;
     if ( m_xServiceInfo.is() )
@@ -81,12 +81,12 @@ uno::Sequence< OUString > SAL_CALL ImportDocumentHandler::getSupportedServiceNam
     return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported);
 }
 
-OUString ImportDocumentHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString ImportDocumentHandler::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.ImportDocumentHandler");
 }
 
-uno::Sequence< OUString > ImportDocumentHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > ImportDocumentHandler::getSupportedServiceNames_static(  )
 {
     uno::Sequence< OUString > aSupported { "com.sun.star.report.ImportDocumentHandler" };
     return aSupported;
@@ -98,12 +98,12 @@ uno::Reference< uno::XInterface > SAL_CALL ImportDocumentHandler::create( const
     return *(new ImportDocumentHandler( _rxContext ));
 }
 // xml::sax::XDocumentHandler:
-void SAL_CALL ImportDocumentHandler::startDocument() throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ImportDocumentHandler::startDocument()
 {
     m_xDelegatee->startDocument();
 }
 
-void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ImportDocumentHandler::endDocument()
 {
     m_xDelegatee->endDocument();
     uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xModel,uno::UNO_QUERY_THROW);
@@ -153,7 +153,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
     }
 }
 
-void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList)
 {
     uno::Reference< xml::sax::XAttributeList > xNewAttribs = _xAttrList;
     bool bExport = true;
@@ -293,7 +293,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
         m_xDelegatee->startElement(_sName,xNewAttribs);
 }
 
-void SAL_CALL ImportDocumentHandler::endElement(const OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ImportDocumentHandler::endElement(const OUString & _sName)
 {
     bool bExport = true;
     OUString sNewName = _sName;
@@ -320,26 +320,26 @@ void SAL_CALL ImportDocumentHandler::endElement(const OUString & _sName) throw (
         m_xDelegatee->endElement(sNewName);
 }
 
-void SAL_CALL ImportDocumentHandler::characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ImportDocumentHandler::characters(const OUString & aChars)
 {
     m_xDelegatee->characters(aChars);
 }
 
-void SAL_CALL ImportDocumentHandler::ignorableWhitespace(const OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ImportDocumentHandler::ignorableWhitespace(const OUString & aWhitespaces)
 {
     m_xDelegatee->ignorableWhitespace(aWhitespaces);
 }
 
-void SAL_CALL ImportDocumentHandler::processingInstruction(const OUString & aTarget, const OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ImportDocumentHandler::processingInstruction(const OUString & aTarget, const OUString & aData)
 {
     m_xDelegatee->processingInstruction(aTarget,aData);
 }
 
-void SAL_CALL ImportDocumentHandler::setDocumentLocator(const uno::Reference< xml::sax::XLocator > & xLocator) throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
+void SAL_CALL ImportDocumentHandler::setDocumentLocator(const uno::Reference< xml::sax::XLocator > & xLocator)
 {
     m_xDelegatee->setDocumentLocator(xLocator);
 }
-void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >& _aArguments )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     comphelper::SequenceAsHashMap aArgs(_aArguments);
@@ -379,13 +379,13 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >
     m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap());
 }
 
-uno::Any SAL_CALL ImportDocumentHandler::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ImportDocumentHandler::queryInterface( const uno::Type& _rType )
 {
     uno::Any aReturn = ImportDocumentHandler_BASE::queryInterface(_rType);
     return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? m_xProxy->queryAggregation(_rType) : aReturn);
 }
 
-uno::Sequence< uno::Type > SAL_CALL ImportDocumentHandler::getTypes(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL ImportDocumentHandler::getTypes(  )
 {
     if ( m_xTypeProvider.is() )
         return ::comphelper::concatSequences(
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
index 800b52074e0d..9bc49ea247f8 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx
@@ -43,9 +43,9 @@ class ImportDocumentHandler : public ImportDocumentHandler_BASE
 public:
     // XServiceInfo - static versions
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+    static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
                     create(const css::uno::Reference< css::uno::XComponentContext >&);
 public:
@@ -53,25 +53,25 @@ public:
 
 private:
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     DECLARE_XTYPEPROVIDER( )
 
     // css::xml::sax::XDocumentHandler:
-    virtual void SAL_CALL startDocument() throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL startElement(const OUString & aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL endElement(const OUString & aName) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
+    virtual void SAL_CALL startElement(const OUString & aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override;
+    virtual void SAL_CALL endElement(const OUString & aName) override;
+    virtual void SAL_CALL characters(const OUString & aChars) override;
+    virtual void SAL_CALL ignorableWhitespace(const OUString & aWhitespaces) override;
+    virtual void SAL_CALL processingInstruction(const OUString & aTarget, const OUString & aData) override;
+    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override;
 
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 private:
     ImportDocumentHandler(ImportDocumentHandler &) = delete;
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 3756d9bf0e92..bf6908f14702 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -278,12 +278,12 @@ uno::Reference< uno::XInterface > ORptImportHelper::create(uno::Reference< uno::
     return static_cast< XServiceInfo* >(new ORptFilter(xContext, SvXMLImportFlags::SETTINGS ));
 }
 
-OUString ORptImportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+OUString ORptImportHelper::getImplementationName_Static(  )
 {
     return OUString(SERVICE_SETTINGSIMPORTER);
 }
 
-Sequence< OUString > ORptImportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+Sequence< OUString > ORptImportHelper::getSupportedServiceNames_Static(  )
 {
     Sequence< OUString > aSupported { SERVICE_IMPORTFILTER };
     return aSupported;
@@ -295,12 +295,12 @@ Reference< XInterface > ORptContentImportHelper::create(const Reference< XCompon
         SvXMLImportFlags::FONTDECLS ));
 }
 
-OUString ORptContentImportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+OUString ORptContentImportHelper::getImplementationName_Static(  )
 {
     return OUString(SERVICE_CONTENTIMPORTER);
 }
 
-Sequence< OUString > ORptContentImportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+Sequence< OUString > ORptContentImportHelper::getSupportedServiceNames_Static(  )
 {
     Sequence< OUString > aSupported { SERVICE_IMPORTFILTER };
     return aSupported;
@@ -314,12 +314,12 @@ Reference< XInterface > ORptStylesImportHelper::create(Reference< XComponentCont
         SvXMLImportFlags::FONTDECLS ));
 }
 
-OUString ORptStylesImportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+OUString ORptStylesImportHelper::getImplementationName_Static(  )
 {
     return OUString(SERVICE_STYLESIMPORTER);
 }
 
-Sequence< OUString > ORptStylesImportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+Sequence< OUString > ORptStylesImportHelper::getSupportedServiceNames_Static(  )
 {
     Sequence< OUString > aSupported { SERVICE_IMPORTFILTER };
     return aSupported;
@@ -332,12 +332,12 @@ Reference< XInterface > ORptMetaImportHelper::create(Reference< XComponentContex
         SvXMLImportFlags::META));
 }
 
-OUString ORptMetaImportHelper::getImplementationName_Static(  ) throw (RuntimeException)
+OUString ORptMetaImportHelper::getImplementationName_Static(  )
 {
     return OUString(SERVICE_METAIMPORTER);
 }
 
-Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static(  )
 {
     Sequence< OUString > aSupported { SERVICE_IMPORTFILTER };
     return aSupported;
@@ -375,12 +375,12 @@ uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContex
 }
 
 
-OUString ORptFilter::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString ORptFilter::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.OReportFilter");
 }
 
-uno::Sequence< OUString > ORptFilter::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > ORptFilter::getSupportedServiceNames_Static(  )
 {
     uno::Sequence< OUString > aServices { SERVICE_IMPORTFILTER };
 
@@ -388,7 +388,6 @@ uno::Sequence< OUString > ORptFilter::getSupportedServiceNames_Static(  ) throw(
 }
 
 sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor )
-    throw (RuntimeException, std::exception)
 {
     vcl::Window*     pFocusWindow = Application::GetFocusWindow();
     bool    bRet = false;
@@ -406,7 +405,6 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript
 }
 
 bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
-    throw (RuntimeException, std::exception)
 {
     OUString                     sFileName;
     uno::Reference< embed::XStorage >   xStorage;
@@ -959,7 +957,6 @@ const OUString& ORptFilter::convertFormula(const OUString& _sFormula)
 }
 
 void SAL_CALL ORptFilter::startDocument()
-    throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     m_xReportDefinition.set(GetModel(),UNO_QUERY_THROW);
     OSL_ENSURE(m_xReportDefinition.is(),"ReportDefinition is NULL!");
@@ -973,7 +970,6 @@ void SAL_CALL ORptFilter::startDocument()
 }
 
 void ORptFilter::endDocument()
-    throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( GetModel().is(), "model missing; maybe startDocument wasn't called?" );
     if( !GetModel().is() )
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index fe82d812b9a2..b0ae876c810b 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -92,7 +92,7 @@ private:
     std::shared_ptr<rptui::OReportModel>        m_pReportModel;
 
     /// @throws RuntimeException
-    bool                            implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
+    bool                            implImport( const Sequence< PropertyValue >& rDescriptor );
 
     SvXMLImportContext* CreateStylesContext(const OUString& rLocalName,
                                             const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle );
@@ -114,12 +114,12 @@ public:
     ORptFilter( const Reference< XComponentContext >& _rxContext, SvXMLImportFlags nImportFlags = SvXMLImportFlags::ALL );
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) override;
 
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+    static OUString getImplementationName_Static();
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
     create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 
@@ -128,10 +128,8 @@ public:
     }
     void FinishStyles();
 
-    virtual void SAL_CALL startDocument()
-    throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endDocument()
-    throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
 
     const SvXMLTokenMap& GetDocElemTokenMap() const;
     const SvXMLTokenMap& GetReportElemTokenMap() const;
@@ -178,9 +176,9 @@ class ORptImportHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static Sequence< OUString > getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
     create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 };
@@ -193,9 +191,9 @@ class ORptContentImportHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static Sequence< OUString > getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
     create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 };
@@ -208,9 +206,9 @@ class ORptStylesImportHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static Sequence< OUString > getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
     create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 };
@@ -223,9 +221,9 @@ class ORptMetaImportHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static OUString getImplementationName_Static(  ) throw (css::uno::RuntimeException);
+    static OUString getImplementationName_Static(  );
     /// @throws css::uno::RuntimeException
-    static Sequence< OUString > getSupportedServiceNames_Static(  ) throw(css::uno::RuntimeException);
+    static Sequence< OUString > getSupportedServiceNames_Static(  );
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
     create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 };
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index d661058b64c2..ad8fddeedc15 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -266,7 +266,7 @@ bool OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt )
     return FloatingWindow::PreNotify( _rNEvt );
 }
 
-void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt ) throw( uno::RuntimeException, std::exception )
+void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt )
 {
     OSL_ENSURE( _evt.Source == m_xRowSet, "OAddFieldWindow::_propertyChanged: where did this come from?" );
     (void)_evt;
@@ -410,7 +410,7 @@ void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,svx::ODataAcces
     }
 }
 
-void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent )  throw(css::uno::RuntimeException, std::exception)
+void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent )
 {
     if ( m_pListBox.get() )
     {
@@ -429,7 +429,7 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent
     }
 }
 
-void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception)
+void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ )
 {
     if ( m_pListBox.get() )
     {
@@ -439,7 +439,7 @@ void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEven
     }
 }
 
-void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(css::uno::RuntimeException, std::exception)
+void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ )
 {
 }
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 8ad17838b11f..695e2f2030f1 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -88,11 +88,11 @@ public:
     explicit OFieldExpressionControlContainerListener(OFieldExpressionControl* pParent) : mpParent(pParent) {}
 
     // 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;
     // XContainerListener
-    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override;
+    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override;
+    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override;
 };
 
 class OFieldExpressionControl : public ::svt::EditBrowseBox
@@ -116,9 +116,9 @@ public:
 
     // XContainerListener
     /// @throws css::uno::RuntimeException
-    void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception);
+    void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent);
     /// @throws css::uno::RuntimeException
-    void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception);
+    void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent);
 
     virtual Size GetOptimalSize() const override;
 
@@ -179,16 +179,16 @@ public:
 };
 
 
-void OFieldExpressionControlContainerListener::disposing(const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
+void OFieldExpressionControlContainerListener::disposing(const css::lang::EventObject& )
 {}
 
-void OFieldExpressionControlContainerListener::elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception)
+void OFieldExpressionControlContainerListener::elementInserted(const css::container::ContainerEvent& rEvent)
 { mpParent->elementInserted(rEvent); }
 
-void OFieldExpressionControlContainerListener::elementReplaced(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException, std::exception)
+void OFieldExpressionControlContainerListener::elementReplaced(const css::container::ContainerEvent& )
 {}
 
-void OFieldExpressionControlContainerListener::elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception)
+void OFieldExpressionControlContainerListener::elementRemoved(const css::container::ContainerEvent& rEvent)
 { mpParent->elementRemoved(rEvent); }
 
 
@@ -612,7 +612,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const
 
 // XContainerListener
 
-void SAL_CALL OFieldExpressionControl::elementInserted(const container::ContainerEvent& evt) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OFieldExpressionControl::elementInserted(const container::ContainerEvent& evt)
 {
     if ( m_bIgnoreEvent )
         return;
@@ -652,7 +652,7 @@ void SAL_CALL OFieldExpressionControl::elementInserted(const container::Containe
     }
 }
 
-void SAL_CALL OFieldExpressionControl::elementRemoved(const container::ContainerEvent& evt) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OFieldExpressionControl::elementRemoved(const container::ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1200,7 +1200,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void )
     }
 }
 
-void OGroupsSortingDialog::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw(uno::RuntimeException, std::exception)
+void OGroupsSortingDialog::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
 {
     uno::Reference< report::XGroup > xGroup(_rEvent.Source,uno::UNO_QUERY);
     if ( xGroup.is() )
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 02fe768a4f91..30c511bb54db 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -128,15 +128,13 @@ class NavigatorTree :   public ::cppu::BaseMutex
 
     protected:
         // OPropertyChangeListener
-        virtual void _propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) override;
+        virtual void _propertyChanged(const beans::PropertyChangeEvent& _rEvent) override;
 
         // OContainerListener
-        virtual void _elementInserted( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException, std::exception) override;
-        virtual void _elementRemoved( const container::ContainerEvent& Event )
-            throw (uno::RuntimeException, std::exception) override;
-        virtual void _elementReplaced( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException, std::exception) override;
-        virtual void _disposing(const lang::EventObject& _rSource)
-            throw (uno::RuntimeException, std::exception) override;
+        virtual void _elementInserted( const container::ContainerEvent& _rEvent ) override;
+        virtual void _elementRemoved( const container::ContainerEvent& Event ) override;
+        virtual void _elementReplaced( const container::ContainerEvent& _rEvent ) override;
+        virtual void _disposing(const lang::EventObject& _rSource) override;
     };
 
     enum DROP_ACTION        { DA_SCROLLUP, DA_SCROLLDOWN, DA_EXPANDNODE };
@@ -163,11 +161,10 @@ protected:
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& _rEvt ) override;
 
     // OSelectionChangeListener
-    virtual void _disposing(const lang::EventObject& _rSource)
-        throw (uno::RuntimeException, std::exception) override;
+    virtual void _disposing(const lang::EventObject& _rSource) override;
 
     // OPropertyChangeListener
-    virtual void _propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException) override;
+    virtual void _propertyChanged(const beans::PropertyChangeEvent& _rEvent) override;
 
     // OContainerListener Helper
     void _elementInserted( const container::ContainerEvent& _rEvent );
@@ -182,7 +179,7 @@ public:
     DECL_LINK(OnEntrySelDesel, SvTreeListBox*, void);
     DECL_LINK( OnDropActionTimer, Timer*, void );
 
-    virtual void _selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) override;
+    virtual void _selectionChanged( const lang::EventObject& aEvent ) override;
 
     // ITraverseReport
     virtual void traverseReport(const uno::Reference< report::XReportDefinition>& _xReport) override;
@@ -461,7 +458,7 @@ IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void)
     }
 }
 
-void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException)
+void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent )
 {
     m_pSelectionListener->lock();
     uno::Reference< view::XSelectionSupplier> xSelectionSupplier(aEvent.Source,uno::UNO_QUERY);
@@ -641,7 +638,7 @@ void NavigatorTree::traverseDetail(const uno::Reference< report::XSection>& _xSe
     traverseSection(_xSection,pParent,RID_SVXBMP_ICON_DETAIL);
 }
 
-void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
+void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
 {
     uno::Reference< report::XReportDefinition> xReport(_rEvent.Source,uno::UNO_QUERY);
     if ( xReport.is() )
@@ -730,7 +727,6 @@ void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent )
 }
 
 void NavigatorTree::_disposing(const lang::EventObject& _rSource)
-    throw (uno::RuntimeException, std::exception)
 {
     removeEntry(find(_rSource.Source));
 }
@@ -794,7 +790,7 @@ NavigatorTree::UserData::~UserData()
 }
 
 // OPropertyChangeListener
-void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
+void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
 {
     SvTreeListEntry* pEntry = m_pTree->find(_rEvent.Source);
     OSL_ENSURE(pEntry,"No entry could be found! Why not!");
@@ -838,24 +834,22 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent&
     {}
 }
 
-void NavigatorTree::UserData::_elementInserted( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException, std::exception)
+void NavigatorTree::UserData::_elementInserted( const container::ContainerEvent& _rEvent )
 {
     m_pTree->_elementInserted( _rEvent );
 }
 
 void NavigatorTree::UserData::_elementRemoved( const container::ContainerEvent& _rEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     m_pTree->_elementRemoved( _rEvent );
 }
 
-void NavigatorTree::UserData::_elementReplaced( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException, std::exception)
+void NavigatorTree::UserData::_elementReplaced( const container::ContainerEvent& _rEvent )
 {
     m_pTree->_elementReplaced( _rEvent );
 }
 
 void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource)
-    throw (uno::RuntimeException, std::exception)
 {
     m_pTree->_disposing( _rSource );
 }
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 01461ca4949a..4975d8d3499f 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -120,11 +120,11 @@ public:
 
 private:
     // FmXChangeListener
-    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override;
     // OContainerListener
-    virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void _elementInserted( const css::container::ContainerEvent& _rEvent ) override;
+    virtual void _elementRemoved( const  css::container::ContainerEvent& _rEvent ) override;
+    virtual void _elementReplaced( const css::container::ContainerEvent& _rEvent ) override;
 };
 
 } // rptui
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index 5cd69f2e9ef3..a0786b897a78 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -52,9 +52,9 @@ namespace rptui
     public:
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
                         create(const css::uno::Reference< css::uno::XComponentContext >&);
 
@@ -62,31 +62,31 @@ namespace rptui
     private:
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // css::lang::XComponent:
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)   throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) override;
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
 
         // css::inspection::XPropertyHandler:
-        virtual void SAL_CALL inspect(const css::uno::Reference< css::uno::XInterface > & Component) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const css::uno::Any & Value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& ControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const css::uno::Any & ControlValue) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const css::uno::Any & PropertyValue, const css::uno::Type & ControlValueType) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & Listener) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & _rxListener) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, css::uno::Any & out_Data, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::NullPointerException, std::exception) override;
-        virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const css::uno::Any & NewValue, const css::uno::Any & OldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL inspect(const css::uno::Reference< css::uno::XInterface > & Component) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) override;
+        virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const css::uno::Any & Value) override;
+        virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) override;
+        virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& ControlFactory ) override;
+        virtual css::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const css::uno::Any & ControlValue) override;
+        virtual css::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const css::uno::Any & PropertyValue, const css::uno::Type & ControlValueType) override;
+        virtual void SAL_CALL addPropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & Listener) override;
+        virtual void SAL_CALL removePropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & _rxListener) override;
+        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() override;
+        virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) override;
+        virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, css::uno::Any & out_Data, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI) override;
+        virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const css::uno::Any & NewValue, const css::uno::Any & OldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) override;
+        virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) override;
 
     protected:
         virtual ~DataProviderHandler() override {}
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 3f729a073951..0dfbb46af1cb 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -57,30 +57,30 @@ namespace rptui
         virtual ~DefaultComponentInspectorModel() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XObjectInspectorModel
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHandlerFactories() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getHasHelpSection() throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getIsReadOnly() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setIsReadOnly( sal_Bool _isreadonly ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHandlerFactories() override;
+        virtual sal_Bool SAL_CALL getHasHelpSection() override;
+        virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() override;
+        virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() override;
+        virtual sal_Bool SAL_CALL getIsReadOnly() override;
+        virtual void SAL_CALL setIsReadOnly( sal_Bool _isreadonly ) override;
 
-        virtual css::uno::Sequence< css::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories(  ) override;
+        virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     public:
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
                         create(const css::uno::Reference< css::uno::XComponentContext >&);
 
diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx
index 7d928a4b5d87..31e317df3be5 100644
--- a/reportdesign/source/ui/inc/FixedTextColor.hxx
+++ b/reportdesign/source/ui/inc/FixedTextColor.hxx
@@ -39,9 +39,9 @@ namespace rptui
         const OReportController& m_rReportController;
 
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::awt::XVclWindowPeer > getVclWindowPeer(const css::uno::Reference< css::report::XFixedText >& _xComponent) throw(css::uno::RuntimeException);
+        css::uno::Reference< css::awt::XVclWindowPeer > getVclWindowPeer(const css::uno::Reference< css::report::XFixedText >& _xComponent);
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::awt::XControl > getXControl(const css::uno::Reference< css::report::XFixedText >& _xFixedText) throw(css::uno::RuntimeException);
+        css::uno::Reference< css::awt::XControl > getXControl(const css::uno::Reference< css::report::XFixedText >& _xFixedText);
 
         static void setPropertyTextColor(const css::uno::Reference< css::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey);
 
diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
index a54ca63a8f2a..da70fc782d06 100644
--- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
+++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx
@@ -38,7 +38,7 @@ namespace rptui
         sal_Int32 m_nTextColor;
 
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::awt::XVclWindowPeer > getVclWindowPeer(const css::uno::Reference< css::report::XReportComponent >& _xComponent) throw(css::uno::RuntimeException);
+        css::uno::Reference< css::awt::XVclWindowPeer > getVclWindowPeer(const css::uno::Reference< css::report::XReportComponent >& _xComponent);
 
         void setPlaceholderText( const css::uno::Reference< css::uno::XInterface >& _rxComponent );
         void setPlaceholderText( const css::uno::Reference< css::awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText );
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 1632daa90c7f..d277cc402c24 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -231,16 +231,16 @@ namespace rptui
 
 
         // 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;
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
     public:
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
                         create(const css::uno::Reference< css::uno::XComponentContext >&);
 
@@ -248,31 +248,31 @@ namespace rptui
         explicit GeometryHandler(css::uno::Reference< css::uno::XComponentContext > const & context);
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // css::lang::XComponent:
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)   throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) override;
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
 
         // css::inspection::XPropertyHandler:
-        virtual void SAL_CALL inspect(const css::uno::Reference< css::uno::XInterface > & Component) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const css::uno::Any & Value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, std::exception) override;
-        virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& ControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const css::uno::Any & ControlValue) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const css::uno::Any & PropertyValue, const css::uno::Type & ControlValueType) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & Listener) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & _rxListener) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, css::uno::Any & out_Data, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::NullPointerException, std::exception) override;
-        virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const css::uno::Any & NewValue, const css::uno::Any & OldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL inspect(const css::uno::Reference< css::uno::XInterface > & Component) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) override;
+        virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const css::uno::Any & Value) override;
+        virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) override;
+        virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& ControlFactory ) override;
+        virtual css::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const css::uno::Any & ControlValue) override;
+        virtual css::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const css::uno::Any & PropertyValue, const css::uno::Type & ControlValueType) override;
+        virtual void SAL_CALL addPropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & Listener) override;
+        virtual void SAL_CALL removePropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & _rxListener) override;
+        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() override;
+        virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) override;
+        virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, css::uno::Any & out_Data, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI) override;
+        virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const css::uno::Any & NewValue, const css::uno::Any & OldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) override;
+        virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) override;
 
     protected:
         virtual ~GeometryHandler() override;
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 0ba13dedb592..567e5d7d9c8b 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -135,7 +135,7 @@ private:
     void operator =(OGroupsSortingDialog&) = delete;
 protected:
     // OPropertyChangeListener
-    virtual void    _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException, std::exception) override;
+    virtual void    _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) override;
 public:
     OGroupsSortingDialog( vcl::Window* pParent
                         ,bool _bReadOnly
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index 865e06911054..3f7d50466c72 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -46,9 +46,9 @@ namespace rptui
     public:
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static(  ) throw(css::uno::RuntimeException);
+        static OUString getImplementationName_Static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  ) throw(css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_static(  );
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
                         create(const css::uno::Reference< css::uno::XComponentContext >&);
 
@@ -56,31 +56,31 @@ namespace rptui
         explicit ReportComponentHandler(css::uno::Reference< css::uno::XComponentContext > const & context);
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // css::lang::XComponent:
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener)   throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & xListener) override;
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
 
         // css::inspection::XPropertyHandler:
-        virtual void SAL_CALL inspect(const css::uno::Reference< css::uno::XInterface > & Component) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const css::uno::Any & Value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& ControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const css::uno::Any & ControlValue) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const css::uno::Any & PropertyValue, const css::uno::Type & ControlValueType) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & Listener) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & _rxListener) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override;
-        virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, css::uno::Any & out_Data, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::NullPointerException, std::exception) override;
-        virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const css::uno::Any & NewValue, const css::uno::Any & OldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override;
-        virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL inspect(const css::uno::Reference< css::uno::XInterface > & Component) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) override;
+        virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const css::uno::Any & Value) override;
+        virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) override;
+        virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& ControlFactory ) override;
+        virtual css::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const css::uno::Any & ControlValue) override;
+        virtual css::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const css::uno::Any & PropertyValue, const css::uno::Type & ControlValueType) override;
+        virtual void SAL_CALL addPropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & Listener) override;
+        virtual void SAL_CALL removePropertyChangeListener(const css::uno::Reference< css::beans::XPropertyChangeListener > & _rxListener) override;
+        virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() override;
+        virtual sal_Bool SAL_CALL isComposable(const OUString & PropertyName) override;
+        virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, css::uno::Any & out_Data, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI) override;
+        virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const css::uno::Any & NewValue, const css::uno::Any & OldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) override;
+        virtual sal_Bool SAL_CALL suspend(sal_Bool Suspend) override;
 
     protected:
         virtual ~ReportComponentHandler() override {}
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 7634bf0ec8e5..a750f4ea3c8d 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -318,7 +318,7 @@ namespace rptui
         virtual void Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override;
 
         virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, css::uno::Any& _rDefault ) const override;
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue) override;
 
     private:
         virtual ~OReportController() override;
@@ -346,43 +346,43 @@ namespace rptui
 
         virtual bool                        Construct(vcl::Window* pParent) 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;
 
         // css::frame::XController
-        virtual sal_Bool SAL_CALL           suspend(sal_Bool bSuspend) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL           suspend(sal_Bool bSuspend) override;
 
         // css::lang::XComponent
         virtual void        SAL_CALL disposing() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
         // need by registration
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 
         // css::container::XContainerListener
-        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& Event) override;
+        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& Event) override;
+        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& Event) override;
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
         // XSelectionSupplier
-        virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) override;
+        virtual css::uno::Any SAL_CALL getSelection(  ) override;
+        virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+        virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
         // css::frame::XController
-        virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL attachModel(const css::uno::Reference< css::frame::XModel > & xModel) override;
+        virtual css::uno::Any SAL_CALL getViewData() override;
+        virtual void SAL_CALL restoreViewData(const css::uno::Any& Data) override;
 
         /** gives access to the report definition
         * \return the report definition object, may be <NULL/>
@@ -390,22 +390,22 @@ namespace rptui
         const css::uno::Reference< css::report::XReportDefinition>& getReportDefinition() const { return m_xReportDefinition; }
 
         // css::frame::XController
-        virtual css::uno::Reference< css::frame::XModel >  SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::frame::XModel >  SAL_CALL getModel() override;
 
         // XTitle
-        virtual OUString SAL_CALL getTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTitle(  ) override;
 
         // XModeSelector
-        virtual void SAL_CALL setMode( const OUString& aMode ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override ;
-        virtual OUString SAL_CALL getMode(  ) throw (css::uno::RuntimeException, std::exception) override ;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes(  ) throw (css::uno::RuntimeException, std::exception) override ;
-        virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (css::uno::RuntimeException, std::exception) override ;
+        virtual void SAL_CALL setMode( const OUString& aMode ) override ;
+        virtual OUString SAL_CALL getMode(  ) override ;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes(  ) override ;
+        virtual sal_Bool SAL_CALL supportsMode( const OUString& aMode ) override ;
 
         // XVisualObject
-        virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const css::awt::Size& aSize ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const css::awt::Size& aSize ) override;
+        virtual css::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) override;
+        virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) override;
+        virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) override;
 
 
         /** returns the current position of the splitter
@@ -443,7 +443,7 @@ namespace rptui
         inline void         resetZoomType()         { m_eZoomType = SvxZoomType::PERCENT; }
 
         // css::beans::XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override
         {
             return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
         }
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 0d3a0db0b736..427d12cd33e6 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -60,18 +60,18 @@ namespace rptui
         OXReportControllerObserver(const OReportController& _rController);
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) 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;
 
         // XContainerListener
-        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override;
+        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override;
+        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override;
 
         // XModifyListener
-        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 
 
         void AddElement(const css::uno::Reference< css::uno::XInterface>& Element);
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index e4c43abb4181..b6dc96080cd9 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -74,7 +74,7 @@ namespace rptui
         virtual void        Command( const CommandEvent& rCEvt ) override;
 
         // OPropertyChangeListener
-        virtual void    _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException) override;
+        virtual void    _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) override;
     public:
         OReportSection(OSectionWindow* _pParent,const css::uno::Reference< css::report::XSection >& _xSection);
         virtual ~OReportSection() override;
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 67624fe21c56..e57f6b092e46 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -62,7 +62,7 @@ namespace rptui
     protected:
         virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
         // OPropertyChangeListener
-        virtual void    _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException) override;
+        virtual void    _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) override;
     public:
         OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView);
         virtual ~OReportWindow() override;
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index c995b964b4a1..12871c6f63af 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -69,7 +69,7 @@ namespace rptui
         virtual void            Resize() override;
         virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
         // OPropertyChangeListener
-        virtual void            _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException, std::exception) override;
+        virtual void            _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) override;
     public:
         OScrollWindowHelper( ODesignView* _pReportDesignView);
         virtual ~OScrollWindowHelper() override;
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 45d342775bee..fda4807f734f 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -90,8 +90,7 @@ namespace rptui
         virtual void Resize() override;
 
     protected:
-        virtual void    _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void    _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) override;
     public:
         OSectionWindow( OViewsWindow* _pParent
                         ,const css::uno::Reference< css::report::XSection >& _xSection
diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx
index c2f11e4303d7..86f336effed3 100644
--- a/reportdesign/source/ui/inc/statusbarcontroller.hxx
+++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx
@@ -38,45 +38,45 @@ namespace rptui
         OStatusbarController(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
 
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 
     private:
-        void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+        void SAL_CALL dispose() override;
         // XInterface
         DECLARE_XINTERFACE( )
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
         // need by registration
 
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XUpdatable
-        virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL update() override;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
         // XStatusbarController
-        virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) override;
+        virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) override;
+        virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) override;
         virtual void SAL_CALL command( const css::awt::Point& aPos,
                                        ::sal_Int32 nCommand,
                                        sal_Bool bMouseEvent,
-                                       const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override;
+                                       const css::uno::Any& aData ) override;
         virtual void SAL_CALL paint( const css::uno::Reference< css::awt::XGraphics >& xGraphics,
                                      const css::awt::Rectangle& rOutputRectangle,
-                                     ::sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
+                                     ::sal_Int32 nStyle ) override;
+        virtual void SAL_CALL click( const css::awt::Point& aPos ) override;
+        virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) override;
     };
 }
 #endif // DBAUI_STATUSBARCONTROLLER_HXX
diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx
index 2e6198072321..83291253e5bc 100644
--- a/reportdesign/source/ui/inc/toolboxcontroller.hxx
+++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx
@@ -50,34 +50,34 @@ namespace rptui
         virtual ~OToolboxController() override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
         // need by registration
         /// @throws css::uno::RuntimeException
-        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static();
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
             create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
         // XToolbarController
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
 
         // XSubToolbarController
-        virtual sal_Bool SAL_CALL opensSubToolbar(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getSubToolbarName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateImage(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL opensSubToolbar(  ) override;
+        virtual OUString SAL_CALL getSubToolbarName(  ) override;
+        virtual void SAL_CALL functionSelected( const OUString& aCommand ) override;
+        virtual void SAL_CALL updateImage(  ) override;
     };
 
 } // rptui
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index f92899c5b60f..b07e8bede535 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -71,27 +71,27 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext
     }
 }
 
-OUString SAL_CALL DataProviderHandler::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL DataProviderHandler::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL DataProviderHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DataProviderHandler::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_static();
 }
 
-OUString DataProviderHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString DataProviderHandler::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.DataProviderHandler");
 }
 
-uno::Sequence< OUString > DataProviderHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > DataProviderHandler::getSupportedServiceNames_static(  )
 {
     uno::Sequence< OUString > aSupported { "com.sun.star.report.inspection.DataProviderHandler" };
     return aSupported;
@@ -111,12 +111,12 @@ void SAL_CALL DataProviderHandler::disposing()
     ::comphelper::disposeComponent( m_xMasterDetails );
     ::comphelper::disposeComponent(m_xTypeConverter);
 }
-void SAL_CALL DataProviderHandler::addEventListener(const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DataProviderHandler::addEventListener(const uno::Reference< lang::XEventListener > & xListener)
 {
     m_xFormComponentHandler->addEventListener(xListener);
 }
 
-void SAL_CALL DataProviderHandler::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DataProviderHandler::removeEventListener(const uno::Reference< lang::XEventListener > & aListener)
 {
     m_xFormComponentHandler->removeEventListener(aListener);
 }
@@ -124,7 +124,7 @@ void SAL_CALL DataProviderHandler::removeEventListener(const uno::Reference< lan
 // inspection::XPropertyHandler:
 
 /********************************************************************************/
-void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface > & Component) throw (uno::RuntimeException, lang::NullPointerException, std::exception)
+void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface > & Component)
 {
     try
     {
@@ -163,7 +163,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface
     }
 }
 
-uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & PropertyName)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     uno::Any aPropertyValue;
@@ -209,7 +209,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & Propert
     return aPropertyValue;
 }
 
-void SAL_CALL DataProviderHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+void SAL_CALL DataProviderHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
@@ -250,12 +250,12 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue)
     }
 }
 
-beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const OUString & PropertyName)
 {
     return m_xFormComponentHandler->getPropertyState(PropertyName);
 }
 
-inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(const OUString & PropertyName,  const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException, std::exception)
+inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(const OUString & PropertyName,  const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory)
 {
     inspection::LineDescriptor aOut;
     const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
@@ -290,7 +290,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
     return aOut;
 }
 
-uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const OUString & _rPropertyValue, const uno::Any & _rControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const OUString & _rPropertyValue, const uno::Any & _rControlValue)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     uno::Any aPropertyValue( _rControlValue );
@@ -318,7 +318,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const OUString & _
     return aPropertyValue;
 }
 
-uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const OUString & _rPropertyName, const uno::Any & _rPropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const OUString & _rPropertyName, const uno::Any & _rPropertyValue, const uno::Type & ControlValueType)
 {
     uno::Any aControlValue( _rPropertyValue );
     if ( !aControlValue.hasValue() )
@@ -349,17 +349,17 @@ uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const OUString & _r
     return aControlValue;
 }
 
-void SAL_CALL DataProviderHandler::addPropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & Listener) throw (uno::RuntimeException, lang::NullPointerException, std::exception)
+void SAL_CALL DataProviderHandler::addPropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & Listener)
 {
     m_xFormComponentHandler->addPropertyChangeListener(Listener);
 }
 
-void SAL_CALL DataProviderHandler::removePropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & _rxListener) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DataProviderHandler::removePropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & _rxListener)
 {
     m_xFormComponentHandler->removePropertyChangeListener(_rxListener);
 }
 
-uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedProperties()
 {
     ::std::vector< beans::Property > aNewProps;
     if( m_xChartModel.is() )
@@ -383,13 +383,13 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope
     return uno::Sequence< beans::Property >(aNewProps.data(), aNewProps.size());
 }
 
-uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupersededProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupersededProperties()
 {
     uno::Sequence< OUString > aRet { PROPERTY_TITLE }; // have a look at OPropertyInfoService::getExcludeProperties
     return aRet;
 }
 
-uno::Sequence< OUString > SAL_CALL DataProviderHandler::getActuatingProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL DataProviderHandler::getActuatingProperties()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -397,12 +397,12 @@ uno::Sequence< OUString > SAL_CALL DataProviderHandler::getActuatingProperties()
     return ::comphelper::concatSequences(m_xFormComponentHandler->getActuatingProperties(),aSeq);
 }
 
-sal_Bool SAL_CALL DataProviderHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+sal_Bool SAL_CALL DataProviderHandler::isComposable( const OUString& _rPropertyName )
 {
     return OPropertyInfoService::isComposable( _rPropertyName, m_xFormComponentHandler );
 }
 
-inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException, std::exception)
+inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI)
 {
     if ( !_rxInspectorUI.is() )
         throw lang::NullPointerException();
@@ -429,7 +429,7 @@ inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteracti
     return eResult;
 }
 
-void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException, std::exception)
+void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -477,7 +477,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & Act
     }
 }
 
-sal_Bool SAL_CALL DataProviderHandler::suspend(sal_Bool Suspend) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DataProviderHandler::suspend(sal_Bool Suspend)
 {
     return m_xFormComponentHandler->suspend(Suspend);
 }
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index aa93293b2d93..d6720053fe83 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -64,27 +64,27 @@ namespace rptui
     {
     }
 
-    OUString SAL_CALL DefaultComponentInspectorModel::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL DefaultComponentInspectorModel::getImplementationName(  )
     {
         return getImplementationName_Static();
     }
 
-    sal_Bool SAL_CALL DefaultComponentInspectorModel::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL DefaultComponentInspectorModel::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    Sequence< OUString > SAL_CALL DefaultComponentInspectorModel::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DefaultComponentInspectorModel::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_static();
     }
 
-    OUString DefaultComponentInspectorModel::getImplementationName_Static(  ) throw(RuntimeException)
+    OUString DefaultComponentInspectorModel::getImplementationName_Static(  )
     {
         return OUString("com.sun.star.comp.report.DefaultComponentInspectorModel");
     }
 
-    Sequence< OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static(  ) throw(RuntimeException)
+    Sequence< OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static(  )
     {
         Sequence< OUString > aSupported { "com.sun.star.report.inspection.DefaultComponentInspectorModel" };
         return aSupported;
@@ -96,7 +96,7 @@ namespace rptui
     }
 
 
-    Sequence< Any > SAL_CALL DefaultComponentInspectorModel::getHandlerFactories() throw (RuntimeException, std::exception)
+    Sequence< Any > SAL_CALL DefaultComponentInspectorModel::getHandlerFactories()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -127,39 +127,39 @@ namespace rptui
         return aReturn;
     }
 
-    sal_Bool SAL_CALL DefaultComponentInspectorModel::getHasHelpSection() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DefaultComponentInspectorModel::getHasHelpSection()
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         return m_bHasHelpSection;
     }
 
 
-    ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMinHelpTextLines() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMinHelpTextLines()
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         return m_nMinHelpTextLines;
     }
 
-    sal_Bool SAL_CALL DefaultComponentInspectorModel::getIsReadOnly() throw (css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL DefaultComponentInspectorModel::getIsReadOnly()
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         return m_bIsReadOnly;
     }
 
-    void SAL_CALL DefaultComponentInspectorModel::setIsReadOnly( sal_Bool _isreadonly ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL DefaultComponentInspectorModel::setIsReadOnly( sal_Bool _isreadonly )
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         m_bIsReadOnly = _isreadonly;
     }
 
 
-    ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMaxHelpTextLines() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMaxHelpTextLines()
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         return m_nMaxHelpTextLines;
     }
 
-    void SAL_CALL DefaultComponentInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL DefaultComponentInspectorModel::initialize( const Sequence< Any >& _arguments )
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         if ( m_bConstructed )
@@ -195,7 +195,7 @@ namespace rptui
         m_bConstructed = true;
     }
 
-    Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultComponentInspectorModel::describeCategories(  ) throw (RuntimeException, std::exception)
+    Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultComponentInspectorModel::describeCategories(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -223,7 +223,7 @@ namespace rptui
     }
 
 
-    ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName )
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         const sal_Int32 nPropertyId( OPropertyInfoService::getPropertyId( _rPropertyName ) );
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 44b783275a9a..816d77cf14f5 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -239,27 +239,27 @@ GeometryHandler::~GeometryHandler()
 {
 }
 
-OUString SAL_CALL GeometryHandler::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL GeometryHandler::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL GeometryHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL GeometryHandler::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_static();
 }
 
-OUString GeometryHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString GeometryHandler::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.GeometryHandler");
 }
 
-uno::Sequence< OUString > GeometryHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > GeometryHandler::getSupportedServiceNames_static(  )
 {
     uno::Sequence< OUString > aSupported { "com.sun.star.report.inspection.GeometryHandler" };
     return aSupported;
@@ -289,12 +289,12 @@ void SAL_CALL GeometryHandler::disposing()
     catch(uno::Exception&)
     {}
 }
-void SAL_CALL GeometryHandler::addEventListener(const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException, std::exception)
+void SAL_CALL GeometryHandler::addEventListener(const uno::Reference< lang::XEventListener > & xListener)
 {
     m_xFormComponentHandler->addEventListener(xListener);
 }
 
-void SAL_CALL GeometryHandler::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw (uno::RuntimeException, std::exception)
+void SAL_CALL GeometryHandler::removeEventListener(const uno::Reference< lang::XEventListener > & aListener)
 {
     m_xFormComponentHandler->removeEventListener(aListener);
 }
@@ -302,7 +302,7 @@ void SAL_CALL GeometryHandler::removeEventListener(const uno::Reference< lang::X
 // inspection::XPropertyHandler:
 
 /********************************************************************************/
-void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface > & _rxInspectee ) throw (uno::RuntimeException, lang::NullPointerException, std::exception)
+void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface > & _rxInspectee )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     m_sScope.clear();
@@ -348,7 +348,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface >
     m_xFormComponentHandler->inspect(m_xReportComponent);
 }
 
-uno::Any SAL_CALL GeometryHandler::getPropertyValue(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+uno::Any SAL_CALL GeometryHandler::getPropertyValue(const OUString & PropertyName)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     uno::Any aPropertyValue;
@@ -442,7 +442,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const OUString & PropertyNam
     return aPropertyValue;
 }
 
-void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, std::exception)
+void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value)
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
     uno::Any aNewValue = Value;
@@ -662,7 +662,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c
 }
 
 
-beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const OUString & PropertyName)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_xFormComponentHandler->getPropertyState(PropertyName);
@@ -707,7 +707,7 @@ void GeometryHandler::implCreateListLikeControl(
 }
 
 
-inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException, std::exception)
+inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory)
 {
     inspection::LineDescriptor aOut;
     const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
@@ -953,7 +953,7 @@ uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,sal_uInt16 _nRe
     }
 }
 
-uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & PropertyName, const uno::Any & _rControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & PropertyName, const uno::Any & _rControlValue)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     uno::Any aPropertyValue( _rControlValue );
@@ -1134,7 +1134,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
     return aPropertyValue;
 }
 
-uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & PropertyName, const uno::Any & _rPropertyValue, const uno::Type & _rControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & PropertyName, const uno::Any & _rPropertyValue, const uno::Type & _rControlValueType)
 {
     uno::Any aControlValue( _rPropertyValue );
     if ( !aControlValue.hasValue() )
@@ -1278,14 +1278,14 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
     }
     return aControlValue;
 }
-void SAL_CALL GeometryHandler::addPropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & _rxListener) throw (uno::RuntimeException, lang::NullPointerException, std::exception)
+void SAL_CALL GeometryHandler::addPropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & _rxListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     m_aPropertyListeners.addListener( _rxListener );
     m_xFormComponentHandler->addPropertyChangeListener(_rxListener);
 }
 
-void SAL_CALL GeometryHandler::removePropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & _rxListener) throw (uno::RuntimeException, std::exception)
+void SAL_CALL GeometryHandler::removePropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & _rxListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     m_aPropertyListeners.removeListener( _rxListener );
@@ -1293,7 +1293,7 @@ void SAL_CALL GeometryHandler::removePropertyChangeListener(const uno::Reference
 }
 
 
-uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedProperties()
 {
     ::std::vector< beans::Property > aNewProps;
     aNewProps.reserve(20); // only a guess
@@ -1374,7 +1374,7 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie
     return uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size());
 }
 
-uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupersededProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupersededProperties()
 {
     uno::Sequence< OUString > aRet;
     const uno::Reference<report::XReportDefinition> xReport(m_xReportComponent,uno::UNO_QUERY);
@@ -1391,7 +1391,7 @@ uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupersededProperties() th
     return aRet;
 }
 
-uno::Sequence< OUString > SAL_CALL GeometryHandler::getActuatingProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL GeometryHandler::getActuatingProperties()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1405,12 +1405,12 @@ uno::Sequence< OUString > SAL_CALL GeometryHandler::getActuatingProperties() thr
     return ::comphelper::concatSequences(m_xFormComponentHandler->getActuatingProperties(),aSeq);
 }
 
-sal_Bool SAL_CALL GeometryHandler::isComposable(const OUString & _rPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+sal_Bool SAL_CALL GeometryHandler::isComposable(const OUString & _rPropertyName)
 {
     return OPropertyInfoService::isComposable( _rPropertyName, m_xFormComponentHandler );
 }
 
-inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & _rData, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException, std::exception)
+inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & _rData, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI)
 {
     if ( !_rxInspectorUI.is() )
         throw lang::NullPointerException();
@@ -1491,7 +1491,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
     return m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, _rData, _rxInspectorUI);
 }
 
-void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI, sal_Bool _bFirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException, std::exception)
+void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI, sal_Bool _bFirstTimeInit)
 {
     if ( !_rxInspectorUI.is() )
         throw lang::NullPointerException();
@@ -1574,7 +1574,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & Actuati
     }
 }
 
-sal_Bool SAL_CALL GeometryHandler::suspend(sal_Bool Suspend) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL GeometryHandler::suspend(sal_Bool Suspend)
 {
     return m_xFormComponentHandler->suspend(Suspend);
 }
@@ -2215,11 +2215,11 @@ sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const OUString& _sDataFi
 }
 
 // XEventListener
-void SAL_CALL GeometryHandler::disposing(const lang::EventObject& ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL GeometryHandler::disposing(const lang::EventObject& )
 {
 }
 // XPropertyChangeListener
-void SAL_CALL GeometryHandler::propertyChange(const beans::PropertyChangeEvent& /*evt*/) throw(uno::RuntimeException, std::exception)
+void SAL_CALL GeometryHandler::propertyChange(const beans::PropertyChangeEvent& /*evt*/)
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
     if ( !m_bIn )
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index be623b479152..71d088175e76 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -52,27 +52,27 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo
     }
 }
 
-OUString SAL_CALL ReportComponentHandler::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ReportComponentHandler::getImplementationName(  )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL ReportComponentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ReportComponentHandler::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_static();
 }
 
-OUString ReportComponentHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
+OUString ReportComponentHandler::getImplementationName_Static(  )
 {
     return OUString("com.sun.star.comp.report.ReportComponentHandler");
 }
 
-uno::Sequence< OUString > ReportComponentHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
+uno::Sequence< OUString > ReportComponentHandler::getSupportedServiceNames_static(  )
 {
     uno::Sequence< OUString > aSupported { "com.sun.star.report.inspection.ReportComponentHandler" };
     return aSupported;
@@ -90,12 +90,12 @@ void SAL_CALL ReportComponentHandler::disposing()
 {
     ::comphelper::disposeComponent(m_xFormComponentHandler);
 }
-void SAL_CALL ReportComponentHandler::addEventListener(const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ReportComponentHandler::addEventListener(const uno::Reference< lang::XEventListener > & xListener)
 {
     m_xFormComponentHandler->addEventListener(xListener);
 }
 
-void SAL_CALL ReportComponentHandler::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ReportComponentHandler::removeEventListener(const uno::Reference< lang::XEventListener > & aListener)
 {
     m_xFormComponentHandler->removeEventListener(aListener);
 }
@@ -103,7 +103,7 @@ void SAL_CALL ReportComponentHandler::removeEventListener(const uno::Reference<
 // inspection::XPropertyHandler:
 
 /********************************************************************************/
-void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterface > & Component) throw (uno::RuntimeException, lang::NullPointerException, std::exception)
+void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterface > & Component)
 {
     try
     {
@@ -128,47 +128,47 @@ void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterf
     }
 }
 
-uno::Any SAL_CALL ReportComponentHandler::getPropertyValue(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+uno::Any SAL_CALL ReportComponentHandler::getPropertyValue(const OUString & PropertyName)
 {
     return m_xFormComponentHandler->getPropertyValue(PropertyName);
 }
 
-void SAL_CALL ReportComponentHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+void SAL_CALL ReportComponentHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value)
 {
     m_xFormComponentHandler->setPropertyValue(PropertyName, Value);
 }
 
-beans::PropertyState SAL_CALL ReportComponentHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+beans::PropertyState SAL_CALL ReportComponentHandler::getPropertyState(const OUString & PropertyName)
 {
     return m_xFormComponentHandler->getPropertyState(PropertyName);
 }
 
-inspection::LineDescriptor SAL_CALL ReportComponentHandler::describePropertyLine(const OUString & PropertyName,  const uno::Reference< inspection::XPropertyControlFactory > & ControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException, std::exception)
+inspection::LineDescriptor SAL_CALL ReportComponentHandler::describePropertyLine(const OUString & PropertyName,  const uno::Reference< inspection::XPropertyControlFactory > & ControlFactory)
 {
     return m_xFormComponentHandler->describePropertyLine(PropertyName, ControlFactory);
 }
 
-uno::Any SAL_CALL ReportComponentHandler::convertToPropertyValue(const OUString & PropertyName, const uno::Any & ControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+uno::Any SAL_CALL ReportComponentHandler::convertToPropertyValue(const OUString & PropertyName, const uno::Any & ControlValue)
 {
     return m_xFormComponentHandler->convertToPropertyValue(PropertyName, ControlValue);
 }
 
-uno::Any SAL_CALL ReportComponentHandler::convertToControlValue(const OUString & PropertyName, const uno::Any & PropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+uno::Any SAL_CALL ReportComponentHandler::convertToControlValue(const OUString & PropertyName, const uno::Any & PropertyValue, const uno::Type & ControlValueType)
 {
     return m_xFormComponentHandler->convertToControlValue(PropertyName, PropertyValue, ControlValueType);
 }
 
-void SAL_CALL ReportComponentHandler::addPropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & Listener) throw (uno::RuntimeException, lang::NullPointerException, std::exception)
+void SAL_CALL ReportComponentHandler::addPropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & Listener)
 {
     m_xFormComponentHandler->addPropertyChangeListener(Listener);
 }
 
-void SAL_CALL ReportComponentHandler::removePropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & _rxListener) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ReportComponentHandler::removePropertyChangeListener(const uno::Reference< beans::XPropertyChangeListener > & _rxListener)
 {
     m_xFormComponentHandler->removePropertyChangeListener(_rxListener);
 }
 
-uno::Sequence< beans::Property > SAL_CALL ReportComponentHandler::getSupportedProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< beans::Property > SAL_CALL ReportComponentHandler::getSupportedProperties()
 {
     ::std::vector< beans::Property > aNewProps;
     rptui::OPropertyInfoService::getExcludeProperties( aNewProps, m_xFormComponentHandler );
@@ -176,33 +176,33 @@ uno::Sequence< beans::Property > SAL_CALL ReportComponentHandler::getSupportedPr
     return uno::Sequence< beans::Property >(aNewProps.data(), aNewProps.size());
 }
 
-uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupersededProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupersededProperties()
 {
     uno::Sequence< OUString > aRet;
     return aRet;
 }
 
-uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getActuatingProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getActuatingProperties()
 {
     return m_xFormComponentHandler->getActuatingProperties();
 }
 
-sal_Bool SAL_CALL ReportComponentHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
+sal_Bool SAL_CALL ReportComponentHandler::isComposable( const OUString& _rPropertyName )
 {
     return OPropertyInfoService::isComposable( _rPropertyName, m_xFormComponentHandler );
 }
 
-inspection::InteractiveSelectionResult SAL_CALL ReportComponentHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException, std::exception)
+inspection::InteractiveSelectionResult SAL_CALL ReportComponentHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI)
 {
     return m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, out_Data, InspectorUI);
 }
 
-void SAL_CALL ReportComponentHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException, std::exception)
+void SAL_CALL ReportComponentHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, sal_Bool FirstTimeInit)
 {
     m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, InspectorUI, FirstTimeInit);
 }
 
-sal_Bool SAL_CALL ReportComponentHandler::suspend(sal_Bool Suspend) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ReportComponentHandler::suspend(sal_Bool Suspend)
 {
     return m_xFormComponentHandler->suspend(Suspend);
 }
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index 4d3a5fd67de7..c4646a8c617a 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -40,28 +40,28 @@ namespace rptui
     using namespace ::com::sun::star::frame;
     using namespace ::com::sun::star::util;
 
-OUString SAL_CALL OStatusbarController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL OStatusbarController::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-OUString OStatusbarController::getImplementationName_Static() throw( RuntimeException )
+OUString OStatusbarController::getImplementationName_Static()
 {
     return OUString("com.sun.star.report.comp.StatusbarController");
 }
 
-Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static()
 {
     Sequence<OUString> aSupported { "com.sun.star.frame.StatusbarController" };
     return aSupported;
 }
 
-sal_Bool SAL_CALL OStatusbarController::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatusbarController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString> SAL_CALL OStatusbarController::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString> SAL_CALL OStatusbarController::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -79,7 +79,7 @@ OStatusbarController::OStatusbarController(const Reference< XComponentContext >&
 {
 }
 
-void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArguments )
 {
     StatusbarController::initialize(_rArguments);
     SolarMutexGuard aSolarMutexGuard;
@@ -124,7 +124,7 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen
     }
 }
 // XStatusListener
-void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEvent)throw ( RuntimeException, std::exception )
+void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEvent)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -155,17 +155,17 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
 }
 
 // XStatusbarController
-sal_Bool SAL_CALL OStatusbarController::mouseButtonDown(const css::awt::MouseEvent& _aEvent)throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatusbarController::mouseButtonDown(const css::awt::MouseEvent& _aEvent)
 {
     return m_rController.is() && m_rController->mouseButtonDown(_aEvent);
 }
 
-sal_Bool SAL_CALL OStatusbarController::mouseMove(    const css::awt::MouseEvent& _aEvent)throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatusbarController::mouseMove(    const css::awt::MouseEvent& _aEvent)
 {
     return m_rController.is() && m_rController->mouseMove(_aEvent);
 }
 
-sal_Bool SAL_CALL OStatusbarController::mouseButtonUp(    const css::awt::MouseEvent& _aEvent)throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OStatusbarController::mouseButtonUp(    const css::awt::MouseEvent& _aEvent)
 {
     return m_rController.is() && m_rController->mouseButtonUp(_aEvent);
 }
@@ -175,7 +175,6 @@ void SAL_CALL OStatusbarController::command(
     ::sal_Int32 nCommand,
     sal_Bool bMouseEvent,
     const css::uno::Any& aData )
-throw (css::uno::RuntimeException, std::exception)
 {
     if ( m_rController.is() )
         m_rController->command( aPos, nCommand, bMouseEvent, aData );
@@ -185,7 +184,6 @@ void SAL_CALL OStatusbarController::paint(
     const css::uno::Reference< css::awt::XGraphics >& xGraphics,
     const css::awt::Rectangle& rOutputRectangle,
     ::sal_Int32 nStyle )
-throw (css::uno::RuntimeException, std::exception)
 {
     if ( m_rController.is() )
         m_rController->paint( xGraphics, rOutputRectangle, nStyle );
@@ -193,7 +191,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 void SAL_CALL OStatusbarController::click(
     const css::awt::Point& aPos )
-throw (css::uno::RuntimeException, std::exception)
 {
     if ( m_rController.is() )
         m_rController->click( aPos );
@@ -201,13 +198,12 @@ throw (css::uno::RuntimeException, std::exception)
 
 void SAL_CALL OStatusbarController::doubleClick(
     const css::awt::Point& aPos )
-throw (css::uno::RuntimeException, std::exception)
 {
     if ( m_rController.is() )
         m_rController->doubleClick( aPos );
 }
 
-void SAL_CALL OStatusbarController::update() throw ( RuntimeException, std::exception )
+void SAL_CALL OStatusbarController::update()
 {
     ::svt::StatusbarController::update();
     if ( m_rController.is() )
@@ -215,7 +211,7 @@ void SAL_CALL OStatusbarController::update() throw ( RuntimeException, std::exce
 }
 
 // XComponent
-void SAL_CALL OStatusbarController::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL OStatusbarController::dispose()
 {
     if ( m_rController.is() )
         ::comphelper::disposeComponent( m_rController );
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index bede2e4fb1d3..b482c781c816 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -49,29 +49,29 @@ namespace rptui
     using namespace util;
     using namespace ui;
 
-OUString SAL_CALL OToolboxController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL OToolboxController::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
 
-OUString OToolboxController::getImplementationName_Static() throw( RuntimeException )
+OUString OToolboxController::getImplementationName_Static()
 {
     return OUString("com.sun.star.report.comp.ReportToolboxController");
 }
 
-Sequence< OUString> OToolboxController::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString> OToolboxController::getSupportedServiceNames_Static()
 {
     Sequence<OUString> aSupported { "com.sun.star.report.ReportToolboxController" };
     return aSupported;
 }
 
-sal_Bool SAL_CALL OToolboxController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OToolboxController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString> SAL_CALL OToolboxController::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString> SAL_CALL OToolboxController::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -95,7 +95,7 @@ OToolboxController::~OToolboxController()
 }
 
 // XInterface
-Any SAL_CALL OToolboxController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL OToolboxController::queryInterface( const Type& _rType )
 {
     Any aReturn = ToolboxController::queryInterface(_rType);
     if (!aReturn.hasValue())
@@ -113,7 +113,7 @@ void SAL_CALL OToolboxController::release() throw ()
     ToolboxController::release();
 }
 
-void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments )
 {
     ToolboxController::initialize(_rArguments);
     SolarMutexGuard aSolarMutexGuard;
@@ -156,7 +156,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
     }
 }
 
-void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete );
@@ -164,7 +164,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event
         m_pToolbarController->statusChanged( Event );
 }
 
-Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException, std::exception)
+Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow()
 {
     // execute the menu
     SolarMutexGuard aSolarMutexGuard;
@@ -177,27 +177,27 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw
     return xRet;
 }
 
-void SAL_CALL OToolboxController::execute( sal_Int16 KeyModifier ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OToolboxController::execute( sal_Int16 KeyModifier )
 {
     if ( m_pToolbarController.is() )
         m_pToolbarController->execute( KeyModifier );
 }
 
-sal_Bool SAL_CALL OToolboxController::opensSubToolbar() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OToolboxController::opensSubToolbar()
 {
     return true;
 }
 
-OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL OToolboxController::getSubToolbarName()
 {
     return OUString();
 }
 
-void SAL_CALL OToolboxController::functionSelected( const OUString& /*rCommand*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OToolboxController::functionSelected( const OUString& /*rCommand*/ )
 {
 }
 
-void SAL_CALL OToolboxController::updateImage(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OToolboxController::updateImage(  )
 {
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index 21fbaa477435..24ee9a2b296c 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -151,7 +151,7 @@ namespace rptui
 
 
     // XPropertyChangeListener
-    uno::Reference<awt::XControl> FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText) throw(uno::RuntimeException)
+    uno::Reference<awt::XControl> FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText)
     {
 
         uno::Reference<awt::XControl> xControl;
@@ -184,7 +184,7 @@ namespace rptui
     }
 
 
-    uno::Reference<awt::XVclWindowPeer> FixedTextColor::getVclWindowPeer(const uno::Reference< report::XFixedText >& _xComponent) throw(uno::RuntimeException)
+    uno::Reference<awt::XVclWindowPeer> FixedTextColor::getVclWindowPeer(const uno::Reference< report::XFixedText >& _xComponent)
     {
         uno::Reference<awt::XVclWindowPeer> xVclWindowPeer;
         uno::Reference<awt::XControl> xControl = getXControl(_xComponent);
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 649d7fc6a39d..af5ba66c93ab 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -154,7 +154,7 @@ namespace rptui
     }
 
 
-    uno::Reference<awt::XVclWindowPeer> FormattedFieldBeautifier::getVclWindowPeer(const uno::Reference< report::XReportComponent >& _xComponent) throw(uno::RuntimeException)
+    uno::Reference<awt::XVclWindowPeer> FormattedFieldBeautifier::getVclWindowPeer(const uno::Reference< report::XReportComponent >& _xComponent)
     {
         uno::Reference<awt::XVclWindowPeer> xVclWindowPeer;
 
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 10db48c2f591..2a70cde05e63 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -242,24 +242,24 @@ static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
         _xWindow = VCLUnoHelper::GetInterface(_pView);
 }
 
-OUString SAL_CALL OReportController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL OReportController::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
 
-OUString OReportController::getImplementationName_Static() throw( RuntimeException )
+OUString OReportController::getImplementationName_Static()
 {
     return OUString("com.sun.star.report.comp.ReportDesign");
 }
 
-Sequence< OUString> OReportController::getSupportedServiceNames_Static() throw( RuntimeException )
+Sequence< OUString> OReportController::getSupportedServiceNames_Static()
 {
     Sequence<OUString> aSupported { "com.sun.star.sdb.ReportDesign" };
     return aSupported;
 }
 
-Sequence< OUString> SAL_CALL OReportController::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString> SAL_CALL OReportController::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -1769,7 +1769,7 @@ bool OReportController::Construct(vcl::Window* pParent)
     return true;
 }
 
-sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/)
 {
     if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed )
         return true;
@@ -2133,24 +2133,24 @@ void OReportController::notifyGroupSections(const ContainerEvent& _rEvent,bool _
 }
 
 // ::container::XContainerListener
-void SAL_CALL OReportController::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OReportController::elementInserted( const ContainerEvent& _rEvent )
 {
     notifyGroupSections(_rEvent,true);
 }
 
-void SAL_CALL OReportController::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL OReportController::elementRemoved( const ContainerEvent& _rEvent )
 {
     notifyGroupSections(_rEvent,false);
 }
 
-void SAL_CALL OReportController::elementReplaced( const ContainerEvent& /*_rEvent*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL OReportController::elementReplaced( const ContainerEvent& /*_rEvent*/ )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
     OSL_FAIL("Not yet implemented!");
 }
 
-void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
+void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEvent& evt )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -2246,7 +2246,7 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven
 }
 
 
-void SAL_CALL OReportController::disposing( const lang::EventObject& Source ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OReportController::disposing( const lang::EventObject& Source )
 {
     // simply disambiguate
     OReportController_BASE::disposing(Source);
@@ -2525,7 +2525,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
 }
 
 
-sal_Bool SAL_CALL OReportController::attachModel(const uno::Reference< frame::XModel > & xModel) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OReportController::attachModel(const uno::Reference< frame::XModel > & xModel)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -2704,7 +2704,7 @@ void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, const uno::Referen
 }
 
 
-uno::Any SAL_CALL OReportController::getViewData() throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL OReportController::getViewData()
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -2770,7 +2770,7 @@ uno::Any SAL_CALL OReportController::getViewData() throw( uno::RuntimeException,
     return uno::makeAny( aViewData.getPropertyValues() );
 }
 
-void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( uno::RuntimeException, std::exception )
+void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -2963,7 +2963,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
     return xModel;
 }
 
-uno::Reference< frame::XModel >  SAL_CALL OReportController::getModel() throw( uno::RuntimeException, std::exception )
+uno::Reference< frame::XModel >  SAL_CALL OReportController::getModel()
 {
     return m_xReportDefinition.get();
 }
@@ -3037,7 +3037,7 @@ void OReportController::insertGraphic()
 }
 
 
-sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportController::select( const Any& aSelection )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     bool bRet = true;
@@ -3077,7 +3077,7 @@ sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (Ille
     return bRet;
 }
 
-Any SAL_CALL OReportController::getSelection(  ) throw (RuntimeException, std::exception)
+Any SAL_CALL OReportController::getSelection(  )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     Any aRet;
@@ -3090,12 +3090,12 @@ Any SAL_CALL OReportController::getSelection(  ) throw (RuntimeException, std::e
     return aRet;
 }
 
-void SAL_CALL OReportController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OReportController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener )
 {
     m_aSelectionListeners.addInterface( Listener );
 }
 
-void SAL_CALL OReportController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL OReportController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& Listener )
 {
     m_aSelectionListeners.removeInterface( Listener );
 }
@@ -4002,7 +4002,6 @@ void OReportController::checkChartEnabled()
 
 // css.frame.XTitle
 OUString SAL_CALL OReportController::getTitle()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -4033,7 +4032,7 @@ void OReportController::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any&
     return *OReportController_PROP::getArrayHelper();
 }
 
-void SAL_CALL OReportController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle,const Any& _aValue) throw (Exception, std::exception)
+void SAL_CALL OReportController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle,const Any& _aValue)
 {
     if ( _nHandle == PROPERTY_ID_ZOOMVALUE )
     {
@@ -4041,21 +4040,21 @@ void SAL_CALL OReportController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHa
         impl_zoom_nothrow();
     }
 }
-void SAL_CALL OReportController::setMode( const OUString& aMode ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OReportController::setMode( const OUString& aMode )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     m_sMode = aMode;
 }
-OUString SAL_CALL OReportController::getMode(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OReportController::getMode(  )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return m_sMode;
 }
-css::uno::Sequence< OUString > SAL_CALL OReportController::getSupportedModes(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OReportController::getSupportedModes(  )
 {
     return uno::Sequence< OUString> { OUString("remote"), OUString("normal") };
 }
-sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode )
 {
     uno::Sequence< OUString> aModes = getSupportedModes();
     const OUString* pIter = aModes.getConstArray();
@@ -4245,7 +4244,7 @@ void OReportController::openZoomDialog()
 
 
 // XVisualObject
-void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize )
 {
     ::osl::MutexGuard aGuard( getMutex() );
         bool bChanged =
@@ -4257,13 +4256,13 @@ void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const
     m_nAspect = _nAspect;
 }
 
-awt::Size SAL_CALL OReportController::getVisualAreaSize( ::sal_Int64 /*nAspect*/ ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception)
+awt::Size SAL_CALL OReportController::getVisualAreaSize( ::sal_Int64 /*nAspect*/ )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return m_aVisualAreaSize;
 }
 
-embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepresentation( ::sal_Int64 _nAspect ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception)
+embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepresentation( ::sal_Int64 _nAspect )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -4301,7 +4300,7 @@ embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepres
     return aResult;
 }
 
-::sal_Int32 SAL_CALL OReportController::getMapUnit( ::sal_Int64 /*nAspect*/ ) throw (uno::Exception, uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL OReportController::getMapUnit( ::sal_Int64 /*nAspect*/ )
 {
     return embed::EmbedMapUnits::ONE_100TH_MM;
 }
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 0fd26d4c40cd..a17f78ac3204 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -124,7 +124,7 @@ public:
     }
 
     // XEventListener
-    void SAL_CALL OXReportControllerObserver::disposing(const lang::EventObject& e) throw( uno::RuntimeException, std::exception )
+    void SAL_CALL OXReportControllerObserver::disposing(const lang::EventObject& e)
     {
         (void) e;
         // check if it's an object we have cached information about
@@ -146,7 +146,7 @@ public:
     }
 
     // XPropertyChangeListener
-    void SAL_CALL OXReportControllerObserver::propertyChange(const beans::PropertyChangeEvent& _rEvent) throw(uno::RuntimeException, std::exception)
+    void SAL_CALL OXReportControllerObserver::propertyChange(const beans::PropertyChangeEvent& _rEvent)
     {
         (void) _rEvent;
         ::osl::ClearableMutexGuard aGuard( m_pImpl->m_aMutex );
@@ -298,7 +298,7 @@ void OXReportControllerObserver::switchListening( const uno::Reference< uno::XIn
 }
 
 
-void SAL_CALL OXReportControllerObserver::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OXReportControllerObserver::modified( const lang::EventObject& /*aEvent*/ )
 {
 }
 
@@ -344,7 +344,7 @@ void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInter
 }
 // XContainerListener
 
-void SAL_CALL OXReportControllerObserver::elementInserted(const container::ContainerEvent& evt) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OXReportControllerObserver::elementInserted(const container::ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
@@ -358,7 +358,7 @@ void SAL_CALL OXReportControllerObserver::elementInserted(const container::Conta
 }
 
 
-void SAL_CALL OXReportControllerObserver::elementReplaced(const container::ContainerEvent& evt) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OXReportControllerObserver::elementReplaced(const container::ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
@@ -372,7 +372,7 @@ void SAL_CALL OXReportControllerObserver::elementReplaced(const container::Conta
 }
 
 
-void SAL_CALL OXReportControllerObserver::elementRemoved(const container::ContainerEvent& evt) throw(uno::RuntimeException, std::exception)
+void SAL_CALL OXReportControllerObserver::elementRemoved(const container::ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index cda794958407..8f2337371878 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -494,7 +494,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt )
     }
 }
 
-void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
+void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
 {
     if ( m_xSection.is() )
     {
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 949a83289c3b..c47b84ecadb2 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -431,7 +431,7 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const
     return nZoom;
 }
 
-void OReportWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
+void OReportWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
 {
     (void)_rEvent;
     Resize();
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 994dc51ed8ba..a2b73dc44662 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -372,7 +372,6 @@ void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt )
 }
 
 void OScrollWindowHelper::_propertyChanged(const beans::PropertyChangeEvent& /*_rEvent*/)
-    throw (uno::RuntimeException, std::exception)
 {
     m_aReportWindow->notifySizeChanged();
 }
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 9d9230c17835..65459b59e9a0 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -123,7 +123,6 @@ void OSectionWindow::dispose()
 }
 
 void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     const uno::Reference< report::XSection > xSection(_rEvent.Source,uno::UNO_QUERY);
diff --git a/salhelper/source/condition.cxx b/salhelper/source/condition.cxx
index 6112616ecae5..61971def7509 100644
--- a/salhelper/source/condition.cxx
+++ b/salhelper/source/condition.cxx
@@ -99,9 +99,6 @@ ConditionWaiter::ConditionWaiter(Condition& aCond)
 
 
 ConditionWaiter::ConditionWaiter(Condition& aCond,sal_uInt32 milliSec)
-    throw(
-        ConditionWaiter::timedout
-    )
     : m_aCond(aCond)
 {
     TimeValue aTime;
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 843a3ef0ffcc..a07a9588a7e9 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -92,11 +92,7 @@ public:
     /// @throws css::io::NotConnectedException
     /// @throws css::io::BufferSizeExceededException
     /// @throws css::uno::RuntimeException
-    sal_Int32 readAndConvert( css::uno::Sequence<sal_Int8> &seq , sal_Int32 nMaxToRead )
-        throw ( css::io::IOException,
-                css::io::NotConnectedException ,
-                css::io::BufferSizeExceededException ,
-                css::uno::RuntimeException );
+    sal_Int32 readAndConvert( css::uno::Sequence<sal_Int8> &seq , sal_Int32 nMaxToRead );
 
 private:
 
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
index c77277bcb456..83a7be3f2fda 100644
--- a/sax/qa/cppunit/parser.cxx
+++ b/sax/qa/cppunit/parser.cxx
@@ -28,13 +28,11 @@ class DummyTokenHandler : public cppu::WeakImplHelper< xml::sax::XFastTokenHandl
 public:
              DummyTokenHandler() {}
 
-    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence<sal_Int8>& )
-        throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence<sal_Int8>& ) override
     {
         return FastToken::DONTKNOW;
     }
-    virtual uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 )
-        throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 ) override
     {
         CPPUNIT_ASSERT_MESSAGE( "getUTF8Identifier: unexpected call", false );
         return uno::Sequence<sal_Int8>();
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index a5c66eb53704..8876a4aa01e7 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -87,14 +87,14 @@ public:
     const OUString & getString() { return m_aStr; }
 
     // XDocumentHandler
-    virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL endElement( const OUString& aName ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException, exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
+    virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+    virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) override;
 };
 
 OUString TestDocumentHandler::canonicalform(const OUString &sName, const OUString &sValue, bool isElement)
@@ -139,7 +139,6 @@ OUString TestDocumentHandler::getNamespace(const OUString &sName)
 }
 
 void SAL_CALL TestDocumentHandler::startDocument()
-        throw(SAXException, RuntimeException, exception)
 {
     m_aStr.clear();
     m_aNamespaceStack.clear();
@@ -150,12 +149,10 @@ void SAL_CALL TestDocumentHandler::startDocument()
 
 
 void SAL_CALL TestDocumentHandler::endDocument()
-        throw(SAXException, RuntimeException, exception)
 {
 }
 
 void SAL_CALL TestDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs )
-        throw( SAXException, RuntimeException, exception )
 {
     OUString sAttributes;
     m_aCountStack.push(0);
@@ -172,7 +169,6 @@ void SAL_CALL TestDocumentHandler::startElement( const OUString& aName, const Re
 
 
 void SAL_CALL TestDocumentHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException, exception )
 {
     m_aStr = m_aStr + canonicalform(aName, "", true);
     sal_uInt16 nPopQty = m_aCountStack.top();
@@ -183,27 +179,23 @@ void SAL_CALL TestDocumentHandler::endElement( const OUString& aName )
 
 
 void SAL_CALL TestDocumentHandler::characters( const OUString& aChars )
-        throw(SAXException, RuntimeException, exception)
 {
     m_aStr = m_aStr + aChars;
 }
 
 
 void SAL_CALL TestDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces )
-        throw(SAXException, RuntimeException, exception)
 {
     m_aStr = m_aStr + aWhitespaces;
 }
 
 
 void SAL_CALL TestDocumentHandler::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
-        throw(SAXException, RuntimeException, exception)
 {
 }
 
 
 void SAL_CALL TestDocumentHandler::setDocumentLocator( const Reference< XLocator >& /*xLocator*/ )
-        throw(SAXException, RuntimeException, exception)
 {
 }
 
@@ -213,14 +205,14 @@ public:
     NSDocumentHandler() {}
 
     // XDocumentHandler
-    virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException, exception) override {}
-    virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException, exception) override {}
-    virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL endElement( const OUString& /* aName */ ) throw (SAXException, RuntimeException, exception) override {}
-    virtual void SAL_CALL characters( const OUString& /* aChars */ ) throw (SAXException, RuntimeException, exception) override {}
-    virtual void SAL_CALL ignorableWhitespace( const OUString& /* aWhitespaces */ ) throw (SAXException, RuntimeException, exception) override {}
-    virtual void SAL_CALL processingInstruction( const OUString& /* aTarget */, const OUString& /* aData */ ) throw (SAXException, RuntimeException, exception) override {}
-    virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& /* xLocator */ ) throw (SAXException, RuntimeException, exception) override {}
+    virtual void SAL_CALL startDocument() override {}
+    virtual void SAL_CALL endDocument() override {}
+    virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) override;
+    virtual void SAL_CALL endElement( const OUString& /* aName */ ) override {}
+    virtual void SAL_CALL characters( const OUString& /* aChars */ ) override {}
+    virtual void SAL_CALL ignorableWhitespace( const OUString& /* aWhitespaces */ ) override {}
+    virtual void SAL_CALL processingInstruction( const OUString& /* aTarget */, const OUString& /* aData */ ) override {}
+    virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& /* xLocator */ ) override {}
 };
 
 OUString getNamespaceValue( const OUString& rNamespacePrefix )
@@ -252,7 +244,6 @@ OUString resolveNamespace( const OUString& aName )
 }
 
 void SAL_CALL NSDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList >&/* xAttribs */ )
-        throw( SAXException, RuntimeException, exception )
 {
     if (! (aName == "office:document" || aName == "office:body" || aName == "office:text" ||
         aName == "text:p" || aName == "note:p") )
@@ -275,10 +266,8 @@ public:
     const static OString namespacePrefixes[];
 
     // XFastTokenHandler
-    virtual Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) override;
+    virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override;
     //FastTokenHandlerBase
     virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override;
 };
@@ -294,7 +283,6 @@ const OUStringLiteral DummyTokenHandler::namespaceURIs[] = { "http://www.w3.org/
 const OString DummyTokenHandler::namespacePrefixes[] = { "", "w", "Player" };
 
 Sequence< sal_Int8 > DummyTokenHandler::getUTF8Identifier( sal_Int32 nToken )
-    throw (uno::RuntimeException, std::exception)
 {
     OString aUtf8Token;
     if ( ( ( nToken & 0xffff0000 ) != 0 ) ) //namespace
@@ -315,7 +303,6 @@ Sequence< sal_Int8 > DummyTokenHandler::getUTF8Identifier( sal_Int32 nToken )
 }
 
 sal_Int32 DummyTokenHandler::getTokenFromUTF8( const uno::Sequence< sal_Int8 >& rIdentifier )
-    throw (uno::RuntimeException, std::exception)
 {
     return getTokenDirect( reinterpret_cast< const char* >(
                     rIdentifier.getConstArray() ), rIdentifier.getLength() );
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 9330749185f4..ec53ee80edc8 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -107,30 +107,22 @@ public:
     SaxExpatParser();
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments)
-        throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments) override;
 
     // The SAX-Parser-Interface
-    virtual void SAL_CALL parseStream(  const InputSource& structSource)
-        throw ( SAXException,
-                IOException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentHandler(const css::uno::Reference< XDocumentHandler > & xHandler)
-        throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL setErrorHandler(const css::uno::Reference< XErrorHandler > & xHandler)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDTDHandler(const css::uno::Reference < XDTDHandler > & xHandler)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEntityResolver(const css::uno::Reference<  XEntityResolver >& xResolver)
-        throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL setLocale( const Locale &locale )                     throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL parseStream(  const InputSource& structSource) override;
+    virtual void SAL_CALL setDocumentHandler(const css::uno::Reference< XDocumentHandler > & xHandler) override;
+
+    virtual void SAL_CALL setErrorHandler(const css::uno::Reference< XErrorHandler > & xHandler) override;
+    virtual void SAL_CALL setDTDHandler(const css::uno::Reference < XDTDHandler > & xHandler) override;
+    virtual void SAL_CALL setEntityResolver(const css::uno::Reference<  XEntityResolver >& xResolver) override;
+
+    virtual void SAL_CALL setLocale( const Locale &locale ) override;
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw (std::exception) override;
-    css::uno::Sequence< OUString >         SAL_CALL getSupportedServiceNames() throw (std::exception) override;
-    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override;
+    OUString                     SAL_CALL getImplementationName() override;
+    css::uno::Sequence< OUString >         SAL_CALL getSupportedServiceNames() override;
+    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) override;
 
 private:
     std::unique_ptr<SaxExpatParser_Impl>   m_pImpl;
@@ -323,33 +315,33 @@ public:
     }
 
 public: //XLocator
-    virtual sal_Int32 SAL_CALL getColumnNumber() throw (std::exception) override
+    virtual sal_Int32 SAL_CALL getColumnNumber() override
     {
         return XML_GetCurrentColumnNumber( m_pParser->getEntity().pParser );
     }
-    virtual sal_Int32 SAL_CALL getLineNumber() throw (std::exception) override
+    virtual sal_Int32 SAL_CALL getLineNumber() override
     {
         return XML_GetCurrentLineNumber( m_pParser->getEntity().pParser );
     }
-    virtual OUString SAL_CALL getPublicId() throw (std::exception) override
+    virtual OUString SAL_CALL getPublicId() override
     {
         return m_pParser->getEntity().structSource.sPublicId;
     }
-    virtual OUString SAL_CALL getSystemId() throw (std::exception) override
+    virtual OUString SAL_CALL getSystemId() override
     {
         return m_pParser->getEntity().structSource.sSystemId;
     }
 
     // XSeekable (only for getPosition)
 
-    virtual void SAL_CALL seek( sal_Int64 ) throw(std::exception) override
+    virtual void SAL_CALL seek( sal_Int64 ) override
     {
     }
-    virtual sal_Int64 SAL_CALL getPosition() throw(std::exception) override
+    virtual sal_Int64 SAL_CALL getPosition() override
     {
         return XML_GetCurrentByteIndex( m_pParser->getEntity().pParser );
     }
-    virtual ::sal_Int64 SAL_CALL getLength() throw(std::exception) override
+    virtual ::sal_Int64 SAL_CALL getLength() override
     {
         return 0;
     }
@@ -378,7 +370,6 @@ SaxExpatParser::SaxExpatParser(  )
 // css::lang::XInitialization:
 void SAL_CALL
 SaxExpatParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments)
-    throw (css::uno::RuntimeException, css::uno::Exception, std::exception)
 {
     // possible arguments: a string "DoSmeplease"
     if (rArguments.getLength())
@@ -399,9 +390,6 @@ SaxExpatParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments
 *
 ****************/
 void SaxExpatParser::parseStream(   const InputSource& structSource)
-    throw (SAXException,
-           IOException,
-           css::uno::RuntimeException, std::exception)
 {
     // Only one text at one time
     MutexGuard guard( m_pImpl->aMutex );
@@ -509,7 +497,6 @@ void SaxExpatParser::parseStream(   const InputSource& structSource)
 }
 
 void SaxExpatParser::setDocumentHandler(const css::uno::Reference< XDocumentHandler > & xHandler)
-    throw (css::uno::RuntimeException, std::exception)
 {
     m_pImpl->rDocumentHandler = xHandler;
     m_pImpl->rExtendedDocumentHandler =
@@ -517,43 +504,40 @@ void SaxExpatParser::setDocumentHandler(const css::uno::Reference< XDocumentHand
 }
 
 void SaxExpatParser::setErrorHandler(const css::uno::Reference< XErrorHandler > & xHandler)
-    throw (css::uno::RuntimeException, std::exception)
 {
     m_pImpl->rErrorHandler = xHandler;
 }
 
 void SaxExpatParser::setDTDHandler(const css::uno::Reference< XDTDHandler > & xHandler)
-    throw (css::uno::RuntimeException, std::exception)
 {
     m_pImpl->rDTDHandler = xHandler;
 }
 
 void SaxExpatParser::setEntityResolver(const css::uno::Reference < XEntityResolver > & xResolver)
-    throw (css::uno::RuntimeException, std::exception)
 {
     m_pImpl->rEntityResolver = xResolver;
 }
 
 
-void SaxExpatParser::setLocale( const Locale & locale ) throw (css::uno::RuntimeException, std::exception)
+void SaxExpatParser::setLocale( const Locale & locale )
 {
     m_pImpl->locale = locale;
 }
 
 // XServiceInfo
-OUString SaxExpatParser::getImplementationName() throw (std::exception)
+OUString SaxExpatParser::getImplementationName()
 {
     return OUString("com.sun.star.comp.extensions.xml.sax.ParserExpat");
 }
 
 // XServiceInfo
-sal_Bool SaxExpatParser::supportsService(const OUString& ServiceName) throw (std::exception)
+sal_Bool SaxExpatParser::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-css::uno::Sequence< OUString > SaxExpatParser::getSupportedServiceNames() throw (std::exception)
+css::uno::Sequence< OUString > SaxExpatParser::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> seq { "com.sun.star.xml.sax.Parser" };
     return seq;
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index 0d216010c89a..b4a1fb1cbfd7 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -93,23 +93,23 @@ private:
     bool                    m_bStartElementFinished;
 
     /// @throws SAXException
-    inline sal_uInt32 writeSequence() throw( SAXException );
+    inline sal_uInt32 writeSequence();
 
     // use only if to insert the bytes more space in the sequence is needed and
     // so the sequence has to write out and reset rPos to 0
     // writes sequence only on overflow, sequence could be full on the end (rPos == SEQUENCESIZE)
     /// @throws SAXException
     inline void AddBytes(sal_Int8* pTarget, sal_uInt32& rPos,
-                const sal_Int8* pBytes, sal_uInt32 nBytesCount) throw( SAXException );
+                const sal_Int8* pBytes, sal_uInt32 nBytesCount);
     /// @throws SAXException
     inline bool convertToXML(const sal_Unicode * pStr,
                         sal_Int32 nStrLen,
                         bool bDoNormalization,
                         bool bNormalizeWhitespace,
                         sal_Int8 *pTarget,
-                        sal_uInt32& rPos) throw( SAXException );
+                        sal_uInt32& rPos);
     /// @throws SAXException
-    inline void FinishStartElement() throw( SAXException );
+    inline void FinishStartElement();
 public:
     explicit SaxWriterHelper(Reference< XOutputStream > const & m_TempOut)
         : m_out(m_TempOut)
@@ -129,7 +129,7 @@ public:
     }
 
     /// @throws SAXException
-    inline void insertIndentation(sal_uInt32 m_nLevel)  throw( SAXException );
+    inline void insertIndentation(sal_uInt32 m_nLevel);
 
 // returns whether it works correct or invalid characters were in the string
 // If there are invalid characters in the string it returns sal_False.
@@ -137,48 +137,48 @@ public:
     /// @throws SAXException
     inline bool writeString(const OUString& rWriteOutString,
                         bool bDoNormalization,
-                        bool bNormalizeWhitespace) throw( SAXException );
+                        bool bNormalizeWhitespace);
 
     sal_uInt32 GetLastColumnCount() const throw()
         { return (sal_uInt32)(nCurrentPos - nLastLineFeedPos); }
 
     /// @throws SAXException
-    inline void startDocument() throw( SAXException );
+    inline void startDocument();
 
 // returns whether it works correct or invalid characters were in the strings
 // If there are invalid characters in one of the strings it returns sal_False.
 // Than the calling method has to throw the needed Exception.
     /// @throws SAXException
-    inline SaxInvalidCharacterError startElement(const OUString& rName, const Reference< XAttributeList >& xAttribs) throw( SAXException );
+    inline SaxInvalidCharacterError startElement(const OUString& rName, const Reference< XAttributeList >& xAttribs);
     /// @throws SAXException
-    inline bool FinishEmptyElement() throw( SAXException );
+    inline bool FinishEmptyElement();
 
 // returns whether it works correct or invalid characters were in the string
 // If there are invalid characters in the string it returns sal_False.
 // Than the calling method has to throw the needed Exception.
     /// @throws SAXException
-    inline bool endElement(const OUString& rName) throw( SAXException );
+    inline bool endElement(const OUString& rName);
     /// @throws SAXException
-    inline void endDocument() throw( SAXException );
+    inline void endDocument();
 
 // returns whether it works correct or invalid characters were in the strings
 // If there are invalid characters in the string it returns sal_False.
 // Than the calling method has to throw the needed Exception.
     /// @throws SAXException
-    inline bool processingInstruction(const OUString& rTarget, const OUString& rData) throw( SAXException );
+    inline bool processingInstruction(const OUString& rTarget, const OUString& rData);
     /// @throws SAXException
-    inline void startCDATA() throw( SAXException );
+    inline void startCDATA();
     /// @throws SAXException
-    inline void endCDATA() throw( SAXException );
+    inline void endCDATA();
 
 // returns whether it works correct or invalid characters were in the strings
 // If there are invalid characters in the string it returns sal_False.
 // Than the calling method has to throw the needed Exception.
     /// @throws SAXException
-    inline bool comment(const OUString& rComment) throw( SAXException );
+    inline bool comment(const OUString& rComment);
 
     /// @throws SAXException
-    inline void clearBuffer() throw( SAXException );
+    inline void clearBuffer();
 };
 
 const bool g_bValidCharsBelow32[32] =
@@ -205,7 +205,7 @@ inline bool IsInvalidChar(const sal_Unicode aChar)
 * write through to the output stream
 *
 *****/
-inline sal_uInt32 SaxWriterHelper::writeSequence() throw( SAXException )
+inline sal_uInt32 SaxWriterHelper::writeSequence()
 {
     try
     {
@@ -225,7 +225,7 @@ inline sal_uInt32 SaxWriterHelper::writeSequence() throw( SAXException )
 }
 
 inline void SaxWriterHelper::AddBytes(sal_Int8* pTarget, sal_uInt32& rPos,
-                const sal_Int8* pBytes, sal_uInt32 nBytesCount) throw( SAXException )
+                const sal_Int8* pBytes, sal_uInt32 nBytesCount)
 {
     OSL_ENSURE((rPos + nBytesCount) > SEQUENCESIZE, "wrong use of AddBytesMethod");
     sal_uInt32 nCount(SEQUENCESIZE - rPos);
@@ -256,7 +256,7 @@ inline bool SaxWriterHelper::convertToXML( const sal_Unicode * pStr,
                         bool bDoNormalization,
                         bool bNormalizeWhitespace,
                         sal_Int8 *pTarget,
-                        sal_uInt32& rPos ) throw( SAXException )
+                        sal_uInt32& rPos )
 {
     bool bRet(true);
     sal_uInt32 nSurrogate = 0;
@@ -480,7 +480,7 @@ inline bool SaxWriterHelper::convertToXML( const sal_Unicode * pStr,
     return bRet;
 }
 
-inline void SaxWriterHelper::FinishStartElement() throw( SAXException )
+inline void SaxWriterHelper::FinishStartElement()
 {
     if (!m_bStartElementFinished)
     {
@@ -492,7 +492,7 @@ inline void SaxWriterHelper::FinishStartElement() throw( SAXException )
     }
 }
 
-inline void SaxWriterHelper::insertIndentation(sal_uInt32 m_nLevel) throw( SAXException )
+inline void SaxWriterHelper::insertIndentation(sal_uInt32 m_nLevel)
 {
     FinishStartElement();
     if (m_nLevel > 0)
@@ -532,7 +532,7 @@ inline void SaxWriterHelper::insertIndentation(sal_uInt32 m_nLevel) throw( SAXEx
 
 inline bool SaxWriterHelper::writeString( const OUString& rWriteOutString,
                         bool bDoNormalization,
-                        bool bNormalizeWhitespace ) throw( SAXException )
+                        bool bNormalizeWhitespace )
 {
     FinishStartElement();
     return convertToXML(rWriteOutString.getStr(),
@@ -543,7 +543,7 @@ inline bool SaxWriterHelper::writeString( const OUString& rWriteOutString,
                     nCurrentPos);
 }
 
-inline void SaxWriterHelper::startDocument() throw( SAXException )
+inline void SaxWriterHelper::startDocument()
 {
     const char pc[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
     const int nLen = strlen( pc );
@@ -565,7 +565,7 @@ inline void SaxWriterHelper::startDocument() throw( SAXException )
         nCurrentPos = writeSequence();
 }
 
-inline SaxInvalidCharacterError SaxWriterHelper::startElement(const OUString& rName, const Reference< XAttributeList >& xAttribs) throw( SAXException )
+inline SaxInvalidCharacterError SaxWriterHelper::startElement(const OUString& rName, const Reference< XAttributeList >& xAttribs)
 {
     FinishStartElement();
 
@@ -625,7 +625,7 @@ inline SaxInvalidCharacterError SaxWriterHelper::startElement(const OUString& rN
     return eRet;
 }
 
-inline bool SaxWriterHelper::FinishEmptyElement() throw( SAXException )
+inline bool SaxWriterHelper::FinishEmptyElement()
 {
     if (m_bStartElementFinished)
         return false;
@@ -644,7 +644,7 @@ inline bool SaxWriterHelper::FinishEmptyElement() throw( SAXException )
     return true;
 }
 
-inline bool SaxWriterHelper::endElement(const OUString& rName) throw( SAXException )
+inline bool SaxWriterHelper::endElement(const OUString& rName)
 {
     FinishStartElement();
 
@@ -667,7 +667,7 @@ inline bool SaxWriterHelper::endElement(const OUString& rName) throw( SAXExcepti
     return bRet;
 }
 
-inline void SaxWriterHelper::endDocument() throw( SAXException )
+inline void SaxWriterHelper::endDocument()
 {
     if (nCurrentPos > 0)
     {
@@ -677,7 +677,7 @@ inline void SaxWriterHelper::endDocument() throw( SAXException )
     }
 }
 
-inline void SaxWriterHelper::clearBuffer() throw( SAXException )
+inline void SaxWriterHelper::clearBuffer()
 {
     FinishStartElement();
     if (nCurrentPos > 0)
@@ -690,7 +690,7 @@ inline void SaxWriterHelper::clearBuffer() throw( SAXException )
     }
 }
 
-inline bool SaxWriterHelper::processingInstruction(const OUString& rTarget, const OUString& rData) throw( SAXException )
+inline bool SaxWriterHelper::processingInstruction(const OUString& rTarget, const OUString& rData)
 {
     FinishStartElement();
     mp_Sequence[nCurrentPos] = '<';
@@ -724,7 +724,7 @@ inline bool SaxWriterHelper::processingInstruction(const OUString& rTarget, cons
     return bRet;
 }
 
-inline void SaxWriterHelper::startCDATA() throw( SAXException )
+inline void SaxWriterHelper::startCDATA()
 {
     FinishStartElement();
     if ((nCurrentPos + 9) <= SEQUENCESIZE)
@@ -738,7 +738,7 @@ inline void SaxWriterHelper::startCDATA() throw( SAXException )
         nCurrentPos = writeSequence();
 }
 
-inline void SaxWriterHelper::endCDATA() throw( SAXException )
+inline void SaxWriterHelper::endCDATA()
 {
     FinishStartElement();
     if ((nCurrentPos + 3) <= SEQUENCESIZE)
@@ -752,7 +752,7 @@ inline void SaxWriterHelper::endCDATA() throw( SAXException )
         nCurrentPos = writeSequence();
 }
 
-inline bool SaxWriterHelper::comment(const OUString& rComment) throw( SAXException )
+inline bool SaxWriterHelper::comment(const OUString& rComment)
 {
     FinishStartElement();
     mp_Sequence[nCurrentPos] = '<';
@@ -902,8 +902,7 @@ public:
     }
 
 public: // XActiveDataSource
-    virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream)
-        throw (RuntimeException, std::exception) override
+    virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream) override
     {
         try
         {
@@ -927,51 +926,39 @@ public: // XActiveDataSource
                    e.WrappedException);
         }
     }
-    virtual Reference< XOutputStream >  SAL_CALL getOutputStream()
-        throw(RuntimeException, std::exception) override
+    virtual Reference< XOutputStream >  SAL_CALL getOutputStream() override
     {
         return m_out;
     }
 
 public: // XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw(SAXException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
 
-    virtual void SAL_CALL endDocument()
-        throw(SAXException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() override;
 
     virtual void SAL_CALL startElement(const OUString& aName,
-                                       const Reference< XAttributeList > & xAttribs)
-        throw (SAXException, RuntimeException, std::exception) override;
+                                       const Reference< XAttributeList > & xAttribs) override;
 
-    virtual void SAL_CALL endElement(const OUString& aName)
-        throw(SAXException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL endElement(const OUString& aName) override;
 
-    virtual void SAL_CALL characters(const OUString& aChars)
-        throw(SAXException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters(const OUString& aChars) override;
 
-    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
-        throw(SAXException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
     virtual void SAL_CALL processingInstruction(const OUString& aTarget,
-                                                const OUString& aData)
-        throw(SAXException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator(const Reference< XLocator > & xLocator)
-        throw(SAXException, RuntimeException, std::exception) override;
+                                                const OUString& aData) override;
+    virtual void SAL_CALL setDocumentLocator(const Reference< XLocator > & xLocator) override;
 
 public: // XExtendedDocumentHandler
-    virtual void SAL_CALL startCDATA() throw(SAXException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL endCDATA() throw(SAXException,RuntimeException, std::exception) override;
-    virtual void SAL_CALL comment(const OUString& sComment)
-        throw(SAXException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL unknown(const OUString& sString)
-        throw(SAXException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL allowLineBreak()
-        throw(SAXException,RuntimeException, std::exception) override;
+    virtual void SAL_CALL startCDATA() override;
+    virtual void SAL_CALL endCDATA() override;
+    virtual void SAL_CALL comment(const OUString& sComment) override;
+    virtual void SAL_CALL unknown(const OUString& sString) override;
+    virtual void SAL_CALL allowLineBreak() override;
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw(std::exception) override;
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames() throw(std::exception) override;
-    sal_Bool                    SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
+    OUString                     SAL_CALL getImplementationName() override;
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames() override;
+    sal_Bool                    SAL_CALL supportsService(const OUString& ServiceName) override;
 
 private:
     sal_Int32 getIndentPrefixLength( sal_Int32 nFirstLineBreakOccurrence ) throw();
@@ -1008,25 +995,25 @@ inline bool isFirstCharWhitespace( const sal_Unicode *p ) throw()
 }
 
 // XServiceInfo
-OUString SAXWriter::getImplementationName() throw(std::exception)
+OUString SAXWriter::getImplementationName()
 {
     return OUString("com.sun.star.extensions.xml.sax.Writer");
 }
 
 // XServiceInfo
-sal_Bool SAXWriter::supportsService(const OUString& ServiceName) throw(std::exception)
+sal_Bool SAXWriter::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > SAXWriter::getSupportedServiceNames() throw (std::exception)
+Sequence< OUString > SAXWriter::getSupportedServiceNames()
 {
     Sequence<OUString> seq { "com.sun.star.xml.sax.Writer" };
     return seq;
 }
 
-void SAXWriter::startDocument()                     throw(SAXException, RuntimeException, std::exception )
+void SAXWriter::startDocument()
 {
     if( m_bDocStarted || ! m_out.is() || !m_pSaxWriterHelper ) {
         throw SAXException();
@@ -1036,7 +1023,7 @@ void SAXWriter::startDocument()                     throw(SAXException, RuntimeE
 }
 
 
-void SAXWriter::endDocument()                   throw(SAXException, RuntimeException, std::exception)
+void SAXWriter::endDocument()
 {
     if( ! m_bDocStarted )
     {
@@ -1067,7 +1054,6 @@ void SAXWriter::endDocument()                   throw(SAXException, RuntimeExcep
 
 
 void SAXWriter::startElement(const OUString& aName, const Reference< XAttributeList >& xAttribs)
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( ! m_bDocStarted )
     {
@@ -1135,7 +1121,7 @@ void SAXWriter::startElement(const OUString& aName, const Reference< XAttributeL
     }
 }
 
-void SAXWriter::endElement(const OUString& aName)   throw (SAXException, RuntimeException, std::exception)
+void SAXWriter::endElement(const OUString& aName)
 {
     if( ! m_bDocStarted ) {
         throw SAXException ();
@@ -1179,7 +1165,7 @@ void SAXWriter::endElement(const OUString& aName)   throw (SAXException, Runtime
     }
 }
 
-void SAXWriter::characters(const OUString& aChars)  throw(SAXException, RuntimeException, std::exception)
+void SAXWriter::characters(const OUString& aChars)
 {
     if( ! m_bDocStarted )
     {
@@ -1232,7 +1218,7 @@ void SAXWriter::characters(const OUString& aChars)  throw(SAXException, RuntimeE
 }
 
 
-void SAXWriter::ignorableWhitespace(const OUString&) throw(SAXException, RuntimeException, std::exception)
+void SAXWriter::ignorableWhitespace(const OUString&)
 {
     if( ! m_bDocStarted )
     {
@@ -1243,7 +1229,6 @@ void SAXWriter::ignorableWhitespace(const OUString&) throw(SAXException, Runtime
 }
 
 void SAXWriter::processingInstruction(const OUString& aTarget, const OUString& aData)
-    throw (SAXException, RuntimeException, std::exception)
 {
     if( ! m_bDocStarted || m_bIsCDATA )
     {
@@ -1278,12 +1263,11 @@ void SAXWriter::processingInstruction(const OUString& aTarget, const OUString& a
 
 
 void SAXWriter::setDocumentLocator(const Reference< XLocator >&)
-        throw (SAXException, RuntimeException, std::exception)
 {
 
 }
 
-void SAXWriter::startCDATA() throw(SAXException, RuntimeException, std::exception)
+void SAXWriter::startCDATA()
 {
     if( ! m_bDocStarted || m_bIsCDATA)
     {
@@ -1300,7 +1284,7 @@ void SAXWriter::startCDATA() throw(SAXException, RuntimeException, std::exceptio
     m_bIsCDATA = true;
 }
 
-void SAXWriter::endCDATA() throw (SAXException,RuntimeException, std::exception)
+void SAXWriter::endCDATA()
 {
     if( ! m_bDocStarted || ! m_bIsCDATA)
     {
@@ -1320,7 +1304,7 @@ void SAXWriter::endCDATA() throw (SAXException,RuntimeException, std::exception)
 }
 
 
-void SAXWriter::comment(const OUString& sComment) throw(SAXException, RuntimeException, std::exception)
+void SAXWriter::comment(const OUString& sComment)
 {
     if( ! m_bDocStarted || m_bIsCDATA )
     {
@@ -1349,7 +1333,7 @@ void SAXWriter::comment(const OUString& sComment) throw(SAXException, RuntimeExc
 }
 
 
-void SAXWriter::allowLineBreak( )   throw ( SAXException , RuntimeException, std::exception)
+void SAXWriter::allowLineBreak( )
 {
     if( ! m_bDocStarted || m_bAllowLineBreak ) {
         throw SAXException();
@@ -1358,7 +1342,7 @@ void SAXWriter::allowLineBreak( )   throw ( SAXException , RuntimeException, std
      m_bAllowLineBreak = true;
 }
 
-void SAXWriter::unknown(const OUString& sString) throw (SAXException, RuntimeException, std::exception)
+void SAXWriter::unknown(const OUString& sString)
 {
 
     if( ! m_bDocStarted )
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 361e02fc99b0..d19f56ea0603 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::io;
 namespace sax_expatwrap {
 
 sal_Int32 XMLFile2UTFConverter::readAndConvert( Sequence<sal_Int8> &seq , sal_Int32 nMaxToRead )
-    throw ( IOException, NotConnectedException , BufferSizeExceededException , RuntimeException )
 {
     if( ! m_in.is() ) {
         throw NotConnectedException();
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 3428297a933a..bf64bffe77b0 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -210,25 +210,25 @@ public:
     /// @throws css::xml::sax::SAXException
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
-    void parseStream( const css::xml::sax::InputSource& aInputSource ) throw (css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception);
+    void parseStream( const css::xml::sax::InputSource& aInputSource );
     /// @throws css::uno::RuntimeException
-    void setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) throw (css::uno::RuntimeException);
+    void setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler );
     /// @throws css::uno::RuntimeException
-    void setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) throw (css::uno::RuntimeException);
+    void setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler );
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    void registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken );
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    OUString getNamespaceURL( const OUString& rPrefix ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    OUString getNamespaceURL( const OUString& rPrefix );
     /// @throws css::uno::RuntimeException
-    void setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) throw (css::uno::RuntimeException);
+    void setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler );
     /// @throws css::uno::RuntimeException
-    void setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) throw (css::uno::RuntimeException);
+    void setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver );
     /// @throws css::uno::RuntimeException
-    void setNamespaceHandler( const css::uno::Reference< css::xml::sax::XFastNamespaceHandler >& Handler) throw (css::uno::RuntimeException);
+    void setNamespaceHandler( const css::uno::Reference< css::xml::sax::XFastNamespaceHandler >& Handler);
     /// @throws css::uno::RuntimeException
-    void setLocale( const css::lang::Locale& rLocale ) throw (css::uno::RuntimeException);
+    void setLocale( const css::lang::Locale& rLocale );
 
     // called by the C callbacks of the expat parser
     void callbackStartElement( const xmlChar *localName , const xmlChar* prefix, const xmlChar* URI,
@@ -257,9 +257,9 @@ private:
 
     sal_Int32 GetToken( const xmlChar* pName, sal_Int32 nameLen );
     /// @throws css::xml::sax::SAXException
-    sal_Int32 GetTokenWithPrefix( const xmlChar* pPrefix, int prefixLen, const xmlChar* pName, int nameLen ) throw (css::xml::sax::SAXException);
+    sal_Int32 GetTokenWithPrefix( const xmlChar* pPrefix, int prefixLen, const xmlChar* pName, int nameLen );
     /// @throws css::xml::sax::SAXException
-    OUString GetNamespaceURL( const OString& rPrefix ) throw (css::xml::sax::SAXException);
+    OUString GetNamespaceURL( const OString& rPrefix );
     sal_Int32 GetNamespaceToken( const OUString& rNamespaceURL );
     sal_Int32 GetTokenWithContextNamespace( sal_Int32 nNamespaceToken, const xmlChar* pName, int nNameLen );
     void DefineNamespace( const OString& rPrefix, const OUString& namespaceURL );
@@ -352,37 +352,37 @@ public:
 
     void dispose() { mpParser = nullptr; }
     /// @throws RuntimeException
-    void checkDispose() throw (RuntimeException) { if( !mpParser ) throw DisposedException(); }
+    void checkDispose() { if( !mpParser ) throw DisposedException(); }
 
     //XLocator
-    virtual sal_Int32 SAL_CALL getColumnNumber() throw (RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getLineNumber() throw (RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPublicId() throw (RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSystemId() throw (RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getColumnNumber() override;
+    virtual sal_Int32 SAL_CALL getLineNumber() override;
+    virtual OUString SAL_CALL getPublicId() override;
+    virtual OUString SAL_CALL getSystemId() override;
 
 private:
     FastSaxParserImpl *mpParser;
 };
 
-sal_Int32 SAL_CALL FastLocatorImpl::getColumnNumber() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL FastLocatorImpl::getColumnNumber()
 {
     checkDispose();
     return xmlSAX2GetColumnNumber( mpParser->getEntity().mpParser );
 }
 
-sal_Int32 SAL_CALL FastLocatorImpl::getLineNumber() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL FastLocatorImpl::getLineNumber()
 {
     checkDispose();
     return xmlSAX2GetLineNumber( mpParser->getEntity().mpParser );
 }
 
-OUString SAL_CALL FastLocatorImpl::getPublicId() throw (RuntimeException, std::exception)
+OUString SAL_CALL FastLocatorImpl::getPublicId()
 {
     checkDispose();
     return mpParser->getEntity().maStructSource.sPublicId;
 }
 
-OUString SAL_CALL FastLocatorImpl::getSystemId() throw (RuntimeException, std::exception)
+OUString SAL_CALL FastLocatorImpl::getSystemId()
 {
     checkDispose();
     return mpParser->getEntity().maStructSource.sSystemId;
@@ -663,7 +663,7 @@ sal_Int32 FastSaxParserImpl::GetToken( const xmlChar* pName, sal_Int32 nameLen /
                                                     XML_CAST( pName ), nameLen ); // uses utf-8
 }
 
-sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const xmlChar* pPrefix, int nPrefixLen, const xmlChar* pName, int nNameLen ) throw (SAXException)
+sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const xmlChar* pPrefix, int nPrefixLen, const xmlChar* pName, int nNameLen )
 {
     sal_Int32 nNamespaceToken = FastToken::DONTKNOW;
 
@@ -706,7 +706,7 @@ sal_Int32 FastSaxParserImpl::GetNamespaceToken( const OUString& rNamespaceURL )
         return FastToken::DONTKNOW;
 }
 
-OUString FastSaxParserImpl::GetNamespaceURL( const OString& rPrefix ) throw (SAXException)
+OUString FastSaxParserImpl::GetNamespaceURL( const OString& rPrefix )
 {
     Entity& rEntity = getEntity();
     if( !rEntity.maNamespaceCount.empty() )
@@ -740,7 +740,6 @@ sal_Int32 FastSaxParserImpl::GetTokenWithContextNamespace( sal_Int32 nNamespaceT
 *
 ****************/
 void FastSaxParserImpl::parseStream(const InputSource& maStructSource)
-    throw (SAXException, IOException, RuntimeException, std::exception)
 {
     xmlInitParser();
 
@@ -858,18 +857,18 @@ void FastSaxParserImpl::parseStream(const InputSource& maStructSource)
     popEntity();
 }
 
-void FastSaxParserImpl::setFastDocumentHandler( const Reference< XFastDocumentHandler >& Handler ) throw (RuntimeException)
+void FastSaxParserImpl::setFastDocumentHandler( const Reference< XFastDocumentHandler >& Handler )
 {
     maData.mxDocumentHandler = Handler;
 }
 
-void FastSaxParserImpl::setTokenHandler( const Reference< XFastTokenHandler >& xHandler ) throw (RuntimeException)
+void FastSaxParserImpl::setTokenHandler( const Reference< XFastTokenHandler >& xHandler )
 {
     maData.mxTokenHandler = xHandler;
     maData.mpTokenHandler = dynamic_cast< FastTokenHandlerBase *>( xHandler.get() );
 }
 
-void FastSaxParserImpl::registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (IllegalArgumentException, RuntimeException)
+void FastSaxParserImpl::registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken )
 {
     if( NamespaceToken >= FastToken::NAMESPACE )
     {
@@ -882,7 +881,7 @@ void FastSaxParserImpl::registerNamespace( const OUString& NamespaceURL, sal_Int
     throw IllegalArgumentException();
 }
 
-OUString FastSaxParserImpl::getNamespaceURL( const OUString& rPrefix ) throw(IllegalArgumentException, RuntimeException)
+OUString FastSaxParserImpl::getNamespaceURL( const OUString& rPrefix )
 {
     try
     {
@@ -894,22 +893,22 @@ OUString FastSaxParserImpl::getNamespaceURL( const OUString& rPrefix ) throw(Ill
     throw IllegalArgumentException();
 }
 
-void FastSaxParserImpl::setErrorHandler(const Reference< XErrorHandler > & Handler) throw (RuntimeException)
+void FastSaxParserImpl::setErrorHandler(const Reference< XErrorHandler > & Handler)
 {
     maData.mxErrorHandler = Handler;
 }
 
-void FastSaxParserImpl::setEntityResolver(const Reference < XEntityResolver > & Resolver) throw (RuntimeException)
+void FastSaxParserImpl::setEntityResolver(const Reference < XEntityResolver > & Resolver)
 {
     maData.mxEntityResolver = Resolver;
 }
 
-void FastSaxParserImpl::setLocale( const lang::Locale & Locale ) throw (RuntimeException)
+void FastSaxParserImpl::setLocale( const lang::Locale & Locale )
 {
     maData.maLocale = Locale;
 }
 
-void FastSaxParserImpl::setNamespaceHandler( const Reference< XFastNamespaceHandler >& Handler ) throw (RuntimeException)
+void FastSaxParserImpl::setNamespaceHandler( const Reference< XFastNamespaceHandler >& Handler )
 {
     maData.mxNamespaceHandler = Handler;
 }
@@ -1366,7 +1365,6 @@ FastSaxParser::~FastSaxParser()
 
 void SAL_CALL
 FastSaxParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments)
-    throw (css::uno::RuntimeException, css::uno::Exception, std::exception)
 {
     if (rArguments.getLength())
     {
@@ -1383,74 +1381,61 @@ FastSaxParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments)
 }
 
 void FastSaxParser::parseStream( const xml::sax::InputSource& aInputSource )
-    throw (xml::sax::SAXException, io::IOException,
-           uno::RuntimeException, std::exception)
 {
     mpImpl->parseStream(aInputSource);
 }
 
 void FastSaxParser::setFastDocumentHandler( const uno::Reference<xml::sax::XFastDocumentHandler>& Handler )
-    throw (uno::RuntimeException, std::exception)
 {
     mpImpl->setFastDocumentHandler(Handler);
 }
 
 void FastSaxParser::setTokenHandler( const uno::Reference<xml::sax::XFastTokenHandler>& Handler )
-    throw (uno::RuntimeException, std::exception)
 {
     mpImpl->setTokenHandler(Handler);
 }
 
 void FastSaxParser::registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     mpImpl->registerNamespace(NamespaceURL, NamespaceToken);
 }
 
 OUString FastSaxParser::getNamespaceURL( const OUString& rPrefix )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     return mpImpl->getNamespaceURL(rPrefix);
 }
 
 void FastSaxParser::setErrorHandler( const uno::Reference< xml::sax::XErrorHandler >& Handler )
-    throw (uno::RuntimeException, std::exception)
 {
     mpImpl->setErrorHandler(Handler);
 }
 
 void FastSaxParser::setEntityResolver( const uno::Reference< xml::sax::XEntityResolver >& Resolver )
-    throw (uno::RuntimeException, std::exception)
 {
     mpImpl->setEntityResolver(Resolver);
 }
 
 void FastSaxParser::setLocale( const lang::Locale& rLocale )
-    throw (uno::RuntimeException, std::exception)
 {
     mpImpl->setLocale(rLocale);
 }
 
 void FastSaxParser::setNamespaceHandler( const uno::Reference< css::xml::sax::XFastNamespaceHandler >& Handler)
-    throw (uno::RuntimeException, std::exception)
 {
     mpImpl->setNamespaceHandler(Handler);
 }
 
 OUString FastSaxParser::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.extensions.xml.sax.FastParser");
 }
 
 sal_Bool FastSaxParser::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence<OUString> FastSaxParser::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     Sequence<OUString> seq { "com.sun.star.xml.sax.FastParser" };
     return seq;
diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx
index dbcc03ff97b4..2c70d5327da6 100644
--- a/sax/source/fastparser/legacyfastparser.cxx
+++ b/sax/source/fastparser/legacyfastparser.cxx
@@ -58,10 +58,8 @@ public:
     void addNSDeclAttributes( rtl::Reference < comphelper::AttributeList >& rAttrList );
 
     //XFastNamespaceHandler
-    virtual void SAL_CALL registerNamespace( const OUString& rNamespacePrefix, const OUString& rNamespaceURI )
-                            throw (RuntimeException, exception) override;
-    virtual OUString SAL_CALL getNamespaceURI( const OUString& rNamespacePrefix )
-                            throw (RuntimeException, exception) override;
+    virtual void SAL_CALL registerNamespace( const OUString& rNamespacePrefix, const OUString& rNamespaceURI ) override;
+    virtual OUString SAL_CALL getNamespaceURI( const OUString& rNamespacePrefix ) override;
 };
 
 NamespaceHandler::NamespaceHandler()
@@ -85,14 +83,12 @@ void NamespaceHandler::addNSDeclAttributes( rtl::Reference < comphelper::Attribu
 }
 
 void NamespaceHandler::registerNamespace( const OUString& rNamespacePrefix, const OUString& rNamespaceURI )
-                            throw (RuntimeException, exception)
 {
     m_aNamespaceDefines.push_back( o3tl::make_unique<NamespaceDefine>(
                                     rNamespacePrefix, rNamespaceURI) );
 }
 
 OUString NamespaceHandler::getNamespaceURI( const OUString&/* rNamespacePrefix */ )
-                            throw (RuntimeException, exception)
 {
     return OUString();
 }
@@ -105,27 +101,20 @@ public:
     SaxLegacyFastParser();
 
 // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments)
-        throw (RuntimeException, Exception, exception) override;
+    virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments) override;
 
 // The SAX-Parser-Interface
-    virtual void SAL_CALL parseStream(  const InputSource& structSource)
-        throw ( SAXException, IOException, RuntimeException, exception) override;
-    virtual void SAL_CALL setDocumentHandler(const Reference< XDocumentHandler > & xHandler)
-        throw (RuntimeException, exception) override;
-    virtual void SAL_CALL setErrorHandler(const Reference< XErrorHandler > & xHandler)
-        throw (RuntimeException, exception) override;
-    virtual void SAL_CALL setDTDHandler(const Reference < XDTDHandler > & xHandler)
-        throw (RuntimeException, exception) override;
-    virtual void SAL_CALL setEntityResolver(const Reference<  XEntityResolver >& xResolver)
-        throw (RuntimeException, exception) override;
-    virtual void SAL_CALL setLocale( const Locale &locale )
-        throw (RuntimeException, exception) override;
+    virtual void SAL_CALL parseStream(  const InputSource& structSource) override;
+    virtual void SAL_CALL setDocumentHandler(const Reference< XDocumentHandler > & xHandler) override;
+    virtual void SAL_CALL setErrorHandler(const Reference< XErrorHandler > & xHandler) override;
+    virtual void SAL_CALL setDTDHandler(const Reference < XDTDHandler > & xHandler) override;
+    virtual void SAL_CALL setEntityResolver(const Reference<  XEntityResolver >& xResolver) override;
+    virtual void SAL_CALL setLocale( const Locale &locale ) override;
 
 // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw (exception) override;
-    Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
 
 private:
     Reference< XFastParser > m_xParser;
@@ -150,18 +139,18 @@ public:
                              Reference< XFastTokenHandler > const & xTokenHandler);
 
     // XFastDocumentHandler
-    virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException, exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
+    virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) override;
 
     // XFastContextHandler
-    virtual void SAL_CALL startFastElement( sal_Int32 nElement, const Reference< XFastAttributeList >& Attribs ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (SAXException, RuntimeException, exception) override;
-    virtual Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const Reference< XFastAttributeList >& Attribs ) throw (SAXException, RuntimeException, exception) override;
-    virtual Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs ) throw (SAXException, RuntimeException, exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException, exception) override;
+    virtual void SAL_CALL startFastElement( sal_Int32 nElement, const Reference< XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL endFastElement( sal_Int32 Element ) override;
+    virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) override;
+    virtual Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const Reference< XFastAttributeList >& Attribs ) override;
+    virtual Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
 
 };
 
@@ -194,35 +183,30 @@ CallbackDocumentHandler::CallbackDocumentHandler( Reference< XDocumentHandler >
 }
 
 void SAL_CALL CallbackDocumentHandler::startDocument()
-        throw (SAXException, RuntimeException, exception)
 {
     if ( m_xDocumentHandler.is() )
         m_xDocumentHandler->startDocument();
 }
 
 void SAL_CALL CallbackDocumentHandler::endDocument()
-        throw (SAXException, RuntimeException, exception)
 {
     if ( m_xDocumentHandler.is() )
         m_xDocumentHandler->endDocument();
 }
 
 void SAL_CALL CallbackDocumentHandler::setDocumentLocator( const Reference< XLocator >& xLocator )
-        throw (SAXException, RuntimeException, exception)
 {
     if ( m_xDocumentHandler.is() )
         m_xDocumentHandler->setDocumentLocator( xLocator );
 }
 
 void SAL_CALL CallbackDocumentHandler::startFastElement( sal_Int32 nElement , const Reference< XFastAttributeList >& Attribs  )
-        throw (SAXException, RuntimeException, exception)
 {
     startUnknownElement( CallbackDocumentHandler::getNamespacePrefixFromToken( nElement ),
                          CallbackDocumentHandler::getNameFromToken( nElement ), Attribs );
 }
 
 void SAL_CALL CallbackDocumentHandler::startUnknownElement( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs  )
-        throw (SAXException, RuntimeException, exception)
 {
     if ( m_xDocumentHandler.is() )
     {
@@ -265,7 +249,6 @@ void SAL_CALL CallbackDocumentHandler::startUnknownElement( const OUString& Name
 }
 
 void SAL_CALL CallbackDocumentHandler::endFastElement( sal_Int32 nElement )
-        throw (SAXException, RuntimeException, exception)
 {
     endUnknownElement( CallbackDocumentHandler::getNamespacePrefixFromToken( nElement ),
                        CallbackDocumentHandler::getNameFromToken( nElement ) );
@@ -273,7 +256,6 @@ void SAL_CALL CallbackDocumentHandler::endFastElement( sal_Int32 nElement )
 
 
 void SAL_CALL CallbackDocumentHandler::endUnknownElement( const OUString& Namespace, const OUString& Name )
-        throw (SAXException, RuntimeException, exception)
 {
     if ( m_xDocumentHandler.is() )
     {
@@ -287,20 +269,17 @@ void SAL_CALL CallbackDocumentHandler::endUnknownElement( const OUString& Namesp
 }
 
 Reference< XFastContextHandler > SAL_CALL CallbackDocumentHandler::createFastChildContext( sal_Int32/* nElement */, const Reference< XFastAttributeList >&/* Attribs */ )
-        throw (SAXException, RuntimeException, exception)
 {
     return this;
 }
 
 
 Reference< XFastContextHandler > SAL_CALL CallbackDocumentHandler::createUnknownChildContext( const OUString&/* Namespace */, const OUString&/* Name */, const Reference< XFastAttributeList >&/* Attribs */ )
-        throw (SAXException, RuntimeException, exception)
 {
     return this;
 }
 
 void SAL_CALL CallbackDocumentHandler::characters( const OUString& aChars )
-        throw (SAXException, RuntimeException, exception)
 {
     if ( m_xDocumentHandler.is() )
         m_xDocumentHandler->characters( aChars );
@@ -314,7 +293,6 @@ SaxLegacyFastParser::SaxLegacyFastParser( ) : m_aNamespaceHandler( new Namespace
 }
 
 void SAL_CALL SaxLegacyFastParser::initialize(Sequence< Any > const& rArguments )
-    throw (RuntimeException, Exception, exception)
 {
     if (rArguments.getLength())
     {
@@ -343,9 +321,6 @@ void SAL_CALL SaxLegacyFastParser::initialize(Sequence< Any > const& rArguments
 }
 
 void SaxLegacyFastParser::parseStream( const InputSource& structSource )
-        throw ( SAXException,
-                IOException,
-                RuntimeException, exception)
 {
     m_xParser->setFastDocumentHandler( new CallbackDocumentHandler( m_xDocumentHandler.get(),
                                        m_aNamespaceHandler.get(), m_xTokenHandler.get() ) );
@@ -354,46 +329,41 @@ void SaxLegacyFastParser::parseStream( const InputSource& structSource )
 }
 
 void SaxLegacyFastParser::setDocumentHandler( const Reference< XDocumentHandler > & xHandler )
-        throw (RuntimeException, exception)
 {
     m_xDocumentHandler = xHandler;
 }
 
 void SaxLegacyFastParser::setErrorHandler( const Reference< XErrorHandler > & xHandler )
-        throw (RuntimeException, exception)
 {
     m_xParser->setErrorHandler( xHandler );
 }
 
 void SaxLegacyFastParser::setDTDHandler( const Reference < XDTDHandler > &/* xHandler */ )
-        throw (RuntimeException, exception)
 {
 
 }
 
 void SaxLegacyFastParser::setEntityResolver( const Reference<  XEntityResolver >& xResolver )
-        throw (RuntimeException, exception)
 {
     m_xParser->setEntityResolver( xResolver );
 }
 
 void SaxLegacyFastParser::setLocale( const Locale &locale )
-        throw (RuntimeException, exception)
 {
     m_xParser->setLocale( locale );
 }
 
-OUString SaxLegacyFastParser::getImplementationName() throw (exception)
+OUString SaxLegacyFastParser::getImplementationName()
 {
     return OUString("com.sun.star.comp.extensions.xml.sax.LegacyFastParser");
 }
 
-sal_Bool SaxLegacyFastParser::supportsService(const OUString& ServiceName) throw (exception)
+sal_Bool SaxLegacyFastParser::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SaxLegacyFastParser::getSupportedServiceNames() throw (exception)
+Sequence< OUString > SaxLegacyFastParser::getSupportedServiceNames()
 {
     Sequence<OUString> seq { "com.sun.star.xml.sax.LegacyFastParser" };
     return seq;
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index e9ae452a7aca..01a50f7d39d9 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -118,7 +118,7 @@ void FastAttributeList::addUnknown( const OString& rName, const OString& value )
 }
 
 // XFastAttributeList
-sal_Bool FastAttributeList::hasAttribute( ::sal_Int32 Token ) throw (RuntimeException, std::exception)
+sal_Bool FastAttributeList::hasAttribute( ::sal_Int32 Token )
 {
     for (sal_Int32 i : maAttributeTokens)
         if (i == Token)
@@ -127,7 +127,7 @@ sal_Bool FastAttributeList::hasAttribute( ::sal_Int32 Token ) throw (RuntimeExce
     return false;
 }
 
-sal_Int32 FastAttributeList::getValueToken( ::sal_Int32 Token ) throw (SAXException, RuntimeException, std::exception)
+sal_Int32 FastAttributeList::getValueToken( ::sal_Int32 Token )
 {
     for (size_t i = 0; i < maAttributeTokens.size(); ++i)
         if (maAttributeTokens[i] == Token)
@@ -139,7 +139,7 @@ sal_Int32 FastAttributeList::getValueToken( ::sal_Int32 Token ) throw (SAXExcept
     throw SAXException();
 }
 
-sal_Int32 FastAttributeList::getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) throw (RuntimeException, std::exception)
+sal_Int32 FastAttributeList::getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default )
 {
     for (size_t i = 0; i < maAttributeTokens.size(); ++i)
         if (maAttributeTokens[i] == Token)
@@ -191,7 +191,7 @@ bool FastAttributeList::getAsChar( sal_Int32 nToken, const char*& rPos ) const
     return false;
 }
 
-OUString FastAttributeList::getValue( ::sal_Int32 Token ) throw (SAXException, RuntimeException, std::exception)
+OUString FastAttributeList::getValue( ::sal_Int32 Token )
 {
     for (size_t i = 0; i < maAttributeTokens.size(); ++i)
         if (maAttributeTokens[i] == Token)
@@ -200,7 +200,7 @@ OUString FastAttributeList::getValue( ::sal_Int32 Token ) throw (SAXException, R
     throw SAXException();
 }
 
-OUString FastAttributeList::getOptionalValue( ::sal_Int32 Token ) throw (RuntimeException, std::exception)
+OUString FastAttributeList::getOptionalValue( ::sal_Int32 Token )
 {
     for (size_t i = 0; i < maAttributeTokens.size(); ++i)
         if (maAttributeTokens[i] == Token)
@@ -208,7 +208,7 @@ OUString FastAttributeList::getOptionalValue( ::sal_Int32 Token ) throw (Runtime
 
     return OUString();
 }
-Sequence< Attribute > FastAttributeList::getUnknownAttributes(  ) throw (RuntimeException, std::exception)
+Sequence< Attribute > FastAttributeList::getUnknownAttributes(  )
 {
     Sequence< Attribute > aSeq( maUnknownAttributes.size() );
     Attribute* pAttr = aSeq.getArray();
@@ -216,7 +216,7 @@ Sequence< Attribute > FastAttributeList::getUnknownAttributes(  ) throw (Runtime
         (*attrIter).FillAttribute( pAttr++ );
     return aSeq;
 }
-Sequence< FastAttribute > FastAttributeList::getFastAttributes(  ) throw (RuntimeException, std::exception)
+Sequence< FastAttribute > FastAttributeList::getFastAttributes(  )
 {
     Sequence< FastAttribute > aSeq( maAttributeTokens.size() );
     FastAttribute* pAttr = aSeq.getArray();
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index 7d4c737fde66..43d338072153 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -52,90 +52,70 @@ public:
             ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos);
     virtual ~ScAccessibleFilterMenu() override;
 
-    virtual bool SAL_CALL isVisible()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual bool SAL_CALL isVisible() override;
 
     /// XAccessibleComponent
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
-        SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )
-            throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
-    virtual void SAL_CALL grabFocus()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() override;
 
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
 
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     /// XAccessibleContext
 
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-            throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
 
     virtual css::uno::Reference<
         css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-            throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     /// XAccessibleEventBroadcaster
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) override;
 
     ///  Remove an existing event listener.
     virtual void SAL_CALL
         removeAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) override;
 
     /// XAccessibleSelection
 
-    virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild(sal_Int32 nChildIndex) override;
 
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected(sal_Int32 nChildIndex) override;
 
-    virtual void SAL_CALL clearAccessibleSelection()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL clearAccessibleSelection() override;
 
-    virtual void SAL_CALL selectAllAccessibleChildren()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAllAccessibleChildren() override;
 
-    virtual ::sal_Int32 SAL_CALL getSelectedAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getSelectedAccessibleChild(sal_Int32 nChildIndex)
-            throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleChild(sal_Int32 nChildIndex) override;
 
-    virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL deselectAccessibleChild(sal_Int32 nChildIndex) override;
 
     /// XInterface
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
 
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     /// XTypeProvider
 
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
     /// non-UNO methods
 
@@ -147,11 +127,9 @@ protected:
 
     sal_Int32 getMenuItemCount() const;
 
-    virtual Rectangle GetBoundingBoxOnScreen() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
 
-    virtual Rectangle GetBoundingBox() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     bool isSelected() const;
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index c150278631d1..cbf4425cff25 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -44,40 +44,31 @@ public:
 
     /// XAccessibleContext
 
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-            throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-            throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     /// XAccessibleAction
 
-    virtual ::sal_Int32 SAL_CALL getAccessibleActionCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() override;
 
-    virtual sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) override;
 
-    virtual OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL
-        getAccessibleActionKeyBinding(sal_Int32 nIndex)
-            throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getAccessibleActionKeyBinding(sal_Int32 nIndex) override;
 
     /// XInterface
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
 
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
@@ -88,11 +79,9 @@ public:
 
 protected:
 
-    virtual Rectangle GetBoundingBoxOnScreen() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
 
-    virtual Rectangle GetBoundingBox() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     bool isSelected() const;
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index 5a8af2f9f0ee..8ef5af28fa81 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -35,15 +35,12 @@ public:
 
     // XAccessibleContext
 
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-            throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     // Non-UNO Methods
 
diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx
index 12106ddd82e6..9cc670e4df7c 100644
--- a/sc/inc/AccessibleGlobal.hxx
+++ b/sc/inc/AccessibleGlobal.hxx
@@ -34,18 +34,14 @@ public:
 
     // XAccessibleStateSet
 
-    virtual sal_Bool SAL_CALL isEmpty()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isEmpty() override;
 
-    virtual sal_Bool SAL_CALL contains(sal_Int16 nState)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL contains(sal_Int16 nState) override;
 
     virtual sal_Bool SAL_CALL containsAll(
-        const css::uno::Sequence<sal_Int16>& aStateSet)
-            throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<sal_Int16>& aStateSet) override;
 
-    virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() override;
 
     // Non-UNO Methods
 
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx
index 009740167c84..095ddf6012d0 100644
--- a/sc/inc/addruno.hxx
+++ b/sc/inc/addruno.hxx
@@ -48,48 +48,24 @@ public:
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index 8ed8eb03bda4..27436be98963 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -58,58 +58,34 @@ public:
 
                             // XNameContainer
     virtual void SAL_CALL   insertByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::container::ElementExistException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException,
-                                        std::exception) override;
-    virtual void SAL_CALL   removeByName( const OUString& Name )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL   removeByName( const OUString& Name ) override;
 
                             // XNameReplace
     virtual void SAL_CALL   replaceByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScAutoFormatObj : public ::cppu::WeakImplHelper<
@@ -135,80 +111,49 @@ public:
     void                    InitFormat( sal_uInt16 nNewIndex );
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
-                                    sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScAutoFormatObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj);
@@ -229,48 +174,24 @@ public:
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 221ce48b19e8..8ae79b293bbd 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -48,34 +48,34 @@ css::uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() th
 OUString SAL_CALL ScDocument_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL ScDocument_createInstance(
-            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags ) throw( css::uno::Exception, std::exception );
+            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags );
 
 // Calc XML import
 css::uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw();
 OUString SAL_CALL ScXMLImport_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_createInstance(
-            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw();
 OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance(
-            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw();
 OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance(
-            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw();
 OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance(
-            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw();
 OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance(
-            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+            const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 class ScSpreadsheetSettings : public cppu::WeakImplHelper<
                                         css::sheet::XGlobalSheetSettings,
@@ -86,14 +86,14 @@ private:
     SfxItemPropertySet      aPropSet;
 
     /// @throws css::uno::RuntimeException
-    bool getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException);
+    bool getPropertyBool(const OUString& aPropertyName);
     /// @throws css::uno::RuntimeException
-    sal_Int16 getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException);
+    sal_Int16 getPropertyInt16(const OUString& aPropertyName);
     /// @throws css::uno::RuntimeException
-    void setProperty(const OUString& aPropertyName, bool p1) throw (css::uno::RuntimeException)
+    void setProperty(const OUString& aPropertyName, bool p1)
         { setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
     /// @throws css::uno::RuntimeException
-    void setProperty(const OUString& aPropertyName, sal_Int16 p1) throw (css::uno::RuntimeException)
+    void setProperty(const OUString& aPropertyName, sal_Int16 p1)
         { setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
 public:
                             ScSpreadsheetSettings();
@@ -103,130 +103,104 @@ public:
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // XGlobalSheetSettings
-    virtual sal_Bool SAL_CALL getMoveSelection() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getMoveSelection() override
         { return getPropertyBool("MoveSelection"); }
-    virtual void SAL_CALL setMoveSelection(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setMoveSelection(sal_Bool p1) override
         { setProperty("MoveSelection", (bool)p1); }
-    virtual sal_Int16 SAL_CALL getMoveDirection() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getMoveDirection() override
         { return getPropertyInt16("MoveDirection"); }
-    virtual void SAL_CALL setMoveDirection(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setMoveDirection(sal_Int16 p1) override
         { setProperty("MoveDirection", p1); }
-    virtual sal_Bool SAL_CALL getEnterEdit() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getEnterEdit() override
         { return getPropertyBool("EnterEdit"); }
-    virtual void SAL_CALL setEnterEdit(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setEnterEdit(sal_Bool p1) override
         { setProperty("EnterEdit", (bool)p1); }
-    virtual sal_Bool SAL_CALL getExtendFormat() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getExtendFormat() override
         { return getPropertyBool("ExtendFormat"); }
-    virtual void SAL_CALL setExtendFormat(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setExtendFormat(sal_Bool p1) override
         { setProperty("ExtendFormat", (bool)p1); }
-    virtual sal_Bool SAL_CALL getRangeFinder() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getRangeFinder() override
         { return getPropertyBool("RangeFinder"); }
-    virtual void SAL_CALL setRangeFinder(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setRangeFinder(sal_Bool p1) override
         { setProperty("RangeFinder", (bool)p1); }
-    virtual sal_Bool SAL_CALL getExpandReferences() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getExpandReferences() override
         { return getPropertyBool("ExpandReferences"); }
-    virtual void SAL_CALL setExpandReferences(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setExpandReferences(sal_Bool p1) override
         { setProperty("ExpandReferences", (bool)p1); }
-    virtual sal_Bool SAL_CALL getMarkHeader() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getMarkHeader() override
         { return getPropertyBool("MarkHeader"); }
-    virtual void SAL_CALL setMarkHeader(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setMarkHeader(sal_Bool p1) override
         { setProperty("MarkHeader", (bool)p1); }
-    virtual sal_Bool SAL_CALL getUseTabCol() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getUseTabCol() override
         { return getPropertyBool("UseTabCol"); }
-    virtual void SAL_CALL setUseTabCol(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setUseTabCol(sal_Bool p1) override
         { setProperty("UseTabCol", (bool)p1); }
-    virtual sal_Int16 SAL_CALL getMetric() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getMetric() override
         { return getPropertyInt16("Metric"); }
-    virtual void SAL_CALL setMetric(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setMetric(sal_Int16 p1) override
         { setProperty("Metric", p1); }
-    virtual sal_Int16 SAL_CALL getScale() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getScale() override
         { return getPropertyInt16("Scale"); }
-    virtual void SAL_CALL setScale(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setScale(sal_Int16 p1) override
         { setProperty("Scale", p1); }
-    virtual sal_Bool SAL_CALL getDoAutoComplete() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getDoAutoComplete() override
         { return getPropertyBool("DoAutoComplete"); }
-    virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) override
         { setProperty("DoAutoComplete", (bool)p1); }
-    virtual sal_Int16 SAL_CALL getStatusBarFunction() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getStatusBarFunction() override
         { return getPropertyInt16("StatusBarFunction"); }
-    virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) override
         { setProperty("StatusBarFunction", p1); }
-    virtual css::uno::Sequence<OUString> SAL_CALL getUserLists() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getUserLists() override
         {
            css::uno::Any any = getPropertyValue("UserLists");
            css::uno::Sequence<OUString> b;
            any >>= b;
            return b;
         }
-    virtual void SAL_CALL setUserLists(const css::uno::Sequence<OUString>& p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setUserLists(const css::uno::Sequence<OUString>& p1) override
         { setPropertyValue( "UserLists", css::uno::Any(p1) ); }
-    virtual sal_Int16 SAL_CALL getLinkUpdateMode() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getLinkUpdateMode() override
         { return getPropertyInt16("LinkUpdateMode"); }
-    virtual void SAL_CALL setLinkUpdateMode(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setLinkUpdateMode(sal_Int16 p1) override
         { setProperty("LinkUpdateMode", p1); }
-    virtual sal_Bool SAL_CALL getPrintAllSheets() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getPrintAllSheets() override
         { return getPropertyBool("PrintAllSheets"); }
-    virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) override
         { setProperty("PrintAllSheets", (bool)p1); }
-    virtual sal_Bool SAL_CALL getPrintEmptyPages() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getPrintEmptyPages() override
         { return getPropertyBool("PrintEmptyPages"); }
-    virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) override
         { setProperty("PrintEmptyPages", (bool)p1); }
-    virtual sal_Bool SAL_CALL getUsePrinterMetrics() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getUsePrinterMetrics() override
         { return getPropertyBool("UsePrinterMetrics"); }
-    virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) override
         { setProperty("UsePrinterMetrics", (bool)p1); }
-    virtual sal_Bool SAL_CALL getReplaceCellsWarning() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getReplaceCellsWarning() override
         { return getPropertyBool("ReplaceCellsWarning"); }
-    virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) override
         { setProperty("ReplaceCellsWarning", (bool)p1); }
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw (css::beans::UnknownPropertyException,
-                                       css::beans::PropertyVetoException,
-                                       css::lang::IllegalArgumentException,
-                                       css::lang::WrappedTargetException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw (css::beans::UnknownPropertyException,
-                                       css::lang::WrappedTargetException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScRecentFunctionsObj : public cppu::WeakImplHelper<
@@ -238,20 +212,14 @@ public:
     virtual                 ~ScRecentFunctionsObj() override;
 
                             // XRecentFunctions
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getRecentFunctionIds()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRecentFunctionIds( const css::uno::Sequence< sal_Int32 >& aRecentFunctionIds )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxRecentFunctions()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getRecentFunctionIds() override;
+    virtual void SAL_CALL setRecentFunctionIds( const css::uno::Sequence< sal_Int32 >& aRecentFunctionIds ) override;
+    virtual sal_Int32 SAL_CALL getMaxRecentFunctions() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScFunctionListObj : public cppu::WeakImplHelper<
@@ -266,43 +234,29 @@ public:
 
                             // XFunctionDescriptions
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-                            getById( sal_Int32 nId )
-                                throw(css::lang::IllegalArgumentException,
-                                css::uno::RuntimeException, std::exception) override;
+                            getById( sal_Int32 nId ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 2caeea7f10c0..aded180f3f69 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -218,24 +218,18 @@ protected:
                                 sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry );
     /// @throws css::uno::RuntimeException
     virtual void            GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                css::uno::Any& )
-                                throw(css::uno::RuntimeException,
-                                      std::exception);
+                                css::uno::Any& );
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     virtual void            SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                                const css::uno::Any& aValue )
-                                throw(css::lang::IllegalArgumentException,
-                                      css::uno::RuntimeException,
-                                      std::exception);
+                                                const css::uno::Any& aValue );
 
 public:
                             ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR);
                             ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR);
     virtual                 ~ScCellRangesBase() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
@@ -258,228 +252,135 @@ public:
     bool                    IsCursorOnly() const            { return bCursorOnly; }
 
                             // XSheetOperation
-    virtual double SAL_CALL computeFunction( css::sheet::GeneralFunction nFunction )
-                                throw(css::uno::Exception,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual void SAL_CALL   clearContents( sal_Int32 nContentFlags )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL computeFunction( css::sheet::GeneralFunction nFunction ) override;
+    virtual void SAL_CALL   clearContents( sal_Int32 nContentFlags ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XMultiPropertySet
     virtual void SAL_CALL   setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames,
-                                    const css::uno::Sequence< css::uno::Any >& aValues )
-                                throw (css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Sequence< css::uno::Any >& aValues ) override;
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL
-                            getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                            getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames,
-                                    const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
     virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames,
-                                    const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
                             // XTolerantMultiPropertySet
     virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL
         setPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames,
-                                    const css::uno::Sequence< css::uno::Any >& aValues )
-                                    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Sequence< css::uno::Any >& aValues ) override;
     virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL
-        getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames )
-                                    throw (css::uno::RuntimeException, std::exception) override;
+        getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL
-        getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames )
-                                    throw (css::uno::RuntimeException, std::exception) override;
+        getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
                             // XPropertyState
     virtual css::beans::PropertyState SAL_CALL getPropertyState(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
                             getPropertyStates( const css::uno::Sequence<
-                                        OUString >& aPropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setPropertyToDefault( const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        OUString >& aPropertyName ) override;
+    virtual void SAL_CALL   setPropertyToDefault( const OUString& PropertyName ) override;
     virtual css::uno::Any SAL_CALL getPropertyDefault(
-                                    const OUString& aPropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& aPropertyName ) override;
 
                             // XIndent
-    virtual void SAL_CALL   decrementIndent() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   incrementIndent() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   decrementIndent() override;
+    virtual void SAL_CALL   incrementIndent() override;
 
                             // XChartData
     virtual void SAL_CALL   addChartDataChangeEventListener(
-                                const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                                const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
     virtual void SAL_CALL   removeChartDataChangeEventListener( const css::uno::Reference<
-                                    css::chart::XChartDataChangeEventListener >& aListener )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual double SAL_CALL getNotANumber() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNotANumber( double nNumber )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual double SAL_CALL getNotANumber() override;
+    virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) override;
 
                             // XChartDataArray
     virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL
-                            getData()
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
-    virtual void SAL_CALL   setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual void SAL_CALL   setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
+                            getData() override;
+    virtual void SAL_CALL   setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override;
+    virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override;
+    virtual void SAL_CALL   setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) override;
 
                             // XCellRangesQuery
     virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL
-                            queryVisibleCells()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            queryVisibleCells() override;
     virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL
-                            queryEmptyCells()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            queryEmptyCells() override;
     virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL
-                            queryContentCells( sal_Int16 nContentFlags )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            queryContentCells( sal_Int16 nContentFlags ) override;
     virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL
-                            queryFormulaCells( sal_Int32 nResultFlags )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            queryFormulaCells( sal_Int32 nResultFlags ) override;
     virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL
                             queryColumnDifferences(
-                                const css::table::CellAddress& aCompare )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
+                                const css::table::CellAddress& aCompare ) override;
     virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL
                             queryRowDifferences(
-                                const css::table::CellAddress& aCompare )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
+                                const css::table::CellAddress& aCompare ) override;
     virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL
                             queryIntersection(
-                                const css::table::CellRangeAddress& aRange )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::table::CellRangeAddress& aRange ) override;
 
                             // XFormulaQuery
     virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL
-                            queryDependents( sal_Bool bRecursive )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            queryDependents( sal_Bool bRecursive ) override;
     virtual css::uno::Reference< css::sheet::XSheetCellRanges > SAL_CALL
-                            queryPrecedents( sal_Bool bRecursive )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            queryPrecedents( sal_Bool bRecursive ) override;
 
                             // XSearchable
     virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL
-                            createSearchDescriptor()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            createSearchDescriptor() override;
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-                            findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
+                            findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-                            findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
                             findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt,
-                                      const css::uno::Reference< css::util::XSearchDescriptor >& xDesc )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                      const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override;
 
                             // XReplaceable
     virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL
-                            createReplaceDescriptor() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL replaceAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
+                            createReplaceDescriptor() override;
+    virtual sal_Int32 SAL_CALL replaceAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override;
 
                             // XModifyBroadcaster
-    virtual void SAL_CALL   addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL   removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScCellRangesBase* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj);
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
 class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase,
@@ -497,8 +398,7 @@ public:
                             ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR);
     virtual                 ~ScCellRangesObj() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
@@ -506,88 +406,55 @@ public:
 
                             // XSheetCellRanges
     virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL
-                            getCells() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRangeAddressesAsString()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            getCells() override;
+    virtual OUString SAL_CALL getRangeAddressesAsString() override;
     virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL
-                            getRangeAddresses() throw(css::uno::RuntimeException, std::exception) override;
+                            getRangeAddresses() override;
 
                             // XSheetCellRangeContainer
     virtual void SAL_CALL   addRangeAddress( const css::table::CellRangeAddress& rRange,
-                                        sal_Bool bMergeRanges )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeRangeAddress( const css::table::CellRangeAddress& rRange )
-                                throw(css::container::NoSuchElementException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        sal_Bool bMergeRanges ) override;
+    virtual void SAL_CALL   removeRangeAddress( const css::table::CellRangeAddress& rRange ) override;
     virtual void SAL_CALL   addRangeAddresses( const css::uno::Sequence<
                                         css::table::CellRangeAddress >& rRanges,
-                                        sal_Bool bMergeRanges )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                        sal_Bool bMergeRanges ) override;
     virtual void SAL_CALL   removeRangeAddresses( const css::uno::Sequence<
-                                        css::table::CellRangeAddress >& rRanges )
-                                throw(css::container::NoSuchElementException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::table::CellRangeAddress >& rRanges ) override;
 
                             // XNameContainer
     virtual void SAL_CALL   insertByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                    throw (css::lang::IllegalArgumentException,
-                                           css::container::ElementExistException,
-                                           css::lang::WrappedTargetException,
-                                           css::uno::RuntimeException,
-                                           std::exception) override;
-    virtual void SAL_CALL   removeByName( const OUString& Name )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL   removeByName( const OUString& Name ) override;
 
                             // XNameReplace
     virtual void SAL_CALL   replaceByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
 class SC_DLLPUBLIC ScCellRangeObj : public ScCellRangesBase,
@@ -617,27 +484,19 @@ protected:
     const ScRange&          GetRange() const    { return aRange; }
     virtual const SfxItemPropertyMap& GetItemPropertyMap() override;
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                css::uno::Any& )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                                css::uno::Any& ) override;
     virtual void            SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                                const css::uno::Any& aValue )
-                                throw(css::lang::IllegalArgumentException,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
+                                                const css::uno::Any& aValue ) override;
 
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::table::XCell >
-                            GetCellByPosition_Impl( sal_Int32 nColumn, sal_Int32 nRow )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::uno::RuntimeException);
+                            GetCellByPosition_Impl( sal_Int32 nColumn, sal_Int32 nRow );
 
             /// @throws css::uno::RuntimeException
             void            SetArrayFormula_Impl( const OUString& rFormula,
                                 const OUString& rFormulaNmsp,
-                                const formula::FormulaGrammar::Grammar eGrammar )
-                                    throw (css::uno::RuntimeException, std::exception);
+                                const formula::FormulaGrammar::Grammar eGrammar );
 
 public:
                             ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR);
@@ -648,162 +507,126 @@ public:
                             CreateRangeFromDoc( ScDocument* pDoc, const ScRange& rR );
 
     virtual css::uno::Any SAL_CALL queryInterface(
-                                const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
     virtual void            RefChanged() override;
 
                             // XCellRangeAddressable
-    virtual css::table::CellRangeAddress SAL_CALL getRangeAddress()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::table::CellRangeAddress SAL_CALL getRangeAddress() override;
 
                             // XSheetCellRange
     virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL
-                            getSpreadsheet() throw(css::uno::RuntimeException, std::exception) override;
+                            getSpreadsheet() override;
 
                             // XArrayFormulaRange
-    virtual OUString SAL_CALL getArrayFormula() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setArrayFormula( const OUString& aFormula )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getArrayFormula() override;
+    virtual void SAL_CALL   setArrayFormula( const OUString& aFormula ) override;
 
                             // XArrayFormulaTokens
-    virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getArrayTokens()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+    virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getArrayTokens() override;
     virtual void SAL_CALL   setArrayTokens( const css::uno::Sequence<
-                                    css::sheet::FormulaToken >& aTokens )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                                    css::sheet::FormulaToken >& aTokens ) override;
 
                             // XCellRangeData
-    virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray() override;
+    virtual void SAL_CALL   setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) override;
 
                             // XCellRangeFormula
     virtual css::uno::Sequence< css::uno::Sequence<
-                            OUString > > SAL_CALL getFormulaArray()
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFormulaArray( const css::uno::Sequence< css::uno::Sequence< OUString > >& aArray )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                            OUString > > SAL_CALL getFormulaArray() override;
+    virtual void SAL_CALL   setFormulaArray( const css::uno::Sequence< css::uno::Sequence< OUString > >& aArray ) override;
 
                             // XMultipleOperation
     virtual void SAL_CALL   setTableOperation(
                                 const css::table::CellRangeAddress& aFormulaRange,
                                 css::sheet::TableOperationMode nMode,
                                 const css::table::CellAddress& aColumnCell,
-                                const css::table::CellAddress& aRowCell )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::table::CellAddress& aRowCell ) override;
 
                             // XMergeable
-    virtual void SAL_CALL   merge( sal_Bool bMerge ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getIsMerged() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   merge( sal_Bool bMerge ) override;
+    virtual sal_Bool SAL_CALL getIsMerged() override;
 
                             // XCellSeries
     virtual void SAL_CALL   fillSeries( css::sheet::FillDirection nFillDirection,
                                 css::sheet::FillMode nFillMode,
                                 css::sheet::FillDateMode nFillDateMode,
-                                double fStep, double fEndValue )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                double fStep, double fEndValue ) override;
     virtual void SAL_CALL   fillAuto( css::sheet::FillDirection nFillDirection,
-                                sal_Int32 nSourceCount )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                sal_Int32 nSourceCount ) override;
 
                             // XAutoFormattable
-    virtual void SAL_CALL   autoFormat( const OUString& aName )
-                                throw(css::lang::IllegalArgumentException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   autoFormat( const OUString& aName ) override;
 
                             // XSortable
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-                            createSortDescriptor() throw(css::uno::RuntimeException, std::exception) override;
+                            createSortDescriptor() override;
     virtual void SAL_CALL   sort( const css::uno::Sequence<
-                                css::beans::PropertyValue >& xDescriptor )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::beans::PropertyValue >& xDescriptor ) override;
 
                             // XSheetFilterableEx
     virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL
                             createFilterDescriptorByObject( const css::uno::Reference<
-                                css::sheet::XSheetFilterable >& xObject )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::XSheetFilterable >& xObject ) override;
 
                             // XSheetFilterable
     virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL
-                            createFilterDescriptor( sal_Bool bEmpty )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            createFilterDescriptor( sal_Bool bEmpty ) override;
     virtual void SAL_CALL   filter( const css::uno::Reference<
-                                css::sheet::XSheetFilterDescriptor >& xDescriptor )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::XSheetFilterDescriptor >& xDescriptor ) override;
 
                             // XSubTotalCalculatable
     virtual css::uno::Reference< css::sheet::XSubTotalDescriptor > SAL_CALL
-                            createSubTotalDescriptor( sal_Bool bEmpty )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            createSubTotalDescriptor( sal_Bool bEmpty ) override;
     virtual void SAL_CALL   applySubTotals(const css::uno::Reference< css::sheet::XSubTotalDescriptor >& xDescriptor,
-                                sal_Bool bReplace)
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   removeSubTotals() throw(css::uno::RuntimeException, std::exception) override;
+                                sal_Bool bReplace) override;
+    virtual void SAL_CALL   removeSubTotals() override;
 
                             // XImportable
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-                            createImportDescriptor( sal_Bool bEmpty )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   doImport( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            createImportDescriptor( sal_Bool bEmpty ) override;
+    virtual void SAL_CALL   doImport( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
 
                             // XCellFormatRangesSupplier
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-                            getCellFormatRanges() throw(css::uno::RuntimeException, std::exception) override;
+                            getCellFormatRanges() override;
 
                             // XUniqueCellFormatRangesSupplier
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-                            getUniqueCellFormatRanges() throw(css::uno::RuntimeException, std::exception) override;
+                            getUniqueCellFormatRanges() override;
 
                             // XColumnRowRange
     virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL
-                            getColumns() throw(css::uno::RuntimeException, std::exception) override;
+                            getColumns() override;
     virtual css::uno::Reference< css::table::XTableRows > SAL_CALL
-                            getRows() throw(css::uno::RuntimeException, std::exception) override;
+                            getRows() override;
 
                             // XCellRange
     virtual css::uno::Reference< css::table::XCell > SAL_CALL
-                            getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::uno::RuntimeException, std::exception) override;
+                            getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
     virtual css::uno::Reference< css::table::XCellRange > SAL_CALL
                             getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop,
-                                sal_Int32 nRight, sal_Int32 nBottom )
-                                    throw(css::lang::IndexOutOfBoundsException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                sal_Int32 nRight, sal_Int32 nBottom ) override;
     virtual css::uno::Reference< css::table::XCellRange > SAL_CALL
-                            getCellRangeByName( const OUString& aRange )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            getCellRangeByName( const OUString& aRange ) override;
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::table::XCellRange >
-                            getCellRangeByName( const OUString& aRange,  const ScAddress::Details& rDetails )
-                                throw(css::uno::RuntimeException);
+                            getCellRangeByName( const OUString& aRange,  const ScAddress::Details& rDetails );
 
                             // XPropertySet override due to Range-Properties
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
 //! really derive cell from range?
@@ -835,13 +658,9 @@ private:
 protected:
     virtual const SfxItemPropertyMap& GetItemPropertyMap() override;
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                css::uno::Any& )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                                css::uno::Any& ) override;
     virtual void            SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                                const css::uno::Any& aValue )
-                                throw(css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                                const css::uno::Any& aValue ) override;
 
 public:
     static const SvxItemPropertySet* GetEditPropertySet();
@@ -850,8 +669,7 @@ public:
                             ScCellObj(ScDocShell* pDocSh, const ScAddress& rP);
     virtual                 ~ScCellObj() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
@@ -868,108 +686,83 @@ public:
                             // XText
     virtual void SAL_CALL   insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange,
                                 const css::uno::Reference< css::text::XTextContent >& xContent,
-                                sal_Bool bAbsorb )
-                                    throw(css::lang::IllegalArgumentException,
-                                          css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent )
-                                    throw(css::container::NoSuchElementException,
-                                          css::uno::RuntimeException, std::exception) override;
+                                sal_Bool bAbsorb ) override;
+    virtual void SAL_CALL   removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) override;
 
                             // XSimpleText
     virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
-                            createTextCursor() throw(css::uno::RuntimeException, std::exception) override;
+                            createTextCursor() override;
     virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
-                            createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) override;
     virtual void SAL_CALL   insertString( const css::uno::Reference< css::text::XTextRange >& xRange,
-                                        const OUString& aString, sal_Bool bAbsorb )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                        const OUString& aString, sal_Bool bAbsorb ) override;
     virtual void SAL_CALL   insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange,
-                                        sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                        sal_Int16 nControlCharacter, sal_Bool bAbsorb ) override;
 
                             // XTextRange
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getText() throw(css::uno::RuntimeException, std::exception) override;
+                            getText() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getStart() throw(css::uno::RuntimeException, std::exception) override;
+                            getStart() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getEnd() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setString( const OUString& aString )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL   setString( const OUString& aString ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XCell
-    virtual OUString SAL_CALL getFormula() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFormula( const OUString& aFormula )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFormulaResult( double nValue )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFormulaString( const OUString& aFormula )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getValue() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setValue( double nValue ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellContentType SAL_CALL getType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getError() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getFormula() override;
+    virtual void SAL_CALL   setFormula( const OUString& aFormula ) override;
+    virtual void SAL_CALL   setFormulaResult( double nValue ) override;
+    virtual void SAL_CALL   setFormulaString( const OUString& aFormula ) override;
+    virtual double SAL_CALL getValue() override;
+    virtual void SAL_CALL   setValue( double nValue ) override;
+    virtual css::table::CellContentType SAL_CALL getType() override;
+    virtual sal_Int32 SAL_CALL getError() override;
 
                             // XFormulaTokens
-    virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens )
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens() override;
+    virtual void SAL_CALL   setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override;
 
                             // XCellAddressable
-    virtual css::table::CellAddress SAL_CALL getCellAddress()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::table::CellAddress SAL_CALL getCellAddress() override;
 
                             // XSheetAnnotationAnchor
     virtual css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL
-                            getAnnotation() throw(css::uno::RuntimeException, std::exception) override;
+                            getAnnotation() override;
 
                             // XTextFieldsSupplier
     virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL
-                            getTextFields() throw(css::uno::RuntimeException, std::exception) override;
+                            getTextFields() override;
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-                            getTextFieldMasters() throw(css::uno::RuntimeException, std::exception) override;
+                            getTextFieldMasters() override;
 
                             // XPropertySet override due to cell properties
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
                             // XActionLockable
-    virtual sal_Bool SAL_CALL isActionLocked() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   addActionLock() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeActionLock() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setActionLocks( sal_Int16 nLock )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL resetActionLocks() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isActionLocked() override;
+    virtual void SAL_CALL   addActionLock() override;
+    virtual void SAL_CALL   removeActionLock() override;
+    virtual void SAL_CALL   setActionLocks( sal_Int16 nLock ) override;
+    virtual sal_Int16 SAL_CALL resetActionLocks() override;
 };
 
 class ScTableSheetObj : public ScCellRangeObj,
@@ -1003,14 +796,9 @@ private:
 protected:
     virtual const SfxItemPropertyMap& GetItemPropertyMap() override;
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                css::uno::Any& )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                                css::uno::Any& ) override;
     virtual void            SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                                const css::uno::Any& aValue )
-                                throw(css::lang::IllegalArgumentException,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
+                                                const css::uno::Any& aValue ) override;
 
 public:
                             ScTableSheetObj(ScDocShell* pDocSh, SCTAB nTab);
@@ -1018,222 +806,163 @@ public:
 
     void                    InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab);
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
                             // XSpreadsheet
     virtual css::uno::Reference< css::sheet::XSheetCellCursor >
-                            SAL_CALL createCursor() throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL createCursor() override;
     virtual css::uno::Reference< css::sheet::XSheetCellCursor > SAL_CALL
                             createCursorByRange( const css::uno::Reference<
-                                css::sheet::XSheetCellRange >& aRange )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::XSheetCellRange >& aRange ) override;
 
                             // XSheetCellRange
     virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL
-                            getSpreadsheet() throw(css::uno::RuntimeException, std::exception) override;
+                            getSpreadsheet() override;
 
                             // XCellRange
     virtual css::uno::Reference< css::table::XCell > SAL_CALL
-                            getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::uno::RuntimeException, std::exception) override;
+                            getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
     virtual css::uno::Reference< css::table::XCellRange > SAL_CALL
                             getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop,
-                                sal_Int32 nRight, sal_Int32 nBottom )
-                                    throw(css::lang::IndexOutOfBoundsException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                sal_Int32 nRight, sal_Int32 nBottom ) override;
     using ScCellRangeObj::getCellRangeByName;
     virtual css::uno::Reference< css::table::XCellRange > SAL_CALL
-                            getCellRangeByName( const OUString& aRange )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            getCellRangeByName( const OUString& aRange ) override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XSheetPageBreak
     virtual css::uno::Sequence< css::sheet::TablePageBreakData > SAL_CALL
-                            getColumnPageBreaks() throw(css::uno::RuntimeException, std::exception) override;
+                            getColumnPageBreaks() override;
     virtual css::uno::Sequence< css::sheet::TablePageBreakData > SAL_CALL
-                            getRowPageBreaks() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeAllManualPageBreaks() throw(css::uno::RuntimeException, std::exception) override;
+                            getRowPageBreaks() override;
+    virtual void SAL_CALL   removeAllManualPageBreaks() override;
 
                             // XCellRangeMovement
     virtual void SAL_CALL   insertCells( const css::table::CellRangeAddress& aRange,
-                                css::sheet::CellInsertMode nMode )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::CellInsertMode nMode ) override;
     virtual void SAL_CALL   removeRange( const css::table::CellRangeAddress& aRange,
-                                css::sheet::CellDeleteMode nMode )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::CellDeleteMode nMode ) override;
     virtual void SAL_CALL   moveRange( const css::table::CellAddress& aDestination,
-                                const css::table::CellRangeAddress& aSource )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::table::CellRangeAddress& aSource ) override;
     virtual void SAL_CALL   copyRange( const css::table::CellAddress& aDestination,
-                                const css::table::CellRangeAddress& aSource )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::table::CellRangeAddress& aSource ) override;
 
                             // XTableChartsSupplier
     virtual css::uno::Reference< css::table::XTableCharts > SAL_CALL
-                            getCharts() throw(css::uno::RuntimeException, std::exception) override;
+                            getCharts() override;
 
                             // XDataPilotTablesSupplier
     virtual css::uno::Reference< css::sheet::XDataPilotTables > SAL_CALL
-                            getDataPilotTables() throw(css::uno::RuntimeException, std::exception) override;
+                            getDataPilotTables() override;
 
                             // XScenariosSupplier
     virtual css::uno::Reference< css::sheet::XScenarios > SAL_CALL
-                            getScenarios() throw(css::uno::RuntimeException, std::exception) override;
+                            getScenarios() override;
 
                             // XSheetAnnotationsSupplier
     virtual css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL
-                            getAnnotations() throw(css::uno::RuntimeException, std::exception) override;
+                            getAnnotations() override;
 
                             // XDrawPageSupplier
     virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL
-                            getDrawPage() throw(css::uno::RuntimeException, std::exception) override;
+                            getDrawPage() override;
 
                             // XPrintAreas
     virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL
-                            getPrintAreas() throw(css::uno::RuntimeException, std::exception) override;
+                            getPrintAreas() override;
     virtual void SAL_CALL setPrintAreas( const css::uno::Sequence<
-                                css::table::CellRangeAddress >& aPrintAreas )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getPrintTitleColumns() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setPrintTitleColumns( sal_Bool bPrintTitleColumns )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellRangeAddress SAL_CALL getTitleColumns()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                css::table::CellRangeAddress >& aPrintAreas ) override;
+    virtual sal_Bool SAL_CALL getPrintTitleColumns() override;
+    virtual void SAL_CALL   setPrintTitleColumns( sal_Bool bPrintTitleColumns ) override;
+    virtual css::table::CellRangeAddress SAL_CALL getTitleColumns() override;
     virtual void SAL_CALL   setTitleColumns(
-                                const css::table::CellRangeAddress& aTitleColumns )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getPrintTitleRows() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setPrintTitleRows( sal_Bool bPrintTitleRows )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellRangeAddress SAL_CALL getTitleRows()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                const css::table::CellRangeAddress& aTitleColumns ) override;
+    virtual sal_Bool SAL_CALL getPrintTitleRows() override;
+    virtual void SAL_CALL   setPrintTitleRows( sal_Bool bPrintTitleRows ) override;
+    virtual css::table::CellRangeAddress SAL_CALL getTitleRows() override;
     virtual void SAL_CALL   setTitleRows(
-                                const css::table::CellRangeAddress& aTitleRows )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::table::CellRangeAddress& aTitleRows ) override;
 
                             // XSheetLinkable
-    virtual css::sheet::SheetLinkMode SAL_CALL getLinkMode()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setLinkMode( css::sheet::SheetLinkMode nLinkMode )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLinkUrl() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setLinkUrl( const OUString& aLinkUrl )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLinkSheetName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setLinkSheetName( const OUString& aLinkSheetName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::sheet::SheetLinkMode SAL_CALL getLinkMode() override;
+    virtual void SAL_CALL   setLinkMode( css::sheet::SheetLinkMode nLinkMode ) override;
+    virtual OUString SAL_CALL getLinkUrl() override;
+    virtual void SAL_CALL   setLinkUrl( const OUString& aLinkUrl ) override;
+    virtual OUString SAL_CALL getLinkSheetName() override;
+    virtual void SAL_CALL   setLinkSheetName( const OUString& aLinkSheetName ) override;
     virtual void SAL_CALL   link( const OUString& aUrl,
                                 const OUString& aSheetName,
                                 const OUString& aFilterName,
                                 const OUString& aFilterOptions,
-                                css::sheet::SheetLinkMode nMode )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::SheetLinkMode nMode ) override;
 
                             // XSheetAuditing
-    virtual sal_Bool SAL_CALL hideDependents( const css::table::CellAddress& aPosition )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hidePrecedents( const css::table::CellAddress& aPosition )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL showDependents( const css::table::CellAddress& aPosition )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL showPrecedents( const css::table::CellAddress& aPosition )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL showErrors( const css::table::CellAddress& aPosition )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL showInvalid() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   clearArrows() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hideDependents( const css::table::CellAddress& aPosition ) override;
+    virtual sal_Bool SAL_CALL hidePrecedents( const css::table::CellAddress& aPosition ) override;
+    virtual sal_Bool SAL_CALL showDependents( const css::table::CellAddress& aPosition ) override;
+    virtual sal_Bool SAL_CALL showPrecedents( const css::table::CellAddress& aPosition ) override;
+    virtual sal_Bool SAL_CALL showErrors( const css::table::CellAddress& aPosition ) override;
+    virtual sal_Bool SAL_CALL showInvalid() override;
+    virtual void SAL_CALL   clearArrows() override;
 
                             // XSheetOutline
     virtual void SAL_CALL   group( const css::table::CellRangeAddress& aRange,
-                                css::table::TableOrientation nOrientation )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
+                                css::table::TableOrientation nOrientation ) override;
     virtual void SAL_CALL   ungroup( const css::table::CellRangeAddress& aRange,
-                                css::table::TableOrientation nOrientation )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
-    virtual void SAL_CALL   autoOutline( const css::table::CellRangeAddress& aRange )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual void SAL_CALL   clearOutline()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual void SAL_CALL   hideDetail( const css::table::CellRangeAddress& aRange )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual void SAL_CALL   showDetail( const css::table::CellRangeAddress& aRange )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                                css::table::TableOrientation nOrientation ) override;
+    virtual void SAL_CALL   autoOutline( const css::table::CellRangeAddress& aRange ) override;
+    virtual void SAL_CALL   clearOutline() override;
+    virtual void SAL_CALL   hideDetail( const css::table::CellRangeAddress& aRange ) override;
+    virtual void SAL_CALL   showDetail( const css::table::CellRangeAddress& aRange ) override;
     virtual void SAL_CALL   showLevel( sal_Int16 nLevel,
-                                css::table::TableOrientation nOrientation )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
+                                css::table::TableOrientation nOrientation ) override;
 
                             // XProtectable
-    virtual void SAL_CALL   protect( const OUString& aPassword )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   unprotect( const OUString& aPassword )
-                                throw(css::lang::IllegalArgumentException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isProtected() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   protect( const OUString& aPassword ) override;
+    virtual void SAL_CALL   unprotect( const OUString& aPassword ) override;
+    virtual sal_Bool SAL_CALL isProtected() override;
 
                             // XScenario
-    virtual sal_Bool SAL_CALL getIsScenario() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getScenarioComment() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setScenarioComment( const OUString& aScenarioComment )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsScenario() override;
+    virtual OUString SAL_CALL getScenarioComment() override;
+    virtual void SAL_CALL   setScenarioComment( const OUString& aScenarioComment ) override;
     virtual void SAL_CALL   addRanges( const css::uno::Sequence<
-                                css::table::CellRangeAddress >& aRanges )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   apply() throw(css::uno::RuntimeException, std::exception) override;
+                                css::table::CellRangeAddress >& aRanges ) override;
+    virtual void SAL_CALL   apply() override;
                             // XScenarioEnhanced
     virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL
-                            getRanges(  )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            getRanges(  ) override;
 
                             // XExternalSheetName
-    virtual void SAL_CALL   setExternalName( const OUString& aUrl, const OUString& aSheetName )
-                                throw (css::container::ElementExistException,
-                                       css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setExternalName( const OUString& aUrl, const OUString& aSheetName ) override;
 
                             // XEventsSupplier
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents()
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() override;
 
                             // XPropertySet override due to sheet properties
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
-                                    sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScTableSheetObj* getImplementation(const css::uno::Reference< css::uno::XInterface>& rObj);
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
 class ScTableColumnObj : public ScCellRangeObj,
@@ -1245,48 +974,35 @@ private:
 protected:
     virtual const SfxItemPropertyMap& GetItemPropertyMap() override;
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                css::uno::Any& )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                                css::uno::Any& ) override;
     virtual void            SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                                const css::uno::Any& aValue )
-                                throw(css::lang::IllegalArgumentException,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
+                                                const css::uno::Any& aValue ) override;
 
 public:
                             ScTableColumnObj(ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab);
     virtual                 ~ScTableColumnObj() override;
 
     virtual css::uno::Any SAL_CALL queryInterface(
-                                const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XPropertySet override due to column properties
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
 class ScTableRowObj : public ScCellRangeObj
@@ -1297,14 +1013,9 @@ private:
 protected:
     virtual const SfxItemPropertyMap& GetItemPropertyMap() override;
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                css::uno::Any& )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                                css::uno::Any& ) override;
     virtual void            SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
-                                                const css::uno::Any& aValue )
-                                throw(css::lang::IllegalArgumentException,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
+                                                const css::uno::Any& aValue ) override;
 
 public:
                             ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab);
@@ -1312,16 +1023,12 @@ public:
 
                             // XPropertySet override due to row properties
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScCellsObj : public cppu::WeakImplHelper<
@@ -1341,20 +1048,16 @@ public:
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScCellsEnumeration : public cppu::WeakImplHelper<
@@ -1380,19 +1083,13 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement()
-                                throw(css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScCellFormatsObj : public cppu::WeakImplHelper<
@@ -1415,28 +1112,21 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScCellFormatsEnumeration : public cppu::WeakImplHelper<
@@ -1463,19 +1153,13 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement()
-                                throw(css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 typedef std::vector< ScRangeList > ScMyRangeLists;
@@ -1498,28 +1182,21 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper<
@@ -1539,19 +1216,13 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement()
-                                throw(css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 9201638b701d..d9c019dc7a3d 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -71,109 +71,76 @@ public:
 
     // XDataProvider
     virtual sal_Bool SAL_CALL createDataSourcePossible(
-        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
 
     virtual css::uno::Reference<
         css::chart2::data::XDataSource > SAL_CALL createDataSource(
-            const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
 
     virtual css::uno::Sequence<
         css::beans::PropertyValue > SAL_CALL detectArguments(
-            const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource )
-            throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) override;
 
     virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(
-        const OUString& aRangeRepresentation )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& aRangeRepresentation ) override;
 
     virtual css::uno::Reference<
         css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(
-            const OUString& aRangeRepresentation )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const OUString& aRangeRepresentation ) override;
 
     virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL
-        createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) override;
 
-    virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() override;
 
     // XSheetDataProvider
     virtual sal_Bool SAL_CALL createDataSequenceByFormulaTokensPossible(
-        const css::uno::Sequence< css::sheet::FormulaToken >& aTokens )
-            throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override;
 
     virtual css::uno::Reference< css::chart2::data::XDataSequence >
         SAL_CALL createDataSequenceByFormulaTokens(
-            const css::uno::Sequence< css::sheet::FormulaToken >& aTokens )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override;
 
     // XRangeXMLConversion
-    virtual OUString SAL_CALL convertRangeToXML( const OUString& sRangeRepresentation )
-        throw ( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+    virtual OUString SAL_CALL convertRangeToXML( const OUString& sRangeRepresentation ) override;
 
-    virtual OUString SAL_CALL convertRangeFromXML( const OUString& sXMLRange )
-        throw ( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+    virtual OUString SAL_CALL convertRangeFromXML( const OUString& sXMLRange ) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL
-        getPropertySetInfo() throw( css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw( css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
 
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener>& xListener)
-        throw( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener>& xListener) override;
 
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener>& rListener)
-        throw( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener>& rListener) override;
 
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener)
-        throw( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) override;
 
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener)
-        throw( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) override;
 
     // 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( const OUString&
-            rServiceName) throw( css::uno::RuntimeException, std::exception) override;
+            rServiceName) override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames() throw(
-                css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
 private:
 
@@ -198,18 +165,16 @@ public:
     // XDataSource
     virtual css::uno::Sequence< css::uno::Reference<
             css::chart2::data::XLabeledDataSequence > > SAL_CALL
-        getDataSequences() throw (css::uno::RuntimeException, std::exception) override;
+        getDataSequences() override;
 
     // 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( const OUString&
-            rServiceName) throw( css::uno::RuntimeException, std::exception) override;
+            rServiceName) override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames() throw(
-                css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // implementation
 
@@ -249,113 +214,75 @@ public:
 
     // XDataSequence
     virtual css::uno::Sequence< css::uno::Any >
-        SAL_CALL getData()
-            throw (css::uno::RuntimeException,
-                   std::exception) override;
-    virtual OUString SAL_CALL getSourceRangeRepresentation()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getData() override;
+    virtual OUString SAL_CALL getSourceRangeRepresentation() override;
     virtual css::uno::Sequence< OUString >
-        SAL_CALL generateLabel(css::chart2::data::LabelOrigin nOrigin)
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL generateLabel(css::chart2::data::LabelOrigin nOrigin) override;
 
     /** Get the number format key for the n-th data entry
      * If nIndex == -1, then you will get the number format key for the first non-empty entry
      */
-    virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override;
 
     // XNumericalDataSequence
     virtual css::uno::Sequence< double >
-        SAL_CALL getNumericalData()
-            throw (css::uno::RuntimeException,
-                   std::exception) override;
+        SAL_CALL getNumericalData() override;
 
     // XTextualDataSequence
     virtual css::uno::Sequence< OUString >
-        SAL_CALL getTextualData()
-            throw (css::uno::RuntimeException,
-                   std::exception) override;
+        SAL_CALL getTextualData() override;
 
     // XTimeBased
-    virtual sal_Bool SAL_CALL switchToNext(sal_Bool bWrap) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setToPointInTime(sal_Int32 nPoint) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL switchToNext(sal_Bool bWrap) override;
+    virtual sal_Bool SAL_CALL setToPointInTime(sal_Int32 nPoint) override;
 
-    virtual void SAL_CALL setRange(sal_Int32 nStart, sal_Int32 nEnd) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setRange(sal_Int32 nStart, sal_Int32 nEnd) override;
 
     // XPropertySet
     virtual css::uno::Reference<
         css::beans::XPropertySetInfo> SAL_CALL
-        getPropertySetInfo() throw( css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw( css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
 
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw(css::beans::UnknownPropertyException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException,
-              std::exception) override;
+            const OUString& rPropertyName) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener>& xListener)
-        throw( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener>& xListener) override;
 
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener>& rListener)
-        throw( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener>& rListener) override;
 
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener)
-        throw( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener>& rListener) override;
 
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference<  css::beans::XVetoableChangeListener>& rListener)
-        throw( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<  css::beans::XVetoableChangeListener>& rListener) override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // XModifyBroadcaster
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // 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( const OUString&
-            rServiceName) throw( css::uno::RuntimeException, std::exception) override;
+            rServiceName) override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames() throw(
-                css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
 private:
     void setDataChangedHint(bool b);
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 0cc5e50eb89b..f0b715bb3c6c 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -63,45 +63,30 @@ public:
     virtual void SAL_CALL   addNewByName( const OUString& aName,
                                     const css::awt::Rectangle& aRect,
                                     const css::uno::Sequence< css::table::CellRangeAddress >& aRanges,
-                                    sal_Bool bColumnHeaders, sal_Bool bRowHeaders )
-                                        throw(css::uno::RuntimeException,
-                                              std::exception) override;
-    virtual void SAL_CALL   removeByName( const OUString& aName )
-                                        throw(css::uno::RuntimeException, std::exception) override;
+                                    sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) override;
+    virtual void SAL_CALL   removeByName( const OUString& aName ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 typedef ::cppu::WeakComponentImplHelper<
@@ -130,9 +115,7 @@ private:
 protected:
     // ::comphelper::OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
-    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
-        throw (css::uno::Exception,
-               std::exception) override;
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
     virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
@@ -155,40 +138,29 @@ public:
     using ScChartObj_Base::disposing;
 
                             // XTableChart
-    virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setHasColumnHeaders( sal_Bool bHasColumnHeaders )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual sal_Bool SAL_CALL getHasRowHeaders() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setHasRowHeaders( sal_Bool bHasRowHeaders )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual sal_Bool SAL_CALL getHasColumnHeaders() override;
+    virtual void SAL_CALL   setHasColumnHeaders( sal_Bool bHasColumnHeaders ) override;
+    virtual sal_Bool SAL_CALL getHasRowHeaders() override;
+    virtual void SAL_CALL   setHasRowHeaders( sal_Bool bHasRowHeaders ) override;
     virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL
-                            getRanges(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setRanges( const css::uno::Sequence< css::table::CellRangeAddress >& aRanges )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            getRanges(  ) override;
+    virtual void SAL_CALL   setRanges( const css::uno::Sequence< css::table::CellRangeAddress >& aRanges ) override;
 
                             // XEmbeddedObjectSupplier
     virtual css::uno::Reference< css::lang::XComponent > SAL_CALL
-                            getEmbeddedObject() throw(css::uno::RuntimeException, std::exception) override;
+                            getEmbeddedObject() override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 };
 
 #endif
diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx
index caa8bff8bc1a..0d1f5a7919d0 100644
--- a/sc/inc/confuno.hxx
+++ b/sc/inc/confuno.hxx
@@ -46,48 +46,24 @@ public:
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx
index ceff23afb5b4..256d7690c66d 100644
--- a/sc/inc/cursuno.hxx
+++ b/sc/inc/cursuno.hxx
@@ -35,68 +35,51 @@ public:
     virtual                 ~ScCellCursorObj() override;
 
     virtual css::uno::Any SAL_CALL queryInterface(
-                                const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
                             // XSheetCellCursor
-    virtual void SAL_CALL   collapseToCurrentRegion() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   collapseToCurrentArray()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual void SAL_CALL   collapseToMergedArea() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   expandToEntireColumns() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   expandToEntireRows() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   collapseToSize( sal_Int32 nColumns, sal_Int32 nRows )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   collapseToCurrentRegion() override;
+    virtual void SAL_CALL   collapseToCurrentArray() override;
+    virtual void SAL_CALL   collapseToMergedArea() override;
+    virtual void SAL_CALL   expandToEntireColumns() override;
+    virtual void SAL_CALL   expandToEntireRows() override;
+    virtual void SAL_CALL   collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) override;
 
                             // XUsedAreaCursor
-    virtual void SAL_CALL   gotoStartOfUsedArea( sal_Bool bExpand )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   gotoEndOfUsedArea( sal_Bool bExpand )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   gotoStartOfUsedArea( sal_Bool bExpand ) override;
+    virtual void SAL_CALL   gotoEndOfUsedArea( sal_Bool bExpand ) override;
 
                             // XCellCursor
-    virtual void SAL_CALL   gotoStart() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   gotoEnd() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   gotoNext() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   gotoPrevious() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   gotoStart() override;
+    virtual void SAL_CALL   gotoEnd() override;
+    virtual void SAL_CALL   gotoNext() override;
+    virtual void SAL_CALL   gotoPrevious() override;
+    virtual void SAL_CALL   gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) override;
 
                             // XSheetCellRange
     virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL
-                            getSpreadsheet() throw(css::uno::RuntimeException, std::exception) override;
+                            getSpreadsheet() override;
 
                             // XCellRange
     virtual css::uno::Reference< css::table::XCell > SAL_CALL
-                            getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::uno::RuntimeException, std::exception) override;
+                            getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
     virtual css::uno::Reference< css::table::XCellRange > SAL_CALL
                             getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop,
-                                sal_Int32 nRight, sal_Int32 nBottom )
-                                    throw(css::lang::IndexOutOfBoundsException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                sal_Int32 nRight, sal_Int32 nBottom ) override;
     using ScCellRangeObj::getCellRangeByName;
     virtual css::uno::Reference< css::table::XCellRange > SAL_CALL
-                            getCellRangeByName( const OUString& aRange )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            getCellRangeByName( const OUString& aRange ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
 #endif
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index c4e7841640d0..b99538667267 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -100,48 +100,33 @@ public:
 
                             // XDataPilotTables
     virtual css::uno::Reference< css::sheet::XDataPilotDescriptor > SAL_CALL
-                            createDataPilotDescriptor() throw(css::uno::RuntimeException, std::exception) override;
+                            createDataPilotDescriptor() override;
     virtual void SAL_CALL   insertNewByName( const OUString& aName,
                                     const css::table::CellAddress& aOutputAddress,
-                                    const css::uno::Reference< css::sheet::XDataPilotDescriptor >& xDescriptor )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
-    virtual void SAL_CALL   removeByName( const OUString& aName )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::sheet::XDataPilotDescriptor >& xDescriptor ) override;
+    virtual void SAL_CALL   removeByName( const OUString& aName ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 //  ScDataPilotDescriptorBase is never instantiated directly
@@ -163,8 +148,7 @@ public:
     virtual                 ~ScDataPilotDescriptorBase() override;
 
     virtual css::uno::Any SAL_CALL queryInterface(
-                                const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
@@ -179,82 +163,53 @@ public:
                             // XDataPilotDescriptor
                             //  getName, setName, getTag, setTag in derived classes
 
-    virtual css::table::CellRangeAddress SAL_CALL getSourceRange()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSourceRange( const css::table::CellRangeAddress& aSourceRange )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::table::CellRangeAddress SAL_CALL getSourceRange() override;
+    virtual void SAL_CALL setSourceRange( const css::table::CellRangeAddress& aSourceRange ) override;
     virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL
-                            getFilterDescriptor() throw(css::uno::RuntimeException, std::exception) override;
+                            getFilterDescriptor() override;
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-                            getDataPilotFields() throw(css::uno::RuntimeException, std::exception) override;
+                            getDataPilotFields() override;
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-                            getColumnFields() throw(css::uno::RuntimeException, std::exception) override;
+                            getColumnFields() override;
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-                            getRowFields() throw(css::uno::RuntimeException, std::exception) override;
+                            getRowFields() override;
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-                            getPageFields() throw(css::uno::RuntimeException, std::exception) override;
+                            getPageFields() override;
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-                            getDataFields() throw(css::uno::RuntimeException, std::exception) override;
+                            getDataFields() override;
     virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL
-                            getHiddenFields() throw(css::uno::RuntimeException, std::exception) override;
+                            getHiddenFields() override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw (css::beans::UnknownPropertyException,
-                                       css::lang::WrappedTargetException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XDataPilotDataLayoutFieldSupplier
     virtual css::uno::Reference< css::sheet::XDataPilotField >
-                            SAL_CALL getDataLayoutField()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+                            SAL_CALL getDataLayoutField() override;
 
                             // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
-                                    sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     SC_DLLPUBLIC static ScDataPilotDescriptorBase* getImplementation(const css::uno::Reference<css::sheet::XDataPilotDescriptor>& rObj);
 
                             // XTypeProvider (override in ScDataPilotTableObj)
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
                             // XServiceInfo is in derived classes
 };
@@ -272,20 +227,15 @@ public:
     virtual void SetDPObject(ScDPObject* pDPObj) override;
 
                             // rest of XDataPilotDescriptor (incl. XNamed)
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTag() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setTag( const OUString& aTag )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
+    virtual OUString SAL_CALL getTag() override;
+    virtual void SAL_CALL   setTag( const OUString& aTag ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScDataPilotTableObj : public ScDataPilotDescriptorBase,
@@ -303,8 +253,7 @@ public:
                             ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN);
     virtual                 ~ScDataPilotTableObj() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
@@ -314,54 +263,38 @@ public:
     virtual void SetDPObject(ScDPObject* pDPObj) override;
 
                             // rest of XDataPilotDescriptor (incl. XNamed)
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTag() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setTag( const OUString& aTag )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
+    virtual OUString SAL_CALL getTag() override;
+    virtual void SAL_CALL   setTag( const OUString& aTag ) override;
 
                             // XDataPilotTable
-    virtual css::table::CellRangeAddress SAL_CALL getOutputRange()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   refresh() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::table::CellRangeAddress SAL_CALL getOutputRange() override;
+    virtual void SAL_CALL   refresh() override;
 
                             // XDataPilotTable2
     virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > >
-        SAL_CALL getDrillDownData(const css::table::CellAddress& aAddr)
-                                throw(css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getDrillDownData(const css::table::CellAddress& aAddr) override;
 
     virtual css::sheet::DataPilotTablePositionData
-        SAL_CALL getPositionData(const css::table::CellAddress& aAddr)
-                                throw(css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getPositionData(const css::table::CellAddress& aAddr) override;
 
-    virtual void SAL_CALL insertDrillDownSheet(const css::table::CellAddress& aAddr)
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertDrillDownSheet(const css::table::CellAddress& aAddr) override;
 
-    virtual css::table::CellRangeAddress SAL_CALL getOutputRangeByType( sal_Int32 nType )
-                                throw(css::lang::IllegalArgumentException,
-                                      css::uno::RuntimeException, std::exception) override;
+    virtual css::table::CellRangeAddress SAL_CALL getOutputRangeByType( sal_Int32 nType ) override;
 
                             // XModifyBroadcaster
-    virtual void SAL_CALL   addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL   removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
                             // XTypeProvider (override)
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 struct ScFieldIdentifier
@@ -431,38 +364,26 @@ public:
     virtual             ~ScDataPilotFieldsObj() override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     ScDataPilotFieldObj*    GetObjectByIndex_Impl( sal_Int32 nIndex ) const;
@@ -498,54 +419,27 @@ public:
     virtual             ~ScDataPilotFieldObj() override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL   setName(const OUString& aName)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName(const OUString& aName) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue(const OUString& PropertyName )
-                                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 getPropertyValue(const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XDatePilotField
     virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL
-                                getItems() throw (css::uno::RuntimeException, std::exception) override;
+                                getItems() override;
 
                             // only called from property-functions:
     css::sheet::DataPilotFieldOrientation getOrientation() const;
@@ -576,23 +470,14 @@ public:
                             // XDataPilotFieldGrouping
     static bool HasString(const css::uno::Sequence< OUString >& aItems, const OUString& aString);
     virtual css::uno::Reference < css::sheet::XDataPilotField > SAL_CALL
-        createNameGroup(const css::uno::Sequence< OUString >& aItems)
-             throw (css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    std::exception) override;
+        createNameGroup(const css::uno::Sequence< OUString >& aItems) override;
     virtual css::uno::Reference < css::sheet::XDataPilotField > SAL_CALL
-        createDateGroup(const css::sheet::DataPilotFieldGroupInfo& rInfo)
-             throw (css::uno::RuntimeException,
-                    css::lang::IllegalArgumentException,
-                    std::exception) override;
+        createDateGroup(const css::sheet::DataPilotFieldGroupInfo& rInfo) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     css::uno::Reference< css::container::XIndexAccess >
@@ -633,64 +518,41 @@ public:
     virtual             ~ScDataPilotFieldGroupsObj() override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                                 // XNameReplace
     virtual void SAL_CALL replaceByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                throw (css::lang::IllegalArgumentException,
-                                    css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
 
                             // XNameContainer
     virtual void SAL_CALL insertByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                throw (css::lang::IllegalArgumentException,
-                                    css::container::ElementExistException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-                                throw (css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
                         // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // implementation
     /// @throws css::uno::RuntimeException
-    ScFieldGroup&       getFieldGroup( const OUString& rName ) throw(css::uno::RuntimeException);
+    ScFieldGroup&       getFieldGroup( const OUString& rName );
     /// @throws css::uno::RuntimeException
-    void                renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) throw(css::uno::RuntimeException);
+    void                renameFieldGroup( const OUString& rOldName, const OUString& rNewName );
 
 private:
     ScFieldGroups::iterator implFindByName( const OUString& rName );
@@ -716,63 +578,39 @@ public:
     virtual             ~ScDataPilotFieldGroupObj() override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                                 // XNameReplace
     virtual void SAL_CALL replaceByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                throw (css::lang::IllegalArgumentException,
-                                    css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
 
                                 // XNameContainer
     virtual void SAL_CALL insertByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                throw (css::lang::IllegalArgumentException,
-                                    css::container::ElementExistException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-                                throw (css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
                     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     ScDataPilotFieldGroupsObj& mrParent;
@@ -793,17 +631,13 @@ public:
     virtual             ~ScDataPilotFieldGroupItemObj() override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     ScDataPilotFieldGroupObj& mrParent;
@@ -826,38 +660,26 @@ public:
     virtual             ~ScDataPilotItemsObj() override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     ScDataPilotItemObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const;
@@ -882,56 +704,29 @@ public:
     virtual             ~ScDataPilotItemObj() override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw (css::beans::UnknownPropertyException,
-                                       css::beans::PropertyVetoException,
-                                       css::lang::IllegalArgumentException,
-                                       css::lang::WrappedTargetException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw (css::beans::UnknownPropertyException,
-                                       css::lang::WrappedTargetException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     SfxItemPropertySet  maPropSet;
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 233e25645e0f..115d5e7b1c58 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -126,77 +126,47 @@ public:
 
                             // XSubTotalDescriptor
     virtual void SAL_CALL   addNew( const css::uno::Sequence< css::sheet::SubTotalColumn >& aSubTotalColumns,
-                                sal_Int32 nGroupColumn )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   clear() throw(css::uno::RuntimeException, std::exception) override;
+                                sal_Int32 nGroupColumn ) override;
+    virtual void SAL_CALL   clear() override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScSubTotalDescriptorBase* getImplementation(const css::uno::Reference<css::sheet::XSubTotalDescriptor>& rObj);
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 //  ScSubTotalDescriptor - dummy container to use with XImportTarget
@@ -247,22 +217,17 @@ public:
     virtual                 ~ScSubTotalFieldObj() override;
 
                             // XSubTotalField
-    virtual sal_Int32 SAL_CALL getGroupColumn() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setGroupColumn( sal_Int32 nGroupColumn )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getGroupColumn() override;
+    virtual void SAL_CALL   setGroupColumn( sal_Int32 nGroupColumn ) override;
     virtual css::uno::Sequence< css::sheet::SubTotalColumn > SAL_CALL
-                            getSubTotalColumns() throw(css::uno::RuntimeException, std::exception) override;
+                            getSubTotalColumns() override;
     virtual void SAL_CALL   setSubTotalColumns( const css::uno::Sequence<
-                                css::sheet::SubTotalColumn >& aSubTotalColumns )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::SubTotalColumn >& aSubTotalColumns ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScConsolidationDescriptor : public cppu::WeakImplHelper<
@@ -280,36 +245,25 @@ public:
     const ScConsolidateParam& GetParam() const  { return aParam; }
 
                             // XConsolidationDescriptor
-    virtual css::sheet::GeneralFunction SAL_CALL getFunction()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFunction( css::sheet::GeneralFunction nFunction )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::sheet::GeneralFunction SAL_CALL getFunction() override;
+    virtual void SAL_CALL   setFunction( css::sheet::GeneralFunction nFunction ) override;
     virtual css::uno::Sequence< css::table::CellRangeAddress > SAL_CALL
-                            getSources(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setSources( const css::uno::Sequence< css::table::CellRangeAddress >& aSources )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellAddress SAL_CALL getStartOutputPosition()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            getSources(  ) override;
+    virtual void SAL_CALL   setSources( const css::uno::Sequence< css::table::CellRangeAddress >& aSources ) override;
+    virtual css::table::CellAddress SAL_CALL getStartOutputPosition() override;
     virtual void SAL_CALL   setStartOutputPosition(
-                                const css::table::CellAddress& aStartOutputPosition )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getUseColumnHeaders() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setUseColumnHeaders( sal_Bool bUseColumnHeaders )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getUseRowHeaders() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setUseRowHeaders( sal_Bool bUseRowHeaders )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getInsertLinks() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setInsertLinks( sal_Bool bInsertLinks )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                const css::table::CellAddress& aStartOutputPosition ) override;
+    virtual sal_Bool SAL_CALL getUseColumnHeaders() override;
+    virtual void SAL_CALL   setUseColumnHeaders( sal_Bool bUseColumnHeaders ) override;
+    virtual sal_Bool SAL_CALL getUseRowHeaders() override;
+    virtual void SAL_CALL   setUseRowHeaders( sal_Bool bUseRowHeaders ) override;
+    virtual sal_Bool SAL_CALL getInsertLinks() override;
+    virtual void SAL_CALL   setInsertLinks( sal_Bool bInsertLinks ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 //  ScFilterDescriptorBase - base class for FilterDescriptor
@@ -342,73 +296,46 @@ public:
 
                             // XSheetFilterDescriptor
     virtual css::uno::Sequence< css::sheet::TableFilterField > SAL_CALL
-                            getFilterFields() throw(css::uno::RuntimeException, std::exception) override;
+                            getFilterFields() override;
     virtual void SAL_CALL   setFilterFields( const css::uno::Sequence<
-                                css::sheet::TableFilterField >& aFilterFields )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::TableFilterField >& aFilterFields ) override;
 
                             // XSheetFilterDescriptor2
     virtual css::uno::Sequence< css::sheet::TableFilterField2 > SAL_CALL
-                            getFilterFields2() throw(css::uno::RuntimeException, std::exception) override;
+                            getFilterFields2() override;
     virtual void SAL_CALL   setFilterFields2( const css::uno::Sequence<
-                                css::sheet::TableFilterField2 >& aFilterFields )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::TableFilterField2 >& aFilterFields ) override;
 
                             // XSheetFilterDescriptor3
     virtual css::uno::Sequence< css::sheet::TableFilterField3 > SAL_CALL
-                            getFilterFields3() throw(css::uno::RuntimeException, std::exception) override;
+                            getFilterFields3() override;
     virtual void SAL_CALL   setFilterFields3( const css::uno::Sequence<
-                                css::sheet::TableFilterField3 >& aFilterFields )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::TableFilterField3 >& aFilterFields ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 //  ScFilterDescriptor - dummy container to use with XFilterable
@@ -499,85 +426,56 @@ public:
     void                    SetSubTotalParam(const ScSubTotalParam& rSubTotalParam);
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XDatabaseRange
-    virtual css::table::CellRangeAddress SAL_CALL getDataArea()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setDataArea( const css::table::CellRangeAddress& aDataArea )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::table::CellRangeAddress SAL_CALL getDataArea() override;
+    virtual void SAL_CALL   setDataArea( const css::table::CellRangeAddress& aDataArea ) override;
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-                            getSortDescriptor() throw(css::uno::RuntimeException, std::exception) override;
+                            getSortDescriptor() override;
     virtual css::uno::Reference< css::sheet::XSheetFilterDescriptor > SAL_CALL
-                            getFilterDescriptor() throw(css::uno::RuntimeException, std::exception) override;
+                            getFilterDescriptor() override;
     virtual css::uno::Reference< css::sheet::XSubTotalDescriptor > SAL_CALL
-                            getSubTotalDescriptor() throw(css::uno::RuntimeException, std::exception) override;
+                            getSubTotalDescriptor() override;
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-                            getImportDescriptor() throw(css::uno::RuntimeException, std::exception) override;
+                            getImportDescriptor() override;
 
                             // XRefreshable
-    virtual void SAL_CALL   refresh() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   refresh() override;
     virtual void SAL_CALL   addRefreshListener( const css::uno::Reference<
-                                    css::util::XRefreshListener >& l )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    css::util::XRefreshListener >& l ) override;
     virtual void SAL_CALL   removeRefreshListener( const css::uno::Reference<
-                                    css::util::XRefreshListener >& l )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    css::util::XRefreshListener >& l ) override;
 
                             // XCellRangeReferrer
     virtual css::uno::Reference< css::table::XCellRange > SAL_CALL
-                            getReferredCells() throw(css::uno::RuntimeException, std::exception) override;
+                            getReferredCells() override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScDatabaseRangesObj : public cppu::WeakImplHelper<
@@ -601,44 +499,30 @@ public:
 
                             // XDatabaseRanges
     virtual void SAL_CALL   addNewByName( const OUString& aName,
-                                const css::table::CellRangeAddress& aRange )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                const css::table::CellRangeAddress& aRange ) override;
+    virtual void SAL_CALL   removeByName( const OUString& aName ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScUnnamedDatabaseRangesObj : public cppu::WeakImplHelper<
@@ -655,16 +539,9 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XUnnamedDatabaseRanges
-    virtual void SAL_CALL setByTable( const css::table::CellRangeAddress& aRange )
-                                throw(css::uno::RuntimeException,
-                                      css::lang::IndexOutOfBoundsException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByTable( sal_Int32 nTab )
-                                throw(css::uno::RuntimeException,
-                                css::lang::IndexOutOfBoundsException,
-                                css::container::NoSuchElementException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByTable( sal_Int32 nTab )
-                                throw (css::uno::RuntimeException,
-                                css::lang::IndexOutOfBoundsException, std::exception) override;
+    virtual void SAL_CALL setByTable( const css::table::CellRangeAddress& aRange ) override;
+    virtual css::uno::Any SAL_CALL getByTable( sal_Int32 nTab ) override;
+    virtual sal_Bool SAL_CALL hasByTable( sal_Int32 nTab ) override;
 };
 
 #endif
diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx
index 62b80274fb4b..6fa01fbcd104 100644
--- a/sc/inc/defltuno.hxx
+++ b/sc/inc/defltuno.hxx
@@ -49,66 +49,33 @@ public:
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XPropertyState
     virtual css::beans::PropertyState SAL_CALL getPropertyState(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
-                            getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setPropertyToDefault( const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
+                            getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL   setPropertyToDefault( const OUString& PropertyName ) override;
     virtual css::uno::Any SAL_CALL getPropertyDefault(
-                                    const OUString& aPropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& aPropertyName ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index b54ad2fd5ae6..c6dab173dc44 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -60,27 +60,22 @@ public:
     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;
+                                        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;
+                            getSlaveDispatchProvider() override;
     virtual void SAL_CALL   setSlaveDispatchProvider( const css::uno::Reference<
-                                css::frame::XDispatchProvider >& xNewDispatchProvider )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                css::frame::XDispatchProvider >& xNewDispatchProvider ) override;
     virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
-                            getMasterDispatchProvider() throw(css::uno::RuntimeException, std::exception) override;
+                            getMasterDispatchProvider() override;
     virtual void SAL_CALL   setMasterDispatchProvider( const css::uno::Reference<
-                                css::frame::XDispatchProvider >& xNewSupplier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                css::frame::XDispatchProvider >& xNewSupplier ) 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;
 };
 
 class ScDispatch : public cppu::WeakImplHelper<
@@ -103,24 +98,17 @@ public:
 
                             /// 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;
+                                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 )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                                const css::util::URL& aURL ) 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;
+                                const css::util::URL& aURL ) override;
 
                             /// XSelectionChangeListener
-    virtual void SAL_CALL   selectionChanged( const css::lang::EventObject& aEvent )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+    virtual void SAL_CALL   selectionChanged( const css::lang::EventObject& aEvent ) 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;
 };
 
 #endif
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 55957f37ae2d..d4969581dfab 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -143,8 +143,7 @@ public:
     void                    NotifyChanges( const OUString& rOperation, const ScRangeList& rRanges,
                                            const css::uno::Sequence< css::beans::PropertyValue >& rProperties );
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
@@ -152,205 +151,136 @@ public:
 
                             /// XSpreadsheetDocument
     virtual css::uno::Reference< css::sheet::XSpreadsheets > SAL_CALL
-                            getSheets() throw(css::uno::RuntimeException, std::exception) override;
+                            getSheets() override;
 
                             /// XStyleFamiliesSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-                            getStyleFamilies() throw(css::uno::RuntimeException, std::exception) override;
+                            getStyleFamilies() override;
 
                             /// XRenderable
     virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection,
-                                    const css::uno::Sequence< css::beans::PropertyValue >& xOptions )
-                                throw (css::lang::IllegalArgumentException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override;
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
                             getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection,
-                                    const css::uno::Sequence< css::beans::PropertyValue >& xOptions )
-                                throw (css::lang::IllegalArgumentException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override;
     virtual void SAL_CALL   render( sal_Int32 nRenderer, const css::uno::Any& aSelection,
-                                    const css::uno::Sequence< css::beans::PropertyValue >& xOptions )
-                                throw (css::lang::IllegalArgumentException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override;
 
                             /// XLinkTargetSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-                            getLinks() throw(css::uno::RuntimeException, std::exception) override;
+                            getLinks() override;
 
                             /// XActionLockable
-    virtual sal_Bool SAL_CALL isActionLocked() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   addActionLock() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeActionLock() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setActionLocks( sal_Int16 nLock )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL resetActionLocks() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isActionLocked() override;
+    virtual void SAL_CALL   addActionLock() override;
+    virtual void SAL_CALL   removeActionLock() override;
+    virtual void SAL_CALL   setActionLocks( sal_Int16 nLock ) override;
+    virtual sal_Int16 SAL_CALL resetActionLocks() override;
 
-        virtual void SAL_CALL   lockControllers() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL   unlockControllers() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL   lockControllers() override;
+        virtual void SAL_CALL   unlockControllers() override;
 
                             /// XCalculatable
-    virtual void SAL_CALL   calculate() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   calculateAll() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAutomaticCalculationEnabled()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   enableAutomaticCalculation( sal_Bool bEnabled )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   calculate() override;
+    virtual void SAL_CALL   calculateAll() override;
+    virtual sal_Bool SAL_CALL isAutomaticCalculationEnabled() override;
+    virtual void SAL_CALL   enableAutomaticCalculation( sal_Bool bEnabled ) override;
 
                             /// XProtectable
-    virtual void SAL_CALL   protect( const OUString& aPassword )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   unprotect( const OUString& aPassword )
-                                throw(css::lang::IllegalArgumentException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isProtected() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   protect( const OUString& aPassword ) override;
+    virtual void SAL_CALL   unprotect( const OUString& aPassword ) override;
+    virtual sal_Bool SAL_CALL isProtected() override;
 
                             /// XDrawPagesSupplier
     virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL
-                            getDrawPages() throw(css::uno::RuntimeException, std::exception) override;
+                            getDrawPages() override;
 
                             /// XGoalSeek
     virtual css::sheet::GoalResult SAL_CALL seekGoal(
                                 const css::table::CellAddress& aFormulaPosition,
                                 const css::table::CellAddress& aVariablePosition,
-                                const OUString& aGoalValue )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
+                                const OUString& aGoalValue ) override;
 
                             /// XConsolidatable
     virtual css::uno::Reference< css::sheet::XConsolidationDescriptor >
-                            SAL_CALL createConsolidationDescriptor( sal_Bool bEmpty )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL consolidate( const css::uno::Reference< css::sheet::XConsolidationDescriptor >& xDescriptor )
-                                    throw (css::uno::RuntimeException,
-                                          std::exception) override;
+                            SAL_CALL createConsolidationDescriptor( sal_Bool bEmpty ) override;
+    virtual void SAL_CALL consolidate( const css::uno::Reference< css::sheet::XConsolidationDescriptor >& xDescriptor ) override;
 
                             /// XDocumentAuditing
-    virtual void SAL_CALL   refreshArrows() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   refreshArrows() override;
 
                             /// XViewDataSupplier
-    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getViewData(  )
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getViewData(  ) override;
 
                             /// XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             /// XMultiServiceFactory
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-                            createInstance( const OUString& aServiceSpecifier )
-                                throw(css::uno::Exception,
-                                        css::uno::RuntimeException, std::exception) override;
+                            createInstance( const OUString& aServiceSpecifier ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
                             createInstanceWithArguments( const OUString& ServiceSpecifier,
-                                const css::uno::Sequence< css::uno::Any >& Arguments )
-                                throw(css::uno::Exception,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             /// XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScModelObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj);
 
                             /// XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
                             /// XChangesNotifier
-    virtual void SAL_CALL addChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) override;
+    virtual void SAL_CALL removeChangesListener( const css::uno::Reference< css::util::XChangesListener >& aListener ) override;
 
     // XOpenCLSelection
-    virtual sal_Bool SAL_CALL isOpenCLEnabled()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isOpenCLEnabled() override;
 
-    virtual void SAL_CALL enableOpenCL(sal_Bool bEnable)
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL enableOpenCL(sal_Bool bEnable) override;
 
-    virtual void SAL_CALL enableAutomaticDeviceSelection(sal_Bool bForce)
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL enableAutomaticDeviceSelection(sal_Bool bForce) override;
 
-    virtual void SAL_CALL disableAutomaticDeviceSelection()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disableAutomaticDeviceSelection() override;
 
-    virtual void SAL_CALL selectOpenCLDevice( sal_Int32 platform, sal_Int32 device )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectOpenCLDevice( sal_Int32 platform, sal_Int32 device ) override;
 
-    virtual sal_Int32 SAL_CALL getPlatformID()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getPlatformID() override;
 
-    virtual sal_Int32 SAL_CALL getDeviceID()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getDeviceID() override;
 
     virtual css::uno::Sequence< css::sheet::opencl::OpenCLPlatform >
-        SAL_CALL getOpenCLPlatforms()
-                                throw(css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getOpenCLPlatforms() override;
 
-    virtual void SAL_CALL enableOpcodeSubsetTest()
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL enableOpcodeSubsetTest() override;
 
-    virtual void SAL_CALL disableOpcodeSubsetTest()
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disableOpcodeSubsetTest() override;
 
-    virtual sal_Bool SAL_CALL isOpcodeSubsetTested()
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isOpcodeSubsetTested() override;
 
-    virtual void SAL_CALL setFormulaCellNumberLimit( sal_Int32 number )
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFormulaCellNumberLimit( sal_Int32 number ) override;
 
-    virtual sal_Int32 SAL_CALL getFormulaCellNumberLimit()
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getFormulaCellNumberLimit() override;
 
     /// @see vcl::ITiledRenderable::paintTile().
     virtual void paintTile( VirtualDevice& rDevice,
@@ -447,30 +377,21 @@ public:
 
                             /// XDrawPages
     virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL
-                            insertNewByIndex( sal_Int32 nIndex )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            insertNewByIndex( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL   remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) override;
 
                             /// XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             /// XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScTableSheetsObj : public cppu::WeakImplHelper<
@@ -494,92 +415,58 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             /// XSpreadsheets
-    virtual void SAL_CALL   insertNewByName( const OUString& aName, sal_Int16 nPosition )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   moveByName( const OUString& aName, sal_Int16 nDestination )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual void SAL_CALL   insertNewByName( const OUString& aName, sal_Int16 nPosition ) override;
+    virtual void SAL_CALL   moveByName( const OUString& aName, sal_Int16 nDestination ) override;
     virtual void SAL_CALL   copyByName( const OUString& aName,
-                                const OUString& aCopy, sal_Int16 nDestination )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
+                                const OUString& aCopy, sal_Int16 nDestination ) override;
 
                             /// XSpreadsheets2
     virtual sal_Int32 SAL_CALL importSheet(
         const css::uno::Reference< css::sheet::XSpreadsheetDocument > & xDocSrc,
         const OUString& srcName,
-        sal_Int32 nDestPosition)
-        throw(css::lang::IllegalArgumentException,
-              css::lang::IndexOutOfBoundsException,
-              css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nDestPosition) override;
 
                             /// XCellRangesAccess
 
     virtual css::uno::Reference< css::table::XCell >
-        SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet ) override;
 
     virtual css::uno::Reference< css::table::XCellRange >
-        SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet ) override;
 
     virtual css::uno::Sequence < css::uno::Reference< css::table::XCellRange > >
-        SAL_CALL getCellRangesByName( const OUString& aRange )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getCellRangesByName( const OUString& aRange ) override;
 
                             /// XNameContainer
     virtual void SAL_CALL   insertByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::container::ElementExistException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByName( const OUString& Name )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL   removeByName( const OUString& Name ) override;
 
                             /// XNameReplace
     virtual void SAL_CALL   replaceByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
 
                             /// XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             /// XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             /// XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             /// XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScTableColumnsObj : public cppu::WeakImplHelper<
@@ -607,82 +494,46 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             /// XTableColumns
-    virtual void SAL_CALL   insertByIndex( sal_Int32 nIndex, sal_Int32 nCount )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override;
+    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override;
 
                             /// XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             /// XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             /// XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             /// XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             /// XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException,
-                                    std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScTableRowsObj : public cppu::WeakImplHelper<
@@ -708,71 +559,40 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             /// XTableRows
-    virtual void SAL_CALL   insertByIndex( sal_Int32 nIndex, sal_Int32 nCount )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override;
+    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override;
 
                             /// XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             /// XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             /// XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             /// XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper<
@@ -785,47 +605,23 @@ public:
 
                             /// XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScAnnotationsObj : public cppu::WeakImplHelper<
@@ -849,36 +645,25 @@ public:
 
                             /// XSheetAnnotations
     virtual void SAL_CALL   insertNew( const css::table::CellAddress& aPosition,
-                                const OUString& aText )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                const OUString& aText ) override;
+    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex ) override;
 
                             /// XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             /// XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             /// XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScScenariosObj : public cppu::WeakImplHelper<
@@ -905,44 +690,30 @@ public:
                             /// XScenarios
     virtual void SAL_CALL   addNewByName( const OUString& aName,
                                 const css::uno::Sequence< css::table::CellRangeAddress >& aRanges,
-                                const OUString& aComment )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                const OUString& aComment ) override;
+    virtual void SAL_CALL   removeByName( const OUString& aName ) override;
 
                             /// XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             /// XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             /// XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             /// XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index 128853020ee8..2cb65bae2617 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -179,75 +179,45 @@ public:
 
                             // XDimensionsSupplier
     virtual css::uno::Reference< css::container::XNameAccess >
-                            SAL_CALL getDimensions(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getDimensions(  ) override;
 
                             // XDataPilotResults
-    virtual css::uno::Sequence< css::uno::Sequence< css::sheet::DataResult > > SAL_CALL getResults(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::sheet::DataResult > > SAL_CALL getResults(  ) override;
 
     virtual css::uno::Sequence<double> SAL_CALL
         getFilteredResults(
-            const css::uno::Sequence<css::sheet::DataPilotFieldFilter>& aFilters )
-                throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence<css::sheet::DataPilotFieldFilter>& aFilters ) override;
 
                             // XRefreshable
-    virtual void SAL_CALL   refresh() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   refresh() override;
+    virtual void SAL_CALL   addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
+    virtual void SAL_CALL   removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
 
                             // XDrillDownDataSupplier
     virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > >
         SAL_CALL getDrillDownData(const css::uno::Sequence<
-                                      css::sheet::DataPilotFieldFilter >& aFilters )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                      css::sheet::DataPilotFieldFilter >& aFilters ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 #if DUMP_PIVOT_TABLE
     void DumpResults() const;
@@ -270,27 +240,18 @@ public:
     void                    CountChanged();
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     long            getCount() const;
     ScDPDimension*  getByIndex(long nIndex) const;
@@ -335,63 +296,38 @@ public:
     const OUString*  GetSubtotalName() const;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XHierarchiesSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-                            getHierarchies() throw(css::uno::RuntimeException, std::exception) override;
+                            getHierarchies() override;
 
                             // XCloneable
     virtual css::uno::Reference< css::util::XCloneable > SAL_CALL
-                            createClone() throw(css::uno::RuntimeException, std::exception) override;
+                            createClone() override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     sal_uInt16 getOrientation() const;
     bool getIsDataLayoutDimension() const;
@@ -422,27 +358,18 @@ public:
     virtual                 ~ScDPHierarchies() override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static long     getCount();
     ScDPHierarchy*  getByIndex(long nIndex) const;
@@ -466,21 +393,17 @@ public:
     ScDPLevels*             GetLevelsObject();
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XLevelsSupplier
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-                            getLevels() throw(css::uno::RuntimeException, std::exception) override;
+                            getLevels() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScDPLevels : public cppu::WeakImplHelper<
@@ -499,27 +422,18 @@ public:
     virtual                 ~ScDPLevels() override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     long            getCount() const;
     ScDPLevel*      getByIndex(long nIndex) const;
@@ -557,62 +471,37 @@ public:
     ScDPMembers*            GetMembersObject();
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XMembersSupplier
     virtual css::uno::Reference< css::sheet::XMembersAccess > SAL_CALL
-                            getMembers() throw(css::uno::RuntimeException, std::exception) override;
+                            getMembers() override;
 
                             // XDataPilotMemberResults
     virtual css::uno::Sequence< css::sheet::MemberResult > SAL_CALL
-                            getResults() throw(css::uno::RuntimeException, std::exception) override;
+                            getResults() override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     css::uno::Sequence<sal_Int16> getSubTotals() const;
     bool getShowEmpty() const { return bShowEmpty;}
@@ -673,31 +562,21 @@ public:
     virtual                 ~ScDPMembers() override;
 
                             // XMembersAccess
-    virtual css::uno::Sequence< OUString > SAL_CALL getLocaleIndependentElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getLocaleIndependentElementNames() override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     long                    getCount() const { return nMbrCount;}
     ScDPMember*             getByIndex(long nIndex) const;
@@ -709,8 +588,7 @@ public:
 
 private:
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > getElementNames( bool bLocaleIndependent ) const
-                                throw(css::uno::RuntimeException, std::exception);
+    css::uno::Sequence< OUString > getElementNames( bool bLocaleIndependent ) const;
 };
 
 class ScDPMember : public cppu::WeakImplHelper<
@@ -749,54 +627,29 @@ public:
     sal_Int32               Compare( const ScDPMember& rOther ) const;      // visible order
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     bool isVisible() const { return bVisible;}
     bool getShowDetails() const { return bShowDet;}
diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx
index 8099aa55e3f5..504c7cd5cdcc 100644
--- a/sc/inc/eventuno.hxx
+++ b/sc/inc/eventuno.hxx
@@ -46,34 +46,21 @@ public:
 
                             // XNameReplace
     virtual void SAL_CALL   replaceByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 79fc090fe412..e176ac862de9 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -79,42 +79,30 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XContainer
-    virtual void SAL_CALL   addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    virtual void SAL_CALL   removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
                             // XRefreshable
-    virtual void SAL_CALL refresh(  )
-                                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                    throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
+    virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
+    virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScHeaderFieldsObj : public cppu::WeakImplHelper<
@@ -141,42 +129,30 @@ public:
     virtual                 ~ScHeaderFieldsObj() override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XContainer
-    virtual void SAL_CALL   addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    virtual void SAL_CALL   removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
                             // XRefreshable
-    virtual void SAL_CALL refresh(  )
-                                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                    throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh(  ) override;
+    virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
+    virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 /**
@@ -240,77 +216,44 @@ public:
         ScEditSource* pEditSrc, const ESelection& rSel);
 
                             // XTextField
-    virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) override;
 
                             // XTextContent
-    virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange )
-                                    throw(css::lang::IllegalArgumentException,
-                                            css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getAnchor() throw(css::uno::RuntimeException, std::exception) override;
+                            getAnchor() override;
 
                             // XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
 #endif
diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx
index 12d22860e294..01acc3ccc565 100644
--- a/sc/inc/filtuno.hxx
+++ b/sc/inc/filtuno.hxx
@@ -53,37 +53,24 @@ public:
 
                             // XPropertyAccess
     virtual css::uno::Sequence< css::beans::PropertyValue >
-                            SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertyValues() override;
     virtual void SAL_CALL   setPropertyValues( const css::uno::Sequence<
-                                    css::beans::PropertyValue >& aProps )
-                                throw (css::beans::UnknownPropertyException,
-                                        css::beans::PropertyVetoException,
-                                        css::lang::IllegalArgumentException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                    css::beans::PropertyValue >& aProps ) override;
 
                             // XExecutableDialog
-    virtual void SAL_CALL   setTitle( const OUString& aTitle )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setTitle( const OUString& aTitle ) override;
+    virtual sal_Int16 SAL_CALL execute() override;
 
                             // XImporter
-    virtual void SAL_CALL   setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-                                throw (css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
                             // XExporter
-    virtual void SAL_CALL   setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-                                throw (css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 547989d82d31..045f5d0c69ba 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -88,52 +88,37 @@ public:
                                 formula::FormulaGrammar::Grammar eGrammar) const;
 
                             // XSheetConditionalEntries
-    virtual void SAL_CALL   addNew( const css::uno::Sequence< css::beans::PropertyValue >& aConditionalEntry )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   clear() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   addNew( const css::uno::Sequence< css::beans::PropertyValue >& aConditionalEntry ) override;
+    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL   clear() override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScTableConditionalFormat* getImplementation(const css::uno::Reference<css::sheet::XSheetConditionalEntries>& rObj);
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScTableConditionalEntry : public cppu::WeakImplHelper<
@@ -152,37 +137,25 @@ public:
     void                    GetData(ScCondFormatEntryItem& rData) const;
 
                             // XSheetCondition
-    virtual css::sheet::ConditionOperator SAL_CALL getOperator()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getConditionOperator()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setOperator( css::sheet::ConditionOperator nOperator )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setConditionOperator( sal_Int32 nOperator )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getFormula1() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFormula1( const OUString& aFormula1 )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getFormula2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFormula2( const OUString& aFormula2 )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellAddress SAL_CALL getSourcePosition()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::sheet::ConditionOperator SAL_CALL getOperator() override;
+    virtual sal_Int32 SAL_CALL getConditionOperator() override;
+    virtual void SAL_CALL   setOperator( css::sheet::ConditionOperator nOperator ) override;
+    virtual void SAL_CALL   setConditionOperator( sal_Int32 nOperator ) override;
+    virtual OUString SAL_CALL getFormula1() override;
+    virtual void SAL_CALL   setFormula1( const OUString& aFormula1 ) override;
+    virtual OUString SAL_CALL getFormula2() override;
+    virtual void SAL_CALL   setFormula2( const OUString& aFormula2 ) override;
+    virtual css::table::CellAddress SAL_CALL getSourcePosition() override;
+    virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition ) override;
 
                             // XSheetConditionalEntry
-    virtual OUString SAL_CALL getStyleName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setStyleName( const OUString& aStyleName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getStyleName() override;
+    virtual void SAL_CALL   setStyleName( const OUString& aStyleName ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScTableValidationObj : public cppu::WeakImplHelper<
@@ -229,85 +202,50 @@ public:
                                                 formula::FormulaGrammar::Grammar eGrammar ) const;
 
                             // XSheetCondition
-    virtual css::sheet::ConditionOperator SAL_CALL getOperator()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getConditionOperator()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setOperator( css::sheet::ConditionOperator nOperator )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setConditionOperator( sal_Int32 nOperator )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getFormula1() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFormula1( const OUString& aFormula1 )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getFormula2() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFormula2( const OUString& aFormula2 )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellAddress SAL_CALL getSourcePosition()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::sheet::ConditionOperator SAL_CALL getOperator() override;
+    virtual sal_Int32 SAL_CALL getConditionOperator() override;
+    virtual void SAL_CALL   setOperator( css::sheet::ConditionOperator nOperator ) override;
+    virtual void SAL_CALL   setConditionOperator( sal_Int32 nOperator ) override;
+    virtual OUString SAL_CALL getFormula1() override;
+    virtual void SAL_CALL   setFormula1( const OUString& aFormula1 ) override;
+    virtual OUString SAL_CALL getFormula2() override;
+    virtual void SAL_CALL   setFormula2( const OUString& aFormula2 ) override;
+    virtual css::table::CellAddress SAL_CALL getSourcePosition() override;
+    virtual void SAL_CALL setSourcePosition( const css::table::CellAddress& aSourcePosition ) override;
 
                             // XMultiFormulaTokens
     virtual css::uno::Sequence< css::sheet::FormulaToken >
-                            SAL_CALL getTokens( sal_Int32 nIndex )
-                                throw(css::uno::RuntimeException,css::lang::IndexOutOfBoundsException, std::exception) override;
+                            SAL_CALL getTokens( sal_Int32 nIndex ) override;
     virtual void SAL_CALL setTokens( sal_Int32 nIndex,
-                                     const css::uno::Sequence< css::sheet::FormulaToken >& aTokens )
-                                throw(css::uno::RuntimeException,css::lang::IndexOutOfBoundsException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
+                                     const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScTableValidationObj* getImplementation(const css::uno::Reference<css::beans::XPropertySet>& rObj);
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 267c7f31706c..ad32fb6d3e54 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -73,55 +73,27 @@ public:
                             // XFunctionAccess
     virtual css::uno::Any SAL_CALL callFunction(
                                     const OUString& aName,
-                                    const css::uno::Sequence< css::uno::Any >& aArguments )
-                                throw (css::container::NoSuchElementException,
-                                       css::lang::IllegalArgumentException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index efbfc35311fa..f6f0a3e97b86 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -72,56 +72,29 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XRefreshable
-    virtual void SAL_CALL   refresh()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   refresh() override;
+    virtual void SAL_CALL   addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
+    virtual void SAL_CALL   removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // aus get/setPropertyValue gerufen:
     OUString         getFileName() const;
@@ -134,12 +107,9 @@ public:
     void                    setRefreshDelay(sal_Int32 nRefreshDelay);
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScSheetLinksObj : public cppu::WeakImplHelper<
@@ -162,38 +132,26 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScAreaLinkObj : public cppu::WeakImplHelper<
@@ -222,50 +180,24 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XRefreshable
-    virtual void SAL_CALL   refresh()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   refresh() override;
+    virtual void SAL_CALL   addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
+    virtual void SAL_CALL   removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // called from get/setPropertyValue:
     OUString                getFileName() const;
@@ -278,21 +210,15 @@ public:
     void                    setRefreshDelay(sal_Int32 nRefreshDelay);
 
                             // XAreaLink
-    virtual OUString SAL_CALL getSourceArea() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setSourceArea( const OUString& aSourceArea )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellRangeAddress SAL_CALL getDestArea()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDestArea( const css::table::CellRangeAddress& aDestArea )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSourceArea() override;
+    virtual void SAL_CALL   setSourceArea( const OUString& aSourceArea ) override;
+    virtual css::table::CellRangeAddress SAL_CALL getDestArea() override;
+    virtual void SAL_CALL setDestArea( const css::table::CellRangeAddress& aDestArea ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScAreaLinksObj : public cppu::WeakImplHelper<
@@ -317,34 +243,25 @@ public:
                                                 const OUString& aFileName,
                                                 const OUString& aSourceArea,
                                                 const OUString& aFilter,
-                                                const OUString& aFilterOptions )
-                                            throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex )
-                                            throw(css::uno::RuntimeException, std::exception) override;
+                                                const OUString& aFilterOptions ) override;
+    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 //! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols
@@ -374,40 +291,29 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XDDELink
-    virtual OUString SAL_CALL getApplication() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTopic() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getItem() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getApplication() override;
+    virtual OUString SAL_CALL getTopic() override;
+    virtual OUString SAL_CALL getItem() override;
 
                             // XRefreshable
-    virtual void SAL_CALL   refresh() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   refresh() override;
+    virtual void SAL_CALL   addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
+    virtual void SAL_CALL   removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) override;
 
                             // XDDELinkResults
     virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > >
-        SAL_CALL getResults(  )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        SAL_CALL getResults(  ) override;
     virtual void SAL_CALL setResults(
-        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aResults )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aResults ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScDDELinksObj : public cppu::WeakImplHelper<
@@ -430,45 +336,31 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XDDELinks
     virtual css::uno::Reference< css::sheet::XDDELink > SAL_CALL addDDELink(
         const OUString& aApplication, const OUString& aTopic,
-        const OUString& aItem, css::sheet::DDELinkMode nMode )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        const OUString& aItem, css::sheet::DDELinkMode nMode ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScExternalSheetCacheObj : public cppu::WeakImplHelper< css::sheet::XExternalSheetCache >
@@ -479,21 +371,16 @@ public:
 
                             // XExternalSheetCache
     virtual void SAL_CALL setCellValue(
-        sal_Int32 nCol, sal_Int32 nRow, const css::uno::Any& rAny)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nCol, sal_Int32 nRow, const css::uno::Any& rAny) override;
 
-    virtual css::uno::Any SAL_CALL getCellValue(sal_Int32 nCol, sal_Int32 nRow)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCellValue(sal_Int32 nCol, sal_Int32 nRow) override;
 
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllRows()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllRows() override;
 
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllColumns(sal_Int32 nRow)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getAllColumns(sal_Int32 nRow) override;
 
     // Attributes
-    virtual sal_Int32 SAL_CALL getTokenIndex()
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getTokenIndex() override;
 
 private:
     ScExternalSheetCacheObj(const ScExternalSheetCacheObj&) = delete;
@@ -512,38 +399,27 @@ public:
 
                             // XExternalDocLink
     virtual css::uno::Reference< css::sheet::XExternalSheetCache >
-        SAL_CALL addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache )
-            throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Attributes
-    virtual sal_Int32 SAL_CALL getTokenIndex()
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getTokenIndex() override;
 
 private:
     ScDocShell* mpDocShell;
@@ -560,34 +436,24 @@ public:
 
                             // XExternalDocLinks
     virtual css::uno::Reference< css::sheet::XExternalDocLink >
-        SAL_CALL addDocLink( const OUString& aDocName )
-            throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL addDocLink( const OUString& aDocName ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
 private:
     ScExternalDocLinksObj(const ScExternalDocLinksObj&) = delete;
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index d939d77a6759..e3af738b95b9 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -32,18 +32,15 @@
 
 #define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii )            \
 OUString SAL_CALL ClassName::getImplementationName()                      \
-    throw(css::uno::RuntimeException, std::exception)                                   \
 {                                                                                    \
     return OUString(ClassNameAscii);                         \
 }                                                                                    \
 sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \
-    throw(css::uno::RuntimeException, std::exception)                                   \
 {                                                                                    \
     return cppu::supportsService(this, ServiceName);                                \
 }                                                                                    \
 css::uno::Sequence< OUString >                                   \
     SAL_CALL ClassName::getSupportedServiceNames()                           \
-    throw(css::uno::RuntimeException, std::exception)                                   \
 {                                                                                    \
     css::uno::Sequence< OUString > aRet { ServiceAscii };                  \
     return aRet;                                                                     \
@@ -52,23 +49,15 @@ css::uno::Sequence< OUString >                                   \
 #define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName )                                \
     void SAL_CALL ClassName::addPropertyChangeListener( const OUString&,       \
                             const uno::Reference<beans::XPropertyChangeListener>&)  \
-                            throw(beans::UnknownPropertyException,                  \
-                            lang::WrappedTargetException, uno::RuntimeException, std::exception)    \
     { OSL_FAIL("not implemented"); }                                                \
     void SAL_CALL ClassName::removePropertyChangeListener( const OUString&,    \
                             const uno::Reference<beans::XPropertyChangeListener>&)  \
-                            throw(beans::UnknownPropertyException,                  \
-                            lang::WrappedTargetException, uno::RuntimeException, std::exception)    \
     { OSL_FAIL("not implemented"); }                                                \
     void SAL_CALL ClassName::addVetoableChangeListener( const OUString&,       \
                             const uno::Reference<beans::XVetoableChangeListener>&)  \
-                            throw(beans::UnknownPropertyException,                  \
-                            lang::WrappedTargetException, uno::RuntimeException, std::exception)    \
     { OSL_FAIL("not implemented"); }                                                \
     void SAL_CALL ClassName::removeVetoableChangeListener( const OUString&,    \
                             const uno::Reference<beans::XVetoableChangeListener>&)  \
-                            throw(beans::UnknownPropertyException,                  \
-                            lang::WrappedTargetException, uno::RuntimeException, std::exception)    \
     { OSL_FAIL("not implemented"); }
 
 #define SC_QUERYINTERFACE(x)    \
@@ -97,19 +86,13 @@ public:
     virtual                 ~ScIndexEnumeration() override;
 
                             // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement()
-                                throw(css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 //  new (uno 3) variant
@@ -127,24 +110,17 @@ public:
     virtual                 ~ScNameToIndexAccess() override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 class SC_DLLPUBLIC ScUnoHelpFunctions
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index befd15efe3bf..62375e598007 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -75,88 +75,50 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             /// XNamedRange
-    virtual OUString SAL_CALL getContent() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setContent( const OUString& aContent )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual css::table::CellAddress SAL_CALL getReferencePosition()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getContent() override;
+    virtual void SAL_CALL   setContent( const OUString& aContent ) override;
+    virtual css::table::CellAddress SAL_CALL getReferencePosition() override;
     virtual void SAL_CALL   setReferencePosition(
-                                const css::table::CellAddress& aReferencePosition )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
-    virtual sal_Int32       SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setType( sal_Int32 nType )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+                                const css::table::CellAddress& aReferencePosition ) override;
+    virtual sal_Int32       SAL_CALL getType() override;
+    virtual void SAL_CALL   setType( sal_Int32 nType ) override;
 
                             /// XFormulaTokens
-    virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+    virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL getTokens() override;
+    virtual void SAL_CALL   setTokens( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens ) override;
 
                             /// XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             /// XCellRangeReferrer
     virtual css::uno::Reference< css::table::XCellRange > SAL_CALL
-                            getReferredCells() throw(css::uno::RuntimeException, std::exception) override;
+                            getReferredCells() override;
 
                             /// XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             /// XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScNamedRangesObj : public ::cppu::WeakImplHelper<
@@ -200,95 +162,57 @@ public:
 
                             /// XNamedRanges
     virtual void SAL_CALL   addNewByName( const OUString& aName, const OUString& aContent,
-                                const css::table::CellAddress& aPosition, sal_Int32 nType )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
+                                const css::table::CellAddress& aPosition, sal_Int32 nType ) override;
     virtual void SAL_CALL   addNewFromTitles( const css::table::CellRangeAddress& aSource,
-                                css::sheet::Border aBorder )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   outputList( const css::table::CellAddress& aOutputPosition )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                css::sheet::Border aBorder ) override;
+    virtual void SAL_CALL   removeByName( const OUString& aName ) override;
+    virtual void SAL_CALL   outputList( const css::table::CellAddress& aOutputPosition ) override;
 
                             /// XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             /// XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             /// XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             /// XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             /// XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             /// XActionLockable
-    virtual sal_Bool SAL_CALL isActionLocked() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addActionLock() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeActionLock() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL resetActionLocks() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isActionLocked() override;
+    virtual void SAL_CALL addActionLock() override;
+    virtual void SAL_CALL removeActionLock() override;
+    virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) override;
+    virtual sal_Int16 SAL_CALL resetActionLocks() override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScGlobalNamedRangesObj: public ScNamedRangesObj
@@ -343,22 +267,15 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             /// XLabelRange
-    virtual css::table::CellRangeAddress SAL_CALL getLabelArea()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setLabelArea( const css::table::CellRangeAddress& aLabelArea )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellRangeAddress SAL_CALL getDataArea()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setDataArea( const css::table::CellRangeAddress& aDataArea )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::table::CellRangeAddress SAL_CALL getLabelArea() override;
+    virtual void SAL_CALL   setLabelArea( const css::table::CellRangeAddress& aLabelArea ) override;
+    virtual css::table::CellRangeAddress SAL_CALL getDataArea() override;
+    virtual void SAL_CALL   setDataArea( const css::table::CellRangeAddress& aDataArea ) override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScLabelRangesObj : public ::cppu::WeakImplHelper<
@@ -381,34 +298,25 @@ public:
 
                             /// XLabelRanges
     virtual void SAL_CALL   addNew( const css::table::CellRangeAddress& aLabelArea,
-                                const css::table::CellRangeAddress& aDataArea )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                const css::table::CellRangeAddress& aDataArea ) override;
+    virtual void SAL_CALL   removeByIndex( sal_Int32 nIndex ) override;
 
                             /// XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             /// XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             /// XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index e849b3e3da86..015132a7b4fa 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -50,66 +50,46 @@ public:
 
                             /// XChild
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-                            getParent() throw(css::uno::RuntimeException, std::exception) override;
+                            getParent() override;
     virtual void SAL_CALL   setParent( const css::uno::Reference<
-                                        css::uno::XInterface >& Parent )
-                                    throw(css::lang::NoSupportException,
-                                            css::uno::RuntimeException, std::exception) override;
+                                        css::uno::XInterface >& Parent ) override;
 
                             /// XSimpleText
     virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
-                            createTextCursor() throw(css::uno::RuntimeException, std::exception) override;
+                            createTextCursor() override;
     virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
-                            createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) override;
     virtual void SAL_CALL   insertString( const css::uno::Reference<
                                         css::text::XTextRange >& xRange,
-                                        const OUString& aString, sal_Bool bAbsorb )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                        const OUString& aString, sal_Bool bAbsorb ) override;
     virtual void SAL_CALL   insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange,
-                                        sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                        sal_Int16 nControlCharacter, sal_Bool bAbsorb ) override;
 
                             /// XTextRange
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getText() throw(css::uno::RuntimeException, std::exception) override;
+                            getText() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getStart() throw(css::uno::RuntimeException, std::exception) override;
+                            getStart() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getEnd() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setString( const OUString& aString )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL   setString( const OUString& aString ) override;
 
                             /// XSheetAnnotation
-    virtual css::table::CellAddress SAL_CALL getPosition()
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAuthor()
-        throw(css::uno::RuntimeException,
-              std::exception) override;
-    virtual OUString SAL_CALL getDate()
-        throw(css::uno::RuntimeException,
-              std::exception) override;
-    virtual sal_Bool SAL_CALL getIsVisible()
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
-    virtual void SAL_CALL setIsVisible( sal_Bool bIsVisible )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::table::CellAddress SAL_CALL getPosition() override;
+    virtual OUString SAL_CALL getAuthor() override;
+    virtual OUString SAL_CALL getDate() override;
+    virtual sal_Bool SAL_CALL getIsVisible() override;
+    virtual void SAL_CALL setIsVisible( sal_Bool bIsVisible ) override;
 
                             /// XSheetAnnotationShapeSupplier
     virtual css::uno::Reference < css::drawing::XShape > SAL_CALL
-                            getAnnotationShape()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            getAnnotationShape() override;
 
                             /// XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     SvxUnoText&         GetUnoText();
diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx
index ca201c342a29..84dbc7665ce8 100644
--- a/sc/inc/optuno.hxx
+++ b/sc/inc/optuno.hxx
@@ -66,18 +66,9 @@ public:
     // get/setPropertyValue override to used stored options instead of document
 
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException,
-                                    std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
 };
 
 #endif
diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx
index f7303919799b..4da521a9359d 100644
--- a/sc/inc/pageuno.hxx
+++ b/sc/inc/pageuno.hxx
@@ -30,16 +30,12 @@ public:
     ScPageObj(SdrPage* pPage);
     virtual ~ScPageObj() throw() override;
 
-    virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index f4e9e7ec4dfb..df3eef981a84 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -91,141 +91,84 @@ public:
 
                             // XInterface
     virtual css::uno::Any SAL_CALL queryInterface(
-                                const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException,
-                                    std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException,
-                                    std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
-                            getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setPropertyToDefault( const OUString& PropertyName )
-                                throw (css::beans::UnknownPropertyException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                            getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL   setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
                             // XTextContent
-    virtual void SAL_CALL   attach(const css::uno::Reference< css::text::XTextRange > & xTextRange)
-                                throw( css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL   attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getAnchor()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            getAnchor() override;
 
                             // XComponent
-    virtual void SAL_CALL   dispose() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL   addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener)
-                                throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL   removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener)
-                                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL   dispose() override;
+    virtual void SAL_CALL   addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
+    virtual void SAL_CALL   removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
 
                             // XText
     virtual void SAL_CALL   insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange,
                                 const css::uno::Reference< css::text::XTextContent >& xContent,
-                                sal_Bool bAbsorb )
-                                    throw(css::lang::IllegalArgumentException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent )
-                                    throw(css::container::NoSuchElementException,
-                                            css::uno::RuntimeException, std::exception) override;
+                                sal_Bool bAbsorb ) override;
+    virtual void SAL_CALL   removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) override;
 
                             // XSimpleText
     virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
-                            createTextCursor() throw(css::uno::RuntimeException, std::exception) override;
+                            createTextCursor() override;
     virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
-                            createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) override;
     virtual void SAL_CALL   insertString( const css::uno::Reference< css::text::XTextRange >& xRange,
-                                        const OUString& aString, sal_Bool bAbsorb )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                        const OUString& aString, sal_Bool bAbsorb ) override;
     virtual void SAL_CALL   insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange,
-                                        sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                        sal_Int16 nControlCharacter, sal_Bool bAbsorb ) override;
 
                             // XTextRange
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getText() throw(css::uno::RuntimeException, std::exception) override;
+                            getText() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getStart() throw(css::uno::RuntimeException, std::exception) override;
+                            getStart() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getEnd() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setString( const OUString& aString )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL   setString( const OUString& aString ) override;
 
     // XChild
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent()
-                            throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent )
-                            throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) override;
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
                             // XEventsSupplier
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw (css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override ;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 #endif
diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx
index 60f93d456203..d139311f4fc5 100644
--- a/sc/inc/srchuno.hxx
+++ b/sc/inc/srchuno.hxx
@@ -45,68 +45,41 @@ public:
     SvxSearchItem*          GetSearchItem() const       { return pSearchItem.get(); }
 
                             // XReplaceDescriptor
-    virtual OUString SAL_CALL getReplaceString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setReplaceString( const OUString& aReplaceString )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getReplaceString() override;
+    virtual void SAL_CALL   setReplaceString( const OUString& aReplaceString ) override;
 
                             // XSearchDescriptor
-    virtual OUString SAL_CALL getSearchString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setSearchString( const OUString& aString )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSearchString() override;
+    virtual void SAL_CALL   setSearchString( const OUString& aString ) override;
 
                             // search/replace should be called from outside (from XSearchable)...
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                                 // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
-                                    sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScCellSearchObj* getImplementation(const css::uno::Reference<css::util::XSearchDescriptor>& rObj);
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 5eef0928930c..f0a6408b7efc 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -66,54 +66,36 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XStyleLoader
     virtual void SAL_CALL   loadStylesFromURL( const OUString& URL,
-                                const css::uno::Sequence< css::beans::PropertyValue >& aOptions )
-                                        throw(css::io::IOException,
-                                            css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Sequence< css::beans::PropertyValue >& aOptions ) override;
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-                            getStyleLoaderOptions() throw(css::uno::RuntimeException, std::exception) override;
+                            getStyleLoaderOptions() override;
 
                             //XStyleLoader2
     virtual void SAL_CALL   loadStylesFromDocument( const css::uno::Reference < css::lang::XComponent > & aSourceComponent,
-                                const css::uno::Sequence< css::beans::PropertyValue >& aOptions )
-                                        throw(css::io::IOException,
-                                            css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Sequence< css::beans::PropertyValue >& aOptions ) override;
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 private:
     /// @throws css::io::IOException
     /// @throws css::uno::RuntimeException
     void loadStylesFromDocShell( ScDocShell* pSource,
-                              const css::uno::Sequence< css::beans::PropertyValue>& aOptions )
-                                throw(css::io::IOException,
-                                            css::uno::RuntimeException, std::exception);
+                              const css::uno::Sequence< css::beans::PropertyValue>& aOptions );
 };
 
 class ScStyleFamilyObj : public ::cppu::WeakImplHelper<
@@ -138,74 +120,39 @@ public:
 
                             // XNameContainer
     virtual void SAL_CALL   insertByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::container::ElementExistException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeByName( const OUString& Name )
-                                throw(css::container::NoSuchElementException,
-                                      css::lang::WrappedTargetException,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
+                                const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL   removeByName( const OUString& Name ) override;
 
                             // XNameReplace
     virtual void SAL_CALL   replaceByName( const OUString& aName,
-                                const css::uno::Any& aElement )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aElement ) override;
 
                             // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-                                throw(css::container::NoSuchElementException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-                                throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScStyleObj : public ::cppu::WeakImplHelper<
@@ -229,24 +176,20 @@ private:
     const SfxItemSet*       GetStyleItemSet_Impl( const OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    css::beans::PropertyState getPropertyState_Impl( const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception);
+    css::beans::PropertyState getPropertyState_Impl( const OUString& PropertyName );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any           getPropertyDefault_Impl( const OUString& aPropertyName )
-                                throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+    css::uno::Any           getPropertyDefault_Impl( const OUString& aPropertyName );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any           getPropertyValue_Impl( const OUString& aPropertyName )
-                                throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+    css::uno::Any           getPropertyValue_Impl( const OUString& aPropertyName );
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     void                    setPropertyValue_Impl( const OUString& rPropertyName,
                                                  const SfxItemPropertySimpleEntry* pEntry,
-                                                 const css::uno::Any* pValue )
-                                        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+                                                 const css::uno::Any* pValue );
 
 public:
                             ScStyleObj() = delete;
@@ -264,121 +207,64 @@ public:
                             CreateEmptyNumberingRules();
 
                             // XStyle
-    virtual sal_Bool SAL_CALL isUserDefined() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isInUse() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getParentStyle() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setParentStyle( const OUString& aParentStyle )
-                                throw(css::container::NoSuchElementException,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual sal_Bool SAL_CALL isUserDefined() override;
+    virtual sal_Bool SAL_CALL isInUse() override;
+    virtual OUString SAL_CALL getParentStyle() override;
+    virtual void SAL_CALL   setParentStyle( const OUString& aParentStyle ) override;
 
                             // XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setName( const OUString& aName )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL   setName( const OUString& aName ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XMultiPropertySet
     virtual void SAL_CALL   setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames,
-                                    const css::uno::Sequence< css::uno::Any >& aValues )
-                                throw (css::beans::PropertyVetoException,
-                                       css::lang::IllegalArgumentException,
-                                       css::lang::WrappedTargetException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const css::uno::Sequence< css::uno::Any >& aValues ) override;
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL
-                            getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                            getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames,
-                                    const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
     virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames,
-                                    const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
                             // XPropertyState
     virtual css::beans::PropertyState SAL_CALL getPropertyState(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
-                            getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setPropertyToDefault( const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                            getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL   setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
                             // XMultiPropertyStates
     // getPropertyStates already defined for XPropertyState
-    virtual void SAL_CALL   setAllPropertiesToDefault()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames )
-                                throw (css::beans::UnknownPropertyException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+    virtual void SAL_CALL   setAllPropertiesToDefault() override;
+    virtual void SAL_CALL   setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL
-                            getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames )
-                                throw (css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                            getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScStyleObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj);
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index e688683dcecc..547d61df89d9 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -78,21 +78,18 @@ public:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // css::container::XNameAccess
-    virtual css::uno::Any SAL_CALL     getByName(const OUString& aName)
-                                throw(  css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString> SAL_CALL      getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL           hasByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL     getByName(const OUString& aName) override;
+    virtual css::uno::Sequence< OUString> SAL_CALL      getElementNames() override;
+    virtual sal_Bool SAL_CALL           hasByName(const OUString& aName) override;
 
                             // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL        getElementType() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL           hasElements() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Type SAL_CALL        getElementType() override;
+    virtual sal_Bool SAL_CALL           hasElements() override;
 
                             // css::lang::XServiceInfo
-    virtual OUString SAL_CALL            getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString> SAL_CALL      getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL            getImplementationName() override;
+    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString> SAL_CALL      getSupportedServiceNames() override;
 };
 
 class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper<
@@ -115,46 +112,26 @@ public:
     static void             SetLinkTargetBitmap( css::uno::Any& rRet, sal_uInt16 nType );
 
                             // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL  getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL  getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue(const OUString& aPropertyName,
-                                    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     getPropertyValue(const OUString& PropertyName)
-                                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     getPropertyValue(const OUString& PropertyName) override;
     virtual void SAL_CALL           addPropertyChangeListener(const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener > & xListener)
-                                throw(  css::beans::UnknownPropertyException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception ) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener > & xListener) override;
     virtual void SAL_CALL           removePropertyChangeListener(const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener)
-                                throw(  css::beans::UnknownPropertyException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception ) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) override;
     virtual void SAL_CALL           addVetoableChangeListener(const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener)
-                                throw(  css::beans::UnknownPropertyException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception ) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) override;
     virtual void SAL_CALL           removeVetoableChangeListener(const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener)
-                                throw(  css::beans::UnknownPropertyException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception ) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) override;
 
                             // css::document::XLinkTargetSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL  getLinks() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL  getLinks() override;
 
                             // css::lang::XServiceInfo
-    virtual OUString SAL_CALL            getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL            getImplementationName() override;
+    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScLinkTargetsObj : public ::cppu::WeakImplHelper<
@@ -169,21 +146,18 @@ public:
     virtual                 ~ScLinkTargetsObj() override;
 
                             // css::container::XNameAccess
-    virtual css::uno::Any SAL_CALL         getByName(const OUString& aName)
-                                throw(  css::container::NoSuchElementException,
-                                        css::lang::WrappedTargetException,
-                                         css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString> SAL_CALL      getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL           hasByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL         getByName(const OUString& aName) override;
+    virtual css::uno::Sequence< OUString> SAL_CALL      getElementNames() override;
+    virtual sal_Bool SAL_CALL           hasByName(const OUString& aName) override;
 
                             // css::container::XElementAccess
-    virtual css::uno::Type SAL_CALL        getElementType() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL           hasElements() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Type SAL_CALL        getElementType() override;
+    virtual sal_Bool SAL_CALL           hasElements() override;
 
                             // css::lang::XServiceInfo
-    virtual OUString SAL_CALL            getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString> SAL_CALL      getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL            getImplementationName() override;
+    virtual sal_Bool SAL_CALL           supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString> SAL_CALL      getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 12c7136fce8b..3d6f5f1908d8 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -80,27 +80,23 @@ public:
 
                             // XHeaderFooterContent
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getLeftText() throw(css::uno::RuntimeException, std::exception) override;
+                            getLeftText() override;
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getCenterText() throw(css::uno::RuntimeException, std::exception) override;
+                            getCenterText() override;
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getRightText() throw(css::uno::RuntimeException, std::exception) override;
+                            getRightText() override;
 
                             // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
-                                    sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static rtl::Reference<ScHeaderFooterContentObj> getImplementation(const css::uno::Reference<css::sheet::XHeaderFooterContent>& rObj);
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -167,65 +163,51 @@ public:
                             // XText
     virtual void SAL_CALL   insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange,
                                 const css::uno::Reference< css::text::XTextContent >& xContent,
-                                sal_Bool bAbsorb )
-                                    throw(css::lang::IllegalArgumentException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent )
-                                    throw(css::container::NoSuchElementException,
-                                            css::uno::RuntimeException, std::exception) override;
+                                sal_Bool bAbsorb ) override;
+    virtual void SAL_CALL   removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) override;
 
                             // XSimpleText
     virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
-                            createTextCursor() throw(css::uno::RuntimeException, std::exception) override;
+                            createTextCursor() override;
     virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL
-                            createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) override;
     virtual void SAL_CALL   insertString( const css::uno::Reference< css::text::XTextRange >& xRange,
-                                        const OUString& aString, sal_Bool bAbsorb )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                        const OUString& aString, sal_Bool bAbsorb ) override;
     virtual void SAL_CALL   insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange,
-                                        sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                    throw(css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                        sal_Int16 nControlCharacter, sal_Bool bAbsorb ) override;
 
                             // XTextRange
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getText() throw(css::uno::RuntimeException, std::exception) override;
+                            getText() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getStart() throw(css::uno::RuntimeException, std::exception) override;
+                            getStart() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getEnd() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setString( const OUString& aString )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL   setString( const OUString& aString ) override;
 
                             // XTextRangeMover
     virtual void SAL_CALL   moveTextRange( const css::uno::Reference< css::text::XTextRange >& xRange,
-                                        sal_Int16 nParagraphs )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                                        sal_Int16 nParagraphs ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XTextFieldsSupplier
     virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL
-                            getTextFields() throw(css::uno::RuntimeException, std::exception) override;
+                            getTextFields() override;
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL
-                            getTextFieldMasters() throw(css::uno::RuntimeException, std::exception) override;
+                            getTextFieldMasters() override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -246,15 +228,14 @@ public:
 
                             // SvxUnoTextCursor methods reimplemented here:
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getText() throw(css::uno::RuntimeException, std::exception) override;
+                            getText() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getStart() throw(css::uno::RuntimeException, std::exception) override;
+                            getStart() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getEnd() throw(css::uno::RuntimeException, std::exception) override;
+                            getEnd() override;
 
                             // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScCellTextCursor* getImplementation(const css::uno::Reference< css::uno::XInterface>& rObj);
@@ -271,15 +252,14 @@ public:
 
                             // SvxUnoTextCursor methods reimplemented here:
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getText() throw(css::uno::RuntimeException, std::exception) override;
+                            getText() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getStart() throw(css::uno::RuntimeException, std::exception) override;
+                            getStart() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getEnd() throw(css::uno::RuntimeException, std::exception) override;
+                            getEnd() override;
 
                             // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScHeaderFooterTextCursor* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj);
@@ -298,15 +278,14 @@ public:
 
                             // SvxUnoTextCursor methods reimplemented here:
     virtual css::uno::Reference< css::text::XText > SAL_CALL
-                            getText() throw(css::uno::RuntimeException, std::exception) override;
+                            getText() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getStart() throw(css::uno::RuntimeException, std::exception) override;
+                            getStart() override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
-                            getEnd() throw(css::uno::RuntimeException, std::exception) override;
+                            getEnd() override;
 
                             // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScDrawTextCursor* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj);
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index 55599c3834d2..17108b038659 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -75,56 +75,29 @@ public:
                             // XFormulaParser
     virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL parseFormula(
                                     const OUString& aFormula,
-                                    const css::table::CellAddress& rReferencePos )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const css::table::CellAddress& rReferencePos ) override;
     virtual OUString SAL_CALL printFormula( const css::uno::Sequence< css::sheet::FormulaToken >& aTokens,
-                                    const css::table::CellAddress& rReferencePos )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                                    const css::table::CellAddress& rReferencePos ) override;
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class ScFormulaOpCodeMapperObj : public formula::FormulaOpCodeMapperObj
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index e81010a1eb1d..2baa6c8bdb65 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -70,56 +70,40 @@ public:
 
     ScTabViewShell*         GetViewShell() const    { return pViewShell; }
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
                             // XViewPane
-    virtual sal_Int32 SAL_CALL getFirstVisibleColumn() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getFirstVisibleRow() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFirstVisibleRow( sal_Int32 nFirstVisibleRow )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual css::table::CellRangeAddress SAL_CALL getVisibleRange()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual sal_Int32 SAL_CALL getFirstVisibleColumn() override;
+    virtual void SAL_CALL   setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) override;
+    virtual sal_Int32 SAL_CALL getFirstVisibleRow() override;
+    virtual void SAL_CALL   setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) override;
+    virtual css::table::CellRangeAddress SAL_CALL getVisibleRange() override;
 
                             // XCellRangeReferrer
     virtual css::uno::Reference< css::table::XCellRange > SAL_CALL
-                            getReferredCells() throw(css::uno::RuntimeException, std::exception) override;
+                            getReferredCells() override;
 
                             // XFormLayerAccess
     virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL
-                            getFormController( const css::uno::Reference< css::form::XForm >& Form )
-                                    throw (css::uno::RuntimeException, std::exception) override;
+                            getFormController( const css::uno::Reference< css::form::XForm >& Form ) override;
     virtual sal_Bool SAL_CALL
-                            isFormDesignMode(  )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setFormDesignMode( sal_Bool DesignMode )
-                                throw (css::uno::RuntimeException, std::exception) override;
+                            isFormDesignMode(  ) override;
+    virtual void SAL_CALL   setFormDesignMode( sal_Bool DesignMode ) override;
 
                             // XControlAccess
     virtual css::uno::Reference< css::awt::XControl > SAL_CALL
-                            getControl( const css::uno::Reference< css::awt::XControlModel >& xModel )
-                                    throw(css::container::NoSuchElementException,
-                                        css::uno::RuntimeException, std::exception) override;
+                            getControl( const css::uno::Reference< css::awt::XControlModel >& xModel ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
 //  ScViewPaneObj for direct use (including OWeakObject)
@@ -130,8 +114,7 @@ public:
                             ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP);
     virtual                 ~ScViewPaneObj() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 };
@@ -189,8 +172,7 @@ public:
                             ScTabViewObj() = delete;
     virtual                 ~ScTabViewObj() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL   acquire() throw() override;
     virtual void SAL_CALL   release() throw() override;
 
@@ -200,180 +182,108 @@ public:
     void                    SheetChanged( bool bSameTabButMoved );
     bool                    IsMouseListening() const;
     /// @throws css::uno::RuntimeException
-    bool                    MousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException);
+    bool                    MousePressed( const css::awt::MouseEvent& e );
     /// @throws css::uno::RuntimeException
-    bool                    MouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException);
+    bool                    MouseReleased( const css::awt::MouseEvent& e );
 
     void                    RangeSelDone( const OUString& rText );
     void                    RangeSelAborted( const OUString& rText );
     void                    RangeSelChanged( const OUString& rText );
 
                             // XSelectionSupplier
-    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection )
-                                throw(css::lang::IllegalArgumentException,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual css::uno::Any SAL_CALL getSelection()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
-    virtual void SAL_CALL   addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
-    virtual void SAL_CALL   removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) override;
+    virtual css::uno::Any SAL_CALL getSelection() override;
+    virtual void SAL_CALL   addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+    virtual void SAL_CALL   removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
     //! XPrintable?
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    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 getPropertyValue( const OUString& PropertyName )
-                                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 getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw (css::beans::UnknownPropertyException,
-                                       css::lang::WrappedTargetException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
 
                             // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-                            createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+                            createEnumeration() override;
 
                             // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
                             // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
                             // XSpreadsheetView
     virtual css::uno::Reference< css::sheet::XSpreadsheet > SAL_CALL
-                            getActiveSheet() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setActiveSheet( const css::uno::Reference< css::sheet::XSpreadsheet >& xActiveSheet )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception) override;
+                            getActiveSheet() override;
+    virtual void SAL_CALL   setActiveSheet( const css::uno::Reference< css::sheet::XSpreadsheet >& xActiveSheet ) override;
 
                             //XEnhancedMouseClickBroadcaster
 
     virtual void SAL_CALL addEnhancedMouseClickHandler( const css::uno::Reference<
-                                css::awt::XEnhancedMouseClickHandler >& aListener )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
-    virtual void SAL_CALL removeEnhancedMouseClickHandler( const css::uno::Reference< css::awt::XEnhancedMouseClickHandler >& aListener )
-                                    throw (css::uno::RuntimeException, std::exception) override;
+                                css::awt::XEnhancedMouseClickHandler >& aListener ) override;
+    virtual void SAL_CALL removeEnhancedMouseClickHandler( const css::uno::Reference< css::awt::XEnhancedMouseClickHandler >& aListener ) override;
 
                             //XActivationBroadcaster
 
-    virtual void SAL_CALL addActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
-    virtual void SAL_CALL removeActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener )
-                                    throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener ) override;
+    virtual void SAL_CALL removeActivationEventListener( const css::uno::Reference< css::sheet::XActivationEventListener >& aListener ) override;
 
                             // XViewSplitable
-    virtual sal_Bool SAL_CALL getIsWindowSplit() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSplitHorizontal() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSplitVertical() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSplitColumn()
-        throw(css::uno::RuntimeException,
-              std::exception) override;
-    virtual sal_Int32 SAL_CALL getSplitRow()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual sal_Bool SAL_CALL getIsWindowSplit() override;
+    virtual sal_Int32 SAL_CALL getSplitHorizontal() override;
+    virtual sal_Int32 SAL_CALL getSplitVertical() override;
+    virtual sal_Int32 SAL_CALL getSplitColumn() override;
+    virtual sal_Int32 SAL_CALL getSplitRow() override;
+    virtual void SAL_CALL   splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) override;
 
                             // XViewFreezable
-    virtual sal_Bool SAL_CALL hasFrozenPanes() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual sal_Bool SAL_CALL hasFrozenPanes() override;
+    virtual void SAL_CALL   freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) override;
 
                             // XRangeSelection
-    virtual void SAL_CALL   startRangeSelection( const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   abortRangeSelection() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   addRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
-    virtual void SAL_CALL   removeRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   addRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& aListener )
-                                    throw (css::uno::RuntimeException,
-                                           std::exception) override;
-    virtual void SAL_CALL   removeRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& aListener )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   startRangeSelection( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
+    virtual void SAL_CALL   abortRangeSelection() override;
+    virtual void SAL_CALL   addRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener ) override;
+    virtual void SAL_CALL   removeRangeSelectionListener( const css::uno::Reference< css::sheet::XRangeSelectionListener >& aListener ) override;
+    virtual void SAL_CALL   addRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& aListener ) override;
+    virtual void SAL_CALL   removeRangeSelectionChangeListener( const css::uno::Reference< css::sheet::XRangeSelectionChangeListener >& aListener ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
                             // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
-                                    sal_Int8 >& aIdentifier )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    sal_Int8 >& aIdentifier ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
     static ScTabViewObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj);
 
                             // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XTransferableSupplier
-    virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getTransferable()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans )
-                                throw(css::datatransfer::UnsupportedFlavorException,
-                                      css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getTransferable() override;
+    virtual void SAL_CALL insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) override;
 
     // XSelectedSheetsSupplier
-    virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets()
-        throw(css::uno::RuntimeException,
-              std::exception) override;
+    virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() override;
 };
 
 class ScPreviewObj : public SfxBaseController,
@@ -385,8 +295,7 @@ public:
     ScPreviewObj(ScPreviewShell* pViewSh);
     virtual ~ScPreviewObj() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType)
-            throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType) override;
 
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
@@ -394,8 +303,7 @@ public:
     virtual void Notify(SfxBroadcaster&, const SfxHint& rHint) override;
 
     // XSelectedSheetsSupplier
-    virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int32> SAL_CALL getSelectedSheets() override;
 };
 
 #endif
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 73f4ebc3b09d..f17f689f5cff 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -302,7 +302,7 @@ ScDPDimensions* ScDPSource::GetDimensionsObject()
     return pDimensions.get();
 }
 
-uno::Reference<container::XNameAccess> SAL_CALL ScDPSource::getDimensions() throw(uno::RuntimeException, std::exception)
+uno::Reference<container::XNameAccess> SAL_CALL ScDPSource::getDimensions()
 {
     return GetDimensionsObject();
 }
@@ -357,7 +357,6 @@ long ScDPSource::GetSourceDim(long nDim)
 }
 
 uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResults()
-                                                            throw(uno::RuntimeException, std::exception)
 {
     CreateRes_Impl();       // create pColResRoot and pRowResRoot
 
@@ -393,7 +392,6 @@ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResult
 
 uno::Sequence<double> ScDPSource::getFilteredResults(
             const uno::Sequence<sheet::DataPilotFieldFilter>& aFilters )
-                throw (uno::RuntimeException, std::exception)
 {
     if (maResFilterSet.empty())
         getResults(); // Build result tree first.
@@ -425,25 +423,22 @@ uno::Sequence<double> ScDPSource::getFilteredResults(
     return uno::Sequence<double>();
 }
 
-void SAL_CALL ScDPSource::refresh() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScDPSource::refresh()
 {
     disposeData();
 }
 
 void SAL_CALL ScDPSource::addRefreshListener( const uno::Reference<util::XRefreshListener >& )
-                                                throw(uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");    //TODO: exception?
 }
 
 void SAL_CALL ScDPSource::removeRefreshListener( const uno::Reference<util::XRefreshListener >& )
-                                                throw(uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");    //TODO: exception?
 }
 
 Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<sheet::DataPilotFieldFilter>& aFilters)
-    throw (uno::RuntimeException, std::exception)
 {
     long nColumnCount = GetData()->GetColumnCount();
 
@@ -1101,7 +1096,6 @@ const uno::Sequence<sheet::MemberResult>* ScDPSource::GetMemberResults( ScDPLeve
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     using beans::PropertyAttribute::READONLY;
@@ -1125,9 +1119,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
 }
 
 void SAL_CALL ScDPSource::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     if (aPropertyName == SC_UNO_DP_COLGRAND)
         bColumnGrand = lcl_GetBoolFromAny(aValue);
@@ -1151,8 +1142,6 @@ void SAL_CALL ScDPSource::setPropertyValue( const OUString& aPropertyName, const
 }
 
 uno::Any SAL_CALL ScDPSource::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if ( aPropertyName == SC_UNO_DP_COLGRAND )
@@ -1240,8 +1229,6 @@ void ScDPDimensions::CountChanged()
 // very simple XNameAccess implementation using getCount/getByIndex
 
 uno::Any SAL_CALL ScDPDimensions::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     long nCount = getCount();
     for (long i=0; i<nCount; i++)
@@ -1257,7 +1244,7 @@ uno::Any SAL_CALL ScDPDimensions::getByName( const OUString& aName )
 //    return uno::Any();
 }
 
-uno::Sequence<OUString> SAL_CALL ScDPDimensions::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL ScDPDimensions::getElementNames()
 {
     long nCount = getCount();
     uno::Sequence<OUString> aSeq(nCount);
@@ -1267,7 +1254,7 @@ uno::Sequence<OUString> SAL_CALL ScDPDimensions::getElementNames() throw(uno::Ru
     return aSeq;
 }
 
-sal_Bool SAL_CALL ScDPDimensions::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDPDimensions::hasByName( const OUString& aName )
 {
     long nCount = getCount();
     for (long i=0; i<nCount; i++)
@@ -1276,12 +1263,12 @@ sal_Bool SAL_CALL ScDPDimensions::hasByName( const OUString& aName ) throw(uno::
     return false;
 }
 
-uno::Type SAL_CALL ScDPDimensions::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScDPDimensions::getElementType()
 {
     return cppu::UnoType<container::XNamed>::get();
 }
 
-sal_Bool SAL_CALL ScDPDimensions::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDPDimensions::hasElements()
 {
     return ( getCount() > 0 );
 }
@@ -1355,12 +1342,11 @@ const OUString* ScDPDimension::GetSubtotalName() const
 }
 
 uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return GetHierarchiesObject();
 }
 
-OUString SAL_CALL ScDPDimension::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDPDimension::getName()
 {
     if (!aName.isEmpty())
         return aName;
@@ -1368,7 +1354,7 @@ OUString SAL_CALL ScDPDimension::getName() throw(uno::RuntimeException, std::exc
         return pSource->GetData()->getDimensionName( nDim );
 }
 
-void SAL_CALL ScDPDimension::setName( const OUString& rNewName ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScDPDimension::setName( const OUString& rNewName )
 {
     //  used after cloning
     aName = rNewName;
@@ -1404,7 +1390,7 @@ ScDPDimension* ScDPDimension::CreateCloneObject()
     return pNew;
 }
 
-uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() throw(uno::RuntimeException, std::exception)
+uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone()
 {
     return CreateCloneObject();
 }
@@ -1448,7 +1434,6 @@ const ScDPItemData& ScDPDimension::GetSelectedData()
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1477,9 +1462,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
 }
 
 void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     if ( aPropertyName == SC_UNO_DP_USEDHIERARCHY )
     {
@@ -1562,8 +1544,6 @@ void SAL_CALL ScDPDimension::setPropertyValue( const OUString& aPropertyName, co
 }
 
 uno::Any SAL_CALL ScDPDimension::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if ( aPropertyName == SC_UNO_DP_POSITION )
@@ -1690,8 +1670,6 @@ ScDPHierarchies::~ScDPHierarchies()
 // very simple XNameAccess implementation using getCount/getByIndex
 
 uno::Any SAL_CALL ScDPHierarchies::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     long nCount = getCount();
     for (long i=0; i<nCount; i++)
@@ -1706,7 +1684,7 @@ uno::Any SAL_CALL ScDPHierarchies::getByName( const OUString& aName )
     throw container::NoSuchElementException();
 }
 
-uno::Sequence<OUString> SAL_CALL ScDPHierarchies::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL ScDPHierarchies::getElementNames()
 {
     long nCount = getCount();
     uno::Sequence<OUString> aSeq(nCount);
@@ -1716,7 +1694,7 @@ uno::Sequence<OUString> SAL_CALL ScDPHierarchies::getElementNames() throw(uno::R
     return aSeq;
 }
 
-sal_Bool SAL_CALL ScDPHierarchies::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDPHierarchies::hasByName( const OUString& aName )
 {
     long nCount = getCount();
     for (long i=0; i<nCount; i++)
@@ -1725,12 +1703,12 @@ sal_Bool SAL_CALL ScDPHierarchies::hasByName( const OUString& aName ) throw(uno:
     return false;
 }
 
-uno::Type SAL_CALL ScDPHierarchies::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScDPHierarchies::getElementType()
 {
     return cppu::UnoType<container::XNamed>::get();
 }
 
-sal_Bool SAL_CALL ScDPHierarchies::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDPHierarchies::hasElements()
 {
     return ( getCount() > 0 );
 }
@@ -1789,12 +1767,11 @@ ScDPLevels* ScDPHierarchy::GetLevelsObject()
 }
 
 uno::Reference<container::XNameAccess> SAL_CALL ScDPHierarchy::getLevels()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return GetLevelsObject();
 }
 
-OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDPHierarchy::getName()
 {
     OUString aRet;        //TODO: globstr-ID !!!!
     switch (nHier)
@@ -1815,7 +1792,7 @@ OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException, std::exc
     return aRet;
 }
 
-void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ )
 {
     OSL_FAIL("not implemented");        //TODO: exception?
 }
@@ -1860,8 +1837,6 @@ ScDPLevels::~ScDPLevels()
 // very simple XNameAccess implementation using getCount/getByIndex
 
 uno::Any SAL_CALL ScDPLevels::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     long nCount = getCount();
     for (long i=0; i<nCount; i++)
@@ -1876,7 +1851,7 @@ uno::Any SAL_CALL ScDPLevels::getByName( const OUString& aName )
     throw container::NoSuchElementException();
 }
 
-uno::Sequence<OUString> SAL_CALL ScDPLevels::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL ScDPLevels::getElementNames()
 {
     long nCount = getCount();
     uno::Sequence<OUString> aSeq(nCount);
@@ -1886,7 +1861,7 @@ uno::Sequence<OUString> SAL_CALL ScDPLevels::getElementNames() throw(uno::Runtim
     return aSeq;
 }
 
-sal_Bool SAL_CALL ScDPLevels::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDPLevels::hasByName( const OUString& aName )
 {
     long nCount = getCount();
     for (long i=0; i<nCount; i++)
@@ -1895,12 +1870,12 @@ sal_Bool SAL_CALL ScDPLevels::hasByName( const OUString& aName ) throw(uno::Runt
     return false;
 }
 
-uno::Type SAL_CALL ScDPLevels::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScDPLevels::getElementType()
 {
     return cppu::UnoType<container::XNamed>::get();
 }
 
-sal_Bool SAL_CALL ScDPLevels::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDPLevels::hasElements()
 {
     return ( getCount() > 0 );
 }
@@ -2053,12 +2028,12 @@ ScDPMembers* ScDPLevel::GetMembersObject()
     return mxMembers.get();
 }
 
-uno::Reference<sheet::XMembersAccess> SAL_CALL ScDPLevel::getMembers() throw(uno::RuntimeException, std::exception)
+uno::Reference<sheet::XMembersAccess> SAL_CALL ScDPLevel::getMembers()
 {
     return GetMembersObject();
 }
 
-uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::RuntimeException, std::exception)
+uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults()
 {
     const uno::Sequence<sheet::MemberResult>* pRes = pSource->GetMemberResults( this );
     if (pRes)
@@ -2067,7 +2042,7 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
     return uno::Sequence<sheet::MemberResult>(0);       //TODO: Error?
 }
 
-OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDPLevel::getName()
 {
     long nSrcDim = pSource->GetSourceDim( nDim );
     if ( pSource->IsDateDimension( nSrcDim ) )
@@ -2124,7 +2099,7 @@ OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException, std::excepti
     return pDim->getName();
 }
 
-void SAL_CALL ScDPLevel::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScDPLevel::setName( const OUString& /* rNewName */ )
 {
     OSL_FAIL("not implemented");        //TODO: exception?
 }
@@ -2143,7 +2118,6 @@ uno::Sequence<sal_Int16> ScDPLevel::getSubTotals() const
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2165,9 +2139,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo()
 }
 
 void SAL_CALL ScDPLevel::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     if ( aPropertyName == SC_UNO_DP_SHOWEMPTY )
         bShowEmpty = lcl_GetBoolFromAny(aValue);
@@ -2198,8 +2169,6 @@ void SAL_CALL ScDPLevel::setPropertyValue( const OUString& aPropertyName, const
 }
 
 uno::Any SAL_CALL ScDPLevel::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if ( aPropertyName == SC_UNO_DP_SHOWEMPTY )
@@ -2354,8 +2323,6 @@ sal_Int32 ScDPMembers::GetIndexFromName( const OUString& rName ) const
 }
 
 uno::Any SAL_CALL ScDPMembers::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nIndex = GetIndexFromName( aName );
     if ( nIndex >= 0 )
@@ -2369,22 +2336,22 @@ uno::Any SAL_CALL ScDPMembers::getByName( const OUString& aName )
     throw container::NoSuchElementException();
 }
 
-uno::Sequence<OUString> SAL_CALL ScDPMembers::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL ScDPMembers::getElementNames()
 {
     return getElementNames( false );
 }
 
-sal_Bool SAL_CALL ScDPMembers::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDPMembers::hasByName( const OUString& aName )
 {
     return ( GetIndexFromName( aName ) >= 0 );
 }
 
-uno::Type SAL_CALL ScDPMembers::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScDPMembers::getElementType()
 {
     return cppu::UnoType<container::XNamed>::get();
 }
 
-sal_Bool SAL_CALL ScDPMembers::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDPMembers::hasElements()
 {
     return ( getCount() > 0 );
 }
@@ -2394,7 +2361,6 @@ sal_Bool SAL_CALL ScDPMembers::hasElements() throw(uno::RuntimeException, std::e
 // XMembersAccess implementation
 
 uno::Sequence<OUString> SAL_CALL ScDPMembers::getLocaleIndependentElementNames()
-        throw(uno::RuntimeException, std::exception)
 {
     return getElementNames( true );
 }
@@ -2402,7 +2368,6 @@ uno::Sequence<OUString> SAL_CALL ScDPMembers::getLocaleIndependentElementNames()
 // end of XMembersAccess implementation
 
 uno::Sequence<OUString> ScDPMembers::getElementNames( bool bLocaleIndependent ) const
-        throw(uno::RuntimeException, std::exception)
 {
     // Return list of names in sorted order,
     // so it's displayed in that order in the field options dialog.
@@ -2623,12 +2588,12 @@ OUString ScDPMember::GetNameStr( bool bLocaleIndependent ) const
     return OUString();
 }
 
-OUString SAL_CALL ScDPMember::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDPMember::getName()
 {
     return GetNameStr( false );
 }
 
-void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ )
 {
     OSL_FAIL("not implemented");        //TODO: exception?
 }
@@ -2636,7 +2601,6 @@ void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::R
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2654,9 +2618,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
 }
 
 void SAL_CALL ScDPMember::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     if ( aPropertyName == SC_UNO_DP_ISVISIBLE )
         bVisible = lcl_GetBoolFromAny(aValue);
@@ -2677,8 +2638,6 @@ void SAL_CALL ScDPMember::setPropertyValue( const OUString& aPropertyName, const
 }
 
 uno::Any SAL_CALL ScDPMember::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if ( aPropertyName == SC_UNO_DP_ISVISIBLE )
diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx
index 5f451f518f51..b11b90d0a5ee 100644
--- a/sc/source/core/inc/addinlis.hxx
+++ b/sc/source/core/inc/addinlis.hxx
@@ -67,22 +67,17 @@ public:
           { return aResult; }
 
     // XResultListener
-    virtual void SAL_CALL modified( const css::sheet::ResultEvent& aEvent )
-                              throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::sheet::ResultEvent& aEvent ) 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;
 
     // 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( const OUString& ServiceName )
-                                  throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 };
 
 #endif // INCLUDED_SC_SOURCE_CORE_INC_ADDINLIS_HXX
diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx
index 29985bf4f9d7..41a68c17c6d9 100644
--- a/sc/source/core/tool/addinlis.cxx
+++ b/sc/source/core/tool/addinlis.cxx
@@ -105,7 +105,6 @@ void ScAddInListener::RemoveDocument( ScDocument* pDocumentP )
 // XResultListener
 
 void SAL_CALL ScAddInListener::modified( const css::sheet::ResultEvent& aEvent )
-                                throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard; //TODO: or generate a UserEvent
 
@@ -126,7 +125,6 @@ void SAL_CALL ScAddInListener::modified( const css::sheet::ResultEvent& aEvent )
 // XEventListener
 
 void SAL_CALL ScAddInListener::disposing( const css::lang::EventObject& /* Source */ )
-                                throw(css::uno::RuntimeException, std::exception)
 {
     // hold a ref so this is not deleted at removeResultListener
     uno::Reference<sheet::XResultListener> xRef( this );
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 5b50659be9d6..020962ddc2a0 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -118,33 +118,33 @@ private:
     ::osl::Mutex m_aMutex;
 public:
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override { return  cppu::UnoType<container::XIndexContainer>::get(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override { return  cppu::UnoType<container::XIndexContainer>::get(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return ( !IdToOleNameHash.empty() );
     }
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !hasByName(aName) )
             throw container::NoSuchElementException();
         return uno::makeAny( IdToOleNameHash[ aName ] );
     }
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return comphelper::mapKeysToSequence( IdToOleNameHash);
     }
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return ( IdToOleNameHash.find( aName ) != IdToOleNameHash.end() );
     }
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( hasByName( aName ) )
@@ -154,14 +154,14 @@ public:
             throw lang::IllegalArgumentException();
        IdToOleNameHash[ aName ] = xElement;
     }
-    virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeByName( const OUString& aName ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !hasByName( aName ) )
             throw container::NoSuchElementException();
         IdToOleNameHash.erase( IdToOleNameHash.find( aName ) );
     }
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !hasByName( aName ) )
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index e0ff274097d7..e82e7a5e0ae7 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1050,9 +1050,6 @@ ScDocShell* XclExpXmlStream::getDocShell()
 }
 
 bool XclExpXmlStream::exportDocument()
-    throw (css::uno::RuntimeException,
-           css::ucb::ContentCreationException,
-           std::exception)
 {
     ScDocShell* pShell = getDocShell();
     ScDocument& rDoc = pShell->GetDocument();
@@ -1145,7 +1142,7 @@ bool XclExpXmlStream::exportDocument()
     return new ::oox::xls::ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) );
 }
 
-OUString XclExpXmlStream::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString XclExpXmlStream::getImplementationName()
 {
     return OUString( "TODO" );
 }
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index e815cbaf339c..35ae5dfaa350 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -79,23 +79,23 @@ public:
     explicit PaletteIndex( const ColorDataVec& rColorDataTable ) : maColorData( rColorDataTable ) {}
 
     // Methods XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount() override
     {
          return  maColorData.size();
     }
 
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         //--Index;  // apparently the palette is already 1 based
         return uno::makeAny( sal_Int32( maColorData[ Index ] ) );
     }
 
     // Methods XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType() override
     {
         return ::cppu::UnoType<sal_Int32>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements() override
     {
         return (maColorData.size() > 0);
     }
diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx
index a169733dddd1..0d87691739b2 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
@@ -32,8 +32,7 @@ class ExcelFilter : public ::oox::core::XmlFilterBase
 public:
     /// @throws css::uno::RuntimeException
     explicit            ExcelFilter(
-                            const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-                            throw( css::uno::RuntimeException );
+                            const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual             ~ExcelFilter() override;
 
     void                registerWorkbookGlobals( WorkbookGlobals& rBookGlob );
@@ -49,12 +48,12 @@ public:
     virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override;
     virtual void useInternalChartDataTable( bool bInternal ) override;
 
-    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) override;
 
 private:
     virtual GraphicHelper* implCreateGraphicHelper() const override;
     virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     WorkbookGlobals*    mpBookGlob;
 };
diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx
index eaf1a113607e..fb4821ca2d20 100644
--- a/sc/source/filter/inc/ooxformulaparser.hxx
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
@@ -47,40 +47,35 @@ public:
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
     virtual ::rtl::OUString SAL_CALL
-                        getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+                        getImplementationName() override;
 
     virtual sal_Bool SAL_CALL
-                        supportsService( const ::rtl::OUString& rService )
-                            throw( css::uno::RuntimeException, std::exception ) override;
+                        supportsService( const ::rtl::OUString& rService ) override;
 
     virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL
-                        getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+                        getSupportedServiceNames() override;
 
     // com.sun.star.lang.XInitialization interface ----------------------------
 
     virtual void SAL_CALL initialize(
-                            const css::uno::Sequence< css::uno::Any >& rArgs )
-                            throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+                            const css::uno::Sequence< css::uno::Any >& rArgs ) override;
 
     // com.sun.star.sheet.XFilterFormulaParser interface ----------------------
 
     virtual ::rtl::OUString SAL_CALL
-                        getSupportedNamespace()
-                            throw( css::uno::RuntimeException, std::exception ) override;
+                        getSupportedNamespace() override;
 
     // com.sun.star.sheet.XFormulaParser interface ----------------------------
 
     virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL
                         parseFormula(
                             const ::rtl::OUString& rFormula,
-                            const css::table::CellAddress& rReferencePos )
-                        throw( css::uno::RuntimeException, std::exception ) override;
+                            const css::table::CellAddress& rReferencePos ) override;
 
     virtual ::rtl::OUString SAL_CALL
                         printFormula(
                             const css::uno::Sequence< css::sheet::FormulaToken >& rTokens,
-                            const css::table::CellAddress& rReferencePos )
-                        throw( css::uno::RuntimeException, std::exception ) override;
+                            const css::table::CellAddress& rReferencePos ) override;
 
 private:
     typedef std::shared_ptr< OOXMLFormulaParserImpl >   ParserImplRef;
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 600b1442903a..754187b46ea2 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -318,10 +318,7 @@ public:
                                         OUString* pRelationshipId = nullptr );
 
     // ignore
-    virtual bool exportDocument()
-        throw (css::uno::RuntimeException,
-               css::ucb::ContentCreationException,
-               std::exception) override;
+    virtual bool exportDocument() override;
 
     // only needed for import; ignore
     virtual bool importDocument() throw() override;
@@ -361,7 +358,7 @@ public:
 
 private:
     virtual ::oox::ole::VbaProject* implCreateVbaProject() const override;
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     ScDocShell *getDocShell();
     sax_fastparser::FSHelperPtr&    WriteAttributesInternal( sal_Int32 nAttribute, ... );
 
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index 8cda915f6b74..e624e34b426a 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -40,7 +40,7 @@ using namespace ::oox::core;
 
 using ::oox::drawingml::table::TableStyleListPtr;
 
-ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
+ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) :
     XmlFilterBase( rxContext ),
     mpBookGlob( nullptr )
 {
@@ -149,7 +149,7 @@ GraphicHelper* ExcelFilter::implCreateGraphicHelper() const
     return new ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) );
 }
 
-sal_Bool SAL_CALL ExcelFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL ExcelFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor )
 {
     if ( XmlFilterBase::filter( rDescriptor ) )
         return true;
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL ExcelFilter::filter( const css::uno::Sequence< css::beans::Pro
     return false;
 }
 
-OUString ExcelFilter::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString ExcelFilter::getImplementationName()
 {
     return OUString( "com.sun.star.comp.oox.xls.ExcelFilter" );
 }
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index 720c27707bc2..6491560d6d8f 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -108,17 +108,17 @@ OOXMLFormulaParser::~OOXMLFormulaParser()
 }
 
 // com.sun.star.lang.XServiceInfo interface -----------------------------------
-OUString SAL_CALL OOXMLFormulaParser::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL OOXMLFormulaParser::getImplementationName()
 {
     return OUString( "com.sun.star.comp.oox.xls.FormulaParser");
 }
 
-sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString& rService ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString& rService )
 {
     return cppu::supportsService(this, rService);
 }
 
-Sequence< OUString > SAL_CALL OOXMLFormulaParser::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL OOXMLFormulaParser::getSupportedServiceNames()
 {
     Sequence< OUString > aServiceNames { "com.sun.star.sheet.FilterFormulaParser" };
     return aServiceNames;
@@ -126,7 +126,7 @@ Sequence< OUString > SAL_CALL OOXMLFormulaParser::getSupportedServiceNames() thr
 
 // com.sun.star.lang.XInitialization interface --------------------------------
 
-void SAL_CALL OOXMLFormulaParser::initialize( const Sequence< Any >& rArgs ) throw( Exception, RuntimeException, std::exception )
+void SAL_CALL OOXMLFormulaParser::initialize( const Sequence< Any >& rArgs )
 {
     OSL_ENSURE( rArgs.hasElements(), "OOXMLFormulaParser::initialize - missing arguments" );
     if( !rArgs.hasElements() )
@@ -136,7 +136,7 @@ void SAL_CALL OOXMLFormulaParser::initialize( const Sequence< Any >& rArgs ) thr
 
 // com.sun.star.sheet.XFilterFormulaParser interface --------------------------
 
-OUString SAL_CALL OOXMLFormulaParser::getSupportedNamespace() throw( RuntimeException, std::exception )
+OUString SAL_CALL OOXMLFormulaParser::getSupportedNamespace()
 {
     return OUString( "http://schemas.microsoft.com/office/excel/formula");
 }
@@ -144,7 +144,7 @@ OUString SAL_CALL OOXMLFormulaParser::getSupportedNamespace() throw( RuntimeExce
 // com.sun.star.sheet.XFormulaParser interface --------------------------------
 
 Sequence< FormulaToken > SAL_CALL OOXMLFormulaParser::parseFormula(
-        const OUString& rFormula, const CellAddress& rReferencePos ) throw( RuntimeException, std::exception )
+        const OUString& rFormula, const CellAddress& rReferencePos )
 {
     if( !mxParserImpl )
     {
@@ -156,7 +156,7 @@ Sequence< FormulaToken > SAL_CALL OOXMLFormulaParser::parseFormula(
 }
 
 OUString SAL_CALL OOXMLFormulaParser::printFormula(
-        const Sequence< FormulaToken >& /*rTokens*/, const CellAddress& /*rReferencePos*/ ) throw( RuntimeException, std::exception )
+        const Sequence< FormulaToken >& /*rTokens*/, const CellAddress& /*rReferencePos*/ )
 {
     // not implemented
     throw RuntimeException();
diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx
index 307ad59f4e1d..5c8c80b190d1 100644
--- a/sc/source/filter/orcus/filterdetect.cxx
+++ b/sc/source/filter/orcus/filterdetect.cxx
@@ -28,18 +28,14 @@ class OrcusFormatDetect : public ::cppu::WeakImplHelper<
 public:
     explicit            OrcusFormatDetect();
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
-    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) 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 OUString SAL_CALL
-                        detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq )
-                            throw( css::uno::RuntimeException, std::exception ) override;
+                        detect( css::uno::Sequence< css::beans::PropertyValue >& rMediaDescSeq ) override;
 
 private:
 };
@@ -49,25 +45,21 @@ OrcusFormatDetect::OrcusFormatDetect()
 }
 
 OUString OrcusFormatDetect::getImplementationName()
-        throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("");
 }
 
 sal_Bool OrcusFormatDetect::supportsService(const OUString& /*rServiceName*/)
-        throw( css::uno::RuntimeException, std::exception )
 {
     return false;
 }
 
 css::uno::Sequence<OUString> OrcusFormatDetect::getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<OUString>();
 }
 
 OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue>& rMediaDescSeq)
-        throw( css::uno::RuntimeException, std::exception )
 {
     utl::MediaDescriptor aMediaDescriptor( rMediaDescSeq );
     bool bAborted = aMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ABORTED(), false);
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx
index db4c1ea25ec6..bb05210c22ab 100644
--- a/sc/source/filter/xml/XMLCodeNameProvider.cxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx
@@ -59,7 +59,6 @@ XMLCodeNameProvider::~XMLCodeNameProvider()
 }
 
 sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName )
-    throw (uno::RuntimeException, std::exception )
 {
     if( aName == msDocName )
         return !mpDoc->GetCodeName().isEmpty();
@@ -79,8 +78,6 @@ sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName )
 }
 
 uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName )
-    throw (container::NoSuchElementException,
-           lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     uno::Sequence<beans::PropertyValue> aProps(1);
@@ -110,7 +107,6 @@ uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SCTAB nCount = mpDoc->GetTableCount() + 1;
     std::vector< OUString > aNames;
@@ -134,13 +130,11 @@ uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames(  )
 }
 
 uno::Type SAL_CALL XMLCodeNameProvider::getElementType(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
 }
 
 sal_Bool SAL_CALL XMLCodeNameProvider::hasElements()
-    throw (uno::RuntimeException, std::exception )
 {
     if( !mpDoc->GetCodeName().isEmpty() )
         return true;
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx
index 4b249782caa8..e0e2156b7e15 100644
--- a/sc/source/filter/xml/XMLCodeNameProvider.hxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx
@@ -38,22 +38,15 @@ public:
     explicit XMLCodeNameProvider(ScDocument* pDoc);
     virtual ~XMLCodeNameProvider() override;
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw (css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw (css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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 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;
 
     static void set( const css::uno::Reference< css::container::XNameAccess>& xNameAccess, ScDocument *pDoc );
 };
diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx
index f108b439a14c..e7fa6a6d6532 100644
--- a/sc/source/filter/xml/XMLEmptyContext.cxx
+++ b/sc/source/filter/xml/XMLEmptyContext.cxx
@@ -33,7 +33,6 @@ ScXMLEmptyContext::~ScXMLEmptyContext()
 css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     ScXMLEmptyContext::createFastChildContext( sal_Int32 nElement,
     const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*xAttrList*/ )
-    throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception)
 {
     SvXMLImportContext *pContext = new ScXMLEmptyContext( GetScImport(), nElement );
 
diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx
index e003cde0d33a..49679d2dda4b 100644
--- a/sc/source/filter/xml/XMLEmptyContext.hxx
+++ b/sc/source/filter/xml/XMLEmptyContext.hxx
@@ -33,8 +33,7 @@ public:
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
         createFastChildContext( sal_Int32 nElement,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 };
 
 #endif
diff --git a/sc/source/filter/xml/importcontext.cxx b/sc/source/filter/xml/importcontext.cxx
index 56196ea98f69..d0bceeddbcd7 100644
--- a/sc/source/filter/xml/importcontext.cxx
+++ b/sc/source/filter/xml/importcontext.cxx
@@ -31,17 +31,14 @@ const ScXMLImport& ScXMLImportContext::GetScImport() const
 }
 
 void SAL_CALL ScXMLImportContext::startFastElement(sal_Int32 /*nElement*/, const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*xAttrList*/)
-    throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception)
 {
 }
 
 void SAL_CALL ScXMLImportContext::endFastElement(sal_Int32 /*nElement*/)
-    throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception)
 {
 }
 
 void SAL_CALL ScXMLImportContext::characters(const OUString &)
-    throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception)
 {
 }
 
diff --git a/sc/source/filter/xml/importcontext.hxx b/sc/source/filter/xml/importcontext.hxx
index 0d9a13609eee..089b6c1027cb 100644
--- a/sc/source/filter/xml/importcontext.hxx
+++ b/sc/source/filter/xml/importcontext.hxx
@@ -27,14 +27,11 @@ public:
     ScXMLImportContext( SvXMLImport& rImport );
 
     virtual void SAL_CALL startFastElement (sal_Int32 nElement,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList) override;
 
-    virtual void SAL_CALL characters(const OUString & aChars)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL characters(const OUString & aChars) override;
 
-    virtual void SAL_CALL endFastElement(sal_Int32 nElement)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
 protected:
     ScXMLImport& GetScImport();
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index f31079d79010..486cea560fed 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -198,7 +198,6 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix,
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
         ScXMLBodyContext::createFastChildContext( sal_Int32 nElement,
         const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData();
     if ( pSheetData && pSheetData->HasStartPos() )
@@ -237,7 +236,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 }
 
 void SAL_CALL ScXMLBodyContext::characters(const OUString &)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData();
     if ( pSheetData && pSheetData->HasStartPos() )
@@ -250,7 +248,6 @@ void SAL_CALL ScXMLBodyContext::characters(const OUString &)
 }
 
 void SAL_CALL ScXMLBodyContext::endFastElement(sal_Int32 /*nElement*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData();
     if ( pSheetData && pSheetData->HasStartPos() )
diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx
index b5176cc15aad..b80bbd8cd044 100644
--- a/sc/source/filter/xml/xmlbodyi.hxx
+++ b/sc/source/filter/xml/xmlbodyi.hxx
@@ -52,14 +52,11 @@ public:
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
         createFastChildContext( sal_Int32 nElement,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 
-    virtual void SAL_CALL endFastElement(sal_Int32 nElement)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
-    virtual void SAL_CALL characters(const OUString & aChars)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL characters(const OUString & aChars) override;
 };
 
 #endif
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 3559cc814b0b..0f6292c3fff7 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1497,7 +1497,6 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString() const
 }
 
 void SAL_CALL ScXMLTableRowCellContext::endFastElement(sal_Int32 /*nElement*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     HasSpecialCaseFormulaText();
     if( bFormulaTextResult && (mbPossibleErrorCell || mbCheckWithCompilerForError) )
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index 845bdc07dfc9..284c8ffe1136 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -150,8 +150,7 @@ public:
     void SetDetectiveObj( const ScAddress& rPosition );
     void SetCellRangeSource( const ScAddress& rPosition );
 
-    virtual void SAL_CALL endFastElement(sal_Int32 nElement)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 };
 
 #endif
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 64d2ff96ee02..35a5e92c3b57 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -5040,7 +5040,6 @@ sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass )
 
 // XExporter
 void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XComponent>& xComponent )
-                            throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SvXMLExport::setSourceDocument( xComponent );
@@ -5070,7 +5069,6 @@ void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XCompon
 
 // XFilter
 sal_Bool SAL_CALL ScXMLExport::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDoc)
@@ -5082,7 +5080,6 @@ sal_Bool SAL_CALL ScXMLExport::filter( const css::uno::Sequence< css::beans::Pro
 }
 
 void SAL_CALL ScXMLExport::cancel()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDoc)
@@ -5092,7 +5089,6 @@ void SAL_CALL ScXMLExport::cancel()
 
 // XInitialization
 void SAL_CALL ScXMLExport::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SvXMLExport::initialize(aArguments);
@@ -5100,7 +5096,6 @@ void SAL_CALL ScXMLExport::initialize( const css::uno::Sequence< css::uno::Any >
 
 // XUnoTunnel
 sal_Int64 SAL_CALL ScXMLExport::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return SvXMLExport::getSomething(aIdentifier);
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 833163db6cbb..65f6efe54e2a 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -260,17 +260,17 @@ public:
     virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+    virtual void SAL_CALL cancel() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     virtual void DisposingModel() override;
 };
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index bb4748006a2e..4ec2acdfa287 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -115,7 +115,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw(
 }
 
 uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance(
-    const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+    const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
 {
     // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_ALL);
     return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_getImplementationName(), SvXMLImportFlags::ALL ));
@@ -133,7 +133,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() t
 }
 
 uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance(
-    const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+    const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
 {
     // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_META);
     return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META ));
@@ -151,7 +151,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames()
 }
 
 uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance(
-    const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+    const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
 {
     // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlagsSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS);
     return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::FONTDECLS));
@@ -169,7 +169,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames(
 }
 
 uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance(
-    const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+    const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
 {
     // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::META|SvXMLImportFlags::STYLES|SvXMLImportFlags::MASTERSTYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::SETTINGS|SvXMLImportFlags::FONTDECLS);
     return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Content_getImplementationName(), SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS));
@@ -187,7 +187,7 @@ uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames
 }
 
 uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance(
-    const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+    const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
 {
     // return (cppu::OWeakObject*)new ScXMLImport(SvXMLImportFlags::SETTINGS);
     return static_cast<cppu::OWeakObject*>(new ScXMLImport( comphelper::getComponentContext(rSMgr), ScXMLImport_Settings_getImplementationName(), SvXMLImportFlags::SETTINGS ));
@@ -244,18 +244,14 @@ public:
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
         createFastChildContext( sal_Int32 nElement,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 
     virtual void SAL_CALL startFastElement (sal_Int32 nElement,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList) override;
 
-    virtual void SAL_CALL characters(const OUString & aChars)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL characters(const OUString & aChars) override;
 
-    virtual void SAL_CALL endFastElement(sal_Int32 nElement)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 };
 
 ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -292,16 +288,13 @@ public:
         const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) override;
 
     virtual void SAL_CALL startFastElement (sal_Int32 nElement,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList) override;
 
-    virtual void SAL_CALL endFastElement(sal_Int32 nElement)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
         createFastChildContext( sal_Int32 nElement,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 };
 
 ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport,
@@ -342,7 +335,6 @@ SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext(
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
     ScXMLFlatDocContext_Impl::createFastChildContext( sal_Int32 nElement,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if ( nElement != ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_META ) )
         return ScXMLDocContext_Impl::createFastChildContext( nElement, xAttrList );
@@ -352,13 +344,11 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 
 void SAL_CALL ScXMLFlatDocContext_Impl::startFastElement(sal_Int32 nElement,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     SvXMLMetaDocumentContext::startFastElement( nElement, xAttrList );
 }
 
 void SAL_CALL ScXMLFlatDocContext_Impl::endFastElement(sal_Int32 nElement)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     SvXMLMetaDocumentContext::endFastElement( nElement );
 }
@@ -371,8 +361,7 @@ public:
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
         createFastChildContext( sal_Int32 nElement,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 };
 
 ScXMLBodyContext_Impl::ScXMLBodyContext_Impl( ScXMLImport& rImport, sal_Int32 /*nElement*/,
@@ -384,7 +373,6 @@ ScXMLImportContext( rImport )
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
     ScXMLBodyContext_Impl::createFastChildContext( sal_Int32 nElement,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     return GetScImport().CreateBodyContext( nElement, xAttrList );
 }
@@ -437,7 +425,6 @@ SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
     ScXMLDocContext_Impl::createFastChildContext( sal_Int32 nElement,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     SvXMLImportContext *pContext(nullptr);
 
@@ -463,17 +450,14 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 
 void SAL_CALL ScXMLDocContext_Impl::startFastElement(sal_Int32 /*nElement*/,
     const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 }
 
 void SAL_CALL ScXMLDocContext_Impl::endFastElement(sal_Int32 /*nElement*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 }
 
 void SAL_CALL ScXMLDocContext_Impl::characters(const OUString &)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 }
 
@@ -2335,7 +2319,6 @@ ScXMLImport::~ScXMLImport() throw()
 }
 
 void ScXMLImport::initialize( const css::uno::Sequence<css::uno::Any>& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     SvXMLImport::initialize(aArguments);
 
@@ -3068,7 +3051,6 @@ void ScXMLImport::SetStylesToRangesFinished()
 
 // XImporter
 void SAL_CALL ScXMLImport::setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ScXMLImport::MutexGuard aGuard(*this);
     SvXMLImport::setTargetDocument( xDoc );
@@ -3090,7 +3072,6 @@ throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exce
 
 // css::xml::sax::XDocumentHandler
 void SAL_CALL ScXMLImport::startDocument()
-throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception )
 {
     ScXMLImport::MutexGuard aGuard(*this);
     SvXMLImport::startDocument();
@@ -3300,9 +3281,6 @@ void ScXMLImport::SetStringRefSyntaxIfMissing()
 }
 
 void SAL_CALL ScXMLImport::endDocument()
-    throw(css::xml::sax::SAXException,
-          css::uno::RuntimeException,
-          std::exception)
 {
     ScXMLImport::MutexGuard aGuard(*this);
     if (getImportFlags() & SvXMLImportFlags::CONTENT)
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index c09dff58feac..fce8191bba1d 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -968,8 +968,7 @@ public:
     virtual ~ScXMLImport() throw() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments ) override;
 
     // namespace office
     // NB: in contrast to other CreateFooContexts, this particular one handles
@@ -1155,14 +1154,10 @@ public:
     void SetStylesToRangesFinished();
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL startDocument()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endDocument()
-        throw(css::xml::sax::SAXException,
-              css::uno::RuntimeException,
-              std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
+
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
 
     virtual void DisposingModel() override;
 
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 130843211c9d..a8409582444d 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -107,7 +107,6 @@ ScXMLTableRowContext::~ScXMLTableRowContext()
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
         ScXMLTableRowContext::createFastChildContext( sal_Int32 nElement,
         const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     SvXMLImportContext *pContext(nullptr);
 
@@ -143,7 +142,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 }
 
 void SAL_CALL ScXMLTableRowContext::endFastElement(sal_Int32 /*nElement*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     ScXMLImport& rXMLImport(GetScImport());
     if (!bHasCell && nRepeatedRows > 1)
@@ -253,7 +251,6 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext()
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
         ScXMLTableRowsContext::createFastChildContext( sal_Int32 nElement,
         const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     SvXMLImportContext *pContext(nullptr);
 
@@ -287,7 +284,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 }
 
 void SAL_CALL ScXMLTableRowsContext::endFastElement(sal_Int32 /*nElement*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     ScXMLImport& rXMLImport(GetScImport());
     if (bHeader)
diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx
index 5c3ab2920d87..1b3839349dc2 100644
--- a/sc/source/filter/xml/xmlrowi.hxx
+++ b/sc/source/filter/xml/xmlrowi.hxx
@@ -40,13 +40,11 @@ public:
 
     virtual ~ScXMLTableRowContext() override;
 
-    virtual void SAL_CALL endFastElement(sal_Int32 nElement)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
         createFastChildContext( sal_Int32 nElement,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 };
 
 class ScXMLTableRowsContext : public ScXMLImportContext
@@ -67,11 +65,9 @@ public:
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
                         createFastChildContext( sal_Int32 nElement,
-                        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList )
-                        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+                        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 
-    virtual void SAL_CALL endFastElement(sal_Int32 nElement)
-                        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
 };
 
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 6093c5225dce..f482b13fee24 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -323,7 +323,6 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
         ScXMLTableContext::createFastChildContext( sal_Int32 nElement,
         const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-        throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     const SvXMLTokenMap& rTokenMap(GetScImport().GetTableElemTokenMap());
     sal_uInt16 nToken = rTokenMap.Get( nElement );
@@ -365,7 +364,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 }
 
 void SAL_CALL ScXMLTableContext::endFastElement(sal_Int32 /*nElement*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     ScXMLImport::MutexGuard aMutexGuard(GetScImport());
     ScXMLImport& rImport = GetScImport();
diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx
index 0dfa46d2d2b7..ada786019320 100644
--- a/sc/source/filter/xml/xmltabi.hxx
+++ b/sc/source/filter/xml/xmltabi.hxx
@@ -59,11 +59,9 @@ public:
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
         createFastChildContext( sal_Int32 nElement,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+        const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) override;
 
-    virtual void SAL_CALL endFastElement(sal_Int32 nElement)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 };
 
 class ScXMLTableProtectionContext : public ScXMLImportContext
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 460a1f76cc8c..1ed01b3121e2 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -131,13 +131,11 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( ScAccessibleCell, ScAccessibleCellBase, Access
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleCell::getAccessibleAtPoint(
         const awt::Point& rPoint )
-        throw (uno::RuntimeException, std::exception)
 {
     return AccessibleStaticTextBase::getAccessibleAtPoint(rPoint);
 }
 
 void SAL_CALL ScAccessibleCell::grabFocus(  )
-        throw (uno::RuntimeException, std::exception)
 {
      SolarMutexGuard aGuard;
     IsObjectValid();
@@ -153,7 +151,6 @@ void SAL_CALL ScAccessibleCell::grabFocus(  )
 }
 
 Rectangle ScAccessibleCell::GetBoundingBoxOnScreen() const
-        throw (uno::RuntimeException, std::exception)
 {
     Rectangle aCellRect(GetBoundingBox());
     if (mpViewShell)
@@ -170,7 +167,6 @@ Rectangle ScAccessibleCell::GetBoundingBoxOnScreen() const
 }
 
 Rectangle ScAccessibleCell::GetBoundingBox() const
-        throw (uno::RuntimeException, std::exception)
 {
     Rectangle aCellRect;
     if (mpViewShell)
@@ -215,22 +211,18 @@ Rectangle ScAccessibleCell::GetBoundingBox() const
 
 sal_Int32 SAL_CALL
     ScAccessibleCell::getAccessibleChildCount()
-                    throw (uno::RuntimeException, std::exception)
 {
     return AccessibleStaticTextBase::getAccessibleChildCount();
 }
 
 uno::Reference< XAccessible > SAL_CALL
     ScAccessibleCell::getAccessibleChild(sal_Int32 nIndex)
-        throw (uno::RuntimeException,
-        lang::IndexOutOfBoundsException, std::exception)
 {
     return AccessibleStaticTextBase::getAccessibleChild(nIndex);
 }
 
 uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessibleCell::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
@@ -286,7 +278,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
 
 uno::Reference<XAccessibleRelationSet> SAL_CALL
        ScAccessibleCell::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -303,14 +294,12 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
     //=====  XServiceInfo  ====================================================
 
 OUString SAL_CALL ScAccessibleCell::getImplementationName()
-        throw (uno::RuntimeException, std::exception)
 {
     return OUString("ScAccessibleCell");
 }
 
 uno::Sequence< OUString> SAL_CALL
     ScAccessibleCell::getSupportedServiceNames()
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames();
     sal_Int32 nOldSize(aSequence.getLength());
@@ -509,9 +498,6 @@ static OUString ReplaceFourChar(const OUString& oldOUString)
 }
 
 uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -543,7 +529,7 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
 }
 
 // cell has its own ParaIndent property, so when calling character attributes on cell, the ParaIndent should replace the ParaLeftMargin if its value is not zero.
-uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes )
 {
     SolarMutexGuard aGuard;
 
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 890908afecb8..521732d27b19 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -75,7 +75,6 @@ ScAccessibleCellBase::~ScAccessibleCellBase()
     //=====  XAccessibleComponent  ============================================
 
 bool SAL_CALL ScAccessibleCellBase::isVisible()
-    throw (uno::RuntimeException, std::exception)
 {
      SolarMutexGuard aGuard;
     IsObjectValid();
@@ -95,7 +94,6 @@ bool SAL_CALL ScAccessibleCellBase::isVisible()
 }
 
 sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -135,7 +133,6 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground()
 }
 
 sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -179,7 +176,6 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground()
     //=====  XInterface  =====================================================
 
 uno::Any SAL_CALL ScAccessibleCellBase::queryInterface( uno::Type const & rType )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aAny (ScAccessibleCellBaseImpl::queryInterface(rType));
     return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType);
@@ -201,7 +197,6 @@ void SAL_CALL ScAccessibleCellBase::release()
 
 sal_Int32
     ScAccessibleCellBase::getAccessibleIndexInParent()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -210,7 +205,6 @@ sal_Int32
 
 OUString SAL_CALL
     ScAccessibleCellBase::createAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     OUString sDescription = OUString(ScResId(STR_ACC_CELL_DESCR));
 
@@ -219,7 +213,6 @@ OUString SAL_CALL
 
 OUString SAL_CALL
     ScAccessibleCellBase::createAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     // Document not needed, because only the cell address, but not the tablename is needed
     // always us OOO notation
@@ -230,7 +223,6 @@ OUString SAL_CALL
 
 uno::Any SAL_CALL
     ScAccessibleCellBase::getCurrentValue()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -244,7 +236,6 @@ uno::Any SAL_CALL
 
 sal_Bool SAL_CALL
     ScAccessibleCellBase::setCurrentValue( const uno::Any& aNumber )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -269,14 +260,12 @@ sal_Bool SAL_CALL
 
 uno::Any SAL_CALL
     ScAccessibleCellBase::getMaximumValue(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Any(DBL_MAX);
 }
 
 uno::Any SAL_CALL
     ScAccessibleCellBase::getMinimumValue(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Any(-DBL_MAX);
 }
@@ -284,7 +273,6 @@ uno::Any SAL_CALL
     //=====  XServiceInfo  ====================================================
 
 OUString SAL_CALL ScAccessibleCellBase::getImplementationName()
-        throw (uno::RuntimeException, std::exception)
 {
     return OUString("ScAccessibleCellBase");
 }
@@ -292,14 +280,12 @@ OUString SAL_CALL ScAccessibleCellBase::getImplementationName()
     //=====  XTypeProvider  ===================================================
 
 uno::Sequence< uno::Type > SAL_CALL ScAccessibleCellBase::getTypes()
-        throw (uno::RuntimeException, std::exception)
 {
     return comphelper::concatSequences(ScAccessibleCellBaseImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleCellBase::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -314,7 +300,6 @@ bool ScAccessibleCellBase::IsEditable(
 }
 
 OUString SAL_CALL ScAccessibleCellBase::GetNote()
-                                throw (css::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -361,7 +346,6 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote()
 }
 
 OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs()
-                                        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -442,7 +426,6 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs()
 }
 
 OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs()
-                                        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -592,7 +575,6 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs()
 //end of cell attributes
 
 OUString SAL_CALL ScAccessibleCellBase::GetAllDisplayNote()
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString strNote;
     OUString strTrackText;
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 3bf756a1c36f..13b541f4e891 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -104,7 +104,6 @@ void SAL_CALL ScAccessibleContextBase::disposing()
 //=====  XInterface  =====================================================
 
 uno::Any SAL_CALL ScAccessibleContextBase::queryInterface( uno::Type const & rType )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aAny (ScAccessibleContextBaseWeakImpl::queryInterface(rType));
     return aAny.hasValue() ? aAny : ScAccessibleContextBaseImplEvent::queryInterface(rType);
@@ -137,7 +136,6 @@ void ScAccessibleContextBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 uno::Reference< XAccessibleContext> SAL_CALL
     ScAccessibleContextBase::getAccessibleContext()
-    throw (uno::RuntimeException, std::exception)
 {
     return this;
 }
@@ -145,7 +143,6 @@ uno::Reference< XAccessibleContext> SAL_CALL
 //=====  XAccessibleComponent  ================================================
 
 sal_Bool SAL_CALL ScAccessibleContextBase::containsPoint(const awt::Point& rPoint )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -154,14 +151,12 @@ sal_Bool SAL_CALL ScAccessibleContextBase::containsPoint(const awt::Point& rPoin
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleContextBase::getAccessibleAtPoint(
         const awt::Point& /* rPoint */ )
-        throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
     return uno::Reference<XAccessible>();
 }
 
 awt::Rectangle SAL_CALL ScAccessibleContextBase::getBounds(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -169,7 +164,6 @@ awt::Rectangle SAL_CALL ScAccessibleContextBase::getBounds(  )
 }
 
 awt::Point SAL_CALL ScAccessibleContextBase::getLocation(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -177,7 +171,6 @@ awt::Point SAL_CALL ScAccessibleContextBase::getLocation(  )
 }
 
 awt::Point SAL_CALL ScAccessibleContextBase::getLocationOnScreen(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -185,7 +178,6 @@ awt::Point SAL_CALL ScAccessibleContextBase::getLocationOnScreen(  )
 }
 
 awt::Size SAL_CALL ScAccessibleContextBase::getSize(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -193,7 +185,6 @@ awt::Size SAL_CALL ScAccessibleContextBase::getSize(  )
 }
 
 bool SAL_CALL ScAccessibleContextBase::isShowing(  )
-        throw (uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -212,25 +203,21 @@ bool SAL_CALL ScAccessibleContextBase::isShowing(  )
 }
 
 bool SAL_CALL ScAccessibleContextBase::isVisible()
-    throw (uno::RuntimeException, std::exception)
 {
     return true;
 }
 
 void SAL_CALL ScAccessibleContextBase::grabFocus(  )
-        throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 sal_Int32 SAL_CALL ScAccessibleContextBase::getForeground(  )
-        throw (uno::RuntimeException, std::exception)
 {
     return COL_BLACK;
 }
 
 sal_Int32 SAL_CALL ScAccessibleContextBase::getBackground(  )
-        throw (uno::RuntimeException, std::exception)
 {
     return COL_WHITE;
 }
@@ -238,7 +225,6 @@ sal_Int32 SAL_CALL ScAccessibleContextBase::getBackground(  )
 //=====  XAccessibleContext  ==================================================
 
 sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("should be implemented in the abrevated class");
     return 0;
@@ -246,8 +232,6 @@ sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount()
 
 uno::Reference<XAccessible> SAL_CALL
     ScAccessibleContextBase::getAccessibleChild(sal_Int32 /* nIndex */)
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
-               std::exception)
 {
     OSL_FAIL("should be implemented in the abrevated class");
     return uno::Reference<XAccessible>();
@@ -255,14 +239,12 @@ uno::Reference<XAccessible> SAL_CALL
 
 uno::Reference<XAccessible> SAL_CALL
        ScAccessibleContextBase::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     return mxParent;
 }
 
 sal_Int32 SAL_CALL
        ScAccessibleContextBase::getAccessibleIndexInParent()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -296,14 +278,12 @@ sal_Int32 SAL_CALL
 
 sal_Int16 SAL_CALL
     ScAccessibleContextBase::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     return maRole;
 }
 
 OUString SAL_CALL
        ScAccessibleContextBase::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -329,7 +309,6 @@ OUString SAL_CALL
 
 OUString SAL_CALL
        ScAccessibleContextBase::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -356,22 +335,18 @@ OUString SAL_CALL
 
 uno::Reference<XAccessibleRelationSet> SAL_CALL
        ScAccessibleContextBase::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     return new utl::AccessibleRelationSetHelper();
 }
 
 uno::Reference<XAccessibleStateSet> SAL_CALL
         ScAccessibleContextBase::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference<XAccessibleStateSet>();
 }
 
 lang::Locale SAL_CALL
        ScAccessibleContextBase::getLocale()
-    throw (IllegalAccessibleComponentStateException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -393,7 +368,6 @@ lang::Locale SAL_CALL
 void SAL_CALL
        ScAccessibleContextBase::addAccessibleEventListener(
            const uno::Reference<XAccessibleEventListener>& xListener)
-    throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -411,7 +385,6 @@ void SAL_CALL
 void SAL_CALL
        ScAccessibleContextBase::removeAccessibleEventListener(
         const uno::Reference<XAccessibleEventListener>& xListener)
-    throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -436,7 +409,6 @@ void SAL_CALL
 
 void SAL_CALL ScAccessibleContextBase::disposing(
     const lang::EventObject& rSource )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (rSource.Source == mxParent)
@@ -445,26 +417,22 @@ void SAL_CALL ScAccessibleContextBase::disposing(
 
 void SAL_CALL ScAccessibleContextBase::notifyEvent(
         const AccessibleEventObject& /* aEvent */ )
-        throw (uno::RuntimeException, std::exception)
 {
 }
 
 // XServiceInfo
 OUString SAL_CALL ScAccessibleContextBase::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("ScAccessibleContextBase");
 }
 
 sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& sServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 uno::Sequence< OUString> SAL_CALL
        ScAccessibleContextBase::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return {"com.sun.star.accessibility.Accessible",
             "com.sun.star.accessibility.AccessibleContext"};
@@ -473,14 +441,12 @@ uno::Sequence< OUString> SAL_CALL
 //=====  XTypeProvider  =======================================================
 
 uno::Sequence< uno::Type > SAL_CALL ScAccessibleContextBase::getTypes()
-        throw (uno::RuntimeException, std::exception)
 {
     return comphelper::concatSequences(ScAccessibleContextBaseWeakImpl::getTypes(), ScAccessibleContextBaseImplEvent::getTypes());
 }
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleContextBase::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -489,14 +455,12 @@ uno::Sequence<sal_Int8> SAL_CALL
 
 OUString SAL_CALL
     ScAccessibleContextBase::createAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("should be implemented in the abrevated class");
     return OUString();
 }
 
 OUString SAL_CALL ScAccessibleContextBase::createAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("should be implemented in the abrevated class");
     return OUString();
@@ -533,21 +497,18 @@ void ScAccessibleContextBase::CommitFocusLost() const
 }
 
 Rectangle ScAccessibleContextBase::GetBoundingBoxOnScreen() const
-        throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
     return Rectangle();
 }
 
 Rectangle ScAccessibleContextBase::GetBoundingBox() const
-        throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
     return Rectangle();
 }
 
 void ScAccessibleContextBase::IsObjectValid() const
-        throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
         throw lang::DisposedException();
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 39ab0c4817df..428a440fd398 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -104,20 +104,19 @@ void SAL_CALL ScAccessibleCsvControl::disposing()
 // XAccessibleComponent -------------------------------------------------------
 
 Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint( const css::awt::Point& /* rPoint */ )
-        throw( RuntimeException, std::exception )
 {
     ensureAlive();
     return nullptr;
 }
 
-bool SAL_CALL ScAccessibleCsvControl::isVisible() throw( RuntimeException, std::exception )
+bool SAL_CALL ScAccessibleCsvControl::isVisible()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
     return implGetControl().IsVisible();
 }
 
-void SAL_CALL ScAccessibleCsvControl::grabFocus() throw( RuntimeException, std::exception )
+void SAL_CALL ScAccessibleCsvControl::grabFocus()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -172,21 +171,21 @@ void ScAccessibleCsvControl::SendRemoveColumnEvent( sal_uInt32 /* nFirstColumn *
 
 // helpers --------------------------------------------------------------------
 
-Rectangle ScAccessibleCsvControl::GetBoundingBoxOnScreen() const throw( RuntimeException, std::exception )
+Rectangle ScAccessibleCsvControl::GetBoundingBoxOnScreen() const
 {
     SolarMutexGuard aGuard;
     ensureAlive();
     return implGetControl().GetWindowExtentsRelative( nullptr );
 }
 
-Rectangle ScAccessibleCsvControl::GetBoundingBox() const throw( RuntimeException, std::exception )
+Rectangle ScAccessibleCsvControl::GetBoundingBox() const
 {
     SolarMutexGuard aGuard;
     ensureAlive();
     return implGetControl().GetWindowExtentsRelative( implGetControl().GetAccessibleParentWindow() );
 }
 
-void ScAccessibleCsvControl::ensureAlive() const throw( DisposedException )
+void ScAccessibleCsvControl::ensureAlive() const
 {
     if( !implIsAlive() )
         throw DisposedException();
@@ -199,7 +198,7 @@ ScCsvControl& ScAccessibleCsvControl::implGetControl() const
 }
 
 Reference< XAccessible > ScAccessibleCsvControl::implGetChildByRole(
-        const Reference< XAccessible >& rxParentObj, sal_uInt16 nRole ) throw( RuntimeException )
+        const Reference< XAccessible >& rxParentObj, sal_uInt16 nRole )
 {
     Reference< XAccessible > xAccObj;
     if( rxParentObj.is() )
@@ -342,7 +341,6 @@ ScAccessibleCsvRuler::~ScAccessibleCsvRuler()
 // XAccessibleComponent -----------------------------------------------------
 
 sal_Int32 SAL_CALL ScAccessibleCsvRuler::getForeground(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -350,7 +348,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getForeground(  )
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -359,21 +356,19 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground(  )
 
 // XAccessibleContext ---------------------------------------------------------
 
-sal_Int32 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount()
 {
     ensureAlive();
     return 0;
 }
 
 Reference< XAccessible > SAL_CALL ScAccessibleCsvRuler::getAccessibleChild( sal_Int32 /* nIndex */ )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     ensureAlive();
     throw IndexOutOfBoundsException();
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleRelationSet()
-        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -389,7 +384,6 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessible
 }
 
 Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleStateSet()
-        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     AccessibleStateSetHelper* pStateSet = implCreateStateSet();
@@ -405,7 +399,7 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleSta
 
 // XAccessibleText ------------------------------------------------------------
 
-sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -413,7 +407,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeExcept
 }
 
 sal_Bool SAL_CALL ScAccessibleCsvRuler::setCaretPosition( sal_Int32 nIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -425,7 +418,6 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::setCaretPosition( sal_Int32 nIndex )
 }
 
 sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -435,7 +427,6 @@ sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex )
 
 Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes( sal_Int32 nIndex,
             const css::uno::Sequence< OUString >& /* aRequestedAttributes */ )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -446,7 +437,6 @@ Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes(
 }
 
 css::awt::Rectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32 nIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -463,7 +453,7 @@ css::awt::Rectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32
     return aRect;
 }
 
-sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -471,7 +461,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeExcep
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const css::awt::Point& rPoint )
-        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -480,32 +469,31 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const css::awt::Point&
     return lcl_GetApiPos( ::std::min( ::std::max( rRuler.GetPosFromX( rPoint.X ), static_cast<sal_Int32>(0) ), rRuler.GetPosCount() ) );
 }
 
-OUString SAL_CALL ScAccessibleCsvRuler::getSelectedText() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvRuler::getSelectedText()
 {
     ensureAlive();
     return OUString();
 }
 
-sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionStart() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionStart()
 {
     ensureAlive();
     return -1;
 }
 
-sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionEnd() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionEnd()
 {
     ensureAlive();
     return -1;
 }
 
 sal_Bool SAL_CALL ScAccessibleCsvRuler::setSelection( sal_Int32 /* nStartIndex */, sal_Int32 /* nEndIndex */ )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     ensureAlive();
     return false;
 }
 
-OUString SAL_CALL ScAccessibleCsvRuler::getText() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvRuler::getText()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -513,7 +501,6 @@ OUString SAL_CALL ScAccessibleCsvRuler::getText() throw( RuntimeException, std::
 }
 
 OUString SAL_CALL ScAccessibleCsvRuler::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -522,7 +509,6 @@ OUString SAL_CALL ScAccessibleCsvRuler::getTextRange( sal_Int32 nStartIndex, sal
 }
 
 TextSegment SAL_CALL ScAccessibleCsvRuler::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType )
-        throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -587,7 +573,6 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextAtIndex( sal_Int32 nIndex, sal
 }
 
 TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType )
-        throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -640,7 +625,6 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBeforeIndex( sal_Int32 nIndex,
 }
 
 TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType )
-        throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -694,7 +678,6 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBehindIndex( sal_Int32 nIndex,
 }
 
 sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, sal_Int32 /* nEndIndex */ )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     ensureAlive();
     return false;
@@ -703,7 +686,6 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, s
 // XInterface -----------------------------------------------------------------
 
 Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const css::uno::Type& rType )
-        throw( RuntimeException, std::exception )
 {
     Any aAny( ScAccessibleCsvRulerImpl::queryInterface( rType ) );
     return aAny.hasValue() ? aAny : ScAccessibleCsvControl::queryInterface( rType );
@@ -721,21 +703,21 @@ void SAL_CALL ScAccessibleCsvRuler::release() throw ()
 
 // XServiceInfo ---------------------------------------------------------------
 
-OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName()
 {
     return OUString( RULER_IMPL_NAME );
 }
 
 // XTypeProvider --------------------------------------------------------------
 
-Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception )
+Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes()
 {
     Sequence< css::uno::Type > aSeq( 1 );
     aSeq[ 0 ] = cppu::UnoType<XAccessibleText>::get();
     return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
 }
 
-Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -757,32 +739,29 @@ void ScAccessibleCsvRuler::SendCaretEvent()
 
 // helpers --------------------------------------------------------------------
 
-OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName()
 {
     return OUString( ScResId( STR_ACC_CSVRULER_NAME ) );
 }
 
-OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleDescription() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleDescription()
 {
     return OUString( ScResId( STR_ACC_CSVRULER_DESCR ) );
 }
 
 void ScAccessibleCsvRuler::ensureValidIndex( sal_Int32 nIndex ) const
-        throw( IndexOutOfBoundsException )
 {
     if( (nIndex < 0) || (nIndex >= implGetTextLength()) )
         throw IndexOutOfBoundsException();
 }
 
 void ScAccessibleCsvRuler::ensureValidIndexWithEnd( sal_Int32 nIndex ) const
-        throw( IndexOutOfBoundsException )
 {
     if( (nIndex < 0) || (nIndex > implGetTextLength()) )
         throw IndexOutOfBoundsException();
 }
 
 void ScAccessibleCsvRuler::ensureValidRange( sal_Int32& rnStartIndex, sal_Int32& rnEndIndex ) const
-        throw( IndexOutOfBoundsException )
 {
     if( rnStartIndex > rnEndIndex )
         ::std::swap( rnStartIndex, rnEndIndex );
@@ -795,7 +774,7 @@ ScCsvRuler& ScAccessibleCsvRuler::implGetRuler() const
     return static_cast< ScCsvRuler& >( implGetControl() );
 }
 
-void ScAccessibleCsvRuler::constructStringBuffer() throw( RuntimeException )
+void ScAccessibleCsvRuler::constructStringBuffer()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -877,7 +856,6 @@ void ScAccessibleCsvGrid::disposing()
 // XAccessibleComponent -------------------------------------------------------
 
 Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw( RuntimeException, std::exception )
 {
     Reference< XAccessible > xRet;
     if( containsPoint( rPoint ) )
@@ -897,7 +875,6 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( con
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getForeground(  )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -905,7 +882,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getBackground(  )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -914,7 +890,7 @@ throw (RuntimeException, std::exception)
 
 // XAccessibleContext ---------------------------------------------------------
 
-sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -938,7 +914,6 @@ Reference<XAccessible> ScAccessibleCsvGrid::getAccessibleCell(sal_Int32 nRow, sa
 }
 
 Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_Int32 nIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -948,7 +923,6 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_I
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleRelationSet()
-        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -964,7 +938,6 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleR
 }
 
 Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStateSet()
-        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     AccessibleStateSetHelper* pStateSet = implCreateStateSet();
@@ -983,14 +956,14 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStat
 
 // XAccessibleTable -----------------------------------------------------------
 
-sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowCount()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
     return implGetRowCount();
 }
 
-sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -998,7 +971,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() throw( Runtim
 }
 
 OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleRowDescription( sal_Int32 nRow )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1007,7 +979,6 @@ OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleRowDescription( sal_Int32 nR
 }
 
 OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnDescription( sal_Int32 nColumn )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1016,7 +987,6 @@ OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnDescription( sal_Int32
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     ensureAlive();
     ensureValidPosition( nRow, nColumn );
@@ -1024,7 +994,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowExtentAt( sal_Int32 nRow
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     ensureAlive();
     ensureValidPosition( nRow, nColumn );
@@ -1032,28 +1001,24 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnExtentAt( sal_Int32 n
 }
 
 Reference< XAccessibleTable > SAL_CALL ScAccessibleCsvGrid::getAccessibleRowHeaders()
-        throw( RuntimeException, std::exception )
 {
     ensureAlive();
     return nullptr;
 }
 
 Reference< XAccessibleTable > SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnHeaders()
-        throw( RuntimeException, std::exception )
 {
     ensureAlive();
     return nullptr;
 }
 
 Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleRows()
-        throw( RuntimeException, std::exception )
 {
     ensureAlive();
     return Sequence< sal_Int32 >();
 }
 
 Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleColumns()
-        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1071,14 +1036,12 @@ Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleColumns
 }
 
 sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleRowSelected( sal_Int32 /* nRow */ )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     ensureAlive();
     return false;
 }
 
 sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleColumnSelected( sal_Int32 nColumn )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1087,7 +1050,6 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleColumnSelected( sal_Int32 nCo
 }
 
 Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1096,27 +1058,23 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCellAt( sal_
 }
 
 Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCaption()
-        throw( RuntimeException, std::exception )
 {
     ensureAlive();
     return nullptr;
 }
 
 Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleSummary()
-        throw( RuntimeException, std::exception )
 {
     ensureAlive();
     return nullptr;
 }
 
 sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleSelected( sal_Int32 /* nRow */, sal_Int32 nColumn )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     return isAccessibleColumnSelected( nColumn );
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1125,7 +1083,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1134,7 +1091,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1145,7 +1101,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildInd
 // XAccessibleSelection -------------------------------------------------------
 
 void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1158,7 +1113,6 @@ void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex
 }
 
 sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1167,19 +1121,19 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChi
     return implIsColumnSelected( nColumn );
 }
 
-void SAL_CALL ScAccessibleCsvGrid::clearAccessibleSelection() throw( RuntimeException, std::exception )
+void SAL_CALL ScAccessibleCsvGrid::clearAccessibleSelection()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
     implGetGrid().SelectAll( false );
 }
 
-void SAL_CALL ScAccessibleCsvGrid::selectAllAccessibleChildren() throw( RuntimeException, std::exception )
+void SAL_CALL ScAccessibleCsvGrid::selectAllAccessibleChildren()
 {
     selectAccessibleChild( 0 );
 }
 
-sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1187,7 +1141,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() throw(
 }
 
 Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1201,7 +1154,6 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChil
 }
 
 void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1218,7 +1170,6 @@ void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedC
 // XInterface -----------------------------------------------------------------
 
 Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const css::uno::Type& rType )
-        throw( RuntimeException, std::exception )
 {
     Any aAny( ScAccessibleCsvGridImpl::queryInterface( rType ) );
     return aAny.hasValue() ? aAny : ScAccessibleCsvControl::queryInterface( rType );
@@ -1236,14 +1187,14 @@ void SAL_CALL ScAccessibleCsvGrid::release() throw ()
 
 // XServiceInfo ---------------------------------------------------------------
 
-OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName()
 {
     return OUString( GRID_IMPL_NAME );
 }
 
 // XTypeProvider --------------------------------------------------------------
 
-Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception )
+Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes()
 {
     Sequence< css::uno::Type > aSeq( 2 );
     aSeq[ 0 ] = cppu::UnoType<XAccessibleTable>::get();
@@ -1251,7 +1202,7 @@ Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( Runti
     return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
 }
 
-Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1316,25 +1267,23 @@ void ScAccessibleCsvGrid::SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uI
 
 // helpers --------------------------------------------------------------------
 
-OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName()
 {
     return OUString( ScResId( STR_ACC_CSVGRID_NAME ) );
 }
 
-OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleDescription() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleDescription()
 {
     return OUString( ScResId( STR_ACC_CSVGRID_DESCR ) );
 }
 
 void ScAccessibleCsvGrid::ensureValidIndex( sal_Int32 nIndex ) const
-        throw( IndexOutOfBoundsException )
 {
     if( (nIndex < 0) || (nIndex >= implGetCellCount()) )
         throw IndexOutOfBoundsException();
 }
 
 void ScAccessibleCsvGrid::ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const
-        throw( IndexOutOfBoundsException )
 {
     if( (nRow < 0) || (nRow >= implGetRowCount()) || (nColumn < 0) || (nColumn >= implGetColumnCount()) )
         throw IndexOutOfBoundsException();
@@ -1434,7 +1383,7 @@ void SAL_CALL ScAccessibleCsvCell::disposing()
 
 // XAccessibleComponent -------------------------------------------------------
 
-void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException, std::exception )
+void SAL_CALL ScAccessibleCsvCell::grabFocus()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1443,7 +1392,6 @@ void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException, std::exc
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvCell::getForeground(  )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1451,7 +1399,6 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Int32 SAL_CALL ScAccessibleCsvCell::getBackground(  )
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1460,18 +1407,17 @@ throw (RuntimeException, std::exception)
 
 // XAccessibleContext -----------------------------------------------------
 
-sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount()
 {
     return AccessibleStaticTextBase::getAccessibleChildCount();
 }
 
 Reference< XAccessible > SAL_CALL ScAccessibleCsvCell::getAccessibleChild( sal_Int32 nIndex )
-        throw( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     return AccessibleStaticTextBase::getAccessibleChild( nIndex );
 }
 
-sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent()
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1479,7 +1425,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() throw( Runt
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvCell::getAccessibleRelationSet()
-        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1487,7 +1432,6 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvCell::getAccessibleR
 }
 
 Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvCell::getAccessibleStateSet()
-        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     AccessibleStateSetHelper* pStateSet = implCreateStateSet();
@@ -1515,14 +1459,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScAccessibleCsvCell, ScAccessibleCsvControl, A
 
 // XServiceInfo ---------------------------------------------------------------
 
-OUString SAL_CALL ScAccessibleCsvCell::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvCell::getImplementationName()
 {
     return OUString( CELL_IMPL_NAME );
 }
 
 // helpers --------------------------------------------------------------------
 
-Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const throw( RuntimeException, std::exception )
+Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const
 {
     SolarMutexGuard aGuard;
     ensureAlive();
@@ -1531,19 +1475,19 @@ Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const throw( RuntimeExce
     return aRect;
 }
 
-Rectangle ScAccessibleCsvCell::GetBoundingBox() const throw( RuntimeException, std::exception )
+Rectangle ScAccessibleCsvCell::GetBoundingBox() const
 {
     SolarMutexGuard aGuard;
     ensureAlive();
     return implGetBoundingBox();
 }
 
-OUString SAL_CALL ScAccessibleCsvCell::createAccessibleName() throw( RuntimeException, std::exception )
+OUString SAL_CALL ScAccessibleCsvCell::createAccessibleName()
 {
     return maCellText;
 }
 
-OUString SAL_CALL ScAccessibleCsvCell::createAccessibleDescription() throw( RuntimeException )
+OUString SAL_CALL ScAccessibleCsvCell::createAccessibleDescription()
 {
     return OUString();
 }
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 2416aa27b510..6ee818cb4aa1 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -266,14 +266,12 @@ public:
         const css::uno::Reference< css::drawing::XShape >& _rxShape,
         const long _nIndex,
         const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
-    )   throw (css::uno::RuntimeException) override;
+    ) override;
 
     virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel
-        (css::beans::XPropertySet* pSet)
-        throw (css::uno::RuntimeException) override;
+        (css::beans::XPropertySet* pSet) override;
     virtual css::uno::Reference< css::accessibility::XAccessible>
-        GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape)
-            throw (css::uno::RuntimeException) override;
+        GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape) override;
     ///=====  Internal  ========================================================
     void SetDrawBroadcaster();
 
@@ -464,7 +462,6 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const SfxHint& rHint)
 bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentChild,
         const css::uno::Reference< css::drawing::XShape >& _rxShape,
         const long /*_nIndex*/, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo)
-    throw (uno::RuntimeException)
 {
     // create the new child
     rtl::Reference< ::accessibility::AccessibleShape > pReplacement(::accessibility::ShapeTypeHandler::Instance().CreateAccessibleObject (
@@ -507,7 +504,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
     return bResult;
 }
 
-::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException)
+::accessibility::AccessibleControlShape * ScChildrenShapes::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet)
 {
     sal_Int32 count = GetCount();
     for (sal_Int32 index=0;index<count;index++)
@@ -529,7 +526,6 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
 
 css::uno::Reference < css::accessibility::XAccessible >
 ScChildrenShapes::GetAccessibleCaption (const css::uno::Reference < css::drawing::XShape>& xShape)
-            throw (css::uno::RuntimeException)
 {
     sal_Int32 count = GetCount();
     for (sal_Int32 index=0;index<count;index++)
@@ -1468,7 +1464,6 @@ void SAL_CALL ScAccessibleDocument::disposing()
 }
 
 void SAL_CALL ScAccessibleDocument::disposing( const lang::EventObject& /* Source */ )
-        throw (uno::RuntimeException, std::exception)
 {
     disposing();
 }
@@ -1648,7 +1643,6 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 }
 
 void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject& /* aEvent */ )
-        throw (uno::RuntimeException, std::exception)
 {
     bool bSelectionChanged(false);
     if (mpAccessibleSpreadsheet.is())
@@ -1678,7 +1672,6 @@ void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject& /
     //=====  XInterface  =====================================================
 
 uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const & rType )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aAnyTmp;
     if(rType == cppu::UnoType<XAccessibleGetAccFlowTo>::get())
@@ -1707,7 +1700,6 @@ void SAL_CALL ScAccessibleDocument::release()
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoint(
         const awt::Point& rPoint )
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Reference<XAccessible> xAccessible = nullptr;
     if (containsPoint(rPoint))
@@ -1737,7 +1729,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoin
 }
 
 void SAL_CALL ScAccessibleDocument::grabFocus(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1763,7 +1754,6 @@ void SAL_CALL ScAccessibleDocument::grabFocus(  )
     /// Return the number of currently visible children.
 sal_Int32 SAL_CALL
     ScAccessibleDocument::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1780,8 +1770,6 @@ sal_Int32 SAL_CALL
     /// Return the specified child or NULL if index is invalid.
 uno::Reference<XAccessible> SAL_CALL
     ScAccessibleDocument::getAccessibleChild(sal_Int32 nIndex)
-    throw (uno::RuntimeException,
-        lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1812,7 +1800,6 @@ uno::Reference<XAccessible> SAL_CALL
     /// Return the set of current states.
 uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessibleDocument::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
@@ -1839,7 +1826,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
 
 OUString SAL_CALL
     ScAccessibleDocument::getAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1875,7 +1861,6 @@ OUString SAL_CALL
 
 void SAL_CALL
     ScAccessibleDocument::selectAccessibleChild( sal_Int32 nChildIndex )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1909,7 +1894,6 @@ void SAL_CALL
 
 sal_Bool SAL_CALL
     ScAccessibleDocument::isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1942,7 +1926,6 @@ sal_Bool SAL_CALL
 
 void SAL_CALL
     ScAccessibleDocument::clearAccessibleSelection(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1953,7 +1936,6 @@ void SAL_CALL
 
 void SAL_CALL
     ScAccessibleDocument::selectAllAccessibleChildren(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1970,7 +1952,6 @@ void SAL_CALL
 
 sal_Int32 SAL_CALL
     ScAccessibleDocument::getSelectedAccessibleChildCount(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1990,7 +1971,6 @@ sal_Int32 SAL_CALL
 
 uno::Reference<XAccessible > SAL_CALL
     ScAccessibleDocument::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -2018,7 +1998,6 @@ uno::Reference<XAccessible > SAL_CALL
 
 void SAL_CALL
     ScAccessibleDocument::deselectAccessibleChild( sal_Int32 nChildIndex )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -2051,14 +2030,12 @@ void SAL_CALL
 
 OUString SAL_CALL
     ScAccessibleDocument::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("ScAccessibleDocument");
 }
 
 uno::Sequence< OUString> SAL_CALL
     ScAccessibleDocument::getSupportedServiceNames()
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames();
     sal_Int32 nOldSize(aSequence.getLength());
@@ -2072,14 +2049,12 @@ uno::Sequence< OUString> SAL_CALL
 //=====  XTypeProvider  =======================================================
 
 uno::Sequence< uno::Type > SAL_CALL ScAccessibleDocument::getTypes()
-        throw (uno::RuntimeException, std::exception)
 {
     return comphelper::concatSequences(ScAccessibleDocumentImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleDocument::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -2149,7 +2124,6 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA
 
 OUString SAL_CALL
     ScAccessibleDocument::createAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     OUString sDescription = OUString(ScResId(STR_ACC_DOC_DESCR));
     return sDescription;
@@ -2157,7 +2131,6 @@ OUString SAL_CALL
 
 OUString SAL_CALL
     ScAccessibleDocument::createAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -2168,7 +2141,6 @@ OUString SAL_CALL
 }
 
 Rectangle ScAccessibleDocument::GetBoundingBoxOnScreen() const
-    throw (uno::RuntimeException, std::exception)
 {
     Rectangle aRect;
     if (mpViewShell)
@@ -2181,7 +2153,6 @@ Rectangle ScAccessibleDocument::GetBoundingBoxOnScreen() const
 }
 
 Rectangle ScAccessibleDocument::GetBoundingBox() const
-    throw (uno::RuntimeException, std::exception)
 {
     Rectangle aRect;
     if (mpViewShell)
@@ -2307,7 +2278,6 @@ ScAddress   ScAccessibleDocument::GetCurCellAddress() const
 }
 
 uno::Any SAL_CALL ScAccessibleDocument::getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -2384,7 +2354,6 @@ css::uno::Sequence< css::uno::Any > ScAccessibleDocument::GetScAccFlowToSequence
 
 css::uno::Sequence< css::uno::Any >
         SAL_CALL ScAccessibleDocument::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
-        throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -2480,13 +2449,11 @@ css::uno::Sequence< css::uno::Any >
 }
 
 sal_Int32 SAL_CALL ScAccessibleDocument::getForeground(  )
-        throw (uno::RuntimeException, std::exception)
 {
     return COL_BLACK;
 }
 
 sal_Int32 SAL_CALL ScAccessibleDocument::getBackground(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index f8f55086484c..56d300981b29 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -622,7 +622,7 @@ public:
         const css::uno::Reference< css::drawing::XShape >& _rxShape,
         const long _nIndex,
         const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
-    )   throw (css::uno::RuntimeException) override;
+    ) override;
 
     ///=====  Internal  ========================================================
 
@@ -824,7 +824,6 @@ void ScShapeChildren::VisAreaChanged() const
 bool ScShapeChildren::ReplaceChild (::accessibility::AccessibleShape* /* pCurrentChild */,
     const css::uno::Reference< css::drawing::XShape >& /* _rxShape */,
         const long /* _nIndex */, const ::accessibility::AccessibleShapeTreeInfo& /* _rShapeTreeInfo */)
-        throw (uno::RuntimeException)
 {
     OSL_FAIL("should not be called in the page preview");
     return false;
@@ -1312,7 +1311,6 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
 //=====  XAccessibleComponent  ============================================
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleAtPoint( const awt::Point& rPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference<XAccessible> xAccessible;
     if (containsPoint(rPoint))
@@ -1373,7 +1371,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
     return xAccessible;
 }
 
-void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus()
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1391,7 +1389,6 @@ void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() throw (uno::RuntimeEx
 //=====  XAccessibleContext  ==============================================
 
 sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1407,7 +1404,6 @@ sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount()
 }
 
 uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChild(sal_Int32 nIndex)
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1470,7 +1466,6 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi
 
     /// Return the set of current states.
 uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet()
-                        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
@@ -1498,13 +1493,11 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge
     //=====  XServiceInfo  ====================================================
 
 OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName()
-                    throw (uno::RuntimeException, std::exception)
 {
     return OUString("ScAccessibleDocumentPagePreview");
 }
 
 uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames()
-                    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames();
     sal_Int32 nOldSize(aSequence.getLength());
@@ -1519,7 +1512,6 @@ uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedS
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleDocumentPagePreview::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1527,20 +1519,18 @@ uno::Sequence<sal_Int8> SAL_CALL
 //=====  internal  ========================================================
 
 OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription()
-                    throw (uno::RuntimeException, std::exception)
 {
     OUString sDescription = OUString(ScResId(STR_ACC_PREVIEWDOC_DESCR));
     return sDescription;
 }
 
 OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName()
-                    throw (uno::RuntimeException, std::exception)
 {
     OUString sName = OUString(ScResId(STR_ACC_PREVIEWDOC_NAME));
     return sName;
 }
 
-Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception)
+Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const
 {
     Rectangle aRect;
     if (mpViewShell)
@@ -1552,7 +1542,7 @@ Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const throw
     return aRect;
 }
 
-Rectangle ScAccessibleDocumentPagePreview::GetBoundingBox() const throw (uno::RuntimeException, std::exception)
+Rectangle ScAccessibleDocumentPagePreview::GetBoundingBox() const
 {
     Rectangle aRect;
     if (mpViewShell)
@@ -1598,7 +1588,6 @@ ScShapeChildren* ScAccessibleDocumentPagePreview::GetShapeChildren()
 }
 
 OUString ScAccessibleDocumentPagePreview::getAccessibleName()
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 878ee603d219..6393c872f253 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -128,7 +128,6 @@ void ScAccessibleEditObject::GotFocus()
 
 css::uno::Any SAL_CALL
     ScAccessibleEditObject::queryInterface (const css::uno::Type & rType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aReturn = ScAccessibleContextBase::queryInterface (rType);
     if ( ! aReturn.hasValue())
@@ -153,7 +152,6 @@ void SAL_CALL
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPoint(
         const awt::Point& rPoint )
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Reference<XAccessible> xRet;
     if (containsPoint(rPoint))
@@ -170,7 +168,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPo
 }
 
 Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen() const
-        throw (uno::RuntimeException, std::exception)
 {
     Rectangle aScreenBounds;
 
@@ -199,7 +196,6 @@ Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen() const
 }
 
 Rectangle ScAccessibleEditObject::GetBoundingBox() const
-        throw (uno::RuntimeException, std::exception)
 {
     Rectangle aBounds( GetBoundingBoxOnScreen() );
 
@@ -234,7 +230,6 @@ Rectangle ScAccessibleEditObject::GetBoundingBox() const
 
 sal_Int32 SAL_CALL
     ScAccessibleEditObject::getAccessibleChildCount()
-                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -244,8 +239,6 @@ sal_Int32 SAL_CALL
 
 uno::Reference< XAccessible > SAL_CALL
     ScAccessibleEditObject::getAccessibleChild(sal_Int32 nIndex)
-        throw (uno::RuntimeException,
-        lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -255,7 +248,6 @@ uno::Reference< XAccessible > SAL_CALL
 
 uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessibleEditObject::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
@@ -283,7 +275,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
 
 OUString SAL_CALL
     ScAccessibleEditObject::createAccessibleDescription()
-    throw (uno::RuntimeException)
 {
 //    OSL_FAIL("Should never be called, because is set in the constructor.")
     return OUString();
@@ -291,7 +282,6 @@ OUString SAL_CALL
 
 OUString SAL_CALL
     ScAccessibleEditObject::createAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("Should never be called, because is set in the constructor.");
     return OUString();
@@ -301,7 +291,6 @@ OUString SAL_CALL
 
 void SAL_CALL
     ScAccessibleEditObject::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
-        throw (uno::RuntimeException, std::exception)
 {
     CreateTextHelper();
 
@@ -312,7 +301,6 @@ void SAL_CALL
 
 void SAL_CALL
     ScAccessibleEditObject::removeAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
-        throw (uno::RuntimeException, std::exception)
 {
     CreateTextHelper();
 
@@ -324,7 +312,6 @@ void SAL_CALL
     //=====  XServiceInfo  ====================================================
 
 OUString SAL_CALL ScAccessibleEditObject::getImplementationName()
-        throw (uno::RuntimeException, std::exception)
 {
     return OUString("ScAccessibleEditObject");
 }
@@ -333,7 +320,6 @@ OUString SAL_CALL ScAccessibleEditObject::getImplementationName()
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleEditObject::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -393,13 +379,11 @@ void ScAccessibleEditObject::CreateTextHelper()
 }
 
 sal_Int32 SAL_CALL ScAccessibleEditObject::getForeground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     return GetFgBgColor(SC_UNONAME_CCOLOR);
 }
 
 sal_Int32 SAL_CALL ScAccessibleEditObject::getBackground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     return GetFgBgColor(SC_UNONAME_CELLBACK);
 }
@@ -444,13 +428,10 @@ sal_Int32 ScAccessibleEditObject::GetFgBgColor( const OUString &strPropColor)
 //=====  XAccessibleSelection  ============================================
 
 void SAL_CALL ScAccessibleEditObject::selectAccessibleChild( sal_Int32 )
-throw ( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
 }
 
 sal_Bool SAL_CALL ScAccessibleEditObject::isAccessibleChildSelected( sal_Int32 nChildIndex )
-throw ( IndexOutOfBoundsException,
-       RuntimeException, std::exception )
 {
     uno::Reference<XAccessible> xAcc = getAccessibleChild( nChildIndex );
     uno::Reference<XAccessibleContext> xContext;
@@ -472,17 +453,14 @@ throw ( IndexOutOfBoundsException,
 }
 
 void SAL_CALL ScAccessibleEditObject::clearAccessibleSelection(  )
-throw ( RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL ScAccessibleEditObject::selectAllAccessibleChildren(  )
-throw ( RuntimeException, std::exception )
 {
 }
 
 sal_Int32 SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChildCount()
-throw ( RuntimeException, std::exception )
 {
     sal_Int32 nCount = 0;
     sal_Int32 TotalCount = getAccessibleChildCount();
@@ -492,7 +470,6 @@ throw ( RuntimeException, std::exception )
 }
 
 uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-throw ( IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if ( nSelectedChildIndex > getSelectedAccessibleChildCount() )
         throw IndexOutOfBoundsException();
@@ -509,13 +486,10 @@ throw ( IndexOutOfBoundsException, RuntimeException, std::exception)
 
 void SAL_CALL ScAccessibleEditObject::deselectAccessibleChild(
                                                             sal_Int32 )
-                                                            throw ( IndexOutOfBoundsException,
-                                                            RuntimeException, std::exception )
 {
 }
 
 uno::Reference< XAccessibleRelationSet > ScAccessibleEditObject::getAccessibleRelationSet(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     vcl::Window* pWindow = mpWindow;
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index 178b40a85ec8..ca38874eb626 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -93,29 +93,25 @@ ScAccessibleFilterMenu::~ScAccessibleFilterMenu()
 // XAccessibleComponent
 
 Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleAtPoint( const css::awt::Point& /*rPoint*/ )
-        throw (RuntimeException, std::exception)
 {
     return this;
 }
 
-bool ScAccessibleFilterMenu::isVisible() throw (RuntimeException, std::exception)
+bool ScAccessibleFilterMenu::isVisible()
 {
     return mpWindow->IsVisible();
 }
 
 void ScAccessibleFilterMenu::grabFocus()
-    throw (RuntimeException, std::exception)
 {
 }
 
 sal_Int32 ScAccessibleFilterMenu::getForeground()
-    throw (RuntimeException, std::exception)
 {
     return 0;
 }
 
 sal_Int32 ScAccessibleFilterMenu::getBackground()
-    throw (RuntimeException, std::exception)
 {
     return 0;
 }
@@ -123,13 +119,11 @@ sal_Int32 ScAccessibleFilterMenu::getBackground()
 // XAccessibleContext
 
 sal_Int32 ScAccessibleFilterMenu::getAccessibleChildCount()
-    throw (RuntimeException, std::exception)
 {
     return getMenuItemCount();
 }
 
 Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nIndex)
-    throw (RuntimeException, IndexOutOfBoundsException, std::exception)
 {
     if (maMenuItems.size() <= static_cast<size_t>(nIndex))
         throw IndexOutOfBoundsException();
@@ -138,14 +132,12 @@ Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nInd
 }
 
 Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet()
-    throw (RuntimeException, std::exception)
 {
     updateStates();
     return mxStateSet;
 }
 
 OUString ScAccessibleFilterMenu::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString("ScAccessibleFilterMenu");
 }
@@ -154,7 +146,6 @@ OUString ScAccessibleFilterMenu::getImplementationName()
 
 void ScAccessibleFilterMenu::addAccessibleEventListener(
         const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ScAccessibleContextBase::addAccessibleEventListener(xListener);
     for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, true));
@@ -162,7 +153,6 @@ void ScAccessibleFilterMenu::addAccessibleEventListener(
 
 void ScAccessibleFilterMenu::removeAccessibleEventListener(
         const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ScAccessibleContextBase::removeAccessibleEventListener(xListener);
     for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, false));
@@ -171,7 +161,6 @@ void ScAccessibleFilterMenu::removeAccessibleEventListener(
 // XAccessibleSelection
 
 void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
         throw IndexOutOfBoundsException();
@@ -180,7 +169,6 @@ void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex)
 }
 
 sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
         throw IndexOutOfBoundsException();
@@ -188,24 +176,23 @@ sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex
     return mpWindow->isMenuItemSelected(static_cast<size_t>(nChildIndex));
 }
 
-void ScAccessibleFilterMenu::clearAccessibleSelection() throw (RuntimeException, std::exception)
+void ScAccessibleFilterMenu::clearAccessibleSelection()
 {
     mpWindow->clearSelectedMenuItem();
 }
 
-void ScAccessibleFilterMenu::selectAllAccessibleChildren() throw (RuntimeException, std::exception)
+void ScAccessibleFilterMenu::selectAllAccessibleChildren()
 {
     // not supported - this is a menu, you can't select all menu items.
 }
 
-sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount()
 {
     // Since this is a menu, either one menu item is selected, or none at all.
     return mpWindow->getSelectedMenuItem() == ScMenuFloatingWindow::MENU_NOT_SELECTED ? 0 : 1;
 }
 
 Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_Int32 nChildIndex)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
         throw IndexOutOfBoundsException();
@@ -213,7 +200,7 @@ Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_In
     return maMenuItems[nChildIndex];
 }
 
-void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex)
 {
     if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
         throw IndexOutOfBoundsException();
@@ -224,7 +211,6 @@ void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) thro
 // XInterface
 
 uno::Any SAL_CALL ScAccessibleFilterMenu::queryInterface( uno::Type const & rType )
-    throw (RuntimeException, std::exception)
 {
     Any any = ScAccessibleContextBase::queryInterface(rType);
     if (any.hasValue())
@@ -246,13 +232,11 @@ void SAL_CALL ScAccessibleFilterMenu::release() throw ()
 // XTypeProvider
 
 Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId()
-    throw (RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const
-    throw (RuntimeException, std::exception)
 {
     if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED)
         return Rectangle();
@@ -275,7 +259,6 @@ Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const
 }
 
 Rectangle ScAccessibleFilterMenu::GetBoundingBox() const
-    throw (RuntimeException, std::exception)
 {
     if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED)
         return Rectangle();
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
index 634bb7fc39bc..1b2174ecbdcb 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
@@ -53,58 +53,51 @@ ScAccessibleFilterMenuItem::~ScAccessibleFilterMenuItem()
 }
 
 sal_Int32 ScAccessibleFilterMenuItem::getAccessibleChildCount()
-    throw (RuntimeException, std::exception)
 {
     return 0;
 }
 
 Reference<XAccessible> ScAccessibleFilterMenuItem::getAccessibleChild(sal_Int32 /*nIndex*/)
-    throw (RuntimeException, IndexOutOfBoundsException, std::exception)
 {
     throw IndexOutOfBoundsException();
 }
 
 Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet()
-    throw (RuntimeException, std::exception)
 {
     updateStateSet();
     return mxStateSet;
 }
 
 OUString ScAccessibleFilterMenuItem::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString("ScAccessibleFilterMenuItem");
 }
 
 // XAccessibleAction
 
-sal_Int32 ScAccessibleFilterMenuItem::getAccessibleActionCount() throw (RuntimeException, std::exception)
+sal_Int32 ScAccessibleFilterMenuItem::getAccessibleActionCount()
 {
     return 1;
 }
 
 sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     mpWindow->executeMenuItem(mnMenuPos);
     return true;
 }
 
 OUString ScAccessibleFilterMenuItem::getAccessibleActionDescription(sal_Int32 /*nIndex*/)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     return OUString("click");
 }
 
 Reference<XAccessibleKeyBinding> ScAccessibleFilterMenuItem::getAccessibleActionKeyBinding(
-    sal_Int32 /*nIndex*/) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    sal_Int32 /*nIndex*/)
 {
     return Reference<XAccessibleKeyBinding>();
 }
 
 Any SAL_CALL ScAccessibleFilterMenuItem::queryInterface( uno::Type const & rType )
-    throw (RuntimeException, std::exception)
 {
     Any any = ScAccessibleContextBase::queryInterface(rType);
     if (any.hasValue())
@@ -134,7 +127,6 @@ void ScAccessibleFilterMenuItem::setEnabled(bool bEnabled)
 }
 
 Rectangle ScAccessibleFilterMenuItem::GetBoundingBoxOnScreen() const
-    throw (RuntimeException, std::exception)
 {
     if (!mpWindow->IsVisible())
         return Rectangle();
@@ -148,7 +140,6 @@ Rectangle ScAccessibleFilterMenuItem::GetBoundingBoxOnScreen() const
 }
 
 Rectangle ScAccessibleFilterMenuItem::GetBoundingBox() const
-    throw (RuntimeException, std::exception)
 {
     if (!mpWindow->IsVisible())
         return Rectangle();
diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
index 0d24e7093152..958ce1cbea16 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
@@ -42,14 +42,14 @@ ScAccessibleFilterTopWindow::~ScAccessibleFilterTopWindow()
 
 // XAccessibleContext
 
-sal_Int32 ScAccessibleFilterTopWindow::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 ScAccessibleFilterTopWindow::getAccessibleChildCount()
 {
     sal_Int32 nMenuCount = getMenuItemCount();
     return nMenuCount + 6;
 }
 
 Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild(
-    sal_Int32 nIndex) throw (RuntimeException, IndexOutOfBoundsException, std::exception)
+    sal_Int32 nIndex)
 {
     if (nIndex >= getAccessibleChildCount())
         throw IndexOutOfBoundsException();
@@ -82,7 +82,7 @@ Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild(
     return Reference<XAccessible>();
 }
 
-OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException, std::exception)
+OUString ScAccessibleFilterTopWindow::getImplementationName()
 {
     return OUString("ScAccessibleFilterTopWindow");
 }
diff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxx
index 8d37a8aa005a..19e23a7e0444 100644
--- a/sc/source/ui/Accessibility/AccessibleGlobal.cxx
+++ b/sc/source/ui/Accessibility/AccessibleGlobal.cxx
@@ -33,19 +33,18 @@ ScAccessibleStateSet::~ScAccessibleStateSet()
 
 // XAccessibleStateSet
 
-sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty()
 {
     return maStates.empty();
 }
 
 sal_Bool SAL_CALL ScAccessibleStateSet::contains(sal_Int16 nState)
-    throw (RuntimeException, std::exception)
 {
     return maStates.count(nState) != 0;
 }
 
 sal_Bool SAL_CALL ScAccessibleStateSet::containsAll(
-    const Sequence<sal_Int16>& aStateSet) throw (RuntimeException, std::exception)
+    const Sequence<sal_Int16>& aStateSet)
 {
     sal_Int32 n = aStateSet.getLength();
     for (sal_Int32 i = 0; i < n; ++i)
@@ -59,7 +58,6 @@ sal_Bool SAL_CALL ScAccessibleStateSet::containsAll(
 }
 
 Sequence<sal_Int16> SAL_CALL ScAccessibleStateSet::getStates()
-    throw (RuntimeException, std::exception)
 {
     Sequence<sal_Int16> aSeq(0);
     set<sal_Int16>::const_iterator itr = maStates.begin(), itrEnd = maStates.end();
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 1d5976679294..55ca0b0248e1 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -144,7 +144,6 @@ void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 //=====  XAccessibleComponent  ============================================
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPoint( const awt::Point& aPoint )
-                                throw (uno::RuntimeException, std::exception)
 {
     uno::Reference<XAccessible> xRet;
 
@@ -172,7 +171,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPo
     return xRet;
 }
 
-void SAL_CALL ScAccessiblePageHeader::grabFocus() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScAccessiblePageHeader::grabFocus()
 {
      SolarMutexGuard aGuard;
     IsObjectValid();
@@ -186,7 +185,7 @@ void SAL_CALL ScAccessiblePageHeader::grabFocus() throw (uno::RuntimeException,
 
 //=====  XAccessibleContext  ==============================================
 
-sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount()
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -217,7 +216,6 @@ sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno:
 }
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChild( sal_Int32 nIndex )
-                                throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -248,13 +246,12 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChil
     return xRet;
 }
 
-sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent()
 {
     return mnIndex;
 }
 
 uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccessibleStateSet()
-                                throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
@@ -280,13 +277,12 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess
 
 //=====  XServiceInfo  ====================================================
 
-OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAccessiblePageHeader::getImplementationName()
 {
     return OUString("ScAccessiblePageHeader");
 }
 
 uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames();
     sal_Int32 nOldSize(aSequence.getLength());
@@ -300,20 +296,18 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceName
 //====  internal  =========================================================
 
 OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription()
-                    throw (uno::RuntimeException, std::exception)
 {
     OUString sDesc(SC_RESSTR(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR));
     return sDesc.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN));
 }
 
 OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName()
-                    throw (uno::RuntimeException, std::exception)
 {
     OUString sName(SC_RESSTR(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME));
     return sName.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN));
 }
 
-Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception)
+Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const
 {
     Rectangle aCellRect(GetBoundingBox());
     if (mpViewShell)
@@ -329,7 +323,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::Run
     return aCellRect;
 }
 
-Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeException, std::exception)
+Rectangle ScAccessiblePageHeader::GetBoundingBox() const
 {
     Rectangle aRect;
     if (mpViewShell)
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 662b6d3d285e..9d698889ac41 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -109,7 +109,6 @@ void ScAccessiblePageHeaderArea::Notify( SfxBroadcaster& rBC, const SfxHint& rHi
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessibleAtPoint(
         const awt::Point& rPoint )
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Reference<XAccessible> xRet;
     if (containsPoint(rPoint))
@@ -130,7 +129,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessible
 
 sal_Int32 SAL_CALL
     ScAccessiblePageHeaderArea::getAccessibleChildCount()
-                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -141,8 +139,6 @@ sal_Int32 SAL_CALL
 
 uno::Reference< XAccessible > SAL_CALL
     ScAccessiblePageHeaderArea::getAccessibleChild(sal_Int32 nIndex)
-        throw (uno::RuntimeException,
-        lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -153,7 +149,6 @@ uno::Reference< XAccessible > SAL_CALL
 
 uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessiblePageHeaderArea::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
@@ -181,14 +176,12 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
 
 OUString SAL_CALL
        ScAccessiblePageHeaderArea::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("ScAccessiblePageHeaderArea");
 }
 
 uno::Sequence< OUString> SAL_CALL
        ScAccessiblePageHeaderArea::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames();
     sal_Int32 nOldSize(aSequence.getLength());
@@ -203,14 +196,12 @@ uno::Sequence< OUString> SAL_CALL
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessiblePageHeaderArea::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 //===== internal ==============================================================
 OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription()
-    throw(uno::RuntimeException, std::exception)
 {
     OUString sDesc;
     switch (meAdjust)
@@ -232,7 +223,6 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription()
 }
 
 OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     OUString sName;
     switch (meAdjust)
@@ -254,7 +244,6 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName()
 }
 
 Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const
-    throw(css::uno::RuntimeException, std::exception)
 {
     Rectangle aRect;
     if (mxParent.is())
@@ -271,7 +260,6 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const
 }
 
 Rectangle ScAccessiblePageHeaderArea::GetBoundingBox() const
-    throw (css::uno::RuntimeException, std::exception)
 {
     Rectangle aRect;
     if (mxParent.is())
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index f7f457ff4446..a931018fd28f 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -95,7 +95,6 @@ void ScAccessiblePreviewCell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
 //=====  XAccessibleComponent  ============================================
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleAtPoint( const awt::Point& rPoint )
-                                throw (uno::RuntimeException, std::exception)
 {
     uno::Reference<XAccessible> xRet;
     if (containsPoint(rPoint))
@@ -112,7 +111,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleAtP
     return xRet;
 }
 
-void SAL_CALL ScAccessiblePreviewCell::grabFocus() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScAccessiblePreviewCell::grabFocus()
 {
      SolarMutexGuard aGuard;
     IsObjectValid();
@@ -126,7 +125,7 @@ void SAL_CALL ScAccessiblePreviewCell::grabFocus() throw (uno::RuntimeException,
 
 //=====  XAccessibleContext  ==============================================
 
-sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount()
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -136,7 +135,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() throw(uno:
 }
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChild(sal_Int32 nIndex)
-                            throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -146,7 +144,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChi
 }
 
 uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessibleStateSet()
-                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -178,13 +175,12 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessi
 
 //=====  XServiceInfo  ====================================================
 
-OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName()
 {
     return OUString("ScAccessiblePreviewCell");
 }
 
 uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames();
     sal_Int32 nOldSize(aSequence.getLength());
@@ -199,14 +195,13 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNam
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessiblePreviewCell::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 //====  internal  =========================================================
 
-Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception)
+Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const
 {
     Rectangle aCellRect;
     if (mpViewShell)
@@ -223,7 +218,7 @@ Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const throw (uno::Ru
     return aCellRect;
 }
 
-Rectangle ScAccessiblePreviewCell::GetBoundingBox() const throw (uno::RuntimeException, std::exception)
+Rectangle ScAccessiblePreviewCell::GetBoundingBox() const
 {
     Rectangle aCellRect;
     if (mpViewShell)
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index de1ba2790abc..06dc5b76689a 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -135,7 +135,6 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint&
 //=====  XInterface  =====================================================
 
 uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::queryInterface( uno::Type const & rType )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aAny (ScAccessiblePreviewHeaderCellImpl::queryInterface(rType));
     return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType);
@@ -155,7 +154,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::release()
 
 //=====  XAccessibleValue  ================================================
 
-uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue()
 {
      SolarMutexGuard aGuard;
     IsObjectValid();
@@ -170,13 +169,12 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::R
 }
 
 sal_Bool SAL_CALL ScAccessiblePreviewHeaderCell::setCurrentValue( const uno::Any& /* aNumber */ )
-                                                                throw (uno::RuntimeException, std::exception)
 {
     //  it is not possible to set a value
     return false;
 }
 
-uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue()
 {
      SolarMutexGuard aGuard;
     IsObjectValid();
@@ -189,7 +187,7 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() throw (uno::R
     return uno::Any(fValue);
 }
 
-uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue()
 {
     double fValue(0.0);
     return uno::Any(fValue);
@@ -198,7 +196,6 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue() throw (uno::R
 //=====  XAccessibleComponent  ============================================
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleAtPoint( const awt::Point& rPoint )
-                                throw (uno::RuntimeException, std::exception)
 {
     uno::Reference<XAccessible> xRet;
     if (containsPoint(rPoint))
@@ -215,7 +212,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi
     return xRet;
 }
 
-void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus()
 {
      SolarMutexGuard aGuard;
     IsObjectValid();
@@ -229,7 +226,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() throw (uno::RuntimeExce
 
 //=====  XAccessibleContext  ==============================================
 
-sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount()
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -239,7 +236,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() thro
 }
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChild(sal_Int32 nIndex)
-                            throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -248,13 +244,12 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi
     return mpTextHelper->GetChild(nIndex);
 }
 
-sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent()
 {
     return mnIndex;
 }
 
 uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleStateSet()
-                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -282,13 +277,12 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getA
 
 //=====  XServiceInfo  ====================================================
 
-OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName()
 {
     return OUString("ScAccessiblePreviewHeaderCell");
 }
 
 uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames();
     sal_Int32 nOldSize(aSequence.getLength());
@@ -302,21 +296,19 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServ
 //=====  XTypeProvider  =======================================================
 
 uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewHeaderCell::getTypes()
-        throw (uno::RuntimeException, std::exception)
 {
     return comphelper::concatSequences(ScAccessiblePreviewHeaderCellImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessiblePreviewHeaderCell::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 //====  internal  =========================================================
 
-Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception)
+Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const
 {
     Rectangle aCellRect;
 
@@ -343,7 +335,7 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (u
     return aCellRect;
 }
 
-Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::RuntimeException, std::exception)
+Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const
 {
     FillTableInfo();
 
@@ -370,13 +362,13 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBox() const throw (uno::Runt
     return Rectangle();
 }
 
-OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription()
 {
     OUString sDescription = OUString(ScResId(STR_ACC_HEADERCELL_DESCR));
     return sDescription;
 }
 
-OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName()
 {
     OUString sName = OUString(ScResId(STR_ACC_HEADERCELL_NAME));
 
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index ac7deac10917..d9235cb972a1 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -107,7 +107,6 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
 //=====  XInterface  =====================================================
 
 uno::Any SAL_CALL ScAccessiblePreviewTable::queryInterface( uno::Type const & rType )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aAny (ScAccessiblePreviewTableImpl::queryInterface(rType));
     return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType);
@@ -128,7 +127,6 @@ void SAL_CALL ScAccessiblePreviewTable::release()
 //=====  XAccessibleTable  ================================================
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -142,7 +140,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowCount()
 }
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -156,7 +153,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnCount()
 }
 
 OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int32 nRow )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     FillTableInfo();
@@ -167,7 +163,6 @@ OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sal_Int
 }
 
 OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     FillTableInfo();
@@ -178,7 +173,6 @@ OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription( sal_
 }
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -212,7 +206,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32
 }
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -245,32 +238,31 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnExtentAt( sal_In
     return nColumns;
 }
 
-uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleRowHeaders() throw (uno::RuntimeException, std::exception)
+uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleRowHeaders()
 {
     //! missing
     return nullptr;
 }
 
-uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnHeaders() throw (uno::RuntimeException, std::exception)
+uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnHeaders()
 {
     //! missing
     return nullptr;
 }
 
-uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleRows() throw (uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleRows()
 {
     //  in the page preview, there is no selection
     return uno::Sequence<sal_Int32>(0);
 }
 
-uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleColumns() throw (uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleColumns()
 {
     //  in the page preview, there is no selection
     return uno::Sequence<sal_Int32>(0);
 }
 
 sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 nRow )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     //  in the page preview, there is no selection
 
@@ -283,7 +275,6 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 n
 }
 
 sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleColumnSelected( sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     //  in the page preview, there is no selection
 
@@ -296,7 +287,6 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleColumnSelected( sal_Int3
 }
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -336,20 +326,19 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCe
     return xRet;
 }
 
-uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCaption() throw (uno::RuntimeException, std::exception)
+uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCaption()
 {
     //! missing
     return nullptr;
 }
 
-uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleSummary() throw (uno::RuntimeException, std::exception)
+uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleSummary()
 {
     //! missing
     return nullptr;
 }
 
 sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     //  in the page preview, there is no selection
     SolarMutexGuard aGuard;
@@ -368,7 +357,6 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow
 }
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -388,7 +376,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow,
 }
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -407,7 +394,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildI
 }
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -428,7 +414,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int32 nChi
 //=====  XAccessibleComponent  ============================================
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleAtPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference<XAccessible> xRet;
     if (containsPoint(aPoint))
@@ -476,7 +461,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleAt
     return xRet;
 }
 
-void SAL_CALL ScAccessiblePreviewTable::grabFocus() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScAccessiblePreviewTable::grabFocus()
 {
      SolarMutexGuard aGuard;
     IsObjectValid();
@@ -491,7 +476,6 @@ void SAL_CALL ScAccessiblePreviewTable::grabFocus() throw (uno::RuntimeException
 //=====  XAccessibleContext  ==============================================
 
 sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -505,7 +489,6 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount()
 }
 
 uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleChild( sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -532,13 +515,12 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCh
     return xRet;
 }
 
-sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent()
 {
     return mnIndex;
 }
 
 uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAccessibleStateSet()
-                                throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
@@ -565,13 +547,12 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce
 
 //=====  XServiceInfo  ====================================================
 
-OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName()
 {
     return OUString("ScAccessiblePreviewTable");
 }
 
 uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames();
     sal_Int32 nOldSize(aSequence.getLength());
@@ -585,13 +566,11 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNa
 //=====  XTypeProvider  ===================================================
 
 uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewTable::getTypes()
-        throw (uno::RuntimeException, std::exception)
 {
     return comphelper::concatSequences(ScAccessiblePreviewTableImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -599,14 +578,12 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId()
 //====  internal  =========================================================
 
 OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription()
-                    throw (uno::RuntimeException, std::exception)
 {
     OUString sDesc(ScResId(STR_ACC_TABLE_DESCR));
     return sDesc;
 }
 
 OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     OUString sName(SC_RESSTR(STR_ACC_TABLE_NAME));
 
@@ -625,7 +602,7 @@ OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName()
     return sName;
 }
 
-Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception)
+Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const
 {
     Rectangle aCellRect(GetBoundingBox());
     if (mpViewShell)
@@ -642,7 +619,6 @@ Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::R
 }
 
 Rectangle ScAccessiblePreviewTable::GetBoundingBox() const
-    throw (uno::RuntimeException, std::exception)
 {
     FillTableInfo();
 
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 203a048bb0a4..4c15bcf4a65e 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -767,7 +767,6 @@ void ScAccessibleSpreadsheet::CommitFocusCell(const ScAddress &aNewCell)
 //=====  XAccessibleTable  ================================================
 
 uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleRowHeaders(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -786,7 +785,6 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessib
 }
 
 uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleColumnHeaders(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -805,7 +803,6 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessib
 }
 
 uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleRows(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -836,7 +833,6 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessib
 }
 
 uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleColumns(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -861,7 +857,6 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessib
 }
 
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleRowSelected( sal_Int32 nRow )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -883,7 +878,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleRowSelected( sal_Int32 nR
 }
 
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleColumnSelected( sal_Int32 nColumn )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -930,7 +924,6 @@ rtl::Reference<ScAccessibleCell> ScAccessibleSpreadsheet::GetAccessibleCellAt(sa
 }
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-                    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -947,7 +940,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleCel
 }
 
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -973,7 +965,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleSelected( sal_Int32 nRow,
     //=====  XAccessibleComponent  ============================================
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleAtPoint(const awt::Point& rPoint)
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< XAccessible > xAccessible;
     if (containsPoint(rPoint))
@@ -998,7 +989,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleAtP
 }
 
 void SAL_CALL ScAccessibleSpreadsheet::grabFocus(  )
-        throw (uno::RuntimeException, std::exception)
 {
     if (getAccessibleParent().is())
     {
@@ -1009,13 +999,11 @@ void SAL_CALL ScAccessibleSpreadsheet::grabFocus(  )
 }
 
 sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getForeground(  )
-        throw (uno::RuntimeException, std::exception)
 {
     return COL_BLACK;
 }
 
 sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1025,7 +1013,6 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground(  )
     //=====  XAccessibleContext  ==============================================
 
 uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception)
 {
     utl::AccessibleRelationSetHelper* pRelationSet = nullptr;
     if(mpAccDoc)
@@ -1037,7 +1024,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAcce
 
 uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessibleSpreadsheet::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<XAccessibleStateSet> xParentStates;
@@ -1074,7 +1060,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ///=====  XAccessibleSelection  ===========================================
 
 void SAL_CALL ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1092,7 +1077,6 @@ void SAL_CALL ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int32 nChildIn
 
 void SAL_CALL
         ScAccessibleSpreadsheet::clearAccessibleSelection(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1104,7 +1088,6 @@ void SAL_CALL
 }
 
 void SAL_CALL ScAccessibleSpreadsheet::selectAllAccessibleChildren(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1125,7 +1108,6 @@ void SAL_CALL ScAccessibleSpreadsheet::selectAllAccessibleChildren(  )
 
 sal_Int32 SAL_CALL
         ScAccessibleSpreadsheet::getSelectedAccessibleChildCount(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1154,7 +1136,6 @@ sal_Int32 SAL_CALL
 
 uno::Reference<XAccessible > SAL_CALL
         ScAccessibleSpreadsheet::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1193,7 +1174,6 @@ uno::Reference<XAccessible > SAL_CALL
 }
 
 void SAL_CALL ScAccessibleSpreadsheet::deselectAccessibleChild( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1294,14 +1274,12 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange)
     //=====  XServiceInfo  ====================================================
 
 OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName()
-        throw (uno::RuntimeException, std::exception)
 {
     return OUString("ScAccessibleSpreadsheet");
 }
 
 uno::Sequence< OUString> SAL_CALL
     ScAccessibleSpreadsheet::getSupportedServiceNames()
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames();
     sal_Int32 nOldSize(aSequence.getLength());
@@ -1316,7 +1294,6 @@ uno::Sequence< OUString> SAL_CALL
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleSpreadsheet::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1324,7 +1301,6 @@ uno::Sequence<sal_Int8> SAL_CALL
 ///=====  XAccessibleEventBroadcaster  =====================================
 
 void SAL_CALL ScAccessibleSpreadsheet::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener)
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -1335,7 +1311,6 @@ void SAL_CALL ScAccessibleSpreadsheet::addAccessibleEventListener(const uno::Ref
 //====  internal  =========================================================
 
 Rectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() const
-    throw (uno::RuntimeException, std::exception)
 {
     Rectangle aRect;
     if (mpViewShell)
@@ -1348,7 +1323,6 @@ Rectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() const
 }
 
 Rectangle ScAccessibleSpreadsheet::GetBoundingBox() const
-    throw (uno::RuntimeException, std::exception)
 {
     Rectangle aRect;
     if (mpViewShell)
@@ -1451,7 +1425,6 @@ Rectangle ScAccessibleSpreadsheet::GetVisCells(const Rectangle& rVisArea)
 }
 
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1469,7 +1442,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row )
 }
 
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1487,7 +1459,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column )
 }
 
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1506,7 +1477,6 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row )
 }
 
 sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectColumn( sal_Int32 column )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index c3c557d7707b..a70dfff350bc 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -62,7 +62,6 @@ void SAL_CALL ScAccessibleTableBase::disposing()
     //=====  XInterface  =====================================================
 
 uno::Any SAL_CALL ScAccessibleTableBase::queryInterface( uno::Type const & rType )
-    throw (uno::RuntimeException, std::exception)
 {
     if ( rType == cppu::UnoType<XAccessibleTableSelection>::get())
     {
@@ -90,7 +89,6 @@ void SAL_CALL ScAccessibleTableBase::release()
     //=====  XAccessibleTable  ================================================
 
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowCount(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -98,7 +96,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowCount(  )
 }
 
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -106,7 +103,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount(  )
 }
 
 OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 nRow )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     OSL_FAIL("Here should be a implementation to fill the description");
 
@@ -118,7 +114,6 @@ OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32
 }
 
 OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int32 nColumn )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     OSL_FAIL("Here should be a implementation to fill the description");
 
@@ -130,7 +125,6 @@ OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int
 }
 
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -164,7 +158,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nR
 }
 
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -198,7 +191,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32
 }
 
 uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessibleRowHeaders(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< XAccessibleTable > xAccessibleTable;
     OSL_FAIL("Here should be a implementation to fill the row headers");
@@ -208,7 +200,6 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible
 }
 
 uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessibleColumnHeaders(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< XAccessibleTable > xAccessibleTable;
     OSL_FAIL("Here should be a implementation to fill the column headers");
@@ -218,7 +209,6 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible
 }
 
 uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleRows(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     uno::Sequence< sal_Int32 > aSequence;
@@ -226,7 +216,6 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessible
 }
 
 uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleColumns(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     uno::Sequence< sal_Int32 > aSequence;
@@ -234,21 +223,18 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessible
 }
 
 sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleRowSelected( sal_Int32 /* nRow */ )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     return false;
 }
 
 sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleColumnSelected( sal_Int32 /* nColumn */ )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     return false;
 }
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCellAt( sal_Int32 /* nRow */, sal_Int32 /* nColumn */ )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     uno::Reference< XAccessible > xAccessible;
@@ -256,7 +242,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCellA
 }
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCaption(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     uno::Reference< XAccessible > xAccessible;
@@ -264,7 +249,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCapti
 }
 
 uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleSummary(  )
-                    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     uno::Reference< XAccessible > xAccessible;
@@ -272,7 +256,6 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleSumma
 }
 
 sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow */, sal_Int32 /* nColumn */ )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     OSL_FAIL("not implemented yet");
     return false;
@@ -281,7 +264,6 @@ sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow
 // =====  XAccessibleExtendedTable  ========================================
 
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -298,7 +280,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sa
 }
 
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildIndex )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -310,7 +291,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildInde
 }
 
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildIndex )
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -324,7 +304,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildI
 // =====  XAccessibleContext  ==============================================
 
 sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -342,9 +321,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount()
 
 uno::Reference< XAccessible > SAL_CALL
     ScAccessibleTableBase::getAccessibleChild(sal_Int32 nIndex)
-        throw (uno::RuntimeException,
-        lang::IndexOutOfBoundsException,
-        std::exception)
 {
     SolarMutexGuard aGuard;
     IsObjectValid();
@@ -365,14 +341,12 @@ uno::Reference< XAccessible > SAL_CALL
 
 OUString SAL_CALL
     ScAccessibleTableBase::createAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     OUString sDesc(ScResId(STR_ACC_TABLE_DESCR));
     return sDesc;
 }
 
 OUString SAL_CALL ScAccessibleTableBase::createAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     OUString sName(SC_RESSTR(STR_ACC_TABLE_NAME));
     OUString sCoreName;
@@ -383,7 +357,6 @@ OUString SAL_CALL ScAccessibleTableBase::createAccessibleName()
 
 uno::Reference<XAccessibleRelationSet> SAL_CALL
     ScAccessibleTableBase::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("should be implemented in the abrevated class");
     return uno::Reference<XAccessibleRelationSet>();
@@ -391,7 +364,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
 
 uno::Reference<XAccessibleStateSet> SAL_CALL
     ScAccessibleTableBase::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("should be implemented in the abrevated class");
     uno::Reference< XAccessibleStateSet > xAccessibleStateSet;
@@ -401,13 +373,11 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
     ///=====  XAccessibleSelection  ===========================================
 
 void SAL_CALL ScAccessibleTableBase::selectAccessibleChild( sal_Int32 /* nChildIndex */ )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
 }
 
 sal_Bool SAL_CALL
         ScAccessibleTableBase::isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     // I don't need to guard, because the called functions have a guard
     if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount())
@@ -417,18 +387,15 @@ sal_Bool SAL_CALL
 
 void SAL_CALL
         ScAccessibleTableBase::clearAccessibleSelection(  )
-        throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ScAccessibleTableBase::selectAllAccessibleChildren()
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 sal_Int32 SAL_CALL
         ScAccessibleTableBase::getSelectedAccessibleChildCount(  )
-        throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nResult(0);
     return nResult;
@@ -436,21 +403,18 @@ sal_Int32 SAL_CALL
 
 uno::Reference<XAccessible > SAL_CALL
         ScAccessibleTableBase::getSelectedAccessibleChild( sal_Int32 /* nSelectedChildIndex */ )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     uno::Reference < XAccessible > xAccessible;
     return xAccessible;
 }
 
 void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int32 /* nSelectedChildIndex */ )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
 }
 
     //=====  XServiceInfo  ====================================================
 
 OUString SAL_CALL ScAccessibleTableBase::getImplementationName()
-        throw (uno::RuntimeException, std::exception)
 {
     return OUString("ScAccessibleTableBase");
 }
@@ -458,14 +422,12 @@ OUString SAL_CALL ScAccessibleTableBase::getImplementationName()
     //=====  XTypeProvider  ===================================================
 
 uno::Sequence< uno::Type > SAL_CALL ScAccessibleTableBase::getTypes()
-        throw (uno::RuntimeException, std::exception)
 {
     return comphelper::concatSequences(ScAccessibleTableBaseImpl::getTypes(), ScAccessibleContextBase::getTypes());
 }
 
 uno::Sequence<sal_Int8> SAL_CALL
     ScAccessibleTableBase::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -488,29 +450,21 @@ void ScAccessibleTableBase::CommitTableModelChange(sal_Int32 nStartRow, sal_Int3
 }
 
 sal_Bool SAL_CALL ScAccessibleTableBase::selectRow( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
-           std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ScAccessibleTableBase::selectColumn( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
-           std::exception)
 {
     return true;
 }
 
 sal_Bool SAL_CALL ScAccessibleTableBase::unselectRow( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
-           std::exception)
 {
         return true;
 }
 
 sal_Bool SAL_CALL ScAccessibleTableBase::unselectColumn( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
-           std::exception)
 {
     return true;
 }
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
index a38c08cd27de..1c858f1de77a 100644
--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
@@ -40,13 +40,11 @@ ScDrawModelBroadcaster::~ScDrawModelBroadcaster()
 }
 
 void SAL_CALL ScDrawModelBroadcaster::addEventListener( const uno::Reference< document::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     maEventListeners.addInterface( xListener );
 }
 
 void SAL_CALL ScDrawModelBroadcaster::removeEventListener( const uno::Reference< document::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     maEventListeners.removeInterface( xListener );
 }
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 8c8d24b15683..1c0a506e1cda 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -779,7 +779,7 @@ const css::uno::Sequence< sal_Int8 >& ScDrawTransferObj::getUnoTunnelId()
     return theScDrawTransferObjUnoTunnelId::get().getSeq();
 }
 
-sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
     if( ( rId.getLength() == 16 ) &&
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 21ee669859a8..34fa4e0a58b7 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -869,7 +869,7 @@ const css::uno::Sequence< sal_Int8 >& ScTransferObj::getUnoTunnelId()
     return theScTransferUnoTunnelId::get().getSeq();
 }
 
-sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
     if( ( rId.getLength() == 16 ) &&
diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index 8009d0c99603..808c28d80852 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -106,18 +106,18 @@ class VBAProjectListener : public ContainerListenerHelper
 public:
     explicit VBAProjectListener( ScMacroManager* pMacroMgr ) : mpMacroMgr( pMacroMgr ) {}
     // XEventListener
-    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException, std::exception) override {}
+    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) override {}
 
     // XContainerListener
-    virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception) override {}
-    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) throw(RuntimeException, std::exception) override
+    virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) override {}
+    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) override
     {
         OUString sModuleName;
         Event.Accessor >>= sModuleName;
         mpMacroMgr->InitUserFuncData();
         mpMacroMgr->BroadcastModuleUpdate(sModuleName);
     }
-    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception) override {}
+    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) override {}
 
 };
 
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index 11dc542f219c..68adf6cd2ab7 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -85,20 +85,16 @@ public:
     ///=====  XAccessibleComponent  ============================================
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
-        SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
-    virtual void SAL_CALL grabFocus(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) override;
 
 protected:
     /// Return the object's current bounding box relative to the desktop.
-    virtual Rectangle GetBoundingBoxOnScreen() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
 
     /// Return the object's current bounding box relative to the parent object.
-    virtual Rectangle GetBoundingBox() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBox() const override;
 
 public:
     ///=====  XAccessibleContext  ==============================================
@@ -106,49 +102,38 @@ public:
     /// Return the number of currently visible children.
     /// override to calculate this on demand
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-                    throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     /// Return the specified child or NULL if index is invalid.
     /// override to calculate this on demand
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-                css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
 
     /// Return the set of current states.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     virtual css::uno::Reference<
         css::accessibility::XAccessibleRelationSet> SAL_CALL
-           getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+           getAccessibleRelationSet() override;
 
     ///=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Returns a list of all supported services.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
-    virtual css::uno::Any SAL_CALL getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Any SAL_CALL getExtendedAttributes() override;
 
     // Override this method to handle cell's ParaIndent attribute specially.
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
 private:
     ScTabViewShell* mpViewShell;
     ScAccessibleDocument* mpAccDoc;
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index 7322d74bd4e9..f37252032c81 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -44,14 +44,12 @@ protected:
     virtual ~ScAccessibleCellBase() override;
 public:
 
-    virtual bool SAL_CALL isVisible()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual bool SAL_CALL isVisible() override;
 
     ///=====  XInterface  =====================================================
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
 
     virtual void SAL_CALL acquire() throw () override;
 
@@ -59,70 +57,57 @@ public:
 
     ///=====  XAccessibleComponent  ============================================
 
-    virtual sal_Int32 SAL_CALL getForeground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBackground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     ///=====  XAccessibleContext  ==============================================
 
     /// Return this objects index among the parents children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleIndexInParent() override;
 
 protected:
     /// Return this object's description.
     virtual OUString SAL_CALL
-        createAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createAccessibleDescription() override;
 
     /// Return the object's current name.
     virtual OUString SAL_CALL
-        createAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createAccessibleName() override;
 
 public:
     ///=====  XAccessibleValue  ================================================
 
     virtual css::uno::Any SAL_CALL
-        getCurrentValue()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        getCurrentValue() override;
 
     virtual sal_Bool SAL_CALL
-        setCurrentValue( const css::uno::Any& aNumber )
-        throw (css::uno::RuntimeException, std::exception) override;
+        setCurrentValue( const css::uno::Any& aNumber ) override;
 
     virtual css::uno::Any SAL_CALL
-        getMaximumValue(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getMaximumValue(  ) override;
 
     virtual css::uno::Any SAL_CALL
-        getMinimumValue(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getMinimumValue(  ) override;
 
     ///=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     ///=====  XTypeProvider  ===================================================
 
     /// returns the possible types
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 protected:
     ScAddress maCellAddress;
@@ -136,18 +121,14 @@ private:
         const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates);
 protected:
     /// @throw css::uno::RuntimeException
-    OUString SAL_CALL GetNote()
-        throw (css::uno::RuntimeException);
+    OUString SAL_CALL GetNote();
 
     /// @throw css::uno::RuntimeException
-    OUString SAL_CALL GetAllDisplayNote()
-        throw (css::uno::RuntimeException, std::exception);
+    OUString SAL_CALL GetAllDisplayNote();
     /// @throw css::uno::RuntimeException
-    OUString SAL_CALL getShadowAttrs()
-        throw (css::uno::RuntimeException, std::exception);
+    OUString SAL_CALL getShadowAttrs();
     /// @throw css::uno::RuntimeException
-    OUString SAL_CALL getBorderAttrs()
-        throw (css::uno::RuntimeException, std::exception);
+    OUString SAL_CALL getBorderAttrs();
 public:
     const ScAddress& GetCellAddress() const { return maCellAddress; }
 };
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index e1431d2b3e41..bb444c2e984e 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -79,12 +79,10 @@ protected:
 public:
 
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL isShowing(  )
-        throw (css::uno::RuntimeException);
+    bool SAL_CALL isShowing(  );
 
     /// @throws css::uno::RuntimeException
-    virtual bool SAL_CALL isVisible()
-        throw (css::uno::RuntimeException, std::exception);
+    virtual bool SAL_CALL isVisible();
 
     ///=====  SfxListener  =====================================================
 
@@ -93,8 +91,7 @@ public:
     ///=====  XInterface  =====================================================
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
 
     virtual void SAL_CALL acquire() throw () override;
 
@@ -104,95 +101,73 @@ public:
 
     /// Return the XAccessibleContext.
     virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
     ///=====  XAccessibleComponent  ============================================
 
     virtual sal_Bool SAL_CALL containsPoint(
-        const css::awt::Point& rPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& rPoint ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
         SAL_CALL getAccessibleAtPoint(
-        const css::awt::Point& rPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& rPoint ) override;
 
-    virtual css::awt::Rectangle SAL_CALL getBounds(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
 
-    virtual css::awt::Point SAL_CALL getLocation(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
 
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
 
-    virtual css::awt::Size SAL_CALL getSize(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
 
-    virtual void SAL_CALL grabFocus(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) override;
 
-    virtual sal_Int32 SAL_CALL getForeground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBackground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     ///=====  XAccessibleContext  ==============================================
 
     /// Return the number of currently visible children.
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /// Return the specified child or NULL if index is invalid.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-               css::lang::IndexOutOfBoundsException,
-               std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
 
     /// Return a reference to the parent.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent() override;
 
     /// Return this objects index among the parents children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleIndexInParent() override;
 
     /// Return this object's role.
     virtual sal_Int16 SAL_CALL
-        getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRole() override;
 
     /// Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     /// Return the object's current name.
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
     /// Return NULL to indicate that an empty relation set.
     virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     /// Return the set of current states.
     virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     /** Return the parents locale or throw exception if this object has no
         parent yet/anymore.
     */
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-        throw (css::uno::RuntimeException,
-            css::accessibility::IllegalAccessibleComponentStateException, std::exception) override;
+        getLocale() override;
 
     ///=====  XAccessibleEventBroadcaster  =====================================
 
@@ -201,87 +176,73 @@ public:
     */
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) override;
 
     //  Remove an existing event listener.
     virtual void SAL_CALL
         removeAccessibleEventListener(
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) override;
 
     ///=====  XAccessibleEventListener  ========================================
 
     virtual void SAL_CALL
-        disposing( const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing( const css::lang::EventObject& Source ) override;
 
     virtual void SAL_CALL
         notifyEvent(
-        const css::accessibility::AccessibleEventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     ///=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class.
     */
     virtual sal_Bool SAL_CALL
-        supportsService(const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService(const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext and Accessible service.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     ///=====  XTypeProvider  ===================================================
 
      /// returns the possible types
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 protected:
     /// Return this object's description.
     ///
     /// @throws css::uno::RuntimeException
     virtual OUString SAL_CALL
-        createAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception);
+        createAccessibleDescription();
 
     /// Return the object's current name.
     ///
     /// @throws css::uno::RuntimeException
     virtual OUString SAL_CALL
-        createAccessibleName()
-        throw (css::uno::RuntimeException,
-               std::exception);
+        createAccessibleName();
 
     /// Return the object's current bounding box relative to the desktop.
     ///
     /// @throws css::uno::RuntimeException
-    virtual Rectangle GetBoundingBoxOnScreen() const
-        throw (css::uno::RuntimeException, std::exception);
+    virtual Rectangle GetBoundingBoxOnScreen() const;
 
     /// Return the object's current bounding box relative to the parent object.
     ///
     /// @throws css::uno::RuntimeException
-    virtual Rectangle GetBoundingBox() const
-        throw (css::uno::RuntimeException, std::exception);
+    virtual Rectangle GetBoundingBox() const;
 
 public:
     /// Calls all Listener to tell they the change.
@@ -298,8 +259,7 @@ protected:
     bool IsDefunc() const { return rBHelper.bDisposed; }
 
     /// @throws css::lang::DisposedException
-    void IsObjectValid() const
-        throw (css::lang::DisposedException);
+    void IsObjectValid() const;
 
     /// Use this method to set initial Name without notification
     void SetName(const OUString& rName) { msName = rName; }
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index 4794360e1db4..836addd33957 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -53,16 +53,15 @@ public:
     virtual void SAL_CALL       disposing() override;
 
     /** Returns true, if the control is visible. */
-    virtual bool SAL_CALL isVisible() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual bool SAL_CALL isVisible() override;
 
     // XAccessibleComponent ---------------------------------------------------
 
     /** Returns the child at the specified point (cell returns NULL). */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     /** Sets the focus to this control. */
-    virtual void SAL_CALL grabFocus() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL grabFocus() override;
 
     // events -----------------------------------------------------------------
 public:
@@ -84,15 +83,15 @@ public:
     // helpers ----------------------------------------------------------------
 protected:
     /** Returns this object's current bounding box relative to the desktop. */
-    virtual Rectangle GetBoundingBoxOnScreen() const throw( css::uno::RuntimeException, std::exception ) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
     /** Returns this object's current bounding box relative to the parent object. */
-    virtual Rectangle GetBoundingBox() const throw( css::uno::RuntimeException, std::exception ) override;
+    virtual Rectangle GetBoundingBox() const override;
 
     /** Returns whether the object is alive. Must be called with locked mutex. */
     inline bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; }
     /** @throws css::lang::DisposedException if the object is disposed/disposing or any pointer
         is missing. Should be used with locked mutex! */
-    void ensureAlive() const throw( css::lang::DisposedException );
+    void ensureAlive() const;
 
     /** Returns the VCL control. Assumes a living object. */
     ScCsvControl& implGetControl() const;
@@ -101,8 +100,7 @@ protected:
 
         @throws css::uno::RuntimeException
     */
-    static css::uno::Reference< css::accessibility::XAccessible > implGetChildByRole( const css::uno::Reference< css::accessibility::XAccessible >& rxParentObj, sal_uInt16 nRole )
-        throw( css::uno::RuntimeException );
+    static css::uno::Reference< css::accessibility::XAccessible > implGetChildByRole( const css::uno::Reference< css::accessibility::XAccessible >& rxParentObj, sal_uInt16 nRole );
     /** Creates a StateSetHelper and fills it with DEFUNC, OPAQUE, ENABLED, SHOWING and VISIBLE. */
     ::utl::AccessibleStateSetHelper* implCreateStateSet();
 
@@ -129,91 +127,76 @@ public:
 
     // XAccessibleComponent -----------------------------------------------------
 
-    virtual sal_Int32 SAL_CALL getForeground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBackground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleContext -----------------------------------------------------
 
     /** Returns the child count (the ruler does not have children). */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /** Throws an exception (the ruler does not have children). */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override;
 
     /** Returns the relation to the grid control. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
 
     /** Returns the current set of states. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet >  SAL_CALL getAccessibleStateSet()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet >  SAL_CALL getAccessibleStateSet() override;
 
     // XAccessibleText --------------------------------------------------------
 
     /** Return the position of the caret. */
-    virtual sal_Int32 SAL_CALL getCaretPosition() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition() override;
 
     /** Sets the position of the caret. */
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
 
     /** Returns the specified character. */
-    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
 
     /** Returns the attributes of the specified character. */
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
 
     /** Returns the screen coordinates of the specified character. */
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
 
     /** Returns the count of characters. */
-    virtual sal_Int32 SAL_CALL getCharacterCount() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount() override;
 
     /** Returns the character index at the specified coordinate (object's coordinate system). */
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& rPoint )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& rPoint ) override;
 
     /** Returns the selected text (ruler returns empty string). */
-    virtual OUString SAL_CALL getSelectedText() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getSelectedText() override;
 
     /** Returns the start index of the selection (ruler returns -1). */
-    virtual sal_Int32 SAL_CALL getSelectionStart() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getSelectionStart() override;
 
     /** Returns the end index of the selection (ruler returns -1). */
-    virtual sal_Int32 SAL_CALL getSelectionEnd() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd() override;
 
     /** Selects a part of the text (ruler does nothing). */
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     /** Returns the entire text. */
-    virtual OUString SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getText() override;
 
     /** Returns the specified range [Start,End) of the text. */
-    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     /** Returns the specified text portion. */
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
 
     /** Copies the specified text range into the clipboard (ruler does nothing). */
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     // XInterface -------------------------------------------------------------
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
     virtual void SAL_CALL acquire() throw() override;
 
@@ -222,18 +205,15 @@ public:
     // XServiceInfo -----------------------------------------------------------
 
     /** Returns an identifier for the implementation of this object. */
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     // XTypeProvider ----------------------------------------------------------
 
     /** Returns a sequence with all supported interface types. */
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     /** Returns an implementation ID. */
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // events -----------------------------------------------------------------
 public:
@@ -243,22 +223,17 @@ public:
     // helpers ----------------------------------------------------------------
 private:
     /** Returns this object's name. */
-    virtual OUString SAL_CALL createAccessibleName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL createAccessibleName() override;
     /** Returns this object's description. */
-    virtual OUString SAL_CALL createAccessibleDescription()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL createAccessibleDescription() override;
 
     /** @throws css::lang::IndexOutOfBoundsException if the specified character position is invalid (outside 0..len-1). */
-    void ensureValidIndex( sal_Int32 nIndex ) const
-        throw( css::lang::IndexOutOfBoundsException );
+    void ensureValidIndex( sal_Int32 nIndex ) const;
     /** @throws css::lang::IndexOutOfBoundsException if the specified character position is invalid (outside 0..len). */
-    void ensureValidIndexWithEnd( sal_Int32 nIndex ) const
-        throw( css::lang::IndexOutOfBoundsException );
+    void ensureValidIndexWithEnd( sal_Int32 nIndex ) const;
     /** @throws css::lang::IndexOutOfBoundsException if the specified character range [Start,End) is invalid.
         @descr  If Start>End, swaps Start and End before checking. */
-    void ensureValidRange( sal_Int32& rnStartIndex, sal_Int32& rnEndIndex ) const
-        throw( css::lang::IndexOutOfBoundsException );
+    void ensureValidRange( sal_Int32& rnStartIndex, sal_Int32& rnEndIndex ) const;
 
     /** Returns the VCL ruler control. Assumes a living object. */
     ScCsvRuler& implGetRuler() const;
@@ -267,7 +242,7 @@ private:
 
         @throws css::uno::RuntimeException
     */
-    void constructStringBuffer() throw( css::uno::RuntimeException );
+    void constructStringBuffer();
     /** Returns the character count of the text. */
     sal_Int32 implGetTextLength() const;
 
@@ -306,147 +281,113 @@ public:
     // XAccessibleComponent ---------------------------------------------------
 
     /** Returns the cell at the specified point. */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
-    virtual sal_Int32 SAL_CALL getForeground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBackground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleContext -----------------------------------------------------
 
     /** Returns the child count (count of cells in the table). */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /** Returns the specified child cell. */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override;
 
     /** Returns the relation to the ruler control. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
 
     /** Returns the current set of states. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet >  SAL_CALL getAccessibleStateSet()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet >  SAL_CALL getAccessibleStateSet() override;
 
     // XAccessibleTable -------------------------------------------------------
 
     /** Returns the number of rows in the table. */
-    virtual sal_Int32 SAL_CALL getAccessibleRowCount()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
 
     /** Returns the number of columns in the table. */
-    virtual sal_Int32 SAL_CALL getAccessibleColumnCount()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount() override;
 
     /** Returns the description of the specified row in the table. */
-    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override;
 
     /** Returns the description text of the specified column in the table. */
-    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
 
     /** Returns the number of rows occupied at a specified row and column.
         @descr  Returns always 1 (Merged cells not supported). */
-    virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** Returns the number of rows occupied at a specified row and column.
         @descr  Returns always 1 (Merged cells not supported). */
-    virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** Returns the row headers as an AccessibleTable. */
-    virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders() override;
 
     /** Returns the column headers as an AccessibleTable. */
-    virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders() override;
 
     /** Returns the selected rows as a sequence. */
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() override;
 
     /** Returns the selected columns as a sequence. */
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() override;
 
     /** Returns true, if the specified row is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
 
     /** Returns true, if the specified column is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
 
     /** Returns the accessible cell object at the specified position. */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** Returns the caption object of the table. */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption() override;
 
     /** Returns the summary description object of the table. */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary() override;
 
     /** Returns true, if the cell at a specified position is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** Returns the child index of the cell at the specified position. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** Returns the row index of the specified child. */
-    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
 
     /** Returns the column index of the specified child. */
-    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
 
     // XAccessibleSelection ---------------------------------------------------
 
     /** Selects the specified child (selects the entire column or the entire table). */
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     /** Returns true, if the specified child is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
 
     /** Deselects all cells. */
-    virtual void SAL_CALL clearAccessibleSelection()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL clearAccessibleSelection() override;
 
     /** Selects all cells. */
-    virtual void SAL_CALL selectAllAccessibleChildren()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren() override;
 
     /** Returns the count of selected children. */
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
 
     /** Returns the child with the specified index in all selected children. */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     /** Deselects the child with the specified index in all selected children. */
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     // XInterface -------------------------------------------------------------
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
     virtual void SAL_CALL acquire() throw() override;
 
@@ -455,18 +396,15 @@ public:
     // XServiceInfo -----------------------------------------------------------
 
     /** Returns an identifier for the implementation of this object. */
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     // XTypeProvider ----------------------------------------------------------
 
     /** Returns a sequence with all supported interface types. */
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     /** Returns an implementation ID. */
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // events -----------------------------------------------------------------
 public:
@@ -482,18 +420,14 @@ public:
     // helpers ----------------------------------------------------------------
 private:
     /** Returns this object's name. */
-    virtual OUString SAL_CALL createAccessibleName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL createAccessibleName() override;
     /** Returns this object's description. */
-    virtual OUString SAL_CALL createAccessibleDescription()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL createAccessibleDescription() override;
 
     /** @throws css::lang::IndexOutOfBoundsException if nIndex is not a valid child index. */
-    void ensureValidIndex( sal_Int32 nIndex ) const
-        throw( css::lang::IndexOutOfBoundsException );
+    void ensureValidIndex( sal_Int32 nIndex ) const;
     /** @Throws css::lang::IndexOutOfBoundsException if the specified position is invalid. */
-    void ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const
-        throw( css::lang::IndexOutOfBoundsException );
+    void ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const;
 
     /** Returns the VCL grid control. Assumes a living object. */
     ScCsvGrid& implGetGrid() const;
@@ -554,35 +488,28 @@ public:
     // XAccessibleComponent ---------------------------------------------------
 
     /** Sets the focus to the column of this cell. */
-    virtual void SAL_CALL grabFocus() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL grabFocus() override;
 
-    virtual sal_Int32 SAL_CALL getForeground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBackground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleContext -----------------------------------------------------
 
     /** Returns the child count. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /** Returns the specified child. */
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex )
-        throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override;
 
     /** Returns the index of this cell in the table. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
     /** Returns the relation to the ruler control. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
 
     /** Returns the current set of states. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet >  SAL_CALL getAccessibleStateSet()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet >  SAL_CALL getAccessibleStateSet() override;
 
     // XInterface -------------------------------------------------------------
 
@@ -595,23 +522,20 @@ public:
     // XServiceInfo -----------------------------------------------------------
 
     /** Returns an identifier for the implementation of this object. */
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     // helpers ----------------------------------------------------------------
 protected:
     /** Returns this object's current bounding box relative to the desktop. */
-    virtual Rectangle GetBoundingBoxOnScreen() const throw( css::uno::RuntimeException, std::exception ) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
     /** Returns this object's current bounding box relative to the parent object. */
-    virtual Rectangle GetBoundingBox() const throw( css::uno::RuntimeException, std::exception ) override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     /** Returns this object's name. */
-    virtual OUString SAL_CALL createAccessibleName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL createAccessibleName() override;
     /** Returns this object's description. */
-    virtual OUString SAL_CALL createAccessibleDescription()
-        throw( css::uno::RuntimeException ) override;
+    virtual OUString SAL_CALL createAccessibleDescription() override;
 
     /** Returns the VCL grid control. Assumes a living object. */
     ScCsvGrid& implGetGrid() const;
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx
index 9a2807d54336..6a01e699a197 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -83,8 +83,7 @@ public:
     ///=====  XInterface  =====================================================
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
 
     virtual void SAL_CALL acquire() throw () override;
 
@@ -94,106 +93,81 @@ public:
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
         SAL_CALL getAccessibleAtPoint(
-        const css::awt::Point& rPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& rPoint ) override;
 
-    virtual void SAL_CALL grabFocus(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) override;
 
     ///=====  XAccessibleContext  ==============================================
 
     /// Return the number of currently visible children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     /// Return the specified child or NULL if index is invalid.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-                css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
 
     /// Return the set of current states.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
-    virtual css::uno::Any SAL_CALL getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL getExtendedAttributes() override ;
     ///=====  XAccessibleSelection  ===========================================
 
     virtual void SAL_CALL
-        selectAccessibleChild( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception) override;
+        selectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     virtual sal_Bool SAL_CALL
-        isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception) override;
+        isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
 
     virtual void SAL_CALL
-        clearAccessibleSelection(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        clearAccessibleSelection(  ) override;
 
     virtual void SAL_CALL
-        selectAllAccessibleChildren(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        selectAllAccessibleChildren(  ) override;
 
     virtual sal_Int32 SAL_CALL
-        getSelectedAccessibleChildCount(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleChildCount(  ) override;
 
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     virtual void SAL_CALL
-        deselectAccessibleChild( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception) override;
+        deselectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     ///=====  XSelectionListener  =============================================
 
-    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override;
 
-    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;
 
     ///=====  XServiceInfo  ===================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Returns a list of all supported services.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     ///=====  XTypeProvider  ===================================================
 
     /// returns the possible types
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
     ///=====  IAccessibleViewForwarder  ========================================
 
@@ -239,21 +213,17 @@ public:
 protected:
     /// Return this object's description.
     virtual OUString SAL_CALL
-        createAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createAccessibleDescription() override;
 
     /// Return the object's current name.
     virtual OUString SAL_CALL
-        createAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createAccessibleName() override;
 
     /// Return the object's current bounding box relative to the desktop.
-    virtual Rectangle GetBoundingBoxOnScreen() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
 
     /// Return the object's current bounding box relative to the parent object.
-    virtual Rectangle GetBoundingBox() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     ScTabViewShell* mpViewShell;
@@ -289,14 +259,11 @@ public:
     ScAddress   GetCurCellAddress() const;
     //=====  XAccessibleGetAccFromXShape  ============================================
     css::uno::Sequence< css::uno::Any >
-        SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) override;
 
-     virtual sal_Int32 SAL_CALL getForeground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+     virtual sal_Int32 SAL_CALL getForeground(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBackground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 };
 
 #endif
diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
index 3129a2ce34c3..450c51c1ed0e 100644
--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
@@ -58,77 +58,62 @@ public:
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
         SAL_CALL getAccessibleAtPoint(
-        const css::awt::Point& rPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& rPoint ) override;
 
-    virtual void SAL_CALL grabFocus(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) override;
 
     ///=====  XAccessibleContext  ==============================================
 
     /// Return the number of currently visible children.
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /// Return the specified child or NULL if index is invalid.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-               css::lang::IndexOutOfBoundsException,
-               std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
 
     /// Return the set of current states.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
-    virtual OUString SAL_CALL getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName() override;
     ///=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Returns a list of all supported services.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     ///=====  XTypeProvider  ===================================================
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
     ///=====  internal  ========================================================
 
 protected:
     /// Return this object's description.
     virtual OUString SAL_CALL
-        createAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createAccessibleDescription() override;
 
     /// Return the object's current name.
     virtual OUString SAL_CALL
-        createAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createAccessibleName() override;
 
 public: // needed in ScShapeChildren
     /// Return the object's current bounding box relative to the desktop.
-    virtual Rectangle GetBoundingBoxOnScreen() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
 
 protected:
     /// Return the object's current bounding box relative to the parent object.
-    virtual Rectangle GetBoundingBox() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     ScPreviewShell* mpViewShell;
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index 1b35218fcfd5..962a36af1daa 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -72,8 +72,7 @@ public:
 ///=====  XInterface  =====================================================
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
 
     virtual void SAL_CALL acquire() throw () override;
 
@@ -82,17 +81,14 @@ public:
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
         SAL_CALL getAccessibleAtPoint(
-        const css::awt::Point& rPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& rPoint ) override;
 
 protected:
     /// Return the object's current bounding box relative to the desktop.
-    virtual Rectangle GetBoundingBoxOnScreen() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
 
     /// Return the object's current bounding box relative to the parent object.
-    virtual Rectangle GetBoundingBox() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBox() const override;
 
 public:
     ///=====  XAccessibleContext  ==============================================
@@ -100,57 +96,40 @@ public:
     /// Return the number of currently visible children.
     /// override to calculate this on demand
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-                    throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     /// Return the specified child or NULL if index is invalid.
     /// override to calculate this on demand
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-                css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
 
     /// Return the set of current states.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     //=====  XAccessibleSelection  ============================================
 
         virtual void SAL_CALL selectAccessibleChild(
-            sal_Int32 nChildIndex )
-            throw ( css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception ) override;
+            sal_Int32 nChildIndex ) override;
         virtual sal_Bool SAL_CALL isAccessibleChildSelected(
-            sal_Int32 nChildIndex )
-            throw ( css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL clearAccessibleSelection(  )
-            throw ( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL selectAllAccessibleChildren(  )
-            throw ( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  )
-            throw ( css::uno::RuntimeException, std::exception ) override;
+            sal_Int32 nChildIndex ) override;
+        virtual void SAL_CALL clearAccessibleSelection(  ) override;
+        virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
-            sal_Int32 nSelectedChildIndex )
-            throw ( css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nSelectedChildIndex ) override;
         virtual void SAL_CALL deselectAccessibleChild(
-            sal_Int32 nSelectedChildIndex )
-            throw ( css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nSelectedChildIndex ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
 protected:
     /// Return this object's description.
     virtual OUString SAL_CALL
-        createAccessibleDescription()
-        throw (css::uno::RuntimeException) override;
+        createAccessibleDescription() override;
 
     /// Return the object's current name.
     virtual OUString SAL_CALL
-        createAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createAccessibleName() override;
 
 public:
     ///=====  XAccessibleEventBroadcaster  =====================================
@@ -160,30 +139,26 @@ public:
     */
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) override;
 
     //  Remove an existing event listener.
     virtual void SAL_CALL
         removeAccessibleEventListener(
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) override;
 
     ///=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     ///=====  XTypeProvider  ===================================================
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 private:
     std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper;
@@ -200,11 +175,9 @@ private:
     ScAddress m_curCellAddress;
 
     ///=====  XAccessibleComponent  ============================================
-    virtual sal_Int32 SAL_CALL getForeground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBackground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     sal_Int32 GetFgBgColor(  const rtl::OUString &strPropColor) ;
 };
diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx
index 6a8645f735ea..a5ad2cec6aa2 100644
--- a/sc/source/ui/inc/AccessiblePageHeader.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeader.hxx
@@ -51,34 +51,29 @@ public:
     //=====  XAccessibleComponent  ============================================
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleAtPoint( const css::awt::Point& aPoint )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   grabFocus() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL   grabFocus() override;
 
     //=====  XAccessibleContext  ==============================================
 
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleChild( sal_Int32 i )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-                            getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleStateSet() override;
 
     //=====  XServiceInfo  ====================================================
 
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
-    virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL createAccessibleDescription() override;
+    virtual OUString SAL_CALL createAccessibleName() override;
 
-    virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override;
-    virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     ScPreviewShell*     mpViewShell;
diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
index 25067fbf7431..c66d84a80dfe 100644
--- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
@@ -57,59 +57,51 @@ public:
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
         SAL_CALL getAccessibleAtPoint(
-        const css::awt::Point& rPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& rPoint ) override;
 
     ///=====  XAccessibleContext  ==============================================
 
     /// Return the number of currently visible children.
     /// override to calculate this on demand
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-                    throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     /// Return the specified child or NULL if index is invalid.
     /// override to calculate this on demand
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-                css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
 
     /// Return the set of current states.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     ///=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext and Accessible service.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     ///=====  XTypeProvider  ===================================================
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 protected:
-    virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL createAccessibleDescription() override;
+    virtual OUString SAL_CALL createAccessibleName() override;
 
-    virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override;
-    virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     EditTextObject* mpEditObj;
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index 061330b3e5c2..ba9212ead0b5 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -53,40 +53,34 @@ public:
     //=====  XAccessibleComponent  ============================================
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleAtPoint( const css::awt::Point& aPoint )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   grabFocus() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL   grabFocus() override;
 
     //=====  XAccessibleContext  ==============================================
 
     // override to calculate this on demand
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleChild( sal_Int32 i )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                    css::uno::RuntimeException, std::exception) override;
+                            getAccessibleChild( sal_Int32 i ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-                            getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleStateSet() override;
 
     //=====  XServiceInfo  ====================================================
 
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     ///=====  XTypeProvider  ===================================================
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 protected:
-    virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override;
-    virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     ScPreviewShell* mpViewShell;
diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
index 142b58c6e116..381b45032711 100644
--- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
@@ -62,8 +62,7 @@ public:
     ///=====  XInterface  =====================================================
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
 
     virtual void SAL_CALL acquire() throw () override;
 
@@ -71,55 +70,47 @@ public:
 
     //=====  XAccessibleValue  ================================================
 
-    virtual css::uno::Any SAL_CALL getCurrentValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMaximumValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getMinimumValue() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue() override;
+    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
+    virtual css::uno::Any SAL_CALL getMaximumValue() override;
+    virtual css::uno::Any SAL_CALL getMinimumValue() override;
 
     //=====  XAccessibleComponent  ============================================
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleAtPoint( const css::awt::Point& aPoint )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   grabFocus() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL   grabFocus() override;
 
     //=====  XAccessibleContext  ==============================================
 
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleChild( sal_Int32 i )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-                            getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleStateSet() override;
 
     //=====  XServiceInfo  ====================================================
 
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     ///=====  XTypeProvider  ===================================================
 
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 protected:
-    virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL createAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL createAccessibleDescription() override;
+    virtual OUString SAL_CALL createAccessibleName() override;
 
-    virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override;
-    virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     ScPreviewShell*     mpViewShell;
diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx
index 36bc0d716549..adb5b5908a15 100644
--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx
@@ -54,8 +54,7 @@ public:
     ///=====  XInterface  =====================================================
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
 
     virtual void SAL_CALL acquire() throw () override;
 
@@ -63,116 +62,64 @@ public:
 
     //=====  XAccessibleTable  ================================================
 
-    virtual sal_Int32 SAL_CALL getAccessibleRowCount()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumnCount()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount() override;
+    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override;
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-                            getAccessibleRowHeaders() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleRowHeaders() override;
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-                            getAccessibleColumnHeaders() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows()
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns()
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                            getAccessibleColumnHeaders() override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() override;
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                            getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleCaption() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleCaption() override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleSummary() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
+                            getAccessibleSummary() override;
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
 
     //=====  XAccessibleComponent  ============================================
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleAtPoint( const css::awt::Point& aPoint )
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual void SAL_CALL   grabFocus() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL   grabFocus() override;
 
     //=====  XAccessibleContext  ==============================================
 
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                            getAccessibleChild( sal_Int32 i )
-                                throw (css::lang::IndexOutOfBoundsException,
-                                       css::uno::RuntimeException,
-                                       std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-                            getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override;
+                            getAccessibleStateSet() override;
 
     //=====  XServiceInfo  ====================================================
 
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //=====  XTypeProvider  ===================================================
 
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 protected:
-    virtual OUString SAL_CALL createAccessibleDescription() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL createAccessibleName()
-                                throw (css::uno::RuntimeException,
-                                       std::exception) override;
+    virtual OUString SAL_CALL createAccessibleDescription() override;
+    virtual OUString SAL_CALL createAccessibleName() override;
 
-    virtual Rectangle GetBoundingBoxOnScreen() const throw(css::uno::RuntimeException, std::exception) override;
-    virtual Rectangle GetBoundingBox() const throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
+    virtual Rectangle GetBoundingBox() const override;
 
 private:
     ScPreviewShell*     mpViewShell;
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 210d7dfd43a7..5cc6a6baf9af 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -102,130 +102,98 @@ private:
 
     /// Returns the row headers as an AccessibleTable.
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-                getAccessibleRowHeaders(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getAccessibleRowHeaders(  ) override;
 
     /// Returns the column headers as an AccessibleTable.
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-                getAccessibleColumnHeaders(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getAccessibleColumnHeaders(  ) override;
 
     /// Returns the selected rows in a table.
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-                getSelectedAccessibleRows(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getSelectedAccessibleRows(  ) override;
 
     /// Returns the selected columns in a table.
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-                getSelectedAccessibleColumns(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getSelectedAccessibleColumns(  ) override;
 
     /// Returns a boolean value indicating whether the specified row is selected.
     virtual sal_Bool SAL_CALL
-                isAccessibleRowSelected( sal_Int32 nRow )
-                    throw (css::uno::RuntimeException,
-                    css::lang::IndexOutOfBoundsException, std::exception) override;
+                isAccessibleRowSelected( sal_Int32 nRow ) override;
 
     /// Returns a boolean value indicating whether the specified column is selected.
     virtual sal_Bool SAL_CALL
-                isAccessibleColumnSelected( sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                    css::lang::IndexOutOfBoundsException, std::exception) override;
+                isAccessibleColumnSelected( sal_Int32 nColumn ) override;
 
     /// Returns the Accessible at a specified row and column in the table.
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                            css::lang::IndexOutOfBoundsException, std::exception) override;
+                getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     rtl::Reference<ScAccessibleCell> GetAccessibleCellAt(sal_Int32 nRow, sal_Int32 nColumn);
 
     /// Returns a boolean value indicating whether the accessible at a specified row and column is selected.
     virtual sal_Bool SAL_CALL
-                isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                    css::lang::IndexOutOfBoundsException, std::exception) override;
+                isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     ///=====  XAccessibleComponent  ============================================
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
         SAL_CALL getAccessibleAtPoint(
-        const css::awt::Point& rPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& rPoint ) override;
 
-    virtual void SAL_CALL grabFocus(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) override;
 
-    virtual sal_Int32 SAL_CALL getForeground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBackground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     ///=====  XAccessibleContext  ==============================================
 
     /// Return NULL to indicate that an empty relation set.
     virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     /// Return the set of current states.
     virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     ///=====  XAccessibleSelection  ===========================================
 
     virtual void SAL_CALL
-        selectAccessibleChild( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+        selectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     virtual void SAL_CALL
-        clearAccessibleSelection(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        clearAccessibleSelection(  ) override;
 
     virtual void SAL_CALL
-        selectAllAccessibleChildren(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        selectAllAccessibleChildren(  ) override;
 
     virtual sal_Int32 SAL_CALL
-        getSelectedAccessibleChildCount(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleChildCount(  ) override;
 
     virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL
-        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     virtual void SAL_CALL
-        deselectAccessibleChild( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+        deselectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     ///=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Returns a list of all supported services.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     ///=====  XTypeProvider  ===================================================
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
     ///=====  XAccessibleEventBroadcaster  =====================================
 
@@ -234,30 +202,19 @@ private:
     */
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) override;
     //=====  XAccessibleTableSelection  ============================================
-    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException,
-               std::exception) override;
+    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override;
+    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override;
+    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override;
+    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override;
 
 protected:
     /// Return the object's current bounding box relative to the desktop.
-    virtual Rectangle GetBoundingBoxOnScreen() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBoxOnScreen() const override;
 
     /// Return the object's current bounding box relative to the parent object.
-    virtual Rectangle GetBoundingBox() const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual Rectangle GetBoundingBox() const override;
 private:
     ScTabViewShell* mpViewShell;
     ScRangeList*    mpMarkedRanges;
diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx
index 362bb032031e..63f1bb6b98a5 100644
--- a/sc/source/ui/inc/AccessibleTableBase.hxx
+++ b/sc/source/ui/inc/AccessibleTableBase.hxx
@@ -58,8 +58,7 @@ public:
     ///=====  XInterface  =====================================================
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
 
     virtual void SAL_CALL acquire() throw () override;
 
@@ -69,239 +68,161 @@ public:
 
     /// Returns the number of rows in the table.
     virtual sal_Int32 SAL_CALL
-                getAccessibleRowCount(  )
-                    throw (css::uno::RuntimeException,
-                           std::exception) override;
+                getAccessibleRowCount(  ) override;
 
     /// Returns the number of columns in the table.
     virtual sal_Int32 SAL_CALL
-                getAccessibleColumnCount(  )
-                    throw (css::uno::RuntimeException,
-                           std::exception) override;
+                getAccessibleColumnCount(  ) override;
 
     /// Returns the description of the specified row in the table.
     virtual OUString SAL_CALL
-                getAccessibleRowDescription( sal_Int32 nRow )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                getAccessibleRowDescription( sal_Int32 nRow ) override;
 
     /// Returns the description text of the specified column in the table.
     virtual OUString SAL_CALL
-                getAccessibleColumnDescription( sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                getAccessibleColumnDescription( sal_Int32 nColumn ) override;
 
     /** Returns the number of rows occupied by the Accessible at a specified row and column in the table.
     Returns 1 if it is only a cell and the number of rows the cell is merged if the cell is a merged cell.
     */
     virtual sal_Int32 SAL_CALL
-                getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /** Returns the number of columns occupied by the Accessible at a specified row and column in the table.
     Returns 1 if it is only a cell and the number of columns the cell is merged if the cell is a merged cell.
     */
     virtual sal_Int32 SAL_CALL
-                getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /// Returns the row headers as an AccessibleTable.
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-                getAccessibleRowHeaders(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getAccessibleRowHeaders(  ) override;
 
     /// Returns the column headers as an AccessibleTable.
     virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL
-                getAccessibleColumnHeaders(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getAccessibleColumnHeaders(  ) override;
 
     /// Returns the selected rows in a table.
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-                getSelectedAccessibleRows(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getSelectedAccessibleRows(  ) override;
 
     /// Returns the selected columns in a table.
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-                getSelectedAccessibleColumns(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getSelectedAccessibleColumns(  ) override;
 
     /// Returns a boolean value indicating whether the specified row is selected.
     virtual sal_Bool SAL_CALL
-                isAccessibleRowSelected( sal_Int32 nRow )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                isAccessibleRowSelected( sal_Int32 nRow ) override;
 
     /// Returns a boolean value indicating whether the specified column is selected.
     virtual sal_Bool SAL_CALL
-                isAccessibleColumnSelected( sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                isAccessibleColumnSelected( sal_Int32 nColumn ) override;
 
     /// Returns the Accessible at a specified row and column in the table.
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /// Returns the caption for the table.
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                getAccessibleCaption(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getAccessibleCaption(  ) override;
 
     /// Returns the summary description of the table.
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                getAccessibleSummary(  )
-                    throw (css::uno::RuntimeException, std::exception) override;
+                getAccessibleSummary(  ) override;
 
     /// Returns a boolean value indicating whether the accessible at a specified row and column is selected.
     virtual sal_Bool SAL_CALL
-                isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     ///=====  XAccessibleExtendedTable  ========================================
 
     /// Returns the index of the cell on the given position.
     virtual sal_Int32 SAL_CALL
-                getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
 
     /// Returns the row number of an index in the table.
     virtual sal_Int32 SAL_CALL
-                getAccessibleRow( sal_Int32 nChildIndex )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                getAccessibleRow( sal_Int32 nChildIndex ) override;
 
     /// Returns the column number of an index in the table.
     virtual sal_Int32 SAL_CALL
-                getAccessibleColumn( sal_Int32 nChildIndex )
-                    throw (css::uno::RuntimeException,
-                           css::lang::IndexOutOfBoundsException,
-                           std::exception) override;
+                getAccessibleColumn( sal_Int32 nChildIndex ) override;
 
     //=====  XAccessibleContext  ==============================================
 
     /// Return the number of currently visible children.
     /// override to calculate this on demand
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-                    throw (css::uno::RuntimeException,
-                           std::exception) override;
+        getAccessibleChildCount() override;
 
     /// Return the specified child or NULL if index is invalid.
     /// override to calculate this on demand
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild(sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-               css::lang::IndexOutOfBoundsException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException,
-               std::exception) override;
+        getAccessibleChild(sal_Int32 nIndex) override;
+    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override;
+    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override;
+    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override;
+    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override;
 
 protected:
     /// Return this object's description.
     virtual OUString SAL_CALL
-        createAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createAccessibleDescription() override;
 
     /// Return the object's current name.
     virtual OUString SAL_CALL
-        createAccessibleName()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        createAccessibleName() override;
 
 public:
     /// Return NULL to indicate that an empty relation set.
     virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     /// Return the set of current states.
     // perhaps sometimes to be implemented
     virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     ///=====  XAccessibleSelection  ===========================================
 
     virtual void SAL_CALL
-        selectAccessibleChild( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+        selectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     virtual sal_Bool SAL_CALL
-        isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+        isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
 
     virtual void SAL_CALL
-        clearAccessibleSelection(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        clearAccessibleSelection(  ) override;
 
     virtual void SAL_CALL
-        selectAllAccessibleChildren(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        selectAllAccessibleChildren(  ) override;
 
     virtual sal_Int32 SAL_CALL
-        getSelectedAccessibleChildCount(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleChildCount(  ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     virtual void SAL_CALL
-        deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+        deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     ///=====  XServiceInfo  ===================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     ///=====  XTypeProvider  ===================================================
 
     /// returns the possible types
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     /** Returns a implementation id.
     */
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
 protected:
     /// contains the range of the table, because it could be a subrange of the complete table
diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
index 912bf2774003..cdba0dbb00bb 100644
--- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx
+++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
@@ -42,26 +42,21 @@ public:
 protected:
     // ____ XSelectionChangeListener ____
     virtual void SAL_CALL selectionChanged(
-        const css::lang::EventObject& aEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent ) override;
 
     // ____ XEventListener (base of XSelectionChangeListener) ____
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source ) override;
 
     // ____ WeakComponentImplHelperBase ____
     // is called when dispose() is called at this component
     virtual void SAL_CALL disposing() override;
 
     // ____ 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(
-        const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     ScTabViewShell * m_pViewShell;
diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx
index 3e42d6f12283..6c014da85713 100644
--- a/sc/source/ui/inc/DrawModelBroadcaster.hxx
+++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx
@@ -39,10 +39,8 @@ public:
     ScDrawModelBroadcaster( SdrModel *pDrawModel );
     virtual ~ScDrawModelBroadcaster() override;
 
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) override;
 
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 };
diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx
index ab7ab4e9f229..9a1a95c4e7b9 100644
--- a/sc/source/ui/inc/condformatuno.hxx
+++ b/sc/source/ui/inc/condformatuno.hxx
@@ -59,20 +59,13 @@ public:
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
 
     // XConditionalFormats
-    virtual sal_Int32 SAL_CALL createByRange(const uno::Reference<sheet::XSheetCellRanges>& xRanges)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL createByRange(const uno::Reference<sheet::XSheetCellRanges>& xRanges) override;
 
-    virtual void SAL_CALL removeByID( const sal_Int32 nID )
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual void SAL_CALL removeByID( const sal_Int32 nID ) override;
 
-    virtual uno::Sequence< uno::Reference< sheet::XConditionalFormat > > SAL_CALL getConditionalFormats()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual uno::Sequence< uno::Reference< sheet::XConditionalFormat > > SAL_CALL getConditionalFormats() override;
 
-    virtual sal_Int32 SAL_CALL getLength()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual sal_Int32 SAL_CALL getLength() override;
 
     ScConditionalFormatList* getCoreObject();
 
@@ -92,67 +85,35 @@ public:
     ScDocShell* getDocShell();
 
     // XConditionalFormat
-    virtual void SAL_CALL createEntry(const sal_Int32 nType, const sal_Int32 nPos)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL createEntry(const sal_Int32 nType, const sal_Int32 nPos) override;
 
-    virtual void SAL_CALL removeByIndex(const sal_Int32 nIndex)
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual void SAL_CALL removeByIndex(const sal_Int32 nIndex) override;
 
     // XIndexAccess
 
-    virtual uno::Type SAL_CALL getElementType()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual 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;
 
-    virtual sal_Int32 SAL_CALL getCount()
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
 
-    virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex)
-                                throw(css::uno::RuntimeException,
-                                      std::exception) override;
+    virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     ScConditionalFormat* getCoreObject();
 
@@ -175,45 +136,23 @@ public:
     ScCondFormatEntry* getCoreObject();
 
     // XConditionEntry
-    virtual sal_Int32 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getType() override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 private:
     ScDocShell* mpDocShell;
@@ -231,48 +170,26 @@ public:
     virtual ~ScColorScaleFormatObj() override;
 
     // XConditionEntry
-    virtual sal_Int32 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getType() override;
 
 
     ScColorScaleFormat* getCoreObject();
 
                             // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 private:
     rtl::Reference<ScCondFormatObj> mxParent;
@@ -287,23 +204,17 @@ public:
 
     virtual ~ScColorScaleEntryObj() override;
 
-    virtual css::util::Color SAL_CALL getColor()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Color SAL_CALL getColor() override;
 
-    virtual void SAL_CALL setColor(css::util::Color aColor)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setColor(css::util::Color aColor) override;
 
-    virtual sal_Int32 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getType() override;
 
-    virtual void SAL_CALL setType(sal_Int32 nType)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setType(sal_Int32 nType) override;
 
-    virtual OUString SAL_CALL getFormula()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getFormula() override;
 
-    virtual void SAL_CALL setFormula(const OUString& rString)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFormula(const OUString& rString) override;
 
 private:
     ScColorScaleEntry* getCoreObject();
@@ -323,45 +234,23 @@ public:
     ScDataBarFormat* getCoreObject();
 
     // XConditionEntry
-    virtual sal_Int32 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getType() override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 private:
     rtl::Reference<ScCondFormatObj> mxParent;
@@ -376,17 +265,13 @@ public:
 
     virtual ~ScDataBarEntryObj() override;
 
-    virtual sal_Int32 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getType() override;
 
-    virtual void SAL_CALL setType(sal_Int32 nType)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setType(sal_Int32 nType) override;
 
-    virtual OUString SAL_CALL getFormula()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getFormula() override;
 
-    virtual void SAL_CALL setFormula(const OUString& rString)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFormula(const OUString& rString) override;
 
 private:
     ScColorScaleEntry* getCoreObject();
@@ -406,45 +291,23 @@ public:
     ScIconSetFormat* getCoreObject();
 
     // XConditionEntry
-    virtual sal_Int32 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getType() override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 private:
     rtl::Reference<ScCondFormatObj> mxParent;
@@ -459,17 +322,13 @@ public:
 
     virtual ~ScIconSetEntryObj() override;
 
-    virtual sal_Int32 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getType() override;
 
-    virtual void SAL_CALL setType(sal_Int32 nType)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setType(sal_Int32 nType) override;
 
-    virtual OUString SAL_CALL getFormula()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getFormula() override;
 
-    virtual void SAL_CALL setFormula(const OUString& rString)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFormula(const OUString& rString) override;
 
 private:
     ScColorScaleEntry* getCoreObject();
@@ -490,45 +349,23 @@ public:
     ScCondDateFormatEntry* getCoreObject();
 
     // XConditionEntry
-    virtual sal_Int32 SAL_CALL getType()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getType() override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
-                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
-                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 private:
     rtl::Reference<ScCondFormatObj> mxParent;
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index 24e14a732b5d..300e99425002 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -96,7 +96,7 @@ public:
     ScDragSrc           GetDragSourceFlags() const      { return nDragSourceFlags; }
 
     static ScDrawTransferObj* GetOwnClipboard( vcl::Window* pUIWin );
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
     static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
     const ScRangeListVector& GetProtectedChartRangesVector() const { return m_aProtectedChartRangesVector; }
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index 593a5e0ee40b..30d5ea8b9412 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -108,7 +108,7 @@ public:
     static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( vcl::Window* pUIWin );
 
     static SfxObjectShell*  SetDrawClipDoc( bool bAnyOle );     // update ScGlobal::xDrawClipDocShellRef
-    virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) override;
     static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 };
 
diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx
index 95740e46731f..4052d5edde8e 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -54,10 +54,6 @@ ScPanelFactory::~ScPanelFactory()
 Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
     const ::rtl::OUString& rsResourceURL,
     const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-    throw(
-        container::NoSuchElementException,
-        lang::IllegalArgumentException,
-        RuntimeException, std::exception)
 {
     Reference<ui::XUIElement> xElement;
 
@@ -124,19 +120,16 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
 }
 
 OUString ScPanelFactory::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("org.apache.openoffice.comp.sc.sidebar.ScPanelFactory");
 }
 
 sal_Bool ScPanelFactory::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> ScPanelFactory::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<OUString> aServiceNames { "com.sun.star.ui.UIElementFactory" };
     return aServiceNames;
diff --git a/sc/source/ui/sidebar/ScPanelFactory.hxx b/sc/source/ui/sidebar/ScPanelFactory.hxx
index 476dd6da26b8..1e08c43281e9 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.hxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.hxx
@@ -47,20 +47,13 @@ public:
     // XUIElementFactory
     css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
         const ::rtl::OUString& rsResourceURL,
-        const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-        throw(
-            css::container::NoSuchElementException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception ) override;
+        const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 } } // end of namespace sc::sidebar
diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
index f4686de887e9..e90b32192256 100644
--- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
+++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
@@ -44,7 +44,6 @@ ScChartRangeSelectionListener::~ScChartRangeSelectionListener()
 
 // ____ XModifyListener ____
 void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     Reference< chart2::data::XRangeHighlighter > xRangeHighlighter( aEvent.Source, uno::UNO_QUERY );
     if( xRangeHighlighter.is())
@@ -62,7 +61,6 @@ void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::Event
 
 // ____ XEventListener ____
 void SAL_CALL ScChartRangeSelectionListener::disposing( const lang::EventObject& /*Source*/ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index ea22d9b824d5..46087c12903e 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -93,7 +93,6 @@ bool ScAddressConversionObj::ParseUIString( const OUString& rUIString, ::formula
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -130,9 +129,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp
 }
 
 void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     if ( !pDocShell )
         throw uno::RuntimeException();
@@ -215,8 +211,6 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropert
 }
 
 uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     if ( !pDocShell )
         throw uno::RuntimeException();
@@ -285,19 +279,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAddressConversionObj )
 
 // lang::XServiceInfo
 
-OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAddressConversionObj::getImplementationName()
 {
     return OUString("ScAddressConversionObj" );
 }
 
 sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScAddressConversionObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     if (bIsRange)
         return {SC_SERVICENAME_RANGEADDRESS};
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index d6efeac255c0..6e42bc44e8c5 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -201,9 +201,6 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const OUString& aName)
 // container::XNameContainer
 
 void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::Any& aElement )
-                            throw (lang::IllegalArgumentException, container::ElementExistException,
-                                   lang::WrappedTargetException, uno::RuntimeException,
-                                   std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -255,8 +252,6 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::
 }
 
 void SAL_CALL ScAutoFormatsObj::replaceByName( const OUString& aName, const uno::Any& aElement )
-                            throw(lang::IllegalArgumentException, container::NoSuchElementException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //! zusammenfassen?
@@ -265,8 +260,6 @@ void SAL_CALL ScAutoFormatsObj::replaceByName( const OUString& aName, const uno:
 }
 
 void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName )
-                                throw(container::NoSuchElementException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat();
@@ -288,7 +281,6 @@ void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName )
 // container::XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration"));
@@ -296,15 +288,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumera
 
 // container::XIndexAccess
 
-sal_Int32 SAL_CALL ScAutoFormatsObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScAutoFormatsObj::getCount()
 {
     SolarMutexGuard aGuard;
     return ScGlobal::GetOrCreateAutoFormat()->size();
 }
 
 uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< container::XNamed >  xFormat(GetObjectByIndex_Impl((sal_uInt16)nIndex));
@@ -313,13 +303,13 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex )
     return uno::makeAny(xFormat);
 }
 
-uno::Type SAL_CALL ScAutoFormatsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScAutoFormatsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<container::XNamed>::get();    // muss zu getByIndex passen
 }
 
-sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScAutoFormatsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -328,8 +318,6 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException, s
 // container::XNameAccess
 
 uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< container::XNamed >  xFormat(GetObjectByName_Impl(aName));
@@ -339,7 +327,6 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName )
 }
 
 uno::Sequence<OUString> SAL_CALL ScAutoFormatsObj::getElementNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat();
@@ -354,7 +341,6 @@ uno::Sequence<OUString> SAL_CALL ScAutoFormatsObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nDummy;
@@ -392,7 +378,7 @@ void ScAutoFormatObj::InitFormat( sal_uInt16 nNewIndex )
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScAutoFormatObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -435,7 +421,6 @@ ScAutoFormatFieldObj* ScAutoFormatObj::GetObjectByIndex_Impl(sal_uInt16 nIndex)
 // container::XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration"));
@@ -443,7 +428,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumerat
 
 // container::XIndexAccess
 
-sal_Int32 SAL_CALL ScAutoFormatObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScAutoFormatObj::getCount()
 {
     SolarMutexGuard aGuard;
     if (IsInserted())
@@ -453,8 +438,6 @@ sal_Int32 SAL_CALL ScAutoFormatObj::getCount() throw(uno::RuntimeException, std:
 }
 
 uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -466,13 +449,13 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex )
     return uno::Any();
 }
 
-uno::Type SAL_CALL ScAutoFormatObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScAutoFormatObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<beans::XPropertySet>::get();  // muss zu getByIndex passen
 }
 
-sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScAutoFormatObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -480,7 +463,7 @@ sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException, st
 
 // container::XNamed
 
-OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAutoFormatObj::getName()
 {
     SolarMutexGuard aGuard;
     ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat();
@@ -491,7 +474,6 @@ OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException, std::e
 }
 
 void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat();
@@ -534,7 +516,6 @@ void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName )
 // beans::XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( aPropSet.getPropertyMap() ));
@@ -543,9 +524,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatObj::getPropertySet
 
 void SAL_CALL ScAutoFormatObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat();
@@ -576,8 +554,6 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aAny;
@@ -629,7 +605,6 @@ ScAutoFormatFieldObj::~ScAutoFormatFieldObj()
 // beans::XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatFieldObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( aPropSet.getPropertyMap() ));
@@ -638,9 +613,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatFieldObj::getProper
 
 void SAL_CALL ScAutoFormatFieldObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat();
@@ -742,8 +714,6 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aVal;
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 242b8a03fd8b..f5b0e77ef683 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -199,7 +199,7 @@ uno::Sequence<OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static()
     return aRet;
 }
 
-bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName)
 {
    uno::Any any = getPropertyValue(aPropertyName);
    bool b = false;
@@ -207,7 +207,7 @@ bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName) throw
    return b;
 }
 
-sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName)
 {
    uno::Any any = getPropertyValue(aPropertyName);
    sal_Int16 b = 0;
@@ -218,7 +218,6 @@ sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName)
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -228,9 +227,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPrope
 
 void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-                       lang::IllegalArgumentException, lang::WrappedTargetException,
-                       uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -386,8 +382,6 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aPropertyName )
-                throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-                       uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -472,7 +466,6 @@ ScRecentFunctionsObj_get_implementation(css::uno::XComponentContext*, css::uno::
 // XRecentFunctions
 
 uno::Sequence<sal_Int32> SAL_CALL ScRecentFunctionsObj::getRecentFunctionIds()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScAppOptions& rOpt = SC_MOD()->GetAppOptions();
@@ -491,7 +484,6 @@ uno::Sequence<sal_Int32> SAL_CALL ScRecentFunctionsObj::getRecentFunctionIds()
 
 void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds(
                     const uno::Sequence<sal_Int32>& aRecentFunctionIds )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nCount = (sal_uInt16) std::min( aRecentFunctionIds.getLength(), (sal_Int32) LRU_MAX );
@@ -507,7 +499,7 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds(
     pScMod->SetAppOptions(aNewOpts);
 }
 
-sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions()
 {
     return LRU_MAX;
 }
@@ -587,7 +579,6 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co
 // XFunctionDescriptions
 
 uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int32 nId )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
@@ -614,8 +605,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int
 // XNameAccess
 
 uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
@@ -642,7 +631,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName )
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScFunctionListObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScFunctionListObj::getCount()
 {
     SolarMutexGuard aGuard;
     sal_Int32 nCount = 0;
@@ -653,8 +642,6 @@ sal_Int32 SAL_CALL ScFunctionListObj::getCount() throw(uno::RuntimeException, st
 }
 
 uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
@@ -680,7 +667,6 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex )
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.FunctionDescriptionEnumeration"));
@@ -688,19 +674,19 @@ uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumer
 
 // XElementAccess
 
-uno::Type SAL_CALL ScFunctionListObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScFunctionListObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
 }
 
-sal_Bool SAL_CALL ScFunctionListObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScFunctionListObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() > 0 );
 }
 
-uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames()
 {
     SolarMutexGuard aGuard;
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
@@ -721,7 +707,6 @@ uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno:
 }
 
 sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index c17c239a4a72..d826d75e8e16 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -92,7 +92,7 @@ namespace calc
         // TODO: clean up here whatever you need to clean up (e.g. revoking listeners etc.)
     }
 
-    Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo(  )
     {
         return createPropertySetInfo( getInfoHelper() ) ;
     }
@@ -132,17 +132,17 @@ namespace calc
             // TODO: error message
     }
 
-    OUString SAL_CALL OCellListSource::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OCellListSource::getImplementationName(  )
     {
         return OUString( "com.sun.star.comp.sheet.OCellListSource" );
     }
 
-    sal_Bool SAL_CALL OCellListSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OCellListSource::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames(  )
     {
         return {"com.sun.star.table.CellRangeListSource",
                 "com.sun.star.form.binding.ListEntrySource"};
@@ -172,7 +172,7 @@ namespace calc
         return sText;
     }
 
-    sal_Int32 SAL_CALL OCellListSource::getListEntryCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OCellListSource::getListEntryCount(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed();
@@ -182,7 +182,7 @@ namespace calc
         return aAddress.EndRow - aAddress.StartRow + 1;
     }
 
-    OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed();
@@ -194,7 +194,7 @@ namespace calc
         return getCellTextContent_noCheck( _nPosition );
     }
 
-    Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed();
@@ -210,7 +210,7 @@ namespace calc
         return aAllEntries;
     }
 
-    void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed();
@@ -222,7 +222,7 @@ namespace calc
         m_aListEntryListeners.addInterface( _rxListener );
     }
 
-    void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception)
+    void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         checkDisposed();
@@ -234,7 +234,7 @@ namespace calc
         m_aListEntryListeners.removeInterface( _rxListener );
     }
 
-    void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ )
     {
         notifyModified();
     }
@@ -263,7 +263,7 @@ namespace calc
 
     }
 
-    void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCellListSource::disposing( const EventObject& aEvent )
     {
         Reference<XInterface> xRangeInt( m_xRange, UNO_QUERY );
         if ( xRangeInt == aEvent.Source )
@@ -273,7 +273,7 @@ namespace calc
         }
     }
 
-    void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments )
     {
         if ( m_bInitialized )
             throw Exception();
diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx
index 9f9aa76d26ac..2763c768bc2d 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -85,22 +85,22 @@ namespace calc
         DECLARE_XTYPEPROVIDER()
 
         // XListEntrySource
-        virtual sal_Int32 SAL_CALL getListEntryCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAllListEntries(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getListEntryCount(  ) override;
+        virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAllListEntries(  ) override;
+        virtual void SAL_CALL addListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) override;
+        virtual void SAL_CALL removeListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) override;
 
         // OComponentHelper/XComponent
         virtual void SAL_CALL disposing() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
         // OPropertySetHelper
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -110,11 +110,11 @@ namespace calc
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
         // XModifyListener
-        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     private:
         void    checkDisposed( ) const;
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 536e227a9d94..f387325c6faf 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1750,7 +1750,6 @@ void ScCellRangesBase::SetCursorOnly( bool bSet )
 }
 
 uno::Any SAL_CALL ScCellRangesBase::queryInterface( const uno::Type& rType )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SC_QUERYINTERFACE( beans::XPropertySet )
     SC_QUERYINTERFACE( beans::XMultiPropertySet )
@@ -1782,7 +1781,7 @@ void SAL_CALL ScCellRangesBase::release() throw()
     OWeakObject::release();
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -1807,7 +1806,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() throw(uno::Runtim
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1821,7 +1819,6 @@ void ScCellRangesBase::PaintGridRanges_Impl( )
 // XSheetOperation
 
 double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunction )
-    throw(uno::Exception, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScMarkData aMark(*GetMarkData());
@@ -1841,7 +1838,7 @@ double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunct
     return fVal;
 }
 
-void SAL_CALL ScCellRangesBase::clearContents( sal_Int32 nContentFlags ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellRangesBase::clearContents( sal_Int32 nContentFlags )
 {
     SolarMutexGuard aGuard;
     if ( !aRanges.empty() )
@@ -1943,7 +1940,6 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhic
 }
 
 beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const OUString& aPropertyName )
-                                throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( aRanges.empty() )
@@ -1958,7 +1954,6 @@ beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const OUString
 
 uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates(
                                 const uno::Sequence<OUString>& aPropertyNames )
-                            throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1977,7 +1972,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates
 }
 
 void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyName )
-                            throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( pDocShell )
@@ -2022,8 +2016,6 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyN
 }
 
 uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropertyName )
-                                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                                        uno::RuntimeException, std::exception)
 {
     //! mit getPropertyValue zusammenfassen
 
@@ -2130,7 +2122,6 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropert
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangesBase::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -2250,9 +2241,6 @@ static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const
 
 void SAL_CALL ScCellRangesBase::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2268,7 +2256,6 @@ void SAL_CALL ScCellRangesBase::setPropertyValue(
 }
 
 void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     if ( pEntry )
     {
@@ -2466,8 +2453,6 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
 }
 
 uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2485,7 +2470,6 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyN
 }
 
 void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny )
-    throw(uno::RuntimeException, std::exception)
 {
     if ( pEntry )
     {
@@ -2635,8 +2619,6 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
 
 void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( aRanges.empty() )
@@ -2647,8 +2629,6 @@ void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const OUString& /* aP
 
 void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( aRanges.empty() )
@@ -2659,16 +2639,12 @@ void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const OUString& /*
 
 void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -2677,10 +2653,6 @@ void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const OUString&,
 
 void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames,
                                     const uno::Sequence< uno::Any >& aValues )
-                                throw (beans::PropertyVetoException,
-                                    lang::IllegalArgumentException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2767,7 +2739,6 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString
 
 uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues(
                                 const uno::Sequence< OUString >& aPropertyNames )
-                                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2785,20 +2756,17 @@ uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues(
 
 void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */,
                                     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                                throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ScCellRangesBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                                throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */,
                                     const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
-                                throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -2818,7 +2786,6 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, const SfxHint&, rHint, void )
 // XTolerantMultiPropertySet
 uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::setPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames,
                                     const uno::Sequence< uno::Any >& aValues )
-                                    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2937,7 +2904,6 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set
 }
 
 uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames )
-                                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2967,7 +2933,6 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get
 }
 
 uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames )
-                                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3006,7 +2971,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas
 
 // XIndent
 
-void SAL_CALL ScCellRangesBase::decrementIndent() throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL ScCellRangesBase::decrementIndent()
 {
     SolarMutexGuard aGuard;
     if ( pDocShell && !aRanges.empty() )        // leer = nichts zu tun
@@ -3018,7 +2983,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent() throw(css::uno::RuntimeExcepti
     }
 }
 
-void SAL_CALL ScCellRangesBase::incrementIndent() throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL ScCellRangesBase::incrementIndent()
 {
     SolarMutexGuard aGuard;
     if ( pDocShell && !aRanges.empty() )        // leer = nichts zu tun
@@ -3082,7 +3047,6 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const
 }
 
 uno::Sequence< uno::Sequence<double> > SAL_CALL ScCellRangesBase::getData()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl());
@@ -3143,7 +3107,6 @@ ScRangeListRef ScCellRangesBase::GetLimitedChartRanges_Impl( long nDataColumns,
 }
 
 void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<double> >& aData )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3196,7 +3159,6 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub
 }
 
 uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl());
@@ -3215,7 +3177,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions()
 
 void SAL_CALL ScCellRangesBase::setRowDescriptions(
                         const uno::Sequence<OUString>& aRowDescriptions )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3267,7 +3228,6 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions(
 }
 
 uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl());
@@ -3286,7 +3246,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions()
 
 void SAL_CALL ScCellRangesBase::setColumnDescriptions(
     const uno::Sequence<OUString>& aColumnDescriptions )
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3361,7 +3320,6 @@ void ScCellRangesBase::ForceChartListener_Impl()
 
 void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Reference<
                                     chart::XChartDataChangeEventListener >& aListener )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( pDocShell && !aRanges.empty() )
@@ -3385,7 +3343,6 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe
 
 void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::Reference<
                                     chart::XChartDataChangeEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( pDocShell && !aRanges.empty() )
@@ -3396,13 +3353,13 @@ void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::R
     }
 }
 
-double SAL_CALL ScCellRangesBase::getNotANumber() throw(css::uno::RuntimeException, std::exception)
+double SAL_CALL ScCellRangesBase::getNotANumber()
 {
     //  im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will
     return DBL_MIN;
 }
 
-sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber )
 {
     //  im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will
     return (nNumber == DBL_MIN);
@@ -3411,7 +3368,6 @@ sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) throw(uno::Ru
 // XModifyBroadcaster
 
 void SAL_CALL ScCellRangesBase::addModifyListener(const uno::Reference<util::XModifyListener>& aListener)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( aRanges.empty() )
@@ -3433,7 +3389,6 @@ void SAL_CALL ScCellRangesBase::addModifyListener(const uno::Reference<util::XMo
 }
 
 void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util::XModifyListener>& aListener )
-                                throw(uno::RuntimeException, std::exception)
 {
 
     SolarMutexGuard aGuard;
@@ -3468,7 +3423,6 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util:
 // XCellRangesQuery
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleCells()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -3508,7 +3462,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC
 }
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCells()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -3544,7 +3497,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentCells(
     sal_Int16 nContentFlags )
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -3634,7 +3586,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaCells(
     sal_Int32 nResultFlags )
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -3772,21 +3723,21 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
 }
 
 uno::Reference<sheet::XSheetCellRanges > SAL_CALL ScCellRangesBase::queryColumnDifferences(
-    const table::CellAddress& aCompare ) throw(uno::RuntimeException, std::exception)
+    const table::CellAddress& aCompare )
 {
     SolarMutexGuard aGuard;
     return QueryDifferences_Impl( aCompare, true );
 }
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryRowDifferences(
-    const table::CellAddress& aCompare ) throw(uno::RuntimeException, std::exception)
+    const table::CellAddress& aCompare )
 {
     SolarMutexGuard aGuard;
     return QueryDifferences_Impl( aCompare, false );
 }
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersection(
-                            const table::CellRangeAddress& aRange ) throw(uno::RuntimeException, std::exception)
+                            const table::CellRangeAddress& aRange )
 {
     SolarMutexGuard aGuard;
     ScRange aMask( (SCCOL)aRange.StartColumn, (SCROW)aRange.StartRow, aRange.Sheet,
@@ -3811,7 +3762,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersec
 // XFormulaQuery
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPrecedents(
-    sal_Bool bRecursive ) throw(uno::RuntimeException, std::exception)
+    sal_Bool bRecursive )
 {
     SolarMutexGuard aGuard;
     if ( pDocShell )
@@ -3860,7 +3811,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden
 }
 
 uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependents(
-    sal_Bool bRecursive ) throw(uno::RuntimeException, std::exception)
+    sal_Bool bRecursive )
 {
     SolarMutexGuard aGuard;
     if ( pDocShell )
@@ -3921,7 +3872,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen
 // XSearchable
 
 uno::Reference<util::XSearchDescriptor> SAL_CALL ScCellRangesBase::createSearchDescriptor()
-                                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScCellSearchObj;
@@ -3929,8 +3879,6 @@ uno::Reference<util::XSearchDescriptor> SAL_CALL ScCellRangesBase::createSearchD
 
 uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll(
                         const uno::Reference<util::XSearchDescriptor>& xDesc )
-                                                    throw(uno::RuntimeException,
-                                                          std::exception)
 {
     SolarMutexGuard aGuard;
     //  Wenn nichts gefunden wird, soll Null zurueckgegeben werden (?)
@@ -4016,7 +3964,6 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl(
 
 uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findFirst(
                         const uno::Reference<util::XSearchDescriptor>& xDesc )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return Find_Impl( xDesc, nullptr );
@@ -4025,7 +3972,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findFirst(
 uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext(
                         const uno::Reference<uno::XInterface>& xStartAt,
                         const uno::Reference<util::XSearchDescriptor >& xDesc )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( xStartAt.is() )
@@ -4047,15 +3993,12 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext(
 // XReplaceable
 
 uno::Reference<util::XReplaceDescriptor> SAL_CALL ScCellRangesBase::createReplaceDescriptor()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScCellSearchObj;
 }
 
 sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSearchDescriptor>& xDesc )
-                                                throw(uno::RuntimeException,
-                                                      std::exception)
 {
     SolarMutexGuard aGuard;
     sal_Int32 nReplaced = 0;
@@ -4139,7 +4082,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScCellRangesBase::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -4194,7 +4137,6 @@ void ScCellRangesObj::RefChanged()
 }
 
 uno::Any SAL_CALL ScCellRangesObj::queryInterface( const uno::Type& rType )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SC_QUERYINTERFACE( sheet::XSheetCellRangeContainer )
     SC_QUERYINTERFACE( sheet::XSheetCellRanges )
@@ -4218,7 +4160,7 @@ void SAL_CALL ScCellRangesObj::release() throw()
     ScCellRangesBase::release();
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -4240,7 +4182,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::Runtime
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScCellRangesObj::getImplementationId()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -4264,7 +4205,6 @@ ScCellRangeObj* ScCellRangesObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const
 }
 
 uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddresses()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -4287,7 +4227,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddress
 }
 
 uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -4304,7 +4243,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells
 }
 
 OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aString;
@@ -4319,7 +4257,6 @@ OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString()
 
 void SAL_CALL ScCellRangesObj::addRangeAddress( const table::CellRangeAddress& rRange,
                                     sal_Bool bMergeRanges )
-                                    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScRange aRange(static_cast<SCCOL>(rRange.StartColumn),
@@ -4340,8 +4277,6 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const ScR
 }
 
 void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress& rRange )
-                                throw(css::container::NoSuchElementException,
-                                    css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -4389,7 +4324,6 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress
 
 void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRanges,
                                     sal_Bool bMergeRanges )
-                                    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_Int32 nCount(rRanges.getLength());
@@ -4410,8 +4344,6 @@ void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::Cel
 }
 
 void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRangeSeq )
-                                throw(css::container::NoSuchElementException,
-                                    css::uno::RuntimeException, std::exception)
 {
     // use sometimes a better/faster implementation
     sal_uInt32 nCount(rRangeSeq.getLength());
@@ -4436,9 +4368,6 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const OUS
 }
 
 void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::Any& aElement )
-                            throw (lang::IllegalArgumentException, container::ElementExistException,
-                                   lang::WrappedTargetException, uno::RuntimeException,
-                                   std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -4564,8 +4493,6 @@ static bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
 }
 
 void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName )
-                                throw(container::NoSuchElementException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -4629,8 +4556,6 @@ void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName )
 // XNameReplace
 
 void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno::Any& aElement )
-                            throw(lang::IllegalArgumentException, container::NoSuchElementException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //! zusammenfassen?
@@ -4641,8 +4566,6 @@ void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno::
 // XNameAccess
 
 uno::Any SAL_CALL ScCellRangesObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -4679,7 +4602,6 @@ static bool lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries,
 }
 
 uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getElementNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -4710,7 +4632,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -4723,7 +4644,6 @@ sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName )
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetCellRangesEnumeration"));
@@ -4731,7 +4651,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumerat
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScCellRangesObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScCellRangesObj::getCount()
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -4739,8 +4659,6 @@ sal_Int32 SAL_CALL ScCellRangesObj::getCount() throw(uno::RuntimeException, std:
 }
 
 uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XCellRange> xRange(GetObjectByIndex_Impl(nIndex));
@@ -4750,13 +4668,13 @@ uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScCellRangesObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScCellRangesObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<table::XCellRange>::get();
 }
 
-sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellRangesObj::hasElements()
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -4764,19 +4682,17 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException, st
 }
 
 // XServiceInfo
-OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellRangesObj::getImplementationName()
 {
     return OUString( "ScCellRangesObj" );
 }
 
 sal_Bool SAL_CALL ScCellRangesObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {SCSHEETCELLRANGES_SERVICE,
             SCCELLPROPERTIES_SERVICE,
@@ -4819,7 +4735,6 @@ void ScCellRangeObj::RefChanged()
 }
 
 uno::Any SAL_CALL ScCellRangeObj::queryInterface( const uno::Type& rType )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SC_QUERYINTERFACE( sheet::XCellRangeAddressable )
     SC_QUERYINTERFACE( table::XCellRange )
@@ -4854,7 +4769,7 @@ void SAL_CALL ScCellRangeObj::release() throw()
     ScCellRangesBase::release();
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -4890,7 +4805,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeE
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScCellRangeObj::getImplementationId()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -4902,7 +4816,6 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangeObj::getImplementationId()
 
 uno::Reference<table::XCell> ScCellRangeObj::GetCellByPosition_Impl(
                                         sal_Int32 nColumn, sal_Int32 nRow )
-                                throw(lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     ScDocShell* pDocSh = GetDocShell();
     if (!pDocSh)
@@ -4925,7 +4838,6 @@ uno::Reference<table::XCell> ScCellRangeObj::GetCellByPosition_Impl(
 
 uno::Reference<table::XCell> SAL_CALL ScCellRangeObj::getCellByPosition(
                                         sal_Int32 nColumn, sal_Int32 nRow )
-                                throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -4934,7 +4846,6 @@ uno::Reference<table::XCell> SAL_CALL ScCellRangeObj::getCellByPosition(
 
 uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPosition(
                 sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
-                                    throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -4962,13 +4873,13 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPositio
 }
 
 uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName(
-                        const OUString& aName ) throw(uno::RuntimeException, std::exception)
+                        const OUString& aName )
 {
     return getCellRangeByName( aName, ScAddress::detailsOOOa1 );
 }
 
 uno::Reference<table::XCellRange>  ScCellRangeObj::getCellRangeByName(
-                        const OUString& aName, const ScAddress::Details& rDetails  ) throw(uno::RuntimeException)
+                        const OUString& aName, const ScAddress::Details& rDetails  )
 {
     //  name refers to the whole document (with the range's table as default),
     //  valid only if the range is within this range
@@ -5020,7 +4931,7 @@ uno::Reference<table::XCellRange>  ScCellRangeObj::getCellRangeByName(
 
 // XColumnRowRange
 
-uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() throw(uno::RuntimeException, std::exception)
+uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5032,7 +4943,7 @@ uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() throw
     return nullptr;
 }
 
-uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() throw(uno::RuntimeException, std::exception)
+uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5046,7 +4957,7 @@ uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() throw(uno::
 
 // XAddressableCellRange
 
-table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() throw(uno::RuntimeException, std::exception)
+table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress()
 {
     SolarMutexGuard aGuard;
     table::CellRangeAddress aRet;
@@ -5057,7 +4968,6 @@ table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() throw(uno::Ru
 // XSheetCellRange
 
 uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5070,7 +4980,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet()
 
 // XArrayFormulaRange
 
-OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellRangeObj::getArrayFormula()
 {
     SolarMutexGuard aGuard;
 
@@ -5104,7 +5014,6 @@ OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException,
 
 void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula,
     const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar)
-        throw (uno::RuntimeException, std::exception)
 {
     ScDocShell* pDocSh = GetDocShell();
     if (pDocSh)
@@ -5131,7 +5040,6 @@ void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula,
 }
 
 void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     // GRAM_API for API compatibility.
@@ -5140,7 +5048,6 @@ void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula )
 
 // XArrayFormulaTokens
 uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -5174,7 +5081,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens()
     return aSequence;
 }
 
-void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::FormulaToken>& rTokens )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5210,7 +5117,6 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula
 // XCellRangeData
 
 uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray()
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -5238,7 +5144,6 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray()
 
 void SAL_CALL ScCellRangeObj::setDataArray(
                         const uno::Sequence< uno::Sequence<uno::Any> >& aArray )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -5257,7 +5162,6 @@ void SAL_CALL ScCellRangeObj::setDataArray(
 // XCellRangeFormula
 
 uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArray()
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -5299,7 +5203,6 @@ uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArra
 
 void SAL_CALL ScCellRangeObj::setFormulaArray(
                         const uno::Sequence< uno::Sequence<OUString> >& aArray )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -5323,7 +5226,6 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress&
                                         sheet::TableOperationMode nMode,
                                         const table::CellAddress& aColumnCell,
                                         const table::CellAddress& aRowCell )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5366,7 +5268,7 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress&
 
 // XMergeable
 
-void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5385,7 +5287,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti
     }
 }
 
-sal_Bool SAL_CALL ScCellRangeObj::getIsMerged() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellRangeObj::getIsMerged()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5396,7 +5298,7 @@ sal_Bool SAL_CALL ScCellRangeObj::getIsMerged() throw(uno::RuntimeException, std
 
 void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection,
                         sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode,
-                        double fStep, double fEndValue ) throw(uno::RuntimeException, std::exception)
+                        double fStep, double fEndValue )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5471,7 +5373,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection,
 }
 
 void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection,
-                                sal_Int32 nSourceCount ) throw(uno::RuntimeException, std::exception)
+                                sal_Int32 nSourceCount )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5517,7 +5419,6 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection,
 // XAutoFormattable
 
 void SAL_CALL ScCellRangeObj::autoFormat( const OUString& aName )
-                    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5539,7 +5440,6 @@ void SAL_CALL ScCellRangeObj::autoFormat( const OUString& aName )
 // XSortable
 
 uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescriptor()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScSortParam aParam;
@@ -5570,7 +5470,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescripto
 }
 
 void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& aDescriptor )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5625,7 +5524,7 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a
 // XFilterable
 
 uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFilterDescriptor(
-                                sal_Bool bEmpty ) throw(uno::RuntimeException, std::exception)
+                                sal_Bool bEmpty )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5658,7 +5557,6 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil
 }
 
 void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDescriptor>& xDescriptor )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -5736,7 +5634,6 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
 
 uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFilterDescriptorByObject(
                         const uno::Reference<sheet::XSheetFilterable>& xObject )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -5798,7 +5695,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil
 // XSubTotalSource
 
 uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTotalDescriptor(
-                                sal_Bool bEmpty ) throw(uno::RuntimeException, std::exception)
+                                sal_Bool bEmpty )
 {
     SolarMutexGuard aGuard;
     ScSubTotalDescriptor* pNew = new ScSubTotalDescriptor;
@@ -5835,7 +5732,6 @@ uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTot
 void SAL_CALL ScCellRangeObj::applySubTotals(
     const uno::Reference<sheet::XSubTotalDescriptor>& xDescriptor,
     sal_Bool bReplace)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -5877,7 +5773,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals(
     }
 }
 
-void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellRangeObj::removeSubTotals()
 {
     SolarMutexGuard aGuard;
 
@@ -5905,7 +5801,6 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException, std
 }
 
 uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createImportDescriptor( sal_Bool bEmpty )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScImportParam aParam;
@@ -5924,7 +5819,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createImportDescrip
 }
 
 void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue>& aDescriptor )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5951,7 +5845,6 @@ void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue
 // XCellFormatRangesSupplier
 
 uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getCellFormatRanges()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5963,7 +5856,6 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getCellFormatRa
 // XUniqueCellFormatRangesSupplier
 
 uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getUniqueCellFormatRanges()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -5975,7 +5867,6 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getUniqueCellFo
 // XPropertySet erweitert fuer Range-Properties
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -5984,7 +5875,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetI
 }
 
 void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     //  Range has only Position and Size in addition to ScCellRangesBase, both are ReadOnly
     //  -> nothing to do here
@@ -5993,7 +5883,6 @@ void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEnt
 }
 
 void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny )
-    throw(uno::RuntimeException, std::exception)
 {
     if ( pEntry )
     {
@@ -6036,19 +5925,17 @@ const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap()
 
 // XServiceInfo
 
-OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellRangeObj::getImplementationName()
 {
     return OUString( "ScCellRangeObj" );
 }
 
 sal_Bool SAL_CALL ScCellRangeObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {SCSHEETCELLRANGE_SERVICE,
             SCCELLRANGE_SERVICE,
@@ -6110,7 +5997,7 @@ void ScCellObj::RefChanged()
     }
 }
 
-uno::Any SAL_CALL ScCellObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScCellObj::queryInterface( const uno::Type& rType )
 {
     SC_QUERYINTERFACE( table::XCell )
     SC_QUERYINTERFACE( table::XCell2 )
@@ -6138,7 +6025,7 @@ void SAL_CALL ScCellObj::release() throw()
     ScCellRangeObj::release();
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -6165,7 +6052,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeExcept
     return aTypes;
 }
 
-uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId() throw(uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -6283,7 +6170,6 @@ void ScCellObj::InputEnglishString( const OUString& rText )
 //  XText
 
 uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScCellTextCursor( *this );
@@ -6291,7 +6177,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor()
 
 uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange(
                                     const uno::Reference<text::XTextRange>& aTextPosition )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SvxUnoTextCursor* pCursor = new ScCellTextCursor( *this );
@@ -6312,13 +6197,13 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange(
     return xCursor;
 }
 
-OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellObj::getString()
 {
     SolarMutexGuard aGuard;
     return GetOutputString_Impl();
 }
 
-void SAL_CALL ScCellObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellObj::setString( const OUString& aText )
 {
     SolarMutexGuard aGuard;
     SetString_Impl(aText, false, false);  // immer Text
@@ -6330,7 +6215,6 @@ void SAL_CALL ScCellObj::setString( const OUString& aText ) throw(uno::RuntimeEx
 
 void SAL_CALL ScCellObj::insertString( const uno::Reference<text::XTextRange>& xRange,
                                         const OUString& aString, sal_Bool bAbsorb )
-                                    throw(uno::RuntimeException, std::exception)
 {
     // special handling for ScCellTextCursor is no longer needed,
     // SvxUnoText::insertString checks for SvxUnoTextRangeBase instead of SvxUnoTextRange
@@ -6341,7 +6225,6 @@ void SAL_CALL ScCellObj::insertString( const uno::Reference<text::XTextRange>& x
 
 void SAL_CALL ScCellObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange,
                                                 sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetUnoText().insertControlCharacter(xRange, nControlCharacter, bAbsorb);
@@ -6350,7 +6233,6 @@ void SAL_CALL ScCellObj::insertControlCharacter( const uno::Reference<text::XTex
 void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRange >& xRange,
                                                 const uno::Reference<text::XTextContent >& xContent,
                                                 sal_Bool bAbsorb )
-                                    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6402,7 +6284,6 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang
 }
 
 void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent )
-                                throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( xContent.is() )
@@ -6418,38 +6299,37 @@ void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextCont
     GetUnoText().removeTextContent(xContent);
 }
 
-uno::Reference<text::XText> SAL_CALL ScCellObj::getText() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XText> SAL_CALL ScCellObj::getText()
 {
     SolarMutexGuard aGuard;
     return this;
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getStart()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getStart();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getEnd()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getEnd();
 }
 
 uno::Reference<container::XEnumeration> SAL_CALL ScCellObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return GetUnoText().createEnumeration();
 }
 
-uno::Type SAL_CALL ScCellObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScCellObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getElementType();
 }
 
-sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().hasElements();
@@ -6457,31 +6337,31 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException, std::exc
 
 //  XCell
 
-OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellObj::getFormula()
 {
     SolarMutexGuard aGuard;
     return GetInputString_Impl( true /* English */ );
 }
 
-void SAL_CALL ScCellObj::setFormula( const OUString& aFormula ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellObj::setFormula( const OUString& aFormula )
 {
     SolarMutexGuard aGuard;
     SetString_Impl(aFormula, true, true); // Interpret as English
 }
 
-double SAL_CALL ScCellObj::getValue() throw(uno::RuntimeException, std::exception)
+double SAL_CALL ScCellObj::getValue()
 {
     SolarMutexGuard aGuard;
     return GetValue_Impl();
 }
 
-void SAL_CALL ScCellObj::setValue( double nValue ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellObj::setValue( double nValue )
 {
     SolarMutexGuard aGuard;
     SetValue_Impl(nValue);
 }
 
-void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula)
 {
     SolarMutexGuard aGuard;
     ScDocShell *pDocSh = GetDocShell();
@@ -6492,7 +6372,7 @@ void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) throw(uno::
         pDocSh->GetDocFunc().SetFormulaCell(aCellPos, pCell, false);
     }
 }
-void SAL_CALL ScCellObj::setFormulaResult( double nValue ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellObj::setFormulaResult( double nValue )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6509,7 +6389,7 @@ void SAL_CALL ScCellObj::setFormulaResult( double nValue ) throw(uno::RuntimeExc
     }
 }
 
-table::CellContentType SAL_CALL ScCellObj::getType() throw(uno::RuntimeException, std::exception)
+table::CellContentType SAL_CALL ScCellObj::getType()
 {
     SolarMutexGuard aGuard;
     table::CellContentType eRet = table::CellContentType_EMPTY;
@@ -6556,7 +6436,7 @@ table::CellContentType ScCellObj::GetResultType_Impl()
     return getType();   // wenn keine Formel
 }
 
-sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScCellObj::getError()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6577,7 +6457,6 @@ sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException, std::excep
 // XFormulaTokens
 
 uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence<sheet::FormulaToken> aSequence;
@@ -6596,7 +6475,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens()
     return aSequence;
 }
 
-void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6613,7 +6492,7 @@ void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rT
 
 // XCellAddressable
 
-table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeException, std::exception)
+table::CellAddress SAL_CALL ScCellObj::getCellAddress()
 {
     SolarMutexGuard aGuard;
     table::CellAddress aAdr;
@@ -6626,7 +6505,6 @@ table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeExcept
 // XSheetAnnotationAnchor
 
 uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6640,7 +6518,6 @@ uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation()
 // XFieldTypesSupplier
 
 uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellObj::getTextFields()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6654,7 +6531,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellObj::getTextFields(
 }
 
 uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters()
-                                                throw(uno::RuntimeException, std::exception)
 {
     //  sowas gibts nicht im Calc (?)
     return nullptr;
@@ -6663,7 +6539,6 @@ uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters()
 // XPropertySet erweitert fuer Zell-Properties
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -6672,7 +6547,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellObj::getPropertySetInfo()
 }
 
 void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     if ( pEntry )
     {
@@ -6694,7 +6568,6 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c
 }
 
 void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny )
-    throw(uno::RuntimeException, std::exception)
 {
     if ( pEntry )
     {
@@ -6720,19 +6593,17 @@ const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap()
 
 // XServiceInfo
 
-OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellObj::getImplementationName()
 {
     return OUString( "ScCellObj" );
 }
 
 sal_Bool SAL_CALL ScCellObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {SCSHEETCELL_SERVICE,
             SCCELL_SERVICE,
@@ -6745,13 +6616,13 @@ uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames()
 
 // XActionLockable
 
-sal_Bool SAL_CALL ScCellObj::isActionLocked() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellObj::isActionLocked()
 {
     SolarMutexGuard aGuard;
     return nActionLockCount != 0;
 }
 
-void SAL_CALL ScCellObj::addActionLock() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellObj::addActionLock()
 {
     SolarMutexGuard aGuard;
     if (!nActionLockCount)
@@ -6767,7 +6638,7 @@ void SAL_CALL ScCellObj::addActionLock() throw(uno::RuntimeException, std::excep
     nActionLockCount++;
 }
 
-void SAL_CALL ScCellObj::removeActionLock() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellObj::removeActionLock()
 {
     SolarMutexGuard aGuard;
     if (nActionLockCount > 0)
@@ -6790,7 +6661,7 @@ void SAL_CALL ScCellObj::removeActionLock() throw(uno::RuntimeException, std::ex
     }
 }
 
-void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock )
 {
     SolarMutexGuard aGuard;
     if (mxUnoText.is())
@@ -6807,7 +6678,7 @@ void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeExc
     nActionLockCount = nLock;
 }
 
-sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL ScCellObj::resetActionLocks()
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nRet(nActionLockCount);
@@ -6841,7 +6712,7 @@ void ScTableSheetObj::InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab)
     InitInsertRange( pDocSh, ScRange(0,0,nTab, MAXCOL,MAXROW,nTab) );
 }
 
-uno::Any SAL_CALL ScTableSheetObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScTableSheetObj::queryInterface( const uno::Type& rType )
 {
     SC_QUERYINTERFACE( sheet::XSpreadsheet )
     SC_QUERYINTERFACE( container::XNamed )
@@ -6875,7 +6746,7 @@ void SAL_CALL ScTableSheetObj::release() throw()
     ScCellRangeObj::release();
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -6911,7 +6782,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::Runtime
     return aTypes;
 }
 
-uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId() throw(uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -6932,7 +6803,7 @@ SCTAB ScTableSheetObj::GetTab_Impl() const
 
 // former XSheet
 
-uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() throw(uno::RuntimeException, std::exception)
+uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6944,7 +6815,6 @@ uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() throw(
 }
 
 uno::Reference<sheet::XDataPilotTables> SAL_CALL ScTableSheetObj::getDataPilotTables()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6955,7 +6825,7 @@ uno::Reference<sheet::XDataPilotTables> SAL_CALL ScTableSheetObj::getDataPilotTa
     return nullptr;
 }
 
-uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() throw(uno::RuntimeException, std::exception)
+uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6968,7 +6838,6 @@ uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() throw
 }
 
 uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotations()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -6981,14 +6850,13 @@ uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotation
 }
 
 uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByName(
-                        const OUString& rRange ) throw(uno::RuntimeException, std::exception)
+                        const OUString& rRange )
 {
     SolarMutexGuard aGuard;
     return ScCellRangeObj::getCellRangeByName( rRange );
 }
 
 uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7003,7 +6871,6 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor()
 
 uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorByRange(
                         const uno::Reference<sheet::XSheetCellRange>& xCellRange )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7023,7 +6890,6 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorBy
 // XSheetCellRange
 
 uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return this;        //!???
@@ -7033,7 +6899,6 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet()
 
 uno::Reference<table::XCell> SAL_CALL ScTableSheetObj::getCellByPosition(
                                         sal_Int32 nColumn, sal_Int32 nRow )
-                                throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return ScCellRangeObj::GetCellByPosition_Impl(nColumn, nRow);
@@ -7041,14 +6906,12 @@ uno::Reference<table::XCell> SAL_CALL ScTableSheetObj::getCellByPosition(
 
 uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByPosition(
                 sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
-                                throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return ScCellRangeObj::getCellRangeByPosition(nLeft,nTop,nRight,nBottom);
 }
 
 uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPageBreaks()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7094,7 +6957,6 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage
 }
 
 uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBreaks()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7117,7 +6979,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre
     return uno::Sequence<sheet::TablePageBreakData>(0);
 }
 
-void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7149,7 +7011,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc
 
 // XNamed
 
-OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableSheetObj::getName()
 {
     SolarMutexGuard aGuard;
     OUString aName;
@@ -7160,7 +7022,6 @@ OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException, std::e
 }
 
 void SAL_CALL ScTableSheetObj::setName( const OUString& aNewName )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7173,7 +7034,6 @@ void SAL_CALL ScTableSheetObj::setName( const OUString& aNewName )
 // XDrawPageSupplier
 
 uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7197,7 +7057,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage()
 // XCellMovement
 
 void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRangeAddress,
-                                sheet::CellInsertMode nMode ) throw(uno::RuntimeException, std::exception)
+                                sheet::CellInsertMode nMode )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7228,7 +7088,7 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang
 }
 
 void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRangeAddress,
-                                sheet::CellDeleteMode nMode ) throw(uno::RuntimeException, std::exception)
+                                sheet::CellDeleteMode nMode )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7260,7 +7120,6 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang
 
 void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination,
                                         const table::CellRangeAddress& aSource )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7276,7 +7135,6 @@ void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination
 
 void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& aDestination,
                                         const table::CellRangeAddress& aSource )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7332,7 +7190,6 @@ void ScTableSheetObj::PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges )
 }
 
 uno::Sequence<table::CellRangeAddress> SAL_CALL ScTableSheetObj::getPrintAreas()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7363,7 +7220,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScTableSheetObj::getPrintAreas()
 
 void SAL_CALL ScTableSheetObj::setPrintAreas(
                     const uno::Sequence<table::CellRangeAddress>& aPrintAreas )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7394,7 +7250,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
     }
 }
 
-sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7408,7 +7264,6 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() throw(uno::RuntimeExce
 }
 
 void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7436,7 +7291,7 @@ void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns
     }
 }
 
-table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() throw(uno::RuntimeException, std::exception)
+table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns()
 {
     SolarMutexGuard aGuard;
     table::CellRangeAddress aRet;
@@ -7456,7 +7311,6 @@ table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() throw(uno::R
 }
 
 void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& aTitleColumns )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7475,7 +7329,7 @@ void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& a
     }
 }
 
-sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7489,7 +7343,6 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() throw(uno::RuntimeExcepti
 }
 
 void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7517,7 +7370,7 @@ void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows )
     }
 }
 
-table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() throw(uno::RuntimeException, std::exception)
+table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows()
 {
     SolarMutexGuard aGuard;
     table::CellRangeAddress aRet;
@@ -7537,7 +7390,6 @@ table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() throw(uno::Runt
 }
 
 void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTitleRows )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7558,7 +7410,7 @@ void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTit
 
 // XSheetLinkable
 
-sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() throw(uno::RuntimeException, std::exception)
+sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode()
 {
     SolarMutexGuard aGuard;
     sheet::SheetLinkMode eRet = sheet::SheetLinkMode_NONE;
@@ -7575,7 +7427,6 @@ sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() throw(uno::RuntimeE
 }
 
 void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -7587,7 +7438,7 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode )
     link( aUrl, aSheet, "", "", nLinkMode );
 }
 
-OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableSheetObj::getLinkUrl()
 {
     SolarMutexGuard aGuard;
     OUString aFile;
@@ -7598,7 +7449,6 @@ OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException, std
 }
 
 void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -7610,7 +7460,7 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl )
     link( aLinkUrl, aSheet, "", "", eMode );
 }
 
-OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableSheetObj::getLinkSheetName()
 {
     SolarMutexGuard aGuard;
     OUString aSheet;
@@ -7621,7 +7471,6 @@ OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeExceptio
 }
 
 void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -7635,7 +7484,7 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName
 
 void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aSheetName,
                         const OUString& aFilterName, const OUString& aFilterOptions,
-                        sheet::SheetLinkMode nMode ) throw(uno::RuntimeException, std::exception)
+                        sheet::SheetLinkMode nMode )
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7700,7 +7549,6 @@ void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aShee
 // XSheetAuditing
 
 sal_Bool SAL_CALL ScTableSheetObj::hideDependents( const table::CellAddress& aPosition )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7715,7 +7563,6 @@ sal_Bool SAL_CALL ScTableSheetObj::hideDependents( const table::CellAddress& aPo
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPosition )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7730,7 +7577,6 @@ sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPo
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPosition )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7745,7 +7591,6 @@ sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPo
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPosition )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7760,7 +7605,6 @@ sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPo
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPosition )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7774,7 +7618,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPositi
     return false;
 }
 
-sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTableSheetObj::showInvalid()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7783,7 +7627,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException, st
     return false;
 }
 
-void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScTableSheetObj::clearArrows()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7795,8 +7639,6 @@ void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException, std::e
 
 void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange,
                                         table::TableOrientation nOrientation )
-                                    throw (uno::RuntimeException,
-                                           std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7812,8 +7654,6 @@ void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange
 
 void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRange,
                                         table::TableOrientation nOrientation )
-                                    throw (uno::RuntimeException,
-                                           std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7828,7 +7668,6 @@ void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRan
 }
 
 void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCellRange )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7842,7 +7681,6 @@ void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCell
 }
 
 void SAL_CALL ScTableSheetObj::clearOutline()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7855,7 +7693,6 @@ void SAL_CALL ScTableSheetObj::clearOutline()
 }
 
 void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellRange )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7869,7 +7706,6 @@ void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellR
 }
 
 void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellRange )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7883,7 +7719,6 @@ void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellR
 }
 
 void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientation nOrientation )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7899,7 +7734,6 @@ void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientat
 // XProtectable
 
 void SAL_CALL ScTableSheetObj::protect( const OUString& aPassword )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7911,7 +7745,6 @@ void SAL_CALL ScTableSheetObj::protect( const OUString& aPassword )
 }
 
 void SAL_CALL ScTableSheetObj::unprotect( const OUString& aPassword )
-                            throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7923,7 +7756,7 @@ void SAL_CALL ScTableSheetObj::unprotect( const OUString& aPassword )
     }
 }
 
-sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTableSheetObj::isProtected()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7936,7 +7769,7 @@ sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException, st
 
 // XScenario
 
-sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTableSheetObj::getIsScenario()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7946,7 +7779,7 @@ sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException,
     return false;
 }
 
-OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableSheetObj::getScenarioComment()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7962,7 +7795,6 @@ OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeExcept
 }
 
 void SAL_CALL ScTableSheetObj::setScenarioComment( const OUString& aScenarioComment )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -7985,7 +7817,6 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const OUString& aScenarioComm
 }
 
 void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAddress>& rScenRanges )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -8022,7 +7853,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd
     }
 }
 
-void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScTableSheetObj::apply()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -8047,7 +7878,6 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException, std::excepti
 // XScenarioEnhanced
 
 uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges(  )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -8080,7 +7910,6 @@ uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges(  )
 // XExternalSheetName
 
 void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSheetName )
-    throw (container::ElementExistException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -8099,7 +7928,7 @@ void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSh
 
 // XEventsSupplier
 
-uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() throw (uno::RuntimeException, std::exception)
+uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -8112,7 +7941,6 @@ uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() th
 // XPropertySet erweitert fuer Sheet-Properties
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableSheetObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -8121,8 +7949,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableSheetObj::getPropertySet
 }
 
 void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue )
-    throw(lang::IllegalArgumentException, uno::RuntimeException,
-          std::exception)
 {
     if ( pEntry )
     {
@@ -8454,8 +8280,6 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
 
 void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
                                             uno::Any& rAny )
-    throw(uno::RuntimeException,
-          std::exception)
 {
     if ( pEntry )
     {
@@ -8605,19 +8429,17 @@ const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap()
 
 // XServiceInfo
 
-OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableSheetObj::getImplementationName()
 {
     return OUString( "ScTableSheetObj" );
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {SCSPREADSHEET_SERVICE,
             SCSHEETCELLRANGE_SERVICE,
@@ -8631,7 +8453,7 @@ uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames()
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScTableSheetObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -8672,7 +8494,7 @@ ScTableColumnObj::~ScTableColumnObj()
 {
 }
 
-uno::Any SAL_CALL ScTableColumnObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScTableColumnObj::queryInterface( const uno::Type& rType )
 {
     SC_QUERYINTERFACE( container::XNamed )
 
@@ -8689,7 +8511,7 @@ void SAL_CALL ScTableColumnObj::release() throw()
     ScCellRangeObj::release();
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -8708,14 +8530,14 @@ uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::Runtim
     return aTypes;
 }
 
-uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId() throw(uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XNamed
 
-OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableColumnObj::getName()
 {
     SolarMutexGuard aGuard;
 
@@ -8727,7 +8549,6 @@ OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException, std::
 }
 
 void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     throw uno::RuntimeException();      // read-only
@@ -8736,7 +8557,6 @@ void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ )
 // XPropertySet erweitert fuer Spalten-Properties
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -8745,8 +8565,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnObj::getPropertySe
 }
 
 void ScTableColumnObj::SetOnePropertyValue(const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue)
-    throw(lang::IllegalArgumentException, uno::RuntimeException,
-          std::exception)
 {
     if ( pEntry )
     {
@@ -8810,7 +8628,6 @@ void ScTableColumnObj::SetOnePropertyValue(const SfxItemPropertySimpleEntry* pEn
 }
 
 void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny )
-    throw(uno::RuntimeException, std::exception)
 {
     if ( pEntry )
     {
@@ -8876,7 +8693,6 @@ ScTableRowObj::~ScTableRowObj()
 // XPropertySet erweitert fuer Zeilen-Properties
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -8885,7 +8701,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowObj::getPropertySetIn
 }
 
 void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     if ( pEntry )
     {
@@ -8960,7 +8775,6 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
 }
 
 void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny )
-    throw(uno::RuntimeException, std::exception)
 {
     if ( pEntry )
     {
@@ -9048,7 +8862,6 @@ void ScCellsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScCellsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -9056,13 +8869,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellsObj::createEnumeration()
     return nullptr;
 }
 
-uno::Type SAL_CALL ScCellsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScCellsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<table::XCell>::get();
 }
 
-sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     bool bHas = false;
@@ -9184,14 +8997,13 @@ void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XEnumeration
 
-sal_Bool SAL_CALL ScCellsEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellsEnumeration::hasMoreElements()
 {
     SolarMutexGuard aGuard;
     return !bAtEnd;
 }
 
-uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchElementException,
-                                        lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScCellsEnumeration::nextElement()
 {
     SolarMutexGuard aGuard;
     if (pDocShell && !bAtEnd)
@@ -9270,7 +9082,7 @@ ScCellRangeObj* ScCellFormatsObj::GetObjectByIndex_Impl(long nIndex) const
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScCellFormatsObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScCellFormatsObj::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -9292,8 +9104,6 @@ sal_Int32 SAL_CALL ScCellFormatsObj::getCount() throw(uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -9304,13 +9114,13 @@ uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScCellFormatsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScCellFormatsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<table::XCellRange>::get();
 }
 
-sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellFormatsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );     //! immer groesser 0 ??
@@ -9319,7 +9129,6 @@ sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException, s
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScCellFormatsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -9416,14 +9225,13 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XEnumeration
 
-sal_Bool SAL_CALL ScCellFormatsEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellFormatsEnumeration::hasMoreElements()
 {
     SolarMutexGuard aGuard;
     return !bAtEnd;
 }
 
-uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuchElementException,
-                                        lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement()
 {
     SolarMutexGuard aGuard;
 
@@ -9646,7 +9454,7 @@ ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -9654,8 +9462,6 @@ sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount() throw(uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -9665,13 +9471,13 @@ uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScUniqueCellFormatsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScUniqueCellFormatsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XSheetCellRangeContainer>::get();
 }
 
-sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( aRangeLists.size() != 0 );
@@ -9680,7 +9486,6 @@ sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() throw(uno::RuntimeExcept
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScUniqueCellFormatsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -9719,14 +9524,13 @@ void ScUniqueCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHi
 
 // XEnumeration
 
-sal_Bool SAL_CALL ScUniqueCellFormatsEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScUniqueCellFormatsEnumeration::hasMoreElements()
 {
     SolarMutexGuard aGuard;
     return static_cast<sal_uInt32>(nCurrentPosition) < aRangeLists.size();
 }
 
-uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement() throw(container::NoSuchElementException,
-                                        lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement()
 {
     SolarMutexGuard aGuard;
 
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 3b301d043372..eed7f3ecbdb2 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -95,7 +95,7 @@ namespace calc
         // for the cell)
     }
 
-    Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo(  )
     {
         return createPropertySetInfo( getInfoHelper() ) ;
     }
@@ -124,7 +124,7 @@ namespace calc
             _rValue <<= xCellAddress->getCellAddress( );
     }
 
-    Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes(  ) throw (RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes(  )
     {
         checkDisposed( );
         checkInitialized( );
@@ -154,7 +154,7 @@ namespace calc
         return aTypes;
     }
 
-    sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType )
     {
         checkDisposed( );
         checkInitialized( );
@@ -170,7 +170,7 @@ namespace calc
         return false;
     }
 
-    Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException, std::exception)
+    Any SAL_CALL OCellValueBinding::getValue( const Type& aType )
     {
         checkDisposed( );
         checkInitialized( );
@@ -255,7 +255,7 @@ namespace calc
         return aReturn;
     }
 
-    void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL OCellValueBinding::setValue( const Any& aValue )
     {
         checkDisposed( );
         checkInitialized( );
@@ -413,17 +413,17 @@ namespace calc
         }
     }
 
-    OUString SAL_CALL OCellValueBinding::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OCellValueBinding::getImplementationName(  )
     {
         return OUString( "com.sun.star.comp.sheet.OCellValueBinding" );
     }
 
-    sal_Bool SAL_CALL OCellValueBinding::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL OCellValueBinding::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames(  )
     {
         Sequence< OUString > aServices( m_bListPos ? 3 : 2 );
         aServices[ 0 ] = "com.sun.star.table.CellValueBinding";
@@ -433,13 +433,13 @@ namespace calc
         return aServices;
     }
 
-    void SAL_CALL OCellValueBinding::addModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCellValueBinding::addModifyListener( const Reference< XModifyListener >& _rxListener )
     {
        if ( _rxListener.is() )
            m_aModifyListeners.addInterface( _rxListener );
     }
 
-    void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener )
     {
        if ( _rxListener.is() )
            m_aModifyListeners.removeInterface( _rxListener );
@@ -468,12 +468,12 @@ namespace calc
         }
     }
 
-    void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ )
     {
         notifyModified();
     }
 
-    void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent )
     {
         Reference<XInterface> xCellInt( m_xCell, UNO_QUERY );
         if ( xCellInt == aEvent.Source )
@@ -484,7 +484,7 @@ namespace calc
         }
     }
 
-    void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments )
     {
         if ( m_bInitialized )
             throw Exception();
diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx
index 22ca062f50fb..4527177dbb49 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.hxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.hxx
@@ -91,21 +91,21 @@ namespace calc
         DECLARE_XTYPEPROVIDER()
 
         // XValueBinding
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getSupportedValueTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw (css::form::binding::IncompatibleTypesException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getSupportedValueTypes(  ) override;
+        virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) override;
+        virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) override;
+        virtual void SAL_CALL setValue( const css::uno::Any& aValue ) override;
 
         // OComponentHelper/XComponent
         virtual void SAL_CALL disposing() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
         // OPropertySetHelper
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
@@ -115,15 +115,15 @@ namespace calc
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
         // XModifyBroadcaster
-        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
         // XModifyListener
-        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     private:
         void    checkDisposed( ) const;
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 76b594b8d0b4..4e751b3f6672 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1020,7 +1020,6 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
 }
 
 sal_Bool SAL_CALL ScChart2DataProvider::createDataSourcePossible( const uno::Sequence< beans::PropertyValue >& aArguments )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( ! m_pDocument )
@@ -1420,7 +1419,6 @@ void shrinkToDataRange(ScDocument* pDoc, vector<ScTokenRef>& rRefTokens)
 uno::Reference< chart2::data::XDataSource> SAL_CALL
 ScChart2DataProvider::createDataSource(
     const uno::Sequence< beans::PropertyValue >& aArguments )
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( ! m_pDocument )
@@ -1780,7 +1778,6 @@ std::pair<OUString, OUString> constructKey(const uno::Reference< chart2::data::X
 
 uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArguments(
     const uno::Reference< chart2::data::XDataSource >& xDataSource )
-    throw (uno::RuntimeException, std::exception)
 {
     ::std::vector< beans::PropertyValue > aResult;
     bool bRowSourceDetected = false;
@@ -2044,7 +2041,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
 }
 
 sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( ! m_pDocument )
@@ -2060,8 +2056,6 @@ sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationP
 uno::Reference< chart2::data::XDataSequence > SAL_CALL
     ScChart2DataProvider::createDataSequenceByRangeRepresentation(
     const OUString& aRangeRepresentation )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< chart2::data::XDataSequence > xResult;
@@ -2087,13 +2081,11 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL
 uno::Reference<chart2::data::XDataSequence> SAL_CALL
 ScChart2DataProvider::createDataSequenceByValueArray(
     const OUString& /*aRole*/, const OUString& /*aRangeRepresentation*/ )
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     return uno::Reference<chart2::data::XDataSequence>();
 }
 
 uno::Reference< sheet::XRangeSelection > SAL_CALL ScChart2DataProvider::getRangeSelection()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< sheet::XRangeSelection > xResult;
 
@@ -2106,7 +2098,6 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL ScChart2DataProvider::getRange
 
 sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByFormulaTokensPossible(
     const Sequence<sheet::FormulaToken>& aTokens )
-        throw (uno::RuntimeException, std::exception)
 {
     if (aTokens.getLength() <= 0)
         return false;
@@ -2163,7 +2154,6 @@ sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByFormulaTokensPossibl
 Reference<chart2::data::XDataSequence> SAL_CALL
 ScChart2DataProvider::createDataSequenceByFormulaTokens(
     const Sequence<sheet::FormulaToken>& aTokens )
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     Reference<chart2::data::XDataSequence> xResult;
     if (aTokens.getLength() <= 0)
@@ -2233,7 +2223,6 @@ ScChart2DataProvider::createDataSequenceByFormulaTokens(
 // XRangeXMLConversion ---------------------------------------------------
 
 OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRangeRepresentation )
-    throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
 {
     OUString aRet;
     if (!m_pDocument)
@@ -2258,7 +2247,6 @@ OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRang
 }
 
 OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXMLRange )
-    throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
 {
     if (!m_pDocument)
     {
@@ -2302,7 +2290,7 @@ OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXM
 // DataProvider XPropertySet -------------------------------------------------
 
 uno::Reference< beans::XPropertySetInfo> SAL_CALL
-ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException, std::exception)
+ScChart2DataProvider::getPropertySetInfo()
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -2312,10 +2300,6 @@ ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException, std::ex
 
 void SAL_CALL ScChart2DataProvider::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
-            throw( beans::UnknownPropertyException,
-                    beans::PropertyVetoException,
-                    lang::IllegalArgumentException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
     {
@@ -2328,8 +2312,6 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue(
 
 uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue(
         const OUString& rPropertyName)
-            throw( beans::UnknownPropertyException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
@@ -2347,8 +2329,6 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue(
 void SAL_CALL ScChart2DataProvider::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/)
-            throw( beans::UnknownPropertyException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not yet implemented" );
 }
@@ -2356,8 +2336,6 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener(
 void SAL_CALL ScChart2DataProvider::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/)
-            throw( beans::UnknownPropertyException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not yet implemented" );
 }
@@ -2365,8 +2343,6 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener(
 void SAL_CALL ScChart2DataProvider::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/)
-            throw( beans::UnknownPropertyException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not yet implemented" );
 }
@@ -2374,8 +2350,6 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener(
 void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/ )
-            throw( beans::UnknownPropertyException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not yet implemented" );
 }
@@ -2406,7 +2380,7 @@ void ScChart2DataSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 }
 
 uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence> > SAL_CALL
-ScChart2DataSource::getDataSequences() throw ( uno::RuntimeException, std::exception)
+ScChart2DataSource::getDataSequences()
 {
     SolarMutexGuard aGuard;
     return comphelper::containerToSequence(m_aLabeledSequences);
@@ -2964,7 +2938,6 @@ void ScChart2DataSequence::ExternalRefListener::addFileId(sal_uInt16 nFileId)
 }
 
 uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( !m_pDocument)
@@ -2994,7 +2967,6 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
 // XNumericalDataSequence --------------------------------------------------
 
 uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( !m_pDocument)
@@ -3020,7 +2992,6 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData()
 // XTextualDataSequence --------------------------------------------------
 
 uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence<OUString> aSeq;
@@ -3053,7 +3024,6 @@ uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData()
 }
 
 OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation()
-            throw ( uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aStr;
@@ -3168,7 +3138,6 @@ private:
 }
 
 uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin)
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( !m_pDocument)
@@ -3223,7 +3192,6 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress& rPos)
 }
 
 ::sal_Int32 SAL_CALL ScChart2DataSequence::getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     BuildDataCache();
@@ -3257,7 +3225,6 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress& rPos)
 // XCloneable ================================================================
 
 uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3281,7 +3248,6 @@ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone()
 // XModifyBroadcaster ========================================================
 
 void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     // like ScCellRangesBase::addModifyListener
     SolarMutexGuard aGuard;
@@ -3321,7 +3287,6 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
 }
 
 void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     // like ScCellRangesBase::removeModifyListener
 
@@ -3364,7 +3329,7 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference<
 // DataSequence XPropertySet -------------------------------------------------
 
 uno::Reference< beans::XPropertySetInfo> SAL_CALL
-ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException, std::exception)
+ScChart2DataSequence::getPropertySetInfo()
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -3374,10 +3339,6 @@ ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException, std::ex
 
 void SAL_CALL ScChart2DataSequence::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
-            throw( beans::UnknownPropertyException,
-                    beans::PropertyVetoException,
-                    lang::IllegalArgumentException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if ( rPropertyName == SC_UNONAME_ROLE )
     {
@@ -3404,10 +3365,6 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rPropertyName)
-    throw(beans::UnknownPropertyException,
-          lang::WrappedTargetException,
-          uno::RuntimeException,
-          std::exception)
 {
     uno::Any aRet;
     if ( rPropertyName == SC_UNONAME_ROLE )
@@ -3446,8 +3403,6 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rProper
 void SAL_CALL ScChart2DataSequence::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/)
-            throw( beans::UnknownPropertyException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     // FIXME: real implementation
     OSL_FAIL( "Not yet implemented" );
@@ -3456,8 +3411,6 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener(
 void SAL_CALL ScChart2DataSequence::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/)
-            throw( beans::UnknownPropertyException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     // FIXME: real implementation
     OSL_FAIL( "Not yet implemented" );
@@ -3466,8 +3419,6 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener(
 void SAL_CALL ScChart2DataSequence::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/)
-            throw( beans::UnknownPropertyException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     // FIXME: real implementation
     OSL_FAIL( "Not yet implemented" );
@@ -3476,8 +3427,6 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener(
 void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/)
-            throw( beans::UnknownPropertyException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     // FIXME: real implementation
     OSL_FAIL( "Not yet implemented" );
@@ -3489,7 +3438,6 @@ void ScChart2DataSequence::setDataChangedHint(bool b)
 }
 
 sal_Bool ScChart2DataSequence::switchToNext(sal_Bool bWrap)
-    throw (uno::RuntimeException, std::exception)
 {
     if(!mbTimeBased)
         return true;
@@ -3523,7 +3471,6 @@ sal_Bool ScChart2DataSequence::switchToNext(sal_Bool bWrap)
 }
 
 void ScChart2DataSequence::setRange(sal_Int32 nStart, sal_Int32 nEnd)
-    throw (uno::RuntimeException, std::exception)
 {
     mnTimeBasedStart = nStart;
     mnTimeBasedEnd = nEnd;
@@ -3531,7 +3478,6 @@ void ScChart2DataSequence::setRange(sal_Int32 nStart, sal_Int32 nEnd)
 }
 
 sal_Bool ScChart2DataSequence::setToPointInTime(sal_Int32 nPoint)
-    throw (uno::RuntimeException, std::exception)
 {
     if(nPoint > mnTimeBasedEnd - mnTimeBasedStart)
         return false;
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 124245fddd08..b2c5bec2b25c 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -166,8 +166,6 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName,
                                         const awt::Rectangle& aRect,
                                         const uno::Sequence<table::CellRangeAddress>& aRanges,
                                         sal_Bool bColumnHeaders, sal_Bool bRowHeaders )
-                                    throw(css::uno::RuntimeException,
-                                          std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pDocShell)
@@ -296,7 +294,6 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName,
 }
 
 void SAL_CALL ScChartsObj::removeByName( const OUString& aName )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SdrOle2Obj* pObj = lcl_FindChartObj( pDocShell, nTab, aName );
@@ -317,7 +314,6 @@ void SAL_CALL ScChartsObj::removeByName( const OUString& aName )
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableChartsEnumeration"));
@@ -325,7 +321,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration(
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScChartsObj::getCount()
 {
     SolarMutexGuard aGuard;
     sal_Int32 nCount = 0;
@@ -354,8 +350,6 @@ sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException, std::exc
 }
 
 uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XTableChart> xChart(GetObjectByIndex_Impl(nIndex));
@@ -365,21 +359,19 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScChartsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScChartsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<table::XTableChart>::get();
 }
 
-sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScChartsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return getCount() != 0;
 }
 
 uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XTableChart> xChart(GetObjectByName_Impl(aName));
@@ -389,7 +381,7 @@ uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName )
         throw container::NoSuchElementException();
 }
 
-uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -434,7 +426,6 @@ uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::Runti
 }
 
 sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return ( lcl_FindChartObj( pDocShell, nTab, aName ) != nullptr );
@@ -557,7 +548,6 @@ void ScChartObj::Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, b
 }
 
 void ScChartObj::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue )
-    throw (uno::Exception, std::exception)
 {
     switch ( nHandle )
     {
@@ -651,7 +641,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScChartObj, ScChartObj_Base, ScChartObj_PBase
 
 // XTableChart
 
-sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders()
 {
     SolarMutexGuard aGuard;
     ScRangeListRef xRanges = new ScRangeList;
@@ -661,8 +651,6 @@ sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException,
 }
 
 void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders )
-    throw(uno::RuntimeException,
-          std::exception)
 {
     SolarMutexGuard aGuard;
     ScRangeListRef xRanges = new ScRangeList;
@@ -672,7 +660,7 @@ void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders )
         Update_Impl( xRanges, bHasColumnHeaders, bOldRowHeaders );
 }
 
-sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScChartObj::getHasRowHeaders()
 {
     SolarMutexGuard aGuard;
     ScRangeListRef xRanges = new ScRangeList;
@@ -682,7 +670,6 @@ sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() throw(uno::RuntimeException, st
 }
 
 void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScRangeListRef xRanges = new ScRangeList;
@@ -692,7 +679,7 @@ void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders )
         Update_Impl( xRanges, bOldColHeaders, bHasRowHeaders );
 }
 
-uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(uno::RuntimeException, std::exception)
+uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges()
 {
     SolarMutexGuard aGuard;
     ScRangeListRef xRanges = new ScRangeList;
@@ -725,7 +712,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(un
 }
 
 void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress>& aRanges )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScRangeListRef xOldRanges = new ScRangeList;
@@ -752,7 +738,7 @@ void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress
 
 // XEmbeddedObjectSupplier
 
-uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw(uno::RuntimeException, std::exception)
+uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject()
 {
     SolarMutexGuard aGuard;
     SdrOle2Obj* pObject = lcl_FindChartObj( pDocShell, nTab, aChartName );
@@ -767,13 +753,13 @@ uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw(
 
 // XNamed
 
-OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScChartObj::getName()
 {
     SolarMutexGuard aGuard;
     return aChartName;
 }
 
-void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScChartObj::setName( const OUString& /* aName */ )
 {
     SolarMutexGuard aGuard;
     throw uno::RuntimeException();      // name cannot be changed
@@ -781,7 +767,7 @@ void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) throw(uno::Runt
 
 // XPropertySet
 
-uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() ) ;
 }
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index 58f6371bddcc..2e541a5912dd 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -331,7 +331,6 @@ void ScCondFormatsObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 }
 
 sal_Int32 ScCondFormatsObj::createByRange(const uno::Reference< sheet::XSheetCellRanges >& xRanges)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!mpDocShell)
@@ -362,7 +361,6 @@ sal_Int32 ScCondFormatsObj::createByRange(const uno::Reference< sheet::XSheetCel
 }
 
 void ScCondFormatsObj::removeByID(const sal_Int32 nID)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScConditionalFormatList* pFormatList = getCoreObject();
@@ -370,7 +368,6 @@ void ScCondFormatsObj::removeByID(const sal_Int32 nID)
 }
 
 uno::Sequence<uno::Reference<sheet::XConditionalFormat> > ScCondFormatsObj::getConditionalFormats()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScConditionalFormatList* pFormatList = getCoreObject();
@@ -386,7 +383,6 @@ uno::Sequence<uno::Reference<sheet::XConditionalFormat> > ScCondFormatsObj::getC
 }
 
 sal_Int32 ScCondFormatsObj::getLength()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScConditionalFormatList* pFormatList = getCoreObject();
@@ -469,7 +465,6 @@ ScDocShell* ScCondFormatObj::getDocShell()
 }
 
 void ScCondFormatObj::createEntry(const sal_Int32 nType, const sal_Int32 nPos)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScConditionalFormat* pFormat = getCoreObject();
@@ -508,7 +503,6 @@ void ScCondFormatObj::createEntry(const sal_Int32 nType, const sal_Int32 nPos)
 }
 
 void ScCondFormatObj::removeByIndex(const sal_Int32 nIndex)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (getCoreObject()->size() >= size_t(nIndex))
@@ -518,13 +512,11 @@ void ScCondFormatObj::removeByIndex(const sal_Int32 nIndex)
 }
 
 uno::Type ScCondFormatObj::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<beans::XPropertySet>::get();
 }
 
 sal_Bool ScCondFormatObj::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScConditionalFormat* pFormat = getCoreObject();
@@ -532,7 +524,6 @@ sal_Bool ScCondFormatObj::hasElements()
 }
 
 sal_Int32 ScCondFormatObj::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScConditionalFormat* pFormat = getCoreObject();
@@ -541,7 +532,6 @@ sal_Int32 ScCondFormatObj::getCount()
 }
 
 uno::Any ScCondFormatObj::getByIndex(sal_Int32 nIndex)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (getCoreObject()->size() <= size_t(nIndex))
@@ -554,7 +544,6 @@ uno::Any ScCondFormatObj::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondFormatObj::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -564,9 +553,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondFormatObj::getPropertySet
 
 void SAL_CALL ScCondFormatObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -605,8 +591,6 @@ void SAL_CALL ScCondFormatObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScCondFormatObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -637,32 +621,24 @@ uno::Any SAL_CALL ScCondFormatObj::getPropertyValue( const OUString& aPropertyNa
 
 void SAL_CALL ScCondFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScCondFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScCondFormatObj::addVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScCondFormatObj::removeVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
@@ -704,13 +680,11 @@ ScCondFormatEntry* ScConditionEntryObj::getCoreObject()
 }
 
 sal_Int32 ScConditionEntryObj::getType()
-    throw(uno::RuntimeException, std::exception)
 {
     return sheet::ConditionEntryType::CONDITION;
 }
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScConditionEntryObj::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     static uno::Reference<beans::XPropertySetInfo> aRef(
         new SfxItemPropertySetInfo( maPropSet.getPropertyMap() ));
@@ -719,9 +693,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScConditionEntryObj::getPropert
 
 void SAL_CALL ScConditionEntryObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -783,8 +754,6 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScConditionEntryObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -834,32 +803,24 @@ uno::Any SAL_CALL ScConditionEntryObj::getPropertyValue( const OUString& aProper
 
 void SAL_CALL ScConditionEntryObj::addPropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScConditionEntryObj::removePropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScConditionEntryObj::addVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScConditionEntryObj::removeVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
@@ -886,13 +847,11 @@ ScColorScaleFormat* ScColorScaleFormatObj::getCoreObject()
 }
 
 sal_Int32 ScColorScaleFormatObj::getType()
-    throw(uno::RuntimeException, std::exception)
 {
     return sheet::ConditionEntryType::COLORSCALE;
 }
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScColorScaleFormatObj::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     static uno::Reference<beans::XPropertySetInfo> aRef(
         new SfxItemPropertySetInfo( maPropSet.getPropertyMap() ));
@@ -939,9 +898,6 @@ void setColorScaleEntry(ScColorScaleEntry* pEntry, uno::Reference<sheet::XColorS
 
 void SAL_CALL ScColorScaleFormatObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -977,8 +933,6 @@ void SAL_CALL ScColorScaleFormatObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScColorScaleFormatObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1010,32 +964,24 @@ uno::Any SAL_CALL ScColorScaleFormatObj::getPropertyValue( const OUString& aProp
 
 void SAL_CALL ScColorScaleFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScColorScaleFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScColorScaleFormatObj::addVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScColorScaleFormatObj::removeVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
@@ -1061,20 +1007,17 @@ ScColorScaleEntry* ScColorScaleEntryObj::getCoreObject()
 }
 
 util::Color ScColorScaleEntryObj::getColor()
-    throw(uno::RuntimeException, std::exception)
 {
     Color aColor = getCoreObject()->GetColor();
     return aColor.GetColor();
 }
 
 void ScColorScaleEntryObj::setColor(util::Color aColor)
-    throw(uno::RuntimeException, std::exception)
 {
     getCoreObject()->SetColor(Color(aColor));
 }
 
 sal_Int32 ScColorScaleEntryObj::getType()
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     for (ColorScaleEntryTypeApiMap & rEntry : aColorScaleEntryTypeMap)
@@ -1089,7 +1032,6 @@ sal_Int32 ScColorScaleEntryObj::getType()
 }
 
 void ScColorScaleEntryObj::setType(sal_Int32 nType)
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     for (ColorScaleEntryTypeApiMap & rEntry : aColorScaleEntryTypeMap)
@@ -1104,7 +1046,6 @@ void ScColorScaleEntryObj::setType(sal_Int32 nType)
 }
 
 OUString ScColorScaleEntryObj::getFormula()
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     switch (pEntry->GetType())
@@ -1120,7 +1061,6 @@ OUString ScColorScaleEntryObj::getFormula()
 }
 
 void ScColorScaleEntryObj::setFormula(const OUString& rFormula)
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     switch (pEntry->GetType())
@@ -1158,13 +1098,11 @@ ScDataBarFormat* ScDataBarFormatObj::getCoreObject()
 }
 
 sal_Int32 ScDataBarFormatObj::getType()
-    throw(uno::RuntimeException, std::exception)
 {
     return sheet::ConditionEntryType::DATABAR;
 }
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDataBarFormatObj::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -1211,9 +1149,6 @@ void setDataBarEntry(ScColorScaleEntry* pEntry, uno::Reference<sheet::XDataBarEn
 
 void SAL_CALL ScDataBarFormatObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1342,8 +1277,6 @@ void SAL_CALL ScDataBarFormatObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScDataBarFormatObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1420,32 +1353,24 @@ uno::Any SAL_CALL ScDataBarFormatObj::getPropertyValue( const OUString& aPropert
 
 void SAL_CALL ScDataBarFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScDataBarFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScDataBarFormatObj::addVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScDataBarFormatObj::removeVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
@@ -1474,7 +1399,6 @@ ScColorScaleEntry* ScDataBarEntryObj::getCoreObject()
 }
 
 sal_Int32 ScDataBarEntryObj::getType()
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     for (DataBarEntryTypeApiMap & rEntry : aDataBarEntryTypeMap)
@@ -1489,7 +1413,6 @@ sal_Int32 ScDataBarEntryObj::getType()
 }
 
 void ScDataBarEntryObj::setType(sal_Int32 nType)
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     for (DataBarEntryTypeApiMap & rEntry : aDataBarEntryTypeMap)
@@ -1504,7 +1427,6 @@ void ScDataBarEntryObj::setType(sal_Int32 nType)
 }
 
 OUString ScDataBarEntryObj::getFormula()
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     switch (pEntry->GetType())
@@ -1520,7 +1442,6 @@ OUString ScDataBarEntryObj::getFormula()
 }
 
 void ScDataBarEntryObj::setFormula(const OUString& rFormula)
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     switch (pEntry->GetType())
@@ -1558,13 +1479,11 @@ ScIconSetFormat* ScIconSetFormatObj::getCoreObject()
 }
 
 sal_Int32 ScIconSetFormatObj::getType()
-    throw(uno::RuntimeException, std::exception)
 {
     return sheet::ConditionEntryType::ICONSET;
 }
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScIconSetFormatObj::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -1612,9 +1531,6 @@ void setIconSetEntry(ScIconSetFormat* pFormat, uno::Reference<sheet::XIconSetEnt
 
 void SAL_CALL ScIconSetFormatObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1687,8 +1603,6 @@ void SAL_CALL ScIconSetFormatObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScIconSetFormatObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1739,32 +1653,24 @@ uno::Any SAL_CALL ScIconSetFormatObj::getPropertyValue( const OUString& aPropert
 
 void SAL_CALL ScIconSetFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScIconSetFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScIconSetFormatObj::addVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScIconSetFormatObj::removeVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
@@ -1790,7 +1696,6 @@ ScColorScaleEntry* ScIconSetEntryObj::getCoreObject()
 }
 
 sal_Int32 ScIconSetEntryObj::getType()
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     // the first entry always is minimum
@@ -1809,7 +1714,6 @@ sal_Int32 ScIconSetEntryObj::getType()
 }
 
 void ScIconSetEntryObj::setType(sal_Int32 nType)
-    throw(uno::RuntimeException, std::exception)
 {
     // first entry is always MIN
     if (mnPos == 0)
@@ -1828,7 +1732,6 @@ void ScIconSetEntryObj::setType(sal_Int32 nType)
 }
 
 OUString ScIconSetEntryObj::getFormula()
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     switch (pEntry->GetType())
@@ -1844,7 +1747,6 @@ OUString ScIconSetEntryObj::getFormula()
 }
 
 void ScIconSetEntryObj::setFormula(const OUString& rFormula)
-    throw(uno::RuntimeException, std::exception)
 {
     ScColorScaleEntry* pEntry = getCoreObject();
     switch (pEntry->GetType())
@@ -1881,13 +1783,11 @@ ScCondDateFormatEntry* ScCondDateFormatObj::getCoreObject()
 }
 
 sal_Int32 ScCondDateFormatObj::getType()
-    throw(uno::RuntimeException, std::exception)
 {
     return sheet::ConditionEntryType::DATE;
 }
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondDateFormatObj::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -1897,9 +1797,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondDateFormatObj::getPropert
 
 void SAL_CALL ScCondDateFormatObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1943,8 +1840,6 @@ void SAL_CALL ScCondDateFormatObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScCondDateFormatObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1984,32 +1879,24 @@ uno::Any SAL_CALL ScCondDateFormatObj::getPropertyValue( const OUString& aProper
 
 void SAL_CALL ScCondDateFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScCondDateFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */,
                             const uno::Reference<beans::XPropertyChangeListener>& /* aListener */)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScCondDateFormatObj::addVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
 
 void SAL_CALL ScCondDateFormatObj::removeVetoableChangeListener( const OUString&,
                             const uno::Reference<beans::XVetoableChangeListener>&)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SAL_WARN("sc", "not implemented");
 }
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index b4a43981531c..0285c94ea007 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -110,7 +110,6 @@ void ScDocumentConfiguration::Notify( SfxBroadcaster&, const SfxHint& rHint )
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocumentConfiguration::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -120,9 +119,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocumentConfiguration::getPro
 
 void SAL_CALL ScDocumentConfiguration::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -360,8 +356,6 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -527,19 +521,17 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration )
 
 // XServiceInfo
-OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDocumentConfiguration::getImplementationName()
 {
     return OUString( "ScDocumentConfiguration" );
 }
 
 sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {"com.sun.star.comp.SpreadsheetSettings",
             "com.sun.star.document.Settings"};
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index fd30a8a048c1..43a2a76e7a16 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -46,7 +46,7 @@ ScCellCursorObj::~ScCellCursorObj()
 {
 }
 
-uno::Any SAL_CALL ScCellCursorObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScCellCursorObj::queryInterface( const uno::Type& rType )
 {
     SC_QUERYINTERFACE( sheet::XSheetCellCursor )
     SC_QUERYINTERFACE( sheet::XUsedAreaCursor )
@@ -65,7 +65,7 @@ void SAL_CALL ScCellCursorObj::release() throw()
     ScCellRangeObj::release();
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -86,14 +86,14 @@ uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::Runtime
     return aTypes;
 }
 
-uno::Sequence<sal_Int8> SAL_CALL ScCellCursorObj::getImplementationId() throw(uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL ScCellCursorObj::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XSheetCellCursor
 
-void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellCursorObj::collapseToCurrentRegion()
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -119,7 +119,6 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeExcep
 }
 
 void SAL_CALL ScCellCursorObj::collapseToCurrentArray()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -151,7 +150,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray()
     }*/
 }
 
-void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellCursorObj::collapseToMergedArea()
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -169,7 +168,7 @@ void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeExceptio
     }
 }
 
-void SAL_CALL ScCellCursorObj::expandToEntireColumns() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellCursorObj::expandToEntireColumns()
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -182,7 +181,7 @@ void SAL_CALL ScCellCursorObj::expandToEntireColumns() throw(uno::RuntimeExcepti
     SetNewRange( aNewRange );
 }
 
-void SAL_CALL ScCellCursorObj::expandToEntireRows() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellCursorObj::expandToEntireRows()
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -196,7 +195,6 @@ void SAL_CALL ScCellCursorObj::expandToEntireRows() throw(uno::RuntimeException,
 }
 
 void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRows )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( nColumns <= 0 || nRows <= 0 )
@@ -232,7 +230,6 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo
 // XUsedAreaCursor
 
 void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea(sal_Bool bExpand)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -260,7 +257,6 @@ void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea(sal_Bool bExpand)
 }
 
 void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDocShell* pDocSh = GetDocShell();
@@ -289,7 +285,7 @@ void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand )
 
 // XCellCursor
 
-void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellCursorObj::gotoStart()
 {
     //  this is similar to collapseToCurrentRegion
     //! something like gotoEdge with 4 possible directions is needed
@@ -317,7 +313,7 @@ void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException, std::exc
     }
 }
 
-void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellCursorObj::gotoEnd()
 {
     //  this is similar to collapseToCurrentRegion
     //! something like gotoEdge with 4 possible directions is needed
@@ -345,7 +341,7 @@ void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException, std::excep
     }
 }
 
-void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellCursorObj::gotoNext()
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -367,7 +363,7 @@ void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException, std::exce
     SetNewRange( ScRange( nNewX, nNewY, nTab ) );
 }
 
-void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScCellCursorObj::gotoPrevious()
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -390,7 +386,6 @@ void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException, std::
 }
 
 void SAL_CALL ScCellCursorObj::gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScRangeList& rRanges = GetRangeList();
@@ -416,7 +411,6 @@ void SAL_CALL ScCellCursorObj::gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nR
 // XSheetCellRange
 
 uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellCursorObj::getSpreadsheet()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return ScCellRangeObj::getSpreadsheet();
@@ -426,7 +420,6 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellCursorObj::getSpreadsheet()
 
 uno::Reference<table::XCell> SAL_CALL ScCellCursorObj::getCellByPosition(
                                         sal_Int32 nColumn, sal_Int32 nRow )
-                                throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return ScCellRangeObj::getCellByPosition(nColumn,nRow);
@@ -434,14 +427,13 @@ uno::Reference<table::XCell> SAL_CALL ScCellCursorObj::getCellByPosition(
 
 uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByPosition(
                 sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
-                                throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return ScCellRangeObj::getCellRangeByPosition(nLeft,nTop,nRight,nBottom);
 }
 
 uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName(
-                        const OUString& rRange ) throw(uno::RuntimeException, std::exception)
+                        const OUString& rRange )
 {
     SolarMutexGuard aGuard;
     return ScCellRangeObj::getCellRangeByName(rRange);
@@ -449,19 +441,17 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName(
 
 // XServiceInfo
 
-OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellCursorObj::getImplementationName()
 {
     return OUString( "ScCellCursorObj" );
 }
 
 sal_Bool SAL_CALL ScCellCursorObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     //  get all service names from cell range
     uno::Sequence<OUString> aParentSeq(ScCellRangeObj::getSupportedServiceNames());
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index ecff34578f60..b5d0bccf66eb 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -350,7 +350,6 @@ ScDataPilotTableObj* ScDataPilotTablesObj::GetObjectByName_Impl(const OUString&
 }
 
 Reference<XDataPilotDescriptor> SAL_CALL ScDataPilotTablesObj::createDataPilotDescriptor()
-                                            throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -398,7 +397,6 @@ static OUString lcl_GetOriginalName(const Reference< XNamed >& rDim)
 void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName,
     const CellAddress& aOutputAddress,
     const Reference<XDataPilotDescriptor>& xDescriptor )
-        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!xDescriptor.is()) return;
@@ -437,7 +435,6 @@ void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName,
 }
 
 void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName )
-                                        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = lcl_GetDPObject( pDocShell, nTab, aName );
@@ -452,7 +449,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName )
 
 // XEnumerationAccess
 
-Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() throw(RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration()
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotTablesEnumeration"));
@@ -460,7 +457,7 @@ Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() thr
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount()
 {
     SolarMutexGuard aGuard;
     if ( pDocShell )
@@ -487,7 +484,6 @@ sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException, std:
 }
 
 Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex )
-        throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Reference<XDataPilotTable2> xTable(GetObjectByIndex_Impl(nIndex));
@@ -496,13 +492,13 @@ Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex )
     return Any( xTable );
 }
 
-uno::Type SAL_CALL ScDataPilotTablesObj::getElementType() throw(RuntimeException, std::exception)
+uno::Type SAL_CALL ScDataPilotTablesObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<XDataPilotTable2>::get();
 }
 
-sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -511,7 +507,6 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException, st
 // XNameAccess
 
 Any SAL_CALL ScDataPilotTablesObj::getByName( const OUString& aName )
-        throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Reference<XDataPilotTable2> xTable(GetObjectByName_Impl(aName));
@@ -521,7 +516,6 @@ Any SAL_CALL ScDataPilotTablesObj::getByName( const OUString& aName )
 }
 
 Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -559,7 +553,6 @@ Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName )
-                                        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -597,7 +590,6 @@ ScDataPilotDescriptorBase::~ScDataPilotDescriptorBase()
 }
 
 Any SAL_CALL ScDataPilotDescriptorBase::queryInterface( const uno::Type& rType )
-                                                throw(RuntimeException, std::exception)
 {
     SC_QUERYINTERFACE( XDataPilotDescriptor )
     SC_QUERYINTERFACE( XPropertySet )
@@ -621,7 +613,6 @@ void SAL_CALL ScDataPilotDescriptorBase::release() throw()
 }
 
 Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes()
-                                                    throw(RuntimeException, std::exception)
 {
     static Sequence< uno::Type > aTypes;
     if ( aTypes.getLength() == 0 )
@@ -639,7 +630,6 @@ Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes()
 }
 
 Sequence<sal_Int8> SAL_CALL ScDataPilotDescriptorBase::getImplementationId()
-                                                    throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -657,7 +647,6 @@ void ScDataPilotDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
 // XDataPilotDescriptor
 
 CellRangeAddress SAL_CALL ScDataPilotDescriptorBase::getSourceRange()
-                                            throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -671,7 +660,7 @@ CellRangeAddress SAL_CALL ScDataPilotDescriptorBase::getSourceRange()
     return aRet;
 }
 
-void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& aSourceRange ) throw(RuntimeException, std::exception)
+void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& aSourceRange )
 {
     SolarMutexGuard aGuard;
 
@@ -691,49 +680,42 @@ void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress&
 }
 
 Reference<XSheetFilterDescriptor> SAL_CALL ScDataPilotDescriptorBase::getFilterDescriptor()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScDataPilotFilterDescriptor( pDocShell, this );
 }
 
 Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getDataPilotFields()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScDataPilotFieldsObj( *this );
 }
 
 Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getColumnFields()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_COLUMN );
 }
 
 Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getRowFields()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_ROW );
 }
 
 Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getPageFields()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_PAGE );
 }
 
 Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getDataFields()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_DATA );
 }
 
 Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getHiddenFields()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_HIDDEN );
@@ -741,7 +723,6 @@ Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getHiddenFields()
 
 // XPropertySet
 Reference< XPropertySetInfo > SAL_CALL ScDataPilotDescriptorBase::getPropertySetInfo(  )
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static Reference<XPropertySetInfo> aRef =
@@ -750,8 +731,6 @@ Reference< XPropertySetInfo > SAL_CALL ScDataPilotDescriptorBase::getPropertySet
 }
 
 void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
-        throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException,
-                WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObject = GetDPObject();
@@ -895,8 +874,6 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp
 }
 
 Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPropertyName )
-        throw (UnknownPropertyException, WrappedTargetException,
-               RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Any aRet;
@@ -1007,32 +984,27 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope
 
 void SAL_CALL ScDataPilotDescriptorBase::addPropertyChangeListener(
         const OUString& /* aPropertyName */, const Reference<XPropertyChangeListener >& /* xListener */ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ScDataPilotDescriptorBase::removePropertyChangeListener(
         const OUString& /* aPropertyName */, const Reference<XPropertyChangeListener >& /* aListener */ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ScDataPilotDescriptorBase::addVetoableChangeListener(
         const OUString& /* PropertyName */, const Reference<XVetoableChangeListener >& /* aListener */ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ScDataPilotDescriptorBase::removeVetoableChangeListener(
         const OUString& /* PropertyName */, const Reference<XVetoableChangeListener >& /* aListener */ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 // XDataPilotDataLayoutFieldSupplier
 
 Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutField()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( ScDPObject* pDPObject = GetDPObject() )
@@ -1052,7 +1024,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScDataPilotDescriptorBase::getSomething(
-                const Sequence<sal_Int8 >& rId ) throw(RuntimeException, std::exception)
+                const Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -1095,7 +1067,6 @@ ScDataPilotTableObj::~ScDataPilotTableObj()
 }
 
 Any SAL_CALL ScDataPilotTableObj::queryInterface( const uno::Type& rType )
-                                                throw(RuntimeException, std::exception)
 {
     // since we manually do resolve the query for XDataPilotTable2
     // we also need to do the same for XDataPilotTable
@@ -1116,7 +1087,7 @@ void SAL_CALL ScDataPilotTableObj::release() throw()
     ScDataPilotDescriptorBase::release();
 }
 
-Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeException, std::exception)
+Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes()
 {
     static Sequence< uno::Type > aTypes;
     if ( aTypes.getLength() == 0 )
@@ -1137,7 +1108,6 @@ Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeExce
 }
 
 Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId()
-                                                    throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1160,7 +1130,7 @@ void ScDataPilotTableObj::SetDPObject( ScDPObject* pDPObject )
 
 // "rest of XDataPilotDescriptor"
 
-OUString SAL_CALL ScDataPilotTableObj::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ScDataPilotTableObj::getName()
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName);
@@ -1170,7 +1140,6 @@ OUString SAL_CALL ScDataPilotTableObj::getName() throw(RuntimeException, std::ex
 }
 
 void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName )
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName);
@@ -1186,7 +1155,7 @@ void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName )
     }
 }
 
-OUString SAL_CALL ScDataPilotTableObj::getTag() throw(RuntimeException, std::exception)
+OUString SAL_CALL ScDataPilotTableObj::getTag()
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName);
@@ -1196,7 +1165,6 @@ OUString SAL_CALL ScDataPilotTableObj::getTag() throw(RuntimeException, std::exc
 }
 
 void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag )
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName);
@@ -1211,7 +1179,7 @@ void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag )
 
 // XDataPilotTable
 
-CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeException, std::exception)
+CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange()
 {
     SolarMutexGuard aGuard;
     CellRangeAddress aRet;
@@ -1228,7 +1196,7 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeExc
     return aRet;
 }
 
-void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException, std::exception)
+void SAL_CALL ScDataPilotTableObj::refresh()
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName);
@@ -1240,7 +1208,6 @@ void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException, std::except
 }
 
 Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const CellAddress& aAddr)
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Sequence< Sequence<Any> > aTabData;
@@ -1254,7 +1221,6 @@ Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const C
 }
 
 DataPilotTablePositionData SAL_CALL ScDataPilotTableObj::getPositionData(const CellAddress& aAddr)
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     DataPilotTablePositionData aPosData;
@@ -1268,7 +1234,6 @@ DataPilotTablePositionData SAL_CALL ScDataPilotTableObj::getPositionData(const C
 }
 
 void SAL_CALL ScDataPilotTableObj::insertDrillDownSheet(const CellAddress& aAddr)
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = GetDPObject();
@@ -1285,7 +1250,6 @@ void SAL_CALL ScDataPilotTableObj::insertDrillDownSheet(const CellAddress& aAddr
 }
 
 CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRangeByType( sal_Int32 nType )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nType < 0 || nType > DataPilotOutputRangeType::RESULT)
@@ -1298,7 +1262,6 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRangeByType( sal_Int32 n
 }
 
 void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util::XModifyListener>& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1311,7 +1274,6 @@ void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util:
 }
 
 void SAL_CALL ScDataPilotTableObj::removeModifyListener( const uno::Reference<util::XModifyListener>& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1412,27 +1374,25 @@ void ScDataPilotDescriptor::SetDPObject( ScDPObject* pDPObject )
 
 // "rest of XDataPilotDescriptor"
 
-OUString SAL_CALL ScDataPilotDescriptor::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ScDataPilotDescriptor::getName()
 {
     SolarMutexGuard aGuard;
     return mpDPObject->GetName();
 }
 
 void SAL_CALL ScDataPilotDescriptor::setName( const OUString& aNewName )
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     mpDPObject->SetName( aNewName );
 }
 
-OUString SAL_CALL ScDataPilotDescriptor::getTag() throw(RuntimeException, std::exception)
+OUString SAL_CALL ScDataPilotDescriptor::getTag()
 {
     SolarMutexGuard aGuard;
     return mpDPObject->GetTag();
 }
 
 void SAL_CALL ScDataPilotDescriptor::setTag( const OUString& aNewTag )
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     mpDPObject->SetTag( aNewTag );
@@ -1707,7 +1667,6 @@ ScDataPilotFieldObj* ScDataPilotFieldsObj::GetObjectByName_Impl(const OUString&
 // XEnumerationAccess
 
 Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration()
-                                                    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotFieldsEnumeration"));
@@ -1715,7 +1674,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration()
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount()
 {
     SolarMutexGuard aGuard;
 // TODO
@@ -1724,7 +1683,6 @@ sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() throw(RuntimeException, std:
 }
 
 Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex )
-        throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Reference< XPropertySet > xField( GetObjectByIndex_Impl( nIndex ) );
@@ -1733,20 +1691,19 @@ Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex )
     return Any( xField );
 }
 
-uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType() throw(RuntimeException, std::exception)
+uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<XPropertySet>::get();
 }
 
-sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
 }
 
 Any SAL_CALL ScDataPilotFieldsObj::getByName( const OUString& aName )
-        throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Reference<XPropertySet> xField(GetObjectByName_Impl(aName));
@@ -1756,7 +1713,6 @@ Any SAL_CALL ScDataPilotFieldsObj::getByName( const OUString& aName )
 }
 
 Sequence<OUString> SAL_CALL ScDataPilotFieldsObj::getElementNames()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 // TODO
@@ -1780,7 +1736,6 @@ Sequence<OUString> SAL_CALL ScDataPilotFieldsObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScDataPilotFieldsObj::hasByName( const OUString& aName )
-                                        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1809,7 +1764,6 @@ ScDataPilotFieldObj::~ScDataPilotFieldObj()
 // XNamed
 
 OUString SAL_CALL ScDataPilotFieldObj::getName()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aName;
@@ -1829,7 +1783,6 @@ OUString SAL_CALL ScDataPilotFieldObj::getName()
 }
 
 void SAL_CALL ScDataPilotFieldObj::setName(const OUString& rName)
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = nullptr;
@@ -1844,7 +1797,6 @@ void SAL_CALL ScDataPilotFieldObj::setName(const OUString& rName)
 // XPropertySet
 
 Reference<XPropertySetInfo> SAL_CALL ScDataPilotFieldObj::getPropertySetInfo()
-                                                        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static Reference<XPropertySetInfo> aRef(
@@ -1853,9 +1805,6 @@ Reference<XPropertySetInfo> SAL_CALL ScDataPilotFieldObj::getPropertySetInfo()
 }
 
 void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
-        throw (UnknownPropertyException, PropertyVetoException,
-               IllegalArgumentException, WrappedTargetException,
-               RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( aPropertyName == SC_UNONAME_FUNCTION )
@@ -1973,8 +1922,6 @@ void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyNa
 }
 
 Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyName )
-        throw (UnknownPropertyException, WrappedTargetException,
-               RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Any aRet;
@@ -2068,7 +2015,6 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam
 // XDatePilotField
 
 Reference<XIndexAccess> SAL_CALL ScDataPilotFieldObj::getItems()
-                throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!mxItems.is())
@@ -2563,8 +2509,6 @@ bool ScDataPilotFieldObj::HasString(const Sequence< OUString >& rItems, const OU
 
 // XDataPilotFieldGrouping
 Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( const Sequence< OUString >& rItems )
-         throw (RuntimeException, IllegalArgumentException,
-                std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2733,8 +2677,6 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons
 }
 
 Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( const DataPilotFieldGroupInfo& rInfo )
-        throw (RuntimeException, IllegalArgumentException,
-               std::exception)
 {
     SolarMutexGuard aGuard;
     using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy;
@@ -2900,7 +2842,6 @@ ScDataPilotFieldGroupsObj::~ScDataPilotFieldGroupsObj()
 // XNameAccess
 
 Any SAL_CALL ScDataPilotFieldGroupsObj::getByName( const OUString& rName )
-        throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( implFindByName( rName ) == maGroups.end() )
@@ -2908,7 +2849,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByName( const OUString& rName )
     return Any( Reference< XNameAccess >( new ScDataPilotFieldGroupObj( *this, rName ) ) );
 }
 
-Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames()
 {
     SolarMutexGuard aGuard;
     Sequence< OUString > aSeq;
@@ -2922,7 +2863,7 @@ Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() throw
     return aSeq;
 }
 
-sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
     return implFindByName( rName ) != maGroups.end();
@@ -2931,7 +2872,6 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName )
 // XNameReplace
 
 void SAL_CALL ScDataPilotFieldGroupsObj::replaceByName( const OUString& rName, const Any& rElement )
-        throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2954,7 +2894,6 @@ void SAL_CALL ScDataPilotFieldGroupsObj::replaceByName( const OUString& rName, c
 // XNameContainer
 
 void SAL_CALL ScDataPilotFieldGroupsObj::insertByName( const OUString& rName, const Any& rElement )
-        throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2978,7 +2917,6 @@ void SAL_CALL ScDataPilotFieldGroupsObj::insertByName( const OUString& rName, co
 }
 
 void SAL_CALL ScDataPilotFieldGroupsObj::removeByName( const OUString& rName )
-        throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2994,14 +2932,13 @@ void SAL_CALL ScDataPilotFieldGroupsObj::removeByName( const OUString& rName )
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScDataPilotFieldGroupsObj::getCount() throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScDataPilotFieldGroupsObj::getCount()
 {
     SolarMutexGuard aGuard;
     return static_cast< sal_Int32 >( maGroups.size() );
 }
 
 Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex )
-        throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ((nIndex < 0) || (nIndex >= static_cast< sal_Int32 >( maGroups.size() )))
@@ -3011,7 +2948,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex )
 
 // XEnumerationAccess
 
-Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() throw(RuntimeException, std::exception)
+Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration()
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) );
@@ -3019,13 +2956,13 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration()
 
 // XElementAccess
 
-uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType() throw(RuntimeException, std::exception)
+uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<XNameAccess>::get();
 }
 
-sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return !maGroups.empty();
@@ -3033,7 +2970,7 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeExceptio
 
 // implementation
 
-ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName ) throw(RuntimeException)
+ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName )
 {
     SolarMutexGuard aGuard;
     ScFieldGroups::iterator aIt = implFindByName( rName );
@@ -3042,7 +2979,7 @@ ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName )
      return *aIt;
 }
 
-void ScDataPilotFieldGroupsObj::renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) throw(RuntimeException)
+void ScDataPilotFieldGroupsObj::renameFieldGroup( const OUString& rOldName, const OUString& rNewName )
 {
     SolarMutexGuard aGuard;
     ScFieldGroups::iterator aOldIt = implFindByName( rOldName );
@@ -3092,7 +3029,6 @@ ScDataPilotFieldGroupObj::~ScDataPilotFieldGroupObj()
 // XNameAccess
 
 Any SAL_CALL ScDataPilotFieldGroupObj::getByName( const OUString& rName )
-        throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers;
@@ -3102,13 +3038,13 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByName( const OUString& rName )
     return Any( Reference< XNamed >( new ScDataPilotFieldGroupItemObj( *this, *aIt ) ) );
 }
 
-Sequence< OUString > SAL_CALL ScDataPilotFieldGroupObj::getElementNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ScDataPilotFieldGroupObj::getElementNames()
 {
     SolarMutexGuard aGuard;
     return ::comphelper::containerToSequence( mrParent.getFieldGroup( maGroupName ).maMembers );
 }
 
-sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
     ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers;
@@ -3118,7 +3054,6 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) t
 // XNameReplace
 
 void SAL_CALL ScDataPilotFieldGroupObj::replaceByName( const OUString& rName, const Any& rElement )
-        throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3144,7 +3079,6 @@ void SAL_CALL ScDataPilotFieldGroupObj::replaceByName( const OUString& rName, co
 // XNameContainer
 
 void SAL_CALL ScDataPilotFieldGroupObj::insertByName( const OUString& rName, const Any& /*rElement*/ )
-        throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3161,7 +3095,6 @@ void SAL_CALL ScDataPilotFieldGroupObj::insertByName( const OUString& rName, con
 }
 
 void SAL_CALL ScDataPilotFieldGroupObj::removeByName( const OUString& rName )
-        throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3177,14 +3110,13 @@ void SAL_CALL ScDataPilotFieldGroupObj::removeByName( const OUString& rName )
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScDataPilotFieldGroupObj::getCount() throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScDataPilotFieldGroupObj::getCount()
 {
     SolarMutexGuard aGuard;
     return static_cast< sal_Int32 >( mrParent.getFieldGroup( maGroupName ).maMembers.size() );
 }
 
 Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex )
-        throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers;
@@ -3195,7 +3127,7 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex )
 
 // XEnumerationAccess
 
-Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() throw(RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration()
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) );
@@ -3203,13 +3135,13 @@ Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration()
 
 // XElementAccess
 
-uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType() throw(RuntimeException, std::exception)
+uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<XNamed>::get();
 }
 
-sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return !mrParent.getFieldGroup( maGroupName ).maMembers.empty();
@@ -3217,13 +3149,13 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException
 
 // XNamed
 
-OUString SAL_CALL ScDataPilotFieldGroupObj::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ScDataPilotFieldGroupObj::getName()
 {
     SolarMutexGuard aGuard;
     return maGroupName;
 }
 
-void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) throw(RuntimeException, std::exception)
+void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
     mrParent.renameFieldGroup( maGroupName, rName );
@@ -3245,13 +3177,13 @@ ScDataPilotFieldGroupItemObj::~ScDataPilotFieldGroupItemObj()
 
 // XNamed
 
-OUString SAL_CALL ScDataPilotFieldGroupItemObj::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ScDataPilotFieldGroupItemObj::getName()
 {
     SolarMutexGuard aGuard;
     return maName;
 }
 
-void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) throw(RuntimeException, std::exception)
+void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
     mrParent.replaceByName( maName, Any( rName ) );
@@ -3279,7 +3211,6 @@ ScDataPilotItemObj* ScDataPilotItemsObj::GetObjectByIndex_Impl( sal_Int32 nIndex
 // XNameAccess
 
 Any SAL_CALL ScDataPilotItemsObj::getByName( const OUString& aName )
-        throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Reference<XNameAccess> xMembers = GetMembers();
@@ -3303,7 +3234,6 @@ Any SAL_CALL ScDataPilotItemsObj::getByName( const OUString& aName )
 }
 
 Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames()
-                                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Sequence< OUString > aSeq;
@@ -3313,7 +3243,6 @@ Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName )
-                                        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bFound = false;
@@ -3338,7 +3267,6 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName )
 // XEnumerationAccess
 
 Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration()
-                                                    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotItemsEnumeration"));
@@ -3346,14 +3274,13 @@ Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration()
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScDataPilotItemsObj::getCount() throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScDataPilotItemsObj::getCount()
 {
     SolarMutexGuard aGuard;
     return GetMemberCount();
 }
 
 Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex )
-        throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Reference< XPropertySet > xItem( GetObjectByIndex_Impl( nIndex ) );
@@ -3362,13 +3289,13 @@ Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex )
     return Any( xItem );
 }
 
-uno::Type SAL_CALL ScDataPilotItemsObj::getElementType() throw(RuntimeException, std::exception)
+uno::Type SAL_CALL ScDataPilotItemsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<XPropertySet>::get();
 }
 
-sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -3386,7 +3313,7 @@ ScDataPilotItemObj::~ScDataPilotItemObj()
 }
 
                             // XNamed
-OUString SAL_CALL ScDataPilotItemObj::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL ScDataPilotItemObj::getName()
 {
     SolarMutexGuard aGuard;
     OUString sRet;
@@ -3405,14 +3332,12 @@ OUString SAL_CALL ScDataPilotItemObj::getName() throw(RuntimeException, std::exc
 }
 
 void SAL_CALL ScDataPilotItemObj::setName( const OUString& /* aName */ )
-                                throw(RuntimeException, std::exception)
 {
 }
 
                             // XPropertySet
 Reference< XPropertySetInfo >
                             SAL_CALL ScDataPilotItemObj::getPropertySetInfo(  )
-                                throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static Reference<XPropertySetInfo> aRef =
@@ -3421,9 +3346,6 @@ Reference< XPropertySetInfo >
 }
 
 void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
-        throw (UnknownPropertyException, PropertyVetoException,
-               IllegalArgumentException, WrappedTargetException,
-               RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDPObject* pDPObj = nullptr;
@@ -3475,8 +3397,6 @@ void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyNam
 }
 
 Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName )
-        throw (UnknownPropertyException, WrappedTargetException,
-               RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Any aRet;
@@ -3534,25 +3454,21 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName
 
 void SAL_CALL ScDataPilotItemObj::addPropertyChangeListener(
         const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ScDataPilotItemObj::removePropertyChangeListener(
         const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* aListener */ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ScDataPilotItemObj::addVetoableChangeListener(
         const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ScDataPilotItemObj::removeVetoableChangeListener(
         const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index a955e551cb1d..a2a282e56c59 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -458,7 +458,7 @@ ScSubTotalFieldObj::~ScSubTotalFieldObj()
 
 // XSubTotalField
 
-sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn()
 {
     SolarMutexGuard aGuard;
     ScSubTotalParam aParam;
@@ -467,7 +467,7 @@ sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() throw(uno::RuntimeExcept
     return aParam.nField[nPos];
 }
 
-void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn )
 {
     SolarMutexGuard aGuard;
     ScSubTotalParam aParam;
@@ -479,7 +479,6 @@ void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) throw
 }
 
 uno::Sequence<sheet::SubTotalColumn> SAL_CALL ScSubTotalFieldObj::getSubTotalColumns()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScSubTotalParam aParam;
@@ -499,7 +498,6 @@ uno::Sequence<sheet::SubTotalColumn> SAL_CALL ScSubTotalFieldObj::getSubTotalCol
 
 void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns(
                             const uno::Sequence<sheet::SubTotalColumn>& aSubTotalColumns )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScSubTotalParam aParam;
@@ -551,7 +549,7 @@ ScSubTotalFieldObj* ScSubTotalDescriptorBase::GetObjectByIndex_Impl(sal_uInt16 n
     return nullptr;
 }
 
-void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScSubTotalDescriptorBase::clear()
 {
     SolarMutexGuard aGuard;
     ScSubTotalParam aParam;
@@ -567,7 +565,7 @@ void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException, std
 
 void SAL_CALL ScSubTotalDescriptorBase::addNew(
                         const uno::Sequence<sheet::SubTotalColumn>& aSubTotalColumns,
-                        sal_Int32 nGroupColumn ) throw(uno::RuntimeException, std::exception)
+                        sal_Int32 nGroupColumn )
 {
     SolarMutexGuard aGuard;
     ScSubTotalParam aParam;
@@ -618,7 +616,6 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew(
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SubTotalFieldsEnumeration"));
@@ -626,7 +623,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::creat
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount()
 {
     SolarMutexGuard aGuard;
     ScSubTotalParam aParam;
@@ -639,8 +636,6 @@ sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() throw(uno::RuntimeExcept
 }
 
 uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XSubTotalField> xField(GetObjectByIndex_Impl((sal_uInt16)nIndex));
@@ -650,13 +645,13 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XSubTotalField>::get();
 }
 
-sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -665,7 +660,6 @@ sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() throw(uno::RuntimeExce
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSubTotalDescriptorBase::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -675,9 +669,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSubTotalDescriptorBase::getPr
 
 void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScSubTotalParam aParam;
@@ -716,8 +707,6 @@ void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScSubTotalParam aParam;
@@ -752,7 +741,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSubTotalDescriptorBase )
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScSubTotalDescriptorBase::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -841,21 +830,19 @@ void ScConsolidationDescriptor::SetParam( const ScConsolidateParam& rNew )
 
 // XConsolidationDescriptor
 
-sheet::GeneralFunction SAL_CALL ScConsolidationDescriptor::getFunction() throw(uno::RuntimeException, std::exception)
+sheet::GeneralFunction SAL_CALL ScConsolidationDescriptor::getFunction()
 {
     SolarMutexGuard aGuard;
     return ScDataUnoConversion::SubTotalToGeneral(aParam.eFunction);
 }
 
 void SAL_CALL ScConsolidationDescriptor::setFunction( sheet::GeneralFunction nFunction )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aParam.eFunction = ScDPUtil::toSubTotalFunc(nFunction);
 }
 
 uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSources()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nCount = aParam.nDataAreaCount;
@@ -882,7 +869,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSo
 
 void SAL_CALL ScConsolidationDescriptor::setSources(
                     const uno::Sequence<table::CellRangeAddress>& aSources )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nCount = (sal_uInt16)aSources.getLength();
@@ -906,7 +892,6 @@ void SAL_CALL ScConsolidationDescriptor::setSources(
 }
 
 table::CellAddress SAL_CALL ScConsolidationDescriptor::getStartOutputPosition()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     table::CellAddress aPos;
@@ -918,7 +903,6 @@ table::CellAddress SAL_CALL ScConsolidationDescriptor::getStartOutputPosition()
 
 void SAL_CALL ScConsolidationDescriptor::setStartOutputPosition(
                                 const table::CellAddress& aStartOutputPosition )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aParam.nCol = (SCCOL)aStartOutputPosition.Column;
@@ -926,40 +910,37 @@ void SAL_CALL ScConsolidationDescriptor::setStartOutputPosition(
     aParam.nTab = aStartOutputPosition.Sheet;
 }
 
-sal_Bool SAL_CALL ScConsolidationDescriptor::getUseColumnHeaders() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScConsolidationDescriptor::getUseColumnHeaders()
 {
     SolarMutexGuard aGuard;
     return aParam.bByCol;
 }
 
 void SAL_CALL ScConsolidationDescriptor::setUseColumnHeaders( sal_Bool bUseColumnHeaders )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aParam.bByCol = bUseColumnHeaders;
 }
 
-sal_Bool SAL_CALL ScConsolidationDescriptor::getUseRowHeaders() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScConsolidationDescriptor::getUseRowHeaders()
 {
     SolarMutexGuard aGuard;
     return aParam.bByRow;
 }
 
 void SAL_CALL ScConsolidationDescriptor::setUseRowHeaders( sal_Bool bUseRowHeaders )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aParam.bByRow = bUseRowHeaders;
 }
 
-sal_Bool SAL_CALL ScConsolidationDescriptor::getInsertLinks() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScConsolidationDescriptor::getInsertLinks()
 {
     SolarMutexGuard aGuard;
     return aParam.bReferenceData;
 }
 
 void SAL_CALL ScConsolidationDescriptor::setInsertLinks( sal_Bool bInsertLinks )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aParam.bReferenceData = bInsertLinks;
@@ -992,7 +973,6 @@ void ScFilterDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
 // XSheetFilterDescriptor and XSheetFilterDescriptor2
 
 uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilterFields()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScQueryParam aParam;
@@ -1209,7 +1189,6 @@ void fillQueryParam(
 }
 
 uno::Sequence<sheet::TableFilterField2> SAL_CALL ScFilterDescriptorBase::getFilterFields2()
-throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScQueryParam aParam;
@@ -1260,7 +1239,6 @@ throw(uno::RuntimeException, std::exception)
 }
 
 uno::Sequence<sheet::TableFilterField3> SAL_CALL ScFilterDescriptorBase::getFilterFields3()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScQueryParam aParam;
@@ -1321,7 +1299,6 @@ uno::Sequence<sheet::TableFilterField3> SAL_CALL ScFilterDescriptorBase::getFilt
 
 void SAL_CALL ScFilterDescriptorBase::setFilterFields(
                 const uno::Sequence<sheet::TableFilterField>& aFilterFields )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScQueryParam aParam;
@@ -1387,7 +1364,6 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields(
 
 void SAL_CALL ScFilterDescriptorBase::setFilterFields2(
     const uno::Sequence<sheet::TableFilterField2>& aFilterFields )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScQueryParam aParam;
@@ -1398,7 +1374,6 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2(
 
 void SAL_CALL ScFilterDescriptorBase::setFilterFields3(
     const uno::Sequence<sheet::TableFilterField3>& aFilterFields )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScQueryParam aParam;
@@ -1412,7 +1387,6 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields3(
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFilterDescriptorBase::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -1422,9 +1396,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFilterDescriptorBase::getProp
 
 void SAL_CALL ScFilterDescriptorBase::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScQueryParam aParam;
@@ -1469,8 +1440,6 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScQueryParam aParam;
@@ -1667,14 +1636,13 @@ ScDBData* ScDatabaseRangeObj::GetDBData_Impl() const
 
 // XNamed
 
-OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDatabaseRangeObj::getName()
 {
     SolarMutexGuard aGuard;
     return aName;
 }
 
 void SAL_CALL ScDatabaseRangeObj::setName( const OUString& aNewName )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1688,7 +1656,7 @@ void SAL_CALL ScDatabaseRangeObj::setName( const OUString& aNewName )
 
 // XDatabaseRange
 
-table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::RuntimeException, std::exception)
+table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea()
 {
     SolarMutexGuard aGuard;
     table::CellRangeAddress aAddress;
@@ -1707,7 +1675,6 @@ table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::Ru
 }
 
 void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aDataArea )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDBData* pData = GetDBData_Impl();
@@ -1723,7 +1690,6 @@ void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aD
 }
 
 uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getSortDescriptor()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScSortParam aParam;
@@ -1795,7 +1761,6 @@ void ScDatabaseRangeObj::SetQueryParam(const ScQueryParam& rQueryParam)
 }
 
 uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScDatabaseRangeObj::getFilterDescriptor()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScRangeFilterDescriptor(pDocShell, this);
@@ -1855,14 +1820,12 @@ void ScDatabaseRangeObj::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam)
 }
 
 uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScDatabaseRangeObj::getSubTotalDescriptor()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScRangeSubTotalDescriptor(this);
 }
 
 uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getImportDescriptor()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScImportParam aParam;
@@ -1877,7 +1840,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getImportDescri
 
 // XRefreshable
 
-void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScDatabaseRangeObj::refresh()
 {
     SolarMutexGuard aGuard;
     ScDBData* pData = GetDBData_Impl();
@@ -1906,7 +1869,6 @@ void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException, std::ex
 
 void SAL_CALL ScDatabaseRangeObj::addRefreshListener(
                                 const uno::Reference<util::XRefreshListener >& xListener )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aRefreshListeners.push_back( uno::Reference<util::XRefreshListener>( xListener ));
@@ -1918,7 +1880,6 @@ void SAL_CALL ScDatabaseRangeObj::addRefreshListener(
 
 void SAL_CALL ScDatabaseRangeObj::removeRefreshListener(
                                 const uno::Reference<util::XRefreshListener >& xListener )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nCount = aRefreshListeners.size();
@@ -1946,7 +1907,6 @@ void ScDatabaseRangeObj::Refreshed_Impl()
 // XCellRangeSource
 
 uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScRange aRange;
@@ -1967,7 +1927,6 @@ uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells(
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDatabaseRangeObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -1977,9 +1936,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDatabaseRangeObj::getProperty
 
 void SAL_CALL ScDatabaseRangeObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScDBData* pData = GetDBData_Impl();
@@ -2073,8 +2029,6 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -2157,19 +2111,17 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropert
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj )
 
 // XServiceInfo
-OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDatabaseRangeObj::getImplementationName()
 {
     return OUString( "ScDatabaseRangeObj" );
 }
 
 sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {"com.sun.star.sheet.DatabaseRange",
             SCLINKTARGET_SERVICE};
@@ -2230,7 +2182,6 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const OUString& aN
 
 void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName,
                                         const table::CellRangeAddress& aRange )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -2247,7 +2198,6 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName,
 }
 
 void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -2263,7 +2213,6 @@ void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName )
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DatabaseRangesEnumeration"));
@@ -2271,7 +2220,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnum
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -2287,8 +2236,6 @@ sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException,
 }
 
 uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nIndex < 0)
@@ -2301,13 +2248,13 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScDatabaseRangesObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScDatabaseRangesObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XDatabaseRange>::get();
 }
 
-sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -2316,8 +2263,6 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException
 // XNameAccess
 
 uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XDatabaseRange> xRange(GetObjectByName_Impl(aName));
@@ -2329,7 +2274,6 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName )
 }
 
 uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2353,7 +2297,6 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2395,8 +2338,6 @@ void ScUnnamedDatabaseRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 // XUnnamedDatabaseRanges
 
 void ScUnnamedDatabaseRangesObj::setByTable( const table::CellRangeAddress& aRange )
-                                throw( uno::RuntimeException,
-                                        lang::IndexOutOfBoundsException, std::exception )
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -2416,9 +2357,6 @@ void ScUnnamedDatabaseRangesObj::setByTable( const table::CellRangeAddress& aRan
 }
 
 uno::Any ScUnnamedDatabaseRangesObj::getByTable( sal_Int32 nTab )
-                                throw(uno::RuntimeException,
-                                    lang::IndexOutOfBoundsException,
-                                    container::NoSuchElementException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -2437,8 +2375,6 @@ uno::Any ScUnnamedDatabaseRangesObj::getByTable( sal_Int32 nTab )
 }
 
 sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab )
-                                    throw (uno::RuntimeException,
-                                        lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index f7a6ba2888e3..e245b9dd5c27 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -108,7 +108,6 @@ void ScDocDefaultsObj::ItemsChanged()
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo(
@@ -118,9 +117,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySe
 
 void SAL_CALL ScDocDefaultsObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -201,8 +197,6 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     //  use pool default if set
 
@@ -251,7 +245,6 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocDefaultsObj )
 // XPropertyState
 
 beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString& aPropertyName )
-                                throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -286,7 +279,6 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString
 
 uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates(
                             const uno::Sequence<OUString>& aPropertyNames )
-                    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     //  the simple way: call getPropertyState
 
@@ -300,7 +292,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates
 }
 
 void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyName )
-                            throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -321,8 +312,6 @@ void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyN
 }
 
 uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropertyName )
-                            throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     //  always use static default
 
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 24957eecc4a8..885cf33de385 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -91,7 +91,6 @@ void ScDispatchProviderInterceptor::Notify( SfxBroadcaster&, const SfxHint& rHin
 uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDispatch(
                         const util::URL& aURL, const OUString& aTargetFrameName,
                         sal_Int32 nSearchFlags )
-                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -116,7 +115,6 @@ uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDi
 uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL
                         ScDispatchProviderInterceptor::queryDispatches(
                         const uno::Sequence<frame::DispatchDescriptor>& aDescripts )
-                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -135,7 +133,6 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL
 
 uno::Reference<frame::XDispatchProvider> SAL_CALL
                         ScDispatchProviderInterceptor::getSlaveDispatchProvider()
-                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return m_xSlaveDispatcher;
@@ -143,7 +140,6 @@ uno::Reference<frame::XDispatchProvider> SAL_CALL
 
 void SAL_CALL ScDispatchProviderInterceptor::setSlaveDispatchProvider(
                         const uno::Reference<frame::XDispatchProvider>& xNewDispatchProvider )
-                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     m_xSlaveDispatcher.set(xNewDispatchProvider);
@@ -151,7 +147,6 @@ void SAL_CALL ScDispatchProviderInterceptor::setSlaveDispatchProvider(
 
 uno::Reference<frame::XDispatchProvider> SAL_CALL
                         ScDispatchProviderInterceptor::getMasterDispatchProvider()
-                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return m_xMasterDispatcher;
@@ -159,7 +154,6 @@ uno::Reference<frame::XDispatchProvider> SAL_CALL
 
 void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider(
                         const uno::Reference<frame::XDispatchProvider>& xNewSupplier )
-                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     m_xMasterDispatcher.set(xNewSupplier);
@@ -168,7 +162,6 @@ void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider(
 // XEventListener
 
 void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject& /* Source */ )
-                                throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -216,7 +209,6 @@ void ScDispatch::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 void SAL_CALL ScDispatch::dispatch( const util::URL& aURL,
                                 const uno::Sequence<beans::PropertyValue>& aArgs )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -264,7 +256,6 @@ static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImport
 void SAL_CALL ScDispatch::addStatusListener(
     const uno::Reference<frame::XStatusListener>& xListener,
     const util::URL& aURL)
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -302,7 +293,6 @@ void SAL_CALL ScDispatch::addStatusListener(
 void SAL_CALL ScDispatch::removeStatusListener(
                                 const uno::Reference<frame::XStatusListener>& xListener,
                                 const util::URL& aURL )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -332,7 +322,6 @@ void SAL_CALL ScDispatch::removeStatusListener(
 // XSelectionChangeListener
 
 void SAL_CALL ScDispatch::selectionChanged( const css::lang::EventObject& /* aEvent */ )
-    throw (css::uno::RuntimeException, std::exception)
 {
     //  currently only called for URL cURLDocDataSource
 
@@ -367,7 +356,6 @@ void SAL_CALL ScDispatch::selectionChanged( const css::lang::EventObject& /* aEv
 // XEventListener
 
 void SAL_CALL ScDispatch::disposing( const css::lang::EventObject& rSource )
-                                throw (css::uno::RuntimeException, std::exception)
 {
     uno::Reference<view::XSelectionSupplier> xSupplier(rSource.Source, uno::UNO_QUERY);
     xSupplier->removeSelectionChangeListener(this);
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9db139b88478..757cd8e71a07 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1001,7 +1001,6 @@ void ScModelObj::initializeForTiledRendering(const css::uno::Sequence<css::beans
 }
 
 uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SC_QUERYINTERFACE( sheet::XSpreadsheetDocument )
     SC_QUERYINTERFACE( document::XActionLockable )
@@ -1047,7 +1046,7 @@ void SAL_CALL ScModelObj::release() throw()
     SfxBaseModel::release();
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -1101,7 +1100,6 @@ uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeExcep
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScModelObj::getImplementationId()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1156,7 +1154,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 
 // XSpreadsheetDocument
 
-uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() throw(uno::RuntimeException, std::exception)
+uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1167,7 +1165,6 @@ uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() throw(uno:
 // XStyleFamiliesSupplier
 
 uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getStyleFamilies()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1458,7 +1455,6 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
 
 sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection,
     const uno::Sequence<beans::PropertyValue>& rOptions)
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pDocShell)
@@ -1509,9 +1505,6 @@ static sal_Int32 lcl_GetRendererNum( sal_Int32 nSelRenderer, const OUString& rPa
 
 uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 nSelRenderer,
                                     const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions  )
-                                throw (lang::IllegalArgumentException,
-                                       uno::RuntimeException,
-                                       std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pDocShell)
@@ -1619,9 +1612,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32
 
 void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelection,
                                     const uno::Sequence<beans::PropertyValue>& rOptions )
-                                throw(lang::IllegalArgumentException,
-                                      uno::RuntimeException,
-                                      std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pDocShell)
@@ -1817,7 +1807,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec
 
 // XLinkTargetSupplier
 
-uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() throw(uno::RuntimeException, std::exception)
+uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1827,7 +1817,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() throw(uno
 
 // XActionLockable
 
-sal_Bool SAL_CALL ScModelObj::isActionLocked() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScModelObj::isActionLocked()
 {
     SolarMutexGuard aGuard;
     bool bLocked = false;
@@ -1836,28 +1826,28 @@ sal_Bool SAL_CALL ScModelObj::isActionLocked() throw(uno::RuntimeException, std:
     return bLocked;
 }
 
-void SAL_CALL ScModelObj::addActionLock() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScModelObj::addActionLock()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
         pDocShell->LockDocument();
 }
 
-void SAL_CALL ScModelObj::removeActionLock() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScModelObj::removeActionLock()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
         pDocShell->UnlockDocument();
 }
 
-void SAL_CALL ScModelObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScModelObj::setActionLocks( sal_Int16 nLock )
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
         pDocShell->SetLockCount(nLock);
 }
 
-sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL ScModelObj::resetActionLocks()
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nRet = 0;
@@ -1869,7 +1859,7 @@ sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException, s
     return nRet;
 }
 
-void SAL_CALL ScModelObj::lockControllers() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScModelObj::lockControllers()
 {
     SolarMutexGuard aGuard;
     SfxBaseModel::lockControllers();
@@ -1877,7 +1867,7 @@ void SAL_CALL ScModelObj::lockControllers() throw (css::uno::RuntimeException, s
         pDocShell->LockPaint();
 }
 
-void SAL_CALL ScModelObj::unlockControllers() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScModelObj::unlockControllers()
 {
     SolarMutexGuard aGuard;
     if (hasControllersLocked())
@@ -1890,7 +1880,7 @@ void SAL_CALL ScModelObj::unlockControllers() throw (css::uno::RuntimeException,
 
 // XCalculate
 
-void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScModelObj::calculate()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1901,7 +1891,7 @@ void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException, std::exceptio
     }
 }
 
-void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScModelObj::calculateAll()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1912,7 +1902,7 @@ void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException, std::excep
     }
 }
 
-sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1923,7 +1913,6 @@ sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::Runtime
 }
 
 void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabledIn )
-                                                throw(uno::RuntimeException, std::exception)
 {
     bool bEnabled(bEnabledIn);
     SolarMutexGuard aGuard;
@@ -1944,7 +1933,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabledIn )
 
 // XProtectable
 
-void SAL_CALL ScModelObj::protect( const OUString& aPassword ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScModelObj::protect( const OUString& aPassword )
 {
     SolarMutexGuard aGuard;
     // #i108245# if already protected, don't change anything
@@ -1955,7 +1944,6 @@ void SAL_CALL ScModelObj::protect( const OUString& aPassword ) throw(uno::Runtim
 }
 
 void SAL_CALL ScModelObj::unprotect( const OUString& aPassword )
-                        throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1966,7 +1954,7 @@ void SAL_CALL ScModelObj::unprotect( const OUString& aPassword )
     }
 }
 
-sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScModelObj::isProtected()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1978,7 +1966,7 @@ sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException, std::ex
 
 // XDrawPagesSupplier
 
-uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() throw(uno::RuntimeException, std::exception)
+uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1994,8 +1982,6 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal(
                                 const table::CellAddress& aFormulaPosition,
                                 const table::CellAddress& aVariablePosition,
                                 const OUString& aGoalValue )
-                                    throw (uno::RuntimeException,
-                                           std::exception)
 {
     SolarMutexGuard aGuard;
     sheet::GoalResult aResult;
@@ -2019,7 +2005,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal(
 // XConsolidatable
 
 uno::Reference<sheet::XConsolidationDescriptor> SAL_CALL ScModelObj::createConsolidationDescriptor(
-                                sal_Bool bEmpty ) throw(uno::RuntimeException, std::exception)
+                                sal_Bool bEmpty )
 {
     SolarMutexGuard aGuard;
     ScConsolidationDescriptor* pNew = new ScConsolidationDescriptor;
@@ -2035,7 +2021,6 @@ uno::Reference<sheet::XConsolidationDescriptor> SAL_CALL ScModelObj::createConso
 
 void SAL_CALL ScModelObj::consolidate(
     const uno::Reference<sheet::XConsolidationDescriptor>& xDescriptor )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //  das koennte theoretisch ein fremdes Objekt sein, also nur das
@@ -2061,7 +2046,7 @@ void SAL_CALL ScModelObj::consolidate(
 
 // XDocumentAuditing
 
-void SAL_CALL ScModelObj::refreshArrows() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScModelObj::refreshArrows()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -2070,7 +2055,6 @@ void SAL_CALL ScModelObj::refreshArrows() throw(uno::RuntimeException, std::exce
 
 // XViewDataSupplier
 uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData(  )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference < container::XIndexAccess > xRet( SfxBaseModel::getViewData() );
 
@@ -2100,7 +2084,6 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData(  )
 //! auch an der Applikation anbieten?
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -2110,9 +2093,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo(
 
 void SAL_CALL ScModelObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-          lang::IllegalArgumentException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2260,8 +2240,6 @@ void SAL_CALL ScModelObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -2532,7 +2510,6 @@ css::uno::Reference<css::uno::XInterface> ScModelObj::create(
 
 uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance(
                                 const OUString& aServiceSpecifier )
-                                throw(uno::Exception, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return create(aServiceSpecifier, nullptr);
@@ -2541,7 +2518,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance(
 uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments(
                                 const OUString& ServiceSpecifier,
                                 const uno::Sequence<uno::Any>& aArgs )
-                                throw(uno::Exception, uno::RuntimeException, std::exception)
 {
     //! unterscheiden zwischen eigenen Services und denen vom Drawing-Layer?
 
@@ -2561,7 +2537,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments
 }
 
 uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2576,7 +2551,7 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
 }
 
 // XServiceInfo
-OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScModelObj::getImplementationName()
 {
     return OUString( "ScModelObj" );
     /* // Matching the .component information:
@@ -2585,13 +2560,11 @@ OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeExceptio
 }
 
 sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {SCMODELOBJ_SERVICE, SCDOCSETTINGS_SERVICE, SCDOC_SERVICE};
 }
@@ -2599,7 +2572,7 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames()
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScModelObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -2658,14 +2631,12 @@ ScModelObj* ScModelObj::getImplementation(const uno::Reference<uno::XInterface>&
 // XChangesNotifier
 
 void ScModelObj::addChangesListener( const uno::Reference< util::XChangesListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     maChangesListeners.addInterface( aListener );
 }
 
 void ScModelObj::removeChangesListener( const uno::Reference< util::XChangesListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     maChangesListeners.removeInterface( aListener );
@@ -2826,13 +2797,11 @@ void ScModelObj::HandleCalculateEvents()
 // XOpenCLSelection
 
 sal_Bool ScModelObj::isOpenCLEnabled()
-    throw (uno::RuntimeException, std::exception)
 {
     return officecfg::Office::Common::Misc::UseOpenCL::get();
 }
 
 void ScModelObj::enableOpenCL(sal_Bool bEnable)
-    throw (uno::RuntimeException, std::exception)
 {
     if (ScCalcConfig::isOpenCLEnabled() == static_cast<bool>(bEnable))
         return;
@@ -2856,7 +2825,6 @@ void ScModelObj::enableOpenCL(sal_Bool bEnable)
 }
 
 void ScModelObj::enableAutomaticDeviceSelection(sal_Bool bForce)
-    throw (uno::RuntimeException, std::exception)
 {
     ScCalcConfig aConfig = ScInterpreter::GetGlobalConfig();
     aConfig.mbOpenCLAutoSelect = true;
@@ -2872,7 +2840,6 @@ void ScModelObj::enableAutomaticDeviceSelection(sal_Bool bForce)
 }
 
 void ScModelObj::disableAutomaticDeviceSelection()
-    throw (uno::RuntimeException, std::exception)
 {
     ScCalcConfig aConfig = ScInterpreter::GetGlobalConfig();
     aConfig.mbOpenCLAutoSelect = false;
@@ -2883,7 +2850,6 @@ void ScModelObj::disableAutomaticDeviceSelection()
 }
 
 void ScModelObj::selectOpenCLDevice( sal_Int32 nPlatform, sal_Int32 nDevice )
-    throw (uno::RuntimeException, std::exception)
 {
     if(nPlatform < 0 || nDevice < 0)
         throw uno::RuntimeException();
@@ -2905,7 +2871,6 @@ void ScModelObj::selectOpenCLDevice( sal_Int32 nPlatform, sal_Int32 nDevice )
 }
 
 sal_Int32 ScModelObj::getPlatformID()
-    throw (uno::RuntimeException, std::exception)
 {
 #if !HAVE_FEATURE_OPENCL
     return -1;
@@ -2918,7 +2883,6 @@ sal_Int32 ScModelObj::getPlatformID()
 }
 
 sal_Int32 ScModelObj::getDeviceID()
-    throw (uno::RuntimeException, std::exception)
 {
 #if !HAVE_FEATURE_OPENCL
     return -1;
@@ -2931,7 +2895,6 @@ sal_Int32 ScModelObj::getDeviceID()
 }
 
 uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms()
-    throw (uno::RuntimeException, std::exception)
 {
 #if !HAVE_FEATURE_OPENCL
     return uno::Sequence<sheet::opencl::OpenCLPlatform>();
@@ -2963,7 +2926,6 @@ namespace {
 
 /// @throws css::uno::RuntimeException
 void setOpcodeSubsetTest(bool bFlag)
-    throw (uno::RuntimeException, std::exception)
 {
     std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
     officecfg::Office::Calc::Formula::Calculation::OpenCLSubsetOnly::set(bFlag, batch);
@@ -2973,25 +2935,21 @@ void setOpcodeSubsetTest(bool bFlag)
 }
 
 void ScModelObj::enableOpcodeSubsetTest()
-    throw (uno::RuntimeException, std::exception)
 {
     setOpcodeSubsetTest(true);
 }
 
 void ScModelObj::disableOpcodeSubsetTest()
-    throw (uno::RuntimeException, std::exception)
 {
     setOpcodeSubsetTest(false);
 }
 
 sal_Bool ScModelObj::isOpcodeSubsetTested()
-    throw (uno::RuntimeException, std::exception)
 {
     return officecfg::Office::Calc::Formula::Calculation::OpenCLSubsetOnly::get();
 }
 
 void ScModelObj::setFormulaCellNumberLimit( sal_Int32 number )
-    throw (uno::RuntimeException, std::exception)
 {
     std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
     officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::set(number, batch);
@@ -2999,7 +2957,6 @@ void ScModelObj::setFormulaCellNumberLimit( sal_Int32 number )
 }
 
 sal_Int32 ScModelObj::getFormulaCellNumberLimit()
-    throw (uno::RuntimeException, std::exception)
 {
     return officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get().get();
 }
@@ -3050,7 +3007,6 @@ uno::Reference<drawing::XDrawPage> ScDrawPagesObj::GetObjectByIndex_Impl(sal_Int
 // XDrawPages
 
 uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sal_Int32 nPos )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<drawing::XDrawPage> xRet;
@@ -3066,7 +3022,6 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sa
 }
 
 void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>& xPage )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SvxDrawPage* pImp = SvxDrawPage::getImplementation( xPage );
@@ -3083,7 +3038,7 @@ void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>&
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScDrawPagesObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScDrawPagesObj::getCount()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -3092,8 +3047,6 @@ sal_Int32 SAL_CALL ScDrawPagesObj::getCount() throw(uno::RuntimeException, std::
 }
 
 uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<drawing::XDrawPage> xPage(GetObjectByIndex_Impl(nIndex));
@@ -3103,13 +3056,13 @@ uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScDrawPagesObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScDrawPagesObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<drawing::XDrawPage>::get();
 }
 
-sal_Bool SAL_CALL ScDrawPagesObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDrawPagesObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -3161,7 +3114,6 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const OUString& aName) c
 }
 
 void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int16 nPosition )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3174,7 +3126,6 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int1
 }
 
 void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDestination )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3190,7 +3141,6 @@ void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDe
 
 void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName,
     const OUString& aCopy, sal_Int16 nDestination )
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3218,8 +3168,6 @@ void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName,
 }
 
 void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno::Any& aElement )
-                            throw(lang::IllegalArgumentException, container::ElementExistException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3269,8 +3217,6 @@ void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno::
 }
 
 void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno::Any& aElement )
-                            throw(lang::IllegalArgumentException, container::NoSuchElementException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3320,8 +3266,6 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno:
 }
 
 void SAL_CALL ScTableSheetsObj::removeByName( const OUString& aName )
-                                throw(container::NoSuchElementException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3341,7 +3285,6 @@ void SAL_CALL ScTableSheetsObj::removeByName( const OUString& aName )
 sal_Int32 ScTableSheetsObj::importSheet(
     const uno::Reference < sheet::XSpreadsheetDocument > & xDocSrc,
     const OUString& srcName, const sal_Int32 nDestPosition )
-        throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     //pDocShell is the destination
     ScDocument& rDocDest = pDocShell->GetDocument();
@@ -3375,7 +3318,6 @@ sal_Int32 ScTableSheetsObj::importSheet(
 // XCellRangesAccess
 
 uno::Reference< table::XCell > SAL_CALL ScTableSheetsObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((sal_uInt16)nSheet)));
@@ -3386,7 +3328,6 @@ uno::Reference< table::XCell > SAL_CALL ScTableSheetsObj::getCellByPosition( sal
 }
 
 uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((sal_uInt16)nSheet)));
@@ -3397,7 +3338,6 @@ uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPos
 }
 
 uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const OUString& aRange )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence < uno::Reference < table::XCellRange > > xRet;
@@ -3428,7 +3368,6 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj:
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetsEnumeration"));
@@ -3436,7 +3375,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumera
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScTableSheetsObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScTableSheetsObj::getCount()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -3445,8 +3384,6 @@ sal_Int32 SAL_CALL ScTableSheetsObj::getCount() throw(uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XSpreadsheet> xSheet(GetObjectByIndex_Impl(nIndex));
@@ -3457,13 +3394,13 @@ uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex )
 //    return uno::Any();
 }
 
-uno::Type SAL_CALL ScTableSheetsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScTableSheetsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XSpreadsheet>::get();
 }
 
-sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTableSheetsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -3472,8 +3409,6 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException, s
 // XNameAccess
 
 uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XSpreadsheet> xSheet(GetObjectByName_Impl(aName));
@@ -3484,7 +3419,6 @@ uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName )
 }
 
 uno::Sequence<OUString> SAL_CALL ScTableSheetsObj::getElementNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -3505,7 +3439,6 @@ uno::Sequence<OUString> SAL_CALL ScTableSheetsObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -3568,7 +3501,6 @@ ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const OUString& aName)
 }
 
 void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3584,7 +3516,6 @@ void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 n
 }
 
 void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3602,7 +3533,6 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableColumnsEnumeration"));
@@ -3610,15 +3540,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumer
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScTableColumnsObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScTableColumnsObj::getCount()
 {
     SolarMutexGuard aGuard;
     return nEndCol - nStartCol + 1;
 }
 
 uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XCellRange> xColumn(GetObjectByIndex_Impl(nIndex));
@@ -3628,21 +3556,19 @@ uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScTableColumnsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScTableColumnsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<table::XCellRange>::get();
 }
 
-sal_Bool SAL_CALL ScTableColumnsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTableColumnsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
 }
 
 uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XCellRange> xColumn(GetObjectByName_Impl(aName));
@@ -3653,7 +3579,6 @@ uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName )
 }
 
 uno::Sequence<OUString> SAL_CALL ScTableColumnsObj::getElementNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SCCOL nCount = nEndCol - nStartCol + 1;
@@ -3666,7 +3591,6 @@ uno::Sequence<OUString> SAL_CALL ScTableColumnsObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SCCOL nCol = 0;
@@ -3680,7 +3604,6 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const OUString& aName )
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnsObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -3690,9 +3613,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnsObj::getPropertyS
 
 void SAL_CALL ScTableColumnsObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pDocShell)
@@ -3736,8 +3656,6 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pDocShell)
@@ -3821,7 +3739,6 @@ ScTableRowObj* ScTableRowsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const
 }
 
 void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3837,7 +3754,6 @@ void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCou
 }
 
 void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -3855,7 +3771,6 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableRowsEnumeration"));
@@ -3863,15 +3778,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumerati
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScTableRowsObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScTableRowsObj::getCount()
 {
     SolarMutexGuard aGuard;
     return nEndRow - nStartRow + 1;
 }
 
 uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XCellRange> xRow(GetObjectByIndex_Impl(nIndex));
@@ -3881,13 +3794,13 @@ uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScTableRowsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScTableRowsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<table::XCellRange>::get();
 }
 
-sal_Bool SAL_CALL ScTableRowsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTableRowsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -3896,7 +3809,6 @@ sal_Bool SAL_CALL ScTableRowsObj::hasElements() throw(uno::RuntimeException, std
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowsObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -3906,9 +3818,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowsObj::getPropertySetI
 
 void SAL_CALL ScTableRowsObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pDocShell)
@@ -4004,8 +3913,6 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pDocShell)
@@ -4070,7 +3977,6 @@ ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj()
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     //! muss noch
     return nullptr;
@@ -4078,16 +3984,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPr
 
 void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue(
                         const OUString& /* aPropertyName */, const uno::Any& /* aValue */ )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     //! muss noch
 }
 
 uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /* aPropertyName */ )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     //! muss noch
     return uno::Any();
@@ -4145,7 +4046,6 @@ ScAnnotationObj* ScAnnotationsObj::GetObjectByIndex_Impl( sal_Int32 nIndex ) con
 
 void SAL_CALL ScAnnotationsObj::insertNew(
         const table::CellAddress& aPosition, const OUString& rText )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -4156,7 +4056,7 @@ void SAL_CALL ScAnnotationsObj::insertNew(
     }
 }
 
-void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex )
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -4176,7 +4076,6 @@ void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Run
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     //! iterate directly (more efficiently)?
 
@@ -4187,7 +4086,6 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera
 // XIndexAccess
 
 sal_Int32 SAL_CALL ScAnnotationsObj::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_Int32 nCount = 0;
@@ -4203,8 +4101,6 @@ sal_Int32 SAL_CALL ScAnnotationsObj::getCount()
 }
 
 uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XSheetAnnotation> xAnnotation(GetObjectByIndex_Impl(nIndex));
@@ -4214,13 +4110,13 @@ uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScAnnotationsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScAnnotationsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XSheetAnnotation>::get();
 }
 
-sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScAnnotationsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -4297,7 +4193,6 @@ ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const OUString& aName)
 void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName,
                                 const uno::Sequence<table::CellRangeAddress>& aRanges,
                                 const OUString& aComment )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( pDocShell )
@@ -4328,7 +4223,6 @@ void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName,
 }
 
 void SAL_CALL ScScenariosObj::removeByName( const OUString& aName )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SCTAB nIndex;
@@ -4339,7 +4233,6 @@ void SAL_CALL ScScenariosObj::removeByName( const OUString& aName )
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.ScenariosEnumeration"));
@@ -4347,7 +4240,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumerati
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScScenariosObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScScenariosObj::getCount()
 {
     SolarMutexGuard aGuard;
     SCTAB nCount = 0;
@@ -4369,8 +4262,6 @@ sal_Int32 SAL_CALL ScScenariosObj::getCount() throw(uno::RuntimeException, std::
 }
 
 uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XScenario> xScen(GetObjectByIndex_Impl(nIndex));
@@ -4380,21 +4271,19 @@ uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScScenariosObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScScenariosObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XScenario>::get();
 }
 
-sal_Bool SAL_CALL ScScenariosObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScScenariosObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
 }
 
 uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XScenario> xScen(GetObjectByName_Impl(aName));
@@ -4405,7 +4294,6 @@ uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName )
 }
 
 uno::Sequence<OUString> SAL_CALL ScScenariosObj::getElementNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SCTAB nCount = (SCTAB)getCount();
@@ -4425,7 +4313,6 @@ uno::Sequence<OUString> SAL_CALL ScScenariosObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SCTAB nIndex;
diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx
index 2eb4d60cca78..c3e24180a8cd 100644
--- a/sc/source/ui/unoobj/eventuno.cxx
+++ b/sc/source/ui/unoobj/eventuno.cxx
@@ -64,8 +64,6 @@ static ScSheetEventId lcl_GetEventFromName( const OUString& aName )
 // XNameReplace
 
 void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::NoSuchElementException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!mpDocShell)
@@ -117,7 +115,6 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno:
 // XNameAccess
 
 uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScSheetEventId nEvent = lcl_GetEventFromName(aName);
@@ -148,7 +145,7 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName )
     return aRet;
 }
 
-uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames()
 {
     SolarMutexGuard aGuard;
     uno::Sequence<OUString> aNames((int)ScSheetEventId::COUNT);
@@ -157,7 +154,7 @@ uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::
     return aNames;
 }
 
-sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName )
 {
     SolarMutexGuard aGuard;
     ScSheetEventId nEvent = lcl_GetEventFromName(aName);
@@ -166,13 +163,13 @@ sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) throw(uno
 
 // XElementAccess
 
-uno::Type SAL_CALL ScSheetEventsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScSheetEventsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
 }
 
-sal_Bool SAL_CALL ScSheetEventsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScSheetEventsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     if (mpDocShell)
diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx
index 027febb19876..d0c72c57600b 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -27,17 +27,17 @@ using utl::MediaDescriptor;
 ScExcelBiffDetect::ScExcelBiffDetect( const uno::Reference<uno::XComponentContext>& /*xContext*/ ) {}
 ScExcelBiffDetect::~ScExcelBiffDetect() {}
 
-OUString ScExcelBiffDetect::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString ScExcelBiffDetect::getImplementationName()
 {
     return OUString("com.sun.star.comp.calc.ExcelBiffFormatDetector");
 }
 
-sal_Bool ScExcelBiffDetect::supportsService( const OUString& aName ) throw (uno::RuntimeException, std::exception)
+sal_Bool ScExcelBiffDetect::supportsService( const OUString& aName )
 {
     return cppu::supportsService(this, aName);
 }
 
-uno::Sequence<OUString> ScExcelBiffDetect::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence<OUString> ScExcelBiffDetect::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aNames { "com.sun.star.frame.ExtendedTypeDetection" };
     return aNames;
@@ -133,7 +133,6 @@ bool isTemplate(const OUString& rType)
 }
 
 OUString ScExcelBiffDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor )
-    throw (uno::RuntimeException, std::exception)
 {
     MediaDescriptor aMediaDesc(lDescriptor);
     OUString aType;
diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx
index 9830ccd6deef..acb182533bbf 100644
--- a/sc/source/ui/unoobj/exceldetect.hxx
+++ b/sc/source/ui/unoobj/exceldetect.hxx
@@ -26,13 +26,12 @@ public:
     virtual ~ScExcelBiffDetect() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XExtendedFilterDetection
-    virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) override;
 };
 
 #endif
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index d397e05c0a10..178ef7a17996 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -341,7 +341,7 @@ uno::Reference<text::XTextField> ScCellFieldsObj::GetObjectByIndex_Impl(sal_Int3
     return xRet;
 }
 
-sal_Int32 SAL_CALL ScCellFieldsObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScCellFieldsObj::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -353,8 +353,6 @@ sal_Int32 SAL_CALL ScCellFieldsObj::getCount() throw(uno::RuntimeException, std:
 }
 
 uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<text::XTextField> xField(GetObjectByIndex_Impl(nIndex));
@@ -364,20 +362,19 @@ uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScCellFieldsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScCellFieldsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<text::XTextField>::get();
 }
 
-sal_Bool SAL_CALL ScCellFieldsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScCellFieldsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
 }
 
 uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration"));
@@ -385,21 +382,18 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumerat
 
 void SAL_CALL ScCellFieldsObj::addContainerListener(
                                 const uno::Reference<container::XContainerListener>& /* xListener */ )
-                                    throw(uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ScCellFieldsObj::removeContainerListener(
                                 const uno::Reference<container::XContainerListener>& /* xListener */ )
-                                    throw(uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 // XRefreshable
 void SAL_CALL ScCellFieldsObj::refresh(  )
-                                    throw (uno::RuntimeException, std::exception)
 {
     if (mpRefreshListeners)
     {
@@ -411,7 +405,6 @@ void SAL_CALL ScCellFieldsObj::refresh(  )
 }
 
 void SAL_CALL ScCellFieldsObj::addRefreshListener( const uno::Reference< util::XRefreshListener >& xListener )
-                                    throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -423,7 +416,6 @@ void SAL_CALL ScCellFieldsObj::addRefreshListener( const uno::Reference< util::X
 }
 
 void SAL_CALL ScCellFieldsObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener )
-                                    throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -506,7 +498,7 @@ uno::Reference<text::XTextField> ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_In
     return xRet;
 }
 
-sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -517,8 +509,6 @@ sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() throw(uno::RuntimeException, st
 }
 
 uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<text::XTextField> xField(GetObjectByIndex_Impl(nIndex));
@@ -528,20 +518,19 @@ uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScHeaderFieldsObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScHeaderFieldsObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<text::XTextField>::get();
 }
 
-sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
 }
 
 uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration"));
@@ -549,21 +538,18 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumer
 
 void SAL_CALL ScHeaderFieldsObj::addContainerListener(
                                 const uno::Reference<container::XContainerListener>& /* xListener */ )
-                                    throw(uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL ScHeaderFieldsObj::removeContainerListener(
                                 const uno::Reference<container::XContainerListener>& /* xListener */ )
-                                    throw(uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 // XRefreshable
 void SAL_CALL ScHeaderFieldsObj::refresh(  )
-                                    throw (uno::RuntimeException, std::exception)
 {
     if (mpRefreshListeners)
     {
@@ -575,7 +561,6 @@ void SAL_CALL ScHeaderFieldsObj::refresh(  )
 }
 
 void SAL_CALL ScHeaderFieldsObj::addRefreshListener( const uno::Reference< util::XRefreshListener >& xListener )
-                                    throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -587,7 +572,6 @@ void SAL_CALL ScHeaderFieldsObj::addRefreshListener( const uno::Reference< util:
 }
 
 void SAL_CALL ScHeaderFieldsObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener )
-                                    throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -1162,7 +1146,6 @@ bool ScEditFieldObj::IsInserted() const
 // XTextField
 
 OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1201,7 +1184,6 @@ OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand )
 // XTextContent
 
 void SAL_CALL ScEditFieldObj::attach( const uno::Reference<text::XTextRange>& xTextRange )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (xTextRange.is())
@@ -1214,7 +1196,7 @@ void SAL_CALL ScEditFieldObj::attach( const uno::Reference<text::XTextRange>& xT
     }
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScEditFieldObj::getAnchor() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScEditFieldObj::getAnchor()
 {
     SolarMutexGuard aGuard;
     return mpContent;
@@ -1222,21 +1204,19 @@ uno::Reference<text::XTextRange> SAL_CALL ScEditFieldObj::getAnchor() throw(uno:
 
 // XComponent
 
-void SAL_CALL ScEditFieldObj::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScEditFieldObj::dispose()
 {
     OComponentHelper::dispose();
 }
 
 void SAL_CALL ScEditFieldObj::addEventListener(
                         const uno::Reference<lang::XEventListener>& xListener )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     OComponentHelper::addEventListener( xListener );
 }
 
 void SAL_CALL ScEditFieldObj::removeEventListener(
                         const uno::Reference<lang::XEventListener>& xListener )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     OComponentHelper::removeEventListener( xListener );
 }
@@ -1244,7 +1224,6 @@ void SAL_CALL ScEditFieldObj::removeEventListener(
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScEditFieldObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<beans::XPropertySetInfo> aRef = pPropSet->getPropertySetInfo();
@@ -1253,9 +1232,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScEditFieldObj::getPropertySetI
 
 void SAL_CALL ScEditFieldObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-                       lang::IllegalArgumentException, lang::WrappedTargetException,
-                       uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (aPropertyName == SC_UNONAME_ANCHOR)
@@ -1287,8 +1263,6 @@ void SAL_CALL ScEditFieldObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (aPropertyName == SC_UNONAME_TEXTFIELD_TYPE)
@@ -1339,7 +1313,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScEditFieldObj )
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScEditFieldObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -1371,25 +1345,23 @@ ScEditFieldObj* ScEditFieldObj::getImplementation(const uno::Reference<text::XTe
 
 // XServiceInfo
 
-OUString SAL_CALL ScEditFieldObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScEditFieldObj::getImplementationName()
 {
     return OUString("ScEditFieldObj");
 }
 
 sal_Bool SAL_CALL ScEditFieldObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScEditFieldObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {"com.sun.star.text.TextField",
             "com.sun.star.text.TextContent"};
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -1412,7 +1384,6 @@ uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() throw(uno::RuntimeE
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScEditFieldObj::getImplementationId()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index f11fc1ee18d5..be27823aaa70 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -117,7 +117,7 @@ Calc_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*, css::u
 
 // XPropertyAccess
 
-uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValues() throw(uno::RuntimeException, std::exception)
+uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValues()
 {
     uno::Sequence<beans::PropertyValue> aRet(1);
     beans::PropertyValue* pArray = aRet.getArray();
@@ -129,8 +129,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu
 }
 
 void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence<beans::PropertyValue>& aProps )
-                    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                            lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const beans::PropertyValue* pPropArray = aProps.getConstArray();
     long nPropCount = aProps.getLength();
@@ -152,12 +150,12 @@ void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence<beans::
 
 // XExecutableDialog
 
-void SAL_CALL ScFilterOptionsObj::setTitle( const OUString& /* aTitle */ ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScFilterOptionsObj::setTitle( const OUString& /* aTitle */ )
 {
     // not used
 }
 
-sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL ScFilterOptionsObj::execute()
 {
     sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
 
@@ -301,7 +299,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st
 // XImporter
 
 void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang::XComponent>& /* xDoc */ )
-                            throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     bExport = false;
 }
@@ -309,7 +306,6 @@ void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang::
 // XExporter
 
 void SAL_CALL ScFilterOptionsObj::setSourceDocument( const uno::Reference<lang::XComponent>& /* xDoc */ )
-                            throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     bExport = true;
 }
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index edc5e48a3aa7..0a74f29beecf 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -245,7 +245,6 @@ ScTableConditionalEntry* ScTableConditionalFormat::GetObjectByIndex_Impl(sal_uIn
 
 void SAL_CALL ScTableConditionalFormat::addNew(
                     const uno::Sequence<beans::PropertyValue >& aConditionalEntry )
-                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScCondFormatEntryItem aEntry;
@@ -340,7 +339,6 @@ void SAL_CALL ScTableConditionalFormat::addNew(
 }
 
 void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -350,7 +348,7 @@ void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex )
     }
 }
 
-void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScTableConditionalFormat::clear()
 {
     SolarMutexGuard aGuard;
     maEntries.clear();
@@ -359,7 +357,6 @@ void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException, std
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableConditionalEntryEnumeration"));
@@ -367,15 +364,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::creat
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScTableConditionalFormat::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScTableConditionalFormat::getCount()
 {
     SolarMutexGuard aGuard;
     return maEntries.size();
 }
 
 uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XSheetConditionalEntry> xEntry(GetObjectByIndex_Impl((sal_uInt16)nIndex));
@@ -385,13 +380,13 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScTableConditionalFormat::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScTableConditionalFormat::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XSheetConditionalEntry>::get();
 }
 
-sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTableConditionalFormat::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -408,8 +403,6 @@ static OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex )
 }
 
 uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -429,7 +422,6 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName )
 }
 
 uno::Sequence<OUString> SAL_CALL ScTableConditionalFormat::getElementNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -443,7 +435,6 @@ uno::Sequence<OUString> SAL_CALL ScTableConditionalFormat::getElementNames()
 }
 
 sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const OUString& aName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -458,7 +449,7 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const OUString& aName )
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScTableConditionalFormat::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -506,60 +497,54 @@ void ScTableConditionalEntry::GetData(ScCondFormatEntryItem& rData) const
 // XSheetCondition
 
 sheet::ConditionOperator SAL_CALL ScTableConditionalEntry::getOperator()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return lcl_ConditionModeToOperator( aData.meMode );
 }
 
 void SAL_CALL ScTableConditionalEntry::setOperator( sheet::ConditionOperator nOperator )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aData.meMode = lcl_ConditionOperatorToMode( nOperator );
 }
 
 sal_Int32 SAL_CALL ScTableConditionalEntry::getConditionOperator()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return lcl_ConditionModeToOperatorNew( aData.meMode );
 }
 
 void SAL_CALL ScTableConditionalEntry::setConditionOperator( sal_Int32 nOperator )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aData.meMode = ScConditionEntry::GetModeFromApi( nOperator );
 }
 
-OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableConditionalEntry::getFormula1()
 {
     SolarMutexGuard aGuard;
     return aData.maExpr1;
 }
 
 void SAL_CALL ScTableConditionalEntry::setFormula1( const OUString& aFormula1 )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aData.maExpr1 = aFormula1;
 }
 
-OUString SAL_CALL ScTableConditionalEntry::getFormula2() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableConditionalEntry::getFormula2()
 {
     SolarMutexGuard aGuard;
     return aData.maExpr2;
 }
 
 void SAL_CALL ScTableConditionalEntry::setFormula2( const OUString& aFormula2 )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aData.maExpr2 = aFormula2;
 }
 
-table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() throw(uno::RuntimeException, std::exception)
+table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition()
 {
     SolarMutexGuard aGuard;
     table::CellAddress aRet;
@@ -570,7 +555,6 @@ table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() throw(u
 }
 
 void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddress& aSourcePosition )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aData.maPos.Set( (SCCOL)aSourcePosition.Column, (SCROW)aSourcePosition.Row, aSourcePosition.Sheet );
@@ -578,14 +562,13 @@ void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddre
 
 // XSheetConditionalEntry
 
-OUString SAL_CALL ScTableConditionalEntry::getStyleName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableConditionalEntry::getStyleName()
 {
     SolarMutexGuard aGuard;
     return ScStyleNameConversion::DisplayToProgrammaticName( aData.maStyle, SfxStyleFamily::Para );
 }
 
 void SAL_CALL ScTableConditionalEntry::setStyleName( const OUString& aStyleName )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aData.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStyleName, SfxStyleFamily::Para );
@@ -702,60 +685,54 @@ ScTableValidationObj::~ScTableValidationObj()
 // XSheetCondition
 
 sheet::ConditionOperator SAL_CALL ScTableValidationObj::getOperator()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return lcl_ConditionModeToOperator( (ScConditionMode)nMode );
 }
 
 void SAL_CALL ScTableValidationObj::setOperator( sheet::ConditionOperator nOperator )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToMode( nOperator ) );
 }
 
 sal_Int32 SAL_CALL ScTableValidationObj::getConditionOperator()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return lcl_ConditionModeToOperatorNew( (ScConditionMode)nMode );
 }
 
 void SAL_CALL ScTableValidationObj::setConditionOperator( sal_Int32 nOperator )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     nMode = sal::static_int_cast<sal_uInt16>( ScConditionEntry::GetModeFromApi( nOperator ) );
 }
 
-OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableValidationObj::getFormula1()
 {
     SolarMutexGuard aGuard;
     return aExpr1;
 }
 
 void SAL_CALL ScTableValidationObj::setFormula1( const OUString& aFormula1 )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aExpr1 = aFormula1;
 }
 
-OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTableValidationObj::getFormula2()
 {
     SolarMutexGuard aGuard;
     return aExpr2;
 }
 
 void SAL_CALL ScTableValidationObj::setFormula2( const OUString& aFormula2 )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aExpr2 = aFormula2;
 }
 
-table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() throw(uno::RuntimeException, std::exception)
+table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition()
 {
     SolarMutexGuard aGuard;
     table::CellAddress aRet;
@@ -766,14 +743,12 @@ table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() throw(uno:
 }
 
 void SAL_CALL ScTableValidationObj::setSourcePosition( const table::CellAddress& aSourcePosition )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aSrcPos.Set( (SCCOL)aSourcePosition.Column, (SCROW)aSourcePosition.Row, aSourcePosition.Sheet );
 }
 
 uno::Sequence<sheet::FormulaToken> SAL_CALL ScTableValidationObj::getTokens( sal_Int32 nIndex )
-                                            throw(uno::RuntimeException,lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nIndex >= 2 || nIndex < 0)
@@ -783,7 +758,6 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScTableValidationObj::getTokens( sal
 }
 
 void SAL_CALL ScTableValidationObj::setTokens( sal_Int32 nIndex, const uno::Sequence<sheet::FormulaToken>& aTokens )
-                                            throw(uno::RuntimeException,lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nIndex >= 2 || nIndex < 0)
@@ -801,13 +775,12 @@ void SAL_CALL ScTableValidationObj::setTokens( sal_Int32 nIndex, const uno::Sequ
     }
 }
 
-sal_Int32 SAL_CALL ScTableValidationObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScTableValidationObj::getCount()
 {
     return 2;
 }
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableValidationObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -817,9 +790,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableValidationObj::getProper
 
 void SAL_CALL ScTableValidationObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -930,8 +900,6 @@ void SAL_CALL ScTableValidationObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -981,7 +949,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableValidationObj )
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScTableValidationObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 5fae65828bf0..1f90c52d0525 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -211,19 +211,17 @@ ScFunctionAcceess_get_implementation(css::uno::XComponentContext*, css::uno::Seq
 }
 
 // XServiceInfo
-OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScFunctionAccess::getImplementationName()
 {
     return OUString("stardiv.StarCalc.ScFunctionAccess");
 }
 
 sal_Bool SAL_CALL ScFunctionAccess::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {SCFUNCTIONACCESS_SERVICE, SCDOCSETTINGS_SERVICE};
 }
@@ -231,7 +229,6 @@ uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames()
 // XPropertySet (document settings)
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -241,9 +238,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySe
 
 void SAL_CALL ScFunctionAccess::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -266,8 +260,6 @@ void SAL_CALL ScFunctionAccess::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -459,8 +451,6 @@ static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArr
 
 uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName,
                             const uno::Sequence<uno::Any>& aArguments )
-                throw (container::NoSuchElementException, lang::IllegalArgumentException,
-                       uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index d001bd989c93..64528ab62133 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -126,13 +126,13 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const
 
 // XNamed
 
-OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScSheetLinkObj::getName()
 {
     SolarMutexGuard aGuard;
     return getFileName();   // Name ist der Dateiname (URL)
 }
 
-void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScSheetLinkObj::setName( const OUString& aName )
 {
     SolarMutexGuard aGuard;
     setFileName(aName);     // Name ist der Dateiname (URL)
@@ -141,7 +141,6 @@ void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::Runtim
 // XRefreshable
 
 void SAL_CALL ScSheetLinkObj::refresh()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScTableLink* pLink = GetLink_Impl();
@@ -151,7 +150,6 @@ void SAL_CALL ScSheetLinkObj::refresh()
 
 void SAL_CALL ScSheetLinkObj::addRefreshListener(
     const uno::Reference<util::XRefreshListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aRefreshListeners.push_back( xListener );
@@ -163,7 +161,6 @@ void SAL_CALL ScSheetLinkObj::addRefreshListener(
 
 void SAL_CALL ScSheetLinkObj::removeRefreshListener(
                                 const uno::Reference<util::XRefreshListener >& xListener )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     size_t nCount = aRefreshListeners.size();
@@ -198,7 +195,6 @@ void ScSheetLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh )
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSheetLinkObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -208,9 +204,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSheetLinkObj::getPropertySetI
 
 void SAL_CALL ScSheetLinkObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aValStr;
@@ -244,8 +237,6 @@ void SAL_CALL ScSheetLinkObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -442,14 +433,13 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName)
 
 // XEnumerationAccess
 uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetLinksEnumeration"));
 }
 
 // XIndexAccess
-sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScSheetLinksObj::getCount()
 {
     typedef std::unordered_set<OUString, OUStringHash> StrSetType;
 
@@ -475,8 +465,6 @@ sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException, std:
 }
 
 uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<beans::XPropertySet> xLink(GetObjectByIndex_Impl(nIndex));
@@ -486,21 +474,19 @@ uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScSheetLinksObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScSheetLinksObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<beans::XPropertySet>::get();
 }
 
-sal_Bool SAL_CALL ScSheetLinksObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScSheetLinksObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
 }
 
 uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<beans::XPropertySet> xLink(GetObjectByName_Impl(aName));
@@ -512,7 +498,6 @@ uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName )
 }
 
 sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //  Name ist der Dateiname
@@ -533,7 +518,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName )
     return false;
 }
 
-uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames()
 {
     typedef std::unordered_set<OUString, OUStringHash> StrSetType;
 
@@ -679,7 +664,6 @@ void ScAreaLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh )
 // XRefreshable
 
 void SAL_CALL ScAreaLinkObj::refresh()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos);
@@ -689,7 +673,6 @@ void SAL_CALL ScAreaLinkObj::refresh()
 
 void SAL_CALL ScAreaLinkObj::addRefreshListener(
     const uno::Reference<util::XRefreshListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aRefreshListeners.push_back( xListener );
@@ -701,7 +684,6 @@ void SAL_CALL ScAreaLinkObj::addRefreshListener(
 
 void SAL_CALL ScAreaLinkObj::removeRefreshListener(
                                 const uno::Reference<util::XRefreshListener >& xListener )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     size_t nCount = aRefreshListeners.size();
@@ -732,7 +714,6 @@ void ScAreaLinkObj::Refreshed_Impl()
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAreaLinkObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -742,9 +723,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAreaLinkObj::getPropertySetIn
 
 void SAL_CALL ScAreaLinkObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aValStr;
@@ -778,8 +756,6 @@ void SAL_CALL ScAreaLinkObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -866,7 +842,7 @@ void ScAreaLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay)
 
 // XAreaLink
 
-OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAreaLinkObj::getSourceArea()
 {
     SolarMutexGuard aGuard;
     OUString aRet;
@@ -877,13 +853,12 @@ OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException, st
 }
 
 void SAL_CALL ScAreaLinkObj::setSourceArea( const OUString& aSourceArea )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Modify_Impl( nullptr, nullptr, nullptr, &aSourceArea, nullptr );
 }
 
-table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() throw(uno::RuntimeException, std::exception)
+table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea()
 {
     SolarMutexGuard aGuard;
     table::CellRangeAddress aRet;
@@ -894,7 +869,6 @@ table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() throw(uno::Runtime
 }
 
 void SAL_CALL ScAreaLinkObj::setDestArea( const table::CellRangeAddress& aDestArea )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Modify_Impl( nullptr, nullptr, nullptr, nullptr, &aDestArea );
@@ -939,7 +913,6 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP
                                                 const OUString& aSourceArea,
                                                 const OUString& aFilter,
                                                 const OUString& aFilterOptions )
-                                            throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -954,7 +927,7 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP
     }
 }
 
-void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex )
 {
     SolarMutexGuard aGuard;
     ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, (size_t)nIndex);
@@ -970,7 +943,6 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Runti
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAreaLinksEnumeration"));
@@ -978,7 +950,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScAreaLinksObj::getCount()
 {
     SolarMutexGuard aGuard;
     sal_Int32 nAreaCount = 0;
@@ -997,8 +969,6 @@ sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException, std::
 }
 
 uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XAreaLink> xLink(GetObjectByIndex_Impl(nIndex));
@@ -1008,13 +978,13 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScAreaLinksObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScAreaLinksObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XAreaLink>::get();
 }
 
-sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScAreaLinksObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -1068,13 +1038,13 @@ static OUString lcl_BuildDDEName( const OUString& rAppl, const OUString& rTopic,
     return aRet;
 }
 
-OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDDELinkObj::getName()
 {
     SolarMutexGuard aGuard;
     return lcl_BuildDDEName( aAppl, aTopic, aItem );
 }
 
-void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ )
 {
     //  name can't be changed (formulas wouldn't find the link)
     throw uno::RuntimeException();
@@ -1082,7 +1052,7 @@ void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) throw(uno::Ru
 
 // XDDELink
 
-OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDDELinkObj::getApplication()
 {
     SolarMutexGuard aGuard;
     //! Test, ob Link noch im Dokument enthalten?
@@ -1090,7 +1060,7 @@ OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException, st
     return aAppl;
 }
 
-OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDDELinkObj::getTopic()
 {
     SolarMutexGuard aGuard;
     //! Test, ob Link noch im Dokument enthalten?
@@ -1098,7 +1068,7 @@ OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException, std::exc
     return aTopic;
 }
 
-OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScDDELinkObj::getItem()
 {
     SolarMutexGuard aGuard;
     //! Test, ob Link noch im Dokument enthalten?
@@ -1108,7 +1078,7 @@ OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException, std::exce
 
 // XRefreshable
 
-void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScDDELinkObj::refresh()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1120,7 +1090,6 @@ void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException, std::exceptio
 
 void SAL_CALL ScDDELinkObj::addRefreshListener(
     const uno::Reference<util::XRefreshListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aRefreshListeners.push_back( xListener );
@@ -1132,7 +1101,6 @@ void SAL_CALL ScDDELinkObj::addRefreshListener(
 
 void SAL_CALL ScDDELinkObj::removeRefreshListener(
                                 const uno::Reference<util::XRefreshListener >& xListener )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     size_t nCount = aRefreshListeners.size();
@@ -1152,7 +1120,6 @@ void SAL_CALL ScDDELinkObj::removeRefreshListener(
 // XDDELinkResults
 
 uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence< uno::Sequence< uno::Any > > aReturn;
@@ -1187,7 +1154,6 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults(  )
 }
 
 void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& aResults )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bSuccess = false;
@@ -1276,7 +1242,6 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const OUString& aName)
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DDELinksEnumeration"));
@@ -1284,7 +1249,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScDDELinksObj::getCount()
 {
     SolarMutexGuard aGuard;
     sal_Int32 nAreaCount = 0;
@@ -1294,8 +1259,6 @@ sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException, std::e
 }
 
 uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XDDELink> xLink(GetObjectByIndex_Impl(nIndex));
@@ -1305,21 +1268,19 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScDDELinksObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScDDELinksObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XDDELink>::get();
 }
 
-sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScDDELinksObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
 }
 
 uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XDDELink> xLink(GetObjectByName_Impl(aName));
@@ -1329,7 +1290,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName )
         throw container::NoSuchElementException();
 }
 
-uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1352,7 +1313,6 @@ uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::Run
 }
 
 sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1376,7 +1336,6 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName )
 uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink(
     const OUString& aApplication, const OUString& aTopic,
     const OUString& aItem, css::sheet::DDELinkMode nMode )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< sheet::XDDELink > xLink;
@@ -1436,7 +1395,6 @@ ScExternalSheetCacheObj::~ScExternalSheetCacheObj()
 }
 
 void SAL_CALL ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nRow, const Any& rValue)
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nRow < 0 || nCol < 0)
@@ -1461,7 +1419,6 @@ void SAL_CALL ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nR
 }
 
 Any SAL_CALL ScExternalSheetCacheObj::getCellValue(sal_Int32 nCol, sal_Int32 nRow)
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nRow < 0 || nCol < 0)
@@ -1493,7 +1450,6 @@ Any SAL_CALL ScExternalSheetCacheObj::getCellValue(sal_Int32 nCol, sal_Int32 nRo
 }
 
 Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllRows()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     vector<SCROW> aRows;
@@ -1507,7 +1463,6 @@ Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllRows()
 }
 
 Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllColumns(sal_Int32 nRow)
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nRow < 0)
@@ -1524,7 +1479,6 @@ Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllColumns(sal_Int32
 }
 
 sal_Int32 SAL_CALL ScExternalSheetCacheObj::getTokenIndex()
-        throw (RuntimeException, std::exception)
 {
     return static_cast< sal_Int32 >( mnIndex );
 }
@@ -1540,7 +1494,6 @@ ScExternalDocLinkObj::~ScExternalDocLinkObj()
 
 Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetCache(
     const OUString& aSheetName, sal_Bool bDynamicCache )
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     size_t nIndex = 0;
@@ -1554,7 +1507,6 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC
 }
 
 Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName)
-        throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     size_t nIndex = 0;
@@ -1568,7 +1520,6 @@ Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName)
 }
 
 Sequence< OUString > SAL_CALL ScExternalDocLinkObj::getElementNames()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     vector<OUString> aTabNames;
@@ -1588,7 +1539,6 @@ Sequence< OUString > SAL_CALL ScExternalDocLinkObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScExternalDocLinkObj::hasByName(const OUString &aName)
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1598,7 +1548,6 @@ sal_Bool SAL_CALL ScExternalDocLinkObj::hasByName(const OUString &aName)
 }
 
 sal_Int32 SAL_CALL ScExternalDocLinkObj::getCount()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1607,7 +1556,6 @@ sal_Int32 SAL_CALL ScExternalDocLinkObj::getCount()
 }
 
 Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nApiIndex)
-        throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1628,7 +1576,6 @@ Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nApiIndex)
 }
 
 Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumeration()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Reference< container::XEnumeration > aRef(
@@ -1638,14 +1585,12 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer
 }
 
 uno::Type SAL_CALL ScExternalDocLinkObj::getElementType()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XExternalDocLink>::get();
 }
 
 sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1654,7 +1599,6 @@ sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements()
 }
 
 sal_Int32 SAL_CALL ScExternalDocLinkObj::getTokenIndex()
-        throw (RuntimeException, std::exception)
 {
     return static_cast<sal_Int32>(mnFileId);
 }
@@ -1671,7 +1615,6 @@ ScExternalDocLinksObj::~ScExternalDocLinksObj()
 
 Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink(
     const OUString& aDocName )
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aDocUrl( ScGlobal::GetAbsDocName( aDocName, mpDocShell));
@@ -1681,7 +1624,6 @@ Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink(
 }
 
 Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName)
-        throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aDocUrl( ScGlobal::GetAbsDocName( aName, mpDocShell));
@@ -1695,7 +1637,6 @@ Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName)
 }
 
 Sequence< OUString > SAL_CALL ScExternalDocLinksObj::getElementNames()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_uInt16 n = mpRefMgr->getExternalFileCount();
@@ -1710,21 +1651,18 @@ Sequence< OUString > SAL_CALL ScExternalDocLinksObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScExternalDocLinksObj::hasByName(const OUString &aName)
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return mpRefMgr->hasExternalFile(aName);
 }
 
 sal_Int32 SAL_CALL ScExternalDocLinksObj::getCount()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return mpRefMgr->getExternalFileCount();
 }
 
 Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex)
-        throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nIndex > ::std::numeric_limits<sal_uInt16>::max() || nIndex < ::std::numeric_limits<sal_uInt16>::min())
@@ -1740,7 +1678,6 @@ Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex)
 }
 
 Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnumeration()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Reference< container::XEnumeration > aRef(
@@ -1750,14 +1687,12 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume
 }
 
 uno::Type SAL_CALL ScExternalDocLinksObj::getElementType()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XExternalDocLinks>::get();
 }
 
 sal_Bool SAL_CALL ScExternalDocLinksObj::hasElements()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return mpRefMgr->getExternalFileCount() > 0;
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index bb9a8ac68203..d3920166ad40 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -200,14 +200,13 @@ ScIndexEnumeration::~ScIndexEnumeration()
 
 // XEnumeration
 
-sal_Bool SAL_CALL ScIndexEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScIndexEnumeration::hasMoreElements()
 {
     SolarMutexGuard aGuard;
     return ( nPos < xIndex->getCount() );
 }
 
-uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchElementException,
-                                        lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScIndexEnumeration::nextElement()
 {
     SolarMutexGuard aGuard;
     uno::Any aReturn;
@@ -223,20 +222,17 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme
 }
 
 OUString SAL_CALL ScIndexEnumeration::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return OUString("ScIndexEnumeration");
 }
 
 sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< OUString >
     SAL_CALL ScIndexEnumeration::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<OUString> aRet { sServiceName };
     return aRet;
@@ -258,15 +254,12 @@ ScNameToIndexAccess::~ScNameToIndexAccess()
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScNameToIndexAccess::getCount(  ) throw(css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScNameToIndexAccess::getCount(  )
 {
     return aNames.getLength();
 }
 
 css::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex )
-                                throw(css::lang::IndexOutOfBoundsException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception)
 {
     if ( xNameAccess.is() && nIndex >= 0 && nIndex < aNames.getLength() )
         return xNameAccess->getByName( aNames.getConstArray()[nIndex] );
@@ -277,7 +270,6 @@ css::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex )
 // XElementAccess
 
 css::uno::Type SAL_CALL ScNameToIndexAccess::getElementType(  )
-                                throw(css::uno::RuntimeException, std::exception)
 {
     if ( xNameAccess.is() )
         return xNameAccess->getElementType();
@@ -285,7 +277,7 @@ css::uno::Type SAL_CALL ScNameToIndexAccess::getElementType(  )
         return uno::Type();
 }
 
-sal_Bool SAL_CALL ScNameToIndexAccess::hasElements(  ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScNameToIndexAccess::hasElements(  )
 {
     return getCount() > 0;
 }
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index b71f9f56925f..5fc43a4c174a 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -210,14 +210,13 @@ void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray*
     }
 }
 
-OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScNamedRangeObj::getName()
 {
     SolarMutexGuard aGuard;
     return aName;
 }
 
 void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //! adapt formulas ?????
@@ -230,7 +229,7 @@ void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName )
         throw uno::RuntimeException();      // no other exceptions specified
 }
 
-OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScNamedRangeObj::getContent()
 {
     SolarMutexGuard aGuard;
     OUString aContent;
@@ -242,7 +241,6 @@ OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException, std
 }
 
 void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aContStr(aContent);
@@ -251,7 +249,6 @@ void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent )
 }
 
 table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAddress aPos;
@@ -277,7 +274,6 @@ table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition()
 }
 
 void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& aReferencePosition )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAddress aPos( (SCCOL)aReferencePosition.Column, (SCROW)aReferencePosition.Row, aReferencePosition.Sheet );
@@ -285,7 +281,7 @@ void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& a
     Modify_Impl( nullptr, nullptr, nullptr, &aPos, nullptr,formula::FormulaGrammar::GRAM_API );
 }
 
-sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScNamedRangeObj::getType()
 {
     SolarMutexGuard aGuard;
     sal_Int32 nType=0;
@@ -302,7 +298,6 @@ sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException, std::
 }
 
 void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScRangeData::Type nNewType = ScRangeData::Type::Name;
@@ -318,7 +313,6 @@ void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType )
 // XFormulaTokens
 
 uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence<sheet::FormulaToken> aSequence;
@@ -333,7 +327,6 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens()
 }
 
 void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( pDocShell )
@@ -348,7 +341,6 @@ void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToke
 // XCellRangeSource
 
 uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScRange aRange;
@@ -368,7 +360,6 @@ uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells()
 // beans::XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference< beans::XPropertySetInfo >  aRef(new SfxItemPropertySetInfo( lcl_GetNamedRangeMap() ));
@@ -377,9 +368,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySet
 
 void SAL_CALL ScNamedRangeObj::setPropertyValue(
                         const OUString& rPropertyName, const uno::Any& /*aValue*/ )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( rPropertyName == SC_UNONAME_ISSHAREDFMLA )
@@ -389,8 +377,6 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const OUString& rPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -420,19 +406,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj )
 
 // lang::XServiceInfo
 
-OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScNamedRangeObj::getImplementationName()
 {
     return OUString( "ScNamedRangeObj" );
 }
 
 sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {SCNAMEDRANGEOBJ_SERVICE, SCLINKTARGET_SERVICE};
 }
@@ -440,7 +424,7 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames()
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScNamedRangeObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -491,7 +475,6 @@ void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName,
     const OUString& aContent, const table::CellAddress& aPosition,
     sal_Int32 nUnoType )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAddress aPos( (SCCOL)aPosition.Column, (SCROW)aPosition.Row, aPosition.Sheet );
@@ -531,7 +514,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName,
 }
 
 void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& aSource,
-                                    sheet::Border aBorder ) throw(uno::RuntimeException, std::exception)
+                                    sheet::Border aBorder )
 {
     SolarMutexGuard aGuard;
     //! this cannot be an enum, because multiple bits can be set !!!
@@ -555,7 +538,6 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress&
 }
 
 void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -580,7 +562,6 @@ void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName )
 }
 
 void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPosition )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScAddress aPos( (SCCOL)aOutputPosition.Column, (SCROW)aOutputPosition.Row, aOutputPosition.Sheet );
@@ -591,7 +572,6 @@ void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPos
 // container::XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.NamedRangesEnumeration"));
@@ -599,7 +579,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumera
 
 // container::XIndexAccess
 
-sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScNamedRangesObj::getCount()
 {
     SolarMutexGuard aGuard;
     long nRet = 0;
@@ -618,8 +598,6 @@ sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< sheet::XNamedRange >  xRange(GetObjectByIndex_Impl((sal_uInt16)nIndex));
@@ -629,20 +607,19 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScNamedRangesObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScNamedRangesObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XNamedRange>::get();   // must be suitable for getByIndex
 }
 
-sal_Bool SAL_CALL ScNamedRangesObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScNamedRangesObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
 }
 
 Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangesObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     static Reference<beans::XPropertySetInfo> aRef(
         new SfxItemPropertySetInfo(lcl_GetNamedRangesMap()));
@@ -651,9 +628,6 @@ Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangesObj::getPropertySetInfo
 
 void SAL_CALL ScNamedRangesObj::setPropertyValue(
                         const OUString& rPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     if ( rPropertyName == SC_UNO_MODIFY_BROADCAST )
     {
@@ -662,8 +636,6 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue(
 }
 
 Any SAL_CALL ScNamedRangesObj::getPropertyValue( const OUString& rPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     Any aRet;
     if ( rPropertyName == SC_UNO_MODIFY_BROADCAST )
@@ -677,8 +649,6 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const OUString& rPropertyName )
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangesObj )
 
 uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< sheet::XNamedRange >  xRange(GetObjectByName_Impl(aName));
@@ -689,7 +659,6 @@ uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName )
 }
 
 uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -714,7 +683,6 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -744,13 +712,13 @@ void ScNamedRangesObj::unlock()
 
 // document::XActionLockable
 
-sal_Bool ScNamedRangesObj::isActionLocked() throw(uno::RuntimeException, std::exception)
+sal_Bool ScNamedRangesObj::isActionLocked()
 {
     SolarMutexGuard aGuard;
     return pDocShell->GetDocument().GetNamedRangesLockCount() != 0;
 }
 
-void ScNamedRangesObj::addActionLock() throw(uno::RuntimeException, std::exception)
+void ScNamedRangesObj::addActionLock()
 {
     SolarMutexGuard aGuard;
     ScDocument& rDoc = pDocShell->GetDocument();
@@ -763,7 +731,7 @@ void ScNamedRangesObj::addActionLock() throw(uno::RuntimeException, std::excepti
     rDoc.SetNamedRangesLockCount( nLockCount );
 }
 
-void ScNamedRangesObj::removeActionLock() throw(uno::RuntimeException, std::exception)
+void ScNamedRangesObj::removeActionLock()
 {
     SolarMutexGuard aGuard;
     ScDocument& rDoc = pDocShell->GetDocument();
@@ -779,7 +747,7 @@ void ScNamedRangesObj::removeActionLock() throw(uno::RuntimeException, std::exce
     }
 }
 
-void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException, std::exception)
+void ScNamedRangesObj::setActionLocks( sal_Int16 nLock )
 {
     SolarMutexGuard aGuard;
     if ( nLock >= 0 )
@@ -798,7 +766,7 @@ void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeExcep
     }
 }
 
-sal_Int16 ScNamedRangesObj::resetActionLocks() throw(uno::RuntimeException, std::exception)
+sal_Int16 ScNamedRangesObj::resetActionLocks()
 {
     SolarMutexGuard aGuard;
     ScDocument& rDoc = pDocShell->GetDocument();
@@ -1003,7 +971,6 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData )
 // sheet::XLabelRange
 
 table::CellRangeAddress SAL_CALL ScLabelRangeObj::getLabelArea()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     table::CellRangeAddress aRet;
@@ -1014,7 +981,6 @@ table::CellRangeAddress SAL_CALL ScLabelRangeObj::getLabelArea()
 }
 
 void SAL_CALL ScLabelRangeObj::setLabelArea( const table::CellRangeAddress& aLabelArea )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScRange aLabelRange;
@@ -1023,7 +989,6 @@ void SAL_CALL ScLabelRangeObj::setLabelArea( const table::CellRangeAddress& aLab
 }
 
 table::CellRangeAddress SAL_CALL ScLabelRangeObj::getDataArea()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     table::CellRangeAddress aRet;
@@ -1034,7 +999,6 @@ table::CellRangeAddress SAL_CALL ScLabelRangeObj::getDataArea()
 }
 
 void SAL_CALL ScLabelRangeObj::setDataArea( const table::CellRangeAddress& aDataArea )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScRange aDataRange;
@@ -1087,7 +1051,6 @@ ScLabelRangeObj* ScLabelRangesObj::GetObjectByIndex_Impl(size_t nIndex)
 
 void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelArea,
                                 const table::CellRangeAddress& aDataArea )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1119,7 +1082,6 @@ void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelAre
 }
 
 void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -1158,7 +1120,6 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex )
 // container::XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.LabelRangesEnumeration"));
@@ -1166,7 +1127,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumera
 
 // container::XIndexAccess
 
-sal_Int32 SAL_CALL ScLabelRangesObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScLabelRangesObj::getCount()
 {
     SolarMutexGuard aGuard;
     if (pDocShell)
@@ -1180,8 +1141,6 @@ sal_Int32 SAL_CALL ScLabelRangesObj::getCount() throw(uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< sheet::XLabelRange >  xRange(GetObjectByIndex_Impl((sal_uInt16)nIndex));
@@ -1191,14 +1150,14 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScLabelRangesObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScLabelRangesObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XLabelRange>::get();   // must be suitable for getByIndex
 
 }
 
-sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScLabelRangesObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index ec1d5956043f..c21b1a62cff7 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -89,7 +89,7 @@ void ScAnnotationObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // XChild
 
-uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno::RuntimeException, std::exception)
+uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent()
 {
     SolarMutexGuard aGuard;
 
@@ -103,7 +103,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno:
 }
 
 void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>& /* Parent */ )
-                                    throw(lang::NoSupportException, uno::RuntimeException, std::exception)
 {
     //  hamma nich
     //! Exception oder so ??!
@@ -112,7 +111,6 @@ void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>&
 // XSimpleText
 
 uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //  Notizen brauchen keine Extrawurst
@@ -121,20 +119,19 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor()
 
 uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRange(
                                     const uno::Reference<text::XTextRange>& aTextPosition )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //  Notizen brauchen keine Extrawurst
     return GetUnoText().createTextCursorByRange(aTextPosition);
 }
 
-OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScAnnotationObj::getString()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getString();
 }
 
-void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScAnnotationObj::setString( const OUString& aText )
 {
     SolarMutexGuard aGuard;
     GetUnoText().setString(aText);
@@ -142,7 +139,6 @@ void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::Run
 
 void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRange>& xRange,
                                             const OUString& aString, sal_Bool bAbsorb )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetUnoText().insertString( xRange, aString, bAbsorb );
@@ -150,25 +146,24 @@ void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRan
 
 void SAL_CALL ScAnnotationObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange,
                                             sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetUnoText().insertControlCharacter( xRange, nControlCharacter, bAbsorb );
 }
 
-uno::Reference<text::XText> SAL_CALL ScAnnotationObj::getText() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XText> SAL_CALL ScAnnotationObj::getText()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getText();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getStart()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getStart();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd()
 {
     SolarMutexGuard aGuard;
     return GetUnoText().getEnd();
@@ -176,7 +171,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::R
 
 // XSheetAnnotation
 
-table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeException, std::exception)
+table::CellAddress SAL_CALL ScAnnotationObj::getPosition()
 {
     SolarMutexGuard aGuard;
     table::CellAddress aAdr;
@@ -187,7 +182,6 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc
 }
 
 OUString SAL_CALL ScAnnotationObj::getAuthor()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScPostIt* pNote = ImplGetNote();
@@ -195,21 +189,20 @@ OUString SAL_CALL ScAnnotationObj::getAuthor()
 }
 
 OUString SAL_CALL ScAnnotationObj::getDate()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const ScPostIt* pNote = ImplGetNote();
     return pNote ? pNote->GetDate() : OUString();
 }
 
-sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScAnnotationObj::getIsVisible()
 {
     SolarMutexGuard aGuard;
     const ScPostIt* pNote = ImplGetNote();
     return pNote && pNote->IsCaptionShown();
 }
 
-void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible )
 {
     SolarMutexGuard aGuard;
     // show/hide note with undo action
@@ -219,8 +212,6 @@ void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::Ru
 
 // XSheetAnnotationShapeSupplier
 uno::Reference < drawing::XShape > SAL_CALL ScAnnotationObj::getAnnotationShape()
-                                throw(css::uno::RuntimeException,
-                                      std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference < drawing::XShape > xShape;
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index ff479fe92677..0731ef75cb06 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -198,9 +198,6 @@ ScDocOptionsObj::~ScDocOptionsObj()
 
 void SAL_CALL ScDocOptionsObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -211,8 +208,6 @@ void SAL_CALL ScDocOptionsObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx
index a1566c7d397c..c2b49d86ed19 100644
--- a/sc/source/ui/unoobj/pageuno.cxx
+++ b/sc/source/ui/unoobj/pageuno.cxx
@@ -34,7 +34,6 @@ ScPageObj::~ScPageObj() throw()
 }
 
 uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const
-    throw (css::uno::RuntimeException, std::exception)
 {
     uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::CreateShape( pObj ));
 
@@ -44,19 +43,16 @@ uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const
 }
 
 OUString SAL_CALL ScPageObj::getImplementationName()
-                                throw(uno::RuntimeException, std::exception)
 {
     return OUString("ScPageObj");
 }
 
 sal_Bool SAL_CALL ScPageObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScPageObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence<OUString> aRet { "com.sun.star.sheet.SpreadsheetDrawPage" };
     return aRet;
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 6e3318bdddc8..f0372bae38c7 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -261,7 +261,6 @@ static bool lcl_MayBeDBase( SvStream& rStream )
 }
 
 OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor )
-    throw( uno::RuntimeException, std::exception )
 {
     MediaDescriptor aMediaDesc( lDescriptor );
     OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() );
@@ -328,19 +327,17 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
     return aTypeName;
 }
 
-OUString SAL_CALL ScFilterDetect::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScFilterDetect::getImplementationName()
 {
     return OUString("com.sun.star.comp.calc.FormatDetector");
 }
 
 sal_Bool ScFilterDetect::supportsService( const OUString& sServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence<OUString> seqServiceNames { "com.sun.star.frame.ExtendedTypeDetection" };
     return seqServiceNames;
diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx
index f5e00db299d6..e97bfbf416d2 100644
--- a/sc/source/ui/unoobj/scdetect.hxx
+++ b/sc/source/ui/unoobj/scdetect.hxx
@@ -43,14 +43,13 @@ public:
     virtual ~ScFilterDetect() override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::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;
 
     // XExtendedFilterDetect
 
-    virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) override;
 };
 
 #endif
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 6511c5abb31f..0f15c36fdf64 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -92,7 +92,7 @@ public:
         maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs );
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         SolarMutexGuard aGuard;
         maCachedObject = uno::Any(); // clear cached object
@@ -135,14 +135,14 @@ public:
         return maCachedObject.hasValue();
 
     }
-    css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    css::uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         SolarMutexGuard aGuard;
         if ( !hasByName( aName ) )
             throw css::container::NoSuchElementException();
         return maCachedObject;
     }
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         SolarMutexGuard aGuard;
         ScDocument& rDoc = mpDocShell->GetDocument();
@@ -159,8 +159,8 @@ public:
         return aNames;
     }
     // XElemenAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override { return uno::Type(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception ) override { return true; }
+    virtual css::uno::Type SAL_CALL getElementType(  ) override { return uno::Type(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return true; }
 
 };
 
@@ -170,7 +170,7 @@ class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper< document::XCodeName
 public:
     explicit ScVbaCodeNameProvider( ScDocShell& rDocShell ) : mrDocShell(rDocShell) {}
     // XCodeNameQuery
-    OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) override
+    OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) override
     {
         SolarMutexGuard aGuard;
         OUString sCodeName;
@@ -209,8 +209,7 @@ public:
         return sCodeName;
     }
 
-    OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer )
-            throw( uno::RuntimeException, std::exception ) override
+    OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) override
     {
         SolarMutexGuard aGuard;
         uno::Reference<drawing::XDrawPagesSupplier> xSupplier(mrDocShell.GetModel(), uno::UNO_QUERY_THROW);
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index eb850fae4082..ec65204dab54 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -136,7 +136,6 @@ ScShapeObj::~ScShapeObj()
 // XInterface
 
 uno::Any SAL_CALL ScShapeObj::queryInterface( const uno::Type& rType )
-                                                throw(uno::RuntimeException, std::exception)
 {
     uno::Any aRet = ScShapeObj_Base::queryInterface( rType );
 
@@ -225,7 +224,6 @@ static uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<u
 //  XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -321,9 +319,6 @@ static awt::Point lcl_GetRelativePos( uno::Reference< drawing::XShape >& xShape,
 }
 
 void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const uno::Any& aValue)
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-          lang::IllegalArgumentException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -652,8 +647,6 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const
 }
 
 uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -838,8 +831,6 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName )
 
 void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyName,
                             const uno::Reference<beans::XPropertyChangeListener>& aListener)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -862,8 +853,6 @@ void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyNa
 
 void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropertyName,
                             const uno::Reference<beans::XPropertyChangeListener>& aListener)
-                            throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -874,8 +863,6 @@ void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropert
 
 void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyName,
                             const uno::Reference<beans::XVetoableChangeListener>& aListener)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -886,8 +873,6 @@ void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyNa
 
 void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropertyName,
                             const uno::Reference<beans::XVetoableChangeListener>& aListener)
-                            throw(beans::UnknownPropertyException,
-                                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -899,7 +884,6 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropert
 //  XPropertyState
 
 beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPropertyName )
-                                throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -932,7 +916,6 @@ beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPro
 
 uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates(
                                 const uno::Sequence<OUString>& aPropertyNames )
-                            throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -947,8 +930,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates(
 }
 
 void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName )
-    throw (beans::UnknownPropertyException, uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -978,8 +959,6 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName )
 }
 
 uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName )
-                                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1003,7 +982,6 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName
 // XTextContent
 
 void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTextRange */ )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1011,7 +989,6 @@ void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTe
 }
 
 uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1052,7 +1029,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor()
 
 // XComponent
 
-void SAL_CALL ScShapeObj::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScShapeObj::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -1063,7 +1040,6 @@ void SAL_CALL ScShapeObj::dispose() throw(uno::RuntimeException, std::exception)
 
 void SAL_CALL ScShapeObj::addEventListener(
                         const uno::Reference<lang::XEventListener>& xListener )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1074,7 +1050,6 @@ void SAL_CALL ScShapeObj::addEventListener(
 
 void SAL_CALL ScShapeObj::removeEventListener(
                         const uno::Reference<lang::XEventListener>& xListener )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1102,7 +1077,6 @@ static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet
 void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRange>& xRange,
                                                 const uno::Reference<text::XTextContent>& xContent,
                                                 sal_Bool bAbsorb )
-                                    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1130,7 +1104,6 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan
 }
 
 void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent )
-                                throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1145,7 +1118,6 @@ void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextCon
 // Use own SvxUnoTextCursor subclass - everything is just passed to aggregated object
 
 uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1163,7 +1135,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor()
 
 uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange(
                                     const uno::Reference<text::XTextRange>& aTextPosition )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1187,7 +1158,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange(
 
 void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>& xRange,
                                         const OUString& aString, sal_Bool bAbsorb )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1200,7 +1170,6 @@ void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>&
 
 void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange,
                                                 sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1214,13 +1183,13 @@ void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTe
 // XTextRange
 // (parent of XSimpleText)
 
-uno::Reference<text::XText> SAL_CALL ScShapeObj::getText() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XText> SAL_CALL ScShapeObj::getText()
 {
     SolarMutexGuard aGuard;
     return this;
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart()
 {
     SolarMutexGuard aGuard;
 
@@ -1233,7 +1202,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::Runt
 //    return uno::Reference<text::XTextRange>();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -1246,7 +1215,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::Runtim
 //    return uno::Reference<text::XTextRange>();
 }
 
-OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScShapeObj::getString()
 {
     SolarMutexGuard aGuard;
 
@@ -1259,7 +1228,7 @@ OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException, std::exce
 //    return OUString();
 }
 
-void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScShapeObj::setString( const OUString& aText )
 {
     SolarMutexGuard aGuard;
 
@@ -1272,7 +1241,7 @@ void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeE
 
 // XChild
 
-uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() throw (uno::RuntimeException, std::exception)
+uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent()
 {
     SolarMutexGuard aGuard;
 
@@ -1307,14 +1276,14 @@ uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() throw (uno::R
     return nullptr;
 }
 
-void SAL_CALL ScShapeObj::setParent( const uno::Reference< uno::XInterface >& ) throw (lang::NoSupportException, uno::RuntimeException, std::exception)
+void SAL_CALL ScShapeObj::setParent( const uno::Reference< uno::XInterface >& )
 {
     throw lang::NoSupportException();
 }
 
 // XTypeProvider
 
-uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes()
 {
     uno::Sequence< uno::Type > aBaseTypes( ScShapeObj_Base::getTypes() );
 
@@ -1335,7 +1304,6 @@ uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeExcep
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1372,10 +1340,7 @@ public:
     }
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw (lang::IllegalArgumentException, container::NoSuchElementException,
-               lang::WrappedTargetException, uno::RuntimeException,
-               std::exception) override
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override
     {
         if ( !hasByName( aName ) )
             throw container::NoSuchElementException();
@@ -1411,9 +1376,7 @@ public:
     }
 
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName )
-        throw (container::NoSuchElementException, lang::WrappedTargetException,
-               uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         uno::Sequence< beans::PropertyValue > aProperties;
         ScMacroInfo* pInfo = getInfo(false);
@@ -1437,24 +1400,24 @@ public:
         return uno::Any( aProperties );
     }
 
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames() override
     {
         uno::Sequence<OUString> aSeq { SC_EVENTACC_ONCLICK };
         return aSeq;
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         return aName == SC_EVENTACC_ONCLICK;
     }
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType() override
     {
         return cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get();
     }
 
-    virtual sal_Bool SAL_CALL hasElements() throw(uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements() override
     {
         // elements are always present (but contained property sequences may be empty)
         return true;
@@ -1462,22 +1425,22 @@ public:
 };
 
 ::uno::Reference< container::XNameReplace > SAL_CALL
-ScShapeObj::getEvents(  ) throw(uno::RuntimeException, std::exception)
+ScShapeObj::getEvents(  )
 {
     return new ShapeUnoEventAccessImpl( this );
 }
 
-OUString SAL_CALL ScShapeObj::getImplementationName(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScShapeObj::getImplementationName(  )
 {
     return OUString( "com.sun.star.comp.sc.ScShapeObj" );
 }
 
-sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames(  )
 {
     uno::Reference<lang::XServiceInfo> xSI;
     if ( mxShapeAgg.is() )
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index 7fe453fe8c57..e572f669b758 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -95,14 +95,13 @@ ScCellSearchObj::~ScCellSearchObj()
 
 // XSearchDescriptor
 
-OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellSearchObj::getSearchString()
 {
     SolarMutexGuard aGuard;
     return pSearchItem->GetSearchString();
 }
 
 void SAL_CALL ScCellSearchObj::setSearchString( const OUString& aString )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     pSearchItem->SetSearchString( aString );
@@ -110,14 +109,13 @@ void SAL_CALL ScCellSearchObj::setSearchString( const OUString& aString )
 
 // XReplaceDescriptor
 
-OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellSearchObj::getReplaceString()
 {
     SolarMutexGuard aGuard;
     return pSearchItem->GetReplaceString();
 }
 
 void SAL_CALL ScCellSearchObj::setReplaceString( const OUString& aReplaceString )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     pSearchItem->SetReplaceString( aReplaceString );
@@ -126,7 +124,6 @@ void SAL_CALL ScCellSearchObj::setReplaceString( const OUString& aReplaceString
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellSearchObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -136,9 +133,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellSearchObj::getPropertySet
 
 void SAL_CALL ScCellSearchObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -160,8 +154,6 @@ void SAL_CALL ScCellSearchObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -189,19 +181,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj )
 
 // XServiceInfo
 
-OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScCellSearchObj::getImplementationName()
 {
     return OUString( "ScCellSearchObj" );
 }
 
 sal_Bool SAL_CALL ScCellSearchObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {SCSEARCHDESCRIPTOR_SERVICE, SCREPLACEDESCRIPTOR_SERVICE};
 }
@@ -209,7 +199,7 @@ uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames()
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScCellSearchObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index e646e70e5dfd..1b27d6f6e2fb 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -457,14 +457,12 @@ ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const OUString& aName
 
 // container::XIndexAccess
 
-sal_Int32 SAL_CALL ScStyleFamiliesObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScStyleFamiliesObj::getCount()
 {
     return SC_STYLE_FAMILY_COUNT;
 }
 
 uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< container::XNameContainer >  xFamily(GetObjectByIndex_Impl(nIndex));
@@ -475,13 +473,13 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex )
 //    return uno::Any();
 }
 
-uno::Type SAL_CALL ScStyleFamiliesObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScStyleFamiliesObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<container::XNameContainer>::get();    // muss zu getByIndex passen
 }
 
-sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -490,8 +488,6 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException,
 // container::XNameAccess
 
 uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName )
-                    throw(container::NoSuchElementException,
-                        lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< container::XNameContainer >  xFamily(GetObjectByName_Impl(aName));
@@ -503,13 +499,11 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName )
 }
 
 uno::Sequence<OUString> SAL_CALL ScStyleFamiliesObj::getElementNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     return {SC_FAMILYNAME_CELL, SC_FAMILYNAME_PAGE};
 }
 
 sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     return aName == SC_FAMILYNAME_CELL || aName == SC_FAMILYNAME_PAGE;
 }
@@ -518,7 +512,6 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName )
 
 void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const OUString& aURL,
                         const uno::Sequence<beans::PropertyValue>& aOptions )
-                                throw(io::IOException, uno::RuntimeException, std::exception)
 {
     //! use aOptions (like Writer)
     //! set flag to disable filter option dialogs when importing
@@ -533,7 +526,6 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const OUString& aURL,
 }
 
 uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderOptions()
-                                                throw(uno::RuntimeException, std::exception)
 {
     //  return defaults for options (?)
 
@@ -556,7 +548,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO
 
 void SAL_CALL ScStyleFamiliesObj::loadStylesFromDocument( const uno::Reference < lang::XComponent > & aSourceComponent,
                         const uno::Sequence<beans::PropertyValue>& aOptions )
-                                throw(io::IOException, uno::RuntimeException, std::exception)
 {
    // Source document docShell
    if ( !aSourceComponent.is() )
@@ -571,7 +562,6 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromDocument( const uno::Reference <
 
 void ScStyleFamiliesObj::loadStylesFromDocShell( ScDocShell* pSource,
                         const uno::Sequence<beans::PropertyValue>& aOptions )
-                                throw(io::IOException, uno::RuntimeException, std::exception)
 {
 
     if ( pSource && pDocShell )
@@ -662,8 +652,6 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const OUString& aName)
 }
 
 void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::Any& aElement )
-                            throw(lang::IllegalArgumentException, container::ElementExistException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bDone = false;
@@ -709,8 +697,6 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::
 }
 
 void SAL_CALL ScStyleFamilyObj::replaceByName( const OUString& aName, const uno::Any& aElement )
-                            throw(lang::IllegalArgumentException, container::NoSuchElementException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     //! zusammenfassen?
@@ -719,10 +705,6 @@ void SAL_CALL ScStyleFamilyObj::replaceByName( const OUString& aName, const uno:
 }
 
 void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName )
-                                throw(container::NoSuchElementException,
-                                      lang::WrappedTargetException,
-                                      uno::RuntimeException,
-                                      std::exception)
 {
     SolarMutexGuard aGuard;
     bool bFound = false;
@@ -777,7 +759,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName )
 
 // container::XIndexAccess
 
-sal_Int32 SAL_CALL ScStyleFamilyObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScStyleFamilyObj::getCount()
 {
     SolarMutexGuard aGuard;
     if ( pDocShell )
@@ -792,8 +774,6 @@ sal_Int32 SAL_CALL ScStyleFamilyObj::getCount() throw(uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< style::XStyle >  xObj(GetObjectByIndex_Impl(nIndex));
@@ -804,13 +784,13 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex )
 //    return uno::Any();
 }
 
-uno::Type SAL_CALL ScStyleFamilyObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScStyleFamilyObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<style::XStyle>::get();    // muss zu getByIndex passen
 }
 
-sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScStyleFamilyObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -819,8 +799,6 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException, s
 // container::XNameAccess
 
 uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName )
-            throw(container::NoSuchElementException,
-                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< style::XStyle > xObj(
@@ -833,7 +811,6 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName )
 }
 
 uno::Sequence<OUString> SAL_CALL ScStyleFamilyObj::getElementNames()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( pDocShell )
@@ -862,7 +839,6 @@ uno::Sequence<OUString> SAL_CALL ScStyleFamilyObj::getElementNames()
 }
 
 sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( pDocShell )
@@ -879,18 +855,18 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName )
 
 // XPropertySet
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getPropertySetInfo(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getPropertySetInfo(  )
 {
     OSL_FAIL( "###unexpected!" );
     return uno::Reference< beans::XPropertySetInfo >();
 }
 
-void SAL_CALL ScStyleFamilyObj::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ScStyleFamilyObj::setPropertyValue( const OUString&, const uno::Any& )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyName )
 {
     uno::Any aRet;
 
@@ -921,22 +897,22 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyN
     return aRet;
 }
 
-void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& )
 {
     OSL_FAIL( "###unexpected!" );
 }
@@ -977,7 +953,7 @@ ScStyleObj::~ScStyleObj()
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScStyleObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -1034,7 +1010,7 @@ SfxStyleSheetBase* ScStyleObj::GetStyle_Impl( bool bUseCachedValue )
 
 // style::XStyle
 
-sal_Bool SAL_CALL ScStyleObj::isUserDefined() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScStyleObj::isUserDefined()
 {
     SolarMutexGuard aGuard;
     SfxStyleSheetBase* pStyle = GetStyle_Impl();
@@ -1043,7 +1019,7 @@ sal_Bool SAL_CALL ScStyleObj::isUserDefined() throw(uno::RuntimeException, std::
     return false;
 }
 
-sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScStyleObj::isInUse()
 {
     SolarMutexGuard aGuard;
     SfxStyleSheetBase* pStyle = GetStyle_Impl();
@@ -1052,7 +1028,7 @@ sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException, std::except
     return false;
 }
 
-OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScStyleObj::getParentStyle()
 {
     SolarMutexGuard aGuard;
     SfxStyleSheetBase* pStyle = GetStyle_Impl();
@@ -1062,9 +1038,6 @@ OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException, std:
 }
 
 void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle )
-    throw(container::NoSuchElementException,
-          uno::RuntimeException,
-          std::exception)
 {
     SolarMutexGuard aGuard;
     SfxStyleSheetBase* pStyle = GetStyle_Impl();
@@ -1113,7 +1086,7 @@ void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle )
 
 // container::XNamed
 
-OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScStyleObj::getName()
 {
     SolarMutexGuard aGuard;
     SfxStyleSheetBase* pStyle = GetStyle_Impl();
@@ -1123,7 +1096,6 @@ OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException, std::except
 }
 
 void SAL_CALL ScStyleObj::setName( const OUString& aNewName )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SfxStyleSheetBase* pStyle = GetStyle_Impl();
@@ -1201,7 +1173,6 @@ const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const OUString& rPropName,
 }
 
 beans::PropertyState ScStyleObj::getPropertyState_Impl( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE;
 
@@ -1240,7 +1211,6 @@ beans::PropertyState ScStyleObj::getPropertyState_Impl( const OUString& aPropert
 }
 
 beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1249,7 +1219,6 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPro
 }
 
 uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( const uno::Sequence<OUString>& aPropertyNames )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1263,8 +1232,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( cons
 }
 
 void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException,
-          std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1277,7 +1244,6 @@ void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName )
 }
 
 uno::Any ScStyleObj::getPropertyDefault_Impl( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
 
@@ -1364,7 +1330,6 @@ uno::Any ScStyleObj::getPropertyDefault_Impl( const OUString& aPropertyName )
 }
 
 uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1373,7 +1338,6 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName
 }
 
 uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( const uno::Sequence<OUString>& aPropertyNames )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1389,9 +1353,6 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( const uno::Seq
 
 void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames,
                                                 const uno::Sequence< uno::Any >& aValues )
-throw (beans::PropertyVetoException, lang::IllegalArgumentException,
-       lang::WrappedTargetException, uno::RuntimeException,
-       std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1410,7 +1371,6 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException,
 }
 
 uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1424,21 +1384,18 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( const uno::Seque
 
 void SAL_CALL ScStyleObj::addPropertiesChangeListener( const uno::Sequence<OUString>& /* aPropertyNames */,
                                     const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ )
-                                throw (uno::RuntimeException, std::exception)
 {
     // no bound properties
 }
 
 void SAL_CALL ScStyleObj::removePropertiesChangeListener(
                                     const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ )
-                                throw (uno::RuntimeException, std::exception)
 {
     // no bound properties
 }
 
 void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<OUString>& /* aPropertyNames */,
                                     const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ )
-                                throw (uno::RuntimeException, std::exception)
 {
     // no bound properties
 }
@@ -1447,7 +1404,6 @@ void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<OUStrin
 // getPropertyStates already defined for XPropertyState
 
 void SAL_CALL ScStyleObj::setAllPropertiesToDefault()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1497,7 +1453,6 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault()
 }
 
 void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<OUString>& aPropertyNames )
-    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1514,16 +1469,12 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<OUString>&
 // beans::XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScStyleObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return pPropSet->getPropertySetInfo();
 }
 
 void SAL_CALL ScStyleObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-          lang::IllegalArgumentException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1536,7 +1487,6 @@ void SAL_CALL ScStyleObj::setPropertyValue( const OUString& aPropertyName, const
 }
 
 void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SfxStyleSheetBase* pStyle = GetStyle_Impl( true );
     if ( pStyle && pEntry )
@@ -1844,7 +1794,6 @@ void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const Sfx
 }
 
 uno::Any ScStyleObj::getPropertyValue_Impl( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
     SfxStyleSheetBase* pStyle = GetStyle_Impl( true );
@@ -1976,7 +1925,6 @@ uno::Any ScStyleObj::getPropertyValue_Impl( const OUString& aPropertyName )
 }
 
 uno::Any SAL_CALL ScStyleObj::getPropertyValue( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     GetStyle_Impl();
@@ -1988,19 +1936,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj )
 
 // lang::XServiceInfo
 
-OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScStyleObj::getImplementationName()
 {
     return OUString("ScStyleObj" );
 }
 
 sal_Bool SAL_CALL ScStyleObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     const bool bPage = ( eFamily == SfxStyleFamily::Page );
 
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 8a270a261c34..3da7da4c739a 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -90,7 +90,6 @@ void ScLinkTargetTypesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 // container::XNameAccess
 
 uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName)
-        throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     if (pDocShell)
     {
@@ -102,7 +101,7 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName)
     throw container::NoSuchElementException();
 }
 
-uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames()
 {
     uno::Sequence<OUString> aRet(SC_LINKTARGETTYPE_COUNT);
     OUString* pArray = aRet.getArray();
@@ -111,7 +110,7 @@ uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() throw(
     return aRet;
 }
 
-sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName)
 {
     for (const auto & i : aNames)
         if ( i == aName )
@@ -121,12 +120,12 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw(
 
 // container::XElementAccess
 
-uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType()
 {
     return cppu::UnoType<beans::XPropertySet>::get();
 }
 
-sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements()
 {
     return true;
 }
@@ -155,7 +154,7 @@ void ScLinkTargetTypeObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
 // document::XLinkTargetSupplier
 
-uno::Reference< container::XNameAccess > SAL_CALL  ScLinkTargetTypeObj::getLinks() throw( uno::RuntimeException, std::exception )
+uno::Reference< container::XNameAccess > SAL_CALL  ScLinkTargetTypeObj::getLinks()
 {
     uno::Reference< container::XNameAccess >  xCollection;
 
@@ -186,7 +185,7 @@ uno::Reference< container::XNameAccess > SAL_CALL  ScLinkTargetTypeObj::getLinks
 
 // beans::XPropertySet
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL  ScLinkTargetTypeObj::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo > SAL_CALL  ScLinkTargetTypeObj::getPropertySetInfo()
 {
     SolarMutexGuard aGuard;
     static uno::Reference< beans::XPropertySetInfo >  aRef(new SfxItemPropertySetInfo( lcl_GetLinkTargetMap() ));
@@ -195,11 +194,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL  ScLinkTargetTypeObj::getProp
 
 void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aPropertyName */,
             const uno::Any& /* aValue */)
-        throw(  beans::UnknownPropertyException,
-                beans::PropertyVetoException,
-                lang::IllegalArgumentException,
-                lang::WrappedTargetException,
-                 uno::RuntimeException, std::exception )
 {
     //  everything is read-only
     //! exception?
@@ -228,7 +222,6 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType
 }
 
 uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& PropertyName)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     uno::Any aRet;
     if ( PropertyName == SC_UNO_LINKDISPBIT )
@@ -254,7 +247,6 @@ ScLinkTargetsObj::~ScLinkTargetsObj()
 // container::XNameAccess
 
 uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName)
-        throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     uno::Reference< beans::XPropertySet >  xProp( ScUnoHelpFunctions::AnyToInterface( xCollection->getByName(aName) ), uno::UNO_QUERY );
     if (xProp.is())
@@ -264,24 +256,24 @@ uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName)
 //    return uno::Any();
 }
 
-uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames()
 {
     return xCollection->getElementNames();
 }
 
-sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName)
 {
     return xCollection->hasByName(aName);
 }
 
 // container::XElementAccess
 
-uno::Type SAL_CALL ScLinkTargetsObj::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type SAL_CALL ScLinkTargetsObj::getElementType()
 {
     return cppu::UnoType<beans::XPropertySet>::get();
 }
 
-sal_Bool SAL_CALL ScLinkTargetsObj::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL ScLinkTargetsObj::hasElements()
 {
     return xCollection->hasElements();
 }
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 5d61fd03794b..4af1cc4be2a5 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -116,7 +116,6 @@ const EditTextObject* ScHeaderFooterContentObj::GetRightEditObject() const
 // XHeaderFooterContent
 
 uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getLeftText()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<text::XText> xInt(*mxLeftText, uno::UNO_QUERY);
@@ -124,7 +123,6 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getLeftText()
 }
 
 uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getCenterText()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<text::XText> xInt(*mxCenterText, uno::UNO_QUERY);
@@ -132,7 +130,6 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getCenterText()
 }
 
 uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<text::XText> xInt(*mxRightText, uno::UNO_QUERY);
@@ -142,7 +139,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText()
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -296,7 +293,6 @@ const SvxUnoText& ScHeaderFooterTextObj::GetUnoText()
 // XText
 
 uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCursor()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScHeaderFooterTextCursor( this );
@@ -304,7 +300,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs
 
 uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCursorByRange(
                                     const uno::Reference<text::XTextRange>& aTextPosition )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -324,7 +319,7 @@ void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData )
     rData.nTotalPages   = 99;
 }
 
-OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScHeaderFooterTextObj::getString()
 {
     SolarMutexGuard aGuard;
     OUString aRet;
@@ -368,7 +363,7 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException
     return aRet;
 }
 
-void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText )
 {
     SolarMutexGuard aGuard;
 
@@ -380,7 +375,6 @@ void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(un
 
 void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XTextRange>& xRange,
                                             const OUString& aString, sal_Bool bAbsorb )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -391,7 +385,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XT
 void SAL_CALL ScHeaderFooterTextObj::insertControlCharacter(
                                             const uno::Reference<text::XTextRange>& xRange,
                                             sal_Int16 nControlCharacter, sal_Bool bAbsorb )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -403,7 +396,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
                                             const uno::Reference<text::XTextRange >& xRange,
                                             const uno::Reference<text::XTextContent >& xContent,
                                             sal_Bool bAbsorb )
-                                throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( xContent.is() && xRange.is() )
@@ -474,7 +466,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
 
 void SAL_CALL ScHeaderFooterTextObj::removeTextContent(
                                             const uno::Reference<text::XTextContent>& xContent )
-                                throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( xContent.is() )
@@ -492,7 +483,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent(
     mxUnoText->removeTextContent( xContent );
 }
 
-uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText()
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -500,7 +491,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno:
     return mxUnoText->getText();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart()
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -508,7 +499,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() thro
     return mxUnoText->getStart();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd()
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -519,7 +510,6 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw(
 // XTextFieldsSupplier
 
 uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::getTextFields()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     // all fields
@@ -527,7 +517,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::ge
 }
 
 uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFieldMasters()
-                                                throw(uno::RuntimeException, std::exception)
 {
     //  sowas gibts nicht im Calc (?)
     return nullptr;
@@ -538,7 +527,6 @@ uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFi
 void SAL_CALL ScHeaderFooterTextObj::moveTextRange(
                                         const uno::Reference<text::XTextRange>& xRange,
                                         sal_Int16 nParagraphs )
-                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -549,7 +537,6 @@ void SAL_CALL ScHeaderFooterTextObj::moveTextRange(
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEnumeration()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -559,7 +546,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEn
 
 // XElementAccess
 
-uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType()
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -567,7 +554,7 @@ uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeExc
     return mxUnoText->getElementType();
 }
 
-sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements()
 {
     SolarMutexGuard aGuard;
     if (!mxUnoText.is())
@@ -596,13 +583,13 @@ ScCellTextCursor::~ScCellTextCursor() throw()
 
 // SvxUnoTextCursor methods reimplemented here to return the right objects:
 
-uno::Reference<text::XText> SAL_CALL ScCellTextCursor::getText() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XText> SAL_CALL ScCellTextCursor::getText()
 {
     SolarMutexGuard aGuard;
     return &rTextObj;
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart()
 {
     SolarMutexGuard aGuard;
 
@@ -619,7 +606,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno
     return xRange;
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -639,7 +626,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno::
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScCellTextCursor::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -678,13 +665,13 @@ ScHeaderFooterTextCursor::~ScHeaderFooterTextCursor() throw() {};
 
 // SvxUnoTextCursor methods reimplemented here to return the right objects:
 
-uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextCursor::getText() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextCursor::getText()
 {
     SolarMutexGuard aGuard;
     return rTextObj.get();
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart()
 {
     SolarMutexGuard aGuard;
 
@@ -701,7 +688,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() t
     return xRange;
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -721,7 +708,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() thr
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScHeaderFooterTextCursor::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -772,13 +759,13 @@ ScDrawTextCursor::~ScDrawTextCursor() throw()
 
 // SvxUnoTextCursor methods reimplemented here to return the right objects:
 
-uno::Reference<text::XText> SAL_CALL ScDrawTextCursor::getText() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XText> SAL_CALL ScDrawTextCursor::getText()
 {
     SolarMutexGuard aGuard;
     return xParentText;
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart()
 {
     SolarMutexGuard aGuard;
 
@@ -795,7 +782,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno
     return xRange;
 }
 
-uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -815,7 +802,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno::
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScDrawTextCursor::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index e080b0488558..5197da10b98e 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -123,7 +123,6 @@ void ScFormulaParserObj::SetCompilerFlags( ScCompiler& rCompiler ) const
 
 uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula(
     const OUString& aFormula, const table::CellAddress& rReferencePos )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence<sheet::FormulaToken> aRet;
@@ -149,7 +148,6 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula(
 
 OUString SAL_CALL ScFormulaParserObj::printFormula(
         const uno::Sequence<sheet::FormulaToken>& aTokens, const table::CellAddress& rReferencePos )
-                                throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aRet;
@@ -176,7 +174,6 @@ OUString SAL_CALL ScFormulaParserObj::printFormula(
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFormulaParserObj::getPropertySetInfo()
-                                                        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetFormulaParserMap() ));
@@ -185,9 +182,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFormulaParserObj::getProperty
 
 void SAL_CALL ScFormulaParserObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                        lang::IllegalArgumentException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( aPropertyName == SC_UNO_COMPILEFAP )
@@ -243,8 +237,6 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropertyName )
-                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-                        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx
index 641d556feb79..c56f4e5deccb 100644
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@@ -43,7 +43,7 @@ uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw()
 }
 
 uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance(
-                const uno::Reference< lang::XMultiServiceFactory > & /* rSMgr */, SfxModelFlags _nCreationFlags ) throw( uno::Exception, std::exception )
+                const uno::Reference< lang::XMultiServiceFactory > & /* rSMgr */, SfxModelFlags _nCreationFlags )
 {
     SolarMutexGuard aGuard;
     ScDLL::Init();
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 0a7b17577caf..11a76fcd020e 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -141,7 +141,6 @@ void ScViewPaneBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
 }
 
 uno::Any SAL_CALL ScViewPaneBase::queryInterface( const uno::Type& rType )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SC_QUERYINTERFACE( sheet::XViewPane )
     SC_QUERYINTERFACE( sheet::XCellRangeReferrer )
@@ -153,7 +152,7 @@ uno::Any SAL_CALL ScViewPaneBase::queryInterface( const uno::Type& rType )
     return uno::Any();          // OWeakObject is in derived objects
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -170,14 +169,13 @@ uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeE
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScViewPaneBase::getImplementationId()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XViewPane
 
-sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn()
 {
     SolarMutexGuard aGuard;
     if (pViewShell)
@@ -195,7 +193,6 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeExc
 }
 
 void SAL_CALL ScViewPaneBase::setFirstVisibleColumn(sal_Int32 nFirstVisibleColumn)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pViewShell)
@@ -211,7 +208,7 @@ void SAL_CALL ScViewPaneBase::setFirstVisibleColumn(sal_Int32 nFirstVisibleColum
     }
 }
 
-sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow()
 {
     SolarMutexGuard aGuard;
     if (pViewShell)
@@ -229,7 +226,6 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeExcept
 }
 
 void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pViewShell)
@@ -246,7 +242,6 @@ void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow )
 }
 
 table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     table::CellRangeAddress aAdr;
@@ -279,7 +274,6 @@ table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange()
 // XCellRangeSource
 
 uno::Reference<table::XCellRange> SAL_CALL ScViewPaneBase::getReferredCells()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (pViewShell)
@@ -317,7 +311,7 @@ namespace
 }
 
 // XFormLayerAccess
-uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException, std::exception)
+uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFormController( const uno::Reference< form::XForm >& Form )
 {
     SolarMutexGuard aGuard;
 
@@ -332,7 +326,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFor
     return xController;
 }
 
-sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode(  )
 {
     SolarMutexGuard aGuard;
 
@@ -345,7 +339,7 @@ sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode(  ) throw (uno::RuntimeExcept
     return bIsFormDesignMode;
 }
 
-void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool DesignMode ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool DesignMode )
 {
     SolarMutexGuard aGuard;
 
@@ -360,7 +354,6 @@ void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool DesignMode ) throw (un
 
 uno::Reference<awt::XControl> SAL_CALL ScViewPaneBase::getControl(
                             const uno::Reference<awt::XControlModel>& xModel )
-                throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -422,7 +415,6 @@ ScViewPaneObj::~ScViewPaneObj()
 }
 
 uno::Any SAL_CALL ScViewPaneObj::queryInterface( const uno::Type& rType )
-                                                throw(uno::RuntimeException, std::exception)
 {
     //  ScViewPaneBase has everything except OWeakObject
 
@@ -476,7 +468,6 @@ ScTabViewObj::~ScTabViewObj()
 }
 
 uno::Any SAL_CALL ScTabViewObj::queryInterface( const uno::Type& rType )
-                                                throw(uno::RuntimeException, std::exception)
 {
     SC_QUERYINTERFACE( sheet::XSpreadsheetView )
     SC_QUERYINTERFACE( sheet::XEnhancedMouseClickBroadcaster )
@@ -584,7 +575,7 @@ void ScTabViewObj::SheetChanged( bool bSameTabButMoved )
     nPreviousTab = nNewTab;
 }
 
-uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes()
 {
     static uno::Sequence<uno::Type> aTypes;
     if ( aTypes.getLength() == 0 )
@@ -624,7 +615,6 @@ uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeExc
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScTabViewObj::getImplementationId()
-                                                throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -676,8 +666,6 @@ static void lcl_ShowObject( ScTabViewShell& rViewSh, ScDrawView& rDrawView, SdrO
 }
 
 sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
-    throw(lang::IllegalArgumentException, uno::RuntimeException,
-          std::exception)
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -860,7 +848,6 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
 }
 
 uno::Any SAL_CALL ScTabViewObj::getSelection()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -970,7 +957,6 @@ uno::Any SAL_CALL ScTabViewObj::getSelection()
 // XEnumerationAccess
 
 uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration"));
@@ -978,7 +964,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScTabViewObj::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScTabViewObj::getCount()
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -996,8 +982,6 @@ sal_Int32 SAL_CALL ScTabViewObj::getCount() throw(uno::RuntimeException, std::ex
 }
 
 uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex )
-                            throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<sheet::XViewPane> xPane(GetObjectByIndex_Impl((sal_uInt16)nIndex));
@@ -1008,13 +992,13 @@ uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex )
 //    return uno::Any();
 }
 
-uno::Type SAL_CALL ScTabViewObj::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScTabViewObj::getElementType()
 {
     SolarMutexGuard aGuard;
     return cppu::UnoType<sheet::XViewPane>::get();
 }
 
-sal_Bool SAL_CALL ScTabViewObj::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTabViewObj::hasElements()
 {
     SolarMutexGuard aGuard;
     return ( getCount() != 0 );
@@ -1070,7 +1054,6 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) const
 }
 
 uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet()
-                                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -1085,7 +1068,6 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet()
 
 // support expand (but not replace) the active sheet
 void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreadsheet>& xActiveSheet )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1177,7 +1159,6 @@ bool ScTabViewObj::IsMouseListening() const
 }
 
 bool ScTabViewObj::MousePressed( const awt::MouseEvent& e )
-                                    throw (::uno::RuntimeException)
 {
     bool bReturn(false);
     if ( e.Buttons == css::awt::MouseButton::LEFT )
@@ -1271,7 +1252,6 @@ bool ScTabViewObj::MousePressed( const awt::MouseEvent& e )
 }
 
 bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e )
-                                    throw (uno::RuntimeException)
 {
     if ( e.Buttons == css::awt::MouseButton::LEFT )
     {
@@ -1366,7 +1346,6 @@ void ScTabViewObj::EndActivationListening()
 }
 
 void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference< awt::XEnhancedMouseClickHandler >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1377,7 +1356,6 @@ void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference<
 }
 
 void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Reference< awt::XEnhancedMouseClickHandler >& aListener )
-                                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nCount = aMouseClickHandlers.size();
@@ -1395,7 +1373,6 @@ void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Referenc
 // XActivationBroadcaster
 
 void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sheet::XActivationEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1406,7 +1383,6 @@ void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sh
 }
 
 void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference< sheet::XActivationEventListener >& aListener )
-                                    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_uInt16 nCount = aActivationListeners.size();
@@ -1541,7 +1517,7 @@ void ScTabViewObj::SetZoomType(sal_Int16 aZoomType)
     }
 }
 
-sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit()
 {
     SolarMutexGuard aGuard;
     //  wie Menue-Slot SID_WINDOW_SPLIT
@@ -1557,7 +1533,7 @@ sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException,
     return false;
 }
 
-sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes()
 {
     SolarMutexGuard aGuard;
     //  wie Menue-Slot SID_WINDOW_FIX
@@ -1573,7 +1549,7 @@ sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException, st
     return false;
 }
 
-sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal()
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -1586,7 +1562,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() throw(uno::RuntimeExceptio
     return 0;
 }
 
-sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical()
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -1600,7 +1576,6 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() throw(uno::RuntimeException,
 }
 
 sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -1625,7 +1600,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn()
     return 0;
 }
 
-sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScTabViewObj::getSplitRow()
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -1648,7 +1623,6 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException, std:
 }
 
 void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -1661,7 +1635,6 @@ void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixel
 }
 
 void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -1688,7 +1661,6 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow
 
 void SAL_CALL ScTabViewObj::addSelectionChangeListener(
     const uno::Reference<view::XSelectionChangeListener>& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aSelectionChgListeners.push_back( xListener );
@@ -1696,7 +1668,6 @@ void SAL_CALL ScTabViewObj::addSelectionChangeListener(
 
 void SAL_CALL ScTabViewObj::removeSelectionChangeListener(
                 const uno::Reference< view::XSelectionChangeListener >& xListener )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     for (XSelectionChangeListenerVector::iterator it = aSelectionChgListeners.begin();
@@ -1770,7 +1741,6 @@ void ScTabViewObj::SelectionChanged()
 //! auch an der Applikation anbieten?
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
@@ -1780,9 +1750,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInf
 
 void SAL_CALL ScTabViewObj::setPropertyValue(
                         const OUString& aPropertyName, const uno::Any& aValue )
-                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-                      lang::IllegalArgumentException, lang::WrappedTargetException,
-                      uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1903,8 +1870,6 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
 }
 
 uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -1963,10 +1928,6 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName
 
 void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPropertyName */,
     const uno::Reference<beans::XPropertyChangeListener >& xListener )
-        throw (beans::UnknownPropertyException,
-               lang::WrappedTargetException,
-               uno::RuntimeException,
-               std::exception)
 {
     SolarMutexGuard aGuard;
     aPropertyChgListeners.push_back( xListener );
@@ -1974,9 +1935,6 @@ void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPrope
 
 void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPropertyName */,
                                     const uno::Reference<beans::XPropertyChangeListener >& xListener )
-                                throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     for (XViewPropertyChangeListenerVector::iterator it = aPropertyChgListeners.begin();
@@ -1992,17 +1950,11 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPr
 
 void SAL_CALL ScTabViewObj::addVetoableChangeListener( const OUString& /* PropertyName */,
                                     const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ )
-                                throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ScTabViewObj::removeVetoableChangeListener( const OUString& /* PropertyName */,
                                     const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ )
-                                throw(beans::UnknownPropertyException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
 }
 
@@ -2018,7 +1970,6 @@ void ScTabViewObj::VisAreaChanged()
 
 void SAL_CALL ScTabViewObj::startRangeSelection(
                                 const uno::Sequence<beans::PropertyValue>& aArguments )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -2059,7 +2010,7 @@ void SAL_CALL ScTabViewObj::startRangeSelection(
     }
 }
 
-void SAL_CALL ScTabViewObj::abortRangeSelection() throw(uno::RuntimeException, std::exception)
+void SAL_CALL ScTabViewObj::abortRangeSelection()
 {
     SolarMutexGuard aGuard;
     ScTabViewShell* pViewSh = GetViewShell();
@@ -2069,7 +2020,6 @@ void SAL_CALL ScTabViewObj::abortRangeSelection() throw(uno::RuntimeException, s
 
 void SAL_CALL ScTabViewObj::addRangeSelectionListener(
     const uno::Reference<sheet::XRangeSelectionListener>& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aRangeSelListeners.push_back( xListener );
@@ -2077,7 +2027,6 @@ void SAL_CALL ScTabViewObj::addRangeSelectionListener(
 
 void SAL_CALL ScTabViewObj::removeRangeSelectionListener(
                                 const uno::Reference<sheet::XRangeSelectionListener>& xListener )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     for (XRangeSelectionListenerVector::iterator it = aRangeSelListeners.begin();
@@ -2093,7 +2042,6 @@ void SAL_CALL ScTabViewObj::removeRangeSelectionListener(
 
 void SAL_CALL ScTabViewObj::addRangeSelectionChangeListener(
     const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     aRangeChgListeners.push_back( xListener );
@@ -2101,7 +2049,6 @@ void SAL_CALL ScTabViewObj::addRangeSelectionChangeListener(
 
 void SAL_CALL ScTabViewObj::removeRangeSelectionChangeListener(
                                 const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener )
-                                    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     for (XRangeSelectionChangeListenerVector::iterator it = aRangeChgListeners.begin();
@@ -2155,19 +2102,17 @@ void ScTabViewObj::RangeSelChanged( const OUString& rText )
 }
 
 // XServiceInfo
-OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ScTabViewObj::getImplementationName()
 {
     return OUString( "ScTabViewObj" );
 }
 
 sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString& rServiceName )
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames()
-                                                    throw(uno::RuntimeException, std::exception)
 {
     return {SCTABVIEWOBJ_SERVICE, SCVIEWSETTINGS_SERVICE};
 }
@@ -2175,7 +2120,7 @@ uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames()
 // XUnoTunnel
 
 sal_Int64 SAL_CALL ScTabViewObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -2206,8 +2151,6 @@ ScTabViewObj* ScTabViewObj::getImplementation(const uno::Reference<uno::XInterfa
 }
 
 css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL ScTabViewObj::getTransferable()
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     ScEditShell* pShell = dynamic_cast<ScEditShell*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0)  );
@@ -2234,9 +2177,6 @@ css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL ScTabViewObj::g
 }
 
 void SAL_CALL ScTabViewObj::insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans )
-    throw (css::datatransfer::UnsupportedFlavorException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     ScEditShell* pShell = dynamic_cast<ScEditShell*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0)  );
@@ -2276,7 +2216,6 @@ uno::Sequence<sal_Int32> toSequence(const ScMarkData::MarkedTabsType& rSelected)
 }
 
 uno::Sequence<sal_Int32> ScTabViewObj::getSelectedSheets()
-    throw (uno::RuntimeException, std::exception)
 {
     ScTabViewShell* pViewSh = GetViewShell();
     if (!pViewSh)
@@ -2312,7 +2251,6 @@ ScPreviewObj::~ScPreviewObj()
 }
 
 uno::Any ScPreviewObj::queryInterface(const uno::Type& rType)
-    throw(uno::RuntimeException, std::exception)
 {
     SC_QUERYINTERFACE(sheet::XSelectedSheetsSupplier)
     return SfxBaseController::queryInterface(rType);
@@ -2335,7 +2273,6 @@ void ScPreviewObj::Notify(SfxBroadcaster&, const SfxHint& rHint)
 }
 
 uno::Sequence<sal_Int32> ScPreviewObj::getSelectedSheets()
-    throw (uno::RuntimeException, std::exception)
 {
     ScPreview* p = mpViewShell ? mpViewShell->GetPreview() : nullptr;
     if (!p)
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index 7d86430f811c..41f12cec6cfc 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -46,7 +46,7 @@ namespace vba {
 namespace excel {
 
 uno::Reference< sheet::XUnnamedDatabaseRanges >
-GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException )
+GetUnnamedDataBaseRanges( ScDocShell* pShell )
 {
     uno::Reference< frame::XModel > xModel;
     if ( pShell )
@@ -59,7 +59,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException )
 // returns the XDatabaseRange for the autofilter on sheet (nSheet)
 // also populates sName with the name of range
 uno::Reference< sheet::XDatabaseRange >
-GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeException )
+GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet )
 {
     uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( GetUnnamedDataBaseRanges( pShell ), uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XDatabaseRange > xDataBaseRange;
@@ -77,7 +77,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc
     return xDataBaseRange;
 }
 
-ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRange ) throw ( uno::RuntimeException )
+ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRange )
 {
     ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange );
     if ( !pScCellRangesBase )
@@ -88,7 +88,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang
 }
 
 uno::Reference< XHelperInterface >
-getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException, std::exception )
+getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange )
 {
     uno::Reference< sheet::XSheetCellRange > xSheetRange( xRange, uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XSpreadsheet > xSheet( xSheetRange->getSpreadsheet(), uno::UNO_SET_THROW );
@@ -110,26 +110,26 @@ class PasteCellsWarningReseter
 private:
     bool bInitialWarningState;
     /// @throws uno::RuntimeException
-    static uno::Reference< sheet::XGlobalSheetSettings > const & getGlobalSheetSettings() throw ( uno::RuntimeException )
+    static uno::Reference< sheet::XGlobalSheetSettings > const & getGlobalSheetSettings()
     {
         static uno::Reference< sheet::XGlobalSheetSettings > xProps = sheet::GlobalSheetSettings::create( comphelper::getProcessComponentContext() );
         return xProps;
     }
 
     /// @throws uno::RuntimeException
-    static bool getReplaceCellsWarning() throw ( uno::RuntimeException )
+    static bool getReplaceCellsWarning()
     {
         return getGlobalSheetSettings()->getReplaceCellsWarning();
     }
 
     /// @throws uno::RuntimeException
-    static void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
+    static void setReplaceCellsWarning( bool bState )
     {
         getGlobalSheetSettings()->setReplaceCellsWarning( bState );
     }
 public:
     /// @throws uno::RuntimeException
-    PasteCellsWarningReseter() throw ( uno::RuntimeException )
+    PasteCellsWarningReseter()
     {
         bInitialWarningState = getReplaceCellsWarning();
         if ( bInitialWarningState )
@@ -254,7 +254,7 @@ getViewFrame( const uno::Reference< frame::XModel >& xModel )
 }
 
 uno::Reference< XHelperInterface >
-getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) throw ( uno::RuntimeException, std::exception )
+getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet )
 {
     uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW );
     OUString sCodeName;
@@ -268,7 +268,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) thro
 }
 
 uno::Reference< XHelperInterface >
-getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) throw ( uno::RuntimeException, std::exception )
+getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges )
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( xRanges, uno::UNO_QUERY_THROW );
     uno::Reference< container::XEnumeration > xEnum = xEnumAccess->createEnumeration();
@@ -277,7 +277,7 @@ getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& x
 }
 
 uno::Reference< XHelperInterface >
-getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell ) throw ( uno::RuntimeException, std::exception )
+getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell )
 {
     uno::Reference< sheet::XSheetCellRange > xSheetRange( xCell, uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XSpreadsheet > xSheet( xSheetRange->getSpreadsheet(), uno::UNO_SET_THROW );
@@ -285,7 +285,7 @@ getUnoSheetModuleObj( const uno::Reference< table::XCell >& xCell ) throw ( uno:
 }
 
 uno::Reference< XHelperInterface >
-getUnoSheetModuleObj( const uno::Reference< frame::XModel >& xModel, SCTAB nTab ) throw ( uno::RuntimeException, std::exception )
+getUnoSheetModuleObj( const uno::Reference< frame::XModel >& xModel, SCTAB nTab )
 {
     uno::Reference< sheet::XSpreadsheetDocument > xDoc( xModel, uno::UNO_QUERY_THROW );
     uno::Reference< container::XIndexAccess > xSheets( xDoc->getSheets(), uno::UNO_QUERY_THROW );
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index cd17fede7ae0..7fc8f4da5f66 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -48,23 +48,23 @@ ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference< css::uno::XC
 SfxViewFrame* getViewFrame( const css::uno::Reference< css::frame::XModel >& xModel );
 
 /// @throws css::uno::RuntimeException
-css::uno::Reference< css::sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( css::uno::RuntimeException );
+css::uno::Reference< css::sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell );
 
 /// @throws css::uno::RuntimeException
-css::uno::Reference< css::sheet::XDatabaseRange > GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( css::uno::RuntimeException );
+css::uno::Reference< css::sheet::XDatabaseRange > GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet );
 /// @throws css::uno::RuntimeException
-css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet ) throw ( css::uno::RuntimeException, std::exception );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet );
 /// @throws css::uno::RuntimeException
-css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges ) throw ( css::uno::RuntimeException, std::exception );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges );
 /// @throws css::uno::RuntimeException
-css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::uno::RuntimeException, std::exception );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCellRange >& xRange );
 /// @throws css::uno::RuntimeException
-css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCell >& xCell ) throw ( css::uno::RuntimeException, std::exception );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::table::XCell >& xCell );
 /// @throws css::uno::RuntimeException
-css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::frame::XModel >& xModel, SCTAB nTab ) throw ( css::uno::RuntimeException, std::exception );
+css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const css::uno::Reference< css::frame::XModel >& xModel, SCTAB nTab );
 
 /// @throws css::uno::RuntimeException
-ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException );
+ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange );
 void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc );
 
 class ScVbaCellRangeAccess
@@ -77,7 +77,7 @@ public:
 // by default will throw if unsuccessful.
 /// @throws css::uno::RuntimeException
 template < typename ImplObject >
-    ImplObject* getImplFromDocModuleWrapper( const css::uno::Reference< css::uno::XInterface >& rxWrapperIf, bool bThrow = true ) throw (css::uno::RuntimeException)
+    ImplObject* getImplFromDocModuleWrapper( const css::uno::Reference< css::uno::XInterface >& rxWrapperIf, bool bThrow = true )
     {
         ImplObject* pObj = nullptr;
         css::uno::Reference< css::lang::XUnoTunnel >  xTunnel( rxWrapperIf, css::uno::UNO_QUERY );
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index a55a99c80987..e4b17f1016cd 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -141,21 +141,21 @@ ScVbaApplication::~ScVbaApplication()
 }
 
 OUString SAL_CALL
-ScVbaApplication::getExactName( const OUString& aApproximateName ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getExactName( const OUString& aApproximateName )
 {
     uno::Reference< beans::XExactName > xWSF( new ScVbaWSFunction( this, mxContext ) );
     return xWSF->getExactName( aApproximateName );
 }
 
 uno::Reference< beans::XIntrospectionAccess > SAL_CALL
-ScVbaApplication::getIntrospection() throw(css::uno::RuntimeException, std::exception)
+ScVbaApplication::getIntrospection()
 {
     uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) );
     return xWSF->getIntrospection();
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam)
 {
     /*  When calling the functions directly at the Application object, no runtime
         errors are thrown, but the error is inserted into the return value. */
@@ -173,35 +173,35 @@ ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno
 }
 
 void SAL_CALL
-ScVbaApplication::setValue( const OUString& PropertyName, const uno::Any& Value ) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+ScVbaApplication::setValue( const OUString& PropertyName, const uno::Any& Value )
 {
     uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) );
     xWSF->setValue( PropertyName, Value );
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::getValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+ScVbaApplication::getValue( const OUString& PropertyName )
 {
     uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) );
     return xWSF->getValue( PropertyName );
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::hasMethod( const OUString& Name ) throw(uno::RuntimeException, std::exception)
+ScVbaApplication::hasMethod( const OUString& Name )
 {
     uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) );
     return xWSF->hasMethod( Name );
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::hasProperty( const OUString& Name ) throw(uno::RuntimeException, std::exception)
+ScVbaApplication::hasProperty( const OUString& Name )
 {
     uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) );
     return xWSF->hasProperty( Name );
 }
 
 uno::Reference< excel::XWorkbook >
-ScVbaApplication::getActiveWorkbook() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getActiveWorkbook()
 {
     uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ), uno::UNO_SET_THROW );
     uno::Reference< excel::XWorkbook > xWorkbook( getVBADocument( xModel ), uno::UNO_QUERY );
@@ -211,7 +211,7 @@ ScVbaApplication::getActiveWorkbook() throw (uno::RuntimeException, std::excepti
 }
 
 uno::Reference< excel::XWorkbook > SAL_CALL
-ScVbaApplication::getThisWorkbook() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getThisWorkbook()
 {
     uno::Reference< frame::XModel > xModel( getThisExcelDoc( mxContext ), uno::UNO_SET_THROW );
     uno::Reference< excel::XWorkbook > xWorkbook( getVBADocument( xModel ), uno::UNO_QUERY );
@@ -221,13 +221,13 @@ ScVbaApplication::getThisWorkbook() throw (uno::RuntimeException, std::exception
 }
 
 uno::Reference< XAssistant > SAL_CALL
-ScVbaApplication::getAssistant() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getAssistant()
 {
     return uno::Reference< XAssistant >( new ScVbaAssistant( this, mxContext ) );
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::getSelection() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getSelection()
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument() );
 
@@ -288,7 +288,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< excel::XRange >
-ScVbaApplication::getActiveCell() throw (uno::RuntimeException, std::exception )
+ScVbaApplication::getActiveCell()
 {
     uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
     uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW);
@@ -305,7 +305,7 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException, std::exception )
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::International( sal_Int32 /*Index*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::International( sal_Int32 /*Index*/ )
 {
     // complete stub for now
     // #TODO flesh out some of the Indices we could handle
@@ -314,7 +314,7 @@ ScVbaApplication::International( sal_Int32 /*Index*/ ) throw (uno::RuntimeExcept
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::Workbooks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::Workbooks( const uno::Any& aIndex )
 {
     uno::Reference< XCollection > xWorkBooks( new ScVbaWorkbooks( this, mxContext ) );
     if (  aIndex.getValueTypeClass() == uno::TypeClass_VOID )
@@ -327,20 +327,20 @@ ScVbaApplication::Workbooks( const uno::Any& aIndex ) throw (uno::RuntimeExcepti
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::Worksheets( const uno::Any& aIndex )
 {
     uno::Reference< excel::XWorkbook > xWorkbook( getActiveWorkbook(), uno::UNO_SET_THROW );
     return xWorkbook->Worksheets( aIndex );
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception)
+ScVbaApplication::WorksheetFunction( )
 {
     return uno::makeAny( uno::Reference< script::XInvocation >( new ScVbaWSFunction( this, mxContext ) ) );
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::Evaluate( const OUString& Name ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::Evaluate( const OUString& Name )
 {
     // #TODO Evaluate allows other things to be evaluated, e.g. functions
     // I think ( like SIN(3) etc. ) need to investigate that
@@ -350,7 +350,7 @@ ScVbaApplication::Evaluate( const OUString& Name ) throw (uno::RuntimeException,
 }
 
 uno::Any
-ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::Dialogs( const uno::Any &aIndex )
 {
     uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( this ), mxContext, getCurrentDocument() ) );
     if( !aIndex.hasValue() )
@@ -359,7 +359,7 @@ ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException
 }
 
 uno::Reference< excel::XWindow > SAL_CALL
-ScVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getActiveWindow()
 {
     uno::Reference< frame::XModel > xModel = getCurrentDocument();
     uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
@@ -369,7 +369,7 @@ ScVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getCutCopyMode()
 {
     //# FIXME TODO, implementation
     uno::Any result;
@@ -378,19 +378,19 @@ ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaApplication::setCutCopyMode( const uno::Any& /* _cutcopymode */ ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setCutCopyMode( const uno::Any& /* _cutcopymode */ )
 {
     //# FIXME TODO, implementation
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::getStatusBar() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getStatusBar()
 {
     return uno::makeAny( !getDisplayStatusBar() );
 }
 
 void SAL_CALL
-ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setStatusBar( const uno::Any& _statusbar )
 {
     OUString sText;
     bool bDefault = false;
@@ -418,7 +418,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaApplication::getCalculation() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getCalculation()
 {
     // TODO: in Excel, this is an application-wide setting
     uno::Reference<sheet::XCalculatable> xCalc(getCurrentDocument(), uno::UNO_QUERY_THROW);
@@ -429,7 +429,7 @@ ScVbaApplication::getCalculation() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setCalculation( ::sal_Int32 _calculation )
 {
     // TODO: in Excel, this is an application-wide setting
     uno::Reference< sheet::XCalculatable > xCalc(getCurrentDocument(), uno::UNO_QUERY_THROW);
@@ -446,7 +446,7 @@ ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::Runtime
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::Windows( const uno::Any& aIndex  ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::Windows( const uno::Any& aIndex  )
 {
     uno::Reference< excel::XWindows >  xWindows( new ScVbaWindows( this, mxContext ) );
     if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
@@ -454,7 +454,7 @@ ScVbaApplication::Windows( const uno::Any& aIndex  ) throw (uno::RuntimeExceptio
     return uno::Any( xWindows->Item( aIndex, uno::Any() ) );
 }
 void SAL_CALL
-ScVbaApplication::wait( double time ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::wait( double time )
 {
     StarBASIC* pBasic = SfxApplication::GetBasic();
     SbxArrayRef aArgs = new SbxArray;
@@ -473,14 +473,14 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException, std::excepti
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::Range( const uno::Any& Cell1, const uno::Any& Cell2 )
 {
     uno::Reference< excel::XRange > xVbRange = ScVbaRange::ApplicationRange( mxContext, Cell1, Cell2 );
     return uno::makeAny( xVbRange );
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException, std::exception )
+ScVbaApplication::Names( const css::uno::Any& aIndex )
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW );
@@ -496,7 +496,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep
 }
 
 uno::Reference< excel::XWorksheet > SAL_CALL
-ScVbaApplication::getActiveSheet() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getActiveSheet()
 {
     uno::Reference< excel::XWorksheet > result;
     uno::Reference< excel::XWorkbook > xWorkbook( getActiveWorkbook(), uno::UNO_QUERY );
@@ -530,7 +530,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException, std::exception)
  *  by test excel, it seems Scroll no effect. ???
 *******************************************************************************/
 void SAL_CALL
-ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll )
 {
     //test Scroll is a boolean
     bool bScroll = false;
@@ -627,7 +627,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
 }
 
 sal_Int32 SAL_CALL
-ScVbaApplication::getCursor() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getCursor()
 {
     PointerStyle nPointerStyle =  getPointerStyle(getCurrentDocument());
 
@@ -647,7 +647,7 @@ ScVbaApplication::getCursor() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setCursor( sal_Int32 _cursor )
 {
     try
     {
@@ -689,7 +689,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, s
 // #TODO perhaps we should switch the return type depending of the filter
 // type, e.g. return Calc for Calc and Excel if it's an imported doc
 OUString SAL_CALL
-ScVbaApplication::getName() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getName()
 {
     return OUString("Microsoft Excel" );
 }
@@ -701,44 +701,44 @@ ScVbaApplication::getName() throw (uno::RuntimeException, std::exception)
 // error message thrown by OpenOffice
 
 void SAL_CALL
-ScVbaApplication::setDisplayAlerts(sal_Bool displayAlerts) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setDisplayAlerts(sal_Bool displayAlerts)
 {
     mrAppSettings.mbDisplayAlerts = displayAlerts;
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::getDisplayAlerts() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getDisplayAlerts()
 {
     return mrAppSettings.mbDisplayAlerts;
 }
 
 void SAL_CALL
-ScVbaApplication::setEnableEvents(sal_Bool bEnable) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setEnableEvents(sal_Bool bEnable)
 {
     mrAppSettings.mbEnableEvents = bEnable;
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::getEnableEvents() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getEnableEvents()
 {
     return mrAppSettings.mbEnableEvents;
 }
 
 void SAL_CALL
-ScVbaApplication::setEnableCancelKey(sal_Bool bEnable) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setEnableCancelKey(sal_Bool bEnable)
 {
     // Stub, does nothing
     mrAppSettings.mbEnableCancelKey = bEnable;
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::getEnableCancelKey() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getEnableCancelKey()
 {
     return mrAppSettings.mbEnableCancelKey;
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::getDisplayFullScreen()  throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getDisplayFullScreen()
 {
     SfxViewShell* pShell  = excel::getCurrentBestViewShell( mxContext );
     if ( pShell )
@@ -747,7 +747,7 @@ ScVbaApplication::getDisplayFullScreen()  throw (uno::RuntimeException, std::exc
 }
 
 void SAL_CALL
-ScVbaApplication::setDisplayFullScreen( sal_Bool bSet )  throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setDisplayFullScreen( sal_Bool bSet )
 {
     // #FIXME calling  ScViewUtil::SetFullScreen( *pShell, bSet );
     // directly results in a strange crash, using dispatch instead
@@ -756,7 +756,7 @@ ScVbaApplication::setDisplayFullScreen( sal_Bool bSet )  throw (uno::RuntimeExce
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::getDisplayScrollBars()  throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getDisplayScrollBars()
 {
     ScTabViewShell* pShell  = excel::getCurrentBestViewShell( mxContext );
     if ( pShell )
@@ -767,7 +767,7 @@ ScVbaApplication::getDisplayScrollBars()  throw (uno::RuntimeException, std::exc
 }
 
 void SAL_CALL
-ScVbaApplication::setDisplayScrollBars( sal_Bool bSet )  throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setDisplayScrollBars( sal_Bool bSet )
 {
     // use uno here as it does all he repainting etc. magic
     uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -777,49 +777,49 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet )  throw (uno::RuntimeExce
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::getDisplayExcel4Menus() throw (css::uno::RuntimeException, std::exception)
+ScVbaApplication::getDisplayExcel4Menus()
 {
     return mrAppSettings.mbExcel4Menus;
 }
 
 void SAL_CALL
-ScVbaApplication::setDisplayExcel4Menus( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception)
+ScVbaApplication::setDisplayExcel4Menus( sal_Bool bSet )
 {
     mrAppSettings.mbExcel4Menus = bSet;
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::getDisplayNoteIndicator() throw (css::uno::RuntimeException, std::exception)
+ScVbaApplication::getDisplayNoteIndicator()
 {
     return mrAppSettings.mbDisplayNoteIndicator;
 }
 
 void SAL_CALL
-ScVbaApplication::setDisplayNoteIndicator( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception)
+ScVbaApplication::setDisplayNoteIndicator( sal_Bool bSet )
 {
     mrAppSettings.mbDisplayNoteIndicator = bSet;
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::getShowWindowsInTaskbar() throw (css::uno::RuntimeException, std::exception)
+ScVbaApplication::getShowWindowsInTaskbar()
 {
     return mrAppSettings.mbShowWindowsInTaskbar;
 }
 
 void SAL_CALL
-ScVbaApplication::setShowWindowsInTaskbar( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception)
+ScVbaApplication::setShowWindowsInTaskbar( sal_Bool bSet )
 {
     mrAppSettings.mbShowWindowsInTaskbar = bSet;
 }
 
 sal_Bool SAL_CALL
-ScVbaApplication::getIteration() throw (css::uno::RuntimeException, std::exception)
+ScVbaApplication::getIteration()
 {
     return SC_MOD()->GetDocOptions().IsIter();
 }
 
 void SAL_CALL
-ScVbaApplication::setIteration( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception)
+ScVbaApplication::setIteration( sal_Bool bSet )
 {
     uno::Reference< lang::XMultiComponentFactory > xSMgr(
         mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
@@ -843,7 +843,7 @@ ScVbaApplication::setIteration( sal_Bool bSet ) throw (css::uno::RuntimeExceptio
 }
 
 void SAL_CALL
-ScVbaApplication::Calculate() throw(  script::BasicErrorException , uno::RuntimeException, std::exception )
+ScVbaApplication::Calculate()
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XCalculatable > xCalculatable( getCurrentDocument(), uno::UNO_QUERY_THROW );
@@ -851,7 +851,7 @@ ScVbaApplication::Calculate() throw(  script::BasicErrorException , uno::Runtime
 }
 
 /// @throws uno::RuntimeException
-static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException )
+static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext )
 {
     static uno::Reference< util::XPathSettings >  xPathSettings;
     if ( !xPathSettings.is() )
@@ -861,7 +861,7 @@ static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService(
     return xPathSettings;
 }
 
-OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw (uno::RuntimeException, std::exception)
+OUString ScVbaApplication::getOfficePath( const OUString& _sPathType )
 {
     OUString sRetPath;
     uno::Reference< util::XPathSettings > xProps = lcl_getPathSettingsService( mxContext );
@@ -884,7 +884,7 @@ OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw (un
 }
 
 void SAL_CALL
-ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath )
 {
     uno::Reference< util::XPathSettings > xProps = lcl_getPathSettingsService( mxContext );
     OUString aURL;
@@ -893,25 +893,25 @@ ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) throw (u
 }
 
 OUString SAL_CALL
-ScVbaApplication::getDefaultFilePath() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getDefaultFilePath()
 {
     return getOfficePath( "Work");
 }
 
 OUString SAL_CALL
-ScVbaApplication::getLibraryPath() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getLibraryPath()
 {
     return getOfficePath( "Basic");
 }
 
 OUString SAL_CALL
-ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getTemplatesPath()
 {
     return getOfficePath( "Template");
 }
 
 OUString SAL_CALL
-ScVbaApplication::getPathSeparator() throw (uno::RuntimeException, std::exception)
+ScVbaApplication::getPathSeparator()
 {
     return OUString( (sal_Unicode) SAL_PATHDELIMITER );
 }
@@ -928,7 +928,6 @@ typedef ::std::list< ScRange > ListOfScRange;
     @throws uno::RuntimeException
 */
 void lclAddToListOfScRange( ListOfScRange& rList, const uno::Any& rArg )
-        throw (script::BasicErrorException, uno::RuntimeException)
 {
     if( rArg.hasValue() )
     {
@@ -1035,7 +1034,6 @@ void lclJoinRanges( ListOfScRange& rList )
     @throws uno::RuntimeException
 */
 void lclIntersectRanges( ListOfScRange& rList, const uno::Any& rArg )
-        throw (script::BasicErrorException, uno::RuntimeException)
 {
     // extract the ranges from the passed argument, will throw on invalid data
     ListOfScRange aList2;
@@ -1078,7 +1076,7 @@ void lclIntersectRanges( ListOfScRange& rList, const uno::Any& rArg )
 uno::Reference< excel::XRange > lclCreateVbaRange(
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Reference< frame::XModel >& rxModel,
-        const ListOfScRange& rList ) throw (uno::RuntimeException, std::exception)
+        const ListOfScRange& rList )
 {
     ScDocShell* pDocShell = excel::getDocShell( rxModel );
     if( !pDocShell ) throw uno::RuntimeException();
@@ -1111,7 +1109,6 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect(
         const uno::Any& rArg19, const uno::Any& rArg20, const uno::Any& rArg21, const uno::Any& rArg22,
         const uno::Any& rArg23, const uno::Any& rArg24, const uno::Any& rArg25, const uno::Any& rArg26,
         const uno::Any& rArg27, const uno::Any& rArg28, const uno::Any& rArg29, const uno::Any& rArg30 )
-        throw (script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     if( !rArg1.is() || !rArg2.is() )
         DebugHelper::basicexception( ERRCODE_BASIC_BAD_PARAMETER, OUString() );
@@ -1165,7 +1162,6 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union(
         const uno::Any& rArg19, const uno::Any& rArg20, const uno::Any& rArg21, const uno::Any& rArg22,
         const uno::Any& rArg23, const uno::Any& rArg24, const uno::Any& rArg25, const uno::Any& rArg26,
         const uno::Any& rArg27, const uno::Any& rArg28, const uno::Any& rArg29, const uno::Any& rArg30 )
-        throw (script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     if( !rArg1.is() || !rArg2.is() )
         DebugHelper::basicexception( ERRCODE_BASIC_BAD_PARAMETER, OUString() );
@@ -1210,14 +1206,14 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union(
 }
 
 double
-ScVbaApplication::InchesToPoints( double Inches ) throw (uno::RuntimeException, std::exception )
+ScVbaApplication::InchesToPoints( double Inches )
 {
    double result = ( Inches * 72.0 );
    return result;
 }
 
 void
-ScVbaApplication::Volatile( const uno::Any& aVolatile )  throw ( uno::RuntimeException, std::exception )
+ScVbaApplication::Volatile( const uno::Any& aVolatile )
 {
     bool bVolatile = true;
     aVolatile >>= bVolatile;
@@ -1235,7 +1231,6 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile )  throw ( uno::RuntimeExc
 
 sal_Bool SAL_CALL
 ScVbaApplication::getDisplayFormulaBar()
-    throw (css::uno::RuntimeException, std::exception)
 {
     bool bRes = false;
     ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext );
@@ -1255,7 +1250,6 @@ ScVbaApplication::getDisplayFormulaBar()
 
 void SAL_CALL
 ScVbaApplication::setDisplayFormulaBar( sal_Bool _displayformulabar )
-    throw(css::uno::RuntimeException, std::exception)
 {
     ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext );
     if ( pViewShell && ( _displayformulabar !=  getDisplayFormulaBar() ) )
@@ -1267,7 +1261,7 @@ ScVbaApplication::setDisplayFormulaBar( sal_Bool _displayformulabar )
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException, std::exception )
+ScVbaApplication::Caller( const uno::Any& /*aIndex*/ )
 {
     StarBASIC* pBasic = SfxApplication::GetBasic();
     SbMethod* pMeth = static_cast<SbMethod*>(pBasic->GetRtl()->Find( "FuncCaller", SbxClassType::Method ));
@@ -1283,13 +1277,13 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep
 }
 
 uno::Reference< frame::XModel >
-ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
+ScVbaApplication::getCurrentDocument()
 {
     return getCurrentExcelDoc(mxContext);
 }
 
 uno::Any SAL_CALL
-ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaApplication::MenuBars( const uno::Any& aIndex )
 {
     uno::Reference< XCommandBars > xCommandBars( CommandBars( uno::Any() ), uno::UNO_QUERY_THROW );
     uno::Reference< XCollection > xMenuBars( new ScVbaMenuBars( this, mxContext, xCommandBars ) );
@@ -1301,7 +1295,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio
     return uno::Any( xMenuBars );
 }
 
-void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Procedure )
 {
     try
     {
@@ -1316,7 +1310,7 @@ void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Proc
     }
 }
 
-void SAL_CALL ScVbaApplication::Undo() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaApplication::Undo()
 {
     uno::Reference< frame::XModel > xModel( getThisExcelDoc( mxContext ), uno::UNO_SET_THROW );
 
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index 1b74af2d7492..cc995d0b471f 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -38,10 +38,10 @@ private:
     ScVbaAppSettings& mrAppSettings;
 
     /// @throws css::uno::RuntimeException
-    OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException, std::exception );
+    OUString getOfficePath( const OUString& sPath );
 
 protected:
-    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() override;
 
 public:
     explicit ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext );
@@ -51,85 +51,83 @@ public:
     static bool getDocumentEventsEnabled();
 
     // XExactName
-    virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) override;
 
     // XInvocation
-    virtual css::uno::Reference< css::beans::XIntrospectionAccess >  SAL_CALL getIntrospection()  throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any  SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void  SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any  SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool  SAL_CALL hasMethod(const OUString& Name)  throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool  SAL_CALL hasProperty(const OUString& Name)  throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XIntrospectionAccess >  SAL_CALL getIntrospection() override;
+    virtual css::uno::Any  SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) override;
+    virtual void  SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) override;
+    virtual css::uno::Any  SAL_CALL getValue(const OUString& PropertyName) override;
+    virtual sal_Bool  SAL_CALL hasMethod(const OUString& Name) override;
+    virtual sal_Bool  SAL_CALL hasProperty(const OUString& Name) override;
 
     // XApplication
-    virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCalculation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCalculation( ::sal_Int32 _calculation ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayFormulaBar()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayFormulaBar(sal_Bool _displayformulabar)
-        throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getStatusBar() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnableCancelKey( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Bool SAL_CALL getDisplayFullScreen() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayFullScreen( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayScrollBars() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayScrollBars( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayExcel4Menus() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayExcel4Menus( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Bool SAL_CALL getDisplayNoteIndicator() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayNoteIndicator( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getShowWindowsInTaskbar() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShowWindowsInTaskbar( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getIteration() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setIteration( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL wait( double time ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL InchesToPoints( double InchesToPoints ) throw (css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) override;
+    virtual OUString SAL_CALL getDefaultFilePath() override;
+    virtual OUString SAL_CALL getPathSeparator() override;
+    virtual OUString SAL_CALL getLibraryPath() override;
+    virtual OUString SAL_CALL getTemplatesPath() override;
+
+    virtual OUString SAL_CALL getName() override;
+    virtual sal_Bool SAL_CALL getDisplayAlerts() override;
+    virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) override;
+    virtual ::sal_Int32 SAL_CALL getCalculation() override;
+    virtual void SAL_CALL setCalculation( ::sal_Int32 _calculation ) override;
+    virtual css::uno::Any SAL_CALL getSelection() override;
+    virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() override;
+    virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() override;
+    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() override;
+    virtual sal_Bool SAL_CALL getDisplayFormulaBar() override;
+    virtual void SAL_CALL setDisplayFormulaBar(sal_Bool _displayformulabar) override;
+
+    virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() override;
+    virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() override;
+    virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) override;
+    virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL WorksheetFunction( ) override;
+    virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) override;
+    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) override;
+    virtual css::uno::Any SAL_CALL getCutCopyMode() override;
+    virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) override;
+    virtual css::uno::Any SAL_CALL getStatusBar() override;
+    virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) override;
+    virtual ::sal_Int32 SAL_CALL getCursor() override;
+    virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) override;
+    virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) override;
+    virtual sal_Bool SAL_CALL getEnableEvents() override;
+    virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) override;
+    virtual sal_Bool SAL_CALL getEnableCancelKey() override;
+    virtual void SAL_CALL setEnableCancelKey( sal_Bool bEnable ) override;
+
+    virtual sal_Bool SAL_CALL getDisplayFullScreen() override;
+    virtual void SAL_CALL setDisplayFullScreen( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL getDisplayScrollBars() override;
+    virtual void SAL_CALL setDisplayScrollBars( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL getDisplayExcel4Menus() override;
+    virtual void SAL_CALL setDisplayExcel4Menus( sal_Bool bSet ) override;
+
+    virtual sal_Bool SAL_CALL getDisplayNoteIndicator() override;
+    virtual void SAL_CALL setDisplayNoteIndicator( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL getShowWindowsInTaskbar() override;
+    virtual void SAL_CALL setShowWindowsInTaskbar( sal_Bool bSet ) override;
+    virtual sal_Bool SAL_CALL getIteration() override;
+    virtual void SAL_CALL setIteration( sal_Bool bSet ) override;
+
+    virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) override;
+    virtual void SAL_CALL wait( double time ) override;
+    virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) override;
+    virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override;
+    virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) override;
+    virtual void SAL_CALL Calculate() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override;
+    virtual double SAL_CALL InchesToPoints( double InchesToPoints ) override;
+    virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) override;
+    virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) override;
+    virtual void SAL_CALL Undo() override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 28a114ec4002..13b586d232b4 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -41,59 +41,59 @@ ScVbaAssistant::~ScVbaAssistant()
 {
 }
 
-sal_Bool SAL_CALL ScVbaAssistant::getVisible() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaAssistant::getVisible()
 {
     return m_bIsVisible;
 }
 
-void SAL_CALL ScVbaAssistant::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaAssistant::setVisible( sal_Bool bVisible )
 {
     m_bIsVisible = bVisible;
 }
 
-sal_Bool SAL_CALL ScVbaAssistant::getOn() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaAssistant::getOn()
 {
     return false;
 }
 
-void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn )
 {
     setVisible( bOn );
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaAssistant::getTop() throw (css::uno::RuntimeException, std::exception)
+ScVbaAssistant::getTop()
 {
     return m_nPointsTop;
 }
 void SAL_CALL
-ScVbaAssistant::setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception)
+ScVbaAssistant::setTop( ::sal_Int32 _top )
 {
     m_nPointsTop = _top;
 }
 ::sal_Int32 SAL_CALL
-ScVbaAssistant::getLeft() throw (css::uno::RuntimeException, std::exception)
+ScVbaAssistant::getLeft()
 {
     return m_nPointsLeft;
 }
 void SAL_CALL
-ScVbaAssistant::setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception)
+ScVbaAssistant::setLeft( ::sal_Int32 _left )
 {
     m_nPointsLeft = _left;
 }
 ::sal_Int32 SAL_CALL
-ScVbaAssistant::getAnimation() throw (css::uno::RuntimeException, std::exception)
+ScVbaAssistant::getAnimation()
 {
     return m_nAnimation;
 }
 void SAL_CALL
-ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException, std::exception)
+ScVbaAssistant::setAnimation( ::sal_Int32 _animation )
 {
     m_nAnimation = _animation;
 }
 
 OUString SAL_CALL
-ScVbaAssistant::Name(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaAssistant::Name(  )
 {
     return m_sName;
 }
diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx
index fea786bd24d5..d6d95a6c01c7 100644
--- a/sc/source/ui/vba/vbaassistant.hxx
+++ b/sc/source/ui/vba/vbaassistant.hxx
@@ -42,18 +42,18 @@ public:
     ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext );
     virtual ~ScVbaAssistant() override;
     // XAssistant
-    virtual sal_Bool SAL_CALL getOn() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOn( sal_Bool _on ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getAnimation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getOn() override;
+    virtual void SAL_CALL setOn( sal_Bool _on ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+    virtual ::sal_Int32 SAL_CALL getTop() override;
+    virtual void SAL_CALL setTop( ::sal_Int32 _top ) override;
+    virtual ::sal_Int32 SAL_CALL getLeft() override;
+    virtual void SAL_CALL setLeft( ::sal_Int32 _left ) override;
+    virtual ::sal_Int32 SAL_CALL getAnimation() override;
+    virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) override;
 
-    virtual OUString SAL_CALL Name(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL Name(  ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index 061f698781a3..517a5d707389 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -46,12 +46,12 @@ class EnumWrapper : public EnumerationHelper_BASE
         sal_Int32 nIndex;
 public:
         explicit EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-        virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasMoreElements(  ) override
         {
                 return ( nIndex < m_xIndexAccess->getCount() );
         }
 
-        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual uno::Any SAL_CALL nextElement(  ) override
         {
                 if ( nIndex < m_xIndexAccess->getCount() )
                         return m_xIndexAccess->getByIndex( nIndex++ );
@@ -62,7 +62,7 @@ public:
 }
 
 uno::Reference< excel::XAxis >
-ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext,  sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException, script::BasicErrorException )
+ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext,  sal_Int32 nType, sal_Int32 nAxisGroup )
 {
     ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() );
     if ( !pChart )
@@ -116,8 +116,8 @@ public:
         }
 
     }
-    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override { return mCoordinates.size(); }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount() override { return mCoordinates.size(); }
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         try
         {
@@ -133,11 +133,11 @@ public:
         }
     }
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType() override
     {
         return cppu::UnoType<excel::XAxis>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements( ) override
     {
         return ( mCoordinates.size() > 0 );
     }
@@ -156,19 +156,19 @@ ScVbaAxes::ScVbaAxes( const uno::Reference< XHelperInterface >& xParent,const un
 }
 
 uno::Type SAL_CALL
-ScVbaAxes::getElementType() throw (css::uno::RuntimeException)
+ScVbaAxes::getElementType()
 {
     return  cppu::UnoType<excel::XAxes>::get();
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-ScVbaAxes::createEnumeration() throw (css::uno::RuntimeException)
+ScVbaAxes::createEnumeration()
 {
     return new EnumWrapper( m_xIndexAccess );
 }
 
 uno::Any SAL_CALL
-ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup)
 {
     // #TODO map the possible index combinations to a container::XIndexAccess wrapper impl
     // using a vector of valid std::pair maybe?
diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx
index e638eded5db8..b0d8fa85a6f5 100644
--- a/sc/source/ui/vba/vbaaxes.hxx
+++ b/sc/source/ui/vba/vbaaxes.hxx
@@ -30,17 +30,17 @@ class ScVbaAxes : public ScVbaAxes_BASE
 public:
     ScVbaAxes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< ov::excel::XChart >& xChart );
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     // XCollection
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) override;
     virtual css::uno::Any createCollectionObject(const css::uno::Any&) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     /// @throws css::uno::RuntimeException
     /// @throws css::script::BasicErrorException
-    static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext,  sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException, css::script::BasicErrorException );
+    static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext,  sal_Int32 nType, sal_Int32 nAxisGroup );
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAAXES_HXX
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 1f1349b05f3b..9d21e52baed0 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -34,7 +34,7 @@ const OUString AUTOORIGIN("AutoOrigin");
 const OUString VBA_MIN("Max");
 const OUString VBA_MAX("Min");
 ScVbaChart*
-ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
+ScVbaAxis::getChartPtr()
 {
     ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() );
     if ( !pChart )
@@ -43,7 +43,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
 }
 
 bool
-ScVbaAxis::isValueAxis() throw( script::BasicErrorException )
+ScVbaAxis::isValueAxis()
 {
     if ( getType() == xlCategory )
     {
@@ -61,14 +61,14 @@ ScVbaAxis::ScVbaAxis( const uno::Reference< XHelperInterface >& xParent,const un
 }
 
 void SAL_CALL
-ScVbaAxis::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::Delete(  )
 {
     uno::Reference< lang::XComponent > xComponent( mxPropertySet, uno::UNO_QUERY_THROW );
     xComponent->dispose();
 }
 
  uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL
-ScVbaAxis::getAxisTitle(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getAxisTitle(  )
 {
     uno::Reference< excel::XAxisTitle > xAxisTitle;
     try
@@ -101,20 +101,20 @@ ScVbaAxis::getAxisTitle(  ) throw (script::BasicErrorException, uno::RuntimeExce
 }
 
 void SAL_CALL
-ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ )
 {
     DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString());
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaAxis::getDisplayUnit(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getDisplayUnit(  )
 {
     DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString());
     return -1;
 }
 
 void SAL_CALL
-ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses )
 {
     try
     {
@@ -147,7 +147,7 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio
     }
 }
 ::sal_Int32 SAL_CALL
-ScVbaAxis::getCrosses(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getCrosses(  )
 {
     sal_Int32 nCrosses = xlAxisCrossesCustom;
     try
@@ -181,7 +181,7 @@ ScVbaAxis::getCrosses(  ) throw (script::BasicErrorException, uno::RuntimeExcept
 }
 
  void SAL_CALL
-ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setCrossesAt( double _fCrossesAt )
 {
     try
     {
@@ -196,7 +196,7 @@ ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException
 }
 
  double SAL_CALL
-ScVbaAxis::getCrossesAt(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getCrossesAt(  )
 {
     double fCrosses = 0.0;
     try
@@ -211,19 +211,19 @@ ScVbaAxis::getCrossesAt(  ) throw (script::BasicErrorException, uno::RuntimeExce
 }
 
 void SAL_CALL
-ScVbaAxis::setType( ::sal_Int32 _nType ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setType( ::sal_Int32 _nType )
 {
     mnType = _nType;
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaAxis::getType(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getType(  )
 {
     return mnType;
 }
 
 void SAL_CALL
-ScVbaAxis::setHasTitle( sal_Bool _bHasTitle ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setHasTitle( sal_Bool _bHasTitle )
 {
     try
     {
@@ -249,7 +249,7 @@ ScVbaAxis::setHasTitle( sal_Bool _bHasTitle ) throw (script::BasicErrorException
 }
 
  sal_Bool SAL_CALL
-ScVbaAxis::getHasTitle(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getHasTitle(  )
 {
     bool bHasTitle = false;
     try
@@ -276,7 +276,7 @@ ScVbaAxis::getHasTitle(  ) throw (script::BasicErrorException, uno::RuntimeExcep
 }
 
 void SAL_CALL
-ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setMinorUnit( double _fMinorUnit )
 {
     try
     {
@@ -290,7 +290,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException
 }
 
 double SAL_CALL
-ScVbaAxis::getMinorUnit(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getMinorUnit(  )
 {
     double fMinor = 1.0;
     try
@@ -306,7 +306,7 @@ ScVbaAxis::getMinorUnit(  ) throw (script::BasicErrorException, uno::RuntimeExce
 }
 
 void SAL_CALL
-ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto )
 {
     try
     {
@@ -320,7 +320,7 @@ ScVbaAxis::setMinorUnitIsAuto( sal_Bool _bMinorUnitIsAuto ) throw (script::Basic
 }
 
  sal_Bool SAL_CALL
-ScVbaAxis::getMinorUnitIsAuto(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getMinorUnitIsAuto(  )
 {
     bool bIsAuto = false;
     try
@@ -338,20 +338,20 @@ ScVbaAxis::getMinorUnitIsAuto(  ) throw (script::BasicErrorException, uno::Runti
 }
 
 void SAL_CALL
-ScVbaAxis::setReversePlotOrder( sal_Bool /*ReversePlotOrder*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setReversePlotOrder( sal_Bool /*ReversePlotOrder*/ )
 {
     DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString());
 }
 
 sal_Bool SAL_CALL
-ScVbaAxis::getReversePlotOrder(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getReversePlotOrder(  )
 {
     DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString());
     return false;
 }
 
 void SAL_CALL
-ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setMajorUnit( double _fMajorUnit )
 {
     try
     {
@@ -367,7 +367,7 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException
 }
 
 double SAL_CALL
-ScVbaAxis::getMajorUnit(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getMajorUnit(  )
 {
     double fMax = 1.0;
     try
@@ -383,7 +383,7 @@ ScVbaAxis::getMajorUnit(  ) throw (script::BasicErrorException, uno::RuntimeExce
 }
 
 void SAL_CALL
-ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto )
 {
     try
     {
@@ -399,7 +399,7 @@ ScVbaAxis::setMajorUnitIsAuto( sal_Bool _bMajorUnitIsAuto ) throw (script::Basic
 }
 
 sal_Bool SAL_CALL
-ScVbaAxis::getMajorUnitIsAuto(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getMajorUnitIsAuto(  )
 {
     bool bIsAuto = false;
     try
@@ -417,7 +417,7 @@ ScVbaAxis::getMajorUnitIsAuto(  ) throw (script::BasicErrorException, uno::Runti
 }
 
 void SAL_CALL
-ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setMaximumScale( double _fMaximumScale )
 {
     try
     {
@@ -433,7 +433,7 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc
 }
 
 double SAL_CALL
-ScVbaAxis::getMaximumScale(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getMaximumScale(  )
 {
     double fMax = 1.0;
     try
@@ -452,7 +452,7 @@ ScVbaAxis::getMaximumScale(  ) throw (script::BasicErrorException, uno::RuntimeE
 }
 
 void SAL_CALL
-ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto )
 {
     try
     {
@@ -467,7 +467,7 @@ ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) throw (script:
 }
 
 sal_Bool SAL_CALL
-ScVbaAxis::getMaximumScaleIsAuto(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getMaximumScaleIsAuto(  )
 {
     bool bIsAuto = false;
     try
@@ -483,7 +483,7 @@ ScVbaAxis::getMaximumScaleIsAuto(  ) throw (script::BasicErrorException, uno::Ru
 }
 
 void SAL_CALL
-ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setMinimumScale( double _fMinimumScale )
 {
     try
     {
@@ -497,7 +497,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc
 }
 
 double SAL_CALL
-ScVbaAxis::getMinimumScale(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getMinimumScale(  )
 {
     double fMin = 0.0;
     try
@@ -513,7 +513,7 @@ ScVbaAxis::getMinimumScale(  ) throw (script::BasicErrorException, uno::RuntimeE
 }
 
 void SAL_CALL
-ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto )
 {
     try
     {
@@ -529,7 +529,7 @@ ScVbaAxis::setMinimumScaleIsAuto( sal_Bool _bMinimumScaleIsAuto ) throw (script:
 }
 
 sal_Bool SAL_CALL
-ScVbaAxis::getMinimumScaleIsAuto(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getMinimumScaleIsAuto(  )
 {
     bool bIsAuto = false;
     try
@@ -547,13 +547,13 @@ ScVbaAxis::getMinimumScaleIsAuto(  ) throw (script::BasicErrorException, uno::Ru
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaAxis::getAxisGroup(  ) throw (uno::RuntimeException, std::exception)
+ScVbaAxis::getAxisGroup(  )
 {
     return mnGroup;
 }
 
 void SAL_CALL
-ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType )
 {
     try
     {
@@ -580,7 +580,7 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaAxis::getScaleType(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaAxis::getScaleType(  )
 {
     sal_Int32 nScaleType = xlScaleLinear;
     try
@@ -603,36 +603,36 @@ ScVbaAxis::getScaleType(  ) throw (script::BasicErrorException, uno::RuntimeExce
 }
 
 double SAL_CALL
-ScVbaAxis::getHeight(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaAxis::getHeight(  )
 {
     return oShapeHelper->getHeight();
 }
 
-void SAL_CALL ScVbaAxis::setHeight( double height ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaAxis::setHeight( double height )
 {
     oShapeHelper->setHeight( height );
 }
-double SAL_CALL ScVbaAxis::getWidth(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaAxis::getWidth(  )
 {
     return oShapeHelper->getWidth( );
 }
-void SAL_CALL ScVbaAxis::setWidth( double width ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaAxis::setWidth( double width )
 {
     oShapeHelper->setWidth( width );
 }
-double SAL_CALL ScVbaAxis::getTop(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaAxis::getTop(  )
 {
     return oShapeHelper->getTop( );
 }
-void SAL_CALL ScVbaAxis::setTop( double top ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaAxis::setTop( double top )
 {
     oShapeHelper->setTop( top );
 }
-double SAL_CALL ScVbaAxis::getLeft(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaAxis::getLeft(  )
 {
     return oShapeHelper->getLeft( );
 }
-void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaAxis::setLeft( double left )
 {
     oShapeHelper->setLeft( left );
 }
diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx
index 12eccc8dd785..88004a31514b 100644
--- a/sc/source/ui/vba/vbaaxis.hxx
+++ b/sc/source/ui/vba/vbaaxis.hxx
@@ -33,55 +33,55 @@ class ScVbaAxis : public ScVbaAxis_BASE
     sal_Int32 mnGroup;
     bool bCrossesAreCustomized;
     /// @throws css::uno::RuntimeException
-    ScVbaChart* getChartPtr() throw( css::uno::RuntimeException );
+    ScVbaChart* getChartPtr();
     /// @throws css::script::BasicErrorException
-    bool isValueAxis() throw( css::script::BasicErrorException );
+    bool isValueAxis();
     std::unique_ptr<ov::ShapeHelper> oShapeHelper;
 
 public:
     ScVbaAxis( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup );
     // Methods
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL getAxisTitle(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayUnit( ::sal_Int32 DisplayUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getDisplayUnit(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCrosses(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCrossesAt( double CrossesAt ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getCrossesAt(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setType( ::sal_Int32 Type ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getType(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHasTitle( sal_Bool HasTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getHasTitle(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMinorUnit( double MinorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getMinorUnit(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMinorUnitIsAuto( sal_Bool MinorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMinorUnitIsAuto(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setReversePlotOrder( sal_Bool ReversePlotOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getReversePlotOrder(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMajorUnit( double MajorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getMajorUnit(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMajorUnitIsAuto( sal_Bool MajorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMajorUnitIsAuto(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMaximumScale( double MaximumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getMaximumScale(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMaximumScaleIsAuto( sal_Bool MaximumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMaximumScaleIsAuto(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMinimumScale( double MinimumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getMinimumScale(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMinimumScaleIsAuto( sal_Bool MinimumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMinimumScaleIsAuto(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getAxisGroup(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setScaleType( ::sal_Int32 ScaleType ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getScaleType(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getHeight(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeight( double height ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getWidth(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidth( double width ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getTop(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTop( double top ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getLeft(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual css::uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL getAxisTitle(  ) override;
+    virtual void SAL_CALL setDisplayUnit( ::sal_Int32 DisplayUnit ) override;
+    virtual ::sal_Int32 SAL_CALL getDisplayUnit(  ) override;
+    virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) override;
+    virtual ::sal_Int32 SAL_CALL getCrosses(  ) override;
+    virtual void SAL_CALL setCrossesAt( double CrossesAt ) override;
+    virtual double SAL_CALL getCrossesAt(  ) override;
+    virtual void SAL_CALL setType( ::sal_Int32 Type ) override;
+    virtual ::sal_Int32 SAL_CALL getType(  ) override;
+    virtual void SAL_CALL setHasTitle( sal_Bool HasTitle ) override;
+    virtual sal_Bool SAL_CALL getHasTitle(  ) override;
+    virtual void SAL_CALL setMinorUnit( double MinorUnit ) override;
+    virtual double SAL_CALL getMinorUnit(  ) override;
+    virtual void SAL_CALL setMinorUnitIsAuto( sal_Bool MinorUnitIsAuto ) override;
+    virtual sal_Bool SAL_CALL getMinorUnitIsAuto(  ) override;
+    virtual void SAL_CALL setReversePlotOrder( sal_Bool ReversePlotOrder ) override;
+    virtual sal_Bool SAL_CALL getReversePlotOrder(  ) override;
+    virtual void SAL_CALL setMajorUnit( double MajorUnit ) override;
+    virtual double SAL_CALL getMajorUnit(  ) override;
+    virtual void SAL_CALL setMajorUnitIsAuto( sal_Bool MajorUnitIsAuto ) override;
+    virtual sal_Bool SAL_CALL getMajorUnitIsAuto(  ) override;
+    virtual void SAL_CALL setMaximumScale( double MaximumScale ) override;
+    virtual double SAL_CALL getMaximumScale(  ) override;
+    virtual void SAL_CALL setMaximumScaleIsAuto( sal_Bool MaximumScaleIsAuto ) override;
+    virtual sal_Bool SAL_CALL getMaximumScaleIsAuto(  ) override;
+    virtual void SAL_CALL setMinimumScale( double MinimumScale ) override;
+    virtual double SAL_CALL getMinimumScale(  ) override;
+    virtual void SAL_CALL setMinimumScaleIsAuto( sal_Bool MinimumScaleIsAuto ) override;
+    virtual sal_Bool SAL_CALL getMinimumScaleIsAuto(  ) override;
+    virtual ::sal_Int32 SAL_CALL getAxisGroup(  ) override;
+    virtual void SAL_CALL setScaleType( ::sal_Int32 ScaleType ) override;
+    virtual ::sal_Int32 SAL_CALL getScaleType(  ) override;
+    virtual double SAL_CALL getHeight(  ) override;
+    virtual void SAL_CALL setHeight( double height ) override;
+    virtual double SAL_CALL getWidth(  ) override;
+    virtual void SAL_CALL setWidth( double width ) override;
+    virtual double SAL_CALL getTop(  ) override;
+    virtual void SAL_CALL setTop( double top ) override;
+    virtual double SAL_CALL getLeft(  ) override;
+    virtual void SAL_CALL setLeft( double left ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index c761f43dc993..3737005e9ee9 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -160,14 +160,14 @@ public:
     ScVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, ScVbaPalette& rPalette) : ScVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {}
 
     // XBorder
-    uno::Any SAL_CALL getColor() throw (uno::RuntimeException, std::exception) override
+    uno::Any SAL_CALL getColor() override
     {
         table::BorderLine aBorderLine;
         if ( getBorderLine( aBorderLine ) )
             return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) );
         throw uno::RuntimeException("No Implementation available" );
     }
-    void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) override
+    void SAL_CALL setColor( const uno::Any& _color ) override
     {
         sal_Int32 nColor = 0;
         _color >>= nColor;
@@ -181,7 +181,7 @@ public:
             throw uno::RuntimeException("No Implementation available" );
     }
 
-    uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) override
+    uno::Any SAL_CALL getColorIndex() override
     {
         sal_Int32 nColor = 0;
         XLRGBToOORGB( getColor() ) >>= nColor;
@@ -201,7 +201,7 @@ public:
         return uno::makeAny(nIndex);
     }
 
-    void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) override
+    void SAL_CALL setColorIndex( const uno::Any& _colorindex ) override
     {
         sal_Int32 nColor = 0;
         _colorindex >>= nColor;
@@ -209,7 +209,7 @@ public:
             nColor = 1;
         setColor( OORGBToXLRGB( m_Palette.getPalette()->getByIndex( --nColor )  ) );
     }
-    uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) override
+    uno::Any SAL_CALL getWeight() override
     {
         table::BorderLine aBorderLine;
         if ( getBorderLine( aBorderLine ) )
@@ -231,7 +231,7 @@ public:
         }
         throw uno::RuntimeException("Method failed" );
     }
-    void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) override
+    void SAL_CALL setWeight( const uno::Any& _weight ) override
     {
         sal_Int32 nWeight = 0;
         _weight >>= nWeight;
@@ -261,12 +261,12 @@ public:
                     throw uno::RuntimeException("Method failed" );
     }
 
-    uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override
+    uno::Any SAL_CALL getLineStyle() override
     {
         // always return xlContinuous;
         return uno::makeAny( XlLineStyle::xlContinuous );
     }
-    void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) override
+    void SAL_CALL setLineStyle( const uno::Any& _linestyle ) override
     {
         // Urk no choice but to silently ignore we don't support this attribute
         // #TODO would be nice to support the excel line styles
@@ -320,11 +320,11 @@ public:
     {
     }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         return SAL_N_ELEMENTS( supportedIndexTable );
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
 
         sal_Int32 nIndex = getTableIndex( Index );
@@ -335,11 +335,11 @@ public:
         }
         throw lang::IndexOutOfBoundsException();
     }
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return  cppu::UnoType<excel::XBorder>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return true;
     }
@@ -357,12 +357,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE
     sal_Int32 nIndex;
 public:
     explicit RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < m_xIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex < m_xIndexAccess->getCount() )
             return m_xIndexAccess->getByIndex( nIndex++ );
@@ -379,7 +379,7 @@ ScVbaBorders::ScVbaBorders( const uno::Reference< XHelperInterface >& xParent, c
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaBorders::createEnumeration() throw (uno::RuntimeException)
+ScVbaBorders::createEnumeration()
 {
     return new RangeBorderEnumWrapper( m_xIndexAccess );
 }
@@ -391,18 +391,18 @@ ScVbaBorders::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Type
-ScVbaBorders::getElementType() throw (uno::RuntimeException)
+ScVbaBorders::getElementType()
 {
     return cppu::UnoType<excel::XBorders>::get();
 }
 
 uno::Any
-ScVbaBorders::getItemByIntIndex( const sal_Int32 nIndex )  throw (uno::RuntimeException)
+ScVbaBorders::getItemByIntIndex( const sal_Int32 nIndex )
 {
     return createCollectionObject( m_xIndexAccess->getByIndex( nIndex ) );
 }
 
-uno::Any SAL_CALL ScVbaBorders::getColor() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaBorders::getColor()
 {
     sal_Int32 count = getCount();
     uno::Any color;
@@ -422,7 +422,7 @@ uno::Any SAL_CALL ScVbaBorders::getColor() throw (uno::RuntimeException, std::ex
     }
     return  color;
 }
-void SAL_CALL ScVbaBorders::setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaBorders::setColor( const uno::Any& _color )
 {
     sal_Int32 count = getCount();
     for( sal_Int32 i = 0; i < count ; i++ )
@@ -431,7 +431,7 @@ void SAL_CALL ScVbaBorders::setColor( const uno::Any& _color ) throw (uno::Runti
         xBorder->setColor( _color );
     }
 }
-uno::Any SAL_CALL ScVbaBorders::getColorIndex() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaBorders::getColorIndex()
 {
     sal_Int32 count = getCount();
     uno::Any nColorIndex;
@@ -451,7 +451,7 @@ uno::Any SAL_CALL ScVbaBorders::getColorIndex() throw (uno::RuntimeException, st
     }
     return  nColorIndex;
 }
-void SAL_CALL ScVbaBorders::setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaBorders::setColorIndex( const uno::Any& _colorindex )
 {
     sal_Int32 count = getCount();
     for( sal_Int32 i = 0; i < count ; i++ )
@@ -483,7 +483,7 @@ lcl_areAllLineWidthsSame( const table::TableBorder& maTableBorder, bool bIsCell
     return bRes;
 }
 
-uno::Any SAL_CALL ScVbaBorders::getLineStyle() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaBorders::getLineStyle()
 {
     table::TableBorder aTableBorder;
     m_xProps->getPropertyValue( sTableBorder ) >>= aTableBorder;
@@ -503,7 +503,7 @@ uno::Any SAL_CALL ScVbaBorders::getLineStyle() throw (uno::RuntimeException, std
     }
     return uno::makeAny( aLinestyle );
 }
-void SAL_CALL ScVbaBorders::setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaBorders::setLineStyle( const uno::Any& _linestyle )
 {
     sal_Int32 count = getCount();
     for( sal_Int32 i = 0; i < count ; i++ )
@@ -512,7 +512,7 @@ void SAL_CALL ScVbaBorders::setLineStyle( const uno::Any& _linestyle ) throw (un
         xBorder->setLineStyle( _linestyle );
     }
 }
-uno::Any SAL_CALL ScVbaBorders::getWeight() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaBorders::getWeight()
 {
     sal_Int32 count = getCount();
     uno::Any weight;
@@ -532,7 +532,7 @@ uno::Any SAL_CALL ScVbaBorders::getWeight() throw (uno::RuntimeException, std::e
     }
     return  weight;
 }
-void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight )
 {
     sal_Int32 count = getCount();
     for( sal_Int32 i = 0; i < count ; i++ )
diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx
index 61076363174d..dafcbe525cf5 100644
--- a/sc/source/ui/vba/vbaborders.hxx
+++ b/sc/source/ui/vba/vbaborders.hxx
@@ -32,29 +32,29 @@ class ScVbaPalette;
 class ScVbaBorders : public ScVbaBorders_BASE
 {
     // XEnumerationAccess
-    virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) override;
     bool bRangeIsSingleCell;
     css::uno::Reference< css::beans::XPropertySet > m_xProps;
 public:
     ScVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, ScVbaPalette& rPalette );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // XBorders
 
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
-    virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getLineStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWeight( const  css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getColor() override;
+    virtual void SAL_CALL setColor( const css::uno::Any& _color ) override;
+    virtual css::uno::Any SAL_CALL getColorIndex() override;
+    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override;
+    virtual css::uno::Any SAL_CALL getLineStyle() override;
+    virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) override;
+    virtual css::uno::Any SAL_CALL getWeight() override;
+    virtual void SAL_CALL setWeight( const  css::uno::Any& ) override;
     // xxxxBASE
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx
index 747878e082d6..10ce85c79f12 100644
--- a/sc/source/ui/vba/vbacharacters.cxx
+++ b/sc/source/ui/vba/vbacharacters.cxx
@@ -24,7 +24,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< text::XSimpleText>& xRange,const css::uno::Any& Start, const css::uno::Any& Length, bool Replace  ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette),  nLength(-1), nStart(1), bReplace( Replace )
+ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< text::XSimpleText>& xRange,const css::uno::Any& Start, const css::uno::Any& Length, bool Replace  ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette),  nLength(-1), nStart(1), bReplace( Replace )
 {
     Start >>= nStart;
     if ( nStart < 1 )
@@ -49,41 +49,41 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar
 }
 
 OUString SAL_CALL
-ScVbaCharacters::getCaption() throw (css::uno::RuntimeException, std::exception)
+ScVbaCharacters::getCaption()
 {
     return m_xTextRange->getString();
 }
 void SAL_CALL
-ScVbaCharacters::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception)
+ScVbaCharacters::setCaption( const OUString& _caption )
 {
     m_xTextRange->setString( _caption );
 
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaCharacters::getCount() throw (css::uno::RuntimeException, std::exception)
+ScVbaCharacters::getCount()
 {
     return getCaption().getLength();
 }
 
 OUString SAL_CALL
-ScVbaCharacters::getText() throw (css::uno::RuntimeException, std::exception)
+ScVbaCharacters::getText()
 {
     return getCaption();
 }
 void SAL_CALL
-ScVbaCharacters::setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception)
+ScVbaCharacters::setText( const OUString& _text )
 {
     setCaption( _text );
 }
 uno::Reference< excel::XFont > SAL_CALL
-ScVbaCharacters::getFont() throw (css::uno::RuntimeException, std::exception)
+ScVbaCharacters::getFont()
 {
     uno::Reference< beans::XPropertySet > xProps( m_xTextRange, uno::UNO_QUERY_THROW );
     return uno::Reference< excel::XFont >( new ScVbaFont( this, mxContext, m_aPalette, xProps ) );
 }
 void SAL_CALL
-ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException, std::exception)
+ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ )
 {
     // #TODO #FIXME needs implementation, or can't be done?
     throw uno::RuntimeException("Not Implemented" );
@@ -91,13 +91,13 @@ ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) thro
 
 // Methods
 void SAL_CALL
-ScVbaCharacters::Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception)
+ScVbaCharacters::Insert( const OUString& rString )
 {
     m_xSimpleText->insertString( m_xTextRange, rString, bReplace );
 }
 
 void SAL_CALL
-ScVbaCharacters::Delete(  ) throw (css::uno::RuntimeException, std::exception)
+ScVbaCharacters::Delete(  )
 {
     // #FIXME #TODO is this a bit suspect?, I wonder should the contents
     // of the cell be deleted from the parent ( range )
diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx
index 552b472fe073..8dc1acd22f91 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -40,20 +40,20 @@ private:
 public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    ScVbaCharacters( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,  const ScVbaPalette& dPalette, const css::uno::Reference< css::text::XSimpleText >& xRange, const css::uno::Any& Start, const css::uno::Any& Length, bool bReplace = false  ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    ScVbaCharacters( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,  const ScVbaPalette& dPalette, const css::uno::Reference< css::text::XSimpleText >& xRange, const css::uno::Any& Start, const css::uno::Any& Length, bool bReplace = false  );
 
     // Attributes
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& _text ) override;
+    virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() override;
+    virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) override;
 
     // Methods
-    virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Insert( const OUString& String ) override;
+    virtual void SAL_CALL Delete(  ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 3919969749d9..e8b93b474614 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -78,7 +78,7 @@ ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xPar
 }
 
 OUString SAL_CALL
-ScVbaChart::getName() throw (css::uno::RuntimeException, std::exception)
+ScVbaChart::getName()
 {
     OUString sName;
     uno::Reference< beans::XPropertySet > xProps( mxChartDocument, uno::UNO_QUERY_THROW );
@@ -93,13 +93,13 @@ ScVbaChart::getName() throw (css::uno::RuntimeException, std::exception)
 }
 
 uno::Any  SAL_CALL
-ScVbaChart::SeriesCollection(const uno::Any&) throw (uno::RuntimeException, std::exception)
+ScVbaChart::SeriesCollection(const uno::Any&)
 {
     return uno::Any();
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorException, std::exception)
+ScVbaChart::getChartType()
 {
     sal_Int32 nChartType = -1;
     try
@@ -218,7 +218,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce
 }
 
 void SAL_CALL
-ScVbaChart::setChartType( ::sal_Int32 _nChartType ) throw ( uno::RuntimeException, script::BasicErrorException, std::exception)
+ScVbaChart::setChartType( ::sal_Int32 _nChartType )
 {
 try
 {
@@ -543,7 +543,7 @@ try
 }
 
 void SAL_CALL
-ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaChart::Activate()
 {
     // #TODO how are Chart sheets handled ( I know we don't even consider
     // them in the worksheets/sheets collections ), but.....???
@@ -558,7 +558,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException
 }
 
 void SAL_CALL
-ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& _xCalcRange, const css::uno::Any& _aPlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& _xCalcRange, const css::uno::Any& _aPlotBy )
 {
     try
     {
@@ -634,13 +634,13 @@ ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount )
 }
 
 void
-ScVbaChart::setDefaultChartType() throw ( script::BasicErrorException )
+ScVbaChart::setDefaultChartType()
 {
     setChartType( xlColumnClustered );
 }
 
 void
-ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy )
 {
     try
     {
@@ -665,7 +665,7 @@ ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorExce
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaChart::getPlotBy(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaChart::getPlotBy(  )
 {
     try
     {
@@ -687,7 +687,7 @@ ScVbaChart::getPlotBy(  ) throw (script::BasicErrorException, uno::RuntimeExcept
 }
 
 void
-ScVbaChart::setDiagram( const OUString& _sDiagramType ) throw( script::BasicErrorException )
+ScVbaChart::setDiagram( const OUString& _sDiagramType )
 {
     try
     {
@@ -705,19 +705,19 @@ ScVbaChart::setDiagram( const OUString& _sDiagramType ) throw( script::BasicErro
 // #TODO find out why we have Location/getLocation? there is afaik no
 // Location property, just a Location function for the Chart object
 sal_Int32 SAL_CALL
-ScVbaChart::Location() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaChart::Location()
 {
     return getLocation();
 }
 
 sal_Int32 SAL_CALL
-ScVbaChart::getLocation() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaChart::getLocation()
 {
      return -1;
 }
 
 void SAL_CALL
-ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ )
 {
     // Helper api just stubs out the code <shrug>
     // #TODO come back and make sense out of this
@@ -805,7 +805,7 @@ ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ )
 }
 
 sal_Bool SAL_CALL
-ScVbaChart::getHasTitle(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaChart::getHasTitle(  )
 {
     bool bHasTitle = false;
     try
@@ -820,7 +820,7 @@ ScVbaChart::getHasTitle(  ) throw (script::BasicErrorException, uno::RuntimeExce
 }
 
 void SAL_CALL
-ScVbaChart::setHasTitle( sal_Bool bTitle ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaChart::setHasTitle( sal_Bool bTitle )
 {
     try
     {
@@ -834,7 +834,7 @@ ScVbaChart::setHasTitle( sal_Bool bTitle ) throw (script::BasicErrorException, u
 }
 
 sal_Bool SAL_CALL
-ScVbaChart::getHasLegend(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaChart::getHasLegend(  )
 {
     bool bHasLegend = false;
     try
@@ -849,7 +849,7 @@ ScVbaChart::getHasLegend(  ) throw (script::BasicErrorException, uno::RuntimeExc
 }
 
 void SAL_CALL
-ScVbaChart::setHasLegend( sal_Bool bLegend ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaChart::setHasLegend( sal_Bool bLegend )
 {
     try
     {
@@ -862,7 +862,7 @@ ScVbaChart::setHasLegend( sal_Bool bLegend ) throw (script::BasicErrorException,
 }
 
 uno::Reference< excel::XChartTitle > SAL_CALL
-ScVbaChart::getChartTitle(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaChart::getChartTitle(  )
 {
     uno::Reference< drawing::XShape > xTitleShape = mxChartDocument->getTitle();
     // #TODO check parent
@@ -870,7 +870,7 @@ ScVbaChart::getChartTitle(  ) throw (script::BasicErrorException, uno::RuntimeEx
 }
 
 uno::Any SAL_CALL
-ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup )
 {
     // mmm chart probably is the parent, #TODO check parent
     uno::Reference< excel::XAxes > xAxes = new ScVbaAxes( this, mxContext, this );
@@ -879,7 +879,7 @@ ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) throw (scrip
     return xAxes->Item( Type, AxisGroup );
 }
 bool
-ScVbaChart::is3D() throw ( uno::RuntimeException )
+ScVbaChart::is3D()
 {
     // #TODO perhaps provide limited Debughelper functionality
     bool is3d = false;
@@ -888,7 +888,7 @@ ScVbaChart::is3D() throw ( uno::RuntimeException )
 }
 
 sal_Int32
-ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( uno::RuntimeException )
+ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked )
 {
     // #TODO perhaps provide limited Debughelper functionality
     if (isStacked())
@@ -903,7 +903,7 @@ ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked,
 }
 
 bool
-ScVbaChart::isStacked() throw ( uno::RuntimeException )
+ScVbaChart::isStacked()
 {
     // #TODO perhaps provide limited Debughelper functionality
     bool bStacked = false;
@@ -912,7 +912,7 @@ ScVbaChart::isStacked() throw ( uno::RuntimeException )
 }
 
 bool
-ScVbaChart::is100PercentStacked() throw ( uno::RuntimeException )
+ScVbaChart::is100PercentStacked()
 {
     // #TODO perhaps provide limited Debughelper functionality
     bool b100Percent = false;
@@ -921,7 +921,7 @@ ScVbaChart::is100PercentStacked() throw ( uno::RuntimeException )
 }
 
 sal_Int32
-ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( script::BasicErrorException )
+ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked)
 {
     try
     {
@@ -953,7 +953,7 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _
 }
 
 sal_Int32
-ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (script::BasicErrorException)
+ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown)
 {
     try
     {
@@ -977,7 +977,7 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw
 }
 
 bool
-ScVbaChart::hasMarkers() throw ( script::BasicErrorException )
+ScVbaChart::hasMarkers()
 {
     bool bHasMarkers = false;
     try
@@ -995,7 +995,7 @@ ScVbaChart::hasMarkers() throw ( script::BasicErrorException )
 }
 
 sal_Int32
-ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( script::BasicErrorException )
+ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers)
 {
     if (hasMarkers())
         return _nWithMarkers;
@@ -1013,7 +1013,7 @@ ScVbaChart::assignDiagramAttributes()
 }
 
 uno::Reference< beans::XPropertySet >
-ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException, uno::RuntimeException )
+ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup)
 {
     assignDiagramAttributes();
     uno::Reference< beans::XPropertySet > xAxisProps;
diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx
index 359b5b10cf80..5c4e3171b786 100644
--- a/sc/source/ui/vba/vbachart.hxx
+++ b/sc/source/ui/vba/vbachart.hxx
@@ -51,23 +51,23 @@ friend class ScVbaAxis;
 
     static css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount );
     /// @throws css::script::BasicErrorException
-    void setDefaultChartType()throw ( css::script::BasicErrorException ) ;
+    void setDefaultChartType() ;
     /// @throws css::script::BasicErrorException
-    void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException );
+    void setDiagram( const OUString& _sDiagramType);
     /// @throws css::uno::RuntimeException
-    bool isStacked() throw ( css::uno::RuntimeException );
+    bool isStacked();
     /// @throws css::uno::RuntimeException
-    bool is100PercentStacked() throw ( css::uno::RuntimeException );
+    bool is100PercentStacked();
     /// @throws css::uno::RuntimeException
-    sal_Int32 getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( css::uno::RuntimeException );
+    sal_Int32 getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked );
     /// @throws css::script::BasicErrorException
-    sal_Int32 getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( css::script::BasicErrorException );
+    sal_Int32 getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked);
     /// @throws css::script::BasicErrorException
-    sal_Int32 getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (css::script::BasicErrorException);
+    sal_Int32 getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown);
     /// @throws css::script::BasicErrorException
-    bool hasMarkers() throw ( css::script::BasicErrorException );
+    bool hasMarkers();
     /// @throws css::script::BasicErrorException
-    sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( css::script::BasicErrorException );
+    sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers);
     void assignDiagramAttributes();
 public:
     ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart );
@@ -75,28 +75,28 @@ public:
     // Non-interface
     const css::uno::Reference< css::beans::XPropertySet >& xDiagramPropertySet() const { return mxDiagramPropertySet; }
     /// @throws css::uno::RuntimeException
-    bool is3D() throw ( css::uno::RuntimeException );
+    bool is3D();
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
+    css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup);
     // Methods
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override;
-    virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override;
-    virtual void SAL_CALL Activate(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL Location(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getLocation(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLocation( ::sal_Int32 where, const css::uno::Any& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getHasTitle(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHasTitle( sal_Bool bTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getHasLegend(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHasLegend( sal_Bool bLegend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPlotBy( ::sal_Int32 xlRowCol ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getPlotBy(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) override;
+    virtual ::sal_Int32 SAL_CALL getChartType() override;
+    virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) override;
+    virtual void SAL_CALL Activate(  ) override;
+    virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) override;
+    virtual ::sal_Int32 SAL_CALL Location(  ) override;
+    virtual ::sal_Int32 SAL_CALL getLocation(  ) override;
+    virtual void SAL_CALL setLocation( ::sal_Int32 where, const css::uno::Any& Name ) override;
+    virtual sal_Bool SAL_CALL getHasTitle(  ) override;
+    virtual void SAL_CALL setHasTitle( sal_Bool bTitle ) override;
+    virtual sal_Bool SAL_CALL getHasLegend(  ) override;
+    virtual void SAL_CALL setHasLegend( sal_Bool bLegend ) override;
+    virtual void SAL_CALL setPlotBy( ::sal_Int32 xlRowCol ) override;
+    virtual ::sal_Int32 SAL_CALL getPlotBy(  ) override;
+    virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle(  ) override;
+    virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index 3d9778a4f1ad..eec8cdd29c27 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -49,7 +49,7 @@ OUString const & ScVbaChartObject::getPersistName()
 }
 
 uno::Reference< drawing::XShape >
-ScVbaChartObject::setShape() throw ( script::BasicErrorException )
+ScVbaChartObject::setShape()
 {
     try
     {
@@ -78,21 +78,19 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException )
 }
 
 void SAL_CALL
-ScVbaChartObject::setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception)
+ScVbaChartObject::setName( const OUString& sName )
 {
     xNamedShape->setName(sName);
 }
 
 OUString SAL_CALL
-ScVbaChartObject::getName() throw (css::uno::RuntimeException, std::exception)
+ScVbaChartObject::getName()
 {
     return xNamedShape->getName();
 }
 
 void SAL_CALL
 ScVbaChartObject::Delete()
-    throw (css::script::BasicErrorException,
-           css::uno::RuntimeException, std::exception)
 {
     // parent of this object is sheet
     uno::Reference< excel::XWorksheet > xParent( getParent(), uno::UNO_QUERY_THROW );
@@ -105,7 +103,7 @@ ScVbaChartObject::Delete()
 }
 
 void
-ScVbaChartObject::Activate() throw ( script::BasicErrorException )
+ScVbaChartObject::Activate()
 {
     try
     {
@@ -123,7 +121,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException )
 }
 
 uno::Reference< excel::XChart > SAL_CALL
-ScVbaChartObject::getChart() throw (css::uno::RuntimeException, std::exception)
+ScVbaChartObject::getChart()
 {
     return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart );
 }
diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx
index aa6d7f1f5fb9..6bce2f4b54c8 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -45,15 +45,15 @@ class ScVbaChartObject : public ChartObjectImpl_BASE
     css::uno::Reference< css::container::XNamed > xNamedShape;
     OUString const & getPersistName();
     /// @throws css::script::BasicErrorException
-    css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException );
+    css::uno::Reference< css::drawing::XShape > setShape();
 public:
     ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier );
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& sName ) override;
+    virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() override;
+    virtual void SAL_CALL Delete() override;
     /// @throws css::script::BasicErrorException
-    void Activate() throw ( css::script::BasicErrorException );
+    void Activate();
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index 6989795debbf..9e5f5c025714 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -41,8 +41,8 @@ class ChartObjectEnumerationImpl : public EnumerationHelperImpl
 
 public:
     /// @throws uno::RuntimeException
-    ChartObjectEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier, const uno::Reference< XHelperInterface >& _xParent ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier( _xDrawPageSupplier ) {}
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    ChartObjectEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier, const uno::Reference< XHelperInterface >& _xParent ) : EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier( _xDrawPageSupplier ) {}
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         uno::Any ret;
 
@@ -87,7 +87,7 @@ ScVbaChartObjects::removeByName(const OUString& _sChartName)
 }
 
 uno::Sequence< OUString >
-ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException )
+ScVbaChartObjects::getChartObjectNames()
 {
     uno::Sequence< OUString > sChartNames;
     try
@@ -127,7 +127,7 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException
 
 // XChartObjects
 uno::Any SAL_CALL
-ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight ) throw (script::BasicErrorException, std::exception)
+ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight )
 {
     try
     {
@@ -150,7 +150,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight
     }
     return aNULL();
 }
-void SAL_CALL ScVbaChartObjects::Delete(  ) throw (script::BasicErrorException, std::exception)
+void SAL_CALL ScVbaChartObjects::Delete(  )
 {
     uno::Sequence< OUString > sChartNames = xTableCharts->getElementNames();
     sal_Int32 ncount = sChartNames.getLength();
@@ -161,7 +161,7 @@ void SAL_CALL ScVbaChartObjects::Delete(  ) throw (script::BasicErrorException,
 // XEnumerationAccess
 
 uno::Reference< container::XEnumeration >
-ScVbaChartObjects::createEnumeration() throw (uno::RuntimeException)
+ScVbaChartObjects::createEnumeration()
 {
     css::uno::Reference< container::XEnumerationAccess > xEnumAccess( xTableCharts, uno::UNO_QUERY_THROW );
     return new ChartObjectEnumerationImpl( mxContext, xEnumAccess->createEnumeration(), xDrawPageSupplier, getParent() /* sheet */);
@@ -170,7 +170,7 @@ ScVbaChartObjects::createEnumeration() throw (uno::RuntimeException)
 // XElementAccess
 
 uno::Type
-ScVbaChartObjects::getElementType() throw (uno::RuntimeException)
+ScVbaChartObjects::getElementType()
 {
     return cppu::UnoType<excel::XChartObject>::get();
 }
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx
index e62b1ab2634a..915df9d75003 100644
--- a/sc/source/ui/vba/vbachartobjects.hxx
+++ b/sc/source/ui/vba/vbachartobjects.hxx
@@ -42,16 +42,16 @@ public:
     ScVbaChartObjects( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableCharts >& _xTableCharts, const css::uno::Reference< css::drawing::XDrawPageSupplier >&  _xDrawPageSupplier );
 
     /// @throws css::script::BasicErrorException
-    css::uno::Sequence< OUString > getChartObjectNames() throw( css::script::BasicErrorException );
+    css::uno::Sequence< OUString > getChartObjectNames();
     void removeByName(const OUString& _sChartName);
 
     // XChartObjects
-    virtual css::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (css::script::BasicErrorException, std::exception) override;
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) override;
+    virtual void SAL_CALL Delete(  ) override;
     // XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
     // ChartObjects_BASE
diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index 411a15abe0de..bc39a9c6b2dd 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -42,7 +42,7 @@ ScVbaComment::ScVbaComment(
         const uno::Reference< XHelperInterface >& xParent,
         const uno::Reference< uno::XComponentContext >& xContext,
         const uno::Reference< frame::XModel >& xModel,
-        const uno::Reference< table::XCellRange >& xRange ) throw( lang::IllegalArgumentException, uno::RuntimeException ) :
+        const uno::Reference< table::XCellRange >& xRange ) :
     ScVbaComment_BASE( xParent, xContext ),
     mxModel( xModel, uno::UNO_SET_THROW ),
     mxRange( xRange )
@@ -55,7 +55,7 @@ ScVbaComment::ScVbaComment(
 // private helper functions
 
 uno::Reference< sheet::XSheetAnnotation > SAL_CALL
-ScVbaComment::getAnnotation() throw (uno::RuntimeException)
+ScVbaComment::getAnnotation()
 {
     uno::Reference< table::XCell > xCell( mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XSheetAnnotationAnchor > xAnnoAnchor( xCell, uno::UNO_QUERY_THROW );
@@ -63,7 +63,7 @@ ScVbaComment::getAnnotation() throw (uno::RuntimeException)
 }
 
 uno::Reference< sheet::XSheetAnnotations > SAL_CALL
-ScVbaComment::getAnnotations() throw (uno::RuntimeException)
+ScVbaComment::getAnnotations()
 {
     uno::Reference< sheet::XSheetCellRange > xSheetCellRange(mxRange, ::uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XSpreadsheet > xSheet = xSheetCellRange->getSpreadsheet();
@@ -73,7 +73,7 @@ ScVbaComment::getAnnotations() throw (uno::RuntimeException)
 }
 
 sal_Int32 SAL_CALL
-ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException)
+ScVbaComment::getAnnotationIndex()
 {
     uno::Reference< sheet::XSheetAnnotations > xAnnos = getAnnotations();
     table::CellAddress aAddress = getAnnotation()->getPosition();
@@ -98,7 +98,7 @@ ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException)
 }
 
 uno::Reference< excel::XComment > SAL_CALL
-ScVbaComment::getCommentByIndex( sal_Int32 Index ) throw (uno::RuntimeException)
+ScVbaComment::getCommentByIndex( sal_Int32 Index )
 {
     uno::Reference< container::XIndexAccess > xIndexAccess( getAnnotations(), uno::UNO_QUERY_THROW );
     // parent is sheet ( parent of the range which is the parent of the comment )
@@ -110,19 +110,19 @@ ScVbaComment::getCommentByIndex( sal_Int32 Index ) throw (uno::RuntimeException)
 // public vba functions
 
 OUString SAL_CALL
-ScVbaComment::getAuthor() throw (uno::RuntimeException, std::exception)
+ScVbaComment::getAuthor()
 {
     return getAnnotation()->getAuthor();
 }
 
 void SAL_CALL
-ScVbaComment::setAuthor( const OUString& /*_author*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaComment::setAuthor( const OUString& /*_author*/ )
 {
     // #TODO #FIXME  implementation needed
 }
 
 uno::Reference< msforms::XShape > SAL_CALL
-ScVbaComment::getShape() throw (uno::RuntimeException, std::exception)
+ScVbaComment::getShape()
 {
     uno::Reference< sheet::XSheetAnnotationShapeSupplier > xAnnoShapeSupp( getAnnotation(), uno::UNO_QUERY_THROW );
     uno::Reference< drawing::XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), uno::UNO_SET_THROW );
@@ -133,39 +133,39 @@ ScVbaComment::getShape() throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL
-ScVbaComment::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaComment::getVisible()
 {
     return getAnnotation()->getIsVisible();
 }
 
 void SAL_CALL
-ScVbaComment::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception)
+ScVbaComment::setVisible( sal_Bool _visible )
 {
     getAnnotation()->setIsVisible( _visible );
 }
 
 void SAL_CALL
-ScVbaComment::Delete() throw (uno::RuntimeException, std::exception)
+ScVbaComment::Delete()
 {
     getAnnotations()->removeByIndex( getAnnotationIndex() );
 }
 
 uno::Reference< excel::XComment > SAL_CALL
-ScVbaComment::Next() throw (uno::RuntimeException, std::exception)
+ScVbaComment::Next()
 {
     // index: uno = 0, vba = 1
     return getCommentByIndex( getAnnotationIndex() + 2 );
 }
 
 uno::Reference< excel::XComment > SAL_CALL
-ScVbaComment::Previous() throw (uno::RuntimeException, std::exception)
+ScVbaComment::Previous()
 {
     // index: uno = 0, vba = 1
     return getCommentByIndex( getAnnotationIndex() );
 }
 
 OUString SAL_CALL
-ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::Any& Overwrite ) throw (uno::RuntimeException, std::exception)
+ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::Any& Overwrite )
 {
     OUString sText;
     aText >>= sText;
diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx
index 5383a8501768..3ee4d4550e27 100644
--- a/sc/source/ui/vba/vbacomment.hxx
+++ b/sc/source/ui/vba/vbacomment.hxx
@@ -38,13 +38,13 @@ class ScVbaComment : public ScVbaComment_BASE
 
 private:
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL getAnnotation() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL getAnnotation();
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL getAnnotations() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL getAnnotations();
     /// @throws css::uno::RuntimeException
-    sal_Int32 SAL_CALL getAnnotationIndex() throw (css::uno::RuntimeException);
+    sal_Int32 SAL_CALL getAnnotationIndex();
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ov::excel::XComment > SAL_CALL getCommentByIndex( sal_Int32 Index ) throw (css::uno::RuntimeException);
+    css::uno::Reference< ov::excel::XComment > SAL_CALL getCommentByIndex( sal_Int32 Index );
 public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
@@ -52,20 +52,20 @@ public:
         const css::uno::Reference< ov::XHelperInterface >& xParent,
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const css::uno::Reference< css::frame::XModel >& xModel,
-        const css::uno::Reference< css::table::XCellRange >& xRange ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+        const css::uno::Reference< css::table::XCellRange >& xRange );
 
     // Attributes
-    virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAuthor( const OUString& _author ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAuthor() override;
+    virtual void SAL_CALL setAuthor( const OUString& _author ) override;
+    virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
 
     // Methods
-    virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete() override;
+    virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() override;
+    virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() override;
+    virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx
index 2f92dfff1f6e..b78cc4eacf68 100644
--- a/sc/source/ui/vba/vbacomments.cxx
+++ b/sc/source/ui/vba/vbacomments.cxx
@@ -46,12 +46,12 @@ public:
             const uno::Reference< XHelperInterface >& xParent,
             const uno::Reference< uno::XComponentContext >& xContext,
             const uno::Reference< container::XEnumeration >& xEnumeration,
-            const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) :
+            const uno::Reference< frame::XModel >& xModel ) :
         EnumerationHelperImpl( xParent, xContext, xEnumeration ),
         mxModel( xModel, uno::UNO_SET_THROW )
     {}
 
-    virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement() override
     {
         return AnnotationToComment( m_xEnumeration->nextElement(), m_xContext, mxModel );
     }
@@ -71,7 +71,7 @@ ScVbaComments::ScVbaComments(
 // public helper functions
 
 uno::Reference< container::XEnumeration >
-ScVbaComments::createEnumeration() throw (uno::RuntimeException)
+ScVbaComments::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return new CommentEnumeration( mxParent, mxContext, xEnumAccess->createEnumeration(), mxModel );
@@ -84,7 +84,7 @@ ScVbaComments::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Type
-ScVbaComments::getElementType() throw (uno::RuntimeException)
+ScVbaComments::getElementType()
 {
     return cppu::UnoType<excel::XComment>::get();
 }
diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx
index 9a7e7315d94a..a45ae2a96f12 100644
--- a/sc/source/ui/vba/vbacomments.hxx
+++ b/sc/source/ui/vba/vbacomments.hxx
@@ -37,8 +37,8 @@ public:
         const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // ScVbaComments_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index 2fe01884caa4..17e2fc901c2b 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -37,7 +37,7 @@ ScVbaCondition< Ifc... >::ScVbaCondition(  const uno::Reference< XHelperInterfac
 
 template< typename... Ifc >
 sheet::ConditionOperator
-ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator) throw ( script::BasicErrorException )
+ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator)
 {
     sheet::ConditionOperator aRetAPIOperator = sheet::ConditionOperator_NONE;
     sal_Int32 nOperator = 0;
@@ -79,21 +79,21 @@ ScVbaCondition< Ifc... >::retrieveAPIOperator( const uno::Any& _aOperator) throw
 
 template< typename... Ifc >
 OUString
-ScVbaCondition< Ifc... >::Formula1( ) throw ( script::BasicErrorException, uno::RuntimeException )
+ScVbaCondition< Ifc... >::Formula1( )
 {
      return mxSheetCondition->getFormula1();
 }
 
 template< typename... Ifc >
 OUString
-ScVbaCondition< Ifc... >::Formula2( ) throw ( script::BasicErrorException, uno::RuntimeException )
+ScVbaCondition< Ifc... >::Formula2( )
 {
      return mxSheetCondition->getFormula2();
 }
 
 template< typename... Ifc >
 void
-ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException )
+ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1)
 {
     OUString sFormula;
     if ( (_aFormula1 >>= sFormula ))
@@ -107,7 +107,7 @@ ScVbaCondition< Ifc... >::setFormula1( const uno::Any& _aFormula1) throw ( scrip
 
 template< typename... Ifc >
 sal_Int32
-ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue) throw ( script::BasicErrorException )
+ScVbaCondition< Ifc... >::Operator(bool _bIncludeFormulaValue)
 {
     sal_Int32 retvalue = -1;
     sheet::ConditionOperator aConditionalOperator =  mxSheetCondition->getOperator();
diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx
index d5346f2d8f50..bedd0424f161 100644
--- a/sc/source/ui/vba/vbacondition.hxx
+++ b/sc/source/ui/vba/vbacondition.hxx
@@ -34,15 +34,15 @@ public:
     ScVbaCondition(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition );
 
     /// @throws css::script::BasicErrorException
-    static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator) throw ( css::script::BasicErrorException );
+    static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator);
 
-    virtual OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE;
-    virtual OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE;
+    virtual OUString SAL_CALL Formula1( ) SAL_OVERRIDE;
+    virtual OUString SAL_CALL Formula2( ) SAL_OVERRIDE;
     /// @throws css::script::BasicErrorException
-    virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException );
+    virtual void setFormula1( const css::uno::Any& _aFormula1);
     /// @throws css::script::BasicErrorException
-    virtual sal_Int32 Operator(bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException );
-    virtual sal_Int32 SAL_CALL Operator() throw ( css::script::BasicErrorException, css::uno::RuntimeException ) SAL_OVERRIDE = 0;
+    virtual sal_Int32 Operator(bool _bIncludeFormulaValue);
+    virtual sal_Int32 SAL_CALL Operator() SAL_OVERRIDE = 0;
 
 };
 #endif
diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx
index 93460c20c95e..8ab7cafb0415 100644
--- a/sc/source/ui/vba/vbadialogs.cxx
+++ b/sc/source/ui/vba/vbadialogs.cxx
@@ -24,7 +24,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 uno::Any
-ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException, std::exception)
+ScVbaDialogs::Item( const uno::Any &aItem )
 {
     sal_Int32 nIndex = 0;
     aItem >>= nIndex;
diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx
index dc62a5af18fc..c9e9c657b2b7 100644
--- a/sc/source/ui/vba/vbadialogs.hxx
+++ b/sc/source/ui/vba/vbadialogs.hxx
@@ -34,7 +34,7 @@ public:
     ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): ScVbaDialogs_BASE( xParent, xContext, xModel ) {}
 
     // XCollection
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index 4ffb20e0c84c..0224d7f39d10 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -55,7 +55,7 @@ namespace {
     @throws lang::IllegalArgumentException
     @throws uno::RuntimeException
 */
-SCTAB lclGetTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException, uno::RuntimeException)
+SCTAB lclGetTabFromArgs( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex )
 {
     VbaEventsHelperBase::checkArgument( rArgs, nIndex );
 
@@ -127,28 +127,28 @@ public:
     void stopControllerListening( const uno::Reference< frame::XController >& rxController );
 
     // XTopWindowListener
-    virtual void SAL_CALL windowOpened( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowClosing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowClosed( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowMinimized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowNormalized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowActivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowDeactivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowOpened( const lang::EventObject& rEvent ) override;
+    virtual void SAL_CALL windowClosing( const lang::EventObject& rEvent ) override;
+    virtual void SAL_CALL windowClosed( const lang::EventObject& rEvent ) override;
+    virtual void SAL_CALL windowMinimized( const lang::EventObject& rEvent ) override;
+    virtual void SAL_CALL windowNormalized( const lang::EventObject& rEvent ) override;
+    virtual void SAL_CALL windowActivated( const lang::EventObject& rEvent ) override;
+    virtual void SAL_CALL windowDeactivated( const lang::EventObject& rEvent ) override;
 
     // XWindowListener
-    virtual void SAL_CALL windowResized( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowMoved( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowShown( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowHidden( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized( const awt::WindowEvent& rEvent ) override;
+    virtual void SAL_CALL windowMoved( const awt::WindowEvent& rEvent ) override;
+    virtual void SAL_CALL windowShown( const lang::EventObject& rEvent ) override;
+    virtual void SAL_CALL windowHidden( const lang::EventObject& rEvent ) override;
 
     // XBorderResizeListener
-    virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) override;
 
     // XChangesListener
-    virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) override;
 
 private:
     /** Starts listening to the document model. */
@@ -250,27 +250,27 @@ void ScVbaEventListener::stopControllerListening( const uno::Reference< frame::X
     }
 }
 
-void SAL_CALL ScVbaEventListener::windowOpened( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowOpened( const lang::EventObject& /*rEvent*/ )
 {
 }
 
-void SAL_CALL ScVbaEventListener::windowClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowClosing( const lang::EventObject& /*rEvent*/ )
 {
 }
 
-void SAL_CALL ScVbaEventListener::windowClosed( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowClosed( const lang::EventObject& /*rEvent*/ )
 {
 }
 
-void SAL_CALL ScVbaEventListener::windowMinimized( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowMinimized( const lang::EventObject& /*rEvent*/ )
 {
 }
 
-void SAL_CALL ScVbaEventListener::windowNormalized( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowNormalized( const lang::EventObject& /*rEvent*/ )
 {
 }
 
-void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEvent )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -291,7 +291,7 @@ void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEve
     }
 }
 
-void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rEvent )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -307,7 +307,7 @@ void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rE
     }
 }
 
-void SAL_CALL ScVbaEventListener::windowResized( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowResized( const awt::WindowEvent& rEvent )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -319,19 +319,19 @@ void SAL_CALL ScVbaEventListener::windowResized( const awt::WindowEvent& rEvent
     }
 }
 
-void SAL_CALL ScVbaEventListener::windowMoved( const awt::WindowEvent& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowMoved( const awt::WindowEvent& /*rEvent*/ )
 {
 }
 
-void SAL_CALL ScVbaEventListener::windowShown( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowShown( const lang::EventObject& /*rEvent*/ )
 {
 }
 
-void SAL_CALL ScVbaEventListener::windowHidden( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::windowHidden( const lang::EventObject& /*rEvent*/ )
 {
 }
 
-void SAL_CALL ScVbaEventListener::borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& /*aNewSize*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& /*aNewSize*/ )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -344,7 +344,7 @@ void SAL_CALL ScVbaEventListener::borderWidthsChanged( const uno::Reference< uno
     }
 }
 
-void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEvent )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -399,7 +399,7 @@ void SAL_CALL ScVbaEventListener::changesOccurred( const util::ChangesEvent& rEv
     }
 }
 
-void SAL_CALL ScVbaEventListener::disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventListener::disposing( const lang::EventObject& rEvent )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -569,7 +569,7 @@ ScVbaEventsHelper::~ScVbaEventsHelper()
 {
 }
 
-void SAL_CALL ScVbaEventsHelper::notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaEventsHelper::notifyEvent( const css::document::EventObject& rEvent )
 {
     static const uno::Sequence< uno::Any > saEmptyArgs;
     if( (rEvent.EventName == GlobalEventConfig::GetEventName( GlobalEventId::OPENDOC )) ||
@@ -624,13 +624,11 @@ void SAL_CALL ScVbaEventsHelper::notifyEvent( const css::document::EventObject&
 }
 
 OUString ScVbaEventsHelper::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("ScVbaEventsHelper");
 }
 
 css::uno::Sequence<OUString> ScVbaEventsHelper::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.script.vba.VBASpreadsheetEventProcessor"};
@@ -639,7 +637,7 @@ css::uno::Sequence<OUString> ScVbaEventsHelper::getSupportedServiceNames()
 // protected ------------------------------------------------------------------
 
 bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue,
-        const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs ) throw (uno::RuntimeException)
+        const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& rArgs )
 {
     // document and document shell are needed during event processing
     if( !mpShell || !mpDoc )
@@ -689,7 +687,7 @@ bool ScVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue,
 }
 
 uno::Sequence< uno::Any > ScVbaEventsHelper::implBuildArgumentList( const EventHandlerInfo& rInfo,
-        const uno::Sequence< uno::Any >& rArgs ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+        const uno::Sequence< uno::Any >& rArgs )
 {
     // fill arguments for workbook events associated to sheet events according to sheet events, sheet will be added below
     bool bSheetEventAsBookEvent = rInfo.mnEventId > USERDEFINED_START;
@@ -780,7 +778,7 @@ uno::Sequence< uno::Any > ScVbaEventsHelper::implBuildArgumentList( const EventH
 }
 
 void ScVbaEventsHelper::implPostProcessEvent( EventQueue& rEventQueue,
-        const EventHandlerInfo& rInfo, bool bCancel ) throw (uno::RuntimeException)
+        const EventHandlerInfo& rInfo, bool bCancel )
 {
     switch( rInfo.mnEventId )
     {
@@ -801,7 +799,6 @@ void ScVbaEventsHelper::implPostProcessEvent( EventQueue& rEventQueue,
 
 OUString ScVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& rInfo,
         const uno::Sequence< uno::Any >& rArgs ) const
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     bool bSheetEvent = false;
     rInfo.maUserData >>= bSheetEvent;
@@ -841,7 +838,7 @@ bool lclSelectionChanged( const ScRangeList& rLeft, const ScRangeList& rRight )
 
 } // namespace
 
-bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) throw (lang::IllegalArgumentException, uno::RuntimeException)
+bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex )
 {
     uno::Reference< uno::XInterface > xOldSelection( maOldSelection, uno::UNO_QUERY );
     uno::Reference< uno::XInterface > xNewSelection = getXSomethingFromArgs< uno::XInterface >( rArgs, nIndex, false );
@@ -853,7 +850,6 @@ bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rAr
 }
 
 uno::Any ScVbaEventsHelper::createWorksheet( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     // extract sheet index, will throw, if parameter is invalid
     SCTAB nTab = lclGetTabFromArgs( rArgs, nIndex );
@@ -861,7 +857,6 @@ uno::Any ScVbaEventsHelper::createWorksheet( const uno::Sequence< uno::Any >& rA
 }
 
 uno::Any ScVbaEventsHelper::createRange( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     // it is possible to pass an existing VBA Range object
     uno::Reference< excel::XRange > xVbaRange = getXSomethingFromArgs< excel::XRange >( rArgs, nIndex );
@@ -889,7 +884,6 @@ uno::Any ScVbaEventsHelper::createRange( const uno::Sequence< uno::Any >& rArgs,
 }
 
 uno::Any ScVbaEventsHelper::createHyperlink( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     uno::Reference< table::XCell > xCell = getXSomethingFromArgs< table::XCell >( rArgs, nIndex, false );
     uno::Sequence< uno::Any > aArgs( 2 );
@@ -900,7 +894,6 @@ uno::Any ScVbaEventsHelper::createHyperlink( const uno::Sequence< uno::Any >& rA
 }
 
 uno::Any ScVbaEventsHelper::createWindow( const uno::Sequence< uno::Any >& rArgs, sal_Int32 nIndex ) const
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Any > aArgs( 3 );
     aArgs[ 0 ] <<= getVBADocument( mxModel );
diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx
index 4e3f33409d29..ce6eb35b8007 100644
--- a/sc/source/ui/vba/vbaeventshelper.hxx
+++ b/sc/source/ui/vba/vbaeventshelper.hxx
@@ -35,19 +35,17 @@ public:
         const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual ~ScVbaEventsHelper() override;
 
-    virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 protected:
-    virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) override;
-    virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
+    virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) override;
+    virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) override;
+    virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) override;
+    virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const override;
 
 private:
     /** Checks if selection has been changed compared to selection of last call.
@@ -55,28 +53,28 @@ private:
         @throws css::lang::IllegalArgumentException
         @throws css::uno::RuntimeException
     */
-    bool isSelectionChanged( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    bool isSelectionChanged( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex );
 
     /** Creates a VBA Worksheet object (the argument must contain a sheet index).
         @throws css::lang::IllegalArgumentException
         @throws css::uno::RuntimeException
     */
-    css::uno::Any createWorksheet( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+    css::uno::Any createWorksheet( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const;
     /** Creates a VBA Range object (the argument must contain a UNO range or UNO range list).
         @throws css::lang::IllegalArgumentException
         @throws css::uno::RuntimeException
     */
-    css::uno::Any createRange( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+    css::uno::Any createRange( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const;
     /** Creates a VBA Hyperlink object (the argument must contain a UNO cell).
         @throws css::lang::IllegalArgumentException
         @throws css::uno::RuntimeException
     */
-    css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+    css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const;
     /** Creates a VBA Window object (the argument must contain a model controller).
         @throws css::lang::IllegalArgumentException
         @throws css::uno::RuntimeException
     */
-    css::uno::Any createWindow( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+    css::uno::Any createWindow( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const;
 
 private:
     ::rtl::Reference< ScVbaEventListener > mxListener;
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index d6525665de18..369d95ee0375 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -41,7 +41,7 @@ ScVbaFont::ScVbaFont(
         const uno::Reference< uno::XComponentContext >& xContext,
         const ScVbaPalette& dPalette,
         const uno::Reference< beans::XPropertySet >& xPropertySet,
-        ScCellRangeObj* pRangeObj, bool bFormControl ) throw ( uno::RuntimeException ) :
+        ScCellRangeObj* pRangeObj, bool bFormControl ) :
     ScVbaFont_BASE( xParent, xContext, dPalette.getPalette(), xPropertySet, bFormControl ),
     mPalette( dPalette ),
     mpRangeObj( pRangeObj )
@@ -59,7 +59,7 @@ ScVbaFont::~ScVbaFont()
 }
 
 /// @throws css::uno::RuntimeException
-static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) throw ( uno::RuntimeException )
+static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf )
 {
     uno::Reference< text::XTextRange > xTxtRange( xIf, uno::UNO_QUERY_THROW );
     uno::Reference< text::XSimpleText > xTxt( xTxtRange->getText(), uno::UNO_QUERY_THROW ) ;
@@ -67,7 +67,7 @@ static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference<
     return xProps;
 }
 void SAL_CALL
-ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+ScVbaFont::setSuperscript( const uno::Any& aValue )
 {
     // #FIXEME create some sort of generic get/set code where
     // you can pass a functor
@@ -110,7 +110,7 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getSuperscript()
 {
         uno::Reference< table::XCell> xCell( mxFont, uno::UNO_QUERY );
         uno::Reference< table::XCellRange > xCellRange( mxFont, uno::UNO_QUERY );
@@ -143,7 +143,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+ScVbaFont::setSubscript( const uno::Any& aValue )
 {
         uno::Reference< table::XCell> xCell( mxFont, uno::UNO_QUERY );
         uno::Reference< table::XCellRange > xCellRange( mxFont, uno::UNO_QUERY );
@@ -184,7 +184,7 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getSubscript()
 {
         uno::Reference< table::XCell> xCell( mxFont, uno::UNO_QUERY );
         uno::Reference< table::XCellRange > xCellRange( mxFont, uno::UNO_QUERY );
@@ -218,7 +218,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception )
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getSize() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getSize()
 {
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT_HEIGHT) == SfxItemState::DONTCARE )
@@ -227,7 +227,7 @@ ScVbaFont::getSize() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException, std::exception )
+ScVbaFont::setColorIndex( const uno::Any& _colorindex )
 {
     sal_Int32 nIndex = 0;
     _colorindex >>= nIndex;
@@ -244,7 +244,7 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getColorIndex()
 {
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT_COLOR) == SfxItemState::DONTCARE )
@@ -253,7 +253,7 @@ ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception )
 }
 
 void  SAL_CALL
-ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception )
+ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ )
 {
 //XXX #TODO# #FIXME#
     //mxFont->setPropertyValue("CharSize", ( uno::Any )fValue );
@@ -262,7 +262,7 @@ ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::Runtime
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getStandardFontSize()
 {
 //XXX #TODO# #FIXME#
     throw uno::RuntimeException( "getStandardFontSize not supported" );
@@ -270,14 +270,14 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception )
 }
 
 void  SAL_CALL
-ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception )
+ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ )
 {
 //XXX #TODO# #FIXME#
     throw uno::RuntimeException("setStandardFont not supported" );
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getStandardFont() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getStandardFont()
 {
 //XXX #TODO# #FIXME#
     throw uno::RuntimeException("getStandardFont not supported");
@@ -285,7 +285,7 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException, std::exception )
+ScVbaFont::setFontStyle( const uno::Any& aValue )
 {
     bool bBold = false;
     bool bItalic = false;
@@ -316,7 +316,7 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getFontStyle() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getFontStyle()
 {
     OUStringBuffer aStyles;
     bool bValue = false;
@@ -335,7 +335,7 @@ ScVbaFont::getFontStyle() throw ( uno::RuntimeException, std::exception )
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getBold() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getBold()
 {
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT_WEIGHT) == SfxItemState::DONTCARE )
@@ -344,7 +344,7 @@ ScVbaFont::getBold() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+ScVbaFont::setUnderline( const uno::Any& aValue )
 {
     // default
     sal_Int32 nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone;
@@ -378,7 +378,7 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getUnderline() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getUnderline()
 {
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE) == SfxItemState::DONTCARE )
@@ -405,7 +405,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException, std::exception )
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getStrikethrough() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getStrikethrough()
 {
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT) == SfxItemState::DONTCARE )
@@ -414,7 +414,7 @@ ScVbaFont::getStrikethrough() throw ( uno::RuntimeException, std::exception )
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getShadow() throw (uno::RuntimeException, std::exception)
+ScVbaFont::getShadow()
 {
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT_SHADOWED) == SfxItemState::DONTCARE )
@@ -423,7 +423,7 @@ ScVbaFont::getShadow() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getItalic() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getItalic()
 {
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT_POSTURE) == SfxItemState::DONTCARE )
@@ -433,7 +433,7 @@ ScVbaFont::getItalic() throw ( uno::RuntimeException, std::exception )
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getName() throw ( uno::RuntimeException, std::exception )
+ScVbaFont::getName()
 {
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT) == SfxItemState::DONTCARE )
@@ -441,7 +441,7 @@ ScVbaFont::getName() throw ( uno::RuntimeException, std::exception )
     return ScVbaFont_BASE::getName();
 }
 uno::Any
-ScVbaFont::getColor() throw (uno::RuntimeException, std::exception)
+ScVbaFont::getColor()
 {
     // #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet )
     uno::Any aAny;
@@ -450,13 +450,13 @@ ScVbaFont::getColor() throw (uno::RuntimeException, std::exception)
 }
 
 void  SAL_CALL
-ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+ScVbaFont::setOutlineFont( const uno::Any& aValue )
 {
     mxFont->setPropertyValue("CharContoured", aValue );
 }
 
 uno::Any SAL_CALL
-ScVbaFont::getOutlineFont() throw (uno::RuntimeException, std::exception)
+ScVbaFont::getOutlineFont()
 {
     if ( GetDataSet() )
         if (  GetDataSet()->GetItemState( ATTR_FONT_CONTOUR) == SfxItemState::DONTCARE )
diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx
index d1138acec2c2..4a460e70b3b8 100644
--- a/sc/source/ui/vba/vbafont.hxx
+++ b/sc/source/ui/vba/vbafont.hxx
@@ -43,33 +43,33 @@ public:
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const ScVbaPalette& dPalette,
         const css::uno::Reference< css::beans::XPropertySet >& xPropertySet,
-        ScCellRangeObj* pRangeObj = nullptr, bool bFormControl = false ) throw ( css::uno::RuntimeException );
+        ScCellRangeObj* pRangeObj = nullptr, bool bFormControl = false );
     virtual ~ScVbaFont() override;// {}
 
     // Attributes
-    virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getStandardFontSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getStandardFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStandardFont( const css::uno::Any& _standardfont ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getFontStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFontStyle( const css::uno::Any& _fontstyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL getSize() override;
+    virtual css::uno::Any SAL_CALL getStandardFontSize() override;
+    virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) override;
+    virtual css::uno::Any SAL_CALL getStandardFont() override;
+    virtual void SAL_CALL setStandardFont( const css::uno::Any& _standardfont ) override;
+    virtual css::uno::Any SAL_CALL getFontStyle() override;
+    virtual void SAL_CALL setFontStyle( const css::uno::Any& _fontstyle ) override;
+    virtual css::uno::Any SAL_CALL getColorIndex() override;
+    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override;
+    virtual css::uno::Any SAL_CALL getBold() override;
+    virtual css::uno::Any SAL_CALL getUnderline() override;
+    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) override;
+    virtual css::uno::Any SAL_CALL getStrikethrough() override;
+    virtual css::uno::Any SAL_CALL getShadow() override;
+    virtual css::uno::Any SAL_CALL getItalic() override;
+    virtual css::uno::Any SAL_CALL getSubscript() override;
+    virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) override;
+    virtual css::uno::Any SAL_CALL getSuperscript() override;
+    virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) override;
+    virtual css::uno::Any SAL_CALL getName() override;
+    virtual css::uno::Any SAL_CALL getColor() override ;
+    virtual css::uno::Any SAL_CALL getOutlineFont() override ;
+    virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) override ;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index db4f2dbe1eed..0d07983d30fc 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -55,7 +55,7 @@ ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xP
                                     const uno::Reference< uno::XComponentContext > & xContext,
                                     const uno::Reference< beans::XPropertySet >& _xPropertySet,
                                     const uno::Reference< frame::XModel >& xModel,
-                                    bool bCheckAmbiguoity ) throw ( script::BasicErrorException )
+                                    bool bCheckAmbiguoity )
     : ScVbaFormat_BASE( xParent, xContext ),
       m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ),
       mxPropertySet( _xPropertySet ),
@@ -78,7 +78,7 @@ ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xP
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment)   throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment)
 {
     try
     {
@@ -116,7 +116,7 @@ ScVbaFormat< Ifc... >::setVerticalAlignment( const uno::Any& _oAlignment)   thro
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getVerticalAlignment(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::getVerticalAlignment(  )
 {
     uno::Any aResult = aNULL();
     try
@@ -153,7 +153,7 @@ ScVbaFormat< Ifc... >::getVerticalAlignment(  ) throw (script::BasicErrorExcepti
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignment )
 {
     try
     {
@@ -193,7 +193,7 @@ ScVbaFormat< Ifc... >::setHorizontalAlignment( const uno::Any& HorizontalAlignme
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getHorizontalAlignment(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::getHorizontalAlignment(  )
 {
     uno::Any NRetAlignment = aNULL();
     try
@@ -234,7 +234,7 @@ ScVbaFormat< Ifc... >::getHorizontalAlignment(  ) throw (script::BasicErrorExcep
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation )
 {
     try
     {
@@ -271,7 +271,7 @@ ScVbaFormat< Ifc... >::setOrientation( const uno::Any& _aOrientation ) throw (sc
 }
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getOrientation(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::getOrientation(  )
 {
     uno::Any NRetOrientation = aNULL();
     try
@@ -310,7 +310,7 @@ ScVbaFormat< Ifc... >::getOrientation(  ) throw (script::BasicErrorException, un
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText )
 {
     try
     {
@@ -324,7 +324,7 @@ ScVbaFormat< Ifc... >::setWrapText( const uno::Any& _aWrapText ) throw (script::
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getWrapText(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormat< Ifc... >::getWrapText(  )
 {
     uno::Any aWrap = aNULL();
     try
@@ -344,7 +344,7 @@ ScVbaFormat< Ifc... >::getWrapText(  ) throw (script::BasicErrorException, uno::
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException )
+ScVbaFormat< Ifc... >::Borders( const uno::Any& Index )
 {
     ScVbaPalette aPalette( excel::getDocShell( mxModel ) );
     uno::Reference< XCollection > xColl =  new ScVbaBorders( thisHelperIface(), ScVbaFormat_BASE::mxContext, uno::Reference< table::XCellRange >( mxPropertySet, uno::UNO_QUERY_THROW ), aPalette );
@@ -358,7 +358,7 @@ ScVbaFormat< Ifc... >::Borders( const uno::Any& Index ) throw (script::BasicErro
 
 template< typename... Ifc >
 uno::Reference< excel::XFont > SAL_CALL
-ScVbaFormat< Ifc... >::Font(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::Font(  )
 {
     ScVbaPalette aPalette( excel::getDocShell( mxModel ) );
     return new ScVbaFont( thisHelperIface(), ScVbaFormat_BASE::mxContext, aPalette, mxPropertySet );
@@ -366,14 +366,14 @@ ScVbaFormat< Ifc... >::Font(  ) throw (script::BasicErrorException, uno::Runtime
 
 template< typename... Ifc >
 uno::Reference< excel::XInterior > SAL_CALL
-ScVbaFormat< Ifc... >::Interior(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::Interior(  )
 {
     return new ScVbaInterior( thisHelperIface(), ScVbaFormat_BASE::mxContext, mxPropertySet );
 }
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getNumberFormatLocal(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::getNumberFormatLocal(  )
 {
     uno::Any aRet = uno::makeAny( OUString() );
     try
@@ -404,7 +404,7 @@ ScVbaFormat< Ifc... >::getNumberFormatLocal(  ) throw (script::BasicErrorExcepti
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString )
 {
     try
     {
@@ -433,7 +433,7 @@ ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString )
 {
     try
     {
@@ -464,7 +464,7 @@ ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) throw (
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel )
 {
     try
     {
@@ -488,7 +488,7 @@ ScVbaFormat< Ifc... >::setIndentLevel( const uno::Any& _aLevel ) throw (script::
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getIndentLevel(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::getIndentLevel(  )
 {
     uno::Any NRetIndentLevel = aNULL();
     try
@@ -512,7 +512,7 @@ ScVbaFormat< Ifc... >::getIndentLevel(  ) throw (script::BasicErrorException, un
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setLocked( const uno::Any& _aLocked ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setLocked( const uno::Any& _aLocked )
 {
     try
     {
@@ -533,7 +533,7 @@ ScVbaFormat< Ifc... >::setLocked( const uno::Any& _aLocked ) throw (script::Basi
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setFormulaHidden( const uno::Any& FormulaHidden ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setFormulaHidden( const uno::Any& FormulaHidden )
 {
     try
     {
@@ -553,7 +553,7 @@ ScVbaFormat< Ifc... >::setFormulaHidden( const uno::Any& FormulaHidden ) throw (
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getLocked(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormat< Ifc... >::getLocked(  )
 {
     uno::Any aCellProtection = aNULL();
     try
@@ -587,7 +587,7 @@ ScVbaFormat< Ifc... >::getLocked(  ) throw (script::BasicErrorException, uno::Ru
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getFormulaHidden(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormat< Ifc... >::getFormulaHidden(  )
 {
     uno::Any aBoolRet = aNULL();
     try
@@ -620,7 +620,7 @@ ScVbaFormat< Ifc... >::getFormulaHidden(  ) throw (script::BasicErrorException,
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit )
 {
     try
     {
@@ -635,7 +635,7 @@ ScVbaFormat< Ifc... >::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (scri
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getShrinkToFit(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::getShrinkToFit(  )
 {
     uno::Any aRet = aNULL();
     try
@@ -653,7 +653,7 @@ ScVbaFormat< Ifc... >::getShrinkToFit(  ) throw (script::BasicErrorException, un
 
 template< typename... Ifc >
 void SAL_CALL
-ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder )
 {
     try
     {
@@ -686,7 +686,7 @@ ScVbaFormat< Ifc... >::setReadingOrder( const uno::Any& ReadingOrder ) throw (sc
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getReadingOrder(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormat< Ifc... >::getReadingOrder(  )
 {
     uno::Any NRetReadingOrder = aNULL();
     try
@@ -718,7 +718,7 @@ ScVbaFormat< Ifc... >::getReadingOrder(  ) throw (script::BasicErrorException, u
 
 template< typename... Ifc >
 uno::Any SAL_CALL
-ScVbaFormat< Ifc... >::getNumberFormat(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormat< Ifc... >::getNumberFormat(  )
 {
     uno::Any aFormat = aNULL();
     try
@@ -745,7 +745,7 @@ ScVbaFormat< Ifc... >::getNumberFormat(  ) throw (script::BasicErrorException, u
 
 template< typename... Ifc >
 bool
-ScVbaFormat< Ifc... >::isAmbiguous(const OUString& _sPropertyName) throw ( script::BasicErrorException )
+ScVbaFormat< Ifc... >::isAmbiguous(const OUString& _sPropertyName)
 {
     bool bResult = false;
     try
@@ -762,7 +762,7 @@ ScVbaFormat< Ifc... >::isAmbiguous(const OUString& _sPropertyName) throw ( scrip
 
 template< typename... Ifc >
 void
-ScVbaFormat< Ifc... >::initializeNumberFormats() throw ( script::BasicErrorException, uno::RuntimeException )
+ScVbaFormat< Ifc... >::initializeNumberFormats()
 {
     if ( !xNumberFormats.is() )
     {
@@ -774,7 +774,7 @@ ScVbaFormat< Ifc... >::initializeNumberFormats() throw ( script::BasicErrorExcep
 
 template< typename... Ifc >
 uno::Reference< beans::XPropertyState > const &
-ScVbaFormat< Ifc... >::getXPropertyState() throw ( uno::RuntimeException )
+ScVbaFormat< Ifc... >::getXPropertyState()
 {
     if ( !xPropertyState.is() )
         xPropertyState.set( mxPropertySet, uno::UNO_QUERY_THROW );
@@ -783,14 +783,14 @@ ScVbaFormat< Ifc... >::getXPropertyState() throw ( uno::RuntimeException )
 
 template< typename... Ifc >
 ScCellRangesBase*
-ScVbaFormat< Ifc... >::getCellRangesBase() throw ( ::uno::RuntimeException )
+ScVbaFormat< Ifc... >::getCellRangesBase()
 {
     return ScCellRangesBase::getImplementation( mxPropertySet );
 }
 
 template< typename... Ifc >
 SfxItemSet*
-ScVbaFormat< Ifc... >::getCurrentDataSet() throw (uno::RuntimeException, std::exception)
+ScVbaFormat< Ifc... >::getCurrentDataSet()
 {
     SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() );
     if ( !pDataSet )
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index 604bd6fa4bff..d8bbc897e225 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -48,107 +48,107 @@ protected:
     bool mbCheckAmbiguoity;
     bool mbAddIndent;
     /// @throws css::script::BasicErrorException
-    bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException );
+    bool isAmbiguous(const OUString& _sPropertyName);
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::beans::XPropertyState > const &  getXPropertyState() throw ( css::uno::RuntimeException );
+    css::uno::Reference< css::beans::XPropertyState > const &  getXPropertyState();
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    void initializeNumberFormats() throw ( css::script::BasicErrorException, css::uno::RuntimeException );
+    void initializeNumberFormats();
     /// @throws css::uno::RuntimeException
-    SfxItemSet*  getCurrentDataSet( ) throw (css::uno::RuntimeException, std::exception);
+    SfxItemSet*  getCurrentDataSet( );
 protected:
     /// @throws css::uno::RuntimeException
-    virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException );
+    virtual ScCellRangesBase* getCellRangesBase();
 public:
     /// @throws css::script::BasicErrorException
-    ScVbaFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( css::script::BasicErrorException );
+    ScVbaFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& xModel, bool bCheckAmbiguoity );
     virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() = 0;
      /// @throws css::uno::RuntimeException
-     void SAL_CALL setAddIndent( const css::uno::Any& BAddIndent) throw( css::uno::RuntimeException ) { BAddIndent >>= mbAddIndent; }
+     void SAL_CALL setAddIndent( const css::uno::Any& BAddIndent) { BAddIndent >>= mbAddIndent; }
      /// @throws css::uno::RuntimeException
-     css::uno::Any SAL_CALL getAddIndent() throw( css::uno::RuntimeException ) { return css::uno::makeAny( mbAddIndent ); }
+     css::uno::Any SAL_CALL getAddIndent() { return css::uno::makeAny( mbAddIndent ); }
         // Interface Methods
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setNumberFormat( const css::uno::Any& NumberFormat ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setNumberFormat( const css::uno::Any& NumberFormat );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getNumberFormat(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception);
+    virtual css::uno::Any SAL_CALL getNumberFormat(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setNumberFormatLocal( const css::uno::Any& NumberFormatLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setNumberFormatLocal( const css::uno::Any& NumberFormatLocal );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getNumberFormatLocal(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getNumberFormatLocal(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setIndentLevel( const css::uno::Any& IndentLevel ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setIndentLevel( const css::uno::Any& IndentLevel );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getIndentLevel(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getIndentLevel(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setHorizontalAlignment( const css::uno::Any& HorizontalAlignment ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setHorizontalAlignment( const css::uno::Any& HorizontalAlignment );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getHorizontalAlignment(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getHorizontalAlignment(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setVerticalAlignment( const css::uno::Any& VerticalAlignment ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setVerticalAlignment( const css::uno::Any& VerticalAlignment );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getVerticalAlignment(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getVerticalAlignment(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setOrientation( const css::uno::Any& Orientation ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setOrientation( const css::uno::Any& Orientation );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getOrientation(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getOrientation(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setShrinkToFit( const css::uno::Any& ShrinkToFit ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setShrinkToFit( const css::uno::Any& ShrinkToFit );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getShrinkToFit(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getShrinkToFit(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setWrapText( const css::uno::Any& WrapText ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setWrapText( const css::uno::Any& WrapText );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getWrapText(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception);
+    virtual css::uno::Any SAL_CALL getWrapText(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setLocked( const css::uno::Any& Locked ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setLocked( const css::uno::Any& Locked );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getLocked(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception);
+    virtual css::uno::Any SAL_CALL getLocked(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getFormulaHidden(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception);
+    virtual css::uno::Any SAL_CALL getFormulaHidden(  );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
+    virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) = 0;
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getMergeCells(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
+    virtual css::uno::Any SAL_CALL getMergeCells(  ) = 0;
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Any SAL_CALL getReadingOrder(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getReadingOrder(  );
 };
 
 #endif
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index 17629ed9c68d..36d1fc2a3bec 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star;
 
 /// @throws css::script::BasicErrorException
 static ScVbaFormatConditions*
-lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions >& xFormatConditions ) throw ( script::BasicErrorException )
+lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions >& xFormatConditions )
 {
     ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() );
     if ( !pFormatConditions )
@@ -40,7 +40,7 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterfa
                                             const uno::Reference< sheet::XSheetConditionalEntry >& _xSheetConditionalEntry,
                                             const uno::Reference< excel::XStyle >& _xStyle,
                                             const uno::Reference< excel::XFormatConditions >& _xFormatConditions,
-                                            const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException, css::script::BasicErrorException )
+                                            const uno::Reference< css::beans::XPropertySet >& _xPropertySet )
     : ScVbaFormatCondition_BASE( xParent, xContext,
                                  uno::Reference< sheet::XSheetCondition >( _xSheetConditionalEntry, css::uno::UNO_QUERY_THROW ) ),
                                  moFormatConditions( _xFormatConditions ), mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet )
@@ -52,7 +52,7 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterfa
 }
 
 void SAL_CALL
-ScVbaFormatCondition::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormatCondition::Delete(  )
 {
     ScVbaFormatConditions* pFormatConditions = lcl_getScVbaFormatConditionsPtr( moFormatConditions );
     pFormatConditions->removeFormatCondition(msStyleName, true);
@@ -60,7 +60,7 @@ ScVbaFormatCondition::Delete(  ) throw (script::BasicErrorException, uno::Runtim
 }
 
 void SAL_CALL
-ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 )
 {
     try
     {
@@ -75,23 +75,23 @@ ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, co
 }
 
 uno::Reference< excel::XInterior > SAL_CALL
-ScVbaFormatCondition::Interior(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormatCondition::Interior(  )
 {
     return mxStyle->Interior();
 }
 
 uno::Reference< excel::XFont > SAL_CALL
-ScVbaFormatCondition::Font(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormatCondition::Font(  )
 {
     return mxStyle->Font();
 }
 uno::Any SAL_CALL
-ScVbaFormatCondition::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormatCondition::Borders( const uno::Any& Index )
 { return mxStyle->Borders( Index );
 }
 
 sheet::ConditionOperator
-ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< sheet::XSheetCondition >& _xSheetCondition ) throw ( script::BasicErrorException )
+ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< sheet::XSheetCondition >& _xSheetCondition )
 {
     sheet::ConditionOperator aAPIType = sheet::ConditionOperator_NONE;
     switch (_nVBAType)
@@ -110,7 +110,7 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference<
 }
 
 void
-ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException )
+ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1)
 {
     // getA1Formula *SHOULD* detect whether the formula is r1c1 or A1 syntax
     // and if R1C1 convert to A1
@@ -118,7 +118,7 @@ ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::B
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaFormatCondition::Type(  ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception )
+ScVbaFormatCondition::Type(  )
 {
     sal_Int32 nReturnType = 0;
     if ( mxSheetCondition->getOperator() == sheet::ConditionOperator_FORMULA)
@@ -129,19 +129,19 @@ ScVbaFormatCondition::Type(  ) throw ( script::BasicErrorException, uno::Runtime
 }
 
 ::sal_Int32
-ScVbaFormatCondition::Operator( bool bVal ) throw (script::BasicErrorException )
+ScVbaFormatCondition::Operator( bool bVal )
 {
     return ScVbaFormatCondition_BASE::Operator( bVal );
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaFormatCondition::Operator(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormatCondition::Operator(  )
 {
     return ScVbaFormatCondition_BASE::Operator( true );
 }
 
 void
-ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException )
+ScVbaFormatCondition::notifyRange()
 {
     try
     {
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx
index 60a4c8ab92f7..02c0b8c517b2 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -46,23 +46,23 @@ public:
                           const css::uno::Reference< css::sheet::XSheetConditionalEntry >& _xSheetConditionalEntry,
                           const css::uno::Reference< ov::excel::XStyle >&,
                           const css::uno::Reference< ov::excel::XFormatConditions >& _xFormatConditions,
-                          const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException, css::script::BasicErrorException );
+                          const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet );
 
     /// @throws css::script::BasicErrorException
-    void notifyRange() throw ( css::script::BasicErrorException );
+    void notifyRange();
     /// @throws css::script::BasicErrorException
-    static css::sheet::ConditionOperator retrieveAPIType(sal_Int32 _nVBAType, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ) throw( css::script::BasicErrorException );
+    static css::sheet::ConditionOperator retrieveAPIType(sal_Int32 _nVBAType, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition );
 
     //Methods
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL Type(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 Operator( bool  ) throw (css::script::BasicErrorException) override;
-    virtual ::sal_Int32 SAL_CALL Operator(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override;
-    virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ) override;
-    virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) override;
+    virtual ::sal_Int32 SAL_CALL Type(  ) override;
+    virtual ::sal_Int32 Operator( bool  ) override;
+    virtual ::sal_Int32 SAL_CALL Operator(  ) override;
+    virtual void setFormula1( const css::uno::Any& _aFormula1) override;
+    virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior(  ) override;
+    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) override;
+    virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font(  ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx
index 6cfebf709b2b..7514695a553e 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -35,7 +35,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 void SAL_CALL
-ScVbaFormatConditions::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormatConditions::Delete(  )
 {
     try
     {
@@ -58,7 +58,7 @@ ScVbaFormatConditions::Delete(  ) throw (script::BasicErrorException, uno::Runti
 }
 
 uno::Type SAL_CALL
-ScVbaFormatConditions::getElementType() throw (css::uno::RuntimeException)
+ScVbaFormatConditions::getElementType()
 {
     return cppu::UnoType<excel::XFormatCondition>::get();
 }
@@ -93,12 +93,12 @@ class EnumWrapper : public EnumerationHelper_BASE
         sal_Int32 nIndex;
 public:
         EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference<excel::XRange >& xRange, const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference<excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xCollection, const uno::Reference<beans::XPropertySet >& xProps  ) : m_xIndexAccess( xIndexAccess ), m_xParentRange( xRange ), m_xContext( xContext ), m_xStyles( xStyles ), m_xParentCollection( xCollection ), m_xProps( xProps ), nIndex( 0 ) {}
-        virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasMoreElements(  ) override
         {
                 return ( nIndex < m_xIndexAccess->getCount() );
         }
 
-        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual uno::Any SAL_CALL nextElement(  ) override
         {
             try
             {
@@ -131,13 +131,13 @@ public:
 }
 
 uno::Reference< excel::XFormatCondition > SAL_CALL
-ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 )
 {
     return Add( _nType, _aOperator, _aFormula1, _aFormula2, uno::Reference< excel::XStyle >() );
 }
 
 uno::Reference< excel::XFormatCondition >
-ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2, const css::uno::Reference< excel::XStyle >& _xStyle  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2, const css::uno::Reference< excel::XStyle >& _xStyle  )
 {
     // #TODO
     // #FIXME
@@ -206,13 +206,13 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-ScVbaFormatConditions::createEnumeration() throw (uno::RuntimeException)
+ScVbaFormatConditions::createEnumeration()
 {
     return new EnumWrapper( m_xIndexAccess, mxRangeParent, mxContext, mxStyles, this, mxParentRangePropertySet  );
 }
 
 void
-ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException )
+ScVbaFormatConditions::notifyRange()
 {
     try
     {
@@ -225,7 +225,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException )
 }
 
 OUString
-ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( script::BasicErrorException )
+ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula)
 {
     // #TODO, #FIXME hook-in proper formula conversion detection & logic
     OUString sFormula;
@@ -245,7 +245,7 @@ ScVbaFormatConditions::getStyleName()
 }
 
 void
-ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( script::BasicErrorException )
+ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle)
 {
     try
     {
diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx
index c34bc4871132..0978bc1875ab 100644
--- a/sc/source/ui/vba/vbaformatconditions.hxx
+++ b/sc/source/ui/vba/vbaformatconditions.hxx
@@ -47,22 +47,22 @@ class ScVbaFormatConditions: public CollTestImplHelper< ov::excel::XFormatCondit
     css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet;
 public:
     /// @throws css::script::BasicErrorException
-    void notifyRange() throw ( css::script::BasicErrorException );
+    void notifyRange();
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle );
     /// @throws css::script::BasicErrorException
-    static OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException );
+    static OUString getA1Formula(const css::uno::Any& _aFormula);
     OUString getStyleName();
     /// @throws css::script::BasicErrorException
-    void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( css::script::BasicErrorException );
+    void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle);
     const css::uno::Reference< css::sheet::XSheetConditionalEntries >& getSheetConditionalEntries() const { return mxSheetConditionalEntries; }
     // XFormatConditions
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject(const css::uno::Any&) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index b0159503071f..598390fc8074 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -56,7 +56,7 @@ ScVbaGlobals::~ScVbaGlobals()
 // XGlobals
 
 uno::Reference<excel::XApplication > const &
-ScVbaGlobals::getApplication() throw (uno::RuntimeException)
+ScVbaGlobals::getApplication()
 {
     if ( !mxApplication.is() )
         mxApplication.set( new ScVbaApplication( mxContext) );
@@ -64,13 +64,13 @@ ScVbaGlobals::getApplication() throw (uno::RuntimeException)
 }
 
 uno::Reference<excel::XApplication > SAL_CALL
-ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getExcel()
 {
        return getApplication();
 }
 
 uno::Reference< excel::XWorkbook > SAL_CALL
-ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getActiveWorkbook()
 {
     uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY);
     if ( xWorkbook.is() )
@@ -82,131 +82,131 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< excel::XWindow > SAL_CALL
-ScVbaGlobals::getActiveWindow() throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getActiveWindow()
 {
     return getApplication()->getActiveWindow();
 }
 
 uno::Reference< excel::XWorksheet > SAL_CALL
-ScVbaGlobals::getActiveSheet() throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getActiveSheet()
 {
     return getApplication()->getActiveSheet();
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::WorkBooks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::WorkBooks( const uno::Any& aIndex )
 {
     return uno::Any( getApplication()->Workbooks(aIndex) );
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::WorkSheets(const uno::Any& aIndex) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::WorkSheets(const uno::Any& aIndex)
 {
     return getApplication()->Worksheets( aIndex );
 }
 uno::Any SAL_CALL
-ScVbaGlobals::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::Sheets( const uno::Any& aIndex )
 {
     return WorkSheets( aIndex );
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 )
 {
     return getApplication()->Range( Cell1, Cell2 );
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException, std::exception )
+ScVbaGlobals::Names( const css::uno::Any& aIndex )
 {
     return getApplication()->Names( aIndex );
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaGlobals::getActiveCell() throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getActiveCell()
 {
     return getApplication()->getActiveCell();
 }
 
 uno::Reference< XAssistant > SAL_CALL
-ScVbaGlobals::getAssistant() throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getAssistant()
 {
     return getApplication()->getAssistant();
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::getSelection() throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getSelection()
 {
     return getApplication()->getSelection();
 }
 
 uno::Reference< excel::XWorkbook > SAL_CALL
-ScVbaGlobals::getThisWorkbook() throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getThisWorkbook()
 {
     return getApplication()->getThisWorkbook();
 }
 void SAL_CALL
-ScVbaGlobals::Calculate()  throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaGlobals::Calculate()
 {
     return getApplication()->Calculate();
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex )
 {
     return getApplication()->getActiveSheet()->Cells( RowIndex, ColumnIndex );
 }
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaGlobals::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::Columns( const uno::Any& aIndex )
 {
     return getApplication()->getActiveSheet()->Columns( aIndex );
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::CommandBars( const uno::Any& aIndex )
 {
     uno::Reference< XApplicationBase > xBase( getApplication(), uno::UNO_QUERY_THROW );
     return xBase->CommandBars( aIndex );
 }
 
 css::uno::Reference< ov::excel::XRange > SAL_CALL
-ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 )
 {
     return getApplication()->Union(  Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
 }
 css::uno::Reference< ov::excel::XRange > SAL_CALL
-ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 )
 {
     return getApplication()->Intersect(  Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::Evaluate( const OUString& Name ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::Evaluate( const OUString& Name )
 {
     return getApplication()->Evaluate( Name );
 }
 
 css::uno::Any SAL_CALL
-ScVbaGlobals::WorksheetFunction(  ) throw (css::uno::RuntimeException, std::exception)
+ScVbaGlobals::WorksheetFunction(  )
 {
     return getApplication()->WorksheetFunction();
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::Windows( const uno::Any& aIndex )
 {
     return getApplication()->Windows( aIndex );
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::Rows( const uno::Any& aIndex )
 {
     return getApplication()->getActiveSheet()->Rows( aIndex );
 
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::getDebug() throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getDebug()
 {
     try // return empty object on error
     {
@@ -222,13 +222,13 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-ScVbaGlobals::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::MenuBars( const uno::Any& aIndex )
 {
     return uno::Any( getApplication()->MenuBars(aIndex) );
 }
 
 uno::Sequence< OUString > SAL_CALL
-ScVbaGlobals::getAvailableServiceNames(  ) throw (uno::RuntimeException, std::exception)
+ScVbaGlobals::getAvailableServiceNames(  )
 {
     static bool bInit = false;
     static uno::Sequence< OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() );
diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx
index 199868788e62..da401f40d5f2 100644
--- a/sc/source/ui/vba/vbaglobals.hxx
+++ b/sc/source/ui/vba/vbaglobals.hxx
@@ -38,8 +38,7 @@ class ScVbaGlobals : public ScVbaGlobals_BASE
 {
     css::uno::Reference< ov::excel::XApplication > mxApplication;
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ov::excel::XApplication > const & SAL_CALL getApplication()
-                        throw (css::uno::RuntimeException);
+    css::uno::Reference< ov::excel::XApplication > const & SAL_CALL getApplication();
 public:
 
     ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs,
@@ -47,36 +46,36 @@ public:
     virtual ~ScVbaGlobals() override;
 
     // XGlobals
-    virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Calculate(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() override;
+    virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() override;
+    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() override;
+    virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() override;
+    virtual void SAL_CALL Calculate(  ) override;
 
-    virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getSelection() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() override;
+    virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) override;
 
-    virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL WorksheetFunction(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getDebug() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL WorksheetFunction(  ) override;
+    virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) override;
+    virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) override;
+    virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() override;
+    virtual css::uno::Any SAL_CALL getDebug() override;
+    virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) override;
 
     // XMultiServiceFactory
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx
index d9451e31b7a7..6b338e478106 100644
--- a/sc/source/ui/vba/vbahyperlink.cxx
+++ b/sc/source/ui/vba/vbahyperlink.cxx
@@ -34,7 +34,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs,
-        const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException, uno::RuntimeException) :
+        const uno::Reference< uno::XComponentContext >& rxContext ) :
     HyperlinkImpl_BASE( getXSomethingFromArgs< XHelperInterface >( rArgs, 0 ), rxContext ),
     mxCell( getXSomethingFromArgs< table::XCell >( rArgs, 1, false ) ),
     mnType( office::MsoHyperlinkType::msoHyperlinkRange )
@@ -47,7 +47,7 @@ ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs,
 ScVbaHyperlink::ScVbaHyperlink( const uno::Reference< XHelperInterface >& rxAnchor,
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Any& rAddress, const uno::Any& rSubAddress,
-        const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) throw (uno::RuntimeException) :
+        const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) :
     HyperlinkImpl_BASE( rxAnchor, rxContext ) // parent of Hyperlink is the anchor object
 {
     // extract parameters, Address must not be empty
@@ -105,52 +105,52 @@ ScVbaHyperlink::~ScVbaHyperlink()
 {
 }
 
-OUString ScVbaHyperlink::getName() throw (uno::RuntimeException, std::exception)
+OUString ScVbaHyperlink::getName()
 {
     // it seems this attribute is same as TextToDisplay
     return getTextToDisplay();
 }
 
-void ScVbaHyperlink::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception)
+void ScVbaHyperlink::setName( const OUString& rName )
 {
     setTextToDisplay( rName );
 }
 
-OUString ScVbaHyperlink::getAddress() throw (uno::RuntimeException, std::exception)
+OUString ScVbaHyperlink::getAddress()
 {
     return getUrlComponents().first;
 }
 
-void ScVbaHyperlink::setAddress( const OUString& rAddress ) throw (uno::RuntimeException, std::exception)
+void ScVbaHyperlink::setAddress( const OUString& rAddress )
 {
     UrlComponents aUrlComp = getUrlComponents();
     aUrlComp.first = rAddress;
     setUrlComponents( aUrlComp );
 }
 
-OUString ScVbaHyperlink::getSubAddress() throw (uno::RuntimeException, std::exception)
+OUString ScVbaHyperlink::getSubAddress()
 {
     return getUrlComponents().second;
 }
 
-void ScVbaHyperlink::setSubAddress( const OUString& rSubAddress ) throw (uno::RuntimeException, std::exception)
+void ScVbaHyperlink::setSubAddress( const OUString& rSubAddress )
 {
     UrlComponents aUrlComp = getUrlComponents();
     aUrlComp.second = rSubAddress;
     setUrlComponents( aUrlComp );
 }
 
-OUString SAL_CALL ScVbaHyperlink::getScreenTip() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaHyperlink::getScreenTip()
 {
     return maScreenTip;
 }
 
-void SAL_CALL ScVbaHyperlink::setScreenTip( const OUString& rScreenTip ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaHyperlink::setScreenTip( const OUString& rScreenTip )
 {
     maScreenTip = rScreenTip;
 }
 
-OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException, std::exception)
+OUString ScVbaHyperlink::getTextToDisplay()
 {
     ensureTextField();
     OUString aTextToDisplay;
@@ -158,18 +158,18 @@ OUString ScVbaHyperlink::getTextToDisplay() throw (uno::RuntimeException, std::e
     return aTextToDisplay;
 }
 
-void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay ) throw (uno::RuntimeException, std::exception)
+void ScVbaHyperlink::setTextToDisplay( const OUString& rTextToDisplay )
 {
     ensureTextField();
     mxTextField->setPropertyValue("Representation", uno::Any( rTextToDisplay ) );
 }
 
-sal_Int32 SAL_CALL ScVbaHyperlink::getType() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaHyperlink::getType()
 {
     return mnType;
 }
 
-uno::Reference< excel::XRange > SAL_CALL ScVbaHyperlink::getRange() throw (uno::RuntimeException, std::exception)
+uno::Reference< excel::XRange > SAL_CALL ScVbaHyperlink::getRange()
 {
     if( mnType == office::MsoHyperlinkType::msoHyperlinkRange )
     {
@@ -188,7 +188,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaHyperlink::getRange() throw (uno::
     throw uno::RuntimeException();
 }
 
-uno::Reference< msforms::XShape > SAL_CALL ScVbaHyperlink::getShape() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XShape > SAL_CALL ScVbaHyperlink::getShape()
 {
     // error if called at a range Hyperlink object
     return uno::Reference< msforms::XShape >( getParent(), uno::UNO_QUERY_THROW );
@@ -198,13 +198,13 @@ VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaHyperlink, "ooo.vba.excel.Hyperlink" )
 
 // private --------------------------------------------------------------------
 
-void ScVbaHyperlink::ensureTextField() throw (uno::RuntimeException)
+void ScVbaHyperlink::ensureTextField()
 {
     if( !mxTextField.is() )
         throw uno::RuntimeException();
 }
 
-ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::RuntimeException)
+ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents()
 {
     ensureTextField();
     OUString aUrl;
@@ -215,7 +215,7 @@ ScVbaHyperlink::UrlComponents ScVbaHyperlink::getUrlComponents() throw (uno::Run
     return UrlComponents( aUrl.copy( 0, nHashPos ), aUrl.copy( nHashPos + 1 ) );
 }
 
-void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp ) throw (uno::RuntimeException)
+void ScVbaHyperlink::setUrlComponents( const UrlComponents& rUrlComp )
 {
     ensureTextField();
     OUStringBuffer aUrl( rUrlComp.first );
diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx
index 899721280105..3e941a748541 100644
--- a/sc/source/ui/vba/vbahyperlink.hxx
+++ b/sc/source/ui/vba/vbahyperlink.hxx
@@ -36,31 +36,31 @@ public:
     /// @throws css::uno::RuntimeException
     ScVbaHyperlink(
         const css::uno::Sequence< css::uno::Any >& rArgs,
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     /// @throws css::uno::RuntimeException
     ScVbaHyperlink(
         const css::uno::Reference< ov::XHelperInterface >& rxAnchor,
         const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         const css::uno::Any& rAddress, const css::uno::Any& rSubAddress,
-        const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ) throw (css::uno::RuntimeException);
+        const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay );
 
     virtual ~ScVbaHyperlink() override;
 
     // Attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAddress() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAddress( const OUString& rAddress ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& rName ) override;
+    virtual OUString SAL_CALL getAddress() override;
+    virtual void SAL_CALL setAddress( const OUString& rAddress ) override;
+    virtual OUString SAL_CALL getSubAddress() override;
+    virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) override;
+    virtual OUString SAL_CALL getScreenTip() override;
+    virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) override;
+    virtual OUString SAL_CALL getTextToDisplay() override;
+    virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) override;
+    virtual sal_Int32 SAL_CALL getType() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() override;
+    virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() override;
 
     // XHelperInterface
     VBAHELPER_DECL_XHELPERINTERFACE
@@ -69,11 +69,11 @@ private:
     typedef ::std::pair< OUString, OUString > UrlComponents;
 
     /// @throws css::uno::RuntimeException
-    void ensureTextField() throw (css::uno::RuntimeException);
+    void ensureTextField();
     /// @throws css::uno::RuntimeException
-    UrlComponents getUrlComponents() throw (css::uno::RuntimeException);
+    UrlComponents getUrlComponents();
     /// @throws css::uno::RuntimeException
-    void setUrlComponents( const UrlComponents& rUrlComp ) throw (css::uno::RuntimeException);
+    void setUrlComponents( const UrlComponents& rUrlComp );
 
 private:
     css::uno::Reference< css::table::XCell > mxCell;
diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx
index 3e8f2260f209..0d3a2c608432 100644
--- a/sc/source/ui/vba/vbahyperlinks.cxx
+++ b/sc/source/ui/vba/vbahyperlinks.cxx
@@ -35,7 +35,7 @@ namespace {
 
     @throws css::uno::RuntimeException
 */
-bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRange >& rxInner ) throw (uno::RuntimeException)
+bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRange >& rxInner )
 {
     const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner );
     if( rScInner.empty() || rScOuter.empty() )
@@ -54,12 +54,12 @@ struct EqualAnchorFunctor
     uno::Reference< msforms::XShape > mxAnchorShape;
     sal_Int32 mnType;
     /// @throws uno::RuntimeException
-    explicit EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException);
+    explicit EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink );
     /// @throws uno::RuntimeException
-    bool operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const throw (uno::RuntimeException);
+    bool operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const;
 };
 
-EqualAnchorFunctor::EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException) :
+EqualAnchorFunctor::EqualAnchorFunctor( const uno::Reference< excel::XHyperlink >& rxHlink ) :
     mnType( rxHlink->getType() )
 {
     switch( mnType )
@@ -76,7 +76,7 @@ EqualAnchorFunctor::EqualAnchorFunctor( const uno::Reference< excel::XHyperlink
     }
 }
 
-bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const throw (uno::RuntimeException)
+bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& rxHlink ) const
 {
     sal_Int32 nType = rxHlink->getType();
     if( nType != mnType )
@@ -110,37 +110,37 @@ class ScVbaHlinkContainer : public ::cppu::WeakImplHelper< container::XIndexAcce
 {
 public:
     /// @throws uno::RuntimeException
-    explicit ScVbaHlinkContainer() throw (uno::RuntimeException);
+    explicit ScVbaHlinkContainer();
     /// @throws uno::RuntimeException
-    explicit ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetContainer, const ScRangeList& rScRanges ) throw (uno::RuntimeException);
+    explicit ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetContainer, const ScRangeList& rScRanges );
 
     /** Inserts the passed hyperlink into the collection. Will remove a
         Hyperlink object with the same anchor as the passed Hyperlink object.
 
         @throws uno::RuntimeException
     */
-    void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException);
+    void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink );
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
 private:
     typedef ::std::vector< uno::Reference< excel::XHyperlink > > HyperlinkVector;
     HyperlinkVector     maHlinks;
 };
 
-ScVbaHlinkContainer::ScVbaHlinkContainer() throw (uno::RuntimeException)
+ScVbaHlinkContainer::ScVbaHlinkContainer()
 {
     // TODO FIXME: fill with existing hyperlinks
 }
 
 ScVbaHlinkContainer::ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetContainer,
-        const ScRangeList& rScRanges ) throw (uno::RuntimeException)
+        const ScRangeList& rScRanges )
 {
     for( sal_Int32 nIndex = 0, nCount = rxSheetContainer->getCount(); nIndex < nCount; ++nIndex )
     {
@@ -151,7 +151,7 @@ ScVbaHlinkContainer::ScVbaHlinkContainer( const ScVbaHlinkContainerRef& rxSheetC
     }
 }
 
-void ScVbaHlinkContainer::insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException)
+void ScVbaHlinkContainer::insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink )
 {
     HyperlinkVector::iterator aIt = ::std::find_if( maHlinks.begin(), maHlinks.end(), EqualAnchorFunctor( rxHlink ) );
     if( aIt == maHlinks.end() )
@@ -160,25 +160,24 @@ void ScVbaHlinkContainer::insertHyperlink( const uno::Reference< excel::XHyperli
         *aIt = rxHlink;
 }
 
-sal_Int32 SAL_CALL ScVbaHlinkContainer::getCount() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaHlinkContainer::getCount()
 {
     return static_cast< sal_Int32 >( maHlinks.size() );
 }
 
 uno::Any SAL_CALL ScVbaHlinkContainer::getByIndex( sal_Int32 nIndex )
-        throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( (0 <= nIndex) && (nIndex < getCount()) )
         return uno::Any( maHlinks[ static_cast< size_t >( nIndex ) ] );
     throw lang::IndexOutOfBoundsException();
 }
 
-uno::Type SAL_CALL ScVbaHlinkContainer::getElementType() throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScVbaHlinkContainer::getElementType()
 {
     return cppu::UnoType<excel::XHyperlink>::get();
 }
 
-sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements()
 {
     return !maHlinks.empty();
 }
@@ -195,7 +194,7 @@ ScVbaHlinkContainerMember::~ScVbaHlinkContainerMember()
 } // namespace detail
 
 ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent,
-        const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) :
+        const uno::Reference< uno::XComponentContext >& rxContext ) :
     detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer ),
     ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) )
 {
@@ -203,7 +202,7 @@ ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxPa
 
 ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent,
         const uno::Reference< uno::XComponentContext >& rxContext,
-        const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) throw (uno::RuntimeException) :
+        const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) :
     detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer( rxSheetHlinks->mxContainer, rScRanges ) ),
     ScVbaHyperlinks_BASE( rxParent, rxContext, uno::Reference< container::XIndexAccess >( mxContainer.get() ) ),
     mxSheetHlinks( rxSheetHlinks )
@@ -218,7 +217,7 @@ ScVbaHyperlinks::~ScVbaHyperlinks()
 
 uno::Reference< excel::XHyperlink > SAL_CALL ScVbaHyperlinks::Add(
     const uno::Any& rAnchor, const uno::Any& rAddress, const uno::Any& rSubAddress,
-    const uno::Any& rScreenTip, const uno::Any& rTextToDisplay ) throw (uno::RuntimeException, std::exception)
+    const uno::Any& rScreenTip, const uno::Any& rTextToDisplay )
 {
     /*  If this Hyperlinks object has been created from a Range object, the
         call to Add() is passed to the Hyperlinks object of the parent
@@ -243,7 +242,7 @@ uno::Reference< excel::XHyperlink > SAL_CALL ScVbaHyperlinks::Add(
     return xHlink;
 }
 
-void SAL_CALL ScVbaHyperlinks::Delete() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaHyperlinks::Delete()
 {
     // FIXME not implemented
     throw uno::RuntimeException();
@@ -251,14 +250,14 @@ void SAL_CALL ScVbaHyperlinks::Delete() throw (uno::RuntimeException, std::excep
 
 // XEnumerationAccess ---------------------------------------------------------
 
-uno::Reference< container::XEnumeration > SAL_CALL ScVbaHyperlinks::createEnumeration() throw (uno::RuntimeException)
+uno::Reference< container::XEnumeration > SAL_CALL ScVbaHyperlinks::createEnumeration()
 {
     return new SimpleIndexAccessToEnumeration( m_xIndexAccess );
 }
 
 // XElementAccess -------------------------------------------------------------
 
-uno::Type SAL_CALL ScVbaHyperlinks::getElementType() throw (uno::RuntimeException)
+uno::Type SAL_CALL ScVbaHyperlinks::getElementType()
 {
     return cppu::UnoType<excel::XHyperlink>::get();
 }
diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx
index 81b49a6e10c3..48aa35b4b19b 100644
--- a/sc/source/ui/vba/vbahyperlinks.hxx
+++ b/sc/source/ui/vba/vbahyperlinks.hxx
@@ -101,29 +101,28 @@ public:
     /// @throws css::uno::RuntimeException
     explicit ScVbaHyperlinks(
         const css::uno::Reference< ov::XHelperInterface >& rxParent,
-        const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     /// @throws css::uno::RuntimeException
     explicit ScVbaHyperlinks(
         const css::uno::Reference< ov::XHelperInterface >& rxParent,
         const css::uno::Reference< css::uno::XComponentContext >& rxContext,
-        const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges ) throw (css::uno::RuntimeException);
+        const ScVbaHyperlinksRef& rxSheetHlinks, const ScRangeList& rScRanges );
 
     virtual ~ScVbaHyperlinks() override;
 
     // XHyperlinks
     virtual css::uno::Reference< ov::excel::XHyperlink > SAL_CALL Add(
         const css::uno::Any& rAnchor, const css::uno::Any& rAddress, const css::uno::Any& rSubAddress,
-        const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay )
-            throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ) override;
 
-    virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete() override;
 
     // XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
 
     // ScVbaCollectionBase
     virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) override;
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 2b1a7d114e39..51b4c2270615 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -79,7 +79,7 @@ static PatternMap lcl_getPatternMap()
 
 static PatternMap aPatternMap( lcl_getPatternMap() );
 
-ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >&  xProps, ScDocument* pScDoc ) throw ( lang::IllegalArgumentException) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(xProps), m_pScDoc( pScDoc )
+ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >&  xProps, ScDocument* pScDoc ) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(xProps), m_pScDoc( pScDoc )
 {
     // auto color
     m_aPattColor.SetColor( (sal_uInt32)0x0 );
@@ -89,14 +89,14 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent,
 }
 
 uno::Any
-ScVbaInterior::getColor() throw (uno::RuntimeException, std::exception)
+ScVbaInterior::getColor()
 {
     Color aBackColor( GetBackColor() );
     return uno::makeAny( OORGBToXLRGB( aBackColor.GetColor() ) );
 }
 
 void
-ScVbaInterior::setColor( const uno::Any& _color  ) throw (uno::RuntimeException, std::exception)
+ScVbaInterior::setColor( const uno::Any& _color  )
 {
     sal_Int32 nColor = 0;
     if( _color >>= nColor )
@@ -147,7 +147,7 @@ ScVbaInterior::getPalette()
 }
 
 void SAL_CALL
-ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception)
+ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex )
 {
     sal_Int32 nIndex = 0;
     _colorindex >>= nIndex;
@@ -198,7 +198,7 @@ ScVbaInterior::GetColorIndex( const sal_Int32 nColor )
 }
 
 uno::Any SAL_CALL
-ScVbaInterior::getColorIndex() throw ( css::uno::RuntimeException, std::exception )
+ScVbaInterior::getColorIndex()
 {
     sal_Int32 nColor = 0;
     // hackly for excel::XlColorIndex::xlColorIndexNone
@@ -293,7 +293,7 @@ ScVbaInterior::SetUserDefinedAttributes( const OUString& sName, const uno::Any&
 }
 // OOo do not support below API
 uno::Any SAL_CALL
-ScVbaInterior::getPattern() throw (uno::RuntimeException, std::exception)
+ScVbaInterior::getPattern()
 {
     // XlPattern
     uno::Any aPattern = GetUserDefinedAttributes( PATTERN );
@@ -302,7 +302,7 @@ ScVbaInterior::getPattern() throw (uno::RuntimeException, std::exception)
     return uno::makeAny( excel::XlPattern::xlPatternNone );
 }
 void SAL_CALL
-ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeException, std::exception)
+ScVbaInterior::setPattern( const uno::Any& _pattern )
 {
     if( _pattern >>= m_nPattern )
     {
@@ -337,7 +337,7 @@ ScVbaInterior::GetBackColor()
     return aBackColor;
 }
 uno::Any SAL_CALL
-ScVbaInterior::getPatternColor() throw (uno::RuntimeException, std::exception)
+ScVbaInterior::getPatternColor()
 {
     // 0 is the default color. no filled.
     uno::Any aPatternColor = GetUserDefinedAttributes( PATTERNCOLOR );
@@ -349,7 +349,7 @@ ScVbaInterior::getPatternColor() throw (uno::RuntimeException, std::exception)
     return uno::makeAny( sal_Int32( 0 ) );
 }
 void SAL_CALL
-ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::RuntimeException, std::exception)
+ScVbaInterior::setPatternColor( const uno::Any& _patterncolor )
 {
     sal_Int32 nPattColor = 0;
     if( _patterncolor >>= nPattColor )
@@ -361,7 +361,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt
         throw uno::RuntimeException("Invalid Pattern Color" );
 }
 uno::Any SAL_CALL
-ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException, std::exception)
+ScVbaInterior::getPatternColorIndex()
 {
     sal_Int32 nColor = 0;
     XLRGBToOORGB( getPatternColor() ) >>= nColor;
@@ -369,7 +369,7 @@ ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException, std::excepti
     return GetIndexColor( nColor );
 }
 void SAL_CALL
-ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw (uno::RuntimeException, std::exception)
+ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex )
 {
     sal_Int32 nColorIndex = 0;
     if( _patterncolorindex >>= nColorIndex )
diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx
index 65abdbf1a7b3..98d928686f66 100644
--- a/sc/source/ui/vba/vbainterior.hxx
+++ b/sc/source/ui/vba/vbainterior.hxx
@@ -58,19 +58,19 @@ protected:
 public:
         /// @throws css::lang::IllegalArgumentException
         ScVbaInterior( const css::uno::Reference< ov::XHelperInterface >& xParent,  const css::uno::Reference< css::uno::XComponentContext >& xContext,
-                 const css::uno::Reference< css::beans::XPropertySet >& xProps, ScDocument* pScDoc = nullptr) throw ( css::lang::IllegalArgumentException);
+                 const css::uno::Reference< css::beans::XPropertySet >& xProps, ScDocument* pScDoc = nullptr);
 
-    virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL getColor() override ;
+    virtual void SAL_CALL setColor( const css::uno::Any& _color ) override ;
 
-    virtual css::uno::Any SAL_CALL getColorIndex() throw ( css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getPattern() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPatternColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getColorIndex() override;
+    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override;
+    virtual css::uno::Any SAL_CALL getPattern() override;
+    virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) override;
+    virtual css::uno::Any SAL_CALL getPatternColor() override;
+    virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) override;
+    virtual css::uno::Any SAL_CALL getPatternColorIndex() override;
+    virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) override;
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx
index f0088b8af289..0e023ac17e0a 100644
--- a/sc/source/ui/vba/vbamenu.cxx
+++ b/sc/source/ui/vba/vbamenu.cxx
@@ -13,30 +13,30 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) throw( uno::RuntimeException ) : Menu_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl )
+ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) : Menu_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl )
 {
 }
 
 OUString SAL_CALL
-ScVbaMenu::getCaption() throw ( uno::RuntimeException, std::exception )
+ScVbaMenu::getCaption()
 {
     return m_xCommandBarControl->getCaption();
 }
 
 void SAL_CALL
-ScVbaMenu::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception)
+ScVbaMenu::setCaption( const OUString& _caption )
 {
     m_xCommandBarControl->setCaption( _caption );
 }
 
 void SAL_CALL
-ScVbaMenu::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaMenu::Delete( )
 {
     m_xCommandBarControl->Delete();
 }
 
 uno::Any SAL_CALL
-ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaMenu::MenuItems( const uno::Any& aIndex )
 {
     uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBarControl->Controls( uno::Any() ), uno::UNO_QUERY_THROW );
     uno::Reference< excel::XMenuItems > xMenuItems( new ScVbaMenuItems( this, mxContext, xCommandBarControls ) );
diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx
index 7cc42f0336b2..a6e0e23979db 100644
--- a/sc/source/ui/vba/vbamenu.hxx
+++ b/sc/source/ui/vba/vbamenu.hxx
@@ -22,13 +22,13 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaMenu( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ) throw( css::uno::RuntimeException );
+    ScVbaMenu( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl );
 
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
 
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx
index e400ab3a31e9..2c7c04b1597a 100644
--- a/sc/source/ui/vba/vbamenubar.cxx
+++ b/sc/source/ui/vba/vbamenubar.cxx
@@ -13,12 +13,12 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-ScVbaMenuBar::ScVbaMenuBar( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBar >& rCommandBar ) throw( uno::RuntimeException ) : MenuBar_BASE(rParent, rContext), m_xCommandBar(rCommandBar)
+ScVbaMenuBar::ScVbaMenuBar( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBar >& rCommandBar ) : MenuBar_BASE(rParent, rContext), m_xCommandBar(rCommandBar)
 {
 }
 
 uno::Any SAL_CALL
-ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaMenuBar::Menus( const uno::Any& aIndex )
 {
     uno::Reference< XCommandBarControls > xCommandBarControls( m_xCommandBar->Controls( uno::Any() ), uno::UNO_QUERY_THROW );
     uno::Reference< excel::XMenus > xMenus( new ScVbaMenus( this, mxContext, xCommandBarControls ) );
diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx
index 03ebf37b212b..5a07657f3a9a 100644
--- a/sc/source/ui/vba/vbamenubar.hxx
+++ b/sc/source/ui/vba/vbamenubar.hxx
@@ -22,9 +22,9 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaMenuBar( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBar >& rCommandBar ) throw( css::uno::RuntimeException );
+    ScVbaMenuBar( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBar >& rCommandBar );
 
-    virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx
index 93a63ec6350c..1c2759990c66 100644
--- a/sc/source/ui/vba/vbamenubars.cxx
+++ b/sc/source/ui/vba/vbamenubars.cxx
@@ -21,14 +21,14 @@ class MenuBarEnumeration : public ::cppu::WeakImplHelper< container::XEnumeratio
     uno::Reference< container::XEnumeration > m_xEnumeration;
 public:
     /// @throws uno::RuntimeException
-    MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
+    MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
     {
     }
-    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasMoreElements() override
     {
         return m_xEnumeration->hasMoreElements();
     }
-    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL nextElement() override
     {
         // FIXME: should be add menubar
         if( hasMoreElements() )
@@ -42,7 +42,7 @@ public:
     }
 };
 
-ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) throw ( uno::RuntimeException ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars )
+ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars )
 {
 }
 
@@ -52,13 +52,13 @@ ScVbaMenuBars::~ScVbaMenuBars()
 
 // XEnumerationAccess
 uno::Type SAL_CALL
-ScVbaMenuBars::getElementType() throw ( uno::RuntimeException )
+ScVbaMenuBars::getElementType()
 {
     return cppu::UnoType<excel::XMenuBar>::get();
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaMenuBars::createEnumeration() throw ( uno::RuntimeException )
+ScVbaMenuBars::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBars, uno::UNO_QUERY_THROW );
     return uno::Reference< container::XEnumeration >( new MenuBarEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
@@ -72,14 +72,14 @@ ScVbaMenuBars::createCollectionObject( const uno::Any& aSource )
 }
 
 sal_Int32 SAL_CALL
-ScVbaMenuBars::getCount() throw(css::uno::RuntimeException)
+ScVbaMenuBars::getCount()
 {
     return m_xCommandBars->getCount();
 }
 
 // ScVbaCollectionBaseImpl
 uno::Any SAL_CALL
-ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
+ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ )
 {
     sal_Int16 nIndex = 0;
     aIndex >>= nIndex;
diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx
index 17ac680815a5..da2017c40baf 100644
--- a/sc/source/ui/vba/vbamenubars.hxx
+++ b/sc/source/ui/vba/vbamenubars.hxx
@@ -25,16 +25,16 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaMenuBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBars >& xCommandBars ) throw (css::uno::RuntimeException);
+    ScVbaMenuBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBars >& xCommandBars );
     virtual ~ScVbaMenuBars() override;
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx
index 48321652ca3f..1ef5836cfe91 100644
--- a/sc/source/ui/vba/vbamenuitem.cxx
+++ b/sc/source/ui/vba/vbamenuitem.cxx
@@ -11,36 +11,36 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) throw( uno::RuntimeException ) : MenuItem_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl )
+ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< XCommandBarControl >& rCommandBarControl ) : MenuItem_BASE( rParent, rContext ), m_xCommandBarControl( rCommandBarControl )
 {
 }
 
 OUString SAL_CALL
-ScVbaMenuItem::getCaption() throw ( uno::RuntimeException, std::exception )
+ScVbaMenuItem::getCaption()
 {
     return m_xCommandBarControl->getCaption();
 }
 
 void SAL_CALL
-ScVbaMenuItem::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception)
+ScVbaMenuItem::setCaption( const OUString& _caption )
 {
     m_xCommandBarControl->setCaption( _caption );
 }
 
 OUString SAL_CALL
-ScVbaMenuItem::getOnAction() throw ( uno::RuntimeException, std::exception )
+ScVbaMenuItem::getOnAction()
 {
     return m_xCommandBarControl->getOnAction();
 }
 
 void SAL_CALL
-ScVbaMenuItem::setOnAction( const OUString& _onaction ) throw (uno::RuntimeException, std::exception)
+ScVbaMenuItem::setOnAction( const OUString& _onaction )
 {
     m_xCommandBarControl->setOnAction( _onaction );
 }
 
 void SAL_CALL
-ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaMenuItem::Delete( )
 {
     m_xCommandBarControl->Delete();
 }
diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx
index 5fc1bbc38c78..86d22c34bde6 100644
--- a/sc/source/ui/vba/vbamenuitem.hxx
+++ b/sc/source/ui/vba/vbamenuitem.hxx
@@ -22,14 +22,14 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl ) throw( css::uno::RuntimeException );
+    ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< ov::XCommandBarControl >& rCommandBarControl );
 
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+    virtual OUString SAL_CALL getOnAction() override;
+    virtual void SAL_CALL setOnAction( const OUString& _onaction ) override;
 
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx
index d5fd6484ecf3..76fb396352c9 100644
--- a/sc/source/ui/vba/vbamenuitems.cxx
+++ b/sc/source/ui/vba/vbamenuitems.cxx
@@ -24,14 +24,14 @@ class MenuEnumeration : public MenuEnumeration_BASE
     uno::Reference< container::XEnumeration > m_xEnumeration;
 public:
     /// @throws uno::RuntimeException
-    MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
+    MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
     {
     }
-    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasMoreElements() override
     {
         return m_xEnumeration->hasMoreElements();
     }
-    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL nextElement() override
     {
         // FIXME: should be add menu
         if( hasMoreElements() )
@@ -55,19 +55,19 @@ public:
     }
 };
 
-ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
+ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
 {
 }
 
 // XEnumerationAccess
 uno::Type SAL_CALL
-ScVbaMenuItems::getElementType() throw ( uno::RuntimeException )
+ScVbaMenuItems::getElementType()
 {
     return cppu::UnoType<excel::XMenuItem>::get();
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaMenuItems::createEnumeration() throw ( uno::RuntimeException )
+ScVbaMenuItems::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW );
     return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
@@ -81,7 +81,7 @@ ScVbaMenuItems::createCollectionObject( const uno::Any& aSource )
 }
 
 sal_Int32 SAL_CALL
-ScVbaMenuItems::getCount() throw(css::uno::RuntimeException)
+ScVbaMenuItems::getCount()
 {
     // FIXME: should check if it is a popup menu
     return m_xCommandBarControls->getCount();
@@ -89,7 +89,7 @@ ScVbaMenuItems::getCount() throw(css::uno::RuntimeException)
 
 // ScVbaCollectionBaseImpl
 uno::Any SAL_CALL
-ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
+ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ )
 {
     uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
     if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup )
@@ -99,7 +99,7 @@ ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) thro
     throw uno::RuntimeException();
 }
 
-uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ )
 {
     sal_Int32 nType = office::MsoControlType::msoControlButton;
     uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore );
diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx
index 21a19cc98ddf..506e3a9b2b3e 100644
--- a/sc/source/ui/vba/vbamenuitems.hxx
+++ b/sc/source/ui/vba/vbamenuitems.hxx
@@ -24,17 +24,17 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaMenuItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException );
+    ScVbaMenuItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
     // Methods
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) override;
+    virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx
index 8247faf5898d..be32c02008d0 100644
--- a/sc/source/ui/vba/vbamenus.cxx
+++ b/sc/source/ui/vba/vbamenus.cxx
@@ -23,14 +23,14 @@ class MenuEnumeration : public MenuEnumeration_BASE
     uno::Reference< container::XEnumeration > m_xEnumeration;
 public:
     /// @throws uno::RuntimeException
-    MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
+    MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration )
     {
     }
-    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasMoreElements() override
     {
         return m_xEnumeration->hasMoreElements();
     }
-    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL nextElement() override
     {
         // FIXME: should be add menu
         if( hasMoreElements() )
@@ -49,19 +49,19 @@ public:
     }
 };
 
-ScVbaMenus::ScVbaMenus( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : Menus_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
+ScVbaMenus::ScVbaMenus( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) : Menus_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
 {
 }
 
 // XEnumerationAccess
 uno::Type SAL_CALL
-ScVbaMenus::getElementType() throw ( uno::RuntimeException )
+ScVbaMenus::getElementType()
 {
     return cppu::UnoType<excel::XMenu>::get();
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaMenus::createEnumeration() throw ( uno::RuntimeException )
+ScVbaMenus::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW );
     return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
@@ -75,7 +75,7 @@ ScVbaMenus::createCollectionObject( const uno::Any& aSource )
 }
 
 sal_Int32 SAL_CALL
-ScVbaMenus::getCount() throw(css::uno::RuntimeException)
+ScVbaMenus::getCount()
 {
     // FIXME: should check if it is a popup menu
     return m_xCommandBarControls->getCount();
@@ -83,7 +83,7 @@ ScVbaMenus::getCount() throw(css::uno::RuntimeException)
 
 // ScVbaCollectionBaseImpl
 uno::Any SAL_CALL
-ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
+ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ )
 {
     uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
     if( xCommandBarControl->getType() != office::MsoControlType::msoControlPopup )
@@ -91,7 +91,7 @@ ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( u
     return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) );
 }
 
-uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore )
 {
     sal_Int32 nType = office::MsoControlType::msoControlPopup;
     uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore );
diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx
index dff934db42d2..3727d7500564 100644
--- a/sc/source/ui/vba/vbamenus.hxx
+++ b/sc/source/ui/vba/vbamenus.hxx
@@ -24,17 +24,17 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaMenus( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException );
+    ScVbaMenus( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
     // Methods
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) override;
+    virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 7fe9a92a5f72..6e6e86e9ac4b 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -56,37 +56,37 @@ ScVbaName::~ScVbaName()
 }
 
 OUString
-ScVbaName::getName() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::getName()
 {
     return mxNamedRange->getName();
 }
 
 void
-ScVbaName::setName( const OUString & rName ) throw (css::uno::RuntimeException, std::exception)
+ScVbaName::setName( const OUString & rName )
 {
     mxNamedRange->setName( rName );
 }
 
 OUString
-ScVbaName::getNameLocal() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::getNameLocal()
 {
     return getName();
 }
 
 void
-ScVbaName::setNameLocal( const OUString & rName ) throw (css::uno::RuntimeException, std::exception)
+ScVbaName::setNameLocal( const OUString & rName )
 {
     setName( rName );
 }
 
 sal_Bool
-ScVbaName::getVisible() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::getVisible()
 {
     return true;
 }
 
 void
-ScVbaName::setVisible( sal_Bool /*bVisible*/ ) throw (css::uno::RuntimeException, std::exception)
+ScVbaName::setVisible( sal_Bool /*bVisible*/ )
 {
 }
 
@@ -131,7 +131,7 @@ void  ScVbaName::setContent( const OUString& rContent, const formula::FormulaGra
 }
 
 OUString
-ScVbaName::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::getValue()
 {
     rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
 
@@ -139,62 +139,62 @@ ScVbaName::getValue() throw (css::uno::RuntimeException, std::exception)
 }
 
 void
-ScVbaName::setValue( const OUString & rValue ) throw (css::uno::RuntimeException, std::exception)
+ScVbaName::setValue( const OUString & rValue )
 {
     setContent( rValue, formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
 }
 
 OUString
-ScVbaName::getRefersTo() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::getRefersTo()
 {
     return getValue();
 }
 
 void
-ScVbaName::setRefersTo( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception)
+ScVbaName::setRefersTo( const OUString & rRefersTo )
 {
     setValue( rRefersTo );
 }
 
 OUString
-ScVbaName::getRefersToLocal() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::getRefersToLocal()
 {
     return getRefersTo();
 }
 
 void
-ScVbaName::setRefersToLocal( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception)
+ScVbaName::setRefersToLocal( const OUString & rRefersTo )
 {
     setRefersTo( rRefersTo );
 }
 
 OUString
-ScVbaName::getRefersToR1C1() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::getRefersToR1C1()
 {
     rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
     return  sResult;
 }
 
 void
-ScVbaName::setRefersToR1C1( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception)
+ScVbaName::setRefersToR1C1( const OUString & rRefersTo )
 {
     setContent( rRefersTo, formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
 }
 
 OUString
-ScVbaName::getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::getRefersToR1C1Local()
 {
     return getRefersToR1C1();
 }
 
 void
-ScVbaName::setRefersToR1C1Local( const OUString & rRefersTo ) throw (css::uno::RuntimeException, std::exception)
+ScVbaName::setRefersToR1C1Local( const OUString & rRefersTo )
 {
     setRefersTo( rRefersTo );
 }
 
 css::uno::Reference< ov::excel::XRange >
-ScVbaName::getRefersToRange() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::getRefersToRange()
 {
     uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName(
         mxContext, mxNamedRange->getName(), excel::getDocShell( mxModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
@@ -202,7 +202,7 @@ ScVbaName::getRefersToRange() throw (css::uno::RuntimeException, std::exception)
 }
 
 void
-ScVbaName::Delete() throw (css::uno::RuntimeException, std::exception)
+ScVbaName::Delete()
 {
     mxNames->removeByName( mxNamedRange->getName() );
 }
diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx
index c2b049948e8b..300b836612b6 100644
--- a/sc/source/ui/vba/vbaname.hxx
+++ b/sc/source/ui/vba/vbaname.hxx
@@ -41,26 +41,26 @@ public:
     virtual ~ScVbaName() override;
 
     // Attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNameLocal( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const OUString &rValue ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString &rName ) override;
+    virtual OUString SAL_CALL getNameLocal() override;
+    virtual void SAL_CALL setNameLocal( const OUString &rName ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) override;
+    virtual OUString SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const OUString &rValue ) override;
+    virtual OUString SAL_CALL getRefersTo() override;
+    virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) override;
+    virtual OUString SAL_CALL getRefersToLocal() override;
+    virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) override;
+    virtual OUString SAL_CALL getRefersToR1C1() override;
+    virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) override;
+    virtual OUString SAL_CALL getRefersToR1C1Local() override;
+    virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() override;
 
     // Methods
-    virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete() override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index 7042651bbb88..f9f1e32b0472 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -44,9 +44,9 @@ class NamesEnumeration : public EnumerationHelperImpl
     uno::Reference< sheet::XNamedRanges > m_xNames;
 public:
     /// @throws uno::RuntimeException
-    NamesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel , const uno::Reference< sheet::XNamedRanges >& xNames ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ), m_xNames( xNames ) {}
+    NamesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel , const uno::Reference< sheet::XNamedRanges >& xNames ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ), m_xNames( xNames ) {}
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         uno::Reference< sheet::XNamedRange > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
         return uno::makeAny( uno::Reference< excel::XName > ( new ScVbaName( m_xParent, m_xContext, xNamed ,m_xNames , m_xModel ) ) );
@@ -92,7 +92,6 @@ ScVbaNames::Add( const css::uno::Any& Name ,
                                         const css::uno::Any& /*CategoryLocal*/,
                                         const css::uno::Any& RefersToR1C1,
                                         const css::uno::Any& RefersToR1C1Local )
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString sName;
     uno::Reference< excel::XRange > xRange;
@@ -227,13 +226,13 @@ ScVbaNames::Add( const css::uno::Any& Name ,
 
 // XEnumerationAccess
 css::uno::Type
-ScVbaNames::getElementType() throw( css::uno::RuntimeException )
+ScVbaNames::getElementType()
 {
     return cppu::UnoType<ov::excel::XName>::get();
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaNames::createEnumeration() throw (uno::RuntimeException)
+ScVbaNames::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( mxNames, uno::UNO_QUERY_THROW );
     return new NamesEnumeration( getParent(), mxContext, xEnumAccess->createEnumeration(), mxModel , mxNames );
diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx
index 912171f9ee21..bf8be0ca29e5 100644
--- a/sc/source/ui/vba/vbanames.hxx
+++ b/sc/source/ui/vba/vbanames.hxx
@@ -46,8 +46,8 @@ public:
     virtual ~ScVbaNames() override;
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // Methods
     virtual css::uno::Any SAL_CALL Add( const css::uno::Any& aName ,
@@ -60,9 +60,7 @@ public:
                     const css::uno::Any& aRefersToLocal,
                     const css::uno::Any& aCategoryLocal,
                     const css::uno::Any& aRefersToR1C1,
-                    const css::uno::Any& aRefersToR1C1Local )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+                    const css::uno::Any& aRefersToR1C1Local ) override;
 
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx
index b47a127417e8..9030b8ad661b 100644
--- a/sc/source/ui/vba/vbaoleobject.cxx
+++ b/sc/source/ui/vba/vbaoleobject.cxx
@@ -48,90 +48,90 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen
 }
 
 uno::Reference< uno::XInterface > SAL_CALL
-ScVbaOLEObject::getObject() throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::getObject()
 {
     return uno::Reference< uno::XInterface >( m_xControl, uno::UNO_QUERY_THROW );
 }
 
 sal_Bool SAL_CALL
-ScVbaOLEObject::getEnabled() throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::getEnabled()
 {
     return m_xControl->getEnabled();
 }
 
 void SAL_CALL
-ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::setEnabled( sal_Bool _enabled )
 {
     m_xControl->setEnabled( _enabled );
 }
 
 sal_Bool SAL_CALL
-ScVbaOLEObject::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::getVisible()
 {
     return m_xControl->getVisible();
 }
 
 void SAL_CALL
-ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::setVisible( sal_Bool _visible )
 {
     m_xControl->setVisible( _visible );
 }
 
 double SAL_CALL
-ScVbaOLEObject::getLeft() throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::getLeft()
 {
     return m_xControl->getLeft();
 }
 
 void SAL_CALL
-ScVbaOLEObject::setLeft( double _left ) throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::setLeft( double _left )
 {
     m_xControl->setLeft( _left );
 
 }
 
 double SAL_CALL
-ScVbaOLEObject::getTop() throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::getTop()
 {
     return m_xControl->getTop();
 }
 
 void SAL_CALL
-ScVbaOLEObject::setTop( double _top ) throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::setTop( double _top )
 {
     m_xControl->setTop( _top );
 }
 
 double SAL_CALL
-ScVbaOLEObject::getHeight() throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::getHeight()
 {
     return m_xControl->getHeight();
 }
 
 void SAL_CALL
-ScVbaOLEObject::setHeight( double _height ) throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::setHeight( double _height )
 {
     m_xControl->setHeight( _height );
 }
 
 double SAL_CALL
-ScVbaOLEObject::getWidth() throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::getWidth()
 {
     return m_xControl->getWidth();
 }
 
 void SAL_CALL
-ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException, std::exception)
+ScVbaOLEObject::setWidth( double _width )
 {
     m_xControl->setWidth( _width );
 }
 
-OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaOLEObject::getLinkedCell()
 {
     return m_xControl->getControlSource();
 }
 
-void SAL_CALL ScVbaOLEObject::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaOLEObject::setLinkedCell( const OUString& _linkedcell )
 {
     m_xControl->setControlSource( _linkedcell );
 }
diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx
index e9285496035e..f3dc86c8f1c8 100644
--- a/sc/source/ui/vba/vbaoleobject.hxx
+++ b/sc/source/ui/vba/vbaoleobject.hxx
@@ -38,22 +38,22 @@ public:
             css::uno::Reference< css::drawing::XControlShape > const & xControlShape );
 
     // XOLEObject Attributes
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() override;
+    virtual sal_Bool SAL_CALL getEnabled() override;
+    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
 
-    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getLeft() override;
+    virtual void SAL_CALL setLeft( double _left ) override;
+    virtual double SAL_CALL getTop() override;
+    virtual void SAL_CALL setTop( double _top ) override;
+    virtual double SAL_CALL getHeight() override;
+    virtual void SAL_CALL setHeight( double _height ) override;
+    virtual double SAL_CALL getWidth() override;
+    virtual void SAL_CALL setWidth( double _width ) override;
+    virtual OUString SAL_CALL getLinkedCell() override;
+    virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) override;
 };
 #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECT_HXX
 
diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx
index 5ea0dfe40443..6b700cc33f6f 100644
--- a/sc/source/ui/vba/vbaoleobjects.cxx
+++ b/sc/source/ui/vba/vbaoleobjects.cxx
@@ -49,12 +49,12 @@ public:
         }
     }
 
-    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount() override
     {
         return vObjects.size();
     }
 
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw lang::IndexOutOfBoundsException();
@@ -62,12 +62,12 @@ public:
     }
 
         // Methods XElementAccess
-        virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
+        virtual uno::Type SAL_CALL getElementType() override
         {
             return cppu::UnoType<drawing::XControlShape>::get();
         }
 
-        virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasElements() override
         {
             return ( getCount() > 0 );
         }
@@ -84,12 +84,12 @@ class EnumWrapper : public EnumerationHelper_BASE
 public:
         EnumWrapper(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< container::XIndexAccess >& xIndexAccess ) :  m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
 
-        virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasMoreElements(  ) override
         {
                 return ( nIndex < m_xIndexAccess->getCount() );
         }
 
-        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual uno::Any SAL_CALL nextElement(  ) override
         {
                 if ( nIndex < m_xIndexAccess->getCount() )
         {
@@ -113,7 +113,7 @@ ScVbaOLEObjects::ScVbaOLEObjects( const uno::Reference< XHelperInterface >& xPar
 {
 }
 uno::Reference< container::XEnumeration >
-ScVbaOLEObjects::createEnumeration() throw (uno::RuntimeException)
+ScVbaOLEObjects::createEnumeration()
 {
     return new EnumWrapper( getParent(), mxContext, m_xIndexAccess );
 }
@@ -131,7 +131,7 @@ ScVbaOLEObjects::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Any
-ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::RuntimeException)
+ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex )
 {
     try
     {
@@ -158,7 +158,7 @@ ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::Runt
 }
 
 uno::Type
-ScVbaOLEObjects::getElementType() throw (uno::RuntimeException)
+ScVbaOLEObjects::getElementType()
 {
     return cppu::UnoType<ooo::vba::excel::XOLEObject>::get();
 }
diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx
index ef992d2c5857..3ffc0a31621b 100644
--- a/sc/source/ui/vba/vbaoleobjects.hxx
+++ b/sc/source/ui/vba/vbaoleobjects.hxx
@@ -29,7 +29,7 @@ typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE;
 class ScVbaOLEObjects : public OLEObjectsImpl_BASE
 {
 protected:
-    virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) override;
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 public:
@@ -37,8 +37,8 @@ public:
                     const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx
index 23553b25f054..67c521e9be73 100644
--- a/sc/source/ui/vba/vbaoutline.cxx
+++ b/sc/source/ui/vba/vbaoutline.cxx
@@ -21,7 +21,7 @@ using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
 void
-ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels ) throw (uno::RuntimeException, std::exception)
+ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels )
 {
     if (mxOutline.is())
     {
diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx
index ae1991e60007..fa38211daaa2 100644
--- a/sc/source/ui/vba/vbaoutline.hxx
+++ b/sc/source/ui/vba/vbaoutline.hxx
@@ -34,7 +34,7 @@ public:
          css::uno::Reference<css::sheet::XSheetOutline> const & outline): ScVbaOutline_BASE( xParent, xContext) , mxOutline(outline)
     {}
 
-    virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException, std::exception) override ;
+    virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) override ;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx
index 2f29060bb1a2..53a63c01e29a 100644
--- a/sc/source/ui/vba/vbapagebreak.cxx
+++ b/sc/source/ui/vba/vbapagebreak.cxx
@@ -27,7 +27,7 @@ template< typename... Ifc >
 ScVbaPageBreak< Ifc... >::ScVbaPageBreak( const uno::Reference< XHelperInterface >& xParent,
                     const uno::Reference< uno::XComponentContext >& xContext,
                     uno::Reference< beans::XPropertySet >& xProps,
-                    sheet::TablePageBreakData aTablePageBreakData) throw (uno::RuntimeException):
+                    sheet::TablePageBreakData aTablePageBreakData):
             ScVbaPageBreak_BASE( xParent, xContext ),
             mxRowColPropertySet( xProps ),
             maTablePageBreakData( aTablePageBreakData )
@@ -35,7 +35,7 @@ ScVbaPageBreak< Ifc... >::ScVbaPageBreak( const uno::Reference< XHelperInterface
 }
 
 template< typename... Ifc >
-sal_Int32 ScVbaPageBreak< Ifc... >::getType() throw (uno::RuntimeException)
+sal_Int32 ScVbaPageBreak< Ifc... >::getType()
 {
     uno::Any aValue = mxRowColPropertySet->getPropertyValue("IsStartOfNewPage");
     bool hasPageBreak = false;
@@ -51,7 +51,7 @@ sal_Int32 ScVbaPageBreak< Ifc... >::getType() throw (uno::RuntimeException)
 }
 
 template< typename... Ifc >
-void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) throw (uno::RuntimeException)
+void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type)
 {
     if( (type != excel::XlPageBreak::xlPageBreakNone) &&
         (type != excel::XlPageBreak::xlPageBreakManual) &&
@@ -74,13 +74,13 @@ void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) throw (uno::RuntimeExcept
 }
 
 template< typename... Ifc >
-void ScVbaPageBreak< Ifc... >::Delete() throw ( script::BasicErrorException, uno::RuntimeException)
+void ScVbaPageBreak< Ifc... >::Delete()
 {
     mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(false));
 }
 
 template< typename... Ifc >
-uno::Reference< excel::XRange> ScVbaPageBreak< Ifc... >::Location() throw ( script::BasicErrorException, uno::RuntimeException)
+uno::Reference< excel::XRange> ScVbaPageBreak< Ifc... >::Location()
 {
     uno::Reference< table::XCellRange > xRange( mxRowColPropertySet, uno::UNO_QUERY_THROW );
     return new ScVbaRange( ScVbaPageBreak_BASE::getParent(), ScVbaPageBreak_BASE::mxContext, xRange);
@@ -113,7 +113,7 @@ template class ScVbaPageBreak< excel::XVPageBreak >;
 ScVbaVPageBreak::ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
                                   const css::uno::Reference< css::uno::XComponentContext >& xContext,
                                   css::uno::Reference< css::beans::XPropertySet >& xProps,
-                                  css::sheet::TablePageBreakData aTablePageBreakData ) throw ( css::uno::RuntimeException )
+                                  css::sheet::TablePageBreakData aTablePageBreakData )
 :   ScVbaVPageBreak_BASE( xParent, xContext, xProps, aTablePageBreakData )
 {
 }
diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx
index 9b26b34e7da5..e86c799b050d 100644
--- a/sc/source/ui/vba/vbapagebreak.hxx
+++ b/sc/source/ui/vba/vbapagebreak.hxx
@@ -41,13 +41,13 @@ public:
     ScVbaPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
                     const css::uno::Reference< css::uno::XComponentContext >& xContext,
                     css::uno::Reference< css::beans::XPropertySet >& xProps,
-                    css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException);
+                    css::sheet::TablePageBreakData aTablePageBreakData);
 
-    virtual sal_Int32 SAL_CALL getType( ) throw (css::uno::RuntimeException) SAL_OVERRIDE;
-    virtual void SAL_CALL setType(sal_Int32 type) throw (css::uno::RuntimeException) SAL_OVERRIDE;
+    virtual sal_Int32 SAL_CALL getType( ) SAL_OVERRIDE;
+    virtual void SAL_CALL setType(sal_Int32 type) SAL_OVERRIDE;
 
-    virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE;
-    virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE;
+    virtual void SAL_CALL Delete() SAL_OVERRIDE;
+    virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() SAL_OVERRIDE;
 };
 
 typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE;
@@ -59,7 +59,7 @@ public:
     ScVbaHPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
                     const css::uno::Reference< css::uno::XComponentContext >& xContext,
                     css::uno::Reference< css::beans::XPropertySet >& xProps,
-                    css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException):
+                    css::sheet::TablePageBreakData aTablePageBreakData):
               ScVbaHPageBreak_BASE( xParent,xContext,xProps,aTablePageBreakData ){}
 
     // XHelperInterface
@@ -77,7 +77,7 @@ public:
     ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
                      const css::uno::Reference< css::uno::XComponentContext >& xContext,
                      css::uno::Reference< css::beans::XPropertySet >& xProps,
-                     css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException);
+                     css::sheet::TablePageBreakData aTablePageBreakData);
 
     virtual ~ScVbaVPageBreak() override;
 
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index eccd1809c911..b5d964a7a206 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -41,7 +41,7 @@ public:
     }
 
     /// @throws css::uno::RuntimeException
-    sal_Int32 getAPIStartofRange( const uno::Reference< excel::XRange >& xRange ) throw (css::uno::RuntimeException)
+    sal_Int32 getAPIStartofRange( const uno::Reference< excel::XRange >& xRange )
     {
         if( m_bColumn )
             return xRange->getColumn() - 1;
@@ -49,7 +49,7 @@ public:
     }
 
     /// @throws uno::RuntimeException
-    sal_Int32 getAPIEndIndexofRange( const uno::Reference< excel::XRange >& xRange, sal_Int32 nUsedStart ) throw (uno::RuntimeException)
+    sal_Int32 getAPIEndIndexofRange( const uno::Reference< excel::XRange >& xRange, sal_Int32 nUsedStart )
     {
         if( m_bColumn )
             return nUsedStart + xRange->Columns( uno::Any() )->getCount() - 1;
@@ -57,7 +57,7 @@ public:
     }
 
     /// @throws uno::RuntimeException
-    uno::Sequence<sheet::TablePageBreakData> getAllPageBreaks() throw (uno::RuntimeException)
+    uno::Sequence<sheet::TablePageBreakData> getAllPageBreaks()
     {
         if( m_bColumn )
             return mxSheetPageBreak->getColumnPageBreaks();
@@ -65,7 +65,7 @@ public:
     }
 
     /// @throws uno::RuntimeException
-    uno::Reference<container::XIndexAccess> getRowColContainer() throw (uno::RuntimeException)
+    uno::Reference<container::XIndexAccess> getRowColContainer()
     {
         uno::Reference< table::XColumnRowRange > xColumnRowRange( mxSheetPageBreak, uno::UNO_QUERY_THROW );
         uno::Reference<container::XIndexAccess> xIndexAccess;
@@ -77,21 +77,21 @@ public:
     }
 
     /// @throws uno::RuntimeException
-    sheet::TablePageBreakData getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw (uno::RuntimeException);
+    sheet::TablePageBreakData getTablePageBreakData( sal_Int32 nAPIItemIndex );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    uno::Any Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException);
+    uno::Any Add( const css::uno::Any& Before );
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         if( m_bColumn )
              return cppu::UnoType<excel::XVPageBreak>::get();
         return  cppu::UnoType<excel::XHPageBreak>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return true;
     }
@@ -102,7 +102,7 @@ public:
 *  also considers the position and sizes of shapes and manually inserted page breaks
 *  Note: In MS  there is a limit of 1026 horizontal page breaks per sheet.
 */
-sal_Int32 SAL_CALL RangePageBreaks::getCount(  ) throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL RangePageBreaks::getCount(  )
 {
     sal_Int32 nCount = 0;
     uno::Reference< excel::XWorksheet > xWorksheet( mxParent, uno::UNO_QUERY_THROW );
@@ -123,7 +123,7 @@ sal_Int32 SAL_CALL RangePageBreaks::getCount(  ) throw (uno::RuntimeException, s
     return nCount;
 }
 
-uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index )
 {
     if( (Index < getCount()) && ( Index >= 0 ))
     {
@@ -141,7 +141,7 @@ uno::Any SAL_CALL RangePageBreaks::getByIndex( sal_Int32 Index ) throw (lang::In
     throw lang::IndexOutOfBoundsException();
 }
 
-sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPIItemIndex ) throw (uno::RuntimeException)
+sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPIItemIndex )
 {
     sal_Int32 index = -1;
     sheet::TablePageBreakData aTablePageBreakData;
@@ -166,7 +166,7 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI
     return aTablePageBreakData;
 }
 
-uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException)
+uno::Any RangePageBreaks::Add( const css::uno::Any& Before )
 {
     uno::Reference< excel::XRange > xRange;
     Before >>= xRange;
@@ -193,12 +193,12 @@ class RangePageBreaksEnumWrapper : public EnumerationHelper_BASE
     sal_Int32 nIndex;
 public:
     explicit RangePageBreaksEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < m_xIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex < m_xIndexAccess->getCount() )
             return m_xIndexAccess->getByIndex( nIndex++ );
@@ -208,12 +208,12 @@ public:
 
 ScVbaHPageBreaks::ScVbaHPageBreaks( const uno::Reference< XHelperInterface >& xParent,
                                     const uno::Reference< uno::XComponentContext >& xContext,
-                                    uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak) throw (uno::RuntimeException):
+                                    uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak):
                           ScVbaHPageBreaks_BASE( xParent,xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, false ))
 {
 }
 
-uno::Any SAL_CALL ScVbaHPageBreaks::Add( const uno::Any& Before) throw ( script::BasicErrorException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaHPageBreaks::Add( const uno::Any& Before)
 {
     RangePageBreaks* pPageBreaks = dynamic_cast< RangePageBreaks* >( m_xIndexAccess.get() );
     if( pPageBreaks )
@@ -224,7 +224,7 @@ uno::Any SAL_CALL ScVbaHPageBreaks::Add( const uno::Any& Before) throw ( script:
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaHPageBreaks::createEnumeration() throw (uno::RuntimeException)
+ScVbaHPageBreaks::createEnumeration()
 {
     return new RangePageBreaksEnumWrapper( m_xIndexAccess );
 }
@@ -236,7 +236,7 @@ ScVbaHPageBreaks::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Type
-ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException)
+ScVbaHPageBreaks::getElementType()
 {
     return cppu::UnoType<excel::XHPageBreak>::get();
 }
@@ -262,7 +262,7 @@ ScVbaHPageBreaks::getServiceNames()
 //VPageBreak
 ScVbaVPageBreaks::ScVbaVPageBreaks( const uno::Reference< XHelperInterface >& xParent,
                                     const uno::Reference< uno::XComponentContext >& xContext,
-                                    uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( uno::RuntimeException )
+                                    uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak )
 :   ScVbaVPageBreaks_BASE( xParent, xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, true ) )
 {
 }
@@ -272,7 +272,7 @@ ScVbaVPageBreaks::~ScVbaVPageBreaks()
 }
 
 uno::Any SAL_CALL
-ScVbaVPageBreaks::Add( const uno::Any& Before ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception )
+ScVbaVPageBreaks::Add( const uno::Any& Before )
 {
     RangePageBreaks* pPageBreaks = dynamic_cast< RangePageBreaks* >( m_xIndexAccess.get() );
     if( pPageBreaks )
@@ -283,7 +283,7 @@ ScVbaVPageBreaks::Add( const uno::Any& Before ) throw ( script::BasicErrorExcept
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaVPageBreaks::createEnumeration() throw ( uno::RuntimeException )
+ScVbaVPageBreaks::createEnumeration()
 {
     return new RangePageBreaksEnumWrapper( m_xIndexAccess );
 }
@@ -295,7 +295,7 @@ ScVbaVPageBreaks::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Type
-ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException )
+ScVbaVPageBreaks::getElementType()
 {
     return cppu::UnoType<excel::XVPageBreak>::get();
 }
diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx
index 762e6e7c8af9..cf656d074128 100644
--- a/sc/source/ui/vba/vbapagebreaks.hxx
+++ b/sc/source/ui/vba/vbapagebreaks.hxx
@@ -42,14 +42,14 @@ public:
     /// @throws css::uno::RuntimeException
     ScVbaHPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent,
                     const css::uno::Reference< css::uno::XComponentContext >& xContext,
-                    css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak) throw (css::uno::RuntimeException);
+                    css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak);
 
     // XHPageBreaks
-    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) override;
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject(const css::uno::Any&) override;
 
     // XHelperInterface
@@ -66,16 +66,16 @@ public:
     /// @throws css::uno::RuntimeException
     ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent,
                       const css::uno::Reference< css::uno::XComponentContext >& xContext,
-                      css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( css::uno::RuntimeException );
+                      css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak );
 
     virtual ~ScVbaVPageBreaks() override;
 
     // XVPageBreaks
-    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) override;
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException ) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException ) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject( const css::uno::Any& ) override;
 
     // XHelperInterface
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index d39af7984864..64179f85f658 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -45,7 +45,7 @@ using namespace ::ooo::vba;
 ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent,
                 const uno::Reference< uno::XComponentContext >& xContext,
                 const uno::Reference< sheet::XSpreadsheet >& xSheet,
-                const uno::Reference< frame::XModel >& xModel) throw (uno::RuntimeException):
+                const uno::Reference< frame::XModel >& xModel):
            ScVbaPageSetup_BASE( xParent, xContext ), mxSheet( xSheet ), mbIsLandscape( false )
 {
     // query for current page style
@@ -64,7 +64,7 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent
     mxPageProps->getPropertyValue("IsLandscape") >>= mbIsLandscape;
 }
 
-OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaPageSetup::getPrintArea()
 {
     OUString aPrintArea;
     uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW );
@@ -87,7 +87,7 @@ OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeExcepti
     return aPrintArea;
 }
 
-void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas )
 {
     uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW );
     if( rAreas.isEmpty() ||
@@ -116,32 +116,32 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) throw (css:
     }
 }
 
-double SAL_CALL ScVbaPageSetup::getHeaderMargin() throw (css::uno::RuntimeException)
+double SAL_CALL ScVbaPageSetup::getHeaderMargin()
 {
     return VbaPageSetupBase::getHeaderMargin();
 }
 
-void SAL_CALL ScVbaPageSetup::setHeaderMargin( double margin ) throw (css::uno::RuntimeException)
+void SAL_CALL ScVbaPageSetup::setHeaderMargin( double margin )
 {
     VbaPageSetupBase::setHeaderMargin( margin );
 }
 
-double SAL_CALL ScVbaPageSetup::getFooterMargin() throw (css::uno::RuntimeException)
+double SAL_CALL ScVbaPageSetup::getFooterMargin()
 {
     return VbaPageSetupBase::getFooterMargin();
 }
 
-void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno::RuntimeException)
+void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin )
 {
     VbaPageSetupBase::setFooterMargin( margin );
 }
 
-uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall()
 {
     return mxPageProps->getPropertyValue("ScaleToPagesY");
 }
 
-void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall)
 {
     sal_uInt16 scaleToPageY = 0;
     try
@@ -159,12 +159,12 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall)
     }
 }
 
-uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() throw (css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide()
 {
     return mxPageProps->getPropertyValue("ScaleToPagesX");
 }
 
-void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide)
 {
     sal_uInt16 scaleToPageX = 0;
     try
@@ -182,12 +182,12 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide)
     }
 }
 
-uno::Any SAL_CALL ScVbaPageSetup::getZoom() throw (css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaPageSetup::getZoom()
 {
     return mxPageProps->getPropertyValue("PageScale");
 }
 
-void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom)
 {
     sal_uInt16 pageScale = 0;
     try
@@ -230,7 +230,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru
     mxPageProps->setPropertyValue("PageScale", uno::makeAny( pageScale ));
 }
 
-OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaPageSetup::getLeftHeader()
 {
     OUString leftHeader;
     try
@@ -249,7 +249,7 @@ OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeExcept
     return leftHeader;
 }
 
-void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader)
 {
     try
     {
@@ -266,7 +266,7 @@ void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw (
     }
 }
 
-OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaPageSetup::getCenterHeader()
 {
     OUString centerHeader;
     try
@@ -285,7 +285,7 @@ OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeExce
     return centerHeader;
 }
 
-void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader)
 {
     try
     {
@@ -302,7 +302,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) thr
     }
 }
 
-OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaPageSetup::getRightHeader()
 {
     OUString rightHeader;
     try
@@ -321,7 +321,7 @@ OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeExcep
     return rightHeader;
 }
 
-void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader)
 {
     try
     {
@@ -338,7 +338,7 @@ void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw
     }
 }
 
-OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaPageSetup::getLeftFooter()
 {
     OUString leftFooter;
     try
@@ -357,7 +357,7 @@ OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeExcept
     return leftFooter;
 }
 
-void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter)
 {
     try
     {
@@ -374,7 +374,7 @@ void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw (
     }
 }
 
-OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaPageSetup::getCenterFooter()
 {
     OUString centerFooter;
     try
@@ -393,7 +393,7 @@ OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeExce
     return centerFooter;
 }
 
-void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter)
 {
     try
     {
@@ -411,7 +411,7 @@ void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) thr
 
 }
 
-OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaPageSetup::getRightFooter()
 {
     OUString rightFooter;
     try
@@ -430,7 +430,7 @@ OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeExcep
     return rightFooter;
 }
 
-void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter)
 {
     try
     {
@@ -447,7 +447,7 @@ void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw
     }
 }
 
-sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaPageSetup::getOrder()
 {
     sal_Int32 order = excel::XlOrder::xlDownThenOver;
     try
@@ -465,7 +465,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException,
     return order;
 }
 
-void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order)
 {
     bool bOrder = true;
     switch( order )
@@ -488,7 +488,7 @@ void SAL_CALL ScVbaPageSetup::setOrder(sal_Int32 order) throw (css::uno::Runtime
     }
 }
 
-sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber()
 {
     sal_Int16 number = 0;
     try
@@ -508,7 +508,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime
     return number;
 }
 
-void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber)
 {
     if( firstPageNumber == excel::Constants::xlAutomatic )
         firstPageNumber = 0;
@@ -524,7 +524,7 @@ void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) thr
     }
 }
 
-sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically()
 {
     bool centerVertically = false;
     try
@@ -538,7 +538,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::Runtime
     return centerVertically;
 }
 
-void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically)
 {
     try
     {
@@ -549,7 +549,7 @@ void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) th
     }
 }
 
-sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally()
 {
     bool centerHorizontally = false;
     try
@@ -563,7 +563,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::Runti
     return centerHorizontally;
 }
 
-void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally)
 {
     try
     {
@@ -574,7 +574,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally
     }
 }
 
-sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings()
 {
     bool printHeadings = false;
     try
@@ -588,7 +588,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeExc
     return printHeadings;
 }
 
-void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings)
 {
     try
     {
@@ -599,32 +599,32 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c
     }
 }
 
-sal_Bool SAL_CALL ScVbaPageSetup::getPrintGridlines() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaPageSetup::getPrintGridlines()
 {
     return false;
 }
 
-void SAL_CALL ScVbaPageSetup::setPrintGridlines( sal_Bool /*_printgridlines*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setPrintGridlines( sal_Bool /*_printgridlines*/ )
 {
 }
 
-OUString SAL_CALL ScVbaPageSetup::getPrintTitleRows() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaPageSetup::getPrintTitleRows()
 {
     return OUString();
 }
-void SAL_CALL ScVbaPageSetup::setPrintTitleRows( const OUString& /*_printtitlerows*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setPrintTitleRows( const OUString& /*_printtitlerows*/ )
 {
 }
-OUString SAL_CALL ScVbaPageSetup::getPrintTitleColumns() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaPageSetup::getPrintTitleColumns()
 {
     return OUString();
 }
 
-void SAL_CALL ScVbaPageSetup::setPrintTitleColumns( const OUString& /*_printtitlecolumns*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setPrintTitleColumns( const OUString& /*_printtitlecolumns*/ )
 {
 }
 
-sal_Int32 SAL_CALL ScVbaPageSetup::getPaperSize() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaPageSetup::getPaperSize()
 {
     awt::Size aSize; // current papersize
     mxPageProps->getPropertyValue( "Size" ) >>= aSize;
@@ -637,7 +637,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getPaperSize() throw (uno::RuntimeException,
     return nPaperSizeIndex;
 }
 
-void SAL_CALL ScVbaPageSetup::setPaperSize( sal_Int32 papersize ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaPageSetup::setPaperSize( sal_Int32 papersize )
 {
     if ( papersize != excel::XlPaperSize::xlPaperUser )
     {
diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx
index f0b84bc3eabd..e1c6c4cfc50b 100644
--- a/sc/source/ui/vba/vbapagesetup.hxx
+++ b/sc/source/ui/vba/vbapagesetup.hxx
@@ -39,52 +39,52 @@ public:
     ScVbaPageSetup( const css::uno::Reference< ov::XHelperInterface >& xParent,
                     const css::uno::Reference< css::uno::XComponentContext >& xContext,
                     const css::uno::Reference< css::sheet::XSpreadsheet>& xSheet,
-                    const css::uno::Reference< css::frame::XModel >& xModel) throw (css::uno::RuntimeException);
+                    const css::uno::Reference< css::frame::XModel >& xModel);
 
     // Attribute
-    virtual OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException) override;
-    void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException) override;
-    double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException) override;
-    void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL getFitToPagesTall() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getFitToPagesWide() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getOrder() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOrder( sal_Int32 order ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getFirstPageNumber() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFirstPageNumber( sal_Int32 firstPageNumber ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getCenterVertically() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCenterVertically( sal_Bool centerVertically ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getCenterHorizontally() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getPrintHeadings() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getPrintArea() override;
+    virtual void SAL_CALL setPrintArea( const OUString& rAreas ) override;
+    virtual double SAL_CALL getHeaderMargin() override;
+    void SAL_CALL setHeaderMargin( double margin ) override;
+    double SAL_CALL getFooterMargin() override;
+    void SAL_CALL setFooterMargin( double margin ) override;
+    virtual css::uno::Any SAL_CALL getFitToPagesTall() override;
+    virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) override;
+    virtual css::uno::Any SAL_CALL getFitToPagesWide() override;
+    virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) override;
+    virtual css::uno::Any SAL_CALL getZoom() override;
+    virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) override;
+    virtual OUString SAL_CALL getLeftHeader() override;
+    virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) override;
+    virtual OUString SAL_CALL getCenterHeader() override;
+    virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) override;
+    virtual OUString SAL_CALL getRightHeader() override;
+    virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) override;
+    virtual OUString SAL_CALL getLeftFooter() override;
+    virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) override;
+    virtual OUString SAL_CALL getCenterFooter() override;
+    virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) override;
+    virtual OUString SAL_CALL getRightFooter() override;
+    virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) override;
+    virtual sal_Int32 SAL_CALL getOrder() override;
+    virtual void SAL_CALL setOrder( sal_Int32 order ) override;
+    virtual sal_Int32 SAL_CALL getFirstPageNumber() override;
+    virtual void SAL_CALL setFirstPageNumber( sal_Int32 firstPageNumber ) override;
+    virtual sal_Bool SAL_CALL getCenterVertically() override;
+    virtual void SAL_CALL setCenterVertically( sal_Bool centerVertically ) override;
+    virtual sal_Bool SAL_CALL getCenterHorizontally() override;
+    virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) override;
+    virtual sal_Bool SAL_CALL getPrintHeadings() override;
+    virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) override;
 
-    virtual sal_Bool SAL_CALL getPrintGridlines() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrintGridlines( sal_Bool _printgridlines ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::rtl::OUString SAL_CALL getPrintTitleRows() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getPaperSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getPrintGridlines() override;
+    virtual void SAL_CALL setPrintGridlines( sal_Bool _printgridlines ) override;
+    virtual ::rtl::OUString SAL_CALL getPrintTitleRows() override;
+    virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) override;
+    virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() override;
+    virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) override;
+    virtual sal_Int32 SAL_CALL getPaperSize() override;
+    virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx
index e6b577f2f3d5..7454b6f01792 100644
--- a/sc/source/ui/vba/vbapalette.cxx
+++ b/sc/source/ui/vba/vbapalette.cxx
@@ -54,12 +54,12 @@ public:
    DefaultPalette(){}
 
     // Methods XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount() override
     {
         return SAL_N_ELEMENTS(spnDefColorTable8);
     }
 
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw lang::IndexOutOfBoundsException();
@@ -67,11 +67,11 @@ public:
     }
 
     // Methods XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType() override
     {
         return ::cppu::UnoType<sal_Int32>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements() override
     {
         return true;
     }
diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx
index 1b8e905e489a..5abb35c853be 100644
--- a/sc/source/ui/vba/vbapane.cxx
+++ b/sc/source/ui/vba/vbapane.cxx
@@ -30,7 +30,7 @@ ScVbaPane::ScVbaPane(
         const css::uno::Reference< ov::XHelperInterface >& xParent,
         const uno::Reference< uno::XComponentContext >& xContext,
         const uno::Reference< frame::XModel >& rModel,
-        const uno::Reference< sheet::XViewPane >& rViewPane ) throw (uno::RuntimeException) :
+        const uno::Reference< sheet::XViewPane >& rViewPane ) :
     m_xModel(rModel, uno::UNO_SET_THROW),
     m_xViewPane(rViewPane, uno::UNO_SET_THROW),
     m_xParent(xParent),
@@ -39,13 +39,13 @@ ScVbaPane::ScVbaPane(
 }
 
 sal_Int32 SAL_CALL
-ScVbaPane::getScrollColumn() throw (uno::RuntimeException, std::exception)
+ScVbaPane::getScrollColumn()
 {
     return ( m_xViewPane->getFirstVisibleColumn() + 1 );
 }
 
 void SAL_CALL
-ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeException, std::exception)
+ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn )
 {
     if( _scrollcolumn < 1 )
     {
@@ -55,13 +55,13 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti
 }
 
 sal_Int32 SAL_CALL
-ScVbaPane::getScrollRow() throw (uno::RuntimeException, std::exception)
+ScVbaPane::getScrollRow()
 {
     return ( m_xViewPane->getFirstVisibleRow() + 1 );
 }
 
 void SAL_CALL
-ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException, std::exception)
+ScVbaPane::setScrollRow( sal_Int32 _scrollrow )
 {
     if( _scrollrow < 1 )
     {
@@ -71,7 +71,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException, st
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaPane::getVisibleRange() throw (uno::RuntimeException, std::exception)
+ScVbaPane::getVisibleRange()
 {
     // TODO: Excel includes partly visible rows/columns, Calc does not
     table::CellRangeAddress aRangeAddr = m_xViewPane->getVisibleRange();
@@ -85,7 +85,7 @@ ScVbaPane::getVisibleRange() throw (uno::RuntimeException, std::exception)
 
 //Method
 void SAL_CALL
-ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception)
+ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft )
 {
     OUString messageBuffer;
     sal_Int32 downRows = 0;
@@ -138,7 +138,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
 }
 
 void SAL_CALL
-ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception)
+ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft )
 {
     OUString messageBuffer;
     table::CellRangeAddress visibleRange = m_xViewPane->getVisibleRange();
diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx
index 831aca519f6a..5c3589223219 100644
--- a/sc/source/ui/vba/vbapane.hxx
+++ b/sc/source/ui/vba/vbapane.hxx
@@ -33,18 +33,18 @@ public:
         const css::uno::Reference< ov::XHelperInterface >& rParent,
         const css::uno::Reference< css::uno::XComponentContext >& rContext,
         const css::uno::Reference< css::frame::XModel >& rModel,
-        const css::uno::Reference< css::sheet::XViewPane >& rViewPane ) throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::sheet::XViewPane >& rViewPane );
 
     // XPane attributes
-    virtual sal_Int32 SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setScrollColumn( sal_Int32 _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setScrollRow( sal_Int32 _scrollrow ) throw (css::uno::RuntimeException, std::exception) override;
-     virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getScrollColumn() override;
+    virtual void SAL_CALL setScrollColumn( sal_Int32 _scrollcolumn ) override;
+    virtual sal_Int32 SAL_CALL getScrollRow() override;
+    virtual void SAL_CALL setScrollRow( sal_Int32 _scrollrow ) override;
+     virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() override;
 
     // XPane methods
-    virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override;
+    virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override;
 
 protected:
     css::uno::Reference< css::frame::XModel > m_xModel;
diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx
index fff859362c9d..db42296a52c4 100644
--- a/sc/source/ui/vba/vbapivotcache.cxx
+++ b/sc/source/ui/vba/vbapivotcache.cxx
@@ -26,7 +26,7 @@ ScVbaPivotCache::ScVbaPivotCache( const uno::Reference< XHelperInterface >& xPar
 }
 
 void SAL_CALL
-ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException, std::exception)
+ScVbaPivotCache::Refresh()
 {
     m_xTable->refresh();
 }
diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx
index 417d20370c02..f7004774dffc 100644
--- a/sc/source/ui/vba/vbapivotcache.hxx
+++ b/sc/source/ui/vba/vbapivotcache.hxx
@@ -32,7 +32,7 @@ class ScVbaPivotCache : public PivotCacheImpl_BASE
 public:
     ScVbaPivotCache( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable );
 
-    virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Refresh() override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx
index 2e3758f7f388..a8af3db58e2a 100644
--- a/sc/source/ui/vba/vbapivottable.cxx
+++ b/sc/source/ui/vba/vbapivottable.cxx
@@ -27,7 +27,7 @@ ScVbaPivotTable::ScVbaPivotTable( const uno::Reference< uno::XComponentContext >
 }
 
 uno::Reference< excel::XPivotCache >
-ScVbaPivotTable::PivotCache() throw (uno::RuntimeException, std::exception)
+ScVbaPivotTable::PivotCache()
 {
     // #FIXME with a quick example failed to determine what the parent
     // should be, leaving as null at the moment
diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx
index b673f6a730ea..eb16e9905efe 100644
--- a/sc/source/ui/vba/vbapivottable.hxx
+++ b/sc/source/ui/vba/vbapivottable.hxx
@@ -31,7 +31,7 @@ class ScVbaPivotTable : public PivotTableImpl_BASE
     css::uno::Reference< css::sheet::XDataPilotTable > m_xTable;
 public:
     ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable );
-    virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache(  ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx
index 97facba0c103..f60c5e53b7db 100644
--- a/sc/source/ui/vba/vbapivottables.cxx
+++ b/sc/source/ui/vba/vbapivottables.cxx
@@ -34,9 +34,9 @@ class PivotTableEnumeration : public EnumerationHelperImpl
 {
 public:
     /// @throws uno::RuntimeException
-    PivotTableEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {}
+    PivotTableEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {}
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         return DataPilotToPivotTable( m_xEnumeration->nextElement(),  m_xContext );
     }
@@ -48,7 +48,7 @@ ScVbaPivotTables::ScVbaPivotTables( const uno::Reference< XHelperInterface >& xP
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaPivotTables::createEnumeration() throw (uno::RuntimeException)
+ScVbaPivotTables::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return new PivotTableEnumeration( mxParent, mxContext, xEnumAccess->createEnumeration() );
@@ -61,7 +61,7 @@ ScVbaPivotTables::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Type
-ScVbaPivotTables::getElementType() throw (uno::RuntimeException)
+ScVbaPivotTables::getElementType()
 {
     return cppu::UnoType<excel::XPivotTable>::get();
 }
diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx
index 908afee55bd1..5b95d9724472 100644
--- a/sc/source/ui/vba/vbapivottables.hxx
+++ b/sc/source/ui/vba/vbapivottables.hxx
@@ -37,8 +37,8 @@ public:
     ScVbaPivotTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // XPivotTables
 
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 8599c4450e44..4d444f2aaebc 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -253,7 +253,7 @@ static uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const
     return xRange;
 }
 
-ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException )
+ScCellRangesBase* ScVbaRange::getCellRangesBase()
 {
     if( mxRanges.is() )
         return ScCellRangesBase::getImplementation( mxRanges );
@@ -262,12 +262,12 @@ ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException
     throw uno::RuntimeException("General Error creating range - Unknown" );
 }
 
-ScCellRangeObj* ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException )
+ScCellRangeObj* ScVbaRange::getCellRangeObj()
 {
     return dynamic_cast< ScCellRangeObj* >( getCellRangesBase() );
 }
 
-SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw (uno::RuntimeException, std::exception)
+SfxItemSet*  ScVbaRange::getCurrentDataSet( )
 {
     SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() );
     if ( !pDataSet )
@@ -299,9 +299,9 @@ class SingleRangeEnumeration : public EnumerationHelper_BASE
     bool bHasMore;
 public:
     /// @throws uno::RuntimeException
-    explicit SingleRangeEnumeration( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xRange( xRange ), bHasMore( true ) { }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override { return bHasMore; }
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    explicit SingleRangeEnumeration( const uno::Reference< table::XCellRange >& xRange ) : m_xRange( xRange ), bHasMore( true ) { }
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override { return bHasMore; }
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !bHasMore )
             throw container::NoSuchElementException();
@@ -322,18 +322,18 @@ private:
 public:
     explicit SingleRangeIndexAccess( const uno::Reference< table::XCellRange >& xRange ) : m_xRange( xRange ) {}
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException, std::exception) override { return 1; }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount() override { return 1; }
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index != 0 )
             throw lang::IndexOutOfBoundsException();
         return uno::makeAny( m_xRange );
     }
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<table::XCellRange>::get(); }
-    virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return true; }
+    virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<table::XCellRange>::get(); }
+    virtual sal_Bool SAL_CALL hasElements() override { return true; }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) override { return new SingleRangeEnumeration( m_xRange ); }
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() override { return new SingleRangeEnumeration( m_xRange ); }
 
 };
 
@@ -343,8 +343,8 @@ class RangesEnumerationImpl : public EnumerationHelperImpl
     bool mbIsColumns;
 public:
     /// @throws uno::RuntimeException
-    RangesEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {}
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    RangesEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {}
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         return lcl_makeRange( m_xParent, m_xContext, m_xEnumeration->nextElement(), mbIsRows, mbIsColumns );
     }
@@ -358,10 +358,10 @@ public:
     ScVbaRangeAreas( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, bool bIsRows, bool bIsColumns ) : ScVbaCollectionBaseImpl( xParent, xContext, xIndexAccess ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {}
 
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException) override;
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException) override { return cppu::UnoType<excel::XRange>::get(); }
+    virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<excel::XRange>::get(); }
 
     virtual uno::Any createCollectionObject( const uno::Any& aSource ) override;
 
@@ -372,7 +372,7 @@ public:
 };
 
 uno::Reference< container::XEnumeration > SAL_CALL
-ScVbaRangeAreas::createEnumeration() throw (uno::RuntimeException)
+ScVbaRangeAreas::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return new RangesEnumerationImpl( mxParent, mxContext, xEnumAccess->createEnumeration(), mbIsRows, mbIsColumns );
@@ -387,7 +387,7 @@ ScVbaRangeAreas::createCollectionObject( const uno::Any& aSource )
 // assume that xIf is infact a ScCellRangesBase
 /// @throws uno::RuntimeException
 ScDocShell*
-getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
+getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf )
 {
     ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf );
     if ( !pUno )
@@ -397,7 +397,7 @@ getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::R
 
 /// @throws uno::RuntimeException
 ScDocShell*
-getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
+getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange )
 {
     // need the ScCellRangesBase to get docshell
     uno::Reference< uno::XInterface > xIf( xRange );
@@ -406,7 +406,7 @@ getDocShellFromRange( const uno::Reference< table::XCellRange >& xRange ) throw
 
 /// @throws uno::RuntimeException
 ScDocShell*
-getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) throw ( uno::RuntimeException )
+getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges )
 {
     // need the ScCellRangesBase to get docshell
     uno::Reference< uno::XInterface > xIf( xRanges );
@@ -414,14 +414,14 @@ getDocShellFromRanges( const uno::Reference< sheet::XSheetCellRangeContainer >&
 }
 
 /// @throws uno::RuntimeException
-uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::RuntimeException )
+uno::Reference< frame::XModel > getModelFromXIf( const uno::Reference< uno::XInterface >& xIf )
 {
     ScDocShell* pDocShell = getDocShellFromIf(xIf );
     return pDocShell->GetModel();
 }
 
 /// @throws uno::RuntimeException
-uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
+uno::Reference< frame::XModel > getModelFromRange( const uno::Reference< table::XCellRange >& xRange )
 {
     // the XInterface for getImplementation can be any derived interface, no need for queryInterface
     uno::Reference< uno::XInterface > xIf( xRange );
@@ -439,7 +439,7 @@ getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange )
 }
 
 ScDocument&
-ScVbaRange::getScDocument() throw (uno::RuntimeException)
+ScVbaRange::getScDocument()
 {
     if ( mxRanges.is() )
     {
@@ -451,7 +451,7 @@ ScVbaRange::getScDocument() throw (uno::RuntimeException)
 }
 
 ScDocShell*
-ScVbaRange::getScDocShell() throw (uno::RuntimeException)
+ScVbaRange::getScDocShell()
 {
     if ( mxRanges.is() )
     {
@@ -468,28 +468,28 @@ ScVbaRange* ScVbaRange::getImplementation( const uno::Reference< excel::XRange >
     return dynamic_cast< ScVbaRange* >( rxRange.get() );
 }
 
-uno::Reference< frame::XModel > ScVbaRange::getUnoModel() throw (uno::RuntimeException)
+uno::Reference< frame::XModel > ScVbaRange::getUnoModel()
 {
     if( ScDocShell* pDocShell = getScDocShell() )
         return pDocShell->GetModel();
     throw uno::RuntimeException();
 }
 
-uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException)
+uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference< excel::XRange >& rxRange )
 {
     if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) )
         return pScVbaRange->getUnoModel();
     throw uno::RuntimeException();
 }
 
-const ScRangeList& ScVbaRange::getScRangeList() throw (uno::RuntimeException)
+const ScRangeList& ScVbaRange::getScRangeList()
 {
     if( ScCellRangesBase* pScRangesBase = getCellRangesBase() )
         return pScRangesBase->GetRangeList();
     throw uno::RuntimeException("Cannot obtain UNO range implementation object" );
 }
 
-const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException)
+const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange )
 {
     if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) )
         return pScVbaRange->getScRangeList();
@@ -626,9 +626,9 @@ public:
     {
     }
 
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) override { return mCurElem < mMaxElems; }
+    virtual sal_Bool SAL_CALL hasMoreElements() override { return mCurElem < mMaxElems; }
 
-    virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement() override
     {
         if ( !hasMoreElements() )
             throw container::NoSuchElementException();
@@ -646,7 +646,7 @@ class CellsEnumeration : public CellsEnumeration_BASE
     vCellPos::const_iterator m_it;
 
     /// @throws uno::RuntimeException
-    uno::Reference< table::XCellRange > getArea( sal_Int32 nVBAIndex ) throw ( uno::RuntimeException )
+    uno::Reference< table::XCellRange > getArea( sal_Int32 nVBAIndex )
     {
         if ( nVBAIndex < 1 || nVBAIndex > m_xAreas->getCount() )
             throw uno::RuntimeException();
@@ -677,9 +677,9 @@ public:
         }
         m_it = m_CellPositions.begin();
     }
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) override { return m_it != m_CellPositions.end(); }
+    virtual sal_Bool SAL_CALL hasMoreElements() override { return m_it != m_CellPositions.end(); }
 
-    virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement() override
     {
         if ( !hasMoreElements() )
             throw container::NoSuchElementException();
@@ -1097,42 +1097,42 @@ class RangeHelper
 
 public:
     /// @throws uno::RuntimeException
-    explicit RangeHelper( const uno::Reference< table::XCellRange >& xCellRange ) throw (uno::RuntimeException) : m_xCellRange( xCellRange )
+    explicit RangeHelper( const uno::Reference< table::XCellRange >& xCellRange ) : m_xCellRange( xCellRange )
     {
         if ( !m_xCellRange.is() )
             throw uno::RuntimeException();
     }
     /// @throws uno::RuntimeException
-    explicit RangeHelper( const uno::Any& rCellRange ) throw (uno::RuntimeException)
+    explicit RangeHelper( const uno::Any& rCellRange )
     {
         m_xCellRange.set(rCellRange, uno::UNO_QUERY_THROW);
     }
     /// @throws uno::RuntimeException
-    uno::Reference< sheet::XSheetCellRange > getSheetCellRange() throw (uno::RuntimeException)
+    uno::Reference< sheet::XSheetCellRange > getSheetCellRange()
     {
         return uno::Reference< sheet::XSheetCellRange >(m_xCellRange, uno::UNO_QUERY_THROW);
     }
     /// @throws uno::RuntimeException
-    uno::Reference< sheet::XSpreadsheet >  getSpreadSheet() throw (uno::RuntimeException)
+    uno::Reference< sheet::XSpreadsheet >  getSpreadSheet()
     {
         return getSheetCellRange()->getSpreadsheet();
     }
 
     /// @throws uno::RuntimeException
-    uno::Reference< table::XCellRange > getCellRangeFromSheet() throw (uno::RuntimeException)
+    uno::Reference< table::XCellRange > getCellRangeFromSheet()
     {
         return uno::Reference< table::XCellRange >(getSpreadSheet(), uno::UNO_QUERY_THROW );
     }
 
     /// @throws uno::RuntimeException
-    uno::Reference< sheet::XCellRangeAddressable >  getCellRangeAddressable() throw (uno::RuntimeException)
+    uno::Reference< sheet::XCellRangeAddressable >  getCellRangeAddressable()
     {
         return uno::Reference< sheet::XCellRangeAddressable >(m_xCellRange, ::uno::UNO_QUERY_THROW);
 
     }
 
     /// @throws uno::RuntimeException
-    uno::Reference< sheet::XSheetCellCursor > getSheetCellCursor() throw ( uno::RuntimeException )
+    uno::Reference< sheet::XSheetCellCursor > getSheetCellCursor()
     {
         return  uno::Reference< sheet::XSheetCellCursor >( getSpreadSheet()->createCursorByRange( getSheetCellRange() ), uno::UNO_QUERY_THROW );
     }
@@ -1167,7 +1167,7 @@ ScVbaRange::getCellRangesForAddress( ScRefFlags& rResFlags, const OUString& sAdd
     return false;
 }
 
-bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv ) throw ( uno::RuntimeException )
+bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv )
 {
     // see if there is a match with a named range
     uno::Reference< beans::XPropertySet > xProps( pDocSh->GetModel(), uno::UNO_QUERY_THROW );
@@ -1241,7 +1241,7 @@ bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRang
 
 /// @throws uno::RuntimeException
 ScVbaRange*
-getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException, std::exception )
+getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 )
 {
     ScRangeList aCellRanges;
     ScRange refRange;
@@ -1265,13 +1265,13 @@ namespace {
 
 /// @throws uno::RuntimeException
 template< typename RangeType >
-inline table::CellRangeAddress lclGetRangeAddress( const uno::Reference< RangeType >& rxCellRange ) throw (uno::RuntimeException)
+inline table::CellRangeAddress lclGetRangeAddress( const uno::Reference< RangeType >& rxCellRange )
 {
     return uno::Reference< sheet::XCellRangeAddressable >( rxCellRange, uno::UNO_QUERY_THROW )->getRangeAddress();
 }
 
 /// @throws uno::RuntimeException
-void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange ) throw (uno::RuntimeException)
+void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange )
 {
     using namespace ::com::sun::star::sheet::CellFlags;
     sal_Int32 nFlags = VALUE | DATETIME | STRING | ANNOTATION | FORMULA | HARDATTR | STYLES | EDITATTR | FORMATTED;
@@ -1280,7 +1280,7 @@ void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange ) thr
 }
 
 /// @throws uno::RuntimeException
-uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference< table::XCellRange >& rxCellRange, bool bRecursive ) throw (uno::RuntimeException)
+uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference< table::XCellRange >& rxCellRange, bool bRecursive )
 {
     uno::Reference< sheet::XSheetCellRange > xNewCellRange( rxCellRange, uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XSpreadsheet > xSheet( xNewCellRange->getSpreadsheet(), uno::UNO_SET_THROW );
@@ -1300,7 +1300,7 @@ uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference
 }
 
 /// @throws uno::RuntimeException
-uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) throw (uno::RuntimeException)
+uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive )
 {
     if( !rxCellRanges.is() )
         throw uno::RuntimeException("Missing cell ranges object" );
@@ -1321,7 +1321,7 @@ uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::
 }
 
 /// @throws uno::RuntimeException
-void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, bool bMerge ) throw (uno::RuntimeException)
+void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, bool bMerge )
 {
     uno::Reference< util::XMergeable > xMerge( lclExpandToMerged( rxCellRange, true ), uno::UNO_QUERY_THROW );
     // Calc cannot merge over merged ranges, always unmerge first
@@ -1344,7 +1344,7 @@ void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange,
 }
 
 /// @throws uno::RuntimeException
-util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxCellRange ) throw (uno::RuntimeException)
+util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxCellRange )
 {
     /*  1) Check if range is completely inside one single merged range. To do
         this, try to extend from top-left cell only (not from entire range).
@@ -1374,14 +1374,14 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC
 css::uno::Reference< excel::XRange >
 ScVbaRange::getRangeObjectForName(
         const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName,
-        ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException, std::exception )
+        ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv )
 {
     table::CellRangeAddress refAddr;
     return getRangeForName( xContext, sRangeName, pDocSh, refAddr, eConv );
 }
 
 /// @throws uno::RuntimeException
-table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh ) throw ( uno::RuntimeException )
+table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh )
 {
     uno::Reference< table::XCellRange > xRangeParam;
     switch ( aParam.getValueTypeClass() )
@@ -1421,7 +1421,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam,
 
 /// @throws uno::RuntimeException
 static uno::Reference< XCollection >
-lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext,  const uno::Reference< table::XCellRange >& xRange  ) throw( uno::RuntimeException )
+lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext,  const uno::Reference< table::XCellRange >& xRange  )
 {
     uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW );
     ScDocument& rDoc = getDocumentFromRange(xRange);
@@ -1431,7 +1431,7 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno
 }
 
 ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args,
-    uno::Reference< uno::XComponentContext> const & xContext )  throw ( lang::IllegalArgumentException, uno::RuntimeException ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( false ), mbIsColumns( false )
+    uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaRange_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( false ), mbIsColumns( false )
 {
     mxRange.set( mxPropertySet, uno::UNO_QUERY );
     mxRanges.set( mxPropertySet, uno::UNO_QUERY );
@@ -1447,7 +1447,7 @@ ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args,
     m_Areas = new ScVbaRangeAreas( mxParent, mxContext, xIndex, mbIsRows, mbIsColumns );
 }
 
-ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, bool bIsRows, bool bIsColumns ) throw( lang::IllegalArgumentException )
+ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange, bool bIsRows, bool bIsColumns )
 : ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRange, uno::UNO_QUERY_THROW ), getModelFromRange( xRange), true ), mxRange( xRange ),
                 mbIsRows( bIsRows ),
                 mbIsColumns( bIsColumns )
@@ -1463,7 +1463,6 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const
 }
 
 ScVbaRange::ScVbaRange(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows, bool bIsColumns)
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
 : ScVbaRange_BASE( xParent, xContext, uno::Reference< beans::XPropertySet >( xRanges, uno::UNO_QUERY_THROW ), getModelFromXIf( uno::Reference< uno::XInterface >( xRanges, uno::UNO_QUERY_THROW ) ), true ), mxRanges( xRanges ),mbIsRows( bIsRows ), mbIsColumns( bIsColumns )
 
 {
@@ -1504,7 +1503,7 @@ ScVbaRange::visitArray( ArrayVisitor& visitor )
 }
 
 uno::Any
-ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException)
+ScVbaRange::getValue( ValueGetter& valueGetter)
 {
     uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
     // single cell range
@@ -1522,7 +1521,7 @@ ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException)
 }
 
 uno::Any SAL_CALL
-ScVbaRange::getValue() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getValue()
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1540,7 +1539,7 @@ ScVbaRange::getValue() throw (uno::RuntimeException, std::exception)
 }
 
 void
-ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter ) throw (uno::RuntimeException)
+ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter )
 {
     uno::TypeClass aClass = aValue.getValueTypeClass();
     if ( aClass == uno::TypeClass_SEQUENCE )
@@ -1577,7 +1576,7 @@ ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter ) throw (
 }
 
 void SAL_CALL
-ScVbaRange::setValue( const uno::Any  &aValue ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::setValue( const uno::Any  &aValue )
 {
     // If this is a multiple selection apply setValue over all areas
     if ( m_Areas->getCount() > 1 )
@@ -1592,7 +1591,7 @@ ScVbaRange::setValue( const uno::Any  &aValue ) throw (uno::RuntimeException, st
 }
 
 void SAL_CALL
-ScVbaRange::Clear() throw (uno::RuntimeException, std::exception)
+ScVbaRange::Clear()
 {
     using namespace ::com::sun::star::sheet::CellFlags;
     sal_Int32 nFlags = VALUE | DATETIME | STRING | FORMULA | HARDATTR | EDITATTR | FORMATTED;
@@ -1601,7 +1600,7 @@ ScVbaRange::Clear() throw (uno::RuntimeException, std::exception)
 
 //helper ClearContent
 void
-ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (uno::RuntimeException)
+ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent )
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1628,13 +1627,13 @@ ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (uno::Runti
 }
 
 void SAL_CALL
-ScVbaRange::ClearComments() throw (uno::RuntimeException, std::exception)
+ScVbaRange::ClearComments()
 {
     ClearContents( sheet::CellFlags::ANNOTATION, false );
 }
 
 void SAL_CALL
-ScVbaRange::ClearContents() throw (uno::RuntimeException, std::exception)
+ScVbaRange::ClearContents()
 {
     using namespace ::com::sun::star::sheet::CellFlags;
     sal_Int32 nFlags = VALUE | DATETIME | STRING | FORMULA;
@@ -1642,7 +1641,7 @@ ScVbaRange::ClearContents() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaRange::ClearFormats() throw (uno::RuntimeException, std::exception)
+ScVbaRange::ClearFormats()
 {
     // FIXME: need to check if we need to combine FORMATTED
     using namespace ::com::sun::star::sheet::CellFlags;
@@ -1651,7 +1650,7 @@ ScVbaRange::ClearFormats() throw (uno::RuntimeException, std::exception)
 }
 
 void
-ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException)
+ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::Grammar eGram )
 {
     // If this is a multiple selection apply setFormula over all areas
     if ( m_Areas->getCount() > 1 )
@@ -1666,7 +1665,7 @@ ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::
 }
 
 uno::Any
-ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException)
+ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram )
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1683,32 +1682,32 @@ ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno
 }
 
 void
-ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::setFormula(const uno::Any &rFormula )
 {
     // #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO                            // results in "=$a$1:a1", temporalily disable conversion
     setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
 }
 
 uno::Any
-ScVbaRange::getFormulaR1C1() throw (css::uno::RuntimeException, std::exception)
+ScVbaRange::getFormulaR1C1()
 {
     return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
 }
 
 void
-ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::setFormulaR1C1(const uno::Any& rFormula )
 {
     setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
 }
 
 uno::Any
-ScVbaRange::getFormula() throw (css::uno::RuntimeException, std::exception)
+ScVbaRange::getFormula()
 {
     return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
 }
 
 sal_Int32
-ScVbaRange::getCount() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getCount()
 {
     // If this is a multiple selection apply setValue over all areas
     if ( m_Areas->getCount() > 1 )
@@ -1732,7 +1731,7 @@ ScVbaRange::getCount() throw (uno::RuntimeException, std::exception)
 }
 
 sal_Int32
-ScVbaRange::getRow() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getRow()
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1748,7 +1747,7 @@ ScVbaRange::getRow() throw (uno::RuntimeException, std::exception)
 }
 
 sal_Int32
-ScVbaRange::getColumn() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getColumn()
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1764,7 +1763,7 @@ ScVbaRange::getColumn() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any
-ScVbaRange::HasFormula() throw (uno::RuntimeException, std::exception)
+ScVbaRange::HasFormula()
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -1805,7 +1804,7 @@ ScVbaRange::HasFormula() throw (uno::RuntimeException, std::exception)
     return uno::makeAny( true );
 }
 void
-ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( uno::RuntimeException )
+ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -1827,35 +1826,35 @@ ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFi
 }
 
 void
-ScVbaRange::FillLeft() throw (uno::RuntimeException, std::exception)
+ScVbaRange::FillLeft()
 {
     fillSeries(sheet::FillDirection_TO_LEFT,
         sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
 }
 
 void
-ScVbaRange::FillRight() throw (uno::RuntimeException, std::exception)
+ScVbaRange::FillRight()
 {
     fillSeries(sheet::FillDirection_TO_RIGHT,
         sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
 }
 
 void
-ScVbaRange::FillUp() throw (uno::RuntimeException, std::exception)
+ScVbaRange::FillUp()
 {
     fillSeries(sheet::FillDirection_TO_TOP,
         sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
 }
 
 void
-ScVbaRange::FillDown() throw (uno::RuntimeException, std::exception)
+ScVbaRange::FillDown()
 {
     fillSeries(sheet::FillDirection_TO_BOTTOM,
         sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
 }
 
 OUString
-ScVbaRange::getText() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getText()
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1871,7 +1870,7 @@ ScVbaRange::getText() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff )
 {
     SCROW nRowOffset = 0;
     SCCOL nColOffset = 0;
@@ -1907,7 +1906,7 @@ ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw (
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::CurrentRegion() throw (uno::RuntimeException, std::exception)
+ScVbaRange::CurrentRegion()
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1928,7 +1927,7 @@ ScVbaRange::CurrentRegion() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::CurrentArray() throw (uno::RuntimeException, std::exception)
+ScVbaRange::CurrentArray()
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1948,7 +1947,7 @@ ScVbaRange::CurrentArray() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any
-ScVbaRange::getFormulaArray() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getFormulaArray()
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -1986,7 +1985,7 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException, std::exception)
 }
 
 void
-ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeException, std::exception)
+ScVbaRange::setFormulaArray(const uno::Any& rFormula)
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -2022,7 +2021,7 @@ ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeExcepti
 }
 
 OUString
-ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length)
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -2048,7 +2047,7 @@ ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno
 }
 
 OUString
-ScVbaRange::Address(  const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Address(  const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -2123,7 +2122,7 @@ ScVbaRange::Address(  const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut
 }
 
 uno::Reference < excel::XFont >
-ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException)
+ScVbaRange::Font()
 {
     uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY );
     ScDocument& rDoc = getScDocument();
@@ -2145,7 +2144,7 @@ ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException)
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException, std::exception)
+ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex )
 {
     // #TODO code within the test below "if ( m_Areas.... " can be removed
     // Test is performed only because m_xRange is NOT set to be
@@ -2167,7 +2166,7 @@ uno::Reference< excel::XRange >
 ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent,
                          const uno::Reference< uno::XComponentContext >& xContext,
                          const uno::Reference< css::table::XCellRange >& xRange,
-                         const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException)
+                         const uno::Any &nRowIndex, const uno::Any &nColumnIndex )
 {
     sal_Int32 nRow = 0, nColumn = 0;
 
@@ -2245,7 +2244,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent,
 }
 
 void
-ScVbaRange::Select() throw (uno::RuntimeException, std::exception)
+ScVbaRange::Select()
 {
     ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
     if ( !pUnoRangesBase )
@@ -2295,7 +2294,7 @@ void setCursor( SCCOL nCol, SCROW nRow, const uno::Reference< frame::XModel >& x
 }
 
 void
-ScVbaRange::Activate() throw (uno::RuntimeException, std::exception)
+ScVbaRange::Activate()
 {
     // get first cell of current range
     uno::Reference< table::XCellRange > xCellRange;
@@ -2355,7 +2354,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Rows(const uno::Any& aIndex )
 {
     OUString sAddress;
 
@@ -2398,7 +2397,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exc
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Columns(const uno::Any& aIndex )
 {
     OUString sAddress;
 
@@ -2438,7 +2437,7 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException, std::
 }
 
 void
-ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaRange::setMergeCells( const uno::Any& aIsMerged )
 {
     bool bMerge = extractBoolFromAny( aIsMerged );
 
@@ -2472,7 +2471,7 @@ ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicError
 }
 
 uno::Any
-ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaRange::getMergeCells()
 {
     if( mxRanges.is() )
     {
@@ -2501,7 +2500,7 @@ ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeExce
 }
 
 void
-ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Copy(const ::uno::Any& Destination)
 {
     if ( m_Areas->getCount() > 1 )
         throw uno::RuntimeException("That command cannot be used on multiple selections" );
@@ -2531,7 +2530,7 @@ ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException, st
 }
 
 void
-ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Cut(const ::uno::Any& Destination)
 {
     if ( m_Areas->getCount() > 1 )
         throw uno::RuntimeException("That command cannot be used on multiple selections" );
@@ -2557,7 +2556,7 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException, std
 }
 
 void
-ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErrorException, uno::RuntimeException)
+ScVbaRange::setNumberFormat( const uno::Any& aFormat )
 {
     OUString sFormat;
     aFormat >>= sFormat;
@@ -2576,7 +2575,7 @@ ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErro
 }
 
 uno::Any
-ScVbaRange::getNumberFormat() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::getNumberFormat()
 {
 
     if ( m_Areas->getCount() > 1 )
@@ -2605,7 +2604,7 @@ ScVbaRange::getNumberFormat() throw (script::BasicErrorException, uno::RuntimeEx
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize )
 {
     long nRowSize = 0, nColumnSize = 0;
     bool bIsRowChanged = ( RowSize >>= nRowSize ), bIsColumnChanged = ( ColumnSize >>= nColumnSize );
@@ -2629,7 +2628,7 @@ ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw
 }
 
 void
-ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaRange::setWrapText( const uno::Any& aIsWrapped )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -2648,7 +2647,7 @@ ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorE
 }
 
 uno::Any
-ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::getWrapText()
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -2676,18 +2675,18 @@ ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeExcept
     return aValue;
 }
 
-uno::Reference< excel::XInterior > ScVbaRange::Interior( ) throw ( script::BasicErrorException, uno::RuntimeException)
+uno::Reference< excel::XInterior > ScVbaRange::Interior( )
 {
     uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
         return new ScVbaInterior ( this, mxContext, xProps, &getScDocument() );
 }
 uno::Reference< excel::XRange >
-ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 )
 {
     return Range( Cell1, Cell2, false );
 }
 uno::Reference< excel::XRange >
-ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseInpuRangeTab )
 
 {
     uno::Reference< table::XCellRange > xCellRange = mxRange;
@@ -2788,7 +2787,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI
 
 // Allow access to underlying openoffice uno api ( useful for debugging
 // with openoffice basic )
-uno::Any SAL_CALL ScVbaRange::getCellRange(  ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaRange::getCellRange(  )
 {
     uno::Any aAny;
     if ( mxRanges.is() )
@@ -2798,7 +2797,7 @@ uno::Any SAL_CALL ScVbaRange::getCellRange(  ) throw (uno::RuntimeException, std
     return aAny;
 }
 
-uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException)
+uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange )
 {
     if( ScVbaRange* pVbaRange = getImplementation( rxRange ) )
         return pVbaRange->getCellRange();
@@ -2854,7 +2853,7 @@ getPasteFormulaBits( sal_Int32 Operation)
     return nFormulaBits;
 }
 void SAL_CALL
-ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception)
+ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose )
 {
     if ( m_Areas->getCount() > 1 )
         throw uno::RuntimeException("That command cannot be used on multiple selections" );
@@ -2888,7 +2887,7 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException)
+ScVbaRange::getEntireColumnOrRow( bool bColumn )
 {
     ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
     // copy the range list
@@ -2919,19 +2918,19 @@ ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException)
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaRange::getEntireRow() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getEntireRow()
 {
     return getEntireColumnOrRow(false);
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaRange::getEntireColumn() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getEntireColumn()
 {
     return getEntireColumnOrRow(true);
 }
 
 uno::Reference< excel::XComment > SAL_CALL
-ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::AddComment( const uno::Any& Text )
 {
     // if there is already a comment in the top-left cell then throw
     if( getComment().is() )
@@ -2955,7 +2954,7 @@ ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException, std
 }
 
 uno::Reference< excel::XComment > SAL_CALL
-ScVbaRange::getComment() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getComment()
 {
     // intentional behavior to return a null object if no
     // comment defined
@@ -2968,7 +2967,7 @@ ScVbaRange::getComment() throw (uno::RuntimeException, std::exception)
 
 /// @throws uno::RuntimeException
 uno::Reference< beans::XPropertySet >
-getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool bRows ) throw ( uno::RuntimeException )
+getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool bRows )
 {
     uno::Reference< table::XColumnRowRange > xColRow( xCellRange, uno::UNO_QUERY_THROW );
     uno::Reference< beans::XPropertySet > xProps;
@@ -2980,7 +2979,7 @@ getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool
 }
 
 uno::Any SAL_CALL
-ScVbaRange::getHidden() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getHidden()
 {
     // if multi-area result is the result of the
     // first area
@@ -3004,7 +3003,7 @@ ScVbaRange::getHidden() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::setHidden( const uno::Any& _hidden )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -3030,7 +3029,7 @@ ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException, s
 }
 
 sal_Bool SAL_CALL
-ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat  ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat  )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -3132,7 +3131,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ )
 {
     // return a Range object that represents the first cell where that information is found.
     OUString sWhat;
@@ -3321,7 +3320,7 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere
 // helper method for Sort
 /// @throws uno::RuntimeException
 sal_Int32 findSortPropertyIndex( const uno::Sequence< beans::PropertyValue >& props,
-const OUString& sPropName ) throw( uno::RuntimeException )
+const OUString& sPropName )
 {
     const beans::PropertyValue* pProp = props.getConstArray();
     sal_Int32 nItems = props.getLength();
@@ -3339,7 +3338,7 @@ const OUString& sPropName ) throw( uno::RuntimeException )
 /// @throws uno::RuntimeException
 void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRange,
     const uno::Reference< table::XCellRange >& xColRowKey, sal_Int16 nOrder,
-    table::TableSortField& aTableField, bool bIsSortColumn, bool bMatchCase ) throw ( uno::RuntimeException )
+    table::TableSortField& aTableField, bool bIsSortColumn, bool bMatchCase )
 {
         RangeHelper parentRange( xParentRange );
         RangeHelper colRowRange( xColRowKey );
@@ -3373,7 +3372,7 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan
 }
 
 void SAL_CALL
-ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& Key2, const uno::Any& /*Type*/, const uno::Any& Order2, const uno::Any& Key3, const uno::Any& Order3, const uno::Any& Header, const uno::Any& OrderCustom, const uno::Any& MatchCase, const uno::Any& Orientation, const uno::Any& SortMethod,  const uno::Any& DataOption1, const uno::Any& DataOption2, const uno::Any& DataOption3  ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& Key2, const uno::Any& /*Type*/, const uno::Any& Order2, const uno::Any& Key3, const uno::Any& Order3, const uno::Any& Header, const uno::Any& OrderCustom, const uno::Any& MatchCase, const uno::Any& Orientation, const uno::Any& SortMethod,  const uno::Any& DataOption1, const uno::Any& DataOption2, const uno::Any& DataOption3  )
 {
     // #TODO# #FIXME# can we do something with Type
     if ( m_Areas->getCount() > 1 )
@@ -3549,7 +3548,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaRange::End( ::sal_Int32 Direction )  throw (uno::RuntimeException, std::exception)
+ScVbaRange::End( ::sal_Int32 Direction )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -3640,7 +3639,7 @@ ScVbaRange::isSingleCellRange()
 }
 
 uno::Reference< excel::XCharacters > SAL_CALL
-ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length )
 {
     if ( !isSingleCellRange() )
         throw uno::RuntimeException("Can't create Characters property for multicell range " );
@@ -3652,7 +3651,7 @@ ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (u
 }
 
  void SAL_CALL
-ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Delete( const uno::Any& Shift )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -3700,7 +3699,7 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException, std::e
 
 //XElementAccess
 sal_Bool SAL_CALL
-ScVbaRange::hasElements() throw (uno::RuntimeException, std::exception)
+ScVbaRange::hasElements()
 {
     uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY );
     if ( xColumnRowRange.is() )
@@ -3712,7 +3711,7 @@ ScVbaRange::hasElements() throw (uno::RuntimeException, std::exception)
 
 // XEnumerationAccess
 uno::Reference< container::XEnumeration > SAL_CALL
-ScVbaRange::createEnumeration() throw (uno::RuntimeException, std::exception)
+ScVbaRange::createEnumeration()
 {
     if ( mbIsColumns || mbIsRows )
     {
@@ -3730,7 +3729,7 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException, std::exception)
 }
 
 OUString SAL_CALL
-ScVbaRange::getDefaultMethodName(  ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::getDefaultMethodName(  )
 {
     return OUString( "Item" );
 }
@@ -3738,7 +3737,6 @@ ScVbaRange::getDefaultMethodName(  ) throw (uno::RuntimeException, std::exceptio
 // returns calc internal col. width ( in points )
 double
 ScVbaRange::getCalcColWidth(const table::CellRangeAddress& rAddress)
-    throw (uno::RuntimeException, std::exception)
 {
     ScDocument& rDoc = getScDocument();
     sal_uInt16 nWidth = rDoc.GetOriginalWidth( static_cast< SCCOL >( rAddress.StartColumn ), static_cast< SCTAB >( rAddress.Sheet ) );
@@ -3749,7 +3747,6 @@ ScVbaRange::getCalcColWidth(const table::CellRangeAddress& rAddress)
 
 double
 ScVbaRange::getCalcRowHeight(const table::CellRangeAddress& rAddress)
-    throw (uno::RuntimeException, std::exception)
 {
     ScDocument& rDoc = getDocumentFromRange( mxRange );
     sal_uInt16 nWidth = rDoc.GetOriginalHeight( rAddress.StartRow, rAddress.Sheet );
@@ -3772,7 +3769,7 @@ double getDefaultCharWidth( ScDocShell* pDocShell )
 }
 
 uno::Any SAL_CALL
-ScVbaRange::getColumnWidth() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getColumnWidth()
 {
     sal_Int32 nLen = m_Areas->getCount();
     if ( nLen > 1 )
@@ -3809,7 +3806,7 @@ ScVbaRange::getColumnWidth() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::setColumnWidth( const uno::Any& _columnwidth )
 {
     sal_Int32 nLen = m_Areas->getCount();
     if ( nLen > 1 )
@@ -3841,7 +3838,7 @@ ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeEx
 }
 
 uno::Any SAL_CALL
-ScVbaRange::getWidth() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getWidth()
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -3862,7 +3859,7 @@ ScVbaRange::getWidth() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-ScVbaRange::Areas( const uno::Any& item) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Areas( const uno::Any& item)
 {
     if ( !item.hasValue() )
         return uno::makeAny( m_Areas );
@@ -3870,7 +3867,7 @@ ScVbaRange::Areas( const uno::Any& item) throw (uno::RuntimeException, std::exce
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException )
+ScVbaRange::getArea( sal_Int32 nIndex )
 {
     if ( !m_Areas.is() )
         throw uno::RuntimeException("No areas available" );
@@ -3879,7 +3876,7 @@ ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException )
 }
 
 uno::Any
-ScVbaRange::Borders( const uno::Any& item ) throw( script::BasicErrorException, uno::RuntimeException )
+ScVbaRange::Borders( const uno::Any& item )
 {
     if ( !item.hasValue() )
         return uno::makeAny( getBorders() );
@@ -3888,7 +3885,7 @@ ScVbaRange::Borders( const uno::Any& item ) throw( script::BasicErrorException,
 
 uno::Any SAL_CALL
 ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& Weight,
-                const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException, std::exception)
+                const css::uno::Any& ColorIndex, const css::uno::Any& Color )
 {
     sal_Int32 nCount = getBorders()->getCount();
 
@@ -3935,7 +3932,6 @@ ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& W
 
 uno::Any SAL_CALL
 ScVbaRange::getRowHeight()
-    throw (uno::RuntimeException, std::exception)
 {
     sal_Int32 nLen = m_Areas->getCount();
     if ( nLen > 1 )
@@ -3974,7 +3970,7 @@ ScVbaRange::getRowHeight()
 }
 
 void SAL_CALL
-ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeException, std::exception)
+ScVbaRange::setRowHeight( const uno::Any& _rowheight)
 {
     sal_Int32 nLen = m_Areas->getCount();
     if ( nLen > 1 )
@@ -4000,7 +3996,7 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti
 }
 
 uno::Any SAL_CALL
-ScVbaRange::getPageBreak() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getPageBreak()
 {
     sal_Int32 nPageBreak = excel::XlPageBreak::xlPageBreakNone;
     ScDocShell* pShell = getDocShellFromRange( mxRange );
@@ -4036,7 +4032,7 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeException, std::exception)
+ScVbaRange::setPageBreak( const uno::Any& _pagebreak)
 {
     sal_Int32 nPageBreak = 0;
     _pagebreak >>= nPageBreak;
@@ -4067,7 +4063,7 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti
 }
 
 uno::Any SAL_CALL
-ScVbaRange::getHeight() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getHeight()
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -4088,7 +4084,7 @@ ScVbaRange::getHeight() throw (uno::RuntimeException, std::exception)
 }
 
 awt::Point
-ScVbaRange::getPosition() throw ( uno::RuntimeException )
+ScVbaRange::getPosition()
 {
     awt::Point aPoint;
     uno::Reference< beans::XPropertySet > xProps;
@@ -4100,7 +4096,7 @@ ScVbaRange::getPosition() throw ( uno::RuntimeException )
     return aPoint;
 }
 uno::Any SAL_CALL
-ScVbaRange::getLeft() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getLeft()
 {
     // helperapi returns the first ranges left ( and top below )
     if ( m_Areas->getCount() > 1 )
@@ -4110,7 +4106,7 @@ ScVbaRange::getLeft() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-ScVbaRange::getTop() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getTop()
 {
     // helperapi returns the first ranges top
     if ( m_Areas->getCount() > 1 )
@@ -4143,7 +4139,7 @@ uno::Reference< sheet::XCellRangeReferrer > getNamedRange( const uno::Reference<
 }
 
 uno::Reference< excel::XName >
-ScVbaRange::getName() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getName()
 {
     uno::Reference< beans::XPropertySet > xProps( getUnoModel(), uno::UNO_QUERY );
     uno::Reference< table::XCellRange > thisRange( getCellRange(), uno::UNO_QUERY_THROW );
@@ -4170,7 +4166,7 @@ ScVbaRange::getName() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< excel::XWorksheet >
-ScVbaRange::getWorksheet() throw (uno::RuntimeException, std::exception)
+ScVbaRange::getWorksheet()
 {
     // #TODO #FIXME parent should always be set up ( currently thats not
     // the case )
@@ -4195,7 +4191,7 @@ ScVbaRange::getWorksheet() throw (uno::RuntimeException, std::exception)
 // #TODO remove this ugly application processing
 // Process an application Range request e.g. 'Range("a1,b2,a4:b6")
 uno::Reference< excel::XRange >
-ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception)
+ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 )
 {
     // Although the documentation seems clear that Range without a
     // qualifier then it's a shortcut for ActiveSheet.Range
@@ -4376,7 +4372,6 @@ static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference
 
 void SAL_CALL
 ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const uno::Any& Operator, const uno::Any& Criteria2, const uno::Any& /*VisibleDropDown*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     // Is there an existing autofilter
     RangeHelper thisRange( mxRange );
@@ -4621,7 +4616,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const
 }
 
 void SAL_CALL
-ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ )
 {
     // It appears ( from the web ) that the undocumented CopyOrigin
     // param should contain member of enum XlInsertFormatOrigin
@@ -4672,7 +4667,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) thro
 }
 
 void SAL_CALL
-ScVbaRange::Autofit() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::Autofit()
 {
     sal_Int32 nLen = m_Areas->getCount();
     if ( nLen > 1 )
@@ -4709,7 +4704,7 @@ ScVbaRange::Autofit() throw (script::BasicErrorException, uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::Hyperlinks( const uno::Any& aIndex )
 {
     /*  The range object always returns a new Hyperlinks object containing a
         fixed list of existing hyperlinks in the range.
@@ -4730,7 +4725,7 @@ ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException, s
 }
 
 css::uno::Reference< excel::XValidation > SAL_CALL
-ScVbaRange::getValidation() throw (css::uno::RuntimeException, std::exception)
+ScVbaRange::getValidation()
 {
     if ( !m_xValidation.is() )
         m_xValidation = new ScVbaValidation( this, mxContext, mxRange );
@@ -4740,7 +4735,7 @@ ScVbaRange::getValidation() throw (css::uno::RuntimeException, std::exception)
 namespace {
 
 /// @throws uno::RuntimeException
-sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCell >& rxCell ) throw (uno::RuntimeException)
+sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCell >& rxCell )
 {
     /*  TODO/FIXME: We need an apostroph-prefix property at the cell to
         implement this correctly. For now, return an apostroph for every text
@@ -4754,7 +4749,7 @@ sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCell >& rxCell ) thr
 }
 
 /// @throws uno::RuntimeException
-sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCellRange >& rxRange ) throw (uno::RuntimeException)
+sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCellRange >& rxRange )
 {
     /*  This implementation is able to handle different prefixes (needed if
         Application.TransitionNavigKeys is true). The function lclGetPrefixChar
@@ -4782,7 +4777,7 @@ sal_Unicode lclGetPrefixChar( const uno::Reference< table::XCellRange >& rxRange
 }
 
 /// @throws uno::RuntimeException
-sal_Unicode lclGetPrefixChar( const uno::Reference< sheet::XSheetCellRangeContainer >& rxRanges ) throw (uno::RuntimeException)
+sal_Unicode lclGetPrefixChar( const uno::Reference< sheet::XSheetCellRangeContainer >& rxRanges )
 {
     sal_Unicode cCurrPrefix = 0;
     uno::Reference< container::XEnumerationAccess > xRangesEA( rxRanges, uno::UNO_QUERY_THROW );
@@ -4806,7 +4801,7 @@ inline uno::Any lclGetPrefixVariant( sal_Unicode cPrefixChar )
 
 } // namespace
 
-uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaRange::getPrefixCharacter()
 {
     /*  (1) If Application.TransitionNavigKeys is false, this function returns
         an apostroph character if the text cell begins with an apostroph
@@ -4831,7 +4826,7 @@ uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException,
     throw uno::RuntimeException("Unexpected empty Range object" );
 }
 
-uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException, std::exception)
+uno::Any ScVbaRange::getShowDetail()
 {
     // #FIXME, If the specified range is in a PivotTable report
 
@@ -4869,7 +4864,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException, std::ex
     return aNULL();
 }
 
-void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::RuntimeException, std::exception)
+void ScVbaRange::setShowDetail(const uno::Any& aShowDetail)
 {
     // #FIXME, If the specified range is in a PivotTable report
 
@@ -4905,7 +4900,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::MergeArea()
 {
     uno::Reference< sheet::XSheetCellRange > xMergeShellCellRange(mxRange->getCellRangeByPosition(0,0,0,0), uno::UNO_QUERY_THROW);
     uno::Reference< sheet::XSheetCellCursor > xMergeSheetCursor(xMergeShellCellRange->getSpreadsheet()->createCursorByRange( xMergeShellCellRange ), uno::UNO_QUERY_THROW);
@@ -4934,7 +4929,7 @@ ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeExceptio
 }
 
 void SAL_CALL
-ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName )
 {
     ScDocShell* pShell = nullptr;
 
@@ -4968,7 +4963,7 @@ ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any&
 }
 
 void SAL_CALL
-ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const uno::Any& Type ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const uno::Any& Type )
 {
     uno::Reference< excel::XRange > xDest( Destination, uno::UNO_QUERY_THROW );
     ScVbaRange* pRange = getImplementation( xDest );
@@ -5083,7 +5078,7 @@ ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const
                                    nCount, fStep, fEndValue, true, true );
 }
 sal_Bool SAL_CALL
-ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange >& ChangingCell ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange >& ChangingCell )
 {
     ScDocShell* pDocShell = getScDocShell();
     bool bRes = true;
@@ -5113,13 +5108,13 @@ ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange
 }
 
 void
-ScVbaRange::Calculate(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::Calculate(  )
 {
     getWorksheet()->Calculate();
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::Item( const uno::Any& row, const uno::Any& column )
 {
     if ( mbIsRows || mbIsColumns )
     {
@@ -5136,7 +5131,7 @@ ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::B
 }
 
 void
-ScVbaRange::AutoOutline(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::AutoOutline(  )
 {
     // #TODO #FIXME needs to check for summary row/col ( whatever they are )
     // not valid for multi Area Addresses
@@ -5160,7 +5155,7 @@ ScVbaRange::AutoOutline(  ) throw (script::BasicErrorException, uno::RuntimeExce
 }
 
 void SAL_CALL
-ScVbaRange:: ClearOutline(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange:: ClearOutline(  )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -5178,7 +5173,7 @@ ScVbaRange:: ClearOutline(  ) throw (script::BasicErrorException, uno::RuntimeEx
 }
 
 void
-ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, uno::RuntimeException )
+ScVbaRange::groupUnGroup( bool bUnGroup )
 {
     if ( m_Areas->getCount() > 1 )
          DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
@@ -5195,24 +5190,24 @@ ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, u
 }
 
 void SAL_CALL
-ScVbaRange::Group(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::Group(  )
 {
     groupUnGroup(false);
 }
 void SAL_CALL
-ScVbaRange::Ungroup(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::Ungroup(  )
 {
     groupUnGroup(true);
 }
 
 /// @throws uno::RuntimeException
-static void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, bool _bMerge ) throw ( uno::RuntimeException )
+static void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, bool _bMerge )
 {
         uno::Reference< util::XMergeable > xMergeable( xCellRange, uno::UNO_QUERY_THROW );
         xMergeable->merge(_bMerge);
 }
 void SAL_CALL
-ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::Merge( const uno::Any& Across )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -5241,7 +5236,7 @@ ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException,
 }
 
 void SAL_CALL
-ScVbaRange::UnMerge(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::UnMerge(  )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -5257,7 +5252,7 @@ ScVbaRange::UnMerge(  ) throw (script::BasicErrorException, uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-ScVbaRange::getStyle() throw (css::script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::getStyle()
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -5273,7 +5268,7 @@ ScVbaRange::getStyle() throw (css::script::BasicErrorException, uno::RuntimeExce
     return uno::makeAny( xStyle );
 }
 void SAL_CALL
-ScVbaRange::setStyle( const uno::Any& _style ) throw (uno::RuntimeException, std::exception)
+ScVbaRange::setStyle( const uno::Any& _style )
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -5317,7 +5312,7 @@ ScVbaRange::PreviousNext( bool bIsPrevious )
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::Next()
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -5328,7 +5323,7 @@ ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException, st
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::Previous()
 {
     if ( m_Areas->getCount() > 1 )
     {
@@ -5340,8 +5335,6 @@ ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException
 
 uno::Reference< excel::XRange > SAL_CALL
 ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue)
-    throw (script::BasicErrorException, uno::RuntimeException,
-           std::exception)
 {
     bool bIsSingleCell = isSingleCellRange();
     bool bIsMultiArea = ( m_Areas->getCount() > 1 );
@@ -5422,7 +5415,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue)
 }
 
 /// @throws script::BasicErrorException
-static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::BasicErrorException )
+static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType)
 {
     sal_Int32 nType = excel::XlSpecialCellsValue::xlNumbers;
     aType >>= nType;
@@ -5450,7 +5443,7 @@ static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script
 }
 
 uno::Reference< excel::XRange >
-ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( script::BasicErrorException )
+ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue)
 {
     uno::Reference< excel::XRange > xRange;
     try
@@ -5506,14 +5499,14 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw (
 }
 
 void SAL_CALL
-ScVbaRange::RemoveSubtotal(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::RemoveSubtotal(  )
 {
     uno::Reference< sheet::XSubTotalCalculatable > xSub( mxRange, uno::UNO_QUERY_THROW );
     xSub->removeSubTotals();
 }
 
 void SAL_CALL
-ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::Sequence< ::sal_Int32 >& _nTotalList, const uno::Any& aReplace, const uno::Any& PageBreaks, const uno::Any& /*SummaryBelowData*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::Sequence< ::sal_Int32 >& _nTotalList, const uno::Any& aReplace, const uno::Any& PageBreaks, const uno::Any& /*SummaryBelowData*/ )
 {
     try
     {
@@ -5602,7 +5595,7 @@ ScVbaRange::getServiceNames()
 }
 
 sal_Bool SAL_CALL
-ScVbaRange::hasError() throw (uno::RuntimeException, std::exception)
+ScVbaRange::hasError()
 {
     double dResult = 0.0;
     uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 958d43b27abb..73cd9de39ea5 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -88,79 +88,77 @@ class ScVbaRange : public ScVbaRange_BASE
     bool mbIsColumns;
     css::uno::Reference< ov::excel::XValidation > m_xValidation;
     /// @throws css::uno::RuntimeException
-    double getCalcColWidth(const css::table::CellRangeAddress&)
-        throw (css::uno::RuntimeException, std::exception);
+    double getCalcColWidth(const css::table::CellRangeAddress&);
     /// @throws css::uno::RuntimeException
-    double getCalcRowHeight(const css::table::CellRangeAddress&)
-        throw (css::uno::RuntimeException, std::exception);
+    double getCalcRowHeight(const css::table::CellRangeAddress&);
     void visitArray( ArrayVisitor& vistor );
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn ) throw( css::uno::RuntimeException );
+    css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn );
 
     /// @throws css::uno::RuntimeException
-    void fillSeries(  css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( css::uno::RuntimeException );
+    void fillSeries(  css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue );
 
     /// @throws css::uno::RuntimeException
-    void ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (css::uno::RuntimeException);
+    void ClearContents( sal_Int32 nFlags, bool bFireEvent );
 
     /// @throws css::uno::RuntimeException
-    css::uno::Any getValue( ValueGetter& rValueGetter ) throw (css::uno::RuntimeException);
+    css::uno::Any getValue( ValueGetter& rValueGetter );
     /// @throws css::uno::RuntimeException
-    void setValue( const css::uno::Any& aValue, ValueSetter& setter ) throw ( css::uno::RuntimeException);
+    void setValue( const css::uno::Any& aValue, ValueSetter& setter );
 
     /// @throws css::uno::RuntimeException
-    css::uno::Any getFormulaValue( formula::FormulaGrammar::Grammar ) throw (css::uno::RuntimeException);
+    css::uno::Any getFormulaValue( formula::FormulaGrammar::Grammar );
     /// @throws css::uno::RuntimeException
-    void setFormulaValue( const css::uno::Any& aValue, formula::FormulaGrammar::Grammar ) throw ( css::uno::RuntimeException);
+    void setFormulaValue( const css::uno::Any& aValue, formula::FormulaGrammar::Grammar );
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ov::excel::XRange > getArea( sal_Int32 nIndex  ) throw( css::uno::RuntimeException );
+    css::uno::Reference< ov::excel::XRange > getArea( sal_Int32 nIndex  );
     /// @throws css::uno::RuntimeException
-    ScCellRangeObj* getCellRangeObj( )  throw ( css::uno::RuntimeException );
+    ScCellRangeObj* getCellRangeObj( );
     css::uno::Reference< ov::XCollection >& getBorders();
     /// @throws css::uno::RuntimeException
-    void groupUnGroup( bool bUnGroup ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
+    void groupUnGroup( bool bUnGroup );
      css::uno::Reference< ov::excel::XRange > PreviousNext( bool bIsPrevious );
      /// @throws css::script::BasicErrorException
-     css::uno::Reference< ov::excel::XRange > SpecialCellsImpl( sal_Int32 nType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException );
+     css::uno::Reference< ov::excel::XRange > SpecialCellsImpl( sal_Int32 nType, const css::uno::Any& _oValue);
     /// @throws css::uno::RuntimeException
-    css::awt::Point getPosition() throw ( css::uno::RuntimeException );
+    css::awt::Point getPosition();
 
     /** Fires a Worksheet_Change event for this range or range list. */
     void fireChangeEvent();
 
 protected:
-    virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ) override;
+    virtual ScCellRangesBase* getCellRangesBase() override;
     /// @throws css::uno::RuntimeException
-    SfxItemSet* getCurrentDataSet() throw (css::uno::RuntimeException, std::exception);
+    SfxItemSet* getCurrentDataSet();
 public:
     /// @throws css::lang::IllegalArgumentException
-    ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException );
+    ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false );
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XSheetCellRangeContainer >& xRanges, bool bIsRows = false, bool bIsColumns = false );
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    ScVbaRange( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    ScVbaRange( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
 
     /// @throws css::uno::RuntimeException
-    ScDocument& getScDocument() throw (css::uno::RuntimeException);
+    ScDocument& getScDocument();
     /// @throws css::uno::RuntimeException
-    ScDocShell* getScDocShell() throw (css::uno::RuntimeException);
+    ScDocShell* getScDocShell();
 
     /** Returns the ScVbaRange implementation object for the passed VBA Range object. */
     static ScVbaRange* getImplementation( const css::uno::Reference< ov::excel::XRange >& rxRange );
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::frame::XModel > getUnoModel() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::frame::XModel > getUnoModel();
     /// @throws css::uno::RuntimeException
-    static css::uno::Reference< css::frame::XModel > getUnoModel( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException);
+    static css::uno::Reference< css::frame::XModel > getUnoModel( const css::uno::Reference< ov::excel::XRange >& rxRange );
 
     /// @throws css::uno::RuntimeException
-    const ScRangeList& getScRangeList() throw (css::uno::RuntimeException);
+    const ScRangeList& getScRangeList();
     /// @throws css::uno::RuntimeException
-    static const ScRangeList& getScRangeList( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException);
+    static const ScRangeList& getScRangeList( const css::uno::Reference< ov::excel::XRange >& rxRange );
 
     virtual ~ScVbaRange() override;
      virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() override { return this; }
@@ -170,145 +168,138 @@ public:
     static css::uno::Reference< ov::excel::XRange > getRangeObjectForName(
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const OUString& sRangeName, ScDocShell* pDocSh,
-        formula::FormulaGrammar::AddressConvention eConv  ) throw ( css::uno::RuntimeException, std::exception );
+        formula::FormulaGrammar::AddressConvention eConv  );
 
     /// @throws css::uno::RuntimeException
     static css::uno::Reference< ov::excel::XRange > CellsHelper(
         const css::uno::Reference< ov::XHelperInterface >& xParent,
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const css::uno::Reference< css::table::XCellRange >& xRange,
-        const css::uno::Any &nRowIndex, const css::uno::Any &nColumnIndex ) throw(css::uno::RuntimeException);
+        const css::uno::Any &nRowIndex, const css::uno::Any &nColumnIndex );
 
     // Attributes
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void   SAL_CALL setValue( const css::uno::Any& aValue ) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void   SAL_CALL setFormula( const css::uno::Any& rFormula ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getFormulaArray() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void   SAL_CALL setFormulaArray(const css::uno::Any& rFormula) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getFormulaR1C1() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void   SAL_CALL setFormulaR1C1( const css::uno::Any &rFormula ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getRow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getColumn() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void   SAL_CALL setValue( const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getFormula() override;
+    virtual void   SAL_CALL setFormula( const css::uno::Any& rFormula ) override;
+    virtual css::uno::Any SAL_CALL getFormulaArray() override;
+    virtual void   SAL_CALL setFormulaArray(const css::uno::Any& rFormula) override;
+    virtual css::uno::Any SAL_CALL getFormulaR1C1() override;
+    virtual void   SAL_CALL setFormulaR1C1( const css::uno::Any &rFormula ) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual ::sal_Int32 SAL_CALL getRow() override;
+    virtual ::sal_Int32 SAL_CALL getColumn() override;
+    virtual OUString SAL_CALL getText() override;
     using ScVbaRange_BASE::setNumberFormat;
-    virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL getNumberFormat() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMergeCells( const css::uno::Any& bMerge ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL getMergeCells() throw (css::script::BasicErrorException, css::uno::RuntimeException) override;
-    virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL getWrapText() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireRow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireColumn() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XComment > SAL_CALL getComment() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getHidden() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getColumnWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getRowHeight()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getHeight()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPageBreak() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPrefixCharacter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) override;
+    virtual css::uno::Any SAL_CALL getNumberFormat() override;
+    virtual void SAL_CALL setMergeCells( const css::uno::Any& bMerge ) override;
+    virtual css::uno::Any SAL_CALL getMergeCells() override;
+    virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) override;
+    virtual css::uno::Any SAL_CALL getWrapText() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireRow() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireColumn() override;
+    virtual css::uno::Reference< ov::excel::XComment > SAL_CALL getComment() override;
+    virtual css::uno::Any SAL_CALL getHidden() override;
+    virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) override;
+    virtual css::uno::Any SAL_CALL getColumnWidth() override;
+    virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) override;
+    virtual css::uno::Any SAL_CALL getRowHeight() override;
+    virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) override;
+    virtual css::uno::Any SAL_CALL getWidth() override;
+    virtual css::uno::Any SAL_CALL getHeight() override;
+    virtual css::uno::Any SAL_CALL getTop() override;
+    virtual css::uno::Any SAL_CALL getLeft() override;
+
+    virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() override;
+    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() override;
+    virtual css::uno::Any SAL_CALL getPageBreak() override;
+    virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) override;
+    virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() override;
+    virtual css::uno::Any SAL_CALL getPrefixCharacter() override;
+    virtual css::uno::Any SAL_CALL getShowDetail() override;
+    virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) override;
     // Methods
-    virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Clear() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ClearComments() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ClearContents() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ClearFormats() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL HasFormula() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL FillLeft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL FillRight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL FillUp() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL FillDown() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset )
-                                                           throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount )
-                                                 throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol )
-                                                          throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange >  SAL_CALL Rows( const css::uno::Any& nIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange >  SAL_CALL Columns( const css::uno::Any &nIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Copy( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Cut( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Resize( const css::uno::Any& RowSize, const css::uno::Any& ColumnSize )
-                                                           throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException) override;
-    virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior(  ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) override ;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) override;
+    virtual void SAL_CALL Clear() override;
+    virtual void SAL_CALL ClearComments() override;
+    virtual void SAL_CALL ClearContents() override;
+    virtual void SAL_CALL ClearFormats() override;
+    virtual css::uno::Any SAL_CALL HasFormula() override;
+    virtual void SAL_CALL FillLeft() override;
+    virtual void SAL_CALL FillRight() override;
+    virtual void SAL_CALL FillUp() override;
+    virtual void SAL_CALL FillDown() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() override;
+    virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) override;
+
+    virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) override;
+
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) override;
+    virtual void SAL_CALL Select() override;
+    virtual void SAL_CALL Activate() override;
+    virtual css::uno::Reference< ov::excel::XRange >  SAL_CALL Rows( const css::uno::Any& nIndex ) override;
+    virtual css::uno::Reference< ov::excel::XRange >  SAL_CALL Columns( const css::uno::Any &nIndex ) override;
+    virtual void SAL_CALL Copy( const css::uno::Any& Destination ) override;
+    virtual void SAL_CALL Cut( const css::uno::Any& Destination ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Resize( const css::uno::Any& RowSize, const css::uno::Any& ColumnSize ) override;
+    virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() override;
+    virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior(  ) override ;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) override;
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException, std::exception);
-    virtual css::uno::Any SAL_CALL getCellRange(  ) throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab );
+    virtual css::uno::Any SAL_CALL getCellRange(  ) override;
     /// @throws css::uno::RuntimeException
-    static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException);
-    virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod,  const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction )  throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete( const css::uno::Any& Shift ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) override;
+    static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange );
+    virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) override;
+    virtual sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) override;
+    virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod,  const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) override;
+    virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) override;
+    virtual void SAL_CALL Delete( const css::uno::Any& Shift ) override;
+    virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) override;
+    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) override;
     virtual css::uno::Any SAL_CALL BorderAround( const css::uno::Any& LineStyle,
-                const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL AutoFilter( const css::uno::Any& Field, const css::uno::Any& Criteria1, const css::uno::Any& Operator, const css::uno::Any& Criteria2, const css::uno::Any& VisibleDropDown )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Autofit() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception) override ;
-     void SAL_CALL Calculate(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL AutoOutline(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ClearOutline(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Ungroup(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Group(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Merge( const css::uno::Any& Across ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL UnMerge(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getStyle() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Next() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL RemoveSubtotal(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL MergeArea() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Subtotal( ::sal_Int32 GroupBy, ::sal_Int32 Function, const css::uno::Sequence< ::sal_Int32 >& TotalList, const css::uno::Any& Replace, const css::uno::Any& PageBreaks, const css::uno::Any& SummaryBelowData ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+                const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) override;
+    virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) override;
+
+    virtual void SAL_CALL AutoFilter( const css::uno::Any& Field, const css::uno::Any& Criteria1, const css::uno::Any& Operator, const css::uno::Any& Criteria2, const css::uno::Any& VisibleDropDown ) override;
+    virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) override;
+    virtual void SAL_CALL Autofit() override;
+    virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) override;
+    virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) override ;
+     void SAL_CALL Calculate(  ) override;
+    virtual void SAL_CALL AutoOutline(  ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) override;
+    virtual void SAL_CALL ClearOutline(  ) override;
+    virtual void SAL_CALL Ungroup(  ) override;
+    virtual void SAL_CALL Group(  ) override;
+    virtual void SAL_CALL Merge( const css::uno::Any& Across ) override;
+    virtual void SAL_CALL UnMerge(  ) override;
+    virtual css::uno::Any SAL_CALL getStyle() override;
+    virtual void SAL_CALL setStyle( const css::uno::Any& _style ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Next() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() override;
+    virtual void SAL_CALL RemoveSubtotal(  ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL MergeArea() override;
+    virtual void SAL_CALL Subtotal( ::sal_Int32 GroupBy, ::sal_Int32 Function, const css::uno::Sequence< ::sal_Int32 >& TotalList, const css::uno::Any& Replace, const css::uno::Any& PageBreaks, const css::uno::Any& SummaryBelowData ) override;
 
     // XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Type SAL_CALL getElementType() override
     {
         return cppu::UnoType<ov::excel::XRange>::get();
 
     }
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements() override;
     // XDefaultMethod
-    OUString SAL_CALL getDefaultMethodName(  ) throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getDefaultMethodName(  ) override;
         // XDefaultProperty
-        OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+        OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
 
 // #TODO completely rewrite ScVbaRange, it's become a hackfest
 // it needs to be closer to ScCellRangeBase in that the underlying
@@ -318,13 +309,12 @@ public:
 //     * object should be a lightweight as possible
 //     * we shouldn't need hacks like this below
     /// @throws css::uno::RuntimeException
-    static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception);
+    static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 );
     static bool getCellRangesForAddress(ScRefFlags &rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter );
-    virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue)
-        throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) override;
     // XErrorQuery
-    virtual sal_Bool SAL_CALL hasError(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasError(  ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
@@ -333,8 +323,7 @@ public:
 /// @throws css::uno::RuntimeException
 bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange,
                                ScRangeList& aCellRanges,
-                               formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 )
-    throw ( css::uno::RuntimeException );
+                               formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 );
 
 #endif // INCLUDED_SC_SOURCE_UI_VBA_VBARANGE_HXX
 
diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx
index 889754fea7b4..7764a137d148 100644
--- a/sc/source/ui/vba/vbasheetobject.cxx
+++ b/sc/source/ui/vba/vbasheetobject.cxx
@@ -42,7 +42,7 @@ ScVbaButtonCharacters::ScVbaButtonCharacters(
         const uno::Reference< beans::XPropertySet >& rxPropSet,
         const ScVbaPalette& rPalette,
         const uno::Any& rStart,
-        const uno::Any& rLength ) throw (uno::RuntimeException) :
+        const uno::Any& rLength ) :
     ScVbaButtonCharacters_BASE( rxParent, rxContext ),
     maPalette( rPalette ),
     mxPropSet( rxPropSet, uno::UNO_SET_THROW )
@@ -63,7 +63,7 @@ ScVbaButtonCharacters::~ScVbaButtonCharacters()
 
 // XCharacters attributes
 
-OUString SAL_CALL ScVbaButtonCharacters::getCaption() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaButtonCharacters::getCaption()
 {
     // ignore invalid mnStart and/or mnLength members
     OUString aString = getFullString();
@@ -72,7 +72,7 @@ OUString SAL_CALL ScVbaButtonCharacters::getCaption() throw (uno::RuntimeExcepti
     return aString.copy( nStart, nLength );
 }
 
-void SAL_CALL ScVbaButtonCharacters::setCaption( const OUString& rCaption ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButtonCharacters::setCaption( const OUString& rCaption )
 {
     /*  Replace the covered text with the passed text, ignore invalid mnStart
         and/or mnLength members. This operation does not affect the mnLength
@@ -87,37 +87,37 @@ void SAL_CALL ScVbaButtonCharacters::setCaption( const OUString& rCaption ) thro
     setFullString( aString.replaceAt( nStart, nLength, rCaption ) );
 }
 
-sal_Int32 SAL_CALL ScVbaButtonCharacters::getCount() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaButtonCharacters::getCount()
 {
     // always return the total length of the caption
     return getFullString().getLength();
 }
 
-OUString SAL_CALL ScVbaButtonCharacters::getText() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaButtonCharacters::getText()
 {
     // Text attribute same as Caption attribute?
     return getCaption();
 }
 
-void SAL_CALL ScVbaButtonCharacters::setText( const OUString& rText ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButtonCharacters::setText( const OUString& rText )
 {
     // Text attribute same as Caption attribute?
     setCaption( rText );
 }
 
-uno::Reference< excel::XFont > SAL_CALL ScVbaButtonCharacters::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< excel::XFont > SAL_CALL ScVbaButtonCharacters::getFont()
 {
     return new ScVbaFont( this, mxContext, maPalette, mxPropSet, nullptr, true );
 }
 
-void SAL_CALL ScVbaButtonCharacters::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButtonCharacters::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ )
 {
     // TODO
 }
 
 // XCharacters methods
 
-void SAL_CALL ScVbaButtonCharacters::Insert( const OUString& rString ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButtonCharacters::Insert( const OUString& rString )
 {
     /*  The Insert() operation is in fact "replace covered characters", at
         least for buttons... It seems there is no easy way to really insert a
@@ -125,7 +125,7 @@ void SAL_CALL ScVbaButtonCharacters::Insert( const OUString& rString ) throw (un
     setCaption( rString );
 }
 
-void SAL_CALL ScVbaButtonCharacters::Delete() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButtonCharacters::Delete()
 {
     /*  The Delete() operation is nothing else than "replace with empty string".
         This does not affect the mnLength parameter, multiple calls of Delete()
@@ -140,12 +140,12 @@ VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButtonCharacters, "ooo.vba.excel.Character
 
 // private
 
-OUString ScVbaButtonCharacters::getFullString() const throw (uno::RuntimeException)
+OUString ScVbaButtonCharacters::getFullString() const
 {
     return mxPropSet->getPropertyValue( "Label" ).get< OUString >();
 }
 
-void ScVbaButtonCharacters::setFullString( const OUString& rString ) throw (uno::RuntimeException)
+void ScVbaButtonCharacters::setFullString( const OUString& rString )
 {
     mxPropSet->setPropertyValue( "Label", uno::Any( rString ) );
 }
@@ -154,7 +154,7 @@ ScVbaSheetObjectBase::ScVbaSheetObjectBase(
         const uno::Reference< XHelperInterface >& rxParent,
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Reference< frame::XModel >& rxModel,
-        const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) :
+        const uno::Reference< drawing::XShape >& rxShape ) :
     ScVbaSheetObject_BASE( rxParent, rxContext ),
     maPalette( rxModel ),
     mxModel( rxModel, uno::UNO_SET_THROW ),
@@ -165,65 +165,65 @@ ScVbaSheetObjectBase::ScVbaSheetObjectBase(
 
 // XSheetObject attributes
 
-double SAL_CALL ScVbaSheetObjectBase::getLeft() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaSheetObjectBase::getLeft()
 {
     return HmmToPoints( mxShape->getPosition().X );
 }
 
-void SAL_CALL ScVbaSheetObjectBase::setLeft( double fLeft ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaSheetObjectBase::setLeft( double fLeft )
 {
     if( fLeft < 0.0 )
         throw uno::RuntimeException();
     mxShape->setPosition( awt::Point( PointsToHmm( fLeft ), mxShape->getPosition().Y ) );
 }
 
-double SAL_CALL ScVbaSheetObjectBase::getTop() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaSheetObjectBase::getTop()
 {
     return HmmToPoints( mxShape->getPosition().Y );
 }
 
-void SAL_CALL ScVbaSheetObjectBase::setTop( double fTop ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaSheetObjectBase::setTop( double fTop )
 {
     if( fTop < 0.0 )
         throw uno::RuntimeException();
     mxShape->setPosition( awt::Point( mxShape->getPosition().X, PointsToHmm( fTop ) ) );
 }
 
-double SAL_CALL ScVbaSheetObjectBase::getWidth() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaSheetObjectBase::getWidth()
 {
     return HmmToPoints( mxShape->getSize().Width );
 }
 
-void SAL_CALL ScVbaSheetObjectBase::setWidth( double fWidth ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaSheetObjectBase::setWidth( double fWidth )
 {
     if( fWidth <= 0.0 )
         throw uno::RuntimeException();
     mxShape->setSize( awt::Size( PointsToHmm( fWidth ), mxShape->getSize().Height ) );
 }
 
-double SAL_CALL ScVbaSheetObjectBase::getHeight() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaSheetObjectBase::getHeight()
 {
     return HmmToPoints( mxShape->getSize().Height );
 }
 
-void SAL_CALL ScVbaSheetObjectBase::setHeight( double fHeight ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaSheetObjectBase::setHeight( double fHeight )
 {
     if( fHeight <= 0.0 )
         throw uno::RuntimeException();
     mxShape->setSize( awt::Size( mxShape->getSize().Width, PointsToHmm( fHeight ) ) );
 }
 
-OUString SAL_CALL ScVbaSheetObjectBase::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaSheetObjectBase::getName()
 {
     return mxShapeProps->getPropertyValue( "Name" ).get< OUString >();
 }
 
-void SAL_CALL ScVbaSheetObjectBase::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaSheetObjectBase::setName( const OUString& rName )
 {
     mxShapeProps->setPropertyValue( "Name", uno::Any( rName ) );
 }
 
-sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement()
 {
     sal_Int32 nRet = excel::XlPlacement::xlMoveAndSize;
 #if 0 // TODO: not working at the moment.
@@ -242,7 +242,7 @@ sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() throw (uno::RuntimeExcep
     return nRet;
 }
 
-void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ )
 {
 #if 0 // TODO: not working at the moment.
     SvxShape* pShape = SvxShape::getImplementation( mxShape );
@@ -263,27 +263,27 @@ void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) thr
 #endif
 }
 
-sal_Bool SAL_CALL ScVbaSheetObjectBase::getPrintObject() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaSheetObjectBase::getPrintObject()
 {
     // not supported
     return true;
 }
 
-void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ )
 {
     // not supported
 }
 
 // private
 
-void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex ) throw (uno::RuntimeException)
+void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex )
 {
     OUString aName = OUStringBuffer( implGetBaseName() ).append( ' ' ).append( nIndex + 1 ).makeStringAndClear();
     setName( aName );
     implSetDefaultProperties();
 }
 
-void ScVbaSheetObjectBase::implSetDefaultProperties() throw (uno::RuntimeException)
+void ScVbaSheetObjectBase::implSetDefaultProperties()
 {
 }
 
@@ -293,7 +293,7 @@ ScVbaControlObjectBase::ScVbaControlObjectBase(
         const uno::Reference< frame::XModel >& rxModel,
         const uno::Reference< container::XIndexContainer >& rxFormIC,
         const uno::Reference< drawing::XControlShape >& rxControlShape,
-        ListenerType eListenerType ) throw (uno::RuntimeException) :
+        ListenerType eListenerType ) :
     ScVbaControlObject_BASE( rxParent, rxContext, rxModel, uno::Reference< drawing::XShape >( rxControlShape, uno::UNO_QUERY_THROW ) ),
     mxFormIC( rxFormIC, uno::UNO_SET_THROW ),
     mxControlProps( rxControlShape->getControl(), uno::UNO_QUERY_THROW )
@@ -327,17 +327,17 @@ ScVbaControlObjectBase::ScVbaControlObjectBase(
 
 // XSheetObject attributes
 
-OUString SAL_CALL ScVbaControlObjectBase::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaControlObjectBase::getName()
 {
     return mxControlProps->getPropertyValue( "Name" ).get< OUString >();
 }
 
-void SAL_CALL ScVbaControlObjectBase::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControlObjectBase::setName( const OUString& rName )
 {
     mxControlProps->setPropertyValue( "Name", uno::Any( rName ) );
 }
 
-OUString SAL_CALL ScVbaControlObjectBase::getOnAction() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaControlObjectBase::getOnAction()
 {
     uno::Reference< script::XEventAttacherManager > xEventMgr( mxFormIC, uno::UNO_QUERY_THROW );
     sal_Int32 nIndex = getModelIndexInForm();
@@ -354,7 +354,7 @@ OUString SAL_CALL ScVbaControlObjectBase::getOnAction() throw (uno::RuntimeExcep
     return OUString();
 }
 
-void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName )
 {
     uno::Reference< script::XEventAttacherManager > xEventMgr( mxFormIC, uno::UNO_QUERY_THROW );
     sal_Int32 nIndex = getModelIndexInForm();
@@ -377,32 +377,32 @@ void SAL_CALL ScVbaControlObjectBase::setOnAction( const OUString& rMacroName )
     }
 }
 
-sal_Bool SAL_CALL ScVbaControlObjectBase::getPrintObject() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaControlObjectBase::getPrintObject()
 {
     return mxControlProps->getPropertyValue( "Printable" ).get<bool>();
 }
 
-void SAL_CALL ScVbaControlObjectBase::setPrintObject( sal_Bool bPrintObject ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControlObjectBase::setPrintObject( sal_Bool bPrintObject )
 {
     mxControlProps->setPropertyValue( "Printable", uno::Any( bPrintObject ) );
 }
 
 // XControlObject attributes
 
-sal_Bool SAL_CALL ScVbaControlObjectBase::getAutoSize() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaControlObjectBase::getAutoSize()
 {
     // not supported
     return false;
 }
 
-void SAL_CALL ScVbaControlObjectBase::setAutoSize( sal_Bool /*bAutoSize*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControlObjectBase::setAutoSize( sal_Bool /*bAutoSize*/ )
 {
     // not supported
 }
 
 // private
 
-sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const throw (uno::RuntimeException)
+sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const
 {
     for( sal_Int32 nIndex = 0, nCount = mxFormIC->getCount(); nIndex < nCount; ++nIndex )
     {
@@ -418,34 +418,34 @@ ScVbaButton::ScVbaButton(
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Reference< frame::XModel >& rxModel,
         const uno::Reference< container::XIndexContainer >& rxFormIC,
-        const uno::Reference< drawing::XControlShape >& rxControlShape ) throw (uno::RuntimeException) :
+        const uno::Reference< drawing::XControlShape >& rxControlShape ) :
     ScVbaButton_BASE( rxParent, rxContext, rxModel, rxFormIC, rxControlShape, LISTENER_ACTION )
 {
 }
 
 // XButton attributes
 
-OUString SAL_CALL ScVbaButton::getCaption() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaButton::getCaption()
 {
     return mxControlProps->getPropertyValue( "Label" ).get< OUString >();
 }
 
-void SAL_CALL ScVbaButton::setCaption( const OUString& rCaption ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButton::setCaption( const OUString& rCaption )
 {
     mxControlProps->setPropertyValue( "Label", uno::Any( rCaption ) );
 }
 
-uno::Reference< excel::XFont > SAL_CALL ScVbaButton::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< excel::XFont > SAL_CALL ScVbaButton::getFont()
 {
     return new ScVbaFont( this, mxContext, maPalette, mxControlProps, nullptr, true );
 }
 
-void SAL_CALL ScVbaButton::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButton::setFont( const uno::Reference< excel::XFont >& /*rxFont*/ )
 {
     // TODO
 }
 
-sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment()
 {
     switch( mxControlProps->getPropertyValue( "Align" ).get< sal_Int16 >() )
     {
@@ -456,7 +456,7 @@ sal_Int32 SAL_CALL ScVbaButton::getHorizontalAlignment() throw (uno::RuntimeExce
     return excel::Constants::xlCenter;
 }
 
-void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign )
 {
     sal_Int32 nAwtAlign = awt::TextAlign::CENTER;
     switch( nAlign )
@@ -469,7 +469,7 @@ void SAL_CALL ScVbaButton::setHorizontalAlignment( sal_Int32 nAlign ) throw (uno
     mxControlProps->setPropertyValue( "Align", uno::Any( static_cast< sal_Int16 >( nAwtAlign ) ) );
 }
 
-sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment()
 {
     switch( mxControlProps->getPropertyValue( "VerticalAlign" ).get< style::VerticalAlignment >() )
     {
@@ -481,7 +481,7 @@ sal_Int32 SAL_CALL ScVbaButton::getVerticalAlignment() throw (uno::RuntimeExcept
     return excel::Constants::xlCenter;
 }
 
-void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign )
 {
     style::VerticalAlignment eAwtAlign = style::VerticalAlignment_MIDDLE;
     switch( nAlign )
@@ -493,20 +493,20 @@ void SAL_CALL ScVbaButton::setVerticalAlignment( sal_Int32 nAlign ) throw (uno::
     mxControlProps->setPropertyValue( "VerticalAlign", uno::Any( eAwtAlign ) );
 }
 
-sal_Int32 SAL_CALL ScVbaButton::getOrientation() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaButton::getOrientation()
 {
     // not supported
     return excel::XlOrientation::xlHorizontal;
 }
 
-void SAL_CALL ScVbaButton::setOrientation( sal_Int32 /*nOrientation*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaButton::setOrientation( sal_Int32 /*nOrientation*/ )
 {
     // not supported
 }
 
 // XButton methods
 
-uno::Reference< excel::XCharacters > SAL_CALL ScVbaButton::Characters( const uno::Any& rStart, const uno::Any& rLength ) throw (uno::RuntimeException, std::exception)
+uno::Reference< excel::XCharacters > SAL_CALL ScVbaButton::Characters( const uno::Any& rStart, const uno::Any& rLength )
 {
     return new ScVbaButtonCharacters( this, mxContext, mxControlProps, maPalette, rStart, rLength );
 }
@@ -522,7 +522,7 @@ OUString ScVbaButton::implGetBaseName() const
     return OUString( "Button" );
 }
 
-void ScVbaButton::implSetDefaultProperties() throw (uno::RuntimeException)
+void ScVbaButton::implSetDefaultProperties()
 {
     setCaption( getName() );
 }
diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx
index 5c1a7200d44f..721bcf99a243 100644
--- a/sc/source/ui/vba/vbasheetobject.hxx
+++ b/sc/source/ui/vba/vbasheetobject.hxx
@@ -45,30 +45,30 @@ public:
         const css::uno::Reference< css::beans::XPropertySet >& rxPropSet,
         const ScVbaPalette& rPalette,
         const css::uno::Any& rStart,
-        const css::uno::Any& rLength ) throw (css::uno::RuntimeException);
+        const css::uno::Any& rLength );
     virtual ~ScVbaButtonCharacters() override;
 
     // XCharacters attributes
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& rCaption ) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& rText ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() override;
+    virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) override;
 
     // XCharacters methods
-    virtual void SAL_CALL Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Insert( const OUString& rString ) override;
+    virtual void SAL_CALL Delete() override;
 
     // XHelperInterface
     VBAHELPER_DECL_XHELPERINTERFACE
 
 private:
     /// @throws css::uno::RuntimeException
-    OUString getFullString() const throw (css::uno::RuntimeException);
+    OUString getFullString() const;
     /// @throws css::uno::RuntimeException
-    void setFullString( const OUString& rString ) throw (css::uno::RuntimeException);
+    void setFullString( const OUString& rString );
 
 private:
     ScVbaPalette maPalette;
@@ -88,29 +88,29 @@ public:
         const css::uno::Reference< ov::XHelperInterface >& rxParent,
         const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         const css::uno::Reference< css::frame::XModel >& rxModel,
-        const css::uno::Reference< css::drawing::XShape >& rxShape ) throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::drawing::XShape >& rxShape );
 
     // XSheetObject attributes
-    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeft( double fLeft ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTop( double fTop ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidth( double fWidth ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeight( double fHeight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getPlacement() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getLeft() override;
+    virtual void SAL_CALL setLeft( double fLeft ) override;
+    virtual double SAL_CALL getTop() override;
+    virtual void SAL_CALL setTop( double fTop ) override;
+    virtual double SAL_CALL getWidth() override;
+    virtual void SAL_CALL setWidth( double fWidth ) override;
+    virtual double SAL_CALL getHeight() override;
+    virtual void SAL_CALL setHeight( double fHeight ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& rName ) override;
+    virtual sal_Int32 SAL_CALL getPlacement() override;
+    virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) override;
+    virtual sal_Bool SAL_CALL getPrintObject() override;
+    virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) override;
 
     /** Sets default properties after a new object has been created.
 
         @throws css::uno::RuntimeException
     */
-    void setDefaultProperties( sal_Int32 nIndex ) throw (css::uno::RuntimeException);
+    void setDefaultProperties( sal_Int32 nIndex );
 
 protected:
     /** Derived classes return the base name used for new objects. */
@@ -119,7 +119,7 @@ protected:
 
         @throws css::uno::RuntimeException
     */
-    virtual void implSetDefaultProperties() throw (css::uno::RuntimeException);
+    virtual void implSetDefaultProperties();
 
 protected:
     ScVbaPalette maPalette;
@@ -150,23 +150,23 @@ public:
         const css::uno::Reference< css::frame::XModel >& rxModel,
         const css::uno::Reference< css::container::XIndexContainer >& rxFormIC,
         const css::uno::Reference< css::drawing::XControlShape >& rxControlShape,
-        ListenerType eListenerType ) throw (css::uno::RuntimeException);
+        ListenerType eListenerType );
 
     // XSheetObject attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOnAction( const OUString& rMacroName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& rName ) override;
+    virtual OUString SAL_CALL getOnAction() override;
+    virtual void SAL_CALL setOnAction( const OUString& rMacroName ) override;
+    virtual sal_Bool SAL_CALL getPrintObject() override;
+    virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) override;
 
     // XControlObject attributes
-    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getAutoSize() override;
+    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) override;
 
 protected:
     /// @throws css::uno::RuntimeException
-    sal_Int32 getModelIndexInForm() const throw (css::uno::RuntimeException);
+    sal_Int32 getModelIndexInForm() const;
 
 protected:
     css::uno::Reference< css::container::XIndexContainer > mxFormIC;
@@ -186,30 +186,30 @@ public:
         const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         const css::uno::Reference< css::frame::XModel >& rxModel,
         const css::uno::Reference< css::container::XIndexContainer >& rxFormIC,
-        const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ) throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::drawing::XControlShape >& rxControlShape );
 
     // XButton attributes
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getHorizontalAlignment() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHorizontalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getVerticalAlignment() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& rCaption ) override;
+    virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() override;
+    virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) override;
+    virtual sal_Int32 SAL_CALL getHorizontalAlignment() override;
+    virtual void SAL_CALL setHorizontalAlignment( sal_Int32 nAlign ) override;
+    virtual sal_Int32 SAL_CALL getVerticalAlignment() override;
+    virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) override;
+    virtual sal_Int32 SAL_CALL getOrientation() override;
+    virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) override;
 
     // XButton methods
     css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters(
-        const css::uno::Any& rStart, const css::uno::Any& rLength ) throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& rStart, const css::uno::Any& rLength ) override;
 
     // XHelperInterface
     VBAHELPER_DECL_XHELPERINTERFACE
 
 protected:
     virtual OUString implGetBaseName() const override;
-    virtual void implSetDefaultProperties() throw (css::uno::RuntimeException) override;
+    virtual void implSetDefaultProperties() override;
 };
 
 #endif
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx
index 2ac40eb50176..ab8c102ced38 100644
--- a/sc/source/ui/vba/vbasheetobjects.cxx
+++ b/sc/source/ui/vba/vbasheetobjects.cxx
@@ -57,7 +57,7 @@ inline bool lclGetProperty( Type& orValue, const uno::Reference< beans::XPropert
 
     @throws uno::RuntimeException
 */
-inline double lclPointsToHmm( const uno::Any& rPoints ) throw (uno::RuntimeException)
+inline double lclPointsToHmm( const uno::Any& rPoints )
 {
     return PointsToHmm( ::rtl::math::approxFloor( rPoints.get< double >() / 0.75 ) * 0.75 );
 }
@@ -80,7 +80,7 @@ public:
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Reference< frame::XModel >& rxModel,
         const uno::Reference< sheet::XSpreadsheet >& rxSheet,
-        const uno::Type& rVbaType ) throw (uno::RuntimeException);
+        const uno::Type& rVbaType );
 
     /** Returns the VBA helper interface of the VBA collection object. */
     inline const uno::Reference< XHelperInterface >& getParent() const { return mxParent; }
@@ -94,40 +94,40 @@ public:
 
         @throws uno::RuntimeException
     */
-    void collectShapes() throw (uno::RuntimeException);
+    void collectShapes();
     /** Creates and returns a new UNO shape.
 
         @throws uno::RuntimeException
     */
-    uno::Reference< drawing::XShape > createShape( const awt::Point& rPos, const awt::Size& rSize ) throw (uno::RuntimeException);
+    uno::Reference< drawing::XShape > createShape( const awt::Point& rPos, const awt::Size& rSize );
     /** Inserts the passed shape into the draw page and into this container, and returns its index in the draw page.
 
         @throws uno::RuntimeException
     */
-    sal_Int32 insertShape( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException);
+    sal_Int32 insertShape( const uno::Reference< drawing::XShape >& rxShape );
     /** Creates and returns a new VBA implementation object for the passed shape.
 
         @throws uno::RuntimeException
     */
-    ::rtl::Reference< ScVbaSheetObjectBase > createVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException);
+    ::rtl::Reference< ScVbaSheetObjectBase > createVbaObject( const uno::Reference< drawing::XShape >& rxShape );
     /** Creates and returns a new VBA implementation object for the passed shape in an Any.
 
         @throws uno::RuntimeException
     */
-    uno::Any createCollectionObject( const uno::Any& rSource ) throw (uno::RuntimeException);
+    uno::Any createCollectionObject( const uno::Any& rSource );
     /** Returns the VBA implementation object with the specified name.
 
         @throws uno::RuntimeException
     */
-    uno::Any getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException);
+    uno::Any getItemByStringIndex( const OUString& rIndex );
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
 protected:
     /** Derived classes return true, if the passed shape is supported by the instance. */
@@ -136,7 +136,7 @@ protected:
 
         @throws uno::RuntimeException
     */
-    virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) = 0;
+    virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) = 0;
     /** Derived classes return the service name of the UNO shape. */
     virtual OUString implGetShapeServiceName() const = 0;
 
@@ -144,12 +144,12 @@ protected:
 
         @throws uno::RuntimeException
     */
-    virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException);
+    virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const;
     /** Is called when a new UNO shape has been created but not yet inserted into the drawing page.
 
         @throws uno::RuntimeException
     */
-    virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException);
+    virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape );
 
 protected:
     uno::Reference< XHelperInterface > mxParent;
@@ -169,7 +169,7 @@ ScVbaObjectContainer::ScVbaObjectContainer(
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Reference< frame::XModel >& rxModel,
         const uno::Reference< sheet::XSpreadsheet >& rxSheet,
-        const uno::Type& rVbaType ) throw (uno::RuntimeException) :
+        const uno::Type& rVbaType ) :
     mxParent( rxParent ),
     mxContext( rxContext ),
     mxModel( rxModel, uno::UNO_SET_THROW ),
@@ -180,7 +180,7 @@ ScVbaObjectContainer::ScVbaObjectContainer(
     mxShapes.set( xDrawPageSupp->getDrawPage(), uno::UNO_QUERY_THROW );
 }
 
-void ScVbaObjectContainer::collectShapes() throw (uno::RuntimeException)
+void ScVbaObjectContainer::collectShapes()
 {
     maShapes.clear();
     for( sal_Int32 nIndex = 0, nCount = mxShapes->getCount(); nIndex < nCount; ++nIndex )
@@ -191,7 +191,7 @@ void ScVbaObjectContainer::collectShapes() throw (uno::RuntimeException)
     }
 }
 
-uno::Reference< drawing::XShape > ScVbaObjectContainer::createShape( const awt::Point& rPos, const awt::Size& rSize ) throw (uno::RuntimeException)
+uno::Reference< drawing::XShape > ScVbaObjectContainer::createShape( const awt::Point& rPos, const awt::Size& rSize )
 {
     uno::Reference< drawing::XShape > xShape( mxFactory->createInstance( implGetShapeServiceName() ), uno::UNO_QUERY_THROW );
     xShape->setPosition( rPos );
@@ -200,7 +200,7 @@ uno::Reference< drawing::XShape > ScVbaObjectContainer::createShape( const awt::
     return xShape;
 }
 
-sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException)
+sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XShape >& rxShape )
 {
     mxShapes->add( rxShape );
     maShapes.push_back( rxShape );
@@ -208,19 +208,19 @@ sal_Int32 ScVbaObjectContainer::insertShape( const uno::Reference< drawing::XSha
 }
 
 ::rtl::Reference< ScVbaSheetObjectBase > ScVbaObjectContainer::createVbaObject(
-    const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException)
+    const uno::Reference< drawing::XShape >& rxShape )
 {
     return implCreateVbaObject( rxShape );
 }
 
-uno::Any ScVbaObjectContainer::createCollectionObject( const uno::Any& rSource ) throw (uno::RuntimeException)
+uno::Any ScVbaObjectContainer::createCollectionObject( const uno::Any& rSource )
 {
     uno::Reference< drawing::XShape > xShape( rSource, uno::UNO_QUERY_THROW );
     uno::Reference< excel::XSheetObject > xSheetObject( implCreateVbaObject( xShape ) );
     return uno::Any( xSheetObject );
 }
 
-uno::Any ScVbaObjectContainer::getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException)
+uno::Any ScVbaObjectContainer::getItemByStringIndex( const OUString& rIndex )
 {
     for( ShapeVector::iterator aIt = maShapes.begin(), aEnd = maShapes.end(); aIt != aEnd; ++aIt )
         if( rIndex == implGetShapeName( *aIt ) )
@@ -230,13 +230,12 @@ uno::Any ScVbaObjectContainer::getItemByStringIndex( const OUString& rIndex ) th
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL ScVbaObjectContainer::getCount() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaObjectContainer::getCount()
 {
     return static_cast< sal_Int32 >( maShapes.size() );
 }
 
 uno::Any SAL_CALL ScVbaObjectContainer::getByIndex( sal_Int32 nIndex )
-        throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( (0 <= nIndex) && (nIndex < getCount()) )
         return uno::Any( maShapes[ static_cast< size_t >( nIndex ) ] );
@@ -245,25 +244,25 @@ uno::Any SAL_CALL ScVbaObjectContainer::getByIndex( sal_Int32 nIndex )
 
 // XElementAccess
 
-uno::Type SAL_CALL ScVbaObjectContainer::getElementType() throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL ScVbaObjectContainer::getElementType()
 {
     return cppu::UnoType<drawing::XShape>::get();
 }
 
-sal_Bool SAL_CALL ScVbaObjectContainer::hasElements() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaObjectContainer::hasElements()
 {
     return !maShapes.empty();
 }
 
 // private
 
-OUString ScVbaObjectContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException)
+OUString ScVbaObjectContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const
 {
     uno::Reference< beans::XPropertySet > xPropSet( rxShape, uno::UNO_QUERY_THROW );
     return xPropSet->getPropertyValue( "Name" ).get< OUString >();
 }
 
-void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& /*rxShape*/ ) throw (uno::RuntimeException)
+void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& /*rxShape*/ )
 {
 }
 
@@ -288,7 +287,7 @@ uno::Any ScVbaObjectEnumeration::createCollectionObject( const uno::Any& rSource
     return mxContainer->createCollectionObject( rSource );
 }
 
-ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException) :
+ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) :
     ScVbaSheetObjects_BASE( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ),
     mxContainer( rxContainer )
 {
@@ -299,21 +298,21 @@ ScVbaSheetObjectsBase::~ScVbaSheetObjectsBase()
 {
 }
 
-void ScVbaSheetObjectsBase::collectShapes() throw (uno::RuntimeException)
+void ScVbaSheetObjectsBase::collectShapes()
 {
     mxContainer->collectShapes();
 }
 
 // XEnumerationAccess
 
-uno::Reference< container::XEnumeration > SAL_CALL ScVbaSheetObjectsBase::createEnumeration() throw (uno::RuntimeException)
+uno::Reference< container::XEnumeration > SAL_CALL ScVbaSheetObjectsBase::createEnumeration()
 {
     return new ScVbaObjectEnumeration( mxContainer );
 }
 
 // XElementAccess
 
-uno::Type SAL_CALL ScVbaSheetObjectsBase::getElementType() throw (uno::RuntimeException)
+uno::Type SAL_CALL ScVbaSheetObjectsBase::getElementType()
 {
     return mxContainer->getVbaType();
 }
@@ -325,21 +324,21 @@ uno::Any ScVbaSheetObjectsBase::createCollectionObject( const uno::Any& rSource
     return mxContainer->createCollectionObject( rSource );
 }
 
-uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException)
+uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex )
 {
     return mxContainer->getItemByStringIndex( rIndex );
 }
 
 // Graphic object containers supporting ooo.vba.excel.XGraphicObject
 
-ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (uno::RuntimeException) :
+ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) :
     ScVbaGraphicObjects_BASE( rxContainer )
 {
 }
 
 // XGraphicObjects
 
-uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno::Any& rTop, const uno::Any& rWidth, const uno::Any& rHeight ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno::Any& rTop, const uno::Any& rWidth, const uno::Any& rHeight )
 {
     /*  Extract double values from passed Anys (the lclPointsToHmm() helper
         function will throw a RuntimeException on any error), and convert from
@@ -372,17 +371,17 @@ public:
         const uno::Reference< frame::XModel >& rxModel,
         const uno::Reference< sheet::XSpreadsheet >& rxSheet,
         const uno::Type& rVbaType,
-        const OUString& rModelServiceName ) throw (uno::RuntimeException);
+        const OUString& rModelServiceName );
 
 protected:
     /// @throws uno::RuntimeException
-    uno::Reference< container::XIndexContainer > const & createForm() throw (uno::RuntimeException);
+    uno::Reference< container::XIndexContainer > const & createForm();
 
     virtual bool implPickShape( const uno::Reference< drawing::XShape >& rxShape ) const override;
     virtual OUString implGetShapeServiceName() const override;
     virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const;
-    virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException) override;
-    virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) override;
+    virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const override;
+    virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) override;
 
 protected:
     uno::Reference< container::XIndexContainer > mxFormIC;
@@ -395,13 +394,13 @@ ScVbaControlContainer::ScVbaControlContainer(
         const uno::Reference< frame::XModel >& rxModel,
         const uno::Reference< sheet::XSpreadsheet >& rxSheet,
         const uno::Type& rVbaType,
-        const OUString& rModelServiceName ) throw (uno::RuntimeException) :
+        const OUString& rModelServiceName ) :
     ScVbaObjectContainer( rxParent, rxContext, rxModel, rxSheet, rVbaType ),
     maModelServiceName( rModelServiceName )
 {
 }
 
-uno::Reference< container::XIndexContainer > const & ScVbaControlContainer::createForm() throw (uno::RuntimeException)
+uno::Reference< container::XIndexContainer > const & ScVbaControlContainer::createForm()
 {
     if( !mxFormIC.is() )
     {
@@ -448,13 +447,13 @@ bool ScVbaControlContainer::implCheckProperties( const uno::Reference< beans::XP
     return true;
 }
 
-OUString ScVbaControlContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException)
+OUString ScVbaControlContainer::implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const
 {
     uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW );
     return uno::Reference< container::XNamed >( xControlShape->getControl(), uno::UNO_QUERY_THROW )->getName();
 }
 
-void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException)
+void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape )
 {
     // passed shape must be a control shape
     uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW );
@@ -479,10 +478,10 @@ public:
         const uno::Reference< XHelperInterface >& rxParent,
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Reference< frame::XModel >& rxModel,
-        const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException);
+        const uno::Reference< sheet::XSpreadsheet >& rxSheet );
 
 protected:
-    virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) override;
+    virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) override;
     virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const override;
 };
 
@@ -490,7 +489,7 @@ ScVbaButtonContainer::ScVbaButtonContainer(
         const uno::Reference< XHelperInterface >& rxParent,
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Reference< frame::XModel >& rxModel,
-        const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException) :
+        const uno::Reference< sheet::XSpreadsheet >& rxSheet ) :
     ScVbaControlContainer(
         rxParent, rxContext, rxModel, rxSheet,
         cppu::UnoType<excel::XButton>::get(),
@@ -498,7 +497,7 @@ ScVbaButtonContainer::ScVbaButtonContainer(
 {
 }
 
-ScVbaSheetObjectBase* ScVbaButtonContainer::implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException)
+ScVbaSheetObjectBase* ScVbaButtonContainer::implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape )
 {
     uno::Reference< drawing::XControlShape > xControlShape( rxShape, uno::UNO_QUERY_THROW );
     return new ScVbaButton( mxParent, mxContext, mxModel, createForm(), xControlShape );
@@ -515,7 +514,7 @@ ScVbaButtons::ScVbaButtons(
         const uno::Reference< XHelperInterface >& rxParent,
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Reference< frame::XModel >& rxModel,
-        const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException) :
+        const uno::Reference< sheet::XSpreadsheet >& rxSheet ) :
     ScVbaGraphicObjectsBase( new ScVbaButtonContainer( rxParent, rxContext, rxModel, rxSheet ) )
 {
 }
diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx
index b0fc53521d7b..ca9872e4f9f4 100644
--- a/sc/source/ui/vba/vbasheetobjects.hxx
+++ b/sc/source/ui/vba/vbasheetobjects.hxx
@@ -43,24 +43,24 @@ class ScVbaSheetObjectsBase : public ScVbaSheetObjects_BASE
 {
 public:
     /// @throws css::uno::RuntimeException
-    explicit ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException);
+    explicit ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer );
     virtual ~ScVbaSheetObjectsBase() override;
 
     /** Updates the collection by fetching all shapes from the draw page.
 
         @throws css::uno::RuntimeException
     */
-    void collectShapes() throw (css::uno::RuntimeException);
+    void collectShapes();
 
     // XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
 
     // ScVbaCollectionBase
     virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) override;
-    virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) override;
 
 protected:
     ScVbaObjectContainerRef mxContainer;
@@ -75,14 +75,14 @@ class ScVbaGraphicObjectsBase : public ScVbaGraphicObjects_BASE
 {
 public:
     /// @throws css::uno::RuntimeException
-    explicit ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException);
+    explicit ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer );
 
     // XGraphicObjects
     virtual css::uno::Any SAL_CALL Add(
         const css::uno::Any& rLeft,
         const css::uno::Any& rTop,
         const css::uno::Any& rWidth,
-        const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& rHeight ) override;
 };
 
 /** Collection containing all button controls from a sheet (not ActiveX controls). */
@@ -94,7 +94,7 @@ public:
         const css::uno::Reference< ov::XHelperInterface >& rxParent,
         const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         const css::uno::Reference< css::frame::XModel >& rxModel,
-        const css::uno::Reference< css::sheet::XSpreadsheet >& rxSheet ) throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::sheet::XSpreadsheet >& rxSheet );
 
     VBAHELPER_DECL_XHELPERINTERFACE
 };
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index 243a49a687d4..4c82b44629c7 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star;
 static const char DISPLAYNAME[] = "DisplayName";
 
 uno::Reference< container::XNameAccess >
-ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException )
+ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel )
 {
     uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW);
     uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName("CellStyles"), uno::UNO_QUERY_THROW );
@@ -37,14 +37,14 @@ ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xMode
 /// @throws script::BasicErrorException
 /// @throws uno::RuntimeException
 static uno::Reference< beans::XPropertySet >
-lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException )
+lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XModel >& xModel )
 {
 
     uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW );
     return xStyleProps;
 }
 
-void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorException )
+void ScVbaStyle::initialise()
 {
     if (!mxModel.is() )
         DebugHelper::basicexception(ERRCODE_BASIC_METHOD_FAILED, "XModel Interface could not be retrieved" );
@@ -63,7 +63,6 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorE
 ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent,
                         const uno::Reference< uno::XComponentContext > & xContext,
                         const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel )
-                    throw ( script::BasicErrorException, uno::RuntimeException )
     :  ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false )
 {
     try
@@ -80,7 +79,6 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent,
                         const uno::Reference< uno::XComponentContext > & xContext,
                         const uno::Reference< beans::XPropertySet >& _xPropertySet,
                         const uno::Reference< frame::XModel >& _xModel )
-                    throw ( script::BasicErrorException, uno::RuntimeException )
     : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false )
 {
     try
@@ -94,25 +92,25 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent,
 }
 
 sal_Bool SAL_CALL
-ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaStyle::BuiltIn()
 {
     return !mxStyle->isUserDefined();
 
 }
 void SAL_CALL
-ScVbaStyle::setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaStyle::setName( const OUString& Name )
 {
     mxStyle->setName(Name);
 }
 
 OUString SAL_CALL
-ScVbaStyle::getName() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaStyle::getName()
 {
     return mxStyle->getName();
 }
 
 void SAL_CALL
-ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaStyle::setNameLocal( const OUString& NameLocal )
 {
     try
     {
@@ -125,7 +123,7 @@ ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorE
 }
 
 OUString SAL_CALL
-ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaStyle::getNameLocal()
 {
     OUString sName;
     try
@@ -140,7 +138,7 @@ ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeExcep
 }
 
 void SAL_CALL
-ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaStyle::Delete()
 {
     try
     {
@@ -153,13 +151,13 @@ ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException,
 }
 
 void SAL_CALL
-ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ )
 {
     DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString());
 }
 
 uno::Any SAL_CALL
-ScVbaStyle::getMergeCells(  ) throw (script::BasicErrorException, uno::RuntimeException)
+ScVbaStyle::getMergeCells(  )
 {
     DebugHelper::basicexception(ERRCODE_BASIC_NOT_IMPLEMENTED, OUString());
     return uno::Any();
diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx
index fd8521ccb618..c21a55f6638d 100644
--- a/sc/source/ui/vba/vbastyle.hxx
+++ b/sc/source/ui/vba/vbastyle.hxx
@@ -35,27 +35,27 @@ protected:
     css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer;
     /// @throws css::uno::RuntimeException
     /// @throws css::script::BasicErrorException
-    void initialise() throw ( css::uno::RuntimeException, css::script::BasicErrorException );
+    void initialise();
 public:
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
+    ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
+    ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel );
     /// @throws css::uno::RuntimeException
-    static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
+    static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel );
     virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() override { return this; };
     // XStyle Methods
-    virtual sal_Bool SAL_CALL BuiltIn() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL BuiltIn() override;
+    virtual void SAL_CALL setName( const OUString& Name ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) override;
+    virtual OUString SAL_CALL getNameLocal() override;
+    virtual void SAL_CALL Delete() override;
     // XFormat
-    virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL getMergeCells(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) override;
+    virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) override;
+    virtual css::uno::Any SAL_CALL getMergeCells(  ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx
index a4a1457882b7..2b8da076c2ba 100644
--- a/sc/source/ui/vba/vbastyles.cxx
+++ b/sc/source/ui/vba/vbastyles.cxx
@@ -33,7 +33,7 @@ lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Referenc
     return uno::makeAny( xStyle );
 }
 
-ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent )
+ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent )
 {
     try
     {
@@ -47,7 +47,7 @@ ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, con
 }
 
 uno::Sequence< OUString >
-ScVbaStyles::getStyleNames() throw ( uno::RuntimeException )
+ScVbaStyles::getStyleNames()
 {
     return mxNameContainerCellStyles->getElementNames();
 }
@@ -59,7 +59,7 @@ ScVbaStyles::createCollectionObject(const uno::Any& aObject)
 }
 
 uno::Type SAL_CALL
-ScVbaStyles::getElementType() throw (uno::RuntimeException)
+ScVbaStyles::getElementType()
 {
     return cppu::UnoType<excel::XStyle>::get();
 }
@@ -76,11 +76,11 @@ class EnumWrapper : public EnumerationHelper_BASE
         sal_Int32 nIndex;
 public:
         EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference<XHelperInterface >& xParent, const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference<frame::XModel >& xModel ) : m_xIndexAccess( xIndexAccess ), m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel ), nIndex( 0 ) {}
-        virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasMoreElements(  ) override
         {
                 return ( nIndex < m_xIndexAccess->getCount() );
         }
-        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual uno::Any SAL_CALL nextElement(  ) override
         {
             try
             {
@@ -113,13 +113,13 @@ public:
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-ScVbaStyles::createEnumeration() throw (uno::RuntimeException)
+ScVbaStyles::createEnumeration()
 {
     return new EnumWrapper( m_xIndexAccess, mxParent, mxContext, mxModel );
 }
 
 uno::Reference< excel::XStyle > SAL_CALL
-ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn )
 {
     uno::Reference< excel::XStyle > aRet;
     try
@@ -166,7 +166,7 @@ ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (scr
 }
 
 void
-ScVbaStyles::Delete(const OUString& _sStyleName) throw ( script::BasicErrorException )
+ScVbaStyles::Delete(const OUString& _sStyleName)
 {
     try
     {
diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx
index d724492eef00..82f60d3a8cda 100644
--- a/sc/source/ui/vba/vbastyles.hxx
+++ b/sc/source/ui/vba/vbastyles.hxx
@@ -34,16 +34,16 @@ class ScVbaStyles: public ScVbaStyles_BASE
     css::uno::Reference< css::container::XNameContainer > mxNameContainerCellStyles;
 public:
     /// @throws css::script::BasicErrorException
-    ScVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException );
+    ScVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > getStyleNames() throw ( css::uno::RuntimeException );
+    css::uno::Sequence< OUString > getStyleNames();
     /// @throws css::script::BasicErrorException
-    void Delete(const OUString& _sStyleName) throw ( css::script::BasicErrorException );
+    void Delete(const OUString& _sStyleName);
     // XStyles
-     virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+     virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject(const css::uno::Any&) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx
index f0e84e716ed1..1e141f4ffab0 100644
--- a/sc/source/ui/vba/vbatextboxshape.cxx
+++ b/sc/source/ui/vba/vbatextboxshape.cxx
@@ -31,19 +31,19 @@ ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentConte
 }
 
 OUString SAL_CALL
-ScVbaTextBoxShape::getText() throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBoxShape::getText()
 {
     return m_xTextRange->getString();
 }
 
 void SAL_CALL
-ScVbaTextBoxShape::setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBoxShape::setText( const OUString& _text )
 {
     m_xTextRange->setString( _text );
 }
 
 uno::Reference< excel::XCharacters > SAL_CALL
-ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException, std::exception)
+ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length )
 {
     ScDocShell* pDocShell = excel::getDocShell( m_xModel );
     ScDocument* pDoc = pDocShell ? &pDocShell->GetDocument() : nullptr;
diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx
index 2e762429ac76..3c71ee87032c 100644
--- a/sc/source/ui/vba/vbatextboxshape.hxx
+++ b/sc/source/ui/vba/vbatextboxshape.hxx
@@ -34,9 +34,9 @@ public:
     ScVbaTextBoxShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel );
 
    // Attributes
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& _text ) override;
+    virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) override;
 };
 #endif // INCLUDED_SC_SOURCE_UI_VBA_VBATEXTBOXSHAPE_HXX
 
diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx
index 3c270d175219..c6aa6dd328c5 100644
--- a/sc/source/ui/vba/vbatextframe.cxx
+++ b/sc/source/ui/vba/vbatextframe.cxx
@@ -27,13 +27,13 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException ) :  ScVbaTextFrame_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< drawing::XShape >( args, 1, false ) )
+ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Reference< uno::XComponentContext> const & xContext ) :  ScVbaTextFrame_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< drawing::XShape >( args, 1, false ) )
 {
 }
 
 // Methods
 uno::Any SAL_CALL
-ScVbaTextFrame::Characters() throw (uno::RuntimeException, std::exception)
+ScVbaTextFrame::Characters()
 {
     uno::Reference< text::XSimpleText > xSimpleText( m_xShape, uno::UNO_QUERY_THROW );
     ScVbaPalette aPalette( SfxObjectShell::Current() );
diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx
index ff223c822144..9bac1c531e81 100644
--- a/sc/source/ui/vba/vbatextframe.hxx
+++ b/sc/source/ui/vba/vbatextframe.hxx
@@ -30,9 +30,9 @@ class ScVbaTextFrame : public ScVbaTextFrame_BASE
 {
 public:
     /// @throws css::lang::IllegalArgumentException
-    ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ) throw ( css::lang::IllegalArgumentException );
+    ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
     // Methods
-    virtual css::uno::Any SAL_CALL Characters(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Characters(  ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index fa85c2de0712..a4da150287c7 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -47,7 +47,7 @@ public:
         xShapePropertySet.set( xTitleShape, css::uno::UNO_QUERY_THROW );
         oShapeHelper.reset( new ov::ShapeHelper(xTitleShape) );
     }
-    css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior(  ) SAL_OVERRIDE
     {
         // #TODO find out what the proper parent should be
         // leaving as set by the helperapi for the moment
@@ -55,14 +55,14 @@ public:
         // otherwise attempts to access the palette will fail
         return new ScVbaInterior( BaseClass::mxParent, BaseClass::mxContext, xShapePropertySet );
     }
-    css::uno::Reference< ov::excel::XFont > SAL_CALL Font(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    css::uno::Reference< ov::excel::XFont > SAL_CALL Font(  ) SAL_OVERRIDE
     {
         // #TODO find out what the proper parent should be
         // leaving as set by the helperapi for the moment
         return new ScVbaFont( BaseClass::mxParent, BaseClass::mxContext, m_Palette, xShapePropertySet );
 
     }
-    void SAL_CALL setText( const OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    void SAL_CALL setText( const OUString& Text ) SAL_OVERRIDE
     {
         try
         {
@@ -73,7 +73,7 @@ public:
             throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
         }
     }
-    OUString SAL_CALL getText(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    OUString SAL_CALL getText(  ) SAL_OVERRIDE
     {
         OUString sText;
         try
@@ -87,23 +87,23 @@ public:
         return sText;
     }
 
-    void SAL_CALL setTop( double Top ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    void SAL_CALL setTop( double Top ) SAL_OVERRIDE
     {
         oShapeHelper->setTop( Top );
     }
-    double SAL_CALL getTop(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    double SAL_CALL getTop(  ) SAL_OVERRIDE
     {
         return oShapeHelper->getTop();
     }
-    void SAL_CALL setLeft( double Left ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    void SAL_CALL setLeft( double Left ) SAL_OVERRIDE
     {
         oShapeHelper->setLeft( Left );
     }
-    double SAL_CALL getLeft(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    double SAL_CALL getLeft(  ) SAL_OVERRIDE
     {
         return oShapeHelper->getLeft();
     }
-    void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) SAL_OVERRIDE
     {
         try
         {
@@ -114,7 +114,7 @@ public:
             throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), ERRCODE_BASIC_METHOD_FAILED, OUString() );
         }
     }
-    ::sal_Int32 SAL_CALL getOrientation(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE
+    ::sal_Int32 SAL_CALL getOrientation(  ) SAL_OVERRIDE
     {
         sal_Int32 nSOOrientation = 0;
         try
diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx
index 82fbcdf3e224..e2e75009a35d 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -52,7 +52,7 @@ lcl_getValidationProps( const uno::Reference< table::XCellRange >& xRange )
 }
 
 sal_Bool SAL_CALL
-ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getIgnoreBlank()
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
     bool bBlank = false;
@@ -61,7 +61,7 @@ ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaValidation::setIgnoreBlank( sal_Bool _ignoreblank ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation::setIgnoreBlank( sal_Bool _ignoreblank )
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
     xProps->setPropertyValue( SC_UNONAME_IGNOREBL, uno::makeAny( _ignoreblank ) );
@@ -69,7 +69,7 @@ ScVbaValidation::setIgnoreBlank( sal_Bool _ignoreblank ) throw (uno::RuntimeExce
 }
 
 sal_Bool SAL_CALL
-ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getInCellDropdown()
 {
     uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
     sal_Int32 nShowList = 0;
@@ -78,7 +78,7 @@ ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException, std::exceptio
 }
 
 void SAL_CALL
-ScVbaValidation::setInCellDropdown( sal_Bool  _incelldropdown  ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation::setInCellDropdown( sal_Bool  _incelldropdown  )
 {
     sal_Int32 nDropDown = 0;
     if ( _incelldropdown )
@@ -89,7 +89,7 @@ ScVbaValidation::setInCellDropdown( sal_Bool  _incelldropdown  ) throw (uno::Run
 }
 
 sal_Bool SAL_CALL
-ScVbaValidation::getShowInput() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getShowInput()
 {
     uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
     bool bShowInput = false;
@@ -98,7 +98,7 @@ ScVbaValidation::getShowInput() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaValidation:: setShowInput( sal_Bool _showinput ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation:: setShowInput( sal_Bool _showinput )
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps(m_xRange) );
     xProps->setPropertyValue( SC_UNONAME_IGNOREBL, uno::makeAny( _showinput ) );
@@ -106,7 +106,7 @@ ScVbaValidation:: setShowInput( sal_Bool _showinput ) throw (uno::RuntimeExcepti
 }
 
 sal_Bool SAL_CALL
-ScVbaValidation::getShowError() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getShowError()
 {
     uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
     bool bShowError = false;
@@ -115,7 +115,7 @@ ScVbaValidation::getShowError() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaValidation::setShowError( sal_Bool _showerror ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation::setShowError( sal_Bool _showerror )
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
     xProps->setPropertyValue( SC_UNONAME_SHOWERR, uno::makeAny( _showerror ) );
@@ -123,7 +123,7 @@ ScVbaValidation::setShowError( sal_Bool _showerror ) throw (uno::RuntimeExceptio
 }
 
 OUString SAL_CALL
-ScVbaValidation::getErrorTitle() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getErrorTitle()
 {
     uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
     OUString sErrorTitle;
@@ -132,7 +132,7 @@ ScVbaValidation::getErrorTitle() throw (uno::RuntimeException, std::exception)
 }
 
 void
-ScVbaValidation::setErrorTitle( const OUString& _errormessage ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation::setErrorTitle( const OUString& _errormessage )
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
     xProps->setPropertyValue( SC_UNONAME_ERRTITLE, uno::makeAny( _errormessage ) );
@@ -140,7 +140,7 @@ ScVbaValidation::setErrorTitle( const OUString& _errormessage ) throw (uno::Runt
 }
 
 OUString SAL_CALL
-ScVbaValidation::getInputMessage() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getInputMessage()
 {
     uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
     OUString sMsg;
@@ -149,7 +149,7 @@ ScVbaValidation::getInputMessage() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaValidation::setInputMessage( const OUString& _inputmessage ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation::setInputMessage( const OUString& _inputmessage )
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
     xProps->setPropertyValue( SC_UNONAME_INPMESS, uno::makeAny( _inputmessage ) );
@@ -157,7 +157,7 @@ ScVbaValidation::setInputMessage( const OUString& _inputmessage ) throw (uno::Ru
 }
 
 OUString SAL_CALL
-ScVbaValidation::getInputTitle() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getInputTitle()
 {
     uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
     OUString sString;
@@ -166,7 +166,7 @@ ScVbaValidation::getInputTitle() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaValidation::setInputTitle( const OUString& _inputtitle ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation::setInputTitle( const OUString& _inputtitle )
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
     xProps->setPropertyValue( SC_UNONAME_INPTITLE, uno::makeAny( _inputtitle ) );
@@ -174,7 +174,7 @@ ScVbaValidation::setInputTitle( const OUString& _inputtitle ) throw (uno::Runtim
 }
 
 OUString SAL_CALL
-ScVbaValidation::getErrorMessage() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getErrorMessage()
 {
     uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
     OUString sString;
@@ -183,7 +183,7 @@ ScVbaValidation::getErrorMessage() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation::setErrorMessage( const OUString& _errormessage )
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
     xProps->setPropertyValue( SC_UNONAME_ERRMESS, uno::makeAny( _errormessage ) );
@@ -191,7 +191,7 @@ ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::Ru
 }
 
 void SAL_CALL
-ScVbaValidation::Delete(  ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation::Delete(  )
 {
     OUString sBlank;
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
@@ -212,7 +212,7 @@ ScVbaValidation::Delete(  ) throw (uno::RuntimeException, std::exception)
 
 // Fix the defect that validatation cannot work when the input should be limited between a lower bound and an upper bound
 void SAL_CALL
-ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const uno::Any& Operator, const uno::Any& Formula1, const uno::Any& Formula2 ) throw (uno::RuntimeException, std::exception)
+ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const uno::Any& Operator, const uno::Any& Formula1, const uno::Any& Formula2 )
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
     uno::Reference< sheet::XSheetCondition > xCond( xProps, uno::UNO_QUERY_THROW );
@@ -294,7 +294,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un
 }
 
 OUString SAL_CALL
-ScVbaValidation::getFormula1() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getFormula1()
 {
     uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW );
     OUString sString = xCond->getFormula1();
@@ -315,14 +315,14 @@ ScVbaValidation::getFormula1() throw (uno::RuntimeException, std::exception)
 }
 
 OUString SAL_CALL
-ScVbaValidation::getFormula2() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getFormula2()
 {
         uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW );
     return xCond->getFormula2();
 }
 
 sal_Int32 SAL_CALL
-ScVbaValidation::getType() throw (uno::RuntimeException, std::exception)
+ScVbaValidation::getType()
 {
     uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
     sheet::ValidationType nValType = sheet::ValidationType_ANY;
diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx
index 14e7c430f2d8..b253386dfdca 100644
--- a/sc/source/ui/vba/vbavalidation.hxx
+++ b/sc/source/ui/vba/vbavalidation.hxx
@@ -32,28 +32,28 @@ class ScVbaValidation : public ValidationImpl_BASE
 public:
     ScVbaValidation( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange ) : ValidationImpl_BASE( xParent, xContext ), m_xRange( xRange) {}
     // Attributes
-    virtual sal_Bool SAL_CALL getIgnoreBlank() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setIgnoreBlank( sal_Bool _ignoreblank ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getInCellDropdown() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInCellDropdown( sal_Bool _incelldropdown ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getShowInput() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShowInput( sal_Bool _showinput ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getShowError() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShowError( sal_Bool _showerror ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIgnoreBlank() override;
+    virtual void SAL_CALL setIgnoreBlank( sal_Bool _ignoreblank ) override;
+    virtual sal_Bool SAL_CALL getInCellDropdown() override;
+    virtual void SAL_CALL setInCellDropdown( sal_Bool _incelldropdown ) override;
+    virtual sal_Bool SAL_CALL getShowInput() override;
+    virtual void SAL_CALL setShowInput( sal_Bool _showinput ) override;
+    virtual sal_Bool SAL_CALL getShowError() override;
+    virtual void SAL_CALL setShowError( sal_Bool _showerror ) override;
+    virtual OUString SAL_CALL getInputTitle() override;
+    virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) override;
+    virtual OUString SAL_CALL getErrorTitle() override;
+    virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) override;
+    virtual OUString SAL_CALL getInputMessage() override;
+    virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) override;
+    virtual OUString SAL_CALL getErrorMessage() override;
+    virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) override;
+    virtual OUString SAL_CALL getFormula1() override ;
+    virtual OUString SAL_CALL getFormula2() override;
+    virtual sal_Int32 SAL_CALL getType() override;
     // Methods
-    virtual void SAL_CALL Delete(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 2a7ef9c729d9..fae68abba1b3 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -70,16 +70,16 @@ public:
     Sheets::const_iterator m_it;
 
     /// @throws uno::RuntimeException
-    SelectedSheetsEnum( const uno::Reference< uno::XComponentContext >& xContext, const Sheets& sheets, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) :  m_xContext( xContext ), m_sheets( sheets ), m_xModel( xModel )
+    SelectedSheetsEnum( const uno::Reference< uno::XComponentContext >& xContext, const Sheets& sheets, const uno::Reference< frame::XModel >& xModel ) :  m_xContext( xContext ), m_sheets( sheets ), m_xModel( xModel )
     {
         m_it = m_sheets.begin();
     }
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return m_it != m_sheets.end();
     }
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !hasMoreElements() )
         {
@@ -128,16 +128,16 @@ public:
     }
 
     //XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new SelectedSheetsEnum( m_xContext, sheets, m_xModel  );
     }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         return sheets.size();
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0
         || static_cast< Sheets::size_type >( Index ) >= sheets.size() )
@@ -147,18 +147,18 @@ public:
     }
 
     //XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<excel::XWorksheet>::get();
     }
 
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return ( !sheets.empty() );
     }
 
     //XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         NameIndexHash::const_iterator it = namesToIndices.find( aName );
         if ( it == namesToIndices.end() )
@@ -167,12 +167,12 @@ public:
 
     }
 
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         return comphelper::mapKeysToSequence( namesToIndices );
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         NameIndexHash::const_iterator it = namesToIndices.find( aName );
         return (it != namesToIndices.end());
@@ -184,7 +184,7 @@ ScVbaWindow::ScVbaWindow(
         const uno::Reference< XHelperInterface >& xParent,
         const uno::Reference< uno::XComponentContext >& xContext,
         const uno::Reference< frame::XModel >& xModel,
-        const uno::Reference< frame::XController >& xController ) throw (uno::RuntimeException) :
+        const uno::Reference< frame::XController >& xController ) :
     WindowImpl_BASE( xParent, xContext, xModel, xController )
 {
     init();
@@ -192,7 +192,7 @@ ScVbaWindow::ScVbaWindow(
 
 ScVbaWindow::ScVbaWindow(
         const uno::Sequence< uno::Any >& args,
-        const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException) :
+        const uno::Reference< uno::XComponentContext >& xContext ) :
     WindowImpl_BASE( args, xContext )
 {
     init();
@@ -219,25 +219,25 @@ ScVbaWindow::init()
 }
 
 uno::Reference< beans::XPropertySet >
-ScVbaWindow::getControllerProps() throw (uno::RuntimeException)
+ScVbaWindow::getControllerProps()
 {
     return uno::Reference< beans::XPropertySet >( getController(), uno::UNO_QUERY_THROW );
 }
 
 uno::Reference< beans::XPropertySet >
-ScVbaWindow::getFrameProps() throw (uno::RuntimeException)
+ScVbaWindow::getFrameProps()
 {
     return uno::Reference< beans::XPropertySet >( getController()->getFrame(), uno::UNO_QUERY_THROW );
 }
 
 uno::Reference< awt::XDevice >
-ScVbaWindow::getDevice() throw (uno::RuntimeException)
+ScVbaWindow::getDevice()
 {
     return uno::Reference< awt::XDevice >( getWindow(), uno::UNO_QUERY_THROW );
 }
 
 void
-ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft, bool bLargeScroll ) throw (uno::RuntimeException)
+ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft, bool bLargeScroll )
 {
     if( !m_xPane.is() )
         throw uno::RuntimeException();
@@ -248,19 +248,19 @@ ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& T
 }
 
 void SAL_CALL
-ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft )
 {
     Scroll( Down, Up, ToRight, ToLeft, false );
 }
 
 void SAL_CALL
-ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft )
 {
     Scroll( Down, Up, ToRight, ToLeft, true );
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::SelectedSheets( const uno::Any& aIndex )
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( new SelectedSheetsEnumAccess( mxContext, m_xModel ) );
     // #FIXME needs a workbook as a parent
@@ -274,7 +274,7 @@ ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeExcepti
 }
 
 void SAL_CALL
-ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*Position*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*Position*/ )
 {
 // #TODO #FIXME need some implementation to scroll through the tabs
 // but where is this done?
@@ -294,7 +294,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getCaption() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getCaption()
 {
     static const char sCrud[] = " - OpenOffice.org Calc";
     static const sal_Int32 nCrudLen = strlen(sCrud);
@@ -333,13 +333,13 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setCaption( const uno::Any& _caption )
 {
     getFrameProps()->setPropertyValue( SC_UNONAME_TITLE, _caption );
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getScrollRow() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getScrollRow()
 {
     sal_Int32 nValue = 0;
     // !! TODO !! get view shell from controller
@@ -354,7 +354,7 @@ ScVbaWindow::getScrollRow() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setScrollRow( const uno::Any& _scrollrow )
 {
     // !! TODO !! get view shell from controller
     ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
@@ -369,7 +369,7 @@ ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeExcep
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getScrollColumn() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getScrollColumn()
 {
     sal_Int32 nValue = 0;
     // !! TODO !! get view shell from controller
@@ -384,7 +384,7 @@ ScVbaWindow::getScrollColumn() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn )
 {
     // !! TODO !! get view shell from controller
     ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
@@ -399,7 +399,7 @@ ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::Runtim
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getWindowState()
 {
     sal_Int32 nwindowState = xlNormal;
     // !! TODO !! get view shell from controller
@@ -417,7 +417,7 @@ ScVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setWindowState( const uno::Any& _windowstate )
 {
     sal_Int32 nwindowState = xlMaximized;
     _windowstate >>= nwindowState;
@@ -439,7 +439,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE
 }
 
 void
-ScVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception)
+ScVbaWindow::Activate()
 {
     rtl::Reference<ScVbaWorkbook> workbook( new ScVbaWorkbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ) );
 
@@ -447,35 +447,35 @@ ScVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception)
 }
 
 void
-ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook )
 {
     rtl::Reference< ScVbaWorkbook > workbook( new ScVbaWorkbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ) );
     workbook->Close(SaveChanges, FileName, RouteWorkBook );
 }
 
 uno::Reference< excel::XPane > SAL_CALL
-ScVbaWindow::ActivePane() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaWindow::ActivePane()
 {
     uno::Reference< sheet::XViewPane > xViewPane( getController(), uno::UNO_QUERY_THROW );
     return new ScVbaPane( this, mxContext, m_xModel, xViewPane );
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaWindow::ActiveCell(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaWindow::ActiveCell(  )
 {
     uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
     return xApplication->getActiveCell();
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::Selection(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaWindow::Selection(  )
 {
     uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
     return xApplication->getSelection();
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaWindow::RangeSelection()
 {
     /*  TODO / FIXME: According to documentation, this method returns the range
         selection even if shapes are selected. */
@@ -483,7 +483,7 @@ ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeEx
 }
 
 sal_Bool SAL_CALL
-ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getDisplayGridlines()
 {
     OUString sName( SC_UNO_SHOWGRID );
     bool bGrid = true;
@@ -492,14 +492,14 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayGridlines( sal_Bool _displaygridlines ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setDisplayGridlines( sal_Bool _displaygridlines )
 {
     OUString sName( SC_UNO_SHOWGRID );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _displaygridlines ));
 }
 
 sal_Bool SAL_CALL
-ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getDisplayHeadings()
 {
     OUString sName( SC_UNO_COLROWHDR );
     bool bHeading = true;
@@ -508,14 +508,14 @@ ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayHeadings( sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setDisplayHeadings( sal_Bool _bDisplayHeadings )
 {
     OUString sName( SC_UNO_COLROWHDR );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings ));
 }
 
 sal_Bool SAL_CALL
-ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getDisplayHorizontalScrollBar()
 {
     OUString sName( SC_UNO_HORSCROLL );
     bool bHorizontalScrollBar = true;
@@ -524,14 +524,14 @@ ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException, std::
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar )
 {
     OUString sName( SC_UNO_HORSCROLL );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar ));
 }
 
 sal_Bool SAL_CALL
-ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getDisplayOutline()
 {
     OUString sName( SC_UNO_OUTLSYMB );
     bool bOutline = true;
@@ -540,14 +540,14 @@ ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayOutline( sal_Bool _bDisplayOutline ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setDisplayOutline( sal_Bool _bDisplayOutline )
 {
     OUString sName( SC_UNO_OUTLSYMB );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayOutline ));
 }
 
 sal_Bool SAL_CALL
-ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getDisplayVerticalScrollBar()
 {
     OUString sName( SC_UNO_VERTSCROLL );
     bool bVerticalScrollBar = true;
@@ -556,14 +556,14 @@ ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException, std::ex
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar )
 {
     OUString sName( SC_UNO_VERTSCROLL );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar ));
 }
 
 sal_Bool SAL_CALL
-ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getDisplayWorkbookTabs()
 {
     OUString sName( SC_UNO_SHEETTABS );
     bool bWorkbookTabs = true;
@@ -572,21 +572,21 @@ ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException, std::excepti
 }
 
 void SAL_CALL
-ScVbaWindow::setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs )
 {
     OUString sName( SC_UNO_SHEETTABS );
     getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs ));
 }
 
 sal_Bool SAL_CALL
-ScVbaWindow::getFreezePanes() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getFreezePanes()
 {
     uno::Reference< sheet::XViewFreezable > xViewFreezable( getController(), uno::UNO_QUERY_THROW );
     return xViewFreezable->hasFrozenPanes();
 }
 
 void SAL_CALL
-ScVbaWindow::setFreezePanes( sal_Bool _bFreezePanes ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setFreezePanes( sal_Bool _bFreezePanes )
 {
     uno::Reference< sheet::XViewPane > xViewPane( getController(), uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XViewSplitable > xViewSplitable( xViewPane, uno::UNO_QUERY_THROW );
@@ -617,14 +617,14 @@ ScVbaWindow::setFreezePanes( sal_Bool _bFreezePanes ) throw (uno::RuntimeExcepti
 }
 
 sal_Bool SAL_CALL
-ScVbaWindow::getSplit() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getSplit()
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return xViewSplitable->getIsWindowSplit();
 }
 
 void SAL_CALL
-ScVbaWindow::setSplit( sal_Bool _bSplit ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setSplit( sal_Bool _bSplit )
 {
     if( !_bSplit )
     {
@@ -642,14 +642,14 @@ ScVbaWindow::setSplit( sal_Bool _bSplit ) throw (uno::RuntimeException, std::exc
 }
 
 sal_Int32 SAL_CALL
-ScVbaWindow::getSplitColumn() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getSplitColumn()
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return xViewSplitable->getSplitColumn();
 }
 
 void SAL_CALL
-ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn )
 {
     if( getSplitColumn() != _splitcolumn )
     {
@@ -660,14 +660,14 @@ ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeExcepti
 }
 
 double SAL_CALL
-ScVbaWindow::getSplitHorizontal() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getSplitHorizontal()
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return PixelsToPoints( getDevice(), xViewSplitable->getSplitHorizontal(), true );
 }
 
 void SAL_CALL
-ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setSplitHorizontal( double _splithorizontal )
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     double fHoriPixels = PointsToPixels( getDevice(), _splithorizontal, true );
@@ -675,14 +675,14 @@ ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeEx
 }
 
 sal_Int32 SAL_CALL
-ScVbaWindow::getSplitRow() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getSplitRow()
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return xViewSplitable->getSplitRow();
 }
 
 void SAL_CALL
-ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setSplitRow( sal_Int32 _splitrow )
 {
     if( getSplitRow() != _splitrow )
     {
@@ -693,14 +693,14 @@ ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException, st
 }
 
 double SAL_CALL
-ScVbaWindow::getSplitVertical() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getSplitVertical()
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     return PixelsToPoints( getDevice(), xViewSplitable->getSplitVertical(), false );
 }
 
 void SAL_CALL
-ScVbaWindow::setSplitVertical(double _splitvertical ) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setSplitVertical(double _splitvertical )
 {
     uno::Reference< sheet::XViewSplitable > xViewSplitable( getController(), uno::UNO_QUERY_THROW );
     double fVertiPixels = PointsToPixels( getDevice(), _splitvertical, false );
@@ -734,7 +734,7 @@ void ScVbaWindow::SplitAtDefinedPosition( sal_Int32 nColumns, sal_Int32 nRows )
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getZoom() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getZoom()
 {
     uno::Reference< beans::XPropertySet > xProps = getControllerProps();
     OUString sName( SC_UNO_ZOOMTYPE );
@@ -755,7 +755,6 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ScVbaWindow::setZoom(const uno::Any& _zoom)
-    throw (uno::RuntimeException, std::exception)
 {
     sal_Int16 nZoom = 100;
     _zoom >>= nZoom;
@@ -770,14 +769,14 @@ void SAL_CALL ScVbaWindow::setZoom(const uno::Any& _zoom)
 }
 
 uno::Reference< excel::XWorksheet > SAL_CALL
-ScVbaWindow::ActiveSheet(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaWindow::ActiveSheet(  )
 {
     uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
     return xApplication->getActiveSheet();
 }
 
 uno::Any SAL_CALL
-ScVbaWindow::getView() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getView()
 {
     bool bPageBreak = false;
     sal_Int32 nWindowView = excel::XlWindowView::xlNormalView;
@@ -795,7 +794,7 @@ ScVbaWindow::getView() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException, std::exception)
+ScVbaWindow::setView( const uno::Any& _view)
 {
     sal_Int32 nWindowView = excel::XlWindowView::xlNormalView;
     _view >>= nWindowView;
@@ -818,7 +817,7 @@ ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException, std::
 }
 
 uno::Reference< excel::XRange > SAL_CALL
-ScVbaWindow::getVisibleRange() throw (uno::RuntimeException, std::exception)
+ScVbaWindow::getVisibleRange()
 {
     uno::Reference< container::XIndexAccess > xPanesIA( getController(), uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XViewPane > xTopLeftPane( xPanesIA->getByIndex( 0 ), uno::UNO_QUERY_THROW );
@@ -827,7 +826,7 @@ ScVbaWindow::getVisibleRange() throw (uno::RuntimeException, std::exception)
 }
 
 sal_Int32 SAL_CALL
-ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points)
 {
     sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
     double fConvertFactor = (getDevice()->getInfo().PixelPerMeterX/100000);
@@ -835,7 +834,7 @@ ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicE
 }
 
 sal_Int32 SAL_CALL
-ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points)
 {
     sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
     double fConvertFactor = (getDevice()->getInfo().PixelPerMeterY/100000);
@@ -843,7 +842,7 @@ ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicE
 }
 
 void SAL_CALL
-ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName )
 {
     // need test, print current active sheet
     // !! TODO !! get view shell from controller
@@ -851,14 +850,14 @@ ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const
 }
 
 void SAL_CALL
-ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges )
 {
     // need test, print preview current active sheet
     // !! TODO !! get view shell from controller
     PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) );
 }
 
-double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaWindow::getTabRatio()
 {
     ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
     if ( pViewShell && pViewShell->GetViewData().GetView() )
@@ -870,7 +869,7 @@ double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException, st
     return 0.0;
 }
 
-void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaWindow::setTabRatio( double fRatio )
 {
     ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
     if ( pViewShell && pViewShell->GetViewData().GetView() )
diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx
index 3cdfe56e9ee5..ee70854f6c79 100644
--- a/sc/source/ui/vba/vbawindow.hxx
+++ b/sc/source/ui/vba/vbawindow.hxx
@@ -42,18 +42,18 @@ private:
 
     void init();
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::beans::XPropertySet > getControllerProps() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::beans::XPropertySet > getControllerProps();
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::beans::XPropertySet > getFrameProps() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::beans::XPropertySet > getFrameProps();
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::awt::XDevice > getDevice() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::awt::XDevice > getDevice();
 
 protected:
     void SplitAtDefinedPosition( sal_Int32 nColumns, sal_Int32 nRows );
 
 public:
     /// @throws css::uno::RuntimeException
-    void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll ) throw (css::uno::RuntimeException);
+    void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll );
 
 public:
     /// @throws css::uno::RuntimeException
@@ -61,71 +61,69 @@ public:
         const css::uno::Reference< ov::XHelperInterface >& xParent,
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const css::uno::Reference< css::frame::XModel >& xModel,
-        const css::uno::Reference< css::frame::XController >& xController )
-        throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::frame::XController >& xController );
     /// @throws css::uno::RuntimeException
     ScVbaWindow(
         const css::uno::Sequence< css::uno::Any >& aArgs,
-        const css::uno::Reference< css::uno::XComponentContext >& xContext )
-        throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     // XWindow
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-     virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayGridlines() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayGridlines( sal_Bool _displaygridlines ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayHeadings() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayHeadings( sal_Bool _bDisplayHeadings ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayHorizontalScrollBar() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayOutline() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayOutline( sal_Bool _bDisplayOutline ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayVerticalScrollBar() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayWorkbookTabs() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFreezePanes( sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSplit( sal_Bool _bSplit ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setSplitColumn( sal_Int32 _splitcolumn ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual double SAL_CALL getSplitHorizontal() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setSplitHorizontal( double _splithorizontal ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Int32 SAL_CALL getSplitRow() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setSplitRow( sal_Int32 _splitrow ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual double SAL_CALL getSplitVertical() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setSplitVertical( double _splitvertical ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setZoom(const css::uno::Any& _zoom) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getTabRatio() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setTabRatio( double _tabratio ) throw (css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell(  ) override;
+     virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() override;
+    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet(  ) override;
+    virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) override;
+    virtual css::uno::Any SAL_CALL getCaption() override;
+    virtual sal_Bool SAL_CALL getDisplayGridlines() override;
+    virtual void SAL_CALL setDisplayGridlines( sal_Bool _displaygridlines ) override;
+    virtual sal_Bool SAL_CALL getDisplayHeadings() override;
+    virtual void SAL_CALL setDisplayHeadings( sal_Bool _bDisplayHeadings ) override;
+    virtual sal_Bool SAL_CALL getDisplayHorizontalScrollBar() override;
+    virtual void SAL_CALL setDisplayHorizontalScrollBar( sal_Bool _bDisplayHorizontalScrollBar ) override;
+    virtual sal_Bool SAL_CALL getDisplayOutline() override;
+    virtual void SAL_CALL setDisplayOutline( sal_Bool _bDisplayOutline ) override;
+    virtual sal_Bool SAL_CALL getDisplayVerticalScrollBar() override;
+    virtual void SAL_CALL setDisplayVerticalScrollBar( sal_Bool _bDisplayVerticalScrollBar ) override;
+    virtual sal_Bool SAL_CALL getDisplayWorkbookTabs() override;
+    virtual void SAL_CALL setDisplayWorkbookTabs( sal_Bool _bDisplayWorkbookTabs ) override;
+    virtual sal_Bool SAL_CALL getFreezePanes() override;
+    virtual void SAL_CALL setFreezePanes( sal_Bool _bFreezePanes ) override;
+    virtual sal_Bool SAL_CALL getSplit() override;
+    virtual void SAL_CALL setSplit( sal_Bool _bSplit ) override;
+    virtual sal_Int32 SAL_CALL getSplitColumn() override ;
+    virtual void SAL_CALL setSplitColumn( sal_Int32 _splitcolumn ) override ;
+    virtual double SAL_CALL getSplitHorizontal() override ;
+    virtual void SAL_CALL setSplitHorizontal( double _splithorizontal ) override ;
+    virtual sal_Int32 SAL_CALL getSplitRow() override ;
+    virtual void SAL_CALL setSplitRow( sal_Int32 _splitrow ) override ;
+    virtual double SAL_CALL getSplitVertical() override ;
+    virtual void SAL_CALL setSplitVertical( double _splitvertical ) override ;
+    virtual css::uno::Any SAL_CALL getScrollRow() override ;
+    virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) override ;
+    virtual css::uno::Any SAL_CALL getScrollColumn() override ;
+    virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) override ;
+    virtual css::uno::Any SAL_CALL getView() override;
+    virtual void SAL_CALL setView( const css::uno::Any& _view ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() override;
+    virtual css::uno::Any SAL_CALL getWindowState() override;
+    virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) override;
+    virtual css::uno::Any SAL_CALL getZoom() override;
+    virtual void SAL_CALL setZoom(const css::uno::Any& _zoom) override;
+    virtual double SAL_CALL getTabRatio() override ;
+    virtual void SAL_CALL setTabRatio( double _tabratio ) override ;
 
     // Methods
-    virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Activate(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Selection(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL RangeSelection() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override;
+    virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override;
+    virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) override;
+    virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) override;
+    virtual void SAL_CALL Activate(  ) override;
+    virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) override;
+    virtual css::uno::Any SAL_CALL Selection(  ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL RangeSelection() override;
+    virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) override;
+    virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) override;
+    virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) override;
+    virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index d7202344c12e..324df72297ee 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -60,13 +60,13 @@ protected:
 
 public:
     /// @throws uno::RuntimeException
-    WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Components& components ) throw ( uno::RuntimeException ) :  m_xContext( xContext ), m_components( components )
+    WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Components& components ) :  m_xContext( xContext ), m_components( components )
     {
         m_it = m_components.begin();
     }
 
     /// @throws uno::RuntimeException
-    explicit WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) :  m_xContext( xContext )
+    explicit WindowComponentEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) :  m_xContext( xContext )
     {
         uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(m_xContext);
         uno::Reference< container::XEnumeration > xComponents = xDesktop->getComponents()->createEnumeration();
@@ -79,12 +79,12 @@ public:
         m_it = m_components.begin();
     }
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return m_it != m_components.end();
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !hasMoreElements() )
         {
@@ -99,7 +99,7 @@ class WindowEnumImpl : public  WindowComponentEnumImpl
     uno::Any m_aApplication;
 public:
     WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext,  const uno::Any& aApplication ): WindowComponentEnumImpl( xContext ), m_aApplication( aApplication ) {}
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext, m_aApplication );
     }
@@ -140,16 +140,16 @@ public:
     }
 
     //XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new WindowComponentEnumImpl( m_xContext, m_windows );
     }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         return m_windows.size();
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0
             || static_cast< Components::size_type >( Index ) >= m_windows.size() )
@@ -158,18 +158,18 @@ public:
     }
 
     //XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<sheet::XSpreadsheetDocument>::get();
     }
 
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return ( !m_windows.empty() );
     }
 
     //XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         NameIndexHash::const_iterator it = namesToIndices.find( aName );
         if ( it == namesToIndices.end() )
@@ -178,12 +178,12 @@ public:
 
     }
 
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         return comphelper::mapKeysToSequence( namesToIndices );
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         NameIndexHash::const_iterator it = namesToIndices.find( aName );
         return (it != namesToIndices.end());
@@ -195,7 +195,7 @@ ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParen
 {
 }
 uno::Reference< container::XEnumeration >
-ScVbaWindows::createEnumeration() throw (uno::RuntimeException)
+ScVbaWindows::createEnumeration()
 {
     return new WindowEnumImpl( mxContext, Application() );
 }
@@ -207,13 +207,13 @@ ScVbaWindows::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Type
-ScVbaWindows::getElementType() throw (uno::RuntimeException)
+ScVbaWindows::getElementType()
 {
     return cppu::UnoType<excel::XWindows>::get();
 }
 
 void SAL_CALL
-ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ )
 {
     //#TODO #FIXME see what can be done for an implementation here
 }
diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx
index 262287b2b778..3e9867db4006 100644
--- a/sc/source/ui/vba/vbawindows.hxx
+++ b/sc/source/ui/vba/vbawindows.hxx
@@ -34,11 +34,11 @@ public:
     ScVbaWindows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // XWindows
-    virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) override;
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index a732f0f87858..3c2bdda52ccd 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -66,7 +66,7 @@ void ScVbaWorkbook::initColorData( const uno::Sequence< sal_Int32 >& sColors )
 }
 
 void SAL_CALL
-ScVbaWorkbook::ResetColors(  ) throw (::script::BasicErrorException, ::uno::RuntimeException, std::exception)
+ScVbaWorkbook::ResetColors(  )
 {
         uno::Reference< container::XIndexAccess > xIndexAccess( ScVbaPalette::getDefaultPalette(), uno::UNO_QUERY_THROW );
         sal_Int32 nLen = xIndexAccess->getCount();
@@ -80,7 +80,7 @@ ScVbaWorkbook::ResetColors(  ) throw (::script::BasicErrorException, ::uno::Runt
 }
 
 ::uno::Any SAL_CALL
-ScVbaWorkbook::Colors( const ::uno::Any& Index ) throw (::script::BasicErrorException, ::uno::RuntimeException, std::exception)
+ScVbaWorkbook::Colors( const ::uno::Any& Index )
 {
     uno::Any aRet;
     if ( Index.hasValue() )
@@ -137,7 +137,7 @@ bool ScVbaWorkbook::setFilterPropsFromFormat( sal_Int32 nFormat, uno::Sequence<
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaWorkbook::getFileFormat(  ) throw (::uno::RuntimeException, std::exception)
+ScVbaWorkbook::getFileFormat(  )
 {
         sal_Int32 aFileFormat = 0;
         OUString aFilterName;
@@ -216,7 +216,7 @@ ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args,
 }
 
 uno::Reference< excel::XWorksheet >
-ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException, std::exception)
+ScVbaWorkbook::getActiveSheet()
 {
     uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ), uno::UNO_SET_THROW );
     uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -229,13 +229,13 @@ ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-ScVbaWorkbook::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorkbook::Sheets( const uno::Any& aIndex )
 {
     return Worksheets( aIndex );
 }
 
 uno::Any SAL_CALL
-ScVbaWorkbook::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorkbook::Worksheets( const uno::Any& aIndex )
 {
     uno::Reference< frame::XModel > xModel( getModel() );
     uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xModel, uno::UNO_QUERY_THROW );
@@ -249,7 +249,7 @@ ScVbaWorkbook::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException
     return uno::Any( xWorkSheets->Item( aIndex, uno::Any() ) );
 }
 uno::Any SAL_CALL
-ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorkbook::Windows( const uno::Any& aIndex )
 {
 
     uno::Reference< excel::XWindows >  xWindows( new ScVbaWindows( getParent(), mxContext ) );
@@ -259,32 +259,32 @@ ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException, s
 }
 
 void SAL_CALL
-ScVbaWorkbook::Activate() throw (uno::RuntimeException, std::exception)
+ScVbaWorkbook::Activate()
 {
     VbaDocumentBase::Activate();
 }
 
 void
-ScVbaWorkbook::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException)
+ScVbaWorkbook::Protect( const uno::Any &aPassword )
 {
     VbaDocumentBase::Protect( aPassword );
 }
 
 sal_Bool
-ScVbaWorkbook::getProtectStructure() throw (uno::RuntimeException, std::exception)
+ScVbaWorkbook::getProtectStructure()
 {
     uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
     return xProt->isProtected();
 }
 
-sal_Bool SAL_CALL ScVbaWorkbook::getPrecisionAsDisplayed() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaWorkbook::getPrecisionAsDisplayed()
 {
     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
     ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument();
     return rDoc.GetDocOptions().IsCalcAsShown();
 }
 
-void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed )
 {
     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
     ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument();
@@ -294,7 +294,7 @@ void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDispl
 }
 
 void
-ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeException, std::exception)
+ScVbaWorkbook::SaveCopyAs( const OUString& sFileName )
 {
     OUString aURL;
     osl::FileBase::getFileURLFromSystemPath( sFileName, aURL );
@@ -306,7 +306,7 @@ ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeExcep
 }
 
 void SAL_CALL
-ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ ) throw (css::uno::RuntimeException, std::exception)
+ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*ReadOnlyRecommended*/, const uno::Any& /*CreateBackup*/, const uno::Any& /*AccessMode*/, const uno::Any& /*ConflictResolution*/, const uno::Any& /*AddToMru*/, const uno::Any& /*TextCodepage*/, const uno::Any& /*TextVisualLayout*/, const uno::Any& /*Local*/ )
 {
     OUString sFileName;
     FileName >>= sFileName;
@@ -355,7 +355,7 @@ ScVbaWorkbook::SaveAs( const uno::Any& FileName, const uno::Any& FileFormat, con
 }
 
 css::uno::Any SAL_CALL
-ScVbaWorkbook::Styles( const uno::Any& Item ) throw (::script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaWorkbook::Styles( const uno::Any& Item )
 {
     // quick look and Styles object doesn't seem to have a valid parent
     // or a least the object browser just shows an object that has no
@@ -367,7 +367,7 @@ ScVbaWorkbook::Styles( const uno::Any& Item ) throw (::script::BasicErrorExcepti
 }
 
 uno::Any SAL_CALL
-ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorkbook::Names( const uno::Any& aIndex )
 {
     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW );
     uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW );
@@ -397,14 +397,14 @@ ScVbaWorkbook::getServiceNames()
 }
 
 OUString SAL_CALL
-ScVbaWorkbook::getCodeName() throw (css::uno::RuntimeException, std::exception)
+ScVbaWorkbook::getCodeName()
 {
     uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY_THROW );
     return xModelProp->getPropertyValue("CodeName").get< OUString >();
 }
 
 sal_Int64
-ScVbaWorkbook::getSomething(const uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception)
+ScVbaWorkbook::getSomething(const uno::Sequence<sal_Int8 >& rId )
 {
     if (rId.getLength() == 16 &&
         0 == memcmp( ScVbaWorksheet::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ))
diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx
index 647641e1d6e8..25c4b188017c 100644
--- a/sc/source/ui/vba/vbaworkbook.hxx
+++ b/sc/source/ui/vba/vbaworkbook.hxx
@@ -40,35 +40,35 @@ public:
     ScVbaWorkbook(  css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
 
     // Attributes
-    virtual sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getPrecisionAsDisplayed() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getProtectStructure() override;
+    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() override;
+    virtual sal_Bool SAL_CALL getPrecisionAsDisplayed() override;
+    virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) override;
+    virtual void SAL_CALL Activate() override;
+    virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) override;
+    virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) override;
+    virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override;
 
-    virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ResetColors(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getFileFormat(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) override;
+    virtual void SAL_CALL ResetColors(  ) override;
+    virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) override;
+    virtual ::sal_Int32 SAL_CALL getFileFormat(  ) override;
+    virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) override;
 
     // code name
-    virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCodeName() override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 
     // XUnoTunnel
-    virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) override;
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOK_HXX
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 0eb690c9fc18..c26088c42f1a 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -79,9 +79,9 @@ class WorkBookEnumImpl : public EnumerationHelperImpl
 {
 public:
     /// @throws uno::RuntimeException
-    WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {}
+    WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {}
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         uno::Reference< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
         return getWorkbook( m_xContext, xDoc, m_xParent );
@@ -94,12 +94,12 @@ ScVbaWorkbooks::ScVbaWorkbooks( const uno::Reference< XHelperInterface >& xParen
 }
 // XEnumerationAccess
 uno::Type
-ScVbaWorkbooks::getElementType() throw (uno::RuntimeException)
+ScVbaWorkbooks::getElementType()
 {
     return cppu::UnoType<excel::XWorkbook>::get();
 }
 uno::Reference< container::XEnumeration >
-ScVbaWorkbooks::createEnumeration() throw (uno::RuntimeException)
+ScVbaWorkbooks::createEnumeration()
 {
     // #FIXME its possible the WorkBookEnumImpl here doesn't reflect
     // the state of this object ( although it should ) would be
@@ -117,7 +117,7 @@ ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Any SAL_CALL
-ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException, std::exception)
+ScVbaWorkbooks::Add( const uno::Any& Template )
 {
     uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc;
     sal_Int32 nWorkbookType = 0;
@@ -161,7 +161,7 @@ ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException, st
 }
 
 void SAL_CALL
-ScVbaWorkbooks::Close() throw (uno::RuntimeException, std::exception)
+ScVbaWorkbooks::Close()
 {
 }
 
@@ -200,7 +200,7 @@ ScVbaWorkbooks::getFileFilterType( const OUString& rFileName )
 
 // #TODO# #FIXME# can any of the unused params below be used?
 uno::Any SAL_CALL
-ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ )
 {
     // we need to detect if this is a URL, if not then assume it's a file path
     OUString aURL;
diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx
index a30359be3c69..c9825d51e039 100644
--- a/sc/source/ui/vba/vbaworkbooks.hxx
+++ b/sc/source/ui/vba/vbaworkbooks.hxx
@@ -39,8 +39,8 @@ public:
     ScVbaWorkbooks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // ScVbaWorkbooks_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
@@ -48,9 +48,9 @@ public:
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 
     // XWorkbooks
-    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) override;
+    virtual void SAL_CALL Close(  ) override;
+    virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) override;
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index ff021a8c8eec..30e9fdb3828b 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -181,12 +181,12 @@ openNewDoc(const OUString& aSheetName )
 
 ScVbaWorksheet::ScVbaWorksheet(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
         const uno::Reference< sheet::XSpreadsheet >& xSheet,
-        const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel), mbVeryHidden( false )
+        const uno::Reference< frame::XModel >& xModel ) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel), mbVeryHidden( false )
 {
 }
 
 ScVbaWorksheet::ScVbaWorksheet( uno::Sequence< uno::Any> const & args,
-    uno::Reference< uno::XComponentContext> const & xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) :  WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ), mbVeryHidden( false )
+    uno::Reference< uno::XComponentContext> const & xContext ) :  WorksheetImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ), mbVeryHidden( false )
 {
     if ( args.getLength() < 3 )
         throw lang::IllegalArgumentException();
@@ -283,21 +283,21 @@ ScVbaWorksheet::createSheetCopy(uno::Reference<excel::XWorksheet> const & xSheet
 }
 
 OUString
-ScVbaWorksheet::getName() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getName()
 {
     uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW );
     return xNamed->getName();
 }
 
 void
-ScVbaWorksheet::setName(const OUString &rName ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::setName(const OUString &rName )
 {
     uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW );
     xNamed->setName( rName );
 }
 
 sal_Int32
-ScVbaWorksheet::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getVisible()
 {
     uno::Reference< beans::XPropertySet > xProps( getSheet(), uno::UNO_QUERY_THROW );
     bool bVisible = false;
@@ -307,7 +307,7 @@ ScVbaWorksheet::getVisible() throw (uno::RuntimeException, std::exception)
 }
 
 void
-ScVbaWorksheet::setVisible( sal_Int32 nVisible ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::setVisible( sal_Int32 nVisible )
 {
     using namespace ::ooo::vba::excel::XlSheetVisibility;
     bool bVisible = true;
@@ -333,13 +333,13 @@ ScVbaWorksheet::setVisible( sal_Int32 nVisible ) throw (uno::RuntimeException, s
 }
 
 sal_Int16
-ScVbaWorksheet::getIndex() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getIndex()
 {
     return getSheetID() + 1;
 }
 
 sal_Int32
-ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getEnableSelection()
 {
     uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
     SCTAB nTab = 0;
@@ -366,7 +366,7 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException, std::exceptio
 }
 
 void
-ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection )
 {
     if( (nSelection != excel::XlEnableSelection::xlNoRestrictions) &&
         (nSelection != excel::XlEnableSelection::xlUnlockedCells) &&
@@ -405,7 +405,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx
 
 }
 
-sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode()
 {
     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
     ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument();
@@ -415,7 +415,7 @@ sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode() throw (uno::RuntimeExcepti
     return false;
 }
 
-void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode )
 {
     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
     ScDocShell* pDocShell = excel::getDocShell( xModel );
@@ -441,7 +441,7 @@ void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode ) thro
 }
 
 uno::Reference< excel::XRange >
-ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getUsedRange()
 {
      uno::Reference< sheet::XSheetCellRange > xSheetCellRange(getSheet(), uno::UNO_QUERY_THROW );
     uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor( getSheet()->createCursorByRange( xSheetCellRange ), uno::UNO_QUERY_THROW );
@@ -453,20 +453,20 @@ ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< excel::XOutline >
-ScVbaWorksheet::Outline( ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Outline( )
 {
     uno::Reference<sheet::XSheetOutline> xOutline(getSheet(),uno::UNO_QUERY_THROW);
     return new ScVbaOutline( this, mxContext, xOutline);
 }
 
 uno::Reference< excel::XPageSetup >
-ScVbaWorksheet::PageSetup( ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::PageSetup( )
 {
     return new ScVbaPageSetup( this, mxContext, getSheet(), getModel() );
 }
 
 uno::Any
-ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex )
 {
     uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak(getSheet(),uno::UNO_QUERY_THROW);
     uno::Reference< excel::XHPageBreaks > xHPageBreaks( new ScVbaHPageBreaks( this, mxContext, xSheetPageBreak));
@@ -476,7 +476,7 @@ ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) throw (uno::RuntimeExcepti
 }
 
 uno::Any
-ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) throw ( uno::RuntimeException, std::exception )
+ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex )
 {
     uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak( getSheet(), uno::UNO_QUERY_THROW );
     uno::Reference< excel::XVPageBreaks > xVPageBreaks( new ScVbaVPageBreaks( this, mxContext, xSheetPageBreak ) );
@@ -486,32 +486,32 @@ ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) throw ( uno::RuntimeExcept
 }
 
 sal_Int32
-ScVbaWorksheet::getStandardWidth() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getStandardWidth()
 {
     return STANDARDWIDTH ;
 }
 
 sal_Int32
-ScVbaWorksheet::getStandardHeight() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getStandardHeight()
 {
     return STANDARDHEIGHT;
 }
 
 sal_Bool
-ScVbaWorksheet::getProtectionMode() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getProtectionMode()
 {
     return false;
 }
 
 sal_Bool
-ScVbaWorksheet::getProtectContents()throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getProtectContents()
 {
     uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW);
     return xProtectable->isProtected();
 }
 
 sal_Bool
-ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getProtectDrawingObjects()
 {
     SCTAB nTab = 0;
     OUString aSheetName = getName();
@@ -529,13 +529,13 @@ ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException, std::ex
 }
 
 sal_Bool
-ScVbaWorksheet::getProtectScenarios() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getProtectScenarios()
 {
     return false;
 }
 
 void
-ScVbaWorksheet::Activate() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Activate()
 {
     uno::Reference< sheet::XSpreadsheetView > xSpreadsheet(
             getModel()->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -543,13 +543,13 @@ ScVbaWorksheet::Activate() throw (uno::RuntimeException, std::exception)
 }
 
 void
-ScVbaWorksheet::Select() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Select()
 {
     Activate();
 }
 
 void
-ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After )
 {
     uno::Reference<excel::XWorksheet> xSheet;
     OUString aCurrSheetName = getName();
@@ -586,7 +586,7 @@ ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno
 }
 
 void
-ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After )
 {
     uno::Reference<excel::XWorksheet> xSheet;
     if (!(Before >>= xSheet) && !(After >>=xSheet)&& !(Before.hasValue()) && !(After.hasValue()))
@@ -600,7 +600,7 @@ ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno
 }
 
 void
-ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ )
 {
     // #TODO# #FIXME# Link is not used
     uno::Reference<excel::XRange> xRange( Destination, uno::UNO_QUERY );
@@ -610,7 +610,7 @@ ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) t
 }
 
 void
-ScVbaWorksheet::Delete() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Delete()
 {
     uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
     OUString aSheetName = getName();
@@ -629,7 +629,7 @@ ScVbaWorksheet::Delete() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< excel::XWorksheet >
-ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException)
+ScVbaWorksheet::getSheetAtOffset(SCTAB offset)
 {
     uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
     uno::Reference <sheet::XSpreadsheets> xSheets( xSpreadDoc->getSheets(), uno::UNO_QUERY_THROW );
@@ -645,19 +645,19 @@ ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException)
 }
 
 uno::Reference< excel::XWorksheet >
-ScVbaWorksheet::getNext() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getNext()
 {
     return getSheetAtOffset(static_cast<SCTAB>(1));
 }
 
 uno::Reference< excel::XWorksheet >
-ScVbaWorksheet::getPrevious() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getPrevious()
 {
     return getSheetAtOffset(-1);
 }
 
 void
-ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObjects*/, const uno::Any& /*Contents*/, const uno::Any& /*Scenarios*/, const uno::Any& /*UserInterfaceOnly*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObjects*/, const uno::Any& /*Contents*/, const uno::Any& /*Scenarios*/, const uno::Any& /*UserInterfaceOnly*/ )
 {
     // #TODO# #FIXME# is there anything we can do with the unused param
     // can the implementation use anything else here
@@ -668,7 +668,7 @@ ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObje
 }
 
 void
-ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Unprotect( const uno::Any& Password )
 {
     uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW);
     OUString aPasswd;
@@ -677,14 +677,14 @@ ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeExcepti
 }
 
 void
-ScVbaWorksheet::Calculate() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Calculate()
 {
     uno::Reference <sheet::XCalculatable> xReCalculate(getModel(), uno::UNO_QUERY_THROW);
     xReCalculate->calculate();
 }
 
 uno::Reference< excel::XRange >
-ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 )
 {
     uno::Reference< excel::XRange > xSheetRange( new ScVbaRange( this, mxContext
 , uno::Reference< table::XCellRange >( getSheet(), uno::UNO_QUERY_THROW ) ) );
@@ -692,7 +692,7 @@ ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 ) throw
 }
 
 void
-ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ )
 {
     // #TODO# #FIXME# unused params above, can we do anything with those
     OUString url = ".uno:SpellDialog";
@@ -701,7 +701,7 @@ ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::A
 }
 
 uno::Reference< excel::XRange >
-ScVbaWorksheet::getSheetRange() throw (uno::RuntimeException)
+ScVbaWorksheet::getSheetRange()
 {
     uno::Reference< table::XCellRange > xRange( getSheet(),uno::UNO_QUERY_THROW );
     return uno::Reference< excel::XRange >( new ScVbaRange( this, mxContext, xRange ) );
@@ -711,7 +711,6 @@ ScVbaWorksheet::getSheetRange() throw (uno::RuntimeException)
 // the vbarange functionality here ...
 uno::Reference< excel::XRange >
 ScVbaWorksheet::Cells( const ::uno::Any &nRow, const ::uno::Any &nCol )
-        throw (uno::RuntimeException, std::exception)
 {
     // Performance optimization for often-called Cells method:
     // Use a common helper method instead of creating a new ScVbaRange object
@@ -720,19 +719,19 @@ ScVbaWorksheet::Cells( const ::uno::Any &nRow, const ::uno::Any &nCol )
 }
 
 uno::Reference< excel::XRange >
-ScVbaWorksheet::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Rows(const uno::Any& aIndex )
 {
     return getSheetRange()->Rows( aIndex );
 }
 
 uno::Reference< excel::XRange >
-ScVbaWorksheet::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Columns( const uno::Any& aIndex )
 {
     return getSheetRange()->Columns( aIndex );
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::ChartObjects( const uno::Any& Index )
 {
     if ( !mxCharts.is() )
     {
@@ -753,7 +752,7 @@ ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeExcepti
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::PivotTables( const uno::Any& Index ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::PivotTables( const uno::Any& Index )
 {
     uno::Reference< css::sheet::XSpreadsheet > xSheet = getSheet();
     uno::Reference< sheet::XDataPilotTablesSupplier > xTables(xSheet, uno::UNO_QUERY_THROW ) ;
@@ -766,7 +765,7 @@ ScVbaWorksheet::PivotTables( const uno::Any& Index ) throw (uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::Comments( const uno::Any& Index ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Comments( const uno::Any& Index )
 {
     uno::Reference< css::sheet::XSpreadsheet > xSheet = getSheet();
     uno::Reference< sheet::XSheetAnnotationsSupplier > xAnnosSupp( xSheet, uno::UNO_QUERY_THROW );
@@ -779,7 +778,7 @@ ScVbaWorksheet::Comments( const uno::Any& Index ) throw (uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex )
 {
     /*  The worksheet always returns the same Hyperlinks object.
         See vbahyperlinks.hxx for more details. */
@@ -791,7 +790,7 @@ ScVbaWorksheet::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Names( const css::uno::Any& aIndex )
 {
     // fake sheet-local names by returning all global names
     // #163498# initialize Names object with correct parent (this worksheet)
@@ -805,7 +804,7 @@ ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::OLEObjects( const uno::Any& Index ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::OLEObjects( const uno::Any& Index )
 {
     uno::Reference< sheet::XSpreadsheet > xSpreadsheet( getSheet(), uno::UNO_QUERY_THROW );
     uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( xSpreadsheet, uno::UNO_QUERY_THROW );
@@ -819,7 +818,7 @@ ScVbaWorksheet::OLEObjects( const uno::Any& Index ) throw (uno::RuntimeException
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::Shapes( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Shapes( const uno::Any& aIndex )
 {
     uno::Reference< sheet::XSpreadsheet > xSpreadsheet( getSheet(), uno::UNO_QUERY_THROW );
     uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( xSpreadsheet, uno::UNO_QUERY_THROW );
@@ -833,7 +832,7 @@ ScVbaWorksheet::Shapes( const uno::Any& aIndex ) throw (uno::RuntimeException, s
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::Buttons( const uno::Any& rIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Buttons( const uno::Any& rIndex )
 {
     if( !mxButtons.is() )
         mxButtons.set( new ScVbaButtons( this, mxContext, mxModel, mxSheet ) );
@@ -845,55 +844,55 @@ ScVbaWorksheet::Buttons( const uno::Any& rIndex ) throw (uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::CheckBoxes( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::CheckBoxes( const uno::Any& /*rIndex*/ )
 {
     throw uno::RuntimeException();
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::DropDowns( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::DropDowns( const uno::Any& /*rIndex*/ )
 {
     throw uno::RuntimeException();
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::GroupBoxes( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::GroupBoxes( const uno::Any& /*rIndex*/ )
 {
     throw uno::RuntimeException();
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::Labels( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Labels( const uno::Any& /*rIndex*/ )
 {
     throw uno::RuntimeException();
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::ListBoxes( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::ListBoxes( const uno::Any& /*rIndex*/ )
 {
     throw uno::RuntimeException();
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::OptionButtons( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::OptionButtons( const uno::Any& /*rIndex*/ )
 {
     throw uno::RuntimeException();
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::ScrollBars( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::ScrollBars( const uno::Any& /*rIndex*/ )
 {
     throw uno::RuntimeException();
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::Spinners( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Spinners( const uno::Any& /*rIndex*/ )
 {
     throw uno::RuntimeException();
 }
 
 void SAL_CALL
-ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::ShowDataForm( )
 {
     uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
     ScTabViewShell* pTabViewShell = excel::getBestViewShell( xModel );
@@ -909,7 +908,7 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::Evaluate( const OUString& Name )
 {
     // #TODO Evaluate allows other things to be evaluated, e.g. functions
     // I think ( like SIN(3) etc. ) need to investigate that
@@ -919,24 +918,24 @@ ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException, s
 }
 
 uno::Reference< beans::XIntrospectionAccess > SAL_CALL
-ScVbaWorksheet::getIntrospection(  ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::getIntrospection(  )
 {
     return uno::Reference< beans::XIntrospectionAccess >();
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+ScVbaWorksheet::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ )
 {
     throw uno::RuntimeException("Unsupported"); // unsupported operation
 }
 
 void SAL_CALL
-ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     setDefaultPropByIntrospection( getValue( aPropertyName ), aValue );
 }
 uno::Any SAL_CALL
-ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+ScVbaWorksheet::getValue( const OUString& aPropertyName )
 {
     uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
 
@@ -947,7 +946,7 @@ ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownP
 }
 
 sal_Bool SAL_CALL
-ScVbaWorksheet::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::hasMethod( const OUString& /*aName*/ )
 {
     return false;
 }
@@ -976,7 +975,7 @@ ScVbaWorksheet::getFormControls()
 
                 }
 sal_Bool SAL_CALL
-ScVbaWorksheet::hasProperty( const OUString& aName ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::hasProperty( const OUString& aName )
 {
     uno::Reference< container::XNameAccess > xFormControls( getFormControls() );
     if ( xFormControls.is() )
@@ -1024,13 +1023,13 @@ ScVbaWorksheet::getServiceImplName()
 }
 
 void SAL_CALL
-ScVbaWorksheet::setEnableCalculation( sal_Bool bEnableCalculation ) throw ( script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaWorksheet::setEnableCalculation( sal_Bool bEnableCalculation )
 {
     uno::Reference <sheet::XCalculatable> xCalculatable(getModel(), uno::UNO_QUERY_THROW);
         xCalculatable->enableAutomaticCalculation( bEnableCalculation);
 }
 sal_Bool SAL_CALL
-ScVbaWorksheet::getEnableCalculation(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaWorksheet::getEnableCalculation(  )
 {
     uno::Reference <sheet::XCalculatable> xCalculatable(getModel(), uno::UNO_QUERY_THROW);
     return xCalculatable->isAutomaticCalculationEnabled();
@@ -1049,21 +1048,21 @@ ScVbaWorksheet::getServiceNames()
 }
 
 OUString SAL_CALL
-ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException, std::exception)
+ScVbaWorksheet::getCodeName()
 {
     uno::Reference< beans::XPropertySet > xSheetProp( mxSheet, uno::UNO_QUERY_THROW );
     return xSheetProp->getPropertyValue("CodeName").get< OUString >();
 }
 
 sal_Int16
-ScVbaWorksheet::getSheetID() throw (uno::RuntimeException)
+ScVbaWorksheet::getSheetID()
 {
     uno::Reference< sheet::XCellRangeAddressable > xAddressable( mxSheet, uno::UNO_QUERY_THROW ); // if ActiveSheet, mxSheet is null.
     return xAddressable->getRangeAddress().Sheet;
 }
 
 void SAL_CALL
-ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName, const uno::Any& IgnorePrintAreas ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName, const uno::Any& IgnorePrintAreas )
 {
     sal_Int32 nTo = 0;
     sal_Int32 nFrom = 0;
@@ -1086,7 +1085,7 @@ ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::A
 }
 
 sal_Int64 SAL_CALL
-ScVbaWorksheet::getSomething(const uno::Sequence<sal_Int8 > & rId) throw(uno::RuntimeException, std::exception)
+ScVbaWorksheet::getSomething(const uno::Sequence<sal_Int8 > & rId)
 {
     if (rId.getLength() == 16 &&
         0 == memcmp( ScVbaWorksheet::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ))
diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx
index 207b60355895..a1d8fa11f9ec 100644
--- a/sc/source/ui/vba/vbaworksheet.hxx
+++ b/sc/source/ui/vba/vbaworksheet.hxx
@@ -58,9 +58,9 @@ class ScVbaWorksheet : public WorksheetImpl_BASE
     bool mbVeryHidden;
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ov::excel::XWorksheet > getSheetAtOffset(SCTAB offset) throw (css::uno::RuntimeException);
+    css::uno::Reference< ov::excel::XWorksheet > getSheetAtOffset(SCTAB offset);
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ov::excel::XRange > getSheetRange() throw (css::uno::RuntimeException);
+    css::uno::Reference< ov::excel::XRange > getSheetRange();
 
     css::uno::Reference< css::container::XNameAccess > getFormControls();
     css::uno::Any getControlShape( const OUString& sName );
@@ -70,10 +70,10 @@ public:
     ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent,
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet,
-        const css::uno::Reference< css::frame::XModel >& xModel )throw (css::uno::RuntimeException)  ;
+        const css::uno::Reference< css::frame::XModel >& xModel )  ;
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
 
     virtual ~ScVbaWorksheet() override;
 
@@ -86,88 +86,88 @@ public:
     css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> const & xSheet, bool bAfter);
 
     // Attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getStandardHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getProtectionMode() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getProtectContents() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getProtectDrawingObjects() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getProtectScenarios() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() throw (css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() throw (css::uno::RuntimeException, std::exception) override;
-     virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) override;
-     virtual sal_Int32 SAL_CALL getEnableSelection() throw (css::uno::RuntimeException, std::exception) override;
-     virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoFilterMode() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString &rName ) override;
+    virtual sal_Int32 SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Int32 nVisible ) override;
+    virtual ::sal_Int32 SAL_CALL getStandardWidth() override;
+    virtual ::sal_Int32 SAL_CALL getStandardHeight() override;
+    virtual sal_Bool SAL_CALL getProtectionMode() override;
+    virtual sal_Bool SAL_CALL getProtectContents() override;
+    virtual sal_Bool SAL_CALL getProtectDrawingObjects() override;
+    virtual sal_Bool SAL_CALL getProtectScenarios() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() override ;
+    virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) override;
+    virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) override;
+    virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) override;
+    virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() override;
+    virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() override;
+     virtual sal_Int16 SAL_CALL getIndex() override;
+     virtual sal_Int32 SAL_CALL getEnableSelection() override;
+     virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) override;
+    virtual sal_Bool SAL_CALL getAutoFilterMode() override;
+    virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) override;
 
     // Methods
-    virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) override ;
-     virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Paste( const css::uno::Any& Destination, const css::uno::Any& Link ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Protect( const css::uno::Any& Password, const css::uno::Any& DrawingObjects, const css::uno::Any& Contents, const css::uno::Any& Scenarios, const css::uno::Any& UserInterfaceOnly ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Unprotect( const css::uno::Any& Password ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL Calculate(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL CheckSpelling( const css::uno::Any& CustomDictionary,const css::uno::Any& IgnoreUppercase,const css::uno::Any& AlwaysSuggest, const css::uno::Any& SpellingLang ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Activate() override;
+    virtual void SAL_CALL Select() override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) override;
+    virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) override ;
+     virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) override;
+    virtual void SAL_CALL Paste( const css::uno::Any& Destination, const css::uno::Any& Link ) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual void SAL_CALL Protect( const css::uno::Any& Password, const css::uno::Any& DrawingObjects, const css::uno::Any& Contents, const css::uno::Any& Scenarios, const css::uno::Any& UserInterfaceOnly ) override;
+    virtual void SAL_CALL Unprotect( const css::uno::Any& Password ) override;
+
+    virtual void SAL_CALL Calculate(  ) override;
+    virtual void SAL_CALL CheckSpelling( const css::uno::Any& CustomDictionary,const css::uno::Any& IgnoreUppercase,const css::uno::Any& AlwaysSuggest, const css::uno::Any& SpellingLang ) override;
     // Hacks (?)
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Any SAL_CALL OLEObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Any SAL_CALL Buttons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL CheckBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL DropDowns( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL GroupBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Labels( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL ListBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL OptionButtons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL ScrollBars( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL setEnableCalculation( sal_Bool EnableCalculation ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getEnableCalculation(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ShowDataForm(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) override;
+    virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) override;
+
+    virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) override;
+    virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) override;
+    virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) override;
+    virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) override;
+
+    virtual css::uno::Any SAL_CALL OLEObjects( const css::uno::Any& Index ) override;
+    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) override;
+
+    virtual css::uno::Any SAL_CALL Buttons( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL CheckBoxes( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL DropDowns( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL GroupBoxes( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL Labels( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL ListBoxes( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL OptionButtons( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL ScrollBars( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) override;
+
+    virtual void SAL_CALL setEnableCalculation( sal_Bool EnableCalculation ) override;
+    virtual sal_Bool SAL_CALL getEnableCalculation(  ) override;
+    virtual void SAL_CALL ShowDataForm(  ) override;
     // XInvocation
-    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) override;
+    virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) override;
+    virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override;
     // CodeName
-    virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCodeName() override;
     /// @throws css::uno::RuntimeException
-    sal_Int16 getSheetID() throw (css::uno::RuntimeException);
+    sal_Int16 getSheetID();
 
-    virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     // XUnoTunnel
-    virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) override;
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEET_HXX
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 0592ca1e0f77..e4accbffbab9 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -66,11 +66,11 @@ class WorkSheetsEnumeration : public ::cppu::WeakImplHelper< container::XEnumera
     SheetMap::iterator mIt;
 public:
     explicit WorkSheetsEnumeration( const SheetMap& sMap ) : mSheetMap( sMap ), mIt( mSheetMap.begin() ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( mIt != mSheetMap.end() );
     }
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !hasMoreElements() )
             throw container::NoSuchElementException();
@@ -88,16 +88,16 @@ class SheetCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAcc
 public:
     explicit SheetCollectionHelper( const SheetMap& sMap ) : mSheetMap( sMap ), cachePos(mSheetMap.begin()) {}
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override { return  cppu::UnoType<sheet::XSpreadsheet>::get(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override { return ( !mSheetMap.empty() ); }
+    virtual uno::Type SAL_CALL getElementType(  ) override { return  cppu::UnoType<sheet::XSpreadsheet>::get(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return ( !mSheetMap.empty() ); }
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName(aName) )
             throw container::NoSuchElementException();
         return uno::makeAny( *cachePos );
     }
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         uno::Sequence< OUString > sNames( mSheetMap.size() );
         OUString* pString = sNames.getArray();
@@ -111,7 +111,7 @@ public:
         }
         return sNames;
     }
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         cachePos = mSheetMap.begin();
         SheetMap::iterator it_end = mSheetMap.end();
@@ -125,8 +125,8 @@ public:
     }
 
     // XElementAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override { return mSheetMap.size(); }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override { return mSheetMap.size(); }
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw lang::IndexOutOfBoundsException();
@@ -135,7 +135,7 @@ public:
 
     }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new WorkSheetsEnumeration( mSheetMap );
     }
@@ -146,9 +146,9 @@ class SheetsEnumeration : public EnumerationHelperImpl
     uno::Reference< frame::XModel > m_xModel;
 public:
     /// @throws uno::RuntimeException
-    SheetsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {}
+    SheetsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {}
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         uno::Reference< sheet::XSpreadsheet > xSheet( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
         uno::Reference< XHelperInterface > xIf = excel::getUnoSheetModuleObj( xSheet );
@@ -177,13 +177,13 @@ ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xPar
 
 // XEnumerationAccess
 uno::Type
-ScVbaWorksheets::getElementType() throw (uno::RuntimeException)
+ScVbaWorksheets::getElementType()
 {
     return cppu::UnoType<excel::XWorksheet>::get();
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaWorksheets::createEnumeration() throw (uno::RuntimeException)
+ScVbaWorksheets::createEnumeration()
 {
     if ( !m_xSheets.is() )
     {
@@ -215,7 +215,7 @@ ScVbaWorksheets::createCollectionObject( const uno::Any& aSource )
 // XWorksheets
 uno::Any
 ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
-                     const uno::Any& Count, const uno::Any& Type ) throw (uno::RuntimeException, std::exception)
+                     const uno::Any& Count, const uno::Any& Type )
 {
     if ( isSelectedSheets() )
         return uno::Any(); // or should we throw?
@@ -288,7 +288,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
 }
 
 void
-ScVbaWorksheets::Delete() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheets::Delete()
 {
     // #TODO #INVESTIGATE
     // mmm this method could be trouble if the underlying
@@ -309,7 +309,7 @@ ScVbaWorksheets::isSelectedSheets()
 }
 
 void SAL_CALL
-ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName )
 {
     sal_Int32 nTo = 0;
     sal_Int32 nFrom = 0;
@@ -330,7 +330,7 @@ ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheets::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaWorksheets::getVisible()
 {
     bool bVisible = true;
     uno::Reference< container::XEnumeration > xEnum( createEnumeration(), uno::UNO_QUERY_THROW );
@@ -347,7 +347,7 @@ ScVbaWorksheets::getVisible() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheets::setVisible( const uno::Any& _visible )
 {
     bool bState = false;
     if ( _visible >>= bState )
@@ -364,7 +364,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep
 }
 
 void SAL_CALL
-ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException, std::exception)
+ScVbaWorksheets::Select( const uno::Any& Replace )
 {
     ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel );
     if ( !pViewShell )
@@ -394,7 +394,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException,
 }
 
 void SAL_CALL
-ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) throw (css::uno::RuntimeException, std::exception)
+ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After)
 {
     uno::Reference<excel::XWorksheet> xSheet;
     sal_Int32 nElems = getCount();
@@ -437,7 +437,6 @@ ScVbaWorksheets::Copy ( const uno::Any& Before, const uno::Any& After) throw (cs
 //ScVbaCollectionBaseImpl
 uno::Any SAL_CALL
 ScVbaWorksheets::Item(const uno::Any& Index, const uno::Any& Index2)
-    throw (lang::IndexOutOfBoundsException, script::BasicErrorException, uno::RuntimeException)
 {
     if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE )
     {
@@ -481,7 +480,7 @@ ScVbaWorksheets::getServiceNames()
     return sNames;
 }
 
-bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException, uno::RuntimeException )
+bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab )
 {
     if (!xSpreadDoc.is())
         throw lang::IllegalArgumentException( "nameExists() xSpreadDoc is null", uno::Reference< uno::XInterface  >(), 1 );
@@ -502,7 +501,7 @@ bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>&
     return false;
 }
 
-void ScVbaWorksheets::PrintPreview( const css::uno::Any& /*EnableChanges*/ ) throw (css::uno::RuntimeException, std::exception)
+void ScVbaWorksheets::PrintPreview( const css::uno::Any& /*EnableChanges*/ )
 {
     // need test, print preview current active sheet
     // !! TODO !! get view shell from controller
diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx
index 82c3e7aeb500..26e8d227df67 100644
--- a/sc/source/ui/vba/vbaworksheets.hxx
+++ b/sc/source/ui/vba/vbaworksheets.hxx
@@ -42,28 +42,27 @@ public:
     bool isSelectedSheets();
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // XWorksheets
-    virtual css::uno::Any SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) override;
+    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) override;
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
-    virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Select( const css::uno::Any& Replace ) override;
+    virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) override;
+    virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) override;
     // ScVbaWorksheets_BASE
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 )
-        throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) override;
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab );
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEETS_HXX
diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx
index 4b70c34d3fe2..5e319fe7173b 100644
--- a/sc/source/ui/vba/vbawsfunction.cxx
+++ b/sc/source/ui/vba/vbawsfunction.cxx
@@ -72,13 +72,13 @@ ScVbaWSFunction::ScVbaWSFunction( const uno::Reference< XHelperInterface >& xPar
 }
 
 uno::Reference< beans::XIntrospectionAccess >
-ScVbaWSFunction::getIntrospection()  throw(uno::RuntimeException, std::exception)
+ScVbaWSFunction::getIntrospection()
 {
     return uno::Reference<beans::XIntrospectionAccess>();
 }
 
 uno::Any SAL_CALL
-ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/)
 {
     // create copy of parameters, replace Excel range objects with UNO range objects
     uno::Sequence< uno::Any > aParamTemp( Params );
@@ -244,19 +244,19 @@ ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::
 }
 
 void SAL_CALL
-ScVbaWSFunction::setValue(const OUString& /*PropertyName*/, const uno::Any& /*Value*/) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+ScVbaWSFunction::setValue(const OUString& /*PropertyName*/, const uno::Any& /*Value*/)
 {
     throw beans::UnknownPropertyException();
 }
 
 uno::Any SAL_CALL
-ScVbaWSFunction::getValue(const OUString& /*PropertyName*/) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+ScVbaWSFunction::getValue(const OUString& /*PropertyName*/)
 {
     throw beans::UnknownPropertyException();
 }
 
 sal_Bool SAL_CALL
-ScVbaWSFunction::hasMethod(const OUString& Name)  throw(uno::RuntimeException, std::exception)
+ScVbaWSFunction::hasMethod(const OUString& Name)
 {
     bool bIsFound = false;
     try
@@ -276,13 +276,13 @@ ScVbaWSFunction::hasMethod(const OUString& Name)  throw(uno::RuntimeException, s
 }
 
 sal_Bool SAL_CALL
-ScVbaWSFunction::hasProperty(const OUString& /*Name*/)  throw(uno::RuntimeException, std::exception)
+ScVbaWSFunction::hasProperty(const OUString& /*Name*/)
 {
      return false;
 }
 
 OUString SAL_CALL
-ScVbaWSFunction::getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception)
+ScVbaWSFunction::getExactName( const OUString& aApproximateName )
 {
     OUString sName = aApproximateName.toAsciiUpperCase();
     if ( !hasMethod( sName ) )
diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx
index 058794d748cc..eaedf551fdf5 100644
--- a/sc/source/ui/vba/vbawsfunction.hxx
+++ b/sc/source/ui/vba/vbawsfunction.hxx
@@ -33,13 +33,13 @@ class ScVbaWSFunction :  public ScVbaWSFunction_BASE
 public:
     ScVbaWSFunction( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-    virtual css::uno::Reference< css::beans::XIntrospectionAccess >  SAL_CALL getIntrospection()  throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any  SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void  SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any  SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool  SAL_CALL hasMethod(const OUString& Name)  throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool  SAL_CALL hasProperty(const OUString& Name)  throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XIntrospectionAccess >  SAL_CALL getIntrospection() override;
+    virtual css::uno::Any  SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) override;
+    virtual void  SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) override;
+    virtual css::uno::Any  SAL_CALL getValue(const OUString& PropertyName) override;
+    virtual sal_Bool  SAL_CALL hasMethod(const OUString& Name) override;
+    virtual sal_Bool  SAL_CALL hasProperty(const OUString& Name) override;
+    virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 4b000b5943fe..c8f5bf5265db 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -66,7 +66,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
     return pRet;
 }
 
-ResMgr& AnalysisAddIn::GetResMgr() throw( uno::RuntimeException, std::exception )
+ResMgr& AnalysisAddIn::GetResMgr()
 {
     if( !pResMgr )
     {
@@ -100,7 +100,7 @@ AnalysisFuncRes::AnalysisFuncRes( ResId& rRes, ResMgr& rResMgr, sal_uInt16 nInd,
     FreeResource();
 }
 
-OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( uno::RuntimeException, std::exception )
+OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex )
 {
     OUString                      aRet;
     AnalysisResourcePublisher   aResPubl( AnalysisResId( RID_ANALYSIS_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
@@ -158,7 +158,7 @@ AnalysisAddIn::~AnalysisAddIn()
 
 sal_Int32 AnalysisAddIn::getDateMode(
         const uno::Reference< beans::XPropertySet >& xPropSet,
-        const uno::Any& rAny ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        const uno::Any& rAny )
 {
     sal_Int32 nMode = aAnyConv.getInt32( xPropSet, rAny, 0 );
     if( (nMode < 0) || (nMode > 4) )
@@ -168,7 +168,7 @@ sal_Int32 AnalysisAddIn::getDateMode(
 
 #define MAXFACTDOUBLE   300
 
-double AnalysisAddIn::FactDouble( sal_Int32 nNum ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+double AnalysisAddIn::FactDouble( sal_Int32 nNum )
 {
     if( nNum < 0 || nNum > MAXFACTDOUBLE )
         throw lang::IllegalArgumentException();
@@ -229,43 +229,43 @@ uno::Reference< uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance(
 }
 
 // XServiceName
-OUString SAL_CALL AnalysisAddIn::getServiceName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getServiceName()
 {
     // name of specific AddIn service
     return OUString( MY_SERVICE );
 }
 
 // XServiceInfo
-OUString SAL_CALL AnalysisAddIn::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL AnalysisAddIn::supportsService( const OUString& aName ) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL AnalysisAddIn::supportsService( const OUString& aName )
 {
     return cppu::supportsService(this, aName);
 }
 
-uno::Sequence< OUString > SAL_CALL AnalysisAddIn::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL AnalysisAddIn::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
 // XLocalizable
-void SAL_CALL AnalysisAddIn::setLocale( const lang::Locale& eLocale ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL AnalysisAddIn::setLocale( const lang::Locale& eLocale )
 {
     aFuncLoc = eLocale;
 
     InitData();     // change of locale invalidates resources!
 }
 
-lang::Locale SAL_CALL AnalysisAddIn::getLocale() throw( uno::RuntimeException, std::exception )
+lang::Locale SAL_CALL AnalysisAddIn::getLocale()
 {
     return aFuncLoc;
 }
 
 // XAddIn
-OUString SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const OUString& ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const OUString& )
 {
     //  not used by calc
     //  (but should be implemented for other uses of the AddIn service)
@@ -273,7 +273,7 @@ OUString SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const OUString& ) t
     return OUString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgrammaticName )
 {
     OUString          aRet;
 
@@ -298,7 +298,7 @@ OUString SAL_CALL AnalysisAddIn::getDisplayFunctionName( const OUString& aProgra
     return aRet;
 }
 
-OUString SAL_CALL AnalysisAddIn::getFunctionDescription( const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getFunctionDescription( const OUString& aProgrammaticName )
 {
     OUString          aRet;
 
@@ -309,7 +309,7 @@ OUString SAL_CALL AnalysisAddIn::getFunctionDescription( const OUString& aProgra
     return aRet;
 }
 
-OUString SAL_CALL AnalysisAddIn::getDisplayArgumentName( const OUString& aName, sal_Int32 nArg ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getDisplayArgumentName( const OUString& aName, sal_Int32 nArg )
 {
     OUString          aRet;
 
@@ -326,7 +326,7 @@ OUString SAL_CALL AnalysisAddIn::getDisplayArgumentName( const OUString& aName,
     return aRet;
 }
 
-OUString SAL_CALL AnalysisAddIn::getArgumentDescription( const OUString& aName, sal_Int32 nArg ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getArgumentDescription( const OUString& aName, sal_Int32 nArg )
 {
     OUString          aRet;
 
@@ -345,7 +345,7 @@ OUString SAL_CALL AnalysisAddIn::getArgumentDescription( const OUString& aName,
 
 static const char pDefCatName[] = "Add-In";
 
-OUString SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const OUString& aName ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const OUString& aName )
 {
     //  return non-translated strings
     //  return OUString( "Add-In" );
@@ -370,7 +370,7 @@ OUString SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const OUString& aN
     return aRet;
 }
 
-OUString SAL_CALL AnalysisAddIn::getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getDisplayCategoryName( const OUString& aProgrammaticFunctionName )
 {
     //  return translated strings, not used for predefined categories
     //  return OUString( "Add-In" );
@@ -421,7 +421,7 @@ inline const lang::Locale& AnalysisAddIn::GetLocale( sal_uInt32 nInd )
         return aFuncLoc;
 }
 
-uno::Sequence< sheet::LocalizedName > SAL_CALL AnalysisAddIn::getCompatibilityNames( const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+uno::Sequence< sheet::LocalizedName > SAL_CALL AnalysisAddIn::getCompatibilityNames( const OUString& aProgrammaticName )
 {
     auto it = std::find_if(pFD->begin(), pFD->end(), FindFuncData( aProgrammaticName ) );
     if( it == pFD->end() )
@@ -445,7 +445,7 @@ uno::Sequence< sheet::LocalizedName > SAL_CALL AnalysisAddIn::getCompatibilityNa
 // XAnalysis
 /** Workday */
 sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( const uno::Reference< beans::XPropertySet >& xOptions,
-    sal_Int32 nDate, sal_Int32 nDays, const uno::Any& aHDay ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+    sal_Int32 nDate, sal_Int32 nDays, const uno::Any& aHDay )
 {
     if( !nDays )
         return nDate;
@@ -502,13 +502,13 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( const uno::Reference< beans::XProp
 
 /** Yearfrac */
 double SAL_CALL AnalysisAddIn::getYearfrac( const uno::Reference< beans::XPropertySet >& xOpt,
-    sal_Int32 nStartDate, sal_Int32 nEndDate, const uno::Any& rMode ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+    sal_Int32 nStartDate, sal_Int32 nEndDate, const uno::Any& rMode )
 {
     double fRet = GetYearFrac( xOpt, nStartDate, nEndDate, getDateMode( xOpt, rMode ) );
     RETURN_FINITE( fRet );
 }
 
-sal_Int32 SAL_CALL AnalysisAddIn::getEdate( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nMonths ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+sal_Int32 SAL_CALL AnalysisAddIn::getEdate( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nMonths )
 {
     sal_Int32 nNullDate = GetNullDate( xOpt );
     ScaDate aDate( nNullDate, nStartDate, 5 );
@@ -516,7 +516,7 @@ sal_Int32 SAL_CALL AnalysisAddIn::getEdate( const uno::Reference< beans::XProper
     return aDate.getDate( nNullDate );
 }
 
-sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nDate, sal_Int32 nMode )
 {
     nDate += GetNullDate( xOpt );
 
@@ -529,7 +529,7 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( const uno::Reference< beans::XProp
     return ( nDate - nFirstInYear + ( ( nMode == 1 )? ( nFirstDayInYear + 1 ) % 7 : nFirstDayInYear ) ) / 7 + 1;
 }
 
-sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nDate, sal_Int32 nMonths ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nDate, sal_Int32 nMonths )
 {
     sal_Int32   nNullDate = GetNullDate( xOpt );
     nDate += nNullDate;
@@ -556,7 +556,7 @@ sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( const uno::Reference< beans::XProp
 }
 
 sal_Int32 SAL_CALL AnalysisAddIn::getNetworkdays( const uno::Reference< beans::XPropertySet >& xOpt,
-        sal_Int32 nStartDate, sal_Int32 nEndDate, const uno::Any& aHDay ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+        sal_Int32 nStartDate, sal_Int32 nEndDate, const uno::Any& aHDay )
 {
     sal_Int32                   nNullDate = GetNullDate( xOpt );
 
@@ -592,19 +592,19 @@ sal_Int32 SAL_CALL AnalysisAddIn::getNetworkdays( const uno::Reference< beans::X
     return nCnt;
 }
 
-sal_Int32 SAL_CALL AnalysisAddIn::getIseven( sal_Int32 nVal ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+sal_Int32 SAL_CALL AnalysisAddIn::getIseven( sal_Int32 nVal )
 {
     return ( nVal & 0x00000001 )? 0 : 1;
 }
 
-sal_Int32 SAL_CALL AnalysisAddIn::getIsodd( sal_Int32 nVal ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+sal_Int32 SAL_CALL AnalysisAddIn::getIsodd( sal_Int32 nVal )
 {
     return ( nVal & 0x00000001 )? 1 : 0;
 }
 
 double SAL_CALL
 AnalysisAddIn::getMultinomial( const uno::Reference< beans::XPropertySet >& xOpt, const uno::Sequence< uno::Sequence< sal_Int32 > >& aVLst,
-                               const uno::Sequence< uno::Any >& aOptVLst ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+                               const uno::Sequence< uno::Any >& aOptVLst )
 {
     ScaDoubleListGE0 aValList;
 
@@ -633,7 +633,7 @@ AnalysisAddIn::getMultinomial( const uno::Reference< beans::XPropertySet >& xOpt
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, const uno::Sequence< uno::Sequence< double > >& aCoeffList ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, const uno::Sequence< uno::Sequence< double > >& aCoeffList )
 {
     double                          fRet = 0.0;
 
@@ -665,7 +665,7 @@ double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, co
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getQuotient( double fNum, double fDenom ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getQuotient( double fNum, double fDenom )
 {
     double fRet;
     if( (fNum < 0) != (fDenom < 0) )
@@ -675,7 +675,7 @@ double SAL_CALL AnalysisAddIn::getQuotient( double fNum, double fDenom ) throw(
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getMround( double fNum, double fMult ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getMround( double fNum, double fMult )
 {
     if( fMult == 0.0 )
         return fMult;
@@ -684,13 +684,13 @@ double SAL_CALL AnalysisAddIn::getMround( double fNum, double fMult ) throw( uno
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getSqrtpi( double fNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getSqrtpi( double fNum )
 {
     double fRet = sqrt( fNum * PI );
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax )
 {
     fMin = ::rtl::math::round( fMin, 0, rtl_math_RoundingMode_Up );
     fMax = ::rtl::math::round( fMax, 0, rtl_math_RoundingMode_Up );
@@ -701,7 +701,7 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) throw(
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getGcd( const uno::Reference< beans::XPropertySet >& xOpt, const uno::Sequence< uno::Sequence< double > >& aVLst, const uno::Sequence< uno::Any >& aOptVLst ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getGcd( const uno::Reference< beans::XPropertySet >& xOpt, const uno::Sequence< uno::Sequence< double > >& aVLst, const uno::Sequence< uno::Any >& aOptVLst )
 {
     ScaDoubleListGT0 aValList;
 
@@ -720,7 +720,7 @@ double SAL_CALL AnalysisAddIn::getGcd( const uno::Reference< beans::XPropertySet
     RETURN_FINITE( f );
 }
 
-double SAL_CALL AnalysisAddIn::getLcm( const uno::Reference< beans::XPropertySet >& xOpt, const uno::Sequence< uno::Sequence< double > >& aVLst, const uno::Sequence< uno::Any >& aOptVLst ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getLcm( const uno::Reference< beans::XPropertySet >& xOpt, const uno::Sequence< uno::Sequence< double > >& aVLst, const uno::Sequence< uno::Any >& aOptVLst )
 {
     ScaDoubleListGE0 aValList;
 
@@ -751,19 +751,19 @@ double SAL_CALL AnalysisAddIn::getLcm( const uno::Reference< beans::XPropertySet
     RETURN_FINITE( f );
 }
 
-double SAL_CALL AnalysisAddIn::getBesseli( double fNum, sal_Int32 nOrder ) throw( uno::RuntimeException, lang::IllegalArgumentException, sheet::NoConvergenceException, std::exception )
+double SAL_CALL AnalysisAddIn::getBesseli( double fNum, sal_Int32 nOrder )
 {
     double fRet = sca::analysis::BesselI( fNum, nOrder );
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getBesselj( double fNum, sal_Int32 nOrder ) throw( uno::RuntimeException, lang::IllegalArgumentException, sheet::NoConvergenceException, std::exception )
+double SAL_CALL AnalysisAddIn::getBesselj( double fNum, sal_Int32 nOrder )
 {
     double fRet = sca::analysis::BesselJ( fNum, nOrder );
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getBesselk( double fNum, sal_Int32 nOrder ) throw( uno::RuntimeException, lang::IllegalArgumentException, sheet::NoConvergenceException, std::exception )
+double SAL_CALL AnalysisAddIn::getBesselk( double fNum, sal_Int32 nOrder )
 {
     if( nOrder < 0 || fNum <= 0.0 )
         throw lang::IllegalArgumentException();
@@ -772,7 +772,7 @@ double SAL_CALL AnalysisAddIn::getBesselk( double fNum, sal_Int32 nOrder ) throw
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getBessely( double fNum, sal_Int32 nOrder ) throw( uno::RuntimeException, lang::IllegalArgumentException, sheet::NoConvergenceException, std::exception )
+double SAL_CALL AnalysisAddIn::getBessely( double fNum, sal_Int32 nOrder )
 {
     if( nOrder < 0 || fNum <= 0.0 )
         throw lang::IllegalArgumentException();
@@ -789,7 +789,7 @@ const double    SCA_MAX16       = 549755813888.0;   // max. val for hexadecimal
 const double    SCA_MIN16       = -SCA_MAX16-1.0;   // min. val for hexadecimal numbers (39 bits + sign)
 const sal_Int32 SCA_MAXPLACES   = 10;               // max. number of places
 
-OUString SAL_CALL AnalysisAddIn::getBin2Oct( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getBin2Oct( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces )
 {
     double fVal = ConvertToDec( aNum, 2, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -797,13 +797,13 @@ OUString SAL_CALL AnalysisAddIn::getBin2Oct( const uno::Reference< beans::XPrope
     return ConvertFromDec( fVal, SCA_MIN8, SCA_MAX8, 8, nPlaces, SCA_MAXPLACES, bUsePlaces );
 }
 
-double SAL_CALL AnalysisAddIn::getBin2Dec( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getBin2Dec( const OUString& aNum )
 {
     double fRet = ConvertToDec( aNum, 2, SCA_MAXPLACES );
     RETURN_FINITE( fRet );
 }
 
-OUString SAL_CALL AnalysisAddIn::getBin2Hex( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getBin2Hex( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces )
 {
     double fVal = ConvertToDec( aNum, 2, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -811,7 +811,7 @@ OUString SAL_CALL AnalysisAddIn::getBin2Hex( const uno::Reference< beans::XPrope
     return ConvertFromDec( fVal, SCA_MIN16, SCA_MAX16, 16, nPlaces, SCA_MAXPLACES, bUsePlaces );
 }
 
-OUString SAL_CALL AnalysisAddIn::getOct2Bin( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getOct2Bin( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces )
 {
     double fVal = ConvertToDec( aNum, 8, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -819,13 +819,13 @@ OUString SAL_CALL AnalysisAddIn::getOct2Bin( const uno::Reference< beans::XPrope
     return ConvertFromDec( fVal, SCA_MIN2, SCA_MAX2, 2, nPlaces, SCA_MAXPLACES, bUsePlaces );
 }
 
-double SAL_CALL AnalysisAddIn::getOct2Dec( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getOct2Dec( const OUString& aNum )
 {
     double fRet = ConvertToDec( aNum, 8, SCA_MAXPLACES );
     RETURN_FINITE( fRet );
 }
 
-OUString SAL_CALL AnalysisAddIn::getOct2Hex( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getOct2Hex( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces )
 {
     double fVal = ConvertToDec( aNum, 8, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -833,28 +833,28 @@ OUString SAL_CALL AnalysisAddIn::getOct2Hex( const uno::Reference< beans::XPrope
     return ConvertFromDec( fVal, SCA_MIN16, SCA_MAX16, 16, nPlaces, SCA_MAXPLACES, bUsePlaces );
 }
 
-OUString SAL_CALL AnalysisAddIn::getDec2Bin( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getDec2Bin( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nNum, const uno::Any& rPlaces )
 {
     sal_Int32 nPlaces = 0;
     bool bUsePlaces = aAnyConv.getInt32( nPlaces, xOpt, rPlaces );
     return ConvertFromDec( nNum, SCA_MIN2, SCA_MAX2, 2, nPlaces, SCA_MAXPLACES, bUsePlaces );
 }
 
-OUString SAL_CALL AnalysisAddIn::getDec2Oct( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getDec2Oct( const uno::Reference< beans::XPropertySet >& xOpt, sal_Int32 nNum, const uno::Any& rPlaces )
 {
     sal_Int32 nPlaces = 0;
     bool bUsePlaces = aAnyConv.getInt32( nPlaces, xOpt, rPlaces );
     return ConvertFromDec( nNum, SCA_MIN8, SCA_MAX8, 8, nPlaces, SCA_MAXPLACES, bUsePlaces );
 }
 
-OUString SAL_CALL AnalysisAddIn::getDec2Hex( const uno::Reference< beans::XPropertySet >& xOpt, double fNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getDec2Hex( const uno::Reference< beans::XPropertySet >& xOpt, double fNum, const uno::Any& rPlaces )
 {
     sal_Int32 nPlaces = 0;
     bool bUsePlaces = aAnyConv.getInt32( nPlaces, xOpt, rPlaces );
     return ConvertFromDec( fNum, SCA_MIN16, SCA_MAX16, 16, nPlaces, SCA_MAXPLACES, bUsePlaces );
 }
 
-OUString SAL_CALL AnalysisAddIn::getHex2Bin( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getHex2Bin( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces )
 {
     double fVal = ConvertToDec( aNum, 16, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -862,13 +862,13 @@ OUString SAL_CALL AnalysisAddIn::getHex2Bin( const uno::Reference< beans::XPrope
     return ConvertFromDec( fVal, SCA_MIN2, SCA_MAX2, 2, nPlaces, SCA_MAXPLACES, bUsePlaces );
 }
 
-double SAL_CALL AnalysisAddIn::getHex2Dec( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getHex2Dec( const OUString& aNum )
 {
     double fRet = ConvertToDec( aNum, 16, SCA_MAXPLACES );
     RETURN_FINITE( fRet );
 }
 
-OUString SAL_CALL AnalysisAddIn::getHex2Oct( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getHex2Oct( const uno::Reference< beans::XPropertySet >& xOpt, const OUString& aNum, const uno::Any& rPlaces )
 {
     double fVal = ConvertToDec( aNum, 16, SCA_MAXPLACES );
     sal_Int32 nPlaces = 0;
@@ -876,12 +876,12 @@ OUString SAL_CALL AnalysisAddIn::getHex2Oct( const uno::Reference< beans::XPrope
     return ConvertFromDec( fVal, SCA_MIN8, SCA_MAX8, 8, nPlaces, SCA_MAXPLACES, bUsePlaces );
 }
 
-sal_Int32 SAL_CALL AnalysisAddIn::getDelta( const uno::Reference< beans::XPropertySet >& xOpt, double fNum1, const uno::Any& rNum2 ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+sal_Int32 SAL_CALL AnalysisAddIn::getDelta( const uno::Reference< beans::XPropertySet >& xOpt, double fNum1, const uno::Any& rNum2 )
 {
     return sal_Int32(fNum1 == aAnyConv.getDouble( xOpt, rNum2, 0.0 ));
 }
 
-double SAL_CALL AnalysisAddIn::getErf( const uno::Reference< beans::XPropertySet >& xOpt, double fLL, const uno::Any& rUL ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getErf( const uno::Reference< beans::XPropertySet >& xOpt, double fLL, const uno::Any& rUL )
 {
     double fUL, fRet;
     bool bContainsValue = aAnyConv.getDouble( fUL, xOpt, rUL );
@@ -890,36 +890,36 @@ double SAL_CALL AnalysisAddIn::getErf( const uno::Reference< beans::XPropertySet
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getErfc( double f ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getErfc( double f )
 {
     double fRet = Erfc( f );
     RETURN_FINITE( fRet );
 }
 
-sal_Int32 SAL_CALL AnalysisAddIn::getGestep( const uno::Reference< beans::XPropertySet >& xOpt, double fNum, const uno::Any& rStep ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+sal_Int32 SAL_CALL AnalysisAddIn::getGestep( const uno::Reference< beans::XPropertySet >& xOpt, double fNum, const uno::Any& rStep )
 {
     return sal_Int32(fNum >= aAnyConv.getDouble( xOpt, rStep, 0.0 ));
 }
 
-double SAL_CALL AnalysisAddIn::getFactdouble( sal_Int32 nNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getFactdouble( sal_Int32 nNum )
 {
     double fRet = FactDouble( nNum );
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getImabs( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getImabs( const OUString& aNum )
 {
     double fRet = Complex( aNum ).Abs();
     RETURN_FINITE( fRet );
 }
 
-double SAL_CALL AnalysisAddIn::getImaginary( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getImaginary( const OUString& aNum )
 {
     double fRet = Complex( aNum ).Imag();
     RETURN_FINITE( fRet );
 }
 
-OUString SAL_CALL AnalysisAddIn::getImpower( const OUString& aNum, double f ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImpower( const OUString& aNum, double f )
 {
     Complex     z( aNum );
 
@@ -928,13 +928,13 @@ OUString SAL_CALL AnalysisAddIn::getImpower( const OUString& aNum, double f ) th
     return z.GetString();
 }
 
-double SAL_CALL AnalysisAddIn::getImargument( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getImargument( const OUString& aNum )
 {
     double fRet = Complex( aNum ).Arg();
     RETURN_FINITE( fRet );
 }
 
-OUString SAL_CALL AnalysisAddIn::getImcos( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImcos( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -943,7 +943,7 @@ OUString SAL_CALL AnalysisAddIn::getImcos( const OUString& aNum ) throw( uno::Ru
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImdiv( const OUString& aDivid, const OUString& aDivis ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImdiv( const OUString& aDivid, const OUString& aDivis )
 {
     Complex     z( aDivid );
 
@@ -952,7 +952,7 @@ OUString SAL_CALL AnalysisAddIn::getImdiv( const OUString& aDivid, const OUStrin
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImexp( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImexp( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -961,7 +961,7 @@ OUString SAL_CALL AnalysisAddIn::getImexp( const OUString& aNum ) throw( uno::Ru
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImconjugate( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImconjugate( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -970,7 +970,7 @@ OUString SAL_CALL AnalysisAddIn::getImconjugate( const OUString& aNum ) throw( u
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImln( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImln( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -979,7 +979,7 @@ OUString SAL_CALL AnalysisAddIn::getImln( const OUString& aNum ) throw( uno::Run
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImlog10( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImlog10( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -988,7 +988,7 @@ OUString SAL_CALL AnalysisAddIn::getImlog10( const OUString& aNum ) throw( uno::
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImlog2( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImlog2( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -997,7 +997,7 @@ OUString SAL_CALL AnalysisAddIn::getImlog2( const OUString& aNum ) throw( uno::R
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImproduct( const uno::Reference< beans::XPropertySet >&, const uno::Sequence< uno::Sequence< OUString > >& aNum1, const uno::Sequence< uno::Any >& aNL ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImproduct( const uno::Reference< beans::XPropertySet >&, const uno::Sequence< uno::Sequence< OUString > >& aNum1, const uno::Sequence< uno::Any >& aNL )
 {
     ComplexList     z_list;
 
@@ -1014,13 +1014,13 @@ OUString SAL_CALL AnalysisAddIn::getImproduct( const uno::Reference< beans::XPro
     return z.GetString();
 }
 
-double SAL_CALL AnalysisAddIn::getImreal( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getImreal( const OUString& aNum )
 {
     double fRet = Complex( aNum ).Real();
     RETURN_FINITE( fRet );
 }
 
-OUString SAL_CALL AnalysisAddIn::getImsin( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImsin( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1029,7 +1029,7 @@ OUString SAL_CALL AnalysisAddIn::getImsin( const OUString& aNum ) throw( uno::Ru
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImsub( const OUString& aNum1, const OUString& aNum2 ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImsub( const OUString& aNum1, const OUString& aNum2 )
 {
     Complex     z( aNum1 );
 
@@ -1038,7 +1038,7 @@ OUString SAL_CALL AnalysisAddIn::getImsub( const OUString& aNum1, const OUString
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImsum( const uno::Reference< beans::XPropertySet >&, const uno::Sequence< uno::Sequence< OUString > >& aNum1, const uno::Sequence< uno::Any >& aFollowingPars ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImsum( const uno::Reference< beans::XPropertySet >&, const uno::Sequence< uno::Sequence< OUString > >& aNum1, const uno::Sequence< uno::Any >& aFollowingPars )
 {
     ComplexList     z_list;
 
@@ -1055,7 +1055,7 @@ OUString SAL_CALL AnalysisAddIn::getImsum( const uno::Reference< beans::XPropert
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImsqrt( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImsqrt( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1064,7 +1064,7 @@ OUString SAL_CALL AnalysisAddIn::getImsqrt( const OUString& aNum ) throw( uno::R
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImtan( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImtan( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1073,7 +1073,7 @@ OUString SAL_CALL AnalysisAddIn::getImtan( const OUString& aNum ) throw( uno::Ru
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImsec( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImsec( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1082,7 +1082,7 @@ OUString SAL_CALL AnalysisAddIn::getImsec( const OUString& aNum ) throw( uno::Ru
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImcsc( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImcsc( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1091,7 +1091,7 @@ OUString SAL_CALL AnalysisAddIn::getImcsc( const OUString& aNum ) throw( uno::Ru
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImcot( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImcot( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1100,7 +1100,7 @@ OUString SAL_CALL AnalysisAddIn::getImcot( const OUString& aNum ) throw( uno::Ru
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImsinh( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImsinh( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1109,7 +1109,7 @@ OUString SAL_CALL AnalysisAddIn::getImsinh( const OUString& aNum ) throw( uno::R
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImcosh( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImcosh( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1118,7 +1118,7 @@ OUString SAL_CALL AnalysisAddIn::getImcosh( const OUString& aNum ) throw( uno::R
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImsech( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImsech( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1127,7 +1127,7 @@ OUString SAL_CALL AnalysisAddIn::getImsech( const OUString& aNum ) throw( uno::R
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getImcsch( const OUString& aNum ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getImcsch( const OUString& aNum )
 {
     Complex     z( aNum );
 
@@ -1136,7 +1136,7 @@ OUString SAL_CALL AnalysisAddIn::getImcsch( const OUString& aNum ) throw( uno::R
     return z.GetString();
 }
 
-OUString SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const uno::Any& rSuff ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const uno::Any& rSuff )
 {
     bool    bi;
 
@@ -1160,7 +1160,7 @@ OUString SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const uno::An
     return Complex( fR, fI, bi ? 'i' : 'j' ).GetString();
 }
 
-double SAL_CALL AnalysisAddIn::getConvert( double f, const OUString& aFU, const OUString& aTU ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getConvert( double f, const OUString& aFU, const OUString& aTU )
 {
     if( !pCDL )
         pCDL = new ConvertDataList();
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index 00a86ca47ece..97c671820045 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -62,9 +62,9 @@ private:
     sca::analysis::ScaAnyConverter aAnyConv;
 
     /// @throws css::uno::RuntimeException
-    ResMgr&                     GetResMgr() throw( css::uno::RuntimeException, std::exception );
+    ResMgr&                     GetResMgr();
     /// @throws css::uno::RuntimeException
-    OUString                    GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException, std::exception );
+    OUString                    GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex );
     void                        InitDefLocales();
     inline const css::lang::Locale& GetLocale( sal_uInt32 nInd );
     void                        InitData();
@@ -75,8 +75,7 @@ private:
                                 /// @throws css::lang::IllegalArgumentException
     sal_Int32                   getDateMode(
                                     const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
-                                    const css::uno::Any& rAny )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    const css::uno::Any& rAny );
 
 public:
     explicit                    AnalysisAddIn(
@@ -85,159 +84,159 @@ public:
 
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    double                      FactDouble( sal_Int32 nNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    double                      FactDouble( sal_Int32 nNum );
 
     static OUString               getImplementationName_Static();
     static css::uno::Sequence< OUString >        getSupportedServiceNames_Static();
 
                                 // XAddIn
-    virtual OUString SAL_CALL     getProgrammaticFuntionName( const OUString& aDisplayName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL     getDisplayFunctionName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL     getFunctionDescription( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL     getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL     getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL     getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL     getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL     getProgrammaticFuntionName( const OUString& aDisplayName ) override;
+    virtual OUString SAL_CALL     getDisplayFunctionName( const OUString& aProgrammaticName ) override;
+    virtual OUString SAL_CALL     getFunctionDescription( const OUString& aProgrammaticName ) override;
+    virtual OUString SAL_CALL     getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) override;
+    virtual OUString SAL_CALL     getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) override;
+    virtual OUString SAL_CALL     getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) override;
+    virtual OUString SAL_CALL     getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) override;
 
                                 // XCompatibilityNames
-    virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) override;
 
                                 // XLocalizable
-    virtual void SAL_CALL       setLocale( const css::lang::Locale& eLocale ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL       setLocale( const css::lang::Locale& eLocale ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
                                 // XServiceName
-    virtual OUString SAL_CALL     getServiceName(  ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL     getServiceName(  ) override;
 
                                 // XServiceInfo
-    virtual OUString SAL_CALL     getImplementationName(  ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL   supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL  getSupportedServiceNames(  ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL     getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL   supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL  getSupportedServiceNames(  ) override;
 
     //  methods from own interfaces start here
 
                             // XAnalysis
 //    virtual double SAL_CALL       get_Test( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nMode, double f1, double f2, double f3 ) throw( css::uno::RuntimeException );
 
-    virtual sal_Int32 SAL_CALL  getWorkday( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nDays, const css::uno::Any& aHDay ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getYearfrac( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nEndDate, const css::uno::Any& aMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL  getEdate( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nMonths ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL  getWeeknum( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL  getEomonth( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nMonths ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL  getNetworkdays( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nEndDate, const css::uno::Any& aHDay ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual sal_Int32 SAL_CALL  getIseven( sal_Int32 nVal ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL  getIsodd( sal_Int32 nVal ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getMultinomial( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& aVLst, const css::uno::Sequence< css::uno::Any >& aOptVLst ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getSeriessum( double fX, double fN, double fM, const css::uno::Sequence< css::uno::Sequence< double > >& aCoeffList ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getQuotient( double fNum, double fDenum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getMround( double fNum, double fMult ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getSqrtpi( double fNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getRandbetween( double fMin, double fMax ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getGcd( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& aVLst, const css::uno::Sequence< css::uno::Any >& aOptVLst ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getLcm( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& aVLst, const css::uno::Sequence< css::uno::Any >& aOptVLst ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getBesseli( double fNum, sal_Int32 nOrder ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sheet::NoConvergenceException, std::exception ) override;
-    virtual double SAL_CALL     getBesselj( double fNum, sal_Int32 nOrder ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sheet::NoConvergenceException, std::exception ) override;
-    virtual double SAL_CALL     getBesselk( double fNum, sal_Int32 nOrder ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sheet::NoConvergenceException, std::exception ) override;
-    virtual double SAL_CALL     getBessely( double fNum, sal_Int32 nOrder ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sheet::NoConvergenceException, std::exception ) override;
-
-    virtual OUString SAL_CALL     getBin2Oct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getBin2Dec( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getBin2Hex( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual OUString SAL_CALL     getOct2Bin( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getOct2Dec( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getOct2Hex( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual OUString SAL_CALL     getDec2Bin( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 fNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getDec2Oct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 fNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getDec2Hex( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual OUString SAL_CALL     getHex2Bin( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getHex2Dec( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getHex2Oct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual sal_Int32 SAL_CALL  getDelta( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fNum1, const css::uno::Any& rNum2 ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getErf( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fLowerLimit, const css::uno::Any& rUpperLimit ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getErfc( double fLowerLimit ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual sal_Int32 SAL_CALL  getGestep( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fNum, const css::uno::Any& rStep ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getFactdouble( sal_Int32 nNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getImabs( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getImaginary( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImpower( const OUString& aNum, double fPower ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getImargument( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImcos( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImdiv( const OUString& aDivident, const OUString& aDivisor ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImexp( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImconjugate( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImln( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImlog10( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImlog2( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImproduct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< OUString > >& aNum1, const css::uno::Sequence< css::uno::Any >& aNumList ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getImreal( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImsin( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImsub( const OUString& aNum1, const OUString& aNum2 ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImsum( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< OUString > >& aNum1, const css::uno::Sequence< css::uno::Any >& aFollowingPars ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual OUString SAL_CALL     getImsqrt( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImtan( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImsec( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImcsc( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImcot( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImsinh( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImcosh( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImsech( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getImcsch( const OUString& aNum ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual OUString SAL_CALL     getComplex( double fReal, double fImaginary, const css::uno::Any& rSuffix ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getConvert( double fVal, const OUString& aFromUnit, const OUString& aToUnit ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-
-    virtual double SAL_CALL     getAmordegrc( const css::uno::Reference< css::beans::XPropertySet >&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getAmorlinc( const css::uno::Reference< css::beans::XPropertySet >&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getAccrint( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nIssue, sal_Int32 nFirstInter, sal_Int32 nSettle, double fRate, const css::uno::Any& rVal, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getAccrintm( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const css::uno::Any& rVal, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getReceived( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getDisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getDuration( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getEffect( double fNominal, sal_Int32 nPeriods ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getCumprinc( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getCumipmt( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getPrice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getPricedisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getPricemat( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fYield, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getMduration( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getNominal( double fRate, sal_Int32 nPeriods ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getDollarfr( double fDollarDec, sal_Int32 nFrac ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getDollarde( double fDollarFrac, sal_Int32 nFrac ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getYield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getYielddisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getYieldmat( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getTbilleq( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getTbillprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getTbillyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getOddfprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getOddfyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getOddlprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getOddlyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getXirr( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates, const css::uno::Any& rGuess ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getXnpv( double fRate, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getIntrate( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getCoupncd( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getCoupdays( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getCoupdaysnc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getCoupdaybs( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getCouppcd( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getCoupnum( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
-    virtual double SAL_CALL     getFvschedule( double fPrinc, const css::uno::Sequence< css::uno::Sequence< double > >& rSchedule ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL  getWorkday( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nDays, const css::uno::Any& aHDay ) override;
+    virtual double SAL_CALL     getYearfrac( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nEndDate, const css::uno::Any& aMode ) override;
+    virtual sal_Int32 SAL_CALL  getEdate( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nMonths ) override;
+    virtual sal_Int32 SAL_CALL  getWeeknum( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nMode ) override;
+    virtual sal_Int32 SAL_CALL  getEomonth( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nMonths ) override;
+    virtual sal_Int32 SAL_CALL  getNetworkdays( const css::uno::Reference< css::beans::XPropertySet >&, sal_Int32 nStartDate, sal_Int32 nEndDate, const css::uno::Any& aHDay ) override;
+
+    virtual sal_Int32 SAL_CALL  getIseven( sal_Int32 nVal ) override;
+    virtual sal_Int32 SAL_CALL  getIsodd( sal_Int32 nVal ) override;
+
+    virtual double SAL_CALL     getMultinomial( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& aVLst, const css::uno::Sequence< css::uno::Any >& aOptVLst ) override;
+    virtual double SAL_CALL     getSeriessum( double fX, double fN, double fM, const css::uno::Sequence< css::uno::Sequence< double > >& aCoeffList ) override;
+    virtual double SAL_CALL     getQuotient( double fNum, double fDenum ) override;
+
+    virtual double SAL_CALL     getMround( double fNum, double fMult ) override;
+    virtual double SAL_CALL     getSqrtpi( double fNum ) override;
+
+    virtual double SAL_CALL     getRandbetween( double fMin, double fMax ) override;
+
+    virtual double SAL_CALL     getGcd( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& aVLst, const css::uno::Sequence< css::uno::Any >& aOptVLst ) override;
+    virtual double SAL_CALL     getLcm( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& aVLst, const css::uno::Sequence< css::uno::Any >& aOptVLst ) override;
+
+    virtual double SAL_CALL     getBesseli( double fNum, sal_Int32 nOrder ) override;
+    virtual double SAL_CALL     getBesselj( double fNum, sal_Int32 nOrder ) override;
+    virtual double SAL_CALL     getBesselk( double fNum, sal_Int32 nOrder ) override;
+    virtual double SAL_CALL     getBessely( double fNum, sal_Int32 nOrder ) override;
+
+    virtual OUString SAL_CALL     getBin2Oct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) override;
+    virtual double SAL_CALL     getBin2Dec( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getBin2Hex( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) override;
+
+    virtual OUString SAL_CALL     getOct2Bin( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) override;
+    virtual double SAL_CALL     getOct2Dec( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getOct2Hex( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) override;
+
+    virtual OUString SAL_CALL     getDec2Bin( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 fNum, const css::uno::Any& rPlaces ) override;
+    virtual OUString SAL_CALL     getDec2Oct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 fNum, const css::uno::Any& rPlaces ) override;
+    virtual OUString SAL_CALL     getDec2Hex( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fNum, const css::uno::Any& rPlaces ) override;
+
+    virtual OUString SAL_CALL     getHex2Bin( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) override;
+    virtual double SAL_CALL     getHex2Dec( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getHex2Oct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const OUString& aNum, const css::uno::Any& rPlaces ) override;
+
+    virtual sal_Int32 SAL_CALL  getDelta( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fNum1, const css::uno::Any& rNum2 ) override;
+
+    virtual double SAL_CALL     getErf( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fLowerLimit, const css::uno::Any& rUpperLimit ) override;
+    virtual double SAL_CALL     getErfc( double fLowerLimit ) override;
+
+    virtual sal_Int32 SAL_CALL  getGestep( const css::uno::Reference< css::beans::XPropertySet >& xOpt, double fNum, const css::uno::Any& rStep ) override;
+
+    virtual double SAL_CALL     getFactdouble( sal_Int32 nNum ) override;
+
+    virtual double SAL_CALL     getImabs( const OUString& aNum ) override;
+    virtual double SAL_CALL     getImaginary( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImpower( const OUString& aNum, double fPower ) override;
+    virtual double SAL_CALL     getImargument( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImcos( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImdiv( const OUString& aDivident, const OUString& aDivisor ) override;
+    virtual OUString SAL_CALL     getImexp( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImconjugate( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImln( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImlog10( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImlog2( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImproduct( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< OUString > >& aNum1, const css::uno::Sequence< css::uno::Any >& aNumList ) override;
+    virtual double SAL_CALL     getImreal( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImsin( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImsub( const OUString& aNum1, const OUString& aNum2 ) override;
+    virtual OUString SAL_CALL     getImsum( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< OUString > >& aNum1, const css::uno::Sequence< css::uno::Any >& aFollowingPars ) override;
+
+    virtual OUString SAL_CALL     getImsqrt( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImtan( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImsec( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImcsc( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImcot( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImsinh( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImcosh( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImsech( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getImcsch( const OUString& aNum ) override;
+    virtual OUString SAL_CALL     getComplex( double fReal, double fImaginary, const css::uno::Any& rSuffix ) override;
+
+    virtual double SAL_CALL     getConvert( double fVal, const OUString& aFromUnit, const OUString& aToUnit ) override;
+
+    virtual double SAL_CALL     getAmordegrc( const css::uno::Reference< css::beans::XPropertySet >&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getAmorlinc( const css::uno::Reference< css::beans::XPropertySet >&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getAccrint( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nIssue, sal_Int32 nFirstInter, sal_Int32 nSettle, double fRate, const css::uno::Any& rVal, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getAccrintm( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const css::uno::Any& rVal, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getReceived( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getDisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getDuration( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getEffect( double fNominal, sal_Int32 nPeriods ) override;
+    virtual double SAL_CALL     getCumprinc( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) override;
+    virtual double SAL_CALL     getCumipmt( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) override;
+    virtual double SAL_CALL     getPrice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getPricedisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getPricemat( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fYield, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getMduration( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getNominal( double fRate, sal_Int32 nPeriods ) override;
+    virtual double SAL_CALL     getDollarfr( double fDollarDec, sal_Int32 nFrac ) override;
+    virtual double SAL_CALL     getDollarde( double fDollarFrac, sal_Int32 nFrac ) override;
+    virtual double SAL_CALL     getYield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getYielddisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getYieldmat( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getTbilleq( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) override;
+    virtual double SAL_CALL     getTbillprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) override;
+    virtual double SAL_CALL     getTbillyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice ) override;
+    virtual double SAL_CALL     getOddfprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getOddfyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getOddlprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getOddlyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOptBase) override;
+    virtual double SAL_CALL     getXirr( const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates, const css::uno::Any& rGuess ) override;
+    virtual double SAL_CALL     getXnpv( double fRate, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates ) override;
+    virtual double SAL_CALL     getIntrate( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getCoupncd( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getCoupdays( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getCoupdaysnc( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getCoupdaybs( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getCouppcd( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getCoupnum( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOptBase ) override;
+    virtual double SAL_CALL     getFvschedule( double fPrinc, const css::uno::Sequence< css::uno::Sequence< double > >& rSchedule ) override;
 };
 
 #endif
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index d542c049d959..a3bedca123f8 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -199,7 +199,6 @@ sal_Int32 DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear )
  */
 
 void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt16& rYear )
-    throw( lang::IllegalArgumentException )
 {
     if( nDays < 0 )
         throw lang::IllegalArgumentException();
@@ -253,7 +252,7 @@ void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt
  *
  */
 
-sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOpt ) throw( uno::RuntimeException )
+sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOpt )
 {
     if( xOpt.is() )
     {
@@ -339,7 +338,7 @@ sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 nYear2 )
 
 
 sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
-    sal_Int32* pOptDaysIn1stYear ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    sal_Int32* pOptDaysIn1stYear )
 {
     bool    bNeg = nStartDate > nEndDate;
 
@@ -410,7 +409,7 @@ sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEnd
 }
 
 
-double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
 {
     sal_Int32   nDays1stYear;
     sal_Int32   nTotalDays = GetDiffDate( nNullDate, nStartDate, nEndDate, nMode, &nDays1stYear );
@@ -419,7 +418,7 @@ double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDat
 }
 
 
-sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode )
 {
     switch( nMode )
     {
@@ -450,7 +449,7 @@ sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode )
  *   The calculations are defined in:
  *   Open Document Format for Office Applications version 1.2 Part 2, par. 4.11.7
  */
-double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
 {
     if( nStartDate == nEndDate )
         return 0.0;     // nothing to do...
@@ -654,7 +653,7 @@ double GetGcd( double f1, double f2 )
 }
 
 
-double ConvertToDec( const OUString& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+double ConvertToDec( const OUString& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim )
 {
     if ( nBase < 2 || nBase > 36 )
         throw lang::IllegalArgumentException();
@@ -721,7 +720,7 @@ static inline sal_Char GetMaxChar( sal_uInt16 nBase )
 
 
 OUString ConvertFromDec( double fNum, double fMin, double fMax, sal_uInt16 nBase,
-    sal_Int32 nPlaces, sal_Int32 nMaxPlaces, bool bUsePlaces ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    sal_Int32 nPlaces, sal_Int32 nMaxPlaces, bool bUsePlaces )
 {
     fNum = ::rtl::math::approxFloor( fNum );
     fMin = ::rtl::math::approxFloor( fMin );
@@ -987,7 +986,7 @@ OUString GetString( double f, bool bLeadingSign, sal_uInt16 nMaxDig )
 
 
 double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
-    double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    double fRestVal, double fPer, double fRate, sal_Int32 nBase )
 {
     sal_uInt32  nPer = sal_uInt32( fPer );
     double      fUsePer = 1.0 / fRate;
@@ -1032,7 +1031,7 @@ double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int
 
 
 double GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
-    double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    double fRestVal, double fPer, double fRate, sal_Int32 nBase )
 {
     sal_uInt32  nPer = sal_uInt32( fPer );
     double      fOneRate = fCost * fRate;
@@ -1056,7 +1055,7 @@ double GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int3
 
 
 double GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup,
-    double fYield, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    double fYield, sal_Int32 nFreq, sal_Int32 nBase )
 {
     double          fYearfrac = GetYearFrac( nNullDate, nSettle, nMat, nBase );
     double          fNumOfCoups = GetCoupnum( nNullDate, nSettle, nMat, nFreq, nBase );
@@ -1089,7 +1088,7 @@ double GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, doub
 
 
 double GetYieldmat( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
-    double fRate, double fPrice, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    double fRate, double fPrice, sal_Int32 nBase )
 {
     double      fIssMat = GetYearFrac( nNullDate, nIssue, nMat, nBase );
     double      fIssSet = GetYearFrac( nNullDate, nIssue, nSettle, nBase );
@@ -1106,7 +1105,7 @@ double GetYieldmat( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_
 
 double GetOddfprice( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /*nMat*/, sal_Int32 /*nIssue*/,
     sal_Int32 /*nFirstCoup*/, double /*fRate*/, double /*fYield*/, double /*fRedemp*/, sal_Int32 /*nFreq*/,
-    sal_Int32 /*nBase*/ ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    sal_Int32 /*nBase*/ )
 {
     // If you change this to not unconditionally throw, the
     // SAL_WNOUNREACHABLE_CODE_PUSH/POP around the caller in
@@ -1116,7 +1115,7 @@ double GetOddfprice( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
 
 
 double getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice,
-                    double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+                    double fRedemp, sal_Int32 nFreq, sal_Int32 nBase )
 {
     double      fRate = fCoup;
     double      fPriceN = 0.0;
@@ -1168,7 +1167,7 @@ double getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double
 
 
 double getPrice_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield,
-                    double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+                    double fRedemp, sal_Int32 nFreq, sal_Int32 nBase )
 {
     double      fFreq = nFreq;
 
@@ -1192,7 +1191,7 @@ double getPrice_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double
 
 double GetOddfyield( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /*nMat*/, sal_Int32 /*nIssue*/,
     sal_Int32 /*nFirstCoup*/, double /*fRate*/, double /*fPrice*/, double /*fRedemp*/, sal_Int32 /*nFreq*/,
-    sal_Int32 /*nBase*/ ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    sal_Int32 /*nBase*/ )
 {
     // If you change this to not unconditionally throw, the
     // SAL_WNOUNREACHABLE_CODE_PUSH/POP around the caller in
@@ -1202,7 +1201,7 @@ double GetOddfyield( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
 
 
 double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastCoup,
-    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase )
 {
     double      fFreq = double( nFreq );
     double      fDCi = GetYearFrac( nNullDate, nLastCoup, nMat, nBase ) * fFreq;
@@ -1218,7 +1217,7 @@ double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal
 
 
 double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastCoup,
-    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase )
 {
     double      fFreq = double( nFreq );
     double      fDCi = GetYearFrac( nNullDate, nLastCoup, nMat, nBase ) * fFreq;
@@ -1274,7 +1273,6 @@ double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF )
 // COUPPCD: find last coupon date before settlement (can be equal to settlement)
 /// @throws css::lang::IllegalArgumentException
 static void lcl_GetCouppcd( ScaDate& rDate, const ScaDate& rSettle, const ScaDate& rMat, sal_Int32 nFreq )
-    throw( lang::IllegalArgumentException )
 {
     rDate = rMat;
     rDate.setYear( rSettle.getYear() );
@@ -1285,7 +1283,6 @@ static void lcl_GetCouppcd( ScaDate& rDate, const ScaDate& rSettle, const ScaDat
 }
 
 double GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
         throw lang::IllegalArgumentException();
@@ -1298,7 +1295,6 @@ double GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I
 // COUPNCD: find first coupon date after settlement (is never equal to settlement)
 /// @throws css::lang::IllegalArgumentException
 static void lcl_GetCoupncd( ScaDate& rDate, const ScaDate& rSettle, const ScaDate& rMat, sal_Int32 nFreq )
-    throw( lang::IllegalArgumentException )
 {
     rDate = rMat;
     rDate.setYear( rSettle.getYear() );
@@ -1309,7 +1305,6 @@ static void lcl_GetCoupncd( ScaDate& rDate, const ScaDate& rSettle, const ScaDat
 }
 
 double GetCoupncd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
         throw lang::IllegalArgumentException();
@@ -1321,7 +1316,6 @@ double GetCoupncd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I
 
 // COUPDAYBS: get day count: coupon date before settlement <-> settlement
 double GetCoupdaybs( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
         throw lang::IllegalArgumentException();
@@ -1334,7 +1328,6 @@ double GetCoupdaybs( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal
 
 // COUPDAYSNC: get day count: settlement <-> coupon date after settlement
 double GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
         throw lang::IllegalArgumentException();
@@ -1351,7 +1344,6 @@ double GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sa
 
 // COUPDAYS: get day count: coupon date before settlement <-> coupon date after settlement
 double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
         throw lang::IllegalArgumentException();
@@ -1369,7 +1361,6 @@ double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_
 
 // COUPNUM: get count of coupon dates
 double GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
-    throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
     if( nSettle >= nMat || CHK_Freq )
         throw lang::IllegalArgumentException();
@@ -1492,7 +1483,7 @@ void SortedIndividualInt32List::Insert( sal_Int32 nDay, sal_Int32 nNullDate, boo
 
 
 void SortedIndividualInt32List::Insert(
-        double fDay, sal_Int32 nNullDate, bool bInsertOnWeekend ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        double fDay, sal_Int32 nNullDate, bool bInsertOnWeekend )
 {
     if( (fDay < -2147483648.0) || (fDay > 2147483649.0) )
         throw lang::IllegalArgumentException();
@@ -1526,7 +1517,7 @@ void SortedIndividualInt32List::InsertHolidayList(
         const ScaAnyConverter& rAnyConv,
         const uno::Any& rHolAny,
         sal_Int32 nNullDate,
-        bool bInsertOnWeekend ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        bool bInsertOnWeekend )
 {
     double fDay;
     if( rAnyConv.getDouble( fDay, rHolAny ) )
@@ -1538,7 +1529,7 @@ void SortedIndividualInt32List::InsertHolidayList(
         ScaAnyConverter& rAnyConv,
         const uno::Reference< beans::XPropertySet >& xOptions,
         const uno::Any& rHolAny,
-        sal_Int32 nNullDate ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        sal_Int32 nNullDate )
 {
     rAnyConv.init( xOptions );
     if( rHolAny.getValueTypeClass() == uno::TypeClass_SEQUENCE )
@@ -1565,7 +1556,7 @@ void SortedIndividualInt32List::InsertHolidayList(
 
 
 void ScaDoubleList::Append(
-        const uno::Sequence< uno::Sequence< double > >& rValueSeq ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        const uno::Sequence< uno::Sequence< double > >& rValueSeq )
 {
     const uno::Sequence< double >* pSeqArray = rValueSeq.getConstArray();
     for( sal_Int32 nIndex1 = 0; nIndex1 < rValueSeq.getLength(); nIndex1++ )
@@ -1579,7 +1570,7 @@ void ScaDoubleList::Append(
 
 
 void ScaDoubleList::Append(
-        const uno::Sequence< uno::Sequence< sal_Int32 > >& rValueSeq ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        const uno::Sequence< uno::Sequence< sal_Int32 > >& rValueSeq )
 {
     const uno::Sequence< sal_Int32 >* pSeqArray = rValueSeq.getConstArray();
     for( sal_Int32 nIndex1 = 0; nIndex1 < rValueSeq.getLength(); nIndex1++ )
@@ -1594,7 +1585,7 @@ void ScaDoubleList::Append(
 void ScaDoubleList::Append(
         const ScaAnyConverter& rAnyConv,
         const uno::Any& rAny,
-        bool bIgnoreEmpty ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        bool bIgnoreEmpty )
 {
     if( auto s = o3tl::tryAccess<
             css::uno::Sequence<css::uno::Sequence<css::uno::Any>>>(rAny) )
@@ -1613,7 +1604,7 @@ void ScaDoubleList::Append(
 void ScaDoubleList::Append(
         const ScaAnyConverter& rAnyConv,
         const uno::Sequence< uno::Any >& rAnySeq,
-        bool bIgnoreEmpty ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        bool bIgnoreEmpty )
 {
     const uno::Any* pArray = rAnySeq.getConstArray();
     for( sal_Int32 nIndex = 0; nIndex < rAnySeq.getLength(); nIndex++ )
@@ -1624,7 +1615,7 @@ void ScaDoubleList::Append(
 void ScaDoubleList::Append(
         const ScaAnyConverter& rAnyConv,
         const uno::Sequence< uno::Sequence< uno::Any > >& rAnySeq,
-        bool bIgnoreEmpty ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        bool bIgnoreEmpty )
 {
     const uno::Sequence< uno::Any >* pArray = rAnySeq.getConstArray();
     for( sal_Int32 nIndex = 0; nIndex < rAnySeq.getLength(); nIndex++ )
@@ -1634,20 +1625,20 @@ void ScaDoubleList::Append(
 void ScaDoubleList::Append(
         ScaAnyConverter& rAnyConv,
         const uno::Reference< beans::XPropertySet >& xOpt,
-        const uno::Sequence< uno::Any >& rAnySeq ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        const uno::Sequence< uno::Any >& rAnySeq )
 {
     rAnyConv.init( xOpt );
     Append( rAnyConv, rAnySeq, true/*bIgnoreEmpty*/ );
 }
 
 
-bool ScaDoubleList::CheckInsert( double ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
+bool ScaDoubleList::CheckInsert( double ) const
 {
     return true;
 }
 
 
-bool ScaDoubleListGT0::CheckInsert( double fValue ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
+bool ScaDoubleListGT0::CheckInsert( double fValue ) const
 {
     if( fValue < 0.0 )
         throw lang::IllegalArgumentException();
@@ -1655,7 +1646,7 @@ bool ScaDoubleListGT0::CheckInsert( double fValue ) const throw( uno::RuntimeExc
 }
 
 
-bool ScaDoubleListGE0::CheckInsert( double fValue ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
+bool ScaDoubleListGE0::CheckInsert( double fValue ) const
 {
     if( fValue < 0.0 )
         throw lang::IllegalArgumentException();
@@ -1663,7 +1654,7 @@ bool ScaDoubleListGE0::CheckInsert( double fValue ) const throw( uno::RuntimeExc
 }
 
 
-Complex::Complex( const OUString& rStr ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+Complex::Complex( const OUString& rStr )
 {
     if( !ParseString( rStr, *this ) )
         throw lang::IllegalArgumentException();
@@ -1744,7 +1735,7 @@ bool Complex::ParseString( const OUString& rStr, Complex& rCompl )
 }
 
 
-OUString Complex::GetString() const throw( uno::RuntimeException, lang::IllegalArgumentException )
+OUString Complex::GetString() const
 {
     CHK_FINITE(r);
     CHK_FINITE(i);
@@ -1773,7 +1764,7 @@ OUString Complex::GetString() const throw( uno::RuntimeException, lang::IllegalA
 }
 
 
-double Complex::Arg() const throw( uno::RuntimeException, lang::IllegalArgumentException )
+double Complex::Arg() const
 {
     if( r == 0.0 && i == 0.0 )
         throw lang::IllegalArgumentException();
@@ -1787,7 +1778,7 @@ double Complex::Arg() const throw( uno::RuntimeException, lang::IllegalArgumentE
 }
 
 
-void Complex::Power( double fPower ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Power( double fPower )
 {
     if( r == 0.0 && i == 0.0 )
     {
@@ -1827,7 +1818,7 @@ void Complex::Sqrt()
 }
 
 
-void Complex::Sin() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Sin()
 {
     if( !::rtl::math::isValidArcArg( r ) )
         throw lang::IllegalArgumentException();
@@ -1845,7 +1836,7 @@ void Complex::Sin() throw( uno::RuntimeException, lang::IllegalArgumentException
 }
 
 
-void Complex::Cos() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Cos()
 {
     if( !::rtl::math::isValidArcArg( r ) )
         throw lang::IllegalArgumentException();
@@ -1863,7 +1854,7 @@ void Complex::Cos() throw( uno::RuntimeException, lang::IllegalArgumentException
 }
 
 
-void Complex::Div( const Complex& z ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Div( const Complex& z )
 {
     if( z.r == 0 && z.i == 0 )
         throw lang::IllegalArgumentException();
@@ -1890,7 +1881,7 @@ void Complex::Exp()
 }
 
 
-void Complex::Ln() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Ln()
 {
     if( r == 0.0 && i == 0.0 )
         throw lang::IllegalArgumentException();
@@ -1907,21 +1898,21 @@ void Complex::Ln() throw( uno::RuntimeException, lang::IllegalArgumentException
 }
 
 
-void Complex::Log10() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Log10()
 {
     Ln();
     Mult( 0.434294481903251828 );   // * log10( e )
 }
 
 
-void Complex::Log2() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Log2()
 {
     Ln();
     Mult( 1.442695040888963407 );   // * log2( e )
 }
 
 
-void Complex::Tan() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Tan()
 {
     if ( i )
     {
@@ -1940,7 +1931,7 @@ void Complex::Tan() throw( uno::RuntimeException, lang::IllegalArgumentException
 }
 
 
-void Complex::Sec() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Sec()
 {
     if( i )
     {
@@ -1961,7 +1952,7 @@ void Complex::Sec() throw( uno::RuntimeException, lang::IllegalArgumentException
 }
 
 
-void Complex::Csc() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Csc()
 {
     if( i )
     {
@@ -1982,7 +1973,7 @@ void Complex::Csc() throw( uno::RuntimeException, lang::IllegalArgumentException
 }
 
 
-void Complex::Cot() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Cot()
 {
     if ( i )
     {
@@ -2001,7 +1992,7 @@ void Complex::Cot() throw( uno::RuntimeException, lang::IllegalArgumentException
 }
 
 
-void Complex::Sinh() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Sinh()
 {
     if( !::rtl::math::isValidArcArg( r ) )
         throw lang::IllegalArgumentException();
@@ -2018,7 +2009,7 @@ void Complex::Sinh() throw( uno::RuntimeException, lang::IllegalArgumentExceptio
 }
 
 
-void Complex::Cosh() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Cosh()
 {
     if( !::rtl::math::isValidArcArg( r ) )
         throw lang::IllegalArgumentException();
@@ -2035,7 +2026,7 @@ void Complex::Cosh() throw( uno::RuntimeException, lang::IllegalArgumentExceptio
 }
 
 
-void Complex::Sech() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Sech()
 {
     if ( i )
     {
@@ -2056,7 +2047,7 @@ void Complex::Sech() throw( uno::RuntimeException, lang::IllegalArgumentExceptio
 }
 
 
-void Complex::Csch() throw( uno::RuntimeException, lang::IllegalArgumentException )
+void Complex::Csch()
 {
     if ( i )
     {
@@ -2084,7 +2075,7 @@ ComplexList::~ComplexList()
 }
 
 
-void ComplexList::Append( const uno::Sequence< uno::Sequence< OUString > >& r, ComplListAppendHandl eAH ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void ComplexList::Append( const uno::Sequence< uno::Sequence< OUString > >& r, ComplListAppendHandl eAH )
 {
     sal_Int32   n1, n2;
     sal_Int32   nE1 = r.getLength();
@@ -2112,7 +2103,7 @@ void ComplexList::Append( const uno::Sequence< uno::Sequence< OUString > >& r, C
 }
 
 
-void ComplexList::Append( const uno::Sequence< uno::Any >& aMultPars, ComplListAppendHandl eAH ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+void ComplexList::Append( const uno::Sequence< uno::Any >& aMultPars, ComplListAppendHandl eAH )
 {
     sal_Int32       nEle = aMultPars.getLength();
     bool            bEmpty0 = eAH == AH_EmpyAs0;
@@ -2274,7 +2265,7 @@ sal_Int16 ConvertData::GetMatchingLevel( const OUString& rRef ) const
 
 
 double ConvertData::Convert(
-    double f, const ConvertData& r, sal_Int16 nLevFrom, sal_Int16 nLevTo ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
+    double f, const ConvertData& r, sal_Int16 nLevFrom, sal_Int16 nLevTo ) const
 {
     if( Class() != r.Class() )
         throw lang::IllegalArgumentException();
@@ -2325,7 +2316,7 @@ ConvertDataLinear::~ConvertDataLinear()
 }
 
 double ConvertDataLinear::Convert(
-    double f, const ConvertData& r, sal_Int16 nLevFrom, sal_Int16 nLevTo ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
+    double f, const ConvertData& r, sal_Int16 nLevFrom, sal_Int16 nLevTo ) const
 {
     if( Class() != r.Class() )
         throw lang::IllegalArgumentException();
@@ -2547,7 +2538,7 @@ ConvertDataList::~ConvertDataList()
 }
 
 
-double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUString& rTo )
 {
     ConvertData*    pFrom = nullptr;
     ConvertData*    pTo = nullptr;
@@ -2699,7 +2690,7 @@ sal_Int32 ScaDate::getDaysInYearRange( sal_uInt16 nFrom, sal_uInt16 nTo ) const
     return b30Days ? ((nTo - nFrom + 1) * 360) : ::GetDaysInYears( nFrom, nTo );
 }
 
-void ScaDate::doAddYears( sal_Int32 nYearCount ) throw( lang::IllegalArgumentException )
+void ScaDate::doAddYears( sal_Int32 nYearCount )
 {
     sal_Int32 nNewYear = nYearCount + nYear;
     if( (nNewYear < 0) || (nNewYear > 0x7FFF) )
@@ -2707,7 +2698,7 @@ void ScaDate::doAddYears( sal_Int32 nYearCount ) throw( lang::IllegalArgumentExc
     nYear = static_cast< sal_uInt16 >( nNewYear );
 }
 
-void ScaDate::addMonths( sal_Int32 nMonthCount ) throw( lang::IllegalArgumentException )
+void ScaDate::addMonths( sal_Int32 nMonthCount )
 {
     sal_Int32 nNewMonth = nMonthCount + nMonth;
     if( nNewMonth > 12 )
@@ -2733,7 +2724,7 @@ sal_Int32 ScaDate::getDate( sal_Int32 nNullDate ) const
     return ::DateToDays( nRealDay, nMonth, nYear ) - nNullDate;
 }
 
-sal_Int32 ScaDate::getDiff( const ScaDate& rFrom, const ScaDate& rTo ) throw( lang::IllegalArgumentException )
+sal_Int32 ScaDate::getDiff( const ScaDate& rFrom, const ScaDate& rTo )
 {
     if( rFrom > rTo )
         return getDiff( rTo, rFrom );
@@ -2815,7 +2806,7 @@ ScaAnyConverter::~ScaAnyConverter()
 {
 }
 
-void ScaAnyConverter::init( const uno::Reference< beans::XPropertySet >& xPropSet ) throw( uno::RuntimeException )
+void ScaAnyConverter::init( const uno::Reference< beans::XPropertySet >& xPropSet )
 {
     // try to get default number format
     bHasValidFormat = false;
@@ -2839,7 +2830,7 @@ void ScaAnyConverter::init( const uno::Reference< beans::XPropertySet >& xPropSe
     }
 }
 
-double ScaAnyConverter::convertToDouble( const OUString& rString ) const throw( lang::IllegalArgumentException )
+double ScaAnyConverter::convertToDouble( const OUString& rString ) const
 {
     double fValue = 0.0;
     if( bHasValidFormat )
@@ -2866,7 +2857,7 @@ double ScaAnyConverter::convertToDouble( const OUString& rString ) const throw(
 
 bool ScaAnyConverter::getDouble(
         double& rfResult,
-        const uno::Any& rAny ) const throw( lang::IllegalArgumentException )
+        const uno::Any& rAny ) const
 {
     rfResult = 0.0;
     bool bContainsVal = true;
@@ -2896,7 +2887,7 @@ bool ScaAnyConverter::getDouble(
 bool ScaAnyConverter::getDouble(
         double& rfResult,
         const uno::Reference< beans::XPropertySet >& xPropSet,
-        const uno::Any& rAny ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        const uno::Any& rAny )
 {
     init( xPropSet );
     return getDouble( rfResult, rAny );
@@ -2905,7 +2896,7 @@ bool ScaAnyConverter::getDouble(
 double ScaAnyConverter::getDouble(
         const uno::Reference< beans::XPropertySet >& xPropSet,
         const uno::Any& rAny,
-        double fDefault ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        double fDefault )
 {
     double fResult;
     if( !getDouble( fResult, xPropSet, rAny ) )
@@ -2916,7 +2907,7 @@ double ScaAnyConverter::getDouble(
 bool ScaAnyConverter::getInt32(
         sal_Int32& rnResult,
         const uno::Reference< beans::XPropertySet >& xPropSet,
-        const uno::Any& rAny ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        const uno::Any& rAny )
 {
     double fResult;
     bool bContainsVal = getDouble( fResult, xPropSet, rAny );
@@ -2930,7 +2921,7 @@ bool ScaAnyConverter::getInt32(
 sal_Int32 ScaAnyConverter::getInt32(
         const uno::Reference< beans::XPropertySet >& xPropSet,
         const uno::Any& rAny,
-        sal_Int32 nDefault ) throw( uno::RuntimeException, lang::IllegalArgumentException )
+        sal_Int32 nDefault )
 {
     sal_Int32 nResult;
     if( !getInt32( nResult, xPropSet, rAny ) )
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 40565ea50ad7..b00654d39056 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -72,9 +72,9 @@ inline bool     IsLeapYear( sal_uInt16 nYear );
 sal_uInt16          DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
 sal_Int32           DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear );
 /// @throws css::lang::IllegalArgumentException
-void                DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt16& rYear ) throw( css::lang::IllegalArgumentException );
+void                DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt16& rYear );
 /// @throws css::uno::RuntimeException
-sal_Int32           GetNullDate( const css::uno::Reference< css::beans::XPropertySet >& xOptions ) throw( css::uno::RuntimeException );
+sal_Int32           GetNullDate( const css::uno::Reference< css::beans::XPropertySet >& xOptions );
 sal_Int32           GetDiffDate360(
                         sal_uInt16 nDay1, sal_uInt16 nMonth1, sal_uInt16 nYear1, bool bLeapYear1,
                         sal_uInt16 nDay2, sal_uInt16 nMonth2, sal_uInt16 nYear2,
@@ -87,33 +87,30 @@ inline sal_Int16    GetDayOfWeek( sal_Int32 nDate );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 sal_Int32           GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
-                                sal_Int32* pOptDaysIn1stYear ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int32* pOptDaysIn1stYear );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
-double              GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+double              GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
-sal_Int32           GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+sal_Int32           GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
-double              GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
-                        throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+double              GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
-inline double       GetYearFrac( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
-                        throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+inline double       GetYearFrac( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode );
 
 double              BinomialCoefficient( double n, double k );
 double              GetGcd( double f1, double f2 );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
-double              ConvertToDec( const OUString& rFromNum, sal_uInt16 nBaseFrom, sal_uInt16 nCharLim ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+double              ConvertToDec( const OUString& rFromNum, sal_uInt16 nBaseFrom, sal_uInt16 nCharLim );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 OUString              ConvertFromDec(
                         double fNum, double fMin, double fMax, sal_uInt16 nBase,
-                        sal_Int32 nPlaces, sal_Int32 nMaxPlaces, bool bUsePlaces ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                        sal_Int32 nPlaces, sal_Int32 nMaxPlaces, bool bUsePlaces );
 double              Erf( double fX );
 double              Erfc( double fX );
 bool                ParseDouble( const sal_Unicode*& rpDoubleAsString, double& rReturn );
@@ -122,73 +119,73 @@ OUString            GetString( double fNumber, bool bLeadingSign, sal_uInt16 nMa
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
-                                double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                double fRestVal, double fPer, double fRate, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
-                                double fRestVal, double fPer, double fRate, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                double fRestVal, double fPer, double fRate, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup,
-                                double fYield, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                double fYield, sal_Int32 nFreq, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetYieldmat( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
-                                double fRate, double fPrice, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                double fRate, double fPrice, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetOddfprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
                                 sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp,
-                                sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int32 nFreq, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice,
-                                double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                double fRedemp, sal_Int32 nFreq, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              getPrice_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield,
-                                double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                double fRedemp, sal_Int32 nFreq, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetOddfyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
                                 sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp,
-                                sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int32 nFreq, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
-                                double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
-                                double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase );
 double              GetRmz( double fZins, double fZzr, double fBw, double fZw, sal_Int32 nF );
 double              GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF );
 
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetCoupncd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetCoupdaybs( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int32 nBase );
 
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat,
-                                sal_Int32 nFreq, sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int32 nFreq, sal_Int32 nBase );
 /// @throws css::uno::RuntimeException
 /// @throws css::lang::IllegalArgumentException
 double              GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
-                                sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int32 nBase );
 
 
 enum FDCategory
@@ -295,8 +292,7 @@ private:
     void                        Insert( sal_Int32 nDay, sal_Int32 nNullDate, bool bInsertOnWeekend );
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                        Insert( double fDay, sal_Int32 nNullDate, bool bInsertOnWeekend )
-                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                        Insert( double fDay, sal_Int32 nNullDate, bool bInsertOnWeekend );
 
                                 /** @param rAnyConv  must be an initialized ScaAnyConmverter
                                     @param bInsertOnWeekend  insertion mode: false = holidays on weekend are omitted
@@ -307,7 +303,7 @@ private:
                                     const ScaAnyConverter& rAnyConv,
                                     const css::uno::Any& rHolAny,
                                     sal_Int32 nNullDate,
-                                    bool bInsertOnWeekend ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    bool bInsertOnWeekend );
 
 public:
                                 SortedIndividualInt32List();
@@ -332,7 +328,7 @@ public:
                                     ScaAnyConverter& rAnyConv,
                                     const css::uno::Reference< css::beans::XPropertySet >& xOptions,
                                     const css::uno::Any& rHolAny,
-                                    sal_Int32 nNullDate) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    sal_Int32 nNullDate);
 };
 
 
@@ -345,7 +341,7 @@ protected:
 
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    inline void                 Append( double fValue ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
+    inline void                 Append( double fValue )
                                     { if( CheckInsert( fValue ) ) ListAppend( fValue ); }
 
                                 /** @param rAnyConv  must be an initialized ScaAnyConmverter
@@ -356,7 +352,7 @@ protected:
     void                        Append(
                                     const ScaAnyConverter& rAnyConv,
                                     const css::uno::Any& rAny,
-                                    bool bIgnoreEmpty ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    bool bIgnoreEmpty );
 
                                 /** @param rAnyConv  must be an initialized ScaAnyConmverter
                                     @param bIgnoreEmpty  handling of empty Any's/strings: false = inserted as 0.0; true = omitted
@@ -366,7 +362,7 @@ protected:
     void                        Append(
                                     const ScaAnyConverter& rAnyConv,
                                     const css::uno::Sequence< css::uno::Any >& rAnySeq,
-                                    bool bIgnoreEmpty ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    bool bIgnoreEmpty );
 
                                 /** @param rAnyConv  must be an initialized ScaAnyConmverter
                                     @param bIgnoreEmpty  handling of empty Any's/strings: false = inserted as 0.0; true = omitted
@@ -376,7 +372,7 @@ protected:
     void                        Append(
                                     const ScaAnyConverter& rAnyConv,
                                     const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& rAnySeq,
-                                    bool bIgnoreEmpty ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    bool bIgnoreEmpty );
 
 public:
     virtual                     ~ScaDoubleList() {}
@@ -388,12 +384,10 @@ public:
 
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                        Append( const css::uno::Sequence< css::uno::Sequence< double > >& rValueArr )
-                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                        Append( const css::uno::Sequence< css::uno::Sequence< double > >& rValueArr );
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                        Append( const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rValueArr )
-                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                        Append( const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rValueArr );
 
                                 /** @param rAnyConv  is an initialized or uninitialized ScaAnyConverter
                                     @param bIgnoreEmpty  handling of empty Any's/strings: false = inserted as 0.0; true = omitted
@@ -403,12 +397,11 @@ public:
     void                        Append(
                                     ScaAnyConverter& rAnyConv,
                                     const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-                                    const css::uno::Sequence< css::uno::Any >& rAnySeq ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    const css::uno::Sequence< css::uno::Any >& rAnySeq );
 
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    virtual bool                CheckInsert( double fValue ) const
-                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    virtual bool                CheckInsert( double fValue ) const;
 };
 
 
@@ -416,8 +409,7 @@ public:
 class ScaDoubleListGT0 : public ScaDoubleList
 {
 public:
-    virtual bool                CheckInsert( double fValue ) const
-                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ) override;
+    virtual bool                CheckInsert( double fValue ) const override;
 };
 
 
@@ -425,8 +417,7 @@ public:
 class ScaDoubleListGE0 : public ScaDoubleList
 {
 public:
-    virtual bool                CheckInsert( double fValue ) const
-                                    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ) override;
+    virtual bool                CheckInsert( double fValue ) const override;
 };
 
 
@@ -440,75 +431,75 @@ public:
     inline                  Complex( double fReal, double fImag = 0.0, sal_Unicode cC = '\0' );
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    explicit                Complex( const OUString& rComplexAsString ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    explicit                Complex( const OUString& rComplexAsString );
 
     inline static bool      IsImagUnit( sal_Unicode c );
     static bool             ParseString( const OUString& rComplexAsString, Complex& rReturn );
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    OUString                GetString() const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    OUString                GetString() const;
 
     inline double           Real() const;
     inline double           Imag() const;
 
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    double                  Arg() const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    double                  Arg() const;
     inline double           Abs() const;
 
     // following functions change the complex number itself to avoid unnecessary copy actions!
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Power( double fPower ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Power( double fPower );
     void                    Sqrt();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Sin() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Sin();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Cos() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Cos();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Div( const Complex& rDivisor ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Div( const Complex& rDivisor );
     void                    Exp();
     inline void             Conjugate();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Ln() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Ln();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Log10() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Log10();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Log2() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Log2();
     inline void             Mult( double fFact );
     inline void             Mult( const Complex& rMult );
     inline void             Sub( const Complex& rMult );
     inline void             Add( const Complex& rAdd );
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Tan() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Tan();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Sec() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Sec();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Csc() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Csc();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Cot() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Cot();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Sinh() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Sinh();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Cosh() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Cosh();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Sech() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Sech();
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Csch() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Csch();
 
 };
 
@@ -538,10 +529,10 @@ public:
     inline void             Append( Complex* pNew );
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Append( const css::uno::Sequence< css::uno::Sequence< OUString > >& rComplexNumList, ComplListAppendHandl eAH ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Append( const css::uno::Sequence< css::uno::Sequence< OUString > >& rComplexNumList, ComplListAppendHandl eAH );
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void                    Append( const css::uno::Sequence< css::uno::Any >& aMultPars,ComplListAppendHandl eAH ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void                    Append( const css::uno::Sequence< css::uno::Any >& aMultPars,ComplListAppendHandl eAH );
 };
 
 
@@ -583,7 +574,7 @@ public:
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
     virtual double          Convert( double fVal, const ConvertData& rTo,
-                                sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const;
                                     // converts fVal from this unit to rFrom unit
                                     // throws exception if not from same class
                                     // this implementation is for proportional cases only
@@ -608,7 +599,7 @@ public:
     virtual                 ~ConvertDataLinear() override;
 
     virtual double          Convert( double fVal, const ConvertData& rTo,
-                                sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ) override;
+                                sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const override;
                                     // for cases where f(x) = a + bx applies (e.g. Temperatures)
 
     virtual double          ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const override;
@@ -626,7 +617,7 @@ public:
 
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    double                  Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    double                  Convert( double fVal, const OUString& rFrom, const OUString& rTo );
 };
 
 
@@ -648,7 +639,7 @@ inline sal_Int16 GetDayOfWeek( sal_Int32 n )
 }
 
 
-inline double GetYearFrac( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException )
+inline double GetYearFrac( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
 {
     return GetYearFrac( GetNullDate( xOpt ), nStartDate, nEndDate, nMode );
 }
@@ -815,7 +806,7 @@ private:
                                 /// Adds/subtracts the given count of years, does not adjust day.
                                 ///
                                 /// @throws css::lang::IllegalArgumentException
-    void                        doAddYears( sal_Int32 nYearCount ) throw( css::lang::IllegalArgumentException );
+    void                        doAddYears( sal_Int32 nYearCount );
 
 public:
                                 ScaDate();
@@ -839,21 +830,21 @@ public:
                                 /// adds/subtracts the given count of months, adjusts day
                                 ///
                                 /// @throws css::lang::IllegalArgumentException
-    void                        addMonths( sal_Int32 nMonthCount ) throw( css::lang::IllegalArgumentException );
+    void                        addMonths( sal_Int32 nMonthCount );
 
                                 /// sets the given year, adjusts day
     inline void                 setYear( sal_uInt16 nNewYear );
                                 /// adds/subtracts the given count of years, adjusts day
                                 ///
                                 /// @throws css::lang::IllegalArgumentException
-    inline void                 addYears( sal_Int32 nYearCount ) throw( css::lang::IllegalArgumentException );
+    inline void                 addYears( sal_Int32 nYearCount );
 
                                 /// @return  the internal number of the current date
     sal_Int32                   getDate( sal_Int32 nNullDate ) const;
                                 /// @return  the number of days between the two dates
                                 ///
                                 /// @throws css::lang::IllegalArgumentException
-    static sal_Int32            getDiff( const ScaDate& rFrom, const ScaDate& rTo ) throw( css::lang::IllegalArgumentException );
+    static sal_Int32            getDiff( const ScaDate& rFrom, const ScaDate& rTo );
 
     bool                        operator<( const ScaDate& rCmp ) const;
     inline bool                 operator<=( const ScaDate& rCmp ) const { return !(rCmp < *this); }
@@ -877,7 +868,7 @@ inline void ScaDate::setYear( sal_uInt16 nNewYear )
     setDay();
 }
 
-inline void ScaDate::addYears( sal_Int32 nYearCount ) throw( css::lang::IllegalArgumentException )
+inline void ScaDate::addYears( sal_Int32 nYearCount )
 {
     doAddYears( nYearCount );
     setDay();
@@ -898,8 +889,7 @@ private:
                                         on strings not representing any double value.
                                     @return  the converted double value. */
     double                      convertToDouble(
-                                    const OUString& rString ) const
-                                throw( css::lang::IllegalArgumentException );
+                                    const OUString& rString ) const;
 
 public:
     explicit                    ScaAnyConverter(
@@ -910,8 +900,7 @@ public:
                                 ///
                                 /// @throws css::uno::RuntimeException
     void                        init(
-                                    const css::uno::Reference< css::beans::XPropertySet >& xPropSet )
-                                throw( css::uno::RuntimeException );
+                                    const css::uno::Reference< css::beans::XPropertySet >& xPropSet );
 
                                 /** Converts an Any to double (without initialization).
                                     The Any can be empty or contain a double or string.
@@ -921,8 +910,7 @@ public:
                                              false if the Any is empty or the string is empty */
     bool                        getDouble(
                                     double& rfResult,
-                                    const css::uno::Any& rAny ) const
-                                throw( css::lang::IllegalArgumentException );
+                                    const css::uno::Any& rAny ) const;
 
                                 /** Converts an Any to double (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -933,8 +921,7 @@ public:
     bool                        getDouble(
                                     double& rfResult,
                                     const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
-                                    const css::uno::Any& rAny )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    const css::uno::Any& rAny );
 
                                 /** Converts an Any to double (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -944,8 +931,7 @@ public:
     double                      getDouble(
                                     const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
                                     const css::uno::Any& rAny,
-                                    double fDefault )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    double fDefault );
 
                                 /** Converts an Any to sal_Int32 (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -956,8 +942,7 @@ public:
     bool                        getInt32(
                                     sal_Int32& rnResult,
                                     const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
-                                    const css::uno::Any& rAny )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    const css::uno::Any& rAny );
 
                                 /** Converts an Any to sal_Int32 (with initialization).
                                     The Any can be empty or contain a double or string.
@@ -967,8 +952,7 @@ public:
     sal_Int32                   getInt32(
                                     const css::uno::Reference< css::beans::XPropertySet >& xPropSet,
                                     const css::uno::Any& rAny,
-                                    sal_Int32 nDefault )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+                                    sal_Int32 nDefault );
 };
 
 } }
diff --git a/scaddins/source/analysis/bessel.cxx b/scaddins/source/analysis/bessel.cxx
index b93018cfc1d2..0369785987e3 100644
--- a/scaddins/source/analysis/bessel.cxx
+++ b/scaddins/source/analysis/bessel.cxx
@@ -55,7 +55,7 @@ const double f_2_DIV_PI = 2.0 / f_PI;
     alpha_k=1 for k=N and alpha_k=0 otherwise
 */
 
-double BesselJ( double x, sal_Int32 N ) throw (IllegalArgumentException, NoConvergenceException)
+double BesselJ( double x, sal_Int32 N )
 
 {
     if( N < 0 )
@@ -167,7 +167,7 @@ double BesselJ( double x, sal_Int32 N ) throw (IllegalArgumentException, NoConve
     No asymptotic approximation used, see issue 43040.
  */
 
-double BesselI( double x, sal_Int32 n ) throw( IllegalArgumentException, NoConvergenceException )
+double BesselI( double x, sal_Int32 n )
 {
     const sal_Int32 nMaxIteration = 2000;
     const double fXHalf = x / 2.0;
@@ -224,7 +224,7 @@ double BesselI( double x, sal_Int32 n ) throw( IllegalArgumentException, NoConve
 
 /// @throws IllegalArgumentException
 /// @throws NoConvergenceException
-double Besselk0( double fNum ) throw( IllegalArgumentException, NoConvergenceException )
+double Besselk0( double fNum )
 {
     double  fRet;
 
@@ -251,7 +251,7 @@ double Besselk0( double fNum ) throw( IllegalArgumentException, NoConvergenceExc
 
 /// @throws IllegalArgumentException
 /// @throws NoConvergenceException
-double Besselk1( double fNum ) throw( IllegalArgumentException, NoConvergenceException )
+double Besselk1( double fNum )
 {
     double  fRet;
 
@@ -278,7 +278,7 @@ double Besselk1( double fNum ) throw( IllegalArgumentException, NoConvergenceExc
 }
 
 
-double BesselK( double fNum, sal_Int32 nOrder ) throw( IllegalArgumentException, NoConvergenceException )
+double BesselK( double fNum, sal_Int32 nOrder )
 {
     switch( nOrder )
     {
@@ -323,7 +323,7 @@ double BesselK( double fNum, sal_Int32 nOrder ) throw( IllegalArgumentException,
 
 /// @throws IllegalArgumentException
 /// @throws NoConvergenceException
-double Bessely0( double fX ) throw( IllegalArgumentException, NoConvergenceException )
+double Bessely0( double fX )
 {
     if (fX <= 0)
         throw IllegalArgumentException();
@@ -377,7 +377,7 @@ double Bessely0( double fX ) throw( IllegalArgumentException, NoConvergenceExcep
 // http://www.openoffice.org/nonav/issues/showattachment.cgi/63609/Comments%20to%20the%20implementation%20of%20the%20Bessel%20functions.odt
 /// @throws IllegalArgumentException
 /// @throws NoConvergenceException
-double Bessely1( double fX ) throw( IllegalArgumentException, NoConvergenceException )
+double Bessely1( double fX )
 {
     if (fX <= 0)
         throw IllegalArgumentException();
@@ -429,7 +429,7 @@ double Bessely1( double fX ) throw( IllegalArgumentException, NoConvergenceExcep
         throw NoConvergenceException();
 }
 
-double BesselY( double fNum, sal_Int32 nOrder ) throw( IllegalArgumentException, NoConvergenceException )
+double BesselY( double fNum, sal_Int32 nOrder )
 {
     switch( nOrder )
     {
diff --git a/scaddins/source/analysis/bessel.hxx b/scaddins/source/analysis/bessel.hxx
index ae49c99059c1..cfb8a5a88c8a 100644
--- a/scaddins/source/analysis/bessel.hxx
+++ b/scaddins/source/analysis/bessel.hxx
@@ -36,28 +36,28 @@ namespace analysis {
     @throws css::lang::IllegalArgumentException
     @throws css::sheet::NoConvergenceException
 */
-double BesselJ( double x, sal_Int32 n ) throw( css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
+double BesselJ( double x, sal_Int32 n );
 
 /** Returns the result for the modified BESSEL function of first kind (I), n-th order, at point x.
 
     @throws css::lang::IllegalArgumentException
     @throws css::sheet::NoConvergenceException
 */
-double BesselI( double x, sal_Int32 n ) throw( css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
+double BesselI( double x, sal_Int32 n );
 
 /** Returns the result for the unmodified BESSEL function of second kind (Y), n-th order, at point x.
 
     @throws css::lang::IllegalArgumentException
     @throws css::sheet::NoConvergenceException
 */
-double BesselY( double x, sal_Int32 n ) throw( css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
+double BesselY( double x, sal_Int32 n );
 
 /** Returns the result for the modified BESSEL function of second kind (K), n-th order, at point x.
 
     @throws css::lang::IllegalArgumentException
     @throws css::sheet::NoConvergenceException
 */
-double BesselK( double x, sal_Int32 n ) throw( css::lang::IllegalArgumentException, css::sheet::NoConvergenceException );
+double BesselK( double x, sal_Int32 n );
 
 } // namespace analysis
 } // namespace sca
diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx
index 7a38d5876cc6..70cc6e37a5e5 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -25,7 +25,7 @@ using namespace sca::analysis;
 
 double SAL_CALL AnalysisAddIn::getAmordegrc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal,
-    double fPer, double fRate, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    double fPer, double fRate, const css::uno::Any& rOB )
 {
     if( nDate > nFirstPer || fRate <= 0.0 || fRestVal > fCost ||
         fCost <= 0.0 || fRestVal < 0 || fPer < 0 )
@@ -38,7 +38,7 @@ double SAL_CALL AnalysisAddIn::getAmordegrc( const css::uno::Reference< css::bea
 
 double SAL_CALL AnalysisAddIn::getAmorlinc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal,
-    double fPer, double fRate, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    double fPer, double fRate, const css::uno::Any& rOB )
 {
     if ( nDate > nFirstPer || fRate <= 0.0 || fRestVal > fCost ||
          fCost <= 0.0 || fRestVal < 0 || fPer < 0 )
@@ -51,7 +51,7 @@ double SAL_CALL AnalysisAddIn::getAmorlinc( const css::uno::Reference< css::bean
 
 double SAL_CALL AnalysisAddIn::getAccrint( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nIssue, sal_Int32 /*nFirstInter*/, sal_Int32 nSettle, double fRate,
-    const css::uno::Any &rVal, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    const css::uno::Any &rVal, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     double      fVal = aAnyConv.getDouble( xOpt, rVal, 1000.0 );
 
@@ -64,7 +64,7 @@ double SAL_CALL AnalysisAddIn::getAccrint( const css::uno::Reference< css::beans
 
 
 double SAL_CALL AnalysisAddIn::getAccrintm( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const css::uno::Any& rVal, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const css::uno::Any& rVal, const css::uno::Any& rOB )
 {
     double      fVal = aAnyConv.getDouble( xOpt, rVal, 1000.0 );
 
@@ -77,7 +77,7 @@ double SAL_CALL AnalysisAddIn::getAccrintm( const css::uno::Reference< css::bean
 
 
 double SAL_CALL AnalysisAddIn::getReceived( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const css::uno::Any& rOB )
 {
     if( fInvest <= 0.0 || fDisc <= 0.0 || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -88,7 +88,7 @@ double SAL_CALL AnalysisAddIn::getReceived( const css::uno::Reference< css::bean
 
 
 double SAL_CALL AnalysisAddIn::getDisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOB )
 {
     if( fPrice <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -99,7 +99,6 @@ double SAL_CALL AnalysisAddIn::getDisc( const css::uno::Reference< css::beans::X
 
 double SAL_CALL AnalysisAddIn::getDuration( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOB )
-    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
 {
     if( fCoup < 0.0 || fYield < 0.0 || CHK_Freq || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -109,7 +108,7 @@ double SAL_CALL AnalysisAddIn::getDuration( const css::uno::Reference< css::bean
 }
 
 
-double SAL_CALL AnalysisAddIn::getEffect( double fNominal, sal_Int32 nPeriods ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getEffect( double fNominal, sal_Int32 nPeriods )
 {
     if( nPeriods < 1 || fNominal <= 0.0 )
         throw css::lang::IllegalArgumentException();
@@ -122,7 +121,7 @@ double SAL_CALL AnalysisAddIn::getEffect( double fNominal, sal_Int32 nPeriods )
 
 
 double SAL_CALL AnalysisAddIn::getCumprinc( double fRate, sal_Int32 nNumPeriods, double fVal,
-    sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType )
 {
     double fRmz, fKapZ;
 
@@ -160,7 +159,7 @@ double SAL_CALL AnalysisAddIn::getCumprinc( double fRate, sal_Int32 nNumPeriods,
 
 
 double SAL_CALL AnalysisAddIn::getCumipmt( double fRate, sal_Int32 nNumPeriods, double fVal,
-    sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType )
 {
     double fRmz, fZinsZ;
 
@@ -199,7 +198,7 @@ double SAL_CALL AnalysisAddIn::getCumipmt( double fRate, sal_Int32 nNumPeriods,
 
 double SAL_CALL AnalysisAddIn::getPrice( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield, double fRedemp, sal_Int32 nFreq,
-    const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    const css::uno::Any& rOB )
 {
     if( fYield < 0.0 || fRate < 0.0 || fRedemp <= 0.0 || CHK_Freq || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -210,7 +209,7 @@ double SAL_CALL AnalysisAddIn::getPrice( const css::uno::Reference< css::beans::
 
 
 double SAL_CALL AnalysisAddIn::getPricedisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const css::uno::Any& rOB )
 {
     if( fDisc <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -222,7 +221,6 @@ double SAL_CALL AnalysisAddIn::getPricedisc( const css::uno::Reference< css::bea
 
 double SAL_CALL AnalysisAddIn::getPricemat( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fYield, const css::uno::Any& rOB )
-    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
 {
     if( fRate < 0.0 || fYield < 0.0 || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -245,7 +243,6 @@ double SAL_CALL AnalysisAddIn::getPricemat( const css::uno::Reference< css::bean
 
 double SAL_CALL AnalysisAddIn::getMduration( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const css::uno::Any& rOB )
-    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
 {
     if( fCoup < 0.0 || fYield < 0.0 || CHK_Freq )
         throw css::lang::IllegalArgumentException();
@@ -256,7 +253,7 @@ double SAL_CALL AnalysisAddIn::getMduration( const css::uno::Reference< css::bea
 }
 
 
-double SAL_CALL AnalysisAddIn::getNominal( double fRate, sal_Int32 nPeriods ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getNominal( double fRate, sal_Int32 nPeriods )
 {
     if( fRate <= 0.0 || nPeriods < 0 )
         throw css::lang::IllegalArgumentException();
@@ -267,7 +264,7 @@ double SAL_CALL AnalysisAddIn::getNominal( double fRate, sal_Int32 nPeriods ) th
 }
 
 
-double SAL_CALL AnalysisAddIn::getDollarfr( double fDollarDec, sal_Int32 nFrac ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getDollarfr( double fDollarDec, sal_Int32 nFrac )
 {
     if( nFrac <= 0 )
         throw css::lang::IllegalArgumentException();
@@ -287,7 +284,7 @@ double SAL_CALL AnalysisAddIn::getDollarfr( double fDollarDec, sal_Int32 nFrac )
 }
 
 
-double SAL_CALL AnalysisAddIn::getDollarde( double fDollarFrac, sal_Int32 nFrac ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getDollarde( double fDollarFrac, sal_Int32 nFrac )
 {
     if( nFrac <= 0 )
         throw css::lang::IllegalArgumentException();
@@ -309,7 +306,6 @@ double SAL_CALL AnalysisAddIn::getDollarde( double fDollarFrac, sal_Int32 nFrac
 
 double SAL_CALL AnalysisAddIn::getYield( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB )
-    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
 {
     if( fCoup < 0.0 || fPrice <= 0.0 || fRedemp <= 0.0 || CHK_Freq || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -320,7 +316,7 @@ double SAL_CALL AnalysisAddIn::getYield( const css::uno::Reference< css::beans::
 
 
 double SAL_CALL AnalysisAddIn::getYielddisc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const css::uno::Any& rOB )
 {
     if( fPrice <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -336,7 +332,6 @@ double SAL_CALL AnalysisAddIn::getYielddisc( const css::uno::Reference< css::bea
 
 double SAL_CALL AnalysisAddIn::getYieldmat( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const css::uno::Any& rOB )
-    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
 {
     if( fPrice <= 0.0 || fRate <= 0.0 || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -347,7 +342,7 @@ double SAL_CALL AnalysisAddIn::getYieldmat( const css::uno::Reference< css::bean
 
 
 double SAL_CALL AnalysisAddIn::getTbilleq( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, double fDisc )
 {
     nMat++;
 
@@ -362,7 +357,7 @@ double SAL_CALL AnalysisAddIn::getTbilleq( const css::uno::Reference< css::beans
 
 
 double SAL_CALL AnalysisAddIn::getTbillprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, double fDisc )
 {
     if( fDisc <= 0.0 || nSettle > nMat )
         throw css::lang::IllegalArgumentException();
@@ -381,7 +376,6 @@ double SAL_CALL AnalysisAddIn::getTbillprice( const css::uno::Reference< css::be
 
 
 double SAL_CALL AnalysisAddIn::getTbillyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice )
-    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
 {
     sal_Int32   nDiff = GetDiffDate360( xOpt, nSettle, nMat, true );
     nDiff++;
@@ -405,7 +399,7 @@ SAL_WNOUNREACHABLE_CODE_PUSH
 
 double SAL_CALL AnalysisAddIn::getOddfprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup,
-    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     if( fRate < 0.0 || fYield < 0.0 || CHK_Freq || nMat <= nFirstCoup || nFirstCoup <= nSettle || nSettle <= nIssue )
         throw css::lang::IllegalArgumentException();
@@ -423,7 +417,7 @@ SAL_WNOUNREACHABLE_CODE_PUSH
 
 double SAL_CALL AnalysisAddIn::getOddfyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup,
-    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     if( fRate < 0.0 || fPrice <= 0.0 || CHK_Freq || nMat <= nFirstCoup || nFirstCoup <= nSettle || nSettle <= nIssue )
         throw css::lang::IllegalArgumentException();
@@ -437,7 +431,7 @@ SAL_WNOUNREACHABLE_CODE_POP
 
 double SAL_CALL AnalysisAddIn::getOddlprice( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
-    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     if( fRate <= 0.0 || fYield < 0.0 || fRedemp <= 0.0 || CHK_Freq || nMat <= nSettle || nSettle <= nLastInterest )
         throw css::lang::IllegalArgumentException();
@@ -450,7 +444,7 @@ double SAL_CALL AnalysisAddIn::getOddlprice( const css::uno::Reference< css::bea
 
 double SAL_CALL AnalysisAddIn::getOddlyield( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
     sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
-    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     if( fRate <= 0.0 || fPrice <= 0.0 || fRedemp <= 0.0 || CHK_Freq || nMat <= nSettle || nSettle <= nLastInterest )
         throw css::lang::IllegalArgumentException();
@@ -522,7 +516,7 @@ static double lcl_sca_XirrResult_Deriv1( const ScaDoubleList& rValues, const Sca
 // XIRR calculation
 
 double SAL_CALL AnalysisAddIn::getXirr(
-    const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates, const css::uno::Any& rGuessRate ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    const css::uno::Reference< css::beans::XPropertySet >& xOpt, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates, const css::uno::Any& rGuessRate )
 {
     ScaDoubleList aValues, aDates;
     aValues.Append( rValues );
@@ -582,7 +576,7 @@ double SAL_CALL AnalysisAddIn::getXirr(
 
 
 double SAL_CALL AnalysisAddIn::getXnpv(
-    double fRate, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    double fRate, const css::uno::Sequence< css::uno::Sequence< double > >& rValues, const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& rDates )
 {
     ScaDoubleList aValList;
     ScaDoubleList aDateList;
@@ -607,7 +601,7 @@ double SAL_CALL AnalysisAddIn::getXnpv(
 
 
 double SAL_CALL AnalysisAddIn::getIntrate( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const css::uno::Any& rOB )
 {
     if( fInvest <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat )
         throw css::lang::IllegalArgumentException();
@@ -618,7 +612,7 @@ double SAL_CALL AnalysisAddIn::getIntrate( const css::uno::Reference< css::beans
 
 
 double SAL_CALL AnalysisAddIn::getCoupncd( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     double fRet = GetCoupncd( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
@@ -626,7 +620,7 @@ double SAL_CALL AnalysisAddIn::getCoupncd( const css::uno::Reference< css::beans
 
 
 double SAL_CALL AnalysisAddIn::getCoupdays( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     double fRet = GetCoupdays( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
@@ -634,7 +628,7 @@ double SAL_CALL AnalysisAddIn::getCoupdays( const css::uno::Reference< css::bean
 
 
 double SAL_CALL AnalysisAddIn::getCoupdaysnc( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     double fRet = GetCoupdaysnc( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
@@ -642,7 +636,7 @@ double SAL_CALL AnalysisAddIn::getCoupdaysnc( const css::uno::Reference< css::be
 
 
 double SAL_CALL AnalysisAddIn::getCoupdaybs( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     double fRet = GetCoupdaybs( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
@@ -650,7 +644,7 @@ double SAL_CALL AnalysisAddIn::getCoupdaybs( const css::uno::Reference< css::bea
 
 
 double SAL_CALL AnalysisAddIn::getCouppcd( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     double fRet = GetCouppcd( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
@@ -658,14 +652,14 @@ double SAL_CALL AnalysisAddIn::getCouppcd( const css::uno::Reference< css::beans
 
 
 double SAL_CALL AnalysisAddIn::getCoupnum( const css::uno::Reference< css::beans::XPropertySet >& xOpt,
-    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+    sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const css::uno::Any& rOB )
 {
     double fRet = GetCoupnum( GetNullDate( xOpt ), nSettle, nMat, nFreq, getDateMode( xOpt, rOB ) );
     RETURN_FINITE( fRet );
 }
 
 
-double SAL_CALL AnalysisAddIn::getFvschedule( double fPrinc, const css::uno::Sequence< css::uno::Sequence< double > >& rSchedule ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception )
+double SAL_CALL AnalysisAddIn::getFvschedule( double fPrinc, const css::uno::Sequence< css::uno::Sequence< double > >& rSchedule )
 {
     ScaDoubleList aSchedList;
 
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 1c8f481b4813..d5e0d9aac320 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -172,7 +172,7 @@ const lang::Locale& ScaDateAddIn::GetLocale( sal_uInt32 nIndex )
     return (nIndex < sizeof( pLang )) ? pDefLocales[ nIndex ] : aFuncLoc;
 }
 
-ResMgr& ScaDateAddIn::GetResMgr() throw( uno::RuntimeException, std::exception )
+ResMgr& ScaDateAddIn::GetResMgr()
 {
     if( !pResMgr )
     {
@@ -200,7 +200,7 @@ void ScaDateAddIn::InitData()
     }
 }
 
-OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( uno::RuntimeException, std::exception )
+OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex )
 {
     OUString aRet;
 
@@ -230,48 +230,48 @@ uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static()
 }
 
 // XServiceName
-OUString SAL_CALL ScaDateAddIn::getServiceName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaDateAddIn::getServiceName()
 {
     // name of specific AddIn service
     return OUString( MY_SERVICE );
 }
 
 // XServiceInfo
-OUString SAL_CALL ScaDateAddIn::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaDateAddIn::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL ScaDateAddIn::supportsService( const OUString& aServiceName ) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL ScaDateAddIn::supportsService( const OUString& aServiceName )
 {
     return cppu::supportsService(this, aServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL ScaDateAddIn::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL ScaDateAddIn::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
 // XLocalizable
-void SAL_CALL ScaDateAddIn::setLocale( const lang::Locale& eLocale ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL ScaDateAddIn::setLocale( const lang::Locale& eLocale )
 {
     aFuncLoc = eLocale;
     InitData();     // change of locale invalidates resources!
 }
 
-lang::Locale SAL_CALL ScaDateAddIn::getLocale() throw( uno::RuntimeException, std::exception )
+lang::Locale SAL_CALL ScaDateAddIn::getLocale()
 {
     return aFuncLoc;
 }
 
-OUString SAL_CALL ScaDateAddIn::getProgrammaticFuntionName( const OUString& ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaDateAddIn::getProgrammaticFuntionName( const OUString& )
 {
     //  not used by calc
     //  (but should be implemented for other uses of the AddIn service)
     return OUString();
 }
 
-OUString SAL_CALL ScaDateAddIn::getDisplayFunctionName( const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaDateAddIn::getDisplayFunctionName( const OUString& aProgrammaticName )
 {
     OUString aRet;
 
@@ -292,7 +292,7 @@ OUString SAL_CALL ScaDateAddIn::getDisplayFunctionName( const OUString& aProgram
     return aRet;
 }
 
-OUString SAL_CALL ScaDateAddIn::getFunctionDescription( const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaDateAddIn::getFunctionDescription( const OUString& aProgrammaticName )
 {
     OUString aRet;
 
@@ -305,7 +305,7 @@ OUString SAL_CALL ScaDateAddIn::getFunctionDescription( const OUString& aProgram
 }
 
 OUString SAL_CALL ScaDateAddIn::getDisplayArgumentName(
-        const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName, sal_Int32 nArgument )
 {
     OUString aRet;
 
@@ -324,7 +324,7 @@ OUString SAL_CALL ScaDateAddIn::getDisplayArgumentName(
 }
 
 OUString SAL_CALL ScaDateAddIn::getArgumentDescription(
-        const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName, sal_Int32 nArgument )
 {
     OUString aRet;
 
@@ -343,7 +343,7 @@ OUString SAL_CALL ScaDateAddIn::getArgumentDescription(
 }
 
 OUString SAL_CALL ScaDateAddIn::getProgrammaticCategoryName(
-        const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName )
 {
     OUString aRet;
 
@@ -371,14 +371,14 @@ OUString SAL_CALL ScaDateAddIn::getProgrammaticCategoryName(
 }
 
 OUString SAL_CALL ScaDateAddIn::getDisplayCategoryName(
-        const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName )
 {
     return getProgrammaticCategoryName( aProgrammaticName );
 }
 
 // XCompatibilityNames
 uno::Sequence< sheet::LocalizedName > SAL_CALL ScaDateAddIn::getCompatibilityNames(
-        const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName )
 {
     auto fDataIt = std::find_if(pFuncDataList->begin(), pFuncDataList->end(),
                                 FindScaFuncData( aProgrammaticName ) );
@@ -455,7 +455,6 @@ sal_Int32 DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear )
 
 void DaysToDate( sal_Int32 nDays,
                 sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt16& rYear )
-        throw( lang::IllegalArgumentException )
 {
     if( nDays < 0 )
         throw lang::IllegalArgumentException();
@@ -509,7 +508,6 @@ void DaysToDate( sal_Int32 nDays,
  * @throws uno::RuntimeException
  */
 sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOptions )
-        throw( uno::RuntimeException )
 {
     if (xOptions.is())
     {
@@ -587,7 +585,7 @@ sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOptions )
 sal_Int32 SAL_CALL ScaDateAddIn::getDiffWeeks(
         const uno::Reference< beans::XPropertySet >& xOptions,
         sal_Int32 nStartDate, sal_Int32 nEndDate,
-        sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+        sal_Int32 nMode )
 {
     if (nMode != 0 && nMode != 1)
         throw lang::IllegalArgumentException();
@@ -627,7 +625,7 @@ sal_Int32 SAL_CALL ScaDateAddIn::getDiffWeeks(
 sal_Int32 SAL_CALL ScaDateAddIn::getDiffMonths(
         const uno::Reference< beans::XPropertySet >& xOptions,
         sal_Int32 nStartDate, sal_Int32 nEndDate,
-        sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+        sal_Int32 nMode )
 {
     if (nMode != 0 && nMode != 1)
         throw lang::IllegalArgumentException();
@@ -675,7 +673,7 @@ sal_Int32 SAL_CALL ScaDateAddIn::getDiffMonths(
 sal_Int32 SAL_CALL ScaDateAddIn::getDiffYears(
         const uno::Reference< beans::XPropertySet >& xOptions,
         sal_Int32 nStartDate, sal_Int32 nEndDate,
-        sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+        sal_Int32 nMode )
 {
     if (nMode != 0 && nMode != 1)
         throw lang::IllegalArgumentException();
@@ -701,7 +699,7 @@ sal_Int32 SAL_CALL ScaDateAddIn::getDiffYears(
  */
 sal_Int32 SAL_CALL ScaDateAddIn::getIsLeapYear(
         const uno::Reference< beans::XPropertySet >& xOptions,
-        sal_Int32 nDate ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+        sal_Int32 nDate )
 {
     sal_Int32 nNullDate = GetNullDate( xOptions );
     sal_Int32 nDays = nDate + nNullDate;
@@ -717,7 +715,7 @@ sal_Int32 SAL_CALL ScaDateAddIn::getIsLeapYear(
  */
 sal_Int32 SAL_CALL ScaDateAddIn::getDaysInMonth(
         const uno::Reference<beans::XPropertySet>& xOptions,
-        sal_Int32 nDate ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+        sal_Int32 nDate )
 {
     sal_Int32 nNullDate = GetNullDate( xOptions );
     sal_Int32 nDays = nDate + nNullDate;
@@ -733,7 +731,7 @@ sal_Int32 SAL_CALL ScaDateAddIn::getDaysInMonth(
  */
 sal_Int32 SAL_CALL ScaDateAddIn::getDaysInYear(
         const uno::Reference< beans::XPropertySet >& xOptions,
-        sal_Int32 nDate ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+        sal_Int32 nDate )
 {
     sal_Int32 nNullDate = GetNullDate( xOptions );
     sal_Int32 nDays = nDate + nNullDate;
@@ -761,7 +759,7 @@ sal_Int32 SAL_CALL ScaDateAddIn::getDaysInYear(
  */
 sal_Int32 SAL_CALL ScaDateAddIn::getWeeksInYear(
         const uno::Reference< beans::XPropertySet >& xOptions,
-        sal_Int32 nDate ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+        sal_Int32 nDate )
 {
     sal_Int32 nNullDate = GetNullDate( xOptions );
     sal_Int32 nDays = nDate + nNullDate;
@@ -788,7 +786,7 @@ sal_Int32 SAL_CALL ScaDateAddIn::getWeeksInYear(
  * This function rotates each character by 13 in the alphabet.
  * Only the characters 'a' ... 'z' and 'A' ... 'Z' are modified.
  */
-OUString SAL_CALL ScaDateAddIn::getRot13( const OUString& aSrcString ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+OUString SAL_CALL ScaDateAddIn::getRot13( const OUString& aSrcString )
 {
     OUStringBuffer aBuffer( aSrcString );
     for( sal_Int32 nIndex = 0; nIndex < aBuffer.getLength(); nIndex++ )
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 490fcd19fd80..c0637d6295a4 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -191,11 +191,11 @@ private:
     void                        InitDefLocales();
     const css::lang::Locale& GetLocale( sal_uInt32 nIndex );
     /// @throws css::uno::RuntimeException
-    ResMgr&                     GetResMgr() throw( css::uno::RuntimeException, std::exception );
+    ResMgr&                     GetResMgr();
     void                        InitData();
 
     /// @throws css::uno::RuntimeException
-    OUString                    GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException, std::exception );
+    OUString                    GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex );
 
 public:
                                 ScaDateAddIn();
@@ -204,28 +204,28 @@ public:
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
                                 // XAddIn
-    virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) override;
+    virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) override;
+    virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) override;
+    virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticName, sal_Int32 nArgument ) override;
+    virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticName, sal_Int32 nArgument ) override;
+    virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticName ) override;
+    virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticName ) override;
 
                                 // XCompatibilityNames
-    virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) override;
 
                                 // XLocalizable
-    virtual void SAL_CALL       setLocale( const css::lang::Locale& eLocale ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL       setLocale( const css::lang::Locale& eLocale ) override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
 
                                 // XServiceName
-    virtual OUString SAL_CALL getServiceName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
                                 // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL   supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL   supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //  methods from own interfaces start here
 
@@ -233,45 +233,37 @@ public:
     virtual sal_Int32 SAL_CALL  getDiffWeeks(
                                     const css::uno::Reference< css::beans::XPropertySet >& xOptions,
                                     sal_Int32 nEndDate, sal_Int32 nStartDate,
-                                    sal_Int32 nMode )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+                                    sal_Int32 nMode ) override;
 
     virtual sal_Int32 SAL_CALL  getDiffMonths(
                                     const css::uno::Reference< css::beans::XPropertySet >& xOptions,
                                     sal_Int32 nEndDate, sal_Int32 nStartDate,
-                                    sal_Int32 nMode )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+                                    sal_Int32 nMode ) override;
 
     virtual sal_Int32 SAL_CALL  getDiffYears(
                                     const css::uno::Reference< css::beans::XPropertySet >& xOptions,
                                     sal_Int32 nEndDate, sal_Int32 nStartDate,
-                                    sal_Int32 nMode )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+                                    sal_Int32 nMode ) override;
 
     virtual sal_Int32 SAL_CALL  getIsLeapYear(
                                     const css::uno::Reference< css::beans::XPropertySet >& xOptions,
-                                    sal_Int32 nDate )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+                                    sal_Int32 nDate ) override;
 
     virtual sal_Int32 SAL_CALL  getDaysInMonth(
                                     const css::uno::Reference< css::beans::XPropertySet >& xOptions,
-                                    sal_Int32 nDate )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+                                    sal_Int32 nDate ) override;
 
     virtual sal_Int32 SAL_CALL  getDaysInYear(
                                     const css::uno::Reference< css::beans::XPropertySet >& xOptions,
-                                    sal_Int32 nDate )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+                                    sal_Int32 nDate ) override;
 
     virtual sal_Int32 SAL_CALL  getWeeksInYear(
                                     const css::uno::Reference< css::beans::XPropertySet >& xOptions,
-                                    sal_Int32 nDate )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+                                    sal_Int32 nDate ) override;
 
                                 // XMiscFunctions
     virtual OUString SAL_CALL getRot13(
-                                    const OUString& aSrcText )
-                                throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+                                    const OUString& aSrcText ) override;
 };
 
 #endif // INCLUDED_SCADDINS_SOURCE_DATEFUNC_DATEFUNC_HXX
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 8c3befb15ea2..b5e696057201 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -182,7 +182,7 @@ const lang::Locale& ScaPricingAddIn::GetLocale( sal_uInt32 nIndex )
     return (nIndex < sizeof( pLang )) ? pDefLocales[ nIndex ] : aFuncLoc;
 }
 
-ResMgr& ScaPricingAddIn::GetResMgr() throw( uno::RuntimeException, std::exception )
+ResMgr& ScaPricingAddIn::GetResMgr()
 {
     if( !pResMgr )
     {
@@ -216,7 +216,7 @@ void ScaPricingAddIn::InitData()
     }
 }
 
-OUString ScaPricingAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( uno::RuntimeException, std::exception )
+OUString ScaPricingAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex )
 {
     OUString aRet;
 
@@ -246,50 +246,50 @@ uno::Sequence< OUString > ScaPricingAddIn::getSupportedServiceNames_Static()
 }
 
 // XServiceName
-OUString SAL_CALL ScaPricingAddIn::getServiceName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaPricingAddIn::getServiceName()
 {
     // name of specific AddIn service
     return OUString( MY_SERVICE );
 }
 
 // XServiceInfo
-OUString SAL_CALL ScaPricingAddIn::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaPricingAddIn::getImplementationName()
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL ScaPricingAddIn::supportsService( const OUString& aServiceName ) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL ScaPricingAddIn::supportsService( const OUString& aServiceName )
 {
     return cppu::supportsService(this, aServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL ScaPricingAddIn::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL ScaPricingAddIn::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
 
 // XLocalizable
-void SAL_CALL ScaPricingAddIn::setLocale( const lang::Locale& eLocale ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL ScaPricingAddIn::setLocale( const lang::Locale& eLocale )
 {
     aFuncLoc = eLocale;
     InitData();     // change of locale invalidates resources!
 }
 
-lang::Locale SAL_CALL ScaPricingAddIn::getLocale() throw( uno::RuntimeException, std::exception )
+lang::Locale SAL_CALL ScaPricingAddIn::getLocale()
 {
     return aFuncLoc;
 }
 
 // function descriptions start here
 // XAddIn
-OUString SAL_CALL ScaPricingAddIn::getProgrammaticFuntionName( const OUString& ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaPricingAddIn::getProgrammaticFuntionName( const OUString& )
 {
     //  not used by calc
     //  (but should be implemented for other uses of the AddIn service)
     return OUString();
 }
 
-OUString SAL_CALL ScaPricingAddIn::getDisplayFunctionName( const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaPricingAddIn::getDisplayFunctionName( const OUString& aProgrammaticName )
 {
     OUString aRet;
 
@@ -310,7 +310,7 @@ OUString SAL_CALL ScaPricingAddIn::getDisplayFunctionName( const OUString& aProg
     return aRet;
 }
 
-OUString SAL_CALL ScaPricingAddIn::getFunctionDescription( const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ScaPricingAddIn::getFunctionDescription( const OUString& aProgrammaticName )
 {
     OUString aRet;
 
@@ -323,7 +323,7 @@ OUString SAL_CALL ScaPricingAddIn::getFunctionDescription( const OUString& aProg
 }
 
 OUString SAL_CALL ScaPricingAddIn::getDisplayArgumentName(
-        const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName, sal_Int32 nArgument )
 {
     OUString aRet;
 
@@ -342,7 +342,7 @@ OUString SAL_CALL ScaPricingAddIn::getDisplayArgumentName(
 }
 
 OUString SAL_CALL ScaPricingAddIn::getArgumentDescription(
-        const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName, sal_Int32 nArgument )
 {
     OUString aRet;
 
@@ -361,7 +361,7 @@ OUString SAL_CALL ScaPricingAddIn::getArgumentDescription(
 }
 
 OUString SAL_CALL ScaPricingAddIn::getProgrammaticCategoryName(
-        const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName )
 {
     OUString aRet;
 
@@ -389,14 +389,14 @@ OUString SAL_CALL ScaPricingAddIn::getProgrammaticCategoryName(
 }
 
 OUString SAL_CALL ScaPricingAddIn::getDisplayCategoryName(
-        const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName )
 {
     return getProgrammaticCategoryName( aProgrammaticName );
 }
 
 // XCompatibilityNames
 uno::Sequence< sheet::LocalizedName > SAL_CALL ScaPricingAddIn::getCompatibilityNames(
-        const OUString& aProgrammaticName ) throw( uno::RuntimeException, std::exception )
+        const OUString& aProgrammaticName )
 {
     auto fDataIt = std::find_if( pFuncDataList->begin(), pFuncDataList->end(),
                                  FindScaFuncData( aProgrammaticName ) );
@@ -527,7 +527,7 @@ double SAL_CALL ScaPricingAddIn::getOptBarrier( double spot, double vol,
             double r, double rf, double T, double strike,
             double barrier_low, double barrier_up, double rebate,
             const OUString& put_call, const OUString& in_out,
-            const OUString& barriercont, const uno::Any& greekstr ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+            const OUString& barriercont, const uno::Any& greekstr )
 {
     bs::types::PutCall pc;
     bs::types::BarrierKIO kio;
@@ -553,7 +553,7 @@ double SAL_CALL ScaPricingAddIn::getOptTouch( double spot, double vol,
             double r, double rf, double T,
             double barrier_low, double barrier_up,
             const OUString& for_dom, const OUString& in_out,
-            const OUString& barriercont, const uno::Any& greekstr ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+            const OUString& barriercont, const uno::Any& greekstr )
 {
     bs::types::ForDom fd;
     bs::types::BarrierKIO kio;
@@ -577,7 +577,7 @@ double SAL_CALL ScaPricingAddIn::getOptTouch( double spot, double vol,
 // OPT_PRB_HIT(...)
 double SAL_CALL ScaPricingAddIn::getOptProbHit( double spot, double vol,
             double mu, double T,
-            double barrier_low, double barrier_up ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+            double barrier_low, double barrier_up )
 {
     // read and check input values
     if( spot<=0.0 || vol<=0.0 || T<0.0 ) {
@@ -593,7 +593,7 @@ double SAL_CALL ScaPricingAddIn::getOptProbHit( double spot, double vol,
 double SAL_CALL ScaPricingAddIn::getOptProbInMoney( double spot, double vol,
             double mu, double T,
             double barrier_low, double barrier_up,
-            const uno::Any& strikeval, const uno::Any& put_call ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
+            const uno::Any& strikeval, const uno::Any& put_call )
 {
     bs::types::PutCall pc=bs::types::Call;
     double  K;
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index f73d3aded419..d3cb74f9f88c 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -203,11 +203,11 @@ private:
     void                        InitDefLocales();
     const css::lang::Locale& GetLocale( sal_uInt32 nIndex );
     /// @throws css::uno::RuntimeException
-    ResMgr&                     GetResMgr() throw( css::uno::RuntimeException, std::exception );
+    ResMgr&                     GetResMgr();
     void                        InitData();
 
     /// @throws css::uno::RuntimeException
-    OUString             GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException, std::exception );
+    OUString             GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex );
 
 public:
                                 ScaPricingAddIn();
@@ -217,28 +217,28 @@ public:
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
                                 // XAddIn
-    virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticName, sal_Int32 nArgument ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) override;
+    virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) override;
+    virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) override;
+    virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticName, sal_Int32 nArgument ) override;
+    virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticName, sal_Int32 nArgument ) override;
+    virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticName ) override;
+    virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticName ) override;
 
                                 // XCompatibilityNames
-    virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL getCompatibilityNames( const OUString& aProgrammaticName ) override;
 
                                 // XLocalizable
-    virtual void SAL_CALL       setLocale( const css::lang::Locale& eLocale ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL       setLocale( const css::lang::Locale& eLocale ) override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
 
                                 // XServiceName
-    virtual OUString SAL_CALL getServiceName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
                                 // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL   supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL   supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 
     //  methods from own interfaces start here
@@ -248,22 +248,22 @@ public:
             double r, double rf, double T, double strike,
             double barrier_low, double barrier_up, double rebate,
             const OUString& put_call, const OUString& in_out,
-            const OUString& continuous, const css::uno::Any& greek ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+            const OUString& continuous, const css::uno::Any& greek ) override;
 
    virtual double SAL_CALL getOptTouch( double spot, double vol,
             double r, double rf, double T,
             double barrier_low, double barrier_up,
             const OUString& for_dom, const OUString& in_out,
-            const OUString& barriercont, const css::uno::Any& greekstr ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+            const OUString& barriercont, const css::uno::Any& greekstr ) override;
 
    virtual double SAL_CALL getOptProbHit( double spot, double vol,
             double mu, double T,
-            double barrier_low, double barrier_up ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+            double barrier_low, double barrier_up ) override;
 
    virtual double SAL_CALL getOptProbInMoney( double spot, double vol,
             double mu, double T,
             double barrier_low, double barrier_up,
-            const css::uno::Any& strikeval, const css::uno::Any& put_call ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+            const css::uno::Any& strikeval, const css::uno::Any& put_call ) override;
 
 };
 
diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx
index 189a6f9f64a0..d7f1751972c3 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -39,20 +39,18 @@ public:
     CoinMPSolver() {}
 
 private:
-    virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getImplementationName()
-        throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL solve() override;
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.Calc.CoinMPSolver");
     }
-    virtual OUString SAL_CALL getComponentDescription()
-        throw (uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getComponentDescription() override
     {
         return SolverComponent::GetResourceString( RID_COINMP_SOLVER_COMPONENT );
     }
 };
 
-void SAL_CALL CoinMPSolver::solve() throw(uno::RuntimeException, std::exception)
+void SAL_CALL CoinMPSolver::solve()
 {
     uno::Reference<frame::XModel> xModel( mxDoc, uno::UNO_QUERY );
     if ( !xModel.is() )
diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx
index c605bc17e4a9..d517696c8577 100644
--- a/sccomp/source/solver/LpsolveSolver.cxx
+++ b/sccomp/source/solver/LpsolveSolver.cxx
@@ -70,20 +70,18 @@ public:
     LpsolveSolver() {}
 
 private:
-    virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getImplementationName()
-        throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL solve() override;
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.Calc.LpsolveSolver");
     }
-    virtual OUString SAL_CALL getComponentDescription()
-        throw (uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getComponentDescription() override
     {
         return SolverComponent::GetResourceString( RID_SOLVER_COMPONENT );
     }
 };
 
-void SAL_CALL LpsolveSolver::solve() throw(uno::RuntimeException, std::exception)
+void SAL_CALL LpsolveSolver::solve()
 {
     uno::Reference<frame::XModel> xModel( mxDoc, uno::UNO_QUERY );
     if ( !xModel.is() )
diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx
index 4f4778cdfab0..bac5e8dc2b2c 100644
--- a/sccomp/source/solver/SolverComponent.cxx
+++ b/sccomp/source/solver/SolverComponent.cxx
@@ -132,19 +132,19 @@ cppu::IPropertyArrayHelper& SAL_CALL SolverComponent::getInfoHelper()
     return *getArrayHelper();
 }
 
-uno::Reference<beans::XPropertySetInfo> SAL_CALL SolverComponent::getPropertySetInfo() throw(uno::RuntimeException, std::exception)
+uno::Reference<beans::XPropertySetInfo> SAL_CALL SolverComponent::getPropertySetInfo()
 {
     return createPropertySetInfo( getInfoHelper() );
 }
 
 // XSolverDescription
 
-OUString SAL_CALL SolverComponent::getStatusDescription() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SolverComponent::getStatusDescription()
 {
     return maStatus;
 }
 
-OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rPropertyName ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rPropertyName )
 {
     sal_uInt32 nResId = 0;
     sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
@@ -178,84 +178,81 @@ OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rProp
 
 // XSolver: settings
 
-uno::Reference<sheet::XSpreadsheetDocument> SAL_CALL SolverComponent::getDocument() throw(uno::RuntimeException, std::exception)
+uno::Reference<sheet::XSpreadsheetDocument> SAL_CALL SolverComponent::getDocument()
 {
     return mxDoc;
 }
 
 void SAL_CALL SolverComponent::setDocument( const uno::Reference<sheet::XSpreadsheetDocument>& _document )
-                                throw(uno::RuntimeException, std::exception)
 {
     mxDoc = _document;
 }
 
-table::CellAddress SAL_CALL SolverComponent::getObjective() throw(uno::RuntimeException, std::exception)
+table::CellAddress SAL_CALL SolverComponent::getObjective()
 {
     return maObjective;
 }
 
-void SAL_CALL SolverComponent::setObjective( const table::CellAddress& _objective ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SolverComponent::setObjective( const table::CellAddress& _objective )
 {
     maObjective = _objective;
 }
 
-uno::Sequence<table::CellAddress> SAL_CALL SolverComponent::getVariables() throw(uno::RuntimeException, std::exception)
+uno::Sequence<table::CellAddress> SAL_CALL SolverComponent::getVariables()
 {
     return maVariables;
 }
 
 void SAL_CALL SolverComponent::setVariables( const uno::Sequence<table::CellAddress>& _variables )
-                                throw(uno::RuntimeException, std::exception)
 {
     maVariables = _variables;
 }
 
-uno::Sequence<sheet::SolverConstraint> SAL_CALL SolverComponent::getConstraints() throw(uno::RuntimeException, std::exception)
+uno::Sequence<sheet::SolverConstraint> SAL_CALL SolverComponent::getConstraints()
 {
     return maConstraints;
 }
 
 void SAL_CALL SolverComponent::setConstraints( const uno::Sequence<sheet::SolverConstraint>& _constraints )
-                                throw(uno::RuntimeException, std::exception)
 {
     maConstraints = _constraints;
 }
 
-sal_Bool SAL_CALL SolverComponent::getMaximize() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SolverComponent::getMaximize()
 {
     return mbMaximize;
 }
 
-void SAL_CALL SolverComponent::setMaximize( sal_Bool _maximize ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SolverComponent::setMaximize( sal_Bool _maximize )
 {
     mbMaximize = _maximize;
 }
 
 // XSolver: get results
 
-sal_Bool SAL_CALL SolverComponent::getSuccess() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SolverComponent::getSuccess()
 {
     return mbSuccess;
 }
 
-double SAL_CALL SolverComponent::getResultValue() throw(uno::RuntimeException, std::exception)
+double SAL_CALL SolverComponent::getResultValue()
 {
     return mfResultValue;
 }
 
-uno::Sequence<double> SAL_CALL SolverComponent::getSolution() throw(uno::RuntimeException, std::exception)
+uno::Sequence<double> SAL_CALL SolverComponent::getSolution()
 {
     return maSolution;
 }
 
 // XServiceInfo
 
-sal_Bool SAL_CALL SolverComponent::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SolverComponent::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence<OUString> SAL_CALL SolverComponent::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL SolverComponent::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aServiceNames { "com.sun.star.sheet.Solver" };
     return aServiceNames;
diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx
index dd0d21affd3b..227d48de5822 100644
--- a/sccomp/source/solver/SolverComponent.hxx
+++ b/sccomp/source/solver/SolverComponent.hxx
@@ -104,53 +104,40 @@ public:
     DECLARE_XINTERFACE()
     DECLARE_XTYPEPROVIDER()
 
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
     virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;     // from OPropertySetHelper
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;    // from OPropertyArrayUsageHelper
 
                             // XSolver
-    virtual css::uno::Reference< css::sheet::XSpreadsheetDocument > SAL_CALL getDocument()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sheet::XSpreadsheetDocument > SAL_CALL getDocument() override;
     virtual void SAL_CALL   setDocument( const css::uno::Reference<
-                                    css::sheet::XSpreadsheetDocument >& _document )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellAddress SAL_CALL getObjective() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setObjective( const css::table::CellAddress& _objective )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::table::CellAddress > SAL_CALL getVariables()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    css::sheet::XSpreadsheetDocument >& _document ) override;
+    virtual css::table::CellAddress SAL_CALL getObjective() override;
+    virtual void SAL_CALL   setObjective( const css::table::CellAddress& _objective ) override;
+    virtual css::uno::Sequence< css::table::CellAddress > SAL_CALL getVariables() override;
     virtual void SAL_CALL   setVariables( const css::uno::Sequence<
-                                    css::table::CellAddress >& _variables )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::sheet::SolverConstraint > SAL_CALL getConstraints()
-                                throw(css::uno::RuntimeException, std::exception) override;
+                                    css::table::CellAddress >& _variables ) override;
+    virtual css::uno::Sequence< css::sheet::SolverConstraint > SAL_CALL getConstraints() override;
     virtual void SAL_CALL   setConstraints( const css::uno::Sequence<
-                                    css::sheet::SolverConstraint >& _constraints )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMaximize() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setMaximize( sal_Bool _maximize ) throw(css::uno::RuntimeException, std::exception) override;
+                                    css::sheet::SolverConstraint >& _constraints ) override;
+    virtual sal_Bool SAL_CALL getMaximize() override;
+    virtual void SAL_CALL   setMaximize( sal_Bool _maximize ) override;
 
-    virtual sal_Bool SAL_CALL getSuccess() throw(css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getResultValue() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< double > SAL_CALL getSolution()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getSuccess() override;
+    virtual double SAL_CALL getResultValue() override;
+    virtual css::uno::Sequence< double > SAL_CALL getSolution() override;
 
-    virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) override = 0;
+    virtual void SAL_CALL solve() override = 0;
 
                             // XSolverDescription
-    virtual OUString SAL_CALL getComponentDescription() throw (css::uno::RuntimeException, std::exception) override = 0;
-    virtual OUString SAL_CALL getStatusDescription() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPropertyDescription( const OUString& aPropertyName )
-                                throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getComponentDescription() override = 0;
+    virtual OUString SAL_CALL getStatusDescription() override;
+    virtual OUString SAL_CALL getPropertyDescription( const OUString& aPropertyName ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override = 0;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override = 0;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx
index b39368ee03ce..16b4ded791a8 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -66,7 +66,7 @@ namespace basprov
     // XBrowseNode
 
 
-    OUString BasicLibraryNodeImpl::getName(  ) throw (RuntimeException, std::exception)
+    OUString BasicLibraryNodeImpl::getName(  )
     {
         SolarMutexGuard aGuard;
 
@@ -74,7 +74,7 @@ namespace basprov
     }
 
 
-    Sequence< Reference< browse::XBrowseNode > > BasicLibraryNodeImpl::getChildNodes(  ) throw (RuntimeException, std::exception)
+    Sequence< Reference< browse::XBrowseNode > > BasicLibraryNodeImpl::getChildNodes(  )
     {
         SolarMutexGuard aGuard;
 
@@ -106,7 +106,7 @@ namespace basprov
     }
 
 
-    sal_Bool BasicLibraryNodeImpl::hasChildNodes(  ) throw (RuntimeException, std::exception)
+    sal_Bool BasicLibraryNodeImpl::hasChildNodes(  )
     {
         SolarMutexGuard aGuard;
 
@@ -118,7 +118,7 @@ namespace basprov
     }
 
 
-    sal_Int16 BasicLibraryNodeImpl::getType(  ) throw (RuntimeException, std::exception)
+    sal_Int16 BasicLibraryNodeImpl::getType(  )
     {
         SolarMutexGuard aGuard;
 
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index 1f7bd0e7aec4..c23dcaa8a475 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -60,14 +60,10 @@ namespace basprov
         virtual ~BasicLibraryNodeImpl() override;
 
         // XBrowseNode
-        virtual OUString SAL_CALL getName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasChildNodes(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getType(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName(  ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  ) override;
+        virtual sal_Bool SAL_CALL hasChildNodes(  ) override;
+        virtual sal_Int16 SAL_CALL getType(  ) override;
     };
 
 
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index a67a8f766432..e9da25e5cfe3 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -114,7 +114,7 @@ namespace basprov
     // XBrowseNode
 
 
-    OUString BasicMethodNodeImpl::getName(  ) throw (RuntimeException, std::exception)
+    OUString BasicMethodNodeImpl::getName(  )
     {
         SolarMutexGuard aGuard;
 
@@ -126,19 +126,19 @@ namespace basprov
     }
 
 
-    Sequence< Reference< browse::XBrowseNode > > BasicMethodNodeImpl::getChildNodes(  ) throw (RuntimeException, std::exception)
+    Sequence< Reference< browse::XBrowseNode > > BasicMethodNodeImpl::getChildNodes(  )
     {
         return Sequence< Reference< browse::XBrowseNode > >();
     }
 
 
-    sal_Bool BasicMethodNodeImpl::hasChildNodes(  ) throw (RuntimeException, std::exception)
+    sal_Bool BasicMethodNodeImpl::hasChildNodes(  )
     {
         return false;
     }
 
 
-    sal_Int16 BasicMethodNodeImpl::getType(  ) throw (RuntimeException, std::exception)
+    sal_Int16 BasicMethodNodeImpl::getType(  )
     {
         return browse::BrowseNodeTypes::SCRIPT;
     }
@@ -167,7 +167,7 @@ namespace basprov
     // XPropertySet
 
 
-    Reference< XPropertySetInfo > BasicMethodNodeImpl::getPropertySetInfo(  ) throw (RuntimeException, std::exception)
+    Reference< XPropertySetInfo > BasicMethodNodeImpl::getPropertySetInfo(  )
     {
         Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
@@ -177,7 +177,7 @@ namespace basprov
     // XInvocation
 
 
-    Reference< XIntrospectionAccess > BasicMethodNodeImpl::getIntrospection(  ) throw (RuntimeException, std::exception)
+    Reference< XIntrospectionAccess > BasicMethodNodeImpl::getIntrospection(  )
     {
         return Reference< XIntrospectionAccess >();
     }
@@ -185,8 +185,6 @@ namespace basprov
 
     Any BasicMethodNodeImpl::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams,
         Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
-        throw (IllegalArgumentException, script::CannotConvertException,
-               reflection::InvocationTargetException, RuntimeException, std::exception)
     {
         (void)aParams;
         (void)aOutParamIndex;
@@ -272,8 +270,6 @@ namespace basprov
 
 
     void BasicMethodNodeImpl::setValue( const OUString& aPropertyName, const Any& aValue )
-        throw (UnknownPropertyException, script::CannotConvertException,
-               reflection::InvocationTargetException, RuntimeException, std::exception)
     {
         (void)aPropertyName;
         (void)aValue;
@@ -283,7 +279,7 @@ namespace basprov
     }
 
 
-    Any BasicMethodNodeImpl::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+    Any BasicMethodNodeImpl::getValue( const OUString& aPropertyName )
     {
         (void)aPropertyName;
 
@@ -292,7 +288,7 @@ namespace basprov
     }
 
 
-    sal_Bool BasicMethodNodeImpl::hasMethod( const OUString& aName ) throw (RuntimeException, std::exception)
+    sal_Bool BasicMethodNodeImpl::hasMethod( const OUString& aName )
     {
         bool bReturn = false;
         if ( aName == BASPROV_PROPERTY_EDITABLE )
@@ -302,7 +298,7 @@ namespace basprov
     }
 
 
-    sal_Bool BasicMethodNodeImpl::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception)
+    sal_Bool BasicMethodNodeImpl::hasProperty( const OUString& aName )
     {
         (void)aName;
 
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 5afb2ae7cee9..132c6df7fb8c 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -81,38 +81,25 @@ namespace basprov
         DECLARE_XTYPEPROVIDER()
 
         // XBrowseNode
-        virtual OUString SAL_CALL getName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasChildNodes(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getType(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName(  ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  ) override;
+        virtual sal_Bool SAL_CALL hasChildNodes(  ) override;
+        virtual sal_Int16 SAL_CALL getType(  ) override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
         // XInvocation
-        virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) override;
         virtual css::uno::Any SAL_CALL invoke(
             const OUString& aFunctionName,
             const css::uno::Sequence< css::uno::Any >& aParams,
             css::uno::Sequence< sal_Int16 >& aOutParamIndex,
-            css::uno::Sequence< css::uno::Any >& aOutParam )
-            throw (css::lang::IllegalArgumentException, css::script::CannotConvertException,
-                   css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue )
-            throw (css::beans::UnknownPropertyException, css::script::CannotConvertException,
-                   css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName )
-            throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasMethod( const OUString& aName )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasProperty( const OUString& aName )
-            throw (css::uno::RuntimeException, std::exception) override;
+            css::uno::Sequence< css::uno::Any >& aOutParam ) override;
+        virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) override;
+        virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override;
+        virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override;
     };
 
 
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index b1ee7d495790..145dda2b6e54 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -59,7 +59,7 @@ namespace basprov
     // XBrowseNode
 
 
-    OUString BasicModuleNodeImpl::getName(  ) throw (RuntimeException, std::exception)
+    OUString BasicModuleNodeImpl::getName(  )
     {
         SolarMutexGuard aGuard;
 
@@ -71,7 +71,7 @@ namespace basprov
     }
 
 
-    Sequence< Reference< browse::XBrowseNode > > BasicModuleNodeImpl::getChildNodes(  ) throw (RuntimeException, std::exception)
+    Sequence< Reference< browse::XBrowseNode > > BasicModuleNodeImpl::getChildNodes(  )
     {
         SolarMutexGuard aGuard;
 
@@ -107,7 +107,7 @@ namespace basprov
     }
 
 
-    sal_Bool BasicModuleNodeImpl::hasChildNodes(  ) throw (RuntimeException, std::exception)
+    sal_Bool BasicModuleNodeImpl::hasChildNodes(  )
     {
         SolarMutexGuard aGuard;
 
@@ -123,7 +123,7 @@ namespace basprov
     }
 
 
-    sal_Int16 BasicModuleNodeImpl::getType(  ) throw (RuntimeException, std::exception)
+    sal_Int16 BasicModuleNodeImpl::getType(  )
     {
         SolarMutexGuard aGuard;
 
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index 122337bf320f..e317df2272f1 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -54,14 +54,10 @@ namespace basprov
         virtual ~BasicModuleNodeImpl() override;
 
         // XBrowseNode
-        virtual OUString SAL_CALL getName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasChildNodes(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getType(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName(  ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  ) override;
+        virtual sal_Bool SAL_CALL hasChildNodes(  ) override;
+        virtual sal_Int16 SAL_CALL getType(  ) override;
     };
 
 
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index a166b2cf8efa..39a95bd5da4a 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -168,17 +168,17 @@ namespace basprov
     }
 
     // XServiceInfo
-    OUString BasicProviderImpl::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString BasicProviderImpl::getImplementationName(  )
     {
         return getImplementationName_BasicProviderImpl();
     }
 
-    sal_Bool BasicProviderImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool BasicProviderImpl::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    Sequence< OUString > BasicProviderImpl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > BasicProviderImpl::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_BasicProviderImpl();
     }
@@ -187,7 +187,7 @@ namespace basprov
     // XInitialization
 
 
-    void BasicProviderImpl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+    void BasicProviderImpl::initialize( const Sequence< Any >& aArguments )
     {
         // TODO
 
@@ -278,7 +278,6 @@ namespace basprov
 
 
     Reference < provider::XScript > BasicProviderImpl::getScript( const OUString& scriptURI )
-        throw ( provider::ScriptFrameworkErrorException, RuntimeException, std::exception)
     {
         // TODO
 
@@ -394,13 +393,13 @@ namespace basprov
     // XBrowseNode
 
 
-    OUString BasicProviderImpl::getName(  ) throw (RuntimeException, std::exception)
+    OUString BasicProviderImpl::getName(  )
     {
         return OUString("Basic");
     }
 
 
-    Sequence< Reference< browse::XBrowseNode > > BasicProviderImpl::getChildNodes(  ) throw (RuntimeException, std::exception)
+    Sequence< Reference< browse::XBrowseNode > > BasicProviderImpl::getChildNodes(  )
     {
         SolarMutexGuard aGuard;
 
@@ -457,7 +456,7 @@ namespace basprov
     }
 
 
-    sal_Bool BasicProviderImpl::hasChildNodes(  ) throw (RuntimeException, std::exception)
+    sal_Bool BasicProviderImpl::hasChildNodes(  )
     {
         SolarMutexGuard aGuard;
 
@@ -478,7 +477,7 @@ namespace basprov
     }
 
 
-    sal_Int16 BasicProviderImpl::getType(  ) throw (RuntimeException, std::exception)
+    sal_Int16 BasicProviderImpl::getType(  )
     {
         return browse::BrowseNodeTypes::CONTAINER;
     }
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index 8026a5c034ca..b3ba2617982c 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -70,31 +70,22 @@ namespace basprov
         virtual ~BasicProviderImpl() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XScriptProvider
         virtual css::uno::Reference < css::script::provider::XScript > SAL_CALL getScript(
-            const OUString& scriptURI )
-            throw (  css::script::provider::ScriptFrameworkErrorException, css::uno::RuntimeException, std::exception) override;
+            const OUString& scriptURI ) override;
 
         // XBrowseNode
-        virtual OUString SAL_CALL getName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasChildNodes(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getType(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName(  ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  ) override;
+        virtual sal_Bool SAL_CALL hasChildNodes(  ) override;
+        virtual sal_Int16 SAL_CALL getType(  ) override;
     };
 
 
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 1c991dbf8d48..dd098d42b9cd 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -143,7 +143,7 @@ namespace basprov
     // XPropertySet
 
 
-    Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo(  ) throw (RuntimeException, std::exception)
+    Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo(  )
     {
         Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
@@ -154,7 +154,6 @@ namespace basprov
 
 
     Any BasicScriptImpl::invoke( const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
-        throw ( provider::ScriptFrameworkErrorException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
     {
         // TODO: throw CannotConvertException
         // TODO: check length of aOutParamIndex, aOutParam
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index cf530d69f22b..71aae465ad7b 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -89,14 +89,9 @@ namespace basprov
         virtual css::uno::Any SAL_CALL invoke(
             const css::uno::Sequence< css::uno::Any >& aParams,
             css::uno::Sequence< sal_Int16 >& aOutParamIndex,
-            css::uno::Sequence< css::uno::Any >& aOutParam )
-            throw (
-                    css::script::provider::ScriptFrameworkErrorException,
-                    css::reflection::InvocationTargetException,
-                    css::uno::RuntimeException, std::exception ) override;
+            css::uno::Sequence< css::uno::Any >& aOutParam ) override;
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
         // SfxListener
         virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx b/scripting/source/dlgprov/DialogModelProvider.cxx
index d3e4aa5ef4f2..afd4628e9ed1 100644
--- a/scripting/source/dlgprov/DialogModelProvider.cxx
+++ b/scripting/source/dlgprov/DialogModelProvider.cxx
@@ -40,7 +40,7 @@ DialogModelProvider::DialogModelProvider(Reference< XComponentContext > const &
 {}
 
 // lang::XInitialization:
-void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception)
+void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any > & aArguments)
 {
     if ( aArguments.getLength() == 1 )
     {
@@ -72,84 +72,84 @@ void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence< uno::Any
 }
 
 // container::XElementAccess:
-uno::Type SAL_CALL DialogModelProvider::getElementType() throw (css::uno::RuntimeException, std::exception)
+uno::Type SAL_CALL DialogModelProvider::getElementType()
 {
     return m_xDialogModel->getElementType();
 }
 
-sal_Bool SAL_CALL DialogModelProvider::hasElements() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DialogModelProvider::hasElements()
 {
     return m_xDialogModel->hasElements();
 }
 
 // container::XNameAccess:
-uno::Any SAL_CALL DialogModelProvider::getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception)
+uno::Any SAL_CALL DialogModelProvider::getByName(const OUString & aName)
 {
     return m_xDialogModel->getByName(aName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getElementNames() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getElementNames()
 {
     return m_xDialogModel->getElementNames();
 }
 
-sal_Bool SAL_CALL DialogModelProvider::hasByName(const OUString & aName) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DialogModelProvider::hasByName(const OUString & aName)
 {
     return m_xDialogModel->hasByName(aName);
 }
 
 // container::XNameReplace:
-void SAL_CALL DialogModelProvider::replaceByName(const OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception)
+void SAL_CALL DialogModelProvider::replaceByName(const OUString & aName, const uno::Any & aElement)
 {
     m_xDialogModel->replaceByName(aName,aElement);
 }
 
 // container::XNameContainer:
-void SAL_CALL DialogModelProvider::insertByName(const OUString & aName, const uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception)
+void SAL_CALL DialogModelProvider::insertByName(const OUString & aName, const uno::Any & aElement)
 {
     m_xDialogModel->insertByName(aName,aElement);
 }
 
-void SAL_CALL DialogModelProvider::removeByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception)
+void SAL_CALL DialogModelProvider::removeByName(const OUString & aName)
 {
     m_xDialogModel->removeByName(aName);
 }
-uno::Reference< beans::XPropertySetInfo > SAL_CALL DialogModelProvider::getPropertySetInfo(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL DialogModelProvider::getPropertySetInfo(  )
 {
     return m_xDialogModelProp->getPropertySetInfo();
 }
-void SAL_CALL DialogModelProvider::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL DialogModelProvider::setPropertyValue( const OUString&, const uno::Any& )
 {
 }
-uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL DialogModelProvider::getPropertyValue( const OUString& PropertyName )
 {
     return m_xDialogModelProp->getPropertyValue(PropertyName);
 }
-void SAL_CALL DialogModelProvider::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL DialogModelProvider::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& )
 {
 }
-void SAL_CALL DialogModelProvider::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL DialogModelProvider::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& )
 {
 }
-void SAL_CALL DialogModelProvider::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL DialogModelProvider::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& )
 {
 }
-void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const OUString& ,const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL DialogModelProvider::removeVetoableChangeListener( const OUString& ,const uno::Reference< beans::XVetoableChangeListener >& )
 {
 }
 
 // com.sun.star.uno.XServiceInfo:
-OUString SAL_CALL DialogModelProvider::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL DialogModelProvider::getImplementationName()
 {
     return comp_DialogModelProvider::_getImplementationName();
 }
 
-sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DialogModelProvider::supportsService(OUString const & serviceName)
 {
     return cppu::supportsService(this, serviceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL DialogModelProvider::getSupportedServiceNames()
 {
     return comp_DialogModelProvider::_getSupportedServiceNames();
 }
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx
index ccf04a80d16d..9de4469a0d38 100644
--- a/scripting/source/dlgprov/DialogModelProvider.hxx
+++ b/scripting/source/dlgprov/DialogModelProvider.hxx
@@ -42,36 +42,36 @@ public:
     explicit DialogModelProvider(css::uno::Reference< css::uno::XComponentContext > const & context);
 private:
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
 
     // css::container::XElementAccess:
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // css::container::XNameAccess:
-    virtual css::uno::Any SAL_CALL getByName(const OUString & aName) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString & aName) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString & aName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString & aName) override;
 
     // css::container::XNameReplace:
-    virtual void SAL_CALL replaceByName(const OUString & aName, const css::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) override;
+    virtual void SAL_CALL replaceByName(const OUString & aName, const css::uno::Any & aElement) override;
 
     // css::container::XNameContainer:
-    virtual void SAL_CALL insertByName(const OUString & aName, const css::uno::Any & aElement) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception) override;
-    virtual void SAL_CALL removeByName(const OUString & Name) throw (css::uno::RuntimeException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception) override;
+    virtual void SAL_CALL insertByName(const OUString & aName, const css::uno::Any & aElement) override;
+    virtual void SAL_CALL removeByName(const OUString & Name) override;
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 private:
     DialogModelProvider(const DialogModelProvider &) = delete;
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index ca25c1458f78..b19512a2a296 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -185,7 +185,7 @@ namespace dlgprov
 
 
     Reference< script::XScriptListener >
-    DialogEventsAttacherImpl::getScriptListenerForKey( const OUString& sKey ) throw ( RuntimeException )
+    DialogEventsAttacherImpl::getScriptListenerForKey( const OUString& sKey )
     {
         ListenerHash::iterator it = listenersForTypes.find( sKey );
         if ( it == listenersForTypes.end() )
@@ -325,8 +325,6 @@ namespace dlgprov
     void SAL_CALL DialogEventsAttacherImpl::attachEvents( const Sequence< Reference< XInterface > >& Objects,
         const css::uno::Reference<css::script::XScriptListener>&,
         const Any& Helper )
-        throw (IllegalArgumentException, IntrospectionException, CannotCreateAdapterException,
-               ServiceNotRegisteredException, RuntimeException, std::exception)
     {
         // get EventAttacher
         {
@@ -408,7 +406,7 @@ namespace dlgprov
     // XEventListener
 
 
-    void DialogAllListenerImpl::disposing(const EventObject& ) throw ( RuntimeException, std::exception )
+    void DialogAllListenerImpl::disposing(const EventObject& )
     {
     }
 
@@ -416,7 +414,7 @@ namespace dlgprov
     // XAllListener
 
 
-    void DialogAllListenerImpl::firing( const AllEventObject& Event ) throw ( RuntimeException, std::exception )
+    void DialogAllListenerImpl::firing( const AllEventObject& Event )
     {
         //::osl::MutexGuard aGuard( getMutex() );
 
@@ -425,7 +423,6 @@ namespace dlgprov
 
 
     Any DialogAllListenerImpl::approveFiring( const AllEventObject& Event )
-        throw ( reflection::InvocationTargetException, RuntimeException, std::exception )
     {
         //::osl::MutexGuard aGuard( getMutex() );
 
@@ -642,7 +639,7 @@ namespace dlgprov
     // XEventListener
 
 
-    void DialogScriptListenerImpl::disposing(const EventObject& ) throw ( RuntimeException, std::exception )
+    void DialogScriptListenerImpl::disposing(const EventObject& )
     {
     }
 
@@ -650,7 +647,7 @@ namespace dlgprov
     // XScriptListener
 
 
-    void DialogScriptListenerImpl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException, std::exception )
+    void DialogScriptListenerImpl::firing( const ScriptEvent& aScriptEvent )
     {
         //::osl::MutexGuard aGuard( getMutex() );
 
@@ -659,7 +656,6 @@ namespace dlgprov
 
 
     Any DialogScriptListenerImpl::approveFiring( const ScriptEvent& aScriptEvent )
-        throw ( reflection::InvocationTargetException, RuntimeException, std::exception )
     {
         //::osl::MutexGuard aGuard( getMutex() );
 
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 34a2d9a888aa..392ffcdc9c70 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -53,7 +53,7 @@ namespace dlgprov
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
         css::uno::Reference< css::script::XEventAttacher > m_xEventAttacher;
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::script::XScriptListener > getScriptListenerForKey( const OUString& sScriptName ) throw ( css::uno::RuntimeException );
+        css::uno::Reference< css::script::XScriptListener > getScriptListenerForKey( const OUString& sScriptName );
         css::uno::Reference< css::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const css::uno::Reference< css::awt::XControl>& xControl, OUString& sCodeName );
         void nestedAttachEvents( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects, const css::uno::Any& Helper, OUString& sDialogCodeName );
         void attachEventsToControl( const css::uno::Reference< css::awt::XControl>& xControl, const css::uno::Reference< css::script::XScriptEventsSupplier >& events, const css::uno::Any& Helper  );
@@ -71,12 +71,7 @@ namespace dlgprov
         virtual void SAL_CALL attachEvents( const css::uno::Sequence<
             css::uno::Reference< css::uno::XInterface > >& Objects,
             const css::uno::Reference<css::script::XScriptListener>&,
-            const css::uno::Any& Helper )
-            throw (css::lang::IllegalArgumentException,
-                   css::beans::IntrospectionException,
-                   css::script::CannotCreateAdapterException,
-                   css::lang::ServiceNotRegisteredException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& Helper ) override;
     };
 
 
@@ -102,14 +97,11 @@ namespace dlgprov
         virtual ~DialogAllListenerImpl() 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;
 
         // XAllListener
-        virtual void SAL_CALL firing( const css::script::AllEventObject& Event )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL approveFiring( const css::script::AllEventObject& Event )
-            throw (css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL firing( const css::script::AllEventObject& Event ) override;
+        virtual css::uno::Any SAL_CALL approveFiring( const css::script::AllEventObject& Event ) override;
     };
 
 
@@ -130,14 +122,11 @@ namespace dlgprov
         virtual ~DialogScriptListenerImpl() 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;
 
         // XScriptListener
-        virtual void SAL_CALL firing( const css::script::ScriptEvent& aScriptEvent )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Any SAL_CALL approveFiring( const css::script::ScriptEvent& aScriptEvent )
-            throw (css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL firing( const css::script::ScriptEvent& aScriptEvent ) override;
+        virtual css::uno::Any SAL_CALL approveFiring( const css::script::ScriptEvent& aScriptEvent ) override;
     };
 
 
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 8267d5f3b965..9c7433133d08 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -128,7 +128,7 @@ namespace dlgprov
         const Reference< io::XInputStream >& xInput,
         const Reference< frame::XModel >& xModel,
         const Reference< resource::XStringResourceManager >& xStringResourceManager,
-        const Any &aDialogSourceURL) throw ( Exception )
+        const Any &aDialogSourceURL)
     {
         Reference< container::XNameContainer > xDialogModel(  lcl_createControlModel(i_xContext) );
 
@@ -231,12 +231,12 @@ namespace dlgprov
     Reference< container::XNameContainer > DialogProviderImpl::createDialogModel(
         const Reference< io::XInputStream >& xInput,
         const Reference< resource::XStringResourceManager >& xStringResourceManager,
-        const Any &aDialogSourceURL) throw ( Exception )
+        const Any &aDialogSourceURL)
     {
         return lcl_createDialogModel(m_xContext,xInput,m_xModel,xStringResourceManager,aDialogSourceURL);
     }
 
-    Reference< XControlModel > DialogProviderImpl::createDialogModelForBasic() throw ( Exception )
+    Reference< XControlModel > DialogProviderImpl::createDialogModelForBasic()
     {
         if ( !m_BasicInfo.get() )
             // shouln't get here
@@ -553,17 +553,17 @@ namespace dlgprov
     // XServiceInfo
 
 
-    OUString DialogProviderImpl::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString DialogProviderImpl::getImplementationName(  )
     {
         return getImplementationName_DialogProviderImpl();
     }
 
-    sal_Bool DialogProviderImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool DialogProviderImpl::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    Sequence< OUString > DialogProviderImpl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > DialogProviderImpl::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_DialogProviderImpl();
     }
@@ -572,7 +572,7 @@ namespace dlgprov
     // XInitialization
 
 
-    void DialogProviderImpl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+    void DialogProviderImpl::initialize( const Sequence< Any >& aArguments )
     {
         ::osl::MutexGuard aGuard( getMutex() );
 
@@ -615,7 +615,6 @@ namespace dlgprov
     Reference < XControl > DialogProviderImpl::createDialogImpl(
         const OUString& URL, const Reference< XInterface >& xHandler,
         const Reference< XWindowPeer >& xParent, bool bDialogProviderMode )
-            throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         // if the dialog is located in a document, the document must already be open!
 
@@ -680,7 +679,6 @@ namespace dlgprov
     }
 
     Reference < XDialog > DialogProviderImpl::createDialog( const OUString& URL )
-        throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         Reference< XInterface > xDummyHandler;
         Reference< XWindowPeer > xDummyPeer;
@@ -691,7 +689,6 @@ namespace dlgprov
 
     Reference < XDialog > DialogProviderImpl::createDialogWithHandler(
         const OUString& URL, const Reference< XInterface >& xHandler )
-            throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         if( !xHandler.is() )
         {
@@ -707,7 +704,6 @@ namespace dlgprov
 
     Reference < XDialog > DialogProviderImpl::createDialogWithArguments(
         const OUString& URL, const Sequence< NamedValue >& Arguments )
-            throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         ::comphelper::NamedValueCollection aArguments( Arguments );
 
@@ -733,7 +729,6 @@ namespace dlgprov
     Reference< XWindow > DialogProviderImpl::createContainerWindow(
         const OUString& URL, const OUString& WindowType,
         const Reference< XWindowPeer >& xParent, const Reference< XInterface >& xHandler )
-            throw (lang::IllegalArgumentException, RuntimeException, std::exception)
     {
         (void)WindowType;   // for future use
         if( !xParent.is() )
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index b554e531aa38..6277bba85b3e 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -60,7 +60,7 @@ namespace dlgprov
                 const css::uno::Reference< css::io::XInputStream >& xInput,
                 const css::uno::Reference< css::frame::XModel >& xModel,
                 const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager,
-                const css::uno::Any &aDialogSourceURL) throw ( css::uno::Exception );
+                const css::uno::Any &aDialogSourceURL);
 
     typedef ::cppu::WeakImplHelper<
         css::lang::XServiceInfo,
@@ -99,9 +99,9 @@ namespace dlgprov
             css::uno::Reference< css::container::XNameContainer > createDialogModel(
                 const css::uno::Reference< css::io::XInputStream >& xInput,
                 const css::uno::Reference< css::resource::XStringResourceManager >& xStringResourceManager,
-                const css::uno::Any &aDialogSourceURL) throw ( css::uno::Exception );
+                const css::uno::Any &aDialogSourceURL);
             /// @throws css::uno::Exception
-            css::uno::Reference< css::awt::XControlModel > createDialogModelForBasic() throw ( css::uno::Exception );
+            css::uno::Reference< css::awt::XControlModel > createDialogModelForBasic();
 
         // XDialogProvider / XDialogProvider2 impl method
         /// @throws css::lang::IllegalArgumentException
@@ -110,8 +110,7 @@ namespace dlgprov
             const OUString& URL,
             const css::uno::Reference< css::uno::XInterface >& xHandler,
             const css::uno::Reference< css::awt::XWindowPeer >& xParent,
-            bool bDialogProviderMode )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+            bool bDialogProviderMode );
 
     public:
         explicit DialogProviderImpl(
@@ -119,38 +118,30 @@ namespace dlgprov
         virtual ~DialogProviderImpl() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XDialogProvider
         virtual css::uno::Reference < css::awt::XDialog > SAL_CALL createDialog(
-            const OUString& URL )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const OUString& URL ) override;
 
         // XDialogProvider2
         virtual css::uno::Reference < css::awt::XDialog > SAL_CALL createDialogWithHandler(
             const OUString& URL,
-            const css::uno::Reference< css::uno::XInterface >& xHandler )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::uno::XInterface >& xHandler ) override;
 
         virtual css::uno::Reference < css::awt::XDialog > SAL_CALL createDialogWithArguments(
             const OUString& URL,
-            const css::uno::Sequence< css::beans::NamedValue >& Arguments )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override;
 
         virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createContainerWindow(
             const OUString& URL, const OUString& WindowType,
             const css::uno::Reference< css::awt::XWindowPeer >& xParent,
-            const css::uno::Reference< css::uno::XInterface >& xHandler )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::uno::XInterface >& xHandler ) override;
      };
 
 
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 2dff3383e348..28064c02fe48 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -69,7 +69,6 @@ namespace scripting_protocolhandler
 
 void SAL_CALL ScriptProtocolHandler::initialize(
     const css::uno::Sequence < css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, std::exception )
 {
     if ( m_bInitialised )
     {
@@ -90,7 +89,6 @@ void SAL_CALL ScriptProtocolHandler::initialize(
 
 Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch(
     const URL& aURL, const OUString& sTargetFrameName, sal_Int32 nSearchFlags )
-    throw( css::uno::RuntimeException, std::exception )
 {
     (void)sTargetFrameName;
     (void)nSearchFlags;
@@ -115,7 +113,6 @@ Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch(
 Sequence< Reference< XDispatch > > SAL_CALL
 ScriptProtocolHandler::queryDispatches(
 const Sequence < DispatchDescriptor >& seqDescriptor )
-throw( RuntimeException, std::exception )
 {
     sal_Int32 nCount = seqDescriptor.getLength();
     Sequence< Reference< XDispatch > > lDispatcher( nCount );
@@ -131,7 +128,6 @@ throw( RuntimeException, std::exception )
 void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
     const URL& aURL, const Sequence < PropertyValue >& lArgs,
     const Reference< XDispatchResultListener >& xListener )
-    throw ( RuntimeException, std::exception )
 {
 
     bool bSuccess = false;
@@ -309,14 +305,12 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 
 void SAL_CALL ScriptProtocolHandler::dispatch(
 const URL& aURL, const Sequence< PropertyValue >& lArgs )
-throw ( RuntimeException, std::exception )
 {
     dispatchWithNotification( aURL, lArgs, Reference< XDispatchResultListener >() );
 }
 
 void SAL_CALL ScriptProtocolHandler::addStatusListener(
 const Reference< XStatusListener >& xControl, const URL& aURL )
-throw ( RuntimeException, std::exception )
 {
     (void)xControl;
     (void)aURL;
@@ -326,7 +320,6 @@ throw ( RuntimeException, std::exception )
 
 void SAL_CALL ScriptProtocolHandler::removeStatusListener(
 const Reference< XStatusListener >& xControl, const URL& aURL )
-throw ( RuntimeException, std::exception )
 {
     (void)xControl;
     (void)aURL;
@@ -440,21 +433,18 @@ ScriptProtocolHandler::~ScriptProtocolHandler()
 
 /* XServiceInfo */
 OUString SAL_CALL ScriptProtocolHandler::getImplementationName( )
-throw( RuntimeException, std::exception )
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
 sal_Bool SAL_CALL ScriptProtocolHandler::supportsService(const OUString& sServiceName )
-throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
 Sequence< OUString > SAL_CALL ScriptProtocolHandler::getSupportedServiceNames()
-throw( RuntimeException, std::exception )
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -474,7 +464,6 @@ OUString ScriptProtocolHandler::impl_getStaticImplementationName()
 /* Helper for registry */
 Reference< XInterface > SAL_CALL ScriptProtocolHandler::impl_createInstance(
 const Reference< css::lang::XMultiServiceFactory >& xServiceManager )
-throw( RuntimeException )
 {
     return Reference< XInterface > ( *new ScriptProtocolHandler( comphelper::getComponentContext(xServiceManager) ) );
 }
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 70fe12843040..825f5ab75379 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -79,12 +79,9 @@ public:
     virtual ~ScriptProtocolHandler() override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::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;
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence < OUString > impl_getStaticSupportedServiceNames();
@@ -94,43 +91,36 @@ public:
     /// @throws css::uno::RuntimeException
     static css::uno::Reference < css::uno::XInterface > SAL_CALL
     impl_createInstance(
-        const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )
-    throw( css::uno::RuntimeException );
+        const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
     static css::uno::Reference < css::lang::XSingleServiceFactory > impl_createFactory(
         const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
     /* Implementation for XDispatchProvider */
     virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL
     queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName,
-                   sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override ;
+                   sal_Int32 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;
 
     /* Implementation for X(Notifying)Dispatch */
     virtual void SAL_CALL dispatchWithNotification(
         const css::util::URL& aURL,
         const css::uno::Sequence< css::beans::PropertyValue >& lArgs,
-        const css::uno::Reference< css::frame::XDispatchResultListener >& Listener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) override;
     virtual void SAL_CALL dispatch(
         const css::util::URL& aURL,
-        const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) 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;
+        const css::util::URL& aURL ) 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;
+        const css::util::URL& aURL ) override;
 
     /* Implementation for XInitialization */
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence < css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, std::exception ) override;
+        const css::uno::Sequence < css::uno::Any >& aArguments ) override;
 };
 
 }
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index 5859b4b6eef5..5ff52ea288d4 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -259,7 +259,6 @@ ActiveMSPList::addActiveMSP( const Reference< uno::XInterface >& xComponent,
 
 
 void SAL_CALL ActiveMSPList::disposing( const css::lang::EventObject& Source )
-throw ( css::uno::RuntimeException, std::exception )
 
 {
     try
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index dffe00f4bb6b..0ce042baac07 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -72,8 +72,7 @@ public:
     //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;
 
 private:
     void addActiveMSP( const css::uno::Reference< css::uno::XInterface >& xComponent,
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index c6481a46d660..e74b9f90de99 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -72,15 +72,13 @@ public:
     }
 
     virtual OUString
-    SAL_CALL getName()
-            throw ( RuntimeException, std::exception ) override
+    SAL_CALL getName() override
     {
         return m_Name;
     }
 
     virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
-    getChildNodes()
-        throw ( RuntimeException, std::exception ) override
+    getChildNodes() override
     {
         std::vector<  Sequence< Reference < browse::XBrowseNode > > > seqs;
         seqs.reserve( m_Nodes.size() );
@@ -119,8 +117,7 @@ public:
     }
 
     virtual sal_Bool SAL_CALL
-    hasChildNodes()
-        throw ( RuntimeException, std::exception ) override
+    hasChildNodes() override
     {
         if ( !m_Nodes.empty() )
         {
@@ -144,8 +141,7 @@ public:
         return false;
     }
 
-    virtual sal_Int16 SAL_CALL getType()
-        throw ( RuntimeException, std::exception ) override
+    virtual sal_Int16 SAL_CALL getType() override
     {
         return browse::BrowseNodeTypes::CONTAINER;
     }
@@ -194,15 +190,13 @@ public:
     // XBrowseNode
 
 
-    virtual OUString SAL_CALL getName()
-        throw ( RuntimeException, std::exception ) override
+    virtual OUString SAL_CALL getName() override
     {
         return m_sNodeName;
     }
 
     virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
-    getChildNodes()
-        throw ( RuntimeException, std::exception ) override
+    getChildNodes() override
     {
         if ( m_hBNA == nullptr )
         {
@@ -222,14 +216,12 @@ public:
         return children;
     }
 
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw ( RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return true;
     }
 
-    virtual sal_Int16 SAL_CALL getType()
-        throw ( RuntimeException, std::exception ) override
+    virtual sal_Int16 SAL_CALL getType() override
     {
         return browse::BrowseNodeTypes::CONTAINER;
     }
@@ -418,8 +410,7 @@ public:
     }
 
     virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
-                getChildNodes()
-    throw ( RuntimeException, std::exception ) override
+                getChildNodes() override
     {
         if ( hasChildNodes() )
         {
@@ -452,29 +443,25 @@ public:
         }
     }
 
-    virtual sal_Int16 SAL_CALL getType()
-        throw ( RuntimeException, std::exception ) override
+    virtual sal_Int16 SAL_CALL getType() override
     {
         return m_xWrappedBrowseNode->getType();
     }
 
     virtual OUString
-    SAL_CALL getName()
-    throw ( RuntimeException, std::exception ) override
+    SAL_CALL getName() override
     {
         return m_xWrappedBrowseNode->getName();
     }
 
     virtual sal_Bool SAL_CALL
-    hasChildNodes()
-        throw ( RuntimeException, std::exception ) override
+    hasChildNodes() override
     {
         return m_xWrappedBrowseNode->hasChildNodes();
     }
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( const Type& aType )
-        throw ( css::uno::RuntimeException, std::exception ) override
+    virtual Any SAL_CALL queryInterface( const Type& aType ) override
     {
         Any aRet = t_BrowseNodeBase::queryInterface( aType );
         if ( aRet.hasValue() )
@@ -493,13 +480,11 @@ public:
 
     // XTypeProvider (implemnented by base, but needs to be overridden for
     //                delegating to aggregate)
-    virtual Sequence< Type > SAL_CALL getTypes()
-        throw ( css::uno::RuntimeException, std::exception ) override
+    virtual Sequence< Type > SAL_CALL getTypes() override
     {
         return m_xWrappedTypeProv->getTypes();
     }
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -527,8 +512,7 @@ public:
     }
 
     virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
-                getChildNodes()
-    throw ( RuntimeException, std::exception ) override
+                getChildNodes() override
     {
         // no need to sort user, share, doc1...docN
         //::std::sort( m_vNodes.begin(), m_vNodes.end(), alphaSortForBNodes() );
@@ -541,22 +525,19 @@ public:
         return children;
     }
 
-    virtual sal_Int16 SAL_CALL getType()
-        throw ( RuntimeException, std::exception ) override
+    virtual sal_Int16 SAL_CALL getType() override
     {
         return browse::BrowseNodeTypes::ROOT;
     }
 
     virtual OUString
-    SAL_CALL getName()
-    throw ( RuntimeException, std::exception ) override
+    SAL_CALL getName() override
     {
         return m_Name;
     }
 
     virtual sal_Bool SAL_CALL
-    hasChildNodes()
-        throw ( RuntimeException, std::exception ) override
+    hasChildNodes() override
     {
         bool result = true;
         if ( m_vNodes.empty() )
@@ -580,15 +561,13 @@ public:
     {
     }
 
-    virtual OUString SAL_CALL getName()
-        throw ( RuntimeException, std::exception ) override
+    virtual OUString SAL_CALL getName() override
     {
         return OUString("Root");
     }
 
     virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
-    getChildNodes()
-        throw ( RuntimeException, std::exception ) override
+    getChildNodes() override
     {
 
         std::vector< Reference < browse::XBrowseNode > > locnBNs = getAllBrowseNodes( m_xComponentContext );
@@ -604,14 +583,12 @@ public:
         return children;
     }
 
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw ( RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return true; // will always be user and share
     }
 
-    virtual sal_Int16 SAL_CALL getType()
-        throw ( RuntimeException, std::exception ) override
+    virtual sal_Int16 SAL_CALL getType() override
     {
         return browse::BrowseNodeTypes::CONTAINER;
     }
@@ -637,7 +614,6 @@ BrowseNodeFactoryImpl::~BrowseNodeFactoryImpl()
  */
 Reference< browse::XBrowseNode > SAL_CALL
 BrowseNodeFactoryImpl::createView( sal_Int16 viewType )
-    throw (RuntimeException, std::exception)
 {
     switch( viewType )
     {
@@ -652,7 +628,6 @@ BrowseNodeFactoryImpl::createView( sal_Int16 viewType )
 
 Reference< browse::XBrowseNode >
 BrowseNodeFactoryImpl::getOrganizerHierarchy()
-    throw (RuntimeException)
 {
     Reference< browse::XBrowseNode > xRet = new  DefaultRootBrowseNode( m_xComponentContext );
     return xRet;
@@ -693,20 +668,17 @@ bnf_create( Reference< XComponentContext > const & xComponentContext )
 
 OUString SAL_CALL
 BrowseNodeFactoryImpl::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return bnf_getImplementationName();
 }
 
 Sequence< OUString > SAL_CALL
 BrowseNodeFactoryImpl::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return bnf_getSupportedServiceNames();
 }
 
 sal_Bool BrowseNodeFactoryImpl::supportsService(OUString const & serviceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index db5f4a8ef233..45d0832f807c 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -51,26 +51,21 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
 
     // 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;
+        supportsService( OUString const & serviceName ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
     // XBrowseNodeFactory
     virtual css::uno::Reference< css::script::browse::XBrowseNode > SAL_CALL
-        createView( sal_Int16 viewType )
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        createView( sal_Int16 viewType ) override;
 private:
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::script::browse::XBrowseNode >
-        getOrganizerHierarchy()
-            throw ( css::uno::RuntimeException );
+        getOrganizerHierarchy();
 };
 
 
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index c18d278bfc1e..9eaca17f0bc9 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -72,7 +72,7 @@ bool endsWith( const OUString& target,
 // XScriptProvider implementation
 
 
-MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext > & xContext ) throw ( RuntimeException ):
+MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext > & xContext ):
         m_xContext( xContext ), m_bIsValid( false ), m_bInitialised( false ),
         m_bIsPkgMSP( false ), m_pPCache( nullptr )
 {
@@ -94,7 +94,6 @@ MasterScriptProvider::~MasterScriptProvider()
 
 
 void SAL_CALL MasterScriptProvider::initialize( const Sequence < Any >& args )
-throw ( Exception, RuntimeException, std::exception )
 {
     if ( m_bInitialised )
         return;
@@ -229,8 +228,6 @@ void MasterScriptProvider::createPkgProvider()
 
 Reference< provider::XScript >
 MasterScriptProvider::getScript( const OUString& scriptURI )
-throw ( provider::ScriptFrameworkErrorException,
-        RuntimeException, std::exception )
 {
     if ( !m_bIsValid )
     {
@@ -384,7 +381,6 @@ MasterScriptProvider::providerCache()
 
 OUString SAL_CALL
 MasterScriptProvider::getName()
-        throw ( css::uno::RuntimeException, std::exception )
 {
     if ( !m_bIsPkgMSP )
     {
@@ -414,7 +410,6 @@ MasterScriptProvider::getName()
 
 Sequence< Reference< browse::XBrowseNode > > SAL_CALL
 MasterScriptProvider::getChildNodes()
-        throw ( css::uno::RuntimeException, std::exception )
 {
     if ( !providerCache() )
         throw RuntimeException( "MasterScriptProvider::getAllProviders, cache not initialised" );
@@ -445,7 +440,6 @@ MasterScriptProvider::getChildNodes()
 
 sal_Bool SAL_CALL
 MasterScriptProvider::hasChildNodes()
-        throw ( css::uno::RuntimeException, std::exception )
 {
     return true;
 }
@@ -453,7 +447,6 @@ MasterScriptProvider::hasChildNodes()
 
 sal_Int16 SAL_CALL
 MasterScriptProvider::getType()
-        throw ( css::uno::RuntimeException, std::exception )
 {
     return browse::BrowseNodeTypes::CONTAINER;
 }
@@ -474,7 +467,7 @@ MasterScriptProvider::parseLocationName( const OUString& location )
 
 // Register Package
 void SAL_CALL
-MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement )
 {
     if ( !m_bIsPkgMSP )
     {
@@ -553,7 +546,7 @@ MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement )
 
 // Revoke Package
 void SAL_CALL
-MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception)
+MasterScriptProvider::removeByName( const OUString& Name )
 {
     if ( !m_bIsPkgMSP )
     {
@@ -624,7 +617,7 @@ MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::No
 
 
 void SAL_CALL
-MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception)
+MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement )
 {
     (void)aName;
     (void)aElement;
@@ -637,7 +630,7 @@ MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement
 }
 
 Any SAL_CALL
-MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception)
+MasterScriptProvider::getByName( const OUString& aName )
 {
     (void)aName;
 
@@ -651,7 +644,7 @@ MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSu
 }
 
 sal_Bool SAL_CALL
-MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException, std::exception)
+MasterScriptProvider::hasByName( const OUString& aName )
 {
     bool result = false;
     if ( !m_bIsPkgMSP )
@@ -721,7 +714,7 @@ MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException
 
 
 Sequence< OUString > SAL_CALL
-MasterScriptProvider::getElementNames(  ) throw ( RuntimeException, std::exception)
+MasterScriptProvider::getElementNames(  )
 {
     // TODO needs implementing
     Sequence< OUString >  names;
@@ -733,14 +726,14 @@ MasterScriptProvider::getElementNames(  ) throw ( RuntimeException, std::excepti
 }
 
 Type SAL_CALL
-MasterScriptProvider::getElementType(  ) throw ( RuntimeException, std::exception)
+MasterScriptProvider::getElementType(  )
 {
     // TODO needs implementing
     Type t;
     return t;
 }
 
-sal_Bool SAL_CALL MasterScriptProvider::hasElements(  ) throw ( RuntimeException, std::exception)
+sal_Bool SAL_CALL MasterScriptProvider::hasElements(  )
 {
     // TODO needs implementing
     if ( true )
@@ -752,20 +745,17 @@ sal_Bool SAL_CALL MasterScriptProvider::hasElements(  ) throw ( RuntimeException
 
 
 OUString SAL_CALL MasterScriptProvider::getImplementationName( )
-throw( RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.script.provider.MasterScriptProvider"  );
 }
 
 sal_Bool SAL_CALL MasterScriptProvider::supportsService( const OUString& serviceName )
-throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, serviceName);
 }
 
 
 Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( )
-throw( RuntimeException, std::exception )
 {
     OUString names[3];
 
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 47ba9689ac8d..a77642587dd9 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -52,46 +52,37 @@ public:
     /// @throws css::uno::RuntimeException
     explicit MasterScriptProvider(
         const css::uno::Reference< css::uno::XComponentContext >
-        & xContext ) throw( css::uno::RuntimeException );
+        & xContext );
     virtual ~MasterScriptProvider() override;
 
     // XServiceInfo implementation
-    virtual OUString SAL_CALL getImplementationName( )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName( ) override;
 
     // XBrowseNode implementation
-    virtual OUString SAL_CALL getName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int16 SAL_CALL getType()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes() override;
+    virtual sal_Bool SAL_CALL hasChildNodes() override;
+    virtual sal_Int16 SAL_CALL getType() override;
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw ( css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
 
     // XScriptProvider implementation
     virtual css::uno::Reference < css::script::provider::XScript > SAL_CALL
-        getScript( const OUString& scriptURI )
-        throw( css::script::provider::ScriptFrameworkErrorException,
-               css::uno::RuntimeException, std::exception ) override;
+        getScript( const OUString& scriptURI ) override;
 
     /**
      *  XInitialise implementation
@@ -99,8 +90,7 @@ public:
      * @param args expected to contain a single OUString
      * containing the URI
      */
-    virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args ) override;
 
     // returns context string for this provider, eg
     const OUString& getContextString() { return m_sCtxString; }
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index d2d4493c0d35..a805015d0c3e 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -44,7 +44,7 @@ MasterScriptProviderFactory::~MasterScriptProviderFactory()
 }
 
 Reference< provider::XScriptProvider > SAL_CALL
-MasterScriptProviderFactory::createScriptProvider( const Any& context ) throw ( lang::IllegalArgumentException, RuntimeException, std::exception)
+MasterScriptProviderFactory::createScriptProvider( const Any& context )
 {
     Reference< provider::XScriptProvider > xMsp( getActiveMSPList() ->getMSPFromAnyContext( context ), UNO_QUERY_THROW );
     return xMsp;
@@ -84,20 +84,17 @@ mspf_create( Reference< XComponentContext > const & xComponentContext )
 }
 
 OUString SAL_CALL MasterScriptProviderFactory::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return mspf_getImplementationName();
 }
 
 Sequence< OUString > SAL_CALL MasterScriptProviderFactory::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return mspf_getSupportedServiceNames();
 }
 
 sal_Bool MasterScriptProviderFactory::supportsService(
     OUString const & serviceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index 7a5245a30268..833e079e7f96 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -58,21 +58,17 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
 
     // 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;
+        supportsService( OUString const & serviceName ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
     // XScriptProviderFactory
     virtual css::uno::Reference< css::script::provider::XScriptProvider >
-        SAL_CALL createScriptProvider( const css::uno::Any& context )
-            throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        SAL_CALL createScriptProvider( const css::uno::Any& context ) override;
 };
 
 
diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index 57a2f924fbbe..65b4fa4f5f02 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -31,8 +31,7 @@ using namespace com::sun::star::script;
 namespace func_provider
 {
 
-ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext )
-    throw ( RuntimeException ) : m_Sctx( scriptContext ), m_xContext( xContext )
+ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext ) : m_Sctx( scriptContext ), m_xContext( xContext )
 {
     // initialise m_hProviderDetailsCache with details of ScriptProviders
     // will use createContentEnumeration
@@ -43,8 +42,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co
 }
 
 
-ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList )
-    throw ( RuntimeException ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext )
+ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext )
 
 {
     // initialise m_hProviderDetailsCache with details of ScriptProviders
@@ -81,7 +79,7 @@ ProviderCache::getProvider( const OUString& providerName )
 }
 
 Sequence < Reference< provider::XScriptProvider > >
-ProviderCache::getAllProviders() throw ( RuntimeException )
+ProviderCache::getAllProviders()
 {
     // need to create providers that haven't been created already
     // so check what providers exist and what ones don't
@@ -131,7 +129,7 @@ ProviderCache::getAllProviders() throw ( RuntimeException )
 }
 
 void
-ProviderCache::populateCache() throw ( RuntimeException )
+ProviderCache::populateCache()
 {
     // wrong name in services.rdb
     OUString serviceName;
@@ -179,7 +177,7 @@ ProviderCache::populateCache() throw ( RuntimeException )
 }
 
 Reference< provider::XScriptProvider >
-ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeException )
+ProviderCache::createProvider( ProviderDetails& details )
 {
     try
     {
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 967f50cef269..7aacf487fb54 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -53,26 +53,23 @@ class ProviderCache
 
 public:
      /// @throws css::uno::RuntimeException
-     ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext )
-        throw ( css::uno::RuntimeException );
+     ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext );
      /// @throws css::uno::RuntimeException
      ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext,
-        const css::uno::Sequence< OUString >& blackList )
-        throw ( css::uno::RuntimeException );
+        const css::uno::Sequence< OUString >& blackList );
     ~ProviderCache();
      css::uno::Reference< css::script::provider::XScriptProvider >
          getProvider( const OUString& providerName );
      /// @throws css::uno::RuntimeException
      css::uno::Sequence < css::uno::Reference< css::script::provider::XScriptProvider > >
-         getAllProviders() throw ( css::uno::RuntimeException );
+         getAllProviders();
 private:
     /// @throws css::uno::RuntimeException
-    void populateCache()
-        throw ( css::uno::RuntimeException );
+    void populateCache();
 
     /// @throws css::uno::RuntimeException
    css::uno::Reference< css::script::provider::XScriptProvider >
-        createProvider( ProviderDetails& details ) throw ( css::uno::RuntimeException );
+        createProvider( ProviderDetails& details );
     bool isInBlackList( const OUString& serviceName )
     {
         if ( m_sBlackList.getLength() > 0 )
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index f205e6cb3582..233f0021ecab 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -47,7 +47,6 @@ static const char USER_URI[] =
 
 ScriptingFrameworkURIHelper::ScriptingFrameworkURIHelper(
     const uno::Reference< uno::XComponentContext >& xContext)
-        throw( uno::RuntimeException )
 {
     try
     {
@@ -76,7 +75,6 @@ ScriptingFrameworkURIHelper::~ScriptingFrameworkURIHelper()
 void SAL_CALL
 ScriptingFrameworkURIHelper::initialize(
     const uno::Sequence < uno::Any >& args )
-throw ( uno::Exception, uno::RuntimeException, std::exception )
 {
     if ( args.getLength() != 2 ||
          args[0].getValueType() != ::cppu::UnoType<OUString>::get() ||
@@ -194,7 +192,6 @@ ScriptingFrameworkURIHelper::getLanguagePath(const OUString& rLanguagePart)
 
 OUString SAL_CALL
 ScriptingFrameworkURIHelper::getScriptURI(const OUString& rStorageURI)
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     OUStringBuffer buf(120);
 
@@ -210,7 +207,6 @@ ScriptingFrameworkURIHelper::getScriptURI(const OUString& rStorageURI)
 
 OUString SAL_CALL
 ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI)
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     OUString sLanguagePart;
     try
@@ -238,14 +234,12 @@ ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI)
 
 OUString SAL_CALL
 ScriptingFrameworkURIHelper::getRootStorageURI()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_sBaseURI;
 }
 
 OUString SAL_CALL
 ScriptingFrameworkURIHelper::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString(
         "com.sun.star.script.provider.ScriptURIHelper" );
@@ -253,14 +247,12 @@ ScriptingFrameworkURIHelper::getImplementationName()
 
 sal_Bool SAL_CALL
 ScriptingFrameworkURIHelper::supportsService( const OUString& serviceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, serviceName );
 }
 
 uno::Sequence< OUString > SAL_CALL
 ScriptingFrameworkURIHelper::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     OUString serviceNameList[] = {
         OUString(
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index 5cd5a3c7e47d..b1d26b572cd8 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -58,40 +58,30 @@ private:
 public:
     /// @throws css::uno::RuntimeException
     explicit ScriptingFrameworkURIHelper(
-        const css::uno::Reference< css::uno::XComponentContext >& xContext )
-            throw( css::uno::RuntimeException );
+        const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     virtual ~ScriptingFrameworkURIHelper() override;
 
     virtual void SAL_CALL
-        initialize( const css::uno::Sequence < css::uno::Any > & args )
-            throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        initialize( const css::uno::Sequence < css::uno::Any > & args ) override;
 
     virtual OUString SAL_CALL
-        getRootStorageURI()
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        getRootStorageURI() override;
 
     virtual OUString SAL_CALL
-        getScriptURI( const OUString& rStorageURI )
-            throw( css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getScriptURI( const OUString& rStorageURI ) override;
 
     virtual OUString SAL_CALL
-        getStorageURI( const OUString& rScriptURI )
-            throw( css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getStorageURI( const OUString& rScriptURI ) override;
 
     virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
 
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 };
 
 } // namespace func_provider
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 49f7f823d451..190fabdde719 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -124,17 +124,17 @@ StringResourceImpl::~StringResourceImpl()
 
 // XServiceInfo
 
-OUString StringResourceImpl::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString StringResourceImpl::getImplementationName(  )
 {
     return getImplementationName_StringResourceImpl();
 }
 
-sal_Bool StringResourceImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool StringResourceImpl::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > StringResourceImpl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > StringResourceImpl::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_StringResourceImpl();
 }
@@ -143,7 +143,6 @@ Sequence< OUString > StringResourceImpl::getSupportedServiceNames(  ) throw (Run
 // XModifyBroadcaster
 
 void StringResourceImpl::addModifyListener( const Reference< XModifyListener >& aListener )
-    throw (RuntimeException, std::exception)
 {
     if( !aListener.is() )
         throw RuntimeException();
@@ -153,7 +152,6 @@ void StringResourceImpl::addModifyListener( const Reference< XModifyListener >&
 }
 
 void StringResourceImpl::removeModifyListener( const Reference< XModifyListener >& aListener )
-    throw (RuntimeException, std::exception)
 {
     if( !aListener.is() )
         throw RuntimeException();
@@ -167,7 +165,6 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener
 
 OUString StringResourceImpl::implResolveString
     ( const OUString& ResourceID, LocaleItem* pLocaleItem )
-        throw (css::resource::MissingResourceException)
 {
     OUString aRetStr;
     bool bSuccess = false;
@@ -190,14 +187,12 @@ OUString StringResourceImpl::implResolveString
 }
 
 OUString StringResourceImpl::resolveString( const OUString& ResourceID )
-    throw (css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return implResolveString( ResourceID, m_pCurrentLocaleItem );
 }
 
 OUString StringResourceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale )
-    throw ( css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     LocaleItem* pLocaleItem = getItemForLocale( locale, false );
@@ -217,7 +212,6 @@ bool StringResourceImpl::implHasEntryForId( const OUString& ResourceID, LocaleIt
 }
 
 sal_Bool StringResourceImpl::hasEntryForId( const OUString& ResourceID )
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return implHasEntryForId( ResourceID, m_pCurrentLocaleItem );
@@ -225,7 +219,6 @@ sal_Bool StringResourceImpl::hasEntryForId( const OUString& ResourceID )
 
 sal_Bool StringResourceImpl::hasEntryForIdAndLocale( const OUString& ResourceID,
     const Locale& locale )
-        throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     LocaleItem* pLocaleItem = getItemForLocale( locale, false );
@@ -255,7 +248,7 @@ Sequence< OUString > StringResourceImpl::implGetResourceIDs( LocaleItem* pLocale
 }
 
 Sequence< OUString > StringResourceImpl::getResourceIDsForLocale
-    ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception)
+    ( const Locale& locale )
 {
     ::osl::MutexGuard aGuard( getMutex() );
     LocaleItem* pLocaleItem = getItemForLocale( locale, false );
@@ -263,14 +256,12 @@ Sequence< OUString > StringResourceImpl::getResourceIDsForLocale
 }
 
 Sequence< OUString > StringResourceImpl::getResourceIDs(  )
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return implGetResourceIDs( m_pCurrentLocaleItem );
 }
 
 Locale StringResourceImpl::getCurrentLocale()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -281,7 +272,6 @@ Locale StringResourceImpl::getCurrentLocale()
 }
 
 Locale StringResourceImpl::getDefaultLocale(  )
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -292,7 +282,6 @@ Locale StringResourceImpl::getDefaultLocale(  )
 }
 
 Sequence< Locale > StringResourceImpl::getLocales(  )
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -313,7 +302,6 @@ Sequence< Locale > StringResourceImpl::getLocales(  )
 // XStringResourceManager
 
 void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg )
-    throw (NoSupportException)
 {
     if( m_bReadOnly )
     {
@@ -323,14 +311,12 @@ void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg )
 }
 
 sal_Bool StringResourceImpl::isReadOnly()
-    throw (RuntimeException, std::exception)
 {
     return m_bReadOnly;
 }
 
 void StringResourceImpl::implSetCurrentLocale( const Locale& locale,
     bool FindClosestMatch, bool bUseDefaultIfNoMatch )
-        throw (IllegalArgumentException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -354,14 +340,12 @@ void StringResourceImpl::implSetCurrentLocale( const Locale& locale,
 }
 
 void StringResourceImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     bool bUseDefaultIfNoMatch = false;
     implSetCurrentLocale( locale, FindClosestMatch, bUseDefaultIfNoMatch );
 }
 
 void StringResourceImpl::setDefaultLocale( const Locale& locale )
-    throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceImpl::setDefaultLocale(): Read only" );
@@ -403,7 +387,6 @@ void StringResourceImpl::implSetString( const OUString& ResourceID,
 }
 
 void StringResourceImpl::setString( const OUString& ResourceID, const OUString& Str )
-    throw (NoSupportException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceImpl::setString(): Read only" );
@@ -412,7 +395,6 @@ void StringResourceImpl::setString( const OUString& ResourceID, const OUString&
 
 void StringResourceImpl::setStringForLocale
     ( const OUString& ResourceID, const OUString& Str, const Locale& locale )
-        throw (NoSupportException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceImpl::setStringForLocale(): Read only" );
@@ -421,7 +403,6 @@ void StringResourceImpl::setStringForLocale
 }
 
 void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem )
-    throw (css::resource::MissingResourceException)
 {
     if( pLocaleItem != nullptr && loadLocale( pLocaleItem ) )
     {
@@ -440,7 +421,6 @@ void StringResourceImpl::implRemoveId( const OUString& ResourceID, LocaleItem* p
 }
 
 void StringResourceImpl::removeId( const OUString& ResourceID )
-    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceImpl::removeId(): Read only" );
@@ -448,7 +428,6 @@ void StringResourceImpl::removeId( const OUString& ResourceID )
 }
 
 void StringResourceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale )
-    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceImpl::removeIdForLocale(): Read only" );
@@ -457,7 +436,6 @@ void StringResourceImpl::removeIdForLocale( const OUString& ResourceID, const Lo
 }
 
 void StringResourceImpl::newLocale( const Locale& locale )
-    throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceImpl::newLocale(): Read only" );
@@ -520,7 +498,6 @@ void StringResourceImpl::newLocale( const Locale& locale )
 }
 
 void StringResourceImpl::removeLocale( const Locale& locale )
-    throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceImpl::removeLocale(): Read only" );
@@ -609,7 +586,6 @@ void StringResourceImpl::implScanIdForNumber( const OUString& ResourceID )
 }
 
 sal_Int32 StringResourceImpl::getUniqueNumericId(  )
-    throw (RuntimeException, NoSupportException, std::exception)
 {
     if( m_nNextUniqueNumericId == UNIQUE_NUMBER_NEEDS_INITIALISATION )
     {
@@ -630,7 +606,6 @@ sal_Int32 StringResourceImpl::getUniqueNumericId(  )
 
 LocaleItem* StringResourceImpl::getItemForLocale
     ( const Locale& locale, bool bException )
-        throw (css::lang::IllegalArgumentException)
 {
     LocaleItem* pRetItem = nullptr;
 
@@ -740,21 +715,18 @@ StringResourcePersistenceImpl::~StringResourcePersistenceImpl()
 
 
 OUString StringResourcePersistenceImpl::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.scripting.StringResource");
 }
 
 
 sal_Bool StringResourcePersistenceImpl::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 
 Sequence< OUString > StringResourcePersistenceImpl::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getSupportedServiceNames();
 }
@@ -767,7 +739,6 @@ static const char aNameBaseDefaultStr[] = "strings";
 
 void StringResourcePersistenceImpl::implInitializeCommonParameters
     ( const Sequence< Any >& aArguments )
-        throw (Exception, RuntimeException)
 {
     bool bReadOnlyOk = (aArguments[1] >>= m_bReadOnly);
     if( !bReadOnlyOk )
@@ -812,113 +783,93 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters
 
 // XModifyBroadcaster
 void StringResourcePersistenceImpl::addModifyListener( const Reference< XModifyListener >& aListener )
-    throw (RuntimeException, std::exception)
 {
     StringResourceImpl::addModifyListener( aListener );
 }
 void StringResourcePersistenceImpl::removeModifyListener( const Reference< XModifyListener >& aListener )
-    throw (RuntimeException, std::exception)
 {
     StringResourceImpl::removeModifyListener( aListener );
 }
 
 // XStringResourceResolver
 OUString StringResourcePersistenceImpl::resolveString( const OUString& ResourceID )
-    throw (css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveString( ResourceID ) ;
 }
 OUString StringResourcePersistenceImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale )
-    throw ( css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveStringForLocale( ResourceID, locale );
 }
 sal_Bool StringResourcePersistenceImpl::hasEntryForId( const OUString& ResourceID )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::hasEntryForId( ResourceID ) ;
 }
 sal_Bool StringResourcePersistenceImpl::hasEntryForIdAndLocale( const OUString& ResourceID,
     const Locale& locale )
-        throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale );
 }
 Locale StringResourcePersistenceImpl::getCurrentLocale()
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getCurrentLocale();
 }
 Locale StringResourcePersistenceImpl::getDefaultLocale(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getDefaultLocale();
 }
 Sequence< Locale > StringResourcePersistenceImpl::getLocales(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getLocales();
 }
 
 // XStringResourceManager
 sal_Bool StringResourcePersistenceImpl::isReadOnly()
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::isReadOnly();
 }
 void StringResourcePersistenceImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     StringResourceImpl::setCurrentLocale( locale, FindClosestMatch );
 }
 void StringResourcePersistenceImpl::setDefaultLocale( const Locale& locale )
-    throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception)
 {
     StringResourceImpl::setDefaultLocale( locale );
 }
 Sequence< OUString > StringResourcePersistenceImpl::getResourceIDs(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getResourceIDs();
 }
 void StringResourcePersistenceImpl::setString( const OUString& ResourceID, const OUString& Str )
-    throw (NoSupportException, RuntimeException, std::exception)
 {
     StringResourceImpl::setString( ResourceID, Str );
 }
 void StringResourcePersistenceImpl::setStringForLocale
     ( const OUString& ResourceID, const OUString& Str, const Locale& locale )
-        throw (NoSupportException, RuntimeException, std::exception)
 {
     StringResourceImpl::setStringForLocale( ResourceID, Str, locale );
 }
 Sequence< OUString > StringResourcePersistenceImpl::getResourceIDsForLocale
-    ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception)
+    ( const Locale& locale )
 {
     return StringResourceImpl::getResourceIDsForLocale( locale );
 }
 void StringResourcePersistenceImpl::removeId( const OUString& ResourceID )
-    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeId( ResourceID );
 }
 void StringResourcePersistenceImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale )
-    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeIdForLocale( ResourceID, locale );
 }
 void StringResourcePersistenceImpl::newLocale( const Locale& locale )
-    throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::newLocale( locale );
 }
 void StringResourcePersistenceImpl::removeLocale( const Locale& locale )
-    throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeLocale( locale );
 }
 sal_Int32 StringResourcePersistenceImpl::getUniqueNumericId(  )
-    throw (RuntimeException, NoSupportException, std::exception)
 {
     return StringResourceImpl::getUniqueNumericId();
 }
@@ -927,12 +878,10 @@ sal_Int32 StringResourcePersistenceImpl::getUniqueNumericId(  )
 // XStringResourcePersistence
 
 void StringResourcePersistenceImpl::store()
-    throw (NoSupportException, Exception, RuntimeException, std::exception)
 {
 }
 
 sal_Bool StringResourcePersistenceImpl::isModified(  )
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -940,14 +889,12 @@ sal_Bool StringResourcePersistenceImpl::isModified(  )
 }
 
 void StringResourcePersistenceImpl::setComment( const OUString& Comment )
-    throw (css::uno::RuntimeException, std::exception)
 {
     m_aComment = Comment;
 }
 
 void StringResourcePersistenceImpl::storeToStorage( const Reference< XStorage >& Storage,
     const OUString& NameBase, const OUString& Comment )
-        throw (Exception, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -964,7 +911,6 @@ void StringResourcePersistenceImpl::implStoreAtStorage
     bool bUsedForStore,
     bool bStoreAll
 )
-    throw (Exception, RuntimeException, std::exception)
 {
     // Delete files for deleted locales
     if( bUsedForStore )
@@ -1072,7 +1018,6 @@ void StringResourcePersistenceImpl::implStoreAtStorage
 void StringResourcePersistenceImpl::storeToURL( const OUString& URL,
     const OUString& NameBase, const OUString& Comment,
     const Reference< css::task::XInteractionHandler >& Handler )
-        throw (Exception, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -1092,7 +1037,6 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles
     const OUString& aNameBase,
     const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
 )
-    throw (Exception, RuntimeException, std::exception)
 {
     // Delete files for deleted locales
     while( m_aDeletedLocaleItemVector.size() > 0 )
@@ -1118,7 +1062,6 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles
     const OUString& aNameBase,
     const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
 )
-    throw (Exception, RuntimeException, std::exception)
 {
     // Delete files for changed defaults
     for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin();
@@ -1148,7 +1091,6 @@ void StringResourcePersistenceImpl::implStoreAtLocation
     bool bStoreAll,
     bool bKillAll
 )
-    throw (Exception, RuntimeException, std::exception)
 {
     // Delete files for deleted locales
     if( bUsedForStore || bKillAll )
@@ -1339,7 +1281,6 @@ Sequence< ::sal_Int8 > BinaryOutput::closeAndGetData()
 // pos3                         Properties file written by implWritePropertiesFile
 
 Sequence< sal_Int8 > StringResourcePersistenceImpl::exportBinary(  )
-    throw (RuntimeException, std::exception)
 {
     BinaryOutput aOut( m_xContext );
 
@@ -1546,7 +1487,6 @@ OUString BinaryInput::readString()
 }
 
 void StringResourcePersistenceImpl::importBinary( const Sequence< ::sal_Int8 >& Data )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     // Init: Remove all locales
     sal_Int32 nOldLocaleCount = 0;
@@ -2239,17 +2179,17 @@ StringResourceWithStorageImpl::~StringResourceWithStorageImpl()
 // XServiceInfo
 
 
-OUString StringResourceWithStorageImpl::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString StringResourceWithStorageImpl::getImplementationName(  )
 {
     return getImplementationName_StringResourceWithStorageImpl();
 }
 
-sal_Bool StringResourceWithStorageImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool StringResourceWithStorageImpl::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_StringResourceWithStorageImpl();
 }
@@ -2259,7 +2199,6 @@ Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames(  )
 
 
 void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -2287,120 +2226,99 @@ void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArgument
 
 // XModifyBroadcaster
 void StringResourceWithStorageImpl::addModifyListener( const Reference< XModifyListener >& aListener )
-    throw (RuntimeException, std::exception)
 {
     StringResourceImpl::addModifyListener( aListener );
 }
 void StringResourceWithStorageImpl::removeModifyListener( const Reference< XModifyListener >& aListener )
-    throw (RuntimeException, std::exception)
 {
     StringResourceImpl::removeModifyListener( aListener );
 }
 
 // XStringResourceResolver
 OUString StringResourceWithStorageImpl::resolveString( const OUString& ResourceID )
-    throw (css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveString( ResourceID ) ;
 }
 OUString StringResourceWithStorageImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale )
-    throw ( css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveStringForLocale( ResourceID, locale );
 }
 sal_Bool StringResourceWithStorageImpl::hasEntryForId( const OUString& ResourceID )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::hasEntryForId( ResourceID ) ;
 }
 sal_Bool StringResourceWithStorageImpl::hasEntryForIdAndLocale( const OUString& ResourceID,
     const Locale& locale )
-        throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale );
 }
 Sequence< OUString > StringResourceWithStorageImpl::getResourceIDs(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getResourceIDs();
 }
 Sequence< OUString > StringResourceWithStorageImpl::getResourceIDsForLocale
-    ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception)
+    ( const Locale& locale )
 {
     return StringResourceImpl::getResourceIDsForLocale( locale );
 }
 Locale StringResourceWithStorageImpl::getCurrentLocale()
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getCurrentLocale();
 }
 Locale StringResourceWithStorageImpl::getDefaultLocale(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getDefaultLocale();
 }
 Sequence< Locale > StringResourceWithStorageImpl::getLocales(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getLocales();
 }
 
 // XStringResourceManager
 sal_Bool StringResourceWithStorageImpl::isReadOnly()
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::isReadOnly();
 }
 void StringResourceWithStorageImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     StringResourceImpl::setCurrentLocale( locale, FindClosestMatch );
 }
 void StringResourceWithStorageImpl::setDefaultLocale( const Locale& locale )
-    throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception)
 {
     StringResourceImpl::setDefaultLocale( locale );
 }
 void StringResourceWithStorageImpl::setString( const OUString& ResourceID, const OUString& Str )
-    throw (NoSupportException, RuntimeException, std::exception)
 {
     StringResourceImpl::setString( ResourceID, Str );
 }
 void StringResourceWithStorageImpl::setStringForLocale
     ( const OUString& ResourceID, const OUString& Str, const Locale& locale )
-        throw (NoSupportException, RuntimeException, std::exception)
 {
     StringResourceImpl::setStringForLocale( ResourceID, Str, locale );
 }
 void StringResourceWithStorageImpl::removeId( const OUString& ResourceID )
-    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeId( ResourceID );
 }
 void StringResourceWithStorageImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale )
-    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeIdForLocale( ResourceID, locale );
 }
 void StringResourceWithStorageImpl::newLocale( const Locale& locale )
-    throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::newLocale( locale );
 }
 void StringResourceWithStorageImpl::removeLocale( const Locale& locale )
-    throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeLocale( locale );
 }
 sal_Int32 StringResourceWithStorageImpl::getUniqueNumericId(  )
-    throw (RuntimeException, NoSupportException, std::exception)
 {
     return StringResourceImpl::getUniqueNumericId();
 }
 
 // XStringResourcePersistence
 void StringResourceWithStorageImpl::store()
-    throw (NoSupportException, Exception, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceWithStorageImpl::store(): Read only" );
@@ -2416,35 +2334,29 @@ void StringResourceWithStorageImpl::store()
 }
 
 sal_Bool StringResourceWithStorageImpl::isModified(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourcePersistenceImpl::isModified();
 }
 void StringResourceWithStorageImpl::setComment( const OUString& Comment )
-    throw (css::uno::RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::setComment( Comment );
 }
 void StringResourceWithStorageImpl::storeToStorage( const Reference< XStorage >& Storage,
     const OUString& NameBase, const OUString& Comment )
-        throw (Exception, RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment );
 }
 void StringResourceWithStorageImpl::storeToURL( const OUString& URL,
     const OUString& NameBase, const OUString& Comment,
     const Reference< css::task::XInteractionHandler >& Handler )
-        throw (Exception, RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::storeToURL( URL, NameBase, Comment, Handler );
 }
 Sequence< ::sal_Int8 > StringResourceWithStorageImpl::exportBinary(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourcePersistenceImpl::exportBinary();
 }
 void StringResourceWithStorageImpl::importBinary( const Sequence< ::sal_Int8 >& Data )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::importBinary( Data );
 }
@@ -2453,14 +2365,12 @@ void StringResourceWithStorageImpl::importBinary( const Sequence< ::sal_Int8 >&
 // XStringResourceWithStorage
 
 void StringResourceWithStorageImpl::storeAsStorage( const Reference< XStorage >& Storage )
-    throw (Exception, RuntimeException, std::exception)
 {
     setStorage( Storage );
     store();
 }
 
 void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Storage )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -2559,17 +2469,17 @@ StringResourceWithLocationImpl::~StringResourceWithLocationImpl()
 // XServiceInfo
 
 
-OUString StringResourceWithLocationImpl::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString StringResourceWithLocationImpl::getImplementationName(  )
 {
     return getImplementationName_StringResourceWithLocationImpl();
 }
 
-sal_Bool StringResourceWithLocationImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool StringResourceWithLocationImpl::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames(  )
 {
     return getSupportedServiceNames_StringResourceWithLocationImpl();
 }
@@ -2579,7 +2489,6 @@ Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames(
 
 
 void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
@@ -2623,120 +2532,99 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen
 
 // XModifyBroadcaster
 void StringResourceWithLocationImpl::addModifyListener( const Reference< XModifyListener >& aListener )
-    throw (RuntimeException, std::exception)
 {
     StringResourceImpl::addModifyListener( aListener );
 }
 void StringResourceWithLocationImpl::removeModifyListener( const Reference< XModifyListener >& aListener )
-    throw (RuntimeException, std::exception)
 {
     StringResourceImpl::removeModifyListener( aListener );
 }
 
 // XStringResourceResolver
 OUString StringResourceWithLocationImpl::resolveString( const OUString& ResourceID )
-    throw (css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveString( ResourceID ) ;
 }
 OUString StringResourceWithLocationImpl::resolveStringForLocale( const OUString& ResourceID, const Locale& locale )
-    throw ( css::resource::MissingResourceException, RuntimeException, std::exception)
 {
     return StringResourceImpl::resolveStringForLocale( ResourceID, locale );
 }
 sal_Bool StringResourceWithLocationImpl::hasEntryForId( const OUString& ResourceID )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::hasEntryForId( ResourceID ) ;
 }
 sal_Bool StringResourceWithLocationImpl::hasEntryForIdAndLocale( const OUString& ResourceID,
     const Locale& locale )
-        throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::hasEntryForIdAndLocale( ResourceID, locale );
 }
 Sequence< OUString > StringResourceWithLocationImpl::getResourceIDs(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getResourceIDs();
 }
 Sequence< OUString > StringResourceWithLocationImpl::getResourceIDsForLocale
-    ( const Locale& locale ) throw (css::uno::RuntimeException, std::exception)
+    ( const Locale& locale )
 {
     return StringResourceImpl::getResourceIDsForLocale( locale );
 }
 Locale StringResourceWithLocationImpl::getCurrentLocale()
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getCurrentLocale();
 }
 Locale StringResourceWithLocationImpl::getDefaultLocale(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getDefaultLocale();
 }
 Sequence< Locale > StringResourceWithLocationImpl::getLocales(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::getLocales();
 }
 
 // XStringResourceManager
 sal_Bool StringResourceWithLocationImpl::isReadOnly()
-    throw (RuntimeException, std::exception)
 {
     return StringResourceImpl::isReadOnly();
 }
 void StringResourceWithLocationImpl::setCurrentLocale( const Locale& locale, sal_Bool FindClosestMatch )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     StringResourceImpl::setCurrentLocale( locale, FindClosestMatch );
 }
 void StringResourceWithLocationImpl::setDefaultLocale( const Locale& locale )
-    throw (IllegalArgumentException, RuntimeException,NoSupportException, std::exception)
 {
     StringResourceImpl::setDefaultLocale( locale );
 }
 void StringResourceWithLocationImpl::setString( const OUString& ResourceID, const OUString& Str )
-    throw (NoSupportException, RuntimeException, std::exception)
 {
     StringResourceImpl::setString( ResourceID, Str );
 }
 void StringResourceWithLocationImpl::setStringForLocale
     ( const OUString& ResourceID, const OUString& Str, const Locale& locale )
-        throw (NoSupportException, RuntimeException, std::exception)
 {
     StringResourceImpl::setStringForLocale( ResourceID, Str, locale );
 }
 void StringResourceWithLocationImpl::removeId( const OUString& ResourceID )
-    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeId( ResourceID );
 }
 void StringResourceWithLocationImpl::removeIdForLocale( const OUString& ResourceID, const Locale& locale )
-    throw (css::resource::MissingResourceException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeIdForLocale( ResourceID, locale );
 }
 void StringResourceWithLocationImpl::newLocale( const Locale& locale )
-    throw (ElementExistException, IllegalArgumentException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::newLocale( locale );
 }
 void StringResourceWithLocationImpl::removeLocale( const Locale& locale )
-    throw (IllegalArgumentException, RuntimeException, NoSupportException, std::exception)
 {
     StringResourceImpl::removeLocale( locale );
 }
 sal_Int32 StringResourceWithLocationImpl::getUniqueNumericId(  )
-    throw (RuntimeException, NoSupportException, std::exception)
 {
     return StringResourceImpl::getUniqueNumericId();
 }
 
 // XStringResourcePersistence
 void StringResourceWithLocationImpl::store()
-    throw (NoSupportException, Exception, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceWithLocationImpl::store(): Read only" );
@@ -2754,35 +2642,29 @@ void StringResourceWithLocationImpl::store()
 }
 
 sal_Bool StringResourceWithLocationImpl::isModified(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourcePersistenceImpl::isModified();
 }
 void StringResourceWithLocationImpl::setComment( const OUString& Comment )
-    throw (css::uno::RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::setComment( Comment );
 }
 void StringResourceWithLocationImpl::storeToStorage( const Reference< XStorage >& Storage,
     const OUString& NameBase, const OUString& Comment )
-        throw (Exception, RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::storeToStorage( Storage, NameBase, Comment );
 }
 void StringResourceWithLocationImpl::storeToURL( const OUString& URL,
     const OUString& NameBase, const OUString& Comment,
     const Reference< css::task::XInteractionHandler >& Handler )
-        throw (Exception, RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::storeToURL( URL, NameBase, Comment, Handler );
 }
 Sequence< ::sal_Int8 > StringResourceWithLocationImpl::exportBinary(  )
-    throw (RuntimeException, std::exception)
 {
     return StringResourcePersistenceImpl::exportBinary();
 }
 void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >& Data )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     StringResourcePersistenceImpl::importBinary( Data );
 }
@@ -2792,16 +2674,12 @@ void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >&
 
 // XStringResourceWithLocation
 void StringResourceWithLocationImpl::storeAsURL( const OUString& URL )
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     setURL( URL );
     store();
 }
 
 void StringResourceWithLocationImpl::setURL( const OUString& URL )
-    throw (css::lang::IllegalArgumentException,
-           css::lang::NoSupportException,
-           css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     implCheckReadOnly( "StringResourceWithLocationImpl::setURL(): Read only" );
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index b67403937217..c4754b02864a 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -118,14 +118,12 @@ protected:
 
     // Checks read only status and throws exception if it's true
     /// @throws css::lang::NoSupportException
-    void implCheckReadOnly( const sal_Char* pExceptionMsg )
-        throw (css::lang::NoSupportException);
+    void implCheckReadOnly( const sal_Char* pExceptionMsg );
 
     // Returns the LocalItem for a given locale, if it exists, otherwise NULL
     // This method compares the locales exactly, no closest match search is performed
     /// @throws css::lang::IllegalArgumentException
-    LocaleItem* getItemForLocale( const css::lang::Locale& locale, bool bException )
-        throw (css::lang::IllegalArgumentException);
+    LocaleItem* getItemForLocale( const css::lang::Locale& locale, bool bException );
 
     // Returns the LocalItem for a given locale, if it exists, otherwise NULL
     // This method performs a closest match search, at least the language must match
@@ -133,23 +131,20 @@ protected:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     void implSetCurrentLocale( const css::lang::Locale& locale,
-        bool FindClosestMatch, bool bUseDefaultIfNoMatch )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+        bool FindClosestMatch, bool bUseDefaultIfNoMatch );
 
     void implModified();
     void implNotifyListeners();
 
     //=== Impl methods for ...ForLocale methods ===
     /// @throws css::resource::MissingResourceException
-    OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem )
-        throw (css::resource::MissingResourceException);
+    OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem );
     bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem );
     css::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem );
     void implSetString( const OUString& ResourceID,
         const OUString& Str, LocaleItem* pLocaleItem );
     /// @throws css::resource::MissingResourceException
-    void implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem )
-        throw (css::resource::MissingResourceException);
+    void implRemoveId( const OUString& ResourceID, LocaleItem* pLocaleItem );
 
     // Method to load a locale if necessary, returns true if loading was
     // successful. Default implementation in base class just returns true.
@@ -163,72 +158,41 @@ public:
     virtual ~StringResourceImpl() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
      // XStringResourceResolver
-    virtual OUString SAL_CALL resolveString( const OUString& ResourceID )
-        throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override;
     virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw ( css::resource::MissingResourceException,
-                    css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override;
     virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
-        ( const css::lang::Locale& locale )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getCurrentLocale(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getDefaultLocale(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ( const css::lang::Locale& locale ) override;
+    virtual css::lang::Locale SAL_CALL getCurrentLocale(  ) override;
+    virtual css::lang::Locale SAL_CALL getDefaultLocale(  ) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  ) override;
 
     // XStringResourceManager
-    virtual sal_Bool SAL_CALL isReadOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str )
-        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
+    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override;
+    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override;
     virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str,
-        const css::lang::Locale& locale )
-            throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeId( const OUString& ResourceID )
-        throw (css::resource::MissingResourceException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL removeId( const OUString& ResourceID ) override;
     virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw (css::resource::MissingResourceException, css::uno::RuntimeException,
-                   css::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL newLocale( const css::lang::Locale& locale )
-        throw (css::container::ElementExistException, css::lang::IllegalArgumentException,
-               css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  )
-        throw (css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override;
+    virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  ) override;
  };
 
 typedef ::cppu::ImplInheritanceHelper<
@@ -245,8 +209,7 @@ protected:
 
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
-    void SAL_CALL implInitializeCommonParameters( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException);
+    void SAL_CALL implInitializeCommonParameters( const css::uno::Sequence< css::uno::Any >& aArguments );
 
     // Scan locale properties files
     virtual void implScanLocales();
@@ -282,8 +245,7 @@ protected:
         const css::uno::Reference< css::embed::XStorage >& Storage,
         bool bUsedForStore,
         bool bStoreAll
-    )
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
+    );
 
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
@@ -292,8 +254,7 @@ protected:
         const OUString& Location,
         const OUString& aNameBase,
         const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
-    )
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
+    );
 
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
@@ -302,8 +263,7 @@ protected:
         const OUString& Location,
         const OUString& aNameBase,
         const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
-    )
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
+    );
 
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
@@ -316,8 +276,7 @@ protected:
         bool bUsedForStore,
         bool bStoreAll,
         bool bKillAll = false
-    )
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
+    );
 
 public:
     explicit StringResourcePersistenceImpl(
@@ -325,94 +284,54 @@ public:
     virtual ~StringResourcePersistenceImpl() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
      // XStringResourceResolver
-    virtual OUString SAL_CALL resolveString( const OUString& ResourceID )
-        throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override;
     virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw ( css::resource::MissingResourceException,
-                    css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override;
     virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
-        ( const css::lang::Locale& locale )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getCurrentLocale(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getDefaultLocale(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ( const css::lang::Locale& locale ) override;
+    virtual css::lang::Locale SAL_CALL getCurrentLocale(  ) override;
+    virtual css::lang::Locale SAL_CALL getDefaultLocale(  ) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  ) override;
 
     // XStringResourceManager
-    virtual sal_Bool SAL_CALL isReadOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str )
-        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
+    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override;
+    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override;
     virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str,
-        const css::lang::Locale& locale )
-            throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeId( const OUString& ResourceID )
-        throw (css::resource::MissingResourceException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL removeId( const OUString& ResourceID ) override;
     virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw (css::resource::MissingResourceException, css::uno::RuntimeException,
-                   css::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL newLocale( const css::lang::Locale& locale )
-        throw (css::container::ElementExistException, css::lang::IllegalArgumentException,
-               css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  )
-        throw (css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override;
+    virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  ) override;
 
     // XStringResourcePersistence
-    virtual void SAL_CALL store(  )
-        throw (css::lang::NoSupportException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isModified(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setComment( const OUString& Comment )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL store(  ) override;
+    virtual sal_Bool SAL_CALL isModified(  ) override;
+    virtual void SAL_CALL setComment( const OUString& Comment ) override;
     virtual void SAL_CALL storeToStorage
         ( const css::uno::Reference< css::embed::XStorage >& Storage,
-          const OUString& NameBase, const OUString& Comment )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+          const OUString& NameBase, const OUString& Comment ) override;
     virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase,
         const OUString& Comment, const css::uno::Reference
-        < css::task::XInteractionHandler >& Handler )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        < css::task::XInteractionHandler >& Handler ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  ) override;
+    virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) override;
 };
 
 
@@ -434,106 +353,63 @@ public:
     virtual ~StringResourceWithStorageImpl() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
      // XStringResourceResolver
-    virtual OUString SAL_CALL resolveString( const OUString& ResourceID )
-        throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override;
     virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw ( css::resource::MissingResourceException,
-                    css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override;
     virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
-        ( const css::lang::Locale& locale )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getCurrentLocale(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getDefaultLocale(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ( const css::lang::Locale& locale ) override;
+    virtual css::lang::Locale SAL_CALL getCurrentLocale(  ) override;
+    virtual css::lang::Locale SAL_CALL getDefaultLocale(  ) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  ) override;
 
     // XStringResourceManager
-    virtual sal_Bool SAL_CALL isReadOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str )
-        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
+    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override;
+    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override;
     virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str,
-        const css::lang::Locale& locale )
-            throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeId( const OUString& ResourceID )
-        throw (css::resource::MissingResourceException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL removeId( const OUString& ResourceID ) override;
     virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw (css::resource::MissingResourceException, css::uno::RuntimeException,
-                   css::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL newLocale( const css::lang::Locale& locale )
-        throw (css::container::ElementExistException, css::lang::IllegalArgumentException,
-               css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  )
-        throw (css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override;
+    virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  ) override;
 
     // XStringResourcePersistence
-    virtual void SAL_CALL store(  )
-        throw (css::lang::NoSupportException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isModified(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setComment( const OUString& Comment )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL store(  ) override;
+    virtual sal_Bool SAL_CALL isModified(  ) override;
+    virtual void SAL_CALL setComment( const OUString& Comment ) override;
     virtual void SAL_CALL storeToStorage
         ( const css::uno::Reference< css::embed::XStorage >& Storage,
-          const OUString& NameBase, const OUString& Comment )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+          const OUString& NameBase, const OUString& Comment ) override;
     virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase,
         const OUString& Comment, const css::uno::Reference
-        < css::task::XInteractionHandler >& Handler )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        < css::task::XInteractionHandler >& Handler ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  ) override;
+    virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) override;
 
     // XStringResourceWithStorage
     virtual void SAL_CALL storeAsStorage
-        ( const css::uno::Reference< css::embed::XStorage >& Storage )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        ( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
     virtual void SAL_CALL setStorage
-        ( const css::uno::Reference< css::embed::XStorage >& Storage )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        ( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
 };
 
 
@@ -559,105 +435,61 @@ public:
     virtual ~StringResourceWithLocationImpl() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
      // XStringResourceResolver
-    virtual OUString SAL_CALL resolveString( const OUString& ResourceID )
-        throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL resolveString( const OUString& ResourceID ) override;
     virtual OUString SAL_CALL resolveStringForLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw ( css::resource::MissingResourceException,
-                    css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual sal_Bool SAL_CALL hasEntryForId( const OUString& ResourceID ) override;
     virtual sal_Bool SAL_CALL hasEntryForIdAndLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDs(  ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getResourceIDsForLocale
-        ( const css::lang::Locale& locale )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getCurrentLocale(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getDefaultLocale(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        ( const css::lang::Locale& locale ) override;
+    virtual css::lang::Locale SAL_CALL getCurrentLocale(  ) override;
+    virtual css::lang::Locale SAL_CALL getDefaultLocale(  ) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales(  ) override;
 
     // XStringResourceManager
-    virtual sal_Bool SAL_CALL isReadOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str )
-        throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
+    virtual void SAL_CALL setCurrentLocale( const css::lang::Locale& locale, sal_Bool FindClosestMatch ) override;
+    virtual void SAL_CALL setDefaultLocale( const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL setString( const OUString& ResourceID, const OUString& Str ) override;
     virtual void SAL_CALL setStringForLocale( const OUString& ResourceID, const OUString& Str,
-        const css::lang::Locale& locale )
-            throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeId( const OUString& ResourceID )
-        throw (css::resource::MissingResourceException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL removeId( const OUString& ResourceID ) override;
     virtual void SAL_CALL removeIdForLocale( const OUString& ResourceID,
-        const css::lang::Locale& locale )
-            throw (css::resource::MissingResourceException, css::uno::RuntimeException,
-                   css::lang::NoSupportException, std::exception) override;
-    virtual void SAL_CALL newLocale( const css::lang::Locale& locale )
-        throw (css::container::ElementExistException, css::lang::IllegalArgumentException,
-               css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
-               css::lang::NoSupportException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  )
-        throw (css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL newLocale( const css::lang::Locale& locale ) override;
+    virtual void SAL_CALL removeLocale( const css::lang::Locale& locale ) override;
+    virtual ::sal_Int32 SAL_CALL getUniqueNumericId(  ) override;
 
     // XStringResourcePersistence
-    virtual void SAL_CALL store(  )
-        throw (css::lang::NoSupportException,
-               css::uno::Exception,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isModified(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setComment( const OUString& Comment )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL store(  ) override;
+    virtual sal_Bool SAL_CALL isModified(  ) override;
+    virtual void SAL_CALL setComment( const OUString& Comment ) override;
     virtual void SAL_CALL storeToStorage
         ( const css::uno::Reference< css::embed::XStorage >& Storage,
-          const OUString& NameBase, const OUString& Comment )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+          const OUString& NameBase, const OUString& Comment ) override;
     virtual void SAL_CALL storeToURL( const OUString& URL, const OUString& NameBase,
         const OUString& Comment, const css::uno::Reference
-        < css::task::XInteractionHandler >& Handler )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        < css::task::XInteractionHandler >& Handler ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL exportBinary(  ) override;
+    virtual void SAL_CALL importBinary( const css::uno::Sequence< ::sal_Int8 >& Data ) override;
 
     // XStringResourceWithLocation
-    virtual void SAL_CALL storeAsURL( const OUString& URL )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setURL( const OUString& URL )
-        throw (css::lang::IllegalArgumentException, css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL storeAsURL( const OUString& URL ) override;
+    virtual void SAL_CALL setURL( const OUString& URL ) override;
 };
 
 
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 017bc3999e11..96b4ee53ba7a 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -449,32 +449,32 @@ public:
     ReadOnlyEventsNameContainer( const Sequence< OUString >& eventMethods, const OUString& sCodeName );
     // XNameContainer
 
-    virtual void SAL_CALL insertByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException, std::exception) override
+    virtual void SAL_CALL insertByName( const OUString&, const Any& ) override
     {
         throw RuntimeException("ReadOnly container" );
 
     }
-    virtual void SAL_CALL removeByName( const OUString& ) throw (css::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) override
+    virtual void SAL_CALL removeByName( const OUString& ) override
     {
         throw RuntimeException("ReadOnly container" );
     }
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) override
+    virtual void SAL_CALL replaceByName( const OUString&, const Any& ) override
     {
         throw RuntimeException("ReadOnly container" );
 
     }
 
     // XNameAccess
-    virtual Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getElementNames(  ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException, std::exception) override
+    virtual Type SAL_CALL getElementType(  ) override
     { return cppu::UnoType<OUString>::get(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     { return !m_hEvents.empty(); }
 private:
 
@@ -500,7 +500,7 @@ ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< OUStri
 }
 
 Any SAL_CALL
-ReadOnlyEventsNameContainer::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception){
+ReadOnlyEventsNameContainer::getByName( const OUString& aName ){
     EventSupplierHash::const_iterator it = m_hEvents.find( aName );
     if ( it == m_hEvents.end() )
         throw container::NoSuchElementException();
@@ -508,13 +508,13 @@ ReadOnlyEventsNameContainer::getByName( const OUString& aName ) throw (container
 }
 
 Sequence< OUString > SAL_CALL
-ReadOnlyEventsNameContainer::getElementNames(  ) throw (RuntimeException, std::exception)
+ReadOnlyEventsNameContainer::getElementNames(  )
 {
     return comphelper::mapKeysToSequence(m_hEvents);
 }
 
 sal_Bool SAL_CALL
-ReadOnlyEventsNameContainer::hasByName( const OUString& aName ) throw (RuntimeException, std::exception)
+ReadOnlyEventsNameContainer::hasByName( const OUString& aName )
 {
     EventSupplierHash::const_iterator it = m_hEvents.find( aName );
     if ( it == m_hEvents.end() )
@@ -529,7 +529,7 @@ public:
     { m_xNameContainer = new ReadOnlyEventsNameContainer( eventMethods, sCodeName ); }
 
     // XScriptEventSupplier
-    virtual Reference< container::XNameContainer > SAL_CALL getEvents(  ) throw (RuntimeException, std::exception) override { return m_xNameContainer; }
+    virtual Reference< container::XNameContainer > SAL_CALL getEvents(  ) override { return m_xNameContainer; }
 private:
     Reference< container::XNameContainer > m_xNameContainer;
 };
@@ -548,25 +548,25 @@ class EventListener : public EventListener_BASE
 public:
     EventListener();
     // XEventListener
-    virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const lang::EventObject& Source) override;
     using cppu::OPropertySetHelper::disposing;
 
     // XScriptListener
-    virtual void SAL_CALL firing(const ScriptEvent& evt) throw(RuntimeException, std::exception) override;
-    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL firing(const ScriptEvent& evt) override;
+    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) override;
     // XCloseListener
-    virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) override;
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
     // XInterface
     DECLARE_XINTERFACE()
 
     // XTypeProvider
     DECLARE_XTYPEPROVIDER()
-    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override
     {
         if ( nHandle == EVENTLSTNR_PROPERTY_ID_MODEL )
         {
@@ -592,20 +592,17 @@ public:
             setShellFromModel();
     }
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     {
         return OUString( "ooo.vba.EventListener"  );
     }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         const OUString strName( getImplementationName() );
         return Sequence< OUString >( &strName, 1 );
@@ -621,7 +618,7 @@ protected:
 private:
     void setShellFromModel();
     /// @throws RuntimeException
-    void firing_Impl( const  ScriptEvent& evt, Any *pSyncRet ) throw( RuntimeException, std::exception );
+    void firing_Impl( const  ScriptEvent& evt, Any *pSyncRet );
 
     Reference< frame::XModel > m_xModel;
     bool m_bDocClosed;
@@ -664,20 +661,20 @@ EventListener::setShellFromModel()
 
 //XEventListener
 void
-EventListener::disposing(const lang::EventObject&)  throw( RuntimeException, std::exception )
+EventListener::disposing(const lang::EventObject&)
 {
 }
 
 //XScriptListener
 
 void SAL_CALL
-EventListener::firing(const ScriptEvent& evt) throw(RuntimeException, std::exception)
+EventListener::firing(const ScriptEvent& evt)
 {
     firing_Impl( evt, nullptr );
 }
 
 Any SAL_CALL
-EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::InvocationTargetException, RuntimeException, std::exception)
+EventListener::approveFiring(const ScriptEvent& evt)
 {
     Any ret;
     firing_Impl( evt, &ret );
@@ -686,13 +683,13 @@ EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::Invocatio
 
 // XCloseListener
 void SAL_CALL
-EventListener::queryClosing( const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception)
+EventListener::queryClosing( const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ )
 {
     //Nothing to do
 }
 
 void SAL_CALL
-EventListener::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
+EventListener::notifyClosing( const lang::EventObject& /*Source*/ )
 {
     m_bDocClosed = true;
     uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xModel, uno::UNO_QUERY );
@@ -704,7 +701,7 @@ EventListener::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::
 
 // XInitialization
 void SAL_CALL
-EventListener::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+EventListener::initialize( const Sequence< Any >& aArguments )
 {
     if ( aArguments.getLength() == 1 )
         aArguments[0] >>= m_xModel;
@@ -741,7 +738,7 @@ EventListener::createArrayHelper(  ) const
 
 // XPropertySet
 Reference< beans::XPropertySetInfo >
-EventListener::getPropertySetInfo(  ) throw (RuntimeException, std::exception)
+EventListener::getPropertySetInfo(  )
 {
     Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -810,7 +807,7 @@ bool DenyMouseDrag(const ScriptEvent& evt, void const * )
 // EventListener
 
 void
-EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeException, std::exception)
+EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet )
 {
     // let default handlers deal with non vba stuff
     if ( evt.ScriptType != "VBAInterop" )
@@ -964,23 +961,20 @@ public:
     VBAToOOEventDescGen();
 
     // XVBAToOOEventDescGen
-    virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const OUString& sCtrlServiceName, const OUString& sCodeName ) throw (RuntimeException, std::exception) override;
-    virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl,  const OUString& sCodeName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const OUString& sCtrlServiceName, const OUString& sCodeName ) override;
+    virtual Reference< XScriptEventsSupplier > SAL_CALL getEventSupplier( const Reference< XInterface >& xControl,  const OUString& sCodeName ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     {
         return OUString( "ooo.vba.VBAToOOEventDesc"  );
     }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         const OUString strName( getImplementationName() );
         return Sequence< OUString >( &strName, 1 );
@@ -991,14 +985,14 @@ public:
 VBAToOOEventDescGen::VBAToOOEventDescGen() {}
 
 Sequence< ScriptEventDescriptor > SAL_CALL
-VBAToOOEventDescGen::getEventDescriptions( const OUString& sCntrlServiceName, const OUString& sCodeName ) throw (RuntimeException, std::exception)
+VBAToOOEventDescGen::getEventDescriptions( const OUString& sCntrlServiceName, const OUString& sCodeName )
 {
     ScriptEventHelper evntHelper( sCntrlServiceName );
     return evntHelper.createEvents( sCodeName );
 }
 
 Reference< XScriptEventsSupplier > SAL_CALL
-VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName  ) throw (css::uno::RuntimeException, std::exception)
+VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl, const OUString& sCodeName  )
 {
     ScriptEventHelper evntHelper( xControl );
     Reference< XScriptEventsSupplier > xSupplier =
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 4ab84d7eb9eb..deda3a427623 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -159,7 +159,7 @@ public:
 
     // helper
     /// @throws css::uno::Exception
-    SAL_DLLPRIVATE css::uno::Reference< css::animations::XAnimationNode > createAfterEffectNode() const throw (css::uno::Exception);
+    SAL_DLLPRIVATE css::uno::Reference< css::animations::XAnimationNode > createAfterEffectNode() const;
     SAL_DLLPRIVATE css::uno::Reference< css::drawing::XShape > getTargetShape() const;
 
     // static helpers
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 38eb3bf87f74..cbed1fcdb8db 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -295,13 +295,13 @@ public:
 
         @throws css::uno::RuntimeException
     */
-    css::uno::Reference< css::animations::XAnimationNode > const & getAnimationNode() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::animations::XAnimationNode > const & getAnimationNode();
 
     /** sets the main animation node
 
         @throws css::uno::RuntimeException
     */
-    void setAnimationNode( css::uno::Reference< css::animations::XAnimationNode >& xNode ) throw (css::uno::RuntimeException);
+    void setAnimationNode( css::uno::Reference< css::animations::XAnimationNode >& xNode );
 
     /// @return a helper class to manipulate effects inside the main sequence
     std::shared_ptr< sd::MainSequence > const & getMainSequence();
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index d3b7e1c7285f..3d6e6248da6b 100644
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
@@ -55,60 +55,60 @@ public:
     virtual ~SdStyleFamily() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // XSingleServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(  ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(  ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XPropertySet
-    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const css::uno::Reference<css::beans::XVetoableChangeListener>&aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const css::uno::Reference<css::beans::XVetoableChangeListener>&aListener ) override;
 
 private:
     /// @throws css::uno::RuntimeException
-    void throwIfDisposed() const throw(css::uno::RuntimeException);
+    void throwIfDisposed() const;
     /// @throws css::lang::IllegalArgumentException
-    SdStyleSheet* GetValidNewSheet( const css::uno::Any& rElement ) throw(css::lang::IllegalArgumentException);
+    SdStyleSheet* GetValidNewSheet( const css::uno::Any& rElement );
     /// @throws css::container::NoSuchElementException
     /// @throws css::lang::WrappedTargetException
-    SdStyleSheet* GetSheetByName( const OUString& rName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException );
+    SdStyleSheet* GetSheetByName( const OUString& rName );
 
     SfxStyleFamily mnFamily;
     rtl::Reference< SfxStyleSheetPool > mxPool;
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 7c470748aeca..4447ee7f31af 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -96,30 +96,30 @@ public:
 
 public:
     /// @throws css::uno::RuntimeException
-    void throwIfDisposed() throw(css::uno::RuntimeException);
+    void throwIfDisposed();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 protected:
     void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily );
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 4cf99f3dc4cf..41b94338e183 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -86,49 +86,49 @@ public:
     virtual void SAL_CALL release(  ) throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XStyle
-    virtual sal_Bool SAL_CALL isUserDefined(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isInUse(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getParentStyle(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isUserDefined(  ) override;
+    virtual sal_Bool SAL_CALL isInUse(  ) override;
+    virtual OUString SAL_CALL getParentStyle(  ) override;
+    virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     void notifyModifyListener();
 
 protected:
     /// @throws css::uno::RuntimeException
-    static const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) throw (css::uno::RuntimeException);
+    static const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName );
 
     virtual void Load (SvStream& rIn, sal_uInt16 nVersion) override;
 
@@ -136,7 +136,7 @@ protected:
     virtual             ~SdStyleSheet() override;
 
     /// @throws css::uno::RuntimeException
-    void throwIfDisposed() throw (css::uno::RuntimeException);
+    void throwIfDisposed();
 
     void disposing();
 
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index 92df56ffa21c..02240acffcf2 100644
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -43,7 +43,7 @@ public:
     virtual             ~TextApiObject() throw() override;
 
     /// @throws css::uno::RuntimeException
-    void SAL_CALL dispose() throw(css::uno::RuntimeException);
+    void SAL_CALL dispose();
 
     OutlinerParaObject* CreateText();
     void                SetText( OutlinerParaObject& rText );
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 9438660e5725..886700a47398 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -919,7 +919,7 @@ void CustomAnimationEffect::setFill( sal_Int16 nFill )
         mxNode->setFill( nFill );
 }
 
-Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const throw (Exception)
+Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const
 {
     DBG_ASSERT( mbHasAfterEffect, "sd::CustomAnimationEffect::createAfterEffectNode(), this node has no after effect!" );
 
@@ -1995,7 +1995,6 @@ bool stl_CustomAnimationEffect_search_node_predict::operator()( const CustomAnim
 
 /// @throws Exception
 static bool implFindNextContainer( Reference< XTimeContainer >& xParent, Reference< XTimeContainer >& xCurrent, Reference< XTimeContainer >& xNext )
- throw(Exception)
 {
     Reference< XEnumerationAccess > xEnumerationAccess( xParent, UNO_QUERY_THROW );
     Reference< XEnumeration > xEnumeration( xEnumerationAccess->createEnumeration() );
@@ -2971,19 +2970,19 @@ class AnimationChangeListener : public cppu::WeakImplHelper< XChangesListener >
 public:
     explicit AnimationChangeListener( MainSequence* pMainSequence ) : mpMainSequence( pMainSequence ) {}
 
-    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 private:
     MainSequence* mpMainSequence;
 };
 
-void SAL_CALL AnimationChangeListener::changesOccurred( const css::util::ChangesEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationChangeListener::changesOccurred( const css::util::ChangesEvent& )
 {
     if( mpMainSequence )
         mpMainSequence->startRecreateTimer();
 }
 
-void SAL_CALL AnimationChangeListener::disposing( const css::lang::EventObject& ) throw (RuntimeException, std::exception)
+void SAL_CALL AnimationChangeListener::disposing( const css::lang::EventObject& )
 {
 }
 
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 88af7562d06a..ef893140b858 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -61,32 +61,32 @@ public:
     SdrModel* GetModel() { return (mpPage != nullptr) ? mpPage->GetModel() : nullptr; }
 
     // XInterface:
-    virtual Any SAL_CALL queryInterface(Type const & type) throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface(Type const & type) override;
     virtual void SAL_CALL acquire() throw () override { ::cppu::WeakComponentImplHelper< XAnnotation >::acquire(); }
     virtual void SAL_CALL release() throw () override { ::cppu::WeakComponentImplHelper< XAnnotation >::release(); }
 
     // css::beans::XPropertySet:
-    virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const Any & aValue) throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception) override;
-    virtual Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception) override;
+    virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const Any & aValue) override;
+    virtual Any SAL_CALL getPropertyValue(const OUString & PropertyName) override;
+    virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener) override;
+    virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & aListener) override;
+    virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) override;
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const Reference< XVetoableChangeListener > & aListener) override;
 
     // css::office::XAnnotation:
-    virtual css::uno::Any SAL_CALL getAnchor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual RealPoint2D SAL_CALL getPosition() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition(const RealPoint2D & the_value) throw (RuntimeException, std::exception) override;
-    virtual css::geometry::RealSize2D SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::geometry::RealSize2D& _size ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAuthor() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAuthor(const OUString & the_value) throw (RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getInitials() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInitials(const OUString & the_value) throw (RuntimeException, std::exception) override;
-    virtual util::DateTime SAL_CALL getDateTime() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDateTime(const util::DateTime & the_value) throw (RuntimeException, std::exception) override;
-    virtual Reference< XText > SAL_CALL getTextRange() throw (RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getAnchor() override;
+    virtual RealPoint2D SAL_CALL getPosition() override;
+    virtual void SAL_CALL setPosition(const RealPoint2D & the_value) override;
+    virtual css::geometry::RealSize2D SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( const css::geometry::RealSize2D& _size ) override;
+    virtual OUString SAL_CALL getAuthor() override;
+    virtual void SAL_CALL setAuthor(const OUString & the_value) override;
+    virtual OUString SAL_CALL getInitials() override;
+    virtual void SAL_CALL setInitials(const OUString & the_value) override;
+    virtual util::DateTime SAL_CALL getDateTime() override;
+    virtual void SAL_CALL setDateTime(const util::DateTime & the_value) override;
+    virtual Reference< XText > SAL_CALL getTextRange() override;
 
 private:
     // destructor is private and will be called indirectly by the release call    virtual ~Annotation() {}
@@ -191,48 +191,48 @@ void SAL_CALL Annotation::disposing()
     }
 }
 
-Any Annotation::queryInterface(Type const & type) throw (RuntimeException, std::exception)
+Any Annotation::queryInterface(Type const & type)
 {
     return ::cppu::WeakComponentImplHelper< XAnnotation>::queryInterface(type);
 }
 
 // com.sun.star.beans.XPropertySet:
-Reference< XPropertySetInfo > SAL_CALL Annotation::getPropertySetInfo() throw (RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL Annotation::getPropertySetInfo()
 {
     return ::cppu::PropertySetMixin< XAnnotation >::getPropertySetInfo();
 }
 
-void SAL_CALL Annotation::setPropertyValue(const OUString & aPropertyName, const Any & aValue) throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception)
+void SAL_CALL Annotation::setPropertyValue(const OUString & aPropertyName, const Any & aValue)
 {
     ::cppu::PropertySetMixin< XAnnotation >::setPropertyValue(aPropertyName, aValue);
 }
 
-Any SAL_CALL Annotation::getPropertyValue(const OUString & aPropertyName) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception)
+Any SAL_CALL Annotation::getPropertyValue(const OUString & aPropertyName)
 {
     return ::cppu::PropertySetMixin< XAnnotation >::getPropertyValue(aPropertyName);
 }
 
-void SAL_CALL Annotation::addPropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception)
+void SAL_CALL Annotation::addPropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener)
 {
     ::cppu::PropertySetMixin< XAnnotation >::addPropertyChangeListener(aPropertyName, xListener);
 }
 
-void SAL_CALL Annotation::removePropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception)
+void SAL_CALL Annotation::removePropertyChangeListener(const OUString & aPropertyName, const Reference< XPropertyChangeListener > & xListener)
 {
     ::cppu::PropertySetMixin< XAnnotation >::removePropertyChangeListener(aPropertyName, xListener);
 }
 
-void SAL_CALL Annotation::addVetoableChangeListener(const OUString & aPropertyName, const Reference< XVetoableChangeListener > & xListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception)
+void SAL_CALL Annotation::addVetoableChangeListener(const OUString & aPropertyName, const Reference< XVetoableChangeListener > & xListener)
 {
     ::cppu::PropertySetMixin< XAnnotation >::addVetoableChangeListener(aPropertyName, xListener);
 }
 
-void SAL_CALL Annotation::removeVetoableChangeListener(const OUString & aPropertyName, const Reference< XVetoableChangeListener > & xListener) throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception)
+void SAL_CALL Annotation::removeVetoableChangeListener(const OUString & aPropertyName, const Reference< XVetoableChangeListener > & xListener)
 {
     ::cppu::PropertySetMixin< XAnnotation >::removeVetoableChangeListener(aPropertyName, xListener);
 }
 
-Any SAL_CALL Annotation::getAnchor() throw (RuntimeException, std::exception)
+Any SAL_CALL Annotation::getAnchor()
 {
     osl::MutexGuard g(m_aMutex);
     Any aRet;
@@ -245,13 +245,13 @@ Any SAL_CALL Annotation::getAnchor() throw (RuntimeException, std::exception)
 }
 
 // css::office::XAnnotation:
-RealPoint2D SAL_CALL Annotation::getPosition() throw (RuntimeException, std::exception)
+RealPoint2D SAL_CALL Annotation::getPosition()
 {
     osl::MutexGuard g(m_aMutex);
     return m_Position;
 }
 
-void SAL_CALL Annotation::setPosition(const RealPoint2D & the_value) throw (RuntimeException, std::exception)
+void SAL_CALL Annotation::setPosition(const RealPoint2D & the_value)
 {
     prepareSet("Position", Any(), Any(), nullptr);
     {
@@ -262,13 +262,13 @@ void SAL_CALL Annotation::setPosition(const RealPoint2D & the_value) throw (Runt
 }
 
 // css::office::XAnnotation:
-RealSize2D SAL_CALL Annotation::getSize() throw (RuntimeException, std::exception)
+RealSize2D SAL_CALL Annotation::getSize()
 {
     osl::MutexGuard g(m_aMutex);
     return m_Size;
 }
 
-void SAL_CALL Annotation::setSize(const RealSize2D & the_value) throw (RuntimeException, std::exception)
+void SAL_CALL Annotation::setSize(const RealSize2D & the_value)
 {
     prepareSet("Size", Any(), Any(), nullptr);
     {
@@ -278,13 +278,13 @@ void SAL_CALL Annotation::setSize(const RealSize2D & the_value) throw (RuntimeEx
     }
 }
 
-OUString SAL_CALL Annotation::getAuthor() throw (RuntimeException, std::exception)
+OUString SAL_CALL Annotation::getAuthor()
 {
     osl::MutexGuard g(m_aMutex);
     return m_Author;
 }
 
-void SAL_CALL Annotation::setAuthor(const OUString & the_value) throw (RuntimeException, std::exception)
+void SAL_CALL Annotation::setAuthor(const OUString & the_value)
 {
     prepareSet("Author", Any(), Any(), nullptr);
     {
@@ -294,13 +294,13 @@ void SAL_CALL Annotation::setAuthor(const OUString & the_value) throw (RuntimeEx
     }
 }
 
-OUString SAL_CALL Annotation::getInitials() throw (RuntimeException, std::exception)
+OUString SAL_CALL Annotation::getInitials()
 {
     osl::MutexGuard g(m_aMutex);
     return m_Initials;
 }
 
-void SAL_CALL Annotation::setInitials(const OUString & the_value) throw (RuntimeException, std::exception)
+void SAL_CALL Annotation::setInitials(const OUString & the_value)
 {
     prepareSet("Initials", Any(), Any(), nullptr);
     {
@@ -310,13 +310,13 @@ void SAL_CALL Annotation::setInitials(const OUString & the_value) throw (Runtime
     }
 }
 
-util::DateTime SAL_CALL Annotation::getDateTime() throw (RuntimeException, std::exception)
+util::DateTime SAL_CALL Annotation::getDateTime()
 {
     osl::MutexGuard g(m_aMutex);
     return m_DateTime;
 }
 
-void SAL_CALL Annotation::setDateTime(const util::DateTime & the_value) throw (RuntimeException, std::exception)
+void SAL_CALL Annotation::setDateTime(const util::DateTime & the_value)
 {
     prepareSet("DateTime", Any(), Any(), nullptr);
     {
@@ -340,7 +340,7 @@ void Annotation::createChangeUndo()
     }
 }
 
-Reference< XText > SAL_CALL Annotation::getTextRange() throw (RuntimeException, std::exception)
+Reference< XText > SAL_CALL Annotation::getTextRange()
 {
     osl::MutexGuard g(m_aMutex);
     if( !m_TextRange.is() && (mpPage != nullptr) )
diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx
index 842cbd522b96..66aee30c8e6e 100644
--- a/sd/source/core/annotations/AnnotationEnumeration.cxx
+++ b/sd/source/core/annotations/AnnotationEnumeration.cxx
@@ -41,8 +41,8 @@ public:
     AnnotationEnumeration& operator=(const AnnotationEnumeration&) = delete;
 
     // css::office::XAnnotationEnumeration:
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL nextElement() throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL nextElement() override;
 
 private:
     // destructor is private and will be called indirectly by the release call    virtual ~AnnotationEnumeration() {}
@@ -63,12 +63,12 @@ AnnotationEnumeration::AnnotationEnumeration( const AnnotationVector& rAnnotatio
 }
 
 // css::office::XAnnotationEnumeration:
-sal_Bool SAL_CALL AnnotationEnumeration::hasMoreElements() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL AnnotationEnumeration::hasMoreElements()
 {
     return maIter != maAnnotations.end();
 }
 
-css::uno::Reference< css::office::XAnnotation > SAL_CALL AnnotationEnumeration::nextElement() throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception)
+css::uno::Reference< css::office::XAnnotation > SAL_CALL AnnotationEnumeration::nextElement()
 {
     if( maIter == maAnnotations.end() )
         throw css::container::NoSuchElementException();
diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx
index 2877ea59d37a..1972c725f06f 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -48,7 +48,7 @@ sd::MainSequencePtr const & SdPage::getMainSequence()
 }
 
 /** returns the main animation node */
-Reference< XAnimationNode > const & SdPage::getAnimationNode() throw (RuntimeException)
+Reference< XAnimationNode > const & SdPage::getAnimationNode()
 {
     if( !mxAnimationNode.is() )
     {
@@ -61,7 +61,7 @@ Reference< XAnimationNode > const & SdPage::getAnimationNode() throw (RuntimeExc
     return mxAnimationNode;
 }
 
-void SdPage::setAnimationNode( Reference< XAnimationNode >& xNode ) throw (RuntimeException)
+void SdPage::setAnimationNode( Reference< XAnimationNode >& xNode )
 {
     mxAnimationNode = xNode;
     if( mpMainSequence.get() )
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index cca0024a928b..d2ad712f3d09 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -113,13 +113,13 @@ SdStyleFamily::~SdStyleFamily()
     delete mpImpl;
 }
 
-void SdStyleFamily::throwIfDisposed() const throw(RuntimeException)
+void SdStyleFamily::throwIfDisposed() const
 {
     if( !mxPool.is() )
         throw DisposedException();
 }
 
-SdStyleSheet* SdStyleFamily::GetValidNewSheet( const Any& rElement ) throw(IllegalArgumentException)
+SdStyleSheet* SdStyleFamily::GetValidNewSheet( const Any& rElement )
 {
     Reference< XStyle > xStyle( rElement, UNO_QUERY );
     SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( xStyle.get() );
@@ -130,7 +130,7 @@ SdStyleSheet* SdStyleFamily::GetValidNewSheet( const Any& rElement ) throw(Illeg
     return pStyle;
 }
 
-SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException )
+SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString& rName )
 {
     SdStyleSheet* pRet = nullptr;
     if( !rName.isEmpty() )
@@ -165,17 +165,17 @@ SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString& rName ) throw(NoSuc
 }
 
 // XServiceInfo
-OUString SAL_CALL SdStyleFamily::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL SdStyleFamily::getImplementationName()
 {
     return OUString( "SdStyleFamily" );
 }
 
-sal_Bool SAL_CALL SdStyleFamily::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SdStyleFamily::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-Sequence< OUString > SAL_CALL SdStyleFamily::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdStyleFamily::getSupportedServiceNames()
 {
     OUString aServiceName( "com.sun.star.style.StyleFamily" );
     Sequence< OUString > aSeq( &aServiceName, 1 );
@@ -183,7 +183,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getSupportedServiceNames() throw(Ru
 }
 
 // XNamed
-OUString SAL_CALL SdStyleFamily::getName() throw (RuntimeException, std::exception)
+OUString SAL_CALL SdStyleFamily::getName()
 {
     if( mnFamily == SD_STYLE_FAMILY_MASTERPAGE )
     {
@@ -205,20 +205,20 @@ OUString SAL_CALL SdStyleFamily::getName() throw (RuntimeException, std::excepti
     }
 }
 
-void SAL_CALL SdStyleFamily::setName( const OUString& ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleFamily::setName( const OUString& )
 {
 }
 
 // XNameAccess
 
-Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SdStyleFamily::getByName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
     return Any( Reference< XStyle >( static_cast<SfxUnoStyleSheet*>(GetSheetByName( rName )) ) );
 }
 
-Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames()
 {
     SolarMutexGuard aGuard;
 
@@ -260,7 +260,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce
     }
 }
 
-sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName )
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -297,12 +297,12 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(Runtim
 
 // XElementAccess
 
-Type SAL_CALL SdStyleFamily::getElementType() throw(RuntimeException, std::exception)
+Type SAL_CALL SdStyleFamily::getElementType()
 {
     return cppu::UnoType<XStyle>::get();
 }
 
-sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SdStyleFamily::hasElements()
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -325,7 +325,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException, std::exce
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL SdStyleFamily::getCount()
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -348,7 +348,7 @@ sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException, std::except
     return nCount;
 }
 
-Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index )
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -389,7 +389,7 @@ Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds
 
 // XNameContainer
 
-void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rElement )
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -405,7 +405,7 @@ void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rEl
     mxPool->Insert( pStyle );
 }
 
-void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SdStyleFamily::removeByName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -420,7 +420,7 @@ void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchE
 
 // XNameReplace
 
-void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aElement )
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -434,7 +434,7 @@ void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aE
 
 // XSingleServiceFactory
 
-Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL SdStyleFamily::createInstance()
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -449,14 +449,14 @@ Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception
     }
 }
 
-Reference< XInterface > SAL_CALL SdStyleFamily::createInstanceWithArguments( const Sequence< Any >&  ) throw(Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL SdStyleFamily::createInstanceWithArguments( const Sequence< Any >&  )
 {
     return createInstance();
 }
 
 // XComponent
 
-void SAL_CALL SdStyleFamily::dispose(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleFamily::dispose(  )
 {
     if( mxPool.is() )
         mxPool.clear();
@@ -468,28 +468,28 @@ void SAL_CALL SdStyleFamily::dispose(  ) throw (RuntimeException, std::exception
     }
 }
 
-void SAL_CALL SdStyleFamily::addEventListener( const Reference< XEventListener >&  ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleFamily::addEventListener( const Reference< XEventListener >&  )
 {
 }
 
-void SAL_CALL SdStyleFamily::removeEventListener( const Reference< XEventListener >&  ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleFamily::removeEventListener( const Reference< XEventListener >&  )
 {
 }
 
 // XPropertySet
 
-Reference<XPropertySetInfo> SdStyleFamily::getPropertySetInfo() throw (RuntimeException, std::exception)
+Reference<XPropertySetInfo> SdStyleFamily::getPropertySetInfo()
 {
     OSL_FAIL( "###unexpected!" );
     return Reference<XPropertySetInfo>();
 }
 
-void SdStyleFamily::setPropertyValue( const OUString& , const Any&  ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SdStyleFamily::setPropertyValue( const OUString& , const Any&  )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SdStyleFamily::getPropertyValue( const OUString& PropertyName )
 {
     if ( PropertyName == "DisplayName" )
     {
@@ -509,22 +509,22 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno
     }
 }
 
-void SdStyleFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SdStyleFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-void SdStyleFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SdStyleFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-void SdStyleFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SdStyleFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-void SdStyleFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SdStyleFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>&  )
 {
     OSL_FAIL( "###unexpected!" );
 }
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 607028598f26..35fae91d8562 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1223,31 +1223,31 @@ void SdStyleSheetPool::RemoveStyleFamily( const SdPage* pPage )
     }
 }
 
-void SdStyleSheetPool::throwIfDisposed() throw(css::uno::RuntimeException)
+void SdStyleSheetPool::throwIfDisposed()
 {
     if( mpDoc == nullptr )
         throw DisposedException();
 }
 
 // XServiceInfo
-OUString SAL_CALL SdStyleSheetPool::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL SdStyleSheetPool::getImplementationName()
 {
     return OUString( "SdStyleSheetPool" );
 }
 
-sal_Bool SAL_CALL SdStyleSheetPool::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SdStyleSheetPool::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL SdStyleSheetPool::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdStyleSheetPool::getSupportedServiceNames()
 {
     OUString aStr("com.sun.star.style.StyleFamilies");
     return Sequence< OUString >( &aStr, 1 );
 }
 
 // XNameAccess
-Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName )
 {
     throwIfDisposed();
 
@@ -1269,7 +1269,7 @@ Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchEl
     throw NoSuchElementException();
 }
 
-Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames()
 {
     throwIfDisposed();
 
@@ -1288,7 +1288,7 @@ Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeE
     return aNames;
 }
 
-sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName )
 {
     throwIfDisposed();
 
@@ -1312,28 +1312,28 @@ sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(Run
 
 // XElementAccess
 
-Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException, std::exception)
+Type SAL_CALL SdStyleSheetPool::getElementType()
 {
     throwIfDisposed();
 
     return cppu::UnoType<XNameAccess>::get();
 }
 
-sal_Bool SAL_CALL SdStyleSheetPool::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SdStyleSheetPool::hasElements()
 {
     return true;
 }
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL SdStyleSheetPool::getCount() throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL SdStyleSheetPool::getCount()
 {
     throwIfDisposed();
 
     return maStyleFamilyMap.size() + 3;
 }
 
-Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index )
 {
     switch( Index )
     {
@@ -1362,7 +1362,7 @@ Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou
 
 // XComponent
 
-void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleSheetPool::dispose()
 {
     if( mpDoc )
     {
@@ -1393,11 +1393,11 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException, std::exceptio
     }
 }
 
-void SAL_CALL SdStyleSheetPool::addEventListener( const Reference< XEventListener >& /*xListener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleSheetPool::addEventListener( const Reference< XEventListener >& /*xListener*/ )
 {
 }
 
-void SAL_CALL SdStyleSheetPool::removeEventListener( const Reference< XEventListener >& /*aListener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleSheetPool::removeEventListener( const Reference< XEventListener >& /*aListener*/ )
 {
 }
 
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index f7419ef3781b..7e98f6474268 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -680,7 +680,7 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily )
     }
 }
 
-void SdStyleSheet::throwIfDisposed() throw (RuntimeException)
+void SdStyleSheet::throwIfDisposed()
 {
     if( !mxPool.is() )
         throw DisposedException();
@@ -726,7 +726,7 @@ void SAL_CALL SdStyleSheet::release(  ) throw ()
 
 // XComponent
 
-void SAL_CALL SdStyleSheet::dispose(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleSheet::dispose(  )
 {
     ClearableMutexGuard aGuard( mrBHelper.rMutex );
     if (!mrBHelper.bDisposed && !mrBHelper.bInDispose)
@@ -778,7 +778,7 @@ void SdStyleSheet::disposing()
     mxPool.clear();
 }
 
-void SAL_CALL SdStyleSheet::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleSheet::addEventListener( const Reference< XEventListener >& xListener )
 {
     ClearableMutexGuard aGuard( mrBHelper.rMutex );
     if (mrBHelper.bDisposed || mrBHelper.bInDispose)
@@ -793,14 +793,14 @@ void SAL_CALL SdStyleSheet::addEventListener( const Reference< XEventListener >&
     }
 }
 
-void SAL_CALL SdStyleSheet::removeEventListener( const Reference< XEventListener >& xListener  ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleSheet::removeEventListener( const Reference< XEventListener >& xListener  )
 {
     mrBHelper.removeListener( cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 // XModifyBroadcaster
 
-void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener >& xListener )
 {
     ClearableMutexGuard aGuard( mrBHelper.rMutex );
     if (mrBHelper.bDisposed || mrBHelper.bInDispose)
@@ -817,7 +817,7 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener
     }
 }
 
-void SAL_CALL SdStyleSheet::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SdStyleSheet::removeModifyListener( const Reference< XModifyListener >& xListener )
 {
     mrBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener );
 }
@@ -838,17 +838,17 @@ void SdStyleSheet::notifyModifyListener()
 }
 
 // XServiceInfo
-OUString SAL_CALL SdStyleSheet::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL SdStyleSheet::getImplementationName()
 {
     return OUString( "SdStyleSheet" );
 }
 
-sal_Bool SAL_CALL SdStyleSheet::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SdStyleSheet::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-Sequence< OUString > SAL_CALL SdStyleSheet::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdStyleSheet::getSupportedServiceNames()
 {
     Sequence< OUString > aNameSequence( 10 );
     OUString* pStrings = aNameSequence.getArray();
@@ -868,14 +868,14 @@ Sequence< OUString > SAL_CALL SdStyleSheet::getSupportedServiceNames() throw(Run
 }
 
 // XNamed
-OUString SAL_CALL SdStyleSheet::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL SdStyleSheet::getName()
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
     return GetApiName();
 }
 
-void SAL_CALL SdStyleSheet::setName( const OUString& rName  ) throw(RuntimeException, std::exception)
+void SAL_CALL SdStyleSheet::setName( const OUString& rName  )
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -889,21 +889,21 @@ void SAL_CALL SdStyleSheet::setName( const OUString& rName  ) throw(RuntimeExcep
 
 // XStyle
 
-sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SdStyleSheet::isUserDefined()
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
     return IsUserDefined();
 }
 
-sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SdStyleSheet::isInUse()
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
     return IsUsed();
 }
 
-OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException, std::exception)
+OUString SAL_CALL SdStyleSheet::getParentStyle()
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -917,7 +917,7 @@ OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException, std::ex
     return OUString();
 }
 
-void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName  ) throw(NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName  )
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -957,7 +957,7 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName  ) throw
 
 // XPropertySet
 
-Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo()
 {
     throwIfDisposed();
     static Reference< XPropertySetInfo > xInfo;
@@ -966,7 +966,7 @@ Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeEx
     return xInfo;
 }
 
-void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
 {
     SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -1052,7 +1052,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con
     }
 }
 
-Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -1158,14 +1158,14 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro
     }
 }
 
-void SAL_CALL SdStyleSheet::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {}
-void SAL_CALL SdStyleSheet::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {}
-void SAL_CALL SdStyleSheet::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {}
-void SAL_CALL SdStyleSheet::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {}
+void SAL_CALL SdStyleSheet::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) {}
+void SAL_CALL SdStyleSheet::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) {}
+void SAL_CALL SdStyleSheet::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) {}
+void SAL_CALL SdStyleSheet::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) {}
 
 // XPropertyState
 
-PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -1242,7 +1242,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN
     }
 }
 
-Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequence< OUString >& aPropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -1260,7 +1260,7 @@ Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequen
     return aPropertyStateSequence;
 }
 
-void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -1284,7 +1284,7 @@ void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName )
     Broadcast(SfxHint(SfxHintId::DataChanged));
 }
 
-Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -1317,7 +1317,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t
 }
 
 /** this is used because our property map is not sorted yet */
-const SfxItemPropertySimpleEntry* SdStyleSheet::getPropertyMapEntry( const OUString& rPropertyName ) throw (css::uno::RuntimeException)
+const SfxItemPropertySimpleEntry* SdStyleSheet::getPropertyMapEntry( const OUString& rPropertyName )
 {
     return GetStylePropertySet().getPropertyMapEntry(rPropertyName);
 }
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 40480ecfc347..11537e656673 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -144,7 +144,7 @@ rtl::Reference< TextApiObject > TextApiObject::create( SdDrawDocument* pDoc )
     return xRet;
 }
 
-void SAL_CALL TextApiObject::dispose() throw(RuntimeException)
+void SAL_CALL TextApiObject::dispose()
 {
     if( mpSource )
     {
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 178261b7e449..2c486a778ce1 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -71,7 +71,7 @@ public:
 
     // from FilterBase
     virtual bool importDocument() throw() override;
-    virtual bool exportDocument() throw (css::uno::RuntimeException, std::exception) override;
+    virtual bool exportDocument() override;
 
     // only needed for import, leave them empty, refactor later XmlFilterBase to export and import base?
     virtual oox::vml::Drawing* getVmlDrawing() override { return nullptr; }
@@ -132,7 +132,7 @@ private:
 
     void AddLayoutIdAndRelation( const ::sax_fastparser::FSHelperPtr& pFS, sal_Int32 nLayoutFileId );
 
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     ::sax_fastparser::FSHelperPtr mPresentationFS;
 
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 4df2bbff379f..a20ead1f37be 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -341,7 +341,7 @@ bool PowerPointExport::importDocument() throw()
     return false;
 }
 
-bool PowerPointExport::exportDocument() throw (css::uno::RuntimeException, std::exception)
+bool PowerPointExport::exportDocument()
 {
     DrawingML::ResetCounters();
     maShapeMap.clear ();
@@ -2292,12 +2292,12 @@ uno::Sequence< OUString > SAL_CALL PowerPointExport_getSupportedServiceNames() t
 }
 
 /// @throws uno::Exception
-uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const uno::Reference< XComponentContext > & rxCtxt ) throw( uno::Exception )
+uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const uno::Reference< XComponentContext > & rxCtxt )
 {
     return static_cast<cppu::OWeakObject*>(new PowerPointExport( rxCtxt ));
 }
 
-OUString PowerPointExport::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString PowerPointExport::getImplementationName()
 {
     return PowerPointExport_getImplementationName();
 }
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 285b8b339a9a..c94e7ddcfd7b 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -97,12 +97,10 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper< css::task:
 
     sal_uInt16 GetErrorCode() const { return nFilterError; };
 
-    virtual void SAL_CALL   handle( const css::uno::Reference< css::task::XInteractionRequest >& )
-                                throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL   handle( const css::uno::Reference< css::task::XInteractionRequest >& ) override;
 };
 
 void SdGRFFilter_ImplInteractionHdl::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
-        throw( css::uno::RuntimeException, std::exception )
 {
     if( !m_xInter.is() )
         return;
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 6aa7bbecb174..4fdb8fb074ce 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -72,29 +72,23 @@ public:
     virtual void SAL_CALL release() throw() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) throw ( Exception, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const Sequence< Any > & aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( RuntimeException, std::exception ) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XPropertyAccess
-    virtual Sequence< PropertyValue > SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue > & aProps )
-        throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual Sequence< PropertyValue > SAL_CALL getPropertyValues() override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue > & aProps ) override;
 
     // XExecuteDialog
-    virtual sal_Int16 SAL_CALL execute()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL execute() override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-        throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
 };
 
@@ -115,25 +109,21 @@ void SAL_CALL SdHtmlOptionsDialog::release() throw()
 
 // XInitialization
 void SAL_CALL SdHtmlOptionsDialog::initialize( const Sequence< Any > & )
-    throw ( Exception, RuntimeException, std::exception )
 {
 }
 
 // XServiceInfo
 OUString SAL_CALL SdHtmlOptionsDialog::getImplementationName()
-    throw( RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.draw.SdHtmlOptionsDialog" );
 }
 
 sal_Bool SAL_CALL SdHtmlOptionsDialog::supportsService( const OUString& rServiceName )
-    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL SdHtmlOptionsDialog::getSupportedServiceNames()
-    throw ( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet { "com.sun.star.ui.dialog.FilterOptionsDialog" };
     return aRet;
@@ -141,7 +131,6 @@ Sequence< OUString > SAL_CALL SdHtmlOptionsDialog::getSupportedServiceNames()
 
 // XPropertyAccess
 Sequence< PropertyValue > SdHtmlOptionsDialog::getPropertyValues()
-        throw ( RuntimeException, std::exception )
 {
     sal_Int32 i, nCount;
     for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
@@ -159,9 +148,6 @@ Sequence< PropertyValue > SdHtmlOptionsDialog::getPropertyValues()
 }
 
 void SdHtmlOptionsDialog::setPropertyValues( const Sequence< PropertyValue > & aProps )
-        throw ( UnknownPropertyException, PropertyVetoException,
-                IllegalArgumentException, WrappedTargetException,
-                RuntimeException, std::exception )
 {
     maMediaDescriptor = aProps;
 
@@ -178,13 +164,11 @@ void SdHtmlOptionsDialog::setPropertyValues( const Sequence< PropertyValue > & a
 
 // XExecutableDialog
 void SdHtmlOptionsDialog::setTitle( const OUString& aTitle )
-    throw ( RuntimeException, std::exception )
 {
     aDialogTitle = aTitle;
 }
 
 sal_Int16 SdHtmlOptionsDialog::execute()
-    throw ( RuntimeException, std::exception )
 {
     sal_Int16 nRet = ExecutableDialogResults::CANCEL;
 
@@ -210,7 +194,6 @@ sal_Int16 SdHtmlOptionsDialog::execute()
 
 // XEmporter
 void SdHtmlOptionsDialog::setSourceDocument( const Reference< XComponent >& xDoc )
-        throw ( IllegalArgumentException, RuntimeException, std::exception )
 {
     // try to set the corresponding metric unit
     Reference< XServiceInfo > xServiceInfo(xDoc, UNO_QUERY);
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 6f91cb7e7b6f..48b701192433 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -223,7 +223,6 @@ void AccessibleDocumentViewBase::ViewForwarderChanged()
 
 Reference<XAccessible> SAL_CALL
        AccessibleDocumentViewBase::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -232,7 +231,6 @@ Reference<XAccessible> SAL_CALL
 
 sal_Int32 SAL_CALL
     AccessibleDocumentViewBase::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -244,7 +242,6 @@ sal_Int32 SAL_CALL
 
 Reference<XAccessible> SAL_CALL
     AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex)
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -265,7 +262,6 @@ Reference<XAccessible> SAL_CALL
 uno::Reference<XAccessible > SAL_CALL
     AccessibleDocumentViewBase::getAccessibleAtPoint (
         const awt::Point& aPoint)
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -302,7 +298,6 @@ uno::Reference<XAccessible > SAL_CALL
 
 awt::Rectangle SAL_CALL
     AccessibleDocumentViewBase::getBounds()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -338,7 +333,6 @@ awt::Rectangle SAL_CALL
 
 awt::Point SAL_CALL
     AccessibleDocumentViewBase::getLocation()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     awt::Rectangle aBoundingBox (getBounds());
@@ -347,7 +341,6 @@ awt::Point SAL_CALL
 
 awt::Point SAL_CALL
     AccessibleDocumentViewBase::getLocationOnScreen()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     ::Point aLogicalPoint (maShapeTreeInfo.GetViewForwarder()->GetVisibleArea().TopLeft());
@@ -357,7 +350,6 @@ awt::Point SAL_CALL
 
 awt::Size SAL_CALL
     AccessibleDocumentViewBase::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -379,7 +371,6 @@ awt::Size SAL_CALL
 
 uno::Any SAL_CALL
     AccessibleDocumentViewBase::queryInterface (const uno::Type & rType)
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aReturn = AccessibleContextBase::queryInterface (rType);
     if ( ! aReturn.hasValue())
@@ -415,14 +406,12 @@ void SAL_CALL
 
 OUString SAL_CALL
     AccessibleDocumentViewBase::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessibleDocumentViewBase");
 }
 
 css::uno::Sequence< OUString> SAL_CALL
     AccessibleDocumentViewBase::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     return AccessibleContextBase::getSupportedServiceNames ();
@@ -432,7 +421,6 @@ css::uno::Sequence< OUString> SAL_CALL
 
 css::uno::Sequence< css::uno::Type> SAL_CALL
     AccessibleDocumentViewBase::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -526,7 +514,6 @@ void AccessibleDocumentViewBase::impl_dispose()
 
 void SAL_CALL
     AccessibleDocumentViewBase::disposing (const lang::EventObject& rEventObject)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -546,7 +533,6 @@ void SAL_CALL
 //=====  XPropertyChangeListener  =============================================
 
 void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyChangeEvent& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     // Empty
 }
@@ -555,7 +541,6 @@ void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyC
 
 void SAL_CALL
     AccessibleDocumentViewBase::windowResized (const css::awt::WindowEvent& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     if( IsDisposed() )
         return;
@@ -565,7 +550,6 @@ void SAL_CALL
 
 void SAL_CALL
     AccessibleDocumentViewBase::windowMoved (const css::awt::WindowEvent& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     if( IsDisposed() )
         return;
@@ -575,7 +559,6 @@ void SAL_CALL
 
 void SAL_CALL
     AccessibleDocumentViewBase::windowShown (const css::lang::EventObject& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     if( IsDisposed() )
         return;
@@ -585,7 +568,6 @@ void SAL_CALL
 
 void SAL_CALL
     AccessibleDocumentViewBase::windowHidden (const css::lang::EventObject& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     if( IsDisposed() )
         return;
@@ -596,7 +578,6 @@ void SAL_CALL
 //=====  XFocusListener  ==================================================
 
 void AccessibleDocumentViewBase::focusGained (const css::awt::FocusEvent& e)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     if (e.Source == mxWindow)
@@ -604,7 +585,6 @@ void AccessibleDocumentViewBase::focusGained (const css::awt::FocusEvent& e)
 }
 
 void AccessibleDocumentViewBase::focusLost (const css::awt::FocusEvent& e)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     if (e.Source == mxWindow)
@@ -624,7 +604,6 @@ void SAL_CALL AccessibleDocumentViewBase::disposing()
 /// Create a name for this view.
 OUString
     AccessibleDocumentViewBase::CreateAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString ("AccessibleDocumentViewBase");
 }
@@ -634,7 +613,6 @@ OUString
 */
 OUString
     AccessibleDocumentViewBase::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString sDescription;
 
@@ -702,7 +680,6 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject (
 // return ourself as context in default case
 uno::Reference< XAccessibleContext >
     AccessibleDocumentViewBase::implGetAccessibleContext()
-    throw (uno::RuntimeException)
 {
     return this;
 }
@@ -710,7 +687,6 @@ uno::Reference< XAccessibleContext >
 // return sal_False in default case
 bool
     AccessibleDocumentViewBase::implIsSelected( sal_Int32 )
-    throw (uno::RuntimeException)
 {
     return false;
 }
@@ -718,14 +694,10 @@ bool
 // return nothing in default case
 void
     AccessibleDocumentViewBase::implSelect( sal_Int32, bool )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
 }
 
 uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -850,7 +822,6 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
 
 css::uno::Sequence< css::uno::Any >
         SAL_CALL AccessibleDocumentViewBase::getAccFlowTo(const css::uno::Any&, sal_Int32 )
-        throw ( css::uno::RuntimeException, std::exception )
 {
     css::uno::Sequence< uno::Any> aRet;
 
@@ -858,13 +829,11 @@ css::uno::Sequence< css::uno::Any >
 }
 
 sal_Int32 SAL_CALL AccessibleDocumentViewBase::getForeground(  )
-        throw (uno::RuntimeException, std::exception)
 {
     return COL_BLACK;
 }
 
 sal_Int32 SAL_CALL AccessibleDocumentViewBase::getBackground(  )
-        throw (uno::RuntimeException, std::exception)
 {
      ThrowIfDisposed ();
     ::osl::MutexGuard aGuard (maMutex);
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 1f18b700547e..0e43dede5120 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -185,7 +185,6 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh
 
 sal_Int32 SAL_CALL
     AccessibleDrawDocumentView::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -200,7 +199,6 @@ sal_Int32 SAL_CALL
 
 uno::Reference<XAccessible> SAL_CALL
     AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex)
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -234,7 +232,6 @@ uno::Reference<XAccessible> SAL_CALL
 
 OUString SAL_CALL
     AccessibleDrawDocumentView::getAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -272,7 +269,6 @@ OUString SAL_CALL
 
 void SAL_CALL
     AccessibleDrawDocumentView::disposing (const lang::EventObject& rEventObject)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -290,7 +286,6 @@ void SAL_CALL
 
 void SAL_CALL
     AccessibleDrawDocumentView::propertyChange (const beans::PropertyChangeEvent& rEventObject)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -382,14 +377,12 @@ void SAL_CALL
 
 OUString SAL_CALL
     AccessibleDrawDocumentView::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessibleDrawDocumentView");
 }
 
 css::uno::Sequence< OUString> SAL_CALL
     AccessibleDrawDocumentView::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // Get list of supported service names from base class...
@@ -408,7 +401,6 @@ css::uno::Sequence< OUString> SAL_CALL
 
 uno::Any SAL_CALL
     AccessibleDrawDocumentView::queryInterface (const uno::Type & rType)
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aReturn = AccessibleDocumentViewBase::queryInterface (rType);
     if ( ! aReturn.hasValue())
@@ -433,7 +425,6 @@ void SAL_CALL
 //=====  XAccessibleGroupPosition  =========================================
 uno::Sequence< sal_Int32 > SAL_CALL
     AccessibleDrawDocumentView::getGroupPosition( const uno::Any& rAny )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -507,7 +498,6 @@ uno::Sequence< sal_Int32 > SAL_CALL
 }
 
 OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -541,7 +531,6 @@ OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny )
 
 /// Create a name for this view.
 OUString AccessibleDrawDocumentView::CreateAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString sName;
 
@@ -594,7 +583,6 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName()
 */
 OUString
     AccessibleDrawDocumentView::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString sDescription;
 
@@ -646,7 +634,6 @@ OUString
 */
 bool
     AccessibleDrawDocumentView::implIsSelected( sal_Int32 nAccessibleChildIndex )
-    throw (uno::RuntimeException)
 {
     const SolarMutexGuard aSolarGuard;
     uno::Reference< view::XSelectionSupplier >  xSel( mxController, uno::UNO_QUERY );
@@ -688,7 +675,6 @@ bool
 */
 void
     AccessibleDrawDocumentView::implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     const SolarMutexGuard aSolarGuard;
     uno::Reference< view::XSelectionSupplier >  xSel( mxController, uno::UNO_QUERY );
@@ -828,7 +814,6 @@ void SAL_CALL AccessibleDrawDocumentView::disposing()
 
 css::uno::Sequence< css::uno::Any >
         SAL_CALL AccessibleDrawDocumentView::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
-        throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index a3280ece0c2b..0d627e3b99fd 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -113,7 +113,6 @@ void AccessibleOutlineView::ViewForwarderChanged()
 
 sal_Int32 SAL_CALL
     AccessibleOutlineView::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -123,7 +122,6 @@ sal_Int32 SAL_CALL
 
 uno::Reference<XAccessible> SAL_CALL
     AccessibleOutlineView::getAccessibleChild (sal_Int32 nIndex)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     // Forward request to children manager.
@@ -132,7 +130,6 @@ uno::Reference<XAccessible> SAL_CALL
 
 OUString SAL_CALL
     AccessibleOutlineView::getAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -160,7 +157,7 @@ OUString SAL_CALL
 
 //=====  XAccessibleEventBroadcaster  ========================================
 
-void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
 {
     // delegate listener handling to children manager.
     if ( ! IsDisposed())
@@ -168,7 +165,7 @@ void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const uno::Refe
     AccessibleContextBase::addEventListener(xListener);
 }
 
-void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
 {
     // forward
     if ( ! IsDisposed())
@@ -180,7 +177,6 @@ void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::R
 
 OUString SAL_CALL
     AccessibleOutlineView::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessibleOutlineView");
 }
@@ -217,7 +213,6 @@ void SAL_CALL AccessibleOutlineView::disposing()
 
 void SAL_CALL
     AccessibleOutlineView::propertyChange (const beans::PropertyChangeEvent& rEventObject)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -245,7 +240,6 @@ void SAL_CALL
 /// Create a name for this view.
 OUString
     AccessibleOutlineView::CreateAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -257,7 +251,6 @@ OUString
 */
 OUString
     AccessibleOutlineView::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index 1ab3529fc997..643bc125925b 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -57,7 +57,6 @@ AccessiblePageShape::~AccessiblePageShape()
 
 sal_Int32 SAL_CALL
        AccessiblePageShape::getAccessibleChildCount()
-    throw (std::exception)
 {
     return 0;
 }
@@ -67,7 +66,6 @@ sal_Int32 SAL_CALL
 */
 uno::Reference<XAccessible> SAL_CALL
     AccessiblePageShape::getAccessibleChild( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     throw lang::IndexOutOfBoundsException ("page shape has no children",
         static_cast<uno::XWeak*>(this));
@@ -76,7 +74,6 @@ uno::Reference<XAccessible> SAL_CALL
 //=====  XAccessibleComponent  ================================================
 
 awt::Rectangle SAL_CALL AccessiblePageShape::getBounds()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -138,7 +135,6 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds()
 }
 
 sal_Int32 SAL_CALL AccessiblePageShape::getForeground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     sal_Int32 nColor (0x0ffffffL);
@@ -164,7 +160,6 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground()
     draw page or its master page.
 */
 sal_Int32 SAL_CALL AccessiblePageShape::getBackground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     sal_Int32 nColor (0x01020ffL);
@@ -213,7 +208,6 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground()
 
 OUString SAL_CALL
     AccessiblePageShape::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     return OUString("AccessiblePageShape");
@@ -221,7 +215,6 @@ OUString SAL_CALL
 
 css::uno::Sequence< OUString> SAL_CALL
     AccessiblePageShape::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     return AccessibleShape::getSupportedServiceNames();
@@ -231,7 +224,6 @@ css::uno::Sequence< OUString> SAL_CALL
 
 void SAL_CALL
     AccessiblePageShape::disposing (const css::lang::EventObject& aEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     AccessibleShape::disposing (aEvent);
@@ -240,7 +232,6 @@ void SAL_CALL
 //=====  XComponent  ==========================================================
 
 void AccessiblePageShape::dispose()
-    throw (css::uno::RuntimeException, std::exception)
 {
     // Unregister listeners.
     Reference<lang::XComponent> xComponent (mxShape, uno::UNO_QUERY);
@@ -258,14 +249,12 @@ void AccessiblePageShape::dispose()
 
 OUString
     AccessiblePageShape::CreateAccessibleBaseName()
-    throw (css::uno::RuntimeException)
 {
     return OUString ("PageShape");
 }
 
 OUString
     AccessiblePageShape::CreateAccessibleName()
-    throw (css::uno::RuntimeException)
 {
     Reference<beans::XPropertySet> xPageProperties (mxPage, UNO_QUERY);
 
@@ -287,7 +276,6 @@ OUString
 
 OUString
     AccessiblePageShape::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException)
 {
     return OUString ("Page Shape");
 }
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index fcda6c8ad698..67d9bc73533c 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -46,7 +46,6 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape()
 
 OUString SAL_CALL
     AccessiblePresentationGraphicShape::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessiblePresentationGraphicShape");
 }
@@ -54,7 +53,6 @@ OUString SAL_CALL
 /// Set this object's name if is different to the current name.
 OUString
     AccessiblePresentationGraphicShape::CreateAccessibleBaseName()
-    throw (css::uno::RuntimeException)
 {
     OUString sName;
 
@@ -76,7 +74,6 @@ OUString
 
 OUString
     AccessiblePresentationGraphicShape::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     //    return createAccessibleName ();
     DescriptionGenerator aDG (mxShape);
@@ -100,7 +97,6 @@ OUString
 }
 
 sal_Int16 SAL_CALL AccessiblePresentationGraphicShape::getAccessibleRole ()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return  AccessibleRole::GRAPHIC ;
 }
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index 2a341a20af48..0cfc2e52f120 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -46,7 +46,6 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape()
 
 OUString SAL_CALL
     AccessiblePresentationOLEShape::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessiblePresentationOLEShape");
 }
@@ -54,7 +53,6 @@ OUString SAL_CALL
 /// Set this object's name if it is different to the current name.
 OUString
     AccessiblePresentationOLEShape::CreateAccessibleBaseName()
-    throw (css::uno::RuntimeException)
 {
     OUString sName;
 
@@ -82,7 +80,6 @@ OUString
 
 OUString
     AccessiblePresentationOLEShape::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     //    return createAccessibleName();
     DescriptionGenerator aDG (mxShape);
@@ -119,7 +116,6 @@ OUString
 
 //  Return this object's role.
 sal_Int16 SAL_CALL AccessiblePresentationOLEShape::getAccessibleRole ()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return  AccessibleRole::EMBEDDED_OBJECT ;
 }
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index e2906a6d6bd6..410b3cd2e664 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -48,14 +48,12 @@ AccessiblePresentationShape::~AccessiblePresentationShape()
 
 OUString SAL_CALL
     AccessiblePresentationShape::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessiblePresentationShape");
 }
 
 /// Set this object's name if is different to the current name.
 OUString AccessiblePresentationShape::CreateAccessibleBaseName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString sName;
 
@@ -104,7 +102,6 @@ OUString AccessiblePresentationShape::CreateAccessibleBaseName()
 
 OUString
     AccessiblePresentationShape::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     //    return createAccessibleName ();
     DescriptionGenerator aDG (mxShape);
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 04d43dd2f11c..22eeb2160eea 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -99,7 +99,6 @@ void SAL_CALL AccessibleSlideSorterObject::disposing()
 
 Reference<XAccessibleContext> SAL_CALL
     AccessibleSlideSorterObject::getAccessibleContext()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return this;
@@ -108,28 +107,24 @@ Reference<XAccessibleContext> SAL_CALL
 //===== XAccessibleContext ====================================================
 
 sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return 0;
 }
 
 Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     throw lang::IndexOutOfBoundsException();
 }
 
 Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxParent;
 }
 
 sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -155,7 +150,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent()
 }
 
 sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     //set Role = Shape
@@ -165,14 +159,12 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole()
 }
 
 OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return SD_RESSTR(STR_PAGE);
 }
 
 OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -186,7 +178,6 @@ OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName()
 
 Reference<XAccessibleRelationSet> SAL_CALL
     AccessibleSlideSorterObject::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return Reference<XAccessibleRelationSet>();
@@ -194,7 +185,6 @@ Reference<XAccessibleRelationSet> SAL_CALL
 
 Reference<XAccessibleStateSet> SAL_CALL
     AccessibleSlideSorterObject::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -223,8 +213,6 @@ Reference<XAccessibleStateSet> SAL_CALL
 }
 
 lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale()
-    throw (IllegalAccessibleComponentStateException,
-        RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // Delegate request to parent.
@@ -244,7 +232,6 @@ lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale()
 
 void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener(
     const Reference<XAccessibleEventListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     if (rxListener.is())
     {
@@ -266,7 +253,6 @@ void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener(
 
 void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener(
     const Reference<XAccessibleEventListener>& rxListener)
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (rxListener.is() && mnClientId)
@@ -289,7 +275,6 @@ void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener(
 //===== XAccessibleComponent ==================================================
 
 sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& aPoint)
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const awt::Size aSize (getSize());
@@ -301,13 +286,11 @@ sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& a
 
 Reference<XAccessible> SAL_CALL
     AccessibleSlideSorterObject::getAccessibleAtPoint(const awt::Point& )
-    throw (uno::RuntimeException, std::exception)
 {
     return nullptr;
 }
 
 awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -341,7 +324,6 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds()
 }
 
 awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation ()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     const awt::Rectangle aBBox (getBounds());
@@ -349,7 +331,6 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation ()
 }
 
 awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -372,7 +353,6 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen()
 }
 
 awt::Size SAL_CALL AccessibleSlideSorterObject::getSize()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     const awt::Rectangle aBBox (getBounds());
@@ -380,13 +360,11 @@ awt::Size SAL_CALL AccessibleSlideSorterObject::getSize()
 }
 
 void SAL_CALL AccessibleSlideSorterObject::grabFocus()
-    throw (RuntimeException, std::exception)
 {
     // nothing to do
 }
 
 sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     svtools::ColorConfig aColorConfig;
@@ -395,7 +373,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground()
 }
 
 sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
@@ -405,20 +382,17 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground()
 // XServiceInfo
 OUString SAL_CALL
        AccessibleSlideSorterObject::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessibleSlideSorterObject");
 }
 
 sal_Bool SAL_CALL AccessibleSlideSorterObject::supportsService (const OUString& sServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 uno::Sequence< OUString> SAL_CALL
        AccessibleSlideSorterObject::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -429,7 +403,6 @@ uno::Sequence< OUString> SAL_CALL
 }
 
 void AccessibleSlideSorterObject::ThrowIfDisposed()
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index de4949ef0403..d4225e6f5e4b 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -183,7 +183,6 @@ void AccessibleSlideSorterView::Destroyed()
 
 Reference<XAccessibleContext > SAL_CALL
     AccessibleSlideSorterView::getAccessibleContext()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     return this;
@@ -192,7 +191,6 @@ Reference<XAccessibleContext > SAL_CALL
 //=====  XAccessibleContext  ==================================================
 
 sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard (maMutex);
@@ -201,7 +199,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount()
 
 Reference<XAccessible > SAL_CALL
     AccessibleSlideSorterView::getAccessibleChild (sal_Int32 nIndex)
-    throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard (maMutex);
@@ -213,7 +210,6 @@ Reference<XAccessible > SAL_CALL
 }
 
 Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -230,7 +226,6 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent(
 }
 
 sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent()
-    throw (uno::RuntimeException, std::exception)
 {
     OSL_ASSERT(getAccessibleParent().is());
     ThrowIfDisposed();
@@ -254,7 +249,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent()
 }
 
 sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     static sal_Int16 nRole = AccessibleRole::DOCUMENT;
@@ -262,7 +256,6 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole()
 }
 
 OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
@@ -271,7 +264,6 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription()
 }
 
 OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
@@ -281,14 +273,12 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName()
 
 Reference<XAccessibleRelationSet> SAL_CALL
     AccessibleSlideSorterView::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     return Reference<XAccessibleRelationSet>();
 }
 
 Reference<XAccessibleStateSet > SAL_CALL
     AccessibleSlideSorterView::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -312,8 +302,6 @@ Reference<XAccessibleStateSet > SAL_CALL
 }
 
 lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale()
-    throw (IllegalAccessibleComponentStateException,
-        RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     Reference<XAccessibleContext> xParentContext;
@@ -330,7 +318,6 @@ lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale()
 
 void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener(
     const Reference<XAccessibleEventListener >& rxListener)
-    throw (RuntimeException, std::exception)
 {
     if (rxListener.is())
     {
@@ -352,7 +339,6 @@ void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener(
 
 void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener(
     const Reference<XAccessibleEventListener >& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (rxListener.is())
@@ -379,7 +365,6 @@ void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener(
 //===== XAccessibleComponent ==================================================
 
 sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aPoint)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const awt::Rectangle aBBox (getBounds());
@@ -391,7 +376,6 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aP
 
 Reference<XAccessible> SAL_CALL
     AccessibleSlideSorterView::getAccessibleAtPoint (const awt::Point& aPoint)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     Reference<XAccessible> xAccessible;
@@ -408,7 +392,6 @@ Reference<XAccessible> SAL_CALL
 }
 
 awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -429,7 +412,6 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds()
 }
 
 awt::Point SAL_CALL AccessibleSlideSorterView::getLocation()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     awt::Point aLocation;
@@ -448,7 +430,6 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocation()
     and our own relative location.
 */
 awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -471,7 +452,6 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen()
 }
 
 awt::Size SAL_CALL AccessibleSlideSorterView::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     awt::Size aSize;
@@ -487,7 +467,6 @@ awt::Size SAL_CALL AccessibleSlideSorterView::getSize()
 }
 
 void SAL_CALL AccessibleSlideSorterView::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -497,7 +476,6 @@ void SAL_CALL AccessibleSlideSorterView::grabFocus()
 }
 
 sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     svtools::ColorConfig aColorConfig;
@@ -506,7 +484,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground()
 }
 
 sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
@@ -516,8 +493,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground()
 //===== XAccessibleSelection ==================================================
 
 void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChildIndex)
-    throw (lang::IndexOutOfBoundsException,
-        RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -530,8 +505,6 @@ void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChild
 }
 
 sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int32 nChildIndex)
-    throw (lang::IndexOutOfBoundsException,
-        RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     bool bIsSelected = false;
@@ -548,7 +521,6 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3
 }
 
 void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -557,7 +529,6 @@ void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection()
 }
 
 void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -566,7 +537,6 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren()
 }
 
 sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     const SolarMutexGuard aSolarGuard;
@@ -575,7 +545,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount()
 
 Reference<XAccessible > SAL_CALL
     AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int32 nSelectedChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     const SolarMutexGuard aSolarGuard;
@@ -603,8 +572,6 @@ Reference<XAccessible > SAL_CALL
 }
 
 void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChildIndex)
-    throw (lang::IndexOutOfBoundsException,
-        RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -619,20 +586,17 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi
 // XServiceInfo
 OUString SAL_CALL
        AccessibleSlideSorterView::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessibleSlideSorterView");
 }
 
 sal_Bool SAL_CALL AccessibleSlideSorterView::supportsService (const OUString& sServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 uno::Sequence< OUString> SAL_CALL
        AccessibleSlideSorterView::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -644,7 +608,6 @@ uno::Sequence< OUString> SAL_CALL
 }
 
 void AccessibleSlideSorterView::ThrowIfDisposed()
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index a05b01182ce4..b793469b6c8d 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -1161,7 +1161,7 @@ SdrObjClosedKind MotionPathTag::GetMarkedObjectsClosedState() const
 }
 
 // XChangesListener
-void SAL_CALL MotionPathTag::changesOccurred( const ChangesEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL MotionPathTag::changesOccurred( const ChangesEvent& /*Event*/ )
 {
     if( mpPathObj && !mbInUpdatePath && (mpEffect->getPath() != msLastPath) )
     {
@@ -1174,13 +1174,13 @@ void SAL_CALL MotionPathTag::changesOccurred( const ChangesEvent& /*Event*/ ) th
     }
 }
 
-void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ )
 {
     if( mpPathObj )
         Dispose();
 }
 
-Any SAL_CALL MotionPathTag::queryInterface( const css::uno::Type& aType ) throw (RuntimeException, std::exception)
+Any SAL_CALL MotionPathTag::queryInterface( const css::uno::Type& aType )
 {
     if( aType == cppu::UnoType<XChangesListener>::get() )
         return Any( Reference< XChangesListener >( this ) );
diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx
index bfd035d034c3..ebb6a55c8a71 100644
--- a/sd/source/ui/animations/motionpathtag.hxx
+++ b/sd/source/ui/animations/motionpathtag.hxx
@@ -85,9 +85,9 @@ public:
     bool OnMove( const KeyEvent& rKEvt );
 
     // XChangesListener
-    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw () override;
     virtual void SAL_CALL release(  ) throw () override;
 
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index f2fcd2ce7112..2c75dff8bf4a 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -231,7 +231,7 @@ void SAL_CALL AnnotationManagerImpl::disposing ()
 }
 
 // XEventListener
-void SAL_CALL AnnotationManagerImpl::notifyEvent( const css::document::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AnnotationManagerImpl::notifyEvent( const css::document::EventObject& aEvent )
 {
     if( aEvent.EventName == "OnAnnotationInserted" || aEvent.EventName == "OnAnnotationRemoved" || aEvent.EventName == "OnAnnotationChanged" )
     {
@@ -239,7 +239,7 @@ void SAL_CALL AnnotationManagerImpl::notifyEvent( const css::document::EventObje
     }
 }
 
-void SAL_CALL AnnotationManagerImpl::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AnnotationManagerImpl::disposing( const css::lang::EventObject& /*Source*/ )
 {
 }
 
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 04ceb976e5c0..b860118cfdd5 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -58,8 +58,8 @@ public:
     virtual void SAL_CALL disposing () override;
 
     // XEventListener
-    virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     void ExecuteAnnotation (SfxRequest& rRequest);
     void GetAnnotationState (SfxItemSet& rItemSet);
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 796974590294..4e512d410aa2 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -740,7 +740,7 @@ void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmar
     }
 }
 
-sal_Int64 SAL_CALL SdTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL SdTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
 
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index a0e848a39b65..c6e695ed9ada 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -37,12 +37,11 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     void setToolboxItemImage( sal_uInt16 nImage );
 
@@ -228,7 +227,6 @@ DisplayModeController::DisplayModeController( const css::uno::Reference< css::un
 }
 
 void SAL_CALL DisplayModeController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( aArguments );
     ToolBox* pToolBox = nullptr;
@@ -264,12 +262,12 @@ void DisplayModeController::setToolboxItemImage( sal_uInt16 nImage )
 
 // XServiceInfo
 
-OUString SAL_CALL DisplayModeController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL DisplayModeController::getImplementationName()
 {
     return OUString( "com.sun.star.comp.sd.DisplayModeController" );
 }
 
-Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames(  ) throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames(  )
 {
     css::uno::Sequence<OUString> aRet { "com.sun.star.frame.ToolbarController" };
     return aRet;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index acdad1d98c82..ea56c4a8b6ac 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -309,26 +309,26 @@ void LayoutToolbarMenu::SelectHdl(void* pControl)
 }
 
 /// @throws css::uno::RuntimeException
-OUString SlideLayoutController_getImplementationName() throw (css::uno::RuntimeException)
+OUString SlideLayoutController_getImplementationName()
 {
     return OUString( "com.sun.star.comp.sd.SlideLayoutController" );
 }
 
 /// @throws RuntimeException
-Sequence< OUString >  SlideLayoutController_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString >  SlideLayoutController_getSupportedServiceNames()
 {
     Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 /// @throws css::uno::RuntimeException
-OUString InsertSlideController_getImplementationName() throw (css::uno::RuntimeException)
+OUString InsertSlideController_getImplementationName()
 {
     return OUString( "com.sun.star.comp.sd.InsertSlideController" );
 }
 
 /// @throws RuntimeException
-Sequence< OUString >  InsertSlideController_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString >  InsertSlideController_getSupportedServiceNames()
 {
     Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
@@ -343,7 +343,6 @@ SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentCo
 }
 
 void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( aArguments );
 
@@ -365,7 +364,7 @@ VclPtr<vcl::Window> SlideLayoutController::createPopupWindow( vcl::Window* pPare
 
 // XServiceInfo
 
-OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SlideLayoutController::getImplementationName()
 {
     if( mbInsertPage )
         return InsertSlideController_getImplementationName();
@@ -373,7 +372,7 @@ OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeE
         return SlideLayoutController_getImplementationName();
 }
 
-Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames(  ) throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames(  )
 {
     if( mbInsertPage )
         return InsertSlideController_getSupportedServiceNames();
diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx
index f9a6d21e5a47..b81e30af6dcb 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.hxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.hxx
@@ -35,12 +35,11 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     using svt::PopupWindowController::createPopupWindow;
 private:
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index bef35545c845..fcb8cca4c0ba 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -51,7 +51,6 @@ ClientBoxEntry::~ClientBoxEntry()
 {}
 
 void ClientRemovedListener::disposing( lang::EventObject const & rEvt )
-    throw ( uno::RuntimeException, std::exception )
 {
     (void) rEvt;
 }
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index d6ffe9dc7f49..597c9e4fca45 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -80,8 +80,7 @@ public:
     virtual ~ClientRemovedListener() override;
 
     // XEventListener
-    virtual void SAL_CALL disposing(css::lang::EventObject const & evt)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(css::lang::EventObject const & evt) override;
 };
 
 class ClientBox : public Control
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index c0be5330c245..c1c6bab04031 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -139,7 +139,7 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction )
     SdTransferable::DragFinished(nDropAction);
 }
 
-sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
 
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 710687da1290..4909a8ee1a5d 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -90,7 +90,6 @@ void SAL_CALL Configuration::disposing()
 //----- XConfiguration --------------------------------------------------------
 
 void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResourceId)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -108,7 +107,6 @@ void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResour
 }
 
 void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxResourceId)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -130,7 +128,6 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources (
     const Reference<XResourceId>& rxAnchorId,
     const OUString& rsResourceURLPrefix,
     AnchorBindingMode eMode)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -172,7 +169,6 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources (
 }
 
 sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxResourceId)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -184,7 +180,6 @@ sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxRe
 //----- XCloneable ------------------------------------------------------------
 
 Reference<util::XCloneable> SAL_CALL Configuration::createClone()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -200,7 +195,6 @@ Reference<util::XCloneable> SAL_CALL Configuration::createClone()
 //----- XNamed ----------------------------------------------------------------
 
 OUString SAL_CALL Configuration::getName()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     OUString aString;
@@ -224,26 +218,22 @@ OUString SAL_CALL Configuration::getName()
 }
 
 void SAL_CALL Configuration::setName (const OUString& rsName)
-    throw (RuntimeException, std::exception)
 {
     (void)rsName; // rsName is ignored.
 }
 
 OUString Configuration::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString(
         "com.sun.star.comp.Draw.framework.configuration.Configuration");
 }
 
 sal_Bool Configuration::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> Configuration::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.drawing.framework.Configuration"};
@@ -276,7 +266,6 @@ void Configuration::PostEvent (
 }
 
 void Configuration::ThrowIfDisposed() const
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index daec78bc54cd..a9d451a8d4dd 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -170,7 +170,6 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener (
     const Reference<XConfigurationChangeListener>& rxListener,
     const OUString& rsEventType,
     const Any& rUserData)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -181,7 +180,6 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener (
 
 void SAL_CALL ConfigurationController::removeConfigurationChangeListener (
     const Reference<XConfigurationChangeListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -191,7 +189,6 @@ void SAL_CALL ConfigurationController::removeConfigurationChangeListener (
 
 void SAL_CALL ConfigurationController::notifyEvent (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mpImplementation->mpBroadcaster->NotifyListeners(rEvent);
@@ -200,7 +197,6 @@ void SAL_CALL ConfigurationController::notifyEvent (
 //----- XConfigurationController ----------------------------------------------
 
 void SAL_CALL ConfigurationController::lock()
-    throw (RuntimeException, std::exception)
 {
     OSL_ASSERT(mpImplementation.get()!=nullptr);
     OSL_ASSERT(mpImplementation->mpConfigurationUpdater.get()!=nullptr);
@@ -215,7 +211,6 @@ void SAL_CALL ConfigurationController::lock()
 }
 
 void SAL_CALL ConfigurationController::unlock()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -233,7 +228,6 @@ void SAL_CALL ConfigurationController::unlock()
 void SAL_CALL ConfigurationController::requestResourceActivation (
     const Reference<XResourceId>& rxResourceId,
     ResourceActivationMode eMode)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
        ThrowIfDisposed();
@@ -291,7 +285,6 @@ void SAL_CALL ConfigurationController::requestResourceActivation (
 
 void SAL_CALL ConfigurationController::requestResourceDeactivation (
     const Reference<XResourceId>& rxResourceId)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -329,7 +322,6 @@ void SAL_CALL ConfigurationController::requestResourceDeactivation (
 
 Reference<XResource> SAL_CALL ConfigurationController::getResource (
     const Reference<XResourceId>& rxResourceId)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -340,7 +332,6 @@ Reference<XResource> SAL_CALL ConfigurationController::getResource (
 }
 
 void SAL_CALL ConfigurationController::update()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -359,7 +350,6 @@ void SAL_CALL ConfigurationController::update()
 }
 
 sal_Bool SAL_CALL ConfigurationController::hasPendingRequests()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -369,7 +359,6 @@ sal_Bool SAL_CALL ConfigurationController::hasPendingRequests()
 
 void SAL_CALL ConfigurationController::postChangeRequest (
     const Reference<XConfigurationChangeRequest>& rxRequest)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -378,7 +367,6 @@ void SAL_CALL ConfigurationController::postChangeRequest (
 }
 
 Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -391,7 +379,6 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfigur
 }
 
 Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -409,7 +396,6 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfigurat
 */
 void SAL_CALL ConfigurationController::restoreConfiguration (
     const Reference<XConfiguration>& rxNewConfiguration)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -470,7 +456,6 @@ void SAL_CALL ConfigurationController::restoreConfiguration (
 void SAL_CALL ConfigurationController::addResourceFactory(
     const OUString& sResourceURL,
     const Reference<XResourceFactory>& rxResourceFactory)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -479,7 +464,6 @@ void SAL_CALL ConfigurationController::addResourceFactory(
 
 void SAL_CALL ConfigurationController::removeResourceFactoryForURL(
     const OUString& sResourceURL)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -488,7 +472,6 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForURL(
 
 void SAL_CALL ConfigurationController::removeResourceFactoryForReference(
     const Reference<XResourceFactory>& rxResourceFactory)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -497,7 +480,6 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForReference(
 
 Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory (
     const OUString& sResourceURL)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -508,7 +490,6 @@ Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory
 //----- XInitialization -------------------------------------------------------
 
 void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -523,7 +504,6 @@ void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArgumen
 }
 
 void ConfigurationController::ThrowIfDisposed () const
-    throw (css::lang::DisposedException, css::uno::RuntimeException)
 {
     if (mbIsDisposed)
     {
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
index 090eed3cf4fe..770b6c414db9 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -29,7 +29,7 @@ namespace sd { namespace framework {
 
 GenericConfigurationChangeRequest::GenericConfigurationChangeRequest (
     const Reference<XResourceId>& rxResourceId,
-    const Mode eMode) throw(css::lang::IllegalArgumentException)
+    const Mode eMode)
     : GenericConfigurationChangeRequestInterfaceBase(MutexOwner::maMutex),
       mxResourceId(rxResourceId),
       meMode(eMode)
@@ -44,7 +44,6 @@ GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest() throw()
 
 void SAL_CALL GenericConfigurationChangeRequest::execute (
     const Reference<XConfiguration>& rxConfiguration)
-    throw (RuntimeException, std::exception)
 {
     if (rxConfiguration.is())
     {
@@ -62,7 +61,6 @@ void SAL_CALL GenericConfigurationChangeRequest::execute (
 }
 
 OUString SAL_CALL GenericConfigurationChangeRequest::getName()
-    throw (RuntimeException, std::exception)
 {
     return "GenericConfigurationChangeRequest "
         + (meMode==Activation ? OUString("activate ") : OUString("deactivate "))
@@ -70,7 +68,6 @@ OUString SAL_CALL GenericConfigurationChangeRequest::getName()
 }
 
 void SAL_CALL GenericConfigurationChangeRequest::setName (const OUString& rsName)
-    throw (RuntimeException, std::exception)
 {
     (void)rsName;
     // Ignored.
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
index 9582cdb4169d..ba0366d16127 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
@@ -64,8 +64,7 @@ public:
     GenericConfigurationChangeRequest (
         const css::uno::Reference<css::drawing::framework::XResourceId>&
             rxResourceId,
-        const Mode eMode)
-        throw (css::lang::IllegalArgumentException);
+        const Mode eMode);
 
     virtual ~GenericConfigurationChangeRequest() throw() override;
 
@@ -79,22 +78,19 @@ public:
             The configuration to which the requested change is made.
     */
     virtual void SAL_CALL execute (
-        const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration) override;
 
     // XNamed
 
     /** Return a human readable string representation.  This is used for
         debugging purposes.
     */
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
 
     /** This call is ignored because the XNamed interface is (mis)used to
         give access to a human readable name for debugging purposes.
     */
-    virtual void SAL_CALL setName (const OUString& rName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setName (const OUString& rName) override;
 
 private:
     const css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId;
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index fa4f94a50a81..29a157d7fd12 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -58,7 +58,6 @@ ResourceFactoryManager::~ResourceFactoryManager()
 void ResourceFactoryManager::AddFactory (
     const OUString& rsURL,
     const Reference<XResourceFactory>& rxFactory)
-        throw (RuntimeException)
 {
     if ( ! rxFactory.is())
         throw lang::IllegalArgumentException();
@@ -92,7 +91,6 @@ void ResourceFactoryManager::AddFactory (
 
 void ResourceFactoryManager::RemoveFactoryForURL (
     const OUString& rsURL)
-    throw (RuntimeException)
 {
     if (rsURL.isEmpty())
         throw lang::IllegalArgumentException();
@@ -124,7 +122,6 @@ void ResourceFactoryManager::RemoveFactoryForURL (
 
 void ResourceFactoryManager::RemoveFactoryForReference(
     const Reference<XResourceFactory>& rxFactory)
-    throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -153,7 +150,6 @@ void ResourceFactoryManager::RemoveFactoryForReference(
 
 Reference<XResourceFactory> ResourceFactoryManager::GetFactory (
     const OUString& rsCompleteURL)
-    throw (RuntimeException)
 {
     OUString sURLBase (rsCompleteURL);
     if (mxURLTransformer.is())
@@ -184,7 +180,6 @@ Reference<XResourceFactory> ResourceFactoryManager::GetFactory (
 }
 
 Reference<XResourceFactory> ResourceFactoryManager::FindFactory (const OUString& rsURLBase)
-    throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard (maMutex);
     FactoryMap::const_iterator iFactory (maFactoryMap.find(rsURLBase));
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
index c6ab5c9a09ad..ed0370107d98 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx
@@ -53,8 +53,7 @@ public:
     */
     void AddFactory (
         const OUString& rsURL,
-        const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory)
-        throw (css::uno::RuntimeException);
+        const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory);
 
     /** Unregister the specified factory.
         @param rsURL
@@ -63,8 +62,7 @@ public:
         @throws css::uno::RuntimeException
     */
     void RemoveFactoryForURL(
-        const OUString& rsURL)
-        throw (css::uno::RuntimeException);
+        const OUString& rsURL);
 
     /** Unregister the specified factory.
         @param rxFactory
@@ -73,8 +71,7 @@ public:
         @throws css::uno::RuntimeException
     */
     void RemoveFactoryForReference(
-        const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory)
-        throw (css::uno::RuntimeException);
+        const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory);
 
     /** Return a factory that can create resources specified by the given URL.
         @param rsCompleteURL
@@ -86,8 +83,7 @@ public:
         @throws css::uno::RuntimeException
     */
     css::uno::Reference<css::drawing::framework::XResourceFactory> GetFactory (
-        const OUString& rsURL)
-        throw (css::uno::RuntimeException);
+        const OUString& rsURL);
 
 private:
     ::osl::Mutex maMutex;
@@ -116,8 +112,7 @@ private:
         @throws css::uno::RuntimeException
     */
     css::uno::Reference<css::drawing::framework::XResourceFactory> FindFactory (
-        const OUString& rsURLBase)
-        throw (css::uno::RuntimeException);
+        const OUString& rsURLBase);
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 04b354e3c2b4..7eec7882c999 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -109,7 +109,6 @@ ResourceId::~ResourceId()
 
 OUString SAL_CALL
     ResourceId::getResourceURL()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (!maResourceURLs.empty())
         return maResourceURLs[0];
@@ -119,7 +118,6 @@ OUString SAL_CALL
 
 util::URL SAL_CALL
     ResourceId::getFullResourceURL()
- throw(css::uno::RuntimeException, std::exception)
 {
     if (mpURL.get() != nullptr)
         return *mpURL;
@@ -141,14 +139,12 @@ util::URL SAL_CALL
 
 sal_Bool SAL_CALL
     ResourceId::hasAnchor()
-    throw (RuntimeException, std::exception)
 {
     return maResourceURLs.size()>1;
 }
 
 Reference<XResourceId> SAL_CALL
     ResourceId::getAnchor()
-    throw (RuntimeException, std::exception)
 {
     ::rtl::Reference<ResourceId> rResourceId (new ResourceId());
     const sal_Int32 nAnchorCount (maResourceURLs.size()-1);
@@ -163,7 +159,6 @@ Reference<XResourceId> SAL_CALL
 
 Sequence<OUString> SAL_CALL
     ResourceId::getAnchorURLs()
-    throw (RuntimeException, std::exception)
 {
     const sal_Int32 nAnchorCount (maResourceURLs.size() - 1);
     if (nAnchorCount > 0)
@@ -179,7 +174,6 @@ Sequence<OUString> SAL_CALL
 
 OUString SAL_CALL
     ResourceId::getResourceTypePrefix()
-    throw (RuntimeException, std::exception)
 {
     if (!maResourceURLs.empty() )
     {
@@ -201,7 +195,6 @@ OUString SAL_CALL
 
 sal_Int16 SAL_CALL
     ResourceId::compareTo (const Reference<XResourceId>& rxResourceId)
-    throw (RuntimeException, std::exception)
 {
     sal_Int16 nResult (0);
 
@@ -327,7 +320,6 @@ sal_Bool SAL_CALL
     ResourceId::isBoundTo (
         const Reference<XResourceId>& rxResourceId,
         AnchorBindingMode eMode)
-    throw (RuntimeException, std::exception)
 {
     if ( ! rxResourceId.is())
     {
@@ -355,14 +347,12 @@ sal_Bool SAL_CALL
     ResourceId::isBoundToURL (
         const OUString& rsAnchorURL,
         AnchorBindingMode eMode)
-    throw (RuntimeException, std::exception)
 {
     return IsBoundToAnchor(&rsAnchorURL, nullptr, eMode);
 }
 
 Reference<XResourceId> SAL_CALL
     ResourceId::clone()
-    throw(RuntimeException, std::exception)
 {
     return new ResourceId(maResourceURLs);
 }
@@ -370,7 +360,6 @@ Reference<XResourceId> SAL_CALL
 //----- XInitialization -------------------------------------------------------
 
 void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments)
-    throw (RuntimeException, std::exception)
 {
     sal_uInt32 nCount (aArguments.getLength());
     for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex)
@@ -399,19 +388,16 @@ void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments)
 }
 
 OUString ResourceId::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Draw.framework.ResourceId");
 }
 
 sal_Bool ResourceId::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> ResourceId::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.drawing.framework.ResourceId"};
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index 10142f9b1501..fdbb7ca24909 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -38,7 +38,6 @@ UpdateRequest::~UpdateRequest() throw()
 }
 
 void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfiguration)
-    throw (RuntimeException, std::exception)
 {
     (void)rxConfiguration;
     // Do nothing here.  The configuration is updated when the request queue
@@ -46,13 +45,11 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu
 }
 
 OUString SAL_CALL UpdateRequest::getName()
-    throw (RuntimeException, std::exception)
 {
     return OUString("UpdateRequest");
 }
 
 void SAL_CALL UpdateRequest::setName (const OUString& rsName)
-    throw (RuntimeException, std::exception)
 {
     (void)rsName;
     // Ignored.
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx
index 54c11b2878a9..fb2b00e20c8a 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.hxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx
@@ -52,22 +52,19 @@ public:
     // XConfigurationChangeOperation
 
     virtual void SAL_CALL execute (
-        const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration) override;
 
     // XNamed
 
     /** Return a human readable string representation.  This is used for
         debugging purposes.
     */
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
 
     /** This call is ignored because the XNamed interface is (mis)used to
         give access to a human readable name for debugging purposes.
     */
-    virtual void SAL_CALL setName (const OUString& rName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setName (const OUString& rName) override;
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index aa072a15ed88..e94ea93230d2 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -126,7 +126,6 @@ void SAL_CALL BasicPaneFactory::disposing()
 }
 
 void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     if (aArguments.getLength() > 0)
     {
@@ -208,7 +207,6 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments)
 
 Reference<XResource> SAL_CALL BasicPaneFactory::createResource (
     const Reference<XResourceId>& rxPaneId)
-    throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -275,7 +273,6 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource (
 
 void SAL_CALL BasicPaneFactory::releaseResource (
     const Reference<XResource>& rxPane)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -328,7 +325,6 @@ void SAL_CALL BasicPaneFactory::releaseResource (
 
 void SAL_CALL BasicPaneFactory::notifyConfigurationChange (
     const ConfigurationChangeEvent& /* rEvent */ )
-    throw (RuntimeException, std::exception)
 {
     // FIXME: nothing to do
 }
@@ -337,7 +333,6 @@ void SAL_CALL BasicPaneFactory::notifyConfigurationChange (
 
 void SAL_CALL BasicPaneFactory::disposing (
     const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     if (mxConfigurationControllerWeak == rEventObject.Source)
     {
@@ -429,7 +424,6 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane (
 }
 
 void BasicPaneFactory::ThrowIfDisposed() const
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index 82df2a858884..52e333e346ef 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -69,32 +69,27 @@ public:
     // XInitialization
 
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence<css::uno::Any>& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::uno::Any>& aArguments) override;
 
     // XResourceFactory
 
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL createResource (
-            const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
+            const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId) override;
 
     virtual void SAL_CALL
         releaseResource (
-            const css::uno::Reference<css::drawing::framework::XResource>& rxPane)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::drawing::framework::XResource>& rxPane) override;
 
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     // lang::XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEventObject) override;
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
@@ -134,8 +129,7 @@ private:
             const PaneDescriptor& rDescriptor);
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 9efdefb9a820..407310085826 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -71,7 +71,6 @@ void BasicToolBarFactory::Shutdown()
 //----- XInitialization -------------------------------------------------------
 
 void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     if (aArguments.getLength() > 0)
     {
@@ -124,7 +123,6 @@ void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments)
 
 void SAL_CALL BasicToolBarFactory::disposing (
     const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     if (rEventObject.Source == mxConfigurationController)
         mxConfigurationController = nullptr;
@@ -134,7 +132,6 @@ void SAL_CALL BasicToolBarFactory::disposing (
 
 Reference<XResource> SAL_CALL BasicToolBarFactory::createResource (
     const Reference<XResourceId>& rxToolBarId)
-    throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -152,7 +149,6 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource (
 
 void SAL_CALL BasicToolBarFactory::releaseResource (
     const Reference<XResource>& rxToolBar)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -162,7 +158,6 @@ void SAL_CALL BasicToolBarFactory::releaseResource (
 }
 
 void BasicToolBarFactory::ThrowIfDisposed() const
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
index bafef33ca6bc..28c5215d8a7e 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx
@@ -63,26 +63,22 @@ public:
     virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL
         createResource (
             const css::uno::Reference<
-                css::drawing::framework::XResourceId>& rxToolBarId)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
+                css::drawing::framework::XResourceId>& rxToolBarId) override;
 
     virtual void SAL_CALL
         releaseResource (
             const css::uno::Reference<css::drawing::framework::XResource>&
-                rxToolBar)
-        throw (css::uno::RuntimeException, std::exception) override;
+                rxToolBar) override;
 
     // XInitialization
 
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence<css::uno::Any>& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::uno::Any>& aArguments) override;
 
     // lang::XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEventObject) override;
 
 private:
     css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController;
@@ -92,8 +88,7 @@ private:
     void Shutdown();
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 387dafc430ea..b608cb344e8a 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -132,7 +132,6 @@ void SAL_CALL BasicViewFactory::disposing()
 
 Reference<XResource> SAL_CALL BasicViewFactory::createResource (
     const Reference<XResourceId>& rxViewId)
-    throw(RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception)
 {
     Reference<XResource> xView;
     const bool bIsCenterPane (
@@ -186,7 +185,6 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource (
 }
 
 void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxView)
-    throw(RuntimeException, std::exception)
 {
     if ( ! rxView.is())
         throw lang::IllegalArgumentException();
@@ -239,7 +237,6 @@ void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxV
 }
 
 void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     if (aArguments.getLength() > 0)
     {
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 373b1f740f44..793fd7be5e14 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -77,18 +77,15 @@ public:
 
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL createResource (
-            const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId)
-        throw(css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
+            const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) override;
 
     virtual void SAL_CALL releaseResource (
-        const css::uno::Reference<css::drawing::framework::XResource>& xView)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::framework::XResource>& xView) override;
 
     // XInitialization
 
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence<css::uno::Any>& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::uno::Any>& aArguments) override;
 
 private:
     css::uno::Reference<css::drawing::framework::XConfigurationController>
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index ac5f5be63319..ec0995721380 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -183,7 +183,6 @@ vcl::Window* ChildWindowPane::GetWindow()
 }
 
 Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow()
-    throw (RuntimeException, std::exception)
 {
     if (mpWindow == nullptr || ! mxWindow.is())
         GetWindow();
@@ -202,7 +201,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(
 //----- XEventListener --------------------------------------------------------
 
 void SAL_CALL ChildWindowPane::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index db85c0296cfb..dfe916309095 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -73,8 +73,7 @@ public:
         window pointer before forwarding the call to the base class.
     */
     virtual css::uno::Reference<css::awt::XWindow>
-        SAL_CALL getWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getWindow() override;
 
     DECLARE_XINTERFACE()
     DECLARE_XTYPEPROVIDER()
@@ -82,8 +81,7 @@ public:
     // XEventListener
 
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
 private:
     sal_uInt16 mnChildWindowId;
diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx
index c30d5860ed7b..ed63d7c30379 100644
--- a/sd/source/ui/framework/factories/FrameWindowPane.cxx
+++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx
@@ -37,7 +37,6 @@ FrameWindowPane::~FrameWindowPane() throw()
 }
 
 sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx
index a0cd4b1185be..c3c827db85a6 100644
--- a/sd/source/ui/framework/factories/FrameWindowPane.hxx
+++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx
@@ -42,8 +42,7 @@ public:
         children, if only to visualize that something (a view) is missing.
         Therefore this method always returns <FALSE/>.
     */
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 86ffbb2d0c1b..ec9a875076bd 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -118,7 +118,6 @@ void SAL_CALL FullScreenPane::disposing()
 //----- XPane -----------------------------------------------------------------
 
 sal_Bool SAL_CALL FullScreenPane::isVisible()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -129,7 +128,6 @@ sal_Bool SAL_CALL FullScreenPane::isVisible()
 }
 
 void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -140,7 +138,6 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible)
 }
 
 Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -152,7 +149,6 @@ Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessibl
 
 void SAL_CALL FullScreenPane::setAccessible (
     const Reference<css::accessibility::XAccessible>& rxAccessible)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -193,7 +189,6 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent&, rEvent, void)
 }
 
 Reference<rendering::XCanvas> FullScreenPane::CreateCanvas()
-    throw (RuntimeException)
 {
     VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(mxWindow);
     if (pWindow)
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index c299e3f97c9f..3253ea153fac 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -58,25 +58,20 @@ public:
 
     //----- XPane -------------------------------------------------------------
 
-    virtual sal_Bool SAL_CALL isVisible()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isVisible() override;
 
-    virtual void SAL_CALL setVisible (sal_Bool bIsVisible)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setVisible (sal_Bool bIsVisible) override;
 
-    virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() override;
 
     virtual void SAL_CALL setAccessible (
-        const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override;
 
     DECL_LINK(WindowEventHandler, VclWindowEvent&, void);
 
 protected:
     virtual css::uno::Reference<css::rendering::XCanvas>
-        CreateCanvas()
-        throw (css::uno::RuntimeException) override;
+        CreateCanvas() override;
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index 20fec54b9f64..2429c1467d28 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -64,7 +64,6 @@ vcl::Window* Pane::GetWindow()
 //----- XPane -----------------------------------------------------------------
 
 Reference<awt::XWindow> SAL_CALL Pane::getWindow()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -72,7 +71,6 @@ Reference<awt::XWindow> SAL_CALL Pane::getWindow()
 }
 
 Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas()
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     ThrowIfDisposed();
@@ -86,7 +84,6 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas()
 //----- XPane2 ----------------------------------------------------------------
 
 sal_Bool SAL_CALL Pane::isVisible()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -98,7 +95,6 @@ sal_Bool SAL_CALL Pane::isVisible()
 }
 
 void SAL_CALL Pane::setVisible (sal_Bool bIsVisible)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -108,7 +104,6 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible)
 }
 
 Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     vcl::Window* pWindow = GetWindow();
@@ -120,7 +115,6 @@ Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible()
 
 void SAL_CALL Pane::setAccessible (
     const Reference<css::accessibility::XAccessible>& rxAccessible)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     vcl::Window* pWindow = GetWindow();
@@ -131,7 +125,6 @@ void SAL_CALL Pane::setAccessible (
 //----- XResource -------------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL Pane::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -139,7 +132,6 @@ Reference<XResourceId> SAL_CALL Pane::getResourceId()
 }
 
 sal_Bool SAL_CALL Pane::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return true;
 }
@@ -157,7 +149,6 @@ const Sequence<sal_Int8>& Pane::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId)
-    throw (RuntimeException, std::exception)
 {
     sal_Int64 nResult = 0;
 
@@ -171,7 +162,6 @@ sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId)
 }
 
 Reference<rendering::XCanvas> Pane::CreateCanvas()
-    throw (RuntimeException)
 {
     Reference<rendering::XCanvas> xCanvas;
 
@@ -187,7 +177,6 @@ Reference<rendering::XCanvas> Pane::CreateCanvas()
 }
 
 void Pane::ThrowIfDisposed() const
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 59e550dc4551..8bd2523c8f12 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -52,8 +52,7 @@ public:
     // XInitialization
 
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence<css::uno::Any>& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::uno::Any>& aArguments) override;
 };
 
 typedef ::cppu::WeakComponentImplHelper <XView> PresentationViewInterfaceBase;
@@ -72,10 +71,10 @@ public:
 
     // XView
 
-    virtual Reference<XResourceId> SAL_CALL getResourceId() throw (RuntimeException, std::exception) override
+    virtual Reference<XResourceId> SAL_CALL getResourceId() override
     { return mxResourceId; };
 
-    virtual sal_Bool SAL_CALL isAnchorOnly() throw (RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isAnchorOnly() override
     { return false; }
 
 private:
@@ -118,7 +117,6 @@ void SAL_CALL PresentationFactory::disposing()
 
 Reference<XResource> SAL_CALL PresentationFactory::createResource (
     const Reference<XResourceId>& rxViewId)
-    throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -131,7 +129,6 @@ Reference<XResource> SAL_CALL PresentationFactory::createResource (
 
 void SAL_CALL PresentationFactory::releaseResource (
     const Reference<XResource>& rxView)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     (void)rxView;
@@ -154,7 +151,6 @@ void SAL_CALL PresentationFactory::releaseResource (
 
 void SAL_CALL PresentationFactory::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -163,13 +159,11 @@ void SAL_CALL PresentationFactory::notifyConfigurationChange (
 
 void SAL_CALL PresentationFactory::disposing (
     const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     (void)rEventObject;
 }
 
 void PresentationFactory::ThrowIfDisposed() const
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -197,7 +191,6 @@ void PresentationFactoryProvider::disposing()
 
 void SAL_CALL PresentationFactoryProvider::initialize(
     const Sequence<Any>& aArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     if (aArguments.getLength() > 0)
     {
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index c89c874aa524..b0daeff82be6 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -87,7 +87,7 @@ void SAL_CALL ViewShellWrapper::disposing()
     mpViewShell.reset();
 }
 
-uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType )
 {
     if( mpSlideSorterViewShell &&
         rType == cppu::UnoType<view::XSelectionSupplier>::get() )
@@ -102,20 +102,18 @@ uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) th
 //----- XResource -------------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     return mxViewId;
 }
 
 sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
 
 //----- XSelectionSupplier --------------------------------------------------
 
-sal_Bool SAL_CALL ViewShellWrapper::select( const css::uno::Any& aSelection ) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ViewShellWrapper::select( const css::uno::Any& aSelection )
 {
     if (!mpSlideSorterViewShell)
         return false;
@@ -152,7 +150,6 @@ sal_Bool SAL_CALL ViewShellWrapper::select( const css::uno::Any& aSelection ) th
 }
 
 uno::Any SAL_CALL ViewShellWrapper::getSelection()
-    throw (uno::RuntimeException, std::exception)
 {
     Any aResult;
 
@@ -177,11 +174,11 @@ uno::Any SAL_CALL ViewShellWrapper::getSelection()
     return aResult;
 }
 
-void SAL_CALL ViewShellWrapper::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ViewShellWrapper::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& )
 {
 }
 
-void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& )
 {
 }
 
@@ -189,7 +186,6 @@ void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Refere
 
 sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor (
     const Reference<XResource>& xResource)
-    throw (RuntimeException, std::exception)
 {
     bool bResult (false);
 
@@ -236,7 +232,6 @@ const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId)
-    throw (RuntimeException, std::exception)
 {
     sal_Int64 nResult = 0;
 
@@ -252,7 +247,6 @@ sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId
 //===== awt::XWindowListener ==================================================
 
 void SAL_CALL ViewShellWrapper::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ViewShell* pViewShell (mpViewShell.get());
@@ -261,13 +255,11 @@ void SAL_CALL ViewShellWrapper::windowResized (const awt::WindowEvent& rEvent)
 }
 
 void SAL_CALL ViewShellWrapper::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ViewShell* pViewShell (mpViewShell.get());
@@ -276,7 +268,6 @@ void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent)
 }
 
 void SAL_CALL ViewShellWrapper::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -284,7 +275,6 @@ void SAL_CALL ViewShellWrapper::windowHidden (const lang::EventObject& rEvent)
 //===== XEventListener ========================================================
 
 void SAL_CALL ViewShellWrapper::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxWindow)
         mxWindow = nullptr;
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index 5e7f1e8d9421..c8543232f538 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -102,7 +102,6 @@ void SAL_CALL CenterViewFocusModule::disposing()
 
 void SAL_CALL CenterViewFocusModule::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (mbValid)
     {
@@ -151,7 +150,6 @@ void CenterViewFocusModule::HandleNewView (
 
 void SAL_CALL CenterViewFocusModule::disposing (
     const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (mxConfigurationController.is())
         if (rEvent.Source == mxConfigurationController)
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
index c86452e2d2ac..931247ae9ecc 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@@ -59,14 +59,12 @@ public:
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     // XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
 private:
     class ViewShellContainer;
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 4a0e92eaddea..803758e0e5cb 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -65,7 +65,6 @@ Reference<XModuleController> ModuleController::CreateInstance (
 }
 
 ModuleController::ModuleController (const Reference<XComponentContext>& rxContext)
-    throw (std::exception)
     : ModuleControllerInterfaceBase(MutexOwner::maMutex),
       mxController(),
       mpResourceToFactoryMap(new ResourceToFactoryMap()),
@@ -202,7 +201,6 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues)
 //----- XModuleController -----------------------------------------------------
 
 void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL)
-    throw (RuntimeException, std::exception)
 {
     ResourceToFactoryMap::const_iterator iFactory (mpResourceToFactoryMap->find(rsResourceURL));
     if (iFactory != mpResourceToFactoryMap->end())
@@ -244,7 +242,6 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL)
 //----- XInitialization -------------------------------------------------------
 
 void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     if (aArguments.getLength() > 0)
     {
diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx
index 7b007c4fdcfc..a0c77e24b83f 100644
--- a/sd/source/ui/framework/module/ResourceManager.cxx
+++ b/sd/source/ui/framework/module/ResourceManager.cxx
@@ -111,7 +111,6 @@ void SAL_CALL ResourceManager::disposing()
 
 void SAL_CALL ResourceManager::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     OSL_ASSERT(rEvent.ResourceId.is());
 
@@ -223,7 +222,6 @@ void ResourceManager::HandleResourceRequest(
 
 void SAL_CALL ResourceManager::disposing (
     const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (mxConfigurationController.is()
         && rEvent.Source == mxConfigurationController)
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index ae88b746b933..080ac90d18e3 100644
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -61,14 +61,12 @@ public:
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     // XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
 protected:
     css::uno::Reference<css::drawing::framework::XConfigurationController>
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index e41c7c10f396..2372158fe950 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -91,7 +91,6 @@ void SAL_CALL ShellStackGuard::disposing()
 
 void SAL_CALL ShellStackGuard::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Type.equals(FrameworkHelper::msConfigurationUpdateStartEvent))
     {
@@ -108,7 +107,6 @@ void SAL_CALL ShellStackGuard::notifyConfigurationChange (
 
 void SAL_CALL ShellStackGuard::disposing (
     const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (mxConfigurationController.is())
         if (rEvent.Source == mxConfigurationController)
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 2cdba472f5e2..bb506e3a5004 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -68,13 +68,11 @@ public:
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     // 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;
 
 private:
     css::uno::Reference<css::drawing::framework::XConfigurationController>
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
index bf6c040c8034..5185e53f8988 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -87,7 +87,6 @@ void SlideSorterModule::SaveResourceState()
 
 void SAL_CALL SlideSorterModule::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent))
     {
diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx
index 0861ca8b1e47..3b0eb9f709a9 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.hxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@@ -43,8 +43,7 @@ public:
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
 private:
     css::uno::Reference<css::drawing::framework::XResourceId> mxViewTabBarId;
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx
index 1370bd07dfd5..29c1f3a18cfc 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -98,7 +98,6 @@ void SAL_CALL ToolBarModule::disposing()
 
 void SAL_CALL ToolBarModule::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (mxConfigurationController.is())
     {
@@ -184,7 +183,6 @@ void ToolBarModule::HandleUpdateEnd()
 }
 
 void SAL_CALL ToolBarModule::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (mxConfigurationController.is()
         && rEvent.Source == mxConfigurationController)
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index b8e9c6f81c02..0922f69890ca 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -61,14 +61,12 @@ public:
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     // XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
 private:
     css::uno::Reference<
diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx
index 0630163be692..5915384cfd0a 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.cxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.cxx
@@ -78,7 +78,6 @@ void ToolPanelModule::SaveResourceState()
 
 void SAL_CALL ToolPanelModule::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (!rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent))
         ResourceManager::notifyConfigurationChange(rEvent);
diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx
index c84a6c8b140f..4e4aeee58fb0 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.hxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.hxx
@@ -42,8 +42,7 @@ public:
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 02a7b553b2e1..2752493faa9d 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -91,7 +91,6 @@ void SAL_CALL ViewTabBarModule::disposing()
 
 void SAL_CALL ViewTabBarModule::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (mxConfigurationController.is())
     {
@@ -126,7 +125,6 @@ void SAL_CALL ViewTabBarModule::notifyConfigurationChange (
 
 void SAL_CALL ViewTabBarModule::disposing (
     const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (mxConfigurationController.is()
         && rEvent.Source == mxConfigurationController)
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index fb6ba518a17d..7dc0ebf30b28 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -62,14 +62,12 @@ public:
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     // XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
 private:
     css::uno::Reference<
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index faff98541cac..a469dce9ec7d 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -95,11 +95,9 @@ public:
 
     virtual void SAL_CALL disposing() override;
     // XEventListener
-    virtual void SAL_CALL disposing (const lang::EventObject& rEvent)
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing (const lang::EventObject& rEvent) override;
     // XConfigurationChangeListener
-    virtual void SAL_CALL notifyConfigurationChange (const ConfigurationChangeEvent& rEvent)
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyConfigurationChange (const ConfigurationChangeEvent& rEvent) override;
 
 private:
     OUString msEventType;
@@ -133,8 +131,7 @@ public:
     /** XEventListener.  This method is called when the frame::XController
         is being destroyed.
     */
-    virtual void SAL_CALL disposing (const lang::EventObject& rEvent)
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing (const lang::EventObject& rEvent) override;
 
     /** This method is called when the ViewShellBase is being destroyed.
     */
@@ -299,8 +296,7 @@ public:
 
     virtual void SAL_CALL disposing() override;
 
-    virtual void SAL_CALL disposing (const lang::EventObject& rEventObject)
-        throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) override;
 
 private:
     ::std::shared_ptr<FrameworkHelper> mpHelper;
@@ -819,7 +815,6 @@ void SAL_CALL FrameworkHelper::DisposeListener::disposing()
 }
 
 void SAL_CALL FrameworkHelper::DisposeListener::disposing (const lang::EventObject& rEventObject)
-    throw(RuntimeException, std::exception)
 {
     if (mpHelper.get() != nullptr)
         mpHelper->disposing(rEventObject);
@@ -895,7 +890,6 @@ void CallbackCaller::disposing()
 }
 
 void SAL_CALL CallbackCaller::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxConfigurationController)
     {
@@ -906,7 +900,6 @@ void SAL_CALL CallbackCaller::disposing (const lang::EventObject& rEvent)
 
 void SAL_CALL CallbackCaller::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Type.equals(msEventType) && maFilter(rEvent))
     {
@@ -960,7 +953,6 @@ void LifetimeController::disposing()
 }
 
 void SAL_CALL LifetimeController::disposing (const lang::EventObject& rEvent)
-    throw(RuntimeException, std::exception)
 {
     (void)rEvent;
     mbListeningToController = false;
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 521957d81081..05f90265a294 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -139,47 +139,37 @@ public:
     //=====  XAccessibleContext  ==============================================
 
     virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent() override;
 
     /** This implementation returns either 1 or 0 depending on whether there
         is an active accessible OLE object or not.
     */
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     /** This implementation either returns the active accessible OLE object
         if it exists and the given index is 0 or throws an exception.
     */
     virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-            css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
     //=====  XAccessibleComponent  ============================================
 
     virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL
-        getAccessibleAtPoint (const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleAtPoint (const css::awt::Point& aPoint) override;
 
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
     //=====  XInterface  ======================================================
 
     virtual css::uno::Any SAL_CALL
-        queryInterface (const css::uno::Type & rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+        queryInterface (const css::uno::Type & rType) override;
 
     virtual void SAL_CALL
         acquire()
@@ -194,60 +184,46 @@ public:
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     //=====  XTypeProvider  ===================================================
 
     virtual css::uno::Sequence< css::uno::Type> SAL_CALL
-        getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getTypes() override;
 
     //=====  lang::XEventListener  ============================================
 
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     //=====  XPropertyChangeListener  =========================================
 
     virtual void SAL_CALL
-        propertyChange (const css::beans::PropertyChangeEvent& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        propertyChange (const css::beans::PropertyChangeEvent& rEventObject) override;
 
     //=====  XWindowListener  =================================================
 
     virtual void SAL_CALL
-        windowResized (const css::awt::WindowEvent& e)
-        throw (css::uno::RuntimeException, std::exception) override;
+        windowResized (const css::awt::WindowEvent& e) override;
 
     virtual void SAL_CALL
-        windowMoved (const css::awt::WindowEvent& e)
-        throw (css::uno::RuntimeException, std::exception) override;
+        windowMoved (const css::awt::WindowEvent& e) override;
 
     virtual void SAL_CALL
-        windowShown (const css::lang::EventObject& e)
-        throw (css::uno::RuntimeException, std::exception) override;
+        windowShown (const css::lang::EventObject& e) override;
 
     virtual void SAL_CALL
-        windowHidden (const css::lang::EventObject& e)
-        throw (css::uno::RuntimeException, std::exception) override;
+        windowHidden (const css::lang::EventObject& e) override;
 
     //=====  XFocusListener  =================================================
 
-    virtual void SAL_CALL focusGained (const css::awt::FocusEvent& e)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL focusLost (const css::awt::FocusEvent& e)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL focusGained (const css::awt::FocusEvent& e) override;
+    virtual void SAL_CALL focusLost (const css::awt::FocusEvent& e) override;
     //----------------------------xAttribute----------------------------
-    virtual css::uno::Any SAL_CALL getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Any SAL_CALL getExtendedAttributes() override;
      ::sd::ViewShell* mpViewShell;
 private:
 
@@ -257,18 +233,15 @@ private:
 
     // return ourself as context in default case
     virtual css::uno::Reference< css::accessibility::XAccessibleContext >
-        implGetAccessibleContext()
-        throw ( css::uno::RuntimeException ) override;
+        implGetAccessibleContext() override;
 
     // return sal_False in default case
     virtual bool
-        implIsSelected( sal_Int32 nAccessibleChildIndex )
-        throw (css::uno::RuntimeException) override;
+        implIsSelected( sal_Int32 nAccessibleChildIndex ) override;
 
     // return nothing in default case
     virtual void
-        implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
+        implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override;
 
 protected:
     /// The core window that is made accessible.
@@ -311,8 +284,7 @@ protected:
            A name string.
     */
     virtual OUString
-        CreateAccessibleName ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleName () override;
 
     /** Create a description string.  The current description is not
         modified and, therefore, no events are send.  This method is usually
@@ -322,8 +294,7 @@ protected:
            A description string.
     */
     virtual OUString
-        CreateAccessibleDescription ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription () override;
 
     /** This method is called when (after) the frame containing this
         document has been activated.  Can be used to send FOCUSED state
@@ -357,16 +328,13 @@ protected:
         const css::uno::Reference<css::accessibility::XAccessible>& xOLEObject);
     //=====  XAccessibleGetAccFromXShape  ============================================
     css::uno::Sequence< css::uno::Any >
-        SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) override;
 
 public:
     void SwitchViewActivated() { Activated(); }
-     virtual sal_Int32 SAL_CALL getForeground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+     virtual sal_Int32 SAL_CALL getForeground(  ) override;
 
-    virtual sal_Int32 SAL_CALL getBackground(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
     virtual void impl_dispose();
 };
 
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index af0be6c6577c..1408d90d3ac0 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -59,34 +59,27 @@ public:
     //=====  XAccessibleContext  ==============================================
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-            css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
     //=====  lang::XEventListener  ============================================
 
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     //=====  XPropertyChangeListener  =========================================
 
     virtual void SAL_CALL
-        propertyChange (const css::beans::PropertyChangeEvent& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        propertyChange (const css::beans::PropertyChangeEvent& rEventObject) override;
     //=====  XInterface  ======================================================
 
     virtual css::uno::Any SAL_CALL
-        queryInterface (const css::uno::Type & rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+        queryInterface (const css::uno::Type & rType) override;
 
     virtual void SAL_CALL
         acquire()
@@ -98,28 +91,21 @@ public:
 
     //=====  XAccessibleGroupPosition  =========================================
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-        getGroupPosition( const css::uno::Any& rAny )
-        throw (css::uno::RuntimeException,
-               css::lang::IndexOutOfBoundsException, std::exception) override;
-    virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        getGroupPosition( const css::uno::Any& rAny ) override;
+    virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject ) override;
 
 protected:
 
     //=====  XServiceInfo  ====================================================
 
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     virtual bool
-        implIsSelected( sal_Int32 nAccessibleChildIndex )
-        throw (css::uno::RuntimeException) override;
+        implIsSelected( sal_Int32 nAccessibleChildIndex ) override;
 
     /** Select or deselect the specified child or all children if the given
         index has the special value ACCESSIBLE_SELECTION_CHILD_ALL.
@@ -135,8 +121,7 @@ protected:
             reps. children.
     */
     virtual void
-        implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
+        implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override;
 private:
     ::sd::ViewShell* mpSdViewSh;
 
@@ -157,15 +142,13 @@ protected:
 
     /// Create an accessible name that contains the current view mode.
     virtual OUString
-        CreateAccessibleName ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleName () override;
 
     /** Create an accessible description that contains the current
         view mode.
     */
     virtual OUString
-        CreateAccessibleDescription ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription () override;
 
     /** Make sure that the currently focused shape sends a FOCUSED state
         change event indicating that it has (regained) the focus.
@@ -181,8 +164,7 @@ protected:
 
     //=====  XAccessibleGetAccFromXShape  ============================================
     css::uno::Sequence< css::uno::Any >
-        SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) override;
     css::uno::Reference< css::accessibility::XAccessible >
         GetSelAccContextInTable();
 
diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx
index fb3b16cdb24e..bcaadb755557 100644
--- a/sd/source/ui/inc/AccessibleOutlineView.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineView.hxx
@@ -57,34 +57,28 @@ public:
     //=====  XAccessibleContext  ==============================================
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
     //=====  XAccessibleEventBroadcaster  ========================================
 
     virtual void SAL_CALL
         addAccessibleEventListener (
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener) override;
 
     virtual void SAL_CALL
         removeAccessibleEventListener (
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener) override;
 
     //=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     //=====  lang::XEventListener  ============================================
 
@@ -93,8 +87,7 @@ public:
     //=====  XPropertyChangeListener  =========================================
 
     virtual void SAL_CALL
-        propertyChange (const css::beans::PropertyChangeEvent& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        propertyChange (const css::beans::PropertyChangeEvent& rEventObject) override;
 
 protected:
 
@@ -113,14 +106,12 @@ protected:
 
     /// Create an accessible name that contains the current view mode.
     virtual OUString
-        CreateAccessibleName ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleName () override;
 
     /// Create an accessible description that contains the current
     /// view mode.
     virtual OUString
-        CreateAccessibleDescription ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription () override;
 
 private:
 
diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx
index 5009c2b243ff..a7fcaffa053d 100644
--- a/sd/source/ui/inc/AccessiblePageShape.hxx
+++ b/sd/source/ui/inc/AccessiblePageShape.hxx
@@ -65,8 +65,7 @@ public:
 
     /// Returns always 0 because there can be no children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount()
-        throw (std::exception) override;
+        getAccessibleChildCount() override;
 
     /** Return the specified child.
         @param nIndex
@@ -78,41 +77,33 @@ public:
             Throws always an exception because there are no children.
     */
     virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
     //=====  XAccessibleComponent  ============================================
 
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
 
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     //=====  XComponent  ======================================================
 
     virtual void SAL_CALL
-        dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+        dispose() override;
 
     //=====  XServiceInfo  ====================================================
 
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     //=====  lang::XEventListener  ============================================
 
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& Source)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& Source) override;
 
     using AccessibleShape::disposing;
 
@@ -120,17 +111,14 @@ protected:
     /** Create a base name string that contains the accessible name.
     */
     virtual OUString
-        CreateAccessibleBaseName()
-        throw (css::uno::RuntimeException) override;
+        CreateAccessibleBaseName() override;
 
     virtual OUString
-        CreateAccessibleName()
-        throw (css::uno::RuntimeException) override;
+        CreateAccessibleName() override;
 
     /// Create a description string that contains the accessible description.
     virtual OUString
-        CreateAccessibleDescription()
-        throw (css::uno::RuntimeException) override;
+        CreateAccessibleDescription() override;
 
 private:
     css::uno::Reference<css::drawing::XDrawPage> mxPage;
diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
index 8a43b45c18f8..40798fd16567 100644
--- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
@@ -42,22 +42,19 @@ public:
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     //=====  internal  ========================================================
 
     /// Create a name string that contains the accessible name.
     virtual OUString
-        CreateAccessibleBaseName ()
-        throw (css::uno::RuntimeException) override;
+        CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
     virtual OUString
-        CreateAccessibleDescription ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription () override;
     /// Return this object's role.
-    virtual sal_Int16 SAL_CALL getAccessibleRole () throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole () override;
 };
 
 } // end of namespace accessibility
diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
index 331e6a4e4600..5e47295f22ca 100644
--- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
@@ -42,22 +42,19 @@ public:
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     //=====  internal  ========================================================
 
     /// Create a name string that contains the accessible name.
     virtual OUString
-        CreateAccessibleBaseName ()
-        throw (css::uno::RuntimeException) override;
+        CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
     virtual OUString
-        CreateAccessibleDescription ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription () override;
     /// Return this object's role.
-    virtual sal_Int16 SAL_CALL getAccessibleRole () throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole () override;
 };
 
 } // end of namespace accessibility
diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx
index e32fc4141472..ae918ebcb1f8 100644
--- a/sd/source/ui/inc/AccessiblePresentationShape.hxx
+++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx
@@ -41,20 +41,17 @@ public:
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     //=====  internal  ========================================================
 
     /// Create a name string that contains the accessible name.
     virtual OUString
-        CreateAccessibleBaseName ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleBaseName () override;
 
     /// Create a description string that contains the accessible description.
     virtual OUString
-        CreateAccessibleDescription ()
-        throw (css::uno::RuntimeException, std::exception) override;
+        CreateAccessibleDescription () override;
     OUString GetStyle() override;
 
 private:
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index eb0f9a6fa286..cdbab94393fc 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -86,113 +86,88 @@ public:
     //===== XAccessible =======================================================
 
     virtual css::uno::Reference<css::accessibility::XAccessibleContext > SAL_CALL
-        getAccessibleContext()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
     //===== XAccessibleEventBroadcaster =======================================
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener) override;
 
     virtual void SAL_CALL
         removeAccessibleEventListener(
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener ) override;
 
     //=====  XAccessibleContext  ==============================================
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent() override;
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleIndexInParent() override;
 
     virtual sal_Int16 SAL_CALL
-        getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRole() override;
 
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-        throw (css::uno::RuntimeException,
-            css::accessibility::IllegalAccessibleComponentStateException, std::exception) override;
+        getLocale() override;
 
     //=====  XAccessibleComponent  ================================================
 
     virtual sal_Bool SAL_CALL containsPoint (
-        const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& aPoint) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
         getAccessibleAtPoint (
-            const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::awt::Point& aPoint) override;
 
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
-    virtual void SAL_CALL grabFocus()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() override;
 
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
 
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     //=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class.
     */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
 private:
     css::uno::Reference<css::accessibility::XAccessible> mxParent;
@@ -207,8 +182,7 @@ private:
 
         @throws css::lang::DisposedException
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 
     /** Check whether or not the object has been disposed (or is in the
         state of being disposed).
diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index 6318151a855d..b706a85989d7 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -92,75 +92,62 @@ public:
     //===== XAccessible =======================================================
 
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
-        getAccessibleContext()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
     //===== XAccessibleEventBroadcaster =======================================
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) override;
 
     virtual void SAL_CALL
         removeAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener ) override;
 
     //=====  XAccessibleContext  ==============================================
 
     /// Return the number of currently visible children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleChildCount() override;
 
     /// Return the specified child or throw exception.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
     /// Return a reference to the parent.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent() override;
 
     /// Return this objects index among the parents children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleIndexInParent() override;
 
     /// Return this object's role.
     virtual sal_Int16 SAL_CALL
-        getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRole() override;
 
     /// Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     /// Return the object's current name.
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
     /// Return NULL to indicate that an empty relation set.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     /// Return the set of current states.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     /** Return the parents locale or throw exception if this object has no
         parent yet/anymore.
     */
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-        throw (css::uno::RuntimeException,
-            css::accessibility::IllegalAccessibleComponentStateException, std::exception) override;
+        getLocale() override;
 
     //=====  XAccessibleComponent  ================================================
 
@@ -169,108 +156,85 @@ public:
         inside this object.
     */
     virtual sal_Bool SAL_CALL containsPoint (
-        const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& aPoint) override;
 
     /** The default implementation returns an empty reference.
     */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
         getAccessibleAtPoint (
-            const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::awt::Point& aPoint) override;
 
     /** The default implementation returns an empty rectangle.
     */
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
     /** The default implementation uses the result of
         <member>getBounds</member> to determine the location.
     */
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
     /** The default implementation returns an empty position, i.e. the
     * result of the default constructor of <type>css::awt::Point</type>.
     */
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
     /** The default implementation uses the result of
         <member>getBounds</member> to determine the size.
     */
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
     /** The default implementation does nothing.
     */
-    virtual void SAL_CALL grabFocus()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() override;
 
     /** Returns black as the default foreground color.
     */
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
 
     /** Returns white as the default background color.
     */
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     //===== XAccessibleSelection ==============================================
 
     virtual void SAL_CALL
-        selectAccessibleChild (sal_Int32 nChildIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+        selectAccessibleChild (sal_Int32 nChildIndex) override;
 
     virtual sal_Bool SAL_CALL
-        isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+        isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
 
     virtual void SAL_CALL
-        clearAccessibleSelection(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        clearAccessibleSelection(  ) override;
 
     virtual void SAL_CALL
-        selectAllAccessibleChildren(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        selectAllAccessibleChildren(  ) override;
 
     virtual sal_Int32 SAL_CALL
-        getSelectedAccessibleChildCount(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleChildCount(  ) override;
 
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     virtual void SAL_CALL
-        deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+        deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     //=====  XServiceInfo  ====================================================
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class.
     */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     void SwitchViewActivated();
 private:
@@ -290,8 +254,7 @@ private:
 
         @throws css::lang::DisposedException
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } // end of namespace ::accessibility
diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx
index ddc042103162..5ca57eb8c0f4 100644
--- a/sd/source/ui/inc/DocumentRenderer.hxx
+++ b/sd/source/ui/inc/DocumentRenderer.hxx
@@ -44,20 +44,17 @@ public:
     // XRenderable
     virtual sal_Int32 SAL_CALL getRendererCount (
         const css::uno::Any& aSelection,
-        const css::uno::Sequence<css::beans::PropertyValue >& xOptions)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::PropertyValue >& xOptions) override;
 
     virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getRenderer (
         sal_Int32 nRenderer,
         const css::uno::Any& rSelection,
-        const css::uno::Sequence<css::beans::PropertyValue>& rxOptions)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) override;
 
     virtual void SAL_CALL render (
         sal_Int32 nRenderer,
         const css::uno::Any& rSelection,
-        const css::uno::Sequence<css::beans::PropertyValue>& rxOptions)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) override;
 
 private:
     class Implementation;
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index abd43d072c14..d8e203478df2 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -167,71 +167,64 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XComponent
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XController
-    virtual sal_Bool SAL_CALL suspend( sal_Bool Suspend ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL suspend( sal_Bool Suspend ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XSelectionSupplier
-    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSelection(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) override;
+    virtual css::uno::Any SAL_CALL getSelection(  ) override;
+    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // XFormLayerAccess
-    virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isFormDesignMode(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) override;
+    virtual sal_Bool SAL_CALL isFormDesignMode(  ) override;
+    virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) override;
 
     // XControlAccess
-    virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const css::uno::Reference< css::awt::XControlModel >& xModel ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const css::uno::Reference< css::awt::XControlModel >& xModel ) override;
 
     // XDrawView
     virtual void SAL_CALL
         setCurrentPage (
             const css::uno::Reference<
-            css::drawing::XDrawPage >& xPage)
-        throw(css::uno::RuntimeException, std::exception) override;
+            css::drawing::XDrawPage >& xPage) override;
 
     virtual css::uno::Reference<
         css::drawing::XDrawPage > SAL_CALL
-        getCurrentPage()
-        throw(css::uno::RuntimeException, std::exception) override;
+        getCurrentPage() override;
 
     // lang::XEventListener
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     // view::XSelectionChangeListener
     virtual void  SAL_CALL
-        selectionChanged (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        selectionChanged (const css::lang::EventObject& rEvent) override;
 
     // XControllerManager
 
     virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL
-        getConfigurationController()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getConfigurationController() override;
 
     virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL
-        getModuleController()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getModuleController() override;
 
     // XUnoTunnel
 
-    virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override;
 
 protected:
     /** This method must return the name to index table. This table
@@ -268,24 +261,21 @@ protected:
         css::uno::Any & rConvertedValue,
         css::uno::Any & rOldValue,
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::lang::IllegalArgumentException) override;
+        const css::uno::Any& rValue ) override;
 
     /** The same as setFastProperyValue, but no exception is thrown and nHandle
         is always valid. You must not broadcast the changes in this method.
      */
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+        const css::uno::Any& rValue ) override;
 
     /** When the called object has been disposed already this method throws
         a Disposed exception and does not return.
 
         @throws css::lang::DisposedException
     */
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 
     using cppu::OPropertySetHelper::disposing;
     using cppu::OPropertySetHelper::getFastPropertyValue;
diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx
index 612e0bf8a7fd..1f13425969a8 100644
--- a/sd/source/ui/inc/DrawSubController.hxx
+++ b/sd/source/ui/inc/DrawSubController.hxx
@@ -37,9 +37,9 @@ namespace sd {
                     css::lang::XServiceInfo >( aMutex ) {}
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override = 0;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override = 0;
+        virtual OUString SAL_CALL getImplementationName(  ) override = 0;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override = 0;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override = 0;
     };
 
 }
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 0302217cbb93..8e9e2b927a35 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -49,54 +49,36 @@ public:
     // XSelectionSupplier
 
     virtual sal_Bool SAL_CALL select (
-        const css::uno::Any& aSelection)
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception) override;
+        const css::uno::Any& aSelection) override;
 
-    virtual css::uno::Any SAL_CALL getSelection()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Any SAL_CALL getSelection() override;
 
     virtual void SAL_CALL addSelectionChangeListener (
-        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override;
 
     virtual void SAL_CALL removeSelectionChangeListener (
-        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference<css::drawing::XDrawPage >& xPage)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+        const css::uno::Reference<css::drawing::XDrawPage >& xPage) override;
 
-    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
     // XFastPropertySet
 
     virtual void SAL_CALL setFastPropertyValue (
         sal_Int32 nHandle,
-        const css::uno::Any& rValue)
-        throw(css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& rValue) override;
 
     virtual css::uno::Any SAL_CALL getFastPropertyValue (
-        sal_Int32 nHandle)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nHandle) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 protected:
     bool getMasterPageMode() const throw();
@@ -116,7 +98,7 @@ protected:
             The new layer object.
         @throws css::uno::RuntimeException
     */
-    void setActiveLayer (const css::uno::Reference< css::drawing::XLayer>& rxLayer) throw (css::uno::RuntimeException, std::exception);
+    void setActiveLayer (const css::uno::Reference< css::drawing::XLayer>& rxLayer);
 
     void SetZoom( sal_Int16 nZoom );
     sal_Int16 GetZoom() const;
diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx
index f305f2b57b4d..a4d0fa746b59 100644
--- a/sd/source/ui/inc/SdUnoOutlineView.hxx
+++ b/sd/source/ui/inc/SdUnoOutlineView.hxx
@@ -44,51 +44,36 @@ public:
     // XSelectionSupplier
 
     virtual sal_Bool SAL_CALL select (
-        const css::uno::Any& aSelection)
-        throw(css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& aSelection) override;
 
-    virtual css::uno::Any SAL_CALL getSelection()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getSelection() override;
 
     virtual void SAL_CALL addSelectionChangeListener (
-        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override;
 
     virtual void SAL_CALL removeSelectionChangeListener (
-        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference<css::drawing::XDrawPage >& xPage)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XDrawPage >& xPage) override;
 
-    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
     // XFastPropertySet
 
     virtual void SAL_CALL setFastPropertyValue (
         sal_Int32 nHandle,
-        const css::uno::Any& rValue)
-        throw(css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& rValue) override;
 
     virtual css::uno::Any SAL_CALL getFastPropertyValue (
-        sal_Int32 nHandle)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nHandle) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     OutlineViewShell& mrOutlineViewShell;
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index ad80e3e5ad2a..3c7621de31b8 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -44,52 +44,37 @@ public:
 
     // XSelectionSupplier
 
-    virtual sal_Bool SAL_CALL select (const css::uno::Any& aSelection)
-        throw(css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL select (const css::uno::Any& aSelection) override;
 
-    virtual css::uno::Any SAL_CALL getSelection()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getSelection() override;
 
     virtual void SAL_CALL addSelectionChangeListener (
-        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override;
 
     virtual void SAL_CALL removeSelectionChangeListener (
-        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference< css::drawing::XDrawPage >& xPage)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::drawing::XDrawPage >& xPage) override;
 
     virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL
-        getCurrentPage()
-        throw(css::uno::RuntimeException, std::exception) override;
+        getCurrentPage() override;
 
     // XFastPropertySet
 
     virtual void SAL_CALL setFastPropertyValue (
         sal_Int32 nHandle,
-        const css::uno::Any& rValue)
-        throw(css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& rValue) override;
 
     virtual css::uno::Any SAL_CALL getFastPropertyValue (
-        sal_Int32 nHandle)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nHandle) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     slidesorter::SlideSorter& mrSlideSorter;
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index f13eedef6053..259b0869b107 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -70,55 +70,45 @@ public:
 
     virtual void SAL_CALL
         notifyConfigurationChange (
-            const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     //----- XEventListener ----------------------------------------------------
 
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
     //----- XTabBar -----------------------------------------------------------
 
     virtual void
         SAL_CALL addTabBarButtonAfter (
             const css::drawing::framework::TabBarButton& rButton,
-            const css::drawing::framework::TabBarButton& rAnchor)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::drawing::framework::TabBarButton& rAnchor) override;
 
     virtual void
         SAL_CALL appendTabBarButton (
-            const css::drawing::framework::TabBarButton& rButton)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::drawing::framework::TabBarButton& rButton) override;
 
     virtual void
         SAL_CALL removeTabBarButton (
-            const css::drawing::framework::TabBarButton& rButton)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::drawing::framework::TabBarButton& rButton) override;
 
     virtual sal_Bool
         SAL_CALL hasTabBarButton (
-            const css::drawing::framework::TabBarButton& rButton)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::drawing::framework::TabBarButton& rButton) override;
 
     virtual css::uno::Sequence<css::drawing::framework::TabBarButton>
-        SAL_CALL getTabBarButtons()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getTabBarButtons() override;
 
     //----- XResource ---------------------------------------------------------
 
     virtual css::uno::Reference<
-        css::drawing::framework::XResourceId> SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::drawing::framework::XResourceId> SAL_CALL getResourceId() override;
 
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
     //----- XUnoTunnel --------------------------------------------------------
 
-    virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override;
 
     /** The returned value is calculated as the difference between the
         total height of the control and the heigh of its first tab page.
diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx
index d2d52b62ad47..a235e393818c 100644
--- a/sd/source/ui/inc/facreg.hxx
+++ b/sd/source/ui/inc/facreg.hxx
@@ -30,15 +30,15 @@ namespace com { namespace sun { namespace star {
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags );
 /// @throws css::uno::RuntimeException
-OUString SdDrawingDocument_getImplementationName() throw( css::uno::RuntimeException );
+OUString SdDrawingDocument_getImplementationName();
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames();
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags );
 /// @throws css::uno::RuntimeException
-OUString SdPresentationDocument_getImplementationName() throw( css::uno::RuntimeException );
+OUString SdPresentationDocument_getImplementationName();
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames();
 
 #endif
 
diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx
index 8c20bef04eaf..d97266cd89ab 100644
--- a/sd/source/ui/inc/framework/Configuration.hxx
+++ b/sd/source/ui/inc/framework/Configuration.hxx
@@ -84,54 +84,44 @@ public:
 
     virtual void SAL_CALL addResource (
         const css::uno::Reference<css::drawing::framework::XResourceId>&
-            rxResourceId)
-        throw (css::uno::RuntimeException, std::exception) override;
+            rxResourceId) override;
 
     virtual void SAL_CALL removeResource(
         const css::uno::Reference<css::drawing::framework::XResourceId>&
-            rxResourceId)
-        throw (css::uno::RuntimeException, std::exception) override;
+            rxResourceId) override;
 
     virtual css::uno::Sequence< css::uno::Reference<
         css::drawing::framework::XResourceId> > SAL_CALL getResources (
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId,
         const OUString& rsResourceURLPrefix,
-        css::drawing::framework::AnchorBindingMode eMode)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::drawing::framework::AnchorBindingMode eMode) override;
 
     virtual sal_Bool SAL_CALL hasResource (
         const css::uno::Reference<css::drawing::framework::XResourceId>&
-            rxResourceId)
-        throw (css::uno::RuntimeException, std::exception) override;
+            rxResourceId) override;
 
     // XCloneable
 
     virtual css::uno::Reference<css::util::XCloneable>
-        SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL createClone() override;
 
     // XNamed
 
     /** Return a human readable string representation.  This is used for
         debugging purposes.
     */
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
 
     /** This call is ignored because the XNamed interface is (mis)used to
         give access to a human readable name for debugging purposes.
     */
-    virtual void SAL_CALL setName (const OUString& rName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setName (const OUString& rName) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
     class ResourceContainer;
@@ -177,8 +167,7 @@ private:
 
         @throws css::lang::DisposedException
     */
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 /** Return whether the two given configurations contain the same resource
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
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 83fd00b23a4b..213f86273ebb 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -72,14 +72,12 @@ public:
 
     // XModuleController
 
-    virtual void SAL_CALL requestResource(const OUString& rsResourceURL)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL requestResource(const OUString& rsResourceURL) override;
 
     // XInitialization
 
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence<css::uno::Any>& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::uno::Any>& aArguments) override;
 
 private:
     css::uno::Reference<
@@ -92,8 +90,7 @@ private:
 
     /// @throws std::exception
     ModuleController (
-        const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-        throw (std::exception);
+        const css::uno::Reference<css::uno::XComponentContext>& rxContext);
     ModuleController (const ModuleController&) = delete;
     virtual ~ModuleController() throw() override;
 
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index ddbf3454621f..3c15fbdfcd64 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -88,44 +88,35 @@ public:
         in the window of the pane.
     */
     virtual css::uno::Reference<css::awt::XWindow>
-        SAL_CALL getWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getWindow() override;
 
     virtual css::uno::Reference<css::rendering::XCanvas>
-        SAL_CALL getCanvas()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getCanvas() override;
 
     //----- XPane2 -------------------------------------------------------------
 
-    virtual sal_Bool SAL_CALL isVisible()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isVisible() override;
 
-    virtual void SAL_CALL setVisible (sal_Bool bIsVisible)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setVisible (sal_Bool bIsVisible) override;
 
-    virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() override;
 
     virtual void SAL_CALL setAccessible (
-        const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override;
 
     //----- XResource ---------------------------------------------------------
 
     virtual css::uno::Reference<css::drawing::framework::XResourceId>
-        SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getResourceId() override;
 
     /** For the typical pane it makes no sense to be displayed without a
         view.  Therefore this default implementation returns always <TRUE/>.
     */
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
     //----- XUnoTunnel --------------------------------------------------------
 
-    virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override;
 
 protected:
     css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId;
@@ -139,8 +130,7 @@ protected:
         @throws css::uno::RuntimeException
     */
     virtual css::uno::Reference<css::rendering::XCanvas>
-        CreateCanvas()
-        throw (css::uno::RuntimeException);
+        CreateCanvas();
 
     /** Throw DisposedException when the object has already been disposed or
         is currently being disposed.  Otherwise this method returns
@@ -148,8 +138,7 @@ protected:
 
         @throws css::lang::DisposedException
     */
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index 37a5fc4f0714..aa81f38ff111 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -60,24 +60,20 @@ public:
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL createResource (
             const css::uno::Reference<
-                css::drawing::framework::XResourceId>& rxViewId)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
+                css::drawing::framework::XResourceId>& rxViewId) override;
 
     virtual void SAL_CALL releaseResource (
-        const css::uno::Reference<css::drawing::framework::XResource>& xView)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::framework::XResource>& xView) override;
 
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     // lang::XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEventObject) override;
 
 private:
     css::uno::Reference<css::drawing::framework::XConfigurationController>
@@ -85,8 +81,7 @@ private:
     css::uno::Reference<css::frame::XController> mxController;
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx
index 0558cdfb8609..aa11447df77b 100644
--- a/sd/source/ui/inc/framework/ResourceId.hxx
+++ b/sd/source/ui/inc/framework/ResourceId.hxx
@@ -100,67 +100,53 @@ public:
     //===== XResourceId =======================================================
 
     virtual OUString SAL_CALL
-        getResourceURL()
-        throw(css::uno::RuntimeException, std::exception) override;
+        getResourceURL() override;
 
     virtual css::util::URL SAL_CALL
-        getFullResourceURL()
-        throw(css::uno::RuntimeException, std::exception) override;
+        getFullResourceURL() override;
 
     virtual sal_Bool SAL_CALL
-        hasAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+        hasAnchor() override;
 
     virtual css::uno::Reference<
         css::drawing::framework::XResourceId> SAL_CALL
-        getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAnchor() override;
 
     virtual css::uno::Sequence<OUString> SAL_CALL
-        getAnchorURLs()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAnchorURLs() override;
 
     virtual OUString SAL_CALL
-        getResourceTypePrefix()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getResourceTypePrefix() override;
 
     virtual sal_Int16 SAL_CALL
         compareTo (const css::uno::Reference<
-            css::drawing::framework::XResourceId>& rxResourceId)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::drawing::framework::XResourceId>& rxResourceId) override;
 
     virtual sal_Bool SAL_CALL
         isBoundTo (
             const css::uno::Reference<
                 css::drawing::framework::XResourceId>& rxResourceId,
-            css::drawing::framework::AnchorBindingMode eMode)
-        throw(css::uno::RuntimeException, std::exception) override;
+            css::drawing::framework::AnchorBindingMode eMode) override;
 
     virtual sal_Bool SAL_CALL
         isBoundToURL (
             const OUString& rsAnchorURL,
-            css::drawing::framework::AnchorBindingMode eMode)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::drawing::framework::AnchorBindingMode eMode) override;
 
     virtual css::uno::Reference<
         css::drawing::framework::XResourceId> SAL_CALL
-        clone()
-        throw(css::uno::RuntimeException, std::exception) override;
+        clone() override;
 
     //===== XInitialization ===================================================
 
     void SAL_CALL initialize (
-        const css::uno::Sequence<css::uno::Any>& aArguments)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::uno::Any>& aArguments) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
     /** The set of URLs that consist of the resource URL at index 0 and the
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index 061d185c4dca..6105da021f71 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -70,7 +70,7 @@ public:
     virtual ~ViewShellWrapper() override;
 
     virtual void SAL_CALL disposing() override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
 
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
 
@@ -82,57 +82,46 @@ public:
 
     // XUnoTunnel
 
-    virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override;
 
     // XResource
 
     virtual css::uno::Reference<css::drawing::framework::XResourceId>
-        SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getResourceId() override;
 
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
     // XSelectionSupplier
 
-    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSelection()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) override;
+    virtual css::uno::Any SAL_CALL getSelection() override;
+    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
     // XRelocatableResource
 
     virtual sal_Bool SAL_CALL relocateToAnchor (
         const css::uno::Reference<
-            css::drawing::framework::XResource>& xResource)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::drawing::framework::XResource>& xResource) override;
 
     // XWindowListener
 
     virtual void SAL_CALL windowResized(
-        const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::WindowEvent& rEvent) override;
 
     virtual void SAL_CALL windowMoved(
-        const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::WindowEvent& rEvent) override;
 
     virtual void SAL_CALL windowShown(
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
     virtual void SAL_CALL windowHidden(
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
     // XEventListener
 
     virtual void SAL_CALL disposing(
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
 private:
     ::std::shared_ptr< ViewShell >                                      mpViewShell;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 2053c8d5128f..76bfa73e0dbc 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -105,7 +105,7 @@ public:
         SAL_DLLPRIVATE virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
         SAL_DLLPRIVATE virtual void      DragFinished( sal_Int8 nDropAction ) override;
 
-        SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
+        SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
     };
 
     friend class SdPageObjsTLB::SdPageObjsTransferable;
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index ba00241534b5..234c4c58bcce 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -109,7 +109,7 @@ protected:
     virtual bool                    WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override;
     virtual void                    ObjectReleased() override;
 
-    virtual sal_Int64 SAL_CALL      getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL      getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
 
 private:
 
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 30a77de00c6e..6dba507d431b 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -117,32 +117,28 @@ public:
         virtual void SAL_CALL disposing() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XPresentation
-    virtual void SAL_CALL start(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL end()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL rehearseTimings(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL start(  ) override;
+    virtual void SAL_CALL end() override;
+    virtual void SAL_CALL rehearseTimings(  ) override;
 
     // XPresentation2
-    virtual void SAL_CALL startWithArguments(const css::uno::Sequence< css::beans::PropertyValue >& Arguments)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL isRunning(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::presentation::XSlideShowController > SAL_CALL getController(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startWithArguments(const css::uno::Sequence< css::beans::PropertyValue >& Arguments) override;
+    virtual sal_Bool SAL_CALL isRunning(  ) override;
+    virtual css::uno::Reference< css::presentation::XSlideShowController > SAL_CALL getController(  ) override;
 
     // legacy api
 
@@ -188,7 +184,7 @@ private:
     void StartFullscreenPresentation();
 
     /// @throws css::uno::RuntimeException
-    void ThrowIfDisposed() const throw (css::uno::RuntimeException);
+    void ThrowIfDisposed() const;
 
     void CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::Window* pParentWindow );
     WorkWindow *GetWorkWindow();
diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx
index f3802dca93a9..4285b9d70918 100644
--- a/sd/source/ui/inc/tools/PropertySet.hxx
+++ b/sd/source/ui/inc/tools/PropertySet.hxx
@@ -52,50 +52,29 @@ public:
     // XPropertySet
 
     virtual css::uno::Reference<css::beans::XPropertySetInfo>
-        SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getPropertySetInfo() override;
 
     virtual void SAL_CALL setPropertyValue (
         const OUString& rsPropertyName,
-        const css::uno::Any& rsPropertyValue)
-        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 getPropertyValue (const OUString& rsPropertyName)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& rsPropertyValue) override;
+
+    virtual css::uno::Any SAL_CALL getPropertyValue (const OUString& rsPropertyName) override;
 
     virtual void SAL_CALL addPropertyChangeListener (
         const OUString& rsPropertyName,
-        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override;
 
     virtual void SAL_CALL removePropertyChangeListener (
         const OUString& rsPropertyName,
-        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override;
 
     virtual void SAL_CALL addVetoableChangeListener (
         const OUString& rsPropertyName,
-        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override;
 
     virtual void SAL_CALL removeVetoableChangeListener (
         const OUString& rsPropertyName,
-        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override;
 
 protected:
     /** Return the requested property value.
@@ -128,8 +107,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sd::tools
diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx
index d627a174da15..3d3061a2266a 100644
--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@@ -92,14 +92,12 @@ public:
     */
     virtual void SAL_CALL
         statusChanged (
-            const css::frame::FeatureStateEvent& rState)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::frame::FeatureStateEvent& rState) override;
 
     //=====  lang::XEventListener  ============================================
 
     virtual void SAL_CALL
-        disposing(const css::lang::EventObject& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+        disposing(const css::lang::EventObject& rEvent) override;
 
 protected:
     /** This method is called by the WeakComponentImplHelper base class in
@@ -126,8 +124,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 
     /** Transform the given string into a URL object.
     */
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index 82d1a8a0c37e..01af05533d32 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -98,8 +98,7 @@ private:
         OUString const & aServiceSpecifier, OUString const & referer);
 
     /// @throws css::uno::RuntimeException
-    SdPage* InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
-        throw (css::uno::RuntimeException, std::exception);
+    SdPage* InsertSdPage( sal_uInt16 nPage, bool bDuplicate );
 
     const bool mbImpressDoc;
     bool mbClipBoard;
@@ -156,78 +155,77 @@ public:
     UNO3_GETIMPLEMENTATION_DECL(SdXImpressDocument)
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XModel
-    virtual void SAL_CALL lockControllers(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unlockControllers(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL lockControllers(  ) override;
+    virtual void SAL_CALL unlockControllers(  ) override;
+    virtual sal_Bool SAL_CALL hasControllersLocked(  ) override;
+    virtual css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() override;
+    virtual void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XDrawPageDuplicator
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL duplicate( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL duplicate( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) override;
 
     // XDrawPagesSupplier
-    virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getDrawPages(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getDrawPages(  ) override;
 
     // XMasterPagesSupplier
-    virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getMasterPages(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getMasterPages(  ) override;
 
     // XLayerManagerSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLayerManager(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLayerManager(  ) override;
 
     // XCustomPresentationSupplier
-    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getCustomPresentations(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getCustomPresentations(  ) override;
 
     // XHandoutMasterSupplier
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getHandoutMasterPage(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getHandoutMasterPage(  ) override;
 
     // XPresentationSupplier
-    virtual css::uno::Reference< css::presentation::XPresentation > SAL_CALL getPresentation(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::presentation::XPresentation > SAL_CALL getPresentation(  ) override;
 
     // XMultiServiceFactory ( SvxFmMSFactory )
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
     virtual css::uno::Reference<css::uno::XInterface> SAL_CALL
     createInstanceWithArguments(
         OUString const & ServiceSpecifier,
-        css::uno::Sequence<css::uno::Any> const & Arguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence<css::uno::Any> const & Arguments) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XLinkTargetSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(  ) override;
 
     // XStyleFamiliesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(  ) override;
 
     // XAnyCompareFactory
-    virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) override;
 
     // XRenderable
-    virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override;
+    virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override;
 
     // ITiledRenderable
     virtual void paintTile( VirtualDevice& rDevice,
@@ -276,7 +274,7 @@ public:
         and still has to forward the second call to the base class.
         See also comments of issue 27847.
     */
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 };
 
 /***********************************************************************
@@ -293,31 +291,31 @@ public:
     virtual ~SdDrawPagesAccess() throw() override;
 
     // XDrawPages
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 };
 
 /***********************************************************************
@@ -334,28 +332,26 @@ public:
     virtual ~SdMasterPagesAccess() throw() override;
 
     // XDrawPages
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 };
 
 /***********************************************************************
@@ -373,27 +369,27 @@ public:
     virtual ~SdDocLinkTargets() throw() override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // intern
     /// @throws std::exception
-    SdPage* FindPage( const OUString& rName ) const throw(std::exception);
+    SdPage* FindPage( const OUString& rName ) const;
 };
 
 #endif
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index 0d29682eb957..b930581413ad 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -72,9 +72,9 @@ protected:
     const SvxItemPropertySet*   mpPropSet;
 
     /// @throws css::lang::IllegalArgumentException
-    virtual void setBackground( const css::uno::Any& rValue ) throw(css::lang::IllegalArgumentException, std::exception);
+    virtual void setBackground( const css::uno::Any& rValue );
     /// @throws std::exception
-    virtual void getBackground( css::uno::Any& rValue ) throw(std::exception);
+    virtual void getBackground( css::uno::Any& rValue );
 
     OUString getBookmarkURL() const;
     void setBookmarkURL( OUString& rURL );
@@ -95,7 +95,7 @@ protected:
     void setNavigationOrder( const css::uno::Any& rValue );
 
     /// @throws css::uno::RuntimeException
-    void throwIfDisposed() const throw (css::uno::RuntimeException );
+    void throwIfDisposed() const;
 
 public:
     SdGenericDrawPage( SdXImpressDocument* pModel, SdPage* pInPage, const SvxItemPropertySet* pSet ) throw();
@@ -108,63 +108,55 @@ public:
     SdXImpressDocument* GetModel() const;
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // this is called whenever a SdrObject must be created for a empty api shape wrapper
-    virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // SvxFmDrawPage
-    virtual css::uno::Reference<css::drawing::XShape>  CreateShape(SdrObject *pObj) const
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XShape>  CreateShape(SdrObject *pObj) const override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL release() throw() override;
 
     // XShapeCombiner
-    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL combine( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL split( const css::uno::Reference< css::drawing::XShape >& xGroup ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL combine( const css::uno::Reference< css::drawing::XShapes >& xShapes ) override;
+    virtual void SAL_CALL split( const css::uno::Reference< css::drawing::XShape >& xGroup ) override;
 
     // XShapeBinder
-    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL bind( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unbind( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL bind( const css::uno::Reference< css::drawing::XShapes >& xShapes ) override;
+    virtual void SAL_CALL unbind( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XMultiPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     // XLinkTargetSupplier
-    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(  ) override;
 
     // XServiceInfo
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAnimationNodeSupplier
-    virtual css::uno::Reference< css::animations::XAnimationNode > SAL_CALL getAnimationNode(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::animations::XAnimationNode > SAL_CALL getAnimationNode(  ) override;
 
     // XAnnotationAccess:
-    virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL createAndInsertAnnotation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAnnotation(const css::uno::Reference< css::office::XAnnotation > & annotation) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual css::uno::Reference< css::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL createAndInsertAnnotation() override;
+    virtual void SAL_CALL removeAnnotation(const css::uno::Reference< css::office::XAnnotation > & annotation) override;
+    virtual css::uno::Reference< css::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() override;
 };
 
 /***********************************************************************
@@ -179,7 +171,7 @@ private:
     css::uno::Sequence< css::uno::Type > maTypeSequence;
 
 protected:
-    virtual void setBackground( const css::uno::Any& rValue ) throw(css::lang::IllegalArgumentException) override;
+    virtual void setBackground( const css::uno::Any& rValue ) override;
     virtual void getBackground( css::uno::Any& rValue ) throw() override;
 public:
     SdDrawPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw();
@@ -192,43 +184,41 @@ public:
     static OUString getUiNameFromPageApiName( const OUString& rApiName );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XMasterPageTarget
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getMasterPage(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMasterPage( const css::uno::Reference< css::drawing::XDrawPage >& xMasterPage ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getMasterPage(  ) override;
+    virtual void SAL_CALL setMasterPage( const css::uno::Reference< css::drawing::XDrawPage >& xMasterPage ) override;
 
     // XPresentationPage
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage(  ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XShapes
-    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 };
 
 /***********************************************************************
@@ -241,8 +231,8 @@ class SdMasterPage : public css::presentation::XPresentationPage,
 private:
     css::uno::Sequence< css::uno::Type > maTypeSequence;
 protected:
-    virtual void setBackground( const css::uno::Any& rValue ) throw( css::lang::IllegalArgumentException, std::exception  ) override;
-    virtual void getBackground( css::uno::Any& rValue ) throw (std::exception) override;
+    virtual void setBackground( const css::uno::Any& rValue ) override;
+    virtual void getBackground( css::uno::Any& rValue ) override;
 
 public:
     SdMasterPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw();
@@ -251,39 +241,37 @@ public:
     UNO3_GETIMPLEMENTATION_DECL(SdMasterPage)
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XPresentationPage
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage(  ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XShapes
-    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 };
 
 /***********************************************************************
@@ -305,18 +293,18 @@ public:
     SdrObject* FindObject( const OUString& rName ) const throw();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 };
 
 OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index 2036051f45ae..76e17c1a4a09 100644
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -59,14 +59,14 @@ public:
     virtual ~SdUnoSearchReplaceShape() throw();
 
     // XReplaceable
-    virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL replaceAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor(  ) override;
+    virtual sal_Int32 SAL_CALL replaceAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override;
 
     // XSearchable
-    virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt, const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor(  ) override;
+    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt, const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override;
 };
 
 /* ================================================================= */
@@ -90,7 +90,7 @@ protected:
 
 public:
     /// @throws css::uno::RuntimeException
-    SdUnoSearchReplaceDescriptor(bool bReplace) throw (css::uno::RuntimeException);
+    SdUnoSearchReplaceDescriptor(bool bReplace);
     virtual ~SdUnoSearchReplaceDescriptor() throw() override;
 
     bool IsCaseSensitive() const { return mbCaseSensitive; }
@@ -99,21 +99,21 @@ public:
     UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor )
 
     // XSearchDescriptor
-    virtual OUString SAL_CALL getSearchString(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSearchString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSearchString(  ) override;
+    virtual void SAL_CALL setSearchString( const OUString& aString ) override;
 
     // XReplaceDescriptor
-    virtual OUString SAL_CALL getReplaceString(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getReplaceString(  ) override;
+    virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 };
 
 /* ================================================================= */
@@ -130,12 +130,12 @@ public:
     virtual ~SdUnoFindAllAccess() throw() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 };
 
 #endif // INCLUDED_SD_SOURCE_UI_INC_UNOSRCH_HXX
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 3848ec6faa9b..99634cd10f7c 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -59,38 +59,29 @@ public:
         const css::geometry::RealSize2D& rSpriteSize);
     PresenterCustomSprite(const PresenterCustomSprite&) = delete;
     PresenterCustomSprite& operator=(const PresenterCustomSprite&) = delete;
-    virtual void SAL_CALL disposing()
-        throw (RuntimeException) override;
+    virtual void SAL_CALL disposing() override;
 
     // XSprite
 
-    virtual void SAL_CALL setAlpha (double nAlpha)
-        throw (lang::IllegalArgumentException,RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAlpha (double nAlpha) override;
 
     virtual void SAL_CALL move (const geometry::RealPoint2D& rNewPos,
         const rendering::ViewState& rViewState,
-        const rendering::RenderState& rRenderState)
-        throw (lang::IllegalArgumentException,RuntimeException, std::exception) override;
+        const rendering::RenderState& rRenderState) override;
 
-    virtual void SAL_CALL transform (const geometry::AffineMatrix2D& rTransformation)
-        throw (lang::IllegalArgumentException,RuntimeException, std::exception) override;
+    virtual void SAL_CALL transform (const geometry::AffineMatrix2D& rTransformation) override;
 
-    virtual void SAL_CALL clip (const Reference<rendering::XPolyPolygon2D>& rClip)
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL clip (const Reference<rendering::XPolyPolygon2D>& rClip) override;
 
-    virtual void SAL_CALL setPriority (double nPriority)
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPriority (double nPriority) override;
 
-    virtual void SAL_CALL show()
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL show() override;
 
-    virtual void SAL_CALL hide()
-        throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL hide() override;
 
     // XCustomSprite
 
-    virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas()
-        throw (RuntimeException, std::exception) override;
+    virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas() override;
 
 private:
     rtl::Reference<PresenterCanvas> mpCanvas;
@@ -100,8 +91,7 @@ private:
     geometry::RealSize2D maSpriteSize;
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 //===== PresenterCanvas =======================================================
@@ -135,7 +125,6 @@ PresenterCanvas::~PresenterCanvas()
 }
 
 void SAL_CALL PresenterCanvas::disposing()
-    throw (css::uno::RuntimeException)
 {
     if (mxWindow.is())
         mxWindow->removeWindowListener(this);
@@ -144,7 +133,6 @@ void SAL_CALL PresenterCanvas::disposing()
 //----- XCanvas ---------------------------------------------------------------
 
 void SAL_CALL PresenterCanvas::clear()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // ToDo: Clear the area covered by the child window.  A simple forward
@@ -155,7 +143,6 @@ void SAL_CALL PresenterCanvas::drawPoint (
     const css::geometry::RealPoint2D& aPoint,
     const css::rendering::ViewState& aViewState,
     const css::rendering::RenderState& aRenderState)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mxSharedCanvas->drawPoint(aPoint,MergeViewState(aViewState),aRenderState);
@@ -166,7 +153,6 @@ void SAL_CALL PresenterCanvas::drawLine (
         const css::geometry::RealPoint2D& aEndPoint,
         const css::rendering::ViewState& aViewState,
         const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mxSharedCanvas->drawLine(aStartPoint,aEndPoint,MergeViewState(aViewState),aRenderState);
@@ -177,7 +163,6 @@ void SAL_CALL PresenterCanvas::drawBezier (
         const css::geometry::RealPoint2D& aEndPoint,
         const css::rendering::ViewState& aViewState,
         const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mxSharedCanvas->drawBezier(aBezierSegment,aEndPoint,MergeViewState(aViewState),aRenderState);
@@ -187,7 +172,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::
         const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
         const css::rendering::ViewState& aViewState,
         const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->drawPolyPolygon(
@@ -199,7 +183,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas::
         const css::rendering::ViewState& aViewState,
         const css::rendering::RenderState& aRenderState,
         const css::rendering::StrokeAttributes& aStrokeAttributes)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->strokePolyPolygon(
@@ -213,9 +196,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
             const css::rendering::RenderState& aRenderState,
             const css::uno::Sequence< css::rendering::Texture >& aTextures,
             const css::rendering::StrokeAttributes& aStrokeAttributes)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->strokeTexturedPolyPolygon(
@@ -230,9 +210,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
             const css::uno::Sequence<css::rendering::Texture>& aTextures,
             const css::uno::Reference<css::geometry::XMapping2D>& xMapping,
             const css::rendering::StrokeAttributes& aStrokeAttributes)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->strokeTextureMappedPolyPolygon(
@@ -250,7 +227,6 @@ css::uno::Reference<css::rendering::XPolyPolygon2D> SAL_CALL
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState,
             const css::rendering::StrokeAttributes& aStrokeAttributes)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->queryStrokeShapes(
@@ -262,8 +238,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
             const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon,
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->fillPolyPolygon(
@@ -276,9 +250,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState,
             const css::uno::Sequence<css::rendering::Texture>& xTextures)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->fillTexturedPolyPolygon(
@@ -292,9 +263,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
             const css::rendering::RenderState& aRenderState,
             const css::uno::Sequence< css::rendering::Texture >& xTextures,
             const css::uno::Reference< css::geometry::XMapping2D >& xMapping)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->fillTextureMappedPolyPolygon(
@@ -306,8 +274,6 @@ css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL
             const css::rendering::FontRequest& aFontRequest,
             const css::uno::Sequence< css::beans::PropertyValue >& aExtraFontProperties,
             const css::geometry::Matrix2D& aFontMatrix)
-        throw (css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->createFont(
@@ -318,7 +284,6 @@ css::uno::Sequence<css::rendering::FontInfo> SAL_CALL
         PresenterCanvas::queryAvailableFonts(
             const css::rendering::FontInfo& aFilter,
             const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->queryAvailableFonts(aFilter, aFontProperties);
@@ -331,7 +296,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState,
             ::sal_Int8 nTextDirection)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->drawText(
@@ -343,7 +307,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
             const css::uno::Reference< css::rendering::XTextLayout >& xLayoutetText,
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->drawTextLayout(
@@ -355,9 +318,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
             const css::uno::Reference< css::rendering::XBitmap >& xBitmap,
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->drawBitmap(
@@ -369,9 +329,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
             const css::uno::Reference< css::rendering::XBitmap>& xBitmap,
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->drawBitmapModulated(
@@ -380,7 +337,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
 
 css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL
         PresenterCanvas::getDevice()
-        throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSharedCanvas->getDevice();
@@ -391,7 +347,6 @@ css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL
 Reference<rendering::XAnimatedSprite> SAL_CALL
     PresenterCanvas::createSpriteFromAnimation (
         const css::uno::Reference<css::rendering::XAnimation>& rAnimation)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -407,9 +362,6 @@ Reference<rendering::XAnimatedSprite> SAL_CALL
         const css::uno::Sequence<
             css::uno::Reference< css::rendering::XBitmap > >& rAnimationBitmaps,
     ::sal_Int8 nInterpolationMode)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -423,7 +375,6 @@ Reference<rendering::XAnimatedSprite> SAL_CALL
 Reference<rendering::XCustomSprite> SAL_CALL
     PresenterCanvas::createCustomSprite (
         const css::geometry::RealSize2D& rSpriteSize)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -447,7 +398,6 @@ Reference<rendering::XCustomSprite> SAL_CALL
 Reference<rendering::XSprite> SAL_CALL
     PresenterCanvas::createClonedSprite (
         const css::uno::Reference< css::rendering::XSprite >& rxOriginal)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -460,7 +410,6 @@ Reference<rendering::XSprite> SAL_CALL
 }
 
 sal_Bool SAL_CALL PresenterCanvas::updateScreen (sal_Bool bUpdateAll)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -479,7 +428,6 @@ sal_Bool SAL_CALL PresenterCanvas::updateScreen (sal_Bool bUpdateAll)
 //----- XEventListener --------------------------------------------------------
 
 void SAL_CALL PresenterCanvas::disposing (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (rEvent.Source == mxWindow)
@@ -489,7 +437,6 @@ void SAL_CALL PresenterCanvas::disposing (const css::lang::EventObject& rEvent)
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterCanvas::windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -497,7 +444,6 @@ void SAL_CALL PresenterCanvas::windowResized (const css::awt::WindowEvent& rEven
 }
 
 void SAL_CALL PresenterCanvas::windowMoved (const css::awt::WindowEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -505,7 +451,6 @@ void SAL_CALL PresenterCanvas::windowMoved (const css::awt::WindowEvent& rEvent)
 }
 
 void SAL_CALL PresenterCanvas::windowShown (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -513,7 +458,6 @@ void SAL_CALL PresenterCanvas::windowShown (const css::lang::EventObject& rEvent
 }
 
 void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -522,7 +466,6 @@ void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEven
 //----- XBitmap ---------------------------------------------------------------
 
 geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -536,7 +479,6 @@ geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize()
 }
 
 sal_Bool SAL_CALL PresenterCanvas::hasAlpha()
-    throw (RuntimeException, std::exception)
 {
     Reference<rendering::XBitmap> xBitmap (mxSharedCanvas, UNO_QUERY);
     if (xBitmap.is())
@@ -548,9 +490,6 @@ sal_Bool SAL_CALL PresenterCanvas::hasAlpha()
 Reference<rendering::XBitmap> SAL_CALL PresenterCanvas::getScaledBitmap(
     const css::geometry::RealSize2D& rNewSize,
     sal_Bool bFast)
-    throw (css::uno::RuntimeException,
-        css::lang::IllegalArgumentException,
-        css::rendering::VolatileContentDestroyedException, std::exception)
 {
     (void)rNewSize;
     (void)bFast;
@@ -766,7 +705,6 @@ Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip (
 }
 
 void PresenterCanvas::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSharedCanvas.is())
     {
@@ -792,7 +730,6 @@ PresenterCustomSprite::PresenterCustomSprite (
 }
 
 void SAL_CALL PresenterCustomSprite::disposing()
-    throw (RuntimeException)
 {
     Reference<XComponent> xComponent (mxSprite, UNO_QUERY);
     mxSprite = nullptr;
@@ -804,7 +741,6 @@ void SAL_CALL PresenterCustomSprite::disposing()
 //----- XSprite ---------------------------------------------------------------
 
 void SAL_CALL PresenterCustomSprite::setAlpha (const double nAlpha)
-    throw (lang::IllegalArgumentException,RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mxSprite->setAlpha(nAlpha);
@@ -814,7 +750,6 @@ void SAL_CALL PresenterCustomSprite::move (
     const geometry::RealPoint2D& rNewPos,
     const rendering::ViewState& rViewState,
     const rendering::RenderState& rRenderState)
-    throw (lang::IllegalArgumentException,RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     maPosition = rNewPos;
@@ -830,14 +765,12 @@ void SAL_CALL PresenterCustomSprite::move (
 }
 
 void SAL_CALL PresenterCustomSprite::transform (const geometry::AffineMatrix2D& rTransformation)
-    throw (lang::IllegalArgumentException,RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mxSprite->transform(rTransformation);
 }
 
 void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolygon2D>& rxClip)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // The clip region is expected in the coordinate system of the sprite.
@@ -847,21 +780,18 @@ void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolyg
 }
 
 void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mxSprite->setPriority(nPriority);
 }
 
 void SAL_CALL PresenterCustomSprite::show()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mxSprite->show();
 }
 
 void SAL_CALL PresenterCustomSprite::hide()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mxSprite->hide();
@@ -870,14 +800,12 @@ void SAL_CALL PresenterCustomSprite::hide()
 //----- XCustomSprite ---------------------------------------------------------
 
 Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxSprite->getContentCanvas();
 }
 
 void PresenterCustomSprite::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSprite.is())
     {
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index bfe780df31a4..52163258bce1 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -98,8 +98,7 @@ public:
     PresenterCanvas(const PresenterCanvas&) = delete;
     PresenterCanvas& operator=(const PresenterCanvas&) = delete;
 
-    virtual void SAL_CALL disposing()
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing() override;
 
     css::awt::Point GetOffset (const css::uno::Reference<css::awt::XWindow>& rxBaseWindow);
 
@@ -123,41 +122,35 @@ public:
 
     // XCanvas
 
-    virtual void SAL_CALL clear()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL clear() override;
 
     virtual void SAL_CALL drawPoint (
         const css::geometry::RealPoint2D& aPoint,
         const css::rendering::ViewState& aViewState,
-        const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::rendering::RenderState& aRenderState) override;
 
     virtual void SAL_CALL drawLine (
         const css::geometry::RealPoint2D& aStartPoint,
         const css::geometry::RealPoint2D& aEndPoint,
         const css::rendering::ViewState& aViewState,
-        const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::rendering::RenderState& aRenderState) override;
 
     virtual void SAL_CALL drawBezier (
         const css::geometry::RealBezierSegment2D& aBezierSegment,
         const css::geometry::RealPoint2D& aEndPoint,
         const css::rendering::ViewState& aViewState,
-        const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::rendering::RenderState& aRenderState) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawPolyPolygon (
         const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
         const css::rendering::ViewState& aViewState,
-        const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::rendering::RenderState& aRenderState) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokePolyPolygon (
         const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
         const css::rendering::ViewState& aViewState,
         const css::rendering::RenderState& aRenderState,
-        const css::rendering::StrokeAttributes& aStrokeAttributes)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        const css::rendering::StrokeAttributes& aStrokeAttributes) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
         strokeTexturedPolyPolygon (
@@ -165,10 +158,7 @@ public:
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState,
             const css::uno::Sequence< css::rendering::Texture >& aTextures,
-            const css::rendering::StrokeAttributes& aStrokeAttributes)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::rendering::StrokeAttributes& aStrokeAttributes) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
         strokeTextureMappedPolyPolygon(
@@ -177,36 +167,27 @@ public:
             const css::rendering::RenderState& aRenderState,
             const css::uno::Sequence<css::rendering::Texture>& aTextures,
             const css::uno::Reference<css::geometry::XMapping2D>& xMapping,
-            const css::rendering::StrokeAttributes& aStrokeAttributes)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::rendering::StrokeAttributes& aStrokeAttributes) override;
 
     virtual css::uno::Reference<css::rendering::XPolyPolygon2D> SAL_CALL
         queryStrokeShapes(
             const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon,
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState,
-            const css::rendering::StrokeAttributes& aStrokeAttributes)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::rendering::StrokeAttributes& aStrokeAttributes) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
         fillPolyPolygon(
             const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon,
             const css::rendering::ViewState& aViewState,
-            const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::rendering::RenderState& aRenderState) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
         fillTexturedPolyPolygon(
             const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon,
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState,
-            const css::uno::Sequence<css::rendering::Texture>& xTextures)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence<css::rendering::Texture>& xTextures) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
         fillTextureMappedPolyPolygon(
@@ -214,24 +195,18 @@ public:
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState,
             const css::uno::Sequence< css::rendering::Texture >& xTextures,
-            const css::uno::Reference< css::geometry::XMapping2D >& xMapping)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::geometry::XMapping2D >& xMapping) override;
 
     virtual css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL
         createFont(
             const css::rendering::FontRequest& aFontRequest,
             const css::uno::Sequence< css::beans::PropertyValue >& aExtraFontProperties,
-            const css::geometry::Matrix2D& aFontMatrix)
-        throw (css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::geometry::Matrix2D& aFontMatrix) override;
 
     virtual css::uno::Sequence<css::rendering::FontInfo> SAL_CALL
         queryAvailableFonts(
             const css::rendering::FontInfo& aFilter,
-            const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
         drawText(
@@ -239,100 +214,74 @@ public:
             const css::uno::Reference< css::rendering::XCanvasFont >& xFont,
             const css::rendering::ViewState& aViewState,
             const css::rendering::RenderState& aRenderState,
-            ::sal_Int8 nTextDirection)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            ::sal_Int8 nTextDirection) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
         drawTextLayout(
             const css::uno::Reference< css::rendering::XTextLayout >& xLayoutetText,
             const css::rendering::ViewState& aViewState,
-            const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::rendering::RenderState& aRenderState) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
         drawBitmap(
             const css::uno::Reference< css::rendering::XBitmap >& xBitmap,
             const css::rendering::ViewState& aViewState,
-            const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::rendering::RenderState& aRenderState) override;
 
     virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL
         drawBitmapModulated(
             const css::uno::Reference< css::rendering::XBitmap>& xBitmap,
             const css::rendering::ViewState& aViewState,
-            const css::rendering::RenderState& aRenderState)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::rendering::RenderState& aRenderState) override;
 
     virtual css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL
-        getDevice()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getDevice() override;
 
     // XSpriteCanvas
 
     css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL
         createSpriteFromAnimation (
-            const css::uno::Reference< css::rendering::XAnimation >& animation)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::rendering::XAnimation >& animation) override;
 
     css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL
         createSpriteFromBitmaps (
             const css::uno::Sequence<
                 css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps,
-            ::sal_Int8 interpolationMode)
-        throw (css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException,
-            css::uno::RuntimeException, std::exception) override;
+            ::sal_Int8 interpolationMode) override;
 
     css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL
         createCustomSprite (
-            const css::geometry::RealSize2D& spriteSize)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::geometry::RealSize2D& spriteSize) override;
 
     css::uno::Reference< css::rendering::XSprite > SAL_CALL
         createClonedSprite (
-            const css::uno::Reference< css::rendering::XSprite >& original)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::rendering::XSprite >& original) override;
 
-    sal_Bool SAL_CALL updateScreen (sal_Bool bUpdateAll)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL updateScreen (sal_Bool bUpdateAll) override;
 
     // 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;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XBitmap
 
-    virtual css::geometry::IntegerSize2D SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::geometry::IntegerSize2D SAL_CALL getSize() override;
 
-    virtual sal_Bool SAL_CALL hasAlpha()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasAlpha() override;
 
     virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getScaledBitmap(
         const css::geometry::RealSize2D& rNewSize,
-        sal_Bool bFast)
-        throw (css::uno::RuntimeException,
-            css::lang::IllegalArgumentException,
-            css::rendering::VolatileContentDestroyedException, std::exception) override;
+        sal_Bool bFast) override;
 
 private:
     css::uno::Reference<css::rendering::XSpriteCanvas> mxUpdateCanvas;
@@ -374,8 +323,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 7a7f4856da53..f452e0d41893 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -58,7 +58,6 @@ PresenterHelper::~PresenterHelper()
 //----- XInitialize -----------------------------------------------------------
 
 void SAL_CALL PresenterHelper::initialize (const Sequence<Any>& rArguments)
-    throw(Exception,RuntimeException, std::exception)
 {
     (void)rArguments;
 }
@@ -71,7 +70,6 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow (
     sal_Bool bInitiallyVisible,
     sal_Bool bEnableChildTransparentMode,
     sal_Bool bEnableParentClip)
-    throw (css::uno::RuntimeException, std::exception)
 {
     VclPtr<vcl::Window> pParentWindow(VCLUnoHelper::GetWindow(rxParentWindow));
 
@@ -119,7 +117,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas (
     const Reference<rendering::XCanvas>& rxSharedCanvas,
     const Reference<awt::XWindow>& rxSharedWindow,
     const Reference<awt::XWindow>& rxWindow)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if ( ! rxSharedCanvas.is()
         || ! rxSharedWindow.is()
@@ -143,7 +140,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
     const Reference<awt::XWindow>& rxWindow,
     sal_Int16 nRequestedCanvasFeatures,
     const OUString& rsOptionalCanvasServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)nRequestedCanvasFeatures;
 
@@ -177,7 +173,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
 
 void SAL_CALL PresenterHelper::toTop (
     const Reference<awt::XWindow>& rxWindow)
-    throw (css::uno::RuntimeException, std::exception)
 {
     VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(rxWindow);
     if (pWindow)
@@ -199,7 +194,6 @@ struct IdMapEntry {
 Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap (
     const OUString& id,
     const Reference<rendering::XCanvas>& rxCanvas)
-    throw (RuntimeException, std::exception)
 {
     if ( ! rxCanvas.is())
         return nullptr;
@@ -421,7 +415,6 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap (
 
 void SAL_CALL PresenterHelper::captureMouse (
     const Reference<awt::XWindow>& rxWindow)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex());
 
@@ -434,7 +427,6 @@ void SAL_CALL PresenterHelper::captureMouse (
 }
 
 void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWindow)
-    throw (RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex());
 
@@ -449,7 +441,6 @@ void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWi
 awt::Rectangle PresenterHelper::getWindowExtentsRelative (
     const Reference<awt::XWindow>& rxChildWindow,
     const Reference<awt::XWindow>& rxParentWindow)
-    throw (RuntimeException, std::exception)
 {
     VclPtr<vcl::Window> pChildWindow = VCLUnoHelper::GetWindow(rxChildWindow);
     VclPtr<vcl::Window> pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow);
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index e5f0113f068b..cad98b4b15f4 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -48,8 +48,7 @@ public:
 
     // XInitialize
 
-    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
-        throw(css::uno::Exception,css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
     // XPresenterHelper
 
@@ -58,42 +57,34 @@ public:
         sal_Bool bCreateSystemChildWindow,
         sal_Bool bInitiallyVisible,
         sal_Bool bEnableChildTransparentMode,
-        sal_Bool bEnableParentClip)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bEnableParentClip) override;
 
     virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createSharedCanvas (
         const css::uno::Reference<css::rendering::XSpriteCanvas>& rxUpdateCanvas,
         const css::uno::Reference<css::awt::XWindow>& rxUpdateWindow,
         const css::uno::Reference<css::rendering::XCanvas>& rxSharedCanvas,
         const css::uno::Reference<css::awt::XWindow>& rxSharedWindow,
-        const css::uno::Reference<css::awt::XWindow>& rxWindow)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::awt::XWindow>& rxWindow) override;
 
     virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createCanvas (
         const css::uno::Reference<css::awt::XWindow>& rxWindow,
         sal_Int16 nRequestedCanvasFeatures,
-        const OUString& rsOptionalCanvasServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& rsOptionalCanvasServiceName) override;
 
     virtual void SAL_CALL toTop (
-        const css::uno::Reference<css::awt::XWindow>& rxWindow)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::awt::XWindow>& rxWindow) override;
 
     virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL loadBitmap (
         const OUString& rsURL,
-        const css::uno::Reference<css::rendering::XCanvas>& rxCanvas)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) override;
 
-    virtual void SAL_CALL captureMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL captureMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow) override;
 
-    virtual void SAL_CALL releaseMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL releaseMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow) override;
 
     virtual css::awt::Rectangle SAL_CALL getWindowExtentsRelative (
         const css::uno::Reference<css::awt::XWindow>& rxChildWindow,
-        const css::uno::Reference<css::awt::XWindow>& rxParentWindow)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::awt::XWindow>& rxParentWindow) override;
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 749e3b694803..da02be8d842d 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -87,7 +87,6 @@ PresenterPreviewCache::~PresenterPreviewCache()
 //----- XInitialize -----------------------------------------------------------
 
 void SAL_CALL PresenterPreviewCache::initialize (const Sequence<Any>& rArguments)
-    throw(Exception, RuntimeException, std::exception)
 {
     if (rArguments.getLength() != 0)
         throw RuntimeException();
@@ -98,7 +97,6 @@ void SAL_CALL PresenterPreviewCache::initialize (const Sequence<Any>& rArguments
 void SAL_CALL PresenterPreviewCache::setDocumentSlides (
     const Reference<container::XIndexAccess>& rxSlides,
     const Reference<XInterface>& rxDocument)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     OSL_ASSERT(mpCacheContext.get()!=nullptr);
@@ -109,7 +107,6 @@ void SAL_CALL PresenterPreviewCache::setDocumentSlides (
 void SAL_CALL PresenterPreviewCache::setVisibleRange (
     sal_Int32 nFirstVisibleSlideIndex,
     sal_Int32 nLastVisibleSlideIndex)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     OSL_ASSERT(mpCacheContext.get()!=nullptr);
@@ -119,7 +116,6 @@ void SAL_CALL PresenterPreviewCache::setVisibleRange (
 
 void SAL_CALL PresenterPreviewCache::setPreviewSize (
     const css::geometry::IntegerSize2D& rSize)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     OSL_ASSERT(mpCache.get()!=nullptr);
@@ -131,7 +127,6 @@ void SAL_CALL PresenterPreviewCache::setPreviewSize (
 Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview (
     sal_Int32 nSlideIndex,
     const Reference<rendering::XCanvas>& rxCanvas)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     OSL_ASSERT(mpCacheContext.get()!=nullptr);
@@ -154,7 +149,6 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview (
 
 void SAL_CALL PresenterPreviewCache::addPreviewCreationNotifyListener (
     const Reference<drawing::XSlidePreviewCacheListener>& rxListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
         return;
@@ -164,14 +158,12 @@ void SAL_CALL PresenterPreviewCache::addPreviewCreationNotifyListener (
 
 void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener (
     const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mpCacheContext->RemovePreviewCreationNotifyListener(rxListener);
 }
 
 void SAL_CALL PresenterPreviewCache::pause()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     OSL_ASSERT(mpCache.get()!=nullptr);
@@ -179,7 +171,6 @@ void SAL_CALL PresenterPreviewCache::pause()
 }
 
 void SAL_CALL PresenterPreviewCache::resume()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     OSL_ASSERT(mpCache.get()!=nullptr);
@@ -187,7 +178,6 @@ void SAL_CALL PresenterPreviewCache::resume()
 }
 
 void PresenterPreviewCache::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index 20af28218214..9c611dc72744 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -52,44 +52,35 @@ public:
     /** Accepts no arguments.  All values that are necessary to set up a
         preview cache can be provided via methods.
     */
-    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
-        throw(css::uno::Exception,css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
     // XSlidePreviewCache
 
     virtual void SAL_CALL setDocumentSlides (
         const css::uno::Reference<css::container::XIndexAccess>& rxSlides,
-        const css::uno::Reference<css::uno::XInterface>& rxDocument)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::uno::XInterface>& rxDocument) override;
 
     virtual void SAL_CALL setVisibleRange (
         sal_Int32 nFirstVisibleSlideIndex,
-        sal_Int32 nLastVisibleSlideIndex)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nLastVisibleSlideIndex) override;
 
     virtual void SAL_CALL setPreviewSize (
-        const css::geometry::IntegerSize2D& rSize)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::geometry::IntegerSize2D& rSize) override;
 
     virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL
         getSlidePreview (
             sal_Int32 nSlideIndex,
-            const css::uno::Reference<css::rendering::XCanvas>& rxCanvas)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) override;
 
     virtual void SAL_CALL addPreviewCreationNotifyListener (
-        const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) override;
 
     virtual void SAL_CALL removePreviewCreationNotifyListener (
-        const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) override;
 
-    virtual void SAL_CALL pause()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL pause() override;
 
-    virtual void SAL_CALL resume()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL resume() override;
 
 private:
     class PresenterCacheContext;
@@ -100,7 +91,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed() throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 74ab94f7e667..ae5d81c9d802 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -115,7 +115,6 @@ void SAL_CALL PresenterTextView::disposing()
 
 // XInitialization
 void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -217,7 +216,6 @@ Any PresenterTextView::SetPropertyValue (
 }
 
 void PresenterTextView::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (PresenterTextViewInterfaceBase::rBHelper.bDisposed
         || PresenterTextViewInterfaceBase::rBHelper.bInDispose
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx
index ab70375b13fc..1024eccb5eb1 100644
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ b/sd/source/ui/presenter/PresenterTextView.hxx
@@ -52,8 +52,7 @@ public:
 
     // XInitialization
 
-    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
 protected:
     virtual void SAL_CALL disposing() override;
@@ -71,7 +70,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed() throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index b0a6f088efea..f00cff827f4b 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -52,7 +52,6 @@ void SAL_CALL SlideRenderer::disposing()
 //----- XInitialization -------------------------------------------------------
 
 void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -64,19 +63,16 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments)
 }
 
 OUString SlideRenderer::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Draw.SlideRenderer");
 }
 
 sal_Bool SlideRenderer::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> SlideRenderer::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{"com.sun.star.drawing.SlideRenderer"};
 }
@@ -87,7 +83,6 @@ Reference<awt::XBitmap> SlideRenderer::createPreview (
     const Reference<drawing::XDrawPage>& rxSlide,
     const awt::Size& rMaximalSize,
     sal_Int16 nSuperSampleFactor)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
@@ -101,7 +96,6 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas (
     const awt::Size& rMaximalSize,
     sal_Int16 nSuperSampleFactor,
     const Reference<rendering::XCanvas>& rxCanvas)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
@@ -119,7 +113,6 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas (
 awt::Size SAL_CALL SlideRenderer::calculatePreviewSize (
     double nSlideAspectRatio,
     const awt::Size& rMaximalSize)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (rMaximalSize.Width <= 0
         || rMaximalSize.Height <= 0
@@ -143,8 +136,6 @@ BitmapEx SlideRenderer::CreatePreview (
     const Reference<drawing::XDrawPage>& rxSlide,
     const awt::Size& rMaximalSize,
     sal_Int16 nSuperSampleFactor)
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
     const SdPage* pPage = SdPage::getImplementation(rxSlide);
     if (pPage == nullptr)
@@ -198,7 +189,6 @@ BitmapEx SlideRenderer::CreatePreview (
 }
 
 void SlideRenderer::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx
index ca7de46f9cd7..5e0ad57d7dc2 100644
--- a/sd/source/ui/presenter/SlideRenderer.hxx
+++ b/sd/source/ui/presenter/SlideRenderer.hxx
@@ -54,37 +54,30 @@ public:
 
     // XInitialization
 
-    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XSlideRenderer
 
     virtual css::uno::Reference<css::awt::XBitmap> SAL_CALL createPreview (
         const css::uno::Reference<css::drawing::XDrawPage>& rxSlide,
         const css::awt::Size& rMaximumPreviewPixelSize,
-        sal_Int16 nSuperSampleFactor)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Int16 nSuperSampleFactor) override;
 
     virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL createPreviewForCanvas (
         const css::uno::Reference<css::drawing::XDrawPage>& rxSlide,
         const css::awt::Size& rMaximumPreviewPixelSize,
         sal_Int16 nSuperSampleFactor,
-        const css::uno::Reference<css::rendering::XCanvas>& rxCanvas)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) override;
 
     virtual css::awt::Size SAL_CALL calculatePreviewSize (
         double nSlideAspectRatio,
-        const css::awt::Size& rMaximumPreviewPixelSize)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Size& rMaximumPreviewPixelSize) override;
 
 private:
     PreviewRenderer maPreviewRenderer;
@@ -93,13 +86,12 @@ private:
     BitmapEx CreatePreview (
         const css::uno::Reference<css::drawing::XDrawPage>& rxSlide,
         const css::awt::Size& rMaximumPreviewPixelSize,
-        sal_Int16 nSuperSampleFactor)
-        throw (css::uno::RuntimeException, std::exception);
+        sal_Int16 nSuperSampleFactor);
 
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed() throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index 4792d6e61bfa..00e50c289093 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -64,20 +64,19 @@ void Listener::init( const css::uno::Reference< css::presentation::XSlideShowCon
 //----- XAnimationListener ----------------------------------------------------
 
 void SAL_CALL Listener::beginEvent(const css::uno::Reference<
-    css::animations::XAnimationNode >&  rNode ) throw (css::uno::RuntimeException, std::exception)
+    css::animations::XAnimationNode >&  rNode )
 {
     (void) rNode;
 }
 
 void SAL_CALL Listener::endEvent( const css::uno::Reference<
-    css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception)
+    css::animations::XAnimationNode >& rNode )
 {
     (void) rNode;
 }
 
 void SAL_CALL Listener::repeat( const css::uno::Reference<
     css::animations::XAnimationNode >& rNode, ::sal_Int32 aRepeat )
-     throw (css::uno::RuntimeException, std::exception)
 {
     (void) rNode;
     (void) aRepeat;
@@ -86,28 +85,23 @@ void SAL_CALL Listener::repeat( const css::uno::Reference<
 //----- XSlideShowListener ----------------------------------------------------
 
 void SAL_CALL Listener::paused()
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Listener::resumed()
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Listener::slideEnded (sal_Bool bReverse)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void) bReverse;
 }
 
 void SAL_CALL Listener::hyperLinkClicked (const OUString &)
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Listener::slideTransitionStarted()
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_Int32 aSlide = mController->getCurrentSlideIndex();
 
@@ -123,12 +117,10 @@ void SAL_CALL Listener::slideTransitionStarted()
 }
 
 void SAL_CALL Listener::slideTransitionEnded()
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL Listener::slideAnimationsEnded()
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -145,7 +137,6 @@ void SAL_CALL Listener::disposing()
 
 void SAL_CALL Listener::disposing (
     const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void) rEvent;
     dispose();
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index e62b67340411..1e7bc4cca395 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -37,27 +37,24 @@ public:
 
     // XAnimationListener
     virtual void SAL_CALL beginEvent(const css::uno::Reference<
-        css::animations::XAnimationNode >&  rNode ) throw (css::uno::RuntimeException, std::exception) override;
+        css::animations::XAnimationNode >&  rNode ) override;
     virtual void SAL_CALL endEvent( const css::uno::Reference<
-        css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) override;
+        css::animations::XAnimationNode >& rNode ) override;
     virtual void SAL_CALL repeat( const css::uno::Reference<
-        css::animations::XAnimationNode >& rNode, ::sal_Int32 Repeat )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::animations::XAnimationNode >& rNode, ::sal_Int32 Repeat ) override;
 
     // XSlideShowListener
-    virtual void SAL_CALL paused(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL resumed(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideTransitionStarted(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideTransitionEnded(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideAnimationsEnded(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL paused(  ) override;
+    virtual void SAL_CALL resumed(  ) override;
+    virtual void SAL_CALL slideTransitionStarted(  ) override;
+    virtual void SAL_CALL slideTransitionEnded(  ) override;
+    virtual void SAL_CALL slideAnimationsEnded(  ) override;
+    virtual void SAL_CALL slideEnded(sal_Bool bReverse) override;
+    virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) override;
 
     // XEventListener
     virtual void SAL_CALL disposing() override;
-    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;
 
 private:
     rtl::Reference<Communicator> mCommunicator;
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 808686361d9b..7e1048114eea 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -68,10 +68,6 @@ void SAL_CALL PanelFactory::disposing()
 Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
     const ::rtl::OUString& rsUIElementResourceURL,
     const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-    throw(
-        css::container::NoSuchElementException,
-        css::lang::IllegalArgumentException,
-        css::uno::RuntimeException, std::exception)
 {
     // Process arguments.
     const ::comphelper::NamedValueCollection aArguments (rArguments);
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index de4a6ec9f2db..444438255ea0 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -57,11 +57,7 @@ public:
 
     css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
         const ::rtl::OUString& rsResourceURL,
-        const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-        throw(
-            css::container::NoSuchElementException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 };
 
 } } // end of namespace sd::sidebar
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 2cbdf1e6dd52..23bea3a068ee 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -135,7 +135,7 @@ SlideShow::SlideShow( SdDrawDocument* pDoc )
 {
 }
 
-void SlideShow::ThrowIfDisposed() const throw (RuntimeException)
+void SlideShow::ThrowIfDisposed() const
 {
     if( mpDoc == nullptr )
         throw DisposedException();
@@ -226,17 +226,17 @@ void SlideShow::CreateController(  ViewShell* pViewSh, ::sd::View* pView, vcl::W
 }
 
 // XServiceInfo
-OUString SAL_CALL SlideShow::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL SlideShow::getImplementationName(  )
 {
     return OUString( "com.sun.star.comp.sd.SlideShow" );
 }
 
-sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames(  )
 {
     OUString aService( "com.sun.star.presentation.Presentation" );
     Sequence< OUString > aSeq( &aService, 1 );
@@ -244,14 +244,14 @@ Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames(  ) throw(Runt
 }
 
 // XPropertySet
-Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo()
 {
     SolarMutexGuard aGuard;
     static Reference< XPropertySetInfo > xInfo = maPropSet.getPropertySetInfo();
     return xInfo;
  }
 
-void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
 {
     SolarMutexGuard aGuard;
     ThrowIfDisposed();
@@ -513,7 +513,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const
         mpDoc->SetChanged();
 }
 
-Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
     ThrowIfDisposed();
@@ -579,25 +579,25 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U
     }
 }
 
-void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  )
 {
 }
 
-void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  )
 {
 }
 
-void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  )
 {
 }
 
-void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  )
 {
 }
 
 // XPresentation
 
-void SAL_CALL SlideShow::start() throw(RuntimeException, std::exception)
+void SAL_CALL SlideShow::start()
 {
     const Sequence< PropertyValue > aArguments;
     startWithArguments( aArguments );
@@ -631,7 +631,6 @@ void SlideShow::SetExitAfterPresenting(bool bExit)
 }
 
 void SAL_CALL SlideShow::end()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -774,7 +773,7 @@ void SAL_CALL SlideShow::end()
     }
 }
 
-void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exception)
+void SAL_CALL SlideShow::rehearseTimings()
 {
     Sequence< PropertyValue > aArguments(1);
     aArguments[0].Name = "RehearseTimings";
@@ -785,7 +784,6 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exceptio
 // XPresentation2
 
 void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rArguments)
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ThrowIfDisposed();
@@ -846,13 +844,13 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rAr
 
 }
 
-sal_Bool SAL_CALL SlideShow::isRunning(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideShow::isRunning(  )
 {
     SolarMutexGuard aGuard;
     return mxController.is() && mxController->isRunning();
 }
 
-Reference< XSlideShowController > SAL_CALL SlideShow::getController(  ) throw (RuntimeException, std::exception)
+Reference< XSlideShowController > SAL_CALL SlideShow::getController(  )
 {
     ThrowIfDisposed();
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index f34d6972e312..2da56df510a4 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1163,13 +1163,13 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ )
     }
 }
 
-void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener )
 {
     if( mxListenerProxy.is() )
         mxListenerProxy->addSlideShowListener( xListener );
 }
 
-void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener )
 {
     if( mxListenerProxy.is() )
         mxListenerProxy->removeSlideShowListener( xListener );
@@ -1273,7 +1273,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
     }
 }
 
-void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Exception, std::exception )
+void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes )
 {
     try
     {
@@ -1393,7 +1393,7 @@ IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl, void*, void)
         mxPresentation->end();
 }
 
-void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::pause()
 {
     SolarMutexGuard aSolarGuard;
 
@@ -1419,7 +1419,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception)
     }
 }
 
-void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::resume()
 {
     SolarMutexGuard aSolarGuard;
 
@@ -1456,13 +1456,13 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception)
 #endif
 }
 
-sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::isPaused()
 {
     SolarMutexGuard aSolarGuard;
     return mbIsPaused;
 }
 
-void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -1619,7 +1619,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark
     return ( nPgNum - 1) >> 1;
 }
 
-void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException, std::exception)
+void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink )
 {
     OUString aBookmark( aHyperLink );
 
@@ -1670,7 +1670,7 @@ sal_Int32 SlideshowImpl::getCurrentSlideNumber()
     return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1;
 }
 
-sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SlideshowImpl::isEndless()
 {
     SolarMutexGuard aSolarGuard;
     return maPresSettings.mbEndless;
@@ -2500,7 +2500,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible )
     }
 }
 
-void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::activate()
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2539,7 +2539,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception)
     }
 }
 
-void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::deactivate()
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2570,7 +2570,7 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl, Timer *, void)
     }
 }
 
-sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::isActive()
 {
     SolarMutexGuard aSolarGuard;
     return mbActive;
@@ -2600,7 +2600,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
     }
 }
 
-Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException, std::exception)
+Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide()
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2615,7 +2615,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE
     return xSlide;
 }
 
-sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex()
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2629,19 +2629,19 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, s
     }
 }
 
-sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex()
 {
     return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1;
 }
 
 // css::presentation::XSlideShowController:
 
-::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount()
 {
     return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0;
 }
 
-Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception)
+Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index)
 {
     if( (mpSlideController.get() == nullptr ) || (Index < 0) || (Index >= mpSlideController->getSlideIndexCount() ) )
         throw IndexOutOfBoundsException();
@@ -2649,13 +2649,13 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index
     return mpSlideController->getSlideByNumber( mpSlideController->getSlideNumber( Index ) );
 }
 
-sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop()
 {
     SolarMutexGuard aSolarGuard;
     return maPresSettings.mbAlwaysOnTop;
 }
 
-void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways )
 {
     SolarMutexGuard aSolarGuard;
     if( maPresSettings.mbAlwaysOnTop != bool(bAlways) )
@@ -2665,19 +2665,19 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx
     }
 }
 
-sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::isFullScreen()
 {
     SolarMutexGuard aSolarGuard;
     return maPresSettings.mbFullScreen;
 }
 
-sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::getMouseVisible()
 {
     SolarMutexGuard aSolarGuard;
     return maPresSettings.mbMouseVisible;
 }
 
-void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible )
 {
     SolarMutexGuard aSolarGuard;
     if( maPresSettings.mbMouseVisible != bool(bVisible) )
@@ -2688,13 +2688,13 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime
     }
 }
 
-sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::getUsePen()
 {
     SolarMutexGuard aSolarGuard;
     return mbUsePen;
 }
 
-void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen )
 {
     SolarMutexGuard aSolarGuard;
     mbUsePen = bMouseAsPen;
@@ -2735,33 +2735,33 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
     }
 }
 
-double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException, std::exception)
+double SAL_CALL SlideshowImpl::getPenWidth()
 {
     SolarMutexGuard aSolarGuard;
     return mdUserPaintStrokeWidth;
 }
 
-void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth )
 {
     SolarMutexGuard aSolarGuard;
     mdUserPaintStrokeWidth = dStrokeWidth;
     setUsePen( true ); // enable pen mode, update color and width
 }
 
-sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SlideshowImpl::getPenColor()
 {
     SolarMutexGuard aSolarGuard;
     return mnUserPaintColor;
 }
 
-void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor )
 {
     SolarMutexGuard aSolarGuard;
     mnUserPaintColor = nColor;
     setUsePen( true ); // enable pen mode, update color
 }
 
-void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException)
+void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk)
 {
     if( bEraseAllInk )
     {
@@ -2782,13 +2782,13 @@ void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeExc
 }
 
 // XSlideShowController Methods
-sal_Bool SAL_CALL SlideshowImpl::isRunning(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::isRunning(  )
 {
     SolarMutexGuard aSolarGuard;
     return mxShow.is();
 }
 
-void SAL_CALL SlideshowImpl::gotoNextEffect(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoNextEffect(  )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2814,7 +2814,7 @@ void SAL_CALL SlideshowImpl::gotoNextEffect(  ) throw (RuntimeException, std::ex
     }
 }
 
-void SAL_CALL SlideshowImpl::gotoPreviousEffect(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoPreviousEffect(  )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2836,7 +2836,7 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect(  ) throw (RuntimeException, std
     }
 }
 
-void SAL_CALL SlideshowImpl::gotoFirstSlide(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoFirstSlide(  )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2857,7 +2857,7 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide(  ) throw (RuntimeException, std::ex
     }
 }
 
-void SAL_CALL SlideshowImpl::gotoNextSlide(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoNextSlide(  )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -2928,7 +2928,7 @@ void SAL_CALL SlideshowImpl::gotoNextSlide(  ) throw (RuntimeException, std::exc
     }
 }
 
-void SAL_CALL SlideshowImpl::gotoPreviousSlide(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoPreviousSlide(  )
 {
     gotoPreviousSlide(false);
 }
@@ -2982,7 +2982,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
     }
 }
 
-void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoLastSlide()
 {
     SolarMutexGuard aSolarGuard;
 
@@ -3006,7 +3006,7 @@ void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::excep
     }
 }
 
-void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -3019,7 +3019,6 @@ void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (Ru
 }
 
 void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide )
-    throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
 
@@ -3039,7 +3038,7 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide )
     }
 }
 
-void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -3049,7 +3048,7 @@ void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeEx
     displaySlideIndex( nIndex );
 }
 
-void SAL_CALL SlideshowImpl::stopSound(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::stopSound(  )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -3074,27 +3073,27 @@ void SAL_CALL SlideshowImpl::stopSound(  ) throw (RuntimeException, std::excepti
 
 // XIndexAccess
 
-::sal_Int32 SAL_CALL SlideshowImpl::getCount(  ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SlideshowImpl::getCount(  )
 {
     return getSlideCount();
 }
 
-css::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index )
 {
     return Any( getSlideByIndex( Index ) );
 }
 
-css::uno::Type SAL_CALL SlideshowImpl::getElementType(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Type SAL_CALL SlideshowImpl::getElementType(  )
 {
     return cppu::UnoType<XDrawPage>::get();
 }
 
-sal_Bool SAL_CALL SlideshowImpl::hasElements(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::hasElements(  )
 {
     return getSlideCount() != 0;
 }
 
-Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException, std::exception)
+Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow()
 {
     return mxShow;
 }
@@ -3115,7 +3114,7 @@ PresentationSettingsEx::PresentationSettingsEx( PresentationSettings& r )
 {
 }
 
-void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArguments ) throw (IllegalArgumentException, std::exception)
+void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArguments )
 {
     sal_Int32 nArguments = rArguments.getLength();
     const PropertyValue* pValue = rArguments.getConstArray();
@@ -3127,7 +3126,7 @@ void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArg
     }
 }
 
-void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue ) throw (IllegalArgumentException, std::exception)
+void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue )
 {
     if ( rProperty == "RehearseTimings" )
     {
@@ -3276,7 +3275,7 @@ void SlideShowListenerProxy::removeSlideShowListener( const css::uno::Reference<
     maListeners.removeInterface(xListener);
 }
 
-void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3289,7 +3288,7 @@ void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNod
     }
 }
 
-void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3302,7 +3301,7 @@ void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode
     }
 }
 
-void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3317,7 +3316,7 @@ void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >&
 
 // css::presentation::XSlideShowListener:
 
-void SAL_CALL SlideShowListenerProxy::paused(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::paused(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3328,7 +3327,7 @@ void SAL_CALL SlideShowListenerProxy::paused(  ) throw (css::uno::RuntimeExcepti
         });
 }
 
-void SAL_CALL SlideShowListenerProxy::resumed(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::resumed(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3339,7 +3338,7 @@ void SAL_CALL SlideShowListenerProxy::resumed(  ) throw (css::uno::RuntimeExcept
         });
 }
 
-void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3350,7 +3349,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeEx
         });
 }
 
-void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3361,7 +3360,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (css::uno::R
         });
 }
 
-void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3372,7 +3371,7 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded(  ) throw (css::uno::
         });
 }
 
-void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException, std::exception)
+void SlideShowListenerProxy::slideEnded(sal_Bool bReverse)
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -3393,7 +3392,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti
     }
 }
 
-void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException, std::exception)
+void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink )
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -3416,7 +3415,7 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro
 
 // XEventListener
 
-void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& aDisposeEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& aDisposeEvent )
 {
     maListeners.disposeAndClear( aDisposeEvent );
     mxController.clear();
@@ -3425,7 +3424,7 @@ void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& a
 
 // XShapeEventListener
 
-void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& aOriginalEvent )
 {
     SolarMutexGuard aSolarGuard;
     if( mxController.is() )
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index eebe4c0a0a40..810e0709b288 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -101,10 +101,10 @@ struct PresentationSettingsEx : public PresentationSettings
     explicit PresentationSettingsEx( PresentationSettings& );
 
     /// @throws css::lang::IllegalArgumentException
-    void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException, std::exception);
+    void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments );
 
     /// @throws css::lang::IllegalArgumentException
-    void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, std::exception);
+    void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue );
 };
 
 struct WrappedShapeEventImpl
@@ -135,24 +135,24 @@ public:
     void removeShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape );
 
     // css::animations::XAnimationListener
-    virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override;
+    virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override;
+    virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) override;
 
     // css::presentation::XSlideShowListener:
-    virtual void SAL_CALL paused() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL resumed() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideTransitionStarted() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL paused() override;
+    virtual void SAL_CALL resumed() override;
+    virtual void SAL_CALL slideTransitionStarted() override;
+    virtual void SAL_CALL slideTransitionEnded() override;
+    virtual void SAL_CALL slideAnimationsEnded() override;
+    virtual void SAL_CALL slideEnded(sal_Bool bReverse) override;
+    virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) override;
 
     // css::lang::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;
 
     // css::presentation::XShapeEventListener:
-    virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) override;
 
     ::comphelper::OInterfaceContainerHelper2 maListeners;
 
@@ -171,57 +171,57 @@ public:
     explicit SlideshowImpl( const css::uno::Reference< css::presentation::XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow);
 
     // css::presentation::XSlideShowController:
-    virtual sal_Bool SAL_CALL getAlwaysOnTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAlwaysOnTop( sal_Bool _alwaysontop ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMouseVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMouseVisible( sal_Bool _mousevisible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getUsePen() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setUsePen( sal_Bool _usepen ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getAlwaysOnTop() override;
+    virtual void SAL_CALL setAlwaysOnTop( sal_Bool _alwaysontop ) override;
+    virtual sal_Bool SAL_CALL getMouseVisible() override;
+    virtual void SAL_CALL setMouseVisible( sal_Bool _mousevisible ) override;
+    virtual sal_Bool SAL_CALL getUsePen() override;
+    virtual void SAL_CALL setUsePen( sal_Bool _usepen ) override;
+    virtual ::sal_Int32 SAL_CALL getPenColor() override;
+    virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) override;
+    virtual double SAL_CALL getPenWidth() override;
+    virtual void SAL_CALL setPenWidth( double dStrokeWidth ) override;
     /// @throws css::uno::RuntimeException
-    void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL isRunning(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getSlideCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoNextEffect(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoPreviousEffect(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoFirstSlide(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoNextSlide(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoPreviousSlide(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoLastSlide(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stopSound(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL pause(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL resume(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isPaused(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL activate(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deactivate(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isActive(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getNextSlideIndex(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEndless(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isFullScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow(  ) throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setEraseAllInk( bool bEraseAllInk );
+    virtual sal_Bool SAL_CALL isRunning(  ) override;
+    virtual ::sal_Int32 SAL_CALL getSlideCount(  ) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) override;
+    virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) override;
+    virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) override;
+    virtual void SAL_CALL gotoNextEffect(  ) override;
+    virtual void SAL_CALL gotoPreviousEffect(  ) override;
+    virtual void SAL_CALL gotoFirstSlide(  ) override;
+    virtual void SAL_CALL gotoNextSlide(  ) override;
+    virtual void SAL_CALL gotoPreviousSlide(  ) override;
+    virtual void SAL_CALL gotoLastSlide(  ) override;
+    virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) override;
+    virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) override;
+    virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) override;
+    virtual void SAL_CALL stopSound(  ) override;
+    virtual void SAL_CALL pause(  ) override;
+    virtual void SAL_CALL resume(  ) override;
+    virtual sal_Bool SAL_CALL isPaused(  ) override;
+    virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) override;
+    virtual void SAL_CALL activate(  ) override;
+    virtual void SAL_CALL deactivate(  ) override;
+    virtual sal_Bool SAL_CALL isActive(  ) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide(  ) override;
+    virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex(  ) override;
+    virtual ::sal_Int32 SAL_CALL getNextSlideIndex(  ) override;
+    virtual sal_Bool SAL_CALL isEndless(  ) override;
+    virtual sal_Bool SAL_CALL isFullScreen(  ) override;
+    virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow(  ) override;
 
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow
     void slideEnded(const bool bReverse);
     /// @throws css::uno::RuntimeException
-    void hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException, std::exception);
+    void hyperLinkClicked(const OUString & hyperLink);
     void click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent);
     bool swipe(const CommandSwipeData &rSwipeData);
     bool longpress(const CommandLongPressData& rLongPressData);
@@ -304,7 +304,7 @@ private:
     void removeShapeEvents();
     void registerShapeEvents( sal_Int32 nSlideNumber );
     /// @throws css::uno::Exception
-    void registerShapeEvents( css::uno::Reference< css::drawing::XShapes >& xShapes ) throw (css::uno::Exception, std::exception);
+    void registerShapeEvents( css::uno::Reference< css::drawing::XShapes >& xShapes );
 
     static css::uno::Reference< css::presentation::XSlideShow > createSlideShow();
 
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 7437810555bd..a22e15baa598 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -67,7 +67,7 @@ void SlideShowViewListeners::removeListener( const Reference< util::XModifyListe
         maListeners.erase( aIter );
 }
 
-void SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( css::uno::Exception )
+void SlideShowViewListeners::notify( const lang::EventObject& _rEvent )
 {
     ::osl::MutexGuard aGuard( mrMutex );
 
@@ -109,7 +109,7 @@ SlideShowViewPaintListeners::SlideShowViewPaintListeners( ::osl::Mutex& rMutex )
 }
 
 bool SlideShowViewPaintListeners::implTypedNotify( const Reference< awt::XPaintListener >& rListener,
-                                              const awt::PaintEvent&                  rEvent ) throw( uno::Exception )
+                                              const awt::PaintEvent&                  rEvent )
 {
     rListener->windowPaint( rEvent );
     return true; // continue calling listeners
@@ -122,7 +122,7 @@ SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex )
 }
 
 bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseListener >&  rListener,
-                                              const WrappedMouseEvent&                  rEvent ) throw( uno::Exception )
+                                              const WrappedMouseEvent&                  rEvent )
 {
     switch( rEvent.meType )
     {
@@ -153,7 +153,7 @@ SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mut
 }
 
 bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::XMouseMotionListener >&  rListener,
-                                                    const WrappedMouseMotionEvent&                  rEvent ) throw( uno::Exception )
+                                                    const WrappedMouseMotionEvent&                  rEvent )
 {
     switch( rEvent.meType )
     {
@@ -200,7 +200,7 @@ SlideShowView::SlideShowView( ShowWindow&     rOutputWindow,
 }
 
 // Dispose all internal references
-void SAL_CALL SlideShowView::dispose() throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::dispose()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -227,7 +227,7 @@ void SAL_CALL SlideShowView::dispose() throw (RuntimeException, std::exception)
 }
 
 // Disposing our broadcaster
-void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(RuntimeException, std::exception)
+void SAL_CALL SlideShowView::disposing( const lang::EventObject& )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -252,7 +252,7 @@ void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(Runtime
     }
 }
 
-void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) throw (RuntimeException)
+void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -276,14 +276,14 @@ void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) throw (RuntimeExc
 }
 
 // XSlideShowView methods
-Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas(  ) throw (RuntimeException, std::exception)
+Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return mpCanvas.get() ? mpCanvas->getUNOSpriteCanvas() : Reference< rendering::XSpriteCanvas >();
 }
 
-void SAL_CALL SlideShowView::clear() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::clear()
 {
     // paint background in black
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -307,12 +307,12 @@ void SAL_CALL SlideShowView::clear() throw (css::uno::RuntimeException, std::exc
     }
 }
 
-geometry::IntegerSize2D SAL_CALL SlideShowView::getTranslationOffset( ) throw (RuntimeException, std::exception)
+geometry::IntegerSize2D SAL_CALL SlideShowView::getTranslationOffset( )
 {
         return mTranslationOffset;
 }
 
-geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation(  ) throw (RuntimeException, std::exception)
+geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     SolarMutexGuard aSolarGuard;
@@ -373,7 +373,7 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation(  ) throw (Ru
     return ::basegfx::unotools::affineMatrixFromHomMatrix( aRes, aMatrix );
 }
 
-void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< util::XModifyListener >& xListener )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -381,7 +381,7 @@ void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference<
         mpViewListeners->addListener( xListener );
 }
 
-void SAL_CALL SlideShowView::removeTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::removeTransformationChangedListener( const Reference< util::XModifyListener >& xListener )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -389,7 +389,7 @@ void SAL_CALL SlideShowView::removeTransformationChangedListener( const Referenc
         mpViewListeners->removeListener( xListener );
 }
 
-void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListener >& xListener )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -397,7 +397,7 @@ void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListe
         mpPaintListeners->addTypedListener( xListener );
 }
 
-void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintListener >& xListener )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -405,7 +405,7 @@ void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintLi
         mpPaintListeners->removeTypedListener( xListener );
 }
 
-void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListener >& xListener )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -413,7 +413,7 @@ void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListe
         mpMouseListeners->addTypedListener( xListener );
 }
 
-void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseListener >& xListener )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -421,7 +421,7 @@ void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseLi
         mpMouseListeners->removeTypedListener( xListener );
 }
 
-void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -437,7 +437,7 @@ void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMous
         mpMouseMotionListeners->addTypedListener( xListener );
 }
 
-void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -448,7 +448,7 @@ void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XM
     // events, when the last listener is gone.
 }
 
-void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -460,7 +460,7 @@ void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (Ru
         mxWindowPeer->setPointer( mxPointer );
 }
 
-awt::Rectangle SAL_CALL SlideShowView::getCanvasArea(  ) throw (RuntimeException, std::exception)
+awt::Rectangle SAL_CALL SlideShowView::getCanvasArea(  )
 {
     awt::Rectangle aRectangle;
 
@@ -493,7 +493,7 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp
 }
 
 // XWindowListener methods
-void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -509,23 +509,23 @@ void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (R
     }
 }
 
-void SAL_CALL SlideShowView::windowMoved( const awt::WindowEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::windowMoved( const awt::WindowEvent& )
 {
     // ignored
 }
 
-void SAL_CALL SlideShowView::windowShown( const lang::EventObject& ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::windowShown( const lang::EventObject& )
 {
     // ignored
 }
 
-void SAL_CALL SlideShowView::windowHidden( const lang::EventObject& ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::windowHidden( const lang::EventObject& )
 {
     // ignored
 }
 
 // XMouseListener implementation
-void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     if( mpSlideShow && mpSlideShow->isInputFreezed() )
@@ -549,7 +549,7 @@ void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) throw (uno
     }
 }
 
-void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     if( mbMousePressedEaten )
@@ -572,7 +572,7 @@ void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) throw (un
     }
 }
 
-void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -588,7 +588,7 @@ void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) throw (uno
     updateimpl( aGuard, mpSlideShow ); // warning: clears guard!
 }
 
-void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -605,7 +605,7 @@ void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e ) throw (uno:
 }
 
 // XMouseMotionListener implementation
-void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -621,7 +621,7 @@ void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e ) throw (uno
     updateimpl( aGuard, mpSlideShow ); // warning: clears guard!
 }
 
-void SAL_CALL SlideShowView::mouseMoved( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseMoved( const awt::MouseEvent& e )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 0d3eceba2abd..4f96a8772394 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -106,7 +106,7 @@ public:
     void    addListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener );
     void    removeListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener );
     /// @throws css::uno::Exception
-    void    notify( const css::lang::EventObject& _rEvent ) throw( css::uno::Exception );
+    void    notify( const css::lang::EventObject& _rEvent );
     void    disposing( const css::lang::EventObject& _rEventSource );
 
 protected:
@@ -124,7 +124,7 @@ public:
     SlideShowViewPaintListeners( ::osl::Mutex& rMutex );
 
 protected:
-    virtual bool implTypedNotify( const css::uno::Reference< css::awt::XPaintListener >& rListener, const css::awt::PaintEvent& rEvent ) throw( css::uno::Exception ) override;
+    virtual bool implTypedNotify( const css::uno::Reference< css::awt::XPaintListener >& rListener, const css::awt::PaintEvent& rEvent ) override;
 };
 
 // SlideShowViewMouseListeners
@@ -137,7 +137,7 @@ public:
 
 protected:
     virtual bool implTypedNotify( const css::uno::Reference< css::awt::XMouseListener >&  rListener,
-                             const WrappedMouseEvent&                   rEvent ) throw( css::uno::Exception ) override;
+                             const WrappedMouseEvent&                   rEvent ) override;
 };
 
 
@@ -152,7 +152,7 @@ public:
 
 protected:
     virtual bool implTypedNotify( const css::uno::Reference< css::awt::XMouseMotionListener >&    rListener,
-                             const WrappedMouseMotionEvent&                 rEvent ) throw( css::uno::Exception ) override;
+                             const WrappedMouseMotionEvent&                 rEvent ) override;
 };
 
 // SlideShowView
@@ -177,45 +177,45 @@ public:
     void ignoreNextMouseReleased() { mbMousePressedEaten = true; }
 
     /// Dispose all internal references
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     /// Disposing our broadcaster
-    virtual void SAL_CALL disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& ) override;
 
     /// @throws css::uno::RuntimeException
-    void SAL_CALL paint( const css::awt::PaintEvent& e ) throw (css::uno::RuntimeException);
+    void SAL_CALL paint( const css::awt::PaintEvent& e );
 
     // XSlideShowView methods
-    virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clear(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCanvasArea(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas(  ) override;
+    virtual void SAL_CALL clear(  ) override;
+    virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation(  ) override;
+    virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) override;
+    virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override;
+    virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override;
+    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) override;
+    virtual css::awt::Rectangle SAL_CALL getCanvasArea(  ) override;
 
     // XWindowListener methods
-    virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override;
+    virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override;
+    virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) override;
 
     // XMouseListener implementation
-    virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) override;
+    virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) override;
+    virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) override;
+    virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) override;
 
     // XMouseMotionListener implementation
-    virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) override;
+    virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) override;
 
     using cppu::WeakComponentImplHelperBase::disposing;
 
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 330e1a71a88a..271ff8ad02fa 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -394,7 +394,6 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent
 
 void SAL_CALL Listener::disposing (
     const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     if ((mbListeningToDocument || mbListeningToUNODocument)
         && mrSlideSorter.GetModel().GetDocument()!=nullptr
@@ -418,7 +417,6 @@ void SAL_CALL Listener::disposing (
 
 void SAL_CALL Listener::notifyEvent (
     const document::EventObject& )
-    throw (RuntimeException, std::exception)
 {
 }
 
@@ -426,7 +424,6 @@ void SAL_CALL Listener::notifyEvent (
 
 void SAL_CALL Listener::propertyChange (
     const PropertyChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -475,7 +472,6 @@ void SAL_CALL Listener::propertyChange (
 //===== frame::XFrameActionListener  ==========================================
 
 void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     switch (rEvent.Action)
     {
@@ -500,7 +496,6 @@ void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent)
 
 void SAL_CALL Listener::notifyEvent (
     const AccessibleEventObject& )
-    throw (RuntimeException, std::exception)
 {
 }
 
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index 429ff75162d4..3b0d26e619d8 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -96,27 +96,23 @@ public:
 
     //=====  lang::XEventListener  ============================================
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     //=====  document::XEventListener  ========================================
     virtual void SAL_CALL
         notifyEvent (
-            const css::document::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::document::EventObject& rEventObject) override;
 
     //=====  beans::XPropertySetListener  =====================================
     virtual void SAL_CALL
         propertyChange (
-            const css::beans::PropertyChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::beans::PropertyChangeEvent& rEvent) override;
 
     //===== accessibility::XAccessibleEventListener  ==========================
     virtual void SAL_CALL
         notifyEvent (
             const css::accessibility::AccessibleEventObject&
-            rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+            rEvent) override;
 
     //===== frame::XFrameActionListener  ======================================
     /** For certain actions the listener connects to a new controller of the
@@ -124,8 +120,7 @@ public:
         in the center pane is replaced by another view shell.
     */
     virtual void SAL_CALL
-        frameAction (const css::frame::FrameActionEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        frameAction (const css::frame::FrameActionEvent& rEvent) override;
 
     virtual void SAL_CALL disposing() override;
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index 35f53ae46036..a1e00135e4bf 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -66,7 +66,6 @@ void SAL_CALL SlideSorterService::disposing()
 //----- XInitialization -------------------------------------------------------
 
 void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -116,13 +115,11 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments)
 //----- XView -----------------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     return mxViewId;
 }
 
 sal_Bool SAL_CALL SlideSorterService::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
@@ -130,7 +127,6 @@ sal_Bool SAL_CALL SlideSorterService::isAnchorOnly()
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -139,13 +135,11 @@ void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent)
 }
 
 void SAL_CALL SlideSorterService::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -153,7 +147,6 @@ void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent)
 }
 
 void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -162,7 +155,6 @@ void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent)
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxParentWindow)
         mxParentWindow = nullptr;
@@ -171,7 +163,6 @@ void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent)
 //----- XDrawView -------------------------------------------------------------
 
 void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawPage>& rxSlide)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr)
@@ -180,7 +171,6 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP
 }
 
 Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr)
@@ -192,14 +182,12 @@ Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage()
 //----- attributes ------------------------------------------------------------
 
 Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides()
-    throw (RuntimeException, std::exception)
 {
     return mpSlideSorter->GetModel().GetDocumentSlides();
 }
 
 void SAL_CALL SlideSorterService::setDocumentSlides (
     const Reference<container::XIndexAccess >& rxSlides)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -207,7 +195,6 @@ void SAL_CALL SlideSorterService::setDocumentSlides (
 }
 
 sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -217,7 +204,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide()
 }
 
 void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -229,7 +215,6 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue)
 }
 
 sal_Bool SAL_CALL SlideSorterService::getIsShowSelection()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -239,7 +224,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowSelection()
 }
 
 void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -247,7 +231,6 @@ void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue)
 }
 
 sal_Bool SAL_CALL SlideSorterService::getIsShowFocus()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -257,7 +240,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowFocus()
 }
 
 void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -265,7 +247,6 @@ void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue)
 }
 
 sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -275,7 +256,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection()
 }
 
 void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -283,7 +263,6 @@ void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue)
 }
 
 sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -295,7 +274,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreen
 
 void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPresentation (
     sal_Bool bValue)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -304,7 +282,6 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres
 }
 
 sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -314,7 +291,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical()
 }
 
 void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -324,7 +300,6 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue)
 }
 
 sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -334,7 +309,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling()
 }
 
 void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -342,7 +316,6 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue)
 }
 
 util::Color SAL_CALL SlideSorterService::getBackgroundColor()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -353,7 +326,6 @@ util::Color SAL_CALL SlideSorterService::getBackgroundColor()
 }
 
 void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundColor)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -361,7 +333,6 @@ void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundCol
 }
 
 util::Color SAL_CALL SlideSorterService::getTextColor()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -372,7 +343,6 @@ util::Color SAL_CALL SlideSorterService::getTextColor()
 }
 
 void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -380,7 +350,6 @@ void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor)
 }
 
 util::Color SAL_CALL SlideSorterService::getSelectionColor()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -391,7 +360,6 @@ util::Color SAL_CALL SlideSorterService::getSelectionColor()
 }
 
 void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -399,7 +367,6 @@ void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor
 }
 
 util::Color SAL_CALL SlideSorterService::getHighlightColor()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -410,7 +377,6 @@ util::Color SAL_CALL SlideSorterService::getHighlightColor()
 }
 
 void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -418,7 +384,6 @@ void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor
 }
 
 sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid())
@@ -428,7 +393,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly()
 }
 
 void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid())
@@ -447,7 +411,6 @@ void SlideSorterService::Resize()
 }
 
 void SlideSorterService::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index 6613b96131e1..26b98c989aa0 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -56,125 +56,89 @@ public:
 
     // XInitialization
 
-    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
     // XResourceId
 
-    css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override;
 
-    sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL isAnchorOnly() override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // 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;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage(
-        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override;
 
-    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
     // Attributes
 
-    virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides() override;
 
     virtual void SAL_CALL setDocumentSlides (
-        const css::uno::Reference<css::container::XIndexAccess >& rxSlides)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::container::XIndexAccess >& rxSlides) override;
 
-    virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide() override;
 
-    virtual void SAL_CALL setIsHighlightCurrentSlide (sal_Bool bIsHighlightCurrentSlide)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setIsHighlightCurrentSlide (sal_Bool bIsHighlightCurrentSlide) override;
 
-    virtual sal_Bool SAL_CALL getIsShowSelection()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsShowSelection() override;
 
-    virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) override;
 
-    virtual sal_Bool SAL_CALL getIsCenterSelection()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsCenterSelection() override;
 
-    virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) override;
 
-    virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation() override;
 
     virtual void SAL_CALL setIsSuspendPreviewUpdatesDuringFullScreenPresentation (
-        sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) override;
 
-    virtual sal_Bool SAL_CALL getIsOrientationVertical()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsOrientationVertical() override;
 
-    virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) override;
 
-    virtual sal_Bool SAL_CALL getIsSmoothScrolling()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsSmoothScrolling() override;
 
-    virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) override;
 
-    virtual css::util::Color SAL_CALL getBackgroundColor()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Color SAL_CALL getBackgroundColor() override;
 
-    virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor) override;
 
-    virtual css::util::Color SAL_CALL getTextColor()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Color SAL_CALL getTextColor() override;
 
-    virtual void SAL_CALL setTextColor (css::util::Color aTextColor)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTextColor (css::util::Color aTextColor) override;
 
-    virtual css::util::Color SAL_CALL getSelectionColor()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Color SAL_CALL getSelectionColor() override;
 
-    virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor) override;
 
-    virtual css::util::Color SAL_CALL getHighlightColor()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::util::Color SAL_CALL getHighlightColor() override;
 
-    virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor) override;
 
-    virtual sal_Bool SAL_CALL getIsUIReadOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsUIReadOnly() override;
 
-    virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly) override;
 
-    virtual sal_Bool SAL_CALL getIsShowFocus()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsShowFocus() override;
 
-    virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus) override;
 
 private:
     std::shared_ptr<SlideSorter> mpSlideSorter;
@@ -186,7 +150,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed() throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sd::slidesorter
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index cb21b379a049..6496ac33f805 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -77,20 +77,17 @@ public:
 
     //===== lang::XEventListener ==============================================
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     //===== beans::XPropertySetListener =======================================
     virtual void SAL_CALL
         propertyChange (
-            const css::beans::PropertyChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::beans::PropertyChangeEvent& rEvent) override;
 
     //===== view::XSelectionChangeListener ====================================
     virtual void SAL_CALL
         selectionChanged (
-            const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::lang::EventObject& rEvent) override;
 
     //===== frame::XFrameActionListener  ======================================
     /** For certain actions the listener connects to a new controller of the
@@ -98,14 +95,12 @@ public:
         in the center pane is replaced by another view shell.
     */
     virtual void SAL_CALL
-        frameAction (const css::frame::FrameActionEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        frameAction (const css::frame::FrameActionEvent& rEvent) override;
 
     //===== drawing::framework::XConfigurationChangeListener ==================
     virtual void SAL_CALL
         notifyConfigurationChange (
-            const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     virtual void SAL_CALL disposing() override;
 
@@ -430,7 +425,6 @@ void EventMultiplexer::Implementation::DisconnectFromController()
 
 void SAL_CALL EventMultiplexer::Implementation::disposing (
     const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     if (mbListeningToController)
     {
@@ -454,7 +448,6 @@ void SAL_CALL EventMultiplexer::Implementation::disposing (
 
 void SAL_CALL EventMultiplexer::Implementation::propertyChange (
     const beans::PropertyChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -482,7 +475,6 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange (
 
 void SAL_CALL EventMultiplexer::Implementation::frameAction (
     const frame::FrameActionEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     Reference<frame::XFrame> xFrame (mxFrameWeak);
     if (rEvent.Frame == xFrame)
@@ -514,7 +506,6 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction (
 
 void SAL_CALL EventMultiplexer::Implementation::selectionChanged (
     const lang::EventObject& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     CallListeners (EventMultiplexerEventId::EditViewSelection);
 }
@@ -523,7 +514,6 @@ void SAL_CALL EventMultiplexer::Implementation::selectionChanged (
 
 void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     sal_Int32 nEventType = 0;
     rEvent.UserData >>= nEventType;
diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx
index b386f53a5e56..59d25cb0618c 100644
--- a/sd/source/ui/tools/PropertySet.cxx
+++ b/sd/source/ui/tools/PropertySet.cxx
@@ -42,7 +42,6 @@ void SAL_CALL PropertySet::disposing()
 //----- XPropertySet ----------------------------------------------------------
 
 Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo()
-    throw(RuntimeException, std::exception)
 {
     return nullptr;
 }
@@ -50,11 +49,6 @@ Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo()
 void SAL_CALL PropertySet::setPropertyValue (
     const OUString& rsPropertyName,
     const css::uno::Any& rsPropertyValue)
-    throw(css::beans::UnknownPropertyException,
-        css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -76,9 +70,6 @@ void SAL_CALL PropertySet::setPropertyValue (
 }
 
 Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName)
-        throw(css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -88,9 +79,6 @@ Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName)
 void SAL_CALL PropertySet::addPropertyChangeListener (
     const OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if ( ! rxListener.is())
         throw lang::IllegalArgumentException();
@@ -107,9 +95,6 @@ void SAL_CALL PropertySet::addPropertyChangeListener (
 void SAL_CALL PropertySet::removePropertyChangeListener (
     const OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-    throw(beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ::std::pair<ChangeListenerContainer::iterator,ChangeListenerContainer::iterator>
         aRange (mpChangeListeners->equal_range(rsPropertyName));
@@ -135,9 +120,6 @@ void SAL_CALL PropertySet::removePropertyChangeListener (
 void SAL_CALL PropertySet::addVetoableChangeListener (
     const OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     // Constraint properties are not supported and thus no vetoable
     // listeners.
@@ -148,9 +130,6 @@ void SAL_CALL PropertySet::addVetoableChangeListener (
 void SAL_CALL PropertySet::removeVetoableChangeListener (
     const OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     // Constraint properties are not supported and thus no vetoable
     // listeners.
@@ -173,7 +152,6 @@ void PropertySet::CallListeners (
 }
 
 void PropertySet::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx
index e827ff4ec723..1d359ace214d 100644
--- a/sd/source/ui/tools/SlotStateListener.cxx
+++ b/sd/source/ui/tools/SlotStateListener.cxx
@@ -118,7 +118,6 @@ uno::Reference<frame::XDispatch>
 
 void SlotStateListener::statusChanged (
     const frame::FeatureStateEvent& rState)
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     OUString sSlotName (rState.FeatureURL.Complete);
@@ -146,12 +145,10 @@ void SlotStateListener::ReleaseListeners()
 
 void SAL_CALL SlotStateListener::disposing (
     const lang::EventObject& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SlotStateListener::ThrowIfDisposed()
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 446cad75ba2f..db1cd7d559b3 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -107,7 +107,6 @@ IMPLEMENT_FORWARD_XINTERFACE2(
 // XTypeProvider
 
 Sequence<Type> SAL_CALL DrawController::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // OPropertySetHelper does not provide getTypes, so we have to
@@ -128,7 +127,6 @@ IMPLEMENT_GET_IMPLEMENTATION_ID(DrawController);
 // XComponent
 
 void SAL_CALL DrawController::dispose()
-    throw( RuntimeException, std::exception )
 {
     if( !mbDisposing )
     {
@@ -170,7 +168,6 @@ void SAL_CALL DrawController::dispose()
 
 void SAL_CALL DrawController::addEventListener(
     const Reference<lang::XEventListener >& xListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SfxBaseController::addEventListener( xListener );
@@ -178,14 +175,13 @@ void SAL_CALL DrawController::addEventListener(
 
 void SAL_CALL DrawController::removeEventListener (
     const Reference<lang::XEventListener >& aListener)
-    throw (RuntimeException, std::exception)
 {
     if(!rBHelper.bDisposed && !rBHelper.bInDispose && !mbDisposing)
         SfxBaseController::removeEventListener( aListener );
 }
 
 // XController
-sal_Bool SAL_CALL DrawController::suspend( sal_Bool Suspend ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DrawController::suspend( sal_Bool Suspend )
 {
     if( Suspend )
     {
@@ -203,7 +199,7 @@ sal_Bool SAL_CALL DrawController::suspend( sal_Bool Suspend ) throw (css::uno::R
 }
 
 // XServiceInfo
-OUString SAL_CALL DrawController::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL DrawController::getImplementationName(  )
 {
     // Do not throw an exception at the moment.  This leads to a crash
     // under Solaris on reload.  See issue i70929 for details.
@@ -214,13 +210,11 @@ OUString SAL_CALL DrawController::getImplementationName(  ) throw(RuntimeExcepti
 static const char ssServiceName[] = "com.sun.star.drawing.DrawingDocumentDrawView";
 
 sal_Bool SAL_CALL DrawController::supportsService (const OUString& rsServiceName)
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rsServiceName);
 }
 
 Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames()
-    throw(RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     Sequence<OUString> aSupportedServices { ssServiceName };
@@ -229,7 +223,6 @@ Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames()
 
 //------ XSelectionSupplier --------------------------------------------
 sal_Bool SAL_CALL DrawController::select (const Any& aSelection)
-    throw(lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
@@ -241,7 +234,6 @@ sal_Bool SAL_CALL DrawController::select (const Any& aSelection)
 }
 
 Any SAL_CALL DrawController::getSelection()
-    throw(RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
@@ -254,7 +246,6 @@ Any SAL_CALL DrawController::getSelection()
 
 void SAL_CALL DrawController::addSelectionChangeListener(
     const Reference< view::XSelectionChangeListener >& xListener)
-    throw(RuntimeException, std::exception)
 {
     if( mbDisposing )
         throw lang::DisposedException();
@@ -264,7 +255,6 @@ void SAL_CALL DrawController::addSelectionChangeListener(
 
 void SAL_CALL DrawController::removeSelectionChangeListener(
     const Reference< view::XSelectionChangeListener >& xListener )
-    throw(RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed)
         throw lang::DisposedException();
@@ -276,7 +266,6 @@ void SAL_CALL DrawController::removeSelectionChangeListener(
 
 void SAL_CALL
     DrawController::disposing (const lang::EventObject& )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
@@ -284,7 +273,6 @@ void SAL_CALL
 
 void  SAL_CALL
     DrawController::selectionChanged (const lang::EventObject& rEvent)
-        throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // Have to forward the event to our selection change listeners.
@@ -314,7 +302,6 @@ void  SAL_CALL
 // XDrawView
 
 void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPage >& xPage )
-    throw(RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
@@ -324,7 +311,6 @@ void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPag
 }
 
 Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage()
-    throw(RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SolarMutexGuard aGuard;
@@ -557,7 +543,6 @@ void DrawController::ReleaseViewShellBase()
 
 Reference<XConfigurationController> SAL_CALL
     DrawController::getConfigurationController()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -566,7 +551,6 @@ Reference<XConfigurationController> SAL_CALL
 
 Reference<XModuleController> SAL_CALL
     DrawController::getModuleController()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -586,7 +570,6 @@ const Sequence<sal_Int8>& DrawController::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL DrawController::getSomething (const Sequence<sal_Int8>& rId)
-    throw (RuntimeException, std::exception)
 {
     sal_Int64 nResult = 0;
 
@@ -684,7 +667,6 @@ IPropertyArrayHelper & DrawController::getInfoHelper()
 }
 
 Reference < beans::XPropertySetInfo >  DrawController::getPropertySetInfo()
-        throw ( css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -692,7 +674,7 @@ Reference < beans::XPropertySetInfo >  DrawController::getPropertySetInfo()
     return xInfo;
 }
 
-uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException, std::exception)
+uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form )
 {
     SolarMutexGuard aGuard;
 
@@ -707,7 +689,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFor
     return xController;
 }
 
-sal_Bool SAL_CALL DrawController::isFormDesignMode(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DrawController::isFormDesignMode(  )
 {
     SolarMutexGuard aGuard;
 
@@ -720,7 +702,7 @@ sal_Bool SAL_CALL DrawController::isFormDesignMode(  ) throw (uno::RuntimeExcept
     return bIsDesignMode;
 }
 
-void SAL_CALL DrawController::setFormDesignMode( sal_Bool DesignMode ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DrawController::setFormDesignMode( sal_Bool DesignMode )
 {
     SolarMutexGuard aGuard;
 
@@ -729,7 +711,7 @@ void SAL_CALL DrawController::setFormDesignMode( sal_Bool DesignMode ) throw (un
         pFormShell->SetDesignMode( DesignMode );
 }
 
-uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno::Reference< awt::XControlModel >& xModel ) throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno::Reference< awt::XControlModel >& xModel )
 {
     SolarMutexGuard aGuard;
 
@@ -749,7 +731,6 @@ sal_Bool DrawController::convertFastPropertyValue (
     Any & rOldValue,
     sal_Int32 nHandle,
     const Any& rValue)
-    throw ( css::lang::IllegalArgumentException)
 {
     bool bResult = false;
 
@@ -780,7 +761,6 @@ sal_Bool DrawController::convertFastPropertyValue (
 void DrawController::setFastPropertyValue_NoBroadcast (
     sal_Int32 nHandle,
     const Any& rValue)
-    throw ( css::uno::Exception, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nHandle == PROPERTY_SUB_CONTROLLER)
@@ -850,7 +830,6 @@ void DrawController::DisposeFrameworkControllers()
 }
 
 void DrawController::ThrowIfDisposed() const
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose || mbDisposing)
     {
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 4fc83e1d00a5..9e831a2f51f4 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -126,7 +126,6 @@ Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer() throw ()
 }
 
 void SdUnoDrawView::setActiveLayer (const Reference<drawing::XLayer>& rxLayer)
-    throw (uno::RuntimeException, std::exception)
 {
     // Get the SdrLayer object corresponding to the given reference.
     if ( ! rxLayer.is())
@@ -148,9 +147,6 @@ void SdUnoDrawView::setActiveLayer (const Reference<drawing::XLayer>& rxLayer)
 // XSelectionSupplier
 
 sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection )
-    throw (lang::IllegalArgumentException,
-           RuntimeException,
-           std::exception)
 {
     bool bOk = true;
 
@@ -246,7 +242,6 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection )
 }
 
 Any SAL_CALL SdUnoDrawView::getSelection()
-    throw (RuntimeException, std::exception)
 {
     Any aAny;
 
@@ -295,14 +290,12 @@ Any SAL_CALL SdUnoDrawView::getSelection()
 
 void SAL_CALL SdUnoDrawView::addSelectionChangeListener (
     const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rxListener;
 }
 
 void SAL_CALL SdUnoDrawView::removeSelectionChangeListener (
     const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rxListener;
 }
@@ -310,11 +303,6 @@ void SAL_CALL SdUnoDrawView::removeSelectionChangeListener (
 void SdUnoDrawView::setFastPropertyValue (
     sal_Int32 nHandle,
         const Any& rValue)
-    throw(css::beans::UnknownPropertyException,
-        css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     switch( nHandle )
     {
@@ -376,9 +364,6 @@ void SdUnoDrawView::setFastPropertyValue (
 
 Any SAL_CALL SdUnoDrawView::getFastPropertyValue (
     sal_Int32 nHandle)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     Any aValue;
     switch( nHandle )
@@ -424,7 +409,6 @@ Any SAL_CALL SdUnoDrawView::getFastPropertyValue (
 
 void SAL_CALL SdUnoDrawView::setCurrentPage (
     const Reference< drawing::XDrawPage >& xPage )
-    throw (RuntimeException, std::exception)
 {
     SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation( xPage );
     SdrPage *pSdrPage = pDrawPage ? pDrawPage->GetSdrPage() : nullptr;
@@ -442,7 +426,6 @@ void SAL_CALL SdUnoDrawView::setCurrentPage (
 }
 
 Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage()
-    throw(RuntimeException, std::exception)
 {
     Reference< drawing::XDrawPage >  xPage;
 
@@ -558,17 +541,17 @@ Any SdUnoDrawView::getDrawViewMode() const
 }
 
 // XServiceInfo
-OUString SAL_CALL SdUnoDrawView::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL SdUnoDrawView::getImplementationName(  )
 {
     return OUString( "com.sun.star.comp.sd.SdUnoDrawView") ;
 }
 
-sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-Sequence< OUString > SAL_CALL SdUnoDrawView::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdUnoDrawView::getSupportedServiceNames(  )
 {
     OUString aSN("com.sun.star.drawing.DrawingDocumentDrawView");
     uno::Sequence< OUString > aSeq( &aSN, 1 );
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index 21e0353c8669..1449026e967c 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -53,14 +53,12 @@ void SAL_CALL SdUnoOutlineView::disposing()
 //----- XSelectionSupplier ----------------------------------------------------
 
 sal_Bool SAL_CALL SdUnoOutlineView::select( const Any&  )
-    throw(lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     // todo: add selections for text ranges
     return false;
 }
 
 Any SAL_CALL SdUnoOutlineView::getSelection()
-    throw(RuntimeException, std::exception)
 {
     Any aAny;
     return aAny;
@@ -68,14 +66,12 @@ Any SAL_CALL SdUnoOutlineView::getSelection()
 
 void SAL_CALL SdUnoOutlineView::addSelectionChangeListener (
     const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rxListener;
 }
 
 void SAL_CALL SdUnoOutlineView::removeSelectionChangeListener (
     const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rxListener;
 }
@@ -83,7 +79,6 @@ void SAL_CALL SdUnoOutlineView::removeSelectionChangeListener (
 //----- XDrawView -------------------------------------------------------------
 void SAL_CALL SdUnoOutlineView::setCurrentPage (
     const Reference< drawing::XDrawPage >& xPage)
-    throw(RuntimeException, std::exception)
 {
     SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation( xPage );
     SdrPage *pSdrPage = pDrawPage ? pDrawPage->GetSdrPage() : nullptr;
@@ -94,7 +89,6 @@ void SAL_CALL SdUnoOutlineView::setCurrentPage (
 }
 
 Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage()
-    throw(RuntimeException, std::exception)
 {
     Reference<drawing::XDrawPage>  xPage;
 
@@ -108,11 +102,6 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage()
 void SdUnoOutlineView::setFastPropertyValue (
     sal_Int32 nHandle,
         const Any& rValue)
-    throw(css::beans::UnknownPropertyException,
-        css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     switch( nHandle )
     {
@@ -131,9 +120,6 @@ void SdUnoOutlineView::setFastPropertyValue (
 
 Any SAL_CALL SdUnoOutlineView::getFastPropertyValue (
     sal_Int32 nHandle)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     Any aValue;
 
@@ -157,17 +143,17 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue (
 }
 
 // XServiceInfo
-OUString SAL_CALL SdUnoOutlineView::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL SdUnoOutlineView::getImplementationName(  )
 {
     return OUString("com.sun.star.comp.sd.SdUnoOutlineView");
 }
 
-sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-Sequence< OUString > SAL_CALL SdUnoOutlineView::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdUnoOutlineView::getSupportedServiceNames(  )
 {
     OUString aSN( "com.sun.star.presentation.OutlineView" );
     uno::Sequence< OUString > aSeq( &aSN, 1 );
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index 15a3cc7e6d20..e5b172752526 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -51,7 +51,6 @@ SdUnoSlideView::~SdUnoSlideView() throw()
 //----- XSelectionSupplier ----------------------------------------------------
 
 sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection)
-      throw(lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     bool bOk = true;
 
@@ -85,7 +84,6 @@ sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection)
 }
 
 Any SAL_CALL SdUnoSlideView::getSelection()
-      throw(RuntimeException, std::exception)
 {
     Any aResult;
 
@@ -109,14 +107,12 @@ Any SAL_CALL SdUnoSlideView::getSelection()
 
 void SAL_CALL SdUnoSlideView::addSelectionChangeListener (
     const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rxListener;
 }
 
 void SAL_CALL SdUnoSlideView::removeSelectionChangeListener (
     const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rxListener;
 }
@@ -125,7 +121,6 @@ void SAL_CALL SdUnoSlideView::removeSelectionChangeListener (
 
 void SAL_CALL SdUnoSlideView::setCurrentPage (
     const css::uno::Reference<css::drawing::XDrawPage>& rxDrawPage)
-    throw(css::uno::RuntimeException, std::exception)
 {
     Reference<beans::XPropertySet> xProperties (rxDrawPage, UNO_QUERY);
     if (xProperties.is())
@@ -141,7 +136,6 @@ void SAL_CALL SdUnoSlideView::setCurrentPage (
 
 css::uno::Reference<css::drawing::XDrawPage > SAL_CALL
     SdUnoSlideView::getCurrentPage()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()->GetXDrawPage();
 }
@@ -151,11 +145,6 @@ css::uno::Reference<css::drawing::XDrawPage > SAL_CALL
 void SdUnoSlideView::setFastPropertyValue (
     sal_Int32 nHandle,
         const Any& rValue)
-    throw(css::beans::UnknownPropertyException,
-        css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     (void)rValue;
 
@@ -164,9 +153,6 @@ void SdUnoSlideView::setFastPropertyValue (
 
 Any SAL_CALL SdUnoSlideView::getFastPropertyValue (
     sal_Int32 nHandle)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if( nHandle != DrawController::PROPERTY_VIEWOFFSET )
         throw beans::UnknownPropertyException( OUString::number(nHandle), static_cast<cppu::OWeakObject*>(this));
@@ -175,17 +161,17 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue (
 }
 
 // XServiceInfo
-OUString SAL_CALL SdUnoSlideView::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL SdUnoSlideView::getImplementationName(  )
 {
     return OUString( "com.sun.star.comp.sd.SdUnoSlideView" );
 }
 
-sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames(  )
 {
     OUString aSN( "com.sun.star.presentation.SlidesView" );
     uno::Sequence< OUString > aSeq( &aSN, 1 );
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 9b654caf04cb..8fea77d429f1 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -74,30 +74,30 @@ namespace sd
         explicit DocumentSettings( SdXImpressDocument* pModel );
 
         // XInterface
-        virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) override;
+        virtual Any SAL_CALL queryInterface( const Type& aType ) override;
         virtual void SAL_CALL acquire(  ) throw () override;
         virtual void SAL_CALL release(  ) throw () override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // DocumentSettingsSerializer cf. xmloff
         virtual uno::Sequence<beans::PropertyValue>
@@ -109,8 +109,8 @@ namespace sd
                                        const uno::Sequence<beans::PropertyValue>& aConfigProps ) override;
 
     protected:
-        virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception ) override;
-        virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, RuntimeException, std::exception ) override;
+        virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override;
+        virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override;
 
     private:
         bool LoadList( XPropertyListType t, const OUString &rPath,
@@ -392,8 +392,6 @@ uno::Sequence<beans::PropertyValue>
 void
 DocumentSettings::_setPropertyValues(const PropertyMapEntry** ppEntries,
         const Any* pValues)
-throw (UnknownPropertyException, PropertyVetoException,
-    IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -976,7 +974,6 @@ void DocumentSettings::ExtractURL( XPropertyListType t, Any* pValue )
 void
 DocumentSettings::_getPropertyValues(
         const PropertyMapEntry** ppEntries, Any* pValue)
-throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1191,7 +1188,7 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::
 }
 
 // XInterface
-Any SAL_CALL DocumentSettings::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+Any SAL_CALL DocumentSettings::queryInterface( const Type& aType )
 {
     return WeakImplHelper< XPropertySet, XMultiPropertySet, XServiceInfo >::queryInterface( aType );
 }
@@ -1207,82 +1204,79 @@ void SAL_CALL DocumentSettings::release(  ) throw ()
 }
 
 // XPropertySet
-Reference< XPropertySetInfo > SAL_CALL DocumentSettings::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL DocumentSettings::getPropertySetInfo(  )
 {
     return PropertySetHelper::getPropertySetInfo();
 }
 
-void SAL_CALL DocumentSettings::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL DocumentSettings::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
 {
     PropertySetHelper::setPropertyValue( aPropertyName, aValue );
 }
 
-Any SAL_CALL DocumentSettings::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL DocumentSettings::getPropertyValue( const OUString& PropertyName )
 {
     return PropertySetHelper::getPropertyValue( PropertyName );
 }
 
-void SAL_CALL DocumentSettings::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL DocumentSettings::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener )
 {
     PropertySetHelper::addPropertyChangeListener( aPropertyName, xListener );
 }
 
-void SAL_CALL DocumentSettings::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL DocumentSettings::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener )
 {
     PropertySetHelper::removePropertyChangeListener( aPropertyName, aListener );
 }
 
-void SAL_CALL DocumentSettings::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL DocumentSettings::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener )
 {
     PropertySetHelper::addVetoableChangeListener( PropertyName, aListener );
 }
 
-void SAL_CALL DocumentSettings::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL DocumentSettings::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener )
 {
     PropertySetHelper::removeVetoableChangeListener( PropertyName, aListener );
 }
 
 // XMultiPropertySet
-void SAL_CALL DocumentSettings::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL DocumentSettings::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues )
 {
     PropertySetHelper::setPropertyValues( aPropertyNames, aValues );
 }
 
-Sequence< Any > SAL_CALL DocumentSettings::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException, std::exception)
+Sequence< Any > SAL_CALL DocumentSettings::getPropertyValues( const Sequence< OUString >& aPropertyNames )
 {
     return PropertySetHelper::getPropertyValues( aPropertyNames );
 }
 
-void SAL_CALL DocumentSettings::addPropertiesChangeListener( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException, std::exception)
+void SAL_CALL DocumentSettings::addPropertiesChangeListener( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener )
 {
     PropertySetHelper::addPropertiesChangeListener( aPropertyNames, xListener );
 }
 
-void SAL_CALL DocumentSettings::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException, std::exception)
+void SAL_CALL DocumentSettings::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& xListener )
 {
     PropertySetHelper::removePropertiesChangeListener( xListener );
 }
 
-void SAL_CALL DocumentSettings::firePropertiesChangeEvent( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException, std::exception)
+void SAL_CALL DocumentSettings::firePropertiesChangeEvent( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener )
 {
     PropertySetHelper::firePropertiesChangeEvent( aPropertyNames, xListener );
 }
 
 // XServiceInfo
 OUString SAL_CALL DocumentSettings::getImplementationName(  )
-    throw(RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.Draw.DocumentSettings" );
 }
 
 sal_Bool SAL_CALL DocumentSettings::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL DocumentSettings::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     Sequence< OUString > aSeq( 2 );
     aSeq[0] = "com.sun.star.document.Settings" ;
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index fe02c933becf..e41558577ac6 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -77,64 +77,64 @@ public:
     void init( sal_Int16 nPresetClass );
 
     // XInitialization
-    void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
+    void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XChild
-    Reference< XInterface > SAL_CALL getParent(  ) throw (RuntimeException, std::exception) override;
-    void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) override;
+    Reference< XInterface > SAL_CALL getParent(  ) override;
+    void SAL_CALL setParent( const Reference< XInterface >& Parent ) override;
 
     // XCloneable
-    virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException, std::exception) override;
+    virtual Reference< XCloneable > SAL_CALL createClone() override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw(std::exception) override;
-    Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
 
     // XAnimationNode
-    ::sal_Int16 SAL_CALL getType() throw (RuntimeException, std::exception) override;
-    Any SAL_CALL getBegin() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException, std::exception) override;
-    Any SAL_CALL getDuration() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException, std::exception) override;
-    Any SAL_CALL getEnd() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException, std::exception) override;
-    Any SAL_CALL getEndSync() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) override;
-    Any SAL_CALL getRepeatCount() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) override;
-    Any SAL_CALL getRepeatDuration() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) override;
-    ::sal_Int16 SAL_CALL getFill() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setFill( ::sal_Int16 _fill ) throw (RuntimeException, std::exception) override;
-    ::sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setFillDefault( ::sal_Int16 _filldefault ) throw (RuntimeException, std::exception) override;
-    ::sal_Int16 SAL_CALL getRestart() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setRestart( ::sal_Int16 _restart ) throw (RuntimeException, std::exception) override;
-    ::sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setRestartDefault( ::sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) override;
-    double SAL_CALL getAcceleration() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) override;
-    double SAL_CALL getDecelerate() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) override;
-    Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException, std::exception) override;
-    void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) override;
+    ::sal_Int16 SAL_CALL getType() override;
+    Any SAL_CALL getBegin() override;
+    void SAL_CALL setBegin( const Any& _begin ) override;
+    Any SAL_CALL getDuration() override;
+    void SAL_CALL setDuration( const Any& _duration ) override;
+    Any SAL_CALL getEnd() override;
+    void SAL_CALL setEnd( const Any& _end ) override;
+    Any SAL_CALL getEndSync() override;
+    void SAL_CALL setEndSync( const Any& _endsync ) override;
+    Any SAL_CALL getRepeatCount() override;
+    void SAL_CALL setRepeatCount( const Any& _repeatcount ) override;
+    Any SAL_CALL getRepeatDuration() override;
+    void SAL_CALL setRepeatDuration( const Any& _repeatduration ) override;
+    ::sal_Int16 SAL_CALL getFill() override;
+    void SAL_CALL setFill( ::sal_Int16 _fill ) override;
+    ::sal_Int16 SAL_CALL getFillDefault() override;
+    void SAL_CALL setFillDefault( ::sal_Int16 _filldefault ) override;
+    ::sal_Int16 SAL_CALL getRestart() override;
+    void SAL_CALL setRestart( ::sal_Int16 _restart ) override;
+    ::sal_Int16 SAL_CALL getRestartDefault() override;
+    void SAL_CALL setRestartDefault( ::sal_Int16 _restartdefault ) override;
+    double SAL_CALL getAcceleration() override;
+    void SAL_CALL setAcceleration( double _acceleration ) override;
+    double SAL_CALL getDecelerate() override;
+    void SAL_CALL setDecelerate( double _decelerate ) override;
+    sal_Bool SAL_CALL getAutoReverse() override;
+    void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) override;
+    Sequence< NamedValue > SAL_CALL getUserData() override;
+    void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) override;
 
     // XElementAccess
-    virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override;
+    virtual Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
-    virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception) override;
+    virtual Reference< XEnumeration > SAL_CALL createEnumeration() override;
 
     // XTimeContainer
-    Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override;
-    Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override;
-    Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override;
-    Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
-    Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override;
+    Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) override;
+    Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) override;
+    Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) override;
+    Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) override;
+    Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) override;
 
 private:
     // our first, last and only protection from mutli-threads!
@@ -202,7 +202,7 @@ void RandomAnimationNode::init( sal_Int16 nPresetClass )
 }
 
 // XInitialization
-void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments )
 {
     if( aArguments.getLength() != 1 )
         throw IllegalArgumentException();
@@ -222,242 +222,241 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments
 }
 
 // XAnimationNode
-sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL RandomAnimationNode::getType()
 {
     Guard< Mutex > aGuard( maMutex );
     return css::animations::AnimationNodeType::PAR;
 }
 
 // XAnimationNode
-Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException, std::exception)
+Any SAL_CALL RandomAnimationNode::getBegin()
 {
     Guard< Mutex > aGuard( maMutex );
     return maBegin;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin )
 {
     Guard< Mutex > aGuard( maMutex );
     maBegin = _begin;
 }
 
 // XAnimationNode
-Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException, std::exception)
+Any SAL_CALL RandomAnimationNode::getDuration()
 {
     Guard< Mutex > aGuard( maMutex );
     return maDuration;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration )
 {
     Guard< Mutex > aGuard( maMutex );
     maDuration = _duration;
 }
 
 // XAnimationNode
-Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException, std::exception)
+Any SAL_CALL RandomAnimationNode::getEnd()
 {
     Guard< Mutex > aGuard( maMutex );
     return maEnd;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setEnd( const Any& _end )
 {
     Guard< Mutex > aGuard( maMutex );
     maEnd = _end;
 }
 
 // XAnimationNode
-Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException, std::exception)
+Any SAL_CALL RandomAnimationNode::getEndSync()
 {
     Guard< Mutex > aGuard( maMutex );
     return maEndSync;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync )
 {
     Guard< Mutex > aGuard( maMutex );
     maEndSync = _endsync;
 }
 
 // XAnimationNode
-Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException, std::exception)
+Any SAL_CALL RandomAnimationNode::getRepeatCount()
 {
     Guard< Mutex > aGuard( maMutex );
     return maRepeatCount;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount )
 {
     Guard< Mutex > aGuard( maMutex );
     maRepeatCount = _repeatcount;
 }
 
 // XAnimationNode
-Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException, std::exception)
+Any SAL_CALL RandomAnimationNode::getRepeatDuration()
 {
     Guard< Mutex > aGuard( maMutex );
     return maRepeatDuration;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration )
 {
     Guard< Mutex > aGuard( maMutex );
     maRepeatDuration = _repeatduration;
 }
 
 // XAnimationNode
-sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL RandomAnimationNode::getFill()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnFill;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill )
 {
     Guard< Mutex > aGuard( maMutex );
     mnFill = _fill;
 }
 
 // XAnimationNode
-sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnFillDefault;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault )
 {
     Guard< Mutex > aGuard( maMutex );
     mnFillDefault = _filldefault;
 }
 
 // XAnimationNode
-sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL RandomAnimationNode::getRestart()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnRestart;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart )
 {
     Guard< Mutex > aGuard( maMutex );
     mnRestart = _restart;
 }
 
 // XAnimationNode
-sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault()
 {
     Guard< Mutex > aGuard( maMutex );
     return mnRestartDefault;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault )
 {
     Guard< Mutex > aGuard( maMutex );
     mnRestartDefault = _restartdefault;
 }
 
 // XAnimationNode
-double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException, std::exception)
+double SAL_CALL RandomAnimationNode::getAcceleration()
 {
     Guard< Mutex > aGuard( maMutex );
     return mfAcceleration;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration )
 {
     Guard< Mutex > aGuard( maMutex );
     mfAcceleration = _acceleration;
 }
 
 // XAnimationNode
-double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException, std::exception)
+double SAL_CALL RandomAnimationNode::getDecelerate()
 {
     Guard< Mutex > aGuard( maMutex );
     return mfDecelerate;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate )
 {
     Guard< Mutex > aGuard( maMutex );
     mfDecelerate = _decelerate;
 }
 
 // XAnimationNode
-sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse()
 {
     Guard< Mutex > aGuard( maMutex );
     return mbAutoReverse;
 }
 
 // XAnimationNode
-void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse )
 {
     Guard< Mutex > aGuard( maMutex );
     mbAutoReverse = _autoreverse;
 }
 
-Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (RuntimeException, std::exception)
+Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData()
 {
     Guard< Mutex > aGuard( maMutex );
     return maUserData;
 }
 
-void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _userdata )
 {
     Guard< Mutex > aGuard( maMutex );
     maUserData = _userdata;
 }
 
 // XChild
-Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL RandomAnimationNode::getParent()
 {
     Guard< Mutex > aGuard( maMutex );
     return mxParent;
 }
 
 // XChild
-void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Parent )
 {
     Guard< Mutex > aGuard( maMutex );
     mxParent = Parent;
 }
 
 // XCloneable
-Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (RuntimeException, std::exception)
+Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone()
 {
     Reference< XCloneable > xNewNode( new RandomAnimationNode( *this ) );
     return xNewNode;
 }
 
 // XElementAccess
-Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException, std::exception)
+Type SAL_CALL RandomAnimationNode::getElementType()
 {
     return cppu::UnoType<XAnimationNode>::get();
 }
 
 // XElementAccess
-sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL RandomAnimationNode::hasElements()
 {
     return true;
 }
 
 // XEnumerationAccess
 Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration()
-    throw (RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( maMutex );
 
@@ -501,35 +500,30 @@ Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration()
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >&  )
-    throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     return appendChild( newChild );
 }
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >&  )
-    throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     return appendChild( newChild );
 }
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >&  )
-    throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     return appendChild( newChild );
 }
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Reference< XAnimationNode >& oldChild )
-    throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     return oldChild;
 }
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Reference< XAnimationNode >& newChild )
-    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     Reference< XAnimate > xAnimate( newChild, UNO_QUERY );
     if( xAnimate.is() )
@@ -546,19 +540,19 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Ref
 }
 
 // XServiceInfo
-OUString RandomAnimationNode::getImplementationName() throw(std::exception)
+OUString RandomAnimationNode::getImplementationName()
 {
     return OUString( "sd::RandomAnimationNode" ) ;
 }
 
 // XServiceInfo
-sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName) throw(std::exception)
+sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > RandomAnimationNode::getSupportedServiceNames() throw(std::exception)
+Sequence< OUString > RandomAnimationNode::getSupportedServiceNames()
 {
     Sequence< OUString > aSeq( 2 );
     aSeq[0] = "com.sun.star.animations.ParallelTimeContainer";
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 5ad76a4bbeb5..342bea38cdb0 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -49,7 +49,7 @@ SdFilterDetect::~SdFilterDetect()
 {
 }
 
-OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDescriptor ) throw( RuntimeException, std::exception )
+OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDescriptor )
 {
     MediaDescriptor aMediaDesc( lDescriptor );
     OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() );
@@ -133,19 +133,19 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
 }
 
 // XServiceInfo
-OUString SAL_CALL SdFilterDetect::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SdFilterDetect::getImplementationName()
 {
     return OUString( "com.sun.star.comp.draw.FormatDetector" );
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames()
 {
     Sequence<OUString> seqServiceNames { "com.sun.star.frame.ExtendedTypeDetection" };
     return seqServiceNames ;
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index e8c1cd9035ff..2077b2974e20 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -57,13 +57,13 @@ public:
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::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;
 
     // XExtendedFilterDetect
 
-    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override;
 };
 
 #endif
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 61cddf6c2929..4dc48ceccbcb 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -63,19 +63,16 @@ UNO3_GETIMPLEMENTATION_IMPL( SdXCustomPresentation );
 
 // XServiceInfo
 OUString SAL_CALL SdXCustomPresentation::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString( "SdXCustomPresentation" ) ;
 }
 
 sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     OUString aSN( "com.sun.star.presentation.CustomPresentation" );
     uno::Sequence< OUString > aSeq( &aSN, 1 );
@@ -84,7 +81,6 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNam
 
 // XIndexContainer
 void SAL_CALL SdXCustomPresentation::insertByIndex( sal_Int32 Index, const uno::Any& Element )
-    throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -119,7 +115,6 @@ void SAL_CALL SdXCustomPresentation::insertByIndex( sal_Int32 Index, const uno::
 }
 
 void SAL_CALL SdXCustomPresentation::removeByIndex( sal_Int32 Index )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -152,7 +147,6 @@ void SAL_CALL SdXCustomPresentation::removeByIndex( sal_Int32 Index )
 
 // XIndexReplace
 void SAL_CALL SdXCustomPresentation::replaceByIndex( sal_Int32 Index, const uno::Any& Element )
-    throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     removeByIndex( Index );
     insertByIndex( Index, Element );
@@ -160,13 +154,11 @@ void SAL_CALL SdXCustomPresentation::replaceByIndex( sal_Int32 Index, const uno:
 
 // XElementAccess
 uno::Type SAL_CALL SdXCustomPresentation::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<drawing::XDrawPage>::get();
 }
 
 sal_Bool SAL_CALL SdXCustomPresentation::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -178,7 +170,6 @@ sal_Bool SAL_CALL SdXCustomPresentation::hasElements()
 
 // XIndexAccess
 sal_Int32 SAL_CALL SdXCustomPresentation::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if( bDisposing )
@@ -188,7 +179,6 @@ sal_Int32 SAL_CALL SdXCustomPresentation::getCount()
 }
 
 uno::Any SAL_CALL SdXCustomPresentation::getByIndex( sal_Int32 Index )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -212,7 +202,6 @@ uno::Any SAL_CALL SdXCustomPresentation::getByIndex( sal_Int32 Index )
 
 // XNamed
 OUString SAL_CALL SdXCustomPresentation::getName()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -226,7 +215,6 @@ OUString SAL_CALL SdXCustomPresentation::getName()
 }
 
 void SAL_CALL SdXCustomPresentation::setName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -238,7 +226,7 @@ void SAL_CALL SdXCustomPresentation::setName( const OUString& aName )
 }
 
 // XComponent
-void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL SdXCustomPresentation::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -257,7 +245,6 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException, std:
 }
 
 void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw(uno::RuntimeException, std::exception)
 {
     if( bDisposing )
         throw lang::DisposedException();
@@ -265,7 +252,7 @@ void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lan
     aDisposeListeners.addInterface(xListener);
 }
 
-void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
 {
     if( !bDisposing )
         aDisposeListeners.removeInterface(aListener);
@@ -287,19 +274,16 @@ SdXCustomPresentationAccess::~SdXCustomPresentationAccess() throw()
 
 // XServiceInfo
 OUString SAL_CALL SdXCustomPresentationAccess::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString( "SdXCustomPresentationAccess" );
 }
 
 sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     const OUString aNS( "com.sun.star.presentation.CustomPresentationAccess" );
     uno::Sequence< OUString > aSeq( &aNS, 1 );
@@ -308,21 +292,18 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServ
 
 // XSingleServiceFactory
 uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstance()
-    throw(uno::Exception, uno::RuntimeException, std::exception)
 {
     uno::Reference< uno::XInterface >  xRef( static_cast<cppu::OWeakObject*>(new SdXCustomPresentation()) );
     return xRef;
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstanceWithArguments( const uno::Sequence< uno::Any >& )
-    throw(uno::Exception, uno::RuntimeException, std::exception)
 {
     return createInstance();
 }
 
 // XNameContainer
 void SAL_CALL SdXCustomPresentationAccess::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -376,7 +357,6 @@ void SAL_CALL SdXCustomPresentationAccess::insertByName( const OUString& aName,
 }
 
 void SAL_CALL SdXCustomPresentationAccess::removeByName( const OUString& Name )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -393,7 +373,6 @@ void SAL_CALL SdXCustomPresentationAccess::removeByName( const OUString& Name )
 
 // XNameReplace
 void SAL_CALL SdXCustomPresentationAccess::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     removeByName( aName );
     insertByName( aName, aElement );
@@ -401,7 +380,6 @@ void SAL_CALL SdXCustomPresentationAccess::replaceByName( const OUString& aName,
 
 // XNameAccess
 uno::Any SAL_CALL SdXCustomPresentationAccess::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -422,7 +400,6 @@ uno::Any SAL_CALL SdXCustomPresentationAccess::getByName( const OUString& aName
 }
 
 uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -444,7 +421,6 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getElementNames(
 }
 
 sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return getSdCustomShow(aName) != nullptr;
@@ -452,13 +428,11 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName
 
 // XElementAccess
 uno::Type SAL_CALL SdXCustomPresentationAccess::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<container::XIndexContainer>::get();
 }
 
 sal_Bool SAL_CALL SdXCustomPresentationAccess::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx
index 64f6c1f7591e..2069d4acc34e 100644
--- a/sd/source/ui/unoidl/unocpres.hxx
+++ b/sd/source/ui/unoidl/unocpres.hxx
@@ -68,33 +68,33 @@ public:
     UNO3_GETIMPLEMENTATION_DECL(SdXCustomPresentation)
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XIndexContainer
-    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
+    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override;
 
     // XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 };
 
 class List;
@@ -115,29 +115,29 @@ public:
     virtual ~SdXCustomPresentationAccess() throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XSingleServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(  ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(  ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 };
 
 inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const throw()
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index 02aa54000b95..c918d378bcd5 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -33,12 +33,12 @@ using namespace ::com::sun::star;
 
 // com.sun.star.comp.Draw.DrawingDocument
 
-OUString SAL_CALL SdDrawingDocument_getImplementationName() throw( uno::RuntimeException )
+OUString SAL_CALL SdDrawingDocument_getImplementationName()
 {
     return OUString( "com.sun.star.comp.Draw.DrawingDocument" );
 }
 
-uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException )
+uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames()
 {
     uno::Sequence< OUString > aSeq( 2 );
     aSeq[0] = "com.sun.star.drawing.DrawingDocument";
@@ -62,12 +62,12 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance(
 
 // com.sun.star.comp.Draw.PresentationDocument
 
-OUString SAL_CALL SdPresentationDocument_getImplementationName() throw( uno::RuntimeException )
+OUString SAL_CALL SdPresentationDocument_getImplementationName()
 {
     return OUString( "com.sun.star.comp.Draw.PresentationDocument" );
 }
 
-uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException )
+uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames()
 {
     uno::Sequence< OUString > aSeq( 2 );
     aSeq[0] = "com.sun.star.drawing.DrawingDocumentFactory";
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 3b287a545136..e15fcafe58a0 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -148,19 +148,16 @@ UNO3_GETIMPLEMENTATION_IMPL( SdLayer );
 
 // XServiceInfo
 OUString SAL_CALL SdLayer::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SdUnoLayer");
 }
 
 sal_Bool SAL_CALL SdLayer::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     OUString aServiceName(UNO_PREFIX "drawing.Layer");
     uno::Sequence< OUString > aSeq( &aServiceName, 1 );
@@ -169,14 +166,12 @@ uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames()
 
 // beans::XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL SdLayer::getPropertySetInfo(  )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return pPropSet->getPropertySetInfo();
 }
 
 void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -242,7 +237,6 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un
 }
 
 uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -283,10 +277,10 @@ uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName )
     return aValue;
 }
 
-void SAL_CALL SdLayer::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
+void SAL_CALL SdLayer::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {}
+void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {}
+void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {}
+void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {}
 
 bool SdLayer::get( LayerAttribute what ) throw()
 {
@@ -387,7 +381,6 @@ void SdLayer::set( LayerAttribute what, bool flag ) throw()
 
 // css::container::XChild
 uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -398,25 +391,23 @@ uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent()
 }
 
 void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& )
-    throw (css::lang::NoSupportException,
-        css::uno::RuntimeException, std::exception)
 {
     throw lang::NoSupportException ();
 }
 
 // XComponent
-void SAL_CALL SdLayer::dispose(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayer::dispose(  )
 {
     mxLayerManager.clear();
     pLayer = nullptr;
 }
 
-void SAL_CALL SdLayer::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayer::addEventListener( const uno::Reference< lang::XEventListener >& )
 {
     OSL_FAIL("not implemented!");
 }
 
-void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventListener >& )
 {
     OSL_FAIL("not implemented!");
 }
@@ -437,7 +428,7 @@ SdLayerManager::~SdLayerManager() throw()
 UNO3_GETIMPLEMENTATION_IMPL( SdLayerManager );
 
 // XComponent
-void SAL_CALL SdLayerManager::dispose(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayerManager::dispose(  )
 {
     mpModel = nullptr;
     if( mpLayers )
@@ -449,31 +440,28 @@ void SAL_CALL SdLayerManager::dispose(  ) throw (uno::RuntimeException, std::exc
     }
 }
 
-void SAL_CALL SdLayerManager::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayerManager::addEventListener( const uno::Reference< lang::XEventListener >& )
 {
     OSL_FAIL("not implemented!");
 }
 
-void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::XEventListener >& )
 {
     OSL_FAIL("not implemented!");
 }
 
 // XServiceInfo
 OUString SAL_CALL SdLayerManager::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SdUnoLayerManager");
 }
 
 sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSeq { UNO_PREFIX "drawing.LayerManager" };
     return aSeq;
@@ -481,7 +469,6 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames()
 
 // XLayerManager
 uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal_Int32 nIndex )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -515,7 +502,6 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
 }
 
 void SAL_CALL SdLayerManager::remove( const uno::Reference< drawing::XLayer >& xLayer )
-    throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -536,7 +522,6 @@ void SAL_CALL SdLayerManager::remove( const uno::Reference< drawing::XLayer >& x
 }
 
 void SAL_CALL SdLayerManager::attachShapeToLayer( const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XLayer >& xLayer )
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -557,7 +542,7 @@ void SAL_CALL SdLayerManager::attachShapeToLayer( const uno::Reference< drawing:
     mpModel->SetModified();
 }
 
-uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( const uno::Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception)
+uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( const uno::Reference< drawing::XShape >& xShape )
 {
     SolarMutexGuard aGuard;
 
@@ -582,7 +567,6 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( con
 
 // XIndexAccess
 sal_Int32 SAL_CALL SdLayerManager::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -599,7 +583,6 @@ sal_Int32 SAL_CALL SdLayerManager::getCount()
 }
 
 uno::Any SAL_CALL SdLayerManager::getByIndex( sal_Int32 nLayer )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -622,7 +605,6 @@ uno::Any SAL_CALL SdLayerManager::getByIndex( sal_Int32 nLayer )
 
 // XNameAccess
 uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -638,7 +620,6 @@ uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -662,7 +643,7 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames()
     return aSeq;
 }
 
-sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName )
 {
     SolarMutexGuard aGuard;
 
@@ -676,12 +657,11 @@ sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::
 
 // XElementAccess
 uno::Type SAL_CALL SdLayerManager::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<drawing::XLayer>::get();
 }
 
-sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdLayerManager::hasElements()
 {
     return getCount() > 0;
 }
diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx
index 1228376e75b3..22724d3a7693 100644
--- a/sd/source/ui/unoidl/unolayer.hxx
+++ b/sd/source/ui/unoidl/unolayer.hxx
@@ -62,34 +62,34 @@ public:
     UNO3_GETIMPLEMENTATION_DECL( SdLayer )
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // css::container::XChild
 
     /** Returns the layer manager that manages this layer.
     */
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     /** Not implemented.  Always throws an exception.
         @throws NoSupportException.
     */
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
 private:
     rtl::Reference<SdLayerManager>     mxLayerManager;
@@ -121,28 +121,28 @@ public:
     UNO3_GETIMPLEMENTATION_DECL( SdLayerManager )
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XLayerManager
-    virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XLayer >& xLayer ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL attachShapeToLayer( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XLayer >& xLayer ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL getLayerForShape( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XLayer >& xLayer ) override;
+    virtual void SAL_CALL attachShapeToLayer( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XLayer >& xLayer ) override;
+    virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL getLayerForShape( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     /** Return the <type>XLayer</type> object that is associated with the
         given <type>SdrLayer</type> object.  If the requested object does
@@ -159,9 +159,9 @@ public:
     css::uno::Reference< css::drawing::XLayer> GetLayer (SdrLayer* pLayer);
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 private:
     SdXImpressDocument* mpModel;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index e4ac5f6d31b6..7fd6355ce508 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -252,7 +252,7 @@ SdXImpressDocument::~SdXImpressDocument() throw()
 }
 
 // XInterface
-uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType )
 {
     uno::Any aAny;
 
@@ -339,7 +339,7 @@ SdXImpressDocument* SdXImpressDocument::getImplementation( const uno::Reference<
         return nullptr;
 }
 
-sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier )
 {
     if( rIdentifier.getLength() == 16 )
     {
@@ -354,7 +354,7 @@ sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< s
 }
 
 // XTypeProvider
-uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes(  )
 {
     ::SolarMutexGuard aGuard;
 
@@ -394,7 +394,7 @@ uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes(  ) throw(uno::
     return maTypeSequence;
 }
 
-uno::Sequence< sal_Int8 > SAL_CALL SdXImpressDocument::getImplementationId(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int8 > SAL_CALL SdXImpressDocument::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -453,7 +453,6 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 *                                                                             *
 ******************************************************************************/
 SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate )
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PageKind::Standard );
     SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
@@ -569,7 +568,6 @@ void SdXImpressDocument::SetModified() throw()
 
 // XModel
 void SAL_CALL SdXImpressDocument    ::lockControllers(  )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -580,7 +578,6 @@ void SAL_CALL SdXImpressDocument    ::lockControllers(  )
 }
 
 void SAL_CALL SdXImpressDocument::unlockControllers(  )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -594,7 +591,6 @@ void SAL_CALL SdXImpressDocument::unlockControllers(  )
 }
 
 sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked(  )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -604,7 +600,7 @@ sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked(  )
     return mpDoc && mpDoc->isLocked();
 }
 
-uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewData() throw( uno::RuntimeException, std::exception )
+uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewData()
 {
     ::SolarMutexGuard aGuard;
 
@@ -640,7 +636,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD
     return xRet;
 }
 
-void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container::XIndexAccess >& xData ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container::XIndexAccess >& xData )
 {
     ::SolarMutexGuard aGuard;
 
@@ -677,7 +673,6 @@ void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container:
 
 // XDrawPageDuplicator
 uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( const uno::Reference< drawing::XDrawPage >& xPage )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -705,7 +700,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( con
 
 // XDrawPagesSupplier
 uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -725,7 +719,6 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages(
 
 // XMasterPagesSupplier
 uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPages()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -746,7 +739,6 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPage
 
 // XLayerManagerSupplier
 uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerManager(  )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -763,7 +755,6 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerMa
 
 // XCustomPresentationSupplier
 uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCustomPresentations()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -780,7 +771,6 @@ uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCust
 
 // XPresentationSupplier
 uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPresentation()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -792,7 +782,6 @@ uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPr
 
 // XHandoutMasterSupplier
 uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMasterPage()
-    throw (uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1088,7 +1077,6 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create(
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( const OUString& aServiceSpecifier )
-    throw(uno::Exception, uno::RuntimeException, std::exception)
 {
     return create(aServiceSpecifier, "");
 }
@@ -1097,7 +1085,6 @@ css::uno::Reference<css::uno::XInterface>
 SdXImpressDocument::createInstanceWithArguments(
     OUString const & ServiceSpecifier,
     css::uno::Sequence<css::uno::Any> const & Arguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     OUString arg;
     if ((ServiceSpecifier == "com.sun.star.drawing.GraphicObjectShape"
@@ -1112,7 +1099,6 @@ SdXImpressDocument::createInstanceWithArguments(
 }
 
 uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1179,7 +1165,6 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames(
 
 // lang::XServiceInfo
 OUString SAL_CALL SdXImpressDocument::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString( "SdXImpressDocument" );
     /* // Matching the .component information:
@@ -1190,12 +1175,11 @@ OUString SAL_CALL SdXImpressDocument::getImplementationName()
 }
 
 sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames()
 {
     ::SolarMutexGuard aGuard;
 
@@ -1216,14 +1200,12 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames(
 
 // XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL SdXImpressDocument::getPropertySetInfo(  )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
     return mpPropSet->getPropertySetInfo();
 }
 
 void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1301,7 +1283,6 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam
 }
 
 uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1424,14 +1405,13 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property
     return aAny;
 }
 
-void SAL_CALL SdXImpressDocument::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdXImpressDocument::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdXImpressDocument::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdXImpressDocument::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
+void SAL_CALL SdXImpressDocument::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) {}
+void SAL_CALL SdXImpressDocument::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) {}
+void SAL_CALL SdXImpressDocument::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) {}
+void SAL_CALL SdXImpressDocument::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) {}
 
 // XLinkTargetSupplier
 uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1446,7 +1426,6 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks()
 
 // XStyleFamiliesSupplier
 uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFamilies(  )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1459,7 +1438,6 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFa
 
 // XAnyCompareFactory
 uno::Reference< css::ucb::XAnyCompare > SAL_CALL SdXImpressDocument::createAnyCompareByName( const OUString& )
-    throw (uno::RuntimeException, std::exception)
 {
     return SvxCreateNumRuleCompare();
 }
@@ -1467,7 +1445,6 @@ uno::Reference< css::ucb::XAnyCompare > SAL_CALL SdXImpressDocument::createAnyCo
 // XRenderable
 sal_Int32 SAL_CALL SdXImpressDocument::getRendererCount( const uno::Any& rSelection,
                                                          const uno::Sequence< beans::PropertyValue >&  )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
     sal_Int32   nRet = 0;
@@ -1498,7 +1475,6 @@ sal_Int32 SAL_CALL SdXImpressDocument::getRendererCount( const uno::Any& rSelect
 
 uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( sal_Int32 , const uno::Any& ,
                                                                                 const uno::Sequence< beans::PropertyValue >& rxOptions )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1882,7 +1858,6 @@ namespace
 
 void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& rSelection,
                                           const uno::Sequence< beans::PropertyValue >& rxOptions )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2637,7 +2612,7 @@ void SdXImpressDocument::initializeDocument()
     }
 }
 
-void SAL_CALL SdXImpressDocument::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SdXImpressDocument::dispose()
 {
     if( !mbDisposed )
     {
@@ -2752,7 +2727,6 @@ SdDrawPagesAccess::~SdDrawPagesAccess() throw()
 
 // XIndexAccess
 sal_Int32 SAL_CALL SdDrawPagesAccess::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2763,7 +2737,6 @@ sal_Int32 SAL_CALL SdDrawPagesAccess::getCount()
 }
 
 uno::Any SAL_CALL SdDrawPagesAccess::getByIndex( sal_Int32 Index )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2786,7 +2759,7 @@ uno::Any SAL_CALL SdDrawPagesAccess::getByIndex( sal_Int32 Index )
 }
 
 // XNameAccess
-uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName )
 {
     ::SolarMutexGuard aGuard;
 
@@ -2816,7 +2789,7 @@ uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) throw(co
     throw container::NoSuchElementException();
 }
 
-uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames()
 {
     ::SolarMutexGuard aGuard;
 
@@ -2837,7 +2810,7 @@ uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(un
     return aNames;
 }
 
-sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName )
 {
     ::SolarMutexGuard aGuard;
 
@@ -2861,13 +2834,11 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(un
 
 // XElementAccess
 uno::Type SAL_CALL SdDrawPagesAccess::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<drawing::XDrawPage>::get();
 }
 
 sal_Bool SAL_CALL SdDrawPagesAccess::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     return getCount() > 0;
 }
@@ -2879,7 +2850,6 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasElements()
  * @returns corresponding SdDrawPage
  */
 uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2905,7 +2875,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByInde
  * removing this page.
  */
 void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage )
-        throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2959,17 +2928,17 @@ void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPag
 
 // XServiceInfo
 
-OUString SAL_CALL SdDrawPagesAccess::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SdDrawPagesAccess::getImplementationName(  )
 {
     return OUString( "SdDrawPagesAccess" );
 }
 
-sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames(  )
 {
     OUString aService( "com.sun.star.drawing.DrawPages" );
     uno::Sequence< OUString > aSeq( &aService, 1 );
@@ -2977,17 +2946,17 @@ uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames(
 }
 
 // XComponent
-void SAL_CALL SdDrawPagesAccess::dispose(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdDrawPagesAccess::dispose(  )
 {
     mpModel = nullptr;
 }
 
-void SAL_CALL SdDrawPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >&  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdDrawPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >&  )
 {
     OSL_FAIL( "not implemented!" );
 }
 
-void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >&  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >&  )
 {
     OSL_FAIL( "not implemented!" );
 }
@@ -3004,24 +2973,23 @@ SdMasterPagesAccess::~SdMasterPagesAccess() throw()
 }
 
 // XComponent
-void SAL_CALL SdMasterPagesAccess::dispose(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdMasterPagesAccess::dispose(  )
 {
     mpModel = nullptr;
 }
 
-void SAL_CALL SdMasterPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >&  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdMasterPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >&  )
 {
     OSL_FAIL( "not implemented!" );
 }
 
-void SAL_CALL SdMasterPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >&  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdMasterPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >&  )
 {
     OSL_FAIL( "not implemented!" );
 }
 
 // XIndexAccess
 sal_Int32 SAL_CALL SdMasterPagesAccess::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3036,7 +3004,6 @@ sal_Int32 SAL_CALL SdMasterPagesAccess::getCount()
  * specified position in the model.
  */
 uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3060,20 +3027,17 @@ uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index )
 
 // XElementAccess
 uno::Type SAL_CALL SdMasterPagesAccess::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<drawing::XDrawPage>::get();
 }
 
 sal_Bool SAL_CALL SdMasterPagesAccess::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     return getCount() > 0;
 }
 
 // XDrawPages
 uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIndex( sal_Int32 nInsertPos )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3169,7 +3133,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
  * the model.
  */
 void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3224,17 +3187,17 @@ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawP
 
 // XServiceInfo
 
-OUString SAL_CALL SdMasterPagesAccess::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SdMasterPagesAccess::getImplementationName(  )
 {
     return OUString( "SdMasterPagesAccess" );
 }
 
-sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames(  )
 {
     OUString aService( "com.sun.star.drawing.MasterPages" );
     uno::Sequence< OUString > aSeq( &aService, 1 );
@@ -3253,24 +3216,23 @@ SdDocLinkTargets::~SdDocLinkTargets() throw()
 }
 
 // XComponent
-void SAL_CALL SdDocLinkTargets::dispose(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdDocLinkTargets::dispose(  )
 {
     mpModel = nullptr;
 }
 
-void SAL_CALL SdDocLinkTargets::addEventListener( const uno::Reference< lang::XEventListener >&  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdDocLinkTargets::addEventListener( const uno::Reference< lang::XEventListener >&  )
 {
     OSL_FAIL( "not implemented!" );
 }
 
-void SAL_CALL SdDocLinkTargets::removeEventListener( const uno::Reference< lang::XEventListener >&  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SdDocLinkTargets::removeEventListener( const uno::Reference< lang::XEventListener >&  )
 {
     OSL_FAIL( "not implemented!" );
 }
 
 // XNameAccess
 uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3292,7 +3254,6 @@ uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3345,7 +3306,6 @@ uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames()
 }
 
 sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3357,13 +3317,11 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName )
 
 // container::XElementAccess
 uno::Type SAL_CALL SdDocLinkTargets::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<beans::XPropertySet>::get();
 }
 
 sal_Bool SAL_CALL SdDocLinkTargets::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3373,7 +3331,7 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasElements()
     return mpModel->GetDoc() != nullptr;
 }
 
-SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw(std::exception)
+SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const
 {
     SdDrawDocument* pDoc = mpModel->GetDoc();
     if( pDoc == nullptr )
@@ -3408,19 +3366,16 @@ SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw(std::exc
 
 // XServiceInfo
 OUString SAL_CALL SdDocLinkTargets::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString( "SdDocLinkTargets" );
 }
 
 sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     const OUString aSN( "com.sun.star.document.LinkTargets" );
     uno::Sequence< OUString > aSeq( &aSN, 1 );
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index 05b52b0c48b3..efc80fb58ef0 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
 
     // XNotifyingDispatch
 void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     // there is no guarantee, that we are holded alive during this method!
     // May the outside dispatch container will be updated by a CONTEXT_CHANGED
@@ -67,20 +66,20 @@ void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, cons
     }
 }
     // XDispatch
-void SAL_CALL SdUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SdUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs )
 {
     dispatchWithNotification(aURL, aArgs, uno::Reference< frame::XDispatchResultListener >());
 }
 
-void SAL_CALL SdUnoModule::addStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SdUnoModule::addStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&)
 {
 }
 
-void SAL_CALL SdUnoModule::removeStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SdUnoModule::removeStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&)
 {
 }
 
-uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SdUnoModule::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( uno::RuntimeException, std::exception )
+uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SdUnoModule::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts )
 {
     sal_Int32 nCount = seqDescripts.getLength();
     uno::Sequence< uno::Reference< frame::XDispatch > > lDispatcher( nCount );
@@ -97,7 +96,6 @@ uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SdUnoModule::queryD
 
 // XDispatchProvider
 uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const util::URL& aURL, const OUString&, sal_Int32 )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SdDLL::Init();
@@ -111,17 +109,17 @@ uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const ut
 }
 
 // XServiceInfo
-OUString SAL_CALL SdUnoModule::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SdUnoModule::getImplementationName(  )
 {
     return OUString( "com.sun.star.comp.Draw.DrawingModule" );
 }
 
-sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames(  )
 {
     uno::Sequence<OUString> aSeq { "com.sun.star.drawing.ModuleDispatcher" };
     return aSeq;
diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx
index 113e0a6b3bb6..4f6716e60cb6 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -54,24 +54,22 @@ public:
     SdUnoModule() {}
 
     // XnotifyingDispatch
-    virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) 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;
 
     // XDispatchProvider
-    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 ;
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) override ;
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(  const   css::util::URL &            aURL            ,
                                                             const   OUString &   sTargetFrameName,
-                                                                    sal_Int32   eSearchFlags    )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                                                    sal_Int32   eSearchFlags    ) override;
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 #endif
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index ff0d04265cd4..1af83e0f39f3 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -287,7 +287,6 @@ void SdXShape::dispose()
 }
 
 uno::Any SAL_CALL SdXShape::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     return mpShape->queryInterface( rType );
 }
@@ -317,7 +316,6 @@ bool SdXShape::queryAggregation( const css::uno::Type & rType, css::uno::Any& aA
 }
 
 uno::Sequence< uno::Type > SAL_CALL SdXShape::getTypes()
-    throw (uno::RuntimeException)
 {
     if( mpModel && !mpModel->IsImpressDocument() )
     {
@@ -348,7 +346,7 @@ uno::Sequence< uno::Type > SAL_CALL SdXShape::getTypes()
 }
 
 // XPropertyState
-beans::PropertyState SAL_CALL SdXShape::getPropertyState( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException)
+beans::PropertyState SAL_CALL SdXShape::getPropertyState( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -366,7 +364,7 @@ beans::PropertyState SAL_CALL SdXShape::getPropertyState( const OUString& Proper
     }
 }
 
-void SAL_CALL SdXShape::setPropertyToDefault( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException)
+void SAL_CALL SdXShape::setPropertyToDefault( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -380,7 +378,7 @@ void SAL_CALL SdXShape::setPropertyToDefault( const OUString& PropertyName ) thr
     }
 }
 
-uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -407,7 +405,6 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName )
 
 //XPropertySet
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdXShape::getPropertySetInfo()
-    throw(css::uno::RuntimeException)
 {
     sal_uIntPtr nObjId = reinterpret_cast<sal_uIntPtr>(mpShape->getPropertyMapEntries());
     css::uno::Reference<css::beans::XPropertySetInfo> pInfo;
@@ -433,12 +430,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdXShape::getProper
 }
 
 void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue )
-    throw (css::beans::UnknownPropertyException,
-           css::beans::PropertyVetoException,
-           css::lang::IllegalArgumentException,
-           css::lang::WrappedTargetException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -687,10 +678,6 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const c
 }
 
 css::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName )
-    throw (css::beans::UnknownPropertyException,
-           css::lang::WrappedTargetException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -844,7 +831,6 @@ css::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName
 
 /** */
 SdAnimationInfo* SdXShape::GetAnimationInfo( bool bCreate ) const
-    throw (std::exception)
 {
     SdAnimationInfo* pInfo = nullptr;
 
@@ -855,7 +841,7 @@ SdAnimationInfo* SdXShape::GetAnimationInfo( bool bCreate ) const
     return pInfo;
 }
 
-uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(css::uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aSeq( mpShape->_getSupportedServiceNames() );
 
@@ -882,7 +868,6 @@ uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(cs
 /** checks if this is a presentation object
  */
 bool SdXShape::IsPresObj() const
-    throw (std::exception)
 {
     SdrObject* pObj = mpShape->GetSdrObject();
     if(pObj)
@@ -1037,7 +1022,7 @@ void SdXShape::SetMasterDepend( bool bDepend ) throw()
     }
 }
 
-void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException )
+void SdXShape::SetStyleSheet( const uno::Any& rAny )
 {
     SdrObject* pObj = mpShape->GetSdrObject();
     if( pObj == nullptr )
@@ -1066,7 +1051,7 @@ void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumen
     }
 }
 
-uno::Any SdXShape::GetStyleSheet() const throw( beans::UnknownPropertyException  )
+uno::Any SdXShape::GetStyleSheet() const
 {
     SdrObject* pObj = mpShape->GetSdrObject();
     if( pObj == nullptr )
@@ -1106,25 +1091,25 @@ public:
     explicit SdUnoEventsAccess(SdXShape* pShape) throw();
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 // XEventsSupplier
-uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents(  ) throw(css::uno::RuntimeException, std::exception)
+uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents(  )
 {
     return new SdUnoEventsAccess( this );
 }
@@ -1179,7 +1164,6 @@ static void clearEventsInAnimationInfo( SdAnimationInfo* pInfo )
 
 // XNameReplace
 void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( mpShape == nullptr || aName != maStrOnClick )
         throw container::NoSuchElementException();
@@ -1450,7 +1434,6 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
 
 // XNameAccess
 uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( mpShape == nullptr || aName != maStrOnClick )
         throw container::NoSuchElementException();
@@ -1661,45 +1644,39 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > SAL_CALL SdUnoEventsAccess::getElementNames(  )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aStr( &maStrOnClick, 1 );
     return aStr;
 }
 
 sal_Bool SAL_CALL SdUnoEventsAccess::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     return aName == maStrOnClick;
 }
 
 // XElementAccess
 uno::Type SAL_CALL SdUnoEventsAccess::getElementType(  )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get();
 }
 
-sal_Bool SAL_CALL SdUnoEventsAccess::hasElements(  ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdUnoEventsAccess::hasElements(  )
 {
     return true;
 }
 
 // XServiceInfo
 OUString SAL_CALL SdUnoEventsAccess::getImplementationName(  )
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString( "SdUnoEventsAccess" );
 }
 
 sal_Bool SAL_CALL SdUnoEventsAccess::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SdUnoEventsAccess::getSupportedServiceNames(  )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aStr( &maStrServiceName, 1 );
     return aStr;
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index 75b1389ed9cd..e7a2f956cf99 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -48,18 +48,15 @@ private:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
-    void SetStyleSheet( const css::uno::Any& rAny )
-        throw( css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException );
+    void SetStyleSheet( const css::uno::Any& rAny );
     /// @throws css::beans::UnknownPropertyException
-    css::uno::Any GetStyleSheet() const throw( css::beans::UnknownPropertyException  );
+    css::uno::Any GetStyleSheet() const;
 
     // Intern
     /// @throws std::exception
-    SdAnimationInfo* GetAnimationInfo( bool bCreate = false ) const
-        throw (std::exception);
+    SdAnimationInfo* GetAnimationInfo( bool bCreate = false ) const;
     /// @throws std::exception
-    bool IsPresObj() const
-        throw (std::exception);
+    bool IsPresObj() const;
 
     bool IsEmptyPresObj() const;
     void SetEmptyPresObj(bool bEmpty);
@@ -78,38 +75,28 @@ public:
     virtual void modelChanged( SdrModel* pNewModel ) override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XServiceInfo
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     // XEventsSupplier
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) override;
 };
 
 struct SvEventDescription;
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 80b820a975ca..58400aa5c4e3 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -329,7 +329,7 @@ const css::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw
     return theSdGenericDrawPageUnoTunnelId::get().getSeq();
 }
 
-sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
         if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(),
             rId.getConstArray(), 16 ) )
@@ -361,7 +361,7 @@ SdGenericDrawPage::~SdGenericDrawPage() throw()
 {
 }
 
-void SdGenericDrawPage::throwIfDisposed() const throw (css::uno::RuntimeException )
+void SdGenericDrawPage::throwIfDisposed() const
 {
     if( (SvxFmDrawPage::mpModel == nullptr) || (mpModel == nullptr) || (SvxFmDrawPage::mpPage == nullptr) )
         throw lang::DisposedException();
@@ -399,7 +399,6 @@ void SdGenericDrawPage::UpdateModel()
 
 // this is called whenever a SdrObject must be created for a empty api shape wrapper
 SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShape >& xShape )
-    throw (css::uno::RuntimeException, std::exception)
 {
     if( nullptr == SvxFmDrawPage::mpPage || !xShape.is() )
         return nullptr;
@@ -542,7 +541,6 @@ SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShap
 
 // XInterface
 Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     Any aAny;
 
@@ -597,7 +595,6 @@ Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType )
 
 // XPropertySet
 Reference< beans::XPropertySetInfo > SAL_CALL SdGenericDrawPage::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
     throwIfDisposed();
@@ -605,12 +602,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL SdGenericDrawPage::getPropertySetI
 }
 
 void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
-    throw (beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException,
-           std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1018,7 +1009,6 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
 }
 
 Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1332,13 +1322,13 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
     return aAny;
 }
 
-void SAL_CALL SdGenericDrawPage::addPropertyChangeListener( const OUString& , const Reference< beans::XPropertyChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdGenericDrawPage::removePropertyChangeListener( const OUString& , const Reference< beans::XPropertyChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdGenericDrawPage::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdGenericDrawPage::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
+void SAL_CALL SdGenericDrawPage::addPropertyChangeListener( const OUString& , const Reference< beans::XPropertyChangeListener >&  ) {}
+void SAL_CALL SdGenericDrawPage::removePropertyChangeListener( const OUString& , const Reference< beans::XPropertyChangeListener >&  ) {}
+void SAL_CALL SdGenericDrawPage::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  ) {}
+void SAL_CALL SdGenericDrawPage::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  ) {}
 
 // XMultiPropertySet
-void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception )
+void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues )
 {
     if( aPropertyNames.getLength() != aValues.getLength() )
         throw lang::IllegalArgumentException();
@@ -1360,7 +1350,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >&
     }
 }
 
-Sequence< Any > SAL_CALL SdGenericDrawPage::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception)
+Sequence< Any > SAL_CALL SdGenericDrawPage::getPropertyValues( const Sequence< OUString >& aPropertyNames )
 {
     const OUString* pNames = aPropertyNames.getConstArray();
     sal_uInt32 nCount = aPropertyNames.getLength();
@@ -1383,20 +1373,19 @@ Sequence< Any > SAL_CALL SdGenericDrawPage::getPropertyValues( const Sequence< O
     return aValues;
 }
 
-void SAL_CALL SdGenericDrawPage::addPropertiesChangeListener( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >&  ) throw (RuntimeException, std::exception)
+void SAL_CALL SdGenericDrawPage::addPropertiesChangeListener( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >&  )
 {
 }
 
-void SAL_CALL SdGenericDrawPage::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >&  ) throw (RuntimeException, std::exception)
+void SAL_CALL SdGenericDrawPage::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >&  )
 {
 }
 
-void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >&  ) throw (RuntimeException, std::exception)
+void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >&  )
 {
 }
 
 Reference< drawing::XShape >  SdGenericDrawPage::CreateShape(SdrObject *pObj) const
-    throw (RuntimeException, std::exception)
 {
     DBG_ASSERT( GetPage(), "SdGenericDrawPage::CreateShape(), can't create shape for disposed page!" );
     DBG_ASSERT( pObj, "SdGenericDrawPage::CreateShape(), invalid call with pObj == 0!" );
@@ -1529,7 +1518,6 @@ Reference< drawing::XShape >  SdGenericDrawPage::CreateShape(SdrObject *pObj) co
 
 // XServiceInfo
 Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     Sequence< OUString > aSeq( SvxFmDrawPage::getSupportedServiceNames() );
     comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.GenericDrawPage",
@@ -1540,17 +1528,16 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames()
 
 // XLinkTargetSupplier
 Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks(  )
-    throw(uno::RuntimeException, std::exception)
 {
     return new SdPageLinkTargets( this );
 }
 
-void SdGenericDrawPage::setBackground( const Any& ) throw(lang::IllegalArgumentException, std::exception)
+void SdGenericDrawPage::setBackground( const Any& )
 {
     OSL_FAIL( "Don't call me, I'm useless!" );
 }
 
-void SdGenericDrawPage::getBackground( Any& ) throw(std::exception)
+void SdGenericDrawPage::getBackground( Any& )
 {
     OSL_FAIL( "Don't call me, I'm useless!" );
 }
@@ -1595,7 +1582,6 @@ void SdGenericDrawPage::setBookmarkURL( OUString& rURL )
 }
 
 Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Reference< drawing::XShapes >& xShapes )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1631,7 +1617,6 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc
 }
 
 void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGroup )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1649,7 +1634,6 @@ void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGro
 }
 
 Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< drawing::XShapes >& xShapes )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1682,7 +1666,6 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference<
 }
 
 void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1896,7 +1879,7 @@ void SdGenericDrawPage::disposing() throw()
 }
 
 // XAnimationNodeSupplier
-Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() throw (uno::RuntimeException, std::exception)
+Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode()
 {
     ::SolarMutexGuard aGuard;
 
@@ -1920,13 +1903,11 @@ SdPageLinkTargets::~SdPageLinkTargets() throw()
 
 // XElementAccess
 uno::Type SAL_CALL SdPageLinkTargets::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<beans::XPropertySet>::get();
 }
 
 sal_Bool SAL_CALL SdPageLinkTargets::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1953,7 +1934,6 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasElements()
 
 // XNameAccess
 Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1972,7 +1952,6 @@ Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName )
 }
 
 Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2014,7 +1993,6 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames()
 }
 
 sal_Bool SAL_CALL SdPageLinkTargets::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2044,19 +2022,16 @@ SdrObject* SdPageLinkTargets::FindObject( const OUString& rName ) const throw()
 
 // XServiceInfo
 OUString SAL_CALL SdPageLinkTargets::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString( "SdPageLinkTargets" );
 }
 
 sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     Sequence< OUString > aSeq { "com.sun.star.document.LinkTargets" };
     return aSeq;
@@ -2074,7 +2049,6 @@ SdDrawPage::~SdDrawPage() throw()
 
 // XInterface
 Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rType == cppu::UnoType<drawing::XMasterPageTarget>::get() )
     {
@@ -2106,7 +2080,7 @@ void SAL_CALL SdDrawPage::release() throw()
 UNO3_GETIMPLEMENTATION2_IMPL( SdDrawPage, SdGenericDrawPage );
 
 // XTypeProvider
-Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeException, std::exception)
+Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes()
 {
     ::SolarMutexGuard aGuard;
 
@@ -2154,7 +2128,7 @@ Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeExceptio
     return maTypeSequence;
 }
 
-Sequence< sal_Int8 > SAL_CALL SdDrawPage::getImplementationId() throw(uno::RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL SdDrawPage::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -2253,12 +2227,12 @@ OUString SdDrawPage::getUiNameFromPageApiName( const OUString& rApiName )
 }
 
 // XServiceInfo
-OUString SAL_CALL SdDrawPage::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SdDrawPage::getImplementationName()
 {
     return OUString( "SdDrawPage" );
 }
 
-Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames()
 {
     ::SolarMutexGuard aGuard;
 
@@ -2274,14 +2248,12 @@ Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno::
 }
 
 sal_Bool SAL_CALL SdDrawPage::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 // XNamed
 void SAL_CALL SdDrawPage::setName( const OUString& rName )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2360,7 +2332,6 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName )
 }
 
 OUString SAL_CALL SdDrawPage::getName()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2371,7 +2342,6 @@ OUString SAL_CALL SdDrawPage::getName()
 
 // XMasterPageTarget
 Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage(  )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2394,7 +2364,6 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage(  )
 }
 
 void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& xMasterPage )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2433,7 +2402,6 @@ void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >&
 
 // XPresentationPage
 Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2453,39 +2421,33 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage()
 
 // XIndexAccess
 sal_Int32 SAL_CALL SdDrawPage::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     return SdGenericDrawPage::getCount();
 }
 
 Any SAL_CALL SdDrawPage::getByIndex( sal_Int32 Index )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     return SdGenericDrawPage::getByIndex( Index );
 }
 
 // XElementAccess
 uno::Type SAL_CALL SdDrawPage::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return SdGenericDrawPage::getElementType();
 }
 
 sal_Bool SAL_CALL SdDrawPage::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     return SdGenericDrawPage::hasElements();
 }
 
 // XShapes
-void SAL_CALL SdDrawPage::add( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SdDrawPage::add( const Reference< drawing::XShape >& xShape )
 {
     SdGenericDrawPage::add( xShape );
 }
 
 void SAL_CALL SdDrawPage::remove( const Reference< drawing::XShape >& xShape )
-    throw (uno::RuntimeException,
-           std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2506,7 +2468,6 @@ void SAL_CALL SdDrawPage::remove( const Reference< drawing::XShape >& xShape )
 }
 
 void SdDrawPage::setBackground( const Any& rValue )
-    throw( lang::IllegalArgumentException )
 {
     Reference< beans::XPropertySet > xSet;
 
@@ -2571,7 +2532,7 @@ void SdDrawPage::setBackground( const Any& rValue )
 }
 
 // XAnnotationAccess:
-Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation() throw (RuntimeException, std::exception)
+Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation()
 {
     if( !GetPage() )
         throw DisposedException();
@@ -2581,12 +2542,12 @@ Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation()
     return xRet;
 }
 
-void SAL_CALL SdGenericDrawPage::removeAnnotation(const Reference< XAnnotation > & annotation) throw (RuntimeException, IllegalArgumentException, std::exception)
+void SAL_CALL SdGenericDrawPage::removeAnnotation(const Reference< XAnnotation > & annotation)
 {
     GetPage()->removeAnnotation(annotation);
 }
 
-Reference< XAnnotationEnumeration > SAL_CALL SdGenericDrawPage::createAnnotationEnumeration() throw (RuntimeException, std::exception)
+Reference< XAnnotationEnumeration > SAL_CALL SdGenericDrawPage::createAnnotationEnumeration()
 {
     return ::sd::createAnnotationEnumeration( GetPage()->getAnnotations() );
 }
@@ -2637,12 +2598,12 @@ public:
     explicit SdNavigationOrderAccess(SdrPage* pPage);
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException, std::exception) override;
+    virtual Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
 private:
     std::vector< Reference< XShape > > maShapes;
@@ -2665,12 +2626,12 @@ SdNavigationOrderAccess::SdNavigationOrderAccess( SdrPage* pPage )
 }
 
 // XIndexAccess
-sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount(  )
 {
     return static_cast< sal_Int32 >( maShapes.size() );
 }
 
-Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index )
 {
     if( (Index < 0) || (Index > getCount()) )
         throw IndexOutOfBoundsException();
@@ -2679,12 +2640,12 @@ Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (Index
 }
 
 // XElementAccess
-Type SAL_CALL SdNavigationOrderAccess::getElementType(  ) throw (RuntimeException, std::exception)
+Type SAL_CALL SdNavigationOrderAccess::getElementType(  )
 {
     return cppu::UnoType<XShape>::get();
 }
 
-sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements(  )
 {
     return !maShapes.empty();
 }
@@ -2713,7 +2674,6 @@ SdMasterPage::~SdMasterPage() throw()
 
 // XInterface
 Any SAL_CALL SdMasterPage::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2750,7 +2710,7 @@ void SAL_CALL SdMasterPage::release() throw()
 UNO3_GETIMPLEMENTATION2_IMPL( SdMasterPage, SdGenericDrawPage );
 
 // XTypeProvider
-Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeException, std::exception)
+Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes()
 {
     ::SolarMutexGuard aGuard;
 
@@ -2797,18 +2757,18 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeExcept
     return maTypeSequence;
 }
 
-Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId() throw(uno::RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo
-OUString SAL_CALL SdMasterPage::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SdMasterPage::getImplementationName()
 {
     return OUString( "SdMasterPage" );
 }
 
-Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames()
 {
     ::SolarMutexGuard aGuard;
 
@@ -2824,13 +2784,12 @@ Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno
 }
 
 sal_Bool SAL_CALL SdMasterPage::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 // XElementAccess
-sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SdMasterPage::hasElements()
 {
     ::SolarMutexGuard aGuard;
 
@@ -2843,14 +2802,12 @@ sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException, std::
 }
 
 uno::Type SAL_CALL SdMasterPage::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return SdGenericDrawPage::getElementType();
 }
 
 // XIndexAccess
 sal_Int32 SAL_CALL SdMasterPage::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2860,7 +2817,6 @@ sal_Int32 SAL_CALL SdMasterPage::getCount()
 }
 
 Any SAL_CALL SdMasterPage::getByIndex( sal_Int32 Index )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2871,7 +2827,6 @@ Any SAL_CALL SdMasterPage::getByIndex( sal_Int32 Index )
 
 // intern
 void SdMasterPage::setBackground( const Any& rValue )
-    throw( lang::IllegalArgumentException, std::exception )
 {
     // we need at least an beans::XPropertySet
     Reference< beans::XPropertySet > xInputSet( rValue, UNO_QUERY );
@@ -2976,7 +2931,7 @@ void SdMasterPage::setBackground( const Any& rValue )
     }
 }
 
-void SdMasterPage::getBackground( Any& rValue ) throw (std::exception)
+void SdMasterPage::getBackground( Any& rValue )
 {
     if( GetModel() ) try
     {
@@ -3034,7 +2989,6 @@ void SdMasterPage::getBackground( Any& rValue ) throw (std::exception)
 
 // XNamed
 void SAL_CALL SdMasterPage::setName( const OUString& rName )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3077,7 +3031,6 @@ void SAL_CALL SdMasterPage::setName( const OUString& rName )
 }
 
 OUString SAL_CALL SdMasterPage::getName(  )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3094,7 +3047,6 @@ OUString SAL_CALL SdMasterPage::getName(  )
 
 // XPresentationPage
 Reference< drawing::XDrawPage > SAL_CALL SdMasterPage::getNotesPage()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3113,14 +3065,12 @@ Reference< drawing::XDrawPage > SAL_CALL SdMasterPage::getNotesPage()
 }
 
 // XShapes
-void SAL_CALL SdMasterPage::add( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SdMasterPage::add( const Reference< drawing::XShape >& xShape )
 {
     SdGenericDrawPage::add( xShape );
 }
 
 void SAL_CALL SdMasterPage::remove( const Reference< drawing::XShape >& xShape )
-    throw (uno::RuntimeException,
-           std::exception)
 {
     ::SolarMutexGuard aGuard;
 
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 6995461f1da1..17043a99e4c6 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -178,19 +178,16 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
 
 // XServiceInfo
 OUString SAL_CALL SdUnoPageBackground::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SdUnoPageBackground");
 }
 
 sal_Bool SAL_CALL SdUnoPageBackground::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SdUnoPageBackground::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aNameSequence( 2 );
     OUString* pStrings = aNameSequence.getArray();
@@ -203,13 +200,11 @@ uno::Sequence< OUString > SAL_CALL SdUnoPageBackground::getSupportedServiceNames
 
 // XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL SdUnoPageBackground::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     return mpPropSet->getPropertySetInfo();
 }
 
 void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -266,7 +261,6 @@ void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyNa
 }
 
 uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -318,14 +312,13 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert
     return aAny;
 }
 
-void SAL_CALL SdUnoPageBackground::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdUnoPageBackground::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdUnoPageBackground::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
-void SAL_CALL SdUnoPageBackground::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {}
+void SAL_CALL SdUnoPageBackground::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) {}
+void SAL_CALL SdUnoPageBackground::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) {}
+void SAL_CALL SdUnoPageBackground::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) {}
+void SAL_CALL SdUnoPageBackground::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) {}
 
 // XPropertyState
 beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -372,7 +365,6 @@ beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUStr
 }
 
 uno::Sequence< beans::PropertyState > SAL_CALL SdUnoPageBackground::getPropertyStates( const uno::Sequence< OUString >& aPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -389,7 +381,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL SdUnoPageBackground::getPropertyS
 }
 
 void SAL_CALL SdUnoPageBackground::setPropertyToDefault( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -413,7 +404,6 @@ void SAL_CALL SdUnoPageBackground::setPropertyToDefault( const OUString& Propert
 }
 
 uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx
index 6e08f7bdadd8..d163f0f0dfee 100644
--- a/sd/source/ui/unoidl/unopback.hxx
+++ b/sd/source/ui/unoidl/unopback.hxx
@@ -60,24 +60,24 @@ public:
     UNO3_GETIMPLEMENTATION_DECL( SdUnoPageBackground )
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 };
 
 #endif
diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx
index 6f60d693f590..bc3ec20dc5fb 100644
--- a/sd/source/ui/unoidl/unopool.cxx
+++ b/sd/source/ui/unoidl/unopool.cxx
@@ -48,8 +48,7 @@ public:
     explicit SdUnoDrawPool(SdDrawDocument* pModel) throw();
 
 protected:
-    virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue )
-        throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception ) override;
+    virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue ) override;
 
 private:
     SdDrawDocument* mpDrawModel;
@@ -61,7 +60,6 @@ SdUnoDrawPool::SdUnoDrawPool( SdDrawDocument* pModel ) throw()
 }
 
 void SdUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const uno::Any& rValue )
-    throw(beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     switch( pEntry->mnHandle )
     {
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index f48ce25a7180..ad94374375dd 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -96,13 +96,11 @@ SdUnoSearchReplaceShape::~SdUnoSearchReplaceShape() throw()
 
 // util::XReplaceable
 uno::Reference< util::XReplaceDescriptor > SAL_CALL SdUnoSearchReplaceShape::createReplaceDescriptor()
-    throw( uno::RuntimeException, std::exception )
 {
     return new SdUnoSearchReplaceDescriptor(true);
 }
 
 sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< util::XSearchDescriptor >& xDesc )
-    throw( uno::RuntimeException, std::exception )
 {
     SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc );
     if( pDescr == nullptr )
@@ -194,13 +192,11 @@ sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< ut
 
 // XSearchable
 uno::Reference< css::util::XSearchDescriptor > SAL_CALL SdUnoSearchReplaceShape::createSearchDescriptor(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return new SdUnoSearchReplaceDescriptor(false);
 }
 
 uno::Reference< css::container::XIndexAccess > SAL_CALL SdUnoSearchReplaceShape::findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc )
-    throw(css::uno::RuntimeException, std::exception)
 {
     SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc );
     if( pDescr == nullptr )
@@ -307,7 +303,6 @@ uno::Reference< css::container::XIndexAccess > SAL_CALL SdUnoSearchReplaceShape:
 }
 
 uno::Reference< css::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc )
-    throw(css::uno::RuntimeException, std::exception)
 {
     uno::Reference< text::XTextRange > xRange( GetCurrentShape(), uno::UNO_QUERY );
     if( xRange.is() )
@@ -342,7 +337,6 @@ uno::Reference< drawing::XShape >  SdUnoSearchReplaceShape::GetCurrentShape() co
 }
 
 uno::Reference< css::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt, const css::uno::Reference< css::util::XSearchDescriptor >& xDesc )
-    throw(css::uno::RuntimeException, std::exception)
 {
     SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc );
 
@@ -702,7 +696,7 @@ uno::Reference< drawing::XShape >  SdUnoSearchReplaceShape::GetShape( const uno:
 
 UNO3_GETIMPLEMENTATION_IMPL( SdUnoSearchReplaceDescriptor );
 
-SdUnoSearchReplaceDescriptor::SdUnoSearchReplaceDescriptor( bool bReplace ) throw (css::uno::RuntimeException)
+SdUnoSearchReplaceDescriptor::SdUnoSearchReplaceDescriptor( bool bReplace )
 {
     mpPropSet.reset( new SvxItemPropertySet(ImplGetSearchPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool()) );
 
@@ -719,40 +713,34 @@ SdUnoSearchReplaceDescriptor::~SdUnoSearchReplaceDescriptor() throw()
 
 // XSearchDescriptor
 OUString SAL_CALL SdUnoSearchReplaceDescriptor::getSearchString()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return maSearchStr;
 }
 
 void SAL_CALL SdUnoSearchReplaceDescriptor::setSearchString( const OUString& aString )
-    throw(css::uno::RuntimeException, std::exception)
 {
     maSearchStr = aString;
 }
 
 // XReplaceDescriptor
 OUString SAL_CALL SdUnoSearchReplaceDescriptor::getReplaceString()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return maReplaceStr;
 }
 
 void SAL_CALL SdUnoSearchReplaceDescriptor::setReplaceString( const OUString& aReplaceString )
-    throw(css::uno::RuntimeException, std::exception)
 {
     maReplaceStr = aReplaceString;
 }
 
 // XPropertySet
 uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdUnoSearchReplaceDescriptor::getPropertySetInfo()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return mpPropSet->getPropertySetInfo();
 }
 
 void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue )
-    throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -780,7 +768,6 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aP
 }
 
 uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString& PropertyName )
-    throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -806,10 +793,10 @@ uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString
     return aAny;
 }
 
-void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >&  ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {}
-void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >&  ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {}
-void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >&  ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {}
-void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >&  ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {}
+void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >&  ) {}
+void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >&  ) {}
+void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >&  ) {}
+void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >&  ) {}
 
 /* ================================================================= */
 
@@ -824,26 +811,22 @@ SdUnoFindAllAccess::~SdUnoFindAllAccess() throw()
 
 // XElementAccess
 uno::Type SAL_CALL SdUnoFindAllAccess::getElementType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
 sal_Bool SAL_CALL SdUnoFindAllAccess::hasElements()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return maSequence.getLength() > 0;
 }
 
 // XIndexAccess
 sal_Int32 SAL_CALL SdUnoFindAllAccess::getCount()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return maSequence.getLength();
 }
 
 uno::Any SAL_CALL SdUnoFindAllAccess::getByIndex( sal_Int32 Index )
-    throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
 
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 6dfcbfd36747..e08eac833ed5 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -2234,7 +2234,6 @@ DocumentRenderer::~DocumentRenderer()
 sal_Int32 SAL_CALL DocumentRenderer::getRendererCount (
     const css::uno::Any& aSelection,
     const css::uno::Sequence<css::beans::PropertyValue >& rOptions)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     (void)aSelection;
     mpImpl->ProcessProperties(rOptions);
@@ -2245,7 +2244,6 @@ Sequence<beans::PropertyValue> SAL_CALL DocumentRenderer::getRenderer (
     sal_Int32 nRenderer,
     const css::uno::Any& rSelection,
     const css::uno::Sequence<css::beans::PropertyValue>& rOptions)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     (void)nRenderer;
     (void)rSelection;
@@ -2257,7 +2255,6 @@ void SAL_CALL DocumentRenderer::render (
     sal_Int32 nRenderer,
     const css::uno::Any& rSelection,
     const css::uno::Sequence<css::beans::PropertyValue>& rOptions)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     (void)rSelection;
     mpImpl->ProcessProperties(rOptions);
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index e82108ef7e88..fc7492c7e92c 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -235,7 +235,6 @@ vcl::Window* ViewTabBar::GetAnchorWindow(
 
 void SAL_CALL  ViewTabBar::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent)
         && rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix)
@@ -249,7 +248,6 @@ void SAL_CALL  ViewTabBar::notifyConfigurationChange (
 
 void SAL_CALL ViewTabBar::disposing(
     const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxConfigurationController)
     {
@@ -263,35 +261,30 @@ void SAL_CALL ViewTabBar::disposing(
 void SAL_CALL ViewTabBar::addTabBarButtonAfter (
     const TabBarButton& rButton,
     const TabBarButton& rAnchor)
-    throw (css::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     AddTabBarButton(rButton, rAnchor);
 }
 
 void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton)
-    throw (css::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     AddTabBarButton(rButton);
 }
 
 void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton)
-    throw (css::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     RemoveTabBarButton(rButton);
 }
 
 sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton)
-    throw (css::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     return HasTabBarButton(rButton);
 }
 
 Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons()
-    throw (css::uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     return GetTabBarButtons();
@@ -300,13 +293,11 @@ Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons()
 //----- XResource -------------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     return mxViewTabBarId;
 }
 
 sal_Bool SAL_CALL ViewTabBar::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
@@ -324,7 +315,6 @@ const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId)
-    throw (RuntimeException, std::exception)
 {
     sal_Int64 nResult = 0;
 
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 5257e60796b3..7c4f59dab434 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -90,12 +90,12 @@ public:
                             explicit ScannerEventListener( DrawViewShell* pParent ) : mpParent( pParent )  {}
 
     // XEventListener
-    virtual void SAL_CALL   disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   disposing( const lang::EventObject& rEventObject ) override;
 
     void                    ParentDestroyed() { mpParent = nullptr; }
 };
 
-void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject )
 {
     if( mpParent )
         mpParent->ScannerEvent( rEventObject );
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 787a6ddf6830..6e5cff3f70b2 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -346,7 +346,6 @@ void InformationDialog::execute()
 
 
 void OKActionListener::actionPerformed( const ActionEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( rEvent.ActionCommand == "button" )
     {
@@ -354,7 +353,6 @@ void OKActionListener::actionPerformed( const ActionEvent& rEvent )
     }
 }
 void OKActionListener::disposing( const css::lang::EventObject& /* Source */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 3de345eb8234..530f01bcf33a 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -69,8 +69,8 @@ class OKActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListene
 public:
     explicit OKActionListener( InformationDialog& rInformationDialog ) : mrInformationDialog( rInformationDialog ){}
 
-    virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 private:
 
     InformationDialog& mrInformationDialog;
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 014228540a40..c72b44a12ad7 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -347,7 +347,6 @@ void OptimizerDialog::UpdateStatus( const css::uno::Sequence< css::beans::Proper
 
 
 void ItemListener::itemStateChanged( const ItemEvent& Event )
-    throw ( RuntimeException, std::exception )
 {
     try
     {
@@ -475,13 +474,11 @@ void ItemListener::itemStateChanged( const ItemEvent& Event )
     }
 }
 void ItemListener::disposing( const css::lang::EventObject& /* Source */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 
 void ActionListener::actionPerformed( const ActionEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     switch( TKGet( rEvent.ActionCommand ) )
     {
@@ -614,13 +611,11 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
     }
 }
 void ActionListener::disposing( const css::lang::EventObject& /* Source */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 
 void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( !rEvent.ActionCommand.isEmpty() )
     {
@@ -632,13 +627,11 @@ void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent )
     mrOptimizerDialog.UpdateControlStates();
 }
 void ActionListenerListBox0Pg0::disposing( const css::lang::EventObject& /* Source */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 
 void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     double fDouble = 0;
     Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" );
@@ -646,13 +639,11 @@ void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */
         mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
 }
 void TextListenerFormattedField0Pg1::disposing( const css::lang::EventObject& /* Source */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 
 void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     OUString aString;
     Any aAny = mrOptimizerDialog.getControlProperty( "ComboBox0Pg1", "Text" );
@@ -674,13 +665,11 @@ void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ )
     }
 }
 void TextListenerComboBox0Pg1::disposing( const css::lang::EventObject& /* Source */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
 
 void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     double fDouble;
     Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" );
@@ -694,7 +683,6 @@ void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ )
     }
 }
 void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     double fDouble;
     Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" );
@@ -708,19 +696,16 @@ void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ )
     }
 }
 void SpinListenerFormattedField0Pg1::first( const SpinEvent& /* rEvent */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( static_cast< double >( 0 ) ) );
     mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)0 ) );
 }
 void SpinListenerFormattedField0Pg1::last( const SpinEvent& /* rEvent */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( static_cast< double >( 100 ) ) );
     mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)100 ) );
 }
 void SpinListenerFormattedField0Pg1::disposing( const css::lang::EventObject& /* Source */ )
-    throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index 4b01f1792852..c2cb67574426 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -130,8 +130,8 @@ class ItemListener : public ::cppu::WeakImplHelper< css::awt::XItemListener >
 public:
     explicit ItemListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}
 
-    virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 private:
 
     OptimizerDialog& mrOptimizerDialog;
@@ -143,8 +143,8 @@ class ActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListener
 public:
     explicit ActionListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}
 
-    virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 private:
 
     OptimizerDialog& mrOptimizerDialog;
@@ -156,8 +156,8 @@ class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper< css::awt::XActi
 public:
     explicit ActionListenerListBox0Pg0( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}
 
-    virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 private:
 
     OptimizerDialog& mrOptimizerDialog;
@@ -169,8 +169,8 @@ class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt::
 public:
     explicit TextListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}
 
-    virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 private:
 
     OptimizerDialog& mrOptimizerDialog;
@@ -182,8 +182,8 @@ class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper< css::awt::XTextL
 public:
     explicit TextListenerComboBox0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}
 
-    virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 private:
 
     OptimizerDialog& mrOptimizerDialog;
@@ -195,11 +195,11 @@ class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt::
 public:
     explicit SpinListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}
 
-    virtual void SAL_CALL up( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL down( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL first( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL last( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL up( const css::awt::SpinEvent& Event ) override;
+    virtual void SAL_CALL down( const css::awt::SpinEvent& Event ) override;
+    virtual void SAL_CALL first( const css::awt::SpinEvent& Event ) override;
+    virtual void SAL_CALL last( const css::awt::SpinEvent& Event ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 private:
 
     OptimizerDialog& mrOptimizerDialog;
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index 460e4c386a23..b0a5077c5a1e 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -47,7 +47,7 @@ PPPOptimizer::~PPPOptimizer()
 
 
 Reference< css::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch(
-    const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException, std::exception )
+    const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ )
 {
     Reference < XDispatch > xRet;
     if ( aURL.Protocol.equalsIgnoreAsciiCase( "vnd.com.sun.star.comp.PPPOptimizer:" ) )
@@ -60,7 +60,7 @@ Reference< css::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch(
 
 
 Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizer::queryDispatches(
-    const Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception )
+    const Sequence< css::frame::DispatchDescriptor >& aDescripts )
 {
     Sequence< Reference< css::frame::XDispatch> > aReturn( aDescripts.getLength() );
     Reference< css::frame::XDispatch>* pReturn = aReturn.getArray();
@@ -77,7 +77,6 @@ Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizer::queryDispa
 
 
 void SAL_CALL PPPOptimizer::dispatch( const URL& rURL, const Sequence< PropertyValue >& lArguments )
-    throw( RuntimeException, std::exception )
 {
     if ( mxController.is() && rURL.Protocol.equalsIgnoreAsciiCase( "vnd.com.sun.star.comp.PPPOptimizer:" ) )
     {
@@ -101,7 +100,6 @@ void SAL_CALL PPPOptimizer::dispatch( const URL& rURL, const Sequence< PropertyV
 
 
 void SAL_CALL PPPOptimizer::addStatusListener( const Reference< XStatusListener >&, const URL& )
-    throw( RuntimeException, std::exception )
 {
     // TODO
     OSL_FAIL( "PPPOptimizer::addStatusListener()\nNot implemented yet!" );
@@ -109,7 +107,6 @@ void SAL_CALL PPPOptimizer::addStatusListener( const Reference< XStatusListener
 
 
 void SAL_CALL PPPOptimizer::removeStatusListener( const Reference< XStatusListener >&, const URL& )
-    throw( RuntimeException, std::exception )
 {
     // TODO
     OSL_FAIL( "PPPOptimizer::removeStatusListener()\nNot implemented yet!" );
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index 91ef44cbd147..ebac7d5babca 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -44,23 +44,19 @@ 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;
+        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;
+        const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) override;
 
     // XDispatch
     virtual void SAL_CALL dispatch( const css::util::URL& aURL,
-                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
 
     virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener,
-                                                const css::util::URL& aURL )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                                const css::util::URL& aURL ) override;
     virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener,
-                                                const css::util::URL& aURL )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                                const css::util::URL& aURL ) override;
 
     static sal_Int64 GetFileSize( const OUString& rURL );
 };
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 122875cebb45..244eb2939262 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -42,7 +42,6 @@ PPPOptimizerDialog::~PPPOptimizerDialog()
 }
 
 void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments )
-    throw ( Exception, RuntimeException, std::exception )
 {
     if( aArguments.getLength() != 1 )
         throw IllegalArgumentException();
@@ -53,25 +52,22 @@ void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments
 }
 
 OUString SAL_CALL PPPOptimizerDialog::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return PPPOptimizerDialog_getImplementationName();
 }
 
 sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName )
-    throw ( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return PPPOptimizerDialog_getSupportedServiceNames();
 }
 
 Reference< css::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch(
-    const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException, std::exception )
+    const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ )
 {
     Reference < XDispatch > xRet;
     if ( aURL.Protocol.equalsIgnoreAsciiCase( "vnd.com.sun.star.comp.PresentationMinimizer:" ) )
@@ -81,7 +77,7 @@ Reference< css::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch(
 }
 
 Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizerDialog::queryDispatches(
-    const Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception )
+    const Sequence< css::frame::DispatchDescriptor >& aDescripts )
 {
     Sequence< Reference< css::frame::XDispatch> > aReturn( aDescripts.getLength() );
     Reference< css::frame::XDispatch>* pReturn = aReturn.getArray();
@@ -95,7 +91,6 @@ Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizerDialog::quer
 
 void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
                                             const Sequence< PropertyValue >& rArguments )
-    throw( RuntimeException, std::exception )
 {
 
     if ( mxController.is() && rURL.Protocol.equalsIgnoreAsciiCase( "vnd.com.sun.star.comp.PresentationMinimizer:" ) )
@@ -143,14 +138,12 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
 }
 
 void SAL_CALL PPPOptimizerDialog::addStatusListener( const Reference< XStatusListener >&, const URL& )
-    throw( RuntimeException, std::exception )
 {
     // TODO
     // OSL_FAIL( "PPPOptimizerDialog::addStatusListener()\nNot implemented yet!" );
 }
 
 void SAL_CALL PPPOptimizerDialog::removeStatusListener( const Reference< XStatusListener >&, const URL& )
-    throw( RuntimeException, std::exception )
 {
     // TODO
     // OSL_FAIL( "PPPOptimizerDialog::removeStatusListener()\nNot implemented yet!" );
@@ -168,7 +161,6 @@ Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
 }
 
 Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XComponentContext > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new PPPOptimizerDialog( rSMgr ));
 }
diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx
index b0e2ce757d82..6c247ecfb66f 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -54,45 +54,36 @@ public:
     virtual ~PPPOptimizerDialog() override;
 
     // XInitialization
-    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // 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( const OUString& sServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) 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;
 
     // 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;
+        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;
+        const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) override;
 
     // XDispatch
     virtual void SAL_CALL dispatch( const css::util::URL& aURL,
-                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
 
     virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener,
-                                                const css::util::URL& aURL )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                                const css::util::URL& aURL ) override;
     virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener,
-                                                const css::util::URL& aURL )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                                                const css::util::URL& aURL ) override;
 };
 
 OUString PPPOptimizerDialog_getImplementationName();
 css::uno::Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames();
 /// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > PPPOptimizerDialog_createInstance( const css::uno::Reference< css::uno::XComponentContext > & rSMgr )
-    throw( css::uno::Exception );
+css::uno::Reference< css::uno::XInterface > PPPOptimizerDialog_createInstance( const css::uno::Reference< css::uno::XComponentContext > & rSMgr );
 
 
 #endif // INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZERDIALOG_HXX
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index 9bb02189c567..c3a44f524523 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -84,7 +84,6 @@ void UnoDialog::endExecute( bool bStatus )
 
 
 Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > const & xParentPeer )
-    throw ( Exception )
 {
     mxDialog->setVisible( false );
     Reference< XToolkit > xToolkit( Toolkit::create( mxContext ), UNO_QUERY_THROW  );
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index a2eafd4062d2..5c4179768d50 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -61,8 +61,7 @@ public:
     void endExecute( bool bStatus );
 
     /// @throws css::uno::Exception
-    css::uno::Reference< css::awt::XWindowPeer > createWindowPeer( css::uno::Reference< css::awt::XWindowPeer > const & xParentPeer )
-        throw ( css::uno::Exception );
+    css::uno::Reference< css::awt::XWindowPeer > createWindowPeer( css::uno::Reference< css::awt::XWindowPeer > const & xParentPeer );
 
     css::uno::Reference< css::uno::XInterface > insertControlModel( const OUString& rServiceName, const OUString& rName,
         const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues );
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 7d2975857518..3c078525fb31 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -187,7 +187,7 @@ PDFDetector::PDFDetector( const uno::Reference< uno::XComponentContext >& xConte
 {}
 
 // XExtendedFilterDetection
-OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData )
 {
     osl::MutexGuard const guard( m_aMutex );
     bool bSuccess = false;
@@ -382,19 +382,16 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
 }
 
 OUString PDFDetector::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.documents.PDFDetector");
 }
 
 sal_Bool PDFDetector::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> PDFDetector::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{"com.sun.star.document.ImportFilter"};
 }
diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx
index c2af1d257ee1..995ed5991695 100644
--- a/sdext/source/pdfimport/filterdet.hxx
+++ b/sdext/source/pdfimport/filterdet.hxx
@@ -49,17 +49,13 @@ public:
 
     // XExtendedFilterDetection
     virtual OUString SAL_CALL detect( css::uno::Sequence<
-                                               css::beans::PropertyValue >& io_rDescriptor )
-        throw (css::uno::RuntimeException, std::exception) override;
+                                               css::beans::PropertyValue >& io_rDescriptor ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 6c8a8959319c..df10b09a108a 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -57,15 +57,15 @@ public:
     PDFPasswordRequest& operator=(const PDFPasswordRequest&) = delete;
 
     // XInteractionRequest
-    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;
 
     // XInteractionPassword
-    virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPassword( const OUString& rPwd ) override;
+    virtual OUString SAL_CALL getPassword() override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select() throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL select() override;
 
     bool isSelected() const { osl::MutexGuard const guard( m_aMutex ); return m_bSelected; }
 
@@ -86,33 +86,33 @@ PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const OUString& rName )
     m_bSelected(false)
 {}
 
-uno::Any PDFPasswordRequest::getRequest() throw (uno::RuntimeException, std::exception)
+uno::Any PDFPasswordRequest::getRequest()
 {
     return m_aRequest;
 }
 
-uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordRequest::getContinuations() throw (uno::RuntimeException, std::exception)
+uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordRequest::getContinuations()
 {
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > aRet( 1 );
     aRet[0] = this;
     return aRet;
 }
 
-void PDFPasswordRequest::setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception)
+void PDFPasswordRequest::setPassword( const OUString& rPwd )
 {
     osl::MutexGuard const guard( m_aMutex );
 
     m_aPassword = rPwd;
 }
 
-OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException, std::exception)
+OUString PDFPasswordRequest::getPassword()
 {
     osl::MutexGuard const guard( m_aMutex );
 
     return m_aPassword;
 }
 
-void PDFPasswordRequest::select() throw (uno::RuntimeException, std::exception)
+void PDFPasswordRequest::select()
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -130,7 +130,7 @@ public:
 private:
     virtual ~UnsupportedEncryptionFormatRequest() override {}
 
-    virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) override {
+    virtual uno::Any SAL_CALL getRequest() override {
         return uno::makeAny(
             task::ErrorCodeRequest(
                 OUString(), uno::Reference< uno::XInterface >(),
@@ -140,7 +140,7 @@ private:
     }
 
     virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > >
-    SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) override {
+    SAL_CALL getContinuations() override {
         return
             uno::Sequence< uno::Reference< task::XInteractionContinuation > >();
     }
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index f554f8148b8c..9738d62615bf 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -56,7 +56,7 @@ PDFIHybridAdaptor::PDFIHybridAdaptor( const uno::Reference< uno::XComponentConte
 }
 
 // XFilter
-sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::PropertyValue >& rFilterData )
 {
     bool bRet = false;
     if( m_xModel.is() )
@@ -187,12 +187,12 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
     return bRet;
 }
 
-void SAL_CALL PDFIHybridAdaptor::cancel() throw(std::exception)
+void SAL_CALL PDFIHybridAdaptor::cancel()
 {
 }
 
 //XImporter
-void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException, std::exception )
+void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument )
 {
     SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" );
     m_xModel.set( xDocument, uno::UNO_QUERY );
@@ -201,19 +201,16 @@ void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::
 }
 
 OUString PDFIHybridAdaptor::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.documents.HybridPDFImport");
 }
 
 sal_Bool PDFIHybridAdaptor::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> PDFIHybridAdaptor::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{"com.sun.star.document.ImportFilter"};
 }
@@ -283,7 +280,7 @@ bool PDFIRawAdaptor::odfConvert( const OUString&                          rURL,
 // XImportFilter
 sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::PropertyValue >&        rSourceData,
                                             const uno::Reference< xml::sax::XDocumentHandler >& rHdl,
-                                            const uno::Sequence< OUString >&               /*rUserData*/ ) throw( uno::RuntimeException, std::exception )
+                                            const uno::Sequence< OUString >&               /*rUserData*/ )
 {
     // get the InputStream carrying the PDF content
     uno::Reference< io::XInputStream > xInput;
@@ -325,7 +322,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property
 }
 
 //XImporter
-void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException, std::exception )
+void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument )
 {
     SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" );
     m_xModel.set( xDocument, uno::UNO_QUERY );
@@ -334,19 +331,16 @@ void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XCo
 }
 
 OUString PDFIRawAdaptor::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_implementationName;
 }
 
 sal_Bool PDFIRawAdaptor::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> PDFIRawAdaptor::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{"com.sun.star.document.ImportFilter"};
 }
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index db26526787c2..1e5bc3687fd0 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -59,21 +59,17 @@ namespace pdfi
                                           css::uno::XComponentContext >& xContext );
 
         // XFilter
-        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<css::beans::PropertyValue>& rFilterData ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancel() throw(std::exception) override;
+        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<css::beans::PropertyValue>& rFilterData ) override;
+        virtual void SAL_CALL cancel() override;
 
         // XImporter
-        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument )
-            throw( css::lang::IllegalArgumentException, std::exception ) override;
+        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) override;
 
-        OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getImplementationName() override;
 
-        sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-            throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
     };
 
     typedef ::cppu::WeakComponentImplHelper<
@@ -133,20 +129,16 @@ namespace pdfi
         // XImportFilter
         virtual sal_Bool SAL_CALL importer( const css::uno::Sequence< css::beans::PropertyValue >& rSourceData,
                                             const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHdl,
-                                            const css::uno::Sequence< OUString >& rUserData ) throw( css::uno::RuntimeException, std::exception ) override;
+                                            const css::uno::Sequence< OUString >& rUserData ) override;
 
         // XImporter
-        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument )
-            throw( css::lang::IllegalArgumentException, std::exception ) override;
+        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) override;
 
-        OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        OUString SAL_CALL getImplementationName() override;
 
-        sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-            throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
     };
 }
 
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 6fa5db9bd3cd..5b65cd9cd531 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -54,37 +54,37 @@ namespace {
     }
 }
 
-sal_Int16 SAL_CALL SaxAttrList::getLength() throw(std::exception)
+sal_Int16 SAL_CALL SaxAttrList::getLength()
 {
     return sal_Int16(m_aAttributes.size());
 }
-OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex ) throw(std::exception)
+OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex )
 {
     return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aName : OUString();
 }
 
-OUString SAL_CALL SaxAttrList::getTypeByIndex( sal_Int16 i_nIndex) throw(std::exception)
+OUString SAL_CALL SaxAttrList::getTypeByIndex( sal_Int16 i_nIndex)
 {
     return (i_nIndex < sal_Int16(m_aAttributes.size())) ? getCDATAString() : OUString();
 }
 
-OUString SAL_CALL SaxAttrList::getTypeByName( const OUString& i_rName ) throw(std::exception)
+OUString SAL_CALL SaxAttrList::getTypeByName( const OUString& i_rName )
 {
     return (m_aIndexMap.find( i_rName ) != m_aIndexMap.end()) ? getCDATAString() : OUString();
 }
 
-OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw(std::exception)
+OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex )
 {
     return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aValue : OUString();
 }
 
-OUString SAL_CALL SaxAttrList::getValueByName(const OUString& i_rName) throw(std::exception)
+OUString SAL_CALL SaxAttrList::getValueByName(const OUString& i_rName)
 {
     std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName );
     return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : OUString();
 }
 
-css::uno::Reference< css::util::XCloneable > SAL_CALL SaxAttrList::createClone() throw(std::exception)
+css::uno::Reference< css::util::XCloneable > SAL_CALL SaxAttrList::createClone()
 {
     return new SaxAttrList( *this );
 }
diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx
index c57cd5ac69f4..73c9222a2258 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.hxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.hxx
@@ -52,15 +52,15 @@ namespace pdfi
         virtual ~SaxAttrList() override;
 
         // css::xml::sax::XAttributeList
-        virtual sal_Int16 SAL_CALL getLength() throw(std::exception) override;
-        virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception) override;
-        virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception) override;
-        virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(std::exception) override;
-        virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception) override;
-        virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception) override;
+        virtual sal_Int16 SAL_CALL getLength() override;
+        virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) override;
+        virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) override;
+        virtual OUString SAL_CALL getTypeByName(const OUString& aName) override;
+        virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) override;
+        virtual OUString SAL_CALL getValueByName(const OUString& aName) override;
 
         // css::util::XCloneable
-        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw(std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
     };
 }
 
diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx
index aa4c541229df..bd9fddc5cd56 100644
--- a/sdext/source/pdfimport/test/outputwrap.hxx
+++ b/sdext/source/pdfimport/test/outputwrap.hxx
@@ -44,18 +44,18 @@ typedef ::cppu::WeakComponentImplHelper<
             maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write);
         }
 
-        virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) override
 
         {
             sal_uInt64 nBytesWritten(0);
             maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten);
         }
 
-        virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL flush() override
         {
         }
 
-        virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL closeOutput() override
         {
             maFile.close();
         }
@@ -72,16 +72,16 @@ typedef ::cppu::WeakComponentImplHelper<
         {
         }
 
-        virtual void SAL_CALL writeBytes(const css::uno::Sequence< ::sal_Int8 >& aData) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL writeBytes(const css::uno::Sequence< ::sal_Int8 >& aData) override
         {
             maBuffer.append(reinterpret_cast<const sal_Char *>(aData.getConstArray()), aData.getLength());
         }
 
-        virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL flush() override
         {
         }
 
-        virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL closeOutput() override
         {
             mrString = maBuffer.makeStringAndClear();
         }
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 86f17c26aa9c..1a1b206d99b1 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -95,105 +95,77 @@ public:
     //----- XAccessible -------------------------------------------------------
 
     virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
     //-----  XAccessibleContext  ----------------------------------------------
 
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
-    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override;
 
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
 
-    virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
-    virtual OUString SAL_CALL getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
 
-    virtual OUString SAL_CALL getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName() override;
 
     virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
-    virtual css::lang::Locale SAL_CALL getLocale()
-        throw (css::uno::RuntimeException,
-            css::accessibility::IllegalAccessibleComponentStateException, std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
 
     //-----  XAccessibleComponent  --------------------------------------------
 
     virtual sal_Bool SAL_CALL containsPoint (
-        const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& aPoint) override;
 
     virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL
         getAccessibleAtPoint (
-            const css::awt::Point& aPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::awt::Point& aPoint) override;
 
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
-    virtual void SAL_CALL grabFocus()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() override;
 
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
 
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     //-----  XAccessibleEventBroadcaster --------------------------------------
 
     virtual void SAL_CALL addAccessibleEventListener (
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) override;
 
     virtual void SAL_CALL removeAccessibleEventListener (
-            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) override;
 
     //----- XWindowListener ---------------------------------------------------
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     //----- 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;
 
 protected:
     OUString msName;
@@ -216,8 +188,7 @@ protected:
     void UpdateState (const sal_Int16 aState, const bool bValue);
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 //===== AccessibleStateSet ====================================================
@@ -239,17 +210,13 @@ public:
 
     //----- XAccessibleStateSet -----------------------------------------------
 
-    virtual sal_Bool SAL_CALL isEmpty()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isEmpty() override;
 
-    virtual sal_Bool SAL_CALL contains (sal_Int16 nState)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL contains (sal_Int16 nState) override;
 
-    virtual sal_Bool SAL_CALL containsAll (const css::uno::Sequence<sal_Int16>& rStateSet)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsAll (const css::uno::Sequence<sal_Int16>& rStateSet) override;
 
-    virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() override;
 
 private:
     const sal_Int32 mnStateSet;
@@ -276,17 +243,13 @@ public:
 
     //----- XAccessibleRelationSet --------------------------------------------
 
-    virtual sal_Int32 SAL_CALL getRelationCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getRelationCount() override;
 
-    virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex)
-        throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
+    virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex) override;
 
-    virtual sal_Bool SAL_CALL containsRelation (sal_Int16 nRelationType)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsRelation (sal_Int16 nRelationType) override;
 
-    virtual AccessibleRelation SAL_CALL getRelationByType (sal_Int16 nRelationType)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual AccessibleRelation SAL_CALL getRelationByType (sal_Int16 nRelationType) override;
 
 private:
     ::std::vector<AccessibleRelation> maRelations;
@@ -314,78 +277,54 @@ public:
     //----- XAccessibleContext ------------------------------------------------
 
     virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     //----- XAccessibleText ---------------------------------------------------
 
-    virtual sal_Int32 SAL_CALL getCaretPosition()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition() override;
 
-    virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) override;
 
-    virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) override;
 
     virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL
         getCharacterAttributes (
             ::sal_Int32 nIndex,
-            const css::uno::Sequence<OUString>& rRequestedAttributes)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence<OUString>& rRequestedAttributes) override;
 
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) override;
 
-    virtual sal_Int32 SAL_CALL getCharacterCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount() override;
 
-    virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) override;
 
-    virtual OUString SAL_CALL getSelectedText()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSelectedText() override;
 
-    virtual sal_Int32 SAL_CALL getSelectionStart()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getSelectionStart() override;
 
-    virtual sal_Int32 SAL_CALL getSelectionEnd()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd() override;
 
-    virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) override;
 
-    virtual OUString SAL_CALL getText()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getText() override;
 
     virtual OUString SAL_CALL getTextRange (
         sal_Int32 nStartIndex,
-        sal_Int32 nEndIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nEndIndex) override;
 
     virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex (
         sal_Int32 nIndex,
-        sal_Int16 nTextType)
-        throw (css::lang::IndexOutOfBoundsException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        sal_Int16 nTextType) override;
 
     virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex (
         sal_Int32 nIndex,
-        sal_Int16 nTextType)
-        throw (css::lang::IndexOutOfBoundsException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        sal_Int16 nTextType) override;
 
     virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex (
         sal_Int32 nIndex,
-        sal_Int16 nTextType)
-        throw (css::lang::IndexOutOfBoundsException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+        sal_Int16 nTextType) override;
 
-    virtual sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex)
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex) override;
 
 protected:
     virtual awt::Point GetRelativeLocation() override;
@@ -718,7 +657,6 @@ void SAL_CALL PresenterAccessible::disposing()
 //----- XAccessible -----------------------------------------------------------
 
 Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if ( ! mpAccessibleConsole.is())
     {
@@ -742,7 +680,6 @@ Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext
 //----- XFocusListener ----------------------------------------------------
 
 void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusGained at " << this
@@ -751,7 +688,6 @@ void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEve
 }
 
 void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusLost at " << this);
@@ -761,7 +697,6 @@ void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent
 //----- XEventListener ----------------------------------------------------
 
 void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (rEvent.Source == mxMainWindow)
         mxMainWindow = nullptr;
@@ -770,7 +705,6 @@ void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEve
 //----- XInitialize -----------------------------------------------------------
 
 void SAL_CALL PresenterAccessible::initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (rArguments.getLength() >= 1)
     {
@@ -846,7 +780,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::disposing()
 
 Reference<XAccessibleContext> SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleContext()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -856,7 +789,6 @@ Reference<XAccessibleContext> SAL_CALL
 //-----  XAccessibleContext  ----------------------------------------------
 
 sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -867,7 +799,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCoun
 
 Reference<XAccessible> SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleChild (sal_Int32 nIndex)
-    throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -879,7 +810,6 @@ Reference<XAccessible> SAL_CALL
 
 Reference<XAccessible> SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleParent()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -888,7 +818,6 @@ Reference<XAccessible> SAL_CALL
 
 sal_Int32 SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleIndexInParent()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -910,7 +839,6 @@ sal_Int32 SAL_CALL
 
 sal_Int16 SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleRole()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -919,7 +847,6 @@ sal_Int16 SAL_CALL
 
 OUString SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleDescription()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -928,7 +855,6 @@ OUString SAL_CALL
 
 OUString SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -937,7 +863,6 @@ OUString SAL_CALL
 
 Reference<XAccessibleRelationSet> SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleRelationSet()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -946,7 +871,6 @@ Reference<XAccessibleRelationSet> SAL_CALL
 
 Reference<XAccessibleStateSet> SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleStateSet()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -955,8 +879,6 @@ Reference<XAccessibleStateSet> SAL_CALL
 
 lang::Locale SAL_CALL
     PresenterAccessible::AccessibleObject::getLocale()
-    throw (RuntimeException,
-        IllegalAccessibleComponentStateException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -973,7 +895,6 @@ lang::Locale SAL_CALL
 
 sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint (
     const awt::Point& rPoint)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -991,7 +912,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint (
 
 Reference<XAccessible> SAL_CALL
     PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const awt::Point& rPoint)
-    throw (RuntimeException, std::exception)
 {
     (void)rPoint;
     ThrowIfDisposed();
@@ -1000,7 +920,6 @@ Reference<XAccessible> SAL_CALL
 }
 
 awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1011,7 +930,6 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds()
 }
 
 awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1021,7 +939,6 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation()
 }
 
 awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1034,7 +951,6 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen()
 }
 
 awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1044,7 +960,6 @@ awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize()
 }
 
 void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mxBorderWindow.is())
@@ -1054,7 +969,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus()
 }
 
 sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1062,7 +976,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground()
 }
 
 sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1073,7 +986,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground()
 
 void SAL_CALL PresenterAccessible::AccessibleObject::addAccessibleEventListener (
     const Reference<XAccessibleEventListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     if (rxListener.is())
     {
@@ -1093,7 +1005,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::addAccessibleEventListener
 
 void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListener (
     const Reference<XAccessibleEventListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (rxListener.is())
@@ -1112,7 +1023,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListen
 
 void SAL_CALL PresenterAccessible::AccessibleObject::windowResized (
     const css::awt::WindowEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -1121,7 +1031,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowResized (
 
 void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved (
     const css::awt::WindowEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -1130,7 +1039,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved (
 
 void SAL_CALL PresenterAccessible::AccessibleObject::windowShown (
     const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     UpdateStateSet();
@@ -1138,7 +1046,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowShown (
 
 void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden (
     const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     UpdateStateSet();
@@ -1147,7 +1054,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden (
 //----- XEventListener --------------------------------------------------------
 
 void SAL_CALL PresenterAccessible::AccessibleObject::disposing (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (rEvent.Source == mxContentWindow)
     {
@@ -1330,7 +1236,6 @@ awt::Point PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation()
 }
 
 void PresenterAccessible::AccessibleObject::ThrowIfDisposed() const
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
         throw lang::DisposedException("object has already been disposed", uno::Reference<uno::XInterface>(const_cast<uno::XWeak*>(static_cast<uno::XWeak const *>(this))));
@@ -1357,19 +1262,16 @@ sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState)
 //----- XAccessibleStateSet ---------------------------------------------------
 
 sal_Bool SAL_CALL AccessibleStateSet::isEmpty()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return mnStateSet==0;
 }
 
 sal_Bool SAL_CALL AccessibleStateSet::contains (sal_Int16 nState)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return (mnStateSet & GetStateMask(nState)) != 0;
 }
 
 sal_Bool SAL_CALL AccessibleStateSet::containsAll (const css::uno::Sequence<sal_Int16>& rStateSet)
-    throw (css::uno::RuntimeException, std::exception)
 {
     for (sal_Int32 nIndex=0,nCount=rStateSet.getLength(); nIndex<nCount; ++nIndex)
     {
@@ -1380,7 +1282,6 @@ sal_Bool SAL_CALL AccessibleStateSet::containsAll (const css::uno::Sequence<sal_
 }
 
 css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::std::vector<sal_Int16> aStates;
     aStates.reserve(sizeof(mnStateSet)*8);
@@ -1411,13 +1312,11 @@ void AccessibleRelationSet::AddRelation (
 //----- XAccessibleRelationSet ------------------------------------------------
 
 sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return maRelations.size();
 }
 
 AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex)
-    throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception)
 {
     if (nIndex<0 && sal_uInt32(nIndex)>=maRelations.size())
         return AccessibleRelation();
@@ -1426,7 +1325,6 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex
 }
 
 sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     for (::std::vector<AccessibleRelation>::const_iterator iRelation(maRelations.begin());
          iRelation!=maRelations.end();
@@ -1439,7 +1337,6 @@ sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationTy
 }
 
 AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 nRelationType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     for (::std::vector<AccessibleRelation>::const_iterator iRelation(maRelations.begin());
          iRelation!=maRelations.end();
@@ -1468,7 +1365,6 @@ PresenterAccessible::AccessibleParagraph::AccessibleParagraph (
 
 Reference<XAccessibleRelationSet> SAL_CALL
     PresenterAccessible::AccessibleParagraph::getAccessibleRelationSet()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1497,7 +1393,6 @@ Reference<XAccessibleRelationSet> SAL_CALL
 //----- XAccessibleText -------------------------------------------------------
 
 sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1509,7 +1404,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition()
 }
 
 sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1523,7 +1417,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sa
 }
 
 sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1536,7 +1429,6 @@ Sequence<css::beans::PropertyValue> SAL_CALL
     PresenterAccessible::AccessibleParagraph::getCharacterAttributes (
         ::sal_Int32 nIndex,
         const css::uno::Sequence<OUString>& rRequestedAttributes)
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1559,7 +1451,6 @@ Sequence<css::beans::PropertyValue> SAL_CALL
 
 awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBounds (
     sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1586,7 +1477,6 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo
 }
 
 sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1599,7 +1489,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount()
 
 sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
     const css::awt::Point& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     sal_Int32 nIndex (-1);
@@ -1607,7 +1496,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
 }
 
 OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1615,7 +1503,6 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText()
 }
 
 sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1623,7 +1510,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart()
 }
 
 sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1633,7 +1519,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd()
 sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
     sal_Int32 nStartIndex,
     sal_Int32 nEndIndex)
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     (void)nEndIndex;
     ThrowIfDisposed();
@@ -1642,7 +1527,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
 }
 
 OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1656,7 +1540,6 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText()
 OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange (
     sal_Int32 nLocalStartIndex,
     sal_Int32 nLocalEndIndex)
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1674,9 +1557,6 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange (
 TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex (
     sal_Int32 nLocalCharacterIndex,
     sal_Int16 nTextType)
-    throw (css::lang::IndexOutOfBoundsException,
-        css::lang::IllegalArgumentException,
-        css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1690,9 +1570,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex (
 TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeIndex (
     sal_Int32 nLocalCharacterIndex,
     sal_Int16 nTextType)
-    throw (css::lang::IndexOutOfBoundsException,
-        css::lang::IllegalArgumentException,
-        css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1706,9 +1583,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeInde
 TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindIndex (
     sal_Int32 nLocalCharacterIndex,
     sal_Int16 nTextType)
-    throw (css::lang::IndexOutOfBoundsException,
-        css::lang::IllegalArgumentException,
-        css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -1722,7 +1596,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindInde
 sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText (
     sal_Int32 nStartIndex,
     sal_Int32 nEndIndex)
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index 7bb26b8b78b1..eb8531ac84db 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -73,26 +73,21 @@ public:
     //----- XAccessible -------------------------------------------------------
 
     virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
     //----- XFocusListener ----------------------------------------------------
 
-    virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) override;
 
-    virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) override;
 
     //----- 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;
 
     //----- XInitialization ---------------------------------------------------
 
-    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
     class AccessibleObject;
     class AccessibleParagraph;
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index fc787724efef..baf81e5aee35 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -231,28 +231,24 @@ css::geometry::IntegerSize2D const & PresenterButton::GetSize()
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterButton::windowShown (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -261,7 +257,6 @@ void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEven
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (mxWindow.is() && mxCanvas.is())
@@ -294,7 +289,6 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent)
 //----- XMouseListener --------------------------------------------------------
 
 void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -302,7 +296,6 @@ void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent)
 }
 
 void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -318,7 +311,6 @@ void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent
 }
 
 void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -327,7 +319,6 @@ void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent)
 }
 
 void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -338,14 +329,12 @@ void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent)
 //----- XMouseMotionListener --------------------------------------------------
 
 void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -354,7 +343,6 @@ void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent)
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (rEvent.Source == mxWindow)
         mxWindow = nullptr;
@@ -503,7 +491,6 @@ Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties (
 }
 
 void PresenterButton::ThrowIfDisposed() const
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index fe16bcb2cbf0..18a504c20d59 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -74,48 +74,36 @@ public:
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // XMouseListener
 
-    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override;
 
     // XMouseMotionListener
 
-    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override;
 
     // 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;
 
 private:
     ::rtl::Reference<PresenterController> mpPresenterController;
@@ -161,8 +149,7 @@ private:
         const OUString& rsConfgurationName);
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } }
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index f6e39cd4b51b..1bb33c46b1e0 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -720,7 +720,6 @@ IPresentationTime* PresenterController::GetPresentationTime()
 
 void SAL_CALL PresenterController::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -802,7 +801,6 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
 
 void SAL_CALL PresenterController::disposing (
     const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxController)
         mxController = nullptr;
@@ -818,7 +816,6 @@ void SAL_CALL PresenterController::disposing (
 
 void SAL_CALL PresenterController::frameAction (
     const frame::FrameActionEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Action == frame::FrameAction_FRAME_ACTIVATED)
     {
@@ -830,7 +827,6 @@ void SAL_CALL PresenterController::frameAction (
 //----- XKeyListener ----------------------------------------------------------
 
 void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     // Tell all views about the unhandled key event.
     PresenterPaneContainer::PaneList::const_iterator iPane;
@@ -846,7 +842,6 @@ void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent)
 }
 
 void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source != mxMainWindow)
         return;
@@ -1048,13 +1043,11 @@ void PresenterController::HandleNumericKeyPress (
 //----- XFocusListener --------------------------------------------------------
 
 void SAL_CALL PresenterController::focusGained (const css::awt::FocusEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterController::focusLost (const css::awt::FocusEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -1062,7 +1055,6 @@ void SAL_CALL PresenterController::focusLost (const css::awt::FocusEvent& rEvent
 //----- XMouseListener --------------------------------------------------------
 
 void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     if (mxMainWindow.is())
@@ -1070,19 +1062,16 @@ void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEv
 }
 
 void SAL_CALL PresenterController::mouseReleased (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterController::mouseEntered (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -1090,13 +1079,11 @@ void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEve
 //----- XMouseMotionListener --------------------------------------------------
 
 void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterController::mouseDragged (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index d9eef94da5b9..958d5c3ef26c 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -145,56 +145,43 @@ public:
     // XConfigurationChangeListener
 
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
     // XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
     // XFrameActionListener
 
     virtual void SAL_CALL frameAction (
-        const css::frame::FrameActionEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::frame::FrameActionEvent& rEvent) override;
 
     // XKeyListener
 
-    virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) override;
+    virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) override;
 
     // XFocusListener
 
-    virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) override;
+    virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) override;
 
     // XMouseListener
 
-    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override;
 
     // XMouseMotionListener
 
-    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override;
 
 private:
     typedef ::std::map<css::uno::Reference<css::frame::XFrame>,rtl::Reference<PresenterController> > InstanceContainer;
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index 23834291fafe..d6f3986be086 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
@@ -63,14 +63,12 @@ void SAL_CALL PresenterCurrentSlideObserver::disposing()
 
 void SAL_CALL PresenterCurrentSlideObserver::beginEvent (
     const Reference<animations::XAnimationNode>& rNode)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rNode;
 }
 
 void SAL_CALL PresenterCurrentSlideObserver::endEvent (
     const Reference<animations::XAnimationNode>& rNode)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rNode;
 }
@@ -78,23 +76,19 @@ void SAL_CALL PresenterCurrentSlideObserver::endEvent (
 void SAL_CALL PresenterCurrentSlideObserver::repeat (
     const css::uno::Reference<css::animations::XAnimationNode>& rNode,
     sal_Int32)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rNode;
 }
 
 void SAL_CALL PresenterCurrentSlideObserver::paused()
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL PresenterCurrentSlideObserver::resumed()
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // Determine whether the new current slide (the one after the one that
     // just ended) is the slide past the last slide in the presentation,
@@ -106,24 +100,20 @@ void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse)
 }
 
 void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const OUString &)
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL PresenterCurrentSlideObserver::slideTransitionStarted()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if( mpPresenterController.is() )
         mpPresenterController->UpdateCurrentSlide(0);
 }
 
 void SAL_CALL PresenterCurrentSlideObserver::slideTransitionEnded()
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded()
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -131,7 +121,6 @@ void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded()
 
 void SAL_CALL PresenterCurrentSlideObserver::disposing (
     const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == Reference<XInterface>(static_cast<XWeak*>(mpPresenterController.get())))
         dispose();
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index c68c6861c07a..087084e7d1b7 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
@@ -55,23 +55,22 @@ public:
     virtual void SAL_CALL disposing() override;
 
     // XSlideShowListener
-    virtual void SAL_CALL paused(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL resumed(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideTransitionStarted(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideTransitionEnded(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideAnimationsEnded(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL paused(  ) override;
+    virtual void SAL_CALL resumed(  ) override;
+    virtual void SAL_CALL slideTransitionStarted(  ) override;
+    virtual void SAL_CALL slideTransitionEnded(  ) override;
+    virtual void SAL_CALL slideAnimationsEnded(  ) override;
+    virtual void SAL_CALL slideEnded(sal_Bool bReverse) override;
+    virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) override;
 
     // XAnimationListener
-    virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override;
+    virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override;
+    virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) override;
 
     // XEventListener
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
 private:
     ::rtl::Reference<PresenterController> mpPresenterController;
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 336a47e6c486..d35c378f3aff 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -100,7 +100,6 @@ void PresenterFrameworkObserver::Shutdown()
 }
 
 void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if ( ! rEvent.Source.is())
         return;
@@ -115,7 +114,6 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE
 
 void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange (
     const ConfigurationChangeEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     bool bDispose(false);
 
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index 4406e6836119..3937606d7d80 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -52,11 +52,9 @@ public:
         const Action& rAction);
 
     virtual void SAL_CALL disposing() override;
-    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;
     virtual void SAL_CALL notifyConfigurationChange (
-        const css::drawing::framework::ConfigurationChangeEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
 
 private:
     css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController;
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 42ba18411179..92d7819da92e 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -209,7 +209,6 @@ void SAL_CALL PresenterHelpView::disposing()
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     if (rEventObject.Source == mxCanvas)
     {
@@ -225,7 +224,6 @@ void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObjec
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -233,14 +231,12 @@ void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent)
 }
 
 void SAL_CALL PresenterHelpView::windowMoved (const awt::WindowEvent& rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -248,7 +244,6 @@ void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent)
 }
 
 void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -257,7 +252,6 @@ void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent)
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterHelpView::windowPaint (const css::awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     Paint(rEvent.UpdateRect);
 }
@@ -453,14 +447,12 @@ void PresenterHelpView::CheckFontSize()
 //----- XResourceId -----------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxViewId;
 }
 
 sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
@@ -502,7 +494,6 @@ void PresenterHelpView::Resize()
 }
 
 void PresenterHelpView::ThrowIfDisposed()
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
index 67f314b82613..3d2a4a25069e 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -60,35 +60,27 @@ public:
     // lang::XEventListener
 
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // XResourceId
 
-    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override;
 
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
 private:
     class TextContainer;
@@ -120,8 +112,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sdext::presenter
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index c964839a38b4..4fc1ac3a4995 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -282,7 +282,6 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP
 //-----  lang::XEventListener -------------------------------------------------
 
 void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     if (rEventObject.Source == mxParentWindow)
         mxParentWindow = nullptr;
@@ -291,26 +290,22 @@ void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObje
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterNotesView::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     Layout();
 }
 
 void SAL_CALL PresenterNotesView::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterNotesView::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterNotesView::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -318,7 +313,6 @@ void SAL_CALL PresenterNotesView::windowHidden (const lang::EventObject& rEvent)
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -337,13 +331,11 @@ void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent)
 //----- XResourceId -----------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL PresenterNotesView::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     return mxViewId;
 }
 
 sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
@@ -351,7 +343,6 @@ sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly()
 //----- XDrawView -------------------------------------------------------------
 
 void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
-    throw (RuntimeException, std::exception)
 {
     // Get the associated notes page.
     mxCurrentNotesPage = nullptr;
@@ -369,7 +360,6 @@ void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDraw
 }
 
 Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage()
-    throw (RuntimeException, std::exception)
 {
     return nullptr;
 }
@@ -377,7 +367,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage()
 //----- XKeyListener ----------------------------------------------------------
 
 void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     switch (rEvent.KeyCode)
     {
@@ -419,7 +408,6 @@ void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent)
 }
 
 void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index 99976cc39461..57aa2d044241 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -88,51 +88,39 @@ public:
     // lang::XEventListener
 
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // XResourceId
 
-    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override;
 
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override;
 
-    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
     // XKeyListener
 
-    virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) override;
+    virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) override;
 
 private:
     css::uno::Reference<css::drawing::framework::XResourceId> mxViewId;
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
index 8efbb05e1ee7..14036c8f3617 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -56,14 +56,12 @@ PresenterPane::~PresenterPane()
 //----- XPane -----------------------------------------------------------------
 
 Reference<awt::XWindow> SAL_CALL PresenterPane::getWindow()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxContentWindow;
 }
 
 Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxContentCanvas;
@@ -72,7 +70,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas()
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     PresenterPaneBase::windowResized(rEvent);
@@ -87,7 +84,6 @@ void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent)
 }
 
 void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     PresenterPaneBase::windowMoved(rEvent);
@@ -101,7 +97,6 @@ void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent)
 }
 
 void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     PresenterPaneBase::windowShown(rEvent);
@@ -119,7 +114,6 @@ void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent)
 }
 
 void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     PresenterPaneBase::windowHidden(rEvent);
@@ -131,7 +125,6 @@ void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent)
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterPane::windowPaint (const awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx
index fbd61446c9c2..dc12aa920abc 100644
--- a/sdext/source/presenter/PresenterPane.hxx
+++ b/sdext/source/presenter/PresenterPane.hxx
@@ -51,30 +51,23 @@ public:
 
     // XPane
 
-    css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() override;
 
-    css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
 private:
     /** Store the bounding box so that when the window is resized or moved
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 0303cd9691c6..295e76c94284 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -134,7 +134,6 @@ const awt::Point& PresenterPaneBase::GetCalloutAnchor() const
 //----- XInitialization -------------------------------------------------------
 
 void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -231,14 +230,12 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
 //----- XResourceId -----------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL PresenterPaneBase::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxPaneId;
 }
 
 sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return true;
 }
@@ -246,28 +243,24 @@ sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly()
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterPaneBase::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterPaneBase::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterPaneBase::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -276,7 +269,6 @@ void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject& rEvent)
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterPaneBase::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxBorderWindow)
     {
@@ -402,7 +394,6 @@ bool PresenterPaneBase::IsVisible() const
 }
 
 void PresenterPaneBase::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 9a31c2eacf27..3f19273236d7 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -78,35 +78,27 @@ public:
 
     // XInitialization
 
-    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
     // XResourceId
 
-    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override;
 
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // 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;
 
 protected:
     ::rtl::Reference<PresenterController> mpPresenterController;
@@ -141,8 +133,7 @@ protected:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 7d6f60a7224f..47f86d1f44bc 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -172,7 +172,6 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder (
     const OUString& rsPaneBorderStyleName,
     const css::awt::Rectangle& rRectangle,
     drawing::framework::BorderType eBorderType)
-    throw(css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -185,7 +184,6 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder (
     const OUString& rsPaneBorderStyleName,
     const css::awt::Rectangle& rRectangle,
     drawing::framework::BorderType eBorderType)
-    throw(css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -200,7 +198,6 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder (
     const css::awt::Rectangle& rOuterBorderRectangle,
     const css::awt::Rectangle& rRepaintArea,
     const OUString& rsTitle)
-    throw(css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -236,7 +233,6 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout (
     const css::awt::Rectangle& rRepaintArea,
     const OUString& rsTitle,
     const css::awt::Point& rCalloutAnchor)
-    throw(css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -268,7 +264,6 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout (
 
 awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset (
     const OUString& rsPaneBorderStyleName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ProvideTheme();
@@ -370,7 +365,6 @@ awt::Rectangle PresenterPaneBorderPainter::RemoveBorder (
 }
 
 void PresenterPaneBorderPainter::ThrowIfDisposed() const
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index 8230cd58a1aa..467926d5469d 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -90,22 +90,19 @@ public:
     virtual css::awt::Rectangle SAL_CALL addBorder (
         const OUString& rsPaneBorderStyleName,
         const css::awt::Rectangle& rRectangle,
-        css::drawing::framework::BorderType eBorderType)
-        throw(css::uno::RuntimeException, std::exception) override;
+        css::drawing::framework::BorderType eBorderType) override;
 
     virtual css::awt::Rectangle SAL_CALL removeBorder (
         const OUString& rsPaneBorderStyleName,
         const css::awt::Rectangle& rRectangle,
-        css::drawing::framework::BorderType eBorderType)
-        throw(css::uno::RuntimeException, std::exception) override;
+        css::drawing::framework::BorderType eBorderType) override;
 
     virtual void SAL_CALL paintBorder (
         const OUString& rsPaneBorderStyleName,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const css::awt::Rectangle& rOuterBorderRectangle,
         const css::awt::Rectangle& rRepaintArea,
-        const OUString& rsTitle)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& rsTitle) override;
 
     virtual void SAL_CALL paintBorderWithCallout (
         const OUString& rsPaneBorderStyleName,
@@ -113,12 +110,10 @@ public:
         const css::awt::Rectangle& rOuterBorderRectangle,
         const css::awt::Rectangle& rRepaintArea,
         const OUString& rsTitle,
-        const css::awt::Point& rCalloutAnchor)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::awt::Point& rCalloutAnchor) override;
 
     virtual css::awt::Point SAL_CALL getCalloutOffset (
-        const OUString& rsPaneBorderStyleName)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& rsPaneBorderStyleName) override;
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxContext;
@@ -136,8 +131,7 @@ private:
     void ProvideTheme();
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index d22616334b2f..05a6a1e3e54d 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -355,7 +355,6 @@ void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor)
 
 void SAL_CALL PresenterPaneContainer::disposing (
     const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     SharedPaneDescriptor pDescriptor (
         FindContentWindow(Reference<awt::XWindow>(rEvent.Source, UNO_QUERY)));
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index 6961a07bd00f..ea9ba7292aab 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -168,8 +168,7 @@ public:
     // XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
 private:
     css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index 9be6b39bc4ae..3477895c03d3 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -115,7 +115,6 @@ PresenterPaneFactory::~PresenterPaneFactory()
 }
 
 void SAL_CALL PresenterPaneFactory::disposing()
-    throw (RuntimeException)
 {
     Reference<XConfigurationController> xCC (mxConfigurationControllerWeak);
     if (xCC.is())
@@ -141,7 +140,6 @@ void SAL_CALL PresenterPaneFactory::disposing()
 
 Reference<XResource> SAL_CALL PresenterPaneFactory::createResource (
     const Reference<XResourceId>& rxPaneId)
-    throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -181,7 +179,6 @@ Reference<XResource> SAL_CALL PresenterPaneFactory::createResource (
 }
 
 void SAL_CALL PresenterPaneFactory::releaseResource (const Reference<XResource>& rxResource)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -317,7 +314,6 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
 }
 
 void PresenterPaneFactory::ThrowIfDisposed() const
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index 932111af0411..f605a0d8f59c 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -71,22 +71,19 @@ public:
         const ::rtl::Reference<PresenterController>& rpPresenterController);
     virtual ~PresenterPaneFactory() override;
 
-    virtual void SAL_CALL disposing()
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing() override;
 
     // XResourceFactory
 
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL createResource (
             const css::uno::Reference<
-                css::drawing::framework::XResourceId>& rxPaneId)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
+                css::drawing::framework::XResourceId>& rxPaneId) override;
 
     virtual void SAL_CALL
         releaseResource (
             const css::uno::Reference<css::drawing::framework::XResource>&
-                rxPane)
-        throw (css::uno::RuntimeException, std::exception) override;
+                rxPane) override;
 
 private:
     css::uno::WeakReference<css::uno::XComponentContext> mxComponentContextWeak;
@@ -113,7 +110,7 @@ private:
         const bool bIsSpritePane);
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } }
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index b5b18813cea0..07470b31816d 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -195,28 +195,23 @@ public:
     // XDispatch
     virtual void SAL_CALL dispatch(
         const css::util::URL& aURL,
-        const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 
     virtual void SAL_CALL addStatusListener(
         const css::uno::Reference<css::frame::XStatusListener>& rxListener,
-        const css::util::URL& rURL)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::util::URL& rURL) override;
 
     virtual void SAL_CALL removeStatusListener (
         const css::uno::Reference<css::frame::XStatusListener>& rxListener,
-        const css::util::URL& rURL)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::util::URL& rURL) override;
 
     // document::XEventListener
 
-    virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) override;
 
     // 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;
 
 private:
     OUString msURLPath;
@@ -270,7 +265,6 @@ void SAL_CALL PresenterProtocolHandler::disposing()
 //----- XInitialize -----------------------------------------------------------
 
 void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArguments)
-    throw (Exception, RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (aArguments.getLength() > 0)
@@ -291,20 +285,17 @@ void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArgume
 }
 
 OUString PresenterProtocolHandler::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return getImplementationName_static();
 }
 
 sal_Bool PresenterProtocolHandler::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString>
 PresenterProtocolHandler::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return getSupportedServiceNames_static();
 }
@@ -315,7 +306,6 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch (
     const css::util::URL& rURL,
     const OUString& rsTargetFrameName,
     sal_Int32 nSearchFlags)
-    throw(RuntimeException, std::exception)
 {
     (void)rsTargetFrameName;
     (void)nSearchFlags;
@@ -333,7 +323,6 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch (
 
 Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryDispatches(
     const Sequence<frame::DispatchDescriptor>& rDescriptors)
-    throw(RuntimeException, std::exception)
 {
     (void)rDescriptors;
     ThrowIfDisposed();
@@ -342,7 +331,6 @@ Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryD
 
 
 void PresenterProtocolHandler::ThrowIfDisposed() const
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -442,7 +430,6 @@ void PresenterProtocolHandler::Dispatch::disposing()
 void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch(
     const css::util::URL& rURL,
     const css::uno::Sequence<css::beans::PropertyValue>& /*rArguments*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -468,7 +455,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch(
 void SAL_CALL PresenterProtocolHandler::Dispatch::addStatusListener(
     const css::uno::Reference<css::frame::XStatusListener>& rxListener,
     const css::util::URL& rURL)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (rURL.Path == msURLPath)
     {
@@ -488,7 +474,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::addStatusListener(
 void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener (
     const css::uno::Reference<css::frame::XStatusListener>& rxListener,
     const css::util::URL& rURL)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (rURL.Path == msURLPath)
     {
@@ -508,7 +493,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener (
 
 void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent (
     const css::document::EventObject& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -518,7 +502,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent (
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterProtocolHandler::Dispatch::disposing (const css::lang::EventObject& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     mbIsListeningToWindowManager = false;
diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx
index 68594dbfc721..890b65db4bbf 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.hxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.hxx
@@ -57,17 +57,13 @@ public:
     // XInitialization
 
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence<css::uno::Any>& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::uno::Any>& aArguments) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XDispatchProvider
 
@@ -75,20 +71,18 @@ public:
         queryDispatch (
             const css::util::URL& aURL,
             const OUString& aTargetFrameName,
-            sal_Int32 nSearchFlags )
-        throw(css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nSearchFlags ) override;
 
     virtual css::uno::Sequence<css::uno::Reference<css::frame::XDispatch> > SAL_CALL
         queryDispatches(
-            const css::uno::Sequence< css::frame::DispatchDescriptor>& rDescriptors)
-        throw(css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::frame::DispatchDescriptor>& rDescriptors) override;
 
 private:
     class Dispatch;
     ::rtl::Reference<PresenterController> mpPresenterController;
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } }
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index fdda9b6bcafc..e5d61a768adf 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -74,11 +74,11 @@ namespace {
 
         // document::XEventListener
 
-        virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) override;
 
         // 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;
 
     private:
         css::uno::Reference<css::frame::XModel2 > mxModel;
@@ -125,7 +125,6 @@ void SAL_CALL PresenterScreenJob::disposing()
 
 Any SAL_CALL PresenterScreenJob::execute(
     const Sequence< beans::NamedValue >& Arguments )
-    throw (lang::IllegalArgumentException, Exception, RuntimeException, std::exception)
 {
     Sequence< beans::NamedValue > lEnv;
 
@@ -206,7 +205,7 @@ void SAL_CALL PresenterScreenListener::disposing()
 
 // document::XEventListener
 
-void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event )
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -235,7 +234,6 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb
 // XEventListener
 
 void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -306,7 +304,6 @@ void SAL_CALL PresenterScreen::disposing()
 //----- XEventListener --------------------------------------------------------
 
 void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/)
-    throw (RuntimeException, std::exception)
 {
     mxSlideShowControllerWeak = WeakReference<presentation::XSlideShowController>();
     RequestShutdownPresenterScreen();
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 53f234d45d39..fe9346231195 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -68,10 +68,7 @@ public:
     // XJob
 
     virtual css::uno::Any SAL_CALL execute(
-        const css::uno::Sequence<css::beans::NamedValue >& Arguments)
-        throw (css::lang::IllegalArgumentException,
-            css::uno::Exception,
-            css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence<css::beans::NamedValue >& Arguments) override;
 
 private:
     explicit PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
@@ -123,7 +120,7 @@ public:
 
     // 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;
 
 private:
     css::uno::Reference<css::frame::XModel2 > mxModel;
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index 8cba1bcafa01..89ac7f52ce16 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -322,25 +322,21 @@ void PresenterScrollBar::Paint (
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterScrollBar::windowMoved (const css::awt::WindowEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterScrollBar::windowShown (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterScrollBar::windowHidden (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -348,7 +344,6 @@ void SAL_CALL PresenterScrollBar::windowHidden (const css::lang::EventObject& rE
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterScrollBar::windowPaint (const css::awt::PaintEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (mxWindow.is())
     {
@@ -367,7 +362,6 @@ void SAL_CALL PresenterScrollBar::windowPaint (const css::awt::PaintEvent& rEven
 //----- XMouseListener --------------------------------------------------------
 
 void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     maDragAnchor.X = rEvent.X;
     maDragAnchor.Y = rEvent.Y;
@@ -377,7 +371,6 @@ void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEve
 }
 
 void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -388,13 +381,11 @@ void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent& rEv
 }
 
 void SAL_CALL PresenterScrollBar::mouseEntered (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     if (meMouseMoveArea != None)
@@ -412,7 +403,6 @@ void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEven
 //----- XMouseMotionListener --------------------------------------------------
 
 void SAL_CALL PresenterScrollBar::mouseMoved (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     const Area eArea (GetArea(rEvent.X, rEvent.Y));
     if (eArea != meMouseMoveArea)
@@ -428,7 +418,6 @@ void SAL_CALL PresenterScrollBar::mouseMoved (const css::awt::MouseEvent& rEvent
 }
 
 void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (meButtonDownArea != Thumb)
         return;
@@ -449,7 +438,6 @@ void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEve
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (rEvent.Source == mxWindow)
         mxWindow = nullptr;
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 26341835c7ea..46a6704bc7f8 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -110,48 +110,36 @@ public:
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // XMouseListener
 
-    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override;
 
     // XMouseMotionListener
 
-    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override;
 
     // 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;
 
     enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None,
                 AreaCount = None };
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 75a5a64b1ba7..978a6577ac45 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -126,13 +126,11 @@ void SAL_CALL PresenterSlidePreview::disposing()
 //----- XResourceId -----------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL PresenterSlidePreview::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     return mxViewId;
 }
 
 sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
@@ -140,7 +138,6 @@ sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly()
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -149,13 +146,11 @@ void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent& rEve
 }
 
 void SAL_CALL PresenterSlidePreview::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -164,7 +159,6 @@ void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject& rEven
 }
 
 void SAL_CALL PresenterSlidePreview::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -172,7 +166,6 @@ void SAL_CALL PresenterSlidePreview::windowHidden (const lang::EventObject& rEve
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterSlidePreview::windowPaint (const awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -188,7 +181,6 @@ void SAL_CALL PresenterSlidePreview::windowPaint (const awt::PaintEvent& rEvent)
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterSlidePreview::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxWindow)
     {
@@ -201,7 +193,6 @@ void SAL_CALL PresenterSlidePreview::disposing (const lang::EventObject& rEvent)
 //----- XDrawView -------------------------------------------------------------
 
 void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex());
@@ -209,7 +200,6 @@ void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XD
 }
 
 Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return nullptr;
@@ -383,7 +373,6 @@ void PresenterSlidePreview::Resize()
 }
 
 void PresenterSlidePreview::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index f94eab89cccd..2df1d56c9981 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -69,43 +69,33 @@ public:
 
     // XResourceId
 
-    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override;
 
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // 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;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override;
 
-    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
 protected:
     ::rtl::Reference<PresenterController> mpPresenterController;
@@ -148,7 +138,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed() throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 6237a165f058..25a357e823c3 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -253,7 +253,6 @@ void PresenterSlideShowView::disposing()
 
 void SAL_CALL PresenterSlideShowView::setCurrentPage (
     const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
-    throw (css::uno::RuntimeException, std::exception)
 {
     mxCurrentSlide = rxSlide;
     if (mpPresenterController.get() != nullptr
@@ -295,7 +294,6 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage (
 }
 
 css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::getCurrentPage()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return mxCurrentSlide;
 }
@@ -314,7 +312,6 @@ void PresenterSlideShowView::ReleaseView()
 //----- XSlideShowView --------------------------------------------------------
 
 Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -322,7 +319,6 @@ Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas()
 }
 
 void SAL_CALL PresenterSlideShowView::clear()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     mbIsForcedPaintPending = false;
@@ -350,7 +346,6 @@ void SAL_CALL PresenterSlideShowView::clear()
 }
 
 geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -377,7 +372,6 @@ geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation()
 }
 
 geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return geometry::IntegerSize2D(0,0);
@@ -385,7 +379,6 @@ geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset()
 
 void SAL_CALL PresenterSlideShowView::addTransformationChangedListener(
     const Reference<util::XModifyListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     maBroadcaster.addListener(
@@ -395,7 +388,6 @@ void SAL_CALL PresenterSlideShowView::addTransformationChangedListener(
 
 void SAL_CALL PresenterSlideShowView::removeTransformationChangedListener(
     const Reference<util::XModifyListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     maBroadcaster.removeListener(
@@ -405,7 +397,6 @@ void SAL_CALL PresenterSlideShowView::removeTransformationChangedListener(
 
 void SAL_CALL PresenterSlideShowView::addPaintListener(
     const Reference<awt::XPaintListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     maBroadcaster.addListener(
@@ -415,7 +406,6 @@ void SAL_CALL PresenterSlideShowView::addPaintListener(
 
 void SAL_CALL PresenterSlideShowView::removePaintListener(
     const Reference<awt::XPaintListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     maBroadcaster.removeListener(
@@ -425,7 +415,6 @@ void SAL_CALL PresenterSlideShowView::removePaintListener(
 
 void SAL_CALL PresenterSlideShowView::addMouseListener(
     const Reference<awt::XMouseListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     maBroadcaster.addListener(
@@ -435,7 +424,6 @@ void SAL_CALL PresenterSlideShowView::addMouseListener(
 
 void SAL_CALL PresenterSlideShowView::removeMouseListener(
     const Reference<awt::XMouseListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     maBroadcaster.removeListener(
@@ -445,7 +433,6 @@ void SAL_CALL PresenterSlideShowView::removeMouseListener(
 
 void SAL_CALL PresenterSlideShowView::addMouseMotionListener(
     const Reference<awt::XMouseMotionListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     maBroadcaster.addListener(
@@ -455,7 +442,6 @@ void SAL_CALL PresenterSlideShowView::addMouseMotionListener(
 
 void SAL_CALL PresenterSlideShowView::removeMouseMotionListener(
     const Reference<awt::XMouseMotionListener>& rxListener)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     maBroadcaster.removeListener(
@@ -464,7 +450,6 @@ void SAL_CALL PresenterSlideShowView::removeMouseMotionListener(
 }
 
 void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -484,7 +469,7 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape)
     }
 }
 
-awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea(  ) throw (RuntimeException, std::exception)
+awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea(  )
 {
     if( mxViewWindow.is() && mxTopPane.is() )
         return mxPresenterHelper->getWindowExtentsRelative( mxViewWindow, mxTopPane->getWindow() );
@@ -499,7 +484,6 @@ awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea(  ) throw (Runtime
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterSlideShowView::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxViewWindow)
         mxViewWindow = nullptr;
@@ -510,7 +494,6 @@ void SAL_CALL PresenterSlideShowView::disposing (const lang::EventObject& rEvent
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterSlideShowView::windowPaint (const awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     // Deactivated views must not be painted.
     if ( ! mbIsPresenterViewActive)
@@ -531,7 +514,6 @@ void SAL_CALL PresenterSlideShowView::windowPaint (const awt::PaintEvent& rEvent
 //----- XMouseListener --------------------------------------------------------
 
 void SAL_CALL PresenterSlideShowView::mousePressed (const awt::MouseEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     awt::MouseEvent aEvent (rEvent);
     aEvent.Source = static_cast<XWeak*>(this);
@@ -551,7 +533,6 @@ void SAL_CALL PresenterSlideShowView::mousePressed (const awt::MouseEvent& rEven
 }
 
 void SAL_CALL PresenterSlideShowView::mouseReleased (const awt::MouseEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     awt::MouseEvent aEvent (rEvent);
     aEvent.Source = static_cast<XWeak*>(this);
@@ -564,7 +545,6 @@ void SAL_CALL PresenterSlideShowView::mouseReleased (const awt::MouseEvent& rEve
 }
 
 void SAL_CALL PresenterSlideShowView::mouseEntered (const awt::MouseEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     awt::MouseEvent aEvent (rEvent);
     aEvent.Source = static_cast<XWeak*>(this);
@@ -577,7 +557,6 @@ void SAL_CALL PresenterSlideShowView::mouseEntered (const awt::MouseEvent& rEven
 }
 
 void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     awt::MouseEvent aEvent (rEvent);
     aEvent.Source = static_cast<XWeak*>(this);
@@ -592,7 +571,6 @@ void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent
 //----- XMouseMotionListener --------------------------------------------------
 
 void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     awt::MouseEvent aEvent (rEvent);
     aEvent.Source = static_cast<XWeak*>(this);
@@ -605,7 +583,6 @@ void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEven
 }
 
 void SAL_CALL PresenterSlideShowView::mouseMoved (const awt::MouseEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     awt::MouseEvent aEvent (rEvent);
     aEvent.Source = static_cast<XWeak*>(this);
@@ -620,7 +597,6 @@ void SAL_CALL PresenterSlideShowView::mouseMoved (const awt::MouseEvent& rEvent)
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -631,7 +607,6 @@ void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent& rEv
 }
 
 void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     if ( ! mbIsPaintPending)
@@ -639,14 +614,12 @@ void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent& rEven
 }
 
 void SAL_CALL PresenterSlideShowView::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     Resize();
 }
 
 void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -654,13 +627,11 @@ void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEv
 //----- XView -----------------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId()
-    throw(RuntimeException, std::exception)
 {
     return mxViewId;
 }
 
 sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
@@ -984,7 +955,6 @@ void PresenterSlideShowView::CreateBackgroundPolygons()
 }
 
 void PresenterSlideShowView::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index a324f7009d02..b7a3e76a6158 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -79,124 +79,94 @@ public:
     // XSlideShowView
 
     virtual css::uno::Reference<
-        css::rendering::XSpriteCanvas > SAL_CALL getCanvas()
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::rendering::XSpriteCanvas > SAL_CALL getCanvas() override;
 
-    virtual void SAL_CALL clear()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL clear() override;
 
-    virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation() override;
 
-    virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset() override;
 
     virtual void SAL_CALL addTransformationChangedListener(
         const css::uno::Reference<
-            css::util::XModifyListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::util::XModifyListener >& xListener) override;
 
     virtual void SAL_CALL removeTransformationChangedListener(
         const css::uno::Reference<
-            css::util::XModifyListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::util::XModifyListener >& xListener) override;
 
     virtual void SAL_CALL addPaintListener(
         const css::uno::Reference<
-            css::awt::XPaintListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::awt::XPaintListener >& xListener) override;
 
     virtual void SAL_CALL removePaintListener(
         const css::uno::Reference<
-            css::awt::XPaintListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::awt::XPaintListener >& xListener) override;
 
     virtual void SAL_CALL addMouseListener(
         const css::uno::Reference<
-            css::awt::XMouseListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::awt::XMouseListener >& xListener) override;
 
     virtual void SAL_CALL removeMouseListener(
         const css::uno::Reference<
-            css::awt::XMouseListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::awt::XMouseListener >& xListener) override;
 
     virtual void SAL_CALL addMouseMotionListener(
         const css::uno::Reference<
-            css::awt::XMouseMotionListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::awt::XMouseMotionListener >& xListener) override;
 
     virtual void SAL_CALL removeMouseMotionListener(
         const css::uno::Reference<
-            css::awt::XMouseMotionListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::awt::XMouseMotionListener >& xListener) override;
 
-    virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape) override;
 
-    virtual css::awt::Rectangle SAL_CALL getCanvasArea(  )
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getCanvasArea(  ) override;
 
     // 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;
 
     // XPaintListener
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // XMouseListener
-    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override;
 
     // XMouseMotionListener
 
-    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XView
 
     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL
-        getResourceId()
-        throw(css::uno::RuntimeException, std::exception) override;
+        getResourceId() override;
 
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override;
 
-    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
     // CachablePresenterView
 
@@ -261,8 +231,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 
     void impl_addAndConfigureView();
 };
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index d493344561d9..fdb3ddec8781 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -426,7 +426,6 @@ void PresenterSlideSorter::SetActiveState (const bool bIsActive)
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     if (rEventObject.Source == mxWindow)
     {
@@ -451,7 +450,6 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -460,14 +458,12 @@ void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEven
 }
 
 void SAL_CALL PresenterSlideSorter::windowMoved (const awt::WindowEvent& rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -476,7 +472,6 @@ void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent
 }
 
 void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
@@ -485,7 +480,6 @@ void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEven
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -503,7 +497,6 @@ void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEv
 //----- XMouseListener --------------------------------------------------------
 
 void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::awt::MouseEvent rTemp =rEvent;
     /// check whether RTL interface or not
@@ -516,7 +509,6 @@ void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rE
 }
 
 void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::awt::MouseEvent rTemp =rEvent;
     /// check whether RTL interface or not
@@ -547,13 +539,11 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r
 }
 
 void SAL_CALL PresenterSlideSorter::mouseEntered (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     mnSlideIndexMousePressed = -1;
@@ -564,7 +554,6 @@ void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEv
 //----- XMouseMotionListener --------------------------------------------------
 
 void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (mpMouseOverManager.get() != nullptr)
     {
@@ -594,7 +583,6 @@ void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEve
 }
 
 void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -602,14 +590,12 @@ void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rE
 //----- XResourceId -----------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxViewId;
 }
 
 sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
@@ -618,7 +604,6 @@ sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly()
 
 void SAL_CALL PresenterSlideSorter::propertyChange (
     const css::beans::PropertyChangeEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -627,7 +612,6 @@ void SAL_CALL PresenterSlideSorter::propertyChange (
 
 void SAL_CALL PresenterSlideSorter::notifyPreviewCreation (
     sal_Int32 nSlideIndex)
-    throw(css::uno::RuntimeException, std::exception)
 {
     OSL_ASSERT(mpLayout.get()!=nullptr);
 
@@ -638,7 +622,6 @@ void SAL_CALL PresenterSlideSorter::notifyPreviewCreation (
 //----- XDrawView -------------------------------------------------------------
 
 void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
-    throw (RuntimeException, std::exception)
 {
     (void)rxSlide;
 
@@ -670,7 +653,6 @@ void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDr
 }
 
 Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return nullptr;
@@ -1108,7 +1090,6 @@ bool PresenterSlideSorter::ProvideCanvas()
 }
 
 void PresenterSlideSorter::ThrowIfDisposed()
-    throw (lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index 3d5d4d82ce3e..021786efd2e4 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -77,78 +77,60 @@ public:
     // lang::XEventListener
 
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // XMouseListener
 
-    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override;
 
     // XMouseMotionListener
 
-    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override;
 
     // XResourceId
 
-    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override;
 
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
     // XPropertyChangeListener
 
     virtual void SAL_CALL propertyChange (
-        const css::beans::PropertyChangeEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::beans::PropertyChangeEvent& rEvent) override;
 
     // XSlidePreviewCacheListener
 
     virtual void SAL_CALL notifyPreviewCreation (
-        sal_Int32 nSlideIndex)
-        throw(css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nSlideIndex) override;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override;
 
-    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
@@ -201,8 +183,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 } } // end of namespace ::sdext::presenter
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index f873af85fa71..f951258cd053 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -62,14 +62,12 @@ void PresenterSpritePane::disposing()
 //----- XPane -----------------------------------------------------------------
 
 Reference<awt::XWindow> SAL_CALL PresenterSpritePane::getWindow()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return mxContentWindow;
 }
 
 Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas()
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -82,7 +80,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas()
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     PresenterPaneBase::windowResized(rEvent);
@@ -93,7 +90,6 @@ void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent
 }
 
 void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     PresenterPaneBase::windowMoved(rEvent);
@@ -105,7 +101,6 @@ void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent)
 }
 
 void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     PresenterPaneBase::windowShown(rEvent);
@@ -121,7 +116,6 @@ void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent)
 }
 
 void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     PresenterPaneBase::windowHidden(rEvent);
@@ -134,7 +128,6 @@ void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     ThrowIfDisposed();
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx
index 859f9dc9501a..e65ea98a9148 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sdext/source/presenter/PresenterSpritePane.hxx
@@ -61,30 +61,23 @@ public:
 
     // XPane
 
-    virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() override;
 
-    virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
 private:
     css::uno::Reference<css::awt::XWindow> mxParentWindow;
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 093f7548ffd7..477dafda5c54 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -488,7 +488,6 @@ void PresenterClockTimer::CheckCurrentTime (const TimeValue& rCurrentTime)
 //----- XCallback -------------------------------------------------------------
 
 void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rUserData;
 
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index 6b6ce0eef029..903a7ed5320d 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -95,8 +95,7 @@ public:
 
     // XCallback
 
-    virtual void SAL_CALL notify (const css::uno::Any& rUserData)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notify (const css::uno::Any& rUserData) override;
 
 private:
     static ::rtl::Reference<PresenterClockTimer> mpInstance;
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index fbd1694abcd9..42823bbedbab 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -160,18 +160,15 @@ namespace {
 
         // 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;
 
         // document::XEventListener
 
-        virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) override;
 
         // frame::XStatusListener
 
-        virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) override;
 
     protected:
         ::rtl::Reference<PresenterToolBar> mpToolBar;
@@ -219,8 +216,7 @@ namespace {
 
         // 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;
 
     protected:
         virtual awt::Size CreateBoundingSize (
@@ -492,7 +488,6 @@ const Reference<XComponentContext>& PresenterToolBar::GetComponentContext() cons
 //-----  lang::XEventListener -------------------------------------------------
 
 void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     if (rEventObject.Source == mxWindow)
         mxWindow = nullptr;
@@ -501,34 +496,29 @@ void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterToolBar::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     mbIsLayoutPending = true;
 }
 
 void SAL_CALL PresenterToolBar::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterToolBar::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
     mbIsLayoutPending = true;
 }
 
 void SAL_CALL PresenterToolBar::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 //----- XPaintListener --------------------------------------------------------
 void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if ( ! mxCanvas.is())
         return;
@@ -553,28 +543,24 @@ void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent)
 
 //----- XMouseListener --------------------------------------------------------
 void SAL_CALL PresenterToolBar::mousePressed (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
         ThrowIfDisposed();
         CheckMouseOver(rEvent, true, true);
 }
 
 void SAL_CALL PresenterToolBar::mouseReleased (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
         ThrowIfDisposed();
         CheckMouseOver(rEvent, true);
 }
 
 void SAL_CALL PresenterToolBar::mouseEntered (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
         ThrowIfDisposed();
         CheckMouseOver(rEvent, true);
 }
 
 void SAL_CALL PresenterToolBar::mouseExited (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
         ThrowIfDisposed();
         CheckMouseOver(rEvent, false);
@@ -583,14 +569,12 @@ void SAL_CALL PresenterToolBar::mouseExited (const css::awt::MouseEvent& rEvent)
 //----- XMouseMotionListener --------------------------------------------------
 
 void SAL_CALL PresenterToolBar::mouseMoved (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
         ThrowIfDisposed();
         CheckMouseOver(rEvent, true);
  }
 
 void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     (void)rEvent;
@@ -599,7 +583,6 @@ void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent& rEvent
 //----- XDrawView -------------------------------------------------------------
 
 void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
-    throw (RuntimeException, std::exception)
 {
     if (rxSlide != mxCurrentSlide)
     {
@@ -609,7 +592,6 @@ void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPa
 }
 
 Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage()
-    throw (RuntimeException, std::exception)
 {
     return mxCurrentSlide;
 }
@@ -1051,7 +1033,6 @@ void PresenterToolBar::CheckMouseOver (
 }
 
 void PresenterToolBar::ThrowIfDisposed() const
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -1144,7 +1125,6 @@ const ::rtl::Reference<PresenterToolBar>& PresenterToolBarView::GetPresenterTool
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterToolBarView::windowPaint (const css::awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     awt::Rectangle aWindowBox (mxWindow->getPosSize());
     mpPresenterController->GetCanvasHelper()->Paint(
@@ -1158,7 +1138,6 @@ void SAL_CALL PresenterToolBarView::windowPaint (const css::awt::PaintEvent& rEv
 //-----  lang::XEventListener -------------------------------------------------
 
 void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventObject)
-    throw (RuntimeException, std::exception)
 {
     if (rEventObject.Source == mxWindow)
         mxWindow = nullptr;
@@ -1167,13 +1146,11 @@ void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventOb
 //----- XResourceId -----------------------------------------------------------
 
 Reference<XResourceId> SAL_CALL PresenterToolBarView::getResourceId()
-    throw (RuntimeException, std::exception)
 {
     return mxViewId;
 }
 
 sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly()
-    throw (RuntimeException, std::exception)
 {
     return false;
 }
@@ -1181,7 +1158,6 @@ sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly()
 //----- XDrawView -------------------------------------------------------------
 
 void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide)
-    throw (RuntimeException, std::exception)
 {
     Reference<drawing::XDrawView> xToolBar (static_cast<XWeak*>(mpToolBar.get()), UNO_QUERY);
     if (xToolBar.is())
@@ -1189,7 +1165,6 @@ void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDr
 }
 
 Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage()
-    throw (RuntimeException, std::exception)
 {
     return nullptr;
 }
@@ -1362,7 +1337,6 @@ void Element::UpdateState()
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -1370,7 +1344,6 @@ void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent)
 //----- document::XEventListener ----------------------------------------------
 
 void SAL_CALL Element::notifyEvent (const css::document::EventObject& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     UpdateState();
@@ -1379,7 +1352,6 @@ void SAL_CALL Element::notifyEvent (const css::document::EventObject& rEvent)
 //----- frame::XStatusListener ------------------------------------------------
 
 void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     bool bIsSelected (mbIsSelected);
     bool bIsEnabled (rEvent.IsEnabled);
@@ -1613,7 +1585,6 @@ PresenterBitmapDescriptor::Mode Button::GetMode() const
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     mbIsListenerRegistered = false;
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index b4b83b8dd765..3bd2cbcac39c 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -103,58 +103,44 @@ public:
     // lang::XEventListener
 
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // XMouseListener
 
-    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override;
 
     // XMouseMotionListener
 
-    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override;
 
-    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
     class Context;
 
@@ -210,8 +196,7 @@ private:
     /** @throws css::lang::DisposedException when the object has already been
         disposed.
     */
-    void ThrowIfDisposed() const
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 /** View for the PresenterToolBar.
@@ -236,31 +221,25 @@ public:
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // lang::XEventListener
 
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     // XResourceId
 
-    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override;
 
-    virtual sal_Bool SAL_CALL isAnchorOnly()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAnchorOnly() override;
 
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override;
 
-    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
 private:
     //    css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 67654127f465..912bc1bab0e0 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -74,8 +74,7 @@ public:
     }
 
     virtual void SAL_CALL setCurrentPage (
-        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
-        throw (css::uno::RuntimeException, std::exception) override
+        const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override
     {
         Reference<presentation::XSlideShowController> xSlideShowController (
             mpPresenterController->GetSlideShowController());
@@ -179,7 +178,6 @@ PresenterViewFactory::~PresenterViewFactory()
 }
 
 void SAL_CALL PresenterViewFactory::disposing()
-    throw (RuntimeException)
 {
     if (mxConfigurationController.is())
         mxConfigurationController->removeResourceFactoryForReference(this);
@@ -210,7 +208,6 @@ void SAL_CALL PresenterViewFactory::disposing()
 
 Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
     const Reference<XResourceId>& rxViewId)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -236,7 +233,6 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
 }
 
 void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>& rxView)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -515,7 +511,6 @@ Reference<XView> PresenterViewFactory::CreateHelpView(
 }
 
 void PresenterViewFactory::ThrowIfDisposed() const
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index b83c7790a592..f699c7b1b2ba 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -96,20 +96,17 @@ public:
         const ::rtl::Reference<PresenterController>& rpPresenterController);
     virtual ~PresenterViewFactory() override;
 
-    virtual void SAL_CALL disposing()
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing() override;
 
     // XResourceFactory
 
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL createResource (
-            const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) override;
 
     virtual void SAL_CALL
         releaseResource (
-            const css::uno::Reference<css::drawing::framework::XResource>& rxPane)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::drawing::framework::XResource>& rxPane) override;
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
@@ -157,7 +154,7 @@ private:
         const css::uno::Reference<css::drawing::framework::XPane>& rxAnchorPane);
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } }
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 7907ae25b691..158049d9a24b 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -216,7 +216,6 @@ void PresenterWindowManager::SetPaneBorderPainter (
 //----- XWindowListener -------------------------------------------------------
 
 void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (rEvent.Source == mxParentWindow)
@@ -237,7 +236,6 @@ void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEv
 }
 
 void SAL_CALL PresenterWindowManager::windowMoved (const awt::WindowEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     if (rEvent.Source != mxParentWindow)
@@ -251,13 +249,11 @@ void SAL_CALL PresenterWindowManager::windowMoved (const awt::WindowEvent& rEven
 }
 
 void SAL_CALL PresenterWindowManager::windowShown (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
 
 void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     (void)rEvent;
 }
@@ -265,7 +261,6 @@ void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEv
 //----- XPaintListener --------------------------------------------------------
 
 void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent)
-    throw (RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 
@@ -298,14 +293,12 @@ void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent
 //----- XMouseListener --------------------------------------------------------
 
 void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     mbIsMouseClickPending = true;
 }
 
 void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (mbIsMouseClickPending)
     {
@@ -315,14 +308,12 @@ void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent&
 }
 
 void SAL_CALL PresenterWindowManager::mouseEntered (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     mbIsMouseClickPending = false;
 }
 
 void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
     mbIsMouseClickPending = false;
@@ -331,13 +322,11 @@ void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent& r
 //----- XFocusListener --------------------------------------------------------
 
 void SAL_CALL PresenterWindowManager::focusGained (const css::awt::FocusEvent& /*rEvent*/)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
 }
 
 void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     (void)rEvent;
@@ -346,7 +335,6 @@ void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEv
 //----- XEventListener --------------------------------------------------------
 
 void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent)
-    throw (RuntimeException, std::exception)
 {
     if (rEvent.Source == mxParentWindow)
         mxParentWindow = nullptr;
@@ -1117,7 +1105,6 @@ void PresenterWindowManager::Update()
 }
 
 void PresenterWindowManager::ThrowIfDisposed() const
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 26bc4f701cf6..64d850386f35 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -114,50 +114,38 @@ public:
 
     // XWindowListener
 
-    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override;
 
-    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override;
 
-    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override;
 
     // XPaintListener
 
-    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override;
 
     // XMouseListener
 
-    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override;
 
-    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override;
 
     // XFocusListener
 
-    virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) override;
 
-    virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) override;
 
     // XEventListener
 
     virtual void SAL_CALL disposing (
-        const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& rEvent) override;
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
@@ -213,7 +201,7 @@ private:
     void NotifyDisposing();
 
     /// @throws css::lang::DisposedException
-    void ThrowIfDisposed() const throw (css::lang::DisposedException);
+    void ThrowIfDisposed() const;
 };
 
 } }
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";
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index d20c668c3546..0ac727c52187 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -48,15 +48,13 @@ class SfxRefreshListener : public ::cppu::WeakImplHelper<css::util::XRefreshList
         }
 
         // util.XRefreshListener
-        virtual void SAL_CALL refreshed( const css::lang::EventObject& rEvent )
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL refreshed( const css::lang::EventObject& rEvent ) override
         {
             m_pOwner->refreshed(rEvent);
         }
 
         // 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
         {
             m_pOwner->disposing(rEvent);
         }
@@ -92,7 +90,7 @@ SfxFilterListener::~SfxFilterListener()
 {
 }
 
-void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource )
 {
     SolarMutexGuard aGuard;
     uno::Reference< util::XRefreshable > xContainer( aSource.Source, uno::UNO_QUERY );
@@ -105,7 +103,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) t
     }
 }
 
-void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& aSource ) throw( uno::RuntimeException )
+void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& aSource )
 {
     SolarMutexGuard aGuard;
     uno::Reference< util::XRefreshable > xNotifier( aSource.Source, uno::UNO_QUERY );
diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index 8fd5a9af4196..bf4d348a0e44 100644
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
@@ -42,10 +42,10 @@ class SfxFilterListener final
     public:
         // XRefreshListener
         /// @throws css::uno::RuntimeException
-        void SAL_CALL refreshed( const css::lang::EventObject& aSource ) throw( css::uno::RuntimeException, std::exception );
+        void SAL_CALL refreshed( const css::lang::EventObject& aSource );
         // XEventListener
         /// @throws css::uno::RuntimeException
-        void SAL_CALL disposing( const css::lang::EventObject& aSource ) throw( css::uno::RuntimeException );
+        void SAL_CALL disposing( const css::lang::EventObject& aSource );
 
 };
 
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index dab426adf6b2..918e70c8f04f 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -99,7 +99,7 @@ void SfxStatusListener::ReBind()
 }
 
 // new UNO API
-void SAL_CALL SfxStatusListener::dispose() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL SfxStatusListener::dispose()
 {
     if ( m_xDispatch.is() && !m_aCommand.Complete.isEmpty() )
     {
@@ -118,19 +118,16 @@ void SAL_CALL SfxStatusListener::dispose() throw( css::uno::RuntimeException, st
 }
 
 void SAL_CALL SfxStatusListener::addEventListener( const Reference< XEventListener >& )
-throw ( RuntimeException, std::exception )
 {
     // do nothing - this is a wrapper class which does not support listeners
 }
 
 void SAL_CALL SfxStatusListener::removeEventListener( const Reference< XEventListener >& )
-throw ( RuntimeException, std::exception )
 {
     // do nothing - this is a wrapper class which does not support listeners
 }
 
 void SAL_CALL SfxStatusListener::disposing( const EventObject& Source )
-throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -141,7 +138,6 @@ throw( RuntimeException, std::exception )
 }
 
 void SAL_CALL SfxStatusListener::statusChanged( const FeatureStateEvent& rEvent)
-throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index c39c7eff154a..8465c33dfa85 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -65,7 +65,7 @@ BindDispatch_Impl::BindDispatch_Impl( const css::uno::Reference< css::frame::XDi
     aStatus.IsEnabled = true;
 }
 
-void SAL_CALL BindDispatch_Impl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL BindDispatch_Impl::disposing( const css::lang::EventObject& )
 {
     if ( xDisp.is() )
     {
@@ -74,7 +74,7 @@ void SAL_CALL BindDispatch_Impl::disposing( const css::lang::EventObject& ) thro
     }
 }
 
-void SAL_CALL  BindDispatch_Impl::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL  BindDispatch_Impl::statusChanged( const css::frame::FeatureStateEvent& rEvent )
 {
     aStatus = rEvent;
     if ( !pCache )
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index d298b19e16f9..32551122c55b 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -119,14 +119,12 @@ void ThumbnailViewAcc::LoseFocus()
 }
 
 uno::Reference< accessibility::XAccessibleContext > SAL_CALL ThumbnailViewAcc::getAccessibleContext()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return this;
 }
 
 sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -136,7 +134,6 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleChildCount()
 }
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleChild( sal_Int32 i )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -152,7 +149,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces
 }
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -166,7 +162,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces
 }
 
 sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -191,7 +186,6 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent()
 }
 
 sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // #i73746# As the Java Access Bridge (v 2.0.1) uses "managesDescendants"
@@ -202,14 +196,12 @@ sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole()
 }
 
 OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return OUString("ThumbnailView");
 }
 
 OUString SAL_CALL ThumbnailViewAcc::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -230,14 +222,12 @@ OUString SAL_CALL ThumbnailViewAcc::getAccessibleName()
 }
 
 uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ThumbnailViewAcc::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return uno::Reference< accessibility::XAccessibleRelationSet >();
 }
 
 uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewAcc::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper();
@@ -257,7 +247,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewAcc::
 }
 
 lang::Locale SAL_CALL ThumbnailViewAcc::getLocale()
-    throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -276,7 +265,6 @@ lang::Locale SAL_CALL ThumbnailViewAcc::getLocale()
 }
 
 void SAL_CALL ThumbnailViewAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard (m_aMutex);
@@ -300,7 +288,6 @@ void SAL_CALL ThumbnailViewAcc::addAccessibleEventListener( const uno::Reference
 }
 
 void SAL_CALL ThumbnailViewAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard (m_aMutex);
@@ -316,7 +303,6 @@ void SAL_CALL ThumbnailViewAcc::removeAccessibleEventListener( const uno::Refere
 }
 
 sal_Bool SAL_CALL ThumbnailViewAcc::containsPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const awt::Rectangle    aRect( getBounds() );
@@ -327,7 +313,6 @@ sal_Bool SAL_CALL ThumbnailViewAcc::containsPoint( const awt::Point& aPoint )
 }
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleAtPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -349,7 +334,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces
 }
 
 awt::Rectangle SAL_CALL ThumbnailViewAcc::getBounds()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -366,7 +350,6 @@ awt::Rectangle SAL_CALL ThumbnailViewAcc::getBounds()
 }
 
 awt::Point SAL_CALL ThumbnailViewAcc::getLocation()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const awt::Rectangle    aRect( getBounds() );
@@ -379,7 +362,6 @@ awt::Point SAL_CALL ThumbnailViewAcc::getLocation()
 }
 
 awt::Point SAL_CALL ThumbnailViewAcc::getLocationOnScreen()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -393,7 +375,6 @@ awt::Point SAL_CALL ThumbnailViewAcc::getLocationOnScreen()
 }
 
 awt::Size SAL_CALL ThumbnailViewAcc::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const awt::Rectangle    aRect( getBounds() );
@@ -406,7 +387,6 @@ awt::Size SAL_CALL ThumbnailViewAcc::getSize()
 }
 
 void SAL_CALL ThumbnailViewAcc::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -414,7 +394,6 @@ void SAL_CALL ThumbnailViewAcc::grabFocus()
 }
 
 sal_Int32 SAL_CALL ThumbnailViewAcc::getForeground(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
@@ -422,7 +401,6 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getForeground(  )
 }
 
 sal_Int32 SAL_CALL ThumbnailViewAcc::getBackground(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
@@ -430,7 +408,6 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getBackground(  )
 }
 
 void SAL_CALL ThumbnailViewAcc::selectAccessibleChild( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -445,7 +422,6 @@ void SAL_CALL ThumbnailViewAcc::selectAccessibleChild( sal_Int32 nChildIndex )
 }
 
 sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -461,21 +437,18 @@ sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int32 nChildI
 }
 
 void SAL_CALL ThumbnailViewAcc::clearAccessibleSelection()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
 }
 
 void SAL_CALL ThumbnailViewAcc::selectAllAccessibleChildren()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // unsupported due to single selection only
 }
 
 sal_Int32 SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -493,7 +466,6 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChildCount()
 }
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -511,7 +483,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelec
 }
 
 void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -522,7 +493,7 @@ void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
     (void) nChildIndex;
 }
 
-sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
 
@@ -580,7 +551,6 @@ ThumbnailViewItem* ThumbnailViewAcc::getItem (sal_uInt16 nIndex) const
 }
 
 void ThumbnailViewAcc::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -665,25 +635,21 @@ ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const uno::Refere
 }
 
 uno::Reference< accessibility::XAccessibleContext > SAL_CALL ThumbnailViewItemAcc::getAccessibleContext()
-    throw (uno::RuntimeException, std::exception)
 {
     return this;
 }
 
 sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     return 0;
 }
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleChild( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     throw lang::IndexOutOfBoundsException();
 }
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     uno::Reference< accessibility::XAccessible >    xRet;
@@ -695,7 +661,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getA
 }
 
 sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleIndexInParent()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     // The index defaults to -1 to indicate the child does not belong to its
@@ -735,19 +700,16 @@ sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleIndexInParent()
 }
 
 sal_Int16 SAL_CALL ThumbnailViewItemAcc::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     return accessibility::AccessibleRole::LIST_ITEM;
 }
 
 OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString();
 }
 
 OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     OUString aRet;
@@ -768,13 +730,11 @@ OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName()
 }
 
 uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ThumbnailViewItemAcc::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< accessibility::XAccessibleRelationSet >();
 }
 
 uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewItemAcc::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     ::utl::AccessibleStateSetHelper*    pStateSet = new ::utl::AccessibleStateSetHelper;
@@ -804,7 +764,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewItemA
 }
 
 lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale()
-    throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     uno::Reference< accessibility::XAccessible >    xParent( getAccessibleParent() );
@@ -822,7 +781,6 @@ lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale()
 }
 
 void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
 
@@ -845,7 +803,6 @@ void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Refer
 }
 
 void SAL_CALL ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
 
@@ -860,7 +817,6 @@ void SAL_CALL ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Re
 }
 
 sal_Bool SAL_CALL ThumbnailViewItemAcc::containsPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     const awt::Rectangle    aRect( getBounds() );
     const Point             aSize( aRect.Width, aRect.Height );
@@ -870,14 +826,12 @@ sal_Bool SAL_CALL ThumbnailViewItemAcc::containsPoint( const awt::Point& aPoint
 }
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleAtPoint( const awt::Point& )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< accessibility::XAccessible > xRet;
     return xRet;
 }
 
 awt::Rectangle SAL_CALL ThumbnailViewItemAcc::getBounds()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     awt::Rectangle      aRet;
@@ -900,7 +854,6 @@ awt::Rectangle SAL_CALL ThumbnailViewItemAcc::getBounds()
 }
 
 awt::Point SAL_CALL ThumbnailViewItemAcc::getLocation()
-    throw (uno::RuntimeException, std::exception)
 {
     const awt::Rectangle    aRect( getBounds() );
     awt::Point              aRet;
@@ -912,7 +865,6 @@ awt::Point SAL_CALL ThumbnailViewItemAcc::getLocation()
 }
 
 awt::Point SAL_CALL ThumbnailViewItemAcc::getLocationOnScreen()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     awt::Point          aRet;
@@ -930,7 +882,6 @@ awt::Point SAL_CALL ThumbnailViewItemAcc::getLocationOnScreen()
 }
 
 awt::Size SAL_CALL ThumbnailViewItemAcc::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     const awt::Rectangle    aRect( getBounds() );
     awt::Size               aRet;
@@ -942,25 +893,22 @@ awt::Size SAL_CALL ThumbnailViewItemAcc::getSize()
 }
 
 void SAL_CALL ThumbnailViewItemAcc::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing to do
 }
 
 sal_Int32 SAL_CALL ThumbnailViewItemAcc::getForeground(  )
-    throw (uno::RuntimeException, std::exception)
 {
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
     return static_cast<sal_Int32>(nColor);
 }
 
 sal_Int32 SAL_CALL ThumbnailViewItemAcc::getBackground(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor());
 }
 
-sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
 
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index 33eb205187a4..fb2cdc591be3 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -78,46 +78,46 @@ public:
     void LoseFocus();
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
 
 private:
     ::std::vector< css::uno::Reference<
@@ -156,8 +156,7 @@ private:
 
         @throws css::lang::DisposedException
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 class ThumbnailViewItemAcc : public ::cppu::WeakImplHelper< css::accessibility::XAccessible,
@@ -192,37 +191,37 @@ public:
 public:
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
 };
 
 #endif // INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 33d5314ff262..9eca383e71a4 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -120,14 +120,14 @@ void SfxStatusDispatcher::ReleaseAll()
     aListeners.disposeAndClear( aObject );
 }
 
-void SAL_CALL SfxStatusDispatcher::dispatch( const css::util::URL&, const css::uno::Sequence< css::beans::PropertyValue >& ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SfxStatusDispatcher::dispatch( const css::util::URL&, const css::uno::Sequence< css::beans::PropertyValue >& )
 {
 }
 
 void SAL_CALL SfxStatusDispatcher::dispatchWithNotification(
     const css::util::URL&,
     const css::uno::Sequence< css::beans::PropertyValue >&,
-    const css::uno::Reference< css::frame::XDispatchResultListener >& ) throw( css::uno::RuntimeException, std::exception )
+    const css::uno::Reference< css::frame::XDispatchResultListener >& )
 {
 }
 
@@ -136,7 +136,7 @@ SfxStatusDispatcher::SfxStatusDispatcher()
 {
 }
 
-void SAL_CALL SfxStatusDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SfxStatusDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL)
 {
     aListeners.addInterface( aURL.Complete, aListener );
     if ( aURL.Complete == ".uno:LifeTime" )
@@ -150,14 +150,14 @@ void SAL_CALL SfxStatusDispatcher::addStatusListener(const css::uno::Reference<
     }
 }
 
-void SAL_CALL SfxStatusDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SfxStatusDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL )
 {
     aListeners.removeInterface( aURL.Complete, aListener );
 }
 
 
 // XUnoTunnel
-sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
 {
     if ( aIdentifier == impl_getStaticIdentifier() )
         return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ));
@@ -219,7 +219,7 @@ std::unique_ptr< css::uno::ContextLayer > EnsureJavaContext()
 }
 #endif
 
-void SAL_CALL SfxOfficeDispatch::dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SfxOfficeDispatch::dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
 {
     // ControllerItem is the Impl class
     if ( pImpl )
@@ -233,7 +233,7 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const css::util::URL& aURL, const css
 
 void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const css::util::URL& aURL,
         const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
-        const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ) throw( css::uno::RuntimeException, std::exception )
+        const css::uno::Reference< css::frame::XDispatchResultListener >& rListener )
 {
     // ControllerItem is the Impl class
     if ( pImpl )
@@ -245,7 +245,7 @@ void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const css::util::URL&
     }
 }
 
-void SAL_CALL SfxOfficeDispatch::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SfxOfficeDispatch::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL)
 {
     GetListeners().addInterface( aURL.Complete, aListener );
     if ( pImpl )
@@ -605,7 +605,6 @@ void collectUsageInformation(const util::URL& rURL, const uno::Sequence<beans::P
 void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL,
         const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
         const css::uno::Reference< css::frame::XDispatchResultListener >& rListener )
-    throw (css::uno::RuntimeException, std::exception)
 {
     collectUsageInformation(aURL, aArgs);
 
@@ -816,7 +815,7 @@ SfxDispatcher* SfxDispatchController_Impl::GetDispatcher()
     return pDispatcher;
 }
 
-void SAL_CALL SfxDispatchController_Impl::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL) throw ( css::uno::RuntimeException )
+void SAL_CALL SfxDispatchController_Impl::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL)
 {
     SolarMutexGuard aGuard;
     if ( !pDispatch )
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index f08306d6be8e..db2d583df39b 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -99,51 +99,51 @@ public:
     explicit BackingComp(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void          SAL_CALL acquire       (                             ) throw(                          ) override;
     virtual void          SAL_CALL release       (                             ) throw(                          ) override;
 
     // XTypeProvide
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes           () throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 >       SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes           () override;
+    virtual css::uno::Sequence< sal_Int8 >       SAL_CALL getImplementationId() override;
 
     // XServiceInfo
-    virtual OUString                       SAL_CALL getImplementationName   (                                     ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool                              SAL_CALL supportsService         ( const OUString& sServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(                                     ) throw(css::uno::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;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArgs ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArgs ) override;
 
     // XController
-    virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getViewData() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL restoreViewData( const css::uno::Any& aData ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) override;
+    virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) override;
+    virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) override;
+    virtual css::uno::Any SAL_CALL getViewData() override;
+    virtual void SAL_CALL restoreViewData( const css::uno::Any& aData ) override;
+    virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() override;
+    virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() override;
 
     // XKeyListener
-    virtual void SAL_CALL keyPressed ( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL keyPressed ( const css::awt::KeyEvent& aEvent ) override;
+    virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose            (                                                                   ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener   ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose            (                                                                   ) override;
+    virtual void SAL_CALL addEventListener   ( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
     // XDispatchProvider
-    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) override;
 
     // XDispatch
-    virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, 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 >& lArguments ) override;
+    virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) override;
+    virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) override;
 };
 
 BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext >& xContext )
@@ -167,7 +167,6 @@ BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext
  */
 
 css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/ const css::uno::Type& aType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aResult;
 
@@ -236,7 +235,6 @@ void SAL_CALL BackingComp::release()
 */
 
 css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes()
-    throw(css::uno::RuntimeException, std::exception)
 {
     static ::cppu::OTypeCollection* pTypeCollection = nullptr;
     if (!pTypeCollection)
@@ -283,25 +281,21 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes()
 */
 
 css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 OUString SAL_CALL BackingComp::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.sfx2.BackingComp");
 }
 
 sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const OUString& sServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > lNames(2);
     lNames[0] = "com.sun.star.frame.StartModule";
@@ -364,7 +358,6 @@ css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames()
 */
 
 void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::frame::XFrame >& xFrame )
-    throw (css::uno::RuntimeException, std::exception)
 {
     /* SAFE */
     SolarMutexGuard aGuard;
@@ -454,7 +447,6 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
  */
 
 sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< css::frame::XModel >& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return false;
 }
@@ -469,7 +461,6 @@ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< cs
  */
 
 css::uno::Reference< css::frame::XModel > SAL_CALL BackingComp::getModel()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Reference< css::frame::XModel >();
 }
@@ -481,7 +472,6 @@ css::uno::Reference< css::frame::XModel > SAL_CALL BackingComp::getModel()
  */
 
 css::uno::Any SAL_CALL BackingComp::getViewData()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Any();
 }
@@ -494,7 +484,6 @@ css::uno::Any SAL_CALL BackingComp::getViewData()
  */
 
 void SAL_CALL BackingComp::restoreViewData( /*IN*/ const css::uno::Any& )
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -508,7 +497,6 @@ void SAL_CALL BackingComp::restoreViewData( /*IN*/ const css::uno::Any& )
  */
 
 css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame()
-    throw (css::uno::RuntimeException, std::exception)
 {
     /* SAFE { */
     SolarMutexGuard aGuard;
@@ -531,7 +519,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame()
  */
 
 sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool )
-    throw (css::uno::RuntimeException, std::exception)
 {
     /* FIXME ... implemented by using default :-( */
     return true;
@@ -554,7 +541,6 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool )
 */
 
 void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEvent )
-    throw(css::uno::RuntimeException, std::exception)
 {
     // Attention: don't free m_pAccExec here! see comments inside dtor and
     // keyPressed() for further details.
@@ -582,7 +568,6 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
 */
 
 void SAL_CALL BackingComp::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     /* SAFE { */
     SolarMutexGuard aGuard;
@@ -629,7 +614,6 @@ void SAL_CALL BackingComp::dispose()
  */
 
 void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< css::lang::XEventListener >& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
             OUString("not supported"),
@@ -646,7 +630,6 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c
  */
 
 void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference< css::lang::XEventListener >& )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -670,7 +653,6 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference
  */
 
 void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno::Any >& lArgs )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     /* SAFE { */
     SolarMutexGuard aGuard;
@@ -718,7 +700,6 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
  */
 
 void SAL_CALL BackingComp::keyPressed( /*IN*/ const css::awt::KeyEvent&  )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -727,7 +708,6 @@ void SAL_CALL BackingComp::keyPressed( /*IN*/ const css::awt::KeyEvent&  )
  */
 
 void SAL_CALL BackingComp::keyReleased( /*IN*/ const css::awt::KeyEvent& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     /* Attention
         Please use keyPressed() instead of this method. Otherwhise it would be possible, that
@@ -739,7 +719,7 @@ void SAL_CALL BackingComp::keyReleased( /*IN*/ const css::awt::KeyEvent& )
 }
 
 // XDispatchProvider
-css::uno::Reference< css::frame::XDispatch > SAL_CALL BackingComp::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XDispatch > SAL_CALL BackingComp::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatch;
     if ( aURL.Protocol == "vnd.org.libreoffice.recentdocs:" )
@@ -748,7 +728,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL BackingComp::queryDispatch
     return xDispatch;
 }
 
-css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL BackingComp::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL BackingComp::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts )
 {
     sal_Int32 nCount = seqDescripts.getLength();
     css::uno::Sequence < css::uno::Reference < XDispatch > > lDispatcher( nCount );
@@ -760,7 +740,7 @@ css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL Bac
 }
 
 // XDispatch
-void SAL_CALL BackingComp::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL BackingComp::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ )
 {
     // vnd.org.libreoffice.recentdocs:ClearRecentFileList  - clear recent files
     if ( aURL.Path == "ClearRecentFileList" )
@@ -784,11 +764,11 @@ void SAL_CALL BackingComp::dispatch( const css::util::URL& aURL, const css::uno:
     }
 }
 
-void SAL_CALL BackingComp::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL BackingComp::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ )
 {
 }
 
-void SAL_CALL BackingComp::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL BackingComp::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ )
 {
 }
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 004be29324d4..a84a21bb88eb 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -154,38 +154,38 @@ OUString DecodeSpaces_Impl( const OUString& rSource );
 // FileDialogHelper_Impl
 
 // XFilePickerListener Methods
-void SAL_CALL FileDialogHelper_Impl::fileSelectionChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException, std::exception )
+void SAL_CALL FileDialogHelper_Impl::fileSelectionChanged( const FilePickerEvent& aEvent )
 {
     SolarMutexGuard aGuard;
     mpAntiImpl->FileSelectionChanged( aEvent );
 }
 
-void SAL_CALL FileDialogHelper_Impl::directoryChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException, std::exception )
+void SAL_CALL FileDialogHelper_Impl::directoryChanged( const FilePickerEvent& aEvent )
 {
     SolarMutexGuard aGuard;
     mpAntiImpl->DirectoryChanged( aEvent );
 }
 
-OUString SAL_CALL FileDialogHelper_Impl::helpRequested( const FilePickerEvent& aEvent ) throw ( RuntimeException, std::exception )
+OUString SAL_CALL FileDialogHelper_Impl::helpRequested( const FilePickerEvent& aEvent )
 {
     SolarMutexGuard aGuard;
     return sfx2::FileDialogHelper::HelpRequested( aEvent );
 }
 
-void SAL_CALL FileDialogHelper_Impl::controlStateChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException, std::exception )
+void SAL_CALL FileDialogHelper_Impl::controlStateChanged( const FilePickerEvent& aEvent )
 {
     SolarMutexGuard aGuard;
     mpAntiImpl->ControlStateChanged( aEvent );
 }
 
-void SAL_CALL FileDialogHelper_Impl::dialogSizeChanged() throw ( RuntimeException, std::exception )
+void SAL_CALL FileDialogHelper_Impl::dialogSizeChanged()
 {
     SolarMutexGuard aGuard;
     mpAntiImpl->DialogSizeChanged();
 }
 
 // XDialogClosedListener Methods
-void SAL_CALL FileDialogHelper_Impl::dialogClosed( const DialogClosedEvent& _rEvent ) throw ( RuntimeException, std::exception )
+void SAL_CALL FileDialogHelper_Impl::dialogClosed( const DialogClosedEvent& _rEvent )
 {
     SolarMutexGuard aGuard;
     mpAntiImpl->DialogClosed( _rEvent );
@@ -300,7 +300,7 @@ void FileDialogHelper_Impl::handleDialogSizeChanged()
 }
 
 // XEventListener Methods
-void SAL_CALL FileDialogHelper_Impl::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL FileDialogHelper_Impl::disposing( const EventObject& )
 {
     SolarMutexGuard aGuard;
     dispose();
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 0becafecbd6f..19e66113d881 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -149,17 +149,17 @@ namespace sfx2
 
     public:
         // XFilePickerListener methods
-        virtual void SAL_CALL               fileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL               directoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual OUString SAL_CALL           helpRequested( const css::ui::dialogs::FilePickerEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL               controlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL               dialogSizeChanged() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL               fileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) override;
+        virtual void SAL_CALL               directoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) override;
+        virtual OUString SAL_CALL           helpRequested( const css::ui::dialogs::FilePickerEvent& aEvent ) override;
+        virtual void SAL_CALL               controlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ) override;
+        virtual void SAL_CALL               dialogSizeChanged() override;
 
         // XDialogClosedListener methods
-        virtual void SAL_CALL               dialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL               dialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent ) override;
 
         // XEventListener methods
-        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;
 
         // handle XFilePickerListener events
         void                    handleFileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 7bcc296598c5..2bdee55110a7 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -92,12 +92,10 @@ public:
         PrepareListener_Impl();
 
         // css.frame.XStatusListener
-        virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent)
-          throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent) override;
 
         // css.lang.XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-          throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
         bool IsSet() const {return m_bState;}
 };
@@ -107,7 +105,7 @@ PrepareListener_Impl::PrepareListener_Impl() :
 {
 }
 
-void PrepareListener_Impl::statusChanged(const css::frame::FeatureStateEvent& rEvent) throw(css::uno::RuntimeException, std::exception)
+void PrepareListener_Impl::statusChanged(const css::frame::FeatureStateEvent& rEvent)
 {
     if( rEvent.IsEnabled )
         rEvent.State >>= m_bState;
@@ -115,7 +113,7 @@ void PrepareListener_Impl::statusChanged(const css::frame::FeatureStateEvent& rE
         m_bState = false;
 }
 
-void PrepareListener_Impl::disposing(const css::lang::EventObject& /*rEvent*/) throw(css::uno::RuntimeException, std::exception)
+void PrepareListener_Impl::disposing(const css::lang::EventObject& /*rEvent*/)
 {
 }
 
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 1c8f8f8c128a..9b805abb39be 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -797,7 +797,7 @@ DocumentMetadataAccess::~DocumentMetadataAccess()
 
 // css::rdf::XRepositorySupplier:
 uno::Reference< rdf::XRepository > SAL_CALL
-DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException, std::exception)
+DocumentMetadataAccess::getRDFRepository()
 {
     OSL_ENSURE(m_pImpl->m_xRepository.is(), "repository not initialized");
     return m_pImpl->m_xRepository;
@@ -805,20 +805,20 @@ DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException, std::ex
 
 // css::rdf::XNode:
 OUString SAL_CALL
-DocumentMetadataAccess::getStringValue() throw (uno::RuntimeException, std::exception)
+DocumentMetadataAccess::getStringValue()
 {
     return m_pImpl->m_xBaseURI->getStringValue();
 }
 
 // css::rdf::XURI:
 OUString SAL_CALL
-DocumentMetadataAccess::getNamespace() throw (uno::RuntimeException, std::exception)
+DocumentMetadataAccess::getNamespace()
 {
     return m_pImpl->m_xBaseURI->getNamespace();
 }
 
 OUString SAL_CALL
-DocumentMetadataAccess::getLocalName() throw (uno::RuntimeException, std::exception)
+DocumentMetadataAccess::getLocalName()
 {
     return m_pImpl->m_xBaseURI->getLocalName();
 }
@@ -827,7 +827,6 @@ DocumentMetadataAccess::getLocalName() throw (uno::RuntimeException, std::except
 uno::Reference< rdf::XMetadatable > SAL_CALL
 DocumentMetadataAccess::getElementByMetadataReference(
     const css::beans::StringPair & i_rReference)
-throw (uno::RuntimeException, std::exception)
 {
     const IXmlIdRegistry * pReg(
         m_pImpl->m_rXmlIdRegistrySupplier.GetXmlIdRegistry() );
@@ -841,7 +840,6 @@ throw (uno::RuntimeException, std::exception)
 uno::Reference< rdf::XMetadatable > SAL_CALL
 DocumentMetadataAccess::getElementByURI(
     const uno::Reference< rdf::XURI > & i_xURI )
-throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     if (!i_xURI.is()) {
         throw lang::IllegalArgumentException(
@@ -867,7 +865,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL
 DocumentMetadataAccess::getMetadataGraphsWithType(
     const uno::Reference<rdf::XURI> & i_xType)
-throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     if (!i_xType.is()) {
         throw lang::IllegalArgumentException(
@@ -889,8 +886,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 uno::Reference<rdf::XURI> SAL_CALL
 DocumentMetadataAccess::addMetadataFile(const OUString & i_rFileName,
     const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    container::ElementExistException, std::exception)
 {
     if (!isFileNameValid(i_rFileName)) {
         throw lang::IllegalArgumentException(
@@ -932,9 +927,6 @@ DocumentMetadataAccess::importMetadataFile(::sal_Int16 i_Format,
     const OUString & i_rFileName,
     const uno::Reference< rdf::XURI > & i_xBaseURI,
     const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    datatransfer::UnsupportedFlavorException,
-    container::ElementExistException, rdf::ParseException, io::IOException, std::exception)
 {
     if (!isFileNameValid(i_rFileName)) {
         throw lang::IllegalArgumentException(
@@ -975,8 +967,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 DocumentMetadataAccess::removeMetadataFile(
     const uno::Reference< rdf::XURI > & i_xGraphName)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    container::NoSuchElementException, std::exception)
 {
     try {
         m_pImpl->m_xRepository->destroyGraph(i_xGraphName);
@@ -994,8 +984,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 DocumentMetadataAccess::addContentOrStylesFile(
     const OUString & i_rFileName)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    container::ElementExistException, std::exception)
 {
     if (!isFileNameValid(i_rFileName)) {
         throw lang::IllegalArgumentException(
@@ -1014,8 +1002,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 DocumentMetadataAccess::removeContentOrStylesFile(
     const OUString & i_rFileName)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    container::NoSuchElementException, std::exception)
 {
     if (!isFileNameValid(i_rFileName)) {
         throw lang::IllegalArgumentException(
@@ -1054,8 +1040,6 @@ void SAL_CALL DocumentMetadataAccess::loadMetadataFromStorage(
     const uno::Reference< embed::XStorage > & i_xStorage,
     const uno::Reference<rdf::XURI> & i_xBaseURI,
     const uno::Reference<task::XInteractionHandler> & i_xHandler)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    lang::WrappedTargetException, std::exception)
 {
     if (!i_xStorage.is()) {
         throw lang::IllegalArgumentException(
@@ -1157,8 +1141,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
 void SAL_CALL DocumentMetadataAccess::storeMetadataToStorage(
     const uno::Reference< embed::XStorage > & i_xStorage)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    lang::WrappedTargetException, std::exception)
 {
     if (!i_xStorage.is()) {
         throw lang::IllegalArgumentException(
@@ -1225,8 +1207,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 DocumentMetadataAccess::loadMetadataFromMedium(
     const uno::Sequence< beans::PropertyValue > & i_rMedium)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    lang::WrappedTargetException, std::exception)
 {
     uno::Reference<io::XInputStream> xIn;
     utl::MediaDescriptor md(i_rMedium);
@@ -1284,8 +1264,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 DocumentMetadataAccess::storeMetadataToMedium(
     const uno::Sequence< beans::PropertyValue > & i_rMedium)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    lang::WrappedTargetException, std::exception)
 {
     utl::MediaDescriptor md(i_rMedium);
     OUString URL;
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index cd379584eb3e..86d2f7eb0d19 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -1520,14 +1520,12 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther,
 
 // css::rdf::XNode:
 OUString SAL_CALL MetadatableMixin::getStringValue()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return getNamespace() + getLocalName();
 }
 
 // css::rdf::XURI:
 OUString SAL_CALL MetadatableMixin::getLocalName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     beans::StringPair mdref( getMetadataReference() );
@@ -1544,7 +1542,6 @@ OUString SAL_CALL MetadatableMixin::getLocalName()
 }
 
 OUString SAL_CALL MetadatableMixin::getNamespace()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const uno::Reference< frame::XModel > xModel( GetModel() );
@@ -1555,7 +1552,6 @@ OUString SAL_CALL MetadatableMixin::getNamespace()
 // css::rdf::XMetadatable:
 beans::StringPair SAL_CALL
 MetadatableMixin::getMetadataReference()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1573,7 +1569,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 MetadatableMixin::setMetadataReference(
     const beans::StringPair & i_rReference)
-throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1589,7 +1584,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 }
 
 void SAL_CALL MetadatableMixin::ensureMetadataReference()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 82280b1cd027..6870e7fe1867 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -134,157 +134,97 @@ public:
     SfxDocumentMetaData& operator=(const SfxDocumentMetaData&) = delete;
 
     // css::lang::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(
-        const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
+        const OUString & ServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // css::lang::XComponent:
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     // css::document::XDocumentProperties:
-    virtual OUString SAL_CALL getAuthor()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAuthor(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getGenerator()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setGenerator(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::util::DateTime SAL_CALL getCreationDate()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCreationDate(const css::util::DateTime & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitle()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitle(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSubject()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSubject(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDescription(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getKeywords()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAuthor() override;
+    virtual void SAL_CALL setAuthor(const OUString & the_value) override;
+    virtual OUString SAL_CALL getGenerator() override;
+    virtual void SAL_CALL setGenerator(const OUString & the_value) override;
+    virtual css::util::DateTime SAL_CALL getCreationDate() override;
+    virtual void SAL_CALL setCreationDate(const css::util::DateTime & the_value) override;
+    virtual OUString SAL_CALL getTitle() override;
+    virtual void SAL_CALL setTitle(const OUString & the_value) override;
+    virtual OUString SAL_CALL getSubject() override;
+    virtual void SAL_CALL setSubject(const OUString & the_value) override;
+    virtual OUString SAL_CALL getDescription() override;
+    virtual void SAL_CALL setDescription(const OUString & the_value) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getKeywords() override;
     virtual void SAL_CALL setKeywords(
-        const css::uno::Sequence< OUString > & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLanguage()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLanguage(const css::lang::Locale & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getModifiedBy()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setModifiedBy(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::util::DateTime SAL_CALL getModificationDate()
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< OUString > & the_value) override;
+    virtual css::lang::Locale SAL_CALL getLanguage() override;
+    virtual void SAL_CALL setLanguage(const css::lang::Locale & the_value) override;
+    virtual OUString SAL_CALL getModifiedBy() override;
+    virtual void SAL_CALL setModifiedBy(const OUString & the_value) override;
+    virtual css::util::DateTime SAL_CALL getModificationDate() override;
     virtual void SAL_CALL setModificationDate(
-            const css::util::DateTime & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPrintedBy()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrintedBy(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::util::DateTime SAL_CALL getPrintDate()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrintDate(const css::util::DateTime & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTemplateName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTemplateName(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTemplateURL()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTemplateURL(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::util::DateTime SAL_CALL getTemplateDate()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTemplateDate(const css::util::DateTime & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAutoloadURL()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoloadURL(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getAutoloadSecs()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoloadSecs(::sal_Int32 the_value)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual OUString SAL_CALL getDefaultTarget()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultTarget(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::util::DateTime & the_value) override;
+    virtual OUString SAL_CALL getPrintedBy() override;
+    virtual void SAL_CALL setPrintedBy(const OUString & the_value) override;
+    virtual css::util::DateTime SAL_CALL getPrintDate() override;
+    virtual void SAL_CALL setPrintDate(const css::util::DateTime & the_value) override;
+    virtual OUString SAL_CALL getTemplateName() override;
+    virtual void SAL_CALL setTemplateName(const OUString & the_value) override;
+    virtual OUString SAL_CALL getTemplateURL() override;
+    virtual void SAL_CALL setTemplateURL(const OUString & the_value) override;
+    virtual css::util::DateTime SAL_CALL getTemplateDate() override;
+    virtual void SAL_CALL setTemplateDate(const css::util::DateTime & the_value) override;
+    virtual OUString SAL_CALL getAutoloadURL() override;
+    virtual void SAL_CALL setAutoloadURL(const OUString & the_value) override;
+    virtual ::sal_Int32 SAL_CALL getAutoloadSecs() override;
+    virtual void SAL_CALL setAutoloadSecs(::sal_Int32 the_value) override;
+    virtual OUString SAL_CALL getDefaultTarget() override;
+    virtual void SAL_CALL setDefaultTarget(const OUString & the_value) override;
     virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL
-        getDocumentStatistics() throw (css::uno::RuntimeException, std::exception) override;
+        getDocumentStatistics() override;
     virtual void SAL_CALL setDocumentStatistics(
-        const css::uno::Sequence< css::beans::NamedValue > & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getEditingCycles()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEditingCycles(::sal_Int16 the_value)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getEditingDuration()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEditingDuration(::sal_Int32 the_value)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual void SAL_CALL resetUserData(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::NamedValue > & the_value) override;
+    virtual ::sal_Int16 SAL_CALL getEditingCycles() override;
+    virtual void SAL_CALL setEditingCycles(::sal_Int16 the_value) override;
+    virtual ::sal_Int32 SAL_CALL getEditingDuration() override;
+    virtual void SAL_CALL setEditingDuration(::sal_Int32 the_value) override;
+    virtual void SAL_CALL resetUserData(const OUString & the_value) override;
     virtual css::uno::Reference< css::beans::XPropertyContainer > SAL_CALL
-        getUserDefinedProperties() throw (css::uno::RuntimeException, std::exception) override;
+        getUserDefinedProperties() override;
     virtual void SAL_CALL loadFromStorage(
         const css::uno::Reference< css::embed::XStorage > & Storage,
-        const css::uno::Sequence< css::beans::PropertyValue > & Medium)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException,
-               css::io::WrongFormatException,
-               css::lang::WrappedTargetException, css::io::IOException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue > & Medium) override;
     virtual void SAL_CALL loadFromMedium(const OUString & URL,
-        const css::uno::Sequence< css::beans::PropertyValue > & Medium)
-        throw (css::uno::RuntimeException,
-               css::io::WrongFormatException,
-               css::lang::WrappedTargetException, css::io::IOException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue > & Medium) override;
     virtual void SAL_CALL storeToStorage(
         const css::uno::Reference< css::embed::XStorage > & Storage,
-        const css::uno::Sequence< css::beans::PropertyValue > & Medium)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException, css::io::IOException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue > & Medium) override;
     virtual void SAL_CALL storeToMedium(const OUString & URL,
-        const css::uno::Sequence< css::beans::PropertyValue > & Medium)
-        throw (css::uno::RuntimeException,
-               css::lang::WrappedTargetException, css::io::IOException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue > & Medium) override;
 
     // css::lang::XInitialization:
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any > & aArguments)
-        throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+        const css::uno::Sequence< css::uno::Any > & aArguments) override;
 
     // css::util::XCloneable:
-    virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() override;
 
     // css::util::XModifiable:
-    virtual sal_Bool SAL_CALL isModified(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setModified( sal_Bool bModified )
-        throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isModified(  ) override;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override;
 
     // css::util::XModifyBroadcaster:
     virtual void SAL_CALL addModifyListener(
-        const css::uno::Reference< css::util::XModifyListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener > & xListener) override;
     virtual void SAL_CALL removeModifyListener(
-        const css::uno::Reference< css::util::XModifyListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::util::XModifyListener > & xListener) override;
 
     // css::xml::sax::XSAXSerializable
     virtual void SAL_CALL serialize(
         const css::uno::Reference<css::xml::sax::XDocumentHandler>& i_xHandler,
-        const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces) override;
 
 protected:
     virtual ~SfxDocumentMetaData() override {}
@@ -366,25 +306,25 @@ public:
     explicit CompatWriterDocPropsImpl( css::uno::Reference< css::uno::XComponentContext > const & context) : CompatWriterDocPropsImpl_BASE( context ) {}
 
 // XCompatWriterDocPropsImpl
-    virtual OUString SAL_CALL getManager() throw (css::uno::RuntimeException, std::exception) override { return msManager; }
-    virtual void SAL_CALL setManager( const OUString& _manager ) throw (css::uno::RuntimeException, std::exception) override { msManager = _manager; }
-    virtual OUString SAL_CALL getCategory() throw (css::uno::RuntimeException, std::exception) override { return msCategory; }
-    virtual void SAL_CALL setCategory( const OUString& _category ) throw (css::uno::RuntimeException, std::exception) override { msCategory = _category; }
-    virtual OUString SAL_CALL getCompany() throw (css::uno::RuntimeException, std::exception) override { return msCompany; }
-    virtual void SAL_CALL setCompany( const OUString& _company ) throw (css::uno::RuntimeException, std::exception) override { msCompany = _company; }
+    virtual OUString SAL_CALL getManager() override { return msManager; }
+    virtual void SAL_CALL setManager( const OUString& _manager ) override { msManager = _manager; }
+    virtual OUString SAL_CALL getCategory() override { return msCategory; }
+    virtual void SAL_CALL setCategory( const OUString& _category ) override { msCategory = _category; }
+    virtual OUString SAL_CALL getCompany() override { return msCompany; }
+    virtual void SAL_CALL setCompany( const OUString& _company ) override { msCompany = _company; }
 
 // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName(  ) override
     {
         return OUString("CompatWriterDocPropsImpl");
     }
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override
     {
         css::uno::Sequence<OUString> aServiceNames { "com.sun.star.writer.DocumentProperties" };
         return aServiceNames;
@@ -655,7 +595,6 @@ SfxDocumentMetaData::getURLProperties(
 /// @throws css::uno::RuntimeException
 OUString SAL_CALL
 getNodeText(const css::uno::Reference<css::xml::dom::XNode>& i_xNode)
-        throw (css::uno::RuntimeException)
 {
     if (!i_xNode.is()) throw css::uno::RuntimeException(
         OUString("SfxDocumentMetaData::getNodeText: argument is null"), i_xNode);
@@ -1333,21 +1272,19 @@ SfxDocumentMetaData::SfxDocumentMetaData(
 
 // com.sun.star.uno.XServiceInfo:
 OUString SAL_CALL
-SfxDocumentMetaData::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getImplementationName()
 {
     return OUString("SfxDocumentMetaData");
 }
 
 sal_Bool SAL_CALL
 SfxDocumentMetaData::supportsService(OUString const & serviceName)
-        throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL
 SfxDocumentMetaData::getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > s { "com.sun.star.document.DocumentProperties" };
     return s;
@@ -1355,7 +1292,7 @@ SfxDocumentMetaData::getSupportedServiceNames()
 
 
 // css::lang::XComponent:
-void SAL_CALL SfxDocumentMetaData::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SfxDocumentMetaData::dispose()
 {
     ::osl::MutexGuard g(m_aMutex);
     if (!m_isInitialized) {
@@ -1375,21 +1312,20 @@ void SAL_CALL SfxDocumentMetaData::dispose() throw (css::uno::RuntimeException,
 
 // css::document::XDocumentProperties:
 OUString SAL_CALL
-SfxDocumentMetaData::getAuthor() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getAuthor()
 {
     ::osl::MutexGuard g(m_aMutex);
     return getMetaText("meta:initial-creator");
 }
 
 void SAL_CALL SfxDocumentMetaData::setAuthor(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("meta:initial-creator", the_value);
 }
 
 
 OUString SAL_CALL
-SfxDocumentMetaData::getGenerator() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getGenerator()
 {
     ::osl::MutexGuard g(m_aMutex);
     return getMetaText("meta:generator");
@@ -1397,13 +1333,12 @@ SfxDocumentMetaData::getGenerator() throw (css::uno::RuntimeException, std::exce
 
 void SAL_CALL
 SfxDocumentMetaData::setGenerator(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("meta:generator", the_value);
 }
 
 css::util::DateTime SAL_CALL
-SfxDocumentMetaData::getCreationDate() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getCreationDate()
 {
     ::osl::MutexGuard g(m_aMutex);
     return textToDateTimeDefault(getMetaText("meta:creation-date"));
@@ -1411,26 +1346,24 @@ SfxDocumentMetaData::getCreationDate() throw (css::uno::RuntimeException, std::e
 
 void SAL_CALL
 SfxDocumentMetaData::setCreationDate(const css::util::DateTime & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("meta:creation-date", dateTimeToText(the_value));
 }
 
 OUString SAL_CALL
-SfxDocumentMetaData::getTitle() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getTitle()
 {
     ::osl::MutexGuard g(m_aMutex);
     return getMetaText("dc:title");
 }
 
 void SAL_CALL SfxDocumentMetaData::setTitle(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("dc:title", the_value);
 }
 
 OUString SAL_CALL
-SfxDocumentMetaData::getSubject() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getSubject()
 {
     ::osl::MutexGuard g(m_aMutex);
     return getMetaText("dc:subject");
@@ -1438,13 +1371,12 @@ SfxDocumentMetaData::getSubject() throw (css::uno::RuntimeException, std::except
 
 void SAL_CALL
 SfxDocumentMetaData::setSubject(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("dc:subject", the_value);
 }
 
 OUString SAL_CALL
-SfxDocumentMetaData::getDescription() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getDescription()
 {
     ::osl::MutexGuard g(m_aMutex);
     return getMetaText("dc:description");
@@ -1452,13 +1384,12 @@ SfxDocumentMetaData::getDescription() throw (css::uno::RuntimeException, std::ex
 
 void SAL_CALL
 SfxDocumentMetaData::setDescription(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("dc:description", the_value);
 }
 
 css::uno::Sequence< OUString >
-SAL_CALL SfxDocumentMetaData::getKeywords() throw (css::uno::RuntimeException, std::exception)
+SAL_CALL SfxDocumentMetaData::getKeywords()
 {
     ::osl::MutexGuard g(m_aMutex);
     return getMetaList("meta:keyword");
@@ -1467,7 +1398,6 @@ SAL_CALL SfxDocumentMetaData::getKeywords() throw (css::uno::RuntimeException, s
 void SAL_CALL
 SfxDocumentMetaData::setKeywords(
         const css::uno::Sequence< OUString > & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard g(m_aMutex);
     if (setMetaList("meta:keyword", the_value, nullptr)) {
@@ -1477,7 +1407,7 @@ SfxDocumentMetaData::setKeywords(
 }
 
 css::lang::Locale SAL_CALL
-        SfxDocumentMetaData::getLanguage() throw (css::uno::RuntimeException, std::exception)
+        SfxDocumentMetaData::getLanguage()
 {
     ::osl::MutexGuard g(m_aMutex);
     css::lang::Locale loc( LanguageTag::convertToLocale( getMetaText("dc:language"), false));
@@ -1486,14 +1416,13 @@ css::lang::Locale SAL_CALL
 
 void SAL_CALL
 SfxDocumentMetaData::setLanguage(const css::lang::Locale & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     OUString text( LanguageTag::convertToBcp47( the_value, false));
     setMetaTextAndNotify("dc:language", text);
 }
 
 OUString SAL_CALL
-SfxDocumentMetaData::getModifiedBy() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getModifiedBy()
 {
     ::osl::MutexGuard g(m_aMutex);
     return getMetaText("dc:creator");
@@ -1501,13 +1430,12 @@ SfxDocumentMetaData::getModifiedBy() throw (css::uno::RuntimeException, std::exc
 
 void SAL_CALL
 SfxDocumentMetaData::setModifiedBy(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("dc:creator", the_value);
 }
 
 css::util::DateTime SAL_CALL
-SfxDocumentMetaData::getModificationDate() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getModificationDate()
 {
     ::osl::MutexGuard g(m_aMutex);
     return textToDateTimeDefault(getMetaText("dc:date"));
@@ -1515,13 +1443,12 @@ SfxDocumentMetaData::getModificationDate() throw (css::uno::RuntimeException, st
 
 void SAL_CALL
 SfxDocumentMetaData::setModificationDate(const css::util::DateTime & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("dc:date", dateTimeToText(the_value));
 }
 
 OUString SAL_CALL
-SfxDocumentMetaData::getPrintedBy() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getPrintedBy()
 {
     ::osl::MutexGuard g(m_aMutex);
     return getMetaText("meta:printed-by");
@@ -1529,13 +1456,12 @@ SfxDocumentMetaData::getPrintedBy() throw (css::uno::RuntimeException, std::exce
 
 void SAL_CALL
 SfxDocumentMetaData::setPrintedBy(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("meta:printed-by", the_value);
 }
 
 css::util::DateTime SAL_CALL
-SfxDocumentMetaData::getPrintDate() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getPrintDate()
 {
     ::osl::MutexGuard g(m_aMutex);
     return textToDateTimeDefault(getMetaText("meta:print-date"));
@@ -1543,13 +1469,12 @@ SfxDocumentMetaData::getPrintDate() throw (css::uno::RuntimeException, std::exce
 
 void SAL_CALL
 SfxDocumentMetaData::setPrintDate(const css::util::DateTime & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     setMetaTextAndNotify("meta:print-date", dateTimeToText(the_value));
 }
 
 OUString SAL_CALL
-SfxDocumentMetaData::getTemplateName() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getTemplateName()
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -1558,7 +1483,6 @@ SfxDocumentMetaData::getTemplateName() throw (css::uno::RuntimeException, std::e
 
 void SAL_CALL
 SfxDocumentMetaData::setTemplateName(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard g(m_aMutex);
     checkInit();
@@ -1570,7 +1494,7 @@ SfxDocumentMetaData::setTemplateName(const OUString & the_value)
 }
 
 OUString SAL_CALL
-SfxDocumentMetaData::getTemplateURL() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getTemplateURL()
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -1579,7 +1503,6 @@ SfxDocumentMetaData::getTemplateURL() throw (css::uno::RuntimeException, std::ex
 
 void SAL_CALL
 SfxDocumentMetaData::setTemplateURL(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard g(m_aMutex);
     checkInit();
@@ -1591,7 +1514,7 @@ SfxDocumentMetaData::setTemplateURL(const OUString & the_value)
 }
 
 css::util::DateTime SAL_CALL
-SfxDocumentMetaData::getTemplateDate() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getTemplateDate()
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -1600,7 +1523,6 @@ SfxDocumentMetaData::getTemplateDate() throw (css::uno::RuntimeException, std::e
 
 void SAL_CALL
 SfxDocumentMetaData::setTemplateDate(const css::util::DateTime & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard g(m_aMutex);
     checkInit();
@@ -1612,7 +1534,7 @@ SfxDocumentMetaData::setTemplateDate(const css::util::DateTime & the_value)
 }
 
 OUString SAL_CALL
-SfxDocumentMetaData::getAutoloadURL() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getAutoloadURL()
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -1621,7 +1543,6 @@ SfxDocumentMetaData::getAutoloadURL() throw (css::uno::RuntimeException, std::ex
 
 void SAL_CALL
 SfxDocumentMetaData::setAutoloadURL(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard g(m_aMutex);
     checkInit();
@@ -1633,7 +1554,7 @@ SfxDocumentMetaData::setAutoloadURL(const OUString & the_value)
 }
 
 ::sal_Int32 SAL_CALL
-SfxDocumentMetaData::getAutoloadSecs() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getAutoloadSecs()
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -1642,7 +1563,6 @@ SfxDocumentMetaData::getAutoloadSecs() throw (css::uno::RuntimeException, std::e
 
 void SAL_CALL
 SfxDocumentMetaData::setAutoloadSecs(::sal_Int32 the_value)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
 {
     if (the_value < 0) throw css::lang::IllegalArgumentException(
         OUString("SfxDocumentMetaData::setAutoloadSecs: argument is negative"),
@@ -1657,7 +1577,7 @@ SfxDocumentMetaData::setAutoloadSecs(::sal_Int32 the_value)
 }
 
 OUString SAL_CALL
-SfxDocumentMetaData::getDefaultTarget() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getDefaultTarget()
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -1666,7 +1586,6 @@ SfxDocumentMetaData::getDefaultTarget() throw (css::uno::RuntimeException, std::
 
 void SAL_CALL
 SfxDocumentMetaData::setDefaultTarget(const OUString & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard g(m_aMutex);
     checkInit();
@@ -1678,7 +1597,7 @@ SfxDocumentMetaData::setDefaultTarget(const OUString & the_value)
 }
 
 css::uno::Sequence< css::beans::NamedValue > SAL_CALL
-SfxDocumentMetaData::getDocumentStatistics() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getDocumentStatistics()
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -1706,7 +1625,6 @@ SfxDocumentMetaData::getDocumentStatistics() throw (css::uno::RuntimeException,
 void SAL_CALL
 SfxDocumentMetaData::setDocumentStatistics(
         const css::uno::Sequence< css::beans::NamedValue > & the_value)
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard g(m_aMutex);
     checkInit();
@@ -1736,7 +1654,7 @@ SfxDocumentMetaData::setDocumentStatistics(
 }
 
 ::sal_Int16 SAL_CALL
-SfxDocumentMetaData::getEditingCycles() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getEditingCycles()
 {
     ::osl::MutexGuard g(m_aMutex);
     OUString text = getMetaText("meta:editing-cycles");
@@ -1751,7 +1669,6 @@ SfxDocumentMetaData::getEditingCycles() throw (css::uno::RuntimeException, std::
 
 void SAL_CALL
 SfxDocumentMetaData::setEditingCycles(::sal_Int16 the_value)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
 {
     if (the_value < 0) throw css::lang::IllegalArgumentException(
         OUString("SfxDocumentMetaData::setEditingCycles: argument is negative"),
@@ -1762,7 +1679,7 @@ SfxDocumentMetaData::setEditingCycles(::sal_Int16 the_value)
 }
 
 ::sal_Int32 SAL_CALL
-SfxDocumentMetaData::getEditingDuration() throw (css::uno::RuntimeException, std::exception)
+SfxDocumentMetaData::getEditingDuration()
 {
     ::osl::MutexGuard g(m_aMutex);
     return textToDuration(getMetaText("meta:editing-duration"));
@@ -1770,7 +1687,6 @@ SfxDocumentMetaData::getEditingDuration() throw (css::uno::RuntimeException, std
 
 void SAL_CALL
 SfxDocumentMetaData::setEditingDuration(::sal_Int32 the_value)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
 {
     if (the_value < 0) throw css::lang::IllegalArgumentException(
         OUString("SfxDocumentMetaData::setEditingDuration: argument is negative"),
@@ -1780,7 +1696,6 @@ SfxDocumentMetaData::setEditingDuration(::sal_Int32 the_value)
 
 void SAL_CALL
 SfxDocumentMetaData::resetUserData(const OUString & the_value)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ClearableMutexGuard g(m_aMutex);
 
@@ -1807,7 +1722,6 @@ SfxDocumentMetaData::resetUserData(const OUString & the_value)
 
 css::uno::Reference< css::beans::XPropertyContainer > SAL_CALL
 SfxDocumentMetaData::getUserDefinedProperties()
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -1820,9 +1734,6 @@ void SAL_CALL
 SfxDocumentMetaData::loadFromStorage(
         const css::uno::Reference< css::embed::XStorage > & xStorage,
         const css::uno::Sequence< css::beans::PropertyValue > & Medium)
-    throw (css::uno::RuntimeException, css::lang::IllegalArgumentException,
-           css::io::WrongFormatException,
-           css::lang::WrappedTargetException, css::io::IOException, std::exception)
 {
     if (!xStorage.is()) throw css::lang::IllegalArgumentException(
         OUString("SfxDocumentMetaData::loadFromStorage: argument is null"), *this, 0);
@@ -1891,8 +1802,6 @@ void SAL_CALL
 SfxDocumentMetaData::storeToStorage(
         const css::uno::Reference< css::embed::XStorage > & xStorage,
         const css::uno::Sequence< css::beans::PropertyValue > & Medium)
-    throw (css::uno::RuntimeException, css::lang::IllegalArgumentException,
-           css::lang::WrappedTargetException, css::io::IOException, std::exception)
 {
     if (!xStorage.is()) throw css::lang::IllegalArgumentException(
         OUString("SfxDocumentMetaData::storeToStorage:"
@@ -1965,8 +1874,6 @@ SfxDocumentMetaData::storeToStorage(
 void SAL_CALL
 SfxDocumentMetaData::loadFromMedium(const OUString & URL,
         const css::uno::Sequence< css::beans::PropertyValue > & Medium)
-    throw (css::uno::RuntimeException, css::io::WrongFormatException,
-           css::lang::WrappedTargetException, css::io::IOException, std::exception)
 {
     css::uno::Reference<css::io::XInputStream> xIn;
     utl::MediaDescriptor md(Medium);
@@ -2008,8 +1915,6 @@ SfxDocumentMetaData::loadFromMedium(const OUString & URL,
 void SAL_CALL
 SfxDocumentMetaData::storeToMedium(const OUString & URL,
         const css::uno::Sequence< css::beans::PropertyValue > & Medium)
-    throw (css::uno::RuntimeException,
-           css::lang::WrappedTargetException, css::io::IOException, std::exception)
 {
     utl::MediaDescriptor md(Medium);
     if (!URL.isEmpty()) {
@@ -2056,7 +1961,6 @@ SfxDocumentMetaData::storeToMedium(const OUString & URL,
 
 // css::lang::XInitialization:
 void SAL_CALL SfxDocumentMetaData::initialize( const css::uno::Sequence< css::uno::Any > & aArguments)
-    throw (css::uno::RuntimeException, css::uno::Exception, std::exception)
 {
     // possible arguments:
     // - no argument: default initialization (empty DOM)
@@ -2094,7 +1998,6 @@ void SAL_CALL SfxDocumentMetaData::initialize( const css::uno::Sequence< css::un
 // css::util::XCloneable:
 css::uno::Reference<css::util::XCloneable> SAL_CALL
 SfxDocumentMetaData::createClone()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -2125,7 +2028,6 @@ SfxDocumentMetaData::createClone()
 
 // css::util::XModifiable:
 sal_Bool SAL_CALL SfxDocumentMetaData::isModified(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -2135,7 +2037,6 @@ sal_Bool SAL_CALL SfxDocumentMetaData::isModified(  )
 }
 
 void SAL_CALL SfxDocumentMetaData::setModified( sal_Bool bModified )
-        throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference<css::util::XModifiable> xMB;
     { // do not lock mutex while notifying (#i93514#) to prevent deadlock
@@ -2171,7 +2072,6 @@ void SAL_CALL SfxDocumentMetaData::setModified( sal_Bool bModified )
 // css::util::XModifyBroadcaster:
 void SAL_CALL SfxDocumentMetaData::addModifyListener(
         const css::uno::Reference< css::util::XModifyListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -2185,7 +2085,6 @@ void SAL_CALL SfxDocumentMetaData::addModifyListener(
 
 void SAL_CALL SfxDocumentMetaData::removeModifyListener(
         const css::uno::Reference< css::util::XModifyListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
@@ -2201,7 +2100,6 @@ void SAL_CALL SfxDocumentMetaData::removeModifyListener(
 void SAL_CALL SfxDocumentMetaData::serialize(
     const css::uno::Reference<css::xml::sax::XDocumentHandler>& i_xHandler,
     const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces)
-    throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index f77a2766dcaf..c7d1d219b609 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -180,8 +180,6 @@ OUString SfxFilter::GetTypeFromStorage( const SotStorage& rStg )
 
 OUString SfxFilter::GetTypeFromStorage(
     const uno::Reference<embed::XStorage>& xStorage, bool bTemplate )
-        throw ( beans::UnknownPropertyException, lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     SfxFilterMatcher aMatcher;
 
diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index 4020bfc700f5..66672dc04d86 100644
--- a/sfx2/source/doc/docstoragemodifylistener.cxx
+++ b/sfx2/source/doc/docstoragemodifylistener.cxx
@@ -51,7 +51,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ )
     {
         ::osl::Guard< comphelper::SolarMutex > aGuard( m_rMutex );
         // storageIsModified must not contain any locking!
@@ -60,7 +60,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentStorageModifyListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentStorageModifyListener::disposing( const EventObject& /*Source*/ )
     {
         // not interested in. In particular, we do *not* dispose ourself when a storage we're
         // listening at is disposed. The reason here is that this listener instance is *reused*
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 48234d01bf94..38b87dc3ad6d 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -164,10 +164,10 @@ public:
                                 : m_xInteractionHandler( rxInteractionHandler )
                             {}
 
-    virtual uno::Reference<task::XInteractionHandler> SAL_CALL getInteractionHandler() throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference<task::XInteractionHandler> SAL_CALL getInteractionHandler() override
     { return m_xInteractionHandler; }
 
-    virtual uno::Reference<ucb::XProgressHandler> SAL_CALL    getProgressHandler() throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference<ucb::XProgressHandler> SAL_CALL    getProgressHandler() override
     { return m_xProgressHandler; }
 };
 
@@ -2170,20 +2170,17 @@ class SfxDocTplService: public ::cppu::WeakImplHelper< css::lang::XLocalizable,
 public:
     explicit SfxDocTplService( const css::uno::Reference < uno::XComponentContext >& xContext );
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.sfx2.DocumentTemplates");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.DocumentTemplates" };
         return aSeq;
@@ -2191,27 +2188,27 @@ public:
 
 
     // --- XLocalizable ---
-    void SAL_CALL                   setLocale( const css::lang::Locale & eLocale ) throw( css::uno::RuntimeException, std::exception ) override;
-    css::lang::Locale SAL_CALL              getLocale() throw( css::uno::RuntimeException, std::exception ) override;
+    void SAL_CALL                   setLocale( const css::lang::Locale & eLocale ) override;
+    css::lang::Locale SAL_CALL              getLocale() override;
 
     // --- XDocumentTemplates ---
-    css::uno::Reference< css::ucb::XContent > SAL_CALL  getContent() throw( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Reference< css::ucb::XContent > SAL_CALL  getContent() override;
     sal_Bool SAL_CALL               storeTemplate( const OUString& GroupName,
                                                    const OUString& TemplateName,
-                                                   const css::uno::Reference< css::frame::XStorable >& Storable ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                   const css::uno::Reference< css::frame::XStorable >& Storable ) override;
     sal_Bool SAL_CALL               addTemplate( const OUString& GroupName,
                                                  const OUString& TemplateName,
-                                                 const OUString& SourceURL ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                 const OUString& SourceURL ) override;
     sal_Bool SAL_CALL               removeTemplate( const OUString& GroupName,
-                                                    const OUString& TemplateName ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const OUString& TemplateName ) override;
     sal_Bool SAL_CALL               renameTemplate( const OUString& GroupName,
                                                     const OUString& OldTemplateName,
-                                                    const OUString& NewTemplateName ) throw( css::uno::RuntimeException, std::exception ) override;
-    sal_Bool SAL_CALL               addGroup( const OUString& GroupName ) throw( css::uno::RuntimeException, std::exception ) override;
-    sal_Bool SAL_CALL               removeGroup( const OUString& GroupName ) throw( css::uno::RuntimeException, std::exception ) override;
+                                                    const OUString& NewTemplateName ) override;
+    sal_Bool SAL_CALL               addGroup( const OUString& GroupName ) override;
+    sal_Bool SAL_CALL               removeGroup( const OUString& GroupName ) override;
     sal_Bool SAL_CALL               renameGroup( const OUString& OldGroupName,
-                                                 const OUString& NewGroupName ) throw( css::uno::RuntimeException, std::exception ) override;
-    void SAL_CALL                   update() throw( css::uno::RuntimeException, std::exception ) override;
+                                                 const OUString& NewGroupName ) override;
+    void SAL_CALL                   update() override;
 };
 
 
@@ -2226,14 +2223,12 @@ SfxDocTplService::SfxDocTplService( const uno::Reference< XComponentContext >& x
 
 
 lang::Locale SAL_CALL SfxDocTplService::getLocale()
-    throw( uno::RuntimeException, std::exception )
 {
     return pImp->getLocale();
 }
 
 
 void SAL_CALL SfxDocTplService::setLocale( const lang::Locale & rLocale )
-    throw( uno::RuntimeException, std::exception )
 {
     pImp->setLocale( rLocale );
 }
@@ -2242,7 +2237,6 @@ void SAL_CALL SfxDocTplService::setLocale( const lang::Locale & rLocale )
 //--- XDocumentTemplates ---
 
 uno::Reference< ucb::XContent > SAL_CALL SfxDocTplService::getContent()
-    throw( uno::RuntimeException, std::exception )
 {
     if ( pImp->init() )
         return pImp->getContent().get();
@@ -2254,7 +2248,6 @@ uno::Reference< ucb::XContent > SAL_CALL SfxDocTplService::getContent()
 sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName,
                                                    const OUString& TemplateName,
                                                    const uno::Reference< frame::XStorable >& Storable )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( pImp->init() )
         return pImp->storeTemplate( GroupName, TemplateName, Storable );
@@ -2266,7 +2259,6 @@ sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName,
 sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName,
                                                  const OUString& rTemplateName,
                                                  const OUString& rSourceURL )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( pImp->init() )
         return pImp->addTemplate( rGroupName, rTemplateName, rSourceURL );
@@ -2277,7 +2269,6 @@ sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName,
 
 sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName,
                                                     const OUString& rTemplateName )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( pImp->init() )
         return pImp->removeTemplate( rGroupName, rTemplateName );
@@ -2289,7 +2280,6 @@ sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName,
 sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName,
                                                     const OUString& rOldName,
                                                     const OUString& rNewName )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( rOldName == rNewName )
         return true;
@@ -2302,7 +2292,6 @@ sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName,
 
 
 sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( pImp->init() )
         return pImp->addGroup( rGroupName );
@@ -2312,7 +2301,6 @@ sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName )
 
 
 sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( pImp->init() )
         return pImp->removeGroup( rGroupName );
@@ -2323,7 +2311,6 @@ sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName )
 
 sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName,
                                                  const OUString& rNewName )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( rOldName == rNewName )
         return true;
@@ -2336,7 +2323,6 @@ sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName,
 
 
 void SAL_CALL SfxDocTplService::update()
-    throw( uno::RuntimeException, std::exception )
 {
     if ( pImp->init() )
         pImp->update();
diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx
index cb82f0d24e16..4e681f1079fe 100644
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star;
 
 
 std::vector< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext >& xContext )
-    throw( uno::Exception )
 {
     OUString aStringID = "groupuinames.xml";
     return ReadLocalizationSequence_Impl( xInStream, aStringID, xContext );
@@ -42,7 +41,6 @@ std::vector< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequ
 
 
 void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::Reference< io::XOutputStream >& xOutStream, const std::vector< beans::StringPair >& aSequence, const uno::Reference< uno::XComponentContext >& xContext )
-    throw( uno::Exception )
 {
     if ( !xOutStream.is() )
         throw uno::RuntimeException();
@@ -89,7 +87,6 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R
 
 
 std::vector< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext >& xContext )
-    throw( uno::Exception )
 {
     if ( !xContext.is() || !xInStream.is() )
         throw uno::RuntimeException();
@@ -133,19 +130,16 @@ std::vector< beans::StringPair > const & DocTemplLocaleHelper::GetParsingResult(
 
 
 void SAL_CALL DocTemplLocaleHelper::startDocument()
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL DocTemplLocaleHelper::endDocument()
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
-        throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     if ( aName == m_aGroupListElement )
     {
@@ -189,7 +183,6 @@ void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const u
 
 
 void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName )
-    throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     if ( m_aElementsSeq.empty() )
         throw xml::sax::SAXException(); // TODO: no other end elements expected!
@@ -202,25 +195,21 @@ void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName )
 
 
 void SAL_CALL DocTemplLocaleHelper::characters( const OUString& /*aChars*/ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL DocTemplLocaleHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL DocTemplLocaleHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL DocTemplLocaleHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
-        throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index aa9db5802cf8..16167e1acc1c 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -43,8 +43,7 @@ class DocTemplLocaleHelper : public cppu::WeakImplHelper < css::xml::sax::XDocum
     std::vector< css::beans::StringPair > const & GetParsingResult();
 
     /// @throws css::uno::Exception
-    static std::vector< css::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const css::uno::Reference< css::io::XInputStream >& xInStream, const OUString& aStringID, const css::uno::Reference< css::uno::XComponentContext >& xContext )
-    throw( css::uno::Exception );
+    static std::vector< css::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const css::uno::Reference< css::io::XInputStream >& xInStream, const OUString& aStringID, const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
 public:
     virtual ~DocTemplLocaleHelper() override;
@@ -55,8 +54,7 @@ public:
     std::vector< css::beans::StringPair >
     ReadGroupLocalizationSequence(
         const css::uno::Reference< css::io::XInputStream >& xInStream,
-        const css::uno::Reference< css::uno::XComponentContext >& xContext )
-            throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     // writes sequence of elements ( GroupName, GroupUIName )
     /// @throws css::uno::Exception
@@ -64,18 +62,17 @@ public:
     void SAL_CALL WriteGroupLocalizationSequence(
         const css::uno::Reference< css::io::XOutputStream >& xOutStream,
         const std::vector< css::beans::StringPair >& aSequence,
-        const css::uno::Reference< css::uno::XComponentContext >& xContext )
-            throw( css::uno::Exception );
+        const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     // XDocumentHandler
-    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement( const OUString& aName ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
+    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 };
 
 #endif
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index 290b861a57bf..27022fe80b22 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -245,7 +245,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentUndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::enterUndoContext( const OUString& i_title )
     {
         // SYNCHRONIZED --->
         UndoManagerGuard aGuard( *this );
@@ -255,7 +255,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentUndoManager::enterHiddenUndoContext(  ) throw (EmptyUndoStackException, RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::enterHiddenUndoContext(  )
     {
         // SYNCHRONIZED --->
         UndoManagerGuard aGuard( *this );
@@ -265,7 +265,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentUndoManager::leaveUndoContext(  ) throw (InvalidStateException, RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::leaveUndoContext(  )
     {
         // SYNCHRONIZED --->
         UndoManagerGuard aGuard( *this );
@@ -275,7 +275,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentUndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (RuntimeException, IllegalArgumentException, std::exception)
+    void SAL_CALL DocumentUndoManager::addUndoAction( const Reference< XUndoAction >& i_action )
     {
         // SYNCHRONIZED --->
         UndoManagerGuard aGuard( *this );
@@ -285,7 +285,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentUndoManager::undo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::undo(  )
     {
         // SYNCHRONIZED --->
         UndoManagerGuard aGuard( *this );
@@ -295,7 +295,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentUndoManager::redo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::redo(  )
     {
         // SYNCHRONIZED --->
         UndoManagerGuard aGuard( *this );
@@ -305,49 +305,49 @@ namespace sfx2
     }
 
 
-    sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible(  )
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.isUndoPossible();
     }
 
 
-    sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible(  )
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.isRedoPossible();
     }
 
 
-    OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException, std::exception)
+    OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle(  )
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.getCurrentUndoActionTitle();
     }
 
 
-    OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException, std::exception)
+    OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle(  )
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.getCurrentRedoActionTitle();
     }
 
 
-    Sequence< OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles(  )
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.getAllUndoActionTitles();
     }
 
 
-    Sequence< OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles(  )
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.getAllRedoActionTitles();
     }
 
 
-    void SAL_CALL DocumentUndoManager::clear(  ) throw (UndoContextNotClosedException, RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::clear(  )
     {
         // SYNCHRONIZED --->
         UndoManagerGuard aGuard( *this );
@@ -357,7 +357,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentUndoManager::clearRedo(  ) throw (UndoContextNotClosedException, RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::clearRedo(  )
     {
         // SYNCHRONIZED --->
         UndoManagerGuard aGuard( *this );
@@ -367,7 +367,7 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentUndoManager::reset() throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::reset()
     {
         // SYNCHRONIZED --->
         UndoManagerGuard aGuard( *this );
@@ -377,49 +377,49 @@ namespace sfx2
     }
 
 
-    void SAL_CALL DocumentUndoManager::lock(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::lock(  )
     {
         UndoManagerGuard aGuard( *this );
         m_pImpl->aUndoHelper.lock();
     }
 
 
-    void SAL_CALL DocumentUndoManager::unlock(  ) throw (RuntimeException, NotLockedException, std::exception)
+    void SAL_CALL DocumentUndoManager::unlock(  )
     {
         UndoManagerGuard aGuard( *this );
         m_pImpl->aUndoHelper.unlock();
     }
 
 
-    sal_Bool SAL_CALL DocumentUndoManager::isLocked(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DocumentUndoManager::isLocked(  )
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.isLocked();
     }
 
 
-    void SAL_CALL DocumentUndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.addUndoManagerListener( i_listener );
     }
 
 
-    void SAL_CALL DocumentUndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.removeUndoManagerListener( i_listener );
     }
 
 
-    Reference< XInterface > SAL_CALL DocumentUndoManager::getParent(  ) throw (RuntimeException, std::exception)
+    Reference< XInterface > SAL_CALL DocumentUndoManager::getParent(  )
     {
         UndoManagerGuard aGuard( *this );
         return static_cast< XModel* >( &getBaseModel() );
     }
 
 
-    void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent )
     {
         (void)i_parent;
         throw NoSupportException( OUString(), m_pImpl->getThis() );
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index e9c6fe1203e4..1ca63db3194a 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -65,44 +65,40 @@ class IFrameObject : public ::cppu::WeakImplHelper <
 public:
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
-    IFrameObject(const css::uno::Reference < css::uno::XComponentContext>& rxContext, const css::uno::Sequence< css::uno::Any >& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException);
+    IFrameObject(const css::uno::Reference < css::uno::XComponentContext>& rxContext, const css::uno::Sequence< css::uno::Any >& aArguments);
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.sfx2.IFrameObject");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.SpecialEmbeddedObject" };
         return aSeq;
     }
 
     virtual sal_Bool SAL_CALL load( const css::uno::Sequence < css::beans::PropertyValue >& lDescriptor,
-            const css::uno::Reference < css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override ;
-    virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL execute(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference < css::frame::XFrame >& xFrame ) override;
+    virtual void SAL_CALL cancel() override;
+    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) override;
+    virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) override;
+    virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override ;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+    virtual ::sal_Int16 SAL_CALL execute(  ) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) override;
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) override;
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) override;
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 };
 
 class IFrameWindow_Impl : public vcl::Window
@@ -149,7 +145,6 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl()
 }
 
 IFrameObject::IFrameObject(const uno::Reference < uno::XComponentContext >& rxContext, const css::uno::Sequence< css::uno::Any >& aArguments)
-    throw ( uno::Exception, uno::RuntimeException )
     : mxContext( rxContext )
     , maPropMap( lcl_GetIFramePropertyMap_Impl() )
 {
@@ -160,7 +155,6 @@ IFrameObject::IFrameObject(const uno::Reference < uno::XComponentContext >& rxCo
 sal_Bool SAL_CALL IFrameObject::load(
     const uno::Sequence < css::beans::PropertyValue >& /*lDescriptor*/,
     const uno::Reference < frame::XFrame >& xFrame )
-throw( uno::RuntimeException, std::exception )
 {
     if ( SvtMiscOptions().IsPluginsEnabled() )
     {
@@ -206,7 +200,7 @@ throw( uno::RuntimeException, std::exception )
     return false;
 }
 
-void SAL_CALL IFrameObject::cancel() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL IFrameObject::cancel()
 {
     try
     {
@@ -220,31 +214,30 @@ void SAL_CALL IFrameObject::cancel() throw( css::uno::RuntimeException, std::exc
     }
 }
 
-void SAL_CALL IFrameObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception )
+void SAL_CALL IFrameObject::close( sal_Bool /*bDeliverOwnership*/ )
 {
 }
 
-void SAL_CALL IFrameObject::addCloseListener( const css::uno::Reference < css::util::XCloseListener >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL IFrameObject::addCloseListener( const css::uno::Reference < css::util::XCloseListener >& )
 {
 }
 
-void SAL_CALL IFrameObject::removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL IFrameObject::removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& )
 {
 }
 
-void SAL_CALL IFrameObject::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL IFrameObject::disposing( const css::lang::EventObject& )
 {
     cancel();
 }
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetInfo() throw( css::uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetInfo()
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( maPropMap );
     return xInfo;
 }
 
 void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, const uno::Any& aAny)
-    throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const SfxItemPropertySimpleEntry*  pEntry = maPropMap.getByName( aPropertyName );
     if( !pEntry )
@@ -325,7 +318,6 @@ void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, cons
 }
 
 uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName)
-        throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const SfxItemPropertySimpleEntry*  pEntry = maPropMap.getByName( aPropertyName );
     if( !pEntry )
@@ -382,23 +374,23 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName)
     return aAny;
 }
 
-void SAL_CALL IFrameObject::addPropertyChangeListener(const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener > & ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL IFrameObject::addPropertyChangeListener(const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener > & )
 {
 }
 
-void SAL_CALL IFrameObject::removePropertyChangeListener(const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener > & ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL IFrameObject::removePropertyChangeListener(const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener > & )
 {
 }
 
-void SAL_CALL IFrameObject::addVetoableChangeListener(const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener > & ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL IFrameObject::addVetoableChangeListener(const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener > & )
 {
 }
 
-void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener > & ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener > & )
 {
 }
 
-::sal_Int16 SAL_CALL IFrameObject::execute() throw (css::uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL IFrameObject::execute()
 {
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
     ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateEditObjectDialog( ".uno:InsertObjectFloatingFrame", mxObj ));
@@ -407,7 +399,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const
     return 0;
 }
 
-void SAL_CALL IFrameObject::setTitle( const OUString& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL IFrameObject::setTitle( const OUString& )
 {
 }
 
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 902a2b0038b5..2e50c0a731e5 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -136,12 +136,11 @@ public:
 
     void SetPreventClose( bool bPrevent ) { m_bPreventClose = bPrevent; }
 
-    virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership )
-        throw ( uno::RuntimeException, util::CloseVetoException, std::exception ) override;
+    virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) override;
 
-    virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) override ;
 
-    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override ;
 
 } ;
 
@@ -152,7 +151,6 @@ SfxClosePreventer_Impl::SfxClosePreventer_Impl()
 }
 
 void SAL_CALL SfxClosePreventer_Impl::queryClosing( const lang::EventObject&, sal_Bool bDeliverOwnership )
-        throw ( uno::RuntimeException, util::CloseVetoException, std::exception )
 {
     if ( m_bPreventClose )
     {
@@ -163,10 +161,10 @@ void SAL_CALL SfxClosePreventer_Impl::queryClosing( const lang::EventObject&, sa
     }
 }
 
-void SAL_CALL SfxClosePreventer_Impl::notifyClosing( const lang::EventObject& ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL SfxClosePreventer_Impl::notifyClosing( const lang::EventObject& )
 {}
 
-void SAL_CALL SfxClosePreventer_Impl::disposing( const lang::EventObject& ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL SfxClosePreventer_Impl::disposing( const lang::EventObject& )
 {}
 
 
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 61db73a28999..047719e137ca 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -153,25 +153,23 @@ class SfxModelListener_Impl : public ::cppu::WeakImplHelper< css::util::XCloseLi
     SfxObjectShell* mpDoc;
 public:
     explicit SfxModelListener_Impl( SfxObjectShell* pDoc ) : mpDoc(pDoc) {};
-    virtual void SAL_CALL queryClosing( const css::lang::EventObject& aEvent, sal_Bool bDeliverOwnership )
-        throw ( css::uno::RuntimeException, css::util::CloseVetoException, std::exception) override ;
-    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& aEvent ) throw ( css::uno::RuntimeException, std::exception ) override ;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw ( css::uno::RuntimeException, std::exception ) override ;
+    virtual void SAL_CALL queryClosing( const css::lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) override ;
+    virtual void SAL_CALL notifyClosing( const css::lang::EventObject& aEvent ) override ;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override ;
 
 };
 
 void SAL_CALL SfxModelListener_Impl::queryClosing( const css::lang::EventObject& , sal_Bool )
-    throw ( css::uno::RuntimeException, css::util::CloseVetoException, std::exception)
 {
 }
 
-void SAL_CALL SfxModelListener_Impl::notifyClosing( const css::lang::EventObject& ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SfxModelListener_Impl::notifyClosing( const css::lang::EventObject& )
 {
     SolarMutexGuard aSolarGuard;
     mpDoc->Broadcast( SfxHint(SfxHintId::Deinitializing) );
 }
 
-void SAL_CALL SfxModelListener_Impl::disposing( const css::lang::EventObject& _rEvent ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SfxModelListener_Impl::disposing( const css::lang::EventObject& _rEvent )
 {
     // am I ThisComponent in AppBasic?
     SolarMutexGuard aSolarGuard;
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index d92692a62aec..530d8b8c7d5f 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -44,21 +44,19 @@ class OwnSubFilterService : public cppu::WeakImplHelper < document::XFilter
 public:
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
-    explicit OwnSubFilterService(const css::uno::Sequence< css::uno::Any >& aArguments)
-        throw (uno::Exception, uno::RuntimeException);
+    explicit OwnSubFilterService(const css::uno::Sequence< css::uno::Any >& aArguments);
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) override;
+    virtual void SAL_CALL cancel() 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;
 };
 
 OwnSubFilterService::OwnSubFilterService(const css::uno::Sequence< css::uno::Any >& aArguments)
-    throw (uno::Exception, uno::RuntimeException)
     : m_pObjectShell( nullptr )
 {
     if ( aArguments.getLength() != 2 )
@@ -82,7 +80,6 @@ OwnSubFilterService::OwnSubFilterService(const css::uno::Sequence< css::uno::Any
 }
 
 sal_Bool SAL_CALL OwnSubFilterService::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
-    throw (uno::RuntimeException, std::exception)
 {
     if ( !m_pObjectShell )
         throw uno::RuntimeException();
@@ -91,25 +88,21 @@ sal_Bool SAL_CALL OwnSubFilterService::filter( const uno::Sequence< beans::Prope
 }
 
 void SAL_CALL OwnSubFilterService::cancel()
-    throw (uno::RuntimeException, std::exception)
 {
     // not implemented
 }
 
 OUString SAL_CALL OwnSubFilterService::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.document.OwnSubFilter");
 }
 
 sal_Bool SAL_CALL OwnSubFilterService::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OwnSubFilterService::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(2);
     aRet[0] = "com.sun.star.document.OwnSubFilter";
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 8ed498457bd9..b790e8ee1aad 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -103,10 +103,10 @@ class SfxPrintJob_Impl : public cppu::WeakImplHelper
 
 public:
     explicit SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData );
-    virtual Sequence< css::beans::PropertyValue > SAL_CALL getPrintOptions(  ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< css::beans::PropertyValue > SAL_CALL getPrinter(  ) throw (RuntimeException, std::exception) override;
-    virtual Reference< css::view::XPrintable > SAL_CALL getPrintable(  ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancelJob() throw (RuntimeException, std::exception) override;
+    virtual Sequence< css::beans::PropertyValue > SAL_CALL getPrintOptions(  ) override;
+    virtual Sequence< css::beans::PropertyValue > SAL_CALL getPrinter(  ) override;
+    virtual Reference< css::view::XPrintable > SAL_CALL getPrintable(  ) override;
+    virtual void SAL_CALL cancelJob() override;
 };
 
 SfxPrintJob_Impl::SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData )
@@ -114,12 +114,12 @@ SfxPrintJob_Impl::SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData )
 {
 }
 
-Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrintOptions() throw (RuntimeException, std::exception)
+Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrintOptions()
 {
     return m_pData->m_aPrintOptions;
 }
 
-Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter() throw (RuntimeException, std::exception)
+Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter()
 {
     if( m_pData->m_pObjectShell.Is() )
     {
@@ -130,13 +130,13 @@ Sequence< css::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter() th
     return Sequence< css::beans::PropertyValue >();
 }
 
-Reference< css::view::XPrintable > SAL_CALL SfxPrintJob_Impl::getPrintable() throw (RuntimeException, std::exception)
+Reference< css::view::XPrintable > SAL_CALL SfxPrintJob_Impl::getPrintable()
 {
     Reference < view::XPrintable > xPrintable( m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->GetModel() : nullptr, UNO_QUERY );
     return xPrintable;
 }
 
-void SAL_CALL SfxPrintJob_Impl::cancelJob() throw (RuntimeException, std::exception)
+void SAL_CALL SfxPrintJob_Impl::cancelJob()
 {
     // FIXME: how to cancel PrintJob via API?!
     if( m_pData->m_pObjectShell.Is() )
@@ -148,7 +148,7 @@ SfxPrintHelper::SfxPrintHelper()
     m_pData.reset(new IMPL_PrintListener_DataContainer(m_aMutex));
 }
 
-void SAL_CALL SfxPrintHelper::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL SfxPrintHelper::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     if ( aArguments.getLength() )
     {
@@ -252,7 +252,7 @@ namespace
 //  XPrintable
 
 
-uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() throw(css::uno::RuntimeException, std::exception)
+uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter()
 {
     // object already disposed?
     SolarMutexGuard aGuard;
@@ -450,7 +450,6 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
 }
 
 void SAL_CALL SfxPrintHelper::setPrinter(const uno::Sequence< beans::PropertyValue >& rPrinter)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     // object already disposed?
     SolarMutexGuard aGuard;
@@ -583,7 +582,6 @@ class ImplUCBPrintWatcher : public ::osl::Thread
 //  XPrintable
 
 void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& rOptions)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     if( Application::GetSettings().GetMiscSettings().GetDisablePrinting() )
         return;
@@ -821,13 +819,13 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
         static_cast<view::XPrintJobListener*>(pIterator.next())->printJobEvent( aEvent );
 }
 
-void SAL_CALL SfxPrintHelper::addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SfxPrintHelper::addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener )
 {
     SolarMutexGuard aGuard;
     m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener );
 }
 
-void SAL_CALL SfxPrintHelper::removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SfxPrintHelper::removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener )
 {
     SolarMutexGuard aGuard;
     m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<view::XPrintJobListener>::get(), xListener );
diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx
index 6faca49f89eb..88cdca28b7ee 100644
--- a/sfx2/source/doc/printhelper.hxx
+++ b/sfx2/source/doc/printhelper.hxx
@@ -48,14 +48,12 @@ public:
     SfxPrintHelper() ;
     virtual ~SfxPrintHelper() override ;
 
-    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& seqPrinter )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+    virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) override;
+    virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() override;
+    virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& seqPrinter ) override;
+    virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions ) override;
 
 private:
 
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 934e8ca2811c..ad0520d4ba4d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -152,14 +152,11 @@ public:
         : m_rShell(i_rDoc)
     { };
 
-    virtual void SAL_CALL disposing( const lang::EventObject& )
-        throw ( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL modified( const lang::EventObject& )
-        throw ( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& ) override;
+    virtual void SAL_CALL modified( const lang::EventObject& ) override;
 };
 
 void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& )
-        throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -168,7 +165,6 @@ void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& )
 }
 
 void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& )
-    throw ( RuntimeException, std::exception )
 {
 }
 
@@ -313,16 +309,16 @@ public:
         : m_pData( pData )
     {}
 
-    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( RuntimeException, std::exception ) override ;
-    virtual void SAL_CALL printJobEvent( const view::PrintJobEvent& rEvent ) throw ( RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override ;
+    virtual void SAL_CALL printJobEvent( const view::PrintJobEvent& rEvent ) override;
 };
 
-void SAL_CALL SfxPrintHelperListener_Impl::disposing( const lang::EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL SfxPrintHelperListener_Impl::disposing( const lang::EventObject& )
 {
     m_pData->m_xPrintable = nullptr;
 }
 
-void SAL_CALL SfxPrintHelperListener_Impl::printJobEvent( const view::PrintJobEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxPrintHelperListener_Impl::printJobEvent( const view::PrintJobEvent& rEvent )
 {
     ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<view::XPrintJobListener>::get());
     if ( pContainer!=nullptr )
@@ -509,7 +505,7 @@ SfxBaseModel::~SfxBaseModel()
 }
 
 //  XInterface
-Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType )
 {
     if  (   ( !m_bSupportEmbeddedScripts && rType.equals( cppu::UnoType<document::XEmbeddedScripts>::get() ) )
         ||  ( !m_bSupportDocRecovery && rType.equals( cppu::UnoType<XDocumentRecovery>::get() ) )
@@ -561,7 +557,7 @@ namespace
     }
 }
 
-Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException, std::exception )
+Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes()
 {
     Sequence< uno::Type > aTypes( SfxBaseModel_Base::getTypes() );
 
@@ -578,7 +574,7 @@ Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException,
 //  XTypeProvider
 
 
-Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -603,7 +599,7 @@ Reference< script::XStarBasicAccess > implGetStarBasicAccess( SfxObjectShell* pO
     return xRet;
 }
 
-Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContainer() throw( RuntimeException, std::exception )
+Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContainer()
 {
 #if !HAVE_FEATURE_SCRIPTING
     Reference< container::XNameContainer > dummy;
@@ -628,7 +624,6 @@ Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContaine
 */
 void SAL_CALL SfxBaseModel::createLibrary( const OUString& LibName, const OUString& Password,
     const OUString& ExternalSourceURL, const OUString& LinkTargetURL )
-        throw(container::ElementExistException, RuntimeException, std::exception)
 {
 #if !HAVE_FEATURE_SCRIPTING
     (void) LibName;
@@ -652,7 +647,6 @@ void SAL_CALL SfxBaseModel::createLibrary( const OUString& LibName, const OUStri
 */
 void SAL_CALL SfxBaseModel::addModule( const OUString& LibraryName, const OUString& ModuleName,
     const OUString& Language, const OUString& Source )
-        throw( container::NoSuchElementException, RuntimeException, std::exception)
 {
 #if !HAVE_FEATURE_SCRIPTING
     (void) LibraryName;
@@ -676,7 +670,6 @@ void SAL_CALL SfxBaseModel::addModule( const OUString& LibraryName, const OUStri
 */
 void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUString& DialogName,
     const Sequence< sal_Int8 >& Data )
-        throw(container::NoSuchElementException, RuntimeException, std::exception)
 {
 #if !HAVE_FEATURE_SCRIPTING
     (void) LibraryName;
@@ -698,7 +691,7 @@ void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUStri
 //  XChild
 
 
-Reference< XInterface > SAL_CALL SfxBaseModel::getParent() throw( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL SfxBaseModel::getParent()
 {
     SfxModelGuard aGuard( *this );
 
@@ -709,7 +702,7 @@ Reference< XInterface > SAL_CALL SfxBaseModel::getParent() throw( RuntimeExcepti
 //  XChild
 
 
-void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent) throw(lang::NoSupportException, RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent)
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
     m_pData->m_xParent = Parent;
@@ -719,7 +712,7 @@ void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent) thr
 //  XChild
 
 
-void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::dispose()
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
 
@@ -778,7 +771,6 @@ void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException, std::exception)
 
 
 void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListener >& aListener )
-    throw(RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
     m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
@@ -789,7 +781,6 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListe
 
 
 void SAL_CALL SfxBaseModel::removeEventListener( const Reference< lang::XEventListener >& aListener )
-    throw(RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
     m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
@@ -811,7 +802,6 @@ IMPL_SfxBaseModel_DataContainer::impl_setDocumentProperties(
 // document::XDocumentPropertiesSupplier:
 Reference< document::XDocumentProperties > SAL_CALL
 SfxBaseModel::getDocumentProperties()
-    throw(RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
     if ( !m_pData->m_xDocumentProperties.is() )
@@ -829,7 +819,6 @@ SfxBaseModel::getDocumentProperties()
 
 
 void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject )
-    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if ( impl_isDisposed() )
@@ -853,7 +842,6 @@ void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject )
 
 sal_Bool SAL_CALL SfxBaseModel::attachResource( const   OUString&                   rURL    ,
                                                 const   Sequence< beans::PropertyValue >&  rArgs   )
-    throw(RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
     if ( rURL.isEmpty() && rArgs.getLength() == 1 && rArgs[0].Name == "SetEmbedded" )
@@ -938,7 +926,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const   OUString&
 //  frame::XModel
 
 
-OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException, std::exception)
+OUString SAL_CALL SfxBaseModel::getURL()
 {
     SfxModelGuard aGuard( *this );
     return m_pData->m_sURL ;
@@ -948,7 +936,7 @@ OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException, std::exception)
 //  frame::XModel
 
 
-Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeException, std::exception)
+Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs()
 {
     SfxModelGuard aGuard( *this );
     if ( m_pData->m_pObjectShell.Is() )
@@ -1048,7 +1036,6 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE
 
 
 void SAL_CALL SfxBaseModel::connectController( const Reference< frame::XController >& xController )
-    throw(RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
     OSL_PRECOND( xController.is(), "SfxBaseModel::connectController: invalid controller!" );
@@ -1072,7 +1059,7 @@ void SAL_CALL SfxBaseModel::connectController( const Reference< frame::XControll
 //  frame::XModel
 
 
-void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XController >& xController ) throw(RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XController >& xController )
 {
     SfxModelGuard aGuard( *this );
 
@@ -1099,22 +1086,22 @@ namespace
         }
 
         // XUndoAction
-        virtual OUString SAL_CALL getTitle() throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL undo(  ) throw (UndoFailedException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL redo(  ) throw (UndoFailedException, RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTitle() override;
+        virtual void SAL_CALL undo(  ) override;
+        virtual void SAL_CALL redo(  ) override;
 
     private:
         const Reference< XModel >   m_xModel;
         const bool                  m_bUndoIsUnlock;
     };
 
-    OUString SAL_CALL ControllerLockUndoAction::getTitle() throw (RuntimeException, std::exception)
+    OUString SAL_CALL ControllerLockUndoAction::getTitle()
     {
         // this action is intended to be used within an UndoContext only, so nobody will ever see this title ...
         return OUString();
     }
 
-    void SAL_CALL ControllerLockUndoAction::undo(  ) throw (UndoFailedException, RuntimeException, std::exception)
+    void SAL_CALL ControllerLockUndoAction::undo(  )
     {
         if ( m_bUndoIsUnlock )
             m_xModel->unlockControllers();
@@ -1122,7 +1109,7 @@ namespace
             m_xModel->lockControllers();
     }
 
-    void SAL_CALL ControllerLockUndoAction::redo(  ) throw (UndoFailedException, RuntimeException, std::exception)
+    void SAL_CALL ControllerLockUndoAction::redo(  )
     {
         if ( m_bUndoIsUnlock )
             m_xModel->lockControllers();
@@ -1135,7 +1122,7 @@ namespace
 //  frame::XModel
 
 
-void SAL_CALL SfxBaseModel::lockControllers() throw(RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::lockControllers()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1154,7 +1141,7 @@ void SAL_CALL SfxBaseModel::lockControllers() throw(RuntimeException, std::excep
 //  frame::XModel
 
 
-void SAL_CALL SfxBaseModel::unlockControllers() throw(RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::unlockControllers()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1173,7 +1160,7 @@ void SAL_CALL SfxBaseModel::unlockControllers() throw(RuntimeException, std::exc
 //  frame::XModel
 
 
-sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked()
 {
     SfxModelGuard aGuard( *this );
     return ( m_pData->m_nControllerLockCount != 0 ) ;
@@ -1183,7 +1170,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(RuntimeException, s
 //  frame::XModel
 
 
-Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() throw(RuntimeException, std::exception)
+Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1200,7 +1187,6 @@ Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() th
 
 
 void SAL_CALL SfxBaseModel::setCurrentController( const Reference< frame::XController >& xCurrentController )
-        throw (container::NoSuchElementException, RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -1211,7 +1197,7 @@ void SAL_CALL SfxBaseModel::setCurrentController( const Reference< frame::XContr
 //  frame::XModel
 
 
-Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1235,7 +1221,7 @@ Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(Runti
 //  XModifiable2
 
 
-sal_Bool SAL_CALL SfxBaseModel::disableSetModified() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxBaseModel::disableSetModified()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1248,7 +1234,7 @@ sal_Bool SAL_CALL SfxBaseModel::disableSetModified() throw (RuntimeException, st
     return bResult;
 }
 
-sal_Bool SAL_CALL SfxBaseModel::enableSetModified() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxBaseModel::enableSetModified()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1261,7 +1247,7 @@ sal_Bool SAL_CALL SfxBaseModel::enableSetModified() throw (RuntimeException, std
     return bResult;
 }
 
-sal_Bool SAL_CALL SfxBaseModel::isSetModifiedEnabled() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxBaseModel::isSetModifiedEnabled()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1275,7 +1261,7 @@ sal_Bool SAL_CALL SfxBaseModel::isSetModifiedEnabled() throw (RuntimeException,
 //  XModifiable
 
 
-sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxBaseModel::isModified()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1287,7 +1273,6 @@ sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException, std::except
 
 
 void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified )
-        throw (beans::PropertyVetoException, RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -1299,7 +1284,7 @@ void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified )
 //  XModifiable
 
 
-void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyListener >& xListener)
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
 
@@ -1310,7 +1295,7 @@ void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyList
 //  XModifiable
 
 
-void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyListener >& xListener)
 {
     SfxModelGuard aGuard( *this );
 
@@ -1321,7 +1306,7 @@ void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyL
 //  XCloseable
 
 
-void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership )
 {
     SolarMutexGuard aGuard;
     if ( impl_isDisposed() || m_pData->m_bClosed || m_pData->m_bClosing )
@@ -1384,7 +1369,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
 //  XCloseBroadcaster
 
 
-void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListener >& xListener )
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
 
@@ -1395,7 +1380,7 @@ void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListe
 //  XCloseBroadcaster
 
 
-void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseListener >& xListener )
 {
     SfxModelGuard aGuard( *this );
 
@@ -1406,7 +1391,7 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseLi
 //  XPrintable
 
 
-Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getPrinter() throw(RuntimeException, std::exception)
+Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getPrinter()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1417,7 +1402,6 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getPrinter() throw(Runti
 }
 
 void SAL_CALL SfxBaseModel::setPrinter(const Sequence< beans::PropertyValue >& rPrinter)
-        throw (lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -1426,7 +1410,6 @@ void SAL_CALL SfxBaseModel::setPrinter(const Sequence< beans::PropertyValue >& r
 }
 
 void SAL_CALL SfxBaseModel::print(const Sequence< beans::PropertyValue >& rOptions)
-        throw (lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -1438,7 +1421,7 @@ void SAL_CALL SfxBaseModel::print(const Sequence< beans::PropertyValue >& rOptio
 //  XStorable
 
 
-sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxBaseModel::hasLocation()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1449,7 +1432,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException, std::excep
 //  XStorable
 
 
-OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException, std::exception)
+OUString SAL_CALL SfxBaseModel::getLocation()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1469,7 +1452,7 @@ OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException, std::excep
 //  XStorable
 
 
-sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxBaseModel::isReadonly()
 {
     SfxModelGuard aGuard( *this );
 
@@ -1481,9 +1464,6 @@ sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException, std::except
 
 
 void SAL_CALL SfxBaseModel::storeSelf( const    Sequence< beans::PropertyValue >&  aSeqArgs )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
 
@@ -1602,7 +1582,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const    Sequence< beans::PropertyValue >
 //  XStorable
 
 
-void SAL_CALL SfxBaseModel::store() throw (io::IOException, RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::store()
 {
     storeSelf( Sequence< beans::PropertyValue >() );
 }
@@ -1613,7 +1593,6 @@ void SAL_CALL SfxBaseModel::store() throw (io::IOException, RuntimeException, st
 
 void SAL_CALL SfxBaseModel::storeAsURL( const   OUString&                   rURL    ,
                                         const   Sequence< beans::PropertyValue >&  rArgs   )
-        throw (io::IOException, RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -1640,7 +1619,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const   OUString&                   rURL
 
 //  XUndoManagerSupplier
 
-Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager(  ) throw (RuntimeException, std::exception)
+Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager(  )
 {
     SfxModelGuard aGuard( *this );
     if ( !m_pData->m_pDocumentUndoManager.is() )
@@ -1654,7 +1633,6 @@ Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager(  ) throw (Runti
 
 void SAL_CALL SfxBaseModel::storeToURL( const   OUString&                   rURL    ,
                                         const   Sequence< beans::PropertyValue >&  rArgs   )
-        throw (io::IOException, RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -1675,13 +1653,13 @@ void SAL_CALL SfxBaseModel::storeToURL( const   OUString&                   rURL
     }
 }
 
-sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave()
 {
     SfxModelGuard aGuard( *this );
     return m_pData->m_bModifiedSinceLastSave;
 }
 
-void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception )
+void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor )
 {
     SfxModelGuard aGuard( *this );
 
@@ -1693,7 +1671,7 @@ void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocatio
     m_pData->m_bModifiedSinceLastSave = false;
 }
 
-void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception )
+void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor )
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
 
@@ -1725,10 +1703,6 @@ void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, c
 
 
 void SAL_CALL SfxBaseModel::initNew()
-        throw (frame::DoubleInitializationException,
-               io::IOException,
-               RuntimeException,
-               Exception, std::exception)
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
     if ( IsInitialized() )
@@ -1780,10 +1754,6 @@ void setUpdatePickList( SfxMedium* pMedium )
 }
 
 void SAL_CALL SfxBaseModel::load(   const Sequence< beans::PropertyValue >& seqArguments )
-        throw (frame::DoubleInitializationException,
-               io::IOException,
-               RuntimeException,
-               Exception, std::exception)
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
     if ( IsInitialized() )
@@ -1913,9 +1883,6 @@ void SAL_CALL SfxBaseModel::load(   const Sequence< beans::PropertyValue >& seqA
 
 
 Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFlavor )
-        throw (datatransfer::UnsupportedFlavorException,
-               io::IOException,
-               RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -2152,7 +2119,6 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
 
 
 Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavors()
-        throw (RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -2219,7 +2185,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo
 
 
 sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
-        throw (RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -2277,7 +2242,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF
 //  XEventsSupplier
 
 
-Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( RuntimeException, std::exception )
+Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents()
 {
     SfxModelGuard aGuard( *this );
 
@@ -2293,7 +2258,7 @@ Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( R
 //  XEmbeddedScripts
 
 
-Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBasicLibraries() throw (RuntimeException, std::exception)
+Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBasicLibraries()
 {
     SfxModelGuard aGuard( *this );
 
@@ -2303,7 +2268,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBas
     return xBasicLibraries;
 }
 
-Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDialogLibraries() throw (RuntimeException, std::exception)
+Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDialogLibraries()
 {
     SfxModelGuard aGuard( *this );
 
@@ -2313,7 +2278,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDia
     return xDialogLibraries;
 }
 
-sal_Bool SAL_CALL SfxBaseModel::getAllowMacroExecution() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxBaseModel::getAllowMacroExecution()
 {
     SfxModelGuard aGuard( *this );
 
@@ -2326,7 +2291,7 @@ sal_Bool SAL_CALL SfxBaseModel::getAllowMacroExecution() throw (RuntimeException
 //  XScriptInvocationContext
 
 
-Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContainer() throw (RuntimeException, std::exception)
+Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContainer()
 {
     SfxModelGuard aGuard( *this );
 
@@ -2362,7 +2327,7 @@ Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContaine
 //  XEventBroadcaster
 
 
-void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventListener >& aListener )
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
 
@@ -2373,7 +2338,7 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventL
 //  XEventBroadcaster
 
 
-void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEventListener >& aListener )
 {
     SfxModelGuard aGuard( *this );
 
@@ -2385,7 +2350,6 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEve
 
 
 void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document::XDocumentEventListener >& aListener )
-    throw ( RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
     m_pData->m_aInterfaceContainer.addInterface( cppu::UnoType<document::XDocumentEventListener>::get(), aListener );
@@ -2393,7 +2357,6 @@ void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document:
 
 
 void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< document::XDocumentEventListener >& aListener )
-    throw ( RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
     m_pData->m_aInterfaceContainer.removeInterface( cppu::UnoType<document::XDocumentEventListener>::get(), aListener );
@@ -2401,25 +2364,21 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume
 
 
 void SAL_CALL SfxBaseModel::notifyDocumentEvent( const OUString&, const Reference< frame::XController2 >&, const Any& )
-    throw ( lang::IllegalArgumentException, lang::NoSupportException, RuntimeException, std::exception )
 {
     throw lang::NoSupportException("SfxBaseModel controls all the sent notifications itself!" );
 }
 
 Sequence< document::CmisProperty > SAL_CALL SfxBaseModel::getCmisProperties()
-    throw ( RuntimeException, std::exception )
 {
     return m_pData->m_cmisProperties;
 }
 
 void SAL_CALL SfxBaseModel::setCmisProperties( const Sequence< document::CmisProperty >& _cmisproperties )
-    throw ( RuntimeException, std::exception )
 {
     m_pData->m_cmisProperties = _cmisproperties;
 }
 
 void SAL_CALL SfxBaseModel::updateCmisProperties( const Sequence< document::CmisProperty >& aProperties )
-    throw ( RuntimeException, std::exception )
 {
     SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
     if ( pMedium )
@@ -2441,7 +2400,7 @@ void SAL_CALL SfxBaseModel::updateCmisProperties( const Sequence< document::Cmis
 
 }
 
-void SAL_CALL SfxBaseModel::checkOut(  ) throw ( RuntimeException, std::exception )
+void SAL_CALL SfxBaseModel::checkOut(  )
 {
     SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
     if ( pMedium )
@@ -2473,7 +2432,7 @@ void SAL_CALL SfxBaseModel::checkOut(  ) throw ( RuntimeException, std::exceptio
     }
 }
 
-void SAL_CALL SfxBaseModel::cancelCheckOut(  ) throw ( RuntimeException, std::exception )
+void SAL_CALL SfxBaseModel::cancelCheckOut(  )
 {
     SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
     if ( pMedium )
@@ -2497,7 +2456,7 @@ void SAL_CALL SfxBaseModel::cancelCheckOut(  ) throw ( RuntimeException, std::ex
     }
 }
 
-void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage ) throw ( RuntimeException, std::exception )
+void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage )
 {
     SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
     if ( pMedium )
@@ -2538,7 +2497,7 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage
     }
 }
 
-uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( ) throw ( RuntimeException, std::exception )
+uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( )
 {
     uno::Sequence< document::CmisVersion > aVersions;
     SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
@@ -2561,7 +2520,7 @@ uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( )
     return aVersions;
 }
 
-bool SfxBaseModel::getBoolPropertyValue( const OUString& rName ) throw ( RuntimeException )
+bool SfxBaseModel::getBoolPropertyValue( const OUString& rName )
 {
     bool bValue = false;
     if ( m_pData->m_pObjectShell.Is() )
@@ -2590,22 +2549,22 @@ bool SfxBaseModel::getBoolPropertyValue( const OUString& rName ) throw ( Runtime
     return bValue;
 }
 
-sal_Bool SAL_CALL SfxBaseModel::isVersionable( ) throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxBaseModel::isVersionable( )
 {
     return getBoolPropertyValue( "IsVersionable" );
 }
 
-sal_Bool SAL_CALL SfxBaseModel::canCheckOut( ) throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxBaseModel::canCheckOut( )
 {
     return getBoolPropertyValue( "CanCheckOut" );
 }
 
-sal_Bool SAL_CALL SfxBaseModel::canCancelCheckOut( ) throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxBaseModel::canCancelCheckOut( )
 {
     return getBoolPropertyValue( "CanCancelCheckOut" );
 }
 
-sal_Bool SAL_CALL SfxBaseModel::canCheckIn( ) throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxBaseModel::canCheckIn( )
 {
     return getBoolPropertyValue( "CanCheckIn" );
 }
@@ -3168,7 +3127,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame
 
 }
 
-Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() throw(RuntimeException, std::exception)
+Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData()
 {
     SfxModelGuard aGuard( *this );
 
@@ -3207,7 +3166,7 @@ Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() throw
     return m_pData->m_contViewData;
 }
 
-void SAL_CALL SfxBaseModel::setViewData( const Reference < container::XIndexAccess >& aData ) throw(RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::setViewData( const Reference < container::XIndexAccess >& aData )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3247,7 +3206,7 @@ bool SfxBaseModel::hasEventListeners() const
     return !impl_isDisposed() && (nullptr != m_pData->m_aInterfaceContainer.getContainer( cppu::UnoType<document::XEventListener>::get()) );
 }
 
-void SAL_CALL SfxBaseModel::addPrintJobListener( const Reference< view::XPrintJobListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::addPrintJobListener( const Reference< view::XPrintJobListener >& xListener )
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
 
@@ -3259,7 +3218,7 @@ void SAL_CALL SfxBaseModel::addPrintJobListener( const Reference< view::XPrintJo
     }
 }
 
-void SAL_CALL SfxBaseModel::removePrintJobListener( const Reference< view::XPrintJobListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxBaseModel::removePrintJobListener( const Reference< view::XPrintJobListener >& xListener )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3271,7 +3230,7 @@ void SAL_CALL SfxBaseModel::removePrintJobListener( const Reference< view::XPrin
     }
 }
 
-sal_Int64 SAL_CALL SfxBaseModel::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL SfxBaseModel::getSomething( const Sequence< sal_Int8 >& aIdentifier )
 {
     SvGlobalName aName( aIdentifier );
     if (aName == SvGlobalName( SFX_GLOBAL_CLASSID ))
@@ -3307,7 +3266,6 @@ void SfxBaseModel::ListenForStorage_Impl( const Reference< embed::XStorage >& xS
 }
 
 Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode )
-    throw ( RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -3331,8 +3289,6 @@ Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const
 }
 
 Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames()
-    throw ( io::IOException,
-            RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3370,7 +3326,6 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames()
 
 
 Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptProvider()
-    throw ( RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3481,13 +3436,11 @@ static void ConvertSlotsToCommands( SfxObjectShell* pDoc, Reference< container::
 }
 
 Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfigurationManager()
-        throw ( RuntimeException, std::exception )
 {
     return Reference< ui::XUIConfigurationManager >( getUIConfigurationManager2(), UNO_QUERY_THROW );
 }
 
 Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManager2()
-        throw ( RuntimeException )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3587,10 +3540,6 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage
 
 
 void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Size& aSize )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                Exception,
-                RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3618,10 +3567,6 @@ void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Siz
 }
 
 awt::Size SAL_CALL SfxBaseModel::getVisualAreaSize( sal_Int64 /*nAspect*/ )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                Exception,
-                RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -3635,8 +3580,6 @@ awt::Size SAL_CALL SfxBaseModel::getVisualAreaSize( sal_Int64 /*nAspect*/ )
 
 
 sal_Int32 SAL_CALL SfxBaseModel::getMapUnit( sal_Int64 /*nAspect*/ )
-        throw ( Exception,
-                RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -3647,10 +3590,6 @@ sal_Int32 SAL_CALL SfxBaseModel::getMapUnit( sal_Int64 /*nAspect*/ )
 }
 
 embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentation( ::sal_Int64 /*nAspect*/ )
-        throw ( lang::IllegalArgumentException,
-                embed::WrongStateException,
-                Exception,
-                RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3672,11 +3611,6 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat
 
 void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& xStorage,
                                              const Sequence< beans::PropertyValue >& aMediaDescriptor )
-    throw ( lang::IllegalArgumentException,
-            frame::DoubleInitializationException,
-            io::IOException,
-            Exception,
-            RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
     if ( IsInitialized() )
@@ -3713,10 +3647,6 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >&
 
 void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& xStorage,
                                 const Sequence< beans::PropertyValue >& aMediaDescriptor )
-    throw ( lang::IllegalArgumentException,
-            io::IOException,
-            Exception,
-            RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3775,10 +3705,6 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >&
 }
 
 void SAL_CALL SfxBaseModel::switchToStorage( const Reference< embed::XStorage >& xStorage )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                Exception,
-                RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3808,9 +3734,6 @@ void SAL_CALL SfxBaseModel::switchToStorage( const Reference< embed::XStorage >&
 }
 
 Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentStorage()
-        throw ( io::IOException,
-                Exception,
-                RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3823,7 +3746,6 @@ Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentStorage()
 
 void SAL_CALL SfxBaseModel::addStorageChangeListener(
             const Reference< document::XStorageChangeListener >& xListener )
-        throw ( RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
 
@@ -3833,7 +3755,6 @@ void SAL_CALL SfxBaseModel::addStorageChangeListener(
 
 void SAL_CALL SfxBaseModel::removeStorageChangeListener(
             const Reference< document::XStorageChangeListener >& xListener )
-        throw ( RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
 
@@ -3858,7 +3779,6 @@ bool SfxBaseModel::impl_getPrintHelper()
 
 // css.frame.XModule
  void SAL_CALL SfxBaseModel::setIdentifier(const OUString& Identifier)
-    throw (RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
     m_pData->m_sModuleIdentifier = Identifier;
@@ -3867,7 +3787,6 @@ bool SfxBaseModel::impl_getPrintHelper()
 
 // css.frame.XModule
  OUString SAL_CALL SfxBaseModel::getIdentifier()
-    throw (RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
     if (!m_pData->m_sModuleIdentifier.isEmpty())
@@ -3919,7 +3838,6 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper ()
 
 // css.frame.XTitle
 OUString SAL_CALL SfxBaseModel::getTitle()
-    throw (RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     SfxModelGuard aGuard( *this );
@@ -3972,7 +3890,6 @@ OUString SAL_CALL SfxBaseModel::getTitle()
 
 // css.frame.XTitle
 void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle )
-    throw (RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     SfxModelGuard aGuard( *this );
@@ -3984,7 +3901,6 @@ void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle )
 
 // css.frame.XTitleChangeBroadcaster
 void SAL_CALL SfxBaseModel::addTitleChangeListener( const Reference< frame::XTitleChangeListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING );
@@ -3997,7 +3913,6 @@ void SAL_CALL SfxBaseModel::addTitleChangeListener( const Reference< frame::XTit
 
 // css.frame.XTitleChangeBroadcaster
 void SAL_CALL SfxBaseModel::removeTitleChangeListener( const Reference< frame::XTitleChangeListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     // SYNCHRONIZED ->
     SfxModelGuard aGuard( *this );
@@ -4010,8 +3925,6 @@ void SAL_CALL SfxBaseModel::removeTitleChangeListener( const Reference< frame::X
 
 // css.frame.XUntitledNumbers
 ::sal_Int32 SAL_CALL SfxBaseModel::leaseNumber( const Reference< XInterface >& xComponent )
-    throw (lang::IllegalArgumentException,
-           RuntimeException, std::exception         )
 {
     SfxModelGuard aGuard( *this );
 
@@ -4021,8 +3934,6 @@ void SAL_CALL SfxBaseModel::removeTitleChangeListener( const Reference< frame::X
 
 // css.frame.XUntitledNumbers
 void SAL_CALL SfxBaseModel::releaseNumber( ::sal_Int32 nNumber )
-    throw (lang::IllegalArgumentException,
-           RuntimeException, std::exception         )
 {
     SfxModelGuard aGuard( *this );
     impl_getUntitledHelper ()->releaseNumber (nNumber);
@@ -4031,8 +3942,6 @@ void SAL_CALL SfxBaseModel::releaseNumber( ::sal_Int32 nNumber )
 
 // css.frame.XUntitledNumbers
 void SAL_CALL SfxBaseModel::releaseNumberForComponent( const Reference< XInterface >& xComponent )
-    throw (lang::IllegalArgumentException,
-           RuntimeException, std::exception         )
 {
     SfxModelGuard aGuard( *this );
     impl_getUntitledHelper ()->releaseNumberForComponent (xComponent);
@@ -4041,7 +3950,6 @@ void SAL_CALL SfxBaseModel::releaseNumberForComponent( const Reference< XInterfa
 
 // css.frame.XUntitledNumbers
 OUString SAL_CALL SfxBaseModel::getUntitledPrefix()
-    throw (RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
     return impl_getUntitledHelper ()->getUntitledPrefix ();
@@ -4050,7 +3958,6 @@ OUString SAL_CALL SfxBaseModel::getUntitledPrefix()
 
 // frame::XModel2
 Reference< container::XEnumeration > SAL_CALL SfxBaseModel::getControllers()
-    throw (RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4068,7 +3975,6 @@ Reference< container::XEnumeration > SAL_CALL SfxBaseModel::getControllers()
 
 // frame::XModel2
 Sequence< OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames()
-    throw (RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4084,9 +3990,6 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames()
 
 // frame::XModel2
 Reference< frame::XController2 > SAL_CALL SfxBaseModel::createDefaultViewController( const Reference< frame::XFrame >& i_rFrame )
-    throw (RuntimeException         ,
-           lang::IllegalArgumentException,
-           Exception, std::exception                )
 {
     SfxModelGuard aGuard( *this );
 
@@ -4193,9 +4096,6 @@ SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame
 // frame::XModel2
 Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController(
         const OUString& i_rViewName, const Sequence< PropertyValue >& i_rArguments, const Reference< XFrame >& i_rFrame )
-    throw (RuntimeException         ,
-           lang::IllegalArgumentException,
-           Exception, std::exception                )
 {
     SfxModelGuard aGuard( *this );
 
@@ -4281,7 +4181,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController(
 
 // rdf::XRepositorySupplier:
 Reference< rdf::XRepository > SAL_CALL
-SfxBaseModel::getRDFRepository() throw (RuntimeException, std::exception)
+SfxBaseModel::getRDFRepository()
 {
     SfxModelGuard aGuard( *this );
 
@@ -4295,7 +4195,7 @@ SfxBaseModel::getRDFRepository() throw (RuntimeException, std::exception)
 
 // rdf::XNode:
 OUString SAL_CALL
-SfxBaseModel::getStringValue() throw (RuntimeException, std::exception)
+SfxBaseModel::getStringValue()
 {
     SfxModelGuard aGuard( *this );
 
@@ -4309,7 +4209,7 @@ SfxBaseModel::getStringValue() throw (RuntimeException, std::exception)
 
 // rdf::XURI:
 OUString SAL_CALL
-SfxBaseModel::getNamespace() throw (RuntimeException, std::exception)
+SfxBaseModel::getNamespace()
 {
     SfxModelGuard aGuard( *this );
 
@@ -4322,7 +4222,7 @@ SfxBaseModel::getNamespace() throw (RuntimeException, std::exception)
 }
 
 OUString SAL_CALL
-SfxBaseModel::getLocalName() throw (RuntimeException, std::exception)
+SfxBaseModel::getLocalName()
 {
     SfxModelGuard aGuard( *this );
 
@@ -4338,7 +4238,6 @@ SfxBaseModel::getLocalName() throw (RuntimeException, std::exception)
 Reference< rdf::XMetadatable > SAL_CALL
 SfxBaseModel::getElementByMetadataReference(
     const beans::StringPair & i_rReference)
-throw (RuntimeException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4352,7 +4251,6 @@ throw (RuntimeException, std::exception)
 
 Reference< rdf::XMetadatable > SAL_CALL
 SfxBaseModel::getElementByURI(const Reference< rdf::XURI > & i_xURI)
-throw (RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4367,7 +4265,6 @@ throw (RuntimeException, lang::IllegalArgumentException, std::exception)
 Sequence< Reference< rdf::XURI > > SAL_CALL
 SfxBaseModel::getMetadataGraphsWithType(
     const Reference<rdf::XURI> & i_xType)
-throw (RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4382,8 +4279,6 @@ throw (RuntimeException, lang::IllegalArgumentException, std::exception)
 Reference<rdf::XURI> SAL_CALL
 SfxBaseModel::addMetadataFile(const OUString & i_rFileName,
     const Sequence < Reference< rdf::XURI > > & i_rTypes)
-throw (RuntimeException, lang::IllegalArgumentException,
-    container::ElementExistException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4401,9 +4296,6 @@ SfxBaseModel::importMetadataFile(::sal_Int16 i_Format,
     const OUString & i_rFileName,
     const Reference< rdf::XURI > & i_xBaseURI,
     const Sequence < Reference< rdf::XURI > > & i_rTypes)
-throw (RuntimeException, lang::IllegalArgumentException,
-    datatransfer::UnsupportedFlavorException,
-    container::ElementExistException, rdf::ParseException, io::IOException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4419,8 +4311,6 @@ throw (RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 SfxBaseModel::removeMetadataFile(
     const Reference< rdf::XURI > & i_xGraphName)
-throw (RuntimeException, lang::IllegalArgumentException,
-    container::NoSuchElementException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4434,8 +4324,6 @@ throw (RuntimeException, lang::IllegalArgumentException,
 
 void SAL_CALL
 SfxBaseModel::addContentOrStylesFile(const OUString & i_rFileName)
-throw (RuntimeException, lang::IllegalArgumentException,
-    container::ElementExistException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4449,8 +4337,6 @@ throw (RuntimeException, lang::IllegalArgumentException,
 
 void SAL_CALL
 SfxBaseModel::removeContentOrStylesFile(const OUString & i_rFileName)
-throw (RuntimeException, lang::IllegalArgumentException,
-    container::NoSuchElementException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4467,8 +4353,6 @@ SfxBaseModel::loadMetadataFromStorage(
     Reference< embed::XStorage > const & i_xStorage,
     Reference<rdf::XURI> const & i_xBaseURI,
     Reference<task::XInteractionHandler> const & i_xHandler)
-throw (RuntimeException, lang::IllegalArgumentException,
-    lang::WrappedTargetException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4494,8 +4378,6 @@ throw (RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 SfxBaseModel::storeMetadataToStorage(
     Reference< embed::XStorage > const & i_xStorage)
-throw (RuntimeException, lang::IllegalArgumentException,
-    lang::WrappedTargetException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4510,8 +4392,6 @@ throw (RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 SfxBaseModel::loadMetadataFromMedium(
     const Sequence< beans::PropertyValue > & i_rMedium)
-throw (RuntimeException, lang::IllegalArgumentException,
-    lang::WrappedTargetException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
@@ -4536,8 +4416,6 @@ throw (RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 SfxBaseModel::storeMetadataToMedium(
     const Sequence< beans::PropertyValue > & i_rMedium)
-throw (RuntimeException, lang::IllegalArgumentException,
-    lang::WrappedTargetException, std::exception)
 {
     SfxModelGuard aGuard( *this );
 
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index 21a30bfd79e7..9267ed18846c 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -75,13 +75,13 @@ namespace sfx2
         );
 
         // XSingleServiceFactory
-        virtual Reference< XInterface > SAL_CALL createInstance(  ) throw (Exception, RuntimeException, std::exception) override;
-        virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override;
+        virtual Reference< XInterface > SAL_CALL createInstance(  ) override;
+        virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     protected:
         virtual ~SfxModelFactory() override;
@@ -113,7 +113,7 @@ namespace sfx2
     }
 
 
-    Reference< XInterface > SAL_CALL SfxModelFactory::createInstance(  ) throw (Exception, RuntimeException, std::exception)
+    Reference< XInterface > SAL_CALL SfxModelFactory::createInstance(  )
     {
         return createInstanceWithArguments( Sequence< Any >() );
     }
@@ -142,7 +142,7 @@ namespace sfx2
     }
 
 
-    Reference< XInterface > SAL_CALL SfxModelFactory::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception)
+    Reference< XInterface > SAL_CALL SfxModelFactory::createInstanceWithArguments( const Sequence< Any >& _rArguments )
     {
         ::comphelper::NamedValueCollection aArgs( _rArguments );
         const bool bEmbeddedObject = aArgs.getOrDefault( "EmbeddedObject", false );
@@ -179,17 +179,17 @@ namespace sfx2
         return xInstance;
     }
 
-    OUString SAL_CALL SfxModelFactory::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL SfxModelFactory::getImplementationName(  )
     {
         return m_sImplementationName;
     }
 
-    sal_Bool SAL_CALL SfxModelFactory::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL SfxModelFactory::supportsService( const OUString& _rServiceName )
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    Sequence< OUString > SAL_CALL SfxModelFactory::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL SfxModelFactory::getSupportedServiceNames(  )
     {
         return m_aServiceNames;
     }
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index 12ea42cdb316..22b21b853eef 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -123,32 +123,32 @@ namespace sfx2
         virtual void SAL_CALL release(  ) throw () override;
 
         // XUndoManager
-        virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL enterHiddenUndoContext(  ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL leaveUndoContext(  ) throw (css::util::InvalidStateException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL undo(  ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL redo(  ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isUndoPossible(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isRedoPossible(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCurrentUndoActionTitle(  ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCurrentRedoActionTitle(  ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clear(  ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL clearRedo(  ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL reset(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL enterUndoContext( const OUString& i_title ) override;
+        virtual void SAL_CALL enterHiddenUndoContext(  ) override;
+        virtual void SAL_CALL leaveUndoContext(  ) override;
+        virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) override;
+        virtual void SAL_CALL undo(  ) override;
+        virtual void SAL_CALL redo(  ) override;
+        virtual sal_Bool SAL_CALL isUndoPossible(  ) override;
+        virtual sal_Bool SAL_CALL isRedoPossible(  ) override;
+        virtual OUString SAL_CALL getCurrentUndoActionTitle(  ) override;
+        virtual OUString SAL_CALL getCurrentRedoActionTitle(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles(  ) override;
+        virtual void SAL_CALL clear(  ) override;
+        virtual void SAL_CALL clearRedo(  ) override;
+        virtual void SAL_CALL reset(  ) override;
+        virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override;
+        virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override;
 
         // XLockable, base of XUndoManager
-        virtual void SAL_CALL lock(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL unlock(  ) throw (css::util::NotLockedException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isLocked(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL lock(  ) override;
+        virtual void SAL_CALL unlock(  ) override;
+        virtual sal_Bool SAL_CALL isLocked(  ) override;
 
         // XChild, base of XUndoManager
-        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     private:
         std::unique_ptr< DocumentUndoManager_Impl > m_pImpl;
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 2a3a0cfbf01e..1eb32581546d 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -63,28 +63,22 @@ public:
                                virtual ~SfxEvents_Impl() override;
 
     //  --- XNameReplace ---
-    virtual void SAL_CALL       replaceByName( const OUString & aName, const css::uno::Any & aElement )
-                                    throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException,
-                                           css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL       replaceByName( const OUString & aName, const css::uno::Any & aElement ) override;
 
     //  --- XNameAccess ( parent of XNameReplace ) ---
-    virtual css::uno::Any SAL_CALL        getByName( const OUString& aName )
-                                    throw( css::container::NoSuchElementException, css::lang::WrappedTargetException,
-                                           css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL   hasByName( const OUString& aName ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL        getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL   hasByName( const OUString& aName ) override;
 
     //  --- XElementAccess ( parent of XNameAccess ) ---
-    virtual css::uno::Type SAL_CALL    getElementType() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL   hasElements() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Type SAL_CALL    getElementType() override;
+    virtual sal_Bool SAL_CALL   hasElements() override;
 
     // --- ::document::XEventListener ---
-    virtual void SAL_CALL       notifyEvent( const css::document::EventObject& aEvent )
-                                    throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL       notifyEvent( const css::document::EventObject& aEvent ) override;
 
     // --- ::lang::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;
 
     static SvxMacro*            ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, bool bNormalizeMacro );
     static void                 NormalizeMacro( const css::uno::Any& rIn, css::uno::Any& rOut, SfxObjectShell* pDoc );
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index bc2474d7141c..7f26a1399c7e 100644
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -30,8 +30,8 @@ class FilterOptionsContinuation : public comphelper::OInteraction< css::document
     css::uno::Sequence< css::beans::PropertyValue > rProperties;
 
 public:
-    virtual void SAL_CALL setFilterOptions( const css::uno::Sequence< css::beans::PropertyValue >& rProp ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getFilterOptions(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setFilterOptions( const css::uno::Sequence< css::beans::PropertyValue >& rProp ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getFilterOptions(  ) override;
 };
 
 class RequestFilterOptions : public ::cppu::WeakImplHelper< css::task::XInteractionRequest >
@@ -52,12 +52,10 @@ public:
         return m_xOptions->getFilterOptions();
     }
 
-    virtual css::uno::Any SAL_CALL getRequest()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getRequest() override;
 
     virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation >
-            > SAL_CALL getContinuations()
-        throw( css::uno::RuntimeException, std::exception ) override;
+            > SAL_CALL getContinuations() override;
 };
 
 #endif
diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx
index f65640891ee5..91800a551a33 100644
--- a/sfx2/source/inc/macroloader.hxx
+++ b/sfx2/source/inc/macroloader.hxx
@@ -53,45 +53,34 @@ class SfxMacroLoader : public cppu::WeakImplHelper<
 public:
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
-    SfxMacroLoader(const css::uno::Sequence< css::uno::Any >& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException);
+    SfxMacroLoader(const css::uno::Sequence< css::uno::Any >& aArguments);
 
-    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;
 
     /// @throws css::uno::RuntimeException
     /// @throws css::ucb::ContentCreationException
-    static ErrCode loadMacro( const OUString& aURL, css::uno::Any& rRetval, SfxObjectShell* pDoc ) throw( css::uno::RuntimeException, css::ucb::ContentCreationException, std::exception );
+    static ErrCode loadMacro( const OUString& aURL, css::uno::Any& rRetval, SfxObjectShell* pDoc );
 
     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 void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) override;
 
-    virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) override;
 
-    virtual css::uno::Any SAL_CALL dispatchWithReturnValue( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL dispatchWithReturnValue( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) 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 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 )
-        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 ) override;
 };
 
 #endif
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 77fc56ad7495..2e5937136fbe 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -51,8 +51,8 @@ public:
                                 const css::util::URL& rURL,
                                 SfxStateCache* pStateCache, const SfxSlot* pSlot );
 
-    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& Source ) 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& Source ) override;
 
     void                    Release();
     const css::frame::FeatureStateEvent& GetStatus() const { return aStatus;}
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index a612b82baef3..d526ccd14e1f 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -166,19 +166,19 @@ class LayoutManagerListener : public ::cppu::WeakImplHelper<
 
         //  XComponent
 
-        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
+        virtual void SAL_CALL dispose() override;
 
 
         //  XEventListener
 
-        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
 
         // XLayoutManagerEventListener
 
-        virtual void SAL_CALL layoutEvent( const css::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const css::uno::Any& aInfo ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL layoutEvent( const css::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const css::uno::Any& aInfo ) override;
 
     private:
         bool                                             m_bHasFrame;
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index aa94e1b8e07f..807b353b0d16 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -53,8 +53,6 @@ using namespace css;
     //  --- XNameReplace ---
 
 void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno::Any & rElement )
-                                throw( lang::IllegalArgumentException, container::NoSuchElementException,
-                                       lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -111,8 +109,6 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno::
 //  --- XNameAccess ---
 
 uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName )
-                                throw( container::NoSuchElementException, lang::WrappedTargetException,
-                                       uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -130,13 +126,13 @@ uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName )
 }
 
 
-uno::Sequence< OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL SfxEvents_Impl::getElementNames()
 {
     return maEventNames;
 }
 
 
-sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -156,14 +152,14 @@ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno
 
 //  --- XElementAccess ( parent of XNameAccess ) ---
 
-uno::Type SAL_CALL SfxEvents_Impl::getElementType() throw ( uno::RuntimeException, std::exception )
+uno::Type SAL_CALL SfxEvents_Impl::getElementType()
 {
     uno::Type aElementType = cppu::UnoType<uno::Sequence < beans::PropertyValue >>::get();
     return aElementType;
 }
 
 
-sal_Bool SAL_CALL SfxEvents_Impl::hasElements() throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxEvents_Impl::hasElements()
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -268,7 +264,7 @@ void SfxEvents_Impl::Execute( uno::Any& aEventData, const document::DocumentEven
 
 // --- ::document::XEventListener ---
 
-void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent )
 {
     ::osl::ClearableMutexGuard aGuard( maMutex );
 
@@ -298,7 +294,7 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent )
 
 // --- ::lang::XEventListener ---
 
-void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx
index c4a7ab946c44..b4db95ec412a 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -74,75 +74,57 @@ class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
 public:
     explicit SfxGlobalEvents_Impl(const css::uno::Reference < css::uno::XComponentContext >& rxContext);
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.comp.sfx2.GlobalEventBroadcaster");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.GlobalEventBroadcaster" };
         return aSeq;
     }
 
     // css.document.XEventBroadcaster
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() override;
 
-    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::document::XEventListener >& xListener)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::document::XEventListener >& xListener) override;
 
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener) override;
 
     // css.document.XDocumentEventBroadcaster
-    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) override;
+    virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& Listener ) override;
+    virtual void SAL_CALL notifyDocumentEvent( const OUString& EventName, const css::uno::Reference< css::frame::XController2 >& ViewController, const css::uno::Any& Supplement ) override;
 
     // css.document.XEventListener
-    virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) override;
 
     // css.document.XDocumentEventListener
-    virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) override;
 
     // css.container.XSet
-    virtual sal_Bool SAL_CALL has(const css::uno::Any& aElement)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL has(const css::uno::Any& aElement) override;
 
-    virtual void SAL_CALL insert(const css::uno::Any& aElement)
-        throw(css::lang::IllegalArgumentException  ,
-              css::container::ElementExistException,
-              css::uno::RuntimeException, std::exception           ) override;
+    virtual void SAL_CALL insert(const css::uno::Any& aElement) override;
 
-    virtual void SAL_CALL remove(const css::uno::Any& aElement)
-        throw(css::lang::IllegalArgumentException   ,
-              css::container::NoSuchElementException,
-              css::uno::RuntimeException, std::exception            ) override;
+    virtual void SAL_CALL remove(const css::uno::Any& aElement) override;
 
     // css.container.XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // css.container.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;
 
     // css.lang.XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
 private:
 
@@ -170,7 +152,6 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const uno::Reference < uno::XCompone
 }
 
 uno::Reference< container::XNameReplace > SAL_CALL SfxGlobalEvents_Impl::getEvents()
-    throw(uno::RuntimeException, std::exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -180,7 +161,6 @@ uno::Reference< container::XNameReplace > SAL_CALL SfxGlobalEvents_Impl::getEven
 
 
 void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const uno::Reference< document::XEventListener >& xListener)
-    throw(uno::RuntimeException, std::exception)
 {
     // container is threadsafe
     m_aLegacyListeners.addInterface(xListener);
@@ -188,7 +168,6 @@ void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const uno::Reference< docum
 
 
 void SAL_CALL SfxGlobalEvents_Impl::removeEventListener(const uno::Reference< document::XEventListener >& xListener)
-    throw(uno::RuntimeException, std::exception)
 {
     // container is threadsafe
     m_aLegacyListeners.removeInterface(xListener);
@@ -196,14 +175,12 @@ void SAL_CALL SfxGlobalEvents_Impl::removeEventListener(const uno::Reference< do
 
 
 void SAL_CALL SfxGlobalEvents_Impl::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& Listener )
-    throw(uno::RuntimeException, std::exception)
 {
     m_aDocumentListeners.addInterface( Listener );
 }
 
 
 void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& Listener )
-    throw(uno::RuntimeException, std::exception)
 {
     m_aDocumentListeners.removeInterface( Listener );
 }
@@ -211,7 +188,6 @@ void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Refe
 
 void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_EventName*/,
         const uno::Reference< frame::XController2 >& /*_ViewController*/, const uno::Any& /*_Supplement*/ )
-        throw (lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException, std::exception)
 {
     // we're a multiplexer only, no chance to generate artificial events here
     throw lang::NoSupportException(OUString(), *this);
@@ -219,7 +195,6 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_Even
 
 
 void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const document::EventObject& aEvent)
-    throw(uno::RuntimeException, std::exception)
 {
     document::DocumentEvent aDocEvent(aEvent.Source, aEvent.EventName, nullptr, uno::Any());
     implts_notifyJobExecution(aEvent);
@@ -229,7 +204,6 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const document::EventObject& aEv
 
 
 void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::DocumentEvent& Event )
-    throw (uno::RuntimeException, std::exception)
 {
     implts_notifyJobExecution(document::EventObject(Event.Source, Event.EventName));
     implts_checkAndExecuteEventBindings(Event);
@@ -238,7 +212,6 @@ void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::Docume
 
 
 void SAL_CALL SfxGlobalEvents_Impl::disposing(const lang::EventObject& aEvent)
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Reference< frame::XModel > xDoc(aEvent.Source, uno::UNO_QUERY);
 
@@ -253,7 +226,6 @@ void SAL_CALL SfxGlobalEvents_Impl::disposing(const lang::EventObject& aEvent)
 
 
 sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const uno::Any& aElement)
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< frame::XModel > xDoc;
     aElement >>= xDoc;
@@ -273,9 +245,6 @@ sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const uno::Any& aElement)
 
 
 void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement )
-    throw (lang::IllegalArgumentException  ,
-           container::ElementExistException,
-           uno::RuntimeException, std::exception           )
 {
     uno::Reference< frame::XModel > xDoc;
     aElement >>= xDoc;
@@ -310,9 +279,6 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement )
 
 
 void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement )
-    throw (lang::IllegalArgumentException   ,
-           container::NoSuchElementException,
-           uno::RuntimeException, std::exception            )
 {
     uno::Reference< frame::XModel > xDoc;
     aElement >>= xDoc;
@@ -347,7 +313,6 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement )
 
 
 uno::Reference< container::XEnumeration > SAL_CALL SfxGlobalEvents_Impl::createEnumeration()
-    throw (uno::RuntimeException, std::exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -367,14 +332,12 @@ uno::Reference< container::XEnumeration > SAL_CALL SfxGlobalEvents_Impl::createE
 
 
 uno::Type SAL_CALL SfxGlobalEvents_Impl::getElementType()
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<frame::XModel>::get();
 }
 
 
 sal_Bool SAL_CALL SfxGlobalEvents_Impl::hasElements()
-    throw (uno::RuntimeException, std::exception)
 {
     // SAFE ->
     ::osl::ResettableMutexGuard aLock(m_aLock);
diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx
index 10b01dc07c8f..6cb4dd4a87a5 100644
--- a/sfx2/source/sidebar/Accessible.cxx
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -43,7 +43,6 @@ void SAL_CALL Accessible::disposing()
 }
 
 Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return mxContext;
 }
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 27cd449d2c7c..7a1ac1f588b6 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -63,8 +63,7 @@ namespace
             if (mxFrame.is())
                 mxFrame->removeFrameActionListener(this);
         }
-        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
         {
             (void)rEvent;
 
@@ -72,8 +71,7 @@ namespace
             mrControllerItem.ResetFrame();
             mxFrame = nullptr;
         }
-        virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent) override
         {
             SolarMutexGuard g;
             if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED)
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 840d7531e1c5..4e275a5d1ab5 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -262,7 +262,6 @@ void SAL_CALL SidebarController::disposing()
 }
 
 void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // Update to the requested new context asynchronously to avoid
     // subtle errors caused by SFX2 which in rare cases can not
@@ -283,19 +282,16 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex
 }
 
 void SAL_CALL SidebarController::disposing (const css::lang::EventObject& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     dispose();
 }
 
 void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChangeEvent& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     maPropertyChangeForwarder.RequestCall();
 }
 
 void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     bool bIsReadWrite (true);
     if (rEvent.IsEnabled)
@@ -316,7 +312,6 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv
 }
 
 void SAL_CALL SidebarController::requestLayout()
-    throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nMinimalWidth = 0;
     if (mpCurrentDeck && !mpCurrentDeck->isDisposed())
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 0e90e95f6f96..8c8db52d0731 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -79,7 +79,6 @@ SidebarPanelBase::~SidebarPanelBase()
 }
 
 void SAL_CALL SidebarPanelBase::disposing()
-    throw (css::uno::RuntimeException)
 {
     mpControl.disposeAndClear();
 
@@ -96,7 +95,6 @@ void SAL_CALL SidebarPanelBase::disposing()
 // XContextChangeEventListener
 void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
     const ui::ContextChangeEventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     IContextChangeReceiver* pContextChangeReceiver
         = dynamic_cast<IContextChangeReceiver*>(mpControl.get());
@@ -111,7 +109,6 @@ void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
 
 void SAL_CALL SidebarPanelBase::disposing (
     const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -120,32 +117,27 @@ void SAL_CALL SidebarPanelBase::disposing (
 }
 
 css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return mxFrame;
 }
 
 ::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return msResourceURL;
 }
 
 sal_Int16 SAL_CALL SidebarPanelBase::getType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return ui::UIElementType::TOOLPANEL;
 }
 
 Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(this));
 }
 
 Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessible (
     const Reference<accessibility::XAccessible>& rxParentAccessible)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rxParentAccessible;
 
@@ -154,7 +146,6 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl
 }
 
 Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (mpControl != nullptr)
         return Reference<awt::XWindow>(
@@ -165,7 +156,6 @@ Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow()
 }
 
 ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWidth)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (maLayoutSize.Minimum >= 0)
         return maLayoutSize;
@@ -191,7 +181,7 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
     return ui::LayoutSize(0,0,0);
 }
 
-sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth ()
 {
     if (isLayoutEnabled(mpControl))
     {
@@ -203,7 +193,6 @@ sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(css::uno::RuntimeE
 }
 
 void SAL_CALL SidebarPanelBase::updateModel(const css::uno::Reference<css::frame::XModel>& xModel)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SidebarModelUpdate* pModelUpdate = dynamic_cast<SidebarModelUpdate*>(mpControl.get());
     if (!pModelUpdate)
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 1b96d23c7879..097e4df762c2 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -378,7 +378,6 @@ Reference<beans::XPropertySet> Theme::GetPropertySet()
 }
 
 Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference<beans::XPropertySetInfo>(this);
 }
@@ -386,9 +385,6 @@ Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo()
 void SAL_CALL Theme::setPropertyValue (
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Any& rValue)
-    throw (css::beans::UnknownPropertyException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
@@ -431,9 +427,6 @@ void SAL_CALL Theme::setPropertyValue (
 
 Any SAL_CALL Theme::getPropertyValue (
     const ::rtl::OUString& rsPropertyName)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
@@ -451,9 +444,6 @@ Any SAL_CALL Theme::getPropertyValue (
 void SAL_CALL Theme::addPropertyChangeListener(
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
@@ -476,9 +466,6 @@ void SAL_CALL Theme::addPropertyChangeListener(
 void SAL_CALL Theme::removePropertyChangeListener(
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
@@ -511,9 +498,6 @@ void SAL_CALL Theme::removePropertyChangeListener(
 void SAL_CALL Theme::addVetoableChangeListener(
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
@@ -536,9 +520,6 @@ void SAL_CALL Theme::addVetoableChangeListener(
 void SAL_CALL Theme::removeVetoableChangeListener(
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
@@ -568,7 +549,6 @@ void SAL_CALL Theme::removeVetoableChangeListener(
 }
 
 css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties()
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::std::vector<beans::Property> aProperties;
 
@@ -593,8 +573,6 @@ css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties()
 }
 
 beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName)
-    throw(css::beans::UnknownPropertyException,
-        css::uno::RuntimeException, std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
@@ -614,7 +592,6 @@ beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsProp
 }
 
 sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
diff --git a/sfx2/source/sidebar/UnoDeck.cxx b/sfx2/source/sidebar/UnoDeck.cxx
index 0c2b2cf1a1d3..facddd25fa65 100644
--- a/sfx2/source/sidebar/UnoDeck.cxx
+++ b/sfx2/source/sidebar/UnoDeck.cxx
@@ -34,7 +34,6 @@ SidebarController* SfxUnoDeck::getSidebarController()
 }
 
 OUString SAL_CALL SfxUnoDeck::getId()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -42,7 +41,6 @@ OUString SAL_CALL SfxUnoDeck::getId()
 }
 
 OUString SAL_CALL  SfxUnoDeck::getTitle()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -60,7 +58,6 @@ OUString SAL_CALL  SfxUnoDeck::getTitle()
 }
 
 void SAL_CALL SfxUnoDeck::setTitle( const OUString& newTitle )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -83,7 +80,6 @@ void SAL_CALL SfxUnoDeck::setTitle( const OUString& newTitle )
 }
 
 sal_Bool SAL_CALL SfxUnoDeck::isActive()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -93,7 +89,6 @@ sal_Bool SAL_CALL SfxUnoDeck::isActive()
 
 
 void SAL_CALL SfxUnoDeck::activate( const sal_Bool bActivate )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -109,7 +104,6 @@ void SAL_CALL SfxUnoDeck::activate( const sal_Bool bActivate )
 }
 
 uno::Reference<ui::XPanels> SAL_CALL SfxUnoDeck::getPanels()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -118,7 +112,6 @@ uno::Reference<ui::XPanels> SAL_CALL SfxUnoDeck::getPanels()
 }
 
 sal_Int32 SAL_CALL SfxUnoDeck::getOrderIndex()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -128,7 +121,6 @@ sal_Int32 SAL_CALL SfxUnoDeck::getOrderIndex()
 }
 
 void SAL_CALL SfxUnoDeck::setOrderIndex( const sal_Int32 newOrderIndex )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -144,7 +136,6 @@ void SAL_CALL SfxUnoDeck::setOrderIndex( const sal_Int32 newOrderIndex )
 }
 
 void SAL_CALL SfxUnoDeck::moveFirst()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -168,7 +159,6 @@ void SAL_CALL SfxUnoDeck::moveFirst()
 }
 
 void SAL_CALL SfxUnoDeck::moveLast()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -192,7 +182,6 @@ void SAL_CALL SfxUnoDeck::moveLast()
 }
 
 void SAL_CALL SfxUnoDeck::moveUp()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -225,7 +214,6 @@ void SAL_CALL SfxUnoDeck::moveUp()
 }
 
 void SAL_CALL SfxUnoDeck::moveDown()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
diff --git a/sfx2/source/sidebar/UnoDecks.cxx b/sfx2/source/sidebar/UnoDecks.cxx
index a26568f3b6ab..b8bee8e300e1 100644
--- a/sfx2/source/sidebar/UnoDecks.cxx
+++ b/sfx2/source/sidebar/UnoDecks.cxx
@@ -32,9 +32,6 @@ SidebarController* SfxUnoDecks::getSidebarController()
 // XNameAccess
 
 uno::Any SAL_CALL SfxUnoDecks::getByName( const OUString& aName )
-                                throw(container::NoSuchElementException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -53,7 +50,6 @@ uno::Any SAL_CALL SfxUnoDecks::getByName( const OUString& aName )
 
 
 uno::Sequence< OUString > SAL_CALL SfxUnoDecks::getElementNames()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -88,7 +84,6 @@ uno::Sequence< OUString > SAL_CALL SfxUnoDecks::getElementNames()
 }
 
 sal_Bool SAL_CALL SfxUnoDecks::hasByName( const OUString& aName )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -121,7 +116,7 @@ sal_Bool SAL_CALL SfxUnoDecks::hasByName( const OUString& aName )
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL SfxUnoDecks::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SfxUnoDecks::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -130,9 +125,6 @@ sal_Int32 SAL_CALL SfxUnoDecks::getCount() throw(uno::RuntimeException, std::exc
 }
 
 uno::Any SAL_CALL SfxUnoDecks::getByIndex( sal_Int32 Index )
-                                throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -150,14 +142,13 @@ uno::Any SAL_CALL SfxUnoDecks::getByIndex( sal_Int32 Index )
 
 // XElementAccess
 uno::Type SAL_CALL SfxUnoDecks::getElementType()
-                                throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
     return uno::Type();
 }
 
-sal_Bool SAL_CALL SfxUnoDecks::hasElements() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxUnoDecks::hasElements()
 {
     SolarMutexGuard aGuard;
 
diff --git a/sfx2/source/sidebar/UnoPanel.cxx b/sfx2/source/sidebar/UnoPanel.cxx
index e696e32b0b88..ac46f80a79e1 100644
--- a/sfx2/source/sidebar/UnoPanel.cxx
+++ b/sfx2/source/sidebar/UnoPanel.cxx
@@ -42,7 +42,6 @@ SidebarController* SfxUnoPanel::getSidebarController()
 }
 
 OUString SAL_CALL SfxUnoPanel::getId()
-                               throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -50,7 +49,6 @@ OUString SAL_CALL SfxUnoPanel::getId()
 }
 
 OUString SAL_CALL  SfxUnoPanel::getTitle()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -59,7 +57,6 @@ OUString SAL_CALL  SfxUnoPanel::getTitle()
 }
 
 void SAL_CALL SfxUnoPanel::setTitle( const OUString& newTitle )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -76,7 +73,6 @@ void SAL_CALL SfxUnoPanel::setTitle( const OUString& newTitle )
 }
 
 sal_Bool SAL_CALL SfxUnoPanel::isExpanded()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -85,7 +81,6 @@ sal_Bool SAL_CALL SfxUnoPanel::isExpanded()
 
 
 void SAL_CALL SfxUnoPanel::expand( const sal_Bool bCollapseOther )
-                                throw(uno::RuntimeException, std::exception)
 {
 
     SolarMutexGuard aGuard;
@@ -111,7 +106,6 @@ void SAL_CALL SfxUnoPanel::expand( const sal_Bool bCollapseOther )
 }
 
 void SAL_CALL SfxUnoPanel::collapse()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -121,7 +115,6 @@ void SAL_CALL SfxUnoPanel::collapse()
 }
 
 uno::Reference<awt::XWindow> SAL_CALL SfxUnoPanel::getDialog()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -130,7 +123,6 @@ uno::Reference<awt::XWindow> SAL_CALL SfxUnoPanel::getDialog()
 
 
 sal_Int32 SAL_CALL SfxUnoPanel::getOrderIndex()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -140,7 +132,6 @@ sal_Int32 SAL_CALL SfxUnoPanel::getOrderIndex()
 }
 
 void SAL_CALL SfxUnoPanel::setOrderIndex( const sal_Int32 newOrderIndex )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -156,7 +147,6 @@ void SAL_CALL SfxUnoPanel::setOrderIndex( const sal_Int32 newOrderIndex )
 }
 
 void SAL_CALL SfxUnoPanel::moveFirst()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -180,7 +170,6 @@ void SAL_CALL SfxUnoPanel::moveFirst()
 }
 
 void SAL_CALL SfxUnoPanel::moveLast()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -204,7 +193,6 @@ void SAL_CALL SfxUnoPanel::moveLast()
 }
 
 void SAL_CALL SfxUnoPanel::moveUp()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -237,7 +225,6 @@ void SAL_CALL SfxUnoPanel::moveUp()
 }
 
 void SAL_CALL SfxUnoPanel::moveDown()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
diff --git a/sfx2/source/sidebar/UnoPanels.cxx b/sfx2/source/sidebar/UnoPanels.cxx
index 22cc780e56b6..dd47d3f95d1f 100644
--- a/sfx2/source/sidebar/UnoPanels.cxx
+++ b/sfx2/source/sidebar/UnoPanels.cxx
@@ -35,7 +35,6 @@ SidebarController* SfxUnoPanels::getSidebarController()
 }
 
 OUString SAL_CALL SfxUnoPanels::getDeckId()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -45,9 +44,6 @@ OUString SAL_CALL SfxUnoPanels::getDeckId()
 // XNameAccess
 
 uno::Any SAL_CALL SfxUnoPanels::getByName( const OUString& aName )
-                                throw(container::NoSuchElementException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -66,7 +62,6 @@ uno::Any SAL_CALL SfxUnoPanels::getByName( const OUString& aName )
 
 
 uno::Sequence< OUString > SAL_CALL SfxUnoPanels::getElementNames()
-                                throw(uno::RuntimeException, std::exception)
 {
 
     SolarMutexGuard aGuard;
@@ -101,7 +96,6 @@ uno::Sequence< OUString > SAL_CALL SfxUnoPanels::getElementNames()
 }
 
 sal_Bool SAL_CALL SfxUnoPanels::hasByName( const OUString& aName )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -132,7 +126,7 @@ sal_Bool SAL_CALL SfxUnoPanels::hasByName( const OUString& aName )
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL SfxUnoPanels::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SfxUnoPanels::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -141,9 +135,6 @@ sal_Int32 SAL_CALL SfxUnoPanels::getCount() throw(uno::RuntimeException, std::ex
 }
 
 uno::Any SAL_CALL SfxUnoPanels::getByIndex( sal_Int32 Index )
-                                throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -162,14 +153,13 @@ uno::Any SAL_CALL SfxUnoPanels::getByIndex( sal_Int32 Index )
 
 // XElementAccess
 uno::Type SAL_CALL SfxUnoPanels::getElementType()
-                                throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
     return uno::Type();
 }
 
-sal_Bool SAL_CALL SfxUnoPanels::hasElements() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxUnoPanels::hasElements()
 {
     SolarMutexGuard aGuard;
 
diff --git a/sfx2/source/sidebar/UnoSidebar.cxx b/sfx2/source/sidebar/UnoSidebar.cxx
index 6ea75563d16c..abf4d420f975 100644
--- a/sfx2/source/sidebar/UnoSidebar.cxx
+++ b/sfx2/source/sidebar/UnoSidebar.cxx
@@ -36,7 +36,6 @@ SidebarController* SfxUnoSidebar::getSidebarController()
 }
 
 void SAL_CALL SfxUnoSidebar::showDecks ( const sal_Bool bVisible )
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -52,7 +51,6 @@ void SAL_CALL SfxUnoSidebar::showDecks ( const sal_Bool bVisible )
 }
 
 void SAL_CALL SfxUnoSidebar::setVisible ( const sal_Bool bVisible )
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -69,7 +67,6 @@ void SAL_CALL SfxUnoSidebar::setVisible ( const sal_Bool bVisible )
 }
 
 sal_Bool SAL_CALL SfxUnoSidebar::isVisible()
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -79,7 +76,6 @@ sal_Bool SAL_CALL SfxUnoSidebar::isVisible()
 }
 
 uno::Reference<frame::XFrame> SAL_CALL SfxUnoSidebar::getFrame()
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -90,7 +86,6 @@ uno::Reference<frame::XFrame> SAL_CALL SfxUnoSidebar::getFrame()
 }
 
 uno::Reference<ui::XDecks> SAL_CALL SfxUnoSidebar::getDecks()
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -99,7 +94,6 @@ uno::Reference<ui::XDecks> SAL_CALL SfxUnoSidebar::getDecks()
 }
 
 uno::Reference<ui::XSidebar> SAL_CALL SfxUnoSidebar::getSidebar()
-                            throw (uno::RuntimeException, std::exception)
 {
     return getSidebarController();
 }
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 87b2102a7f88..db33fb780cb7 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -185,7 +185,6 @@ void SAL_CALL SfxStatusBarControl::release() throw()
 
 // XStatusListener
 void SAL_CALL SfxStatusBarControl::statusChanged( const frame::FeatureStateEvent& rEvent )
-throw ( css::uno::RuntimeException, std::exception )
 {
     SfxViewFrame* pViewFrame = nullptr;
     uno::Reference < frame::XController > xController;
@@ -293,7 +292,6 @@ throw ( css::uno::RuntimeException, std::exception )
 
 sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonDown(
     const awt::MouseEvent& rMouseEvent )
-throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ::Point aPos( rMouseEvent.X, rMouseEvent.Y );
@@ -310,7 +308,6 @@ throw ( uno::RuntimeException, std::exception )
 
 sal_Bool SAL_CALL SfxStatusBarControl::mouseMove(
     const awt::MouseEvent& rMouseEvent )
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ::Point aPos( rMouseEvent.X, rMouseEvent.Y );
@@ -326,7 +323,6 @@ throw (uno::RuntimeException, std::exception)
 
 sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonUp(
     const ::awt::MouseEvent& rMouseEvent )
-throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ::Point aPos( rMouseEvent.X, rMouseEvent.Y );
@@ -345,7 +341,6 @@ void SAL_CALL SfxStatusBarControl::command(
     ::sal_Int32 nCommand,
     sal_Bool /*bMouseEvent*/,
     const css::uno::Any& /*aData*/ )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ::Point aPos( rPos.X, rPos.Y );
@@ -359,7 +354,6 @@ void SAL_CALL SfxStatusBarControl::paint(
     const uno::Reference< awt::XGraphics >& xGraphics,
     const awt::Rectangle& rOutputRectangle,
     ::sal_Int32 nStyle )
-throw ( ::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -374,7 +368,6 @@ throw ( ::uno::RuntimeException, std::exception )
 
 
 void SAL_CALL SfxStatusBarControl::click( const awt::Point& )
-throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     Click();
@@ -382,7 +375,6 @@ throw ( uno::RuntimeException, std::exception )
 
 
 void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& )
-throw ( uno::RuntimeException, std::exception )
 {
 }
 
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 15df10869efd..b908b6f932f6 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -242,7 +242,7 @@ unsigned short SfxToolBoxControl::GetSlotId() const
 }
 
 
-void SAL_CALL SfxToolBoxControl::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SfxToolBoxControl::dispose()
 {
     if ( m_bDisposed )
         return;
@@ -421,7 +421,6 @@ void SfxToolBoxControl::Dispatch( const OUString& aCommand, css::uno::Sequence<
 
 // XStatusListener
 void SAL_CALL SfxToolBoxControl::statusChanged( const FeatureStateEvent& rEvent )
-throw ( css::uno::RuntimeException, std::exception )
 {
     SfxViewFrame* pViewFrame = nullptr;
     Reference < XController > xController;
@@ -539,25 +538,25 @@ throw ( css::uno::RuntimeException, std::exception )
 }
 
 // XToolbarController
-void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier )
 {
     SolarMutexGuard aGuard;
     Select( (sal_uInt16)KeyModifier );
 }
 
-void SAL_CALL SfxToolBoxControl::click() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SfxToolBoxControl::click()
 {
     SolarMutexGuard aGuard;
     Click();
 }
 
-void SAL_CALL SfxToolBoxControl::doubleClick() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SfxToolBoxControl::doubleClick()
 {
     SolarMutexGuard aGuard;
     DoubleClick();
 }
 
-Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() throw (css::uno::RuntimeException, std::exception)
+Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow()
 {
     SolarMutexGuard aGuard;
     VclPtr<vcl::Window> pWindow = CreatePopupWindow();
@@ -567,7 +566,7 @@ Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() t
         return Reference< css::awt::XWindow >();
 }
 
-Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( const Reference< css::awt::XWindow >& rParent ) throw (css::uno::RuntimeException, std::exception)
+Reference< css::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( const Reference< css::awt::XWindow >& rParent )
 {
     SolarMutexGuard aGuard;
     return VCLUnoHelper::GetInterface( CreateItemWindow( VCLUnoHelper::GetWindow( rParent )));
@@ -706,8 +705,7 @@ class SfxFrameStatusListener : public svt::FrameStatusListener
                                 SfxPopupWindow* pCallee );
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event )
-            throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
     private:
         VclPtr<SfxPopupWindow> m_pCallee;
@@ -723,7 +721,6 @@ SfxFrameStatusListener::SfxFrameStatusListener(
 
 // XStatusListener
 void SAL_CALL SfxFrameStatusListener::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-throw ( css::uno::RuntimeException, std::exception )
 {
     m_pCallee->statusChanged( rEvent );
 }
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx
index 5abbff30be45..0c736331e030 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -64,18 +64,18 @@ public:
     explicit ClassificationCategoriesController(const uno::Reference<uno::XComponentContext>& rContext);
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override;
-    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
+    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    void SAL_CALL dispose() throw (uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose() override;
 
     // XToolbarController
-    uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) override;
+    uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) override;
 
     // XStatusListener
-    void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception) override;
+    void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) override;
 
     void removeEntries();
 };
@@ -119,17 +119,17 @@ ClassificationCategoriesController::ClassificationCategoriesController(const uno
 
 }
 
-OUString ClassificationCategoriesController::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString ClassificationCategoriesController::getImplementationName()
 {
     return OUString("com.sun.star.comp.sfx2.ClassificationCategoriesController");
 }
 
-sal_Bool ClassificationCategoriesController::supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception)
+sal_Bool ClassificationCategoriesController::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence<OUString> ClassificationCategoriesController::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence<OUString> ClassificationCategoriesController::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aServices
     {
@@ -138,7 +138,7 @@ uno::Sequence<OUString> ClassificationCategoriesController::getSupportedServiceN
     return aServices;
 }
 
-void ClassificationCategoriesController::dispose() throw (uno::RuntimeException, std::exception)
+void ClassificationCategoriesController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -148,7 +148,7 @@ void ClassificationCategoriesController::dispose() throw (uno::RuntimeException,
     m_xListener->dispose();
 }
 
-uno::Reference<awt::XWindow> ClassificationCategoriesController::createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception)
+uno::Reference<awt::XWindow> ClassificationCategoriesController::createItemWindow(const uno::Reference<awt::XWindow>& rParent)
 {
     VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow(rParent);
     auto pToolbar = dynamic_cast<ToolBox*>(pParent.get());
@@ -178,7 +178,7 @@ IMPL_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, vo
     comphelper::dispatchCommand(".uno:ClassificationApply", aPropertyValues);
 }
 
-void ClassificationCategoriesController::statusChanged(const frame::FeatureStateEvent& /*rEvent*/) throw (uno::RuntimeException, std::exception)
+void ClassificationCategoriesController::statusChanged(const frame::FeatureStateEvent& /*rEvent*/)
 {
     if (!m_pClassification)
         return;
diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index 33323d64be96..63f06265f300 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -119,37 +119,34 @@ public:
 
     SfxClassificationParser();
 
-    void SAL_CALL startDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL startDocument() override;
 
-    void SAL_CALL endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL endDocument() override;
 
-    void SAL_CALL startElement(const OUString& aName, const uno::Reference<xml::sax::XAttributeList>& xAttribs)
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL startElement(const OUString& aName, const uno::Reference<xml::sax::XAttributeList>& xAttribs) override;
 
-    void SAL_CALL endElement(const OUString& aName) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL endElement(const OUString& aName) override;
 
-    void SAL_CALL characters(const OUString& aChars) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL characters(const OUString& aChars) override;
 
-    void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
 
-    void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) override;
 
-    void SAL_CALL setDocumentLocator(const uno::Reference<xml::sax::XLocator>& xLocator)
-    throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL setDocumentLocator(const uno::Reference<xml::sax::XLocator>& xLocator) override;
 };
 
 SfxClassificationParser::SfxClassificationParser() = default;
 
-void SAL_CALL SfxClassificationParser::startDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL SfxClassificationParser::startDocument()
 {
 }
 
-void SAL_CALL SfxClassificationParser::endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL SfxClassificationParser::endDocument()
 {
 }
 
 void SAL_CALL SfxClassificationParser::startElement(const OUString& rName, const uno::Reference<xml::sax::XAttributeList>& xAttribs)
-throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if (rName == "baf:PolicyAuthorityName")
     {
@@ -235,7 +232,7 @@ throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
     }
 }
 
-void SAL_CALL SfxClassificationParser::endElement(const OUString& rName) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL SfxClassificationParser::endElement(const OUString& rName)
 {
     if (rName == "baf:PolicyAuthorityName")
         m_bInPolicyAuthorityName = false;
@@ -282,7 +279,7 @@ void SAL_CALL SfxClassificationParser::endElement(const OUString& rName) throw (
     }
 }
 
-void SAL_CALL SfxClassificationParser::characters(const OUString& rChars) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL SfxClassificationParser::characters(const OUString& rChars)
 {
     if (m_bInPolicyAuthorityName)
         m_aPolicyAuthorityName += rChars;
@@ -300,15 +297,15 @@ void SAL_CALL SfxClassificationParser::characters(const OUString& rChars) throw
         m_aValue += rChars;
 }
 
-void SAL_CALL SfxClassificationParser::ignorableWhitespace(const OUString& /*rWhitespace*/) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL SfxClassificationParser::ignorableWhitespace(const OUString& /*rWhitespace*/)
 {
 }
 
-void SAL_CALL SfxClassificationParser::processingInstruction(const OUString& /*rTarget*/, const OUString& /*rData*/) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL SfxClassificationParser::processingInstruction(const OUString& /*rTarget*/, const OUString& /*rData*/)
 {
 }
 
-void SAL_CALL SfxClassificationParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& /*xLocator*/) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL SfxClassificationParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& /*xLocator*/)
 {
 }
 
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index ffdbfda5f78f..16d1d04a351e 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -103,20 +103,17 @@ class SfxFrameLoader_Impl : public ::cppu::WeakImplHelper< css::frame::XSynchron
 public:
     explicit SfxFrameLoader_Impl( const css::uno::Reference < css::uno::XComponentContext >& _rxContext );
 
-    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;
 
 
     // XSynchronousFrameLoader
 
-    virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs, const css::uno::Reference< css::frame::XFrame >& _rxFrame ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs, const css::uno::Reference< css::frame::XFrame >& _rxFrame ) override;
+    virtual void SAL_CALL cancel() override;
 
 protected:
     virtual                 ~SfxFrameLoader_Impl() override;
@@ -609,7 +606,6 @@ Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Re
 
 sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rArgs,
                                              const Reference< XFrame >& _rTargetFrame )
-    throw( RuntimeException, std::exception )
 {
     ENSURE_OR_THROW( _rTargetFrame.is(), "illegal NULL frame" );
 
@@ -753,24 +749,24 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
     return bLoadSuccess;
 }
 
-void SfxFrameLoader_Impl::cancel() throw( RuntimeException, std::exception )
+void SfxFrameLoader_Impl::cancel()
 {
 }
 
 /* XServiceInfo */
-OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName()
 {
     return OUString("com.sun.star.comp.office.FrameLoader");
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames()
 {
     Sequence< OUString > seqServiceNames( 2 );
     seqServiceNames.getArray() [0] = "com.sun.star.frame.SynchronousFrameLoader";
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index f216e55c38c5..0ca24239445b 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -125,43 +125,42 @@ public:
     uno::Reference < frame::XFrame > GetFrame() const;
 
     // XEmbeddedClient
-    virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL saveObject() override;
+    virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) override;
 
     // XInplaceClient
-    virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL canInplaceActivate() override;
+    virtual void SAL_CALL activatingInplace() override;
+    virtual void SAL_CALL activatingUI() override;
+    virtual void SAL_CALL deactivatedInplace() override;
+    virtual void SAL_CALL deactivatedUI() override;
+    virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() override;
+    virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() override;
+    virtual awt::Rectangle SAL_CALL getPlacement() override;
+    virtual awt::Rectangle SAL_CALL getClipRectangle() override;
+    virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) override;
+    virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) override;
+    virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) override;
 
     // XComponentSupplier
-    virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException, std::exception ) override;
+    virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() override;
 
     // XWindowSupplier
-    virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException, std::exception ) override;
+    virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() override;
 
     // document::XEventListener
-    virtual void SAL_CALL       notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL       notifyEvent( const document::EventObject& aEvent ) override;
 
     // XStateChangeListener
-    virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+    virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 };
 
 void SAL_CALL SfxInPlaceClient_Impl::changingState(
     const css::lang::EventObject& /*aEvent*/,
     ::sal_Int32 /*nOldState*/,
     ::sal_Int32 /*nNewState*/ )
-throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -169,7 +168,6 @@ void SAL_CALL SfxInPlaceClient_Impl::stateChanged(
     const css::lang::EventObject& /*aEvent*/,
     ::sal_Int32 nOldState,
     ::sal_Int32 nNewState )
-throw (css::uno::RuntimeException, std::exception)
 {
     if ( m_pClient && nOldState != embed::EmbedStates::LOADED && nNewState == embed::EmbedStates::RUNNING )
     {
@@ -181,7 +179,7 @@ throw (css::uno::RuntimeException, std::exception)
     }
 }
 
-void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& aEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -194,7 +192,6 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a
 }
 
 void SAL_CALL SfxInPlaceClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ )
-throw (css::uno::RuntimeException, std::exception)
 {
     DELETEZ( m_pClient );
 }
@@ -209,9 +206,6 @@ uno::Reference < frame::XFrame > SfxInPlaceClient_Impl::GetFrame() const
 }
 
 void SAL_CALL SfxInPlaceClient_Impl::saveObject()
-    throw ( embed::ObjectSaveVetoException,
-            uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     if ( !m_bStoreObject )
         // client wants to discard the object (usually it means the container document is closed while an object is active
@@ -305,8 +299,6 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
 
 
 void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible )
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -321,7 +313,6 @@ void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible )
 // XInplaceClient
 
 sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate()
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( !m_xObject.is() )
         throw uno::RuntimeException();
@@ -335,8 +326,6 @@ sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate()
 
 
 void SAL_CALL SfxInPlaceClient_Impl::activatingInplace()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
@@ -344,8 +333,6 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingInplace()
 
 
 void SAL_CALL SfxInPlaceClient_Impl::activatingUI()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
@@ -357,8 +344,6 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingUI()
 
 
 void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
@@ -366,8 +351,6 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace()
 
 
 void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
@@ -378,8 +361,6 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI()
 
 
 uno::Reference< css::frame::XLayoutManager > SAL_CALL SfxInPlaceClient_Impl::getLayoutManager()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     uno::Reference < beans::XPropertySet > xFrame( GetFrame(), uno::UNO_QUERY );
     if ( !xFrame.is() )
@@ -401,16 +382,12 @@ uno::Reference< css::frame::XLayoutManager > SAL_CALL SfxInPlaceClient_Impl::get
 
 
 uno::Reference< frame::XDispatchProvider > SAL_CALL SfxInPlaceClient_Impl::getInplaceDispatchProvider()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     return uno::Reference < frame::XDispatchProvider >( GetFrame(), uno::UNO_QUERY_THROW );
 }
 
 
 awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
@@ -426,8 +403,6 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement()
 
 
 awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
@@ -443,8 +418,6 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle()
 
 
 void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ )
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
@@ -454,8 +427,6 @@ void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence<
 
 
 void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/ )
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
@@ -463,9 +434,6 @@ void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/
 
 
 void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPosRect )
-    throw ( embed::WrongStateException,
-            uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     uno::Reference< embed::XInplaceObject > xInplace( m_xObject, uno::UNO_QUERY );
     if ( !xInplace.is() || !m_pClient || !m_pClient->GetEditWin() || !m_pClient->GetViewShell() )
@@ -515,7 +483,6 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPo
 // XComponentSupplier
 
 uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent()
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetViewShell() )
         throw uno::RuntimeException();
@@ -536,7 +503,6 @@ uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent(
 // XWindowSupplier
 
 uno::Reference< awt::XWindow > SAL_CALL SfxInPlaceClient_Impl::getWindow()
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( !m_pClient || !m_pClient->GetEditWin() )
         throw uno::RuntimeException();
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index c68a851adb4f..8c273a78e69e 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -213,16 +213,16 @@ public:
                                 --m_refCount;
                             }
 
-    virtual void SAL_CALL   start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL   end() throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setText(const OUString& aText) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL   setValue(sal_Int32 nValue) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL   reset() throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL   start(const OUString& aText, sal_Int32 nRange) override;
+    virtual void SAL_CALL   end() override;
+    virtual void SAL_CALL   setText(const OUString& aText) override;
+    virtual void SAL_CALL   setValue(sal_Int32 nValue) override;
+    virtual void SAL_CALL   reset() override;
 
-    virtual void SAL_CALL   disposing( const lang::EventObject& Source ) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL   disposing( const lang::EventObject& Source ) override;
 };
 
-void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception)
+void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange)
 {
     SolarMutexGuard aGuard;
     if ( xOwner.is() )
@@ -241,7 +241,7 @@ void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange)
     }
 }
 
-void SAL_CALL SfxStatusIndicator::end() throw(RuntimeException, std::exception)
+void SAL_CALL SfxStatusIndicator::end()
 {
     SolarMutexGuard aGuard;
     if ( xOwner.is() )
@@ -256,7 +256,7 @@ void SAL_CALL SfxStatusIndicator::end() throw(RuntimeException, std::exception)
     }
 }
 
-void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) throw(RuntimeException, std::exception)
+void SAL_CALL SfxStatusIndicator::setText(const OUString& aText)
 {
     SolarMutexGuard aGuard;
     if ( xOwner.is() )
@@ -271,7 +271,7 @@ void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) throw(RuntimeEx
     }
 }
 
-void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(RuntimeException, std::exception)
+void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue )
 {
     SolarMutexGuard aGuard;
     if ( xOwner.is() )
@@ -290,7 +290,7 @@ void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(RuntimeExce
     }
 }
 
-void SAL_CALL SfxStatusIndicator::reset() throw(RuntimeException, std::exception)
+void SAL_CALL SfxStatusIndicator::reset()
 {
     SolarMutexGuard aGuard;
     if ( xOwner.is() )
@@ -305,7 +305,7 @@ void SAL_CALL SfxStatusIndicator::reset() throw(RuntimeException, std::exception
     }
 }
 
-void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/ )
 {
     SolarMutexGuard aGuard;
     xOwner = nullptr;
@@ -321,8 +321,8 @@ class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper< fra
 public:
     explicit IMPL_SfxBaseController_ListenerHelper(  SfxBaseController*  pController ) ;
 
-    virtual void SAL_CALL frameAction( const frame::FrameActionEvent& aEvent ) throw (RuntimeException, std::exception) override ;
-    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) override ;
+    virtual void SAL_CALL frameAction( const frame::FrameActionEvent& aEvent ) override ;
+    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override ;
 
 private:
 
@@ -335,10 +335,9 @@ class IMPL_SfxBaseController_CloseListenerHelper : public ::cppu::WeakImplHelper
 public:
     explicit IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController*  pController ) ;
 
-    virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership )
-        throw (RuntimeException, util::CloseVetoException, std::exception) override ;
-    virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) override ;
-    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) override ;
+    virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) override ;
+    virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) override ;
+    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override ;
 
 private:
 
@@ -351,12 +350,11 @@ IMPL_SfxBaseController_CloseListenerHelper::IMPL_SfxBaseController_CloseListener
 {
 }
 
-void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::disposing( const lang::EventObject& /*aEvent*/ )
 {
 }
 
 void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership )
-    throw (RuntimeException, util::CloseVetoException, std::exception)
 {
     SolarMutexGuard aGuard;
     SfxViewShell* pShell = m_pController->GetViewShell_Impl();
@@ -380,7 +378,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const la
     }
 }
 
-void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::notifyClosing( const lang::EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::notifyClosing( const lang::EventObject& /*aEvent*/ )
 {
 }
 
@@ -430,7 +428,7 @@ IMPL_SfxBaseController_ListenerHelper::IMPL_SfxBaseController_ListenerHelper(
 {
 }
 
-void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::FrameActionEvent& aEvent ) throw( RuntimeException, std::exception )
+void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::FrameActionEvent& aEvent )
 {
     SolarMutexGuard aGuard;
     if  (
@@ -455,7 +453,7 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::F
 //  IMPL_SfxBaseController_ListenerHelper -> XEventListener
 
 
-void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::EventObject& /*aEvent*/ )
 {
     SolarMutexGuard aGuard;
     if ( m_pController && m_pController->getFrame().is() )
@@ -480,7 +478,7 @@ SfxBaseController::~SfxBaseController()
 //  SfxBaseController -> XController2
 
 
-Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (RuntimeException, std::exception)
+Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow()
 {
     SolarMutexGuard aGuard;
     if ( !m_pData->m_pViewShell )
@@ -489,7 +487,7 @@ Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (Run
     return Reference< XWindow >( GetViewFrame_Impl().GetFrame().GetWindow().GetComponentInterface(), UNO_QUERY_THROW );
 }
 
-OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeException, std::exception)
+OUString SAL_CALL SfxBaseController::getViewControllerName()
 {
     SolarMutexGuard aGuard;
     if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() )
@@ -506,7 +504,7 @@ OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeExcep
     return sViewName;
 }
 
-Sequence< PropertyValue > SAL_CALL SfxBaseController::getCreationArguments() throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL SfxBaseController::getCreationArguments()
 {
     SolarMutexGuard aGuard;
     if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() )
@@ -530,7 +528,7 @@ SfxViewFrame& SfxBaseController::GetViewFrame_Impl() const
 }
 
 
-Reference<XSidebarProvider> SAL_CALL SfxBaseController::getSidebar() throw (RuntimeException, std::exception)
+Reference<XSidebarProvider> SAL_CALL SfxBaseController::getSidebar()
 {
         SfxViewFrame& rViewFrame = GetViewFrame_Impl();
         SfxFrame& rFrame = rViewFrame.GetFrame();
@@ -543,7 +541,7 @@ Reference<XSidebarProvider> SAL_CALL SfxBaseController::getSidebar() throw (Runt
 //  SfxBaseController -> XController2 -> XController
 
 
-void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& xFrame ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& xFrame )
 {
     Reference< frame::XFrame > xTemp( getFrame() ) ;
 
@@ -581,7 +579,7 @@ void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >&
 //  SfxBaseController -> XController
 
 
-sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel >& xModel ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel >& xModel )
 {
     if ( m_pData->m_pViewShell && xModel.is() && xModel != m_pData->m_pViewShell->GetObjectShell()->GetModel() )
     {
@@ -600,7 +598,7 @@ sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel
 //  SfxBaseController -> XController
 
 
-sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend )
 {
     SolarMutexGuard aGuard;
 
@@ -658,7 +656,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
 //  SfxBaseController -> XController
 
 
-uno::Any SfxBaseController::getViewData() throw( RuntimeException, std::exception )
+uno::Any SfxBaseController::getViewData()
 {
     uno::Any         aAny;
     OUString sData;
@@ -676,7 +674,7 @@ uno::Any SfxBaseController::getViewData() throw( RuntimeException, std::exceptio
 //  SfxBaseController -> XController
 
 
-void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue )
 {
     SolarMutexGuard aGuard;
     if ( m_pData->m_pViewShell )
@@ -691,7 +689,7 @@ void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw
 //  SfxBaseController -> XController
 
 
-Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( RuntimeException, std::exception )
+Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame()
 {
     SolarMutexGuard aGuard;
     return m_pData->m_xFrame;
@@ -701,7 +699,7 @@ Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( Runtime
 //  SfxBaseController -> XController
 
 
-Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( RuntimeException, std::exception )
+Reference< frame::XModel > SAL_CALL SfxBaseController::getModel()
 {
     SolarMutexGuard aGuard;
     return m_pData->m_pViewShell ? m_pData->m_pViewShell->GetObjectShell()->GetModel() : Reference < frame::XModel > () ;
@@ -713,7 +711,7 @@ Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( Runtime
 
 Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch(   const   util::URL&             aURL            ,
                                                                     const   OUString&            sTargetFrameName,
-                                                                            sal_Int32           eSearchFlags    ) throw( RuntimeException, std::exception )
+                                                                            sal_Int32           eSearchFlags    )
 {
     SolarMutexGuard aGuard;
     Reference< frame::XDispatch >  xDisp;
@@ -869,7 +867,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch(   const
 //  SfxBaseController -> XDispatchProvider
 
 
-uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( RuntimeException, std::exception )
+uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts )
 {
     // Create return list - which must have same size then the given descriptor
     // It's not allowed to pack it!
@@ -891,7 +889,6 @@ uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::query
 
 
 frame::BorderWidths SAL_CALL SfxBaseController::getBorder()
-    throw ( RuntimeException, std::exception )
 {
     frame::BorderWidths aResult;
 
@@ -909,21 +906,18 @@ frame::BorderWidths SAL_CALL SfxBaseController::getBorder()
 }
 
 void SAL_CALL SfxBaseController::addBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener )
-    throw ( RuntimeException, std::exception )
 {
     m_pData->m_aListenerContainer.addInterface( cppu::UnoType<frame::XBorderResizeListener>::get(),
                                                 xListener );
 }
 
 void SAL_CALL SfxBaseController::removeBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener )
-    throw ( RuntimeException, std::exception )
 {
     m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<frame::XBorderResizeListener>::get(),
                                                 xListener );
 }
 
 awt::Rectangle SAL_CALL SfxBaseController::queryBorderedArea( const awt::Rectangle& aPreliminaryRectangle )
-    throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( m_pData->m_pViewShell )
@@ -964,7 +958,7 @@ void SfxBaseController::BorderWidthsChanged_Impl()
 //  SfxBaseController -> XComponent
 
 
-void SAL_CALL SfxBaseController::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseController::dispose()
 {
     SolarMutexGuard aGuard;
     Reference< XController > xTmp( this );
@@ -1035,7 +1029,7 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException, std::excepti
 //  SfxBaseController -> XComponent
 
 
-void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener )
 {
     m_pData->m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
 }
@@ -1044,7 +1038,7 @@ void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEvent
 //  SfxBaseController -> XComponent
 
 
-void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener )
 {
     m_pData->m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
 }
@@ -1075,7 +1069,7 @@ SfxViewShell* SfxBaseController::GetViewShell_Impl() const
     return m_pData->m_pViewShell;
 }
 
-Reference< task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicator(  ) throw (RuntimeException, std::exception)
+Reference< task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicator(  )
 {
     SolarMutexGuard aGuard;
     if ( m_pData->m_pViewShell && !m_pData->m_xIndicator.is() )
@@ -1083,7 +1077,7 @@ Reference< task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicat
     return m_pData->m_xIndicator;
 }
 
-void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor )
 
 {
     m_pData->m_aInterceptorContainer.addInterface( xInterceptor );
@@ -1093,7 +1087,7 @@ void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const Reference
         m_pData->m_pViewShell->AddContextMenuInterceptor_Impl( xInterceptor );
 }
 
-void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) throw( RuntimeException, std::exception )
+void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor )
 
 {
     m_pData->m_aInterceptorContainer.removeInterface( xInterceptor );
@@ -1103,32 +1097,31 @@ void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const Reference<
         m_pData->m_pViewShell->RemoveContextMenuInterceptor_Impl( xInterceptor );
 }
 
-void SAL_CALL SfxBaseController::addKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxBaseController::addKeyHandler( const Reference< awt::XKeyHandler >& xHandler )
 {
     SolarMutexGuard aGuard;
     m_pData->m_aUserInputInterception.addKeyHandler( xHandler );
 }
 
-void SAL_CALL SfxBaseController::removeKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxBaseController::removeKeyHandler( const Reference< awt::XKeyHandler >& xHandler )
 {
     SolarMutexGuard aGuard;
     m_pData->m_aUserInputInterception.removeKeyHandler( xHandler );
 }
 
-void SAL_CALL SfxBaseController::addMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxBaseController::addMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler )
 {
     SolarMutexGuard aGuard;
     m_pData->m_aUserInputInterception.addMouseClickHandler( xHandler );
 }
 
-void SAL_CALL SfxBaseController::removeMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxBaseController::removeMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler )
 {
     SolarMutexGuard aGuard;
     m_pData->m_aUserInputInterception.removeMouseClickHandler( xHandler );
 }
 
 uno::Sequence< sal_Int16 > SAL_CALL SfxBaseController::getSupportedCommandGroups()
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1160,7 +1153,6 @@ throw (RuntimeException, std::exception)
 }
 
 uno::Sequence< frame::DispatchInformation > SAL_CALL SfxBaseController::getConfigurableDispatchInformation( sal_Int16 nCmdGroup )
-throw (RuntimeException, std::exception)
 {
     std::list< frame::DispatchInformation > aCmdList;
 
@@ -1493,7 +1485,6 @@ Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper ()
 
 // frame::XTitle
 OUString SAL_CALL SfxBaseController::getTitle()
-    throw (RuntimeException, std::exception)
 {
     return impl_getTitleHelper()->getTitle ();
 }
@@ -1501,7 +1492,6 @@ OUString SAL_CALL SfxBaseController::getTitle()
 
 // frame::XTitle
 void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle)
-    throw (RuntimeException, std::exception)
 {
     impl_getTitleHelper()->setTitle (sTitle);
 }
@@ -1509,7 +1499,6 @@ void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle)
 
 // frame::XTitleChangeBroadcaster
 void SAL_CALL SfxBaseController::addTitleChangeListener(const Reference< frame::XTitleChangeListener >& xListener)
-    throw (RuntimeException, std::exception)
 {
     Reference< frame::XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper(), uno::UNO_QUERY);
     if (xBroadcaster.is ())
@@ -1519,14 +1508,13 @@ void SAL_CALL SfxBaseController::addTitleChangeListener(const Reference< frame::
 
 // frame::XTitleChangeBroadcaster
 void SAL_CALL SfxBaseController::removeTitleChangeListener(const Reference< frame::XTitleChangeListener >& xListener)
-    throw (RuntimeException, std::exception)
 {
     Reference< frame::XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper(), uno::UNO_QUERY);
     if (xBroadcaster.is ())
         xBroadcaster->removeTitleChangeListener (xListener);
 }
 
-void SfxBaseController::initialize( const css::uno::Sequence< css::uno::Any >& /*aArguments*/ ) throw (css::uno::RuntimeException, std::exception)
+void SfxBaseController::initialize( const css::uno::Sequence< css::uno::Any >& /*aArguments*/ )
 {
 }
 
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index 54062262b4bb..3c830c5bc653 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -124,27 +124,27 @@ namespace sfx2
     }
 
 
-    void UserInputInterception::addKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException)
+    void UserInputInterception::addKeyHandler( const Reference< XKeyHandler >& _rxHandler )
     {
         if ( _rxHandler.is() )
             m_pData->m_aKeyHandlers.addInterface( _rxHandler );
     }
 
 
-    void UserInputInterception::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException)
+    void UserInputInterception::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler )
     {
         m_pData->m_aKeyHandlers.removeInterface( _rxHandler );
     }
 
 
-    void UserInputInterception::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException)
+    void UserInputInterception::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler )
     {
         if ( _rxHandler.is() )
             m_pData->m_aMouseClickHandlers.addInterface( _rxHandler );
     }
 
 
-    void UserInputInterception::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException)
+    void UserInputInterception::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler )
     {
         m_pData->m_aMouseClickHandlers.removeInterface( _rxHandler );
     }
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 04e600f096bf..7ac1bcef8343 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -106,12 +106,10 @@ public:
     SfxClipboardChangeListener( SfxViewShell* pView, const uno::Reference< datatransfer::clipboard::XClipboardNotifier >& xClpbrdNtfr );
 
     // XEventListener
-    virtual void SAL_CALL disposing( const lang::EventObject& rEventObject )
-        throw ( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) override;
 
     // XClipboardListener
-    virtual void SAL_CALL changedContents( const datatransfer::clipboard::ClipboardEvent& rEventObject )
-        throw ( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL changedContents( const datatransfer::clipboard::ClipboardEvent& rEventObject ) override;
 
     void DisconnectViewShell() { m_pViewShell = nullptr; }
     void ChangedContents();
@@ -184,7 +182,6 @@ IMPL_STATIC_LINK( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, void*, p, vo
 }
 
 void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*rEventObject*/ )
-    throw ( uno::RuntimeException, std::exception )
 {
     // Either clipboard or ViewShell is going to be destroyed -> no interest in listening anymore
     uno::Reference< lang::XComponent > xCtrl( m_xCtrl );
@@ -204,7 +201,6 @@ void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*
 }
 
 void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::clipboard::ClipboardEvent& )
-    throw ( RuntimeException, std::exception )
 {
     // Make asynchronous call to avoid locking SolarMutex which is the
     // root for many deadlocks, especially in conjunction with the "Windows"
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index dfb9b6d32993..e162a03c3ded 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -77,74 +77,48 @@ public:
 private:
     virtual ~Default() override {}
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return getDefaultImplementationName(); }
 
-    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
     { return ServiceName == getSupportedServiceNames()[0]; }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     { return getDefaultSupportedServiceNames(); }
 
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override
+    getPropertySetInfo() override
     { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
 
     virtual void SAL_CALL setPropertyValue(
-        OUString const &, css::uno::Any const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        OUString const &, css::uno::Any const &) override;
 
     virtual css::uno::Any SAL_CALL getPropertyValue(
-        OUString const & PropertyName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        OUString const & PropertyName) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
     {}
 
     virtual void SAL_CALL removePropertyChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
     {}
 
     virtual void SAL_CALL addVetoableChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
     {}
 
     virtual void SAL_CALL removeVetoableChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
     {}
 };
 
 void Default::setPropertyValue(OUString const &, css::uno::Any const &)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     throw css::lang::IllegalArgumentException(
         OUString("setPropertyValue not supported"),
@@ -263,9 +237,6 @@ css::uno::Any xdgDirectoryIfExists(char const * type) {
 } // namespace
 
 css::uno::Any Default::getPropertyValue(OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if (PropertyName == "TemplatePathVariable")
     {
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index bd0b2d49edd4..70d14cc371fb 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -75,66 +75,44 @@ public:
 private:
     virtual ~Service() override {}
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return getServiceImplementationName(); }
 
-    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
     { return ServiceName == getSupportedServiceNames()[0]; }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     { return getServiceSupportedServiceNames(); }
 
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override
+    getPropertySetInfo() override
     { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
 
     virtual void SAL_CALL setPropertyValue(
-        OUString const &, css::uno::Any const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        OUString const &, css::uno::Any const &) override;
 
     virtual css::uno::Any SAL_CALL getPropertyValue(
-        OUString const & PropertyName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        OUString const & PropertyName) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
     {}
 
     virtual void SAL_CALL removePropertyChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
     {}
 
     virtual void SAL_CALL addVetoableChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
     {}
 
     virtual void SAL_CALL removeVetoableChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
     {}
 
     bool enabled_;
@@ -151,10 +129,6 @@ Service::Service(): enabled_(false) {
 }
 
 void Service::setPropertyValue(OUString const &, css::uno::Any const &)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     throw css::lang::IllegalArgumentException(
         OUString("setPropertyValue not supported"),
@@ -162,9 +136,6 @@ void Service::setPropertyValue(OUString const &, css::uno::Any const &)
 }
 
 css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if (PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
      || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 852d1dc9be7d..1eb92c9773e8 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -257,10 +257,6 @@ OUString LocaleBackend::getSystemLocale()
 
 void LocaleBackend::setPropertyValue(
     OUString const &, css::uno::Any const &)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     throw css::lang::IllegalArgumentException(
         OUString(
@@ -270,9 +266,6 @@ void LocaleBackend::setPropertyValue(
 
 css::uno::Any LocaleBackend::getPropertyValue(
     OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if ( PropertyName == "Locale" ) {
         return css::uno::makeAny(
@@ -300,7 +293,6 @@ OUString SAL_CALL LocaleBackend::getBackendName() {
 }
 
 OUString SAL_CALL LocaleBackend::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return getBackendName() ;
 }
@@ -312,13 +304,11 @@ uno::Sequence<OUString> SAL_CALL LocaleBackend::getBackendServiceNames()
 }
 
 sal_Bool SAL_CALL LocaleBackend::supportsService(const OUString& aServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, aServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL LocaleBackend::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return getBackendServiceNames() ;
 }
diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx
index 5927f4cbd585..2a91d5f3fb44 100644
--- a/shell/source/backends/localebe/localebackend.hxx
+++ b/shell/source/backends/localebe/localebackend.hxx
@@ -39,16 +39,13 @@ class LocaleBackend : public ::cppu::WeakImplHelper <
 
         // XServiceInfo
         virtual OUString SAL_CALL
-            getImplementationName(  )
-                throw (uno::RuntimeException, std::exception) override ;
+            getImplementationName(  ) override ;
 
         virtual sal_Bool SAL_CALL
-            supportsService( const OUString& aServiceName )
-                throw (uno::RuntimeException, std::exception) override ;
+            supportsService( const OUString& aServiceName ) override ;
 
         virtual uno::Sequence<OUString> SAL_CALL
-            getSupportedServiceNames(  )
-                throw (uno::RuntimeException, std::exception) override ;
+            getSupportedServiceNames(  ) override ;
 
         /**
           Provides the implementation name.
@@ -65,53 +62,33 @@ class LocaleBackend : public ::cppu::WeakImplHelper <
 
         // XPropertySet
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override
+        getPropertySetInfo() override
         { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
 
         virtual void SAL_CALL setPropertyValue(
-            OUString const &, css::uno::Any const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            OUString const &, css::uno::Any const &) override;
 
         virtual css::uno::Any SAL_CALL getPropertyValue(
-            OUString const & PropertyName)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            OUString const & PropertyName) override;
 
         virtual void SAL_CALL addPropertyChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
         {}
 
         virtual void SAL_CALL removePropertyChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
         {}
 
         virtual void SAL_CALL addVetoableChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
         {}
 
         virtual void SAL_CALL removeVetoableChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
         {}
 
     protected:
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx
index 19b8e49059e7..0af641f13fef 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -39,14 +39,11 @@ public:
     static MacOSXBackend* createInstance();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
-    virtual sal_Bool SAL_CALL supportsService(const OUString& aServiceName)
-        throw (uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& aServiceName) override;
 
-    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     /**
        Provides the implementation name.
@@ -64,53 +61,33 @@ public:
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override
+    getPropertySetInfo() override
     { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
 
     virtual void SAL_CALL setPropertyValue(
-        OUString const &, css::uno::Any const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        OUString const &, css::uno::Any const &) override;
 
     virtual css::uno::Any SAL_CALL getPropertyValue(
-        OUString const & PropertyName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        OUString const & PropertyName) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
     {}
 
     virtual void SAL_CALL removePropertyChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
     {}
 
     virtual void SAL_CALL addVetoableChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
     {}
 
     virtual void SAL_CALL removeVetoableChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
     {}
 
 protected:
diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm
index 3374c8e6449d..4a4df4201437 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -193,10 +193,6 @@ rtl::OUString GetOUString( NSString* pStr )
 
 void MacOSXBackend::setPropertyValue(
     rtl::OUString const &, css::uno::Any const &)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     throw css::lang::IllegalArgumentException(
         rtl::OUString(
@@ -206,9 +202,6 @@ void MacOSXBackend::setPropertyValue(
 
 css::uno::Any MacOSXBackend::getPropertyValue(
     rtl::OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if ( PropertyName == "WorkPathVariable" )
     {
@@ -430,7 +423,6 @@ rtl::OUString SAL_CALL MacOSXBackend::getBackendName(void)
 }
 
 rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void)
-    throw (uno::RuntimeException, std::exception)
 {
     return getBackendName();
 }
@@ -443,13 +435,11 @@ uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getBackendServiceNames(void
 }
 
 sal_Bool SAL_CALL MacOSXBackend::supportsService(const rtl::OUString& aServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, aServiceName);
 }
 
 uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(void)
-    throw (uno::RuntimeException, std::exception)
 {
     return getBackendServiceNames();
 }
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 42f091fe759a..b1c2b1c344be 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -299,10 +299,6 @@ WinInetBackend* WinInetBackend::createInstance()
 
 void WinInetBackend::setPropertyValue(
     OUString const &, css::uno::Any const &)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
 {
     throw css::lang::IllegalArgumentException(
         OUString(
@@ -312,9 +308,6 @@ void WinInetBackend::setPropertyValue(
 
 css::uno::Any WinInetBackend::getPropertyValue(
     OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
 {
     if ( PropertyName == "ooInetFTPProxyName" )
     {
@@ -351,7 +344,6 @@ OUString SAL_CALL WinInetBackend::getBackendName() {
 }
 
 OUString SAL_CALL WinInetBackend::getImplementationName()
-    throw (uno::RuntimeException)
 {
     return getBackendName() ;
 }
@@ -364,13 +356,11 @@ uno::Sequence<OUString> SAL_CALL WinInetBackend::getBackendServiceNames()
 }
 
 sal_Bool SAL_CALL WinInetBackend::supportsService(const OUString& aServiceName)
-    throw (uno::RuntimeException)
 {
     return cppu::supportsService(this, aServiceName);
 }
 
 uno::Sequence<OUString> SAL_CALL WinInetBackend::getSupportedServiceNames()
-    throw (uno::RuntimeException)
 {
     return getBackendServiceNames() ;
 }
diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx
index 222ed09a1070..b1df7d7a76a3 100644
--- a/shell/source/backends/wininetbe/wininetbackend.hxx
+++ b/shell/source/backends/wininetbe/wininetbackend.hxx
@@ -39,16 +39,13 @@ class WinInetBackend : public ::cppu::WeakImplHelper <
 
         // XServiceInfo
         virtual OUString SAL_CALL
-            getImplementationName(  )
-                throw (uno::RuntimeException) override;
+            getImplementationName(  ) override;
 
         virtual sal_Bool SAL_CALL
-            supportsService( const OUString& aServiceName )
-                throw (uno::RuntimeException) override;
+            supportsService( const OUString& aServiceName ) override;
 
         virtual uno::Sequence<OUString> SAL_CALL
-            getSupportedServiceNames(  )
-                throw (uno::RuntimeException) override;
+            getSupportedServiceNames(  ) override;
 
         /**
           Provides the implementation name.
@@ -65,53 +62,33 @@ class WinInetBackend : public ::cppu::WeakImplHelper <
 
         // XPropertySet
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo() throw (css::uno::RuntimeException) override
+        getPropertySetInfo() override
         { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
 
         virtual void SAL_CALL setPropertyValue(
-            OUString const &, css::uno::Any const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+            OUString const &, css::uno::Any const &) override;
 
         virtual css::uno::Any SAL_CALL getPropertyValue(
-            OUString const & PropertyName)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+            OUString const & PropertyName) override;
 
         virtual void SAL_CALL addPropertyChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException) override
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
         {}
 
         virtual void SAL_CALL removePropertyChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException) override
+            css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
         {}
 
         virtual void SAL_CALL addVetoableChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException) override
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
         {}
 
         virtual void SAL_CALL removeVetoableChangeListener(
             OUString const &,
-            css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-            throw (
-                css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException, css::uno::RuntimeException) override
+            css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
         {}
 
     protected:
diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx
index 9d6afa23d194..e1e8f1829635 100644
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -30,105 +30,90 @@ using namespace com::sun::star::uno;
 
 
 void SAL_CALL CmdMailMsg::setBody( const OUString& aBody )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     m_aBody = aBody;
 }
 
 OUString SAL_CALL CmdMailMsg::getBody(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_aBody;
 }
 
 void SAL_CALL CmdMailMsg::setRecipient( const OUString& aRecipient )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     m_aRecipient = aRecipient;
 }
 
 OUString SAL_CALL CmdMailMsg::getRecipient(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_aRecipient;
 }
 
 void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     m_CcRecipients = aCcRecipient;
 }
 
 Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_CcRecipients;
 }
 
 void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     m_BccRecipients = aBccRecipient;
 }
 
 Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_BccRecipients;
 }
 
 void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     m_aOriginator = aOriginator;
 }
 
 OUString SAL_CALL CmdMailMsg::getOriginator(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_aOriginator;
 }
 
 void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     m_aSubject = aSubject;
 }
 
 OUString SAL_CALL CmdMailMsg::getSubject(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_aSubject;
 }
 
 void SAL_CALL CmdMailMsg::setAttachement( const Sequence< OUString >& aAttachment )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     m_Attachments = aAttachment;
 }
 
 Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement(  )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
     return m_Attachments;
 }
 
 Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
 
@@ -158,7 +143,6 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
 }
 
 Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
 
@@ -191,7 +175,6 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames(  )
 }
 
  sal_Bool SAL_CALL CmdMailMsg::hasByName( const OUString& aName )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_aMutex );
 
@@ -220,14 +203,12 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames(  )
 }
 
 Type SAL_CALL CmdMailMsg::getElementType(  )
-    throw (RuntimeException, std::exception)
 {
     // returning void for multi type container
     return Type();
 }
 
 sal_Bool SAL_CALL CmdMailMsg::hasElements(  )
-    throw (RuntimeException, std::exception)
 {
     return 0 != getElementNames().getLength();
 }
diff --git a/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx
index 74f28e0aa9b8..1a3a6c493adb 100644
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
@@ -54,70 +54,51 @@ public:
     // XSimpleMailMessage
 
 
-    virtual void SAL_CALL setBody( const OUString& aBody )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setBody( const OUString& aBody ) override;
 
-    virtual OUString SAL_CALL getBody(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getBody(  ) override;
 
-    virtual void SAL_CALL setRecipient( const OUString& aRecipient )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setRecipient( const OUString& aRecipient ) override;
 
-    virtual OUString SAL_CALL getRecipient(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getRecipient(  ) override;
 
-    virtual void SAL_CALL setCcRecipient( const css::uno::Sequence< OUString >& aCcRecipient )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setCcRecipient( const css::uno::Sequence< OUString >& aCcRecipient ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getCcRecipient(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getCcRecipient(  ) override;
 
-    virtual void SAL_CALL setBccRecipient( const css::uno::Sequence< OUString >& aBccRecipient )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setBccRecipient( const css::uno::Sequence< OUString >& aBccRecipient ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getBccRecipient(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getBccRecipient(  ) override;
 
-    virtual void SAL_CALL setOriginator( const OUString& aOriginator )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setOriginator( const OUString& aOriginator ) override;
 
-    virtual OUString SAL_CALL getOriginator(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getOriginator(  ) override;
 
-    virtual void SAL_CALL setSubject( const OUString& aSubject )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSubject( const OUString& aSubject ) override;
 
-    virtual OUString SAL_CALL getSubject(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSubject(  ) override;
 
-    virtual void SAL_CALL setAttachement( const css::uno::Sequence< OUString >& aAttachement )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAttachement( const css::uno::Sequence< OUString >& aAttachement ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getAttachement(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAttachement(  ) override;
 
 
     // XNameAccess
 
 
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) 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;
 
 };
 
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index 899a47c3c8fe..7f1d394c35c5 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -73,7 +73,6 @@ CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) :
 // XSimpleMailClientSupplier
 
 Reference< XSimpleMailClient > SAL_CALL CmdMailSuppl::querySimpleMailClient(  )
-    throw (RuntimeException, std::exception)
 {
     return static_cast < XSimpleMailClient * > (this);
 }
@@ -81,7 +80,6 @@ Reference< XSimpleMailClient > SAL_CALL CmdMailSuppl::querySimpleMailClient(  )
 // XSimpleMailClient
 
 Reference< XSimpleMailMessage > SAL_CALL CmdMailSuppl::createSimpleMailMessage(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     return Reference< XSimpleMailMessage >( new CmdMailMsg(  ) );
 }
@@ -128,7 +126,6 @@ void appendShellWord(OStringBuffer & buffer, OUString const & word, bool strict)
 }
 
 void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailMessage >& xSimpleMailMessage, sal_Int32 /*aFlag*/ )
-    throw (IllegalArgumentException, Exception, RuntimeException, std::exception)
 {
     if ( ! xSimpleMailMessage.is() )
     {
@@ -288,19 +285,16 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
 // XServiceInfo
 
 OUString SAL_CALL CmdMailSuppl::getImplementationName(  )
-    throw( RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.system.SimpleCommandMail");
 }
 
 sal_Bool SAL_CALL CmdMailSuppl::supportsService( const OUString& ServiceName )
-    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL CmdMailSuppl::getSupportedServiceNames(    )
-    throw( RuntimeException, std::exception )
 {
     return Component_getSupportedServiceNames();
 }
diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx
index 4d075d477428..13b4d319ac51 100644
--- a/shell/source/cmdmail/cmdmailsuppl.hxx
+++ b/shell/source/cmdmail/cmdmailsuppl.hxx
@@ -50,31 +50,25 @@ public:
     // XSimpleMailClientSupplier
 
 
-    virtual css::uno::Reference< css::system::XSimpleMailClient > SAL_CALL querySimpleMailClient(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::system::XSimpleMailClient > SAL_CALL querySimpleMailClient(  ) override;
 
 
     // XSimpleMailClient
 
 
-    virtual css::uno::Reference< css::system::XSimpleMailMessage > SAL_CALL createSimpleMailMessage(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::system::XSimpleMailMessage > SAL_CALL createSimpleMailMessage(  ) override;
 
-    virtual void SAL_CALL sendSimpleMailMessage( const css::uno::Reference< css::system::XSimpleMailMessage >& xSimpleMailMessage, sal_Int32 aFlag )
-        throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL sendSimpleMailMessage( const css::uno::Reference< css::system::XSimpleMailMessage >& xSimpleMailMessage, sal_Int32 aFlag ) override;
 
 
     // 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( const OUString& ServiceName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 };
 
 #endif
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index a578b488e23d..5fd6f63aae7d 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -94,7 +94,6 @@ namespace shell { namespace sessioninstall
 void SyncDbusSessionHelper::InstallPackageFiles(
     sal_uInt32 xid, css::uno::Sequence<OUString> const & files,
     OUString const & interaction)
-    throw (css::uno::RuntimeException, std::exception)
 {
     request("InstallPackageFiles", xid, files, interaction);
 }
@@ -102,7 +101,6 @@ void SyncDbusSessionHelper::InstallPackageFiles(
 void SyncDbusSessionHelper::InstallProvideFiles(
     sal_uInt32 xid, css::uno::Sequence<OUString> const & files,
     OUString const & interaction)
-    throw (css::uno::RuntimeException, std::exception)
 {
     request("InstallProvideFiles", xid, files, interaction);
 }
@@ -110,7 +108,6 @@ void SyncDbusSessionHelper::InstallProvideFiles(
 void SyncDbusSessionHelper::InstallCatalogs(
     sal_uInt32 xid, css::uno::Sequence<OUString> const & files,
     OUString const & interaction)
-    throw (css::uno::RuntimeException, std::exception)
 {
     request("InstallCatalogs", xid, files, interaction);
 }
@@ -118,7 +115,6 @@ void SyncDbusSessionHelper::InstallCatalogs(
 void SyncDbusSessionHelper::InstallPackageNames(
     sal_uInt32 xid, css::uno::Sequence<OUString> const & packages,
     OUString const & interaction)
-    throw (css::uno::RuntimeException, std::exception)
 {
     request("InstallPackageNames", xid, packages, interaction);
 }
@@ -126,7 +122,6 @@ void SyncDbusSessionHelper::InstallPackageNames(
 void SyncDbusSessionHelper::InstallMimeTypes(
     sal_uInt32 xid, css::uno::Sequence<OUString> const & mimeTypes,
     OUString const & interaction)
-    throw (css::uno::RuntimeException, std::exception)
 {
     request("InstallMimeTypes", xid, mimeTypes, interaction);
 }
@@ -134,7 +129,6 @@ void SyncDbusSessionHelper::InstallMimeTypes(
 void SyncDbusSessionHelper::InstallFontconfigResources(
     sal_uInt32 xid, css::uno::Sequence<OUString> const & resources,
     OUString const & interaction)
-    throw (css::uno::RuntimeException, std::exception)
 {
     request("InstallFontconfigResources", xid, resources, interaction);
 }
@@ -142,7 +136,6 @@ void SyncDbusSessionHelper::InstallFontconfigResources(
 void SyncDbusSessionHelper::InstallGStreamerResources(
     sal_uInt32 xid, css::uno::Sequence<OUString> const & resources,
     OUString const & interaction)
-    throw (css::uno::RuntimeException, std::exception)
 {
     request("InstallGStreamerResources", xid, resources, interaction);
 }
@@ -150,7 +143,6 @@ void SyncDbusSessionHelper::InstallGStreamerResources(
 void SyncDbusSessionHelper::RemovePackageByFiles(
     sal_uInt32 xid, css::uno::Sequence<OUString> const & files,
     OUString const & interaction)
-    throw (css::uno::RuntimeException, std::exception)
 {
     request("RemovePackageByFiles", xid, files, interaction);
 }
@@ -158,12 +150,11 @@ void SyncDbusSessionHelper::RemovePackageByFiles(
 void SyncDbusSessionHelper::InstallPrinterDrivers(
     sal_uInt32 xid, css::uno::Sequence<OUString> const & files,
     OUString const & interaction)
-    throw (css::uno::RuntimeException, std::exception)
 {
     request("InstallPrinteDrivers", xid, files, interaction);
 }
 
-    void SAL_CALL SyncDbusSessionHelper::IsInstalled( const OUString& sPackagename, const OUString& sInteraction, sal_Bool& o_isInstalled ) throw (RuntimeException, std::exception)
+    void SAL_CALL SyncDbusSessionHelper::IsInstalled( const OUString& sPackagename, const OUString& sInteraction, sal_Bool& o_isInstalled )
     {
         const OString sPackagenameAscii = OUStringToOString(sPackagename, RTL_TEXTENCODING_ASCII_US);
         const OString sInteractionAscii = OUStringToOString(sInteraction, RTL_TEXTENCODING_ASCII_US);
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index afbfa92b47cf..2bb0ff741334 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -24,31 +24,31 @@ namespace shell { namespace sessioninstall
             virtual ~SyncDbusSessionHelper() override {}
 
             // XModify Methods
-            virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) override;
 
-            virtual void SAL_CALL InstallProvideFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL InstallProvideFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) override;
 
-            virtual void SAL_CALL InstallCatalogs( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL InstallCatalogs( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) override;
 
-            virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& packages, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& packages, const OUString& interaction ) override;
 
-            virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& mimeTypes, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& mimeTypes, const OUString& interaction ) override;
 
-            virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& resources, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& resources, const OUString& interaction ) override;
 
-            virtual void SAL_CALL InstallGStreamerResources( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& resources, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL InstallGStreamerResources( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& resources, const OUString& interaction ) override;
 
-            virtual void SAL_CALL InstallResources( ::sal_uInt32 /* xid */, const css::uno::Sequence< OUString >& /* types */, const css::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) throw (css::uno::RuntimeException, std::exception) override
+            virtual void SAL_CALL InstallResources( ::sal_uInt32 /* xid */, const css::uno::Sequence< OUString >& /* types */, const css::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) override
                 { throw css::uno::RuntimeException(); } // not implemented
 
-            virtual void SAL_CALL RemovePackageByFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL RemovePackageByFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) override;
 
-            virtual void SAL_CALL InstallPrinterDrivers( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL InstallPrinterDrivers( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) override;
 
             // XQuery Methods
-            virtual void SAL_CALL IsInstalled( const OUString& /* package_name */, const OUString& /* interaction */, sal_Bool& /* installed */ ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL IsInstalled( const OUString& /* package_name */, const OUString& /* interaction */, sal_Bool& /* installed */ ) override;
 
-            virtual void SAL_CALL SearchFile( const OUString& /* file_name */, const OUString& /* interaction */, sal_Bool& /* installed */, OUString& /* package_name */ ) throw (css::uno::RuntimeException, std::exception) override
+            virtual void SAL_CALL SearchFile( const OUString& /* file_name */, const OUString& /* interaction */, sal_Bool& /* installed */, OUString& /* package_name */ ) override
                 { throw css::uno::RuntimeException(); } // not implemented
 
         private:
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 002e3a55570d..b7ef8b816950 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -96,7 +96,6 @@ ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) :
 }
 
 void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags )
-    throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException, std::exception)
 {
     OStringBuffer aBuffer, aLaunchBuffer;
 
@@ -213,19 +212,16 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
 // XServiceInfo
 
 OUString SAL_CALL ShellExec::getImplementationName(  )
-    throw( RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.system.SystemShellExecute");
 }
 
 sal_Bool SAL_CALL ShellExec::supportsService( const OUString& ServiceName )
-    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL ShellExec::getSupportedServiceNames(   )
-    throw( RuntimeException, std::exception )
 {
     return ShellExec_getSupportedServiceNames();
 }
diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx
index 85f3d17c91b6..d00c8d0a88c5 100644
--- a/shell/source/unix/exec/shellexec.hxx
+++ b/shell/source/unix/exec/shellexec.hxx
@@ -43,21 +43,17 @@ public:
     // XSystemShellExecute
 
 
-    virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags )
-        throw (css::lang::IllegalArgumentException, css::system::SystemShellExecuteException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) override;
 
 
     // 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( const OUString& ServiceName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 };
 
 #endif
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index c69d3f2a0c59..4a2b97c83229 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -244,7 +244,6 @@ CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext
 }
 
 void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags )
-        throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException)
 {
     // parameter checking
     if (0 == aCommand.getLength())
@@ -328,19 +327,16 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
 // XServiceInfo
 
 OUString SAL_CALL CSysShExec::getImplementationName(  )
-    throw( RuntimeException )
 {
     return OUString(SYSSHEXEC_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL CSysShExec::supportsService( const OUString& ServiceName )
-    throw( RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL CSysShExec::getSupportedServiceNames(  )
-    throw( RuntimeException )
 {
     return SysShExec_getSupportedServiceNames();
 }
diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx
index 49cc910e7ed0..24051920b399 100644
--- a/shell/source/win32/SysShExec.hxx
+++ b/shell/source/win32/SysShExec.hxx
@@ -52,21 +52,17 @@ public:
     // XSystemShellExecute
 
 
-    virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags )
-        throw (css::lang::IllegalArgumentException, css::system::SystemShellExecuteException, css::uno::RuntimeException) override;
+    virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) override;
 
 
     // XServiceInfo
 
 
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 #endif
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index 5fcc2fac700f..c29bc044d0a1 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -150,7 +150,6 @@ namespace /* private */
 } // namespace private
 
 Reference<XSimpleMailMessage> SAL_CALL CSmplMailClient::createSimpleMailMessage()
-    throw (RuntimeException)
 {
     return Reference<XSimpleMailMessage>(new CSmplMailMsg());
 }
@@ -248,7 +247,6 @@ void CSmplMailClient::assembleCommandLine(
 
 void SAL_CALL CSmplMailClient::sendSimpleMailMessage(
     const Reference<XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag)
-    throw (IllegalArgumentException, Exception, RuntimeException)
 {
     validateParameter(xSimpleMailMessage, aFlag);
 
diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx
index 2da936a95340..4a744c289eec 100644
--- a/shell/source/win32/simplemail/smplmailclient.hxx
+++ b/shell/source/win32/simplemail/smplmailclient.hxx
@@ -29,11 +29,9 @@
 class CSmplMailClient : public cppu::WeakImplHelper<css::system::XSimpleMailClient>
 {
 public:
-    virtual css::uno::Reference<css::system::XSimpleMailMessage> SAL_CALL createSimpleMailMessage()
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference<css::system::XSimpleMailMessage> SAL_CALL createSimpleMailMessage() override;
 
-    virtual void SAL_CALL sendSimpleMailMessage(const css::uno::Reference<css::system::XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag)
-        throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void SAL_CALL sendSimpleMailMessage(const css::uno::Reference<css::system::XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag) override;
 
 private:
     void validateParameter(const css::uno::Reference<css::system::XSimpleMailMessage>& xSimpleMailMessage, sal_Int32 aFlag);
diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx
index 5d6d46e5390b..19b8dd695652 100644
--- a/shell/source/win32/simplemail/smplmailmsg.cxx
+++ b/shell/source/win32/simplemail/smplmailmsg.cxx
@@ -33,85 +33,71 @@ CSmplMailMsg::CSmplMailMsg( )
 }
 
 void SAL_CALL CSmplMailMsg::setBody( const ::rtl::OUString& aBody )
-    throw (RuntimeException)
 {
     m_aBody = aBody;
 }
 
 ::rtl::OUString SAL_CALL CSmplMailMsg::getBody(  )
-    throw (RuntimeException)
 {
     return m_aBody;
 }
 
 void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient )
-    throw (RuntimeException)
 {
     m_aRecipient = aRecipient;
 }
 
 OUString SAL_CALL CSmplMailMsg::getRecipient(  )
-    throw (RuntimeException)
 {
     return m_aRecipient;
 }
 
 void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient )
-    throw (RuntimeException)
 {
     m_CcRecipients = aCcRecipient;
 }
 
 Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient(  )
-    throw (RuntimeException)
 {
     return m_CcRecipients;
 }
 
 void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient )
-    throw (RuntimeException)
 {
     m_BccRecipients = aBccRecipient;
 }
 
 Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient(  )
-    throw (RuntimeException)
 {
     return m_BccRecipients;
 }
 
 void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator )
-    throw (RuntimeException)
 {
     m_aOriginator = aOriginator;
 }
 
 OUString SAL_CALL CSmplMailMsg::getOriginator(  )
-    throw (RuntimeException)
 {
     return m_aOriginator;
 }
 
 void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject )
-    throw (RuntimeException)
 {
     m_aSubject = aSubject;
 }
 
 OUString SAL_CALL CSmplMailMsg::getSubject(  )
-    throw (RuntimeException)
 {
     return m_aSubject;
 }
 
 void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttachement )
-    throw (IllegalArgumentException, RuntimeException)
 {
     m_Attachements = aAttachement;
 }
 
 Sequence< OUString > SAL_CALL CSmplMailMsg::getAttachement(  )
-    throw (RuntimeException)
 {
     return m_Attachements;
 }
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index afdc9ec12a28..ef87341c03b5 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -34,53 +34,39 @@ class CSmplMailMsg : public cppu::WeakImplHelper< css::system::XSimpleMailMessag
 public:
     CSmplMailMsg( );
 
-    virtual void SAL_CALL setBody( const ::rtl::OUString& aBody )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setBody( const ::rtl::OUString& aBody ) override;
 
-    virtual ::rtl::OUString SAL_CALL getBody(  )
-        throw (css::uno::RuntimeException) override;
+    virtual ::rtl::OUString SAL_CALL getBody(  ) override;
 
 
-    virtual void SAL_CALL setRecipient( const OUString& aRecipient )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setRecipient( const OUString& aRecipient ) override;
 
-    virtual OUString SAL_CALL getRecipient(  )
-        throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getRecipient(  ) override;
 
 
-    virtual void SAL_CALL setCcRecipient( const css::uno::Sequence< OUString >& aCcRecipient )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setCcRecipient( const css::uno::Sequence< OUString >& aCcRecipient ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getCcRecipient(  )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getCcRecipient(  ) override;
 
 
-    virtual void SAL_CALL setBccRecipient( const css::uno::Sequence< OUString >& aBccRecipient )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setBccRecipient( const css::uno::Sequence< OUString >& aBccRecipient ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getBccRecipient(  )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getBccRecipient(  ) override;
 
 
-    virtual void SAL_CALL setOriginator( const OUString& aOriginator )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setOriginator( const OUString& aOriginator ) override;
 
-    virtual OUString SAL_CALL getOriginator(  )
-        throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getOriginator(  ) override;
 
 
-    virtual void SAL_CALL setSubject( const OUString& aSubject )
-        throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL setSubject( const OUString& aSubject ) override;
 
-    virtual OUString SAL_CALL getSubject(  )
-        throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getSubject(  ) override;
 
 
-    virtual void SAL_CALL setAttachement( const css::uno::Sequence< OUString >& aAttachement )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
+    virtual void SAL_CALL setAttachement( const css::uno::Sequence< OUString >& aAttachement ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getAttachement(  )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAttachement(  ) override;
 
 private:
     OUString                        m_aBody;
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index 317ec942f7dd..e86544647ed6 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -53,7 +53,6 @@ CSmplMailSuppl::~CSmplMailSuppl()
 }
 
 Reference<XSimpleMailClient> SAL_CALL CSmplMailSuppl::querySimpleMailClient()
-    throw (RuntimeException)
 {
     /* We just try to load the MAPI dll as a test
        if a mail client is available */
@@ -70,19 +69,16 @@ Reference<XSimpleMailClient> SAL_CALL CSmplMailSuppl::querySimpleMailClient()
 // XServiceInfo
 
 OUString SAL_CALL CSmplMailSuppl::getImplementationName()
-    throw(RuntimeException)
 {
     return OUString(COMP_IMPL_NAME);
 }
 
 sal_Bool SAL_CALL CSmplMailSuppl::supportsService(const OUString& ServiceName)
-    throw(RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence<OUString> SAL_CALL CSmplMailSuppl::getSupportedServiceNames()
-    throw(RuntimeException)
 {
     return Component_getSupportedServiceNames();
 }
diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx
index 28414737f7b3..9c5496065d3c 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.hxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.hxx
@@ -45,18 +45,14 @@ public:
     ~CSmplMailSuppl( ) override;
 
     // XSimpleMailClientSupplier
-    virtual css::uno::Reference< css::system::XSimpleMailClient > SAL_CALL querySimpleMailClient(  )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::system::XSimpleMailClient > SAL_CALL querySimpleMailClient(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 #endif
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 472d85d82d65..c707af32e91e 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -125,24 +125,17 @@ public:
     virtual void SAL_CALL disposing() override;
 
 private:
-    virtual void SAL_CALL disposing( const lang::EventObject& Source )
-        throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
 
     // XMouseListener implementation
-    virtual void SAL_CALL mousePressed( const awt::MouseEvent& e )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseReleased( const awt::MouseEvent& e )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseEntered( const awt::MouseEvent& e )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseExited( const awt::MouseEvent& e )
-        throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePressed( const awt::MouseEvent& e ) override;
+    virtual void SAL_CALL mouseReleased( const awt::MouseEvent& e ) override;
+    virtual void SAL_CALL mouseEntered( const awt::MouseEvent& e ) override;
+    virtual void SAL_CALL mouseExited( const awt::MouseEvent& e ) override;
 
     // XMouseMotionListener implementation
-    virtual void SAL_CALL mouseDragged( const awt::MouseEvent& e )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL mouseMoved( const awt::MouseEvent& e )
-        throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseDragged( const awt::MouseEvent& e ) override;
+    virtual void SAL_CALL mouseMoved( const awt::MouseEvent& e ) override;
 
 
     EventQueue*           mpEventQueue;
@@ -309,7 +302,7 @@ void SAL_CALL EventMultiplexerListener::disposing()
 }
 
 void SAL_CALL EventMultiplexerListener::disposing(
-    const lang::EventObject& /*rSource*/ ) throw (uno::RuntimeException, std::exception)
+    const lang::EventObject& /*rSource*/ )
 {
     // there's no real point in acting on this message - after all,
     // the event sources are the XSlideShowViews, which must be
@@ -321,7 +314,7 @@ void SAL_CALL EventMultiplexerListener::disposing(
 }
 
 void SAL_CALL EventMultiplexerListener::mousePressed(
-    const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+    const awt::MouseEvent& e )
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -336,7 +329,7 @@ void SAL_CALL EventMultiplexerListener::mousePressed(
 }
 
 void SAL_CALL EventMultiplexerListener::mouseReleased(
-    const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+    const awt::MouseEvent& e )
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -351,20 +344,20 @@ void SAL_CALL EventMultiplexerListener::mouseReleased(
 }
 
 void SAL_CALL EventMultiplexerListener::mouseEntered(
-    const awt::MouseEvent& /*e*/ ) throw (uno::RuntimeException, std::exception)
+    const awt::MouseEvent& /*e*/ )
 {
     // not used here
 }
 
 void SAL_CALL EventMultiplexerListener::mouseExited(
-    const awt::MouseEvent& /*e*/ ) throw (uno::RuntimeException, std::exception)
+    const awt::MouseEvent& /*e*/ )
 {
     // not used here
 }
 
 // XMouseMotionListener implementation
 void SAL_CALL EventMultiplexerListener::mouseDragged(
-    const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+    const awt::MouseEvent& e )
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -379,7 +372,7 @@ void SAL_CALL EventMultiplexerListener::mouseDragged(
 }
 
 void SAL_CALL EventMultiplexerListener::mouseMoved(
-    const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+    const awt::MouseEvent& e )
 {
     osl::MutexGuard const guard( m_aMutex );
 
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 3758a2a24d49..d8925f3c1222 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -161,12 +161,10 @@ public:
             const Reference< rendering::XBitmap >& xEnteringSlide );
 
     // XTransition
-    virtual void SAL_CALL update( double nTime )
-    throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL update( double nTime ) override;
     virtual void SAL_CALL viewChanged( const Reference< presentation::XSlideShowView >& rView,
                        const Reference< rendering::XBitmap >& rLeavingBitmap,
-                       const Reference< rendering::XBitmap >& rEnteringBitmap )
-    throw (uno::RuntimeException, std::exception) override;
+                       const Reference< rendering::XBitmap >& rEnteringBitmap ) override;
 
 protected:
     void disposeTextures();
@@ -458,25 +456,24 @@ namespace
         uno::Sequence< sal_Int8 >  maComponentTags;
         uno::Sequence< sal_Int32 > maBitCounts;
 
-        virtual sal_Int8 SAL_CALL getType(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Int8 SAL_CALL getType(  ) override
         {
             return rendering::ColorSpaceType::RGB;
         }
-        virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags(  ) throw (uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags(  ) override
         {
             return maComponentTags;
         }
-        virtual sal_Int8 SAL_CALL getRenderingIntent(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Int8 SAL_CALL getRenderingIntent(  ) override
         {
             return rendering::RenderingIntent::PERCEPTUAL;
         }
-        virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) throw (uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) override
         {
             return uno::Sequence< beans::PropertyValue >();
         }
         virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                    const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                uno::RuntimeException, std::exception) override
+                                                                    const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
         {
             // TODO(P3): if we know anything about target
             // colorspace, this can be greatly sped up
@@ -484,7 +481,7 @@ namespace
                 convertToARGB(deviceColor));
             return targetColorSpace->convertFromARGB(aIntermediate);
         }
-        virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override
         {
             const double*  pIn( deviceColor.getConstArray() );
             const std::size_t nLen( deviceColor.getLength() );
@@ -501,7 +498,7 @@ namespace
             }
             return aRes;
         }
-        virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override
         {
             const double*  pIn( deviceColor.getConstArray() );
             const std::size_t nLen( deviceColor.getLength() );
@@ -518,7 +515,7 @@ namespace
             }
             return aRes;
         }
-        virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override
         {
             const double*  pIn( deviceColor.getConstArray() );
             const std::size_t nLen( deviceColor.getLength() );
@@ -535,7 +532,7 @@ namespace
             }
             return aRes;
         }
-        virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
         {
             const rendering::RGBColor* pIn( rgbColor.getConstArray() );
             const std::size_t             nLen( rgbColor.getLength() );
@@ -552,7 +549,7 @@ namespace
             }
             return aRes;
         }
-        virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
         {
             const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
             const std::size_t              nLen( rgbColor.getLength() );
@@ -569,7 +566,7 @@ namespace
             }
             return aRes;
         }
-        virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
         {
             const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
             const std::size_t              nLen( rgbColor.getLength() );
@@ -588,21 +585,20 @@ namespace
         }
 
         // XIntegerBitmapColorSpace
-        virtual sal_Int32 SAL_CALL getBitsPerPixel(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Int32 SAL_CALL getBitsPerPixel(  ) override
         {
             return 32;
         }
-        virtual uno::Sequence< sal_Int32 > SAL_CALL getComponentBitCounts(  ) throw (uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< sal_Int32 > SAL_CALL getComponentBitCounts(  ) override
         {
             return maBitCounts;
         }
-        virtual sal_Int8 SAL_CALL getEndianness(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Int8 SAL_CALL getEndianness(  ) override
         {
             return util::Endianness::LITTLE;
         }
         virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< sal_Int8 >& deviceColor,
-                                                                                const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                        uno::RuntimeException, std::exception) override
+                                                                                const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
         {
             if( dynamic_cast<OGLColorSpace*>(targetColorSpace.get()) )
             {
@@ -633,8 +629,7 @@ namespace
             }
         }
         virtual uno::Sequence< sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< sal_Int8 >& deviceColor,
-                                                                                    const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                                        uno::RuntimeException, std::exception) override
+                                                                                    const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override
         {
             if( dynamic_cast<OGLColorSpace*>(targetColorSpace.get()) )
             {
@@ -650,7 +645,7 @@ namespace
                 return targetColorSpace->convertIntegerFromARGB(aIntermediate);
             }
         }
-        virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< sal_Int8 >& deviceColor ) override
         {
             const sal_Int8* pIn( deviceColor.getConstArray() );
             const std::size_t  nLen( deviceColor.getLength() );
@@ -671,7 +666,7 @@ namespace
             return aRes;
         }
 
-        virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< sal_Int8 >& deviceColor ) override
         {
             const sal_Int8* pIn( deviceColor.getConstArray() );
             const std::size_t  nLen( deviceColor.getLength() );
@@ -693,7 +688,7 @@ namespace
             return aRes;
         }
 
-        virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< sal_Int8 >& deviceColor ) override
         {
             const sal_Int8* pIn( deviceColor.getConstArray() );
             const std::size_t  nLen( deviceColor.getLength() );
@@ -716,7 +711,7 @@ namespace
             return aRes;
         }
 
-        virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
         {
             const rendering::RGBColor* pIn( rgbColor.getConstArray() );
             const std::size_t             nLen( rgbColor.getLength() );
@@ -734,7 +729,7 @@ namespace
             return aRes;
         }
 
-        virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
         {
             const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
             const std::size_t              nLen( rgbColor.getLength() );
@@ -752,7 +747,7 @@ namespace
             return aRes;
         }
 
-        virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+        virtual uno::Sequence< sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
         {
             const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
             const std::size_t              nLen( rgbColor.getLength() );
@@ -1023,7 +1018,7 @@ void OGLTransitionerImpl::GLInitSlides()
     CHECK_GL_ERROR();
 }
 
-void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGLTransitionerImpl::update( double nTime )
 {
 #if OSL_DEBUG_LEVEL > 0
     mnFrameCount ++;
@@ -1070,7 +1065,6 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
 void SAL_CALL OGLTransitionerImpl::viewChanged( const Reference< presentation::XSlideShowView >& rView,
                         const Reference< rendering::XBitmap >& rLeavingBitmap,
                         const Reference< rendering::XBitmap >& rEnteringBitmap )
-    throw (uno::RuntimeException, std::exception)
 {
     SAL_INFO("slideshow.opengl", "transitioner: view changed");
 
@@ -1176,7 +1170,7 @@ public:
     {}
 
     // XTransitionFactory
-    virtual sal_Bool SAL_CALL hasTransition( sal_Int16 transitionType, sal_Int16 transitionSubType ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasTransition( sal_Int16 transitionType, sal_Int16 transitionSubType ) override
     {
         // A set of css::animation::TransitionSubType that don't have any meaning (in the SMIL 2.0
         // standard) for MISCSHAPEWIPE have been chosen to refer to some of these "fancy" optional
@@ -1228,8 +1222,7 @@ public:
         sal_Int16                                             transitionSubType,
         const uno::Reference< presentation::XSlideShowView >& view,
         const uno::Reference< rendering::XBitmap >&           leavingBitmap,
-        const uno::Reference< rendering::XBitmap >&           enteringBitmap )
-    throw (uno::RuntimeException, std::exception) override
+        const uno::Reference< rendering::XBitmap >&           enteringBitmap ) override
     {
         if( !hasTransition( transitionType, transitionSubType ) )
             return uno::Reference< presentation::XTransition >();
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index c515b7a9fac1..386956215cfe 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -113,7 +113,7 @@ public:
         }
 
     //---  XGraphicRenderer  -----------------------------------
-    virtual void SAL_CALL render( const uno::Reference< graphic::XGraphic >& rGraphic ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL render( const uno::Reference< graphic::XGraphic >& rGraphic ) override
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             mxGraphic = rGraphic;
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 64974d147d9d..0a5283387dc6 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -273,52 +273,39 @@ public:
 
 private:
     // XSlideShow:
-    virtual sal_Bool SAL_CALL nextEffect() throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL previousEffect() throw (uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL nextEffect() override;
+    virtual sal_Bool SAL_CALL previousEffect() override;
     virtual sal_Bool SAL_CALL startShapeActivity(
-        uno::Reference<drawing::XShape> const& xShape )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<drawing::XShape> const& xShape ) override;
     virtual sal_Bool SAL_CALL stopShapeActivity(
-        uno::Reference<drawing::XShape> const& xShape )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL pause( sal_Bool bPauseShow )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Reference<drawing::XDrawPage> SAL_CALL getCurrentSlide()
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<drawing::XShape> const& xShape ) override;
+    virtual sal_Bool SAL_CALL pause( sal_Bool bPauseShow ) override;
+    virtual uno::Reference<drawing::XDrawPage> SAL_CALL getCurrentSlide() override;
     virtual void SAL_CALL displaySlide(
         uno::Reference<drawing::XDrawPage> const& xSlide,
         uno::Reference<drawing::XDrawPagesSupplier> const& xDrawPages,
         uno::Reference<animations::XAnimationNode> const& xRootNode,
-        uno::Sequence<beans::PropertyValue> const& rProperties )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerUserPaintPolygons( const css::uno::Reference< css::lang::XMultiServiceFactory >& xDocFactory ) throw (css::uno::RuntimeException, std::exception) override;
+        uno::Sequence<beans::PropertyValue> const& rProperties ) override;
+    virtual void SAL_CALL registerUserPaintPolygons( const css::uno::Reference< css::lang::XMultiServiceFactory >& xDocFactory ) override;
     virtual sal_Bool SAL_CALL setProperty(
-        beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception) override;
+        beans::PropertyValue const& rProperty ) override;
     virtual sal_Bool SAL_CALL addView(
-        uno::Reference<presentation::XSlideShowView> const& xView )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<presentation::XSlideShowView> const& xView ) override;
     virtual sal_Bool SAL_CALL removeView(
-        uno::Reference<presentation::XSlideShowView> const& xView )
-        throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL update( double & nNextTimeout )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<presentation::XSlideShowView> const& xView ) override;
+    virtual sal_Bool SAL_CALL update( double & nNextTimeout ) override;
     virtual void SAL_CALL addSlideShowListener(
-        uno::Reference<presentation::XSlideShowListener> const& xListener )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<presentation::XSlideShowListener> const& xListener ) override;
     virtual void SAL_CALL removeSlideShowListener(
-        uno::Reference<presentation::XSlideShowListener> const& xListener )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<presentation::XSlideShowListener> const& xListener ) override;
     virtual void SAL_CALL addShapeEventListener(
         uno::Reference<presentation::XShapeEventListener> const& xListener,
-        uno::Reference<drawing::XShape> const& xShape )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<drawing::XShape> const& xShape ) override;
     virtual void SAL_CALL removeShapeEventListener(
         uno::Reference<presentation::XShapeEventListener> const& xListener,
-        uno::Reference<drawing::XShape> const& xShape )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<drawing::XShape> const& xShape ) override;
     virtual void SAL_CALL setShapeCursor(
-        uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape ) override;
 
     // CursorManager
 
@@ -1064,7 +1051,6 @@ void SlideShowImpl::displaySlide(
     uno::Reference<drawing::XDrawPagesSupplier> const& xDrawPages,
     uno::Reference<animations::XAnimationNode> const& xRootNode,
     uno::Sequence<beans::PropertyValue> const& rProperties )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1213,7 +1199,7 @@ void SlideShowImpl::redisplayCurrentSlide()
         });
 }
 
-sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException, std::exception)
+sal_Bool SlideShowImpl::nextEffect()
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1229,7 +1215,7 @@ sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException, std::exceptio
         return maEventMultiplexer.notifyNextEffect();
 }
 
-sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException, std::exception)
+sal_Bool SlideShowImpl::previousEffect()
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1274,7 +1260,6 @@ void SlideShowImpl::rewindEffectToPreviousSlide()
 
 sal_Bool SlideShowImpl::startShapeActivity(
     uno::Reference<drawing::XShape> const& /*xShape*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1288,7 +1273,6 @@ sal_Bool SlideShowImpl::startShapeActivity(
 
 sal_Bool SlideShowImpl::stopShapeActivity(
     uno::Reference<drawing::XShape> const& /*xShape*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1301,7 +1285,6 @@ sal_Bool SlideShowImpl::stopShapeActivity(
 }
 
 sal_Bool SlideShowImpl::pause( sal_Bool bPauseShow )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1323,7 +1306,6 @@ sal_Bool SlideShowImpl::pause( sal_Bool bPauseShow )
 }
 
 uno::Reference<drawing::XDrawPage> SlideShowImpl::getCurrentSlide()
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1341,7 +1323,6 @@ uno::Reference<drawing::XDrawPage> SlideShowImpl::getCurrentSlide()
 
 sal_Bool SlideShowImpl::addView(
     uno::Reference<presentation::XSlideShowView> const& xView )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1389,7 +1370,6 @@ sal_Bool SlideShowImpl::addView(
 
 sal_Bool SlideShowImpl::removeView(
     uno::Reference<presentation::XSlideShowView> const& xView )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1410,7 +1390,7 @@ sal_Bool SlideShowImpl::removeView(
     return true;
 }
 
-void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMultiServiceFactory >& xDocFactory ) throw (uno::RuntimeException, std::exception)
+void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMultiServiceFactory >& xDocFactory )
 {
     //Retrieve Polygons if user ends presentation by context menu
     if (mpCurrentSlide)
@@ -1522,7 +1502,6 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
 }
 
 sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1813,7 +1792,6 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
 
 void SlideShowImpl::addSlideShowListener(
     uno::Reference<presentation::XSlideShowListener> const& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1826,7 +1804,6 @@ void SlideShowImpl::addSlideShowListener(
 
 void SlideShowImpl::removeSlideShowListener(
     uno::Reference<presentation::XSlideShowListener> const& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1837,7 +1814,6 @@ void SlideShowImpl::removeSlideShowListener(
 void SlideShowImpl::addShapeEventListener(
     uno::Reference<presentation::XShapeEventListener> const& xListener,
     uno::Reference<drawing::XShape> const& xShape )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1870,7 +1846,6 @@ void SlideShowImpl::addShapeEventListener(
 void SlideShowImpl::removeShapeEventListener(
     uno::Reference<presentation::XShapeEventListener> const& xListener,
     uno::Reference<drawing::XShape> const& xShape )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1897,7 +1872,6 @@ void SlideShowImpl::removeShapeEventListener(
 
 void SlideShowImpl::setShapeCursor(
     uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1958,7 +1932,6 @@ void SlideShowImpl::resetCursor()
 }
 
 sal_Bool SlideShowImpl::update( double & nNextTimeout )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index e82ab8011e5e..d215fcfdaa0e 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -705,14 +705,11 @@ private:
     virtual bool isSoundEnabled() const override;
 
     // XEventListener:
-    virtual void SAL_CALL disposing( lang::EventObject const& evt )
-        throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( lang::EventObject const& evt ) override;
     // XModifyListener:
-    virtual void SAL_CALL modified( const lang::EventObject& aEvent )
-        throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const lang::EventObject& aEvent ) override;
     // XPaintListener:
-    virtual void SAL_CALL windowPaint( const awt::PaintEvent& e )
-        throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL windowPaint( const awt::PaintEvent& e ) override;
 
     // WeakComponentImplHelperBase:
     virtual void SAL_CALL disposing() override;
@@ -1015,7 +1012,6 @@ void SlideView::_dispose()
 
 // XEventListener
 void SlideView::disposing( lang::EventObject const& evt )
-    throw (uno::RuntimeException, std::exception)
 {
     (void)evt;
 
@@ -1057,7 +1053,6 @@ struct WeakRefWrapper
 
 // XModifyListener
 void SlideView::modified( const lang::EventObject& /*aEvent*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard const guard( m_aMutex );
 
@@ -1105,7 +1100,6 @@ void SlideView::modified( const lang::EventObject& /*aEvent*/ )
 
 // XPaintListener
 void SlideView::windowPaint( const awt::PaintEvent& /*e*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx
index 5845c332997c..4db733bb0cd2 100644
--- a/smoketest/smoketest.cxx
+++ b/smoketest/smoketest.cxx
@@ -74,18 +74,15 @@ public:
     explicit Listener(Result * result): result_(result) { OSL_ASSERT(result != nullptr); }
 
 private:
-    virtual void SAL_CALL disposing(css::lang::EventObject const &)
-        throw (css::uno::RuntimeException, std::exception) override {}
+    virtual void SAL_CALL disposing(css::lang::EventObject const &) override {}
 
     virtual void SAL_CALL dispatchFinished(
-        css::frame::DispatchResultEvent const & Result)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::frame::DispatchResultEvent const & Result) override;
 
     Result * result_;
 };
 
 void Listener::dispatchFinished(css::frame::DispatchResultEvent const & Result)
-    throw (css::uno::RuntimeException, std::exception)
 {
     result_->success =
         (Result.State == css::frame::DispatchResultState::SUCCESS) &&
@@ -106,8 +103,7 @@ public:
     { OSL_ASSERT(dispatch.is()); }
 
 private:
-    virtual void SAL_CALL notify(css::uno::Any const &)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL notify(css::uno::Any const &) override
     { dispatch_->dispatchWithNotification(url_, arguments_, listener_); }
 
     css::uno::Reference< css::frame::XNotifyingDispatch > dispatch_;
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 162b57ccd111..1e1bf9426632 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -91,14 +91,14 @@ public:
     explicit FileStreamWrapper_Impl(const OUString& rName);
     virtual ~FileStreamWrapper_Impl() override;
 
-    virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw ( IllegalArgumentException, IOException, RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition(  ) throw ( IOException, RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength(  ) throw ( IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) override;
-    virtual void      SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, RuntimeException, std::exception ) override;
-    virtual void      SAL_CALL closeInput() throw( NotConnectedException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL seek( sal_Int64 _nLocation ) override;
+    virtual sal_Int64 SAL_CALL getPosition(  ) override;
+    virtual sal_Int64 SAL_CALL getLength(  ) override;
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override;
+    virtual void      SAL_CALL skipBytes(sal_Int32 nBytesToSkip) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void      SAL_CALL closeInput() override;
 
 protected:
     void checkConnected();
@@ -130,7 +130,6 @@ FileStreamWrapper_Impl::~FileStreamWrapper_Impl()
 
 
 sal_Int32 SAL_CALL FileStreamWrapper_Impl::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception )
 {
     if ( m_aURL.isEmpty() )
     {
@@ -159,7 +158,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readBytes(Sequence< sal_Int8 >& aData
 }
 
 
-sal_Int32 SAL_CALL FileStreamWrapper_Impl::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL FileStreamWrapper_Impl::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
 {
     if ( m_aURL.isEmpty() )
     {
@@ -182,7 +181,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readSomeBytes(Sequence< sal_Int8 >& a
 }
 
 
-void SAL_CALL FileStreamWrapper_Impl::skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception )
+void SAL_CALL FileStreamWrapper_Impl::skipBytes(sal_Int32 nBytesToSkip)
 {
     if ( m_aURL.isEmpty() )
         return;
@@ -195,7 +194,7 @@ void SAL_CALL FileStreamWrapper_Impl::skipBytes(sal_Int32 nBytesToSkip) throw( N
 }
 
 
-sal_Int32 SAL_CALL FileStreamWrapper_Impl::available() throw( NotConnectedException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL FileStreamWrapper_Impl::available()
 {
     if ( m_aURL.isEmpty() )
         return 0;
@@ -217,7 +216,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::available() throw( NotConnectedExcept
 }
 
 
-void SAL_CALL FileStreamWrapper_Impl::closeInput() throw( NotConnectedException, RuntimeException, std::exception )
+void SAL_CALL FileStreamWrapper_Impl::closeInput()
 {
     if ( m_aURL.isEmpty() )
         return;
@@ -233,7 +232,7 @@ void SAL_CALL FileStreamWrapper_Impl::closeInput() throw( NotConnectedException,
 }
 
 
-void SAL_CALL FileStreamWrapper_Impl::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception)
+void SAL_CALL FileStreamWrapper_Impl::seek( sal_Int64 _nLocation )
 {
     if ( m_aURL.isEmpty() )
         return;
@@ -246,7 +245,7 @@ void SAL_CALL FileStreamWrapper_Impl::seek( sal_Int64 _nLocation ) throw (Illega
 }
 
 
-sal_Int64 SAL_CALL FileStreamWrapper_Impl::getPosition(  ) throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL FileStreamWrapper_Impl::getPosition(  )
 {
     if ( m_aURL.isEmpty() )
         return 0;
@@ -260,7 +259,7 @@ sal_Int64 SAL_CALL FileStreamWrapper_Impl::getPosition(  ) throw (IOException, R
 }
 
 
-sal_Int64 SAL_CALL FileStreamWrapper_Impl::getLength(  ) throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL FileStreamWrapper_Impl::getLength(  )
 {
     if ( m_aURL.isEmpty() )
         return 0;
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 9eff44665900..d8df5f6236f0 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -179,7 +179,6 @@ void OLESimpleStorage::UpdateOriginal_Impl()
 
 
 void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const uno::Reference< io::XInputStream >& xInputStream )
-    throw ( uno::Exception )
 {
     if ( !pStorage || aName.isEmpty() || !xInputStream.is() )
         throw uno::RuntimeException();
@@ -222,7 +221,6 @@ void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, c
 
 
 void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const uno::Reference< container::XNameAccess >& xNameAccess )
-    throw ( uno::Exception )
 {
     if ( !pStorage || aName.isEmpty() || !xNameAccess.is() )
         throw uno::RuntimeException();
@@ -269,10 +267,6 @@ void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, co
 
 
 void SAL_CALL OLESimpleStorage::insertByName( const OUString& aName, const uno::Any& aElement )
-        throw ( lang::IllegalArgumentException,
-                container::ElementExistException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -321,9 +315,6 @@ void SAL_CALL OLESimpleStorage::insertByName( const OUString& aName, const uno::
 
 
 void SAL_CALL OLESimpleStorage::removeByName( const OUString& aName )
-        throw ( container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -350,10 +341,6 @@ void SAL_CALL OLESimpleStorage::removeByName( const OUString& aName )
 
 
 void SAL_CALL OLESimpleStorage::replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw ( lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -378,9 +365,6 @@ void SAL_CALL OLESimpleStorage::replaceByName( const OUString& aName, const uno:
 
 
 uno::Any SAL_CALL OLESimpleStorage::getByName( const OUString& aName )
-        throw ( container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -484,7 +468,6 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const OUString& aName )
 
 
 uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getElementNames()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -512,7 +495,6 @@ uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getElementNames()
 
 
 sal_Bool SAL_CALL OLESimpleStorage::hasByName( const OUString& aName )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -535,7 +517,6 @@ sal_Bool SAL_CALL OLESimpleStorage::hasByName( const OUString& aName )
 
 
 uno::Type SAL_CALL OLESimpleStorage::getElementType()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -547,7 +528,6 @@ uno::Type SAL_CALL OLESimpleStorage::getElementType()
 
 
 sal_Bool SAL_CALL OLESimpleStorage::hasElements()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -574,7 +554,6 @@ sal_Bool SAL_CALL OLESimpleStorage::hasElements()
 
 
 void SAL_CALL OLESimpleStorage::dispose()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -599,7 +578,6 @@ void SAL_CALL OLESimpleStorage::dispose()
 
 void SAL_CALL OLESimpleStorage::addEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -615,7 +593,6 @@ void SAL_CALL OLESimpleStorage::addEventListener(
 
 void SAL_CALL OLESimpleStorage::removeEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -631,9 +608,6 @@ void SAL_CALL OLESimpleStorage::removeEventListener(
 
 
 void SAL_CALL OLESimpleStorage::commit()
-        throw ( css::io::IOException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -657,9 +631,6 @@ void SAL_CALL OLESimpleStorage::commit()
 
 
 void SAL_CALL OLESimpleStorage::revert()
-        throw ( css::io::IOException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -686,7 +657,6 @@ void SAL_CALL OLESimpleStorage::revert()
 
 
 uno::Sequence< sal_Int8 > SAL_CALL OLESimpleStorage::getClassID()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -700,34 +670,28 @@ uno::Sequence< sal_Int8 > SAL_CALL OLESimpleStorage::getClassID()
 }
 
 OUString SAL_CALL OLESimpleStorage::getClassName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString();
 }
 
 void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& /*aClassID*/,
                             const OUString& /*sClassName*/ )
-    throw ( lang::NoSupportException,
-            uno::RuntimeException, std::exception )
 {
     throw lang::NoSupportException();
 }
 
 //  XServiceInfo
 OUString SAL_CALL OLESimpleStorage::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.embed.OLESimpleStorage");
 }
 
 sal_Bool SAL_CALL OLESimpleStorage::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getSupportedServiceNames()
-        throw ( uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.embed.OLESimpleStorage" };
 }
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index 1689a2664264..1b5216998d19 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -55,12 +55,10 @@ class OLESimpleStorage : public cppu::WeakImplHelper<css::embed::XOLESimpleStora
     void UpdateOriginal_Impl();
 
     /// @throws css::uno::Exception
-    static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const css::uno::Reference< css::io::XInputStream >& xInputStream )
-    throw ( css::uno::Exception );
+    static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const css::uno::Reference< css::io::XInputStream >& xInputStream );
 
     /// @throws css::uno::Exception
-    static void InsertNameAccessToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const css::uno::Reference< css::container::XNameAccess >& xNameAccess )
-    throw ( css::uno::Exception );
+    static void InsertNameAccessToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const css::uno::Reference< css::container::XNameAccess >& xNameAccess );
 
 public:
 
@@ -71,88 +69,54 @@ public:
 
     //  XNameContainer
 
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-        throw ( css::lang::IllegalArgumentException,
-                css::container::ElementExistException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw ( css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-        throw ( css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
-    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;
 
     //  XComponent
 
-    virtual void SAL_CALL dispose()
-        throw ( css::uno::RuntimeException, std::exception ) final override;
+    virtual void SAL_CALL dispose() final override;
 
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
     //  XTransactedObject
 
-    virtual void SAL_CALL commit()
-        throw ( css::io::IOException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL commit() override;
 
-    virtual void SAL_CALL revert()
-        throw ( css::io::IOException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL revert() override;
 
     //  XClassifiedObject
 
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID() override;
 
-    virtual OUString SAL_CALL getClassName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getClassName() override;
 
     virtual void SAL_CALL setClassInfo( const css::uno::Sequence< ::sal_Int8 >& aClassID,
-                                        const OUString& sClassName )
-        throw ( css::lang::NoSupportException,
-                css::uno::RuntimeException, std::exception ) override;
+                                        const OUString& sClassName ) override;
 
     //  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( const OUString& ServiceName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 };
 
 #endif
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 34133b0fc6cb..4bf5a463b396 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -54,38 +54,36 @@ class SmModel : public SfxBaseModel,
 {
     std::unique_ptr<SmPrintUIOptions> m_pPrintUIOptions;
 protected:
-    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues )
-        throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
-    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue )
-        throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
+    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override;
+    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override;
 public:
     explicit SmModel( SfxObjectShell *pObjSh );
     virtual ~SmModel() throw () override;
 
     //XInterface
-    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw() override;
     virtual void SAL_CALL release(  ) throw() override;
 
     //XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XRenderable
-    virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) override;
+    virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) override;
 
     // oox::FormulaExportBase
     virtual void writeFormulaOoxml(::sax_fastparser::FSHelperPtr pSerializer,
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 8bce95381ab3..03cb93b650d1 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -164,13 +164,11 @@ void SmGraphicAccessible::LaunchEvent(
 }
 
 uno::Reference< XAccessibleContext > SAL_CALL SmGraphicAccessible::getAccessibleContext()
-    throw (RuntimeException, std::exception)
 {
     return this;
 }
 
 sal_Bool SAL_CALL SmGraphicAccessible::containsPoint( const awt::Point& aPoint )
-    throw (RuntimeException, std::exception)
 {
     //! the arguments coordinates are relative to the current window !
     //! Thus the top-left point is (0, 0)
@@ -186,7 +184,6 @@ sal_Bool SAL_CALL SmGraphicAccessible::containsPoint( const awt::Point& aPoint )
 
 uno::Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleAtPoint(
         const awt::Point& aPoint )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     XAccessible *pRes = nullptr;
@@ -196,7 +193,6 @@ uno::Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleAtPoint
 }
 
 awt::Rectangle SAL_CALL SmGraphicAccessible::getBounds()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -207,7 +203,6 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getBounds()
 }
 
 awt::Point SAL_CALL SmGraphicAccessible::getLocation()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -219,7 +214,6 @@ awt::Point SAL_CALL SmGraphicAccessible::getLocation()
 }
 
 awt::Point SAL_CALL SmGraphicAccessible::getLocationOnScreen()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -230,7 +224,6 @@ awt::Point SAL_CALL SmGraphicAccessible::getLocationOnScreen()
 }
 
 awt::Size SAL_CALL SmGraphicAccessible::getSize()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -248,7 +241,6 @@ awt::Size SAL_CALL SmGraphicAccessible::getSize()
 }
 
 void SAL_CALL SmGraphicAccessible::grabFocus()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -258,7 +250,6 @@ void SAL_CALL SmGraphicAccessible::grabFocus()
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getForeground()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -268,7 +259,6 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getForeground()
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getBackground()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -284,20 +274,17 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getBackground()
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleChildCount()
-    throw (RuntimeException, std::exception)
 {
     return 0;
 }
 
 Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleChild(
         sal_Int32 /*i*/ )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     throw IndexOutOfBoundsException();  // there is no child...
 }
 
 Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -309,7 +296,6 @@ Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent()
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_Int32 nIdx = -1;
@@ -325,13 +311,11 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent()
 }
 
 sal_Int16 SAL_CALL SmGraphicAccessible::getAccessibleRole()
-    throw (RuntimeException, std::exception)
 {
     return AccessibleRole::DOCUMENT;
 }
 
 OUString SAL_CALL SmGraphicAccessible::getAccessibleDescription()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SmDocShell *pDoc = GetDoc_Impl();
@@ -339,14 +323,12 @@ OUString SAL_CALL SmGraphicAccessible::getAccessibleDescription()
 }
 
 OUString SAL_CALL SmGraphicAccessible::getAccessibleName()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return aAccName;
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL SmGraphicAccessible::getAccessibleRelationSet()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Reference< XAccessibleRelationSet > xRelSet = new utl::AccessibleRelationSetHelper();
@@ -354,7 +336,6 @@ Reference< XAccessibleRelationSet > SAL_CALL SmGraphicAccessible::getAccessibleR
 }
 
 Reference< XAccessibleStateSet > SAL_CALL SmGraphicAccessible::getAccessibleStateSet()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ::utl::AccessibleStateSetHelper *pStateSet =
@@ -384,7 +365,6 @@ Reference< XAccessibleStateSet > SAL_CALL SmGraphicAccessible::getAccessibleStat
 }
 
 Locale SAL_CALL SmGraphicAccessible::getLocale()
-    throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     // should be the document language...
@@ -395,7 +375,6 @@ Locale SAL_CALL SmGraphicAccessible::getLocale()
 
 void SAL_CALL SmGraphicAccessible::addAccessibleEventListener(
         const Reference< XAccessibleEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -411,7 +390,6 @@ void SAL_CALL SmGraphicAccessible::addAccessibleEventListener(
 
 void SAL_CALL SmGraphicAccessible::removeAccessibleEventListener(
         const Reference< XAccessibleEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -430,13 +408,11 @@ void SAL_CALL SmGraphicAccessible::removeAccessibleEventListener(
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getCaretPosition()
-    throw (RuntimeException, std::exception)
 {
     return 0;
 }
 
 sal_Bool SAL_CALL SmGraphicAccessible::setCaretPosition( sal_Int32 nIndex )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aTxt( GetAccessibleText_Impl() );
@@ -446,7 +422,6 @@ sal_Bool SAL_CALL SmGraphicAccessible::setCaretPosition( sal_Int32 nIndex )
 }
 
 sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString aTxt( GetAccessibleText_Impl() );
@@ -458,7 +433,6 @@ sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex )
 Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttributes(
         sal_Int32 nIndex,
         const uno::Sequence< OUString > & /*rRequestedAttributes*/ )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_Int32 nLen = GetAccessibleText_Impl().getLength();
@@ -468,7 +442,6 @@ Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttri
 }
 
 awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nIndex )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -539,14 +512,12 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getCharacterCount()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return GetAccessibleText_Impl().getLength();
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint( const awt::Point& aPoint )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -609,19 +580,16 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint( const awt::Point& aPoin
 }
 
 OUString SAL_CALL SmGraphicAccessible::getSelectedText()
-    throw (RuntimeException, std::exception)
 {
     return OUString();
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getSelectionStart()
-    throw (RuntimeException, std::exception)
 {
     return -1;
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getSelectionEnd()
-    throw (RuntimeException, std::exception)
 {
     return -1;
 }
@@ -629,7 +597,6 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getSelectionEnd()
 sal_Bool SAL_CALL SmGraphicAccessible::setSelection(
         sal_Int32 nStartIndex,
         sal_Int32 nEndIndex )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_Int32 nLen = GetAccessibleText_Impl().getLength();
@@ -640,7 +607,6 @@ sal_Bool SAL_CALL SmGraphicAccessible::setSelection(
 }
 
 OUString SAL_CALL SmGraphicAccessible::getText()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return GetAccessibleText_Impl();
@@ -649,7 +615,6 @@ OUString SAL_CALL SmGraphicAccessible::getText()
 OUString SAL_CALL SmGraphicAccessible::getTextRange(
         sal_Int32 nStartIndex,
         sal_Int32 nEndIndex )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     //!! nEndIndex may be the string length per definition of the interface !!
     //!! text should be copied exclusive that end index though. And arguments
@@ -665,7 +630,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
     return aTxt.copy( nStart, nEnd - nStart );
 }
 
-css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     SolarMutexGuard aGuard;
     OUString aTxt( GetAccessibleText_Impl() );
@@ -685,7 +650,7 @@ css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sa
     return aResult;
 }
 
-css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     SolarMutexGuard aGuard;
     OUString aTxt( GetAccessibleText_Impl() );
@@ -706,7 +671,7 @@ css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex
     return aResult;
 }
 
-css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType )
 {
     SolarMutexGuard aGuard;
     OUString aTxt( GetAccessibleText_Impl() );
@@ -731,7 +696,6 @@ css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex
 sal_Bool SAL_CALL SmGraphicAccessible::copyText(
         sal_Int32 nStartIndex,
         sal_Int32 nEndIndex )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bReturn = false;
@@ -761,20 +725,17 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText(
 }
 
 OUString SAL_CALL SmGraphicAccessible::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString("SmGraphicAccessible");
 }
 
 sal_Bool SAL_CALL SmGraphicAccessible::supportsService(
         const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return  cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return Sequence< OUString >{
         "css::accessibility::Accessible",
@@ -1635,7 +1596,6 @@ void SmEditAccessible::ClearWin()
 
 // XAccessible
 uno::Reference< XAccessibleContext > SAL_CALL SmEditAccessible::getAccessibleContext(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return this;
@@ -1643,7 +1603,6 @@ uno::Reference< XAccessibleContext > SAL_CALL SmEditAccessible::getAccessibleCon
 
 // XAccessibleComponent
 sal_Bool SAL_CALL SmEditAccessible::containsPoint( const awt::Point& aPoint )
-    throw (RuntimeException, std::exception)
 {
     //! the arguments coordinates are relative to the current window !
     //! Thus the top left-point is (0, 0)
@@ -1658,7 +1617,6 @@ sal_Bool SAL_CALL SmEditAccessible::containsPoint( const awt::Point& aPoint )
 }
 
 uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleAtPoint( const awt::Point& aPoint )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pTextHelper)
@@ -1667,7 +1625,6 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleAtPoint( c
 }
 
 awt::Rectangle SAL_CALL SmEditAccessible::getBounds(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -1678,7 +1635,6 @@ awt::Rectangle SAL_CALL SmEditAccessible::getBounds(  )
 }
 
 awt::Point SAL_CALL SmEditAccessible::getLocation(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -1690,7 +1646,6 @@ awt::Point SAL_CALL SmEditAccessible::getLocation(  )
 }
 
 awt::Point SAL_CALL SmEditAccessible::getLocationOnScreen(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -1701,7 +1656,6 @@ awt::Point SAL_CALL SmEditAccessible::getLocationOnScreen(  )
 }
 
 awt::Size SAL_CALL SmEditAccessible::getSize(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -1719,7 +1673,6 @@ awt::Size SAL_CALL SmEditAccessible::getSize(  )
 }
 
 void SAL_CALL SmEditAccessible::grabFocus(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -1729,7 +1682,6 @@ void SAL_CALL SmEditAccessible::grabFocus(  )
 }
 
 sal_Int32 SAL_CALL SmEditAccessible::getForeground()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1739,7 +1691,6 @@ sal_Int32 SAL_CALL SmEditAccessible::getForeground()
 }
 
 sal_Int32 SAL_CALL SmEditAccessible::getBackground()
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1756,7 +1707,6 @@ sal_Int32 SAL_CALL SmEditAccessible::getBackground()
 
 // XAccessibleContext
 sal_Int32 SAL_CALL SmEditAccessible::getAccessibleChildCount(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pTextHelper)
@@ -1765,7 +1715,6 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleChildCount(  )
 }
 
 uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleChild( sal_Int32 i )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pTextHelper)
@@ -1774,7 +1723,6 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleChild( sal
 }
 
 uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleParent(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!pWin)
@@ -1786,7 +1734,6 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleParent(  )
 }
 
 sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_Int32 nIdx = -1;
@@ -1802,19 +1749,16 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent(  )
 }
 
 sal_Int16 SAL_CALL SmEditAccessible::getAccessibleRole(  )
-    throw (RuntimeException, std::exception)
 {
     return AccessibleRole::PANEL /*TEXT ?*/;
 }
 
 OUString SAL_CALL SmEditAccessible::getAccessibleDescription(  )
-    throw (RuntimeException, std::exception)
 {
     return OUString();  // empty as agreed with product-management
 }
 
 OUString SAL_CALL SmEditAccessible::getAccessibleName(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     // same name as displayed by the window when not docked
@@ -1822,14 +1766,12 @@ OUString SAL_CALL SmEditAccessible::getAccessibleName(  )
 }
 
 uno::Reference< XAccessibleRelationSet > SAL_CALL SmEditAccessible::getAccessibleRelationSet(  )
-    throw (RuntimeException, std::exception)
 {
     Reference< XAccessibleRelationSet > xRelSet = new utl::AccessibleRelationSetHelper();
     return xRelSet;   // empty relation set
 }
 
 uno::Reference< XAccessibleStateSet > SAL_CALL SmEditAccessible::getAccessibleStateSet(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     ::utl::AccessibleStateSetHelper *pStateSet =
@@ -1860,7 +1802,6 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SmEditAccessible::getAccessibleSt
 }
 
 Locale SAL_CALL SmEditAccessible::getLocale(  )
-    throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     // should be the document language...
@@ -1871,34 +1812,29 @@ Locale SAL_CALL SmEditAccessible::getLocale(  )
 
 // XAccessibleEventBroadcaster
 void SAL_CALL SmEditAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if (pTextHelper)   // not disposing (about to destroy view shell)
         pTextHelper->AddEventListener( xListener );
 }
 
 void SAL_CALL SmEditAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
    if (pTextHelper)   // not disposing (about to destroy view shell)
         pTextHelper->RemoveEventListener( xListener );
 }
 
 OUString SAL_CALL SmEditAccessible::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString("SmEditAccessible");
 }
 
 sal_Bool SAL_CALL SmEditAccessible::supportsService(
         const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return  cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return Sequence< OUString >{
         "css::accessibility::Accessible",
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 5e1cb6fe7b47..9c1095fd4df6 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -85,58 +85,58 @@ public:
                             const css::uno::Any &rNewVal);
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition(  ) override;
+    virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) override;
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount(  ) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual OUString SAL_CALL getSelectedText(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectionStart(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd(  ) override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual OUString SAL_CALL getText(  ) override;
+    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 
@@ -327,39 +327,39 @@ public:
     EditView   * GetEditView()      { return pWin ? pWin->GetEditView() : nullptr; }
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index c9a6ca8637da..e3cad9559e5b 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -367,7 +367,6 @@ SmXMLExport::SmXMLExport(
 
 sal_Int64 SAL_CALL SmXMLExport::getSomething(
     const uno::Sequence< sal_Int8 >& rId )
-throw(uno::RuntimeException, std::exception)
 {
     if ( rId.getLength() == 16 &&
         0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 7d9adcdc7d75..a706457a83a1 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -99,7 +99,7 @@ public:
         OUString const & implementationName, SvXMLExportFlags nExportFlags);
 
     // XUnoTunnel
-    sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
 
     void ExportAutoStyles_() override {}
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index b080317083a4..99a6127011ae 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -427,7 +427,6 @@ uno::Sequence< OUString > SAL_CALL SmXMLImport_getSupportedServiceNames()
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance(
     const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-    throw( uno::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new SmXMLImport(comphelper::getComponentContext(rSMgr), SmXMLImport_getImplementationName(), SvXMLImportFlags::ALL));
 }
@@ -446,7 +445,6 @@ throw()
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLImportMeta_createInstance(
     const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-throw( uno::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new SmXMLImport( comphelper::getComponentContext(rSMgr), SmXMLImportMeta_getImplementationName(), SvXMLImportFlags::META ));
 }
@@ -465,14 +463,12 @@ uno::Sequence< OUString > SAL_CALL SmXMLImportSettings_getSupportedServiceNames(
 
 uno::Reference< uno::XInterface > SAL_CALL SmXMLImportSettings_createInstance(
     const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-    throw( uno::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new SmXMLImport( comphelper::getComponentContext(rSMgr), SmXMLImportSettings_getImplementationName(), SvXMLImportFlags::SETTINGS ));
 }
 
 sal_Int64 SAL_CALL SmXMLImport::getSomething(
     const uno::Sequence< sal_Int8 >&rId )
-throw(uno::RuntimeException, std::exception)
 {
     if ( rId.getLength() == 16 &&
         0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -483,7 +479,6 @@ throw(uno::RuntimeException, std::exception)
 }
 
 void SmXMLImport::endDocument()
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     //Set the resulted tree into the SmDocShell where it belongs
     SmNode *pTree = popOrZero(aNodeStack);
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 3f8f376f3190..addab491ca3f 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -91,12 +91,10 @@ public:
     virtual ~SmXMLImport() throw () override;
 
     // XUnoTunnel
-    sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
 
-    void SAL_CALL endDocument()
-        throw( css::xml::sax::SAXException,
-        css::uno::RuntimeException, std::exception ) override;
+    void SAL_CALL endDocument() override;
 
     SvXMLImportContext *CreateContext(sal_uInt16 nPrefix,
         const OUString &rLocalName,
diff --git a/starmath/source/register.hxx b/starmath/source/register.hxx
index 49aa33dee750..9cdd82a06bb6 100644
--- a/starmath/source/register.hxx
+++ b/starmath/source/register.hxx
@@ -30,7 +30,7 @@ OUString SAL_CALL
         SmDocument_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >SAL_CALL
-        SmDocument_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags) throw( css::uno::Exception );
+        SmDocument_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, SfxModelFlags _nCreationFlags);
 
 //MathML import
 css::uno::Sequence< OUString > SAL_CALL
@@ -39,20 +39,20 @@ OUString SAL_CALL
         SmXMLImport_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL
-        SmXMLImport_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+        SmXMLImport_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 css::uno::Sequence< OUString > SAL_CALL
         SmXMLImportMeta_getSupportedServiceNames() throw();
 OUString SAL_CALL
         SmXMLImportMeta_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL
-        SmXMLImportMeta_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+        SmXMLImportMeta_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 css::uno::Sequence< OUString > SAL_CALL
         SmXMLImportSettings_getSupportedServiceNames() throw();
 OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL
-        SmXMLImportSettings_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+        SmXMLImportSettings_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 
 #endif
 
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 18dfa736bd51..55283530e86a 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -43,7 +43,7 @@ SmFilterDetect::~SmFilterDetect()
 {
 }
 
-OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException, std::exception )
+OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor )
 {
     MediaDescriptor aMediaDesc( lDescriptor );
     uno::Reference< io::XInputStream > xInStream ( aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY );
@@ -119,19 +119,19 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
 }
 
 /* XServiceInfo */
-OUString SAL_CALL SmFilterDetect::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SmFilterDetect::getImplementationName()
 {
     return impl_getStaticImplementationName();
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SmFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SmFilterDetect::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames()
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -149,7 +149,7 @@ OUString SmFilterDetect::impl_getStaticImplementationName()
 }
 
 /* Helper for registry */
-Reference< XInterface > SAL_CALL SmFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception )
+Reference< XInterface > SAL_CALL SmFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
 {
     return Reference< XInterface >( *new SmFilterDetect( xServiceManager ) );
 }
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index e9c31a378ee1..e3896d784924 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -58,9 +58,9 @@ public:
     virtual                 ~SmFilterDetect() override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::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;
 
     /* Helper for XServiceInfo */
     static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
@@ -68,10 +68,10 @@ public:
 
     /* Helper for registry */
     /// @throws css::uno::Exception
-    static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
     // XExtendedFilterDetect
-    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override;
 };
 
 #endif
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index df5a5974f4f1..7988beef365a 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -40,7 +40,7 @@ uno::Sequence< OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw()
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance(
-                const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/, SfxModelFlags _nCreationFlags ) throw( uno::Exception )
+                const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/, SfxModelFlags _nCreationFlags )
 {
     SolarMutexGuard aGuard;
     SmGlobals::ensure();
diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx
index be7e0a4af5b5..329622dd81b6 100644
--- a/starmath/source/unofilter.cxx
+++ b/starmath/source/unofilter.cxx
@@ -32,21 +32,21 @@ public:
     MathTypeFilter();
 
     // XFilter
-    sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
-    void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) override;
+    void SAL_CALL cancel() override;
 
     // XImporter
-    void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (uno::RuntimeException, std::exception) override;
-    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 MathTypeFilter::MathTypeFilter() = default;
 
-sal_Bool MathTypeFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw(uno::RuntimeException, std::exception)
+sal_Bool MathTypeFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescriptor)
 {
     bool bSuccess = false;
     try
@@ -87,26 +87,26 @@ sal_Bool MathTypeFilter::filter(const uno::Sequence<beans::PropertyValue>& rDesc
     return bSuccess;
 }
 
-void MathTypeFilter::cancel() throw(uno::RuntimeException, std::exception)
+void MathTypeFilter::cancel()
 {
 }
 
-void MathTypeFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void MathTypeFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc)
 {
     m_xDstDoc = xDoc;
 }
 
-OUString MathTypeFilter::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString MathTypeFilter::getImplementationName()
 {
     return OUString("com.sun.star.comp.Math.MathTypeFilter");
 }
 
-sal_Bool MathTypeFilter::supportsService(const OUString& rServiceName) throw(uno::RuntimeException, std::exception)
+sal_Bool MathTypeFilter::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence<OUString> MathTypeFilter::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> MathTypeFilter::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet =
     {
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 63f565190d81..94a1567df14e 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -314,7 +314,7 @@ SmModel::~SmModel() throw ()
 {
 }
 
-uno::Any SAL_CALL SmModel::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SmModel::queryInterface( const uno::Type& rType )
 {
     uno::Any aRet =  ::cppu::queryInterface ( rType,
                                     // OWeakObject interfaces
@@ -341,7 +341,7 @@ void SAL_CALL SmModel::release() throw()
     OWeakObject::release();
 }
 
-uno::Sequence< uno::Type > SAL_CALL SmModel::getTypes(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL SmModel::getTypes(  )
 {
     SolarMutexGuard aGuard;
     uno::Sequence< uno::Type > aTypes = SfxBaseModel::getTypes();
@@ -367,7 +367,6 @@ const uno::Sequence< sal_Int8 > & SmModel::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SmModel::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -389,17 +388,17 @@ static sal_Int16 lcl_AnyToINT16(const uno::Any& rAny)
     return nRet;
 }
 
-OUString SmModel::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SmModel::getImplementationName()
 {
     return OUString("com.sun.star.comp.Math.FormulaDocument");
 }
 
-sal_Bool SmModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SmModel::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SmModel::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SmModel::getSupportedServiceNames()
 {
     return uno::Sequence<OUString>{
         "com.sun.star.document.OfficeDocument",
@@ -408,7 +407,6 @@ uno::Sequence< OUString > SmModel::getSupportedServiceNames() throw( uno::Runtim
 }
 
 void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* pValues)
-    throw (RuntimeException, UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -692,7 +690,6 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
 }
 
 void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValue )
-    throw (RuntimeException, UnknownPropertyException, WrappedTargetException, std::exception)
 {
     SmDocShell *pDocSh = static_cast < SmDocShell * > (GetObjectShell());
 
@@ -904,7 +901,6 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
 sal_Int32 SAL_CALL SmModel::getRendererCount(
         const uno::Any& /*rSelection*/,
         const uno::Sequence< beans::PropertyValue >& /*xOptions*/ )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return 1;
@@ -936,7 +932,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SmModel::getRenderer(
         sal_Int32 nRenderer,
         const uno::Any& /*rSelection*/,
         const uno::Sequence< beans::PropertyValue >& /*rxOptions*/ )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -973,7 +968,6 @@ void SAL_CALL SmModel::render(
         sal_Int32 nRenderer,
         const uno::Any& rSelection,
         const uno::Sequence< beans::PropertyValue >& rxOptions )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1069,7 +1063,6 @@ void SAL_CALL SmModel::render(
 }
 
 void SAL_CALL SmModel::setParent( const uno::Reference< uno::XInterface >& xParent)
-        throw( lang::NoSupportException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SfxBaseModel::setParent( xParent );
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index 5f4676e192fb..6638493ad3fa 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -99,45 +99,45 @@ class IdlReflectionServiceImpl
 
 public:
     /// @throws css::uno::RuntimeException
-    const css::uno::Mapping & getCpp2Uno() throw(css::uno::RuntimeException);
+    const css::uno::Mapping & getCpp2Uno();
     /// @throws css::uno::RuntimeException
-    const css::uno::Mapping & getUno2Cpp() throw(css::uno::RuntimeException);
+    const css::uno::Mapping & getUno2Cpp();
     /// @throws css::uno::RuntimeException
-    uno_Interface * mapToUno( const css::uno::Any & rObj, typelib_InterfaceTypeDescription * pTo ) throw(css::uno::RuntimeException);
+    uno_Interface * mapToUno( const css::uno::Any & rObj, typelib_InterfaceTypeDescription * pTo );
 
     // ctor/ dtor
     explicit IdlReflectionServiceImpl( const css::uno::Reference< css::uno::XComponentContext > & xContext );
     virtual ~IdlReflectionServiceImpl() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // some XComponent part from OComponentHelper
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XIdlReflection
-    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL forName( const OUString & rTypeName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getType( const css::uno::Any & rObj ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL forName( const OUString & rTypeName ) override;
+    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getType( const css::uno::Any & rObj ) override;
 
     // XHierarchicalNameAccess
-    virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString & rName ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString & rName ) override;
+    virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & rName ) override;
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescription * pTypeDescr ) throw(css::uno::RuntimeException);
+    css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescription * pTypeDescr );
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescriptionReference * pRef ) throw(css::uno::RuntimeException);
+    css::uno::Reference< css::reflection::XIdlClass > forType( typelib_TypeDescriptionReference * pRef );
 };
 
 
@@ -165,30 +165,30 @@ public:
     virtual ~IdlClassImpl() override;
 
     // XIdlClassImpl default implementation
-    virtual css::uno::TypeClass SAL_CALL getTypeClass() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL equals( const css::uno::Reference< css::reflection::XIdlClass >& xType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::TypeClass SAL_CALL getTypeClass() override;
+    virtual OUString SAL_CALL getName() override;
+    virtual sal_Bool SAL_CALL equals( const css::uno::Reference< css::reflection::XIdlClass >& xType ) override;
 
-    virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL createObject( css::uno::Any & rObj ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) override;
+    virtual void SAL_CALL createObject( css::uno::Any & rObj ) override;
 
     // def impl ????
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getClasses() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getClass( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getInterfaces() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getClasses() override;
+    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getClass( const OUString & rName ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getInterfaces() override;
 
     // structs, interfaces
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() override;
     // structs
-    virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() override;
     // interfaces
-    virtual css::uno::Uik SAL_CALL getUik() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Uik SAL_CALL getUik() override;
+    virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() override;
     // array
-    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() override;
+    virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() override;
 };
 
 
@@ -223,14 +223,14 @@ public:
     virtual ~InterfaceIdlClassImpl() override;
 
     // IdlClassImpl modifications
-    virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Uik SAL_CALL getUik() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL createObject( css::uno::Any & rObj ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() override;
+    virtual css::uno::Uik SAL_CALL getUik() override;
+    virtual css::uno::Reference< css::reflection::XIdlMethod > SAL_CALL getMethod( const OUString & rName ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlMethod > > SAL_CALL getMethods() override;
+    virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() override;
+    virtual void SAL_CALL createObject( css::uno::Any & rObj ) override;
 };
 
 
@@ -257,10 +257,10 @@ public:
     virtual ~CompoundIdlClassImpl() override;
 
     // IdlClassImpl modifications
-    virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass > > SAL_CALL getSuperclasses() override;
+    virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() override;
 };
 
 
@@ -279,24 +279,24 @@ public:
         : IdlClassImpl( pReflection, rName, eTypeClass, pTypeDescr )
         {}
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // IdlClassImpl modifications
-    virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) override;
+    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getComponentType() override;
+    virtual css::uno::Reference< css::reflection::XIdlArray > SAL_CALL getArray() override;
 
     // XIdlArray
-    virtual void SAL_CALL realloc( css::uno::Any & rArray, sal_Int32 nLen ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getLen( const css::uno::Any & rArray ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL get( const css::uno::Any & rArray, sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::lang::ArrayIndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL set( css::uno::Any & rArray, sal_Int32 nIndex, const css::uno::Any & rNewValue ) throw(css::lang::IllegalArgumentException, css::lang::ArrayIndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL realloc( css::uno::Any & rArray, sal_Int32 nLen ) override;
+    virtual sal_Int32 SAL_CALL getLen( const css::uno::Any & rArray ) override;
+    virtual css::uno::Any SAL_CALL get( const css::uno::Any & rArray, sal_Int32 nIndex ) override;
+    virtual void SAL_CALL set( css::uno::Any & rArray, sal_Int32 nIndex, const css::uno::Any & rNewValue ) override;
 };
 
 
@@ -320,9 +320,9 @@ public:
     virtual ~EnumIdlClassImpl() override;
 
     // IdlClassImpl modifications
-    virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL createObject( css::uno::Any & rObj ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlField > > SAL_CALL getFields() override;
+    virtual void SAL_CALL createObject( css::uno::Any & rObj ) override;
 };
 
 
@@ -353,8 +353,8 @@ public:
     virtual ~IdlMemberImpl() override;
 
     // XIdlMember
-    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getDeclaringClass() override;
+    virtual OUString SAL_CALL getName() override;
 };
 
 
diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx
index 1241430aebcc..3ab0b557a28a 100644
--- a/stoc/source/corereflection/crarray.cxx
+++ b/stoc/source/corereflection/crarray.cxx
@@ -33,7 +33,6 @@ namespace stoc_corefl
 // XInterface
 
 Any ArrayIdlClassImpl::queryInterface( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlArray * >( this ) ) );
     return (aRet.hasValue() ? aRet : IdlClassImpl::queryInterface( rType ));
@@ -52,7 +51,6 @@ void ArrayIdlClassImpl::release() throw()
 // XTypeProvider
 
 Sequence< Type > ArrayIdlClassImpl::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     static ::cppu::OTypeCollection * s_pTypes = nullptr;
     if (! s_pTypes)
@@ -70,7 +68,6 @@ Sequence< Type > ArrayIdlClassImpl::getTypes()
 }
 
 Sequence< sal_Int8 > ArrayIdlClassImpl::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -78,7 +75,6 @@ Sequence< sal_Int8 > ArrayIdlClassImpl::getImplementationId()
 // XIdlArray
 
 void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen )
-    throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     TypeClass eTC = rArray.getValueTypeClass();
     if (eTC != TypeClass_SEQUENCE)
@@ -103,7 +99,6 @@ void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen )
 }
 
 sal_Int32 ArrayIdlClassImpl::getLen( const Any & rArray )
-    throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     TypeClass eTC = rArray.getValueTypeClass();
     if (eTC != TypeClass_SEQUENCE)
@@ -117,7 +112,6 @@ sal_Int32 ArrayIdlClassImpl::getLen( const Any & rArray )
 }
 
 Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex )
-    throw(css::lang::IllegalArgumentException, css::lang::ArrayIndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     TypeClass eTC = rArray.getValueTypeClass();
     if (eTC != TypeClass_SEQUENCE)
@@ -148,7 +142,6 @@ Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex )
 
 
 void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewValue )
-    throw(css::lang::IllegalArgumentException, css::lang::ArrayIndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     TypeClass eTC = rArray.getValueTypeClass();
     if (eTC != TypeClass_SEQUENCE)
@@ -191,7 +184,6 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal
 // ArrayIdlClassImpl
 
 sal_Bool ArrayIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return (xType.is() &&
             (equals( xType ) ||
@@ -200,13 +192,11 @@ sal_Bool ArrayIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xTy
 }
 
 Reference< XIdlClass > ArrayIdlClassImpl::getComponentType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return getReflection()->forType( getTypeDescr()->pType );
 }
 
 Reference< XIdlArray > ArrayIdlClassImpl::getArray()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return this;
 }
diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx
index a1deec9b9368..3352e85ebc3d 100644
--- a/stoc/source/corereflection/crbase.cxx
+++ b/stoc/source/corereflection/crbase.cxx
@@ -87,19 +87,16 @@ IdlClassImpl::~IdlClassImpl()
 // XIdlClassImpl default implementation
 
 TypeClass IdlClassImpl::getTypeClass()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return _eTypeClass;
 }
 
 OUString IdlClassImpl::getName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return _aName;
 }
 
 sal_Bool IdlClassImpl::equals( const Reference< XIdlClass >& xType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return (xType.is() &&
             (xType->getTypeClass() == _eTypeClass) && (xType->getName() == _aName));
@@ -122,7 +119,6 @@ static const bool s_aAssignableFromTab[11][11] =
 };
 
 sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     TypeClass eAssign = getTypeClass();
     if (equals( xType ) || eAssign == TypeClass_ANY) // default shot
@@ -142,7 +138,6 @@ sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
 }
 
 void IdlClassImpl::createObject( Any & rObj )
-    throw(css::uno::RuntimeException, std::exception)
 {
     rObj.clear();
     uno_any_destruct( &rObj, reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
@@ -152,21 +147,18 @@ void IdlClassImpl::createObject( Any & rObj )
 // what TODO ????
 
 Sequence< Reference< XIdlClass > > IdlClassImpl::getClasses()
-    throw(css::uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "### unexpected use!" );
     return Sequence< Reference< XIdlClass > >();
 }
 
 Reference< XIdlClass > IdlClassImpl::getClass( const OUString & )
-    throw(css::uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "### unexpected use!" );
     return Reference< XIdlClass >();
 }
 
 Sequence< Reference< XIdlClass > > IdlClassImpl::getInterfaces()
-    throw(css::uno::RuntimeException, std::exception)
 {
 //      OSL_FAIL( "### unexpected use!" );
     return Sequence< Reference< XIdlClass > >();
@@ -174,52 +166,45 @@ Sequence< Reference< XIdlClass > > IdlClassImpl::getInterfaces()
 
 // structs, interfaces
 
-Sequence< Reference< XIdlClass > > IdlClassImpl::getSuperclasses() throw(css::uno::RuntimeException, std::exception)
+Sequence< Reference< XIdlClass > > IdlClassImpl::getSuperclasses()
 {
     return Sequence< Reference< XIdlClass > >();
 }
 // structs
 
 Reference< XIdlField > IdlClassImpl::getField( const OUString & )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference< XIdlField >();
 }
 
 Sequence< Reference< XIdlField > > IdlClassImpl::getFields()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Sequence< Reference< XIdlField > >();
 }
 // interfaces
 
 Uik IdlClassImpl::getUik()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Uik();
 }
 
 Reference< XIdlMethod > IdlClassImpl::getMethod( const OUString & )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference< XIdlMethod >();
 }
 
 Sequence< Reference< XIdlMethod > > IdlClassImpl::getMethods()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Sequence< Reference< XIdlMethod > >();
 }
 // array
 
 Reference< XIdlClass > IdlClassImpl::getComponentType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference< XIdlClass >();
 }
 
 Reference< XIdlArray > IdlClassImpl::getArray()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference< XIdlArray >();
 }
@@ -250,7 +235,6 @@ IdlMemberImpl::~IdlMemberImpl()
 // XIdlMember
 
 Reference< XIdlClass > IdlMemberImpl::getDeclaringClass()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _xDeclClass.is())
     {
@@ -263,7 +247,6 @@ Reference< XIdlClass > IdlMemberImpl::getDeclaringClass()
 }
 
 OUString IdlMemberImpl::getName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return _aName;
 }
diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx
index 3596e220a3c4..3dd101f2979f 100644
--- a/stoc/source/corereflection/crcomp.cxx
+++ b/stoc/source/corereflection/crcomp.cxx
@@ -50,30 +50,29 @@ public:
         {}
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( const Type & rType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( const Type & rType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XTypeProvider
-    virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XIdlMember
-    virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() override;
+    virtual OUString SAL_CALL getName() override;
     // XIdlField
-    virtual Reference< XIdlClass > SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual FieldAccessMode SAL_CALL getAccessMode() throw(css::uno::RuntimeException, std::exception) override;
-    virtual Any SAL_CALL get( const Any & rObj ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+    virtual Reference< XIdlClass > SAL_CALL getType() override;
+    virtual FieldAccessMode SAL_CALL getAccessMode() override;
+    virtual Any SAL_CALL get( const Any & rObj ) override;
+    virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) override;
     // XIdlField2: getType, getAccessMode and get are equal to XIdlField
-    virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL set( Any & rObj, const Any & rValue ) override;
 };
 
 // XInterface
 
 Any IdlCompFieldImpl::queryInterface( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Any aRet( ::cppu::queryInterface( rType,
                                       static_cast< XIdlField * >( this ),
@@ -94,7 +93,6 @@ void IdlCompFieldImpl::release() throw()
 // XTypeProvider
 
 Sequence< Type > IdlCompFieldImpl::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     static ::cppu::OTypeCollection * s_pTypes = nullptr;
     if (! s_pTypes)
@@ -113,7 +111,6 @@ Sequence< Type > IdlCompFieldImpl::getTypes()
 }
 
 Sequence< sal_Int8 > IdlCompFieldImpl::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -121,7 +118,6 @@ Sequence< sal_Int8 > IdlCompFieldImpl::getImplementationId()
 // XIdlMember
 
 Reference< XIdlClass > IdlCompFieldImpl::getDeclaringClass()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _xDeclClass.is())
     {
@@ -149,7 +145,6 @@ Reference< XIdlClass > IdlCompFieldImpl::getDeclaringClass()
 }
 
 OUString IdlCompFieldImpl::getName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return IdlMemberImpl::getName();
 }
@@ -157,19 +152,16 @@ OUString IdlCompFieldImpl::getName()
 // XIdlField
 
 Reference< XIdlClass > IdlCompFieldImpl::getType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return getReflection()->forType( getTypeDescr() );
 }
 
 FieldAccessMode IdlCompFieldImpl::getAccessMode()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return FieldAccessMode_READWRITE;
 }
 
 Any IdlCompFieldImpl::get( const Any & rObj )
-    throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     if (rObj.getValueTypeClass() == css::uno::TypeClass_STRUCT ||
         rObj.getValueTypeClass() == css::uno::TypeClass_EXCEPTION)
@@ -202,7 +194,6 @@ Any IdlCompFieldImpl::get( const Any & rObj )
 }
 
 void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue )
-    throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
 {
     if (rObj.getValueTypeClass() == css::uno::TypeClass_STRUCT ||
         rObj.getValueTypeClass() == css::uno::TypeClass_EXCEPTION)
@@ -239,7 +230,6 @@ void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue )
 
 
 void IdlCompFieldImpl::set( Any & rObj, const Any & rValue )
-    throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
 {
     if (rObj.getValueTypeClass() == css::uno::TypeClass_STRUCT ||
         rObj.getValueTypeClass() == css::uno::TypeClass_EXCEPTION)
@@ -281,7 +271,6 @@ CompoundIdlClassImpl::~CompoundIdlClassImpl()
 
 
 sal_Bool CompoundIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (xType.is())
     {
@@ -305,7 +294,6 @@ sal_Bool CompoundIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > &
 }
 
 Sequence< Reference< XIdlClass > > CompoundIdlClassImpl::getSuperclasses()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _xSuperClass.is())
     {
@@ -324,7 +312,6 @@ Sequence< Reference< XIdlClass > > CompoundIdlClassImpl::getSuperclasses()
 }
 
 Reference< XIdlField > CompoundIdlClassImpl::getField( const OUString & rName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _pFields)
         getFields(); // init fields
@@ -337,7 +324,6 @@ Reference< XIdlField > CompoundIdlClassImpl::getField( const OUString & rName )
 }
 
 Sequence< Reference< XIdlField > > CompoundIdlClassImpl::getFields()
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutexAccess() );
     if (! _pFields)
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 3d1793e0363f..999493113584 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -71,7 +71,6 @@ IdlReflectionServiceImpl::~IdlReflectionServiceImpl() {}
 // XInterface
 
 Any IdlReflectionServiceImpl::queryInterface( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Any aRet( ::cppu::queryInterface(
         rType,
@@ -95,7 +94,6 @@ void IdlReflectionServiceImpl::release() throw()
 // XTypeProvider
 
 Sequence< Type > IdlReflectionServiceImpl::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     static OTypeCollection * s_pTypes = nullptr;
     if (! s_pTypes)
@@ -115,7 +113,6 @@ Sequence< Type > IdlReflectionServiceImpl::getTypes()
 }
 
 Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -123,7 +120,6 @@ Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId()
 // XComponent
 
 void IdlReflectionServiceImpl::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     OComponentHelper::dispose();
 
@@ -143,19 +139,16 @@ void IdlReflectionServiceImpl::dispose()
 // XServiceInfo
 
 OUString IdlReflectionServiceImpl::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return core_getImplementationName();
 }
 
 sal_Bool IdlReflectionServiceImpl::supportsService( const OUString & rServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > IdlReflectionServiceImpl::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return core_getSupportedServiceNames();
 }
@@ -163,7 +156,6 @@ Sequence< OUString > IdlReflectionServiceImpl::getSupportedServiceNames()
 // XIdlReflection
 
 Reference< XIdlClass > IdlReflectionServiceImpl::getType( const Any & rObj )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return (rObj.hasValue() ? forType( rObj.getValueTypeRef() ) : Reference< XIdlClass >());
 }
@@ -215,7 +207,6 @@ inline Reference< XIdlClass > IdlReflectionServiceImpl::constructClass(
 }
 
 Reference< XIdlClass > IdlReflectionServiceImpl::forName( const OUString & rTypeName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Reference< XIdlClass > xRet;
     Any aAny( _aElements.getValue( rTypeName ) );
@@ -243,7 +234,6 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forName( const OUString & rType
 // XHierarchicalNameAccess
 
 Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName )
-    throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
 {
     Any aRet( _aElements.getValue( rName ) );
     if (! aRet.hasValue())
@@ -297,7 +287,6 @@ Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName )
 }
 
 sal_Bool IdlReflectionServiceImpl::hasByHierarchicalName( const OUString & rName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     try
     {
@@ -311,7 +300,6 @@ sal_Bool IdlReflectionServiceImpl::hasByHierarchicalName( const OUString & rName
 
 
 Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescription * pTypeDescr )
-    throw(css::uno::RuntimeException)
 {
     Reference< XIdlClass > xRet;
     OUString aName( pTypeDescr->pTypeName );
@@ -331,7 +319,6 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptio
 }
 
 Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptionReference * pRef )
-    throw(css::uno::RuntimeException)
 {
     typelib_TypeDescription * pTD = nullptr;
     TYPELIB_DANGER_GET( &pTD, pRef );
@@ -348,7 +335,6 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptio
 
 
 const Mapping & IdlReflectionServiceImpl::getCpp2Uno()
-    throw(css::uno::RuntimeException)
 {
     if (! _aCpp2Uno.is())
     {
@@ -371,7 +357,6 @@ const Mapping & IdlReflectionServiceImpl::getCpp2Uno()
 }
 
 const Mapping & IdlReflectionServiceImpl::getUno2Cpp()
-    throw(css::uno::RuntimeException)
 {
     if (! _aUno2Cpp.is())
     {
@@ -395,7 +380,6 @@ const Mapping & IdlReflectionServiceImpl::getUno2Cpp()
 
 uno_Interface * IdlReflectionServiceImpl::mapToUno(
     const Any & rObj, typelib_InterfaceTypeDescription * pTo )
-    throw(css::uno::RuntimeException)
 {
     Reference< XInterface > xObj;
     if (extract( rObj, pTo, xObj, this ))
@@ -409,7 +393,6 @@ uno_Interface * IdlReflectionServiceImpl::mapToUno(
 /// @throws css::uno::Exception
 Reference< XInterface > SAL_CALL IdlReflectionServiceImpl_create(
     const Reference< XComponentContext > & xContext )
-    throw(css::uno::Exception)
 {
     return Reference< XInterface >( static_cast<XWeak *>(static_cast<OWeakObject *>(new IdlReflectionServiceImpl( xContext ))) );
 }
diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx
index 594897049fef..b5a4f1ca1fcf 100644
--- a/stoc/source/corereflection/crenum.cxx
+++ b/stoc/source/corereflection/crenum.cxx
@@ -44,30 +44,29 @@ public:
         {}
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( const Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XTypeProvider
-    virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XIdlMember
-    virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() override;
+    virtual OUString SAL_CALL getName() override;
     // XIdlField
-    virtual Reference< XIdlClass > SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual FieldAccessMode SAL_CALL getAccessMode() throw(css::uno::RuntimeException, std::exception) override;
-    virtual Any SAL_CALL get( const Any & rObj ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+    virtual Reference< XIdlClass > SAL_CALL getType() override;
+    virtual FieldAccessMode SAL_CALL getAccessMode() override;
+    virtual Any SAL_CALL get( const Any & rObj ) override;
+    virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) override;
     // XIdlField2: getType, getAccessMode and get are equal to XIdlField
-    virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL set( Any & rObj, const Any & rValue ) override;
 };
 
 // XInterface
 
 Any IdlEnumFieldImpl::queryInterface( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Any aRet( ::cppu::queryInterface( rType,
                                       static_cast< XIdlField * >( this ),
@@ -88,7 +87,6 @@ void IdlEnumFieldImpl::release() throw()
 // XTypeProvider
 
 Sequence< Type > IdlEnumFieldImpl::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     static ::cppu::OTypeCollection * s_pTypes = nullptr;
     if (! s_pTypes)
@@ -107,7 +105,6 @@ Sequence< Type > IdlEnumFieldImpl::getTypes()
 }
 
 Sequence< sal_Int8 > IdlEnumFieldImpl::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -115,13 +112,11 @@ Sequence< sal_Int8 > IdlEnumFieldImpl::getImplementationId()
 // XIdlMember
 
 Reference< XIdlClass > IdlEnumFieldImpl::getDeclaringClass()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return IdlMemberImpl::getDeclaringClass();
 }
 
 OUString IdlEnumFieldImpl::getName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return IdlMemberImpl::getName();
 }
@@ -129,25 +124,21 @@ OUString IdlEnumFieldImpl::getName()
 // XIdlField
 
 Reference< XIdlClass > IdlEnumFieldImpl::getType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return getDeclaringClass();
 }
 
 FieldAccessMode IdlEnumFieldImpl::getAccessMode()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return FieldAccessMode_READONLY;
 }
 
 Any IdlEnumFieldImpl::get( const Any & )
-    throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     return Any( &_nValue, getTypeDescr() );
 }
 
 void IdlEnumFieldImpl::set( const Any &, const Any & )
-    throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
 {
     throw IllegalAccessException(
         "enum field is constant!",
@@ -155,7 +146,6 @@ void IdlEnumFieldImpl::set( const Any &, const Any & )
 }
 
 void IdlEnumFieldImpl::set( Any &, const Any & )
-    throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
 {
     throw IllegalAccessException(
         "enum field is constant!",
@@ -170,7 +160,6 @@ EnumIdlClassImpl::~EnumIdlClassImpl()
 // IdlClassImpl modifications
 
 Reference< XIdlField > EnumIdlClassImpl::getField( const OUString & rName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _pFields)
         getFields(); // init members
@@ -183,7 +172,6 @@ Reference< XIdlField > EnumIdlClassImpl::getField( const OUString & rName )
 }
 
 Sequence< Reference< XIdlField > > EnumIdlClassImpl::getFields()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _pFields)
     {
@@ -209,7 +197,6 @@ Sequence< Reference< XIdlField > > EnumIdlClassImpl::getFields()
 }
 
 void EnumIdlClassImpl::createObject( Any & rObj )
-    throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32 eVal =
         reinterpret_cast<typelib_EnumTypeDescription *>(IdlClassImpl::getTypeDescr())->nDefaultEnumValue;
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index d61123cc1558..254f1a35267d 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -59,24 +59,24 @@ public:
         {}
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( const Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XTypeProvider
-    virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XIdlMember
-    virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() override;
+    virtual OUString SAL_CALL getName() override;
     // XIdlField
-    virtual Reference< XIdlClass > SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual FieldAccessMode SAL_CALL getAccessMode() throw(css::uno::RuntimeException, std::exception) override;
-    virtual Any SAL_CALL get( const Any & rObj ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+    virtual Reference< XIdlClass > SAL_CALL getType() override;
+    virtual FieldAccessMode SAL_CALL getAccessMode() override;
+    virtual Any SAL_CALL get( const Any & rObj ) override;
+    virtual void SAL_CALL set( const Any & rObj, const Any & rValue ) override;
     // XIdlField2: getType, getAccessMode and get are equal to XIdlField
-    virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL set( Any & rObj, const Any & rValue ) override;
 
 private:
     void checkException(
@@ -86,7 +86,6 @@ private:
 // XInterface
 
 Any IdlAttributeFieldImpl::queryInterface( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Any aRet( ::cppu::queryInterface( rType,
                                       static_cast< XIdlField * >( this ),
@@ -107,7 +106,6 @@ void IdlAttributeFieldImpl::release() throw()
 // XTypeProvider
 
 Sequence< Type > IdlAttributeFieldImpl::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     static ::cppu::OTypeCollection * s_pTypes = nullptr;
     if (! s_pTypes)
@@ -126,7 +124,6 @@ Sequence< Type > IdlAttributeFieldImpl::getTypes()
 }
 
 Sequence< sal_Int8 > IdlAttributeFieldImpl::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -134,7 +131,6 @@ Sequence< sal_Int8 > IdlAttributeFieldImpl::getImplementationId()
 // XIdlMember
 
 Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _xDeclClass.is())
     {
@@ -151,7 +147,6 @@ Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass()
 }
 
 OUString IdlAttributeFieldImpl::getName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return IdlMemberImpl::getName();
 }
@@ -159,21 +154,18 @@ OUString IdlAttributeFieldImpl::getName()
 // XIdlField
 
 Reference< XIdlClass > IdlAttributeFieldImpl::getType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return getReflection()->forType(
         getAttributeTypeDescr()->pAttributeTypeRef );
 }
 
 FieldAccessMode IdlAttributeFieldImpl::getAccessMode()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return ((getAttributeTypeDescr())->bReadOnly
             ? FieldAccessMode_READONLY : FieldAccessMode_READWRITE);
 }
 
 Any IdlAttributeFieldImpl::get( const Any & rObj )
-    throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     uno_Interface * pUnoI = getReflection()->mapToUno(
         rObj, reinterpret_cast<typelib_InterfaceTypeDescription *>(getDeclTypeDescr()) );
@@ -204,7 +196,6 @@ Any IdlAttributeFieldImpl::get( const Any & rObj )
 }
 
 void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue )
-    throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
 {
     if (getAttributeTypeDescr()->bReadOnly)
     {
@@ -291,7 +282,6 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue )
 }
 
 void IdlAttributeFieldImpl::set( const Any & rObj, const Any & rValue )
-    throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
 {
     IdlAttributeFieldImpl::set( const_cast< Any & >( rObj ), rValue );
 }
@@ -342,24 +332,24 @@ public:
     virtual ~IdlInterfaceMethodImpl() override;
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( const Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XTypeProvider
-    virtual Sequence< Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XIdlMember
-    virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+    virtual Reference< XIdlClass > SAL_CALL getDeclaringClass() override;
+    virtual OUString SAL_CALL getName() override;
     // XIdlMethod
-    virtual Reference< XIdlClass > SAL_CALL getReturnType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< Reference< XIdlClass > > SAL_CALL getParameterTypes() throw(css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< ParamInfo > SAL_CALL getParameterInfos() throw(css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< Reference< XIdlClass > > SAL_CALL getExceptionTypes() throw(css::uno::RuntimeException, std::exception) override;
-    virtual MethodMode SAL_CALL getMode() throw(css::uno::RuntimeException, std::exception) override;
-    virtual Any SAL_CALL invoke( const Any & rObj, Sequence< Any > & rArgs ) throw(css::lang::IllegalArgumentException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual Reference< XIdlClass > SAL_CALL getReturnType() override;
+    virtual Sequence< Reference< XIdlClass > > SAL_CALL getParameterTypes() override;
+    virtual Sequence< ParamInfo > SAL_CALL getParameterInfos() override;
+    virtual Sequence< Reference< XIdlClass > > SAL_CALL getExceptionTypes() override;
+    virtual MethodMode SAL_CALL getMode() override;
+    virtual Any SAL_CALL invoke( const Any & rObj, Sequence< Any > & rArgs ) override;
 };
 
 IdlInterfaceMethodImpl::~IdlInterfaceMethodImpl()
@@ -372,7 +362,6 @@ IdlInterfaceMethodImpl::~IdlInterfaceMethodImpl()
 // XInterface
 
 Any IdlInterfaceMethodImpl::queryInterface( const Type & rType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlMethod * >( this ) ) );
     return (aRet.hasValue() ? aRet : IdlMemberImpl::queryInterface( rType ));
@@ -391,7 +380,6 @@ void IdlInterfaceMethodImpl::release() throw()
 // XTypeProvider
 
 Sequence< Type > IdlInterfaceMethodImpl::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     static ::cppu::OTypeCollection * s_pTypes = nullptr;
     if (! s_pTypes)
@@ -409,7 +397,6 @@ Sequence< Type > IdlInterfaceMethodImpl::getTypes()
 }
 
 Sequence< sal_Int8 > IdlInterfaceMethodImpl::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -417,7 +404,6 @@ Sequence< sal_Int8 > IdlInterfaceMethodImpl::getImplementationId()
 // XIdlMember
 
 Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _xDeclClass.is())
     {
@@ -434,7 +420,6 @@ Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass()
 }
 
 OUString IdlInterfaceMethodImpl::getName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return IdlMemberImpl::getName();
 }
@@ -442,13 +427,11 @@ OUString IdlInterfaceMethodImpl::getName()
 // XIdlMethod
 
 Reference< XIdlClass > SAL_CALL IdlInterfaceMethodImpl::getReturnType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return getReflection()->forType( getMethodTypeDescr()->pReturnTypeRef );
 }
 
 Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getExceptionTypes()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _pExceptionTypes)
     {
@@ -474,7 +457,6 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getExceptionTypes()
 }
 
 Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getParameterTypes()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _pParamTypes)
     {
@@ -500,7 +482,6 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getParameterTypes()
 }
 
 Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (! _pParamInfos)
     {
@@ -560,16 +541,12 @@ Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos()
 }
 
 MethodMode SAL_CALL IdlInterfaceMethodImpl::getMode()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return
         getMethodTypeDescr()->bOneWay ? MethodMode_ONEWAY : MethodMode_TWOWAY;
 }
 
 Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & rArgs )
-    throw(css::lang::IllegalArgumentException,
-          css::reflection::InvocationTargetException,
-          css::uno::RuntimeException, std::exception)
 {
     if (auto ifc = o3tl::tryAccess<css::uno::Reference<css::uno::XInterface>>(
             rObj))
@@ -765,7 +742,6 @@ InterfaceIdlClassImpl::~InterfaceIdlClassImpl()
 
 
 Sequence< Reference< XIdlClass > > InterfaceIdlClassImpl::getSuperclasses()
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(getMutexAccess());
     if (_xSuperClasses.getLength() == 0) {
@@ -813,7 +789,6 @@ void InterfaceIdlClassImpl::initMembers()
 }
 
 sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (xType.is() && xType->getTypeClass() == TypeClass_INTERFACE)
     {
@@ -833,14 +808,12 @@ sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > &
 }
 
 Uik InterfaceIdlClassImpl::getUik()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Uik(0, 0, 0, 0, 0);
         // Uiks are deprecated and this function must not be called
 }
 
 Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods()
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutexAccess() );
     if (! _pSortedMemberInit)
@@ -860,7 +833,6 @@ Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods()
 }
 
 Sequence< Reference< XIdlField > > InterfaceIdlClassImpl::getFields()
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutexAccess() );
     if (! _pSortedMemberInit)
@@ -880,7 +852,6 @@ Sequence< Reference< XIdlField > > InterfaceIdlClassImpl::getFields()
 }
 
 Reference< XIdlMethod > InterfaceIdlClassImpl::getMethod( const OUString & rName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutexAccess() );
     if (! _pSortedMemberInit)
@@ -910,7 +881,6 @@ Reference< XIdlMethod > InterfaceIdlClassImpl::getMethod( const OUString & rName
 }
 
 Reference< XIdlField > InterfaceIdlClassImpl::getField( const OUString & rName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( getMutexAccess() );
     if (! _pSortedMemberInit)
@@ -940,7 +910,6 @@ Reference< XIdlField > InterfaceIdlClassImpl::getField( const OUString & rName )
 }
 
 void InterfaceIdlClassImpl::createObject( Any & rObj )
-    throw(css::uno::RuntimeException, std::exception)
 {
     // interfaces cannot be constructed
     rObj.clear();
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 75ee807f335b..4f3069904ce0 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -53,28 +53,27 @@ public:
     NestedRegistryImpl( );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
-        throw(Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // XSimpleRegistry
-    virtual OUString SAL_CALL getURL() throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isValid(  ) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL close(  ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL destroy(  ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual Reference< XRegistryKey > SAL_CALL getRootKey(  ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly(  ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) throw(InvalidRegistryException, MergeConflictException, RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getURL() override;
+    virtual void SAL_CALL open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) override;
+    virtual sal_Bool SAL_CALL isValid(  ) override;
+    virtual void SAL_CALL close(  ) override;
+    virtual void SAL_CALL destroy(  ) override;
+    virtual Reference< XRegistryKey > SAL_CALL getRootKey(  ) override;
+    virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+    virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) override;
 
     // XEnumerationAccess
-    virtual Reference< XEnumeration > SAL_CALL createEnumeration(  ) throw (RuntimeException, std::exception) override;
-    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException, std::exception) override;
+    virtual Reference< XEnumeration > SAL_CALL createEnumeration(  ) override;
+    virtual Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     friend class NestedKeyImpl;
 protected:
@@ -99,35 +98,35 @@ public:
                     NestedKeyImpl* pKey);
 
     // XRegistryKey
-    virtual OUString SAL_CALL getKeyName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly(  ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isValid(  ) throw(RuntimeException, std::exception) override;
-    virtual RegistryKeyType SAL_CALL getKeyType( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual RegistryValueType SAL_CALL getValueType(  ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getLongValue(  ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLongValue( sal_Int32 value ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int32 > SAL_CALL getLongListValue(  ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLongListValue( const css::uno::Sequence< sal_Int32 >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAsciiValue(  ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAsciiValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getAsciiListValue(  ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAsciiListValue( const css::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getStringValue(  ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStringValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getStringListValue(  ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStringListValue( const css::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL getBinaryValue(  ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBinaryValue( const css::uno::Sequence< sal_Int8 >& value ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual Reference< XRegistryKey > SAL_CALL openKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual Reference< XRegistryKey > SAL_CALL createKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeKey(  ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteKey( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual Sequence< Reference< XRegistryKey > > SAL_CALL openKeys(  ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getKeyNames(  ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL createLink( const OUString& aLinkName, const OUString& aLinkTarget ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL deleteLink( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLinkTarget( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getKeyName() override;
+    virtual sal_Bool SAL_CALL isReadOnly(  ) override;
+    virtual sal_Bool SAL_CALL isValid(  ) override;
+    virtual RegistryKeyType SAL_CALL getKeyType( const OUString& rKeyName ) override;
+    virtual RegistryValueType SAL_CALL getValueType(  ) override;
+    virtual sal_Int32 SAL_CALL getLongValue(  ) override;
+    virtual void SAL_CALL setLongValue( sal_Int32 value ) override;
+    virtual Sequence< sal_Int32 > SAL_CALL getLongListValue(  ) override;
+    virtual void SAL_CALL setLongListValue( const css::uno::Sequence< sal_Int32 >& seqValue ) override;
+    virtual OUString SAL_CALL getAsciiValue(  ) override;
+    virtual void SAL_CALL setAsciiValue( const OUString& value ) override;
+    virtual Sequence< OUString > SAL_CALL getAsciiListValue(  ) override;
+    virtual void SAL_CALL setAsciiListValue( const css::uno::Sequence< OUString >& seqValue ) override;
+    virtual OUString SAL_CALL getStringValue(  ) override;
+    virtual void SAL_CALL setStringValue( const OUString& value ) override;
+    virtual Sequence< OUString > SAL_CALL getStringListValue(  ) override;
+    virtual void SAL_CALL setStringListValue( const css::uno::Sequence< OUString >& seqValue ) override;
+    virtual Sequence< sal_Int8 > SAL_CALL getBinaryValue(  ) override;
+    virtual void SAL_CALL setBinaryValue( const css::uno::Sequence< sal_Int8 >& value ) override;
+    virtual Reference< XRegistryKey > SAL_CALL openKey( const OUString& aKeyName ) override;
+    virtual Reference< XRegistryKey > SAL_CALL createKey( const OUString& aKeyName ) override;
+    virtual void SAL_CALL closeKey(  ) override;
+    virtual void SAL_CALL deleteKey( const OUString& rKeyName ) override;
+    virtual Sequence< Reference< XRegistryKey > > SAL_CALL openKeys(  ) override;
+    virtual Sequence< OUString > SAL_CALL getKeyNames(  ) override;
+    virtual sal_Bool SAL_CALL createLink( const OUString& aLinkName, const OUString& aLinkTarget ) override;
+    virtual void SAL_CALL deleteLink( const OUString& rLinkName ) override;
+    virtual OUString SAL_CALL getLinkTarget( const OUString& rLinkName ) override;
+    virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) override;
 
 protected:
     void        computeChanges();
@@ -253,7 +252,7 @@ OUString NestedKeyImpl::computeName(const OUString& name)
 }
 
 
-OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException, std::exception)
+OUString SAL_CALL NestedKeyImpl::getKeyName()
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     return m_name;
@@ -261,7 +260,6 @@ OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException, std::excep
 
 
 sal_Bool SAL_CALL NestedKeyImpl::isReadOnly(  )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -273,7 +271,7 @@ sal_Bool SAL_CALL NestedKeyImpl::isReadOnly(  )
 }
 
 
-sal_Bool SAL_CALL NestedKeyImpl::isValid(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL NestedKeyImpl::isValid(  )
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     return ((m_localKey.is() && m_localKey->isValid()) ||
@@ -282,7 +280,6 @@ sal_Bool SAL_CALL NestedKeyImpl::isValid(  ) throw(RuntimeException, std::except
 
 
 RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -301,7 +298,6 @@ RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName )
 
 
 RegistryValueType SAL_CALL NestedKeyImpl::getValueType(  )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -320,7 +316,6 @@ RegistryValueType SAL_CALL NestedKeyImpl::getValueType(  )
 
 
 sal_Int32 SAL_CALL NestedKeyImpl::getLongValue(  )
-    throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -341,7 +336,6 @@ sal_Int32 SAL_CALL NestedKeyImpl::getLongValue(  )
 
 
 void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -365,7 +359,6 @@ void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value )
 
 
 Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue(  )
-    throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -386,7 +379,6 @@ Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue(  )
 
 
 void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqValue )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -410,7 +402,6 @@ void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqV
 
 
 OUString SAL_CALL NestedKeyImpl::getAsciiValue(  )
-    throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -431,7 +422,6 @@ OUString SAL_CALL NestedKeyImpl::getAsciiValue(  )
 
 
 void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -455,7 +445,6 @@ void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value )
 
 
 Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue(  )
-    throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -476,7 +465,6 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue(  )
 
 
 void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqValue )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -500,7 +488,6 @@ void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqV
 
 
 OUString SAL_CALL NestedKeyImpl::getStringValue(  )
-    throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -521,7 +508,6 @@ OUString SAL_CALL NestedKeyImpl::getStringValue(  )
 
 
 void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -545,7 +531,6 @@ void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value )
 
 
 Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue(  )
-    throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -566,7 +551,6 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue(  )
 
 
 void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seqValue )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -590,7 +574,6 @@ void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seq
 
 
 Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue(  )
-    throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -611,7 +594,6 @@ Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue(  )
 
 
 void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     computeChanges();
@@ -635,7 +617,6 @@ void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value )
 
 
 Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyName )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     if ( !m_localKey.is() && !m_defaultKey.is() )
@@ -671,7 +652,6 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyN
 
 
 Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKeyName )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     if ( (!m_localKey.is() && !m_defaultKey.is()) ||
@@ -729,7 +709,6 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKe
 
 
 void SAL_CALL NestedKeyImpl::closeKey(  )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     if ( m_localKey.is() && m_localKey->isValid() )
@@ -744,7 +723,6 @@ void SAL_CALL NestedKeyImpl::closeKey(  )
 
 
 void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     if ( m_localKey.is() && m_localKey->isValid() &&
@@ -767,7 +745,6 @@ void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName )
 
 
 Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys(  )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     if ( !m_localKey.is() && !m_defaultKey.is() )
@@ -846,7 +823,6 @@ Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys(  )
 
 
 Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames(  )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     if ( !m_localKey.is() && !m_defaultKey.is() )
@@ -912,7 +888,6 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames(  )
 
 
 sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OUString& aLinkTarget )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
 
@@ -970,7 +945,6 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU
 
 
 void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     if ( !m_localKey.is() && !m_defaultKey.is() )
@@ -1016,7 +990,6 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName )
 
 
 OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     if ( !m_localKey.is() && !m_defaultKey.is() )
@@ -1070,7 +1043,6 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName )
 
 
 OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_xRegistry->m_mutex );
     if ( !m_localKey.is() && !m_defaultKey.is() )
@@ -1105,21 +1077,20 @@ public:
         : m_xReg1( r1 ) , m_xReg2( r2 )
         {}
 public:
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL nextElement(  ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+    virtual Any SAL_CALL nextElement(  ) override;
 
 private:
     Reference< XSimpleRegistry > m_xReg1;
     Reference< XSimpleRegistry > m_xReg2;
 };
 
-sal_Bool RegistryEnumueration::hasMoreElements(  ) throw (RuntimeException, std::exception)
+sal_Bool RegistryEnumueration::hasMoreElements(  )
 {
     return m_xReg1.is() || m_xReg2.is();
 }
 
 Any RegistryEnumueration::nextElement(  )
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     Any a;
     if( m_xReg1.is() )
@@ -1140,18 +1111,18 @@ Any RegistryEnumueration::nextElement(  )
 }
 
 
-Reference< XEnumeration > NestedRegistryImpl::createEnumeration(  ) throw (RuntimeException, std::exception)
+Reference< XEnumeration > NestedRegistryImpl::createEnumeration(  )
 {
     MutexGuard guard( m_mutex );
     return new RegistryEnumueration( m_localReg, m_defaultReg );
 }
 
-Type NestedRegistryImpl::getElementType(  ) throw (RuntimeException, std::exception)
+Type NestedRegistryImpl::getElementType(  )
 {
     return cppu::UnoType<decltype(m_localReg)>::get();
 }
 
-sal_Bool SAL_CALL NestedRegistryImpl::hasElements(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL NestedRegistryImpl::hasElements(  )
 {
     MutexGuard guard( m_mutex );
     return m_localReg.is() || m_defaultReg.is();
@@ -1159,19 +1130,16 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements(  ) throw (RuntimeException, s
 
 
 OUString SAL_CALL NestedRegistryImpl::getImplementationName(  )
-    throw(RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.stoc.NestedRegistry");
 }
 
 sal_Bool SAL_CALL NestedRegistryImpl::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence<OUString> SAL_CALL NestedRegistryImpl::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     Sequence< OUString > seqNames { "com.sun.star.registry.NestedRegistry" };
     return seqNames;
@@ -1179,7 +1147,6 @@ Sequence<OUString> SAL_CALL NestedRegistryImpl::getSupportedServiceNames(  )
 
 
 void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments )
-    throw( Exception, RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( m_mutex );
     if ( (aArguments.getLength() == 2) &&
@@ -1194,7 +1161,7 @@ void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments
 }
 
 
-OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException, std::exception)
+OUString SAL_CALL NestedRegistryImpl::getURL()
 {
     Guard< Mutex > aGuard( m_mutex );
     try
@@ -1211,14 +1178,13 @@ OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException, std::exce
 
 
 void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     throw InvalidRegistryException(
             "the 'open' method is not specified for a nested registry" );
 }
 
 
-sal_Bool SAL_CALL NestedRegistryImpl::isValid(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL NestedRegistryImpl::isValid(  )
 {
     Guard< Mutex > aGuard( m_mutex );
     try
@@ -1236,7 +1202,6 @@ sal_Bool SAL_CALL NestedRegistryImpl::isValid(  ) throw(RuntimeException, std::e
 
 
 void SAL_CALL NestedRegistryImpl::close(  )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_mutex );
     if ( m_localReg.is() && m_localReg->isValid() )
@@ -1251,7 +1216,6 @@ void SAL_CALL NestedRegistryImpl::close(  )
 
 
 void SAL_CALL NestedRegistryImpl::destroy(  )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     throw InvalidRegistryException(
             "the 'destroy' method is not specified for a nested registry" );
@@ -1259,7 +1223,6 @@ void SAL_CALL NestedRegistryImpl::destroy(  )
 
 
 Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey(  )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Reference<XRegistryKey> tmpKey;
 
@@ -1290,7 +1253,6 @@ Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey(  )
 
 
 sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly(  )
-    throw(InvalidRegistryException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_mutex );
     try
@@ -1307,7 +1269,6 @@ sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly(  )
 
 
 void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl )
-    throw(InvalidRegistryException, MergeConflictException, RuntimeException, std::exception)
 {
     Guard< Mutex > aGuard( m_mutex );
     if ( m_localReg.is() && m_localReg->isValid() )
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index e174724df572..4dd08dcd9ba2 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1198,42 +1198,36 @@ public:
     explicit ImplementationRegistration( const Reference < XComponentContext > & rSMgr );
 
     // XServiceInfo
-    OUString                        SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) override;
-    Sequence< OUString >            SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+    OUString                        SAL_CALL getImplementationName() override;
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) override;
+    Sequence< OUString >            SAL_CALL getSupportedServiceNames() override;
 
     // XImplementationRegistration
     virtual void SAL_CALL registerImplementation(
         const OUString& implementationLoader,
         const OUString& location,
-        const Reference < XSimpleRegistry > & xReg)
-        throw(  CannotRegisterImplementationException, RuntimeException, std::exception ) override;
+        const Reference < XSimpleRegistry > & xReg) override;
 
     virtual sal_Bool SAL_CALL revokeImplementation(
         const OUString& location,
-        const Reference < XSimpleRegistry >& xReg)
-        throw( RuntimeException, std::exception ) override;
+        const Reference < XSimpleRegistry >& xReg) override;
 
     virtual Sequence< OUString > SAL_CALL getImplementations(
         const OUString& implementationLoader,
-        const OUString& location)
-        throw( RuntimeException, std::exception ) override;
+        const OUString& location) override;
     virtual Sequence< OUString > SAL_CALL checkInstantiation(
-        const OUString& implementationName)
-        throw( RuntimeException, std::exception ) override;
+        const OUString& implementationName) override;
 
     // XImplementationRegistration2
     virtual void SAL_CALL registerImplementationWithLocation(
         const OUString& implementationLoader,
         const OUString& location,
         const OUString& registeredLocation,
-        const Reference < XSimpleRegistry > & xReg)
-        throw(  CannotRegisterImplementationException, RuntimeException, std::exception ) override;
+        const Reference < XSimpleRegistry > & xReg) override;
 
     // XInitialization
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw(  css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 private: // helper methods
     void prepareRegister(
@@ -1277,19 +1271,19 @@ ImplementationRegistration::ImplementationRegistration( const Reference < XCompo
 {}
 
 // XServiceInfo
-OUString ImplementationRegistration::getImplementationName() throw(RuntimeException, std::exception)
+OUString ImplementationRegistration::getImplementationName()
 {
     return OUString("com.sun.star.comp.stoc.ImplementationRegistration");
 }
 
 // XServiceInfo
-sal_Bool ImplementationRegistration::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception)
+sal_Bool ImplementationRegistration::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > ImplementationRegistration::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString > ImplementationRegistration::getSupportedServiceNames()
 {
     Sequence< OUString > seqNames { "com.sun.star.registry.ImplementationRegistration" };
     return seqNames;
@@ -1323,7 +1317,6 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM
 
 void ImplementationRegistration::initialize(
     const css::uno::Sequence< css::uno::Any >& aArgs )
-    throw(  css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
 
     if( aArgs.getLength() != 4 ) {
@@ -1415,7 +1408,6 @@ void ImplementationRegistration::registerImplementationWithLocation(
     const OUString& locationUrl,
     const OUString& registeredLocationUrl,
     const Reference < XSimpleRegistry > & xReg)
-    throw( CannotRegisterImplementationException, RuntimeException, std::exception )
 {
     prepareRegister(
         implementationLoaderUrl, locationUrl, registeredLocationUrl, xReg);
@@ -1516,7 +1508,6 @@ void ImplementationRegistration::registerImplementation(
     const OUString& implementationLoaderUrl,
     const OUString& locationUrl,
     const Reference < XSimpleRegistry > & xReg)
-    throw( CannotRegisterImplementationException, RuntimeException, std::exception )
 {
     prepareRegister(implementationLoaderUrl, locationUrl, locationUrl, xReg);
 }
@@ -1526,7 +1517,6 @@ void ImplementationRegistration::registerImplementation(
 
 sal_Bool ImplementationRegistration::revokeImplementation(const OUString& location,
                                                       const Reference < XSimpleRegistry >& xReg)
-    throw ( RuntimeException, std::exception )
 {
     bool ret = false;
 
@@ -1575,7 +1565,6 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati
 Sequence< OUString > ImplementationRegistration::getImplementations(
     const OUString & implementationLoaderUrl,
     const OUString & locationUrl)
-    throw ( RuntimeException, std::exception )
 {
     OUString activatorName;
 
@@ -1643,7 +1632,6 @@ Sequence< OUString > ImplementationRegistration::getImplementations(
 // virtual function checkInstantiation of XImplementationRegistration
 
 Sequence< OUString > ImplementationRegistration::checkInstantiation(const OUString&)
-    throw ( RuntimeException, std::exception )
 {
     OSL_FAIL( "ImplementationRegistration::checkInstantiation not implemented" );
     return Sequence<OUString>();
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index da3b8c961ead..75443c0bd55a 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -706,115 +706,85 @@ public:
     ImplIntrospectionAccess( const Any& obj, rtl::Reference< IntrospectionAccessStatic_Impl > const & pStaticImpl_ );
 
     // Methods from XIntrospectionAccess
-    virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts()
-        throw( RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL getSuppliedPropertyConcepts()
-        throw( RuntimeException, std::exception ) override;
-    virtual Property SAL_CALL getProperty(const OUString& Name, sal_Int32 PropertyConcepts)
-        throw( NoSuchElementException, RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name, sal_Int32 PropertyConcepts)
-        throw( RuntimeException, std::exception ) override;
-    virtual Sequence< Property > SAL_CALL getProperties(sal_Int32 PropertyConcepts)
-          throw( RuntimeException, std::exception ) override;
-    virtual Reference<XIdlMethod> SAL_CALL getMethod(const OUString& Name, sal_Int32 MethodConcepts)
-          throw( NoSuchMethodException, RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name, sal_Int32 MethodConcepts)
-          throw( RuntimeException, std::exception ) override;
-    virtual Sequence< Reference<XIdlMethod> > SAL_CALL getMethods(sal_Int32 MethodConcepts)
-          throw( RuntimeException, std::exception ) override;
-    virtual Sequence< Type > SAL_CALL getSupportedListeners()
-          throw( RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts() override;
+    virtual sal_Int32 SAL_CALL getSuppliedPropertyConcepts() override;
+    virtual Property SAL_CALL getProperty(const OUString& Name, sal_Int32 PropertyConcepts) override;
+    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name, sal_Int32 PropertyConcepts) override;
+    virtual Sequence< Property > SAL_CALL getProperties(sal_Int32 PropertyConcepts) override;
+    virtual Reference<XIdlMethod> SAL_CALL getMethod(const OUString& Name, sal_Int32 MethodConcepts) override;
+    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name, sal_Int32 MethodConcepts) override;
+    virtual Sequence< Reference<XIdlMethod> > SAL_CALL getMethods(sal_Int32 MethodConcepts) override;
+    virtual Sequence< Type > SAL_CALL getSupportedListeners() override;
     using OWeakObject::queryAdapter;
-    virtual Reference<XInterface> SAL_CALL queryAdapter( const Type& rType )
-          throw( IllegalTypeException, RuntimeException, std::exception ) override;
+    virtual Reference<XInterface> SAL_CALL queryAdapter( const Type& rType ) override;
 
     // Methods from XMaterialHolder
-    virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getMaterial() override;
 
     // Methods from XExactName
-    virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) override;
 
     // Methods from XInterface
-    virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) override;
+    virtual Any SAL_CALL queryInterface( const Type& rType ) override;
     virtual void        SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
     virtual void        SAL_CALL release() throw() override { OWeakObject::release(); }
 
     // Methods from XPropertySet
-    virtual Reference<XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const Any& aValue)
-        throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL getPropertyValue(const OUString& aPropertyName)
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener)
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener)
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener)
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener)
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual Reference<XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const Any& aValue) override;
+    virtual Any SAL_CALL getPropertyValue(const OUString& aPropertyName) override;
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) override;
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener) override;
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) override;
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener) override;
 
     // Methods from XFastPropertySet
-    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const Any& aValue)
-        throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle)
-        throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const Any& aValue) override;
+    virtual Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override;
 
     // Methods from XPropertySetInfo
-    virtual Sequence< Property > SAL_CALL getProperties() throw( RuntimeException, std::exception ) override;
-    virtual Property SAL_CALL getPropertyByName(const OUString& Name) throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) throw( RuntimeException, std::exception ) override;
+    virtual Sequence< Property > SAL_CALL getProperties() override;
+    virtual Property SAL_CALL getPropertyByName(const OUString& Name) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) override;
 
     // Methods from XElementAccess
-    virtual Type SAL_CALL getElementType() throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasElements() throw( RuntimeException, std::exception ) override;
+    virtual Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Methods from XNameAccess
-    virtual Any SAL_CALL getByName(const OUString& Name)
-        throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual Sequence< OUString > SAL_CALL getElementNames() throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( RuntimeException, std::exception ) override;
+    virtual Any SAL_CALL getByName(const OUString& Name) override;
+    virtual Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     // Methods from XNameReplace
-    virtual void SAL_CALL replaceByName(const OUString& Name, const Any& Element)
-        throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL replaceByName(const OUString& Name, const Any& Element) override;
 
     // Methods from XNameContainer
-    virtual void SAL_CALL insertByName(const OUString& Name, const Any& Element)
-        throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByName(const OUString& Name)
-        throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL insertByName(const OUString& Name, const Any& Element) override;
+    virtual void SAL_CALL removeByName(const OUString& Name) override;
 
     // Methods from XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL getByIndex(sal_Int32 Index)
-        throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual Any SAL_CALL getByIndex(sal_Int32 Index) override;
 
     // Methods from XIndexReplace
-    virtual void SAL_CALL replaceByIndex(sal_Int32 Index, const Any& Element)
-        throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL replaceByIndex(sal_Int32 Index, const Any& Element) override;
 
     // Methods from XIndexContainer
-    virtual void SAL_CALL insertByIndex(sal_Int32 Index, const Any& Element)
-        throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByIndex(sal_Int32 Index)
-        throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL insertByIndex(sal_Int32 Index, const Any& Element) override;
+    virtual void SAL_CALL removeByIndex(sal_Int32 Index) override;
 
     // Methods from XEnumerationAccess
-    virtual Reference<XEnumeration> SAL_CALL createEnumeration() throw( RuntimeException, std::exception ) override;
+    virtual Reference<XEnumeration> SAL_CALL createEnumeration() override;
 
     // Methods from XIdlArray
-    virtual void SAL_CALL realloc(Any& array, sal_Int32 length)
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL getLen(const Any& array) throw( IllegalArgumentException, RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL get(const Any& array, sal_Int32 index)
-        throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL set(Any& array, sal_Int32 index, const Any& value)
-        throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL realloc(Any& array, sal_Int32 length) override;
+    virtual sal_Int32 SAL_CALL getLen(const Any& array) override;
+    virtual Any SAL_CALL get(const Any& array, sal_Int32 index) override;
+    virtual void SAL_CALL set(Any& array, sal_Int32 index, const Any& value) override;
 
     // Methods from XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier )
-        throw (RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) override;
 };
 
 ImplIntrospectionAccess::ImplIntrospectionAccess
@@ -1011,7 +981,6 @@ Reference<XIdlArray> ImplIntrospectionAccess::getXIdlArray()
 
 // Methods from XInterface
 Any SAL_CALL ImplIntrospectionAccess::queryInterface( const Type& rType )
-    throw( RuntimeException, std::exception )
 {
     Any aRet( ::cppu::queryInterface(
         rType,
@@ -1051,25 +1020,21 @@ Any SAL_CALL ImplIntrospectionAccess::queryInterface( const Type& rType )
 
 // Methods from XPropertySet
 Reference<XPropertySetInfo> ImplIntrospectionAccess::getPropertySetInfo()
-    throw( RuntimeException, std::exception )
 {
     return static_cast<XPropertySetInfo *>(this);
 }
 
 void ImplIntrospectionAccess::setPropertyValue(const OUString& aPropertyName, const Any& aValue)
-    throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
 {
     mpStaticImpl->setPropertyValue( maInspectedObject, aPropertyName, aValue );
 }
 
 Any ImplIntrospectionAccess::getPropertyValue(const OUString& aPropertyName)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     return mpStaticImpl->getPropertyValue( maInspectedObject, aPropertyName );
 }
 
 void ImplIntrospectionAccess::addPropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     if( mxIface.is() )
     {
@@ -1082,7 +1047,6 @@ void ImplIntrospectionAccess::addPropertyChangeListener(const OUString& aPropert
 }
 
 void ImplIntrospectionAccess::removePropertyChangeListener(const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     if( mxIface.is() )
     {
@@ -1095,7 +1059,6 @@ void ImplIntrospectionAccess::removePropertyChangeListener(const OUString& aProp
 }
 
 void ImplIntrospectionAccess::addVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     if( mxIface.is() )
     {
@@ -1108,7 +1071,6 @@ void ImplIntrospectionAccess::addVetoableChangeListener(const OUString& aPropert
 }
 
 void ImplIntrospectionAccess::removeVetoableChangeListener(const OUString& aPropertyName, const Reference<XVetoableChangeListener>& aListener)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     if( mxIface.is() )
     {
@@ -1122,150 +1084,131 @@ void ImplIntrospectionAccess::removeVetoableChangeListener(const OUString& aProp
 
 // Methods from XFastPropertySet
 void ImplIntrospectionAccess::setFastPropertyValue(sal_Int32, const Any&)
-    throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
 {
 }
 
 Any ImplIntrospectionAccess::getFastPropertyValue(sal_Int32)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     return Any();
 }
 
 // Methods from XPropertySetInfo
-Sequence< Property > ImplIntrospectionAccess::getProperties() throw( RuntimeException, std::exception )
+Sequence< Property > ImplIntrospectionAccess::getProperties()
 {
     return comphelper::containerToSequence(mpStaticImpl->getProperties());
 }
 
 Property ImplIntrospectionAccess::getPropertyByName(const OUString& Name)
-    throw( RuntimeException, std::exception )
 {
     return getProperty( Name, PropertyConcept::ALL );
 }
 
 sal_Bool ImplIntrospectionAccess::hasPropertyByName(const OUString& Name)
-    throw( RuntimeException, std::exception )
 {
     return hasProperty( Name, PropertyConcept::ALL );
 }
 
 // Methods from XElementAccess
-Type ImplIntrospectionAccess::getElementType() throw( RuntimeException, std::exception )
+Type ImplIntrospectionAccess::getElementType()
 {
     return getXElementAccess()->getElementType();
 }
 
-sal_Bool ImplIntrospectionAccess::hasElements() throw( RuntimeException, std::exception )
+sal_Bool ImplIntrospectionAccess::hasElements()
 {
     return getXElementAccess()->hasElements();
 }
 
 // Methods from XNameAccess
 Any ImplIntrospectionAccess::getByName(const OUString& Name)
-    throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
 {
     return getXNameAccess()->getByName( Name );
 }
 
 Sequence< OUString > ImplIntrospectionAccess::getElementNames()
-    throw( RuntimeException, std::exception )
 {
     return getXNameAccess()->getElementNames();
 }
 
 sal_Bool ImplIntrospectionAccess::hasByName(const OUString& Name)
-    throw( RuntimeException, std::exception )
 {
     return getXNameAccess()->hasByName( Name );
 }
 
 // Methods from XNameContainer
 void ImplIntrospectionAccess::insertByName(const OUString& Name, const Any& Element)
-    throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception )
 {
     getXNameContainer()->insertByName( Name, Element );
 }
 
 void ImplIntrospectionAccess::replaceByName(const OUString& Name, const Any& Element)
-    throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
 {
     getXNameReplace()->replaceByName( Name, Element );
 }
 
 void ImplIntrospectionAccess::removeByName(const OUString& Name)
-    throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
 {
     getXNameContainer()->removeByName( Name );
 }
 
 // Methods from XIndexAccess
 // Already in XNameAccess: virtual Reference<XIdlClass> getElementType() const
-sal_Int32 ImplIntrospectionAccess::getCount() throw( RuntimeException, std::exception )
+sal_Int32 ImplIntrospectionAccess::getCount()
 {
     return getXIndexAccess()->getCount();
 }
 
 Any ImplIntrospectionAccess::getByIndex(sal_Int32 Index)
-    throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     return getXIndexAccess()->getByIndex( Index );
 }
 
 // Methods from XIndexContainer
 void ImplIntrospectionAccess::insertByIndex(sal_Int32 Index, const Any& Element)
-    throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     getXIndexContainer()->insertByIndex( Index, Element );
 }
 
 void ImplIntrospectionAccess::replaceByIndex(sal_Int32 Index, const Any& Element)
-    throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     getXIndexReplace()->replaceByIndex( Index, Element );
 }
 
 void ImplIntrospectionAccess::removeByIndex(sal_Int32 Index)
-    throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     getXIndexContainer()->removeByIndex( Index );
 }
 
 // Methods from XEnumerationAccess
 // Already in XNameAccess: virtual Reference<XIdlClass> getElementType() const;
-Reference<XEnumeration> ImplIntrospectionAccess::createEnumeration() throw( RuntimeException, std::exception )
+Reference<XEnumeration> ImplIntrospectionAccess::createEnumeration()
 {
     return getXEnumerationAccess()->createEnumeration();
 }
 
 // Methods from XIdlArray
 void ImplIntrospectionAccess::realloc(Any& array, sal_Int32 length)
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     getXIdlArray()->realloc( array, length );
 }
 
 sal_Int32 ImplIntrospectionAccess::getLen(const Any& array)
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     return getXIdlArray()->getLen( array );
 }
 
 Any ImplIntrospectionAccess::get(const Any& array, sal_Int32 index)
-    throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, RuntimeException, std::exception )
 {
     return getXIdlArray()->get( array, index );
 }
 
 void ImplIntrospectionAccess::set(Any& array, sal_Int32 index, const Any& value)
-    throw( IllegalArgumentException, ArrayIndexOutOfBoundsException, RuntimeException, std::exception )
 {
     getXIdlArray()->set( array, index, value );
 }
 
 // Methods from XUnoTunnel
 sal_Int64 ImplIntrospectionAccess::getSomething( const Sequence< sal_Int8 >& aIdentifier )
-        throw (RuntimeException, std::exception)
 {
     return Reference<XUnoTunnel>::query( mxIface )->getSomething( aIdentifier );
 }
@@ -1275,7 +1218,6 @@ sal_Int64 ImplIntrospectionAccess::getSomething( const Sequence< sal_Int8 >& aId
 
 // Methods from XIntrospectionAccess
 sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts()
-    throw( RuntimeException, std::exception )
 {
     return    MethodConcept::DANGEROUS |
             PROPERTY |
@@ -1286,7 +1228,6 @@ sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts()
 }
 
 sal_Int32 ImplIntrospectionAccess::getSuppliedPropertyConcepts()
-    throw( RuntimeException, std::exception )
 {
     return    PropertyConcept::DANGEROUS |
             PROPERTYSET |
@@ -1295,7 +1236,6 @@ sal_Int32 ImplIntrospectionAccess::getSuppliedPropertyConcepts()
 }
 
 Property ImplIntrospectionAccess::getProperty(const OUString& Name, sal_Int32 PropertyConcepts)
-    throw( NoSuchElementException, RuntimeException, std::exception )
 {
     Property aRet;
     sal_Int32 i = mpStaticImpl->getPropertyIndex( Name );
@@ -1315,7 +1255,6 @@ Property ImplIntrospectionAccess::getProperty(const OUString& Name, sal_Int32 Pr
 }
 
 sal_Bool ImplIntrospectionAccess::hasProperty(const OUString& Name, sal_Int32 PropertyConcepts)
-    throw( RuntimeException, std::exception )
 {
     sal_Int32 i = mpStaticImpl->getPropertyIndex( Name );
     bool bRet = false;
@@ -1329,7 +1268,6 @@ sal_Bool ImplIntrospectionAccess::hasProperty(const OUString& Name, sal_Int32 Pr
 }
 
 Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyConcepts)
-    throw( RuntimeException, std::exception )
 {
     // If all supported concepts are required, simply pass through the sequence
     sal_Int32 nAllSupportedMask =   PROPERTYSET |
@@ -1384,7 +1322,6 @@ Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyCo
 }
 
 Reference<XIdlMethod> ImplIntrospectionAccess::getMethod(const OUString& Name, sal_Int32 MethodConcepts)
-    throw( NoSuchMethodException, RuntimeException, std::exception )
 {
     Reference<XIdlMethod> xRet;
     sal_Int32 i = mpStaticImpl->getMethodIndex( Name );
@@ -1403,7 +1340,6 @@ Reference<XIdlMethod> ImplIntrospectionAccess::getMethod(const OUString& Name, s
 }
 
 sal_Bool ImplIntrospectionAccess::hasMethod(const OUString& Name, sal_Int32 MethodConcepts)
-    throw( RuntimeException, std::exception )
 {
     sal_Int32 i = mpStaticImpl->getMethodIndex( Name );
     bool bRet = false;
@@ -1417,7 +1353,6 @@ sal_Bool ImplIntrospectionAccess::hasMethod(const OUString& Name, sal_Int32 Meth
 }
 
 Sequence< Reference<XIdlMethod> > ImplIntrospectionAccess::getMethods(sal_Int32 MethodConcepts)
-    throw( RuntimeException, std::exception )
 {
     // If all supported concepts are required, simply pass through the sequence
     sal_Int32 nAllSupportedMask =   MethodConcept::DANGEROUS |
@@ -1468,13 +1403,11 @@ Sequence< Reference<XIdlMethod> > ImplIntrospectionAccess::getMethods(sal_Int32
 }
 
 Sequence< Type > ImplIntrospectionAccess::getSupportedListeners()
-    throw( RuntimeException, std::exception )
 {
     return comphelper::containerToSequence(mpStaticImpl->getSupportedListeners());
 }
 
 Reference<XInterface> SAL_CALL ImplIntrospectionAccess::queryAdapter( const Type& rType )
-    throw( IllegalTypeException, RuntimeException, std::exception )
 {
     Reference<XInterface> xRet;
     if(    rType == cppu::UnoType<XInterface>::get()
@@ -1498,13 +1431,13 @@ Reference<XInterface> SAL_CALL ImplIntrospectionAccess::queryAdapter( const Type
 }
 
 // Methods from XMaterialHolder
-Any ImplIntrospectionAccess::getMaterial() throw(RuntimeException, std::exception)
+Any ImplIntrospectionAccess::getMaterial()
 {
     return maInspectedObject;
 }
 
 // Methods from XExactName
-OUString ImplIntrospectionAccess::getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception )
+OUString ImplIntrospectionAccess::getExactName( const OUString& rApproximateName )
 {
     OUString aRetStr;
     LowerToExactNameMap::iterator aIt =
@@ -1622,25 +1555,21 @@ private:
         typeCache_.clear();
     }
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.comp.stoc.Introspection"); }
 
-    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
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence<OUString> SAL_CALL
-    getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     {
         Sequence<OUString> s { "com.sun.star.beans.Introspection" };
         return s;
     }
 
     virtual css::uno::Reference<css::beans::XIntrospectionAccess> SAL_CALL
-    inspect(css::uno::Any const & aObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+    inspect(css::uno::Any const & aObject) override;
 
     css::uno::Reference<css::reflection::XIdlReflection> reflection_;
     Cache<TypeKey, TypeKeyLess> typeCache_;
@@ -1648,7 +1577,6 @@ private:
 
 css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
     css::uno::Any const & aObject)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference<css::reflection::XIdlReflection> reflection;
     {
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 933ed5b556f3..6622441a8cd3 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -101,100 +101,84 @@ public:
                                            const Reference<XIdlReflection> & );
 
     // XInterface
-    virtual Any         SAL_CALL queryInterface( const Type & aType) throw( RuntimeException, std::exception ) override;
+    virtual Any         SAL_CALL queryInterface( const Type & aType) override;
     virtual void        SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
     virtual void        SAL_CALL release() throw() override { OWeakObject::release(); }
 
 
     // XTypeProvider
-    virtual Sequence< css::uno::Type > SAL_CALL getTypes(  )
-       throw(RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId(  )
-       throw( RuntimeException, std::exception) override;
+    virtual Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XMaterialHolder
-    virtual Any         SAL_CALL getMaterial() throw(RuntimeException, std::exception) override;
+    virtual Any         SAL_CALL getMaterial() override;
 
     // XInvocation
-    virtual Reference<XIntrospectionAccess> SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
-        throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value)
-        throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL getValue(const OUString& PropertyName)
-        throw( UnknownPropertyException, RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override;
+    virtual Reference<XIntrospectionAccess> SAL_CALL getIntrospection() override;
+    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) override;
+    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) override;
+    virtual Any SAL_CALL getValue(const OUString& PropertyName) override;
+    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) override;
+    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) override;
 
     // XInvocation2
-    virtual Sequence< OUString > SAL_CALL getMemberNames(  )
-        throw( RuntimeException, std::exception ) override;
-    virtual Sequence< InvocationInfo > SAL_CALL getInfo(  )
-        throw( RuntimeException, std::exception ) override;
-    virtual InvocationInfo SAL_CALL getInfoForName( const OUString& aName, sal_Bool bExact )
-        throw( IllegalArgumentException, RuntimeException, std::exception ) override;
+    virtual Sequence< OUString > SAL_CALL getMemberNames(  ) override;
+    virtual Sequence< InvocationInfo > SAL_CALL getInfo(  ) override;
+    virtual InvocationInfo SAL_CALL getInfoForName( const OUString& aName, sal_Bool bExact ) override;
 
     // All Access and Container methods are not thread safe
     // XElementAccess
-    virtual Type SAL_CALL getElementType() throw( RuntimeException, std::exception ) override
+    virtual Type SAL_CALL getElementType() override
         { return _xElementAccess->getElementType(); }
 
-    virtual sal_Bool SAL_CALL hasElements() throw( RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasElements() override
         { return _xElementAccess->hasElements(); }
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& Name, const Any& Element )
-        throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception ) override
+    virtual void SAL_CALL insertByName( const OUString& Name, const Any& Element ) override
         { _xNameContainer->insertByName( Name, Element ); }
 
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override
+    virtual void SAL_CALL removeByName( const OUString& Name ) override
         { _xNameContainer->removeByName( Name ); }
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& Name, const Any& Element )
-        throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override
+    virtual void SAL_CALL replaceByName( const OUString& Name, const Any& Element ) override
         { _xNameReplace->replaceByName( Name, Element ); }
 
     // XNameAccess
-    virtual Any SAL_CALL getByName( const OUString& Name )
-        throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override
+    virtual Any SAL_CALL getByName( const OUString& Name ) override
         { return _xNameAccess->getByName( Name ); }
 
-    virtual Sequence<OUString> SAL_CALL getElementNames() throw( RuntimeException, std::exception ) override
+    virtual Sequence<OUString> SAL_CALL getElementNames() override
         { return _xNameAccess->getElementNames(); }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& Name ) throw( RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& Name ) override
         { return _xNameAccess->hasByName( Name ); }
 
     // XIndexContainer
-    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element )
-        throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override
+    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element ) override
         { _xIndexContainer->insertByIndex( Index, Element ); }
 
-    virtual void SAL_CALL removeByIndex( sal_Int32 Index )
-        throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override
+    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override
         { _xIndexContainer->removeByIndex( Index ); }
 
     // XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element )
-        throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override
+    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element ) override
         { _xIndexReplace->replaceByIndex( Index, Element ); }
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( RuntimeException, std::exception ) override
+    virtual sal_Int32 SAL_CALL getCount() override
         { return _xIndexAccess->getCount(); }
 
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index )
-        throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override
+    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override
         { return _xIndexAccess->getByIndex( Index ); }
 
     // XEnumerationAccess
-    virtual Reference<XEnumeration> SAL_CALL createEnumeration() throw( RuntimeException, std::exception ) override
+    virtual Reference<XEnumeration> SAL_CALL createEnumeration() override
         { return _xEnumerationAccess->createEnumeration(); }
 
     // XExactName
-    virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) override;
 
 
 private:
@@ -249,7 +233,6 @@ Invocation_Impl::Invocation_Impl
 
 
 Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType )
-    throw( RuntimeException, std::exception )
 {
     // PropertySet implementation
     Any a = ::cppu::queryInterface( aType,
@@ -329,7 +312,7 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType )
 }
 
 
-Any Invocation_Impl::getMaterial() throw(RuntimeException, std::exception)
+Any Invocation_Impl::getMaterial()
 {
     // AB, 12.2.1999  Make sure that the material is taken when possible
     // from the direct Invocation of the Introspection, otherwise structs
@@ -453,7 +436,6 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
 
 
 OUString Invocation_Impl::getExactName( const OUString& rApproximateName )
-    throw( RuntimeException, std::exception )
 {
     if (_xENDirect.is())
         return _xENDirect->getExactName( rApproximateName );
@@ -466,7 +448,6 @@ OUString Invocation_Impl::getExactName( const OUString& rApproximateName )
 
 
 Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection()
-    throw( RuntimeException, std::exception )
 {
     if( _xDirect.is() )
         return _xDirect->getIntrospection();
@@ -476,7 +457,6 @@ Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection()
 
 
 sal_Bool Invocation_Impl::hasMethod( const OUString& Name )
-    throw( RuntimeException, std::exception )
 {
     if (_xDirect.is())
         return _xDirect->hasMethod( Name );
@@ -487,7 +467,6 @@ sal_Bool Invocation_Impl::hasMethod( const OUString& Name )
 
 
 sal_Bool Invocation_Impl::hasProperty( const OUString& Name )
-    throw( RuntimeException, std::exception )
 {
     if (_xDirect.is())
         return _xDirect->hasProperty( Name );
@@ -503,7 +482,6 @@ sal_Bool Invocation_Impl::hasProperty( const OUString& Name )
 
 
 Any Invocation_Impl::getValue( const OUString& PropertyName )
-    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     if (_xDirect.is())
         return _xDirect->getValue( PropertyName );
@@ -537,7 +515,6 @@ Any Invocation_Impl::getValue( const OUString& PropertyName )
 
 
 void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value )
-    throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception )
 {
     if (_xDirect.is())
         _xDirect->setValue( PropertyName, Value );
@@ -613,7 +590,6 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value )
 
 Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>& InParams,
                                 Sequence<sal_Int16>& OutIndices, Sequence<Any>& OutParams )
-    throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception )
 {
     if (_xDirect.is())
         return _xDirect->invoke( FunctionName, InParams, OutIndices, OutParams );
@@ -847,7 +823,6 @@ void Invocation_Impl::getInfoSequenceImpl
 
 // XInvocation2
 Sequence< OUString > SAL_CALL Invocation_Impl::getMemberNames(  )
-    throw( RuntimeException, std::exception )
 {
     if( _xDirect2.is() )
     {
@@ -859,7 +834,6 @@ Sequence< OUString > SAL_CALL Invocation_Impl::getMemberNames(  )
 }
 
 Sequence< InvocationInfo > SAL_CALL Invocation_Impl::getInfo(  )
-    throw( RuntimeException, std::exception )
 {
     if( _xDirect2.is() )
     {
@@ -871,7 +845,6 @@ Sequence< InvocationInfo > SAL_CALL Invocation_Impl::getInfo(  )
 }
 
 InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName, sal_Bool bExact )
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     if( _xDirect2.is() )
     {
@@ -983,7 +956,7 @@ void Invocation_Impl::fillInfoForMethod
 
 
 // XTypeProvider
-Sequence< Type > SAL_CALL Invocation_Impl::getTypes() throw( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL Invocation_Impl::getTypes()
 {
     static Sequence< Type > const * s_pTypes = nullptr;
     if (! s_pTypes)
@@ -1057,7 +1030,7 @@ Sequence< Type > SAL_CALL Invocation_Impl::getTypes() throw( RuntimeException, s
     return *s_pTypes;
 }
 
-Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId(  ) throw( RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1070,14 +1043,14 @@ public:
     explicit InvocationService( const Reference<XComponentContext> & xCtx );
 
     // XServiceInfo
-    OUString                    SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override;
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) override;
-    Sequence< OUString >        SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override;
+    OUString                    SAL_CALL getImplementationName() override;
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) override;
+    Sequence< OUString >        SAL_CALL getSupportedServiceNames() override;
 
     // XSingleServiceFactory
-    Reference<XInterface>       SAL_CALL createInstance() throw( Exception, RuntimeException, std::exception ) override;
+    Reference<XInterface>       SAL_CALL createInstance() override;
     Reference<XInterface>       SAL_CALL createInstanceWithArguments(
-        const Sequence<Any>& rArguments ) throw( Exception, RuntimeException, std::exception ) override;
+        const Sequence<Any>& rArguments ) override;
 private:
     Reference<XComponentContext> mxCtx;
     Reference<XMultiComponentFactory> mxSMgr;
@@ -1098,25 +1071,25 @@ InvocationService::InvocationService( const Reference<XComponentContext> & xCtx
 }
 
 // XServiceInfo
-OUString InvocationService::getImplementationName() throw( RuntimeException, std::exception )
+OUString InvocationService::getImplementationName()
 {
     return inv_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool InvocationService::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception )
+sal_Bool InvocationService::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > InvocationService::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > InvocationService::getSupportedServiceNames()
 {
     return inv_getSupportedServiceNames();
 }
 
 
-Reference<XInterface> InvocationService::createInstance() throw( Exception, RuntimeException, std::exception )
+Reference<XInterface> InvocationService::createInstance()
 {
     //TODO:throw( Exception("no default construction of invocation adapter possible!", *this) );
     return Reference<XInterface>(); // dummy
@@ -1124,7 +1097,7 @@ Reference<XInterface> InvocationService::createInstance() throw( Exception, Runt
 
 
 Reference<XInterface> InvocationService::createInstanceWithArguments(
-    const Sequence<Any>& rArguments ) throw( Exception, RuntimeException, std::exception )
+    const Sequence<Any>& rArguments )
 {
     if (rArguments.getLength() == 1)
     {
@@ -1141,7 +1114,6 @@ Reference<XInterface> InvocationService::createInstanceWithArguments(
 
 /// @throws RuntimeException
 Reference<XInterface> SAL_CALL InvocationService_CreateInstance( const Reference<XComponentContext> & xCtx )
-    throw( RuntimeException )
 {
     Reference<XInterface> xService( *new InvocationService( xCtx ) );
     return xService;
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index d9369716762d..ed9977ffba45 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -103,22 +103,17 @@ public:
     virtual ~FactoryImpl() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XInvocationAdapterFactory
     virtual Reference< XInterface > SAL_CALL createAdapter(
-        const Reference< script::XInvocation > & xReceiver, const Type & rType )
-        throw (RuntimeException, std::exception) override;
+        const Reference< script::XInvocation > & xReceiver, const Type & rType ) override;
     // XInvocationAdapterFactory2
     virtual Reference< XInterface > SAL_CALL createAdapter(
         const Reference< script::XInvocation > & xReceiver,
-        const Sequence< Type > & rTypes )
-        throw (RuntimeException, std::exception) override;
+        const Sequence< Type > & rTypes ) override;
 };
 struct AdapterImpl;
 
@@ -810,7 +805,6 @@ static inline AdapterImpl * lookup_adapter(
 Reference< XInterface > FactoryImpl::createAdapter(
     const Reference< script::XInvocation > & xReceiver,
     const Sequence< Type > & rTypes )
-    throw (RuntimeException, std::exception)
 {
     Reference< XInterface > xRet;
     if (xReceiver.is() && rTypes.getLength())
@@ -869,7 +863,6 @@ Reference< XInterface > FactoryImpl::createAdapter(
 
 Reference< XInterface > FactoryImpl::createAdapter(
     const Reference< script::XInvocation > & xReceiver, const Type & rType )
-    throw (RuntimeException, std::exception)
 {
     return createAdapter( xReceiver, Sequence< Type >( &rType, 1 ) );
 }
@@ -877,19 +870,16 @@ Reference< XInterface > FactoryImpl::createAdapter(
 // XServiceInfo
 
 OUString FactoryImpl::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return invadp_getImplementationName();
 }
 
 sal_Bool FactoryImpl::supportsService( const OUString & rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > FactoryImpl::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return invadp_getSupportedServiceNames();
 }
@@ -897,7 +887,6 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames()
 /// @throws Exception
 static Reference< XInterface > SAL_CALL FactoryImpl_create(
     const Reference< XComponentContext > & xContext )
-    throw (Exception)
 {
     return static_cast<cppu::OWeakObject *>(new FactoryImpl( xContext ));
 }
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 9a093853c05e..5b421b0ba253 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -101,26 +101,21 @@ class JavaComponentLoader : public WeakImplHelper<XImplementationLoader, XServic
 
 public:
     /// @throws RuntimeException
-    explicit JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx)
-        throw(RuntimeException);
+    explicit JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx);
 
 public:
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw(RuntimeException, std::exception) override;
-    virtual Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XImplementationLoader
     virtual css::uno::Reference<XInterface> SAL_CALL activate(
         const OUString& implementationName, const OUString& implementationLoaderUrl,
-        const OUString& locationUrl, const css::uno::Reference<XRegistryKey>& xKey)
-        throw(CannotActivateFactoryException, RuntimeException, std::exception) override;
+        const OUString& locationUrl, const css::uno::Reference<XRegistryKey>& xKey) override;
     virtual sal_Bool SAL_CALL writeRegistryInfo(
         const css::uno::Reference<XRegistryKey>& xKey,
-        const OUString& implementationLoaderUrl, const OUString& locationUrl)
-        throw(CannotRegisterImplementationException, RuntimeException, std::exception) override;
+        const OUString& implementationLoaderUrl, const OUString& locationUrl) override;
 };
 
 const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaLoader()
@@ -289,7 +284,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL
     return m_javaLoader;
 }
 
-JavaComponentLoader::JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx) throw(RuntimeException) :
+JavaComponentLoader::JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx) :
     m_xComponentContext(xCtx)
 
 {
@@ -298,19 +293,16 @@ JavaComponentLoader::JavaComponentLoader(const css::uno::Reference<XComponentCon
 
 // XServiceInfo
 OUString SAL_CALL JavaComponentLoader::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return loader_getImplementationName();
 }
 
 sal_Bool SAL_CALL JavaComponentLoader::supportsService(const OUString & ServiceName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence<OUString> SAL_CALL JavaComponentLoader::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return loader_getSupportedServiceNames();
 }
@@ -320,7 +312,6 @@ Sequence<OUString> SAL_CALL JavaComponentLoader::getSupportedServiceNames()
 sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo(
     const css::uno::Reference<XRegistryKey> & xKey, const OUString & blabla,
     const OUString & rLibName)
-    throw(CannotRegisterImplementationException, RuntimeException, std::exception)
 {
     const css::uno::Reference<XImplementationLoader> & loader = getJavaLoader();
     if (loader.is())
@@ -333,7 +324,6 @@ sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo(
 css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader::activate(
     const OUString & rImplName, const OUString & blabla, const OUString & rLibName,
     const css::uno::Reference<XRegistryKey> & xKey)
-    throw(CannotActivateFactoryException, RuntimeException, std::exception)
 {
     const css::uno::Reference<XImplementationLoader> & loader = getJavaLoader();
     if (loader.is())
@@ -358,7 +348,7 @@ static Mutex & getInitMutex()
 }
 
 /// @throws Exception
-css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader_CreateInstance(const css::uno::Reference<XComponentContext> & xCtx) throw(Exception)
+css::uno::Reference<XInterface> SAL_CALL JavaComponentLoader_CreateInstance(const css::uno::Reference<XComponentContext> & xCtx)
 {
     css::uno::Reference<XInterface> xRet;
 
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 5e20d3d603c5..081dce9b1e72 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -40,7 +40,7 @@ public:
     AbortContinuation(const AbortContinuation&) = delete;
     AbortContinuation& operator=(const AbortContinuation&)= delete;
 
-    virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override {}
+    virtual void SAL_CALL select() override {}
 
 private:
     virtual inline ~AbortContinuation() override {}
@@ -56,7 +56,7 @@ public:
     RetryContinuation(const RetryContinuation&) = delete;
     RetryContinuation& operator=(const RetryContinuation&) = delete;
 
-    virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL select() override;
 
     bool isSelected() const;
 
@@ -68,7 +68,6 @@ private:
 };
 
 void SAL_CALL InteractionRequest::RetryContinuation::select()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_bSelected = true;
@@ -90,14 +89,12 @@ InteractionRequest::InteractionRequest(css::uno::Any const & rRequest):
 }
 
 css::uno::Any SAL_CALL InteractionRequest::getRequest()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_aRequest;
 }
 
 css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >
 SAL_CALL InteractionRequest::getContinuations()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_aContinuations;
 }
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index 8977b4449416..67a506769327 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -39,12 +39,11 @@ class InteractionRequest:
 public:
     explicit InteractionRequest(css::uno::Any const & rRequest);
 
-    virtual css::uno::Any SAL_CALL getRequest()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getRequest() override;
 
     virtual css::uno::Sequence< css::uno::Reference<
         css::task::XInteractionContinuation > > SAL_CALL
-    getContinuations() throw (css::uno::RuntimeException, std::exception) override;
+    getContinuations() override;
 
     bool retry() const;
 
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 907fd12bd7ea..8627f8583d6c 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -131,8 +131,7 @@ private:
     SingletonFactory(const SingletonFactory&) = delete;
     SingletonFactory& operator=(const SingletonFactory&) = delete;
 
-    virtual void SAL_CALL disposing(css::lang::EventObject const &)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(css::lang::EventObject const &) override;
 
     static void dispose();
 
@@ -173,7 +172,6 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::getSingleton(
 }
 
 void SAL_CALL SingletonFactory::disposing(css::lang::EventObject const &)
-    throw (css::uno::RuntimeException, std::exception)
 {
     dispose();
 }
@@ -268,7 +266,7 @@ bool askForRetry(css::uno::Any const & rException)
 /// @throws css::uno::Exception
 void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
                             const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
-                            const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw (css::uno::Exception)
+                            const css::uno::Reference<css::uno::XComponentContext> &xCtx )
 {
     css::uno::Reference<css::uno::XInterface> xConfRegistry = xSMgr->createInstanceWithContext(
             "com.sun.star.configuration.ConfigurationRegistry",
@@ -351,7 +349,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
 void getDefaultLocaleFromConfig(
     stoc_javavm::JVM * pjvm,
     const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
-    const css::uno::Reference<css::uno::XComponentContext> &xCtx ) throw(css::uno::Exception, std::exception)
+    const css::uno::Reference<css::uno::XComponentContext> &xCtx )
 {
     css::uno::Reference<css::uno::XInterface> xConfRegistry =
         xSMgr->createInstanceWithContext( "com.sun.star.configuration.ConfigurationRegistry", xCtx );
@@ -455,7 +453,7 @@ void getDefaultLocaleFromConfig(
 void getJavaPropsFromSafetySettings(
     stoc_javavm::JVM * pjvm,
     const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
-    const css::uno::Reference<css::uno::XComponentContext> &xCtx) throw(css::uno::Exception)
+    const css::uno::Reference<css::uno::XComponentContext> &xCtx)
 {
     css::uno::Reference<css::uno::XInterface> xConfRegistry =
         xSMgr->createInstanceWithContext(
@@ -542,7 +540,7 @@ void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
 void initVMConfiguration(
     stoc_javavm::JVM * pjvm,
     const css::uno::Reference<css::lang::XMultiComponentFactory> & xSMgr,
-    const css::uno::Reference<css::uno::XComponentContext > &xCtx) throw(css::uno::Exception, std::exception)
+    const css::uno::Reference<css::uno::XComponentContext > &xCtx)
 {
     stoc_javavm::JVM jvm;
     try {
@@ -619,7 +617,6 @@ JavaVirtualMachine::JavaVirtualMachine(
 void SAL_CALL
 JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const &
                                    rArguments)
-    throw (css::uno::Exception, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     if (m_bDisposed)
@@ -674,28 +671,24 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const &
 }
 
 OUString SAL_CALL JavaVirtualMachine::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return serviceGetImplementationName();
 }
 
 sal_Bool SAL_CALL
 JavaVirtualMachine::supportsService(OUString const & rServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL
 JavaVirtualMachine::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return serviceGetSupportedServiceNames();
 }
 
 css::uno::Any SAL_CALL
 JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     if (m_bDisposed)
@@ -935,7 +928,6 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
 }
 
 sal_Bool SAL_CALL JavaVirtualMachine::isVMStarted()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     if (m_bDisposed)
@@ -945,7 +937,6 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMStarted()
 }
 
 sal_Bool SAL_CALL JavaVirtualMachine::isVMEnabled()
-    throw (css::uno::RuntimeException, std::exception)
 {
     {
         osl::MutexGuard aGuard(m_aMutex);
@@ -964,7 +955,6 @@ sal_Bool SAL_CALL JavaVirtualMachine::isVMEnabled()
 }
 
 sal_Bool SAL_CALL JavaVirtualMachine::isThreadAttached()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     if (m_bDisposed)
@@ -978,7 +968,6 @@ sal_Bool SAL_CALL JavaVirtualMachine::isThreadAttached()
 }
 
 void SAL_CALL JavaVirtualMachine::registerThread()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     if (m_bDisposed)
@@ -1011,7 +1000,6 @@ void SAL_CALL JavaVirtualMachine::registerThread()
 }
 
 void SAL_CALL JavaVirtualMachine::revokeThread()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     if (m_bDisposed)
@@ -1033,7 +1021,6 @@ void SAL_CALL JavaVirtualMachine::revokeThread()
 
 void SAL_CALL
 JavaVirtualMachine::disposing(css::lang::EventObject const & rSource)
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(m_aMutex);
     if (rSource.Source == m_xInetConfiguration)
@@ -1044,12 +1031,10 @@ JavaVirtualMachine::disposing(css::lang::EventObject const & rSource)
 
 void SAL_CALL JavaVirtualMachine::elementInserted(
     css::container::ContainerEvent const &)
-    throw (css::uno::RuntimeException, std::exception)
 {}
 
 void SAL_CALL JavaVirtualMachine::elementRemoved(
     css::container::ContainerEvent const &)
-    throw (css::uno::RuntimeException, std::exception)
 {}
 
 // If a user changes the setting, for example for proxy settings, then this
@@ -1059,7 +1044,6 @@ void SAL_CALL JavaVirtualMachine::elementRemoved(
 // values.
 void SAL_CALL JavaVirtualMachine::elementReplaced(
     css::container::ContainerEvent const & rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     // TODO Using the new value stored in rEvent is wrong here.  If two threads
     // receive different elementReplaced calls in quick succession, it is
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index f4ebabd48f7f..a8883f1ddffb 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -66,57 +66,44 @@ public:
     // XInitialization
     virtual void SAL_CALL
     initialize(css::uno::Sequence< css::uno::Any > const &
-                   rArguments)
-        throw (css::uno::Exception, std::exception) override;
+                   rArguments) override;
 
     // 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 & rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    supportsService(OUString const & rServiceName) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
     // XJavaVM
     virtual css::uno::Any SAL_CALL
-    getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
-        throw (css::uno::RuntimeException, std::exception) override;
+    getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) override;
 
-    virtual sal_Bool SAL_CALL isVMStarted()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isVMStarted() override;
 
-    virtual sal_Bool SAL_CALL isVMEnabled()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isVMEnabled() override;
 
     // XJavaThreadRegister_11
-    virtual sal_Bool SAL_CALL isThreadAttached()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isThreadAttached() override;
 
-    virtual void SAL_CALL registerThread()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL registerThread() override;
 
-    virtual void SAL_CALL revokeThread()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL revokeThread() override;
 
     // XContainerListener
     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
-    elementInserted(css::container::ContainerEvent const & rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    elementInserted(css::container::ContainerEvent const & rEvent) override;
 
     virtual void SAL_CALL
-    elementRemoved(css::container::ContainerEvent const & rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    elementRemoved(css::container::ContainerEvent const & rEvent) override;
 
     virtual void SAL_CALL
-    elementReplaced(css::container::ContainerEvent const & rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    elementReplaced(css::container::ContainerEvent const & rEvent) override;
 
 private:
     JavaVirtualMachine(JavaVirtualMachine &) = delete;
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 8b765f41515e..4f9cc2c6a1b4 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -61,16 +61,16 @@ public:
     explicit DllComponentLoader( const Reference<XComponentContext> & xCtx );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XImplementationLoader
-    virtual Reference<XInterface> SAL_CALL activate( const OUString& implementationName, const OUString& implementationLoaderUrl, const OUString& locationUrl, const Reference<XRegistryKey>& xKey ) throw(CannotActivateFactoryException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL writeRegistryInfo( const Reference<XRegistryKey>& xKey, const OUString& implementationLoaderUrl, const OUString& locationUrl ) throw(CannotRegisterImplementationException, RuntimeException, std::exception) override;
+    virtual Reference<XInterface> SAL_CALL activate( const OUString& implementationName, const OUString& implementationLoaderUrl, const OUString& locationUrl, const Reference<XRegistryKey>& xKey ) override;
+    virtual sal_Bool SAL_CALL writeRegistryInfo( const Reference<XRegistryKey>& xKey, const OUString& implementationLoaderUrl, const OUString& locationUrl ) override;
 
 private:
     Reference<XMultiServiceFactory> m_xSMgr;
@@ -83,19 +83,16 @@ DllComponentLoader::DllComponentLoader( const Reference<XComponentContext> & xCt
 }
 
 OUString SAL_CALL DllComponentLoader::getImplementationName(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.stoc.DLLComponentLoader");
 }
 
 sal_Bool SAL_CALL DllComponentLoader::supportsService( const OUString& ServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence<OUString> SAL_CALL DllComponentLoader::getSupportedServiceNames(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Sequence< OUString > seqNames { "com.sun.star.loader.SharedLibrary" };
     return seqNames;
@@ -103,7 +100,6 @@ Sequence<OUString> SAL_CALL DllComponentLoader::getSupportedServiceNames(  )
 
 
 void DllComponentLoader::initialize( const css::uno::Sequence< css::uno::Any >& )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "dllcomponentloader::initialize should not be called !" );
 //      if( aArgs.getLength() != 1 )
@@ -130,8 +126,6 @@ void DllComponentLoader::initialize( const css::uno::Sequence< css::uno::Any >&
 Reference<XInterface> SAL_CALL DllComponentLoader::activate(
     const OUString & rImplName, const OUString &, const OUString & rLibName,
     const Reference< XRegistryKey > & )
-
-    throw(CannotActivateFactoryException, RuntimeException, std::exception)
 {
     return loadSharedLibComponentFactory(
         cppu::bootstrap_expandUri(rLibName), OUString(), rImplName, m_xSMgr,
@@ -141,8 +135,6 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate(
 
 sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo(
     const Reference< XRegistryKey > & xKey, const OUString &, const OUString & rLibName )
-
-    throw(CannotRegisterImplementationException, RuntimeException, std::exception)
 {
 #ifdef DISABLE_DYNLOADING
     (void) xKey;
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 8e3fda8c8f57..f5b852553ddc 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -78,16 +78,13 @@ public:
     NamingService_Impl();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-    throw(css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception) override;
-    virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) throw(Exception, RuntimeException, std::exception) override;
-    virtual void SAL_CALL revokeObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getRegisteredObject( const OUString& Name ) override;
+    virtual void SAL_CALL registerObject( const OUString& Name, const css::uno::Reference< css::uno::XInterface >& Object ) override;
+    virtual void SAL_CALL revokeObject( const OUString& Name ) override;
 };
 
 
@@ -102,27 +99,24 @@ NamingService_Impl::NamingService_Impl() {}
 
 // XServiceInfo
 OUString NamingService_Impl::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return ns_getImplementationName();
 }
 
 // XServiceInfo
 sal_Bool NamingService_Impl::supportsService( const OUString & rServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 // XServiceInfo
 Sequence< OUString > NamingService_Impl::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return ns_getSupportedServiceNames();
 }
 
 // XServiceInfo
-Reference< XInterface > NamingService_Impl::getRegisteredObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception)
+Reference< XInterface > NamingService_Impl::getRegisteredObject( const OUString& Name )
 {
     Guard< Mutex > aGuard( aMutex );
     Reference< XInterface > xRet;
@@ -133,14 +127,14 @@ Reference< XInterface > NamingService_Impl::getRegisteredObject( const OUString&
 }
 
 // XServiceInfo
-void NamingService_Impl::registerObject( const OUString& Name, const Reference< XInterface >& Object ) throw(Exception, RuntimeException, std::exception)
+void NamingService_Impl::registerObject( const OUString& Name, const Reference< XInterface >& Object )
 {
     Guard< Mutex > aGuard( aMutex );
     aMap[ Name ] = Object;
 }
 
 // XServiceInfo
-void NamingService_Impl::revokeObject( const OUString& Name ) throw(Exception, RuntimeException, std::exception)
+void NamingService_Impl::revokeObject( const OUString& Name )
 {
     Guard< Mutex > aGuard( aMutex );
     aMap.erase( Name );
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index a701e7b02478..ea3c7479c21d 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -77,17 +77,13 @@ struct FactoryImpl : public ::cppu::WeakImplHelper< lang::XServiceInfo,
     FactoryImpl();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XProxyFactory
     virtual Reference< XAggregation > SAL_CALL createProxy(
-        Reference< XInterface > const & xTarget )
-        throw (RuntimeException, std::exception) override;
+        Reference< XInterface > const & xTarget ) override;
 };
 
 
@@ -165,8 +161,7 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface(
 struct ProxyRoot : public ::cppu::OWeakAggObject
 {
     // XAggregation
-    virtual Any SAL_CALL queryAggregation( Type const & rType )
-        throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryAggregation( Type const & rType ) override;
 
     inline ProxyRoot( ::rtl::Reference< FactoryImpl > const & factory,
                       Reference< XInterface > const & xTarget );
@@ -314,7 +309,6 @@ inline ProxyRoot::ProxyRoot(
 
 
 Any ProxyRoot::queryAggregation( Type const & rType )
-    throw (RuntimeException, std::exception)
 {
     Any ret( OWeakAggObject::queryAggregation( rType ) );
     if (! ret.hasValue())
@@ -413,7 +407,6 @@ FactoryImpl::FactoryImpl()
 
 Reference< XAggregation > FactoryImpl::createProxy(
     Reference< XInterface > const & xTarget )
-    throw (RuntimeException, std::exception)
 {
     return new ProxyRoot( this, xTarget );
 }
@@ -421,19 +414,16 @@ Reference< XAggregation > FactoryImpl::createProxy(
 // XServiceInfo
 
 OUString FactoryImpl::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return proxyfac_getImplementationName();
 }
 
 sal_Bool FactoryImpl::supportsService( const OUString & rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > FactoryImpl::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return proxyfac_getSupportedServiceNames();
 }
@@ -441,7 +431,6 @@ Sequence< OUString > FactoryImpl::getSupportedServiceNames()
 /// @throws Exception
 Reference< XInterface > SAL_CALL proxyfac_create(
     SAL_UNUSED_PARAMETER Reference< XComponentContext > const & )
-    throw (Exception)
 {
     Reference< XInterface > xRet;
     {
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 1bc162ab703a..193c98482569 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -85,8 +85,7 @@ public:
 
     // XAccessControlContext impl
     virtual void SAL_CALL checkPermission(
-        Any const & perm )
-        throw (RuntimeException, std::exception) override;
+        Any const & perm ) override;
 };
 
 inline acc_Intersection::acc_Intersection(
@@ -109,7 +108,6 @@ inline Reference< security::XAccessControlContext > acc_Intersection::create(
 
 void acc_Intersection::checkPermission(
     Any const & perm )
-    throw (RuntimeException, std::exception)
 {
     m_x1->checkPermission( perm );
     m_x2->checkPermission( perm );
@@ -133,8 +131,7 @@ public:
 
     // XAccessControlContext impl
     virtual void SAL_CALL checkPermission(
-        Any const & perm )
-        throw (RuntimeException, std::exception) override;
+        Any const & perm ) override;
 };
 
 inline acc_Union::acc_Union(
@@ -157,7 +154,6 @@ inline Reference< security::XAccessControlContext > acc_Union::create(
 
 void acc_Union::checkPermission(
     Any const & perm )
-    throw (RuntimeException, std::exception)
 {
     try
     {
@@ -184,13 +180,11 @@ public:
 
     // XAccessControlContext impl
     virtual void SAL_CALL checkPermission(
-        Any const & perm )
-        throw (RuntimeException, std::exception) override;
+        Any const & perm ) override;
 };
 
 void acc_Policy::checkPermission(
     Any const & perm )
-    throw (RuntimeException, std::exception)
 {
     m_permissions.checkPermission( perm );
 }
@@ -209,8 +203,7 @@ public:
         Reference< security::XAccessControlContext > const & xRestriction );
 
     // XCurrentContext impl
-    virtual Any SAL_CALL getValueByName( OUString const & name )
-        throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getValueByName( OUString const & name ) override;
 };
 
 inline acc_CurrentContext::acc_CurrentContext(
@@ -226,7 +219,6 @@ inline acc_CurrentContext::acc_CurrentContext(
 }
 
 Any acc_CurrentContext::getValueByName( OUString const & name )
-    throw (RuntimeException, std::exception)
 {
     if (name == s_acRestriction)
     {
@@ -326,31 +318,23 @@ public:
 
     //  XInitialization impl
     virtual void SAL_CALL initialize(
-        Sequence< Any > const & arguments )
-        throw (Exception, std::exception) override;
+        Sequence< Any > const & arguments ) override;
 
     // XAccessController impl
     virtual void SAL_CALL checkPermission(
-        Any const & perm )
-        throw (RuntimeException, std::exception) override;
+        Any const & perm ) override;
     virtual Any SAL_CALL doRestricted(
         Reference< security::XAction > const & xAction,
-        Reference< security::XAccessControlContext > const & xRestriction )
-        throw (Exception, std::exception) override;
+        Reference< security::XAccessControlContext > const & xRestriction ) override;
     virtual Any SAL_CALL doPrivileged(
         Reference< security::XAction > const & xAction,
-        Reference< security::XAccessControlContext > const & xRestriction )
-        throw (Exception, std::exception) override;
-    virtual Reference< security::XAccessControlContext > SAL_CALL getContext()
-        throw (RuntimeException, std::exception) override;
+        Reference< security::XAccessControlContext > const & xRestriction ) override;
+    virtual Reference< security::XAccessControlContext > SAL_CALL getContext() override;
 
     // XServiceInfo impl
-    virtual OUString SAL_CALL getImplementationName()
-        throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 AccessController::AccessController( Reference< XComponentContext > const & xComponentContext )
@@ -426,7 +410,6 @@ void AccessController::disposing()
 
 void AccessController::initialize(
     Sequence< Any > const & arguments )
-    throw (Exception, std::exception)
 {
     // xxx todo: review for forking
     // portal forking hack: re-initialize for another user-id
@@ -748,7 +731,6 @@ PermissionCollection AccessController::getEffectivePermissions(
 
 void AccessController::checkPermission(
     Any const & perm )
-    throw (RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed)
     {
@@ -778,7 +760,6 @@ void AccessController::checkPermission(
 Any AccessController::doRestricted(
     Reference< security::XAction > const & xAction,
     Reference< security::XAccessControlContext > const & xRestriction )
-    throw (Exception, std::exception)
 {
     if (rBHelper.bDisposed)
     {
@@ -811,7 +792,6 @@ Any AccessController::doRestricted(
 Any AccessController::doPrivileged(
     Reference< security::XAction > const & xAction,
     Reference< security::XAccessControlContext > const & xRestriction )
-    throw (Exception, std::exception)
 {
     if (rBHelper.bDisposed)
     {
@@ -846,7 +826,6 @@ Any AccessController::doPrivileged(
 }
 
 Reference< security::XAccessControlContext > AccessController::getContext()
-    throw (RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed)
     {
@@ -870,19 +849,16 @@ Reference< security::XAccessControlContext > AccessController::getContext()
 // XServiceInfo impl
 
 OUString AccessController::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.security.comp.stoc.AccessController");
 }
 
 sal_Bool AccessController::supportsService( OUString const & serviceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 Sequence< OUString > AccessController::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     Sequence<OUString> aSNS { SERVICE_NAME };
     return aSNS;
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index bc3f3fe0e0be..6fada62ca405 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -75,20 +75,14 @@ public:
 
     // XPolicy impl
     virtual Sequence< Any > SAL_CALL getPermissions(
-        OUString const & userId )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence< Any > SAL_CALL getDefaultPermissions()
-        throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL refresh()
-        throw (RuntimeException, std::exception) override;
+        OUString const & userId ) override;
+    virtual Sequence< Any > SAL_CALL getDefaultPermissions() override;
+    virtual void SAL_CALL refresh() override;
 
     // XServiceInfo impl
-    virtual OUString SAL_CALL getImplementationName()
-        throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 FilePolicy::FilePolicy( Reference< XComponentContext > const & xComponentContext )
@@ -108,7 +102,6 @@ void FilePolicy::disposing()
 
 Sequence< Any > FilePolicy::getPermissions(
     OUString const & userId )
-    throw (RuntimeException, std::exception)
 {
     if (! m_init)
     {
@@ -129,7 +122,6 @@ Sequence< Any > FilePolicy::getPermissions(
 }
 
 Sequence< Any > FilePolicy::getDefaultPermissions()
-    throw (RuntimeException, std::exception)
 {
     if (! m_init)
     {
@@ -385,7 +377,6 @@ PolicyReader::~PolicyReader()
 
 
 void FilePolicy::refresh()
-    throw (RuntimeException, std::exception)
 {
     // read out file (the .../file-name value had originally been set in
     // cppu::add_access_control_entries (cppuhelper/source/servicefactory.cxx)
@@ -491,19 +482,16 @@ void FilePolicy::refresh()
 
 
 OUString FilePolicy::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString(IMPL_NAME);
 }
 
 sal_Bool FilePolicy::supportsService( OUString const & serviceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 Sequence< OUString > FilePolicy::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     Sequence<OUString> aSNS { "com.sun.star.security.Policy" };
     return aSNS;
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index f47b0b0b5923..8a6fb3bf9df5 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -163,10 +163,8 @@ public:
         {}
 
     // XEnumeration
-    sal_Bool SAL_CALL hasMoreElements()
-        throw(css::uno::RuntimeException, std::exception) override;
-    Any SAL_CALL nextElement()
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL hasMoreElements() override;
+    Any SAL_CALL nextElement() override;
 private:
     Mutex                               aMutex;
     Sequence< Reference<XInterface > >  aFactories;
@@ -174,7 +172,7 @@ private:
 };
 
 // XEnumeration
-sal_Bool ServiceEnumeration_Impl::hasMoreElements() throw(css::uno::RuntimeException, std::exception)
+sal_Bool ServiceEnumeration_Impl::hasMoreElements()
 {
     MutexGuard aGuard( aMutex );
     return nIt != aFactories.getLength();
@@ -182,7 +180,6 @@ sal_Bool ServiceEnumeration_Impl::hasMoreElements() throw(css::uno::RuntimeExcep
 
 // XEnumeration
 Any ServiceEnumeration_Impl::nextElement()
-    throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( aMutex );
     if( nIt == aFactories.getLength() )
@@ -202,22 +199,17 @@ public:
         {}
 
     // XPropertySetInfo impl
-    virtual Sequence< beans::Property > SAL_CALL getProperties()
-        throw (RuntimeException, std::exception) override;
-    virtual beans::Property SAL_CALL getPropertyByName( OUString const & name )
-        throw (beans::UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( OUString const & name )
-        throw (RuntimeException, std::exception) override;
+    virtual Sequence< beans::Property > SAL_CALL getProperties() override;
+    virtual beans::Property SAL_CALL getPropertyByName( OUString const & name ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( OUString const & name ) override;
 };
 
 Sequence< beans::Property > PropertySetInfo_Impl::getProperties()
-    throw (RuntimeException, std::exception)
 {
     return m_properties;
 }
 
 beans::Property PropertySetInfo_Impl::getPropertyByName( OUString const & name )
-    throw (beans::UnknownPropertyException, RuntimeException, std::exception)
 {
     beans::Property const * p = m_properties.getConstArray();
     for ( sal_Int32 nPos = m_properties.getLength(); nPos--; )
@@ -230,7 +222,6 @@ beans::Property PropertySetInfo_Impl::getPropertyByName( OUString const & name )
 }
 
 sal_Bool PropertySetInfo_Impl::hasPropertyByName( OUString const & name )
-    throw (RuntimeException, std::exception)
 {
     beans::Property const * p = m_properties.getConstArray();
     for ( sal_Int32 nPos = m_properties.getLength(); nPos--; )
@@ -254,10 +245,8 @@ public:
         {}
 
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements()
-         throw(css::uno::RuntimeException, std::exception) override;
-    virtual Any SAL_CALL nextElement()
-        throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual Any SAL_CALL nextElement() override;
 
 private:
     Mutex                           aMutex;
@@ -267,7 +256,6 @@ private:
 
 // XEnumeration
 sal_Bool ImplementationEnumeration_Impl::hasMoreElements()
-    throw(css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( aMutex );
     return aIt != aImplementationMap.end();
@@ -275,7 +263,6 @@ sal_Bool ImplementationEnumeration_Impl::hasMoreElements()
 
 // XEnumeration
 Any ImplementationEnumeration_Impl::nextElement()
-    throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( aMutex );
     if( aIt == aImplementationMap.end() )
@@ -323,11 +310,10 @@ public:
         {}
 
     // XEventListener
-    virtual void SAL_CALL disposing(const EventObject & rEvt ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const EventObject & rEvt ) override;
 };
 
 void OServiceManager_Listener::disposing(const EventObject & rEvt )
-    throw(css::uno::RuntimeException, std::exception)
 {
     Reference<XSet > x( xSMgr );
     if( x.is() )
@@ -370,69 +356,59 @@ public:
     explicit OServiceManager( Reference< XComponentContext > const & xContext );
 
     // XInitialization
-    void SAL_CALL initialize( Sequence< Any > const & args )
-        throw (Exception, std::exception) override;
+    void SAL_CALL initialize( Sequence< Any > const & args ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XMultiComponentFactory
     virtual Reference< XInterface > SAL_CALL createInstanceWithContext(
-        OUString const & rServiceSpecifier, Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override;
+        OUString const & rServiceSpecifier, Reference< XComponentContext > const & xContext ) override;
     virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
         OUString const & rServiceSpecifier,
         Sequence< Any > const & rArguments,
-        Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override;
+        Reference< XComponentContext > const & xContext ) override;
 //      virtual Sequence< OUString > SAL_CALL getAvailableServiceNames()
 //          throw (RuntimeException);
 
     // XMultiServiceFactory
-    virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual Reference<XInterface > SAL_CALL createInstance(const OUString &) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const OUString &, const Sequence<Any >& Arguments) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
+    virtual Reference<XInterface > SAL_CALL createInstance(const OUString &) override;
+    virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const OUString &, const Sequence<Any >& Arguments) override;
 
     // The same as the getAvailableServiceNames, but only unique names
     Sequence< OUString > getUniqueAvailableServiceNames(
         HashSet_OWString & aNameSet );
 
     // XElementAccess
-    virtual Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
-    virtual Reference<XEnumeration > SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override;
+    virtual Reference<XEnumeration > SAL_CALL createEnumeration() override;
 
     // XSet
-    virtual sal_Bool SAL_CALL has( const Any & Element ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insert( const Any & Element ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const Any & Element ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL has( const Any & Element ) override;
+    virtual void SAL_CALL insert( const Any & Element ) override;
+    virtual void SAL_CALL remove( const Any & Element ) override;
 
     // XContentEnumerationAccess
     //Sequence< OUString >          getAvailableServiceNames() throw( (Exception) );
-    virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw(css::uno::RuntimeException, std::exception) override;
+    virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     // XPropertySet
-    Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue)
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    Any SAL_CALL getPropertyValue(const OUString& PropertyName)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) override;
+    Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
+    void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) override;
+    void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) override;
+    void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) override;
+    void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) override;
 
 protected:
     inline bool is_disposed() const;
@@ -509,85 +485,75 @@ public:
         Reference< XComponentContext > const & xContext );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
         { return Reference< XServiceInfo >(getRoot(), UNO_QUERY_THROW)->getImplementationName(); }
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override
         { return Reference< XServiceInfo >(getRoot(), UNO_QUERY_THROW)->supportsService( ServiceName ); }
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) override
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override
         { return Reference< XServiceInfo >(getRoot(), UNO_QUERY_THROW)->getSupportedServiceNames(); }
 
     // XMultiComponentFactory
     virtual Reference< XInterface > SAL_CALL createInstanceWithContext(
-        OUString const & rServiceSpecifier, Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override
+        OUString const & rServiceSpecifier, Reference< XComponentContext > const & xContext ) override
         { return getRoot()->createInstanceWithContext( rServiceSpecifier, xContext ); }
     virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext(
         OUString const & rServiceSpecifier,
         Sequence< Any > const & rArguments,
-        Reference< XComponentContext > const & xContext )
-        throw (Exception, RuntimeException, std::exception) override
+        Reference< XComponentContext > const & xContext ) override
         { return getRoot()->createInstanceWithArgumentsAndContext( rServiceSpecifier, rArguments, xContext ); }
 //      virtual Sequence< OUString > SAL_CALL getAvailableServiceNames()
 //          throw (RuntimeException);
 
     // XMultiServiceFactory
-    virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (RuntimeException, std::exception) override
+    virtual Sequence< OUString > SAL_CALL getAvailableServiceNames() override
         { return getRoot()->getAvailableServiceNames(); }
-    virtual Reference<XInterface > SAL_CALL createInstance(const OUString & name) throw (Exception, std::exception) override
+    virtual Reference<XInterface > SAL_CALL createInstance(const OUString & name) override
         { return getRoot()->createInstanceWithContext( name, m_xContext ); }
-    virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const OUString & name, const Sequence<Any >& Arguments) throw (Exception, std::exception) override
+    virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const OUString & name, const Sequence<Any >& Arguments) override
         { return getRoot()->createInstanceWithArgumentsAndContext( name, Arguments, m_xContext ); }
 
     // XElementAccess
-    virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override
+    virtual Type SAL_CALL getElementType() override
         { return Reference< XElementAccess >(getRoot(), UNO_QUERY_THROW)->getElementType(); }
-    virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements() override
         { return Reference< XElementAccess >(getRoot(), UNO_QUERY_THROW)->hasElements(); }
 
     // XEnumerationAccess
-    virtual Reference<XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception) override
+    virtual Reference<XEnumeration > SAL_CALL createEnumeration() override
         { return Reference< XEnumerationAccess >(getRoot(), UNO_QUERY_THROW)->createEnumeration(); }
 
     // XSet
-    virtual sal_Bool SAL_CALL has( const Any & Element ) throw (RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL has( const Any & Element ) override
         { return Reference< XSet >(getRoot(), UNO_QUERY_THROW)->has( Element ); }
-    virtual void SAL_CALL insert( const Any & Element ) throw (lang::IllegalArgumentException, container::ElementExistException, RuntimeException, std::exception) override
+    virtual void SAL_CALL insert( const Any & Element ) override
         { Reference< XSet >(getRoot(), UNO_QUERY_THROW)->insert( Element ); }
-    virtual void SAL_CALL remove( const Any & Element ) throw (lang::IllegalArgumentException, container::NoSuchElementException, RuntimeException, std::exception) override
+    virtual void SAL_CALL remove( const Any & Element ) override
         { Reference< XSet >(getRoot(), UNO_QUERY_THROW)->remove( Element ); }
 
     // XContentEnumerationAccess
     //Sequence< OUString >          getAvailableServiceNames() throw( (Exception) );
-    virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw (RuntimeException, std::exception) override
+    virtual Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) override
         { return Reference< XContentEnumerationAccess >(getRoot(), UNO_QUERY_THROW)->createContentEnumeration( aServiceName ); }
 
     // XPropertySet
-    Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) override
+    Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() override
         { return Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->getPropertySetInfo(); }
 
-    void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue)
-        throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, RuntimeException, std::exception) override;
-    Any SAL_CALL getPropertyValue(const OUString& PropertyName)
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override;
+    void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) override;
+    Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
 
-    void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener)
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override
+    void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) override
         { Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->addPropertyChangeListener( PropertyName, aListener ); }
-    void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener)
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override
+    void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference<XPropertyChangeListener >& aListener) override
         { Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->removePropertyChangeListener( PropertyName, aListener ); }
-    void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener)
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override
+    void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) override
         { Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->addVetoableChangeListener( PropertyName, aListener ); }
-    void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener)
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception) override
+    void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener >& aListener) override
         { Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->removeVetoableChangeListener( PropertyName, aListener ); }
 };
 
 void SAL_CALL OServiceManagerWrapper::setPropertyValue(
     const OUString& PropertyName, const Any& aValue )
-    throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-           lang::IllegalArgumentException, lang::WrappedTargetException, RuntimeException, std::exception)
 {
     if ( PropertyName == "DefaultContext" )
     {
@@ -612,7 +578,6 @@ void SAL_CALL OServiceManagerWrapper::setPropertyValue(
 
 Any SAL_CALL OServiceManagerWrapper::getPropertyValue(
     const OUString& PropertyName )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException, std::exception)
 {
     if ( PropertyName == "DefaultContext" )
     {
@@ -661,7 +626,6 @@ OServiceManager::OServiceManager( Reference< XComponentContext > const & xContex
 
 // XComponent
 void OServiceManager::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
         return;
@@ -712,7 +676,6 @@ void OServiceManager::disposing()
 
 // XPropertySet
 Reference<XPropertySetInfo > OServiceManager::getPropertySetInfo()
-    throw(css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     if (! m_xPropertyInfo.is())
@@ -733,7 +696,6 @@ Reference<XPropertySetInfo > OServiceManager::getPropertySetInfo()
 
 void OServiceManager::setPropertyValue(
     const OUString& PropertyName, const Any& aValue )
-    throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     if ( PropertyName == "DefaultContext" )
@@ -760,7 +722,6 @@ void OServiceManager::setPropertyValue(
 }
 
 Any OServiceManager::getPropertyValue(const OUString& PropertyName)
-    throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     if ( PropertyName == "DefaultContext" )
@@ -781,7 +742,6 @@ Any OServiceManager::getPropertyValue(const OUString& PropertyName)
 
 void OServiceManager::addPropertyChangeListener(
     const OUString&, const Reference<XPropertyChangeListener >&)
-    throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     throw UnknownPropertyException();
@@ -789,7 +749,6 @@ void OServiceManager::addPropertyChangeListener(
 
 void OServiceManager::removePropertyChangeListener(
     const OUString&, const Reference<XPropertyChangeListener >&)
-    throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     throw UnknownPropertyException();
@@ -797,7 +756,6 @@ void OServiceManager::removePropertyChangeListener(
 
 void OServiceManager::addVetoableChangeListener(
     const OUString&, const Reference<XVetoableChangeListener >&)
-    throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     throw UnknownPropertyException();
@@ -805,7 +763,6 @@ void OServiceManager::addVetoableChangeListener(
 
 void OServiceManager::removeVetoableChangeListener(
     const OUString&, const Reference<XVetoableChangeListener >&)
-    throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     throw UnknownPropertyException();
@@ -845,7 +802,6 @@ Sequence< OUString > OServiceManager::getUniqueAvailableServiceNames(
 Reference< XInterface > OServiceManager::createInstanceWithContext(
     OUString const & rServiceSpecifier,
     Reference< XComponentContext > const & xContext )
-    throw (Exception, RuntimeException, std::exception)
 {
     check_undisposed();
 #if OSL_DEBUG_LEVEL > 0
@@ -900,7 +856,6 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext(
     OUString const & rServiceSpecifier,
     Sequence< Any > const & rArguments,
     Reference< XComponentContext > const & xContext )
-    throw (Exception, RuntimeException, std::exception)
 {
     check_undisposed();
 #if OSL_DEBUG_LEVEL > 0
@@ -953,7 +908,6 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext(
 
 // XMultiServiceFactory, XMultiComponentFactory, XContentEnumeration
 Sequence< OUString > OServiceManager::getAvailableServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     // all names
@@ -964,7 +918,6 @@ Sequence< OUString > OServiceManager::getAvailableServiceNames()
 // XMultibleServiceFactory
 Reference<XInterface > OServiceManager::createInstance(
     const OUString& rServiceSpecifier )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithContext(
         rServiceSpecifier, m_xContext );
@@ -974,7 +927,6 @@ Reference<XInterface > OServiceManager::createInstance(
 Reference<XInterface > OServiceManager::createInstanceWithArguments(
     const OUString& rServiceSpecifier,
     const Sequence<Any >& rArguments )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArgumentsAndContext(
         rServiceSpecifier, rArguments, m_xContext );
@@ -982,7 +934,6 @@ Reference<XInterface > OServiceManager::createInstanceWithArguments(
 
 // XInitialization
 void OServiceManager::initialize( Sequence< Any > const & )
-    throw (Exception, std::exception)
 {
     check_undisposed();
     OSL_FAIL( "not impl!" );
@@ -990,21 +941,18 @@ void OServiceManager::initialize( Sequence< Any > const & )
 
 // XServiceInfo
 OUString OServiceManager::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.stoc.OServiceManager");
 }
 
 // XServiceInfo
 sal_Bool OServiceManager::supportsService(const OUString& ServiceName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
 Sequence< OUString > OServiceManager::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     Sequence< OUString > seqNames(2);
     seqNames[0] = "com.sun.star.lang.MultiServiceFactory";
@@ -1053,7 +1001,6 @@ Sequence< Reference< XInterface > > OServiceManager::queryServiceFactories(
 // XContentEnumerationAccess
 Reference<XEnumeration > OServiceManager::createContentEnumeration(
     const OUString& aServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     Sequence< Reference< XInterface > > factories(
@@ -1065,7 +1012,7 @@ Reference<XEnumeration > OServiceManager::createContentEnumeration(
 }
 
 // XEnumeration
-Reference<XEnumeration > OServiceManager::createEnumeration() throw(css::uno::RuntimeException, std::exception)
+Reference<XEnumeration > OServiceManager::createEnumeration()
 {
     check_undisposed();
     MutexGuard aGuard( m_mutex );
@@ -1074,7 +1021,6 @@ Reference<XEnumeration > OServiceManager::createEnumeration() throw(css::uno::Ru
 
 // XElementAccess
 Type OServiceManager::getElementType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     return cppu::UnoType<XInterface>::get();
@@ -1082,7 +1028,6 @@ Type OServiceManager::getElementType()
 
 // XElementAccess
 sal_Bool OServiceManager::hasElements()
-    throw(css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     MutexGuard aGuard( m_mutex );
@@ -1091,7 +1036,6 @@ sal_Bool OServiceManager::hasElements()
 
 // XSet
 sal_Bool OServiceManager::has( const Any & Element )
-    throw(css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     if( Element.getValueTypeClass() == TypeClass_INTERFACE )
@@ -1112,7 +1056,6 @@ sal_Bool OServiceManager::has( const Any & Element )
 
 // XSet
 void OServiceManager::insert( const Any & Element )
-    throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     if( Element.getValueTypeClass() != TypeClass_INTERFACE )
@@ -1166,9 +1109,6 @@ bool OServiceManager::haveFactoryWithThisImplementation(const OUString& aImplNam
 
 // XSet
 void OServiceManager::remove( const Any & Element )
-     throw(css::lang::IllegalArgumentException,
-           css::container::NoSuchElementException,
-           css::uno::RuntimeException, std::exception)
 {
     if (is_disposed())
         return;
@@ -1259,30 +1199,27 @@ public:
     explicit ORegistryServiceManager( Reference< XComponentContext > const & xContext );
 
     // XInitialization
-    void SAL_CALL initialize(const Sequence< Any >& Arguments)
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL initialize(const Sequence< Any >& Arguments) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
         { return OUString("com.sun.star.comp.stoc.ORegistryServiceManager"); }
 
-    Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XMultiServiceFactory
-    Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
     // XContentEnumerationAccess
     //Sequence< OUString >          getAvailableServiceNames() throw( (Exception) );
-    Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw(css::uno::RuntimeException, std::exception) override;
+    Reference<XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) override;
 
     // XComponent
-    void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose() override;
 
     // OServiceManager
-    Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
-    Any SAL_CALL getPropertyValue(const OUString& PropertyName)
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    Reference<XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
 
 protected:
     //OServiceManager
@@ -1320,7 +1257,6 @@ ORegistryServiceManager::ORegistryServiceManager( Reference< XComponentContext >
 
 // XComponent
 void ORegistryServiceManager::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
         return;
@@ -1459,7 +1395,6 @@ void ORegistryServiceManager::fillAllNamesFromRegistry( HashSet_OWString & rSet
 
 // XInitialization
 void ORegistryServiceManager::initialize(const Sequence< Any >& Arguments)
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     MutexGuard aGuard( m_mutex );
@@ -1477,7 +1412,6 @@ void ORegistryServiceManager::initialize(const Sequence< Any >& Arguments)
 
 // XMultiServiceFactory, XContentEnumeration
 Sequence< OUString > ORegistryServiceManager::getAvailableServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     MutexGuard aGuard( m_mutex );
@@ -1492,7 +1426,6 @@ Sequence< OUString > ORegistryServiceManager::getAvailableServiceNames()
 
 // XServiceInfo
 Sequence< OUString > ORegistryServiceManager::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     Sequence< OUString > seqNames(2);
     seqNames[0] = "com.sun.star.lang.MultiServiceFactory";
@@ -1524,7 +1457,6 @@ Sequence< Reference< XInterface > > ORegistryServiceManager::queryServiceFactori
 // XContentEnumerationAccess
 Reference<XEnumeration > ORegistryServiceManager::createContentEnumeration(
     const OUString& aServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     MutexGuard aGuard(m_mutex);
@@ -1547,7 +1479,6 @@ Reference<XEnumeration > ORegistryServiceManager::createContentEnumeration(
 
 // OServiceManager
 Reference<XPropertySetInfo > ORegistryServiceManager::getPropertySetInfo()
-    throw(css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     if (! m_xPropertyInfo.is())
@@ -1570,7 +1501,6 @@ Reference<XPropertySetInfo > ORegistryServiceManager::getPropertySetInfo()
 }
 
 Any ORegistryServiceManager::getPropertyValue(const OUString& PropertyName)
-    throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     check_undisposed();
     if ( PropertyName == "Registry" )
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index c48913fcab80..d50c243949f6 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -61,45 +61,33 @@ public:
     osl::Mutex mutex_;
 
 private:
-    virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getURL() override;
 
     virtual void SAL_CALL open(
-        OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) override;
 
-    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isValid() override;
 
-    virtual void SAL_CALL close() throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close() override;
 
-    virtual void SAL_CALL destroy() throw(
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL destroy() override;
 
     virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
-    getRootKey() throw(
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    getRootKey() override;
 
-    virtual sal_Bool SAL_CALL isReadOnly() throw(
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
 
     virtual void SAL_CALL mergeKey(
-        OUString const & aKeyName, OUString const & aUrl)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::MergeConflictException, css::uno::RuntimeException, std::exception) override;
+        OUString const & aKeyName, OUString const & aUrl) override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.comp.stoc.SimpleRegistry"); }
 
-    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
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     {
         css::uno::Sequence< OUString > names { "com.sun.star.registry.SimpleRegistry" };
         return names;
@@ -116,158 +104,100 @@ public:
         registry_(registry), key_(key) {}
 
 private:
-    virtual OUString SAL_CALL getKeyName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getKeyName() override;
 
-    virtual sal_Bool SAL_CALL isReadOnly() throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isReadOnly() override;
 
-    virtual sal_Bool SAL_CALL isValid() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isValid() override;
 
     virtual css::registry::RegistryKeyType SAL_CALL getKeyType(
-        OUString const & rKeyName)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & rKeyName) override;
 
-    virtual css::registry::RegistryValueType SAL_CALL getValueType() throw(
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual css::registry::RegistryValueType SAL_CALL getValueType() override;
 
-    virtual sal_Int32 SAL_CALL getLongValue() throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getLongValue() override;
 
-    virtual void SAL_CALL setLongValue(sal_Int32 value) throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setLongValue(sal_Int32 value) override;
 
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() throw(
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() override;
 
     virtual void SAL_CALL setLongListValue(
-        css::uno::Sequence< sal_Int32 > const & seqValue)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< sal_Int32 > const & seqValue) override;
 
-    virtual OUString SAL_CALL getAsciiValue() throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAsciiValue() override;
 
-    virtual void SAL_CALL setAsciiValue(OUString const & value) throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAsciiValue(OUString const & value) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() override;
 
     virtual void SAL_CALL setAsciiListValue(
-        css::uno::Sequence< OUString > const & seqValue)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< OUString > const & seqValue) override;
 
-    virtual OUString SAL_CALL getStringValue() throw(
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getStringValue() override;
 
-    virtual void SAL_CALL setStringValue(OUString const & value) throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setStringValue(OUString const & value) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue()
-        throw (
-            css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() override;
 
     virtual void SAL_CALL setStringListValue(
-        css::uno::Sequence< OUString > const & seqValue)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< OUString > const & seqValue) override;
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() override;
 
     virtual void SAL_CALL setBinaryValue(
-        css::uno::Sequence< sal_Int8 > const & value)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< sal_Int8 > const & value) override;
 
     virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey(
-        OUString const & aKeyName)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aKeyName) override;
 
     virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
-    createKey(OUString const & aKeyName) throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    createKey(OUString const & aKeyName) override;
 
-    virtual void SAL_CALL closeKey() throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL closeKey() override;
 
-    virtual void SAL_CALL deleteKey(OUString const & rKeyName) throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL deleteKey(OUString const & rKeyName) override;
 
     virtual
     css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
-    SAL_CALL openKeys() throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    SAL_CALL openKeys() override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() override;
 
     virtual sal_Bool SAL_CALL createLink(
-        OUString const & aLinkName, OUString const & aLinkTarget)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+        OUString const & aLinkName, OUString const & aLinkTarget) override;
 
-    virtual void SAL_CALL deleteLink(OUString const & rLinkName) throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL deleteLink(OUString const & rLinkName) override;
 
-    virtual OUString SAL_CALL getLinkTarget(OUString const & rLinkName)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getLinkTarget(OUString const & rLinkName) override;
 
-    virtual OUString SAL_CALL getResolvedName(OUString const & aKeyName)
-        throw (
-            css::registry::InvalidRegistryException,
-            css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getResolvedName(OUString const & aKeyName) override;
 
     rtl::Reference< SimpleRegistry > registry_;
     RegistryKey key_;
 };
 
-OUString Key::getKeyName() throw (css::uno::RuntimeException, std::exception) {
+OUString Key::getKeyName() {
     osl::MutexGuard guard(registry_->mutex_);
     return key_.getName();
 }
 
 sal_Bool Key::isReadOnly()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     return key_.isReadOnly();
 }
 
-sal_Bool Key::isValid() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool Key::isValid() {
     osl::MutexGuard guard(registry_->mutex_);
     return key_.isValid();
 }
 
 css::registry::RegistryKeyType Key::getKeyType(OUString const & )
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     return css::registry::RegistryKeyType_KEY;
 }
 
 css::registry::RegistryValueType Key::getValueType()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegValueType type;
@@ -309,9 +239,7 @@ css::registry::RegistryValueType Key::getValueType()
     }
 }
 
-sal_Int32 Key::getLongValue() throw (
-    css::registry::InvalidRegistryException,
-    css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
+sal_Int32 Key::getLongValue()
 {
     osl::MutexGuard guard(registry_->mutex_);
     sal_Int32 value;
@@ -335,7 +263,6 @@ sal_Int32 Key::getLongValue() throw (
 }
 
 void Key::setLongValue(sal_Int32 value)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegError err = key_.setValue(
@@ -349,9 +276,7 @@ void Key::setLongValue(sal_Int32 value)
     }
 }
 
-css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw (
-    css::registry::InvalidRegistryException,
-    css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int32 > Key::getLongListValue()
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegistryValueList< sal_Int32 > list;
@@ -389,7 +314,6 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw (
 }
 
 void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     std::vector< sal_Int32 > list;
@@ -407,9 +331,7 @@ void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue)
     }
 }
 
-OUString Key::getAsciiValue() throw (
-    css::registry::InvalidRegistryException,
-    css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
+OUString Key::getAsciiValue()
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegValueType type;
@@ -476,7 +398,6 @@ OUString Key::getAsciiValue() throw (
 }
 
 void Key::setAsciiValue(OUString const & value)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     OString utf8;
@@ -503,9 +424,7 @@ void Key::setAsciiValue(OUString const & value)
     }
 }
 
-css::uno::Sequence< OUString > Key::getAsciiListValue() throw (
-    css::registry::InvalidRegistryException,
-    css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > Key::getAsciiListValue()
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegistryValueList< char * > list;
@@ -560,7 +479,6 @@ css::uno::Sequence< OUString > Key::getAsciiListValue() throw (
 
 void Key::setAsciiListValue(
     css::uno::Sequence< OUString > const & seqValue)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     std::vector< OString > list;
@@ -596,9 +514,7 @@ void Key::setAsciiListValue(
     }
 }
 
-OUString Key::getStringValue() throw (
-    css::registry::InvalidRegistryException,
-    css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
+OUString Key::getStringValue()
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegValueType type;
@@ -653,7 +569,6 @@ OUString Key::getStringValue() throw (
 }
 
 void Key::setStringValue(OUString const & value)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegError err = key_.setValue(
@@ -670,9 +585,7 @@ void Key::setStringValue(OUString const & value)
     }
 }
 
-css::uno::Sequence< OUString > Key::getStringListValue() throw (
-    css::registry::InvalidRegistryException,
-    css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > Key::getStringListValue()
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegistryValueList< sal_Unicode * > list;
@@ -713,7 +626,6 @@ css::uno::Sequence< OUString > Key::getStringListValue() throw (
 
 void Key::setStringListValue(
     css::uno::Sequence< OUString > const & seqValue)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     std::vector< sal_Unicode * > list;
@@ -733,9 +645,6 @@ void Key::setStringListValue(
 }
 
 css::uno::Sequence< sal_Int8 > Key::getBinaryValue()
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegValueType type;
@@ -774,7 +683,6 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue()
 }
 
 void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegError err = key_.setValue(
@@ -792,7 +700,6 @@ void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value)
 
 css::uno::Reference< css::registry::XRegistryKey > Key::openKey(
     OUString const & aKeyName)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegistryKey key;
@@ -813,7 +720,6 @@ css::uno::Reference< css::registry::XRegistryKey > Key::openKey(
 
 css::uno::Reference< css::registry::XRegistryKey > Key::createKey(
     OUString const & aKeyName)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegistryKey key;
@@ -833,7 +739,6 @@ css::uno::Reference< css::registry::XRegistryKey > Key::createKey(
 }
 
 void Key::closeKey()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegError err = key_.closeKey();
@@ -847,7 +752,6 @@ void Key::closeKey()
 }
 
 void Key::deleteKey(OUString const & rKeyName)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegError err = key_.deleteKey(rKeyName);
@@ -862,7 +766,6 @@ void Key::deleteKey(OUString const & rKeyName)
 
 css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
 Key::openKeys()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegistryKeyArray list;
@@ -891,7 +794,6 @@ Key::openKeys()
 }
 
 css::uno::Sequence< OUString > Key::getKeyNames()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     RegistryKeyNames list;
@@ -919,7 +821,6 @@ css::uno::Sequence< OUString > Key::getKeyNames()
 
 sal_Bool Key::createLink(
     OUString const & /*aLinkName*/, OUString const & /*aLinkTarget*/)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::registry::InvalidRegistryException(
             "com.sun.star.registry.SimpleRegistry key createLink: links are no longer supported",
@@ -927,7 +828,6 @@ sal_Bool Key::createLink(
 }
 
 void Key::deleteLink(OUString const & /*rLinkName*/)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::registry::InvalidRegistryException(
         "com.sun.star.registry.SimpleRegistry key deleteLink: links are no longer supported",
@@ -935,7 +835,6 @@ void Key::deleteLink(OUString const & /*rLinkName*/)
 }
 
 OUString Key::getLinkTarget(OUString const & /*rLinkName*/)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::registry::InvalidRegistryException(
         "com.sun.star.registry.SimpleRegistry key getLinkTarget: links are no longer supported",
@@ -943,7 +842,6 @@ OUString Key::getLinkTarget(OUString const & /*rLinkName*/)
 }
 
 OUString Key::getResolvedName(OUString const & aKeyName)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(registry_->mutex_);
     OUString resolved;
@@ -958,14 +856,13 @@ OUString Key::getResolvedName(OUString const & aKeyName)
     return resolved;
 }
 
-OUString SimpleRegistry::getURL() throw (css::uno::RuntimeException, std::exception) {
+OUString SimpleRegistry::getURL() {
     osl::MutexGuard guard(mutex_);
     return registry_.getName();
 }
 
 void SimpleRegistry::open(
     OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(mutex_);
     RegError err = (rURL.isEmpty() && bCreate)
@@ -984,13 +881,12 @@ void SimpleRegistry::open(
     }
 }
 
-sal_Bool SimpleRegistry::isValid() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool SimpleRegistry::isValid() {
     osl::MutexGuard guard(mutex_);
     return registry_.isValid();
 }
 
 void SimpleRegistry::close()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(mutex_);
     RegError err = registry_.close();
@@ -1004,7 +900,6 @@ void SimpleRegistry::close()
 }
 
 void SimpleRegistry::destroy()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(mutex_);
     RegError err = registry_.destroy(OUString());
@@ -1018,7 +913,6 @@ void SimpleRegistry::destroy()
 }
 
 css::uno::Reference< css::registry::XRegistryKey > SimpleRegistry::getRootKey()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(mutex_);
     RegistryKey root;
@@ -1034,7 +928,6 @@ css::uno::Reference< css::registry::XRegistryKey > SimpleRegistry::getRootKey()
 }
 
 sal_Bool SimpleRegistry::isReadOnly()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(mutex_);
     return registry_.isReadOnly();
@@ -1042,9 +935,6 @@ sal_Bool SimpleRegistry::isReadOnly()
 
 void SimpleRegistry::mergeKey(
     OUString const & aKeyName, OUString const & aUrl)
-    throw (
-        css::registry::InvalidRegistryException,
-        css::registry::MergeConflictException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(mutex_);
     RegistryKey root;
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 83f99ada0a98..37b87f217900 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -245,45 +245,39 @@ class TypeConverter_Impl : public WeakImplHelper< XTypeConverter, XServiceInfo >
     // ...misc helpers...
     /// @throws CannotConvertException
     static sal_Int64 toHyper(
-        const Any& rAny, sal_Int64 min, sal_uInt64 max = SAL_UINT64_MAX )
-        throw( CannotConvertException );
+        const Any& rAny, sal_Int64 min, sal_uInt64 max = SAL_UINT64_MAX );
     /// @throws CannotConvertException
-    static double toDouble( const Any& rAny, double min = -DBL_MAX, double max = DBL_MAX )
-        throw( CannotConvertException );
+    static double toDouble( const Any& rAny, double min = -DBL_MAX, double max = DBL_MAX );
 
 public:
     TypeConverter_Impl();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( RuntimeException, std::exception ) override;
-    virtual  Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual  Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeConverter
-    virtual Any SAL_CALL convertTo( const Any& aFrom, const Type& DestinationType )
-        throw( IllegalArgumentException, CannotConvertException, RuntimeException, std::exception) override;
-    virtual Any SAL_CALL convertToSimpleType( const Any& aFrom, TypeClass aDestinationType )
-        throw( IllegalArgumentException, CannotConvertException, RuntimeException, std::exception) override;
+    virtual Any SAL_CALL convertTo( const Any& aFrom, const Type& DestinationType ) override;
+    virtual Any SAL_CALL convertToSimpleType( const Any& aFrom, TypeClass aDestinationType ) override;
 };
 
 TypeConverter_Impl::TypeConverter_Impl() {}
 
 // XServiceInfo
-OUString TypeConverter_Impl::getImplementationName() throw( RuntimeException, std::exception )
+OUString TypeConverter_Impl::getImplementationName()
 {
     return OUString("com.sun.star.comp.stoc.TypeConverter");
 }
 
 // XServiceInfo
-sal_Bool TypeConverter_Impl::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception )
+sal_Bool TypeConverter_Impl::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames()
 {
     Sequence< OUString > seqNames { "com.sun.star.script.Converter" };
     return seqNames;
@@ -291,7 +285,6 @@ Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames() throw( Runti
 
 
 sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt64 max )
-    throw( CannotConvertException )
 {
     sal_Int64 nRet;
     TypeClass aDestinationClass = rAny.getValueTypeClass();
@@ -406,7 +399,6 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6
 
 
 double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max )
-    throw( CannotConvertException )
 {
     double fRet;
     TypeClass aDestinationClass = rAny.getValueTypeClass();
@@ -487,7 +479,6 @@ double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max )
 
 
 Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestType )
-    throw( IllegalArgumentException, CannotConvertException, RuntimeException, std::exception)
 {
     const Type& aSourceType = rVal.getValueType();
     if (aSourceType == aDestType)
@@ -681,7 +672,6 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
 
 
 Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestinationClass )
-    throw( IllegalArgumentException, CannotConvertException, RuntimeException, std::exception )
 {
     switch (aDestinationClass)
     {
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index c6ff6bbffa64..f618b4a7ae1c 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -49,41 +49,34 @@ public:
     Translator(const Translator&) = delete;
     Translator& operator=(const Translator&) = delete;
 
-    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;
+    getSupportedServiceNames() override;
 
     virtual OUString SAL_CALL
-    translateToInternal(OUString const & externalUriReference)
-        throw (css::uno::RuntimeException, std::exception) override;
+    translateToInternal(OUString const & externalUriReference) override;
 
     virtual OUString SAL_CALL
-    translateToExternal(OUString const & internalUriReference)
-        throw (css::uno::RuntimeException, std::exception) override;
+    translateToExternal(OUString const & internalUriReference) override;
 
 private:
     virtual ~Translator() override {}
 };
 
 OUString Translator::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator");
 }
 
 sal_Bool Translator::supportsService(OUString const & serviceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 css::uno::Sequence< OUString > Translator::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > s { "com.sun.star.uri.ExternalUriReferenceTranslator" };
     return s;
@@ -91,7 +84,6 @@ css::uno::Sequence< OUString > Translator::getSupportedServiceNames()
 
 OUString Translator::translateToInternal(
     OUString const & externalUriReference)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!externalUriReference.matchIgnoreAsciiCase("file:/"))
     {
@@ -140,7 +132,6 @@ OUString Translator::translateToInternal(
 
 OUString Translator::translateToExternal(
     OUString const & internalUriReference)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!internalUriReference.matchIgnoreAsciiCase("file://"))
     {
diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx
index 57d950e842ba..2baa1f3b9b20 100644
--- a/stoc/source/uriproc/UriReference.cxx
+++ b/stoc/source/uriproc/UriReference.cxx
@@ -51,7 +51,7 @@ UriReference::UriReference(
 
 UriReference::~UriReference() {}
 
-OUString UriReference::getUriReference() throw (css::uno::RuntimeException)
+OUString UriReference::getUriReference()
 {
     osl::MutexGuard g(m_mutex);
     OUStringBuffer buf;
@@ -67,13 +67,12 @@ OUString UriReference::getUriReference() throw (css::uno::RuntimeException)
     return buf.makeStringAndClear();
 }
 
-bool UriReference::isAbsolute() throw (css::uno::RuntimeException) {
+bool UriReference::isAbsolute() {
     return !m_scheme.isEmpty();
 }
 
 
 OUString UriReference::getSchemeSpecificPart()
-    throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_mutex);
     OUStringBuffer buf;
@@ -81,33 +80,33 @@ OUString UriReference::getSchemeSpecificPart()
     return buf.makeStringAndClear();
 }
 
-bool UriReference::isHierarchical() throw (css::uno::RuntimeException) {
+bool UriReference::isHierarchical() {
     osl::MutexGuard g(m_mutex);
     return m_isHierarchical;
 }
 
-bool UriReference::hasAuthority() throw (css::uno::RuntimeException) {
+bool UriReference::hasAuthority() {
     osl::MutexGuard g(m_mutex);
     return m_hasAuthority;
 }
 
-OUString UriReference::getAuthority() throw (css::uno::RuntimeException) {
+OUString UriReference::getAuthority() {
     osl::MutexGuard g(m_mutex);
     return m_authority;
 }
 
-OUString UriReference::getPath() throw (css::uno::RuntimeException) {
+OUString UriReference::getPath() {
     osl::MutexGuard g(m_mutex);
     return m_path;
 }
 
-bool UriReference::hasRelativePath() throw (css::uno::RuntimeException) {
+bool UriReference::hasRelativePath() {
     osl::MutexGuard g(m_mutex);
     return m_isHierarchical && !m_hasAuthority
         && (m_path.isEmpty() || m_path[0] != '/');
 }
 
-sal_Int32 UriReference::getPathSegmentCount() throw (css::uno::RuntimeException)
+sal_Int32 UriReference::getPathSegmentCount()
 {
     osl::MutexGuard g(m_mutex);
     if (!m_isHierarchical || m_path.isEmpty()) {
@@ -126,7 +125,6 @@ sal_Int32 UriReference::getPathSegmentCount() throw (css::uno::RuntimeException)
 }
 
 OUString UriReference::getPathSegment(sal_Int32 index)
-    throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_mutex);
     if (m_isHierarchical && !m_path.isEmpty() && index >= 0) {
@@ -144,35 +142,34 @@ OUString UriReference::getPathSegment(sal_Int32 index)
     return OUString();
 }
 
-bool UriReference::hasQuery() throw (css::uno::RuntimeException) {
+bool UriReference::hasQuery() {
     osl::MutexGuard g(m_mutex);
     return m_hasQuery;
 }
 
-OUString UriReference::getQuery() throw (css::uno::RuntimeException) {
+OUString UriReference::getQuery() {
     osl::MutexGuard g(m_mutex);
     return m_query;
 }
 
-bool UriReference::hasFragment() throw (css::uno::RuntimeException) {
+bool UriReference::hasFragment() {
     osl::MutexGuard g(m_mutex);
     return m_hasFragment;
 }
 
-OUString UriReference::getFragment() throw (css::uno::RuntimeException) {
+OUString UriReference::getFragment() {
     osl::MutexGuard g(m_mutex);
     return m_fragment;
 }
 
 void UriReference::setFragment(OUString const & fragment)
-    throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_mutex);
     m_hasFragment = true;
     m_fragment = fragment;
 }
 
-void UriReference::clearFragment() throw (css::uno::RuntimeException) {
+void UriReference::clearFragment() {
     osl::MutexGuard g(m_mutex);
     m_hasFragment = false;
     m_fragment.clear();
diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx
index e052eee03f52..05fdc37f6e09 100644
--- a/stoc/source/uriproc/UriReference.hxx
+++ b/stoc/source/uriproc/UriReference.hxx
@@ -38,60 +38,55 @@ public:
     ~UriReference();
 
     /// @throws css::uno::RuntimeException
-    OUString getUriReference()
-        throw (css::uno::RuntimeException);
+    OUString getUriReference();
 
     /// @throws css::uno::RuntimeException
-    bool isAbsolute() throw (css::uno::RuntimeException);
+    bool isAbsolute();
 
     /// @throws css::uno::RuntimeException
-    const OUString& getScheme() throw (css::uno::RuntimeException) { return m_scheme;}
+    const OUString& getScheme() { return m_scheme;}
 
     /// @throws css::uno::RuntimeException
-    OUString getSchemeSpecificPart()
-        throw (css::uno::RuntimeException);
+    OUString getSchemeSpecificPart();
 
     /// @throws css::uno::RuntimeException
-    bool isHierarchical() throw (css::uno::RuntimeException);
+    bool isHierarchical();
 
     /// @throws css::uno::RuntimeException
-    bool hasAuthority() throw (css::uno::RuntimeException);
+    bool hasAuthority();
 
     /// @throws css::uno::RuntimeException
-    OUString getAuthority() throw (css::uno::RuntimeException);
+    OUString getAuthority();
 
     /// @throws css::uno::RuntimeException
-    OUString getPath() throw (css::uno::RuntimeException);
+    OUString getPath();
 
     /// @throws css::uno::RuntimeException
-    bool hasRelativePath() throw (css::uno::RuntimeException);
+    bool hasRelativePath();
 
     /// @throws css::uno::RuntimeException
-    sal_Int32 getPathSegmentCount()
-        throw (css::uno::RuntimeException);
+    sal_Int32 getPathSegmentCount();
 
     /// @throws css::uno::RuntimeException
-    OUString getPathSegment(sal_Int32 index)
-        throw (css::uno::RuntimeException);
+    OUString getPathSegment(sal_Int32 index);
 
     /// @throws css::uno::RuntimeException
-    bool hasQuery() throw (css::uno::RuntimeException);
+    bool hasQuery();
 
     /// @throws css::uno::RuntimeException
-    OUString getQuery() throw (css::uno::RuntimeException);
+    OUString getQuery();
 
     /// @throws css::uno::RuntimeException
-    bool hasFragment() throw (css::uno::RuntimeException);
+    bool hasFragment();
 
     /// @throws css::uno::RuntimeException
-    OUString getFragment() throw (css::uno::RuntimeException);
+    OUString getFragment();
 
     /// @throws css::uno::RuntimeException
-    void setFragment(OUString const & fragment)
-        throw (css::uno::RuntimeException);
+    void setFragment(OUString const & fragment);
 
     /// @throws css::uno::RuntimeException
-    void clearFragment() throw (css::uno::RuntimeException);
+    void clearFragment();
 
     osl::Mutex m_mutex;
     OUString m_scheme;
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 11f02ca50b3e..71efcf275945 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -107,72 +107,55 @@ public:
     UriReference(const UriReference&) = delete;
     UriReference& operator=(const UriReference&) = delete;
 
-    virtual OUString SAL_CALL getUriReference()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getUriReference() override
     { return m_base.getUriReference(); }
 
-    virtual sal_Bool SAL_CALL isAbsolute()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isAbsolute() override
     { return m_base.isAbsolute(); }
 
-    virtual OUString SAL_CALL getScheme()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getScheme() override
     { return m_base.getScheme(); }
 
-    virtual OUString SAL_CALL getSchemeSpecificPart()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getSchemeSpecificPart() override
     { return m_base.getSchemeSpecificPart(); }
 
-    virtual sal_Bool SAL_CALL isHierarchical()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isHierarchical() override
     { return m_base.isHierarchical(); }
 
-    virtual sal_Bool SAL_CALL hasAuthority()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAuthority() override
     { return m_base.hasAuthority(); }
 
-    virtual OUString SAL_CALL getAuthority()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getAuthority() override
     { return m_base.getAuthority(); }
 
-    virtual OUString SAL_CALL getPath()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPath() override
     { return m_base.getPath(); }
 
-    virtual sal_Bool SAL_CALL hasRelativePath()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasRelativePath() override
     { return m_base.hasRelativePath(); }
 
-    virtual sal_Int32 SAL_CALL getPathSegmentCount()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getPathSegmentCount() override
     { return m_base.getPathSegmentCount(); }
 
-    virtual OUString SAL_CALL getPathSegment(sal_Int32 index)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPathSegment(sal_Int32 index) override
     { return m_base.getPathSegment(index); }
 
-    virtual sal_Bool SAL_CALL hasQuery()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasQuery() override
     { return m_base.hasQuery(); }
 
-    virtual OUString SAL_CALL getQuery()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getQuery() override
     { return m_base.getQuery(); }
 
-    virtual sal_Bool SAL_CALL hasFragment()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasFragment() override
     { return m_base.hasFragment(); }
 
-    virtual OUString SAL_CALL getFragment()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getFragment() override
     { return m_base.getFragment(); }
 
-    virtual void SAL_CALL setFragment(OUString const & fragment)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setFragment(OUString const & fragment) override
     { m_base.setFragment(fragment); }
 
-    virtual void SAL_CALL clearFragment()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL clearFragment() override
     { m_base.clearFragment(); }
 
 private:
@@ -269,26 +252,22 @@ public:
     Factory(const Factory&) = delete;
     Factory& operator=(const Factory&) = delete;
 
-    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;
+    getSupportedServiceNames() override;
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
-    parse(OUString const & uriReference)
-        throw (css::uno::RuntimeException, std::exception) override;
+    parse(OUString const & uriReference) override;
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
     makeAbsolute(
         css::uno::Reference< css::uri::XUriReference > const & baseUriReference,
         css::uno::Reference< css::uri::XUriReference > const & uriReference,
         sal_Bool processSpecialBaseSegments,
-        css::uri::RelativeUriExcessParentSegments excessParentSegments)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uri::RelativeUriExcessParentSegments excessParentSegments) override;
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
     makeRelative(
@@ -296,8 +275,7 @@ public:
         css::uno::Reference< css::uri::XUriReference > const & uriReference,
         sal_Bool preferAuthorityOverRelativePath,
         sal_Bool preferAbsoluteOverRelativePath,
-        sal_Bool encodeRetainedSpecialSegments)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool encodeRetainedSpecialSegments) override;
 
 private:
     virtual ~Factory() override {}
@@ -310,19 +288,16 @@ private:
 };
 
 OUString Factory::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.uri.UriReferenceFactory");
 }
 
 sal_Bool Factory::supportsService(OUString const & serviceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > s { "com.sun.star.uri.UriReferenceFactory" };
     return s;
@@ -330,7 +305,6 @@ css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
 
 css::uno::Reference< css::uri::XUriReference > Factory::parse(
     OUString const & uriReference)
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_Int32 fragment = uriReference.indexOf('#');
     if (fragment == -1) {
@@ -402,7 +376,6 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute(
     css::uno::Reference< css::uri::XUriReference > const & uriReference,
     sal_Bool processSpecialBaseSegments,
     css::uri::RelativeUriExcessParentSegments excessParentSegments)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!baseUriReference.is() || !baseUriReference->isAbsolute()
         || !baseUriReference->isHierarchical() || !uriReference.is()) {
@@ -518,7 +491,6 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative(
     sal_Bool preferAuthorityOverRelativePath,
     sal_Bool preferAbsoluteOverRelativePath,
     sal_Bool encodeRetainedSpecialSegments)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!baseUriReference.is() || !baseUriReference->isAbsolute()
         || !baseUriReference->isHierarchical() || !uriReference.is()) {
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 1bc7bbefcf42..d246f07c9221 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -67,73 +67,59 @@ public:
     UrlReference(const UrlReference&) = delete;
     UrlReference& operator=(const UrlReference&) = delete;
 
-    virtual OUString SAL_CALL getUriReference()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getUriReference() override
     { return base_.getUriReference(); }
 
-    virtual sal_Bool SAL_CALL isAbsolute() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isAbsolute() override
     { return base_.isAbsolute(); }
 
-    virtual OUString SAL_CALL getScheme()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getScheme() override
     { return base_.getScheme(); }
 
-    virtual OUString SAL_CALL getSchemeSpecificPart()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getSchemeSpecificPart() override
     { return base_.getSchemeSpecificPart(); }
 
-    virtual sal_Bool SAL_CALL isHierarchical()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isHierarchical() override
     { return base_.isHierarchical(); }
 
-    virtual sal_Bool SAL_CALL hasAuthority()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAuthority() override
     { return base_.hasAuthority(); }
 
-    virtual OUString SAL_CALL getAuthority()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getAuthority() override
     { return base_.getAuthority(); }
 
-    virtual OUString SAL_CALL getPath()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPath() override
     { return base_.getPath(); }
 
-    virtual sal_Bool SAL_CALL hasRelativePath()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasRelativePath() override
     { return base_.hasRelativePath(); }
 
-    virtual ::sal_Int32 SAL_CALL getPathSegmentCount()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getPathSegmentCount() override
     { return base_.getPathSegmentCount(); }
 
-    virtual OUString SAL_CALL getPathSegment(sal_Int32 index)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPathSegment(sal_Int32 index) override
     { return base_.getPathSegment(index); }
 
-    virtual sal_Bool SAL_CALL hasQuery() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasQuery() override
     { return base_.hasQuery(); }
 
-    virtual OUString SAL_CALL getQuery()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getQuery() override
     { return base_.getQuery(); }
 
-    virtual sal_Bool SAL_CALL hasFragment() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasFragment() override
     { return base_.hasFragment(); }
 
-    virtual OUString SAL_CALL getFragment()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getFragment() override
     { return base_.getFragment(); }
 
-    virtual void SAL_CALL setFragment(OUString const & fragment)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setFragment(OUString const & fragment) override
     { base_.setFragment(fragment); }
 
-    virtual void SAL_CALL clearFragment() throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL clearFragment() override
     { base_.clearFragment(); }
 
     virtual OUString SAL_CALL expand(
-        css::uno::Reference< css::util::XMacroExpander > const & expander)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::util::XMacroExpander > const & expander) override;
 
 private:
     virtual ~UrlReference() override {}
@@ -143,7 +129,6 @@ private:
 
 OUString UrlReference::expand(
     css::uno::Reference< css::util::XMacroExpander > const & expander)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     OSL_ASSERT(expander.is());
     return expander->expandMacros(
@@ -161,40 +146,34 @@ public:
     Parser(const Parser&) = delete;
     Parser& operator=(const Parser&) = delete;
 
-    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;
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
     parse(
         OUString const & scheme,
-        OUString const & schemeSpecificPart)
-        throw (css::uno::RuntimeException, std::exception) override;
+        OUString const & schemeSpecificPart) override;
 
 private:
     virtual ~Parser() override {}
 };
 
 OUString Parser::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand");
 }
 
 sal_Bool Parser::supportsService(OUString const & serviceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > s { "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand" };
     return s;
@@ -202,7 +181,6 @@ css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
 
 css::uno::Reference< css::uri::XUriReference > Parser::parse(
     OUString const & scheme, OUString const & schemeSpecificPart)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!parseSchemeSpecificPart(schemeSpecificPart)) {
         return css::uno::Reference< css::uri::XUriReference >();
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index c63093d79ce7..c57670e27f20 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -201,87 +201,66 @@ public:
     UrlReference(const UrlReference&) = delete;
     UrlReference& operator=(const UrlReference&) = delete;
 
-    virtual OUString SAL_CALL getUriReference()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getUriReference() override
     { return m_base.getUriReference(); }
 
-    virtual sal_Bool SAL_CALL isAbsolute()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isAbsolute() override
     { return m_base.isAbsolute(); }
 
-    virtual OUString SAL_CALL getScheme()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getScheme() override
     { return m_base.getScheme(); }
 
-    virtual OUString SAL_CALL getSchemeSpecificPart()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getSchemeSpecificPart() override
     { return m_base.getSchemeSpecificPart(); }
 
-    virtual sal_Bool SAL_CALL isHierarchical()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isHierarchical() override
     { return m_base.isHierarchical(); }
 
-    virtual sal_Bool SAL_CALL hasAuthority()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAuthority() override
     { return m_base.hasAuthority(); }
 
-    virtual OUString SAL_CALL getAuthority()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getAuthority() override
     { return m_base.getAuthority(); }
 
-    virtual OUString SAL_CALL getPath()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPath() override
     { return m_base.getPath(); }
 
-    virtual sal_Bool SAL_CALL hasRelativePath()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasRelativePath() override
     { return m_base.hasRelativePath(); }
 
-    virtual sal_Int32 SAL_CALL getPathSegmentCount()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getPathSegmentCount() override
     { return m_base.getPathSegmentCount(); }
 
-    virtual OUString SAL_CALL getPathSegment(sal_Int32 index)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPathSegment(sal_Int32 index) override
     { return m_base.getPathSegment(index); }
 
-    virtual sal_Bool SAL_CALL hasQuery()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasQuery() override
     { return m_base.hasQuery(); }
 
-    virtual OUString SAL_CALL getQuery()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getQuery() override
     { return m_base.getQuery(); }
 
-    virtual sal_Bool SAL_CALL hasFragment()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasFragment() override
     { return m_base.hasFragment(); }
 
-    virtual OUString SAL_CALL getFragment()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getFragment() override
     { return m_base.getFragment(); }
 
-    virtual void SAL_CALL setFragment(OUString const & fragment)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setFragment(OUString const & fragment) override
     { m_base.setFragment(fragment); }
 
-    virtual void SAL_CALL clearFragment()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL clearFragment() override
     { m_base.clearFragment(); }
 
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
 
-    virtual void SAL_CALL setName(OUString const & name)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
+    virtual void SAL_CALL setName(OUString const & name) override;
 
-    virtual sal_Bool SAL_CALL hasParameter(OUString const & key)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasParameter(OUString const & key) override;
 
-    virtual OUString SAL_CALL getParameter(OUString const & key)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getParameter(OUString const & key) override;
 
-    virtual void SAL_CALL setParameter(OUString const & key, OUString const & value)
-        throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
+    virtual void SAL_CALL setParameter(OUString const & key, OUString const & value) override;
 
 private:
     virtual ~UrlReference() override {}
@@ -291,13 +270,13 @@ private:
     stoc::uriproc::UriReference m_base;
 };
 
-OUString UrlReference::getName() throw (css::uno::RuntimeException, std::exception) {
+OUString UrlReference::getName() {
     osl::MutexGuard g(m_base.m_mutex);
     sal_Int32 i = 0;
     return parsePart(m_base.m_path, true, &i);
 }
 
-void SAL_CALL UrlReference::setName(OUString const & name) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
+void SAL_CALL UrlReference::setName(OUString const & name)
 {
     if (name.isEmpty())
         throw css::lang::IllegalArgumentException(
@@ -314,14 +293,12 @@ void SAL_CALL UrlReference::setName(OUString const & name) throw (css::uno::Runt
 }
 
 sal_Bool UrlReference::hasParameter(OUString const & key)
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_base.m_mutex);
     return findParameter(key) >= 0;
 }
 
 OUString UrlReference::getParameter(OUString const & key)
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(m_base.m_mutex);
     sal_Int32 i = findParameter(key);
@@ -329,7 +306,6 @@ OUString UrlReference::getParameter(OUString const & key)
 }
 
 void UrlReference::setParameter(OUString const & key, OUString const & value)
-    throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
 {
     if (key.isEmpty())
         throw css::lang::IllegalArgumentException(
@@ -386,38 +362,32 @@ public:
     Parser(const Parser&) = delete;
     Parser& operator=(const Parser&) = delete;
 
-    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;
+    getSupportedServiceNames() override;
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
     parse(
-        OUString const & scheme, OUString const & schemeSpecificPart)
-        throw (css::uno::RuntimeException, std::exception) override;
+        OUString const & scheme, OUString const & schemeSpecificPart) override;
 
 private:
     virtual ~Parser() override {}
 };
 
 OUString Parser::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
 }
 
 sal_Bool Parser::supportsService(OUString const & serviceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > s { "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript" };
     return s;
@@ -426,7 +396,6 @@ css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
 css::uno::Reference< css::uri::XUriReference >
 Parser::parse(
     OUString const & scheme, OUString const & schemeSpecificPart)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!parseSchemeSpecificPart(schemeSpecificPart)) {
         return nullptr;
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 5d2b25852fa4..dc7fbf0015ff 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -54,19 +54,16 @@ public:
     Factory(const Factory&) = delete;
     Factory& operator=(const Factory&) = delete;
 
-    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;
+    getSupportedServiceNames() override;
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
     createVndSunStarPkgUrlReference(
-        css::uno::Reference< css::uri::XUriReference > const & authority)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::uri::XUriReference > const & authority) override;
 
 private:
     virtual ~Factory() override {}
@@ -75,19 +72,16 @@ private:
 };
 
 OUString Factory::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory");
 }
 
 sal_Bool Factory::supportsService(OUString const & serviceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > s { "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory" };
     return s;
@@ -96,7 +90,6 @@ css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
 css::uno::Reference< css::uri::XUriReference >
 Factory::createVndSunStarPkgUrlReference(
     css::uno::Reference< css::uri::XUriReference > const & authority)
-    throw (css::uno::RuntimeException, std::exception)
 {
     OSL_ASSERT(authority.is());
     if (authority->isAbsolute() && !authority->hasFragment()) {
diff --git a/svgio/inc/svgdocumenthandler.hxx b/svgio/inc/svgdocumenthandler.hxx
index b61fbea925b8..c1041574ec6d 100644
--- a/svgio/inc/svgdocumenthandler.hxx
+++ b/svgio/inc/svgdocumenthandler.hxx
@@ -49,14 +49,14 @@ namespace svgio
             virtual ~SvgDocHdl() override;
 
             // Methods XDocumentHandler
-            virtual void SAL_CALL startDocument(  ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL endDocument(  ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL endElement( const OUString& aName ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            virtual void SAL_CALL startDocument(  ) override;
+            virtual void SAL_CALL endDocument(  ) override;
+            virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
+            virtual void SAL_CALL endElement( const OUString& aName ) override;
+            virtual void SAL_CALL characters( const OUString& aChars ) override;
+            virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+            virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+            virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 
             const SvgDocument& getSvgDocument() const { return maDocument; }
         };
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx
index 977b54d3b03f..72e1adf9bee7 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -154,19 +154,19 @@ namespace svgio
 #endif
         }
 
-        void SvgDocHdl::startDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+        void SvgDocHdl::startDocument(  )
         {
             OSL_ENSURE(!mpTarget, "Already a target at document start (!)");
             OSL_ENSURE(!maCssContents.size(), "SvgDocHdl startDocument with active css style stack entry (!)");
         }
 
-        void SvgDocHdl::endDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+        void SvgDocHdl::endDocument(  )
         {
             OSL_ENSURE(!mpTarget, "Still a target at document end (!)");
             OSL_ENSURE(!maCssContents.size(), "SvgDocHdl endDocument with active css style stack entry (!)");
         }
 
-        void SvgDocHdl::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+        void SvgDocHdl::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
         {
             if (bSkip)
                 return;
@@ -409,7 +409,7 @@ namespace svgio
             }
         }
 
-        void SvgDocHdl::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+        void SvgDocHdl::endElement( const OUString& aName )
         {
             if(!aName.isEmpty())
             {
@@ -550,7 +550,7 @@ namespace svgio
             }
         }
 
-        void SvgDocHdl::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+        void SvgDocHdl::characters( const OUString& aChars )
         {
             const sal_uInt32 nLength(aChars.getLength());
 
@@ -625,15 +625,15 @@ namespace svgio
             }
         }
 
-        void SvgDocHdl::ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+        void SvgDocHdl::ignorableWhitespace(const OUString& /*aWhitespaces*/)
         {
         }
 
-        void SvgDocHdl::processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+        void SvgDocHdl::processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/)
         {
         }
 
-        void SvgDocHdl::setDocumentLocator(const uno::Reference< xml::sax::XLocator >& /*xLocator*/) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+        void SvgDocHdl::setDocumentLocator(const uno::Reference< xml::sax::XLocator >& /*xLocator*/)
         {
         }
     } // end of namespace svgreader
diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index c4e8d5ce3c14..15947a85f13c 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -54,12 +54,12 @@ namespace svgio
             // XSvgParser
             virtual uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > SAL_CALL getDecomposition(
                 const uno::Reference< ::io::XInputStream >& xSVGStream,
-                const OUString& aAbsolutePath) throw (uno::RuntimeException, std::exception) override;
+                const OUString& aAbsolutePath) override;
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL supportsService(const OUString&) 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&) override;
+            virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
         };
     } // end of namespace svgreader
 } // end of namespace svgio
@@ -98,7 +98,7 @@ namespace svgio
 
         uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > XSvgParser::getDecomposition(
             const uno::Reference< ::io::XInputStream >& xSVGStream,
-            const OUString& aAbsolutePath ) throw (uno::RuntimeException, std::exception)
+            const OUString& aAbsolutePath )
         {
             drawinglayer::primitive2d::Primitive2DContainer aRetval;
 
@@ -163,17 +163,17 @@ namespace svgio
             return comphelper::containerToSequence(aRetval);
         }
 
-        OUString SAL_CALL XSvgParser::getImplementationName() throw(uno::RuntimeException, std::exception)
+        OUString SAL_CALL XSvgParser::getImplementationName()
         {
             return(XSvgParser_getImplementationName());
         }
 
-        sal_Bool SAL_CALL XSvgParser::supportsService(const OUString& rServiceName) throw(uno::RuntimeException, std::exception)
+        sal_Bool SAL_CALL XSvgParser::supportsService(const OUString& rServiceName)
         {
             return cppu::supportsService(this, rServiceName);
         }
 
-        uno::Sequence< OUString > SAL_CALL XSvgParser::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+        uno::Sequence< OUString > SAL_CALL XSvgParser::getSupportedServiceNames()
         {
             return XSvgParser_getSupportedServiceNames();
         }
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index 1a8e029519ef..70e6fcc69da4 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -73,40 +73,33 @@ public:
         css::uno::Reference< css::ucb::XContentIdentifier > const & identifier);
 
     virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-    getIdentifier() throw (css::uno::RuntimeException, std::exception) override {
+    getIdentifier() override {
         return m_identifier;
     }
 
-    virtual OUString SAL_CALL getContentType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getContentType() override
     {
         return OUString();
     }
 
     virtual void SAL_CALL addContentEventListener(
-        css::uno::Reference< css::ucb::XContentEventListener > const &)
-        throw (css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::ucb::XContentEventListener > const &) override
     {}
 
     virtual void SAL_CALL removeContentEventListener(
-        css::uno::Reference< css::ucb::XContentEventListener > const &)
-        throw (css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::ucb::XContentEventListener > const &) override
     {}
 
-    virtual sal_Int32 SAL_CALL createCommandIdentifier()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL createCommandIdentifier() override
     {
         return 0;
     }
 
     virtual css::uno::Any SAL_CALL execute(
         css::ucb::Command const & command, sal_Int32 commandId,
-        css::uno::Reference< css::ucb::XCommandEnvironment > const &)
-        throw (
-            css::uno::Exception, css::ucb::CommandAbortedException,
-            css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::ucb::XCommandEnvironment > const &) override;
 
-    virtual void SAL_CALL abort(sal_Int32) throw (css::uno::RuntimeException, std::exception) override {}
+    virtual void SAL_CALL abort(sal_Int32) override {}
 
 private:
     static char const m_prefix[];
@@ -132,9 +125,6 @@ Content::Content(
 css::uno::Any Content::execute(
     css::ucb::Command const & command, sal_Int32,
     css::uno::Reference< css::ucb::XCommandEnvironment > const &)
-    throw (
-        css::uno::Exception, css::ucb::CommandAbortedException,
-        css::uno::RuntimeException, std::exception)
 {
     if ( command.Name != "getCasePreservingURL" )
     {
@@ -171,16 +161,14 @@ css::uno::Any Content::execute(
 class Provider: public cppu::WeakImplHelper< css::ucb::XContentProvider > {
 public:
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent(
-        css::uno::Reference< css::ucb::XContentIdentifier > const & identifier)
-        throw (css::ucb::IllegalIdentifierException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::ucb::XContentIdentifier > const & identifier) override
     {
         return new Content(identifier);
     }
 
     virtual sal_Int32 SAL_CALL compareContentIds(
         css::uno::Reference< css::ucb::XContentIdentifier > const & id1,
-        css::uno::Reference< css::ucb::XContentIdentifier > const & id2)
-        throw (css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::ucb::XContentIdentifier > const & id2) override
     {
         assert(id1.is() && id2.is());
         return
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index 1c0d52b8e391..27344aa60878 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -74,7 +74,6 @@ void ItemHolder2::holdConfigItem(EItem eItem)
 }
 
 void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&)
-    throw(css::uno::RuntimeException, std::exception)
 {
     impl_releaseAllItems();
 }
diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx
index 8a5ba35ad473..d0348ef6e0f5 100644
--- a/svl/source/config/itemholder2.hxx
+++ b/svl/source/config/itemholder2.hxx
@@ -42,8 +42,7 @@ class ItemHolder2 : private ItemHolderMutexBase
     // uno interface
     public:
 
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
     // helper
     private:
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 9c482eb3f157..e644dafc459f 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -56,8 +56,6 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::impl_staticCreateSe
 }
 
 uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance()
-    throw ( uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     OUString aTempURL;
 
@@ -86,8 +84,6 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance()
  */
 uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithArguments(
             const uno::Sequence< uno::Any >& aArguments )
-    throw ( uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     sal_Int32 nArgNum = aArguments.getLength();
     OSL_ENSURE( nArgNum < 4, "Wrong parameter number" );
@@ -159,19 +155,16 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA
 }
 
 OUString SAL_CALL FSStorageFactory::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetImplementationName();
 }
 
 sal_Bool SAL_CALL FSStorageFactory::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return impl_staticGetSupportedServiceNames();
 }
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 4ba7d18a2347..4cd54393eefe 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -252,7 +252,6 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
 //  XInterface
 
 uno::Any SAL_CALL FSStorage::queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Any aReturn;
     aReturn = ::cppu::queryInterface
@@ -284,7 +283,6 @@ void SAL_CALL FSStorage::release() throw()
 //  XTypeProvider
 
 uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes()
-        throw( uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_pTypeCollection == nullptr )
     {
@@ -304,7 +302,6 @@ uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId()
-        throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -312,11 +309,6 @@ uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId()
 //  XStorage
 
 void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& xDest )
-        throw ( embed::InvalidStorageException,
-                io::IOException,
-                lang::IllegalArgumentException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -364,12 +356,6 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >&
 
 uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
     const OUString& aStreamName, sal_Int32 nOpenMode )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -473,24 +459,12 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
 
 uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement(
     const OUString&, sal_Int32, const OUString& )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     throw packages::NoEncryptionException();
 }
 
 uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement(
             const OUString& aStorName, sal_Int32 nStorageMode )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -577,12 +551,6 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement(
 }
 
 uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUString& aStreamName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -651,24 +619,12 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUSt
 uno::Reference< io::XStream > SAL_CALL FSStorage::cloneEncryptedStreamElement(
     const OUString&,
     const OUString& )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     throw packages::NoEncryptionException();
 }
 
 void SAL_CALL FSStorage::copyLastCommitTo(
             const uno::Reference< embed::XStorage >& xTargetStorage )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     copyToStorage( xTargetStorage );
 }
@@ -676,11 +632,6 @@ void SAL_CALL FSStorage::copyLastCommitTo(
 void SAL_CALL FSStorage::copyStorageElementLastCommitTo(
             const OUString& aStorName,
             const uno::Reference< embed::XStorage >& xTargetStorage )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -693,10 +644,6 @@ void SAL_CALL FSStorage::copyStorageElementLastCommitTo(
 }
 
 sal_Bool SAL_CALL FSStorage::isStreamElement( const OUString& aElementName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -713,10 +660,6 @@ sal_Bool SAL_CALL FSStorage::isStreamElement( const OUString& aElementName )
 }
 
 sal_Bool SAL_CALL FSStorage::isStorageElement( const OUString& aElementName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -733,12 +676,6 @@ sal_Bool SAL_CALL FSStorage::isStorageElement( const OUString& aElementName )
 }
 
 void SAL_CALL FSStorage::removeElement( const OUString& aElementName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -759,13 +696,6 @@ void SAL_CALL FSStorage::removeElement( const OUString& aElementName )
 }
 
 void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUString& aNewName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -840,13 +770,6 @@ void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUSt
 void SAL_CALL FSStorage::copyElementTo( const OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
                                         const OUString& aNewName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -924,13 +847,6 @@ void SAL_CALL FSStorage::copyElementTo( const OUString& aElementName,
 void SAL_CALL FSStorage::moveElementTo( const OUString& aElementName,
                                         const uno::Reference< embed::XStorage >& xDest,
                                         const OUString& aNewName )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                container::ElementExistException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     copyElementTo( aElementName, xDest, aNewName );
@@ -944,9 +860,6 @@ void SAL_CALL FSStorage::moveElementTo( const OUString& aElementName,
 //  XNameAccess
 
 uno::Any SAL_CALL FSStorage::getByName( const OUString& aName )
-        throw ( container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1002,7 +915,6 @@ uno::Any SAL_CALL FSStorage::getByName( const OUString& aName )
 
 
 uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1062,7 +974,6 @@ uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames()
 }
 
 sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1097,7 +1008,6 @@ sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName )
 }
 
 uno::Type SAL_CALL FSStorage::getElementType()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1109,7 +1019,6 @@ uno::Type SAL_CALL FSStorage::getElementType()
 }
 
 sal_Bool SAL_CALL FSStorage::hasElements()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1139,7 +1048,6 @@ sal_Bool SAL_CALL FSStorage::hasElements()
 
 //  XDisposable
 void SAL_CALL FSStorage::dispose()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1158,7 +1066,6 @@ void SAL_CALL FSStorage::dispose()
 
 void SAL_CALL FSStorage::addEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1173,7 +1080,6 @@ void SAL_CALL FSStorage::addEventListener(
 
 void SAL_CALL FSStorage::removeEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1187,7 +1093,6 @@ void SAL_CALL FSStorage::removeEventListener(
 //  XPropertySet
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL FSStorage::getPropertySetInfo()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1200,11 +1105,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL FSStorage::getPropertySetInfo
 
 
 void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any& )
-        throw ( beans::UnknownPropertyException,
-                beans::PropertyVetoException,
-                lang::IllegalArgumentException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1219,9 +1119,6 @@ void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const
 
 
 uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1240,9 +1137,6 @@ uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName )
 void SAL_CALL FSStorage::addPropertyChangeListener(
             const OUString& /*aPropertyName*/,
             const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1256,9 +1150,6 @@ void SAL_CALL FSStorage::addPropertyChangeListener(
 void SAL_CALL FSStorage::removePropertyChangeListener(
             const OUString& /*aPropertyName*/,
             const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1272,9 +1163,6 @@ void SAL_CALL FSStorage::removePropertyChangeListener(
 void SAL_CALL FSStorage::addVetoableChangeListener(
             const OUString& /*PropertyName*/,
             const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1288,9 +1176,6 @@ void SAL_CALL FSStorage::addVetoableChangeListener(
 void SAL_CALL FSStorage::removeVetoableChangeListener(
             const OUString& /*PropertyName*/,
             const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw ( beans::UnknownPropertyException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1302,12 +1187,6 @@ void SAL_CALL FSStorage::removeVetoableChangeListener(
 
 //  XHierarchicalStorageAccess
 uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1424,24 +1303,11 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl
 }
 
 uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncryptedStreamElementByHierarchicalName( const OUString& /*sStreamName*/, ::sal_Int32 /*nOpenMode*/, const OUString& /*sPassword*/ )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                packages::NoEncryptionException,
-                packages::WrongPasswordException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     throw packages::NoEncryptionException();
 }
 
 void SAL_CALL FSStorage::removeStreamElementByHierarchicalName( const OUString& sStreamPath )
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index 5cf83891d9ff..a3ba6b2ffc65 100644
--- a/svl/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
@@ -68,8 +68,7 @@ public:
 
     //  XInterface
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
     virtual void SAL_CALL acquire() throw() override;
 
@@ -77,236 +76,103 @@ public:
 
     //  XTypeProvider
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     //  XStorage
 
-    virtual void SAL_CALL copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) override;
 
     virtual css::uno::Reference< css::io::XStream > SAL_CALL openStreamElement(
-            const OUString& aStreamName, sal_Int32 nOpenMode )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStreamName, sal_Int32 nOpenMode ) override;
 
     virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStreamElement(
-            const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) override;
 
     virtual css::uno::Reference< css::embed::XStorage > SAL_CALL openStorageElement(
-            const OUString& aStorName, sal_Int32 nStorageMode )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStorName, sal_Int32 nStorageMode ) override;
 
     virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneStreamElement(
-            const OUString& aStreamName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStreamName ) override;
 
     virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStreamElement(
-            const OUString& aStreamName, const OUString& aPass )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const OUString& aStreamName, const OUString& aPass ) override;
 
     virtual void SAL_CALL copyLastCommitTo(
-            const css::uno::Reference< css::embed::XStorage >& xTargetStorage )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) override;
 
     virtual void SAL_CALL copyStorageElementLastCommitTo(
             const OUString& aStorName,
-            const css::uno::Reference< css::embed::XStorage >& xTargetStorage )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::IllegalArgumentException,
-                css::embed::InvalidStorageException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::IllegalArgumentException,
-                css::embed::InvalidStorageException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL removeElement( const OUString& aElementName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) override;
+
+    virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) override;
+
+    virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) override;
+
+    virtual void SAL_CALL removeElement( const OUString& aElementName ) override;
+
+    virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) override;
 
     virtual void SAL_CALL copyElementTo(    const OUString& aElementName,
                                         const css::uno::Reference< css::embed::XStorage >& xDest,
-                                        const OUString& aNewName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                                        const OUString& aNewName ) override;
 
     virtual void SAL_CALL moveElementTo(    const OUString& aElementName,
                                         const css::uno::Reference< css::embed::XStorage >& xDest,
-                                        const OUString& rNewName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                                        const OUString& rNewName ) override;
 
     //  XNameAccess
 
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) 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& aName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
-    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;
 
     //  XComponent
 
-    virtual void SAL_CALL dispose()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
     //  XPropertySet
 
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
 
-    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
 
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
 
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw ( css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //  XHierarchicalStorageAccess
 
-    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) override;
+
+    virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) override;
+
+    virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) override;
 };
 
 #endif
diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index 33eccd7fc789..a68e449c7f47 100644
--- a/svl/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.cxx
@@ -44,7 +44,6 @@ OFSInputStreamContainer::~OFSInputStreamContainer()
 }
 
 uno::Sequence< uno::Type > SAL_CALL OFSInputStreamContainer::getTypes()
-        throw ( uno::RuntimeException, std::exception )
 {
     static ::cppu::OTypeCollection* pTypeCollection = nullptr ;
 
@@ -79,7 +78,6 @@ uno::Sequence< uno::Type > SAL_CALL OFSInputStreamContainer::getTypes()
 }
 
 uno::Any SAL_CALL OFSInputStreamContainer::queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -114,10 +112,6 @@ void SAL_CALL OFSInputStreamContainer::release()
 }
 
 sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -131,10 +125,6 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >
 }
 
 sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -148,10 +138,6 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_In
 }
 
 void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -165,9 +151,6 @@ void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 sal_Int32 SAL_CALL OFSInputStreamContainer::available(  )
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -181,9 +164,6 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::available(  )
 }
 
 void SAL_CALL OFSInputStreamContainer::closeInput(  )
-        throw ( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -197,7 +177,6 @@ void SAL_CALL OFSInputStreamContainer::closeInput(  )
 }
 
 uno::Reference< io::XInputStream > SAL_CALL OFSInputStreamContainer::getInputStream()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -211,7 +190,6 @@ uno::Reference< io::XInputStream > SAL_CALL OFSInputStreamContainer::getInputStr
 }
 
 uno::Reference< io::XOutputStream > SAL_CALL OFSInputStreamContainer::getOutputStream()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -222,9 +200,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OFSInputStreamContainer::getOutputS
 }
 
 void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -238,8 +213,6 @@ void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -253,8 +226,6 @@ sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition()
 }
 
 sal_Int64 SAL_CALL OFSInputStreamContainer::getLength()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -268,7 +239,6 @@ sal_Int64 SAL_CALL OFSInputStreamContainer::getLength()
 }
 
 void SAL_CALL OFSInputStreamContainer::dispose(  )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -290,7 +260,6 @@ void SAL_CALL OFSInputStreamContainer::dispose(  )
 }
 
 void SAL_CALL OFSInputStreamContainer::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -304,7 +273,6 @@ void SAL_CALL OFSInputStreamContainer::addEventListener( const uno::Reference< l
 }
 
 void SAL_CALL OFSInputStreamContainer::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx
index 13c983d7c355..130f8120f9fd 100644
--- a/svl/source/fsstor/oinputstreamcontainer.hxx
+++ b/svl/source/fsstor/oinputstreamcontainer.hxx
@@ -50,36 +50,31 @@ public:
 
     virtual ~OFSInputStreamContainer() override;
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 
     //XStream
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) override;
 
     //XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
     //XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 };
 
diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index 9e5d0c501c1d..8b22d3bec84f 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
@@ -65,7 +65,6 @@ OFSStreamContainer::~OFSStreamContainer()
 
 // XInterface
 uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Any aReturn;
 
@@ -143,7 +142,6 @@ void SAL_CALL OFSStreamContainer::release()
 
 //  XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes()
-        throw( uno::RuntimeException, std::exception )
 {
     if ( m_pTypeCollection == nullptr )
     {
@@ -184,14 +182,12 @@ uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL OFSStreamContainer::getImplementationId()
-        throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XStream
 uno::Reference< io::XInputStream > SAL_CALL OFSStreamContainer::getInputStream()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -208,7 +204,6 @@ uno::Reference< io::XInputStream > SAL_CALL OFSStreamContainer::getInputStream()
 }
 
 uno::Reference< io::XOutputStream > SAL_CALL OFSStreamContainer::getOutputStream()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -226,7 +221,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OFSStreamContainer::getOutputStream
 
 // XComponent
 void SAL_CALL OFSStreamContainer::dispose()
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -258,7 +252,6 @@ void SAL_CALL OFSStreamContainer::dispose()
 }
 
 void SAL_CALL OFSStreamContainer::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -272,7 +265,6 @@ void SAL_CALL OFSStreamContainer::addEventListener( const uno::Reference< lang::
 }
 
 void SAL_CALL OFSStreamContainer::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-        throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -286,9 +278,6 @@ void SAL_CALL OFSStreamContainer::removeEventListener( const uno::Reference< lan
 
 // XSeekable
 void SAL_CALL OFSStreamContainer::seek( sal_Int64 location )
-        throw ( lang::IllegalArgumentException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -302,8 +291,6 @@ void SAL_CALL OFSStreamContainer::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL OFSStreamContainer::getPosition()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -317,8 +304,6 @@ sal_Int64 SAL_CALL OFSStreamContainer::getPosition()
 }
 
 sal_Int64 SAL_CALL OFSStreamContainer::getLength()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -334,10 +319,6 @@ sal_Int64 SAL_CALL OFSStreamContainer::getLength()
 
 // XInputStream
 sal_Int32 SAL_CALL OFSStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -351,10 +332,6 @@ sal_Int32 SAL_CALL OFSStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aDa
 }
 
 sal_Int32 SAL_CALL OFSStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -368,10 +345,6 @@ sal_Int32 SAL_CALL OFSStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >&
 }
 
 void SAL_CALL OFSStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
-        throw( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -385,9 +358,6 @@ void SAL_CALL OFSStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 sal_Int32 SAL_CALL OFSStreamContainer::available()
-        throw( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -401,9 +371,6 @@ sal_Int32 SAL_CALL OFSStreamContainer::available()
 }
 
 void SAL_CALL OFSStreamContainer::closeInput()
-        throw( io::NotConnectedException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -425,10 +392,6 @@ void SAL_CALL OFSStreamContainer::closeInput()
 
 // XOutputStream
 void SAL_CALL OFSStreamContainer::writeBytes( const uno::Sequence< sal_Int8 >& aData )
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -442,10 +405,6 @@ void SAL_CALL OFSStreamContainer::writeBytes( const uno::Sequence< sal_Int8 >& a
 }
 
 void SAL_CALL OFSStreamContainer::flush()
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -459,10 +418,6 @@ void SAL_CALL OFSStreamContainer::flush()
 }
 
 void SAL_CALL OFSStreamContainer::closeOutput()
-        throw ( io::NotConnectedException,
-                io::BufferSizeExceededException,
-                io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -485,8 +440,6 @@ void SAL_CALL OFSStreamContainer::closeOutput()
 
 // XTruncate
 void SAL_CALL OFSStreamContainer::truncate()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -502,8 +455,6 @@ void SAL_CALL OFSStreamContainer::truncate()
 
 // XAsyncOutputMonitor
 void SAL_CALL OFSStreamContainer::waitForCompletion()
-        throw ( io::IOException,
-                uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index feac66ebef58..e0668a5bcd5e 100644
--- a/svl/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.hxx
@@ -64,52 +64,45 @@ public:
     virtual ~OFSStreamContainer() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     //  XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XStream
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
     // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  )
-        throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 
     // XOutputStream
-    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput(  ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
+    virtual void SAL_CALL flush(  ) override;
+    virtual void SAL_CALL closeOutput(  ) override;
 
     // XTruncate
-    virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL truncate() override;
 
     // XAsyncOutputMonitor
-    virtual void SAL_CALL waitForCompletion(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL waitForCompletion(  ) override;
 
 };
 
diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx
index a06045163491..77451966b8e4 100644
--- a/svl/source/inc/fsfactory.hxx
+++ b/svl/source/inc/fsfactory.hxx
@@ -50,13 +50,13 @@ public:
 
 
     // XSingleServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index bfba71cad786..477e5f640428 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -222,8 +222,7 @@ private:
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< css::task::UserRecord > CopyToUserRecordSequence(
                                         const ::std::list< NamePassRecord >& original,
-                                        const css::uno::Reference< css::task::XInteractionHandler >& Handler )
-                                                        throw(css::uno::RuntimeException, std::exception);
+                                        const css::uno::Reference< css::task::XInteractionHandler >& Handler );
 
     css::task::UserRecord CopyToUserRecord(
                                         const NamePassRecord& aRecord,
@@ -234,23 +233,21 @@ private:
     css::uno::Sequence< css::task::UserRecord > FindUsr(
                                         const ::std::list< NamePassRecord >& userlist,
                                         const OUString& name,
-                                        const css::uno::Reference< css::task::XInteractionHandler >& Handler )
-                                                        throw(css::uno::RuntimeException, std::exception);
+                                        const css::uno::Reference< css::task::XInteractionHandler >& Handler );
 /// @throws css::uno::RuntimeException
 bool createUrlRecord(
     const PassMap::iterator & rIter,
     bool bName,
     const OUString & aName,
     const css::uno::Reference< css::task::XInteractionHandler >& aHandler,
-    css::task::UrlRecord & rRec  )
-        throw( css::uno::RuntimeException );
+    css::task::UrlRecord & rRec  );
 
 /// @throws css::uno::RuntimeException
 css::task::UrlRecord find(
     const OUString& aURL,
     const OUString& aName,
     bool bName, // only needed to support empty user names
-    const css::uno::Reference< css::task::XInteractionHandler >& aHandler  ) throw(css::uno::RuntimeException, std::exception);
+    const css::uno::Reference< css::task::XInteractionHandler >& aHandler  );
 
     static OUString GetDefaultMasterPassword();
 
@@ -259,28 +256,23 @@ css::task::UrlRecord find(
                     const css::uno::Reference< css::task::XInteractionHandler >& xHandler );
 
     /// @throws css::uno::RuntimeException
-    OUString const & GetMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& Handler )
-                                                        throw(css::uno::RuntimeException, std::exception);
+    OUString const & GetMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& Handler );
 
     /// @throws css::uno::RuntimeException
-    void UpdateVector( const OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile )
-                                                        throw(css::uno::RuntimeException);
+    void UpdateVector( const OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile );
 
     /// @throws css::uno::RuntimeException
     void PrivateAdd( const OUString& aUrl,
                               const OUString& aUserName,
                               const css::uno::Sequence< OUString >& aPasswords,
                               char  aMode,
-                              const css::uno::Reference< css::task::XInteractionHandler >& Handler )
-                                                        throw(css::uno::RuntimeException, std::exception);
+                              const css::uno::Reference< css::task::XInteractionHandler >& Handler );
 
     /// @throws css::uno::RuntimeException
-    static ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword )
-                                                        throw(css::uno::RuntimeException, std::exception);
+    static ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword );
 
     /// @throws css::uno::RuntimeException
-    static OUString EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPassword )
-                                                        throw(css::uno::RuntimeException);
+    static OUString EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPassword );
 
 public:
     PasswordContainer( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
@@ -289,82 +281,74 @@ public:
     virtual void SAL_CALL add( const OUString& aUrl,
                                const OUString& aUserName,
                                const css::uno::Sequence< OUString >& aPasswords,
-                               const css::uno::Reference< css::task::XInteractionHandler >& Handler  )
-                                                        throw(css::uno::RuntimeException, std::exception) override;
+                               const css::uno::Reference< css::task::XInteractionHandler >& Handler  ) override;
 
     virtual void SAL_CALL addPersistent( const OUString& aUrl,
                                             const OUString& aUserName,
                                          const css::uno::Sequence< OUString >& aPasswords,
-                                          const css::uno::Reference< css::task::XInteractionHandler >& Handler  )
-                                                        throw(css::uno::RuntimeException, std::exception) override;
+                                          const css::uno::Reference< css::task::XInteractionHandler >& Handler  ) override;
 
     virtual css::task::UrlRecord SAL_CALL
                             find( const OUString& aUrl,
-                                  const css::uno::Reference< css::task::XInteractionHandler >& Handler  )
-                                                        throw(css::uno::RuntimeException, std::exception) override;
+                                  const css::uno::Reference< css::task::XInteractionHandler >& Handler  ) override;
 
     virtual css::task::UrlRecord SAL_CALL
                             findForName( const OUString& aUrl,
                                          const OUString& aUserName,
-                                         const css::uno::Reference< css::task::XInteractionHandler >& Handler  )
-                                                        throw(css::uno::RuntimeException, std::exception) override;
+                                         const css::uno::Reference< css::task::XInteractionHandler >& Handler  ) override;
 
     virtual void SAL_CALL remove( const OUString& aUrl,
-                                  const OUString& aUserName )
-                                                        throw(css::uno::RuntimeException, std::exception) override;
+                                  const OUString& aUserName ) override;
 
     virtual void SAL_CALL removePersistent( const OUString& aUrl,
-                                            const OUString& aUserName )
-                                                        throw(css::uno::RuntimeException, std::exception) override;
+                                            const OUString& aUserName ) override;
 
-    virtual void SAL_CALL removeAllPersistent() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeAllPersistent() override;
 
     virtual css::uno::Sequence< css::task::UrlRecord > SAL_CALL
-                            getAllPersistent( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception) override;
+                            getAllPersistent( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
 
 
     // provide factory
     /// @throws css::uno::RuntimeException
-    static OUString SAL_CALL        impl_getStaticImplementationName( ) throw(css::uno::RuntimeException);
+    static OUString SAL_CALL        impl_getStaticImplementationName( );
     /// @throws css::uno::RuntimeException
     static css::uno::Sequence< OUString > SAL_CALL
-                    impl_getStaticSupportedServiceNames(  ) throw(css::uno::RuntimeException);
+                    impl_getStaticSupportedServiceNames(  );
     /// @throws css::uno::RuntimeException
     static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL
-                    impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& ServiceManager ) throw(css::uno::RuntimeException);
+                    impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& ServiceManager );
     /// @throws css::uno::RuntimeException
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
-                    impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException, std::exception );
+                    impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
     // XServiceInfo
-    virtual OUString SAL_CALL    getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL            supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL    getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL            supportsService( const OUString& ServiceName ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-                                        getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+                                        getSupportedServiceNames(  ) 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;
 
     // XMasterPasswordHandling
-    virtual sal_Bool SAL_CALL authorizateWithMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL changeMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMasterPassword() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasMasterPassword(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL allowPersistentStoring( sal_Bool bAllow ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isPersistentStoringAllowed(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL authorizateWithMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) override;
+    virtual sal_Bool SAL_CALL changeMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) override;
+    virtual void SAL_CALL removeMasterPassword() override;
+    virtual sal_Bool SAL_CALL hasMasterPassword(  ) override;
+    virtual sal_Bool SAL_CALL allowPersistentStoring( sal_Bool bAllow ) override;
+    virtual sal_Bool SAL_CALL isPersistentStoringAllowed(  ) override;
 
     // XMasterPasswordHandling2
-    virtual sal_Bool SAL_CALL useDefaultMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDefaultMasterPasswordUsed(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL useDefaultMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) override;
+    virtual sal_Bool SAL_CALL isDefaultMasterPasswordUsed(  ) override;
 
     // XUrlContainer
-    virtual void SAL_CALL addUrl( const OUString& Url, sal_Bool MakePersistent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL findUrl( const OUString& Url ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeUrl( const OUString& Url ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getUrls( sal_Bool OnlyPersistent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addUrl( const OUString& Url, sal_Bool MakePersistent ) override;
+    virtual OUString SAL_CALL findUrl( const OUString& Url ) override;
+    virtual void SAL_CALL removeUrl( const OUString& Url ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getUrls( sal_Bool OnlyPersistent ) override;
 
     void            Notify();
 };
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 70669963d8b7..b2b3f529fc34 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -115,7 +115,6 @@ uno::Sequence<beans::Property> SfxItemPropertyMap::getProperties() const
 }
 
 beans::Property SfxItemPropertyMap::getPropertyByName( const OUString & rName ) const
-    throw( beans::UnknownPropertyException )
 {
     SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
     if( aIter == m_pImpl->end() )
@@ -175,7 +174,6 @@ SfxItemPropertySet::~SfxItemPropertySet()
 
 void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
             const SfxItemSet& rSet, Any& rAny ) const
-                        throw(RuntimeException)
 {
     // get the SfxPoolItem
     const SfxPoolItem* pItem = nullptr;
@@ -204,7 +202,6 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
 
 void SfxItemPropertySet::getPropertyValue( const OUString &rName,
                                            const SfxItemSet& rSet, Any& rAny ) const
-    throw(RuntimeException, UnknownPropertyException)
 {
     // detect which-id
     const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName );
@@ -215,7 +212,6 @@ void SfxItemPropertySet::getPropertyValue( const OUString &rName,
 
 Any SfxItemPropertySet::getPropertyValue( const OUString &rName,
                                           const SfxItemSet& rSet ) const
-    throw(RuntimeException, UnknownPropertyException)
 {
     Any aVal;
     getPropertyValue( rName,rSet, aVal );
@@ -225,8 +221,6 @@ Any SfxItemPropertySet::getPropertyValue( const OUString &rName,
 void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
                                            const Any& aVal,
                                            SfxItemSet& rSet ) const
-    throw(RuntimeException,
-          IllegalArgumentException)
 {
     // get the SfxPoolItem
     const SfxPoolItem* pItem = nullptr;
@@ -252,9 +246,6 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
 void SfxItemPropertySet::setPropertyValue( const OUString &rName,
                                            const Any& aVal,
                                            SfxItemSet& rSet ) const
-    throw(RuntimeException,
-          IllegalArgumentException,
-          UnknownPropertyException)
 {
     const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName );
     if ( !pEntry )
@@ -281,7 +272,6 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn
 }
 
 PropertyState   SfxItemPropertySet::getPropertyState(const OUString& rName, const SfxItemSet& rSet) const
-    throw(UnknownPropertyException)
 {
     PropertyState eRet = PropertyState_DIRECT_VALUE;
 
@@ -328,7 +318,6 @@ SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pE
 }
 
 Sequence< Property > SAL_CALL SfxItemPropertySetInfo::getProperties(  )
-    throw(RuntimeException, std::exception)
 {
     return m_pImpl->m_pOwnMap->getProperties();
 }
@@ -339,13 +328,11 @@ SfxItemPropertySetInfo::~SfxItemPropertySetInfo()
 }
 
 Property SAL_CALL SfxItemPropertySetInfo::getPropertyByName( const OUString& rName )
-    throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     return m_pImpl->m_pOwnMap->getPropertyByName( rName );
 }
 
 sal_Bool SAL_CALL SfxItemPropertySetInfo::hasPropertyByName( const OUString& rName )
-    throw(RuntimeException, std::exception)
 {
     return m_pImpl->m_pOwnMap->hasPropertyByName( rName );
 }
@@ -361,19 +348,17 @@ SfxExtItemPropertySetInfo::~SfxExtItemPropertySetInfo()
 {
 }
 
-Sequence< Property > SAL_CALL SfxExtItemPropertySetInfo::getProperties(  ) throw(RuntimeException, std::exception)
+Sequence< Property > SAL_CALL SfxExtItemPropertySetInfo::getProperties(  )
 {
     return aExtMap.getProperties();
 }
 
 Property SAL_CALL SfxExtItemPropertySetInfo::getPropertyByName( const OUString& rPropertyName )
-    throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     return aExtMap.getPropertyByName( rPropertyName );
 }
 
 sal_Bool SAL_CALL SfxExtItemPropertySetInfo::hasPropertyByName( const OUString& rPropertyName )
-    throw(RuntimeException, std::exception)
 {
     return aExtMap.hasPropertyByName( rPropertyName );
 }
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index e169c4521dec..8ec244c2c014 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -945,7 +945,7 @@ SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const css::uno::Reference<
 /**
  * XUnoTunnel
  */
-::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const css::uno::Sequence< ::sal_Int8 >& rId ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const css::uno::Sequence< ::sal_Int8 >& rId )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getIdentifier().getConstArray(), rId.getConstArray(), 16 ) )
     {
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 17210607d24f..6b1e302fb8c2 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -113,7 +113,6 @@ SvNumberFormatterServiceObj::~SvNumberFormatterServiceObj()
 // XNumberFormatter
 
 void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier( const uno::Reference<util::XNumberFormatsSupplier>& _xSupplier )
-    throw(uno::RuntimeException, std::exception)
 {
     ::rtl::Reference< SvNumberFormatsSupplierObj > xAutoReleaseOld;
 
@@ -134,14 +133,12 @@ void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier( const un
 }
 
 uno::Reference<util::XNumberFormatsSupplier> SAL_CALL SvNumberFormatterServiceObj::getNumberFormatsSupplier()
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return xSupplier.get();
 }
 
 sal_Int32 SAL_CALL SvNumberFormatterServiceObj::detectNumberFormat( sal_Int32 nKey, const OUString& aString )
-    throw(util::NotNumericException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -163,7 +160,6 @@ sal_Int32 SAL_CALL SvNumberFormatterServiceObj::detectNumberFormat( sal_Int32 nK
 }
 
 double SAL_CALL SvNumberFormatterServiceObj::convertStringToNumber( sal_Int32 nKey, const OUString& aString )
-    throw(util::NotNumericException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -185,7 +181,6 @@ double SAL_CALL SvNumberFormatterServiceObj::convertStringToNumber( sal_Int32 nK
 }
 
 OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToString( sal_Int32 nKey, double fValue )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -205,7 +200,6 @@ OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToString( sal_Int32
 util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32 nKey,
                                                                        double fValue,
                                                                        util::Color aDefaultColor )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -228,7 +222,6 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32
 
 OUString SAL_CALL SvNumberFormatterServiceObj::formatString( sal_Int32 nKey,
                                                              const OUString& aString )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -249,7 +242,6 @@ OUString SAL_CALL SvNumberFormatterServiceObj::formatString( sal_Int32 nKey,
 util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32 nKey,
                                                                        const OUString& aString,
                                                                        util::Color aDefaultColor )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -275,7 +267,6 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32
 }
 
 OUString SAL_CALL SvNumberFormatterServiceObj::getInputString( sal_Int32 nKey, double fValue )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -295,7 +286,6 @@ OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToPreviewString( con
                                                                              double fValue,
                                                                              const lang::Locale& nLocale,
                                                                              sal_Bool bAllowEnglish )
-    throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -326,7 +316,6 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( co
                                                                               const lang::Locale& nLocale,
                                                                               sal_Bool bAllowEnglish,
                                                                               util::Color aDefaultColor )
-    throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -362,19 +351,16 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( co
 // XServiceInfo
 
 OUString SAL_CALL SvNumberFormatterServiceObj::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject");
 }
 
 sal_Bool SAL_CALL SvNumberFormatterServiceObj::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence<OUString> SAL_CALL SvNumberFormatterServiceObj::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.util.NumberFormatter" };
 }
@@ -394,7 +380,6 @@ SvNumberFormatsObj::~SvNumberFormatsObj()
 // XNumberFormats
 
 uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsObj::getByKey( sal_Int32 nKey )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -409,7 +394,6 @@ uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsObj::getByKey( sal_I
 uno::Sequence<sal_Int32> SAL_CALL SvNumberFormatsObj::queryKeys( sal_Int16 nType,
                                                                  const lang::Locale& nLocale,
                                                                  sal_Bool bCreate )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -437,7 +421,6 @@ uno::Sequence<sal_Int32> SAL_CALL SvNumberFormatsObj::queryKeys( sal_Int16 nType
 sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const OUString& aFormat,
                                                  const lang::Locale& nLocale,
                                                  sal_Bool bScan )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -460,7 +443,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const OUString& aFormat,
 
 sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const OUString& aFormat,
                                                const lang::Locale& nLocale )
-    throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -492,7 +474,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const OUString& aFormat,
 sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const OUString& aFormat,
                                                         const lang::Locale& nLocale,
                                                         const lang::Locale& nNewLocale )
-    throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -522,7 +503,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const OUString& aFormat,
     return nRet;
 }
 
-void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     SvNumberFormatter* pFormatter = rSupplier.GetNumberFormatter();
@@ -538,7 +519,6 @@ OUString SAL_CALL SvNumberFormatsObj::generateFormat( sal_Int32 nBaseKey,
                                                       sal_Bool bThousands,
                                                       sal_Bool bRed, sal_Int16 nDecimals,
                                                       sal_Int16 nLeading )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -558,7 +538,6 @@ OUString SAL_CALL SvNumberFormatsObj::generateFormat( sal_Int32 nBaseKey,
 // XNumberFormatTypes
 
 sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardIndex( const lang::Locale& nLocale )
-                            throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -576,7 +555,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardIndex( const lang::Locale& nLo
 }
 
 sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const lang::Locale& nLocale )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -597,7 +575,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const
 }
 
 sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatIndex( sal_Int16 nIndex, const lang::Locale& nLocale )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -615,7 +592,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatIndex( sal_Int16 nIndex, const l
 }
 
 sal_Bool SAL_CALL SvNumberFormatsObj::isTypeCompatible( sal_Int16 nOldType, sal_Int16 nNewType )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -623,7 +599,6 @@ sal_Bool SAL_CALL SvNumberFormatsObj::isTypeCompatible( sal_Int16 nOldType, sal_
 }
 
 sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const lang::Locale& nLocale )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -643,19 +618,16 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const
 // XServiceInfo
 
 OUString SAL_CALL SvNumberFormatsObj::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SvNumberFormatsObj");
 }
 
 sal_Bool SAL_CALL SvNumberFormatsObj::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence<OUString> SAL_CALL SvNumberFormatsObj::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.util.NumberFormats" };
 }
@@ -676,7 +648,6 @@ SvNumberFormatObj::~SvNumberFormatObj()
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatObj::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
     static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -686,16 +657,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatObj::getPropertyS
 
 void SAL_CALL SvNumberFormatObj::setPropertyValue( const OUString&,
                                                    const uno::Any& )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-          lang::IllegalArgumentException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     throw beans::UnknownPropertyException(); // Everything is read-only
 }
 
 uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -788,32 +754,24 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty
 
 void SAL_CALL SvNumberFormatObj::addPropertyChangeListener( const OUString&,
                                                             const uno::Reference<beans::XPropertyChangeListener>&)
-    throw(beans::UnknownPropertyException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL SvNumberFormatObj::removePropertyChangeListener( const OUString&,
                                                                const uno::Reference<beans::XPropertyChangeListener>&)
-    throw(beans::UnknownPropertyException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL SvNumberFormatObj::addVetoableChangeListener( const OUString&,
                                                             const uno::Reference<beans::XVetoableChangeListener>&)
-    throw(beans::UnknownPropertyException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const OUString&,
                                                                const uno::Reference<beans::XVetoableChangeListener>&)
-    throw(beans::UnknownPropertyException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -821,7 +779,6 @@ void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const OUString&,
 // XPropertyAccess
 
 uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValues()
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -885,9 +842,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
 }
 
 void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::PropertyValue>& )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-          lang::IllegalArgumentException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     throw beans::UnknownPropertyException(); // Everything is read-only
 }
@@ -895,19 +849,16 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P
 // XServiceInfo
 
 OUString SAL_CALL SvNumberFormatObj::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SvNumberFormatObj");
 }
 
 sal_Bool SAL_CALL SvNumberFormatObj::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence<OUString> SAL_CALL SvNumberFormatObj::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.util.NumberFormatProperties" };
 }
@@ -927,7 +878,6 @@ SvNumberFormatSettingsObj::~SvNumberFormatSettingsObj()
 // XPropertySet
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatSettingsObj::getPropertySetInfo()
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
     static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -937,9 +887,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatSettingsObj::getP
 
 void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const OUString& aPropertyName,
                                                            const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-          lang::IllegalArgumentException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -978,8 +925,6 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const OUString& aProp
 }
 
 uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& aPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1014,32 +959,24 @@ uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& a
 
 void SAL_CALL SvNumberFormatSettingsObj::addPropertyChangeListener( const OUString&,
                                                                     const uno::Reference<beans::XPropertyChangeListener>&)
-    throw(beans::UnknownPropertyException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL SvNumberFormatSettingsObj::removePropertyChangeListener( const OUString&,
                                                                        const uno::Reference<beans::XPropertyChangeListener>&)
-    throw(beans::UnknownPropertyException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL SvNumberFormatSettingsObj::addVetoableChangeListener( const OUString&,
                                                                     const uno::Reference<beans::XVetoableChangeListener>&)
-    throw(beans::UnknownPropertyException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const OUString&,
                                                                        const uno::Reference<beans::XVetoableChangeListener>&)
-    throw(beans::UnknownPropertyException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -1047,19 +984,16 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const OUS
 // XServiceInfo
 
 OUString SAL_CALL SvNumberFormatSettingsObj::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SvNumberFormatSettingsObj");
 }
 
 sal_Bool SAL_CALL SvNumberFormatSettingsObj::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence<OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.util.NumberFormatSettings" };
 }
diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index fad3f5108988..01c582594694 100644
--- a/svl/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
@@ -51,51 +51,33 @@ public:
 
     // XNumberFormatter
     virtual void SAL_CALL attachNumberFormatsSupplier(
-                            const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier )
-                                    throw(css::uno::RuntimeException, std::exception) override;
+                            const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier ) override;
     virtual css::uno::Reference< css::util::XNumberFormatsSupplier >
-                            SAL_CALL getNumberFormatsSupplier()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL detectNumberFormat( sal_Int32 nKey, const OUString& aString )
-                            throw(css::util::NotNumericException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL convertStringToNumber( sal_Int32 nKey, const OUString& aString )
-                            throw(css::util::NotNumericException,
-                                    css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL convertNumberToString( sal_Int32 nKey, double fValue )
-                            throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getNumberFormatsSupplier() override;
+    virtual sal_Int32 SAL_CALL detectNumberFormat( sal_Int32 nKey, const OUString& aString ) override;
+    virtual double SAL_CALL convertStringToNumber( sal_Int32 nKey, const OUString& aString ) override;
+    virtual OUString SAL_CALL convertNumberToString( sal_Int32 nKey, double fValue ) override;
     virtual css::util::Color SAL_CALL queryColorForNumber( sal_Int32 nKey,
-                            double fValue, css::util::Color aDefaultColor )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL formatString( sal_Int32 nKey, const OUString& aString )
-                            throw(css::uno::RuntimeException, std::exception) override;
+                            double fValue, css::util::Color aDefaultColor ) override;
+    virtual OUString SAL_CALL formatString( sal_Int32 nKey, const OUString& aString ) override;
     virtual css::util::Color SAL_CALL queryColorForString( sal_Int32 nKey,
                             const OUString& aString,
-                                css::util::Color aDefaultColor )
-                                    throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue )
-                            throw(css::uno::RuntimeException, std::exception) override;
+                                css::util::Color aDefaultColor ) override;
+    virtual OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue ) override;
 
     // XNumberFormatPreviewer
     virtual OUString SAL_CALL convertNumberToPreviewString(
                             const OUString& aFormat, double fValue,
-                            const css::lang::Locale& nLocale, sal_Bool bAllowEnglish )
-                                throw(css::util::MalformedNumberFormatException,
-                                        css::uno::RuntimeException, std::exception) override;
+                            const css::lang::Locale& nLocale, sal_Bool bAllowEnglish ) override;
     virtual css::util::Color SAL_CALL queryPreviewColorForNumber(
                             const OUString& aFormat, double fValue,
                             const css::lang::Locale& nLocale, sal_Bool bAllowEnglish,
-                            css::util::Color aDefaultColor )
-                                throw(css::util::MalformedNumberFormatException,
-                                        css::uno::RuntimeException, std::exception) override;
+                            css::util::Color aDefaultColor ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                            throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                            throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                            throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -115,50 +97,35 @@ public:
 
     // XNumberFormats
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-                            getByKey( sal_Int32 nKey ) throw(css::uno::RuntimeException, std::exception) override;
+                            getByKey( sal_Int32 nKey ) override;
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL queryKeys( sal_Int16 nType,
-                            const css::lang::Locale& nLocale, sal_Bool bCreate )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            const css::lang::Locale& nLocale, sal_Bool bCreate ) override;
     virtual sal_Int32 SAL_CALL queryKey( const OUString& aFormat,
-                            const css::lang::Locale& nLocale, sal_Bool bScan )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            const css::lang::Locale& nLocale, sal_Bool bScan ) override;
     virtual sal_Int32 SAL_CALL addNew( const OUString& aFormat,
-                            const css::lang::Locale& nLocale )
-                                throw(css::util::MalformedNumberFormatException,
-                                        css::uno::RuntimeException, std::exception) override;
+                            const css::lang::Locale& nLocale ) override;
     virtual sal_Int32 SAL_CALL addNewConverted( const OUString& aFormat,
                             const css::lang::Locale& nLocale,
-                            const css::lang::Locale& nNewLocale )
-                                throw(css::util::MalformedNumberFormatException,
-                                        css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByKey( sal_Int32 nKey ) throw(css::uno::RuntimeException, std::exception) override;
+                            const css::lang::Locale& nNewLocale ) override;
+    virtual void SAL_CALL removeByKey( sal_Int32 nKey ) override;
     virtual OUString SAL_CALL generateFormat( sal_Int32 nBaseKey,
                             const css::lang::Locale& nLocale, sal_Bool bThousands,
-                            sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading ) override;
 
     // XNumberFormatTypes
-    virtual sal_Int32 SAL_CALL getStandardIndex( const css::lang::Locale& nLocale )
-                            throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getStandardIndex( const css::lang::Locale& nLocale ) override;
     virtual sal_Int32 SAL_CALL getStandardFormat( sal_Int16 nType,
-                            const css::lang::Locale& nLocale )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            const css::lang::Locale& nLocale ) override;
     virtual sal_Int32 SAL_CALL getFormatIndex( sal_Int16 nIndex,
-                            const css::lang::Locale& nLocale )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isTypeCompatible( sal_Int16 nOldType, sal_Int16 nNewType )
-                            throw(css::uno::RuntimeException, std::exception) override;
+                            const css::lang::Locale& nLocale ) override;
+    virtual sal_Bool SAL_CALL isTypeCompatible( sal_Int16 nOldType, sal_Int16 nNewType ) override;
     virtual sal_Int32 SAL_CALL getFormatForLocale( sal_Int32 nKey,
-                            const css::lang::Locale& nLocale )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            const css::lang::Locale& nLocale ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                            throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                            throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                            throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -178,63 +145,34 @@ public:
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XPropertyAccess
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-                            getPropertyValues() throw(css::uno::RuntimeException, std::exception) override;
+                            getPropertyValues() override;
     virtual void SAL_CALL   setPropertyValues( const css::uno::Sequence<
-                                css::beans::PropertyValue >& aProps )
-                                    throw(css::beans::UnknownPropertyException,
-                                            css::beans::PropertyVetoException,
-                                            css::lang::IllegalArgumentException,
-                                            css::lang::WrappedTargetException,
-                                            css::uno::RuntimeException, std::exception) override;
+                                css::beans::PropertyValue >& aProps ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -253,52 +191,28 @@ public:
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >
-                            SAL_CALL getPropertySetInfo(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertySetInfo(  ) override;
     virtual void SAL_CALL   setPropertyValue( const OUString& aPropertyName,
-                                    const css::uno::Any& aValue )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::beans::PropertyVetoException,
-                                    css::lang::IllegalArgumentException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-                                    const OUString& PropertyName )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                    const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& xListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL   removePropertyChangeListener( const OUString& aPropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XPropertyChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL   addVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL   removeVetoableChangeListener( const OUString& PropertyName,
                                     const css::uno::Reference<
-                                        css::beans::XVetoableChangeListener >& aListener )
-                                throw(css::beans::UnknownPropertyException,
-                                    css::lang::WrappedTargetException,
-                                    css::uno::RuntimeException, std::exception) override;
+                                        css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 21d211514f99..a7d3b7907ff4 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -72,7 +72,6 @@ void SvNumberFormatsSupplierObj::SetNumberFormatter(SvNumberFormatter* pNew)
 // XNumberFormatsSupplier
 
 uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsSupplierObj::getNumberFormatSettings()
-                                        throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( pImpl->aMutex );
 
@@ -80,7 +79,6 @@ uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsSupplierObj::getNumb
 }
 
 uno::Reference<util::XNumberFormats> SAL_CALL SvNumberFormatsSupplierObj::getNumberFormats()
-                                        throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( pImpl->aMutex );
 
@@ -90,7 +88,7 @@ uno::Reference<util::XNumberFormats> SAL_CALL SvNumberFormatsSupplierObj::getNum
 // XUnoTunnel
 
 sal_Int64 SAL_CALL SvNumberFormatsSupplierObj::getSomething(
-                const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+                const uno::Sequence<sal_Int8 >& rId )
 {
     if ( rId.getLength() == 16 &&
           0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 28a7f16f29bd..3b5a2e061ab4 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -53,7 +53,7 @@ SvNumberFormatsSupplierServiceObject::~SvNumberFormatsSupplierServiceObject()
     }
 }
 
-Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& _rType )
 {
     Any aReturn = ::cppu::queryInterface(_rType,
         static_cast< XInitialization* >(this),
@@ -66,7 +66,7 @@ Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type&
     return aReturn;
 }
 
-void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< Any >& _rArguments ) throw(Exception, RuntimeException, std::exception)
+void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< Any >& _rArguments )
 {
     ::osl::MutexGuard aGuard( getSharedMutex() );
 
@@ -107,37 +107,37 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
     SetNumberFormatter(m_pOwnFormatter);
 }
 
-OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName(  )
 {
     return OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject");
 }
 
-sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
-Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames(  )
 {
     Sequence< OUString > aSupported { "com.sun.star.util.NumberFormatsSupplier" };
     return aSupported;
 }
 
-Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormatSettings() throw(RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormatSettings()
 {
     ::osl::MutexGuard aGuard( getSharedMutex() );
     implEnsureFormatter();
     return SvNumberFormatsSupplierObj::getNumberFormatSettings();
 }
 
-Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormats() throw(RuntimeException, std::exception)
+Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormats()
 {
     ::osl::MutexGuard aGuard( getSharedMutex() );
     implEnsureFormatter();
     return SvNumberFormatsSupplierObj::getNumberFormats();
 }
 
-sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception)
+sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Sequence< sal_Int8 >& aIdentifier )
 {
     sal_Int64 nReturn = SvNumberFormatsSupplierObj::getSomething( aIdentifier );
     if ( nReturn )
diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx
index 1049a5dae054..4a00ce22f86e 100644
--- a/svl/source/numbers/supservs.hxx
+++ b/svl/source/numbers/supservs.hxx
@@ -48,28 +48,28 @@ public:
     // XInterface
     virtual void SAL_CALL acquire() throw() override { SvNumberFormatsSupplierObj::acquire(); }
     virtual void SAL_CALL release() throw() override { SvNumberFormatsSupplierObj::release(); }
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override
         { return SvNumberFormatsSupplierObj::queryInterface(_rType); }
 
     // XAggregation
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XNumberFormatsSupplier
     virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
-                getNumberFormatSettings() throw(css::uno::RuntimeException, std::exception) override;
+                getNumberFormatSettings() override;
     virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL
-                getNumberFormats() throw(css::uno::RuntimeException, std::exception) override;
+                getNumberFormats() override;
 
     // XUnoTunnler
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
 protected:
     void implEnsureFormatter();
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index d83c69964079..f328c8419878 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -402,7 +402,7 @@ PasswordContainer::~PasswordContainer()
     }
 }
 
-void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::disposing( const EventObject& )
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -419,7 +419,7 @@ void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeEx
     }
 }
 
-vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd ) throw(RuntimeException, std::exception)
+vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd )
 {
     if( !aMasterPasswd.isEmpty() )
     {
@@ -468,7 +468,7 @@ vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, co
     throw RuntimeException("Can't decode!" );
 }
 
-OUString PasswordContainer::EncodePasswords(const vector< OUString >& lines, const OUString& aMasterPasswd ) throw(RuntimeException)
+OUString PasswordContainer::EncodePasswords(const vector< OUString >& lines, const OUString& aMasterPasswd )
 {
     if( !aMasterPasswd.isEmpty() )
     {
@@ -545,7 +545,7 @@ OUString PasswordContainer::EncodePasswords(const vector< OUString >& lines, con
     throw RuntimeException("Can't encode!" );
 }
 
-void PasswordContainer::UpdateVector( const OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile ) throw(RuntimeException)
+void PasswordContainer::UpdateVector( const OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile )
 {
     for( list< NamePassRecord >::iterator aNPIter = toUpdate.begin(); aNPIter != toUpdate.end(); ++aNPIter )
         if( aNPIter->GetUserName().equals( aRecord.GetUserName() ) )
@@ -602,7 +602,7 @@ UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, b
 }
 
 
-Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list< NamePassRecord >& original, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list< NamePassRecord >& original, const Reference< XInteractionHandler >& aHandler )
 {
     Sequence< UserRecord >     aResult( original.size() );
     sal_uInt32 nInd = 0;
@@ -619,7 +619,7 @@ Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list<
 }
 
 
-void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler )
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -627,7 +627,7 @@ void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserN
 }
 
 
-void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler  ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler  )
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -635,7 +635,7 @@ void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUStr
 }
 
 
-void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, char Mode, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, char Mode, const Reference< XInteractionHandler >& aHandler )
 {
     NamePassRecord aRecord( UserName );
     ::std::vector< OUString > aStorePass = comphelper::sequenceToContainer< std::vector<OUString> >( Passwords );
@@ -670,19 +670,19 @@ void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserNam
 }
 
 
-UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler  ) throw(RuntimeException, std::exception)
+UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler  )
 {
     return find( aURL, OUString(), false, aHandler );
 }
 
 
-UrlRecord SAL_CALL PasswordContainer::findForName( const OUString& aURL, const OUString& aName, const Reference< XInteractionHandler >& aHandler  ) throw(RuntimeException, std::exception)
+UrlRecord SAL_CALL PasswordContainer::findForName( const OUString& aURL, const OUString& aName, const Reference< XInteractionHandler >& aHandler  )
 {
     return find( aURL, aName, true, aHandler );
 }
 
 
-Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& userlist, const OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& userlist, const OUString& aName, const Reference< XInteractionHandler >& aHandler )
 {
     sal_uInt32 nInd = 0;
     for( list< NamePassRecord >::const_iterator aNPIter = userlist.begin();
@@ -709,7 +709,6 @@ bool PasswordContainer::createUrlRecord(
     const OUString & aName,
     const Reference< XInteractionHandler >& aHandler,
     UrlRecord & rRec )
-        throw( RuntimeException )
 {
     if ( bName )
     {
@@ -736,7 +735,7 @@ UrlRecord PasswordContainer::find(
     const OUString& aURL,
     const OUString& aName,
     bool bName, // only needed to support empty user names
-    const Reference< XInteractionHandler >& aHandler  ) throw(RuntimeException, std::exception)
+    const Reference< XInteractionHandler >& aHandler  )
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -816,7 +815,7 @@ OUString PasswordContainer::RequestPasswordFromUser( PasswordRequestMode aRMode,
 }
 
 
-OUString const & PasswordContainer::GetMasterPassword( const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+OUString const & PasswordContainer::GetMasterPassword( const Reference< XInteractionHandler >& aHandler )
 {
     PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_ENTER;
     if( !m_pStorageFile || !m_pStorageFile->useStorage() )
@@ -875,7 +874,7 @@ OUString const & PasswordContainer::GetMasterPassword( const Reference< XInterac
 }
 
 
-void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& aName ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& aName )
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -915,7 +914,7 @@ void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& a
 }
 
 
-void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const OUString& aName ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const OUString& aName )
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -960,7 +959,7 @@ void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const O
     }
 }
 
-void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::removeAllPersistent()
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -1001,7 +1000,7 @@ void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException, s
     }
 }
 
-Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Reference< XInteractionHandler >& xHandler ) throw(RuntimeException, std::exception)
+Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Reference< XInteractionHandler >& xHandler )
 {
     Sequence< UrlRecord > aResult;
 
@@ -1029,7 +1028,6 @@ Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Refere
 }
 
 sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = false;
     OUString aEncodedMP;
@@ -1083,7 +1081,6 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R
 }
 
 sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bResult = false;
     uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler;
@@ -1140,7 +1137,6 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference<
 }
 
 void SAL_CALL PasswordContainer::removeMasterPassword()
-    throw (uno::RuntimeException, std::exception)
 {
     // remove all the stored passwords and the master password
     removeAllPersistent();
@@ -1154,7 +1150,6 @@ void SAL_CALL PasswordContainer::removeMasterPassword()
 }
 
 sal_Bool SAL_CALL PasswordContainer::hasMasterPassword(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -1166,7 +1161,6 @@ sal_Bool SAL_CALL PasswordContainer::hasMasterPassword(  )
 }
 
 sal_Bool SAL_CALL PasswordContainer::allowPersistentStoring( sal_Bool bAllow )
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -1184,7 +1178,6 @@ sal_Bool SAL_CALL PasswordContainer::allowPersistentStoring( sal_Bool bAllow )
 }
 
 sal_Bool SAL_CALL PasswordContainer::isPersistentStoringAllowed()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -1195,7 +1188,6 @@ sal_Bool SAL_CALL PasswordContainer::isPersistentStoringAllowed()
 }
 
 sal_Bool SAL_CALL PasswordContainer::useDefaultMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler )
-    throw ( uno::RuntimeException, std::exception )
 {
     bool bResult = false;
     uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler;
@@ -1250,7 +1242,6 @@ sal_Bool SAL_CALL PasswordContainer::useDefaultMasterPassword( const uno::Refere
 }
 
 sal_Bool SAL_CALL PasswordContainer::isDefaultMasterPasswordUsed()
-    throw ( uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( mMutex );
 
@@ -1263,25 +1254,21 @@ sal_Bool SAL_CALL PasswordContainer::isDefaultMasterPasswordUsed()
 
 
 void SAL_CALL PasswordContainer::addUrl( const OUString& Url, sal_Bool MakePersistent )
-    throw (uno::RuntimeException, std::exception)
 {
     mUrlContainer.add( Url, MakePersistent );
 }
 
 OUString SAL_CALL PasswordContainer::findUrl( const OUString& Url )
-    throw (uno::RuntimeException, std::exception)
 {
     return mUrlContainer.find( Url );
 }
 
 void SAL_CALL PasswordContainer::removeUrl( const OUString& Url )
-    throw (uno::RuntimeException, std::exception)
 {
     mUrlContainer.remove( Url );
 }
 
 uno::Sequence< OUString > SAL_CALL PasswordContainer::getUrls( sal_Bool OnlyPersistent )
-    throw (uno::RuntimeException, std::exception)
 {
     return mUrlContainer.list( OnlyPersistent );
 }
@@ -1332,38 +1319,38 @@ void PasswordContainer::Notify()
     }
 }
 
-OUString SAL_CALL PasswordContainer::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL PasswordContainer::getImplementationName(  )
 {
     return impl_getStaticImplementationName();
 }
 
-sal_Bool SAL_CALL PasswordContainer::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL PasswordContainer::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this,  ServiceName );
 }
 
-Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames(  )
 {
     return impl_getStaticSupportedServiceNames();
 }
 
-Sequence< OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames(  ) throw(uno::RuntimeException)
+Sequence< OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames(  )
 {
     Sequence< OUString > aRet { "com.sun.star.task.PasswordContainer" };
     return aRet;
 }
 
-OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(uno::RuntimeException)
+OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName()
 {
     return OUString("stardiv.svl.PasswordContainer");
 }
 
-Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
 {
     return Reference< XInterface >( *new PasswordContainer( xServiceManager ) );
 }
 
-Reference< XSingleServiceFactory > SAL_CALL PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager ) throw(RuntimeException)
+Reference< XSingleServiceFactory > SAL_CALL PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager )
 {
     Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager,
                                                         PasswordContainer::impl_getStaticImplementationName(),
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 007913293db9..d445cac66c8b 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -39,45 +39,38 @@ public:
     PathService()
         {}
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw(css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
         {
             return OUString("com.sun.star.comp.svl.PathService");
         }
 
     virtual sal_Bool SAL_CALL supportsService (
-        const OUString & rName)
-        throw(css::uno::RuntimeException, std::exception) override
+        const OUString & rName) override
         {
             return cppu::supportsService(this, rName);
         }
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw(css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
         {
             css::uno::Sequence< OUString > aRet { "com.sun.star.config.SpecialConfigManager" };
             return aRet;
         }
 
     virtual OUString SAL_CALL substituteVariables (
-        const OUString& sText)
-        throw(css::uno::RuntimeException, std::exception) override
+        const OUString& sText) override
         {
             return m_aOptions.SubstituteVariable( sText );
         }
 
     virtual void SAL_CALL addPropertyChangeListener (
-        const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &)
-        throw(css::uno::RuntimeException, std::exception) override
+        const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &) override
         {}
 
     virtual void SAL_CALL removePropertyChangeListener (
-        const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &)
-        throw(css::uno::RuntimeException, std::exception) override
+        const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &) override
         {}
 
-    virtual void SAL_CALL flush()
-        throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL flush() override
         {}
 };
 
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx
index 798637c6b924..919cba36bd1d 100644
--- a/svtools/inc/vclxaccessibleheaderbar.hxx
+++ b/svtools/inc/vclxaccessibleheaderbar.hxx
@@ -42,14 +42,14 @@ public:
     VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow );
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::rtl::OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
 
 public:
     virtual void SAL_CALL disposing() override;
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx
index 182205144020..5bdb0ac7de46 100644
--- a/svtools/inc/vclxaccessibleheaderbaritem.hxx
+++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx
@@ -60,7 +60,7 @@ protected:
     void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
     // OCommonAccessibleComponent
-    virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) override;
 
 public:
     VCLXAccessibleHeaderBarItem( HeaderBar*    pHeadBar, sal_Int32 _nIndexInParent );
@@ -73,35 +73,35 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override {};
-    virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual void SAL_CALL grabFocus(  ) override {};
+    virtual sal_Int32 SAL_CALL getForeground() override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     // XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(    ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(    ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
 };
 
 #endif // INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 080c70f1aafc..81cc65621965 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -86,7 +86,6 @@ void ItemHolder2::holdConfigItem(EItem eItem)
 
 
 void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&)
-    throw(css::uno::RuntimeException, std::exception)
 {
     impl_releaseAllItems();
 }
diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx
index a94a3dc77acb..e4bc8c3ca17b 100644
--- a/svtools/source/config/itemholder2.hxx
+++ b/svtools/source/config/itemholder2.hxx
@@ -48,8 +48,7 @@ class ItemHolder2 : private ItemHolderMutexBase
     // uno interface
     public:
 
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
 
     // helper
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index f528ca65a505..e3fd1b0b2041 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -67,21 +67,21 @@ SvtRulerAccessible::~SvtRulerAccessible()
 
 //=====  XAccessible  =========================================================
 
-uno::Reference< XAccessibleContext > SAL_CALL SvtRulerAccessible::getAccessibleContext() throw( RuntimeException, std::exception )
+uno::Reference< XAccessibleContext > SAL_CALL SvtRulerAccessible::getAccessibleContext()
 {
     return this;
 }
 
 //=====  XAccessibleComponent  ================================================
 
-sal_Bool SAL_CALL SvtRulerAccessible::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtRulerAccessible::containsPoint( const awt::Point& rPoint )
 {
     // no guard -> done in getBounds()
 //  return GetBoundingBox().IsInside( VCLPoint( rPoint ) );
     return Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
 }
 
-uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleAtPoint( const awt::Point& ) throw( RuntimeException, std::exception )
+uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleAtPoint( const awt::Point& )
 {
     ::osl::MutexGuard           aGuard( m_aMutex );
 
@@ -93,31 +93,31 @@ uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleAtPoint(
     return xRet;
 }
 
-awt::Rectangle SAL_CALL SvtRulerAccessible::getBounds() throw( RuntimeException, std::exception )
+awt::Rectangle SAL_CALL SvtRulerAccessible::getBounds()
 {
     // no guard -> done in GetBoundingBox()
     return AWTRectangle( GetBoundingBox() );
 }
 
-awt::Point SAL_CALL SvtRulerAccessible::getLocation() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvtRulerAccessible::getLocation()
 {
     // no guard -> done in GetBoundingBox()
     return AWTPoint( GetBoundingBox().TopLeft() );
 }
 
-awt::Point SAL_CALL SvtRulerAccessible::getLocationOnScreen() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvtRulerAccessible::getLocationOnScreen()
 {
     // no guard -> done in GetBoundingBoxOnScreen()
     return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
 }
 
-awt::Size SAL_CALL SvtRulerAccessible::getSize() throw( RuntimeException, std::exception )
+awt::Size SAL_CALL SvtRulerAccessible::getSize()
 {
     // no guard -> done in GetBoundingBox()
     return AWTSize( GetBoundingBox().GetSize() );
 }
 
-bool SAL_CALL SvtRulerAccessible::isVisible() throw( RuntimeException )
+bool SAL_CALL SvtRulerAccessible::isVisible()
 {
     ::osl::MutexGuard           aGuard( m_aMutex );
 
@@ -127,7 +127,7 @@ bool SAL_CALL SvtRulerAccessible::isVisible() throw( RuntimeException )
 }
 
 //=====  XAccessibleContext  ==================================================
-sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -137,19 +137,18 @@ sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() throw( RuntimeE
 }
 
 uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleChild( sal_Int32 )
-    throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception )
 {
     uno::Reference< XAccessible >   xChild ;
 
     return xChild;
 }
 
-uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleParent() throw( RuntimeException, std::exception )
+uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleParent()
 {
     return mxParent;
 }
 
-sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     //  Use a simple but slow solution for now.  Optimize later.
@@ -175,18 +174,18 @@ sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent() throw( Runti
    return -1;
 }
 
-sal_Int16 SAL_CALL SvtRulerAccessible::getAccessibleRole() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL SvtRulerAccessible::getAccessibleRole()
 {
     return AccessibleRole::RULER;
 }
 
-OUString SAL_CALL SvtRulerAccessible::getAccessibleDescription() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtRulerAccessible::getAccessibleDescription()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     return msDescription;
 }
 
-OUString SAL_CALL SvtRulerAccessible::getAccessibleName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtRulerAccessible::getAccessibleName()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     return msName;
@@ -195,13 +194,13 @@ OUString SAL_CALL SvtRulerAccessible::getAccessibleName() throw( RuntimeExceptio
 /** Return empty uno::Reference to indicate that the relation set is not
     supported.
 */
-uno::Reference< XAccessibleRelationSet > SAL_CALL SvtRulerAccessible::getAccessibleRelationSet() throw( RuntimeException, std::exception )
+uno::Reference< XAccessibleRelationSet > SAL_CALL SvtRulerAccessible::getAccessibleRelationSet()
 {
     return uno::Reference< XAccessibleRelationSet >();
 }
 
 
-uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessibleStateSet() throw( RuntimeException, std::exception )
+uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessibleStateSet()
 {
     ::osl::MutexGuard                       aGuard( m_aMutex );
     utl::AccessibleStateSetHelper*          pStateSetHelper = new utl::AccessibleStateSetHelper;
@@ -231,7 +230,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessible
     return pStateSetHelper;
 }
 
-lang::Locale SAL_CALL SvtRulerAccessible::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception )
+lang::Locale SAL_CALL SvtRulerAccessible::getLocale()
 {
     ::osl::MutexGuard                           aGuard( m_aMutex );
     if( mxParent.is() )
@@ -246,7 +245,6 @@ lang::Locale SAL_CALL SvtRulerAccessible::getLocale() throw( IllegalAccessibleCo
 }
 
 void SAL_CALL SvtRulerAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -258,7 +256,6 @@ void SAL_CALL SvtRulerAccessible::addAccessibleEventListener( const uno::Referen
 }
 
 void SAL_CALL SvtRulerAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is() && mnClientId)
     {
@@ -277,7 +274,7 @@ void SAL_CALL SvtRulerAccessible::removeAccessibleEventListener( const uno::Refe
     }
 }
 
-void SAL_CALL SvtRulerAccessible::grabFocus() throw( RuntimeException, std::exception )
+void SAL_CALL SvtRulerAccessible::grabFocus()
 {
     SolarMutexGuard     aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -288,7 +285,6 @@ void SAL_CALL SvtRulerAccessible::grabFocus() throw( RuntimeException, std::exce
 }
 
 sal_Int32 SvtRulerAccessible::getForeground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard     aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -297,7 +293,6 @@ sal_Int32 SvtRulerAccessible::getForeground(  )
     return mpRepr->GetControlForeground().GetColor();
 }
 sal_Int32 SvtRulerAccessible::getBackground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard     aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -307,23 +302,23 @@ sal_Int32 SvtRulerAccessible::getBackground(  )
 }
 
 // XServiceInfo
-OUString SAL_CALL SvtRulerAccessible::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvtRulerAccessible::getImplementationName()
 {
     return OUString( "com.sun.star.comp.ui.SvtRulerAccessible" );
 }
 
-sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService( this, sServiceName );
 }
 
-Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames()
 {
     return Sequence< OUString > { OUString("com.sun.star.accessibility.AccessibleContext") };
 }
 
 //=====  XTypeProvider  =======================================================
-Sequence< sal_Int8 > SAL_CALL SvtRulerAccessible::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL SvtRulerAccessible::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -345,7 +340,7 @@ void SAL_CALL SvtRulerAccessible::disposing()
     }
 }
 
-Rectangle SvtRulerAccessible::GetBoundingBoxOnScreen() throw( RuntimeException )
+Rectangle SvtRulerAccessible::GetBoundingBoxOnScreen()
 {
     SolarMutexGuard     aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -354,7 +349,7 @@ Rectangle SvtRulerAccessible::GetBoundingBoxOnScreen() throw( RuntimeException )
     return Rectangle( mpRepr->GetParent()->OutputToAbsoluteScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() );
 }
 
-Rectangle SvtRulerAccessible::GetBoundingBox() throw( RuntimeException )
+Rectangle SvtRulerAccessible::GetBoundingBox()
 {
     SolarMutexGuard     aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -364,7 +359,7 @@ Rectangle SvtRulerAccessible::GetBoundingBox() throw( RuntimeException )
     return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() );
 }
 
-void SvtRulerAccessible::ThrowExceptionIfNotAlive() throw( lang::DisposedException )
+void SvtRulerAccessible::ThrowExceptionIfNotAlive()
 {
     if( rBHelper.bDisposed || rBHelper.bInDispose )
         throw lang::DisposedException();
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index ad4eaef311b7..74e4df249562 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -147,7 +147,7 @@ const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible()
 }
 
 
-sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException)
+sal_Int32 ToolbarMenuEntry::getAccessibleChildCount()
 {
     if( mpControl )
     {
@@ -161,7 +161,7 @@ sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException)
 }
 
 
-Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException)
+Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index )
 {
     const Reference< XAccessibleContext >& xContext = GetAccessible();
     if( mpControl )
@@ -219,7 +219,7 @@ void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const css::uno::Any&
 }
 
 
-sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException)
+sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount()
 {
     sal_Int32 nCount = 0;
     for( const auto& pEntry : maEntryVector )
@@ -241,7 +241,7 @@ sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException)
 }
 
 
-Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException)
+Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index )
 {
     for( const auto& pEntry : maEntryVector )
     {
@@ -260,7 +260,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index )
 }
 
 
-Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex )
 {
     for( const auto& pEntry : maEntryVector )
     {
@@ -274,7 +274,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl
 }
 
 
-void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     const int nEntryCount = maEntryVector.size();
     for( int nEntry = 0; nEntry < nEntryCount; nEntry++ )
@@ -304,7 +304,7 @@ void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (Ind
 }
 
 
-bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     const int nEntryCount = maEntryVector.size();
     for( int nEntry = 0; nEntry < nEntryCount; nEntry++ )
@@ -1397,8 +1397,8 @@ public:
     ToolbarPopupStatusListener( const css::uno::Reference< css::frame::XFrame >& xFrame,
                                 ToolbarPopup& rToolbarPopup );
 
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
     VclPtr<ToolbarPopup> mpPopup;
 };
@@ -1413,14 +1413,14 @@ ToolbarPopupStatusListener::ToolbarPopupStatusListener(
 }
 
 
-void SAL_CALL ToolbarPopupStatusListener::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolbarPopupStatusListener::dispose()
 {
     mpPopup.clear();
     svt::FrameStatusListener::dispose();
 }
 
 
-void SAL_CALL ToolbarPopupStatusListener::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL ToolbarPopupStatusListener::statusChanged( const css::frame::FeatureStateEvent& Event )
 {
     if( mpPopup )
         mpPopup->statusChanged( Event );
@@ -1464,7 +1464,7 @@ void ToolbarPopup::AddStatusListener( const OUString& rCommandURL )
     mxStatusListener->addStatusListener( rCommandURL );
 }
 
-void ToolbarPopup::statusChanged( const css::frame::FeatureStateEvent& /*Event*/ ) throw ( css::uno::RuntimeException, std::exception )
+void ToolbarPopup::statusChanged( const css::frame::FeatureStateEvent& /*Event*/ )
 {
 }
 
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 2a3e2759b82c..5d472a1b8746 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -129,14 +129,14 @@ void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue,
 }
 
 
-Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext()
 {
     ThrowIfDisposed();
     return this;
 }
 
 
-sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount()
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -145,7 +145,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeExcep
 }
 
 
-Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 i )
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -154,7 +154,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32
 }
 
 
-Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent()
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -169,7 +169,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R
 }
 
 
-sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent()
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -188,21 +188,21 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx
 }
 
 
-sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole()
 {
     ThrowIfDisposed();
     return AccessibleRole::LIST;
 }
 
 
-OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeException, std::exception)
+OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription()
 {
     ThrowIfDisposed();
     return OUString( "ToolbarMenu" );
 }
 
 
-OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, std::exception)
+OUString SAL_CALL ToolbarMenuAcc::getAccessibleName()
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -222,14 +222,14 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, s
 }
 
 
-Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelationSet() throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelationSet()
 {
     ThrowIfDisposed();
     return Reference< XAccessibleRelationSet >();
 }
 
 
-Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet() throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet()
 {
     ThrowIfDisposed();
     ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper();
@@ -248,7 +248,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet(
 }
 
 
-Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale SAL_CALL ToolbarMenuAcc::getLocale()
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -267,7 +267,7 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta
 }
 
 
-void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener )
 {
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -291,7 +291,7 @@ void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAcce
 }
 
 
-void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener )
 {
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -305,7 +305,7 @@ void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XA
 }
 
 
-sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint )
 {
     ThrowIfDisposed();
     const awt::Rectangle aRect( getBounds() );
@@ -316,7 +316,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) thro
 }
 
 
-Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const awt::Point& aPoint )
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -347,7 +347,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const aw
 }
 
 
-awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException, std::exception)
+awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds()
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -364,7 +364,7 @@ awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException, std
 }
 
 
-awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException, std::exception)
+awt::Point SAL_CALL ToolbarMenuAcc::getLocation()
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -373,7 +373,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException, std::
 }
 
 
-awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen()  throw (RuntimeException, std::exception)
+awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen()
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -382,7 +382,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen()  throw (RuntimeExcepti
 }
 
 
-awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException, std::exception)
+awt::Size SAL_CALL ToolbarMenuAcc::getSize()
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -390,28 +390,28 @@ awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException, std::excep
     return awt::Size( aOutSize.Width(), aOutSize.Height() );
 }
 
-void SAL_CALL ToolbarMenuAcc::grabFocus() throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuAcc::grabFocus()
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
     mpParent->mrMenu.GrabFocus();
 }
 
-sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground()
 {
     ThrowIfDisposed();
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetMenuTextColor().GetColor();
     return static_cast<sal_Int32>(nColor);
 }
 
-sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground()
 {
     ThrowIfDisposed();
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetMenuColor().GetColor();
     return static_cast<sal_Int32>(nColor);
 }
 
-void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -419,7 +419,7 @@ void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) thr
     mpParent->selectAccessibleChild( nChildIndex );
 }
 
-sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -427,7 +427,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildInd
 }
 
 
-void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection()
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -435,14 +435,14 @@ void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException
 }
 
 
-void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren()
 {
     ThrowIfDisposed();
     // unsupported due to single selection only
 }
 
 
-sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount()
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -451,7 +451,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (Runt
 }
 
 
-Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -475,7 +475,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sa
 }
 
 
-void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -520,7 +520,7 @@ void SAL_CALL ToolbarMenuAcc::disposing()
     }
 }
 
-void ToolbarMenuAcc::ThrowIfDisposed() throw (DisposedException)
+void ToolbarMenuAcc::ThrowIfDisposed()
 {
     if(rBHelper.bDisposed || rBHelper.bInDispose || !mpParent)
     {
@@ -576,25 +576,25 @@ void SAL_CALL ToolbarMenuEntryAcc::disposing()
 }
 
 
-Reference< XAccessibleContext > SAL_CALL ToolbarMenuEntryAcc::getAccessibleContext() throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > SAL_CALL ToolbarMenuEntryAcc::getAccessibleContext()
 {
     return this;
 }
 
 
-sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleChildCount()
 {
     return 0;
 }
 
 
-Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleChild( sal_Int32 )
 {
     throw IndexOutOfBoundsException();
 }
 
 
-Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent()
 {
     const SolarMutexGuard aSolarGuard;
     Reference< XAccessible > xRet;
@@ -606,7 +606,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() thr
 }
 
 
-sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent()
 {
     const SolarMutexGuard aSolarGuard;
     // The index defaults to -1 to indicate the child does not belong to its
@@ -637,19 +637,19 @@ sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (Runt
 }
 
 
-sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole()
 {
     return AccessibleRole::LIST_ITEM;
 }
 
 
-OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException, std::exception)
+OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription()
 {
     return OUString();
 }
 
 
-OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException, std::exception)
+OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName()
 {
     const SolarMutexGuard aSolarGuard;
     OUString              aRet;
@@ -669,13 +669,13 @@ OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeExcepti
 }
 
 
-Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleRelationSet() throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleRelationSet()
 {
     return Reference< XAccessibleRelationSet >();
 }
 
 
-Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStateSet() throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStateSet()
 {
     const SolarMutexGuard aSolarGuard;
     ::utl::AccessibleStateSetHelper*    pStateSet = new ::utl::AccessibleStateSetHelper;
@@ -701,7 +701,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStat
 }
 
 
-Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale SAL_CALL ToolbarMenuEntryAcc::getLocale()
 {
     Locale aRet( "", "", "" );
 
@@ -718,7 +718,7 @@ Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleCompone
 }
 
 
-void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener )
 {
     const ::osl::MutexGuard aGuard( maMutex );
 
@@ -736,7 +736,7 @@ void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference<
 }
 
 
-void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener )
 {
     const ::osl::MutexGuard aGuard( maMutex );
 
@@ -749,7 +749,7 @@ void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Referenc
 }
 
 
-sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint )
 {
     const awt::Rectangle    aRect( getBounds() );
     const Point             aSize( aRect.Width, aRect.Height );
@@ -759,14 +759,14 @@ sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint )
 }
 
 
-Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( const awt::Point& )
 {
     Reference< XAccessible > xRet;
     return xRet;
 }
 
 
-awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException, std::exception)
+awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds()
 {
     const SolarMutexGuard aSolarGuard;
     awt::Rectangle      aRet;
@@ -789,14 +789,14 @@ awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException
 }
 
 
-awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException, std::exception)
+awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation()
 {
     const awt::Rectangle aRect( getBounds() );
     return awt::Point( aRect.X, aRect.Y );
 }
 
 
-awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeException, std::exception)
+awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen()
 {
     const SolarMutexGuard aSolarGuard;
     awt::Point aRet;
@@ -813,7 +813,7 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeExc
 }
 
 
-awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException, std::exception)
+awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize()
 {
     const awt::Rectangle aRect( getBounds() );
     awt::Size aRet;
@@ -824,17 +824,17 @@ awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException, std::
     return aRet;
 }
 
-void SAL_CALL ToolbarMenuEntryAcc::grabFocus() throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuEntryAcc::grabFocus()
 {
     // nothing to do
 }
 
-sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getForeground(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getForeground(  )
 {
     return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetMenuTextColor().GetColor());
 }
 
-sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getBackground(  )  throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getBackground(  )
 {
     return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetMenuColor().GetColor());
 }
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index 5a43ba8b1cf9..776dd5548886 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -87,10 +87,10 @@ public:
     const css::uno::Reference< css::accessibility::XAccessibleContext >& GetAccessible();
 
     /// @throws css::uno::RuntimeException
-    sal_Int32 getAccessibleChildCount() throw (css::uno::RuntimeException);
+    sal_Int32 getAccessibleChildCount();
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index );
 
     bool HasCheck() const
     {
@@ -122,43 +122,43 @@ public:
 public:
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     DECL_LINK( WindowEventListener, VclWindowEvent&, void );
 
@@ -180,7 +180,7 @@ private:
 
         @throws css::lang::DisposedException
     */
-    void ThrowIfDisposed() throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 };
 
 
@@ -197,34 +197,34 @@ public:
     virtual ~ToolbarMenuEntryAcc() override;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
 private:
     EventListenerVector    mxEventListeners;
@@ -267,20 +267,20 @@ struct ToolbarMenu_Impl
     void fireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
 
     /// @throws css::uno::RuntimeException
-    sal_Int32 getAccessibleChildCount() throw (css::uno::RuntimeException);
+    sal_Int32 getAccessibleChildCount();
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index );
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( Control* pControl, sal_Int32 childIndex );
 
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
-    void selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    void selectAccessibleChild( sal_Int32 nChildIndex );
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
-    bool isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    bool isAccessibleChildSelected( sal_Int32 nChildIndex );
     void clearAccessibleSelection();
 
     ToolbarMenuEntry* implGetEntry( int nEntry ) const;
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 74b955e3b9d9..088060b2fc4e 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -153,7 +153,6 @@ void ValueSetAcc::LoseFocus()
 
 
 uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAccessibleContext()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return this;
@@ -161,7 +160,6 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAcc
 
 
 sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -174,7 +172,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount()
 
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int32 i )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -191,7 +188,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
 
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -206,7 +202,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
 
 
 sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -232,7 +227,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent()
 
 
 sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     return accessibility::AccessibleRole::LIST;
@@ -240,7 +234,6 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
 
 
 OUString SAL_CALL ValueSetAcc::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -251,7 +244,6 @@ OUString SAL_CALL ValueSetAcc::getAccessibleDescription()
 
 
 OUString SAL_CALL ValueSetAcc::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -277,7 +269,6 @@ OUString SAL_CALL ValueSetAcc::getAccessibleName()
 
 
 uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     SolarMutexGuard g;
@@ -307,7 +298,6 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge
 
 
 uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper();
@@ -327,7 +317,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAc
 
 
 lang::Locale SAL_CALL ValueSetAcc::getLocale()
-    throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -347,7 +336,6 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale()
 
 
 void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard (m_aMutex);
@@ -372,7 +360,6 @@ void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< acc
 
 
 void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard (m_aMutex);
@@ -389,7 +376,6 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference<
 
 
 sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const awt::Rectangle    aRect( getBounds() );
@@ -401,7 +387,6 @@ sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint )
 
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleAtPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -424,7 +409,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
 
 
 awt::Rectangle SAL_CALL ValueSetAcc::getBounds()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -442,7 +426,6 @@ awt::Rectangle SAL_CALL ValueSetAcc::getBounds()
 
 
 awt::Point SAL_CALL ValueSetAcc::getLocation()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const awt::Rectangle    aRect( getBounds() );
@@ -456,7 +439,6 @@ awt::Point SAL_CALL ValueSetAcc::getLocation()
 
 
 awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -471,7 +453,6 @@ awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen()
 
 
 awt::Size SAL_CALL ValueSetAcc::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const awt::Rectangle    aRect( getBounds() );
@@ -484,7 +465,6 @@ awt::Size SAL_CALL ValueSetAcc::getSize()
 }
 
 void SAL_CALL ValueSetAcc::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -492,7 +472,6 @@ void SAL_CALL ValueSetAcc::grabFocus()
 }
 
 sal_Int32 SAL_CALL ValueSetAcc::getForeground(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
@@ -500,7 +479,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getForeground(  )
 }
 
 sal_Int32 SAL_CALL ValueSetAcc::getBackground(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
@@ -508,7 +486,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getBackground(  )
 }
 
 void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -525,7 +502,6 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex )
 
 
 sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -542,7 +518,6 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex
 
 
 void SAL_CALL ValueSetAcc::clearAccessibleSelection()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -551,7 +526,6 @@ void SAL_CALL ValueSetAcc::clearAccessibleSelection()
 
 
 void SAL_CALL ValueSetAcc::selectAllAccessibleChildren()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // unsupported due to single selection only
@@ -559,7 +533,6 @@ void SAL_CALL ValueSetAcc::selectAllAccessibleChildren()
 
 
 sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -578,7 +551,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount()
 
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -597,7 +569,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc
 
 
 void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
@@ -608,7 +579,7 @@ void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
 }
 
 
-sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
 
@@ -689,7 +660,6 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const
 
 
 void ValueSetAcc::ThrowIfDisposed()
-    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -774,28 +744,24 @@ ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInter
 
 
 uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAccessibleContext()
-    throw (uno::RuntimeException, std::exception)
 {
     return this;
 }
 
 
 sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     return 0;
 }
 
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleChild( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     throw lang::IndexOutOfBoundsException();
 }
 
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     uno::Reference< accessibility::XAccessible >    xRet;
@@ -808,7 +774,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl
 
 
 sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     // The index defaults to -1 to indicate the child does not belong to its
@@ -858,21 +823,18 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent()
 
 
 sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     return accessibility::AccessibleRole::LIST_ITEM;
 }
 
 
 OUString SAL_CALL ValueItemAcc::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString();
 }
 
 
 OUString SAL_CALL ValueItemAcc::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     OUString aRet;
@@ -894,14 +856,12 @@ OUString SAL_CALL ValueItemAcc::getAccessibleName()
 
 
 uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< accessibility::XAccessibleRelationSet >();
 }
 
 
 uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     ::utl::AccessibleStateSetHelper*    pStateSet = new ::utl::AccessibleStateSetHelper;
@@ -932,7 +892,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA
 
 
 lang::Locale SAL_CALL ValueItemAcc::getLocale()
-    throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     uno::Reference< accessibility::XAccessible >    xParent( getAccessibleParent() );
@@ -951,7 +910,6 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale()
 
 
 void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
 
@@ -975,7 +933,6 @@ void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< ac
 
 
 void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     const ::osl::MutexGuard aGuard( maMutex );
 
@@ -991,7 +948,6 @@ void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference<
 
 
 sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     const awt::Rectangle    aRect( getBounds() );
     const Point             aSize( aRect.Width, aRect.Height );
@@ -1001,14 +957,12 @@ sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint )
 }
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleAtPoint( const awt::Point& )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< accessibility::XAccessible > xRet;
     return xRet;
 }
 
 awt::Rectangle SAL_CALL ValueItemAcc::getBounds()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     awt::Rectangle      aRet;
@@ -1031,7 +985,6 @@ awt::Rectangle SAL_CALL ValueItemAcc::getBounds()
 }
 
 awt::Point SAL_CALL ValueItemAcc::getLocation()
-    throw (uno::RuntimeException, std::exception)
 {
     const awt::Rectangle    aRect( getBounds() );
     awt::Point              aRet;
@@ -1043,7 +996,6 @@ awt::Point SAL_CALL ValueItemAcc::getLocation()
 }
 
 awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aSolarGuard;
     awt::Point          aRet;
@@ -1061,7 +1013,6 @@ awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen()
 }
 
 awt::Size SAL_CALL ValueItemAcc::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     const awt::Rectangle    aRect( getBounds() );
     awt::Size               aRet;
@@ -1073,20 +1024,17 @@ awt::Size SAL_CALL ValueItemAcc::getSize()
 }
 
 void SAL_CALL ValueItemAcc::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing to do
 }
 
 sal_Int32 SAL_CALL ValueItemAcc::getForeground(  )
-    throw (uno::RuntimeException, std::exception)
 {
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor();
     return static_cast<sal_Int32>(nColor);
 }
 
 sal_Int32 SAL_CALL ValueItemAcc::getBackground(  )
-    throw (uno::RuntimeException, std::exception)
 {
     sal_uInt32 nColor;
     if (mpParent && mpParent->meType == VALUESETITEM_COLOR)
@@ -1096,7 +1044,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getBackground(  )
     return static_cast<sal_Int32>(nColor);
 }
 
-sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
 
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 3a05b9a5656c..b791b4243672 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -104,46 +104,46 @@ public:
     void LoseFocus();
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
 
 private:
     ::std::vector< css::uno::Reference<
@@ -180,8 +180,7 @@ private:
         foul deed.
         @throws css::lang::DisposedException
     */
-    void ThrowIfDisposed()
-        throw (css::lang::DisposedException);
+    void ThrowIfDisposed();
 
     /** Check whether the value set has a 'none' field, i.e. a field (button)
         that deselects any items (selects none of them).
@@ -222,37 +221,37 @@ public:
 public:
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
 };
 
 #endif // INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx
index 4185be0ab2f8..1967f4ba4092 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -68,13 +68,13 @@ VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar()
 // XServiceInfo
 
 
-::rtl::OUString VCLXAccessibleHeaderBar::getImplementationName() throw (RuntimeException, std::exception)
+::rtl::OUString VCLXAccessibleHeaderBar::getImplementationName()
 {
     return OUString( "com.sun.star.comp.toolkit.AccessibleHeaderBar" );
 }
 
 
-Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames()
 {
     Sequence<OUString> aNames { "com.sun.star.awt.AccessibleHeaderBar" };
     return aNames;
@@ -83,7 +83,6 @@ Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames()
 // =======XAccessibleContext=======
 
 sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -94,7 +93,7 @@ sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount(  )
     return nCount;
 }
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i )  throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+        VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i )
 {
     SolarMutexGuard g;
 
@@ -114,7 +113,7 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
     return xChild;
 }
 
-sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole(  )
 {
     return css::accessibility::AccessibleRole::LIST;
 }
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index 3d7ed2a610dc..3885b0111e55 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -77,7 +77,7 @@ void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSe
 }
 
 // OCommonAccessibleComponent
-awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() throw (RuntimeException)
+awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds()
 {
     awt::Rectangle aBounds;
     OExternalLockGuard aGuard( this );
@@ -102,24 +102,24 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, OAccessibleExtend
 
 
 // XServiceInfo
-OUString VCLXAccessibleHeaderBarItem::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleHeaderBarItem::getImplementationName()
 {
     return OUString("com.sun.star.comp.svtools.AccessibleHeaderBarItem");
 }
 
-sal_Bool VCLXAccessibleHeaderBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool VCLXAccessibleHeaderBarItem::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService( this, rServiceName );
 }
 
-Sequence< OUString > VCLXAccessibleHeaderBarItem::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleHeaderBarItem::getSupportedServiceNames()
 {
     Sequence< OUString > aNames { "com.sun.star.awt.AccessibleHeaderBarItem" };
     return aNames;
 }
 
 // XAccessible
-Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContext() throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContext()
 {
     OExternalLockGuard aGuard( this );
 
@@ -130,7 +130,7 @@ Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContex
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -138,7 +138,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeE
 }
 
 
-Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -149,7 +149,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_In
 }
 
 
-Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() throw (RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent()
 {
     OExternalLockGuard aGuard( this );
 
@@ -163,14 +163,14 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() thro
 }
 
 
-sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent()
 {
     OExternalLockGuard aGuard( this );
     return m_nIndexInParent - 1;
 }
 
 
-sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole()
 {
     OExternalLockGuard aGuard( this );
 
@@ -178,7 +178,7 @@ sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeExcepti
 }
 
 
-OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription()
 {
     OExternalLockGuard aGuard( this );
     OUString sDescription;
@@ -186,7 +186,7 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeE
 }
 
 
-OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleHeaderBarItem::getAccessibleName()
 {
     OExternalLockGuard aGuard( this );
 
@@ -197,7 +197,7 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeExceptio
 }
 
 
-Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRelationSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -207,7 +207,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRe
 }
 
 
-Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -227,7 +227,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleState
 }
 
 
-css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale()
 {
     OExternalLockGuard aGuard( this );
 
@@ -238,7 +238,7 @@ css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessi
 // XAccessibleComponent
 
 
-Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception)
+Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( const awt::Point& )
 {
     OExternalLockGuard aGuard( this );
 
@@ -246,7 +246,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( cons
 }
 
 
-sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleHeaderBarItem::getForeground()
 {
     OExternalLockGuard aGuard( this );
 
@@ -255,7 +255,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException,
 }
 
 
-sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleHeaderBarItem::getBackground()
 {
     OExternalLockGuard aGuard( this );
 
@@ -267,7 +267,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException,
 // XAccessibleExtendedComponent
 
 
-Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeException, std::exception)
+Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont()
 {
     OExternalLockGuard aGuard( this );
 
@@ -276,7 +276,7 @@ Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeExc
 }
 
 
-OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleHeaderBarItem::getTitledBorderText()
 {
     OExternalLockGuard aGuard( this );
 
@@ -285,7 +285,7 @@ OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeExcept
 }
 
 
-OUString VCLXAccessibleHeaderBarItem::getToolTipText() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleHeaderBarItem::getToolTipText()
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 7675a594dc31..a3d91ce6e47d 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -83,34 +83,23 @@ public:
     virtual void SAL_CALL release() throw() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const uno::Sequence< uno::Any > & aArguments )
-        throw ( uno::Exception, uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const uno::Sequence< uno::Any > & aArguments ) 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;
 
     // XPropertyAccess
-    virtual uno::Sequence< beans::PropertyValue > SAL_CALL getPropertyValues()
-        throw ( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps )
-        throw ( beans::UnknownPropertyException, beans::PropertyVetoException,
-                lang::IllegalArgumentException, lang::WrappedTargetException,
-                uno::RuntimeException, std::exception ) override;
+    virtual uno::Sequence< beans::PropertyValue > SAL_CALL getPropertyValues() override;
+    virtual void SAL_CALL setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps ) override;
 
     // XExecuteDialog
-    virtual sal_Int16 SAL_CALL execute()
-        throw ( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw ( uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL execute() override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const uno::Reference< lang::XComponent >& xDoc )
-        throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setSourceDocument( const uno::Reference< lang::XComponent >& xDoc ) override;
 
 };
 
@@ -134,23 +123,19 @@ void SAL_CALL SvFilterOptionsDialog::release() throw()
 
 // XInitialization
 void SAL_CALL SvFilterOptionsDialog::initialize( const uno::Sequence< uno::Any > & )
-    throw ( uno::Exception, uno::RuntimeException, std::exception )
 {
 }
 
 // XServiceInfo
 OUString SAL_CALL SvFilterOptionsDialog::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.svtools.SvFilterOptionsDialog" );
 }
 sal_Bool SAL_CALL SvFilterOptionsDialog::supportsService( const OUString& rServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" };
     return aRet;
@@ -158,7 +143,6 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog::getSupportedServiceNam
 
 // XPropertyAccess
 uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues()
-        throw ( uno::RuntimeException, std::exception )
 {
     sal_Int32 i, nCount;
     for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
@@ -176,9 +160,6 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues()
 }
 
 void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps )
-        throw ( beans::UnknownPropertyException, beans::PropertyVetoException,
-                lang::IllegalArgumentException, lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     maMediaDescriptor = aProps;
 
@@ -198,13 +179,11 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope
 
 // XExecutableDialog
 void SvFilterOptionsDialog::setTitle( const OUString& aTitle )
-    throw ( uno::RuntimeException, std::exception )
 {
     maDialogTitle = aTitle;
 }
 
 sal_Int16 SvFilterOptionsDialog::execute()
-    throw ( uno::RuntimeException, std::exception )
 {
     sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
 
@@ -251,7 +230,6 @@ sal_Int16 SvFilterOptionsDialog::execute()
 
 // XEmporter
 void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc )
-        throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     mxSourceDocument = xDoc;
 
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index ca4b4346c5db..22e8285cae37 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -154,7 +154,6 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL )
 
 
 uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Any aAny;
 
@@ -176,7 +175,6 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType )
 
 
 uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     return OWeakAggObject::queryInterface( rType );
 }
@@ -197,27 +195,23 @@ void SAL_CALL GraphicDescriptor::release()
 
 
 OUString SAL_CALL GraphicDescriptor::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.graphic.GraphicDescriptor"  );
 }
 
 sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
 uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.graphic.GraphicDescriptor" };
 }
 
 
 uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< uno::Type >  aTypes( 6 );
     uno::Type*                  pTypes = aTypes.getArray();
@@ -233,7 +227,6 @@ uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -265,17 +258,12 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
 
 
 void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** /*ppEntries*/, const uno::Any* /*pValues*/ )
-    throw( beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-              lang::WrappedTargetException )
 {
     // we only have readonly attributes
 }
 
 
 void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx
index 029a1d8520f5..4878ceef5b2d 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -79,23 +79,23 @@ protected:
     static ::comphelper::PropertySetInfo* createPropertySetInfo();
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // PropertySetHelper
-     virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
-     virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+     virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override;
+     virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override;
 
 private:
 
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index 91d784775d24..b156d6123384 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -50,7 +50,6 @@ void Graphic::init( const ::Graphic& rGraphic )
 
 
 uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Any aAny;
     if( rType == cppu::UnoType<graphic::XGraphic>::get())
@@ -67,7 +66,6 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType )
 
 
 uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     css::uno::Any aReturn = ::unographic::GraphicDescriptor::queryInterface( rType );
     if ( !aReturn.hasValue() )
@@ -89,19 +87,16 @@ void SAL_CALL Graphic::release() throw()
 }
 
 OUString SAL_CALL Graphic::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.graphic.Graphic" );
 }
 
 sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString >    aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() );
     uno::Sequence< OUString >    aNew { "com.sun.star.graphic.Graphic" };
@@ -116,7 +111,6 @@ uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames()
 }
 
 uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type >  aRet( ::unographic::GraphicDescriptor::getTypes() );
     sal_Int32                   nOldCount = aRet.getLength();
@@ -130,14 +124,12 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes()
 
 
 uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
-    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 
 sal_Int8 SAL_CALL Graphic::getType()
-     throw (uno::RuntimeException, std::exception)
 {
     sal_Int8 cRet = graphic::GraphicType::EMPTY;
 
@@ -158,7 +150,7 @@ sal_Int8 SAL_CALL Graphic::getType()
 
 // XBitmap
 
-awt::Size SAL_CALL Graphic::getSize() throw (uno::RuntimeException, std::exception)
+awt::Size SAL_CALL Graphic::getSize()
 {
     SolarMutexGuard aGuard;
 
@@ -171,7 +163,7 @@ awt::Size SAL_CALL Graphic::getSize() throw (uno::RuntimeException, std::excepti
 }
 
 
-uno::Sequence<sal_Int8> SAL_CALL Graphic::getDIB() throw (uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL Graphic::getDIB()
 {
     SolarMutexGuard aGuard;
 
@@ -189,7 +181,7 @@ uno::Sequence<sal_Int8> SAL_CALL Graphic::getDIB() throw (uno::RuntimeException,
 }
 
 
-uno::Sequence<sal_Int8> SAL_CALL Graphic::getMaskDIB() throw (uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL Graphic::getMaskDIB()
 {
     SolarMutexGuard aGuard;
 
@@ -216,7 +208,6 @@ const ::Graphic* Graphic::getImplementation( const uno::Reference< uno::XInterfa
 
 
 sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw( uno::RuntimeException, std::exception )
 {
     return( ( rId.getLength() == 16 && 0 == memcmp( ::Graphic::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ?
             reinterpret_cast<sal_Int64>(&maGraphic) : 0 );
diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx
index e097c5a8fe24..285cb5f10051 100644
--- a/svtools/source/graphic/graphic.hxx
+++ b/svtools/source/graphic/graphic.hxx
@@ -51,30 +51,30 @@ public:
 protected:
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XGraphic
-    virtual ::sal_Int8 SAL_CALL getType(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int8 SAL_CALL getType(  ) override;
 
     // XBitmap
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getDIB(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getMaskDIB(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getDIB(  ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getMaskDIB(  ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
 
 private:
 
diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx
index fa2c98043c70..5a2132bf6bab 100644
--- a/svtools/source/graphic/graphicunofactory.cxx
+++ b/svtools/source/graphic/graphicunofactory.cxx
@@ -40,34 +40,31 @@ class GObjectImpl : public GObjectAccess_BASE
      std::unique_ptr< GraphicObject > mpGObject;
 public:
     /// @throws uno::RuntimeException
-    explicit GObjectImpl(uno::Sequence< uno::Any > const & args) throw (uno::RuntimeException, std::exception);
+    explicit GObjectImpl(uno::Sequence< uno::Any > const & args);
 
      // XGraphicObject
-    virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) throw (uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getUniqueID() throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() override;
+    virtual void SAL_CALL setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) override;
+    OUString SAL_CALL getUniqueID() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("com.sun.star.graphic.GraphicObject");
     }
 
-    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
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         uno::Sequence<OUString> aRet { "com.sun.star.graphic.GraphicObject" };
         return aRet;
     }
 };
 
-GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) throw (uno::RuntimeException, std::exception)
+GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args)
 {
     if ( args.getLength() == 1 )
     {
@@ -81,7 +78,7 @@ GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) throw (uno::Runt
        mpGObject.reset( new GraphicObject() );
 }
 
-uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() throw (uno::RuntimeException, std::exception)
+uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !mpGObject.get() )
@@ -89,7 +86,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() throw (un
     return mpGObject->GetGraphic().GetXGraphic();
 }
 
-void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic >& _graphic )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !mpGObject.get() )
@@ -98,7 +95,7 @@ void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic >
     mpGObject->SetGraphic( aGraphic );
 }
 
-OUString SAL_CALL GObjectImpl::getUniqueID() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL GObjectImpl::getUniqueID()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     OUString sId;
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 87fffe6611c8..7b4293631970 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -66,18 +66,18 @@ public:
 protected:
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XGraphicProvider
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL queryGraphic( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL storeGraphic( const css::uno::Reference< css::graphic::XGraphic >& Graphic, const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL queryGraphic( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) override;
+    virtual void SAL_CALL storeGraphic( const css::uno::Reference< css::graphic::XGraphic >& Graphic, const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) override;
 
 private:
 
@@ -94,26 +94,22 @@ GraphicProvider::GraphicProvider()
 }
 
 OUString SAL_CALL GraphicProvider::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.graphic.GraphicProvider" );
 }
 
 sal_Bool SAL_CALL GraphicProvider::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL GraphicProvider::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSeq { "com.sun.star.graphic.GraphicProvider" };
     return aSeq;
 }
 
 uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type >  aTypes( 3 );
     uno::Type*                  pTypes = aTypes.getArray();
@@ -126,7 +122,6 @@ uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId()
-    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -300,7 +295,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O
 
 
 uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDescriptor( const uno::Sequence< beans::PropertyValue >& rMediaProperties )
-    throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Reference< beans::XPropertySet > xRet;
 
@@ -372,7 +366,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc
 
 
 uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( const uno::Sequence< ::beans::PropertyValue >& rMediaProperties )
-    throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Reference< ::graphic::XGraphic >   xRet;
     OUString                                aPath;
@@ -714,7 +707,6 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
 
 
 void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties )
-    throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 09fc338e687e..ee9444c92bc7 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -60,26 +60,26 @@ public:
     GraphicRendererVCL();
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // PropertySetHelper
-    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
-    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override;
+    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override;
+    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override;
 
     // XGraphicRenderer
-    virtual void SAL_CALL render( const css::uno::Reference< css::graphic::XGraphic >& Graphic ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL render( const css::uno::Reference< css::graphic::XGraphic >& Graphic ) override;
 
 private:
 
@@ -97,7 +97,6 @@ GraphicRendererVCL::GraphicRendererVCL() :
 }
 
 uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Any aAny;
 
@@ -121,7 +120,6 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType
 
 
 uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     return OWeakAggObject::queryInterface( rType );
 }
@@ -142,20 +140,17 @@ void SAL_CALL GraphicRendererVCL::release()
 
 
 OUString SAL_CALL GraphicRendererVCL::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" );
 }
 
 sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
 uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSeq { "com.sun.star.graphic.GraphicRendererVCL" };
     return aSeq;
@@ -163,7 +158,6 @@ uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames(
 
 
 uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< uno::Type >  aTypes( 7 );
     uno::Type*                  pTypes = aTypes.getArray();
@@ -180,7 +174,6 @@ uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -207,10 +200,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
 
 
 void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues )
-    throw( beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-              lang::WrappedTargetException )
 {
     SolarMutexGuard aGuard;
 
@@ -261,7 +250,6 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry*
 
 
 void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException )
 {
     SolarMutexGuard aGuard;
 
@@ -299,7 +287,6 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry*
 
 
 void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphic >& rxGraphic )
-    throw (uno::RuntimeException, std::exception)
 {
     if( mpOutDev && mxDevice.is() && rxGraphic.is() )
     {
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 4375caeb4efa..4caf4692d712 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -72,7 +72,6 @@ void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, sal_Int
 // XGraphicTransformer
 uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange(
     const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo )
-        throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     const uno::Reference< uno::XInterface > xIFace( rxGraphic, uno::UNO_QUERY );
     ::Graphic aGraphic( *::unographic::Graphic::getImplementation( xIFace ) );
@@ -136,7 +135,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange(
 
 uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyDuotone(
     const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorOne, sal_Int32 nColorTwo )
-        throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     const uno::Reference< uno::XInterface > xIFace( rxGraphic, uno::UNO_QUERY );
     ::Graphic aGraphic( *::unographic::Graphic::getImplementation( xIFace ) );
@@ -156,7 +154,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyDuotone(
 
 uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyBrightnessContrast(
     const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso )
-        throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     const uno::Reference< uno::XInterface > xIFace( rxGraphic, uno::UNO_QUERY );
     ::Graphic aGraphic( *::unographic::Graphic::getImplementation( xIFace ) );
diff --git a/svtools/source/graphic/transformer.hxx b/svtools/source/graphic/transformer.hxx
index 2d7376afa024..bb93a5aeef4e 100644
--- a/svtools/source/graphic/transformer.hxx
+++ b/svtools/source/graphic/transformer.hxx
@@ -40,18 +40,15 @@ class GraphicTransformer : public GraphicTransformer_UnoImplHelper1
     // XGraphicTransformer
     virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL colorChange(
         const css::uno::Reference< css::graphic::XGraphic >& rGraphic,
-        sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo ) override;
 
     virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL applyDuotone(
         const css::uno::Reference< css::graphic::XGraphic >& rGraphic,
-        sal_Int32 nColorOne, sal_Int32 nColorTwo )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nColorOne, sal_Int32 nColorTwo ) override;
 
     virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL applyBrightnessContrast(
         const css::uno::Reference< css::graphic::XGraphic >& rxGraphic,
-        sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso ) override;
 
 };
 
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index aafcd7fa437b..eb51dfb8b8ac 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -58,14 +58,14 @@ public:
     virtual ~ODocumentCloser() override;
 
 // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 class MainThreadFrameCloserRequest
@@ -177,7 +177,6 @@ ODocumentCloser::~ODocumentCloser()
 // XComponent
 
 void SAL_CALL ODocumentCloser::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -201,7 +200,6 @@ void SAL_CALL ODocumentCloser::dispose()
 
 
 void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
@@ -215,7 +213,6 @@ void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEv
 
 
 void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pListenersContainer )
@@ -224,19 +221,16 @@ void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang::
 
 // XServiceInfo
 OUString SAL_CALL ODocumentCloser::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.embed.DocumentCloser" );
 }
 
 sal_Bool SAL_CALL ODocumentCloser::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     const OUString aServiceName( "com.sun.star.embed.DocumentCloser" );
     return uno::Sequence< OUString >( &aServiceName, 1 );
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index e7216d25f256..8e0faf1f4994 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -109,7 +109,6 @@ void VCLXHatchWindow::InplaceDeactivate()
 
 
 uno::Any SAL_CALL VCLXHatchWindow::queryInterface( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     // Attention:
     //    Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -138,7 +137,6 @@ void SAL_CALL VCLXHatchWindow::release()
 }
 
 uno::Sequence< uno::Type > SAL_CALL VCLXHatchWindow::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static ::cppu::OTypeCollection* pTypeCollection = nullptr ;
 
@@ -160,17 +158,16 @@ uno::Sequence< uno::Type > SAL_CALL VCLXHatchWindow::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL VCLXHatchWindow::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-css::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize() throw (css::uno::RuntimeException, std::exception)
+css::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize()
 {
     return aHatchBorderSize;
 }
 
-void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchbordersize ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchbordersize )
 {
     if ( pHatchWindow )
     {
@@ -180,26 +177,22 @@ void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchb
 }
 
 void SAL_CALL VCLXHatchWindow::setController( const uno::Reference< embed::XHatchWindowController >& xController )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xController = xController;
 }
 
 void SAL_CALL VCLXHatchWindow::dispose()
-    throw (uno::RuntimeException, std::exception)
 {
     pHatchWindow.clear();
     VCLXWindow::dispose();
 }
 
 void SAL_CALL VCLXHatchWindow::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     VCLXWindow::addEventListener( xListener );
 }
 
 void SAL_CALL VCLXHatchWindow::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw (uno::RuntimeException, std::exception)
 {
     VCLXWindow::removeEventListener( xListener );
 }
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index f25c806cae9e..8aee772ca732 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -39,19 +39,18 @@ public:
     OHatchWindowFactory() {}
 
     // XHatchWindowFactory
-    virtual uno::Reference< embed::XHatchWindow > SAL_CALL createHatchWindowInstance( const uno::Reference< awt::XWindowPeer >& xParent, const awt::Rectangle& aBounds, const awt::Size& aSize ) throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Reference< embed::XHatchWindow > SAL_CALL createHatchWindowInstance( const uno::Reference< awt::XWindowPeer >& xParent, const awt::Rectangle& aBounds, const awt::Size& aSize ) 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;
 };
 
 uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchWindowInstance(
                 const uno::Reference< awt::XWindowPeer >& xParent,
                 const awt::Rectangle& aBounds,
                 const awt::Size& aHandlerSize )
-    throw (uno::RuntimeException, std::exception)
 {
     if ( !xParent.is() )
         throw lang::IllegalArgumentException(); // TODO
@@ -63,19 +62,16 @@ uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchW
 }
 
 OUString SAL_CALL OHatchWindowFactory::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.embed.HatchWindowFactory" );
 }
 
 sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(2);
     aRet[0] = "com.sun.star.embed.HatchWindowFactory";
diff --git a/svtools/source/inc/hatchwindow.hxx b/svtools/source/inc/hatchwindow.hxx
index e33660fe2edf..e60fac6ccf0b 100644
--- a/svtools/source/inc/hatchwindow.hxx
+++ b/svtools/source/inc/hatchwindow.hxx
@@ -48,23 +48,23 @@ public:
     void Deactivated();
 
     // XInterface
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
     void SAL_CALL acquire() throw() override;
     void SAL_CALL release() throw() override;
 
     // XTypeProvider
-    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // XHatchWindow
-    virtual void SAL_CALL setController( const css::uno::Reference< css::embed::XHatchWindowController >& xController ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getHatchBorderSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHatchBorderSize( const css::awt::Size& _hatchbordersize ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setController( const css::uno::Reference< css::embed::XHatchWindowController >& xController ) override;
+    virtual css::awt::Size SAL_CALL getHatchBorderSize() override;
+    virtual void SAL_CALL setHatchBorderSize( const css::awt::Size& _hatchbordersize ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 };
 
 #endif // INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOW_HXX
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index fbf987aa11cd..ed22a03a884d 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -64,46 +64,46 @@ public:
                     virtual ~VCLXMultiLineEdit() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                           SAL_CALL acquire() throw() override  { VCLXWindow::acquire(); }
     void                           SAL_CALL release() throw() override  { VCLXWindow::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XTextComponent
-    void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getSelectedText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Selection SAL_CALL getSelection(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isEditable(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getMaxTextLen(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
+    void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
+    void SAL_CALL setText( const OUString& aText ) override;
+    void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    OUString SAL_CALL getSelectedText(  ) override;
+    void SAL_CALL setSelection( const css::awt::Selection& aSelection ) override;
+    css::awt::Selection SAL_CALL getSelection(  ) override;
+    sal_Bool SAL_CALL isEditable(  ) override;
+    void SAL_CALL setEditable( sal_Bool bEditable ) override;
+    void SAL_CALL setMaxTextLen( sal_Int16 nLen ) override;
+    sal_Int16 SAL_CALL getMaxTextLen(  ) override;
 
     //XTextArea
-    OUString SAL_CALL getTextLines(  ) throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getTextLines(  ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::awt::XTextLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     // css::awt::XWindow
-    void SAL_CALL setFocus(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setFocus(  ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -126,38 +126,38 @@ public:
     virtual void SetWindow( const VclPtr< vcl::Window > &pWindow ) override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                           SAL_CALL acquire() throw() override  { VCLXWindow::acquire(); }
     void                           SAL_CALL release() throw() override  { VCLXWindow::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XTextComponent
-    void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getSelectedText(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Selection SAL_CALL getSelection(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isEditable(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getMaxTextLen(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
+    void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
+    void SAL_CALL setText( const OUString& aText ) override;
+    void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    OUString SAL_CALL getSelectedText(  ) override;
+    void SAL_CALL setSelection( const css::awt::Selection& aSelection ) override;
+    css::awt::Selection SAL_CALL getSelection(  ) override;
+    sal_Bool SAL_CALL isEditable(  ) override;
+    void SAL_CALL setEditable( sal_Bool bEditable ) override;
+    void SAL_CALL setMaxTextLen( sal_Int16 nLen ) override;
+    sal_Int16 SAL_CALL getMaxTextLen(  ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::awt::XTextLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
 
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -180,8 +180,8 @@ public:
     virtual ~SVTXFormattedField() override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
 protected:
     void    setFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier > & xSupplier);
@@ -250,24 +250,24 @@ protected:
 public:
     SVTXRoadmap();
 
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { VCLXWindow::disposing( Source ); }
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override { VCLXWindow::disposing( Source ); }
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
 
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     // XContainerListener
-    void SAL_CALL elementInserted( const css::container::ContainerEvent& rEvent )throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL elementRemoved( const css::container::ContainerEvent& rEvent )throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL elementReplaced( const css::container::ContainerEvent& rEvent )throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL elementInserted( const css::container::ContainerEvent& rEvent ) override;
+    void SAL_CALL elementRemoved( const css::container::ContainerEvent& rEvent ) override;
+    void SAL_CALL elementReplaced( const css::container::ContainerEvent& rEvent ) override;
 
     // XItemEventBroadcaster
-    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
 protected:
 
@@ -288,31 +288,31 @@ public:
                     virtual ~SVTXNumericField() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                           SAL_CALL acquire() throw() override  { SVTXFormattedField::acquire(); }
     void                           SAL_CALL release() throw() override  { SVTXFormattedField::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XNumericField
-    void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getValue(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getSpinSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDecimalDigits(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setValue( double Value ) override;
+    double SAL_CALL getValue(  ) override;
+    void SAL_CALL setMin( double Value ) override;
+    double SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( double Value ) override;
+    double SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( double Value ) override;
+    double SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( double Value ) override;
+    double SAL_CALL getLast(  ) override;
+    void SAL_CALL setSpinSize( double Value ) override;
+    double SAL_CALL getSpinSize(  ) override;
+    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
+    sal_Int16 SAL_CALL getDecimalDigits(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override;
 };
@@ -327,35 +327,35 @@ public:
                     virtual ~SVTXCurrencyField() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                           SAL_CALL acquire() throw() override  { SVTXFormattedField::acquire(); }
     void                           SAL_CALL release() throw() override  { SVTXFormattedField::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     // css::awt::XCurrencyField
-    void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getValue(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMin(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getMax(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getFirst(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getLast(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override;
-    double SAL_CALL getSpinSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Int16 SAL_CALL getDecimalDigits(  ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isStrictFormat(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setValue( double Value ) override;
+    double SAL_CALL getValue(  ) override;
+    void SAL_CALL setMin( double Value ) override;
+    double SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( double Value ) override;
+    double SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( double Value ) override;
+    double SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( double Value ) override;
+    double SAL_CALL getLast(  ) override;
+    void SAL_CALL setSpinSize( double Value ) override;
+    double SAL_CALL getSpinSize(  ) override;
+    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
+    sal_Int16 SAL_CALL getDecimalDigits(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -380,24 +380,24 @@ public:
                     virtual ~VCLXProgressBar() override;
 
     // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                           SAL_CALL acquire() throw() override  { VCLXWindow::acquire(); }
     void                           SAL_CALL release() throw() override  { VCLXWindow::release(); }
 
     // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     // css::awt::XProgressBar
-    void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception ) override;
-    sal_Int32 SAL_CALL getValue() throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setForegroundColor( sal_Int32 nColor ) override;
+    void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override;
+    void SAL_CALL setValue( sal_Int32 nValue ) override;
+    void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) override;
+    sal_Int32 SAL_CALL getValue() override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
@@ -413,7 +413,7 @@ public:
                     virtual ~SVTXDateField() override;
 
     // css::awt::VclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx
index 82b76e34acac..abc1f94d8ec9 100644
--- a/svtools/source/java/javacontext.cxx
+++ b/svtools/source/java/javacontext.cxx
@@ -39,7 +39,6 @@ JavaContext::~JavaContext()
 }
 
 Any SAL_CALL JavaContext::queryInterface(const Type& aType )
-    throw (RuntimeException, std::exception)
 {
     if (aType == cppu::UnoType<XInterface>::get())
         return Any(Reference<XInterface>(static_cast<XInterface*>(this)));
@@ -59,7 +58,7 @@ void SAL_CALL JavaContext::release(  ) throw ()
         delete this;
 }
 
-Any SAL_CALL JavaContext::getValueByName( const OUString& Name) throw (RuntimeException, std::exception)
+Any SAL_CALL JavaContext::getValueByName( const OUString& Name)
 {
     Any retVal;
 
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index 860f3e07971b..41e61413c0af 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -62,7 +62,6 @@ JavaInteractionHandler::~JavaInteractionHandler()
 }
 
 Any SAL_CALL JavaInteractionHandler::queryInterface(const Type& aType )
-    throw (RuntimeException, std::exception)
 {
     if (aType == cppu::UnoType<XInterface>::get())
         return Any( static_cast<XInterface*>(this), aType);
@@ -83,7 +82,7 @@ void SAL_CALL JavaInteractionHandler::release(  ) throw ()
 }
 
 
-void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionRequest >& Request ) throw (RuntimeException, std::exception)
+void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionRequest >& Request )
 {
     Any anyExc = Request->getRequest();
     Sequence< Reference< XInteractionContinuation > > aSeqCont = Request->getContinuations();
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index bec1e4f5a292..e06aa584856c 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -64,7 +64,7 @@ class AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEventListener>
         void execAsync();
     private:
 
-        virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing(const css::lang::EventObject&) override
         {
             m_xFrame->removeEventListener(this);
             m_xFrame.clear();
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index 9720e16bf5f6..190048eba6e8 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.cxx
@@ -40,13 +40,11 @@ TransferableClipboardListener::~TransferableClipboardListener()
 }
 
 void SAL_CALL TransferableClipboardListener::disposing( const lang::EventObject& )
-                                                        throw(uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL TransferableClipboardListener::changedContents(
                             const datatransfer::clipboard::ClipboardEvent& rEventObject )
-                                                        throw(uno::RuntimeException, std::exception)
 {
     if ( aLink.IsSet() )
     {
diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx
index 7f4cbdd9f5c5..c9e4c095e4e2 100644
--- a/svtools/source/misc/dialogclosedlistener.cxx
+++ b/svtools/source/misc/dialogclosedlistener.cxx
@@ -37,7 +37,7 @@ namespace svt
     }
 
     // XDialogClosedListener methods
-    void SAL_CALL DialogClosedListener::dialogClosed( const DialogClosedEvent& aEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL DialogClosedListener::dialogClosed( const DialogClosedEvent& aEvent )
     {
         if ( m_aDialogClosedLink.IsSet() )
         {
@@ -47,7 +47,7 @@ namespace svt
     }
 
     // XEventListener methods
-    void SAL_CALL DialogClosedListener::disposing( const EventObject& ) throw(RuntimeException, std::exception)
+    void SAL_CALL DialogClosedListener::disposing( const EventObject& )
     {
         m_aDialogClosedLink = Link<css::ui::dialogs::DialogClosedEvent*,void>();
     }
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index ac3f498eeb9c..fc8c2ff5cbb6 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -72,16 +72,13 @@ public:
 
     static EmbedEventListener_Impl* Create( EmbeddedObjectRef* );
 
-    virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState )
-                                    throw (embed::WrongStateException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState )
-                                    throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership )
-                                    throw (util::CloseVetoException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+    virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+    virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) override;
+    virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 };
 
 EmbedEventListener_Impl* EmbedEventListener_Impl::Create( EmbeddedObjectRef* p )
@@ -118,15 +115,12 @@ EmbedEventListener_Impl* EmbedEventListener_Impl::Create( EmbeddedObjectRef* p )
 void SAL_CALL EmbedEventListener_Impl::changingState( const lang::EventObject&,
                                                     ::sal_Int32,
                                                     ::sal_Int32 )
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL EmbedEventListener_Impl::stateChanged( const lang::EventObject&,
                                                     ::sal_Int32 nOldState,
                                                     ::sal_Int32 nNewState )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     nState = nNewState;
@@ -162,7 +156,7 @@ void SAL_CALL EmbedEventListener_Impl::stateChanged( const lang::EventObject&,
     }
 }
 
-void SAL_CALL EmbedEventListener_Impl::modified( const lang::EventObject& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL EmbedEventListener_Impl::modified( const lang::EventObject& )
 {
     SolarMutexGuard aGuard;
     if ( pObject && pObject->GetViewAspect() != embed::Aspects::MSOLE_ICON )
@@ -185,7 +179,7 @@ void SAL_CALL EmbedEventListener_Impl::modified( const lang::EventObject& ) thro
     }
 }
 
-void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject& aEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -196,7 +190,6 @@ void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject&
 }
 
 void SAL_CALL EmbedEventListener_Impl::queryClosing( const lang::EventObject& Source, sal_Bool )
-        throw ( util::CloseVetoException, uno::RuntimeException, std::exception)
 {
     // An embedded object can be shared between several objects (f.e. for undo purposes)
     // the object will not be closed before the last "customer" is destroyed
@@ -205,7 +198,7 @@ void SAL_CALL EmbedEventListener_Impl::queryClosing( const lang::EventObject& So
         throw util::CloseVetoException();
 }
 
-void SAL_CALL EmbedEventListener_Impl::notifyClosing( const lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL EmbedEventListener_Impl::notifyClosing( const lang::EventObject& Source )
 {
     if ( pObject && Source.Source == pObject->GetObject() )
     {
@@ -214,7 +207,7 @@ void SAL_CALL EmbedEventListener_Impl::notifyClosing( const lang::EventObject& S
     }
 }
 
-void SAL_CALL EmbedEventListener_Impl::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL EmbedEventListener_Impl::disposing( const lang::EventObject& aEvent )
 {
     if ( pObject && aEvent.Source == pObject->GetObject() )
     {
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index 60a6c0e1be7e..f8dd078f2bf1 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -62,13 +62,13 @@ namespace svt
 
     protected:
         // XStream
-        virtual Reference< XInputStream > SAL_CALL getInputStream(  ) throw (RuntimeException, std::exception) override;
-        virtual Reference< XOutputStream > SAL_CALL getOutputStream(  ) throw (RuntimeException, std::exception) override;
+        virtual Reference< XInputStream > SAL_CALL getInputStream(  ) override;
+        virtual Reference< XOutputStream > SAL_CALL getOutputStream(  ) override;
 
         // XSeekable
-        virtual void SAL_CALL seek( ::sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int64 SAL_CALL getPosition(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int64 SAL_CALL getLength(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL seek( ::sal_Int64 location ) override;
+        virtual ::sal_Int64 SAL_CALL getPosition(  ) override;
+        virtual ::sal_Int64 SAL_CALL getLength(  ) override;
     };
 
 
@@ -83,19 +83,19 @@ namespace svt
     }
 
 
-    Reference< XInputStream > SAL_CALL StreamSupplier::getInputStream(  ) throw (RuntimeException, std::exception)
+    Reference< XInputStream > SAL_CALL StreamSupplier::getInputStream(  )
     {
         return m_xInput;
     }
 
 
-    Reference< XOutputStream > SAL_CALL StreamSupplier::getOutputStream(  ) throw (RuntimeException, std::exception)
+    Reference< XOutputStream > SAL_CALL StreamSupplier::getOutputStream(  )
     {
         return m_xOutput;
     }
 
 
-    void SAL_CALL StreamSupplier::seek( ::sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception)
+    void SAL_CALL StreamSupplier::seek( ::sal_Int64 location )
     {
         if ( !m_xSeekable.is() )
             throw NotConnectedException();
@@ -104,7 +104,7 @@ namespace svt
     }
 
 
-    ::sal_Int64 SAL_CALL StreamSupplier::getPosition(  ) throw (IOException, RuntimeException, std::exception)
+    ::sal_Int64 SAL_CALL StreamSupplier::getPosition(  )
     {
         if ( !m_xSeekable.is() )
             throw NotConnectedException();
@@ -113,7 +113,7 @@ namespace svt
     }
 
 
-    ::sal_Int64 SAL_CALL StreamSupplier::getLength(  ) throw (IOException, RuntimeException, std::exception)
+    ::sal_Int64 SAL_CALL StreamSupplier::getLength(  )
     {
         if ( !m_xSeekable.is() )
             throw NotConnectedException();
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index 8846171c1475..df4d03b67474 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -51,14 +51,14 @@ OpenFileDropTargetListener::~OpenFileDropTargetListener()
 }
 
 
-void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObject& )
 {
     m_xTargetFrame.clear();
     m_xContext.clear();
 }
 
 
-void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde )
 {
     const sal_Int8 nAction = dtde.DropAction;
 
@@ -92,7 +92,7 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr
 }
 
 
-void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee )
 {
     try
     {
@@ -106,7 +106,7 @@ void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dn
 }
 
 
-void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd::DropTargetEvent& )
 {
     try
     {
@@ -118,7 +118,7 @@ void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd
 }
 
 
-void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde )
 {
     try
     {
@@ -136,7 +136,7 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd
 }
 
 
-void SAL_CALL OpenFileDropTargetListener::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL OpenFileDropTargetListener::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& )
 {
 }
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 5e417a718f68..1fa767175fd5 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -237,17 +237,17 @@ TransferableHelper::TerminateListener::~TerminateListener()
 }
 
 
-void SAL_CALL TransferableHelper::TerminateListener::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::TerminateListener::disposing( const EventObject& )
 {
 }
 
 
-void SAL_CALL TransferableHelper::TerminateListener::queryTermination( const EventObject& ) throw( TerminationVetoException, RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::TerminateListener::queryTermination( const EventObject& )
 {
 }
 
 
-void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const EventObject& ) throw( RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const EventObject& )
 {
     mrParent.ImplFlush();
 }
@@ -259,13 +259,11 @@ TransferableHelper::TransferableHelper()
 }
 
 Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor )
-    throw (UnsupportedFlavorException, IOException, RuntimeException, std::exception)
 {
     return getTransferData2(rFlavor, OUString());
 }
 
 Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, const OUString& rDestDoc )
-    throw (UnsupportedFlavorException, IOException, RuntimeException, std::exception)
 {
     if( !maAny.hasValue() || mxFormats->empty() || ( maLastFormat != rFlavor.MimeType ) )
     {
@@ -378,7 +376,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
 }
 
 
-Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() throw( RuntimeException, std::exception )
+Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors()
 {
     const SolarMutexGuard aGuard;
 
@@ -395,7 +393,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr
 }
 
 
-sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor )
 {
     const SolarMutexGuard aGuard;
     bool bRet = false;
@@ -422,7 +420,7 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r
 }
 
 
-void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw( RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& )
 {
     const SolarMutexGuard aGuard;
 
@@ -444,12 +442,12 @@ void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&,
 }
 
 
-void SAL_CALL TransferableHelper::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::disposing( const EventObject& )
 {
 }
 
 
-void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE ) throw( RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE )
 {
     const SolarMutexGuard aGuard;
 
@@ -464,27 +462,27 @@ void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE
 }
 
 
-void SAL_CALL TransferableHelper::dragEnter( const DragSourceDragEvent& ) throw( RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::dragEnter( const DragSourceDragEvent& )
 {
 }
 
 
-void SAL_CALL TransferableHelper::dragExit( const DragSourceEvent& ) throw( RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::dragExit( const DragSourceEvent& )
 {
 }
 
 
-void SAL_CALL TransferableHelper::dragOver( const DragSourceDragEvent& ) throw( RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::dragOver( const DragSourceDragEvent& )
 {
 }
 
 
-void SAL_CALL TransferableHelper::dropActionChanged( const DragSourceDragEvent& ) throw( RuntimeException, std::exception )
+void SAL_CALL TransferableHelper::dropActionChanged( const DragSourceDragEvent& )
 {
 }
 
 
-sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException, std::exception )
+sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
 
@@ -1035,10 +1033,10 @@ private:
 
 protected:
     // XClipboardListener
-    virtual void SAL_CALL changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL changedContents( const clipboard::ClipboardEvent& event ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
 public:
     TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex );
@@ -1068,7 +1066,7 @@ TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X
 }
 
 
-void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException, std::exception)
+void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event )
 {
     SolarMutexGuard aSolarGuard;
         // the SolarMutex here is necessary, since
@@ -1081,7 +1079,7 @@ void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::C
 }
 
 
-void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) throw (RuntimeException, std::exception)
+void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& )
 {
     // clipboard is being disposed. Hmm. Okay, become disfunctional myself.
     dispose();
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 81f68dc7eb0f..4d3e61cd33af 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -53,12 +53,12 @@ DragSourceHelper::DragGestureListener::~DragGestureListener()
 }
 
 
-void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObject& )
 {
 }
 
 
-void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE ) throw( RuntimeException, std::exception )
+void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE )
 {
     const SolarMutexGuard aGuard;
 
@@ -113,12 +113,12 @@ DropTargetHelper::DropTargetListener::~DropTargetListener()
 }
 
 
-void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject& )
 {
 }
 
 
-void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE ) throw( RuntimeException, std::exception )
+void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE )
 {
     const SolarMutexGuard aGuard;
 
@@ -163,7 +163,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv
 }
 
 
-void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE ) throw( RuntimeException, std::exception )
+void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE )
 {
     const SolarMutexGuard aGuard;
 
@@ -179,7 +179,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetD
 }
 
 
-void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE ) throw( RuntimeException, std::exception )
+void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE )
 {
     const SolarMutexGuard aGuard;
 
@@ -201,7 +201,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDr
 }
 
 
-void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& ) throw( RuntimeException, std::exception )
+void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& )
 {
     const SolarMutexGuard aGuard;
 
@@ -222,7 +222,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEv
 }
 
 
-void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const DropTargetDragEvent& ) throw( RuntimeException, std::exception )
+void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const DropTargetDragEvent& )
 {
 }
 
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 4ffafea5f4f5..1138aaa5e7dc 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -54,20 +54,20 @@ namespace {
         explicit OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB);
 
         // XTypeProvider
-        virtual Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(RuntimeException, std::exception) override;
+        virtual Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() 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 css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
         // XPropertySet
-        virtual Reference< XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override;
+        virtual Reference< XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
-        virtual void SAL_CALL initialize(const Sequence< Any >& aArguments) throw(Exception, RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize(const Sequence< Any >& aArguments) override;
 
     protected:
     // OGenericUnoDialog overridables
@@ -87,26 +87,26 @@ namespace {
     }
 
 
-    Sequence<sal_Int8> SAL_CALL OAddressBookSourceDialogUno::getImplementationId(  ) throw(RuntimeException, std::exception)
+    Sequence<sal_Int8> SAL_CALL OAddressBookSourceDialogUno::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
 
 
-    OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName()
     {
         return OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" );
     }
 
 
-    css::uno::Sequence<OUString> SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    css::uno::Sequence<OUString> SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames()
     {
         css::uno::Sequence<OUString> aSupported { "com.sun.star.ui.AddressBookSourceDialog" };
         return aSupported;
     }
 
 
-    Reference<XPropertySetInfo>  SAL_CALL OAddressBookSourceDialogUno::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference<XPropertySetInfo>  SAL_CALL OAddressBookSourceDialogUno::getPropertySetInfo()
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
@@ -136,7 +136,7 @@ namespace {
                 static_cast< AddressBookSourceDialog* >( m_pDialog.get() )->getFieldMapping( m_aAliases );
     }
 
-    void SAL_CALL OAddressBookSourceDialogUno::initialize(const Sequence< Any >& rArguments) throw(Exception, RuntimeException, std::exception)
+    void SAL_CALL OAddressBookSourceDialogUno::initialize(const Sequence< Any >& rArguments)
     {
         if( rArguments.getLength() == 5 )
         {
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 2819b53a569e..518ae332575c 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -53,7 +53,6 @@ FrameStatusListener::~FrameStatusListener()
 
 // XInterface
 Any SAL_CALL FrameStatusListener::queryInterface( const Type& rType )
-throw ( RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface(
                 rType ,
@@ -81,7 +80,6 @@ void SAL_CALL FrameStatusListener::release() throw ()
 
 // XComponent
 void SAL_CALL FrameStatusListener::dispose()
-throw (css::uno::RuntimeException, std::exception)
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -115,20 +113,17 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL FrameStatusListener::addEventListener( const Reference< XEventListener >& )
-throw ( RuntimeException, std::exception )
 {
     // helper class for status updates - no need to support listener
 }
 
 void SAL_CALL FrameStatusListener::removeEventListener( const Reference< XEventListener >& )
-throw ( RuntimeException, std::exception )
 {
     // helper class for status updates - no need to support listener
 }
 
 // XEventListener
 void SAL_CALL FrameStatusListener::disposing( const EventObject& Source )
-throw ( RuntimeException, std::exception )
 {
     Reference< XInterface > xSource( Source.Source );
 
@@ -149,7 +144,6 @@ throw ( RuntimeException, std::exception )
 }
 
 void FrameStatusListener::frameAction( const FrameActionEvent& Action )
-throw ( RuntimeException, std::exception )
 {
     if ( Action.Action == FrameAction_CONTEXT_CHANGED )
         bindListener();
diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index 43d34379da18..dd03972489b1 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.cxx
@@ -71,7 +71,6 @@ GenericToolboxController::~GenericToolboxController()
 }
 
 void SAL_CALL GenericToolboxController::dispose()
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
     m_pToolbox.clear();
@@ -80,7 +79,6 @@ throw ( RuntimeException, std::exception )
 }
 
 void SAL_CALL GenericToolboxController::execute( sal_Int16 /*KeyModifier*/ )
-throw ( RuntimeException, std::exception )
 {
     Reference< XDispatch >       xDispatch;
     Reference< XURLTransformer > xURLTransformer;
@@ -124,7 +122,6 @@ throw ( RuntimeException, std::exception )
 }
 
 void GenericToolboxController::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index b7543b202a46..c7a17139eb65 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -73,7 +73,7 @@ OGenericUnoDialog::~OGenericUnoDialog()
 }
 
 
-Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType)
 {
     Any aReturn = OGenericUnoDialogBase::queryInterface(_rType);
 
@@ -88,7 +88,7 @@ Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType) throw (Runtim
 }
 
 
-Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes(  )
 {
     return ::comphelper::concatSequences(
         OGenericUnoDialogBase::getTypes(),
@@ -96,13 +96,13 @@ Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes(  ) throw(RuntimeException,
     );
 }
 
-sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 
-void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception, std::exception)
+void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     // TODO : need some handling if we're currently executing ...
 
@@ -119,7 +119,7 @@ void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con
 }
 
 
-sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw(IllegalArgumentException)
+sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
 {
     switch (nHandle)
     {
@@ -139,7 +139,7 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any&
 }
 
 
-void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(RuntimeException, std::exception)
+void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle )
 {
     UnoDialogEntryGuard aGuard( *this );
 
@@ -195,7 +195,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck()
 }
 
 
-sal_Int16 SAL_CALL OGenericUnoDialog::execute(  ) throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL OGenericUnoDialog::execute(  )
 {
     // both creation and execution of the dialog must be guarded with the SolarMutex, so be generous here
     SolarMutexGuard aSolarGuard;
@@ -288,7 +288,7 @@ void OGenericUnoDialog::implInitialize(const Any& _rValue)
 }
 
 
-void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception)
+void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bInitialized )
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index 1c0f3431f8f7..225aa304d2b5 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -67,7 +67,7 @@ PopupMenuControllerBase::~PopupMenuControllerBase()
 }
 
 // protected function
-void PopupMenuControllerBase::throwIfDisposed() throw ( RuntimeException )
+void PopupMenuControllerBase::throwIfDisposed()
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
         throw css::lang::DisposedException();
@@ -92,13 +92,13 @@ void SAL_CALL PopupMenuControllerBase::disposing()
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL PopupMenuControllerBase::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL PopupMenuControllerBase::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XEventListener
-void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& )
 {
     osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
@@ -107,11 +107,11 @@ void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( R
 }
 
 // XMenuListener
-void SAL_CALL PopupMenuControllerBase::itemHighlighted( const awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL PopupMenuControllerBase::itemHighlighted( const awt::MenuEvent& )
 {
 }
 
-void SAL_CALL PopupMenuControllerBase::itemSelected( const awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL PopupMenuControllerBase::itemSelected( const awt::MenuEvent& rEvent )
 {
     throwIfDisposed();
 
@@ -157,15 +157,15 @@ IMPL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, void*, p, void )
     delete pDispatchInfo;
 }
 
-void SAL_CALL PopupMenuControllerBase::itemActivated( const awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL PopupMenuControllerBase::itemActivated( const awt::MenuEvent& )
 {
 }
 
-void SAL_CALL PopupMenuControllerBase::itemDeactivated( const awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL PopupMenuControllerBase::itemDeactivated( const awt::MenuEvent& )
 {
 }
 
-void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL PopupMenuControllerBase::updatePopupMenu()
 {
     osl::ClearableMutexGuard aLock( m_aMutex );
     throwIfDisposed();
@@ -199,7 +199,6 @@ PopupMenuControllerBase::queryDispatch(
     const URL& /*aURL*/,
     const OUString& /*sTarget*/,
     sal_Int32 /*nFlags*/ )
-throw( RuntimeException, std::exception )
 {
     // must be implemented by subclass
     osl::MutexGuard aLock( m_aMutex );
@@ -208,7 +207,7 @@ throw( RuntimeException, std::exception )
     return Reference< XDispatch >();
 }
 
-Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispatches( const Sequence< DispatchDescriptor >& lDescriptor ) throw( RuntimeException, std::exception )
+Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispatches( const Sequence< DispatchDescriptor >& lDescriptor )
 {
     // Create return list - which must have same size then the given descriptor
     // It's not allowed to pack it!
@@ -235,7 +234,6 @@ void SAL_CALL
 PopupMenuControllerBase::dispatch(
     const URL& /*aURL*/,
     const Sequence< PropertyValue >& /*seqProperties*/ )
-throw( css::uno::RuntimeException, std::exception )
 {
     // must be implemented by subclass
     osl::MutexGuard aLock( m_aMutex );
@@ -246,7 +244,6 @@ void SAL_CALL
 PopupMenuControllerBase::addStatusListener(
     const Reference< XStatusListener >& xControl,
     const URL& aURL )
-throw( css::uno::RuntimeException, std::exception )
 {
     osl::ResettableMutexGuard aLock( m_aMutex );
     throwIfDisposed();
@@ -275,7 +272,6 @@ throw( css::uno::RuntimeException, std::exception )
 void SAL_CALL PopupMenuControllerBase::removeStatusListener(
     const Reference< XStatusListener >& xControl,
     const URL& /*aURL*/ )
-throw( css::uno::RuntimeException, std::exception )
 {
     rBHelper.removeListener( cppu::UnoType<decltype(xControl)>::get(), xControl );
 }
@@ -302,7 +298,7 @@ OUString PopupMenuControllerBase::determineBaseURL( const OUString& aURL )
 }
 
 // XInitialization
-void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments )
 {
     osl::MutexGuard aLock( m_aMutex );
 
@@ -336,7 +332,7 @@ void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArgum
     }
 }
 // XPopupMenuController
-void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception )
+void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopupMenu >& xPopupMenu )
 {
     osl::MutexGuard aLock( m_aMutex );
     throwIfDisposed();
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index 9229f09bf040..51d7bbc38dde 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -163,26 +163,26 @@ PopupWindowController::~PopupWindowController()
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL PopupWindowController::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL PopupWindowController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XComponent
-void SAL_CALL PopupWindowController::dispose() throw (RuntimeException, std::exception)
+void SAL_CALL PopupWindowController::dispose()
 {
     mxImpl.reset();
     svt::ToolboxController::dispose();
 }
 
 // XStatusListener
-void SAL_CALL PopupWindowController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException, std::exception )
+void SAL_CALL PopupWindowController::statusChanged( const frame::FeatureStateEvent& rEvent )
 {
     svt::ToolboxController::statusChanged(rEvent);
     enable( rEvent.IsEnabled );
 }
 
-Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() throw (RuntimeException, std::exception)
+Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow()
 {
     VclPtr< ToolBox > pToolBox = dynamic_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ).get() );
     if( pToolBox )
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index d2ae6a6b8c85..8bb37ea27ae7 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -94,7 +94,6 @@ Reference< XURLTransformer > StatusbarController::getURLTransformer() const
 
 // XInterface
 Any SAL_CALL StatusbarController::queryInterface( const Type& rType )
-throw ( RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface(
                 rType ,
@@ -122,7 +121,6 @@ void SAL_CALL StatusbarController::release() throw ()
 }
 
 void SAL_CALL StatusbarController::initialize( const Sequence< Any >& aArguments )
-throw ( Exception, RuntimeException, std::exception )
 {
     bool bInitialized( true );
 
@@ -171,7 +169,6 @@ throw ( Exception, RuntimeException, std::exception )
 }
 
 void SAL_CALL StatusbarController::update()
-throw ( RuntimeException, std::exception )
 {
     {
         SolarMutexGuard aSolarMutexGuard;
@@ -185,7 +182,6 @@ throw ( RuntimeException, std::exception )
 
 // XComponent
 void SAL_CALL StatusbarController::dispose()
-throw (css::uno::RuntimeException, std::exception)
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -235,20 +231,17 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL StatusbarController::addEventListener( const Reference< XEventListener >& xListener )
-throw ( RuntimeException, std::exception )
 {
     m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 void SAL_CALL StatusbarController::removeEventListener( const Reference< XEventListener >& aListener )
-throw ( RuntimeException, std::exception )
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), aListener );
 }
 
 // XEventListener
 void SAL_CALL StatusbarController::disposing( const EventObject& Source )
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -279,7 +272,6 @@ throw ( RuntimeException, std::exception )
 
 // XStatusListener
 void SAL_CALL StatusbarController::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -302,21 +294,18 @@ throw ( RuntimeException, std::exception )
 // XStatusbarController
 sal_Bool SAL_CALL StatusbarController::mouseButtonDown(
     const css::awt::MouseEvent& )
-throw (css::uno::RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL StatusbarController::mouseMove(
     const css::awt::MouseEvent& )
-throw (css::uno::RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Bool SAL_CALL StatusbarController::mouseButtonUp(
     const css::awt::MouseEvent& )
-throw (css::uno::RuntimeException, std::exception)
 {
     return false;
 }
@@ -326,7 +315,6 @@ void SAL_CALL StatusbarController::command(
     ::sal_Int32,
     sal_Bool,
     const css::uno::Any& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -334,16 +322,14 @@ void SAL_CALL StatusbarController::paint(
     const css::uno::Reference< css::awt::XGraphics >&,
     const css::awt::Rectangle&,
     ::sal_Int32 )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL StatusbarController::click( const css::awt::Point& )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
-void SAL_CALL StatusbarController::doubleClick( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL StatusbarController::doubleClick( const css::awt::Point& )
 {
     SolarMutexGuard aSolarMutexGuard;
 
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 07a840655704..574180953fa0 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -108,7 +108,7 @@ void SVTXGridControl::impl_checkRowIndex_throw( ::svt::table::TableControl const
 }
 
 
-sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y)
 {
     SolarMutexGuard aGuard;
 
@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y)
 }
 
 
-sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y)
 {
     SolarMutexGuard aGuard;
 
@@ -132,7 +132,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32
 }
 
 
-sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn(  )
 {
     SolarMutexGuard aGuard;
 
@@ -144,7 +144,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn(  ) throw (RuntimeException
 }
 
 
-sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow(  )
 {
     SolarMutexGuard aGuard;
 
@@ -156,7 +156,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow(  ) throw (RuntimeException, s
 }
 
 
-void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, VetoException, std::exception)
+void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex )
 {
     SolarMutexGuard aGuard;
 
@@ -170,19 +170,19 @@ void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32
 }
 
 
-void SAL_CALL SVTXGridControl::addSelectionListener(const Reference< XGridSelectionListener > & listener) throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::addSelectionListener(const Reference< XGridSelectionListener > & listener)
 {
     m_aSelectionListeners.addInterface(listener);
 }
 
 
-void SAL_CALL SVTXGridControl::removeSelectionListener(const Reference< XGridSelectionListener > & listener) throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::removeSelectionListener(const Reference< XGridSelectionListener > & listener)
 {
     m_aSelectionListeners.removeInterface(listener);
 }
 
 
-void SVTXGridControl::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException, std::exception)
+void SVTXGridControl::setProperty( const OUString& PropertyName, const Any& aValue)
 {
     SolarMutexGuard aGuard;
 
@@ -466,7 +466,7 @@ namespace
     }
 }
 
-Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeException, std::exception)
+Any SVTXGridControl::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -600,7 +600,7 @@ Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeEx
 }
 
 
-void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event )
 {
     SolarMutexGuard aGuard;
     m_xTableModel->notifyRowsInserted( i_event );
@@ -608,14 +608,14 @@ void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event ) thro
 
 
 void SAL_CALL
- SVTXGridControl::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+ SVTXGridControl::rowsRemoved( const GridDataEvent& i_event )
 {
     SolarMutexGuard aGuard;
     m_xTableModel->notifyRowsRemoved( i_event );
 }
 
 
-void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event )
 {
     SolarMutexGuard aGuard;
 
@@ -629,7 +629,7 @@ void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) throw
 }
 
 
-void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& )
 {
     SolarMutexGuard aGuard;
 
@@ -641,7 +641,7 @@ void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& ) throw (
 }
 
 
-void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event )
 {
     SolarMutexGuard aGuard;
 
@@ -653,7 +653,7 @@ void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event )
 }
 
 
-void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event )
 {
     SolarMutexGuard aGuard;
 
@@ -663,7 +663,7 @@ void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event ) t
 }
 
 
-void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& )
 {
     OSL_ENSURE( false, "SVTXGridControl::elementReplaced: not implemented!" );
         // at the moment, the XGridColumnModel API does not allow replacing columns
@@ -671,13 +671,13 @@ void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& ) throw (R
 }
 
 
-void SAL_CALL SVTXGridControl::disposing( const EventObject& Source ) throw(RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::disposing( const EventObject& Source )
 {
     VCLXWindow::disposing( Source );
 }
 
 
-void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception )
+void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex )
 {
     SolarMutexGuard aGuard;
 
@@ -690,7 +690,7 @@ void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (Runtim
 }
 
 
-void SAL_CALL SVTXGridControl::selectAllRows() throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::selectAllRows()
 {
     SolarMutexGuard aGuard;
 
@@ -701,7 +701,7 @@ void SAL_CALL SVTXGridControl::selectAllRows() throw (RuntimeException, std::exc
 }
 
 
-void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception )
+void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex )
 {
     SolarMutexGuard aGuard;
 
@@ -714,7 +714,7 @@ void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (Runt
 }
 
 
-void SAL_CALL SVTXGridControl::deselectAllRows() throw (RuntimeException, std::exception)
+void SAL_CALL SVTXGridControl::deselectAllRows()
 {
     SolarMutexGuard aGuard;
 
@@ -725,7 +725,7 @@ void SAL_CALL SVTXGridControl::deselectAllRows() throw (RuntimeException, std::e
 }
 
 
-Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (RuntimeException, std::exception)
+Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows()
 {
     SolarMutexGuard aGuard;
 
@@ -740,7 +740,7 @@ Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (Runti
 }
 
 
-sal_Bool SAL_CALL SVTXGridControl::hasSelectedRows() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SVTXGridControl::hasSelectedRows()
 {
     SolarMutexGuard aGuard;
 
@@ -751,7 +751,7 @@ sal_Bool SAL_CALL SVTXGridControl::hasSelectedRows() throw (RuntimeException, st
 }
 
 
-sal_Bool SAL_CALL SVTXGridControl::isRowSelected( ::sal_Int32 index ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SVTXGridControl::isRowSelected( ::sal_Int32 index )
 {
     SolarMutexGuard aGuard;
 
@@ -762,7 +762,7 @@ sal_Bool SAL_CALL SVTXGridControl::isRowSelected( ::sal_Int32 index ) throw (Run
 }
 
 
-void SVTXGridControl::dispose() throw(RuntimeException, std::exception)
+void SVTXGridControl::dispose()
 {
     EventObject aObj;
     aObj.Source = static_cast<cppu::OWeakObject*>(this);
@@ -850,7 +850,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
 }
 
 
-void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception)
+void SVTXGridControl::setEnable( sal_Bool bEnable )
 {
     SolarMutexGuard aGuard;
 
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index 07af15b39982..a8e074d1074d 100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx
@@ -64,45 +64,45 @@ public:
     virtual ~SVTXGridControl() override;
 
     // XGridDataListener
-    virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) override;
+    virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) override;
+    virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) override;
+    virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) override;
 
     // XContainerListener
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) 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;
 
     // XGridControl
-    virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCurrentColumn(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCurrentRow(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, css::util::VetoException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) override;
+    virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) override;
+    virtual ::sal_Int32 SAL_CALL getCurrentColumn(  ) override;
+    virtual ::sal_Int32 SAL_CALL getCurrentRow(  ) override;
+    virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) override;
 
     // XGridRowSelection
-    virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
-    virtual void SAL_CALL selectAllRows() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
-    virtual void SAL_CALL deselectAllRows() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasSelectedRows() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override;
-
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) override;
+    virtual void SAL_CALL selectAllRows() override;
+    virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) override;
+    virtual void SAL_CALL deselectAllRows() override;
+    virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() override;
+    virtual sal_Bool SAL_CALL hasSelectedRows() override;
+    virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) override;
+    virtual void SAL_CALL addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) override;
+    virtual void SAL_CALL removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) override;
+
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // XWindow
-    void SAL_CALL setEnable( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setEnable( sal_Bool bEnable ) override;
 
 protected:
     // VCLXWindow
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 79a03db19e04..b8a48f08ae8f 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -133,7 +133,6 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const
 
 // XInterface
 Any SAL_CALL ToolboxController::queryInterface( const Type& rType )
-throw ( RuntimeException, std::exception )
 {
     css::uno::Any a(ToolboxController_Base::queryInterface(rType));
     return a.hasValue() ? a : OPropertyContainer::queryInterface(rType);
@@ -150,7 +149,6 @@ void SAL_CALL ToolboxController::release() throw ()
 }
 
 css::uno::Sequence<css::uno::Type> ToolboxController::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<css::uno::Type> s1(ToolboxController_Base::getTypes());
     css::uno::Sequence<css::uno::Type> s2(getBaseTypes());
@@ -163,7 +161,6 @@ css::uno::Sequence<css::uno::Type> ToolboxController::getTypes()
 }
 
 void SAL_CALL ToolboxController::initialize( const Sequence< Any >& aArguments )
-throw ( Exception, RuntimeException, std::exception )
 {
     bool bInitialized( true );
 
@@ -220,7 +217,6 @@ throw ( Exception, RuntimeException, std::exception )
 }
 
 void SAL_CALL ToolboxController::update()
-throw ( RuntimeException, std::exception )
 {
     {
         SolarMutexGuard aSolarMutexGuard;
@@ -234,7 +230,6 @@ throw ( RuntimeException, std::exception )
 
 // XComponent
 void SAL_CALL ToolboxController::dispose()
-throw (css::uno::RuntimeException, std::exception)
 {
     Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
 
@@ -275,20 +270,17 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ToolboxController::addEventListener( const Reference< XEventListener >& xListener )
-throw ( RuntimeException, std::exception )
 {
     m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
 void SAL_CALL ToolboxController::removeEventListener( const Reference< XEventListener >& aListener )
-throw ( RuntimeException, std::exception )
 {
     m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), aListener );
 }
 
 // XEventListener
 void SAL_CALL ToolboxController::disposing( const EventObject& Source )
-throw ( RuntimeException, std::exception )
 {
     Reference< XInterface > xSource( Source.Source );
 
@@ -314,14 +306,12 @@ throw ( RuntimeException, std::exception )
 
 // XStatusListener
 void SAL_CALL ToolboxController::statusChanged( const FeatureStateEvent& )
-throw ( RuntimeException, std::exception )
 {
     // must be implemented by sub class
 }
 
 // XToolbarController
 void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier )
-throw (css::uno::RuntimeException, std::exception)
 {
     Reference< XDispatch >       xDispatch;
     OUString                     aCommandURL;
@@ -368,23 +358,19 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL ToolboxController::click()
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL ToolboxController::doubleClick()
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 Reference< XWindow > SAL_CALL ToolboxController::createPopupWindow()
-throw (css::uno::RuntimeException, std::exception)
 {
     return Reference< XWindow >();
 }
 
 Reference< XWindow > SAL_CALL ToolboxController::createItemWindow( const Reference< XWindow >& )
-throw (css::uno::RuntimeException, std::exception)
 {
     return Reference< XWindow >();
 }
@@ -697,7 +683,7 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ
 }
 
 
-css::uno::Reference< css::beans::XPropertySetInfo >  SAL_CALL ToolboxController::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo >  SAL_CALL ToolboxController::getPropertySetInfo()
 {
     Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -719,7 +705,7 @@ css::uno::Reference< css::beans::XPropertySetInfo >  SAL_CALL ToolboxController:
 sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( css::uno::Any&    aConvertedValue ,
                                              css::uno::Any&        aOldValue       ,
                                              sal_Int32                        nHandle         ,
-                                             const css::uno::Any&  aValue          ) throw( css::lang::IllegalArgumentException )
+                                             const css::uno::Any&  aValue          )
 {
     switch (nHandle)
     {
@@ -742,7 +728,6 @@ sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( css::uno::Any&
 void SAL_CALL ToolboxController::setFastPropertyValue_NoBroadcast(
     sal_Int32                       nHandle,
     const css::uno::Any& aValue )
-throw( css::uno::Exception, std::exception)
 {
     OPropertyContainer::setFastPropertyValue_NoBroadcast(nHandle, aValue);
     if (TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE == nHandle)
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index fa2a39137b10..e2a5cf9bbfea 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -180,7 +180,7 @@ void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry )
 }
 
 
-UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode, bool bThrow /* = true */ ) throw( IllegalArgumentException )
+UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode, bool bThrow /* = true */ )
 {
     if( mpTreeNodeMap )
     {
@@ -416,7 +416,7 @@ void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTree
 }
 
 
-UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (RuntimeException )
+UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const
 {
     if( !mpTreeImpl )
         throw DisposedException();
@@ -424,7 +424,7 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim
 }
 
 
-void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException )
+void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection )
 {
     SolarMutexGuard aGuard;
 
@@ -481,7 +481,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect,
 // css::view::XSelectionSupplier
 
 
-sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection )
 {
     SolarMutexGuard aGuard;
     ChangeNodesSelection( rSelection, true, true );
@@ -489,7 +489,7 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega
 }
 
 
-Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::exception)
+Any SAL_CALL TreeControlPeer::getSelection()
 {
     SolarMutexGuard aGuard;
 
@@ -524,13 +524,13 @@ Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::excep
 }
 
 
-void SAL_CALL TreeControlPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener )
 {
     maSelectionListeners.addInterface( xListener );
 }
 
 
-void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener )
 {
     maSelectionListeners.addInterface( xListener );
 }
@@ -539,27 +539,27 @@ void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< X
 // css::view::XMultiSelectionSupplier
 
 
-sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection )
 {
     ChangeNodesSelection( rSelection, true, false );
     return true;
 }
 
 
-void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection )
 {
     ChangeNodesSelection( rSelection, false, false );
 }
 
 
-void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::clearSelection()
 {
     SolarMutexGuard aGuard;
     getTreeListBoxOrThrow().SelectAll( false );
 }
 
 
-sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount()
 {
     SolarMutexGuard aGuard;
     return getTreeListBoxOrThrow().GetSelectionCount();
@@ -570,8 +570,8 @@ class TreeSelectionEnumeration : public ::cppu::WeakImplHelper< XEnumeration >
 {
 public:
     explicit TreeSelectionEnumeration( std::list< Any >& rSelection );
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual Any SAL_CALL nextElement() override;
 
     std::list< Any > maSelection;
     std::list< Any >::iterator maIter;
@@ -585,13 +585,13 @@ TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection
 }
 
 
-sal_Bool SAL_CALL TreeSelectionEnumeration::hasMoreElements() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL TreeSelectionEnumeration::hasMoreElements()
 {
     return maIter != maSelection.end();
 }
 
 
-Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TreeSelectionEnumeration::nextElement()
 {
     if( maIter == maSelection.end() )
         throw NoSuchElementException();
@@ -600,7 +600,7 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti
 }
 
 
-Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
 {
     SolarMutexGuard aGuard;
 
@@ -623,7 +623,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
 }
 
 
-Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration()
 {
     SolarMutexGuard aGuard;
 
@@ -649,14 +649,14 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
 // css::awt::XTreeControl
 
 
-OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL()
 {
     SolarMutexGuard aGuard;
     return msDefaultExpandedGraphicURL;
 }
 
 
-void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL )
 {
     SolarMutexGuard aGuard;
     if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL )
@@ -685,14 +685,14 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDe
 }
 
 
-OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL()
 {
     SolarMutexGuard aGuard;
     return msDefaultCollapsedGraphicURL;
 }
 
 
-void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL )
 {
     SolarMutexGuard aGuard;
     if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL )
@@ -721,7 +721,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sD
 }
 
 
-sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception)
+sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode )
 {
     SolarMutexGuard aGuard;
 
@@ -731,14 +731,14 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >&
 }
 
 
-sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception)
+sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode )
 {
     SolarMutexGuard aGuard;
     return !isNodeExpanded( xNode );
 }
 
 
-void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception)
+void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode )
 {
     SolarMutexGuard aGuard;
 
@@ -749,7 +749,7 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN
 }
 
 
-sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception)
+sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode )
 {
     SolarMutexGuard aGuard;
 
@@ -759,7 +759,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >&
 }
 
 
-void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception)
+void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode )
 {
     SolarMutexGuard aGuard;
 
@@ -770,7 +770,7 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode )
 }
 
 
-void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception)
+void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode )
 {
     SolarMutexGuard aGuard;
 
@@ -781,19 +781,19 @@ void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode
 }
 
 
-void SAL_CALL TreeControlPeer::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener )
 {
     maTreeExpansionListeners.addInterface( xListener );
 }
 
 
-void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener )
 {
     maTreeExpansionListeners.removeInterface( xListener );
 }
 
 
-Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception)
+Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y )
 {
     SolarMutexGuard aGuard;
 
@@ -810,7 +810,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x
 }
 
 
-Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception)
+Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y )
 {
     SolarMutexGuard aGuard;
 
@@ -827,7 +827,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_
 }
 
 
-awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException, std::exception)
+awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node )
 {
     SolarMutexGuard aGuard;
 
@@ -839,7 +839,7 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode
 }
 
 
-sal_Bool SAL_CALL TreeControlPeer::isEditing(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL TreeControlPeer::isEditing(  )
 {
     SolarMutexGuard aGuard;
 
@@ -848,7 +848,7 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing(  ) throw (RuntimeException, std::e
 }
 
 
-sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL TreeControlPeer::stopEditing()
 {
     SolarMutexGuard aGuard;
 
@@ -865,7 +865,7 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::e
 }
 
 
-void SAL_CALL TreeControlPeer::cancelEditing(  ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::cancelEditing(  )
 {
     SolarMutexGuard aGuard;
 
@@ -874,7 +874,7 @@ void SAL_CALL TreeControlPeer::cancelEditing(  ) throw (RuntimeException, std::e
 }
 
 
-void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode )
 {
     SolarMutexGuard aGuard;
 
@@ -883,12 +883,12 @@ void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >&
     rTree.EditEntry( pEntry );
 }
 
-void SAL_CALL TreeControlPeer::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::addTreeEditListener( const Reference< XTreeEditListener >& xListener )
 {
     maTreeEditListeners.addInterface( xListener );
 }
 
-void SAL_CALL TreeControlPeer::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::removeTreeEditListener( const Reference< XTreeEditListener >& xListener )
 {
     maTreeEditListeners.removeInterface( xListener );
 }
@@ -943,7 +943,7 @@ bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const OUString& r
 // css::awt::tree::TreeDataModelListener
 
 
-void SAL_CALL TreeControlPeer::treeNodesChanged( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::treeNodesChanged( const css::awt::tree::TreeDataModelEvent& rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -953,7 +953,7 @@ void SAL_CALL TreeControlPeer::treeNodesChanged( const css::awt::tree::TreeDataM
     updateTree( rEvent );
 }
 
-void SAL_CALL TreeControlPeer::treeNodesInserted( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::treeNodesInserted( const css::awt::tree::TreeDataModelEvent& rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -963,7 +963,7 @@ void SAL_CALL TreeControlPeer::treeNodesInserted( const css::awt::tree::TreeData
     updateTree( rEvent );
 }
 
-void SAL_CALL TreeControlPeer::treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -973,7 +973,7 @@ void SAL_CALL TreeControlPeer::treeNodesRemoved( const css::awt::tree::TreeDataM
     updateTree( rEvent );
 }
 
-void SAL_CALL TreeControlPeer::treeStructureChanged( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::treeStructureChanged( const css::awt::tree::TreeDataModelEvent& rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -1141,7 +1141,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue )
 }
 
 // XEventListener
-void SAL_CALL TreeControlPeer::disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL TreeControlPeer::disposing( const css::lang::EventObject& )
 {
     // model is disposed, so we clear our tree
     SolarMutexGuard aGuard;
@@ -1172,7 +1172,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
 // css::awt::XLayoutConstrains
 
 
-css::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException, std::exception)
+css::awt::Size TreeControlPeer::getMinimumSize()
 {
     SolarMutexGuard aGuard;
 
@@ -1185,12 +1185,12 @@ css::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException, std::ex
     return aSz;
 }
 
-css::awt::Size TreeControlPeer::getPreferredSize() throw(RuntimeException, std::exception)
+css::awt::Size TreeControlPeer::getPreferredSize()
 {
     return getMinimumSize();
 }
 
-css::awt::Size TreeControlPeer::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(RuntimeException, std::exception)
+css::awt::Size TreeControlPeer::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -1207,7 +1207,7 @@ css::awt::Size TreeControlPeer::calcAdjustedSize( const css::awt::Size& rNewSize
 // css::awt::XVclWindowPeer
 
 
-void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException, std::exception)
+void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aValue)
 {
     SolarMutexGuard aGuard;
 
@@ -1310,7 +1310,7 @@ void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aVal
     }
 }
 
-Any TreeControlPeer::getProperty( const OUString& PropertyName ) throw(RuntimeException, std::exception)
+Any TreeControlPeer::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index 2106cb18eece..9a976f460d55 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -58,63 +58,63 @@ public:
     vcl::Window* createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle );
 
     // css::view::XSelectionSupplier
-    virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) override;
+    virtual css::uno::Any SAL_CALL getSelection(  ) override;
+    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
     // css::view::XMultiSelectionSupplier
-    virtual sal_Bool SAL_CALL addSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getSelectionCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSelectionEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL addSelection( const css::uno::Any& Selection ) override;
+    virtual void SAL_CALL removeSelection( const css::uno::Any& Selection ) override;
+    virtual void SAL_CALL clearSelection(  ) override;
+    virtual ::sal_Int32 SAL_CALL getSelectionCount(  ) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSelectionEnumeration(  ) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration(  ) override;
 
     // css::awt::XTreeControl
-    virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNodeExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNodeCollapsed( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL makeNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL expandNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL collapseNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getNodeRect( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEditing(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL stopEditing(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancelEditing(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startEditingAtNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDefaultExpandedGraphicURL() override;
+    virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) override;
+    virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() override;
+    virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) override;
+    virtual sal_Bool SAL_CALL isNodeExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual sal_Bool SAL_CALL isNodeCollapsed( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL makeNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual sal_Bool SAL_CALL isNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL expandNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL collapseNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL addTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) override;
+    virtual void SAL_CALL removeTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) override;
+    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) override;
+    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) override;
+    virtual css::awt::Rectangle SAL_CALL getNodeRect( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual sal_Bool SAL_CALL isEditing(  ) override;
+    virtual sal_Bool SAL_CALL stopEditing(  ) override;
+    virtual void SAL_CALL cancelEditing(  ) override;
+    virtual void SAL_CALL startEditingAtNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL addTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) override;
+    virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) override;
 
     // css::awt::tree::TreeDataModelListener
-    virtual void SAL_CALL treeNodesChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL treeNodesInserted( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL treeStructureChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL treeNodesChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) override;
+    virtual void SAL_CALL treeNodesInserted( const css::awt::tree::TreeDataModelEvent& aEvent ) override;
+    virtual void SAL_CALL treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& aEvent ) override;
+    virtual void SAL_CALL treeStructureChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) override;
 
     // XEventListener
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     // css::awt::XLayoutConstrains
-    css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL getPreferredSize() throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override;
+    css::awt::Size SAL_CALL getMinimumSize() override;
+    css::awt::Size SAL_CALL getPreferredSize() override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
 
 private:
     /// @throws css::lang::IllegalArgumentException
-    UnoTreeListEntry* getEntry( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bThrow = true ) throw (css::lang::IllegalArgumentException );
+    UnoTreeListEntry* getEntry( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bThrow = true );
 
     void disposeControl();
 
@@ -134,10 +134,10 @@ private:
     static OUString getEntryString( const css::uno::Any& rValue );
 
     /// @throws css::uno::RuntimeException
-    UnoTreeListBoxImpl& getTreeListBoxOrThrow() const throw (css::uno::RuntimeException );
+    UnoTreeListBoxImpl& getTreeListBoxOrThrow() const;
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
-    void ChangeNodesSelection( const css::uno::Any& rSelection, bool bSelect, bool bSetSelection ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException );
+    void ChangeNodesSelection( const css::uno::Any& rSelection, bool bSelect, bool bSetSelection );
 
     void onChangeDataModel( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeDataModel >& xDataModel );
 
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index e8f6cbd5cdcf..6a6688574501 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -138,7 +138,6 @@ void getAnyFromMacro(Any& rAny, const SvxMacro& rMacro)
 void getMacroFromAny(
     SvxMacro& rMacro,
     const Any& rAny)
-        throw ( IllegalArgumentException )
 {
     // get sequence
     Sequence<PropertyValue> aSequence;
@@ -250,11 +249,6 @@ SvBaseEventDescriptor::~SvBaseEventDescriptor()
 void SvBaseEventDescriptor::replaceByName(
     const OUString& rName,
     const Any& rElement )
-    throw(
-        IllegalArgumentException,
-        NoSuchElementException,
-        WrappedTargetException,
-        RuntimeException, std::exception)
 {
     sal_uInt16 nMacroID = getMacroID(rName);
 
@@ -276,10 +270,6 @@ void SvBaseEventDescriptor::replaceByName(
 
 Any SvBaseEventDescriptor::getByName(
     const OUString& rName )
-    throw(
-        NoSuchElementException,
-        WrappedTargetException,
-        RuntimeException, std::exception)
 {
     sal_uInt16 nMacroID = getMacroID(rName);
 
@@ -296,7 +286,6 @@ Any SvBaseEventDescriptor::getByName(
 }
 
 Sequence<OUString> SvBaseEventDescriptor::getElementNames()
-    throw(RuntimeException, std::exception)
 {
     // create and fill sequence
     Sequence<OUString> aSequence(mnMacroItems);
@@ -310,32 +299,27 @@ Sequence<OUString> SvBaseEventDescriptor::getElementNames()
 
 sal_Bool SvBaseEventDescriptor::hasByName(
     const OUString& rName )
-    throw(RuntimeException, std::exception)
 {
     sal_uInt16 nMacroID = getMacroID(rName);
     return (nMacroID != 0);
 }
 
 Type SvBaseEventDescriptor::getElementType()
-    throw(RuntimeException, std::exception)
 {
     return cppu::UnoType<Sequence<PropertyValue>>::get();
 }
 
 sal_Bool SvBaseEventDescriptor::hasElements()
-    throw(RuntimeException, std::exception)
 {
     return mnMacroItems != 0;
 }
 
 sal_Bool SvBaseEventDescriptor::supportsService(const OUString& rServiceName)
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence<OUString> SvBaseEventDescriptor::getSupportedServiceNames()
-    throw(RuntimeException, std::exception)
 {
     Sequence<OUString> aSequence { sAPI_ServiceName };
 
@@ -379,11 +363,6 @@ SvEventDescriptor::~SvEventDescriptor()
 void SvEventDescriptor::replaceByName(
     const sal_uInt16 nEvent,
     const SvxMacro& rMacro)
-        throw(
-            IllegalArgumentException,
-            NoSuchElementException,
-            WrappedTargetException,
-            RuntimeException)
 {
     SvxMacroItem aItem(getMacroItemWhich());
     aItem.SetMacroTable(getMacroItem().GetMacroTable());
@@ -394,10 +373,6 @@ void SvEventDescriptor::replaceByName(
 void SvEventDescriptor::getByName(
     SvxMacro& rMacro,
     const sal_uInt16 nEvent )
-        throw(
-            NoSuchElementException,
-            WrappedTargetException,
-            RuntimeException)
 {
     const SvxMacroItem& rItem = getMacroItem();
     if( rItem.HasMacro( nEvent ) )
@@ -450,7 +425,6 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID) const
 }
 
 OUString SvDetachedEventDescriptor::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return sImplName;
 }
@@ -459,11 +433,6 @@ OUString SvDetachedEventDescriptor::getImplementationName()
 void SvDetachedEventDescriptor::replaceByName(
     const sal_uInt16 nEvent,
     const SvxMacro& rMacro)
-    throw(
-        IllegalArgumentException,
-        NoSuchElementException,
-        WrappedTargetException,
-        RuntimeException)
 {
     sal_Int16 nIndex = getIndex(nEvent);
     if (-1 == nIndex)
@@ -477,10 +446,6 @@ void SvDetachedEventDescriptor::replaceByName(
 void SvDetachedEventDescriptor::getByName(
     SvxMacro& rMacro,
     const sal_uInt16 nEvent )
-    throw(
-        NoSuchElementException,
-        WrappedTargetException,
-        RuntimeException)
 {
     sal_Int16 nIndex = getIndex(nEvent);
     if (-1 == nIndex )
@@ -492,7 +457,6 @@ void SvDetachedEventDescriptor::getByName(
 
 bool SvDetachedEventDescriptor::hasById(
     const sal_uInt16 nEvent ) const     /// item ID of event
-        throw(IllegalArgumentException)
 {
     sal_Int16 nIndex = getIndex(nEvent);
     if (-1 == nIndex)
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 890fbd295e00..d3c3f2acde5c 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -101,10 +101,10 @@ namespace svt { namespace table
         virtual ~ColumnChangeMultiplexer() override;
 
         // XGridColumnListener
-        virtual void SAL_CALL columnChanged( const GridColumnEvent& i_event ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL columnChanged( const GridColumnEvent& i_event ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& i_event ) override;
 
     private:
         UnoGridColumnFacade* m_pColumnImplementation;
@@ -129,7 +129,7 @@ namespace svt { namespace table
     }
 
 
-    void SAL_CALL ColumnChangeMultiplexer::columnChanged( const GridColumnEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL ColumnChangeMultiplexer::columnChanged( const GridColumnEvent& i_event )
     {
         if ( i_event.AttributeName == "DataColumnIndex" )
         {
@@ -162,7 +162,7 @@ namespace svt { namespace table
     }
 
 
-    void SAL_CALL ColumnChangeMultiplexer::disposing( const EventObject& ) throw (RuntimeException, std::exception)
+    void SAL_CALL ColumnChangeMultiplexer::disposing( const EventObject& )
     {
     }
 
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index e3a362070ee2..9521348ae37d 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -184,7 +184,7 @@ VCLXMultiLineEdit::~VCLXMultiLineEdit()
 {
 }
 
-css::uno::Any VCLXMultiLineEdit::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXMultiLineEdit::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XTextComponent* >(this)),
@@ -202,17 +202,17 @@ IMPL_XTYPEPROVIDER_START( VCLXMultiLineEdit )
     VCLXWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void VCLXMultiLineEdit::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l )
 {
     maTextListeners.addInterface( l );
 }
 
-void VCLXMultiLineEdit::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l )
 {
     maTextListeners.removeInterface( l );
 }
 
-void VCLXMultiLineEdit::setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setText( const OUString& aText )
 {
     SolarMutexGuard aGuard;
 
@@ -229,7 +229,7 @@ void VCLXMultiLineEdit::setText( const OUString& aText ) throw(css::uno::Runtime
     }
 }
 
-void VCLXMultiLineEdit::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::insertText( const css::awt::Selection& rSel, const OUString& aText )
 {
     SolarMutexGuard aGuard;
 
@@ -241,7 +241,7 @@ void VCLXMultiLineEdit::insertText( const css::awt::Selection& rSel, const OUStr
     }
 }
 
-OUString VCLXMultiLineEdit::getText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXMultiLineEdit::getText()
 {
     SolarMutexGuard aGuard;
 
@@ -252,7 +252,7 @@ OUString VCLXMultiLineEdit::getText() throw(css::uno::RuntimeException, std::exc
     return aText;
 }
 
-OUString VCLXMultiLineEdit::getSelectedText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXMultiLineEdit::getSelectedText()
 {
     SolarMutexGuard aGuard;
 
@@ -264,7 +264,7 @@ OUString VCLXMultiLineEdit::getSelectedText() throw(css::uno::RuntimeException,
 
 }
 
-void VCLXMultiLineEdit::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setSelection( const css::awt::Selection& aSelection )
 {
     SolarMutexGuard aGuard;
 
@@ -275,7 +275,7 @@ void VCLXMultiLineEdit::setSelection( const css::awt::Selection& aSelection ) th
     }
 }
 
-css::awt::Selection VCLXMultiLineEdit::getSelection() throw(css::uno::RuntimeException, std::exception)
+css::awt::Selection VCLXMultiLineEdit::getSelection()
 {
     SolarMutexGuard aGuard;
 
@@ -289,7 +289,7 @@ css::awt::Selection VCLXMultiLineEdit::getSelection() throw(css::uno::RuntimeExc
     return aSel;
 }
 
-sal_Bool VCLXMultiLineEdit::isEditable() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXMultiLineEdit::isEditable()
 {
     SolarMutexGuard aGuard;
 
@@ -297,7 +297,7 @@ sal_Bool VCLXMultiLineEdit::isEditable() throw(css::uno::RuntimeException, std::
     return pMultiLineEdit && !pMultiLineEdit->IsReadOnly() && pMultiLineEdit->IsEnabled();
 }
 
-void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setEditable( sal_Bool bEditable )
 {
     SolarMutexGuard aGuard;
 
@@ -306,7 +306,7 @@ void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(css::uno::Runtim
         pMultiLineEdit->SetReadOnly( !bEditable );
 }
 
-void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen )
 {
     SolarMutexGuard aGuard;
 
@@ -315,7 +315,7 @@ void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeE
         pMultiLineEdit->SetMaxTextLen( nLen );
 }
 
-sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXMultiLineEdit::getMaxTextLen()
 {
     SolarMutexGuard aGuard;
 
@@ -323,7 +323,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(css::uno::RuntimeException, s
     return pMultiLineEdit ? (sal_Int16)pMultiLineEdit->GetMaxTextLen() : (sal_Int16)0;
 }
 
-OUString VCLXMultiLineEdit::getTextLines() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXMultiLineEdit::getTextLines()
 {
     SolarMutexGuard aGuard;
 
@@ -334,7 +334,7 @@ OUString VCLXMultiLineEdit::getTextLines() throw(css::uno::RuntimeException, std
     return aText;
 }
 
-css::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXMultiLineEdit::getMinimumSize()
 {
     SolarMutexGuard aGuard;
 
@@ -345,12 +345,12 @@ css::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(css::uno::RuntimeExcept
     return aSz;
 }
 
-css::awt::Size VCLXMultiLineEdit::getPreferredSize() throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXMultiLineEdit::getPreferredSize()
 {
     return getMinimumSize();
 }
 
-css::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -361,7 +361,7 @@ css::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const css::awt::Size& rNewSi
     return aSz;
 }
 
-css::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
 {
     SolarMutexGuard aGuard;
 
@@ -372,7 +372,7 @@ css::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLi
     return aSz;
 }
 
-void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
 {
     SolarMutexGuard aGuard;
 
@@ -409,7 +409,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven
     }
 }
 
-void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -465,7 +465,7 @@ void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const css::un
     }
 }
 
-css::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -509,7 +509,7 @@ css::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName ) thr
     return aProp;
 }
 
-void SAL_CALL VCLXMultiLineEdit::setFocus(  ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXMultiLineEdit::setFocus(  )
 {
     SolarMutexGuard aGuard;
 
@@ -547,7 +547,7 @@ VCLXFileControl::~VCLXFileControl()
         pControl->GetEdit().SetModifyHdl( Link<Edit&,void>() );
 }
 
-css::uno::Any VCLXFileControl::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXFileControl::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XTextComponent* >(this)),
@@ -563,7 +563,7 @@ IMPL_XTYPEPROVIDER_START( VCLXFileControl )
     VCLXWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -603,17 +603,17 @@ void VCLXFileControl::SetWindow( const VclPtr< vcl::Window > &pWindow )
     VCLXWindow::SetWindow( pWindow );
 }
 
-void VCLXFileControl::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFileControl::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l )
 {
     maTextListeners.addInterface( l );
 }
 
-void VCLXFileControl::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFileControl::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l )
 {
     maTextListeners.removeInterface( l );
 }
 
-void VCLXFileControl::setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFileControl::setText( const OUString& aText )
 {
     SolarMutexGuard aGuard;
 
@@ -628,7 +628,7 @@ void VCLXFileControl::setText( const OUString& aText ) throw(css::uno::RuntimeEx
     }
 }
 
-void VCLXFileControl::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFileControl::insertText( const css::awt::Selection& rSel, const OUString& aText )
 {
     SolarMutexGuard aGuard;
 
@@ -640,7 +640,7 @@ void VCLXFileControl::insertText( const css::awt::Selection& rSel, const OUStrin
     }
 }
 
-OUString VCLXFileControl::getText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXFileControl::getText()
 {
     SolarMutexGuard aGuard;
 
@@ -651,7 +651,7 @@ OUString VCLXFileControl::getText() throw(css::uno::RuntimeException, std::excep
     return aText;
 }
 
-OUString VCLXFileControl::getSelectedText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXFileControl::getSelectedText()
 {
     SolarMutexGuard aGuard;
 
@@ -663,7 +663,7 @@ OUString VCLXFileControl::getSelectedText() throw(css::uno::RuntimeException, st
 
 }
 
-void VCLXFileControl::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFileControl::setSelection( const css::awt::Selection& aSelection )
 {
     SolarMutexGuard aGuard;
 
@@ -672,7 +672,7 @@ void VCLXFileControl::setSelection( const css::awt::Selection& aSelection ) thro
         pFileControl->GetEdit().SetSelection( Selection( aSelection.Min, aSelection.Max ) );
 }
 
-css::awt::Selection VCLXFileControl::getSelection() throw(css::uno::RuntimeException, std::exception)
+css::awt::Selection VCLXFileControl::getSelection()
 {
     SolarMutexGuard aGuard;
 
@@ -686,7 +686,7 @@ css::awt::Selection VCLXFileControl::getSelection() throw(css::uno::RuntimeExcep
     return aSel;
 }
 
-sal_Bool VCLXFileControl::isEditable() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXFileControl::isEditable()
 {
     SolarMutexGuard aGuard;
 
@@ -694,7 +694,7 @@ sal_Bool VCLXFileControl::isEditable() throw(css::uno::RuntimeException, std::ex
     return pFileControl && !pFileControl->GetEdit().IsReadOnly() && pFileControl->GetEdit().IsEnabled();
 }
 
-void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFileControl::setEditable( sal_Bool bEditable )
 {
     SolarMutexGuard aGuard;
 
@@ -703,7 +703,7 @@ void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeE
         pFileControl->GetEdit().SetReadOnly( !bEditable );
 }
 
-void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFileControl::setMaxTextLen( sal_Int16 nLen )
 {
     SolarMutexGuard aGuard;
 
@@ -712,7 +712,7 @@ void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeExc
         pFileControl->GetEdit().SetMaxTextLen( nLen );
 }
 
-sal_Int16 VCLXFileControl::getMaxTextLen() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXFileControl::getMaxTextLen()
 {
     SolarMutexGuard aGuard;
 
@@ -733,7 +733,7 @@ void VCLXFileControl::ModifyHdl()
     maTextListeners.textChanged( aEvent );
 }
 
-css::awt::Size VCLXFileControl::getMinimumSize() throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFileControl::getMinimumSize()
 {
     SolarMutexGuard aGuard;
 
@@ -748,14 +748,14 @@ css::awt::Size VCLXFileControl::getMinimumSize() throw(css::uno::RuntimeExceptio
     return aSz;
 }
 
-css::awt::Size VCLXFileControl::getPreferredSize() throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFileControl::getPreferredSize()
 {
     css::awt::Size aSz = getMinimumSize();
     aSz.Height += 4;
     return aSz;
 }
 
-css::awt::Size VCLXFileControl::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFileControl::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -770,7 +770,7 @@ css::awt::Size VCLXFileControl::calcAdjustedSize( const css::awt::Size& rNewSize
     return aSz;
 }
 
-css::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 )
 {
     SolarMutexGuard aGuard;
 
@@ -784,7 +784,7 @@ css::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) thr
     return aSz;
 }
 
-void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
 {
     SolarMutexGuard aGuard;
 
@@ -828,7 +828,7 @@ void SVTXFormattedField::SetWindow( const VclPtr< vcl::Window > &_pWindow )
 }
 
 
-void SVTXFormattedField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void SVTXFormattedField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -953,7 +953,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const css::u
 }
 
 
-css::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -1421,7 +1421,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 }
 
 
-void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception)
+void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt )
 {
     SolarMutexGuard aGuard;
     VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >();
@@ -1460,12 +1460,12 @@ void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt ) t
 }
 
 
-void SVTXRoadmap::addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception)
+void SVTXRoadmap::addItemListener( const css::uno::Reference< css::awt::XItemListener >& l )
 {
     maItemListeners.addInterface( l );
 }
 
-void SVTXRoadmap::removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception)
+void SVTXRoadmap::removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l )
 {
     maItemListeners.removeInterface( l );
 }
@@ -1493,7 +1493,7 @@ RMItemData SVTXRoadmap::GetRMItemData( const css::container::ContainerEvent& _rE
     return aCurRMItemData;
 }
 
-void SVTXRoadmap::elementInserted( const css::container::ContainerEvent& _rEvent )throw(css::uno::RuntimeException, std::exception)
+void SVTXRoadmap::elementInserted( const css::container::ContainerEvent& _rEvent )
 {
     SolarMutexGuard aGuard;
     VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >();
@@ -1506,7 +1506,7 @@ void SVTXRoadmap::elementInserted( const css::container::ContainerEvent& _rEvent
     }
 }
 
-void SVTXRoadmap::elementRemoved( const css::container::ContainerEvent& _rEvent )throw(css::uno::RuntimeException, std::exception)
+void SVTXRoadmap::elementRemoved( const css::container::ContainerEvent& _rEvent )
 {
     SolarMutexGuard aGuard;
     VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >();
@@ -1518,7 +1518,7 @@ void SVTXRoadmap::elementRemoved( const css::container::ContainerEvent& _rEvent
     }
 }
 
-void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent )throw(css::uno::RuntimeException, std::exception)
+void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent )
 {
     SolarMutexGuard aGuard;
     VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >();
@@ -1532,7 +1532,7 @@ void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent
 }
 
 
-void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -1586,7 +1586,7 @@ void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any
 }
 
 
-css::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -1645,7 +1645,7 @@ SVTXNumericField::~SVTXNumericField()
 {
 }
 
-css::uno::Any SVTXNumericField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SVTXNumericField::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XNumericField* >(this)),
@@ -1660,7 +1660,7 @@ IMPL_XTYPEPROVIDER_START( SVTXNumericField )
 IMPL_XTYPEPROVIDER_END
 
 
-void SVTXNumericField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXNumericField::setValue( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1669,7 +1669,7 @@ void SVTXNumericField::setValue( double Value ) throw(css::uno::RuntimeException
         pField->SetValue( Value );
 }
 
-double SVTXNumericField::getValue() throw(css::uno::RuntimeException, std::exception)
+double SVTXNumericField::getValue()
 {
     SolarMutexGuard aGuard;
 
@@ -1677,7 +1677,7 @@ double SVTXNumericField::getValue() throw(css::uno::RuntimeException, std::excep
     return pField ? pField->GetValue() : 0;
 }
 
-void SVTXNumericField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXNumericField::setMin( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1686,7 +1686,7 @@ void SVTXNumericField::setMin( double Value ) throw(css::uno::RuntimeException,
         pField->SetMinValue( Value );
 }
 
-double SVTXNumericField::getMin() throw(css::uno::RuntimeException, std::exception)
+double SVTXNumericField::getMin()
 {
     SolarMutexGuard aGuard;
 
@@ -1694,7 +1694,7 @@ double SVTXNumericField::getMin() throw(css::uno::RuntimeException, std::excepti
     return pField ? pField->GetMinValue() : 0;
 }
 
-void SVTXNumericField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXNumericField::setMax( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1703,7 +1703,7 @@ void SVTXNumericField::setMax( double Value ) throw(css::uno::RuntimeException,
         pField->SetMaxValue( Value );
 }
 
-double SVTXNumericField::getMax() throw(css::uno::RuntimeException, std::exception)
+double SVTXNumericField::getMax()
 {
     SolarMutexGuard aGuard;
 
@@ -1711,7 +1711,7 @@ double SVTXNumericField::getMax() throw(css::uno::RuntimeException, std::excepti
     return pField ? pField->GetMaxValue() : 0;
 }
 
-void SVTXNumericField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXNumericField::setFirst( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1720,7 +1720,7 @@ void SVTXNumericField::setFirst( double Value ) throw(css::uno::RuntimeException
         pField->SetSpinFirst( Value );
 }
 
-double SVTXNumericField::getFirst() throw(css::uno::RuntimeException, std::exception)
+double SVTXNumericField::getFirst()
 {
     SolarMutexGuard aGuard;
 
@@ -1728,7 +1728,7 @@ double SVTXNumericField::getFirst() throw(css::uno::RuntimeException, std::excep
     return pField ? pField->GetSpinFirst() : 0;
 }
 
-void SVTXNumericField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXNumericField::setLast( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1737,7 +1737,7 @@ void SVTXNumericField::setLast( double Value ) throw(css::uno::RuntimeException,
         pField->SetSpinLast( Value );
 }
 
-double SVTXNumericField::getLast() throw(css::uno::RuntimeException, std::exception)
+double SVTXNumericField::getLast()
 {
     SolarMutexGuard aGuard;
 
@@ -1745,7 +1745,7 @@ double SVTXNumericField::getLast() throw(css::uno::RuntimeException, std::except
     return pField ? pField->GetSpinLast() : 0;
 }
 
-void SVTXNumericField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXNumericField::setSpinSize( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1754,7 +1754,7 @@ void SVTXNumericField::setSpinSize( double Value ) throw(css::uno::RuntimeExcept
         pField->SetSpinSize( Value );
 }
 
-double SVTXNumericField::getSpinSize() throw(css::uno::RuntimeException, std::exception)
+double SVTXNumericField::getSpinSize()
 {
     SolarMutexGuard aGuard;
 
@@ -1762,7 +1762,7 @@ double SVTXNumericField::getSpinSize() throw(css::uno::RuntimeException, std::ex
     return pField ? pField->GetSpinSize() : 0;
 }
 
-void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXNumericField::setDecimalDigits( sal_Int16 Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1771,7 +1771,7 @@ void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::Runti
         pField->SetDecimalDigits( Value );
 }
 
-sal_Int16 SVTXNumericField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 SVTXNumericField::getDecimalDigits()
 {
     SolarMutexGuard aGuard;
 
@@ -1779,7 +1779,7 @@ sal_Int16 SVTXNumericField::getDecimalDigits() throw(css::uno::RuntimeException,
     return pField ? pField->GetDecimalDigits() : 0;
 }
 
-void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
+void SVTXNumericField::setStrictFormat( sal_Bool bStrict )
 {
     SolarMutexGuard aGuard;
 
@@ -1788,7 +1788,7 @@ void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::Runti
         pField->SetStrictFormat( bStrict );
 }
 
-sal_Bool SVTXNumericField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SVTXNumericField::isStrictFormat()
 {
     SolarMutexGuard aGuard;
 
@@ -1812,7 +1812,7 @@ SVTXCurrencyField::~SVTXCurrencyField()
 {
 }
 
-css::uno::Any SVTXCurrencyField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SVTXCurrencyField::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XCurrencyField* >(this)),
@@ -1826,7 +1826,7 @@ IMPL_XTYPEPROVIDER_START( SVTXCurrencyField )
     SVTXFormattedField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void SVTXCurrencyField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setValue( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1835,7 +1835,7 @@ void SVTXCurrencyField::setValue( double Value ) throw(css::uno::RuntimeExceptio
         pField->SetValue( Value );
 }
 
-double SVTXCurrencyField::getValue() throw(css::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getValue()
 {
     SolarMutexGuard aGuard;
 
@@ -1843,7 +1843,7 @@ double SVTXCurrencyField::getValue() throw(css::uno::RuntimeException, std::exce
     return pField ? pField->GetValue() : 0;
 }
 
-void SVTXCurrencyField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setMin( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1852,7 +1852,7 @@ void SVTXCurrencyField::setMin( double Value ) throw(css::uno::RuntimeException,
         pField->SetMinValue( Value );
 }
 
-double SVTXCurrencyField::getMin() throw(css::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getMin()
 {
     SolarMutexGuard aGuard;
 
@@ -1860,7 +1860,7 @@ double SVTXCurrencyField::getMin() throw(css::uno::RuntimeException, std::except
     return pField ? pField->GetMinValue() : 0;
 }
 
-void SVTXCurrencyField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setMax( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1869,7 +1869,7 @@ void SVTXCurrencyField::setMax( double Value ) throw(css::uno::RuntimeException,
         pField->SetMaxValue( Value );
 }
 
-double SVTXCurrencyField::getMax() throw(css::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getMax()
 {
     SolarMutexGuard aGuard;
 
@@ -1877,7 +1877,7 @@ double SVTXCurrencyField::getMax() throw(css::uno::RuntimeException, std::except
     return pField ? pField->GetMaxValue() : 0;
 }
 
-void SVTXCurrencyField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setFirst( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1886,7 +1886,7 @@ void SVTXCurrencyField::setFirst( double Value ) throw(css::uno::RuntimeExceptio
         pField->SetSpinFirst( Value );
 }
 
-double SVTXCurrencyField::getFirst() throw(css::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getFirst()
 {
     SolarMutexGuard aGuard;
 
@@ -1894,7 +1894,7 @@ double SVTXCurrencyField::getFirst() throw(css::uno::RuntimeException, std::exce
     return pField ? pField->GetSpinFirst() : 0;
 }
 
-void SVTXCurrencyField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setLast( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1903,7 +1903,7 @@ void SVTXCurrencyField::setLast( double Value ) throw(css::uno::RuntimeException
         pField->SetSpinLast( Value );
 }
 
-double SVTXCurrencyField::getLast() throw(css::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getLast()
 {
     SolarMutexGuard aGuard;
 
@@ -1911,7 +1911,7 @@ double SVTXCurrencyField::getLast() throw(css::uno::RuntimeException, std::excep
     return pField ? pField->GetSpinLast() : 0;
 }
 
-void SVTXCurrencyField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setSpinSize( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1920,7 +1920,7 @@ void SVTXCurrencyField::setSpinSize( double Value ) throw(css::uno::RuntimeExcep
         pField->SetSpinSize( Value );
 }
 
-double SVTXCurrencyField::getSpinSize() throw(css::uno::RuntimeException, std::exception)
+double SVTXCurrencyField::getSpinSize()
 {
     SolarMutexGuard aGuard;
 
@@ -1928,7 +1928,7 @@ double SVTXCurrencyField::getSpinSize() throw(css::uno::RuntimeException, std::e
     return pField ? pField->GetSpinSize() : 0;
 }
 
-void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value )
 {
     SolarMutexGuard aGuard;
 
@@ -1937,7 +1937,7 @@ void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::Runt
         pField->SetDecimalDigits( Value );
 }
 
-sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 SVTXCurrencyField::getDecimalDigits()
 {
     SolarMutexGuard aGuard;
 
@@ -1945,7 +1945,7 @@ sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(css::uno::RuntimeException
     return pField ? pField->GetDecimalDigits() : 0;
 }
 
-void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict )
 {
     SolarMutexGuard aGuard;
 
@@ -1954,7 +1954,7 @@ void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::Runt
         pField->SetStrictFormat( bStrict );
 }
 
-sal_Bool SVTXCurrencyField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SVTXCurrencyField::isStrictFormat()
 {
     SolarMutexGuard aGuard;
 
@@ -1962,7 +1962,7 @@ sal_Bool SVTXCurrencyField::isStrictFormat() throw(css::uno::RuntimeException, s
     return pField && pField->IsStrictFormat();
 }
 
-void SVTXCurrencyField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void SVTXCurrencyField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -1995,7 +1995,7 @@ void SVTXCurrencyField::setProperty( const OUString& PropertyName, const css::un
         SVTXFormattedField::setProperty(PropertyName, Value);
 }
 
-css::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -2100,7 +2100,7 @@ void VCLXProgressBar::ImplUpdateValue()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXProgressBar::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXProgressBar::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XProgressBar* >(this)),
@@ -2115,7 +2115,7 @@ IMPL_XTYPEPROVIDER_START( VCLXProgressBar )
 IMPL_XTYPEPROVIDER_END
 
 // css::awt::XProgressBar
-void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception)
+void VCLXProgressBar::setForegroundColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
@@ -2127,7 +2127,7 @@ void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(css::uno::Run
     }
 }
 
-void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception)
+void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
@@ -2141,7 +2141,7 @@ void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(css::uno::Run
     }
 }
 
-void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception)
+void VCLXProgressBar::setValue( sal_Int32 nValue )
 {
     SolarMutexGuard aGuard;
 
@@ -2149,7 +2149,7 @@ void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(css::uno::RuntimeExcept
     ImplUpdateValue();
 }
 
-void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception )
+void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax )
 {
     SolarMutexGuard aGuard;
 
@@ -2169,7 +2169,7 @@ void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno:
     ImplUpdateValue();
 }
 
-sal_Int32 VCLXProgressBar::getValue() throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXProgressBar::getValue()
 {
     SolarMutexGuard aGuard;
 
@@ -2177,7 +2177,7 @@ sal_Int32 VCLXProgressBar::getValue() throw(css::uno::RuntimeException, std::exc
 }
 
 // css::awt::VclWindowPeer
-void VCLXProgressBar::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXProgressBar::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -2235,7 +2235,7 @@ void VCLXProgressBar::setProperty( const OUString& PropertyName, const css::uno:
     }
 }
 
-css::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -2292,7 +2292,7 @@ SVTXDateField::~SVTXDateField()
 {
 }
 
-void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const css::uno::Any& Value )
 {
     VCLXDateField::setProperty( PropertyName, Value );
 
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index c8cf52487645..b2b882843099 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -82,26 +82,26 @@ public:
     rtl::Reference<SvMacroTableEventDescriptor> mxEvents;
 
     // overriden helpers from PropertySetHelper
-    virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) override;
-    virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) throw(UnknownPropertyException, WrappedTargetException ) override;
+    virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) override;
+    virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) override;
 
     // XInterface
-    virtual Any SAL_CALL queryAggregation( const Type & rType ) throw(RuntimeException, std::exception) override;
-    virtual Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryAggregation( const Type & rType ) override;
+    virtual Any SAL_CALL queryInterface( const Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XTypeProvider
-    virtual Sequence< Type > SAL_CALL getTypes(  ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(RuntimeException, std::exception) override;
+    virtual Sequence< Type > SAL_CALL getTypes(  ) override;
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XEventsSupplier
-    virtual Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw(RuntimeException, std::exception) override;
+    virtual Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw( RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     static PropertySetInfo* createPropertySetInfo( sal_uInt16 nType );
@@ -299,13 +299,11 @@ IMapObject* SvUnoImageMapObject::createIMapObject() const
 // XInterface
 
 Any SAL_CALL SvUnoImageMapObject::queryInterface( const Type & rType )
-    throw( RuntimeException, std::exception )
 {
     return OWeakAggObject::queryInterface( rType );
 }
 
 Any SAL_CALL SvUnoImageMapObject::queryAggregation( const Type & rType )
-    throw(RuntimeException, std::exception)
 {
     Any aAny;
 
@@ -338,7 +336,6 @@ void SAL_CALL SvUnoImageMapObject::release() throw()
 }
 
 uno::Sequence< uno::Type > SAL_CALL SvUnoImageMapObject::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type > aTypes( 7 );
     uno::Type* pTypes = aTypes.getArray();
@@ -355,19 +352,17 @@ uno::Sequence< uno::Type > SAL_CALL SvUnoImageMapObject::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvUnoImageMapObject::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const  OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const  OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames()
-    throw(RuntimeException, std::exception)
 {
     Sequence< OUString > aSNS( 2 );
     aSNS.getArray()[0] = "com.sun.star.image.ImageMapObject";
@@ -387,7 +382,7 @@ Sequence< OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames()
     return aSNS;
 }
 
-OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL SvUnoImageMapObject::getImplementationName()
 {
     switch( mnType )
     {
@@ -403,7 +398,6 @@ OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeExce
 
 // overriden helpers from PropertySetHelper
 void SvUnoImageMapObject::_setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues )
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
 {
     bool bOk = false;
 
@@ -455,7 +449,6 @@ void SvUnoImageMapObject::_setPropertyValues( const PropertyMapEntry** ppEntries
 }
 
 void SvUnoImageMapObject::_getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValues )
-    throw(UnknownPropertyException, WrappedTargetException )
 {
     while( *ppEntries )
     {
@@ -503,7 +496,6 @@ void SvUnoImageMapObject::_getPropertyValues( const PropertyMapEntry** ppEntries
 
 
 Reference< XNameReplace > SAL_CALL SvUnoImageMapObject::getEvents()
-    throw( RuntimeException, std::exception )
 {
     return mxEvents.get();
 }
@@ -517,29 +509,29 @@ public:
 
     bool fillImageMap( ImageMap& rMap ) const;
     /// @throws IllegalArgumentException
-    static SvUnoImageMapObject* getObject( const Any& aElement ) throw( IllegalArgumentException );
+    static SvUnoImageMapObject* getObject( const Any& aElement );
 
     UNO3_GETIMPLEMENTATION_DECL( SvUnoImageMap )
 
     // XIndexContainer
-    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element ) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element ) override;
+    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override;
 
     // XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element ) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual Type SAL_CALL getElementType(  ) throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw( RuntimeException, std::exception ) override;
+    virtual Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // XSerivceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw( RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     OUString maName;
@@ -567,7 +559,6 @@ SvUnoImageMap::SvUnoImageMap( const ImageMap& rMap, const SvEventDescription* pS
 }
 
 SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement )
-    throw( IllegalArgumentException )
 {
     Reference< XInterface > xObject;
     aElement >>= xObject;
@@ -581,7 +572,6 @@ SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement )
 
 // XIndexContainer
 void SAL_CALL SvUnoImageMap::insertByIndex( sal_Int32 nIndex, const Any& Element )
-    throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
 {
     SvUnoImageMapObject* pObject = getObject( Element );
     const sal_Int32 nCount = maObjectList.size();
@@ -598,7 +588,7 @@ void SAL_CALL SvUnoImageMap::insertByIndex( sal_Int32 nIndex, const Any& Element
     }
 }
 
-void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 nIndex )
 {
     const sal_Int32 nCount = maObjectList.size();
     if( nIndex >= nCount )
@@ -617,7 +607,7 @@ void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 nIndex ) throw(IndexOutOfB
 }
 
 // XIndexReplace
-void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 nIndex, const Any& Element ) throw(IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 nIndex, const Any& Element )
 {
     SvUnoImageMapObject* pObject = getObject( Element );
     const sal_Int32 nCount = maObjectList.size();
@@ -630,12 +620,12 @@ void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 nIndex, const Any& Elemen
 }
 
 // XIndexAccess
-sal_Int32 SAL_CALL SvUnoImageMap::getCount(  ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvUnoImageMap::getCount(  )
 {
     return maObjectList.size();
 }
 
-Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 nIndex )
 {
     const sal_Int32 nCount = maObjectList.size();
     if( nIndex >= nCount )
@@ -649,31 +639,28 @@ Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 nIndex ) throw(IndexOutOfBound
 }
 
 // XElementAccess
-Type SAL_CALL SvUnoImageMap::getElementType(  ) throw(RuntimeException, std::exception)
+Type SAL_CALL SvUnoImageMap::getElementType(  )
 {
     return cppu::UnoType<XPropertySet>::get();
 }
 
-sal_Bool SAL_CALL SvUnoImageMap::hasElements(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SvUnoImageMap::hasElements(  )
 {
     return (!maObjectList.empty());
 }
 
 // XSerivceInfo
 OUString SAL_CALL SvUnoImageMap::getImplementationName(  )
-    throw(RuntimeException, std::exception)
 {
     return OUString( "org.openoffice.comp.svt.SvUnoImageMap" );
 }
 
 sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     const OUString aSN( "com.sun.star.image.ImageMap" );
     return Sequence< OUString >( &aSN, 1 );
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 492bbb9c0d27..d4977cfe456d 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -96,37 +96,37 @@ namespace {
         explicit Wizard( const css::uno::Reference< css::uno::XComponentContext >& i_rContext );
 
         // lang::XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // beans::XPropertySet
-        virtual css::uno::Reference< beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
 
         // ui::dialogs::XWizard
-        virtual OUString SAL_CALL getHelpURL() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHelpURL( const OUString& _helpurl ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< awt::XWindow > SAL_CALL getDialogWindow() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< ui::dialogs::XWizardPage > SAL_CALL getCurrentPage(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL enableButton( ::sal_Int16 WizardButton, sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDefaultButton( ::sal_Int16 WizardButton ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL travelNext(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL travelPrevious(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL enablePage( ::sal_Int16 PageID, sal_Bool Enable ) throw (container::NoSuchElementException, util::InvalidStateException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL updateTravelUI(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL advanceTo( ::sal_Int16 PageId ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL goBackTo( ::sal_Int16 PageId ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL activatePath( ::sal_Int16 PathIndex, sal_Bool Final ) throw (container::NoSuchElementException, util::InvalidStateException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getHelpURL() override;
+        virtual void SAL_CALL setHelpURL( const OUString& _helpurl ) override;
+        virtual css::uno::Reference< awt::XWindow > SAL_CALL getDialogWindow() override;
+        virtual css::uno::Reference< ui::dialogs::XWizardPage > SAL_CALL getCurrentPage(  ) override;
+        virtual void SAL_CALL enableButton( ::sal_Int16 WizardButton, sal_Bool Enable ) override;
+        virtual void SAL_CALL setDefaultButton( ::sal_Int16 WizardButton ) override;
+        virtual sal_Bool SAL_CALL travelNext(  ) override;
+        virtual sal_Bool SAL_CALL travelPrevious(  ) override;
+        virtual void SAL_CALL enablePage( ::sal_Int16 PageID, sal_Bool Enable ) override;
+        virtual void SAL_CALL updateTravelUI(  ) override;
+        virtual sal_Bool SAL_CALL advanceTo( ::sal_Int16 PageId ) override;
+        virtual sal_Bool SAL_CALL goBackTo( ::sal_Int16 PageId ) override;
+        virtual void SAL_CALL activatePath( ::sal_Int16 PathIndex, sal_Bool Final ) override;
 
         // ui::dialogs::XExecutableDialog
-        virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL execute(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+        virtual ::sal_Int16 SAL_CALL execute(  ) override;
 
         // lang::XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
    protected:
         virtual ~Wizard() override;
@@ -224,7 +224,7 @@ namespace {
     }
 
 
-    void SAL_CALL Wizard::initialize( const Sequence< Any >& i_Arguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL Wizard::initialize( const Sequence< Any >& i_Arguments )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_bInitialized )
@@ -273,20 +273,20 @@ namespace {
         return pDialog.get();
     }
 
-    OUString SAL_CALL Wizard::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL Wizard::getImplementationName()
     {
         return OUString("com.sun.star.comp.svtools.uno.Wizard");
     }
 
 
-    Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames()
     {
         Sequence< OUString > aServices { "com.sun.star.ui.dialogs.Wizard" };
         return aServices;
     }
 
 
-    Reference< XPropertySetInfo > SAL_CALL Wizard::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL Wizard::getPropertySetInfo()
     {
         return createPropertySetInfo( getInfoHelper() );
     }
@@ -306,7 +306,7 @@ namespace {
     }
 
 
-    OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException, std::exception)
+    OUString SAL_CALL Wizard::getHelpURL()
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -318,7 +318,7 @@ namespace {
     }
 
 
-    void SAL_CALL Wizard::setHelpURL( const OUString& i_HelpURL ) throw (RuntimeException, std::exception)
+    void SAL_CALL Wizard::setHelpURL( const OUString& i_HelpURL )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -330,7 +330,7 @@ namespace {
     }
 
 
-    Reference< XWindow > SAL_CALL Wizard::getDialogWindow() throw (RuntimeException, std::exception)
+    Reference< XWindow > SAL_CALL Wizard::getDialogWindow()
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -340,7 +340,7 @@ namespace {
     }
 
 
-    void SAL_CALL Wizard::enableButton( ::sal_Int16 i_WizardButton, sal_Bool i_Enable ) throw (RuntimeException, std::exception)
+    void SAL_CALL Wizard::enableButton( ::sal_Int16 i_WizardButton, sal_Bool i_Enable )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -352,7 +352,7 @@ namespace {
     }
 
 
-    void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton ) throw (RuntimeException, std::exception)
+    void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -364,7 +364,7 @@ namespace {
     }
 
 
-    sal_Bool SAL_CALL Wizard::travelNext(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL Wizard::travelNext(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -376,7 +376,7 @@ namespace {
     }
 
 
-    sal_Bool SAL_CALL Wizard::travelPrevious(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL Wizard::travelPrevious(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -388,7 +388,7 @@ namespace {
     }
 
 
-    void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, sal_Bool i_Enable ) throw (NoSuchElementException, InvalidStateException, RuntimeException, std::exception)
+    void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, sal_Bool i_Enable )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -406,7 +406,7 @@ namespace {
     }
 
 
-    void SAL_CALL Wizard::updateTravelUI(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL Wizard::updateTravelUI(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -418,7 +418,7 @@ namespace {
     }
 
 
-    sal_Bool SAL_CALL Wizard::advanceTo( ::sal_Int16 i_PageId ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL Wizard::advanceTo( ::sal_Int16 i_PageId )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -430,7 +430,7 @@ namespace {
     }
 
 
-    sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -442,7 +442,7 @@ namespace {
     }
 
 
-    Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage(  ) throw (RuntimeException, std::exception)
+    Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage(  )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -454,7 +454,7 @@ namespace {
     }
 
 
-    void SAL_CALL Wizard::activatePath( ::sal_Int16 i_PathIndex, sal_Bool i_Final ) throw (NoSuchElementException, InvalidStateException, RuntimeException, std::exception)
+    void SAL_CALL Wizard::activatePath( ::sal_Int16 i_PathIndex, sal_Bool i_Final )
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -469,14 +469,14 @@ namespace {
     }
 
 
-    void SAL_CALL Wizard::setTitle( const OUString& i_Title ) throw (RuntimeException, std::exception)
+    void SAL_CALL Wizard::setTitle( const OUString& i_Title )
     {
         // simply disambiguate
         Wizard_Base::OGenericUnoDialog::setTitle( i_Title );
     }
 
 
-    ::sal_Int16 SAL_CALL Wizard::execute(  ) throw (RuntimeException, std::exception)
+    ::sal_Int16 SAL_CALL Wizard::execute(  )
     {
         return Wizard_Base::OGenericUnoDialog::execute();
     }
diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
index ad1d1df009f2..5b46c3b7f6db 100644
--- a/svx/inc/AccessibleSvxFindReplaceDialog.hxx
+++ b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
@@ -31,8 +31,8 @@ public:
     virtual ~VCLXAccessibleSvxFindReplaceDialog() override;
     virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::rtl::OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index e0e0ac465135..041457f3a6ba 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -60,73 +60,67 @@ public:
     virtual void Init() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw () override;
     virtual void SAL_CALL release(  ) throw () override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     // XAccessibleTable
-    virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumnCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount(  ) override;
+    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override;
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders(  ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows(  ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns(  ) override;
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary(  ) override;
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex )  throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
     // XAccessibleTableSelection
-    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
+    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override ;
+    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override ;
+    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override ;
+    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override ;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName( ) override;
 
     // XComponent
     virtual void SAL_CALL disposing( ) override;
 
     // XSelectionChangeListener
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& Source)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& Source) override;
     virtual void  SAL_CALL
-        selectionChanged (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        selectionChanged (const css::lang::EventObject& rEvent) override;
     sal_Int32 mnPreviousSelectionCount;
     using AccessibleShape::disposing;
     friend class AccessibleTableHeaderShape;
 
     /// @throws css::lang::IndexOutOfBoundsException
-    void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (css::lang::IndexOutOfBoundsException );
+    void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow );
     // overwrite the SetState & ResetState to do special operation for table cell's internal text
     virtual bool SetState (sal_Int16 aState) override;
     virtual bool ResetState (sal_Int16 aState) override;
@@ -137,12 +131,12 @@ public:
     AccessibleCell* GetActiveAccessibleCell();
 
 protected:
-    virtual OUString CreateAccessibleBaseName() throw (css::uno::RuntimeException) override;
+    virtual OUString CreateAccessibleBaseName() override;
 
     sdr::table::SvxTableController* getTableController();
 
     /// @throws css::lang::IndexOutOfBoundsException
-    void checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) throw ( css::lang::IndexOutOfBoundsException );
+    void checkCellPosition( sal_Int32 nCol, sal_Int32 nRow );
 
 private:
     rtl::Reference< AccessibleTableShapeImpl > mxImpl;
@@ -168,61 +162,57 @@ public:
     AccessibleTableHeaderShape& operator=(const AccessibleTableHeaderShape&) = delete;
 
     // XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     //XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
 
     // XAccessibleTable
-    virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumnCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount(  ) override;
+    virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override;
+    virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders(  ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows(  ) override;
+    virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns(  ) override;
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary(  ) override;
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
 
     // XAccessibleTableSelection
-    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
+    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override ;
+    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override ;
+    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override ;
+    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override ;
 private:
     bool mbRow;
     rtl::Reference< AccessibleTableShape > mpTable;
diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx
index 8f816e8a65a0..d9b3747dfe24 100644
--- a/svx/inc/unomlstr.hxx
+++ b/svx/inc/unomlstr.hxx
@@ -34,10 +34,10 @@ public:
     virtual ~SvxUnoShapeModifyListener() throw() override;
 
     // css::util::XModifyListener
-    virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw(  css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override;
 
     // css::lang::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;
 
     // internal
     void invalidate() throw();
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index faa18daad23b..dd17bbdf44b5 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -273,7 +273,7 @@ void AccessibleControlShape::Init()
     }
 }
 
-void SAL_CALL AccessibleControlShape::grabFocus()  throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::grabFocus()
 {
     if ( !m_xUnoControl.is() || !isAliveMode( m_xUnoControl ) )
     {
@@ -289,12 +289,12 @@ void SAL_CALL AccessibleControlShape::grabFocus()  throw (RuntimeException, std:
     }
 }
 
-OUString SAL_CALL AccessibleControlShape::getImplementationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL AccessibleControlShape::getImplementationName()
 {
     return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" );
 }
 
-OUString AccessibleControlShape::CreateAccessibleBaseName() throw (RuntimeException)
+OUString AccessibleControlShape::CreateAccessibleBaseName()
 {
     OUString sName;
 
@@ -316,7 +316,6 @@ OUString AccessibleControlShape::CreateAccessibleBaseName() throw (RuntimeExcept
 
 OUString
     AccessibleControlShape::CreateAccessibleDescription()
-    throw (RuntimeException, std::exception)
 {
     DescriptionGenerator aDG (mxShape);
     ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape);
@@ -353,7 +352,7 @@ OUString
 IMPLEMENT_FORWARD_REFCOUNT( AccessibleControlShape, AccessibleShape )
 IMPLEMENT_GET_IMPLEMENTATION_ID( AccessibleControlShape )
 
-void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& _rEvent )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -379,7 +378,7 @@ void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent&
 #endif
 }
 
-Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType )
 {
     Any aReturn = AccessibleShape::queryInterface( _rType );
     if ( !aReturn.hasValue() )
@@ -391,7 +390,7 @@ Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) throw
     return aReturn;
 }
 
-Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL AccessibleControlShape::getTypes()
 {
     Sequence< Type > aShapeTypes = AccessibleShape::getTypes();
     Sequence< Type > aOwnTypes = AccessibleControlShape_Base::getTypes();
@@ -420,7 +419,7 @@ Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() throw (RuntimeExcep
     return aAllTypes;
 }
 
-void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& _rEvent )
 {
     if ( AccessibleEventId::STATE_CHANGED == _rEvent.EventId )
     {
@@ -455,7 +454,7 @@ void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject&
     }
 }
 
-void SAL_CALL AccessibleControlShape::modeChanged(const ModeChangeEvent& rSource) throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::modeChanged(const ModeChangeEvent& rSource)
 {
     // did it come from our inner context (the real one, not it's proxy!)?
     SAL_INFO("sw.uno", "AccessibleControlShape::modeChanged");
@@ -475,7 +474,7 @@ void SAL_CALL AccessibleControlShape::modeChanged(const ModeChangeEvent& rSource
     SAL_WARN_IF(!bReplaced, "sw.uno", "AccessibleControlShape::modeChanged: replacing ourselves away did fail");
 }
 
-void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource) throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource)
 {
     AccessibleShape::disposing( _rSource );
 }
@@ -510,7 +509,7 @@ bool AccessibleControlShape::ensureListeningState(
     return _bNeedNewListening;
 }
 
-sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( )
 {
     if ( !m_xUnoControl.is() )
         return 0;
@@ -527,7 +526,7 @@ sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) throw(Runt
     }
 }
 
-Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int32 i )
 {
     Reference< XAccessible > xChild;
     if ( !m_xUnoControl.is() )
@@ -570,7 +569,7 @@ Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sa
     return xChild;
 }
 
-Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessibleRelationSet(  )
 {
     utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
     ensureControlModelAccess();
@@ -593,7 +592,7 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessib
     return xSet;
 }
 
-OUString AccessibleControlShape::CreateAccessibleName() throw (RuntimeException, std::exception)
+OUString AccessibleControlShape::CreateAccessibleName()
 {
     ensureControlModelAccess();
 
@@ -831,7 +830,7 @@ void AccessibleControlShape::initializeComposedState()
     }
 }
 
-void SAL_CALL AccessibleControlShape::elementInserted( const css::container::ContainerEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::elementInserted( const css::container::ContainerEvent& _rEvent )
 {
     Reference< XContainer > xContainer( _rEvent.Source, UNO_QUERY );
     Reference< XControl > xControl( _rEvent.Element, UNO_QUERY );
@@ -864,12 +863,12 @@ void SAL_CALL AccessibleControlShape::elementInserted( const css::container::Con
     }
 }
 
-void SAL_CALL AccessibleControlShape::elementRemoved( const css::container::ContainerEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::elementRemoved( const css::container::ContainerEvent& )
 {
     // not interested in
 }
 
-void SAL_CALL AccessibleControlShape::elementReplaced( const css::container::ContainerEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::elementReplaced( const css::container::ContainerEvent& )
 {
     // not interested in
 }
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 20808a9a7bce..02c3aedb571e 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -86,13 +86,12 @@ void AccFrameSelector::RemoveFrameSelEventListener()
 
 
 Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext(  )
-    throw (RuntimeException, std::exception)
 {
     return this;
 }
 
 
-sal_Int32 AccFrameSelector::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 AccFrameSelector::getAccessibleChildCount(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -100,7 +99,6 @@ sal_Int32 AccFrameSelector::getAccessibleChildCount(  ) throw (RuntimeException,
 }
 
 Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -113,7 +111,6 @@ Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i )
 }
 
 Reference< XAccessible > AccFrameSelector::getAccessibleParent(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -126,7 +123,6 @@ Reference< XAccessible > AccFrameSelector::getAccessibleParent(  )
 }
 
 sal_Int32 AccFrameSelector::getAccessibleIndexInParent(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -148,13 +144,12 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent(  )
     return nIdx;
 }
 
-sal_Int16 AccFrameSelector::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 AccFrameSelector::getAccessibleRole(  )
 {
     return meBorder == FrameBorderType::NONE ? AccessibleRole::OPTION_PANE : AccessibleRole::CHECK_BOX;
 }
 
 OUString AccFrameSelector::getAccessibleDescription(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -162,7 +157,6 @@ OUString AccFrameSelector::getAccessibleDescription(  )
 }
 
 OUString AccFrameSelector::getAccessibleName(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -170,7 +164,6 @@ OUString AccFrameSelector::getAccessibleName(  )
 }
 
 Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -202,7 +195,6 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet(
 }
 
 Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
@@ -246,13 +238,11 @@ Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet(  )
 }
 
 Locale AccFrameSelector::getLocale(  )
-    throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
 {
     return Application::GetSettings().GetUILanguageTag().getLocale();
 }
 
 sal_Bool AccFrameSelector::containsPoint( const css::awt::Point& aPt )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -262,7 +252,6 @@ sal_Bool AccFrameSelector::containsPoint( const css::awt::Point& aPt )
 
 Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint(
     const css::awt::Point& aPt )
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -270,7 +259,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint(
     return mpFrameSel->GetChildAccessible( Point( aPt.X, aPt.Y ) );
 }
 
-css::awt::Rectangle AccFrameSelector::getBounds(  ) throw (RuntimeException, std::exception)
+css::awt::Rectangle AccFrameSelector::getBounds(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -296,7 +285,7 @@ css::awt::Rectangle AccFrameSelector::getBounds(  ) throw (RuntimeException, std
 }
 
 
-css::awt::Point AccFrameSelector::getLocation(  ) throw (RuntimeException, std::exception)
+css::awt::Point AccFrameSelector::getLocation(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -315,7 +304,7 @@ css::awt::Point AccFrameSelector::getLocation(  ) throw (RuntimeException, std::
 }
 
 
-css::awt::Point AccFrameSelector::getLocationOnScreen(  ) throw (RuntimeException, std::exception)
+css::awt::Point AccFrameSelector::getLocationOnScreen(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -335,7 +324,7 @@ css::awt::Point AccFrameSelector::getLocationOnScreen(  ) throw (RuntimeExceptio
 }
 
 
-css::awt::Size AccFrameSelector::getSize(  ) throw (RuntimeException, std::exception)
+css::awt::Size AccFrameSelector::getSize(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -353,7 +342,7 @@ css::awt::Size AccFrameSelector::getSize(  ) throw (RuntimeException, std::excep
     return aRet;
 }
 
-void AccFrameSelector::grabFocus(  ) throw (RuntimeException, std::exception)
+void AccFrameSelector::grabFocus(  )
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -361,7 +350,6 @@ void AccFrameSelector::grabFocus(  ) throw (RuntimeException, std::exception)
 }
 
 sal_Int32 AccFrameSelector::getForeground(  )
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
@@ -369,14 +357,13 @@ sal_Int32 AccFrameSelector::getForeground(  )
 }
 
 sal_Int32 AccFrameSelector::getBackground(  )
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IsValid();
     return mpFrameSel->GetControlBackground().GetColor();
 }
 
-void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception)
+void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
 {
     SolarMutexGuard aGuard;
 
@@ -390,7 +377,7 @@ void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleE
     }
 }
 
-void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception)
+void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
 {
     SolarMutexGuard aGuard;
 
@@ -407,19 +394,17 @@ void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessib
     }
 }
 
-OUString AccFrameSelector::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString AccFrameSelector::getImplementationName(  )
 {
     return OUString("AccFrameSelector");
 }
 
 sal_Bool AccFrameSelector::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > AccFrameSelector::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aRet(3);
     OUString* pArray = aRet.getArray();
@@ -429,7 +414,7 @@ Sequence< OUString > AccFrameSelector::getSupportedServiceNames(  )
     return aRet;
 }
 
-void AccFrameSelector::IsValid() throw (RuntimeException)
+void AccFrameSelector::IsValid()
 {
     if(!mpFrameSel)
         throw RuntimeException();
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 49cdd0e21ddd..0d65b418349e 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -45,7 +45,6 @@ AccessibleGraphicShape::~AccessibleGraphicShape()
 
 // XAccessibleImage
 OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (m_pShape)
         return m_pShape->GetTitle();
@@ -54,14 +53,12 @@ OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription()
 
 
 sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return AccessibleShape::getSize().Height;
 }
 
 
 sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return AccessibleShape::getSize().Width;
 }
@@ -69,7 +66,6 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth()
 // XInterface
 css::uno::Any SAL_CALL
     AccessibleGraphicShape::queryInterface (const css::uno::Type & rType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aReturn = AccessibleShape::queryInterface (rType);
     if ( ! aReturn.hasValue())
@@ -97,7 +93,6 @@ void SAL_CALL
 // XServiceInfo
 OUString SAL_CALL
     AccessibleGraphicShape::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessibleGraphicShape");
 }
@@ -105,7 +100,6 @@ OUString SAL_CALL
 
 css::uno::Sequence< OUString> SAL_CALL
     AccessibleGraphicShape::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     // Get list of supported service names from base class...
@@ -123,7 +117,6 @@ css::uno::Sequence< OUString> SAL_CALL
 // XTypeProvider
 uno::Sequence<uno::Type> SAL_CALL
     AccessibleGraphicShape::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     // Get list of types from the context base implementation...
     uno::Sequence<uno::Type> aTypeList (AccessibleShape::getTypes());
@@ -141,7 +134,6 @@ uno::Sequence<uno::Type> SAL_CALL
 /// Create the base name of this object, i.e. the name without appended number.
 OUString
     AccessibleGraphicShape::CreateAccessibleBaseName()
-    throw (css::uno::RuntimeException)
 {
     OUString sName;
 
@@ -163,7 +155,6 @@ OUString
 }
 
 OUString AccessibleGraphicShape::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     //Don't use the same information for accessible name and accessible description.
     OUString sDesc;
@@ -176,7 +167,6 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription()
 
 //  Return this object's role.
 sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception)
 {
     if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != nullptr )
         return AccessibleRole::IMAGE_MAP;
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index e41fa8f1af61..8376fac02cbc 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -45,30 +45,24 @@ AccessibleOLEShape::~AccessibleOLEShape()
 
 // XAccessibleAction
 sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return 0;
 }
 
 
 sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/)
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     throw lang::IndexOutOfBoundsException();
 }
 
 
 OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/)
-    throw (css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception)
 {
     throw lang::IndexOutOfBoundsException();
 }
 
 
 Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActionKeyBinding (sal_Int32 /*nIndex*/)
-    throw (css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception)
 {
     throw lang::IndexOutOfBoundsException();
 }
@@ -76,7 +70,6 @@ Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActio
 // XInterface
 css::uno::Any SAL_CALL
     AccessibleOLEShape::queryInterface (const css::uno::Type & rType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aReturn = AccessibleShape::queryInterface (rType);
     if ( ! aReturn.hasValue())
@@ -104,7 +97,6 @@ void SAL_CALL
 // XServiceInfo
 OUString SAL_CALL
     AccessibleOLEShape::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessibleOLEShape");
 }
@@ -112,7 +104,6 @@ OUString SAL_CALL
 
 css::uno::Sequence< OUString> SAL_CALL
     AccessibleOLEShape::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
     // Get list of supported service names from base class...
@@ -130,7 +121,6 @@ css::uno::Sequence< OUString> SAL_CALL
 // XTypeProvider
 uno::Sequence<uno::Type> SAL_CALL
     AccessibleOLEShape::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     // Get list of types from the context base implementation...
     uno::Sequence<uno::Type> aTypeList (AccessibleShape::getTypes());
@@ -146,7 +136,6 @@ uno::Sequence<uno::Type> SAL_CALL
 
 // XAccessibleExtendedAttributes
 uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     uno::Any strRet;
     ::rtl::OUString style;
@@ -162,7 +151,6 @@ uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes()
 /// Set this object's name if is different to the current name.
 OUString
     AccessibleOLEShape::CreateAccessibleBaseName()
-    throw (css::uno::RuntimeException)
 {
     OUString sName;
 
@@ -194,7 +182,6 @@ OUString
 
 OUString
     AccessibleOLEShape::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return CreateAccessibleName ();
 }
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 8df4e044dff2..455423730c7f 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -299,7 +299,6 @@ bool AccessibleShape::GetState (sal_Int16 aState)
 
 // OverWrite the parent's getAccessibleName method
 OUString SAL_CALL AccessibleShape::getAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
         ThrowIfDisposed ();
     if (m_pShape && !m_pShape->GetTitle().isEmpty())
@@ -309,7 +308,6 @@ OUString SAL_CALL AccessibleShape::getAccessibleName()
 }
 
 OUString SAL_CALL AccessibleShape::getAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     if( m_pShape && !m_pShape->GetDescription().isEmpty())
@@ -324,7 +322,6 @@ OUString SAL_CALL AccessibleShape::getAccessibleDescription()
 */
 sal_Int32 SAL_CALL
        AccessibleShape::getAccessibleChildCount ()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (IsDisposed())
     {
@@ -349,7 +346,6 @@ sal_Int32 SAL_CALL
 */
 uno::Reference<XAccessible> SAL_CALL
     AccessibleShape::getAccessibleChild (sal_Int32 nIndex)
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -379,7 +375,6 @@ uno::Reference<XAccessible> SAL_CALL
 
 uno::Reference<XAccessibleRelationSet> SAL_CALL
     AccessibleShape::getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     if (mpParent == nullptr)
@@ -405,7 +400,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
 */
 uno::Reference<XAccessibleStateSet> SAL_CALL
     AccessibleShape::getAccessibleStateSet()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
     Reference<XAccessibleStateSet> xStateSet;
@@ -482,7 +476,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
 uno::Reference<XAccessible > SAL_CALL
     AccessibleShape::getAccessibleAtPoint (
         const awt::Point& aPoint)
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -513,7 +506,6 @@ uno::Reference<XAccessible > SAL_CALL
 
 
 awt::Rectangle SAL_CALL AccessibleShape::getBounds()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard (maMutex);
@@ -626,7 +618,6 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
 
 
 awt::Point SAL_CALL AccessibleShape::getLocation()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     awt::Rectangle aBoundingBox (getBounds());
@@ -635,7 +626,6 @@ awt::Point SAL_CALL AccessibleShape::getLocation()
 
 
 awt::Point SAL_CALL AccessibleShape::getLocationOnScreen()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
 
@@ -658,7 +648,6 @@ awt::Point SAL_CALL AccessibleShape::getLocationOnScreen()
 
 
 awt::Size SAL_CALL AccessibleShape::getSize()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     awt::Rectangle aBoundingBox (getBounds());
@@ -667,7 +656,6 @@ awt::Size SAL_CALL AccessibleShape::getSize()
 
 
 sal_Int32 SAL_CALL AccessibleShape::getForeground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     sal_Int32 nColor (0x0ffffffL);
@@ -691,7 +679,6 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground()
 
 
 sal_Int32 SAL_CALL AccessibleShape::getBackground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     sal_Int32 nColor (0L);
@@ -730,7 +717,6 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground()
 // XAccessibleEventBroadcaster
 void SAL_CALL AccessibleShape::addAccessibleEventListener (
     const Reference<XAccessibleEventListener >& rxListener)
-    throw (uno::RuntimeException, std::exception)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -749,7 +735,6 @@ void SAL_CALL AccessibleShape::addAccessibleEventListener (
 
 void SAL_CALL AccessibleShape::removeAccessibleEventListener (
     const Reference<XAccessibleEventListener >& rxListener)
-    throw (uno::RuntimeException, std::exception)
 {
     AccessibleContextBase::removeAccessibleEventListener (rxListener);
     if (mpText != nullptr)
@@ -759,7 +744,6 @@ void SAL_CALL AccessibleShape::removeAccessibleEventListener (
 // XInterface
 css::uno::Any SAL_CALL
     AccessibleShape::queryInterface (const css::uno::Type & rType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aReturn = AccessibleContextBase::queryInterface (rType);
     if ( ! aReturn.hasValue())
@@ -795,14 +779,11 @@ void SAL_CALL
 
 // XAccessibleSelection
 void SAL_CALL AccessibleShape::selectAccessibleChild( sal_Int32 )
-throw ( IndexOutOfBoundsException, RuntimeException, std::exception )
 {
 }
 
 
 sal_Bool SAL_CALL AccessibleShape::isAccessibleChildSelected( sal_Int32 nChildIndex )
-throw ( IndexOutOfBoundsException,
-       RuntimeException, std::exception )
 {
     uno::Reference<XAccessible> xAcc = getAccessibleChild( nChildIndex );
     uno::Reference<XAccessibleContext> xContext;
@@ -844,19 +825,16 @@ throw ( IndexOutOfBoundsException,
 
 
 void SAL_CALL AccessibleShape::clearAccessibleSelection(  )
-throw ( RuntimeException, std::exception )
 {
 }
 
 
 void SAL_CALL AccessibleShape::selectAllAccessibleChildren(  )
-throw ( RuntimeException, std::exception )
 {
 }
 
 
 sal_Int32 SAL_CALL AccessibleShape::getSelectedAccessibleChildCount()
-throw ( RuntimeException, std::exception )
 {
     sal_Int32 nCount = 0;
     sal_Int32 TotalCount = getAccessibleChildCount();
@@ -868,7 +846,6 @@ throw ( RuntimeException, std::exception )
 
 
 Reference<XAccessible> SAL_CALL AccessibleShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-throw ( IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if ( nSelectedChildIndex > getSelectedAccessibleChildCount() )
         throw IndexOutOfBoundsException();
@@ -885,15 +862,12 @@ throw ( IndexOutOfBoundsException, RuntimeException, std::exception)
 
 
 void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int32 )
-                                                            throw ( IndexOutOfBoundsException,
-                                                            RuntimeException, std::exception )
 {
 
 }
 
 // XAccessibleExtendedAttributes
 uno::Any SAL_CALL AccessibleShape::getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     uno::Any strRet;
     OUString style;
@@ -910,7 +884,6 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes()
 // XServiceInfo
 OUString SAL_CALL
     AccessibleShape::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("AccessibleShape");
 }
@@ -918,7 +891,6 @@ OUString SAL_CALL
 
 uno::Sequence<OUString> SAL_CALL
     AccessibleShape::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     // Get list of supported service names from base class...
@@ -936,7 +908,6 @@ uno::Sequence<OUString> SAL_CALL
 // XTypeProvider
 uno::Sequence<uno::Type> SAL_CALL
     AccessibleShape::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     // Get list of types from the context base implementation, ...
@@ -975,7 +946,6 @@ uno::Sequence<uno::Type> SAL_CALL
 */
 void SAL_CALL
     AccessibleShape::disposing (const lang::EventObject& aEvent)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard (maMutex);
@@ -999,7 +969,6 @@ void SAL_CALL
 // document::XEventListener
 void SAL_CALL
     AccessibleShape::notifyEvent (const document::EventObject& rEventObject)
-    throw (uno::RuntimeException, std::exception)
 {
     // First check if the event is for us.
     uno::Reference<drawing::XShape> xShape (
@@ -1057,7 +1026,6 @@ AccessibleShape*
 
 sal_Int64 SAL_CALL
     AccessibleShape::getSomething( const uno::Sequence< sal_Int8 >& rIdentifier )
-    throw(uno::RuntimeException, std::exception)
 {
     sal_Int64 nReturn( 0 );
 
@@ -1088,20 +1056,17 @@ void AccessibleShape::ViewForwarderChanged()
 // protected internal
 // Set this object's name if is different to the current name.
 OUString AccessibleShape::CreateAccessibleBaseName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return ShapeTypeHandler::CreateAccessibleBaseName( mxShape );
 }
 
 
 OUString AccessibleShape::CreateAccessibleName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return GetFullAccessibleName(this);
 }
 
 OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape)
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString sName (shape->CreateAccessibleBaseName());
     // Append the shape's index to the name to disambiguate between shapes
@@ -1138,7 +1103,6 @@ OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape)
 
 OUString
     AccessibleShape::CreateAccessibleDescription()
-    throw (css::uno::RuntimeException, std::exception)
 {
     DescriptionGenerator aDG (mxShape);
     aDG.Initialize (CreateAccessibleBaseName());
@@ -1248,7 +1212,6 @@ void AccessibleShape::disposing()
 
 sal_Int32 SAL_CALL
        AccessibleShape::getAccessibleIndexInParent()
-    throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed ();
     //  Use a simple but slow solution for now.  Optimize later.
@@ -1294,7 +1257,6 @@ void AccessibleShape::UpdateNameAndDescription()
 
 //  Return this object's role.
 sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nAccessibleRole =  AccessibleRole::SHAPE ;
     switch (ShapeTypeHandler::Instance().GetTypeId (mxShape))
@@ -1332,7 +1294,6 @@ struct XShapePosCompareHelper
 // XAccessibleGroupPosition
 uno::Sequence< sal_Int32 > SAL_CALL
 AccessibleShape::getGroupPosition( const uno::Any& )
-throw (uno::RuntimeException, std::exception)
 {
     // we will return the:
     // [0] group level
@@ -1425,7 +1386,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 OUString AccessibleShape::getObjectLink( const uno::Any& )
-    throw (uno::RuntimeException, std::exception)
 {
     OUString aRet;
 
@@ -1447,7 +1407,6 @@ OUString AccessibleShape::getObjectLink( const uno::Any& )
 
 // XAccesibleHypertext
 sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     // MT: Introduced with IA2 CWS, but SvxAccessibleHyperlink was redundant to svx::AccessibleHyperlink which we introduced meanwhile.
     // Code need to be adapted....
@@ -1463,7 +1422,6 @@ sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount()
 }
 uno::Reference< XAccessibleHyperlink > SAL_CALL
     AccessibleShape::getHyperLink( sal_Int32 )
-    throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     uno::Reference< XAccessibleHyperlink > xRet;
     // MT: Introduced with IA2 CWS, but SvxAccessibleHyperlink was redundant to svx::AccessibleHyperlink which we introduced meanwhile.
@@ -1478,48 +1436,47 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
     return xRet;
 }
 sal_Int32 SAL_CALL AccessibleShape::getHyperLinkIndex( sal_Int32 )
-throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nRet = 0;
     return nRet;
 }
 // XAccesibleText
-sal_Int32 SAL_CALL AccessibleShape::getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception){return 0;}
-sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return false;}
-sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;}
-css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleShape::getCaretPosition(  ){return 0;}
+sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ){return false;}
+sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ){return 0;}
+css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const css::uno::Sequence< OUString >& )
 {
     uno::Sequence< css::beans::PropertyValue > aValues(0);
     return aValues;
 }
-css::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+css::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 )
 {
     return css::awt::Rectangle(0, 0, 0, 0 );
 }
-sal_Int32 SAL_CALL AccessibleShape::getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception){return 0;}
-sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception){return 0;}
-OUString SAL_CALL AccessibleShape::getSelectedText(  ) throw (css::uno::RuntimeException, std::exception){return OUString();}
-sal_Int32 SAL_CALL AccessibleShape::getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception){return 0;}
-sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception){return 0;}
-sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;}
-OUString SAL_CALL AccessibleShape::getText(  ) throw (css::uno::RuntimeException, std::exception){return OUString();}
-OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();}
-css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleShape::getCharacterCount(  ){return 0;}
+sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const css::awt::Point& ){return 0;}
+OUString SAL_CALL AccessibleShape::getSelectedText(  ){return OUString();}
+sal_Int32 SAL_CALL AccessibleShape::getSelectionStart(  ){return 0;}
+sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd(  ){return 0;}
+sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ){return true;}
+OUString SAL_CALL AccessibleShape::getText(  ){return OUString();}
+OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ){return OUString();}
+css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 )
 {
     css::accessibility::TextSegment aResult;
     return aResult;
 }
-css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 )
 {
     css::accessibility::TextSegment aResult;
     return aResult;
 }
-css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 )
 {
     css::accessibility::TextSegment aResult;
     return aResult;
 }
-sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;}
+sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ){return true;}
 
 } // end of namespace accessibility
 
diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
index 2430b5420b7b..01fb333104c0 100644
--- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
+++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
@@ -80,13 +80,13 @@ void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi
 // XServiceInfo
 
 
-OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() throw (RuntimeException, std::exception)
+OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName()
 {
     return OUString( "VCLXAccessibleSvxFindReplaceDialog" );
 }
 
 
-Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames()
 {
     Sequence< OUString > aNames { "VCLXAccessibleSvxFindReplaceDialog" };
     return aNames;
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index d1a7acde0f07..972228117db5 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
@@ -55,21 +55,16 @@ long ChildrenManager::GetChildCount() const throw ()
 }
 
 css::uno::Reference<XAccessible> ChildrenManager::GetChild (long nIndex)
-    throw (css::uno::RuntimeException,
-           css::lang::IndexOutOfBoundsException)
 {
     return mpImpl->GetChild (nIndex);
 }
 
 Reference<XAccessible> ChildrenManager::GetChild (const Reference<drawing::XShape>& xShape)
-    throw (css::uno::RuntimeException)
 {
     return mpImpl->GetChild (xShape);
 }
 
 css::uno::Reference<css::drawing::XShape> ChildrenManager::GetChildShape(long nIndex)
-    throw (css::uno::RuntimeException,
-           css::lang::IndexOutOfBoundsException)
 {
     return mpImpl->GetChildShape(nIndex);
 }
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 74fb7e481c4e..b3674b56f1d9 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -106,8 +106,6 @@ long ChildrenManagerImpl::GetChildCount() const throw ()
 
 
 css::uno::Reference<css::drawing::XShape> ChildrenManagerImpl::GetChildShape(long nIndex)
-    throw (css::uno::RuntimeException,
-           css::lang::IndexOutOfBoundsException)
 {
     uno::Reference<XAccessible> xAcc = GetChild(nIndex);
     ChildDescriptorListType::const_iterator aEnd = maVisibleChildren.end();
@@ -124,8 +122,6 @@ css::uno::Reference<css::drawing::XShape> ChildrenManagerImpl::GetChildShape(lon
 */
 uno::Reference<XAccessible>
     ChildrenManagerImpl::GetChild (long nIndex)
-    throw (css::uno::RuntimeException,
-           css::lang::IndexOutOfBoundsException)
 {
     // Check whether the given index is valid.
     if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size())
@@ -142,7 +138,6 @@ uno::Reference<XAccessible>
 */
 uno::Reference<XAccessible>
     ChildrenManagerImpl::GetChild (ChildDescriptor& rChildDescriptor,sal_Int32 _nIndex)
-    throw (css::uno::RuntimeException)
 {
     if ( ! rChildDescriptor.mxAccessibleShape.is())
     {
@@ -178,7 +173,6 @@ uno::Reference<XAccessible>
 
 uno::Reference<XAccessible>
     ChildrenManagerImpl::GetChild (const uno::Reference<drawing::XShape>& xShape)
-    throw (uno::RuntimeException)
 {
     ChildDescriptorListType::const_iterator aEnd = maVisibleChildren.end();
     for (ChildDescriptorListType::iterator I = maVisibleChildren.begin(); I != aEnd; ++I)
@@ -623,7 +617,6 @@ void ChildrenManagerImpl::SetInfo (const AccessibleShapeTreeInfo& rShapeTreeInfo
 // lang::XEventListener
 void SAL_CALL
     ChildrenManagerImpl::disposing (const lang::EventObject& rEventObject)
-    throw (uno::RuntimeException, std::exception)
 {
     if (rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster()
             || rEventObject.Source == maShapeTreeInfo.GetController())
@@ -655,7 +648,6 @@ void SAL_CALL
 void SAL_CALL
     ChildrenManagerImpl::notifyEvent (
         const document::EventObject& rEventObject)
-    throw (uno::RuntimeException, std::exception)
 {
     if (rEventObject.EventName == "ShapeInserted")
         AddShape (Reference<drawing::XShape>(rEventObject.Source, uno::UNO_QUERY));
@@ -667,7 +659,6 @@ void SAL_CALL
 // view::XSelectionChangeListener
 void  SAL_CALL
     ChildrenManagerImpl::selectionChanged (const lang::EventObject& /*rEvent*/)
-        throw (uno::RuntimeException, std::exception)
 {
     UpdateSelection ();
 }
@@ -734,7 +725,6 @@ bool ChildrenManagerImpl::ReplaceChild (
     const css::uno::Reference< css::drawing::XShape >& _rxShape,
     const long /*_nIndex*/,
     const AccessibleShapeTreeInfo& _rShapeTreeInfo)
-    throw (uno::RuntimeException)
 {
     AccessibleShapeInfo aShapeInfo( _rxShape, pCurrentChild->getAccessibleParent(), this );
     // create the new child
@@ -783,7 +773,7 @@ bool ChildrenManagerImpl::ReplaceChild (
 }
 
 // Add the impl method for IAccessibleParent interface
-AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException)
+AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet)
 {
     sal_Int32 count = GetChildCount();
     for (sal_Int32 index=0;index<count;index++)
@@ -800,7 +790,6 @@ AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::b
 }
 uno::Reference<XAccessible>
     ChildrenManagerImpl::GetAccessibleCaption (const uno::Reference<drawing::XShape>& xShape)
-    throw (uno::RuntimeException)
 {
     ChildDescriptorListType::const_iterator aEnd = maVisibleChildren.end();
     for (ChildDescriptorListType::iterator I = maVisibleChildren.begin(); I != aEnd; ++I)
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 27d73b74034c..8bd8f6ee0da5 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -120,9 +120,7 @@ public:
 
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IndexOutOfBoundsException
-    css::uno::Reference<css::drawing::XShape> GetChildShape(long nIndex)
-        throw (css::uno::RuntimeException,
-               css::lang::IndexOutOfBoundsException);
+    css::uno::Reference<css::drawing::XShape> GetChildShape(long nIndex);
     /** Return the requested accessible child or throw and
         IndexOutOfBoundsException if the given index is invalid.
         @param nIndex
@@ -137,9 +135,7 @@ public:
             Throws an IndexOutOfBoundsException if the index is not valid.
     */
     css::uno::Reference<css::accessibility::XAccessible>
-        GetChild (long nIndex)
-        throw (css::uno::RuntimeException,
-               css::lang::IndexOutOfBoundsException);
+        GetChild (long nIndex);
 
     /** Return the requested accessible child.
         @param aChildDescriptor
@@ -154,8 +150,7 @@ public:
         @throws css::uno::RuntimeException
     */
     css::uno::Reference<css::accessibility::XAccessible>
-        GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex)
-        throw (css::uno::RuntimeException);
+        GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex);
 
     /** Return the requested accessible child given a shape.  This method
         searches the list of descriptors for the one that holds the
@@ -171,8 +166,7 @@ public:
         @throws css::uno::RuntimeException
     */
     css::uno::Reference<css::accessibility::XAccessible>
-        GetChild (const css::uno::Reference<css::drawing::XShape>& xShape)
-        throw (css::uno::RuntimeException);
+        GetChild (const css::uno::Reference<css::drawing::XShape>& xShape);
 
     /** Update the child manager.  Take care of a modified set of children
         and modified visible area.  This method can optimize the update
@@ -241,18 +235,15 @@ public:
 
     // lang::XEventListener
     virtual void SAL_CALL
-        disposing (const css::lang::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        disposing (const css::lang::EventObject& rEventObject) override;
 
     // document::XEventListener
     virtual void SAL_CALL
-        notifyEvent (const css::document::EventObject& rEventObject)
-        throw (css::uno::RuntimeException, std::exception) override;
+        notifyEvent (const css::document::EventObject& rEventObject) override;
 
     // view::XSelectionChangeListener
     virtual void  SAL_CALL
-        selectionChanged (const css::lang::EventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+        selectionChanged (const css::lang::EventObject& rEvent) override;
 
     // IAccessibleViewForwarderListener
     /** Informs this children manager and its children about a change of one
@@ -283,15 +274,13 @@ public:
         const css::uno::Reference< css::drawing::XShape >& _rxShape,
         const long _nIndex,
         const AccessibleShapeTreeInfo& _rShapeTreeInfo
-    )   throw (css::uno::RuntimeException) override;
+    ) override;
 
     // Add the impl method for IAccessibleParent interface
     virtual AccessibleControlShape* GetAccControlShapeFromModel
-        (css::beans::XPropertySet* pSet)
-        throw (css::uno::RuntimeException) override;
+        (css::beans::XPropertySet* pSet) override;
     virtual css::uno::Reference<css::accessibility::XAccessible>
-        GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape)
-        throw (css::uno::RuntimeException) override;
+        GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape) override;
 protected:
     /** This list holds the descriptors of all currently visible shapes and
         associated accessible object.
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 6f7e27cf8a13..768b58b94e9d 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -153,13 +153,13 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessible(
 }
 
 // XAccessible
-Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception )
+Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext()
 {
     return this;
 }
 
 // XAccessibleComponent
-sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point& rPoint )
 {
     // no guard -> done in getSize()
     awt::Size aSize (getSize());
@@ -170,7 +170,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point
 }
 
 
-Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception )
+Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -200,7 +200,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt
 }
 
 
-awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( RuntimeException, std::exception )
+awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds()
 {
     // no guard -> done in GetBoundingBox()
     Rectangle           aCoreBounds( GetBoundingBox() );
@@ -213,7 +213,7 @@ awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( Runtim
 }
 
 
-awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation()
 {
     // no guard -> done in GetBoundingBox()
     Rectangle   aRect( GetBoundingBox() );
@@ -221,7 +221,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeE
 }
 
 
-awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen()
 {
     // no guard -> done in GetBoundingBoxOnScreen()
     Rectangle   aRect( GetBoundingBoxOnScreen() );
@@ -229,7 +229,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw(
 }
 
 
-awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeException, std::exception )
+awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize()
 {
     // no guard -> done in GetBoundingBox()
     Rectangle   aRect( GetBoundingBox() );
@@ -237,7 +237,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept
 }
 
 // XAccessibleContext
-sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount()
 {
     ::SolarMutexGuard aGuard;
 
@@ -250,7 +250,6 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() thro
 
 /** returns the SdrObject at index nIndex from the model of this graph */
 SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex )
-    throw( RuntimeException, lang::IndexOutOfBoundsException )
 {
     ::SolarMutexGuard aGuard;
 
@@ -281,7 +280,6 @@ void SvxGraphCtrlAccessibleContext::CommitChange (
 }
 
 Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex )
-    throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -289,13 +287,13 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh
 }
 
 
-Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception )
+Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent()
 {
     return mxParent;
 }
 
 
-sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent()
 {
     ::SolarMutexGuard aGuard;
     //  Use a simple but slow solution for now.  Optimize later.
@@ -326,20 +324,20 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() t
 }
 
 
-sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole()
 {
     return AccessibleRole::PANEL;
 }
 
 
-OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription()
 {
     ::SolarMutexGuard aGuard;
     return msDescription;
 }
 
 
-OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName()
 {
     ::SolarMutexGuard aGuard;
     return msName;
@@ -349,13 +347,13 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( Runt
 /** Return empty reference to indicate that the relation set is not
     supported.
 */
-Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception )
+Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet()
 {
     return Reference< XAccessibleRelationSet >();
 }
 
 
-Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception )
+Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet()
 {
     ::SolarMutexGuard aGuard;
 
@@ -379,7 +377,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce
 }
 
 
-lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception )
+lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale()
 {
     ::SolarMutexGuard aGuard;
 
@@ -396,7 +394,6 @@ lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() throw( IllegalA
 
 // XAccessibleEventListener
 void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -409,7 +406,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const R
 
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -428,7 +424,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( cons
     }
 }
 
-void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException, std::exception )
+void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus()
 {
     ::SolarMutexGuard aGuard;
 
@@ -439,7 +435,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException
 }
 
 sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     svtools::ColorConfig aColorConfig;
     sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
@@ -447,24 +442,23 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground()
 }
 
 sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground()
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor();
     return static_cast<sal_Int32>(nColor);
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName()
 {
     return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" );
 }
 
-sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames()
 {
     Sequence< OUString > aSNs( 3 );
 
@@ -476,19 +470,19 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService
 }
 
 // XTypeProvider
-Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception )
+Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceName
-OUString SvxGraphCtrlAccessibleContext::getServiceName() throw( RuntimeException, std::exception )
+OUString SvxGraphCtrlAccessibleContext::getServiceName()
 {
     return OUString( "com.sun.star.accessibility.AccessibleContext" );
 }
 
 // XAccessibleSelection
-void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception )
+void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex )
 {
     ::SolarMutexGuard aGuard;
 
@@ -502,7 +496,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI
 }
 
 
-sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex )
 {
     ::SolarMutexGuard aGuard;
 
@@ -513,7 +507,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_
 }
 
 
-void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException, std::exception )
+void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection()
 {
     ::SolarMutexGuard aGuard;
 
@@ -524,7 +518,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R
 }
 
 
-void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException, std::exception )
+void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren()
 {
     ::SolarMutexGuard aGuard;
 
@@ -535,7 +529,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw
 }
 
 
-sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount()
 {
     ::SolarMutexGuard aGuard;
 
@@ -548,7 +542,6 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun
 
 
 Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex )
-    throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -565,7 +558,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce
 }
 
 
-void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception )
+void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex )
 {
     ::SolarMutexGuard aGuard;
 
@@ -594,7 +587,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32
 }
 
 // internals
-void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) throw( lang::IndexOutOfBoundsException )
+void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex )
 {
     if( nIndex < 0 || nIndex >= getSelectedAccessibleChildCount() )
         throw lang::IndexOutOfBoundsException();
@@ -667,7 +660,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
 }
 
 
-Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException )
+Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen()
 {
     ::SolarMutexGuard aGuard;
 
@@ -685,7 +678,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( Runtime
     between the absolute coordinates of the bounding boxes of this control
     and its parent in the accessibility tree.
 */
-Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox() throw( RuntimeException )
+Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox()
 {
     ::SolarMutexGuard aGuard;
 
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 0febf58709a0..0fbeac31e756 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -200,7 +200,6 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape
 /// get the accessible base name for an object
 OUString
     ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference<drawing::XShape>& rxShape)
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nResourceId;
     OUString sName;
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 3d801af3f847..74da070ffba9 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -70,7 +70,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent(
         m_xTable->fireEvent(_nEventId,_rOldValue,_rNewValue);
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount(  )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -78,7 +78,6 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount(  ) throw (
 }
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleAtPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -105,14 +104,13 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtual
 }
 
 void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     mpParent->GrabFocus();
 }
 
-Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -130,7 +128,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild(
     return m_xTable.get();
 }
 
-Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent(  )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -143,7 +141,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent(
     return xRet;
 }
 
-css::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds(  ) throw (RuntimeException)
+css::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds(  )
 {
     css::awt::Rectangle aBounds ( 0, 0, 0, 0 );
     vcl::Window* pWindow = mpParent;
@@ -163,29 +161,29 @@ css::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds(  ) throw (RuntimeEx
     return aBounds;
 }
 
-sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole(  )
 {
     return css::accessibility::AccessibleRole::SCROLL_PANE;
 }
 
-OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription(  )
 {
     OExternalLockGuard aGuard( this );
     return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION);
 }
 
-OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
     return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC);
 }
 
-Reference< XAccessibleRelationSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRelationSet(  )
 {
     return Reference< XAccessibleRelationSet >();
 }
 
-Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -282,7 +280,7 @@ void SAL_CALL SvxShowCharSetAcc::disposing()
 IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base )
 
-bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException)
+bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex )
 {
     return m_pParent && m_pParent->getCharSetControl()->IsSelected(
         sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex));
@@ -290,7 +288,6 @@ bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw
 
         // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
 void SvxShowCharSetAcc::implSelect(sal_Int32 nAccessibleChildIndex, bool bSelect)
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if ( m_pParent )
     {
@@ -301,7 +298,7 @@ void SvxShowCharSetAcc::implSelect(sal_Int32 nAccessibleChildIndex, bool bSelect
     }
 }
 
-css::awt::Rectangle SvxShowCharSetAcc::implGetBounds(  ) throw (RuntimeException)
+css::awt::Rectangle SvxShowCharSetAcc::implGetBounds(  )
 {
     const Point   aOutPos;//( m_pParent->getCharSetControl()->GetPosPixel() );
     Size          aOutSize( m_pParent->getCharSetControl()->GetOutputSizePixel());
@@ -322,7 +319,6 @@ css::awt::Rectangle SvxShowCharSetAcc::implGetBounds(  ) throw (RuntimeException
 }
 
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -331,7 +327,6 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount()
 
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleChild( sal_Int32 i )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -352,7 +347,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge
 
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -361,14 +355,12 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge
 
 
 sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::accessibility::AccessibleRole::TABLE;
 }
 
 
 OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION );
@@ -376,7 +368,6 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription()
 
 
 OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -385,14 +376,12 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName()
 
 
 uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetAcc::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< css::accessibility::XAccessibleRelationSet >();
 }
 
 
 uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetAcc::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
 
@@ -422,7 +411,6 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe
 
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleAtPoint( const awt::Point& aPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -440,54 +428,53 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge
 }
 
 void SAL_CALL SvxShowCharSetAcc::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     m_pParent->getCharSetControl()->GrabFocus();
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowCount(  )
 {
     return ((getAccessibleChildCount()-1) / COLUMN_COUNT) + 1;
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount(  )
 {
     return COLUMN_COUNT;
 }
 
-OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ )
 {
     return OUString();
 }
 
-OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ )
 {
     return OUString();
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ )
 {
     return 1;
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ )
 {
     return 1;
 }
 
-Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleRowHeaders(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleRowHeaders(  )
 {
     return Reference< XAccessibleTable >();
 }
 
-Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleColumnHeaders(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleColumnHeaders(  )
 {
     return Reference< XAccessibleTable >();
 }
 
-Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows(  )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -496,7 +483,7 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows(  )
     return aSel;
 }
 
-Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns(  )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -505,21 +492,21 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns(
     return aSel;
 }
 
-sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return SvxShowCharSet::GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nRow;
 }
 
-sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return SvxShowCharSet::GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nColumn;
 }
 
-Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -530,36 +517,36 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In
     return pItem->GetAccessible();
 }
 
-Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCaption(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCaption(  )
 {
     return Reference< XAccessible >();
 }
 
-Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleSummary(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleSummary(  )
 {
     return Reference< XAccessible >();
 }
 
-sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return m_pParent->getCharSetControl()->GetSelectIndexId() == getAccessibleIndex(nRow,nColumn);
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
 {
     return (nRow*COLUMN_COUNT) + nColumn;
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return SvxShowCharSet::GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex )
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -597,21 +584,18 @@ void SvxShowCharSetItemAcc::ParentDestroyed()
 
 
 sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount()
-    throw (uno::RuntimeException, std::exception)
 {
     return 0;
 }
 
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleChild( sal_Int32 /*i*/ )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     throw lang::IndexOutOfBoundsException();
 }
 
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleParent()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -620,14 +604,12 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc
 
 
 sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::accessibility::AccessibleRole::TABLE_CELL;
 }
 
 
 OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -657,7 +639,6 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription()
 
 
 OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -676,14 +657,12 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName()
 
 
 uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleRelationSet()
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< css::accessibility::XAccessibleRelationSet >();
 }
 
 
 uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleStateSet()
-    throw (uno::RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
@@ -718,13 +697,13 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe
 }
 
 
-sal_Int32 SvxShowCharSetItemAcc::getAccessibleActionCount() throw (RuntimeException, std::exception)
+sal_Int32 SvxShowCharSetItemAcc::getAccessibleActionCount()
 {
     return 1;
 }
 
 
-sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
 
@@ -737,7 +716,7 @@ sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) throw (I
 }
 
 
-OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     if( nIndex == 0 )
         return OUString( "press" );
@@ -745,7 +724,7 @@ OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nInde
 }
 
 
-Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     if( nIndex == 0 )
         return Reference< css::accessibility::XAccessibleKeyBinding >();
@@ -754,12 +733,11 @@ Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::ge
 
 
 void SAL_CALL SvxShowCharSetItemAcc::grabFocus()
-    throw (uno::RuntimeException, std::exception)
 {
     // nothing to do
 }
 
-awt::Rectangle SvxShowCharSetItemAcc::implGetBounds(  ) throw (RuntimeException)
+awt::Rectangle SvxShowCharSetItemAcc::implGetBounds(  )
 {
     awt::Rectangle      aRet;
 
@@ -781,12 +759,11 @@ awt::Rectangle SvxShowCharSetItemAcc::implGetBounds(  ) throw (RuntimeException)
 }
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleAtPoint( const awt::Point& /*aPoint*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< css::accessibility::XAccessible >();
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -809,7 +786,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground(  ) throw (RuntimeExc
     return nColor;
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground(  )
 {
     OExternalLockGuard aGuard( this  );
     sal_Int32 nColor = 0;
@@ -824,7 +801,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground(  ) throw (RuntimeExc
     return nColor;
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -834,7 +811,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground(  ) throw (RuntimeException,
     return nColor;
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground(  )
 {
     OExternalLockGuard aGuard( this  );
     sal_Int32 nColor = 0;
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 83dd81b2242f..162264f88aa6 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -68,18 +68,16 @@ SvxPixelCtlAccessible::~SvxPixelCtlAccessible()
     }
 }
 uno::Reference< XAccessibleContext > SvxPixelCtlAccessible::getAccessibleContext(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return this;
 }
 
-sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount(  ) throw (uno::RuntimeException, std::exception)
+sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount(  )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     return mrPixelCtl.GetSquares();
 }
 uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int32 i )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     if ( i < 0 || i >= getAccessibleChildCount())
@@ -89,7 +87,6 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int
 }
 
 uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     vcl::Window *pTabPage = getNonLayoutParent(&mrPixelCtl);
@@ -100,7 +97,6 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent(  )
 }
 
 sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     sal_uInt16 nIdx = 0;
@@ -114,13 +110,12 @@ sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent(  )
     return nIdx;
 }
 
-sal_Int16 SvxPixelCtlAccessible::getAccessibleRole(  ) throw (uno::RuntimeException, std::exception)
+sal_Int16 SvxPixelCtlAccessible::getAccessibleRole(  )
 {
     return AccessibleRole::LIST;
 }
 
 OUString SvxPixelCtlAccessible::getAccessibleDescription(  )
-    throw (uno::RuntimeException, std::exception)
 {
 
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -128,7 +123,6 @@ OUString SvxPixelCtlAccessible::getAccessibleDescription(  )
 }
 
 OUString SvxPixelCtlAccessible::getAccessibleName(  )
-    throw (uno::RuntimeException, std::exception)
 {
 
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -136,7 +130,6 @@ OUString SvxPixelCtlAccessible::getAccessibleName(  )
 }
 
 uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRelationSet(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper;
@@ -159,7 +152,6 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel
 
 
 uno::Reference< XAccessibleStateSet > SvxPixelCtlAccessible::getAccessibleStateSet(  )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
@@ -191,7 +183,6 @@ uno::Reference< XAccessibleStateSet > SvxPixelCtlAccessible::getAccessibleStateS
 
 
 css::lang::Locale SvxPixelCtlAccessible::getLocale(  )
-    throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     if( getAccessibleParent().is() )
@@ -208,7 +199,6 @@ css::lang::Locale SvxPixelCtlAccessible::getLocale(  )
 
 
 sal_Bool SvxPixelCtlAccessible::containsPoint( const awt::Point& aPt )
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     Point aPoint(aPt.X, aPt.Y);
@@ -219,7 +209,6 @@ sal_Bool SvxPixelCtlAccessible::containsPoint( const awt::Point& aPt )
 }
 uno::Reference<XAccessible > SAL_CALL SvxPixelCtlAccessible::getAccessibleAtPoint (
         const awt::Point& aPoint)
-    throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     if( !IsAlive() )
@@ -235,7 +224,7 @@ uno::Reference<XAccessible > SAL_CALL SvxPixelCtlAccessible::getAccessibleAtPoin
     return CreateChild(nIndex, mrPixelCtl.IndexToPoint(nIndex));
 }
 
-awt::Rectangle SvxPixelCtlAccessible::getBounds(  ) throw (uno::RuntimeException, std::exception)
+awt::Rectangle SvxPixelCtlAccessible::getBounds(  )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     awt::Rectangle aRet;
@@ -248,7 +237,7 @@ awt::Rectangle SvxPixelCtlAccessible::getBounds(  ) throw (uno::RuntimeException
     return aRet;
 }
 
-awt::Point SvxPixelCtlAccessible::getLocation(  ) throw (uno::RuntimeException, std::exception)
+awt::Point SvxPixelCtlAccessible::getLocation(  )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     Point aPos;
@@ -257,52 +246,48 @@ awt::Point SvxPixelCtlAccessible::getLocation(  ) throw (uno::RuntimeException,
     return aRet;
 }
 
-awt::Point SvxPixelCtlAccessible::getLocationOnScreen(  ) throw (uno::RuntimeException, std::exception)
+awt::Point SvxPixelCtlAccessible::getLocationOnScreen(  )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     Rectangle rect = mrPixelCtl.GetWindowExtentsRelative(nullptr);
     return awt::Point(rect.Left(),rect.Top() );
 }
 
-awt::Size SvxPixelCtlAccessible::getSize(  ) throw (uno::RuntimeException, std::exception)
+awt::Size SvxPixelCtlAccessible::getSize(  )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     Size aSz = mrPixelCtl.GetSizePixel();
     return awt::Size(aSz.Width(),aSz.Height());
 }
-void SvxPixelCtlAccessible::grabFocus(  ) throw (uno::RuntimeException, std::exception)
+void SvxPixelCtlAccessible::grabFocus(  )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     mrPixelCtl.GrabFocus();
 }
 
 sal_Int32 SvxPixelCtlAccessible::getForeground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     return mrPixelCtl.GetControlForeground().GetColor();
 }
 
 sal_Int32 SvxPixelCtlAccessible::getBackground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     return mrPixelCtl.GetControlBackground().GetColor();
 }
 
-OUString SvxPixelCtlAccessible::getImplementationName(  ) throw (uno::RuntimeException, std::exception)
+OUString SvxPixelCtlAccessible::getImplementationName(  )
 {
     return OUString("SvxPixelCtlAccessible");
 }
 
 sal_Bool SvxPixelCtlAccessible::supportsService( const OUString& rServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 uno::Sequence< OUString > SvxPixelCtlAccessible::getSupportedServiceNames(  )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -315,7 +300,7 @@ uno::Sequence< OUString > SvxPixelCtlAccessible::getSupportedServiceNames(  )
 
 // XAccessibleSelection
 
-void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -326,27 +311,27 @@ void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildInde
     NotifyChild(nIndex,true,false);
 }
 
-sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
     return mrPixelCtl.GetFocusPosIndex() == nChildIndex;
 }
 
-void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection(  )
 {
 }
 
-void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren(  ) throw (RuntimeException, std::exception)
+void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren(  )
 {
 }
 
-sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount(  )
 {
     return 1;
 }
 
-uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -361,12 +346,12 @@ uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessi
     return xChild;
 }
 
-void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 )
 {
 }
 
 //XAccessibleEventBroadcaster
-void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )  throw( RuntimeException, std::exception )
+void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
 {
     if (xListener.is())
     {
@@ -378,7 +363,6 @@ void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Refe
 }
 
 void SAL_CALL SvxPixelCtlAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -563,25 +547,25 @@ SvxPixelCtlAccessibleChild::~SvxPixelCtlAccessibleChild()
 }
 
 // XAccessible
-uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext() throw( RuntimeException, std::exception )
+uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext()
 {
     return this;
 }
 
 // XAccessibleComponent
-sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::containsPoint( const awt::Point& rPoint )
 {
     // no guard -> done in getBounds()
 //  return GetBoundingBox().IsInside( VCLPoint( rPoint ) );
     return Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
 }
 
-uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleAtPoint( const awt::Point& ) throw( RuntimeException, std::exception )
+uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleAtPoint( const awt::Point& )
 {
     return uno::Reference< XAccessible >();
 }
 
-awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeException, std::exception )
+awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds()
 {
     // no guard -> done in getBoundingBox()
     //Modified by lq, 09/26
@@ -593,37 +577,35 @@ awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeEx
     // End
 }
 
-awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocation() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocation()
 {
     // no guard -> done in getBoundingBox()
     return AWTPoint( GetBoundingBox().TopLeft() );
 }
 
-awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocationOnScreen() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocationOnScreen()
 {
     // no guard -> done in getBoundingBoxOnScreen()
     return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
 }
 
-awt::Size SAL_CALL SvxPixelCtlAccessibleChild::getSize() throw( RuntimeException, std::exception )
+awt::Size SAL_CALL SvxPixelCtlAccessibleChild::getSize()
 {
     // no guard -> done in getBoundingBox()
     return AWTSize( GetBoundingBox().GetSize() );
 }
 
-void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() throw( RuntimeException, std::exception )
+void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus()
 {
 }
 
 sal_Int32 SvxPixelCtlAccessibleChild::getForeground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     ThrowExceptionIfNotAlive();
     return mrParentWindow.GetControlForeground().GetColor();
 }
 sal_Int32 SvxPixelCtlAccessibleChild::getBackground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -632,40 +614,39 @@ sal_Int32 SvxPixelCtlAccessibleChild::getBackground(  )
 }
 
 // XAccessibleContext
-sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount()
 {
     return 0;
 }
 
 uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChild( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     throw lang::IndexOutOfBoundsException();
 }
 
-uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent() throw( RuntimeException, std::exception )
+uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent()
 {
     return mxParent;
 }
 
-sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent()
 {
    return mnIndexInParent;
 }
 
-sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole()
 {
     return AccessibleRole::CHECK_BOX;
 }
 
-OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
     return  GetName();
 }
 
-OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     return  GetName();
@@ -674,12 +655,12 @@ OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName() throw( Runtime
 /** Return empty uno::Reference to indicate that the relation set is not
     supported.
 */
-uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet() throw( RuntimeException, std::exception )
+uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet()
 {
     return uno::Reference< XAccessibleRelationSet >();
 }
 
-uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet() throw( RuntimeException, std::exception )
+uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet()
 {
     ::osl::MutexGuard                       aGuard( m_aMutex );
     utl::AccessibleStateSetHelper*          pStateSetHelper = new utl::AccessibleStateSetHelper;
@@ -710,7 +691,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAc
     return pStateSetHelper;
 }
 
-lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception )
+lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale()
 {
     ::osl::MutexGuard                       aGuard( m_aMutex );
     if( mxParent.is() )
@@ -726,7 +707,6 @@ lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale() throw( IllegalAcce
 }
 
 void SAL_CALL SvxPixelCtlAccessibleChild::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -738,7 +718,6 @@ void SAL_CALL SvxPixelCtlAccessibleChild::addAccessibleEventListener( const uno:
 }
 
 void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -758,17 +737,17 @@ void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const u
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName()
 {
     return OUString( "SvxPixelCtlAccessibleChild" );
 }
 
-sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& rServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService( this, rServiceName );
 }
 
-Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(3);
     OUString* pArray = aRet.getArray();
@@ -797,13 +776,13 @@ void SAL_CALL SvxPixelCtlAccessibleChild::disposing()
     }
 }
 
-void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive() throw( lang::DisposedException )
+void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive()
 {
     if( rBHelper.bDisposed || rBHelper.bInDispose )
         throw lang::DisposedException();
 }
 
-Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() throw( RuntimeException )
+Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -813,7 +792,7 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() throw( RuntimeExc
     return Rectangle( mrParentWindow.OutputToAbsoluteScreenPixel( aRect.TopLeft() ), aRect.GetSize() );
 }
 
-Rectangle const & SvxPixelCtlAccessibleChild::GetBoundingBox() throw( RuntimeException )
+Rectangle const & SvxPixelCtlAccessibleChild::GetBoundingBox()
 {
     // no guard necessary, because no one changes mpBoundingBox after creating it
     ThrowExceptionIfNotAlive();
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 4da503193230..6076049d90bf 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -168,20 +168,20 @@ SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext()
 }
 
 // XAccessible
-Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception )
+Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext()
 {
     return this;
 }
 
 // XAccessibleComponent
-sal_Bool SAL_CALL SvxRectCtlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxRectCtlAccessibleContext::containsPoint( const awt::Point& rPoint )
 {
     // no guard -> done in getBounds()
 //  return GetBoundingBox().IsInside( VCLPoint( rPoint ) );
     return Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
 }
 
-Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception )
+Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint )
 {
     ::osl::MutexGuard           aGuard( m_aMutex );
 
@@ -197,31 +197,31 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleAtPo
     return xRet;
 }
 
-awt::Rectangle SAL_CALL SvxRectCtlAccessibleContext::getBounds() throw( RuntimeException, std::exception )
+awt::Rectangle SAL_CALL SvxRectCtlAccessibleContext::getBounds()
 {
     // no guard -> done in GetBoundingBox()
     return AWTRectangle( GetBoundingBox() );
 }
 
-awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocation() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocation()
 {
     // no guard -> done in GetBoundingBox()
     return AWTPoint( GetBoundingBox().TopLeft() );
 }
 
-awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocationOnScreen()
 {
     // no guard -> done in GetBoundingBoxOnScreen()
     return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
 }
 
-awt::Size SAL_CALL SvxRectCtlAccessibleContext::getSize() throw( RuntimeException, std::exception )
+awt::Size SAL_CALL SvxRectCtlAccessibleContext::getSize()
 {
     // no guard -> done in GetBoundingBox()
     return AWTSize( GetBoundingBox().GetSize() );
 }
 
-bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException )
+bool SAL_CALL SvxRectCtlAccessibleContext::isVisible()
 {
     ::osl::MutexGuard           aGuard( m_aMutex );
 
@@ -231,7 +231,7 @@ bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException )
 }
 
 // XAccessibleContext
-sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -241,7 +241,6 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() throw(
 }
 
 Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChild( sal_Int32 nIndex )
-    throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception )
 {
     checkChildIndex( nIndex );
 
@@ -278,12 +277,12 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
     return xChild;
 }
 
-Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception )
+Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent()
 {
     return mxParent;
 }
 
-sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     //  Use a simple but slow solution for now.  Optimize later.
@@ -309,18 +308,18 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent() thr
    return -1;
 }
 
-sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole()
 {
     return AccessibleRole::PANEL;
 }
 
-OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     return msDescription + " Please use arrow key to selection.";
 }
 
-OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
     return msName;
@@ -329,7 +328,7 @@ OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName() throw( Runtim
 /** Return empty reference to indicate that the relation set is not
     supported.
 */
-Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception )
+Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet()
 {
     //return Reference< XAccessibleRelationSet >();
     utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
@@ -354,7 +353,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAcc
     return xSet;
 }
 
-Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception )
+Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet()
 {
     ::osl::MutexGuard                       aGuard( m_aMutex );
     utl::AccessibleStateSetHelper*          pStateSetHelper = new utl::AccessibleStateSetHelper;
@@ -378,7 +377,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccess
     return pStateSetHelper;
 }
 
-lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception )
+lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale()
 {
     ::osl::MutexGuard                           aGuard( m_aMutex );
     if( mxParent.is() )
@@ -393,7 +392,6 @@ lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale() throw( IllegalAcc
 }
 
 void SAL_CALL SvxRectCtlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -405,7 +403,6 @@ void SAL_CALL SvxRectCtlAccessibleContext::addAccessibleEventListener( const Ref
 }
 
 void SAL_CALL SvxRectCtlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -424,7 +421,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::removeAccessibleEventListener( const
     }
 }
 
-void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException, std::exception )
+void SAL_CALL SvxRectCtlAccessibleContext::grabFocus()
 {
     ::SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -435,7 +432,6 @@ void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException,
 }
 
 sal_Int32 SvxRectCtlAccessibleContext::getForeground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -444,7 +440,6 @@ sal_Int32 SvxRectCtlAccessibleContext::getForeground(  )
     return mpRepr->GetControlForeground().GetColor();
 }
 sal_Int32 SvxRectCtlAccessibleContext::getBackground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -454,30 +449,30 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground(  )
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName()
 {
     return OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" );
 }
 
-sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames()
 {
     const OUString sServiceName( "com.sun.star.accessibility.AccessibleContext" );
     return Sequence< OUString >( &sServiceName, 1 );
 }
 
 // XTypeProvider
-Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XAccessibleSelection
-void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception )
+void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex )
 {
     ::SolarMutexGuard aSolarGuard;
 
@@ -496,7 +491,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nInd
     mpRepr->SetActualRP( pData->ePoint );
 }
 
-sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -505,19 +500,19 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_In
     return nIndex == mnSelectedChild;
 }
 
-void SAL_CALL SvxRectCtlAccessibleContext::clearAccessibleSelection() throw( RuntimeException, std::exception )
+void SAL_CALL SvxRectCtlAccessibleContext::clearAccessibleSelection()
 {
     SAL_WARN( "svx", "SvxRectCtlAccessibleContext::clearAccessibleSelection() is not possible!" );
 }
 
-void SAL_CALL SvxRectCtlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException, std::exception )
+void SAL_CALL SvxRectCtlAccessibleContext::selectAllAccessibleChildren()
 {
     // guard in selectAccessibleChild()!
 
     selectAccessibleChild( 0 );     // default per definition
 }
 
-sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChildCount()
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -525,7 +520,6 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChildCount(
 }
 
 Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex )
-    throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception )
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
 
@@ -536,7 +530,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccess
     return getAccessibleChild( mnSelectedChild );
 }
 
-void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*nIndex*/ ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception )
+void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*nIndex*/ )
 {
     OUString aMessage( "deselectAccessibleChild is not possible in this context" );
 
@@ -546,7 +540,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*
 }
 
 // internals
-void SvxRectCtlAccessibleContext::checkChildIndex( long nIndex ) throw( lang::IndexOutOfBoundsException )
+void SvxRectCtlAccessibleContext::checkChildIndex( long nIndex )
 {
     if( nIndex < 0 || nIndex >= getAccessibleChildCount() )
         throw lang::IndexOutOfBoundsException();
@@ -659,7 +653,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing()
     }
 }
 
-Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException )
+Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen()
 {
     ::SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -669,7 +663,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeEx
     return Rectangle( mpRepr->GetParent()->OutputToScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() );
 }
 
-Rectangle SvxRectCtlAccessibleContext::GetBoundingBox() throw( RuntimeException )
+Rectangle SvxRectCtlAccessibleContext::GetBoundingBox()
 {
     ::SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -679,7 +673,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBox() throw( RuntimeException
     return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() );
 }
 
-void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException )
+void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive()
 {
     if( rBHelper.bDisposed || rBHelper.bInDispose )
         throw lang::DisposedException();
@@ -718,53 +712,52 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext()
 }
 
 // XAccessible
-Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception )
+Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext()
 {
     return this;
 }
 
 // XAccessibleComponent
-sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::containsPoint( const awt::Point& rPoint )
 {
     // no guard -> done in getBounds()
     return Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
 }
 
-Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleAtPoint( const awt::Point& /*rPoint*/ ) throw( RuntimeException, std::exception )
+Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleAtPoint( const awt::Point& /*rPoint*/ )
 {
     return Reference< XAccessible >();
 }
 
-awt::Rectangle SAL_CALL SvxRectCtlChildAccessibleContext::getBounds() throw( RuntimeException, std::exception )
+awt::Rectangle SAL_CALL SvxRectCtlChildAccessibleContext::getBounds()
 {
     // no guard -> done in getBoundingBox()
     return AWTRectangle( GetBoundingBox() );
 }
 
-awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocation() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocation()
 {
     // no guard -> done in getBoundingBox()
     return AWTPoint( GetBoundingBox().TopLeft() );
 }
 
-awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception )
+awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocationOnScreen()
 {
     // no guard -> done in getBoundingBoxOnScreen()
     return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
 }
 
-awt::Size SAL_CALL SvxRectCtlChildAccessibleContext::getSize() throw( RuntimeException, std::exception )
+awt::Size SAL_CALL SvxRectCtlChildAccessibleContext::getSize()
 {
     // no guard -> done in getBoundingBox()
     return AWTSize( GetBoundingBox().GetSize() );
 }
 
-void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() throw( RuntimeException, std::exception )
+void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus()
 {
 }
 
 sal_Int32 SvxRectCtlChildAccessibleContext::getForeground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard   aGuard( maMutex );
@@ -772,7 +765,6 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getForeground(  )
     return mrParentWindow.GetControlForeground().GetColor();
 }
 sal_Int32 SvxRectCtlChildAccessibleContext::getBackground(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard   aGuard( maMutex );
@@ -782,38 +774,38 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getBackground(  )
 }
 
 // XAccessibleContext
-sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount()
 {
     return 0;
 }
 
-Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChild( sal_Int32 /*nIndex*/ ) throw ( RuntimeException, lang::IndexOutOfBoundsException, std::exception )
+Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChild( sal_Int32 /*nIndex*/ )
 {
     throw lang::IndexOutOfBoundsException();
 }
 
-Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception )
+Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent()
 {
     return mxParent;
 }
 
-sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent()
 {
    return mnIndexInParent;
 }
 
-sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole()
 {
     return AccessibleRole::RADIO_BUTTON;
 }
 
-OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription()
 {
     ::osl::MutexGuard   aGuard( maMutex );
     return msDescription;
 }
 
-OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName()
 {
     ::osl::MutexGuard   aGuard( maMutex );
     return msName;
@@ -822,7 +814,7 @@ OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName() throw( R
 /** Return empty reference to indicate that the relation set is not
     supported.
 */
-Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception )
+Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet()
 {
     utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
     uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
@@ -836,7 +828,7 @@ Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::get
     return xSet;
 }
 
-Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception )
+Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet()
 {
     ::osl::MutexGuard                       aGuard( maMutex );
     utl::AccessibleStateSetHelper*          pStateSetHelper = new utl::AccessibleStateSetHelper;
@@ -862,7 +854,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getA
     return pStateSetHelper;
 }
 
-lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception )
+lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale()
 {
     ::osl::MutexGuard                       aGuard( maMutex );
     if( mxParent.is() )
@@ -878,7 +870,6 @@ lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale() throw( Illeg
 }
 
 void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -891,7 +882,6 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( cons
 
 
 void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
-    throw( RuntimeException, std::exception )
 {
     if (xListener.is())
     {
@@ -911,7 +901,7 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( c
 }
 
 // XAccessibleValue
-Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() throw( RuntimeException, std::exception )
+Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue()
 {
     ThrowExceptionIfNotAlive();
 
@@ -920,19 +910,19 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() throw( RuntimeE
     return aRet;
 }
 
-sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::setCurrentValue( const Any& /*aNumber*/ ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::setCurrentValue( const Any& /*aNumber*/ )
 {
     return false;
 }
 
-Any SAL_CALL SvxRectCtlChildAccessibleContext::getMaximumValue() throw( RuntimeException, std::exception )
+Any SAL_CALL SvxRectCtlChildAccessibleContext::getMaximumValue()
 {
     Any aRet;
     aRet <<= 1.0;
     return aRet;
 }
 
-Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeException, std::exception )
+Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue()
 {
     Any aRet;
     aRet <<= 0.0;
@@ -943,13 +933,13 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeE
 // XAccessibleAction
 
 
-sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (RuntimeException, std::exception)
+sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( )
 {
     return 1;
 }
 
 
-sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex )
 {
     ::osl::MutexGuard   aGuard( maMutex );
 
@@ -964,7 +954,7 @@ sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex
 }
 
 
-OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     ::osl::MutexGuard   aGuard( maMutex );
 
@@ -975,7 +965,7 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_
 }
 
 
-Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     ::osl::MutexGuard   aGuard( maMutex );
 
@@ -986,24 +976,24 @@ Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessib
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName()
 {
     return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" );
 }
 
-sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames()
 {
     const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext");
     return Sequence< OUString >( &sServiceName, 1 );
 }
 
 // XTypeProvider
-Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1033,13 +1023,13 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::disposing()
     }
 }
 
-void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException )
+void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive()
 {
     if( rBHelper.bDisposed || rBHelper.bInDispose )
         throw lang::DisposedException();
 }
 
-Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException )
+Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen()
 {
     ::osl::MutexGuard   aGuard( maMutex );
 
@@ -1049,7 +1039,7 @@ Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() throw( Runt
     return Rectangle( mrParentWindow.OutputToScreenPixel( aRect.TopLeft() ), aRect.GetSize() );
 }
 
-Rectangle const & SvxRectCtlChildAccessibleContext::GetBoundingBox() throw( RuntimeException )
+Rectangle const & SvxRectCtlChildAccessibleContext::GetBoundingBox()
 {
     // no guard necessary, because no one changes mpBoundingBox after creating it
     ThrowExceptionIfNotAlive();
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index b2f5beeb98ba..b5a600816bae 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -82,26 +82,18 @@ public:
     virtual void SAL_CALL   release() throw() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XCustomShapeEngine
-    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL render()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::awt::Rectangle SAL_CALL getTextBounds()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > SAL_CALL getInteraction()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::drawing::XShape > SAL_CALL render() override;
+    virtual css::awt::Rectangle SAL_CALL getTextBounds() override;
+    virtual css::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry() override;
+    virtual css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > SAL_CALL getInteraction() override;
 };
 
 EnhancedCustomShapeEngine::EnhancedCustomShapeEngine() :
@@ -121,7 +113,6 @@ void SAL_CALL EnhancedCustomShapeEngine::release() throw()
 
 // XInitialization
 void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArguments )
-    throw ( Exception, RuntimeException, std::exception )
 {
     sal_Int32 i;
     Sequence< beans::PropertyValue > aParameter;
@@ -142,17 +133,14 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArg
 
 // XServiceInfo
 OUString SAL_CALL EnhancedCustomShapeEngine::getImplementationName()
-    throw( RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.drawing.EnhancedCustomShapeEngine" );
 }
 sal_Bool SAL_CALL EnhancedCustomShapeEngine::supportsService( const OUString& rServiceName )
-    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 Sequence< OUString > SAL_CALL EnhancedCustomShapeEngine::getSupportedServiceNames()
-    throw ( RuntimeException, std::exception )
 {
     Sequence<OUString> aRet { "com.sun.star.drawing.CustomShapeEngine" };
     return aRet;
@@ -264,7 +252,6 @@ void SetTemporary( uno::Reference< drawing::XShape >& xShape )
 }
 
 Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
-    throw ( RuntimeException, std::exception )
 {
     Reference< drawing::XShape > xShape;
     SdrObject* pSdrObjCustomShape( dynamic_cast<SdrObjCustomShape*>( GetSdrObjectFromXShape( mxShape ) )  );
@@ -362,7 +349,6 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
 }
 
 awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds()
-    throw ( RuntimeException, std::exception )
 {
     awt::Rectangle aTextRect;
     SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
@@ -383,7 +369,6 @@ awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds()
 }
 
 drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeometry()
-    throw ( RuntimeException, std::exception )
 {
     drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords;
     SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
@@ -464,7 +449,6 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom
 }
 
 Sequence< Reference< drawing::XCustomShapeHandle > > SAL_CALL EnhancedCustomShapeEngine::getInteraction()
-    throw ( RuntimeException, std::exception )
 {
     sal_uInt32 i, nHdlCount = 0;
     SdrObject* pSdrObjCustomShape = GetSdrObjectFromXShape( mxShape );
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
index 230f489f8062..ab4e0d93b460 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
@@ -47,7 +47,6 @@ void SAL_CALL EnhancedCustomShapeHandle::release() throw()
 
 // XCustomShapeHandle
 css::awt::Point SAL_CALL EnhancedCustomShapeHandle::getPosition()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxCustomShape ) );
     if ( !pSdrObjCustomShape )
@@ -61,7 +60,6 @@ css::awt::Point SAL_CALL EnhancedCustomShapeHandle::getPosition()
 }
 
 void SAL_CALL EnhancedCustomShapeHandle::setControllerPosition( const css::awt::Point& aPnt )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxCustomShape ) );
     if ( !pSdrObjCustomShape )
@@ -74,7 +72,6 @@ void SAL_CALL EnhancedCustomShapeHandle::setControllerPosition( const css::awt::
 
 // XInitialization
 void SAL_CALL EnhancedCustomShapeHandle::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
 }
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
index 15525d50fb6d..eca3a8c045ff 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
@@ -48,14 +48,11 @@ public:
     virtual void SAL_CALL release() throw() override;
 
     // XCustomShapeHandle
-    virtual css::awt::Point SAL_CALL getPosition()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setControllerPosition( const css::awt::Point& )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
+    virtual void SAL_CALL setControllerPosition( const css::awt::Point& ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 };
 
 #endif
diff --git a/svx/source/dialog/SafeModeUI.cxx b/svx/source/dialog/SafeModeUI.cxx
index 024d17b5861a..b01cded95639 100644
--- a/svx/source/dialog/SafeModeUI.cxx
+++ b/svx/source/dialog/SafeModeUI.cxx
@@ -27,19 +27,15 @@ public:
     SafeModeUI();
 
     // css.lang.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(const OUString& sServiceName)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) 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::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL,
-                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
 };
 
 SafeModeUI::SafeModeUI()
@@ -47,19 +43,16 @@ SafeModeUI::SafeModeUI()
 }
 
 OUString SAL_CALL SafeModeUI::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.svx.SafeModeUI");
 }
 
 sal_Bool SAL_CALL SafeModeUI::supportsService(const OUString& sServiceName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL SafeModeUI::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > lServiceNames { "com.sun.star.dialog.SafeModeUI" };
     return lServiceNames;
@@ -67,7 +60,6 @@ css::uno::Sequence< OUString > SAL_CALL SafeModeUI::getSupportedServiceNames()
 
 css::uno::Any SAL_CALL SafeModeUI::dispatchWithReturnValue(const css::util::URL&,
                                                    const css::uno::Sequence< css::beans::PropertyValue >& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     css::uno::Any aRet;
diff --git a/svx/source/dialog/crashreportui.cxx b/svx/source/dialog/crashreportui.cxx
index 62e5edd80efd..a589fa09a456 100644
--- a/svx/source/dialog/crashreportui.cxx
+++ b/svx/source/dialog/crashreportui.cxx
@@ -28,19 +28,15 @@ public:
 
     // css.lang.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(const OUString& sServiceName)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) 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::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL,
-                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                        const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
 
 private:
     css::uno::Reference< css::uno::XComponentContext > mxContext;
@@ -53,19 +49,16 @@ CrashReportUI::CrashReportUI(const css::uno::Reference<css::uno::XComponentConte
 }
 
 OUString SAL_CALL CrashReportUI::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.svx.CrashReportUI");
 }
 
 sal_Bool SAL_CALL CrashReportUI::supportsService(const OUString& sServiceName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL CrashReportUI::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > lServiceNames { "com.sun.star.dialog.CrashReportUI" };
     return lServiceNames;
@@ -73,7 +66,6 @@ css::uno::Sequence< OUString > SAL_CALL CrashReportUI::getSupportedServiceNames(
 
 css::uno::Any SAL_CALL CrashReportUI::dispatchWithReturnValue(const css::util::URL&,
                                                    const css::uno::Sequence< css::beans::PropertyValue >& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     css::uno::Any aRet;
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index f257c3c1bf82..d03e228f51f2 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -371,7 +371,6 @@ ERecoveryState RecoveryCore::mapDocState2RecoverState(sal_Int32 eDocState)
 
 
 void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& aEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // a) special notification about start/stop async dispatch!
     //    FeatureDescriptor = "start" || "stop"
@@ -467,7 +466,6 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
 
 
 void SAL_CALL RecoveryCore::disposing(const css::lang::EventObject& /*aEvent*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     m_xRealCore.clear();
 }
@@ -564,7 +562,6 @@ PluginProgress::~PluginProgress()
 
 
 void SAL_CALL PluginProgress::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     // m_pPluginProgressWindow was deleted ...
     // So the internal pointer of this progress
@@ -574,20 +571,17 @@ void SAL_CALL PluginProgress::dispose()
 
 
 void SAL_CALL PluginProgress::addEventListener(const css::uno::Reference< css::lang::XEventListener >& )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL PluginProgress::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& )
-    throw(css::uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL PluginProgress::start(const OUString&,
                                           sal_Int32        nRange)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (m_xProgress.is())
         m_xProgress->start(OUString(), nRange);
@@ -595,7 +589,6 @@ void SAL_CALL PluginProgress::start(const OUString&,
 
 
 void SAL_CALL PluginProgress::end()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (m_xProgress.is())
         m_xProgress->end();
@@ -603,7 +596,6 @@ void SAL_CALL PluginProgress::end()
 
 
 void SAL_CALL PluginProgress::setText(const OUString& sText)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (m_xProgress.is())
         m_xProgress->setText(sText);
@@ -611,7 +603,6 @@ void SAL_CALL PluginProgress::setText(const OUString& sText)
 
 
 void SAL_CALL PluginProgress::setValue(sal_Int32 nValue)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (m_xProgress.is())
         m_xProgress->setValue(nValue);
@@ -619,7 +610,6 @@ void SAL_CALL PluginProgress::setValue(sal_Int32 nValue)
 
 
 void SAL_CALL PluginProgress::reset()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (m_xProgress.is())
         m_xProgress->reset();
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index a38df223f934..9ef4e9558f06 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -127,10 +127,8 @@ public:
     }
     void AssertOneEntry();
 
-    virtual void SAL_CALL selectionChanged(const css::lang::EventObject& aEvent)
-                            throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source)
-                            throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectionChanged(const css::lang::EventObject& aEvent) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source) override;
 
 };
 
@@ -165,12 +163,12 @@ void SvxRubyData_Impl::SetController(const Reference<XController>& xCtrl)
     }
 }
 
-void SvxRubyData_Impl::selectionChanged(const EventObject& ) throw (RuntimeException, std::exception)
+void SvxRubyData_Impl::selectionChanged(const EventObject& )
 {
     bHasSelectionChanged = true;
 }
 
-void SvxRubyData_Impl::disposing(const EventObject&) throw (RuntimeException, std::exception)
+void SvxRubyData_Impl::disposing(const EventObject&)
 {
     try
     {
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index eb80bbadf41b..33af56e75e49 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -128,7 +128,7 @@ FmXModifyMultiplexer::FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl:
 }
 
 
-Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType)
 {
     Any aReturn;
     aReturn = ::cppu::queryInterface(_rType,
@@ -143,12 +143,12 @@ Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) throw (Run
 }
 
 
-void FmXModifyMultiplexer::disposing(const EventObject& ) throw( RuntimeException, std::exception )
+void FmXModifyMultiplexer::disposing(const EventObject& )
 {
 }
 
 
-void FmXModifyMultiplexer::modified(const EventObject& e) throw( RuntimeException, std::exception )
+void FmXModifyMultiplexer::modified(const EventObject& e)
 {
     EventObject aMulti( e);
     aMulti.Source = &m_rParent;
@@ -162,7 +162,7 @@ FmXUpdateMultiplexer::FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl:
 }
 
 
-Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType)
 {
     Any aReturn;
     aReturn = ::cppu::queryInterface(_rType,
@@ -177,12 +177,12 @@ Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType) throw (Run
 }
 
 
-void FmXUpdateMultiplexer::disposing(const EventObject& ) throw( RuntimeException, std::exception )
+void FmXUpdateMultiplexer::disposing(const EventObject& )
 {
 }
 
 
-sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) throw( RuntimeException, std::exception )
+sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e)
 {
     EventObject aMulti( e );
     aMulti.Source = &m_rParent;
@@ -199,7 +199,7 @@ sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) throw( Runtim
 }
 
 
-void FmXUpdateMultiplexer::updated(const EventObject &e) throw( RuntimeException, std::exception )
+void FmXUpdateMultiplexer::updated(const EventObject &e)
 {
     EventObject aMulti( e );
     aMulti.Source = &m_rParent;
@@ -213,7 +213,7 @@ FmXSelectionMultiplexer::FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource,
 }
 
 
-Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType)
 {
     Any aReturn;
     aReturn = ::cppu::queryInterface(_rType,
@@ -228,12 +228,12 @@ Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType) throw (
 }
 
 
-void FmXSelectionMultiplexer::disposing(const EventObject& ) throw( RuntimeException, std::exception )
+void FmXSelectionMultiplexer::disposing(const EventObject& )
 {
 }
 
 
-void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEvent )
 {
     EventObject aMulti(_rEvent);
     aMulti.Source = &m_rParent;
@@ -247,7 +247,7 @@ FmXContainerMultiplexer::FmXContainerMultiplexer( ::cppu::OWeakObject& rSource,
 }
 
 
-Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType)
 {
     Any aReturn;
     aReturn = ::cppu::queryInterface(_rType,
@@ -262,11 +262,11 @@ Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType) throw (
 }
 
 
-void FmXContainerMultiplexer::disposing(const EventObject& ) throw( RuntimeException, std::exception )
+void FmXContainerMultiplexer::disposing(const EventObject& )
 {
 }
 
-void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e) throw( RuntimeException, std::exception )
+void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e)
 {
     ContainerEvent aMulti( e );
     aMulti.Source = &m_rParent;
@@ -274,7 +274,7 @@ void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e) throw( Ru
 }
 
 
-void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( RuntimeException, std::exception )
+void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e)
 {
     ContainerEvent aMulti( e );
     aMulti.Source = &m_rParent;
@@ -282,7 +282,7 @@ void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( Run
 }
 
 
-void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( RuntimeException, std::exception )
+void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e)
 {
     ContainerEvent aMulti( e );
     aMulti.Source = &m_rParent;
@@ -296,7 +296,7 @@ FmXGridControlMultiplexer::FmXGridControlMultiplexer( ::cppu::OWeakObject& rSour
 }
 
 
-Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType)
 {
     Any aReturn;
     aReturn = ::cppu::queryInterface( _rType,
@@ -310,12 +310,12 @@ Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType) throw
 }
 
 
-void FmXGridControlMultiplexer::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void FmXGridControlMultiplexer::disposing( const EventObject& )
 {
 }
 
 
-void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _event ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _event )
 {
     EventObject aForwardedEvent( _event );
     aForwardedEvent.Source = &m_rParent;
@@ -327,7 +327,6 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even
 
 
 Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory)
-    throw (css::uno::Exception)
 {
     return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) ));
 }
@@ -350,7 +349,7 @@ FmXGridControl::~FmXGridControl()
 }
 
 
-Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
+Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType)
 {
     Any aReturn = FmXGridControl_BASE::queryInterface(_rType);
 
@@ -360,29 +359,29 @@ Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType) throw (Runtime
 }
 
 
-Sequence< Type> SAL_CALL FmXGridControl::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type> SAL_CALL FmXGridControl::getTypes(  )
 {
     return comphelper::concatSequences(UnoControl::getTypes(),FmXGridControl_BASE::getTypes());
 }
 
 
-Sequence<sal_Int8> SAL_CALL FmXGridControl::getImplementationId(  ) throw(RuntimeException, std::exception)
+Sequence<sal_Int8> SAL_CALL FmXGridControl::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL FmXGridControl::supportsService(const OUString& ServiceName) throw(std::exception)
+sal_Bool SAL_CALL FmXGridControl::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-OUString SAL_CALL FmXGridControl::getImplementationName() throw(std::exception)
+OUString SAL_CALL FmXGridControl::getImplementationName()
 {
     return OUString("com.sun.star.form.FmXGridControl");
 }
 
-css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames() throw(std::exception)
+css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames()
 {
     Sequence< OUString > aServiceNames(2);
     aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
@@ -391,7 +390,7 @@ css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames()
 }
 
 
-void SAL_CALL FmXGridControl::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -412,7 +411,7 @@ OUString FmXGridControl::GetComponentServiceName()
 }
 
 
-sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< css::awt::XControlModel >& rModel) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< css::awt::XControlModel >& rModel)
 {
     SolarMutexGuard aGuard;
 
@@ -454,7 +453,7 @@ FmXGridPeer* FmXGridControl::imp_CreatePeer(vcl::Window* pParent)
 }
 
 
-void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& /*rToolkit*/, const Reference< css::awt::XWindowPeer >& rParentPeer) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& /*rToolkit*/, const Reference< css::awt::XWindowPeer >& rParentPeer)
 {
     if ( !mxModel.is() )
         throw DisposedException( OUString(), *this );
@@ -611,7 +610,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >&
 }
 
 
-void FmXGridControl::addModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception )
+void FmXGridControl::addModifyListener(const Reference< css::util::XModifyListener >& l)
 {
     m_aModifyListeners.addInterface( l );
     if( getPeer().is() && m_aModifyListeners.getLength() == 1 )
@@ -622,7 +621,7 @@ void FmXGridControl::addModifyListener(const Reference< css::util::XModifyListen
 }
 
 
-sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection )
 {
     SolarMutexGuard aGuard;
     Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY);
@@ -630,7 +629,7 @@ sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (Illega
 }
 
 
-Any SAL_CALL FmXGridControl::getSelection(  ) throw (RuntimeException, std::exception)
+Any SAL_CALL FmXGridControl::getSelection(  )
 {
     SolarMutexGuard aGuard;
     Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY);
@@ -638,7 +637,7 @@ Any SAL_CALL FmXGridControl::getSelection(  ) throw (RuntimeException, std::exce
 }
 
 
-void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener )
 {
     m_aSelectionListeners.addInterface( _rxListener );
     if( getPeer().is() && 1 == m_aSelectionListeners.getLength() )
@@ -649,7 +648,7 @@ void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSele
 }
 
 
-void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener )
 {
     if( getPeer().is() && 1 == m_aSelectionListeners.getLength() )
     {
@@ -660,7 +659,7 @@ void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XS
 }
 
 
-Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xType ) throw(RuntimeException, std::exception)
+Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xType )
 {
     if (getPeer().is())
     {
@@ -673,7 +672,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xT
 }
 
 
-Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException, std::exception)
+Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const Type& xType )
 {
     if (getPeer().is())
     {
@@ -686,7 +685,7 @@ Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const T
 }
 
 
-void SAL_CALL FmXGridControl::removeModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::removeModifyListener(const Reference< css::util::XModifyListener >& l)
 {
     if( getPeer().is() && m_aModifyListeners.getLength() == 1 )
     {
@@ -697,7 +696,7 @@ void SAL_CALL FmXGridControl::removeModifyListener(const Reference< css::util::X
 }
 
 
-void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y )
 {
     SolarMutexGuard aGuard;
     m_bInDraw = true;
@@ -706,7 +705,7 @@ void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeExc
 }
 
 
-void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn)
 {
     css::util::ModeChangeEvent aModeChangeEvent;
 
@@ -758,7 +757,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio
 
 // XBoundComponent
 
-void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener >& l)
 {
     m_aUpdateListeners.addInterface( l );
     if( getPeer().is() && m_aUpdateListeners.getLength() == 1 )
@@ -769,7 +768,7 @@ void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener
 }
 
 
-void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListener >& l)
 {
     if( getPeer().is() && m_aUpdateListeners.getLength() == 1 )
     {
@@ -780,7 +779,7 @@ void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListe
 }
 
 
-sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FmXGridControl::commit()
 {
     Reference< XBoundComponent >  xBound(getPeer(), UNO_QUERY);
     if (xBound.is())
@@ -791,7 +790,7 @@ sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException, std::excepti
 
 // XContainer
 
-void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerListener >& l)
 {
     m_aContainerListeners.addInterface( l );
     if( getPeer().is() && m_aContainerListeners.getLength() == 1 )
@@ -802,7 +801,7 @@ void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerLi
 }
 
 
-void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContainerListener >& l)
 {
     if( getPeer().is() && m_aContainerListeners.getLength() == 1 )
     {
@@ -813,7 +812,7 @@ void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContaine
 }
 
 
-Reference< css::frame::XDispatch >  SAL_CALL FmXGridControl::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception )
+Reference< css::frame::XDispatch >  SAL_CALL FmXGridControl::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags)
 {
     Reference< css::frame::XDispatchProvider >  xPeerProvider(getPeer(), UNO_QUERY);
     if (xPeerProvider.is())
@@ -823,7 +822,7 @@ Reference< css::frame::XDispatch >  SAL_CALL FmXGridControl::queryDispatch(const
 }
 
 
-Sequence< Reference< css::frame::XDispatch > > SAL_CALL FmXGridControl::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException, std::exception )
+Sequence< Reference< css::frame::XDispatch > > SAL_CALL FmXGridControl::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts)
 {
     Reference< css::frame::XDispatchProvider >  xPeerProvider(getPeer(), UNO_QUERY);
     if (xPeerProvider.is())
@@ -833,7 +832,7 @@ Sequence< Reference< css::frame::XDispatch > > SAL_CALL FmXGridControl::queryDis
 }
 
 
-void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor)
 {
     Reference< css::frame::XDispatchProviderInterception >  xPeerInterception(getPeer(), UNO_QUERY);
     if (xPeerInterception.is())
@@ -841,7 +840,7 @@ void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Referenc
 }
 
 
-void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor)
 {
     Reference< css::frame::XDispatchProviderInterception >  xPeerInterception(getPeer(), UNO_QUERY);
     if (xPeerInterception.is())
@@ -849,7 +848,7 @@ void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference
 }
 
 
-void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridControlListener >& _listener )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
@@ -863,7 +862,7 @@ void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridCont
 }
 
 
-void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridControlListener >& _listener )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
@@ -878,14 +877,14 @@ void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridC
 }
 
 
-sal_Int16 SAL_CALL FmXGridControl::getCurrentColumnPosition() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL FmXGridControl::getCurrentColumnPosition()
 {
     Reference< XGridControl > xGrid( getPeer(), UNO_QUERY );
     return xGrid.is() ? xGrid->getCurrentColumnPosition() : -1;
 }
 
 
-void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos)
 {
     Reference< XGridControl > xGrid( getPeer(), UNO_QUERY );
     if ( xGrid.is() )
@@ -897,21 +896,21 @@ void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( Ru
 
 // XElementAccess
 
-sal_Bool SAL_CALL FmXGridControl::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FmXGridControl::hasElements()
 {
     Reference< XElementAccess >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() && xPeer->hasElements();
 }
 
 
-Type SAL_CALL FmXGridControl::getElementType(  ) throw(RuntimeException, std::exception)
+Type SAL_CALL FmXGridControl::getElementType(  )
 {
     return cppu::UnoType<css::awt::XTextComponent>::get();
 }
 
 // XEnumerationAccess
 
-Reference< XEnumeration >  SAL_CALL FmXGridControl::createEnumeration() throw( RuntimeException, std::exception )
+Reference< XEnumeration >  SAL_CALL FmXGridControl::createEnumeration()
 {
     Reference< XEnumerationAccess >  xPeer(getPeer(), UNO_QUERY);
     if (xPeer.is())
@@ -922,14 +921,14 @@ Reference< XEnumeration >  SAL_CALL FmXGridControl::createEnumeration() throw( R
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL FmXGridControl::getCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL FmXGridControl::getCount()
 {
     Reference< XIndexAccess >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->getCount() : 0;
 }
 
 
-Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex)
 {
     Reference< XIndexAccess >  xPeer(getPeer(), UNO_QUERY);
     if (!xPeer.is())
@@ -940,7 +939,7 @@ Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoun
 
 // css::util::XModeSelector
 
-void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException, std::exception )
+void SAL_CALL FmXGridControl::setMode(const OUString& Mode)
 {
     Reference< css::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     if (!xPeer.is())
@@ -950,21 +949,21 @@ void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportExce
 }
 
 
-OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXGridControl::getMode()
 {
     Reference< css::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->getMode() : OUString();
 }
 
 
-css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException, std::exception )
+css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedModes()
 {
     Reference< css::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->getSupportedModes() : css::uno::Sequence<OUString>();
 }
 
 
-sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode)
 {
     Reference< css::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() && xPeer->supportsMode(Mode);
@@ -1107,7 +1106,7 @@ FmXGridPeer* FmXGridPeer::getImplementation( const Reference< XInterface >& _rxI
 }
 
 
-sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIdentifier )
 {
     sal_Int64 nReturn(0);
 
@@ -1125,7 +1124,7 @@ sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIden
 
 // XEventListener
 
-void FmXGridPeer::disposing(const EventObject& e) throw( RuntimeException, std::exception )
+void FmXGridPeer::disposing(const EventObject& e)
 {
 using namespace ::com::sun::star::util;
     bool bKnownSender = false;
@@ -1167,20 +1166,20 @@ using namespace ::com::sun::star::util;
 }
 
 
-void FmXGridPeer::addModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception )
+void FmXGridPeer::addModifyListener(const Reference< css::util::XModifyListener >& l)
 {
     m_aModifyListeners.addInterface( l );
 }
 
 
-void FmXGridPeer::removeModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception )
+void FmXGridPeer::removeModifyListener(const Reference< css::util::XModifyListener >& l)
 {
     m_aModifyListeners.removeInterface( l );
 }
 
 
 #define LAST_KNOWN_TYPE     FormComponentType::PATTERNFIELD
-Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType ) throw(RuntimeException, std::exception)
+Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType )
 {
     // eine 'Konvertierungstabelle'
     static const bool bCanConvert[LAST_KNOWN_TYPE][4] =
@@ -1276,7 +1275,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType
 }
 
 
-Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException, std::exception)
+Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type& xType )
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     DBG_ASSERT(pGrid && pGrid->IsOpen(), "FmXGridPeer::queryFieldData : have no valid grid window !");
@@ -1364,7 +1363,7 @@ void FmXGridPeer::CellModified()
 
 // XPropertyChangeListener
 
-void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception )
+void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt)
 {
     SolarMutexGuard aGuard;
         // want to do a lot of VCL stuff here ...
@@ -1477,19 +1476,19 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE
 
 // XBoundComponent
 
-void FmXGridPeer::addUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException, std::exception )
+void FmXGridPeer::addUpdateListener(const Reference< XUpdateListener >& l)
 {
     m_aUpdateListeners.addInterface(l);
 }
 
 
-void FmXGridPeer::removeUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException, std::exception )
+void FmXGridPeer::removeUpdateListener(const Reference< XUpdateListener >& l)
 {
     m_aUpdateListeners.removeInterface(l);
 }
 
 
-sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception )
+sal_Bool FmXGridPeer::commit()
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (!m_xCursor.is() || !pGrid)
@@ -1511,7 +1510,7 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception )
 }
 
 
-void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeException, std::exception )
+void FmXGridPeer::cursorMoved(const EventObject& _rEvent)
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     // we are not interested in move to insert row only in the resetted event
@@ -1521,7 +1520,7 @@ void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeExceptio
 }
 
 
-void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException, std::exception )
+void FmXGridPeer::rowChanged(const EventObject& _rEvent)
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (pGrid && pGrid->IsOpen())
@@ -1534,7 +1533,7 @@ void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException
 }
 
 
-void FmXGridPeer::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void FmXGridPeer::rowSetChanged(const EventObject& /*event*/)
 {
     // not interested in ...
     // (our parent is a form which means we get a loaded or reloaded after this rowSetChanged)
@@ -1542,33 +1541,33 @@ void FmXGridPeer::rowSetChanged(const EventObject& /*event*/) throw( RuntimeExce
 
 // XLoadListener
 
-void FmXGridPeer::loaded(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception )
+void FmXGridPeer::loaded(const EventObject& /*rEvent*/)
 {
     updateGrid(m_xCursor);
 }
 
 
-void FmXGridPeer::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception )
+void FmXGridPeer::unloaded(const EventObject& /*rEvent*/)
 {
     updateGrid( Reference< XRowSet > (nullptr) );
 }
 
 
-void FmXGridPeer::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void FmXGridPeer::reloading(const EventObject& /*aEvent*/)
 {
     // empty the grid
     updateGrid( Reference< XRowSet > (nullptr) );
 }
 
 
-void FmXGridPeer::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void FmXGridPeer::unloading(const EventObject& /*aEvent*/)
 {
     // empty the grid
     updateGrid( Reference< XRowSet > (nullptr) );
 }
 
 
-void FmXGridPeer::reloaded(const EventObject& aEvent) throw( RuntimeException, std::exception )
+void FmXGridPeer::reloaded(const EventObject& aEvent)
 {
     {
         const sal_Int32 cnt = m_xColumns->getCount();
@@ -1586,7 +1585,7 @@ void FmXGridPeer::reloaded(const EventObject& aEvent) throw( RuntimeException, s
 
 // XGridPeer
 
-Reference< XIndexContainer >  FmXGridPeer::getColumns() throw( RuntimeException, std::exception )
+Reference< XIndexContainer >  FmXGridPeer::getColumns()
 {
     return m_xColumns;
 }
@@ -1632,7 +1631,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol)
 }
 
 
-void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( RuntimeException, std::exception )
+void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns)
 {
     SolarMutexGuard aGuard;
 
@@ -1689,7 +1688,7 @@ void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw(
 }
 
 
-void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exception )
+void FmXGridPeer::setDesignMode(sal_Bool bOn)
 {
     if (bOn != isDesignMode())
     {
@@ -1705,7 +1704,7 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exce
 }
 
 
-sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException, std::exception )
+sal_Bool FmXGridPeer::isDesignMode()
 {
     VclPtr<vcl::Window> pWin = GetWindow();
     if (pWin)
@@ -1715,7 +1714,7 @@ sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException, std::exception )
 }
 
 
-void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void FmXGridPeer::elementInserted(const ContainerEvent& evt)
 {
     SolarMutexGuard aGuard;
 
@@ -1747,7 +1746,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep
 }
 
 
-void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void FmXGridPeer::elementReplaced(const ContainerEvent& evt)
 {
     SolarMutexGuard aGuard;
 
@@ -1802,7 +1801,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep
 }
 
 
-void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void FmXGridPeer::elementRemoved(const ContainerEvent& evt)
 {
     SolarMutexGuard aGuard;
 
@@ -1819,7 +1818,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept
 }
 
 
-void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) throw( RuntimeException, std::exception )
+void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -2031,7 +2030,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext()
 }
 
 
-Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException, std::exception )
+Any FmXGridPeer::getProperty( const OUString& _rPropertyName )
 {
     Any aProp;
     if (GetWindow())
@@ -2080,7 +2079,7 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc
 }
 
 
-void FmXGridPeer::dispose() throw( RuntimeException, std::exception )
+void FmXGridPeer::dispose()
 {
     EventObject aEvt;
     aEvt.Source = static_cast< ::cppu::OWeakObject* >(this);
@@ -2112,12 +2111,12 @@ void FmXGridPeer::dispose() throw( RuntimeException, std::exception )
 
 // XContainer
 
-void FmXGridPeer::addContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException, std::exception )
+void FmXGridPeer::addContainerListener(const Reference< XContainerListener >& l)
 {
     m_aContainerListeners.addInterface( l );
 }
 
-void FmXGridPeer::removeContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException, std::exception )
+void FmXGridPeer::removeContainerListener(const Reference< XContainerListener >& l)
 {
     m_aContainerListeners.removeInterface( l );
 }
@@ -2178,13 +2177,13 @@ void FmXGridPeer::updateGrid(const Reference< XRowSet >& _rxCursor)
 }
 
 
-Reference< XRowSet >  FmXGridPeer::getRowSet() throw( RuntimeException, std::exception )
+Reference< XRowSet >  FmXGridPeer::getRowSet()
 {
     return m_xCursor;
 }
 
 
-void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) throw( RuntimeException, std::exception )
+void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor)
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (!pGrid || !m_xColumns.is() || !m_xColumns->getCount())
@@ -2221,26 +2220,26 @@ void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) throw(
 }
 
 
-void SAL_CALL FmXGridPeer::addGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridPeer::addGridControlListener( const Reference< XGridControlListener >& _listener )
 {
     m_aGridControlListeners.addInterface( _listener );
 }
 
 
-void SAL_CALL FmXGridPeer::removeGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXGridPeer::removeGridControlListener( const Reference< XGridControlListener >& _listener )
 {
     m_aGridControlListeners.removeInterface( _listener );
 }
 
 
-sal_Int16 FmXGridPeer::getCurrentColumnPosition() throw( RuntimeException, std::exception )
+sal_Int16 FmXGridPeer::getCurrentColumnPosition()
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     return pGrid ? pGrid->GetViewColumnPos(pGrid->GetCurColumnId()) : -1;
 }
 
 
-void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException, std::exception )
+void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos)
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (pGrid)
@@ -2248,7 +2247,7 @@ void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeExcepti
 }
 
 
-void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeException, std::exception )
+void FmXGridPeer::selectionChanged(const EventObject& evt)
 {
     SolarMutexGuard aGuard;
 
@@ -2298,27 +2297,27 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeExcepti
 
 // XElementAccess
 
-sal_Bool FmXGridPeer::hasElements() throw( RuntimeException, std::exception )
+sal_Bool FmXGridPeer::hasElements()
 {
     return getCount() != 0;
 }
 
 
-Type SAL_CALL FmXGridPeer::getElementType(  ) throw(RuntimeException, std::exception)
+Type SAL_CALL FmXGridPeer::getElementType(  )
 {
     return cppu::UnoType<css::awt::XControl>::get();
 }
 
 // XEnumerationAccess
 
-Reference< XEnumeration >  FmXGridPeer::createEnumeration() throw( RuntimeException, std::exception )
+Reference< XEnumeration >  FmXGridPeer::createEnumeration()
 {
     return new ::comphelper::OEnumerationByIndex(this);
 }
 
 // XIndexAccess
 
-sal_Int32 FmXGridPeer::getCount() throw( RuntimeException, std::exception )
+sal_Int32 FmXGridPeer::getCount()
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (pGrid)
@@ -2328,7 +2327,7 @@ sal_Int32 FmXGridPeer::getCount() throw( RuntimeException, std::exception )
 }
 
 
-Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+Any FmXGridPeer::getByIndex(sal_Int32 _nIndex)
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     if (_nIndex < 0 ||
@@ -2353,7 +2352,7 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException,
 
 // css::util::XModeSelector
 
-void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException, std::exception )
+void FmXGridPeer::setMode(const OUString& Mode)
 {
     if (!supportsMode(Mode))
         throw NoSupportException();
@@ -2374,13 +2373,13 @@ void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, Runti
 }
 
 
-OUString FmXGridPeer::getMode() throw( RuntimeException, std::exception )
+OUString FmXGridPeer::getMode()
 {
     return m_aMode;
 }
 
 
-css::uno::Sequence<OUString> FmXGridPeer::getSupportedModes() throw( RuntimeException, std::exception )
+css::uno::Sequence<OUString> FmXGridPeer::getSupportedModes()
 {
     static css::uno::Sequence<OUString> aModes;
     if (!aModes.getLength())
@@ -2394,7 +2393,7 @@ css::uno::Sequence<OUString> FmXGridPeer::getSupportedModes() throw( RuntimeExce
 }
 
 
-sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception )
+sal_Bool FmXGridPeer::supportsMode(const OUString& Mode)
 {
     css::uno::Sequence<OUString> aModes(getSupportedModes());
     const OUString* pModes = aModes.getConstArray();
@@ -2437,7 +2436,7 @@ void FmXGridPeer::columnHidden(DbGridColumn* pColumn)
 }
 
 
-void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std::exception )
+void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y )
 {
     VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >();
     EditBrowseBoxFlags nOldFlags = pGrid->GetBrowserFlags();
@@ -2449,7 +2448,7 @@ void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std:
 }
 
 
-Reference< css::frame::XDispatch >  FmXGridPeer::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception )
+Reference< css::frame::XDispatch >  FmXGridPeer::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags)
 {
     Reference< css::frame::XDispatch >  xResult;
 
@@ -2468,7 +2467,7 @@ Reference< css::frame::XDispatch >  FmXGridPeer::queryDispatch(const css::util::
 }
 
 
-Sequence< Reference< css::frame::XDispatch > > FmXGridPeer::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException, std::exception )
+Sequence< Reference< css::frame::XDispatch > > FmXGridPeer::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts)
 {
     if (m_xFirstDispatchInterceptor.is())
         return m_xFirstDispatchInterceptor->queryDispatches(aDescripts);
@@ -2478,7 +2477,7 @@ Sequence< Reference< css::frame::XDispatch > > FmXGridPeer::queryDispatches(cons
 }
 
 
-void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception )
+void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor)
 {
     if (_xInterceptor.is())
     {
@@ -2507,7 +2506,7 @@ void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< css::fram
 }
 
 
-void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception )
+void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor)
 {
     if (!_xInterceptor.is())
         return;
@@ -2561,7 +2560,7 @@ void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< css::frame
 }
 
 
-void FmXGridPeer::statusChanged(const css::frame::FeatureStateEvent& Event) throw( RuntimeException, std::exception )
+void FmXGridPeer::statusChanged(const css::frame::FeatureStateEvent& Event)
 {
     DBG_ASSERT(m_pStateCache, "FmXGridPeer::statusChanged : invalid call !");
     DBG_ASSERT(m_pDispatchers, "FmXGridPeer::statusChanged : invalid call !");
@@ -2588,13 +2587,13 @@ void FmXGridPeer::statusChanged(const css::frame::FeatureStateEvent& Event) thro
 }
 
 
-sal_Bool FmXGridPeer::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception )
+sal_Bool FmXGridPeer::approveReset(const EventObject& /*rEvent*/)
 {
     return true;
 }
 
 
-sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection )
 {
     Sequence< Any > aBookmarks;
     if ( !( _rSelection >>= aBookmarks ) )
@@ -2611,7 +2610,7 @@ sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalAr
 }
 
 
-Any SAL_CALL FmXGridPeer::getSelection(  ) throw (RuntimeException, std::exception)
+Any SAL_CALL FmXGridPeer::getSelection(  )
 {
     VclPtr< FmGridControl > pVclControl = GetAs< FmGridControl >();
     Sequence< Any > aSelectionBookmarks = pVclControl->getSelectionBookmarks();
@@ -2619,19 +2618,19 @@ Any SAL_CALL FmXGridPeer::getSelection(  ) throw (RuntimeException, std::excepti
 }
 
 
-void SAL_CALL FmXGridPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener )
 {
     m_aSelectionListeners.addInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener )
 {
     m_aSelectionListeners.removeInterface( _rxListener );
 }
 
 
-void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException, std::exception )
+void FmXGridPeer::resetted(const EventObject& rEvent)
 {
     if (m_xColumns == rEvent.Source)
     {   // my model was reset -> refresh the grid content
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 0ec4156755a6..2195b90708dd 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -645,7 +645,7 @@ void DbCellControl::implAdjustGenericFieldSetting( const Reference< XPropertySet
 }
 
 
-void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(RuntimeException)
+void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent)
 {
     SolarMutexGuard aGuard;
 
@@ -1443,7 +1443,7 @@ CellControllerRef DbFormattedField::CreateController() const
 }
 
 
-void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException )
+void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent )
 {
     if (_rEvent.PropertyName == FM_PROP_FORMATKEY )
     {
@@ -2394,7 +2394,7 @@ DbComboBox::DbComboBox(DbGridColumn& _rColumn)
 }
 
 
-void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException )
+void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent )
 {
     if ( _rEvent.PropertyName == FM_PROP_STRINGITEMLIST )
     {
@@ -2513,7 +2513,7 @@ DbListBox::DbListBox(DbGridColumn& _rColumn)
 }
 
 
-void DbListBox::_propertyChanged( const css::beans::PropertyChangeEvent& _rEvent ) throw( RuntimeException )
+void DbListBox::_propertyChanged( const css::beans::PropertyChangeEvent& _rEvent )
 {
     if ( _rEvent.PropertyName == FM_PROP_STRINGITEMLIST )
     {
@@ -3174,7 +3174,7 @@ void FmXGridCell::SetTextLineColor(const Color& _rColor)
 
 // XTypeProvider
 
-Sequence< Type > SAL_CALL FmXGridCell::getTypes( ) throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL FmXGridCell::getTypes( )
 {
     Sequence< uno::Type > aTypes = ::comphelper::concatSequences(
         ::cppu::OComponentHelper::getTypes(),
@@ -3208,7 +3208,7 @@ void FmXGridCell::disposing()
 }
 
 
-Any SAL_CALL FmXGridCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL FmXGridCell::queryAggregation( const css::uno::Type& _rType )
 {
     Any aReturn = OComponentHelper::queryAggregation( _rType );
 
@@ -3223,13 +3223,13 @@ Any SAL_CALL FmXGridCell::queryAggregation( const css::uno::Type& _rType ) throw
 
 // css::awt::XControl
 
-Reference< XInterface >  FmXGridCell::getContext() throw( RuntimeException, std::exception )
+Reference< XInterface >  FmXGridCell::getContext()
 {
     return Reference< XInterface > ();
 }
 
 
-Reference< css::awt::XControlModel >  FmXGridCell::getModel() throw( css::uno::RuntimeException, std::exception )
+Reference< css::awt::XControlModel >  FmXGridCell::getModel()
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< css::awt::XControlModel > (m_pColumn->getModel(), UNO_QUERY);
@@ -3237,14 +3237,14 @@ Reference< css::awt::XControlModel >  FmXGridCell::getModel() throw( css::uno::R
 
 // css::form::XBoundControl
 
-sal_Bool FmXGridCell::getLock() throw( RuntimeException, std::exception )
+sal_Bool FmXGridCell::getLock()
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return m_pColumn->isLocked();
 }
 
 
-void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException, std::exception )
+void FmXGridCell::setLock(sal_Bool _bLock)
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     if (getLock() == _bLock)
@@ -3257,119 +3257,119 @@ void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException, std::excepti
 }
 
 
-void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int16 ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int16 )
 {
     OSL_FAIL( "FmXGridCell::setPosSize: not implemented" );
     // not allowed to tamper with this for a grid cell
 }
 
 
-awt::Rectangle SAL_CALL FmXGridCell::getPosSize(  ) throw (RuntimeException, std::exception)
+awt::Rectangle SAL_CALL FmXGridCell::getPosSize(  )
 {
     OSL_FAIL( "FmXGridCell::getPosSize: not implemented" );
     return awt::Rectangle();
 }
 
 
-void SAL_CALL FmXGridCell::setVisible( sal_Bool ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::setVisible( sal_Bool )
 {
     OSL_FAIL( "FmXGridCell::setVisible: not implemented" );
     // not allowed to tamper with this for a grid cell
 }
 
 
-void SAL_CALL FmXGridCell::setEnable( sal_Bool ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::setEnable( sal_Bool )
 {
     OSL_FAIL( "FmXGridCell::setEnable: not implemented" );
     // not allowed to tamper with this for a grid cell
 }
 
 
-void SAL_CALL FmXGridCell::setFocus(  ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::setFocus(  )
 {
     OSL_FAIL( "FmXGridCell::setFocus: not implemented" );
     // not allowed to tamper with this for a grid cell
 }
 
 
-void SAL_CALL FmXGridCell::addWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::addWindowListener( const Reference< awt::XWindowListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aWindowListeners.addInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::removeWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::removeWindowListener( const Reference< awt::XWindowListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aWindowListeners.removeInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::addFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::addFocusListener( const Reference< awt::XFocusListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aFocusListeners.addInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::removeFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::removeFocusListener( const Reference< awt::XFocusListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aFocusListeners.removeInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::addKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::addKeyListener( const Reference< awt::XKeyListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aKeyListeners.addInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::removeKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::removeKeyListener( const Reference< awt::XKeyListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aKeyListeners.removeInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::addMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::addMouseListener( const Reference< awt::XMouseListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aMouseListeners.addInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::removeMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::removeMouseListener( const Reference< awt::XMouseListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aMouseListeners.removeInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aMouseMotionListeners.addInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener )
 {
     checkDisposed(OComponentHelper::rBHelper.bDisposed);
     m_aMouseMotionListeners.removeInterface( _rxListener );
 }
 
 
-void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener )
 {
     OSL_FAIL( "FmXGridCell::addPaintListener: not implemented" );
     (void)_rxListener;
 }
 
 
-void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener )
 {
     OSL_FAIL( "FmXGridCell::removePaintListener: not implemented" );
     (void)_rxListener;
@@ -3608,7 +3608,7 @@ void FmXEditCell::disposing()
 }
 
 
-Any SAL_CALL FmXEditCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL FmXEditCell::queryAggregation( const css::uno::Type& _rType )
 {
     Any aReturn = FmXTextCell::queryAggregation( _rType );
 
@@ -3619,7 +3619,7 @@ Any SAL_CALL FmXEditCell::queryAggregation( const css::uno::Type& _rType ) throw
 }
 
 
-Sequence< css::uno::Type > SAL_CALL FmXEditCell::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< css::uno::Type > SAL_CALL FmXEditCell::getTypes(  )
 {
     return ::comphelper::concatSequences(
         FmXTextCell::getTypes(),
@@ -3632,19 +3632,19 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( FmXEditCell )
 
 // css::awt::XTextComponent
 
-void SAL_CALL FmXEditCell::addTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXEditCell::addTextListener(const Reference< css::awt::XTextListener >& l)
 {
     m_aTextListeners.addInterface( l );
 }
 
 
-void SAL_CALL FmXEditCell::removeTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXEditCell::removeTextListener(const Reference< css::awt::XTextListener >& l)
 {
     m_aTextListeners.removeInterface( l );
 }
 
 
-void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXEditCell::setText( const OUString& aText )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3659,7 +3659,7 @@ void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeExcept
 }
 
 
-void SAL_CALL FmXEditCell::insertText(const css::awt::Selection& rSel, const OUString& aText) throw(RuntimeException, std::exception)
+void SAL_CALL FmXEditCell::insertText(const css::awt::Selection& rSel, const OUString& aText)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3671,7 +3671,7 @@ void SAL_CALL FmXEditCell::insertText(const css::awt::Selection& rSel, const OUS
 }
 
 
-OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXEditCell::getText()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3695,7 +3695,7 @@ OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException, std::exception
 }
 
 
-OUString SAL_CALL FmXEditCell::getSelectedText() throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXEditCell::getSelectedText()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3709,7 +3709,7 @@ OUString SAL_CALL FmXEditCell::getSelectedText() throw( RuntimeException, std::e
 }
 
 
-void SAL_CALL FmXEditCell::setSelection( const css::awt::Selection& aSelection ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXEditCell::setSelection( const css::awt::Selection& aSelection )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3718,7 +3718,7 @@ void SAL_CALL FmXEditCell::setSelection( const css::awt::Selection& aSelection )
 }
 
 
-css::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException, std::exception )
+css::awt::Selection SAL_CALL FmXEditCell::getSelection()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3730,7 +3730,7 @@ css::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException
 }
 
 
-sal_Bool SAL_CALL FmXEditCell::isEditable() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FmXEditCell::isEditable()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3738,7 +3738,7 @@ sal_Bool SAL_CALL FmXEditCell::isEditable() throw( RuntimeException, std::except
 }
 
 
-void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3747,7 +3747,7 @@ void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable ) throw( RuntimeExcep
 }
 
 
-sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3755,7 +3755,7 @@ sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen() throw( RuntimeException, std::ex
 }
 
 
-void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3764,13 +3764,13 @@ void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) throw( RuntimeExcepti
 }
 
 
-void SAL_CALL FmXEditCell::addChangeListener( const Reference< form::XChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXEditCell::addChangeListener( const Reference< form::XChangeListener >& Listener )
 {
     m_aChangeListeners.addInterface( Listener );
 }
 
 
-void SAL_CALL FmXEditCell::removeChangeListener( const Reference< form::XChangeListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXEditCell::removeChangeListener( const Reference< form::XChangeListener >& Listener )
 {
     m_aChangeListeners.removeInterface( Listener );
 }
@@ -3853,7 +3853,7 @@ void FmXCheckBoxCell::disposing()
 }
 
 
-Any SAL_CALL FmXCheckBoxCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL FmXCheckBoxCell::queryAggregation( const css::uno::Type& _rType )
 {
     Any aReturn = FmXDataCell::queryAggregation( _rType );
 
@@ -3864,7 +3864,7 @@ Any SAL_CALL FmXCheckBoxCell::queryAggregation( const css::uno::Type& _rType ) t
 }
 
 
-Sequence< css::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< css::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes(  )
 {
     return ::comphelper::concatSequences(
         FmXDataCell::getTypes(),
@@ -3876,19 +3876,19 @@ Sequence< css::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes(  ) throw(RuntimeE
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXCheckBoxCell )
 
 
-void SAL_CALL FmXCheckBoxCell::addItemListener( const Reference< css::awt::XItemListener >& l ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXCheckBoxCell::addItemListener( const Reference< css::awt::XItemListener >& l )
 {
     m_aItemListeners.addInterface( l );
 }
 
 
-void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< css::awt::XItemListener >& l ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< css::awt::XItemListener >& l )
 {
     m_aItemListeners.removeInterface( l );
 }
 
 
-void SAL_CALL FmXCheckBoxCell::setState( short n ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXCheckBoxCell::setState( short n )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3900,7 +3900,7 @@ void SAL_CALL FmXCheckBoxCell::setState( short n ) throw( RuntimeException, std:
 }
 
 
-short SAL_CALL FmXCheckBoxCell::getState() throw( RuntimeException, std::exception )
+short SAL_CALL FmXCheckBoxCell::getState()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3913,7 +3913,7 @@ short SAL_CALL FmXCheckBoxCell::getState() throw( RuntimeException, std::excepti
 }
 
 
-void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -3922,19 +3922,19 @@ void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) throw( RuntimeExcept
 }
 
 
-void SAL_CALL FmXCheckBoxCell::addActionListener( const Reference< awt::XActionListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXCheckBoxCell::addActionListener( const Reference< awt::XActionListener >& Listener )
 {
     m_aActionListeners.addInterface( Listener );
 }
 
 
-void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActionListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActionListener >& Listener )
 {
     m_aActionListeners.removeInterface( Listener );
 }
 
 
-void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& Label ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& Label )
 {
     SolarMutexGuard aGuard;
     if ( m_pColumn )
@@ -3945,7 +3945,7 @@ void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& Label ) throw (RuntimeE
 }
 
 
-void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& Command ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& Command )
 {
     m_aActionCommand = Command;
 }
@@ -4030,7 +4030,7 @@ void FmXListBoxCell::disposing()
 }
 
 
-Any SAL_CALL FmXListBoxCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL FmXListBoxCell::queryAggregation( const css::uno::Type& _rType )
 {
     Any aReturn = FmXTextCell::queryAggregation(_rType);
 
@@ -4041,7 +4041,7 @@ Any SAL_CALL FmXListBoxCell::queryAggregation( const css::uno::Type& _rType ) th
 }
 
 
-Sequence< css::uno::Type > SAL_CALL FmXListBoxCell::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< css::uno::Type > SAL_CALL FmXListBoxCell::getTypes(  )
 {
     return ::comphelper::concatSequences(
         FmXTextCell::getTypes(),
@@ -4053,31 +4053,31 @@ Sequence< css::uno::Type > SAL_CALL FmXListBoxCell::getTypes(  ) throw(RuntimeEx
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXListBoxCell )
 
 
-void SAL_CALL FmXListBoxCell::addItemListener(const Reference< css::awt::XItemListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::addItemListener(const Reference< css::awt::XItemListener >& l)
 {
     m_aItemListeners.addInterface( l );
 }
 
 
-void SAL_CALL FmXListBoxCell::removeItemListener(const Reference< css::awt::XItemListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::removeItemListener(const Reference< css::awt::XItemListener >& l)
 {
     m_aItemListeners.removeInterface( l );
 }
 
 
-void SAL_CALL FmXListBoxCell::addActionListener(const Reference< css::awt::XActionListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::addActionListener(const Reference< css::awt::XActionListener >& l)
 {
     m_aActionListeners.addInterface( l );
 }
 
 
-void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< css::awt::XActionListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< css::awt::XActionListener >& l)
 {
     m_aActionListeners.removeInterface( l );
 }
 
 
-void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (m_pBox)
@@ -4085,7 +4085,7 @@ void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) thr
 }
 
 
-void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItems, sal_Int16 nPos) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItems, sal_Int16 nPos)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (m_pBox)
@@ -4101,7 +4101,7 @@ void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItem
 }
 
 
-void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pBox )
@@ -4112,20 +4112,20 @@ void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount) thro
 }
 
 
-sal_Int16 SAL_CALL FmXListBoxCell::getItemCount() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL FmXListBoxCell::getItemCount()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_pBox ? m_pBox->GetEntryCount() : 0;
 }
 
 
-OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString();
 }
 
-css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException, std::exception )
+css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4144,7 +4144,7 @@ css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems() throw( RuntimeE
 }
 
 
-sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (m_pBox)
@@ -4159,7 +4159,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() throw( RuntimeException,
 }
 
 
-Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( RuntimeException, std::exception )
+Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     Sequence<sal_Int16> aSeq;
@@ -4175,7 +4175,7 @@ Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( Runt
     return aSeq;
 }
 
-OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXListBoxCell::getSelectedItem()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4191,7 +4191,7 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException, std
 }
 
 
-css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException, std::exception )
+css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4209,7 +4209,7 @@ css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() throw(
 }
 
 
-void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4218,7 +4218,7 @@ void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect) th
 }
 
 
-void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPositions, sal_Bool bSelect)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4230,7 +4230,7 @@ void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPosit
 }
 
 
-void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4239,7 +4239,7 @@ void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect
 }
 
 
-sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4250,7 +4250,7 @@ sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() throw( RuntimeException, std::
 }
 
 
-void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4259,7 +4259,7 @@ void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti) throw( RuntimeExc
 }
 
 
-sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4271,7 +4271,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount() throw( RuntimeExceptio
 }
 
 
-void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4280,7 +4280,7 @@ void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Runt
 }
 
 
-void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeException, std::exception )
+void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4358,7 +4358,7 @@ void FmXComboBoxCell::disposing()
 }
 
 
-Any SAL_CALL FmXComboBoxCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL FmXComboBoxCell::queryAggregation( const css::uno::Type& _rType )
 {
     Any aReturn = FmXTextCell::queryAggregation(_rType);
 
@@ -4369,7 +4369,7 @@ Any SAL_CALL FmXComboBoxCell::queryAggregation( const css::uno::Type& _rType ) t
 }
 
 
-Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes(  )
 {
     return ::comphelper::concatSequences(
         FmXTextCell::getTypes(),
@@ -4381,31 +4381,31 @@ Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes(  ) throw(RuntimeException,
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXComboBoxCell )
 
 
-void SAL_CALL FmXComboBoxCell::addItemListener(const Reference< awt::XItemListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::addItemListener(const Reference< awt::XItemListener >& l)
 {
     m_aItemListeners.addInterface( l );
 }
 
 
-void SAL_CALL FmXComboBoxCell::removeItemListener(const Reference< awt::XItemListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::removeItemListener(const Reference< awt::XItemListener >& l)
 {
     m_aItemListeners.removeInterface( l );
 }
 
 
-void SAL_CALL FmXComboBoxCell::addActionListener(const Reference< awt::XActionListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::addActionListener(const Reference< awt::XActionListener >& l)
 {
     m_aActionListeners.addInterface( l );
 }
 
 
-void SAL_CALL FmXComboBoxCell::removeActionListener(const Reference< awt::XActionListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::removeActionListener(const Reference< awt::XActionListener >& l)
 {
     m_aActionListeners.removeInterface( l );
 }
 
 
-void SAL_CALL FmXComboBoxCell::addItem( const OUString& Item, sal_Int16 Pos ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::addItem( const OUString& Item, sal_Int16 Pos )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pComboBox )
@@ -4413,7 +4413,7 @@ void SAL_CALL FmXComboBoxCell::addItem( const OUString& Item, sal_Int16 Pos ) th
 }
 
 
-void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& Items, sal_Int16 Pos ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& Items, sal_Int16 Pos )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pComboBox )
@@ -4429,7 +4429,7 @@ void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& Items, sal_
 }
 
 
-void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 Pos, sal_Int16 Count ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 Pos, sal_Int16 Count )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pComboBox )
@@ -4440,20 +4440,20 @@ void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 Pos, sal_Int16 Count ) thr
 }
 
 
-sal_Int16 SAL_CALL FmXComboBoxCell::getItemCount() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL FmXComboBoxCell::getItemCount()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_pComboBox ? m_pComboBox->GetEntryCount() : 0;
 }
 
 
-OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 Pos ) throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 Pos )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_pComboBox ? OUString(m_pComboBox->GetEntry(Pos)) : OUString();
 }
 
-Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4470,7 +4470,7 @@ Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeExceptio
 }
 
 
-sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4482,7 +4482,7 @@ sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount() throw( RuntimeExcepti
 }
 
 
-void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pComboBox )
@@ -4538,7 +4538,7 @@ FmXFilterCell::~FmXFilterCell()
 
 // XUnoTunnel
 
-sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rIdentifier )
 {
     sal_Int64 nReturn(0);
 
@@ -4581,7 +4581,7 @@ void FmXFilterCell::disposing()
 }
 
 
-Any SAL_CALL FmXFilterCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL FmXFilterCell::queryAggregation( const css::uno::Type& _rType )
 {
     Any aReturn = FmXGridCell::queryAggregation(_rType);
 
@@ -4592,7 +4592,7 @@ Any SAL_CALL FmXFilterCell::queryAggregation( const css::uno::Type& _rType ) thr
 }
 
 
-Sequence< css::uno::Type > SAL_CALL FmXFilterCell::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< css::uno::Type > SAL_CALL FmXFilterCell::getTypes(  )
 {
     return ::comphelper::concatSequences(
         FmXGridCell::getTypes(),
@@ -4605,72 +4605,72 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( FmXFilterCell )
 
 // css::awt::XTextComponent
 
-void SAL_CALL FmXFilterCell::addTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFilterCell::addTextListener(const Reference< css::awt::XTextListener >& l)
 {
     m_aTextListeners.addInterface( l );
 }
 
 
-void SAL_CALL FmXFilterCell::removeTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFilterCell::removeTextListener(const Reference< css::awt::XTextListener >& l)
 {
     m_aTextListeners.removeInterface( l );
 }
 
 
-void SAL_CALL FmXFilterCell::setText( const OUString& aText ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFilterCell::setText( const OUString& aText )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     static_cast<DbFilterField*>(m_pCellControl)->SetText(aText);
 }
 
 
-void SAL_CALL FmXFilterCell::insertText( const css::awt::Selection& /*rSel*/, const OUString& /*aText*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFilterCell::insertText( const css::awt::Selection& /*rSel*/, const OUString& /*aText*/ )
 {
 }
 
 
-OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXFilterCell::getText()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return static_cast<DbFilterField*>(m_pCellControl)->GetText();
 }
 
 
-OUString SAL_CALL FmXFilterCell::getSelectedText() throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXFilterCell::getSelectedText()
 {
     return getText();
 }
 
 
-void SAL_CALL FmXFilterCell::setSelection( const css::awt::Selection& /*aSelection*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFilterCell::setSelection( const css::awt::Selection& /*aSelection*/ )
 {
 }
 
 
-css::awt::Selection SAL_CALL FmXFilterCell::getSelection() throw( RuntimeException, std::exception )
+css::awt::Selection SAL_CALL FmXFilterCell::getSelection()
 {
     return css::awt::Selection();
 }
 
 
-sal_Bool SAL_CALL FmXFilterCell::isEditable() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FmXFilterCell::isEditable()
 {
     return true;
 }
 
 
-void SAL_CALL FmXFilterCell::setEditable( sal_Bool /*bEditable*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFilterCell::setEditable( sal_Bool /*bEditable*/ )
 {
 }
 
 
-sal_Int16 SAL_CALL FmXFilterCell::getMaxTextLen() throw( RuntimeException, std::exception )
+sal_Int16 SAL_CALL FmXFilterCell::getMaxTextLen()
 {
     return 0;
 }
 
 
-void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ )
 {
 }
 
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 75516618b595..f901dd3d5ab8 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -97,10 +97,10 @@ public:
 
 private:
     // XEventListener
-    virtual void SAL_CALL disposing(const css::lang::EventObject& /*i_aEvt*/) throw ( RuntimeException, std::exception ) override
+    virtual void SAL_CALL disposing(const css::lang::EventObject& /*i_aEvt*/) override
     {
     }
-    virtual void SAL_CALL rowsChanged(const css::sdb::RowsChangeEvent& i_aEvt) throw ( RuntimeException, std::exception ) override
+    virtual void SAL_CALL rowsChanged(const css::sdb::RowsChangeEvent& i_aEvt) override
     {
         if ( i_aEvt.Action == RowChangeAction::UPDATE )
         {
@@ -138,7 +138,7 @@ public:
     GridFieldValueListener(DbGridControl& _rParent, const Reference< XPropertySet >& xField, sal_uInt16 _nId);
     virtual ~GridFieldValueListener() override;
 
-    virtual void _propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException ) override;
+    virtual void _propertyChanged(const PropertyChangeEvent& evt) override;
 
     void suspend() { ++m_nSuspended; }
     void resume() { --m_nSuspended; }
@@ -165,7 +165,7 @@ GridFieldValueListener::~GridFieldValueListener()
     dispose();
 }
 
-void GridFieldValueListener::_propertyChanged(const PropertyChangeEvent& _evt) throw( RuntimeException )
+void GridFieldValueListener::_propertyChanged(const PropertyChangeEvent& _evt)
 {
     DBG_ASSERT(m_nSuspended>=0, "GridFieldValueListener::_propertyChanged : resume > suspend !");
     if (m_nSuspended <= 0)
@@ -199,7 +199,7 @@ public:
     DisposeListenerGridBridge(  DbGridControl& _rParent, const Reference< XComponent >& _rxObject);
     virtual ~DisposeListenerGridBridge() override;
 
-    virtual void disposing(const EventObject& _rEvent, sal_Int16 _nId) throw( RuntimeException ) override { m_rParent.disposing(_nId, _rEvent); }
+    virtual void disposing(const EventObject& _rEvent, sal_Int16 _nId) override { m_rParent.disposing(_nId, _rEvent); }
 };
 
 DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject)
@@ -254,7 +254,7 @@ public:
     void suspend() { ++m_nSuspended; }
     void resume() { --m_nSuspended; }
 
-    virtual void _propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception ) override;
+    virtual void _propertyChanged(const PropertyChangeEvent& evt) override;
 };
 
 FmXGridSourcePropListener::FmXGridSourcePropListener(DbGridControl* _pParent)
@@ -265,7 +265,7 @@ FmXGridSourcePropListener::FmXGridSourcePropListener(DbGridControl* _pParent)
     DBG_ASSERT(m_pParent, "FmXGridSourcePropListener::FmXGridSourcePropListener : invalid parent !");
 }
 
-void FmXGridSourcePropListener::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception )
+void FmXGridSourcePropListener::_propertyChanged(const PropertyChangeEvent& evt)
 {
     DBG_ASSERT(m_nSuspended>=0, "FmXGridSourcePropListener::_propertyChanged : resume > suspend !");
     if (m_nSuspended <= 0)
@@ -2732,7 +2732,7 @@ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMe
     }
 }
 
-void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception )
+void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt)
 {
     SAL_INFO("svx.fmcomp", "DbGridControl::DataSourcePropertyChanged");
     SolarMutexGuard aGuard;
diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx
index 813f51a73612..7b50b9f065d7 100644
--- a/svx/source/form/datalistener.cxx
+++ b/svx/source/form/datalistener.cxx
@@ -45,23 +45,23 @@ namespace svxform
     }
 
     // XContainerListener
-    void SAL_CALL DataListener::elementInserted( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::elementInserted( const ContainerEvent& /*Event*/ )
     {
         m_pNaviWin->NotifyChanges();
     }
 
-    void SAL_CALL DataListener::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::elementRemoved( const ContainerEvent& /*Event*/ )
     {
         m_pNaviWin->NotifyChanges();
     }
 
-    void SAL_CALL DataListener::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::elementReplaced( const ContainerEvent& /*Event*/ )
     {
         m_pNaviWin->NotifyChanges();
     }
 
     // XFrameActionListener
-    void SAL_CALL DataListener::frameAction( const FrameActionEvent& rActionEvt ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::frameAction( const FrameActionEvent& rActionEvt )
     {
         if ( FrameAction_COMPONENT_ATTACHED == rActionEvt.Action ||
              FrameAction_COMPONENT_REATTACHED == rActionEvt.Action )
@@ -71,13 +71,13 @@ namespace svxform
     }
 
     // xml::dom::events::XEventListener
-    void SAL_CALL DataListener::handleEvent( const Reference< XEvent >& /*evt*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::handleEvent( const Reference< XEvent >& /*evt*/ )
     {
         m_pNaviWin->NotifyChanges();
     }
 
     // lang::XEventListener
-    void SAL_CALL DataListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::disposing( const EventObject& /*Source*/ )
     {
         SAL_WARN( "svx.form", "disposing" );
     }
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 3c1116a83494..374324049f97 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -242,16 +242,16 @@ public:
     FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexAccess >& xControllers);
 
 // XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const EventObject& Source) override;
 
 // XFilterControllerListener
-    virtual void SAL_CALL predicateExpressionChanged( const FilterEvent& Event ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL disjunctiveTermRemoved( const FilterEvent& Event ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL disjunctiveTermAdded( const FilterEvent& Event ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL predicateExpressionChanged( const FilterEvent& Event ) override;
+    virtual void SAL_CALL disjunctiveTermRemoved( const FilterEvent& Event ) override;
+    virtual void SAL_CALL disjunctiveTermAdded( const FilterEvent& Event ) override;
 
 // helpers
     /// @throws RuntimeException
-    void dispose() throw( RuntimeException );
+    void dispose();
 
     void AddOrRemoveListener( const Reference< XIndexAccess >& _rxControllers, const bool _bAdd );
 
@@ -269,7 +269,7 @@ FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexA
 }
 
 
-void FmFilterAdapter::dispose() throw( RuntimeException )
+void FmFilterAdapter::dispose()
 {
     AddOrRemoveListener( m_xControllers, false );
 }
@@ -318,7 +318,7 @@ void FmFilterAdapter::setText(sal_Int32 nRowPos,
 
 // XEventListener
 
-void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) throw( RuntimeException, std::exception )
+void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/)
 {
 }
 
@@ -358,7 +358,7 @@ namespace
 
 // XFilterControllerListener
 
-void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event ) throw( RuntimeException, std::exception )
+void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event )
 {
     SolarMutexGuard aGuard;
 
@@ -409,7 +409,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event ) thr
 }
 
 
-void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event )
 {
     SolarMutexGuard aGuard;
 
@@ -444,7 +444,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event
 }
 
 
-void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event )
 {
     SolarMutexGuard aGuard;
 
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index a3c96f8fdc9c..32700e9d70f3 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -28,7 +28,7 @@
 using namespace ::svxform;
 
 
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL SvxFmMSFactory::createInstance(const OUString& rServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception )
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL SvxFmMSFactory::createInstance(const OUString& rServiceSpecifier)
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xRet;
     if ( rServiceSpecifier.startsWith( "com.sun.star.form.component." ) )
@@ -47,7 +47,7 @@ using namespace ::svxform;
 }
 
 
-::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames()
 {
     static const OUStringLiteral aSvxComponentServiceNameList[] =
     {
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 8ce3e23b3ab9..8d87f611b368 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -38,12 +38,12 @@ SvxFmDrawPage::~SvxFmDrawPage() throw ()
 {
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType )
 {
     Any aRet = ::cppu::queryInterface   (   _rType
                                         ,   static_cast< XFormsSupplier2* >( this )
@@ -55,7 +55,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType ) thr
     return aRet;
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes(  )
 {
     css::uno::Sequence< css::uno::Type > aTypes(SvxDrawPage::getTypes());
     aTypes.realloc(aTypes.getLength() + 1);
@@ -66,7 +66,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes(  ) throw(
 }
 
 SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xDescr )
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString aShapeType( xDescr->getShapeType() );
 
@@ -80,7 +79,6 @@ SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::draw
 }
 
 css::uno::Reference< css::drawing::XShape >  SvxFmDrawPage::CreateShape( SdrObject *pObj ) const
-    throw (css::uno::RuntimeException, std::exception)
 {
     if( SdrInventor::FmForm == pObj->GetObjInventor() )
     {
@@ -92,7 +90,7 @@ css::uno::Reference< css::drawing::XShape >  SvxFmDrawPage::CreateShape( SdrObje
 }
 
 // XFormsSupplier
-css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms()
 {
     css::uno::Reference< css::container::XNameContainer >  xForms;
 
@@ -104,7 +102,7 @@ css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::ge
 }
 
 // XFormsSupplier2
-sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxFmDrawPage::hasForms()
 {
     bool bHas = false;
     FmFormPage* pFormPage = dynamic_cast<FmFormPage*>( GetSdrPage()  );
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 59b8c209f695..0c39405586d8 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -73,7 +73,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL OLocalExchange::lostOwnership( const Reference< clipboard::XClipboard >& _rxClipboard, const Reference< XTransferable >& _rxTrans ) throw(RuntimeException, std::exception)
+    void SAL_CALL OLocalExchange::lostOwnership( const Reference< clipboard::XClipboard >& _rxClipboard, const Reference< XTransferable >& _rxTrans )
     {
         TransferableHelper::implCallOwnLostOwnership( _rxClipboard, _rxTrans );
         m_bClipboardOwner = false;
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 9f12a2ad9c53..b58c364e661d 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -88,10 +88,10 @@ namespace svxform
         explicit FormScriptListener( FormScriptingEnvironment * pScriptExecutor );
 
         // XScriptListener
-        virtual void SAL_CALL firing( const ScriptEvent& aEvent ) throw (RuntimeException, std::exception) override;
-        virtual Any SAL_CALL approveFiring( const ScriptEvent& aEvent ) throw (InvocationTargetException, RuntimeException, std::exception) override;
+        virtual void SAL_CALL firing( const ScriptEvent& aEvent ) override;
+        virtual Any SAL_CALL approveFiring( const ScriptEvent& aEvent ) override;
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
         // lifetime control
         void SAL_CALL dispose();
@@ -722,7 +722,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent )
     {
        if ( _rEvent.ScriptType == "VBAInterop" )
            return; // not handled here
@@ -743,7 +743,7 @@ namespace svxform
     }
 
 
-    Any SAL_CALL FormScriptListener::approveFiring( const ScriptEvent& _rEvent ) throw (InvocationTargetException, RuntimeException, std::exception)
+    Any SAL_CALL FormScriptListener::approveFiring( const ScriptEvent& _rEvent )
     {
         Any aResult;
 
@@ -755,7 +755,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL FormScriptListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormScriptListener::disposing( const EventObject& /*Source*/ )
     {
         // not interested in
     }
@@ -785,8 +785,7 @@ namespace svxform
             bool mbQuitBlocked;
         public:
             // XTerminateListener
-            virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/)
-                throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override
+            virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/) override
             {
                 mbQuitBlocked = true;
 #if HAVE_FEATURE_SCRIPTING
@@ -795,16 +794,14 @@ namespace svxform
                 throw css::frame::TerminationVetoException();
             }
 
-            virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/)
-                throw(css::uno::RuntimeException, std::exception) override
+            virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/) override
             {
                 mbQuitBlocked = false;
             }
 
             using cppu::WeakComponentImplHelperBase::disposing;
 
-            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
             {
                 const bool bShutDown = (rEvent.Source == m_xDesktop);
                 if (bShutDown && m_xDesktop.is())
@@ -815,20 +812,17 @@ namespace svxform
             }
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual OUString SAL_CALL getImplementationName() override
             {
                 return OUString("com.sun.star.comp.svx.StarBasicQuitGuard");
             }
 
-            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
             {
                 return cppu::supportsService(this, ServiceName);
             }
 
-            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
             {
                 css::uno::Sequence<OUString> aSeq { "com.sun.star.svx.StarBasicQuitGuard" };
                 return aSeq;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 218adc06c597..4db230f93b1a 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -733,7 +733,7 @@ bool FmXFormShell::IsReadonlyDoc() const
 
 //  EventListener
 
-void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e)
 {
 
     if (m_xActiveController == e.Source)
@@ -771,7 +771,7 @@ void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( Runtime
 }
 
 
-void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt)
 {
     if ( impl_checkDisposed() )
         return;
@@ -836,7 +836,7 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu
 }
 
 
-void SAL_CALL FmXFormShell::formActivated(const lang::EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormShell::formActivated(const lang::EventObject& rEvent)
 {
     if ( impl_checkDisposed() )
         return;
@@ -847,7 +847,7 @@ void SAL_CALL FmXFormShell::formActivated(const lang::EventObject& rEvent) throw
 }
 
 
-void SAL_CALL FmXFormShell::formDeactivated(const lang::EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormShell::formDeactivated(const lang::EventObject& rEvent)
 {
     if ( impl_checkDisposed() )
         return;
@@ -2486,7 +2486,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextIn
 
   // XContainerListener
 
-void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void FmXFormShell::elementInserted(const ContainerEvent& evt)
 {
     if ( impl_checkDisposed() )
         return;
@@ -2501,7 +2501,7 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(css::uno::Ru
 }
 
 
-void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void FmXFormShell::elementReplaced(const ContainerEvent& evt)
 {
     if ( impl_checkDisposed() )
         return;
@@ -2514,7 +2514,7 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(css::uno::Ru
 }
 
 
-void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void FmXFormShell::elementRemoved(const ContainerEvent& evt)
 {
     if ( impl_checkDisposed() )
         return;
@@ -2622,7 +2622,7 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem
 }
 
 
-void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception)
+void FmXFormShell::selectionChanged(const lang::EventObject& rEvent)
 {
     if ( impl_checkDisposed() )
         return;
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 10a9b75a8b00..1e1d3aa337c5 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -111,7 +111,7 @@ void FmRecordCountListener::DisConnect()
 }
 
 
-void SAL_CALL FmRecordCountListener::disposing(const css::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception )
+void SAL_CALL FmRecordCountListener::disposing(const css::lang::EventObject& /*Source*/)
 {
     DBG_ASSERT(m_xListening.is(), "FmRecordCountListener::disposing should never have been called without a propset !");
     DisConnect();
@@ -129,7 +129,7 @@ void FmRecordCountListener::NotifyCurrentCount()
 }
 
 
-void FmRecordCountListener::propertyChange(const  css::beans::PropertyChangeEvent& /*evt*/) throw(css::uno::RuntimeException, std::exception)
+void FmRecordCountListener::propertyChange(const  css::beans::PropertyChangeEvent& /*evt*/)
 {
     NotifyCurrentCount();
 }
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index feea0056f88b..4f1d69215730 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -81,7 +81,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FmTextControlFeature::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmTextControlFeature::statusChanged( const FeatureStateEvent& _rState )
     {
         m_aFeatureState   = _rState.State;
         m_bFeatureEnabled = _rState.IsEnabled;
@@ -91,7 +91,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FmTextControlFeature::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmTextControlFeature::disposing( const EventObject& /*Source*/ )
     {
         // nothing to do
     }
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 3f170ff0c61a..724a831188b8 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -177,9 +177,9 @@ namespace svx
         virtual ~FmFocusListenerAdapter() override;
 
     protected:
-        virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override;
+        virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
     };
 
 
@@ -223,21 +223,21 @@ namespace svx
     }
 
 
-    void SAL_CALL FmFocusListenerAdapter::focusGained( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmFocusListenerAdapter::focusGained( const css::awt::FocusEvent& e )
     {
         if ( m_pObserver )
             m_pObserver->focusGained( e );
     }
 
 
-    void SAL_CALL FmFocusListenerAdapter::focusLost( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmFocusListenerAdapter::focusLost( const css::awt::FocusEvent& e )
     {
         if ( m_pObserver )
             m_pObserver->focusLost( e );
     }
 
 
-    void SAL_CALL FmFocusListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmFocusListenerAdapter::disposing( const EventObject& Source )
     {
         (void)Source;
         DBG_ASSERT( Source.Source == m_xWindow, "FmFocusListenerAdapter::disposing: where did this come from?" );
@@ -262,11 +262,11 @@ namespace svx
         virtual ~FmMouseListenerAdapter() override;
 
     protected:
-        virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) override;
+        virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) override;
+        virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) override;
+        virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
     };
 
     FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< css::awt::XControl >& _rxControl, IContextRequestObserver* _pObserver )
@@ -309,7 +309,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mousePressed( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mousePressed( const css::awt::MouseEvent& _rEvent )
     {
         SolarMutexGuard aGuard;
         // is this a request for a context menu?
@@ -321,25 +321,25 @@ namespace svx
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mouseReleased( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mouseReleased( const css::awt::MouseEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mouseEntered( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mouseEntered( const css::awt::MouseEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mouseExited( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mouseExited( const css::awt::MouseEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::disposing( const EventObject& Source )
     {
         (void)Source;
         DBG_ASSERT( Source.Source == m_xWindow, "FmMouseListenerAdapter::disposing: where did this come from?" );
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 1c4805299b8a..8555605d170d 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -300,7 +300,7 @@ FmXDisposeMultiplexer::~FmXDisposeMultiplexer()
 
 // css::lang::XEventListener
 
-void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& Source) throw( RuntimeException, std::exception )
+void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& Source)
 {
     Reference< css::lang::XEventListener> xPreventDelete(this);
 
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 6963b0db8cee..3ae443c30f74 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -79,17 +79,17 @@ class ScriptEventListenerWrapper : public cppu::WeakImplHelper< XScriptListener
 {
 public:
     /// @throws css::uno::RuntimeException
-    explicit ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException )
+    explicit ScriptEventListenerWrapper( FmFormModel& _rModel)
         :m_rModel( _rModel )
         ,m_attemptedListenerCreation( false )
     {
 
     }
     // XEventListener
-    virtual void SAL_CALL disposing(const EventObject& ) throw( RuntimeException, std::exception ) override {}
+    virtual void SAL_CALL disposing(const EventObject& ) override {}
 
     // XScriptListener
-    virtual void SAL_CALL firing(const  ScriptEvent& evt) throw(RuntimeException, std::exception) override
+    virtual void SAL_CALL firing(const  ScriptEvent& evt) override
     {
         attemptListenerCreation();
         if ( m_vbaListener.is() )
@@ -98,7 +98,7 @@ public:
         }
     }
 
-    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( css::reflection::InvocationTargetException, RuntimeException, std::exception) override
+    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) override
     {
         attemptListenerCreation();
         if ( m_vbaListener.is() )
@@ -509,7 +509,7 @@ void FmXUndoEnvironment::Removed(FmFormObj* pObj)
 
 //  XEventListener
 
-void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException, std::exception )
+void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e)
 {
     // check if it's an object we have cached information about
     if (m_pPropertySetCache)
@@ -527,7 +527,7 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime
 
 // XPropertyChangeListener
 
-void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -722,7 +722,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
 
 // XContainerListener
 
-void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -746,7 +746,7 @@ void FmXUndoEnvironment::implSetModified()
 }
 
 
-void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -763,7 +763,7 @@ void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thr
 }
 
 
-void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -776,7 +776,7 @@ void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) thro
 }
 
 
-void SAL_CALL FmXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::modified( const EventObject& /*aEvent*/ )
 {
     implSetModified();
 }
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index bac41bc254fb..35742d528b2f 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -219,23 +219,23 @@ void FormViewPageWindowAdapter::dispose()
     m_aControllerList.clear();
 }
 
-sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements()
 {
     return getCount() != 0;
 }
 
-Type SAL_CALL  FormViewPageWindowAdapter::getElementType() throw( RuntimeException, std::exception )
+Type SAL_CALL  FormViewPageWindowAdapter::getElementType()
 {
     return cppu::UnoType<XFormController>::get();
 }
 
 // XIndexAccess
-sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount()
 {
     return m_aControllerList.size();
 }
 
-Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex)
 {
     if (nIndex < 0 ||
         nIndex >= getCount())
@@ -246,7 +246,7 @@ Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( Inde
     return aElement;
 }
 
-void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& Control ) throw (RuntimeException, std::exception)
+void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& Control )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -461,7 +461,7 @@ FmXFormView::~FmXFormView()
 
 //      EventListener
 
-void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::disposing(const EventObject& Source)
 {
     if ( m_xWindow.is() && Source.Source == m_xWindow )
     {
@@ -476,14 +476,14 @@ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeEx
 
 // XFormControllerListener
 
-void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent)
 {
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
         m_pView->GetFormShell()->GetImpl()->formActivated( rEvent );
 }
 
 
-void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent)
 {
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
         m_pView->GetFormShell()->GetImpl()->formDeactivated( rEvent );
@@ -491,7 +491,7 @@ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( Run
 
 // XContainerListener
 
-void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt)
 {
     try
     {
@@ -519,13 +519,13 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run
 }
 
 
-void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt)
 {
     elementInserted(evt);
 }
 
 
-void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/)
 {
 }
 
@@ -1903,7 +1903,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
     }
 }
 
-void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ )
 {
     if ( m_xWindow.is() && m_pView )
     {
@@ -1911,7 +1911,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime
     }
 }
 
-void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ )
 {
     // when switch the focus outside the office the mark didn't change
     // so we can not remove us as focus listener
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 3a09dccfa87a..668125ff2dc8 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -99,7 +99,6 @@ using namespace ::dbtools;
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL
     FormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB )
-    throw (css::uno::Exception)
 {
     return *( new ::svxform::FormController( comphelper::getComponentContext(_rxORB) ) );
 }
@@ -430,11 +429,11 @@ public:
     const Sequence< PropertyValue >&   getValues() const { return m_aValues; }
 
 // XInteractionSupplyParameters
-    virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) override;
 };
 
 
-void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception)
+void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues )
 {
     m_aValues = _rValues;
 }
@@ -463,14 +462,14 @@ public:
     }
 
     virtual OUString GetComponentServiceName() override {return OUString("Edit");}
-    virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) override;
 
 protected:
     virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) override;
 };
 
 
-void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw( RuntimeException, std::exception )
+void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer )
 {
     UnoControl::createPeer( rxToolkit, rParentPeer );
 
@@ -627,7 +626,7 @@ void SAL_CALL FormController::release() throw ()
 }
 
 
-Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL FormController::queryInterface( const Type& _rType )
 {
     Any aRet = FormController_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
@@ -638,12 +637,12 @@ Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeE
 }
 
 
-Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Sequence< Type > SAL_CALL FormController::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL FormController::getTypes(  )
 {
     return comphelper::concatSequences(
         FormController_BASE::getTypes(),
@@ -652,17 +651,17 @@ Sequence< Type > SAL_CALL FormController::getTypes(  ) throw(RuntimeException, s
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL FormController::getImplementationName()
 {
     return OUString("org.openoffice.comp.svx.FormController");
 }
 
-Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames()
 {
     // service names which are supported only, but cannot be used to created an
     // instance at a service factory
@@ -674,13 +673,13 @@ Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( R
 }
 
 
-sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/)
 {
     return true;
 }
 
 
-void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::resetted(const EventObject& rEvent)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if (getCurrentControl().is() &&  (getCurrentControl()->getModel() == rEvent.Source))
@@ -764,14 +763,12 @@ void FormController::impl_setTextOnAllFilter_throw()
 
 sal_Bool FormController::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/,
                                             sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
-                throw( IllegalArgumentException )
 {
     return false;
 }
 
 
 void FormController::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
-                         throw( Exception, std::exception )
 {
 }
 
@@ -855,7 +852,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
 }
 
 
-Reference< XPropertySetInfo >  FormController::getPropertySetInfo() throw( RuntimeException, std::exception )
+Reference< XPropertySetInfo >  FormController::getPropertySetInfo()
 {
     static Reference< XPropertySetInfo >  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -887,19 +884,19 @@ void FormController::fillProperties(
 
 // XFilterController
 
-void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& Listener )
 {
     m_aFilterListeners.addInterface( Listener );
 }
 
 
-void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& Listener )
 {
     m_aFilterListeners.removeInterface( Listener );
 }
 
 
-::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( css::uno::RuntimeException, std::exception )
+::sal_Int32 SAL_CALL FormController::getFilterComponents()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -908,7 +905,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X
 }
 
 
-::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( css::uno::RuntimeException, std::exception )
+::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -917,7 +914,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X
 }
 
 
-void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException, std::exception )
+void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -936,7 +933,7 @@ void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::s
 }
 
 
-Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component ) throw( RuntimeException, IndexOutOfBoundsException, std::exception )
+Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -948,7 +945,7 @@ Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component
 }
 
 
-Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw( RuntimeException, std::exception )
+Sequence< Sequence< OUString > > FormController::getPredicateExpressions()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -981,7 +978,7 @@ Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw
 }
 
 
-void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term )
 {
     // SYNCHRONIZED -->
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -1022,7 +1019,7 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term ) throw (I
 }
 
 
-void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeException, std::exception)
+void SAL_CALL FormController::appendEmptyDisjunctiveTerm()
 {
     // SYNCHRONIZED -->
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -1033,7 +1030,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti
 }
 
 
-::sal_Int32 SAL_CALL FormController::getActiveTerm() throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL FormController::getActiveTerm()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1042,7 +1039,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti
 }
 
 
-void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1059,14 +1056,14 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm ) throw (Ind
 
 // XElementAccess
 
-sal_Bool SAL_CALL FormController::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::hasElements()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return !m_aChildren.empty();
 }
 
 
-Type SAL_CALL  FormController::getElementType() throw( RuntimeException, std::exception )
+Type SAL_CALL  FormController::getElementType()
 {
     return cppu::UnoType<XFormController>::get();
 
@@ -1074,7 +1071,7 @@ Type SAL_CALL  FormController::getElementType() throw( RuntimeException, std::ex
 
 // XEnumerationAccess
 
-Reference< XEnumeration > SAL_CALL  FormController::createEnumeration() throw( RuntimeException, std::exception )
+Reference< XEnumeration > SAL_CALL  FormController::createEnumeration()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return new ::comphelper::OEnumerationByIndex(this);
@@ -1082,14 +1079,14 @@ Reference< XEnumeration > SAL_CALL  FormController::createEnumeration() throw( R
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL FormController::getCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL FormController::getCount()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_aChildren.size();
 }
 
 
-Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL FormController::getByIndex(sal_Int32 Index)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (Index < 0 ||
@@ -1101,7 +1098,7 @@ Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBounds
 
 //  EventListener
 
-void SAL_CALL FormController::disposing(const EventObject& e) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::disposing(const EventObject& e)
 {
     // Ist der Container disposed worden
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1231,7 +1228,7 @@ namespace
 }
 
 
-void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     if ( evt.PropertyName == FM_PROP_BOUNDFIELD )
@@ -1441,7 +1438,7 @@ IMPL_LINK_NOARG(FormController, OnToggleAutoFields, void*, void)
 
 // XTextListener
 
-void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::textChanged(const TextEvent& e)
 {
     // SYNCHRONIZED -->
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -1498,7 +1495,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce
 
 // XItemListener
 
-void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     impl_onModify();
@@ -1506,7 +1503,7 @@ void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) thro
 
 // XModificationBroadcaster
 
-void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener > & l)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1514,7 +1511,7 @@ void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener
 }
 
 
-void FormController::removeModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException, std::exception )
+void FormController::removeModifyListener(const Reference< XModifyListener > & l)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1523,7 +1520,7 @@ void FormController::removeModifyListener(const Reference< XModifyListener > & l
 
 // XModificationListener
 
-void FormController::modified( const EventObject& _rEvent ) throw( RuntimeException, std::exception )
+void FormController::modified( const EventObject& _rEvent )
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
@@ -1616,7 +1613,7 @@ bool FormController::determineLockState() const
 
 //  FocusListener
 
-void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, std::exception )
+void FormController::focusGained(const FocusEvent& e)
 {
     // SYNCHRONIZED -->
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -1769,7 +1766,7 @@ IMPL_LINK_NOARG( FormController, OnDeactivated, void*, void )
 }
 
 
-void FormController::focusLost(const FocusEvent& e) throw( RuntimeException, std::exception )
+void FormController::focusLost(const FocusEvent& e)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
@@ -1786,31 +1783,31 @@ void FormController::focusLost(const FocusEvent& e) throw( RuntimeException, std
 }
 
 
-void SAL_CALL FormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ )
 {
     // not interested in
 }
 
 
-void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ )
 {
     // not interested in
 }
 
 
-void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent )
 {
     m_pControlBorderManager->mouseEntered( _rEvent.Source );
 }
 
 
-void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent )
 {
     m_pControlBorderManager->mouseExited( _rEvent.Source );
 }
 
 
-void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource )
 {
     Reference< XControl > xControl( findControl( m_aControls, Reference< XControlModel >( _rSource.Source, UNO_QUERY ), false, false ) );
     Reference< XValidatableFormComponent > xValidatable( _rSource.Source, UNO_QUERY );
@@ -1822,7 +1819,7 @@ void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSou
 }
 
 
-void FormController::setModel(const Reference< XTabControllerModel > & Model) throw( RuntimeException, std::exception )
+void FormController::setModel(const Reference< XTabControllerModel > & Model)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1935,7 +1932,7 @@ void FormController::setModel(const Reference< XTabControllerModel > & Model) th
 }
 
 
-Reference< XTabControllerModel >  FormController::getModel() throw( RuntimeException, std::exception )
+Reference< XTabControllerModel >  FormController::getModel()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2001,7 +1998,7 @@ void FormController::removeFromEventAttacher(const Reference< XControl > & xCont
 }
 
 
-void FormController::setContainer(const Reference< XControlContainer > & xContainer) throw( RuntimeException, std::exception )
+void FormController::setContainer(const Reference< XControlContainer > & xContainer)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     Reference< XTabControllerModel >  xTabModel(getModel());
@@ -2086,7 +2083,7 @@ void FormController::setContainer(const Reference< XControlContainer > & xContai
 }
 
 
-Reference< XControlContainer >  FormController::getContainer() throw( RuntimeException, std::exception )
+Reference< XControlContainer >  FormController::getContainer()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2098,7 +2095,7 @@ Reference< XControlContainer >  FormController::getContainer() throw( RuntimeExc
 }
 
 
-Sequence< Reference< XControl > > FormController::getControls() throw( RuntimeException, std::exception )
+Sequence< Reference< XControl > > FormController::getControls()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2138,7 +2135,7 @@ Sequence< Reference< XControl > > FormController::getControls() throw( RuntimeEx
 }
 
 
-void FormController::autoTabOrder() throw( RuntimeException, std::exception )
+void FormController::autoTabOrder()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2149,7 +2146,7 @@ void FormController::autoTabOrder() throw( RuntimeException, std::exception )
 }
 
 
-void FormController::activateTabOrder() throw( RuntimeException, std::exception )
+void FormController::activateTabOrder()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2538,7 +2535,7 @@ void FormController::removeControl(const Reference< XControl > & xControl)
 
 // XLoadListener
 
-void FormController::loaded(const EventObject& rEvent) throw( RuntimeException, std::exception )
+void FormController::loaded(const EventObject& rEvent)
 {
     OSL_ENSURE( rEvent.Source == m_xModelAsIndex, "FormController::loaded: where did this come from?" );
 
@@ -2620,7 +2617,7 @@ IMPL_LINK_NOARG(FormController, OnLoad, void*, void)
 }
 
 
-void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception )
+void FormController::unloaded(const EventObject& /*rEvent*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2629,7 +2626,7 @@ void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeExcep
 }
 
 
-void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void FormController::reloading(const EventObject& /*aEvent*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2641,7 +2638,7 @@ void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeExce
 }
 
 
-void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException, std::exception )
+void FormController::reloaded(const EventObject& aEvent)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2650,7 +2647,7 @@ void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException
 }
 
 
-void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void FormController::unloading(const EventObject& /*aEvent*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2659,7 +2656,7 @@ void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeExce
 }
 
 
-void FormController::unload() throw( RuntimeException )
+void FormController::unload()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2768,7 +2765,7 @@ void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm
 
 // css::sdbc::XRowSetListener
 
-void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void FormController::cursorMoved(const EventObject& /*event*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2789,12 +2786,12 @@ void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeExc
 }
 
 
-void FormController::rowChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void FormController::rowChanged(const EventObject& /*event*/)
 {
     // not interested in ...
 }
 
-void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void FormController::rowSetChanged(const EventObject& /*event*/)
 {
     // not interested in ...
 }
@@ -2802,7 +2799,7 @@ void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeE
 
 // XContainerListener
 
-void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::elementInserted(const ContainerEvent& evt)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2848,7 +2845,7 @@ void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw(
 }
 
 
-void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt)
 {
     // simulate an elementRemoved
     ContainerEvent aRemoveEvent( evt );
@@ -2863,7 +2860,7 @@ void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw(
 }
 
 
-void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2909,7 +2906,7 @@ Reference< XControl >  FormController::isInList(const Reference< XWindowPeer > &
 }
 
 
-void FormController::activateFirst() throw( RuntimeException, std::exception )
+void FormController::activateFirst()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2920,7 +2917,7 @@ void FormController::activateFirst() throw( RuntimeException, std::exception )
 }
 
 
-void FormController::activateLast() throw( RuntimeException, std::exception )
+void FormController::activateLast()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2932,7 +2929,7 @@ void FormController::activateLast() throw( RuntimeException, std::exception )
 
 // XFormController
 
-Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw (RuntimeException, std::exception)
+Reference< XFormOperations > SAL_CALL FormController::getFormOperations()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2941,7 +2938,7 @@ Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw
 }
 
 
-Reference< XControl> SAL_CALL FormController::getCurrentControl() throw( RuntimeException, std::exception )
+Reference< XControl> SAL_CALL FormController::getCurrentControl()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2949,14 +2946,14 @@ Reference< XControl> SAL_CALL FormController::getCurrentControl() throw( Runtime
 }
 
 
-void SAL_CALL FormController::addActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addActivateListener(const Reference< XFormControllerListener > & l)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
     m_aActivateListeners.addInterface(l);
 }
 
-void SAL_CALL FormController::removeActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeActivateListener(const Reference< XFormControllerListener > & l)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2964,7 +2961,7 @@ void SAL_CALL FormController::removeActivateListener(const Reference< XFormContr
 }
 
 
-void SAL_CALL FormController::addChildController( const Reference< XFormController >& ChildController ) throw( RuntimeException, IllegalArgumentException, std::exception )
+void SAL_CALL FormController::addChildController( const Reference< XFormController >& ChildController )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3001,7 +2998,7 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll
 }
 
 
-Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw (RuntimeException, std::exception)
+Reference< XFormControllerContext > SAL_CALL FormController::getContext()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3009,7 +3006,7 @@ Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw
 }
 
 
-void SAL_CALL FormController::setContext( const Reference< XFormControllerContext >& _context ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::setContext( const Reference< XFormControllerContext >& _context )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3017,7 +3014,7 @@ void SAL_CALL FormController::setContext( const Reference< XFormControllerContex
 }
 
 
-Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler() throw (RuntimeException, std::exception)
+Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3025,7 +3022,7 @@ Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler(
 }
 
 
-void SAL_CALL FormController::setInteractionHandler( const Reference< XInteractionHandler >& _interactionHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::setInteractionHandler( const Reference< XInteractionHandler >& _interactionHandler )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3436,7 +3433,7 @@ void FormController::stopFiltering()
 
 // XModeSelector
 
-void FormController::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException, std::exception )
+void FormController::setMode(const OUString& Mode)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3464,7 +3461,7 @@ void FormController::setMode(const OUString& Mode) throw( NoSupportException, Ru
 }
 
 
-OUString SAL_CALL FormController::getMode() throw( RuntimeException, std::exception )
+OUString SAL_CALL FormController::getMode()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3473,7 +3470,7 @@ OUString SAL_CALL FormController::getMode() throw( RuntimeException, std::except
 }
 
 
-Sequence< OUString > SAL_CALL FormController::getSupportedModes() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL FormController::getSupportedModes()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3489,7 +3486,7 @@ Sequence< OUString > SAL_CALL FormController::getSupportedModes() throw( Runtime
 }
 
 
-sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3653,7 +3650,7 @@ namespace
 
 // XRowSetApproveListener
 
-sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3741,7 +3738,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
 }
 
 
-sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3758,7 +3755,7 @@ sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) th
 }
 
 
-sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3776,7 +3773,7 @@ sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event)
 
 // XRowSetApproveBroadcaster
 
-void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3785,7 +3782,7 @@ void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetA
 }
 
 
-void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3795,7 +3792,7 @@ void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowS
 
 // XErrorListener
 
-void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3816,7 +3813,7 @@ void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( R
 
 // XErrorBroadcaster
 
-void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3825,7 +3822,7 @@ void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorList
 }
 
 
-void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3835,7 +3832,7 @@ void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorL
 
 // XDatabaseParameterBroadcaster2
 
-void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3844,7 +3841,7 @@ void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDat
 }
 
 
-void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3854,20 +3851,20 @@ void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< X
 
 // XDatabaseParameterBroadcaster
 
-void SAL_CALL FormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener)
 {
     FormController::addDatabaseParameterListener( aListener );
 }
 
 
-void SAL_CALL FormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener)
 {
     FormController::removeDatabaseParameterListener( aListener );
 }
 
 // XDatabaseParameterListener
 
-sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3945,7 +3942,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent&
 
 // XConfirmDeleteBroadcaster
 
-void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3954,7 +3951,7 @@ void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirm
 }
 
 
-void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3964,7 +3961,7 @@ void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConf
 
 // XConfirmDeleteListener
 
-sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -4026,7 +4023,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
 }
 
 
-void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& Features )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     // for now, just copy the ids of the features, because ....
@@ -4040,7 +4037,7 @@ void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >&
 }
 
 
-void SAL_CALL FormController::invalidateAllFeatures(  ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::invalidateAllFeatures(  )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -4055,7 +4052,6 @@ void SAL_CALL FormController::invalidateAllFeatures(  ) throw (RuntimeException,
 Reference< XDispatch >
 FormController::interceptedQueryDispatch( const URL& aURL,
                                             const OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/)
-                                            throw( RuntimeException )
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     Reference< XDispatch >  xReturn;
@@ -4094,7 +4090,7 @@ FormController::interceptedQueryDispatch( const URL& aURL,
 }
 
 
-void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs )
 {
     if ( _rArgs.getLength() != 1 )
     {
@@ -4122,7 +4118,7 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper
 }
 
 
-void SAL_CALL FormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL )
 {
     if (_rURL.Complete == FMURL_CONFIRM_DELETION)
     {
@@ -4140,19 +4136,19 @@ void SAL_CALL FormController::addStatusListener( const Reference< XStatusListene
 }
 
 
-Reference< XInterface > SAL_CALL FormController::getParent() throw( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL FormController::getParent()
 {
     return m_xParent;
 }
 
 
-void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent) throw( NoSupportException, RuntimeException, std::exception )
+void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent)
 {
     m_xParent = Parent;
 }
 
 
-void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL )
 {
     (void)_rURL;
     OSL_ENSURE(_rURL.Complete == FMURL_CONFIRM_DELETION, "FormController::removeStatusListener: invalid (unsupported) URL!");
@@ -4192,7 +4188,7 @@ bool FormController::ensureInteractionHandler()
 }
 
 
-void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _rRequest ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _rRequest )
 {
     if ( !ensureInteractionHandler() )
         return;
@@ -4234,7 +4230,7 @@ void FormController::implInvalidateCurrentControlDependentFeatures()
 }
 
 
-void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ )
 {
     implInvalidateCurrentControlDependentFeatures();
 }
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index b4bd0f3dedb9..ccfde930f8a4 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -381,7 +381,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& Features )
     {
         if ( !m_pInvalidationCallback )
             // nobody's interested in ...
@@ -399,7 +399,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FormControllerHelper::invalidateAllFeatures() throw (RuntimeException, std::exception)
+    void SAL_CALL FormControllerHelper::invalidateAllFeatures()
     {
         if ( !m_pInvalidationCallback )
             // nobody's interested in ...
@@ -442,14 +442,14 @@ namespace svx
     }
 
 
-    void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& Event ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& Event )
     {
         OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccurred: two errors during one operation?" );
         m_aOperationError = Event.Reason;
     }
 
 
-    void SAL_CALL FormControllerHelper::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormControllerHelper::disposing( const EventObject& /*_Source*/ )
     {
         // not interested in
     }
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 52802221cf02..e490119fa7a7 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -70,7 +70,7 @@ namespace svxform
     }
 
 
-    Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException, std::exception)
+    Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         Reference< XDispatch> xResult;
@@ -87,7 +87,7 @@ namespace svxform
 
 
     Sequence< Reference< XDispatch > > SAL_CALL
-    DispatchInterceptionMultiplexer::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts ) throw(RuntimeException, std::exception)
+    DispatchInterceptionMultiplexer::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts )
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         Sequence< Reference< XDispatch> > aReturn(aDescripts.getLength());
@@ -101,35 +101,35 @@ namespace svxform
     }
 
 
-    Reference< XDispatchProvider > SAL_CALL DispatchInterceptionMultiplexer::getSlaveDispatchProvider(  ) throw(RuntimeException, std::exception)
+    Reference< XDispatchProvider > SAL_CALL DispatchInterceptionMultiplexer::getSlaveDispatchProvider(  )
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         return m_xSlaveDispatcher;
     }
 
 
-    void SAL_CALL DispatchInterceptionMultiplexer::setSlaveDispatchProvider(const Reference< XDispatchProvider>& xNewDispatchProvider) throw( RuntimeException, std::exception )
+    void SAL_CALL DispatchInterceptionMultiplexer::setSlaveDispatchProvider(const Reference< XDispatchProvider>& xNewDispatchProvider)
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         m_xSlaveDispatcher = xNewDispatchProvider;
     }
 
 
-    Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider() throw( RuntimeException, std::exception )
+    Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider()
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         return m_xMasterDispatcher;
     }
 
 
-    void SAL_CALL DispatchInterceptionMultiplexer::setMasterDispatchProvider(const Reference< XDispatchProvider>& xNewSupplier) throw( RuntimeException, std::exception )
+    void SAL_CALL DispatchInterceptionMultiplexer::setMasterDispatchProvider(const Reference< XDispatchProvider>& xNewSupplier)
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         m_xMasterDispatcher = xNewSupplier;
     }
 
 
-    void SAL_CALL DispatchInterceptionMultiplexer::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+    void SAL_CALL DispatchInterceptionMultiplexer::disposing(const EventObject& Source)
     {
         if (m_bListening)
         {
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index 1e0688dd08db..bfda3c7a54c8 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -119,7 +119,7 @@ namespace svx
     }
 
 
-    void SAL_CALL OSingleFeatureDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception)
+    void SAL_CALL OSingleFeatureDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments )
     {
         ::osl::ClearableMutexGuard aGuard( m_rMutex );
 
@@ -157,7 +157,7 @@ namespace svx
     }
 
 
-    void SAL_CALL OSingleFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException, std::exception)
+    void SAL_CALL OSingleFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL )
     {
         (void)_rURL;
         OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::addStatusListener: unexpected URL!" );
@@ -174,7 +174,7 @@ namespace svx
     }
 
 
-    void SAL_CALL OSingleFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException, std::exception)
+    void SAL_CALL OSingleFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL )
     {
         (void)_rURL;
         OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::removeStatusListener: unexpected URL!" );
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index c8ff1c2f170e..85b26fff6b78 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -76,114 +76,114 @@ namespace svxform
         }
 
         // form::XFormController
-        virtual Reference< XControl > SAL_CALL getCurrentControl(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL addActivateListener( const Reference< form::XFormControllerListener >& l ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeActivateListener( const Reference< form::XFormControllerListener >& l ) throw (RuntimeException, std::exception) override;
+        virtual Reference< XControl > SAL_CALL getCurrentControl(  ) override;
+        virtual void SAL_CALL addActivateListener( const Reference< form::XFormControllerListener >& l ) override;
+        virtual void SAL_CALL removeActivateListener( const Reference< form::XFormControllerListener >& l ) override;
 
         // awt::XTabController
-        virtual void SAL_CALL setModel( const Reference< XTabControllerModel >& Model ) throw (RuntimeException, std::exception) override;
-        virtual Reference< XTabControllerModel > SAL_CALL getModel(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setContainer( const Reference< XControlContainer >& Container ) throw (RuntimeException, std::exception) override;
-        virtual Reference< XControlContainer > SAL_CALL getContainer(  ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< Reference< XControl > > SAL_CALL getControls(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL autoTabOrder(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL activateTabOrder(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL activateFirst(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL activateLast(  ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL setModel( const Reference< XTabControllerModel >& Model ) override;
+        virtual Reference< XTabControllerModel > SAL_CALL getModel(  ) override;
+        virtual void SAL_CALL setContainer( const Reference< XControlContainer >& Container ) override;
+        virtual Reference< XControlContainer > SAL_CALL getContainer(  ) override;
+        virtual Sequence< Reference< XControl > > SAL_CALL getControls(  ) override;
+        virtual void SAL_CALL autoTabOrder(  ) override;
+        virtual void SAL_CALL activateTabOrder(  ) override;
+        virtual void SAL_CALL activateFirst(  ) override;
+        virtual void SAL_CALL activateLast(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     private:
         const Reference< form::runtime::XFormController >   m_xDelegator;
     };
 
 
-    Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl(  ) throw (RuntimeException, std::exception)
+    Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl(  )
     {
         return m_xDelegator->getCurrentControl();
     }
 
 
-    void SAL_CALL LegacyFormController::addActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::addActivateListener( const Reference< form::XFormControllerListener >& _listener )
     {
         m_xDelegator->addActivateListener( _listener );
     }
 
 
-    void SAL_CALL LegacyFormController::removeActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::removeActivateListener( const Reference< form::XFormControllerListener >& _listener )
     {
         m_xDelegator->removeActivateListener( _listener );
     }
 
 
-    void SAL_CALL LegacyFormController::setModel( const Reference< XTabControllerModel >& _model ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::setModel( const Reference< XTabControllerModel >& _model )
     {
         m_xDelegator->setModel( _model );
     }
 
 
-    Reference< XTabControllerModel > SAL_CALL LegacyFormController::getModel(  ) throw (RuntimeException, std::exception)
+    Reference< XTabControllerModel > SAL_CALL LegacyFormController::getModel(  )
     {
         return m_xDelegator->getModel();
     }
 
 
-    void SAL_CALL LegacyFormController::setContainer( const Reference< XControlContainer >& _container ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::setContainer( const Reference< XControlContainer >& _container )
     {
         m_xDelegator->setContainer( _container );
     }
 
 
-    Reference< XControlContainer > SAL_CALL LegacyFormController::getContainer(  ) throw (RuntimeException, std::exception)
+    Reference< XControlContainer > SAL_CALL LegacyFormController::getContainer(  )
     {
         return m_xDelegator->getContainer();
     }
 
 
-    Sequence< Reference< XControl > > SAL_CALL LegacyFormController::getControls(  ) throw (RuntimeException, std::exception)
+    Sequence< Reference< XControl > > SAL_CALL LegacyFormController::getControls(  )
     {
         return m_xDelegator->getControls();
     }
 
 
-    void SAL_CALL LegacyFormController::autoTabOrder(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::autoTabOrder(  )
     {
         m_xDelegator->autoTabOrder();
     }
 
 
-    void SAL_CALL LegacyFormController::activateTabOrder(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::activateTabOrder(  )
     {
         m_xDelegator->activateTabOrder();
     }
 
 
-    void SAL_CALL LegacyFormController::activateFirst(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::activateFirst(  )
     {
         m_xDelegator->activateFirst();
     }
 
 
-    void SAL_CALL LegacyFormController::activateLast(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::activateLast(  )
     {
         m_xDelegator->activateLast();
     }
 
 
-    OUString SAL_CALL LegacyFormController::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL LegacyFormController::getImplementationName(  )
     {
         return OUString( "org.openoffice.comp.svx.LegacyFormController" );
     }
 
-    sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName )
     {
         return cppu::supportsService(this, _serviceName);
     }
 
-    Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames(  )
     {
         Sequence< OUString > aServices(2);
         aServices.getArray()[0] = "com.sun.star.form.FormController";
@@ -195,7 +195,6 @@ namespace svxform
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL
     LegacyFormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB )
-    throw (css::uno::Exception)
 {
     return ::svxform::LegacyFormController::Create( _rxORB );
 }
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 6cd10d247b9f..2af1e9f1ce8e 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -61,13 +61,13 @@ namespace svxform
 
     // XPropertyChangeListener
 
-    void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+    void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source)
     {
         Remove( Source.Source );
     }
 
 
-    void SAL_CALL OFormComponentObserver::propertyChange(const PropertyChangeEvent& evt) throw(RuntimeException, std::exception)
+    void SAL_CALL OFormComponentObserver::propertyChange(const PropertyChangeEvent& evt)
     {
         if( !m_pNavModel ) return;
         if( evt.PropertyName != FM_PROP_NAME ) return;
@@ -92,7 +92,7 @@ namespace svxform
 
     // XContainerListener
 
-    void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt) throw(RuntimeException, std::exception)
+    void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt)
     {
         if (IsLocked() || !m_pNavModel)
             return;
@@ -131,7 +131,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt) throw(RuntimeException, std::exception)
+    void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt)
     {
         if (IsLocked() || !m_pNavModel)
             return;
@@ -179,7 +179,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt) throw(RuntimeException, std::exception)
+    void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt)
     {
         Reference< XInterface > xElement;
         evt.Element >>= xElement;
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 91e7e89caa8e..d44ec744b416 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -257,7 +257,7 @@ bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt )
 }
 
 
-void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception )
+void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt)
 {
     css::uno::Reference< css::form::XForm >  xForm(evt.Source, css::uno::UNO_QUERY);
     UpdateContent(xForm);
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index d65eff71b535..9f2cc14413a2 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -100,7 +100,7 @@ namespace svxform
     }
 
 
-    Sequence<sal_Int8> SAL_CALL OAddConditionDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+    Sequence<sal_Int8> SAL_CALL OAddConditionDialog::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -112,19 +112,19 @@ namespace svxform
     }
 
 
-    OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OAddConditionDialog::getImplementationName()
     {
         return OAddConditionDialog_GetImplementationName();
     }
 
 
-    Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames()
     {
         return OAddConditionDialog_GetSupportedServiceNames();
     }
 
 
-    Reference<XPropertySetInfo>  SAL_CALL OAddConditionDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference<XPropertySetInfo>  SAL_CALL OAddConditionDialog::getPropertySetInfo()
     {
         return createPropertySetInfo( getInfoHelper() );
     }
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 41ee2b86d22c..5f639df86af5 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -132,8 +132,8 @@ public:
 
     void ExecutePopup( vcl::Window *pParent, const ::Point &aPos );
 
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent &rEvent) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject &rSource) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent &rEvent) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject &rSource) override;
 };
 
 
@@ -171,7 +171,6 @@ GalleryThemePopup::GalleryThemePopup(
 
 void SAL_CALL GalleryThemePopup::statusChanged(
     const css::frame::FeatureStateEvent &rEvent )
-throw ( css::uno::RuntimeException, std::exception )
 {
     const OUString &rURL = rEvent.FeatureURL.Complete;
     if ( rURL == CMD_SID_GALLERY_ENABLE_ADDCOPY )
@@ -207,7 +206,6 @@ throw ( css::uno::RuntimeException, std::exception )
 
 void SAL_CALL GalleryThemePopup::disposing(
     const css::lang::EventObject &/*rSource*/)
-throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index ddae1082c597..7437e931dfec 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -61,39 +61,39 @@ public:
     virtual             ~AccFrameSelector() override;
 
     //XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     //XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     //XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override;
+    virtual void SAL_CALL removeAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     void    Invalidate();
     void    NotifyFocusListeners(bool bGetFocus);
@@ -104,7 +104,7 @@ protected:
 
 private:
     /// @throws css::uno::RuntimeException
-    void                IsValid() throw (css::uno::RuntimeException);
+    void                IsValid();
     void                RemoveFrameSelEventListener();
 
     VclPtr<FrameSelector>  mpFrameSel;
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 1eea3a88a03f..4ccc2221d0ae 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -97,60 +97,58 @@ public:
     // XAccessible
     /// Return the XAccessibleContext.
     virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint )    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL grabFocus() override;
 
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
 
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale() throw (css::uno::RuntimeException, css::accessibility::IllegalAccessibleComponentStateException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
+    virtual OUString SAL_CALL getAccessibleName() override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() override;
+    virtual css::lang::Locale SAL_CALL getLocale() override;
 //  virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::uno::RuntimeException) {}
 //  virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::uno::RuntimeException) {}
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener(  const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) override;
+    virtual void SAL_CALL removeAccessibleEventListener(  const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::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;
 
     // XTypeProvider
-    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override;
 
     // XServiceName
-    virtual OUString SAL_CALL getServiceName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL clearAccessibleSelection() throw (css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL selectAllAccessibleChildren() throw (css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() throw (css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection() override;
+    virtual void SAL_CALL selectAllAccessibleChildren() override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     // IAccessibleViewforwarder
     virtual Rectangle GetVisibleArea() const override;
@@ -159,7 +157,7 @@ public:
 
 protected:
     /// @throws css::lang::IndexOutOfBoundsException
-    void checkChildIndexOnSelection( long nIndexOfChild ) throw (css::lang::IndexOutOfBoundsException );
+    void checkChildIndexOnSelection( long nIndexOfChild );
 
 public:
 
@@ -179,20 +177,19 @@ protected:
             When the object is already disposed then a
             <type>DisposedException</type> is thrown.
     */
-     Rectangle GetBoundingBoxOnScreen() throw (css::uno::RuntimeException);
+     Rectangle GetBoundingBoxOnScreen();
 
     /// Return the object's current bounding box relative to the parent object.
     ///
     /// @throws css::uno::RuntimeException
-    Rectangle GetBoundingBox() throw (css::uno::RuntimeException);
+    Rectangle GetBoundingBox();
 
     virtual void SAL_CALL disposing() final override;
 
 private:
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IndexOutOfBoundsException
-    SdrObject* getSdrObject( sal_Int32 nIndex )
-        throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException );
+    SdrObject* getSdrObject( sal_Int32 nIndex );
 
     void CommitChange (sal_Int16 aEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue);
 
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 4e0b41de70c0..41d8f26eb292 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -48,7 +48,7 @@ namespace svx
 
         virtual void SAL_CALL disposing() override;
 
-        virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+        virtual css::awt::Rectangle implGetBounds(  ) override;
     public:
         SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent );
 
@@ -57,22 +57,22 @@ namespace svx
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleComponent
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
         //OAccessibleContextHelper
         // XAccessibleContext - still waiting to be overwritten
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
 
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override { return this; }
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override { return this; }
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
 
         // call the fireEvent method from the table when it exists.
@@ -133,44 +133,44 @@ namespace svx
         DECLARE_XTYPEPROVIDER( )
 
         // XAccessibleComponent
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
 
         //OAccessibleContextHelper
         // XAccessibleContext - still waiting to be overwritten
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override { return this; }
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override { return this; }
+        virtual sal_Int32 SAL_CALL getForeground(  ) override;
+        virtual sal_Int32 SAL_CALL getBackground(  ) override;
 
         // XAccessibleTable
-        virtual sal_Int32 SAL_CALL getAccessibleRowCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleColumnCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleRowCount(  ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleColumnCount(  ) override;
+        virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override;
+        virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders(  ) override;
+        virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows(  ) override;
+        virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns(  ) override;
+        virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
+        virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary(  ) override;
+        virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
+        virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
 
 
         inline void SAL_CALL fireEvent(
@@ -188,19 +188,15 @@ namespace svx
         // OCommonAccessibleSelection
         // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
         virtual bool
-            implIsSelected( sal_Int32 nAccessibleChildIndex )
-            throw (css::uno::RuntimeException) override;
+            implIsSelected( sal_Int32 nAccessibleChildIndex ) override;
 
         // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
         virtual void
-            implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect )
-            throw (css::lang::IndexOutOfBoundsException,
-                   css::uno::RuntimeException,
-                   std::exception) override;
+            implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override;
 
         // OCommonAccessibleComponent
         /// implements the calculation of the bounding rectangle - still waiting to be overwritten
-        virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+        virtual css::awt::Rectangle implGetBounds(  ) override;
     };
 
 
@@ -222,7 +218,7 @@ namespace svx
 
         // OCommonAccessibleComponent
         /// implements the calculation of the bounding rectangle - still waiting to be overwritten
-        virtual css::awt::Rectangle implGetBounds(  ) throw (css::uno::RuntimeException) override;
+        virtual css::awt::Rectangle implGetBounds(  ) override;
     public:
 
         // XInterface
@@ -234,30 +230,30 @@ namespace svx
         void    ParentDestroyed();
 
         // XAccessibleComponent
-        virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL grabFocus(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
 
         //OAccessibleContextHelper
         // XAccessibleContext - still waiting to be overwritten
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+        virtual OUString SAL_CALL getAccessibleName(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
 
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override { return this; }
+        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override { return this; }
 
-        virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override { return mpParent->m_pParent->getForeground(); }
-        virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override { return mpParent->m_pParent->getBackground(); }
+        virtual sal_Int32 SAL_CALL getForeground(  ) override { return mpParent->m_pParent->getForeground(); }
+        virtual sal_Int32 SAL_CALL getBackground(  ) override { return mpParent->m_pParent->getBackground(); }
 
         // XAccessibleAction
-        virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
+        virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
+        virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
 
         inline void SAL_CALL fireEvent(
diff --git a/svx/source/inc/coreservices.hxx b/svx/source/inc/coreservices.hxx
index 35205a8004d4..4f74500738a2 100644
--- a/svx/source/inc/coreservices.hxx
+++ b/svx/source/inc/coreservices.hxx
@@ -37,39 +37,39 @@ namespace svx
 {
 OUString SAL_CALL ExtrusionDepthController_getImplementationName();
 /// @throws css::uno::RuntimeException
-css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &)  throw( css::uno::RuntimeException );
+css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &);
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames();
 
 OUString SAL_CALL ExtrusionDirectionControl_getImplementationName();
 /// @throws css::uno::RuntimeException
-css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &)  throw( css::uno::RuntimeException );
+css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &);
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames();
 
 OUString SAL_CALL ExtrusionLightingControl_getImplementationName();
 /// @throws css::uno::RuntimeException
-css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &)  throw( css::uno::RuntimeException );
+css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &);
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames();
 
 OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName();
 /// @throws css::uno::RuntimeException
-css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &)  throw( css::uno::RuntimeException );
+css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &);
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames();
 
 OUString SAL_CALL FontworkAlignmentControl_getImplementationName();
 /// @throws css::uno::RuntimeException
-css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &)  throw( css::uno::RuntimeException );
+css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &);
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames();
 
 OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName();
 /// @throws css::uno::RuntimeException
-css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &)  throw( css::uno::RuntimeException );
+css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &);
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames();
 }
 
 #endif
diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx
index c12109c3e001..2749c4e5240e 100644
--- a/svx/source/inc/datalistener.hxx
+++ b/svx/source/inc/datalistener.hxx
@@ -50,18 +50,18 @@ namespace svxform
 
     public:
         // XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
         // XFrameActionListener
-        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) override;
 
         // xml::dom::events::XEventListener
-        virtual void SAL_CALL handleEvent( const css::uno::Reference< css::xml::dom::events::XEvent >& evt ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handleEvent( const css::uno::Reference< css::xml::dom::events::XEvent >& evt ) override;
 
         // lang::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;
     };
 
 
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 244c56983439..8d391288719d 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -270,12 +270,10 @@ class RecoveryCore : public ::cppu::WeakImplHelper< css::frame::XStatusListener
     public:
 
         // css.frame.XStatusListener
-        virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent) override;
 
         // css.lang.XEventListener
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
 
     // helper
@@ -338,31 +336,23 @@ class PluginProgress : public ::cppu::WeakImplHelper< css::task::XStatusIndicato
 
         // XStatusIndicator
         virtual void SAL_CALL start(const OUString& sText ,
-                                          sal_Int32        nRange)
-            throw(css::uno::RuntimeException, std::exception) override;
+                                          sal_Int32        nRange) override;
 
-        virtual void SAL_CALL end()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL end() override;
 
-        virtual void SAL_CALL setText(const OUString& sText)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setText(const OUString& sText) override;
 
-        virtual void SAL_CALL setValue(sal_Int32 nValue)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setValue(sal_Int32 nValue) override;
 
-        virtual void SAL_CALL reset()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL reset() override;
 
 
         // XComponent
-        virtual void SAL_CALL dispose()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
 
-        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) override;
 
-        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener) override;
 };
 
 class SaveDialog : public Dialog
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 90e425922885..db0672d05669 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -75,7 +75,7 @@ namespace svxform
 
     protected:
         // XClipboardOwner
-        virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans ) override;
 
         // TransferableHelper
         virtual void        DragFinished( sal_Int8 nDropAction ) override;
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 04bb94ba8a7f..bf4c601eea86 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -290,16 +290,16 @@ namespace svxform
         OFormComponentObserver( ::svxform::NavigatorTreeModel* pModel );
 
     // XEventListenerListener
-        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;
 
     // css::beans::XPropertyChangeListener
-        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
     // css::container::XContainerListener
 
-        virtual void SAL_CALL elementInserted(const  css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced(const  css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved(const  css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted(const  css::container::ContainerEvent& rEvent) override;
+        virtual void SAL_CALL elementReplaced(const  css::container::ContainerEvent& rEvent) override;
+        virtual void SAL_CALL elementRemoved(const  css::container::ContainerEvent& rEvent) override;
 
         void Lock() { m_nLocks++; }
         void UnLock() { m_nLocks--; }
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 60b0dcde5f83..4e1239c65a32 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.hxx
@@ -95,20 +95,17 @@ namespace svxform
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL
 FmXGridControl_NewInstance_Impl(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const &)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const &);
 
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL
 FormController_NewInstance_Impl(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const &)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const &);
 
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL
 LegacyFormController_NewInstance_Impl(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const &)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const &);
 
 #endif // INCLUDED_SVX_SOURCE_INC_FMSERVS_HXX
 
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index fc799e139241..d9b668026108 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -268,22 +268,22 @@ protected:
     SAL_DLLPRIVATE virtual ~FmXFormShell() override;
 
 // EventListener
-    SAL_DLLPRIVATE virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
+    SAL_DLLPRIVATE virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
 
 // css::container::XContainerListener
-    SAL_DLLPRIVATE virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
-    SAL_DLLPRIVATE virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
-    SAL_DLLPRIVATE virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+    SAL_DLLPRIVATE virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override;
+    SAL_DLLPRIVATE virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override;
+    SAL_DLLPRIVATE virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override;
 
 // XSelectionChangeListener
-    SAL_DLLPRIVATE virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+    SAL_DLLPRIVATE virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) override;
 
 // css::beans::XPropertyChangeListener
-    SAL_DLLPRIVATE virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override;
+    SAL_DLLPRIVATE virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
 // css::form::XFormControllerListener
-    SAL_DLLPRIVATE virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
-    SAL_DLLPRIVATE virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+    SAL_DLLPRIVATE virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) override;
+    SAL_DLLPRIVATE virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) override;
 
 // OComponentHelper
     SAL_DLLPRIVATE virtual void SAL_CALL disposing() override;
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index a0d465c4007d..b8038b23ee20 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -80,8 +80,8 @@ namespace svx
 
     protected:
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
     };
 
 
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index b4d3df4c41d4..40ed363cb2ff 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -163,18 +163,18 @@ public:
 
 protected:
     // 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;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override;
 
     // XContainerListener
-    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override;
+    virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override;
+    virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override;
 
     // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 
     void ModeChanged();
     void dispose();
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 71e4d0821d6a..59fe6d23b23f 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -105,15 +105,15 @@ public:
         //const SdrPageViewWinRec*, FmXFormView* pView);
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) override;
 
     // XFormControllerContext
-    virtual void SAL_CALL makeVisible( const css::uno::Reference< css::awt::XControl >& Control ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL makeVisible( const css::uno::Reference< css::awt::XControl >& Control ) override;
 
     const ::std::vector< css::uno::Reference< css::form::runtime::XFormController > >& GetList() {return m_aControllerList;}
 
@@ -194,20 +194,20 @@ public:
     // UNO Anbindung
 
 // css::lang::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;
 
 // css::container::XContainerListener
-    virtual void SAL_CALL elementInserted(const  css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced(const  css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved(const  css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted(const  css::container::ContainerEvent& rEvent) override;
+    virtual void SAL_CALL elementReplaced(const  css::container::ContainerEvent& rEvent) override;
+    virtual void SAL_CALL elementRemoved(const  css::container::ContainerEvent& rEvent) override;
 
 // css::form::XFormControllerListener
-    virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) override;
+    virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) override;
 
     // XFocusListener
-    virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override;
+    virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override;
 
     FmFormView* getView() const {return m_pView;}
     PFormViewPageWindowAdapter  findWindow( const css::uno::Reference< css::awt::XControlContainer >& _rxCC ) const;
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index f9537a93c245..5ee325731154 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -213,197 +213,196 @@ namespace svxform
         virtual ~FormController() override;
 
     // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
     // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     // XDispatch
-        virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArgs ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArgs ) override;
+        virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) override;
+        virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) override;
 
     // css::container::XChild
-        virtual css::uno::Reference< css::uno::XInterface> SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface>& Parent) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::uno::XInterface> SAL_CALL getParent() override;
+        virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface>& Parent) override;
 
     // css::lang::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;
 
     // OComponentHelper
         virtual void SAL_CALL disposing() override;
 
     // OPropertySetHelper
         virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue,
-                                                sal_Int32 nHandle, const css::uno::Any& rValue )
-                    throw( css::lang::IllegalArgumentException ) override;
+                                                sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw( css::uno::Exception, std::exception ) override;
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
 
-        virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
 
         using OPropertySetHelper::getFastPropertyValue;
 
         // XFilterController
-        virtual ::sal_Int32 SAL_CALL getFilterComponents() throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 Component ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 Term ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL appendEmptyDisjunctiveTerm() throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getActiveTerm() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setActiveTerm( ::sal_Int32 ActiveTerm ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getFilterComponents() override;
+        virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() override;
+        virtual void SAL_CALL addFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) override;
+        virtual void SAL_CALL removeFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) override;
+        virtual void SAL_CALL setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) override;
+        virtual css::uno::Reference< css::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 Component ) override;
+        virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() override;
+        virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 Term ) override;
+        virtual void SAL_CALL appendEmptyDisjunctiveTerm() override;
+        virtual ::sal_Int32 SAL_CALL getActiveTerm() override;
+        virtual void SAL_CALL setActiveTerm( ::sal_Int32 ActiveTerm ) override;
 
     // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Type SAL_CALL getElementType() override;
+        virtual sal_Bool SAL_CALL hasElements() override;
 
     // css::container::XEnumerationAccess
-        virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() override;
 
     // css::container::XContainerListener
-        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override;
+        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override;
+        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override;
 
     // XLoadListener
-        virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL unloaded(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) override;
+        virtual void SAL_CALL unloaded(const css::lang::EventObject& rEvent) override;
+        virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) override;
+        virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) override;
+        virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) override;
 
     // XModeSelector
-        virtual void SAL_CALL setMode(const OUString& Mode) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override;
-        virtual OUString SAL_CALL getMode() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setMode(const OUString& Mode) override;
+        virtual OUString SAL_CALL getMode() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes() override;
+        virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) override;
 
     // css::container::XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
+        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) override;
 
     // XModifyBroadcaster
-        virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) override;
+        virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) override;
 
     // XFocusListener
-        virtual void SAL_CALL focusGained(const  css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL focusLost(const  css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL focusGained(const  css::awt::FocusEvent& e) override;
+        virtual void SAL_CALL focusLost(const  css::awt::FocusEvent& e) override;
 
     // XMouseListener
-        virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& _rEvent ) override;
+        virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& _rEvent ) override;
+        virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& _rEvent ) override;
+        virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& _rEvent ) override;
 
     // XFormComponentValidityListener
-        virtual void SAL_CALL componentValidityChanged( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL componentValidityChanged( const css::lang::EventObject& _rSource ) override;
 
     // XInteractionHandler
-        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
 
     // XGridControlListener
-        virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) override;
 
     // css::beans::XPropertyChangeListener -> change of states
-        virtual void SAL_CALL propertyChange(const  css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL propertyChange(const  css::beans::PropertyChangeEvent& evt) override;
 
     // XTextListener           -> modify setzen
-        virtual void SAL_CALL textChanged(const  css::awt::TextEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL textChanged(const  css::awt::TextEvent& rEvent) override;
 
     // XItemListener            -> modify setzen
-        virtual void SAL_CALL itemStateChanged(const  css::awt::ItemEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL itemStateChanged(const  css::awt::ItemEvent& rEvent) override;
 
     // XModifyListener   -> modify setzen
-        virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) override;
 
     // XFormController
-        virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XControl> SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+        virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() override;
+        virtual css::uno::Reference< css::awt::XControl> SAL_CALL getCurrentControl() override;
+        virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) override;
+        virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) override;
+        virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& ChildController ) override;
 
-        virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() override;
+        virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) override;
+        virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() override;
+        virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) override;
 
     // XTabController
-        virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl> > SAL_CALL getControls() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl> > SAL_CALL getControls() override;
 
-        virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel>& Model) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Reference< css::awt::XTabControllerModel> SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel>& Model) override;
+        virtual css::uno::Reference< css::awt::XTabControllerModel> SAL_CALL getModel() override;
 
-        virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer>& Container) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Reference< css::awt::XControlContainer> SAL_CALL getContainer() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer>& Container) override;
+        virtual css::uno::Reference< css::awt::XControlContainer> SAL_CALL getContainer() override;
 
-        virtual void SAL_CALL autoTabOrder() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL activateTabOrder() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL autoTabOrder() override;
+        virtual void SAL_CALL activateTabOrder() override;
 
-        virtual void SAL_CALL activateFirst() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL activateLast() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL activateFirst() override;
+        virtual void SAL_CALL activateLast() override;
 
     // css::sdbc::XRowSetListener
-        virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) override;
+        virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) override;
+        virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) override;
 
     // XRowSetApproveListener
-        virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL approveRowChange(const  css::sdb::RowChangeEvent& event) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) override;
+        virtual sal_Bool SAL_CALL approveRowChange(const  css::sdb::RowChangeEvent& event) override;
+        virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) override;
 
     // XRowSetApproveBroadcaster
-        virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) override;
+        virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) override;
 
     // XSQLErrorBroadcaster
-        virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) override;
 
     // XSQLErrorListener
-        virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) override;
+        virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) override;
 
     // XDatabaseParameterBroadcaster2
-        virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) override;
+        virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) override;
 
     // XDatabaseParameterBroadcaster
-        virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) override;
+        virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) override;
 
     // XDatabaseParameterListener
-        virtual sal_Bool SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) override;
 
     // XConfirmDeleteBroadcaster
-        virtual void SAL_CALL addConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) override;
+        virtual void SAL_CALL removeConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) override;
 
     // XConfirmDeleteListener
-        virtual sal_Bool SAL_CALL confirmDelete(const  css::sdb::RowChangeEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL confirmDelete(const  css::sdb::RowChangeEvent& aEvent) override;
 
     // XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString >  SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString >  SAL_CALL getSupportedServiceNames() override;
 
     // XResetListener
-        virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) override;
+        virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) override;
 
         // XFeatureInvalidation
-        virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL invalidateAllFeatures(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) override;
+        virtual void SAL_CALL invalidateAllFeatures(  ) override;
 
 // method for registration
         static  css::uno::Sequence< OUString > const &  getSupportedServiceNames_Static();
@@ -421,7 +420,7 @@ namespace svxform
                     const css::util::URL& aURL,
                     const OUString& aTargetFrameName,
                     sal_Int32 nSearchFlags
-                )   throw( css::uno::RuntimeException ) override;
+                ) override;
 
         virtual ::osl::Mutex* getInterceptorMutex() override { return &m_aMutex; }
 
@@ -477,7 +476,7 @@ namespace svxform
         void removeFromEventAttacher(const css::uno::Reference< css::awt::XControl>& xControl);
         void toggleAutoFields(bool bAutoFields);
         /// @throws css::uno::RuntimeException
-        void unload() throw( css::uno::RuntimeException );
+        void unload();
         void removeBoundFieldListener();
 
         void startFormListening( const css::uno::Reference< css::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly  );
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index 37dfa672c1da..f48357db5ac9 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -181,14 +181,14 @@ namespace svx
         virtual ~FormControllerHelper() override;
 
         // XFeatureInvalidation
-        virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL invalidateAllFeatures() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) override;
+        virtual void SAL_CALL invalidateAllFeatures() override;
 
         // XSQLErrorListener
-        virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& Event ) 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;
 
     private:
         enum FormOperation { EXECUTE, EXECUTE_ARGS, COMMIT_CONTROL, COMMIT_RECORD };
diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
index 5708737cf258..f6ecd37a1aff 100644
--- a/svx/source/inc/formdispatchinterceptor.hxx
+++ b/svx/source/inc/formdispatchinterceptor.hxx
@@ -35,7 +35,7 @@ namespace svxform
     public:
         /// @throws css::uno::RuntimeException
         virtual css::uno::Reference< css::frame::XDispatch> interceptedQueryDispatch(
-            const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( css::uno::RuntimeException ) = 0;
+            const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) = 0;
 
         virtual ::osl::Mutex* getInterceptorMutex() = 0;
 
@@ -81,17 +81,17 @@ namespace svxform
         );
 
         // css::frame::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;
-        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;
+        virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL 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 ) override;
 
         // css::frame::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 >& xNewDispatchProvider ) throw(css::uno::RuntimeException, std::exception) 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 >& xNewSupplier ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(  ) override;
+        virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewDispatchProvider ) override;
+        virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(  ) override;
+        virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSupplier ) override;
 
         // css::lang::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;
 
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index e53641574e46..00bd404bd86e 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -75,9 +75,9 @@ namespace svx
 
     protected:
         // XDispatch
-        virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ) override;
+        virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) override;
+        virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) override;
 
     protected:
         /** notifies our current state to one or all listeners
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 13d0a8aba8ed..a337a2cc3098 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -323,7 +323,7 @@ protected:
 
 protected:
 // OPropertyChangeListener
-    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override;
+    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override;
 
 private:
     void implDoPropertyListening( const OUString& _rPropertyName, bool _bWarnIfNotExistent );
@@ -433,7 +433,7 @@ protected:
     virtual void        updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override;
 
     // OPropertyChangeListener
-    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override;
+    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override;
 };
 
 
@@ -478,7 +478,7 @@ protected:
     virtual void        implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override;
 
     // OPropertyChangeListener
-    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override;
+    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override;
 };
 
 
@@ -505,7 +505,7 @@ protected:
     virtual void        implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override;
 
     // OPropertyChangeListener
-    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override;
+    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override;
 };
 
 
@@ -730,58 +730,58 @@ public:
     void init();
 
     DECLARE_UNO3_AGG_DEFAULTS(FmXGridCell, OComponentHelper)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
     void SetTextLineColor();
     void SetTextLineColor(const Color& _rColor);
 
 // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // css::lang::XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override {OComponentHelper::dispose();}
-    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener)throw(css::uno::RuntimeException, std::exception) override       { OComponentHelper::addEventListener(aListener);}
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener)throw(css::uno::RuntimeException, std::exception) override        { OComponentHelper::removeEventListener(aListener);}
+    virtual void SAL_CALL dispose() override {OComponentHelper::dispose();}
+    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) override       { OComponentHelper::addEventListener(aListener);}
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) override        { OComponentHelper::removeEventListener(aListener);}
 
 // css::awt::XControl
-    virtual void SAL_CALL setContext(const css::uno::Reference< css::uno::XInterface >& /*Context*/) throw(css::uno::RuntimeException, std::exception) override {}
-    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL getContext() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& /*Toolkit*/, const css::uno::Reference< css::awt::XWindowPeer >& /*Parent*/) throw(css::uno::RuntimeException, std::exception) override {}
-
-    virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) override {return css::uno::Reference< css::awt::XWindowPeer > ();}
-    virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& /*Model*/) throw (css::uno::RuntimeException, std::exception) override {return false;}
-    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override {return css::uno::Reference< css::awt::XView > ();}
-    virtual void SAL_CALL setDesignMode(sal_Bool /*bOn*/) throw (css::uno::RuntimeException, std::exception) override {}
-    virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override {return false;}
-    virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override {return false;}
+    virtual void SAL_CALL setContext(const css::uno::Reference< css::uno::XInterface >& /*Context*/) override {}
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL getContext() override;
+    virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& /*Toolkit*/, const css::uno::Reference< css::awt::XWindowPeer >& /*Parent*/) override {}
+
+    virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() override {return css::uno::Reference< css::awt::XWindowPeer > ();}
+    virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& /*Model*/) override {return false;}
+    virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override;
+    virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() override {return css::uno::Reference< css::awt::XView > ();}
+    virtual void SAL_CALL setDesignMode(sal_Bool /*bOn*/) override {}
+    virtual sal_Bool SAL_CALL isDesignMode() override {return false;}
+    virtual sal_Bool SAL_CALL isTransparent() override {return false;}
 
 // css::form::XBoundControl
-    virtual sal_Bool SAL_CALL getLock() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLock(sal_Bool _bLock) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getLock() override;
+    virtual void SAL_CALL setLock(sal_Bool _bLock) override;
 
     // XWindow
-    virtual void SAL_CALL setPosSize( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPosSize( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int16 Flags ) override;
+    virtual css::awt::Rectangle SAL_CALL getPosSize(  ) override;
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) override;
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) override;
+    virtual void SAL_CALL setFocus(  ) override;
+    virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+    virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+    virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+    virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+    virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+    virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+    virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
 
     bool Commit() {return m_pCellControl->Commit();}
     void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat )
@@ -879,32 +879,32 @@ public:
     FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl );
 
     DECLARE_UNO3_AGG_DEFAULTS(FmXEditCell, FmXTextCell)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
 
 // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // css::awt::XTextComponent
-    virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText(const OUString& aText) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Selection SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEditable() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEditable(sal_Bool bEditable) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getMaxTextLen() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) override;
+    virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) override;
+    virtual void SAL_CALL setText(const OUString& aText) override;
+    virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual OUString SAL_CALL getSelectedText() override;
+    virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) override;
+    virtual css::awt::Selection SAL_CALL getSelection() override;
+    virtual sal_Bool SAL_CALL isEditable() override;
+    virtual void SAL_CALL setEditable(sal_Bool bEditable) override;
+    virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) override;
+    virtual sal_Int16 SAL_CALL getMaxTextLen() override;
 
     // XChangeBroadcaster
-    virtual void SAL_CALL addChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) override;
 
 protected:
     virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override;
@@ -936,26 +936,26 @@ public:
 
 // UNO
     DECLARE_UNO3_AGG_DEFAULTS(FmXCheckBoxCell, FmXDataCell)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // css::awt::XCheckBox
-    virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getState() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setState(sal_Int16 n) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLabel(const OUString& Label) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL enableTriState(sal_Bool b) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override;
+    virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override;
+    virtual sal_Int16 SAL_CALL getState() override;
+    virtual void SAL_CALL setState(sal_Int16 n) override;
+    virtual void SAL_CALL setLabel(const OUString& Label) override;
+    virtual void SAL_CALL enableTriState(sal_Bool b) override;
 
     // XButton
-    virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
     //virtual void SAL_CALL setLabel( const OUString& Label ) throw (css::uno::RuntimeException);
-    virtual void SAL_CALL setActionCommand( const OUString& Command ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setActionCommand( const OUString& Command ) override;
 
 protected:
     virtual vcl::Window* getEventWindow() const override;
@@ -979,36 +979,36 @@ public:
     FmXListBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl );
 
     DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 // css::awt::XListBox
-    virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addItem(const OUString& aItem, sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addItems(const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItems(sal_Int16 nPos, sal_Int16 nCount) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getItemCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getItem(sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getItems() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getSelectedItemPos() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedItem() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SAL_CALL selectItemsPos(const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isMutipleMode() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SAL_CALL setMultipleMode(sal_Bool bMulti) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getDropDownLineCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SAL_CALL setDropDownLineCount(sal_Int16 nLines) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override;
+    virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override;
+    virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener >& l) override;
+    virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener >& l) override;
+    virtual void SAL_CALL addItem(const OUString& aItem, sal_Int16 nPos) override;
+    virtual void SAL_CALL addItems(const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos) override;
+    virtual void SAL_CALL removeItems(sal_Int16 nPos, sal_Int16 nCount) override;
+    virtual sal_Int16 SAL_CALL getItemCount() override;
+    virtual OUString SAL_CALL getItem(sal_Int16 nPos) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getItems() override;
+    virtual sal_Int16 SAL_CALL getSelectedItemPos() override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos() override;
+    virtual OUString SAL_CALL getSelectedItem() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems() override;
+    virtual void SAL_CALL SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) override;
+    virtual void SAL_CALL SAL_CALL selectItemsPos(const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) override;
+    virtual void SAL_CALL SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) override;
+    virtual sal_Bool SAL_CALL isMutipleMode() override;
+    virtual void SAL_CALL SAL_CALL setMultipleMode(sal_Bool bMulti) override;
+    virtual sal_Int16 SAL_CALL getDropDownLineCount() override;
+    virtual void SAL_CALL SAL_CALL setDropDownLineCount(sal_Int16 nLines) override;
+    virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) override;
 
 protected:
     virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override;
@@ -1034,26 +1034,26 @@ public:
     FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl );
 
     DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XComboBox
-    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addItem( const OUString& Item, ::sal_Int16 Pos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& Items, ::sal_Int16 Pos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getItemCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getItem( ::sal_Int16 Pos ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getItems(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int16 SAL_CALL getDropDownLineCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 Lines ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) override;
+    virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) override;
+    virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) override;
+    virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) override;
+    virtual void SAL_CALL addItem( const OUString& Item, ::sal_Int16 Pos ) override;
+    virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& Items, ::sal_Int16 Pos ) override;
+    virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) override;
+    virtual ::sal_Int16 SAL_CALL getItemCount(  ) override;
+    virtual OUString SAL_CALL getItem( ::sal_Int16 Pos ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getItems(  ) override;
+    virtual ::sal_Int16 SAL_CALL getDropDownLineCount(  ) override;
+    virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 Lines ) override;
 
 protected:
     virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override;
@@ -1074,12 +1074,12 @@ public:
 
 
     DECLARE_UNO3_AGG_DEFAULTS(FmXFilterCell, FmXGridCell)
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
 // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
 // helpers for XUnoTunnel
     static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
@@ -1092,18 +1092,18 @@ public:
     virtual void SAL_CALL disposing() override;
 
 // css::awt::XTextComponent
-    virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText(const OUString& aText) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Selection SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEditable() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEditable(sal_Bool bEditable) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getMaxTextLen() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) override;
+    virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) override;
+    virtual void SAL_CALL setText(const OUString& aText) override;
+    virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual OUString SAL_CALL getSelectedText() override;
+    virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) override;
+    virtual css::awt::Selection SAL_CALL getSelection() override;
+    virtual sal_Bool SAL_CALL isEditable() override;
+    virtual void SAL_CALL setEditable(sal_Bool bEditable) override;
+    virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) override;
+    virtual sal_Int16 SAL_CALL getMaxTextLen() override;
 
 protected:
     DECL_LINK( OnCommit, DbFilterField&, void );
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 7de85a596d7b..76d626de9d09 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -82,64 +82,62 @@ public:
     virtual ~SvxPixelCtlAccessibleChild() override;
 
     //XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     //XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
 
     //XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     //Methods for XAccessibleEventBroadcaster
     sal_uInt32 mnClientId;
 
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     virtual void SAL_CALL
         removeAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     //Solution: Add the event handling method
     void FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew);
     virtual void SAL_CALL disposing() override;
 
     /// @throws css::uno::RuntimeException
-    Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException );
+    Rectangle GetBoundingBoxOnScreen();
 
     /// @throws css::uno::RuntimeException
-    Rectangle const & GetBoundingBox() throw( css::uno::RuntimeException );
+    Rectangle const & GetBoundingBox();
 
     /// @returns true if it's disposed or in disposing
     inline bool IsAlive() const;
     /// @throws css::lang::DisposedException if it's not alive
-    void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
+    void ThrowExceptionIfNotAlive();
 
 
     void CheckChild();
@@ -169,56 +167,54 @@ public:
     virtual ~SvxPixelCtlAccessible() override;
 
     //XAccessible
-    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     //XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLocale(  ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
 
     //XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
+    virtual void SAL_CALL grabFocus(  ) override;
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     // XAccessibleSelection
-    void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL clearAccessibleSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL selectAllAccessibleChildren(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+    sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    void SAL_CALL clearAccessibleSelection(  ) override;
+    void SAL_CALL selectAllAccessibleChildren(  ) override;
+    sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     //Methods for XAccessibleEventBroadcaster
     sal_uInt32 mnClientId;
 
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     virtual void SAL_CALL
         removeAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
     //Solution: Add the event handling method
     void FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew);
     virtual void SAL_CALL disposing() override;
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 79ce253aec1c..ea375908995c 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -80,129 +80,120 @@ protected:
 public:
     // XAccessible
     virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleContext() override;
 
     // XAccessibleComponent
     virtual sal_Bool SAL_CALL
-        containsPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
+        containsPoint( const css::awt::Point& rPoint ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     virtual css::awt::Rectangle SAL_CALL
-        getBounds() throw( css::uno::RuntimeException, std::exception ) override;
+        getBounds() override;
 
     virtual css::awt::Point SAL_CALL
-        getLocation() throw( css::uno::RuntimeException, std::exception ) override;
+        getLocation() override;
 
     virtual css::awt::Point SAL_CALL
-        getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override;
+        getLocationOnScreen() override;
 
     virtual css::awt::Size SAL_CALL
-        getSize() throw( css::uno::RuntimeException, std::exception ) override;
+        getSize() override;
 
     /// @throws css::uno::RuntimeException
     bool SAL_CALL
-        isVisible() throw( css::uno::RuntimeException );
+        isVisible();
 
     virtual void SAL_CALL
-        grabFocus() throw( css::uno::RuntimeException, std::exception ) override;
+        grabFocus() override;
 
     virtual sal_Int32 SAL_CALL
-        getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        getForeground(  ) override;
     virtual sal_Int32 SAL_CALL
-        getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        getBackground(  ) override;
 
     // XAccessibleContext
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild( sal_Int32 nIndex )
-            throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
+        getAccessibleChild( sal_Int32 nIndex ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleParent() override;
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleIndexInParent() override;
 
     virtual sal_Int16 SAL_CALL
-        getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleRole() override;
 
     virtual OUString SAL_CALL
-        getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     virtual OUString SAL_CALL
-        getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
-        getAccessibleRelationSet() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleRelationSet() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-        getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleStateSet() override;
 
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-            throw(  css::uno::RuntimeException,
-                    css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override;
+        getLocale() override;
 
     // XAccessibleEventBroadcaster
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     virtual void SAL_CALL
         removeAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XServiceInfo
     virtual OUString SAL_CALL
-        getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
 
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& sServiceName ) override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
     // XTypeProvider
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationId() override;
 
     // XAccessibleSelection
     virtual void SAL_CALL
-        selectAccessibleChild( sal_Int32 nChildIndex )
-            throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+        selectAccessibleChild( sal_Int32 nChildIndex ) override;
 
     virtual sal_Bool SAL_CALL
-        isAccessibleChildSelected( sal_Int32 nChildIndex )
-            throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+        isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
 
     virtual void SAL_CALL
-        clearAccessibleSelection() throw( css::uno::RuntimeException, std::exception ) override;
+        clearAccessibleSelection() override;
 
     virtual void SAL_CALL
-        selectAllAccessibleChildren() throw( css::uno::RuntimeException, std::exception ) override;
+        selectAllAccessibleChildren() override;
 
     virtual sal_Int32 SAL_CALL
-        getSelectedAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override;
+        getSelectedAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-            throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+        getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
     virtual void SAL_CALL
-        deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
-            throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+        deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 
 
 protected:
     // internals
     /// @throws css::lang::IndexOutOfBoundsException
-    void checkChildIndex( long nIndexOfChild ) throw( css::lang::IndexOutOfBoundsException );
+    void checkChildIndex( long nIndexOfChild );
 
     /** Selects a new child by index.
 
@@ -231,12 +222,12 @@ protected:
     /// @Return the object's current bounding box relative to the desktop.
     ///
     /// @throws css::uno::RuntimeException
-    Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException );
+    Rectangle GetBoundingBoxOnScreen();
 
     /// @Return the object's current bounding box relative to the parent object.
     ///
     /// @throws css::uno::RuntimeException
-    Rectangle GetBoundingBox() throw( css::uno::RuntimeException );
+    Rectangle GetBoundingBox();
 
     virtual void SAL_CALL disposing() override;
 
@@ -244,7 +235,7 @@ protected:
     inline bool IsAlive() const;
 
     /// @throws css::lang::DisposedException if it's not alive
-    void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
+    void ThrowExceptionIfNotAlive();
 
 private:
     /** Description of this object.  This is not a constant because it can
@@ -305,110 +296,106 @@ protected:
 public:
     // XAccessible
     virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleContext() override;
 
     // XAccessibleComponent
     virtual sal_Bool SAL_CALL
-        containsPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
+        containsPoint( const css::awt::Point& rPoint ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
 
     virtual css::awt::Rectangle SAL_CALL
-        getBounds() throw( css::uno::RuntimeException, std::exception ) override;
+        getBounds() override;
 
     virtual css::awt::Point SAL_CALL
-        getLocation() throw( css::uno::RuntimeException, std::exception ) override;
+        getLocation() override;
 
     virtual css::awt::Point SAL_CALL
-        getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override;
+        getLocationOnScreen() override;
 
     virtual css::awt::Size SAL_CALL
-        getSize() throw( css::uno::RuntimeException, std::exception ) override;
+        getSize() override;
 
     virtual void SAL_CALL
-        grabFocus() throw( css::uno::RuntimeException, std::exception ) override;
+        grabFocus() override;
 
     virtual sal_Int32 SAL_CALL
-        getForeground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        getForeground(  ) override;
     virtual sal_Int32 SAL_CALL
-        getBackground(  ) throw (css::uno::RuntimeException, std::exception) override;
+        getBackground(  ) override;
 
     // XAccessibleContext
     virtual sal_Int32 SAL_CALL
-        getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleChild( sal_Int32 nIndex )
-            throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
+        getAccessibleChild( sal_Int32 nIndex ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleParent() override;
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleIndexInParent() override;
 
     virtual sal_Int16 SAL_CALL
-        getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleRole() override;
 
     virtual OUString SAL_CALL
-        getAccessibleDescription() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleDescription() override;
 
     virtual OUString SAL_CALL
-        getAccessibleName() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleName() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
-        getAccessibleRelationSet() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleRelationSet() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-        getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleStateSet() override;
 
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-            throw( css::uno::RuntimeException, css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override;
+        getLocale() override;
 
     // XAccessibleEventBroadcaster
     virtual void SAL_CALL
         addAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     virtual void SAL_CALL
         removeAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XAccessibleValue
     virtual css::uno::Any SAL_CALL
-        getCurrentValue() throw( css::uno::RuntimeException, std::exception ) override;
+        getCurrentValue() override;
 
     virtual sal_Bool SAL_CALL
-        setCurrentValue( const css::uno::Any& aNumber ) throw( css::uno::RuntimeException, std::exception ) override;
+        setCurrentValue( const css::uno::Any& aNumber ) override;
 
     virtual css::uno::Any SAL_CALL
-        getMaximumValue() throw( css::uno::RuntimeException, std::exception ) override;
+        getMaximumValue() override;
 
     virtual css::uno::Any SAL_CALL
-        getMinimumValue() throw( css::uno::RuntimeException, std::exception ) override;
+        getMinimumValue() override;
 
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
     // XServiceInfo
     virtual OUString SAL_CALL
-        getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
 
     virtual sal_Bool SAL_CALL
-        supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& sServiceName ) override;
 
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
     // XTypeProvider
     virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationId() override;
 
     // internal
     /// Sets the checked status
@@ -417,10 +404,10 @@ public:
 
 protected:
     /// @throws css::uno::RuntimeException
-    Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException );
+    Rectangle GetBoundingBoxOnScreen();
 
     /// @throws css::uno::RuntimeException
-    Rectangle const & GetBoundingBox() throw( css::uno::RuntimeException );
+    Rectangle const & GetBoundingBox();
 
     void CommitChange( const css::accessibility::AccessibleEventObject& rEvent );
 
@@ -430,7 +417,7 @@ protected:
     inline bool IsAlive() const;
 
     /// @throws css::lang::DisposedException if it's not alive
-    void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException );
+    void ThrowExceptionIfNotAlive();
 
     /// Mutex guarding this object.
     ::osl::Mutex                        maMutex;
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 6440fc4bc755..73d98dbe5ec3 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -102,7 +102,7 @@ public:
 
 protected:
     // FmXChangeListener
-    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override;
 
 protected:
     using SfxControllerItem::GetBindings;
diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx
index 32ef594b3c6e..753768681b1e 100644
--- a/svx/source/inc/xfm_addcondition.hxx
+++ b/svx/source/inc/xfm_addcondition.hxx
@@ -52,14 +52,14 @@ namespace svxform
         OAddConditionDialog( const css::uno::Reference< css::uno::XComponentContext >& _rxORB );
 
         // XTypeProvider
-        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XPropertySet
-        virtual css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference<css::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() override;
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
 
         // OPropertyArrayUsageHelper
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index 71701fa6ede6..fcbf6c464486 100644
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
@@ -47,8 +47,7 @@ public:
     static bool save( const OUString& rURL,
                       const css::uno::Reference< css::container::XNameContainer >& xTable,
                       const css::uno::Reference< css::embed::XStorage > &xStorage,
-                      OUString *pOptName )
-        throw (css::uno::RuntimeException, std::exception);
+                      OUString *pOptName );
 
     // methods without content:
     virtual void ExportAutoStyles_() override;
diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx
index fea4e303dc03..c684fed7abb6 100644
--- a/svx/source/mnuctrls/smarttagmenu.cxx
+++ b/svx/source/mnuctrls/smarttagmenu.cxx
@@ -30,11 +30,11 @@ public:
     explicit SmartTagMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     void FillMenu();
@@ -58,7 +58,6 @@ SmartTagMenuController::SmartTagMenuController( const css::uno::Reference< css::
 }
 
 void SmartTagMenuController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     resetPopupMenu( m_xPopupMenu );
 
@@ -216,13 +215,11 @@ IMPL_LINK( SmartTagMenuController, MenuSelect, Menu*, pMenu, bool )
 }
 
 OUString SmartTagMenuController::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.svx.SmartTagMenuController" );
 }
 
 css::uno::Sequence< OUString > SmartTagMenuController::getSupportedServiceNames()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     css::uno::Sequence< OUString > aRet { "com.sun.star.frame.PopupMenuController" };
     return aRet;
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index a0488a38970d..2a13a40b0181 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -621,24 +621,24 @@ namespace sdr { namespace contact {
         virtual ~ViewObjectContactOfUnoControl_Impl() override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
         // XWindowListener
-        virtual void SAL_CALL windowResized( const WindowEvent& e ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowMoved( const WindowEvent& e ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowShown( const EventObject& e ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL windowHidden( const EventObject& e ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL windowResized( const WindowEvent& e ) override;
+        virtual void SAL_CALL windowMoved( const WindowEvent& e ) override;
+        virtual void SAL_CALL windowShown( const EventObject& e ) override;
+        virtual void SAL_CALL windowHidden( const EventObject& e ) override;
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange( const PropertyChangeEvent& evt ) override;
 
         // XModeChangeListener
-        virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) override;
 
         // XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
     private:
         /** retrieves the SdrPageView which our associated SdrPageViewWindow belongs to
@@ -1299,7 +1299,7 @@ namespace sdr { namespace contact {
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source ) throw(RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source )
     {
         SolarMutexGuard aSolarGuard;
             // some code below - in particular our disposal - might trigger actions which require the
@@ -1325,33 +1325,33 @@ namespace sdr { namespace contact {
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowResized( const WindowEvent& /*e*/ ) throw(RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowResized( const WindowEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowMoved( const WindowEvent& /*e*/ ) throw(RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowMoved( const WindowEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowShown( const EventObject& /*e*/ ) throw(RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowShown( const EventObject& /*e*/ )
     {
         SolarMutexGuard aSolarGuard;
         m_bControlIsVisible = true;
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowHidden( const EventObject& /*e*/ ) throw(RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowHidden( const EventObject& /*e*/ )
     {
         SolarMutexGuard aSolarGuard;
         m_bControlIsVisible = false;
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw(RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ )
     {
         SolarMutexGuard aSolarGuard;
             // (re)painting might require VCL operations, which need the SolarMutex
@@ -1372,7 +1372,7 @@ namespace sdr { namespace contact {
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::modeChanged( const ModeChangeEvent& _rSource )
     {
         SolarMutexGuard aSolarGuard;
 
@@ -1394,13 +1394,13 @@ namespace sdr { namespace contact {
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementInserted( const ContainerEvent& /*_Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementInserted( const ContainerEvent& /*_Event*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event )
     {
         SolarMutexGuard aSolarGuard;
             // some code below - in particular our disposal - might trigger actions which require the
@@ -1415,7 +1415,7 @@ namespace sdr { namespace contact {
     }
 
 
-    void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception)
+    void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementReplaced( const ContainerEvent& Event )
     {
         SolarMutexGuard aSolarGuard;
         DBG_ASSERT( Event.Source == m_xContainer, "ViewObjectContactOfUnoControl_Impl::elementReplaced: where did this come from?" );
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 77970a87b8b4..caa7c7754410 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -45,19 +45,16 @@ public:
     PrimitiveFactory2D(): PrimitiveFactory2DImplBase(m_aMutex) {}
 
             // Methods from XPrimitiveFactory2D
-    virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.comp.graphic.PrimitiveFactory2D"); }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return css::uno::Sequence<OUString>{
             "com.sun.star.graphic.PrimitiveFactory2D"};
@@ -66,7 +63,7 @@ public:
 
 css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape(
     const uno::Reference< drawing::XShape >& xShape,
-    const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception)
+    const uno::Sequence< beans::PropertyValue >& /*aParms*/ )
 {
     css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval;
 
@@ -86,7 +83,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL
 
 css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXDrawPage(
     const uno::Reference< drawing::XDrawPage >& xDrawPage,
-    const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception)
+    const uno::Sequence< beans::PropertyValue >& /*aParms*/ )
 {
     css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval;
 
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 242f8b1ccb04..f84d938bd1bd 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -71,22 +71,15 @@ public:
     // XUIElementFactory
     css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
         const ::rtl::OUString& rsResourceURL,
-        const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-        throw(
-            css::container::NoSuchElementException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
-
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+        const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
+
+    OUString SAL_CALL getImplementationName() override
     { return OUString("org.apache.openoffice.comp.svx.sidebar.PanelFactory"); }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; }
 };
 
@@ -98,10 +91,6 @@ PanelFactory::PanelFactory()
 Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
     const ::rtl::OUString& rsResourceURL,
     const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-    throw(
-        container::NoSuchElementException,
-        lang::IllegalArgumentException,
-        RuntimeException, std::exception)
 {
     const ::comphelper::NamedValueCollection aArguments (rArguments);
     Reference<frame::XFrame> xFrame (aArguments.getOrDefault("Frame", Reference<frame::XFrame>()));
diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx
index e00a015d34b2..1b6c624380e4 100644
--- a/svx/source/sidebar/SelectionChangeHandler.cxx
+++ b/svx/source/sidebar/SelectionChangeHandler.cxx
@@ -49,7 +49,6 @@ SelectionChangeHandler::~SelectionChangeHandler()
 
 
 void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject&)
-    throw (uno::RuntimeException, std::exception)
 {
     if (maSelectionChangeCallback)
     {
@@ -65,13 +64,11 @@ void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject&
 
 
 void SAL_CALL SelectionChangeHandler::disposing (const lang::EventObject&)
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 
 void SAL_CALL SelectionChangeHandler::disposing()
-    throw (uno::RuntimeException)
 {
     if (mbIsConnected)
         Disconnect();
diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
index a48374fb06b5..b966cd9fbc13 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx
@@ -88,7 +88,7 @@ ParaLRSpacingControl::~ParaLRSpacingControl()
 {
 }
 
-void SAL_CALL ParaLRSpacingControl::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ParaLRSpacingControl::dispose()
 {
     if(m_xMultiplexer.is())
     {
@@ -134,7 +134,6 @@ void ParaLRSpacingControl::StateChanged(sal_uInt16 nSID, SfxItemState eState,
 }
 
 void SAL_CALL ParaLRSpacingControl::notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception)
 {
     sal_uInt16 nId = GetId();
     ToolBox& rTbx = GetToolBox();
@@ -150,7 +149,6 @@ void SAL_CALL ParaLRSpacingControl::notifyContextChangeEvent(const css::ui::Cont
 }
 
 ::css::uno::Any SAL_CALL ParaLRSpacingControl::queryInterface(const ::css::uno::Type& aType)
-        throw (::css::uno::RuntimeException, ::std::exception)
 {
     ::css::uno::Any a(SfxToolBoxControl::queryInterface(aType));
     if (a.hasValue())
@@ -165,7 +163,6 @@ void SAL_CALL ParaLRSpacingControl::acquire() throw ()
 }
 
 void SAL_CALL ParaLRSpacingControl::disposing(const ::css::lang::EventObject&)
-    throw (::css::uno::RuntimeException, ::std::exception)
 {
     SfxToolBoxControl::disposing();
 }
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx
index c8fdd697544a..5b2645f7234f 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.cxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx
@@ -35,7 +35,6 @@ TextUnderlinePopup::~TextUnderlinePopup()
 }
 
 void TextUnderlinePopup::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     SfxToolBoxControl::initialize(aArguments);
     if (GetToolBox().GetItemCommand(GetId()) == m_aCommandURL)
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 6320d8f3d70b..7eb9011a0164 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -267,7 +267,7 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags,
 }
 
 // css::util::XModifyListener
-void SmartTagMgr::modified( const lang::EventObject& )  throw( RuntimeException, std::exception )
+void SmartTagMgr::modified( const lang::EventObject& )
 {
     SolarMutexGuard aGuard;
 
@@ -279,7 +279,7 @@ void SmartTagMgr::modified( const lang::EventObject& )  throw( RuntimeException,
 }
 
 // css::lang::XEventListener
-void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeException, std::exception )
+void SmartTagMgr::disposing( const lang::EventObject& rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -306,7 +306,7 @@ void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeExc
 }
 
 // css::util::XChangesListener
-void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( RuntimeException, std::exception)
+void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent )
 {
     SolarMutexGuard aGuard;
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 3b924abb13c1..ee7a1dfb03bf 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -135,36 +135,36 @@ public:
 private:
     Rectangle impl_getScaledRect_nothrow() const;
     // XStateChangeListener
-    virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+    virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
 
     // document::XEventListener
-    virtual void SAL_CALL       notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL       notifyEvent( const document::EventObject& aEvent ) override;
 
     // XEmbeddedClient
-    virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL saveObject() override;
+    virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) override;
 
     // XComponentSupplier
-    virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException, std::exception ) override;
+    virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() override;
 
     // XInplaceClient
-    virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL canInplaceActivate() override;
+    virtual void SAL_CALL activatingInplace() override;
+    virtual void SAL_CALL activatingUI() override;
+    virtual void SAL_CALL deactivatedInplace() override;
+    virtual void SAL_CALL deactivatedUI() override;
+    virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() override;
+    virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() override;
+    virtual awt::Rectangle SAL_CALL getPlacement() override;
+    virtual awt::Rectangle SAL_CALL getClipRectangle() override;
+    virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) override;
+    virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) override;
+    virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) override;
 
     // XWindowSupplier
-    virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException, std::exception ) override;
+    virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() override;
 };
 
 SdrLightEmbeddedClient_Impl::SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj )
@@ -180,7 +180,7 @@ Rectangle SdrLightEmbeddedClient_Impl::impl_getScaledRect_nothrow() const
     return aLogicRect;
 }
 
-void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ )
 {
 }
 
@@ -194,7 +194,7 @@ void SdrLightEmbeddedClient_Impl::Release()
     release();
 }
 
-void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState )
 {
     SolarMutexGuard aGuard;
 
@@ -209,14 +209,14 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventO
     }
 }
 
-void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ )
 {
     SolarMutexGuard aGuard;
 
     GetSdrGlobalData().GetOLEObjCache().RemoveObj(mpObj);
 }
 
-void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObject& aEvent )
 {
     // TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl
 
@@ -282,9 +282,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj
 }
 
 void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject()
-    throw ( embed::ObjectSaveVetoException,
-            uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     // TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl
     uno::Reference< embed::XCommonEmbedPersist > xPersist;
@@ -308,8 +305,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject()
 }
 
 void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisible*/ )
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     // nothing to do currently
     // TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl
@@ -328,7 +323,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisibl
 }
 
 uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComponent()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< util::XCloseable > xResult;
 
@@ -341,7 +335,6 @@ uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComp
 // XInplaceClient
 
 sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate()
-    throw ( uno::RuntimeException, std::exception )
 {
     bool bRet = false;
     SolarMutexGuard aGuard;
@@ -357,14 +350,10 @@ sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate()
 }
 
 void SAL_CALL SdrLightEmbeddedClient_Impl::activatingInplace()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -408,14 +397,10 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
 }
 
 void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedInplace()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     css::uno::Reference< css::frame::XLayoutManager > xLayoutManager(getLayoutManager());
@@ -428,8 +413,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
 }
 
 uno::Reference< css::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Impl::getLayoutManager()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     uno::Reference< css::frame::XLayoutManager > xMan;
     SolarMutexGuard aGuard;
@@ -447,16 +430,12 @@ uno::Reference< css::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Imp
 }
 
 uno::Reference< frame::XDispatchProvider > SAL_CALL SdrLightEmbeddedClient_Impl::getInplaceDispatchProvider()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     return uno::Reference < frame::XDispatchProvider >( lcl_getFrame_throw(mpObj), uno::UNO_QUERY_THROW );
 }
 
 awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( !mpObj )
@@ -473,28 +452,19 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement()
 }
 
 awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getClipRectangle()
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
     return getPlacement();
 }
 
 void SAL_CALL SdrLightEmbeddedClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ )
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL SdrLightEmbeddedClient_Impl::scrollObject( const awt::Size& /*aOffset*/ )
-    throw ( embed::WrongStateException,
-            uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangle& aPosRect )
-    throw ( embed::WrongStateException,
-            uno::Exception,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( !mpObj )
@@ -551,7 +521,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
 // XWindowSupplier
 
 uno::Reference< awt::XWindow > SAL_CALL SdrLightEmbeddedClient_Impl::getWindow()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Reference< awt::XWindow > xCurrent = m_xWindow;
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index a4a0ade0ab44..4199f69921b7 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -75,7 +75,7 @@ public:
     {}
 
     // 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;
 
     void StopListening(const uno::Reference< lang::XComponent >& xComp);
     void StartListening(const uno::Reference< lang::XComponent >& xComp);
@@ -83,7 +83,6 @@ public:
 
 // XEventListener
 void SAL_CALL SdrControlEventListenerImpl::disposing( const css::lang::EventObject& /*Source*/)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (pObj)
     {
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index f72e94ca8ae9..f44fd59ccb8b 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -135,7 +135,7 @@ bool AccessibleCell::ResetState (sal_Int16 aState)
 // XInterface
 
 
-Any SAL_CALL AccessibleCell::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+Any SAL_CALL AccessibleCell::queryInterface( const Type& aType )
 {
     return AccessibleCellBase::queryInterface( aType );
 }
@@ -158,7 +158,7 @@ void SAL_CALL AccessibleCell::release(  ) throw ()
 
 /** The children of this cell come from the paragraphs of text.
 */
-sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount()
 {
     SolarMutexGuard aSolarGuard;
     ThrowIfDisposed ();
@@ -169,7 +169,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (css::uno::Ru
 /** Forward the request to the shape.  Return the requested shape or throw
     an exception for a wrong index.
 */
-Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nIndex) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nIndex)
 {
     SolarMutexGuard aSolarGuard;
     ThrowIfDisposed ();
@@ -185,7 +185,7 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI
         SHOWING
         VISIBLE
 */
-Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet() throw (RuntimeException, std::exception)
+Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet()
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard (maMutex);
@@ -256,7 +256,7 @@ Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet()
 // XAccessibleComponent
 
 
-sal_Bool SAL_CALL AccessibleCell::containsPoint( const css::awt::Point& aPoint) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL AccessibleCell::containsPoint( const css::awt::Point& aPoint)
 {
     return AccessibleComponentBase::containsPoint( aPoint );
 }
@@ -269,7 +269,7 @@ sal_Bool SAL_CALL AccessibleCell::containsPoint( const css::awt::Point& aPoint)
     the already instantiated children and only if no match is found
     instantiate the remaining ones.
 */
-Reference<XAccessible > SAL_CALL  AccessibleCell::getAccessibleAtPoint ( const css::awt::Point& aPoint) throw(RuntimeException, std::exception)
+Reference<XAccessible > SAL_CALL  AccessibleCell::getAccessibleAtPoint ( const css::awt::Point& aPoint)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard (maMutex);
@@ -299,7 +299,7 @@ Reference<XAccessible > SAL_CALL  AccessibleCell::getAccessibleAtPoint ( const c
 }
 
 
-css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, std::exception)
+css::awt::Rectangle SAL_CALL AccessibleCell::getBounds()
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard (maMutex);
@@ -345,7 +345,7 @@ css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException,
 }
 
 
-css::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, std::exception)
+css::awt::Point SAL_CALL AccessibleCell::getLocation()
 {
     ThrowIfDisposed ();
     css::awt::Rectangle aBoundingBox(getBounds());
@@ -353,7 +353,7 @@ css::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException,
 }
 
 
-css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeException, std::exception)
+css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen()
 {
     ThrowIfDisposed ();
 
@@ -377,7 +377,7 @@ css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeExce
 }
 
 
-awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::exception)
+awt::Size SAL_CALL AccessibleCell::getSize()
 {
     ThrowIfDisposed ();
     awt::Rectangle aBoundingBox (getBounds());
@@ -385,13 +385,13 @@ awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::excep
 }
 
 
-void SAL_CALL AccessibleCell::grabFocus() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleCell::grabFocus()
 {
     AccessibleComponentBase::grabFocus();
 }
 
 
-sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleCell::getForeground()
 {
     ThrowIfDisposed ();
     sal_Int32 nColor (0x0ffffffL);
@@ -401,7 +401,7 @@ sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std:
 }
 
 
-sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleCell::getBackground()
 {
     ThrowIfDisposed ();
     sal_Int32 nColor (0L);
@@ -414,20 +414,20 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std:
 // XAccessibleExtendedComponent
 
 
-css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleCell::getFont() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleCell::getFont()
 {
 //todo
     return AccessibleComponentBase::getFont();
 }
 
 
-OUString SAL_CALL AccessibleCell::getTitledBorderText() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL AccessibleCell::getTitledBorderText()
 {
     return AccessibleComponentBase::getTitledBorderText();
 }
 
 
-OUString SAL_CALL AccessibleCell::getToolTipText() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL AccessibleCell::getToolTipText()
 {
     return AccessibleComponentBase::getToolTipText();
 }
@@ -436,7 +436,7 @@ OUString SAL_CALL AccessibleCell::getToolTipText() throw (css::uno::RuntimeExcep
 // XAccessibleEventBroadcaster
 
 
-void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener)  throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard (maMutex);
@@ -455,7 +455,7 @@ void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAcces
 }
 
 
-void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener)
 {
     SolarMutexGuard aSolarGuard;
     AccessibleContextBase::removeAccessibleEventListener(rxListener);
@@ -467,13 +467,13 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc
 // XServiceInfo
 
 
-OUString SAL_CALL AccessibleCell::getImplementationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL AccessibleCell::getImplementationName()
 {
     return OUString("AccessibleCell");
 }
 
 
-Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames()
 {
     ThrowIfDisposed ();
 
@@ -534,7 +534,7 @@ void AccessibleCell::disposing()
     AccessibleContextBase::dispose ();
 }
 
-sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent()
 {
     ThrowIfDisposed ();
     return mnIndexInParent;
@@ -577,7 +577,7 @@ OUString AccessibleCell::getCellName( sal_Int32 nCol, sal_Int32 nRow )
     return aBuf.makeStringAndClear();
 }
 
-OUString SAL_CALL AccessibleCell::getAccessibleName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL AccessibleCell::getAccessibleName()
 {
     ThrowIfDisposed ();
     SolarMutexGuard aSolarGuard;
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index 6aecc113912b..053b0948c045 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -62,43 +62,43 @@ public:
     virtual bool ResetState (sal_Int16 aState) override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw () override;
     virtual void SAL_CALL release(  ) throw () override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual OUString SAL_CALL getAccessibleName() override;
     const sdr::table::CellRef& getCellRef() { return mxCell;}
     void UpdateChildren();
     static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow );
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(const css::awt::Point& aPoint) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getBounds() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocation() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Point SAL_CALL getLocationOnScreen() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(const css::awt::Point& aPoint) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+    virtual css::awt::Size SAL_CALL getSize() override;
+    virtual void SAL_CALL grabFocus() override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     // XAccessibleExtendedComponent
-    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
+    virtual OUString SAL_CALL getTitledBorderText() override;
+    virtual OUString SAL_CALL getToolTipText() override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
 
     // IAccessibleViewForwarderListener
     virtual void ViewForwarderChanged() override;
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 58db3b2726cb..3a344da23712 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -71,15 +71,15 @@ public:
 
     /// @throws IndexOutOfBoundsException
     /// @throws RuntimeException
-    Reference< XAccessible > getAccessibleChild(sal_Int32 i) throw (IndexOutOfBoundsException, RuntimeException);
+    Reference< XAccessible > getAccessibleChild(sal_Int32 i);
     /// @throws IndexOutOfBoundsException
-    void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException );
+    void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow );
 
     // XModifyListener
-    virtual void SAL_CALL modified( const EventObject& aEvent ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const EventObject& aEvent ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
     AccessibleShapeTreeInfo& mrShapeTreeInfo;
     Reference< XTable > mxTable;
@@ -90,7 +90,7 @@ public:
     rtl::Reference< AccessibleCell > getAccessibleCell (const Reference< XCell >& xCell);
     /// @throws IndexOutOfBoundsException
     /// @throws RuntimeException
-    rtl::Reference< AccessibleCell > getAccessibleCell (sal_Int32 nRow, sal_Int32 nColumn) throw (IndexOutOfBoundsException, RuntimeException);
+    rtl::Reference< AccessibleCell > getAccessibleCell (sal_Int32 nRow, sal_Int32 nColumn);
 };
 
 
@@ -154,7 +154,6 @@ rtl::Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (co
 }
 
 rtl::Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (sal_Int32 nRow, sal_Int32 nColumn)
-    throw (IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XCell > xCell( mxTable->getCellByPosition( nColumn, nRow ) );
     rtl::Reference< AccessibleCell > xChild = getAccessibleCell( xCell );
@@ -176,7 +175,6 @@ rtl::Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (sa
 
 
 Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild(sal_Int32 nChildIndex)
-    throw (IndexOutOfBoundsException, RuntimeException)
 {
     sal_Int32 nColumn = 0, nRow = 0;
     getColumnAndRow( nChildIndex, nColumn, nRow );
@@ -204,7 +202,7 @@ Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild(sal_Int32
 }
 
 
-void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException )
+void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow )
 {
     rnRow = 0;
     rnColumn = nChildIndex;
@@ -226,7 +224,7 @@ void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32
 }
 
 // XModifyListener
-void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/ )
 {
     if( mxTable.is() ) try
     {
@@ -321,7 +319,7 @@ void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/
 }
 
 // XEventListener
-void SAL_CALL AccessibleTableShapeImpl::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleTableShapeImpl::disposing( const EventObject& /*Source*/ )
 {
 }
 
@@ -369,7 +367,7 @@ SvxTableController* AccessibleTableShape::getTableController()
 // XInterface
 
 
-Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType )
 {
     if ( aType == cppu::UnoType<XAccessibleTableSelection>::get())
     {
@@ -398,26 +396,26 @@ void SAL_CALL AccessibleTableShape::release(  ) throw ()
 // XAccessible
 
 
-OUString SAL_CALL AccessibleTableShape::getImplementationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL AccessibleTableShape::getImplementationName()
 {
     return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" );
 }
 
 
-OUString AccessibleTableShape::CreateAccessibleBaseName() throw (RuntimeException)
+OUString AccessibleTableShape::CreateAccessibleBaseName()
 {
     return OUString("TableShape");
 }
 
 
-sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( )
 {
     SolarMutexGuard aSolarGuard;
     return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() * mxImpl->mxTable->getColumnCount() : 0;
 }
 
 
-Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int32 i )
 {
     SolarMutexGuard aSolarGuard;
     ThrowIfDisposed();
@@ -426,7 +424,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_
 }
 
 
-sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole()
 {
     return AccessibleRole::TABLE;
 }
@@ -444,28 +442,28 @@ void SAL_CALL AccessibleTableShape::disposing()
 // XAccessibleTable
 
 
-sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount()
 {
     SolarMutexGuard aSolarGuard;
     return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() : 0;
 }
 
 
-sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount(  )
 {
     SolarMutexGuard aSolarGuard;
     return mxImpl->mxTable.is() ? mxImpl->mxTable->getColumnCount() : 0;
 }
 
 
-OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 nRow )
 {
     checkCellPosition( 0, nRow );
     return OUString();
 }
 
 
-OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn )
 {
     SolarMutexGuard aSolarGuard;
     checkCellPosition( nColumn, 0 );
@@ -473,7 +471,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int3
 }
 
 
-sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
 {
     SolarMutexGuard aSolarGuard;
     checkCellPosition( nColumn, nRow );
@@ -487,7 +485,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRo
 }
 
 
-sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
 {
     SolarMutexGuard aSolarGuard;
     checkCellPosition( nColumn, nRow );
@@ -501,7 +499,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32
 }
 
 
-Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHeaders(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHeaders(  )
 {
     Reference< XAccessibleTable > xRet;
     SvxTableController* pController = getTableController();
@@ -517,7 +515,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHea
 }
 
 
-Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumnHeaders(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumnHeaders(  )
 {
     Reference< XAccessibleTable > xRet;
     SvxTableController* pController = getTableController();
@@ -533,7 +531,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumn
 }
 
 
-Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows(  )
 {
     sal_Int32 nRow = getAccessibleRowCount();
     ::std::vector<bool> aSelected( nRow, true );
@@ -569,7 +567,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows(
 }
 
 
-Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumns(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumns(  )
 {
     sal_Int32 nColumn = getAccessibleColumnCount();
     ::std::vector<bool> aSelected( nColumn, true );
@@ -605,7 +603,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumn
 }
 
 
-sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow )
 {
     SolarMutexGuard aSolarGuard;
     checkCellPosition( 0, nRow );
@@ -618,7 +616,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow
 }
 
 
-sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn )
 {
     SolarMutexGuard aSolarGuard;
     checkCellPosition( nColumn, 0 );
@@ -631,7 +629,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nC
 }
 
 
-Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
 {
     SolarMutexGuard aSolarGuard;
     checkCellPosition( nColumn, nRow );
@@ -644,21 +642,21 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal
 }
 
 
-Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption(  )
 {
     Reference< XAccessible > xRet;
     return xRet;
 }
 
 
-Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary(  )
 {
     Reference< XAccessible > xRet;
     return xRet;
 }
 
 
-sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
 {
     SolarMutexGuard aSolarGuard;
     checkCellPosition( nColumn, nRow );
@@ -676,7 +674,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa
 }
 
 
-sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
 {
     SolarMutexGuard aSolarGuard;
     checkCellPosition( nColumn, nRow );
@@ -684,7 +682,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal
 }
 
 
-sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex )
 {
     SolarMutexGuard aSolarGuard;
     sal_Int32 nColumn = 0, nRow = 0;
@@ -693,7 +691,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex
 }
 
 
-sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex )
 {
     SolarMutexGuard aSolarGuard;
     sal_Int32 nColumn = 0, nRow = 0;
@@ -705,7 +703,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIn
 // XAccessibleSelection
 
 
-void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception )
+void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex )
 {
     SolarMutexGuard aSolarGuard;
     CellPos aPos;
@@ -730,7 +728,7 @@ void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex
 }
 
 
-sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception )
+sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex )
 {
     SolarMutexGuard aSolarGuard;
     CellPos aPos;
@@ -740,7 +738,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nCh
 }
 
 
-void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeException, std::exception )
+void SAL_CALL AccessibleTableShape::clearAccessibleSelection()
 {
    SolarMutexGuard aSolarGuard;
 
@@ -750,7 +748,7 @@ void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeEx
 }
 
 
-void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( RuntimeException, std::exception )
+void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren()
 {
    SolarMutexGuard aSolarGuard;
 
@@ -761,7 +759,7 @@ void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( Runtim
 }
 
 
-sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw ( RuntimeException, std::exception )
+sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount()
 {
     SolarMutexGuard aSolarGuard;
 
@@ -780,7 +778,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw
 }
 
 
-Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -801,7 +799,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi
 }
 
 
-void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex )  throw ( IndexOutOfBoundsException, RuntimeException, std::exception )
+void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex )
 {
    SolarMutexGuard aSolarGuard;
     CellPos aPos;
@@ -830,7 +828,6 @@ void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildInd
 
 // XAccessibleTableSelection
 sal_Bool SAL_CALL AccessibleTableShape::selectRow( sal_Int32 row )
-throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     SvxTableController* pController = getTableController();
@@ -840,7 +837,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL AccessibleTableShape::selectColumn( sal_Int32 column )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     SvxTableController* pController = getTableController();
@@ -850,7 +846,6 @@ sal_Bool SAL_CALL AccessibleTableShape::selectColumn( sal_Int32 column )
 }
 
 sal_Bool SAL_CALL AccessibleTableShape::unselectRow( sal_Int32 row )
-throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     SvxTableController* pController = getTableController();
@@ -860,7 +855,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL AccessibleTableShape::unselectColumn( sal_Int32 column )
-throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     SvxTableController* pController = getTableController();
@@ -892,7 +886,7 @@ sal_Int32 AccessibleTableShape::GetIndexOfSelectedChild(
 
     return n < nChildren ? n : -1L;
 }
-void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException )
+void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow )
 {
     mxImpl->getColumnAndRow(nChildIndex, rnColumn, rnRow);
 }
@@ -900,12 +894,10 @@ void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rn
 // XSelectionChangeListener
 void SAL_CALL
     AccessibleTableShape::disposing (const EventObject& aEvent)
-    throw (RuntimeException, std::exception)
 {
     AccessibleShape::disposing(aEvent);
 }
 void  SAL_CALL AccessibleTableShape::selectionChanged (const EventObject& rEvent)
-        throw (RuntimeException, std::exception)
 {
     //sdr::table::CellRef xCellRef = static_cast< sdr::table::CellRef > (rEvent.Source);
     Reference< XCell > xCell(rEvent.Source, UNO_QUERY);
@@ -1001,7 +993,7 @@ bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState)
     return AccessibleContextBase::ResetState (aState);
 }
 
-void AccessibleTableShape::checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) throw ( IndexOutOfBoundsException )
+void AccessibleTableShape::checkCellPosition( sal_Int32 nCol, sal_Int32 nRow )
 {
     if( (nCol >= 0) && (nRow >= 0) && mxImpl->mxTable.is() && (nCol < mxImpl->mxTable->getColumnCount()) && (nRow < mxImpl->mxTable->getRowCount()) )
         return;
@@ -1021,152 +1013,152 @@ AccessibleTableHeaderShape::~AccessibleTableHeaderShape()
 }
 
 // XAccessible
-Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext() throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext()
 {
     return this;
 }
 
 // XAccessibleContext
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleChildCount( ) throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleChildCount( )
 {
     return getAccessibleRowCount() * getAccessibleColumnCount();
 }
 
-Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleChild( sal_Int32 i )
 {
     return mpTable->getAccessibleChild( i );
 }
 
-Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent() throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent()
 {
     Reference< XAccessible > XParent;
     return XParent;
 }
 
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent()
 {
     return -1;
 }
 
-sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole() throw (RuntimeException, std::exception)
+sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole()
 {
     return mpTable->getAccessibleRole();
 }
 
-OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription() throw (RuntimeException, std::exception)
+OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription()
 {
     return mpTable->getAccessibleDescription();
 }
 
-OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName() throw (RuntimeException, std::exception)
+OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName()
 {
     return mpTable->getAccessibleName();
 }
 
-Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet() throw (RuntimeException, std::exception)
+Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet()
 {
     return mpTable->getAccessibleStateSet();
 }
 
-Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet() throw (RuntimeException, std::exception)
+Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet()
 {
     return mpTable->getAccessibleRelationSet();
 }
 
-Locale SAL_CALL AccessibleTableHeaderShape::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+Locale SAL_CALL AccessibleTableHeaderShape::getLocale()
 {
     return mpTable->getLocale();
 }
 
 //XAccessibleComponent
-sal_Bool SAL_CALL AccessibleTableHeaderShape::containsPoint ( const css::awt::Point& aPoint ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL AccessibleTableHeaderShape::containsPoint ( const css::awt::Point& aPoint )
 {
     return mpTable->containsPoint( aPoint );
 }
 
-Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleAtPoint ( const css::awt::Point& aPoint) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleAtPoint ( const css::awt::Point& aPoint)
 {
     return mpTable->getAccessibleAtPoint( aPoint );
 }
 
-css::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds() throw (RuntimeException, std::exception)
+css::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds()
 {
     return mpTable->getBounds();
 }
 
-css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation() throw (RuntimeException, std::exception)
+css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation()
 {
     return mpTable->getLocation();
 }
 
-css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen() throw (RuntimeException, std::exception)
+css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen()
 {
     return mpTable->getLocationOnScreen();
 }
 
-css::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize() throw (RuntimeException, std::exception)
+css::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize()
 {
     return mpTable->getSize();
 }
 
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground()
 {
     return mpTable->getForeground();
 }
 
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground()
 {
     return mpTable->getBackground();
 }
 
-void SAL_CALL AccessibleTableHeaderShape::grabFocus() throw (RuntimeException, std::exception)
+void SAL_CALL AccessibleTableHeaderShape::grabFocus()
 {
     mpTable->grabFocus();
 }
 // XAccessibleTable
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRowCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRowCount()
 {
     return mbRow ? 1 : mpTable->getAccessibleRowCount();
 }
 
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnCount()
 {
     return !mbRow ? 1 : mpTable->getAccessibleColumnCount();
 }
 
-OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleRowDescription( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleRowDescription( sal_Int32 nRow )
 {
     return mpTable->getAccessibleRowDescription( nRow );
 }
 
-OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnDescription( sal_Int32 nColumn )
 {
     return mpTable->getAccessibleColumnDescription( nColumn );
 }
 
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
 {
     return mpTable->getAccessibleRowExtentAt( nRow, nColumn );
 }
 
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
 {
     return mpTable->getAccessibleColumnExtentAt( nRow, nColumn );
 }
 
-Reference< XAccessibleTable > SAL_CALL AccessibleTableHeaderShape::getAccessibleRowHeaders(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleTable > SAL_CALL AccessibleTableHeaderShape::getAccessibleRowHeaders(  )
 {
     Reference< XAccessibleTable > xRet;
     return xRet;
 }
 
-Reference< XAccessibleTable > SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnHeaders(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleTable > SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnHeaders(  )
 {
     Reference< XAccessibleTable > xRet;
     return xRet;
 }
 
-Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessibleRows(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessibleRows(  )
 {
     sal_Int32 nRow = getAccessibleRowCount();
     ::std::vector<bool> aSelected( nRow, true );
@@ -1201,7 +1193,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessible
     return aRet;
 }
 
-Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessibleColumns(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessibleColumns(  )
 {
     sal_Int32 nColumn = getAccessibleColumnCount();
     ::std::vector<bool> aSelected( nColumn, true );
@@ -1236,54 +1228,53 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessible
     return aRet;
 }
 
-sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleRowSelected( sal_Int32 nRow )
 {
     return mpTable->isAccessibleRowSelected( nRow );
 }
 
-sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleColumnSelected( sal_Int32 nColumn )
 {
     return mpTable->isAccessibleColumnSelected( nColumn );
 }
 
-Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
 {
     return mpTable->getAccessibleCellAt( nRow, nColumn );
 }
 
-Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleCaption(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleCaption(  )
 {
     return mpTable->getAccessibleCaption();
 }
 
-Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleSummary(  ) throw (RuntimeException, std::exception)
+Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleSummary(  )
 {
     return mpTable->getAccessibleSummary();
 }
 
-sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
 {
     return mpTable->isAccessibleSelected( nRow, nColumn );
 }
 
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
 {
     return mpTable->getAccessibleIndex( nRow, nColumn );
 }
 
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRow( sal_Int32 nChildIndex )
 {
     return mpTable->getAccessibleRow( nChildIndex );
 }
 
-sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumn( sal_Int32 nChildIndex )
 {
     return mpTable->getAccessibleColumn( nChildIndex );
 }
 
 // XAccessibleTableSelection
 sal_Bool SAL_CALL AccessibleTableHeaderShape::selectRow( sal_Int32 row )
-throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if( mbRow )
         return mpTable->selectRow( row );
@@ -1297,7 +1288,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL AccessibleTableHeaderShape::selectColumn( sal_Int32 column )
-throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if( !mbRow )
         return mpTable->selectColumn( column );
@@ -1311,7 +1301,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL AccessibleTableHeaderShape::unselectRow( sal_Int32 row )
-throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if( mbRow )
         return mpTable->unselectRow( row );
@@ -1324,7 +1313,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL AccessibleTableHeaderShape::unselectColumn( sal_Int32 column )
-throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     if( !mbRow )
         return mpTable->unselectColumn( column );
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index aab82da16cad..0d3b4d444e35 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -352,7 +352,7 @@ rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject*
 }
 
 
-Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException)
+Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject )
 : SdrText( rTableObj, pOutlinerParaObject )
 , SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
 , mpPropSet( ImplGetSvxCellPropertySet() )
@@ -803,7 +803,7 @@ sdr::properties::TextProperties* Cell::CloneProperties( SdrObject& rNewObj, Cell
 // XInterface
 
 
-Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL Cell::queryInterface( const Type & rType )
 {
     if( rType == cppu::UnoType<XMergeableCell>::get() )
         return Any( Reference< XMergeableCell >( this ) );
@@ -840,7 +840,7 @@ void SAL_CALL Cell::release() throw ()
 // XTypeProvider
 
 
-Sequence< Type > SAL_CALL Cell::getTypes(  ) throw (RuntimeException, std::exception)
+Sequence< Type > SAL_CALL Cell::getTypes(  )
 {
     Sequence< Type > aTypes( SvxUnoTextBase::getTypes() );
 
@@ -853,29 +853,25 @@ Sequence< Type > SAL_CALL Cell::getTypes(  ) throw (RuntimeException, std::excep
 }
 
 
-Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId(  ) throw (RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XLayoutConstrains
 css::awt::Size SAL_CALL Cell::getMinimumSize()
-    throw (RuntimeException,
-           std::exception)
 {
     return css::awt::Size( getMinimumWidth(),  getMinimumHeight() );
 }
 
 
 css::awt::Size SAL_CALL Cell::getPreferredSize()
-    throw (RuntimeException,
-           std::exception)
 {
     return getMinimumSize();
 }
 
 
-css::awt::Size SAL_CALL Cell::calcAdjustedSize( const css::awt::Size& aNewSize ) throw (RuntimeException, std::exception)
+css::awt::Size SAL_CALL Cell::calcAdjustedSize( const css::awt::Size& aNewSize )
 {
     return aNewSize;
 }
@@ -884,19 +880,19 @@ css::awt::Size SAL_CALL Cell::calcAdjustedSize( const css::awt::Size& aNewSize )
 // XMergeableCell
 
 
-sal_Int32 SAL_CALL Cell::getRowSpan() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL Cell::getRowSpan()
 {
     return mnRowSpan;
 }
 
 
-sal_Int32 SAL_CALL Cell::getColumnSpan() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL Cell::getColumnSpan()
 {
     return mnColSpan;
 }
 
 
-sal_Bool SAL_CALL Cell::isMerged() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL Cell::isMerged()
 {
     return mbMerged;
 }
@@ -905,13 +901,13 @@ sal_Bool SAL_CALL Cell::isMerged() throw (RuntimeException, std::exception)
 // XCell
 
 
-OUString SAL_CALL Cell::getFormula(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL Cell::getFormula(  )
 {
     return msFormula;
 }
 
 
-void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeException, std::exception)
+void SAL_CALL Cell::setFormula( const OUString& aFormula )
 {
     if( msFormula != aFormula )
     {
@@ -920,13 +916,13 @@ void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeExcepti
 }
 
 
-double SAL_CALL Cell::getValue(  ) throw (RuntimeException, std::exception)
+double SAL_CALL Cell::getValue(  )
 {
     return mfValue;
 }
 
 
-void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException, std::exception)
+void SAL_CALL Cell::setValue( double nValue )
 {
     if( mfValue != nValue )
     {
@@ -936,13 +932,13 @@ void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException, std::exce
 }
 
 
-CellContentType SAL_CALL Cell::getType() throw (RuntimeException, std::exception)
+CellContentType SAL_CALL Cell::getType()
 {
     return mnCellContentType;
 }
 
 
-sal_Int32 SAL_CALL Cell::getError(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL Cell::getError(  )
 {
     return mnError;
 }
@@ -973,13 +969,13 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa
     return aAny;
 }
 
-Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo()
 {
     return mpPropSet->getPropertySetInfo();
 }
 
 
-void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1120,7 +1116,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
 }
 
 
-Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1203,22 +1199,22 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow
 }
 
 
-void SAL_CALL Cell::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Cell::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ )
 {
 }
 
 
-void SAL_CALL Cell::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Cell::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ )
 {
 }
 
 
-void SAL_CALL Cell::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Cell::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ )
 {
 }
 
 
-void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ )
 {
 }
 
@@ -1226,7 +1222,7 @@ void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName
 // XMultiPropertySet
 
 
-void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues )
 {
     ::SolarMutexGuard aSolarGuard;
 
@@ -1256,7 +1252,7 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName
 }
 
 
-Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception)
+Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames )
 {
     ::SolarMutexGuard aSolarGuard;
 
@@ -1289,17 +1285,17 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP
 }
 
 
-void SAL_CALL Cell::addPropertiesChangeListener( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL Cell::addPropertiesChangeListener( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ )
 {
 }
 
 
-void SAL_CALL Cell::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL Cell::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& /*xListener*/ )
 {
 }
 
 
-void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ )
 {
 }
 
@@ -1307,7 +1303,7 @@ void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPr
 // XPropertyState
 
 
-PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1410,7 +1406,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
 }
 
 
-Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1440,7 +1436,7 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt
 }
 
 
-void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1481,7 +1477,7 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U
 }
 
 
-Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1527,7 +1523,6 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(Unk
 
 
 void SAL_CALL Cell::setAllPropertiesToDefault()
-    throw (RuntimeException, std::exception)
 {
     delete mpProperties;
     mpProperties = new sdr::properties::CellProperties( static_cast< SdrTableObj& >( GetObject() ), this );
@@ -1554,7 +1549,7 @@ void SAL_CALL Cell::setAllPropertiesToDefault()
 }
 
 
-void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, RuntimeException, std::exception)
+void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames )
 {
     sal_Int32 nCount = aPropertyNames.getLength();
     const OUString* pName = aPropertyNames.getConstArray();
@@ -1564,7 +1559,7 @@ void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropert
 }
 
 
-Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& aPropertyNames )
 {
     sal_Int32 nCount = aPropertyNames.getLength();
     Sequence< Any > aDefaults( nCount );
@@ -1581,14 +1576,14 @@ Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >&
 // XText
 
 
-void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, const Reference< XTextContent >& xContent, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, const Reference< XTextContent >& xContent, sal_Bool bAbsorb )
 {
     SvxUnoTextBase::insertTextContent( xRange, xContent, bAbsorb );
     notifyModified();
 }
 
 
-void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent ) throw (NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent )
 {
     SvxUnoTextBase::removeTextContent( xContent );
     notifyModified();
@@ -1598,14 +1593,14 @@ void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent
 // XSimpleText
 
 
-void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (RuntimeException, std::exception)
+void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb )
 {
     SvxUnoTextBase::insertString( xRange, aString, bAbsorb );
     notifyModified();
 }
 
 
-void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb )
 {
     SvxUnoTextBase::insertControlCharacter( xRange, nControlCharacter, bAbsorb );
     notifyModified();
@@ -1615,21 +1610,21 @@ void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRang
 // XTextRange
 
 
-OUString SAL_CALL Cell::getString(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL Cell::getString(  )
 {
     maSelection.nStartPara = EE_PARA_MAX_COUNT;
     return SvxUnoTextBase::getString();
 }
 
 
-void SAL_CALL Cell::setString( const OUString& aString ) throw (RuntimeException, std::exception)
+void SAL_CALL Cell::setString( const OUString& aString )
 {
     SvxUnoTextBase::setString( aString );
     notifyModified();
 }
 
 // XEventListener
-void SAL_CALL Cell::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL Cell::disposing( const EventObject& /*Source*/ )
 {
     mxTable.clear();
     dispose();
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 572908aa119f..9b568c584c11 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -102,79 +102,73 @@ public:
     SVX_DLLPRIVATE void copyFormatFrom( const CellRef& xSourceCell );
 
     // XInterface
-    SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& Type ) throw (css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& Type ) override;
     SVX_DLLPRIVATE virtual void SAL_CALL acquire() throw () override;
     SVX_DLLPRIVATE virtual void SAL_CALL release() throw () override;
 
     // XTypeProvider
-    SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    SVX_DLLPRIVATE virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XLayoutConstrains
-    SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getMinimumSize()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getPreferredSize()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw (css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getMinimumSize() override;
+    SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getPreferredSize() override;
+    SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
 
     // XMergeableCell
-    SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getRowSpan() throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColumnSpan() throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual sal_Bool SAL_CALL isMerged() throw (css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getRowSpan() override;
+    SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColumnSpan() override;
+    SVX_DLLPRIVATE virtual sal_Bool SAL_CALL isMerged() override;
 
     // XCell
-    SVX_DLLPRIVATE virtual OUString SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const OUString& aFormula ) throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual double SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL setValue( double nValue ) throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual css::table::CellContentType SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual sal_Int32 SAL_CALL getError() throw (css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual OUString SAL_CALL getFormula() override;
+    SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const OUString& aFormula ) override;
+    SVX_DLLPRIVATE virtual double SAL_CALL getValue() override;
+    SVX_DLLPRIVATE virtual void SAL_CALL setValue( double nValue ) override;
+    SVX_DLLPRIVATE virtual css::table::CellContentType SAL_CALL getType() override;
+    SVX_DLLPRIVATE virtual sal_Int32 SAL_CALL getError() override;
 
     // css::beans::XPropertySet
-    SVX_DLLPRIVATE virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+    SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XMultiPropertySet
-    SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     // css::beans::XPropertyState
-    SVX_DLLPRIVATE virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    SVX_DLLPRIVATE virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     // XMultiPropertyStates
-    SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault() override;
+    SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     // XText
-    SVX_DLLPRIVATE virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) override;
 
     // XSimpleText
-    SVX_DLLPRIVATE virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, sal_Bool bAbsorb ) override;
 
     // XTextRange
-    SVX_DLLPRIVATE virtual OUString SAL_CALL getString(  ) throw (css::uno::RuntimeException, std::exception) override;
-    SVX_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) throw (css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual OUString SAL_CALL getString(  ) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) override;
 
     // XEventListener
-    SVX_DLLPRIVATE virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    SVX_DLLPRIVATE virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     SVX_DLLPRIVATE virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject ) override;
 
@@ -199,7 +193,7 @@ protected:
 
 private:
     /// @throws css::uno::RuntimeException
-    SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException);
+    SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject );
     SVX_DLLPRIVATE virtual ~Cell() throw() override;
 
     Cell(Cell const &) = delete;
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index 02427a6770a4..37b9e04577c8 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -50,19 +50,19 @@ CellCursor::~CellCursor()
 // XCellCursor
 
 
-Reference< XCell > SAL_CALL CellCursor::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCell > SAL_CALL CellCursor::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow )
 {
     return CellRange::getCellByPosition( nColumn, nRow );
 }
 
 
-Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
 {
     return CellRange::getCellRangeByPosition( nLeft, nTop, nRight, nBottom );
 }
 
 
-Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString& aRange ) throw (RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString& aRange )
 {
     return CellRange::getCellRangeByName( aRange );
 }
@@ -71,21 +71,21 @@ Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString&
 // XCellCursor
 
 
-void SAL_CALL CellCursor::gotoStart(  ) throw (RuntimeException, std::exception)
+void SAL_CALL CellCursor::gotoStart(  )
 {
     mnRight = mnLeft;
     mnBottom = mnTop;
 }
 
 
-void SAL_CALL CellCursor::gotoEnd(  ) throw (RuntimeException, std::exception)
+void SAL_CALL CellCursor::gotoEnd(  )
 {
     mnLeft = mnRight;
     mnTop = mnBottom;
 }
 
 
-void SAL_CALL CellCursor::gotoNext(  ) throw (RuntimeException, std::exception)
+void SAL_CALL CellCursor::gotoNext(  )
 {
     if( mxTable.is() )
     {
@@ -113,7 +113,7 @@ void SAL_CALL CellCursor::gotoNext(  ) throw (RuntimeException, std::exception)
 }
 
 
-void SAL_CALL CellCursor::gotoPrevious(  ) throw (RuntimeException, std::exception)
+void SAL_CALL CellCursor::gotoPrevious(  )
 {
     if( mxTable.is() )
     {
@@ -133,7 +133,7 @@ void SAL_CALL CellCursor::gotoPrevious(  ) throw (RuntimeException, std::excepti
 }
 
 
-void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (RuntimeException, std::exception)
+void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset )
 {
     if( mxTable.is() )
     {
@@ -231,7 +231,7 @@ bool CellCursor::GetMergedSelection( CellPos& rStart, CellPos& rEnd )
 }
 
 
-void SAL_CALL CellCursor::merge(  ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL CellCursor::merge(  )
 {
     CellPos aStart, aEnd;
     if( !GetMergedSelection( aStart, aEnd ) )
@@ -493,7 +493,7 @@ void CellCursor::split_vertical( sal_Int32 nRows )
 }
 
 
-void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (NoSupportException, IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows )
 {
     if( (nColumns < 0) || (nRows < 0) )
         throw IllegalArgumentException();
@@ -531,7 +531,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No
 }
 
 
-sal_Bool SAL_CALL CellCursor::isMergeable(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL CellCursor::isMergeable(  )
 {
     CellPos aStart, aEnd;
     return GetMergedSelection( aStart, aEnd );
diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx
index 6a4c301b45cc..6b2a9d5b6d5b 100644
--- a/svx/source/table/cellcursor.hxx
+++ b/svx/source/table/cellcursor.hxx
@@ -39,21 +39,21 @@ public:
     virtual ~CellCursor() override;
 
     // XCellRange
-    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override;
 
     // XCellCursor
-    virtual void SAL_CALL gotoStart(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoEnd(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoNext(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoPrevious(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL gotoStart(  ) override;
+    virtual void SAL_CALL gotoEnd(  ) override;
+    virtual void SAL_CALL gotoNext(  ) override;
+    virtual void SAL_CALL gotoPrevious(  ) override;
+    virtual void SAL_CALL gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) override;
 
     // XMergeableCellRange
-    virtual void SAL_CALL merge(  ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL split( ::sal_Int32 Columns, ::sal_Int32 Rows ) throw (css::lang::NoSupportException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isMergeable(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL merge(  ) override;
+    virtual void SAL_CALL split( ::sal_Int32 Columns, ::sal_Int32 Rows ) override;
+    virtual sal_Bool SAL_CALL isMergeable(  ) override;
 
 protected:
     bool GetMergedSelection( CellPos& rStart, CellPos& rEnd );
diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx
index 1f7dc02416ff..b5e8001c283d 100644
--- a/svx/source/table/cellrange.cxx
+++ b/svx/source/table/cellrange.cxx
@@ -76,13 +76,13 @@ Reference< XTable > CellRange::getTable()
 // XCellRange
 
 
-Reference< XCell > SAL_CALL CellRange::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCell > SAL_CALL CellRange::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow )
 {
     return mxTable->getCellByPosition( mnLeft + nColumn, mnTop + nRow );
 }
 
 
-Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
 {
     if( (nLeft >= 0 ) && (nTop >= 0) && (nRight >= nLeft) && (nBottom >= nTop)  )
     {
@@ -102,7 +102,7 @@ Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nL
 }
 
 
-Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString& /*aRange*/ )
 {
     return Reference< XCellRange >();
 }
diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx
index 519729c7b608..c3955c415778 100644
--- a/svx/source/table/cellrange.hxx
+++ b/svx/source/table/cellrange.hxx
@@ -42,9 +42,9 @@ public:
     virtual css::uno::Reference< css::table::XTable > getTable() override;
 
     // XCellRange
-    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override;
 
 protected:
     TableModelRef mxTable;
diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx
index 687da1b31937..1b5e081e444b 100644
--- a/svx/source/table/propertyset.cxx
+++ b/svx/source/table/propertyset.cxx
@@ -52,7 +52,7 @@ void FastPropertySetInfo::addProperties( const PropertyVector& rProps )
 }
 
 
-const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw (UnknownPropertyException )
+const Property& FastPropertySetInfo::getProperty( const OUString& aName )
 {
     PropertyMap::iterator aIter( maMap.find( aName ) );
     if( aIter == maMap.end() )
@@ -74,19 +74,19 @@ const Property* FastPropertySetInfo::hasProperty( const OUString& aName )
 // XPropertySetInfo
 
 
-Sequence< Property > SAL_CALL FastPropertySetInfo::getProperties() throw (RuntimeException, std::exception)
+Sequence< Property > SAL_CALL FastPropertySetInfo::getProperties()
 {
     return Sequence< Property >( &maProperties[0], maProperties.size() );
 }
 
 
-Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName )
 {
     return getProperty( aName );
 }
 
 
-sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName )
 {
     return hasProperty( aName ) != nullptr;
 }
@@ -105,40 +105,40 @@ FastPropertySet::~FastPropertySet()
 // XPropertySet
 
 
-Reference< XPropertySetInfo > SAL_CALL FastPropertySet::getPropertySetInfo(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL FastPropertySet::getPropertySetInfo(  )
 {
     return Reference< XPropertySetInfo >( mxInfo.get() );
 }
 
 
-void SAL_CALL FastPropertySet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL FastPropertySet::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
 {
     setFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle, aValue );
 }
 
 
-Any SAL_CALL FastPropertySet::getPropertyValue( const OUString& aPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL FastPropertySet::getPropertyValue( const OUString& aPropertyName )
 {
     return getFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle );
 }
 
 
-void SAL_CALL FastPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL FastPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
 {
 }
 
 
-void SAL_CALL FastPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL FastPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
 {
 }
 
 
-void SAL_CALL FastPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL FastPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
 {
 }
 
 
-void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
 {
 }
 
@@ -146,7 +146,7 @@ void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, co
 // XMultiPropertySet
 
 
-void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues )
 {
     const OUString* pPropertyNames = aPropertyNames.getConstArray();
     const Any* pValues = aValues.getConstArray();
@@ -169,7 +169,7 @@ void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aP
 }
 
 
-Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception)
+Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames )
 {
     sal_Int32 nCount = aPropertyNames.getLength();
     Sequence< Any > aValues( nCount );
@@ -192,17 +192,17 @@ Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUS
 }
 
 
-void SAL_CALL FastPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception)
+void SAL_CALL FastPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
 {
 }
 
 
-void SAL_CALL FastPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception)
+void SAL_CALL FastPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& )
 {
 }
 
 
-void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception)
+void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
 {
 }
 
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index a88786a32d5e..47ac513eff0b 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -45,13 +45,13 @@ public:
     void addProperties( const PropertyVector& rProps );
 
     /// @throws css::beans::UnknownPropertyException
-    const css::beans::Property& getProperty( const OUString& aName ) throw (css::beans::UnknownPropertyException );
+    const css::beans::Property& getProperty( const OUString& aName );
     const css::beans::Property* hasProperty( const OUString& aName );
 
     // XPropertySetInfo
-    virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties(  ) override;
+    virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
 private:
     PropertyVector maProperties;
@@ -66,25 +66,25 @@ public:
     virtual ~FastPropertySet() override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XMultiPropertySet
 //    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) 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 = 0;
-    virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override = 0;
+    virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) override = 0;
+    virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override = 0;
 
 private:
     rtl::Reference< FastPropertySetInfo > mxInfo;
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index c951223827f1..0436d57e0106 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -224,10 +224,10 @@ public:
     SdrTableObjImpl& operator=( const SdrTableObjImpl& rSource );
 
     // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) 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;
 
     void update();
 
@@ -556,7 +556,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset
 // XModifyListener
 
 
-void SAL_CALL SdrTableObjImpl::modified( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SdrTableObjImpl::modified( const css::lang::EventObject& /*aEvent*/ )
 {
     update();
 }
@@ -636,7 +636,7 @@ void SdrTableObjImpl::dumpAsXml(xmlTextWriterPtr pWriter) const
 // XEventListener
 
 
-void SAL_CALL SdrTableObjImpl::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SdrTableObjImpl::disposing( const css::lang::EventObject& /*Source*/ )
 {
     mxActiveCell.clear();
     mxTable.clear();
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index 6dc825b39159..06166e67488f 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -67,7 +67,7 @@ void TableColumn::dispose()
 }
 
 
-void TableColumn::throwIfDisposed() const throw (css::uno::RuntimeException)
+void TableColumn::throwIfDisposed() const
 {
     if( !mxTableModel.is() )
         throw DisposedException();
@@ -90,7 +90,7 @@ TableColumn& TableColumn::operator=( const TableColumn& r )
 // XCellRange
 
 
-Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow )
 {
     throwIfDisposed();
     if( nColumn != 0 )
@@ -100,7 +100,7 @@ Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, s
 }
 
 
-Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
 {
     throwIfDisposed();
     if( (nTop >= 0 ) && (nLeft == 0) && (nBottom >= nTop) && (nRight == 0)  )
@@ -111,7 +111,7 @@ Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32
 }
 
 
-Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString& /*aRange*/ )
 {
     return Reference< XCellRange >();
 }
@@ -120,13 +120,13 @@ Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString
 // XNamed
 
 
-OUString SAL_CALL TableColumn::getName() throw (RuntimeException, std::exception)
+OUString SAL_CALL TableColumn::getName()
 {
     return maName;
 }
 
 
-void SAL_CALL TableColumn::setName( const OUString& aName ) throw (RuntimeException, std::exception)
+void SAL_CALL TableColumn::setName( const OUString& aName )
 {
     maName = aName;
 }
@@ -135,7 +135,7 @@ void SAL_CALL TableColumn::setName( const OUString& aName ) throw (RuntimeExcept
 // XFastPropertySet
 
 
-void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue )
 {
     bool bOk = false;
     bool bChange = false;
@@ -223,7 +223,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a
 }
 
 
-Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle )
 {
     switch( nHandle )
     {
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index 5832ea02956c..711a4c0c3847 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -42,22 +42,22 @@ public:
 
     void dispose();
     /// @throws css::uno::RuntimeException
-    void throwIfDisposed() const throw (css::uno::RuntimeException);
+    void throwIfDisposed() const;
 
     TableColumn& operator=( const TableColumn& );
 
     // XCellRange
-    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& aName ) 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;
+    virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override;
 
     /// Get the table that owns this column.
     TableModelRef const & getModel() const;
diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx
index eaf01178c979..d80581ee30d0 100644
--- a/svx/source/table/tablecolumns.cxx
+++ b/svx/source/table/tablecolumns.cxx
@@ -50,7 +50,7 @@ void TableColumns::dispose()
 }
 
 
-void TableColumns::throwIfDisposed() const throw (css::uno::RuntimeException)
+void TableColumns::throwIfDisposed() const
 {
     if( !mxTableModel.is() )
         throw DisposedException();
@@ -60,14 +60,14 @@ void TableColumns::throwIfDisposed() const throw (css::uno::RuntimeException)
 // XTableRows
 
 
-void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception)
+void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount )
 {
     throwIfDisposed();
     mxTableModel->insertColumns( nIndex, nCount );
 }
 
 
-void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception)
+void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
 {
     throwIfDisposed();
     mxTableModel->removeColumns( nIndex, nCount );
@@ -77,14 +77,14 @@ void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
 // XIndexAccess
 
 
-sal_Int32 SAL_CALL TableColumns::getCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL TableColumns::getCount()
 {
     throwIfDisposed();
     return mxTableModel->getColumnCount();
 }
 
 
-Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index )
 {
     throwIfDisposed();
 
@@ -98,7 +98,7 @@ Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBounds
 // XElementAccess
 
 
-Type SAL_CALL TableColumns::getElementType() throw (RuntimeException, std::exception)
+Type SAL_CALL TableColumns::getElementType()
 {
     throwIfDisposed();
 
@@ -106,7 +106,7 @@ Type SAL_CALL TableColumns::getElementType() throw (RuntimeException, std::excep
 }
 
 
-sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL TableColumns::hasElements()
 {
     throwIfDisposed();
 
diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx
index 56051fdc2113..778a1cae6031 100644
--- a/svx/source/table/tablecolumns.hxx
+++ b/svx/source/table/tablecolumns.hxx
@@ -36,19 +36,19 @@ public:
 
     void dispose();
     /// @throws css::uno::RuntimeException
-    void throwIfDisposed() const throw (css::uno::RuntimeException);
+    void throwIfDisposed() const;
 
     // XTableColumns
-    virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override;
+    virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // Methods
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
 private:
     TableModelRef   mxTableModel;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 600495aadc82..02c5a732cf7a 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -110,10 +110,10 @@ public:
         : mpController( pController ) {}
 
     // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) 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;
 
     SvxTableController* mpController;
 };
@@ -122,7 +122,7 @@ public:
 // XModifyListener
 
 
-void SAL_CALL SvxTableControllerModifyListener::modified( const css::lang::EventObject&  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxTableControllerModifyListener::modified( const css::lang::EventObject&  )
 {
     if( mpController )
         mpController->onTableModified();
@@ -132,7 +132,7 @@ void SAL_CALL SvxTableControllerModifyListener::modified( const css::lang::Event
 // XEventListener
 
 
-void SAL_CALL SvxTableControllerModifyListener::disposing( const css::lang::EventObject&  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxTableControllerModifyListener::disposing( const css::lang::EventObject&  )
 {
     mpController = nullptr;
 }
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index ea4aa3358105..49b44de1b05b 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -72,43 +72,43 @@ public:
     TableDesignStyle();
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XStyle
-    virtual sal_Bool SAL_CALL isUserDefined() throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isInUse() throw (RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getParentStyle() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw (NoSuchElementException, RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isUserDefined() override;
+    virtual sal_Bool SAL_CALL isInUse() override;
+    virtual OUString SAL_CALL getParentStyle() override;
+    virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XNameAccess
-    virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getElementNames() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(RuntimeException, std::exception) override ;
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const Reference< XModifyListener >& aListener ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const Reference< XModifyListener >& aListener ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const Reference< XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const Reference< XModifyListener >& aListener ) override;
 
     // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     void notifyModifyListener();
 
@@ -127,51 +127,51 @@ class TableDesignFamily : public ::cppu::WeakImplHelper< XNameContainer, XNamed,
 {
 public:
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XNamed
-    virtual OUString SAL_CALL getName(  ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& aName ) override;
 
     // XNameAccess
-    virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getElementNames() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XElementAccess
-    virtual Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(RuntimeException, std::exception) override;
+    virtual Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(RuntimeException, std::exception) override ;
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) override;
 
     // XSingleServiceFactory
-    virtual Reference< XInterface > SAL_CALL createInstance(  ) throw(Exception, RuntimeException, std::exception) override;
-    virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override;
+    virtual Reference< XInterface > SAL_CALL createInstance(  ) override;
+    virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) override;
 
     // XPropertySet
-    virtual Reference<XPropertySetInfo> SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference<XPropertyChangeListener>& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener>& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const Reference<XVetoableChangeListener>&aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual Reference<XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) override;
+    virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference<XPropertyChangeListener>& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener>& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const Reference<XVetoableChangeListener>&aListener ) override;
 
     TableDesignStyleVector  maDesigns;
 };
@@ -204,17 +204,17 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap()
 }
 
 // XServiceInfo
-OUString SAL_CALL TableDesignStyle::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL TableDesignStyle::getImplementationName()
 {
     return OUString("TableDesignStyle");
 }
 
-sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames()
 {
     OUString aServiceName("com.sun.star.style.Style");
     Sequence< OUString > aSeq( &aServiceName, 1 );
@@ -222,12 +222,12 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames() throw
 }
 
 // XStyle
-sal_Bool SAL_CALL TableDesignStyle::isUserDefined() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL TableDesignStyle::isUserDefined()
 {
     return false;
 }
 
-sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL TableDesignStyle::isInUse()
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
     OInterfaceContainerHelper * pContainer = rBHelper.getContainer( cppu::UnoType<XModifyListener>::get() );
@@ -248,13 +248,13 @@ sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException, std::exce
 }
 
 
-OUString SAL_CALL TableDesignStyle::getParentStyle() throw (RuntimeException, std::exception)
+OUString SAL_CALL TableDesignStyle::getParentStyle()
 {
     return OUString();
 }
 
 
-void SAL_CALL TableDesignStyle::setParentStyle( const OUString& ) throw (NoSuchElementException, RuntimeException, std::exception)
+void SAL_CALL TableDesignStyle::setParentStyle( const OUString& )
 {
 }
 
@@ -262,13 +262,13 @@ void SAL_CALL TableDesignStyle::setParentStyle( const OUString& ) throw (NoSuchE
 // XNamed
 
 
-OUString SAL_CALL TableDesignStyle::getName() throw (RuntimeException, std::exception)
+OUString SAL_CALL TableDesignStyle::getName()
 {
     return msName;
 }
 
 
-void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeException, std::exception)
+void SAL_CALL TableDesignStyle::setName( const OUString& rName )
 {
     msName = rName;
 }
@@ -277,7 +277,7 @@ void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeE
 // XNameAccess
 
 
-Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableDesignStyle::getByName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
 
@@ -291,7 +291,7 @@ Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchEl
 }
 
 
-Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames()
 {
     SolarMutexGuard aGuard;
 
@@ -299,7 +299,7 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeE
 }
 
 
-sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName )  throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
 
@@ -313,13 +313,13 @@ sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName )  throw(Ru
 // XElementAccess
 
 
-Type SAL_CALL TableDesignStyle::getElementType() throw(RuntimeException, std::exception)
+Type SAL_CALL TableDesignStyle::getElementType()
 {
     return cppu::UnoType<XStyle>::get();
 }
 
 
-sal_Bool SAL_CALL TableDesignStyle::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL TableDesignStyle::hasElements()
 {
     return true;
 }
@@ -328,13 +328,13 @@ sal_Bool SAL_CALL TableDesignStyle::hasElements() throw(RuntimeException, std::e
 // XIndexAccess
 
 
-sal_Int32 SAL_CALL TableDesignStyle::getCount() throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL TableDesignStyle::getCount()
 {
     return style_count;
 }
 
 
-Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index )
 {
     SolarMutexGuard aGuard;
 
@@ -348,7 +348,7 @@ Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou
 // XNameReplace
 
 
-void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& aElement )
 {
     SolarMutexGuard aGuard;
 
@@ -398,7 +398,7 @@ void SAL_CALL TableDesignStyle::disposing()
 // XModifyBroadcaster
 
 
-void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListener >& xListener )
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
     if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -414,7 +414,7 @@ void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListe
 }
 
 
-void SAL_CALL TableDesignStyle::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TableDesignStyle::removeModifyListener( const Reference< XModifyListener >& xListener )
 {
     rBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener );
 }
@@ -439,13 +439,13 @@ void TableDesignStyle::notifyModifyListener()
 
 
 // if we get a modify hint from a style, notify all registered XModifyListener
-void SAL_CALL TableDesignStyle::modified( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL TableDesignStyle::modified( const css::lang::EventObject& )
 {
     notifyModifyListener();
 }
 
 
-void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& )
 {
 }
 
@@ -454,17 +454,17 @@ void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) throw
 
 
 // XServiceInfo
-OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeException, std::exception)
+OUString SAL_CALL TableDesignFamily::getImplementationName()
 {
     return OUString("TableDesignFamily");
 }
 
-sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames()
 {
     OUString aServiceName("com.sun.star.style.StyleFamily");
     Sequence< OUString > aSeq( &aServiceName, 1 );
@@ -472,17 +472,17 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() thro
 }
 
 // XNamed
-OUString SAL_CALL TableDesignFamily::getName() throw (RuntimeException, std::exception)
+OUString SAL_CALL TableDesignFamily::getName()
 {
     return OUString( "table" );
 }
 
-void SAL_CALL TableDesignFamily::setName( const OUString& ) throw (RuntimeException, std::exception)
+void SAL_CALL TableDesignFamily::setName( const OUString& )
 {
 }
 
 // XNameAccess
-Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableDesignFamily::getByName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
 
@@ -498,7 +498,7 @@ Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchE
 }
 
 
-Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames()
 {
     SolarMutexGuard aGuard;
 
@@ -514,7 +514,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(Runtime
 }
 
 
-sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName )
 {
     SolarMutexGuard aGuard;
 
@@ -531,13 +531,13 @@ sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(Ru
 // XElementAccess
 
 
-Type SAL_CALL TableDesignFamily::getElementType() throw(RuntimeException, std::exception)
+Type SAL_CALL TableDesignFamily::getElementType()
 {
     return cppu::UnoType<XStyle>::get();
 }
 
 
-sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL TableDesignFamily::hasElements()
 {
     SolarMutexGuard aGuard;
 
@@ -548,7 +548,7 @@ sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException, std::
 // XIndexAccess
 
 
-sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException, std::exception)
+sal_Int32 SAL_CALL TableDesignFamily::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -556,7 +556,7 @@ sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException, std::ex
 }
 
 
-Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index )
 {
     SolarMutexGuard aGuard;
 
@@ -570,7 +570,7 @@ Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBo
 // XNameContainer
 
 
-void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& rElement )
 {
     SolarMutexGuard aGuard;
 
@@ -589,7 +589,7 @@ void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any&
 }
 
 
-void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableDesignFamily::removeByName( const OUString& rName )
 {
     SolarMutexGuard aGuard;
 
@@ -612,7 +612,7 @@ void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoS
 // XNameReplace
 
 
-void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any& aElement )
 {
     SolarMutexGuard aGuard;
 
@@ -639,7 +639,7 @@ void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any
 // XSingleServiceFactory
 
 
-Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL TableDesignFamily::createInstance()
 {
     SolarMutexGuard aGuard;
 
@@ -647,7 +647,7 @@ Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Excep
 }
 
 
-Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments( const Sequence< Any >&  ) throw(Exception, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments( const Sequence< Any >&  )
 {
     return createInstance();
 }
@@ -656,7 +656,7 @@ Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments(
 // XComponent
 
 
-void SAL_CALL TableDesignFamily::dispose(  ) throw (RuntimeException, std::exception)
+void SAL_CALL TableDesignFamily::dispose(  )
 {
     TableDesignStyleVector aDesigns;
     aDesigns.swap( maDesigns );
@@ -670,12 +670,12 @@ void SAL_CALL TableDesignFamily::dispose(  ) throw (RuntimeException, std::excep
 }
 
 
-void SAL_CALL TableDesignFamily::addEventListener( const Reference< XEventListener >&  ) throw (RuntimeException, std::exception)
+void SAL_CALL TableDesignFamily::addEventListener( const Reference< XEventListener >&  )
 {
 }
 
 
-void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventListener >&  ) throw (RuntimeException, std::exception)
+void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventListener >&  )
 {
 }
 
@@ -683,20 +683,20 @@ void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventLis
 // XPropertySet
 
 
-Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (RuntimeException, std::exception)
+Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo()
 {
     OSL_FAIL( "###unexpected!" );
     return Reference<XPropertySetInfo>();
 }
 
 
-void TableDesignFamily::setPropertyValue( const OUString& , const Any&  ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void TableDesignFamily::setPropertyValue( const OUString& , const Any&  )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
 
-Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any TableDesignFamily::getPropertyValue( const OUString& PropertyName )
 {
     if ( PropertyName == "DisplayName" )
     {
@@ -710,25 +710,25 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U
 }
 
 
-void TableDesignFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void TableDesignFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
 
-void TableDesignFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void TableDesignFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
 
-void TableDesignFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void TableDesignFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& )
 {
     OSL_FAIL( "###unexpected!" );
 }
 
 
-void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>&  )
 {
     OSL_FAIL( "###unexpected!" );
 }
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index b0274ad65a67..e608aef83b54 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -289,14 +289,14 @@ void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellV
 // XTable
 
 
-Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeException, std::exception)
+Reference< XCellCursor > SAL_CALL TableModel::createCursor()
 {
     ::SolarMutexGuard aGuard;
     return createCursorByRange( Reference< XCellRange >( this ) );
 }
 
 
-Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange ) throw (IllegalArgumentException, RuntimeException, std::exception)
+Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange )
 {
     ::SolarMutexGuard aGuard;
 
@@ -309,14 +309,14 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen
 }
 
 
-sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL TableModel::getRowCount()
 {
     ::SolarMutexGuard aGuard;
     return getRowCountImpl();
 }
 
 
-sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL TableModel::getColumnCount()
 {
     ::SolarMutexGuard aGuard;
     return getColumnCountImpl();
@@ -333,7 +333,7 @@ std::vector<sal_Int32> TableModel::getColumnWidths()
 // XComponent
 
 
-void TableModel::dispose() throw (RuntimeException, std::exception)
+void TableModel::dispose()
 {
     ::SolarMutexGuard aGuard;
     TableModelBase::dispose();
@@ -343,14 +343,14 @@ void TableModel::dispose() throw (RuntimeException, std::exception)
 // XModifiable
 
 
-sal_Bool SAL_CALL TableModel::isModified(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL TableModel::isModified(  )
 {
     ::SolarMutexGuard aGuard;
     return mbModified;
 }
 
 
-void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoException, RuntimeException, std::exception)
+void SAL_CALL TableModel::setModified( sal_Bool bModified )
 {
     {
         ::SolarMutexGuard aGuard;
@@ -364,13 +364,13 @@ void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoE
 // XModifyBroadcaster
 
 
-void SAL_CALL TableModel::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TableModel::addModifyListener( const Reference< XModifyListener >& xListener )
 {
     rBHelper.addListener( cppu::UnoType<XModifyListener>::get() , xListener );
 }
 
 
-void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener >& xListener )
 {
     rBHelper.removeListener( cppu::UnoType<XModifyListener>::get() , xListener );
 }
@@ -379,7 +379,7 @@ void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener
 // XColumnRowRange
 
 
-Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeException, std::exception)
+Reference< XTableColumns > SAL_CALL TableModel::getColumns()
 {
     ::SolarMutexGuard aGuard;
 
@@ -389,7 +389,7 @@ Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeExcep
 }
 
 
-Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException, std::exception)
+Reference< XTableRows > SAL_CALL TableModel::getRows()
 {
     ::SolarMutexGuard aGuard;
 
@@ -402,7 +402,7 @@ Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException,
 // XCellRange
 
 
-Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow )
 {
     ::SolarMutexGuard aGuard;
 
@@ -414,7 +414,7 @@ Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sa
 }
 
 
-Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
 {
     ::SolarMutexGuard aGuard;
 
@@ -428,7 +428,7 @@ Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 n
 }
 
 
-Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString& /*aRange*/ )
 {
     return Reference< XCellRange >();
 }
@@ -437,40 +437,40 @@ Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString&
 // XPropertySet
 
 
-Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo(  ) throw (RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo(  )
 {
     Reference< XPropertySetInfo > xInfo;
     return xInfo;
 }
 
 
-void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ )
 {
 }
 
 
-Any SAL_CALL TableModel::getPropertyValue( const OUString& /*PropertyName*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableModel::getPropertyValue( const OUString& /*PropertyName*/ )
 {
     return Any();
 }
 
 
-void SAL_CALL TableModel::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableModel::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ )
 {
 }
 
 
-void SAL_CALL TableModel::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableModel::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ )
 {
 }
 
 
-void SAL_CALL TableModel::addVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableModel::addVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ )
 {
 }
 
 
-void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ )
 {
 }
 
@@ -478,12 +478,12 @@ void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPrope
 // XFastPropertySet
 
 
-void SAL_CALL TableModel::setFastPropertyValue( ::sal_Int32 /*nHandle*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableModel::setFastPropertyValue( ::sal_Int32 /*nHandle*/, const Any& /*aValue*/ )
 {
 }
 
 
-Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ )
 {
     Any aAny;
     return aAny;
@@ -542,14 +542,14 @@ void TableModel::disposing()
 // XBroadcaster
 
 
-void TableModel::lockBroadcasts() throw (RuntimeException, std::exception)
+void TableModel::lockBroadcasts()
 {
     ::SolarMutexGuard aGuard;
     ++mnNotifyLock;
 }
 
 
-void TableModel::unlockBroadcasts() throw (RuntimeException, std::exception)
+void TableModel::unlockBroadcasts()
 {
     ::SolarMutexGuard aGuard;
     --mnNotifyLock;
@@ -953,7 +953,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount )
 }
 
 
-TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsException)
+TableRowRef TableModel::getRow( sal_Int32 nRow ) const
 {
     if( (nRow >= 0) && (nRow < getRowCountImpl()) )
         return maRows[nRow];
@@ -962,7 +962,7 @@ TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsEx
 }
 
 
-TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutOfBoundsException)
+TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const
 {
     if( (nColumn >= 0) && (nColumn < getColumnCountImpl()) )
         return maColumns[nColumn];
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index deb083498bd6..e5027da121fa 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -95,47 +95,47 @@ public:
     virtual css::uno::Reference< css::table::XTable > getTable() override;
 
     // XTable
-    virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursor(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursorByRange( const css::uno::Reference< css::table::XCellRange >& rRange ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursor(  ) override;
+    virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursorByRange( const css::uno::Reference< css::table::XCellRange >& rRange ) override;
+    virtual ::sal_Int32 SAL_CALL getRowCount() override;
+    virtual ::sal_Int32 SAL_CALL getColumnCount() override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
 
     // XModifiable
-    virtual sal_Bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isModified(  ) override;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // XColumnRowRange
-    virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns() override;
+    virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows() override;
 
     // XCellRange
-    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( ::sal_Int32 nColumn, ::sal_Int32 nRow ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( ::sal_Int32 nLeft, ::sal_Int32 nTop, ::sal_Int32 nRight, ::sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( ::sal_Int32 nColumn, ::sal_Int32 nRow ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( ::sal_Int32 nLeft, ::sal_Int32 nTop, ::sal_Int32 nRight, ::sal_Int32 nBottom ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) 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;
+    virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override;
 
     // XBroadcaster
-    virtual void SAL_CALL lockBroadcasts() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unlockBroadcasts() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL lockBroadcasts() override;
+    virtual void SAL_CALL unlockBroadcasts() override;
 
 protected:
     void notifyModification();
@@ -163,9 +163,9 @@ private:
     virtual void SAL_CALL disposing() override;
 
     /// @throws css::lang::IndexOutOfBoundsException
-    TableRowRef getRow( sal_Int32 nRow ) const throw (css::lang::IndexOutOfBoundsException);
+    TableRowRef getRow( sal_Int32 nRow ) const;
     /// @throws css::lang::IndexOutOfBoundsException
-    TableColumnRef getColumn( sal_Int32 nColumn ) const throw (css::lang::IndexOutOfBoundsException);
+    TableColumnRef getColumn( sal_Int32 nColumn ) const;
 
     void updateRows();
     void updateColumns();
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index 8f96b59767ac..4f2ced4932c8 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -80,7 +80,7 @@ void TableRow::dispose()
 }
 
 
-void TableRow::throwIfDisposed() const throw (css::uno::RuntimeException)
+void TableRow::throwIfDisposed() const
 {
     if( !mxTableModel.is() )
         throw DisposedException();
@@ -157,7 +157,7 @@ const TableModelRef& TableRow::getModel() const
 // XCellRange
 
 
-Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow )
 {
     throwIfDisposed();
     if( nRow != 0 )
@@ -167,7 +167,7 @@ Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_
 }
 
 
-Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
 {
     throwIfDisposed();
     if( (nLeft >= 0 ) && (nTop == 0) && (nRight >= nLeft) && (nBottom == 0)  )
@@ -178,7 +178,7 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLe
 }
 
 
-Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception)
+Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /*aRange*/ )
 {
     throwIfDisposed();
     return Reference< XCellRange >();
@@ -188,13 +188,13 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /
 // XNamed
 
 
-OUString SAL_CALL TableRow::getName() throw (RuntimeException, std::exception)
+OUString SAL_CALL TableRow::getName()
 {
     return maName;
 }
 
 
-void SAL_CALL TableRow::setName( const OUString& aName ) throw (RuntimeException, std::exception)
+void SAL_CALL TableRow::setName( const OUString& aName )
 {
     maName = aName;
 }
@@ -203,7 +203,7 @@ void SAL_CALL TableRow::setName( const OUString& aName ) throw (RuntimeException
 // XFastPropertySet
 
 
-void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue )
 {
     bool bOk = false;
     bool bChange = false;
@@ -295,7 +295,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal
 }
 
 
-Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle )
 {
     switch( nHandle )
     {
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index bcdbe5ef9bc4..7242ae138751 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -42,7 +42,7 @@ public:
 
     void dispose();
     /// @throws css::uno::RuntimeException
-    void throwIfDisposed() const throw (css::uno::RuntimeException);
+    void throwIfDisposed() const;
 
     TableRow& operator=( const TableRow& );
 
@@ -52,17 +52,17 @@ public:
     const TableModelRef& getModel() const;
 
     // XCellRange
-    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& aName ) 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;
+    virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override;
 
 private:
     static rtl::Reference< FastPropertySetInfo > getStaticPropertySetInfo();
diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx
index e816f7efe53c..f0c4e7593ab2 100644
--- a/svx/source/table/tablerows.cxx
+++ b/svx/source/table/tablerows.cxx
@@ -51,7 +51,7 @@ void TableRows::dispose()
 }
 
 
-void TableRows::throwIfDisposed() const throw (css::uno::RuntimeException)
+void TableRows::throwIfDisposed() const
 {
     if( !mxTableModel.is() )
         throw DisposedException();
@@ -61,14 +61,14 @@ void TableRows::throwIfDisposed() const throw (css::uno::RuntimeException)
 // XTableRows
 
 
-void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception)
+void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount )
 {
     throwIfDisposed();
     mxTableModel->insertRows( nIndex, nCount );
 }
 
 
-void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception)
+void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
 {
     throwIfDisposed();
     mxTableModel->removeRows( nIndex, nCount );
@@ -78,14 +78,14 @@ void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) thr
 // XIndexAccess
 
 
-sal_Int32 SAL_CALL TableRows::getCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL TableRows::getCount()
 {
     throwIfDisposed();
     return mxTableModel->getRowCount();
 }
 
 
-Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL TableRows::getByIndex( sal_Int32 Index )
 {
     throwIfDisposed();
     return Any( Reference< XCellRange >( static_cast< XCellRange* >( mxTableModel->getRow( Index ).get() ) ) );
@@ -95,14 +95,14 @@ Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsExc
 // XElementAccess
 
 
-Type SAL_CALL TableRows::getElementType() throw (RuntimeException, std::exception)
+Type SAL_CALL TableRows::getElementType()
 {
     throwIfDisposed();
     return cppu::UnoType<XCellRange>::get();
 }
 
 
-sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL TableRows::hasElements()
 {
     throwIfDisposed();
     return mxTableModel->getRowCount() != 0;
diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx
index 10788ff0afea..cdd665d56d9b 100644
--- a/svx/source/table/tablerows.hxx
+++ b/svx/source/table/tablerows.hxx
@@ -36,19 +36,19 @@ public:
 
     void dispose();
     /// @throws css::uno::RuntimeException
-    void throwIfDisposed() const throw (css::uno::RuntimeException);
+    void throwIfDisposed() const;
 
     // XTableRows
-    virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override;
+    virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // Methods
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
 private:
     TableModelRef   mxTableModel;
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 5671bf97ace7..e03176232690 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -37,8 +37,7 @@ public:
     virtual ~NumberingPopup() override;
     virtual void dispose() override;
 
-    virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent )
-        throw ( css::uno::RuntimeException ) override;
+    virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 };
 
 class NumberingToolBoxControl : public svt::PopupWindowController
@@ -50,18 +49,14 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     using svt::ToolboxController::createPopupWindow;
 };
@@ -144,7 +139,6 @@ void NumberingPopup::dispose()
 }
 
 void NumberingPopup::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException )
 {
     mpValueSet->SetNoSelection();
 
@@ -208,7 +202,6 @@ VclPtr<vcl::Window> NumberingToolBoxControl::createPopupWindow( vcl::Window* pPa
 
 
 void SAL_CALL NumberingToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     ToolBox* pToolBox = nullptr;
     sal_uInt16 nId = 0;
@@ -222,7 +215,6 @@ void SAL_CALL NumberingToolBoxControl::statusChanged( const css::frame::FeatureS
 }
 
 void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( aArguments );
 
@@ -239,13 +231,11 @@ void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css
 }
 
 OUString SAL_CALL NumberingToolBoxControl::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.svx.NumberingToolBoxControl" );
 }
 
 css::uno::Sequence< OUString > SAL_CALL NumberingToolBoxControl::getSupportedServiceNames()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     css::uno::Sequence<OUString> aRet { "com.sun.star.frame.ToolbarController" };
     return aRet;
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 4bcb8ce12a9a..0eb00d295c9c 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -160,7 +160,7 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE
 
 void ExtrusionDirectionWindow::statusChanged(
     const css::frame::FeatureStateEvent& Event
-)   throw ( css::uno::RuntimeException )
+)
 {
     if( Event.FeatureURL.Main == g_sExtrusionDirection )
     {
@@ -245,7 +245,6 @@ VclPtr<vcl::Window> ExtrusionDirectionControl::createPopupWindow( vcl::Window* p
 
 // XInitialization
 void SAL_CALL ExtrusionDirectionControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( aArguments );
 
@@ -264,7 +263,7 @@ OUString SAL_CALL ExtrusionDirectionControl_getImplementationName()
 }
 
 
-Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames()
 {
     Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
@@ -273,19 +272,19 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames
 
 Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance(
     const Reference< XMultiServiceFactory >& rSMgr
-)   throw( RuntimeException )
+)
 {
     return *new ExtrusionDirectionControl( comphelper::getComponentContext(rSMgr) );
 }
 
 
-OUString SAL_CALL ExtrusionDirectionControl::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL ExtrusionDirectionControl::getImplementationName(  )
 {
     return ExtrusionDirectionControl_getImplementationName();
 }
 
 
-Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames(  )
 {
     return ExtrusionDirectionControl_getSupportedServiceNames();
 }
@@ -382,7 +381,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
 
 void ExtrusionDepthWindow::statusChanged(
     const css::frame::FeatureStateEvent& Event
-)   throw ( css::uno::RuntimeException, std::exception )
+)
 {
     if( Event.FeatureURL.Main.equals( msExtrusionDepth ) )
     {
@@ -480,7 +479,6 @@ VclPtr<vcl::Window> ExtrusionDepthController::createPopupWindow( vcl::Window* pP
 
 // XInitialization
 void SAL_CALL ExtrusionDepthController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( aArguments );
 
@@ -499,24 +497,24 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName()
 }
 
 
-Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames()
 {
     Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 
-Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr )
 {
     return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) );
 }
 
-OUString SAL_CALL ExtrusionDepthController::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL ExtrusionDepthController::getImplementationName(  )
 {
     return ExtrusionDepthController_getImplementationName();
 }
 
-Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames(  )
 {
     return ExtrusionDepthController_getSupportedServiceNames();
 }
@@ -632,7 +630,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
 
 void ExtrusionLightingWindow::statusChanged(
     const css::frame::FeatureStateEvent& Event
-)   throw ( css::uno::RuntimeException )
+)
 {
     if( Event.FeatureURL.Main == g_sExtrusionLightingIntensity )
     {
@@ -745,7 +743,6 @@ VclPtr<vcl::Window> ExtrusionLightingControl::createPopupWindow( vcl::Window* pP
 
 // XInitialization
 void SAL_CALL ExtrusionLightingControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( aArguments );
 
@@ -764,7 +761,7 @@ OUString SAL_CALL ExtrusionLightingControl_getImplementationName()
 }
 
 
-Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames()
 {
     Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
@@ -773,19 +770,19 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames(
 
 Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance(
     const Reference< XMultiServiceFactory >& rSMgr
-)   throw( RuntimeException )
+)
 {
     return *new ExtrusionLightingControl( comphelper::getComponentContext(rSMgr) );
 }
 
 
-OUString SAL_CALL ExtrusionLightingControl::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL ExtrusionLightingControl::getImplementationName(  )
 {
     return ExtrusionLightingControl_getImplementationName();
 }
 
 
-Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames(  )
 {
     return ExtrusionLightingControl_getSupportedServiceNames();
 }
@@ -825,7 +822,7 @@ void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled )
 
 void ExtrusionSurfaceWindow::statusChanged(
     const css::frame::FeatureStateEvent& Event
-)   throw ( css::uno::RuntimeException )
+)
 {
     if( Event.FeatureURL.Main == g_sExtrusionSurface )
     {
@@ -881,7 +878,6 @@ VclPtr<vcl::Window> ExtrusionSurfaceControl::createPopupWindow( vcl::Window* pPa
 
 // XInitialization
 void SAL_CALL ExtrusionSurfaceControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( aArguments );
 
@@ -900,7 +896,7 @@ OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName()
 }
 
 
-Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames()
 {
     Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
@@ -909,19 +905,19 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames()
 
 Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance(
     const Reference< XMultiServiceFactory >& rSMgr
-)   throw( RuntimeException )
+)
 {
     return *new ExtrusionSurfaceControl( comphelper::getComponentContext(rSMgr) );
 }
 
 
-OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName(  )
 {
     return ExtrusionSurfaceControl_getImplementationName();
 }
 
 
-Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames(  )
 {
     return ExtrusionSurfaceControl_getSupportedServiceNames();
 }
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 9b0f50b5687d..cdd9c6b6c597 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -43,7 +43,7 @@ public:
     virtual ~ExtrusionDirectionWindow() override;
     virtual void dispose() override;
 
-    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override;
+    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override;
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 private:
@@ -72,12 +72,11 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     using svt::PopupWindowController::createPopupWindow;
 };
@@ -108,7 +107,7 @@ private:
 public:
     ExtrusionDepthWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow );
 
-    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 };
 
 class ExtrusionDepthController : public svt::PopupWindowController
@@ -119,12 +118,11 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     using svt::PopupWindowController::createPopupWindow;
 };
@@ -160,7 +158,7 @@ public:
     virtual ~ExtrusionLightingWindow() override;
     virtual void dispose() override;
 
-    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override;
+    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override;
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
 };
 
@@ -173,12 +171,11 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     using svt::PopupWindowController::createPopupWindow;
 };
@@ -201,7 +198,7 @@ private:
 public:
     ExtrusionSurfaceWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow );
 
-    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override;
+    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 };
 
 
@@ -213,12 +210,11 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     using svt::PopupWindowController::createPopupWindow;
 };
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index bc3099f4b5b0..b71e796c3c8d 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -248,7 +248,7 @@ class FontworkAlignmentWindow : public ToolbarMenu
 public:
     FontworkAlignmentWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow );
 
-    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( RuntimeException ) override;
+    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
 private:
     svt::ToolboxController& mrController;
@@ -299,7 +299,7 @@ void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
     }
 }
 
-void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( RuntimeException )
+void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent& Event )
 {
     if( Event.FeatureURL.Main.equals( msFontworkAlignment ) )
     {
@@ -342,12 +342,11 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     using  svt::PopupWindowController::createPopupWindow;
 };
@@ -366,7 +365,6 @@ VclPtr<vcl::Window> FontworkAlignmentControl::createPopupWindow( vcl::Window* pP
 
 // XInitialization
 void SAL_CALL FontworkAlignmentControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( aArguments );
 
@@ -385,26 +383,26 @@ OUString SAL_CALL FontworkAlignmentControl_getImplementationName()
 }
 
 
-Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames()
 {
     Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 
-Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr )
 {
     return *new FontworkAlignmentControl( comphelper::getComponentContext(rSMgr) );
 }
 
 
-OUString SAL_CALL FontworkAlignmentControl::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL FontworkAlignmentControl::getImplementationName(  )
 {
     return FontworkAlignmentControl_getImplementationName();
 }
 
 
-Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames(  )
 {
     return FontworkAlignmentControl_getSupportedServiceNames();
 }
@@ -414,7 +412,7 @@ class FontworkCharacterSpacingWindow : public ToolbarMenu
 public:
     FontworkCharacterSpacingWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow );
 
-    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override;
+    virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 private:
     svt::ToolboxController& mrController;
 
@@ -483,7 +481,7 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool, bool bEnab
 }
 
 
-void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException )
+void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureStateEvent& Event )
 {
     if( Event.FeatureURL.Main.equals( msFontworkCharacterSpacing ) )
     {
@@ -568,12 +566,11 @@ public:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     using svt::PopupWindowController::createPopupWindow;
 };
@@ -592,7 +589,6 @@ VclPtr<vcl::Window> FontworkCharacterSpacingControl::createPopupWindow( vcl::Win
 
 // XInitialization
 void SAL_CALL FontworkCharacterSpacingControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( aArguments );
 
@@ -611,26 +607,26 @@ OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName()
 }
 
 
-Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames()
 {
     Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 
-Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr )
 {
     return *new FontworkCharacterSpacingControl( comphelper::getComponentContext(rSMgr) );
 }
 
 
-OUString SAL_CALL FontworkCharacterSpacingControl::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL FontworkCharacterSpacingControl::getImplementationName(  )
 {
     return FontworkCharacterSpacingControl_getImplementationName();
 }
 
 
-Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames(  )
 {
     return FontworkCharacterSpacingControl_getSupportedServiceNames();
 }
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 53dd837d3a83..9b90df505afa 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -266,7 +266,7 @@ public:
     SvxLineEndWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow );
     virtual ~SvxLineEndWindow() override;
     virtual void dispose() override;
-    virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 };
 
 SvxLineEndWindow::SvxLineEndWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow )
@@ -412,7 +412,6 @@ void SvxLineEndWindow::FillValueSet()
 }
 
 void SvxLineEndWindow::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( rEvent.FeatureURL.Complete == ".uno:LineEndListState" )
     {
@@ -466,11 +465,11 @@ public:
     explicit SvxLineEndToolBoxControl( const css::uno::Reference<css::uno::XComponentContext>& rContext );
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& rArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& rArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
@@ -483,7 +482,6 @@ SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( const css::uno::Reference<cs
 }
 
 void SvxLineEndToolBoxControl::initialize( const css::uno::Sequence<css::uno::Any>& rArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( rArguments );
     ToolBox* pToolBox = nullptr;
@@ -498,13 +496,11 @@ VclPtr<vcl::Window> SvxLineEndToolBoxControl::createPopupWindow( vcl::Window* pP
 }
 
 OUString SvxLineEndToolBoxControl::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.svx.LineEndToolBoxControl" );
 }
 
 css::uno::Sequence<OUString> SvxLineEndToolBoxControl::getSupportedServiceNames()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.frame.ToolbarController" };
 }
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 13db72df34ee..e5a037c4b16d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -272,7 +272,7 @@ public:
     virtual ~SvxFrameWindow_Impl() override;
     virtual void dispose() override;
 
-    virtual void    statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException ) override;
+    virtual void    statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 };
 
@@ -1901,7 +1901,6 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void)
 }
 
 void SvxFrameWindow_Impl::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException )
 {
     if ( rEvent.FeatureURL.Complete == ".uno:BorderReducedMode" )
     {
@@ -2319,7 +2318,6 @@ SvxStyleToolBoxControl::~SvxStyleToolBoxControl()
 }
 
 void SAL_CALL SvxStyleToolBoxControl::initialize( const Sequence< Any >& aArguments )
-throw ( Exception, RuntimeException, std::exception)
 {
     SfxToolBoxControl::initialize( aArguments );
 
@@ -2343,7 +2341,6 @@ throw ( Exception, RuntimeException, std::exception)
 
 // XComponent
 void SAL_CALL SvxStyleToolBoxControl::dispose()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SfxToolBoxControl::dispose();
 
@@ -2369,7 +2366,7 @@ void SAL_CALL SvxStyleToolBoxControl::dispose()
     pImpl.reset();
 }
 
-void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException, std::exception)
+void SAL_CALL SvxStyleToolBoxControl::update()
 {
     // Do nothing, we will start binding our listener when we are visible.
     // See link SvxStyleToolBoxControl::VisibilityNotification.
@@ -2678,18 +2675,18 @@ public:
     SvxFontNameToolBoxControl();
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
     // XToolbarController
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     VclPtr<SvxFontNameBox_Impl> m_pBox;
@@ -2700,7 +2697,6 @@ SvxFontNameToolBoxControl::SvxFontNameToolBoxControl()
 }
 
 void SvxFontNameToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ToolBox* pToolBox = nullptr;
@@ -2729,7 +2725,6 @@ void SvxFontNameToolBoxControl::statusChanged( const css::frame::FeatureStateEve
 }
 
 css::uno::Reference< css::awt::XWindow > SvxFontNameToolBoxControl::createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     m_pBox = VclPtr<SvxFontNameBox_Impl>::Create( VCLUnoHelper::GetWindow( rParent ),
@@ -2739,26 +2734,22 @@ css::uno::Reference< css::awt::XWindow > SvxFontNameToolBoxControl::createItemWi
 }
 
 void SvxFontNameToolBoxControl::dispose()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     m_pBox.disposeAndClear();
     ToolboxController::dispose();
 }
 
 OUString SvxFontNameToolBoxControl::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.svx.FontNameToolBoxControl" );
 }
 
 sal_Bool SvxFontNameToolBoxControl::supportsService( const OUString& rServiceName )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 css::uno::Sequence< OUString > SvxFontNameToolBoxControl::getSupportedServiceNames()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.frame.ToolbarController" };
 }
@@ -2841,7 +2832,6 @@ IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, const NamedColor&, rColor, void)
 }
 
 void SvxColorToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-    throw ( css::uno::RuntimeException, std::exception )
 {
     if ( rEvent.FeatureURL.Complete == m_aCommandURL )
         GetToolBox().EnableItem( GetId(), rEvent.IsEnabled );
@@ -2899,7 +2889,6 @@ void SvxColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
 }
 
 sal_Bool SvxColorToolBoxControl::opensSubToolbar()
-    throw (css::uno::RuntimeException, std::exception)
 {
     // For a split button, we mark this controller as a sub-toolbar controller,
     // so we get notified (through updateImage method) on button image changes,
@@ -2908,7 +2897,6 @@ sal_Bool SvxColorToolBoxControl::opensSubToolbar()
 }
 
 void SvxColorToolBoxControl::updateImage()
-    throw (css::uno::RuntimeException, std::exception)
 {
     Image aImage = GetImage( m_xFrame, m_aCommandURL, hasBigImages() );
     if ( !!aImage )
@@ -2919,13 +2907,11 @@ void SvxColorToolBoxControl::updateImage()
 }
 
 OUString SvxColorToolBoxControl::getSubToolbarName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString();
 }
 
 void SvxColorToolBoxControl::functionSelected( const OUString& /*rCommand*/ )
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -2954,11 +2940,11 @@ public:
     explicit SvxFrameToolBoxControl( const css::uno::Reference< css::uno::XComponentContext >& rContext );
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
@@ -2971,7 +2957,6 @@ SvxFrameToolBoxControl::SvxFrameToolBoxControl( const css::uno::Reference< css::
 }
 
 void SvxFrameToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any >& rArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     svt::PopupWindowController::initialize( rArguments );
     ToolBox* pToolBox = nullptr;
@@ -2989,13 +2974,11 @@ VclPtr<vcl::Window> SvxFrameToolBoxControl::createPopupWindow( vcl::Window* pPar
 }
 
 OUString SvxFrameToolBoxControl::getImplementationName()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.svx.FrameToolBoxControl" );
 }
 
 css::uno::Sequence< OUString > SvxFrameToolBoxControl::getSupportedServiceNames()
-    throw ( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.frame.ToolbarController" };
 }
@@ -3042,7 +3025,6 @@ SvxCurrencyToolBoxControl::SvxCurrencyToolBoxControl( sal_uInt16 nSlotId, sal_uI
 SvxCurrencyToolBoxControl::~SvxCurrencyToolBoxControl() {}
 
 void SvxCurrencyToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any >& rArguments )
-    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
 {
     SfxToolBoxControl::initialize(rArguments);
     if (GetToolBox().GetItemCommand(GetId()) == m_aCommandURL)
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 8ae9fe807bb1..091ede2f2002 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -51,27 +51,27 @@ class FontHeightToolBoxControl : public svt::ToolboxController,
             const css::uno::Reference< css::uno::XComponentContext >& rServiceManager );
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
         virtual void SAL_CALL acquire() throw () override;
         virtual void SAL_CALL release() throw () override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL dispose() override;
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
         // XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
+        virtual void SAL_CALL click() override;
+        virtual void SAL_CALL doubleClick() override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
 
         void dispatchCommand( const css::uno::Sequence< css::beans::PropertyValue >& rArgs );
         using svt::ToolboxController::dispatchCommand;
@@ -273,7 +273,6 @@ FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::X
 
 // XInterface
 css::uno::Any SAL_CALL FontHeightToolBoxControl::queryInterface( const css::uno::Type& aType )
-throw (css::uno::RuntimeException, std::exception)
 {
     uno::Any a = ToolboxController::queryInterface( aType );
     if ( a.hasValue() )
@@ -294,19 +293,16 @@ void SAL_CALL FontHeightToolBoxControl::release() throw ()
 
 // XServiceInfo
 sal_Bool SAL_CALL FontHeightToolBoxControl::supportsService( const OUString& ServiceName )
-throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 OUString SAL_CALL FontHeightToolBoxControl::getImplementationName()
-throw( uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.svx.FontHeightToolBoxController");
 }
 
 uno::Sequence< OUString > SAL_CALL FontHeightToolBoxControl::getSupportedServiceNames(  )
-throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
@@ -314,7 +310,6 @@ throw( uno::RuntimeException, std::exception )
 
 // XComponent
 void SAL_CALL FontHeightToolBoxControl::dispose()
-throw (uno::RuntimeException, std::exception)
 {
     svt::ToolboxController::dispose();
 
@@ -325,7 +320,6 @@ throw (uno::RuntimeException, std::exception)
 // XStatusListener
 void SAL_CALL FontHeightToolBoxControl::statusChanged(
     const frame::FeatureStateEvent& rEvent )
-throw ( uno::RuntimeException, std::exception )
 {
     if ( m_pBox )
     {
@@ -354,29 +348,24 @@ throw ( uno::RuntimeException, std::exception )
 
 // XToolbarController
 void SAL_CALL FontHeightToolBoxControl::execute( sal_Int16 /*KeyModifier*/ )
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL FontHeightToolBoxControl::click()
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL FontHeightToolBoxControl::doubleClick()
-throw (css::uno::RuntimeException, std::exception)
 {
 }
 
 uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createPopupWindow()
-throw (css::uno::RuntimeException, std::exception)
 {
     return uno::Reference< awt::XWindow >();
 }
 
 uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWindow(
     const uno::Reference< awt::XWindow >& xParent )
-    throw (css::uno::RuntimeException, std::exception)
 {
     uno::Reference< awt::XWindow > xItemWindow;
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 673ee775669d..1f55336da921 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -422,26 +422,26 @@ public:
     FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext > & rxContext );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XToolbarController
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
 
     DECL_LINK(EditModifyHdl, Edit&, void);
 
@@ -465,7 +465,7 @@ FindTextToolbarController::FindTextToolbarController( const css::uno::Reference<
 }
 
 // XInterface
-css::uno::Any SAL_CALL FindTextToolbarController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL FindTextToolbarController::queryInterface( const css::uno::Type& aType )
 {
     css::uno::Any a = ToolboxController::queryInterface( aType );
     if ( a.hasValue() )
@@ -485,24 +485,24 @@ void SAL_CALL FindTextToolbarController::release() throw ()
 }
 
 // XServiceInfo
-OUString SAL_CALL FindTextToolbarController::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL FindTextToolbarController::getImplementationName()
 {
     return OUString("com.sun.star.svx.FindTextToolboxController");
 }
 
-sal_Bool SAL_CALL FindTextToolbarController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL FindTextToolbarController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL FindTextToolbarController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL FindTextToolbarController::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 // XComponent
-void SAL_CALL FindTextToolbarController::dispose() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FindTextToolbarController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -517,7 +517,7 @@ void SAL_CALL FindTextToolbarController::dispose() throw ( css::uno::RuntimeExce
 }
 
 // XInitialization
-void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     svt::ToolboxController::initialize(aArguments);
 
@@ -539,7 +539,7 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< c
     SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
 }
 
-css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent )
 {
     css::uno::Reference< css::awt::XWindow > xItemWindow;
 
@@ -560,7 +560,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre
 }
 
 // XStatusListener
-void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
 {
     SolarMutexGuard aSolarMutexGuard;
     if ( m_bDisposed )
@@ -601,26 +601,26 @@ public:
     UpDownSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, Type eType );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XToolbarController
-    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
 private:
     Type meType;
@@ -635,7 +635,7 @@ UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Re
 }
 
 // XInterface
-css::uno::Any SAL_CALL UpDownSearchToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL UpDownSearchToolboxController::queryInterface( const css::uno::Type& aType )
 {
     css::uno::Any a = ToolboxController::queryInterface( aType );
     if ( a.hasValue() )
@@ -655,26 +655,26 @@ void SAL_CALL UpDownSearchToolboxController::release() throw ()
 }
 
 // XServiceInfo
-OUString SAL_CALL UpDownSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL UpDownSearchToolboxController::getImplementationName()
 {
     return meType == UpDownSearchToolboxController::UP?
         OUString( "com.sun.star.svx.UpSearchToolboxController" ) :
         OUString( "com.sun.star.svx.DownSearchToolboxController" );
 }
 
-sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL UpDownSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL UpDownSearchToolboxController::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 // XComponent
-void SAL_CALL UpDownSearchToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL UpDownSearchToolboxController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -684,14 +684,14 @@ void SAL_CALL UpDownSearchToolboxController::dispose() throw ( css::uno::Runtime
 }
 
 // XInitialization
-void SAL_CALL UpDownSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+void SAL_CALL UpDownSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     svt::ToolboxController::initialize( aArguments );
     SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
 }
 
 // XToolbarController
-void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
 {
     if ( m_bDisposed )
         throw css::lang::DisposedException();
@@ -709,7 +709,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/
 }
 
 // XStatusListener
-void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ )
 {
 }
 
@@ -720,26 +720,26 @@ public:
     MatchCaseToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XToolbarController
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
 private:
     VclPtr<CheckBox> m_pMatchCaseControl;
@@ -754,7 +754,7 @@ MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Referenc
 }
 
 // XInterface
-css::uno::Any SAL_CALL MatchCaseToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL MatchCaseToolboxController::queryInterface( const css::uno::Type& aType )
 {
     css::uno::Any a = ToolboxController::queryInterface( aType );
     if ( a.hasValue() )
@@ -774,24 +774,24 @@ void SAL_CALL MatchCaseToolboxController::release() throw ()
 }
 
 // XServiceInfo
-OUString SAL_CALL MatchCaseToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL MatchCaseToolboxController::getImplementationName()
 {
     return OUString( "com.sun.star.svx.MatchCaseToolboxController" );
 }
 
-sal_Bool SAL_CALL MatchCaseToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL MatchCaseToolboxController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL MatchCaseToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL MatchCaseToolboxController::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 // XComponent
-void SAL_CALL MatchCaseToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL MatchCaseToolboxController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -803,14 +803,14 @@ void SAL_CALL MatchCaseToolboxController::dispose() throw ( css::uno::RuntimeExc
 }
 
 // XInitialization
-void SAL_CALL MatchCaseToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL MatchCaseToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     svt::ToolboxController::initialize(aArguments);
 
     SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
 }
 
-css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent )
 {
     css::uno::Reference< css::awt::XWindow > xItemWindow;
 
@@ -829,7 +829,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::cr
 }
 
 // XStatusListener
-void SAL_CALL MatchCaseToolboxController::statusChanged( const css::frame::FeatureStateEvent& ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL MatchCaseToolboxController::statusChanged( const css::frame::FeatureStateEvent& )
 {
 }
 
@@ -840,26 +840,26 @@ public:
     SearchFormattedToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XToolbarController
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 
 private:
     VclPtr<CheckBox> m_pSearchFormattedControl;
@@ -874,7 +874,7 @@ SearchFormattedToolboxController::SearchFormattedToolboxController( const css::u
 }
 
 // XInterface
-css::uno::Any SAL_CALL SearchFormattedToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL SearchFormattedToolboxController::queryInterface( const css::uno::Type& aType )
 {
     css::uno::Any a = ToolboxController::queryInterface( aType );
     if ( a.hasValue() )
@@ -894,24 +894,24 @@ void SAL_CALL SearchFormattedToolboxController::release() throw ()
 }
 
 // XServiceInfo
-OUString SAL_CALL SearchFormattedToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SearchFormattedToolboxController::getImplementationName()
 {
     return OUString( "com.sun.star.svx.SearchFormattedToolboxController" );
 }
 
-sal_Bool SAL_CALL SearchFormattedToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SearchFormattedToolboxController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL SearchFormattedToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL SearchFormattedToolboxController::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 // XComponent
-void SAL_CALL SearchFormattedToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SearchFormattedToolboxController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -923,14 +923,14 @@ void SAL_CALL SearchFormattedToolboxController::dispose() throw ( css::uno::Runt
 }
 
 // XInitialization
-void SAL_CALL SearchFormattedToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL SearchFormattedToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     svt::ToolboxController::initialize(aArguments);
 
     SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
 }
 
-css::uno::Reference< css::awt::XWindow > SAL_CALL SearchFormattedToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL SearchFormattedToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent )
 {
     css::uno::Reference< css::awt::XWindow > xItemWindow;
 
@@ -949,7 +949,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL SearchFormattedToolboxControll
 }
 
 // XStatusListener
-void SAL_CALL SearchFormattedToolboxController::statusChanged( const css::frame::FeatureStateEvent& ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SearchFormattedToolboxController::statusChanged( const css::frame::FeatureStateEvent& )
 {
 }
 
@@ -960,26 +960,26 @@ public:
     FindAllToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XToolbarController
-    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 };
 
 FindAllToolboxController::FindAllToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext )
@@ -990,7 +990,7 @@ FindAllToolboxController::FindAllToolboxController( const css::uno::Reference< c
 }
 
 // XInterface
-css::uno::Any SAL_CALL FindAllToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL FindAllToolboxController::queryInterface( const css::uno::Type& aType )
 {
     css::uno::Any a = ToolboxController::queryInterface( aType );
     if ( a.hasValue() )
@@ -1010,25 +1010,25 @@ void SAL_CALL FindAllToolboxController::release() throw ()
 }
 
 // XServiceInfo
-OUString SAL_CALL FindAllToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL FindAllToolboxController::getImplementationName()
 {
     return OUString( "com.sun.star.svx.FindAllToolboxController" );
 }
 
 
-sal_Bool SAL_CALL FindAllToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL FindAllToolboxController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL FindAllToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL FindAllToolboxController::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 // XComponent
-void SAL_CALL FindAllToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FindAllToolboxController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -1038,14 +1038,14 @@ void SAL_CALL FindAllToolboxController::dispose() throw ( css::uno::RuntimeExcep
 }
 
 // XInitialization
-void SAL_CALL FindAllToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+void SAL_CALL FindAllToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     svt::ToolboxController::initialize( aArguments );
     SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
 }
 
 // XToolbarController
-void SAL_CALL FindAllToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FindAllToolboxController::execute( sal_Int16 /*KeyModifier*/ )
 {
     if ( m_bDisposed )
         throw css::lang::DisposedException();
@@ -1057,7 +1057,7 @@ void SAL_CALL FindAllToolboxController::execute( sal_Int16 /*KeyModifier*/ ) thr
 }
 
 // XStatusListener
-void SAL_CALL FindAllToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FindAllToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ )
 {
 }
 
@@ -1068,26 +1068,26 @@ public:
     ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XToolbarController
-    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 };
 
 ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext )
@@ -1098,7 +1098,7 @@ ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Refere
 }
 
 // XInterface
-css::uno::Any SAL_CALL ExitSearchToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL ExitSearchToolboxController::queryInterface( const css::uno::Type& aType )
 {
     css::uno::Any a = ToolboxController::queryInterface( aType );
     if ( a.hasValue() )
@@ -1118,25 +1118,25 @@ void SAL_CALL ExitSearchToolboxController::release() throw ()
 }
 
 // XServiceInfo
-OUString SAL_CALL ExitSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL ExitSearchToolboxController::getImplementationName()
 {
     return OUString( "com.sun.star.svx.ExitFindbarToolboxController" );
 }
 
 
-sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL ExitSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL ExitSearchToolboxController::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 // XComponent
-void SAL_CALL ExitSearchToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL ExitSearchToolboxController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -1146,14 +1146,14 @@ void SAL_CALL ExitSearchToolboxController::dispose() throw ( css::uno::RuntimeEx
 }
 
 // XInitialization
-void SAL_CALL ExitSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+void SAL_CALL ExitSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     svt::ToolboxController::initialize( aArguments );
     SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
 }
 
 // XToolbarController
-void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
 {
     vcl::Window *pFocusWindow = Application::GetFocusWindow();
     if ( pFocusWindow )
@@ -1176,7 +1176,7 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
 }
 
 // XStatusListener
-void SAL_CALL ExitSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL ExitSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ )
 {
 }
 
@@ -1187,26 +1187,26 @@ public:
     SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XToolbarController
-    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
 };
 
 SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext )
@@ -1217,7 +1217,7 @@ SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Refe
 }
 
 // XInterface
-css::uno::Any SAL_CALL SearchLabelToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL SearchLabelToolboxController::queryInterface( const css::uno::Type& aType )
 {
     css::uno::Any a = ToolboxController::queryInterface( aType );
     if ( a.hasValue() )
@@ -1237,25 +1237,25 @@ void SAL_CALL SearchLabelToolboxController::release() throw ()
 }
 
 // XServiceInfo
-OUString SAL_CALL SearchLabelToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SearchLabelToolboxController::getImplementationName()
 {
     return OUString( "com.sun.star.svx.SearchLabelToolboxController" );
 }
 
 
-sal_Bool SAL_CALL SearchLabelToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SearchLabelToolboxController::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL SearchLabelToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL SearchLabelToolboxController::getSupportedServiceNames()
 {
     css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" };
     return aSNS;
 }
 
 // XComponent
-void SAL_CALL SearchLabelToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SearchLabelToolboxController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -1265,18 +1265,18 @@ void SAL_CALL SearchLabelToolboxController::dispose() throw ( css::uno::RuntimeE
 }
 
 // XInitialization
-void SAL_CALL SearchLabelToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+void SAL_CALL SearchLabelToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     svt::ToolboxController::initialize( aArguments );
     SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
 }
 
 // XStatusListener
-void SAL_CALL SearchLabelToolboxController::statusChanged( const css::frame::FeatureStateEvent& ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL SearchLabelToolboxController::statusChanged( const css::frame::FeatureStateEvent& )
 {
 }
 
-css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent )
 {
     VclPtr<vcl::Window> pSL = VclPtr<FixedText>::Create(VCLUnoHelper::GetWindow( Parent ));
     pSL->SetSizePixel(Size(250, 25));
@@ -1297,26 +1297,26 @@ public:
     virtual ~FindbarDispatcher() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XDispatchProvider
-    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions    ) override;
 
     // XDispatch
-    virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, 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 >& lArguments ) override;
+    virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) override;
+    virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) override;
 
 private:
 
@@ -1334,7 +1334,7 @@ FindbarDispatcher::~FindbarDispatcher()
 }
 
 // XInterface
-css::uno::Any SAL_CALL FindbarDispatcher::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL FindbarDispatcher::queryInterface( const css::uno::Type& aType )
 {
     css::uno::Any aReturn( ::cppu::queryInterface( aType,
         static_cast< css::lang::XServiceInfo* >(this),
@@ -1359,17 +1359,17 @@ void SAL_CALL FindbarDispatcher::release() throw()
 }
 
 // XServiceInfo
-OUString SAL_CALL FindbarDispatcher::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL FindbarDispatcher::getImplementationName()
 {
     return OUString("com.sun.star.comp.svx.Impl.FindbarDispatcher");
 }
 
-sal_Bool SAL_CALL FindbarDispatcher::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL FindbarDispatcher::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames()
 {
     css::uno::Sequence< OUString > aSNS( 2 );
     aSNS[0] = "com.sun.star.comp.svx.FindbarDispatcher";
@@ -1378,14 +1378,14 @@ css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNa
 }
 
 // XInitialization
-void SAL_CALL FindbarDispatcher::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+void SAL_CALL FindbarDispatcher::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     if ( aArguments.getLength() )
         aArguments[0] >>= m_xFrame;
 }
 
 // XDispatchProvider
-css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ )
 {
     css::uno::Reference< css::frame::XDispatch > xDispatch;
 
@@ -1395,7 +1395,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDi
     return xDispatch;
 }
 
-css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL FindbarDispatcher::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL FindbarDispatcher::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts )
 {
     sal_Int32 nCount = seqDescripts.getLength();
     css::uno::Sequence < css::uno::Reference < XDispatch > > lDispatcher( nCount );
@@ -1407,7 +1407,7 @@ css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fin
 }
 
 // XDispatch
-void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ )
 {
     //vnd.sun.star.findbar:FocusToFindbar  - set cursor to the FindTextFieldControl of the findbar
     if ( aURL.Path == "FocusToFindbar" )
@@ -1461,11 +1461,11 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
     }
 }
 
-void SAL_CALL FindbarDispatcher::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FindbarDispatcher::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ )
 {
 }
 
-void SAL_CALL FindbarDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FindbarDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ )
 {
 }
 
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 432e5ec1aefa..2cf2197108c3 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -46,7 +46,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx
     rTbx.Invalidate();
 }
 
-void SAL_CALL SvxTbxCtlDraw::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxTbxCtlDraw::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     svt::ToolboxController::initialize(aArguments);
     /*
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 39f6079c8fe3..3e4eacd4186a 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -62,7 +62,7 @@ void ChineseTranslation_UnoDialog::impl_DeleteDialog()
 }
 
 // lang::XServiceInfo
-OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName()
 {
     return getImplementationName_Static();
 }
@@ -72,12 +72,12 @@ OUString ChineseTranslation_UnoDialog::getImplementationName_Static()
     return OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog");
 }
 
-sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedServiceNames()
 {
     return getSupportedServiceNames_Static();
 }
@@ -89,13 +89,13 @@ uno::Sequence< OUString > ChineseTranslation_UnoDialog::getSupportedServiceNames
 }
 
 // ui::dialogs::XExecutableDialog
-void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const OUString& ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const OUString& )
 {
     //not implemented - fell free to do so, if you do need this
 }
 
 
-void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno::Any >& aArguments )
 {
     SolarMutexGuard aSolarGuard;
     if( m_bDisposed || m_bInDispose )
@@ -116,7 +116,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno
 }
 
 
-sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute()
 {
     sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
     {
@@ -148,7 +148,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc
 
 // lang::XComponent
 
-void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::dispose()
 {
     lang::EventObject aEvt;
     {
@@ -167,7 +167,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeExcepti
         m_aDisposeEventListeners.disposeAndClear( aEvt );
 }
 
-void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Reference< lang::XEventListener > & xListener )
 {
     SolarMutexGuard aSolarGuard;
     if( m_bDisposed || m_bInDispose )
@@ -175,7 +175,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Referen
     m_aDisposeEventListeners.addInterface( xListener );
 }
 
-void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Reference< lang::XEventListener > & xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Reference< lang::XEventListener > & xListener )
 {
     SolarMutexGuard aSolarGuard;
     if( m_bDisposed || m_bInDispose )
@@ -186,16 +186,16 @@ void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Refe
 
 // XPropertySet
 
-uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog::getPropertySetInfo(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog::getPropertySetInfo(  )
 {
     return nullptr;
 }
-void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const OUString&, const uno::Any& )
 {
     //only read only properties
     throw beans::PropertyVetoException();
 }
-uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString& rPropertyName )
 {
     uno::Any aRet;
 
@@ -229,19 +229,19 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString
     return aRet;
 
 }
-void SAL_CALL ChineseTranslation_UnoDialog::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  )
 {
     //only not bound properties -> ignore listener
 }
-void SAL_CALL ChineseTranslation_UnoDialog::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >&  )
 {
     //only not bound properties -> ignore listener
 }
-void SAL_CALL ChineseTranslation_UnoDialog::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  )
 {
     //only not bound properties -> ignore listener
 }
-void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >&  )
 {
     //only not bound properties -> ignore listener
 }
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index a65fc2e889de..b0e81e2ba8c6 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -72,40 +72,40 @@ public:
     virtual ~ChineseTranslation_UnoDialog() override;
 
     // lang::XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     /// @throws css::uno::Exception
     static css::uno::Reference< css::uno::XInterface > SAL_CALL
-            create( css::uno::Reference< css::uno::XComponentContext > const & ) throw(css::uno::Exception)
+            create( css::uno::Reference< css::uno::XComponentContext > const & )
     {
         return static_cast<cppu::OWeakObject *>( new ChineseTranslation_UnoDialog );
     }
 
     // lang::XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // ui::dialogs::XExecutableDialog
-    virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+    virtual sal_Int16 SAL_CALL execute(  ) override;
 
     // beans::XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // lang::XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
 
 private:
 
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 3e0e40f4fced..58fd9c773561 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -142,20 +142,20 @@ namespace {
         GraphicExporter();
 
         // XFilter
-        virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancel(  ) throw(RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) override;
+        virtual void SAL_CALL cancel(  ) override;
 
         // XExporter
-        virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override;
+        virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XMimeTypeInfo
-        virtual sal_Bool SAL_CALL supportsMimeType( const OUString& MimeTypeName ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames(  ) throw (RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsMimeType( const OUString& MimeTypeName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames(  ) override;
 
         VclPtr<VirtualDevice> CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const;
 
@@ -990,7 +990,6 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
 
 // XFilter
 sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDescriptor )
-    throw(RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1071,7 +1070,6 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
 }
 
 void SAL_CALL GraphicExporter::cancel()
-    throw(RuntimeException, std::exception)
 {
 }
 
@@ -1079,7 +1077,6 @@ void SAL_CALL GraphicExporter::cancel()
 
 /** the source 'document' could be a XDrawPage, a XShape or a generic XShapes */
 void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XComponent >& xComponent )
-    throw(IllegalArgumentException, RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1186,26 +1183,23 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon
 
 // XServiceInfo
 OUString SAL_CALL GraphicExporter::getImplementationName(  )
-    throw(RuntimeException, std::exception)
 {
     return OUString( "com.sun.star.comp.Draw.GraphicExporter" );
 }
 
 sal_Bool SAL_CALL GraphicExporter::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL GraphicExporter::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     Sequence< OUString > aSupportedServiceNames { "com.sun.star.drawing.GraphicExportFilter" };
     return aSupportedServiceNames;
 }
 
 // XMimeTypeInfo
-sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeName )
 {
     GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
     sal_uInt16 nCount = rFilter.GetExportFormatCount();
@@ -1221,7 +1215,7 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeNa
     return false;
 }
 
-Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames(  )
 {
     GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
     sal_uInt16 nCount = rFilter.GetExportFormatCount();
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index cf6e850cdb57..4d38ba0961a3 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -73,7 +73,7 @@ void SvxUnoNameItemTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw(
         dispose();
 }
 
-sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const  OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const  OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -91,7 +91,6 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons
 
 // XNameContainer
 void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const uno::Any& aElement )
-    throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -105,7 +104,6 @@ void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const
 
 
 void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -140,7 +138,6 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
 
 // XNameReplace
 void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, const uno::Any& aElement )
-    throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -192,7 +189,6 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
 
 // XNameAccess
 uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName )
-    throw( container::NoSuchElementException,  lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -221,7 +217,6 @@ uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName )
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames(  )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -245,7 +240,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames(  )
 }
 
 sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -269,7 +263,6 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName )
 }
 
 sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements(  )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 8cd21000a3c0..53d7355cf408 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -63,22 +63,22 @@ public:
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override;
 
     // XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService( const  OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const  OUString& ServiceName ) override;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const  OUString& aName, const  css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const  OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const  OUString& aName, const  css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const  OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const  OUString& aName, const  css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const  OUString& aName, const  css::uno::Any& aElement ) override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const  OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<  OUString > SAL_CALL getElementNames(  ) throw( css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const  OUString& aName ) override;
+    virtual css::uno::Sequence<  OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) override;
 
     // XElementAccess
-    virtual sal_Bool SAL_CALL hasElements(  ) throw( css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 };
 
 #endif // INCLUDED_SVX_SOURCE_UNODRAW_UNONAMEITEMTABLE_HXX
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 548865e0d01a..5cbbe59fba18 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -57,18 +57,18 @@ namespace svx
         NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool );
 
         // XNameAccess
-        virtual Any SAL_CALL getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getElementNames(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException, std::exception) override;
+        virtual Any SAL_CALL getByName( const OUString& aName ) override;
+        virtual Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
         // XElementAccess
-        virtual Type SAL_CALL getElementType(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException, std::exception) override;
+        virtual Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     };
 
     Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool )
@@ -186,7 +186,7 @@ NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool )
 }
 
 // XNameAccess
-Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL NamespaceMap::getByName( const OUString& aName )
 {
     NamespaceIteratorImpl aIter( mpWhichIds, mpPool );
 
@@ -207,7 +207,7 @@ Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchEleme
     return makeAny( aURL );
 }
 
-Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL NamespaceMap::getElementNames()
 {
     NamespaceIteratorImpl aIter( mpWhichIds, mpPool );
 
@@ -222,7 +222,7 @@ Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeExce
     return comphelper::containerToSequence(aPrefixSet);
 }
 
-sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName )
 {
     NamespaceIteratorImpl aIter( mpWhichIds, mpPool );
 
@@ -241,12 +241,12 @@ sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (Runtim
 }
 
 // XElementAccess
-Type SAL_CALL NamespaceMap::getElementType() throw (RuntimeException, std::exception)
+Type SAL_CALL NamespaceMap::getElementType()
 {
     return ::cppu::UnoType<OUString>::get();
 }
 
-sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL NamespaceMap::hasElements()
 {
     NamespaceIteratorImpl aIter( mpWhichIds, mpPool );
 
@@ -258,19 +258,16 @@ sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException, std::exce
 
 // XServiceInfo
 OUString SAL_CALL NamespaceMap::getImplementationName(  )
-    throw(RuntimeException, std::exception)
 {
     return NamespaceMap_getImplementationName();
 }
 
 sal_Bool SAL_CALL NamespaceMap::supportsService( const OUString& serviceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService( this, serviceName );
 }
 
 Sequence< OUString > SAL_CALL NamespaceMap::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     return NamespaceMap_getSupportedServiceNames();
 }
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 60758c01d382..7dbd98693f8a 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -54,28 +54,28 @@ public:
     SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw();
 
     /// @throws uno::RuntimeException
-    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) = 0;
+    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const = 0;
     /// @throws uno::RuntimeException
     /// @throws lang::IllegalArgumentException
-    virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException, lang::IllegalArgumentException) = 0;
+    virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const = 0;
 
     // XServiceInfo
-    virtual sal_Bool SAL_CALL supportsService( const  OUString& ServiceName ) throw( uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const  OUString& ServiceName ) override;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const  OUString& aName, const  uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const  OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const  OUString& aName, const  uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const  OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const  OUString& aName, const  uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const  OUString& aName, const  uno::Any& aElement ) override;
 
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const  OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence<  OUString > SAL_CALL getElementNames(  ) throw( uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const  OUString& aName ) override;
+    virtual uno::Sequence<  OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) override;
 
     // XElementAccess
-    virtual sal_Bool SAL_CALL hasElements(  ) throw( uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 };
 
 SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw()
@@ -93,14 +93,12 @@ const XPropertyEntry* SvxUnoXPropertyTable::get(long index) const
 
 // XServiceInfo
 sal_Bool SAL_CALL SvxUnoXPropertyTable::supportsService( const  OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XNameContainer
 void SAL_CALL SvxUnoXPropertyTable::insertByName( const  OUString& aName, const  uno::Any& aElement )
-    throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -120,7 +118,6 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const  OUString& aName, const
 }
 
 void SAL_CALL SvxUnoXPropertyTable::removeByName( const  OUString& Name )
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -143,7 +140,6 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const  OUString& Name )
 
 // XNameReplace
 void SAL_CALL SvxUnoXPropertyTable::replaceByName( const  OUString& aName, const  uno::Any& aElement )
-    throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -170,7 +166,6 @@ void SAL_CALL SvxUnoXPropertyTable::replaceByName( const  OUString& aName, const
 
 // XNameAccess
 uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const  OUString& aName )
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -190,7 +185,6 @@ uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const  OUString& aName )
 }
 
 uno::Sequence<  OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames()
-    throw( uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -210,7 +204,6 @@ uno::Sequence<  OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames()
 }
 
 sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const  OUString& aName )
-    throw( uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -230,7 +223,6 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const  OUString& aName )
 
 // XElementAccess
 sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements(  )
-    throw( uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -248,11 +240,11 @@ public:
     virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Type SAL_CALL getElementType() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw()
@@ -278,18 +270,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXColorTable::createEntry(const OUString& r
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoXColorTable::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return ::cppu::UnoType<sal_Int32>::get();
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxUnoXColorTable::getImplementationName(  ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXColorTable::getImplementationName(  )
 {
     return OUString( "SvxUnoXColorTable" );
 }
 
-uno::Sequence<  OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames(  ) throw( uno::RuntimeException, std::exception)
+uno::Sequence<  OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames(  )
 {
     const OUString aServiceName( "com.sun.star.drawing.ColorTable" );
     uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -304,14 +295,14 @@ public:
 
     // SvxUnoXPropertyTable
     virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() override;
-    virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(lang::IllegalArgumentException) override;
+    virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Type SAL_CALL getElementType() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw()
@@ -328,7 +319,7 @@ uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw
     return uno::Any(aBezier);
 }
 
-std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& rName, const uno::Any& rAny) const throw(lang::IllegalArgumentException)
+std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& rName, const uno::Any& rAny) const
 {
     auto pCoords = o3tl::tryAccess<drawing::PolyPolygonBezierCoords>(rAny);
     if( !pCoords )
@@ -346,18 +337,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString&
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<drawing::PolyPolygonBezierCoords>::get();
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName(  ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName(  )
 {
     return OUString( "SvxUnoXLineEndTable" );
 }
 
-uno::Sequence<  OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames(  ) throw( uno::RuntimeException, std::exception)
+uno::Sequence<  OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames(  )
 {
     const OUString aServiceName( "com.sun.star.drawing.LineEndTable" );
     uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -375,11 +365,11 @@ public:
     virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Type SAL_CALL getElementType() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw()
@@ -424,18 +414,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXDashTable::createEntry(const OUString& rN
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoXDashTable::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<drawing::LineDash>::get();
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxUnoXDashTable::getImplementationName(  ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXDashTable::getImplementationName(  )
 {
     return OUString( "SvxUnoXDashTable" );
 }
 
-uno::Sequence<  OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames(  ) throw( uno::RuntimeException, std::exception)
+uno::Sequence<  OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames(  )
 {
     const OUString aServiceName( "com.sun.star.drawing.DashTable" );
     uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -453,11 +442,11 @@ public:
     virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Type SAL_CALL getElementType() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw()
@@ -497,18 +486,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXHatchTable::createEntry(const OUString& r
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoXHatchTable::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<drawing::Hatch>::get();
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxUnoXHatchTable::getImplementationName(  ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXHatchTable::getImplementationName(  )
 {
     return OUString( "SvxUnoXHatchTable" );
 }
 
-uno::Sequence<  OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames(  ) throw( uno::RuntimeException, std::exception)
+uno::Sequence<  OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames(  )
 {
     const OUString aServiceName( "com.sun.star.drawing.HatchTable" );
     uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -526,11 +514,11 @@ public:
     virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Type SAL_CALL getElementType() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw()
@@ -582,18 +570,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXGradientTable::createEntry(const OUString
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoXGradientTable::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<awt::Gradient>::get();
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxUnoXGradientTable::getImplementationName(  ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXGradientTable::getImplementationName(  )
 {
     return OUString( "SvxUnoXGradientTable" );
 }
 
-uno::Sequence<  OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames(  ) throw( uno::RuntimeException, std::exception)
+uno::Sequence<  OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames(  )
 {
     const OUString aServiceName( "com.sun.star.drawing.GradientTable" );
     uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -607,15 +594,15 @@ public:
     explicit SvxUnoXBitmapTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_FILLBITMAP, pTable ) {};
 
     // SvxUnoXPropertyTable
-    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) override;
-    virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException) override;
+    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const override;
+    virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Type SAL_CALL getElementType() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw()
@@ -624,7 +611,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XP
 }
 
 // SvxUnoXPropertyTable
-uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException)
+uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const
 {
     OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX);
     const GraphicObject& rGraphicObject(static_cast<const XBitmapEntry*>(pEntry)->GetGraphicObject());
@@ -633,7 +620,7 @@ uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw(
     return uno::Any(aURL);
 }
 
-std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException)
+std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& rName, const uno::Any& rAny) const
 {
     OUString aURL;
     if(!(rAny >>= aURL))
@@ -646,18 +633,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString&
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return ::cppu::UnoType<OUString>::get();
 }
 
 // XServiceInfo
-OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName(  ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName(  )
 {
     return OUString( "SvxUnoXBitmapTable" );
 }
 
-uno::Sequence<  OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames(  ) throw( uno::RuntimeException, std::exception)
+uno::Sequence<  OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames(  )
 {
     const OUString aServiceName( "com.sun.star.drawing.BitmapTable" );
     uno::Sequence< OUString > aServices( &aServiceName, 1 );
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index 150d5beafa34..9f2953b2f039 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -44,33 +44,33 @@ public:
     explicit SvxUnoGluePointAccess( SdrObject* pObject ) throw();
 
     // XIdentifierContainer
-    virtual sal_Int32 SAL_CALL insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL insert( const uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByIdentifier( sal_Int32 Identifier ) override;
 
     // XIdentifierReplace
-    virtual void SAL_CALL replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) override;
 
     // XIdentifierReplace
-    virtual uno::Any SAL_CALL getByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< sal_Int32 > SAL_CALL getIdentifiers(  ) throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByIdentifier( sal_Int32 Identifier ) override;
+    virtual uno::Sequence< sal_Int32 > SAL_CALL getIdentifiers(  ) override;
 
     /* deprecated */
     // XIndexContainer
-    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const uno::Any& Element ) throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByIndex( sal_Int32 Index, const uno::Any& Element ) override;
+    virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override;
 
     /* deprecated */
     // XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const uno::Any& Element ) throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const uno::Any& Element ) override;
 
     /* deprecated */
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw( uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 };
 
 static void convert( const SdrGluePoint& rSdrGlue, drawing::GluePoint2& rUnoGlue ) throw()
@@ -196,7 +196,7 @@ SvxUnoGluePointAccess::SvxUnoGluePointAccess( SdrObject* pObject ) throw()
 }
 
 // XIdentifierContainer
-sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement )
 {
     if( mpObject.is() )
     {
@@ -226,7 +226,7 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) thr
     return -1;
 }
 
-void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier )
 {
     if( mpObject.is() && ( Identifier >= NON_USER_DEFINED_GLUE_POINTS ))
     {
@@ -255,7 +255,7 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier )
 }
 
 // XIdentifierReplace
-void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement )
 {
     if( mpObject.is() && mpObject->IsNode() )
     {
@@ -289,7 +289,7 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, c
 }
 
 // XIdentifierAccess
-uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier )
 {
     if( mpObject.is() && mpObject->IsNode() )
     {
@@ -329,7 +329,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier )
     throw container::NoSuchElementException();
 }
 
-uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() throw (uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers()
 {
     if( mpObject.is() )
     {
@@ -360,8 +360,6 @@ uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() thro
 
 // XIndexContainer
 void SAL_CALL SvxUnoGluePointAccess::insertByIndex( sal_Int32, const uno::Any& Element )
-    throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
-            lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( mpObject.is() )
     {
@@ -391,7 +389,6 @@ void SAL_CALL SvxUnoGluePointAccess::insertByIndex( sal_Int32, const uno::Any& E
 }
 
 void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( mpObject.is() )
     {
@@ -417,8 +414,6 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index )
 
 // XIndexReplace
 void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno::Any& Element )
-    throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     drawing::GluePoint2 aUnoGlue;
     if(!(Element >>= aUnoGlue))
@@ -444,7 +439,6 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno:
 
 // XIndexAccess
 sal_Int32 SAL_CALL SvxUnoGluePointAccess::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     sal_Int32 nCount = 0;
     if( mpObject.is() )
@@ -465,7 +459,6 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::getCount()
 }
 
 uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( Index >= 0 && mpObject.is() && mpObject->IsNode() )
     {
@@ -497,13 +490,11 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoGluePointAccess::getElementType()
-    throw( uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<drawing::GluePoint2>::get();
 }
 
 sal_Bool SAL_CALL SvxUnoGluePointAccess::hasElements()
-    throw( uno::RuntimeException, std::exception)
 {
     return mpObject.is() && mpObject->IsNode();
 }
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 90ab28488885..261676b8f4a9 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -80,19 +80,15 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo
 
         // css.lang.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(const OUString& sServiceName)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) 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::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL,
-                                            const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
-            throw(css::uno::RuntimeException, std::exception) override;
+                                            const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
 
 
     // helper
@@ -116,19 +112,16 @@ RecoveryUI::RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >&
 }
 
 OUString SAL_CALL RecoveryUI::getImplementationName()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.svx.RecoveryUI");
 }
 
 sal_Bool SAL_CALL RecoveryUI::supportsService(const OUString& sServiceName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 css::uno::Sequence< OUString > SAL_CALL RecoveryUI::getSupportedServiceNames()
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > lServiceNames { "com.sun.star.dialog.RecoveryUI" };
     return lServiceNames;
@@ -136,7 +129,6 @@ css::uno::Sequence< OUString > SAL_CALL RecoveryUI::getSupportedServiceNames()
 
 css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL& aURL,
                                                    const css::uno::Sequence< css::beans::PropertyValue >& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     // Internally we use VCL ... every call into vcl based code must
     // be guarded by locking the global solar mutex.
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index 7bf166292691..a78b6cc13dee 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -30,17 +30,17 @@ class SvxPluginShape : public SvxOle2Shape
 {
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
 public:
     explicit SvxPluginShape( SdrObject* pObj ) throw();
     virtual ~SvxPluginShape() throw() override;
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
     using SvxUnoTextRangeBase::setPropertyValue;
 
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
 
     virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
 };
@@ -48,17 +48,17 @@ class SvxAppletShape : public SvxOle2Shape
 {
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
 public:
     explicit SvxAppletShape( SdrObject* pObj ) throw();
     virtual ~SvxAppletShape() throw() override;
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
     using SvxUnoTextRangeBase::setPropertyValue;
 
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
 
     virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
 };
@@ -66,24 +66,20 @@ class SvxFrameShape : public SvxOle2Shape
 {
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
     virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty,
-        css::uno::Any& rValue)
-            throw (css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException,
-                   std::exception) override;
+        css::uno::Any& rValue) override;
 
 public:
     explicit SvxFrameShape( SdrObject* pObj ) throw();
     virtual ~SvxFrameShape() throw() override;
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
     using SvxUnoTextRangeBase::setPropertyValue;
 
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
 
-    virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
 };
 
 
@@ -91,8 +87,8 @@ class SvxTableShape : public SvxShape
 {
 protected:
     // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
+    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
     virtual void lock() override;
     virtual void unlock() override;
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index fcf589cb545d..aa31209b4144 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -49,7 +49,6 @@ bool SvxTableShape::setPropertyValueImpl(
     const OUString& rName,
     const SfxItemPropertySimpleEntry* pProperty,
     const css::uno::Any& rValue )
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     switch( pProperty->nWID )
     {
@@ -102,7 +101,6 @@ bool SvxTableShape::getPropertyValueImpl(
     const OUString& rName,
     const SfxItemPropertySimpleEntry* pProperty,
     css::uno::Any& rValue )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     switch( pProperty->nWID )
     {
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 388c2e49c974..5cb461772193 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -44,11 +44,11 @@ public:
     virtual bool isValid( const NameOrIndex* pItem ) const override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType(  ) override;
 };
 
 SvxUnoBitmapTable::SvxUnoBitmapTable( SdrModel* pModel ) throw()
@@ -72,13 +72,12 @@ bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const
     return false;
 }
 
-OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoBitmapTable::getImplementationName()
 {
     return OUString("SvxUnoBitmapTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames(  )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.drawing.BitmapTable" };
     return aSNS;
@@ -91,7 +90,6 @@ NameOrIndex* SvxUnoBitmapTable::createItem() const throw()
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoBitmapTable::getElementType(  )
-    throw( uno::RuntimeException, std::exception )
 {
     return ::cppu::UnoType<OUString>::get();
 }
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 11bb724ef4b3..d97d081430ea 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -40,27 +40,27 @@ public:
     SvxUnoColorTable();
 
     // 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;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const  OUString& aName, const  uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const  OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const  OUString& aName, const  uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const  OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const  OUString& aName, const  uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const  OUString& aName, const  uno::Any& aElement ) override;
 
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const  OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const  OUString& aName ) override;
 
-    virtual uno::Sequence<  OUString > SAL_CALL getElementNames() throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Sequence<  OUString > SAL_CALL getElementNames() override;
 
-    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) throw( uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 };
 
 SvxUnoColorTable::SvxUnoColorTable()
@@ -70,18 +70,17 @@ SvxUnoColorTable::SvxUnoColorTable()
             XPropertyListType::Color, SvtPathOptions().GetPalettePath(), ""));
 }
 
-sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const  OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const  OUString& ServiceName )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoColorTable::getImplementationName()
 {
     return OUString("com.sun.star.drawing.SvxUnoColorTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.drawing.ColorTable" };
     return aSNS;
@@ -89,7 +88,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames()
 
 // XNameContainer
 void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     if( hasByName( aName ) )
         throw container::ElementExistException();
@@ -105,7 +103,6 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::
 }
 
 void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name )
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     long nIndex = pList.is() ? pList->GetIndex( Name ) : -1;
     if( nIndex == -1 )
@@ -116,7 +113,6 @@ void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name )
 
 // XNameReplace
 void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     sal_Int32 nColor = 0;
     if( !(aElement >>= nColor) )
@@ -131,7 +127,6 @@ void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno:
 
 // XNameAccess
 uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& aName )
-    throw( container::NoSuchElementException,  lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     long nIndex = pList.is() ? pList->GetIndex( aName ) : -1;
     if( nIndex == -1 )
@@ -142,7 +137,6 @@ uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames()
-    throw( uno::RuntimeException, std::exception )
 {
     const long nCount = pList.is() ? pList->Count() : 0;
 
@@ -159,7 +153,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames()
 }
 
 sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName )
-    throw( uno::RuntimeException, std::exception )
 {
     long nIndex = pList.is() ? pList->GetIndex( aName ) : -1;
     return nIndex != -1;
@@ -167,13 +160,11 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName )
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoColorTable::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return ::cppu::UnoType<sal_Int32>::get();
 }
 
 sal_Bool SAL_CALL SvxUnoColorTable::hasElements()
-    throw( uno::RuntimeException, std::exception )
 {
     return pList.is() && pList->Count() != 0;
 }
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 5574ec29bf90..786e4d8603d4 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -41,11 +41,11 @@ public:
     virtual NameOrIndex* createItem() const throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType(  ) override;
 };
 
 SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw()
@@ -53,13 +53,12 @@ SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw()
 {
 }
 
-OUString SAL_CALL SvxUnoDashTable::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoDashTable::getImplementationName()
 {
     return OUString("SvxUnoDashTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames(  )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.drawing.DashTable" };
     return aSNS;
@@ -74,7 +73,6 @@ NameOrIndex* SvxUnoDashTable::createItem() const throw()
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoDashTable::getElementType(  )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<drawing::LineDash>::get();
 }
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 148bc63148c0..2b9b11071398 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -40,11 +40,11 @@ public:
     virtual NameOrIndex* createItem() const throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType(  ) override;
 };
 
 SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw()
@@ -52,13 +52,12 @@ SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw()
 {
 }
 
-OUString SAL_CALL SvxUnoGradientTable::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoGradientTable::getImplementationName()
 {
     return OUString("SvxUnoGradientTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames(  )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.drawing.GradientTable" };
     return aSNS;
@@ -73,7 +72,6 @@ NameOrIndex* SvxUnoGradientTable::createItem() const throw()
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoGradientTable::getElementType(  )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<awt::Gradient>::get();
 }
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index dcfda9772a50..5ada87d34f9f 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -40,11 +40,11 @@ public:
     virtual NameOrIndex* createItem() const throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType(  ) override;
 };
 
 SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw()
@@ -52,13 +52,12 @@ SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw()
 {
 }
 
-OUString SAL_CALL SvxUnoHatchTable::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoHatchTable::getImplementationName()
 {
     return OUString("SvxUnoHatchTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames(  )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.drawing.HatchTable" };
     return aSNS;
@@ -71,7 +70,6 @@ NameOrIndex* SvxUnoHatchTable::createItem() const throw()
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoHatchTable::getElementType(  )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<drawing::Hatch>::get();
 }
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index e764a10dc35f..bae372d48c73 100644
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
@@ -35,7 +35,7 @@ SvxUnoShapeModifyListener::~SvxUnoShapeModifyListener() throw()
 }
 
 // css::util::XModifyListener
-void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& )
 {
     SolarMutexGuard aGuard;
     if( mpObj )
@@ -46,7 +46,7 @@ void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) thr
 }
 
 // css::lang::XEventListener
-void SvxUnoShapeModifyListener::disposing(const lang::EventObject& ) throw( uno::RuntimeException, std::exception )
+void SvxUnoShapeModifyListener::disposing(const lang::EventObject& )
 {
     invalidate();
 }
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 55033c62f5ac..5f5fbd251f61 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -75,21 +75,21 @@ public:
     explicit SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw();
 
     // XDrawPages
-    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 //-
 
@@ -196,18 +196,16 @@ css::uno::Reference<css::uno::XInterface> create(
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( const OUString& rServiceSpecifier )
-    throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     return create(rServiceSpecifier, "");
 }
 
-uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException)
+uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier )
 {
     return SvxUnoTextCreateTextField( ServiceSpecifier );
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< css::uno::Any >& Arguments )
-    throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     OUString arg;
     if ((ServiceSpecifier == "com.sun.star.drawing.GraphicObjectShape"
@@ -220,7 +218,6 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWi
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     return UHashMap::getServiceNames();
 }
@@ -257,7 +254,7 @@ SvxUnoDrawingModel::~SvxUnoDrawingModel() throw()
 {
 }
 
-uno::Any SAL_CALL SvxUnoDrawingModel::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SvxUnoDrawingModel::queryInterface( const uno::Type & rType )
 {
     uno::Any aAny;
 
@@ -282,7 +279,7 @@ void SAL_CALL SvxUnoDrawingModel::release() throw ( )
 }
 
 // XTypeProvider
-uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes(  )
 {
     if( maTypeSequence.getLength() == 0 )
     {
@@ -307,20 +304,18 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes(  ) throw(uno::
     return maTypeSequence;
 }
 
-uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawingModel::getImplementationId(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawingModel::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 void SAL_CALL SvxUnoDrawingModel::lockControllers(  )
-    throw(uno::RuntimeException, std::exception)
 {
     if( mpDoc )
         mpDoc->setLock(true);
 }
 
 void SAL_CALL SvxUnoDrawingModel::unlockControllers(  )
-    throw(uno::RuntimeException, std::exception)
 {
     if( mpDoc && mpDoc->isLocked() )
     {
@@ -329,14 +324,12 @@ void SAL_CALL SvxUnoDrawingModel::unlockControllers(  )
 }
 
 sal_Bool SAL_CALL SvxUnoDrawingModel::hasControllersLocked(  )
-    throw(uno::RuntimeException, std::exception)
 {
     return mpDoc && mpDoc->isLocked();
 }
 
 // XDrawPagesSupplier
 uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -350,7 +343,6 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages(
 
 // XMultiServiceFactory ( SvxFmMSFactory )
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( const OUString& aServiceSpecifier )
-    throw(uno::Exception, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -508,7 +500,6 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     const uno::Sequence< OUString > aSNS_ORG( SvxFmMSFactory::getAvailableServiceNames() );
 
@@ -546,18 +537,16 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames(
 
 // lang::XServiceInfo
 OUString SAL_CALL SvxUnoDrawingModel::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SvxUnoDrawingModel");
 }
 
 sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames()
 {
     OUString aSN("com.sun.star.drawing.DrawingDocument");
     uno::Sequence< OUString > aSeq( &aSN, 1 );
@@ -566,7 +555,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames(
 
 // XAnyCompareFactory
 uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel::createAnyCompareByName( const OUString& )
-    throw(uno::RuntimeException, std::exception)
 {
     return SvxCreateNumRuleCompare();
 }
@@ -578,7 +566,6 @@ SvxUnoDrawPagesAccess::SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel )  th
 
 // XIndexAccess
 sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -591,7 +578,6 @@ sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount()
 }
 
 uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index )
-    throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -625,13 +611,11 @@ uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index )
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoDrawPagesAccess::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<drawing::XDrawPage>::get();
 }
 
 sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     return getCount() > 0;
 }
@@ -641,7 +625,6 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements()
 // create a new page with model at given position
 // and return corresponding SdDrawPage
 uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -664,7 +647,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewBy
 }
 
 void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage )
-        throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -687,17 +669,17 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra
 
 // XServiceInfo
 
-OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName(  )
 {
     return OUString( "SvxUnoDrawPagesAccess" );
 }
 
-sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames(  )
 {
     OUString aService( "com.sun.star.drawing.DrawPages" );
     uno::Sequence< OUString > aSeq( &aService, 1 );
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index ef6ec0776cb0..0796fc768308 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -71,25 +71,25 @@ public:
     void SAL_CALL ImplInsertByName( const OUString& aName, const uno::Any& aElement );
 
     // 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;
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const  OUString& aName, const  uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const  OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const  OUString& aName, const  uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const  OUString& Name ) override;
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const  OUString& aName, const  uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const  OUString& aName, const  uno::Any& aElement ) override;
 
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const  OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence<  OUString > SAL_CALL getElementNames(  ) throw( uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const  OUString& aName ) override;
+    virtual uno::Sequence<  OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw( uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 };
 
 SvxUnoMarkerTable::SvxUnoMarkerTable( SdrModel* pModel ) throw()
@@ -129,18 +129,17 @@ void SvxUnoMarkerTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
         dispose();
 }
 
-sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const  OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const  OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoMarkerTable::getImplementationName()
 {
     return OUString("SvxUnoMarkerTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames(  )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.drawing.MarkerTable" };
     return aSNS;
@@ -166,7 +165,6 @@ void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const
 
 // XNameContainer
 void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const uno::Any& aElement )
-    throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -179,7 +177,6 @@ void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const u
 }
 
 void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName )
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -214,7 +211,6 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName )
 
 // XNameReplace
 void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const uno::Any& aElement )
-    throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -298,7 +294,6 @@ static bool getByNameFromPool( const OUString& rSearchName, SfxItemPool* pPool,
 
 // XNameAccess
 uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName )
-    throw( container::NoSuchElementException,  lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -341,7 +336,6 @@ static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set<
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -357,7 +351,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames()
 }
 
 sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -392,13 +385,11 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName )
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoMarkerTable::getElementType(  )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<drawing::PointSequence>::get();
 }
 
 sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements(  )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index ac4ed1e44a87..2e5868465298 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -104,7 +104,6 @@ void SvxDrawPage::disposing() throw()
 
 // XComponent
 void SvxDrawPage::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
 
@@ -159,7 +158,7 @@ void SvxDrawPage::dispose()
 
 }
 
-void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
 {
     SolarMutexGuard aGuard;
 
@@ -169,7 +168,7 @@ void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lan
     mrBHelper.addListener( cppu::UnoType<decltype(aListener)>::get() , aListener );
 }
 
-void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
 {
     SolarMutexGuard aGuard;
 
@@ -180,7 +179,6 @@ void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css::
 }
 
 void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -218,13 +216,11 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape
 }
 
 void SAL_CALL SvxDrawPage::addTop( const uno::Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception )
 {
     add(xShape);
 }
 
 void SAL_CALL SvxDrawPage::addBottom( const uno::Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -262,7 +258,6 @@ void SAL_CALL SvxDrawPage::addBottom( const uno::Reference< drawing::XShape >& x
 }
 
 void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -312,7 +307,6 @@ void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape )
 
 // css::container::XIndexAccess
 sal_Int32 SAL_CALL SvxDrawPage::getCount()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -323,7 +317,6 @@ sal_Int32 SAL_CALL SvxDrawPage::getCount()
 }
 
 uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index )
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -343,13 +336,11 @@ uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index )
 
 // css::container::XElementAccess
 uno::Type SAL_CALL SvxDrawPage::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<drawing::XShape>::get();
 }
 
 sal_Bool SAL_CALL SvxDrawPage::hasElements()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -412,7 +403,6 @@ void SvxDrawPage::SelectObjectInView( const Reference< drawing::XShape > & xShap
 }
 
 Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< drawing::XShapes >& xShapes )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -450,7 +440,6 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference<
 }
 
 void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGroup )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -476,7 +465,6 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr
 }
 
 SdrObject *SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xShape)
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_uInt16 nType = 0;
     SdrInventor nInventor;
@@ -587,7 +575,6 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor,
 }
 
 SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & referer )
-    throw (css::uno::RuntimeException)
 {
     SvxShape* pRet = nullptr;
     switch( nInventor )
@@ -810,7 +797,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInvent
 }
 
 Reference< drawing::XShape >  SvxDrawPage::CreateShape( SdrObject *pObj ) const
-    throw (css::uno::RuntimeException, std::exception)
 {
     Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(),
                                               pObj->GetObjInventor(),
@@ -838,25 +824,23 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS
 }
 
 // css::lang::XServiceInfo
-OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxDrawPage::getImplementationName()
 {
     return OUString("SvxDrawPage");
 }
 
 sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
-uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aSeq { "com.sun.star.drawing.ShapeCollection" };
     return aSeq;
 }
 
 SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return SvxDrawPage::CreateShapeByTypeAndInventor( nType, nInventor, nullptr, nullptr, referer );
 }
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 2a56da4fbcca..2bcab15bb261 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -93,7 +93,6 @@ SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) throw()
 }
 
 void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, uno::Any& rValue )
-    throw(beans::UnknownPropertyException)
 {
     switch( pEntry->mnHandle )
     {
@@ -148,7 +147,6 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
 }
 
 void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const uno::Any& rValue )
-    throw(beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     uno::Any aValue( rValue );
 
@@ -199,7 +197,6 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
 }
 
 void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException )
 {
     SolarMutexGuard aGuard;
 
@@ -214,7 +211,6 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp
 }
 
 void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValue )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException )
 {
     SolarMutexGuard aGuard;
 
@@ -229,7 +225,6 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp
 }
 
 void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, beans::PropertyState* pStates )
-    throw(beans::UnknownPropertyException )
 {
     SolarMutexGuard aGuard;
 
@@ -292,7 +287,6 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp
 }
 
 void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry )
-    throw(beans::UnknownPropertyException )
 {
     SolarMutexGuard aGuard;
 
@@ -311,7 +305,6 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry*
 }
 
 uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry* pEntry )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException )
 {
     SolarMutexGuard aGuard;
 
@@ -332,13 +325,11 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry
 // XInterface
 
 uno::Any SAL_CALL SvxUnoDrawPool::queryInterface( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     return OWeakAggObject::queryInterface( rType );
 }
 
 uno::Any SAL_CALL SvxUnoDrawPool::queryAggregation( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
 
@@ -369,7 +360,6 @@ void SAL_CALL SvxUnoDrawPool::release() throw ( )
 }
 
 uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type > aTypes( 6 );
     uno::Type* pTypes = aTypes.getArray();
@@ -385,24 +375,22 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawPool::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const  OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const  OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoDrawPool::getImplementationName()
 {
     return OUString("SvxUnoDrawPool");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames(  )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.drawing.Defaults" };
     return aSNS;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 71f911202dd5..c92b945cfd73 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1117,7 +1117,7 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI
 }
 
 /// @throws std::exception
-bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString ) throw(std::exception)
+bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString )
 {
     // first, calculate the search string length without an optional number behind the name
     sal_Int32 nLength = rString.getLength();
@@ -1271,7 +1271,7 @@ static const sal_uInt16 SvxUnoColorNameResId[] =
 };
 
 /// @throws std::exception
-bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw (std::exception)
+bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString )
 {
     //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't
     //replace "Red Hat 1" with the translation of Red :-)
@@ -1302,7 +1302,7 @@ bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uIn
 /** if the given name is a predefined name for the current language it is replaced by
     the corresponding api name.
 */
-OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(std::exception)
+OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName)
 {
     OUString aNew = rInternalName;
 
@@ -1335,7 +1335,7 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern
 /** if the given name is a predefined api name it is replaced by the predefined name
     for the current language.
 */
-OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(std::exception)
+OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName)
 {
     OUString aNew = rApiName;
 
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 00d1b62f4030..3c75438f99e6 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -101,12 +101,11 @@ void SvxShapeGroup::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
 
 
 uno::Any SAL_CALL SvxShapeGroup::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     return SvxShape::queryInterface( rType );
 }
 
-uno::Any SAL_CALL SvxShapeGroup::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SvxShapeGroup::queryAggregation( const uno::Type & rType )
 {
     uno::Any aAny;
 
@@ -132,7 +131,6 @@ void SAL_CALL SvxShapeGroup::release() throw ( )
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -141,31 +139,29 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId()
 
 
 OUString SAL_CALL SvxShapeGroup::getShapeType()
-    throw( uno::RuntimeException, std::exception )
 {
     return SvxShape::getShapeType();
 }
 
-awt::Point SAL_CALL SvxShapeGroup::getPosition() throw(uno::RuntimeException, std::exception)
+awt::Point SAL_CALL SvxShapeGroup::getPosition()
 {
     return SvxShape::getPosition();
 }
 
 
-void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position )
 {
     SvxShape::setPosition(Position);
 }
 
 
-awt::Size SAL_CALL SvxShapeGroup::getSize() throw(uno::RuntimeException, std::exception)
+awt::Size SAL_CALL SvxShapeGroup::getSize()
 {
     return SvxShape::getSize();
 }
 
 
 void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize )
-    throw(beans::PropertyVetoException, uno::RuntimeException, std::exception)
 {
     SvxShape::setSize( rSize );
 }
@@ -173,14 +169,14 @@ void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize )
 // drawing::XShapeGroup
 
 
-void SAL_CALL SvxShapeGroup::enterGroup(  ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxShapeGroup::enterGroup(  )
 {
     // Todo
 //  pDrView->EnterMarkedGroup();
 }
 
 
-void SAL_CALL SvxShapeGroup::leaveGroup(  ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxShapeGroup::leaveGroup(  )
 {
     // Todo
 //  pDrView->LeaveOneGroup();
@@ -230,7 +226,6 @@ void SvxShapeGroup::addUnoShape( const uno::Reference< drawing::XShape >& xShape
 
 // XShapes
 void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -240,7 +235,6 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap
 
 
 void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -292,7 +286,6 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS
 }
 
 void SAL_CALL SvxShapeGroup::addTop( const uno::Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -301,7 +294,6 @@ void SAL_CALL SvxShapeGroup::addTop( const uno::Reference< drawing::XShape >& xS
 }
 
 void SAL_CALL SvxShapeGroup::addBottom( const uno::Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -312,7 +304,7 @@ void SAL_CALL SvxShapeGroup::addBottom( const uno::Reference< drawing::XShape >&
 // XIndexAccess
 
 
-sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxShapeGroup::getCount()
 {
     ::SolarMutexGuard aGuard;
 
@@ -328,7 +320,6 @@ sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException, std::
 
 
 uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index )
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -350,13 +341,13 @@ uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index )
 // css::container::XElementAccess
 
 
-uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type SAL_CALL SvxShapeGroup::getElementType()
 {
     return cppu::UnoType<drawing::XShape>::get();
 }
 
 
-sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxShapeGroup::hasElements()
 {
     ::SolarMutexGuard aGuard;
 
@@ -375,13 +366,11 @@ SvxShapeConnector::~SvxShapeConnector() throw()
 
 
 uno::Any SAL_CALL SvxShapeConnector::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     return SvxShapeText::queryInterface( rType );
 }
 
 uno::Any SAL_CALL SvxShapeConnector::queryAggregation( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
 
@@ -404,13 +393,11 @@ void SAL_CALL SvxShapeConnector::release() throw ( )
 // XTypeProvider
 
 uno::Sequence< uno::Type > SAL_CALL SvxShapeConnector::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     return SvxShape::getTypes();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -419,31 +406,29 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId()
 
 
 OUString SAL_CALL SvxShapeConnector::getShapeType()
-    throw( uno::RuntimeException, std::exception )
 {
     return SvxShapeText::getShapeType();
 }
 
-awt::Point SAL_CALL SvxShapeConnector::getPosition() throw(uno::RuntimeException, std::exception)
+awt::Point SAL_CALL SvxShapeConnector::getPosition()
 {
     return SvxShapeText::getPosition();
 }
 
 
-void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position )
 {
     SvxShapeText::setPosition(Position);
 }
 
 
-awt::Size SAL_CALL SvxShapeConnector::getSize() throw(uno::RuntimeException, std::exception)
+awt::Size SAL_CALL SvxShapeConnector::getSize()
 {
     return SvxShapeText::getSize();
 }
 
 
 void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize )
-    throw(beans::PropertyVetoException, uno::RuntimeException, std::exception)
 {
     SvxShapeText::setSize( rSize );
 }
@@ -451,7 +436,7 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize )
 
 // XConnectorShape
 
-void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType )
 {
     ::SolarMutexGuard aGuard;
 
@@ -467,7 +452,6 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC
 
 
 void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType  )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -483,7 +467,6 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon
 
 
 void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >&  )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -496,7 +479,6 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing:
 
 
 void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -520,12 +502,11 @@ SvxShapeControl::~SvxShapeControl() throw()
 
 
 uno::Any SAL_CALL SvxShapeControl::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     return SvxShapeText::queryInterface( rType );
 }
 
-uno::Any SAL_CALL SvxShapeControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SvxShapeControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aAny;
 
@@ -548,13 +529,11 @@ void SAL_CALL SvxShapeControl::release() throw ( )
 // XTypeProvider
 
 uno::Sequence< uno::Type > SAL_CALL SvxShapeControl::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     return SvxShape::getTypes();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -563,31 +542,29 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId()
 
 
 OUString SAL_CALL SvxShapeControl::getShapeType()
-    throw( uno::RuntimeException, std::exception )
 {
     return SvxShapeText::getShapeType();
 }
 
-awt::Point SAL_CALL SvxShapeControl::getPosition() throw(uno::RuntimeException, std::exception)
+awt::Point SAL_CALL SvxShapeControl::getPosition()
 {
     return SvxShapeText::getPosition();
 }
 
 
-void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position )
 {
     SvxShapeText::setPosition(Position);
 }
 
 
-awt::Size SAL_CALL SvxShapeControl::getSize() throw(uno::RuntimeException, std::exception)
+awt::Size SAL_CALL SvxShapeControl::getSize()
 {
     return SvxShapeText::getSize();
 }
 
 
 void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize )
-    throw(beans::PropertyVetoException, uno::RuntimeException, std::exception)
 {
     SvxShapeText::setSize( rSize );
 }
@@ -596,7 +573,6 @@ void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize )
 // XControlShape
 
 Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -611,7 +587,6 @@ Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
 
 
 void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel >& xControl )
-    throw( uno::RuntimeException, std::exception )
 {
     ::SolarMutexGuard aGuard;
 
@@ -783,7 +758,6 @@ namespace
 }
 
 void SAL_CALL SvxShapeControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception)
 {
     OUString aFormsName;
     if ( lcl_convertPropertyName( aPropertyName, aFormsName ) )
@@ -822,7 +796,6 @@ void SAL_CALL SvxShapeControl::setPropertyValue( const OUString& aPropertyName,
 }
 
 uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyName )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OUString aFormsName;
     if ( lcl_convertPropertyName( aPropertyName, aFormsName ) )
@@ -871,7 +844,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa
 }
 
 // XPropertyState
-beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
+beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& PropertyName )
 {
     OUString aFormsName;
     if ( lcl_convertPropertyName( PropertyName, aFormsName ) )
@@ -896,7 +869,7 @@ beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString&
     }
 }
 
-void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
+void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyName )
 {
     OUString aFormsName;
     if ( lcl_convertPropertyName( PropertyName, aFormsName ) )
@@ -920,7 +893,6 @@ void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyNam
 }
 
 uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const OUString& aPropertyName )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OUString aFormsName;
     if ( lcl_convertPropertyName( aPropertyName, aFormsName ) )
@@ -976,7 +948,6 @@ SvxShapeCircle::~SvxShapeCircle() throw()
 }
 
 SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind eNew )
- throw( css::beans::PropertyVetoException, css::lang::IllegalArgumentException)
 : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGON), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGON, SdrObject::GetGlobalDrawObjectItemPool()) )
 , mePolygonKind( eNew )
 {
@@ -1020,7 +991,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c
 }
 
 
-bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -1128,9 +1099,6 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo
 
 bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty,
                                                 css::uno::Any& rValue )
-    throw(css::beans::UnknownPropertyException,
-          css::lang::WrappedTargetException,
-          css::uno::RuntimeException)
 {
     switch( pProperty->nWID )
     {
@@ -1201,7 +1169,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
 }
 
 
-void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException)
+void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1236,7 +1204,7 @@ SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw()
 }
 
 
-bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -1277,7 +1245,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con
 }
 
 
-bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
+bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -1315,7 +1283,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
 }
 
 
-void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException)
+void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1347,7 +1315,7 @@ SvxGraphicObject::~SvxGraphicObject() throw()
 {
 }
 
-bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     bool bOk = false;
     switch( pProperty->nWID )
@@ -1495,7 +1463,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
     return true;
 }
 
-bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -1601,13 +1569,11 @@ SvxCustomShape::~SvxCustomShape() throw()
 
 
 uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     return SvxShapeText::queryInterface( rType );
 }
 
 uno::Any SAL_CALL SvxCustomShape::queryAggregation( const uno::Type & rType )
-    throw(uno::RuntimeException, std::exception)
 {
     css::uno::Any aReturn = SvxShapeText::queryAggregation( rType );
     if ( !aReturn.hasValue() )
@@ -1627,13 +1593,11 @@ void SAL_CALL SvxCustomShape::release() throw ( )
 
 
 uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     return SvxShapeText::getTypes();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1641,7 +1605,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId()
 // css::drawing::XShape
 
 
-awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, std::exception)
+awt::Point SAL_CALL SvxCustomShape::getPosition()
 {
     ::SolarMutexGuard aGuard;
     if ( mpModel && mpObj.is() )
@@ -1724,7 +1688,6 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s
 
 
 void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1805,7 +1768,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
     }
 }
 
-bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -1822,7 +1785,7 @@ bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemP
 }
 
 
-void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) throw (css::uno::RuntimeException, std::exception)
+void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType )
 {
     static_cast<SdrObjCustomShape*>(mpObj.get())->MergeDefaultAttributes( &rValueType );
 }
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 8a59d737184e..3af24f0f1fb2 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -76,7 +76,7 @@ void Svx3DSceneObject::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
 }
 
 
-uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType )
 {
     uno::Any aAny;
 
@@ -89,7 +89,7 @@ uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType )
     return aAny;
 }
 
-uno::Any SAL_CALL Svx3DSceneObject::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL Svx3DSceneObject::queryInterface( const uno::Type & rType )
 {
     return SvxShape::queryInterface( rType );
 }
@@ -107,14 +107,12 @@ void SAL_CALL Svx3DSceneObject::release() throw ( )
 // XTypeProvider
 
 uno::Sequence< sal_Int8 > SAL_CALL Svx3DSceneObject::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 
 void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -143,7 +141,6 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape
 
 
 void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xShape )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -184,7 +181,6 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha
 
 
 sal_Int32 SAL_CALL Svx3DSceneObject::getCount()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -197,7 +193,6 @@ sal_Int32 SAL_CALL Svx3DSceneObject::getCount()
 
 
 uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index )
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -219,14 +214,12 @@ uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index )
 // css::container::XElementAccess
 
 uno::Type SAL_CALL Svx3DSceneObject::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<drawing::XShape>::get();
 }
 
 
 sal_Bool SAL_CALL Svx3DSceneObject::hasElements()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -292,7 +285,7 @@ struct ImpRememberTransAndRect
     Rectangle                   maRect;
 };
 
-bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -405,10 +398,6 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte
 
 bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty,
     css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception)
 {
     switch( pProperty->nWID )
     {
@@ -453,7 +442,6 @@ bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItem
 
 // css::lang::XServiceInfo
 uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
     comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3DScene"} );
@@ -469,7 +457,7 @@ Svx3DCubeObject::~Svx3DCubeObject() throw()
 {
 }
 
-bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     SolarMutexGuard aGuard;
 
@@ -524,7 +512,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem
     throw IllegalArgumentException();
 }
 
-bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -574,7 +562,6 @@ bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItem
 
 // css::lang::XServiceInfo
 uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
     comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D",
@@ -591,7 +578,7 @@ Svx3DSphereObject::~Svx3DSphereObject() throw()
 {
 }
 
-bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -635,7 +622,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt
     throw IllegalArgumentException();
 }
 
-bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -680,7 +667,6 @@ bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxIt
 
 // css::lang::XServiceInfo
 uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
     comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D",
@@ -785,7 +771,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon&
     rValue <<= aRetval;
 }
 
-bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -831,7 +817,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte
     throw IllegalArgumentException();
 }
 
-bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -879,7 +865,6 @@ bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxIte
 
 // css::lang::XServiceInfo
 uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
     comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D",
@@ -896,7 +881,7 @@ Svx3DExtrudeObject::~Svx3DExtrudeObject() throw()
 {
 }
 
-bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -931,7 +916,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI
     throw IllegalArgumentException();
 }
 
-bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -981,7 +966,6 @@ bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxI
 
 // css::lang::XServiceInfo
 uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
     comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D",
@@ -998,7 +982,7 @@ Svx3DPolygonObject::~Svx3DPolygonObject() throw()
 {
 }
 
-bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -1071,7 +1055,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI
     throw IllegalArgumentException();
 }
 
-bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -1118,7 +1102,6 @@ bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxI
 
 // css::lang::XServiceInfo
 uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() );
     comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D",
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index c806e75e27e2..d9c43b7d2353 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -80,7 +80,7 @@ SvxOle2Shape::~SvxOle2Shape() throw()
 }
 
 //XPropertySet
-bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -198,7 +198,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro
     throw IllegalArgumentException();
 }
 
-bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -577,19 +577,19 @@ void SvxAppletShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
     SetShapeType( "com.sun.star.drawing.AppletShape" );
 }
 
-void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue )
 {
     SvxShape::setPropertyValue( aPropertyName, rValue );
     resetModifiedState();
 }
 
-void SAL_CALL SvxAppletShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxAppletShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues )
 {
     SvxShape::setPropertyValues( aPropertyNames, rValues );
     resetModifiedState();
 }
 
-bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) )
     {
@@ -610,7 +610,7 @@ bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemP
     }
 }
 
-bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) )
     {
@@ -649,19 +649,19 @@ void SvxPluginShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
     SetShapeType( "com.sun.star.drawing.PluginShape" );
 }
 
-void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue )
 {
     SvxShape::setPropertyValue( aPropertyName, rValue );
     resetModifiedState();
 }
 
-void SAL_CALL SvxPluginShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxPluginShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues )
 {
     SvxShape::setPropertyValues( aPropertyNames, rValues );
     resetModifiedState();
 }
 
-bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) )
     {
@@ -682,7 +682,7 @@ bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemP
     }
 }
 
-bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) )
     {
@@ -713,7 +713,7 @@ SvxFrameShape::~SvxFrameShape() throw()
 {
 }
 
-void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (uno::RuntimeException, std::exception)
+void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
 {
     SvxShape::Create( pNewObj, pNewPage );
     const SvGlobalName aIFrameClassId( SO3_IFRAME_CLASSID );
@@ -721,19 +721,19 @@ void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (u
     SetShapeType( "com.sun.star.drawing.FrameShape" );
 }
 
-void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue )
 {
     SvxShape::setPropertyValue( aPropertyName, rValue );
     resetModifiedState();
 }
 
-void SAL_CALL SvxFrameShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxFrameShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues )
 {
     SvxShape::setPropertyValues( aPropertyNames, rValues );
     resetModifiedState();
 }
 
-bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) )
     {
@@ -756,10 +756,6 @@ bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr
 
 bool SvxFrameShape::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty,
     css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception)
 {
     if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) )
     {
@@ -791,7 +787,7 @@ SvxMediaShape::~SvxMediaShape() throw()
 }
 
 
-bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     if( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM))
         || (pProperty->nWID == OWN_ATTR_MEDIA_STREAM)
@@ -917,7 +913,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr
 }
 
 
-bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     if (   ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) &&
             (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM))
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index bf54674e563c..d20eaef09261 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -171,7 +171,7 @@ protected:
     }
 };
 
-SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException )
+SvxShape::SvxShape( SdrObject* pObject )
 :   maSize(100,100)
 ,   mpImpl( new SvxShapeImpl( *this, maMutex ) )
 ,   mbIsMultiPropertyCall(false)
@@ -185,7 +185,7 @@ SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException )
 }
 
 
-SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw( uno::RuntimeException )
+SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet )
 :   maSize(100,100)
 ,   mpImpl( new SvxShapeImpl( *this, maMutex ) )
 ,   mbIsMultiPropertyCall(false)
@@ -199,7 +199,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries,
 }
 
 
-SvxShape::SvxShape() throw( uno::RuntimeException )
+SvxShape::SvxShape()
 :   maSize(100,100)
 ,   mpImpl( new SvxShapeImpl( *this, maMutex ) )
 ,   mbIsMultiPropertyCall(false)
@@ -273,7 +273,7 @@ void SvxShape::setMaster( SvxShapeMaster* pMaster )
 }
 
 
-uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType )
 {
     if( mpImpl->mpMaster )
     {
@@ -306,7 +306,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >&
 }
 
 
-sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) )
     {
@@ -651,7 +651,6 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet)
 }
 
 uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
-    throw (uno::RuntimeException, std::exception)
 {
     DBG_TESTSOLARMUTEX();
     uno::Any aAny;
@@ -702,7 +701,6 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
 }
 
 uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes()
-    throw (uno::RuntimeException, std::exception)
 {
     if( mpImpl->mpMaster )
     {
@@ -716,7 +714,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes()
 
 
 uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
-    throw(uno::RuntimeException)
 {
     switch( mpImpl->mnObjId )
     {
@@ -994,7 +991,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
 
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId()
-    throw (uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1113,7 +1109,7 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
 }
 
 
-awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::exception)
+awt::Point SAL_CALL SvxShape::getPosition()
 {
     ::SolarMutexGuard aGuard;
 
@@ -1136,7 +1132,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::ex
 }
 
 
-void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::setPosition( const awt::Point& Position )
 {
     ::SolarMutexGuard aGuard;
 
@@ -1166,7 +1162,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run
 }
 
 
-awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException, std::exception)
+awt::Size SAL_CALL SvxShape::getSize()
 {
     ::SolarMutexGuard aGuard;
 
@@ -1183,7 +1179,6 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException, std::excepti
 
 
 void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
-    throw(beans::PropertyVetoException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1234,7 +1229,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
 
 
 // XNamed
-OUString SAL_CALL SvxShape::getName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL SvxShape::getName(  )
 {
     ::SolarMutexGuard aGuard;
     if( mpObj.is() )
@@ -1248,7 +1243,7 @@ OUString SAL_CALL SvxShape::getName(  ) throw(css::uno::RuntimeException, std::e
 }
 
 
-void SAL_CALL SvxShape::setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::setName( const OUString& aName )
 {
     ::SolarMutexGuard aGuard;
     if( mpObj.is() )
@@ -1264,7 +1259,7 @@ void SAL_CALL SvxShape::setName( const OUString& aName ) throw(css::uno::Runtime
 // XShapeDescriptor
 
 
-OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SvxShape::getShapeType()
 {
     if( !maShapeType.getLength() )
         return UHashMap::getNameFromId( mpImpl->mnObjId );
@@ -1275,7 +1270,7 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException, std::exc
 // XComponent
 
 
-void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::dispose()
 {
     ::SolarMutexGuard aGuard;
 
@@ -1334,13 +1329,12 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception)
 
 
 void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener >& xListener )
-    throw(uno::RuntimeException, std::exception)
 {
     mpImpl->maDisposeListeners.addInterface(xListener);
 }
 
 
-void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener )
 {
    mpImpl->maDisposeListeners.removeInterface(aListener);
 }
@@ -1349,7 +1343,7 @@ void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListen
 
 
 Reference< beans::XPropertySetInfo > SAL_CALL
-    SvxShape::getPropertySetInfo() throw(uno::RuntimeException, std::exception)
+    SvxShape::getPropertySetInfo()
 {
     if( mpImpl->mpMaster )
     {
@@ -1362,33 +1356,33 @@ Reference< beans::XPropertySetInfo > SAL_CALL
 }
 
 Reference< beans::XPropertySetInfo > SAL_CALL
-    SvxShape::_getPropertySetInfo() throw(uno::RuntimeException)
+    SvxShape::_getPropertySetInfo()
 {
     return mpPropSet->getPropertySetInfo();
 }
 
 
-void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener  )
 {
     ::osl::MutexGuard aGuard( maMutex );
     mpImpl->maPropertyNotifier.addPropertyChangeListener( _propertyName, _listener );
 }
 
 
-void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener  )
 {
     ::osl::MutexGuard aGuard( maMutex );
     mpImpl->maPropertyNotifier.removePropertyChangeListener( _propertyName, _listener );
 }
 
 
-void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  )
 {
     OSL_FAIL( "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" );
 }
 
 
-void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  )
 {
     OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" );
 }
@@ -1574,7 +1568,6 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
 
 
 void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( mpImpl->mpMaster )
     {
@@ -1587,7 +1580,6 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u
 }
 
 void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1701,7 +1693,6 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
 
 
 uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if ( mpImpl->mpMaster )
         return mpImpl->mpMaster->getPropertyValue( PropertyName );
@@ -1711,7 +1702,6 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName )
 
 
 uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ::SolarMutexGuard aGuard;
 
@@ -1769,7 +1759,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
 
 
 // XMultiPropertySet
-void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues )
 {
     ::SolarMutexGuard aSolarGuard;
 
@@ -1840,7 +1830,7 @@ void SvxShape::endSetPropertyValues()
 }
 
 
-css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames )
 {
     const sal_Int32 nCount = aPropertyNames.getLength();
     const OUString* pNames = aPropertyNames.getConstArray();
@@ -1883,15 +1873,15 @@ css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const
     return aRet;
 }
 
-void SAL_CALL SvxShape::addPropertiesChangeListener( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >&  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::addPropertiesChangeListener( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >&  )
 {
 }
 
-void SAL_CALL SvxShape::removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >&  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >&  )
 {
 }
 
-void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >&  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >&  )
 {
 }
 
@@ -1978,7 +1968,6 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
 
 // XPropertyState
 beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     if( mpImpl->mpMaster )
     {
@@ -1991,7 +1980,6 @@ beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& Proper
 }
 
 beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2058,7 +2046,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
     return eState;
 }
 
-bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -2501,7 +2489,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
 }
 
 
-bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     switch( pProperty->nWID )
     {
@@ -2888,7 +2876,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
 }
 
 
-bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException)
+bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState )
 {
     if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE )
     {
@@ -2918,7 +2906,7 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty
 }
 
 
-bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException)
+bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty )
 {
     if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE )
     {
@@ -2939,7 +2927,6 @@ bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProp
 
 
 uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( const uno::Sequence< OUString >& aPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     const sal_Int32 nCount = aPropertyName.getLength();
     const OUString* pNames = aPropertyName.getConstArray();
@@ -2955,7 +2942,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons
 
 
 void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     if( mpImpl->mpMaster )
     {
@@ -2968,7 +2954,6 @@ void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName )
 }
 
 void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::SolarMutexGuard aGuard;
 
@@ -2987,7 +2972,6 @@ void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName )
 
 
 uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( mpImpl->mpMaster )
     {
@@ -3000,7 +2984,6 @@ uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName )
 }
 
 uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3026,7 +3009,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName )
 }
 
 // XMultiPropertyStates
-void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException, std::exception)
+void SvxShape::setAllPropertiesToDefault()
 {
     ::SolarMutexGuard aGuard;
 
@@ -3056,7 +3039,6 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException, std::ex
 
 void SvxShape::setPropertiesToDefault(
     const uno::Sequence<OUString>& aPropertyNames )
-    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     for ( sal_Int32 pos = 0; pos < aPropertyNames.getLength(); ++pos )
         setPropertyToDefault( aPropertyNames[pos] );
@@ -3064,8 +3046,6 @@ void SvxShape::setPropertiesToDefault(
 
 uno::Sequence<uno::Any> SvxShape::getPropertyDefaults(
     const uno::Sequence<OUString>& aPropertyNames )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     ::std::vector<uno::Any> ret;
     for ( sal_Int32 pos = 0; pos < aPropertyNames.getLength(); ++pos )
@@ -3077,7 +3057,6 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults(
 // XServiceInfo
 
 OUString SAL_CALL SvxShape::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return OUString("SvxShape");
 }
@@ -3130,7 +3109,6 @@ const char sUNO_service_drawing_MediaShape[]                 = STAR_NAMESPACE "d
 
 
 uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames()
-    throw(uno::RuntimeException, std::exception)
 {
     if( mpImpl->mpMaster )
     {
@@ -3143,7 +3121,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames()
 }
 
 uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
-    throw(uno::RuntimeException)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3697,14 +3674,13 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
     return aSeq;
 }
 
-sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XGluePointsSupplier
 uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
     uno::Reference< container::XIndexContainer > xGluePoints( mxGluePoints );
@@ -3720,7 +3696,6 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints()
 
 // XChild
 uno::Reference<uno::XInterface> SAL_CALL SvxShape::getParent()
-    throw(uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
@@ -3749,7 +3724,6 @@ uno::Reference<uno::XInterface> SAL_CALL SvxShape::getParent()
 }
 
 void SAL_CALL SvxShape::setParent( const css::uno::Reference< css::uno::XInterface >& )
-    throw(lang::NoSupportException, uno::RuntimeException, std::exception)
 {
     throw lang::NoSupportException();
 }
@@ -3768,7 +3742,7 @@ void SvxShape::unlock()
 
 
 // XActionLockable
-sal_Bool SAL_CALL SvxShape::isActionLocked(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvxShape::isActionLocked(  )
 {
     ::SolarMutexGuard aGuard;
 
@@ -3776,7 +3750,7 @@ sal_Bool SAL_CALL SvxShape::isActionLocked(  ) throw (css::uno::RuntimeException
 }
 
 
-void SAL_CALL SvxShape::addActionLock(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::addActionLock(  )
 {
     ::SolarMutexGuard aGuard;
 
@@ -3788,7 +3762,7 @@ void SAL_CALL SvxShape::addActionLock(  ) throw (css::uno::RuntimeException, std
 }
 
 
-void SAL_CALL SvxShape::removeActionLock(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxShape::removeActionLock(  )
 {
     ::SolarMutexGuard aGuard;
 
@@ -3800,7 +3774,7 @@ void SAL_CALL SvxShape::removeActionLock(  ) throw (css::uno::RuntimeException,
 }
 
 
-void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::RuntimeException, std::exception )
+void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock )
 {
     ::SolarMutexGuard aGuard;
 
@@ -3814,7 +3788,7 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::Runti
 }
 
 
-sal_Int16 SAL_CALL SvxShape::resetActionLocks(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL SvxShape::resetActionLocks(  )
 {
     ::SolarMutexGuard aGuard;
 
@@ -3892,14 +3866,12 @@ void SvxShapeText::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
 // XInterface
 
 uno::Any SAL_CALL SvxShapeText::queryInterface( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     return SvxShape::queryInterface( rType );
 }
 
 
 uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Any aAny( SvxShape::queryAggregation( rType ) );
     if( aAny.hasValue() )
@@ -3922,19 +3894,19 @@ void SAL_CALL SvxShapeText::release() throw()
 
 // XServiceInfo
 
-OUString SAL_CALL SvxShapeText::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxShapeText::getImplementationName()
 {
     return OUString("SvxShapeText");
 }
 
 
-uno::Sequence< OUString > SAL_CALL SvxShapeText::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL SvxShapeText::getSupportedServiceNames()
 {
     return SvxShape::getSupportedServiceNames();
 }
 
 
-sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(static_cast<SvxShape*>(this), ServiceName);
 }
@@ -3942,12 +3914,11 @@ sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) t
     // XTypeProvider
 
 uno::Sequence< uno::Type > SAL_CALL SvxShapeText::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     return SvxShape::getTypes();
 }
 
-sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     const sal_Int64 nReturn = SvxShape::getSomething( rId );
     if( nReturn )
@@ -3958,7 +3929,6 @@ sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int
 
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -3982,7 +3952,7 @@ void SvxShapeText::unlock()
 }
 
 // css::text::XTextRange
-uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::RuntimeException, std::exception)
+uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart()
 {
     ::SolarMutexGuard aGuard;
     SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
@@ -3992,7 +3962,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::
 
 }
 
-uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::RuntimeException, std::exception)
+uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd()
 {
     ::SolarMutexGuard aGuard;
     SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
@@ -4001,7 +3971,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::Ru
     return SvxUnoTextBase::getEnd();
 }
 
-OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SvxShapeText::getString()
 {
     ::SolarMutexGuard aGuard;
     SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
@@ -4011,7 +3981,7 @@ OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::ex
 }
 
 
-void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvxShapeText::setString( const OUString& aString )
 {
     ::SolarMutexGuard aGuard;
     SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr;
@@ -4021,7 +3991,7 @@ void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::Runt
 }
 
 // override these for special property handling in subcasses. Return true if property is handled
-bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue )
 {
     // HACK-fix #99090#
     // since SdrTextObj::SetVerticalWriting exchanges
@@ -4044,7 +4014,7 @@ bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPro
     return SvxShape::setPropertyValueImpl( rName, pProperty, rValue );
 }
 
-bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue )
 {
     if( pProperty->nWID == SDRATTR_TEXTDIRECTION )
     {
@@ -4059,12 +4029,12 @@ bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPro
     return SvxShape::getPropertyValueImpl( rName, pProperty, rValue );
 }
 
-bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException)
+bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState )
 {
     return SvxShape::getPropertyStateImpl( pProperty, rState );
 }
 
-bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException)
+bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty )
 {
     return SvxShape::setPropertyToDefaultImpl( pProperty );
 }
@@ -4078,12 +4048,12 @@ SvxShapeRect::~SvxShapeRect() throw()
 {
 }
 
-uno::Any SAL_CALL SvxShapeRect::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SvxShapeRect::queryInterface( const uno::Type & rType )
 {
     return SvxShapeText::queryInterface( rType );
 }
 
-uno::Any SAL_CALL SvxShapeRect::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SvxShapeRect::queryAggregation( const uno::Type & rType )
 {
     return SvxShapeText::queryAggregation( rType );
 }
@@ -4100,7 +4070,7 @@ void SAL_CALL SvxShapeRect::release() throw()
 
 // XServiceInfo
 
-uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames()
 {
     return SvxShape::getSupportedServiceNames();
 }
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index d370a9c8aab8..a8754dbbb9c9 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -58,26 +58,26 @@ public:
     virtual void SAL_CALL release() throw() override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ;
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override ;
+    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XShapes
-    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 SvxShapeCollection::SvxShapeCollection() throw()
@@ -120,7 +120,6 @@ void SvxShapeCollection::release() throw()
 
 // XComponent
 void SvxShapeCollection::dispose()
-    throw(css::uno::RuntimeException, std::exception)
 {
     // An frequently programming error is to release the last
     // reference to this object in the disposing message.
@@ -178,39 +177,38 @@ void SvxShapeCollection::dispose()
 }
 
 // XComponent
-void SAL_CALL SvxShapeCollection::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxShapeCollection::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
 {
     mrBHelper.addListener( cppu::UnoType<decltype(aListener)>::get() , aListener );
 }
 
 // XComponent
-void SAL_CALL SvxShapeCollection::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL SvxShapeCollection::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
 {
     mrBHelper.removeListener( cppu::UnoType<decltype(aListener)>::get() , aListener );
 }
 
 // XShapes
 
-void SAL_CALL SvxShapeCollection::add( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SvxShapeCollection::add( const Reference< drawing::XShape >& xShape )
 {
     maShapeContainer.addInterface( xShape );
 }
 
 
-void SAL_CALL SvxShapeCollection::remove( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SvxShapeCollection::remove( const uno::Reference< drawing::XShape >& xShape )
 {
     maShapeContainer.removeInterface( xShape );
 }
 
 
-sal_Int32 SAL_CALL SvxShapeCollection::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvxShapeCollection::getCount()
 {
     return maShapeContainer.getLength();
 }
 
 
 uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index )
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     if( Index < 0 || Index >= getCount() )
         throw lang::IndexOutOfBoundsException();
@@ -222,30 +220,28 @@ uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index )
 }
 
 // XElementAccess
-uno::Type SAL_CALL SvxShapeCollection::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type SAL_CALL SvxShapeCollection::getElementType()
 {
     return cppu::UnoType<drawing::XShape>::get();
 }
 
-sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxShapeCollection::hasElements()
 {
     return getCount() != 0;
 }
 
 // XServiceInfo
 OUString SAL_CALL SvxShapeCollection::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.drawing.SvxShapeCollection");
 }
 
 sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aSeq(2);
     aSeq.getArray()[0] = "com.sun.star.drawing.Shapes";
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index f2f9f58a1e61..3f29ce5b39eb 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -40,11 +40,11 @@ public:
     virtual NameOrIndex* createItem() const throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) 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 uno::Sequence<  OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw( uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType(  ) override;
 };
 
 SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw()
@@ -52,13 +52,12 @@ SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw()
 {
 }
 
-OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName()
 {
     return OUString("SvxUnoTransGradientTable");
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedServiceNames(  )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.drawing.TransparencyGradientTable" };
     return aSNS;
@@ -73,7 +72,6 @@ NameOrIndex* SvxUnoTransGradientTable::createItem() const throw()
 
 // XElementAccess
 uno::Type SAL_CALL SvxUnoTransGradientTable::getElementType(  )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<awt::Gradient>::get();
 }
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 195b09c33245..aebe96aaabb4 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -73,7 +73,6 @@ bool GalleryItem::isValid() const
 
 
 uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Any aAny;
 
@@ -97,7 +96,6 @@ uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType )
 
 
 uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     return OWeakAggObject::queryInterface( rType );
 }
@@ -118,25 +116,21 @@ void SAL_CALL GalleryItem::release()
 
 
 OUString SAL_CALL GalleryItem::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.gallery.GalleryItem" );
 }
 
 sal_Bool SAL_CALL GalleryItem::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL GalleryItem::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.gallery.GalleryItem" };
 }
 
 uno::Sequence< uno::Type > SAL_CALL GalleryItem::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type >  aTypes( 6 );
     uno::Type*                  pTypes = aTypes.getArray();
@@ -152,14 +146,12 @@ uno::Sequence< uno::Type > SAL_CALL GalleryItem::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId()
-    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 
 sal_Int8 SAL_CALL GalleryItem::getType()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
     sal_Int8            nRet = gallery::GalleryItemType::EMPTY;
@@ -222,12 +214,6 @@ sal_Int8 SAL_CALL GalleryItem::getType()
 }
 
 void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues )
-    throw (beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException,
-           std::exception)
 {
     const SolarMutexGuard aGuard;
 
@@ -267,10 +253,6 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt
 }
 
 void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValue )
-    throw (beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     const SolarMutexGuard aGuard;
 
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index d36754be8243..54dbcd2369b9 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -52,30 +52,26 @@ public:
 protected:
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XGalleryItem
-    virtual ::sal_Int8 SAL_CALL getType(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int8 SAL_CALL getType(  ) override;
 
     // PropertySetHelper
-    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override;
+    virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override;
 
 protected:
 
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 4cee8ce8ea20..ea3181bdc6b2 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -68,25 +68,21 @@ GalleryTheme::~GalleryTheme()
 
 
 OUString SAL_CALL GalleryTheme::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.gallery.GalleryTheme" );
 }
 
 sal_Bool SAL_CALL GalleryTheme::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL GalleryTheme::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.gallery.GalleryTheme" };
 }
 
 uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type >  aTypes( 5 );
     uno::Type*                  pTypes = aTypes.getArray();
@@ -101,21 +97,18 @@ uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId()
-    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 
 uno::Type SAL_CALL GalleryTheme::getElementType()
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<gallery::XGalleryItem>::get();
 }
 
 
 sal_Bool SAL_CALL GalleryTheme::hasElements()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
 
@@ -124,7 +117,6 @@ sal_Bool SAL_CALL GalleryTheme::hasElements()
 
 
 sal_Int32 SAL_CALL GalleryTheme::getCount()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
 
@@ -133,7 +125,6 @@ sal_Int32 SAL_CALL GalleryTheme::getCount()
 
 
 uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
     uno::Any            aRet;
@@ -158,7 +149,6 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex )
 
 
 OUString SAL_CALL GalleryTheme::getName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
     OUString     aRet;
@@ -171,7 +161,6 @@ OUString SAL_CALL GalleryTheme::getName(  )
 
 
 void SAL_CALL GalleryTheme::update(  )
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
 
@@ -185,7 +174,6 @@ void SAL_CALL GalleryTheme::update(  )
 
 ::sal_Int32 SAL_CALL GalleryTheme::insertURLByIndex(
     const OUString& rURL, ::sal_Int32 nIndex )
-    throw (lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
     sal_Int32           nRet = -1;
@@ -217,7 +205,6 @@ void SAL_CALL GalleryTheme::update(  )
 
 ::sal_Int32 SAL_CALL GalleryTheme::insertGraphicByIndex(
     const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex )
-    throw (lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
     sal_Int32           nRet = -1;
@@ -244,7 +231,6 @@ void SAL_CALL GalleryTheme::update(  )
 
 ::sal_Int32 SAL_CALL GalleryTheme::insertDrawingByIndex(
     const uno::Reference< lang::XComponent >& Drawing, sal_Int32 nIndex )
-    throw (lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
     sal_Int32 nRet = -1;
@@ -298,7 +284,6 @@ void SAL_CALL GalleryTheme::update(  )
 
 
 void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
 
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index daf53d57ef47..a8f78d6aafab 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -50,29 +50,29 @@ public:
 protected:
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
 
     // XGalleryThemes
-    virtual OUString SAL_CALL getName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL update(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL insertURLByIndex( const OUString& URL, ::sal_Int32 Index ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL insertGraphicByIndex( const css::uno::Reference< css::graphic::XGraphic >& Graphic, ::sal_Int32 Index ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL insertDrawingByIndex( const css::uno::Reference< css::lang::XComponent >& Drawing, ::sal_Int32 Index ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL update(  ) override;
+    virtual ::sal_Int32 SAL_CALL insertURLByIndex( const OUString& URL, ::sal_Int32 Index ) override;
+    virtual ::sal_Int32 SAL_CALL insertGraphicByIndex( const css::uno::Reference< css::graphic::XGraphic >& Graphic, ::sal_Int32 Index ) override;
+    virtual ::sal_Int32 SAL_CALL insertDrawingByIndex( const css::uno::Reference< css::lang::XComponent >& Drawing, ::sal_Int32 Index ) override;
+    virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) override;
 
     // SfxListener
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index 926aba8e21c1..755979493096 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -50,29 +50,29 @@ public:
 protected:
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XGalleryThemeProvider
-    virtual css::uno::Reference< css::gallery::XGalleryTheme > SAL_CALL insertNewByName( const OUString& ThemeName ) throw (css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& ThemeName ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::gallery::XGalleryTheme > SAL_CALL insertNewByName( const OUString& ThemeName ) override;
+    virtual void SAL_CALL removeByName( const OUString& ThemeName ) override;
 
 private:
 
@@ -87,26 +87,22 @@ GalleryThemeProvider::GalleryThemeProvider() :
 }
 
 OUString SAL_CALL GalleryThemeProvider::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" );
 }
 
 sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSeq { "com.sun.star.gallery.GalleryThemeProvider" };
     return aSeq;
 }
 
 uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type >  aTypes( 6 );
     uno::Type*                  pTypes = aTypes.getArray();
@@ -122,13 +118,11 @@ uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL GalleryThemeProvider::getImplementationId()
-    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& rArguments )
-    throw ( uno::Exception, uno::RuntimeException, std::exception )
 {
     uno::Sequence< beans::PropertyValue >   aParams;
     sal_Int32                               i;
@@ -150,14 +144,12 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >&
 
 
 uno::Type SAL_CALL GalleryThemeProvider::getElementType()
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<gallery::XGalleryTheme>::get();
 }
 
 
 sal_Bool SAL_CALL GalleryThemeProvider::hasElements()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
 
@@ -166,7 +158,6 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements()
 
 
 uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName )
-    throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
     uno::Any            aRet;
@@ -185,7 +176,6 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName )
 
 
 uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames()
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
     sal_uInt32                          i = 0, nCount = ( mpGallery ? mpGallery->GetThemeCount() : 0 ), nRealCount = 0;
@@ -206,7 +196,6 @@ uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames()
 
 
 sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName )
-    throw (uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
 
@@ -220,7 +209,6 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName )
 
 
 uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const OUString& rThemeName )
-    throw (container::ElementExistException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
     uno::Reference< gallery::XGalleryTheme >    xRet;
@@ -242,7 +230,6 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe
 
 
 void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName )
-    throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     const SolarMutexGuard aGuard;
 
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 432a786f5b56..3b6af7b87fa4 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -75,9 +75,9 @@ public:
     OutputStorageWrapper_Impl();
 
 // css::io::XOutputStream
-    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush() throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput() throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 
     SvStream*   GetStream();
 };
@@ -100,21 +100,18 @@ SvStream *OutputStorageWrapper_Impl::GetStream()
 
 void SAL_CALL OutputStorageWrapper_Impl::writeBytes(
         const Sequence< sal_Int8 >& aData)
-    throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception)
 {
     MutexGuard          aGuard( maMutex );
     xOut->writeBytes( aData );
 }
 
 void SAL_CALL OutputStorageWrapper_Impl::flush()
-    throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception)
 {
     MutexGuard          aGuard( maMutex );
     xOut->flush();
 }
 
 void SAL_CALL OutputStorageWrapper_Impl::closeOutput()
-    throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception)
 {
     MutexGuard          aGuard( maMutex );
     xOut->closeOutput();
@@ -588,7 +585,6 @@ void SvXMLEmbeddedObjectHelper::Destroy(
 
 // XGraphicObjectResolver: alien objects!
 OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL(const OUString& rURL)
-    throw(RuntimeException, std::exception)
 {
     MutexGuard          aGuard( maMutex );
 
@@ -613,7 +609,6 @@ OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL(const OUSt
 // XNameAccess: alien objects!
 Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName(
         const OUString& rURLStr )
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard          aGuard( maMutex );
     Any aRet;
@@ -711,13 +706,11 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName(
 }
 
 Sequence< OUString > SAL_CALL SvXMLEmbeddedObjectHelper::getElementNames()
-    throw (RuntimeException, std::exception)
 {
    return Sequence< OUString >(0);
 }
 
 sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr )
-    throw (RuntimeException, std::exception)
 {
     MutexGuard          aGuard( maMutex );
     if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode )
@@ -740,7 +733,6 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr
 
 // XNameAccess
 Type SAL_CALL SvXMLEmbeddedObjectHelper::getElementType()
-    throw (RuntimeException, std::exception)
 {
     MutexGuard          aGuard( maMutex );
     if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode )
@@ -750,7 +742,6 @@ Type SAL_CALL SvXMLEmbeddedObjectHelper::getElementType()
 }
 
 sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasElements()
-    throw (RuntimeException, std::exception)
 {
     MutexGuard          aGuard( maMutex );
     if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode )
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 4ef3bfe43dff..bb922a2b2cbd 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -75,11 +75,11 @@ class SvXMLGraphicInputStream:
 {
 private:
 
-    virtual sal_Int32   SAL_CALL    readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override;
-    virtual sal_Int32   SAL_CALL    readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override;
-    virtual void        SAL_CALL    skipBytes(sal_Int32 nBytesToSkip) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override;
-    virtual sal_Int32   SAL_CALL    available() throw(NotConnectedException, RuntimeException, std::exception) override;
-    virtual void        SAL_CALL    closeInput() throw(NotConnectedException, RuntimeException, std::exception) override;
+    virtual sal_Int32   SAL_CALL    readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override;
+    virtual sal_Int32   SAL_CALL    readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override;
+    virtual void        SAL_CALL    skipBytes(sal_Int32 nBytesToSkip) override;
+    virtual sal_Int32   SAL_CALL    available() override;
+    virtual void        SAL_CALL    closeInput() override;
 
 private:
 
@@ -151,7 +151,6 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId )
 }
 
 sal_Int32 SAL_CALL SvXMLGraphicInputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead )
-    throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception )
 {
     if( !mxStmWrapper.is() )
         throw NotConnectedException();
@@ -160,7 +159,6 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readBytes( Sequence< sal_Int8 >& rDa
 }
 
 sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead )
-    throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception )
 {
     if( !mxStmWrapper.is() )
         throw NotConnectedException() ;
@@ -169,7 +167,6 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >&
 }
 
 void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip )
-    throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception )
 {
     if( !mxStmWrapper.is() )
         throw NotConnectedException() ;
@@ -177,7 +174,7 @@ void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip )
     mxStmWrapper->skipBytes( nBytesToSkip );
 }
 
-sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedException, RuntimeException, std::exception )
+sal_Int32 SAL_CALL SvXMLGraphicInputStream::available()
 {
     if( !mxStmWrapper.is() )
         throw NotConnectedException() ;
@@ -185,7 +182,7 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedExcep
     return mxStmWrapper->available();
 }
 
-void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException, RuntimeException, std::exception )
+void SAL_CALL SvXMLGraphicInputStream::closeInput()
 {
     if( !mxStmWrapper.is() )
         throw NotConnectedException() ;
@@ -199,9 +196,9 @@ class SvXMLGraphicOutputStream:
 private:
 
     // XOutputStream
-    virtual void SAL_CALL           writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           writeBytes( const Sequence< sal_Int8 >& rData ) override;
+    virtual void SAL_CALL           flush() override;
+    virtual void SAL_CALL           closeOutput() override;
 
 private:
 
@@ -242,7 +239,6 @@ SvXMLGraphicOutputStream::~SvXMLGraphicOutputStream()
 }
 
 void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 >& rData )
-    throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception )
 {
     if( !mxStmWrapper.is() )
         throw NotConnectedException() ;
@@ -251,7 +247,6 @@ void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 >&
 }
 
 void SAL_CALL SvXMLGraphicOutputStream::flush()
-    throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception )
 {
     if( !mxStmWrapper.is() )
         throw NotConnectedException() ;
@@ -260,7 +255,6 @@ void SAL_CALL SvXMLGraphicOutputStream::flush()
 }
 
 void SAL_CALL SvXMLGraphicOutputStream::closeOutput()
-    throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception )
 {
     if( !mxStmWrapper.is() )
         throw NotConnectedException() ;
@@ -799,7 +793,6 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper )
 
 // XGraphicObjectResolver
 OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& rURL )
-    throw(uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard   aGuard( maMutex );
     const sal_Int32     nIndex = maGrfURLs.size();
@@ -843,7 +836,6 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& r
 
 // XBinaryStreamResolver
 Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const OUString& rURL )
-    throw( RuntimeException, std::exception )
 {
     Reference< XInputStream >   xRet;
     OUString                    aPictureStorageName, aGraphicId;
@@ -864,7 +856,6 @@ Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const OUS
 }
 
 Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream()
-    throw( RuntimeException, std::exception )
 {
     Reference< XOutputStream > xRet;
 
@@ -882,7 +873,6 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream()
 }
 
 OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOutputStream >& rxBinaryStream )
-    throw( RuntimeException, std::exception )
 {
     OUString aRet;
 
@@ -947,29 +937,20 @@ protected:
 
     // ____ XInitialization ____
     // one argument is allowed, which is the XStorage
-    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
-        throw (Exception,
-               RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override;
 
     // ____ XGraphicObjectResolver ____
-    virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL )
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) override;
 
     // ____ XBinaryStreamResolver ____
-    virtual Reference< io::XInputStream > SAL_CALL getInputStream( const OUString& aURL )
-        throw (RuntimeException, std::exception) override;
-    virtual Reference< io::XOutputStream > SAL_CALL createOutputStream()
-        throw (RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream )
-        throw (RuntimeException, std::exception) override;
+    virtual Reference< io::XInputStream > SAL_CALL getInputStream( const OUString& aURL ) override;
+    virtual Reference< io::XOutputStream > SAL_CALL createOutputStream() override;
+    virtual OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) override;
 
     // ____ XServiceInfo ____
-    virtual OUString SAL_CALL getImplementationName()
-        throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     SvXMLGraphicHelperMode              m_eGraphicHelperMode;
@@ -995,7 +976,6 @@ void SAL_CALL SvXMLGraphicImportExportHelper::disposing()
 // ____ XInitialization ____
 void SAL_CALL SvXMLGraphicImportExportHelper::initialize(
     const Sequence< Any >& aArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     Reference< embed::XStorage > xStorage;
     if( aArguments.getLength() > 0 )
@@ -1011,7 +991,6 @@ void SAL_CALL SvXMLGraphicImportExportHelper::initialize(
 
 // ____ XGraphicObjectResolver ____
 OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const OUString& aURL )
-    throw (uno::RuntimeException, std::exception)
 {
     return m_xGraphicObjectResolver->resolveGraphicObjectURL( aURL );
 }
@@ -1019,24 +998,20 @@ OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const
 
 // ____ XBinaryStreamResolver ____
 Reference< io::XInputStream > SAL_CALL SvXMLGraphicImportExportHelper::getInputStream( const OUString& aURL )
-    throw (uno::RuntimeException, std::exception)
 {
     return m_xBinaryStreamResolver->getInputStream( aURL );
 }
 Reference< io::XOutputStream > SAL_CALL SvXMLGraphicImportExportHelper::createOutputStream()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_xBinaryStreamResolver->createOutputStream();
 }
 OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream )
-    throw (uno::RuntimeException, std::exception)
 {
     return m_xBinaryStreamResolver->resolveOutputStream( aBinaryStream );
 }
 
 // ____ XServiceInfo ____
 OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     if( m_eGraphicHelperMode == SvXMLGraphicHelperMode::Read )
         return OUString("com.sun.star.comp.Svx.GraphicImportHelper");
@@ -1044,13 +1019,11 @@ OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName()
 }
 
 sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const OUString& ServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service
     Sequence< OUString > aSupportedServiceNames( 2 );
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 23391317e81f..62732b87671d 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -195,7 +195,6 @@ bool SvxXMLXTableExportComponent::save(
         const uno::Reference<container::XNameContainer >& xTable,
         const uno::Reference<embed::XStorage >& xStorage,
         OUString *pOptName )
-    throw (css::uno::RuntimeException, std::exception)
 {
     bool bRet = false;
     SfxMedium* pMedium = nullptr;
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index 0d6b558a7240..baa11096f4e0 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -35,10 +35,10 @@ public:
     static SwSmartTagMgr& Get();
 
     // css::util::XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 
     // css::util::XChangesListener
-      virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw(css::uno::RuntimeException, std::exception) override;
+      virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override;
 };
 
 #endif
diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx
index a85fa6881c8f..3f15248a6dda 100644
--- a/sw/inc/TextCursorHelper.hxx
+++ b/sw/inc/TextCursorHelper.hxx
@@ -33,7 +33,7 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     virtual const SwPaM*        GetPaM() const  = 0;
     virtual SwPaM*              GetPaM()        = 0;
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index aaef5a76b08f..05240c9169d9 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -273,13 +273,11 @@ public:
         const css::uno::Reference< css::drawing::XShape >& _rxShape,
         const long _nIndex,
         const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
-    )   throw (css::uno::RuntimeException, std::exception) override;
+    ) override;
     virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel
-        (css::beans::XPropertySet* pSet)
-        throw (css::uno::RuntimeException) override;
+        (css::beans::XPropertySet* pSet) override;
     virtual css::uno::Reference< css::accessibility::XAccessible >   GetAccessibleCaption (
-        const css::uno::Reference< css::drawing::XShape > & xShape)
-    throw (css::uno::RuntimeException) override;
+        const css::uno::Reference< css::drawing::XShape > & xShape) override;
 
     // additional Core/Pixel conversions for internal use; also works
     // for preview
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 82f15ad899fe..59defb90ad27 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -62,14 +62,14 @@ public:
     virtual ~SwLinguServiceEventListener() override;
 
     /// XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObj ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObj ) override;
 
     /// XLinguServiceEventListener
-    virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& rLngSvcEvent ) override;
 
     /// XTerminateListener
-    virtual void SAL_CALL queryTermination( const css::lang::EventObject& rEventObj ) throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& rEventObj ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryTermination( const css::lang::EventObject& rEventObj ) override;
+    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& rEventObj ) override;
 };
 
 #endif
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index 4f4d3907d058..982fd62cd12f 100644
--- a/sw/inc/finalthreadmanager.hxx
+++ b/sw/inc/finalthreadmanager.hxx
@@ -42,24 +42,24 @@ public:
     explicit FinalThreadManager(css::uno::Reference< css::uno::XComponentContext > const & context);
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::util::XJobManager:
-    virtual void SAL_CALL registerJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL releaseJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancelAllJobs() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL registerJob(const css::uno::Reference< css::util::XCancellable > & Job) override;
+    virtual void SAL_CALL releaseJob(const css::uno::Reference< css::util::XCancellable > & Job) override;
+    virtual void SAL_CALL cancelAllJobs() override;
 
     // css::frame::XTerminateListener2
-    virtual void SAL_CALL cancelTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancelTermination( const css::lang::EventObject& Event ) override;
 
     // css::frame::XTerminateListener (inherited via css::frame::XTerminateListener2)
-    virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override;
 
     // ::com::sun:star::lang::XEventListener (inherited via css::frame::XTerminateListener)
-    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;
 
 private:
     FinalThreadManager(FinalThreadManager &) = delete;
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 40b6d9777456..70d3cf8f4f75 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -96,7 +96,7 @@ public:
     /// Get a shape by index, excluding TextBoxes.
     ///
     /// @throws css::lang::IndexOutOfBoundsException
-    static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex) throw(css::lang::IndexOutOfBoundsException);
+    static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex);
     /// Get the order of the shape, excluding TextBoxes.
     static sal_Int32 getOrdNum(const SdrObject* pObject);
     /// If pTextBox is a textbox, then set rWrapThrough to the surround of its shape.
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 944c869b48b6..680db85abdd1 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -138,16 +138,10 @@ class SwChartDataProvider :
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments, bool bTestOnly = false )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception);
+    css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments, bool bTestOnly = false );
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception);
+    css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false );
 
     static OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation );
 
@@ -160,34 +154,30 @@ public:
     virtual ~SwChartDataProvider() override;
 
     // XDataProvider
-    virtual sal_Bool SAL_CALL createDataSourcePossible( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments( const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL createDataSourcePossible( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments( const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) override;
+    virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) override;
+    virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection(  ) override;
 
     virtual css::uno::Reference<css::chart2::data::XDataSequence>
         SAL_CALL createDataSequenceByValueArray(
-            const OUString& aRole, const OUString& aRangeRepresentation )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const OUString& aRole, const OUString& aRangeRepresentation ) override;
 
     // XRangeXMLConversion
-    virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) override;
+    virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     void        AddDataSequence( const SwTable &rTable, css::uno::Reference< css::chart2::data::XDataSequence > &rxDataSequence );
     void        RemoveDataSequence( const SwTable &rTable, css::uno::Reference< css::chart2::data::XDataSequence > &rxDataSequence );
@@ -222,12 +212,12 @@ public:
     virtual ~SwChartDataSource() override;
 
     // XDataSource
-    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 typedef cppu::WeakImplHelper
@@ -280,62 +270,52 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // XDataSequence
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual OUString SAL_CALL getSourceRangeRepresentation()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( css::chart2::data::LabelOrigin eLabelOrigin )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override;
+    virtual OUString SAL_CALL getSourceRangeRepresentation() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( css::chart2::data::LabelOrigin eLabelOrigin ) override;
+    virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override;
 
     // XTextualDataSequence
-    virtual css::uno::Sequence< OUString > SAL_CALL getTextualData()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override;
 
     // XNumericalDataSequence
-    virtual css::uno::Sequence< double > SAL_CALL getNumericalData()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XModifiable
-    virtual sal_Bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isModified(  ) override;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) 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;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     SwFrameFormat*   GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
     bool    DeleteBox( const SwTableBox &rBox );
@@ -375,33 +355,33 @@ public:
     virtual ~SwChartLabeledDataSequence() override;
 
     // XLabeledDataSequence
-    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValues( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLabel( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues(  ) override;
+    virtual void SAL_CALL setValues( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel(  ) override;
+    virtual void SAL_CALL setLabel( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) 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;
 
     // XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 
     // XModifyBroadcaster
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 };
 
 #endif
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 3a830353ae38..67db942e0379 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -279,22 +279,22 @@ public:
     SwXTextTables(SwDoc* pDoc);
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat);
 };
@@ -318,25 +318,25 @@ public:
     SwXFrames(SwDoc* pDoc, FlyCntType eSet);
 
     //XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class SwXTextFrames : public SwXFrames
@@ -347,9 +347,9 @@ public:
     SwXTextFrames(SwDoc* pDoc);
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -361,9 +361,9 @@ public:
         SwXTextGraphicObjects(SwDoc* pDoc);
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -375,9 +375,9 @@ public:
     SwXTextEmbeddedObjects(SwDoc* pDoc);
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -390,22 +390,22 @@ public:
     SwXTextSections(SwDoc* pDoc);
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static css::uno::Reference< css::text::XTextSection> GetObject( SwSectionFormat& rFormat );
 };
@@ -419,22 +419,22 @@ class SwXBookmarks : public SwCollectionBaseClass,
         SwXBookmarks(SwDoc* pDoc);
 
         //XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int32 SAL_CALL getCount() override;
+        virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
         //XNameAccess
-        virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+        virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
         //XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
 
         //XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -451,12 +451,12 @@ public:
     SwXNumberingRulesCollection( SwDoc* pDoc );
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 };
 
 typedef
@@ -478,17 +478,17 @@ public:
     SwXFootnotes(bool bEnd, SwDoc* pDoc);
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static css::uno::Reference< css::text::XFootnote> GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat );
 };
@@ -502,22 +502,22 @@ public:
     SwXReferenceMarks(SwDoc* pDoc);
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 2f3e24fef394..482a1380e537 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -101,11 +101,7 @@ namespace SwUnoCursorHelper
     /// @throws css::uno::RuntimeException
     void                        InsertFile(SwUnoCursor* pUnoCursor,
                                     const OUString& rURL,
-                                    const css::uno::Sequence< css::beans::PropertyValue >& rOptions)
-        throw (css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::RuntimeException,
-               std::exception);
+                                    const css::uno::Sequence< css::beans::PropertyValue >& rOptions);
 
     void                        getNumberingProperty(
                                     SwPaM& rPam,
@@ -126,20 +122,17 @@ namespace SwUnoCursorHelper
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     void    makeRedline( SwPaM& rPaM, const OUString& RedlineType,
-            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties );
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     void    makeTableRowRedline( SwTableLine& rTableLine, const OUString& RedlineType,
-            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties );
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     SW_DLLPUBLIC void    makeTableCellRedline( SwTableBox& rTableBox, const OUString& RedlineType,
-            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties );
 
     /// @param bTableMode: attributes should be applied to a table selection
     void SetCursorAttr(SwPaM & rPam, const SfxItemSet & rSet,
@@ -171,12 +164,7 @@ namespace SwUnoCursorHelper
             const SfxItemPropertySet & rPropSet,
             const OUString & rPropertyName,
             const css::uno::Any & rValue,
-            const SetAttrMode nAttrMode = SetAttrMode::DEFAULT)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException);
+            const SetAttrMode nAttrMode = SetAttrMode::DEFAULT);
     /// @param bTableMode: attributes should be applied to a table selection
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::beans::PropertyVetoException
@@ -189,24 +177,14 @@ namespace SwUnoCursorHelper
             const css::uno::Sequence< css::beans::PropertyValue > &
             rPropertyValues,
             const SetAttrMode nAttrMode = SetAttrMode::DEFAULT,
-            const bool bTableMode = false)
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception);
+            const bool bTableMode = false);
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
     css::uno::Any  GetPropertyValue(
             SwPaM& rPaM,
             const SfxItemPropertySet & rPropSet,
-            const OUString & rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception);
+            const OUString & rPropertyName);
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< css::beans::PropertyState > GetPropertyStates(
@@ -215,53 +193,40 @@ namespace SwUnoCursorHelper
             const css::uno::Sequence< OUString >&
                 rPropertyNames,
             const SwGetPropertyStatesCaller eCaller =
-                SW_PROPERTY_STATE_CALLER_DEFAULT)
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException,
-               std::exception);
+                SW_PROPERTY_STATE_CALLER_DEFAULT);
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
     css::beans::PropertyState GetPropertyState(
             SwPaM & rPaM,
             const SfxItemPropertySet & rPropSet,
-            const OUString & rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException);
+            const OUString & rPropertyName);
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::uno::RuntimeException
     void SetPropertyToDefault(
             SwPaM & rPaM,
             const SfxItemPropertySet & rPropSet,
-            const OUString & rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception);
+            const OUString & rPropertyName);
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
     css::uno::Any  GetPropertyDefault(
             SwPaM & rPaM,
             const SfxItemPropertySet & rPropSet,
-            const OUString & rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException);
+            const OUString & rPropertyName);
 
     bool SetPageDesc(
             const css::uno::Any& rValue,
             SwDoc & rDoc, SfxItemSet & rSet);
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void SetTextFormatColl(const css::uno::Any & rAny, SwPaM & rPaM)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+    void SetTextFormatColl(const css::uno::Any & rAny, SwPaM & rPaM);
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     /// @throws css::uno::DeploymentException
     bool SetCursorPropertyValue(
             SfxItemPropertySimpleEntry const& rEntry,
             css::uno::Any const& rValue,
-            SwPaM & rPam, SfxItemSet & rItemSet)
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException,
-               css::uno::DeploymentException, std::exception);
+            SwPaM & rPam, SfxItemSet & rItemSet);
 
     /// try to get something that can be selected out of the XInterface
     /// at most one of the out parameters gets assigned a non-null value
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 3d41e92e8552..132d74eb8234 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -57,7 +57,7 @@ public:
     // The following method is called when a SvxShape-object is to be created.
     // Derived classes may obtain at this point a derivation or an object
     // that is aggregating a SvxShape.
-    virtual css::uno::Reference< css::drawing::XShape >  CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::drawing::XShape >  CreateShape( SdrObject *pObj ) const override;
 };
 
 typedef cppu::WeakAggImplHelper4
@@ -78,33 +78,31 @@ public:
     virtual ~SwXDrawPage() override;
 
     //XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XShapes
-    virtual void SAL_CALL add(const css::uno::Reference< css::drawing::XShape > & xShape) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL remove(const css::uno::Reference< css::drawing::XShape > & xShape) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL add(const css::uno::Reference< css::drawing::XShape > & xShape) override;
+    virtual void SAL_CALL remove(const css::uno::Reference< css::drawing::XShape > & xShape) override;
 
     //XShapeGrouper
-    virtual css::uno::Reference< css::drawing::XShapeGroup >  SAL_CALL group(const css::uno::Reference< css::drawing::XShapes > & xShapes)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL ungroup(const css::uno::Reference< css::drawing::XShapeGroup > & aGroup) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::drawing::XShapeGroup >  SAL_CALL group(const css::uno::Reference< css::drawing::XShapes > & xShapes) override;
+    virtual void SAL_CALL ungroup(const css::uno::Reference< css::drawing::XShapeGroup > & aGroup) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     SwFmDrawPage*   GetSvxPage();
     // renamed and outlined to detect where it's called
@@ -208,10 +206,7 @@ class SwXShape : public SwXShapeBaseClass,
         @throws css::lang::WrappedTargetException
         @throws css::uno::RuntimeException
     */
-    css::uno::Any _getPropAtAggrObj( const OUString& _rPropertyName )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException);
+    css::uno::Any _getPropAtAggrObj( const OUString& _rPropertyName );
 
 protected:
     virtual ~SwXShape() override;
@@ -222,47 +217,47 @@ public:
     SwXShape(css::uno::Reference< css::uno::XInterface > & xShape);
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //XTextContent
-    virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextRange >  SAL_CALL getAnchor() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange >  SAL_CALL getAnchor() override;
 
     //XComponent
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
-    virtual css::awt::Point SAL_CALL getPosition(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getShapeType(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition(  ) override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
+    virtual OUString SAL_CALL getShapeType(  ) override;
 
     SwShapeDescriptor_Impl*     GetDescImpl() {return pImpl;}
     SwFrameFormat*               GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
@@ -281,21 +276,21 @@ protected:
 public:
     SwXGroupShape(css::uno::Reference< css::uno::XInterface > & xShape);
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw() override;
     virtual void SAL_CALL release(  ) throw() override;
 
     //XShapes
-    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
+    virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override;
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 };
 #endif
 
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index 7bc0660af302..5d30d19bef11 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -46,31 +46,22 @@ public:
     static bool getInstanceName(const SwFieldType& rFieldType, OUString& rName);
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XNameAccess
     virtual css::uno::Any SAL_CALL getByName(
-            const OUString& rName)
-        throw (css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getElementNames() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& rName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& rName) override;
 
 };
 
@@ -98,38 +89,29 @@ public:
     virtual void    Invalidate() override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
     virtual css::uno::Reference<
             css::container::XEnumeration >  SAL_CALL
-        createEnumeration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createEnumeration() override;
 
     // XRefreshable
-    virtual void SAL_CALL refresh()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh() override;
     virtual void SAL_CALL addRefreshListener(
             const css::uno::Reference<
-                css::util::XRefreshListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+                css::util::XRefreshListener>& xListener) override;
     virtual void SAL_CALL removeRefreshListener(
             const css::uno::Reference<
-                css::util::XRefreshListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+                css::util::XRefreshListener>& xListener) override;
 
 };
 
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 322c060321ef..4bf9e3aa0647 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -92,55 +92,55 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
 
     //XNamed
-    virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& Name_) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
      //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //XShape
-    virtual css::awt::Point SAL_CALL getPosition(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Size SAL_CALL getSize(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition(  ) override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
 
     //XShapeDescriptor
-    virtual OUString SAL_CALL getShapeType() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getShapeType() override;
 
     //Base implementation
     //XComponent
-    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& xListener) override;
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& xListener) override;
 
     // XTextContent
-    virtual void SAL_CALL attach(const css::uno::Reference<css::text::XTextRange>& xTextRange) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference<css::text::XTextRange>  SAL_CALL getAnchor() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL attach(const css::uno::Reference<css::text::XTextRange>& xTextRange) override;
+    virtual css::uno::Reference<css::text::XTextRange>  SAL_CALL getAnchor() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void attachToRange(const css::uno::Reference< css::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
+    void attachToRange(const css::uno::Reference< css::text::XTextRange > & xTextRange);
 
     const SwFrameFormat* GetFrameFormat() const
     {
@@ -177,8 +177,7 @@ protected:
     virtual const SwStartNode *GetStartNode() const override;
 
     virtual css::uno::Reference< css::text::XTextCursor >
-        CreateCursor()
-        throw (css::uno::RuntimeException) override;
+        CreateCursor() override;
 
     virtual ~SwXTextFrame() override;
 
@@ -192,50 +191,50 @@ public:
     // FIXME: EVIL HACK:  make available for SwXFrame::attachToRange
     using SwXText::SetDoc;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw() override;
     virtual void SAL_CALL release(  ) throw() override;
 
     //XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     //XTextFrame
-    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() override;
 
     //XText
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override;
 
     //XEnumerationAccess - frueher XParagraphEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XTextContent
-    virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor(  ) override;
 
     //XComponent
-    virtual void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XEventsSupplier
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) override;
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XPropertySet
-    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
     void * SAL_CALL operator new( size_t ) throw();
     void SAL_CALL operator delete( void * ) throw();
@@ -262,12 +261,12 @@ public:
         CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XEventsSupplier
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) override;
 
     void * SAL_CALL operator new( size_t ) throw();
     void SAL_CALL operator delete( void * ) throw();
@@ -297,19 +296,19 @@ public:
         CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
     //XEmbeddedObjectSupplier2
-    virtual css::uno::Reference< css::lang::XComponent >  SAL_CALL getEmbeddedObject() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual ::sal_Int64 SAL_CALL getAspect() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getReplacementGraphic() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::lang::XComponent >  SAL_CALL getEmbeddedObject() override;
+    virtual css::uno::Reference< css::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() override;
+    virtual ::sal_Int64 SAL_CALL getAspect() override;
+    virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getReplacementGraphic() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XEventsSupplier
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) override;
     void * SAL_CALL operator new( size_t ) throw();
     void SAL_CALL operator delete( void * ) throw();
 };
@@ -324,10 +323,10 @@ public:
     virtual ~SwXOLEListener() override;
 
 // css::lang::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;
 
 // css::util::XModifyListener
-    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
 
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx
index bd33abbfb10c..f2714217cf0c 100644
--- a/sw/inc/unoidxcoll.hxx
+++ b/sw/inc/unoidxcoll.hxx
@@ -35,39 +35,26 @@ public:
     SwXDocumentIndexes(SwDoc *const pDoc);
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex)
-        throw (css::lang::IndexOutOfBoundsException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     // XNameAccess
     virtual css::uno::Any SAL_CALL getByName(
-            const OUString& rName)
-        throw (css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getElementNames() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& rName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& rName) override;
 
 };
 
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index a9a545523757..4c598c5c63a9 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -103,171 +103,109 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XPropertyState
     virtual css::beans::PropertyState SAL_CALL
-        getPropertyState(const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+        getPropertyState(const OUString& rPropertyName) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
         getPropertyStates(
-            const css::uno::Sequence< OUString >& rPropertyNames)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >& rPropertyNames) override;
     virtual void SAL_CALL setPropertyToDefault(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual css::uno::Any SAL_CALL getPropertyDefault(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
 
     // XMultiPropertySet
     virtual void SAL_CALL setPropertyValues(
             const css::uno::Sequence< OUString >&      rPropertyNames,
-            const css::uno::Sequence< css::uno::Any >& rValues)
-        throw (css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::uno::Any >& rValues) override;
     virtual css::uno::Sequence< css::uno::Any >
         SAL_CALL getPropertyValues(
-            const css::uno::Sequence< OUString >&  rPropertyNames)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >&  rPropertyNames) override;
     virtual void SAL_CALL addPropertiesChangeListener(
             const css::uno::Sequence< OUString >&         rPropertyNames,
-            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertiesChangeListener(
-            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override;
     virtual void SAL_CALL firePropertiesChangeEvent(
             const css::uno::Sequence< OUString >&        rPropertyNames,
-            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override;
 
     // XTolerantMultiPropertySet
     virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL
         setPropertyValuesTolerant(
             const css::uno::Sequence< OUString >&      rPropertyNames,
-            const css::uno::Sequence< css::uno::Any >& rValues)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::uno::Any >& rValues) override;
     virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL
         getPropertyValuesTolerant(
-            const css::uno::Sequence< OUString >& rPropertyNames)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >& rPropertyNames) override;
     virtual css::uno::Sequence<
             css::beans::GetDirectPropertyTolerantResult > SAL_CALL
         getDirectPropertyValuesTolerant(
-            const css::uno::Sequence< OUString >& rPropertyNames)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >& rPropertyNames) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL
-        createEnumeration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createEnumeration() override;
 
     // XContentEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-        createContentEnumeration(const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        createContentEnumeration(const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getAvailableServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAvailableServiceNames() override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
     // XTextRange
     virtual css::uno::Reference< css::text::XText >
-        SAL_CALL getText()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString(const OUString& rString)
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getText() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString(const OUString& rString) override;
 
 };
 
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 38476880edca..c1be37289a6a 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -39,23 +39,23 @@ class SwXRedlineText :
 public:
     SwXRedlineText(SwDoc* pDoc, SwNodeIndex aNodeIndex);
 
-    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw() override {OWeakObject::acquire();}
     virtual void SAL_CALL release(  ) throw() override {OWeakObject::release();}
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     //XText
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override;
 
     //XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() override;
 
     //XElementAccess (via XEnumerationAccess)
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 };
 
 typedef
@@ -76,32 +76,32 @@ public:
     virtual ~SwXRedline() override;
 
 
-    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw() override {OWeakObject::acquire();}
     virtual void SAL_CALL release(  ) throw() override {OWeakObject::release();}
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     //XText
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     const SwRangeRedline*    GetRedline() const {return pRedline;}
 protected:
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index db98d1c6f7c4..420e81cab4de 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -46,20 +46,20 @@ public:
     SwXRedlines(SwDoc* pDoc);
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XEnumerationAccess - was: XParagraphEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static css::beans::XPropertySet*           GetObject( SwRangeRedline& rRedline, SwDoc& rDoc );
 };
@@ -76,13 +76,13 @@ public:
     SwXRedlineEnumeration(SwDoc& rDoc);
 
     //XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL nextElement() throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 protected:
     //SwClient
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index a7cc9bda12c1..0c2e9c796e95 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -54,18 +54,18 @@ public:
     SwXFootnoteProperties(SwDoc* pDoc);
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     void            Invalidate() {pDoc = nullptr;}
 };
@@ -84,18 +84,18 @@ public:
     SwXEndnoteProperties(SwDoc* pDoc);
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     void            Invalidate() {pDoc = nullptr;}
 };
@@ -114,18 +114,18 @@ public:
     SwXLineNumberingProperties(SwDoc* pDoc);
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     void            Invalidate() {pDoc = nullptr;}
 };
@@ -161,44 +161,43 @@ public:
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override;
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XNamed
-    virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& Name_) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     css::uno::Sequence< css::beans::PropertyValue>
             GetNumberingRuleByIndex(const SwNumRule& rNumRule, sal_Int32 nIndex)const;
     /// @throws css::uno::RuntimeException
     /// @throws css::lang::IllegalArgumentException
     void    SetNumberingRuleByIndex(SwNumRule& rNumRule,
-                const css::uno::Sequence< css::beans::PropertyValue>& rProperties, sal_Int32 nIndex)
-                throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception);
+                const css::uno::Sequence< css::beans::PropertyValue>& rProperties, sal_Int32 nIndex);
 
     const OUString*         GetNewCharStyleNames() const {return m_sNewCharStyleNames;}
     const OUString*         GetBulletFontNames() const {return m_sNewBulletFontNames;}
@@ -232,9 +231,9 @@ public:
     using SwXNumberingRules::Invalidate;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -271,28 +270,28 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XTextColumns
-    virtual sal_Int32 SAL_CALL getReferenceValue(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getColumnCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::text::TextColumn > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColumns( const css::uno::Sequence< css::text::TextColumn >& Columns ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getReferenceValue(  ) override;
+    virtual sal_Int16 SAL_CALL getColumnCount(  ) override;
+    virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) override;
+    virtual css::uno::Sequence< css::text::TextColumn > SAL_CALL getColumns(  ) override;
+    virtual void SAL_CALL setColumns( const css::uno::Sequence< css::text::TextColumn >& Columns ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     sal_Int32   GetSepLineWidth() const {return nSepLineWidth;}
     sal_Int32   GetSepLineColor() const {return     nSepLineColor;}
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 7cc1af65ada0..cd19de5657a7 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -71,37 +71,37 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XSearchDescriptor
-    virtual OUString SAL_CALL getSearchString(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSearchString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSearchString(  ) override;
+    virtual void SAL_CALL setSearchString( const OUString& aString ) override;
 
     //XReplaceDescriptor
-    virtual OUString SAL_CALL getReplaceString() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getReplaceString() override;
+    virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XPropertyReplace
-    virtual sal_Bool SAL_CALL getValueSearch() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getSearchAttributes() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setSearchAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) throw( css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getReplaceAttributes() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setReplaceAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) throw( css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL getValueSearch() override;
+    virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getSearchAttributes() override;
+    virtual void SAL_CALL setSearchAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getReplaceAttributes() override;
+    virtual void SAL_CALL setReplaceAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     void    FillSearchItemSet(SfxItemSet& rSet) const;
     void    FillReplaceItemSet(SfxItemSet& rSet) const;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 80f527ec7ba7..3f45f52e175f 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -72,29 +72,26 @@ public:
     SwXStyleFamilies(SwDocShell& rDocShell);
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XStyleLoader
-    virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const css::uno::Sequence< css::beans::PropertyValue >& aOptions)
-        throw (css::io::IOException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getStyleLoaderOptions() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const css::uno::Sequence< css::beans::PropertyValue >& aOptions) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getStyleLoaderOptions() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static css::uno::Reference<css::style::XStyle> CreateStyle(SfxStyleFamily eFamily, SwDoc& rDoc);
     // FIXME: This is very ugly as is the whole conditional paragraph style
@@ -129,17 +126,17 @@ public:
     SwXAutoStyles(SwDocShell& rDocShell);
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL SAL_CALL hasElements(  ) override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
 };
 
@@ -158,14 +155,14 @@ public:
     virtual ~SwXAutoStyleFamily() override;
 
     //XAutoStyleFamily
-    virtual css::uno::Reference< css::style::XAutoStyle > SAL_CALL insertStyle( const css::uno::Sequence< css::beans::PropertyValue >& Values ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::style::XAutoStyle > SAL_CALL insertStyle( const css::uno::Sequence< css::beans::PropertyValue >& Values ) override;
 
     //XEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration(  ) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL SAL_CALL hasElements(  ) override;
 
 };
 
@@ -178,8 +175,8 @@ public:
     virtual ~SwXAutoStylesEnumerator() override;
 
     //XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement(  ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override;
+    virtual css::uno::Any SAL_CALL nextElement(  ) override;
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 };
@@ -201,7 +198,7 @@ private:
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames );
 
 public:
 
@@ -209,34 +206,34 @@ public:
     virtual ~SwXAutoStyle() override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XMultiPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //XMultiPropertyStates
-    virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAllPropertiesToDefault(  ) override;
+    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     // Special
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties() override;
 protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 
@@ -298,42 +295,42 @@ public:
     void SetPhysical();
 
     //XStyle
-    virtual sal_Bool SAL_CALL isUserDefined() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isInUse() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getParentStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParentStyle(const OUString& aParentStyle ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isUserDefined() override;
+    virtual sal_Bool SAL_CALL isInUse() override;
+    virtual OUString SAL_CALL getParentStyle() override;
+    virtual void SAL_CALL setParentStyle(const OUString& aParentStyle ) override;
 
     //XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName(const OUString& rName) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& rName) override;
 
     //XPropertySet
-    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, 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 getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) override;
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) override;
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override;
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& rName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& rName) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& rName) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& rName) override;
 
     //XNameContainer
-    virtual void SAL_CALL insertByName(const OUString& rName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL replaceByName(const OUString& rName, const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName(const OUString& rName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName(const OUString& rName, const css::uno::Any& aElement) override;
+    virtual void SAL_CALL replaceByName(const OUString& rName, const css::uno::Any& aElement) override;
+    virtual void SAL_CALL removeByName(const OUString& rName) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     static css::uno::Reference<css::style::XStyle> CreateXTextTableStyle(SwDocShell* pDocShell, const OUString& rTableAutoFormatName);
 };
@@ -378,34 +375,34 @@ class SwXTextCellStyle : public cppu::WeakImplHelper
     bool IsPhysical();
 
     //XStyle
-    virtual sal_Bool SAL_CALL isUserDefined() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isInUse() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getParentStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParentStyle(const OUString& aParentStyle ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isUserDefined() override;
+    virtual sal_Bool SAL_CALL isInUse() override;
+    virtual OUString SAL_CALL getParentStyle() override;
+    virtual void SAL_CALL setParentStyle(const OUString& aParentStyle ) override;
 
     //XNamed
-    virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName(const OUString& sName) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& sName) override;
 
     //XPropertySet
-    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, 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 getPropertyValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) override;
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& aListener) override;
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override;
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<css::beans::PropertyState> SAL_CALL getPropertyStates(const css::uno::Sequence< OUString >& aPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) override;
+    virtual css::uno::Sequence<css::beans::PropertyState> SAL_CALL getPropertyStates(const css::uno::Sequence< OUString >& aPropertyName) override;
+    virtual void SAL_CALL setPropertyToDefault(const OUString& PropertyName) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault(const OUString& aPropertyName) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     static css::uno::Reference<css::style::XStyle> CreateXTextCellStyle(SwDocShell* pDocShell, const OUString& sName);
 };
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index b4cf9a1a3ec4..aa18474c3470 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -78,8 +78,7 @@ class SwXCell final : public SwXCellBaseClass,
     virtual const SwStartNode *GetStartNode() const override;
 
     virtual css::uno::Reference< css::text::XTextCursor >
-        CreateCursor()
-        throw (css::uno::RuntimeException) override;
+        CreateCursor() override;
 
     bool IsValid() const;
 
@@ -97,52 +96,52 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw() override;
     virtual void SAL_CALL release(  ) throw() override;
 
     //XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     //XCell
-    virtual OUString SAL_CALL getFormula(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getValue(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getFormula(  ) override;
+    virtual void SAL_CALL setFormula( const OUString& aFormula ) override;
+    virtual double SAL_CALL getValue(  ) override;
     /// @throws css::uno::RuntimeException
-    double SAL_CALL getValue(  ) const throw(css::uno::RuntimeException, std::exception)
+    double SAL_CALL getValue(  ) const
         { return const_cast<SwXCell*>(this)->getValue(); };
-    virtual void SAL_CALL setValue( double nValue ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::table::CellContentType SAL_CALL getType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getError(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setValue( double nValue ) override;
+    virtual css::table::CellContentType SAL_CALL getType(  ) override;
+    virtual sal_Int32 SAL_CALL getError(  ) override;
 
     //XText
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL  setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override;
+    virtual void SAL_CALL  setString(const OUString& aString) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //XEnumerationAccess - was: XParagraphEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createEnumeration() override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     SwTableBox* GetTableBox() const { return pBox; }
     static SwXCell* CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = nullptr );
@@ -174,24 +173,18 @@ public:
 
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
 };
@@ -214,46 +207,30 @@ public:
     DECLARE_XINTERFACE()
 
     //XTextTableCursor
-    virtual OUString SAL_CALL getRangeName()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL mergeRange()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL splitRange( sal_Int16 Count, sal_Bool Horizontal )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual OUString SAL_CALL getRangeName() override;
+    virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) override;
+    virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) override;
+    virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) override;
+    virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) override;
+    virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) override;
+    virtual void SAL_CALL gotoStart( sal_Bool bExpand ) override;
+    virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) override;
+    virtual sal_Bool SAL_CALL mergeRange() override;
+    virtual sal_Bool SAL_CALL splitRange( sal_Int16 Count, sal_Bool Horizontal ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //SwClient
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
@@ -314,95 +291,73 @@ public:
     SW_DLLPUBLIC SwFrameFormat* GetFrameFormat();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
 
     //XTextTable
-    virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getCellNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextTableCursor > SAL_CALL createCursorByCellName( const OUString& aCellName )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) override;
+    virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows(  ) override;
+    virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns(  ) override;
+    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getCellNames(  ) override;
+    virtual css::uno::Reference< css::text::XTextTableCursor > SAL_CALL createCursorByCellName( const OUString& aCellName ) override;
 
     //XTextContent
-    virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL attach(const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor(  ) override;
 
     //XComponent
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
 
     //XCellRange
-    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override;
 
     //XChartDataArray
-    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData(  ) override;
+    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions(  ) override;
+    virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions(  ) override;
+    virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) override;
 
     //XChartData
-    virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getNotANumber(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual double SAL_CALL getNotANumber(  ) override;
+    virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) override;
 
     //XSortable
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() override;
+    virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) override;
 
     //XAutoFormattable
-    virtual void SAL_CALL autoFormat(const OUString& aName)
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL autoFormat(const OUString& aName) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XNamed
-    virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& Name_) override;
 
     //XCellRangeData
-    virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray(  ) override;
+    virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -438,63 +393,48 @@ public:
     const SwUnoCursor* GetTableCursor() const;
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XCellRange
-    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override;
+    virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, 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 getPropertyValue(const OUString& PropertyName)
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XChartData
-    virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getNotANumber(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+    virtual double SAL_CALL getNotANumber(  ) override;
+    virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) override;
 
     //XChartDataArray
-    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData(  ) override;
+    virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions(  ) override;
+    virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions(  ) override;
+    virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) override;
 
     //XSortable
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() override;
+    virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) override;
 
     //XCellRangeData
-    virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray(  ) override;
+    virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -514,25 +454,21 @@ public:
     SwXTableRows(SwFrameFormat& rFrameFormat);
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XTableRows
-    virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) override;
+    virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class SwXTableColumns : public cppu::WeakImplHelper
@@ -552,25 +488,21 @@ public:
 
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XTableColumns
-    virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) override;
+    virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 int sw_CompareCellRanges(
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
index fcfc86dabd21..6bb0681a3695 100644
--- a/sw/inc/unotext.hxx
+++ b/sw/inc/unotext.hxx
@@ -66,9 +66,7 @@ private:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     virtual bool CheckForOwnMemberMeta(
-            const SwPaM & rPam, const bool bAbsorb)
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException);
+            const SwPaM & rPam, const bool bAbsorb);
 
 protected:
 
@@ -90,164 +88,106 @@ public:
 
     /// @throws css::uno::RuntimeException
     virtual css::uno::Reference< css::text::XTextCursor >
-        CreateCursor()
-        throw (css::uno::RuntimeException);
+        CreateCursor();
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface(
-            const css::uno::Type& rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Type& rType) override;
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type >
-        SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getTypes() override;
 
     static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
             const css::uno::Reference<
-                css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+                css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XTextRange
     virtual css::uno::Reference< css::text::XText >
-        SAL_CALL getText()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString(const OUString& rString)
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getText() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString(const OUString& rString) override;
 
     // XSimpleText
     virtual void SAL_CALL insertString(
             const css::uno::Reference< css::text::XTextRange > & xRange,
-            const OUString& aString, sal_Bool bAbsorb)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& aString, sal_Bool bAbsorb) override;
     virtual void SAL_CALL insertControlCharacter(
             const css::uno::Reference< css::text::XTextRange > & xRange,
-            sal_Int16 nControlCharacter, sal_Bool bAbsorb)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            sal_Int16 nControlCharacter, sal_Bool bAbsorb) override;
 
     // XText
     virtual void SAL_CALL insertTextContent(
             const css::uno::Reference< css::text::XTextRange > & xRange,
             const css::uno::Reference< css::text::XTextContent > & xContent,
-            sal_Bool bAbsorb)
-        throw (css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+            sal_Bool bAbsorb) override;
     virtual void SAL_CALL removeTextContent(
-            const css::uno::Reference< css::text::XTextContent > & xContent)
-        throw (css::container::NoSuchElementException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextContent > & xContent) override;
 
     // XParagraphAppend
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
         finishParagraph(
-            const css::uno::Sequence< css::beans::PropertyValue >&  rCharacterAndParagraphProperties)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >&  rCharacterAndParagraphProperties) override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
         finishParagraphInsert(
             const css::uno::Sequence< css::beans::PropertyValue >&  rCharacterAndParagraphProperties,
-            const css::uno::Reference< css::text::XTextRange >&     xInsertPosition)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange >&     xInsertPosition) override;
 
     // XTextPortionAppend
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
         appendTextPortion(
             const OUString& rText,
-            const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties)
-        throw (css::lang::IllegalArgumentException,
-               css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) override;
 
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
         insertTextPortion(
             const OUString& rText,
             const css::uno::Sequence< css::beans::PropertyValue >&  rCharacterAndParagraphProperties,
-            const css::uno::Reference< css::text::XTextRange >&     rTextRange)
-        throw (css::lang::IllegalArgumentException,
-               css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::uno::RuntimeException,
-               std::exception) override;
+            const css::uno::Reference< css::text::XTextRange >&     rTextRange) override;
 
     // XTextContentAppend
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
         appendTextContent(
             const css::uno::Reference< css::text::XTextContent >&   xTextContent,
-            const css::uno::Sequence< css::beans::PropertyValue >&  rCharacterAndParagraphProperties)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >&  rCharacterAndParagraphProperties) override;
     virtual css::uno::Reference< css::text::XTextRange > SAL_CALL
         insertTextContentWithProperties(
             const css::uno::Reference< css::text::XTextContent >&  xTextContent,
             const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties,
-            const css::uno::Reference< css::text::XTextRange >& xInsertPosition)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange >& xInsertPosition) override;
 
     // XTextConvert
     virtual css::uno::Reference< css::text::XTextContent > SAL_CALL
         convertToTextFrame(
             const css::uno::Reference< css::text::XTextRange >& xStart,
             const css::uno::Reference< css::text::XTextRange >& xEnd,
-            const css::uno::Sequence< css::beans::PropertyValue >& xFrameProperties)
-        throw (css::lang::IllegalArgumentException,
-               css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >& xFrameProperties) override;
     virtual css::uno::Reference<
                 css::text::XTextTable > SAL_CALL
         convertToTable(
@@ -268,48 +208,33 @@ public:
                 rRowProperties,
            css::uno::Sequence<
                 css::beans::PropertyValue > const&
-                rTableProperties)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+                rTableProperties) override;
 
     // XTextCopy
     virtual void SAL_CALL copyText(
-            const css::uno::Reference< css::text::XTextCopy >& xSource )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextCopy >& xSource ) override;
 
     // XTextRangeCompare
     sal_Int16 SAL_CALL compareRegionStarts(
             const css::uno::Reference< css::text::XTextRange >& xR1,
-            const css::uno::Reference< css::text::XTextRange >& xR2)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange >& xR2) override;
     sal_Int16 SAL_CALL compareRegionEnds(
             const css::uno::Reference< css::text::XTextRange >& xR1,
-            const css::uno::Reference< css::text::XTextRange >& xR2)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange >& xR2) override;
 
     // XRelativeTextContentInsert
     virtual void SAL_CALL insertTextContentBefore(
             const css::uno::Reference< css::text::XTextContent>& xNewContent,
-            const css::uno::Reference< css::text::XTextContent>& xSuccessor)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextContent>& xSuccessor) override;
     virtual void SAL_CALL insertTextContentAfter(
             const css::uno::Reference< css::text::XTextContent>& xNewContent,
-            const css::uno::Reference< css::text::XTextContent>& xPredecessor)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextContent>& xPredecessor) override;
 
     // XRelativeTextContentRemove
     virtual void SAL_CALL removeTextContentBefore(
-            const css::uno::Reference< css::text::XTextContent>& xSuccessor)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextContent>& xSuccessor) override;
     virtual void SAL_CALL removeTextContentAfter(
-            const css::uno::Reference< css::text::XTextContent>& xPredecessor)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextContent>& xPredecessor) override;
 };
 
 #endif // INCLUDED_SW_INC_UNOTEXT_HXX
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index 41168442a24d..bb10b191d373 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -55,53 +55,41 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface(
-            const css::uno::Type& rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Type& rType) override;
     virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
     virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
 
     // XAggregation
     virtual css::uno::Any SAL_CALL queryAggregation(
-            const css::uno::Type& rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Type& rType) override;
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type >
-        SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL
-        createEnumeration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createEnumeration() override;
 
     // XSimpleText
     virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL
-        createTextCursor()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createTextCursor() override;
     virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL
         createTextCursorByRange(
-            const css::uno::Reference< css::text::XTextRange > & xTextPosition)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextPosition) override;
 
 };
 
@@ -124,8 +112,7 @@ protected:
 
     virtual const SwStartNode *GetStartNode() const override;
     virtual css::uno::Reference< css::text::XTextCursor >
-        CreateCursor()
-        throw (css::uno::RuntimeException) override;
+        CreateCursor() override;
 
     virtual ~SwXHeadFootText() override;
 
@@ -139,48 +126,37 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface(
-            const css::uno::Type& rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Type& rType) override;
     virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
     virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type >
-        SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL
-        createEnumeration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createEnumeration() override;
 
     // XSimpleText
     virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL
-        createTextCursor()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createTextCursor() override;
     virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL
         createTextCursorByRange(
-            const css::uno::Reference< css::text::XTextRange > & xTextPosition)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextPosition) override;
 
 };
 
diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx
index b3a57127f2d7..7f457fe506ef 100644
--- a/sw/inc/unotextcursor.hxx
+++ b/sw/inc/unotextcursor.hxx
@@ -107,247 +107,154 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
             const css::uno::Reference<
-                css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+                css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
             const css::uno::Reference<
-                css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+                css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
             const css::uno::Reference<
-                css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+                css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
             const css::uno::Reference<
-                css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+                css::beans::XVetoableChangeListener >& xListener) override;
 
     // XPropertyState
     virtual css::beans::PropertyState SAL_CALL
-        getPropertyState(const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+        getPropertyState(const OUString& rPropertyName) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
         getPropertyStates(
-            const css::uno::Sequence< OUString >& rPropertyNames)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >& rPropertyNames) override;
     virtual void SAL_CALL setPropertyToDefault(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual css::uno::Any SAL_CALL getPropertyDefault(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
 
     // XMultiPropertySet
     virtual void SAL_CALL setPropertyValues(
             const css::uno::Sequence< OUString >& aPropertyNames,
-            const css::uno::Sequence< css::uno::Any >& aValues )
-        throw (
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::uno::Any >& aValues ) override;
 
     virtual css::uno::Sequence< css::uno::Any > SAL_CALL
-        getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     virtual void SAL_CALL addPropertiesChangeListener(
         const css::uno::Sequence< OUString >& aPropertyNames,
-        const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     virtual void SAL_CALL removePropertiesChangeListener(
-        const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     virtual void SAL_CALL firePropertiesChangeEvent(
         const css::uno::Sequence< OUString >& aPropertyNames,
-        const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     // XMultiPropertyStates
-    virtual void SAL_CALL setAllPropertiesToDefault()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAllPropertiesToDefault() override;
     virtual void SAL_CALL setPropertiesToDefault(
-            const css::uno::Sequence< OUString >&  rPropertyNames)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >&  rPropertyNames) override;
     virtual css::uno::Sequence< css::uno::Any >
         SAL_CALL getPropertyDefaults(
-            const css::uno::Sequence< OUString >&  rPropertyNames)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >&  rPropertyNames) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL
-        createEnumeration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createEnumeration() override;
 
     // XContentEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-        createContentEnumeration(const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        createContentEnumeration(const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getAvailableServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAvailableServiceNames() override;
 
     // XSortable
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-        createSortDescriptor()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createSortDescriptor() override;
     virtual void SAL_CALL sort(
-            const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) override;
 
     // XDocumentInsertable
     virtual void SAL_CALL insertDocumentFromURL(
             const OUString& rURL,
-            const css::uno::Sequence< css::beans::PropertyValue >& rOptions)
-        throw (css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >& rOptions) override;
 
     // XTextRange
     virtual css::uno::Reference< css::text::XText >
-        SAL_CALL getText()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString(const OUString& rString)
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getText() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString(const OUString& rString) override;
 
     // XTextCursor
-    virtual void SAL_CALL collapseToStart()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL collapseToEnd()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isCollapsed()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool bExpand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool bExpand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoStart(sal_Bool bExpand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL gotoEnd(sal_Bool bExpand)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL collapseToStart() override;
+    virtual void SAL_CALL collapseToEnd() override;
+    virtual sal_Bool SAL_CALL isCollapsed() override;
+    virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool bExpand) override;
+    virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool bExpand) override;
+    virtual void SAL_CALL gotoStart(sal_Bool bExpand) override;
+    virtual void SAL_CALL gotoEnd(sal_Bool bExpand) override;
     virtual void SAL_CALL gotoRange(
             const css::uno::Reference< css::text::XTextRange >& xRange,
-            sal_Bool bExpand)
-        throw (css::uno::RuntimeException, std::exception) override;
+            sal_Bool bExpand) override;
 
     // XWordCursor
-    virtual sal_Bool SAL_CALL isStartOfWord()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEndOfWord()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoNextWord(sal_Bool bExpand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoPreviousWord(sal_Bool bExpand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoEndOfWord(sal_Bool bExpand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoStartOfWord(sal_Bool bExpand)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isStartOfWord() override;
+    virtual sal_Bool SAL_CALL isEndOfWord() override;
+    virtual sal_Bool SAL_CALL gotoNextWord(sal_Bool bExpand) override;
+    virtual sal_Bool SAL_CALL gotoPreviousWord(sal_Bool bExpand) override;
+    virtual sal_Bool SAL_CALL gotoEndOfWord(sal_Bool bExpand) override;
+    virtual sal_Bool SAL_CALL gotoStartOfWord(sal_Bool bExpand) override;
 
     // XSentenceCursor
-    virtual sal_Bool SAL_CALL isStartOfSentence()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEndOfSentence()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoNextSentence(sal_Bool Expand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoPreviousSentence(sal_Bool Expand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoStartOfSentence(sal_Bool Expand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoEndOfSentence(sal_Bool Expand)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isStartOfSentence() override;
+    virtual sal_Bool SAL_CALL isEndOfSentence() override;
+    virtual sal_Bool SAL_CALL gotoNextSentence(sal_Bool Expand) override;
+    virtual sal_Bool SAL_CALL gotoPreviousSentence(sal_Bool Expand) override;
+    virtual sal_Bool SAL_CALL gotoStartOfSentence(sal_Bool Expand) override;
+    virtual sal_Bool SAL_CALL gotoEndOfSentence(sal_Bool Expand) override;
 
     // XParagraphCursor
-    virtual sal_Bool SAL_CALL isStartOfParagraph()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEndOfParagraph()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoStartOfParagraph(sal_Bool Expand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoEndOfParagraph(sal_Bool Expand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoNextParagraph(sal_Bool Expand)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL gotoPreviousParagraph(sal_Bool Expand)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isStartOfParagraph() override;
+    virtual sal_Bool SAL_CALL isEndOfParagraph() override;
+    virtual sal_Bool SAL_CALL gotoStartOfParagraph(sal_Bool Expand) override;
+    virtual sal_Bool SAL_CALL gotoEndOfParagraph(sal_Bool Expand) override;
+    virtual sal_Bool SAL_CALL gotoNextParagraph(sal_Bool Expand) override;
+    virtual sal_Bool SAL_CALL gotoPreviousParagraph(sal_Bool Expand) override;
 
     // XRedline
     virtual void SAL_CALL makeRedline(
             const OUString& rRedlineType,
-            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties) override;
 
     //XMarkingAccess
-    virtual void SAL_CALL invalidateMarkings(::sal_Int32 nType)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL invalidateMarkings(::sal_Int32 nType) override;
 
 };
 
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index ae6941f2fcab..90b7851b6864 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -101,8 +101,7 @@ private:
     //TODO: new exception type for protected content
     /// @throws css::uno::RuntimeException
     void    DeleteAndInsert(
-                const OUString& rText, const bool bForceExpandHints)
-        throw (css::uno::RuntimeException);
+                const OUString& rText, const bool bForceExpandHints);
     void    Invalidate();
 
     virtual ~SwXTextRange() override;
@@ -127,121 +126,75 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XPropertyState
     virtual css::beans::PropertyState SAL_CALL
-        getPropertyState(const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+        getPropertyState(const OUString& rPropertyName) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
         getPropertyStates(
-            const css::uno::Sequence< OUString >& rPropertyNames)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >& rPropertyNames) override;
     virtual void SAL_CALL setPropertyToDefault(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual css::uno::Any SAL_CALL getPropertyDefault(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL
-        createEnumeration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createEnumeration() override;
 
     // XContentEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
-        createContentEnumeration(const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        createContentEnumeration(const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getAvailableServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAvailableServiceNames() override;
 
     // XTextRange
     virtual css::uno::Reference< css::text::XText >
-        SAL_CALL getText()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getText() override;
     virtual css::uno::Reference<
-                css::text::XTextRange > SAL_CALL getStart()
-        throw (css::uno::RuntimeException, std::exception) override;
+                css::text::XTextRange > SAL_CALL getStart() override;
     virtual css::uno::Reference<
-                css::text::XTextRange > SAL_CALL getEnd()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString(const OUString& rString)
-        throw (css::uno::RuntimeException, std::exception) override;
+                css::text::XTextRange > SAL_CALL getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString(const OUString& rString) override;
 
     // XRedline
     virtual void SAL_CALL makeRedline(
             const OUString& rRedlineType,
-            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties) override;
 
 };
 
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index e4aa520612c9..e358cbd0f19f 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -208,191 +208,170 @@ public:
     SwXTextDocument(SwDocShell* pShell);
 
     void NotifyRefreshListeners();
-    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw() override;
     virtual void SAL_CALL release(  ) throw() override;
 
     //XWeak
-    virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter(  ) override;
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XTextDocument
-    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL reformat() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() override;
+    virtual void SAL_CALL reformat() override;
 
     //XModel
-    virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getURL(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL lockControllers(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL unlockControllers(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override;
+    virtual OUString SAL_CALL getURL(  ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) override;
+    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) override;
+    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) override;
+    virtual void SAL_CALL lockControllers(  ) override;
+    virtual void SAL_CALL unlockControllers(  ) override;
+    virtual sal_Bool SAL_CALL hasControllersLocked(  ) override;
+    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) override;
+    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) override;
 
     //XComponent
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) override;
 
     //XCloseable
-    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) override;
 
     //XLineNumberingProperties
-    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties() override;
 
     //XChapterNumberingSupplier
-    virtual css::uno::Reference< css::container::XIndexReplace >  SAL_CALL getChapterNumberingRules() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XIndexReplace >  SAL_CALL getChapterNumberingRules() override;
 
     //XNumberingRulesSupplier
-    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getNumberingRules() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getNumberingRules() override;
 
     //XFootnotesSupplier
-    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getFootnotes() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getFootnoteSettings() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getFootnotes() override;
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getFootnoteSettings() override;
 
     //XEndnotesSupplier
-    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getEndnotes() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getEndnoteSettings() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getEndnotes() override;
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getEndnoteSettings() override;
 
     //XReplaceable
-    virtual css::uno::Reference< css::util::XReplaceDescriptor >  SAL_CALL createReplaceDescriptor() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL replaceAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::util::XReplaceDescriptor >  SAL_CALL createReplaceDescriptor() override;
+    virtual sal_Int32 SAL_CALL replaceAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) override;
 
     //XSearchable
-    virtual css::uno::Reference< css::util::XSearchDescriptor >  SAL_CALL createSearchDescriptor() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL findAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL findFirst(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL findNext(const css::uno::Reference< css::uno::XInterface > & xStartAt, const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::util::XSearchDescriptor >  SAL_CALL createSearchDescriptor() override;
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL findAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) override;
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL findFirst(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) override;
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL findNext(const css::uno::Reference< css::uno::XInterface > & xStartAt, const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) override;
 
     //XPagePrintable
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setPagePrintSettings(const css::uno::Sequence< css::beans::PropertyValue >& aSettings) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL printPages(const css::uno::Sequence< css::beans::PropertyValue >& xOptions) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings() override;
+    virtual void SAL_CALL setPagePrintSettings(const css::uno::Sequence< css::beans::PropertyValue >& aSettings) override;
+    virtual void SAL_CALL printPages(const css::uno::Sequence< css::beans::PropertyValue >& xOptions) override;
 
     //XReferenceMarksSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getReferenceMarks() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getReferenceMarks() override;
 
     // css::text::XTextFieldsSupplier
-    virtual css::uno::Reference< css::container::XEnumerationAccess >  SAL_CALL getTextFields() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextFieldMasters() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XEnumerationAccess >  SAL_CALL getTextFields() override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextFieldMasters() override;
 
     // css::text::XTextEmbeddedObjectsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getEmbeddedObjects() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getEmbeddedObjects() override;
 
     // css::text::XBookmarksSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getBookmarks() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getBookmarks() override;
 
     // css::text::XTextSectionsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextSections() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextSections() override;
 
     // css::text::XTextTablesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextTables() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextTables() override;
 
     // css::text::XTextGraphicObjectsSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getGraphicObjects() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getGraphicObjects() override;
 
     // css::text::XTextFramesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextFrames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextFrames() override;
 
     //XStyleFamiliesSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getStyleFamilies() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getStyleFamilies() override;
 
     //XAutoStylesSupplier
-    virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles(  ) override;
 
     //XMultiServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL createInstance(const OUString& ServiceSpecifier)
-                throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL createInstance(const OUString& ServiceSpecifier) override;
     virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier,
-                const css::uno::Sequence< css::uno::Any >& Arguments)
-                throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-                throw( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Sequence< css::uno::Any >& Arguments) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::drawing::XDrawPageSupplier
-    virtual css::uno::Reference< css::drawing::XDrawPage >  SAL_CALL getDrawPage() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::drawing::XDrawPage >  SAL_CALL getDrawPage() override;
 
     // css::text::XDocumentIndexesSupplier
-    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getDocumentIndexes() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getDocumentIndexes() override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) override;
 
     //XLinkTargetSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getLinks() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getLinks() override;
 
     //XRedlinesSupplier
-    virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getRedlines(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getRedlines(  ) override;
 
     // css::util::XRefreshable
-    virtual void SAL_CALL refresh() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL refresh() override;
+    virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) override;
+    virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) override;
 
     // css::util::XLinkUpdate,
-    virtual void SAL_CALL updateLinks(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL updateLinks(  ) override;
 
     // css::view::XRenderable
-    virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override;
+    virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override;
 
     // css::xforms::XFormsSupplier
-    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getXForms(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getXForms(  ) override;
 
     // css::document::XDocumentLanguages
-    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount ) override;
 
     // css::text::XFlatParagraphIteratorProvider:
-    virtual css::uno::Reference< css::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) override;
 
     // css::util::XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     /// @see vcl::ITiledRenderable::paintTile().
     virtual void paintTile( VirtualDevice &rDevice,
@@ -442,7 +421,7 @@ public:
     OUString getTrackedChangeAuthors() override;
 
     // css::tiledrendering::XTiledRenderable
-    virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) override;
 
     void                        Invalidate();
     void                        Reactivate(SwDocShell* pNewDocShell);
@@ -484,18 +463,18 @@ public:
     virtual ~SwXLinkTargetSupplier() override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     void    Invalidate() {pxDoc = nullptr;}
 };
@@ -522,30 +501,30 @@ public:
     virtual ~SwXLinkNameAccessWrapper() override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XLinkTargetSupplier
-    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getLinks() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getLinks() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -563,18 +542,18 @@ public:
     virtual ~SwXOutlineTarget() override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 enum class SwCreateDrawTable {
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index ae2ebe72f1d8..0a55c6c83e2f 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -770,8 +770,7 @@ public:
     {
     }
 
-    virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& rEvent) override
     {
         if (rEvent.State == frame::DispatchResultState::SUCCESS)
         {
@@ -779,8 +778,7 @@ public:
         }
     }
 
-    virtual void SAL_CALL disposing(const css::lang::EventObject&)
-    throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing(const css::lang::EventObject&) override
     {
     }
 };
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 5a732e4af8cb..7d9b3c702934 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -235,25 +235,21 @@ SwAccessibleCell::~SwAccessibleCell()
 }
 
 OUString SAL_CALL SwAccessibleCell::getAccessibleDescription()
-        throw (uno::RuntimeException, std::exception)
 {
     return GetName();
 }
 
 OUString SAL_CALL SwAccessibleCell::getImplementationName()
-        throw( uno::RuntimeException, std::exception )
 {
     return OUString(sImplementationName);
 }
 
 sal_Bool SAL_CALL SwAccessibleCell::supportsService(const OUString& sTestServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sTestServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -285,7 +281,6 @@ void SwAccessibleCell::InvalidatePosOrSize( const SwRect& rOldBox )
 // XAccessibleInterface
 
 uno::Any SwAccessibleCell::queryInterface( const uno::Type& rType )
-    throw( uno::RuntimeException, std::exception )
 {
     if (rType == cppu::UnoType<XAccessibleExtendedAttributes>::get())
     {
@@ -315,7 +310,6 @@ uno::Any SwAccessibleCell::queryInterface( const uno::Type& rType )
 
 // XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL SwAccessibleCell::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() );
 
@@ -329,7 +323,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleCell::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
-        throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -347,7 +340,6 @@ SwFrameFormat* SwAccessibleCell::GetTableBoxFormat() const
 
 //Implement TableCell currentValue
 uno::Any SwAccessibleCell::getCurrentValue( )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleValue );
@@ -356,7 +348,6 @@ uno::Any SwAccessibleCell::getCurrentValue( )
 }
 
 sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleValue );
@@ -372,13 +363,11 @@ sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber )
 }
 
 uno::Any SwAccessibleCell::getMaximumValue( )
-    throw( uno::RuntimeException, std::exception )
 {
     return uno::Any(DBL_MAX);
 }
 
 uno::Any SwAccessibleCell::getMinimumValue(  )
-    throw( uno::RuntimeException, std::exception )
 {
     return uno::Any(-DBL_MAX);
 }
@@ -406,7 +395,6 @@ static OUString ReplaceFourChar(const OUString& oldOUString)
 }
 
 css::uno::Any SAL_CALL SwAccessibleCell::getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -426,7 +414,6 @@ css::uno::Any SAL_CALL SwAccessibleCell::getExtendedAttributes()
 }
 
 sal_Int32 SAL_CALL SwAccessibleCell::getBackground()
-        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -451,45 +438,38 @@ sal_Int32 SAL_CALL SwAccessibleCell::getBackground()
 // XAccessibleSelection
 void SwAccessibleCell::selectAccessibleChild(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     m_aSelectionHelper.selectAccessibleChild(nChildIndex);
 }
 
 sal_Bool SwAccessibleCell::isAccessibleChildSelected(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     return m_aSelectionHelper.isAccessibleChildSelected(nChildIndex);
 }
 
 void SwAccessibleCell::clearAccessibleSelection(  )
-    throw ( uno::RuntimeException, std::exception )
 {
 }
 
 void SwAccessibleCell::selectAllAccessibleChildren(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     m_aSelectionHelper.selectAllAccessibleChildren();
 }
 
 sal_Int32 SwAccessibleCell::getSelectedAccessibleChildCount(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_aSelectionHelper.getSelectedAccessibleChildCount();
 }
 
 uno::Reference<XAccessible> SwAccessibleCell::getSelectedAccessibleChild(
     sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     return m_aSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex);
 }
 
 void SwAccessibleCell::deselectAccessibleChild(
     sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     m_aSelectionHelper.deselectAccessibleChild(nSelectedChildIndex);
 }
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index bb4cdb2f5b6e..213a4c1ff415 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -62,26 +62,22 @@ public:
 
     /// Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     // XServiceInfo
 
     // Returns an identifier for the implementation of this object.
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     // Return whether the specified service is supported by this class.
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     // Returns a list of all supported services.  In this case that is just
     // the AccessibleContext service.
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override;
 
@@ -93,8 +89,7 @@ public:
     // between those inherited through SwAccessibleContext and
     // XAccessibleValue).
 
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
 
     virtual void SAL_CALL acquire(  ) throw () override
         { SwAccessibleContext::acquire(); };
@@ -103,55 +98,38 @@ public:
         { SwAccessibleContext::release(); };
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XAccessibleValue
 
     // XAccessibleExtendedAttributes
-    css::uno::Any SAL_CALL getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
+    css::uno::Any SAL_CALL getExtendedAttributes() override ;
 private:
     SwFrameFormat* GetTableBoxFormat() const;
 
 public:
-    virtual css::uno::Any SAL_CALL getCurrentValue( )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getCurrentValue( ) override;
 
-    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
 
-    virtual css::uno::Any SAL_CALL getMaximumValue(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
 
-    virtual css::uno::Any SAL_CALL getMinimumValue(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
     // XAccessibleComponent
-    sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getBackground() override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL clearAccessibleSelection(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
+
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nSelectedChildIndex ) override;
 
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
 };
 
 #endif
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 52672aa34973..669773168b0d 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -540,14 +540,12 @@ SwAccessibleContext::~SwAccessibleContext()
 
 uno::Reference< XAccessibleContext > SAL_CALL
     SwAccessibleContext::getAccessibleContext()
-        throw (uno::RuntimeException, std::exception)
 {
     uno::Reference < XAccessibleContext > xRet( this );
     return xRet;
 }
 
 sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -561,7 +559,6 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount()
 
 uno::Reference< XAccessible> SAL_CALL
     SwAccessibleContext::getAccessibleChild( sal_Int32 nIndex )
-        throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -609,7 +606,6 @@ uno::Reference< XAccessible> SAL_CALL
 }
 
 uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -634,7 +630,6 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent()
 }
 
 sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -657,27 +652,23 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent()
 }
 
 sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole()
-        throw (uno::RuntimeException, std::exception)
 {
     return m_nRole;
 }
 
 OUString SAL_CALL SwAccessibleContext::getAccessibleDescription()
-        throw (uno::RuntimeException, std::exception)
 {
     OSL_ENSURE(false, "description needs to be overriden");
     THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overridden)" );
 }
 
 OUString SAL_CALL SwAccessibleContext::getAccessibleName()
-        throw (uno::RuntimeException, std::exception)
 {
     return m_sName;
 }
 
 uno::Reference< XAccessibleRelationSet> SAL_CALL
     SwAccessibleContext::getAccessibleRelationSet()
-        throw (uno::RuntimeException, std::exception)
 {
     // by default there are no relations
     uno::Reference< XAccessibleRelationSet> xRet( new utl::AccessibleRelationSetHelper() );
@@ -686,7 +677,6 @@ uno::Reference< XAccessibleRelationSet> SAL_CALL
 
 uno::Reference<XAccessibleStateSet> SAL_CALL
     SwAccessibleContext::getAccessibleStateSet()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -705,7 +695,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
 }
 
 lang::Locale SAL_CALL SwAccessibleContext::getLocale()
-        throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -715,7 +704,6 @@ lang::Locale SAL_CALL SwAccessibleContext::getLocale()
 
 void SAL_CALL SwAccessibleContext::addAccessibleEventListener(
             const uno::Reference< XAccessibleEventListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is())
     {
@@ -728,7 +716,6 @@ void SAL_CALL SwAccessibleContext::addAccessibleEventListener(
 
 void SAL_CALL SwAccessibleContext::removeAccessibleEventListener(
             const uno::Reference< XAccessibleEventListener >& xListener )
-        throw (uno::RuntimeException, std::exception)
 {
     if (xListener.is() && m_nClientId)
     {
@@ -760,7 +747,6 @@ static bool lcl_PointInRectangle(const awt::Point & aPoint,
 
 sal_Bool SAL_CALL SwAccessibleContext::containsPoint(
             const awt::Point& aPoint )
-        throw (uno::RuntimeException, std::exception)
 {
     awt::Rectangle aPixBounds = getBoundsImpl(true);
     aPixBounds.X = 0;
@@ -771,7 +757,6 @@ sal_Bool SAL_CALL SwAccessibleContext::containsPoint(
 
 uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint(
                 const awt::Point& aPoint )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -827,7 +812,6 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint
    false: Use absolute mode.
 */
 awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative)
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -871,13 +855,11 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative)
 }
 
 awt::Rectangle SAL_CALL SwAccessibleContext::getBounds()
-        throw (uno::RuntimeException, std::exception)
 {
     return getBoundsImpl(true);
 }
 
 awt::Point SAL_CALL SwAccessibleContext::getLocation()
-    throw (uno::RuntimeException, std::exception)
 {
     awt::Rectangle aRect = getBoundsImpl(true);
     awt::Point aPoint(aRect.X, aRect.Y);
@@ -886,7 +868,6 @@ awt::Point SAL_CALL SwAccessibleContext::getLocation()
 }
 
 awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen()
-        throw (uno::RuntimeException, std::exception)
 {
     awt::Rectangle aRect = getBoundsImpl(false);
 
@@ -902,7 +883,6 @@ awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen()
 }
 
 awt::Size SAL_CALL SwAccessibleContext::getSize()
-        throw (uno::RuntimeException, std::exception)
 {
     awt::Rectangle aRect = getBoundsImpl(false);
     awt::Size aSize( aRect.Width, aRect.Height );
@@ -911,7 +891,6 @@ awt::Size SAL_CALL SwAccessibleContext::getSize()
 }
 
 void SAL_CALL SwAccessibleContext::grabFocus()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -952,19 +931,16 @@ void SAL_CALL SwAccessibleContext::grabFocus()
 }
 
 sal_Int32 SAL_CALL SwAccessibleContext::getForeground()
-        throw (uno::RuntimeException, std::exception)
 {
     return COL_BLACK;
 }
 
 sal_Int32 SAL_CALL SwAccessibleContext::getBackground()
-        throw (uno::RuntimeException, std::exception)
 {
     return COL_WHITE;
 }
 
 OUString SAL_CALL SwAccessibleContext::getImplementationName()
-        throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( false, "implementation name needs to be overridden" );
 
@@ -972,13 +948,11 @@ OUString SAL_CALL SwAccessibleContext::getImplementationName()
 }
 
 sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceName)
-        throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( false, "supported services names needs to be overridden" );
     THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overridden" )
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 6ffab870371c..764172e603f0 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -180,8 +180,7 @@ protected:
 
     /// @throws css::uno::RuntimeException
     css::awt::Rectangle SAL_CALL
-        getBoundsImpl(bool bRelative)
-        throw (css::uno::RuntimeException, std::exception);
+        getBoundsImpl(bool bRelative);
 
     // #i85634#
     inline void NotRegisteredAtAccessibleMap()
@@ -200,118 +199,93 @@ public:
 
     // Return the XAccessibleContext.
     virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
-        getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleContext() override;
 
     // XAccessibleContext
 
     // Return the number of currently visible children.
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     // Return the specified child or NULL if index is invalid.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-                css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
     // Return a reference to the parent.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent() override;
 
     // Return this objects index among the parents children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleIndexInParent() override;
 
     // Return this object's role.
     virtual sal_Int16 SAL_CALL
-        getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRole() override;
 
     // Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     // Return the object's current name.
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
     // Return NULL to indicate that an empty relation set.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     // Return the set of current states.
     virtual css::uno::Reference<
             css::accessibility::XAccessibleStateSet> SAL_CALL
-        getAccessibleStateSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleStateSet() override;
 
     /** Return the parents locale or throw exception if this object has no
         parent yet/anymore. */
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-        throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        getLocale() override;
 
     // XAccessibleEventBroadcaster
 
     virtual void SAL_CALL addAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
     virtual void SAL_CALL removeAccessibleEventListener(
-            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
 
     // XAccessibleComponent
     virtual sal_Bool SAL_CALL containsPoint(
-            const css::awt::Point& aPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::awt::Point& aPoint ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
-                const css::awt::Point& aPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+                const css::awt::Point& aPoint ) override;
 
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 
-    virtual void SAL_CALL grabFocus()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() override;
 
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     // XServiceInfo
 
     /** Returns an identifier for the implementation of this object. */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class. */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext service. */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-             throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // thread safe C++ interface
 
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index b64c39a9bb52..c206dcae072b 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -133,7 +133,6 @@ void SwAccessibleDocumentBase::RemoveChild( vcl::Window *pWin )
 }
 
 sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -148,8 +147,6 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount()
 
 uno::Reference< XAccessible> SAL_CALL
     SwAccessibleDocumentBase::getAccessibleChild( sal_Int32 nIndex )
-        throw (uno::RuntimeException,
-                lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -166,13 +163,11 @@ uno::Reference< XAccessible> SAL_CALL
 }
 
 uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessibleParent()
-        throw (uno::RuntimeException, std::exception)
 {
     return mxParent;
 }
 
 sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -196,13 +191,11 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent()
 }
 
 OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription()
-    throw (uno::RuntimeException, std::exception)
 {
     return GetResource( STR_ACCESS_DOC_DESC );
 }
 
 OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -230,7 +223,6 @@ OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName()
 }
 
 awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds()
-        throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -253,7 +245,6 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds()
 }
 
 awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -268,7 +259,6 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
 }
 
 css::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -283,7 +273,6 @@ css::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen()
 }
 
 css::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -299,7 +288,6 @@ css::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize()
 
 sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint(
             const awt::Point& aPoint )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -316,7 +304,6 @@ sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint(
 
 uno::Reference< XAccessible > SAL_CALL SwAccessibleDocumentBase::getAccessibleAtPoint(
                 const awt::Point& aPoint )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -421,19 +408,16 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve
 }
 
 OUString SAL_CALL SwAccessibleDocument::getImplementationName()
-        throw( uno::RuntimeException, std::exception )
 {
     return OUString(sImplementationName);
 }
 
 sal_Bool SAL_CALL SwAccessibleDocument::supportsService(const OUString& sTestServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sTestServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwAccessibleDocument::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -446,7 +430,6 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleDocument::getSupportedServiceName
 
 uno::Any SwAccessibleDocument::queryInterface(
     const uno::Type& rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet;
     if ( rType == cppu::UnoType<XAccessibleSelection>::get() )
@@ -471,7 +454,6 @@ uno::Any SwAccessibleDocument::queryInterface(
 
 // XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type > aTypes( SwAccessibleDocumentBase::getTypes() );
 
@@ -485,7 +467,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId()
-        throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -494,41 +475,32 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId()
 
 void SwAccessibleDocument::selectAccessibleChild(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception )
 {
     maSelectionHelper.selectAccessibleChild(nChildIndex);
 }
 
 sal_Bool SwAccessibleDocument::isAccessibleChildSelected(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception )
 {
     return maSelectionHelper.isAccessibleChildSelected(nChildIndex);
 }
 
 void SwAccessibleDocument::clearAccessibleSelection(  )
-    throw ( uno::RuntimeException, std::exception )
 {
 }
 
 void SwAccessibleDocument::selectAllAccessibleChildren(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     maSelectionHelper.selectAllAccessibleChildren();
 }
 
 sal_Int32 SwAccessibleDocument::getSelectedAccessibleChildCount(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     return maSelectionHelper.getSelectedAccessibleChildCount();
 }
 
 uno::Reference<XAccessible> SwAccessibleDocument::getSelectedAccessibleChild(
     sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception)
 {
     return maSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex);
 }
@@ -536,16 +508,11 @@ uno::Reference<XAccessible> SwAccessibleDocument::getSelectedAccessibleChild(
 // index has to be treated as global child index.
 void SwAccessibleDocument::deselectAccessibleChild(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception )
 {
     maSelectionHelper.deselectAccessibleChild( nChildIndex );
 }
 
 uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard g;
 
@@ -776,7 +743,6 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 }
 
 sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
-        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return SW_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
@@ -784,8 +750,6 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
 
 css::uno::Sequence< css::uno::Any >
         SAL_CALL SwAccessibleDocument::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
-        throw (css::uno::RuntimeException,
-               std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 342676aef5c4..b1cd613d7ebd 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -52,52 +52,41 @@ public:
     // XAccessibleContext
 
     // Return the number of currently visible children.
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     // Return the specified child or NULL if index is invalid.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-                css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
     // Return a reference to the parent.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleParent() override;
 
     // Return this objects index among the parents children.
     virtual sal_Int32 SAL_CALL
-        getAccessibleIndexInParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleIndexInParent() override;
 
     // Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
-    virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName() override;
 
     // XAccessibleComponent
     virtual sal_Bool SAL_CALL containsPoint(
-            const css::awt::Point& aPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::awt::Point& aPoint ) override;
 
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(
-                const css::awt::Point& aPoint )
-        throw (css::uno::RuntimeException, std::exception) override;
+                const css::awt::Point& aPoint ) override;
 
-    virtual css::awt::Rectangle SAL_CALL getBounds()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() override;
 
-    virtual css::awt::Point SAL_CALL getLocation()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() override;
 
-    virtual css::awt::Point SAL_CALL getLocationOnScreen()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
 
-    virtual css::awt::Size SAL_CALL getSize()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() override;
 };
 
 /**
@@ -127,19 +116,16 @@ public:
 
     // Returns an identifier for the implementation of this object.
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     // Return whether the specified service is supported by this class.
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     // Returns a list of all supported services.  In this case that is just
     // the AccessibleContext service.
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XInterface
 
@@ -148,8 +134,7 @@ public:
     // ambiguities.
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type& aType ) override;
 
     virtual void SAL_CALL acquire(  ) throw () override
         { SwAccessibleContext::acquire(); };
@@ -158,41 +143,27 @@ public:
         { SwAccessibleContext::release(); };
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XAccessibleSelection
 
     virtual void SAL_CALL selectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
     virtual sal_Bool SAL_CALL isAccessibleChildSelected(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL clearAccessibleSelection(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nSelectedChildIndex ) override;
 
     // index has to be treated as global child index.
     virtual void SAL_CALL deselectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
-    virtual css::uno::Any SAL_CALL getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Any SAL_CALL getExtendedAttributes() override;
 
     // thread safe C++ interface
 
@@ -200,14 +171,11 @@ public:
     virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override;
 
     // XAccessibleComponent
-    sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getBackground() override;
 
     // XAccessibleGetAccFlowTo
     css::uno::Sequence< css::uno::Any >
-        SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
-            throw (css::uno::RuntimeException,
-                   std::exception) override;
+        SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) override;
 };
 
 #endif
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index ef3b70b992d2..e0481fd46688 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -49,7 +49,6 @@ SwAccessibleEmbeddedObject::~SwAccessibleEmbeddedObject()
 // XInterface
 css::uno::Any SAL_CALL
     SwAccessibleEmbeddedObject::queryInterface (const css::uno::Type & rType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aReturn = SwAccessibleNoTextFrame::queryInterface (rType);
     if ( ! aReturn.hasValue())
@@ -73,19 +72,16 @@ void SAL_CALL
 }
 
 OUString SAL_CALL SwAccessibleEmbeddedObject::getImplementationName()
-        throw( uno::RuntimeException, std::exception )
 {
     return OUString(sImplementationName);
 }
 
 sal_Bool SAL_CALL SwAccessibleEmbeddedObject::supportsService(const OUString& sTestServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sTestServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -95,14 +91,12 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServi
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementationId()
-        throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XAccessibleExtendedAttributes
 css::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index 76792b649c5c..5d37eb4d455c 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -38,8 +38,7 @@ public:
     // XInterface
 
     virtual css::uno::Any SAL_CALL
-        queryInterface (const css::uno::Type & rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+        queryInterface (const css::uno::Type & rType) override;
 
     virtual void SAL_CALL
         acquire()
@@ -53,26 +52,22 @@ public:
 
     // Returns an identifier for the implementation of this object.
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     // Return whether the specified service is supported by this class.
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     // Returns a list of all supported services.  In this case that is just
     // the AccessibleContext service.
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XAccessibleExtendedAttributes
-        virtual css::uno::Any SAL_CALL getExtendedAttributes()
-            throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Any SAL_CALL getExtendedAttributes() override ;
 };
 
 #endif
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index a2ec4ceb3e30..300b87495a69 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -69,7 +69,6 @@ SwAccessibleFootnote::~SwAccessibleFootnote()
 }
 
 OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -92,7 +91,6 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
 }
 
 OUString SAL_CALL SwAccessibleFootnote::getImplementationName()
-        throw( RuntimeException, std::exception )
 {
     if( AccessibleRole::END_NOTE == GetRole() )
         return OUString(sImplementationNameEndnote);
@@ -101,13 +99,11 @@ OUString SAL_CALL SwAccessibleFootnote::getImplementationName()
 }
 
 sal_Bool SAL_CALL SwAccessibleFootnote::supportsService(const OUString& sTestServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sTestServiceName);
 }
 
 Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -120,7 +116,6 @@ Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames()
 }
 
 Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId()
-        throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index 12ff3e70e8de..01970eb9e916 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -40,29 +40,25 @@ public:
 
     /// Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     // XServiceInfo
 
     /** Returns an identifier for the implementation of this object. */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class. */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext service. */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     static bool IsEndnote( const SwFootnoteFrame *pFrame );
 };
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 6c6a697d9adc..68952434684c 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -43,19 +43,16 @@ SwAccessibleGraphic::~SwAccessibleGraphic()
 }
 
 OUString SAL_CALL SwAccessibleGraphic::getImplementationName()
-        throw( RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.Writer.SwAccessibleGraphic");
 }
 
 sal_Bool SAL_CALL SwAccessibleGraphic::supportsService(const OUString& sTestServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sTestServiceName);
 }
 
 Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -65,14 +62,12 @@ Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames()
 }
 
 Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId()
-        throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 //  Return this object's role.
 sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole()
-        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index 754604d25511..038a3be708e2 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -35,24 +35,21 @@ public:
 
     /** Returns an identifier for the implementation of this object. */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class. */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext service. */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
     /// Return this object's role.
-    virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 };
 
 #endif
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index eb87ee5c4976..f9ecac61fc7a 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -62,7 +62,6 @@ SwAccessibleHeaderFooter::~SwAccessibleHeaderFooter()
 }
 
 OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -78,7 +77,6 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription()
 }
 
 OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName()
-        throw( RuntimeException, std::exception )
 {
     if( AccessibleRole::HEADER == GetRole() )
         return OUString(sImplementationNameHeader);
@@ -87,13 +85,11 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName()
 }
 
 sal_Bool SAL_CALL SwAccessibleHeaderFooter::supportsService(const OUString& sTestServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sTestServiceName);
 }
 
 Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -106,13 +102,11 @@ Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames
 }
 
 Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId()
-        throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 sal_Int32 SAL_CALL SwAccessibleHeaderFooter::getBackground()
-        throw (css::uno::RuntimeException, std::exception)
 {
     Reference< XAccessible > xParent =  getAccessibleParent();
     if (xParent.is())
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index fded39e7d55a..ce7eaa406eb2 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -40,32 +40,27 @@ public:
 
     /// Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     // XServiceInfo
 
     /** Returns an identifier for the implementation of this object. */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class. */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext service. */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
     // XAccessibleComponent
-    sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getBackground() override;
 };
 
 #endif
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index a62075282611..49f7c554023e 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -63,13 +63,11 @@ const SwTextAttr *SwAccessibleHyperlink::GetTextAttr() const
 
 // XAccessibleAction
 sal_Int32 SAL_CALL SwAccessibleHyperlink::getAccessibleActionCount()
-        throw (uno::RuntimeException, std::exception)
 {
      return isValid() ? 1 : 0;
 }
 
 sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -106,7 +104,6 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
 
 OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription(
         sal_Int32 nIndex )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     if(nIndex != 0)
         throw lang::IndexOutOfBoundsException();
@@ -123,7 +120,6 @@ OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription(
 
 uno::Reference< XAccessibleKeyBinding > SAL_CALL
     SwAccessibleHyperlink::getAccessibleActionKeyBinding( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     uno::Reference< XAccessibleKeyBinding > xKeyBinding;
 
@@ -147,7 +143,6 @@ uno::Reference< XAccessibleKeyBinding > SAL_CALL
 // XAccessibleHyperlink
 uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionAnchor(
         sal_Int32 nIndex)
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -162,7 +157,6 @@ uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionAnchor(
 
 uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject(
             sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -181,19 +175,16 @@ uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject(
 }
 
 sal_Int32 SAL_CALL SwAccessibleHyperlink::getStartIndex()
-        throw (uno::RuntimeException, std::exception)
 {
     return nStartIdx;
 }
 
 sal_Int32 SAL_CALL SwAccessibleHyperlink::getEndIndex()
-        throw (uno::RuntimeException, std::exception)
 {
     return nEndIdx;
 }
 
 sal_Bool SAL_CALL SwAccessibleHyperlink::isValid(  )
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (xPara.is())
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index 060be01b617d..24be02b59730 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -48,36 +48,22 @@ class SwAccessibleHyperlink :
 
 public:
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount() override;
+    virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override;
     virtual OUString SAL_CALL getAccessibleActionDescription(
-                sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+                sal_Int32 nIndex ) override;
     virtual css::uno::Reference<
             css::accessibility::XAccessibleKeyBinding > SAL_CALL
-               getAccessibleActionKeyBinding( sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+               getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleHyperlink
     virtual css::uno::Any SAL_CALL getAccessibleActionAnchor(
-                sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+                sal_Int32 nIndex ) override;
     virtual css::uno::Any SAL_CALL getAccessibleActionObject(
-            sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getStartIndex()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getEndIndex()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isValid(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getStartIndex() override;
+    virtual sal_Int32 SAL_CALL getEndIndex() override;
+    virtual sal_Bool SAL_CALL isValid(  ) override;
 };
 
 #endif
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 10f6945a239f..3c484701c717 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -128,8 +128,8 @@ protected:
 public:
     explicit SwDrawModellListener_Impl( SdrModel *pDrawModel );
 
-    virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener( const uno::Reference< document::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const uno::Reference< document::XEventListener >& xListener ) override;
 
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
     void Dispose();
@@ -147,12 +147,12 @@ SwDrawModellListener_Impl::~SwDrawModellListener_Impl()
     Dispose();
 }
 
-void SAL_CALL SwDrawModellListener_Impl::addEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwDrawModellListener_Impl::addEventListener( const uno::Reference< document::XEventListener >& xListener )
 {
     maEventListeners.addInterface( xListener );
 }
 
-void SAL_CALL SwDrawModellListener_Impl::removeEventListener( const uno::Reference< document::XEventListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwDrawModellListener_Impl::removeEventListener( const uno::Reference< document::XEventListener >& xListener )
 {
     maEventListeners.removeInterface( xListener );
 }
@@ -3109,7 +3109,7 @@ bool SwAccessibleMap::ReplaceChild (
         const uno::Reference< drawing::XShape >& _rxShape,
         const long /*_nIndex*/,
         const ::accessibility::AccessibleShapeTreeInfo& /*_rShapeTreeInfo*/
-    )   throw (uno::RuntimeException, std::exception)
+    )
 {
     const SdrObject *pObj = nullptr;
     {
@@ -3182,7 +3182,7 @@ bool SwAccessibleMap::ReplaceChild (
 }
 
 //Get the accessible control shape from the model object, here model object is with XPropertySet type
-::accessibility::AccessibleControlShape * SwAccessibleMap::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException)
+::accessibility::AccessibleControlShape * SwAccessibleMap::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet)
 {
     if( mpShapeMap )
     {
@@ -3207,7 +3207,6 @@ bool SwAccessibleMap::ReplaceChild (
 
 css::uno::Reference< XAccessible >
     SwAccessibleMap::GetAccessibleCaption (const css::uno::Reference< css::drawing::XShape >&)
-    throw (css::uno::RuntimeException)
 {
     return nullptr;
 }
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 4163fc1db223..faa5736ad860 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -173,7 +173,6 @@ void SwAccessibleNoTextFrame::Dispose(bool bRecursive, bool bCanSkipInvisible)
 
 // #i73249#
 OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -188,7 +187,6 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName()
 }
 
 OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleDescription()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -200,7 +198,6 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleDescription()
 // XInterface
 
 uno::Any SAL_CALL SwAccessibleNoTextFrame::queryInterface( const uno::Type& aType )
-    throw (uno::RuntimeException, std::exception)
 {
     if( aType ==
         ::cppu::UnoType<XAccessibleImage>::get() )
@@ -219,7 +216,7 @@ uno::Any SAL_CALL SwAccessibleNoTextFrame::queryInterface( const uno::Type& aTyp
 
 // XTypeProvider
 
-uno::Sequence< uno::Type > SAL_CALL SwAccessibleNoTextFrame::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL SwAccessibleNoTextFrame::getTypes()
 {
     uno::Sequence< uno::Type > aTypes( SwAccessibleFrameBase::getTypes() );
 
@@ -238,66 +235,62 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleNoTextFrame::getTypes() throw(un
     methods. So we just delegate to those. */
 
 OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageDescription()
-    throw ( uno::RuntimeException, std::exception )
 {
     return getAccessibleDescription();
 }
 
 sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageHeight(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     return getSize().Height;
 }
 
 sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageWidth(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     return getSize().Width;
 }
 
 // XAccesibleText
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception){return 0;}
-sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return false;}
-sal_Unicode SAL_CALL SwAccessibleNoTextFrame::getCharacter( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;}
-css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SwAccessibleNoTextFrame::getCharacterAttributes( sal_Int32 , const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition(  ){return 0;}
+sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ){return false;}
+sal_Unicode SAL_CALL SwAccessibleNoTextFrame::getCharacter( sal_Int32 ){return 0;}
+css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SwAccessibleNoTextFrame::getCharacterAttributes( sal_Int32 , const css::uno::Sequence< OUString >& )
 {
     uno::Sequence<beans::PropertyValue> aValues(0);
     return aValues;
 }
-css::awt::Rectangle SAL_CALL SwAccessibleNoTextFrame::getCharacterBounds( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
+css::awt::Rectangle SAL_CALL SwAccessibleNoTextFrame::getCharacterBounds( sal_Int32 )
 {
     return css::awt::Rectangle(0, 0, 0, 0 );
 }
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception){return 0;}
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getIndexAtPoint( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception){return 0;}
-OUString SAL_CALL SwAccessibleNoTextFrame::getSelectedText(  ) throw (css::uno::RuntimeException, std::exception){return OUString();}
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception){return 0;}
-sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception){return 0;}
-sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;}
-OUString SAL_CALL SwAccessibleNoTextFrame::getText(  ) throw (css::uno::RuntimeException, std::exception){return OUString();}
-OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();}
-css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextAtIndex( sal_Int32 , sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCharacterCount(  ){return 0;}
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getIndexAtPoint( const css::awt::Point& ){return 0;}
+OUString SAL_CALL SwAccessibleNoTextFrame::getSelectedText(  ){return OUString();}
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionStart(  ){return 0;}
+sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionEnd(  ){return 0;}
+sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ){return true;}
+OUString SAL_CALL SwAccessibleNoTextFrame::getText(  ){return OUString();}
+OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ){return OUString();}
+css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextAtIndex( sal_Int32 , sal_Int16 )
 {
     css::accessibility::TextSegment aResult;
     return aResult;
 }
-css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBeforeIndex( sal_Int32, sal_Int16 )
 {
     css::accessibility::TextSegment aResult;
     return aResult;
 }
-css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBehindIndex( sal_Int32 , sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBehindIndex( sal_Int32 , sal_Int16 )
 {
     css::accessibility::TextSegment aResult;
     return aResult;
 }
 
-sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;}
+sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ){return true;}
 
 //  XAccessibleHyperText
 
 sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getHyperLinkCount()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -314,7 +307,6 @@ throw (uno::RuntimeException, std::exception)
 
 uno::Reference< XAccessibleHyperlink > SAL_CALL
     SwAccessibleNoTextFrame::getHyperLink( sal_Int32 nLinkIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleHypertext );
@@ -340,13 +332,11 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 }
 
 sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getHyperLinkIndex( sal_Int32 )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     return 0;
 }
 
 uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleNoTextFrame::getAccessibleRelationSet( )
-    throw ( uno::RuntimeException, std::exception )
 {
     return new AccessibleRelationSetHelper();
 }
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index ba7c9ec35257..746901455236 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -59,21 +59,18 @@ public:
 
     // #i73249# - Return the object's current name.
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
 
     /// Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     // XInterface methods need to be implemented to disambiguate
     // between those inherited through SwAccessibleContext and
     // XAccessibleImage.
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type& aType ) override;
 
     virtual void SAL_CALL acquire(  ) throw () override
         { SwAccessibleContext::acquire(); };
@@ -82,59 +79,50 @@ public:
         { SwAccessibleContext::release(); };
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     // XAccessibleImage
     virtual OUString SAL_CALL
-        getAccessibleImageDescription(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleImageDescription(  ) override;
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleImageHeight(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleImageHeight(  ) override;
 
     virtual sal_Int32 SAL_CALL
-        getAccessibleImageWidth(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        getAccessibleImageWidth(  ) override;
 
     // The object is not visible an longer and should be destroyed
     virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override;
 
-    virtual sal_Int32 SAL_CALL getCaretPosition(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionStart(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionEnd(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition(  ) override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount(  ) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual OUString SAL_CALL getSelectedText(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectionStart(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd(  ) override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual OUString SAL_CALL getText(  ) override;
+    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     // XAccessibleHypertext
-    virtual sal_Int32 SAL_CALL getHyperLinkCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getHyperLinkCount() override;
     virtual css::uno::Reference< css::accessibility::XAccessibleHyperlink >
-    SAL_CALL getHyperLink( sal_Int32 nLinkIndex )
-    throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex )
-    throw (css::lang::IndexOutOfBoundsException,
-            css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) override;
+    virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) override;
 
     SwAccessibleMap *GetAccessibleMap(){ return GetMap();}
 
 public:
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 };
 
 #endif
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index d1aebb9cc33c..491c76c6d062 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -45,7 +45,6 @@ SwAccessibleNoTextHyperlink::SwAccessibleNoTextHyperlink( SwAccessibleNoTextFram
 
 // XAccessibleAction
 sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionCount()
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -64,7 +63,6 @@ sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionCount()
 }
 
 sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIndex )
-        throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -104,7 +102,6 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn
 
 OUString SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionDescription(
         sal_Int32 nIndex )
-        throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -131,7 +128,6 @@ OUString SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionDescription(
 
 Reference< XAccessibleKeyBinding > SAL_CALL
     SwAccessibleNoTextHyperlink::getAccessibleActionKeyBinding( sal_Int32 nIndex )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -172,7 +168,6 @@ Reference< XAccessibleKeyBinding > SAL_CALL
 // XAccessibleHyperlink
 Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionAnchor(
         sal_Int32 nIndex )
-        throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -190,7 +185,6 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionAnchor(
 
 Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionObject(
             sal_Int32 nIndex )
-    throw (IndexOutOfBoundsException, RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -215,19 +209,16 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionObject(
 }
 
 sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getStartIndex()
-        throw (RuntimeException, std::exception)
 {
     return 0;
 }
 
 sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getEndIndex()
-        throw (RuntimeException, std::exception)
 {
     return 0;
 }
 
 sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid(  )
-        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index 7629ef8272cc..d57cd29f2e86 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -46,35 +46,21 @@ public:
     SwAccessibleNoTextHyperlink( SwAccessibleNoTextFrame *p, const SwFrame* aFrame );
 
     // XAccessibleAction
-    virtual sal_Int32 SAL_CALL getAccessibleActionCount()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount() override;
+    virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override;
     virtual OUString SAL_CALL getAccessibleActionDescription(
-                sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+                sal_Int32 nIndex ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL
-            getAccessibleActionKeyBinding( sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+            getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // XAccessibleHyperlink
     virtual css::uno::Any SAL_CALL getAccessibleActionAnchor(
-                sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+                sal_Int32 nIndex ) override;
     virtual css::uno::Any SAL_CALL getAccessibleActionObject(
-            sal_Int32 nIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getStartIndex()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getEndIndex()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isValid(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getStartIndex() override;
+    virtual sal_Int32 SAL_CALL getEndIndex() override;
+    virtual sal_Bool SAL_CALL isValid(  ) override;
 };
 
 #endif
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 0bf30f7be3ec..6c2d444af7d3 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -135,19 +135,16 @@ bool SwAccessiblePage::HasCursor()
 }
 
 OUString SwAccessiblePage::getImplementationName( )
-    throw( RuntimeException, std::exception )
 {
     return OUString(sImplementationName);
 }
 
 sal_Bool SwAccessiblePage::supportsService( const OUString& rServiceName)
-    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( )
-    throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -157,13 +154,11 @@ Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( )
 }
 
 Sequence< sal_Int8 > SAL_CALL SwAccessiblePage::getImplementationId()
-        throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 OUString SwAccessiblePage::getAccessibleDescription( )
-    throw( RuntimeException, std::exception )
 {
     CHECK_FOR_DEFUNC( css::accessibility::XAccessibleContext );
 
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index ed6e25cbd3f4..61cd7a7457c3 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -55,22 +55,18 @@ public:
 
     // XAccessibleContext methods that need to be overridden
 
-    virtual OUString SAL_CALL getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription() override;
 
     // 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 (
-        const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        const OUString& sServiceName) override;
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     virtual bool HasCursor() override;   // required by map to remember that object
 };
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 92b0f99df6bf..624928acbc4a 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -573,7 +573,6 @@ bool SwAccessibleParagraph::HasCursor()
 }
 
 void SwAccessibleParagraph::UpdatePortionData()
-    throw( uno::RuntimeException )
 {
     // obtain the text frame
     OSL_ENSURE( GetFrame() != nullptr, "The text frame has vanished!" );
@@ -871,11 +870,6 @@ bool SwAccessibleParagraph::GetTextBoundary(
     const OUString& rText,
     sal_Int32 nPos,
     sal_Int16 nTextType )
-    throw (
-        lang::IndexOutOfBoundsException,
-        lang::IllegalArgumentException,
-        uno::RuntimeException,
-        std::exception)
 {
     // error checking
     if( !( AccessibleTextType::LINE == nTextType
@@ -927,7 +921,6 @@ bool SwAccessibleParagraph::GetTextBoundary(
 }
 
 OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -941,7 +934,6 @@ OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription()
 }
 
 lang::Locale SAL_CALL SwAccessibleParagraph::getLocale()
-        throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -959,7 +951,6 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale()
 
 // #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO
 uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccessibleRelationSet()
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleContext );
@@ -994,7 +985,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
 }
 
 void SAL_CALL SwAccessibleParagraph::grabFocus()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1066,7 +1056,6 @@ static bool lcl_GetBackgroundColor( Color & rColor,
 }
 
 sal_Int32 SAL_CALL SwAccessibleParagraph::getForeground()
-                                throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1088,7 +1077,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getForeground()
 }
 
 sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground()
-                                throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1103,20 +1091,17 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground()
 }
 
 OUString SAL_CALL SwAccessibleParagraph::getImplementationName()
-        throw( uno::RuntimeException, std::exception )
 {
     return OUString(sImplementationName);
 }
 
 sal_Bool SAL_CALL SwAccessibleParagraph::supportsService(
         const OUString& sTestServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sTestServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwAccessibleParagraph::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -1189,7 +1174,6 @@ uno::Sequence< OUString > const & getSupplementalAttributeNames()
 // XInterface
 
 uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if ( rType == cppu::UnoType<XAccessibleText>::get())
@@ -1251,7 +1235,7 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType )
 }
 
 // XTypeProvider
-uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes()
 {
     uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() );
 
@@ -1273,7 +1257,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno:
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId()
-        throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -1281,7 +1264,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId()
 // XAccesibleText
 
 sal_Int32 SwAccessibleParagraph::getCaretPosition()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1303,7 +1285,6 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition()
 }
 
 sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1336,7 +1317,6 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex )
 }
 
 sal_Unicode SwAccessibleParagraph::getCharacter( sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1611,9 +1591,6 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
 uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
     sal_Int32 nIndex,
     const uno::Sequence< OUString >& aRequestedAttributes )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException,
-           std::exception)
 {
 
     SolarMutexGuard aGuard;
@@ -1883,7 +1860,6 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
 
 uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes(
         const uno::Sequence< OUString >& aRequestedAttributes )
-        throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -2053,8 +2029,6 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
 uno::Sequence< PropertyValue > SwAccessibleParagraph::getRunAttributes(
         sal_Int32 nIndex,
         const uno::Sequence< OUString >& aRequestedAttributes )
-        throw ( lang::IndexOutOfBoundsException,
-                uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -2353,7 +2327,6 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
 
 awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
     sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2408,7 +2381,6 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
 }
 
 sal_Int32 SwAccessibleParagraph::getCharacterCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2418,7 +2390,6 @@ sal_Int32 SwAccessibleParagraph::getCharacterCount()
 }
 
 sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2494,7 +2465,6 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
 }
 
 OUString SwAccessibleParagraph::getSelectedText()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2508,7 +2478,6 @@ OUString SwAccessibleParagraph::getSelectedText()
 }
 
 sal_Int32 SwAccessibleParagraph::getSelectionStart()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2520,7 +2489,6 @@ sal_Int32 SwAccessibleParagraph::getSelectionStart()
 }
 
 sal_Int32 SwAccessibleParagraph::getSelectionEnd()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2532,7 +2500,6 @@ sal_Int32 SwAccessibleParagraph::getSelectionEnd()
 }
 
 sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2568,7 +2535,6 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
 }
 
 OUString SwAccessibleParagraph::getText()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2579,7 +2545,6 @@ OUString SwAccessibleParagraph::getText()
 
 OUString SwAccessibleParagraph::getTextRange(
     sal_Int32 nStartIndex, sal_Int32 nEndIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2596,7 +2561,7 @@ OUString SwAccessibleParagraph::getTextRange(
         throw lang::IndexOutOfBoundsException();
 }
 
-/*accessibility::*/TextSegment SwAccessibleParagraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+/*accessibility::*/TextSegment SwAccessibleParagraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType )
 {
     SolarMutexGuard aGuard;
 
@@ -2632,7 +2597,7 @@ OUString SwAccessibleParagraph::getTextRange(
     return aResult;
 }
 
-/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType )
 {
     SolarMutexGuard aGuard;
 
@@ -2703,7 +2668,7 @@ OUString SwAccessibleParagraph::getTextRange(
     return aResult;
 }
 
-/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType )
 {
     SolarMutexGuard aGuard;
 
@@ -2801,7 +2766,6 @@ OUString SwAccessibleParagraph::getTextRange(
 }
 
 sal_Bool SwAccessibleParagraph::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
     SolarMutexGuard aGuard;
@@ -2815,7 +2779,6 @@ sal_Bool SwAccessibleParagraph::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI
 // XAccesibleEditableText
 
 sal_Bool SwAccessibleParagraph::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     CHECK_FOR_DEFUNC( XAccessibleEditableText );
     SolarMutexGuard aGuard;
@@ -2830,7 +2793,6 @@ sal_Bool SwAccessibleParagraph::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIn
 }
 
 sal_Bool SwAccessibleParagraph::pasteText( sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     CHECK_FOR_DEFUNC( XAccessibleEditableText );
     SolarMutexGuard aGuard;
@@ -2845,13 +2807,11 @@ sal_Bool SwAccessibleParagraph::pasteText( sal_Int32 nIndex )
 }
 
 sal_Bool SwAccessibleParagraph::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     return replaceText( nStartIndex, nEndIndex, OUString() );
 }
 
 sal_Bool SwAccessibleParagraph::insertText( const OUString& sText, sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     return replaceText( nIndex, nIndex, sText );
 }
@@ -2859,7 +2819,6 @@ sal_Bool SwAccessibleParagraph::insertText( const OUString& sText, sal_Int32 nIn
 sal_Bool SwAccessibleParagraph::replaceText(
     sal_Int32 nStartIndex, sal_Int32 nEndIndex,
     const OUString& sReplacement )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2911,7 +2870,6 @@ sal_Bool SwAccessibleParagraph::setAttributes(
     sal_Int32 nStartIndex,
     sal_Int32 nEndIndex,
     const uno::Sequence<PropertyValue>& rAttributeSet )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleEditableText );
@@ -2967,7 +2925,6 @@ sal_Bool SwAccessibleParagraph::setAttributes(
 }
 
 sal_Bool SwAccessibleParagraph::setText( const OUString& sText )
-    throw (uno::RuntimeException, std::exception)
 {
     return replaceText(0, GetString().getLength(), sText);
 }
@@ -2976,8 +2933,6 @@ sal_Bool SwAccessibleParagraph::setText( const OUString& sText )
 
 void SwAccessibleParagraph::selectAccessibleChild(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception )
 {
     CHECK_FOR_DEFUNC( XAccessibleSelection );
 
@@ -2986,8 +2941,6 @@ void SwAccessibleParagraph::selectAccessibleChild(
 
 sal_Bool SwAccessibleParagraph::isAccessibleChildSelected(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception )
 {
     CHECK_FOR_DEFUNC( XAccessibleSelection );
 
@@ -2995,13 +2948,11 @@ sal_Bool SwAccessibleParagraph::isAccessibleChildSelected(
 }
 
 void SwAccessibleParagraph::clearAccessibleSelection(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     CHECK_FOR_DEFUNC( XAccessibleSelection );
 }
 
 void SwAccessibleParagraph::selectAllAccessibleChildren(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     CHECK_FOR_DEFUNC( XAccessibleSelection );
 
@@ -3009,7 +2960,6 @@ void SwAccessibleParagraph::selectAllAccessibleChildren(  )
 }
 
 sal_Int32 SwAccessibleParagraph::getSelectedAccessibleChildCount(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     CHECK_FOR_DEFUNC( XAccessibleSelection );
 
@@ -3018,8 +2968,6 @@ sal_Int32 SwAccessibleParagraph::getSelectedAccessibleChildCount(  )
 
 uno::Reference<XAccessible> SwAccessibleParagraph::getSelectedAccessibleChild(
     sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception)
 {
     CHECK_FOR_DEFUNC( XAccessibleSelection );
 
@@ -3029,8 +2977,6 @@ uno::Reference<XAccessible> SwAccessibleParagraph::getSelectedAccessibleChild(
 // index has to be treated as global child index.
 void SwAccessibleParagraph::deselectAccessibleChild(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception )
 {
     CHECK_FOR_DEFUNC( XAccessibleSelection );
 
@@ -3091,7 +3037,6 @@ const SwTextAttr *SwHyperlinkIter_Impl::next()
 };
 
 sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3110,7 +3055,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount()
 
 uno::Reference< XAccessibleHyperlink > SAL_CALL
     SwAccessibleParagraph::getHyperLink( sal_Int32 nLinkIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleHypertext );
@@ -3199,7 +3143,6 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 }
 
 sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleHypertext );
@@ -3239,8 +3182,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde
 
 // #i71360#, #i108125# - adjustments for change tracking text markup
 sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMarkupType )
-                                        throw (lang::IllegalArgumentException,
-                                               uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -3267,14 +3208,11 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar
 
 //MSAA Extension Implementation in app  module
 sal_Bool SAL_CALL SwAccessibleParagraph::scrollToPosition( const css::awt::Point&, sal_Bool )
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount(  )
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard g;
 
@@ -3312,9 +3250,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount(  )
 }
 
 sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSelectedPortionIndex )
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3326,9 +3261,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSe
 }
 
 sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3340,9 +3272,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSele
 }
 
 sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionIndex )
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard g;
 
@@ -3398,9 +3327,6 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
 }
 
 sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 startOffset, sal_Int32 endOffset)
-    throw (css::lang::IndexOutOfBoundsException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3465,9 +3391,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
 /*accessibility::*/TextSegment SAL_CALL
         SwAccessibleParagraph::getTextMarkup( sal_Int32 nTextMarkupIndex,
                                               sal_Int32 nTextMarkupType )
-                                        throw (lang::IndexOutOfBoundsException,
-                                               lang::IllegalArgumentException,
-                                               uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -3495,9 +3418,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
 uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL
         SwAccessibleParagraph::getTextMarkupAtIndex( sal_Int32 nCharIndex,
                                                      sal_Int32 nTextMarkupType )
-                                        throw (lang::IndexOutOfBoundsException,
-                                               lang::IllegalArgumentException,
-                                               uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -3531,8 +3451,6 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL
 
 // #i89175#
 sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex )
-                                        throw (lang::IndexOutOfBoundsException,
-                                               uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -3549,8 +3467,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex
 
 /*accessibility::*/TextSegment SAL_CALL
         SwAccessibleParagraph::getTextAtLineNumber( sal_Int32 nLineNo )
-                                        throw (lang::IndexOutOfBoundsException,
-                                               uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -3575,7 +3491,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex
 }
 
 /*accessibility::*/TextSegment SAL_CALL SwAccessibleParagraph::getTextAtLineWithCaret()
-                                        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -3591,7 +3506,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex
 }
 
 sal_Int32 SAL_CALL SwAccessibleParagraph::getNumberOfLineWithCaret()
-                                        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -3797,7 +3711,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
     return bRet;
 }
 
-sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (css::uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole()
 {
     SolarMutexGuard g;
 
@@ -3836,7 +3750,6 @@ sal_Int32 SwAccessibleParagraph::GetRealHeadingLevel()
 }
 
 uno::Any SAL_CALL SwAccessibleParagraph::getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 22054d82935f..11e05b9486fb 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -182,8 +182,7 @@ protected:
 
     // force update of new portion data
     /// @throws css::uno::RuntimeException
-    void UpdatePortionData()
-        throw( css::uno::RuntimeException );
+    void UpdatePortionData();
 
     // remove the current portion data
     void ClearPortionData();
@@ -191,7 +190,6 @@ protected:
     // get portion data; update if necessary
     /// @throws css::uno::RuntimeException
     SwAccessiblePortionData& GetPortionData()
-        throw( css::uno::RuntimeException )
     {
         if( pPortionData == nullptr )
             UpdatePortionData();
@@ -230,12 +228,7 @@ protected:
     bool GetTextBoundary( css::i18n::Boundary& rBound,
                               const OUString& rText,
                               sal_Int32 nPos,
-                              sal_Int16 aTextType )
-        throw (
-            css::lang::IndexOutOfBoundsException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException,
-            std::exception);
+                              sal_Int16 aTextType );
 
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) override;
 
@@ -249,54 +242,45 @@ public:
     virtual bool HasCursor() override;   // required by map to remember that object
 
     css::uno::Sequence< css::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex  );
-    virtual sal_Int16 SAL_CALL getAccessibleRole()     throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     // XAccessibleContext
 
     // Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     // Return the parents locale or throw exception if this object has no
     // parent yet/anymore.
     virtual css::lang::Locale SAL_CALL
-        getLocale()
-        throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
+        getLocale() override;
 
     // #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO
     virtual css::uno::Reference<
             css::accessibility::XAccessibleRelationSet> SAL_CALL
-        getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleRelationSet() override;
 
     // XAccessibleComponent
 
-    virtual void SAL_CALL grabFocus()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() override;
     // #i71385#
-    virtual sal_Int32 SAL_CALL getForeground()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() override;
+    virtual sal_Int32 SAL_CALL getBackground() override;
 
     // XServiceInfo
 
     // Returns an identifier for the implementation of this object.
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     // Return whether the specified service is supported by this class.
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     // Returns a list of all supported services.  In this case that is just
     // the AccessibleContext service.
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XInterface
 
@@ -305,8 +289,7 @@ public:
     // XAccessibleEditableText).
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type& aType ) override;
 
     virtual void SAL_CALL acquire(  ) throw () override
         { SwAccessibleContext::acquire(); };
@@ -315,131 +298,81 @@ public:
         { SwAccessibleContext::release(); };
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XAccessibleText
-    virtual sal_Int32 SAL_CALL getCaretPosition()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getCharacterCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSelectedText(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionStart()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectionEnd()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCaretPosition() override;
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override;
+    virtual sal_Int32 SAL_CALL getCharacterCount(  ) override;
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override;
+    virtual OUString SAL_CALL getSelectedText(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectionStart() override;
+    virtual sal_Int32 SAL_CALL getSelectionEnd() override;
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual OUString SAL_CALL getText(  ) override;
+    virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override;
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
 
     // XAccessibleEditableText
-    virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) override;
+    virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override;
+    virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) override;
+    virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) override;
+    virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) override;
+    virtual sal_Bool SAL_CALL setText( const OUString& sText ) override;
 
     // XAccessibleSelection
     virtual void SAL_CALL selectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
     virtual sal_Bool SAL_CALL isAccessibleChildSelected(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL clearAccessibleSelection(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nSelectedChildIndex ) override;
 
     // index has to be treated as global child index.
     virtual void SAL_CALL deselectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
     // XAccessibleHypertext
-    virtual sal_Int32 SAL_CALL getHyperLinkCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getHyperLinkCount() override;
     virtual css::uno::Reference<
             css::accessibility::XAccessibleHyperlink >
-        SAL_CALL getHyperLink( sal_Int32 nLinkIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) override;
+    virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) override;
 
     // #i71360#
     // XAccesibleTextMarkup
-    virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType )
-            throw (css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType ) override;
 
     virtual css::accessibility::TextSegment SAL_CALL
             getTextMarkup( sal_Int32 nTextMarkupIndex,
-                           sal_Int32 nTextMarkupType )
-            throw (css::lang::IndexOutOfBoundsException,
-                   css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception) override;
+                           sal_Int32 nTextMarkupType ) override;
 
     virtual css::uno::Sequence< css::accessibility::TextSegment > SAL_CALL
             getTextMarkupAtIndex( sal_Int32 nCharIndex,
-                                  sal_Int32 nTextMarkupType )
-            throw (css::lang::IndexOutOfBoundsException,
-                   css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception) override;
+                                  sal_Int32 nTextMarkupType ) override;
 
     // XAccessibleTextSelection
-    virtual sal_Bool SAL_CALL scrollToPosition( const css::awt::Point& aPoint, sal_Bool isLeftTop )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedPortionCount(  )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Int32 SAL_CALL  addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset)
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual sal_Bool SAL_CALL scrollToPosition( const css::awt::Point& aPoint, sal_Bool isLeftTop ) override;
+    virtual sal_Int32 SAL_CALL getSelectedPortionCount(  ) override;
+    virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex ) override;
+    virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex ) override;
+    virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex ) override;
+    virtual sal_Int32 SAL_CALL  addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset) override;
     // XAccessibleExtendedAttributes
-    virtual css::uno::Any SAL_CALL getExtendedAttributes()
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
+    virtual css::uno::Any SAL_CALL getExtendedAttributes() override ;
     bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd);
     sal_Int32 GetRealHeadingLevel();
     // XAccessibleComponent
@@ -447,26 +380,20 @@ public:
 
     // #i89175#
     // XAccessibleMultiLineText
-    virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex )
-            throw (css::lang::IndexOutOfBoundsException,
-                   css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex ) override;
 
     virtual css::accessibility::TextSegment SAL_CALL
-            getTextAtLineNumber( sal_Int32 nLineNo )
-            throw (css::lang::IndexOutOfBoundsException,
-                   css::uno::RuntimeException, std::exception) override;
+            getTextAtLineNumber( sal_Int32 nLineNo ) override;
 
     virtual css::accessibility::TextSegment SAL_CALL
-            getTextAtLineWithCaret()
-            throw (css::uno::RuntimeException, std::exception) override;
+            getTextAtLineWithCaret() override;
 
-    virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret()
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret() override;
 
     // #i63870#
     // XAccesibleTextAttributes
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override;
 };
 
 inline SwAccessibleParagraph::operator css::accessibility::XAccessibleText *()
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 269e1ed82c10..2489dc307a06 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -40,36 +40,32 @@ SwAccessiblePreview::~SwAccessiblePreview()
 }
 
 OUString SwAccessiblePreview::getImplementationName( )
-    throw( RuntimeException, std::exception )
 {
     return OUString( sImplementationName );
 }
 
 sal_Bool SwAccessiblePreview::supportsService( const OUString& rServiceName )
-    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence<OUString> SwAccessiblePreview::getSupportedServiceNames( )
-    throw( RuntimeException, std::exception )
 {
     return {"com.sun.star.text.AccessibleTextDocumentPageView",
             sAccessibleServiceName};
 }
 
 Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId()
-        throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription()
 {
     return GetResource( STR_ACCESS_PREVIEW_DOC_NAME );
 }
 
-OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL SwAccessiblePreview::getAccessibleName()
 {
     return SwAccessibleDocumentBase::getAccessibleName() + " " + GetResource( STR_ACCESS_PREVIEW_DOC_SUFFIX );
 }
diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx
index ad807fbc7ac7..cc9cab268795 100644
--- a/sw/source/core/access/accpreview.hxx
+++ b/sw/source/core/access/accpreview.hxx
@@ -42,27 +42,24 @@ public:
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class.
     */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext service.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
-    OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getAccessibleDescription() override;
+    OUString SAL_CALL getAccessibleName() override;
     virtual void InvalidateFocus_() override;
 };
 
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 475990901759..ebe0cb4777d4 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -66,7 +66,6 @@ SwFEShell* SwAccessibleSelectionHelper::GetFEShell()
 }
 
 void SwAccessibleSelectionHelper::throwIndexOutOfBoundsException()
-        throw ( lang::IndexOutOfBoundsException )
 {
     Reference < XAccessibleContext > xThis( &m_rContext );
     Reference < XAccessibleSelection >xSelThis( xThis, UNO_QUERY );
@@ -79,8 +78,6 @@ void SwAccessibleSelectionHelper::throwIndexOutOfBoundsException()
 // XAccessibleSelection
 void SwAccessibleSelectionHelper::selectAccessibleChild(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -139,8 +136,6 @@ static bool lcl_getSelectedState(const SwAccessibleChild& aChild,
 
 bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -175,7 +170,6 @@ bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
 }
 
 void SwAccessibleSelectionHelper::selectAllAccessibleChildren(  )
-    throw ( RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -207,7 +201,6 @@ void SwAccessibleSelectionHelper::selectAllAccessibleChildren(  )
 }
 
 sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount(  )
-    throw ( RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -272,8 +265,6 @@ sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount(  )
 
 Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
     sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            RuntimeException)
 {
     SolarMutexGuard aGuard;
 
@@ -367,8 +358,6 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
 // index has to be treated as global child index.
 void SwAccessibleSelectionHelper::deselectAccessibleChild(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            RuntimeException )
 {
     SolarMutexGuard g;
 
diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx
index e1ab1e8924ef..497c071f02fe 100644
--- a/sw/source/core/access/accselectionhelper.hxx
+++ b/sw/source/core/access/accselectionhelper.hxx
@@ -33,8 +33,7 @@ class SwAccessibleSelectionHelper
     SwFEShell* GetFEShell();
 
     /// @throws css::lang::IndexOutOfBoundsException
-    void throwIndexOutOfBoundsException()
-        throw ( css::lang::IndexOutOfBoundsException );
+    void throwIndexOutOfBoundsException();
 
 public:
     SwAccessibleSelectionHelper( SwAccessibleContext& rContext );
@@ -45,35 +44,25 @@ public:
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
     void selectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException );
+        sal_Int32 nChildIndex );
 
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
     bool isAccessibleChildSelected(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException );
+        sal_Int32 nChildIndex );
     /// @throws css::uno::RuntimeException
-    void selectAllAccessibleChildren(  )
-        throw ( css::uno::RuntimeException );
+    void selectAllAccessibleChildren(  );
     /// @throws css::uno::RuntimeException
-    sal_Int32 getSelectedAccessibleChildCount(  )
-        throw ( css::uno::RuntimeException );
+    sal_Int32 getSelectedAccessibleChildCount(  );
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::accessibility::XAccessible > getSelectedAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException);
+        sal_Int32 nSelectedChildIndex );
     // index has to be treated as global child index.
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
     void deselectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException );
+        sal_Int32 nChildIndex );
 };
 
 #endif
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 7a2463c1905f..12afc54a8db5 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -117,8 +117,7 @@ public:
 
     /// @throws lang::IndexOutOfBoundsException
     /// @throws  uno::RuntimeException
-    const SwFrame *GetCell( sal_Int32 nRow, sal_Int32 nColumn, SwAccessibleTable *pThis ) const
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception);
+    const SwFrame *GetCell( sal_Int32 nRow, sal_Int32 nColumn, SwAccessibleTable *pThis ) const;
     const SwFrame *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop ) const;
     inline sal_Int32 GetRowCount() const;
     inline sal_Int32 GetColumnCount() const;
@@ -131,8 +130,7 @@ public:
 
     /// @throws lang::IndexOutOfBoundsException
     void CheckRowAndCol( sal_Int32 nRow, sal_Int32 nCol,
-                         SwAccessibleTable *pThis ) const
-        throw(lang::IndexOutOfBoundsException );
+                         SwAccessibleTable *pThis ) const;
 
     void GetRowColumnAndExtent( const SwRect& rBox,
                                   sal_Int32& rRow, sal_Int32& rColumn,
@@ -419,7 +417,6 @@ void SwAccessibleTableData_Impl::GetSelection(
 const SwFrame *SwAccessibleTableData_Impl::GetCell(
         sal_Int32 nRow, sal_Int32 nColumn,
         SwAccessibleTable *pThis ) const
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     CheckRowAndCol( nRow, nColumn, pThis );
 
@@ -536,7 +533,6 @@ inline Int32Set_Impl::const_iterator SwAccessibleTableData_Impl::GetColumnIter(
 
 void SwAccessibleTableData_Impl::CheckRowAndCol(
         sal_Int32 nRow, sal_Int32 nCol, SwAccessibleTable *pThis ) const
-    throw(lang::IndexOutOfBoundsException )
 {
     if( ( nRow < 0 || nRow >= static_cast< sal_Int32 >( maRows.size() ) ) ||
         ( nCol < 0 || nCol >= static_cast< sal_Int32 >( maColumns.size() ) ) )
@@ -846,7 +842,6 @@ void SwAccessibleTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew
 }
 
 uno::Any SwAccessibleTable::queryInterface( const uno::Type& rType )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if ( rType == cppu::UnoType<XAccessibleTable>::get() )
@@ -874,7 +869,6 @@ uno::Any SwAccessibleTable::queryInterface( const uno::Type& rType )
 
 // XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL SwAccessibleTable::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() );
 
@@ -889,7 +883,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleTable::getTypes()
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId()
-        throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -915,7 +908,6 @@ void SwAccessibleTable::ClearTableData()
 }
 
 OUString SAL_CALL SwAccessibleTable::getAccessibleDescription()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -925,7 +917,6 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleDescription()
 }
 
 sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -935,7 +926,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowCount()
 }
 
 sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnCount(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -946,7 +936,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnCount(  )
 
 OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription(
             sal_Int32 nRow )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     // #i87532# - determine table cell in <nRow>th row and
     // in first column of row header table and return its text content.
@@ -980,7 +969,6 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription(
 
 OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription(
             sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     // #i87532# - determine table cell in first row and
     // in <nColumn>th column of column header table and return its text content.
@@ -1014,7 +1002,6 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription(
 
 sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt(
             sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nExtend = -1;
 
@@ -1045,7 +1032,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt(
 
 sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt(
                sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nExtend = -1;
 
@@ -1076,7 +1062,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt(
 
 uno::Reference< XAccessibleTable > SAL_CALL
         SwAccessibleTable::getAccessibleRowHeaders(  )
-    throw (uno::RuntimeException, std::exception)
 {
     // Row headers aren't supported
     return uno::Reference< XAccessibleTable >();
@@ -1084,7 +1069,6 @@ uno::Reference< XAccessibleTable > SAL_CALL
 
 uno::Reference< XAccessibleTable > SAL_CALL
         SwAccessibleTable::getAccessibleColumnHeaders(  )
-    throw (uno::RuntimeException, std::exception)
 {
     // #i87532# - assure that return accessible object is empty,
     // if no column header exists.
@@ -1100,7 +1084,6 @@ uno::Reference< XAccessibleTable > SAL_CALL
 }
 
 uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1124,7 +1107,6 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows
 }
 
 uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleColumns()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1147,7 +1129,6 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleColu
 }
 
 sal_Bool SAL_CALL SwAccessibleTable::isAccessibleRowSelected( sal_Int32 nRow )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1174,7 +1155,6 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleRowSelected( sal_Int32 nRow )
 
 sal_Bool SAL_CALL SwAccessibleTable::isAccessibleColumnSelected(
         sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1202,7 +1182,6 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleColumnSelected(
 
 uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt(
         sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     uno::Reference< XAccessible > xRet;
 
@@ -1219,14 +1198,12 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt(
 }
 
 uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCaption()
-    throw (uno::RuntimeException, std::exception)
 {
     // captions aren't supported
     return uno::Reference< XAccessible >();
 }
 
 uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleSummary()
-    throw (uno::RuntimeException, std::exception)
 {
     // summaries aren't supported
     return uno::Reference< XAccessible >();
@@ -1234,7 +1211,6 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleSummary()
 
 sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected(
             sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     bool bRet = false;
 
@@ -1261,7 +1237,6 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected(
 
 sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex(
             sal_Int32 nRow, sal_Int32 nColumn )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nRet = -1;
 
@@ -1279,7 +1254,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex(
 }
 
 sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nRet = -1;
 
@@ -1317,7 +1291,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex )
 
 sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn(
         sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nRet = -1;
 
@@ -1354,20 +1327,17 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn(
 }
 
 OUString SAL_CALL SwAccessibleTable::getImplementationName()
-        throw( uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.Writer.SwAccessibleTableView");
 }
 
 sal_Bool SAL_CALL SwAccessibleTable::supportsService(
         const OUString& sTestServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sTestServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwAccessibleTable::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -1488,7 +1458,6 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil
 
 void SAL_CALL SwAccessibleTable::selectAccessibleChild(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleTable );
@@ -1567,8 +1536,6 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
 
 sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleTable );
@@ -1580,7 +1547,6 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected(
 }
 
 void SAL_CALL SwAccessibleTable::clearAccessibleSelection(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -1596,7 +1562,6 @@ void SAL_CALL SwAccessibleTable::clearAccessibleSelection(  )
 }
 
 void SAL_CALL SwAccessibleTable::selectAllAccessibleChildren(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     // first clear selection, then select first and last child
     clearAccessibleSelection();
@@ -1605,7 +1570,6 @@ void SAL_CALL SwAccessibleTable::selectAllAccessibleChildren(  )
 }
 
 sal_Int32 SAL_CALL SwAccessibleTable::getSelectedAccessibleChildCount(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleTable );
@@ -1623,8 +1587,6 @@ sal_Int32 SAL_CALL SwAccessibleTable::getSelectedAccessibleChildCount(  )
 
 uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChild(
     sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleTable );
@@ -1651,8 +1613,6 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChi
 // index has to be treated as global child index.
 void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
     sal_Int32 nChildIndex )
-    throw ( lang::IndexOutOfBoundsException,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleTable );
@@ -1701,7 +1661,6 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
 }
 
 sal_Int32 SAL_CALL SwAccessibleTable::getBackground()
-        throw (css::uno::RuntimeException, std::exception)
 {
     const SvxBrushItem &rBack = GetFrame()->GetAttrSet()->GetBackground();
     sal_uInt32 crBack = rBack.GetColor().GetColor();
@@ -1780,7 +1739,6 @@ void SwAccessibleTable::AddSelectionCell(
 
 // XAccessibleTableSelection
 sal_Bool SAL_CALL SwAccessibleTable::selectRow( sal_Int32 row )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1797,7 +1755,6 @@ sal_Bool SAL_CALL SwAccessibleTable::selectRow( sal_Int32 row )
     return true;
 }
 sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1815,9 +1772,6 @@ sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column )
 }
 
 sal_Bool SAL_CALL SwAccessibleTable::unselectRow( sal_Int32 row )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard g;
 
@@ -1836,9 +1790,6 @@ sal_Bool SAL_CALL SwAccessibleTable::unselectRow( sal_Int32 row )
 }
 
 sal_Bool SAL_CALL SwAccessibleTable::unselectColumn( sal_Int32 column )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard g;
 
@@ -1888,14 +1839,12 @@ void SwAccessibleTableColHeaders::Modify( const SfxPoolItem * /*pOld*/, const Sf
 
 // XInterface
 uno::Any SAL_CALL SwAccessibleTableColHeaders::queryInterface( const uno::Type& aType )
-        throw (uno::RuntimeException, std::exception)
 {
     return SwAccessibleTable::queryInterface( aType );
 }
 
 // XAccessibleContext
 sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1933,7 +1882,6 @@ sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount()
 
 uno::Reference< XAccessible> SAL_CALL
         SwAccessibleTableColHeaders::getAccessibleChild (sal_Int32 nIndex)
-        throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     if ( nIndex < 0 || nIndex >= getAccessibleChildCount() )
     {
@@ -1946,14 +1894,12 @@ uno::Reference< XAccessible> SAL_CALL
 // XAccessibleTable
 uno::Reference< XAccessibleTable >
         SAL_CALL SwAccessibleTableColHeaders::getAccessibleRowHeaders()
-        throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< XAccessibleTable >();
 }
 
 uno::Reference< XAccessibleTable >
         SAL_CALL SwAccessibleTableColHeaders::getAccessibleColumnHeaders()
-        throw (uno::RuntimeException, std::exception)
 {
     return uno::Reference< XAccessibleTable >();
 }
@@ -1961,7 +1907,6 @@ uno::Reference< XAccessibleTable >
 // XServiceInfo
 
 OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName()
-        throw (uno::RuntimeException, std::exception)
 {
     static const sal_Char sImplName[] = "com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView";
     return OUString(sImplName);
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index 830798c15e1e..db4e9c32f2bb 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -95,8 +95,7 @@ public:
     // XAccessibleTable).
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type& aType ) override;
 
     virtual void SAL_CALL acquire(  ) throw () override
         { SwAccessibleContext::acquire(); };
@@ -105,118 +104,76 @@ public:
         { SwAccessibleContext::release(); };
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XAccessibleContext
 
     /// Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     // XAccessibleTable
 
-    virtual sal_Int32 SAL_CALL getAccessibleRowCount()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumnCount(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount() override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount(  ) override;
     virtual OUString SAL_CALL getAccessibleRowDescription(
-            sal_Int32 nRow )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nRow ) override;
     virtual OUString SAL_CALL getAccessibleColumnDescription(
-            sal_Int32 nColumn )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nColumn ) override;
     virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt(
-            sal_Int32 nRow, sal_Int32 nColumn )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nRow, sal_Int32 nColumn ) override;
     virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt(
-               sal_Int32 nRow, sal_Int32 nColumn )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+               sal_Int32 nRow, sal_Int32 nColumn ) override;
     virtual css::uno::Reference<
                 css::accessibility::XAccessibleTable >
-        SAL_CALL getAccessibleRowHeaders(  )
-           throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getAccessibleRowHeaders(  ) override;
     virtual css::uno::Reference<
                 css::accessibility::XAccessibleTable >
-        SAL_CALL getAccessibleColumnHeaders(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getAccessibleColumnHeaders(  ) override;
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-        getSelectedAccessibleRows(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleRows(  ) override;
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL
-        getSelectedAccessibleColumns(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+        getSelectedAccessibleColumns(  ) override;
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override;
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override;
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-        getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+        getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override;
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-        getAccessibleCaption(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleCaption(  ) override;
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-        getAccessibleSummary(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleSummary(  ) override;
     virtual sal_Bool SAL_CALL isAccessibleSelected(
-            sal_Int32 nRow, sal_Int32 nColumn )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nRow, sal_Int32 nColumn ) override;
     virtual sal_Int32 SAL_CALL getAccessibleIndex(
-            sal_Int32 nRow, sal_Int32 nColumn )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
-        throw (css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nRow, sal_Int32 nColumn ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override;
     // XAccessibleTableSelection
-    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
-    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override ;
+    virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override ;
+    virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override;
+    virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override;
     // XServiceInfo
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class.
     */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext service.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // C++ interface
 
@@ -234,38 +191,26 @@ public:
     // XAccessibleSelection
 
     virtual void SAL_CALL selectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
     virtual sal_Bool SAL_CALL isAccessibleChildSelected(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
-    virtual void SAL_CALL clearAccessibleSelection(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
 
-    virtual void SAL_CALL selectAllAccessibleChildren(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
 
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nSelectedChildIndex ) override;
 
     // index has to be treated as global child index.
     virtual void SAL_CALL deselectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-                css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
     // XAccessibleComponent
-    sal_Int32 SAL_CALL getBackground()
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getBackground() override;
     typedef std::vector< std::pair<SwAccessibleContext*,
         css::uno::WeakReference<css::accessibility::XAccessible> > > Cells_t;
     Cells_t m_vecCellAdd;
@@ -297,39 +242,32 @@ public:
     // XInterface
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type& aType ) override;
 
     // XAccessibleContext
 
     /// Return the number of currently visible children.
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
     /// Return the specified child or NULL if index is invalid.
     virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 nIndex)
-        throw (css::uno::RuntimeException,
-                css::lang::IndexOutOfBoundsException, std::exception) override;
+        getAccessibleChild (sal_Int32 nIndex) override;
 
     // XAccessibleTable
 
     virtual css::uno::Reference<
                 css::accessibility::XAccessibleTable >
-        SAL_CALL getAccessibleRowHeaders(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getAccessibleRowHeaders(  ) override;
     virtual css::uno::Reference<
                 css::accessibility::XAccessibleTable >
-        SAL_CALL getAccessibleColumnHeaders(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getAccessibleColumnHeaders(  ) override;
 
     // XServiceInfo
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
 };
 #endif
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index c253eacd572a..61ae50523920 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -142,7 +142,6 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
 
 css::uno::Any SAL_CALL
     SwAccessibleTextFrame::queryInterface (const css::uno::Type & rType)
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aReturn = SwAccessibleContext::queryInterface (rType);
     if ( ! aReturn.hasValue())
@@ -169,13 +168,11 @@ void SAL_CALL
 // XAccessibleSelection
 
 void SAL_CALL SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 )> - missing implementation");
 }
 
 sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nChildIndex )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -201,19 +198,16 @@ sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nC
 }
 
 void SAL_CALL SwAccessibleTextFrame::clearAccessibleSelection(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::clearAccessibleSelection()> - missing implementation");
 }
 
 void SAL_CALL SwAccessibleTextFrame::selectAllAccessibleChildren(  )
-    throw ( uno::RuntimeException, std::exception )
 {
     SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::selectAllAccessibleChildren()> - missing implementation");
 }
 
 sal_Int32 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount()
-    throw ( uno::RuntimeException, std::exception )
 {
     sal_Int32 nCount = 0;
     sal_Int32 TotalCount = getAccessibleChildCount();
@@ -224,7 +218,6 @@ sal_Int32 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount()
 }
 
 uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -242,14 +235,12 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibl
 }
 
 void SAL_CALL SwAccessibleTextFrame::deselectAccessibleChild( sal_Int32 )
-    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception )
 {
     SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::selectAllAccessibleChildren( sal_Int32 )> - missing implementation");
 }
 
 // #i73249#
 OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -264,7 +255,6 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName()
 }
 
 OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription()
-        throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -275,19 +265,16 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription()
 }
 
 OUString SAL_CALL SwAccessibleTextFrame::getImplementationName()
-        throw( uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.Writer.SwAccessibleTextFrameView");
 }
 
 sal_Bool SAL_CALL SwAccessibleTextFrame::supportsService(const OUString& sTestServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, sTestServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -297,7 +284,6 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNam
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId()
-        throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -325,7 +311,6 @@ AccessibleRelation SwAccessibleTextFrame::makeRelation( sal_Int16 nType, const S
 }
 
 uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleTextFrame::getAccessibleRelationSet( )
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleContext );
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index bfe74eeb0038..3b6d5cec590c 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -46,74 +46,57 @@ public:
     SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrame& rFlyFrame );
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        css::uno::Type const & rType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Type const & rType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
     // XAccessibleSelection
     virtual void SAL_CALL selectAccessibleChild(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
     virtual sal_Bool SAL_CALL isAccessibleChildSelected(
-        sal_Int32 nChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nChildIndex ) override;
 
-    virtual void SAL_CALL clearAccessibleSelection(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) override;
 
-    virtual void SAL_CALL selectAllAccessibleChildren(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
 
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception) override;
+        sal_Int32 nSelectedChildIndex ) override;
 
     virtual void SAL_CALL deselectAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
-        throw ( css::lang::IndexOutOfBoundsException,
-        css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nSelectedChildIndex ) override;
 
     // XAccessibleContext
 
     // #i73249# - Return the object's current name.
     virtual OUString SAL_CALL
-        getAccessibleName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleName() override;
     /// Return this object's description.
     virtual OUString SAL_CALL
-        getAccessibleDescription()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getAccessibleDescription() override;
 
     // XServiceInfo
 
     /** Returns an identifier for the implementation of this object.
     */
     virtual OUString SAL_CALL
-        getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
     /** Return whether the specified service is supported by this class.
     */
     virtual sal_Bool SAL_CALL
-        supportsService (const OUString& sServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+        supportsService (const OUString& sServiceName) override;
 
     /** Returns a list of all supported services.  In this case that is just
         the AccessibleContext service.
     */
     virtual css::uno::Sequence< OUString> SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     // XAccessibleContext::getAccessibleRelationSet
 
@@ -128,8 +111,7 @@ private:
         sal_Int16 nType, const SwFlyFrame* pFrame );
 
 public:
-    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() override;
 };
 
 #endif
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index 407458aa75b2..4372df0ab1fb 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -37,8 +37,6 @@ namespace {
     /// @throws css::uno::RuntimeException
     const SwWrongList* getTextMarkupList( const SwTextNode& rTextNode,
                                           const sal_Int32 nTextMarkupType )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException)
     {
         const SwWrongList* pTextMarkupList( nullptr );
         switch ( nTextMarkupType )
@@ -90,8 +88,6 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD
 }
 
 sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupType )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException)
 {
     sal_Int32 nTextMarkupCount( 0 );
 
@@ -111,9 +107,6 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
 css::accessibility::TextSegment
         SwTextMarkupHelper::getTextMarkup( const sal_Int32 nTextMarkupIndex,
                                            const sal_Int32 nTextMarkupType )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException)
 {
     if ( nTextMarkupIndex >= getTextMarkupCount( nTextMarkupType ) ||
          nTextMarkupIndex < 0 )
@@ -157,9 +150,6 @@ css::accessibility::TextSegment
 css::uno::Sequence< css::accessibility::TextSegment >
         SwTextMarkupHelper::getTextMarkupAtIndex( const sal_Int32 nCharIndex,
                                                   const sal_Int32 nTextMarkupType )
-        throw (css::lang::IndexOutOfBoundsException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException)
 {
     // assumption:
     // value of <nCharIndex> is in range [0..length of accessible text)
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index 642f4c75fccf..de3af6013dc6 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -42,29 +42,21 @@ class SwTextMarkupHelper
 
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        sal_Int32 getTextMarkupCount( const sal_Int32 nTextMarkupType )
-                throw (css::lang::IllegalArgumentException,
-                       css::uno::RuntimeException);
+        sal_Int32 getTextMarkupCount( const sal_Int32 nTextMarkupType );
 
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
         css::accessibility::TextSegment getTextMarkup(
                                             const sal_Int32 nTextMarkupIndex,
-                                            const sal_Int32 nTextMarkupType )
-                throw (css::lang::IndexOutOfBoundsException,
-                       css::lang::IllegalArgumentException,
-                       css::uno::RuntimeException);
+                                            const sal_Int32 nTextMarkupType );
 
         /// @throws css::lang::IndexOutOfBoundsException
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
         css::uno::Sequence< css::accessibility::TextSegment >
                 getTextMarkupAtIndex( const sal_Int32 nCharIndex,
-                                      const sal_Int32 nTextMarkupType )
-                throw (css::lang::IndexOutOfBoundsException,
-                       css::lang::IllegalArgumentException,
-                       css::uno::RuntimeException);
+                                      const sal_Int32 nTextMarkupType );
 
     private:
         SwTextMarkupHelper( const SwTextMarkupHelper& ) = delete;
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index ae43d6c62e6d..5cab3c578a20 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -48,7 +48,7 @@ SwSmartTagMgr::~SwSmartTagMgr()
 {
 }
 
-void SwSmartTagMgr::modified( const lang::EventObject& rEO ) throw( RuntimeException, std::exception )
+void SwSmartTagMgr::modified( const lang::EventObject& rEO )
 {
     SolarMutexGuard aGuard;
 
@@ -58,7 +58,7 @@ void SwSmartTagMgr::modified( const lang::EventObject& rEO ) throw( RuntimeExcep
     SmartTagMgr::modified( rEO );
 }
 
-void SwSmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( RuntimeException, std::exception)
+void SwSmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent )
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 3bf4a6a86013..8ccc886fd1a9 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -181,7 +181,7 @@ sal_Int32 SwTextBoxHelper::getCount(const SwDoc* pDoc)
     return nRet;
 }
 
-uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex) throw(lang::IndexOutOfBoundsException)
+uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, sal_Int32 nIndex)
 {
     if (nIndex < 0)
         throw lang::IndexOutOfBoundsException();
diff --git a/sw/source/core/docnode/cancellablejob.cxx b/sw/source/core/docnode/cancellablejob.cxx
index 9704824e10ce..2326ba479e36 100644
--- a/sw/source/core/docnode/cancellablejob.cxx
+++ b/sw/source/core/docnode/cancellablejob.cxx
@@ -25,7 +25,7 @@ CancellableJob::CancellableJob( const rtl::Reference< ObservableThread >& rThrea
 }
 
 // css::util::XCancellable:
-void SAL_CALL CancellableJob::cancel() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL CancellableJob::cancel()
 {
     mrThread->join();
 }
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index 6f6a051b8ce1..ac3a8ed18c4f 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -34,7 +34,7 @@ public:
     explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread );
 
     // css::util::XCancellable:
-    virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel() override;
 
 private:
     CancellableJob( CancellableJob& ) = delete;
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 288dc1a3914d..da4ca6bd2650 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -278,24 +278,24 @@ FinalThreadManager::~FinalThreadManager()
 }
 
 // com.sun.star.uno.XServiceInfo:
-OUString SAL_CALL FinalThreadManager::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL FinalThreadManager::getImplementationName()
 {
     return OUString("com.sun.star.util.comp.FinalThreadManager");
 }
 
-sal_Bool SAL_CALL FinalThreadManager::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL FinalThreadManager::supportsService(OUString const & serviceName)
 {
     return cppu::supportsService(this, serviceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL FinalThreadManager::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL FinalThreadManager::getSupportedServiceNames()
 {
     css::uno::Sequence< OUString > s { "com.sun.star.util.JobManager" };
     return s;
 }
 
 // css::util::XJobManager:
-void SAL_CALL FinalThreadManager::registerJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL FinalThreadManager::registerJob(const css::uno::Reference< css::util::XCancellable > & Job)
 {
     osl::MutexGuard aGuard(maMutex);
 
@@ -308,14 +308,14 @@ void SAL_CALL FinalThreadManager::registerJob(const css::uno::Reference< css::ut
     }
 }
 
-void SAL_CALL FinalThreadManager::releaseJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL FinalThreadManager::releaseJob(const css::uno::Reference< css::util::XCancellable > & Job)
 {
     osl::MutexGuard aGuard(maMutex);
 
     maThreads.remove( Job );
 }
 
-void SAL_CALL FinalThreadManager::cancelAllJobs() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL FinalThreadManager::cancelAllJobs()
 {
     std::list< css::uno::Reference< css::util::XCancellable > > aThreads;
     {
@@ -349,7 +349,7 @@ void SAL_CALL FinalThreadManager::cancelAllJobs() throw (css::uno::RuntimeExcept
 }
 
 // css::frame::XTerminateListener
-void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject& ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception)
+void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject& )
 {
     osl::MutexGuard aGuard(maMutex);
 
@@ -393,7 +393,7 @@ void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject
     return;
 }
 
-void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObject& )
 {
     if ( mpPauseThreadStarting != nullptr )
     {
@@ -404,7 +404,7 @@ void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObjec
     return;
 }
 
-void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObject& )
 {
     if ( mpTerminateOfficeThread != nullptr )
     {
@@ -434,7 +434,7 @@ void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObjec
 }
 
 // ::com::sun:star::lang::XEventListener (inherited via css::frame::XTerminateListener)
-void SAL_CALL FinalThreadManager::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL FinalThreadManager::disposing( const css::lang::EventObject& )
 {
     // nothing to do, because instance doesn't hold any references of observed objects
 }
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 056b3feaa8a6..be658b8567dc 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -73,8 +73,7 @@ public:
 
     virtual ~SwXMLTextBlockImport()
         throw() override;
-    virtual void SAL_CALL endDocument()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL endDocument() override;
 };
 
 enum SwXMLTextBlockToken : sal_Int32
@@ -95,10 +94,8 @@ public:
     virtual ~SwXMLTextBlockTokenHandler() override;
 
     //XFastTokenHandler
-    sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier )
-        throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token )
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override;
+    css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) override;
 
     //Much fast direct C++ shortcut to the method that matters
     virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const override;
@@ -124,10 +121,8 @@ public:
     virtual ~SwXMLBlockListTokenHandler() override;
 
     //XFastTokenHandler
-    sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier )
-        throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token )
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override;
+    css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 Token ) override;
 
     //Much fast direct C++ shortcut to the method that matters
     virtual sal_Int32 getTokenDirect( const char *pTag, sal_Int32 nLength ) const override;
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index c0bee0532fbb..773259e59163 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -42,35 +42,24 @@ public:
     virtual ~SwXTextDefaults () override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, 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 getPropertyValue( const OUString& rPropertyName )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName )
-        throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames )
-        throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName )
-        throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 #endif
 
diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx
index a813db9b6244..901fa79db575 100644
--- a/sw/source/core/inc/dumpfilter.hxx
+++ b/sw/source/core/inc/dumpfilter.hxx
@@ -38,26 +38,19 @@ namespace sw {
        virtual ~LayoutDumpFilter() override;
 
         // XFilter
-        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancel(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+        virtual void SAL_CALL cancel(  ) override;
 
         // XExporter
-        virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     };
 }
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index 122f240cc604..5b13c57b66c2 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -59,15 +59,11 @@ protected:
     /// @throws css::uno::RuntimeException
     void attachToRangeEx(
             const css::uno::Reference< css::text::XTextRange > & xTextRange,
-            IDocumentMarkAccess::MarkType eType)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException );
+            IDocumentMarkAccess::MarkType eType);
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     virtual void attachToRange(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException);
+            const css::uno::Reference< css::text::XTextRange > & xTextRange);
 
     const ::sw::mark::IMark* GetBookmark() const;
 
@@ -98,85 +94,52 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
             const css::uno::Reference<
-                css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+                css::beans::XVetoableChangeListener >& xListener) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName(const OUString& rName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& rName) override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
 };
 
@@ -191,23 +154,23 @@ class SwXFieldmarkParameters
         }
 
         // XNameContainer
-        virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeByName( const OUString& Name ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+        virtual void SAL_CALL removeByName( const OUString& Name ) override;
         // XNameReplace
-        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
     protected:
         //SwClient
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
     private:
         /// @throws css::uno::RuntimeException
-        ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (css::uno::RuntimeException);
+        ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters();
 };
 
 typedef cppu::ImplInheritanceHelper< SwXBookmark,
@@ -233,29 +196,16 @@ public:
                 bool isReplacementObject = false);
 
     virtual void attachToRange(
-            const css::uno::Reference<css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException) override;
-    virtual OUString SAL_CALL getFieldType()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setFieldType(const OUString& description )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getParameters(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::text::XTextRange > & xTextRange) override;
+    virtual OUString SAL_CALL getFieldType() override;
+    virtual void SAL_CALL setFieldType(const OUString& description ) override;
+    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getParameters(  ) override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
 
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index 452ff9d5441f..7e28be9cdcc1 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -33,8 +33,7 @@ class SwFormatINetFormat;
 class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor
 {
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 protected:
     virtual ~SwHyperlinkEventDescriptor() override;
 public:
@@ -66,8 +65,7 @@ public:
 
     virtual ~SwFrameEventDescriptor() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 protected:
     virtual void setMacroItem(const SvxMacroItem& rItem) override;
@@ -86,8 +84,7 @@ public:
 
     virtual ~SwFrameStyleEventDescriptor() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 protected:
     virtual void setMacroItem(const SvxMacroItem& rItem) override;
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 360a98cbaf52..e864587bdfa4 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -73,70 +73,42 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
 };
 
@@ -175,94 +147,58 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XUpdatable
-    virtual void SAL_CALL update()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL update() override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
     // XTextField
-    virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) override;
 
     // XDependentTextField
     virtual void SAL_CALL attachTextFieldMaster(
-            const css::uno::Reference< css::beans::XPropertySet > & xFieldMaster)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL getTextFieldMaster()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertySet > & xFieldMaster) override;
+    virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL getTextFieldMaster() override;
 
 };
 
@@ -285,22 +221,15 @@ public:
     explicit SwXFieldEnumeration(SwDoc & rDoc);
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement()
-        throw (css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
 };
 
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 2751d2c4d58a..5c6eb130232e 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -59,73 +59,51 @@ public:
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // text::XTextMarkup:
-    virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() override;
 
     virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength,
-                                   const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override;
+                                   const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) override;
 
     virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const css::uno::Reference< css::text::XTextRange> & xRange,
-                                                const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override;
+                                                const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) override;
 
     // text::XFlatParagraph:
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setChecked(::sal_Int32 nType, sal_Bool bVal) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isChecked(::sal_Int32 nType) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual sal_Bool SAL_CALL isModified() override;
+    virtual void SAL_CALL setChecked(::sal_Int32 nType, sal_Bool bVal) override;
+    virtual sal_Bool SAL_CALL isChecked(::sal_Int32 nType) override;
+    virtual css::lang::Locale SAL_CALL getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) override;
+    virtual css::lang::Locale SAL_CALL getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) override;
+    virtual void SAL_CALL changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) override;
+    virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) override;
+    virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() override;
 
     using SwXTextMarkup::GetTextNode;
 
     static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId) override;
 
 private:
     SwXFlatParagraph( const SwXFlatParagraph & ) = delete;
@@ -146,11 +124,11 @@ public:
     virtual ~SwXFlatParagraphIterator() override;
 
     // text::XFlatParagraphIterator:
-    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
+    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getFirstPara() override;
+    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getNextPara() override;
+    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getLastPara() override;
+    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaBefore(const css::uno::Reference< css::text::XFlatParagraph > & xPara) override;
+    virtual css::uno::Reference< css::text::XFlatParagraph > SAL_CALL getParaAfter(const css::uno::Reference< css::text::XFlatParagraph > & xPara) override;
 
 protected:
     // SwClient
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index b39a5227e4cc..75b6513ac664 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -57,8 +57,7 @@ protected:
 
     virtual const SwStartNode *GetStartNode() const override;
 
-    virtual css::uno::Reference< css::text::XTextCursor > CreateCursor()
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() override;
 
     virtual ~SwXFootnote() override;
 
@@ -73,121 +72,80 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface(
-            const css::uno::Type& rType)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Type& rType) override;
     virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
     virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type >
-        SAL_CALL getTypes()
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getImplementationId()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
     static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL
-        createEnumeration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createEnumeration() override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
     // XFootnote
-    virtual OUString SAL_CALL getLabel()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLabel(const OUString& rLabel)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getLabel() override;
+    virtual void SAL_CALL setLabel(const OUString& rLabel) override;
 
     // XSimpleText
     virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL
-        createTextCursor()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createTextCursor() override;
     virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL
         createTextCursorByRange(
-            const css::uno::Reference< css::text::XTextRange > & xTextPosition)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextPosition) override;
 
 };
 
diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx
index 42339b84b75f..698a6bc0fa0d 100644
--- a/sw/source/core/inc/unofreg.hxx
+++ b/sw/source/core/inc/unofreg.hxx
@@ -34,13 +34,13 @@ namespace com { namespace sun { namespace star { namespace lang {
 css::uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw();
 OUString SAL_CALL SwUnoModule_getImplementationName() throw();
 /// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL SwUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ) throw( css::uno::Exception );
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr );
 
 // writer documents
 css::uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw();
 OUString SAL_CALL SwTextDocument_getImplementationName() throw();
 /// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL SwTextDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, SfxModelFlags _nCreationFlags ) throw( css::uno::Exception );
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwTextDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, SfxModelFlags _nCreationFlags );
 
 #endif
 
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index 0d1c474187cb..c87460a3dd69 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -83,100 +83,62 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName(const OUString& rName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& rName) override;
 
     // XRefreshable
-    virtual void SAL_CALL refresh()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL refresh() override;
     virtual void SAL_CALL addRefreshListener(
-            const css::uno::Reference< css::util::XRefreshListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::util::XRefreshListener>& xListener) override;
     virtual void SAL_CALL removeRefreshListener(
-            const css::uno::Reference< css::util::XRefreshListener>& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::util::XRefreshListener>& xListener) override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
     // XDocumentIndex
-    virtual OUString SAL_CALL getServiceName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL update()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getServiceName() override;
+    virtual void SAL_CALL update() override;
 
 };
 
@@ -214,84 +176,51 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference<css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference<css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
     // XDocumentIndexMark
-    virtual OUString SAL_CALL getMarkEntry()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getMarkEntry() override;
+    virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) override;
 
 };
 
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 2af5b0ad7a81..90573dd83970 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -73,9 +73,7 @@ protected:
     /// @throws css::uno::RuntimeException
     void SAL_CALL AttachImpl(
             const css::uno::Reference< css::text::XTextRange > & xTextRange,
-            const sal_uInt16 nWhich)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException);
+            const sal_uInt16 nWhich);
 
     virtual ~SwXMeta() override;
 
@@ -106,9 +104,7 @@ public:
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException);
+    bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb);
 
     // MetadatableMixin
     virtual ::sfx2::Metadatable * GetCoreObject() override;
@@ -119,100 +115,71 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& Identifier )
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& Identifier ) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XChild
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-        getParent()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getParent() override;
     virtual void SAL_CALL setParent(
-            css::uno::Reference< css::uno::XInterface> const& xParent)
-        throw (css::uno::RuntimeException,
-            css::lang::NoSupportException, std::exception) override;
+            css::uno::Reference< css::uno::XInterface> const& xParent) override;
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XEnumerationAccess
     virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL
-        createEnumeration()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createEnumeration() override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
     // XTextRange
     virtual css::uno::Reference< css::text::XText >
-        SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getText() override;
     virtual css::uno::Reference<
-                css::text::XTextRange > SAL_CALL getStart()
-        throw (css::uno::RuntimeException, std::exception) override;
+                css::text::XTextRange > SAL_CALL getStart() override;
     virtual css::uno::Reference<
-                css::text::XTextRange > SAL_CALL getEnd()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getString()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setString(const OUString& rString)
-        throw (css::uno::RuntimeException, std::exception) override;
+                css::text::XTextRange > SAL_CALL getEnd() override;
+    virtual OUString SAL_CALL getString() override;
+    virtual void SAL_CALL setString(const OUString& rString) override;
 
     // XSimpleText
     virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL
-        createTextCursor()
-        throw (css::uno::RuntimeException, std::exception) override;
+        createTextCursor() override;
     virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL
         createTextCursorByRange(
-            const css::uno::Reference< css::text::XTextRange > & xTextPosition)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextPosition) override;
     virtual void SAL_CALL insertString(
             const css::uno::Reference< css::text::XTextRange > & xRange,
-            const OUString& aString, sal_Bool bAbsorb)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& aString, sal_Bool bAbsorb) override;
     virtual void SAL_CALL insertControlCharacter(
             const css::uno::Reference< css::text::XTextRange > & xRange,
-            sal_Int16 nControlCharacter, sal_Bool bAbsorb)
-        throw (css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+            sal_Int16 nControlCharacter, sal_Bool bAbsorb) override;
 
     // XText
     virtual void SAL_CALL insertTextContent(
             const css::uno::Reference< css::text::XTextRange > & xRange,
             const css::uno::Reference< css::text::XTextContent > & xContent,
-            sal_Bool bAbsorb)
-        throw (css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception) override;
+            sal_Bool bAbsorb) override;
     virtual void SAL_CALL removeTextContent(
-            const css::uno::Reference< css::text::XTextContent > & xContent)
-        throw (css::container::NoSuchElementException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextContent > & xContent) override;
 
 };
 
@@ -247,78 +214,47 @@ private:
 public:
 
     // 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(
-            const OUString& ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& ServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames( )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames( ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL
-        getPropertyValue(const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+        getPropertyValue(const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException,
-            css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw ( css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
     // XTextField
-    virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) override;
 
 };
 
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 154068af8e95..5eed3898698b 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -129,22 +129,19 @@ protected:
     /// @trhows css::uno::RuntimeException
     void SAL_CALL SetPropertyValues_Impl(
         const css::uno::Sequence< OUString >& aPropertyNames,
-        const css::uno::Sequence< css::uno::Any >& aValues )
-            throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+        const css::uno::Sequence< css::uno::Any >& aValues );
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::lang::WrappedTargetException
     /// @trhows css::uno::RuntimeException
     css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl(
-        const css::uno::Sequence< OUString >& aPropertyNames )
-            throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+        const css::uno::Sequence< OUString >& aPropertyNames );
 
     void GetPropertyValue( css::uno::Any &rVal,
                 const SfxItemPropertySimpleEntry& rEntry, SwUnoCursor *pUnoCursor, SfxItemSet *&pSet );
 
     /// @throws css::uno::RuntimeException
     css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> SAL_CALL GetPropertyValuesTolerant_Impl(
-        const css::uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly )
-            throw (css::uno::RuntimeException, std::exception);
+        const css::uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly );
 
     virtual ~SwXTextPortion() override;
 
@@ -162,51 +159,51 @@ public:
         bool bIsEnd );
 
     //XTextRange
-    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL  getStart() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL   getEnd() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL  getString() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL  setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL  getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL   getEnd() override;
+    virtual OUString SAL_CALL  getString() override;
+    virtual void SAL_CALL  setString(const OUString& aString) override;
 
     //XTolerantMultiPropertySet
-    virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     //XMultiPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //XUnoTunnel
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //XContentEnumerationAccess
-    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XEnumeration >  SAL_CALL createContentEnumeration(const OUString& aServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
     void SetRefMark( css::uno::Reference< css::text::XTextContent > const & xMark)
     { m_xRefMark = xMark; }
@@ -259,25 +256,17 @@ public:
 
     //XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& aIdentifier )
-        throw(css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL nextElement()
-        throw( css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 };
 
 class SwXRedlinePortion : public SwXTextPortion
@@ -286,7 +275,7 @@ private:
     SwRangeRedline const& m_rRedline;
 
     /// @throws css::uno::RuntimeException
-    void Validate() throw (css::uno::RuntimeException);
+    void Validate();
 
     using SwXTextPortion::GetPropertyValue;
 
@@ -301,20 +290,17 @@ public:
 
     /// @throws std::exception
     static css::uno::Any  GetPropertyValue(
-            OUString const& PropertyName, SwRangeRedline const& rRedline) throw (std::exception);
+            OUString const& PropertyName, SwRangeRedline const& rRedline);
     /// @throws std::exception
     static css::uno::Sequence< css::beans::PropertyValue > CreateRedlineProperties(
-                SwRangeRedline const& rRedline, bool const bIsStart) throw (std::exception);
+                SwRangeRedline const& rRedline, bool const bIsStart);
 
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
     // XPropertySet
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
 };
 
 OUString SwRedlineTypeToOUString(RedlineType_t eType);
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index b34b23203395..c65b65009f30 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -63,84 +63,51 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName(const OUString& rName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& rName) override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
 };
 
diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx
index afff7f158003..370ed909f512 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -77,136 +77,84 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // 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(
-            const OUString& rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const OUString& rServiceName) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
     virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
     virtual void SAL_CALL removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener > & xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::lang::XEventListener > & xListener) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
             const OUString& rPropertyName,
-            const css::uno::Any& rValue)
-        throw (css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& rValue) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) override;
     virtual void SAL_CALL addVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& rPropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) override;
 
     // XPropertyState
     virtual css::beans::PropertyState SAL_CALL
-        getPropertyState(const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+        getPropertyState(const OUString& rPropertyName) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
         getPropertyStates(
-            const css::uno::Sequence< OUString >& rPropertyNames)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >& rPropertyNames) override;
     virtual void SAL_CALL setPropertyToDefault(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
     virtual css::uno::Any SAL_CALL getPropertyDefault(
-            const OUString& rPropertyName)
-        throw (css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const OUString& rPropertyName) override;
 
     // XMultiPropertySet
     virtual void SAL_CALL setPropertyValues(
             const css::uno::Sequence< OUString >&  rPropertyNames,
-            const css::uno::Sequence< css::uno::Any >& rValues)
-        throw (css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::uno::Any >& rValues) override;
     virtual css::uno::Sequence< css::uno::Any >
         SAL_CALL getPropertyValues(
-            const css::uno::Sequence< OUString >& rPropertyNames)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< OUString >& rPropertyNames) override;
     virtual void SAL_CALL addPropertiesChangeListener(
             const css::uno::Sequence< OUString >& rPropertyNames,
-            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override;
     virtual void SAL_CALL removePropertiesChangeListener(
-            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override;
     virtual void SAL_CALL firePropertiesChangeEvent(
             const css::uno::Sequence< OUString >&  rPropertyNames,
-            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) override;
 
     // XNamed
-    virtual OUString SAL_CALL getName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName(const OUString& rName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& rName) override;
 
     // XTextContent
     virtual void SAL_CALL attach(
-            const css::uno::Reference< css::text::XTextRange > & xTextRange)
-        throw (css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor()
-        throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() override;
 
     // XTextSection
     virtual css::uno::Reference< css::text::XTextSection > SAL_CALL
-        getParentSection()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getParentSection() override;
     virtual css::uno::Sequence< css::uno::Reference< css::text::XTextSection >  > SAL_CALL
-        getChildSections()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getChildSections() override;
 
 };
 
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index 20844ea72aad..d3f63063e22d 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -54,16 +54,16 @@ public:
     virtual ~SwXTextMarkup() override;
 
     // css::text::XTextMarkup:
-    virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() override;
 
     virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength,
-                                           const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override;
+                                           const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) override;
 
     virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const css::uno::Reference< css::text::XTextRange> & xRange,
-                                                const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override;
+                                                const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) override;
 
     // css::text::XMultiTextMarkup:
-    virtual void SAL_CALL commitMultiTextMarkup( const css::uno::Sequence< css::text::TextMarkupDescriptor >& aMarkups ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL commitMultiTextMarkup( const css::uno::Sequence< css::text::TextMarkupDescriptor >& aMarkups ) override;
 
 private:
     SwXTextMarkup( const SwXTextMarkup & ) = delete;
@@ -88,12 +88,12 @@ public:
     SwXStringKeyMap();
 
     // css::container::XStringKeyMap:
-    virtual css::uno::Any SAL_CALL getValue(const OUString & aKey) throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertValue(const OUString & aKey, const css::uno::Any & aValue) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValue(const OUString & aKey) override;
+    virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) override;
+    virtual void SAL_CALL insertValue(const OUString & aKey, const css::uno::Any & aValue) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) override;
+    virtual css::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) override;
 
 private:
     SwXStringKeyMap(SwXStringKeyMap &) = delete;
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index e0c0649bcba6..c4eac12058da 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -76,7 +76,6 @@ namespace sw
 
     // XFilter
     sal_Bool LayoutDumpFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
-        throw (uno::RuntimeException, std::exception)
     {
         bool bRet = false;
 
@@ -122,38 +121,33 @@ namespace sw
         return bRet;
     }
 
-    void LayoutDumpFilter::cancel(  ) throw (uno::RuntimeException, std::exception)
+    void LayoutDumpFilter::cancel(  )
     {
     }
 
     // XExporter
     void LayoutDumpFilter::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc )
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     {
         m_xSrcDoc = xDoc;
     }
 
     // XInitialization
     void LayoutDumpFilter::initialize( const uno::Sequence< uno::Any >& )
-        throw (uno::Exception, uno::RuntimeException, std::exception)
     {
     }
 
     // XServiceInfo
     OUString LayoutDumpFilter::getImplementationName(  )
-        throw (uno::RuntimeException, std::exception)
     {
         return OUString( "com.sun.star.comp.Writer.LayoutDump" );
     }
 
     sal_Bool LayoutDumpFilter::supportsService( const OUString& rServiceName )
-        throw (uno::RuntimeException, std::exception)
     {
         return cppu::supportsService(this, rServiceName);
     }
 
     uno::Sequence< OUString > LayoutDumpFilter::getSupportedServiceNames()
-        throw (uno::RuntimeException, std::exception)
     {
         uno::Sequence<OUString> aSeq { "com.sun.star.document.ExportFilter" };
         return aSeq;
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 6e731a889cdd..6675b6178478 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -91,9 +91,9 @@ class SwOLEListener_Impl : public ::cppu::WeakImplHelper< embed::XStateChangeLis
 public:
     explicit SwOLEListener_Impl( SwOLEObj* pObj );
     void Release();
-    virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+    virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override;
 };
 
 SwOLEListener_Impl::SwOLEListener_Impl( SwOLEObj* pObj )
@@ -105,11 +105,11 @@ SwOLEListener_Impl::SwOLEListener_Impl( SwOLEObj* pObj )
     }
 }
 
-void SAL_CALL SwOLEListener_Impl::changingState( const lang::EventObject&, ::sal_Int32 , ::sal_Int32 ) throw (embed::WrongStateException, uno::RuntimeException, std::exception)
+void SAL_CALL SwOLEListener_Impl::changingState( const lang::EventObject&, ::sal_Int32 , ::sal_Int32 )
 {
 }
 
-void SAL_CALL SwOLEListener_Impl::stateChanged( const lang::EventObject&, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwOLEListener_Impl::stateChanged( const lang::EventObject&, ::sal_Int32 nOldState, ::sal_Int32 nNewState )
 {
     if ( mpObj && nOldState == embed::EmbedStates::LOADED && nNewState == embed::EmbedStates::RUNNING )
     {
@@ -136,7 +136,7 @@ void SwOLEListener_Impl::Release()
     release();
 }
 
-void SAL_CALL SwOLEListener_Impl::disposing( const lang::EventObject& ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwOLEListener_Impl::disposing( const lang::EventObject& )
 {
     if (mpObj && g_pOLELRU_Cache)
         g_pOLELRU_Cache->RemoveObj( *mpObj );
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index 2fae105f0862..7c91e9deff01 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -53,8 +53,7 @@ public:
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
-        sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
 };
 
 class SwXMLBlockContext : public SvXMLImportContext
@@ -74,8 +73,7 @@ public:
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
-        sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
 };
 
 class SwXMLTextBlockBodyContext : public SvXMLImportContext
@@ -88,8 +86,7 @@ public:
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
-        sal_Int32, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        sal_Int32, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
 };
 
 class SwXMLTextBlockTextContext : public SvXMLImportContext
@@ -103,8 +100,7 @@ public:
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
         sal_Int32 Element,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
 };
 
 class SwXMLTextBlockParContext : public SvXMLImportContext
@@ -116,8 +112,7 @@ public:
     SwXMLTextBlockParContext( SwXMLTextBlockImport & rImport, sal_Int32 Element,
             const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
-    virtual void SAL_CALL characters( const OUString & aChars )
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL characters( const OUString & aChars ) override;
 
     virtual ~SwXMLTextBlockParContext() override;
 };
@@ -131,13 +126,11 @@ SwXMLTextBlockTokenHandler::~SwXMLTextBlockTokenHandler()
 }
 
 sal_Int32 SAL_CALL SwXMLTextBlockTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& Identifier )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return getTokenDirect( reinterpret_cast< const char* >( Identifier.getConstArray() ), Identifier.getLength() );
 }
 
 Sequence< sal_Int8 > SAL_CALL SwXMLTextBlockTokenHandler::getUTF8Identifier( sal_Int32 )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return Sequence< sal_Int8 >();
 }
@@ -159,13 +152,11 @@ SwXMLBlockListTokenHandler::~SwXMLBlockListTokenHandler()
 }
 
 sal_Int32 SAL_CALL SwXMLBlockListTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& Identifier )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return getTokenDirect( reinterpret_cast< const char* >( Identifier.getConstArray() ), Identifier.getLength() );
 }
 
 Sequence< sal_Int8 > SAL_CALL SwXMLBlockListTokenHandler::getUTF8Identifier( sal_Int32 )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return Sequence< sal_Int8 >();
 }
@@ -192,7 +183,6 @@ SwXMLBlockListContext::SwXMLBlockListContext(
 uno::Reference< ::xml::sax::XFastContextHandler > SAL_CALL
 SwXMLBlockListContext::createFastChildContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if ( Element == SwXMLBlockListToken::BLOCK )
         return new SwXMLBlockContext( rLocalRef, Element, xAttrList );
@@ -241,7 +231,6 @@ SwXMLTextBlockDocumentContext::SwXMLTextBlockDocumentContext(
 uno::Reference< ::xml::sax::XFastContextHandler > SAL_CALL
 SwXMLTextBlockDocumentContext::createFastChildContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if ( Element == SwXMLTextBlockToken::OFFICE_BODY )
         return new SwXMLTextBlockBodyContext( rLocalRef, Element, xAttrList );
@@ -261,7 +250,6 @@ SwXMLTextBlockTextContext::SwXMLTextBlockTextContext(
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 SwXMLTextBlockTextContext::createFastChildContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if ( Element == SwXMLTextBlockToken::TEXT_P )
         return new SwXMLTextBlockParContext( rLocalRef, Element, xAttrList );
@@ -281,7 +269,6 @@ SwXMLTextBlockBodyContext::SwXMLTextBlockBodyContext(
 uno::Reference < xml::sax::XFastContextHandler > SAL_CALL
 SwXMLTextBlockBodyContext::createFastChildContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if( Element == SwXMLTextBlockToken::OFFICE_TEXT )
         return new SwXMLTextBlockTextContext( rLocalRef, Element, xAttrList );
@@ -301,7 +288,6 @@ SwXMLTextBlockParContext::SwXMLTextBlockParContext(
 }
 
 void SAL_CALL SwXMLTextBlockParContext::characters( const OUString & aChars )
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     rLocalRef.m_rText += aChars;
 }
@@ -366,7 +352,6 @@ SvXMLImportContext* SwXMLTextBlockImport::CreateFastContext( sal_Int32 Element,
 }
 
 void SAL_CALL SwXMLTextBlockImport::endDocument()
-        throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
 }
 
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index 4aa4c012ad41..fd3c90d5d1d6 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -53,14 +53,12 @@ SwXTextDefaults::~SwXTextDefaults ()
 }
 
 uno::Reference< XPropertySetInfo > SAL_CALL SwXTextDefaults::getPropertySetInfo(  )
-        throw(RuntimeException, std::exception)
 {
     static uno::Reference < XPropertySetInfo > xRef = m_pPropSet->getPropertySetInfo();
     return xRef;
 }
 
 void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, const Any& aValue )
-        throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!m_pDoc)
@@ -125,7 +123,6 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName,
 }
 
 Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!m_pDoc)
@@ -140,32 +137,27 @@ Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName )
 }
 
 void SAL_CALL SwXTextDefaults::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     OSL_FAIL ( "not implemented" );
 }
 
 void SAL_CALL SwXTextDefaults::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     OSL_FAIL ( "not implemented" );
 }
 
 void SAL_CALL SwXTextDefaults::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     OSL_FAIL ( "not implemented" );
 }
 
 void SAL_CALL SwXTextDefaults::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     OSL_FAIL ( "not implemented" );
 }
 
 // XPropertyState
 PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPropertyName )
-        throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     PropertyState eRet = PropertyState_DIRECT_VALUE;
@@ -182,7 +174,6 @@ PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPrope
 }
 
 Sequence< PropertyState > SAL_CALL SwXTextDefaults::getPropertyStates( const Sequence< OUString >& rPropertyNames )
-        throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
     const OUString * pNames = rPropertyNames.getConstArray();
@@ -196,7 +187,6 @@ Sequence< PropertyState > SAL_CALL SwXTextDefaults::getPropertyStates( const Seq
 }
 
 void SAL_CALL SwXTextDefaults::setPropertyToDefault( const OUString& rPropertyName )
-        throw(UnknownPropertyException, RuntimeException, std::exception)
 {
     if (!m_pDoc)
         throw RuntimeException();
@@ -210,7 +200,6 @@ void SAL_CALL SwXTextDefaults::setPropertyToDefault( const OUString& rPropertyNa
 }
 
 Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     if (!m_pDoc)
         throw RuntimeException();
@@ -228,19 +217,16 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName
 }
 
 OUString SAL_CALL SwXTextDefaults::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return OUString("SwXTextDefaults");
 }
 
 sal_Bool SAL_CALL SwXTextDefaults::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwXTextDefaults::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aRet(7);
     OUString* pArr = aRet.getArray();
diff --git a/sw/source/core/unocore/TextCursorHelper.cxx b/sw/source/core/unocore/TextCursorHelper.cxx
index 251b22ae91ee..973757ac328c 100644
--- a/sw/source/core/unocore/TextCursorHelper.cxx
+++ b/sw/source/core/unocore/TextCursorHelper.cxx
@@ -36,7 +36,6 @@ const uno::Sequence< sal_Int8 > & OTextCursorHelper::getUnoTunnelId()
 //XUnoTunnel
 sal_Int64 SAL_CALL OTextCursorHelper::getSomething(
     const uno::Sequence< sal_Int8 >& rId )
-        throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index feca7d3cdee8..a7a62f713ce6 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -190,7 +190,6 @@ const uno::Sequence< sal_Int8 > & SwXBookmark::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXBookmark::getSomething( const uno::Sequence< sal_Int8 >& rId )
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXBookmark>(rId, this);
 }
@@ -198,7 +197,6 @@ throw (uno::RuntimeException, std::exception)
 void SwXBookmark::attachToRangeEx(
     const uno::Reference< text::XTextRange > & xTextRange,
     IDocumentMarkAccess::MarkType eType)
-throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     if (m_pImpl->m_pRegisteredBookmark)
     {
@@ -258,20 +256,17 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
 }
 
 void SwXBookmark::attachToRange( const uno::Reference< text::XTextRange > & xTextRange )
-throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     attachToRangeEx(xTextRange, IDocumentMarkAccess::MarkType::BOOKMARK);
 }
 
 void SAL_CALL SwXBookmark::attach( const uno::Reference< text::XTextRange > & xTextRange )
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     attachToRange( xTextRange );
 }
 
 uno::Reference< text::XTextRange > SAL_CALL SwXBookmark::getAnchor()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -287,7 +282,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL SwXBookmark::dispose()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_pImpl->m_pRegisteredBookmark)
@@ -298,7 +292,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXBookmark::addEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -306,14 +299,12 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXBookmark::removeEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
 }
 
 OUString SAL_CALL SwXBookmark::getName()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -323,7 +314,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL SwXBookmark::setName(const OUString& rName)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -353,7 +343,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 OUString SAL_CALL
-SwXBookmark::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXBookmark::getImplementationName()
 {
     return OUString("SwXBookmark");
 }
@@ -367,13 +357,12 @@ static char const*const g_ServicesBookmark[] =
 static const size_t g_nServicesBookmark(SAL_N_ELEMENTS(g_ServicesBookmark));
 
 sal_Bool SAL_CALL SwXBookmark::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXBookmark::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXBookmark::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(
             g_nServicesBookmark, g_ServicesBookmark);
@@ -396,7 +385,7 @@ uno::Reference<frame::XModel> SwXBookmark::GetModel()
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
-SwXBookmark::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+SwXBookmark::getPropertySetInfo()
 {
     SolarMutexGuard g;
 
@@ -409,9 +398,6 @@ SwXBookmark::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXBookmark::setPropertyValue(const OUString& PropertyName,
         const uno::Any& /*rValue*/)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     // nothing to set here
     throw lang::IllegalArgumentException("Property is read-only: "
@@ -419,8 +405,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 }
 
 uno::Any SAL_CALL SwXBookmark::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -439,8 +423,6 @@ void SAL_CALL
 SwXBookmark::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXBookmark::addPropertyChangeListener(): not implemented");
 }
@@ -449,8 +431,6 @@ void SAL_CALL
 SwXBookmark::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXBookmark::removePropertyChangeListener(): not implemented");
 }
@@ -459,8 +439,6 @@ void SAL_CALL
 SwXBookmark::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXBookmark::addVetoableChangeListener(): not implemented");
 }
@@ -469,8 +447,6 @@ void SAL_CALL
 SwXBookmark::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXBookmark::removeVetoableChangeListener(): not implemented");
 }
@@ -481,7 +457,6 @@ SwXFieldmark::SwXFieldmark(bool _isReplacementObject, ::sw::mark::IMark* pBkm, S
 { }
 
 void SwXFieldmarkParameters::insertByName(const OUString& aName, const uno::Any& aElement)
-    throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IFieldmark::parameter_map_t* pParameters = getCoreParameters();
@@ -491,7 +466,6 @@ void SwXFieldmarkParameters::insertByName(const OUString& aName, const uno::Any&
 }
 
 void SwXFieldmarkParameters::removeByName(const OUString& aName)
-    throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!getCoreParameters()->erase(aName))
@@ -499,7 +473,6 @@ void SwXFieldmarkParameters::removeByName(const OUString& aName)
 }
 
 void SwXFieldmarkParameters::replaceByName(const OUString& aName, const uno::Any& aElement)
-    throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IFieldmark::parameter_map_t* pParameters = getCoreParameters();
@@ -510,7 +483,6 @@ void SwXFieldmarkParameters::replaceByName(const OUString& aName, const uno::Any
 }
 
 uno::Any SwXFieldmarkParameters::getByName(const OUString& aName)
-    throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IFieldmark::parameter_map_t* pParameters = getCoreParameters();
@@ -521,7 +493,6 @@ uno::Any SwXFieldmarkParameters::getByName(const OUString& aName)
 }
 
 uno::Sequence<OUString> SwXFieldmarkParameters::getElementNames()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IFieldmark::parameter_map_t* pParameters = getCoreParameters();
@@ -529,7 +500,6 @@ uno::Sequence<OUString> SwXFieldmarkParameters::getElementNames()
 }
 
 sal_Bool SwXFieldmarkParameters::hasByName(const OUString& aName)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IFieldmark::parameter_map_t* pParameters = getCoreParameters();
@@ -537,13 +507,11 @@ sal_Bool SwXFieldmarkParameters::hasByName(const OUString& aName)
 }
 
 uno::Type SwXFieldmarkParameters::getElementType()
-    throw (uno::RuntimeException, std::exception)
 {
     return ::cppu::UnoType<void>::get();
 }
 
 sal_Bool SwXFieldmarkParameters::hasElements()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return !getCoreParameters()->empty();
@@ -555,7 +523,6 @@ void SwXFieldmarkParameters::Modify(const SfxPoolItem *pOld, const SfxPoolItem *
 }
 
 IFieldmark::parameter_map_t* SwXFieldmarkParameters::getCoreParameters()
-    throw (uno::RuntimeException)
 {
     const IFieldmark* pFieldmark = dynamic_cast< const IFieldmark* >(GetRegisteredIn());
     if(!pFieldmark)
@@ -564,7 +531,6 @@ IFieldmark::parameter_map_t* SwXFieldmarkParameters::getCoreParameters()
 }
 
 void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTextRange )
-    throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
 
     attachToRangeEx( xTextRange,
@@ -572,7 +538,6 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe
 }
 
 OUString SwXFieldmark::getFieldType()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const IFieldmark *pBkm = dynamic_cast<const IFieldmark*>(GetBookmark());
@@ -582,7 +547,6 @@ OUString SwXFieldmark::getFieldType()
 }
 
 void SwXFieldmark::setFieldType(const OUString & fieldType)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IFieldmark *pBkm = const_cast<IFieldmark*>(
@@ -593,7 +557,6 @@ void SwXFieldmark::setFieldType(const OUString & fieldType)
 }
 
 uno::Reference<container::XNameContainer> SwXFieldmark::getParameters()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     IFieldmark *pBkm = const_cast<IFieldmark*>(
@@ -654,9 +617,6 @@ SwXFieldmark::getCheckboxFieldmark()
 void SAL_CALL
 SwXFieldmark::setPropertyValue(const OUString& PropertyName,
         const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     if ( PropertyName == "Checked" )
@@ -677,8 +637,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 // docx import filter thus not published via PropertySet info )
 
 uno::Any SAL_CALL SwXFieldmark::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     if ( rPropertyName == "Checked" )
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 786f12ad0ca4..c72b7c02708e 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -539,8 +539,6 @@ SwChartDataProvider::~SwChartDataProvider()
 
 uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createDataSource(
         const uno::Sequence< beans::PropertyValue >& rArguments, bool bTestOnly )
-    throw (lang::IllegalArgumentException, uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     if (bDisposed)
@@ -957,7 +955,6 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
 
 sal_Bool SAL_CALL SwChartDataProvider::createDataSourcePossible(
         const uno::Sequence< beans::PropertyValue >& rArguments )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -976,7 +973,6 @@ sal_Bool SAL_CALL SwChartDataProvider::createDataSourcePossible(
 
 uno::Reference< chart2::data::XDataSource > SAL_CALL SwChartDataProvider::createDataSource(
         const uno::Sequence< beans::PropertyValue >& rArguments )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return Impl_createDataSource( rArguments );
@@ -1020,7 +1016,6 @@ OUString SwChartDataProvider::GetBrokenCellRangeForExport(
 
 uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArguments(
         const uno::Reference< chart2::data::XDataSource >& xDataSource )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (bDisposed)
@@ -1361,8 +1356,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
 
 uno::Reference< chart2::data::XDataSequence > SwChartDataProvider::Impl_createDataSequenceByRangeRepresentation(
         const OUString& rRangeRepresentation, bool bTestOnly )
-    throw (lang::IllegalArgumentException, uno::RuntimeException,
-           std::exception)
 {
     if (bDisposed)
         throw lang::DisposedException();
@@ -1391,7 +1384,6 @@ uno::Reference< chart2::data::XDataSequence > SwChartDataProvider::Impl_createDa
 
 sal_Bool SAL_CALL SwChartDataProvider::createDataSequenceByRangeRepresentationPossible(
         const OUString& rRangeRepresentation )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1410,14 +1402,12 @@ sal_Bool SAL_CALL SwChartDataProvider::createDataSequenceByRangeRepresentationPo
 
 uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartDataProvider::createDataSequenceByRangeRepresentation(
         const OUString& rRangeRepresentation )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return Impl_createDataSequenceByRangeRepresentation( rRangeRepresentation );
 }
 
 uno::Reference< sheet::XRangeSelection > SAL_CALL SwChartDataProvider::getRangeSelection(  )
-    throw (uno::RuntimeException, std::exception)
 {
     // note: it is no error to return nothing here
     return uno::Reference< sheet::XRangeSelection >();
@@ -1426,13 +1416,11 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL SwChartDataProvider::getRangeS
 uno::Reference<css::chart2::data::XDataSequence> SAL_CALL
     SwChartDataProvider::createDataSequenceByValueArray(
         const OUString& /*aRole*/, const OUString& /*aRangeRepresentation*/ )
-            throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     return uno::Reference<css::chart2::data::XDataSequence>();
 }
 
 void SAL_CALL SwChartDataProvider::dispose(  )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bMustDispose( false );
     {
@@ -1461,7 +1449,6 @@ void SAL_CALL SwChartDataProvider::dispose(  )
 
 void SAL_CALL SwChartDataProvider::addEventListener(
         const uno::Reference< lang::XEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!bDisposed && rxListener.is())
@@ -1470,7 +1457,6 @@ void SAL_CALL SwChartDataProvider::addEventListener(
 
 void SAL_CALL SwChartDataProvider::removeEventListener(
         const uno::Reference< lang::XEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!bDisposed && rxListener.is())
@@ -1478,19 +1464,16 @@ void SAL_CALL SwChartDataProvider::removeEventListener(
 }
 
 OUString SAL_CALL SwChartDataProvider::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("SwChartDataProvider");
 }
 
 sal_Bool SAL_CALL SwChartDataProvider::supportsService(const OUString& rServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwChartDataProvider::getSupportedServiceNames(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.chart2.data.DataProvider"};
 }
@@ -1728,8 +1711,6 @@ void SwChartDataProvider::AddRowCols(
 
 // XRangeXMLConversion
 OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRangeRepresentation )
-    throw (uno::RuntimeException, lang::IllegalArgumentException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     if (bDisposed)
@@ -1798,7 +1779,6 @@ OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRange
 }
 
 OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXMLRange )
-    throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
 {
     SolarMutexGuard aGuard;
     if (bDisposed)
@@ -1855,26 +1835,22 @@ SwChartDataSource::~SwChartDataSource()
 }
 
 uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL SwChartDataSource::getDataSequences(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return aLDS;
 }
 
 OUString SAL_CALL SwChartDataSource::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("SwChartDataSource");
 }
 
 sal_Bool SAL_CALL SwChartDataSource::supportsService(const OUString& rServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwChartDataSource::getSupportedServiceNames(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.chart2.data.DataSource" };
 }
@@ -1989,7 +1965,6 @@ const uno::Sequence< sal_Int8 > & SwChartDataSequence::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwChartDataSequence::getSomething( const uno::Sequence< sal_Int8 > &rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -2002,7 +1977,6 @@ sal_Int64 SAL_CALL SwChartDataSequence::getSomething( const uno::Sequence< sal_I
 
 
 OUString SAL_CALL SwChartDataSequence::getSourceRangeRepresentation(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_bDisposed)
@@ -2021,7 +1995,6 @@ OUString SAL_CALL SwChartDataSequence::getSourceRangeRepresentation(  )
 
 uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
         chart2::data::LabelOrigin eLabelOrigin )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_bDisposed)
@@ -2126,8 +2099,6 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel(
 
 ::sal_Int32 SAL_CALL SwChartDataSequence::getNumberFormatKeyByIndex(
     ::sal_Int32 /*nIndex*/ )
-    throw (lang::IndexOutOfBoundsException,
-           uno::RuntimeException, std::exception)
 {
     return 0;
 }
@@ -2149,7 +2120,6 @@ std::vector< css::uno::Reference< css::table::XCell > > SwChartDataSequence::Get
 }
 
 uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     auto vCells(GetCells());
@@ -2163,7 +2133,6 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData()
 }
 
 uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     auto vCells(GetCells());
@@ -2177,7 +2146,6 @@ uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData()
 }
 
 uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     auto vCells(GetCells());
@@ -2191,7 +2159,6 @@ uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData()
 }
 
 uno::Reference< util::XCloneable > SAL_CALL SwChartDataSequence::createClone(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_bDisposed)
@@ -2200,7 +2167,6 @@ uno::Reference< util::XCloneable > SAL_CALL SwChartDataSequence::createClone(  )
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL SwChartDataSequence::getPropertySetInfo(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_bDisposed)
@@ -2213,7 +2179,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwChartDataSequence::getPrope
 void SAL_CALL SwChartDataSequence::setPropertyValue(
         const OUString& rPropertyName,
         const uno::Any& rValue )
-    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_bDisposed)
@@ -2230,7 +2195,6 @@ void SAL_CALL SwChartDataSequence::setPropertyValue(
 
 uno::Any SAL_CALL SwChartDataSequence::getPropertyValue(
         const OUString& rPropertyName )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_bDisposed)
@@ -2248,7 +2212,6 @@ uno::Any SAL_CALL SwChartDataSequence::getPropertyValue(
 void SAL_CALL SwChartDataSequence::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "not implemented" );
 }
@@ -2256,7 +2219,6 @@ void SAL_CALL SwChartDataSequence::addPropertyChangeListener(
 void SAL_CALL SwChartDataSequence::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "not implemented" );
 }
@@ -2264,7 +2226,6 @@ void SAL_CALL SwChartDataSequence::removePropertyChangeListener(
 void SAL_CALL SwChartDataSequence::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "not implemented" );
 }
@@ -2272,25 +2233,21 @@ void SAL_CALL SwChartDataSequence::addVetoableChangeListener(
 void SAL_CALL SwChartDataSequence::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "not implemented" );
 }
 
 OUString SAL_CALL SwChartDataSequence::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("SwChartDataSequence");
 }
 
 sal_Bool SAL_CALL SwChartDataSequence::supportsService(const OUString& rServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getSupportedServiceNames(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.chart2.data.DataSequence" };
 }
@@ -2312,7 +2269,6 @@ void SwChartDataSequence::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pN
 }
 
 sal_Bool SAL_CALL SwChartDataSequence::isModified(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_bDisposed)
@@ -2323,7 +2279,6 @@ sal_Bool SAL_CALL SwChartDataSequence::isModified(  )
 
 void SAL_CALL SwChartDataSequence::setModified(
         sal_Bool bModified )
-    throw (beans::PropertyVetoException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_bDisposed)
@@ -2335,7 +2290,6 @@ void SAL_CALL SwChartDataSequence::setModified(
 
 void SAL_CALL SwChartDataSequence::addModifyListener(
         const uno::Reference< util::XModifyListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!m_bDisposed && rxListener.is())
@@ -2344,7 +2298,6 @@ void SAL_CALL SwChartDataSequence::addModifyListener(
 
 void SAL_CALL SwChartDataSequence::removeModifyListener(
         const uno::Reference< util::XModifyListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!m_bDisposed && rxListener.is())
@@ -2352,7 +2305,6 @@ void SAL_CALL SwChartDataSequence::removeModifyListener(
 }
 
 void SAL_CALL SwChartDataSequence::disposing( const lang::EventObject& rSource )
-    throw (uno::RuntimeException, std::exception)
 {
     if (m_bDisposed)
         throw lang::DisposedException();
@@ -2363,7 +2315,6 @@ void SAL_CALL SwChartDataSequence::disposing( const lang::EventObject& rSource )
 }
 
 void SAL_CALL SwChartDataSequence::dispose(  )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bMustDispose( false );
     {
@@ -2420,7 +2371,6 @@ void SAL_CALL SwChartDataSequence::dispose(  )
 
 void SAL_CALL SwChartDataSequence::addEventListener(
         const uno::Reference< lang::XEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!m_bDisposed && rxListener.is())
@@ -2429,7 +2379,6 @@ void SAL_CALL SwChartDataSequence::addEventListener(
 
 void SAL_CALL SwChartDataSequence::removeEventListener(
         const uno::Reference< lang::XEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!m_bDisposed && rxListener.is())
@@ -2667,7 +2616,6 @@ SwChartLabeledDataSequence::~SwChartLabeledDataSequence()
 }
 
 uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getValues(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (bDisposed)
@@ -2703,7 +2651,6 @@ void SwChartLabeledDataSequence::SetDataSequence(
 
 void SAL_CALL SwChartLabeledDataSequence::setValues(
         const uno::Reference< chart2::data::XDataSequence >& rxSequence )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (bDisposed)
@@ -2718,7 +2665,6 @@ void SAL_CALL SwChartLabeledDataSequence::setValues(
 }
 
 uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getLabel(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (bDisposed)
@@ -2728,7 +2674,6 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequenc
 
 void SAL_CALL SwChartLabeledDataSequence::setLabel(
         const uno::Reference< chart2::data::XDataSequence >& rxSequence )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (bDisposed)
@@ -2743,7 +2688,6 @@ void SAL_CALL SwChartLabeledDataSequence::setLabel(
 }
 
 uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createClone(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (bDisposed)
@@ -2770,27 +2714,23 @@ uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createCl
 }
 
 OUString SAL_CALL SwChartLabeledDataSequence::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("SwChartLabeledDataSequence");
 }
 
 sal_Bool SAL_CALL SwChartLabeledDataSequence::supportsService(
         const OUString& rServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwChartLabeledDataSequence::getSupportedServiceNames(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.chart2.data.LabeledDataSequence" };
 }
 
 void SAL_CALL SwChartLabeledDataSequence::disposing(
         const lang::EventObject& rSource )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     uno::Reference< uno::XInterface > xRef( rSource.Source );
@@ -2804,7 +2744,6 @@ void SAL_CALL SwChartLabeledDataSequence::disposing(
 
 void SAL_CALL SwChartLabeledDataSequence::modified(
         const lang::EventObject& rEvent )
-    throw (uno::RuntimeException, std::exception)
 {
     if (rEvent.Source == xData || rEvent.Source == xLabels)
     {
@@ -2814,7 +2753,6 @@ void SAL_CALL SwChartLabeledDataSequence::modified(
 
 void SAL_CALL SwChartLabeledDataSequence::addModifyListener(
         const uno::Reference< util::XModifyListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!bDisposed && rxListener.is())
@@ -2823,7 +2761,6 @@ void SAL_CALL SwChartLabeledDataSequence::addModifyListener(
 
 void SAL_CALL SwChartLabeledDataSequence::removeModifyListener(
         const uno::Reference< util::XModifyListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!bDisposed && rxListener.is())
@@ -2831,7 +2768,6 @@ void SAL_CALL SwChartLabeledDataSequence::removeModifyListener(
 }
 
 void SAL_CALL SwChartLabeledDataSequence::dispose(  )
-    throw (uno::RuntimeException, std::exception)
 {
     bool bMustDispose( false );
     {
@@ -2853,7 +2789,6 @@ void SAL_CALL SwChartLabeledDataSequence::dispose(  )
 
 void SAL_CALL SwChartLabeledDataSequence::addEventListener(
         const uno::Reference< lang::XEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!bDisposed && rxListener.is())
@@ -2862,7 +2797,6 @@ void SAL_CALL SwChartLabeledDataSequence::addEventListener(
 
 void SAL_CALL SwChartLabeledDataSequence::removeEventListener(
         const uno::Reference< lang::XEventListener >& rxListener )
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard  aGuard( GetChartMutex() );
     if (!bDisposed && rxListener.is())
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 6b183b033ff4..f6db86e07ea9 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -100,13 +100,13 @@ public:
     explicit SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {}
         // XCodeNameQuery
 
-    OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) throw( uno::RuntimeException, std::exception ) override
+    OUString SAL_CALL getCodeNameForContainer( const uno::Reference< uno::XInterface >& /*xIf*/ ) override
     {
         // #FIXME not implemented...
         return OUString();
     }
 
-    OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) override
+    OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) override
     {
         // Initialise the code name
         if ( msThisDocumentCodeName.isEmpty() )
@@ -180,22 +180,22 @@ public:
     SwVbaProjectNameProvider()
     {
     }
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() );
     }
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName( aName ) )
             throw container::NoSuchElementException();
         return uno::makeAny( mTemplateToProject.find( aName )->second );
     }
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         return comphelper::mapKeysToSequence( mTemplateToProject );
     }
 
-    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception ) override
+    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override
     {
 
         OUString sProjectName;
@@ -205,24 +205,24 @@ public:
         mTemplateToProject[ aName ] = sProjectName;
     }
 
-    virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception ) override
+    virtual void SAL_CALL removeByName( const OUString& Name ) override
     {
         if ( !hasByName( Name ) )
             throw container::NoSuchElementException();
         mTemplateToProject.erase( Name );
     }
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception ) override
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override
     {
         if ( !hasByName( aName ) )
             throw container::NoSuchElementException();
         insertByName( aName, aElement ); // insert will overwrite
     }
     // XElemenAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Type SAL_CALL getElementType(  ) override
     {
         return ::cppu::UnoType<OUString>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
 
         return ( !mTemplateToProject.empty() );
@@ -239,7 +239,7 @@ public:
         // #FIXME #TODO is the code name for ThisDocument read anywhere?
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         // #FIXME #TODO we really need to be checking against the codename for
         // ThisDocument
@@ -248,7 +248,7 @@ public:
         return false;
     }
 
-    css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    css::uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName( aName ) )
              throw container::NoSuchElementException();
@@ -260,14 +260,14 @@ public:
             "Creating Object ( ooo.vba.word.Document ) 0x" << xDocObj.get());
         return  uno::makeAny( xDocObj );
     }
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         uno::Sequence< OUString > aNames;
         return aNames;
     }
     // XElemenAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException, std::exception) override { return uno::Type(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception ) override { return true; }
+    virtual css::uno::Type SAL_CALL getElementType(  ) override { return uno::Type(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return true; }
 
 };
 
@@ -848,7 +848,7 @@ SwXTextTables::~SwXTextTables()
 
 }
 
-sal_Int32 SwXTextTables::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXTextTables::getCount()
 {
     SolarMutexGuard aGuard;
     sal_Int32 nRet = 0;
@@ -858,7 +858,6 @@ sal_Int32 SwXTextTables::getCount() throw( uno::RuntimeException, std::exception
 }
 
 uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex)
-        throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -879,7 +878,6 @@ uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Any SwXTextTables::getByName(const OUString& rItemName)
-    throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -906,7 +904,6 @@ uno::Any SwXTextTables::getByName(const OUString& rItemName)
 }
 
 uno::Sequence< OUString > SwXTextTables::getElementNames()
-        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -927,7 +924,6 @@ uno::Sequence< OUString > SwXTextTables::getElementNames()
 }
 
 sal_Bool SwXTextTables::hasByName(const OUString& rName)
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     bool bRet= false;
@@ -951,12 +947,11 @@ sal_Bool SwXTextTables::hasByName(const OUString& rName)
 
 uno::Type SAL_CALL
     SwXTextTables::getElementType(  )
-        throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<XTextTable>::get();
 }
 
-sal_Bool SwXTextTables::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTables::hasElements()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -964,17 +959,17 @@ sal_Bool SwXTextTables::hasElements() throw( uno::RuntimeException, std::excepti
     return 0 != GetDoc()->GetTableFrameFormatCount(true);
 }
 
-OUString SwXTextTables::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextTables::getImplementationName()
 {
     return OUString("SwXTextTables");
 }
 
-sal_Bool SwXTextTables::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTables::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet { "com.sun.star.text.TextTables" };
     return aRet;
@@ -1039,7 +1034,7 @@ namespace
 
     // runtime adapter for lcl_UnoWrapFrame
     /// @throws uno::RuntimeException
-    uno::Any lcl_UnoWrapFrame(SwFrameFormat* pFormat, FlyCntType eType) throw(uno::RuntimeException)
+    uno::Any lcl_UnoWrapFrame(SwFrameFormat* pFormat, FlyCntType eType)
     {
         switch(eType)
         {
@@ -1067,13 +1062,13 @@ namespace
             SwXFrameEnumeration(const SwDoc* const pDoc);
 
             //XEnumeration
-            virtual sal_Bool SAL_CALL hasMoreElements() throw( RuntimeException, std::exception ) override;
-            virtual Any SAL_CALL nextElement() throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) override;
+            virtual sal_Bool SAL_CALL hasMoreElements() override;
+            virtual Any SAL_CALL nextElement() override;
 
             //XServiceInfo
-            virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override;
-            virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) override;
-            virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override;
+            virtual OUString SAL_CALL getImplementationName() override;
+            virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+            virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     };
 }
 
@@ -1107,14 +1102,14 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc)
 }
 
 template<FlyCntType T>
-sal_Bool SwXFrameEnumeration<T>::hasMoreElements() throw( RuntimeException, std::exception )
+sal_Bool SwXFrameEnumeration<T>::hasMoreElements()
 {
     SolarMutexGuard aGuard;
     return !m_aFrames.empty();
 }
 
 template<FlyCntType T>
-Any SwXFrameEnumeration<T>::nextElement() throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
+Any SwXFrameEnumeration<T>::nextElement()
 {
     SolarMutexGuard aGuard;
     if(m_aFrames.empty())
@@ -1125,34 +1120,34 @@ Any SwXFrameEnumeration<T>::nextElement() throw( NoSuchElementException, Wrapped
 }
 
 template<FlyCntType T>
-OUString SwXFrameEnumeration<T>::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXFrameEnumeration<T>::getImplementationName()
 {
     return OUString("SwXFrameEnumeration");
 }
 
 template<FlyCntType T>
-sal_Bool SwXFrameEnumeration<T>::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXFrameEnumeration<T>::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 template<FlyCntType T>
-Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames()
 {
     return { OUString("com.sun.star.container.XEnumeration") };
 }
 
-OUString SwXFrames::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXFrames::getImplementationName()
 {
     return OUString("SwXFrames");
 }
 
-sal_Bool SwXFrames::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXFrames::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence<OUString> SwXFrames::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence<OUString> SwXFrames::getSupportedServiceNames()
 {
     return { OUString("com.sun.star.text.TextFrames") };
 }
@@ -1165,7 +1160,7 @@ SwXFrames::SwXFrames(SwDoc* _pDoc, FlyCntType eSet) :
 SwXFrames::~SwXFrames()
 {}
 
-uno::Reference<container::XEnumeration> SwXFrames::createEnumeration() throw(uno::RuntimeException, std::exception)
+uno::Reference<container::XEnumeration> SwXFrames::createEnumeration()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1186,7 +1181,7 @@ uno::Reference<container::XEnumeration> SwXFrames::createEnumeration() throw(uno
     }
 }
 
-sal_Int32 SwXFrames::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SwXFrames::getCount()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1196,7 +1191,6 @@ sal_Int32 SwXFrames::getCount() throw(uno::RuntimeException, std::exception)
 }
 
 uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
-    throw(IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1211,7 +1205,6 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Any SwXFrames::getByName(const OUString& rName)
-    throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1234,7 +1227,7 @@ uno::Any SwXFrames::getByName(const OUString& rName)
     return lcl_UnoWrapFrame(const_cast<SwFrameFormat*>(pFormat), m_eType);
 }
 
-uno::Sequence<OUString> SwXFrames::getElementNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence<OUString> SwXFrames::getElementNames()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1251,7 +1244,7 @@ uno::Sequence<OUString> SwXFrames::getElementNames() throw( uno::RuntimeExceptio
     return ::comphelper::containerToSequence(vNames);
 }
 
-sal_Bool SwXFrames::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXFrames::hasByName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1267,7 +1260,7 @@ sal_Bool SwXFrames::hasByName(const OUString& rName) throw( uno::RuntimeExceptio
     }
 }
 
-uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SwXFrames::getElementType()
 {
     SolarMutexGuard aGuard;
     switch(m_eType)
@@ -1283,7 +1276,7 @@ uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException, std:
     }
 }
 
-sal_Bool SwXFrames::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SwXFrames::hasElements()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1292,17 +1285,17 @@ sal_Bool SwXFrames::hasElements() throw(uno::RuntimeException, std::exception)
 }
 
 
-OUString SwXTextFrames::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXTextFrames::getImplementationName()
 {
     return OUString("SwXTextFrames");
 }
 
-sal_Bool SwXTextFrames::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXTextFrames::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXTextFrames::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXTextFrames::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.TextFrames" };
     return aRet;
@@ -1317,17 +1310,17 @@ SwXTextFrames::~SwXTextFrames()
 {
 }
 
-OUString SwXTextGraphicObjects::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXTextGraphicObjects::getImplementationName()
 {
     return OUString("SwXTextGraphicObjects");
 }
 
-sal_Bool SwXTextGraphicObjects::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXTextGraphicObjects::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.TextGraphicObjects" };
     return aRet;
@@ -1342,17 +1335,17 @@ SwXTextGraphicObjects::~SwXTextGraphicObjects()
 {
 }
 
-OUString SwXTextEmbeddedObjects::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXTextEmbeddedObjects::getImplementationName()
 {
     return OUString("SwXTextEmbeddedObjects");
 }
 
-sal_Bool SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.TextEmbeddedObjects" };
     return aRet;
@@ -1367,17 +1360,17 @@ SwXTextEmbeddedObjects::~SwXTextEmbeddedObjects()
 {
 }
 
-OUString SwXTextSections::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXTextSections::getImplementationName()
 {
     return OUString("SwXTextSections");
 }
 
-sal_Bool SwXTextSections::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXTextSections::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXTextSections::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXTextSections::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.TextSections" };
     return aRet;
@@ -1392,7 +1385,7 @@ SwXTextSections::~SwXTextSections()
 {
 }
 
-sal_Int32 SwXTextSections::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXTextSections::getCount()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1408,7 +1401,6 @@ sal_Int32 SwXTextSections::getCount() throw( uno::RuntimeException, std::excepti
 }
 
 uno::Any SwXTextSections::getByIndex(sal_Int32 nIndex)
-    throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Reference< XTextSection >  xRet;
@@ -1441,7 +1433,6 @@ uno::Any SwXTextSections::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Any SwXTextSections::getByName(const OUString& rName)
-    throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -1469,7 +1460,6 @@ uno::Any SwXTextSections::getByName(const OUString& rName)
 }
 
 uno::Sequence< OUString > SwXTextSections::getElementNames()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1502,7 +1492,6 @@ uno::Sequence< OUString > SwXTextSections::getElementNames()
 }
 
 sal_Bool SwXTextSections::hasByName(const OUString& rName)
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1528,12 +1517,12 @@ sal_Bool SwXTextSections::hasByName(const OUString& rName)
     return bRet;
 }
 
-uno::Type SAL_CALL SwXTextSections::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SwXTextSections::getElementType()
 {
     return cppu::UnoType<XTextSection>::get();
 }
 
-sal_Bool SwXTextSections::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextSections::hasElements()
 {
     SolarMutexGuard aGuard;
     size_t nCount = 0;
@@ -1552,17 +1541,17 @@ uno::Reference< XTextSection >  SwXTextSections::GetObject( SwSectionFormat& rFo
     return SwXTextSection::CreateXTextSection(&rFormat);
 }
 
-OUString SwXBookmarks::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXBookmarks::getImplementationName()
 {
     return OUString("SwXBookmarks");
 }
 
-sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXBookmarks::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXBookmarks::getSupportedServiceNames()
 {
     Sequence< OUString > aRet { "com.sun.star.text.Bookmarks" };
     return aRet;
@@ -1576,7 +1565,6 @@ SwXBookmarks::~SwXBookmarks()
 { }
 
 sal_Int32 SwXBookmarks::getCount()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1598,7 +1586,6 @@ sal_Int32 SwXBookmarks::getCount()
 }
 
 uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
-    throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1630,7 +1617,6 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Any SwXBookmarks::getByName(const OUString& rName)
-    throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1649,7 +1635,6 @@ uno::Any SwXBookmarks::getByName(const OUString& rName)
 }
 
 uno::Sequence< OUString > SwXBookmarks::getElementNames()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1671,7 +1656,6 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames()
 }
 
 sal_Bool SwXBookmarks::hasByName(const OUString& rName)
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1682,13 +1666,11 @@ sal_Bool SwXBookmarks::hasByName(const OUString& rName)
 }
 
 uno::Type SAL_CALL SwXBookmarks::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<XTextContent>::get();
 }
 
 sal_Bool SwXBookmarks::hasElements()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1717,7 +1699,7 @@ SwXNumberingRulesCollection::~SwXNumberingRulesCollection()
 {
 }
 
-sal_Int32 SwXNumberingRulesCollection::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXNumberingRulesCollection::getCount()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1726,7 +1708,6 @@ sal_Int32 SwXNumberingRulesCollection::getCount() throw( uno::RuntimeException,
 }
 
 uno::Any SwXNumberingRulesCollection::getByIndex(sal_Int32 nIndex)
-    throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -1747,12 +1728,12 @@ uno::Any SwXNumberingRulesCollection::getByIndex(sal_Int32 nIndex)
     return aRet;
 }
 
-uno::Type SAL_CALL SwXNumberingRulesCollection::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SwXNumberingRulesCollection::getElementType()
 {
     return cppu::UnoType<XIndexReplace>::get();
 }
 
-sal_Bool SwXNumberingRulesCollection::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXNumberingRulesCollection::hasElements()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1760,17 +1741,17 @@ sal_Bool SwXNumberingRulesCollection::hasElements() throw( uno::RuntimeException
     return !GetDoc()->GetNumRuleTable().empty();
 }
 
-OUString SwXFootnotes::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXFootnotes::getImplementationName()
 {
     return OUString("SwXFootnotes");
 }
 
-sal_Bool SwXFootnotes::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXFootnotes::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXFootnotes::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXFootnotes::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.Footnotes" };
     return aRet;
@@ -1786,7 +1767,7 @@ SwXFootnotes::~SwXFootnotes()
 {
 }
 
-sal_Int32 SwXFootnotes::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXFootnotes::getCount()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1806,7 +1787,6 @@ sal_Int32 SwXFootnotes::getCount() throw( uno::RuntimeException, std::exception
 }
 
 uno::Any SwXFootnotes::getByIndex(sal_Int32 nIndex)
-    throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -1840,12 +1820,12 @@ uno::Any SwXFootnotes::getByIndex(sal_Int32 nIndex)
     return aRet;
 }
 
-uno::Type SAL_CALL SwXFootnotes::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SwXFootnotes::getElementType()
 {
     return cppu::UnoType<XFootnote>::get();
 }
 
-sal_Bool SwXFootnotes::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXFootnotes::hasElements()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1858,17 +1838,17 @@ Reference<XFootnote>    SwXFootnotes::GetObject( SwDoc& rDoc, const SwFormatFoot
     return SwXFootnote::CreateXFootnote(rDoc, &const_cast<SwFormatFootnote&>(rFormat));
 }
 
-OUString SwXReferenceMarks::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXReferenceMarks::getImplementationName()
 {
     return OUString("SwXReferenceMarks");
 }
 
-sal_Bool SwXReferenceMarks::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXReferenceMarks::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.ReferenceMarks" };
     return aRet;
@@ -1883,7 +1863,7 @@ SwXReferenceMarks::~SwXReferenceMarks()
 {
 }
 
-sal_Int32 SwXReferenceMarks::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXReferenceMarks::getCount()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1892,7 +1872,6 @@ sal_Int32 SwXReferenceMarks::getCount() throw( uno::RuntimeException, std::excep
 }
 
 uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex)
-    throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -1915,7 +1894,6 @@ uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Any SwXReferenceMarks::getByName(const OUString& rName)
-    throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -1937,7 +1915,7 @@ uno::Any SwXReferenceMarks::getByName(const OUString& rName)
     return aRet;
 }
 
-uno::Sequence< OUString > SwXReferenceMarks::getElementNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXReferenceMarks::getElementNames()
 {
     SolarMutexGuard aGuard;
     uno::Sequence<OUString> aRet;
@@ -1955,7 +1933,7 @@ uno::Sequence< OUString > SwXReferenceMarks::getElementNames() throw( uno::Runti
     return aRet;
 }
 
-sal_Bool SwXReferenceMarks::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXReferenceMarks::hasByName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1963,12 +1941,12 @@ sal_Bool SwXReferenceMarks::hasByName(const OUString& rName) throw( uno::Runtime
     return nullptr != GetDoc()->GetRefMark( rName);
 }
 
-uno::Type SAL_CALL SwXReferenceMarks::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SwXReferenceMarks::getElementType()
 {
     return cppu::UnoType<XTextContent>::get();
 }
 
-sal_Bool SwXReferenceMarks::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXReferenceMarks::hasElements()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 6ee2bb80b4e5..880ae23e4993 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -952,8 +952,6 @@ void resetCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& r
 
 void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL,
     const uno::Sequence< beans::PropertyValue >& rOptions)
-    throw (lang::IllegalArgumentException, io::IOException,
-           uno::RuntimeException, std::exception)
 {
     std::unique_ptr<SfxMedium> pMed;
     SwDoc* pDoc = pUnoCursor->GetDoc();
@@ -1152,7 +1150,6 @@ bool DocInsertStringSplitCR(
 void makeRedline( SwPaM& rPaM,
     const OUString& rRedlineType,
     const uno::Sequence< beans::PropertyValue >& rRedlineProperties )
-        throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     IDocumentRedlineAccess* pRedlineAccess = &rPaM.GetDoc()->getIDocumentRedlineAccess();
 
@@ -1268,7 +1265,6 @@ void makeRedline( SwPaM& rPaM,
 void makeTableRowRedline( SwTableLine& rTableLine,
     const OUString& rRedlineType,
     const uno::Sequence< beans::PropertyValue >& rRedlineProperties )
-        throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     IDocumentRedlineAccess* pRedlineAccess = &rTableLine.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess();
 
@@ -1318,7 +1314,6 @@ void makeTableRowRedline( SwTableLine& rTableLine,
 void makeTableCellRedline( SwTableBox& rTableBox,
     const OUString& rRedlineType,
     const uno::Sequence< beans::PropertyValue >& rRedlineProperties )
-        throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     IDocumentRedlineAccess* pRedlineAccess = &rTableBox.GetFrameFormat()->GetDoc()->getIDocumentRedlineAccess();
 
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 6d39a48129ea..35f794a6a206 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -298,7 +298,6 @@ uno::Reference< uno::XInterface >   SwFmDrawPage::GetInterface( SdrObject* pObj
 }
 
 uno::Reference< drawing::XShape > SwFmDrawPage::CreateShape( SdrObject *pObj ) const
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< drawing::XShape >  xRet;
     if(dynamic_cast<const SwVirtFlyDrawObj*>( pObj) !=  nullptr || pObj->GetObjInventor() == SdrInventor::Swg)
@@ -381,13 +380,13 @@ namespace
             explicit SwXShapesEnumeration(SwXDrawPage* const pDrawPage);
 
             //XEnumeration
-            virtual sal_Bool SAL_CALL hasMoreElements() throw(uno::RuntimeException, std::exception) override;
-            virtual uno::Any SAL_CALL nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+            virtual sal_Bool SAL_CALL hasMoreElements() override;
+            virtual uno::Any SAL_CALL nextElement() 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;
     };
 }
 
@@ -404,13 +403,13 @@ SwXShapesEnumeration::SwXShapesEnumeration(SwXDrawPage* const pDrawPage)
     }
 }
 
-sal_Bool SwXShapesEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SwXShapesEnumeration::hasMoreElements()
 {
     SolarMutexGuard aGuard;
     return !m_aShapes.empty();
 }
 
-uno::Any SwXShapesEnumeration::nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SwXShapesEnumeration::nextElement()
 {
     SolarMutexGuard aGuard;
     if(m_aShapes.empty())
@@ -420,39 +419,39 @@ uno::Any SwXShapesEnumeration::nextElement() throw(container::NoSuchElementExcep
     return aResult;
 }
 
-OUString SwXShapesEnumeration::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SwXShapesEnumeration::getImplementationName()
 {
     return OUString("SwXShapeEnumeration");
 }
 
-sal_Bool SwXShapesEnumeration::supportsService(const OUString& ServiceName) throw(uno::RuntimeException, std::exception)
+sal_Bool SwXShapesEnumeration::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames()
 {
     return { OUString("com.sun.star.container.XEnumeration") };
 }
 
-uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration() throw( uno::RuntimeException, std::exception )
+uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration()
 {
     SolarMutexGuard aGuard;
     return uno::Reference< container::XEnumeration >(
         new SwXShapesEnumeration(this));
 }
 
-OUString SwXDrawPage::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXDrawPage::getImplementationName()
 {
     return OUString("SwXDrawPage");
 }
 
-sal_Bool SwXDrawPage::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXDrawPage::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXDrawPage::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXDrawPage::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet { "com.sun.star.drawing.GenericDrawPage" };
     return aRet;
@@ -474,7 +473,6 @@ SwXDrawPage::~SwXDrawPage()
 }
 
 uno::Any SwXDrawPage::queryInterface( const uno::Type& aType )
-                                                throw( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = SwXDrawPageBaseClass::queryInterface(aType);
     if(!aRet.hasValue())
@@ -493,7 +491,7 @@ uno::Any SwXDrawPage::queryInterface( const uno::Type& aType )
     return aRet;
 }
 
-uno::Sequence< uno::Type > SwXDrawPage::getTypes() throw( uno::RuntimeException, std::exception )
+uno::Sequence< uno::Type > SwXDrawPage::getTypes()
 {
     uno::Sequence< uno::Type > aPageTypes = SwXDrawPageBaseClass::getTypes();
     uno::Sequence< uno::Type > aSvxTypes = GetSvxPage()->getTypes();
@@ -512,7 +510,7 @@ uno::Sequence< uno::Type > SwXDrawPage::getTypes() throw( uno::RuntimeException,
     return aPageTypes;
 }
 
-sal_Int32 SwXDrawPage::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXDrawPage::getCount()
 {
     SolarMutexGuard aGuard;
     if(!pDoc)
@@ -527,8 +525,6 @@ sal_Int32 SwXDrawPage::getCount() throw( uno::RuntimeException, std::exception )
 }
 
 uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex)
-        throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-               uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!pDoc)
@@ -540,12 +536,12 @@ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex)
     return SwTextBoxHelper::getByIndex(pDrawPage->GetSdrPage(), nIndex);
 }
 
-uno::Type  SwXDrawPage::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type  SwXDrawPage::getElementType()
 {
     return cppu::UnoType<drawing::XShape>::get();
 }
 
-sal_Bool SwXDrawPage::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXDrawPage::hasElements()
 {
     SolarMutexGuard aGuard;
     if(!pDoc)
@@ -557,7 +553,6 @@ sal_Bool SwXDrawPage::hasElements() throw( uno::RuntimeException, std::exception
 }
 
 void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!pDoc)
@@ -725,7 +720,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     delete pInternalPam;
 }
 
-void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw( uno::RuntimeException, std::exception )
+void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape)
 {
     SolarMutexGuard aGuard;
     if(!pDoc)
@@ -735,7 +730,6 @@ void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw
 }
 
 uno::Reference< drawing::XShapeGroup >  SwXDrawPage::group(const uno::Reference< drawing::XShapes > & xShapes)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!pDoc || !xShapes.is())
@@ -789,7 +783,7 @@ uno::Reference< drawing::XShapeGroup >  SwXDrawPage::group(const uno::Reference<
     return xRet;
 }
 
-void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & rShapeGroup) throw( uno::RuntimeException, std::exception )
+void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & rShapeGroup)
 {
     SolarMutexGuard aGuard;
     if(!pDoc)
@@ -855,7 +849,6 @@ const uno::Sequence< sal_Int8 > & SwXShape::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXShape::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -979,7 +972,7 @@ SwXShape::~SwXShape()
         GetRegisteredIn()->Remove(this);
 }
 
-uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeException, std::exception )
+uno::Any SwXShape::queryInterface( const uno::Type& aType )
 {
     uno::Any aRet = SwTextBoxHelper::queryInterface(GetFrameFormat(), aType);
     if (aRet.hasValue())
@@ -999,7 +992,7 @@ uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeE
     return aRet;
 }
 
-uno::Sequence< uno::Type > SwXShape::getTypes(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SwXShape::getTypes(  )
 {
     uno::Sequence< uno::Type > aRet = SwXShapeBaseClass::getTypes();
     if(xShapeAgg.is())
@@ -1023,12 +1016,12 @@ uno::Sequence< uno::Type > SwXShape::getTypes(  ) throw(uno::RuntimeException, s
     return aRet;
 }
 
-uno::Sequence< sal_Int8 > SwXShape::getImplementationId(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int8 > SwXShape::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-uno::Reference< beans::XPropertySetInfo >  SwXShape::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo >  SwXShape::getPropertySetInfo()
 {
     SolarMutexGuard aGuard;
     uno::Reference< beans::XPropertySetInfo >  aRet;
@@ -1051,9 +1044,6 @@ uno::Reference< beans::XPropertySetInfo >  SwXShape::getPropertySetInfo() throw(
 }
 
 void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
-     throw( beans::UnknownPropertyException, beans::PropertyVetoException,
-            lang::IllegalArgumentException, lang::WrappedTargetException,
-            uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat*   pFormat = GetFrameFormat();
@@ -1454,8 +1444,6 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
 }
 
 uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -1741,8 +1729,6 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
 }
 
 uno::Any SwXShape::_getPropAtAggrObj( const OUString& _rPropertyName )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException,
-           uno::RuntimeException )
 {
     uno::Any aRet;
 
@@ -1760,7 +1746,6 @@ uno::Any SwXShape::_getPropAtAggrObj( const OUString& _rPropertyName )
 }
 
 beans::PropertyState SwXShape::getPropertyState( const OUString& rPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence< OUString > aNames { rPropertyName };
@@ -1770,7 +1755,6 @@ beans::PropertyState SwXShape::getPropertyState( const OUString& rPropertyName )
 
 uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
     const uno::Sequence< OUString >& aPropertyNames )
-        throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat*   pFormat = GetFrameFormat();
@@ -1885,7 +1869,6 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
 }
 
 void SwXShape::setPropertyToDefault( const OUString& rPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat*   pFormat = GetFrameFormat();
@@ -1948,8 +1931,6 @@ void SwXShape::setPropertyToDefault( const OUString& rPropertyName )
 }
 
 uno::Any SwXShape::getPropertyDefault( const OUString& rPropertyName )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwFrameFormat*   pFormat = GetFrameFormat();
@@ -1987,8 +1968,6 @@ uno::Any SwXShape::getPropertyDefault( const OUString& rPropertyName )
 void SwXShape::addPropertyChangeListener(
     const OUString& _propertyName,
     const uno::Reference< beans::XPropertyChangeListener > & _listener )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     if ( !xShapeAgg.is() )
         throw uno::RuntimeException("no shape aggregate", *this );
@@ -2002,8 +1981,6 @@ void SwXShape::addPropertyChangeListener(
 void SwXShape::removePropertyChangeListener(
     const OUString& _propertyName,
     const uno::Reference< beans::XPropertyChangeListener > & _listener)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     if ( !xShapeAgg.is() )
         throw uno::RuntimeException("no shape aggregate", *this );
@@ -2017,8 +1994,6 @@ void SwXShape::removePropertyChangeListener(
 void SwXShape::addVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/ )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
@@ -2026,8 +2001,6 @@ void SwXShape::addVetoableChangeListener(
 void SwXShape::removeVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
@@ -2038,7 +2011,6 @@ void SwXShape::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
 }
 
 void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange)
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -2105,7 +2077,7 @@ void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange)
     }
 }
 
-uno::Reference< text::XTextRange >  SwXShape::getAnchor() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextRange >  SwXShape::getAnchor()
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextRange >  aRef;
@@ -2127,7 +2099,7 @@ uno::Reference< text::XTextRange >  SwXShape::getAnchor() throw( uno::RuntimeExc
     return aRef;
 }
 
-void SwXShape::dispose() throw( uno::RuntimeException, std::exception )
+void SwXShape::dispose()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -2177,7 +2149,6 @@ void SwXShape::dispose() throw( uno::RuntimeException, std::exception )
 
 void SwXShape::addEventListener(
                     const uno::Reference< lang::XEventListener > & aListener)
-                    throw( uno::RuntimeException, std::exception )
 {
     uno::Reference< lang::XUnoTunnel > xShapeTunnel(xShapeAgg, uno::UNO_QUERY);
     SvxShape* pSvxShape = GetSvxShape();
@@ -2187,24 +2158,23 @@ void SwXShape::addEventListener(
 
 void SwXShape::removeEventListener(
                     const uno::Reference< lang::XEventListener > & aListener)
-                    throw( uno::RuntimeException, std::exception )
 {
     SvxShape* pSvxShape = GetSvxShape();
     if(pSvxShape)
         pSvxShape->removeEventListener(aListener);
 }
 
-OUString SwXShape::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXShape::getImplementationName()
 {
     return OUString("SwXShape");
 }
 
-sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXShape::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXShape::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXShape::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aSeq;
     if (SvxShape* pSvxShape = GetSvxShape())
@@ -2229,7 +2199,7 @@ SvxShape*   SwXShape::GetSvxShape()
 
 // #i31698#
 // implementation of virtual methods from drawing::XShape
-awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException, std::exception )
+awt::Point SAL_CALL SwXShape::getPosition()
 {
     awt::Point aPos( GetAttrPosition() );
 
@@ -2270,7 +2240,6 @@ awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException, std::
 }
 
 void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition )
-                                                throw ( uno::RuntimeException, std::exception )
 {
     SdrObject* pTopGroupObj = GetTopGroupObj();
     if ( !pTopGroupObj )
@@ -2358,7 +2327,7 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& aPosition )
     }
 }
 
-awt::Size SAL_CALL SwXShape::getSize() throw ( uno::RuntimeException, std::exception )
+awt::Size SAL_CALL SwXShape::getSize()
 {
     awt::Size aSize;
     if ( mxShape.is() )
@@ -2369,8 +2338,6 @@ awt::Size SAL_CALL SwXShape::getSize() throw ( uno::RuntimeException, std::excep
 }
 
 void SAL_CALL SwXShape::setSize( const awt::Size& aSize )
-                                        throw ( beans::PropertyVetoException,
-                                                uno::RuntimeException, std::exception )
 {
     if ( mxShape.is() )
     {
@@ -2380,7 +2347,7 @@ void SAL_CALL SwXShape::setSize( const awt::Size& aSize )
 }
 // #i31698#
 // implementation of virtual methods from drawing::XShapeDescriptor
-OUString SAL_CALL SwXShape::getShapeType() throw ( uno::RuntimeException, std::exception )
+OUString SAL_CALL SwXShape::getShapeType()
 {
     if ( mxShape.is() )
     {
@@ -2746,7 +2713,7 @@ SwXGroupShape::~SwXGroupShape()
 {
 }
 
-uno::Any SwXGroupShape::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SwXGroupShape::queryInterface( const uno::Type& rType )
 {
     uno::Any aRet;
     if(rType == cppu::UnoType<XShapes>::get())
@@ -2766,7 +2733,7 @@ void SwXGroupShape::release(  ) throw()
     SwXShape::release();
 }
 
-void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::RuntimeException, std::exception)
+void SwXGroupShape::add( const uno::Reference< XShape >& xShape )
 {
     SolarMutexGuard aGuard;
     SvxShape* pSvxShape = GetSvxShape();
@@ -2825,7 +2792,7 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru
         throw uno::RuntimeException();
 }
 
-void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) throw (uno::RuntimeException, std::exception)
+void SwXGroupShape::remove( const uno::Reference< XShape >& xShape )
 {
     SolarMutexGuard aGuard;
     uno::Reference<XShapes> xShapes;
@@ -2840,7 +2807,7 @@ void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) throw (uno:
     xShapes->remove(xShape);
 }
 
-sal_Int32 SwXGroupShape::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXGroupShape::getCount()
 {
     SolarMutexGuard aGuard;
     uno::Reference<XIndexAccess> xAcc;
@@ -2856,8 +2823,6 @@ sal_Int32 SwXGroupShape::getCount() throw( uno::RuntimeException, std::exception
 }
 
 uno::Any SwXGroupShape::getByIndex(sal_Int32 nIndex)
-        throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-               uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Reference<XIndexAccess> xAcc;
@@ -2872,7 +2837,7 @@ uno::Any SwXGroupShape::getByIndex(sal_Int32 nIndex)
     return xAcc->getByIndex(nIndex);
 }
 
-uno::Type SwXGroupShape::getElementType(  ) throw(uno::RuntimeException, std::exception)
+uno::Type SwXGroupShape::getElementType(  )
 {
     SolarMutexGuard aGuard;
     uno::Reference<XIndexAccess> xAcc;
@@ -2887,7 +2852,7 @@ uno::Type SwXGroupShape::getElementType(  ) throw(uno::RuntimeException, std::ex
     return xAcc->getElementType();
 }
 
-sal_Bool SwXGroupShape::hasElements(  ) throw(uno::RuntimeException, std::exception)
+sal_Bool SwXGroupShape::hasElements(  )
 {
     SolarMutexGuard aGuard;
     uno::Reference<XIndexAccess> xAcc;
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index ddecea980abf..f29aa1a0f8da 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -104,7 +104,6 @@ SwHyperlinkEventDescriptor::~SwHyperlinkEventDescriptor()
 }
 
 OUString SwHyperlinkEventDescriptor::getImplementationName()
-    throw( RuntimeException, std::exception )
 {
     return OUString("SwHyperlinkEventDescriptor");
 }
@@ -198,7 +197,6 @@ sal_uInt16 SwFrameEventDescriptor::getMacroItemWhich() const
 }
 
 OUString SwFrameEventDescriptor::getImplementationName()
-    throw( RuntimeException, std::exception )
 {
     return sSwFrameEventDescriptor;
 }
@@ -230,7 +228,6 @@ const SvxMacroItem& SwFrameStyleEventDescriptor::getMacroItem()
 }
 
 OUString SwFrameStyleEventDescriptor::getImplementationName()
-    throw( RuntimeException, std::exception )
 {
     return sSwFrameStyleEventDescriptor;
 }
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index b23aedd099ff..d7df39bf4884 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -462,14 +462,12 @@ const uno::Sequence< sal_Int8 > & SwXFieldMaster::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXFieldMaster::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXFieldMaster>(rId, this);
 }
 
 OUString SAL_CALL
 SwXFieldMaster::getImplementationName()
-throw (uno::RuntimeException, std::exception)
 {
     return OUString("SwXFieldMaster");
 }
@@ -507,13 +505,12 @@ OUString getServiceName(const sal_uInt16 aId)
 }
 
 sal_Bool SAL_CALL SwXFieldMaster::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXFieldMaster::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXFieldMaster::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -565,7 +562,6 @@ SwXFieldMaster::CreateXFieldMaster(SwDoc * pDoc, SwFieldType *const pType,
 
 uno::Reference<beans::XPropertySetInfo> SAL_CALL
 SwXFieldMaster::getPropertySetInfo()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< beans::XPropertySetInfo >  aRef =
@@ -576,9 +572,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXFieldMaster::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-       lang::IllegalArgumentException, lang::WrappedTargetException,
-       uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwFieldType* pType = GetFieldType(true);
@@ -815,8 +808,6 @@ SwFieldType* SwXFieldMaster::GetFieldType(bool const bDontCreate) const
 
 uno::Any SAL_CALL
 SwXFieldMaster::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -955,28 +946,27 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     return aRet;
 }
 
-void SwXFieldMaster::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXFieldMaster::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXFieldMaster::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXFieldMaster::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXFieldMaster::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXFieldMaster::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXFieldMaster::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXFieldMaster::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL SwXFieldMaster::dispose()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwFieldType *const pFieldType = GetFieldType(true);
@@ -1008,7 +998,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXFieldMaster::addEventListener(
         const uno::Reference<lang::XEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -1016,7 +1005,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXFieldMaster::removeEventListener(
         const uno::Reference<lang::XEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
@@ -1185,7 +1173,6 @@ const uno::Sequence< sal_Int8 > & SwXTextField::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXTextField::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXTextField>(rId, this);
 }
@@ -1257,7 +1244,6 @@ SwServiceType SwXTextField::GetServiceId() const
 
 void SAL_CALL SwXTextField::attachTextFieldMaster(
         const uno::Reference< beans::XPropertySet > & xFieldMaster)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1280,7 +1266,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference< beans::XPropertySet > SAL_CALL
-SwXTextField::getTextFieldMaster() throw (uno::RuntimeException, std::exception)
+SwXTextField::getTextFieldMaster()
 {
     SolarMutexGuard aGuard;
     SwFieldType* pType = nullptr;
@@ -1302,7 +1288,6 @@ SwXTextField::getTextFieldMaster() throw (uno::RuntimeException, std::exception)
 }
 
 OUString SAL_CALL SwXTextField::getPresentation(sal_Bool bShowCommand)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1316,7 +1301,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXTextField::attach(
         const uno::Reference< text::XTextRange > & xTextRange)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_pImpl->m_bIsDescriptor)
@@ -2044,7 +2028,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXTextField::getAnchor() throw (uno::RuntimeException, std::exception)
+SwXTextField::getAnchor()
 {
     SolarMutexGuard aGuard;
 
@@ -2081,7 +2065,7 @@ SwXTextField::getAnchor() throw (uno::RuntimeException, std::exception)
     return xRange;
 }
 
-void SAL_CALL SwXTextField::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextField::dispose()
 {
     SolarMutexGuard aGuard;
     SwField const*const pField = m_pImpl->GetField();
@@ -2102,7 +2086,6 @@ void SAL_CALL SwXTextField::dispose() throw (uno::RuntimeException, std::excepti
 
 void SAL_CALL SwXTextField::addEventListener(
         const uno::Reference<lang::XEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -2110,7 +2093,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXTextField::removeEventListener(
         const uno::Reference<lang::XEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
@@ -2118,7 +2100,6 @@ throw (uno::RuntimeException, std::exception)
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 SwXTextField::getPropertySetInfo()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     // no static
@@ -2141,9 +2122,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXTextField::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwField const*const pField = m_pImpl->GetField();
@@ -2294,8 +2272,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 }
 
 uno::Any SAL_CALL SwXTextField::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -2484,27 +2460,27 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     return aRet;
 }
 
-void SwXTextField::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextField::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXTextField::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextField::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXTextField::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextField::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXTextField::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextField::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SAL_CALL SwXTextField::update() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextField::update()
 {
     SolarMutexGuard aGuard;
     SwField * pField = const_cast<SwField*>(m_pImpl->GetField());
@@ -2560,7 +2536,6 @@ void SAL_CALL SwXTextField::update() throw (uno::RuntimeException, std::exceptio
 }
 
 OUString SAL_CALL SwXTextField::getImplementationName()
-throw (uno::RuntimeException, std::exception)
 {
     return OUString("SwXTextField");
 }
@@ -2580,13 +2555,11 @@ static OUString OldNameToNewName_Impl( const OUString &rOld )
 }
 
 sal_Bool SAL_CALL SwXTextField::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwXTextField::getSupportedServiceNames()
-throw (uno::RuntimeException, std::exception)
 {
     const OUString sServiceName =
         SwXServiceProvider::GetProviderName(m_pImpl->m_nServiceId);
@@ -2651,17 +2624,17 @@ const SwField*  SwXTextField::Impl::GetField() const
     return nullptr;
 }
 
-OUString SwXTextFieldMasters::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextFieldMasters::getImplementationName()
 {
     return OUString("SwXTextFieldMasters");
 }
 
-sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet { "com.sun.star.text.TextFieldMasters" };
     return aRet;
@@ -2727,7 +2700,6 @@ static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName )
 }
 
 uno::Any SwXTextFieldMasters::getByName(const OUString& rName)
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!GetDoc())
@@ -2787,7 +2759,6 @@ bool SwXTextFieldMasters::getInstanceName(
 }
 
 uno::Sequence< OUString > SwXTextFieldMasters::getElementNames()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!GetDoc())
@@ -2811,7 +2782,7 @@ uno::Sequence< OUString > SwXTextFieldMasters::getElementNames()
     return comphelper::containerToSequence(aFieldNames);
 }
 
-sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     if(!GetDoc())
@@ -2828,13 +2799,13 @@ sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::Runti
     return bRet;
 }
 
-uno::Type  SwXTextFieldMasters::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type  SwXTextFieldMasters::getElementType()
 {
     return cppu::UnoType<beans::XPropertySet>::get();
 
 }
 
-sal_Bool SwXTextFieldMasters::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextFieldMasters::hasElements()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2853,17 +2824,17 @@ public:
     Impl() : m_RefreshListeners(m_Mutex) { }
 };
 
-OUString SwXTextFieldTypes::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextFieldTypes::getImplementationName()
 {
     return OUString("SwXTextFieldTypes");
 }
 
-sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet { "com.sun.star.text.TextFields" };
     return aRet;
@@ -2887,7 +2858,6 @@ void SwXTextFieldTypes::Invalidate()
 }
 
 uno::Reference< container::XEnumeration >  SwXTextFieldTypes::createEnumeration()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2895,12 +2865,12 @@ uno::Reference< container::XEnumeration >  SwXTextFieldTypes::createEnumeration(
     return new SwXFieldEnumeration(*GetDoc());
 }
 
-uno::Type  SwXTextFieldTypes::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type  SwXTextFieldTypes::getElementType()
 {
     return cppu::UnoType<text::XDependentTextField>::get();
 }
 
-sal_Bool SwXTextFieldTypes::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextFieldTypes::hasElements()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2908,7 +2878,7 @@ sal_Bool SwXTextFieldTypes::hasElements() throw( uno::RuntimeException, std::exc
     return true; // they always exist
 }
 
-void SAL_CALL SwXTextFieldTypes::refresh() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextFieldTypes::refresh()
 {
     {
         SolarMutexGuard aGuard;
@@ -2926,7 +2896,6 @@ void SAL_CALL SwXTextFieldTypes::refresh() throw (uno::RuntimeException, std::ex
 
 void SAL_CALL SwXTextFieldTypes::addRefreshListener(
         const uno::Reference<util::XRefreshListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_RefreshListeners.addInterface(xListener);
@@ -2934,7 +2903,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXTextFieldTypes::removeRefreshListener(
         const uno::Reference<util::XRefreshListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_RefreshListeners.removeInterface(xListener);
@@ -2962,19 +2930,18 @@ protected:
 };
 
 OUString SAL_CALL
-SwXFieldEnumeration::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXFieldEnumeration::getImplementationName()
 {
     return OUString("SwXFieldEnumeration");
 }
 
 sal_Bool SAL_CALL SwXFieldEnumeration::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXFieldEnumeration::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXFieldEnumeration::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet { "com.sun.star.text.FieldEnumeration" };
     return aRet;
@@ -3020,7 +2987,6 @@ SwXFieldEnumeration::~SwXFieldEnumeration()
 }
 
 sal_Bool SAL_CALL SwXFieldEnumeration::hasMoreElements()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3028,8 +2994,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL SwXFieldEnumeration::nextElement()
-throw (container::NoSuchElementException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index 3f1a5b3950d0..39a0d616d5e9 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -79,7 +79,6 @@ SwXFlatParagraph::~SwXFlatParagraph()
 // XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 SwXFlatParagraph::getPropertySetInfo()
-throw (uno::RuntimeException, std::exception)
 {
     static comphelper::PropertyMapEntry s_Entries[] = {
         { OUString("FieldPositions"), -1, ::cppu::UnoType<uno::Sequence<sal_Int32>>::get(), beans::PropertyAttribute::READONLY, 0 },
@@ -91,9 +90,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL
 SwXFlatParagraph::setPropertyValue(const OUString&, const uno::Any&)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-        lang::IllegalArgumentException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     throw lang::IllegalArgumentException("no values can be set",
             static_cast< ::cppu::OWeakObject*>(this), 0);
@@ -101,8 +97,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
 uno::Any SAL_CALL
 SwXFlatParagraph::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -121,8 +115,6 @@ void SAL_CALL
 SwXFlatParagraph::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SAL_WARN("sw.uno",
         "SwXFlatParagraph::addPropertyChangeListener(): not implemented");
@@ -132,8 +124,6 @@ void SAL_CALL
 SwXFlatParagraph::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SAL_WARN("sw.uno",
         "SwXFlatParagraph::removePropertyChangeListener(): not implemented");
@@ -143,8 +133,6 @@ void SAL_CALL
 SwXFlatParagraph::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SAL_WARN("sw.uno",
         "SwXFlatParagraph::addVetoableChangeListener(): not implemented");
@@ -154,40 +142,38 @@ void SAL_CALL
 SwXFlatParagraph::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SAL_WARN("sw.uno",
         "SwXFlatParagraph::removeVetoableChangeListener(): not implemented");
 }
 
 
-css::uno::Reference< css::container::XStringKeyMap > SAL_CALL SwXFlatParagraph::getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::container::XStringKeyMap > SAL_CALL SwXFlatParagraph::getMarkupInfoContainer()
 {
     return SwXTextMarkup::getMarkupInfoContainer();
 }
 
 void SAL_CALL SwXFlatParagraph::commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const uno::Reference< text::XTextRange> & xRange,
-                                                      const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (uno::RuntimeException, std::exception)
+                                                      const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer)
 {
     SolarMutexGuard aGuard;
     SwXTextMarkup::commitTextRangeMarkup( nType, aIdentifier, xRange,  xMarkupInfoContainer );
 }
 
-void SAL_CALL SwXFlatParagraph::commitStringMarkup(::sal_Int32 nType, const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXFlatParagraph::commitStringMarkup(::sal_Int32 nType, const OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer)
 {
     SolarMutexGuard aGuard;
     SwXTextMarkup::commitStringMarkup( nType, rIdentifier, nStart, nLength,  rxMarkupInfoContainer );
 }
 
 // text::XFlatParagraph:
-OUString SAL_CALL SwXFlatParagraph::getText() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXFlatParagraph::getText()
 {
     return maExpandText;
 }
 
 // text::XFlatParagraph:
-void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, sal_Bool bVal ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, sal_Bool bVal )
 {
     SolarMutexGuard aGuard;
 
@@ -210,7 +196,7 @@ void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, sal_Bool bVal ) t
 }
 
 // text::XFlatParagraph:
-sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType )
 {
     SolarMutexGuard aGuard;
     if (GetTextNode())
@@ -227,7 +213,7 @@ sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType ) throw (uno::R
 }
 
 // text::XFlatParagraph:
-sal_Bool SAL_CALL SwXFlatParagraph::isModified() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXFlatParagraph::isModified()
 {
     SolarMutexGuard aGuard;
     return nullptr == GetTextNode();
@@ -235,7 +221,6 @@ sal_Bool SAL_CALL SwXFlatParagraph::isModified() throw (uno::RuntimeException, s
 
 // text::XFlatParagraph:
 lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen)
-    throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!GetTextNode())
@@ -247,7 +232,6 @@ lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sa
 
 // text::XFlatParagraph:
 lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen)
-    throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -259,7 +243,7 @@ lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPo
 }
 
 // text::XFlatParagraph:
-void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
+void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes)
 {
     SolarMutexGuard aGuard;
 
@@ -289,7 +273,7 @@ void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, c
 }
 
 // text::XFlatParagraph:
-void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
+void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes)
 {
     SolarMutexGuard aGuard;
 
@@ -314,7 +298,7 @@ void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 n
 }
 
 // text::XFlatParagraph:
-css::uno::Sequence< ::sal_Int32 > SAL_CALL SwXFlatParagraph::getLanguagePortions() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< ::sal_Int32 > SAL_CALL SwXFlatParagraph::getLanguagePortions()
 {
     return css::uno::Sequence< ::sal_Int32>();
 }
@@ -333,7 +317,6 @@ SwXFlatParagraph::getUnoTunnelId()
 sal_Int64 SAL_CALL
 SwXFlatParagraph::getSomething(
         const uno::Sequence< sal_Int8 >& rId)
-    throw (uno::RuntimeException, std::exception)
 {
     return sw::UnoTunnelImpl(rId, this);
 }
@@ -370,13 +353,11 @@ void SwXFlatParagraphIterator::Modify( const SfxPoolItem* pOld, const SfxPoolIte
 }
 
 uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getFirstPara()
-    throw( uno::RuntimeException, std::exception )
 {
     return getNextPara();   // TODO
 }
 
 uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -478,13 +459,11 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara()
 }
 
 uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getLastPara()
-    throw( uno::RuntimeException, std::exception )
 {
     return getNextPara();
 }
 
 uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(const uno::Reference< text::XFlatParagraph > & xPara)
-    throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -530,7 +509,6 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(co
 }
 
 uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaBefore(const uno::Reference< text::XFlatParagraph > & xPara )
-    throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception )
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index dbc5180899a4..317b8073d083 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1160,7 +1160,6 @@ const ::uno::Sequence< sal_Int8 > & SwXFrame::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXFrame::getSomething( const ::uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -1172,17 +1171,17 @@ sal_Int64 SAL_CALL SwXFrame::getSomething( const ::uno::Sequence< sal_Int8 >& rI
 }
 
 
-OUString SwXFrame::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXFrame::getImplementationName()
 {
     return OUString("SwXFrame");
 }
 
-sal_Bool SwXFrame::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXFrame::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXFrame::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXFrame::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(3);
     aRet[0] = "com.sun.star.text.BaseFrame";
@@ -1292,7 +1291,7 @@ SwXFrame::CreateXFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat)
     return xFrame;
 }
 
-OUString SwXFrame::getName() throw( uno::RuntimeException, std::exception )
+OUString SwXFrame::getName()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -1303,7 +1302,7 @@ OUString SwXFrame::getName() throw( uno::RuntimeException, std::exception )
     return m_sName;
 }
 
-void SwXFrame::setName(const OUString& rName) throw( uno::RuntimeException, std::exception )
+void SwXFrame::setName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -1321,7 +1320,7 @@ void SwXFrame::setName(const OUString& rName) throw( uno::RuntimeException, std:
         throw uno::RuntimeException();
 }
 
-uno::Reference< beans::XPropertySetInfo >  SwXFrame::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo >  SwXFrame::getPropertySetInfo()
 {
     uno::Reference< beans::XPropertySetInfo >  xRef;
     static uno::Reference< beans::XPropertySetInfo >  xFrameRef;
@@ -1403,7 +1402,6 @@ static SwFrameFormat *lcl_GetFrameFormat( const ::uno::Any& rValue, SwDoc *pDoc
 }
 
 void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& _rValue)
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -1997,7 +1995,6 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any&
 }
 
 uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aAny;
@@ -2356,34 +2353,29 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
 
 void SwXFrame::addPropertyChangeListener(const OUString& /*PropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXFrame::removePropertyChangeListener(const OUString& /*PropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXFrame::addVetoableChangeListener(const OUString& /*PropertyName*/,
                                 const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXFrame::removeVetoableChangeListener(
     const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 beans::PropertyState SwXFrame::getPropertyState( const OUString& rPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence< OUString > aPropertyNames { rPropertyName };
@@ -2393,7 +2385,6 @@ beans::PropertyState SwXFrame::getPropertyState( const OUString& rPropertyName )
 
 uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
     const uno::Sequence< OUString >& aPropertyNames )
-        throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence< beans::PropertyState > aStates(aPropertyNames.getLength());
@@ -2479,7 +2470,6 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
 }
 
 void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
-    throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -2573,7 +2563,6 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
 }
 
 uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -2603,7 +2592,6 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName )
 
 void SAL_CALL SwXFrame::addEventListener(
         const uno::Reference<lang::XEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -2611,7 +2599,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXFrame::removeEventListener(
         const uno::Reference<lang::XEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
@@ -2636,7 +2623,7 @@ void SwXFrame::Modify(const SfxPoolItem* pOld, const SfxPoolItem *pNew)
     m_pImpl->m_EventListeners.disposeAndClear(ev);
 }
 
-void SwXFrame::dispose() throw( uno::RuntimeException, std::exception )
+void SwXFrame::dispose()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -2665,7 +2652,7 @@ void SwXFrame::dispose() throw( uno::RuntimeException, std::exception )
 
 }
 
-uno::Reference< text::XTextRange >  SwXFrame::getAnchor() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextRange >  SwXFrame::getAnchor()
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextRange >  aRef;
@@ -2696,7 +2683,6 @@ void SwXFrame::ResetDescriptor()
 }
 
 void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRange)
-            throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!IsDescriptor())
@@ -3063,7 +3049,6 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
 }
 
 void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SwFrameFormat* pFormat;
     if(IsDescriptor())
@@ -3087,7 +3072,7 @@ void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
     }
 }
 
-awt::Point SwXFrame::getPosition() throw( uno::RuntimeException, std::exception )
+awt::Point SwXFrame::getPosition()
 {
     SolarMutexGuard aGuard;
     uno::RuntimeException aRuntime;
@@ -3095,7 +3080,7 @@ awt::Point SwXFrame::getPosition() throw( uno::RuntimeException, std::exception
     throw aRuntime;
 }
 
-void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeException, std::exception )
+void SwXFrame::setPosition(const awt::Point& /*aPosition*/)
 {
     SolarMutexGuard aGuard;
     uno::RuntimeException aRuntime;
@@ -3103,7 +3088,7 @@ void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeE
     throw aRuntime;
 }
 
-awt::Size SwXFrame::getSize() throw( uno::RuntimeException, std::exception )
+awt::Size SwXFrame::getSize()
 {
     const ::uno::Any aVal = getPropertyValue("Size");
     awt::Size const * pRet =  o3tl::doAccess<awt::Size>(aVal);
@@ -3111,13 +3096,12 @@ awt::Size SwXFrame::getSize() throw( uno::RuntimeException, std::exception )
 }
 
 void SwXFrame::setSize(const awt::Size& aSize)
-    throw( beans::PropertyVetoException, uno::RuntimeException, std::exception )
 {
     const ::uno::Any aVal(&aSize, ::cppu::UnoType<awt::Size>::get());
     setPropertyValue("Size", aVal);
 }
 
-OUString SwXFrame::getShapeType() throw( uno::RuntimeException, std::exception )
+OUString SwXFrame::getShapeType()
 {
     return OUString("FrameShape");
 }
@@ -3156,7 +3140,6 @@ void SAL_CALL SwXTextFrame::release(  )throw()
 }
 
 ::uno::Any SAL_CALL SwXTextFrame::queryInterface( const uno::Type& aType )
-    throw (uno::RuntimeException, std::exception)
 {
     ::uno::Any aRet = SwXFrame::queryInterface(aType);
     if(aRet.getValueType() == cppu::UnoType<void>::get())
@@ -3166,7 +3149,7 @@ void SAL_CALL SwXTextFrame::release(  )throw()
     return aRet;
 }
 
-uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes(  )
 {
     uno::Sequence< uno::Type > aTextFrameTypes = SwXTextFrameBaseClass::getTypes();
     uno::Sequence< uno::Type > aFrameTypes = SwXFrame::getTypes();
@@ -3191,12 +3174,12 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes(  ) throw(uno::Runtim
     return aTextFrameTypes;
 }
 
-uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-uno::Reference< text::XText >  SwXTextFrame::getText() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XText >  SwXTextFrame::getText()
 {
     return this;
 }
@@ -3217,12 +3200,12 @@ const SwStartNode *SwXTextFrame::GetStartNode() const
 }
 
 uno::Reference< text::XTextCursor >
-SwXTextFrame::CreateCursor() throw (uno::RuntimeException)
+SwXTextFrame::CreateCursor()
 {
     return createTextCursor();
 }
 
-uno::Reference< text::XTextCursor >  SwXTextFrame::createTextCursor() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextCursor >  SwXTextFrame::createTextCursor()
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextCursor >  aRef;
@@ -3265,7 +3248,7 @@ uno::Reference< text::XTextCursor >  SwXTextFrame::createTextCursor() throw( uno
     return aRef;
 }
 
-uno::Reference< text::XTextCursor >  SwXTextFrame::createTextCursorByRange(const uno::Reference< text::XTextRange > & aTextPosition) throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextCursor >  SwXTextFrame::createTextCursorByRange(const uno::Reference< text::XTextRange > & aTextPosition)
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextCursor >  aRef;
@@ -3286,7 +3269,7 @@ uno::Reference< text::XTextCursor >  SwXTextFrame::createTextCursorByRange(const
     return aRef;
 }
 
-uno::Reference< container::XEnumeration >  SwXTextFrame::createEnumeration() throw( uno::RuntimeException, std::exception )
+uno::Reference< container::XEnumeration >  SwXTextFrame::createEnumeration()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -3298,55 +3281,54 @@ uno::Reference< container::XEnumeration >  SwXTextFrame::createEnumeration() thr
     return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_FRAME);
 }
 
-uno::Type  SwXTextFrame::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type  SwXTextFrame::getElementType()
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SwXTextFrame::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextFrame::hasElements()
 {
     return true;
 }
 
 void SwXTextFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SwXFrame::attach(xTextRange);
 }
 
-uno::Reference< text::XTextRange >  SwXTextFrame::getAnchor() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextRange >  SwXTextFrame::getAnchor()
 {
     SolarMutexGuard aGuard;
     return SwXFrame::getAnchor();
 }
 
-void SwXTextFrame::dispose() throw( uno::RuntimeException, std::exception )
+void SwXTextFrame::dispose()
 {
     SolarMutexGuard aGuard;
     SwXFrame::dispose();
 }
 
-void SwXTextFrame::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException, std::exception )
+void SwXTextFrame::addEventListener(const uno::Reference< lang::XEventListener > & aListener)
 {
     SwXFrame::addEventListener(aListener);
 }
 
-void SwXTextFrame::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException, std::exception )
+void SwXTextFrame::removeEventListener(const uno::Reference< lang::XEventListener > & aListener)
 {
     SwXFrame::removeEventListener(aListener);
 }
 
-OUString SwXTextFrame::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextFrame::getImplementationName()
 {
     return OUString("SwXTextFrame");
 }
 
-sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames()
 {
     uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames();
     aRet.realloc(aRet.getLength() + 2);
@@ -3367,13 +3349,11 @@ void SAL_CALL SwXTextFrame::operator delete( void * p) throw()
 }
 
 uno::Reference<container::XNameReplace > SAL_CALL SwXTextFrame::getEvents()
-    throw(uno::RuntimeException, std::exception)
 {
     return new SwFrameEventDescriptor( *this );
 }
 
 sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     sal_Int64 nRet = SwXFrame::getSomething( rId );
     if( !nRet )
@@ -3383,7 +3363,6 @@ sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >&
 }
 
 ::uno::Any SwXTextFrame::getPropertyValue(const OUString& rPropertyName)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     ::uno::Any aRet;
@@ -3421,18 +3400,17 @@ SwXTextGraphicObject::CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat *cons
     return CreateXFrame<text::XTextContent, SwXTextGraphicObject>(rDoc, pFrameFormat);
 }
 
-OUString SwXTextGraphicObject::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextGraphicObject::getImplementationName()
 {
     return OUString("SwXTextGraphicObject");
 }
 
-sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames();
     aRet.realloc(aRet.getLength() + 1);
@@ -3453,7 +3431,6 @@ void SAL_CALL SwXTextGraphicObject::operator delete( void * p) throw()
 
 uno::Reference<container::XNameReplace> SAL_CALL
     SwXTextGraphicObject::getEvents()
-        throw(uno::RuntimeException, std::exception)
 {
     return new SwFrameEventDescriptor( *this );
 }
@@ -3481,14 +3458,13 @@ SwXTextEmbeddedObject::CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat *co
     return CreateXFrame<text::XTextContent, SwXTextEmbeddedObject>(rDoc, pFrameFormat);
 }
 
-uno::Reference< lang::XComponent >  SwXTextEmbeddedObject::getEmbeddedObject() throw( uno::RuntimeException, std::exception )
+uno::Reference< lang::XComponent >  SwXTextEmbeddedObject::getEmbeddedObject()
 {
     uno::Reference<embed::XEmbeddedObject> xObj(getExtendedControlOverEmbeddedObject());
     return xObj.is() ? uno::Reference<lang::XComponent>(xObj->getComponent(), uno::UNO_QUERY) : nullptr;
 }
 
 uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExtendedControlOverEmbeddedObject()
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Reference< embed::XEmbeddedObject > xResult;
     SwFrameFormat*   pFormat = GetFrameFormat();
@@ -3522,7 +3498,7 @@ uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExte
     return xResult;
 }
 
-sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() throw (uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect()
 {
     SwFrameFormat*   pFormat = GetFrameFormat();
     if(pFormat)
@@ -3539,7 +3515,7 @@ sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() throw (uno::RuntimeExcepti
     return embed::Aspects::MSOLE_CONTENT; // return the default value
 }
 
-void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect )
 {
     SwFrameFormat*   pFormat = GetFrameFormat();
     if(pFormat)
@@ -3554,7 +3530,7 @@ void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect ) throw (uno::
     }
 }
 
-uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplacementGraphic() throw (uno::RuntimeException, std::exception)
+uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplacementGraphic()
 {
     SwFrameFormat*   pFormat = GetFrameFormat();
     if(pFormat)
@@ -3573,18 +3549,17 @@ uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplaceme
     return uno::Reference< graphic::XGraphic >();
 }
 
-OUString SwXTextEmbeddedObject::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextEmbeddedObject::getImplementationName()
 {
     return OUString("SwXTextEmbeddedObject");
 }
 
-sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames()
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames();
     aRet.realloc(aRet.getLength() + 1);
@@ -3605,7 +3580,6 @@ void SAL_CALL SwXTextEmbeddedObject::operator delete( void * p) throw()
 
 uno::Reference<container::XNameReplace> SAL_CALL
     SwXTextEmbeddedObject::getEvents()
-        throw(uno::RuntimeException, std::exception)
 {
     return new SwFrameEventDescriptor( *this );
 }
@@ -3621,7 +3595,6 @@ SwXOLEListener::~SwXOLEListener()
 {}
 
 void SwXOLEListener::modified( const lang::EventObject& /*rEvent*/ )
-                                        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -3653,7 +3626,6 @@ void SwXOLEListener::modified( const lang::EventObject& /*rEvent*/ )
 }
 
 void SwXOLEListener::disposing( const lang::EventObject& rEvent )
-                        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 5b3ecbddbe4e..eb6e30b76db3 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -174,14 +174,13 @@ const uno::Sequence< sal_Int8 > & SwXFootnote::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXFootnote::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     const sal_Int64 nRet( ::sw::UnoTunnelImpl<SwXFootnote>(rId, this) );
     return (nRet) ? nRet : SwXText::getSomething(rId);
 }
 
 OUString SAL_CALL
-SwXFootnote::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXFootnote::getImplementationName()
 {
     return OUString("SwXFootnote");
 }
@@ -199,13 +198,12 @@ static const size_t g_nServicesEndnote( SAL_N_ELEMENTS(g_ServicesFootnote) );
 static const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit!
 
 sal_Bool SAL_CALL SwXFootnote::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXFootnote::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXFootnote::getSupportedServiceNames()
 {
     SolarMutexGuard g;
     return ::sw::GetSupportedServiceNamesImpl(
@@ -214,7 +212,7 @@ SwXFootnote::getSupportedServiceNames() throw (uno::RuntimeException, std::excep
 }
 
 uno::Sequence< uno::Type > SAL_CALL
-SwXFootnote::getTypes() throw (uno::RuntimeException, std::exception)
+SwXFootnote::getTypes()
 {
     const uno::Sequence< uno::Type > aTypes = SwXFootnote_Base::getTypes();
     const uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes();
@@ -222,14 +220,13 @@ SwXFootnote::getTypes() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL
-SwXFootnote::getImplementationId() throw (uno::RuntimeException, std::exception)
+SwXFootnote::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 uno::Any SAL_CALL
 SwXFootnote::queryInterface(const uno::Type& rType)
-throw (uno::RuntimeException, std::exception)
 {
     const uno::Any ret = SwXFootnote_Base::queryInterface(rType);
     return (ret.getValueType() == cppu::UnoType<void>::get())
@@ -237,7 +234,7 @@ throw (uno::RuntimeException, std::exception)
         :   ret;
 }
 
-OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXFootnote::getLabel()
 {
     SolarMutexGuard aGuard;
 
@@ -259,7 +256,7 @@ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException, std::exc
 }
 
 void SAL_CALL
-SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException, std::exception)
+SwXFootnote::setLabel(const OUString& aLabel)
 {
     SolarMutexGuard aGuard;
     OUString newLabel(aLabel);
@@ -290,7 +287,6 @@ SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException, std:
 
 void SAL_CALL
 SwXFootnote::attach(const uno::Reference< text::XTextRange > & xTextRange)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -357,7 +353,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXFootnote::getAnchor() throw (uno::RuntimeException, std::exception)
+SwXFootnote::getAnchor()
 {
     SolarMutexGuard aGuard;
 
@@ -373,7 +369,7 @@ SwXFootnote::getAnchor() throw (uno::RuntimeException, std::exception)
     return xRet;
 }
 
-void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXFootnote::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -390,7 +386,6 @@ void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException, std::exceptio
 void SAL_CALL
 SwXFootnote::addEventListener(
     const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -399,7 +394,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXFootnote::removeEventListener(
     const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
@@ -420,13 +414,13 @@ const SwStartNode *SwXFootnote::GetStartNode() const
 }
 
 uno::Reference< text::XTextCursor >
-SwXFootnote::CreateCursor() throw (uno::RuntimeException)
+SwXFootnote::CreateCursor()
 {
     return createTextCursor();
 }
 
 uno::Reference< text::XTextCursor > SAL_CALL
-SwXFootnote::createTextCursor() throw (uno::RuntimeException, std::exception)
+SwXFootnote::createTextCursor()
 {
     SolarMutexGuard aGuard;
 
@@ -446,7 +440,6 @@ SwXFootnote::createTextCursor() throw (uno::RuntimeException, std::exception)
 uno::Reference< text::XTextCursor > SAL_CALL
 SwXFootnote::createTextCursorByRange(
     const uno::Reference< text::XTextRange > & xTextPosition)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -475,7 +468,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-SwXFootnote::createEnumeration() throw (uno::RuntimeException, std::exception)
+SwXFootnote::createEnumeration()
 {
     SolarMutexGuard aGuard;
 
@@ -488,19 +481,18 @@ SwXFootnote::createEnumeration() throw (uno::RuntimeException, std::exception)
     return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_FOOTNOTE);
 }
 
-uno::Type SAL_CALL SwXFootnote::getElementType() throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SwXFootnote::getElementType()
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SAL_CALL SwXFootnote::hasElements() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXFootnote::hasElements()
 {
     return true;
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 SwXFootnote::getPropertySetInfo()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     static uno::Reference< beans::XPropertySetInfo > xRet =
@@ -511,9 +503,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL
 SwXFootnote::setPropertyValue(const OUString&, const uno::Any&)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-        lang::IllegalArgumentException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     //no values to be set
     throw lang::IllegalArgumentException();
@@ -521,8 +510,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
 uno::Any SAL_CALL
 SwXFootnote::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -562,8 +549,6 @@ void SAL_CALL
 SwXFootnote::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXFootnote::addPropertyChangeListener(): not implemented");
 }
@@ -572,8 +557,6 @@ void SAL_CALL
 SwXFootnote::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXFootnote::removePropertyChangeListener(): not implemented");
 }
@@ -582,8 +565,6 @@ void SAL_CALL
 SwXFootnote::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXFootnote::addVetoableChangeListener(): not implemented");
 }
@@ -592,8 +573,6 @@ void SAL_CALL
 SwXFootnote::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXFootnote::removeVetoableChangeListener(): not implemented");
 }
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index a25780a4e67d..c06361dfed3b 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -67,7 +67,7 @@ using namespace ::com::sun::star;
 
 /// @throws lang::IllegalArgumentException
 static OUString
-lcl_AnyToString(uno::Any const& rVal) throw (lang::IllegalArgumentException)
+lcl_AnyToString(uno::Any const& rVal)
 {
     OUString sRet;
     if(!(rVal >>= sRet))
@@ -79,7 +79,7 @@ lcl_AnyToString(uno::Any const& rVal) throw (lang::IllegalArgumentException)
 
 /// @throws lang::IllegalArgumentException
 static sal_Int16
-lcl_AnyToInt16(uno::Any const& rVal) throw (lang::IllegalArgumentException)
+lcl_AnyToInt16(uno::Any const& rVal)
 {
     sal_Int16 nRet = 0;
     if(!(rVal >>= nRet))
@@ -91,7 +91,7 @@ lcl_AnyToInt16(uno::Any const& rVal) throw (lang::IllegalArgumentException)
 
 /// @throws lang::IllegalArgumentException
 static bool
-lcl_AnyToBool(uno::Any const& rVal) throw (lang::IllegalArgumentException)
+lcl_AnyToBool(uno::Any const& rVal)
 {
     bool bRet = false;
     if(!(rVal >>= bRet))
@@ -105,7 +105,6 @@ lcl_AnyToBool(uno::Any const& rVal) throw (lang::IllegalArgumentException)
 template<typename T>
 void lcl_AnyToBitMask(uno::Any const& rValue,
         T & rBitMask, const T nBit)
-throw (lang::IllegalArgumentException)
 {
     rBitMask = lcl_AnyToBool(rValue)
         ? (rBitMask |  nBit)
@@ -203,29 +202,23 @@ public:
     explicit StyleAccess_Impl(SwXDocumentIndex& rParentIdx);
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService(const OUString& rServiceName)
-        throw (uno::RuntimeException, std::exception) override;
+        supportsService(const OUString& rServiceName) override;
     virtual uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex)
-        throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-                uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     // XIndexReplace
     virtual void SAL_CALL
-        replaceByIndex(sal_Int32 Index, const uno::Any& rElement)
-        throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
-                lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+        replaceByIndex(sal_Int32 Index, const uno::Any& rElement) override;
 
 };
 
@@ -249,29 +242,23 @@ public:
     explicit TokenAccess_Impl(SwXDocumentIndex& rParentIdx);
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL
-        supportsService(const OUString& rServiceName)
-        throw (uno::RuntimeException, std::exception) override;
+        supportsService(const OUString& rServiceName) override;
     virtual uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex)
-        throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-                uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     // XIndexReplace
     virtual void SAL_CALL
-        replaceByIndex(sal_Int32 Index, const uno::Any& rElement)
-        throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
-                lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+        replaceByIndex(sal_Int32 Index, const uno::Any& rElement) override;
 
 };
 
@@ -459,26 +446,24 @@ const uno::Sequence< sal_Int8 > & SwXDocumentIndex::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXDocumentIndex::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXDocumentIndex>(rId, this);
 }
 
 OUString SAL_CALL
-SwXDocumentIndex::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndex::getImplementationName()
 {
     return OUString("SwXDocumentIndex");
 }
 
 sal_Bool SAL_CALL
 SwXDocumentIndex::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXDocumentIndex::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndex::getSupportedServiceNames()
 {
     SolarMutexGuard g;
 
@@ -513,7 +498,6 @@ SwXDocumentIndex::getSupportedServiceNames() throw (uno::RuntimeException, std::
 }
 
 OUString SAL_CALL SwXDocumentIndex::getServiceName()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -538,13 +522,13 @@ throw (uno::RuntimeException, std::exception)
     return SwXServiceProvider::GetProviderName(nObjectType);
 }
 
-void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXDocumentIndex::update()
 {
     return refresh(); // update is from deprecated XDocumentIndex
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
-SwXDocumentIndex::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndex::getPropertySetInfo()
 {
     SolarMutexGuard g;
 
@@ -556,9 +540,6 @@ SwXDocumentIndex::getPropertySetInfo() throw (uno::RuntimeException, std::except
 void SAL_CALL
 SwXDocumentIndex::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -891,8 +872,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
 uno::Any SAL_CALL
 SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1224,8 +1203,6 @@ void SAL_CALL
 SwXDocumentIndex::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXDocumentIndex::addPropertyChangeListener(): not implemented");
 }
@@ -1234,8 +1211,6 @@ void SAL_CALL
 SwXDocumentIndex::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXDocumentIndex::removePropertyChangeListener(): not implemented");
 }
@@ -1244,8 +1219,6 @@ void SAL_CALL
 SwXDocumentIndex::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXDocumentIndex::addVetoableChangeListener(): not implemented");
 }
@@ -1254,8 +1227,6 @@ void SAL_CALL
 SwXDocumentIndex::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXDocumentIndex::removeVetoableChangeListener(): not implemented");
 }
@@ -1281,7 +1252,7 @@ void lcl_CalcLayout(SwDoc *pDoc)
 }
 
 // XRefreshable
-void SAL_CALL SwXDocumentIndex::refresh() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXDocumentIndex::refresh()
 {
     {
         SolarMutexGuard g;
@@ -1316,7 +1287,6 @@ void SAL_CALL SwXDocumentIndex::refresh() throw (uno::RuntimeException, std::exc
 
 void SAL_CALL SwXDocumentIndex::addRefreshListener(
         const uno::Reference<util::XRefreshListener>& xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_Listeners.addInterface(
@@ -1325,7 +1295,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXDocumentIndex::removeRefreshListener(
         const uno::Reference<util::XRefreshListener>& xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_Listeners.removeInterface(
@@ -1334,7 +1303,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL
 SwXDocumentIndex::attach(const uno::Reference< text::XTextRange > & xTextRange)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1395,7 +1363,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXDocumentIndex::getAnchor() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndex::getAnchor()
 {
     SolarMutexGuard aGuard;
 
@@ -1420,7 +1388,7 @@ SwXDocumentIndex::getAnchor() throw (uno::RuntimeException, std::exception)
     return xRet;
 }
 
-void SAL_CALL SwXDocumentIndex::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXDocumentIndex::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -1436,7 +1404,6 @@ void SAL_CALL SwXDocumentIndex::dispose() throw (uno::RuntimeException, std::exc
 void SAL_CALL
 SwXDocumentIndex::addEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_Listeners.addInterface(
@@ -1446,14 +1413,13 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXDocumentIndex::removeEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_Listeners.removeInterface(
             cppu::UnoType<lang::XEventListener>::get(), xListener);
 }
 
-OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXDocumentIndex::getName()
 {
     SolarMutexGuard g;
 
@@ -1475,7 +1441,7 @@ OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException, std:
 }
 
 void SAL_CALL
-SwXDocumentIndex::setName(const OUString& rName) throw (uno::RuntimeException, std::exception)
+SwXDocumentIndex::setName(const OUString& rName)
 {
     SolarMutexGuard g;
 
@@ -1716,25 +1682,23 @@ const uno::Sequence< sal_Int8 > & SwXDocumentIndexMark::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXDocumentIndexMark::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXDocumentIndexMark>(rId, this);
 }
 
 OUString SAL_CALL
-SwXDocumentIndexMark::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexMark::getImplementationName()
 {
     return OUString("SwXDocumentIndexMark");
 }
 
 sal_Bool SAL_CALL SwXDocumentIndexMark::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXDocumentIndexMark::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexMark::getSupportedServiceNames()
 {
     SolarMutexGuard g;
 
@@ -1763,7 +1727,7 @@ SwXDocumentIndexMark::getSupportedServiceNames() throw (uno::RuntimeException, s
 }
 
 OUString SAL_CALL
-SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexMark::getMarkEntry()
 {
     SolarMutexGuard aGuard;
 
@@ -1786,7 +1750,6 @@ SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException, std::exceptio
 
 void SAL_CALL
 SwXDocumentIndexMark::setMarkEntry(const OUString& rIndexEntry)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1821,7 +1784,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXDocumentIndexMark::attach(
         const uno::Reference< text::XTextRange > & xTextRange)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2034,7 +1996,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark(
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXDocumentIndexMark::getAnchor() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexMark::getAnchor()
 {
     SolarMutexGuard aGuard;
 
@@ -2068,7 +2030,7 @@ SwXDocumentIndexMark::getAnchor() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-SwXDocumentIndexMark::dispose() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexMark::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -2082,7 +2044,6 @@ SwXDocumentIndexMark::dispose() throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXDocumentIndexMark::addEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -2091,14 +2052,13 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXDocumentIndexMark::removeEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
-SwXDocumentIndexMark::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexMark::getPropertySetInfo()
 {
     SolarMutexGuard g;
 
@@ -2129,9 +2089,6 @@ SwXDocumentIndexMark::getPropertySetInfo() throw (uno::RuntimeException, std::ex
 void SAL_CALL
 SwXDocumentIndexMark::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2277,8 +2234,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
 uno::Any SAL_CALL
 SwXDocumentIndexMark::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2394,8 +2349,6 @@ void SAL_CALL
 SwXDocumentIndexMark::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXDocumentIndexMark::addPropertyChangeListener(): not implemented");
 }
@@ -2404,8 +2357,6 @@ void SAL_CALL
 SwXDocumentIndexMark::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXDocumentIndexMark::removePropertyChangeListener(): not implemented");
 }
@@ -2414,8 +2365,6 @@ void SAL_CALL
 SwXDocumentIndexMark::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXDocumentIndexMark::addVetoableChangeListener(): not implemented");
 }
@@ -2424,8 +2373,6 @@ void SAL_CALL
 SwXDocumentIndexMark::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXDocumentIndexMark::removeVetoableChangeListener(): not implemented");
 }
@@ -2440,7 +2387,7 @@ SwXDocumentIndexes::~SwXDocumentIndexes()
 }
 
 OUString SAL_CALL
-SwXDocumentIndexes::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexes::getImplementationName()
 {
     return OUString("SwXDocumentIndexes");
 }
@@ -2451,20 +2398,19 @@ static char const*const g_ServicesDocumentIndexes[] =
 };
 
 sal_Bool SAL_CALL SwXDocumentIndexes::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXDocumentIndexes::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexes::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(
         SAL_N_ELEMENTS(g_ServicesDocumentIndexes), g_ServicesDocumentIndexes);
 }
 
 sal_Int32 SAL_CALL
-SwXDocumentIndexes::getCount() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexes::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -2487,8 +2433,6 @@ SwXDocumentIndexes::getCount() throw (uno::RuntimeException, std::exception)
 
 uno::Any SAL_CALL
 SwXDocumentIndexes::getByIndex(sal_Int32 nIndex)
-throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2519,8 +2463,6 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
 
 uno::Any SAL_CALL
 SwXDocumentIndexes::getByName(const OUString& rName)
-throw (container::NoSuchElementException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2548,7 +2490,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException,
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexes::getElementNames()
 {
     SolarMutexGuard aGuard;
 
@@ -2584,7 +2526,6 @@ SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException, std::excepti
 
 sal_Bool SAL_CALL
 SwXDocumentIndexes::hasByName(const OUString& rName)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2609,13 +2550,13 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Type SAL_CALL
-SwXDocumentIndexes::getElementType() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexes::getElementType()
 {
     return cppu::UnoType<text::XDocumentIndex>::get();
 }
 
 sal_Bool SAL_CALL
-SwXDocumentIndexes::hasElements() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndexes::hasElements()
 {
     return 0 != getCount();
 }
@@ -2632,7 +2573,6 @@ SwXDocumentIndex::StyleAccess_Impl::~StyleAccess_Impl()
 
 OUString SAL_CALL
 SwXDocumentIndex::StyleAccess_Impl::getImplementationName()
-throw (uno::RuntimeException, std::exception)
 {
     return OUString("SwXDocumentIndex::StyleAccess_Impl");
 }
@@ -2644,14 +2584,12 @@ static char const*const g_ServicesIndexStyleAccess[] =
 
 sal_Bool SAL_CALL
 SwXDocumentIndex::StyleAccess_Impl::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
 SwXDocumentIndex::StyleAccess_Impl::getSupportedServiceNames()
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::GetSupportedServiceNamesImpl(
         SAL_N_ELEMENTS(g_ServicesIndexStyleAccess),
@@ -2661,8 +2599,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXDocumentIndex::StyleAccess_Impl::replaceByIndex(
         sal_Int32 nIndex, const uno::Any& rElement)
-throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2697,15 +2633,13 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
 }
 
 sal_Int32 SAL_CALL
-SwXDocumentIndex::StyleAccess_Impl::getCount() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndex::StyleAccess_Impl::getCount()
 {
     return MAXLEVEL;
 }
 
 uno::Any SAL_CALL
 SwXDocumentIndex::StyleAccess_Impl::getByIndex(sal_Int32 nIndex)
-throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2738,13 +2672,12 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
 
 uno::Type SAL_CALL
 SwXDocumentIndex::StyleAccess_Impl::getElementType()
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<uno::Sequence<OUString>>::get();
 }
 
 sal_Bool SAL_CALL
-SwXDocumentIndex::StyleAccess_Impl::hasElements() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndex::StyleAccess_Impl::hasElements()
 {
     return true;
 }
@@ -2761,7 +2694,6 @@ SwXDocumentIndex::TokenAccess_Impl::~TokenAccess_Impl()
 
 OUString SAL_CALL
 SwXDocumentIndex::TokenAccess_Impl::getImplementationName()
-throw (uno::RuntimeException, std::exception)
 {
     return OUString("SwXDocumentIndex::TokenAccess_Impl");
 }
@@ -2773,14 +2705,12 @@ static char const*const g_ServicesIndexTokenAccess[] =
 
 sal_Bool SAL_CALL SwXDocumentIndex::TokenAccess_Impl::supportsService(
         const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
 SwXDocumentIndex::TokenAccess_Impl::getSupportedServiceNames()
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::GetSupportedServiceNamesImpl(
             SAL_N_ELEMENTS(g_ServicesIndexTokenAccess),
@@ -2809,8 +2739,6 @@ static const struct TokenType_ g_TokenTypes[] =
 void SAL_CALL
 SwXDocumentIndex::TokenAccess_Impl::replaceByIndex(
         sal_Int32 nIndex, const uno::Any& rElement)
-throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
-        lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2989,7 +2917,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
 }
 
 sal_Int32 SAL_CALL
-SwXDocumentIndex::TokenAccess_Impl::getCount() throw (uno::RuntimeException, std::exception)
+SwXDocumentIndex::TokenAccess_Impl::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -2999,8 +2927,6 @@ SwXDocumentIndex::TokenAccess_Impl::getCount() throw (uno::RuntimeException, std
 
 uno::Any SAL_CALL
 SwXDocumentIndex::TokenAccess_Impl::getByIndex(sal_Int32 nIndex)
-throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3250,14 +3176,12 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
 
 uno::Type SAL_CALL
 SwXDocumentIndex::TokenAccess_Impl::getElementType()
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::UnoType<uno::Sequence< beans::PropertyValues >>::get();
 }
 
 sal_Bool SAL_CALL
 SwXDocumentIndex::TokenAccess_Impl::hasElements()
-throw (uno::RuntimeException, std::exception)
 {
     return true;
 }
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index d11c866405c4..8d0a03eb20b8 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -210,7 +210,6 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer)
 /// @throws uno::RuntimeException
 static void
 lcl_setCharStyle(SwDoc *const pDoc, const uno::Any & rValue, SfxItemSet & rSet)
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SwDocShell *const pDocSh = pDoc->GetDocShell();
     if(pDocSh)
@@ -238,7 +237,6 @@ lcl_setCharStyle(SwDoc *const pDoc, const uno::Any & rValue, SfxItemSet & rSet)
 static void
 lcl_setAutoStyle(IStyleAccess & rStyleAccess, const uno::Any & rValue,
         SfxItemSet & rSet, const bool bPara)
-throw (lang::IllegalArgumentException)
 {
     OUString uStyle;
     if (!(rValue >>= uStyle))
@@ -264,7 +262,6 @@ throw (lang::IllegalArgumentException)
 
 void
 SwUnoCursorHelper::SetTextFormatColl(const uno::Any & rAny, SwPaM & rPaM)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SwDoc *const pDoc = rPaM.GetDoc();
     SwDocShell *const pDocSh = pDoc->GetDocShell();
@@ -477,8 +474,6 @@ bool
 SwUnoCursorHelper::SetCursorPropertyValue(
         SfxItemPropertySimpleEntry const& rEntry, const uno::Any& rValue,
         SwPaM & rPam, SfxItemSet & rItemSet)
-throw (lang::IllegalArgumentException, uno::RuntimeException,
-       uno::DeploymentException, std::exception)
 {
     if (!(rEntry.nFlags & beans::PropertyAttribute::MAYBEVOID) &&
         (rValue.getValueType() == cppu::UnoType<void>::get()))
@@ -837,7 +832,7 @@ bool SwXTextCursor::IsAtEndOfMeta() const
     return false;
 }
 
-OUString SwXTextCursor::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString SwXTextCursor::getImplementationName()
 {
     return OUString("SwXTextCursor");
 }
@@ -857,13 +852,12 @@ static char const*const g_ServicesTextCursor[] =
 static const size_t g_nServicesTextCursor(SAL_N_ELEMENTS(g_ServicesTextCursor));
 
 sal_Bool SAL_CALL SwXTextCursor::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXTextCursor::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(
             g_nServicesTextCursor, g_ServicesTextCursor);
@@ -881,13 +875,12 @@ const uno::Sequence< sal_Int8 > & SwXTextCursor::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXTextCursor::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     const sal_Int64 nRet( ::sw::UnoTunnelImpl<SwXTextCursor>(rId, this) );
     return (nRet) ? nRet : OTextCursorHelper::getSomething(rId);
 }
 
-void SAL_CALL SwXTextCursor::collapseToStart() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCursor::collapseToStart()
 {
     SolarMutexGuard aGuard;
 
@@ -903,7 +896,7 @@ void SAL_CALL SwXTextCursor::collapseToStart() throw (uno::RuntimeException, std
     }
 }
 
-void SAL_CALL SwXTextCursor::collapseToEnd() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCursor::collapseToEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -919,7 +912,7 @@ void SAL_CALL SwXTextCursor::collapseToEnd() throw (uno::RuntimeException, std::
     }
 }
 
-sal_Bool SAL_CALL SwXTextCursor::isCollapsed() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextCursor::isCollapsed()
 {
     SolarMutexGuard aGuard;
 
@@ -934,7 +927,6 @@ sal_Bool SAL_CALL SwXTextCursor::isCollapsed() throw (uno::RuntimeException, std
 
 sal_Bool SAL_CALL
 SwXTextCursor::goLeft(sal_Int16 nCount, sal_Bool Expand)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -953,7 +945,6 @@ throw (uno::RuntimeException, std::exception)
 
 sal_Bool SAL_CALL
 SwXTextCursor::goRight(sal_Int16 nCount, sal_Bool Expand)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -971,7 +962,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoStart(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1027,7 +1018,7 @@ SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException, std::exc
 }
 
 void SAL_CALL
-SwXTextCursor::gotoEnd(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoEnd(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1056,7 +1047,6 @@ SwXTextCursor::gotoEnd(sal_Bool Expand) throw (uno::RuntimeException, std::excep
 void SAL_CALL
 SwXTextCursor::gotoRange(
     const uno::Reference< text::XTextRange > & xRange, sal_Bool bExpand)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1199,7 +1189,7 @@ throw (uno::RuntimeException, std::exception)
     }
 }
 
-sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextCursor::isStartOfWord()
 {
     SolarMutexGuard aGuard;
 
@@ -1210,7 +1200,7 @@ sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException, s
     return bRet;
 }
 
-sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextCursor::isEndOfWord()
 {
     SolarMutexGuard aGuard;
 
@@ -1222,7 +1212,7 @@ sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException, std
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoNextWord(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1269,7 +1259,7 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std::
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoPreviousWord(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1309,7 +1299,7 @@ SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException, s
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoEndOfWord(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1345,7 +1335,7 @@ SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException, std:
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoStartOfWord(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1381,7 +1371,7 @@ SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException, st
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::isStartOfSentence()
 {
     SolarMutexGuard aGuard;
 
@@ -1404,7 +1394,7 @@ SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::isEndOfSentence()
 {
     SolarMutexGuard aGuard;
 
@@ -1428,7 +1418,7 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoNextSentence(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1464,7 +1454,6 @@ SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException, s
 
 sal_Bool SAL_CALL
 SwXTextCursor::gotoPreviousSentence(sal_Bool Expand)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1493,7 +1482,6 @@ throw (uno::RuntimeException, std::exception)
 
 sal_Bool SAL_CALL
 SwXTextCursor::gotoStartOfSentence(sal_Bool Expand)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1516,7 +1504,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoEndOfSentence(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1540,7 +1528,7 @@ SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException,
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::isStartOfParagraph()
 {
     SolarMutexGuard aGuard;
 
@@ -1551,7 +1539,7 @@ SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException, std::exception
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::isEndOfParagraph() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::isEndOfParagraph()
 {
     SolarMutexGuard aGuard;
 
@@ -1563,7 +1551,6 @@ SwXTextCursor::isEndOfParagraph() throw (uno::RuntimeException, std::exception)
 
 sal_Bool SAL_CALL
 SwXTextCursor::gotoStartOfParagraph(sal_Bool Expand)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1588,7 +1575,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1613,7 +1600,7 @@ SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException,
 }
 
 sal_Bool SAL_CALL
-SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::gotoNextParagraph(sal_Bool Expand)
 {
     SolarMutexGuard aGuard;
 
@@ -1630,7 +1617,6 @@ SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException,
 
 sal_Bool SAL_CALL
 SwXTextCursor::gotoPreviousParagraph(sal_Bool Expand)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1646,7 +1632,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XText > SAL_CALL
-SwXTextCursor::getText() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::getText()
 {
     SolarMutexGuard g;
 
@@ -1654,7 +1640,7 @@ SwXTextCursor::getText() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXTextCursor::getStart() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::getStart()
 {
     SolarMutexGuard aGuard;
 
@@ -1680,7 +1666,7 @@ SwXTextCursor::getStart() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXTextCursor::getEnd() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::getEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -1705,7 +1691,7 @@ SwXTextCursor::getEnd() throw (uno::RuntimeException, std::exception)
     return xRet;
 }
 
-OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXTextCursor::getString()
 {
     SolarMutexGuard aGuard;
 
@@ -1717,7 +1703,7 @@ OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException, std::
 }
 
 void SAL_CALL
-SwXTextCursor::setString(const OUString& aString) throw (uno::RuntimeException, std::exception)
+SwXTextCursor::setString(const OUString& aString)
 {
     SolarMutexGuard aGuard;
 
@@ -1733,8 +1719,6 @@ SwXTextCursor::setString(const OUString& aString) throw (uno::RuntimeException,
 uno::Any SwUnoCursorHelper::GetPropertyValue(
     SwPaM& rPaM, const SfxItemPropertySet& rPropSet,
     const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     uno::Any aAny;
     SfxItemPropertySimpleEntry const*const pEntry =
@@ -1771,9 +1755,6 @@ void SwUnoCursorHelper::SetPropertyValue(
     const OUString& rPropertyName,
     const uno::Any& rValue,
     const SetAttrMode nAttrMode)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-        lang::IllegalArgumentException, lang::WrappedTargetException,
-        uno::RuntimeException)
 {
     uno::Sequence< beans::PropertyValue > aValues(1);
     aValues[0].Name = rPropertyName;
@@ -1797,9 +1778,6 @@ void SwUnoCursorHelper::SetPropertyValues(
     SwPaM& rPaM, const SfxItemPropertySet& rPropSet,
     const uno::Sequence< beans::PropertyValue > &rPropertyValues,
     const SetAttrMode nAttrMode, const bool bTableMode)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-        lang::IllegalArgumentException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     if (!rPropertyValues.getLength())
         return;
@@ -1877,7 +1855,6 @@ SwUnoCursorHelper::GetPropertyStates(
             SwPaM& rPaM, const SfxItemPropertySet& rPropSet,
             const uno::Sequence< OUString >& rPropertyNames,
             const SwGetPropertyStatesCaller eCaller)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     const OUString* pNames = rPropertyNames.getConstArray();
     uno::Sequence< beans::PropertyState > aRet(rPropertyNames.getLength());
@@ -1986,7 +1963,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 beans::PropertyState SwUnoCursorHelper::GetPropertyState(
     SwPaM& rPaM, const SfxItemPropertySet& rPropSet,
     const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     uno::Sequence< OUString > aStrings { rPropertyName };
     uno::Sequence< beans::PropertyState > aSeq =
@@ -2020,7 +1996,6 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc,
 void SwUnoCursorHelper::SetPropertyToDefault(
     SwPaM& rPaM, const SfxItemPropertySet& rPropSet,
     const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SwDoc & rDoc = *rPaM.GetDoc();
     SfxItemPropertySimpleEntry const*const pEntry =
@@ -2061,8 +2036,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 uno::Any SwUnoCursorHelper::GetPropertyDefault(
     SwPaM& rPaM, const SfxItemPropertySet& rPropSet,
     const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException)
 {
     SfxItemPropertySimpleEntry const*const pEntry =
         rPropSet.getPropertyMap().getByName(rPropertyName);
@@ -2084,7 +2057,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
-SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::getPropertySetInfo()
 {
     SolarMutexGuard g;
 
@@ -2111,9 +2084,6 @@ SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException, std::exception
 void SAL_CALL
 SwXTextCursor::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-        lang::IllegalArgumentException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2146,8 +2116,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
 uno::Any SAL_CALL
 SwXTextCursor::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2176,8 +2144,6 @@ void SAL_CALL
 SwXTextCursor::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextCursor::addPropertyChangeListener(): not implemented");
 }
@@ -2186,8 +2152,6 @@ void SAL_CALL
 SwXTextCursor::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextCursor::removePropertyChangeListener(): not implemented");
 }
@@ -2196,8 +2160,6 @@ void SAL_CALL
 SwXTextCursor::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextCursor::addVetoableChangeListener(): not implemented");
 }
@@ -2206,15 +2168,12 @@ void SAL_CALL
 SwXTextCursor::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextCursor::removeVetoableChangeListener(): not implemented");
 }
 
 beans::PropertyState SAL_CALL
 SwXTextCursor::getPropertyState(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2228,7 +2187,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 uno::Sequence< beans::PropertyState > SAL_CALL
 SwXTextCursor::getPropertyStates(
         const uno::Sequence< OUString >& rPropertyNames)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2240,7 +2198,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
 void SAL_CALL
 SwXTextCursor::setPropertyToDefault(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     // forward: need no solar mutex here
     uno::Sequence < OUString > aSequence ( &rPropertyName, 1 );
@@ -2249,8 +2206,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
 uno::Any SAL_CALL
 SwXTextCursor::getPropertyDefault(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     // forward: need no solar mutex here
     const uno::Sequence < OUString > aSequence ( &rPropertyName, 1 );
@@ -2260,9 +2215,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 void SAL_CALL SwXTextCursor::setPropertyValues(
     const uno::Sequence< OUString >& aPropertyNames,
     const uno::Sequence< uno::Any >& aValues )
-    throw (
-        css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     if( aValues.getLength() != aPropertyNames.getLength() )
     {
@@ -2303,7 +2255,6 @@ void SAL_CALL SwXTextCursor::setPropertyValues(
 
 uno::Sequence< uno::Any > SAL_CALL
 SwXTextCursor::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames )
-    throw (css::uno::RuntimeException, std::exception)
 {
     // a banal implementation for now
     uno::Sequence< uno::Any > aValues( aPropertyNames.getLength() );
@@ -2315,13 +2266,11 @@ SwXTextCursor::getPropertyValues( const uno::Sequence< OUString >& aPropertyName
 void SAL_CALL SwXTextCursor::addPropertiesChangeListener(
         const uno::Sequence< OUString >& /* aPropertyNames */,
         const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ )
-    throw (css::uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextCursor::addPropertiesChangeListener(): not implemented");
 }
 void SAL_CALL SwXTextCursor::removePropertiesChangeListener(
         const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ )
-    throw (css::uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextCursor::removePropertiesChangeListener(): not implemented");
 }
@@ -2329,7 +2278,6 @@ void SAL_CALL SwXTextCursor::removePropertiesChangeListener(
 void SAL_CALL SwXTextCursor::firePropertiesChangeEvent(
         const uno::Sequence< OUString >& /* aPropertyNames */,
         const uno::Reference< css::beans::XPropertiesChangeListener >& /* xListener */ )
-    throw (css::uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextCursor::firePropertiesChangeEvent(): not implemented");
 }
@@ -2369,7 +2317,6 @@ lcl_EnumerateIds(sal_uInt16 const* pIdRange, std::set<sal_uInt16> &rWhichIds)
 
 void SAL_CALL
 SwXTextCursor::setAllPropertiesToDefault()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2393,7 +2340,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXTextCursor::setPropertiesToDefault(
         const uno::Sequence< OUString >& rPropertyNames)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2459,8 +2405,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 uno::Sequence< uno::Any > SAL_CALL
 SwXTextCursor::getPropertyDefaults(
         const uno::Sequence< OUString >& rPropertyNames)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2500,7 +2444,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 }
 
 void SAL_CALL SwXTextCursor::invalidateMarkings(::sal_Int32 nType)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2541,7 +2484,6 @@ void SAL_CALL
 SwXTextCursor::makeRedline(
     const OUString& rRedlineType,
     const uno::Sequence< beans::PropertyValue >& rRedlineProperties)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2552,8 +2494,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXTextCursor::insertDocumentFromURL(const OUString& rURL,
     const uno::Sequence< beans::PropertyValue >& rOptions)
-throw (lang::IllegalArgumentException, io::IOException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2634,7 +2574,7 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable)
 }
 
 uno::Sequence< beans::PropertyValue > SAL_CALL
-SwXTextCursor::createSortDescriptor() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::createSortDescriptor()
 {
     SolarMutexGuard aGuard;
 
@@ -2895,7 +2835,6 @@ bool SwUnoCursorHelper::ConvertSortProperties(
 
 void SAL_CALL
 SwXTextCursor::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2939,7 +2878,6 @@ SwXTextCursor::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor)
 
 uno::Reference< container::XEnumeration > SAL_CALL
 SwXTextCursor::createContentEnumeration(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     if (rServiceName != "com.sun.star.text.TextContent")
@@ -2949,7 +2887,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-SwXTextCursor::createEnumeration() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::createEnumeration()
 {
     SolarMutexGuard g;
 
@@ -2985,18 +2923,18 @@ SwXTextCursor::createEnumeration() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Type SAL_CALL
-SwXTextCursor::getElementType() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::getElementType()
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SAL_CALL SwXTextCursor::hasElements() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextCursor::hasElements()
 {
     return true;
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException, std::exception)
+SwXTextCursor::getAvailableServiceNames()
 {
     uno::Sequence<OUString> aRet { "com.sun.star.text.TextContent" };
     return aRet;
@@ -3006,7 +2944,6 @@ IMPLEMENT_FORWARD_REFCOUNT( SwXTextCursor,SwXTextCursor_Base )
 
 uno::Any SAL_CALL
 SwXTextCursor::queryInterface(const uno::Type& rType)
-throw (uno::RuntimeException, std::exception)
 {
     return (rType == cppu::UnoType<lang::XUnoTunnel>::get())
         ? OTextCursorHelper::queryInterface(rType)
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index a0100495b039..8dd372fcf576 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -495,24 +495,23 @@ struct SwXParagraphEnumerationImpl final : public SwXParagraphEnumeration
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
         { return OUString("SwXParagraphEnumeration"); }
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) override
         { return cppu::supportsService(this, rServiceName); };
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
         { return {"com.sun.star.text.ParagraphEnumeration"}; };
 
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
     SwUnoCursor& GetCursor()
         { return *m_pCursor; }
     /// @throws container::NoSuchElementException
     /// @throws lang::WrappedTargetException
     /// @throws uno::RuntimeException
-    uno::Reference< text::XTextContent > NextElement_Impl()
-        throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException);
+    uno::Reference< text::XTextContent > NextElement_Impl();
 };
 
 SwXParagraphEnumeration* SwXParagraphEnumeration::Create(
@@ -526,7 +525,7 @@ SwXParagraphEnumeration* SwXParagraphEnumeration::Create(
 }
 
 sal_Bool SAL_CALL
-SwXParagraphEnumerationImpl::hasMoreElements() throw (uno::RuntimeException, std::exception)
+SwXParagraphEnumerationImpl::hasMoreElements()
 {
     SolarMutexGuard aGuard;
     return m_bFirstParagraph || m_xNextPara.is();
@@ -567,7 +566,7 @@ lcl_CursorIsInSection(
 }
 
 uno::Reference< text::XTextContent >
-SwXParagraphEnumerationImpl::NextElement_Impl() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+SwXParagraphEnumerationImpl::NextElement_Impl()
 {
     SwUnoCursor& rUnoCursor = GetCursor();
 
@@ -660,7 +659,7 @@ SwXParagraphEnumerationImpl::NextElement_Impl() throw (container::NoSuchElementE
     return xRef;
 }
 
-uno::Any SAL_CALL SwXParagraphEnumerationImpl::nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwXParagraphEnumerationImpl::nextElement()
 {
     SolarMutexGuard aGuard;
     if (m_bFirstParagraph)
@@ -803,7 +802,6 @@ void SwXTextRange::SetPositions(const SwPaM& rPam)
 
 void SwXTextRange::DeleteAndInsert(
         const OUString& rText, const bool bForceExpandHints)
-throw (uno::RuntimeException)
 {
     if (RANGE_IS_TABLE == m_pImpl->m_eRangePosition)
     {
@@ -848,13 +846,12 @@ const uno::Sequence< sal_Int8 > & SwXTextRange::getUnoTunnelId()
 // XUnoTunnel
 sal_Int64 SAL_CALL
 SwXTextRange::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXTextRange>(rId, this);
 }
 
 OUString SAL_CALL
-SwXTextRange::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXTextRange::getImplementationName()
 {
     return OUString("SwXTextRange");
 }
@@ -873,20 +870,19 @@ static char const*const g_ServicesTextRange[] =
 static const size_t g_nServicesTextRange(SAL_N_ELEMENTS(g_ServicesTextRange));
 
 sal_Bool SAL_CALL SwXTextRange::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXTextRange::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXTextRange::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(
             g_nServicesTextRange, g_ServicesTextRange);
 }
 
 uno::Reference< text::XText > SAL_CALL
-SwXTextRange::getText() throw (uno::RuntimeException, std::exception)
+SwXTextRange::getText()
 {
     SolarMutexGuard aGuard;
 
@@ -909,7 +905,7 @@ SwXTextRange::getText() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXTextRange::getStart() throw (uno::RuntimeException, std::exception)
+SwXTextRange::getStart()
 {
     SolarMutexGuard aGuard;
 
@@ -937,7 +933,7 @@ SwXTextRange::getStart() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXTextRange::getEnd() throw (uno::RuntimeException, std::exception)
+SwXTextRange::getEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -964,7 +960,7 @@ SwXTextRange::getEnd() throw (uno::RuntimeException, std::exception)
     return xRet;
 }
 
-OUString SAL_CALL SwXTextRange::getString() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXTextRange::getString()
 {
     SolarMutexGuard aGuard;
 
@@ -980,7 +976,6 @@ OUString SAL_CALL SwXTextRange::getString() throw (uno::RuntimeException, std::e
 }
 
 void SAL_CALL SwXTextRange::setString(const OUString& rString)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1238,7 +1233,6 @@ CreateParentXText(SwDoc & rDoc, const SwPosition& rPos)
 
 uno::Reference< container::XEnumeration > SAL_CALL
 SwXTextRange::createContentEnumeration(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1262,7 +1256,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-SwXTextRange::createEnumeration() throw (uno::RuntimeException, std::exception)
+SwXTextRange::createEnumeration()
 {
     SolarMutexGuard g;
 
@@ -1286,25 +1280,25 @@ SwXTextRange::createEnumeration() throw (uno::RuntimeException, std::exception)
     return SwXParagraphEnumeration::Create(m_pImpl->m_xParentText, pNewCursor, eSetType);
 }
 
-uno::Type SAL_CALL SwXTextRange::getElementType() throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SwXTextRange::getElementType()
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SAL_CALL SwXTextRange::hasElements() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextRange::hasElements()
 {
     return true;
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXTextRange::getAvailableServiceNames() throw (uno::RuntimeException, std::exception)
+SwXTextRange::getAvailableServiceNames()
 {
     uno::Sequence<OUString> aRet { "com.sun.star.text.TextContent" };
     return aRet;
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
-SwXTextRange::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+SwXTextRange::getPropertySetInfo()
 {
     SolarMutexGuard aGuard;
 
@@ -1316,9 +1310,6 @@ SwXTextRange::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXTextRange::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-        lang::IllegalArgumentException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1334,8 +1325,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
 uno::Any SAL_CALL
 SwXTextRange::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1353,8 +1342,6 @@ void SAL_CALL
 SwXTextRange::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextRange::addPropertyChangeListener(): not implemented");
 }
@@ -1363,8 +1350,6 @@ void SAL_CALL
 SwXTextRange::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextRange::removePropertyChangeListener(): not implemented");
 }
@@ -1373,8 +1358,6 @@ void SAL_CALL
 SwXTextRange::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextRange::addVetoableChangeListener(): not implemented");
 }
@@ -1383,15 +1366,12 @@ void SAL_CALL
 SwXTextRange::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextRange::removeVetoableChangeListener(): not implemented");
 }
 
 beans::PropertyState SAL_CALL
 SwXTextRange::getPropertyState(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1407,7 +1387,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
 uno::Sequence< beans::PropertyState > SAL_CALL
 SwXTextRange::getPropertyStates(const uno::Sequence< OUString >& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1422,7 +1401,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL SwXTextRange::setPropertyToDefault(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1438,8 +1416,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
 uno::Any SAL_CALL
 SwXTextRange::getPropertyDefault(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1457,7 +1433,6 @@ void SAL_CALL
 SwXTextRange::makeRedline(
     const OUString& rRedlineType,
     const uno::Sequence< beans::PropertyValue >& rRedlineProperties )
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1474,24 +1449,24 @@ struct SwXTextRangesImpl final : public SwXTextRanges
 {
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
         { return OUString("SwXTextRanges"); };
-    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) override
         { return cppu::supportsService(this, rServiceName); };
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
         { return { "com.sun.star.text.TextRanges" }; };
 
     // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Type SAL_CALL getElementType() override
         { return cppu::UnoType<text::XTextRange>::get(); };
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements() override
         { return getCount() > 0; };
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     explicit SwXTextRangesImpl(SwPaM *const pPaM)
     {
@@ -1545,7 +1520,6 @@ const uno::Sequence< sal_Int8 > & SwXTextRanges::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXTextRangesImpl::getSomething(const uno::Sequence< sal_Int8 >& rId)
-    throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXTextRanges>(rId, this);
 }
@@ -1557,13 +1531,12 @@ SwXTextRangesImpl::getSomething(const uno::Sequence< sal_Int8 >& rId)
  */
 
 sal_Int32 SAL_CALL SwXTextRangesImpl::getCount()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return static_cast<sal_Int32>(m_Ranges.size());
 }
 
-uno::Any SAL_CALL SwXTextRangesImpl::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwXTextRangesImpl::getByIndex(sal_Int32 nIndex)
 {
     SolarMutexGuard aGuard;
     if ((nIndex < 0) || (static_cast<size_t>(nIndex) >= m_Ranges.size()))
@@ -1598,16 +1571,16 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString)
 struct SwXParaFrameEnumerationImpl final : public SwXParaFrameEnumeration
 {
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
         { return OUString("SwXParaFrameEnumeration"); };
-    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override
         { return cppu::supportsService(this, rServiceName); };
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
         { return {"com.sun.star.util.ContentEnumeration"}; };
 
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 
     SwXParaFrameEnumerationImpl(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat);
     virtual void SAL_CALL release() throw () override
@@ -1743,7 +1716,7 @@ bool SwXParaFrameEnumerationImpl::CreateNextObject()
 }
 
 sal_Bool SAL_CALL
-SwXParaFrameEnumerationImpl::hasMoreElements() throw (uno::RuntimeException, std::exception)
+SwXParaFrameEnumerationImpl::hasMoreElements()
 {
     SolarMutexGuard aGuard;
     PurgeFrameClients();
@@ -1751,8 +1724,6 @@ SwXParaFrameEnumerationImpl::hasMoreElements() throw (uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL SwXParaFrameEnumerationImpl::nextElement()
-throw (container::NoSuchElementException,
-        lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     PurgeFrameClients();
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 1dc1a8fa84a5..c0dc4ae01677 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -100,8 +100,7 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
                             const SwTextNode& rTextNode,
                             const SwAttrSet** ppSet,
                             const SfxItemPropertySimpleEntry& rEntry,
-                            bool &rAttrSetFetched )
-    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception);
+                            bool &rAttrSetFetched );
 
 class SwXParagraph::Impl
     : public SwClient
@@ -156,34 +155,27 @@ public:
     /// @throws uno::RuntimeException
     void SetPropertyValues_Impl(
             const uno::Sequence< OUString >& rPropertyNames,
-            const uno::Sequence< uno::Any >& rValues)
-        throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-                lang::IllegalArgumentException, lang::WrappedTargetException,
-                uno::RuntimeException);
+            const uno::Sequence< uno::Any >& rValues);
 
     /// @throws beans::UnknownPropertyException
     /// @throws lang::WrappedTargetException
     /// @throws uno::RuntimeException
     uno::Sequence< uno::Any >
         GetPropertyValues_Impl(
-            const uno::Sequence< OUString >& rPropertyNames)
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-                uno::RuntimeException, std::exception);
+            const uno::Sequence< OUString >& rPropertyNames);
 
     //UUUU
     /// @throws uno::RuntimeException
     void GetSinglePropertyValue_Impl(
         const SfxItemPropertySimpleEntry& rEntry,
         const SfxItemSet& rSet,
-        uno::Any& rAny ) const
-    throw(uno::RuntimeException);
+        uno::Any& rAny ) const;
 
     /// @throws uno::RuntimeException
     uno::Sequence< beans::GetDirectPropertyTolerantResult >
         GetPropertyValuesTolerant_Impl(
             const uno::Sequence< OUString >& rPropertyNames,
-            bool bDirectValuesOnly)
-        throw (uno::RuntimeException, std::exception);
+            bool bDirectValuesOnly);
 protected:
     // SwClient
     virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override;
@@ -302,13 +294,12 @@ const uno::Sequence< sal_Int8 > & SwXParagraph::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXParagraph::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXParagraph>(rId, this);
 }
 
 OUString SAL_CALL
-SwXParagraph::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXParagraph::getImplementationName()
 {
     return OUString("SwXParagraph");
 }
@@ -329,13 +320,12 @@ static const size_t g_nServicesParagraph(SAL_N_ELEMENTS(g_ServicesParagraph));
 
 sal_Bool SAL_CALL
 SwXParagraph::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXParagraph::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXParagraph::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(
             g_nServicesParagraph, g_ServicesParagraph);
@@ -362,7 +352,6 @@ SwXParagraph::attachToText(SwXText & rParent, SwTextNode & rTextNode)
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 SwXParagraph::getPropertySetInfo()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -374,9 +363,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXParagraph::setPropertyValue(const OUString& rPropertyName,
         const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Sequence<OUString> aPropertyNames { rPropertyName };
@@ -387,8 +373,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
 uno::Any
 SwXParagraph::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Sequence<OUString> aPropertyNames { rPropertyName };
@@ -400,9 +384,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 void SwXParagraph::Impl::SetPropertyValues_Impl(
     const uno::Sequence< OUString >& rPropertyNames,
     const uno::Sequence< uno::Any >& rValues )
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException)
 {
     SwTextNode & rTextNode(GetTextNodeOrThrow());
 
@@ -439,8 +420,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 void SAL_CALL SwXParagraph::setPropertyValues(
     const uno::Sequence< OUString >& rPropertyNames,
     const uno::Sequence< uno::Any >& rValues )
-throw (beans::PropertyVetoException, lang::IllegalArgumentException,
-    lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -464,7 +443,6 @@ void SwXParagraph::Impl::GetSinglePropertyValue_Impl(
     const SfxItemPropertySimpleEntry& rEntry,
     const SfxItemSet& rSet,
     uno::Any& rAny ) const
-throw(uno::RuntimeException)
 {
     bool bDone(false);
 
@@ -553,8 +531,6 @@ throw(uno::RuntimeException)
 
 uno::Sequence< uno::Any > SwXParagraph::Impl::GetPropertyValues_Impl(
         const uno::Sequence< OUString > & rPropertyNames )
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SwTextNode & rTextNode(GetTextNodeOrThrow());
 
@@ -593,7 +569,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 
 uno::Sequence< uno::Any > SAL_CALL
 SwXParagraph::getPropertyValues(const uno::Sequence< OUString >& rPropertyNames)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence< uno::Any > aValues;
@@ -620,14 +595,12 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL SwXParagraph::addPropertiesChangeListener(
     const uno::Sequence< OUString >& /*aPropertyNames*/,
     const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXParagraph::addPropertiesChangeListener(): not implemented");
 }
 
 void SAL_CALL SwXParagraph::removePropertiesChangeListener(
     const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXParagraph::removePropertiesChangeListener(): not implemented");
 }
@@ -635,7 +608,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL SwXParagraph::firePropertiesChangeEvent(
     const uno::Sequence< OUString >& /*aPropertyNames*/,
     const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-        throw(uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXParagraph::firePropertiesChangeEvent(): not implemented");
 }
@@ -646,7 +618,6 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL
 SwXParagraph::setPropertyValuesTolerant(
         const uno::Sequence< OUString >& rPropertyNames,
         const uno::Sequence< uno::Any >& rValues )
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -738,7 +709,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL
 SwXParagraph::getPropertyValuesTolerant(
         const uno::Sequence< OUString >& rPropertyNames )
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -761,7 +731,6 @@ throw (uno::RuntimeException, std::exception)
 uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL
 SwXParagraph::getDirectPropertyValuesTolerant(
         const uno::Sequence< OUString >& rPropertyNames )
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -772,7 +741,6 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult >
 SwXParagraph::Impl::GetPropertyValuesTolerant_Impl(
         const uno::Sequence< OUString >& rPropertyNames,
         bool bDirectValuesOnly )
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -919,8 +887,6 @@ void SAL_CALL
 SwXParagraph::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXParagraph::addPropertyChangeListener(): not implemented");
 }
@@ -929,8 +895,6 @@ void SAL_CALL
 SwXParagraph::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXParagraph::removePropertyChangeListener(): not implemented");
 }
@@ -939,8 +903,6 @@ void SAL_CALL
 SwXParagraph::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXParagraph::addVetoableChangeListener(): not implemented");
 }
@@ -949,8 +911,6 @@ void SAL_CALL
 SwXParagraph::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXParagraph::removeVetoableChangeListener(): not implemented");
 }
@@ -960,7 +920,6 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
     const SwAttrSet** ppSet,
     const SfxItemPropertySimpleEntry& rEntry,
     bool &rAttrSetFetched)
-    throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     beans::PropertyState eRet(beans::PropertyState_DEFAULT_VALUE);
 
@@ -1063,7 +1022,6 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState(
 
 beans::PropertyState SAL_CALL
 SwXParagraph::getPropertyState(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1087,7 +1045,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 uno::Sequence< beans::PropertyState > SAL_CALL
 SwXParagraph::getPropertyStates(
         const uno::Sequence< OUString >& PropertyNames)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1128,7 +1085,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
 void SAL_CALL
 SwXParagraph::setPropertyToDefault(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1217,8 +1173,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
 uno::Any SAL_CALL
 SwXParagraph::getPropertyDefault(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1254,7 +1208,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 
 void SAL_CALL
 SwXParagraph::attach(const uno::Reference< text::XTextRange > & /*xTextRange*/)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     // SwXParagraph will only created in order to be inserted by
@@ -1264,7 +1217,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXParagraph::getAnchor() throw (uno::RuntimeException, std::exception)
+SwXParagraph::getAnchor()
 {
     SolarMutexGuard aGuard;
 
@@ -1279,7 +1232,7 @@ SwXParagraph::getAnchor() throw (uno::RuntimeException, std::exception)
     return xRet;
 }
 
-void SAL_CALL SwXParagraph::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXParagraph::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -1295,7 +1248,6 @@ void SAL_CALL SwXParagraph::dispose() throw (uno::RuntimeException, std::excepti
 
 void SAL_CALL SwXParagraph::addEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -1303,14 +1255,13 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXParagraph::removeEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
 }
 
 uno::Reference< container::XEnumeration >  SAL_CALL
-SwXParagraph::createEnumeration() throw (uno::RuntimeException, std::exception)
+SwXParagraph::createEnumeration()
 {
     SolarMutexGuard aGuard;
 
@@ -1324,19 +1275,19 @@ SwXParagraph::createEnumeration() throw (uno::RuntimeException, std::exception)
     return xRef;
 }
 
-uno::Type SAL_CALL SwXParagraph::getElementType() throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SwXParagraph::getElementType()
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SAL_CALL SwXParagraph::hasElements() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXParagraph::hasElements()
 {
     SolarMutexGuard aGuard;
     return GetTextNode() != nullptr;
 }
 
 uno::Reference< text::XText > SAL_CALL
-SwXParagraph::getText() throw (uno::RuntimeException, std::exception)
+SwXParagraph::getText()
 {
     SolarMutexGuard g;
 
@@ -1344,7 +1295,7 @@ SwXParagraph::getText() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXParagraph::getStart() throw (uno::RuntimeException, std::exception)
+SwXParagraph::getStart()
 {
     SolarMutexGuard aGuard;
 
@@ -1361,7 +1312,7 @@ SwXParagraph::getStart() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXParagraph::getEnd() throw (uno::RuntimeException, std::exception)
+SwXParagraph::getEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -1377,7 +1328,7 @@ SwXParagraph::getEnd() throw (uno::RuntimeException, std::exception)
     return xRet;
 }
 
-OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXParagraph::getString()
 {
     SolarMutexGuard aGuard;
     OUString aRet;
@@ -1401,7 +1352,6 @@ OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException, std::e
 }
 
 void SAL_CALL SwXParagraph::setString(const OUString& aString)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1432,7 +1382,6 @@ throw (uno::RuntimeException, std::exception)
 
 uno::Reference< container::XEnumeration > SAL_CALL
 SwXParagraph::createContentEnumeration(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1451,7 +1400,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXParagraph::getAvailableServiceNames() throw (uno::RuntimeException, std::exception)
+SwXParagraph::getAvailableServiceNames()
 {
     uno::Sequence<OUString> aRet { "com.sun.star.text.TextContent" };
     return aRet;
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 5823d6e8a945..98ed94f2d72d 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -135,13 +135,11 @@ SwXTextPortion::~SwXTextPortion()
 }
 
 uno::Reference< text::XText >  SwXTextPortion::getText()
-throw( uno::RuntimeException, std::exception )
 {
     return m_xParentText;
 }
 
 uno::Reference< text::XTextRange >  SwXTextPortion::getStart()
-throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextRange >  xRet;
@@ -154,7 +152,6 @@ throw( uno::RuntimeException, std::exception )
 }
 
 uno::Reference< text::XTextRange >  SwXTextPortion::getEnd()
-throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextRange >  xRet;
@@ -167,7 +164,6 @@ throw( uno::RuntimeException, std::exception )
 }
 
 OUString SwXTextPortion::getString()
-throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     OUString aText;
@@ -184,7 +180,7 @@ throw( uno::RuntimeException, std::exception )
     return aText;
 }
 
-void SwXTextPortion::setString(const OUString& aString) throw( uno::RuntimeException, std::exception )
+void SwXTextPortion::setString(const OUString& aString)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -193,7 +189,6 @@ void SwXTextPortion::setString(const OUString& aString) throw( uno::RuntimeExcep
 }
 
 uno::Reference< beans::XPropertySetInfo >  SwXTextPortion::getPropertySetInfo()
-throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     //! PropertySetInfo for text portion extensions
@@ -211,8 +206,6 @@ throw( uno::RuntimeException, std::exception )
 
 void SwXTextPortion::setPropertyValue(const OUString& rPropertyName,
     const uno::Any& aValue)
-    throw( beans::UnknownPropertyException,
-        beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -382,7 +375,6 @@ void SwXTextPortion::GetPropertyValue(
 
 uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl(
         const uno::Sequence< OUString >& rPropertyNames )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
 {
     sal_Int32 nLength = rPropertyNames.getLength();
     const OUString *pPropertyNames = rPropertyNames.getConstArray();
@@ -412,7 +404,6 @@ uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl(
 
 uno::Any SwXTextPortion::getPropertyValue(
     const OUString& rPropertyName)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Sequence< OUString > aPropertyNames { rPropertyName };
@@ -422,8 +413,6 @@ uno::Any SwXTextPortion::getPropertyValue(
 void SAL_CALL SwXTextPortion::SetPropertyValues_Impl(
     const uno::Sequence< OUString >& rPropertyNames,
     const uno::Sequence< uno::Any >& rValues )
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException,
-            lang::WrappedTargetException, uno::RuntimeException)
 {
     SwUnoCursor& rUnoCursor = GetCursor();
 
@@ -450,8 +439,6 @@ void SAL_CALL SwXTextPortion::SetPropertyValues_Impl(
 void SwXTextPortion::setPropertyValues(
     const uno::Sequence< OUString >& rPropertyNames,
     const uno::Sequence< uno::Any >& rValues )
-        throw(beans::PropertyVetoException, lang::IllegalArgumentException,
-            lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -472,7 +459,6 @@ void SwXTextPortion::setPropertyValues(
 
 uno::Sequence< uno::Any > SwXTextPortion::getPropertyValues(
     const uno::Sequence< OUString >& rPropertyNames )
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence< uno::Any > aValues;
@@ -498,7 +484,6 @@ uno::Sequence< uno::Any > SwXTextPortion::getPropertyValues(
 uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPropertyValuesTolerant(
         const uno::Sequence< OUString >& rPropertyNames,
         const uno::Sequence< uno::Any >& rValues )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -566,7 +551,6 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr
 
 uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXTextPortion::getPropertyValuesTolerant(
         const uno::Sequence< OUString >& rPropertyNames )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -585,7 +569,6 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXTextPortion::getPr
 
 uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::getDirectPropertyValuesTolerant(
         const uno::Sequence< OUString >& rPropertyNames )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     return GetPropertyValuesTolerant_Impl( rPropertyNames, true );
@@ -594,7 +577,6 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
 uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::GetPropertyValuesTolerant_Impl(
         const uno::Sequence< OUString >& rPropertyNames,
         bool bDirectValuesOnly )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -695,45 +677,40 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
 void SwXTextPortion::addPropertiesChangeListener(
     const uno::Sequence< OUString >& /*aPropertyNames*/,
     const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-        throw(uno::RuntimeException, std::exception)
 {}
 
 void SwXTextPortion::removePropertiesChangeListener(
     const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-        throw(uno::RuntimeException, std::exception)
 {}
 
 void SwXTextPortion::firePropertiesChangeEvent(
     const uno::Sequence< OUString >& /*aPropertyNames*/,
     const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-        throw(uno::RuntimeException, std::exception)
 {}
 
 void SwXTextPortion::addPropertyChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXTextPortion::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextPortion::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXTextPortion::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextPortion::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXTextPortion::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextPortion::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
 beans::PropertyState SwXTextPortion::getPropertyState(const OUString& rPropertyName)
-            throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     beans::PropertyState eRet = beans::PropertyState_DEFAULT_VALUE;
@@ -754,7 +731,6 @@ beans::PropertyState SwXTextPortion::getPropertyState(const OUString& rPropertyN
 
 uno::Sequence< beans::PropertyState > SwXTextPortion::getPropertyStates(
         const uno::Sequence< OUString >& rPropertyNames)
-        throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -777,7 +753,6 @@ uno::Sequence< beans::PropertyState > SwXTextPortion::getPropertyStates(
 }
 
 void SwXTextPortion::setPropertyToDefault(const OUString& rPropertyName)
-                throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -787,7 +762,6 @@ void SwXTextPortion::setPropertyToDefault(const OUString& rPropertyName)
 }
 
 uno::Any SwXTextPortion::getPropertyDefault(const OUString& rPropertyName)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -799,7 +773,6 @@ uno::Any SwXTextPortion::getPropertyDefault(const OUString& rPropertyName)
 }
 
 uno::Reference< container::XEnumeration >  SwXTextPortion::createContentEnumeration(const OUString& /*aServiceName*/)
-        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -818,7 +791,6 @@ const uno::Sequence< sal_Int8 > & SwXTextPortion::getUnoTunnelId()
 }
 
 sal_Int64 SwXTextPortion::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -830,7 +802,6 @@ sal_Int64 SwXTextPortion::getSomething( const uno::Sequence< sal_Int8 >& rId )
 }
 
 uno::Sequence< OUString > SwXTextPortion::getAvailableServiceNames()
-throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Sequence<OUString> aRet { "com.sun.star.text.TextContent" };
@@ -838,18 +809,16 @@ throw( uno::RuntimeException, std::exception )
 }
 
 OUString SwXTextPortion::getImplementationName()
-throw( uno::RuntimeException, std::exception )
 {
     return OUString("SwXTextPortion");
 }
 
-sal_Bool SwXTextPortion::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextPortion::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SwXTextPortion::getSupportedServiceNames()
-throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(7);
     OUString* pArray = aRet.getArray();
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index dad7aae424dc..c86f98263060 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -321,7 +321,6 @@ const uno::Sequence< sal_Int8 > & SwXTextPortionEnumeration::getUnoTunnelId()
 
 sal_Int64 SAL_CALL SwXTextPortionEnumeration::getSomething(
         const uno::Sequence< sal_Int8 >& rId )
-throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -333,20 +332,17 @@ throw(uno::RuntimeException, std::exception)
 }
 
 OUString SwXTextPortionEnumeration::getImplementationName()
-throw( RuntimeException, std::exception )
 {
     return OUString("SwXTextPortionEnumeration");
 }
 
 sal_Bool
 SwXTextPortionEnumeration::supportsService(const OUString& rServiceName)
-throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SwXTextPortionEnumeration::getSupportedServiceNames()
-throw( RuntimeException, std::exception )
 {
     Sequence<OUString> aRet { "com.sun.star.text.TextPortionEnumeration" };
     return aRet;
@@ -386,7 +382,6 @@ SwXTextPortionEnumeration::~SwXTextPortionEnumeration()
 }
 
 sal_Bool SwXTextPortionEnumeration::hasMoreElements()
-throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -394,8 +389,6 @@ throw( uno::RuntimeException, std::exception )
 }
 
 uno::Any SwXTextPortionEnumeration::nextElement()
-throw( container::NoSuchElementException, lang::WrappedTargetException,
-       uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index b64a315b0685..3c688fdc64b7 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -60,7 +60,6 @@ const SwStartNode* SwXRedlineText::GetStartNode() const
 }
 
 uno::Any SwXRedlineText::queryInterface( const uno::Type& rType )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
 
@@ -83,7 +82,6 @@ uno::Any SwXRedlineText::queryInterface( const uno::Type& rType )
 }
 
 uno::Sequence<uno::Type> SwXRedlineText::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     // SwXText::getTypes()
     uno::Sequence<uno::Type> aTypes = SwXText::getTypes();
@@ -97,13 +95,11 @@ uno::Sequence<uno::Type> SwXRedlineText::getTypes()
 }
 
 uno::Sequence<sal_Int8> SwXRedlineText::getImplementationId()
-    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -147,7 +143,6 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor()
 
 uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursorByRange(
     const uno::Reference<text::XTextRange> & aTextRange)
-        throw( uno::RuntimeException, std::exception )
 {
     uno::Reference<text::XTextCursor> xCursor = createTextCursor();
     xCursor->gotoRange(aTextRange->getStart(), false);
@@ -156,7 +151,6 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursorByRange(
 }
 
 uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwPaM aPam(aNodeIndex);
@@ -165,12 +159,12 @@ uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration()
     return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_REDLINE);
 }
 
-uno::Type SwXRedlineText::getElementType(  ) throw(uno::RuntimeException, std::exception)
+uno::Type SwXRedlineText::getElementType(  )
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SwXRedlineText::hasElements(  ) throw(uno::RuntimeException, std::exception)
+sal_Bool SwXRedlineText::hasElements(  )
 {
     return true;    // we always have a content index
 }
@@ -227,7 +221,6 @@ static uno::Sequence<beans::PropertyValue> lcl_GetSuccessorProperties(const SwRa
 }
 
 uno::Any SwXRedlinePortion::getPropertyValue( const OUString& rPropertyName )
-        throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Validate();
@@ -258,7 +251,7 @@ uno::Any SwXRedlinePortion::getPropertyValue( const OUString& rPropertyName )
     return aRet;
 }
 
-void SwXRedlinePortion::Validate() throw( uno::RuntimeException )
+void SwXRedlinePortion::Validate()
 {
     SwUnoCursor& rUnoCursor = GetCursor();
     //search for the redline
@@ -271,12 +264,12 @@ void SwXRedlinePortion::Validate() throw( uno::RuntimeException )
         throw uno::RuntimeException();
 }
 
-uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-uno::Any  SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, const SwRangeRedline& rRedline ) throw(std::exception)
+uno::Any  SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, const SwRangeRedline& rRedline )
 {
     uno::Any aRet;
     if(rPropertyName == UNO_NAME_REDLINE_AUTHOR)
@@ -315,7 +308,7 @@ uno::Any  SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, co
 }
 
 uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties(
-    const SwRangeRedline& rRedline, bool bIsStart ) throw (std::exception)
+    const SwRangeRedline& rRedline, bool bIsStart )
 {
     uno::Sequence< beans::PropertyValue > aRet(12);
     const SwRedlineData* pNext = rRedline.GetRedlineData().Next();
@@ -378,7 +371,7 @@ SwXRedline::~SwXRedline()
 {
 }
 
-uno::Reference< beans::XPropertySetInfo > SwXRedline::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SwXRedline::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo >  xRef =
         aSwMapProvider.GetPropertySet(PROPERTY_MAP_REDLINE)->getPropertySetInfo();
@@ -386,8 +379,6 @@ uno::Reference< beans::XPropertySetInfo > SwXRedline::getPropertySetInfo(  ) thr
 }
 
 void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any& aValue )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException,
-        lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!pDoc)
@@ -427,7 +418,6 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any
 }
 
 uno::Any SwXRedline::getPropertyValue( const OUString& rPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!pDoc)
@@ -499,25 +489,21 @@ uno::Any SwXRedline::getPropertyValue( const OUString& rPropertyName )
 void SwXRedline::addPropertyChangeListener(
     const OUString& /*aPropertyName*/,
     const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-        throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SwXRedline::removePropertyChangeListener(
     const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
-        throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SwXRedline::addVetoableChangeListener(
     const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SwXRedline::removeVetoableChangeListener(
     const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-        throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
@@ -531,7 +517,7 @@ void SwXRedline::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
     }
 }
 
-uno::Reference< container::XEnumeration >  SwXRedline::createEnumeration() throw( uno::RuntimeException, std::exception )
+uno::Reference< container::XEnumeration >  SwXRedline::createEnumeration()
 {
     SolarMutexGuard aGuard;
     uno::Reference< container::XEnumeration > xRet;
@@ -547,19 +533,19 @@ uno::Reference< container::XEnumeration >  SwXRedline::createEnumeration() throw
     return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_REDLINE);
 }
 
-uno::Type SwXRedline::getElementType(  ) throw(uno::RuntimeException, std::exception)
+uno::Type SwXRedline::getElementType(  )
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SwXRedline::hasElements(  ) throw(uno::RuntimeException, std::exception)
+sal_Bool SwXRedline::hasElements(  )
 {
     if(!pDoc)
         throw uno::RuntimeException();
     return nullptr != pRedline->GetContentIdx();
 }
 
-uno::Reference< text::XTextCursor >  SwXRedline::createTextCursor() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextCursor >  SwXRedline::createTextCursor()
 {
     SolarMutexGuard aGuard;
     if(!pDoc)
@@ -597,13 +583,11 @@ uno::Reference< text::XTextCursor >  SwXRedline::createTextCursor() throw( uno::
 
 uno::Reference< text::XTextCursor >  SwXRedline::createTextCursorByRange(
     const uno::Reference< text::XTextRange > & /*aTextPosition*/)
-        throw( uno::RuntimeException, std::exception )
 {
     throw uno::RuntimeException();
 }
 
 uno::Any SwXRedline::queryInterface( const uno::Type& rType )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Any aRet = SwXText::queryInterface(rType);
     if(!aRet.hasValue())
@@ -614,7 +598,6 @@ uno::Any SwXRedline::queryInterface( const uno::Type& rType )
 }
 
 uno::Sequence<uno::Type> SwXRedline::getTypes()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence<uno::Type> aTypes = SwXText::getTypes();
     uno::Sequence<uno::Type> aBaseTypes = SwXRedlineBaseClass::getTypes();
@@ -628,7 +611,6 @@ uno::Sequence<uno::Type> SwXRedline::getTypes()
 }
 
 uno::Sequence<sal_Int8> SwXRedline::getImplementationId()
-    throw(uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index 452386f2a209..9c49a5bc73e4 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -45,7 +45,7 @@ SwXRedlines::~SwXRedlines()
 {
 }
 
-sal_Int32 SwXRedlines::getCount(  ) throw(uno::RuntimeException, std::exception)
+sal_Int32 SwXRedlines::getCount(  )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -55,7 +55,6 @@ sal_Int32 SwXRedlines::getCount(  ) throw(uno::RuntimeException, std::exception)
 }
 
 uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex)
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -73,7 +72,6 @@ uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Reference< container::XEnumeration >  SwXRedlines::createEnumeration()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -81,12 +79,12 @@ uno::Reference< container::XEnumeration >  SwXRedlines::createEnumeration()
     return uno::Reference< container::XEnumeration >(new SwXRedlineEnumeration(*GetDoc()));
 }
 
-uno::Type SwXRedlines::getElementType(  ) throw(uno::RuntimeException, std::exception)
+uno::Type SwXRedlines::getElementType(  )
 {
     return cppu::UnoType<beans::XPropertySet>::get();
 }
 
-sal_Bool SwXRedlines::hasElements(  ) throw(uno::RuntimeException, std::exception)
+sal_Bool SwXRedlines::hasElements(  )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -95,19 +93,17 @@ sal_Bool SwXRedlines::hasElements(  ) throw(uno::RuntimeException, std::exceptio
     return rRedTable.size() > 0;
 }
 
-OUString SwXRedlines::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXRedlines::getImplementationName()
 {
     return OUString("SwXRedlines");
 }
 
 sal_Bool SwXRedlines::supportsService(const OUString& ServiceName)
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SwXRedlines::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
     return uno::Sequence< OUString >();
@@ -140,7 +136,7 @@ SwXRedlineEnumeration::~SwXRedlineEnumeration()
 {
 }
 
-sal_Bool SwXRedlineEnumeration::hasMoreElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXRedlineEnumeration::hasMoreElements()
 {
     if(!pDoc)
         throw uno::RuntimeException();
@@ -148,7 +144,6 @@ sal_Bool SwXRedlineEnumeration::hasMoreElements() throw( uno::RuntimeException,
 }
 
 uno::Any SwXRedlineEnumeration::nextElement()
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     if(!pDoc)
         throw uno::RuntimeException();
@@ -161,17 +156,17 @@ uno::Any SwXRedlineEnumeration::nextElement()
     return aRet;
 }
 
-OUString SwXRedlineEnumeration::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXRedlineEnumeration::getImplementationName()
 {
     return OUString("SwXRedlineEnumeration");
 }
 
-sal_Bool SwXRedlineEnumeration::supportsService(const OUString& ServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXRedlineEnumeration::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-uno::Sequence< OUString > SwXRedlineEnumeration::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXRedlineEnumeration::getSupportedServiceNames()
 {
     return uno::Sequence< OUString >();
 }
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index d6d65727a625..8e86f09fcb01 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -167,13 +167,11 @@ const uno::Sequence< sal_Int8 > & SwXReferenceMark::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXReferenceMark::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXReferenceMark>(rId, this);
 }
 
 OUString SAL_CALL SwXReferenceMark::getImplementationName()
-throw (uno::RuntimeException, std::exception)
 {
     return OUString("SwXReferenceMark");
 }
@@ -188,14 +186,12 @@ static const size_t g_nServicesReferenceMark(SAL_N_ELEMENTS(g_ServicesReferenceM
 
 sal_Bool SAL_CALL
 SwXReferenceMark::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
 SwXReferenceMark::getSupportedServiceNames()
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::GetSupportedServiceNamesImpl(
             g_nServicesReferenceMark, g_ServicesReferenceMark);
@@ -283,7 +279,6 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam,
 
 void SAL_CALL
 SwXReferenceMark::attach(const uno::Reference< text::XTextRange > & xTextRange)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -316,7 +311,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXReferenceMark::getAnchor() throw (uno::RuntimeException, std::exception)
+SwXReferenceMark::getAnchor()
 {
     SolarMutexGuard aGuard;
 
@@ -346,7 +341,7 @@ SwXReferenceMark::getAnchor() throw (uno::RuntimeException, std::exception)
     return nullptr;
 }
 
-void SAL_CALL SwXReferenceMark::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXReferenceMark::dispose()
 {
     SolarMutexGuard aGuard;
     if (m_pImpl->IsValid())
@@ -380,7 +375,6 @@ void SAL_CALL SwXReferenceMark::dispose() throw (uno::RuntimeException, std::exc
 
 void SAL_CALL SwXReferenceMark::addEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -388,14 +382,12 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXReferenceMark::removeEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
 }
 
 OUString SAL_CALL SwXReferenceMark::getName()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!m_pImpl->IsValid() ||
@@ -407,7 +399,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL SwXReferenceMark::setName(const OUString& rName)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (m_pImpl->m_bIsDescriptor)
@@ -455,7 +446,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
-SwXReferenceMark::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+SwXReferenceMark::getPropertySetInfo()
 {
     SolarMutexGuard g;
 
@@ -467,17 +458,12 @@ SwXReferenceMark::getPropertySetInfo() throw (uno::RuntimeException, std::except
 
 void SAL_CALL SwXReferenceMark::setPropertyValue(
     const OUString& /*rPropertyName*/, const uno::Any& /*rValue*/ )
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     throw lang::IllegalArgumentException();
 }
 
 uno::Any SAL_CALL
 SwXReferenceMark::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     // does not seem to need SolarMutex
     uno::Any aRet;
@@ -491,8 +477,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 void SAL_CALL SwXReferenceMark::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXReferenceMark::addPropertyChangeListener(): not implemented");
 }
@@ -500,8 +484,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 void SAL_CALL SwXReferenceMark::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXReferenceMark::removePropertyChangeListener(): not implemented");
 }
@@ -509,8 +491,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 void SAL_CALL SwXReferenceMark::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXReferenceMark::addVetoableChangeListener(): not implemented");
 }
@@ -518,8 +498,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 void SAL_CALL SwXReferenceMark::removeVetoableChangeListener(
     const OUString& /*rPropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXReferenceMark::removeVetoableChangeListener(): not implemented");
 }
@@ -532,13 +510,12 @@ private:
     virtual void PrepareForAttach(uno::Reference< text::XTextRange > & xRange,
             const SwPaM & rPam) override;
 
-    virtual bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
-        throw (lang::IllegalArgumentException, uno::RuntimeException) override;
+    virtual bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) override;
 
 protected:
     virtual const SwStartNode *GetStartNode() const override;
     virtual uno::Reference< text::XTextCursor >
-        CreateCursor() throw (uno::RuntimeException) override;
+        CreateCursor() override;
 
 public:
     SwXMetaText(SwDoc & rDoc, SwXMeta & rMeta);
@@ -552,15 +529,14 @@ public:
 
     // XTypeProvider
     virtual uno::Sequence< sal_Int8 > SAL_CALL
-        getImplementationId() throw (uno::RuntimeException, std::exception) override;
+        getImplementationId() override;
 
     // XText
     virtual uno::Reference< text::XTextCursor >  SAL_CALL
-        createTextCursor() throw (uno::RuntimeException, std::exception) override;
+        createTextCursor() override;
     virtual uno::Reference< text::XTextCursor >  SAL_CALL
         createTextCursorByRange(
-            const uno::Reference< text::XTextRange > & xTextPosition)
-        throw (uno::RuntimeException, std::exception) override;
+            const uno::Reference< text::XTextRange > & xTextPosition) override;
 
 };
 
@@ -587,13 +563,11 @@ void SwXMetaText::PrepareForAttach( uno::Reference<text::XTextRange> & xRange,
 }
 
 bool SwXMetaText::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     return m_rMeta.CheckForOwnMemberMeta(rPam, bAbsorb);
 }
 
 uno::Reference< text::XTextCursor > SwXMetaText::CreateCursor()
-throw (uno::RuntimeException)
 {
     uno::Reference< text::XTextCursor > xRet;
     if (IsValid())
@@ -614,14 +588,14 @@ throw (uno::RuntimeException)
 }
 
 uno::Sequence<sal_Int8> SAL_CALL
-SwXMetaText::getImplementationId() throw (uno::RuntimeException, std::exception)
+SwXMetaText::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // XText
 uno::Reference< text::XTextCursor > SAL_CALL
-SwXMetaText::createTextCursor() throw (uno::RuntimeException, std::exception)
+SwXMetaText::createTextCursor()
 {
     return CreateCursor();
 }
@@ -629,7 +603,6 @@ SwXMetaText::createTextCursor() throw (uno::RuntimeException, std::exception)
 uno::Reference< text::XTextCursor > SAL_CALL
 SwXMetaText::createTextCursorByRange(
         const uno::Reference<text::XTextRange> & xTextPosition)
-    throw (uno::RuntimeException, std::exception)
 {
     const uno::Reference<text::XTextCursor> xCursor( CreateCursor() );
     xCursor->gotoRange(xTextPosition, false);
@@ -820,7 +793,6 @@ bool SwXMeta::SetContentRange(
 }
 
 bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     SwTextNode * pTextNode;
     sal_Int32 nMetaStart;
@@ -894,14 +866,13 @@ const uno::Sequence< sal_Int8 > & SwXMeta::getUnoTunnelId()
 // XUnoTunnel
 sal_Int64 SAL_CALL
 SwXMeta::getSomething( const uno::Sequence< sal_Int8 > & i_rId )
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXMeta>(i_rId, this);
 }
 
 // XServiceInfo
 OUString SAL_CALL
-SwXMeta::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXMeta::getImplementationName()
 {
     return OUString("SwXMeta");
 }
@@ -916,13 +887,12 @@ static const size_t g_nServicesMeta(SAL_N_ELEMENTS(g_ServicesMeta));
 
 sal_Bool SAL_CALL
 SwXMeta::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXMeta::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXMeta::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(g_nServicesMeta, g_ServicesMeta);
 }
@@ -931,7 +901,6 @@ SwXMeta::getSupportedServiceNames() throw (uno::RuntimeException, std::exception
 void SAL_CALL
 SwXMeta::addEventListener(
         uno::Reference< lang::XEventListener> const & xListener )
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -940,14 +909,13 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXMeta::removeEventListener(
         uno::Reference< lang::XEventListener> const & xListener )
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
 }
 
 void SAL_CALL
-SwXMeta::dispose() throw (uno::RuntimeException, std::exception)
+SwXMeta::dispose()
 {
     SolarMutexGuard g;
 
@@ -982,7 +950,6 @@ SwXMeta::dispose() throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXMeta::AttachImpl(const uno::Reference< text::XTextRange > & i_xTextRange,
         const sal_uInt16 i_nWhich)
-throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     SolarMutexGuard g;
 
@@ -1069,13 +1036,12 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
 // XTextContent
 void SAL_CALL
 SwXMeta::attach(const uno::Reference< text::XTextRange > & i_xTextRange)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     return SwXMeta::AttachImpl(i_xTextRange, RES_TXTATR_META);
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXMeta::getAnchor() throw (uno::RuntimeException, std::exception)
+SwXMeta::getAnchor()
 {
     SolarMutexGuard g;
 
@@ -1109,35 +1075,35 @@ SwXMeta::getAnchor() throw (uno::RuntimeException, std::exception)
 
 // XTextRange
 uno::Reference< text::XText > SAL_CALL
-SwXMeta::getText() throw (uno::RuntimeException, std::exception)
+SwXMeta::getText()
 {
     SolarMutexGuard g;
     return this;
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXMeta::getStart() throw (uno::RuntimeException, std::exception)
+SwXMeta::getStart()
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->getStart();
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXMeta::getEnd() throw (uno::RuntimeException, std::exception)
+SwXMeta::getEnd()
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->getEnd();
 }
 
 OUString SAL_CALL
-SwXMeta::getString() throw (uno::RuntimeException, std::exception)
+SwXMeta::getString()
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->getString();
 }
 
 void SAL_CALL
-SwXMeta::setString(const OUString& rString) throw (uno::RuntimeException, std::exception)
+SwXMeta::setString(const OUString& rString)
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->setString(rString);
@@ -1145,7 +1111,7 @@ SwXMeta::setString(const OUString& rString) throw (uno::RuntimeException, std::e
 
 // XSimpleText
 uno::Reference< text::XTextCursor > SAL_CALL
-SwXMeta::createTextCursor() throw (uno::RuntimeException, std::exception)
+SwXMeta::createTextCursor()
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->createTextCursor();
@@ -1154,7 +1120,6 @@ SwXMeta::createTextCursor() throw (uno::RuntimeException, std::exception)
 uno::Reference< text::XTextCursor > SAL_CALL
 SwXMeta::createTextCursorByRange(
         const uno::Reference<text::XTextRange> & xTextPosition)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->createTextCursorByRange(xTextPosition);
@@ -1163,7 +1128,6 @@ SwXMeta::createTextCursorByRange(
 void SAL_CALL
 SwXMeta::insertString(const uno::Reference<text::XTextRange> & xRange,
         const OUString& rString, sal_Bool bAbsorb)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->insertString(xRange, rString, bAbsorb);
@@ -1172,7 +1136,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXMeta::insertControlCharacter(const uno::Reference<text::XTextRange> & xRange,
         sal_Int16 nControlCharacter, sal_Bool bAbsorb)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->insertControlCharacter(xRange, nControlCharacter,
@@ -1183,7 +1146,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXMeta::insertTextContent( const uno::Reference<text::XTextRange> & xRange,
         const uno::Reference<text::XTextContent> & xContent, sal_Bool bAbsorb)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->insertTextContent(xRange, xContent, bAbsorb);
@@ -1192,7 +1154,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXMeta::removeTextContent(
         const uno::Reference< text::XTextContent > & xContent)
-    throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
     return m_pImpl->m_xText->removeTextContent(xContent);
@@ -1200,7 +1161,7 @@ SwXMeta::removeTextContent(
 
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL
-SwXMeta::getParent() throw (uno::RuntimeException, std::exception)
+SwXMeta::getParent()
 {
     SolarMutexGuard g;
     SwTextNode * pTextNode;
@@ -1220,20 +1181,19 @@ SwXMeta::getParent() throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL
 SwXMeta::setParent(uno::Reference< uno::XInterface > const& /*xParent*/)
-    throw (uno::RuntimeException, lang::NoSupportException, std::exception)
 {
     throw lang::NoSupportException("setting parent not supported", *this);
 }
 
 // XElementAccess
 uno::Type SAL_CALL
-SwXMeta::getElementType() throw (uno::RuntimeException, std::exception)
+SwXMeta::getElementType()
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
 sal_Bool SAL_CALL
-SwXMeta::hasElements() throw (uno::RuntimeException, std::exception)
+SwXMeta::hasElements()
 {
     SolarMutexGuard g;
 
@@ -1242,7 +1202,7 @@ SwXMeta::hasElements() throw (uno::RuntimeException, std::exception)
 
 // XEnumerationAccess
 uno::Reference< container::XEnumeration > SAL_CALL
-SwXMeta::createEnumeration() throw (uno::RuntimeException, std::exception)
+SwXMeta::createEnumeration()
 {
     SolarMutexGuard g;
 
@@ -1324,7 +1284,7 @@ SwXMetaField::~SwXMetaField()
 
 // XServiceInfo
 OUString SAL_CALL
-SwXMetaField::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXMetaField::getImplementationName()
 {
     return OUString("SwXMetaField");
 }
@@ -1340,13 +1300,12 @@ static const size_t g_nServicesMetaField(SAL_N_ELEMENTS(g_ServicesMetaField));
 
 sal_Bool SAL_CALL
 SwXMetaField::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXMetaField::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXMetaField::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(
             g_nServicesMetaField, g_ServicesMetaField);
@@ -1356,7 +1315,6 @@ SwXMetaField::getSupportedServiceNames() throw (uno::RuntimeException, std::exce
 void SAL_CALL
 SwXMetaField::addEventListener(
         uno::Reference< lang::XEventListener> const & xListener )
-throw (uno::RuntimeException, std::exception)
 {
     return SwXMeta::addEventListener(xListener);
 }
@@ -1364,13 +1322,12 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXMetaField::removeEventListener(
         uno::Reference< lang::XEventListener> const & xListener )
-throw (uno::RuntimeException, std::exception)
 {
     return SwXMeta::removeEventListener(xListener);
 }
 
 void SAL_CALL
-SwXMetaField::dispose() throw (uno::RuntimeException, std::exception)
+SwXMetaField::dispose()
 {
     return SwXMeta::dispose();
 }
@@ -1378,20 +1335,19 @@ SwXMetaField::dispose() throw (uno::RuntimeException, std::exception)
 // XTextContent
 void SAL_CALL
 SwXMetaField::attach(const uno::Reference< text::XTextRange > & i_xTextRange)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     return SwXMeta::AttachImpl(i_xTextRange, RES_TXTATR_METAFIELD);
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXMetaField::getAnchor() throw (uno::RuntimeException, std::exception)
+SwXMetaField::getAnchor()
 {
     return SwXMeta::getAnchor();
 }
 
 // XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
-SwXMetaField::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+SwXMetaField::getPropertySetInfo()
 {
     SolarMutexGuard g;
 
@@ -1404,9 +1360,6 @@ SwXMetaField::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXMetaField::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1439,8 +1392,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
 uno::Any SAL_CALL
 SwXMetaField::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1471,8 +1422,6 @@ void SAL_CALL
 SwXMetaField::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXMetaField::addPropertyChangeListener(): not implemented");
 }
@@ -1481,8 +1430,6 @@ void SAL_CALL
 SwXMetaField::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXMetaField::removePropertyChangeListener(): not implemented");
 }
@@ -1491,8 +1438,6 @@ void SAL_CALL
 SwXMetaField::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXMetaField::addVetoableChangeListener(): not implemented");
 }
@@ -1501,8 +1446,6 @@ void SAL_CALL
 SwXMetaField::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXMetaField::removeVetoableChangeListener(): not implemented");
 }
@@ -1579,7 +1522,6 @@ getPrefixAndSuffix(
 // XTextField
 OUString SAL_CALL
 SwXMetaField::getPresentation(sal_Bool bShowCommand)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 96c0d35530f5..2ede1776ea6d 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -147,18 +147,13 @@ public:
     /// @throws uno::RuntimeException
     void SAL_CALL SetPropertyValues_Impl(
             const uno::Sequence< OUString >& rPropertyNames,
-            const uno::Sequence< uno::Any >& aValues)
-        throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-                lang::IllegalArgumentException, lang::WrappedTargetException,
-                uno::RuntimeException, std::exception);
+            const uno::Sequence< uno::Any >& aValues);
     /// @throws beans::UnknownPropertyException
     /// @throws lang::WrappedTargetException,
     /// @throws uno::RuntimeException
     uno::Sequence< uno::Any > SAL_CALL
         GetPropertyValues_Impl(
-            const uno::Sequence< OUString >& rPropertyNames)
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-                uno::RuntimeException, std::exception);
+            const uno::Sequence< OUString >& rPropertyNames);
 protected:
     // SwClient
     virtual void Modify(const SfxPoolItem *pOld, const SfxPoolItem *pNew) override;
@@ -234,13 +229,12 @@ const uno::Sequence< sal_Int8 > & SwXTextSection::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXTextSection::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXTextSection>(rId, this);
 }
 
 uno::Reference< text::XTextSection > SAL_CALL
-SwXTextSection::getParentSection() throw (uno::RuntimeException, std::exception)
+SwXTextSection::getParentSection()
 {
     SolarMutexGuard aGuard;
 
@@ -253,7 +247,7 @@ SwXTextSection::getParentSection() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Sequence< uno::Reference< text::XTextSection > > SAL_CALL
-SwXTextSection::getChildSections() throw (uno::RuntimeException, std::exception)
+SwXTextSection::getChildSections()
 {
     SolarMutexGuard aGuard;
 
@@ -273,7 +267,6 @@ SwXTextSection::getChildSections() throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL
 SwXTextSection::attach(const uno::Reference< text::XTextRange > & xTextRange)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -440,7 +433,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXTextSection::getAnchor() throw (uno::RuntimeException, std::exception)
+SwXTextSection::getAnchor()
 {
     SolarMutexGuard aGuard;
 
@@ -466,7 +459,7 @@ SwXTextSection::getAnchor() throw (uno::RuntimeException, std::exception)
     return xRet;
 }
 
-void SAL_CALL SwXTextSection::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextSection::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -479,7 +472,6 @@ void SAL_CALL SwXTextSection::dispose() throw (uno::RuntimeException, std::excep
 
 void SAL_CALL SwXTextSection::addEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.addInterface(xListener);
@@ -487,14 +479,13 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXTextSection::removeEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_EventListeners.removeInterface(xListener);
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
-SwXTextSection::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+SwXTextSection::getPropertySetInfo()
 {
     SolarMutexGuard g;
 
@@ -557,9 +548,6 @@ lcl_UpdateSection(SwSectionFormat *const pFormat,
 void SwXTextSection::Impl::SetPropertyValues_Impl(
     const uno::Sequence< OUString >& rPropertyNames,
     const uno::Sequence< uno::Any >& rValues)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-        lang::IllegalArgumentException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     if(rPropertyNames.getLength() != rValues.getLength())
     {
@@ -919,8 +907,6 @@ void SAL_CALL
 SwXTextSection::setPropertyValues(
     const uno::Sequence< OUString >& rPropertyNames,
     const uno::Sequence< uno::Any >& rValues)
-throw (beans::PropertyVetoException, lang::IllegalArgumentException,
-        lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -941,9 +927,6 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException,
 
 void SwXTextSection::setPropertyValue(
     const OUString& rPropertyName, const uno::Any& rValue)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-        lang::IllegalArgumentException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -956,8 +939,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 uno::Sequence< uno::Any >
 SwXTextSection::Impl::GetPropertyValues_Impl(
         const uno::Sequence< OUString > & rPropertyNames )
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SwSectionFormat *const pFormat = GetSectionFormat();
     if (!pFormat && !m_bIsDescriptor)
@@ -1263,7 +1244,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 uno::Sequence< uno::Any > SAL_CALL
 SwXTextSection::getPropertyValues(
     const uno::Sequence< OUString >& rPropertyNames)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence< uno::Any > aValues;
@@ -1289,8 +1269,6 @@ throw (uno::RuntimeException, std::exception)
 
 uno::Any SAL_CALL
 SwXTextSection::getPropertyValue(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1301,14 +1279,12 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 void SAL_CALL SwXTextSection::addPropertiesChangeListener(
     const uno::Sequence< OUString >& /*aPropertyNames*/,
     const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextSection::addPropertiesChangeListener(): not implemented");
 }
 
 void SAL_CALL SwXTextSection::removePropertiesChangeListener(
     const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-throw (uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextSection::removePropertiesChangeListener(): not implemented");
 }
@@ -1316,7 +1292,6 @@ throw (uno::RuntimeException, std::exception)
 void SAL_CALL SwXTextSection::firePropertiesChangeEvent(
     const uno::Sequence< OUString >& /*aPropertyNames*/,
     const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-        throw(uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextSection::firePropertiesChangeEvent(): not implemented");
 }
@@ -1325,8 +1300,6 @@ void SAL_CALL
 SwXTextSection::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextSection::addPropertyChangeListener(): not implemented");
 }
@@ -1335,8 +1308,6 @@ void SAL_CALL
 SwXTextSection::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextSection::removePropertyChangeListener(): not implemented");
 }
@@ -1345,8 +1316,6 @@ void SAL_CALL
 SwXTextSection::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextSection::addVetoableChangeListener(): not implemented");
 }
@@ -1355,15 +1324,12 @@ void SAL_CALL
 SwXTextSection::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXTextSection::removeVetoableChangeListener(): not implemented");
 }
 
 beans::PropertyState SAL_CALL
 SwXTextSection::getPropertyState(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1374,7 +1340,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 uno::Sequence< beans::PropertyState > SAL_CALL
 SwXTextSection::getPropertyStates(
         const uno::Sequence< OUString >& rPropertyNames)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1456,7 +1421,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
 void SAL_CALL
 SwXTextSection::setPropertyToDefault(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1599,8 +1563,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
 uno::Any SAL_CALL
 SwXTextSection::getPropertyDefault(const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1653,7 +1615,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     return aRet;
 }
 
-OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXTextSection::getName()
 {
     SolarMutexGuard aGuard;
 
@@ -1675,7 +1637,6 @@ OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException, std::e
 }
 
 void SAL_CALL SwXTextSection::setName(const OUString& rName)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1723,7 +1684,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 OUString SAL_CALL
-SwXTextSection::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXTextSection::getImplementationName()
 {
     return OUString("SwXTextSection");
 }
@@ -1736,13 +1697,12 @@ static char const*const g_ServicesTextSection[] =
 };
 
 sal_Bool SAL_CALL SwXTextSection::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXTextSection::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXTextSection::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(
                 SAL_N_ELEMENTS(g_ServicesTextSection),
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 716ab9da1d10..80719286fe7f 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -258,17 +258,17 @@ const unsigned short aUnoToSvxAdjust[] =
     USHRT_MAX
 };
 
-OUString SwXFootnoteProperties::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXFootnoteProperties::getImplementationName()
 {
     return OUString("SwXFootnoteProperties");
 }
 
-sal_Bool SwXFootnoteProperties::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXFootnoteProperties::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXFootnoteProperties::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXFootnoteProperties::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.FootnoteSettings" };
     return aRet;
@@ -286,14 +286,12 @@ SwXFootnoteProperties::~SwXFootnoteProperties()
 }
 
 uno::Reference< beans::XPropertySetInfo >  SwXFootnoteProperties::getPropertySetInfo()
-                                                                throw( uno::RuntimeException, std::exception )
 {
     static uno::Reference< beans::XPropertySetInfo >  aRef = m_pPropertySet->getPropertySetInfo();
     return aRef;
 }
 
 void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(pDoc)
@@ -415,7 +413,6 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
 }
 
 uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -534,43 +531,39 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
 
 void SwXFootnoteProperties::addPropertyChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXFootnoteProperties::removePropertyChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXFootnoteProperties::addVetoableChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXFootnoteProperties::removeVetoableChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
-OUString SwXEndnoteProperties::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXEndnoteProperties::getImplementationName()
 {
     return OUString("SwXEndnoteProperties");
 }
 
-sal_Bool SwXEndnoteProperties::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXEndnoteProperties::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXEndnoteProperties::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXEndnoteProperties::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.FootnoteSettings" };
     return aRet;
@@ -586,15 +579,13 @@ SwXEndnoteProperties::~SwXEndnoteProperties()
 {
 }
 
-uno::Reference< beans::XPropertySetInfo >  SwXEndnoteProperties::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo >  SwXEndnoteProperties::getPropertySetInfo()
 {
     static uno::Reference< beans::XPropertySetInfo >  aRef = m_pPropertySet->getPropertySetInfo();
     return aRef;
 }
 
 void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException,
-        lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(pDoc)
@@ -671,7 +662,6 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
 }
 
 uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -759,42 +749,39 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
 }
 
 void SwXEndnoteProperties::addPropertyChangeListener(
-    const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+    const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXEndnoteProperties::removePropertyChangeListener(const OUString& /*PropertyName*/,
         const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/)
-        throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXEndnoteProperties::addVetoableChangeListener(const OUString& /*PropertyName*/,
     const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXEndnoteProperties::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
-OUString SwXLineNumberingProperties::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXLineNumberingProperties::getImplementationName()
 {
     return OUString("SwXLineNumberingProperties");
 }
 
-sal_Bool SwXLineNumberingProperties::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXLineNumberingProperties::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXLineNumberingProperties::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXLineNumberingProperties::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.LineNumberingProperties" };
     return aRet;
@@ -810,7 +797,7 @@ SwXLineNumberingProperties::~SwXLineNumberingProperties()
 {
 }
 
-uno::Reference< beans::XPropertySetInfo >  SwXLineNumberingProperties::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo >  SwXLineNumberingProperties::getPropertySetInfo()
 {
     static uno::Reference< beans::XPropertySetInfo >  aRef = m_pPropertySet->getPropertySetInfo();
     return aRef;
@@ -818,8 +805,6 @@ uno::Reference< beans::XPropertySetInfo >  SwXLineNumberingProperties::getProper
 
 void SwXLineNumberingProperties::setPropertyValue(
     const OUString& rPropertyName, const Any& aValue)
-        throw( UnknownPropertyException, PropertyVetoException,
-                IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(pDoc)
@@ -937,7 +922,6 @@ void SwXLineNumberingProperties::setPropertyValue(
 }
 
 Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     Any aRet;
@@ -1028,23 +1012,22 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName)
     return aRet;
 }
 
-void SwXLineNumberingProperties::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXLineNumberingProperties::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/)
 {
 OSL_FAIL("not implemented");
 }
 
-void SwXLineNumberingProperties::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXLineNumberingProperties::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XPropertyChangeListener > & /*xListener*/)
 {
 OSL_FAIL("not implemented");
 }
 
-void SwXLineNumberingProperties::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXLineNumberingProperties::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/)
 {
 OSL_FAIL("not implemented");
 }
 
 void SwXLineNumberingProperties::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno:: Reference< beans::XVetoableChangeListener > & /*xListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
 OSL_FAIL("not implemented");
 }
@@ -1078,7 +1061,7 @@ const uno::Sequence< sal_Int8 > & SwXNumberingRules::getUnoTunnelId()
 }
 
 // return implementation specific data
-sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw(uno::RuntimeException, std::exception)
+sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId )
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -1089,17 +1072,17 @@ sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId
     return 0;
 }
 
-OUString SwXNumberingRules::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXNumberingRules::getImplementationName()
 {
     return OUString("SwXNumberingRules");
 }
 
-sal_Bool SwXNumberingRules::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXNumberingRules::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXNumberingRules::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXNumberingRules::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.NumberingRules" };
     return aRet;
@@ -1176,8 +1159,6 @@ SwXNumberingRules::~SwXNumberingRules()
 }
 
 void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElement)
-    throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
-                  lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(nIndex < 0 || MAXLEVEL <= nIndex)
@@ -1245,14 +1226,12 @@ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElemen
         throw uno::RuntimeException();
 }
 
-sal_Int32 SwXNumberingRules::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXNumberingRules::getCount()
 {
     return MAXLEVEL;
 }
 
 uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex)
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(nIndex < 0 || MAXLEVEL <= nIndex)
@@ -1281,12 +1260,11 @@ uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Type SwXNumberingRules::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
 }
 
-sal_Bool SwXNumberingRules::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXNumberingRules::hasElements()
 {
     return true;
 }
@@ -1526,7 +1504,6 @@ static PropertyValue const* lcl_FindProperty(
 void SwXNumberingRules::SetNumberingRuleByIndex(
             SwNumRule& rNumRule,
             const uno::Sequence<beans::PropertyValue>& rProperties, sal_Int32 nIndex)
-    throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception)
 {
     SolarMutexGuard aGuard;
     OSL_ENSURE( 0 <= nIndex && nIndex < MAXLEVEL, "index out of range" );
@@ -2094,15 +2071,12 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
 }
 
 uno::Reference< XPropertySetInfo > SwXNumberingRules::getPropertySetInfo()
-    throw(RuntimeException, std::exception)
 {
     static uno::Reference< beans::XPropertySetInfo >  aRef = m_pPropertySet->getPropertySetInfo();
     return aRef;
 }
 
 void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
-    throw(UnknownPropertyException, PropertyVetoException,
-        IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwNumRule* pDocRule = nullptr;
@@ -2172,7 +2146,6 @@ void SwXNumberingRules::setPropertyValue( const OUString& rPropertyName, const A
 }
 
 Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName )
-    throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     Any aRet;
     const SwNumRule* pRule = pNumRule;
@@ -2214,29 +2187,25 @@ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName )
 
 void SwXNumberingRules::addPropertyChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SwXNumberingRules::removePropertyChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SwXNumberingRules::addVetoableChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SwXNumberingRules::removeVetoableChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
-OUString SwXNumberingRules::getName() throw( RuntimeException, std::exception )
+OUString SwXNumberingRules::getName()
 {
     if(pNumRule)
     {
@@ -2255,7 +2224,7 @@ OUString SwXNumberingRules::getName() throw( RuntimeException, std::exception )
     return m_sCreatedNumRuleName;
 }
 
-void SwXNumberingRules::setName(const OUString& /*rName*/) throw( RuntimeException, std::exception )
+void SwXNumberingRules::setName(const OUString& /*rName*/)
 {
     RuntimeException aExcept;
     aExcept.Message = "readonly";
@@ -2274,17 +2243,17 @@ void SwXNumberingRules::Impl::Modify( const SfxPoolItem* pOld, const SfxPoolItem
     }
 }
 
-OUString SwXChapterNumbering::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXChapterNumbering::getImplementationName()
 {
     return OUString("SwXChapterNumbering");
 }
 
-sal_Bool SwXChapterNumbering::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXChapterNumbering::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXChapterNumbering::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXChapterNumbering::getSupportedServiceNames()
 {
     Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -2302,17 +2271,17 @@ SwXChapterNumbering::~SwXChapterNumbering()
 {
 }
 
-OUString SwXTextColumns::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXTextColumns::getImplementationName()
 {
     return OUString("SwXTextColumns");
 }
 
-sal_Bool SwXTextColumns::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXTextColumns::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXTextColumns::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXTextColumns::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.TextColumns" };
     return aRet;
@@ -2384,19 +2353,19 @@ SwXTextColumns::~SwXTextColumns()
 {
 }
 
-sal_Int32 SwXTextColumns::getReferenceValue() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXTextColumns::getReferenceValue()
 {
     SolarMutexGuard aGuard;
     return nReference;
 }
 
-sal_Int16 SwXTextColumns::getColumnCount() throw( uno::RuntimeException, std::exception )
+sal_Int16 SwXTextColumns::getColumnCount()
 {
     SolarMutexGuard aGuard;
     return static_cast< sal_Int16>( aTextColumns.getLength() );
 }
 
-void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeException, std::exception )
+void SwXTextColumns::setColumnCount(sal_Int16 nColumns)
 {
     SolarMutexGuard aGuard;
     if(nColumns <= 0)
@@ -2417,14 +2386,13 @@ void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeExcep
     pCols[nColumns - 1].Width += nDiff;
 }
 
-uno::Sequence< TextColumn > SwXTextColumns::getColumns() throw( uno::RuntimeException, std::exception )
+uno::Sequence< TextColumn > SwXTextColumns::getColumns()
 {
     SolarMutexGuard aGuard;
     return aTextColumns;
 }
 
 void SwXTextColumns::setColumns(const uno::Sequence< TextColumn >& rColumns)
-            throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     sal_Int32 nReferenceTemp = 0;
@@ -2438,15 +2406,13 @@ void SwXTextColumns::setColumns(const uno::Sequence< TextColumn >& rColumns)
     aTextColumns = rColumns;
 }
 
-uno::Reference< XPropertySetInfo > SwXTextColumns::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+uno::Reference< XPropertySetInfo > SwXTextColumns::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo >  aRef = m_pPropSet->getPropertySetInfo();
     return aRef;
 }
 
 void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any& aValue )
-        throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException,
-            WrappedTargetException, RuntimeException, std::exception)
 {
     const SfxItemPropertySimpleEntry*  pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
     if (!pEntry)
@@ -2521,7 +2487,6 @@ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any&
 }
 
 Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     const SfxItemPropertySimpleEntry*  pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
     if (!pEntry)
@@ -2560,25 +2525,21 @@ Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName )
 
 void SwXTextColumns::addPropertyChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SwXTextColumns::removePropertyChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SwXTextColumns::addVetoableChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void SwXTextColumns::removeVetoableChangeListener(
     const OUString& /*rPropertyName*/, const uno::Reference< XVetoableChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
@@ -2593,7 +2554,6 @@ const uno::Sequence< sal_Int8 > & SwXTextColumns::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXTextColumns::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 5f5c9cc6f30c..7f94288aefa5 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -54,8 +54,7 @@ public:
     /// @throws beans::UnknownPropertyException
     /// @throws lang::IllegalArgumentException
     /// @throws uno::RuntimeException
-    void    SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs)
-        throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException );
+    void    SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs);
     const uno::Sequence< beans::PropertyValue > GetProperties() const;
 
     void    FillItemSet(SfxItemSet& rSet, bool bIsValueSearch) const;
@@ -80,7 +79,6 @@ SwSearchProperties_Impl::~SwSearchProperties_Impl()
 }
 
 void    SwSearchProperties_Impl::SetProperties(const uno::Sequence< beans::PropertyValue >& aSearchAttribs)
-                throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException )
 {
     const beans::PropertyValue* pProps = aSearchAttribs.getConstArray();
 
@@ -518,7 +516,6 @@ const uno::Sequence< sal_Int8 > & SwXTextSearch::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -529,40 +526,37 @@ sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >&
     return 0;
 }
 
-OUString SwXTextSearch::getSearchString() throw( uno::RuntimeException, std::exception )
+OUString SwXTextSearch::getSearchString()
 {
     SolarMutexGuard aGuard;
     return m_sSearchText;
 }
 
 void SwXTextSearch::setSearchString(const OUString& rString)
-                                        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     m_sSearchText = rString;
 }
 
-OUString SwXTextSearch::getReplaceString() throw( uno::RuntimeException, std::exception )
+OUString SwXTextSearch::getReplaceString()
 {
     SolarMutexGuard aGuard;
     return m_sReplaceText;
 }
 
-void SwXTextSearch::setReplaceString(const OUString& rReplaceString) throw( uno::RuntimeException, std::exception )
+void SwXTextSearch::setReplaceString(const OUString& rReplaceString)
 {
     SolarMutexGuard aGuard;
     m_sReplaceText = rReplaceString;
 }
 
-uno::Reference< beans::XPropertySetInfo >  SwXTextSearch::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo >  SwXTextSearch::getPropertySetInfo()
 {
     static uno::Reference< beans::XPropertySetInfo >  aRef = m_pPropSet->getPropertySetInfo();
     return aRef;
 }
 
 void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException,
-        lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     const SfxItemPropertySimpleEntry*  pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
@@ -593,7 +587,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A
         throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
 }
 
-uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -630,57 +624,54 @@ SET_UINT16:
     return aRet;
 }
 
-void SwXTextSearch::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextSearch::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXTextSearch::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException, std::exception )
+void SwXTextSearch::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXTextSearch::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException, std::exception )
+void SwXTextSearch::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-void SwXTextSearch::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw(beans::UnknownPropertyException, lang::WrappedTargetException,uno::RuntimeException, std::exception )
+void SwXTextSearch::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
 {
     OSL_FAIL("not implemented");
 }
 
-sal_Bool SwXTextSearch::getValueSearch() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextSearch::getValueSearch()
 {
     SolarMutexGuard aGuard;
     return m_bIsValueSearch;
 }
 
-void SwXTextSearch::setValueSearch(sal_Bool ValueSearch_) throw( uno::RuntimeException, std::exception )
+void SwXTextSearch::setValueSearch(sal_Bool ValueSearch_)
 {
     SolarMutexGuard aGuard;
     m_bIsValueSearch = ValueSearch_;
 }
 
-uno::Sequence< beans::PropertyValue > SwXTextSearch::getSearchAttributes() throw( uno::RuntimeException, std::exception )
+uno::Sequence< beans::PropertyValue > SwXTextSearch::getSearchAttributes()
 {
     return  m_pSearchProperties->GetProperties();
 }
 
 void SwXTextSearch::setSearchAttributes(const uno::Sequence< beans::PropertyValue >& rSearchAttribs)
-    throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     m_pSearchProperties->SetProperties(rSearchAttribs);
 }
 
 uno::Sequence< beans::PropertyValue > SwXTextSearch::getReplaceAttributes()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_pReplaceProperties->GetProperties();
 }
 
 void SwXTextSearch::setReplaceAttributes(const uno::Sequence< beans::PropertyValue >& rReplaceAttribs)
-    throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     m_pReplaceProperties->SetProperties(rReplaceAttribs);
 }
@@ -705,17 +696,17 @@ bool    SwXTextSearch::HasReplaceAttributes() const
     return m_pReplaceProperties->HasAttributes();
 }
 
-OUString SwXTextSearch::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextSearch::getImplementationName()
 {
     return OUString("SwXTextSearch");
 }
 
-sal_Bool SwXTextSearch::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextSearch::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXTextSearch::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXTextSearch::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 9e8c758266f9..f43a03b6dfde 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -198,17 +198,17 @@ namespace sw
         }
 
         //XIndexAccess
-        virtual sal_Int32 SAL_CALL getCount() throw( uno::RuntimeException, std::exception ) override
+        virtual sal_Int32 SAL_CALL getCount() override
         {
             SolarMutexGuard aGuard;
             return GetCountOrName(nullptr);
         };
-        virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
+        virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
         //XElementAccess
-        virtual uno::Type SAL_CALL SAL_CALL getElementType(  ) throw(uno::RuntimeException, std::exception) override
+        virtual uno::Type SAL_CALL SAL_CALL getElementType(  ) override
             { return cppu::UnoType<style::XStyle>::get(); };
-        virtual sal_Bool SAL_CALL SAL_CALL hasElements(  ) throw(uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL SAL_CALL hasElements(  ) override
         {
             if(!m_pBasePool)
                 throw uno::RuntimeException();
@@ -216,28 +216,28 @@ namespace sw
         }
 
         //XNameAccess
-        virtual uno::Any SAL_CALL getByName(const OUString& Name) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
-        virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw( uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( uno::RuntimeException, std::exception ) override;
+        virtual uno::Any SAL_CALL getByName(const OUString& Name) override;
+        virtual uno::Sequence< OUString > SAL_CALL getElementNames() override;
+        virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
         //XNameContainer
-        virtual void SAL_CALL insertByName(const OUString& Name, const uno::Any& Element) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL replaceByName(const OUString& Name, const uno::Any& Element) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeByName(const OUString& Name) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL insertByName(const OUString& Name, const uno::Any& Element) override;
+        virtual void SAL_CALL replaceByName(const OUString& Name, const uno::Any& Element) override;
+        virtual void SAL_CALL removeByName(const OUString& Name) override;
 
         //XPropertySet
-        virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (uno::RuntimeException, std::exception) override
+        virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override
             { return {}; };
-        virtual void SAL_CALL setPropertyValue( const OUString&, const uno::Any&) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setPropertyValue( const OUString&, const uno::Any&) override
             { SAL_WARN("sw.uno", "###unexpected!"); };
-        virtual uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) override
             { SAL_WARN("sw.uno", "###unexpected!"); };
-        virtual void SAL_CALL removePropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removePropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) override
             { SAL_WARN("sw.uno", "###unexpected!"); };
-        virtual void SAL_CALL addVetoableChangeListener(const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL addVetoableChangeListener(const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) override
             { SAL_WARN("sw.uno", "###unexpected!"); };
-        virtual void SAL_CALL removeVetoableChangeListener(const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeVetoableChangeListener(const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) override
             { SAL_WARN("sw.uno", "###unexpected!"); };
 
         //SfxListener
@@ -252,11 +252,11 @@ namespace sw
         }
 
         //XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( uno::RuntimeException, std::exception ) override
+        virtual OUString SAL_CALL getImplementationName() override
             { return {"XStyleFamily"}; };
-        virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) override
+        virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override
             { return cppu::supportsService(this, rServiceName); };
-        virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) override
+        virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
             { return { "com.sun.star.style.StyleFamily" }; }
     };
 
@@ -309,58 +309,58 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XNamed
-    virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& Name_) override;
 
     //XStyle
-    virtual sal_Bool SAL_CALL isUserDefined() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL isInUse() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getParentStyle() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isUserDefined() override;
+    virtual sal_Bool SAL_CALL isInUse() override;
+    virtual OUString SAL_CALL getParentStyle() override;
+    virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override
             { OSL_FAIL("not implemented"); };
-    virtual void SAL_CALL removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override
             { OSL_FAIL("not implemented"); };
-    virtual void SAL_CALL addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override
             { OSL_FAIL("not implemented"); };
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override
             { OSL_FAIL("not implemented"); };
 
     //XMultiPropertySet
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >&, const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >&, const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) override
             {};
-    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) override
             {};
-    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >&, const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >&, const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) override
             {};
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //XMultiPropertyStates
-    virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setAllPropertiesToDefault(  ) override;
+    virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override
+    virtual OUString SAL_CALL getImplementationName() override
             { return {"SwXStyle"}; };
-    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw( css::uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override
             { return cppu::supportsService(this, rServiceName); };
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //SfxListener
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
@@ -384,7 +384,7 @@ public:
     /// @throws lang::IllegalArgumentException
     /// @throws lang::WrappedTargetException
     /// @throws uno::RuntimeException
-    void SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase) throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception);
+    void SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase);
     void PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rVal, SwStyleBase_Impl& rBaseImpl);
 };
 
@@ -403,9 +403,9 @@ public:
     virtual void SAL_CALL acquire(  ) throw() override {SwXStyle::acquire();}
     virtual void SAL_CALL release(  ) throw() override {SwXStyle::release();}
 
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) override;
 
     //ICoreStyle
     virtual void SetItem(enum RES_FRMATR eAtr, const SfxPoolItem& rItem) override;
@@ -425,25 +425,25 @@ public:
     SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, const OUString& rStyleName);
     explicit SwXPageStyle(SwDocShell* pDocSh);
 
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
 
-    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 };
 
 
 using sw::XStyleFamily;
 
-OUString SwXStyleFamilies::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXStyleFamilies::getImplementationName()
     { return {"SwXStyleFamilies"}; }
 
-sal_Bool SwXStyleFamilies::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXStyleFamilies::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXStyleFamilies::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXStyleFamilies::getSupportedServiceNames()
     { return { "com.sun.star.style.StyleFamilies" }; }
 
 SwXStyleFamilies::SwXStyleFamilies(SwDocShell& rDocShell) :
@@ -455,10 +455,6 @@ SwXStyleFamilies::~SwXStyleFamilies()
     { }
 
 uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name)
-    throw(
-        container::NoSuchElementException,
-        lang::WrappedTargetException,
-        uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -471,7 +467,7 @@ uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name)
     return getByIndex(pEntry-pEntries->begin());
 }
 
-uno::Sequence< OUString > SwXStyleFamilies::getElementNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXStyleFamilies::getElementNames()
 {
     auto pEntries(lcl_GetStyleFamilyEntries());
     uno::Sequence<OUString> aNames(pEntries->size());
@@ -480,7 +476,7 @@ uno::Sequence< OUString > SwXStyleFamilies::getElementNames() throw( uno::Runtim
     return aNames;
 }
 
-sal_Bool SwXStyleFamilies::hasByName(const OUString& Name) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXStyleFamilies::hasByName(const OUString& Name)
 {
     auto pEntries(lcl_GetStyleFamilyEntries());
     const auto pEntry = std::find_if(pEntries->begin(), pEntries->end(),
@@ -488,13 +484,12 @@ sal_Bool SwXStyleFamilies::hasByName(const OUString& Name) throw( uno::RuntimeEx
     return pEntry != pEntries->end();
 }
 
-sal_Int32 SwXStyleFamilies::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXStyleFamilies::getCount()
 {
     return lcl_GetStyleFamilyEntries()->size();
 }
 
 uno::Any SwXStyleFamilies::getByIndex(sal_Int32 nIndex)
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     auto pEntries(lcl_GetStyleFamilyEntries());
     SolarMutexGuard aGuard;
@@ -511,18 +506,15 @@ uno::Any SwXStyleFamilies::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Type SwXStyleFamilies::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<container::XNameContainer>::get();
 }
 
-sal_Bool SwXStyleFamilies::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXStyleFamilies::hasElements()
     { return true; }
 
 void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
     const uno::Sequence< beans::PropertyValue >& aOptions)
-    throw (io::IOException, uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     if(!IsValid() || rURL.isEmpty())
@@ -555,7 +547,6 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
 }
 
 uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions()
-        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Sequence< beans::PropertyValue > aSeq(5);
@@ -824,7 +815,6 @@ static sal_uInt16 lcl_TranslateIndexRange(const sal_uInt16 nIndex)
 }
 
 uno::Any XStyleFamily::getByIndex(sal_Int32 nIndex)
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(nIndex < 0)
@@ -844,7 +834,6 @@ uno::Any XStyleFamily::getByIndex(sal_Int32 nIndex)
 }
 
 uno::Any XStyleFamily::getByName(const OUString& rName)
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     OUString sStyleName;
@@ -861,7 +850,7 @@ uno::Any XStyleFamily::getByName(const OUString& rName)
     return uno::makeAny(xStyle);
 }
 
-uno::Sequence<OUString> XStyleFamily::getElementNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence<OUString> XStyleFamily::getElementNames()
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -877,7 +866,7 @@ uno::Sequence<OUString> XStyleFamily::getElementNames() throw( uno::RuntimeExcep
     return comphelper::containerToSequence(vRet);
 }
 
-sal_Bool XStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeException, std::exception )
+sal_Bool XStyleFamily::hasByName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -891,7 +880,6 @@ sal_Bool XStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeExcep
 
 
 void XStyleFamily::insertByName(const OUString& rName, const uno::Any& rElement)
-        throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -963,7 +951,6 @@ void XStyleFamily::insertByName(const OUString& rName, const uno::Any& rElement)
 }
 
 void XStyleFamily::replaceByName(const OUString& rName, const uno::Any& rElement)
-    throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -1027,7 +1014,7 @@ void XStyleFamily::replaceByName(const OUString& rName, const uno::Any& rElement
     }
 }
 
-void XStyleFamily::removeByName(const OUString& rName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void XStyleFamily::removeByName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -1052,7 +1039,7 @@ void XStyleFamily::removeByName(const OUString& rName) throw( container::NoSuchE
         m_pBasePool->Remove(pBase);
 }
 
-uno::Any SAL_CALL XStyleFamily::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL XStyleFamily::getPropertyValue( const OUString& sPropertyName )
 {
     if(sPropertyName != "DisplayName")
         throw beans::UnknownPropertyException( "unknown property: " + sPropertyName, static_cast<OWeakObject *>(this) );
@@ -1183,7 +1170,6 @@ const uno::Sequence<sal_Int8>& SwXStyle::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXStyle::getSomething(const uno::Sequence<sal_Int8>& rId)
-    throw(uno::RuntimeException, std::exception)
 {
     if(rId.getLength() != 16)
         return 0;
@@ -1195,7 +1181,7 @@ sal_Int64 SAL_CALL SwXStyle::getSomething(const uno::Sequence<sal_Int8>& rId)
 }
 
 
-uno::Sequence< OUString > SwXStyle::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXStyle::getSupportedServiceNames()
 {
     long nCount = 1;
     if(SfxStyleFamily::Para == m_rEntry.m_eFamily)
@@ -1336,7 +1322,7 @@ void SwXStyle::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
     }
 }
 
-OUString SwXStyle::getName() throw( uno::RuntimeException, std::exception )
+OUString SwXStyle::getName()
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -1351,7 +1337,7 @@ OUString SwXStyle::getName() throw( uno::RuntimeException, std::exception )
     return aString;
 }
 
-void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException, std::exception )
+void SwXStyle::setName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -1370,7 +1356,7 @@ void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException, std:
     m_sStyleName = rName;
 }
 
-sal_Bool SwXStyle::isUserDefined() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXStyle::isUserDefined()
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -1381,7 +1367,7 @@ sal_Bool SwXStyle::isUserDefined() throw( uno::RuntimeException, std::exception
     return pBase && pBase->IsUserDefined();
 }
 
-sal_Bool SwXStyle::isInUse() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXStyle::isInUse()
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -1391,7 +1377,7 @@ sal_Bool SwXStyle::isInUse() throw( uno::RuntimeException, std::exception )
     return pBase && pBase->IsUsed();
 }
 
-OUString SwXStyle::getParentStyle() throw( uno::RuntimeException, std::exception )
+OUString SwXStyle::getParentStyle()
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -1409,7 +1395,7 @@ OUString SwXStyle::getParentStyle() throw( uno::RuntimeException, std::exception
     return aString;
 }
 
-void SwXStyle::setParentStyle(const OUString& rParentStyle) throw( container::NoSuchElementException, uno::RuntimeException, std::exception )
+void SwXStyle::setParentStyle(const OUString& rParentStyle)
 {
     SolarMutexGuard aGuard;
     OUString sParentStyle;
@@ -1442,7 +1428,7 @@ void SwXStyle::setParentStyle(const OUString& rParentStyle) throw( container::No
     }
 }
 
-uno::Reference<beans::XPropertySetInfo> SwXStyle::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference<beans::XPropertySetInfo> SwXStyle::getPropertySetInfo()
 {
     if(m_bIsConditional)
     {
@@ -1955,7 +1941,7 @@ void SwXStyle::SetPropertyValue<RES_PARATR_NUMRULE>(const SfxItemPropertySimpleE
     }
 }
 
-void SwXStyle::SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase) throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SwXStyle::SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase)
 {
     using propertytype_t = decltype(rEntry.nWID);
     using coresetter_t = std::function<void(SwXStyle&, const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any&, SwStyleBase_Impl&)>;
@@ -2045,7 +2031,6 @@ void SwXStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rPropertyNa
 }
 
 void SwXStyle::setPropertyValues(const uno::Sequence<OUString>& rPropertyNames, const uno::Sequence<uno::Any>& rValues)
-        throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     // workaround for bad designed API
@@ -2384,7 +2369,6 @@ uno::Any SwXStyle::GetPropertyValue_Impl(const SfxItemPropertySet* pPropSet, SwS
 }
 
 uno::Any SwXStyle::getPropertyValue(const OUString& rPropertyName)
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!m_pDoc)
@@ -2398,7 +2382,6 @@ uno::Any SwXStyle::getPropertyValue(const OUString& rPropertyName)
 }
 
 uno::Sequence<uno::Any> SwXStyle::getPropertyValues(const uno::Sequence<OUString>& rPropertyNames)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!m_pDoc)
@@ -2427,7 +2410,6 @@ uno::Sequence<uno::Any> SwXStyle::getPropertyValues(const uno::Sequence<OUString
 }
 
 void SwXStyle::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue)
-        throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const uno::Sequence<OUString> aProperties(&rPropertyName, 1);
@@ -2436,7 +2418,6 @@ void SwXStyle::setPropertyValue(const OUString& rPropertyName, const uno::Any& r
 }
 
 beans::PropertyState SwXStyle::getPropertyState(const OUString& rPropertyName)
-        throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence<OUString> aNames{rPropertyName};
@@ -2459,7 +2440,6 @@ const SfxItemSet* lcl_GetItemsetForProperty(const SfxItemSet& rSet, SfxStyleFami
     return &pSetItem->GetItemSet();
 }
 uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Sequence<OUString>& rPropertyNames)
-        throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence<beans::PropertyState> aRet(rPropertyNames.getLength());
@@ -2557,7 +2537,6 @@ uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Seque
 }
 
 void SwXStyle::setPropertyToDefault(const OUString& rPropertyName)
-        throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     const uno::Sequence<OUString> aSequence(&rPropertyName, 1);
     setPropertiesToDefault(aSequence);
@@ -2585,7 +2564,6 @@ SwFormat* lcl_GetFormatForStyle(SwDoc* pDoc, const rtl::Reference<SwDocStyleShee
 }
 
 void SAL_CALL SwXStyle::setPropertiesToDefault(const uno::Sequence<OUString>& aPropertyNames)
-        throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const rtl::Reference<SwDocStyleSheet> xStyle(new SwDocStyleSheet(*static_cast<SwDocStyleSheet*>(GetStyleSheetBase())));
@@ -2632,7 +2610,6 @@ void SAL_CALL SwXStyle::setPropertiesToDefault(const uno::Sequence<OUString>& aP
 }
 
 void SAL_CALL SwXStyle::setAllPropertiesToDefault()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!m_pBasePool)
@@ -2714,7 +2691,6 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault()
 }
 
 uno::Sequence<uno::Any> SAL_CALL SwXStyle::getPropertyDefaults(const uno::Sequence<OUString>& aPropertyNames)
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_Int32 nCount = aPropertyNames.getLength();
@@ -2755,7 +2731,6 @@ uno::Sequence<uno::Any> SAL_CALL SwXStyle::getPropertyDefaults(const uno::Sequen
 }
 
 uno::Any SwXStyle::getPropertyDefault(const OUString& rPropertyName)
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const uno::Sequence<OUString> aSequence(&rPropertyName, 1);
     return getPropertyDefaults(aSequence)[0];
@@ -3024,7 +2999,6 @@ void SwXPageStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rProper
 }
 
 void SwXPageStyle::setPropertyValues(const uno::Sequence<OUString>& rPropertyNames, const uno::Sequence<uno::Any>& rValues)
-        throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3250,7 +3224,6 @@ uno::Sequence<uno::Any> SwXPageStyle::GetPropertyValues_Impl(const uno::Sequence
 }
 
 uno::Sequence<uno::Any> SwXPageStyle::getPropertyValues(const uno::Sequence<OUString>& rPropertyNames)
-        throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence<uno::Any> aValues;
@@ -3273,7 +3246,6 @@ uno::Sequence<uno::Any> SwXPageStyle::getPropertyValues(const uno::Sequence<OUSt
 }
 
 uno::Any SwXPageStyle::getPropertyValue(const OUString& rPropertyName)
-        throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const uno::Sequence<OUString> aProperties(&rPropertyName, 1);
@@ -3281,7 +3253,6 @@ uno::Any SwXPageStyle::getPropertyValue(const OUString& rPropertyName)
 }
 
 void SwXPageStyle::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue)
-        throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const uno::Sequence<OUString> aProperties(&rPropertyName, 1);
@@ -3315,7 +3286,6 @@ const SfxPoolItem* SwXFrameStyle::GetItem(enum RES_FRMATR eAtr)
 }
 
 uno::Sequence<uno::Type> SwXFrameStyle::getTypes()
-        throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence<uno::Type> aTypes = SwXStyle::getTypes();
     sal_Int32 nLen = aTypes.getLength();
@@ -3325,7 +3295,6 @@ uno::Sequence<uno::Type> SwXFrameStyle::getTypes()
 }
 
 uno::Any SwXFrameStyle::queryInterface(const uno::Type& rType)
-        throw(uno::RuntimeException, std::exception)
 {
     if(rType == cppu::UnoType<XEventsSupplier>::get())
         return uno::makeAny(uno::Reference<XEventsSupplier>(this));
@@ -3333,7 +3302,6 @@ uno::Any SwXFrameStyle::queryInterface(const uno::Type& rType)
 }
 
 uno::Reference<container::XNameReplace> SwXFrameStyle::getEvents()
-        throw(uno::RuntimeException, std::exception)
 {
     return new SwFrameStyleEventDescriptor(*this);
 }
@@ -3370,14 +3338,12 @@ SwXAutoStyles::~SwXAutoStyles()
 {
 }
 
-sal_Int32 SwXAutoStyles::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXAutoStyles::getCount()
 {
     return AUTOSTYLE_FAMILY_COUNT;
 }
 
 uno::Any SwXAutoStyles::getByIndex(sal_Int32 nIndex)
-        throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-                uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -3421,18 +3387,17 @@ uno::Any SwXAutoStyles::getByIndex(sal_Int32 nIndex)
     return aRet;
 }
 
-uno::Type SwXAutoStyles::getElementType(  ) throw(uno::RuntimeException, std::exception)
+uno::Type SwXAutoStyles::getElementType(  )
 {
     return cppu::UnoType<style::XAutoStyleFamily>::get();
 }
 
-sal_Bool SwXAutoStyles::hasElements(  ) throw(uno::RuntimeException, std::exception)
+sal_Bool SwXAutoStyles::hasElements(  )
 {
     return true;
 }
 
 uno::Any SwXAutoStyles::getByName(const OUString& Name)
-        throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     uno::Any aRet;
     if(Name == "CharacterStyles")
@@ -3447,7 +3412,6 @@ uno::Any SwXAutoStyles::getByName(const OUString& Name)
 }
 
 uno::Sequence< OUString > SwXAutoStyles::getElementNames()
-            throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aNames(AUTOSTYLE_FAMILY_COUNT);
     OUString* pNames = aNames.getArray();
@@ -3458,7 +3422,6 @@ uno::Sequence< OUString > SwXAutoStyles::getElementNames()
 }
 
 sal_Bool SwXAutoStyles::hasByName(const OUString& Name)
-            throw( uno::RuntimeException, std::exception )
 {
     if( Name == "CharacterStyles" ||
         Name == "RubyStyles" ||
@@ -3488,7 +3451,6 @@ void SwXAutoStyleFamily::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNe
 
 uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
     const uno::Sequence< beans::PropertyValue >& Values )
-        throw (uno::RuntimeException, std::exception)
 {
     if (!m_pDocShell)
     {
@@ -3719,7 +3681,6 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
 }
 
 uno::Reference< container::XEnumeration > SwXAutoStyleFamily::createEnumeration(  )
-        throw (uno::RuntimeException, std::exception)
 {
     if( !m_pDocShell )
         throw uno::RuntimeException();
@@ -3727,12 +3688,12 @@ uno::Reference< container::XEnumeration > SwXAutoStyleFamily::createEnumeration(
         (new SwXAutoStylesEnumerator( m_pDocShell->GetDoc(), m_eFamily ));
 }
 
-uno::Type SwXAutoStyleFamily::getElementType(  ) throw(uno::RuntimeException, std::exception)
+uno::Type SwXAutoStyleFamily::getElementType(  )
 {
     return cppu::UnoType<style::XAutoStyle>::get();
 }
 
-sal_Bool SwXAutoStyleFamily::hasElements(  ) throw(uno::RuntimeException, std::exception)
+sal_Bool SwXAutoStyleFamily::hasElements(  )
 {
     return false;
 }
@@ -3792,7 +3753,6 @@ void SwXAutoStylesEnumerator::Modify( const SfxPoolItem* pOld, const SfxPoolItem
 }
 
 sal_Bool SwXAutoStylesEnumerator::hasMoreElements(  )
-    throw (uno::RuntimeException, std::exception)
 {
     if( !m_pImpl )
         throw uno::RuntimeException();
@@ -3800,7 +3760,6 @@ sal_Bool SwXAutoStylesEnumerator::hasMoreElements(  )
 }
 
 uno::Any SwXAutoStylesEnumerator::nextElement(  )
-    throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if( !m_pImpl )
         throw uno::RuntimeException();
@@ -3848,7 +3807,6 @@ void SwXAutoStyle::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
 }
 
 uno::Reference< beans::XPropertySetInfo > SwXAutoStyle::getPropertySetInfo(  )
-                throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< beans::XPropertySetInfo >  xRet;
     switch( meFamily )
@@ -3894,18 +3852,10 @@ uno::Reference< beans::XPropertySetInfo > SwXAutoStyle::getPropertySetInfo(  )
 }
 
 void SwXAutoStyle::setPropertyValue( const OUString& /*rPropertyName*/, const uno::Any& /*rValue*/ )
-     throw( beans::UnknownPropertyException,
-            beans::PropertyVetoException,
-            lang::IllegalArgumentException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception)
 {
 }
 
 uno::Any SwXAutoStyle::getPropertyValue( const OUString& rPropertyName )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     const uno::Sequence<OUString> aProperties(&rPropertyName, 1);
@@ -3914,47 +3864,32 @@ uno::Any SwXAutoStyle::getPropertyValue( const OUString& rPropertyName )
 
 void SwXAutoStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/,
                                               const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
 }
 
 void SwXAutoStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/,
                                                  const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
 }
 
 void SwXAutoStyle::addVetoableChangeListener( const OUString& /*PropertyName*/,
                                               const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
 }
 
 void SwXAutoStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/,
                                                  const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
 }
 
 void SwXAutoStyle::setPropertyValues(
         const uno::Sequence< OUString >& /*aPropertyNames*/,
         const uno::Sequence< uno::Any >& /*aValues*/ )
-            throw (beans::PropertyVetoException, lang::IllegalArgumentException,
-                lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl(
         const uno::Sequence< OUString > & rPropertyNames )
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
 {
     if( !mpSet.get() )
     {
@@ -4094,7 +4029,6 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl(
 
 uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues (
         const uno::Sequence< OUString >& rPropertyNames )
-            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Sequence< uno::Any > aValues;
@@ -4119,26 +4053,21 @@ uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues (
 void SwXAutoStyle::addPropertiesChangeListener(
         const uno::Sequence< OUString >& /*aPropertyNames*/,
         const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-            throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SwXAutoStyle::removePropertiesChangeListener(
         const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-            throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SwXAutoStyle::firePropertiesChangeEvent(
         const uno::Sequence< OUString >& /*aPropertyNames*/,
         const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
-            throw (uno::RuntimeException, std::exception)
 {
 }
 
 beans::PropertyState SwXAutoStyle::getPropertyState( const OUString& rPropertyName )
-    throw( beans::UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -4148,15 +4077,10 @@ beans::PropertyState SwXAutoStyle::getPropertyState( const OUString& rPropertyNa
 }
 
 void SwXAutoStyle::setPropertyToDefault( const OUString& /*PropertyName*/ )
-    throw( beans::UnknownPropertyException,
-           uno::RuntimeException, std::exception )
 {
 }
 
 uno::Any SwXAutoStyle::getPropertyDefault( const OUString& rPropertyName )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     const uno::Sequence < OUString > aSequence ( &rPropertyName, 1 );
     return getPropertyDefaults ( aSequence ).getConstArray()[0];
@@ -4164,7 +4088,6 @@ uno::Any SwXAutoStyle::getPropertyDefault( const OUString& rPropertyName )
 
 uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates(
         const uno::Sequence< OUString >& rPropertyNames )
-            throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     if (!mpSet.get())
     {
@@ -4248,26 +4171,22 @@ uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates(
 }
 
 void SwXAutoStyle::setAllPropertiesToDefault(  )
-            throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SwXAutoStyle::setPropertiesToDefault(
         const uno::Sequence< OUString >& /*rPropertyNames*/ )
-            throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
 }
 
 uno::Sequence< uno::Any > SwXAutoStyle::getPropertyDefaults(
         const uno::Sequence< OUString >& /*aPropertyNames*/ )
-            throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-                    uno::RuntimeException, std::exception)
 {
     uno::Sequence< uno::Any > aRet(0);
     return aRet;
 }
 
-uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties() throw (uno::RuntimeException, std::exception)
+uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties()
 {
     if( !mpSet.get() )
         throw uno::RuntimeException();
@@ -4462,7 +4381,7 @@ void SwXTextTableStyle::SetPhysical()
 }
 
 // XStyle
-sal_Bool SAL_CALL SwXTextTableStyle::isUserDefined() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextTableStyle::isUserDefined()
 {
     SolarMutexGuard aGuard;
     // only first style is not user defined
@@ -4472,7 +4391,7 @@ sal_Bool SAL_CALL SwXTextTableStyle::isUserDefined() throw (uno::RuntimeExceptio
     return true;
 }
 
-sal_Bool SAL_CALL SwXTextTableStyle::isInUse() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextTableStyle::isInUse()
 {
     SolarMutexGuard aGuard;
     if (!m_bPhysical)
@@ -4500,16 +4419,16 @@ sal_Bool SAL_CALL SwXTextTableStyle::isInUse() throw (uno::RuntimeException, std
     return false;
 }
 
-OUString SAL_CALL SwXTextTableStyle::getParentStyle() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXTextTableStyle::getParentStyle()
 {
     return OUString();
 }
 
-void SAL_CALL SwXTextTableStyle::setParentStyle(const OUString& /*aParentStyle*/) throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::setParentStyle(const OUString& /*aParentStyle*/)
 { }
 
 //XNamed
-OUString SAL_CALL SwXTextTableStyle::getName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXTextTableStyle::getName()
 {
     SolarMutexGuard aGuard;
     OUString sProgName;
@@ -4517,25 +4436,25 @@ OUString SAL_CALL SwXTextTableStyle::getName() throw(uno::RuntimeException, std:
     return sProgName;
 }
 
-void SAL_CALL SwXTextTableStyle::setName(const OUString& rName) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::setName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     m_pTableAutoFormat->SetName(rName);
 }
 
 //XPropertySet
-css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL SwXTextTableStyle::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL SwXTextTableStyle::getPropertySetInfo()
 {
     static uno::Reference<beans::XPropertySetInfo> xRef(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TABLE_STYLE)->getPropertySetInfo());
     return xRef;
 }
 
-void SAL_CALL SwXTextTableStyle::setPropertyValue(const OUString& /*rPropertyName*/, const css::uno::Any& /*aValue*/) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::setPropertyValue(const OUString& /*rPropertyName*/, const css::uno::Any& /*aValue*/)
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
-css::uno::Any SAL_CALL SwXTextTableStyle::getPropertyValue(const OUString& rPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL SwXTextTableStyle::getPropertyValue(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     bool bIsRow = false;
@@ -4554,28 +4473,28 @@ css::uno::Any SAL_CALL SwXTextTableStyle::getPropertyValue(const OUString& rProp
     return uno::makeAny(bIsRow ? OUString("row") : OUString("column"));
 }
 
-void SAL_CALL SwXTextTableStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ )
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
-void SAL_CALL SwXTextTableStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*aListener*/ )
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
-void SAL_CALL SwXTextTableStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ )
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
-void SAL_CALL SwXTextTableStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ )
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
 //XNameAccess
-uno::Any SAL_CALL SwXTextTableStyle::getByName(const OUString& rName) throw(container::NoSuchElementException, lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwXTextTableStyle::getByName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     const CellStyleNameMap& rMap = GetCellStyleNameMap();
@@ -4586,13 +4505,13 @@ uno::Any SAL_CALL SwXTextTableStyle::getByName(const OUString& rName) throw(cont
     return css::uno::Any(m_aCellStyles[(*iter).second]);
 }
 
-css::uno::Sequence<OUString> SAL_CALL SwXTextTableStyle::getElementNames() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL SwXTextTableStyle::getElementNames()
 {
     SolarMutexGuard aGuard;
     return comphelper::mapKeysToSequence(GetCellStyleNameMap());
 }
 
-sal_Bool SAL_CALL SwXTextTableStyle::hasByName(const OUString& rName) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextTableStyle::hasByName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     const CellStyleNameMap& rMap = GetCellStyleNameMap();
@@ -4601,12 +4520,12 @@ sal_Bool SAL_CALL SwXTextTableStyle::hasByName(const OUString& rName) throw(css:
 }
 
 //XNameContainer
-void SAL_CALL SwXTextTableStyle::insertByName(const OUString& /*Name*/, const uno::Any& /*Element*/) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::insertByName(const OUString& /*Name*/, const uno::Any& /*Element*/)
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
-void SAL_CALL SwXTextTableStyle::replaceByName(const OUString& rName, const uno::Any& rElement) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::replaceByName(const OUString& rName, const uno::Any& rElement)
 {
     SolarMutexGuard aGuard;
     const CellStyleNameMap& rMap = GetCellStyleNameMap();
@@ -4641,34 +4560,34 @@ void SAL_CALL SwXTextTableStyle::replaceByName(const OUString& rName, const uno:
     m_aCellStyles[nCellStyle] = xStyle;
 }
 
-void SAL_CALL SwXTextTableStyle::removeByName(const OUString& /*Name*/) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextTableStyle::removeByName(const OUString& /*Name*/)
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
 //XElementAccess
-uno::Type SAL_CALL SAL_CALL SwXTextTableStyle::getElementType() throw(uno::RuntimeException, std::exception)
+uno::Type SAL_CALL SAL_CALL SwXTextTableStyle::getElementType()
 {
     return cppu::UnoType<style::XStyle>::get();
 }
 
-sal_Bool SAL_CALL SAL_CALL SwXTextTableStyle::hasElements() throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SAL_CALL SwXTextTableStyle::hasElements()
 {
     return true;
 }
 
 //XServiceInfo
-OUString SAL_CALL SwXTextTableStyle::getImplementationName() throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXTextTableStyle::getImplementationName()
 {
     return {"SwXTextTableStyle"};
 }
 
-sal_Bool SAL_CALL SwXTextTableStyle::supportsService(const OUString& rServiceName) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextTableStyle::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-css::uno::Sequence<OUString> SAL_CALL SwXTextTableStyle::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL SwXTextTableStyle::getSupportedServiceNames()
 {
     return {"com.sun.star.style.Style"};
 }
@@ -4799,7 +4718,7 @@ css::uno::Reference<css::style::XStyle> SwXTextCellStyle::CreateXTextCellStyle(S
 }
 
 // XStyle
-sal_Bool SAL_CALL SwXTextCellStyle::isUserDefined() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextCellStyle::isUserDefined()
 {
     SolarMutexGuard aGuard;
     // if this cell belong to first table style then its default style
@@ -4809,7 +4728,7 @@ sal_Bool SAL_CALL SwXTextCellStyle::isUserDefined() throw (css::uno::RuntimeExce
     return true;
 }
 
-sal_Bool SAL_CALL SwXTextCellStyle::isInUse() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextCellStyle::isInUse()
 {
     SolarMutexGuard aGuard;
     uno::Reference<style::XStyleFamiliesSupplier> xFamiliesSupplier(m_pDocShell->GetModel(), uno::UNO_QUERY);
@@ -4833,13 +4752,13 @@ sal_Bool SAL_CALL SwXTextCellStyle::isInUse() throw (css::uno::RuntimeException,
     return xStyle->isInUse();
 }
 
-OUString SAL_CALL SwXTextCellStyle::getParentStyle() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXTextCellStyle::getParentStyle()
 {
     // Do not return name of the parent (which is a table style) because the parent should be a cell style.
     return OUString();
 }
 
-void SAL_CALL SwXTextCellStyle::setParentStyle(const OUString& /*sParentStyle*/) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCellStyle::setParentStyle(const OUString& /*sParentStyle*/)
 {
     SolarMutexGuard aGuard;
     // Changing parent to one which is unaware of it will lead to a something unexcpected. getName() rely on a parent.
@@ -4847,7 +4766,7 @@ void SAL_CALL SwXTextCellStyle::setParentStyle(const OUString& /*sParentStyle*/)
 }
 
 //XNamed
-OUString SAL_CALL SwXTextCellStyle::getName() throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXTextCellStyle::getName()
 {
     SolarMutexGuard aGuard;
     OUString sName;
@@ -4872,7 +4791,7 @@ OUString SAL_CALL SwXTextCellStyle::getName() throw(css::uno::RuntimeException,
     return sName;
 }
 
-void SAL_CALL SwXTextCellStyle::setName(const OUString& sName) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCellStyle::setName(const OUString& sName)
 {
     SolarMutexGuard aGuard;
     // if style is physical then we can not rename it.
@@ -4883,13 +4802,13 @@ void SAL_CALL SwXTextCellStyle::setName(const OUString& sName) throw(css::uno::R
 }
 
 //XPropertySet
-css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL SwXTextCellStyle::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL SwXTextCellStyle::getPropertySetInfo()
 {
     static uno::Reference<beans::XPropertySetInfo> xRef(aSwMapProvider.GetPropertySet(PROPERTY_MAP_CELL_STYLE)->getPropertySetInfo());
     return xRef;
 }
 
-void SAL_CALL SwXTextCellStyle::setPropertyValue(const OUString& rPropertyName, const css::uno::Any& aValue) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCellStyle::setPropertyValue(const OUString& rPropertyName, const css::uno::Any& aValue)
 {
     SolarMutexGuard aGuard;
     const SfxItemPropertySimpleEntry *const pEntry = aSwMapProvider.GetPropertySet(PROPERTY_MAP_CELL_STYLE)->getPropertyMap().getByName(rPropertyName);
@@ -5078,7 +4997,7 @@ void SAL_CALL SwXTextCellStyle::setPropertyValue(const OUString& rPropertyName,
     throw css::beans::UnknownPropertyException();
 }
 
-css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyValue(const OUString& rPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyValue(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -5242,28 +5161,28 @@ css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyValue(const OUString& rPrope
     throw css::beans::UnknownPropertyException();
 }
 
-void SAL_CALL SwXTextCellStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCellStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ )
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
-void SAL_CALL SwXTextCellStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCellStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const css::uno::Reference< css::beans::XPropertyChangeListener >& /*aListener*/ )
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
-void SAL_CALL SwXTextCellStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCellStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ )
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
-void SAL_CALL SwXTextCellStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCellStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const css::uno::Reference< css::beans::XVetoableChangeListener >& /*aListener*/ )
 {
     SAL_WARN("sw.uno", "not implemented");
 }
 
 //XPropertyState
-css::beans::PropertyState SAL_CALL SwXTextCellStyle::getPropertyState(const OUString& rPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+css::beans::PropertyState SAL_CALL SwXTextCellStyle::getPropertyState(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     uno::Sequence<OUString> aNames { rPropertyName };
@@ -5271,7 +5190,7 @@ css::beans::PropertyState SAL_CALL SwXTextCellStyle::getPropertyState(const OUSt
     return aStates.getConstArray()[0];
 }
 
-css::uno::Sequence<css::beans::PropertyState> SAL_CALL SwXTextCellStyle::getPropertyStates(const css::uno::Sequence<OUString>& aPropertyNames) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence<css::beans::PropertyState> SAL_CALL SwXTextCellStyle::getPropertyStates(const css::uno::Sequence<OUString>& aPropertyNames)
 {
     SolarMutexGuard aGuard;
     uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength());
@@ -5421,7 +5340,7 @@ css::uno::Sequence<css::beans::PropertyState> SAL_CALL SwXTextCellStyle::getProp
     return aRet;
 }
 
-void SAL_CALL SwXTextCellStyle::setPropertyToDefault(const OUString& rPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextCellStyle::setPropertyToDefault(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     const SwBoxAutoFormat& rDefaultBoxFormat = SwTableAutoFormat::GetDefaultBoxFormat();
@@ -5622,7 +5541,7 @@ void SAL_CALL SwXTextCellStyle::setPropertyToDefault(const OUString& rPropertyNa
     }
 }
 
-css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyDefault(const OUString& /*aPropertyName*/) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyDefault(const OUString& /*aPropertyName*/)
 {
     SAL_WARN("sw.uno", "not implemented");
     uno::Any aRet;
@@ -5630,17 +5549,17 @@ css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyDefault(const OUString& /*aP
 }
 
 //XServiceInfo
-OUString SAL_CALL SwXTextCellStyle::getImplementationName() throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXTextCellStyle::getImplementationName()
 {
     return {"SwXTextCellStyle"};
 }
 
-sal_Bool SAL_CALL SwXTextCellStyle::supportsService(const OUString& rServiceName) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextCellStyle::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-css::uno::Sequence<OUString> SAL_CALL SwXTextCellStyle::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL SwXTextCellStyle::getSupportedServiceNames()
 {
     return {"com.sun.star.style.Style"};
 }
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 2d9132ef3c67..a710722a085d 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -212,8 +212,6 @@ static bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSv
 static void lcl_SetSpecialProperty(SwFrameFormat* pFormat,
                                    const SfxItemPropertySimpleEntry* pEntry,
                                    const uno::Any& aValue)
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception)
 {
     // special treatment for "non-items"
     switch(pEntry->nWID)
@@ -793,7 +791,6 @@ const uno::Sequence< sal_Int8 > & SwXCell::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXCell::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -805,7 +802,7 @@ sal_Int64 SAL_CALL SwXCell::getSomething( const uno::Sequence< sal_Int8 >& rId )
         return SwXText::getSomething(rId);
 }
 
-uno::Sequence< uno::Type > SAL_CALL SwXCell::getTypes(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > SAL_CALL SwXCell::getTypes(  )
 {
     static uno::Sequence< uno::Type > aRetTypes;
 
@@ -819,7 +816,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXCell::getTypes(  ) throw(uno::RuntimeExce
     return aRetTypes;
 }
 
-uno::Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -837,7 +834,6 @@ void SAL_CALL SwXCell::release(  ) throw()
 }
 
 uno::Any SAL_CALL SwXCell::queryInterface( const uno::Type& aType )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aRet = SwXCellBaseClass::queryInterface(aType);
     if(aRet.getValueType() == cppu::UnoType<void>::get())
@@ -856,7 +852,7 @@ const SwStartNode *SwXCell::GetStartNode() const
 }
 
 uno::Reference< text::XTextCursor >
-SwXCell::CreateCursor() throw (uno::RuntimeException)
+SwXCell::CreateCursor()
 {
     return createTextCursor();
 }
@@ -883,7 +879,7 @@ bool SwXCell::IsValid() const
     return nullptr != pBox;
 }
 
-OUString SwXCell::getFormula() throw( uno::RuntimeException, std::exception )
+OUString SwXCell::getFormula()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -895,7 +891,7 @@ OUString SwXCell::getFormula() throw( uno::RuntimeException, std::exception )
 }
 
 ///@see sw_setValue (TODO: seems to be copy and paste programming here)
-void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException, std::exception )
+void SwXCell::setFormula(const OUString& rFormula)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -925,7 +921,7 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException,
     pMyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
 }
 
-double SwXCell::getValue() throw( uno::RuntimeException, std::exception )
+double SwXCell::getValue()
 {
     SolarMutexGuard aGuard;
     // #i112652# a table cell may contain NaN as a value, do not filter that
@@ -937,13 +933,13 @@ double SwXCell::getValue() throw( uno::RuntimeException, std::exception )
     return fRet;
 }
 
-void SwXCell::setValue(double rValue) throw( uno::RuntimeException, std::exception )
+void SwXCell::setValue(double rValue)
 {
     SolarMutexGuard aGuard;
     sw_setValue( *this, rValue );
 }
 
-table::CellContentType SwXCell::getType() throw( uno::RuntimeException, std::exception )
+table::CellContentType SwXCell::getType()
 {
     SolarMutexGuard aGuard;
 
@@ -961,20 +957,20 @@ table::CellContentType SwXCell::getType() throw( uno::RuntimeException, std::exc
     return  nRes;
 }
 
-void SwXCell::setString(const OUString& aString) throw( uno::RuntimeException, std::exception )
+void SwXCell::setString(const OUString& aString)
 {
     SolarMutexGuard aGuard;
     sw_setString( *this, aString );
 }
 
-sal_Int32 SwXCell::getError() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXCell::getError()
 {
     SolarMutexGuard aGuard;
     OUString sContent = getString();
     return sal_Int32(sContent.equals(SwViewShell::GetShellRes()->aCalc_Error));
 }
 
-uno::Reference<text::XTextCursor> SwXCell::createTextCursor() throw( uno::RuntimeException, std::exception )
+uno::Reference<text::XTextCursor> SwXCell::createTextCursor()
 {
     SolarMutexGuard aGuard;
     if(!pStartNode && !IsValid())
@@ -989,7 +985,6 @@ uno::Reference<text::XTextCursor> SwXCell::createTextCursor() throw( uno::Runtim
 }
 
 uno::Reference<text::XTextCursor> SwXCell::createTextCursorByRange(const uno::Reference< text::XTextRange > & xTextPosition)
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwUnoInternalPaM aPam(*GetDoc());
@@ -1007,14 +1002,13 @@ uno::Reference<text::XTextCursor> SwXCell::createTextCursorByRange(const uno::Re
         *aPam.GetPoint(), aPam.GetMark()));
 }
 
-uno::Reference< beans::XPropertySetInfo >  SwXCell::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo >  SwXCell::getPropertySetInfo()
 {
     static uno::Reference< beans::XPropertySetInfo >  xRef = m_pPropSet->getPropertySetInfo();
     return xRef;
 }
 
 void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1067,7 +1061,6 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV
 }
 
 uno::Any SwXCell::getPropertyValue(const OUString& rPropertyName)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1112,19 +1105,19 @@ uno::Any SwXCell::getPropertyValue(const OUString& rPropertyName)
     }
 }
 
-void SwXCell::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXCell::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-void SwXCell::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXCell::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-void SwXCell::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXCell::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-void SwXCell::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXCell::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-uno::Reference<container::XEnumeration> SwXCell::createEnumeration() throw( uno::RuntimeException, std::exception )
+uno::Reference<container::XEnumeration> SwXCell::createEnumeration()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1139,12 +1132,12 @@ uno::Reference<container::XEnumeration> SwXCell::createEnumeration() throw( uno:
     return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_TBLTEXT, pSttNd, pTable);
 }
 
-uno::Type SAL_CALL SwXCell::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type SAL_CALL SwXCell::getElementType()
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SwXCell::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXCell::hasElements()
 {
     return true;
 }
@@ -1258,22 +1251,22 @@ uno::Any SwXCell::GetAny() const
     return bIsNum ? uno::makeAny(getValue()) : uno::makeAny(const_cast<SwXCell*>(this)->getString());
 }
 
-OUString SwXCell::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXCell::getImplementationName()
     { return OUString("SwXCell"); }
 
-sal_Bool SwXCell::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXCell::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
 
-uno::Sequence< OUString > SwXCell::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXCell::getSupportedServiceNames()
     { return {"com.sun.star.text.CellProperties"}; }
 
-OUString SwXTextTableRow::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextTableRow::getImplementationName()
     { return OUString("SwXTextTableRow"); }
 
-sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
 
-uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames()
     { return {"com.sun.star.text.TextTableRow"}; }
 
 
@@ -1290,19 +1283,13 @@ SwXTextTableRow::~SwXTextTableRow()
         GetRegisteredIn()->Remove(this);
 }
 
-uno::Reference< beans::XPropertySetInfo > SwXTextTableRow::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo > SwXTextTableRow::getPropertySetInfo()
 {
     static uno::Reference<beans::XPropertySetInfo> xRef = m_pPropSet->getPropertySetInfo();
     return xRef;
 }
 
 void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
-    throw (beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
@@ -1381,7 +1368,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno:
     }
 }
 
-uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -1426,16 +1413,16 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw(
     return aRet;
 }
 
-void SwXTextTableRow::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTableRow::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-void SwXTextTableRow::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTableRow::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-void SwXTextTableRow::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTableRow::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-void SwXTextTableRow::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTableRow::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
 void SwXTextTableRow::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
@@ -1462,10 +1449,10 @@ SwTableLine* SwXTextTableRow::FindLine(SwTable* pTable, SwTableLine* pLine)
 
 // SwXTextTableCursor
 
-OUString SwXTextTableCursor::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextTableCursor::getImplementationName()
     { return OUString("SwXTextTableCursor"); }
 
-sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
 
 void SwXTextTableCursor::acquire() throw()
@@ -1481,7 +1468,6 @@ void SwXTextTableCursor::release() throw()
 
 css::uno::Any SAL_CALL
 SwXTextTableCursor::queryInterface( const css::uno::Type& _rType )
-        throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any aReturn = SwXTextTableCursor_Base::queryInterface( _rType );
     if ( !aReturn.hasValue() )
@@ -1496,7 +1482,7 @@ SwDoc*              SwXTextTableCursor::GetDoc()        { return GetFrameFormat(
 const SwUnoCursor&    SwXTextTableCursor::GetCursor() const { return *m_pUnoCursor; }
 SwUnoCursor&          SwXTextTableCursor::GetCursor()       { return *m_pUnoCursor; }
 
-uno::Sequence<OUString> SwXTextTableCursor::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence<OUString> SwXTextTableCursor::getSupportedServiceNames()
     { return {"com.sun.star.text.TextTableCursor"}; }
 
 SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox) :
@@ -1530,7 +1516,6 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat& rTableFormat, const SwTabl
 }
 
 OUString SwXTextTableCursor::getRangeName()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1558,7 +1543,6 @@ OUString SwXTextTableCursor::getRangeName()
 }
 
 sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& sCellName, sal_Bool bExpand)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1567,7 +1551,7 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& sCellName, sal_Bool
     return rTableCursor.GotoTableBox(sCellName);
 }
 
-sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1576,7 +1560,7 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand) throw( un
     return rTableCursor.Left(Count);
 }
 
-sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1585,7 +1569,7 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) throw( u
     return rTableCursor.Right(Count);
 }
 
-sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1594,7 +1578,7 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand) throw( uno:
     return rTableCursor.UpDown(true, Count, nullptr, 0);
 }
 
-sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool bExpand)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1603,7 +1587,7 @@ sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool bExpand) throw( un
     return rTableCursor.UpDown(false, Count, nullptr, 0);
 }
 
-void SwXTextTableCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
+void SwXTextTableCursor::gotoStart(sal_Bool bExpand)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1612,7 +1596,7 @@ void SwXTextTableCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeExceptio
     rTableCursor.MoveTable(GotoCurrTable, fnTableStart);
 }
 
-void SwXTextTableCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
+void SwXTextTableCursor::gotoEnd(sal_Bool bExpand)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1622,7 +1606,6 @@ void SwXTextTableCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException,
 }
 
 sal_Bool SwXTextTableCursor::mergeRange()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1649,7 +1632,6 @@ sal_Bool SwXTextTableCursor::mergeRange()
 }
 
 sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (Count <= 0)
@@ -1670,19 +1652,13 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal)
     return bResult;
 }
 
-uno::Reference< beans::XPropertySetInfo >  SwXTextTableCursor::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo >  SwXTextTableCursor::getPropertySetInfo()
 {
     static uno::Reference< beans::XPropertySetInfo >  xRef = m_pPropSet->getPropertySetInfo();
     return xRef;
 }
 
 void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
-    throw (beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1738,10 +1714,6 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u
 }
 
 uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
-    throw (beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     SwUnoCursor& rUnoCursor = GetCursor();
@@ -1789,16 +1761,16 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
     return aResult;
 }
 
-void SwXTextTableCursor::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTableCursor::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-void SwXTextTableCursor::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTableCursor::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-void SwXTextTableCursor::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTableCursor::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
-void SwXTextTableCursor::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTableCursor::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); };
 
 void SwXTextTableCursor::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
@@ -2026,7 +1998,6 @@ const uno::Sequence< sal_Int8 > & SwXTextTable::getUnoTunnelId()
     { return theSwXTextTableUnoTunnelId::get().getSeq(); }
 
 sal_Int64 SAL_CALL SwXTextTable::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if(rId.getLength() == 16
             && 0 == memcmp(getUnoTunnelId().getConstArray(), rId.getConstArray(), 16))
@@ -2072,7 +2043,7 @@ SwFrameFormat* SwXTextTable::GetFrameFormat()
     return m_pImpl->GetFrameFormat();
 }
 
-void SwXTextTable::initialize(sal_Int32 nR, sal_Int32 nC) throw( uno::RuntimeException, std::exception )
+void SwXTextTable::initialize(sal_Int32 nR, sal_Int32 nC)
 {
     if (!m_pImpl->IsDescriptor() || nR <= 0 || nC <= 0 || nR >= USHRT_MAX || nC >= USHRT_MAX)
         throw uno::RuntimeException();
@@ -2081,7 +2052,6 @@ void SwXTextTable::initialize(sal_Int32 nR, sal_Int32 nC) throw( uno::RuntimeExc
 }
 
 uno::Reference<table::XTableRows> SAL_CALL SwXTextTable::getRows()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XTableRows> xResult(m_pImpl->m_xRows);
@@ -2095,7 +2065,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference<table::XTableColumns> SAL_CALL SwXTextTable::getColumns()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference<table::XTableColumns> xResult(m_pImpl->m_xColumns);
@@ -2108,7 +2077,7 @@ throw (uno::RuntimeException, std::exception)
     return xResult;
 }
 
-uno::Reference<table::XCell> SwXTextTable::getCellByName(const OUString& sCellName) throw( uno::RuntimeException, std::exception )
+uno::Reference<table::XCell> SwXTextTable::getCellByName(const OUString& sCellName)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
@@ -2119,7 +2088,7 @@ uno::Reference<table::XCell> SwXTextTable::getCellByName(const OUString& sCellNa
     return SwXCell::CreateXCell(pFormat, pBox);
 }
 
-uno::Sequence<OUString> SwXTextTable::getCellNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence<OUString> SwXTextTable::getCellNames()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat(GetFrameFormat());
@@ -2134,7 +2103,6 @@ uno::Sequence<OUString> SwXTextTable::getCellNames() throw( uno::RuntimeExceptio
 }
 
 uno::Reference<text::XTextTableCursor> SwXTextTable::createCursorByCellName(const OUString& sCellName)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
@@ -2148,7 +2116,6 @@ uno::Reference<text::XTextTableCursor> SwXTextTable::createCursorByCellName(cons
 
 void SAL_CALL
 SwXTextTable::attach(const uno::Reference<text::XTextRange> & xTextRange)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2221,14 +2188,13 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference<text::XTextRange>  SwXTextTable::getAnchor()
-        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
     return new SwXTextRange(*pFormat);
 }
 
-void SwXTextTable::dispose() throw( uno::RuntimeException, std::exception )
+void SwXTextTable::dispose()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
@@ -2241,7 +2207,6 @@ void SwXTextTable::dispose() throw( uno::RuntimeException, std::exception )
 
 void SAL_CALL SwXTextTable::addEventListener(
         const uno::Reference<lang::XEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_Listeners.addInterface(
@@ -2250,7 +2215,6 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXTextTable::removeEventListener(
         const uno::Reference< lang::XEventListener > & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_Listeners.removeInterface(
@@ -2258,7 +2222,6 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference<table::XCell>  SwXTextTable::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow)
-    throw( uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat(GetFrameFormat());
@@ -2305,7 +2268,6 @@ uno::Reference<table::XCellRange> GetRangeByName(
 } // namespace
 
 uno::Reference<table::XCellRange>  SwXTextTable::getCellRangeByPosition(sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom)
-    throw(uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat(GetFrameFormat());
@@ -2332,7 +2294,6 @@ uno::Reference<table::XCellRange>  SwXTextTable::getCellRangeByPosition(sal_Int3
 }
 
 uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByName(const OUString& sRange)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< table::XCellRange >  aRef;
@@ -2357,7 +2318,6 @@ uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByName(const OUStrin
 }
 
 uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this));
@@ -2368,7 +2328,6 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray()
 }
 
 void SAL_CALL SwXTextTable::setDataArray(const uno::Sequence< uno::Sequence< uno::Any > >& rArray)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this));
@@ -2379,7 +2338,6 @@ void SAL_CALL SwXTextTable::setDataArray(const uno::Sequence< uno::Sequence< uno
 }
 
 uno::Sequence< uno::Sequence< double > > SwXTextTable::getData()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this));
@@ -2392,7 +2350,6 @@ uno::Sequence< uno::Sequence< double > > SwXTextTable::getData()
 }
 
 void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData)
-                                        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this));
@@ -2407,7 +2364,6 @@ void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData
 }
 
 uno::Sequence<OUString> SwXTextTable::getRowDescriptions()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this));
@@ -2420,7 +2376,6 @@ uno::Sequence<OUString> SwXTextTable::getRowDescriptions()
 }
 
 void SwXTextTable::setRowDescriptions(const uno::Sequence<OUString>& rRowDesc)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this));
@@ -2433,7 +2388,6 @@ void SwXTextTable::setRowDescriptions(const uno::Sequence<OUString>& rRowDesc)
 }
 
 uno::Sequence<OUString> SwXTextTable::getColumnDescriptions()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this));
@@ -2446,7 +2400,6 @@ uno::Sequence<OUString> SwXTextTable::getColumnDescriptions()
 }
 
 void SwXTextTable::setColumnDescriptions(const uno::Sequence<OUString>& rColumnDesc)
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::pair<sal_uInt16, sal_uInt16> const RowsAndColumns(SwXTextTable::Impl::ThrowIfComplex(*this));
@@ -2460,7 +2413,6 @@ void SwXTextTable::setColumnDescriptions(const uno::Sequence<OUString>& rColumnD
 
 void SAL_CALL SwXTextTable::addChartDataChangeEventListener(
     const uno::Reference<chart::XChartDataChangeEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_Listeners.addInterface(
@@ -2469,21 +2421,20 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXTextTable::removeChartDataChangeEventListener(
     const uno::Reference<chart::XChartDataChangeEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_Listeners.removeInterface(
             cppu::UnoType<chart::XChartDataChangeEventListener>::get(), xListener);
 }
 
-sal_Bool SwXTextTable::isNotANumber(double nNumber) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTable::isNotANumber(double nNumber)
 {
     // We use DBL_MIN because starcalc does (which uses it because chart
     // wants it that way!)
     return ( nNumber == DBL_MIN );
 }
 
-double SwXTextTable::getNotANumber() throw( uno::RuntimeException, std::exception )
+double SwXTextTable::getNotANumber()
 {
     // We use DBL_MIN because starcalc does (which uses it because chart
     // wants it that way!)
@@ -2491,7 +2442,6 @@ double SwXTextTable::getNotANumber() throw( uno::RuntimeException, std::exceptio
 }
 
 uno::Sequence< beans::PropertyValue > SwXTextTable::createSortDescriptor()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -2499,7 +2449,6 @@ uno::Sequence< beans::PropertyValue > SwXTextTable::createSortDescriptor()
 }
 
 void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwSortOptions aSortOpt;
@@ -2521,8 +2470,6 @@ void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor
 }
 
 void SwXTextTable::autoFormat(const OUString& sAutoFormatName)
-    throw (lang::IllegalArgumentException, uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
@@ -2545,16 +2492,13 @@ void SwXTextTable::autoFormat(const OUString& sAutoFormatName)
         }
 }
 
-uno::Reference< beans::XPropertySetInfo >  SwXTextTable::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo >  SwXTextTable::getPropertySetInfo()
 {
     static uno::Reference<beans::XPropertySetInfo> xRef = m_pImpl->m_pPropSet->getPropertySetInfo();
     return xRef;
 }
 
 void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
-          lang::IllegalArgumentException, lang::WrappedTargetException,
-          uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -2810,10 +2754,6 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
 }
 
 uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
-    throw (beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -3060,19 +3000,19 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
     return aRet;
 }
 
-void SwXTextTable::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTable::addPropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
-void SwXTextTable::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTable::removePropertyChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
-void SwXTextTable::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTable::addVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
-void SwXTextTable::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXTextTable::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/)
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
-OUString SwXTextTable::getName() throw( uno::RuntimeException, std::exception )
+OUString SwXTextTable::getName()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -3085,7 +3025,7 @@ OUString SwXTextTable::getName() throw( uno::RuntimeException, std::exception )
     return m_pImpl->m_sTableName;
 }
 
-void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException, std::exception )
+void SwXTextTable::setName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFormat = GetFrameFormat();
@@ -3193,13 +3133,13 @@ void SwXTextTable::Impl::Modify(
     }
 }
 
-OUString SAL_CALL SwXTextTable::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SwXTextTable::getImplementationName()
     { return OUString("SwXTextTable"); }
 
-sal_Bool SwXTextTable::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextTable::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
 
-uno::Sequence<OUString> SwXTextTable::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SwXTextTable::getSupportedServiceNames()
 {
     return {
         "com.sun.star.document.LinkTarget",
@@ -3271,7 +3211,6 @@ const uno::Sequence< sal_Int8 > & SwXCellRange::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXCellRange::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -3283,13 +3222,13 @@ sal_Int64 SAL_CALL SwXCellRange::getSomething( const uno::Sequence< sal_Int8 >&
 }
 
 
-OUString SwXCellRange::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXCellRange::getImplementationName()
     { return OUString("SwXCellRange"); }
 
-sal_Bool SwXCellRange::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXCellRange::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
 
-uno::Sequence<OUString> SwXCellRange::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence<OUString> SwXCellRange::getSupportedServiceNames()
 {
     return {
         "com.sun.star.text.CellRange",
@@ -3343,7 +3282,6 @@ std::vector< uno::Reference< table::XCell > > SwXCellRange::GetCells()
 
 uno::Reference<table::XCell> SAL_CALL
 SwXCellRange::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow)
-    throw( uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Reference< table::XCell >  aRet;
@@ -3368,8 +3306,6 @@ SwXCellRange::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow)
 uno::Reference<table::XCellRange> SAL_CALL
 SwXCellRange::getCellRangeByPosition(
         sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom)
-    throw (uno::RuntimeException, lang::IndexOutOfBoundsException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< table::XCellRange >  aRet;
@@ -3422,7 +3358,6 @@ SwXCellRange::getCellRangeByPosition(
 
 uno::Reference<table::XCellRange> SAL_CALL
 SwXCellRange::getCellRangeByName(const OUString& rRange)
-        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     sal_Int32 nPos = 0;
@@ -3442,7 +3377,7 @@ SwXCellRange::getCellRangeByName(const OUString& rRange)
                 aDesc.nBottom - m_pImpl->m_RangeDescriptor.nTop);
 }
 
-uno::Reference< beans::XPropertySetInfo >  SwXCellRange::getPropertySetInfo() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySetInfo >  SwXCellRange::getPropertySetInfo()
 {
     static uno::Reference<beans::XPropertySetInfo> xRef = m_pImpl->m_pPropSet->getPropertySetInfo();
     return xRef;
@@ -3450,12 +3385,6 @@ uno::Reference< beans::XPropertySetInfo >  SwXCellRange::getPropertySetInfo() th
 
 void SAL_CALL
 SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
-    throw (beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     SwFrameFormat *const pFormat = m_pImpl->GetFrameFormat();
@@ -3577,10 +3506,6 @@ SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV
 }
 
 uno::Any SAL_CALL SwXCellRange::getPropertyValue(const OUString& rPropertyName)
-    throw (beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -3663,21 +3588,20 @@ uno::Any SAL_CALL SwXCellRange::getPropertyValue(const OUString& rPropertyName)
     return aRet;
 }
 
-void SwXCellRange::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXCellRange::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
-void SwXCellRange::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXCellRange::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
-void SwXCellRange::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXCellRange::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
-void SwXCellRange::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
+void SwXCellRange::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
 ///@see SwXCellRange::getData
 uno::Sequence<uno::Sequence<uno::Any>> SAL_CALL SwXCellRange::getDataArray()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const sal_Int32 nRowCount = m_pImpl->GetRowCount();
@@ -3704,7 +3628,7 @@ uno::Sequence<uno::Sequence<uno::Any>> SAL_CALL SwXCellRange::getDataArray()
 }
 
 ///@see SwXCellRange::setData
-void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno::Any > >& rArray) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno::Any > >& rArray)
 {
     SolarMutexGuard aGuard;
     const sal_Int32 nRowCount = m_pImpl->GetRowCount();
@@ -3739,7 +3663,7 @@ void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno
 }
 
 uno::Sequence<uno::Sequence<double>> SAL_CALL
-SwXCellRange::getData() throw (uno::RuntimeException, std::exception)
+SwXCellRange::getData()
 {
     SolarMutexGuard aGuard;
     const sal_Int32 nRowCount = m_pImpl->GetRowCount();
@@ -3771,7 +3695,6 @@ SwXCellRange::getData() throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL
 SwXCellRange::setData(const uno::Sequence< uno::Sequence<double> >& rData)
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     const sal_Int32 nRowCount = m_pImpl->GetRowCount();
@@ -3841,13 +3764,11 @@ SwXCellRange::Impl::GetLabelDescriptions(SwXCellRange & rThis, bool bRow)
 }
 
 uno::Sequence<OUString> SAL_CALL SwXCellRange::getRowDescriptions()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_pImpl->GetLabelDescriptions(*this, true);
 }
 
 uno::Sequence<OUString> SAL_CALL SwXCellRange::getColumnDescriptions()
-    throw (uno::RuntimeException, std::exception)
 {
     return m_pImpl->GetLabelDescriptions(*this, false);
 }
@@ -3874,21 +3795,18 @@ void SwXCellRange::Impl::SetLabelDescriptions(SwXCellRange & rThis,
 
 void SAL_CALL SwXCellRange::setRowDescriptions(
         const uno::Sequence<OUString>& rRowDesc)
-    throw(uno::RuntimeException, std::exception)
 {
     m_pImpl->SetLabelDescriptions(*this, rRowDesc, true);
 }
 
 void SAL_CALL SwXCellRange::setColumnDescriptions(
         const uno::Sequence<OUString>& rColumnDesc)
-    throw(uno::RuntimeException, std::exception)
 {
     m_pImpl->SetLabelDescriptions(*this, rColumnDesc, false);
 }
 
 void SAL_CALL SwXCellRange::addChartDataChangeEventListener(
         const uno::Reference<chart::XChartDataChangeEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_ChartListeners.addInterface(xListener);
@@ -3896,27 +3814,24 @@ throw (uno::RuntimeException, std::exception)
 
 void SAL_CALL SwXCellRange::removeChartDataChangeEventListener(
         const uno::Reference<chart::XChartDataChangeEventListener> & xListener)
-throw (uno::RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_ChartListeners.removeInterface(xListener);
 }
 
-sal_Bool SwXCellRange::isNotANumber(double /*fNumber*/) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXCellRange::isNotANumber(double /*fNumber*/)
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
-double SwXCellRange::getNotANumber() throw( uno::RuntimeException, std::exception )
+double SwXCellRange::getNotANumber()
     { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); }
 
-uno::Sequence< beans::PropertyValue > SwXCellRange::createSortDescriptor() throw( uno::RuntimeException, std::exception )
+uno::Sequence< beans::PropertyValue > SwXCellRange::createSortDescriptor()
 {
     SolarMutexGuard aGuard;
     return SwUnoCursorHelper::CreateSortDescriptor(true);
 }
 
 void SAL_CALL SwXCellRange::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor)
-    throw (uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     SwSortOptions aSortOpt;
@@ -3978,13 +3893,13 @@ protected:
 
 //  SwXTableRows
 
-OUString SwXTableRows::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTableRows::getImplementationName()
     { return OUString("SwXTableRows"); }
 
-sal_Bool SwXTableRows::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTableRows::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
 
-uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames()
     { return { "com.sun.star.text.TableRows" }; }
 
 
@@ -4000,7 +3915,7 @@ SwFrameFormat* SwXTableRows::GetFrameFormat()
     return static_cast<SwFrameFormat*>(m_pImpl->GetRegisteredIn());
 }
 
-sal_Int32 SwXTableRows::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXTableRows::getCount()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFrameFormat = GetFrameFormat();
@@ -4012,7 +3927,6 @@ sal_Int32 SwXTableRows::getCount() throw( uno::RuntimeException, std::exception
 
 ///@see SwXCell::CreateXCell (TODO: seems to be copy and paste programming here)
 uno::Any SwXTableRows::getByIndex(sal_Int32 nIndex)
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)));
@@ -4030,12 +3944,12 @@ uno::Any SwXTableRows::getByIndex(sal_Int32 nIndex)
     return uno::makeAny(xRet);
 }
 
-uno::Type SAL_CALL SwXTableRows::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type SAL_CALL SwXTableRows::getElementType()
 {
     return cppu::UnoType<beans::XPropertySet>::get();
 }
 
-sal_Bool SwXTableRows::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTableRows::hasElements()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFrameFormat = GetFrameFormat();
@@ -4046,7 +3960,6 @@ sal_Bool SwXTableRows::hasElements() throw( uno::RuntimeException, std::exceptio
 }
 
 void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nCount == 0)
@@ -4086,7 +3999,6 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
 }
 
 void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nCount == 0)
@@ -4143,13 +4055,13 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 };
 
-OUString SwXTableColumns::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXTableColumns::getImplementationName()
     { return OUString("SwXTableColumns"); }
 
-sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName)
     { return cppu::supportsService(this, rServiceName); }
 
-uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames()
     { return { "com.sun.star.text.TableColumns"}; }
 
 
@@ -4165,7 +4077,7 @@ SwFrameFormat* SwXTableColumns::GetFrameFormat() const
     return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(m_pImpl->GetRegisteredIn()));
 }
 
-sal_Int32 SwXTableColumns::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXTableColumns::getCount()
 {
     SolarMutexGuard aGuard;
     SwFrameFormat* pFrameFormat(lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)));
@@ -4178,7 +4090,6 @@ sal_Int32 SwXTableColumns::getCount() throw( uno::RuntimeException, std::excepti
 }
 
 uno::Any SwXTableColumns::getByIndex(sal_Int32 nIndex)
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(nIndex < 0 || getCount() <= nIndex)
@@ -4186,12 +4097,12 @@ uno::Any SwXTableColumns::getByIndex(sal_Int32 nIndex)
     return uno::makeAny(uno::Reference<uno::XInterface>()); // i#21699 not supported
 }
 
-uno::Type SAL_CALL SwXTableColumns::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type SAL_CALL SwXTableColumns::getElementType()
 {
     return cppu::UnoType<uno::XInterface>::get();
 }
 
-sal_Bool SwXTableColumns::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTableColumns::hasElements()
 {
     SolarMutexGuard aGuard;
     lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this));
@@ -4200,7 +4111,6 @@ sal_Bool SwXTableColumns::hasElements() throw( uno::RuntimeException, std::excep
 
 ///@see SwXTableRows::insertByIndex (TODO: seems to be copy and paste programming here)
 void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nCount == 0)
@@ -4240,7 +4150,6 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
 
 ///@see SwXTableRows::removeByIndex (TODO: seems to be copy and paste programming here)
 void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (nCount == 0)
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 2a54d97c6301..fadc9be4a528 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -98,20 +98,17 @@ public:
         finishOrAppendParagraph(
             const uno::Sequence< beans::PropertyValue >&
                 rCharacterAndParagraphProperties,
-            const uno::Reference< text::XTextRange >& xInsertPosition)
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception);
+            const uno::Reference< text::XTextRange >& xInsertPosition);
 
     /// @throws lang::IllegalArgumentException
     /// @throws uno::RuntimeException
     sal_Int16 ComparePositions(
             const uno::Reference<text::XTextRange>& xPos1,
-            const uno::Reference<text::XTextRange>& xPos2)
-        throw (lang::IllegalArgumentException, uno::RuntimeException);
+            const uno::Reference<text::XTextRange>& xPos2);
 
     /// @throws lang::IllegalArgumentException
     /// @throws uno::RuntimeException
-    bool CheckForOwnMember(const SwPaM & rPaM)
-        throw (lang::IllegalArgumentException, uno::RuntimeException);
+    bool CheckForOwnMember(const SwPaM & rPaM);
 
     void ConvertCell(
             const uno::Sequence< uno::Reference< text::XTextRange > > & rCell,
@@ -163,7 +160,6 @@ SwXText::PrepareForAttach(uno::Reference< text::XTextRange > &, const SwPaM &)
 }
 
 bool SwXText::CheckForOwnMemberMeta(const SwPaM &, const bool)
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     OSL_ENSURE(CURSOR_META != m_pImpl->m_eType, "should not be called!");
     return false;
@@ -175,7 +171,7 @@ const SwStartNode *SwXText::GetStartNode() const
 }
 
 uno::Reference< text::XTextCursor >
-SwXText::CreateCursor() throw (uno::RuntimeException)
+SwXText::CreateCursor()
 {
     uno::Reference< text::XTextCursor >  xRet;
     if(IsValid())
@@ -190,7 +186,7 @@ SwXText::CreateCursor() throw (uno::RuntimeException)
 }
 
 uno::Any SAL_CALL
-SwXText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException, std::exception)
+SwXText::queryInterface(const uno::Type& rType)
 {
     uno::Any aRet;
     if (rType == cppu::UnoType<text::XText>::get())
@@ -261,7 +257,7 @@ SwXText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException, st
 }
 
 uno::Sequence< uno::Type > SAL_CALL
-SwXText::getTypes() throw (uno::RuntimeException, std::exception)
+SwXText::getTypes()
 {
     uno::Sequence< uno::Type > aRet(12);
     uno::Type* pTypes = aRet.getArray();
@@ -285,7 +281,6 @@ SwXText::getTypes() throw (uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange,
     const OUString& rString, sal_Bool bAbsorb)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -390,7 +385,6 @@ void SAL_CALL
 SwXText::insertControlCharacter(
         const uno::Reference< text::XTextRange > & xTextRange,
         sal_Int16 nControlCharacter, sal_Bool bAbsorb)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -503,7 +497,6 @@ SwXText::insertTextContent(
         const uno::Reference< text::XTextRange > & xRange,
         const uno::Reference< text::XTextContent > & xContent,
         sal_Bool bAbsorb)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -619,7 +612,6 @@ void SAL_CALL
 SwXText::insertTextContentBefore(
     const uno::Reference< text::XTextContent>& xNewContent,
     const uno::Reference< text::XTextContent>& xSuccessor)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -680,7 +672,6 @@ void SAL_CALL
 SwXText::insertTextContentAfter(
     const uno::Reference< text::XTextContent>& xNewContent,
     const uno::Reference< text::XTextContent>& xPredecessor)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -737,7 +728,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXText::removeTextContentBefore(
     const uno::Reference< text::XTextContent>& xSuccessor)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -790,7 +780,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXText::removeTextContentAfter(
         const uno::Reference< text::XTextContent>& xPredecessor)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -844,7 +833,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXText::removeTextContent(
         const uno::Reference< text::XTextContent > & xContent)
-throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     // forward: need no solar mutex here
     if(!xContent.is())
@@ -857,7 +845,7 @@ throw (container::NoSuchElementException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XText > SAL_CALL
-SwXText::getText() throw (uno::RuntimeException, std::exception)
+SwXText::getText()
 {
     SolarMutexGuard aGuard;
 
@@ -866,7 +854,7 @@ SwXText::getText() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXText::getStart() throw (uno::RuntimeException, std::exception)
+SwXText::getStart()
 {
     SolarMutexGuard aGuard;
 
@@ -883,7 +871,7 @@ SwXText::getStart() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwXText::getEnd() throw (uno::RuntimeException, std::exception)
+SwXText::getEnd()
 {
     SolarMutexGuard aGuard;
 
@@ -899,7 +887,7 @@ SwXText::getEnd() throw (uno::RuntimeException, std::exception)
     return xRet;
 }
 
-OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwXText::getString()
 {
     SolarMutexGuard aGuard;
 
@@ -915,7 +903,7 @@ OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException, std::except
 }
 
 void SAL_CALL
-SwXText::setString(const OUString& rString) throw (uno::RuntimeException, std::exception)
+SwXText::setString(const OUString& rString)
 {
     SolarMutexGuard aGuard;
 
@@ -985,7 +973,6 @@ SwXText::setString(const OUString& rString) throw (uno::RuntimeException, std::e
 //              Only one of the pointers has to be set!
 bool SwXText::Impl::CheckForOwnMember(
     const SwPaM & rPaM)
-throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     const uno::Reference<text::XTextCursor> xOwnCursor(m_rThis.CreateCursor());
 
@@ -1032,7 +1019,6 @@ sal_Int16
 SwXText::Impl::ComparePositions(
     const uno::Reference<text::XTextRange>& xPos1,
     const uno::Reference<text::XTextRange>& xPos2)
-throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     SwUnoInternalPaM aPam1(*m_pDoc);
     SwUnoInternalPaM aPam2(*m_pDoc);
@@ -1072,7 +1058,6 @@ sal_Int16 SAL_CALL
 SwXText::compareRegionStarts(
     const uno::Reference<text::XTextRange>& xRange1,
     const uno::Reference<text::XTextRange>& xRange2)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1090,7 +1075,6 @@ sal_Int16 SAL_CALL
 SwXText::compareRegionEnds(
     const uno::Reference<text::XTextRange>& xRange1,
     const uno::Reference<text::XTextRange>& xRange2)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1105,7 +1089,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
-SwXText::getPropertySetInfo() throw(uno::RuntimeException, std::exception)
+SwXText::getPropertySetInfo()
 {
     SolarMutexGuard g;
 
@@ -1117,9 +1101,6 @@ SwXText::getPropertySetInfo() throw(uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXText::setPropertyValue(const OUString& /*aPropertyName*/,
         const uno::Any& /*aValue*/)
-throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-    lang::IllegalArgumentException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     throw lang::IllegalArgumentException();
 }
@@ -1127,8 +1108,6 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 uno::Any SAL_CALL
 SwXText::getPropertyValue(
     const OUString& rPropertyName)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1183,8 +1162,6 @@ void SAL_CALL
 SwXText::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXText::addPropertyChangeListener(): not implemented");
 }
@@ -1193,8 +1170,6 @@ void SAL_CALL
 SwXText::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXText::removePropertyChangeListener(): not implemented");
 }
@@ -1203,8 +1178,6 @@ void SAL_CALL
 SwXText::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-    uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXText::addVetoableChangeListener(): not implemented");
 }
@@ -1213,8 +1186,6 @@ void SAL_CALL
 SwXText::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/)
-throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-        uno::RuntimeException, std::exception)
 {
     OSL_FAIL("SwXText::removeVetoableChangeListener(): not implemented");
 }
@@ -1231,7 +1202,6 @@ const uno::Sequence< sal_Int8 > & SwXText::getUnoTunnelId()
 
 sal_Int64 SAL_CALL
 SwXText::getSomething(const uno::Sequence< sal_Int8 >& rId)
-throw (uno::RuntimeException, std::exception)
 {
     return ::sw::UnoTunnelImpl<SwXText>(rId, this);
 }
@@ -1239,7 +1209,6 @@ throw (uno::RuntimeException, std::exception)
 uno::Reference< text::XTextRange > SAL_CALL
 SwXText::finishParagraph(
         const uno::Sequence< beans::PropertyValue > & rProperties)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1250,7 +1219,6 @@ uno::Reference< text::XTextRange > SAL_CALL
 SwXText::finishParagraphInsert(
         const uno::Sequence< beans::PropertyValue > & rProperties,
         const uno::Reference< text::XTextRange >& xInsertPosition)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -1261,7 +1229,6 @@ uno::Reference< text::XTextRange >
 SwXText::Impl::finishOrAppendParagraph(
         const uno::Sequence< beans::PropertyValue > & rProperties,
         const uno::Reference< text::XTextRange >& xInsertPosition)
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     if (!m_bIsValid)
     {
@@ -1358,9 +1325,6 @@ SwXText::insertTextPortion(
         const uno::Sequence< beans::PropertyValue > &
             rCharacterAndParagraphProperties,
         const uno::Reference<text::XTextRange>& xInsertPosition)
-    throw (lang::IllegalArgumentException, beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1440,8 +1404,6 @@ SwXText::appendTextPortion(
         const OUString& rText,
         const uno::Sequence< beans::PropertyValue > &
             rCharacterAndParagraphProperties)
-throw (lang::IllegalArgumentException, beans::UnknownPropertyException,
-       beans::PropertyVetoException, uno::RuntimeException, std::exception)
 {
     // Right now this doesn't need a guard, as it's just calling the insert
     // version, that has it already.
@@ -1457,7 +1419,6 @@ SwXText::insertTextContentWithProperties(
     const uno::Sequence< beans::PropertyValue >&
         rCharacterAndParagraphProperties,
     const uno::Reference< text::XTextRange >& xInsertPosition)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1505,7 +1466,6 @@ SwXText::appendTextContent(
     const uno::Reference< text::XTextContent >& xTextContent,
     const uno::Sequence< beans::PropertyValue >&
         rCharacterAndParagraphProperties)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     // Right now this doesn't need a guard, as it's just calling the insert
     // version, that has it already.
@@ -1520,8 +1480,6 @@ SwXText::convertToTextFrame(
     const uno::Reference< text::XTextRange >& xStart,
     const uno::Reference< text::XTextRange >& xEnd,
     const uno::Sequence< beans::PropertyValue >& rFrameProperties)
-    throw (lang::IllegalArgumentException, beans::UnknownPropertyException,
-           beans::PropertyVetoException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2207,7 +2165,6 @@ SwXText::convertToTable(
     const uno::Sequence< uno::Sequence< beans::PropertyValue > >&
         rRowProperties,
     const uno::Sequence< beans::PropertyValue >& rTableProperties)
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2350,7 +2307,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 void SAL_CALL
 SwXText::copyText(
     const uno::Reference< text::XTextCopy >& xSource )
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2384,7 +2340,7 @@ SwXBodyText::~SwXBodyText()
 }
 
 OUString SAL_CALL
-SwXBodyText::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXBodyText::getImplementationName()
 {
     return OUString("SwXBodyText");
 }
@@ -2397,13 +2353,12 @@ static char const*const g_ServicesBodyText[] =
 static const size_t g_nServicesBodyText(SAL_N_ELEMENTS(g_ServicesBodyText));
 
 sal_Bool SAL_CALL SwXBodyText::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXBodyText::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXBodyText::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(
             g_nServicesBodyText, g_ServicesBodyText);
@@ -2411,7 +2366,6 @@ SwXBodyText::getSupportedServiceNames() throw (uno::RuntimeException, std::excep
 
 uno::Any SAL_CALL
 SwXBodyText::queryAggregation(const uno::Type& rType)
-throw (uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if (rType == cppu::UnoType<container::XEnumerationAccess>::get())
@@ -2438,7 +2392,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Sequence< uno::Type > SAL_CALL
-SwXBodyText::getTypes() throw (uno::RuntimeException, std::exception)
+SwXBodyText::getTypes()
 {
     const uno::Sequence< uno::Type > aTypes = SwXBodyText_Base::getTypes();
     const uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes();
@@ -2446,14 +2400,13 @@ SwXBodyText::getTypes() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL
-SwXBodyText::getImplementationId() throw (uno::RuntimeException, std::exception)
+SwXBodyText::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 uno::Any SAL_CALL
 SwXBodyText::queryInterface(const uno::Type& rType)
-throw (uno::RuntimeException, std::exception)
 {
     const uno::Any ret = SwXText::queryInterface(rType);
     return (ret.getValueType() == cppu::UnoType<void>::get())
@@ -2490,7 +2443,7 @@ SwXTextCursor * SwXBodyText::CreateTextCursor(const bool bIgnoreTables)
 }
 
 uno::Reference< text::XTextCursor > SAL_CALL
-SwXBodyText::createTextCursor() throw (uno::RuntimeException, std::exception)
+SwXBodyText::createTextCursor()
 {
     SolarMutexGuard aGuard;
 
@@ -2508,7 +2461,6 @@ SwXBodyText::createTextCursor() throw (uno::RuntimeException, std::exception)
 uno::Reference< text::XTextCursor > SAL_CALL
 SwXBodyText::createTextCursorByRange(
     const uno::Reference< text::XTextRange > & xTextPosition)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2553,7 +2505,6 @@ throw (uno::RuntimeException, std::exception)
 
 uno::Reference< container::XEnumeration > SAL_CALL
 SwXBodyText::createEnumeration()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2572,13 +2523,13 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Type SAL_CALL
-SwXBodyText::getElementType() throw (uno::RuntimeException, std::exception)
+SwXBodyText::getElementType()
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
 sal_Bool SAL_CALL
-SwXBodyText::hasElements() throw (uno::RuntimeException, std::exception)
+SwXBodyText::hasElements()
 {
     SolarMutexGuard aGuard;
 
@@ -2665,7 +2616,7 @@ SwXHeadFootText::~SwXHeadFootText()
 }
 
 OUString SAL_CALL
-SwXHeadFootText::getImplementationName() throw (uno::RuntimeException, std::exception)
+SwXHeadFootText::getImplementationName()
 {
     return OUString("SwXHeadFootText");
 }
@@ -2676,13 +2627,12 @@ static char const*const g_ServicesHeadFootText[] =
 };
 
 sal_Bool SAL_CALL SwXHeadFootText::supportsService(const OUString& rServiceName)
-throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-SwXHeadFootText::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+SwXHeadFootText::getSupportedServiceNames()
 {
     return ::sw::GetSupportedServiceNamesImpl(
             SAL_N_ELEMENTS(g_ServicesHeadFootText),
@@ -2705,13 +2655,13 @@ const SwStartNode *SwXHeadFootText::GetStartNode() const
 }
 
 uno::Reference< text::XTextCursor >
-SwXHeadFootText::CreateCursor() throw (uno::RuntimeException)
+SwXHeadFootText::CreateCursor()
 {
     return createTextCursor();
 }
 
 uno::Sequence< uno::Type > SAL_CALL
-SwXHeadFootText::getTypes() throw (uno::RuntimeException, std::exception)
+SwXHeadFootText::getTypes()
 {
     const uno::Sequence< uno::Type > aTypes = SwXHeadFootText_Base::getTypes();
     const uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes();
@@ -2719,14 +2669,13 @@ SwXHeadFootText::getTypes() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL
-SwXHeadFootText::getImplementationId() throw (uno::RuntimeException, std::exception)
+SwXHeadFootText::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 uno::Any SAL_CALL
 SwXHeadFootText::queryInterface(const uno::Type& rType)
-throw (uno::RuntimeException, std::exception)
 {
     const uno::Any ret = SwXHeadFootText_Base::queryInterface(rType);
     return (ret.getValueType() == cppu::UnoType<void>::get())
@@ -2735,7 +2684,7 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< text::XTextCursor > SAL_CALL
-SwXHeadFootText::createTextCursor() throw (uno::RuntimeException, std::exception)
+SwXHeadFootText::createTextCursor()
 {
     SolarMutexGuard aGuard;
 
@@ -2783,7 +2732,6 @@ SwXHeadFootText::createTextCursor() throw (uno::RuntimeException, std::exception
 uno::Reference< text::XTextCursor > SAL_CALL
 SwXHeadFootText::createTextCursorByRange(
     const uno::Reference< text::XTextRange > & xTextPosition)
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2818,7 +2766,6 @@ throw (uno::RuntimeException, std::exception)
 
 uno::Reference< container::XEnumeration > SAL_CALL
 SwXHeadFootText::createEnumeration()
-throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -2834,12 +2781,12 @@ throw (uno::RuntimeException, std::exception)
 }
 
 uno::Type SAL_CALL
-SwXHeadFootText::getElementType() throw (uno::RuntimeException, std::exception)
+SwXHeadFootText::getElementType()
 {
     return cppu::UnoType<text::XTextRange>::get();
 }
 
-sal_Bool SAL_CALL SwXHeadFootText::hasElements() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXHeadFootText::hasElements()
 {
     return true;
 }
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index 933881085af8..df76dc9708dd 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -82,7 +82,7 @@ const ModelToViewHelper& SwXTextMarkup::GetConversionMap()
     return m_pImpl->m_ConversionMap;
 }
 
-uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfoContainer() throw (uno::RuntimeException, std::exception)
+uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfoContainer()
 {
     SolarMutexGuard aGuard;
 
@@ -91,7 +91,7 @@ uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfo
 }
 
 void SAL_CALL SwXTextMarkup::commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const uno::Reference< text::XTextRange> & xRange,
-                                                   const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) throw (uno::RuntimeException, std::exception)
+                                                   const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer)
 {
     SolarMutexGuard aGuard;
 
@@ -138,7 +138,6 @@ void SAL_CALL SwXTextMarkup::commitStringMarkup(
     ::sal_Int32 nStart,
     ::sal_Int32 nLength,
     const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -386,7 +385,6 @@ static void lcl_commitGrammarMarkUp(
 
 void SAL_CALL SwXTextMarkup::commitMultiTextMarkup(
     const uno::Sequence< text::TextMarkupDescriptor > &rMarkups )
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -491,7 +489,7 @@ SwXStringKeyMap::SwXStringKeyMap()
 {
 }
 
-uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString & aKey) throw (uno::RuntimeException, container::NoSuchElementException, std::exception)
+uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString & aKey)
 {
     std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey );
     if ( aIter == maMap.end() )
@@ -500,12 +498,12 @@ uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString & aKey) throw (uno::R
     return (*aIter).second;
 }
 
-sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const OUString & aKey) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const OUString & aKey)
 {
     return maMap.find( aKey ) != maMap.end();
 }
 
-void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any & aValue) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException, std::exception)
+void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any & aValue)
 {
     std::map< OUString, uno::Any >::const_iterator aIter = maMap.find( aKey );
     if ( aIter != maMap.end() )
@@ -514,12 +512,12 @@ void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any
     maMap[ aKey ] = aValue;
 }
 
-::sal_Int32 SAL_CALL SwXStringKeyMap::getCount() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwXStringKeyMap::getCount()
 {
     return maMap.size();
 }
 
-OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
+OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex)
 {
     if ( (sal_uInt32)nIndex >= maMap.size() )
         throw lang::IndexOutOfBoundsException();
@@ -527,7 +525,7 @@ OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) throw (uno:
     return OUString();
 }
 
-uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
+uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex)
 {
     if ( (sal_uInt32)nIndex >= maMap.size() )
         throw lang::IndexOutOfBoundsException();
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index f5d425bb4afb..8e75a53b4be3 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -380,30 +380,25 @@ public:
     // UNO Anbindung
 
     // XImageConsumer
-    virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height)
-        throw( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL init( sal_Int32 Width, sal_Int32 Height) override;
     virtual void SAL_CALL setColorModel(
             sal_Int16 BitCount, const uno::Sequence< sal_Int32 >& RGBAPal,
             sal_Int32 RedMask, sal_Int32 GreenMask, sal_Int32 BlueMask,
-            sal_Int32 AlphaMask)
-        throw( uno::RuntimeException, std::exception ) override;
+            sal_Int32 AlphaMask) override;
     virtual void SAL_CALL setPixelsByBytes(
             sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height,
             const uno::Sequence< sal_Int8 >& ProducerData,
-            sal_Int32 Offset, sal_Int32 Scansize)
-        throw( uno::RuntimeException, std::exception ) override;
+            sal_Int32 Offset, sal_Int32 Scansize) override;
     virtual void SAL_CALL setPixelsByLongs(
             sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height,
             const uno::Sequence< sal_Int32 >& ProducerData,
-            sal_Int32 Offset, sal_Int32 Scansize)
-        throw( uno::RuntimeException, std::exception ) override;
+            sal_Int32 Offset, sal_Int32 Scansize) override;
     virtual void SAL_CALL complete(
             sal_Int32 Status,
-            const uno::Reference< awt::XImageProducer > & Producer)
-        throw( uno::RuntimeException, std::exception ) override;
+            const uno::Reference< awt::XImageProducer > & Producer) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const EventObject& Source ) throw ( uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const EventObject& Source ) override;
 };
 
 SwHTMLImageWatcher::SwHTMLImageWatcher(
@@ -448,7 +443,6 @@ void SwHTMLImageWatcher::clear()
 }
 
 void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
-    throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( bSetWidth || bSetHeight,
             "Breite oder Hoehe muss angepasst werden" );
@@ -549,27 +543,23 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
 void SwHTMLImageWatcher::setColorModel(
         sal_Int16, const Sequence< sal_Int32 >&, sal_Int32, sal_Int32,
         sal_Int32, sal_Int32 )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
 void SwHTMLImageWatcher::setPixelsByBytes(
         sal_Int32, sal_Int32, sal_Int32, sal_Int32,
         const Sequence< sal_Int8 >&, sal_Int32, sal_Int32 )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
 void SwHTMLImageWatcher::setPixelsByLongs(
         sal_Int32, sal_Int32, sal_Int32, sal_Int32,
         const Sequence< sal_Int32 >&, sal_Int32, sal_Int32 )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
 void SwHTMLImageWatcher::complete( sal_Int32 Status,
         const uno::Reference< awt::XImageProducer >& )
-    throw( uno::RuntimeException, std::exception )
 {
     if( awt::ImageStatus::IMAGESTATUS_ERROR == Status || awt::ImageStatus::IMAGESTATUS_ABORTED == Status )
     {
@@ -580,7 +570,7 @@ void SwHTMLImageWatcher::complete( sal_Int32 Status,
     }
 }
 
-void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) throw ( uno::RuntimeException, std::exception)
+void SwHTMLImageWatcher::disposing(const lang::EventObject& evt)
 {
     uno::Reference< awt::XImageConsumer > xTmp;
 
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 6b4d1b016c3c..fe6b8abdff29 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -89,7 +89,7 @@ OUString DocxExport_getImplementationName()
     return OUString( IMPL_NAME );
 }
 
-OUString DocxExportFilter::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString DocxExportFilter::getImplementationName()
 {
     return DocxExport_getImplementationName();
 }
@@ -100,7 +100,7 @@ uno::Sequence< OUString > SAL_CALL DocxExport_getSupportedServiceNames() throw()
 }
 
 /// @throws uno::Exception
-uno::Reference< uno::XInterface > SAL_CALL DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception )
+uno::Reference< uno::XInterface > SAL_CALL DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx )
 {
     return static_cast<cppu::OWeakObject*>(new DocxExportFilter( xCtx ));
 }
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index 983c8d7f83c3..0efcc51c79fe 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -43,7 +43,7 @@ public:
     virtual bool        exportDocument() override;
 
 private:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
     virtual ::oox::ole::VbaProject* implCreateVbaProject() const override
     {
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index f09a8c525702..5da1c7329838 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -38,7 +38,7 @@ RtfExportFilter::RtfExportFilter(const uno::Reference< uno::XComponentContext >&
 
 RtfExportFilter::~RtfExportFilter() = default;
 
-sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) throw(uno::RuntimeException, std::exception)
+sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor)
 {
     utl::MediaDescriptor aMediaDesc = aDescriptor;
     uno::Reference<io::XStream> xStream = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STREAMFOROUTPUT(), uno::Reference< io::XStream >());
@@ -87,11 +87,11 @@ sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aD
     return true;
 }
 
-void RtfExportFilter::cancel() throw(uno::RuntimeException, std::exception)
+void RtfExportFilter::cancel()
 {
 }
 
-void RtfExportFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void RtfExportFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc)
 {
     m_xSrcDoc = xDoc;
 }
@@ -108,7 +108,7 @@ uno::Sequence< OUString > SAL_CALL RtfExport_getSupportedServiceNames() throw()
     return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" };
 }
 
-uno::Reference< uno::XInterface > SAL_CALL RtfExport_createInstance(const uno::Reference< uno::XComponentContext >& xCtx) throw(uno::Exception)
+uno::Reference< uno::XInterface > SAL_CALL RtfExport_createInstance(const uno::Reference< uno::XComponentContext >& xCtx)
 {
     return static_cast<cppu::OWeakObject*>(new RtfExportFilter(xCtx));
 }
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index 13921975b1f6..842ac77738af 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -51,12 +51,11 @@ public:
     virtual ~RtfExportFilter() override;
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter(const css::uno::Sequence<css::beans::PropertyValue>& aDescriptor) override;
+    virtual void SAL_CALL cancel() override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument(const css::uno::Reference<css::lang::XComponent>& xDoc)
-    throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument(const css::uno::Reference<css::lang::XComponent>& xDoc) override;
 
     RtfWriter m_aWriter;
 };
@@ -64,7 +63,7 @@ public:
 OUString RtfExport_getImplementationName();
 css::uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx) throw(css::uno::Exception);
+css::uno::Reference<css::uno::XInterface> SAL_CALL RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx);
 
 #define IMPL_NAME_RTFEXPORT "com.sun.star.comp.Writer.RtfExport"
 
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index e1b73dfe8131..fe873b616b6d 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -234,7 +234,6 @@ namespace sw
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
         template<class T> const T & item_cast(const SfxPoolItem &rItem)
-            throw(std::bad_cast)
         {
             if (dynamic_cast<const T *>(&rItem) == nullptr)
                 throw std::bad_cast();
@@ -290,7 +289,7 @@ namespace sw
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
         template<class T> const T & ItemGet(const SwContentNode &rNode,
-            sal_uInt16 eType) throw(std::bad_cast)
+            sal_uInt16 eType)
         {
             return item_cast<T>(rNode.GetAttr(eType));
         }
@@ -319,7 +318,7 @@ namespace sw
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
         template<class T> const T & ItemGet(const SwFormat &rFormat,
-            sal_uInt16 eType) throw(std::bad_cast, css::uno::RuntimeException)
+            sal_uInt16 eType)
         {
             return item_cast<T>(rFormat.GetFormatAttr(eType));
         }
@@ -350,7 +349,7 @@ namespace sw
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
         template<class T> const T & ItemGet(const SfxItemSet &rSet,
-            sal_uInt16 eType) throw(std::bad_cast)
+            sal_uInt16 eType)
         {
             return item_cast<T>(rSet.Get(eType));
         }
@@ -385,7 +384,7 @@ namespace sw
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
         template<class T> const T & DefaultItemGet(const SfxItemPool &rPool,
-            sal_uInt16 eType) throw(std::bad_cast)
+            sal_uInt16 eType)
         {
             return item_cast<T>(rPool.GetDefaultItem(eType));
         }
@@ -421,7 +420,7 @@ namespace sw
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
         template<class T> const T & DefaultItemGet(const SwDoc &rDoc,
-            sal_uInt16 eType) throw(std::bad_cast)
+            sal_uInt16 eType)
         {
             return DefaultItemGet<T>(rDoc.GetAttrPool(), eType);
         }
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 483aefb85611..741af3e66d26 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -499,7 +499,6 @@ const Sequence< sal_Int8 > & SwXMLExport::getUnoTunnelId() throw()
 }
 
 sal_Int64 SAL_CALL SwXMLExport::getSomething( const Sequence< sal_Int8 >& rId )
-    throw(RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index bc1ced23c22b..c08b0e2b33b0 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -126,7 +126,7 @@ public:
 
     // XUnoTunnel
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     const SwDoc* getDoc() const;
     SwDoc* getDoc();
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 880d96ff650f..dae5ed530470 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -426,7 +426,6 @@ const Sequence< sal_Int8 > & SwXMLImport::getUnoTunnelId() throw()
 }
 
 sal_Int64 SAL_CALL SwXMLImport::getSomething( const Sequence< sal_Int8 >& rId )
-    throw(RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -450,9 +449,6 @@ static OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCurso
 }
 
 void SwXMLImport::startDocument()
-    throw (xml::sax::SAXException,
-           uno::RuntimeException,
-           std::exception)
 {
     // delegate to parent
     SvXMLImport::startDocument();
@@ -668,7 +664,6 @@ void SwXMLImport::startDocument()
 }
 
 void SwXMLImport::endDocument()
-    throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( GetModel().is(), "model missing; maybe startDocument wasn't called?" );
     if( !GetModel().is() )
@@ -1418,7 +1413,6 @@ void SwXMLImport::SetDocumentSpecificSettings(
 
 void SwXMLImport::initialize(
     const Sequence<Any>& aArguments )
-    throw( uno::Exception, uno::RuntimeException, std::exception)
 {
     // delegate to super class
     SvXMLImport::initialize(aArguments);
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 621f35b5873b..ee6395994d90 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -120,19 +120,15 @@ public:
     virtual ~SwXMLImport() throw() override;
 
     // css::xml::sax::XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw (css::xml::sax::SAXException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL endDocument()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
 
     // XUnoTunnel
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     void                    InsertStyles( bool bAuto );
     void                    FinishStyles();
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 570331019342..a64ab5cab11a 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -90,15 +90,15 @@ class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper
 public:
     explicit SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg);
 
-    virtual void SAL_CALL selectionChanged( 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 selectionChanged( const EventObject& aEvent ) override;
+    virtual void SAL_CALL disposing( const EventObject& Source ) override;
 };
 
 SwXSelChgLstnr_Impl::SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg) :
     rParent(rParentDlg)
 {}
 
-void SwXSelChgLstnr_Impl::selectionChanged( const EventObject&  ) throw (RuntimeException, std::exception)
+void SwXSelChgLstnr_Impl::selectionChanged( const EventObject&  )
 {
     //call the parent to enable selection mode
     Sequence <Any> aSelection;
@@ -115,7 +115,7 @@ void SwXSelChgLstnr_Impl::selectionChanged( const EventObject&  ) throw (Runtime
     }
 }
 
-void SwXSelChgLstnr_Impl::disposing( const EventObject&  ) throw (RuntimeException, std::exception)
+void SwXSelChgLstnr_Impl::disposing( const EventObject&  )
 {
     OSL_FAIL("disposing");
 }
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 765bd86a3f31..44d5c205eb6a 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -42,7 +42,7 @@ SwFilterDetect::~SwFilterDetect()
 {
 }
 
-OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException, std::exception )
+OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor )
 {
     MediaDescriptor aMediaDesc( lDescriptor );
     OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() );
@@ -111,19 +111,19 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor
 }
 
 /* XServiceInfo */
-OUString SAL_CALL SwFilterDetect::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL SwFilterDetect::getImplementationName()
 {
     return OUString("com.sun.star.comp.writer.FormatDetector" );
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SwFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SwFilterDetect::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames()
 {
     Sequence< OUString > seqServiceNames( 3 );
     seqServiceNames.getArray() [0] = "com.sun.star.frame.ExtendedTypeDetection";
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index bd5e5a6357d4..e861b598c24b 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -57,12 +57,12 @@ public:
     virtual                 ~SwFilterDetect() override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::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;
 
     // XExtendedFilterDetect
-    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override;
 };
 
 #endif
diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx
index d225416100cf..deb7734d3a6d 100644
--- a/sw/source/ui/vba/vbaaddin.cxx
+++ b/sw/source/ui/vba/vbaaddin.cxx
@@ -25,7 +25,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL ) throw ( uno::RuntimeException ) :
+SwVbaAddin::SwVbaAddin( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFileURL ) :
     SwVbaAddin_BASE( rParent, rContext ), msFileURL( rFileURL ), mbInstalled( true )
 {
 }
@@ -34,7 +34,7 @@ SwVbaAddin::~SwVbaAddin()
 {
 }
 
-OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwVbaAddin::getName()
 {
     OUString sName;
     INetURLObject aURL( msFileURL );
@@ -43,29 +43,29 @@ OUString SAL_CALL SwVbaAddin::getName() throw (uno::RuntimeException, std::excep
 }
 
 void SAL_CALL
-SwVbaAddin::setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception )
+SwVbaAddin::setName( const OUString& )
 {
     throw uno::RuntimeException(" Fail to set name" );
 }
 
-OUString SAL_CALL SwVbaAddin::getPath() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwVbaAddin::getPath()
 {
     INetURLObject aURL( msFileURL );
     aURL.CutLastName();
     return aURL.GetURLPath();
 }
 
-sal_Bool SAL_CALL SwVbaAddin::getAutoload() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaAddin::getAutoload()
 {
     return true;
 }
 
-sal_Bool SAL_CALL SwVbaAddin::getInstalled() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaAddin::getInstalled()
 {
     return mbInstalled;
 }
 
-void SAL_CALL SwVbaAddin::setInstalled( sal_Bool _installed ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaAddin::setInstalled( sal_Bool _installed )
 {
     if( bool(_installed) != mbInstalled )
     {
diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx
index e5a779f7ab22..7b66b6ba6218 100644
--- a/sw/source/ui/vba/vbaaddin.hxx
+++ b/sw/source/ui/vba/vbaaddin.hxx
@@ -32,16 +32,16 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL ) throw ( css::uno::RuntimeException );
+    SwVbaAddin( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileURL );
     virtual ~SwVbaAddin() override;
 
     // Attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoload() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getInstalled() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInstalled( sal_Bool _installed ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& _name ) override;
+    virtual OUString SAL_CALL getPath() override;
+    virtual sal_Bool SAL_CALL getAutoload() override;
+    virtual sal_Bool SAL_CALL getInstalled() override;
+    virtual void SAL_CALL setInstalled( sal_Bool _installed ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index 8a5a4656072f..d00a658cdf0a 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -57,17 +57,17 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u
     return xAddinsAccess;
 }
 
-SwVbaAddins::SwVbaAddins( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext ) throw (uno::RuntimeException): SwVbaAddins_BASE( xParent, xContext, lcl_getAddinCollection( xParent,xContext ) )
+SwVbaAddins::SwVbaAddins( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext ): SwVbaAddins_BASE( xParent, xContext, lcl_getAddinCollection( xParent,xContext ) )
 {
 }
 // XEnumerationAccess
 uno::Type
-SwVbaAddins::getElementType() throw (uno::RuntimeException)
+SwVbaAddins::getElementType()
 {
     return cppu::UnoType<word::XAddin>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaAddins::createEnumeration() throw (uno::RuntimeException)
+SwVbaAddins::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return xEnumerationAccess->createEnumeration();
diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx
index 624aaea2404f..017014ef6f32 100644
--- a/sw/source/ui/vba/vbaaddins.hxx
+++ b/sw/source/ui/vba/vbaaddins.hxx
@@ -29,11 +29,11 @@ class SwVbaAddins : public SwVbaAddins_BASE
 {
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaAddins( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext ) throw (css::uno::RuntimeException);
+    SwVbaAddins( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaAddins_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index 6922ccee9867..282ca8979bfd 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -47,19 +47,19 @@ SwVbaApplication::~SwVbaApplication()
 }
 
 OUString SAL_CALL
-SwVbaApplication::getName() throw (uno::RuntimeException, std::exception)
+SwVbaApplication::getName()
 {
     return OUString("Microsoft Word" );
 }
 
 uno::Reference< word::XDocument > SAL_CALL
-SwVbaApplication::getActiveDocument() throw (uno::RuntimeException, std::exception)
+SwVbaApplication::getActiveDocument()
 {
     return new SwVbaDocument( this, mxContext, getCurrentDocument() );
 }
 
 uno::Reference< word::XWindow > SAL_CALL
-SwVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception)
+SwVbaApplication::getActiveWindow()
 {
     // #FIXME so far can't determine Parent
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_SET_THROW );
@@ -68,31 +68,31 @@ SwVbaApplication::getActiveWindow() throw (uno::RuntimeException, std::exception
 }
 
 uno::Reference<word::XSystem > SAL_CALL
-SwVbaApplication::getSystem() throw (uno::RuntimeException, std::exception)
+SwVbaApplication::getSystem()
 {
     return uno::Reference< word::XSystem >( new SwVbaSystem( mxContext ) );
 }
 
 uno::Reference<word::XOptions > SAL_CALL
-SwVbaApplication::getOptions() throw (uno::RuntimeException, std::exception)
+SwVbaApplication::getOptions()
 {
     return uno::Reference< word::XOptions >( new SwVbaOptions( mxContext ) );
 }
 
 uno::Any SAL_CALL
-SwVbaApplication::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+SwVbaApplication::CommandBars( const uno::Any& aIndex )
 {
     return VbaApplicationBase::CommandBars( aIndex );
 }
 
 uno::Reference< word::XSelection > SAL_CALL
-SwVbaApplication::getSelection() throw (uno::RuntimeException, std::exception)
+SwVbaApplication::getSelection()
 {
     return new SwVbaSelection( this, mxContext, getCurrentDocument() );
 }
 
 uno::Any SAL_CALL
-SwVbaApplication::Documents( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaApplication::Documents( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaDocuments( this, mxContext ) );
     if ( index.hasValue() )
@@ -101,7 +101,7 @@ SwVbaApplication::Documents( const uno::Any& index ) throw (uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-SwVbaApplication::Addins( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaApplication::Addins( const uno::Any& index )
 {
     static uno::Reference< XCollection > xCol( new SwVbaAddins( this, mxContext ) );
     if ( index.hasValue() )
@@ -110,7 +110,7 @@ SwVbaApplication::Addins( const uno::Any& index ) throw (uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-SwVbaApplication::Dialogs( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaApplication::Dialogs( const uno::Any& index )
 {
     uno::Reference< word::XDialogs > xCol( new SwVbaDialogs( this, mxContext, getCurrentDocument() ));
     if ( index.hasValue() )
@@ -119,7 +119,7 @@ SwVbaApplication::Dialogs( const uno::Any& index ) throw (uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-SwVbaApplication::ListGalleries( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaApplication::ListGalleries( const uno::Any& index )
 {
     uno::Reference< text::XTextDocument > xTextDoc( getCurrentDocument(), uno::UNO_QUERY_THROW );
     uno::Reference< XCollection > xCol( new SwVbaListGalleries( this, mxContext, xTextDoc ) );
@@ -128,34 +128,34 @@ SwVbaApplication::ListGalleries( const uno::Any& index ) throw (uno::RuntimeExce
     return uno::makeAny( xCol );
 }
 
-sal_Bool SAL_CALL SwVbaApplication::getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaApplication::getDisplayAutoCompleteTips()
 {
     return SvxAutoCorrCfg::Get().IsAutoTextTip();
 }
 
-void SAL_CALL SwVbaApplication::setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaApplication::setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips )
 {
     SvxAutoCorrCfg::Get().SetAutoTextTip( _displayAutoCompleteTips );
 }
 
-sal_Int32 SAL_CALL SwVbaApplication::getEnableCancelKey() throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwVbaApplication::getEnableCancelKey()
 {
     // the default value is wdCancelInterrupt in Word
     return word::WdEnableCancelKey::wdCancelInterrupt;
 }
 
-void SAL_CALL SwVbaApplication::setEnableCancelKey( sal_Int32/* _enableCancelKey */) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaApplication::setEnableCancelKey( sal_Int32/* _enableCancelKey */)
 {
     // seems not supported in Writer
 }
 
-float SAL_CALL SwVbaApplication::CentimetersToPoints( float Centimeters ) throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaApplication::CentimetersToPoints( float Centimeters )
 {
     return VbaApplicationBase::CentimetersToPoints( Centimeters );
 }
 
 uno::Reference< frame::XModel >
-SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
+SwVbaApplication::getCurrentDocument()
 {
     return getCurrentWordDoc( mxContext );
 }
diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx
index 63b33d125df2..7a2fc9bd37ad 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -40,27 +40,27 @@ public:
     virtual ~SwVbaApplication() override;
 
     // XApplication
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL CentimetersToPoints( float Centimeters ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() override;
+    virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() override;
+    virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() override;
+    virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() override;
+    virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() override;
+    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) override;
+    virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() override;
+    virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) override;
+    virtual sal_Int32 SAL_CALL getEnableCancelKey() override;
+    virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) override;
+    virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 protected:
-    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() override;
 };
 #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAAPPLICATION_HXX
 
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index e846ef35a4d8..e6bd1fd457f3 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -26,7 +26,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaAutoTextEntry::SwVbaAutoTextEntry( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XAutoTextEntry >& xEntry ) throw ( uno::RuntimeException ) :
+SwVbaAutoTextEntry::SwVbaAutoTextEntry( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XAutoTextEntry >& xEntry ) :
     SwVbaAutoTextEntry_BASE( rParent, rContext ), mxEntry( xEntry )
 {
 }
@@ -35,7 +35,7 @@ SwVbaAutoTextEntry::~SwVbaAutoTextEntry()
 {
 }
 
-uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& _richtext ) throw ( uno::RuntimeException, std::exception )
+uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::Reference< word::XRange >& _where, const uno::Any& _richtext )
 {
     SwVbaRange* pWhere = dynamic_cast<SwVbaRange*>( _where.get() );
     if( pWhere )
@@ -93,18 +93,18 @@ SwVbaAutoTextEntry::getServiceNames()
     return aServiceNames;
 }
 
-SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess )
+SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess )
 {
 }
 
 // XEnumerationAccess
 uno::Type
-SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException)
+SwVbaAutoTextEntries::getElementType()
 {
     return cppu::UnoType<word::XAutoTextEntry>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException)
+SwVbaAutoTextEntries::createEnumeration()
 {
     throw uno::RuntimeException("Not implemented" );
 }
diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx
index ff249b327f26..08d82b5d9220 100644
--- a/sw/source/ui/vba/vbaautotextentry.hxx
+++ b/sw/source/ui/vba/vbaautotextentry.hxx
@@ -35,11 +35,11 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaAutoTextEntry( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XAutoTextEntry >& xEntry ) throw ( css::uno::RuntimeException );
+    SwVbaAutoTextEntry( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XAutoTextEntry >& xEntry );
     virtual ~SwVbaAutoTextEntry() override;
 
     // XAutoTextEntry
-    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
@@ -52,11 +52,11 @@ class SwVbaAutoTextEntries : public SwVbaAutoTextEntries_BASE
 {
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaAutoTextEntries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw (css::uno::RuntimeException);
+    SwVbaAutoTextEntries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaAutoTextEntries_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx
index 17891937a387..02a806413e7d 100644
--- a/sw/source/ui/vba/vbabookmark.cxx
+++ b/sw/source/ui/vba/vbabookmark.cxx
@@ -32,7 +32,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-    const css::uno::Reference< frame::XModel >& rModel, const OUString& rBookmarkName ) throw ( css::uno::RuntimeException ) :
+    const css::uno::Reference< frame::XModel >& rModel, const OUString& rBookmarkName ) :
     SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maBookmarkName( rBookmarkName ), mbValid( true )
 {
     uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel, uno::UNO_QUERY_THROW );
@@ -43,13 +43,13 @@ SwVbaBookmark::~SwVbaBookmark()
 {
 }
 
-void SwVbaBookmark::checkVality() throw ( uno::RuntimeException )
+void SwVbaBookmark::checkVality()
 {
     if( !mbValid )
         throw uno::RuntimeException("The bookmark is not valid" );
 }
 
-void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException, std::exception )
+void SAL_CALL SwVbaBookmark::Delete()
 {
     checkVality();
     uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
@@ -57,25 +57,25 @@ void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException, std::except
     mbValid = false;
 }
 
-void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException, std::exception )
+void SAL_CALL SwVbaBookmark::Select()
 {
     checkVality();
     uno::Reference< view::XSelectionSupplier > xSelectSupp( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
     xSelectSupp->select( uno::makeAny( mxBookmark ) );
 }
 
-OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException, std::exception )
+OUString SAL_CALL SwVbaBookmark::getName()
 {
     return maBookmarkName;
 }
 
-void SAL_CALL SwVbaBookmark::setName( const OUString& _name ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL SwVbaBookmark::setName( const OUString& _name )
 {
     uno::Reference< container::XNamed > xNamed( mxBookmark, uno::UNO_QUERY_THROW );
     xNamed->setName( _name );
 }
 
-uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL SwVbaBookmark::Range()
 {
     uno::Reference< text::XTextContent > xTextContent( mxBookmark, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx
index d963db155def..ab91b7333bfc 100644
--- a/sw/source/ui/vba/vbabookmark.hxx
+++ b/sw/source/ui/vba/vbabookmark.hxx
@@ -36,20 +36,20 @@ private:
 
 private:
     /// @throws css::uno::RuntimeException
-    void checkVality() throw ( css::uno::RuntimeException );
+    void checkVality();
 
 public:
     /// @throws css::uno::RuntimeException
     SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
-        const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rName ) throw ( css::uno::RuntimeException );
+        const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rName );
     virtual ~SwVbaBookmark() override;
 
    // Methods
-    virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& ) override;
+    virtual void SAL_CALL Delete() override;
+    virtual void SAL_CALL Select() override;
+    virtual css::uno::Any SAL_CALL Range() override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index dc095523043f..ca1cbe14ed01 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -36,9 +36,9 @@ class BookmarksEnumeration : public EnumerationHelperImpl
     uno::Reference< frame::XModel > mxModel;
 public:
     /// @throws uno::RuntimeException
-    BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ) {}
+    BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ) {}
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
         OUString aName = xNamed->getName();
@@ -57,25 +57,25 @@ private:
     uno::Any cachePos;
 public:
     /// @throws uno::RuntimeException
-    explicit BookmarkCollectionHelper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : mxIndexAccess( xIndexAccess )
+    explicit BookmarkCollectionHelper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess )
     {
         mxNameAccess.set( mxIndexAccess, uno::UNO_QUERY_THROW );
     }
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override { return  mxIndexAccess->getElementType(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override { return mxIndexAccess->hasElements(); }
+    virtual uno::Type SAL_CALL getElementType(  ) override { return  mxIndexAccess->getElementType(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return mxIndexAccess->hasElements(); }
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName(aName) )
             throw container::NoSuchElementException();
         return cachePos;
     }
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         return mxNameAccess->getElementNames();
     }
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         if( mxNameAccess->hasByName( aName ) )
         {
@@ -98,11 +98,11 @@ public:
         return false;
     }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         return mxIndexAccess->getCount();
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         return mxIndexAccess->getByIndex( Index );
     }
@@ -115,12 +115,12 @@ SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParen
 }
 // XEnumerationAccess
 uno::Type
-SwVbaBookmarks::getElementType() throw (uno::RuntimeException)
+SwVbaBookmarks::getElementType()
 {
     return cppu::UnoType<word::XBookmark>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaBookmarks::createEnumeration() throw (uno::RuntimeException)
+SwVbaBookmarks::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return new BookmarksEnumeration( getParent(), mxContext,xEnumAccess->createEnumeration(), mxModel );
@@ -134,13 +134,13 @@ SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource )
     return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
 }
 
-void SwVbaBookmarks::removeBookmarkByName( const OUString& rName ) throw (uno::RuntimeException)
+void SwVbaBookmarks::removeBookmarkByName( const OUString& rName )
 {
     uno::Reference< text::XTextContent > xBookmark( m_xNameAccess->getByName( rName ), uno::UNO_QUERY_THROW );
     word::getXTextViewCursor( mxModel )->getText()->removeTextContent( xBookmark );
 }
 
-void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException)
+void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& xModel, const OUString& rName, const uno::Reference< text::XTextRange >& rTextRange )
 {
     uno::Reference< lang::XMultiServiceFactory > xDocMSF( xModel, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance("com.sun.star.text.Bookmark"), uno::UNO_QUERY_THROW );
@@ -150,7 +150,7 @@ void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& x
 }
 
 uno::Any SAL_CALL
-SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException, std::exception)
+SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange )
 {
     uno::Reference< text::XTextRange > xTextRange;
     uno::Reference< word::XRange > xRange;
@@ -176,31 +176,31 @@ SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) throw (uno:
 }
 
 sal_Int32 SAL_CALL
-SwVbaBookmarks::getDefaultSorting() throw (css::uno::RuntimeException, std::exception)
+SwVbaBookmarks::getDefaultSorting()
 {
     return word::WdBookmarkSortBy::wdSortByName;
 }
 
 void SAL_CALL
-SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ ) throw (css::uno::RuntimeException, std::exception)
+SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ )
 {
     // not support in Writer
 }
 
 sal_Bool SAL_CALL
-SwVbaBookmarks::getShowHidden() throw (css::uno::RuntimeException, std::exception)
+SwVbaBookmarks::getShowHidden()
 {
     return true;
 }
 
 void SAL_CALL
-SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeException, std::exception)
+SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ )
 {
     // not support in Writer
 }
 
 sal_Bool SAL_CALL
-SwVbaBookmarks::Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception)
+SwVbaBookmarks::Exists( const OUString& rName )
 {
     bool bExist = m_xNameAccess->hasByName( rName );
     return bExist;
diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx
index 234223277e87..4035b6010316 100644
--- a/sw/source/ui/vba/vbabookmarks.hxx
+++ b/sw/source/ui/vba/vbabookmarks.hxx
@@ -38,16 +38,16 @@ private:
 
 private:
     /// @throws css::uno::RuntimeException
-    void removeBookmarkByName( const OUString& rName ) throw (css::uno::RuntimeException);
+    void removeBookmarkByName( const OUString& rName );
 
 public:
     SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel );
 
     /// @throws css::uno::RuntimeException
-    static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException);
+    static void addBookmarkByName( const css::uno::Reference< css::frame::XModel >& xModel, const OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange );
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaBookmarks_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
@@ -55,13 +55,13 @@ public:
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 
     // XBookmarks
-    virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getDefaultSorting() override;
+    virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) override;
+    virtual sal_Bool SAL_CALL getShowHidden() override;
+    virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) override;
 
-    virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL Exists( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rRange ) override;
+    virtual sal_Bool SAL_CALL Exists( const OUString& rName ) override;
 };
 
 #endif // INCLUDED_SW_SOURCE_UI_VBA_VBABOOKMARKS_HXX
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index b301ba244866..552cfaf294bf 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -150,7 +150,7 @@ protected:
 public:
     SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType ) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ) {}
 
-    uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override
+    uno::Any SAL_CALL getLineStyle() override
     {
         sal_Int32 nLineStyle = word::WdLineStyle::wdLineStyleNone;
         table::BorderLine aBorderLine;
@@ -171,7 +171,7 @@ public:
         }
         return uno::makeAny( nLineStyle );
     }
-    void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) override
+    void SAL_CALL setLineStyle( const uno::Any& _linestyle ) override
     {
         // Urk no choice but to silently ignore we don't support this attribute
         // #TODO would be nice to support the word line styles
@@ -251,11 +251,11 @@ public:
     {
     }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         return SAL_N_ELEMENTS( supportedIndexTable );
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
 
         sal_Int32 nIndex = getTableIndex( Index );
@@ -266,11 +266,11 @@ public:
         }
         throw lang::IndexOutOfBoundsException();
     }
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return  cppu::UnoType<word::XBorder>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return true;
     }
@@ -288,12 +288,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE
     sal_Int32 nIndex;
 public:
     explicit RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < m_xIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex < m_xIndexAccess->getCount() )
             return m_xIndexAccess->getByIndex( nIndex++ );
@@ -308,7 +308,7 @@ SwVbaBorders::SwVbaBorders( const uno::Reference< XHelperInterface >& xParent, c
 }
 
 uno::Reference< container::XEnumeration >
-SwVbaBorders::createEnumeration() throw (uno::RuntimeException)
+SwVbaBorders::createEnumeration()
 {
     return new RangeBorderEnumWrapper( m_xIndexAccess );
 }
@@ -320,24 +320,24 @@ SwVbaBorders::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Type
-SwVbaBorders::getElementType() throw (uno::RuntimeException)
+SwVbaBorders::getElementType()
 {
     return cppu::UnoType<word::XBorders>::get();
 }
 
 uno::Any
-SwVbaBorders::getItemByIntIndex( const sal_Int32 nIndex )  throw (uno::RuntimeException)
+SwVbaBorders::getItemByIntIndex( const sal_Int32 nIndex )
 {
     return createCollectionObject( m_xIndexAccess->getByIndex( nIndex ) );
 }
 
-sal_Bool SAL_CALL SwVbaBorders::getShadow() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaBorders::getShadow()
 {
     // always return False for table border in MS Word
     return false;
 }
 
-void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ )
 {
     // not support in Table border in Word
     // TODO:
diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx
index faf2d6ebd311..45364e3c5f59 100644
--- a/sw/source/ui/vba/vbaborders.hxx
+++ b/sw/source/ui/vba/vbaborders.hxx
@@ -30,20 +30,20 @@ class VbaPalette;
 class SwVbaBorders : public SwVbaBorders_BASE
 {
     // XEnumerationAccess
-    virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) override;
+    virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) override;
     css::uno::Reference< css::beans::XPropertySet > m_xProps;
 public:
     SwVbaBorders( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::table::XCellRange >& xRange, VbaPalette& rPalette );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
-    virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getShadow() override;
+    virtual void SAL_CALL setShadow( sal_Bool _shadow ) override;
 
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx
index 1b267c8f107b..17b518eb8b54 100644
--- a/sw/source/ui/vba/vbacell.cxx
+++ b/sw/source/ui/vba/vbacell.cxx
@@ -30,7 +30,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaCell::SwVbaCell( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nColumn, sal_Int32 nRow ) throw ( uno::RuntimeException ) :
+SwVbaCell::SwVbaCell( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nColumn, sal_Int32 nRow ) :
     SwVbaCell_BASE( rParent, rContext ), mxTextTable( xTextTable ), mnColumn( nColumn ), mnRow( nRow )
 {
 }
@@ -39,49 +39,49 @@ SwVbaCell::~SwVbaCell()
 {
 }
 
-::sal_Int32 SAL_CALL SwVbaCell::getWidth() throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaCell::getWidth()
 {
     SwVbaTableHelper aTableHelper( mxTextTable );
     return aTableHelper.GetColWidth( mnColumn, mnRow, true );
 }
 
-void SAL_CALL SwVbaCell::setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCell::setWidth( ::sal_Int32 _width )
 {
     SwVbaTableHelper aTableHelper( mxTextTable );
     aTableHelper.SetColWidth( _width, mnColumn, mnRow, true );
 }
 
-uno::Any SAL_CALL SwVbaCell::getHeight() throw (css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaCell::getHeight()
 {
     uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnRow ) );
     return xRow->getHeight();
 }
 
-void SAL_CALL SwVbaCell::setHeight( const uno::Any& _height ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCell::setHeight( const uno::Any& _height )
 {
     uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnRow ) );
     xRow->setHeight( _height );
 }
 
-::sal_Int32 SAL_CALL SwVbaCell::getHeightRule() throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaCell::getHeightRule()
 {
     uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnRow ) );
     return xRow->getHeightRule();
 }
 
-void SAL_CALL SwVbaCell::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCell::setHeightRule( ::sal_Int32 _heightrule )
 {
     uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnRow ) );
     xRow->setHeightRule( _heightrule );
 }
 
-void SAL_CALL SwVbaCell::SetWidth( float width, sal_Int32 /*rulestyle*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCell::SetWidth( float width, sal_Int32 /*rulestyle*/ )
 {
     // FIXME: handle the argument: rulestyle
     setWidth( static_cast<sal_Int32>(width) );
 }
 
-void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule )
 {
     // FIXME: handle the argument: heightrule
     setHeightRule( heightrule );
diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx
index 63c6569d327d..9c9e7524e43f 100644
--- a/sw/source/ui/vba/vbacell.hxx
+++ b/sw/source/ui/vba/vbacell.hxx
@@ -34,20 +34,20 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaCell( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nColumn, sal_Int32 nRow ) throw ( css::uno::RuntimeException );
+    SwVbaCell( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nColumn, sal_Int32 nRow );
     virtual ~SwVbaCell() override;
 
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getWidth() override;
+    virtual void SAL_CALL setWidth( ::sal_Int32 _width ) override;
+    virtual css::uno::Any SAL_CALL getHeight() override;
+    virtual void SAL_CALL setHeight( const css::uno::Any& _height ) override;
+    virtual ::sal_Int32 SAL_CALL getHeightRule() override;
+    virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) override;
 
     // Methods
-    virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) override;
+    virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index 19251712385f..b47d6a48c3ae 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -35,12 +35,12 @@ public:
     explicit CellsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 )
     {
     }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < mxIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if( nIndex < mxIndexAccess->getCount() )
         {
@@ -64,15 +64,15 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    CellCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw ( css::uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ), mxTextTable( xTextTable ), mnLeft( nLeft ), mnTop( nTop ), mnRight( nRight ), mnBottom( nBottom )
+    CellCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ): mxParent( xParent ), mxContext( xContext ), mxTextTable( xTextTable ), mnLeft( nLeft ), mnTop( nTop ), mnRight( nRight ), mnBottom( nBottom )
     {
     }
 
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount(  ) override
     {
         return ( mnRight - mnLeft + 1 ) * ( mnBottom - mnTop + 1 );
     }
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw css::lang::IndexOutOfBoundsException();
@@ -88,32 +88,32 @@ public:
         throw css::lang::IndexOutOfBoundsException();
 
     }
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<word::XCell>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return true;
     }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new CellsEnumWrapper( this );
     }
 };
 
-SwVbaCells::SwVbaCells( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (uno::RuntimeException) : SwVbaCells_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new CellCollectionHelper( xParent, xContext, xTextTable, nLeft, nTop, nRight, nBottom ) ) ), mxTextTable( xTextTable ), mnTop( nTop ), mnBottom( nBottom )
+SwVbaCells::SwVbaCells( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) : SwVbaCells_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new CellCollectionHelper( xParent, xContext, xTextTable, nLeft, nTop, nRight, nBottom ) ) ), mxTextTable( xTextTable ), mnTop( nTop ), mnBottom( nBottom )
 {
 }
 
-::sal_Int32 SAL_CALL SwVbaCells::getWidth() throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaCells::getWidth()
 {
     uno::Reference< word::XCell > xCell( m_xIndexAccess->getByIndex( 0 ), uno::UNO_QUERY_THROW );
     return xCell->getWidth();
 }
 
-void SAL_CALL SwVbaCells::setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCells::setWidth( ::sal_Int32 _width )
 {
     sal_Int32 nIndex = 0;
     while( nIndex < m_xIndexAccess->getCount() )
@@ -123,13 +123,13 @@ void SAL_CALL SwVbaCells::setWidth( ::sal_Int32 _width ) throw (css::uno::Runtim
     }
 }
 
-uno::Any SAL_CALL SwVbaCells::getHeight() throw (css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaCells::getHeight()
 {
     uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnTop ) );
     return xRow->getHeight();
 }
 
-void SAL_CALL SwVbaCells::setHeight( const uno::Any& _height ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCells::setHeight( const uno::Any& _height )
 {
     for( sal_Int32 row = mnTop; row <= mnBottom; row++ )
     {
@@ -138,13 +138,13 @@ void SAL_CALL SwVbaCells::setHeight( const uno::Any& _height ) throw (css::uno::
     }
 }
 
-::sal_Int32 SAL_CALL SwVbaCells::getHeightRule() throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaCells::getHeightRule()
 {
     uno::Reference< word::XRow > xRow( new SwVbaRow( getParent(), mxContext, mxTextTable, mnTop ) );
     return xRow->getHeightRule();
 }
 
-void SAL_CALL SwVbaCells::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCells::setHeightRule( ::sal_Int32 _heightrule )
 {
     for( sal_Int32 row = mnTop; row <= mnBottom; row++ )
     {
@@ -153,7 +153,7 @@ void SAL_CALL SwVbaCells::setHeightRule( ::sal_Int32 _heightrule ) throw (css::u
     }
 }
 
-void SAL_CALL SwVbaCells::SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCells::SetWidth( float width, sal_Int32 rulestyle )
 {
     sal_Int32 nIndex = 0;
     while( nIndex < m_xIndexAccess->getCount() )
@@ -163,7 +163,7 @@ void SAL_CALL SwVbaCells::SetWidth( float width, sal_Int32 rulestyle ) throw (cs
     }
 }
 
-void SAL_CALL SwVbaCells::SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaCells::SetHeight( float height, sal_Int32 heightrule )
 {
     for( sal_Int32 row = mnTop; row <= mnBottom; row++ )
     {
@@ -174,13 +174,13 @@ void SAL_CALL SwVbaCells::SetHeight( float height, sal_Int32 heightrule ) throw
 
 // XEnumerationAccess
 uno::Type
-SwVbaCells::getElementType() throw (uno::RuntimeException)
+SwVbaCells::getElementType()
 {
     return cppu::UnoType<word::XCell>::get();
 }
 
 uno::Reference< container::XEnumeration >
-SwVbaCells::createEnumeration() throw (uno::RuntimeException)
+SwVbaCells::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return xEnumAccess->createEnumeration();
diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx
index 3d3c4f8d49d0..be6b1b1af122 100644
--- a/sw/source/ui/vba/vbacells.hxx
+++ b/sw/source/ui/vba/vbacells.hxx
@@ -35,23 +35,23 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaCells( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw ( css::uno::RuntimeException );
+    SwVbaCells( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom );
 
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidth( ::sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getWidth() override;
+    virtual void SAL_CALL setWidth( ::sal_Int32 _width ) override;
+    virtual css::uno::Any SAL_CALL getHeight() override;
+    virtual void SAL_CALL setHeight( const css::uno::Any& _height ) override;
+    virtual ::sal_Int32 SAL_CALL getHeightRule() override;
+    virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) override;
 
     // Methods
-    virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL SetWidth( float width, sal_Int32 rulestyle ) override;
+    virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) override;
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaCells_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index 758576f86890..ffa15ce28181 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -29,7 +29,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaColumn::SwVbaColumn( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( uno::RuntimeException ) :
+SwVbaColumn::SwVbaColumn( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nIndex ) :
     SwVbaColumn_BASE( rParent, rContext ), mxTextTable( xTextTable ), mnIndex( nIndex )
 {
     mxTableColumns = mxTextTable->getColumns();
@@ -40,14 +40,14 @@ SwVbaColumn::~SwVbaColumn()
 }
 
 sal_Int32 SAL_CALL
-SwVbaColumn::getWidth( ) throw ( css::uno::RuntimeException, std::exception )
+SwVbaColumn::getWidth( )
 {
     SwVbaTableHelper aTableHelper( mxTextTable );
     return aTableHelper.GetColWidth( mnIndex );
 }
 
 void SAL_CALL
-SwVbaColumn::setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception )
+SwVbaColumn::setWidth( sal_Int32 _width )
 {
 
     SwVbaTableHelper aTableHelper( mxTextTable );
@@ -55,12 +55,12 @@ SwVbaColumn::setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, st
 }
 
 void SAL_CALL
-SwVbaColumn::Select( ) throw ( uno::RuntimeException, std::exception )
+SwVbaColumn::Select( )
 {
     SelectColumn( getCurrentWordDoc(mxContext), mxTextTable, mnIndex, mnIndex );
 }
 
-void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw ( uno::RuntimeException )
+void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn )
 {
     OUStringBuffer aRangeName;
     OUString sStartCol = SwVbaTableHelper::getColumnStr( nStartColumn );
diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx
index 8ecbbd21f1a2..dd4f31820176 100644
--- a/sw/source/ui/vba/vbacolumn.hxx
+++ b/sw/source/ui/vba/vbacolumn.hxx
@@ -36,16 +36,16 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaColumn( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
+    SwVbaColumn( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex );
     virtual ~SwVbaColumn() override;
 
     // Methods
-    virtual sal_Int32 SAL_CALL getWidth() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getWidth() override;
+    virtual void SAL_CALL setWidth( sal_Int32 _width ) override;
+    virtual void SAL_CALL Select(  ) override;
 
     /// @throws css::uno::RuntimeException
-    static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw (css::uno::RuntimeException);
+    static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn );
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index 214392114efe..6b9c577ac369 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -41,12 +41,12 @@ public:
     {
         mxIndexAccess.set( mxTextTable->getColumns(), uno::UNO_QUERY );
     }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < mxIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if( nIndex < mxIndexAccess->getCount() )
         {
@@ -56,30 +56,30 @@ public:
     }
 };
 
-SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable )
+SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns ) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable )
 {
     mnStartColumnIndex = 0;
     SwVbaTableHelper aTableHelper( mxTextTable );
     mnEndColumnIndex = aTableHelper.getTabColumnsMaxCount( ) - 1;
 }
 
-SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mnStartColumnIndex( nStartCol ), mnEndColumnIndex( nEndCol )
+SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mnStartColumnIndex( nStartCol ), mnEndColumnIndex( nEndCol )
 {
     if( mnEndColumnIndex < mnStartColumnIndex )
         throw uno::RuntimeException();
 }
 
-uno::Reference< word::XColumn > SwVbaColumns::getColumnAtIndex( sal_Int32 index ) throw (uno::RuntimeException)
+uno::Reference< word::XColumn > SwVbaColumns::getColumnAtIndex( sal_Int32 index )
 {
     return uno::Reference< word::XColumn >( new SwVbaColumn( this, mxContext, mxTextTable, index ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaColumns::getWidth() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaColumns::getWidth()
 {
     return getColumnAtIndex( mnStartColumnIndex )->getWidth();
 }
 
-void SAL_CALL SwVbaColumns::setWidth( ::sal_Int32 _width ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaColumns::setWidth( ::sal_Int32 _width )
 {
     for( sal_Int32 index = mnStartColumnIndex; index <= mnEndColumnIndex; index++ )
     {
@@ -87,17 +87,17 @@ void SAL_CALL SwVbaColumns::setWidth( ::sal_Int32 _width ) throw (uno::RuntimeEx
     }
 }
 
-void SAL_CALL SwVbaColumns::Select(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaColumns::Select(  )
 {
     SwVbaColumn::SelectColumn( getCurrentWordDoc(mxContext), mxTextTable, mnStartColumnIndex, mnEndColumnIndex );
 }
 
-::sal_Int32 SAL_CALL SwVbaColumns::getCount() throw (uno::RuntimeException)
+::sal_Int32 SAL_CALL SwVbaColumns::getCount()
 {
     return ( mnEndColumnIndex - mnStartColumnIndex + 1 );
 }
 
-uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ )
 {
     sal_Int32 nIndex = 0;
     if( ( Index1 >>= nIndex ) )
@@ -113,12 +113,12 @@ uno::Any SAL_CALL SwVbaColumns::Item( const uno::Any& Index1, const uno::Any& /*
 
 // XEnumerationAccess
 uno::Type
-SwVbaColumns::getElementType() throw (uno::RuntimeException)
+SwVbaColumns::getElementType()
 {
     return cppu::UnoType<word::XColumn>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaColumns::createEnumeration() throw (uno::RuntimeException)
+SwVbaColumns::createEnumeration()
 {
     return new ColumnsEnumWrapper( this, mxContext, mxTextTable );
 }
diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx
index 6fe9cd31d7e0..d4b957fd53f5 100644
--- a/sw/source/ui/vba/vbacolumns.hxx
+++ b/sw/source/ui/vba/vbacolumns.hxx
@@ -37,24 +37,24 @@ private:
 
 private:
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ooo::vba::word::XColumn > getColumnAtIndex( sal_Int32 index ) throw (css::uno::RuntimeException);
+    css::uno::Reference< ooo::vba::word::XColumn > getColumnAtIndex( sal_Int32 index );
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns ) throw ( css::uno::RuntimeException );
+    SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns );
     /// @throws css::uno::RuntimeException
-    SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw ( css::uno::RuntimeException );
+    SwVbaColumns( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol );
 
-    virtual sal_Int32 SAL_CALL getWidth(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getWidth(  ) override;
+    virtual void SAL_CALL setWidth( sal_Int32 _width ) override;
+    virtual void SAL_CALL Select(  ) override;
 
     //XCollection
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaColumns_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx
index e7624398450e..f4de6d75f8af 100644
--- a/sw/source/ui/vba/vbadialogs.cxx
+++ b/sw/source/ui/vba/vbadialogs.cxx
@@ -24,7 +24,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 uno::Any
-SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException, std::exception)
+SwVbaDialogs::Item( const uno::Any &aItem )
 {
     sal_Int32 nIndex = 0;
     aItem >>= nIndex;
diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx
index c01134cd102c..0c9400e4d65b 100644
--- a/sw/source/ui/vba/vbadialogs.hxx
+++ b/sw/source/ui/vba/vbadialogs.hxx
@@ -34,7 +34,7 @@ public:
     SwVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): SwVbaDialogs_BASE( xParent, xContext, xModel ) {}
 
     // XCollection
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index b70c9623e6d8..0ca98f9bd478 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -77,7 +77,7 @@ void SwVbaDocument::Initialize()
 }
 
 uno::Reference< word::XRange > SAL_CALL
-SwVbaDocument::getContent() throw ( uno::RuntimeException, std::exception )
+SwVbaDocument::getContent()
 {
     uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart();
     uno::Reference< text::XTextRange > xEnd;
@@ -86,7 +86,6 @@ SwVbaDocument::getContent() throw ( uno::RuntimeException, std::exception )
 
 uno::Reference< word::XRange > SAL_CALL
 SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd )
-    throw (css::script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     if( !rStart.hasValue() && !rEnd.hasValue() )
         return getContent();
@@ -130,7 +129,7 @@ SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd )
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaBuiltinDocumentProperties( mxParent, mxContext, getModel() ) );
     if ( index.hasValue() )
@@ -139,7 +138,7 @@ SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index ) throw (uno::Ru
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::CustomDocumentProperties( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaCustomDocumentProperties( mxParent, mxContext, getModel() ) );
     if ( index.hasValue() )
@@ -148,7 +147,7 @@ SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) throw (uno::Run
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException, std::exception )
+SwVbaDocument::Bookmarks( const uno::Any& rIndex )
 {
     uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( getModel(),uno::UNO_QUERY_THROW );
     uno::Reference<container::XIndexAccess > xBookmarks( xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY_THROW );
@@ -160,7 +159,7 @@ SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException, std::exception )
+SwVbaDocument::Variables( const uno::Any& rIndex )
 {
     uno::Reference< css::document::XDocumentPropertiesSupplier > xDocumentPropertiesSupplier( getModel(),uno::UNO_QUERY_THROW );
     uno::Reference< css::document::XDocumentProperties > xDocumentProperties =  xDocumentPropertiesSupplier->getDocumentProperties();
@@ -174,7 +173,7 @@ SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Paragraphs( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::Paragraphs( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaParagraphs( mxParent, mxContext, mxTextDocument ) );
     if ( index.hasValue() )
@@ -183,7 +182,7 @@ SwVbaDocument::Paragraphs( const uno::Any& index ) throw (uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Styles( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::Styles( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaStyles( mxParent, mxContext, getModel() ) );
     if ( index.hasValue() )
@@ -192,7 +191,7 @@ SwVbaDocument::Styles( const uno::Any& index ) throw (uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Fields( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::Fields( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, getModel() ) );
     if ( index.hasValue() )
@@ -201,7 +200,7 @@ SwVbaDocument::Fields( const uno::Any& index ) throw (uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Shapes( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::Shapes( const uno::Any& index )
 {
     uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getModel(), uno::UNO_QUERY_THROW );
     uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
@@ -214,7 +213,7 @@ SwVbaDocument::Shapes( const uno::Any& index ) throw (uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Sections( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::Sections( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaSections( mxParent, mxContext, getModel() ) );
     if ( index.hasValue() )
@@ -223,7 +222,7 @@ SwVbaDocument::Sections( const uno::Any& index ) throw (uno::RuntimeException, s
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::TablesOfContents( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::TablesOfContents( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaTablesOfContents( this, mxContext, mxTextDocument ) );
     if ( index.hasValue() )
@@ -232,14 +231,14 @@ SwVbaDocument::TablesOfContents( const uno::Any& index ) throw (uno::RuntimeExce
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::FormFields( const uno::Any& /*index*/ ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::FormFields( const uno::Any& /*index*/ )
 {
     uno::Reference< XCollection > xCol;
     return uno::makeAny( xCol );
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::PageSetup( ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::PageSetup( )
 {
     uno::Reference< beans::XPropertySet > xPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW );
     return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) );
@@ -252,7 +251,7 @@ SwVbaDocument::getServiceImplName()
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException, std::exception)
+SwVbaDocument::getAttachedTemplate()
 {
     uno::Reference< word::XTemplate > xTemplate;
     uno::Reference<css::document::XDocumentPropertiesSupplier> const xDocPropSupp(
@@ -265,7 +264,7 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException, std::exceptio
 }
 
 void SAL_CALL
-SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate )
 {
     OUString sTemplate;
     if( !( _attachedtemplate >>= sTemplate ) )
@@ -289,7 +288,7 @@ SwVbaDocument::setAttachedTemplate( const css::uno::Any& _attachedtemplate ) thr
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Tables( const css::uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::Tables( const css::uno::Any& aIndex )
 {
     uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
     uno::Reference< XCollection > xColl( new SwVbaTables( mxParent, mxContext, xModel ) );
@@ -299,34 +298,34 @@ SwVbaDocument::Tables( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio
     return uno::makeAny( xColl );
 }
 
-void SAL_CALL SwVbaDocument::Activate() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::Activate()
 {
     VbaDocumentBase::Activate();
 }
 
-::sal_Int32 SAL_CALL SwVbaDocument::getProtectionType() throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaDocument::getProtectionType()
 {
     //TODO
     return word::WdProtectionType::wdNoProtection;
 }
 
-void SAL_CALL SwVbaDocument::setProtectionType( ::sal_Int32 /*_protectiontype*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::setProtectionType( ::sal_Int32 /*_protectiontype*/ )
 {
     //TODO
 }
 
-sal_Bool SAL_CALL SwVbaDocument::getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaDocument::getUpdateStylesOnOpen()
 {
     //TODO
     return false;
 }
 
-void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( sal_Bool /*_updatestylesonopen*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( sal_Bool /*_updatestylesonopen*/ )
 {
     //TODO
 }
 
-sal_Bool SAL_CALL SwVbaDocument::getAutoHyphenation() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaDocument::getAutoHyphenation()
 {
     // check this property only in default paragraph style
     bool IsAutoHyphenation = false;
@@ -335,25 +334,25 @@ sal_Bool SAL_CALL SwVbaDocument::getAutoHyphenation() throw (uno::RuntimeExcepti
     return IsAutoHyphenation;
 }
 
-void SAL_CALL SwVbaDocument::setAutoHyphenation( sal_Bool _autohyphenation ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::setAutoHyphenation( sal_Bool _autohyphenation )
 {
     //TODO
     uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
     xParaProps->setPropertyValue("ParaIsHyphenation", uno::makeAny( _autohyphenation ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaDocument::getHyphenationZone()
 {
     //TODO
     return 0;
 }
 
-void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone*/ )
 {
     //TODO
 }
 
-::sal_Int32 SAL_CALL SwVbaDocument::getConsecutiveHyphensLimit() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaDocument::getConsecutiveHyphensLimit()
 {
     //TODO
     sal_Int16 nHyphensLimit = 0;
@@ -362,38 +361,38 @@ void SAL_CALL SwVbaDocument::setHyphenationZone( ::sal_Int32 /*_hyphenationzone*
     return nHyphensLimit;
 }
 
-void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit )
 {
     sal_Int16 nHyphensLimit = static_cast< sal_Int16 >( _consecutivehyphenslimit );
     uno::Reference< beans::XPropertySet > xParaProps( word::getDefaultParagraphStyle( getModel() ), uno::UNO_QUERY_THROW );
     xParaProps->setPropertyValue("ParaHyphenationMaxHyphens", uno::makeAny( nHyphensLimit ) );
 }
 
-void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::Protect( ::sal_Int32 /*Type*/, const uno::Any& /*NOReset*/, const uno::Any& /*Password*/, const uno::Any& /*UseIRM*/, const uno::Any& /*EnforceStyleLock*/ )
 {
     // Seems not support in Writer
     // VbaDocumentBase::Protect( Password );
 }
 
-void SAL_CALL SwVbaDocument::PrintOut( const uno::Any& /*Background*/, const uno::Any& /*Append*/, const uno::Any& /*Range*/, const uno::Any& /*OutputFileName*/, const uno::Any& /*From*/, const uno::Any& /*To*/, const uno::Any& /*Item*/, const uno::Any& /*Copies*/, const uno::Any& /*Pages*/, const uno::Any& /*PageType*/, const uno::Any& /*PrintToFile*/, const uno::Any& /*Collate*/, const uno::Any& /*FileName*/, const uno::Any& /*ActivePrinterMacGX*/, const uno::Any& /*ManualDuplexPrint*/, const uno::Any& /*PrintZoomColumn*/, const uno::Any& /*PrintZoomRow*/, const uno::Any& /*PrintZoomPaperWidth*/, const uno::Any& /*PrintZoomPaperHeight*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::PrintOut( const uno::Any& /*Background*/, const uno::Any& /*Append*/, const uno::Any& /*Range*/, const uno::Any& /*OutputFileName*/, const uno::Any& /*From*/, const uno::Any& /*To*/, const uno::Any& /*Item*/, const uno::Any& /*Copies*/, const uno::Any& /*Pages*/, const uno::Any& /*PageType*/, const uno::Any& /*PrintToFile*/, const uno::Any& /*Collate*/, const uno::Any& /*FileName*/, const uno::Any& /*ActivePrinterMacGX*/, const uno::Any& /*ManualDuplexPrint*/, const uno::Any& /*PrintZoomColumn*/, const uno::Any& /*PrintZoomRow*/, const uno::Any& /*PrintZoomPaperWidth*/, const uno::Any& /*PrintZoomPaperHeight*/ )
 {
     //TODO
 }
 
-void SAL_CALL SwVbaDocument::PrintPreview(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::PrintPreview(  )
 {
     OUString url = ".uno:PrintPreview";
     dispatchRequests( mxModel,url );
 }
 
-void SAL_CALL SwVbaDocument::ClosePrintPreview(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaDocument::ClosePrintPreview(  )
 {
     OUString url = ".uno:ClosePreview";
     dispatchRequests( mxModel,url );
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Revisions( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::Revisions( const uno::Any& index )
 {
     uno::Reference< css::document::XRedlinesSupplier > xRedlinesSupp( mxTextDocument, uno::UNO_QUERY_THROW );
     uno::Reference< container::XIndexAccess > xRedlines( xRedlinesSupp->getRedlines(), uno::UNO_QUERY_THROW );
@@ -404,7 +403,7 @@ SwVbaDocument::Revisions( const uno::Any& index ) throw (uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::Frames( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::Frames( const uno::Any& index )
 {
     uno::Reference< text::XTextFramesSupplier > xTextFramesSupp( mxTextDocument, uno::UNO_QUERY_THROW );
     uno::Reference< container::XIndexAccess > xFrames( xTextFramesSupp->getTextFrames(), uno::UNO_QUERY_THROW );
@@ -439,25 +438,25 @@ SwVbaDocument::getControlShape( const OUString& sName )
 }
 
 uno::Reference< beans::XIntrospectionAccess > SAL_CALL
-SwVbaDocument::getIntrospection(  ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::getIntrospection(  )
 {
     return uno::Reference< beans::XIntrospectionAccess >();
 }
 
 uno::Any SAL_CALL
-SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ )
 {
     SAL_INFO("sw", "** will barf " << aFunctionName );
     throw uno::RuntimeException(); // unsupported operation
 }
 
 void SAL_CALL
-SwVbaDocument::setValue( const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+SwVbaDocument::setValue( const OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ )
 {
     throw uno::RuntimeException(); // unsupported operation
 }
 uno::Any SAL_CALL
-SwVbaDocument::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+SwVbaDocument::getValue( const OUString& aPropertyName )
 {
     uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
 
@@ -468,13 +467,13 @@ SwVbaDocument::getValue( const OUString& aPropertyName ) throw (beans::UnknownPr
 }
 
 sal_Bool SAL_CALL
-SwVbaDocument::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::hasMethod( const OUString& /*aName*/ )
 {
     return false;
 }
 
 sal_Bool SAL_CALL
-SwVbaDocument::hasProperty( const OUString& aName ) throw (uno::RuntimeException, std::exception)
+SwVbaDocument::hasProperty( const OUString& aName )
 {
     uno::Reference< container::XNameAccess > xFormControls( getFormControls() );
     if ( xFormControls.is() )
diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx
index da7e419a0829..5a54d2f1433e 100644
--- a/sw/source/ui/vba/vbadocument.hxx
+++ b/sw/source/ui/vba/vbadocument.hxx
@@ -42,50 +42,49 @@ public:
     virtual ~SwVbaDocument() override;
 
     // XDocument
-    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd )
-        throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getAttachedTemplate() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getProtectionType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setUpdateStylesOnOpen( sal_Bool _updatestylesonopen ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoHyphenation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoHyphenation( sal_Bool _autohyphenation ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getHyphenationZone() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() override;
+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) override;
+    virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) override;
+    virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) override;
+    virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL getAttachedTemplate() override;
+    virtual void SAL_CALL setAttachedTemplate( const css::uno::Any& _attachedtemplate ) override;
+    virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& rIndex ) override;
+    virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) override;
+    virtual void SAL_CALL Activate() override;
+    virtual css::uno::Any SAL_CALL PageSetup() override;
+    virtual css::uno::Any SAL_CALL TablesOfContents( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL FormFields( const css::uno::Any& aIndex ) override;
+    virtual ::sal_Int32 SAL_CALL getProtectionType() override;
+    virtual void SAL_CALL setProtectionType( ::sal_Int32 _protectiontype ) override;
+    virtual sal_Bool SAL_CALL getUpdateStylesOnOpen() override;
+    virtual void SAL_CALL setUpdateStylesOnOpen( sal_Bool _updatestylesonopen ) override;
+    virtual sal_Bool SAL_CALL getAutoHyphenation() override;
+    virtual void SAL_CALL setAutoHyphenation( sal_Bool _autohyphenation ) override;
+    virtual ::sal_Int32 SAL_CALL getHyphenationZone() override;
+    virtual void SAL_CALL setHyphenationZone( ::sal_Int32 _hyphenationzone ) override;
+    virtual ::sal_Int32 SAL_CALL getConsecutiveHyphensLimit() override;
+    virtual void SAL_CALL setConsecutiveHyphensLimit( ::sal_Int32 _consecutivehyphenslimit ) override;
     using VbaDocumentBase::Protect;
-    virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL PrintPreview(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ClosePrintPreview(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Protect( ::sal_Int32 Type, const css::uno::Any& NOReset, const css::uno::Any& Password, const css::uno::Any& UseIRM, const css::uno::Any& EnforceStyleLock ) override;
+    virtual void SAL_CALL PrintOut( const css::uno::Any& Background, const css::uno::Any& Append, const css::uno::Any& Range, const css::uno::Any& OutputFileName, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Item, const css::uno::Any& Copies, const css::uno::Any& Pages, const css::uno::Any& PageType, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& FileName, const css::uno::Any& ActivePrinterMacGX, const css::uno::Any& ManualDuplexPrint, const css::uno::Any& PrintZoomColumn, const css::uno::Any& PrintZoomRow, const css::uno::Any& PrintZoomPaperWidth, const css::uno::Any& PrintZoomPaperHeight ) override;
+    virtual void SAL_CALL PrintPreview(  ) override;
+    virtual void SAL_CALL ClosePrintPreview(  ) override;
+    virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Frames( const css::uno::Any& aIndex ) override;
 
     // XInvocation
-    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) override;
+    virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) override;
+    virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 4ca696d2960c..5f042ab2abf7 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -32,7 +32,7 @@ using namespace ::ooo::vba;
 using namespace css;
 
 /// @throws lang::IllegalArgumentException
-static sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) throw ( lang::IllegalArgumentException )
+static sal_Int8 lcl_toMSOPropType( const uno::Type& aType )
 {
     sal_Int16 msoType = office::MsoDocProperties::msoPropertyTypeString;
 
@@ -449,19 +449,19 @@ protected:
 public:
     SwVbaBuiltInDocumentProperty(  const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo );
     // XDocumentProperty
-    virtual void SAL_CALL Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int8 SAL_CALL getType(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL getValue(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual OUString SAL_CALL getName(  ) override;
+    virtual void SAL_CALL setName( const OUString& Name ) override;
+    virtual ::sal_Int8 SAL_CALL getType(  ) override;
+    virtual void SAL_CALL setType( ::sal_Int8 Type ) override;
+    virtual sal_Bool SAL_CALL getLinkToContent(  ) override;
+    virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) override;
+    virtual uno::Any SAL_CALL getValue(  ) override;
+    virtual void SAL_CALL setValue( const uno::Any& Value ) override;
+    virtual OUString SAL_CALL getLinkSource(  ) override;
+    virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) override;
     //XDefaultProperty
-    virtual OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException, std::exception) override { return OUString("Value"); }
+    virtual OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual uno::Sequence<OUString> getServiceNames() override;
@@ -473,14 +473,14 @@ public:
 
     SwVbaCustomDocumentProperty(  const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo );
 
-    virtual sal_Bool SAL_CALL getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getLinkToContent(  ) override;
+    virtual void SAL_CALL setLinkToContent( sal_Bool LinkToContent ) override;
 
-    virtual OUString SAL_CALL getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getLinkSource(  ) override;
+    virtual void SAL_CALL setLinkSource( const OUString& LinkSource ) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual void SAL_CALL setName( const OUString& Name ) override;
+    virtual void SAL_CALL setType( ::sal_Int8 Type ) override;
 
 };
 
@@ -489,32 +489,32 @@ SwVbaCustomDocumentProperty::SwVbaCustomDocumentProperty(  const uno::Reference<
 }
 
 sal_Bool
-SwVbaCustomDocumentProperty::getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaCustomDocumentProperty::getLinkToContent(  )
 {
     // #FIXME we need to store the link content somewhere
     return false;
 }
 
 void
-SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ )
 {
 }
 
 OUString
-SwVbaCustomDocumentProperty::getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaCustomDocumentProperty::getLinkSource(  )
 {
     // #FIXME we need to store the link content somewhere
     return OUString();
 }
 
 void
-SwVbaCustomDocumentProperty::setLinkSource( const OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaCustomDocumentProperty::setLinkSource( const OUString& /*rsLinkContent*/ )
 {
     // #FIXME we need to store the link source somewhere
 }
 
 void SAL_CALL
-SwVbaCustomDocumentProperty::setName( const OUString& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaCustomDocumentProperty::setName( const OUString& /*Name*/ )
 {
     // setName on existing property ?
     // #FIXME
@@ -522,14 +522,14 @@ SwVbaCustomDocumentProperty::setName( const OUString& /*Name*/ ) throw (script::
 }
 
 void SAL_CALL
-SwVbaCustomDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaCustomDocumentProperty::setType( ::sal_Int8 /*Type*/ )
 {
     // setType, do we need to do a conversion?
     // #FIXME the underlying value needs to be changed to the new type
 }
 
 void SAL_CALL
-SwVbaCustomDocumentProperty::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaCustomDocumentProperty::Delete(  )
 {
     uno::Reference< beans::XPropertyContainer > xContainer(
             mPropInfo.getUserDefinedProperties(), uno::UNO_QUERY_THROW);
@@ -541,53 +541,53 @@ SwVbaBuiltInDocumentProperty::SwVbaBuiltInDocumentProperty( const uno::Reference
 }
 
 void SAL_CALL
-SwVbaBuiltInDocumentProperty::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::Delete(  )
 {
     // not valid for Builtin
     throw uno::RuntimeException();
 }
 
 OUString SAL_CALL
-SwVbaBuiltInDocumentProperty::getName(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::getName(  )
 {
     return mPropInfo.msMSODesc;
 }
 
 void SAL_CALL
-SwVbaBuiltInDocumentProperty::setName( const OUString& ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::setName( const OUString& )
 {
     // not valid for Builtin
     throw uno::RuntimeException();
 }
 
 ::sal_Int8 SAL_CALL
-SwVbaBuiltInDocumentProperty::getType(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::getType(  )
 {
     return lcl_toMSOPropType( getValue().getValueType() );
 }
 
 void SAL_CALL
-SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ )
 {
     // not valid for Builtin
     throw uno::RuntimeException();
 }
 
 sal_Bool SAL_CALL
-SwVbaBuiltInDocumentProperty::getLinkToContent(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::getLinkToContent(  )
 {
     return false; // built-in always false
 }
 
 void SAL_CALL
-SwVbaBuiltInDocumentProperty::setLinkToContent( sal_Bool /*LinkToContent*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::setLinkToContent( sal_Bool /*LinkToContent*/ )
 {
     // not valid for Builtin
     throw uno::RuntimeException();
 }
 
 uno::Any SAL_CALL
-SwVbaBuiltInDocumentProperty::getValue(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::getValue(  )
 {
     uno::Any aRet = mPropInfo.getValue();
     if ( !aRet.hasValue() )
@@ -596,20 +596,20 @@ SwVbaBuiltInDocumentProperty::getValue(  ) throw (script::BasicErrorException, u
 }
 
 void SAL_CALL
-SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value )
 {
     mPropInfo.setValue( Value );
 }
 
 OUString SAL_CALL
-SwVbaBuiltInDocumentProperty::getLinkSource(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::getLinkSource(  )
 {
     // not valid for Builtin
     throw uno::RuntimeException();
 }
 
 void SAL_CALL
-SwVbaBuiltInDocumentProperty::setLinkSource( const OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltInDocumentProperty::setLinkSource( const OUString& /*LinkSource*/ )
 {
     // not valid for Builtin
     throw uno::RuntimeException();
@@ -646,11 +646,11 @@ class DocPropEnumeration : public ::cppu::WeakImplHelper< css::container::XEnume
 public:
 
     explicit DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return mIt != mDocProps.end();
     }
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !hasMoreElements() )
             throw container::NoSuchElementException();
@@ -680,11 +680,11 @@ protected:
         }
     }
 // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         return mDocProps.size();
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         // correct the correct by the base class for 1 based indices
         DocProps::iterator it = mDocProps.find( ++Index );
@@ -692,7 +692,7 @@ protected:
             throw lang::IndexOutOfBoundsException();
         return uno::makeAny( it->second  );
     }
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName( aName ) )
             throw container::NoSuchElementException();
@@ -700,7 +700,7 @@ protected:
         return uno::Any( it->second );
 
     }
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         uno::Sequence< OUString > aNames( getCount() );
         OUString* pName = aNames.getArray();
@@ -710,7 +710,7 @@ protected:
         return aNames;
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         DocPropsByName::iterator it = mNamedDocProps.find( aName );
         if ( it == mNamedDocProps.end() )
@@ -718,15 +718,15 @@ protected:
         return true;
     }
 // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return  cppu::UnoType<XDocumentProperty>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return !mDocProps.empty();
     }
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new DocPropEnumeration( mDocProps );
     }
@@ -737,20 +737,20 @@ SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Refer
 }
 
 uno::Reference< XDocumentProperty > SAL_CALL
-SwVbaBuiltinDocumentProperties::Add( const OUString& /*Name*/, sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaBuiltinDocumentProperties::Add( const OUString& /*Name*/, sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& /*value*/, const uno::Any& /*LinkSource*/ )
 {
     throw uno::RuntimeException( "not supported for Builtin properties" );
 }
 
 // XEnumerationAccess
 uno::Type SAL_CALL
-SwVbaBuiltinDocumentProperties::getElementType() throw (uno::RuntimeException)
+SwVbaBuiltinDocumentProperties::getElementType()
 {
     return  cppu::UnoType<XDocumentProperty>::get();
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-SwVbaBuiltinDocumentProperties::createEnumeration() throw (uno::RuntimeException)
+SwVbaBuiltinDocumentProperties::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return xEnumAccess->createEnumeration();
@@ -799,12 +799,12 @@ public:
                 uno::UNO_SET_THROW);
     };
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         return mxUserDefinedProp->getPropertySetInfo()->getProperties().getLength();
     }
 
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, std::exception ) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
         if ( Index >= aProps.getLength() )
@@ -814,7 +814,7 @@ public:
         return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
     }
 
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName( aName ) )
             throw container::NoSuchElementException();
@@ -823,7 +823,7 @@ public:
         return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
     }
 
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
         uno::Sequence< OUString > aNames( aProps.getLength() );
@@ -835,24 +835,24 @@ public:
         return aNames;
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         SAL_INFO("sw", "hasByName(" << aName << ") returns " << mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) );
         return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName );
     }
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return  cppu::UnoType<XDocumentProperty>::get();
     }
 
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return getCount() > 0;
     }
 
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         // create a map of properties ( the key doesn't matter )
         SAL_INFO("sw", "Creating an enumeration");
@@ -883,7 +883,7 @@ SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Referen
 }
 
 uno::Reference< XDocumentProperty > SAL_CALL
-SwVbaCustomDocumentProperties::Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaCustomDocumentProperties::Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource )
 {
     CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() );
     uno::Reference< XDocumentProperty > xDocProp;
diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx
index 78322b0fa5c2..740353e8291b 100644
--- a/sw/source/ui/vba/vbadocumentproperties.hxx
+++ b/sw/source/ui/vba/vbadocumentproperties.hxx
@@ -31,10 +31,10 @@ public:
     SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
 
     // XDocumentProperties
-    virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
@@ -48,7 +48,7 @@ class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties
 public:
     SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
 // XDocumentProperties
-    virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const OUString& Name, sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
 };
diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx
index 7b130a8ed284..c59c7a60130f 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -65,9 +65,9 @@ class DocumentEnumImpl : public EnumerationHelperImpl
     uno::Any m_aApplication;
 public:
     /// @throws uno::RuntimeException
-    DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {}
+    DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {}
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         uno::Reference< text::XTextDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
         return getDocument( m_xContext, xDoc, m_aApplication );
@@ -79,12 +79,12 @@ SwVbaDocuments::SwVbaDocuments( const uno::Reference< XHelperInterface >& xParen
 }
 // XEnumerationAccess
 uno::Type
-SwVbaDocuments::getElementType() throw (uno::RuntimeException)
+SwVbaDocuments::getElementType()
 {
     return cppu::UnoType<word::XDocument>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaDocuments::createEnumeration() throw (uno::RuntimeException)
+SwVbaDocuments::createEnumeration()
 {
     // #FIXME its possible the DocumentEnumImpl here doesn't reflect
     // the state of this object ( although it should ) would be
@@ -102,7 +102,7 @@ SwVbaDocuments::createCollectionObject( const uno::Any& aSource )
 }
 
 uno::Any SAL_CALL
-SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ ) throw (uno::RuntimeException, std::exception)
+SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/, const uno::Any& /*DocumentType*/, const uno::Any& /*Visible*/ )
 {
     OUString sFileName;
     if( Template.hasValue() && ( Template >>= sFileName ) )
@@ -118,13 +118,13 @@ SwVbaDocuments::Add( const uno::Any& Template, const uno::Any& /*NewTemplate*/,
 
 // #TODO# #FIXME# can any of the unused params below be used?
 void SAL_CALL
-SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ ) throw (uno::RuntimeException, std::exception)
+SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any& /*OriginalFormat*/, const uno::Any& /*RouteDocument*/ )
 {
 }
 
 // #TODO# #FIXME# can any of the unused params below be used?
 uno::Any SAL_CALL
-SwVbaDocuments::Open( const OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ ) throw (uno::RuntimeException, std::exception)
+SwVbaDocuments::Open( const OUString& Filename, const uno::Any& /*ConfirmConversions*/, const uno::Any& ReadOnly, const uno::Any& /*AddToRecentFiles*/, const uno::Any& /*PasswordDocument*/, const uno::Any& /*PasswordTemplate*/, const uno::Any& /*Revert*/, const uno::Any& /*WritePasswordDocument*/, const uno::Any& /*WritePasswordTemplate*/, const uno::Any& /*Format*/, const uno::Any& /*Encoding*/, const uno::Any& /*Visible*/, const uno::Any& /*OpenAndRepair*/, const uno::Any& /*DocumentDirection*/, const uno::Any& /*NoEncodingDialog*/, const uno::Any& /*XMLTransform*/ )
 {
     // we need to detect if this is a URL, if not then assume it's a file path
     OUString aURL;
diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx
index ac5280a33a33..ccf3a4d9b938 100644
--- a/sw/source/ui/vba/vbadocuments.hxx
+++ b/sw/source/ui/vba/vbadocuments.hxx
@@ -34,8 +34,8 @@ public:
     SwVbaDocuments( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaDocuments_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
@@ -43,9 +43,9 @@ public:
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const css::uno::Any& Visible ) override;
+    virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, const css::uno::Any& XMLTransform ) override;
+    virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& OriginalFormat, const css::uno::Any& RouteDocument ) override;
 };
 
 #endif // INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENTS_HXX
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx
index 04f3d5b1e53b..28b6f4e08650 100644
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -45,7 +45,7 @@ SwVbaEventsHelper::~SwVbaEventsHelper()
 }
 
 bool SwVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue,
-        const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& /*rArgs*/ ) throw (uno::RuntimeException)
+        const EventHandlerInfo& rInfo, const uno::Sequence< uno::Any >& /*rArgs*/ )
 {
     switch( rInfo.mnEventId )
     {
@@ -63,20 +63,20 @@ bool SwVbaEventsHelper::implPrepareEvent( EventQueue& rEventQueue,
 }
 
 uno::Sequence< uno::Any > SwVbaEventsHelper::implBuildArgumentList( const EventHandlerInfo& /*rInfo*/,
-        const uno::Sequence< uno::Any >& /*rArgs*/ ) throw (lang::IllegalArgumentException)
+        const uno::Sequence< uno::Any >& /*rArgs*/ )
 {
     // no event handler expects any arguments
     return uno::Sequence< uno::Any >();
 }
 
 void SwVbaEventsHelper::implPostProcessEvent( EventQueue& /*rEventQueue*/,
-        const EventHandlerInfo& /*rInfo*/, bool /*bCancel*/ ) throw (uno::RuntimeException)
+        const EventHandlerInfo& /*rInfo*/, bool /*bCancel*/ )
 {
     // nothing to do after any event
 }
 
 OUString SwVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& /*rInfo*/,
-        const uno::Sequence< uno::Any >& /*rArgs*/ ) const throw (lang::IllegalArgumentException)
+        const uno::Sequence< uno::Any >& /*rArgs*/ ) const
 {
     // TODO: get actual codename from document
     return OUString( "ThisDocument" );
diff --git a/sw/source/ui/vba/vbaeventshelper.hxx b/sw/source/ui/vba/vbaeventshelper.hxx
index a366ee19452a..03a2f8a45f2b 100644
--- a/sw/source/ui/vba/vbaeventshelper.hxx
+++ b/sw/source/ui/vba/vbaeventshelper.hxx
@@ -31,10 +31,10 @@ public:
     virtual ~SwVbaEventsHelper() override;
 
 protected:
-    virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException) override;
-    virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) override;
-    virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) override;
+    virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) override;
+    virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) override;
+    virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) override;
+    virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const override;
 };
 
 #endif
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index af1e1be2d9f7..ae340194c406 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -35,12 +35,12 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaField::SwVbaField(  const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const  uno::Reference< css::text::XTextField >& xTextField) throw ( uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext )
+SwVbaField::SwVbaField(  const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const  uno::Reference< css::text::XTextField >& xTextField) : SwVbaField_BASE( rParent, rContext )
 {
     mxTextField.set( xTextField, uno::UNO_QUERY_THROW );
 }
 
-sal_Bool SAL_CALL SwVbaField::Update() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaField::Update()
 {
     uno::Reference< util::XUpdatable > xUpdatable( mxTextField, uno::UNO_QUERY );
     if( xUpdatable.is() )
@@ -234,11 +234,11 @@ public:
     FieldEnumeration(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< container::XEnumeration >& xEnumeration ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxEnumeration( xEnumeration )
     {
     }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return mxEnumeration->hasMoreElements();
     }
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !hasMoreElements() )
             throw container::NoSuchElementException();
@@ -255,16 +255,16 @@ class FieldCollectionHelper : public ::cppu::WeakImplHelper< container::XIndexAc
     uno::Reference< container::XEnumerationAccess > mxEnumerationAccess;
 public:
     /// @throws css::uno::RuntimeException
-    FieldCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) throw (css::uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
+    FieldCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
     {
         uno::Reference< text::XTextFieldsSupplier > xSupp( xModel, uno::UNO_QUERY_THROW );
         mxEnumerationAccess.set( xSupp->getTextFields(), uno::UNO_QUERY_THROW );
     }
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override { return  mxEnumerationAccess->getElementType(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override { return mxEnumerationAccess->hasElements(); }
+    virtual uno::Type SAL_CALL getElementType(  ) override { return  mxEnumerationAccess->getElementType(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return mxEnumerationAccess->hasElements(); }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         uno::Reference< container::XEnumeration > xEnumeration =  mxEnumerationAccess->createEnumeration();
         sal_Int32 nCount = 0;
@@ -275,7 +275,7 @@ public:
         }
         return nCount;
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if( Index < 0 || Index >= getCount() )
             throw lang::IndexOutOfBoundsException();
@@ -293,7 +293,7 @@ public:
         throw lang::IndexOutOfBoundsException();
     }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         uno::Reference< container::XEnumeration > xEnumeration =  mxEnumerationAccess->createEnumeration();
         return uno::Reference< container::XEnumeration >( new FieldEnumeration( mxParent, mxContext, mxModel, xEnumeration ) );
@@ -306,7 +306,7 @@ SwVbaFields::SwVbaFields( const uno::Reference< XHelperInterface >& xParent, con
 }
 
 uno::Reference< word::XField > SAL_CALL
-SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& /*PreserveFormatting*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& /*PreserveFormatting*/ )
 {
     sal_Int32 nType = word::WdFieldType::wdFieldEmpty;
     Type >>= nType;
@@ -343,7 +343,6 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
 }
 
 uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const OUString& _text )
-    throw (uno::RuntimeException, script::BasicErrorException)
 {
     uno::Reference< text::XTextField > xTextField( mxMSF->createInstance("com.sun.star.text.TextField.FileName"), uno::UNO_QUERY_THROW );
     sal_Int16 nFileFormat = text::FilenameDisplayFormat::NAME_AND_EXT;
@@ -412,7 +411,7 @@ static const DocPropertyTable aDocPropertyTables[] =
     { nullptr, nullptr }
 };
 
-uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const OUString& _text ) throw (uno::RuntimeException)
+uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const OUString& _text )
 {
     OUString aDocProperty;
     SwVbaReadFieldParams aReadParam( _text );
@@ -473,7 +472,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-SwVbaFields::createEnumeration() throw (uno::RuntimeException)
+SwVbaFields::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return xEnumerationAccess->createEnumeration();
@@ -486,7 +485,7 @@ SwVbaFields::createCollectionObject( const uno::Any& aSource )
     return lcl_createField( mxParent, mxContext, mxModel, aSource );
 }
 
-sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwVbaFields::Update()
 {
     sal_Int32 nUpdate = 1;
     try
@@ -512,7 +511,7 @@ SwVbaFields::getServiceImplName()
 
 // XEnumerationAccess
 uno::Type SAL_CALL
-SwVbaFields::getElementType() throw (uno::RuntimeException)
+SwVbaFields::getElementType()
 {
     return  cppu::UnoType<word::XField>::get();
 }
diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx
index 650a09692219..370ceaec3931 100644
--- a/sw/source/ui/vba/vbafield.hxx
+++ b/sw/source/ui/vba/vbafield.hxx
@@ -33,9 +33,9 @@ class SwVbaField : public SwVbaField_BASE
     css::uno::Reference< css::text::XTextField > mxTextField;
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException);
+    SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextField >& xTextField);
 
-    virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL Update() override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
@@ -50,19 +50,18 @@ class SwVbaFields : public SwVbaFields_BASE
 private:
     /// @throws css::uno::RuntimeException
     /// @throws css::script::BasicErrorException
-    css::uno::Reference< css::text::XTextField > Create_Field_FileName(const OUString& rText)
-        throw (css::uno::RuntimeException, css::script::BasicErrorException);
+    css::uno::Reference< css::text::XTextField > Create_Field_FileName(const OUString& rText);
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const OUString& _text ) throw (css::uno::RuntimeException);
+    css::uno::Reference< css::text::XTextField > Create_Field_DocProperty( const OUString& _text );
 
 public:
     SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
     // XFields
-    virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL Update() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ::ooo::vba::word::XField > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& Type, const css::uno::Any& Text, const css::uno::Any& PreserveFormatting ) override;
+    virtual sal_Int32 SAL_CALL Update() override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx
index 3bb5b37a0d23..3556673b0b9a 100644
--- a/sw/source/ui/vba/vbafind.cxx
+++ b/sw/source/ui/vba/vbafind.cxx
@@ -29,7 +29,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaFind::SwVbaFind( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) :
+SwVbaFind::SwVbaFind( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) :
     SwVbaFind_BASE( rParent, rContext ), mxModel( xModel ), mxTextRange( xTextRange ), mbReplace( false ), mnReplaceType( word::WdReplace::wdReplaceOne ), mnWrap( word::WdFindWrap::wdFindStop )
 {
     mxReplaceable.set( mxModel, uno::UNO_QUERY_THROW );
@@ -42,7 +42,7 @@ SwVbaFind::~SwVbaFind()
 {
 }
 
-bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException )
+bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange )
 {
     uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW );
     if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) >= 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) <= 0 )
@@ -50,7 +50,7 @@ bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange
     return false;
 }
 
-bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException )
+bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrentRange )
 {
     uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW );
     if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) == 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) == 0 )
@@ -58,13 +58,13 @@ bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrent
     return false;
 }
 
-void SwVbaFind::SetReplaceWith( const OUString& rText ) throw (uno::RuntimeException)
+void SwVbaFind::SetReplaceWith( const OUString& rText )
 {
     mxPropertyReplace->setReplaceString( rText );
     mbReplace = true;
 }
 
-OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException)
+OUString SwVbaFind::GetReplaceWith()
 {
     return mxPropertyReplace->getReplaceString();
 }
@@ -73,7 +73,7 @@ void SwVbaFind::SetReplace( sal_Int32 type )
     mnReplaceType = type;
     mbReplace = true;
 }
-uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::RuntimeException )
+uno::Reference< text::XTextRange > SwVbaFind::FindOneElement()
 {
     uno::Reference< text::XTextRange > xFoundOne;
     if( !mxTVC->getString().isEmpty() )
@@ -118,7 +118,7 @@ uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::Runt
     return xFoundOne;
 }
 
-bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
+bool SwVbaFind::SearchReplace()
 {
     bool result = false;
 
@@ -176,111 +176,111 @@ bool SwVbaFind::SearchReplace() throw (uno::RuntimeException)
     return result;
 }
 
-OUString SAL_CALL SwVbaFind::getText() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwVbaFind::getText()
 {
     return mxPropertyReplace->getSearchString();
 }
 
-void SAL_CALL SwVbaFind::setText( const OUString& _text ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setText( const OUString& _text )
 {
     mxPropertyReplace->setSearchString( _text );
 }
 
-uno::Any SAL_CALL SwVbaFind::getReplacement() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaFind::getReplacement()
 {
     return uno::makeAny( uno::Reference< word::XReplacement >( new SwVbaReplacement( this, mxContext, mxPropertyReplace ) ) );
 }
 
-void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setReplacement( const uno::Any& /*_replacement */ )
 {
     throw uno::RuntimeException("Not implemented" );
 }
 
-sal_Bool SAL_CALL SwVbaFind::getForward() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaFind::getForward()
 {
     bool bBackward = false;
     mxPropertyReplace->getPropertyValue("SearchBackwards") >>= bBackward;
     return !bBackward;
 }
 
-void SAL_CALL SwVbaFind::setForward( sal_Bool _forward ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setForward( sal_Bool _forward )
 {
     bool bBackward = !_forward;
     mxPropertyReplace->setPropertyValue("SearchBackwards", uno::makeAny( bBackward ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaFind::getWrap() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaFind::getWrap()
 {
     // seems not supported in Writer
     return mnWrap;
 }
 
-void SAL_CALL SwVbaFind::setWrap( ::sal_Int32 _wrap ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setWrap( ::sal_Int32 _wrap )
 {
     // seems not supported in Writer
     mnWrap = _wrap;
 }
 
-sal_Bool SAL_CALL SwVbaFind::getFormat() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaFind::getFormat()
 {
     return mxPropertyReplace->getValueSearch();
 }
 
-void SAL_CALL SwVbaFind::setFormat( sal_Bool _format ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setFormat( sal_Bool _format )
 {
     mxPropertyReplace->setValueSearch( _format );
 }
 
-sal_Bool SAL_CALL SwVbaFind::getMatchCase() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaFind::getMatchCase()
 {
     bool value = false;
     mxPropertyReplace->getPropertyValue("SearchCaseSensitive") >>= value;
     return value;
 }
 
-void SAL_CALL SwVbaFind::setMatchCase( sal_Bool _matchcase ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setMatchCase( sal_Bool _matchcase )
 {
     mxPropertyReplace->setPropertyValue("SearchCaseSensitive", uno::makeAny( _matchcase ) );
 }
 
-sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaFind::getMatchWholeWord()
 {
     bool value = false;
     mxPropertyReplace->getPropertyValue("SearchWords") >>= value;
     return value;
 }
 
-void SAL_CALL SwVbaFind::setMatchWholeWord( sal_Bool _matchwholeword ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setMatchWholeWord( sal_Bool _matchwholeword )
 {
     mxPropertyReplace->setPropertyValue("SearchWords", uno::makeAny( _matchwholeword ) );
 }
 
-sal_Bool SAL_CALL SwVbaFind::getMatchWildcards() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaFind::getMatchWildcards()
 {
     bool value = false;
     mxPropertyReplace->getPropertyValue("SearchRegularExpression") >>= value;
     return value;
 }
 
-void SAL_CALL SwVbaFind::setMatchWildcards( sal_Bool _matchwildcards ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setMatchWildcards( sal_Bool _matchwildcards )
 {
     mxPropertyReplace->setPropertyValue("SearchRegularExpression", uno::makeAny( _matchwildcards ) );
 }
 
-sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaFind::getMatchSoundsLike()
 {
     bool value = false;
     mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value;
     return value;
 }
 
-void SAL_CALL SwVbaFind::setMatchSoundsLike( sal_Bool _matchsoundslike ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setMatchSoundsLike( sal_Bool _matchsoundslike )
 {
     // seems not accurate
     mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::makeAny( _matchsoundslike ) );
 }
 
-sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms()
 {
     bool value = false;
     mxPropertyReplace->getPropertyValue("SearchSimilarity") >>= value;
@@ -289,25 +289,25 @@ sal_Bool SAL_CALL SwVbaFind::getMatchAllWordForms() throw (uno::RuntimeException
     return value;
 }
 
-void SAL_CALL SwVbaFind::setMatchAllWordForms( sal_Bool _matchallwordforms ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setMatchAllWordForms( sal_Bool _matchallwordforms )
 {
     // seems not accurate
     mxPropertyReplace->setPropertyValue("SearchSimilarity", uno::makeAny( _matchallwordforms ) );
     mxPropertyReplace->setPropertyValue("SearchSimilarityRelax", uno::makeAny( _matchallwordforms ) );
 }
 
-uno::Any SAL_CALL SwVbaFind::getStyle() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaFind::getStyle()
 {
     throw uno::RuntimeException("Not implemented" );
 }
 
-void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaFind::setStyle( const uno::Any& /*_style */ )
 {
     throw uno::RuntimeException("Not implemented" );
 }
 
 sal_Bool SAL_CALL
-SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ ) throw (uno::RuntimeException, std::exception)
+SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const uno::Any& MatchWholeWord, const uno::Any& MatchWildcards, const uno::Any& MatchSoundsLike, const uno::Any& MatchAllWordForms, const uno::Any& Forward, const uno::Any& Wrap, const uno::Any& Format, const uno::Any& ReplaceWith, const uno::Any& Replace, const uno::Any& /*MatchKashida*/, const uno::Any& /*MatchDiacritics*/, const uno::Any& /*MatchAlefHamza*/, const uno::Any& /*MatchControl*/, const uno::Any& /*MatchPrefix*/, const uno::Any& /*MatchSuffix*/, const uno::Any& /*MatchPhrase*/, const uno::Any& /*IgnoreSpace*/, const uno::Any& /*IgnorePunct*/ )
 {
     bool result = false;
     if( FindText.hasValue() )
@@ -387,7 +387,7 @@ SwVbaFind::Execute( const uno::Any& FindText, const uno::Any& MatchCase, const u
 }
 
 void SAL_CALL
-SwVbaFind::ClearFormatting(  ) throw (uno::RuntimeException, std::exception)
+SwVbaFind::ClearFormatting(  )
 {
     uno::Sequence< beans::PropertyValue >  aSearchAttribs;
     mxPropertyReplace->setSearchAttributes( aSearchAttribs );
diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx
index 3ce55cc329a4..54c712a86dea 100644
--- a/sw/source/ui/vba/vbafind.hxx
+++ b/sw/source/ui/vba/vbafind.hxx
@@ -45,51 +45,51 @@ private:
 
 private:
     /// @throws css::uno::RuntimeException
-    bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException );
+    bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange );
     /// @throws css::uno::RuntimeException
-    bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException );
+    bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange );
     void SetReplace( sal_Int32 type );
     /// @throws css::uno::RuntimeException
-    void SetReplaceWith( const OUString& rText ) throw ( css::uno::RuntimeException );
+    void SetReplaceWith( const OUString& rText );
     /// @throws css::uno::RuntimeException
-    OUString GetReplaceWith() throw ( css::uno::RuntimeException );
+    OUString GetReplaceWith();
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::text::XTextRange > FindOneElement() throw ( css::uno::RuntimeException );
+    css::uno::Reference< css::text::XTextRange > FindOneElement();
     /// @throws css::uno::RuntimeException
-    bool SearchReplace() throw ( css::uno::RuntimeException );
+    bool SearchReplace();
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
+    SwVbaFind( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange );
     virtual ~SwVbaFind() override;
 
     // Attributes
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getReplacement() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getForward() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setForward( sal_Bool _forward ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getWrap() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getFormat() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFormat( sal_Bool _format ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMatchCase() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMatchCase( sal_Bool _matchcase ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMatchWholeWord() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMatchWholeWord( sal_Bool _matchwholeword ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMatchWildcards() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMatchWildcards( sal_Bool _matchwildcards ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMatchSoundsLike() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMatchSoundsLike( sal_Bool _matchsoundslike ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMatchAllWordForms() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMatchAllWordForms( sal_Bool _matchallwordforms ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& _text ) override;
+    virtual css::uno::Any SAL_CALL getReplacement() override;
+    virtual void SAL_CALL setReplacement( const css::uno::Any& _replacement ) override;
+    virtual sal_Bool SAL_CALL getForward() override;
+    virtual void SAL_CALL setForward( sal_Bool _forward ) override;
+    virtual ::sal_Int32 SAL_CALL getWrap() override;
+    virtual void SAL_CALL setWrap( ::sal_Int32 _wrap ) override;
+    virtual sal_Bool SAL_CALL getFormat() override;
+    virtual void SAL_CALL setFormat( sal_Bool _format ) override;
+    virtual sal_Bool SAL_CALL getMatchCase() override;
+    virtual void SAL_CALL setMatchCase( sal_Bool _matchcase ) override;
+    virtual sal_Bool SAL_CALL getMatchWholeWord() override;
+    virtual void SAL_CALL setMatchWholeWord( sal_Bool _matchwholeword ) override;
+    virtual sal_Bool SAL_CALL getMatchWildcards() override;
+    virtual void SAL_CALL setMatchWildcards( sal_Bool _matchwildcards ) override;
+    virtual sal_Bool SAL_CALL getMatchSoundsLike() override;
+    virtual void SAL_CALL setMatchSoundsLike( sal_Bool _matchsoundslike ) override;
+    virtual sal_Bool SAL_CALL getMatchAllWordForms() override;
+    virtual void SAL_CALL setMatchAllWordForms( sal_Bool _matchallwordforms ) override;
+    virtual css::uno::Any SAL_CALL getStyle() override;
+    virtual void SAL_CALL setStyle( const css::uno::Any& _style ) override;
 
     // Methods
-    virtual sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ClearFormatting(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL Execute( const css::uno::Any& FindText, const css::uno::Any& MatchCase, const css::uno::Any& MatchWholeWord, const css::uno::Any& MatchWildcards, const css::uno::Any& MatchSoundsLike, const css::uno::Any& MatchAllWordForms, const css::uno::Any& Forward, const css::uno::Any& Wrap, const css::uno::Any& Format, const css::uno::Any& ReplaceWith, const css::uno::Any& Replace, const css::uno::Any& MatchKashida, const css::uno::Any& MatchDiacritics, const css::uno::Any& MatchAlefHamza, const css::uno::Any& MatchControl, const css::uno::Any& MatchPrefix, const css::uno::Any& MatchSuffix, const css::uno::Any& MatchPhrase, const css::uno::Any& IgnoreSpace, const css::uno::Any& IgnorePunct ) override;
+    virtual void SAL_CALL ClearFormatting(  ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index 4d043d11287a..933032169085 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -88,7 +88,7 @@ public:
     }
 
     /// @throws lang::IllegalArgumentException
-    sal_Int32 getOOOFromMSO( sal_Int32 nMSOConst ) throw( lang::IllegalArgumentException )
+    sal_Int32 getOOOFromMSO( sal_Int32 nMSOConst )
     {
         ConstToConst::iterator it = MSO2OOO.find( nMSOConst );
         if ( it == MSO2OOO.end() )
@@ -96,7 +96,7 @@ public:
         return it->second;
     }
     /// @throws lang::IllegalArgumentException
-    sal_Int32 getMSOFromOOO( sal_Int32 nOOOConst ) throw( lang::IllegalArgumentException )
+    sal_Int32 getMSOFromOOO( sal_Int32 nOOOConst )
     {
         ConstToConst::iterator it = OOO2MSO.find( nOOOConst );
         if ( it == OOO2MSO.end() )
@@ -105,12 +105,12 @@ public:
     }
 };
 
-SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPalette, uno::Reference< css::beans::XPropertySet > const & xPropertySet ) throw ( css::uno::RuntimeException ) : SwVbaFont_BASE( xParent, xContext, xPalette, xPropertySet )
+SwVbaFont::SwVbaFont( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPalette, uno::Reference< css::beans::XPropertySet > const & xPropertySet ) : SwVbaFont_BASE( xParent, xContext, xPalette, xPropertySet )
 {
 }
 
 uno::Any SAL_CALL
-SwVbaFont::getUnderline() throw (uno::RuntimeException, std::exception)
+SwVbaFont::getUnderline()
 {
     sal_Int32 nOOVal = 0;
     mxFont->getPropertyValue(  UnderLineMapper::propName() ) >>= nOOVal;
@@ -118,7 +118,7 @@ SwVbaFont::getUnderline() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeException, std::exception)
+SwVbaFont::setUnderline( const uno::Any& _underline )
 {
     sal_Int32 nMSOVal = 0;
 
@@ -136,7 +136,7 @@ SwVbaFont::getServiceImplName()
 }
 
 void SAL_CALL
-SwVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException, std::exception )
+SwVbaFont::setColorIndex( const uno::Any& _colorindex )
 {
         sal_Int32 nIndex = 0;
         _colorindex >>= nIndex;
@@ -144,7 +144,7 @@ SwVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep
 }
 
 uno::Any SAL_CALL
-SwVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception )
+SwVbaFont::getColorIndex()
 {
         sal_Int32 nColor = 0;
 
@@ -164,7 +164,7 @@ SwVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception )
     return uno::makeAny( nIndex );
 }
 uno::Any SAL_CALL
-SwVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception )
+SwVbaFont::getSubscript()
 {
     bool bRes = false;
     SwVbaFont_BASE::getSubscript() >>= bRes;
@@ -174,7 +174,7 @@ SwVbaFont::getSubscript() throw ( uno::RuntimeException, std::exception )
 }
 
 uno::Any SAL_CALL
-SwVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception )
+SwVbaFont::getSuperscript()
 {
     bool bRes = false;
     SwVbaFont_BASE::getSuperscript() >>= bRes;
@@ -184,7 +184,7 @@ SwVbaFont::getSuperscript() throw ( uno::RuntimeException, std::exception )
 }
 
 uno::Any SAL_CALL
-SwVbaFont::getBold() throw (uno::RuntimeException, std::exception)
+SwVbaFont::getBold()
 {
     bool bRes = false;
     SwVbaFont_BASE::getBold() >>= bRes;
@@ -194,7 +194,7 @@ SwVbaFont::getBold() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-SwVbaFont::getItalic() throw (uno::RuntimeException, std::exception)
+SwVbaFont::getItalic()
 {
     bool bRes = false;
     SwVbaFont_BASE::getItalic() >>= bRes;
@@ -204,7 +204,7 @@ SwVbaFont::getItalic() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException, std::exception)
+SwVbaFont::getStrikethrough()
 {
     bool bRes = false;
     SwVbaFont_BASE::getStrikethrough() >>= bRes;
@@ -214,7 +214,7 @@ SwVbaFont::getStrikethrough() throw (css::uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-SwVbaFont::getShadow() throw (uno::RuntimeException, std::exception)
+SwVbaFont::getShadow()
 {
     bool bRes = false;
     SwVbaFont_BASE::getShadow() >>= bRes;
diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx
index e12b12447369..2902de5a2988 100644
--- a/sw/source/ui/vba/vbafont.hxx
+++ b/sw/source/ui/vba/vbafont.hxx
@@ -30,20 +30,20 @@ class SwVbaFont : public SwVbaFont_BASE
 {
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaFont( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, css::uno::Reference< css::beans::XPropertySet > const & xPropertySet ) throw ( css::uno::RuntimeException );
+    SwVbaFont( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, css::uno::Reference< css::beans::XPropertySet > const & xPropertySet );
 
     // Attributes
-    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSubscript() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getSuperscript() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) override;
+    virtual css::uno::Any SAL_CALL getColorIndex() override;
+    virtual css::uno::Any SAL_CALL getUnderline() override;
+    virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) override;
+    virtual css::uno::Any SAL_CALL getSubscript() override;
+    virtual css::uno::Any SAL_CALL getSuperscript() override;
 
-    virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getBold() override;
+    virtual css::uno::Any SAL_CALL getItalic() override;
+    virtual css::uno::Any SAL_CALL getStrikethrough() override;
+    virtual css::uno::Any SAL_CALL getShadow() override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx
index 7ddc227ca202..656fc9a6f699 100644
--- a/sw/source/ui/vba/vbaframe.cxx
+++ b/sw/source/ui/vba/vbaframe.cxx
@@ -28,7 +28,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaFrame::SwVbaFrame( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< frame::XModel >& rModel, const css::uno::Reference< text::XTextFrame >& xTextFrame ) throw ( css::uno::RuntimeException ) :
+SwVbaFrame::SwVbaFrame( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< frame::XModel >& rModel, const css::uno::Reference< text::XTextFrame >& xTextFrame ) :
     SwVbaFrame_BASE( rParent, rContext ), mxModel( rModel ), mxTextFrame( xTextFrame )
 {
 }
@@ -37,7 +37,7 @@ SwVbaFrame::~SwVbaFrame()
 {
 }
 
-void SAL_CALL SwVbaFrame::Select() throw ( uno::RuntimeException, std::exception )
+void SAL_CALL SwVbaFrame::Select()
 {
     uno::Reference< view::XSelectionSupplier > xSelectSupp( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
     xSelectSupp->select( uno::makeAny( mxTextFrame ) );
diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx
index 099366aced21..2097e9ac1a24 100644
--- a/sw/source/ui/vba/vbaframe.hxx
+++ b/sw/source/ui/vba/vbaframe.hxx
@@ -33,11 +33,11 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaFrame( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const css::uno::Reference< css::text::XTextFrame >& xTextFrame ) throw ( css::uno::RuntimeException );
+    SwVbaFrame( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const css::uno::Reference< css::text::XTextFrame >& xTextFrame );
     virtual ~SwVbaFrame() override;
 
    // Methods
-    virtual void SAL_CALL Select() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL Select() override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx
index 3e733ac1efe4..7951b83ccb56 100644
--- a/sw/source/ui/vba/vbaframes.cxx
+++ b/sw/source/ui/vba/vbaframes.cxx
@@ -37,15 +37,15 @@ private:
     sal_Int32 nCurrentPos;
 public:
     /// @throws uno::RuntimeException
-    FramesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess,  const uno::Reference< frame::XModel >& xModel  ) throw ( uno::RuntimeException ) : mxParent( xParent ), mxContext( xContext), mxIndexAccess( xIndexAccess ), mxModel( xModel ), nCurrentPos(0)
+    FramesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess,  const uno::Reference< frame::XModel >& xModel  ) : mxParent( xParent ), mxContext( xContext), mxIndexAccess( xIndexAccess ), mxModel( xModel ), nCurrentPos(0)
     {
     }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nCurrentPos < mxIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !hasMoreElements() )
             throw container::NoSuchElementException();
@@ -61,13 +61,13 @@ SwVbaFrames::SwVbaFrames( const uno::Reference< XHelperInterface >& xParent, con
 }
 // XEnumerationAccess
 uno::Type
-SwVbaFrames::getElementType() throw (uno::RuntimeException)
+SwVbaFrames::getElementType()
 {
     return cppu::UnoType<word::XFrame>::get();
 }
 
 uno::Reference< container::XEnumeration >
-SwVbaFrames::createEnumeration() throw (uno::RuntimeException)
+SwVbaFrames::createEnumeration()
 {
     return new FramesEnumeration( this, mxContext,m_xIndexAccess, mxModel );
 }
diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx
index 4ef3ff1b5a14..c0af24f825d5 100644
--- a/sw/source/ui/vba/vbaframes.hxx
+++ b/sw/source/ui/vba/vbaframes.hxx
@@ -36,8 +36,8 @@ public:
     SwVbaFrames( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xFrames, const css::uno::Reference< css::frame::XModel >& xModel );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaFrames_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index a37eb5831b67..3bd9c957352a 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -54,7 +54,7 @@ SwVbaGlobals::~SwVbaGlobals()
 // XGlobals
 
 uno::Reference<word::XApplication > const &
-SwVbaGlobals::getApplication() throw (uno::RuntimeException)
+SwVbaGlobals::getApplication()
 {
     SAL_INFO("sw", "In SwVbaGlobals::getApplication");
     if ( !mxApplication.is() )
@@ -64,72 +64,72 @@ SwVbaGlobals::getApplication() throw (uno::RuntimeException)
 }
 
 uno::Reference<word::XSystem > SAL_CALL
-SwVbaGlobals::getSystem() throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::getSystem()
 {
     return getApplication()->getSystem();
 }
 
 uno::Reference< word::XDocument > SAL_CALL
-SwVbaGlobals::getActiveDocument() throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::getActiveDocument()
 {
     return getApplication()->getActiveDocument();
 }
 
 uno::Reference< word::XWindow > SAL_CALL
-SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::getActiveWindow()
 {
     return getApplication()->getActiveWindow();
 }
 
 OUString SAL_CALL
-SwVbaGlobals::getName() throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::getName()
 {
     return getApplication()->getName();
 }
 
 uno::Reference<word::XOptions > SAL_CALL
-SwVbaGlobals::getOptions() throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::getOptions()
 {
     return getApplication()->getOptions();
 }
 
 uno::Any SAL_CALL
-SwVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::CommandBars( const uno::Any& aIndex )
 {
     return getApplication()->CommandBars( aIndex );
 }
 
 uno::Any SAL_CALL
-SwVbaGlobals::Documents( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::Documents( const uno::Any& index )
 {
     return getApplication()->Documents( index );
 }
 
 uno::Any SAL_CALL
-SwVbaGlobals::Addins( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::Addins( const uno::Any& index )
 {
     return getApplication()->Addins( index );
 }
 
 uno::Any SAL_CALL
-SwVbaGlobals::Dialogs( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::Dialogs( const uno::Any& index )
 {
     return getApplication()->Dialogs( index );
 }
 
 uno::Any SAL_CALL
-SwVbaGlobals::ListGalleries( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::ListGalleries( const uno::Any& index )
 {
     return getApplication()->ListGalleries( index );
 }
 
 uno::Reference<word::XSelection > SAL_CALL
-SwVbaGlobals::getSelection() throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::getSelection()
 {
     return getApplication()->getSelection();
 }
 
-float SAL_CALL SwVbaGlobals::CentimetersToPoints( float Centimeters ) throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaGlobals::CentimetersToPoints( float Centimeters )
 {
     return getApplication()->CentimetersToPoints( Centimeters );
 }
@@ -153,7 +153,7 @@ SwVbaGlobals::getServiceNames()
 }
 
 uno::Sequence< OUString >
-SwVbaGlobals::getAvailableServiceNames(  ) throw (uno::RuntimeException, std::exception)
+SwVbaGlobals::getAvailableServiceNames(  )
 {
     static bool bInit = false;
     static uno::Sequence< OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() );
diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx
index e82783366307..2674112af21f 100644
--- a/sw/source/ui/vba/vbaglobals.hxx
+++ b/sw/source/ui/vba/vbaglobals.hxx
@@ -39,7 +39,7 @@ private:
     css::uno::Reference< ooo::vba::word::XApplication > mxApplication;
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< ooo::vba::word::XApplication > const & getApplication() throw (css::uno::RuntimeException);
+    css::uno::Reference< ooo::vba::word::XApplication > const & getApplication();
 
 public:
 
@@ -47,20 +47,20 @@ public:
     virtual ~SwVbaGlobals() override;
 
     // XGlobals
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL CentimetersToPoints( float Centimeters ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() override;
+    virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() override;
+    virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() override;
+    virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() override;
+    virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() override;
+    virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) override;
+    virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override;
     // XMultiServiceFactory
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(  ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx
index 7b185fed6335..61548d62d521 100644
--- a/sw/source/ui/vba/vbaheaderfooter.cxx
+++ b/sw/source/ui/vba/vbaheaderfooter.cxx
@@ -29,27 +29,27 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, bool isHeader, sal_Int32 index ) throw ( uno::RuntimeException ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index )
+SwVbaHeaderFooter::SwVbaHeaderFooter( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& rProps, bool isHeader, sal_Int32 index ) : SwVbaHeaderFooter_BASE( rParent, rContext ), mxModel( xModel ), mxPageStyleProps( rProps ), mbHeader( isHeader ), mnIndex( index )
 {
 }
 
-sal_Bool SAL_CALL SwVbaHeaderFooter::getIsHeader() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaHeaderFooter::getIsHeader()
 {
     return mbHeader;
 }
 
-sal_Bool SAL_CALL SwVbaHeaderFooter::getLinkToPrevious() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaHeaderFooter::getLinkToPrevious()
 {
     // seems always false
     return false;
 }
 
-void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( sal_Bool /*_linktoprevious*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( sal_Bool /*_linktoprevious*/ )
 {
     // not support in Writer
 }
 
-uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno::RuntimeException, std::exception)
+uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange()
 {
     OUString sPropsNameText;
     if( mbHeader )
@@ -71,7 +71,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno
 }
 
 uno::Any SAL_CALL
-SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaHeaderFooter::Shapes( const uno::Any& index )
 {
     // #FIXME: only get the shapes in the current header/footer
     uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx
index 42e5295b16c9..fd3a3dea462b 100644
--- a/sw/source/ui/vba/vbaheaderfooter.hxx
+++ b/sw/source/ui/vba/vbaheaderfooter.hxx
@@ -35,14 +35,14 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader, sal_Int32 index ) throw ( css::uno::RuntimeException );
+    SwVbaHeaderFooter( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader, sal_Int32 index );
 
     // Attributes
-    virtual sal_Bool SAL_CALL getIsHeader() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getLinkToPrevious() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLinkToPrevious( sal_Bool _linktoprevious ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getIsHeader() override;
+    virtual sal_Bool SAL_CALL getLinkToPrevious() override;
+    virtual void SAL_CALL setLinkToPrevious( sal_Bool _linktoprevious ) override;
+    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL getRange() override;
+    virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.cxx b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
index 271334503b75..3c873b2769cb 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.cxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.cxx
@@ -34,12 +34,12 @@ using namespace ::ooo::vba;
 #define FIRST_PAGE 1
 
 // Class HeaderFooterHelper
-bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< frame::XModel >& xModel )
 {
     return isHeaderFooter( word::getCurrentXText( xModel ) );
 }
 
-bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xText )
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( xText, uno::UNO_QUERY_THROW );
     OUString aImplName = xServiceInfo->getImplementationName();
@@ -48,7 +48,7 @@ bool HeaderFooterHelper::isHeaderFooter( const uno::Reference< text::XText >& xT
     return false;
 }
 
-bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel )
 {
     const uno::Reference< text::XText > xCurrentText = word::getCurrentXText( xModel );
     if( !isHeaderFooter( xCurrentText ) )
@@ -86,7 +86,7 @@ bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel
     return false;
 }
 
-bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel )
 {
     if( isHeader( xModel ) )
     {
@@ -98,7 +98,7 @@ bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel
     return false;
 }
 
-bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel )
 {
     if( isHeader( xModel ) )
     {
@@ -114,7 +114,7 @@ bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel
     return false;
 }
 
-bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel )
 {
     const uno::Reference< text::XText > xCurrentText = word::getCurrentXText( xModel );
     if( !isHeaderFooter( xCurrentText ) )
@@ -152,7 +152,7 @@ bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel
     return false;
 }
 
-bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel )
 {
     if( isFooter( xModel ) )
     {
@@ -163,7 +163,7 @@ bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel
     return false;
 }
 
-bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel )
 {
     if( isFooter( xModel ) )
     {
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.hxx b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
index 1706a63fd7c9..aca71c8196c3 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.hxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
@@ -29,21 +29,21 @@ class HeaderFooterHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static bool isHeaderFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isHeaderFooter( const css::uno::Reference< css::frame::XModel >& xModel );
     /// @throws css::uno::RuntimeException
-    static bool isHeaderFooter( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
+    static bool isHeaderFooter( const css::uno::Reference< css::text::XText >& xText );
     /// @throws css::uno::RuntimeException
-    static bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel );
     /// @throws css::uno::RuntimeException
-    static bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel );
     /// @throws css::uno::RuntimeException
-    static bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel );
     /// @throws css::uno::RuntimeException
-    static bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel );
     /// @throws css::uno::RuntimeException
-    static bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel );
     /// @throws css::uno::RuntimeException
-    static bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    static bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel );
 };
 
 #endif
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index db97153c44a4..c4cedf3f3a14 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -38,22 +38,22 @@ public:
     HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {}
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount(  ) override
     {
         // first page, even pages and primary page
         return 3;
     }
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override
     {
         if( Index < 1 || Index > 3 )
             throw lang::IndexOutOfBoundsException();
         return uno::makeAny( uno::Reference< word::XHeaderFooter >( new SwVbaHeaderFooter( mxParent,  mxContext, mxModel, mxPageStyleProps, mbHeader, Index ) ) );
     }
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<word::XHeaderFooter>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return true;
     }
@@ -65,12 +65,12 @@ class HeadersFootersEnumWrapper : public EnumerationHelper_BASE
     sal_Int32 nIndex;
 public:
     explicit HeadersFootersEnumWrapper( SwVbaHeadersFooters* _pHeadersFooters ) : pHeadersFooters( _pHeadersFooters ), nIndex( 0 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < pHeadersFooters->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex < pHeadersFooters->getCount() )
             return pHeadersFooters->Item( uno::makeAny( ++nIndex ), uno::Any() );
@@ -82,13 +82,13 @@ SwVbaHeadersFooters::SwVbaHeadersFooters( const uno::Reference< XHelperInterface
 {
 }
 
-::sal_Int32 SAL_CALL SwVbaHeadersFooters::getCount() throw (uno::RuntimeException)
+::sal_Int32 SAL_CALL SwVbaHeadersFooters::getCount()
 {
     // wdHeaderFooterFirstPage, wdHeaderFooterPrimary and wdHeaderFooterEvenPages
     return 3;
 }
 
-uno::Any SAL_CALL SwVbaHeadersFooters::Item( const uno::Any& Index1, const uno::Any& ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+uno::Any SAL_CALL SwVbaHeadersFooters::Item( const uno::Any& Index1, const uno::Any& )
 {
     sal_Int32 nIndex = 0;
     Index1 >>= nIndex;
@@ -101,13 +101,13 @@ uno::Any SAL_CALL SwVbaHeadersFooters::Item( const uno::Any& Index1, const uno::
 
 // XEnumerationAccess
 uno::Type
-SwVbaHeadersFooters::getElementType() throw (uno::RuntimeException)
+SwVbaHeadersFooters::getElementType()
 {
     return cppu::UnoType<word::XHeaderFooter>::get();
 }
 uno::Reference< container::XEnumeration >
 
-SwVbaHeadersFooters::createEnumeration() throw (uno::RuntimeException)
+SwVbaHeadersFooters::createEnumeration()
 {
     return new HeadersFootersEnumWrapper( this );
 }
diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx
index bd9477e73ccb..3e9e32d9909e 100644
--- a/sw/source/ui/vba/vbaheadersfooters.hxx
+++ b/sw/source/ui/vba/vbaheadersfooters.hxx
@@ -35,11 +35,11 @@ private:
 public:
     SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader );
 
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaHeadersFooters_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx
index 55128004edcd..4e2a266fdbf6 100644
--- a/sw/source/ui/vba/vbainformationhelper.cxx
+++ b/sw/source/ui/vba/vbainformationhelper.cxx
@@ -32,18 +32,18 @@ using namespace ::com::sun::star;
 
 static const sal_Int32 DEFAULT_PAGE_DISTANCE = 500;
 
-sal_Int32 SwVbaInformationHelper::handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException )
+sal_Int32 SwVbaInformationHelper::handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor )
 {
     uno::Reference< text::XPageCursor > xPageCursor( xTVCursor, uno::UNO_QUERY_THROW );
     return xPageCursor->getPage();
 }
 
-sal_Int32 SwVbaInformationHelper::handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException )
+sal_Int32 SwVbaInformationHelper::handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel )
 {
     return word::getPageCount( xModel );
 }
 
-double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException )
+double SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor )
 {
     xTVCursor->collapseToStart();
     uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbainformationhelper.hxx b/sw/source/ui/vba/vbainformationhelper.hxx
index 86191061d0eb..0424a958e019 100644
--- a/sw/source/ui/vba/vbainformationhelper.hxx
+++ b/sw/source/ui/vba/vbainformationhelper.hxx
@@ -27,11 +27,11 @@ class SwVbaInformationHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static sal_Int32 handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException );
+    static sal_Int32 handleWdActiveEndPageNumber( const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor );
     /// @throws css::uno::RuntimeException
-    static sal_Int32 handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
+    static sal_Int32 handleWdNumberOfPagesInDocument( const css::uno::Reference< css::frame::XModel >& xModel );
     /// @throws css::uno::RuntimeException
-    static double handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor ) throw( css::uno::RuntimeException );
+    static double handleWdVerticalPositionRelativeToPage( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor );
     //static double verticalPositionRelativeToPageBoundary( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextViewCursor >& xTVCursor, const css::uno::Reference< css::beans::XPropertySet >& xStyleProps ) throw( css::uno::RuntimeException );
 
 };
diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx
index 55ae07d1aca2..670fe376b427 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -29,7 +29,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaListFormat::SwVbaListFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) : SwVbaListFormat_BASE( rParent, rContext ), mxTextRange( xTextRange )
+SwVbaListFormat::SwVbaListFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextRange >& xTextRange ) : SwVbaListFormat_BASE( rParent, rContext ), mxTextRange( xTextRange )
 {
 }
 
@@ -37,7 +37,7 @@ SwVbaListFormat::~SwVbaListFormat()
 {
 }
 
-void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior )
 {
     bool bContinuePreviousList = true;
     if( ContinuePreviousList.hasValue() )
@@ -88,7 +88,7 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor
     while( xEnum->hasMoreElements() );
 }
 
-void SAL_CALL SwVbaListFormat::ConvertNumbersToText(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListFormat::ConvertNumbersToText(  )
 {
     throw uno::RuntimeException("Not implemented" );
 }
diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx
index 9223714ed894..e5b5d4fbeef8 100644
--- a/sw/source/ui/vba/vbalistformat.hxx
+++ b/sw/source/ui/vba/vbalistformat.hxx
@@ -34,12 +34,12 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaListFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
+    SwVbaListFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextRange >& xTextRange );
     virtual ~SwVbaListFormat() override;
 
     // Methods
-    virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ConvertNumbersToText(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL ApplyListTemplate( const css::uno::Reference< ::ooo::vba::word::XListTemplate >& ListTemplate, const css::uno::Any& ContinuePreviousList, const css::uno::Any& ApplyTo, const css::uno::Any& DefaultListBehavior ) override;
+    virtual void SAL_CALL ConvertNumbersToText(  ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx
index dac186307a90..30ef9d2f1ca2 100644
--- a/sw/source/ui/vba/vbalistgalleries.cxx
+++ b/sw/source/ui/vba/vbalistgalleries.cxx
@@ -29,12 +29,12 @@ class ListGalleriesEnumWrapper : public EnumerationHelper_BASE
     sal_Int32 nIndex;
 public:
     explicit ListGalleriesEnumWrapper( SwVbaListGalleries* pGalleries ) : pListGalleries( pGalleries ), nIndex( 1 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex <= pListGalleries->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex <= pListGalleries->getCount() )
             return pListGalleries->Item( uno::makeAny( nIndex++ ), uno::Any() );
@@ -42,17 +42,17 @@ public:
     }
 };
 
-SwVbaListGalleries::SwVbaListGalleries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xTextDoc ) throw (uno::RuntimeException) : SwVbaListGalleries_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ),  mxTextDocument( xTextDoc )
+SwVbaListGalleries::SwVbaListGalleries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xTextDoc ) : SwVbaListGalleries_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ),  mxTextDocument( xTextDoc )
 {
 }
 
-::sal_Int32 SAL_CALL SwVbaListGalleries::getCount() throw (uno::RuntimeException)
+::sal_Int32 SAL_CALL SwVbaListGalleries::getCount()
 {
     // 3 types of list( bullet, numbered and outline )
     return 3;
 }
 
-uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
+uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ )
 {
     sal_Int32 nIndex = 0;
     if( ( Index1 >>= nIndex ) )
@@ -67,13 +67,13 @@ uno::Any SAL_CALL SwVbaListGalleries::Item( const uno::Any& Index1, const uno::A
 
 // XEnumerationAccess
 uno::Type
-SwVbaListGalleries::getElementType() throw (uno::RuntimeException)
+SwVbaListGalleries::getElementType()
 {
     return cppu::UnoType<word::XListGallery>::get();
 }
 
 uno::Reference< container::XEnumeration >
-SwVbaListGalleries::createEnumeration() throw (uno::RuntimeException)
+SwVbaListGalleries::createEnumeration()
 {
     return new ListGalleriesEnumWrapper( this );
 }
diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx
index d26ed1407720..7cbf653a4d97 100644
--- a/sw/source/ui/vba/vbalistgalleries.hxx
+++ b/sw/source/ui/vba/vbalistgalleries.hxx
@@ -33,13 +33,13 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaListGalleries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc ) throw (css::uno::RuntimeException);
+    SwVbaListGalleries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc );
 
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaListGalleries_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx
index 037ab1adccd7..f41dcbd639d3 100644
--- a/sw/source/ui/vba/vbalistgallery.cxx
+++ b/sw/source/ui/vba/vbalistgallery.cxx
@@ -24,7 +24,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaListGallery::SwVbaListGallery( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw ( uno::RuntimeException ) : SwVbaListGallery_BASE( rParent, rContext ), mxTextDocument( xTextDoc ), mnType( nType )
+SwVbaListGallery::SwVbaListGallery( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nType ) : SwVbaListGallery_BASE( rParent, rContext ), mxTextDocument( xTextDoc ), mnType( nType )
 {
 }
 
@@ -33,7 +33,7 @@ SwVbaListGallery::~SwVbaListGallery()
 }
 
 uno::Any SAL_CALL
-SwVbaListGallery::ListTemplates( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaListGallery::ListTemplates( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaListTemplates( mxParent, mxContext, mxTextDocument, mnType ) );
     if ( index.hasValue() )
diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx
index 3fe3618aecfb..187cdd418dde 100644
--- a/sw/source/ui/vba/vbalistgallery.hxx
+++ b/sw/source/ui/vba/vbalistgallery.hxx
@@ -33,11 +33,11 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaListGallery( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw ( css::uno::RuntimeException );
+    SwVbaListGallery( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType );
     virtual ~SwVbaListGallery() override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index 7a3fd941e13c..483526bfab13 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -46,12 +46,12 @@ static const sal_Int16 CHAR_DIAMOND = 10022;
 static const sal_Int16 CHAR_ARROW = 10146;
 static const sal_Int16 CHAR_CHECK_MARK = 10003;
 
-SwVbaListHelper::SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw( css::uno::RuntimeException ) : mxTextDocument( xTextDoc ), mnGalleryType( nGalleryType ), mnTemplateType( nTemplateType )
+SwVbaListHelper::SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) : mxTextDocument( xTextDoc ), mnGalleryType( nGalleryType ), mnTemplateType( nTemplateType )
 {
     Init();
 }
 
-void SwVbaListHelper::Init() throw( css::uno::RuntimeException )
+void SwVbaListHelper::Init()
 {
     // set the numbering style name
     switch( mnGalleryType )
@@ -102,7 +102,7 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException )
     }
 }
 
-void SwVbaListHelper::CreateListTemplate() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateListTemplate()
 {
     switch( mnGalleryType )
     {
@@ -128,7 +128,7 @@ void SwVbaListHelper::CreateListTemplate() throw( css::uno::RuntimeException )
     }
 }
 
-void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateBulletListTemplate()
 {
     // there is only 1 level for each bullet list in MSWord
     sal_Int32 nLevel = 0;
@@ -188,7 +188,7 @@ void SwVbaListHelper::CreateBulletListTemplate() throw( css::uno::RuntimeExcepti
     mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
 }
 
-void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateNumberListTemplate()
 {
     // there is only 1 level for each bullet list in MSWord
     sal_Int32 nLevel = 0;
@@ -253,7 +253,7 @@ void SwVbaListHelper::CreateNumberListTemplate() throw( css::uno::RuntimeExcepti
     mxNumberingRules->replaceByIndex( nLevel, uno::makeAny( aPropertyValues ) );
 }
 
-void SwVbaListHelper::CreateOutlineNumberListTemplate() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateOutlineNumberListTemplate()
 {
     switch( mnTemplateType )
     {
@@ -300,7 +300,7 @@ void SwVbaListHelper::CreateOutlineNumberListTemplate() throw( css::uno::Runtime
     }
 }
 
-void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateOutlineNumberForType1()
 {
     sal_Int16 nNumberingType = 0;
     OUString sPrefix;
@@ -377,7 +377,7 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce
     }
 }
 
-void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateOutlineNumberForType2()
 {
     sal_Int16 nNumberingType = style::NumberingType::ARABIC;
     sal_Int16 nParentNumbering = 0;
@@ -398,7 +398,7 @@ void SwVbaListHelper::CreateOutlineNumberForType2() throw( css::uno::RuntimeExce
     }
 }
 
-void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateOutlineNumberForType3()
 {
     sal_Int16 nNumberingType = style::NumberingType::CHAR_SPECIAL;
     OUString sCharStyleName( "Bullet Symbols" );
@@ -447,7 +447,7 @@ void SwVbaListHelper::CreateOutlineNumberForType3() throw( css::uno::RuntimeExce
     }
 }
 
-void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateOutlineNumberForType4()
 {
     sal_Int16 nNumberingType = 0;
     OUString sPrefix;
@@ -532,7 +532,7 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce
     }
 }
 
-void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateOutlineNumberForType5()
 {
     sal_Int16 nNumberingType = style::NumberingType::ARABIC;
     sal_Int16 nParentNumbering = 0;
@@ -551,7 +551,7 @@ void SwVbaListHelper::CreateOutlineNumberForType5() throw( css::uno::RuntimeExce
     }
 }
 
-void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateOutlineNumberForType6()
 {
     sal_Int16 nNumberingType = 0;
     OUString sPrefix;
@@ -634,7 +634,7 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce
     }
 }
 
-void SwVbaListHelper::CreateOutlineNumberForType7() throw( css::uno::RuntimeException )
+void SwVbaListHelper::CreateOutlineNumberForType7()
 {
     sal_Int16 nNumberingType = style::NumberingType::ARABIC;
     uno::Sequence< beans::PropertyValue > aPropertyValues;
@@ -649,14 +649,14 @@ void SwVbaListHelper::CreateOutlineNumberForType7() throw( css::uno::RuntimeExce
     }
 }
 
-uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException )
+uno::Any SwVbaListHelper::getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName )
 {
     uno::Sequence< beans::PropertyValue > aPropertyValues;
     mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
     return getPropertyValue( aPropertyValues, sName );
 }
 
-void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException )
+void SwVbaListHelper::setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue )
 {
     uno::Sequence< beans::PropertyValue > aPropertyValues;
     mxNumberingRules->getByIndex( nLevel ) >>= aPropertyValues;
diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx
index b6ece448dd51..0cc0efafca85 100644
--- a/sw/source/ui/vba/vbalisthelper.hxx
+++ b/sw/source/ui/vba/vbalisthelper.hxx
@@ -29,40 +29,40 @@ private:
     OUString msStyleName;
 
     /// @throws css::uno::RuntimeException
-    void Init() throw( css::uno::RuntimeException );
+    void Init();
     /// @throws css::uno::RuntimeException
-    void CreateListTemplate() throw( css::uno::RuntimeException );
+    void CreateListTemplate();
     /// @throws css::uno::RuntimeException
-    void CreateBulletListTemplate() throw( css::uno::RuntimeException );
+    void CreateBulletListTemplate();
     /// @throws css::uno::RuntimeException
-    void CreateNumberListTemplate() throw( css::uno::RuntimeException );
+    void CreateNumberListTemplate();
     /// @throws css::uno::RuntimeException
-    void CreateOutlineNumberListTemplate() throw( css::uno::RuntimeException );
+    void CreateOutlineNumberListTemplate();
     /// @throws css::uno::RuntimeException
-    void CreateOutlineNumberForType1() throw( css::uno::RuntimeException );
+    void CreateOutlineNumberForType1();
     /// @throws css::uno::RuntimeException
-    void CreateOutlineNumberForType2() throw( css::uno::RuntimeException );
+    void CreateOutlineNumberForType2();
     /// @throws css::uno::RuntimeException
-    void CreateOutlineNumberForType3() throw( css::uno::RuntimeException );
+    void CreateOutlineNumberForType3();
     /// @throws css::uno::RuntimeException
-    void CreateOutlineNumberForType4() throw( css::uno::RuntimeException );
+    void CreateOutlineNumberForType4();
     /// @throws css::uno::RuntimeException
-    void CreateOutlineNumberForType5() throw( css::uno::RuntimeException );
+    void CreateOutlineNumberForType5();
     /// @throws css::uno::RuntimeException
-    void CreateOutlineNumberForType6() throw( css::uno::RuntimeException );
+    void CreateOutlineNumberForType6();
     /// @throws css::uno::RuntimeException
-    void CreateOutlineNumberForType7() throw( css::uno::RuntimeException );
+    void CreateOutlineNumberForType7();
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw( css::uno::RuntimeException );
+    SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType );
 
     sal_Int32 getGalleryType() const { return mnGalleryType; }
     const css::uno::Reference< css::container::XIndexReplace >& getNumberingRules() const { return mxNumberingRules; }
     /// @throws css::uno::RuntimeException
-    css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName ) throw( css::uno::RuntimeException );
+    css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName );
     /// @throws css::uno::RuntimeException
-    void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException );
+    void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const OUString& sName, const css::uno::Any& aValue );
 
 };
 
diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx
index 9b7aa4294a5f..41a4aaf412cd 100644
--- a/sw/source/ui/vba/vbalistlevel.cxx
+++ b/sw/source/ui/vba/vbalistlevel.cxx
@@ -28,7 +28,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaListLevel::SwVbaListLevel( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper, sal_Int32 nLevel ) throw ( uno::RuntimeException ) : SwVbaListLevel_BASE( rParent, rContext ), pListHelper( pHelper ), mnLevel( nLevel )
+SwVbaListLevel::SwVbaListLevel( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper, sal_Int32 nLevel ) : SwVbaListLevel_BASE( rParent, rContext ), pListHelper( pHelper ), mnLevel( nLevel )
 {
 }
 
@@ -36,7 +36,7 @@ SwVbaListLevel::~SwVbaListLevel()
 {
 }
 
-::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment()
 {
     sal_Int16 nAlignment = 0;
     pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "Adjust" ) >>= nAlignment;
@@ -65,7 +65,7 @@ SwVbaListLevel::~SwVbaListLevel()
     return nAlignment;
 }
 
-void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment )
 {
     sal_Int16 nAlignment = text::HoriOrientation::LEFT;
     switch( _alignment )
@@ -93,44 +93,44 @@ void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32 _alignment ) throw (uno:
     pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "Adjust", uno::makeAny( nAlignment ) );
 }
 
-uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont()
 {
     throw uno::RuntimeException("Not implemented" );
 }
 
-void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::XFont >& /*_font*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setFont( const uno::Reference< ::ooo::vba::word::XFont >& /*_font*/ )
 {
     throw uno::RuntimeException("Not implemented" );
 }
 
-::sal_Int32 SAL_CALL SwVbaListLevel::getIndex() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaListLevel::getIndex()
 {
     return mnLevel + 1;
 }
 
-OUString SAL_CALL SwVbaListLevel::getLinkedStyle() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwVbaListLevel::getLinkedStyle()
 {
     // TODO:
     return OUString();
 }
 
-void SAL_CALL SwVbaListLevel::setLinkedStyle( const OUString& /*_linkedstyle*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setLinkedStyle( const OUString& /*_linkedstyle*/ )
 {
     // TODO:
 }
 
-OUString SAL_CALL SwVbaListLevel::getNumberFormat() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwVbaListLevel::getNumberFormat()
 {
     // TODO::
     return OUString();
 }
 
-void SAL_CALL SwVbaListLevel::setNumberFormat( const OUString& /*_numberformat*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setNumberFormat( const OUString& /*_numberformat*/ )
 {
     // TODO::
 }
 
-float SAL_CALL SwVbaListLevel::getNumberPosition() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaListLevel::getNumberPosition()
 {
     // indentAt + firstlineindent
     sal_Int32 nIndentAt = 0;
@@ -143,7 +143,7 @@ float SAL_CALL SwVbaListLevel::getNumberPosition() throw (uno::RuntimeException,
     return static_cast< float >( Millimeter::getInPoints( nResult ) );
 }
 
-void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition )
 {
     sal_Int32 nNumberPosition = Millimeter::getInHundredthsOfOneMillimeter( _numberposition );
 
@@ -154,7 +154,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw (
     pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent", uno::makeAny( nFirstLineIndent ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle()
 {
     sal_Int16 nNumberingType = 0;
     pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "NumberingType" ) >>= nNumberingType;
@@ -218,7 +218,7 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float _numberposition ) throw (
     return nNumberingType;
 }
 
-void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle )
 {
     sal_Int16 nNumberingType = 0;
     switch( _numberstyle )
@@ -292,31 +292,31 @@ void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32 _numberstyle ) throw (
     pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "NumberingType", uno::makeAny( nNumberingType ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher()
 {
     //seems not support?
     return 0;
 }
 
-void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ )
 {
     //seems not support?
 }
 
-::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt()
 {
     sal_Int16 nStartWith = 0;
     pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "StartWith" ) >>= nStartWith;
     return nStartWith;
 }
 
-void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat )
 {
     sal_Int16 nStartWith = (sal_Int16)_startat;
     pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "StartWith", uno::makeAny( nStartWith ) );
 }
 
-float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaListLevel::getTabPosition()
 {
     sal_Int32 nTabPosition = 0;
     pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "ListtabStopPosition" ) >>= nTabPosition;
@@ -324,13 +324,13 @@ float SAL_CALL SwVbaListLevel::getTabPosition() throw (uno::RuntimeException, st
     return static_cast< float >( Millimeter::getInPoints( nTabPosition ) );
 }
 
-void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition )
 {
     sal_Int32 nTabPosition = Millimeter::getInHundredthsOfOneMillimeter( _tabposition );
     pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "ListtabStopPosition", uno::makeAny( nTabPosition ) );
 }
 
-float SAL_CALL SwVbaListLevel::getTextPosition() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaListLevel::getTextPosition()
 {
     // indentAt
     sal_Int32 nIndentAt = 0;
@@ -339,7 +339,7 @@ float SAL_CALL SwVbaListLevel::getTextPosition() throw (uno::RuntimeException, s
     return static_cast< float >( Millimeter::getInPoints( nIndentAt ) );
 }
 
-void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition )
 {
     sal_Int32 nIndentAt = 0;
     sal_Int32 nFirstLineIndent = 0;
@@ -354,7 +354,7 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno:
     pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent", uno::makeAny( nFirstLineIndent ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter()
 {
     sal_Int16 nLabelFollowedBy= 0;
     pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "LabelFollowedBy" ) >>= nLabelFollowedBy;
@@ -362,7 +362,7 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) throw (uno:
     return nLabelFollowedBy;
 }
 
-void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter )
 {
     sal_Int16 nLabelFollowedBy = (sal_Int16)_trailingcharacter;
     pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "LabelFollowedBy", uno::makeAny( nLabelFollowedBy ) );
diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx
index c4ec40ce37c6..3b40c45f80b4 100644
--- a/sw/source/ui/vba/vbalistlevel.hxx
+++ b/sw/source/ui/vba/vbalistlevel.hxx
@@ -34,33 +34,33 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaListLevel( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper, sal_Int32 nLevel ) throw ( css::uno::RuntimeException );
+    SwVbaListLevel( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper, sal_Int32 nLevel );
     virtual ~SwVbaListLevel() override;
 
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLinkedStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNumberFormat() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getNumberPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNumberPosition( float _numberposition ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getNumberStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getResetOnHigher() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getStartAt() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getTabPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTabPosition( float _tabposition ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getTextPosition() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTextPosition( float _textposition ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getTrailingCharacter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getAlignment() override;
+    virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) override;
+    virtual css::uno::Reference< ::ooo::vba::word::XFont > SAL_CALL getFont() override;
+    virtual void SAL_CALL setFont( const css::uno::Reference< ::ooo::vba::word::XFont >& _font ) override;
+    virtual ::sal_Int32 SAL_CALL getIndex() override;
+    virtual OUString SAL_CALL getLinkedStyle() override;
+    virtual void SAL_CALL setLinkedStyle( const OUString& _linkedstyle ) override;
+    virtual OUString SAL_CALL getNumberFormat() override;
+    virtual void SAL_CALL setNumberFormat( const OUString& _numberformat ) override;
+    virtual float SAL_CALL getNumberPosition() override;
+    virtual void SAL_CALL setNumberPosition( float _numberposition ) override;
+    virtual ::sal_Int32 SAL_CALL getNumberStyle() override;
+    virtual void SAL_CALL setNumberStyle( ::sal_Int32 _numberstyle ) override;
+    virtual ::sal_Int32 SAL_CALL getResetOnHigher() override;
+    virtual void SAL_CALL setResetOnHigher( ::sal_Int32 _resetonhigher ) override;
+    virtual ::sal_Int32 SAL_CALL getStartAt() override;
+    virtual void SAL_CALL setStartAt( ::sal_Int32 _startat ) override;
+    virtual float SAL_CALL getTabPosition() override;
+    virtual void SAL_CALL setTabPosition( float _tabposition ) override;
+    virtual float SAL_CALL getTextPosition() override;
+    virtual void SAL_CALL setTextPosition( float _textposition ) override;
+    virtual ::sal_Int32 SAL_CALL getTrailingCharacter() override;
+    virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx
index ff4125b3dbd5..b92fdd29cfb7 100644
--- a/sw/source/ui/vba/vbalistlevels.cxx
+++ b/sw/source/ui/vba/vbalistlevels.cxx
@@ -29,12 +29,12 @@ class ListLevelsEnumWrapper : public EnumerationHelper_BASE
     sal_Int32 nIndex;
 public:
     explicit ListLevelsEnumWrapper( SwVbaListLevels* pLevels ) : pListLevels( pLevels ), nIndex( 1 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex <= pListLevels->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex <= pListLevels->getCount() )
             return pListLevels->Item( uno::makeAny( nIndex++ ), uno::Any() );
@@ -42,11 +42,11 @@ public:
     }
 };
 
-SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, SwVbaListHelperRef const & pHelper ) throw (uno::RuntimeException) : SwVbaListLevels_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ), pListHelper( pHelper )
+SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, SwVbaListHelperRef const & pHelper ) : SwVbaListLevels_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ), pListHelper( pHelper )
 {
 }
 
-::sal_Int32 SAL_CALL SwVbaListLevels::getCount() throw (uno::RuntimeException)
+::sal_Int32 SAL_CALL SwVbaListLevels::getCount()
 {
     sal_Int32 nGalleryType = pListHelper->getGalleryType();
     if( nGalleryType == word::WdListGalleryType::wdBulletGallery
@@ -57,7 +57,7 @@ SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >& xPar
     return 0;
 }
 
-uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
+uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ )
 {
     sal_Int32 nIndex = 0;
     if( !( Index1 >>= nIndex ) )
@@ -70,13 +70,13 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any& Index1, const uno::Any&
 
 // XEnumerationAccess
 uno::Type
-SwVbaListLevels::getElementType() throw (uno::RuntimeException)
+SwVbaListLevels::getElementType()
 {
     return cppu::UnoType<word::XListLevel>::get();
 }
 
 uno::Reference< container::XEnumeration >
-SwVbaListLevels::createEnumeration() throw (uno::RuntimeException)
+SwVbaListLevels::createEnumeration()
 {
     return new ListLevelsEnumWrapper( this );
 }
diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx
index d61d13fa0443..a3252c8fab6c 100644
--- a/sw/source/ui/vba/vbalistlevels.hxx
+++ b/sw/source/ui/vba/vbalistlevels.hxx
@@ -33,13 +33,13 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaListLevels( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper ) throw ( css::uno::RuntimeException );
+    SwVbaListLevels( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, SwVbaListHelperRef const & pHelper );
 
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaListLevels_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx
index 3052745647f5..a4e646d26f78 100644
--- a/sw/source/ui/vba/vbalisttemplate.cxx
+++ b/sw/source/ui/vba/vbalisttemplate.cxx
@@ -25,7 +25,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaListTemplate::SwVbaListTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw ( uno::RuntimeException ) : SwVbaListTemplate_BASE( rParent, rContext )
+SwVbaListTemplate::SwVbaListTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) : SwVbaListTemplate_BASE( rParent, rContext )
 {
     pListHelper.reset( new SwVbaListHelper( xTextDoc, nGalleryType, nTemplateType ) );
 }
@@ -35,7 +35,7 @@ SwVbaListTemplate::~SwVbaListTemplate()
 }
 
 uno::Any SAL_CALL
-SwVbaListTemplate::ListLevels( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaListTemplate::ListLevels( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaListLevels( mxParent, mxContext, pListHelper ) );
     if ( index.hasValue() )
@@ -43,7 +43,7 @@ SwVbaListTemplate::ListLevels( const uno::Any& index ) throw (uno::RuntimeExcept
     return uno::makeAny( xCol );
 }
 
-void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException)
+void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet >& xProps )
 {
     uno::Reference< container::XIndexReplace > xNumberingRules = pListHelper->getNumberingRules();
     xProps->setPropertyValue("NumberingRules", uno::makeAny( xNumberingRules ) );
diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx
index e3d277d5bf82..598656f9dd48 100644
--- a/sw/source/ui/vba/vbalisttemplate.hxx
+++ b/sw/source/ui/vba/vbalisttemplate.hxx
@@ -33,14 +33,14 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaListTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw ( css::uno::RuntimeException );
+    SwVbaListTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType );
     virtual ~SwVbaListTemplate() override;
 
     /// @throws css::uno::RuntimeException
-    void applyListTemplate( css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException );
+    void applyListTemplate( css::uno::Reference< css::beans::XPropertySet >& xProps );
 
     // Methods
-    virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx
index 6cf196afd338..84a979301901 100644
--- a/sw/source/ui/vba/vbalisttemplates.cxx
+++ b/sw/source/ui/vba/vbalisttemplates.cxx
@@ -28,12 +28,12 @@ class ListTemplatesEnumWrapper : public EnumerationHelper_BASE
     sal_Int32 nIndex;
 public:
     explicit ListTemplatesEnumWrapper( SwVbaListTemplates* pTemplates ) : pListTemplates( pTemplates ), nIndex( 1 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex <= pListTemplates->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex <= pListTemplates->getCount() )
             return pListTemplates->Item( uno::makeAny( nIndex++ ), uno::Any() );
@@ -41,17 +41,17 @@ public:
     }
 };
 
-SwVbaListTemplates::SwVbaListTemplates( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw (uno::RuntimeException) : SwVbaListTemplates_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ),  mxTextDocument( xTextDoc ), mnGalleryType( nType )
+SwVbaListTemplates::SwVbaListTemplates( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xTextDoc, sal_Int32 nType ) : SwVbaListTemplates_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >() ),  mxTextDocument( xTextDoc ), mnGalleryType( nType )
 {
 }
 
-::sal_Int32 SAL_CALL SwVbaListTemplates::getCount() throw (uno::RuntimeException)
+::sal_Int32 SAL_CALL SwVbaListTemplates::getCount()
 {
     // 3 types of list( bullet, numbered and outline )
     return 7;
 }
 
-uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (uno::RuntimeException)
+uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ )
 {
     sal_Int32 nIndex = 0;
     if( !( Index1 >>= nIndex ) )
@@ -64,13 +64,13 @@ uno::Any SAL_CALL SwVbaListTemplates::Item( const uno::Any& Index1, const uno::A
 
 // XEnumerationAccess
 uno::Type
-SwVbaListTemplates::getElementType() throw (uno::RuntimeException)
+SwVbaListTemplates::getElementType()
 {
     return cppu::UnoType<word::XListTemplate>::get();
 }
 
 uno::Reference< container::XEnumeration >
-SwVbaListTemplates::createEnumeration() throw (uno::RuntimeException)
+SwVbaListTemplates::createEnumeration()
 {
     return new ListTemplatesEnumWrapper( this );
 }
diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx
index 8dd0a3754090..6a3f71cc2253 100644
--- a/sw/source/ui/vba/vbalisttemplates.hxx
+++ b/sw/source/ui/vba/vbalisttemplates.hxx
@@ -34,13 +34,13 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaListTemplates( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType ) throw (css::uno::RuntimeException);
+    SwVbaListTemplates( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nType );
 
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw ( css::uno::RuntimeException ) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaListTemplates_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx
index aceca9346e6d..34b2b38146ba 100644
--- a/sw/source/ui/vba/vbaoptions.cxx
+++ b/sw/source/ui/vba/vbaoptions.cxx
@@ -41,7 +41,6 @@ SwVbaOptions::~SwVbaOptions()
 
 uno::Any SAL_CALL
 SwVbaOptions::DefaultFilePath( sal_Int32 _path )
-    throw (css::script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     switch( _path )
     {
@@ -127,132 +126,132 @@ uno::Any SwVbaOptions::getValueEvent()
     return uno::makeAny( sPath );
 }
 
-sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineStyle() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineStyle()
 {
     return word::WdLineStyle::wdLineStyleSingle;
 }
 
-void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 /*_defaultborderlinestyle*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setDefaultBorderLineStyle( ::sal_Int32 /*_defaultborderlinestyle*/ )
 {
     // not support in Writer
 }
 
-sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineWidth() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderLineWidth()
 {
     return word::WdLineWidth::wdLineWidth050pt;
 }
 
-void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 /*_defaultborderlinewidth*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setDefaultBorderLineWidth( ::sal_Int32 /*_defaultborderlinewidth*/ )
 {
     // not support in Writer
 }
 
-sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderColorIndex() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwVbaOptions::getDefaultBorderColorIndex()
 {
     return word::WdColorIndex::wdAuto;
 }
 
-void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 /*_defaultbordercolorindex*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 /*_defaultbordercolorindex*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getReplaceSelection() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getReplaceSelection()
 {
     return true;
 }
 
-void SAL_CALL SwVbaOptions::setReplaceSelection( sal_Bool /*_replaceselection*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setReplaceSelection( sal_Bool /*_replaceselection*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getMapPaperSize() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getMapPaperSize()
 {
     return false;
 }
 
-void SAL_CALL SwVbaOptions::setMapPaperSize( sal_Bool /*_mappapersize*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setMapPaperSize( sal_Bool /*_mappapersize*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyHeadings() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyHeadings()
 {
     return false;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( sal_Bool /*_autoformatasyoutypeapplyheadings*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( sal_Bool /*_autoformatasyoutypeapplyheadings*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyBulletedLists() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyBulletedLists()
 {
     return false;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool /*_autoformatasyoutypeapplybulletedlists*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool /*_autoformatasyoutypeapplybulletedlists*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyNumberedLists() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyNumberedLists()
 {
     return false;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool /*_autoformatasyoutypeapplynumberedlists*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool /*_autoformatasyoutypeapplynumberedlists*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeFormatListItemBeginning() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeFormatListItemBeginning()
 {
     return false;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool /*_autoformatasyoutypeformatlistitembeginning*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool /*_autoformatasyoutypeformatlistitembeginning*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeDefineStyles() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeDefineStyles()
 {
     return false;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( sal_Bool /*_autoformatasyoutypedefinestyles*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( sal_Bool /*_autoformatasyoutypedefinestyles*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyHeadings() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyHeadings()
 {
     return false;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( sal_Bool /*_autoformatapplyheadings*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( sal_Bool /*_autoformatapplyheadings*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyLists() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyLists()
 {
     return false;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( sal_Bool /*_autoformatapplylists*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( sal_Bool /*_autoformatapplylists*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyBulletedLists() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyBulletedLists()
 {
     return false;
 }
 
-void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( sal_Bool /*_autoformatapplybulletedlists*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( sal_Bool /*_autoformatapplybulletedlists*/ )
 {
     // not support in Writer
 }
diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx
index 9a15ccd8a759..d7de9d6ea661 100644
--- a/sw/source/ui/vba/vbaoptions.hxx
+++ b/sw/source/ui/vba/vbaoptions.hxx
@@ -36,36 +36,35 @@ public:
     virtual ~SwVbaOptions() override;
 
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getReplaceSelection() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setReplaceSelection( sal_Bool _replaceselection ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMapPaperSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMapPaperSize( sal_Bool _mappapersize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( sal_Bool _autoformatasyoutypeapplyheadings ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool _autoformatasyoutypeapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool _autoformatasyoutypeapplynumberedlists ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool _autoformatasyoutypeformatlistitembeginning ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( sal_Bool _autoformatasyoutypedefinestyles ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoFormatApplyHeadings() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoFormatApplyHeadings( sal_Bool _autoformatapplyheadings ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoFormatApplyLists() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoFormatApplyLists( sal_Bool _autoformatapplylists ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoFormatApplyBulletedLists( sal_Bool _autoformatapplybulletedlists ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getDefaultBorderLineStyle() override;
+    virtual void SAL_CALL setDefaultBorderLineStyle( ::sal_Int32 _defaultborderlinestyle ) override;
+    virtual ::sal_Int32 SAL_CALL getDefaultBorderLineWidth() override;
+    virtual void SAL_CALL setDefaultBorderLineWidth( ::sal_Int32 _defaultborderlinewidth ) override;
+    virtual ::sal_Int32 SAL_CALL getDefaultBorderColorIndex() override;
+    virtual void SAL_CALL setDefaultBorderColorIndex( ::sal_Int32 _defaultbordercolorindex ) override;
+    virtual sal_Bool SAL_CALL getReplaceSelection() override;
+    virtual void SAL_CALL setReplaceSelection( sal_Bool _replaceselection ) override;
+    virtual sal_Bool SAL_CALL getMapPaperSize() override;
+    virtual void SAL_CALL setMapPaperSize( sal_Bool _mappapersize ) override;
+    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyHeadings() override;
+    virtual void SAL_CALL setAutoFormatAsYouTypeApplyHeadings( sal_Bool _autoformatasyoutypeapplyheadings ) override;
+    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyBulletedLists() override;
+    virtual void SAL_CALL setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool _autoformatasyoutypeapplybulletedlists ) override;
+    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeApplyNumberedLists() override;
+    virtual void SAL_CALL setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool _autoformatasyoutypeapplynumberedlists ) override;
+    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeFormatListItemBeginning() override;
+    virtual void SAL_CALL setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool _autoformatasyoutypeformatlistitembeginning ) override;
+    virtual sal_Bool SAL_CALL getAutoFormatAsYouTypeDefineStyles() override;
+    virtual void SAL_CALL setAutoFormatAsYouTypeDefineStyles( sal_Bool _autoformatasyoutypedefinestyles ) override;
+    virtual sal_Bool SAL_CALL getAutoFormatApplyHeadings() override;
+    virtual void SAL_CALL setAutoFormatApplyHeadings( sal_Bool _autoformatapplyheadings ) override;
+    virtual sal_Bool SAL_CALL getAutoFormatApplyLists() override;
+    virtual void SAL_CALL setAutoFormatApplyLists( sal_Bool _autoformatapplylists ) override;
+    virtual sal_Bool SAL_CALL getAutoFormatApplyBulletedLists() override;
+    virtual void SAL_CALL setAutoFormatApplyBulletedLists( sal_Bool _autoformatapplybulletedlists ) override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path )
-        throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) override;
 
     //PropListener
     virtual void setValueEvent( const css::uno::Any& value ) override;
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index bf2f975625fb..dec1c8b47652 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -32,7 +32,7 @@ using namespace ::ooo::vba;
 SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent,
                 const uno::Reference< uno::XComponentContext >& xContext,
                 const uno::Reference< frame::XModel >& xModel,
-                const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException):
+                const uno::Reference< beans::XPropertySet >& xProps ):
            SwVbaPageSetup_BASE( xParent, xContext )
 {
     mxModel.set( xModel, uno::UNO_QUERY_THROW );
@@ -41,13 +41,13 @@ SwVbaPageSetup::SwVbaPageSetup(const uno::Reference< XHelperInterface >& xParent
     mnOrientLandscape = word::WdOrientation::wdOrientLandscape;
 }
 
-double SAL_CALL SwVbaPageSetup::getGutter() throw (uno::RuntimeException, std::exception)
+double SAL_CALL SwVbaPageSetup::getGutter()
 {
     // not support in Writer
     return 0;
 }
 
-void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaPageSetup::setGutter( double _gutter )
 {
     // default add gutter into left margin
     if( _gutter != 0 )
@@ -57,7 +57,7 @@ void SAL_CALL SwVbaPageSetup::setGutter( double _gutter ) throw (uno::RuntimeExc
     }
 }
 
-double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException, std::exception)
+double SAL_CALL SwVbaPageSetup::getHeaderDistance()
 {
     bool isHeaderOn = false;
     mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn;
@@ -75,7 +75,7 @@ double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException
      * @param: headerDistance is the value that is set in MS Word for the distance from the top of the page
      *          to the header
      */
-void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance )
 {
     sal_Int32 newHeaderDistance = Millimeter::getInHundredthsOfOneMillimeter( _headerdistance );
     bool isHeaderOn = false;
@@ -100,7 +100,7 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw
     mxPageProps->setPropertyValue("HeaderHeight", uno::makeAny( newHeaderHeight ) );
 }
 
-double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException, std::exception)
+double SAL_CALL SwVbaPageSetup::getFooterDistance()
 {
     bool isFooterOn = false;
     mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn;
@@ -109,7 +109,7 @@ double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException
     return VbaPageSetupBase::getFooterMargin();
 }
 
-void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance )
 {
     sal_Int32 newFooterDistance = Millimeter::getInHundredthsOfOneMillimeter( _footerdistance );
     bool isFooterOn = false;
@@ -134,7 +134,7 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw
     mxPageProps->setPropertyValue("FooterHeight", uno::makeAny( newFooterHeight ) );
 }
 
-sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter()
 {
     OUString pageStyle = getStyleOfFirstPage();
     if ( pageStyle == "First Page" )
@@ -143,7 +143,7 @@ sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno
     return false;
 }
 
-void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status )
 {
     if( status == getDifferentFirstPageHeaderFooter() )
         return;
@@ -201,7 +201,7 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status
     xFirstPageProps->setPropertyValue("RightMargin", uno::makeAny( nRightMargin ) );
 }
 
-OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException)
+OUString SwVbaPageSetup::getStyleOfFirstPage()
 {
     OUString styleFirstPage;
     uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
@@ -223,7 +223,7 @@ OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException)
     return styleFirstPage;
 }
 
-::sal_Int32 SAL_CALL SwVbaPageSetup::getSectionStart() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaPageSetup::getSectionStart()
 {
     // FIXME:
     sal_Int32 wdSectionStart = word::WdSectionStart::wdSectionNewPage;
@@ -238,7 +238,7 @@ OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException)
     return wdSectionStart;
 }
 
-void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ )
 {
     // fail to find corresponding feature in Writer
     // #FIXME:
diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx
index d51303d94f58..2cdd5caca960 100644
--- a/sw/source/ui/vba/vbapagesetup.hxx
+++ b/sw/source/ui/vba/vbapagesetup.hxx
@@ -32,26 +32,26 @@ class SwVbaPageSetup :  public SwVbaPageSetup_BASE
 {
 private:
     /// @throws css::uno::RuntimeException
-    OUString getStyleOfFirstPage() throw (css::uno::RuntimeException);
+    OUString getStyleOfFirstPage();
 
 public:
     /// @throws css::uno::RuntimeException
     SwVbaPageSetup( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent,
                     const css::uno::Reference< css::uno::XComponentContext >& xContext,
                     const css::uno::Reference< css::frame::XModel >& xModel,
-                    const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException);
+                    const css::uno::Reference< css::beans::XPropertySet >& xProps );
 
     // Attributes
-    virtual double SAL_CALL getGutter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setGutter( double _gutter ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getHeaderDistance() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeaderDistance( double _headerdistance ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getFooterDistance() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFooterDistance( double _footerdistance ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getSectionStart() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getGutter() override;
+    virtual void SAL_CALL setGutter( double _gutter ) override;
+    virtual double SAL_CALL getHeaderDistance() override;
+    virtual void SAL_CALL setHeaderDistance( double _headerdistance ) override;
+    virtual double SAL_CALL getFooterDistance() override;
+    virtual void SAL_CALL setFooterDistance( double _footerdistance ) override;
+    virtual sal_Bool SAL_CALL getDifferentFirstPageHeaderFooter() override;
+    virtual void SAL_CALL setDifferentFirstPageHeaderFooter( sal_Bool status ) override;
+    virtual ::sal_Int32 SAL_CALL getSectionStart() override;
+    virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx
index 2c7f72a3e390..fa5dbe0218c7 100644
--- a/sw/source/ui/vba/vbapalette.cxx
+++ b/sw/source/ui/vba/vbapalette.cxx
@@ -58,12 +58,12 @@ public:
    DefaultPalette(){}
 
     // Methods XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount() override
     {
         return SAL_N_ELEMENTS(ColorTable);
     }
 
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw lang::IndexOutOfBoundsException();
@@ -71,11 +71,11 @@ public:
     }
 
     // Methods XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType() override
     {
         return ::cppu::UnoType<sal_Int32>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements() override
     {
         return true;
     }
diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx
index 4efb7580eacb..118538da3263 100644
--- a/sw/source/ui/vba/vbapane.cxx
+++ b/sw/source/ui/vba/vbapane.cxx
@@ -25,7 +25,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 SwVbaPane::SwVbaPane( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-    const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) :
+    const uno::Reference< frame::XModel >& xModel ) :
     SwVbaPane_BASE( rParent, rContext ), mxModel( xModel )
 {
 }
@@ -35,13 +35,13 @@ SwVbaPane::~SwVbaPane()
 }
 
 uno::Any SAL_CALL
-SwVbaPane::View() throw ( css::uno::RuntimeException, std::exception )
+SwVbaPane::View()
 {
     return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this,  mxContext, mxModel ) ) );
 }
 
 void SAL_CALL
-SwVbaPane::Close( ) throw ( css::uno::RuntimeException, std::exception )
+SwVbaPane::Close( )
 {
     OUString url = ".uno:CloseWin";
     dispatchRequests( mxModel,url );
diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx
index 5cf09bc90e41..e5c13bf1c324 100644
--- a/sw/source/ui/vba/vbapane.hxx
+++ b/sw/source/ui/vba/vbapane.hxx
@@ -32,12 +32,12 @@ private:
 public:
     /// @throws css::uno::RuntimeException
     SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
-        const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException );
+        const css::uno::Reference< css::frame::XModel >& xModel );
     virtual ~SwVbaPane() override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL View(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Close(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL View(  ) override;
+    virtual void SAL_CALL Close(  ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx
index 7a163fe21b38..28edd7be2985 100644
--- a/sw/source/ui/vba/vbapanes.cxx
+++ b/sw/source/ui/vba/vbapanes.cxx
@@ -35,21 +35,21 @@ public:
     PanesIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) {}
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount(  ) override
     {
         return 1;
     }
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override
     {
         if( Index != 0 )
             throw lang::IndexOutOfBoundsException();
         return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent,  mxContext, mxModel ) ) );
     }
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<word::XPane>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return true;
     }
@@ -61,12 +61,12 @@ class PanesEnumWrapper : public EnumerationHelper_BASE
     sal_Int32 nIndex;
 public:
     explicit PanesEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < m_xIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex < m_xIndexAccess->getCount() )
             return m_xIndexAccess->getByIndex( nIndex++ );
@@ -79,12 +79,12 @@ SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const
 }
 // XEnumerationAccess
 uno::Type
-SwVbaPanes::getElementType() throw (uno::RuntimeException)
+SwVbaPanes::getElementType()
 {
     return cppu::UnoType<word::XPane>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaPanes::createEnumeration() throw (uno::RuntimeException)
+SwVbaPanes::createEnumeration()
 {
     return new PanesEnumWrapper( m_xIndexAccess );
 }
diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx
index 2ee7ca287b4f..cfbc15330d66 100644
--- a/sw/source/ui/vba/vbapanes.hxx
+++ b/sw/source/ui/vba/vbapanes.hxx
@@ -33,8 +33,8 @@ public:
     SwVbaPanes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaPanes_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index b4108654e30c..42db168edb41 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -26,7 +26,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaParagraph::SwVbaParagraph( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDocument, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) :
+SwVbaParagraph::SwVbaParagraph( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDocument, const uno::Reference< text::XTextRange >& xTextRange ) :
     SwVbaParagraph_BASE( rParent, rContext ), mxTextDocument( xDocument ), mxTextRange( xTextRange )
 {
 }
@@ -36,20 +36,20 @@ SwVbaParagraph::~SwVbaParagraph()
 }
 
 uno::Reference< word::XRange > SAL_CALL
-SwVbaParagraph::getRange( ) throw ( uno::RuntimeException, std::exception )
+SwVbaParagraph::getRange( )
 {
     return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText() ) );
 }
 
 uno::Any SAL_CALL
-SwVbaParagraph::getStyle( ) throw ( uno::RuntimeException, std::exception )
+SwVbaParagraph::getStyle( )
 {
     uno::Reference< word::XRange > xRange = getRange();
     return xRange->getStyle();
 }
 
 void SAL_CALL
-SwVbaParagraph::setStyle( const uno::Any& style ) throw ( uno::RuntimeException, std::exception )
+SwVbaParagraph::setStyle( const uno::Any& style )
 {
     uno::Reference< word::XRange > xRange = getRange();
     xRange->setStyle( style );
@@ -80,7 +80,7 @@ private:
     uno::Reference< text::XTextDocument > mxTextDocument;
 
     /// @throws uno::RuntimeException
-    uno::Reference< container::XEnumeration > getEnumeration() throw (uno::RuntimeException)
+    uno::Reference< container::XEnumeration > getEnumeration()
     {
         uno::Reference< container::XEnumerationAccess > xParEnumAccess( mxTextDocument->getText(), uno::UNO_QUERY_THROW );
         return xParEnumAccess->createEnumeration();
@@ -88,14 +88,14 @@ private:
 
 public:
     /// @throws uno::RuntimeException
-    explicit ParagraphCollectionHelper( const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException): mxTextDocument( xDocument )
+    explicit ParagraphCollectionHelper( const uno::Reference< text::XTextDocument >& xDocument ): mxTextDocument( xDocument )
     {
     }
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override { return  cppu::UnoType<text::XTextRange>::get(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override { return true; }
+    virtual uno::Type SAL_CALL getElementType(  ) override { return  cppu::UnoType<text::XTextRange>::get(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return true; }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         sal_Int32 nCount = 0;
         uno::Reference< container::XEnumeration > xParEnum = getEnumeration();
@@ -109,7 +109,7 @@ public:
         }
         return nCount;
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if( Index < getCount() )
         {
@@ -129,24 +129,24 @@ public:
         throw lang::IndexOutOfBoundsException();
     }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return getEnumeration();
     }
 };
 
-SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) throw (uno::RuntimeException) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument )
+SwVbaParagraphs::SwVbaParagraphs( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDocument ) : SwVbaParagraphs_BASE( xParent, xContext, new ParagraphCollectionHelper( xDocument ) ), mxTextDocument( xDocument )
 {
 }
 
 // XEnumerationAccess
 uno::Type
-SwVbaParagraphs::getElementType() throw (uno::RuntimeException)
+SwVbaParagraphs::getElementType()
 {
     return cppu::UnoType<word::XParagraph>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaParagraphs::createEnumeration() throw (uno::RuntimeException)
+SwVbaParagraphs::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return xEnumerationAccess->createEnumeration();
diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx
index ed3754b029c3..7ce0b0555630 100644
--- a/sw/source/ui/vba/vbaparagraph.hxx
+++ b/sw/source/ui/vba/vbaparagraph.hxx
@@ -36,13 +36,13 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaParagraph( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDocument, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
+    SwVbaParagraph( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDocument, const css::uno::Reference< css::text::XTextRange >& xTextRange );
     virtual ~SwVbaParagraph() override;
 
     // XParagraph
-    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getStyle() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() override;
+    virtual css::uno::Any SAL_CALL getStyle() override;
+    virtual void SAL_CALL setStyle( const css::uno::Any& style ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
@@ -57,11 +57,11 @@ private:
     css::uno::Reference< css::text::XTextDocument > mxTextDocument;
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaParagraphs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDocument ) throw (css::uno::RuntimeException);
+    SwVbaParagraphs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDocument );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaParagraphs_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx
index e60acecf8e0d..b44130efa22a 100644
--- a/sw/source/ui/vba/vbaparagraphformat.cxx
+++ b/sw/source/ui/vba/vbaparagraphformat.cxx
@@ -45,40 +45,40 @@ SwVbaParagraphFormat::~SwVbaParagraphFormat()
 {
 }
 
-sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment() throw (uno::RuntimeException, css::script::BasicErrorException, std::exception)
+sal_Int32 SAL_CALL SwVbaParagraphFormat::getAlignment()
 {
     style::ParagraphAdjust aParaAdjust = style::ParagraphAdjust_LEFT;
     mxParaProps->getPropertyValue("ParaAdjust") >>= aParaAdjust;
     return getMSWordAlignment( aParaAdjust );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setAlignment( sal_Int32 _alignment )
 {
     style::ParagraphAdjust aParaAdjust = ( style::ParagraphAdjust ) getOOoAlignment( _alignment );
     mxParaProps->setPropertyValue("ParaAdjust", uno::makeAny( aParaAdjust ) );
 }
 
-float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent()
 {
     sal_Int32 indent = 0;
     mxParaProps->getPropertyValue("ParaFirstLineIndent") >>= indent;
     return (float)( Millimeter::getInPoints( indent ) );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent )
 {
     sal_Int32 indent = Millimeter::getInHundredthsOfOneMillimeter( _firstlineindent );
     mxParaProps->setPropertyValue("ParaFirstLineIndent", uno::makeAny( indent ) );
 }
 
-uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaParagraphFormat::getKeepTogether()
 {
     bool bKeep = false;
     mxParaProps->getPropertyValue("ParaKeepTogether") >>= bKeep;
     return uno::makeAny ( bKeep );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogether ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogether )
 {
     bool bKeep = false;
     if( _keeptogether >>= bKeep )
@@ -91,14 +91,14 @@ void SAL_CALL SwVbaParagraphFormat::setKeepTogether( const uno::Any& _keeptogeth
     }
 }
 
-uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaParagraphFormat::getKeepWithNext()
 {
     bool bKeep = false;
     mxParaProps->getPropertyValue("ParaSplit") >>= bKeep;
     return uno::makeAny ( bKeep );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithnext ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithnext )
 {
     bool bKeep = false;
     if( _keepwithnext >>= bKeep )
@@ -111,14 +111,14 @@ void SAL_CALL SwVbaParagraphFormat::setKeepWithNext( const uno::Any& _keepwithne
     }
 }
 
-uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaParagraphFormat::getHyphenation()
 {
     bool bHypn = false;
     mxParaProps->getPropertyValue("ParaIsHyphenation") >>= bHypn;
     return uno::makeAny ( bHypn );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation )
 {
     bool bHypn = false;
     if( _hyphenation >>= bHypn )
@@ -131,14 +131,14 @@ void SAL_CALL SwVbaParagraphFormat::setHyphenation( const uno::Any& _hyphenation
     }
 }
 
-float SAL_CALL SwVbaParagraphFormat::getLineSpacing() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaParagraphFormat::getLineSpacing()
 {
     style::LineSpacing aLineSpacing;
     mxParaProps->getPropertyValue("ParaLineSpacing") >>= aLineSpacing;
     return getMSWordLineSpacing( aLineSpacing );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing )
 {
     style::LineSpacing aLineSpacing;
     mxParaProps->getPropertyValue("ParaLineSpacing") >>= aLineSpacing;
@@ -146,27 +146,27 @@ void SAL_CALL SwVbaParagraphFormat::setLineSpacing( float _linespacing ) throw (
     mxParaProps->setPropertyValue("ParaLineSpacing", uno::makeAny( aLineSpacing ) );
 }
 
-sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwVbaParagraphFormat::getLineSpacingRule()
 {
     style::LineSpacing aLineSpacing;
     mxParaProps->getPropertyValue("ParaLineSpacing") >>= aLineSpacing;
     return getMSWordLineSpacingRule( aLineSpacing );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setLineSpacingRule( sal_Int32 _linespacingrule )
 {
     style::LineSpacing aLineSpacing = getOOoLineSpacingFromRule( _linespacingrule );
     mxParaProps->setPropertyValue("ParaLineSpacing", uno::makeAny( aLineSpacing ) );
 }
 
-uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaParagraphFormat::getNoLineNumber()
 {
     bool noLineNum = false;
     mxParaProps->getPropertyValue("ParaLineNumberCount") >>= noLineNum;
     return uno::makeAny ( noLineNum );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumber ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumber )
 {
     bool noLineNum = false;
     if( _nolinenumber >>= noLineNum )
@@ -179,7 +179,7 @@ void SAL_CALL SwVbaParagraphFormat::setNoLineNumber( const uno::Any& _nolinenumb
     }
 }
 
-sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel()
 {
     sal_Int32 nLevel = word::WdOutlineLevel::wdOutlineLevelBodyText;
     OUString aHeading;
@@ -193,7 +193,7 @@ sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeEx
     return nLevel;
 }
 
-void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel )
 {
     if( _outlinelevel != getOutlineLevel() )
     {
@@ -201,7 +201,7 @@ void SAL_CALL SwVbaParagraphFormat::setOutlineLevel( sal_Int32 _outlinelevel ) t
     }
 }
 
-uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore()
 {
     style::BreakType aBreakType;
     mxParaProps->getPropertyValue("BreakType") >>= aBreakType;
@@ -209,7 +209,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::Runtime
     return uno::makeAny( bBreakBefore );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbefore ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbefore )
 {
     bool bBreakBefore = false;
     if( _breakbefore >>= bBreakBefore )
@@ -238,69 +238,69 @@ void SAL_CALL SwVbaParagraphFormat::setPageBreakBefore( const uno::Any& _breakbe
     }
 }
 
-float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaParagraphFormat::getSpaceBefore()
 {
     sal_Int32 nSpace = 0;
     mxParaProps->getPropertyValue("ParaTopMargin") >>= nSpace;
     return (float)( Millimeter::getInPoints( nSpace ) );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space )
 {
     sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space );
     mxParaProps->setPropertyValue("ParaTopMargin", uno::makeAny( nSpace ) );
 }
 
-float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaParagraphFormat::getSpaceAfter()
 {
     sal_Int32 nSpace = 0;
     mxParaProps->getPropertyValue("ParaBottomMargin") >>= nSpace;
     return (float)( Millimeter::getInPoints( nSpace ) );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space )
 {
     sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _space );
     mxParaProps->setPropertyValue("ParaBottomMargin", uno::makeAny( nSpace ) );
 }
 
-float SAL_CALL SwVbaParagraphFormat::getLeftIndent() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaParagraphFormat::getLeftIndent()
 {
     sal_Int32 nIndent = 0;
     mxParaProps->getPropertyValue("ParaLeftMargin") >>= nIndent;
     return (float)( Millimeter::getInPoints( nIndent ) );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent )
 {
     sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _leftindent );
     mxParaProps->setPropertyValue("ParaLeftMargin", uno::makeAny( nIndent ) );
 }
 
-float SAL_CALL SwVbaParagraphFormat::getRightIndent() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaParagraphFormat::getRightIndent()
 {
     sal_Int32 nIndent = 0;
     mxParaProps->getPropertyValue("ParaRightMargin") >>= nIndent;
     return (float)( Millimeter::getInPoints( nIndent ) );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent )
 {
     sal_Int32 nIndent = Millimeter::getInHundredthsOfOneMillimeter( _rightindent );
     mxParaProps->setPropertyValue("ParaRightMargin", uno::makeAny( nIndent ) );
 }
 
-uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops()
 {
     return uno::makeAny( uno::Reference< word::XTabStops >( new SwVbaTabStops( this, mxContext, mxParaProps ) ) );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ )
 {
     throw uno::RuntimeException("Not implemented" );
 }
 
-uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl()
 {
     sal_Int8 nWidow = 0;
     mxParaProps->getPropertyValue("ParaWidows") >>= nWidow;
@@ -312,7 +312,7 @@ uno::Any SAL_CALL SwVbaParagraphFormat::getWidowControl() throw (uno::RuntimeExc
     return uno::makeAny( bWidow );
 }
 
-void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontrol ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaParagraphFormat::setWidowControl( const uno::Any& _widowcontrol )
 {
     // if we get true, the part of the paragraph on one page has to be
     // at least two lines
@@ -474,7 +474,7 @@ sal_Int32 SwVbaParagraphFormat::getMSWordLineSpacingRule( style::LineSpacing& rL
     return wdLineSpacing;
 }
 
-sal_Int16 SwVbaParagraphFormat::getCharHeight() throw (uno::RuntimeException)
+sal_Int16 SwVbaParagraphFormat::getCharHeight()
 {
     float fCharHeight = 0.0;
     mxParaProps->getPropertyValue("CharHeight") >>= fCharHeight;
diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx
index 2c6387e8a527..645c14c635cc 100644
--- a/sw/source/ui/vba/vbaparagraphformat.hxx
+++ b/sw/source/ui/vba/vbaparagraphformat.hxx
@@ -37,7 +37,7 @@ private:
     static float getMSWordLineSpacing( css::style::LineSpacing& rLineSpacing );
     static sal_Int32 getMSWordLineSpacingRule( css::style::LineSpacing& rLineSpacing );
     /// @throws css::uno::RuntimeException
-    sal_Int16 getCharHeight() throw (css::uno::RuntimeException);
+    sal_Int16 getCharHeight();
     static sal_Int32 getOOoAlignment( sal_Int32 _alignment );
     static sal_Int32 getMSWordAlignment( sal_Int32 _alignment );
 
@@ -46,38 +46,38 @@ public:
     virtual ~SwVbaParagraphFormat() override;
 
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override;
-    virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getFirstLineIndent() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getKeepTogether() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getKeepWithNext() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getHyphenation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getLineSpacing() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLineSpacing( float _linespacing ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getLineSpacingRule() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getNoLineNumber() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getOutlineLevel() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPageBreakBefore() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getSpaceBefore() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSpaceBefore( float _spacebefore ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getSpaceAfter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSpaceAfter( float _spaceafter ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getLeftIndent() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeftIndent( float _leftindent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getRightIndent() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRightIndent( float _rightindent ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getTabStops() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getWidowControl() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getAlignment() override;
+    virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) override;
+    virtual float SAL_CALL getFirstLineIndent() override;
+    virtual void SAL_CALL setFirstLineIndent( float _firstlineindent ) override;
+    virtual css::uno::Any SAL_CALL getKeepTogether() override;
+    virtual void SAL_CALL setKeepTogether( const css::uno::Any& _keeptogether ) override;
+    virtual css::uno::Any SAL_CALL getKeepWithNext() override;
+    virtual void SAL_CALL setKeepWithNext( const css::uno::Any& _keepwithnext ) override;
+    virtual css::uno::Any SAL_CALL getHyphenation() override;
+    virtual void SAL_CALL setHyphenation( const css::uno::Any& _hyphenation ) override;
+    virtual float SAL_CALL getLineSpacing() override;
+    virtual void SAL_CALL setLineSpacing( float _linespacing ) override;
+    virtual ::sal_Int32 SAL_CALL getLineSpacingRule() override;
+    virtual void SAL_CALL setLineSpacingRule( ::sal_Int32 _linespacingrule ) override;
+    virtual css::uno::Any SAL_CALL getNoLineNumber() override;
+    virtual void SAL_CALL setNoLineNumber( const css::uno::Any& _nolinenumber ) override;
+    virtual ::sal_Int32 SAL_CALL getOutlineLevel() override;
+    virtual void SAL_CALL setOutlineLevel( ::sal_Int32 _outlinelevel ) override;
+    virtual css::uno::Any SAL_CALL getPageBreakBefore() override;
+    virtual void SAL_CALL setPageBreakBefore( const css::uno::Any& _pagebreakbefore ) override;
+    virtual float SAL_CALL getSpaceBefore() override;
+    virtual void SAL_CALL setSpaceBefore( float _spacebefore ) override;
+    virtual float SAL_CALL getSpaceAfter() override;
+    virtual void SAL_CALL setSpaceAfter( float _spaceafter ) override;
+    virtual float SAL_CALL getLeftIndent() override;
+    virtual void SAL_CALL setLeftIndent( float _leftindent ) override;
+    virtual float SAL_CALL getRightIndent() override;
+    virtual void SAL_CALL setRightIndent( float _rightindent ) override;
+    virtual css::uno::Any SAL_CALL getTabStops() override;
+    virtual void SAL_CALL setTabStops( const css::uno::Any& _tabstops ) override;
+    virtual css::uno::Any SAL_CALL getWidowControl() override;
+    virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index 3ee72935845d..a76cd1cdce51 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -45,18 +45,18 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart ) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument )
 {
     uno::Reference< text::XTextRange > xEnd;
     initialize( rStart, xEnd );
 }
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument )
 {
     initialize( rStart, rEnd );
 }
 
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText ) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText )
 {
     initialize( rStart, rEnd );
 }
@@ -65,7 +65,7 @@ SwVbaRange::~SwVbaRange()
 {
 }
 
-void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, uno::RuntimeException)
+void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd )
 {
     if( !mxText.is() )
     {
@@ -84,7 +84,7 @@ void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, c
 }
 
 uno::Reference< text::XTextRange > SAL_CALL
-SwVbaRange::getXTextRange() throw (uno::RuntimeException, std::exception)
+SwVbaRange::getXTextRange()
 {
     uno::Reference< text::XTextRange > xTextRange( mxTextCursor, uno::UNO_QUERY_THROW );
     return xTextRange;
@@ -96,7 +96,7 @@ SwVbaRange::getXTextRange() throw (uno::RuntimeException, std::exception)
 * @return
 */
 OUString SAL_CALL
-SwVbaRange::getText() throw ( uno::RuntimeException, std::exception )
+SwVbaRange::getText()
 {
     OUString aText = mxTextCursor->getString();
     sal_Int32 nLen = aText.getLength();
@@ -125,7 +125,7 @@ SwVbaRange::getText() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-SwVbaRange::setText( const OUString& rText ) throw ( uno::RuntimeException, std::exception )
+SwVbaRange::setText( const OUString& rText )
 {
     // Emulate the MSWord behavior, Don't delete the bookmark
     // which contains no text string in current inserting position,
@@ -171,7 +171,6 @@ SwVbaRange::setText( const OUString& rText ) throw ( uno::RuntimeException, std:
 
 // FIXME: test is not pass
 void SAL_CALL SwVbaRange::InsertBreak(const uno::Any& _breakType)
-    throw (css::script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     // default type is wdPageBreak;
     sal_Int32 nBreakType = word::WdBreakType::wdPageBreak;
@@ -215,7 +214,7 @@ void SAL_CALL SwVbaRange::InsertBreak(const uno::Any& _breakType)
 }
 
 void SAL_CALL
-SwVbaRange::Select() throw ( uno::RuntimeException, std::exception )
+SwVbaRange::Select()
 {
     uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextViewCursor > xTextViewCursor = word::getXTextViewCursor( xModel );
@@ -224,14 +223,14 @@ SwVbaRange::Select() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-SwVbaRange::InsertParagraph() throw ( uno::RuntimeException, std::exception )
+SwVbaRange::InsertParagraph()
 {
     mxTextCursor->setString( "" );
     InsertParagraphBefore();
 }
 
 void SAL_CALL
-SwVbaRange::InsertParagraphBefore() throw ( uno::RuntimeException, std::exception )
+SwVbaRange::InsertParagraphBefore()
 {
     uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getStart();
     mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, true );
@@ -239,26 +238,26 @@ SwVbaRange::InsertParagraphBefore() throw ( uno::RuntimeException, std::exceptio
 }
 
 void SAL_CALL
-SwVbaRange::InsertParagraphAfter() throw ( uno::RuntimeException, std::exception )
+SwVbaRange::InsertParagraphAfter()
 {
     uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getEnd();
     mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, true );
 }
 
 uno::Reference< word::XParagraphFormat > SAL_CALL
-SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException, std::exception )
+SwVbaRange::getParagraphFormat()
 {
     uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
     return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, xParaProps ) );
 }
 
 void SAL_CALL
-SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ ) throw ( uno::RuntimeException, std::exception )
+SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& /*rParagraphFormat*/ )
 {
     throw uno::RuntimeException("Not implemented" );
 }
 
-void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( uno::RuntimeException )
+void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType )
 {
     uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW );
     if( ( xProp->getPropertyValue("CharStyleName") >>= aStyleName ) && !aStyleName.isEmpty() )
@@ -276,7 +275,7 @@ void SwVbaRange::GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw
 }
 
 uno::Any SAL_CALL
-SwVbaRange::getStyle() throw ( uno::RuntimeException, std::exception )
+SwVbaRange::getStyle()
 {
     OUString aStyleName;
     OUString aStyleType;
@@ -289,39 +288,39 @@ SwVbaRange::getStyle() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-SwVbaRange::setStyle( const uno::Any& rStyle ) throw ( uno::RuntimeException, std::exception )
+SwVbaRange::setStyle( const uno::Any& rStyle )
 {
     uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
     SwVbaStyle::setStyle( xParaProps, rStyle );
 }
 
 uno::Reference< word::XFont > SAL_CALL
-SwVbaRange::getFont() throw ( uno::RuntimeException, std::exception )
+SwVbaRange::getFont()
 {
     VbaPalette aColors;
     return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), uno::Reference< beans::XPropertySet >( getXTextRange(), uno::UNO_QUERY_THROW ) );
 }
 
 uno::Reference< word::XListFormat > SAL_CALL
-SwVbaRange::getListFormat() throw ( uno::RuntimeException, std::exception )
+SwVbaRange::getListFormat()
 {
     return uno::Reference< word::XListFormat >( new SwVbaListFormat( this, mxContext, getXTextRange() ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaRange::getLanguageID() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaRange::getLanguageID()
 {
     uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
     return SwVbaStyle::getLanguageID( xParaProps );
 }
 
-void SAL_CALL SwVbaRange::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRange::setLanguageID( ::sal_Int32 _languageid )
 {
     uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
     SwVbaStyle::setLanguageID( xParaProps, _languageid );
 }
 
 uno::Any SAL_CALL
-SwVbaRange::PageSetup( ) throw (uno::RuntimeException, std::exception)
+SwVbaRange::PageSetup( )
 {
     uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW );
     uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
@@ -334,13 +333,13 @@ SwVbaRange::PageSetup( ) throw (uno::RuntimeException, std::exception)
     return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, xModel, xPageProps ) ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaRange::getStart() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaRange::getStart()
 {
     uno::Reference< text::XText > xText = mxTextDocument->getText();
     return SwVbaRangeHelper::getPosition( xText, mxTextCursor->getStart() );
 }
 
-void SAL_CALL SwVbaRange::setStart( ::sal_Int32 _start ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRange::setStart( ::sal_Int32 _start )
 {
     uno::Reference< text::XText > xText = mxTextDocument->getText();
     uno::Reference< text::XTextRange > xStart = SwVbaRangeHelper::getRangeByPosition( xText, _start );
@@ -350,13 +349,13 @@ void SAL_CALL SwVbaRange::setStart( ::sal_Int32 _start ) throw (uno::RuntimeExce
     mxTextCursor->gotoRange( xEnd, true );
 }
 
-::sal_Int32 SAL_CALL SwVbaRange::getEnd() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaRange::getEnd()
 {
     uno::Reference< text::XText > xText = mxTextDocument->getText();
     return SwVbaRangeHelper::getPosition( xText, mxTextCursor->getEnd() );
 }
 
-void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end )
 {
     uno::Reference< text::XText > xText = mxTextDocument->getText();
     uno::Reference< text::XTextRange > xEnd = SwVbaRangeHelper::getRangeByPosition( xText, _end );
@@ -365,7 +364,7 @@ void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeExceptio
     mxTextCursor->gotoRange( xEnd, true );
 }
 
-sal_Bool SAL_CALL SwVbaRange::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaRange::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range )
 {
     SwVbaRange* pRange = dynamic_cast< SwVbaRange* >( Range.get() );
     if( !pRange )
@@ -378,7 +377,7 @@ sal_Bool SAL_CALL SwVbaRange::InRange( const uno::Reference< ::ooo::vba::word::X
 }
 
 uno::Any SAL_CALL
-SwVbaRange::Revisions( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaRange::Revisions( const uno::Any& index )
 {
     uno::Reference< text::XTextRange > xTextRange = getXTextRange();
     uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
@@ -389,7 +388,7 @@ SwVbaRange::Revisions( const uno::Any& index ) throw (uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL
-SwVbaRange::Sections( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaRange::Sections( const uno::Any& index )
 {
     uno::Reference< text::XTextRange > xTextRange = getXTextRange();
     uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
@@ -400,7 +399,7 @@ SwVbaRange::Sections( const uno::Any& index ) throw (uno::RuntimeException, std:
 }
 
 uno::Any SAL_CALL
-SwVbaRange::Fields( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaRange::Fields( const uno::Any& index )
 {
     //FIXME: should be get the field in current range
     uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx
index 816e12c3549a..d5ca830ff6aa 100644
--- a/sw/source/ui/vba/vbarange.hxx
+++ b/sw/source/ui/vba/vbarange.hxx
@@ -41,56 +41,53 @@ private:
 private:
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd );
     /// @throws css::uno::RuntimeException
-    void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException );
+    void GetStyleInfo(OUString& aStyleName, OUString& aStyleType );
 public:
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart);
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText);
     virtual ~SwVbaRange() override;
     const css::uno::Reference< css::text::XTextDocument >& getDocument() const { return mxTextDocument; }
 
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() override;
     const css::uno::Reference< css::text::XText >& getXText() const { return mxText; }
     void setXTextCursor( const css::uno::Reference< css::text::XTextCursor >& xTextCursor ) { mxTextCursor = xTextCursor; }
 
     // Attribute
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& rText ) override;
+    virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() override;
+    virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) override;
+    virtual css::uno::Any SAL_CALL getStyle() override;
+    virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) override;
 
-    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() override;
+    virtual css::uno::Reference< ooo::vba::word::XListFormat > SAL_CALL getListFormat() override;
     // Methods
-    virtual void SAL_CALL InsertBreak(const css::uno::Any& _breakType)
-        throw (css::script::BasicErrorException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getLanguageID() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL PageSetup() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL InsertBreak(const css::uno::Any& _breakType) override;
+    virtual void SAL_CALL Select() override;
+    virtual void SAL_CALL InsertParagraph() override;
+    virtual void SAL_CALL InsertParagraphBefore() override;
+    virtual void SAL_CALL InsertParagraphAfter() override;
+    virtual ::sal_Int32 SAL_CALL getLanguageID() override;
+    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) override;
+    virtual css::uno::Any SAL_CALL PageSetup() override;
+    virtual ::sal_Int32 SAL_CALL getStart() override;
+    virtual void SAL_CALL setStart( ::sal_Int32 _start ) override;
+    virtual ::sal_Int32 SAL_CALL getEnd() override;
+    virtual void SAL_CALL setEnd( ::sal_Int32 _end ) override;
+    virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) override;
+    virtual css::uno::Any SAL_CALL Revisions( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx
index dda1bb6558f1..17fd3a0bfa71 100644
--- a/sw/source/ui/vba/vbarangehelper.cxx
+++ b/sw/source/ui/vba/vbarangehelper.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star;
  * @return a range for the position; null is returned if no range can be
  * constructed.
  */
-uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const uno::Reference< text::XText >& rText, sal_Int32 _position ) throw ( uno::RuntimeException )
+uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const uno::Reference< text::XText >& rText, sal_Int32 _position )
 {
     uno::Reference< text::XTextRange > xRange;
     if( rText.is() )
@@ -60,7 +60,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u
     return xRange;
 }
 
-void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, bool _bAbsorb ) throw ( uno::RuntimeException )
+void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const OUString& rStr, bool _bAbsorb )
 {
     sal_Int32 nlastIndex = 0;
     sal_Int32 nIndex = 0;
@@ -90,7 +90,6 @@ void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRa
 
 uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Reference< text::XTextRange >& rTextRange,
                                                                   const uno::Reference< text::XText >& rText )
-    throw ( uno::RuntimeException, script::BasicErrorException )
 {
     uno::Reference< text::XTextCursor > xTextCursor;
     bool bGotTextCursor = false;
@@ -133,7 +132,7 @@ uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Ref
     return xTextCursor;
 }
 
-sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rText, const uno::Reference< text::XTextRange >& rTextRange ) throw ( uno::RuntimeException )
+sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rText, const uno::Reference< text::XTextRange >& rTextRange )
 {
     sal_Int32 nPosition = -1;
     if( rText.is() && rTextRange.is() )
@@ -163,7 +162,7 @@ sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rT
     return nPosition;
 }
 
-uno::Reference< text::XTextContent > SwVbaRangeHelper::findBookmarkByPosition( const uno::Reference< text::XTextDocument >& xTextDoc, const uno::Reference< text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException )
+uno::Reference< text::XTextContent > SwVbaRangeHelper::findBookmarkByPosition( const uno::Reference< text::XTextDocument >& xTextDoc, const uno::Reference< text::XTextRange >& xTextRange )
 {
     uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( xTextDoc, uno::UNO_QUERY_THROW );
     uno::Reference< container::XIndexAccess > xIndexAccess( xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbarangehelper.hxx b/sw/source/ui/vba/vbarangehelper.hxx
index f5eecabe0120..40b02531bd74 100644
--- a/sw/source/ui/vba/vbarangehelper.hxx
+++ b/sw/source/ui/vba/vbarangehelper.hxx
@@ -29,16 +29,16 @@ class SwVbaRangeHelper
 {
 public:
     /// @throws css::uno::RuntimeException
-    static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException );
+    static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position );
     /// @throws css::uno::RuntimeException
-    static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, bool _bAbsorb ) throw ( css::uno::RuntimeException );
+    static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const OUString& rStr, bool _bAbsorb );
     /// @throws css::uno::RuntimeException
     /// @throws css::script::BasicErrorException
-    static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException, css::script::BasicErrorException );
+    static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText );
     /// @throws css::uno::RuntimeException
-    static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw ( css::uno::RuntimeException );
+    static sal_Int32 getPosition( const css::uno::Reference< css::text::XText >& rText, const css::uno::Reference< css::text::XTextRange >& rTextRange );
     /// @throws css::uno::RuntimeException
-    static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw ( css::uno::RuntimeException );
+    static css::uno::Reference< css::text::XTextContent > findBookmarkByPosition( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, const css::uno::Reference< css::text::XTextRange >& xTextRange );
 
 };
 #endif // INCLUDED_SW_SOURCE_UI_VBA_VBARANGEHELPER_HXX
diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx
index 74e0c6a0d1b0..c0de490dc483 100644
--- a/sw/source/ui/vba/vbareplacement.cxx
+++ b/sw/source/ui/vba/vbareplacement.cxx
@@ -23,7 +23,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaReplacement::SwVbaReplacement( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< util::XPropertyReplace >& xPropertyReplace ) throw ( uno::RuntimeException ) :
+SwVbaReplacement::SwVbaReplacement( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< util::XPropertyReplace >& xPropertyReplace ) :
     SwVbaReplacement_BASE( rParent, rContext ), mxPropertyReplace( xPropertyReplace )
 {
 }
@@ -32,17 +32,17 @@ SwVbaReplacement::~SwVbaReplacement()
 {
 }
 
-OUString SAL_CALL SwVbaReplacement::getText() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwVbaReplacement::getText()
 {
     return mxPropertyReplace->getReplaceString();
 }
 
-void SAL_CALL SwVbaReplacement::setText( const OUString& _text ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaReplacement::setText( const OUString& _text )
 {
     mxPropertyReplace->setReplaceString( _text );
 }
 
-void SAL_CALL SwVbaReplacement::ClearFormatting( ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaReplacement::ClearFormatting( )
 {
     uno::Sequence< beans::PropertyValue > aPropValues;
     mxPropertyReplace->setReplaceAttributes( aPropValues );
diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx
index f68f41fc609c..22f37910ed13 100644
--- a/sw/source/ui/vba/vbareplacement.hxx
+++ b/sw/source/ui/vba/vbareplacement.hxx
@@ -32,15 +32,15 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaReplacement( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::util::XPropertyReplace >& xPropertyReplace ) throw ( css::uno::RuntimeException );
+    SwVbaReplacement( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::util::XPropertyReplace >& xPropertyReplace );
     virtual ~SwVbaReplacement() override;
 
     // Attributes
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& _text ) override;
 
     //Methods
-    virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL ClearFormatting() override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx
index 34952f596e86..556a65bd18f7 100644
--- a/sw/source/ui/vba/vbarevision.cxx
+++ b/sw/source/ui/vba/vbarevision.cxx
@@ -28,7 +28,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaRevision::SwVbaRevision( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xRedlineProps ) throw ( uno::RuntimeException ) : SwVbaRevision_BASE( rParent, rContext ), mxModel( xModel ), mxRedlineProps( xRedlineProps )
+SwVbaRevision::SwVbaRevision( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xRedlineProps ) : SwVbaRevision_BASE( rParent, rContext ), mxModel( xModel ), mxRedlineProps( xRedlineProps )
 {
 }
 
@@ -36,7 +36,7 @@ SwVbaRevision::~SwVbaRevision()
 {
 }
 
-sal_Int32 SwVbaRevision::GetPosition() throw (css::uno::RuntimeException)
+sal_Int32 SwVbaRevision::GetPosition()
 {
     sal_Int32 nPos = -1;
     uno::Reference< document::XRedlinesSupplier > xRedlinesSupp( mxModel, uno::UNO_QUERY_THROW );
@@ -59,7 +59,7 @@ sal_Int32 SwVbaRevision::GetPosition() throw (css::uno::RuntimeException)
 }
 
 void SAL_CALL
-SwVbaRevision::Accept() throw ( css::uno::RuntimeException, std::exception )
+SwVbaRevision::Accept()
 {
     SwDoc* pDoc = word::getDocShell( mxModel )->GetDoc();
     if( pDoc )
@@ -67,7 +67,7 @@ SwVbaRevision::Accept() throw ( css::uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-SwVbaRevision::Reject( ) throw ( css::uno::RuntimeException, std::exception )
+SwVbaRevision::Reject( )
 {
     SwDoc* pDoc = word::getDocShell( mxModel )->GetDoc();
     if( pDoc )
diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx
index 8fb556510d8f..77561a42ddc0 100644
--- a/sw/source/ui/vba/vbarevision.hxx
+++ b/sw/source/ui/vba/vbarevision.hxx
@@ -32,16 +32,16 @@ private:
 
 private:
     /// @throws css::uno::RuntimeException
-    sal_Int32 GetPosition() throw (css::uno::RuntimeException);
+    sal_Int32 GetPosition();
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaRevision( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xRedlineProps ) throw ( css::uno::RuntimeException );
+    SwVbaRevision( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xRedlineProps );
     virtual ~SwVbaRevision() override;
 
     // Methods
-    virtual void SAL_CALL Accept(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Reject(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Accept(  ) override;
+    virtual void SAL_CALL Reject(  ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx
index 68b6c1560eca..661413f1ed20 100644
--- a/sw/source/ui/vba/vbarevisions.cxx
+++ b/sw/source/ui/vba/vbarevisions.cxx
@@ -34,11 +34,11 @@ class RedlinesEnumeration : public ::cppu::WeakImplHelper< container::XEnumerati
     RevisionMap::iterator mIt;
 public:
     explicit RedlinesEnumeration( const RevisionMap& sMap ) : mRevisionMap( sMap ), mIt( mRevisionMap.begin() ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( mIt != mRevisionMap.end() );
     }
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !hasMoreElements() )
             throw container::NoSuchElementException();
@@ -53,14 +53,14 @@ class RevisionCollectionHelper : public ::cppu::WeakImplHelper< container::XInde
     RevisionMap mRevisionMap;
 public:
 /// @throws css::uno::RuntimeException
-RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException);
+RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange );
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override { return  cppu::UnoType<beans::XPropertySet>::get(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override { return ( !mRevisionMap.empty() ); }
+    virtual uno::Type SAL_CALL getElementType(  ) override { return  cppu::UnoType<beans::XPropertySet>::get(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return ( !mRevisionMap.empty() ); }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override { return mRevisionMap.size(); }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override { return mRevisionMap.size(); }
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw lang::IndexOutOfBoundsException();
@@ -69,13 +69,13 @@ RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const u
 
     }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new RedlinesEnumeration( mRevisionMap );
     }
 };
 
-RevisionCollectionHelper::RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException)
+RevisionCollectionHelper::RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange )
     {
         uno::Reference< text::XTextRangeCompare > xTRC( xTextRange->getText(), uno::UNO_QUERY_THROW );
         uno::Reference< document::XRedlinesSupplier > xRedlinesSupp( xModel, uno::UNO_QUERY_THROW );
@@ -96,9 +96,9 @@ class RevisionsEnumeration : public EnumerationHelperImpl
     uno::Reference< frame::XModel > m_xModel;
 public:
     /// @throws uno::RuntimeException
-    RevisionsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {}
+    RevisionsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {}
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         uno::Reference< beans::XPropertySet > xRevision( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
         return uno::makeAny( uno::Reference< word::XRevision > ( new SwVbaRevision( m_xParent, m_xContext, m_xModel, xRevision ) ) );
@@ -116,12 +116,12 @@ SwVbaRevisions::SwVbaRevisions( const uno::Reference< XHelperInterface >& xParen
 
 // XEnumerationAccess
 uno::Type
-SwVbaRevisions::getElementType() throw (uno::RuntimeException)
+SwVbaRevisions::getElementType()
 {
     return cppu::UnoType<word::XRevision>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaRevisions::createEnumeration() throw (uno::RuntimeException)
+SwVbaRevisions::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return new RevisionsEnumeration( this, mxContext, xEnumAccess->createEnumeration(), mxModel );
@@ -134,7 +134,7 @@ SwVbaRevisions::createCollectionObject( const css::uno::Any& aSource )
     return uno::makeAny( uno::Reference< word::XRevision > ( new SwVbaRevision( this, mxContext, mxModel, xRevision ) ) );
 }
 
-void SAL_CALL SwVbaRevisions::AcceptAll(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRevisions::AcceptAll(  )
 {
     // First we need to put all the redline into a vector, because if the redline is accepted,
     // it will auto delete in the document.
@@ -154,7 +154,7 @@ void SAL_CALL SwVbaRevisions::AcceptAll(  ) throw (css::uno::RuntimeException, s
     }
 }
 
-void SAL_CALL SwVbaRevisions::RejectAll(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRevisions::RejectAll(  )
 {
     throw uno::RuntimeException();
 }
diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx
index ecadcd0caa6a..2dec38640cb3 100644
--- a/sw/source/ui/vba/vbarevisions.hxx
+++ b/sw/source/ui/vba/vbarevisions.hxx
@@ -37,12 +37,12 @@ public:
     SwVbaRevisions( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
 
     // Methods
-    virtual void SAL_CALL AcceptAll(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL RejectAll(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL AcceptAll(  ) override;
+    virtual void SAL_CALL RejectAll(  ) override;
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaRevisions_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx
index 7e3716e12bf2..67f905a65719 100644
--- a/sw/source/ui/vba/vbarow.cxx
+++ b/sw/source/ui/vba/vbarow.cxx
@@ -31,7 +31,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaRow::SwVbaRow( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( uno::RuntimeException ) :
+SwVbaRow::SwVbaRow( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nIndex ) :
     SwVbaRow_BASE( rParent, rContext ), mxTextTable( xTextTable ), mnIndex( nIndex )
 {
     mxTableRows = mxTextTable->getRows();
@@ -42,7 +42,7 @@ SwVbaRow::~SwVbaRow()
 {
 }
 
-uno::Any SAL_CALL SwVbaRow::getHeight() throw (css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaRow::getHeight()
 {
     if( getHeightRule() == word::WdRowHeightRule::wdRowHeightAuto )
         return uno::makeAny( sal_Int32( word::WdConstants::wdUndefined ) );
@@ -52,7 +52,7 @@ uno::Any SAL_CALL SwVbaRow::getHeight() throw (css::uno::RuntimeException, std::
     return uno::makeAny( (float)Millimeter::getInPoints( nHeight ) );
 }
 
-void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height )
 {
     float height = 0;
     _height >>= height;
@@ -61,26 +61,26 @@ void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) throw (css::uno::Ru
     mxRowProps->setPropertyValue("Height", uno::makeAny( nHeight ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaRow::getHeightRule() throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaRow::getHeightRule()
 {
     bool isAutoHeight = false;
     mxRowProps->getPropertyValue("IsAutoHeight") >>= isAutoHeight;
     return isAutoHeight ? word::WdRowHeightRule::wdRowHeightAuto : word::WdRowHeightRule::wdRowHeightExactly;
 }
 
-void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRow::setHeightRule( ::sal_Int32 _heightrule )
 {
     bool isAutoHeight = ( _heightrule == word::WdRowHeightRule::wdRowHeightAuto );
     mxRowProps->setPropertyValue("IsAutoHeight", uno::makeAny( isAutoHeight ) );
 }
 
 void SAL_CALL
-SwVbaRow::Select( ) throw ( uno::RuntimeException, std::exception )
+SwVbaRow::Select( )
 {
     SelectRow( getCurrentWordDoc(mxContext), mxTextTable, mnIndex, mnIndex );
 }
 
-void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw ( uno::RuntimeException )
+void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow )
 {
     OUStringBuffer aRangeName;
     aRangeName.append('A').append(sal_Int32( nStartRow + 1 ) );
@@ -99,7 +99,7 @@ void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const u
     xSelection->select( uno::makeAny( xSelRange ) );
 }
 
-void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule )
 {
     setHeightRule( heightrule );
     setHeight( uno::makeAny( height ) );
diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx
index a529e5c123df..7c6e6f3ccf8b 100644
--- a/sw/source/ui/vba/vbarow.hxx
+++ b/sw/source/ui/vba/vbarow.hxx
@@ -36,21 +36,21 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaRow( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
+    SwVbaRow( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex );
     virtual ~SwVbaRow() override;
 
     // Attributes
-    virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeight( const css::uno::Any& _height ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getHeightRule() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getHeight() override;
+    virtual void SAL_CALL setHeight( const css::uno::Any& _height ) override;
+    virtual ::sal_Int32 SAL_CALL getHeightRule() override;
+    virtual void SAL_CALL setHeightRule( ::sal_Int32 _heightrule ) override;
 
     // Methods
-    virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Select(  ) override;
+    virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) override;
 
     /// @throws css::uno::RuntimeException
-    static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw (css::uno::RuntimeException);
+    static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow );
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index 182ef99f65a9..9807c5e78c7d 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -44,12 +44,12 @@ public:
     {
         mxIndexAccess.set( mxTextTable->getRows(), uno::UNO_QUERY );
     }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < mxIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if( nIndex < mxIndexAccess->getCount() )
         {
@@ -59,13 +59,13 @@ public:
     }
 };
 
-SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableRows >& xTableRows ) throw (uno::RuntimeException) : SwVbaRows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableRows, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableRows( xTableRows )
+SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableRows >& xTableRows ) : SwVbaRows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableRows, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableRows( xTableRows )
 {
     mnStartRowIndex = 0;
     mnEndRowIndex = m_xIndexAccess->getCount() - 1;
 }
 
-SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableRows >& xTableRows, sal_Int32 nStarIndex, sal_Int32 nEndIndex ) throw (uno::RuntimeException) : SwVbaRows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableRows, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableRows( xTableRows ), mnStartRowIndex( nStarIndex ), mnEndRowIndex( nEndIndex )
+SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableRows >& xTableRows, sal_Int32 nStarIndex, sal_Int32 nEndIndex ) : SwVbaRows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableRows, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableRows( xTableRows ), mnStartRowIndex( nStarIndex ), mnEndRowIndex( nEndIndex )
 {
     if( mnEndRowIndex < mnStartRowIndex )
         throw uno::RuntimeException();
@@ -76,7 +76,7 @@ SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const u
  * is mapped to WdRowAlignment in Word
  * @return the alignment
  */
-::sal_Int32 SAL_CALL SwVbaRows::getAlignment() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaRows::getAlignment()
 {
     sal_Int16 nAlignment = text::HoriOrientation::LEFT;
     uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
@@ -102,7 +102,7 @@ SwVbaRows::SwVbaRows( const uno::Reference< XHelperInterface >& xParent, const u
     return nRet;
 }
 
-void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment )
 {
     sal_Int16 nAlignment = text::HoriOrientation::LEFT;
     switch( _alignment )
@@ -126,7 +126,7 @@ void SAL_CALL SwVbaRows::setAlignment( ::sal_Int32 _alignment ) throw (uno::Runt
     xTableProps->setPropertyValue("HoriOrient", uno::makeAny( nAlignment ) );
 }
 
-uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages()
 {
     bool bAllowBreak = false;
     uno::Reference< container::XIndexAccess > xRowsAccess( mxTableRows, uno::UNO_QUERY_THROW );
@@ -148,7 +148,7 @@ uno::Any SAL_CALL SwVbaRows::getAllowBreakAcrossPages() throw (uno::RuntimeExcep
     return uno::makeAny( bAllowBreak );
 }
 
-void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakacrosspages ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakacrosspages )
 {
     bool bAllowBreak = false;
     _allowbreakacrosspages >>= bAllowBreak;
@@ -160,7 +160,7 @@ void SAL_CALL SwVbaRows::setAllowBreakAcrossPages( const uno::Any& _allowbreakac
     }
 }
 
-float SAL_CALL SwVbaRows::getSpaceBetweenColumns() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaRows::getSpaceBetweenColumns()
 {
     // just get the first spacing of the first cell
     uno::Reference< table::XCellRange > xCellRange( mxTextTable, uno::UNO_QUERY_THROW );
@@ -172,7 +172,7 @@ float SAL_CALL SwVbaRows::getSpaceBetweenColumns() throw (uno::RuntimeException,
     return static_cast< float >( Millimeter::getInPoints( nLeftBorderDistance + nRightBorderDistance ) );
 }
 
-void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns )
 {
     sal_Int32 nSpace = Millimeter::getInHundredthsOfOneMillimeter( _spacebetweencolumns ) / 2;
     uno::Reference< container::XIndexAccess > xColumnAccess( mxTextTable->getColumns(), uno::UNO_QUERY_THROW );
@@ -190,12 +190,12 @@ void SAL_CALL SwVbaRows::setSpaceBetweenColumns( float _spacebetweencolumns ) th
     }
 }
 
-void SAL_CALL SwVbaRows::Delete(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRows::Delete(  )
 {
     mxTableRows->removeByIndex( mnStartRowIndex, getCount() );
 }
 
-void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle )
 {
     uno::Reference< word::XColumns > xColumns( new SwVbaColumns( getParent(), mxContext, mxTextTable, mxTextTable->getColumns() ) );
     sal_Int32 nIndent = (sal_Int32)( LeftIndent );
@@ -228,7 +228,7 @@ void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle
     }
 }
 
-void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeException)
+void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent )
 {
     uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
     sal_Int32 nMargin = 0;
@@ -237,7 +237,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
     xTableProps->setPropertyValue("LeftMargin", uno::makeAny( nMargin ) );
 }
 
- void SwVbaRows::setIndentWithAdjustFirstColumn( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException)
+ void SwVbaRows::setIndentWithAdjustFirstColumn( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent )
  {
     sal_Int32 nIndex = 1;
     uno::Reference< XCollection > xCol( xColumns, uno::UNO_QUERY_THROW );
@@ -251,7 +251,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
  void SwVbaRows::setIndentWithAdjustProportional(
     const uno::Reference< word::XColumns >& xColumns,
     sal_Int32 indent
-) throw (uno::RuntimeException)
+)
  {
     // calculate the new width and get the proportion between old and new
     uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
@@ -283,7 +283,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
     xTableProps->setPropertyValue("Width", uno::makeAny( nNewWidth ) );
  }
 
- void SwVbaRows::setIndentWithAdjustSameWidth( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent ) throw (uno::RuntimeException)
+ void SwVbaRows::setIndentWithAdjustSameWidth( const uno::Reference< word::XColumns >& xColumns, sal_Int32 indent )
  {
     // calculate the new width and get the width of all columns
     uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
@@ -306,17 +306,17 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
     xTableProps->setPropertyValue("Width", uno::makeAny( nNewWidth ) );
  }
 
-void SAL_CALL SwVbaRows::Select(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaRows::Select(  )
 {
     SwVbaRow::SelectRow( getCurrentWordDoc(mxContext), mxTextTable, mnStartRowIndex, mnEndRowIndex );
 }
 
-::sal_Int32 SAL_CALL SwVbaRows::getCount() throw (uno::RuntimeException)
+::sal_Int32 SAL_CALL SwVbaRows::getCount()
 {
     return ( mnEndRowIndex - mnStartRowIndex + 1 );
 }
 
-uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not processed in this base class*/ )
 {
     sal_Int32 nIndex = 0;
     if( ( Index1 >>= nIndex ) )
@@ -332,12 +332,12 @@ uno::Any SAL_CALL SwVbaRows::Item( const uno::Any& Index1, const uno::Any& /*not
 
 // XEnumerationAccess
 uno::Type
-SwVbaRows::getElementType() throw (uno::RuntimeException)
+SwVbaRows::getElementType()
 {
     return cppu::UnoType<word::XRow>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaRows::createEnumeration() throw (uno::RuntimeException)
+SwVbaRows::createEnumeration()
 {
     return new RowsEnumWrapper( this, mxContext, mxTextTable );
 }
diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx
index 23d1f5765d99..96073d51b082 100644
--- a/sw/source/ui/vba/vbarows.hxx
+++ b/sw/source/ui/vba/vbarows.hxx
@@ -38,39 +38,39 @@ private:
 
 private:
     /// @throws css::uno::RuntimeException
-    void setIndentWithAdjustNone( sal_Int32 indent ) throw (css::uno::RuntimeException);
+    void setIndentWithAdjustNone( sal_Int32 indent );
     /// @throws css::uno::RuntimeException
-    void setIndentWithAdjustFirstColumn( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent ) throw (css::uno::RuntimeException);
+    void setIndentWithAdjustFirstColumn( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent );
     /// @throws css::uno::RuntimeException
-    void setIndentWithAdjustProportional( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent ) throw (css::uno::RuntimeException);
+    void setIndentWithAdjustProportional( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent );
     /// @throws css::uno::RuntimeException
-    void setIndentWithAdjustSameWidth( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent ) throw (css::uno::RuntimeException);
+    void setIndentWithAdjustSameWidth( const css::uno::Reference< ooo::vba::word::XColumns >& xColumns, sal_Int32 indent );
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows ) throw ( css::uno::RuntimeException );
+    SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows );
     /// @throws css::uno::RuntimeException
-    SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows, sal_Int32 nStarIndex, sal_Int32 nEndIndex ) throw ( css::uno::RuntimeException );
+    SwVbaRows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, const css::uno::Reference< css::table::XTableRows >& xTableRows, sal_Int32 nStarIndex, sal_Int32 nEndIndex );
 
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getAlignment() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getSpaceBetweenColumns() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getAlignment() override;
+    virtual void SAL_CALL setAlignment( ::sal_Int32 _alignment ) override;
+    virtual css::uno::Any SAL_CALL getAllowBreakAcrossPages() override;
+    virtual void SAL_CALL setAllowBreakAcrossPages( const css::uno::Any& _allowbreakacrosspages ) override;
+    virtual float SAL_CALL getSpaceBetweenColumns() override;
+    virtual void SAL_CALL setSpaceBetweenColumns( float _spacebetweencolumns ) override;
 
     // Methods
-    virtual void SAL_CALL Delete(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Select(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual void SAL_CALL SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) override;
+    virtual void SAL_CALL Select(  ) override;
 
     //XCollection
-    virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override;
+    virtual ::sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaRows_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx
index ff034e30e0f3..bce9b3769dc1 100644
--- a/sw/source/ui/vba/vbasection.cxx
+++ b/sw/source/ui/vba/vbasection.cxx
@@ -25,7 +25,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaSection::SwVbaSection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw ( uno::RuntimeException ) :
+SwVbaSection::SwVbaSection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) :
     SwVbaSection_BASE( rParent, rContext ), mxModel( xModel ), mxPageProps( xProps )
 {
 }
@@ -34,16 +34,16 @@ SwVbaSection::~SwVbaSection()
 {
 }
 
-sal_Bool SAL_CALL SwVbaSection::getProtectedForForms() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaSection::getProtectedForForms()
 {
     return false;
 }
 
-void SAL_CALL SwVbaSection::setProtectedForForms( sal_Bool /*_protectedforforms*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSection::setProtectedForForms( sal_Bool /*_protectedforforms*/ )
 {
 }
 
-uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, true ) );
     if ( index.hasValue() )
@@ -51,7 +51,7 @@ uno::Any SAL_CALL SwVbaSection::Headers( const uno::Any& index ) throw (uno::Run
     return uno::makeAny( xCol );
 }
 
-uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaHeadersFooters( this, mxContext, mxModel, mxPageProps, false ) );
     if ( index.hasValue() )
@@ -60,7 +60,7 @@ uno::Any SAL_CALL SwVbaSection::Footers( const uno::Any& index ) throw (uno::Run
 }
 
 uno::Any SAL_CALL
-SwVbaSection::PageSetup( ) throw (uno::RuntimeException, std::exception)
+SwVbaSection::PageSetup( )
 {
     return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) );
 }
diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx
index d34da89637be..e06043ff0507 100644
--- a/sw/source/ui/vba/vbasection.hxx
+++ b/sw/source/ui/vba/vbasection.hxx
@@ -32,17 +32,17 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaSection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw ( css::uno::RuntimeException );
+    SwVbaSection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps );
     virtual ~SwVbaSection() override;
 
     // Attributes
-    virtual sal_Bool SAL_CALL getProtectedForForms() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setProtectedForForms( sal_Bool _protectedforforms ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getProtectedForForms() override;
+    virtual void SAL_CALL setProtectedForForms( sal_Bool _protectedforforms ) override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL PageSetup(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Headers( const css::uno::Any& index ) override;
+    virtual css::uno::Any SAL_CALL Footers( const css::uno::Any& index ) override;
+    virtual css::uno::Any SAL_CALL PageSetup(  ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index bf5847574e4e..74f5b7bb05a0 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -37,12 +37,12 @@ class SectionEnumeration : public ::cppu::WeakImplHelper< container::XEnumeratio
 
 public:
     explicit SectionEnumeration( const XSectionVec& rVec ) : mxSections( rVec ), mIt( mxSections.begin() ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( mIt != mxSections.end() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( hasMoreElements() )
             return uno::makeAny( *mIt++ );
@@ -62,7 +62,7 @@ private:
 
 public:
     /// @throws uno::RuntimeException
-    SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
+    SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
     {
         uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( mxModel, uno::UNO_QUERY_THROW );
         uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
@@ -81,7 +81,7 @@ public:
     }
 
     /// @throws uno::RuntimeException
-    SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw (uno::RuntimeException) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
+    SectionCollectionHelper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel )
     {
         // Hacky implementation of Range.Sections, only support 1 section
         uno::Reference< beans::XPropertySet > xRangeProps( xTextRange, uno::UNO_QUERY_THROW );
@@ -91,11 +91,11 @@ public:
     }
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount(  ) override
     {
         return mxSections.size();
     }
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw css::lang::IndexOutOfBoundsException();
@@ -103,16 +103,16 @@ public:
         uno::Reference< beans::XPropertySet > xPageProps( mxSections[ Index ], uno::UNO_QUERY_THROW );
         return uno::makeAny( uno::Reference< word::XSection >( new SwVbaSection( mxParent,  mxContext, mxModel, xPageProps ) ) );
     }
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<word::XSection>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return true;
     }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new SectionEnumeration( mxSections );
     }
@@ -123,9 +123,9 @@ class SectionsEnumWrapper : public EnumerationHelperImpl
     uno::Reference< frame::XModel > mxModel;
 public:
     /// @throws uno::RuntimeException
-    SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ){}
+    SectionsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration,  const uno::Reference< frame::XModel >& xModel  ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mxModel( xModel ){}
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         uno::Reference< beans::XPropertySet > xPageProps( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
         return uno::makeAny( uno::Reference< word::XSection > ( new SwVbaSection( m_xParent, m_xContext, mxModel, xPageProps ) ) );
@@ -141,7 +141,7 @@ SwVbaSections::SwVbaSections( const uno::Reference< XHelperInterface >& xParent,
 }
 
 uno::Any SAL_CALL
-SwVbaSections::PageSetup( ) throw (uno::RuntimeException, std::exception)
+SwVbaSections::PageSetup( )
 {
     if( m_xIndexAccess->getCount() )
     {
@@ -154,13 +154,13 @@ SwVbaSections::PageSetup( ) throw (uno::RuntimeException, std::exception)
 
 // XEnumerationAccess
 uno::Type SAL_CALL
-SwVbaSections::getElementType() throw (uno::RuntimeException)
+SwVbaSections::getElementType()
 {
     return cppu::UnoType<word::XSection>::get();
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-SwVbaSections::createEnumeration() throw (uno::RuntimeException)
+SwVbaSections::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return new SectionsEnumWrapper( this, mxContext, xEnumAccess->createEnumeration(), mxModel );
diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx
index 46da02c1b281..e793ecbe7b7c 100644
--- a/sw/source/ui/vba/vbasections.hxx
+++ b/sw/source/ui/vba/vbasections.hxx
@@ -38,10 +38,10 @@ public:
     SwVbaSections( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextRange >& xTextRange );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
-    virtual css::uno::Any SAL_CALL PageSetup(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL PageSetup(  ) override;
 
     // SwVbaSections_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index bd942fa0d396..b5f4461d7819 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -69,7 +69,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaSelection::SwVbaSelection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) : SwVbaSelection_BASE( rParent, rContext ), mxModel( rModel )
+SwVbaSelection::SwVbaSelection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& rModel ) : SwVbaSelection_BASE( rParent, rContext ), mxModel( rModel )
 {
     mxTextViewCursor = word::getXTextViewCursor( mxModel );
 }
@@ -78,7 +78,7 @@ SwVbaSelection::~SwVbaSelection()
 {
 }
 
-uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( uno::RuntimeException )
+uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange()
 {
     uno::Reference< text::XTextRange > xTextRange;
     uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel->getCurrentSelection(), uno::UNO_QUERY_THROW );
@@ -99,7 +99,7 @@ uno::Reference< text::XTextRange > SwVbaSelection::GetSelectedRange() throw ( un
 }
 
 uno::Reference< word::XRange > SAL_CALL
-SwVbaSelection::getRange() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::getRange()
 {
     uno::Reference< text::XTextRange > xTextRange = GetSelectedRange();
     uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
@@ -107,26 +107,26 @@ SwVbaSelection::getRange() throw ( uno::RuntimeException, std::exception )
 }
 
 OUString SAL_CALL
-SwVbaSelection::getText() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::getText()
 {
     return getRange()->getText();
 }
 
 void SAL_CALL
-SwVbaSelection::setText( const OUString& rText ) throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::setText( const OUString& rText )
 {
     getRange()->setText( rText );
 }
 
 void SAL_CALL
-SwVbaSelection::TypeText( const OUString& rText ) throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::TypeText( const OUString& rText )
 {
     // FIXME: handle the property Options.ReplaceSelection, the default value is true
     setText( rText );
 }
 
 void SAL_CALL
-SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend )
 {
     sal_Int32 nUnit = word::WdUnits::wdLine;
     sal_Int32 nExtend = word::WdMovementType::wdMove;
@@ -161,7 +161,7 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw
 }
 
 void SAL_CALL
-SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend )
 {
     sal_Int32 nUnit = word::WdUnits::wdLine;
     sal_Int32 nExtend = word::WdMovementType::wdMove;
@@ -196,7 +196,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw (
 }
 
 void SAL_CALL
-SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count )
 {
     sal_Int32 nUnit = word::WdUnits::wdLine;
     sal_Int32 nCount = 0;
@@ -225,7 +225,7 @@ SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw (
 }
 
 void
-SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend, word::E_DIRECTION eDirection ) throw ( css::script::BasicErrorException, uno::RuntimeException )
+SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend, word::E_DIRECTION eDirection )
 {
     sal_Int32 nUnit = word::WdUnits::wdCharacter;
     sal_Int32 nCount = 1;
@@ -350,7 +350,6 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno::
 }
 
 void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection)
-    throw (css::script::BasicErrorException, uno::RuntimeException)
 {
     uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextTable > xTextTable;
@@ -401,7 +400,7 @@ void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection)
 }
 
 void SAL_CALL
-SwVbaSelection::MoveRight(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaSelection::MoveRight(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend)
 {
     sal_Int32 nCount = 1;
 
@@ -421,7 +420,7 @@ SwVbaSelection::MoveRight(const uno::Any& _unit, const uno::Any& _count, const u
 }
 
 void SAL_CALL
-SwVbaSelection::MoveLeft(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaSelection::MoveLeft(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend)
 {
     sal_Int32 nCount = 1;
     if( _count.hasValue() )
@@ -440,7 +439,7 @@ SwVbaSelection::MoveLeft(const uno::Any& _unit, const uno::Any& _count, const un
 }
 
 void SAL_CALL
-SwVbaSelection::MoveDown(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaSelection::MoveDown(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend)
 {
     sal_Int32 nCount = 1;
 
@@ -460,7 +459,7 @@ SwVbaSelection::MoveDown(const uno::Any& _unit, const uno::Any& _count, const un
 }
 
 void SAL_CALL
-SwVbaSelection::MoveUp(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaSelection::MoveUp(const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend)
 {
     sal_Int32 nCount = 1;
 
@@ -480,7 +479,7 @@ SwVbaSelection::MoveUp(const uno::Any& _unit, const uno::Any& _count, const uno:
 }
 
 void SAL_CALL
-SwVbaSelection::TypeParagraph() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::TypeParagraph()
 {
     // #FIXME: if the selection is an entire paragraph, it's replaced
     // by the new paragraph
@@ -491,71 +490,70 @@ SwVbaSelection::TypeParagraph() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-SwVbaSelection::InsertParagraph() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::InsertParagraph()
 {
     // #FIXME: the selection should include the new paragraph.
     getRange()->InsertParagraph();
 }
 
 void SAL_CALL
-SwVbaSelection::InsertParagraphBefore() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::InsertParagraphBefore()
 {
     getRange()->InsertParagraphBefore();
 }
 
 void SAL_CALL
-SwVbaSelection::InsertParagraphAfter() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::InsertParagraphAfter()
 {
     getRange()->InsertParagraphAfter();
 }
 
 uno::Reference< word::XParagraphFormat > SAL_CALL
-SwVbaSelection::getParagraphFormat() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::getParagraphFormat()
 {
     return getRange()->getParagraphFormat();
 }
 
 void SAL_CALL
-SwVbaSelection::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& rParagraphFormat ) throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& rParagraphFormat )
 {
     return getRange()->setParagraphFormat( rParagraphFormat );
 }
 
 uno::Reference< word::XFind > SAL_CALL
-SwVbaSelection::getFind() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::getFind()
 {
     uno::Reference< text::XTextRange > xTextRange = GetSelectedRange();
     return uno::Reference< word::XFind >( new SwVbaFind( this, mxContext, mxModel, xTextRange ) );
 }
 
 uno::Any SAL_CALL
-SwVbaSelection::getStyle() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::getStyle()
 {
     return getRange()->getStyle();
 }
 
 void SAL_CALL
-SwVbaSelection::setStyle( const uno::Any& rStyle ) throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::setStyle( const uno::Any& rStyle )
 {
     uno::Reference< beans::XPropertySet > xParaProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
     return SwVbaStyle::setStyle( xParaProps, rStyle );
 }
 
 uno::Reference< word::XFont > SAL_CALL
-SwVbaSelection::getFont() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::getFont()
 {
     return getRange()->getFont();
 }
 
 void SAL_CALL
-SwVbaSelection::TypeBackspace() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::TypeBackspace()
 {
     OUString url = ".uno:SwBackspace";
     dispatchRequests( mxModel,url );
 }
 
 uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _what, const uno::Any& _which, const uno::Any& _count, const uno::Any& _name )
-    throw (script::BasicErrorException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nWhat = 0;
     if( !( _what >>= nWhat ) )
@@ -660,17 +658,17 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w
     return getRange();
 }
 
-::sal_Int32 SAL_CALL SwVbaSelection::getLanguageID() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaSelection::getLanguageID()
 {
     return getRange()->getLanguageID();
 }
 
-void SAL_CALL SwVbaSelection::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::setLanguageID( ::sal_Int32 _languageid )
 {
     getRange()->setLanguageID( _languageid );
 }
 
-uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type )
 {
     uno::Any result;
     switch( _type )
@@ -772,13 +770,13 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run
     return result;
 }
 
-void SAL_CALL SwVbaSelection::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::InsertBreak( const uno::Any& _breakType )
 {
     getRange()->InsertBreak( _breakType );
 }
 
 uno::Any SAL_CALL
-SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+SwVbaSelection::Tables( const uno::Any& aIndex )
 {
     // Hacky implementation due to missing api ( and lack of knowledge )
     // we can only support a selection that is a single table
@@ -827,7 +825,7 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException, s
 }
 
 uno::Any SAL_CALL
-SwVbaSelection::Fields( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaSelection::Fields( const uno::Any& index )
 {
     uno::Reference< XCollection > xCol( new SwVbaFields( mxParent, mxContext, mxModel ) );
     if ( index.hasValue() )
@@ -836,7 +834,7 @@ SwVbaSelection::Fields( const uno::Any& index ) throw (uno::RuntimeException, st
 }
 
 uno::Reference< word::XHeaderFooter > SAL_CALL
-SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException, std::exception )
+SwVbaSelection::getHeaderFooter()
 {
     if( HeaderFooterHelper::isHeaderFooter( mxModel ) )
     {
@@ -855,7 +853,7 @@ SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException, std::exception
 }
 
 uno::Any SAL_CALL
-SwVbaSelection::ShapeRange( ) throw (uno::RuntimeException, std::exception)
+SwVbaSelection::ShapeRange( )
 {
     uno::Reference< drawing::XShapes > xShapes( mxModel->getCurrentSelection(), uno::UNO_QUERY );
     if ( !xShapes.is() )
@@ -871,38 +869,38 @@ SwVbaSelection::ShapeRange( ) throw (uno::RuntimeException, std::exception)
     return uno::makeAny( uno::Reference< msforms::XShapeRange >( new ScVbaShapeRange( this, mxContext, xShapesAccess, xDrawPage, mxModel ) ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaSelection::getStart() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaSelection::getStart()
 {
     return getRange()->getStart();
 }
 
-void SAL_CALL SwVbaSelection::setStart( ::sal_Int32 _start ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::setStart( ::sal_Int32 _start )
 {
     getRange()->setStart( _start );
 }
-::sal_Int32 SAL_CALL SwVbaSelection::getEnd() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaSelection::getEnd()
 {
     return getRange()->getEnd();
 }
 
-void SAL_CALL SwVbaSelection::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::setEnd( ::sal_Int32 _end )
 {
     getRange()->setEnd( _end );
 }
 
-void SAL_CALL SwVbaSelection::SelectRow() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::SelectRow()
 {
     uno::Reference< word::XRows > xRows( Rows( uno::Any() ), uno::UNO_QUERY_THROW );
     xRows->Select();
 }
 
-void SAL_CALL SwVbaSelection::SelectColumn() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::SelectColumn()
 {
     uno::Reference< word::XColumns > xColumns( Columns( uno::Any() ), uno::UNO_QUERY_THROW );
     xColumns->Select();
 }
 
-uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index )
 {
     OUString sTLName;
     OUString sBRName;
@@ -928,7 +926,7 @@ uno::Any SAL_CALL SwVbaSelection::Rows( const uno::Any& index ) throw (uno::Runt
     return uno::makeAny( xCol );
 }
 
-uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index )
 {
     OUString sTLName;
     OUString sBRName;
@@ -954,7 +952,7 @@ uno::Any SAL_CALL SwVbaSelection::Columns( const uno::Any& index ) throw (uno::R
     return uno::makeAny( xCol );
 }
 
-uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() throw( uno::RuntimeException )
+uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable()
 {
     uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextTable > xTextTable;
@@ -962,7 +960,7 @@ uno::Reference< text::XTextTable > SwVbaSelection::GetXTextTable() throw( uno::R
     return xTextTable;
 }
 
-bool SwVbaSelection::IsInTable() throw( uno::RuntimeException )
+bool SwVbaSelection::IsInTable()
 {
     uno::Reference< text::XTextTable > xTextTable = GetXTextTable();
     if( xTextTable.is() )
@@ -970,7 +968,7 @@ bool SwVbaSelection::IsInTable() throw( uno::RuntimeException )
     return false;
 }
 
-bool SwVbaSelection::HasSelection() throw( uno::RuntimeException )
+bool SwVbaSelection::HasSelection()
 {
     uno::Reference< text::XTextRange > xStart = mxTextViewCursor->getStart();
     uno::Reference< text::XTextRange > xEnd = mxTextViewCursor->getEnd();
@@ -980,7 +978,7 @@ bool SwVbaSelection::HasSelection() throw( uno::RuntimeException )
     return true;
 }
 
-void SwVbaSelection::GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw( uno::RuntimeException )
+void SwVbaSelection::GetSelectedCellRange( OUString& sTLName, OUString& sBRName )
 {
     uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextTable > xTextTable;
@@ -1011,7 +1009,7 @@ void SwVbaSelection::GetSelectedCellRange( OUString& sTLName, OUString& sBRName
     }
 }
 
-uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index )
 {
     OUString sTLName;
     OUString sBRName;
@@ -1042,25 +1040,25 @@ uno::Any SAL_CALL SwVbaSelection::Cells( const uno::Any& index ) throw (uno::Run
     return uno::makeAny( xCol );
 }
 
-void SAL_CALL SwVbaSelection::Copy(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::Copy(  )
 {
     OUString url = ".uno:Copy";
     dispatchRequests( mxModel,url );
 }
 
-void SAL_CALL SwVbaSelection::CopyAsPicture(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::CopyAsPicture(  )
 {
     // seems not support in Writer
     Copy();
 }
 
-void SAL_CALL SwVbaSelection::Paste(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::Paste(  )
 {
     OUString url = ".uno:Paste";
     dispatchRequests( mxModel,url );
 }
 
-void SAL_CALL SwVbaSelection::Collapse( const uno::Any& Direction ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::Collapse( const uno::Any& Direction )
 {
     if( word::gotoSelectedObjectAnchor( mxModel ) )
         return;
@@ -1089,7 +1087,7 @@ void SAL_CALL SwVbaSelection::Collapse( const uno::Any& Direction ) throw (uno::
     }
 }
 
-void SAL_CALL SwVbaSelection::WholeStory(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaSelection::WholeStory(  )
 {
     uno::Reference< text::XText > xText = word::getCurrentXText( mxModel );
     // FIXME: for i#7747,if the first line is a table, it fails to select all the contents in the story.
@@ -1114,13 +1112,12 @@ void SAL_CALL SwVbaSelection::WholeStory(  ) throw (uno::RuntimeException, std::
     mxTextViewCursor->gotoRange( xEnd, true );
 }
 
-sal_Bool SAL_CALL SwVbaSelection::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaSelection::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range )
 {
     return getRange()->InRange( Range );
 }
 
 void SAL_CALL SwVbaSelection::SplitTable()
-    throw (uno::RuntimeException, std::exception)
 {
     if( !IsInTable() )
         throw uno::RuntimeException();
@@ -1137,7 +1134,7 @@ void SAL_CALL SwVbaSelection::SplitTable()
 }
 
 uno::Any SAL_CALL
-SwVbaSelection::Paragraphs( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+SwVbaSelection::Paragraphs( const uno::Any& aIndex )
 {
     // Hacky implementation due to missing api ( and lack of knowledge )
     // we can only support a selection that is a single paragraph
diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx
index a9727ac3e7fd..fc995c150921 100644
--- a/sw/source/ui/vba/vbaselection.hxx
+++ b/sw/source/ui/vba/vbaselection.hxx
@@ -42,79 +42,75 @@ private:
 private:
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection );
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection )
-        throw (css::script::BasicErrorException, css::uno::RuntimeException);
+    void NextCell( sal_Int32 nCount, ooo::vba::word::E_DIRECTION eDirection );
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::text::XTextRange > GetSelectedRange() throw ( css::uno::RuntimeException );
+    css::uno::Reference< css::text::XTextRange > GetSelectedRange();
     /// @throws css::uno::RuntimeException
-    void GetSelectedCellRange( OUString& sTLName, OUString& sBRName ) throw ( css::uno::RuntimeException );
+    void GetSelectedCellRange( OUString& sTLName, OUString& sBRName );
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::text::XTextTable > GetXTextTable() throw ( css::uno::RuntimeException );
+    css::uno::Reference< css::text::XTextTable > GetXTextTable();
     /// @throws css::uno::RuntimeException
-    bool IsInTable() throw ( css::uno::RuntimeException );
+    bool IsInTable();
     /// @throws css::uno::RuntimeException
-    bool HasSelection() throw ( css::uno::RuntimeException );
+    bool HasSelection();
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
+    SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel );
     virtual ~SwVbaSelection() override;
 
     // Attribute
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL TypeText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL TypeParagraph() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL InsertParagraph() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL InsertParagraphBefore() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL InsertParagraphAfter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL TypeBackspace() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name )
-        throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL ShapeRange( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getStart() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStart( ::sal_Int32 _start ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getEnd() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnd( ::sal_Int32 _end ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SelectRow() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SelectColumn() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Copy(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL CopyAsPicture(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Paste(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL WholeStory(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SplitTable()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& rText ) override;
+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getRange() override;
+    virtual void SAL_CALL HomeKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) override;
+    virtual void SAL_CALL EndKey( const css::uno::Any& _unit, const css::uno::Any& _extend ) override;
+    virtual void SAL_CALL TypeText( const OUString& rText ) override;
+    virtual void SAL_CALL Delete( const css::uno::Any& _unit, const css::uno::Any& _count ) override;
+    virtual void SAL_CALL MoveRight( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) override;
+    virtual void SAL_CALL MoveLeft( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) override;
+    virtual void SAL_CALL MoveDown( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) override;
+    virtual void SAL_CALL MoveUp( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend ) override;
+    virtual void SAL_CALL TypeParagraph() override;
+    virtual void SAL_CALL InsertParagraph() override;
+    virtual void SAL_CALL InsertParagraphBefore() override;
+    virtual void SAL_CALL InsertParagraphAfter() override;
+    virtual css::uno::Reference< ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() override;
+    virtual void SAL_CALL setParagraphFormat( const css::uno::Reference< ooo::vba::word::XParagraphFormat >& rParagraphFormat ) override;
+    virtual css::uno::Reference< ooo::vba::word::XFind > SAL_CALL getFind() override;
+    virtual css::uno::Any SAL_CALL getStyle() override;
+    virtual void SAL_CALL setStyle( const css::uno::Any& _xStyle ) override;
+    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() override;
+    virtual void SAL_CALL TypeBackspace() override;
+    virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL GoTo( const css::uno::Any& _what, const css::uno::Any& _which, const css::uno::Any& _count, const css::uno::Any& _name ) override;
+    virtual ::sal_Int32 SAL_CALL getLanguageID( ) override;
+    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) override;
+    virtual css::uno::Any SAL_CALL Information( sal_Int32 _type ) override;
+    virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) override;
+    virtual css::uno::Any SAL_CALL Tables( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Reference< ooo::vba::word::XHeaderFooter > SAL_CALL getHeaderFooter() override;
+    virtual css::uno::Any SAL_CALL ShapeRange( ) override;
+    virtual ::sal_Int32 SAL_CALL getStart() override;
+    virtual void SAL_CALL setStart( ::sal_Int32 _start ) override;
+    virtual ::sal_Int32 SAL_CALL getEnd() override;
+    virtual void SAL_CALL setEnd( ::sal_Int32 _end ) override;
+    virtual void SAL_CALL SelectRow() override;
+    virtual void SAL_CALL SelectColumn() override;
+    virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Cells( const css::uno::Any& aIndex ) override;
+    virtual void SAL_CALL Copy(  ) override;
+    virtual void SAL_CALL CopyAsPicture(  ) override;
+    virtual void SAL_CALL Paste(  ) override;
+    virtual void SAL_CALL Collapse( const css::uno::Any& Direction ) override;
+    virtual void SAL_CALL WholeStory(  ) override;
+    virtual sal_Bool SAL_CALL InRange( const css::uno::Reference< ::ooo::vba::word::XRange >& Range ) override;
+    virtual void SAL_CALL SplitTable() override;
+    virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index ad9c8de36811..663f0be39a43 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -31,47 +31,47 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel>& xModel, const uno::Reference< beans::XPropertySet >& _xPropertySet ) throw ( script::BasicErrorException, uno::RuntimeException ) : SwVbaStyle_BASE( xParent, xContext ) , mxModel( xModel ), mxStyleProps( _xPropertySet )
+SwVbaStyle::SwVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel>& xModel, const uno::Reference< beans::XPropertySet >& _xPropertySet ) : SwVbaStyle_BASE( xParent, xContext ) , mxModel( xModel ), mxStyleProps( _xPropertySet )
 {
     mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW );
 }
 
 void SAL_CALL
-SwVbaStyle::setName( const OUString& Name ) throw (uno::RuntimeException, std::exception)
+SwVbaStyle::setName( const OUString& Name )
 {
     mxStyle->setName(Name);
 }
 
 OUString SAL_CALL
-SwVbaStyle::getName() throw (uno::RuntimeException, std::exception)
+SwVbaStyle::getName()
 {
     return mxStyle->getName();
 }
 
-sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps ) throw (uno::RuntimeException, std::exception)
+sal_Int32 SwVbaStyle::getLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps )
 {
     lang::Locale aLocale;
     xTCProps->getPropertyValue("CharLocale") >>= aLocale;
     return LanguageTag::convertToLanguageType( aLocale, false);
 }
 
-void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (uno::RuntimeException)
+void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTCProps, sal_Int32 _languageid )
 {
     lang::Locale aLocale = LanguageTag( static_cast<LanguageType>(_languageid) ).getLocale();
     xTCProps->setPropertyValue("CharLocale", uno::makeAny( aLocale ) ) ;
 }
 
-::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID()
 {
     return getLanguageID( mxStyleProps );
 }
 
-void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid )
 {
     setLanguageID( mxStyleProps, _languageid );
 }
 
-::sal_Int32 SAL_CALL SwVbaStyle::getType() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaStyle::getType()
 {
     sal_Int32 nType = word::WdStyleType::wdStyleTypeParagraph;
     uno::Reference< lang::XServiceInfo > xServiceInfo( mxStyle, uno::UNO_QUERY_THROW );
@@ -85,13 +85,13 @@ void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::R
 }
 
 uno::Reference< word::XFont > SAL_CALL
-SwVbaStyle::getFont() throw ( uno::RuntimeException, std::exception )
+SwVbaStyle::getFont()
 {
     VbaPalette aColors;
     return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), mxStyleProps );
 }
 
-void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Any& rStyle )throw (uno::RuntimeException)
+void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Any& rStyle )
 {
     OUString sStyle;
     uno::Reference< word::XStyle > xStyle;
@@ -113,19 +113,19 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro
     throw uno::RuntimeException();
 }
 
-OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL SwVbaStyle::getNameLocal()
 {
     OUString sNameLocal;
     mxStyleProps->getPropertyValue("DisplayName") >>= sNameLocal;
     return sNameLocal;
 }
 
-void SAL_CALL SwVbaStyle::setNameLocal( const OUString& _namelocal ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaStyle::setNameLocal( const OUString& _namelocal )
 {
     mxStyleProps->setPropertyValue("DisplayName", uno::makeAny( _namelocal ) );
 }
 
-uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat() throw (uno::RuntimeException, std::exception)
+uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat()
 {
     if( word::WdStyleType::wdStyleTypeParagraph == getType() )
     {
@@ -138,19 +138,19 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat
     }
 }
 
-sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaStyle::getAutomaticallyUpdate()
 {
     bool isAutoUpdate = false;
     mxStyleProps->getPropertyValue("IsAutoUpdate") >>= isAutoUpdate;
     return isAutoUpdate;
 }
 
-void SAL_CALL SwVbaStyle::setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaStyle::setAutomaticallyUpdate( sal_Bool _automaticallyupdate )
 {
     mxStyleProps->setPropertyValue("IsAutoUpdate", uno::makeAny( _automaticallyupdate ) );
 }
 
-uno::Any SAL_CALL SwVbaStyle::getBaseStyle() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaStyle::getBaseStyle()
 {
     // ParentStyle
     OUString sBaseStyle;
@@ -166,7 +166,7 @@ uno::Any SAL_CALL SwVbaStyle::getBaseStyle() throw (uno::RuntimeException, std::
     }
 }
 
-void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle )
 {
     uno::Reference< word::XStyle > xStyle;
     _basestyle >>= xStyle;
@@ -181,7 +181,7 @@ void SAL_CALL SwVbaStyle::setBaseStyle( const uno::Any& _basestyle ) throw (uno:
     }
 }
 
-uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle()
 {
     //FollowStyle
     OUString sFollowStyle;
@@ -197,7 +197,7 @@ uno::Any SAL_CALL SwVbaStyle::getNextParagraphStyle() throw (uno::RuntimeExcepti
     }
 }
 
-void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphstyle ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphstyle )
 {
     uno::Reference< word::XStyle > xStyle;
     _nextparagraphstyle >>= xStyle;
@@ -212,7 +212,7 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs
     }
 }
 
-::sal_Int32 SAL_CALL SwVbaStyle::getListLevelNumber() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaStyle::getListLevelNumber()
 {
     sal_Int16 nNumberingLevel = 0;
     mxStyleProps->getPropertyValue("NumberingLevel") >>= nNumberingLevel;
diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx
index 61675c23895f..334fd7525fc8 100644
--- a/sw/source/ui/vba/vbastyle.hxx
+++ b/sw/source/ui/vba/vbastyle.hxx
@@ -38,35 +38,35 @@ private:
 public:
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    SwVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
+    SwVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet );
 
     /// @throws css::uno::RuntimeException
-    static void setStyle( const css::uno::Reference< css::beans::XPropertySet >& xParaProps, const css::uno::Any& xStyle ) throw (css::uno::RuntimeException);
+    static void setStyle( const css::uno::Reference< css::beans::XPropertySet >& xParaProps, const css::uno::Any& xStyle );
     /// @throws css::uno::RuntimeException
-    static sal_Int32 getLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps ) throw (css::uno::RuntimeException, std::exception);
+    static sal_Int32 getLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps );
     /// @throws css::uno::RuntimeException
-    static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException);
+    static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid );
 
     // Attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getLanguageID( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutomaticallyUpdate() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getBaseStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getNextParagraphStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getListLevelNumber() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& Name ) override;
+    virtual ::sal_Int32 SAL_CALL getLanguageID( ) override;
+    virtual void SAL_CALL setLanguageID( ::sal_Int32 _languageid ) override;
+    virtual ::sal_Int32 SAL_CALL getType() override;
+    virtual css::uno::Reference< ooo::vba::word::XFont > SAL_CALL getFont() override;
+    virtual OUString SAL_CALL getNameLocal() override;
+    virtual void SAL_CALL setNameLocal( const OUString& _namelocal ) override;
+    virtual css::uno::Reference< ::ooo::vba::word::XParagraphFormat > SAL_CALL getParagraphFormat() override;
+    virtual sal_Bool SAL_CALL getAutomaticallyUpdate() override;
+    virtual void SAL_CALL setAutomaticallyUpdate( sal_Bool _automaticallyupdate ) override;
+    virtual css::uno::Any SAL_CALL getBaseStyle() override;
+    virtual void SAL_CALL setBaseStyle( const css::uno::Any& _basestyle ) override;
+    virtual css::uno::Any SAL_CALL getNextParagraphStyle() override;
+    virtual void SAL_CALL setNextParagraphStyle( const css::uno::Any& _nextparagraphstyle ) override;
+    virtual ::sal_Int32 SAL_CALL getListLevelNumber() override;
 
     //XDefaultProperty
-    virtual OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Name"); }
+    virtual OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Name"); }
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index b50a247407d5..8d51c715dde4 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -174,20 +174,20 @@ public:
         mxParaStyles.set( xStyleFamilies->getByName("ParagraphStyles"), uno::UNO_QUERY_THROW  );
     }
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override { return  cppu::UnoType<style::XStyle>::get(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override { return getCount() > 0; }
+    virtual uno::Type SAL_CALL getElementType(  ) override { return  cppu::UnoType<style::XStyle>::get(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return getCount() > 0; }
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName(aName) )
             throw container::NoSuchElementException();
         return cachePos;
     }
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         return mxParaStyles->getElementNames();
     }
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         // search in the MSOStyleName table first
         for( const MSOStyleNameTable* pTable = aMSOStyleNameTable; pTable->pMSOStyleName != nullptr; pTable++ )
@@ -227,12 +227,12 @@ public:
     }
 
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         uno::Reference< container::XIndexAccess > xIndexAccess( mxParaStyles, uno::UNO_QUERY_THROW );
         return xIndexAccess->getCount();
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw lang::IndexOutOfBoundsException();
@@ -241,7 +241,7 @@ public:
         return xIndexAccess->getByIndex( Index );
     }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         throw uno::RuntimeException("Not implemented" );
     }
@@ -253,12 +253,12 @@ class StylesEnumWrapper : public EnumerationHelper_BASE
     sal_Int32 nIndex;
 public:
     explicit StylesEnumWrapper( SwVbaStyles* _pStyles ) : pStyles( _pStyles ), nIndex( 1 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex <= pStyles->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex <= pStyles->getCount() )
             return pStyles->Item( uno::makeAny( nIndex++ ), uno::Any() );
@@ -267,7 +267,6 @@ public:
 };
 
 SwVbaStyles::SwVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel )
-    throw ( script::BasicErrorException, uno::RuntimeException )
     : SwVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new StyleCollectionHelper( xModel )  ) ), mxModel( xModel )
 {
     mxMSF.set( mxModel, uno::UNO_QUERY_THROW );
@@ -281,20 +280,19 @@ SwVbaStyles::createCollectionObject(const uno::Any& aObject)
 }
 
 uno::Type SAL_CALL
-SwVbaStyles::getElementType() throw (uno::RuntimeException)
+SwVbaStyles::getElementType()
 {
     return cppu::UnoType<word::XStyle>::get();
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-SwVbaStyles::createEnumeration() throw (uno::RuntimeException)
+SwVbaStyles::createEnumeration()
 {
     return new StylesEnumWrapper( this );
 }
 
 uno::Any SAL_CALL
 SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 )
-    throw (lang::IndexOutOfBoundsException, script::BasicErrorException, uno::RuntimeException)
 {
     //handle WdBuiltinStyle
     sal_Int32 nIndex = 0;
diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx
index ec78f17326a0..390225cd08c4 100644
--- a/sw/source/ui/vba/vbastyles.hxx
+++ b/sw/source/ui/vba/vbastyles.hxx
@@ -31,15 +31,12 @@ class SwVbaStyles: public SwVbaStyles_BASE
 public:
     /// @throws css::script::BasicErrorException
     /// @throws css::uno::RuntimeException
-    SwVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel )
-        throw ( css::script::BasicErrorException, css::uno::RuntimeException );
+    SwVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
 
-    virtual css::uno::Any SAL_CALL Item(const css::uno::Any& Index1, const css::uno::Any& Index2)
-        throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException,
-               css::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL Item(const css::uno::Any& Index1, const css::uno::Any& Index2) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject(const css::uno::Any&) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index ffa0cb239d5b..f02ea0c243ba 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -176,7 +176,7 @@ SwVbaSystem::~SwVbaSystem()
 }
 
 sal_Int32 SAL_CALL
-SwVbaSystem::getCursor() throw (uno::RuntimeException, std::exception)
+SwVbaSystem::getCursor()
 {
     PointerStyle nPointerStyle = getPointerStyle( getCurrentWordDoc(mxContext) );
 
@@ -196,7 +196,7 @@ SwVbaSystem::getCursor() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, std::exception)
+SwVbaSystem::setCursor( sal_Int32 _cursor )
 {
     try
     {
@@ -240,7 +240,7 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException, std::e
 }
 
 uno::Any SAL_CALL
-SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( uno::RuntimeException, std::exception )
+SwVbaSystem::PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey )
 {
     // FIXME: need to detect whether it is a relative file path
     // we need to detect if this is a URL, if not then assume it's a file path
diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx
index ae41b838cbdf..9c5921f3de16 100644
--- a/sw/source/ui/vba/vbasystem.hxx
+++ b/sw/source/ui/vba/vbasystem.hxx
@@ -51,9 +51,9 @@ public:
     virtual ~SwVbaSystem() override;
 
     // XSystem
-    virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCursor() override;
+    virtual void SAL_CALL setCursor( sal_Int32 _cursor ) override;
+    virtual css::uno::Any SAL_CALL PrivateProfileString( const OUString& rFilename, const OUString& rSection, const OUString& rKey ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx
index 64fa044f7fcb..488ba6583a1d 100644
--- a/sw/source/ui/vba/vbatable.cxx
+++ b/sw/source/ui/vba/vbatable.cxx
@@ -34,19 +34,19 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaTable::SwVbaTable(  const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rDocument, const  uno::Reference< text::XTextTable >& xTextTable) throw ( uno::RuntimeException ) : SwVbaTable_BASE( rParent, rContext ), mxTextDocument( rDocument )
+SwVbaTable::SwVbaTable(  const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rDocument, const  uno::Reference< text::XTextTable >& xTextTable) : SwVbaTable_BASE( rParent, rContext ), mxTextDocument( rDocument )
 {
     mxTextTable.set( xTextTable, uno::UNO_QUERY_THROW );
 }
 
 uno::Reference< word::XRange > SAL_CALL
-SwVbaTable::Range(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaTable::Range(  )
 {
     return new SwVbaRange( mxParent, mxContext, mxTextDocument, mxTextTable->getAnchor() );
 }
 
 void SAL_CALL
-SwVbaTable::Select(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaTable::Select(  )
 {
     uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
     uno::Reference< frame::XController > xController = xModel->getCurrentController();
@@ -64,21 +64,21 @@ SwVbaTable::Select(  ) throw (script::BasicErrorException, uno::RuntimeException
 }
 
 void SAL_CALL
-SwVbaTable::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaTable::Delete(  )
 {
     uno::Reference< table::XTableRows > xRows( mxTextTable->getRows() );
     xRows->removeByIndex( 0, xRows->getCount() );
 }
 
 OUString SAL_CALL
-SwVbaTable::getName() throw (uno::RuntimeException, std::exception)
+SwVbaTable::getName()
 {
     uno::Reference< container::XNamed > xNamed( mxTextTable, uno::UNO_QUERY_THROW );
     return xNamed->getName();
 }
 
 uno::Any SAL_CALL
-SwVbaTable::Borders( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaTable::Borders( const uno::Any& index )
 {
     uno::Reference< table::XCellRange > aCellRange( mxTextTable, uno::UNO_QUERY_THROW );
     VbaPalette aPalette;
@@ -89,7 +89,7 @@ SwVbaTable::Borders( const uno::Any& index ) throw (uno::RuntimeException, std::
 }
 
 uno::Any SAL_CALL
-SwVbaTable::Rows( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaTable::Rows( const uno::Any& index )
 {
     uno::Reference< table::XTableRows > xTableRows( mxTextTable->getRows(), uno::UNO_QUERY_THROW );
     uno::Reference< XCollection > xCol( new SwVbaRows( this, mxContext, mxTextTable, xTableRows ) );
@@ -99,7 +99,7 @@ SwVbaTable::Rows( const uno::Any& index ) throw (uno::RuntimeException, std::exc
 }
 
 uno::Any SAL_CALL
-SwVbaTable::Columns( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaTable::Columns( const uno::Any& index )
 {
     uno::Reference< table::XTableColumns > xTableColumns( mxTextTable->getColumns(), uno::UNO_QUERY_THROW );
     uno::Reference< XCollection > xCol( new SwVbaColumns( this, mxContext, mxTextTable, xTableColumns ) );
diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx
index ecfae7a37367..37bdd332f810 100644
--- a/sw/source/ui/vba/vbatable.hxx
+++ b/sw/source/ui/vba/vbatable.hxx
@@ -33,14 +33,14 @@ class SwVbaTable : public SwVbaTable_BASE
     css::uno::Reference< css::text::XTextTable > mxTextTable;
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable) throw ( css::uno::RuntimeException);
-    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Select(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
+    SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable);
+    virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range(  ) override;
+    virtual void SAL_CALL Select(  ) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual OUString SAL_CALL getName( ) override;
+    virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Rows( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 19d333b660e9..db7d62caddfb 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -26,12 +26,12 @@ using namespace ::ooo::vba;
 
 #define UNO_TABLE_COLUMN_SUM    10000
 
-SwVbaTableHelper::SwVbaTableHelper( const uno::Reference< text::XTextTable >& xTextTable ) throw (uno::RuntimeException) : mxTextTable( xTextTable )
+SwVbaTableHelper::SwVbaTableHelper( const uno::Reference< text::XTextTable >& xTextTable ) : mxTextTable( xTextTable )
 {
     pTable = GetSwTable( mxTextTable );
 }
 
-SwTable* SwVbaTableHelper::GetSwTable( const uno::Reference< text::XTextTable >& xTextTable ) throw (uno::RuntimeException)
+SwTable* SwVbaTableHelper::GetSwTable( const uno::Reference< text::XTextTable >& xTextTable )
 {
     uno::Reference< lang::XUnoTunnel > xTunnel( xTextTable, uno::UNO_QUERY_THROW );
     SwXTextTable* pXTextTable = reinterpret_cast< SwXTextTable * >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SwXTextTable::getUnoTunnelId())));
@@ -46,7 +46,7 @@ SwTable* SwVbaTableHelper::GetSwTable( const uno::Reference< text::XTextTable >&
     return pTable;
 }
 
-sal_Int32 SwVbaTableHelper::getTabColumnsCount( sal_Int32 nRowIndex ) throw (uno::RuntimeException)
+sal_Int32 SwVbaTableHelper::getTabColumnsCount( sal_Int32 nRowIndex )
 {
     sal_Int32 nRet = 0;
     if(!pTable->IsTableComplex())
@@ -58,7 +58,7 @@ sal_Int32 SwVbaTableHelper::getTabColumnsCount( sal_Int32 nRowIndex ) throw (uno
     return nRet;
 }
 
-sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( ) throw (uno::RuntimeException)
+sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( )
 {
     sal_Int32 nRet = 0;
     sal_Int32 nRowCount = pTable->GetTabLines().size();
@@ -71,7 +71,7 @@ sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( ) throw (uno::RuntimeExceptio
     return nRet;
 }
 
-sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& rCellName ) throw (uno::RuntimeException)
+sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& rCellName )
 {
     sal_Int32 nRet = 0;
     SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox( rCellName ));
@@ -85,7 +85,7 @@ sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& rCellName ) throw (u
     return nRet;
 }
 
-sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& rCellName ) throw (uno::RuntimeException)
+sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& rCellName )
 {
     const SwTableBox* pBox = pTable->GetTableBox( rCellName );
     if( !pBox )
@@ -114,7 +114,7 @@ OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol )
     return sRet;
 }
 
-sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException)
+sal_Int32 SwVbaTableHelper::getTableWidth( )
 {
     sal_Int32 nWidth = 0;
     bool isWidthRelatvie = false;
@@ -131,7 +131,7 @@ sal_Int32 SwVbaTableHelper::getTableWidth( ) throw (uno::RuntimeException)
     return nWidth;
 }
 
-SwTableBox* SwVbaTableHelper::GetTabBox( sal_Int32 nCol, sal_Int32 nRow ) throw (css::uno::RuntimeException)
+SwTableBox* SwVbaTableHelper::GetTabBox( sal_Int32 nCol, sal_Int32 nRow )
 {
     SwTableLines& rLines = pTable->GetTabLines();
     sal_Int32 nRowCount = rLines.size();
@@ -182,7 +182,7 @@ sal_Int32 SwVbaTableHelper::GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum)
     return i - 1;
 }
 
-sal_Int32 SwVbaTableHelper::GetColWidth( sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly ) throw (uno::RuntimeException)
+sal_Int32 SwVbaTableHelper::GetColWidth( sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly )
 {
     SwTableBox* pStart = GetTabBox( nCol, nRow );
     SwTabCols aCols;
@@ -194,7 +194,7 @@ sal_Int32 SwVbaTableHelper::GetColWidth( sal_Int32 nCol, sal_Int32 nRow, bool bC
     return ( sal_Int32 )Millimeter::getInPoints( static_cast<int>(dAbsWidth) );
 }
 
-sal_Int32 SwVbaTableHelper::GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) throw (uno::RuntimeException)
+sal_Int32 SwVbaTableHelper::GetColWidth( SwTabCols& rCols, sal_Int32 nNum )
 {
     SwTwips nWidth = 0;
 
@@ -230,7 +230,7 @@ sal_Int32 SwVbaTableHelper::GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) thro
     return nWidth;
 }
 
-void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly ) throw (css::uno::RuntimeException, std::exception)
+void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow, bool bCurRowOnly )
 {
     double dAbsWidth = Millimeter::getInHundredthsOfOneMillimeter( _width );
     sal_Int32 nTableWidth = getTableWidth( );
diff --git a/sw/source/ui/vba/vbatablehelper.hxx b/sw/source/ui/vba/vbatablehelper.hxx
index 4888785edda0..42aeaaabe1bd 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -32,34 +32,34 @@ private:
 
 private:
     /// @throws css::uno::RuntimeException
-    SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow ) throw (css::uno::RuntimeException);
+    SwTableBox* GetTabBox( sal_Int32 nCol, sal_Int32 nRow );
     void    InitTabCols( SwTabCols& rCols, const SwTableBox *pStart, bool bCurRowOnly );
     static sal_Int32 GetRightSeparator( SwTabCols& rCols, sal_Int32 nNum);
     static sal_Int32 GetColCount( SwTabCols& rCols );
     /// @throws css::uno::RuntimeException
-    static sal_Int32 GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) throw (css::uno::RuntimeException);
+    static sal_Int32 GetColWidth( SwTabCols& rCols, sal_Int32 nNum );
 
 public:
     /// @throws css::uno::RuntimeException
-    explicit SwVbaTableHelper( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException);
+    explicit SwVbaTableHelper( const css::uno::Reference< css::text::XTextTable >& xTextTable );
     /// @throws css::uno::RuntimeException
-    sal_Int32 getTabColumnsCount( sal_Int32 nRowIndex ) throw (css::uno::RuntimeException);
+    sal_Int32 getTabColumnsCount( sal_Int32 nRowIndex );
     /// @throws css::uno::RuntimeException
-    sal_Int32 getTabColumnsMaxCount( ) throw (css::uno::RuntimeException);
+    sal_Int32 getTabColumnsMaxCount( );
     /// @throws css::uno::RuntimeException
-    sal_Int32 getTabRowIndex( const OUString& sCellName ) throw (css::uno::RuntimeException);
+    sal_Int32 getTabRowIndex( const OUString& sCellName );
     /// @throws css::uno::RuntimeException
-    sal_Int32 getTabColIndex( const OUString& sCellName ) throw (css::uno::RuntimeException);
+    sal_Int32 getTabColIndex( const OUString& sCellName );
     /// @throws css::uno::RuntimeException
-    sal_Int32 getTableWidth( ) throw (css::uno::RuntimeException);
+    sal_Int32 getTableWidth( );
 
     /// @throws css::uno::RuntimeException
-    sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly  = false ) throw (css::uno::RuntimeException);
+    sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly  = false );
     /// @throws css::uno::RuntimeException
-    void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly  = false ) throw (css::uno::RuntimeException, std::exception);
+    void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0, bool bCurRowOnly  = false );
 
     /// @throws css::uno::RuntimeException
-    static SwTable* GetSwTable( const css::uno::Reference< css::text::XTextTable >& xTextTable ) throw (css::uno::RuntimeException);
+    static SwTable* GetSwTable( const css::uno::Reference< css::text::XTextTable >& xTextTable );
     static OUString getColumnStr( sal_Int32 nCol );
 };
 
diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx
index 34c177b10b07..778c8cfdf5d6 100644
--- a/sw/source/ui/vba/vbatableofcontents.cxx
+++ b/sw/source/ui/vba/vbatableofcontents.cxx
@@ -25,7 +25,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaTableOfContents::SwVbaTableOfContents( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDoc, const uno::Reference< text::XDocumentIndex >& xDocumentIndex ) throw ( uno::RuntimeException ) :
+SwVbaTableOfContents::SwVbaTableOfContents( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& xDoc, const uno::Reference< text::XDocumentIndex >& xDocumentIndex ) :
     SwVbaTableOfContents_BASE( rParent, rContext ), mxTextDocument( xDoc ), mxDocumentIndex( xDocumentIndex )
 {
     mxTocProps.set( mxDocumentIndex, uno::UNO_QUERY_THROW );
@@ -35,60 +35,60 @@ SwVbaTableOfContents::~SwVbaTableOfContents()
 {
 }
 
-::sal_Int32 SAL_CALL SwVbaTableOfContents::getLowerHeadingLevel() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaTableOfContents::getLowerHeadingLevel()
 {
     sal_Int16 nLevel = 0;
     mxTocProps->getPropertyValue("Level") >>= nLevel;
     return nLevel;
 }
 
-void SAL_CALL SwVbaTableOfContents::setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaTableOfContents::setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel )
 {
     mxTocProps->setPropertyValue("Level", uno::makeAny( sal_Int8( _lowerheadinglevel ) ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaTableOfContents::getTabLeader() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaTableOfContents::getTabLeader()
 {
     // not support in Writer
     return word::WdTabLeader::wdTabLeaderDots;
 }
 
-void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaTableOfContents::setTabLeader( ::sal_Int32 /*_tableader*/ )
 {
     // not support in Writer
 }
 
-sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaTableOfContents::getUseFields()
 {
     bool bUseFields = false;
     mxTocProps->getPropertyValue("CreateFromMarks") >>= bUseFields;
     return bUseFields;
 }
 
-void SAL_CALL SwVbaTableOfContents::setUseFields( sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaTableOfContents::setUseFields( sal_Bool _useFields )
 {
     mxTocProps->setPropertyValue("CreateFromMarks", uno::makeAny( _useFields ) );
 }
 
-sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwVbaTableOfContents::getUseOutlineLevels()
 {
     bool bUseOutlineLevels = false;
     mxTocProps->getPropertyValue("CreateFromOutline") >>= bUseOutlineLevels;
     return bUseOutlineLevels;
 }
 
-void SAL_CALL SwVbaTableOfContents::setUseOutlineLevels( sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaTableOfContents::setUseOutlineLevels( sal_Bool _useOutlineLevels )
 {
     mxTocProps->setPropertyValue("CreateFromOutline", uno::makeAny( _useOutlineLevels ) );
 }
 
-void SAL_CALL SwVbaTableOfContents::Delete(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaTableOfContents::Delete(  )
 {
     uno::Reference< text::XTextContent > xTextContent( mxDocumentIndex, uno::UNO_QUERY_THROW );
     mxTextDocument->getText()->removeTextContent( xTextContent );
 }
 
-void SAL_CALL SwVbaTableOfContents::Update(  ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaTableOfContents::Update(  )
 {
     mxDocumentIndex->update();
 }
diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx
index 11071043193c..effdd6c930fb 100644
--- a/sw/source/ui/vba/vbatableofcontents.hxx
+++ b/sw/source/ui/vba/vbatableofcontents.hxx
@@ -35,22 +35,22 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaTableOfContents( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDoc, const css::uno::Reference< css::text::XDocumentIndex >& xDocumentIndex ) throw ( css::uno::RuntimeException );
+    SwVbaTableOfContents( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& xDoc, const css::uno::Reference< css::text::XDocumentIndex >& xDocumentIndex );
     virtual ~SwVbaTableOfContents() override;
 
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getTabLeader() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getUseFields() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setUseFields( sal_Bool _useFields ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getUseOutlineLevels() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setUseOutlineLevels( sal_Bool _useOutlineLevels ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getLowerHeadingLevel() override;
+    virtual void SAL_CALL setLowerHeadingLevel( ::sal_Int32 _lowerheadinglevel ) override;
+    virtual ::sal_Int32 SAL_CALL getTabLeader() override;
+    virtual void SAL_CALL setTabLeader( ::sal_Int32 _tableader ) override;
+    virtual sal_Bool SAL_CALL getUseFields() override;
+    virtual void SAL_CALL setUseFields( sal_Bool _useFields ) override;
+    virtual sal_Bool SAL_CALL getUseOutlineLevels() override;
+    virtual void SAL_CALL setUseOutlineLevels( sal_Bool _useOutlineLevels ) override;
 
     // Methods
-    virtual void SAL_CALL Delete(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Update(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual void SAL_CALL Update(  ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index 3c0e8343f3c7..545f99fc4c1b 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -83,11 +83,11 @@ public:
         cachePos = mxTables.begin();
     }
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount(  ) override
     {
         return mxTables.size();
     }
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw lang::IndexOutOfBoundsException();
@@ -95,17 +95,17 @@ public:
         return uno::makeAny( xTable );
     }
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override { return  cppu::UnoType<text::XTextTable>::get(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override { return getCount() > 0 ; }
+    virtual uno::Type SAL_CALL getElementType(  ) override { return  cppu::UnoType<text::XTextTable>::get(); }
+    virtual sal_Bool SAL_CALL hasElements(  ) override { return getCount() > 0 ; }
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName(aName) )
             throw container::NoSuchElementException();
         uno::Reference< text::XTextTable > xTable( *cachePos, uno::UNO_QUERY_THROW );
         return uno::makeAny( xTable );
     }
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         uno::Sequence< OUString > sNames( mxTables.size() );
         OUString* pString = sNames.getArray();
@@ -118,7 +118,7 @@ public:
         }
         return sNames;
     }
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         cachePos = mxTables.begin();
         XTextTableVec::iterator it_end = mxTables.end();
@@ -143,11 +143,11 @@ public:
     TableEnumerationImpl(  const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xDocument, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxParent( xParent ), mxContext( xContext ), mxDocument( xDocument ), mxIndexAccess( xIndexAccess ), mnCurIndex(0)
     {
     }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( mnCurIndex < mxIndexAccess->getCount() );
     }
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !hasMoreElements() )
             throw container::NoSuchElementException();
@@ -161,7 +161,7 @@ SwVbaTables::SwVbaTables( const uno::Reference< XHelperInterface >& xParent, con
 }
 
 uno::Reference< word::XTable > SAL_CALL
-SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& NumRows, const uno::Any& NumColumns, const uno::Any& /*DefaultTableBehavior*/, const uno::Any& /*AutoFitBehavior*/ )
 {
     sal_Int32 nCols = 0;
     sal_Int32 nRows = 0;
@@ -195,7 +195,7 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-SwVbaTables::createEnumeration() throw (uno::RuntimeException)
+SwVbaTables::createEnumeration()
 {
     return new TableEnumerationImpl( mxParent, mxContext, mxDocument, m_xIndexAccess );
 }
@@ -216,7 +216,7 @@ SwVbaTables::getServiceImplName()
 
 // XEnumerationAccess
 uno::Type SAL_CALL
-SwVbaTables::getElementType() throw (uno::RuntimeException)
+SwVbaTables::getElementType()
 {
     return  cppu::UnoType<word::XTable>::get();
 }
diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx
index 45aba199a4ef..ae7de0b00cb5 100644
--- a/sw/source/ui/vba/vbatables.hxx
+++ b/sw/source/ui/vba/vbatables.hxx
@@ -31,10 +31,10 @@ class SwVbaTables : public SwVbaTables_BASE
 public:
     SwVbaTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
     // XTables
-    virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ov::word::XTable > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& NumRows, const css::uno::Any& NumColumns, const css::uno::Any& DefaultTableBehavior, const css::uno::Any& AutoFitBehavior ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index e069402d6aef..e1fac5afca27 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -35,12 +35,12 @@ public:
     explicit TablesOfContentsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 )
     {
     }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < mxIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if( nIndex < mxIndexAccess->getCount() )
         {
@@ -61,7 +61,7 @@ private:
 
 public:
     /// @throws uno::RuntimeException
-    TableOfContentsCollectionHelper( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ) throw ( uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ), mxTextDocument( xDoc )
+    TableOfContentsCollectionHelper( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ): mxParent( xParent ), mxContext( xContext ), mxTextDocument( xDoc )
     {
         uno::Reference< text::XDocumentIndexesSupplier > xDocIndexSupp( mxTextDocument, uno::UNO_QUERY_THROW );
         uno::Reference< container::XIndexAccess > xDocIndexes = xDocIndexSupp->getDocumentIndexes();
@@ -76,11 +76,11 @@ public:
         }
     }
 
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount(  ) override
     {
         return maToc.size();
     }
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw lang::IndexOutOfBoundsException();
@@ -88,27 +88,27 @@ public:
         uno::Reference< text::XDocumentIndex > xToc( maToc[Index], uno::UNO_QUERY_THROW );
         return uno::makeAny( uno::Reference< word::XTableOfContents >( new SwVbaTableOfContents( mxParent, mxContext, mxTextDocument, xToc ) ) );
     }
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<word::XTableOfContents>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return true;
     }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new TablesOfContentsEnumWrapper( this );
     }
 };
 
-SwVbaTablesOfContents::SwVbaTablesOfContents( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ) throw (uno::RuntimeException) : SwVbaTablesOfContents_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new TableOfContentsCollectionHelper( xParent, xContext, xDoc ) ) ),  mxTextDocument( xDoc )
+SwVbaTablesOfContents::SwVbaTablesOfContents( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextDocument >& xDoc ) : SwVbaTablesOfContents_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new TableOfContentsCollectionHelper( xParent, xContext, xDoc ) ) ),  mxTextDocument( xDoc )
 {
 }
 
 uno::Reference< word::XTableOfContents > SAL_CALL
-SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const uno::Any& /*UseHeadingStyles*/, const uno::Any& /*UpperHeadingLevel*/, const uno::Any& LowerHeadingLevel, const uno::Any& UseFields, const uno::Any& /*TableID*/, const uno::Any& /*RightAlignPageNumbers*/, const uno::Any& /*IncludePageNumbers*/, const uno::Any& /*AddedStyles*/, const uno::Any& /*UseHyperlinks*/, const uno::Any& /*HidePageNumbersInWeb*/, const uno::Any& /*UseOutlineLevels*/ ) throw (uno::RuntimeException, std::exception)
+SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const uno::Any& /*UseHeadingStyles*/, const uno::Any& /*UpperHeadingLevel*/, const uno::Any& LowerHeadingLevel, const uno::Any& UseFields, const uno::Any& /*TableID*/, const uno::Any& /*RightAlignPageNumbers*/, const uno::Any& /*IncludePageNumbers*/, const uno::Any& /*AddedStyles*/, const uno::Any& /*UseHyperlinks*/, const uno::Any& /*HidePageNumbersInWeb*/, const uno::Any& /*UseOutlineLevels*/ )
 {
     uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxTextDocument, uno::UNO_QUERY_THROW );
     uno::Reference< text::XDocumentIndex > xDocumentIndex( xDocMSF->createInstance("com.sun.star.text.ContentIndex"), uno::UNO_QUERY_THROW );
@@ -147,12 +147,12 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u
 
 // XEnumerationAccess
 uno::Type
-SwVbaTablesOfContents::getElementType() throw (uno::RuntimeException)
+SwVbaTablesOfContents::getElementType()
 {
     return cppu::UnoType<word::XTableOfContents>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaTablesOfContents::createEnumeration() throw (uno::RuntimeException)
+SwVbaTablesOfContents::createEnumeration()
 {
     return new TablesOfContentsEnumWrapper( m_xIndexAccess );
 }
diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx
index 297fe8aa0e7b..1a8199fa990a 100644
--- a/sw/source/ui/vba/vbatablesofcontents.hxx
+++ b/sw/source/ui/vba/vbatablesofcontents.hxx
@@ -35,14 +35,14 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaTablesOfContents( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDoc ) throw ( css::uno::RuntimeException );
+    SwVbaTablesOfContents( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextDocument >& xDoc );
 
     // Methods
-    virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ::ooo::vba::word::XTableOfContents > SAL_CALL Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, const css::uno::Any& UseHeadingStyles, const css::uno::Any& UpperHeadingLevel, const css::uno::Any& LowerHeadingLevel, const css::uno::Any& UseFields, const css::uno::Any& TableID, const css::uno::Any& RightAlignPageNumbers, const css::uno::Any& IncludePageNumbers, const css::uno::Any& AddedStyles, const css::uno::Any& UseHyperlinks, const css::uno::Any& HidePageNumbersInWeb, const css::uno::Any& UseOutlineLevels ) override;
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaTablesOfContents_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx
index c0c57afddf24..bce16115a332 100644
--- a/sw/source/ui/vba/vbatabstop.cxx
+++ b/sw/source/ui/vba/vbatabstop.cxx
@@ -23,7 +23,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ) throw ( uno::RuntimeException ) : SwVbaTabStop_BASE( rParent, rContext )
+SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ) : SwVbaTabStop_BASE( rParent, rContext )
 {
 }
 
diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx
index 9e009e9adf8e..de956205db96 100644
--- a/sw/source/ui/vba/vbatabstop.hxx
+++ b/sw/source/ui/vba/vbatabstop.hxx
@@ -28,7 +28,7 @@ class SwVbaTabStop : public SwVbaTabStop_BASE
 {
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ) throw ( css::uno::RuntimeException );
+    SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext );
     virtual ~SwVbaTabStop() override;
 
     // XHelperInterface
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index 75b05f87927e..c69a503a8e8b 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -30,7 +30,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 /// @throws uno::RuntimeException
-static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException)
+static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< beans::XPropertySet >& xParaProps )
 {
     uno::Sequence< style::TabStop > aSeq;
     xParaProps->getPropertyValue("ParaTabStops") >>= aSeq;
@@ -38,7 +38,7 @@ static uno::Sequence< style::TabStop > lcl_getTabStops( const uno::Reference< be
 }
 
 /// @throws uno::RuntimeException
-static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq ) throw (uno::RuntimeException)
+static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaProps, const uno::Sequence< style::TabStop >& aSeq )
 {
     xParaProps->setPropertyValue("ParaTabStops", uno::makeAny( aSeq ) );
 }
@@ -52,12 +52,12 @@ public:
     explicit TabStopsEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : mxIndexAccess( xIndexAccess ), nIndex( 0 )
     {
     }
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < mxIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if( nIndex < mxIndexAccess->getCount() )
         {
@@ -77,42 +77,42 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    TabStopCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( css::uno::RuntimeException ): mxParent( xParent ), mxContext( xContext )
+    TabStopCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ): mxParent( xParent ), mxContext( xContext )
     {
         mnTabStops = lcl_getTabStops( xParaProps ).getLength();
     }
 
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount(  ) override
     {
         return mnTabStops;
     }
-    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= getCount() )
             throw css::lang::IndexOutOfBoundsException();
 
         return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext ) ) );
     }
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<word::XTabStop>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return true;
     }
     // XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new TabStopsEnumWrapper( this );
     }
 };
 
-SwVbaTabStops::SwVbaTabStops( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& xParaProps ) throw (uno::RuntimeException) : SwVbaTabStops_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new TabStopCollectionHelper( xParent, xContext, xParaProps ) ) ), mxParaProps( xParaProps )
+SwVbaTabStops::SwVbaTabStops( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& xParaProps ) : SwVbaTabStops_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new TabStopCollectionHelper( xParent, xContext, xParaProps ) ) ), mxParaProps( xParaProps )
 {
 }
 
-uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, const uno::Any& Alignment, const uno::Any& Leader ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, const uno::Any& Alignment, const uno::Any& Leader )
 {
     sal_Int32 nPosition = Millimeter::getInHundredthsOfOneMillimeter( Position );
 
@@ -227,7 +227,7 @@ uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, co
     return uno::Reference< word::XTabStop >( new SwVbaTabStop( this, mxContext ) );
 }
 
-void SAL_CALL SwVbaTabStops::ClearAll() throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaTabStops::ClearAll()
 {
     uno::Sequence< style::TabStop > aSeq;
     lcl_setTabStops( mxParaProps, aSeq );
@@ -235,12 +235,12 @@ void SAL_CALL SwVbaTabStops::ClearAll() throw (uno::RuntimeException, std::excep
 
 // XEnumerationAccess
 uno::Type
-SwVbaTabStops::getElementType() throw (uno::RuntimeException)
+SwVbaTabStops::getElementType()
 {
     return cppu::UnoType<word::XTabStop>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaTabStops::createEnumeration() throw (uno::RuntimeException)
+SwVbaTabStops::createEnumeration()
 {
     return new TabStopsEnumWrapper( m_xIndexAccess );
 }
diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx
index c5b8994dfd05..5bb1d439cccd 100644
--- a/sw/source/ui/vba/vbatabstops.hxx
+++ b/sw/source/ui/vba/vbatabstops.hxx
@@ -35,18 +35,15 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    SwVbaTabStops( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( css::uno::RuntimeException );
+    SwVbaTabStops( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps );
 
     // Methods
-    virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader )
-        throw (css::script::BasicErrorException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL ClearAll(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ::ooo::vba::word::XTabStop > SAL_CALL Add( float Position, const css::uno::Any& Alignment, const css::uno::Any& Leader ) override;
+    virtual void SAL_CALL ClearAll(  ) override;
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaTabStops_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index a23735a9c8ec..0a2452f9bb4a 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -56,7 +56,7 @@ SwVbaTemplate::~SwVbaTemplate()
 }
 
 OUString
-SwVbaTemplate::getName() throw ( css::uno::RuntimeException, std::exception )
+SwVbaTemplate::getName()
 {
     OUString sName;
     if( !msFullUrl.isEmpty() )
@@ -68,7 +68,7 @@ SwVbaTemplate::getName() throw ( css::uno::RuntimeException, std::exception )
 }
 
 OUString
-SwVbaTemplate::getPath() throw ( css::uno::RuntimeException, std::exception )
+SwVbaTemplate::getPath()
 {
     OUString sPath;
     if( !msFullUrl.isEmpty() )
@@ -82,7 +82,7 @@ SwVbaTemplate::getPath() throw ( css::uno::RuntimeException, std::exception )
 }
 
 uno::Any SAL_CALL
-SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+SwVbaTemplate::AutoTextEntries( const uno::Any& index )
 {
     uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
     uno::Reference< text::XAutoTextContainer2 > xAutoTextContainer = text::AutoTextContainer::create( xContext );
diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx
index ae6eb822a65e..5765c06a8ee5 100644
--- a/sw/source/ui/vba/vbatemplate.hxx
+++ b/sw/source/ui/vba/vbatemplate.hxx
@@ -34,9 +34,9 @@ public:
     virtual ~SwVbaTemplate() override;
 
    // XTemplate
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual OUString SAL_CALL getPath() override;
+    virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx
index 7aab993d4ebb..76033d2a9d83 100644
--- a/sw/source/ui/vba/vbavariable.cxx
+++ b/sw/source/ui/vba/vbavariable.cxx
@@ -26,7 +26,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 SwVbaVariable::SwVbaVariable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-    const uno::Reference< beans::XPropertyAccess >& rUserDefined, const OUString& rVariableName ) throw ( uno::RuntimeException ) :
+    const uno::Reference< beans::XPropertyAccess >& rUserDefined, const OUString& rVariableName ) :
     SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ), maVariableName( rVariableName )
 {
 }
@@ -36,26 +36,26 @@ SwVbaVariable::~SwVbaVariable()
 }
 
 OUString SAL_CALL
-SwVbaVariable::getName() throw ( css::uno::RuntimeException, std::exception )
+SwVbaVariable::getName()
 {
     return maVariableName;
 }
 
 void SAL_CALL
-SwVbaVariable::setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception )
+SwVbaVariable::setName( const OUString& )
 {
     throw uno::RuntimeException(" Fail to set name" );
 }
 
 uno::Any SAL_CALL
-SwVbaVariable::getValue() throw ( css::uno::RuntimeException, std::exception )
+SwVbaVariable::getValue()
 {
     uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW );
     return xProp->getPropertyValue( maVariableName );
 }
 
 void SAL_CALL
-SwVbaVariable::setValue( const uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception )
+SwVbaVariable::setValue( const uno::Any& rValue )
 {
     // FIXME: fail to set the value if the new type of value is different from the original one.
     uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW );
@@ -63,7 +63,7 @@ SwVbaVariable::setValue( const uno::Any& rValue ) throw ( css::uno::RuntimeExcep
 }
 
 sal_Int32 SAL_CALL
-SwVbaVariable::getIndex() throw ( css::uno::RuntimeException, std::exception )
+SwVbaVariable::getIndex()
 {
     const uno::Sequence< beans::PropertyValue > props = mxUserDefined->getPropertyValues();
     for (sal_Int32 i = 0; i < props.getLength(); ++i)
diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx
index a354ae5bbf38..a278ed16d2b6 100644
--- a/sw/source/ui/vba/vbavariable.hxx
+++ b/sw/source/ui/vba/vbavariable.hxx
@@ -34,15 +34,15 @@ private:
 public:
     /// @throws css::uno::RuntimeException
     SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
-        const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const OUString& rName ) throw ( css::uno::RuntimeException );
+        const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const OUString& rName );
     virtual ~SwVbaVariable() override;
 
    // XVariable
-    virtual OUString SAL_CALL getName() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setName( const OUString& ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& ) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& rValue ) override;
+    virtual sal_Int32 SAL_CALL getIndex() override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx
index 2556cc401de3..d0bfe6bf9d23 100644
--- a/sw/source/ui/vba/vbavariables.cxx
+++ b/sw/source/ui/vba/vbavariables.cxx
@@ -25,7 +25,7 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 /// @throws uno::RuntimeException
-uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertyAccess >& xUserDefined ) throw ( uno::RuntimeException )
+uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertyAccess >& xUserDefined )
 {
     // FIXME: the performance is poor?
     XNamedObjectCollectionHelper< word::XVariable >::XNamedVec aVariables;
@@ -44,12 +44,12 @@ SwVbaVariables::SwVbaVariables( const uno::Reference< XHelperInterface >& xParen
 }
 // XEnumerationAccess
 uno::Type
-SwVbaVariables::getElementType() throw (uno::RuntimeException)
+SwVbaVariables::getElementType()
 {
     return cppu::UnoType<word::XVariable>::get();
 }
 uno::Reference< container::XEnumeration >
-SwVbaVariables::createEnumeration() throw (uno::RuntimeException)
+SwVbaVariables::createEnumeration()
 {
     uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
     return xEnumerationAccess->createEnumeration();
@@ -62,7 +62,7 @@ SwVbaVariables::createCollectionObject( const css::uno::Any& aSource )
 }
 
 uno::Any SAL_CALL
-SwVbaVariables::Add( const OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException, std::exception)
+SwVbaVariables::Add( const OUString& rName, const uno::Any& rValue )
 {
     uno::Any aValue;
     if( rValue.hasValue() )
diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx
index 6a5652562658..aa2901d0e479 100644
--- a/sw/source/ui/vba/vbavariables.hxx
+++ b/sw/source/ui/vba/vbavariables.hxx
@@ -37,8 +37,8 @@ public:
     SwVbaVariables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // SwVbaVariables_BASE
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
@@ -46,7 +46,7 @@ public:
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 
     // XVariables
-    virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Add( const OUString& rName, const css::uno::Any& rValue ) override;
 };
 
 #endif // INCLUDED_SW_SOURCE_UI_VBA_VBAVARIABLES_HXX
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index c8c9524de83c..cbf1e7b95587 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star;
 static const sal_Int32 DEFAULT_BODY_DISTANCE = 500;
 
 SwVbaView::SwVbaView( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
-    const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) :
+    const uno::Reference< frame::XModel >& rModel ) :
     SwVbaView_BASE( rParent, rContext ), mxModel( rModel )
 {
     uno::Reference< frame::XController > xController = mxModel->getCurrentController();
@@ -65,7 +65,7 @@ SwVbaView::~SwVbaView()
 }
 
 ::sal_Int32 SAL_CALL
-SwVbaView::getSeekView() throw (css::uno::RuntimeException, std::exception)
+SwVbaView::getSeekView()
 {
     // FIXME: if the view cursor is in table, field, section and frame
     // handle if the cursor is in table
@@ -116,7 +116,7 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception)
+SwVbaView::setSeekView( ::sal_Int32 _seekview )
 {
     // FIXME: save the current cursor position, if the cursor is in the main
     // document, so we can jump back to this position, if the macro sets
@@ -179,19 +179,19 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio
 }
 
 ::sal_Int32 SAL_CALL
-SwVbaView::getSplitSpecial() throw (css::uno::RuntimeException, std::exception)
+SwVbaView::getSplitSpecial()
 {
     return word::WdSpecialPane::wdPaneNone;
 }
 
 void SAL_CALL
-SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::RuntimeException, std::exception)
+SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */)
 {
     // not support in Writer
 }
 
 sal_Bool SAL_CALL
-SwVbaView::getTableGridLines() throw (css::uno::RuntimeException, std::exception)
+SwVbaView::getTableGridLines()
 {
     bool bShowTableGridLine = false;
     mxViewSettings->getPropertyValue("ShowTableBoundaries") >>= bShowTableGridLine;
@@ -199,13 +199,13 @@ SwVbaView::getTableGridLines() throw (css::uno::RuntimeException, std::exception
 }
 
 void SAL_CALL
-SwVbaView::setTableGridLines( sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception)
+SwVbaView::setTableGridLines( sal_Bool _tablegridlines )
 {
     mxViewSettings->setPropertyValue("ShowTableBoundaries", uno::makeAny( _tablegridlines ) );
 }
 
 ::sal_Int32 SAL_CALL
-SwVbaView::getType() throw (css::uno::RuntimeException, std::exception)
+SwVbaView::getType()
 {
     // FIXME: handle wdPrintPreview type
     bool bOnlineLayout = false;
@@ -214,7 +214,7 @@ SwVbaView::getType() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception)
+SwVbaView::setType( ::sal_Int32 _type )
 {
     // FIXME: handle wdPrintPreview type
     switch( _type )
@@ -241,7 +241,7 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::
     }
 }
 
-uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) throw (uno::RuntimeException, script::BasicErrorException, std::exception)
+uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
 {
     mxModel->lockControllers();
 
diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx
index a69735d22e4f..bee0c957948b 100644
--- a/sw/source/ui/vba/vbaview.hxx
+++ b/sw/source/ui/vba/vbaview.hxx
@@ -37,23 +37,23 @@ private:
 
     /// @throws css::uno::RuntimeException
     /// @throws css::script::BasicErrorException
-    css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception);
+    css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType );
 
 public:
     /// @throws css::uno::RuntimeException
     SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
-        const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
+        const css::uno::Reference< css::frame::XModel >& rModel );
     virtual ~SwVbaView() override;
 
    // XView
-    virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTableGridLines( sal_Bool _tablegridlines ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getSeekView() override;
+    virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) override;
+    virtual ::sal_Int32 SAL_CALL getSplitSpecial() override;
+    virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) override;
+    virtual sal_Bool SAL_CALL getTableGridLines() override;
+    virtual void SAL_CALL setTableGridLines( sal_Bool _tablegridlines ) override;
+    virtual ::sal_Int32 SAL_CALL getType() override;
+    virtual void SAL_CALL setType( ::sal_Int32 _type ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx
index 270abb71eb19..5f5749d0f5c4 100644
--- a/sw/source/ui/vba/vbawindow.cxx
+++ b/sw/source/ui/vba/vbawindow.cxx
@@ -37,13 +37,13 @@ SwVbaWindow::SwVbaWindow(
         const uno::Reference< XHelperInterface >& xParent,
         const uno::Reference< uno::XComponentContext >& xContext,
         const uno::Reference< frame::XModel >& xModel,
-        const uno::Reference< frame::XController >& xController ) throw (uno::RuntimeException) :
+        const uno::Reference< frame::XController >& xController ) :
     WindowImpl_BASE( xParent, xContext, xModel, xController )
 {
 }
 
 void
-SwVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception)
+SwVbaWindow::Activate()
 {
     rtl::Reference<SwVbaDocument> document( new SwVbaDocument(uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel) );
 
@@ -51,7 +51,7 @@ SwVbaWindow::Activate() throw (css::uno::RuntimeException, std::exception)
 }
 
 void
-SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument ) throw (uno::RuntimeException, std::exception)
+SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument )
 {
     // FIXME: it is incorrect when there are more than 1 windows
     rtl::Reference<SwVbaDocument> document( new SwVbaDocument(uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel) );
@@ -60,12 +60,12 @@ SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument )
 }
 
 uno::Any SAL_CALL
-SwVbaWindow::getView() throw (uno::RuntimeException, std::exception)
+SwVbaWindow::getView()
 {
     return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this,  mxContext, m_xModel ) ) );
 }
 
-void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaWindow::setView( const uno::Any& _view )
 {
     sal_Int32 nType = 0;
     if( _view >>= nType )
@@ -76,7 +76,7 @@ void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeE
 }
 
 uno::Any SAL_CALL
-SwVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception)
+SwVbaWindow::getWindowState()
 {
     sal_Int32 nwindowState = word::WdWindowState::wdWindowStateNormal;
     SwView* pView = word::getView( m_xModel );
@@ -93,7 +93,7 @@ SwVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-SwVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeException, std::exception)
+SwVbaWindow::setWindowState( const uno::Any& _windowstate )
 {
     sal_Int32 nwindowState = word::WdWindowState::wdWindowStateMaximize;
     _windowstate >>= nwindowState;
@@ -114,7 +114,7 @@ SwVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE
 }
 
 uno::Any SAL_CALL
-SwVbaWindow::Panes( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+SwVbaWindow::Panes( const uno::Any& aIndex )
 {
     uno::Reference< XCollection > xPanes( new SwVbaPanes( this,  mxContext, m_xModel ) );
     if(  aIndex.getValueTypeClass() == uno::TypeClass_VOID )
@@ -124,7 +124,7 @@ SwVbaWindow::Panes( const uno::Any& aIndex ) throw (uno::RuntimeException, std::
 }
 
 uno::Any SAL_CALL
-SwVbaWindow::ActivePane() throw (uno::RuntimeException, std::exception)
+SwVbaWindow::ActivePane()
 {
     return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this,  mxContext, m_xModel ) ) );
 }
diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx
index 5163f86ba275..e5f7296a8ba5 100644
--- a/sw/source/ui/vba/vbawindow.hxx
+++ b/sw/source/ui/vba/vbawindow.hxx
@@ -35,19 +35,18 @@ public:
         const css::uno::Reference< ov::XHelperInterface >& xParent,
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const css::uno::Reference< css::frame::XModel >& xModel,
-        const css::uno::Reference< css::frame::XController >& xController )
-        throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::frame::XController >& xController );
 
     // Attributes
-    virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getView() override;
+    virtual void SAL_CALL setView( const css::uno::Any& _view ) override;
+    virtual css::uno::Any SAL_CALL getWindowState() override;
+    virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) override;
     // Methods
-    virtual void SAL_CALL Activate(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Activate(  ) override;
+    virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) override;
+    virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) override;
+    virtual css::uno::Any SAL_CALL ActivePane() override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index 2d411778d446..c585b7455a5a 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -37,7 +37,7 @@ SwVbaWrapFormat::SwVbaWrapFormat( uno::Sequence< uno::Any > const& aArgs, uno::R
     m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
 }
 
-void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
+void SwVbaWrapFormat::makeWrap()
 {
     text::WrapTextMode eTextMode = text::WrapTextMode_NONE;
     if( mnSide == word::WdWrapSideType::wdWrapLeft )
@@ -86,7 +86,7 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
     m_xPropertySet->setPropertyValue("TextWrap", uno::makeAny( eTextMode ) );
 }
 
-::sal_Int32 SAL_CALL SwVbaWrapFormat::getType() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaWrapFormat::getType()
 {
     sal_Int32 nType = word::WdWrapType::wdWrapSquare;
     text::WrapTextMode eTextMode;
@@ -128,13 +128,13 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
     return nType;
 }
 
-void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type )
 {
     mnWrapFormatType = _type;
     makeWrap();
 }
 
-::sal_Int32 SAL_CALL SwVbaWrapFormat::getSide() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SwVbaWrapFormat::getSide()
 {
     sal_Int32 nSide = word::WdWrapSideType::wdWrapBoth;
     text::WrapTextMode eTextMode;
@@ -159,61 +159,61 @@ void SAL_CALL SwVbaWrapFormat::setType( ::sal_Int32 _type ) throw (uno::RuntimeE
     return nSide;
 }
 
-void SAL_CALL SwVbaWrapFormat::setSide( ::sal_Int32 _side ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaWrapFormat::setSide( ::sal_Int32 _side )
 {
     mnSide = _side;
     makeWrap();
 }
 
-float SwVbaWrapFormat::getDistance( const OUString& sName ) throw (uno::RuntimeException)
+float SwVbaWrapFormat::getDistance( const OUString& sName )
 {
     sal_Int32 nDistance = 0;
     m_xPropertySet->getPropertyValue( sName ) >>= nDistance;
     return static_cast< float >( Millimeter::getInPoints( nDistance ) );
 }
 
-void SwVbaWrapFormat::setDistance( const OUString& sName, float _distance ) throw (uno::RuntimeException)
+void SwVbaWrapFormat::setDistance( const OUString& sName, float _distance )
 {
     sal_Int32 nDistance = Millimeter::getInHundredthsOfOneMillimeter( _distance );
     m_xPropertySet->setPropertyValue( sName, uno::makeAny( nDistance ) );
 }
 
-float SAL_CALL SwVbaWrapFormat::getDistanceTop() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaWrapFormat::getDistanceTop()
 {
     return getDistance( "TopMargin" );
 }
 
-void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaWrapFormat::setDistanceTop( float _distancetop )
 {
     setDistance( "TopMargin", _distancetop );
 }
 
-float SAL_CALL SwVbaWrapFormat::getDistanceBottom() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaWrapFormat::getDistanceBottom()
 {
     return getDistance( "BottomMargin" );
 }
 
-void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaWrapFormat::setDistanceBottom( float _distancebottom )
 {
     setDistance( "BottomMargin", _distancebottom );
 }
 
-float SAL_CALL SwVbaWrapFormat::getDistanceLeft() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaWrapFormat::getDistanceLeft()
 {
     return getDistance( "LeftMargin" );
 }
 
-void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaWrapFormat::setDistanceLeft( float _distanceleft )
 {
     setDistance( "LeftMargin", _distanceleft );
 }
 
-float SAL_CALL SwVbaWrapFormat::getDistanceRight() throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaWrapFormat::getDistanceRight()
 {
     return getDistance( "RightMargin" );
 }
 
-void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright )
 {
     setDistance( "RightMargin", _distanceright );
 }
diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx
index 5008197d7d55..ef28118ed956 100644
--- a/sw/source/ui/vba/vbawrapformat.hxx
+++ b/sw/source/ui/vba/vbawrapformat.hxx
@@ -35,27 +35,27 @@ private:
 
 private:
     /// @throws css::uno::RuntimeException
-    void makeWrap() throw (css::uno::RuntimeException);
+    void makeWrap();
     /// @throws css::uno::RuntimeException
-    float getDistance( const OUString& sName ) throw (css::uno::RuntimeException);
+    float getDistance( const OUString& sName );
     /// @throws css::uno::RuntimeException
-    void setDistance( const OUString& sName, float _distance ) throw (css::uno::RuntimeException);
+    void setDistance( const OUString& sName, float _distance );
 
 public:
     SwVbaWrapFormat(  css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
 
-    virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getSide() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSide( ::sal_Int32 _side ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getDistanceTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDistanceTop( float _distancetop ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getDistanceBottom() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDistanceBottom( float _distancebottom ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getDistanceLeft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDistanceLeft( float _distanceleft ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getType() override;
+    virtual void SAL_CALL setType( ::sal_Int32 _type ) override;
+    virtual ::sal_Int32 SAL_CALL getSide() override;
+    virtual void SAL_CALL setSide( ::sal_Int32 _side ) override;
+    virtual float SAL_CALL getDistanceTop() override;
+    virtual void SAL_CALL setDistanceTop( float _distancetop ) override;
+    virtual float SAL_CALL getDistanceBottom() override;
+    virtual void SAL_CALL setDistanceBottom( float _distancebottom ) override;
+    virtual float SAL_CALL getDistanceLeft() override;
+    virtual void SAL_CALL setDistanceLeft( float _distanceleft ) override;
+    virtual float SAL_CALL getDistanceRight() override;
+    virtual void SAL_CALL setDistanceRight( float _distanceright ) override;
 
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sw/source/ui/vba/wordvbahelper.cxx b/sw/source/ui/vba/wordvbahelper.cxx
index 63582f924907..0588bba7bb12 100644
--- a/sw/source/ui/vba/wordvbahelper.cxx
+++ b/sw/source/ui/vba/wordvbahelper.cxx
@@ -57,7 +57,7 @@ SwView* getView( const uno::Reference< frame::XModel>& xModel )
     return pDocShell? pDocShell->GetView() : nullptr;
 }
 
-uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference< frame::XModel >& xModel )
 {
     uno::Reference< frame::XController > xController = xModel->getCurrentController();
     uno::Reference< text::XTextViewCursorSupplier > xTextViewCursorSupp( xController, uno::UNO_QUERY_THROW );
@@ -65,13 +65,13 @@ uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference
     return xTextViewCursor;
 }
 
-uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel )
 {
     uno::Reference< beans::XPropertySet > xCursorProps( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
     return getCurrentPageStyle( xModel, xCursorProps );
 }
 
-uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps ) throw (uno::RuntimeException)
+uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xProps )
 {
     OUString aPageStyleName;
     xProps->getPropertyValue("PageStyleName") >>= aPageStyleName;
@@ -83,14 +83,14 @@ uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame
     return xStyle;
 }
 
-sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel ) throw (uno::RuntimeException)
+sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel )
 {
     SwDocShell* pDocShell = getDocShell( xModel );
     SwViewShell* pViewSh = pDocShell ? pDocShell->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() : nullptr;
     return pViewSh ? pViewSh->GetPageCount() : 0;
 }
 
-uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference< frame::XModel >& xModel )
 {
     uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW );
     uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
@@ -100,7 +100,7 @@ uno::Reference< style::XStyle > getDefaultParagraphStyle( const uno::Reference<
     return xStyle;
 }
 
-uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference< text::XText >& xText ) throw (uno::RuntimeException)
+uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference< text::XText >& xText )
 {
     // if the first object is table, get the position of first cell
     uno::Reference< text::XTextRange > xTextRange;
@@ -121,7 +121,7 @@ uno::Reference< text::XTextRange > getFirstObjectPosition( const uno::Reference<
     return xTextRange;
 }
 
-uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XModel >& xModel )
 {
     uno::Reference< text::XTextRange > xTextRange;
     uno::Reference< text::XTextContent > xTextContent( xModel->getCurrentSelection(), uno::UNO_QUERY );
@@ -162,7 +162,7 @@ uno::Reference< text::XText > getCurrentXText( const uno::Reference< frame::XMod
     return xText;
 }
 
-bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel ) throw (uno::RuntimeException)
+bool gotoSelectedObjectAnchor( const uno::Reference< frame::XModel>& xModel )
 {
     bool isObjectSelected = false;
     uno::Reference< text::XTextContent > xTextContent( xModel->getCurrentSelection(), uno::UNO_QUERY );
diff --git a/sw/source/ui/vba/wordvbahelper.hxx b/sw/source/ui/vba/wordvbahelper.hxx
index b66b310f154e..b859285ae1f1 100644
--- a/sw/source/ui/vba/wordvbahelper.hxx
+++ b/sw/source/ui/vba/wordvbahelper.hxx
@@ -39,21 +39,21 @@ namespace ooo
         SwDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel );
         SwView* getView( const css::uno::Reference< css::frame::XModel>& xModel );
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::text::XTextViewCursor > getXTextViewCursor( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+        css::uno::Reference< css::text::XTextViewCursor > getXTextViewCursor( const css::uno::Reference< css::frame::XModel >& xModel );
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+        css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel >& xModel );
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel>& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps ) throw (css::uno::RuntimeException);
+        css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel>& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps );
         /// @throws css::uno::RuntimeException
-        sal_Int32 getPageCount( const css::uno::Reference< css::frame::XModel>& xModel ) throw (css::uno::RuntimeException);
+        sal_Int32 getPageCount( const css::uno::Reference< css::frame::XModel>& xModel );
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::style::XStyle > getDefaultParagraphStyle( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+        css::uno::Reference< css::style::XStyle > getDefaultParagraphStyle( const css::uno::Reference< css::frame::XModel >& xModel );
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
+        css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText );
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::text::XText > getCurrentXText( const css::uno::Reference< css::frame::XModel>& xModel ) throw (css::uno::RuntimeException);
+        css::uno::Reference< css::text::XText > getCurrentXText( const css::uno::Reference< css::frame::XModel>& xModel );
         /// @throws css::uno::RuntimeException
-        bool gotoSelectedObjectAnchor( const css::uno::Reference< css::frame::XModel>& xModel ) throw (css::uno::RuntimeException);
+        bool gotoSelectedObjectAnchor( const css::uno::Reference< css::frame::XModel>& xModel );
 
     enum E_DIRECTION
     {
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 2464878b136b..538f74933b45 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -71,8 +71,7 @@ public:
     }
 
     // XNamed
-    virtual OUString SAL_CALL getName()
-        throw (uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getName() override
     {
         SolarMutexGuard g;
         SwNumRulesWithName const* pRules(m_rNumRules.GetRules(m_nIndex));
@@ -83,8 +82,7 @@ public:
         return pRules->GetName();
     }
 
-    virtual void SAL_CALL setName(OUString const& rName)
-        throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setName(OUString const& rName) override
     {
         SolarMutexGuard g;
         SwNumRulesWithName *const pRules(GetOrCreateRules());
@@ -92,28 +90,23 @@ public:
     }
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType()
-        throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType() override
     {
         return ::cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get();
     }
 
-    virtual ::sal_Bool SAL_CALL hasElements()
-        throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Bool SAL_CALL hasElements() override
     {
         return true;
     }
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount()
-        throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getCount() override
     {
         return MAXLEVEL;
     }
 
-    virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex)
-        throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
-               uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override
     {
         if (nIndex < 0 || MAXLEVEL <= nIndex)
             throw lang::IndexOutOfBoundsException();
@@ -141,10 +134,7 @@ public:
 
     // XIndexReplace
     virtual void SAL_CALL replaceByIndex(
-            sal_Int32 nIndex, uno::Any const& rElement)
-        throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
-               lang::WrappedTargetException, uno::RuntimeException,
-               std::exception) override
+            sal_Int32 nIndex, uno::Any const& rElement) override
     {
         if (nIndex < 0 || MAXLEVEL <= nIndex)
             throw lang::IndexOutOfBoundsException();
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index e372b8ee971d..7808ab038c37 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -206,7 +206,7 @@ class SwDBManager::ConnectionDisposedListener_Impl
 private:
     SwDBManager * m_pDBManager;
 
-    virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
 
 public:
     explicit ConnectionDisposedListener_Impl(SwDBManager& rMgr);
@@ -224,10 +224,10 @@ class SwDataSourceRemovedListener : public cppu::WeakImplHelper<sdb::XDatabaseRe
 public:
     explicit SwDataSourceRemovedListener(SwDBManager& rDBManager);
     virtual ~SwDataSourceRemovedListener() override;
-    virtual void SAL_CALL registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing(const lang::EventObject& rObject) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) override;
+    virtual void SAL_CALL revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) override;
+    virtual void SAL_CALL changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) override;
+    virtual void SAL_CALL disposing(const lang::EventObject& rObject) override;
     void Dispose();
 };
 
@@ -245,11 +245,11 @@ SwDataSourceRemovedListener::~SwDataSourceRemovedListener()
         m_xDatabaseContext->removeDatabaseRegistrationsListener(this);
 }
 
-void SAL_CALL SwDataSourceRemovedListener::registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& /*rEvent*/) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwDataSourceRemovedListener::registeredDatabaseLocation(const sdb::DatabaseRegistrationEvent& /*rEvent*/)
 {
 }
 
-void SAL_CALL SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent)
 {
     if (!m_pDBManager || m_pDBManager->getEmbeddedName().isEmpty())
         return;
@@ -277,13 +277,13 @@ void SAL_CALL SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::Da
     m_pDBManager->setEmbeddedName(OUString(), *pDocShell);
 }
 
-void SAL_CALL SwDataSourceRemovedListener::changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwDataSourceRemovedListener::changedDatabaseLocation(const sdb::DatabaseRegistrationEvent& rEvent)
 {
     if (rEvent.OldLocation != rEvent.NewLocation)
         revokedDatabaseLocation(rEvent);
 }
 
-void SwDataSourceRemovedListener::disposing(const lang::EventObject& /*rObject*/) throw (uno::RuntimeException, std::exception)
+void SwDataSourceRemovedListener::disposing(const lang::EventObject& /*rObject*/)
 {
     m_xDatabaseContext.clear();
 }
@@ -3068,7 +3068,6 @@ SwDBManager::ConnectionDisposedListener_Impl::ConnectionDisposedListener_Impl(Sw
 }
 
 void SwDBManager::ConnectionDisposedListener_Impl::disposing( const lang::EventObject& rSource )
-        throw (uno::RuntimeException, std::exception)
 {
     ::SolarMutexGuard aGuard;
 
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 5691f3deef31..2d7a4760121d 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -68,10 +68,10 @@ class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener >
         }
         virtual ~SwDBTreeList_Impl() override;
 
-    virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const ContainerEvent& Event ) override;
+    virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
     bool                        HasContext();
     SwWrtShell*                 GetWrtShell() { return m_pWrtShell;}
@@ -94,24 +94,24 @@ SwDBTreeList_Impl::~SwDBTreeList_Impl()
     }
 }
 
-void SwDBTreeList_Impl::elementInserted( const ContainerEvent&  ) throw (RuntimeException, std::exception)
+void SwDBTreeList_Impl::elementInserted( const ContainerEvent&  )
 {
     // information not needed
 }
 
-void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent ) throw (RuntimeException, std::exception)
+void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent )
 {
     SolarMutexGuard aGuard;
     OUString sSource;
     rEvent.Accessor >>= sSource;
 }
 
-void SwDBTreeList_Impl::disposing( const EventObject&  ) throw (RuntimeException, std::exception)
+void SwDBTreeList_Impl::disposing( const EventObject&  )
 {
     m_xDatabaseContext = nullptr;
 }
 
-void SwDBTreeList_Impl::elementReplaced( const ContainerEvent& rEvent ) throw (RuntimeException, std::exception)
+void SwDBTreeList_Impl::elementReplaced( const ContainerEvent& rEvent )
 {
     elementRemoved(rEvent);
 }
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 2ba1b834fa9b..dc4c2a210583 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -604,12 +604,12 @@ SwAuthenticator::~SwAuthenticator()
 {
 }
 
-OUString SwAuthenticator::getUserName( ) throw (RuntimeException, std::exception)
+OUString SwAuthenticator::getUserName( )
 {
     return m_aUserName;
 }
 
-OUString SwAuthenticator::getPassword(  ) throw (RuntimeException, std::exception)
+OUString SwAuthenticator::getPassword(  )
 {
     if(!m_aUserName.isEmpty() && m_aPassword.isEmpty() && m_pParentWindow)
     {
@@ -635,7 +635,6 @@ SwConnectionContext::~SwConnectionContext()
 }
 
 uno::Any SwConnectionContext::getValueByName( const OUString& rName )
-                                                throw (uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if( rName == "ServerName" )
@@ -652,17 +651,14 @@ SwConnectionListener::~SwConnectionListener()
 }
 
 void SwConnectionListener::connected(const lang::EventObject& /*aEvent*/)
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SwConnectionListener::disconnected(const lang::EventObject& /*aEvent*/)
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 void SwConnectionListener::disposing(const lang::EventObject& /*aEvent*/)
-    throw(uno::RuntimeException, std::exception)
 {
 }
 
@@ -689,8 +685,6 @@ SwMailTransferable::~SwMailTransferable()
 }
 
 uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /*aFlavor*/ )
-                            throw (datatransfer::UnsupportedFlavorException,
-                            io::IOException, uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if( m_bIsBody )
@@ -714,7 +708,6 @@ uno::Any SwMailTransferable::getTransferData( const datatransfer::DataFlavor& /*
 }
 
 uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFlavors(  )
-                            throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< datatransfer::DataFlavor > aRet(1);
     aRet[0].MimeType = m_aMimeType;
@@ -732,24 +725,20 @@ uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFla
 
 sal_Bool SwMailTransferable::isDataFlavorSupported(
             const datatransfer::DataFlavor& aFlavor )
-                            throw (uno::RuntimeException, std::exception)
 {
     return (aFlavor.MimeType == m_aMimeType);
 }
 
-uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SwMailTransferable::getPropertySetInfo(  )
 {
     return uno::Reference< beans::XPropertySetInfo >();
 }
 
 void SwMailTransferable::setPropertyValue( const OUString& , const uno::Any& )
-    throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException,
-          lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 uno::Any SwMailTransferable::getPropertyValue( const OUString& rPropertyName )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Any aRet;
     if ( rPropertyName == "URL" )
@@ -759,28 +748,24 @@ uno::Any SwMailTransferable::getPropertyValue( const OUString& rPropertyName )
 
 void SwMailTransferable::addPropertyChangeListener(
     const OUString&, const uno::Reference< beans::XPropertyChangeListener >&  )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SwMailTransferable::removePropertyChangeListener(
     const OUString&,
     const uno::Reference< beans::XPropertyChangeListener >& )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SwMailTransferable::addVetoableChangeListener(
     const OUString&,
     const uno::Reference< beans::XVetoableChangeListener >& )
-    throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
 void SwMailTransferable::removeVetoableChangeListener(
     const OUString& ,
     const uno::Reference< beans::XVetoableChangeListener >&  )
-        throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
 }
 
@@ -793,93 +778,88 @@ SwMailMessage::~SwMailMessage()
 {
 }
 
-OUString SwMailMessage::getSenderName() throw (uno::RuntimeException, std::exception)
+OUString SwMailMessage::getSenderName()
 {
     return m_sSenderName;
 }
 
-OUString SwMailMessage::getSenderAddress() throw (uno::RuntimeException, std::exception)
+OUString SwMailMessage::getSenderAddress()
 {
     return m_sSenderAddress;
 }
 
-OUString SwMailMessage::getReplyToAddress() throw (uno::RuntimeException, std::exception)
+OUString SwMailMessage::getReplyToAddress()
 {
     return m_sReplyToAddress;
 }
 
-void SwMailMessage::setReplyToAddress( const OUString& _replytoaddress ) throw (uno::RuntimeException, std::exception)
+void SwMailMessage::setReplyToAddress( const OUString& _replytoaddress )
 {
     m_sReplyToAddress = _replytoaddress;
 }
 
-OUString SwMailMessage::getSubject() throw (uno::RuntimeException, std::exception)
+OUString SwMailMessage::getSubject()
 {
     return m_sSubject;
 }
 
-void SwMailMessage::setSubject( const OUString& _subject ) throw (uno::RuntimeException, std::exception)
+void SwMailMessage::setSubject( const OUString& _subject )
 {
     m_sSubject = _subject;
 }
 
-uno::Reference< datatransfer::XTransferable > SwMailMessage::getBody() throw (uno::RuntimeException, std::exception)
+uno::Reference< datatransfer::XTransferable > SwMailMessage::getBody()
 {
     return m_xBody;
 }
 
 void SwMailMessage::setBody(
         const uno::Reference< datatransfer::XTransferable >& rBody )
-                                                throw (uno::RuntimeException, std::exception)
 {
     m_xBody = rBody;
 }
 
 void  SwMailMessage::addRecipient( const OUString& rRecipientAddress )
-        throw (uno::RuntimeException, std::exception)
 {
     m_aRecipients.realloc(m_aRecipients.getLength() + 1);
     m_aRecipients[m_aRecipients.getLength() - 1] = rRecipientAddress;
 }
 
 void  SwMailMessage::addCcRecipient( const OUString& rRecipientAddress )
-        throw (uno::RuntimeException, std::exception)
 {
     m_aCcRecipients.realloc(m_aCcRecipients.getLength() + 1);
     m_aCcRecipients[m_aCcRecipients.getLength() - 1] = rRecipientAddress;
 
 }
 
-void  SwMailMessage::addBccRecipient( const OUString& rRecipientAddress ) throw (uno::RuntimeException, std::exception)
+void  SwMailMessage::addBccRecipient( const OUString& rRecipientAddress )
 {
     m_aBccRecipients.realloc(m_aBccRecipients.getLength() + 1);
     m_aBccRecipients[m_aBccRecipients.getLength() - 1] = rRecipientAddress;
 }
 
-uno::Sequence< OUString > SwMailMessage::getRecipients(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SwMailMessage::getRecipients(  )
 {
     return m_aRecipients;
 }
 
-uno::Sequence< OUString > SwMailMessage::getCcRecipients(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SwMailMessage::getCcRecipients(  )
 {
     return m_aCcRecipients;
 }
 
-uno::Sequence< OUString > SwMailMessage::getBccRecipients(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SwMailMessage::getBccRecipients(  )
 {
     return m_aBccRecipients;
 }
 
 void SwMailMessage::addAttachment( const mail::MailAttachment& rMailAttachment )
-            throw (uno::RuntimeException, std::exception)
 {
     m_aAttachments.realloc(m_aAttachments.getLength() + 1);
     m_aAttachments[m_aAttachments.getLength() - 1] = rMailAttachment;
 }
 
 uno::Sequence< mail::MailAttachment > SwMailMessage::getAttachments(  )
-                                            throw (uno::RuntimeException, std::exception)
 {
     return m_aAttachments;
 }
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index 52317b1cdca6..97df0257a200 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -51,7 +51,7 @@ public:
     }
 
     // XInterface
-    virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) override
     {
         uno::Any a(ToolboxController::queryInterface(aType));
         if (a.hasValue())
@@ -71,30 +71,30 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("lo.writer.MMCurrentEntryController");
     }
 
-    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         uno::Sequence<OUString> aServices { "com.sun.star.frame.ToolbarController" };
         return aServices;
     }
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     // XToolbarController
-    virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) override;
 };
 
 /// Controller for .uno:MailMergeExcludeEntry toolbar checkbox: creates the checkbox & handles the value.
@@ -112,7 +112,7 @@ public:
     }
 
     // XInterface
-    virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) override
     {
         uno::Any a(ToolboxController::queryInterface(aType));
         if (a.hasValue())
@@ -132,33 +132,33 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     {
         return OUString("lo.writer.MMExcludeEntryController");
     }
 
-    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override
     {
         return cppu::supportsService(this, rServiceName);
     }
 
-    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         uno::Sequence<OUString> aServices { "com.sun.star.frame.ToolbarController" };
         return aServices;
     }
 
     // XComponent
-    virtual void SAL_CALL dispose() throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
 
     // XToolbarController
-    virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) override;
 
     // XStatusListener
-    virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& rEvent) override;
 };
 
-void MMCurrentEntryController::dispose() throw (uno::RuntimeException, std::exception)
+void MMCurrentEntryController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -166,7 +166,7 @@ void MMCurrentEntryController::dispose() throw (uno::RuntimeException, std::exce
     m_pCurrentEdit.disposeAndClear();
 }
 
-uno::Reference<awt::XWindow> MMCurrentEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception)
+uno::Reference<awt::XWindow> MMCurrentEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent)
 {
     VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow(rParent);
     ToolBox* pToolbar = dynamic_cast<ToolBox*>(pParent.get());
@@ -203,7 +203,7 @@ IMPL_LINK(MMCurrentEntryController, CurrentEditUpdatedHdl, Edit&, rEdit, void)
     }
 };
 
-void MMCurrentEntryController::statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception)
+void MMCurrentEntryController::statusChanged(const frame::FeatureStateEvent& rEvent)
 {
     if (!m_pCurrentEdit)
         return;
@@ -229,7 +229,7 @@ void MMCurrentEntryController::statusChanged(const frame::FeatureStateEvent& rEv
     }
 }
 
-void MMExcludeEntryController::dispose() throw (uno::RuntimeException, std::exception)
+void MMExcludeEntryController::dispose()
 {
     SolarMutexGuard aSolarMutexGuard;
 
@@ -237,7 +237,7 @@ void MMExcludeEntryController::dispose() throw (uno::RuntimeException, std::exce
     m_pExcludeCheckbox.disposeAndClear();
 }
 
-uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception)
+uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent)
 {
     VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow(rParent);
     ToolBox* pToolbar = dynamic_cast<ToolBox*>(pParent.get());
@@ -265,7 +265,7 @@ IMPL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, CheckBox&, rCheckbox, voi
         xConfigItem->ExcludeRecord(xConfigItem->GetResultSetPosition(), rCheckbox.IsChecked());
 };
 
-void MMExcludeEntryController::statusChanged(const frame::FeatureStateEvent& rEvent) throw (uno::RuntimeException, std::exception)
+void MMExcludeEntryController::statusChanged(const frame::FeatureStateEvent& rEvent)
 {
     if (!m_pExcludeCheckbox)
         return;
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index e005507a50a3..054f5f4ff8b3 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -1639,28 +1639,26 @@ public:
     {
     }
 
-    virtual void SAL_CALL selectionChanged(const EventObject& /*rEvent*/) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL selectionChanged(const EventObject& /*rEvent*/) override
     {
     }
 
-    virtual void SAL_CALL disposing(const EventObject&) throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing(const EventObject&) override
     {
         m_rParent.stopDBChangeListening();
     }
 
-    virtual void SAL_CALL dispatch(const css::util::URL& rURL, const css::uno::Sequence< css::beans::PropertyValue >& /*rArgs*/)
-        throw (css::uno::RuntimeException,
-               std::exception) override
+    virtual void SAL_CALL dispatch(const css::util::URL& rURL, const css::uno::Sequence< css::beans::PropertyValue >& /*rArgs*/) override
     {
         if (rURL.Complete.equalsAscii(SwXDispatch::GetDBChangeURL()))
             m_rParent.updateCurrentDBDataFromDocument();
     }
 
-    virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL&) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL&) override
     {
     }
 
-    virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL&) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL&) override
     {
     }
 };
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 8636db60d9ce..f7bc082018d2 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -3605,7 +3605,7 @@ const Sequence< sal_Int8 >& SwTransferable::getUnoTunnelId()
     return theSwTransferableUnoTunnelId::get().getSeq();
 }
 
-sal_Int64 SwTransferable::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException, std::exception )
+sal_Int64 SwTransferable::getSomething( const Sequence< sal_Int8 >& rId )
 {
     sal_Int64 nRet;
     if( ( rId.getLength() == 16 ) &&
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index 5fe11aacab67..16589d5f1f99 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -131,20 +131,16 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent
         virtual ~SidebarTextControlAccessibleContext() override;
 
         virtual sal_Int32 SAL_CALL
-                getAccessibleChildCount()
-                throw (css::uno::RuntimeException, std::exception) override;
+                getAccessibleChildCount() override;
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-                getAccessibleChild( sal_Int32 i )
-                throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+                getAccessibleChild( sal_Int32 i ) override;
 
         virtual void SAL_CALL
                 addAccessibleEventListener (
-                    const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
-                throw (css::uno::RuntimeException, std::exception) override;
+                    const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override;
         virtual void SAL_CALL
                 removeAccessibleEventListener (
-                    const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
-                throw (css::uno::RuntimeException, std::exception) override;
+                    const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override;
 
     protected:
         virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
@@ -180,7 +176,6 @@ void SidebarTextControlAccessibleContext::defunc()
 }
 
 sal_Int32 SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChildCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( maMutex );
 
@@ -195,7 +190,6 @@ sal_Int32 SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChildCount(
 }
 
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChild( sal_Int32 i )
-    throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( maMutex );
 
@@ -211,7 +205,6 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTextContr
 
 void SAL_CALL SidebarTextControlAccessibleContext::addAccessibleEventListener (
     const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( maMutex );
 
@@ -223,7 +216,6 @@ void SAL_CALL SidebarTextControlAccessibleContext::addAccessibleEventListener (
 
 void SAL_CALL SidebarTextControlAccessibleContext::removeAccessibleEventListener (
     const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( maMutex );
 
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index db28a18023da..1edda6d00bb2 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -51,7 +51,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
         }
 
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-            getAccessibleParent() throw (css::uno::RuntimeException, std::exception) override
+            getAccessibleParent() override
         {
             osl::MutexGuard aGuard(maMutex);
 
@@ -66,7 +66,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
             return xAccParent;
         }
 
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override
         {
             osl::MutexGuard aGuard(maMutex);
 
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 0033a5a357e7..44dce31a8ddf 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -217,16 +217,14 @@ public:
 private:
     virtual ~ChangesListener() override {}
 
-    virtual void SAL_CALL disposing(css::lang::EventObject const &)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing(css::lang::EventObject const &) override
     {
         osl::MutexGuard g(editor_.mutex_);
         editor_.m_xNotifier.clear();
     }
 
     virtual void SAL_CALL propertiesChange(
-        css::uno::Sequence< css::beans::PropertyChangeEvent > const &)
-        throw (css::uno::RuntimeException, std::exception) override
+        css::uno::Sequence< css::beans::PropertyChangeEvent > const &) override
     {
         SolarMutexGuard g;
         editor_.SetFont();
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 21ebc03e611a..4c32cc0b588b 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -50,39 +50,26 @@ public:
 
                             // XPropertyAccess
     virtual css::uno::Sequence< css::beans::PropertyValue >
-                            SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override;
+                            SAL_CALL getPropertyValues() override;
     virtual void SAL_CALL   setPropertyValues( const css::uno::Sequence<
-                                    css::beans::PropertyValue >& aProps )
-                                throw (css::beans::UnknownPropertyException,
-                                        css::beans::PropertyVetoException,
-                                        css::lang::IllegalArgumentException,
-                                        css::lang::WrappedTargetException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                    css::beans::PropertyValue >& aProps ) override;
 
                             // XExecutableDialog
-    virtual void SAL_CALL   setTitle( const OUString& aTitle )
-                                throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL   setTitle( const OUString& aTitle ) override;
+    virtual sal_Int16 SAL_CALL execute() override;
 
                             // XImporter
     virtual void SAL_CALL   setTargetDocument( const css::uno::Reference<
-                                    css::lang::XComponent >& xDoc )
-                                throw (css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                    css::lang::XComponent >& xDoc ) override;
 
                             // XExporter
     virtual void SAL_CALL   setSourceDocument( const css::uno::Reference<
-                                    css::lang::XComponent >& xDoc )
-                                throw (css::lang::IllegalArgumentException,
-                                        css::uno::RuntimeException, std::exception) override;
+                                    css::lang::XComponent >& xDoc ) override;
 
                             // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-                                throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-                                throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 223171de1f0d..263e77fac52f 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -154,8 +154,8 @@ public:
     {}
     virtual ~SwAuthenticator() override;
 
-    virtual OUString SAL_CALL getUserName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPassword() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getUserName() override;
+    virtual OUString SAL_CALL getPassword() override;
 
 };
 
@@ -169,8 +169,7 @@ public:
     SwConnectionContext(const OUString& rMailServer, sal_Int16 nPort, const OUString& rConnectionType);
     virtual ~SwConnectionContext() override;
 
-    virtual css::uno::Any SAL_CALL getValueByName(const OUString& Name)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValueByName(const OUString& Name) override;
 };
 
 class SwMutexBase
@@ -191,14 +190,11 @@ public:
     {}
     virtual ~SwConnectionListener() override;
 
-    virtual void SAL_CALL connected(const css::lang::EventObject& aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL connected(const css::lang::EventObject& aEvent) override;
 
-    virtual void SAL_CALL disconnected(const css::lang::EventObject& aEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disconnected(const css::lang::EventObject& aEvent) override;
 
-    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 };
 
 class SW_DLLPUBLIC SwMailTransferable :
@@ -215,42 +211,24 @@ class SW_DLLPUBLIC SwMailTransferable :
     SwMailTransferable(const OUString& rURL, const OUString& rName, const OUString& rMimeType);
     SwMailTransferable(const OUString& rBody, const OUString& rMimeType);
     virtual ~SwMailTransferable() override;
-    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& aFlavor)
-                throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException,
-                       css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& aFlavor) override;
 
-    virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors()
-                            throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& aFlavor)
-                            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& aFlavor) override;
 
     //XPropertySet
-    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo()
-                throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, 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 getPropertyValue(const OUString& PropertyName)
-                throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-                      css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
+    virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const css::uno::Any& aValue) override;
+
+    virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) override;
     virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName,
-                                                    const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener)
-                throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-                      css::uno::RuntimeException, std::exception) override;
+                                                    const css::uno::Reference<css::beans::XPropertyChangeListener>& xListener) override;
     virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName,
-                                                       const css::uno::Reference<css::beans::XPropertyChangeListener >& aListener)
-                throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-                      css::uno::RuntimeException, std::exception) override;
+                                                       const css::uno::Reference<css::beans::XPropertyChangeListener >& aListener) override;
     virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName,
-                                                    const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener)
-                throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-                      css::uno::RuntimeException, std::exception) override;
+                                                    const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override;
     virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,
-                                                       const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener)
-                throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-                      css::uno::RuntimeException, std::exception) override;
+                                                       const css::uno::Reference<css::beans::XVetoableChangeListener>& aListener) override;
 
 };
 
@@ -276,37 +254,25 @@ public:
     virtual ~SwMailMessage() override;
 
     // attributes
-    virtual OUString SAL_CALL getSenderName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSenderAddress() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getReplyToAddress() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress )
-                        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSubject() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSubject(const OUString& _subject)
-                        throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getBody()
-                        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBody(const css::uno::Reference<css::datatransfer::XTransferable>& _body)
-                        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getSenderName() override;
+    virtual OUString SAL_CALL getSenderAddress() override;
+    virtual OUString SAL_CALL getReplyToAddress() override;
+    virtual void SAL_CALL setReplyToAddress( const OUString& _replytoaddress ) override;
+    virtual OUString SAL_CALL getSubject() override;
+    virtual void SAL_CALL setSubject(const OUString& _subject) override;
+
+    virtual css::uno::Reference<css::datatransfer::XTransferable> SAL_CALL getBody() override;
+    virtual void SAL_CALL setBody(const css::uno::Reference<css::datatransfer::XTransferable>& _body) override;
 
     // methods
-    virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress )
-                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress )
-                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress )
-                throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getRecipients()
-                throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getCcRecipients()
-                throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<OUString> SAL_CALL getBccRecipients()
-                throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addAttachment(const css::mail::MailAttachment& aMailAttachment)
-                throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence<css::mail::MailAttachment> SAL_CALL getAttachments()
-                throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addRecipient( const OUString& sRecipientAddress ) override;
+    virtual void SAL_CALL addCcRecipient( const OUString& sRecipientAddress ) override;
+    virtual void SAL_CALL addBccRecipient( const OUString& sRecipientAddress ) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getRecipients() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getCcRecipients() override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getBccRecipients() override;
+    virtual void SAL_CALL addAttachment(const css::mail::MailAttachment& aMailAttachment) override;
+    virtual css::uno::Sequence<css::mail::MailAttachment> SAL_CALL getAttachments() override;
     void SetSenderName(const OUString& rSenderName)
     {
         m_sSenderName = rSenderName;
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index 64a90c5dfd5e..2cc079f7048d 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -207,7 +207,7 @@ public:
     void    Invalidate() {m_pWrtShell = nullptr;}
     static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override;
 };
 
 #endif
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 903af9a20f29..88330c0362aa 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -56,7 +56,7 @@ public:
 
     // XEventListener
     virtual void SAL_CALL disposing(
-                    const css::lang::EventObject& rEventObject ) throw(css::uno::RuntimeException, std::exception) override;
+                    const css::lang::EventObject& rEventObject ) override;
 
     void ViewDestroyed() { pView = nullptr; }
 };
@@ -68,13 +68,10 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper<
     SwView* pView;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) override;
 
     // XClipboardListener
-    virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject ) override;
 
 public:
     SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {}
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index 00d6bb0de895..8011c612885f 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -49,11 +49,6 @@ class SwXBodyText;
 typedef tools::SvRef<SwDocShell> SwDocShellRef;
 #endif
 
-/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface >
-    SAL_CALL SwXAutoTextContainer_createInstance(
-        const css::uno::Reference< css::lang::XMultiServiceFactory > & ) throw ( css::uno::Exception );
-
 class SwXAutoTextContainer : public cppu::WeakImplHelper
 <
     css::text::XAutoTextContainer2,
@@ -69,26 +64,26 @@ public:
     SwXAutoTextContainer();
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XAutoTextContainer
-    virtual css::uno::Reference< css::text::XAutoTextGroup >  SAL_CALL insertNewByName(const OUString& aGroupName) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XAutoTextGroup >  SAL_CALL insertNewByName(const OUString& aGroupName) override;
+    virtual void SAL_CALL removeByName(const OUString& aGroupName) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -116,44 +111,44 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XAutoTextGroup
-    virtual css::uno::Sequence< OUString > SAL_CALL getTitles() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XAutoTextEntry >  SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const css::uno::Reference< css::text::XTextRange > & xTextRange) throw( css::container::ElementExistException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getTitles() override;
+    virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) override;
+    virtual css::uno::Reference< css::text::XAutoTextEntry >  SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const css::uno::Reference< css::text::XTextRange > & xTextRange) override;
+    virtual void SAL_CALL removeByName(const OUString& aEntryName) override;
 
     //XNamed
-    virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName(const OUString& Name_) override;
 
     //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
 
     //XNameAccess
-    virtual css::uno::Any SAL_CALL getByName(const OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName(const OUString& Name) override;
 
     //XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     void    Invalidate();
 };
@@ -212,33 +207,33 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     //XText
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL insertString(const css::uno::Reference< css::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL insertControlCharacter(const css::uno::Reference< css::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL insertTextContent(const css::uno::Reference< css::text::XTextRange > & xRange, const css::uno::Reference< css::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeTextContent(const css::uno::Reference< css::text::XTextContent > & xContent) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursor() override;
+    virtual css::uno::Reference< css::text::XTextCursor >  SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) override;
+    virtual void SAL_CALL insertString(const css::uno::Reference< css::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) override;
+    virtual void SAL_CALL insertControlCharacter(const css::uno::Reference< css::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) override;
+    virtual void SAL_CALL insertTextContent(const css::uno::Reference< css::text::XTextRange > & xRange, const css::uno::Reference< css::text::XTextContent > & xContent, sal_Bool bAbsorb) override;
+    virtual void SAL_CALL removeTextContent(const css::uno::Reference< css::text::XTextContent > & xContent) override;
 
     //XTextRange
-    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL  getStart() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL   getEnd() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL  getString() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL  setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL  getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL   getEnd() override;
+    virtual OUString SAL_CALL  getString() override;
+    virtual void SAL_CALL  setString(const OUString& aString) override;
 
     //XAutoTextEntry
-    virtual void    SAL_CALL applyTo(const css::uno::Reference< css::text::XTextRange > & xRange)throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void    SAL_CALL applyTo(const css::uno::Reference< css::text::XTextRange > & xRange) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XEventsSupplier
-    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents(  ) override;
 
     void    Invalidate() {pGlossaries = nullptr;}
     const SwGlossaries* GetGlossaries() { return pGlossaries; }
@@ -261,27 +256,19 @@ public:
 
     virtual ~SwAutoTextEventDescriptor() override;
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
 
 protected:
 
     virtual void replaceByName(
         const sal_uInt16 nEvent,        /// item ID of event
         const SvxMacro& rMacro)     /// event (will be copied)
-            throw(
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException) override;
+             override;
 
     virtual void getByName(
         SvxMacro& rMacro,           /// macro to be filled
         const sal_uInt16 nEvent )       /// item ID of event
-            throw(
-                css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException) override;
+             override;
 };
 
 #endif
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index 4f4e7cf43ac4..c603f499fd4c 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -68,24 +68,24 @@ public:
     virtual ~SwXDispatchProviderInterceptor() override;
 
     //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;
-    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;
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL 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 ) 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 >& xNewDispatchProvider ) throw(css::uno::RuntimeException, std::exception) 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 >& xNewSupplier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(  ) override;
+    virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewDispatchProvider ) override;
+    virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(  ) override;
+    virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSupplier ) 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;
 
     //XUnoTunnel
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // XInterceptorInfo
-    virtual css::uno::Sequence<OUString> SAL_CALL getInterceptedURLs() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<OUString> SAL_CALL getInterceptedURLs() override;
 
     // view destroyed
     void    Invalidate();
@@ -111,17 +111,15 @@ public:
     SwXDispatch(SwView& rView);
     virtual ~SwXDispatch() override;
 
-    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;
 
     //XSelectionChangeListener
-    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) 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;
 
     static const sal_Char* GetDBChangeURL();
 };
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index 8cdd7d1a50e9..243d226105b3 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -137,37 +137,33 @@ public:
     void LaunchMailMergeEvent( const css::text::MailMergeEvent &rData ) const;
 
     // XJob
-    virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments )
-        throw (css::lang::IllegalArgumentException,
-               css::uno::Exception,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments ) override;
 
     // XCancellable
-    virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL cancel() override;
 
     // XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XMailMergeBroadcaster
-    virtual void SAL_CALL addMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) override;
+    virtual void SAL_CALL removeMailMergeEventListener( const css::uno::Reference< css::text::XMailMergeListener >& xListener ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 #endif
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index e140078fc188..ad83a01700c2 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -53,20 +53,15 @@ public:
     SwXModule();
 
     //XViewSettings
-    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getViewSettings()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getViewSettings() override;
 
     //XPrintSettings
-    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getPrintSettings()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getPrintSettings() override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 enum SwXPrintSettingsType
@@ -84,32 +79,14 @@ protected:
     SwPrintData * mpPrtOpt;
     SwDoc *mpDoc;
 
-    virtual void _preSetValues ()
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException) override;
-    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
-    virtual void _postSetValues ()
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException) override;
-
-    virtual void _preGetValues ()
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException) override;
-
-    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
-        throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) override;
-    virtual void _postGetValues ()
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+    virtual void _preSetValues () override;
+    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) override;
+    virtual void _postSetValues () override;
+
+    virtual void _preGetValues () override;
+
+    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) override;
+    virtual void _postGetValues () override;
 
     virtual ~SwXPrintSettings()
         throw() override;
@@ -117,12 +94,9 @@ public:
     SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = nullptr );
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 class SwXViewSettings : public comphelper::ChainableHelperNoState
@@ -140,38 +114,13 @@ protected:
     FieldUnit   eVRulerUnit;
     bool    mbApplyVRulerMetric;
 
-    virtual void _preSetValues ()
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException) override;
-    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void _postSetValues()
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException) override;
-
-    virtual void _preGetValues ()
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException) override;
-    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException) override;
-    virtual void _postGetValues ()
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+    virtual void _preSetValues () override;
+    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) override;
+    virtual void _postSetValues() override;
+
+    virtual void _preGetValues () override;
+    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) override;
+    virtual void _postGetValues () override;
 
     virtual ~SwXViewSettings()
         throw() override;
@@ -179,9 +128,9 @@ public:
     SwXViewSettings(SwView*  pView);
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     bool    IsValid() const {return bObjectValid;}
     void    Invalidate() {bObjectValid = false;}
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index 6c57dc52f445..fe2d2676cc6d 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -76,74 +76,59 @@ protected:
 public:
     SwXTextView(SwView* pSwView);
 
-    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw() override;
     virtual void SAL_CALL release(  ) throw() override;
 
     //XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
     //XSelectionSupplier
-    virtual css::uno::Any SAL_CALL getSelection()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL select(const css::uno::Any& rInterface)
-        throw (css::lang::IllegalArgumentException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL getSelection() override;
+    virtual sal_Bool SAL_CALL select(const css::uno::Any& rInterface) override;
+    virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) override;
+    virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener > & xListener) override;
 
     // XFormLayerAccess
-    virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isFormDesignMode(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) override;
+    virtual sal_Bool SAL_CALL isFormDesignMode(  ) override;
+    virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) override;
 
     // XControlAccess
-    virtual css::uno::Reference< css::awt::XControl >  SAL_CALL getControl(const css::uno::Reference< css::awt::XControlModel > & Model) throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::awt::XControl >  SAL_CALL getControl(const css::uno::Reference< css::awt::XControlModel > & Model) override;
 
     //XTextViewCursorSupplier
-    virtual css::uno::Reference< css::text::XTextViewCursor >  SAL_CALL getViewCursor() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::text::XTextViewCursor >  SAL_CALL getViewCursor() override;
 
     //XViewSettings
-    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getViewSettings() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getViewSettings() override;
 
     //XRubySelection
     virtual css::uno::Sequence<
-            css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic )
-                throw (css::uno::RuntimeException,
-                       std::exception) override;
+            css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic ) override;
 
     virtual void SAL_CALL setRubyList(
         const css::uno::Sequence<
-        css::uno::Sequence< css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic )
-            throw (css::uno::RuntimeException,
-                   std::exception) override;
+        css::uno::Sequence< css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic ) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //XTransferableSupplier
-    virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getTransferable(  )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw (css::datatransfer::UnsupportedFlavorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getTransferable(  ) override;
+    virtual void SAL_CALL insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) override;
 
     void                    NotifySelChanged();
     void                    NotifyDBChanged();
@@ -181,146 +166,75 @@ public:
     DECLARE_XINTERFACE()
 
     //XTextViewCursor
-    virtual sal_Bool SAL_CALL isVisible() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::awt::Point SAL_CALL getPosition() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL isVisible() override;
+    virtual void SAL_CALL setVisible(sal_Bool bVisible) override;
+    virtual css::awt::Point SAL_CALL getPosition() override;
 
     //XTextCursor - neu
-    virtual void SAL_CALL collapseToStart()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL collapseToEnd()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL isCollapsed()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL gotoStart( sal_Bool bExpand )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL gotoEnd( sal_Bool bExpand )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand )
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual void SAL_CALL collapseToStart() override;
+    virtual void SAL_CALL collapseToEnd() override;
+    virtual sal_Bool SAL_CALL isCollapsed() override;
+    virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) override;
+    virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) override;
+    virtual void SAL_CALL gotoStart( sal_Bool bExpand ) override;
+    virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) override;
+    virtual void SAL_CALL gotoRange( const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand ) override;
 
     //XPageCursor
-    virtual sal_Bool SAL_CALL jumpToFirstPage()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL jumpToLastPage()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL jumpToNextPage() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int16 SAL_CALL getPage()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual sal_Bool SAL_CALL jumpToFirstPage() override;
+    virtual sal_Bool SAL_CALL jumpToLastPage() override;
+    virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) override;
+    virtual sal_Bool SAL_CALL jumpToNextPage() override;
+    virtual sal_Bool SAL_CALL jumpToPreviousPage() override;
+    virtual sal_Bool SAL_CALL jumpToEndOfPage() override;
+    virtual sal_Bool SAL_CALL jumpToStartOfPage() override;
+    virtual sal_Int16 SAL_CALL getPage() override;
 
     //XTextRange
-    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL  getStart()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL   getEnd()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual OUString SAL_CALL  getString()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL  setString(const OUString& aString)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL  getStart() override;
+    virtual css::uno::Reference< css::text::XTextRange > SAL_CALL   getEnd() override;
+    virtual OUString SAL_CALL  getString() override;
+    virtual void SAL_CALL  setString(const OUString& aString) override;
 
     //XScreenCursor
-    virtual sal_Bool SAL_CALL screenDown()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL screenUp()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual sal_Bool SAL_CALL screenDown() override;
+    virtual sal_Bool SAL_CALL screenUp() override;
 
     //XViewCursor
-    virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual sal_Bool SAL_CALL goDown(sal_Int16 nCount, sal_Bool bExpand) override;
+    virtual sal_Bool SAL_CALL goUp(sal_Int16 nCount, sal_Bool bExpand) override;
 
     //XLineCursor
-    virtual sal_Bool SAL_CALL isAtStartOfLine()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual sal_Bool SAL_CALL isAtEndOfLine()
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand)
-        throw (css::uno::RuntimeException,
-               std::exception) override;
+    virtual sal_Bool SAL_CALL isAtStartOfLine() override;
+    virtual sal_Bool SAL_CALL isAtEndOfLine() override;
+    virtual void SAL_CALL gotoEndOfLine(sal_Bool bExpand) override;
+    virtual void SAL_CALL gotoStartOfLine(sal_Bool bExpand) override;
 
     //XPropertySet
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     //XPropertyState
-    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException,
-               std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException,
-               std::exception) override;
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     //XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
     //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     void    Invalidate(){m_pView = nullptr;}
 
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 3a33252d7703..7c5e289b3d5a 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -64,22 +64,15 @@ public:
     // XUIElementFactory
     css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
         const OUString& rsResourceURL,
-        const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-        throw(
-            css::container::NoSuchElementException,
-            css::lang::IllegalArgumentException,
-            css::uno::RuntimeException, std::exception ) override;
-
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+        const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
+
+    OUString SAL_CALL getImplementationName() override
     { return OUString("org.apache.openoffice.comp.sw.sidebar.SwPanelFactory"); }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; }
 };
 
@@ -91,10 +84,6 @@ SwPanelFactory::SwPanelFactory()
 Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement (
     const OUString& rsResourceURL,
     const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
-    throw(
-        container::NoSuchElementException,
-        lang::IllegalArgumentException,
-        RuntimeException, std::exception)
 {
     Reference<ui::XUIElement> xElement;
 
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 0c2af38b7679..22fd72773409 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -254,7 +254,7 @@ SwScannerEventListener::~SwScannerEventListener()
 {
 }
 
-void SAL_CALL SwScannerEventListener::disposing( const EventObject& rEventObject) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SwScannerEventListener::disposing( const EventObject& rEventObject)
 {
 #if defined(_WIN32) || defined UNX
     SolarMutexGuard aGuard;
@@ -268,12 +268,10 @@ SwClipboardChangeListener::~SwClipboardChangeListener()
 }
 
 void SAL_CALL SwClipboardChangeListener::disposing( const EventObject& /*rEventObject*/ )
-    throw ( RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL SwClipboardChangeListener::changedContents( const css::datatransfer::clipboard::ClipboardEvent& rEventObject )
-    throw (RuntimeException, std::exception)
 
 {
     const SolarMutexGuard aGuard;
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index e49d11965418..3e529602ff59 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -258,7 +258,6 @@ SwXDocumentSettings::~SwXDocumentSettings()
 }
 
 Any SAL_CALL SwXDocumentSettings::queryInterface( const Type& rType )
-    throw(RuntimeException, std::exception)
 {
         return ::cppu::queryInterface ( rType,
                                         // OWeakObject interfaces
@@ -283,7 +282,6 @@ void SwXDocumentSettings::release ()
 }
 
 uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -302,13 +300,11 @@ uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes(  )
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwXDocumentSettings::getImplementationId(  )
-    throw (RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 void SwXDocumentSettings::_preSetValues ()
-        throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException )
 {
     mpDocSh = mpModel->GetDocShell();
     if (nullptr == mpDocSh)
@@ -320,7 +316,6 @@ void SwXDocumentSettings::_preSetValues ()
 }
 
 void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue )
-        throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     if (rInfo.mnAttributes & PropertyAttribute::READONLY)
         throw PropertyVetoException ("Property is read-only: " + rInfo.maName, static_cast < cppu::OWeakObject * > ( nullptr ) );
@@ -868,7 +863,6 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
 }
 
 void SwXDocumentSettings::_postSetValues ()
-        throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException )
 {
     // set printer only once, namely here!
     if( mpPrinter != nullptr )
@@ -890,7 +884,6 @@ void SwXDocumentSettings::_postSetValues ()
 }
 
 void SwXDocumentSettings::_preGetValues ()
-        throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException )
 {
     mpDocSh = mpModel->GetDocShell();
     if (nullptr == mpDocSh)
@@ -901,8 +894,6 @@ void SwXDocumentSettings::_preGetValues ()
 }
 
 void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue )
-        throw (beans::UnknownPropertyException, lang::WrappedTargetException,
-               uno::RuntimeException)
 {
     switch( rInfo.mnHandle )
     {
@@ -1282,7 +1273,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
 }
 
 void SwXDocumentSettings::_postGetValues ()
-        throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException )
 {
     mpDocSh = nullptr;
     mpDoc = nullptr;
@@ -1290,19 +1280,16 @@ void SwXDocumentSettings::_postGetValues ()
 
 // XServiceInfo
 OUString SAL_CALL SwXDocumentSettings::getImplementationName(  )
-    throw(RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Writer.DocumentSettings");
 }
 
 sal_Bool SAL_CALL SwXDocumentSettings::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL SwXDocumentSettings::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     Sequence< OUString > aSeq( 3 );
     aSeq[0] = "com.sun.star.document.Settings";
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx
index e816b2cb0868..e42ec574ee3d 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.hxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx
@@ -47,23 +47,13 @@ protected:
      * _postSetValues */
     VclPtr<SfxPrinter>      mpPrinter;
 
-    virtual void _preSetValues ()
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
-    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue )
-        throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void _postSetValues ()
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+    virtual void _preSetValues () override;
+    virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const css::uno::Any &rValue ) override;
+    virtual void _postSetValues () override;
 
-    virtual void _preGetValues ()
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
-    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException) override;
-    virtual void _postGetValues ()
-        throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) override;
+    virtual void _preGetValues () override;
+    virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) override;
+    virtual void _postGetValues () override;
 protected:
     virtual ~SwXDocumentSettings()
         throw() override;
@@ -71,24 +61,20 @@ public:
     SwXDocumentSettings( SwXTextDocument* pModel );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  )
         throw () override;
     virtual void SAL_CALL release(  )
         throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) override;
 };
 #endif
 
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index f14ee60c28dc..512163200986 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -50,7 +50,7 @@ SwXFilterOptions::~SwXFilterOptions()
 {
 }
 
-uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() throw (uno::RuntimeException, std::exception)
+uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues()
 {
     uno::Sequence<beans::PropertyValue> aRet(1);
     beans::PropertyValue* pArray = aRet.getArray();
@@ -62,8 +62,6 @@ uno::Sequence< beans::PropertyValue > SwXFilterOptions::getPropertyValues() thro
 }
 
 void   SwXFilterOptions::setPropertyValues( const uno::Sequence<beans::PropertyValue >& aProps )
-    throw (beans::UnknownPropertyException, beans::PropertyVetoException,
-       IllegalArgumentException, WrappedTargetException, uno::RuntimeException, std::exception)
 {
     const beans::PropertyValue* pPropArray = aProps.getConstArray();
     long nPropCount = aProps.getLength();
@@ -82,11 +80,10 @@ void   SwXFilterOptions::setPropertyValues( const uno::Sequence<beans::PropertyV
 }
 
 void   SwXFilterOptions::setTitle( const OUString& /*rTitle*/ )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
-sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::exception)
+sal_Int16 SwXFilterOptions::execute()
 {
     sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
 
@@ -124,32 +121,28 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::excepti
 }
 
 void   SwXFilterOptions::setTargetDocument( const uno::Reference< XComponent >& xDoc )
-    throw (IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     bExport = false;
     xModel = xDoc;
 }
 
 void   SwXFilterOptions::setSourceDocument( const uno::Reference<XComponent >& xDoc )
-        throw (IllegalArgumentException,uno::RuntimeException, std::exception)
 {
     bExport = true;
     xModel = xDoc;
 }
 
-OUString SwXFilterOptions::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SwXFilterOptions::getImplementationName()
 {
     return OUString("com.sun.star.comp.Writer.FilterOptionsDialog");
 }
 
 sal_Bool SwXFilterOptions::supportsService( const OUString& rServiceName )
-    throw(uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SwXFilterOptions::getSupportedServiceNames()
-                throw(uno::RuntimeException, std::exception)
 {
     OUString sService("com.sun.star.ui.dialogs.FilterOptionsDialog");
     return uno::Sequence< OUString> (&sService, 1);
diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx
index a5bfc3fdb000..279a9eedf7f9 100644
--- a/sw/source/uibase/uno/dlelstnr.cxx
+++ b/sw/source/uibase/uno/dlelstnr.cxx
@@ -72,7 +72,6 @@ SwLinguServiceEventListener::~SwLinguServiceEventListener()
 
 void SAL_CALL SwLinguServiceEventListener::processLinguServiceEvent(
             const LinguServiceEvent& rLngSvcEvent )
-        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -102,7 +101,6 @@ void SAL_CALL SwLinguServiceEventListener::processLinguServiceEvent(
 
 void SAL_CALL SwLinguServiceEventListener::disposing(
             const EventObject& rEventObj )
-        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -114,13 +112,11 @@ void SAL_CALL SwLinguServiceEventListener::disposing(
 
 void SAL_CALL SwLinguServiceEventListener::queryTermination(
             const EventObject& /*rEventObj*/ )
-        throw(TerminationVetoException, RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL SwLinguServiceEventListener::notifyTermination(
             const EventObject& rEventObj )
-        throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 3b19d0f2175d..00c0dc9c0ca6 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -68,7 +68,7 @@ SwXAutoTextContainer::~SwXAutoTextContainer()
 
 }
 
-sal_Int32 SwXAutoTextContainer::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXAutoTextContainer::getCount()
 {
     OSL_ENSURE(pGlossaries->GetGroupCnt() < static_cast<size_t>(SAL_MAX_INT32),
                "SwXAutoTextContainer::getCount: too many items");
@@ -76,7 +76,6 @@ sal_Int32 SwXAutoTextContainer::getCount() throw( uno::RuntimeException, std::ex
 }
 
 uno::Any SwXAutoTextContainer::getByIndex(sal_Int32 nIndex)
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     const size_t nCount = pGlossaries->GetGroupCnt();
@@ -85,20 +84,19 @@ uno::Any SwXAutoTextContainer::getByIndex(sal_Int32 nIndex)
     return getByName(pGlossaries->GetGroupName( static_cast<size_t>(nIndex) ));
 }
 
-uno::Type SwXAutoTextContainer::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type SwXAutoTextContainer::getElementType()
 {
     return cppu::UnoType<text::XAutoTextGroup>::get();
 
 }
 
-sal_Bool SwXAutoTextContainer::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXAutoTextContainer::hasElements()
 {
     // At least standard should always exists!
     return true;
 }
 
 uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName)
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
 
@@ -113,7 +111,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName)
     return makeAny( xGroup );
 }
 
-uno::Sequence< OUString > SwXAutoTextContainer::getElementNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXAutoTextContainer::getElementNames()
 {
     SolarMutexGuard aGuard;
     const size_t nCount = pGlossaries->GetGroupCnt();
@@ -133,7 +131,6 @@ uno::Sequence< OUString > SwXAutoTextContainer::getElementNames() throw( uno::Ru
 }
 // Finds group names with or without path index.
 sal_Bool SwXAutoTextContainer::hasByName(const OUString& Name)
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     OUString sGroupName( pGlossaries->GetCompleteGroupName( Name ) );
@@ -144,7 +141,6 @@ sal_Bool SwXAutoTextContainer::hasByName(const OUString& Name)
 
 uno::Reference< text::XAutoTextGroup >  SwXAutoTextContainer::insertNewByName(
     const OUString& aGroupName)
-    throw( lang::IllegalArgumentException, container::ElementExistException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(hasByName(aGroupName))
@@ -185,7 +181,6 @@ uno::Reference< text::XAutoTextGroup >  SwXAutoTextContainer::insertNewByName(
 }
 
 void SwXAutoTextContainer::removeByName(const OUString& aGroupName)
-    throw( container::NoSuchElementException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     // At first find the name with path extension
@@ -195,17 +190,17 @@ void SwXAutoTextContainer::removeByName(const OUString& aGroupName)
     pGlossaries->DelGroupDoc(sGroupName);
 }
 
-OUString SwXAutoTextContainer::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXAutoTextContainer::getImplementationName()
 {
     return OUString("SwXAutoTextContainer" );
 }
 
-sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXAutoTextContainer::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXAutoTextContainer::getSupportedServiceNames()
 {
     OUString sService("com.sun.star.text.AutoTextContainer");
     const uno::Sequence< OUString > aSeq( &sService, 1 );
@@ -223,7 +218,6 @@ const uno::Sequence< sal_Int8 > & SwXAutoTextGroup::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXAutoTextGroup::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -249,7 +243,7 @@ SwXAutoTextGroup::~SwXAutoTextGroup()
 {
 }
 
-uno::Sequence< OUString > SwXAutoTextGroup::getTitles() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXAutoTextGroup::getTitles()
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr);
@@ -267,8 +261,6 @@ uno::Sequence< OUString > SwXAutoTextGroup::getTitles() throw( uno::RuntimeExcep
 
 void SwXAutoTextGroup::renameByName(const OUString& aElementName,
     const OUString& aNewElementName, const OUString& aNewElementTitle)
-    throw( lang::IllegalArgumentException, container::ElementExistException, io::IOException,
-                                                     uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     // throw exception only if the programmatic name is to be changed into an existing name
@@ -338,7 +330,6 @@ static bool lcl_CopySelToDoc( SwDoc* pInsDoc, OTextCursorHelper* pxCursor, SwXTe
 
 uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const OUString& aName,
         const OUString& aTitle, const uno::Reference< text::XTextRange > & xTextRange)
-        throw( container::ElementExistException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(hasByName(aName))
@@ -435,7 +426,7 @@ uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const
     return xEntry;
 }
 
-void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container::NoSuchElementException, uno::RuntimeException, std::exception )
+void SwXAutoTextGroup::removeByName(const OUString& aEntryName)
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr);
@@ -449,13 +440,13 @@ void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container
         throw container::NoSuchElementException();
 }
 
-OUString SwXAutoTextGroup::getName() throw( uno::RuntimeException, std::exception )
+OUString SwXAutoTextGroup::getName()
 {
     SolarMutexGuard aGuard;
     return sName;
 }
 
-void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeException, std::exception )
+void SwXAutoTextGroup::setName(const OUString& rName)
 {
     SolarMutexGuard aGuard;
     if( !pGlossaries )
@@ -497,7 +488,7 @@ void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeExcepti
     pGlossaries = pTempGlossaries;
 }
 
-sal_Int32 SwXAutoTextGroup::getCount() throw( uno::RuntimeException, std::exception )
+sal_Int32 SwXAutoTextGroup::getCount()
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr);
@@ -507,7 +498,6 @@ sal_Int32 SwXAutoTextGroup::getCount() throw( uno::RuntimeException, std::except
 }
 
 uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex)
-    throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr);
@@ -519,13 +509,13 @@ uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex)
     return getByName(pGlosGroup->GetShortName(static_cast<sal_uInt16>(nIndex)));
 }
 
-uno::Type SwXAutoTextGroup::getElementType() throw( uno::RuntimeException, std::exception )
+uno::Type SwXAutoTextGroup::getElementType()
 {
     return cppu::UnoType<text::XAutoTextEntry>::get();
 
 }
 
-sal_Bool SwXAutoTextGroup::hasElements() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXAutoTextGroup::hasElements()
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr);
@@ -536,7 +526,6 @@ sal_Bool SwXAutoTextGroup::hasElements() throw( uno::RuntimeException, std::exce
 }
 
 uno::Any SwXAutoTextGroup::getByName(const OUString& _rName)
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XAutoTextEntry > xEntry = pGlossaries->GetAutoTextEntry( m_sGroupName, sName, _rName );
@@ -546,7 +535,6 @@ uno::Any SwXAutoTextGroup::getByName(const OUString& _rName)
 }
 
 uno::Sequence< OUString > SwXAutoTextGroup::getElementNames()
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : nullptr);
@@ -563,7 +551,6 @@ uno::Sequence< OUString > SwXAutoTextGroup::getElementNames()
 }
 
 sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName)
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -585,7 +572,6 @@ sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName)
 }
 
 uno::Reference< beans::XPropertySetInfo >  SwXAutoTextGroup::getPropertySetInfo()
-    throw( uno::RuntimeException, std::exception )
 {
     static uno::Reference< beans::XPropertySetInfo >  xRet = pPropSet->getPropertySetInfo();
     return xRet;
@@ -593,8 +579,6 @@ uno::Reference< beans::XPropertySetInfo >  SwXAutoTextGroup::getPropertySetInfo(
 
 void SwXAutoTextGroup::setPropertyValue(
     const OUString& rPropertyName, const uno::Any& aValue)
-    throw( beans::UnknownPropertyException, beans::PropertyVetoException,
-         lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const SfxItemPropertySimpleEntry*   pEntry = pPropSet->getPropertyMap().getByName( rPropertyName );
@@ -623,7 +607,6 @@ void SwXAutoTextGroup::setPropertyValue(
 }
 
 uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     const SfxItemPropertySimpleEntry*   pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
@@ -649,25 +632,21 @@ uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName)
 
 void SwXAutoTextGroup::addPropertyChangeListener(
     const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
 }
 
 void SwXAutoTextGroup::removePropertyChangeListener(
     const OUString& /*PropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
 }
 
 void SwXAutoTextGroup::addVetoableChangeListener(
     const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
 }
 
 void SwXAutoTextGroup::removeVetoableChangeListener(
     const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
-    throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
 }
 
@@ -678,17 +657,17 @@ void SwXAutoTextGroup::Invalidate()
     m_sGroupName.clear();
 }
 
-OUString SwXAutoTextGroup::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXAutoTextGroup::getImplementationName()
 {
     return OUString("SwXAutoTextGroup");
 }
 
-sal_Bool SwXAutoTextGroup::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXAutoTextGroup::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXAutoTextGroup::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXAutoTextGroup::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet { "com.sun.star.text.AutoTextGroup" };
     return aRet;
@@ -705,7 +684,6 @@ const uno::Sequence< sal_Int8 > & SwXAutoTextEntry::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXAutoTextEntry::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -799,7 +777,7 @@ void SwXAutoTextEntry::disposing()
     implFlushDocument(true);
 }
 
-uno::Reference< text::XTextCursor >  SwXAutoTextEntry::createTextCursor() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextCursor >  SwXAutoTextEntry::createTextCursor()
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
@@ -807,14 +785,14 @@ uno::Reference< text::XTextCursor >  SwXAutoTextEntry::createTextCursor() throw(
 }
 
 uno::Reference< text::XTextCursor >  SwXAutoTextEntry::createTextCursorByRange(
-    const uno::Reference< text::XTextRange > & aTextPosition) throw( uno::RuntimeException, std::exception )
+    const uno::Reference< text::XTextRange > & aTextPosition)
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
     return mxBodyText->createTextCursorByRange ( aTextPosition );
 }
 
-void SwXAutoTextEntry::insertString(const uno::Reference< text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( uno::RuntimeException, std::exception )
+void SwXAutoTextEntry::insertString(const uno::Reference< text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb)
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
@@ -823,7 +801,6 @@ void SwXAutoTextEntry::insertString(const uno::Reference< text::XTextRange > & x
 
 void SwXAutoTextEntry::insertControlCharacter(const uno::Reference< text::XTextRange > & xRange,
     sal_Int16 nControlCharacter, sal_Bool bAbsorb)
-        throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
@@ -833,7 +810,6 @@ void SwXAutoTextEntry::insertControlCharacter(const uno::Reference< text::XTextR
 void SwXAutoTextEntry::insertTextContent(
     const uno::Reference< text::XTextRange > & xRange,
     const uno::Reference< text::XTextContent > & xContent, sal_Bool bAbsorb)
-        throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
@@ -842,49 +818,48 @@ void SwXAutoTextEntry::insertTextContent(
 
 void SwXAutoTextEntry::removeTextContent(
     const uno::Reference< text::XTextContent > & xContent)
-        throw( container::NoSuchElementException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
     mxBodyText->removeTextContent ( xContent );
 }
 
-uno::Reference< text::XText >  SwXAutoTextEntry::getText() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XText >  SwXAutoTextEntry::getText()
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XText >  xRet =  static_cast<text::XText*>(this);
     return xRet;
 }
 
-uno::Reference< text::XTextRange >  SwXAutoTextEntry::getStart() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextRange >  SwXAutoTextEntry::getStart()
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
     return mxBodyText->getStart();
 }
 
-uno::Reference< text::XTextRange >  SwXAutoTextEntry::getEnd() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextRange >  SwXAutoTextEntry::getEnd()
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
     return mxBodyText->getEnd();
 }
 
-OUString SwXAutoTextEntry::getString() throw( uno::RuntimeException, std::exception )
+OUString SwXAutoTextEntry::getString()
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
     return mxBodyText->getString();
 }
 
-void SwXAutoTextEntry::setString(const OUString& aString) throw( uno::RuntimeException, std::exception )
+void SwXAutoTextEntry::setString(const OUString& aString)
 {
     SolarMutexGuard aGuard;
     EnsureBodyText();
     mxBodyText->setString( aString );
 }
 
-void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextRange)throw( uno::RuntimeException, std::exception )
+void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextRange)
 {
     SolarMutexGuard aGuard;
 
@@ -956,24 +931,23 @@ void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextR
         throw uno::RuntimeException();
 }
 
-OUString SwXAutoTextEntry::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SwXAutoTextEntry::getImplementationName()
 {
     return OUString("SwXAutoTextEntry");
 }
 
-sal_Bool SwXAutoTextEntry::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXAutoTextEntry::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > SwXAutoTextEntry::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SwXAutoTextEntry::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet { "com.sun.star.text.AutoTextEntry" };
     return aRet;
 }
 
 uno::Reference< container::XNameReplace > SwXAutoTextEntry::getEvents()
-    throw( uno::RuntimeException, std::exception )
 {
     return new SwAutoTextEventDescriptor( *this );
 }
@@ -999,7 +973,6 @@ SwAutoTextEventDescriptor::~SwAutoTextEventDescriptor()
 }
 
 OUString SwAutoTextEventDescriptor::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return sSwAutoTextEventDescriptor;
 }
@@ -1007,11 +980,6 @@ OUString SwAutoTextEventDescriptor::getImplementationName()
 void SwAutoTextEventDescriptor::replaceByName(
     const sal_uInt16 nEvent,
     const SvxMacro& rMacro)
-            throw(
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException)
 {
     OSL_ENSURE( nullptr != rAutoTextEntry.GetGlossaries(),
                 "Strangely enough, the AutoText vanished!" );
@@ -1045,10 +1013,6 @@ void SwAutoTextEventDescriptor::replaceByName(
 void SwAutoTextEventDescriptor::getByName(
     SvxMacro& rMacro,
     const sal_uInt16 nEvent )
-            throw(
-                container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException)
 {
     OSL_ENSURE( nullptr != rAutoTextEntry.GetGlossaries(), "no AutoText" );
     OSL_ENSURE( (nEvent == SW_EVENT_END_INS_GLOSSARY) ||
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index 7da8b90a90d5..8fc82355fed5 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -63,7 +63,6 @@ SwXDispatchProviderInterceptor::~SwXDispatchProviderInterceptor()
 
 uno::Reference< frame::XDispatch > SwXDispatchProviderInterceptor::queryDispatch(
     const util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
-        throw(uno::RuntimeException, std::exception)
 {
     DispatchMutexLock_Impl aLock(*this);
     uno::Reference< frame::XDispatch> xResult;
@@ -88,7 +87,7 @@ uno::Reference< frame::XDispatch > SwXDispatchProviderInterceptor::queryDispatch
     return xResult;
 }
 
-uno::Sequence<OUString> SAL_CALL SwXDispatchProviderInterceptor::getInterceptedURLs() throw (uno::RuntimeException, std::exception)
+uno::Sequence<OUString> SAL_CALL SwXDispatchProviderInterceptor::getInterceptedURLs()
 {
     uno::Sequence<OUString> aRet =
     {
@@ -99,7 +98,7 @@ uno::Sequence<OUString> SAL_CALL SwXDispatchProviderInterceptor::getInterceptedU
 }
 
 uno::Sequence< uno::Reference< frame::XDispatch > > SwXDispatchProviderInterceptor::queryDispatches(
-    const uno::Sequence< frame::DispatchDescriptor >& aDescripts ) throw(uno::RuntimeException, std::exception)
+    const uno::Sequence< frame::DispatchDescriptor >& aDescripts )
 {
     DispatchMutexLock_Impl aLock(*this);
     uno::Sequence< uno::Reference< frame::XDispatch> > aReturn(aDescripts.getLength());
@@ -114,35 +113,32 @@ uno::Sequence< uno::Reference< frame::XDispatch > > SwXDispatchProviderIntercept
 }
 
 uno::Reference< frame::XDispatchProvider > SwXDispatchProviderInterceptor::getSlaveDispatchProvider(  )
-        throw(uno::RuntimeException, std::exception)
 {
     DispatchMutexLock_Impl aLock(*this);
     return m_xSlaveDispatcher;
 }
 
 void SwXDispatchProviderInterceptor::setSlaveDispatchProvider(
-    const uno::Reference< frame::XDispatchProvider >& xNewDispatchProvider ) throw(uno::RuntimeException, std::exception)
+    const uno::Reference< frame::XDispatchProvider >& xNewDispatchProvider )
 {
     DispatchMutexLock_Impl aLock(*this);
     m_xSlaveDispatcher = xNewDispatchProvider;
 }
 
 uno::Reference< frame::XDispatchProvider > SwXDispatchProviderInterceptor::getMasterDispatchProvider(  )
-        throw(uno::RuntimeException, std::exception)
 {
     DispatchMutexLock_Impl aLock(*this);
     return m_xMasterDispatcher;
 }
 
 void SwXDispatchProviderInterceptor::setMasterDispatchProvider(
-    const uno::Reference< frame::XDispatchProvider >& xNewSupplier ) throw(uno::RuntimeException, std::exception)
+    const uno::Reference< frame::XDispatchProvider >& xNewSupplier )
 {
     DispatchMutexLock_Impl aLock(*this);
     m_xMasterDispatcher = xNewSupplier;
 }
 
 void SwXDispatchProviderInterceptor::disposing( const lang::EventObject& )
-    throw(uno::RuntimeException, std::exception)
 {
     DispatchMutexLock_Impl aLock(*this);
     if (m_xIntercepted.is())
@@ -168,7 +164,6 @@ const uno::Sequence< sal_Int8 > & SwXDispatchProviderInterceptor::getUnoTunnelId
 
 sal_Int64 SwXDispatchProviderInterceptor::getSomething(
     const uno::Sequence< sal_Int8 >& aIdentifier )
-        throw(uno::RuntimeException, std::exception)
 {
     if( aIdentifier.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -213,7 +208,6 @@ SwXDispatch::~SwXDispatch()
 
 void SwXDispatch::dispatch(const util::URL& aURL,
     const uno::Sequence< beans::PropertyValue >& aArgs)
-        throw (uno::RuntimeException, std::exception)
 {
     if(!m_pView)
         throw uno::RuntimeException();
@@ -280,7 +274,7 @@ void SwXDispatch::dispatch(const util::URL& aURL,
 }
 
 void SwXDispatch::addStatusListener(
-    const uno::Reference< frame::XStatusListener >& xControl, const util::URL& aURL ) throw(uno::RuntimeException, std::exception)
+    const uno::Reference< frame::XStatusListener >& xControl, const util::URL& aURL )
 {
     if(!m_pView)
         throw uno::RuntimeException();
@@ -328,7 +322,7 @@ void SwXDispatch::addStatusListener(
 }
 
 void SwXDispatch::removeStatusListener(
-    const uno::Reference< frame::XStatusListener >& xControl, const util::URL&  ) throw(uno::RuntimeException, std::exception)
+    const uno::Reference< frame::XStatusListener >& xControl, const util::URL&  )
 {
     StatusListenerList::iterator aListIter = m_aListenerList.begin();
     for(aListIter = m_aListenerList.begin(); aListIter != m_aListenerList.end(); ++aListIter)
@@ -349,7 +343,7 @@ void SwXDispatch::removeStatusListener(
     }
 }
 
-void SwXDispatch::selectionChanged( const lang::EventObject&  ) throw(uno::RuntimeException, std::exception)
+void SwXDispatch::selectionChanged( const lang::EventObject&  )
 {
     ShellModes eMode = m_pView->GetShellMode();
     bool bEnable = SHELL_MODE_TEXT == eMode  ||
@@ -375,7 +369,7 @@ void SwXDispatch::selectionChanged( const lang::EventObject&  ) throw(uno::Runti
     }
 }
 
-void SwXDispatch::disposing( const lang::EventObject& rSource ) throw(uno::RuntimeException, std::exception)
+void SwXDispatch::disposing( const lang::EventObject& rSource )
 {
     uno::Reference<view::XSelectionSupplier> xSupplier(rSource.Source, uno::UNO_QUERY);
     uno::Reference<view::XSelectionChangeListener> xThis = this;
diff --git a/sw/source/uibase/uno/unodoc.cxx b/sw/source/uibase/uno/unodoc.cxx
index 929ebcc94944..0beff83088fd 100644
--- a/sw/source/uibase/uno/unodoc.cxx
+++ b/sw/source/uibase/uno/unodoc.cxx
@@ -46,7 +46,6 @@ OUString SAL_CALL SwTextDocument_getImplementationName() throw()
 
 uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance(
         const uno::Reference< lang::XMultiServiceFactory >&, SfxModelFlags _nCreationFlags )
-    throw( uno::Exception )
 {
     SolarMutexGuard aGuard;
     SwGlobals::ensure();
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index e482fc224f61..93499c7267f1 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -132,7 +132,6 @@ static bool LoadFromURL_impl(
         SfxObjectShellRef &rxDocSh,
         const OUString &rURL,
         bool bClose )
-    throw (RuntimeException)
 {
     // try to open the document readonly and hidden
     Reference< frame::XModel > xTmpModel;
@@ -202,11 +201,11 @@ namespace
         virtual ~DelayedFileDeletion( ) override;
 
         // XCloseListener
-        virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL queryClosing( const EventObject& _rSource, sal_Bool _bGetsOwnership ) override;
+        virtual void SAL_CALL notifyClosing( const EventObject& _rSource ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
     private:
         void implTakeOwnership( );
@@ -297,7 +296,7 @@ namespace
         m_aDeleteTimer.Start( );
     }
 
-    void SAL_CALL DelayedFileDeletion::queryClosing( const EventObject& , sal_Bool _bGetsOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception)
+    void SAL_CALL DelayedFileDeletion::queryClosing( const EventObject& , sal_Bool _bGetsOwnership )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( _bGetsOwnership )
@@ -308,7 +307,7 @@ namespace
         throw util::CloseVetoException( );
     }
 
-    void SAL_CALL DelayedFileDeletion::notifyClosing( const EventObject&  ) throw (RuntimeException, std::exception)
+    void SAL_CALL DelayedFileDeletion::notifyClosing( const EventObject&  )
     {
         OSL_FAIL("DelayedFileDeletion::notifyClosing: how this?" );
         // this should not happen:
@@ -316,7 +315,7 @@ namespace
         // Or, we ourself close the document, then we should not be a listener anymore
     }
 
-    void SAL_CALL DelayedFileDeletion::disposing( const EventObject&  ) throw (RuntimeException, std::exception)
+    void SAL_CALL DelayedFileDeletion::disposing( const EventObject&  )
     {
         OSL_FAIL("DelayedFileDeletion::disposing: how this?" );
         // this should not happen:
@@ -432,8 +431,6 @@ private:
 
 uno::Any SAL_CALL SwXMailMerge::execute(
         const uno::Sequence< beans::NamedValue >& rArguments )
-    throw (IllegalArgumentException, Exception,
-           RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     MailMergeExecuteFinalizer aFinalizer(this);
@@ -832,7 +829,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
         return makeAny( true );
 }
 
-void SAL_CALL SwXMailMerge::cancel() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXMailMerge::cancel()
 {
     // Cancel may be called from a second thread, so this protects from m_pMgr
     /// cleanup in the execute function.
@@ -869,7 +866,6 @@ void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetInfo(  )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static Reference< XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo();
@@ -878,7 +874,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetI
 
 void SAL_CALL SwXMailMerge::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue )
-    throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1032,7 +1027,6 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
 
 uno::Any SAL_CALL SwXMailMerge::getPropertyValue(
         const OUString& rPropertyName )
-    throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1087,7 +1081,6 @@ uno::Any SAL_CALL SwXMailMerge::getPropertyValue(
 void SAL_CALL SwXMailMerge::addPropertyChangeListener(
         const OUString& rPropertyName,
         const uno::Reference< beans::XPropertyChangeListener >& rListener )
-    throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!m_bDisposing && rListener.is())
@@ -1103,7 +1096,6 @@ void SAL_CALL SwXMailMerge::addPropertyChangeListener(
 void SAL_CALL SwXMailMerge::removePropertyChangeListener(
         const OUString& rPropertyName,
         const uno::Reference< beans::XPropertyChangeListener >& rListener )
-    throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!m_bDisposing && rListener.is())
@@ -1119,7 +1111,6 @@ void SAL_CALL SwXMailMerge::removePropertyChangeListener(
 void SAL_CALL SwXMailMerge::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*rListener*/ )
-    throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // no vetoable property, thus no support for vetoable change listeners
     OSL_FAIL("not implemented");
@@ -1128,14 +1119,12 @@ void SAL_CALL SwXMailMerge::addVetoableChangeListener(
 void SAL_CALL SwXMailMerge::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*rListener*/ )
-    throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     // no vetoable property, thus no support for vetoable change listeners
     OSL_FAIL("not implemented");
 }
 
 void SAL_CALL SwXMailMerge::dispose()
-    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1152,7 +1141,6 @@ void SAL_CALL SwXMailMerge::dispose()
 
 void SAL_CALL SwXMailMerge::addEventListener(
         const Reference< XEventListener >& rxListener )
-    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!m_bDisposing && rxListener.is())
@@ -1161,7 +1149,6 @@ void SAL_CALL SwXMailMerge::addEventListener(
 
 void SAL_CALL SwXMailMerge::removeEventListener(
         const Reference< XEventListener >& rxListener )
-    throw(RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!m_bDisposing && rxListener.is())
@@ -1170,7 +1157,6 @@ void SAL_CALL SwXMailMerge::removeEventListener(
 
 void SAL_CALL SwXMailMerge::addMailMergeEventListener(
         const uno::Reference< XMailMergeListener >& rxListener )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!m_bDisposing && rxListener.is())
@@ -1179,7 +1165,6 @@ void SAL_CALL SwXMailMerge::addMailMergeEventListener(
 
 void SAL_CALL SwXMailMerge::removeMailMergeEventListener(
         const uno::Reference< XMailMergeListener >& rxListener )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if (!m_bDisposing && rxListener.is())
@@ -1187,19 +1172,16 @@ void SAL_CALL SwXMailMerge::removeMailMergeEventListener(
 }
 
 OUString SAL_CALL SwXMailMerge::getImplementationName()
-    throw(RuntimeException, std::exception)
 {
     return OUString( "SwXMailMerge" );
 }
 
 sal_Bool SAL_CALL SwXMailMerge::supportsService( const OUString& rServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SwXMailMerge::getSupportedServiceNames()
-    throw(RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aNames(2);
     OUString *pName = aNames.getArray();
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index f3ae86406b88..46321258981e 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -203,7 +203,7 @@ SwXModule::~SwXModule()
 {
 }
 
-Reference< XPropertySet >  SwXModule::getViewSettings() throw( uno::RuntimeException, std::exception )
+Reference< XPropertySet >  SwXModule::getViewSettings()
 {
     SolarMutexGuard aGuard;
     if(!mxViewSettings.is())
@@ -214,7 +214,7 @@ Reference< XPropertySet >  SwXModule::getViewSettings() throw( uno::RuntimeExcep
     return mxViewSettings;
 }
 
-Reference< XPropertySet >  SwXModule::getPrintSettings() throw( uno::RuntimeException, std::exception )
+Reference< XPropertySet >  SwXModule::getPrintSettings()
 {
     SolarMutexGuard aGuard;
     if(!mxPrintSettings.is())
@@ -225,17 +225,17 @@ Reference< XPropertySet >  SwXModule::getPrintSettings() throw( uno::RuntimeExce
     return mxPrintSettings;
 }
 
-OUString SwXModule::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXModule::getImplementationName()
 {
     return OUString( "SwXModule"  );
 }
 
-sal_Bool SwXModule::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXModule::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXModule::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXModule::getSupportedServiceNames()
 {
     OUString sService( "com.sun.star.text.GlobalSettings");
     const Sequence< OUString > aSeq( &sService, 1 );
@@ -256,9 +256,6 @@ SwXPrintSettings::~SwXPrintSettings()
 }
 
 void SwXPrintSettings::_preSetValues ()
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException,
-           RuntimeException)
 {
     switch (meType)
     {
@@ -279,8 +276,6 @@ void SwXPrintSettings::_preSetValues ()
 }
 
 void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue )
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException)
 {
     bool bVal;
 
@@ -408,17 +403,11 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo,
 }
 
 void SwXPrintSettings::_postSetValues()
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException,
-           RuntimeException)
 {
     mpPrtOpt = nullptr;
 }
 
 void SwXPrintSettings::_preGetValues()
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException,
-           RuntimeException)
 {
     switch (meType)
     {
@@ -439,7 +428,6 @@ void SwXPrintSettings::_preGetValues()
 }
 
 void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue )
-    throw(UnknownPropertyException, WrappedTargetException )
 {
     switch( rInfo.mnHandle )
     {
@@ -513,22 +501,21 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo,
 }
 
 void SwXPrintSettings::_postGetValues ()
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
 {
     mpPrtOpt = nullptr;
 }
 
-OUString SwXPrintSettings::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXPrintSettings::getImplementationName()
 {
     return OUString("SwXPrintSettings");
 }
 
-sal_Bool SwXPrintSettings::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXPrintSettings::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXPrintSettings::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXPrintSettings::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.PrintSettings" };
     return aRet;
@@ -559,9 +546,6 @@ SwXViewSettings::~SwXViewSettings()
 }
 
 void SwXViewSettings::_preSetValues ()
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException,
-           RuntimeException)
 {
     const SwViewOption* pVOpt = nullptr;
     if(pView)
@@ -580,9 +564,6 @@ void SwXViewSettings::_preSetValues ()
 }
 
 void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, const uno::Any &rValue )
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException,
-           RuntimeException, std::exception)
 {
     // the API flag should not be set to the application's view settings
     switch( rInfo.mnHandle )
@@ -784,9 +765,6 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
 }
 
 void SwXViewSettings::_postSetValues()
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException,
-           RuntimeException )
 {
     if( pView )
     {
@@ -815,9 +793,6 @@ void SwXViewSettings::_postSetValues()
 }
 
 void SwXViewSettings::_preGetValues ()
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException,
-           RuntimeException)
 {
     if(pView)
     {
@@ -830,7 +805,6 @@ void SwXViewSettings::_preGetValues ()
 }
 
 void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue )
-    throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     bool bBool = true;
     bool bBoolVal = false;
@@ -974,22 +948,21 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
 }
 
 void SwXViewSettings::_postGetValues ()
-    throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )
 {
     mpConstViewOption = nullptr;
 }
 
-OUString SwXViewSettings::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXViewSettings::getImplementationName()
 {
     return OUString("SwXViewSettings");
 }
 
-sal_Bool SwXViewSettings::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXViewSettings::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXViewSettings::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXViewSettings::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.text.ViewSettings" };
     return aRet;
diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx
index da6f74cf3a8c..900e54b17ae3 100644
--- a/sw/source/uibase/uno/unomodule.cxx
+++ b/sw/source/uibase/uno/unomodule.cxx
@@ -46,14 +46,13 @@ uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw(
 
 uno::Reference< uno::XInterface > SAL_CALL SwUnoModule_createInstance(
                 const uno::Reference< lang::XMultiServiceFactory > &  )
-    throw (css::uno::Exception)
 {
     SolarMutexGuard aGuard;
     return uno::Reference< uno::XInterface >( dynamic_cast< frame::XDispatch * >(new SwUnoModule), uno::UNO_QUERY );
 }
 
     // XNotifyingDispatch
-void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener )
 {
     // there is no guarantee, that we are holded alive during this method!
     // May the outside dispatch container will be updated by a CONTEXT_CHANGED
@@ -86,7 +85,7 @@ void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, cons
 }
 
     // XDispatch
-void SAL_CALL SwUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SwUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs )
 {
     dispatchWithNotification(aURL, aArgs, uno::Reference< frame::XDispatchResultListener >());
 }
@@ -94,18 +93,17 @@ void SAL_CALL SwUnoModule::dispatch( const util::URL& aURL, const uno::Sequence<
 void SAL_CALL SwUnoModule::addStatusListener(
     const uno::Reference< frame::XStatusListener > & /*xControl*/,
     const util::URL& /*aURL*/)
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL SwUnoModule::removeStatusListener(
     const uno::Reference< frame::XStatusListener > & /*xControl*/,
-    const util::URL& /*aURL*/) throw( uno::RuntimeException, std::exception )
+    const util::URL& /*aURL*/)
 {
 }
 
 uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SwUnoModule::queryDispatches(
-    const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( uno::RuntimeException, std::exception )
+    const uno::Sequence< frame::DispatchDescriptor >& seqDescripts )
 {
     sal_Int32 nCount = seqDescripts.getLength();
     uno::Sequence< uno::Reference< frame::XDispatch > > lDispatcher( nCount );
@@ -123,7 +121,7 @@ uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SwUnoModule::queryD
 // XDispatchProvider
 uno::Reference< frame::XDispatch > SAL_CALL SwUnoModule::queryDispatch(
     const util::URL& aURL, const OUString& /*sTargetFrameName*/,
-    sal_Int32 /*eSearchFlags*/    ) throw( uno::RuntimeException, std::exception )
+    sal_Int32 /*eSearchFlags*/    )
 {
     uno::Reference< frame::XDispatch > xReturn;
 
@@ -137,17 +135,17 @@ uno::Reference< frame::XDispatch > SAL_CALL SwUnoModule::queryDispatch(
 }
 
 // XServiceInfo
-OUString SAL_CALL SwUnoModule::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SwUnoModule::getImplementationName(  )
 {
     return SwUnoModule_getImplementationName();
 }
 
-sal_Bool SAL_CALL SwUnoModule::supportsService( const OUString& sServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwUnoModule::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-uno::Sequence< OUString > SAL_CALL SwUnoModule::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SwUnoModule::getSupportedServiceNames(  )
 {
     return SwUnoModule_getSupportedServiceNames();
 }
diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx
index 58316b1835d7..5a371d65665b 100644
--- a/sw/source/uibase/uno/unomodule.hxx
+++ b/sw/source/uibase/uno/unomodule.hxx
@@ -54,22 +54,22 @@ public:
     SwUnoModule() {}
 
     // XNotifyingDispatch
-    virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) 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;
 
     // XDispatchProvider
-    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 ;
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) override ;
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(  const   css::util::URL &            aURL            ,
                                                             const   OUString &   sTargetFrameName,
-                                                                    sal_Int32   eSearchFlags    ) throw( css::uno::RuntimeException, std::exception ) override ;
+                                                                    sal_Int32   eSearchFlags    ) override ;
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 #endif
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index a1ca0a03b4c2..81519d940c3c 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -273,7 +273,6 @@ const Sequence< sal_Int8 > & SwXTextDocument::getUnoTunnelId()
 }
 
 sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rId )
-    throw(RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -301,7 +300,7 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI
     return (xNumTunnel.is()) ? xNumTunnel->getSomething(rId) : 0;
 }
 
-Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType )
 {
     Any aRet = SwXTextDocumentBaseClass::queryInterface(rType);
     if ( !aRet.hasValue() )
@@ -344,12 +343,12 @@ void SAL_CALL SwXTextDocument::release()throw()
     SfxBaseModel::release();
 }
 
-Reference< XAdapter > SwXTextDocument::queryAdapter(  ) throw(RuntimeException, std::exception)
+Reference< XAdapter > SwXTextDocument::queryAdapter(  )
 {
     return SfxBaseModel::queryAdapter();
 }
 
-Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() throw(RuntimeException, std::exception)
+Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes()
 {
     Sequence< uno::Type > aBaseTypes = SfxBaseModel::getTypes();
     Sequence< uno::Type > aTextTypes = SwXTextDocumentBaseClass::getTypes();
@@ -493,7 +492,7 @@ void SwXTextDocument::GetNumberFormatter()
     }
 }
 
-Reference< XText >  SwXTextDocument::getText() throw( RuntimeException, std::exception )
+Reference< XText >  SwXTextDocument::getText()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -506,14 +505,14 @@ Reference< XText >  SwXTextDocument::getText() throw( RuntimeException, std::exc
     return xBodyText;
 }
 
-void SwXTextDocument::reformat() throw( RuntimeException, std::exception )
+void SwXTextDocument::reformat()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
         throw RuntimeException();
 }
 
-void SwXTextDocument::lockControllers() throw( RuntimeException, std::exception )
+void SwXTextDocument::lockControllers()
 {
     SolarMutexGuard aGuard;
     if(IsValid())
@@ -525,7 +524,7 @@ void SwXTextDocument::lockControllers() throw( RuntimeException, std::exception
         throw RuntimeException();
 }
 
-void SwXTextDocument::unlockControllers() throw( RuntimeException, std::exception )
+void SwXTextDocument::unlockControllers()
 {
     SolarMutexGuard aGuard;
     if(!aActionArr.empty())
@@ -538,24 +537,23 @@ void SwXTextDocument::unlockControllers() throw( RuntimeException, std::exceptio
         throw RuntimeException();
 }
 
-sal_Bool SwXTextDocument::hasControllersLocked() throw( RuntimeException, std::exception )
+sal_Bool SwXTextDocument::hasControllersLocked()
 {
     SolarMutexGuard aGuard;
     return !aActionArr.empty();
 }
 
-Reference< frame::XController >  SwXTextDocument::getCurrentController() throw( RuntimeException, std::exception )
+Reference< frame::XController >  SwXTextDocument::getCurrentController()
 {
     return SfxBaseModel::getCurrentController();
 }
 
 void SwXTextDocument::setCurrentController(const Reference< frame::XController > & xController)
-    throw( NoSuchElementException, RuntimeException, std::exception )
 {
     SfxBaseModel::setCurrentController(xController);
 }
 
-Reference< XInterface >  SwXTextDocument::getCurrentSelection() throw( RuntimeException, std::exception )
+Reference< XInterface >  SwXTextDocument::getCurrentSelection()
 {
     SolarMutexGuard aGuard;
     Reference< XInterface >  xRef;
@@ -576,37 +574,36 @@ Reference< XInterface >  SwXTextDocument::getCurrentSelection() throw( RuntimeEx
 }
 
 sal_Bool SwXTextDocument::attachResource(const OUString& aURL, const Sequence< beans::PropertyValue >& aArgs)
-        throw( RuntimeException, std::exception )
 {
     return SfxBaseModel::attachResource(aURL, aArgs);
 }
 
-OUString SwXTextDocument::getURL() throw( RuntimeException, std::exception )
+OUString SwXTextDocument::getURL()
 {
     return SfxBaseModel::getURL();
 }
 
-Sequence< beans::PropertyValue > SwXTextDocument::getArgs() throw( RuntimeException, std::exception )
+Sequence< beans::PropertyValue > SwXTextDocument::getArgs()
 {
     return SfxBaseModel::getArgs();
 }
 
-void SwXTextDocument::connectController(const Reference< frame::XController > & xController) throw( RuntimeException, std::exception )
+void SwXTextDocument::connectController(const Reference< frame::XController > & xController)
 {
     SfxBaseModel::connectController(xController);
 }
 
-void SwXTextDocument::disconnectController(const Reference< frame::XController > & xController) throw( RuntimeException, std::exception )
+void SwXTextDocument::disconnectController(const Reference< frame::XController > & xController)
 {
     SfxBaseModel::disconnectController(xController);
 }
 
-void SwXTextDocument::dispose() throw( RuntimeException, std::exception )
+void SwXTextDocument::dispose()
 {
     SfxBaseModel::dispose();
 }
 
-void SwXTextDocument::close( sal_Bool bDeliverOwnership ) throw( util::CloseVetoException, RuntimeException, std::exception )
+void SwXTextDocument::close( sal_Bool bDeliverOwnership )
 {
     SolarMutexGuard aGuard;
     if(IsValid() && m_pHiddenViewFrame)
@@ -614,18 +611,17 @@ void SwXTextDocument::close( sal_Bool bDeliverOwnership ) throw( util::CloseVeto
     SfxBaseModel::close(bDeliverOwnership);
 }
 
-void SwXTextDocument::addEventListener(const Reference< lang::XEventListener > & aListener) throw( RuntimeException, std::exception )
+void SwXTextDocument::addEventListener(const Reference< lang::XEventListener > & aListener)
 {
     SfxBaseModel::addEventListener(aListener);
 }
 
-void SwXTextDocument::removeEventListener(const Reference< lang::XEventListener > & aListener) throw( RuntimeException, std::exception )
+void SwXTextDocument::removeEventListener(const Reference< lang::XEventListener > & aListener)
 {
     SfxBaseModel::removeEventListener(aListener);
 }
 
 Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties()
-            throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(IsValid())
@@ -641,7 +637,6 @@ Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties()
 }
 
 Reference< XIndexReplace >  SwXTextDocument::getChapterNumberingRules()
-                                    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -653,7 +648,7 @@ Reference< XIndexReplace >  SwXTextDocument::getChapterNumberingRules()
     return mxXChapterNumbering;
 }
 
-Reference< XIndexAccess >  SwXTextDocument::getNumberingRules() throw( RuntimeException, std::exception )
+Reference< XIndexAccess >  SwXTextDocument::getNumberingRules()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -665,7 +660,7 @@ Reference< XIndexAccess >  SwXTextDocument::getNumberingRules() throw( RuntimeEx
     return mxXNumberingRules;
 }
 
-Reference< XIndexAccess >  SwXTextDocument::getFootnotes() throw( RuntimeException, std::exception )
+Reference< XIndexAccess >  SwXTextDocument::getFootnotes()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -678,7 +673,7 @@ Reference< XIndexAccess >  SwXTextDocument::getFootnotes() throw( RuntimeExcepti
 }
 
 Reference< XPropertySet >  SAL_CALL
-        SwXTextDocument::getFootnoteSettings() throw( RuntimeException, std::exception )
+        SwXTextDocument::getFootnoteSettings()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -690,7 +685,7 @@ Reference< XPropertySet >  SAL_CALL
     return mxXFootnoteSettings;
 }
 
-Reference< XIndexAccess >  SwXTextDocument::getEndnotes() throw( RuntimeException, std::exception )
+Reference< XIndexAccess >  SwXTextDocument::getEndnotes()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -702,7 +697,7 @@ Reference< XIndexAccess >  SwXTextDocument::getEndnotes() throw( RuntimeExceptio
     return mxXEndnotes;
 }
 
-Reference< XPropertySet >  SwXTextDocument::getEndnoteSettings() throw( RuntimeException, std::exception )
+Reference< XPropertySet >  SwXTextDocument::getEndnoteSettings()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -715,7 +710,6 @@ Reference< XPropertySet >  SwXTextDocument::getEndnoteSettings() throw( RuntimeE
 }
 
 Reference< util::XReplaceDescriptor >  SwXTextDocument::createReplaceDescriptor()
-    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     Reference< util::XReplaceDescriptor >  xRet = new SwXTextSearch;
@@ -736,7 +730,6 @@ SwUnoCursor* SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & x
 }
 
 sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > & xDesc)
-                                        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     Reference< XUnoTunnel > xDescTunnel(xDesc, UNO_QUERY);
@@ -809,7 +802,6 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
 }
 
 Reference< util::XSearchDescriptor >  SwXTextDocument::createSearchDescriptor()
-                                                    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     Reference< util::XSearchDescriptor >  xRet = new SwXTextSearch;
@@ -941,7 +933,6 @@ SwUnoCursor* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
 
 Reference< XIndexAccess >
     SwXTextDocument::findAll(const Reference< util::XSearchDescriptor > & xDesc)
-                                                throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     Reference< XInterface >  xTmp;
@@ -956,7 +947,6 @@ Reference< XIndexAccess >
 }
 
 Reference< XInterface >  SwXTextDocument::findFirst(const Reference< util::XSearchDescriptor > & xDesc)
-                                            throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     Reference< XInterface >  xTmp;
@@ -978,7 +968,6 @@ Reference< XInterface >  SwXTextDocument::findFirst(const Reference< util::XSear
 
 Reference< XInterface >  SwXTextDocument::findNext(const Reference< XInterface > & xStartAt,
             const Reference< util::XSearchDescriptor > & xDesc)
-            throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     Reference< XInterface >  xTmp;
@@ -1002,7 +991,6 @@ Reference< XInterface >  SwXTextDocument::findNext(const Reference< XInterface >
 }
 
 Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings()
-    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     Sequence< beans::PropertyValue > aSeq(9);
@@ -1080,7 +1068,6 @@ static OUString lcl_CreateOutlineString( size_t nIndex,
 }
 
 void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue >& aSettings)
-    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(IsValid())
@@ -1155,7 +1142,6 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue
 }
 
 void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOptions)
-    throw( IllegalArgumentException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(IsValid())
@@ -1236,7 +1222,6 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption
 }
 
 Reference< XNameAccess >  SwXTextDocument::getReferenceMarks()
-                                        throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1248,7 +1233,7 @@ Reference< XNameAccess >  SwXTextDocument::getReferenceMarks()
     return mxXReferenceMarks;
 }
 
-Reference< XEnumerationAccess >  SwXTextDocument::getTextFields() throw( RuntimeException, std::exception )
+Reference< XEnumerationAccess >  SwXTextDocument::getTextFields()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1261,7 +1246,6 @@ Reference< XEnumerationAccess >  SwXTextDocument::getTextFields() throw( Runtime
 }
 
 Reference< XNameAccess >  SwXTextDocument::getTextFieldMasters()
-    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1273,7 +1257,7 @@ Reference< XNameAccess >  SwXTextDocument::getTextFieldMasters()
     return mxXTextFieldMasters;
 }
 
-Reference< XNameAccess >  SwXTextDocument::getEmbeddedObjects() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  SwXTextDocument::getEmbeddedObjects()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1285,7 +1269,7 @@ Reference< XNameAccess >  SwXTextDocument::getEmbeddedObjects() throw( RuntimeEx
     return mxXEmbeddedObjects;
 }
 
-Reference< XNameAccess >  SwXTextDocument::getBookmarks() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  SwXTextDocument::getBookmarks()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1297,7 +1281,7 @@ Reference< XNameAccess >  SwXTextDocument::getBookmarks() throw( RuntimeExceptio
     return mxXBookmarks;
 }
 
-Reference< XNameAccess >  SwXTextDocument::getTextSections() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  SwXTextDocument::getTextSections()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1309,7 +1293,7 @@ Reference< XNameAccess >  SwXTextDocument::getTextSections() throw( RuntimeExcep
     return mxXTextSections;
 }
 
-Reference< XNameAccess >  SwXTextDocument::getTextTables() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  SwXTextDocument::getTextTables()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1321,7 +1305,7 @@ Reference< XNameAccess >  SwXTextDocument::getTextTables() throw( RuntimeExcepti
     return mxXTextTables;
 }
 
-Reference< XNameAccess >  SwXTextDocument::getGraphicObjects() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  SwXTextDocument::getGraphicObjects()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1333,7 +1317,7 @@ Reference< XNameAccess >  SwXTextDocument::getGraphicObjects() throw( RuntimeExc
     return mxXGraphicObjects;
 }
 
-Reference< XNameAccess >  SwXTextDocument::getTextFrames() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  SwXTextDocument::getTextFrames()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1345,7 +1329,7 @@ Reference< XNameAccess >  SwXTextDocument::getTextFrames() throw( RuntimeExcepti
     return mxXTextFrames;
 }
 
-Reference< XNameAccess >  SwXTextDocument::getStyleFamilies() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  SwXTextDocument::getStyleFamilies()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1358,7 +1342,6 @@ Reference< XNameAccess >  SwXTextDocument::getStyleFamilies() throw( RuntimeExce
 }
 
 uno::Reference< style::XAutoStyles > SwXTextDocument::getAutoStyles(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1371,7 +1354,7 @@ uno::Reference< style::XAutoStyles > SwXTextDocument::getAutoStyles(  )
 
 }
 
-Reference< drawing::XDrawPage >  SwXTextDocument::getDrawPage() throw( RuntimeException, std::exception )
+Reference< drawing::XDrawPage >  SwXTextDocument::getDrawPage()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1704,7 +1687,6 @@ css::uno::Reference<css::uno::XInterface> SwXTextDocument::create(
 }
 
 Reference< XInterface >  SwXTextDocument::createInstance(const OUString& rServiceName)
-                                        throw( Exception, RuntimeException, std::exception )
 {
     return create(rServiceName, nullptr);
 }
@@ -1712,13 +1694,11 @@ Reference< XInterface >  SwXTextDocument::createInstance(const OUString& rServic
 Reference< XInterface >  SwXTextDocument::createInstanceWithArguments(
         const OUString& ServiceSpecifier,
         const Sequence< Any >& Arguments)
-        throw( Exception, RuntimeException, std::exception )
 {
     return create(ServiceSpecifier, &Arguments);
 }
 
 Sequence< OUString > SwXTextDocument::getAvailableServiceNames()
-                                        throw( RuntimeException, std::exception )
 {
     static Sequence< OUString > aServices;
     if ( aServices.getLength() == 0 )
@@ -1741,7 +1721,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames()
     return aServices;
 }
 
-OUString SwXTextDocument::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXTextDocument::getImplementationName()
 {
     return OUString("SwXTextDocument");
     /* // Matching the .component information:
@@ -1753,12 +1733,12 @@ OUString SwXTextDocument::getImplementationName() throw( RuntimeException, std::
     */
 }
 
-sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXTextDocument::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXTextDocument::getSupportedServiceNames()
 {
     bool bWebDoc    = (dynamic_cast<SwWebDocShell*>(    pDocShell) !=  nullptr );
     bool bGlobalDoc = (dynamic_cast<SwGlobalDocShell*>( pDocShell) !=  nullptr );
@@ -1780,7 +1760,7 @@ Sequence< OUString > SwXTextDocument::getSupportedServiceNames() throw( RuntimeE
     return aRet;
 }
 
-Reference< XIndexAccess >  SwXTextDocument::getDocumentIndexes() throw( RuntimeException, std::exception )
+Reference< XIndexAccess >  SwXTextDocument::getDocumentIndexes()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1792,16 +1772,13 @@ Reference< XIndexAccess >  SwXTextDocument::getDocumentIndexes() throw( RuntimeE
     return mxXDocumentIndexes;
 }
 
-Reference< XPropertySetInfo >  SwXTextDocument::getPropertySetInfo() throw( RuntimeException, std::exception )
+Reference< XPropertySetInfo >  SwXTextDocument::getPropertySetInfo()
 {
     static Reference< XPropertySetInfo >  xRet = pPropSet->getPropertySetInfo();
     return xRet;
 }
 
 void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& aValue)
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException,
-           RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -1981,7 +1958,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any&
 }
 
 Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2135,33 +2111,29 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
 
 void SwXTextDocument::addPropertyChangeListener(const OUString& /*PropertyName*/,
     const Reference< XPropertyChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXTextDocument::removePropertyChangeListener(const OUString& /*PropertyName*/,
     const Reference< XPropertyChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXTextDocument::addVetoableChangeListener(const OUString& /*PropertyName*/,
     const Reference< XVetoableChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
 void SwXTextDocument::removeVetoableChangeListener(const OUString& /*PropertyName*/,
                         const Reference< XVetoableChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     OSL_FAIL("not implemented");
 }
 
-Reference< XNameAccess >  SwXTextDocument::getLinks() throw( RuntimeException, std::exception )
+Reference< XNameAccess >  SwXTextDocument::getLinks()
 {
     if(!mxLinkTargetSupplier.is())
     {
@@ -2170,7 +2142,7 @@ Reference< XNameAccess >  SwXTextDocument::getLinks() throw( RuntimeException, s
     return mxLinkTargetSupplier;
 }
 
-Reference< XEnumerationAccess > SwXTextDocument::getRedlines(  ) throw(RuntimeException, std::exception)
+Reference< XEnumerationAccess > SwXTextDocument::getRedlines(  )
 {
     if(!mxXRedlines.is())
     {
@@ -2188,7 +2160,7 @@ void SwXTextDocument::NotifyRefreshListeners()
             & util::XRefreshListener::refreshed, ev);
 }
 
-void SwXTextDocument::refresh() throw( RuntimeException, std::exception )
+void SwXTextDocument::refresh()
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2201,7 +2173,6 @@ void SwXTextDocument::refresh() throw( RuntimeException, std::exception )
 
 void SAL_CALL SwXTextDocument::addRefreshListener(
         const Reference<util::XRefreshListener> & xListener)
-throw (RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_RefreshListeners.addInterface(xListener);
@@ -2209,13 +2180,12 @@ throw (RuntimeException, std::exception)
 
 void SAL_CALL SwXTextDocument::removeRefreshListener(
         const Reference<util::XRefreshListener> & xListener)
-throw (RuntimeException, std::exception)
 {
     // no need to lock here as m_pImpl is const and container threadsafe
     m_pImpl->m_RefreshListeners.removeInterface(xListener);
 }
 
-void SwXTextDocument::updateLinks(  ) throw(RuntimeException, std::exception)
+void SwXTextDocument::updateLinks(  )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2231,7 +2201,6 @@ void SwXTextDocument::updateLinks(  ) throw(RuntimeException, std::exception)
 
 //XPropertyState
 PropertyState SAL_CALL SwXTextDocument::getPropertyState( const OUString& rPropertyName )
-    throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     PropertyState eRet = PropertyState_DIRECT_VALUE;
@@ -2249,7 +2218,6 @@ PropertyState SAL_CALL SwXTextDocument::getPropertyState( const OUString& rPrope
 }
 
 Sequence< PropertyState > SAL_CALL SwXTextDocument::getPropertyStates( const Sequence< OUString >& rPropertyNames )
-    throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
     const OUString * pNames = rPropertyNames.getConstArray();
@@ -2263,7 +2231,6 @@ Sequence< PropertyState > SAL_CALL SwXTextDocument::getPropertyStates( const Seq
 }
 
 void SAL_CALL SwXTextDocument::setPropertyToDefault( const OUString& rPropertyName )
-    throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2278,7 +2245,6 @@ void SAL_CALL SwXTextDocument::setPropertyToDefault( const OUString& rPropertyNa
 }
 
 Any SAL_CALL SwXTextDocument::getPropertyDefault( const OUString& rPropertyName )
-    throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2460,8 +2426,6 @@ static void lcl_SavePrintUIOptionsToDocumentPrintData(
 sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
         const uno::Any& rSelection,
         const uno::Sequence< beans::PropertyValue >& rxOptions )
-    throw (IllegalArgumentException, RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2649,8 +2613,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
         sal_Int32 nRenderer,
         const uno::Any& rSelection,
         const uno::Sequence< beans::PropertyValue >& rxOptions )
-    throw (IllegalArgumentException, RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -2916,8 +2878,6 @@ void SAL_CALL SwXTextDocument::render(
         sal_Int32 nRenderer,
         const uno::Any& rSelection,
         const uno::Sequence< beans::PropertyValue >& rxOptions )
-    throw (IllegalArgumentException, RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -3074,7 +3034,6 @@ void SAL_CALL SwXTextDocument::render(
 
 // xforms::XFormsSupplier
 Reference<XNameContainer> SAL_CALL SwXTextDocument::getXForms()
-    throw( RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if ( !pDocShell )
@@ -3084,7 +3043,6 @@ Reference<XNameContainer> SAL_CALL SwXTextDocument::getXForms()
 }
 
 uno::Reference< text::XFlatParagraphIterator > SAL_CALL SwXTextDocument::getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic)
-    throw ( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     if (!IsValid())
@@ -3097,7 +3055,7 @@ uno::Reference< text::XFlatParagraphIterator > SAL_CALL SwXTextDocument::getFlat
             *pDocShell->GetDoc(), nTextMarkupType, bAutomatic);
 }
 
-uno::Reference< util::XCloneable > SwXTextDocument::createClone(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< util::XCloneable > SwXTextDocument::createClone(  )
 {
     SolarMutexGuard aGuard;
     if(!IsValid())
@@ -3488,7 +3446,7 @@ void SwXTextDocument::resetSelection()
     pWrtShell->ResetSelect(nullptr, false);
 }
 
-void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight )
 {
     SystemGraphicsData aData;
     aData.nSize = sizeof(SystemGraphicsData);
@@ -3526,9 +3484,6 @@ void SAL_CALL SwXTextDocument::operator delete( void * p) throw()
 uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
         ::sal_Int16 nScriptTypes,
         ::sal_Int16 nMaxCount )
-    throw (lang::IllegalArgumentException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -3734,7 +3689,6 @@ SwXLinkTargetSupplier::~SwXLinkTargetSupplier()
 }
 
 Any SwXLinkTargetSupplier::getByName(const OUString& rName)
-    throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
 {
     Any aRet;
     if(!pxDoc)
@@ -3796,7 +3750,6 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
 }
 
 Sequence< OUString > SwXLinkTargetSupplier::getElementNames()
-                                        throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(7);
     OUString* pNames = aRet.getArray();
@@ -3811,7 +3764,6 @@ Sequence< OUString > SwXLinkTargetSupplier::getElementNames()
 }
 
 sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName)
-                                    throw( RuntimeException, std::exception )
 {
     if( rName == sTables  ||
         rName == sFrames  ||
@@ -3825,30 +3777,27 @@ sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName)
 }
 
 uno::Type  SwXLinkTargetSupplier::getElementType()
-                                    throw( RuntimeException, std::exception )
 {
     return cppu::UnoType<XPropertySet>::get();
 
 }
 
-sal_Bool SwXLinkTargetSupplier::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SwXLinkTargetSupplier::hasElements()
 {
     return nullptr != pxDoc;
 }
 
-OUString SwXLinkTargetSupplier::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXLinkTargetSupplier::getImplementationName()
 {
     return OUString("SwXLinkTargetSupplier");
 }
 
 sal_Bool SwXLinkTargetSupplier::supportsService(const OUString& rServiceName)
-                                                throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames()
-                                                throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet { "com.sun.star.document.LinkTargets" };
     return aRet;
@@ -3878,7 +3827,6 @@ SwXLinkNameAccessWrapper::~SwXLinkNameAccessWrapper()
 }
 
 Any SwXLinkNameAccessWrapper::getByName(const OUString& rName)
-    throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
 {
     Any aRet;
     bool bFound = false;
@@ -3929,7 +3877,6 @@ Any SwXLinkNameAccessWrapper::getByName(const OUString& rName)
 }
 
 Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames()
-                                    throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet;
     if(pxDoc)
@@ -3966,7 +3913,6 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames()
 }
 
 sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName)
-    throw( RuntimeException, std::exception )
 {
     bool bRet = false;
     OUString sParam(rName);
@@ -4005,12 +3951,11 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName)
 }
 
 uno::Type  SwXLinkNameAccessWrapper::getElementType()
-                                throw( RuntimeException, std::exception )
 {
     return cppu::UnoType<XPropertySet>::get();
 }
 
-sal_Bool SwXLinkNameAccessWrapper::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SwXLinkNameAccessWrapper::hasElements()
 {
     bool bRet = false;
     if(pxDoc)
@@ -4025,7 +3970,6 @@ sal_Bool SwXLinkNameAccessWrapper::hasElements() throw( RuntimeException, std::e
 }
 
 Reference< XPropertySetInfo >  SwXLinkNameAccessWrapper::getPropertySetInfo()
-                                        throw( RuntimeException, std::exception )
 {
     static Reference< XPropertySetInfo >  xRet = pPropSet->getPropertySetInfo();
     return xRet;
@@ -4033,11 +3977,6 @@ Reference< XPropertySetInfo >  SwXLinkNameAccessWrapper::getPropertySetInfo()
 
 void SwXLinkNameAccessWrapper::setPropertyValue(
     const OUString& , const Any& )
-    throw( UnknownPropertyException,
-            PropertyVetoException,
-            IllegalArgumentException,
-             WrappedTargetException,
-            RuntimeException, std::exception)
 {
     throw UnknownPropertyException();
 }
@@ -4073,7 +4012,6 @@ static Any lcl_GetDisplayBitmap(const OUString& _sLinkSuffix)
 }
 
 Any SwXLinkNameAccessWrapper::getPropertyValue(const OUString& rPropertyName)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     Any aRet;
     if( rPropertyName == UNO_LINK_DISPLAY_NAME )
@@ -4091,43 +4029,36 @@ Any SwXLinkNameAccessWrapper::getPropertyValue(const OUString& rPropertyName)
 
 void SwXLinkNameAccessWrapper::addPropertyChangeListener(
     const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {}
 
 void SwXLinkNameAccessWrapper::removePropertyChangeListener(
     const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {}
 
 void SwXLinkNameAccessWrapper::addVetoableChangeListener(
     const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {}
 
 void SwXLinkNameAccessWrapper::removeVetoableChangeListener(
     const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {}
 
 Reference< XNameAccess >  SwXLinkNameAccessWrapper::getLinks()
-                                    throw( RuntimeException, std::exception )
 {
     return this;
 }
 
-OUString SwXLinkNameAccessWrapper::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXLinkNameAccessWrapper::getImplementationName()
 {
     return OUString("SwXLinkNameAccessWrapper");
 }
 
 sal_Bool SwXLinkNameAccessWrapper::supportsService(const OUString& rServiceName)
-                                                    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SwXLinkNameAccessWrapper::getSupportedServiceNames()
-                                                    throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet { "com.sun.star.document.LinkTargets" };
     return aRet;
@@ -4143,7 +4074,7 @@ SwXOutlineTarget::~SwXOutlineTarget()
 {
 }
 
-Reference< XPropertySetInfo >  SwXOutlineTarget::getPropertySetInfo() throw( RuntimeException, std::exception )
+Reference< XPropertySetInfo >  SwXOutlineTarget::getPropertySetInfo()
 {
     static Reference< XPropertySetInfo >  xRet = pPropSet->getPropertySetInfo();
     return xRet;
@@ -4151,14 +4082,11 @@ Reference< XPropertySetInfo >  SwXOutlineTarget::getPropertySetInfo() throw( Run
 
 void SwXOutlineTarget::setPropertyValue(
     const OUString& /*PropertyName*/, const Any& /*aValue*/)
-    throw( UnknownPropertyException, PropertyVetoException,
-         IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     throw UnknownPropertyException();
 }
 
 Any SwXOutlineTarget::getPropertyValue(const OUString& rPropertyName)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
     Any aRet;
     if(rPropertyName == UNO_LINK_DISPLAY_NAME)
@@ -4170,39 +4098,35 @@ Any SwXOutlineTarget::getPropertyValue(const OUString& rPropertyName)
 
 void SwXOutlineTarget::addPropertyChangeListener(
     const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
 }
 
 void SwXOutlineTarget::removePropertyChangeListener(
     const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
 }
 
 void SwXOutlineTarget::addVetoableChangeListener(
     const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
 }
 
 void SwXOutlineTarget::removeVetoableChangeListener(
     const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
-    throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception )
 {
 }
 
-OUString SwXOutlineTarget::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXOutlineTarget::getImplementationName()
 {
     return OUString("SwXOutlineTarget");
 }
 
-sal_Bool SwXOutlineTarget::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXOutlineTarget::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SwXOutlineTarget::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXOutlineTarget::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.document.LinkTarget" };
 
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 63cdd44f8306..acbd3f62eb26 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -131,7 +131,7 @@ void SwXTextView::Invalidate()
     m_pView = nullptr;
 }
 
-Sequence< uno::Type > SAL_CALL SwXTextView::getTypes(  ) throw(uno::RuntimeException, std::exception)
+Sequence< uno::Type > SAL_CALL SwXTextView::getTypes(  )
 {
     uno::Sequence< uno::Type > aBaseTypes = SfxBaseController::getTypes();
 
@@ -151,7 +151,7 @@ Sequence< uno::Type > SAL_CALL SwXTextView::getTypes(  ) throw(uno::RuntimeExcep
     return aBaseTypes;
 }
 
-Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId(  ) throw(uno::RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId(  )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -167,7 +167,6 @@ void SAL_CALL SwXTextView::release(  )throw()
 }
 
 uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType )
-    throw (RuntimeException, std::exception)
 {
     uno::Any aRet;
     if(aType == cppu::UnoType<view::XSelectionSupplier>::get())
@@ -221,8 +220,6 @@ uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType )
 }
 
 sal_Bool SwXTextView::select(const uno::Any& aInterface)
-    throw (lang::IllegalArgumentException, uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -320,7 +317,6 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface)
 }
 
 uno::Any SwXTextView::getSelection()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< uno::XInterface >  aRef;
@@ -417,7 +413,6 @@ uno::Any SwXTextView::getSelection()
 
 void SwXTextView::addSelectionChangeListener(
                                     const uno::Reference< view::XSelectionChangeListener > & rxListener)
-                                    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     m_SelChangedListeners.addInterface(rxListener);
@@ -425,7 +420,6 @@ void SwXTextView::addSelectionChangeListener(
 
 void SwXTextView::removeSelectionChangeListener(
                                         const uno::Reference< view::XSelectionChangeListener > & rxListener)
-                                        throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     m_SelChangedListeners.removeInterface(rxListener);
@@ -449,7 +443,6 @@ SdrObject* SwXTextView::GetControl(
 }
 
 uno::Reference< awt::XControl >  SwXTextView::getControl(const uno::Reference< awt::XControlModel > & xModel)
-        throw( container::NoSuchElementException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     uno::Reference< awt::XControl >  xRet;
@@ -457,7 +450,7 @@ uno::Reference< awt::XControl >  SwXTextView::getControl(const uno::Reference< a
     return xRet;
 }
 
-uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormController( const uno::Reference< form::XForm >& Form ) throw (RuntimeException, std::exception)
+uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormController( const uno::Reference< form::XForm >& Form )
 {
     SolarMutexGuard aGuard;
 
@@ -473,7 +466,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormCo
     return xController;
 }
 
-sal_Bool SAL_CALL SwXTextView::isFormDesignMode(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SwXTextView::isFormDesignMode(  )
 {
     SolarMutexGuard aGuard;
     SwView* pView2 = GetView();
@@ -481,7 +474,7 @@ sal_Bool SAL_CALL SwXTextView::isFormDesignMode(  ) throw (uno::RuntimeException
     return !pFormShell || pFormShell->IsDesignMode();
 }
 
-void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool DesignMode ) throw (RuntimeException, std::exception)
+void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool DesignMode )
 {
     SolarMutexGuard aGuard;
     SwView* pView2 = GetView();
@@ -490,7 +483,7 @@ void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool DesignMode ) throw (Runti
         pFormShell->SetDesignMode( DesignMode );
 }
 
-uno::Reference< text::XTextViewCursor >  SwXTextView::getViewCursor() throw( uno::RuntimeException, std::exception )
+uno::Reference< text::XTextViewCursor >  SwXTextView::getViewCursor()
 {
     SolarMutexGuard aGuard;
     if(GetView())
@@ -505,7 +498,7 @@ uno::Reference< text::XTextViewCursor >  SwXTextView::getViewCursor() throw( uno
         throw uno::RuntimeException();
 }
 
-uno::Reference< beans::XPropertySet >  SwXTextView::getViewSettings() throw( uno::RuntimeException, std::exception )
+uno::Reference< beans::XPropertySet >  SwXTextView::getViewSettings()
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -521,7 +514,6 @@ uno::Reference< beans::XPropertySet >  SwXTextView::getViewSettings() throw( uno
 }
 
 Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAutomatic*/ )
-    throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -567,7 +559,6 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
 
 void SAL_CALL SwXTextView::setRubyList(
     const Sequence< Sequence< PropertyValue > >& rRubyList, sal_Bool /*bAutomatic*/ )
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -706,7 +697,6 @@ void SwXTextView::NotifyDBChanged()
 }
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextView::getPropertySetInfo(  )
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     static uno::Reference< XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo();
@@ -715,7 +705,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextView::getPropertySetIn
 
 void SAL_CALL SwXTextView::setPropertyValue(
         const OUString& rPropertyName, const uno::Any& rValue )
-    throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
@@ -750,10 +739,6 @@ void SAL_CALL SwXTextView::setPropertyValue(
 
 uno::Any SAL_CALL SwXTextView::getPropertyValue(
         const OUString& rPropertyName )
-    throw (beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -804,7 +789,6 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue(
 void SAL_CALL SwXTextView::addPropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*rxListener*/ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -812,7 +796,6 @@ void SAL_CALL SwXTextView::addPropertyChangeListener(
 void SAL_CALL SwXTextView::removePropertyChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XPropertyChangeListener >& /*rxListener*/ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -820,7 +803,6 @@ void SAL_CALL SwXTextView::removePropertyChangeListener(
 void SAL_CALL SwXTextView::addVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*rxListener*/ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
@@ -828,22 +810,21 @@ void SAL_CALL SwXTextView::addVetoableChangeListener(
 void SAL_CALL SwXTextView::removeVetoableChangeListener(
         const OUString& /*rPropertyName*/,
         const uno::Reference< beans::XVetoableChangeListener >& /*rxListener*/ )
-    throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     OSL_FAIL("not implemented");
 }
 
-OUString SwXTextView::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXTextView::getImplementationName()
 {
     return OUString("SwXTextView");
 }
 
-sal_Bool SwXTextView::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXTextView::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXTextView::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXTextView::getSupportedServiceNames()
 {
     Sequence< OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -887,18 +868,18 @@ bool SwXTextViewCursor::IsTextSelection( bool bAllowTables ) const
     return bRes;
 }
 
-sal_Bool SwXTextViewCursor::isVisible() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextViewCursor::isVisible()
 {
     OSL_FAIL("not implemented");
     return true;
 }
 
-void SwXTextViewCursor::setVisible(sal_Bool /*bVisible*/) throw( uno::RuntimeException, std::exception )
+void SwXTextViewCursor::setVisible(sal_Bool /*bVisible*/)
 {
     OSL_FAIL("not implemented");
 }
 
-awt::Point SwXTextViewCursor::getPosition() throw( uno::RuntimeException, std::exception )
+awt::Point SwXTextViewCursor::getPosition()
 {
     SolarMutexGuard aGuard;
     awt::Point aRet;
@@ -923,7 +904,6 @@ awt::Point SwXTextViewCursor::getPosition() throw( uno::RuntimeException, std::e
 }
 
 void SwXTextViewCursor::collapseToStart()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -947,7 +927,6 @@ void SwXTextViewCursor::collapseToStart()
 }
 
 void SwXTextViewCursor::collapseToEnd()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -971,7 +950,6 @@ void SwXTextViewCursor::collapseToEnd()
 }
 
 sal_Bool SwXTextViewCursor::isCollapsed()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -990,7 +968,6 @@ sal_Bool SwXTextViewCursor::isCollapsed()
 }
 
 sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1007,7 +984,6 @@ sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand)
 }
 
 sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1027,7 +1003,6 @@ sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand)
 void SwXTextViewCursor::gotoRange(
     const uno::Reference< text::XTextRange > & xRange,
     sal_Bool bExpand)
-        throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView && xRange.is())
@@ -1167,7 +1142,6 @@ void SwXTextViewCursor::gotoRange(
 }
 
 void SwXTextViewCursor::gotoStart(sal_Bool bExpand)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -1182,7 +1156,6 @@ void SwXTextViewCursor::gotoStart(sal_Bool bExpand)
 }
 
 void SwXTextViewCursor::gotoEnd(sal_Bool bExpand)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -1197,7 +1170,6 @@ void SwXTextViewCursor::gotoEnd(sal_Bool bExpand)
 }
 
 sal_Bool SwXTextViewCursor::jumpToFirstPage()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1218,7 +1190,6 @@ sal_Bool SwXTextViewCursor::jumpToFirstPage()
 }
 
 sal_Bool SwXTextViewCursor::jumpToLastPage()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1239,7 +1210,7 @@ sal_Bool SwXTextViewCursor::jumpToLastPage()
     return bRet;
 }
 
-sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1250,7 +1221,7 @@ sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeExcep
     return bRet;
 }
 
-sal_Bool SwXTextViewCursor::jumpToNextPage() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextViewCursor::jumpToNextPage()
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1261,7 +1232,7 @@ sal_Bool SwXTextViewCursor::jumpToNextPage() throw( uno::RuntimeException, std::
     return bRet;
 }
 
-sal_Bool SwXTextViewCursor::jumpToPreviousPage() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextViewCursor::jumpToPreviousPage()
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1272,7 +1243,7 @@ sal_Bool SwXTextViewCursor::jumpToPreviousPage() throw( uno::RuntimeException, s
     return bRet;
 }
 
-sal_Bool SwXTextViewCursor::jumpToEndOfPage() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextViewCursor::jumpToEndOfPage()
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1283,7 +1254,7 @@ sal_Bool SwXTextViewCursor::jumpToEndOfPage() throw( uno::RuntimeException, std:
     return bRet;
 }
 
-sal_Bool SwXTextViewCursor::jumpToStartOfPage() throw( uno::RuntimeException, std::exception )
+sal_Bool SwXTextViewCursor::jumpToStartOfPage()
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1295,7 +1266,6 @@ sal_Bool SwXTextViewCursor::jumpToStartOfPage() throw( uno::RuntimeException, st
 }
 
 sal_Int16 SwXTextViewCursor::getPage()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     sal_Int16 nRet = 0;
@@ -1311,7 +1281,6 @@ sal_Int16 SwXTextViewCursor::getPage()
 }
 
 sal_Bool SwXTextViewCursor::screenDown()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1328,7 +1297,6 @@ sal_Bool SwXTextViewCursor::screenDown()
 }
 
 sal_Bool SwXTextViewCursor::screenUp()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1345,7 +1313,6 @@ sal_Bool SwXTextViewCursor::screenUp()
 }
 
 uno::Reference< text::XText >  SwXTextViewCursor::getText()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XText >  xRet;
@@ -1365,7 +1332,6 @@ uno::Reference< text::XText >  SwXTextViewCursor::getText()
 }
 
 uno::Reference< text::XTextRange >  SwXTextViewCursor::getStart()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextRange >  xRet;
@@ -1385,7 +1351,6 @@ uno::Reference< text::XTextRange >  SwXTextViewCursor::getStart()
 }
 
 uno::Reference< text::XTextRange >  SwXTextViewCursor::getEnd()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Reference< text::XTextRange >  xRet;
@@ -1405,7 +1370,6 @@ uno::Reference< text::XTextRange >  SwXTextViewCursor::getEnd()
 }
 
 OUString SwXTextViewCursor::getString()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     OUString uRet;
@@ -1438,7 +1402,6 @@ OUString SwXTextViewCursor::getString()
 }
 
 void SwXTextViewCursor::setString(const OUString& aString)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -1468,16 +1431,13 @@ void SwXTextViewCursor::setString(const OUString& aString)
     }
 }
 
-uno::Reference< XPropertySetInfo >  SwXTextViewCursor::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+uno::Reference< XPropertySetInfo >  SwXTextViewCursor::getPropertySetInfo(  )
 {
     static uno::Reference< XPropertySetInfo >  xRef = m_pPropSet->getPropertySetInfo();
     return xRef;
 }
 
 void  SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName, const Any& aValue )
-    throw (UnknownPropertyException, PropertyVetoException,
-           IllegalArgumentException, WrappedTargetException,
-           RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -1498,8 +1458,6 @@ void  SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName, const
 }
 
 Any  SwXTextViewCursor::getPropertyValue( const OUString& rPropertyName )
-    throw (UnknownPropertyException, WrappedTargetException,
-           RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     Any aRet;
@@ -1517,30 +1475,25 @@ Any  SwXTextViewCursor::getPropertyValue( const OUString& rPropertyName )
 
 void  SwXTextViewCursor::addPropertyChangeListener(
     const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void  SwXTextViewCursor::removePropertyChangeListener(
     const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*aListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void  SwXTextViewCursor::addVetoableChangeListener(
     const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
-        throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
 }
 
 void  SwXTextViewCursor::removeVetoableChangeListener(
-    const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ )
 {
 }
 
 PropertyState  SwXTextViewCursor::getPropertyState( const OUString& rPropertyName )
-    throw (UnknownPropertyException, RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     PropertyState eState;
@@ -1558,8 +1511,6 @@ PropertyState  SwXTextViewCursor::getPropertyState( const OUString& rPropertyNam
 
 Sequence< PropertyState >  SwXTextViewCursor::getPropertyStates(
     const Sequence< OUString >& rPropertyNames )
-        throw (UnknownPropertyException, RuntimeException,
-               std::exception)
 {
     SolarMutexGuard aGuard;
     Sequence< PropertyState >  aRet;
@@ -1574,8 +1525,6 @@ Sequence< PropertyState >  SwXTextViewCursor::getPropertyStates(
 }
 
 void  SwXTextViewCursor::setPropertyToDefault( const OUString& rPropertyName )
-    throw (UnknownPropertyException, RuntimeException,
-           std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -1588,8 +1537,6 @@ void  SwXTextViewCursor::setPropertyToDefault( const OUString& rPropertyName )
 }
 
 Any  SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName )
-    throw (UnknownPropertyException, WrappedTargetException,
-           RuntimeException, std::exception)
 {
     Any aRet;
     SolarMutexGuard aGuard;
@@ -1604,7 +1551,6 @@ Any  SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName )
 }
 
 sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1621,7 +1567,6 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand)
 }
 
 sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1638,7 +1583,6 @@ sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand)
 }
 
 sal_Bool SwXTextViewCursor::isAtStartOfLine()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1655,7 +1599,6 @@ sal_Bool SwXTextViewCursor::isAtStartOfLine()
 }
 
 sal_Bool SwXTextViewCursor::isAtEndOfLine()
-    throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     bool bRet = false;
@@ -1672,7 +1615,6 @@ sal_Bool SwXTextViewCursor::isAtEndOfLine()
 }
 
 void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -1687,7 +1629,6 @@ void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand)
 }
 
 void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand)
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     if(m_pView)
@@ -1701,17 +1642,17 @@ void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand)
         throw uno::RuntimeException();
 }
 
-OUString SwXTextViewCursor::getImplementationName() throw( RuntimeException, std::exception )
+OUString SwXTextViewCursor::getImplementationName()
 {
     return OUString("SwXTextViewCursor");
 }
 
-sal_Bool SwXTextViewCursor::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SwXTextViewCursor::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SwXTextViewCursor::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SwXTextViewCursor::getSupportedServiceNames()
 {
     Sequence< OUString > aRet(7);
     OUString* pArray = aRet.getArray();
@@ -1738,7 +1679,6 @@ const uno::Sequence< sal_Int8 > & SwXTextViewCursor::getUnoTunnelId()
 //XUnoTunnel
 sal_Int64 SAL_CALL SwXTextViewCursor::getSomething(
     const uno::Sequence< sal_Int8 >& rId )
-        throw(uno::RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( getUnoTunnelId().getConstArray(),
@@ -1775,7 +1715,6 @@ SwPaM*  SwXTextViewCursor::GetPaM()
 }
 
 uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransferable()
-    throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1799,7 +1738,7 @@ uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransfera
     }
 }
 
-void SAL_CALL SwXTextView::insertTransferable( const uno::Reference< datatransfer::XTransferable >& xTrans ) throw (datatransfer::UnsupportedFlavorException, uno::RuntimeException, std::exception)
+void SAL_CALL SwXTextView::insertTransferable( const uno::Reference< datatransfer::XTransferable >& xTrans )
 {
     SolarMutexGuard aGuard;
 
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 167719de7c88..bc238c68be32 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -113,12 +113,12 @@ public:
         {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XMain
-    virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) override;
 };
 
 
@@ -311,8 +311,7 @@ private:
 public:
     void SAL_CALL callRecursivly(
         const css::uno::Reference< XRecursiveCall >& xCall,
-        sal_Int32 nToCall )
-        throw(css::uno::RuntimeException, std::exception) override
+        sal_Int32 nToCall ) override
         {
             MutexGuard guard( m_mutex );
             if( nToCall )
@@ -1102,7 +1101,6 @@ inline bool makeSurrogate(
 
 
 sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
-    throw (RuntimeException, std::exception)
 {
     bool bRet = false;
     try
@@ -1189,19 +1187,16 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
 // XServiceInfo
 
 OUString TestBridgeImpl::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( IMPLNAME );
 }
 
 sal_Bool TestBridgeImpl::supportsService( const OUString & rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > TestBridgeImpl::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return bridge_test::getSupportedServiceNames();
 }
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 7f1a760d50af..2243b16a4973 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -60,12 +60,10 @@ private:
     virtual ~Impl() override {}
 
     virtual void SAL_CALL initialize(
-        css::uno::Sequence< css::uno::Any > const & arguments)
-        throw (css::uno::Exception, std::exception) override;
+        css::uno::Sequence< css::uno::Any > const & arguments) override;
 };
 
 void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
-    throw (css::uno::Exception, std::exception)
 {
     bool arg0;
     ::sal_Int8 arg1 = sal_Int8();
@@ -193,25 +191,19 @@ private:
     virtual ~Impl2() override {}
 
     virtual void SAL_CALL initialize(
-        css::uno::Sequence< css::uno::Any > const & arguments)
-        throw (css::uno::Exception, std::exception) override;
+        css::uno::Sequence< css::uno::Any > const & arguments) override;
 
     //XMultiBase1
-    virtual double SAL_CALL getatt1()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setatt1( double _att1 )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL fn11( ::sal_Int32 arg )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL fn12( const OUString& arg )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getatt1() override;
+    virtual void SAL_CALL setatt1( double _att1 ) override;
+    virtual ::sal_Int32 SAL_CALL fn11( ::sal_Int32 arg ) override;
+    virtual OUString SAL_CALL fn12( const OUString& arg ) override;
 
 
     double m_attr1;
 };
 
 void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
-    throw (css::uno::Exception, std::exception)
 {
     ttb::TestPolyStruct< css::uno::Type > arg0;
     ttb::TestPolyStruct< css::uno::Any > arg1;
@@ -394,24 +386,21 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
 
 //XMultiBase1
 double Impl2::getatt1()
-        throw (css::uno::RuntimeException, std::exception)
 {
     return m_attr1;
 }
 
-void Impl2::setatt1( double _att1 )throw (css::uno::RuntimeException, std::exception)
+void Impl2::setatt1( double _att1 )
 {
     m_attr1 = _att1;
 }
 
 ::sal_Int32 Impl2::fn11( ::sal_Int32 arg )
-        throw (css::uno::RuntimeException, std::exception)
 {
     return 11 * arg;
 }
 
 OUString Impl2::fn12( const OUString& arg )
-        throw (css::uno::RuntimeException, std::exception)
 {
     return "12" + arg;
 }
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index ad3fd185b97c..bda776594200 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -162,9 +162,9 @@ public:
      }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XLBTestBase
     virtual void SAL_CALL setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
@@ -176,8 +176,7 @@ public:
                                      const css::uno::Reference< css::uno::XInterface >& xTest,
                                      const css::uno::Any& rAny,
                                      const css::uno::Sequence<TestElement >& rSequence,
-                                     const TestData& rStruct )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                     const TestData& rStruct ) override;
 
     virtual TestData SAL_CALL setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
                                                 sal_Int16& nShort, sal_uInt16& nUShort,
@@ -188,8 +187,7 @@ public:
                                                 css::uno::Reference< css::uno::XInterface >& xTest,
                                                 css::uno::Any& rAny,
                                                 css::uno::Sequence<TestElement >& rSequence,
-                                                TestData& rStruct )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                                TestData& rStruct ) override;
 
     virtual TestData SAL_CALL getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
                                                sal_Int16& nShort, sal_uInt16& nUShort,
@@ -200,231 +198,210 @@ public:
                                                css::uno::Reference< css::uno::XInterface >& xTest,
                                                css::uno::Any& rAny,
                                                css::uno::Sequence< TestElement >& rSequence,
-                                               TestData& rStruct )
-        throw(css::uno::RuntimeException, std::exception) override;
+                                               TestData& rStruct ) override;
 
-    virtual SmallStruct SAL_CALL echoSmallStruct(const SmallStruct& rStruct) throw(css::uno::RuntimeException, std::exception) override
+    virtual SmallStruct SAL_CALL echoSmallStruct(const SmallStruct& rStruct) override
         { return rStruct; }
-    virtual MediumStruct SAL_CALL echoMediumStruct(const MediumStruct& rStruct) throw(css::uno::RuntimeException, std::exception) override
+    virtual MediumStruct SAL_CALL echoMediumStruct(const MediumStruct& rStruct) override
         { return rStruct; }
-    virtual BigStruct SAL_CALL echoBigStruct(const BigStruct& rStruct) throw(css::uno::RuntimeException, std::exception) override
+    virtual BigStruct SAL_CALL echoBigStruct(const BigStruct& rStruct) override
         { return rStruct; }
-    virtual TwoFloats SAL_CALL echoTwoFloats(const TwoFloats& rStruct) throw(css::uno::RuntimeException, std::exception) override
+    virtual TwoFloats SAL_CALL echoTwoFloats(const TwoFloats& rStruct) override
         { return rStruct; }
-    virtual FourFloats SAL_CALL echoFourFloats(const FourFloats& rStruct) throw(css::uno::RuntimeException, std::exception) override
+    virtual FourFloats SAL_CALL echoFourFloats(const FourFloats& rStruct) override
         { return rStruct; }
-    virtual MixedFloatAndInteger SAL_CALL echoMixedFloatAndInteger(const MixedFloatAndInteger& rStruct) throw(css::uno::RuntimeException, std::exception) override
+    virtual MixedFloatAndInteger SAL_CALL echoMixedFloatAndInteger(const MixedFloatAndInteger& rStruct) override
         { return rStruct; }
-    virtual ThreeByteStruct SAL_CALL echoThreeByteStruct(const ThreeByteStruct& rStruct) throw(css::uno::RuntimeException, std::exception) override
+    virtual ThreeByteStruct SAL_CALL echoThreeByteStruct(const ThreeByteStruct& rStruct) override
         { return rStruct; }
-    virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64, sal_Int32, sal_Int64, sal_Int32 i2 ) throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64, sal_Int32, sal_Int64, sal_Int32 i2 ) override
         { return i2; }
-    virtual sal_Int32 SAL_CALL testPPC64Alignment( double , double , double , sal_Int32 i1 ) throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL testPPC64Alignment( double , double , double , sal_Int32 i1 ) override
         { return i1; }
-    virtual double SAL_CALL testTenDoubles( double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8, double d9, double d10 ) throw(css::uno::RuntimeException, std::exception) override
+    virtual double SAL_CALL testTenDoubles( double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8, double d9, double d10 ) override
         { return d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10; }
-    virtual sal_Bool SAL_CALL getBool() throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL getBool() override
         { return _aData.Bool; }
-    virtual sal_Int8 SAL_CALL getByte() throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_Int8 SAL_CALL getByte() override
         { return _aData.Byte; }
-    virtual sal_Unicode SAL_CALL getChar() throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_Unicode SAL_CALL getChar() override
         { return _aData.Char; }
-    virtual sal_Int16 SAL_CALL getShort() throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_Int16 SAL_CALL getShort() override
         { return _aData.Short; }
-    virtual sal_uInt16 SAL_CALL getUShort() throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_uInt16 SAL_CALL getUShort() override
         { return _aData.UShort; }
-    virtual sal_Int32 SAL_CALL getLong() throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getLong() override
         { return _aData.Long; }
-    virtual sal_uInt32 SAL_CALL getULong() throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_uInt32 SAL_CALL getULong() override
         { return _aData.ULong; }
-    virtual sal_Int64 SAL_CALL getHyper() throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_Int64 SAL_CALL getHyper() override
         { return _aData.Hyper; }
-    virtual sal_uInt64 SAL_CALL getUHyper() throw(css::uno::RuntimeException, std::exception) override
+    virtual sal_uInt64 SAL_CALL getUHyper() override
         { return _aData.UHyper; }
-    virtual float SAL_CALL getFloat() throw(css::uno::RuntimeException, std::exception) override
+    virtual float SAL_CALL getFloat() override
         { return _aData.Float; }
-    virtual double SAL_CALL getDouble() throw(css::uno::RuntimeException, std::exception) override
+    virtual double SAL_CALL getDouble() override
         { return _aData.Double; }
-    virtual TestEnum SAL_CALL getEnum() throw(css::uno::RuntimeException, std::exception) override
+    virtual TestEnum SAL_CALL getEnum() override
         { return _aData.Enum; }
-    virtual OUString SAL_CALL getString() throw(css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getString() override
         { return _aData.String; }
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getInterface(  ) throw(css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getInterface(  ) override
         { return _aData.Interface; }
-    virtual css::uno::Any SAL_CALL getAny() throw(css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getAny() override
         { return _aData.Any; }
-    virtual css::uno::Sequence< TestElement > SAL_CALL getSequence() throw(css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< TestElement > SAL_CALL getSequence() override
         { return _aData.Sequence; }
-    virtual TestData SAL_CALL getStruct() throw(css::uno::RuntimeException, std::exception) override
+    virtual TestData SAL_CALL getStruct() override
         { return _aStructData; }
 
-    virtual void SAL_CALL setBool( sal_Bool _bool ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setBool( sal_Bool _bool ) override
         { _aData.Bool = _bool; }
-    virtual void SAL_CALL setByte( sal_Int8 _byte ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setByte( sal_Int8 _byte ) override
         { _aData.Byte = _byte; }
-    virtual void SAL_CALL setChar( sal_Unicode _char ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setChar( sal_Unicode _char ) override
         { _aData.Char = _char; }
-    virtual void SAL_CALL setShort( sal_Int16 _short ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setShort( sal_Int16 _short ) override
         { _aData.Short = _short; }
-    virtual void SAL_CALL setUShort( sal_uInt16 _ushort ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setUShort( sal_uInt16 _ushort ) override
         { _aData.UShort = _ushort; }
-    virtual void SAL_CALL setLong( sal_Int32 _long ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setLong( sal_Int32 _long ) override
         { _aData.Long = _long; }
-    virtual void SAL_CALL setULong( sal_uInt32 _ulong ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setULong( sal_uInt32 _ulong ) override
         { _aData.ULong = _ulong; }
-    virtual void SAL_CALL setHyper( sal_Int64 _hyper ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setHyper( sal_Int64 _hyper ) override
         { _aData.Hyper = _hyper; }
-    virtual void SAL_CALL setUHyper( sal_uInt64 _uhyper ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setUHyper( sal_uInt64 _uhyper ) override
         { _aData.UHyper = _uhyper; }
-    virtual void SAL_CALL setFloat( float _float ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setFloat( float _float ) override
         { _aData.Float = _float; }
-    virtual void SAL_CALL setDouble( double _double ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setDouble( double _double ) override
         { _aData.Double = _double; }
-    virtual void SAL_CALL setEnum( TestEnum _enum ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setEnum( TestEnum _enum ) override
         { _aData.Enum = _enum; }
-    virtual void SAL_CALL setString( const OUString& _string ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setString( const OUString& _string ) override
         { _aData.String = _string; }
-    virtual void SAL_CALL setInterface( const css::uno::Reference< css::uno::XInterface >& _interface ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setInterface( const css::uno::Reference< css::uno::XInterface >& _interface ) override
         { _aData.Interface = _interface; }
-    virtual void SAL_CALL setAny( const css::uno::Any& _any ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setAny( const css::uno::Any& _any ) override
         { _aData.Any = _any; }
-    virtual void SAL_CALL setSequence( const css::uno::Sequence<TestElement >& _sequence ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setSequence( const css::uno::Sequence<TestElement >& _sequence ) override
         { _aData.Sequence = _sequence; }
-    virtual void SAL_CALL setStruct( const TestData& _struct ) throw(css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setStruct( const TestData& _struct ) override
         { _aStructData = _struct; }
 
-    virtual sal_Int32 SAL_CALL getRaiseAttr1() throw (RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getRaiseAttr1() override
     { throw RuntimeException(); }
 
-    virtual void SAL_CALL setRaiseAttr1(sal_Int32)
-        throw (IllegalArgumentException, RuntimeException, std::exception) override
+    virtual void SAL_CALL setRaiseAttr1(sal_Int32) override
     { throw IllegalArgumentException(); }
 
-    virtual sal_Int32 SAL_CALL getRaiseAttr2()
-        throw (IllegalArgumentException, RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getRaiseAttr2() override
     { throw IllegalArgumentException(); }
 
     virtual TestPolyStruct< sal_Bool > SAL_CALL transportPolyBoolean(
-        TestPolyStruct< sal_Bool > const & arg) throw (RuntimeException, std::exception) override
+        TestPolyStruct< sal_Bool > const & arg) override
     { return arg; }
 
-    virtual void SAL_CALL transportPolyHyper(TestPolyStruct< sal_Int64 > &)
-        throw (RuntimeException, std::exception) override {}
+    virtual void SAL_CALL transportPolyHyper(TestPolyStruct< sal_Int64 > &) override {}
 
     virtual void SAL_CALL transportPolySequence(
         TestPolyStruct< Sequence< Any > > const & arg1,
-        TestPolyStruct< Sequence< Any > > & arg2) throw (RuntimeException, std::exception) override
+        TestPolyStruct< Sequence< Any > > & arg2) override
     { arg2 = arg1; }
 
-    virtual TestPolyStruct< sal_Int32 > SAL_CALL getNullPolyLong()
-        throw (RuntimeException, std::exception) override
+    virtual TestPolyStruct< sal_Int32 > SAL_CALL getNullPolyLong() override
     { return TestPolyStruct< sal_Int32 >(0); /* work around MS compiler bug */ }
 
-    virtual TestPolyStruct< OUString > SAL_CALL getNullPolyString()
-        throw (RuntimeException, std::exception) override
+    virtual TestPolyStruct< OUString > SAL_CALL getNullPolyString() override
     { return TestPolyStruct< OUString >(); }
 
-    virtual TestPolyStruct< Type > SAL_CALL getNullPolyType()
-        throw (RuntimeException, std::exception) override
+    virtual TestPolyStruct< Type > SAL_CALL getNullPolyType() override
     { return TestPolyStruct< Type >(); }
 
-    virtual TestPolyStruct< Any > SAL_CALL getNullPolyAny()
-        throw (RuntimeException, std::exception) override
+    virtual TestPolyStruct< Any > SAL_CALL getNullPolyAny() override
     { return TestPolyStruct< Any >(); }
 
     virtual TestPolyStruct< Sequence< sal_Bool > > SAL_CALL
-    getNullPolySequence() throw (RuntimeException, std::exception) override
+    getNullPolySequence() override
     { return TestPolyStruct< Sequence< sal_Bool > >(); }
 
-    virtual TestPolyStruct< TestEnum > SAL_CALL getNullPolyEnum()
-        throw (RuntimeException, std::exception) override
+    virtual TestPolyStruct< TestEnum > SAL_CALL getNullPolyEnum() override
     { return TestPolyStruct< TestEnum >(
         test::testtools::bridgetest::TestEnum_TEST);
           /* work around MS compiler bug */ }
 
-    virtual TestPolyStruct< TestBadEnum > SAL_CALL getNullPolyBadEnum()
-        throw (RuntimeException, std::exception) override
+    virtual TestPolyStruct< TestBadEnum > SAL_CALL getNullPolyBadEnum() override
     { return TestPolyStruct< TestBadEnum >(
         test::testtools::bridgetest::TestBadEnum_M);
           /* explicitly instantiate with default enumerator */ }
 
-    virtual TestPolyStruct< TestStruct > SAL_CALL getNullPolyStruct()
-        throw (RuntimeException, std::exception) override
+    virtual TestPolyStruct< TestStruct > SAL_CALL getNullPolyStruct() override
     { return TestPolyStruct< TestStruct >(); }
 
     virtual TestPolyStruct< Reference< XBridgeTestBase > > SAL_CALL
-    getNullPolyInterface() throw (RuntimeException, std::exception) override
+    getNullPolyInterface() override
     { return TestPolyStruct< Reference< XBridgeTestBase > >(); }
 
     virtual css::uno::Any SAL_CALL transportAny(
-        const css::uno::Any& value )
-        throw(css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL call( sal_Int32 nCallId, sal_Int32 nWaitMUSEC )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL callOneway( sal_Int32 nCallId, sal_Int32 nWaitMUSEC )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL sequenceOfCallTestPassed(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& value ) override;
+
+    virtual void SAL_CALL call( sal_Int32 nCallId, sal_Int32 nWaitMUSEC ) override;
+    virtual void SAL_CALL callOneway( sal_Int32 nCallId, sal_Int32 nWaitMUSEC ) override;
+    virtual sal_Bool SAL_CALL sequenceOfCallTestPassed(  ) override;
     virtual void SAL_CALL startRecursiveCall(
-        const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) override;
 
-    virtual Reference< XMulti > SAL_CALL getMulti() throw (RuntimeException, std::exception) override;
+    virtual Reference< XMulti > SAL_CALL getMulti() override;
 
-    virtual OUString SAL_CALL testMulti(Reference< XMulti > const & multi)
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL testMulti(Reference< XMulti > const & multi) override;
 
 public: // XBridgeTest
-    virtual TestData SAL_CALL raiseException( sal_Int16 nArgumentPos, const OUString & rMsg, const Reference< XInterface > & xCOntext )
-        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual TestData SAL_CALL raiseException( sal_Int16 nArgumentPos, const OUString & rMsg, const Reference< XInterface > & xCOntext ) override;
 
     virtual void SAL_CALL raiseRuntimeExceptionOneway(
-        const OUString& Message, const css::uno::Reference< css::uno::XInterface >& Context )
-        throw(css::uno::RuntimeException, std::exception) override;
+        const OUString& Message, const css::uno::Reference< css::uno::XInterface >& Context ) override;
 
-    virtual sal_Int32 SAL_CALL getRuntimeException() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getRuntimeException() override;
+    virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) override;
 
     // XBridgeTest2
     virtual Sequence< sal_Bool > SAL_CALL setSequenceBool(
-        const Sequence< sal_Bool >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< sal_Bool >& aSeq ) override;
     virtual Sequence< sal_Unicode > SAL_CALL setSequenceChar(
-        const Sequence< sal_Unicode >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< sal_Unicode >& aSeq ) override;
     virtual Sequence< sal_Int8 > SAL_CALL setSequenceByte(
-        const Sequence< sal_Int8 >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< sal_Int8 >& aSeq ) override;
     virtual Sequence< sal_Int16 > SAL_CALL setSequenceShort(
-        const Sequence< sal_Int16 >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< sal_Int16 >& aSeq ) override;
     virtual Sequence< sal_uInt16 > SAL_CALL setSequenceUShort(
-        const Sequence< sal_uInt16 >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< sal_uInt16 >& aSeq ) override;
     virtual Sequence< sal_Int32 > SAL_CALL setSequenceLong(
-        const Sequence< sal_Int32 >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< sal_Int32 >& aSeq ) override;
     virtual Sequence< sal_uInt32 > SAL_CALL setSequenceULong(
-        const Sequence< sal_uInt32 >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< sal_uInt32 >& aSeq ) override;
     virtual Sequence< sal_Int64 > SAL_CALL setSequenceHyper(
-        const Sequence< sal_Int64 >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< sal_Int64 >& aSeq ) override;
     virtual Sequence< sal_uInt64 > SAL_CALL setSequenceUHyper(
-        const Sequence< sal_uInt64 >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< sal_uInt64 >& aSeq ) override;
     virtual Sequence< float > SAL_CALL setSequenceFloat(
-        const Sequence< float >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< float >& aSeq ) override;
     virtual Sequence< double > SAL_CALL setSequenceDouble(
-        const Sequence< double >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< double >& aSeq ) override;
     virtual Sequence< TestEnum > SAL_CALL setSequenceEnum(
-        const Sequence< TestEnum >& aSeq ) throw (RuntimeException, std::exception) override ;
+        const Sequence< TestEnum >& aSeq ) override ;
     virtual Sequence< OUString > SAL_CALL setSequenceString(
-        const Sequence< OUString >& aString ) throw (RuntimeException, std::exception) override;
+        const Sequence< OUString >& aString ) override;
     virtual Sequence< Reference< XInterface > > SAL_CALL setSequenceXInterface(
-        const Sequence< Reference< XInterface > >& aSeq )
-        throw (RuntimeException, std::exception) override;
+        const Sequence< Reference< XInterface > >& aSeq ) override;
     virtual Sequence<Any > SAL_CALL setSequenceAny(
-        const Sequence<Any >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence<Any >& aSeq ) override;
     virtual Sequence<TestElement > SAL_CALL setSequenceStruct(
-        const Sequence< TestElement >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence< TestElement >& aSeq ) override;
     virtual Sequence< Sequence< sal_Int32 > > SAL_CALL setDim2(
-        const Sequence<Sequence< sal_Int32 > >& aSeq ) throw (RuntimeException, std::exception) override;
+        const Sequence<Sequence< sal_Int32 > >& aSeq ) override;
     virtual Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL setDim3(
-        const Sequence< Sequence< Sequence< sal_Int32 > > >& aSeq )
-        throw (RuntimeException, std::exception) override;
+        const Sequence< Sequence< Sequence< sal_Int32 > > >& aSeq ) override;
     virtual void SAL_CALL setSequencesInOut(Sequence< sal_Bool >& aSeqBoolean,
                                 Sequence< sal_Unicode >& aSeqChar,
                                 Sequence< sal_Int8 >& aSeqByte,
@@ -441,8 +418,7 @@ public: // XBridgeTest
                                 Sequence<Reference<XInterface > >& aSeqXInterface,
                                 Sequence< Any >& aSeqAny,
                                 Sequence< Sequence< sal_Int32 > >& aSeqDim2,
-                                Sequence< Sequence< Sequence< sal_Int32 > > >& aSeqDim3 )
-        throw (RuntimeException, std::exception) override;
+                                Sequence< Sequence< Sequence< sal_Int32 > > >& aSeqDim3 ) override;
     virtual void SAL_CALL setSequencesOut( Sequence< sal_Bool >& aSeqBoolean,
                              Sequence< sal_Unicode >& aSeqChar,
                              Sequence< sal_Int8 >& aSeqByte,
@@ -459,17 +435,14 @@ public: // XBridgeTest
                              Sequence< Reference< XInterface > >& aSeqXInterface,
                              Sequence< Any >& aSeqAny,
                              Sequence< Sequence< sal_Int32 > >& aSeqDim2,
-                             Sequence< Sequence< Sequence< sal_Int32 > > >& aSeqDim3 )
-        throw (RuntimeException, std::exception) override;
+                             Sequence< Sequence< Sequence< sal_Int32 > > >& aSeqDim3 ) override;
     virtual void SAL_CALL testConstructorsService(
-        Reference< XComponentContext > const & context)
-        throw (RuntimeException, std::exception) override;
+        Reference< XComponentContext > const & context) override;
     virtual Reference< XCurrentContextChecker > SAL_CALL
-    getCurrentContextChecker()
-        throw (RuntimeException, std::exception) override;
+    getCurrentContextChecker() override;
 
 public:
-    virtual void SAL_CALL callRecursivly( const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL callRecursivly( const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall ) override;
 };
 
 //Dummy class for XComponent implementation
@@ -481,7 +454,7 @@ public:
 
 };
 
-Any Test_Impl::transportAny( const Any & value ) throw ( css::uno::RuntimeException, std::exception)
+Any Test_Impl::transportAny( const Any & value )
 {
     return value;
 }
@@ -499,7 +472,7 @@ void wait(sal_Int32 microSeconds) {
 
 }
 
-void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(css::uno::RuntimeException, std::exception)
+void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC )
 {
     wait(nWaitMUSEC);
     if( m_bFirstCall )
@@ -514,7 +487,7 @@ void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(css::uno:
 }
 
 
-void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (css::uno::RuntimeException, std::exception)
+void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC )
 {
     wait(nWaitMUSEC);
     m_bSequenceOfCallTestPassed = m_bSequenceOfCallTestPassed && (nCallId > m_nLastCallId);
@@ -522,7 +495,7 @@ void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (cs
 }
 
 
-sal_Bool Test_Impl::sequenceOfCallTestPassed() throw (css::uno::RuntimeException, std::exception)
+sal_Bool Test_Impl::sequenceOfCallTestPassed()
 {
     return m_bSequenceOfCallTestPassed;
 }
@@ -530,7 +503,6 @@ sal_Bool Test_Impl::sequenceOfCallTestPassed() throw (css::uno::RuntimeException
 
 void SAL_CALL Test_Impl::startRecursiveCall(
     const css::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall )
-    throw(css::uno::RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     if( nToCall )
@@ -544,7 +516,6 @@ void SAL_CALL Test_Impl::startRecursiveCall(
 void SAL_CALL Test_Impl::callRecursivly(
     const css::uno::Reference< XRecursiveCall >& xCall,
     sal_Int32 nToCall )
-    throw(css::uno::RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     if( nToCall )
@@ -554,12 +525,11 @@ void SAL_CALL Test_Impl::callRecursivly(
     }
 }
 
-Reference< XMulti > Test_Impl::getMulti() throw (RuntimeException, std::exception) {
+Reference< XMulti > Test_Impl::getMulti() {
     return new testtools::bridgetest::Multi;
 }
 
 OUString Test_Impl::testMulti(Reference< XMulti > const & multi)
-    throw (RuntimeException, std::exception)
 {
     return testtools::bridgetest::testMulti(multi);
 }
@@ -575,7 +545,6 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
                            const css::uno::Any& rAny,
                            const css::uno::Sequence<TestElement >& rSequence,
                            const TestData& rStruct )
-    throw(css::uno::RuntimeException, std::exception)
 {
     assign( _aData,
             bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, fFloat, fDouble,
@@ -593,7 +562,6 @@ TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& n
                                 css::uno::Any& rAny,
                                 css::uno::Sequence<TestElement >& rSequence,
                                 TestData& rStruct )
-    throw(css::uno::RuntimeException, std::exception)
 {
     assign( _aData,
             bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper, nUHyper, fFloat, fDouble,
@@ -617,7 +585,6 @@ TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nB
                                css::uno::Any& rAny,
                                css::uno::Sequence<TestElement >& rSequence,
                                TestData& rStruct )
-    throw(css::uno::RuntimeException, std::exception)
 {
     bBool = _aData.Bool;
     cChar = _aData.Char;
@@ -640,7 +607,6 @@ TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nB
 }
 
 TestData Test_Impl::raiseException( sal_Int16 nArgumentPos, const OUString & rMsg, const Reference< XInterface > & xContext )
-    throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     IllegalArgumentException aExc;
     aExc.ArgumentPosition = nArgumentPos;
@@ -650,7 +616,6 @@ TestData Test_Impl::raiseException( sal_Int16 nArgumentPos, const OUString & rMs
 }
 
 void Test_Impl::raiseRuntimeExceptionOneway( const OUString & rMsg, const Reference< XInterface > & xContext )
-    throw(css::uno::RuntimeException, std::exception)
 {
     RuntimeException aExc;
     aExc.Message          = _aData.String = rMsg;
@@ -691,7 +656,6 @@ void dothrow(const RuntimeException& e)
 }
 
 sal_Int32 Test_Impl::getRuntimeException()
-    throw (RuntimeException, std::exception)
 {
     try
     {
@@ -705,7 +669,7 @@ sal_Int32 Test_Impl::getRuntimeException()
     return 0; // for dummy
 }
 
-void Test_Impl::setRuntimeException( sal_Int32 ) throw(css::uno::RuntimeException, std::exception)
+void Test_Impl::setRuntimeException( sal_Int32 )
 {
     RuntimeException aExc;
     aExc.Message          = _aData.String;
@@ -715,91 +679,91 @@ void Test_Impl::setRuntimeException( sal_Int32 ) throw(css::uno::RuntimeExceptio
 
 // XBridgeTest2 -------------------------------------------------------------
 Sequence< sal_Bool > SAL_CALL Test_Impl::setSequenceBool(
-        const Sequence< sal_Bool >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< sal_Bool >& aSeq )
 {
     _arBool = aSeq;
     return aSeq;
 }
 
 Sequence< sal_Unicode > SAL_CALL Test_Impl::setSequenceChar(
-        const Sequence< sal_Unicode >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< sal_Unicode >& aSeq )
 {
     _arChar = aSeq;
     return aSeq;
 }
 
 Sequence< sal_Int8 > SAL_CALL Test_Impl::setSequenceByte(
-        const Sequence< sal_Int8 >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< sal_Int8 >& aSeq )
 {
     _arByte = aSeq;
     return aSeq;
 }
 
 Sequence< sal_Int16 > SAL_CALL Test_Impl::setSequenceShort(
-        const Sequence< sal_Int16 >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< sal_Int16 >& aSeq )
 {
     _arShort = aSeq;
     return aSeq;
 }
 
 Sequence< sal_uInt16 > SAL_CALL Test_Impl::setSequenceUShort(
-        const Sequence< sal_uInt16 >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< sal_uInt16 >& aSeq )
 {
     _arUShort = aSeq;
     return aSeq;
 }
 
 Sequence< sal_Int32 > SAL_CALL Test_Impl::setSequenceLong(
-        const Sequence< sal_Int32 >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< sal_Int32 >& aSeq )
 {
     _arLong = aSeq;
     return aSeq;
 }
 
 Sequence< sal_uInt32 > SAL_CALL Test_Impl::setSequenceULong(
-        const Sequence< sal_uInt32 >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< sal_uInt32 >& aSeq )
 {
     _arULong = aSeq;
     return aSeq;
 }
 
 Sequence< sal_Int64 > SAL_CALL Test_Impl::setSequenceHyper(
-        const Sequence< sal_Int64 >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< sal_Int64 >& aSeq )
 {
     _arHyper = aSeq;
     return aSeq;
 }
 
 Sequence< sal_uInt64 > SAL_CALL Test_Impl::setSequenceUHyper(
-        const Sequence< sal_uInt64 >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< sal_uInt64 >& aSeq )
 {
     _arUHyper = aSeq;
     return aSeq;
 }
 
 Sequence< float > SAL_CALL Test_Impl::setSequenceFloat(
-        const Sequence< float >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence< float >& aSeq )
 {
     _arFloat = aSeq;
     return aSeq;
 }
 
 Sequence< double > SAL_CALL Test_Impl::setSequenceDouble(
-    const Sequence< double >& aSeq ) throw (RuntimeException, std::exception)
+    const Sequence< double >& aSeq )
 {
     _arDouble = aSeq;
     return aSeq;
 }
 
 Sequence< TestEnum > SAL_CALL Test_Impl::setSequenceEnum(
-    const Sequence< TestEnum >& aSeq ) throw (RuntimeException, std::exception)
+    const Sequence< TestEnum >& aSeq )
 {
     _arEnum = aSeq;
     return aSeq;
 }
 
 Sequence< OUString > SAL_CALL Test_Impl::setSequenceString(
-    const Sequence< OUString >& aSeq ) throw (RuntimeException, std::exception)
+    const Sequence< OUString >& aSeq )
 {
     _arString = aSeq;
     return aSeq;
@@ -807,28 +771,27 @@ Sequence< OUString > SAL_CALL Test_Impl::setSequenceString(
 
 Sequence< Reference< XInterface > > SAL_CALL Test_Impl::setSequenceXInterface(
         const Sequence< Reference< XInterface > >& aSeq )
-        throw (RuntimeException, std::exception)
 {
     _arObject = aSeq;
     return aSeq;
 }
 
 Sequence<Any > SAL_CALL Test_Impl::setSequenceAny(
-    const Sequence<Any >& aSeq ) throw (RuntimeException, std::exception)
+    const Sequence<Any >& aSeq )
 {
     _arAny = aSeq;
     return aSeq;
 }
 
 Sequence<TestElement > SAL_CALL Test_Impl::setSequenceStruct(
-    const Sequence< TestElement >& aSeq ) throw (RuntimeException, std::exception)
+    const Sequence< TestElement >& aSeq )
 {
     _arStruct = aSeq;
     return aSeq;
 }
 
 Sequence< Sequence< sal_Int32 > > SAL_CALL Test_Impl::setDim2(
-        const Sequence<Sequence< sal_Int32 > >& aSeq ) throw (RuntimeException, std::exception)
+        const Sequence<Sequence< sal_Int32 > >& aSeq )
 {
     _arLong2 = aSeq;
     return aSeq;
@@ -836,7 +799,6 @@ Sequence< Sequence< sal_Int32 > > SAL_CALL Test_Impl::setDim2(
 
 Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL Test_Impl::setDim3(
         const Sequence< Sequence< Sequence< sal_Int32 > > >& aSeq )
-        throw (RuntimeException, std::exception)
 {
     _arLong3 = aSeq;
     return aSeq;
@@ -859,7 +821,6 @@ void SAL_CALL Test_Impl::setSequencesInOut(Sequence< sal_Bool >& aSeqBoolean,
                                 Sequence< Any >& aSeqAny,
                                 Sequence< Sequence< sal_Int32 > >& aSeqDim2,
                                 Sequence< Sequence< Sequence< sal_Int32 > > >& aSeqDim3 )
-        throw (RuntimeException, std::exception)
 {
     _arBool = aSeqBoolean;
     _arChar = aSeqChar;
@@ -897,7 +858,6 @@ void SAL_CALL Test_Impl::setSequencesOut( Sequence< sal_Bool >& aSeqBoolean,
                              Sequence< Any >& aSeqAny,
                              Sequence< Sequence< sal_Int32 > >& aSeqDim2,
                              Sequence< Sequence< Sequence< sal_Int32 > > >& aSeqDim3 )
-        throw (RuntimeException, std::exception)
 {
     aSeqBoolean = _arBool;
     aSeqChar = _arChar;
@@ -919,7 +879,7 @@ void SAL_CALL Test_Impl::setSequencesOut( Sequence< sal_Bool >& aSeqBoolean,
 }
 
 void Test_Impl::testConstructorsService(
-    Reference< XComponentContext > const & context) throw (RuntimeException, std::exception)
+    Reference< XComponentContext > const & context)
 {
     Sequence< sal_Bool > arg14(1); arg14[0] = true;
     Sequence< sal_Int8 > arg15(1); arg15[0] = SAL_MIN_INT8;
@@ -1134,7 +1094,6 @@ void Test_Impl::testConstructorsService(
 }
 
 Reference< XCurrentContextChecker > Test_Impl::getCurrentContextChecker()
-    throw (RuntimeException, std::exception)
 {
     return new testtools::bridgetest::CurrentContextChecker;
 }
@@ -1142,19 +1101,16 @@ Reference< XCurrentContextChecker > Test_Impl::getCurrentContextChecker()
 // XServiceInfo
 
 OUString Test_Impl::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return OUString( IMPLNAME );
 }
 
 sal_Bool Test_Impl::supportsService( const OUString & rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > Test_Impl::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return bridge_object::getSupportedServiceNames();
 }
diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx
index 5691335b1170..7fa88e73d0b4 100644
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@@ -51,14 +51,12 @@ public:
     CurrentContext(const CurrentContext&) = delete;
     CurrentContext& operator=(const CurrentContext&) = delete;
 
-    virtual css::uno::Any SAL_CALL getValueByName(OUString const & Name)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValueByName(OUString const & Name) override;
 };
 
 CurrentContext::CurrentContext() {}
 
 css::uno::Any CurrentContext::getValueByName(OUString const & Name)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return Name == KEY ? css::uno::makeAny(OUString(VALUE)) : css::uno::Any();
 }
@@ -73,7 +71,6 @@ sal_Bool testtools::bridgetest::CurrentContextChecker::perform(
     css::uno::Reference<
         ::test::testtools::bridgetest::XCurrentContextChecker > const & other,
     ::sal_Int32 setSteps, ::sal_Int32 checkSteps)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (setSteps == 0) {
         css::uno::ContextLayer layer(new CurrentContext);
diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx
index 1877392129ac..8caeb4ab235f 100644
--- a/testtools/source/bridgetest/currentcontextchecker.hxx
+++ b/testtools/source/bridgetest/currentcontextchecker.hxx
@@ -44,8 +44,7 @@ public:
 
     virtual sal_Bool SAL_CALL perform(
         css::uno::Reference< ::test::testtools::bridgetest::XCurrentContextChecker > const & other,
-        ::sal_Int32 setSteps, ::sal_Int32 checkSteps)
-        throw (css::uno::RuntimeException, std::exception) override;
+        ::sal_Int32 setSteps, ::sal_Int32 checkSteps) override;
 
 private:
     CurrentContextChecker(CurrentContextChecker &) = delete;
diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx
index 6ed12840c7a0..f09cbaf93046 100644
--- a/testtools/source/bridgetest/multi.hxx
+++ b/testtools/source/bridgetest/multi.hxx
@@ -38,72 +38,55 @@ class Multi: public cppu::WeakImplHelper< test::testtools::bridgetest::XMulti >
 public:
     Multi(): m_attribute1(0.0), m_attribute3(0.0) {}
 
-    virtual double SAL_CALL getatt1()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual double SAL_CALL getatt1() override
     { return m_attribute1; }
 
-    virtual void SAL_CALL setatt1(double value)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setatt1(double value) override
     { m_attribute1 = value; }
 
-    virtual sal_Int32 SAL_CALL fn11(sal_Int32 arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL fn11(sal_Int32 arg) override
     { return 11 * arg; }
 
-    virtual OUString SAL_CALL fn12(OUString const & arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL fn12(OUString const & arg) override
     { return "12" + arg; }
 
-    virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg) override
     { return 21 * arg; }
 
-    virtual OUString SAL_CALL fn22(OUString const & arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL fn22(OUString const & arg) override
     { return "22" + arg; }
 
-    virtual double SAL_CALL getatt3()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual double SAL_CALL getatt3() override
     { return m_attribute3; }
 
-    virtual void SAL_CALL setatt3(double value)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setatt3(double value) override
     { m_attribute3 = value; }
 
-    virtual sal_Int32 SAL_CALL fn31(sal_Int32 arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL fn31(sal_Int32 arg) override
     { return 31 * arg; }
 
-    virtual OUString SAL_CALL fn32(OUString const & arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL fn32(OUString const & arg) override
     { return "32" + arg; }
 
-    virtual sal_Int32 SAL_CALL fn33()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL fn33() override
     { return 33; }
 
-    virtual sal_Int32 SAL_CALL fn41(sal_Int32 arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL fn41(sal_Int32 arg) override
     { return 41 * arg; }
 
-    virtual sal_Int32 SAL_CALL fn61(sal_Int32 arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL fn61(sal_Int32 arg) override
     { return 61 * arg; }
 
-    virtual OUString SAL_CALL fn62(OUString const & arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL fn62(OUString const & arg) override
     { return "62" + arg; }
 
-    virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg) override
     { return 71 * arg; }
 
-    virtual OUString SAL_CALL fn72(OUString const & arg)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL fn72(OUString const & arg) override
     { return "72" + arg; }
 
-    virtual sal_Int32 SAL_CALL fn73()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL fn73() override
     { return 73; }
 
 private:
diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx
index 4d29030fc847..a8dee674a308 100644
--- a/toolkit/inc/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx
@@ -44,7 +44,7 @@ public:
     // ::cppu::IPropertyArrayHelper
     sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString * pPropName, sal_Int16 * pAttributes, sal_Int32 nHandle ) override;
     css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() override;
-    css::beans::Property SAL_CALL getPropertyByName(const OUString& rPropertyName) throw (css::beans::UnknownPropertyException) override;
+    css::beans::Property SAL_CALL getPropertyByName(const OUString& rPropertyName) override;
     sal_Bool SAL_CALL hasPropertyByName(const OUString& rPropertyName) override;
     sal_Int32 SAL_CALL getHandleByName( const OUString & rPropertyName ) override;
     sal_Int32 SAL_CALL fillHandles( sal_Int32* pHandles, const css::uno::Sequence< OUString > & rPropNames ) override;
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index f0fd2cf0ec50..8ddbda4108ad 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -304,7 +304,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL AnimatedImagesPeer::startAnimation() throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesPeer::startAnimation()
     {
         SolarMutexGuard aGuard;
         VclPtr<Throbber> pThrobber = GetAsDynamic<Throbber>();
@@ -312,7 +312,7 @@ namespace toolkit
             pThrobber->start();
     }
 
-    void SAL_CALL AnimatedImagesPeer::stopAnimation() throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesPeer::stopAnimation()
     {
         SolarMutexGuard aGuard;
         VclPtr<Throbber> pThrobber = GetAsDynamic<Throbber>();
@@ -320,7 +320,7 @@ namespace toolkit
             pThrobber->stop();
     }
 
-    sal_Bool SAL_CALL AnimatedImagesPeer::isAnimationRunning() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AnimatedImagesPeer::isAnimationRunning()
     {
         SolarMutexGuard aGuard;
         VclPtr<Throbber> pThrobber = GetAsDynamic<Throbber>();
@@ -329,7 +329,7 @@ namespace toolkit
         return false;
     }
 
-    void SAL_CALL AnimatedImagesPeer::setProperty( const OUString& i_propertyName, const Any& i_value ) throw(RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesPeer::setProperty( const OUString& i_propertyName, const Any& i_value )
     {
         SolarMutexGuard aGuard;
 
@@ -374,7 +374,7 @@ namespace toolkit
     }
 
 
-    Any SAL_CALL AnimatedImagesPeer::getProperty( const OUString& i_propertyName ) throw(RuntimeException, std::exception)
+    Any SAL_CALL AnimatedImagesPeer::getProperty( const OUString& i_propertyName )
     {
         SolarMutexGuard aGuard;
 
@@ -430,7 +430,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL AnimatedImagesPeer::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesPeer::elementInserted( const ContainerEvent& i_event )
     {
         SolarMutexGuard aGuard;
         Reference< XAnimatedImages > xAnimatedImages( i_event.Source, UNO_QUERY_THROW );
@@ -453,7 +453,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL AnimatedImagesPeer::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesPeer::elementRemoved( const ContainerEvent& i_event )
     {
         SolarMutexGuard aGuard;
         Reference< XAnimatedImages > xAnimatedImages( i_event.Source, UNO_QUERY_THROW );
@@ -472,7 +472,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL AnimatedImagesPeer::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesPeer::elementReplaced( const ContainerEvent& i_event )
     {
         SolarMutexGuard aGuard;
         Reference< XAnimatedImages > xAnimatedImages( i_event.Source, UNO_QUERY_THROW );
@@ -495,19 +495,19 @@ namespace toolkit
     }
 
 
-    void SAL_CALL AnimatedImagesPeer::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesPeer::disposing( const EventObject& i_event )
     {
         VCLXWindow::disposing( i_event );
     }
 
 
-    void SAL_CALL AnimatedImagesPeer::modified( const EventObject& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesPeer::modified( const EventObject& i_event )
     {
         impl_updateImages_nolck( i_event.Source );
     }
 
 
-    void SAL_CALL AnimatedImagesPeer::dispose(  ) throw(RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesPeer::dispose(  )
     {
         AnimatedImagesPeer_Base::dispose();
         SolarMutexGuard aGuard;
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 3860207e2584..17004ede61a4 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -43,12 +43,12 @@ public:
     AsyncCallback& operator=(const AsyncCallback&) = delete;
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::awt::XRequestCallback:
-    virtual void SAL_CALL addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const css::uno::Any & aData) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const css::uno::Any & aData) override;
 
 private:
 
@@ -67,24 +67,24 @@ private:
 };
 
 // com.sun.star.uno.XServiceInfo:
-OUString SAL_CALL AsyncCallback::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL AsyncCallback::getImplementationName()
 {
     return OUString("com.sun.star.awt.comp.AsyncCallback");
 }
 
-sal_Bool SAL_CALL AsyncCallback::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL AsyncCallback::supportsService(OUString const & serviceName)
 {
     return cppu::supportsService(this, serviceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL AsyncCallback::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL AsyncCallback::getSupportedServiceNames()
 {
     css::uno::Sequence< OUString > s { "com.sun.star.awt.AsyncCallback" };
     return s;
 }
 
 // css::awt::XRequestCallback:
-void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const css::uno::Any & aData) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const css::uno::Any & aData)
 {
     if ( Application::IsInMain() )
     {
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 3310c044c08b..0d540f0bf39c 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -168,217 +168,217 @@ namespace toolkit
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveBorderColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveBorderColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveBorderColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setActiveBorderColor( ::sal_Int32 _activebordercolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setActiveBorderColor( ::sal_Int32 _activebordercolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveBorderColor, _activebordercolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setActiveColor( ::sal_Int32 _activecolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setActiveColor( ::sal_Int32 _activecolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveColor, _activecolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTabColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTabColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveTabColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setActiveTabColor( ::sal_Int32 _activetabcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setActiveTabColor( ::sal_Int32 _activetabcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveTabColor, _activetabcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setActiveTextColor( ::sal_Int32 _activetextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setActiveTextColor( ::sal_Int32 _activetextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveTextColor, _activetextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonRolloverTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonRolloverTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetButtonRolloverTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonRolloverTextColor, _buttonrollovertextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetButtonTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setButtonTextColor( ::sal_Int32 _buttontextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setButtonTextColor( ::sal_Int32 _buttontextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonTextColor, _buttontextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getCheckedColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getCheckedColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetCheckedColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setCheckedColor( ::sal_Int32 _checkedcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setCheckedColor( ::sal_Int32 _checkedcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetCheckedColor, _checkedcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getDarkShadowColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getDarkShadowColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDarkShadowColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setDarkShadowColor( ::sal_Int32 _darkshadowcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setDarkShadowColor( ::sal_Int32 _darkshadowcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDarkShadowColor, _darkshadowcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveBorderColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveBorderColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveBorderColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveBorderColor, _deactivebordercolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setDeactiveColor( ::sal_Int32 _deactivecolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setDeactiveColor( ::sal_Int32 _deactivecolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveColor, _deactivecolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setDeactiveTextColor( ::sal_Int32 _deactivetextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setDeactiveTextColor( ::sal_Int32 _deactivetextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveTextColor, _deactivetextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDialogColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setDialogColor( ::sal_Int32 _dialogcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setDialogColor( ::sal_Int32 _dialogcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDialogColor, _dialogcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDialogTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setDialogTextColor( ::sal_Int32 _dialogtextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setDialogTextColor( ::sal_Int32 _dialogtextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDialogTextColor, _dialogtextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getDisableColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getDisableColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDisableColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setDisableColor( ::sal_Int32 _disablecolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setDisableColor( ::sal_Int32 _disablecolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDisableColor, _disablecolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetFaceColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setFaceColor( ::sal_Int32 _facecolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setFaceColor( ::sal_Int32 _facecolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetFaceColor, _facecolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceGradientColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceGradientColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         const VclPtr<vcl::Window>& pWindow = m_pData->pOwningWindow->GetWindow();
@@ -388,287 +388,287 @@ namespace toolkit
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setFieldColor( ::sal_Int32 _fieldcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setFieldColor( ::sal_Int32 _fieldcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldColor, _fieldcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldRolloverTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldRolloverTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldRolloverTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldRolloverTextColor, _fieldrollovertextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setFieldTextColor( ::sal_Int32 _fieldtextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setFieldTextColor( ::sal_Int32 _fieldtextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldTextColor, _fieldtextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getGroupTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getGroupTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetGroupTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setGroupTextColor( ::sal_Int32 _grouptextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setGroupTextColor( ::sal_Int32 _grouptextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetGroupTextColor, _grouptextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetHelpColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setHelpColor( ::sal_Int32 _helpcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setHelpColor( ::sal_Int32 _helpcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetHelpColor, _helpcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetHelpTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setHelpTextColor( ::sal_Int32 _helptextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setHelpTextColor( ::sal_Int32 _helptextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetHelpTextColor, _helptextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetHighlightColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setHighlightColor( ::sal_Int32 _highlightcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setHighlightColor( ::sal_Int32 _highlightcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetHighlightColor, _highlightcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetHighlightTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setHighlightTextColor( ::sal_Int32 _highlighttextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetHighlightTextColor, _highlighttextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getInactiveTabColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getInactiveTabColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetInactiveTabColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setInactiveTabColor( ::sal_Int32 _inactivetabcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetInactiveTabColor, _inactivetabcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getLabelTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getLabelTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetLabelTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setLabelTextColor( ::sal_Int32 _labeltextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setLabelTextColor( ::sal_Int32 _labeltextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetLabelTextColor, _labeltextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getLightColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getLightColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetLightColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setLightColor( ::sal_Int32 _lightcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setLightColor( ::sal_Int32 _lightcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetLightColor, _lightcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBarColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setMenuBarColor( ::sal_Int32 _menubarcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setMenuBarColor( ::sal_Int32 _menubarcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBarColor, _menubarcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBarTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setMenuBarTextColor( ::sal_Int32 _menubartextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setMenuBarTextColor( ::sal_Int32 _menubartextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBarTextColor, _menubartextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBorderColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBorderColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBorderColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setMenuBorderColor( ::sal_Int32 _menubordercolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setMenuBorderColor( ::sal_Int32 _menubordercolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBorderColor, _menubordercolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setMenuColor( ::sal_Int32 _menucolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setMenuColor( ::sal_Int32 _menucolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuColor, _menucolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuHighlightColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuHighlightColor, _menuhighlightcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuHighlightTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuHighlightTextColor, _menuhighlighttextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setMenuTextColor( ::sal_Int32 _menutextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setMenuTextColor( ::sal_Int32 _menutextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuTextColor, _menutextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getMonoColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getMonoColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMonoColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setMonoColor( ::sal_Int32 _monocolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setMonoColor( ::sal_Int32 _monocolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMonoColor, _monocolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getRadioCheckTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getRadioCheckTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetRadioCheckTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetRadioCheckTextColor, _radiochecktextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getSeparatorColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getSeparatorColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         const VclPtr<vcl::Window>& pWindow = m_pData->pOwningWindow->GetWindow();
@@ -678,63 +678,63 @@ namespace toolkit
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getShadowColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getShadowColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetShadowColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setShadowColor( ::sal_Int32 _shadowcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setShadowColor( ::sal_Int32 _shadowcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetShadowColor, _shadowcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetWindowColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setWindowColor( ::sal_Int32 _windowcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setWindowColor( ::sal_Int32 _windowcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetWindowColor, _windowcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowTextColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowTextColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetWindowTextColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setWindowTextColor( ::sal_Int32 _windowtextcolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setWindowTextColor( ::sal_Int32 _windowtextcolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetWindowTextColor, _windowtextcolor );
     }
 
 
-    ::sal_Int32 SAL_CALL WindowStyleSettings::getWorkspaceColor() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL WindowStyleSettings::getWorkspaceColor()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetWorkspaceColor );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setWorkspaceColor( ::sal_Int32 _workspacecolor ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setWorkspaceColor( ::sal_Int32 _workspacecolor )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetWorkspaceColor, _workspacecolor );
     }
 
 
-    sal_Bool SAL_CALL WindowStyleSettings::getHighContrastMode() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL WindowStyleSettings::getHighContrastMode()
     {
         StyleMethodGuard aGuard( *m_pData );
         const VclPtr<vcl::Window>& pWindow = m_pData->pOwningWindow->GetWindow();
@@ -744,7 +744,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL WindowStyleSettings::setHighContrastMode( sal_Bool _highcontrastmode ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setHighContrastMode( sal_Bool _highcontrastmode )
     {
         StyleMethodGuard aGuard( *m_pData );
         VclPtr<vcl::Window> pWindow = m_pData->pOwningWindow->GetWindow();
@@ -756,161 +756,161 @@ namespace toolkit
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getApplicationFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getApplicationFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetAppFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setApplicationFont( const FontDescriptor& _applicationfont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setApplicationFont( const FontDescriptor& _applicationfont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetAppFont, &StyleSettings::GetAppFont, _applicationfont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getHelpFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getHelpFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetHelpFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setHelpFont( const FontDescriptor& _helpfont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setHelpFont( const FontDescriptor& _helpfont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetHelpFont, &StyleSettings::GetHelpFont, _helpfont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getTitleFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getTitleFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetTitleFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setTitleFont( const FontDescriptor& _titlefont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setTitleFont( const FontDescriptor& _titlefont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetTitleFont, &StyleSettings::GetTitleFont, _titlefont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getFloatTitleFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getFloatTitleFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetFloatTitleFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setFloatTitleFont( const FontDescriptor& _floattitlefont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setFloatTitleFont( const FontDescriptor& _floattitlefont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetFloatTitleFont, &StyleSettings::GetFloatTitleFont, _floattitlefont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getMenuFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getMenuFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetMenuFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setMenuFont( const FontDescriptor& _menufont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setMenuFont( const FontDescriptor& _menufont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetMenuFont, &StyleSettings::GetMenuFont, _menufont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getToolFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getToolFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetToolFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setToolFont( const FontDescriptor& _toolfont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setToolFont( const FontDescriptor& _toolfont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetToolFont, &StyleSettings::GetToolFont, _toolfont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getGroupFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getGroupFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetGroupFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setGroupFont( const FontDescriptor& _groupfont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setGroupFont( const FontDescriptor& _groupfont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetGroupFont, &StyleSettings::GetGroupFont, _groupfont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getLabelFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getLabelFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetLabelFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setLabelFont( const FontDescriptor& _labelfont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setLabelFont( const FontDescriptor& _labelfont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetLabelFont, &StyleSettings::GetLabelFont, _labelfont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getRadioCheckFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getRadioCheckFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetRadioCheckFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setRadioCheckFont( const FontDescriptor& _radiocheckfont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setRadioCheckFont( const FontDescriptor& _radiocheckfont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetRadioCheckFont, &StyleSettings::GetRadioCheckFont, _radiocheckfont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getPushButtonFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getPushButtonFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetPushButtonFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setPushButtonFont( const FontDescriptor& _pushbuttonfont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setPushButtonFont( const FontDescriptor& _pushbuttonfont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetPushButtonFont, &StyleSettings::GetPushButtonFont, _pushbuttonfont );
     }
 
 
-    FontDescriptor SAL_CALL WindowStyleSettings::getFieldFont() throw (RuntimeException, std::exception)
+    FontDescriptor SAL_CALL WindowStyleSettings::getFieldFont()
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetFieldFont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::setFieldFont( const FontDescriptor& _fieldfont ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::setFieldFont( const FontDescriptor& _fieldfont )
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetFieldFont, &StyleSettings::GetFieldFont, _fieldfont );
     }
 
 
-    void SAL_CALL WindowStyleSettings::addStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::addStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener )
     {
         StyleMethodGuard aGuard( *m_pData );
         if ( i_rListener.is() )
@@ -918,7 +918,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL WindowStyleSettings::removeStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL WindowStyleSettings::removeStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener )
     {
         StyleMethodGuard aGuard( *m_pData );
         if ( i_rListener.is() )
diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index 7809dc221904..0bc28cd1dad4 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -52,112 +52,112 @@ namespace toolkit
         void dispose();
 
         // XStyleSettings
-        virtual ::sal_Int32 SAL_CALL getActiveBorderColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setActiveBorderColor( ::sal_Int32 _activebordercolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getActiveColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setActiveColor( ::sal_Int32 _activecolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getActiveTabColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setActiveTabColor( ::sal_Int32 _activetabcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getActiveTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setActiveTextColor( ::sal_Int32 _activetextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getButtonRolloverTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getButtonTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setButtonTextColor( ::sal_Int32 _buttontextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getCheckedColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCheckedColor( ::sal_Int32 _checkedcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getDarkShadowColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDarkShadowColor( ::sal_Int32 _darkshadowcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getDeactiveBorderColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getDeactiveColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDeactiveColor( ::sal_Int32 _deactivecolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getDeactiveTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDeactiveTextColor( ::sal_Int32 _deactivetextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getDialogColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDialogColor( ::sal_Int32 _dialogcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getDialogTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDialogTextColor( ::sal_Int32 _dialogtextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getDisableColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDisableColor( ::sal_Int32 _disablecolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getFaceColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFaceColor( ::sal_Int32 _facecolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getFaceGradientColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getFieldColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFieldColor( ::sal_Int32 _fieldcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getFieldRolloverTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getFieldTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFieldTextColor( ::sal_Int32 _fieldtextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getGroupTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setGroupTextColor( ::sal_Int32 _grouptextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getHelpColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHelpColor( ::sal_Int32 _helpcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getHelpTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHelpTextColor( ::sal_Int32 _helptextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getHighlightColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHighlightColor( ::sal_Int32 _highlightcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getHighlightTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getInactiveTabColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getLabelTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLabelTextColor( ::sal_Int32 _labeltextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getLightColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLightColor( ::sal_Int32 _lightcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMenuBarColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMenuBarColor( ::sal_Int32 _menubarcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMenuBarTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMenuBarTextColor( ::sal_Int32 _menubartextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMenuBorderColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMenuBorderColor( ::sal_Int32 _menubordercolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMenuColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMenuColor( ::sal_Int32 _menucolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMenuHighlightColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMenuHighlightTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMenuTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMenuTextColor( ::sal_Int32 _menutextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMonoColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMonoColor( ::sal_Int32 _monocolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getRadioCheckTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getSeparatorColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getShadowColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setShadowColor( ::sal_Int32 _shadowcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getWindowColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setWindowColor( ::sal_Int32 _windowcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getWindowTextColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setWindowTextColor( ::sal_Int32 _windowtextcolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getWorkspaceColor() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setWorkspaceColor( ::sal_Int32 _workspacecolor ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getHighContrastMode() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHighContrastMode( sal_Bool _highcontrastmode ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getApplicationFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setApplicationFont( const css::awt::FontDescriptor& _applicationfont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getHelpFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setHelpFont( const css::awt::FontDescriptor& _helpfont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getTitleFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTitleFont( const css::awt::FontDescriptor& _titlefont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getFloatTitleFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFloatTitleFont( const css::awt::FontDescriptor& _floattitlefont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getMenuFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMenuFont( const css::awt::FontDescriptor& _menufont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getToolFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setToolFont( const css::awt::FontDescriptor& _toolfont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getGroupFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setGroupFont( const css::awt::FontDescriptor& _groupfont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getLabelFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setLabelFont( const css::awt::FontDescriptor& _labelfont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getRadioCheckFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setRadioCheckFont( const css::awt::FontDescriptor& _radiocheckfont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getPushButtonFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPushButtonFont( const css::awt::FontDescriptor& _pushbuttonfont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::awt::FontDescriptor SAL_CALL getFieldFont() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFieldFont( const css::awt::FontDescriptor& _fieldfont ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addStyleChangeListener( const css::uno::Reference< css::awt::XStyleChangeListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeStyleChangeListener( const css::uno::Reference< css::awt::XStyleChangeListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getActiveBorderColor() override;
+        virtual void SAL_CALL setActiveBorderColor( ::sal_Int32 _activebordercolor ) override;
+        virtual ::sal_Int32 SAL_CALL getActiveColor() override;
+        virtual void SAL_CALL setActiveColor( ::sal_Int32 _activecolor ) override;
+        virtual ::sal_Int32 SAL_CALL getActiveTabColor() override;
+        virtual void SAL_CALL setActiveTabColor( ::sal_Int32 _activetabcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getActiveTextColor() override;
+        virtual void SAL_CALL setActiveTextColor( ::sal_Int32 _activetextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getButtonRolloverTextColor() override;
+        virtual void SAL_CALL setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getButtonTextColor() override;
+        virtual void SAL_CALL setButtonTextColor( ::sal_Int32 _buttontextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getCheckedColor() override;
+        virtual void SAL_CALL setCheckedColor( ::sal_Int32 _checkedcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getDarkShadowColor() override;
+        virtual void SAL_CALL setDarkShadowColor( ::sal_Int32 _darkshadowcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getDeactiveBorderColor() override;
+        virtual void SAL_CALL setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor ) override;
+        virtual ::sal_Int32 SAL_CALL getDeactiveColor() override;
+        virtual void SAL_CALL setDeactiveColor( ::sal_Int32 _deactivecolor ) override;
+        virtual ::sal_Int32 SAL_CALL getDeactiveTextColor() override;
+        virtual void SAL_CALL setDeactiveTextColor( ::sal_Int32 _deactivetextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getDialogColor() override;
+        virtual void SAL_CALL setDialogColor( ::sal_Int32 _dialogcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getDialogTextColor() override;
+        virtual void SAL_CALL setDialogTextColor( ::sal_Int32 _dialogtextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getDisableColor() override;
+        virtual void SAL_CALL setDisableColor( ::sal_Int32 _disablecolor ) override;
+        virtual ::sal_Int32 SAL_CALL getFaceColor() override;
+        virtual void SAL_CALL setFaceColor( ::sal_Int32 _facecolor ) override;
+        virtual ::sal_Int32 SAL_CALL getFaceGradientColor() override;
+        virtual ::sal_Int32 SAL_CALL getFieldColor() override;
+        virtual void SAL_CALL setFieldColor( ::sal_Int32 _fieldcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getFieldRolloverTextColor() override;
+        virtual void SAL_CALL setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getFieldTextColor() override;
+        virtual void SAL_CALL setFieldTextColor( ::sal_Int32 _fieldtextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getGroupTextColor() override;
+        virtual void SAL_CALL setGroupTextColor( ::sal_Int32 _grouptextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getHelpColor() override;
+        virtual void SAL_CALL setHelpColor( ::sal_Int32 _helpcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getHelpTextColor() override;
+        virtual void SAL_CALL setHelpTextColor( ::sal_Int32 _helptextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getHighlightColor() override;
+        virtual void SAL_CALL setHighlightColor( ::sal_Int32 _highlightcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getHighlightTextColor() override;
+        virtual void SAL_CALL setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getInactiveTabColor() override;
+        virtual void SAL_CALL setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getLabelTextColor() override;
+        virtual void SAL_CALL setLabelTextColor( ::sal_Int32 _labeltextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getLightColor() override;
+        virtual void SAL_CALL setLightColor( ::sal_Int32 _lightcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getMenuBarColor() override;
+        virtual void SAL_CALL setMenuBarColor( ::sal_Int32 _menubarcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getMenuBarTextColor() override;
+        virtual void SAL_CALL setMenuBarTextColor( ::sal_Int32 _menubartextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getMenuBorderColor() override;
+        virtual void SAL_CALL setMenuBorderColor( ::sal_Int32 _menubordercolor ) override;
+        virtual ::sal_Int32 SAL_CALL getMenuColor() override;
+        virtual void SAL_CALL setMenuColor( ::sal_Int32 _menucolor ) override;
+        virtual ::sal_Int32 SAL_CALL getMenuHighlightColor() override;
+        virtual void SAL_CALL setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getMenuHighlightTextColor() override;
+        virtual void SAL_CALL setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getMenuTextColor() override;
+        virtual void SAL_CALL setMenuTextColor( ::sal_Int32 _menutextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getMonoColor() override;
+        virtual void SAL_CALL setMonoColor( ::sal_Int32 _monocolor ) override;
+        virtual ::sal_Int32 SAL_CALL getRadioCheckTextColor() override;
+        virtual void SAL_CALL setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getSeparatorColor() override;
+        virtual ::sal_Int32 SAL_CALL getShadowColor() override;
+        virtual void SAL_CALL setShadowColor( ::sal_Int32 _shadowcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getWindowColor() override;
+        virtual void SAL_CALL setWindowColor( ::sal_Int32 _windowcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getWindowTextColor() override;
+        virtual void SAL_CALL setWindowTextColor( ::sal_Int32 _windowtextcolor ) override;
+        virtual ::sal_Int32 SAL_CALL getWorkspaceColor() override;
+        virtual void SAL_CALL setWorkspaceColor( ::sal_Int32 _workspacecolor ) override;
+        virtual sal_Bool SAL_CALL getHighContrastMode() override;
+        virtual void SAL_CALL setHighContrastMode( sal_Bool _highcontrastmode ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getApplicationFont() override;
+        virtual void SAL_CALL setApplicationFont( const css::awt::FontDescriptor& _applicationfont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getHelpFont() override;
+        virtual void SAL_CALL setHelpFont( const css::awt::FontDescriptor& _helpfont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getTitleFont() override;
+        virtual void SAL_CALL setTitleFont( const css::awt::FontDescriptor& _titlefont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getFloatTitleFont() override;
+        virtual void SAL_CALL setFloatTitleFont( const css::awt::FontDescriptor& _floattitlefont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getMenuFont() override;
+        virtual void SAL_CALL setMenuFont( const css::awt::FontDescriptor& _menufont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getToolFont() override;
+        virtual void SAL_CALL setToolFont( const css::awt::FontDescriptor& _toolfont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getGroupFont() override;
+        virtual void SAL_CALL setGroupFont( const css::awt::FontDescriptor& _groupfont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getLabelFont() override;
+        virtual void SAL_CALL setLabelFont( const css::awt::FontDescriptor& _labelfont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getRadioCheckFont() override;
+        virtual void SAL_CALL setRadioCheckFont( const css::awt::FontDescriptor& _radiocheckfont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getPushButtonFont() override;
+        virtual void SAL_CALL setPushButtonFont( const css::awt::FontDescriptor& _pushbuttonfont ) override;
+        virtual css::awt::FontDescriptor SAL_CALL getFieldFont() override;
+        virtual void SAL_CALL setFieldFont( const css::awt::FontDescriptor& _fieldfont ) override;
+        virtual void SAL_CALL addStyleChangeListener( const css::uno::Reference< css::awt::XStyleChangeListener >& Listener ) override;
+        virtual void SAL_CALL removeStyleChangeListener( const css::uno::Reference< css::awt::XStyleChangeListener >& Listener ) override;
 
     private:
         std::unique_ptr< WindowStyleSettings_Data > m_pData;
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 9b6480039d92..2a0596059f99 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -95,17 +95,17 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent()
 IMPLEMENT_FORWARD_XINTERFACE3( VCLXAccessibleComponent, OAccessibleExtendedComponentHelper, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE )
 IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, OAccessibleExtendedComponentHelper, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE )
 
-OUString VCLXAccessibleComponent::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString VCLXAccessibleComponent::getImplementationName()
 {
     return OUString("com.sun.star.comp.toolkit.AccessibleWindow");
 }
 
-sal_Bool VCLXAccessibleComponent::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException, std::exception)
+sal_Bool VCLXAccessibleComponent::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aNames { "com.sun.star.awt.AccessibleWindow" };
     return aNames;
@@ -495,7 +495,7 @@ TRANSIENT
 
 
 // accessibility::XAccessibleContext
-sal_Int32 VCLXAccessibleComponent::getAccessibleChildCount() throw (uno::RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleComponent::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -506,7 +506,7 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleChildCount() throw (uno::Runtime
     return nChildren;
 }
 
-uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleChild( sal_Int32 i )
 {
     OExternalLockGuard aGuard( this );
 
@@ -536,7 +536,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getVclPare
     return xAcc;
 }
 
-uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleParent(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -548,7 +548,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi
     return xAcc;
 }
 
-sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent(  ) throw (uno::RuntimeException, std::exception)
+sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -597,7 +597,7 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent(  ) throw (uno::Ru
     return nIndex;
 }
 
-sal_Int16 VCLXAccessibleComponent::getAccessibleRole(  ) throw (uno::RuntimeException, std::exception)
+sal_Int16 VCLXAccessibleComponent::getAccessibleRole(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -609,7 +609,7 @@ sal_Int16 VCLXAccessibleComponent::getAccessibleRole(  ) throw (uno::RuntimeExce
     return nRole;
 }
 
-OUString VCLXAccessibleComponent::getAccessibleDescription(  ) throw (uno::RuntimeException, std::exception)
+OUString VCLXAccessibleComponent::getAccessibleDescription(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -621,7 +621,7 @@ OUString VCLXAccessibleComponent::getAccessibleDescription(  ) throw (uno::Runti
     return aDescription;
 }
 
-OUString VCLXAccessibleComponent::getAccessibleName(  ) throw (uno::RuntimeException, std::exception)
+OUString VCLXAccessibleComponent::getAccessibleName(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -638,7 +638,7 @@ OUString VCLXAccessibleComponent::getAccessibleName(  ) throw (uno::RuntimeExcep
     return aName;
 }
 
-uno::Reference< accessibility::XAccessibleRelationSet > VCLXAccessibleComponent::getAccessibleRelationSet(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< accessibility::XAccessibleRelationSet > VCLXAccessibleComponent::getAccessibleRelationSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -648,7 +648,7 @@ uno::Reference< accessibility::XAccessibleRelationSet > VCLXAccessibleComponent:
     return xSet;
 }
 
-uno::Reference< accessibility::XAccessibleStateSet > VCLXAccessibleComponent::getAccessibleStateSet(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< accessibility::XAccessibleStateSet > VCLXAccessibleComponent::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -658,14 +658,14 @@ uno::Reference< accessibility::XAccessibleStateSet > VCLXAccessibleComponent::ge
     return xSet;
 }
 
-lang::Locale VCLXAccessibleComponent::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception)
+lang::Locale VCLXAccessibleComponent::getLocale()
 {
     OExternalLockGuard aGuard( this );
 
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException, std::exception)
+uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleAtPoint( const awt::Point& rPoint )
 {
     OExternalLockGuard aGuard( this );
 
@@ -693,7 +693,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi
 }
 
 // accessibility::XAccessibleComponent
-awt::Rectangle VCLXAccessibleComponent::implGetBounds() throw (uno::RuntimeException)
+awt::Rectangle VCLXAccessibleComponent::implGetBounds()
 {
     awt::Rectangle aBounds ( 0, 0, 0, 0 );
 
@@ -745,7 +745,7 @@ awt::Rectangle VCLXAccessibleComponent::implGetBounds() throw (uno::RuntimeExcep
     return aBounds;
 }
 
-awt::Point VCLXAccessibleComponent::getLocationOnScreen(  ) throw (uno::RuntimeException, std::exception)
+awt::Point VCLXAccessibleComponent::getLocationOnScreen(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -760,7 +760,7 @@ awt::Point VCLXAccessibleComponent::getLocationOnScreen(  ) throw (uno::RuntimeE
     return aPos;
 }
 
-void VCLXAccessibleComponent::grabFocus(  ) throw (uno::RuntimeException, std::exception)
+void VCLXAccessibleComponent::grabFocus(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -769,7 +769,7 @@ void VCLXAccessibleComponent::grabFocus(  ) throw (uno::RuntimeException, std::e
         m_xVCLXWindow->setFocus();
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(  ) throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -796,7 +796,7 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(  ) throw (uno::Runtim
     return nColor;
 }
 
-sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground(  ) throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -815,7 +815,7 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground(  ) throw (uno::Runtim
 
 // XAccessibleExtendedComponent
 
-uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -840,7 +840,7 @@ uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont(  ) throw
     return xFont;
 }
 
-OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText(  )
 {
     OExternalLockGuard aGuard( this );
 
@@ -851,7 +851,7 @@ OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText(  ) throw (uno::R
     return sRet;
 }
 
-OUString SAL_CALL VCLXAccessibleComponent::getToolTipText(  ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL VCLXAccessibleComponent::getToolTipText(  )
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx
index daa0cabe47c9..4e0143dadc72 100644
--- a/toolkit/source/awt/vclxbitmap.cxx
+++ b/toolkit/source/awt/vclxbitmap.cxx
@@ -30,7 +30,7 @@
 
 
 // css::uno::XInterface
-css::uno::Any VCLXBitmap::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXBitmap::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XBitmap* >(this)),
@@ -51,7 +51,7 @@ IMPL_XTYPEPROVIDER_END
 
 
 // css::awt::XBitmap
-css::awt::Size VCLXBitmap::getSize() throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXBitmap::getSize()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -59,7 +59,7 @@ css::awt::Size VCLXBitmap::getSize() throw(css::uno::RuntimeException, std::exce
     return aSize;
 }
 
-css::uno::Sequence< sal_Int8 > VCLXBitmap::getDIB() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > VCLXBitmap::getDIB()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -68,7 +68,7 @@ css::uno::Sequence< sal_Int8 > VCLXBitmap::getDIB() throw(css::uno::RuntimeExcep
     return css::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
 }
 
-css::uno::Sequence< sal_Int8 > VCLXBitmap::getMaskDIB() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > VCLXBitmap::getMaskDIB()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index 275ae9b06c2a..0f8a3bb657b0 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -48,7 +48,7 @@ VCLXContainer::~VCLXContainer()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXContainer::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXContainer::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XVclContainer* >(this)),
@@ -65,21 +65,21 @@ IMPL_XTYPEPROVIDER_END
 
 
 // css::awt::XVclContainer
-void VCLXContainer::addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXContainer::addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& rxListener )
 {
     SolarMutexGuard aGuard;
 
     GetContainerListeners().addInterface( rxListener );
 }
 
-void VCLXContainer::removeVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXContainer::removeVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& rxListener )
 {
     SolarMutexGuard aGuard;
 
     GetContainerListeners().removeInterface( rxListener );
 }
 
-css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > VCLXContainer::getWindows(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > VCLXContainer::getWindows(  )
 {
     SolarMutexGuard aGuard;
 
@@ -107,7 +107,7 @@ css::uno::Sequence< css::uno::Reference< css::awt::XWindow > > VCLXContainer::ge
 
 
 // css::awt::XVclContainerPeer
-void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception)
+void VCLXContainer::enableDialogControl( sal_Bool bEnable )
 {
     SolarMutexGuard aGuard;
 
@@ -123,7 +123,7 @@ void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(css::uno::Runt
     }
 }
 
-void VCLXContainer::setTabOrder( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Components, const css::uno::Sequence< css::uno::Any >& Tabs, sal_Bool bGroupControl ) throw(css::uno::RuntimeException, std::exception)
+void VCLXContainer::setTabOrder( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Components, const css::uno::Sequence< css::uno::Any >& Tabs, sal_Bool bGroupControl )
 {
     SolarMutexGuard aGuard;
 
@@ -168,7 +168,7 @@ void VCLXContainer::setTabOrder( const css::uno::Sequence< css::uno::Reference<
     }
 }
 
-void VCLXContainer::setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Components ) throw(css::uno::RuntimeException, std::exception)
+void VCLXContainer::setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XWindow > >& Components )
 {
     SolarMutexGuard aGuard;
 
@@ -228,7 +228,6 @@ void VCLXContainer::setGroup( const css::uno::Sequence< css::uno::Reference< css
 void SAL_CALL VCLXContainer::setProperty(
     const OUString& PropertyName,
     const css::uno::Any& Value )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 9e4ec71462be..d182d0a42f2e 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -63,7 +63,7 @@ void VCLXDevice::SetCreatedWithToolkit( bool bCreatedWithToolkit )
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXDevice::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXDevice::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XDevice* >(this)),
@@ -84,7 +84,7 @@ IMPL_XTYPEPROVIDER_END
 
 
 // css::awt::XDevice,
-css::uno::Reference< css::awt::XGraphics > VCLXDevice::createGraphics(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XGraphics > VCLXDevice::createGraphics(  )
 {
     SolarMutexGuard aGuard;
 
@@ -96,7 +96,7 @@ css::uno::Reference< css::awt::XGraphics > VCLXDevice::createGraphics(  ) throw(
     return xRef;
 }
 
-css::uno::Reference< css::awt::XDevice > VCLXDevice::createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XDevice > VCLXDevice::createDevice( sal_Int32 nWidth, sal_Int32 nHeight )
 {
     SolarMutexGuard aGuard;
 
@@ -112,7 +112,7 @@ css::uno::Reference< css::awt::XDevice > VCLXDevice::createDevice( sal_Int32 nWi
     return xRef;
 }
 
-css::awt::DeviceInfo VCLXDevice::getInfo() throw(css::uno::RuntimeException, std::exception)
+css::awt::DeviceInfo VCLXDevice::getInfo()
 {
     SolarMutexGuard aGuard;
 
@@ -163,7 +163,7 @@ css::awt::DeviceInfo VCLXDevice::getInfo() throw(css::uno::RuntimeException, std
     return aInfo;
 }
 
-css::uno::Sequence< css::awt::FontDescriptor > VCLXDevice::getFontDescriptors(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::awt::FontDescriptor > VCLXDevice::getFontDescriptors(  )
 {
     SolarMutexGuard aGuard;
 
@@ -182,7 +182,7 @@ css::uno::Sequence< css::awt::FontDescriptor > VCLXDevice::getFontDescriptors(
     return aFonts;
 }
 
-css::uno::Reference< css::awt::XFont > VCLXDevice::getFont( const css::awt::FontDescriptor& rDescriptor ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XFont > VCLXDevice::getFont( const css::awt::FontDescriptor& rDescriptor )
 {
     SolarMutexGuard aGuard;
 
@@ -196,7 +196,7 @@ css::uno::Reference< css::awt::XFont > VCLXDevice::getFont( const css::awt::Font
     return xRef;
 }
 
-css::uno::Reference< css::awt::XBitmap > VCLXDevice::createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XBitmap > VCLXDevice::createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight )
 {
     SolarMutexGuard aGuard;
 
@@ -212,7 +212,7 @@ css::uno::Reference< css::awt::XBitmap > VCLXDevice::createBitmap( sal_Int32 nX,
     return xBmp;
 }
 
-css::uno::Reference< css::awt::XDisplayBitmap > VCLXDevice::createDisplayBitmap( const css::uno::Reference< css::awt::XBitmap >& rxBitmap ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XDisplayBitmap > VCLXDevice::createDisplayBitmap( const css::uno::Reference< css::awt::XBitmap >& rxBitmap )
 {
     SolarMutexGuard aGuard;
 
@@ -232,7 +232,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
 
 // Interface implementation of css::awt::XUnitConversion
 
-css::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const css::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const css::awt::Point& aPoint, ::sal_Int16 TargetUnit )
 {
     (void)aPoint;
     SolarMutexGuard aGuard;
@@ -257,7 +257,7 @@ css::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const css::awt::Point&
 }
 
 
-css::awt::Point SAL_CALL VCLXDevice::convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::awt::Point SAL_CALL VCLXDevice::convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit )
 {
     (void)aPoint;
     SolarMutexGuard aGuard;
@@ -281,7 +281,7 @@ css::awt::Point SAL_CALL VCLXDevice::convertPointToPixel( const css::awt::Point&
     return aAWTPoint;
 }
 
-css::awt::Size SAL_CALL VCLXDevice::convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::awt::Size SAL_CALL VCLXDevice::convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit )
 {
     (void)aSize;
     SolarMutexGuard aGuard;
@@ -306,7 +306,7 @@ css::awt::Size SAL_CALL VCLXDevice::convertSizeToLogic( const css::awt::Size& aS
     return aAWTSize;
 }
 
-css::awt::Size SAL_CALL VCLXDevice::convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::awt::Size SAL_CALL VCLXDevice::convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit )
 {
     (void)aSize;
     SolarMutexGuard aGuard;
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 1df5b56ee233..a26739c1bb49 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -69,7 +69,7 @@ bool VCLXFont::ImplAssertValidFontMetric()
 
 
 // css::uno::XInterface
-css::uno::Any VCLXFont::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXFont::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XFont* >(this)),
@@ -88,7 +88,7 @@ IMPL_XTYPEPROVIDER_START( VCLXFont )
 IMPL_XTYPEPROVIDER_END
 
 
-css::awt::FontDescriptor VCLXFont::getFontDescriptor(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::FontDescriptor VCLXFont::getFontDescriptor(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -96,7 +96,7 @@ css::awt::FontDescriptor VCLXFont::getFontDescriptor(  ) throw(css::uno::Runtime
 
 }
 
-css::awt::SimpleFontMetric VCLXFont::getFontMetric(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::SimpleFontMetric VCLXFont::getFontMetric(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -106,7 +106,7 @@ css::awt::SimpleFontMetric VCLXFont::getFontMetric(  ) throw(css::uno::RuntimeEx
     return aFM;
 }
 
-sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXFont::getCharWidth( sal_Unicode c )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -125,7 +125,7 @@ sal_Int16 VCLXFont::getCharWidth( sal_Unicode c ) throw(css::uno::RuntimeExcepti
     return nRet;
 }
 
-css::uno::Sequence< sal_Int16 > VCLXFont::getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int16 > VCLXFont::getCharWidths( sal_Unicode nFirst, sal_Unicode nLast )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -150,7 +150,7 @@ css::uno::Sequence< sal_Int16 > VCLXFont::getCharWidths( sal_Unicode nFirst, sal
     return aSeq;
 }
 
-sal_Int32 VCLXFont::getStringWidth( const OUString& str ) throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXFont::getStringWidth( const OUString& str )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -166,7 +166,7 @@ sal_Int32 VCLXFont::getStringWidth( const OUString& str ) throw(css::uno::Runtim
     return nRet;
 }
 
-sal_Int32 VCLXFont::getStringWidthArray( const OUString& str, css::uno::Sequence< sal_Int32 >& rDXArray ) throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXFont::getStringWidthArray( const OUString& str, css::uno::Sequence< sal_Int32 >& rDXArray )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -188,14 +188,13 @@ sal_Int32 VCLXFont::getStringWidthArray( const OUString& str, css::uno::Sequence
     return nRet;
 }
 
-void VCLXFont::getKernPairs( css::uno::Sequence< sal_Unicode >& /*rnChars1*/, css::uno::Sequence< sal_Unicode >& /*rnChars2*/, css::uno::Sequence< sal_Int16 >& /*rnKerns*/ ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFont::getKernPairs( css::uno::Sequence< sal_Unicode >& /*rnChars1*/, css::uno::Sequence< sal_Unicode >& /*rnChars2*/, css::uno::Sequence< sal_Int16 >& /*rnKerns*/ )
 {
     // NOTE: this empty method is just used for keeping the related UNO-API stable
 }
 
 // css::awt::XFont2
 sal_Bool VCLXFont::hasGlyphs( const OUString& aText )
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     SolarMutexGuard aSolarGuard;
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index c956b2a688cd..22f026f838c5 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star;
 
 
 // uno::XInterface
-uno::Any VCLXGraphics::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any VCLXGraphics::queryInterface( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XGraphics* >(this)),
@@ -153,7 +153,7 @@ void VCLXGraphics::InitOutputDevice( InitOutDevFlags nFlags )
     }
 }
 
-uno::Reference< awt::XDevice > VCLXGraphics::getDevice() throw(uno::RuntimeException, std::exception)
+uno::Reference< awt::XDevice > VCLXGraphics::getDevice()
 {
     SolarMutexGuard aGuard;
 
@@ -166,7 +166,7 @@ uno::Reference< awt::XDevice > VCLXGraphics::getDevice() throw(uno::RuntimeExcep
     return mxDevice;
 }
 
-awt::SimpleFontMetric VCLXGraphics::getFontMetric() throw(uno::RuntimeException, std::exception)
+awt::SimpleFontMetric VCLXGraphics::getFontMetric()
 {
     SolarMutexGuard aGuard;
 
@@ -179,56 +179,56 @@ awt::SimpleFontMetric VCLXGraphics::getFontMetric() throw(uno::RuntimeException,
     return aM;
 }
 
-void VCLXGraphics::setFont( const uno::Reference< awt::XFont >& rxFont ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::setFont( const uno::Reference< awt::XFont >& rxFont )
 {
     SolarMutexGuard aGuard;
 
     maFont = VCLUnoHelper::CreateFont( rxFont );
 }
 
-void VCLXGraphics::selectFont( const awt::FontDescriptor& rDescription ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::selectFont( const awt::FontDescriptor& rDescription )
 {
     SolarMutexGuard aGuard;
 
     maFont = VCLUnoHelper::CreateFont( rDescription, vcl::Font() );
 }
 
-void VCLXGraphics::setTextColor( sal_Int32 nColor ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::setTextColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
     maTextColor = Color( (sal_uInt32)nColor );
 }
 
-void VCLXGraphics::setTextFillColor( sal_Int32 nColor ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::setTextFillColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
     maTextFillColor = Color( (sal_uInt32)nColor );
 }
 
-void VCLXGraphics::setLineColor( sal_Int32 nColor ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::setLineColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
     maLineColor = Color( (sal_uInt32)nColor );
 }
 
-void VCLXGraphics::setFillColor( sal_Int32 nColor ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::setFillColor( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
     maFillColor = Color( (sal_uInt32)nColor );
 }
 
-void VCLXGraphics::setRasterOp( awt::RasterOperation eROP ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::setRasterOp( awt::RasterOperation eROP )
 {
     SolarMutexGuard aGuard;
 
     meRasterOp = (RasterOp)eROP;
 }
 
-void VCLXGraphics::setClipRegion( const uno::Reference< awt::XRegion >& rxRegion ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::setClipRegion( const uno::Reference< awt::XRegion >& rxRegion )
 {
     SolarMutexGuard aGuard;
 
@@ -239,7 +239,7 @@ void VCLXGraphics::setClipRegion( const uno::Reference< awt::XRegion >& rxRegion
         mpClipRegion = nullptr;
 }
 
-void VCLXGraphics::intersectClipRegion( const uno::Reference< awt::XRegion >& rxRegion ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::intersectClipRegion( const uno::Reference< awt::XRegion >& rxRegion )
 {
     SolarMutexGuard aGuard;
 
@@ -253,7 +253,7 @@ void VCLXGraphics::intersectClipRegion( const uno::Reference< awt::XRegion >& rx
     }
 }
 
-void VCLXGraphics::push(  ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::push(  )
 {
     SolarMutexGuard aGuard;
 
@@ -262,7 +262,7 @@ void VCLXGraphics::push(  ) throw(uno::RuntimeException, std::exception)
         mpOutputDevice->Push();
 }
 
-void VCLXGraphics::pop(  ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::pop(  )
 {
     SolarMutexGuard aGuard;
 
@@ -273,7 +273,6 @@ void VCLXGraphics::pop(  ) throw(uno::RuntimeException, std::exception)
 
 void VCLXGraphics::clear(
     const awt::Rectangle& aRect )
-throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -284,7 +283,7 @@ throw(uno::RuntimeException, std::exception)
     }
 }
 
-void VCLXGraphics::copy( const uno::Reference< awt::XDevice >& rxSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::copy( const uno::Reference< awt::XDevice >& rxSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight )
 {
     SolarMutexGuard aGuard;
 
@@ -301,7 +300,7 @@ void VCLXGraphics::copy( const uno::Reference< awt::XDevice >& rxSource, sal_Int
     }
 }
 
-void VCLXGraphics::draw( const uno::Reference< awt::XDisplayBitmap >& rxBitmapHandle, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::draw( const uno::Reference< awt::XDisplayBitmap >& rxBitmapHandle, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight )
 {
     SolarMutexGuard aGuard;
 
@@ -333,7 +332,7 @@ void VCLXGraphics::draw( const uno::Reference< awt::XDisplayBitmap >& rxBitmapHa
     }
 }
 
-void VCLXGraphics::drawPixel( sal_Int32 x, sal_Int32 y ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawPixel( sal_Int32 x, sal_Int32 y )
 {
     SolarMutexGuard aGuard;
 
@@ -344,7 +343,7 @@ void VCLXGraphics::drawPixel( sal_Int32 x, sal_Int32 y ) throw(uno::RuntimeExcep
     }
 }
 
-void VCLXGraphics::drawLine( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawLine( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 )
 {
     SolarMutexGuard aGuard;
 
@@ -355,7 +354,7 @@ void VCLXGraphics::drawLine( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32
     }
 }
 
-void VCLXGraphics::drawRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height )
 {
     SolarMutexGuard aGuard;
 
@@ -366,7 +365,7 @@ void VCLXGraphics::drawRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int3
     }
 }
 
-void VCLXGraphics::drawRoundedRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 nHorzRound, sal_Int32 nVertRound ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawRoundedRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 nHorzRound, sal_Int32 nVertRound )
 {
     SolarMutexGuard aGuard;
 
@@ -377,7 +376,7 @@ void VCLXGraphics::drawRoundedRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, s
     }
 }
 
-void VCLXGraphics::drawPolyLine( const uno::Sequence< sal_Int32 >& DataX, const uno::Sequence< sal_Int32 >& DataY ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawPolyLine( const uno::Sequence< sal_Int32 >& DataX, const uno::Sequence< sal_Int32 >& DataY )
 {
     SolarMutexGuard aGuard;
 
@@ -388,7 +387,7 @@ void VCLXGraphics::drawPolyLine( const uno::Sequence< sal_Int32 >& DataX, const
     }
 }
 
-void VCLXGraphics::drawPolygon( const uno::Sequence< sal_Int32 >& DataX, const uno::Sequence< sal_Int32 >& DataY ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawPolygon( const uno::Sequence< sal_Int32 >& DataX, const uno::Sequence< sal_Int32 >& DataY )
 {
     SolarMutexGuard aGuard;
 
@@ -399,7 +398,7 @@ void VCLXGraphics::drawPolygon( const uno::Sequence< sal_Int32 >& DataX, const u
     }
 }
 
-void VCLXGraphics::drawPolyPolygon( const uno::Sequence< uno::Sequence< sal_Int32 > >& DataX, const uno::Sequence< uno::Sequence< sal_Int32 > >& DataY ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawPolyPolygon( const uno::Sequence< uno::Sequence< sal_Int32 > >& DataX, const uno::Sequence< uno::Sequence< sal_Int32 > >& DataY )
 {
     SolarMutexGuard aGuard;
 
@@ -415,7 +414,7 @@ void VCLXGraphics::drawPolyPolygon( const uno::Sequence< uno::Sequence< sal_Int3
     }
 }
 
-void VCLXGraphics::drawEllipse( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawEllipse( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height )
 {
     SolarMutexGuard aGuard;
 
@@ -426,7 +425,7 @@ void VCLXGraphics::drawEllipse( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_I
     }
 }
 
-void VCLXGraphics::drawArc( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawArc( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 )
 {
     SolarMutexGuard aGuard;
 
@@ -437,7 +436,7 @@ void VCLXGraphics::drawArc( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32
     }
 }
 
-void VCLXGraphics::drawPie( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawPie( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 )
 {
     SolarMutexGuard aGuard;
 
@@ -448,7 +447,7 @@ void VCLXGraphics::drawPie( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32
     }
 }
 
-void VCLXGraphics::drawChord( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawChord( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 )
 {
     SolarMutexGuard aGuard;
 
@@ -459,7 +458,7 @@ void VCLXGraphics::drawChord( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int
     }
 }
 
-void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, const awt::Gradient& rGradient ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, const awt::Gradient& rGradient )
 {
     SolarMutexGuard aGuard;
 
@@ -478,7 +477,7 @@ void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_
     }
 }
 
-void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const OUString& rText ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const OUString& rText )
 {
     SolarMutexGuard aGuard;
 
@@ -489,7 +488,7 @@ void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const OUString& rText ) t
     }
 }
 
-void VCLXGraphics::drawTextArray( sal_Int32 x, sal_Int32 y, const OUString& rText, const uno::Sequence< sal_Int32 >& rLongs ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawTextArray( sal_Int32 x, sal_Int32 y, const OUString& rText, const uno::Sequence< sal_Int32 >& rLongs )
 {
     SolarMutexGuard aGuard;
 
@@ -506,7 +505,7 @@ void VCLXGraphics::drawTextArray( sal_Int32 x, sal_Int32 y, const OUString& rTex
 }
 
 
-void VCLXGraphics::drawImage( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int16 nStyle, const uno::Reference< graphic::XGraphic >& xGraphic ) throw(uno::RuntimeException, std::exception)
+void VCLXGraphics::drawImage( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int16 nStyle, const uno::Reference< graphic::XGraphic >& xGraphic )
 {
     SolarMutexGuard aGuard;
 
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 624e61e0634a..bcf081c89ee1 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -160,7 +160,6 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void )
 
 
 OUString SAL_CALL VCLXMenu::getImplementationName(  )
-throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
     const bool bIsPopupMenu = IsPopupMenu();
@@ -176,7 +175,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 css::uno::Sequence< OUString > SAL_CALL VCLXMenu::getSupportedServiceNames(  )
-throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
     const bool bIsPopupMenu = IsPopupMenu();
@@ -193,14 +191,12 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL VCLXMenu::supportsService(const OUString& rServiceName )
-throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Any VCLXMenu::queryInterface(
     const css::uno::Type & rType )
-throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
     const bool bIsPopupMenu = IsPopupMenu();
@@ -230,7 +226,6 @@ throw(css::uno::RuntimeException, std::exception)
 IMPL_XUNOTUNNEL( VCLXMenu )
 
 css::uno::Sequence< css::uno::Type > VCLXMenu::getTypes()
-throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
     const bool bIsPopupMenu = IsPopupMenu();
@@ -278,14 +273,12 @@ throw(css::uno::RuntimeException, std::exception)
 
 
 css::uno::Sequence< sal_Int8 > VCLXMenu::getImplementationId()
-throw(css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 void VCLXMenu::addMenuListener(
     const css::uno::Reference< css::awt::XMenuListener >& rxListener )
-throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -294,7 +287,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 void VCLXMenu::removeMenuListener(
     const css::uno::Reference< css::awt::XMenuListener >& rxListener )
-throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -306,7 +298,6 @@ void VCLXMenu::insertItem(
     const OUString& aText,
     sal_Int16 nItemStyle,
     sal_Int16 nPos )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -318,7 +309,6 @@ throw(css::uno::RuntimeException, std::exception)
 void VCLXMenu::removeItem(
     sal_Int16 nPos,
     sal_Int16 nCount )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -337,7 +327,6 @@ throw(css::uno::RuntimeException, std::exception)
 }
 
 sal_Int16 VCLXMenu::getItemCount(  )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -347,7 +336,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 sal_Int16 VCLXMenu::getItemId(
     sal_Int16 nPos )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -357,7 +345,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 sal_Int16 VCLXMenu::getItemPos(
     sal_Int16 nId )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -368,7 +355,6 @@ throw(css::uno::RuntimeException, std::exception)
 void VCLXMenu::enableItem(
     sal_Int16 nItemId,
     sal_Bool bEnable )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -379,7 +365,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 sal_Bool VCLXMenu::isItemEnabled(
     sal_Int16 nItemId )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -390,7 +375,6 @@ throw(css::uno::RuntimeException, std::exception)
 void VCLXMenu::setItemText(
     sal_Int16 nItemId,
     const OUString& aText )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -401,7 +385,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 OUString VCLXMenu::getItemText(
     sal_Int16 nItemId )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -415,7 +398,6 @@ throw(css::uno::RuntimeException, std::exception)
 void VCLXMenu::setPopupMenu(
     sal_Int16 nItemId,
     const css::uno::Reference< css::awt::XPopupMenu >& rxPopupMenu )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -433,7 +415,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 css::uno::Reference< css::awt::XPopupMenu > VCLXMenu::getPopupMenu(
     sal_Int16 nItemId )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -465,7 +446,6 @@ throw(css::uno::RuntimeException, std::exception)
 // css::awt::XPopupMenu
 void VCLXMenu::insertSeparator(
     sal_Int16 nPos )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -476,7 +456,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 void VCLXMenu::setDefaultItem(
     sal_Int16 nItemId )
-throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -484,7 +463,6 @@ throw(css::uno::RuntimeException, std::exception)
 }
 
 sal_Int16 VCLXMenu::getDefaultItem(  )
-throw(css::uno::RuntimeException, std::exception)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -494,7 +472,6 @@ throw(css::uno::RuntimeException, std::exception)
 void VCLXMenu::checkItem(
     sal_Int16 nItemId,
     sal_Bool bCheck )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -505,7 +482,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 sal_Bool VCLXMenu::isItemChecked(
     sal_Int16 nItemId )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -517,7 +493,6 @@ sal_Int16 VCLXMenu::execute(
     const css::uno::Reference< css::awt::XWindowPeer >& rxWindowPeer,
     const css::awt::Rectangle& rPos,
     sal_Int16 nFlags )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -536,7 +511,6 @@ throw(css::uno::RuntimeException, std::exception)
 void SAL_CALL VCLXMenu::setCommand(
     sal_Int16 nItemId,
     const OUString& aCommand )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -547,7 +521,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 OUString SAL_CALL VCLXMenu::getCommand(
     sal_Int16 nItemId )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -561,7 +534,6 @@ throw (css::uno::RuntimeException, std::exception)
 void SAL_CALL VCLXMenu::setHelpCommand(
     sal_Int16 nItemId,
     const OUString& aHelp )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -572,7 +544,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 OUString SAL_CALL VCLXMenu::getHelpCommand(
     sal_Int16 nItemId )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -655,7 +626,6 @@ namespace
 
 
 sal_Bool SAL_CALL VCLXMenu::isPopupMenu(  )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -663,7 +633,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL VCLXMenu::clear(  )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -674,7 +643,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 css::awt::MenuItemType SAL_CALL VCLXMenu::getItemType(
     ::sal_Int16 nItemPos )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -691,7 +659,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 void SAL_CALL VCLXMenu::hideDisabledEntries(
     sal_Bool bHide )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -706,7 +673,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 
 sal_Bool SAL_CALL VCLXMenu::isInExecute(  )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -719,7 +685,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 
 void SAL_CALL VCLXMenu::endExecute()
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -731,7 +696,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 void SAL_CALL VCLXMenu::enableAutoMnemonics(
     sal_Bool bEnable )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -748,7 +712,6 @@ throw (css::uno::RuntimeException, std::exception)
 void SAL_CALL VCLXMenu::setAcceleratorKeyEvent(
     ::sal_Int16 nItemId,
     const css::awt::KeyEvent& aKeyEvent )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -763,7 +726,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 css::awt::KeyEvent SAL_CALL VCLXMenu::getAcceleratorKeyEvent(
     ::sal_Int16 nItemId )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -782,7 +744,6 @@ throw (css::uno::RuntimeException, std::exception)
 void SAL_CALL VCLXMenu::setHelpText(
     ::sal_Int16 nItemId,
     const OUString& sHelpText )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -796,7 +757,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 OUString SAL_CALL VCLXMenu::getHelpText(
     ::sal_Int16 nItemId )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -814,7 +774,6 @@ throw (css::uno::RuntimeException, std::exception)
 void SAL_CALL VCLXMenu::setTipHelpText(
     ::sal_Int16 nItemId,
     const OUString& sTipHelpText )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -828,7 +787,6 @@ throw (css::uno::RuntimeException, std::exception)
 
 OUString SAL_CALL VCLXMenu::getTipHelpText(
     ::sal_Int16 nItemId )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -846,7 +804,6 @@ void SAL_CALL VCLXMenu::setItemImage(
     ::sal_Int16 nItemId,
     const css::uno::Reference< css::graphic::XGraphic >& xGraphic,
     sal_Bool bScale )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -862,7 +819,6 @@ throw (css::uno::RuntimeException, std::exception)
 css::uno::Reference< css::graphic::XGraphic > SAL_CALL
 VCLXMenu::getItemImage(
     ::sal_Int16 nItemId )
-throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx
index 9e9590f359ff..a2427984761b 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.cxx
@@ -33,14 +33,14 @@ VCLXPointer::~VCLXPointer()
 // css::lang::XUnoTunnel
 IMPL_XUNOTUNNEL( VCLXPointer )
 
-void VCLXPointer::setType( sal_Int32 nType ) throw(css::uno::RuntimeException, std::exception)
+void VCLXPointer::setType( sal_Int32 nType )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maPointer = Pointer( (PointerStyle)nType );
 }
 
-sal_Int32 VCLXPointer::getType() throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXPointer::getType()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -48,19 +48,16 @@ sal_Int32 VCLXPointer::getType() throw(css::uno::RuntimeException, std::exceptio
 }
 
 OUString VCLXPointer::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.VCLXPointer");
 }
 
 sal_Bool VCLXPointer::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> VCLXPointer::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.awt.Pointer", "stardiv.vcl.Pointer"};
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 9adc64e1196e..d0c65392b94b 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -96,7 +96,7 @@ css::uno::Reference< css::awt::XDevice > const &  VCLXPrinterPropertySet::GetDev
     return mxPrnDevice;
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > VCLXPrinterPropertySet::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > VCLXPrinterPropertySet::getPropertySetInfo(  )
 {
     static css::uno::Reference< css::beans::XPropertySetInfo >  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -118,7 +118,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > VCLXPrinterPropertySet::getP
     return *pPropertyArrayHelper ;
 }
 
-sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException)
+sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -155,7 +155,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( css::uno::Any & rConv
     return bDifferent;
 }
 
-void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception)
+void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -198,7 +198,7 @@ void VCLXPrinterPropertySet::getFastPropertyValue( css::uno::Any& rValue, sal_In
 }
 
 // css::awt::XPrinterPropertySet
-void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -207,7 +207,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(css::be
     setFastPropertyValue( PROPERTY_Horizontal, aValue );
 }
 
-css::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions(  )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -227,7 +227,7 @@ css::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions(  ) t
     return aDescriptions;
 }
 
-void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -237,7 +237,7 @@ void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription ) thro
     GetPrinter()->SetPaperBin( nPaperBin );
 }
 
-css::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup(  )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -247,7 +247,7 @@ css::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup(  ) throw(
     return css::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
 }
 
-void VCLXPrinterPropertySet::setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+void VCLXPrinterPropertySet::setBinarySetup( const css::uno::Sequence< sal_Int8 >& data )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -276,7 +276,7 @@ VCLXPrinter::~VCLXPrinter()
 {
 }
 
-sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(css::awt::PrinterException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -290,7 +290,7 @@ sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/
     return bDone;
 }
 
-void VCLXPrinter::end(  ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception)
+void VCLXPrinter::end(  )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -301,14 +301,14 @@ void VCLXPrinter::end(  ) throw(css::awt::PrinterException, css::uno::RuntimeExc
     }
 }
 
-void VCLXPrinter::terminate(  ) throw(css::uno::RuntimeException, std::exception)
+void VCLXPrinter::terminate(  )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
     mxListener.reset();
 }
 
-css::uno::Reference< css::awt::XDevice > VCLXPrinter::startPage(  ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XDevice > VCLXPrinter::startPage(  )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -319,7 +319,7 @@ css::uno::Reference< css::awt::XDevice > VCLXPrinter::startPage(  ) throw(css::a
     return GetDevice();
 }
 
-void VCLXPrinter::endPage(  ) throw(css::awt::PrinterException, css::uno::RuntimeException, std::exception)
+void VCLXPrinter::endPage(  )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -344,7 +344,7 @@ VCLXInfoPrinter::~VCLXInfoPrinter()
 }
 
 // css::awt::XInfoPrinter
-css::uno::Reference< css::awt::XDevice > VCLXInfoPrinter::createDevice(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XDevice > VCLXInfoPrinter::createDevice(  )
 {
     ::osl::MutexGuard aGuard( Mutex );
 
@@ -356,7 +356,7 @@ css::uno::Reference< css::awt::XDevice > VCLXInfoPrinter::createDevice(  ) throw
 //    ----------------------------------------------------
 
 // css::awt::XPrinterServer
-css::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames(  )
 {
     const std::vector<OUString>& rQueues = Printer::GetPrinterQueues();
     sal_uInt32 nPrinters = rQueues.size();
@@ -368,14 +368,14 @@ css::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames(  ) throw(css:
     return aNames;
 }
 
-css::uno::Reference< css::awt::XPrinter > VCLXPrinterServer::createPrinter( const OUString& rPrinterName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XPrinter > VCLXPrinterServer::createPrinter( const OUString& rPrinterName )
 {
     css::uno::Reference< css::awt::XPrinter > xP;
     xP = new VCLXPrinter( rPrinterName );
     return xP;
 }
 
-css::uno::Reference< css::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrinter( const OUString& rPrinterName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrinter( const OUString& rPrinterName )
 {
     css::uno::Reference< css::awt::XInfoPrinter > xP;
     xP = new VCLXInfoPrinter( rPrinterName );
@@ -383,19 +383,16 @@ css::uno::Reference< css::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrint
 }
 
 OUString VCLXPrinterServer::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.VCLXPrinterServer");
 }
 
 sal_Bool VCLXPrinterServer::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> VCLXPrinterServer::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.awt.PrinterServer", "stardiv.vcl.PrinterServer"};
diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx
index 1d09acb2c378..e7b6d9da4d92 100644
--- a/toolkit/source/awt/vclxregion.cxx
+++ b/toolkit/source/awt/vclxregion.cxx
@@ -38,7 +38,7 @@ VCLXRegion::~VCLXRegion()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXRegion::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXRegion::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XRegion* >(this)),
@@ -56,56 +56,56 @@ IMPL_XTYPEPROVIDER_START( VCLXRegion )
 IMPL_XTYPEPROVIDER_END
 
 
-css::awt::Rectangle VCLXRegion::getBounds() throw(css::uno::RuntimeException, std::exception)
+css::awt::Rectangle VCLXRegion::getBounds()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     return AWTRectangle( maRegion.GetBoundRect() );
 }
 
-void VCLXRegion::clear() throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::clear()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maRegion.SetEmpty();
 }
 
-void VCLXRegion::move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::move( sal_Int32 nHorzMove, sal_Int32 nVertMove )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maRegion.Move( nHorzMove, nVertMove );
 }
 
-void VCLXRegion::unionRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::unionRectangle( const css::awt::Rectangle& rRect )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maRegion.Union( VCLRectangle( rRect ) );
 }
 
-void VCLXRegion::intersectRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::intersectRectangle( const css::awt::Rectangle& rRect )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maRegion.Intersect( VCLRectangle( rRect ) );
 }
 
-void VCLXRegion::excludeRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::excludeRectangle( const css::awt::Rectangle& rRect )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maRegion.Exclude( VCLRectangle( rRect ) );
 }
 
-void VCLXRegion::xOrRectangle( const css::awt::Rectangle& rRect ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::xOrRectangle( const css::awt::Rectangle& rRect )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maRegion.XOr( VCLRectangle( rRect ) );
 }
 
-void VCLXRegion::unionRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::unionRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -113,7 +113,7 @@ void VCLXRegion::unionRegion( const css::uno::Reference< css::awt::XRegion >& rx
         maRegion.Union( VCLUnoHelper::GetRegion( rxRegion ) );
 }
 
-void VCLXRegion::intersectRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::intersectRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -121,7 +121,7 @@ void VCLXRegion::intersectRegion( const css::uno::Reference< css::awt::XRegion >
         maRegion.Intersect( VCLUnoHelper::GetRegion( rxRegion ) );
 }
 
-void VCLXRegion::excludeRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::excludeRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -129,7 +129,7 @@ void VCLXRegion::excludeRegion( const css::uno::Reference< css::awt::XRegion >&
         maRegion.Exclude( VCLUnoHelper::GetRegion( rxRegion ) );
 }
 
-void VCLXRegion::xOrRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRegion::xOrRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -137,7 +137,7 @@ void VCLXRegion::xOrRegion( const css::uno::Reference< css::awt::XRegion >& rxRe
         maRegion.XOr( VCLUnoHelper::GetRegion( rxRegion ) );
 }
 
-css::uno::Sequence< css::awt::Rectangle > VCLXRegion::getRectangles() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::awt::Rectangle > VCLXRegion::getRectangles()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index 30e44899f8f6..6c82ebb39ef0 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -65,7 +65,7 @@ namespace toolkit
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXSpinButton, VCLXWindow, VCLXSpinButton_Base )
 
 
-    void SAL_CALL VCLXSpinButton::dispose( ) throw(RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::dispose( )
     {
         {
             SolarMutexGuard aGuard;
@@ -79,14 +79,14 @@ namespace toolkit
     }
 
 
-    void SAL_CALL VCLXSpinButton::addAdjustmentListener( const Reference< XAdjustmentListener >& listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::addAdjustmentListener( const Reference< XAdjustmentListener >& listener )
     {
         if ( listener.is() )
             maAdjustmentListeners.addInterface( listener );
     }
 
 
-    void SAL_CALL VCLXSpinButton::removeAdjustmentListener( const Reference< XAdjustmentListener >& listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::removeAdjustmentListener( const Reference< XAdjustmentListener >& listener )
     {
         if ( listener.is() )
             maAdjustmentListeners.removeInterface( listener );
@@ -121,13 +121,13 @@ namespace toolkit
     }
 
 
-    void SAL_CALL VCLXSpinButton::setValue( sal_Int32 n ) throw (RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::setValue( sal_Int32 n )
     {
         lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetValue, n );
     }
 
 
-    void SAL_CALL VCLXSpinButton::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue )
     {
         SolarMutexGuard aGuard;
 
@@ -137,49 +137,49 @@ namespace toolkit
     }
 
 
-    sal_Int32 SAL_CALL VCLXSpinButton::getValue(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL VCLXSpinButton::getValue(  )
     {
         return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetValue );
     }
 
 
-    void SAL_CALL VCLXSpinButton::setMinimum( sal_Int32 minValue ) throw (RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::setMinimum( sal_Int32 minValue )
     {
         lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetRangeMin, minValue );
     }
 
 
-    void SAL_CALL VCLXSpinButton::setMaximum( sal_Int32 maxValue ) throw (RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::setMaximum( sal_Int32 maxValue )
     {
         lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetRangeMax, maxValue );
     }
 
 
-    sal_Int32 SAL_CALL VCLXSpinButton::getMinimum(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL VCLXSpinButton::getMinimum(  )
     {
         return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetRangeMin );
     }
 
 
-    sal_Int32 SAL_CALL VCLXSpinButton::getMaximum(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL VCLXSpinButton::getMaximum(  )
     {
         return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetRangeMax );
     }
 
 
-    void SAL_CALL VCLXSpinButton::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::setSpinIncrement( sal_Int32 spinIncrement )
     {
         lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetValueStep, spinIncrement );
     }
 
 
-    sal_Int32 SAL_CALL VCLXSpinButton::getSpinIncrement(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL VCLXSpinButton::getSpinIncrement(  )
     {
         return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetValueStep );
     }
 
 
-    void SAL_CALL VCLXSpinButton::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::setOrientation( sal_Int32 orientation )
     {
         SolarMutexGuard aGuard;
 
@@ -187,7 +187,7 @@ namespace toolkit
     }
 
 
-    sal_Int32 SAL_CALL VCLXSpinButton::getOrientation(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL VCLXSpinButton::getOrientation(  )
     {
         return  ( 0 != ( GetWindow()->GetStyle() & WB_HSCROLL ) )
             ?   ScrollBarOrientation::HORIZONTAL
@@ -227,7 +227,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL VCLXSpinButton::setProperty( const OUString& PropertyName, const Any& Value ) throw(RuntimeException, std::exception)
+    void SAL_CALL VCLXSpinButton::setProperty( const OUString& PropertyName, const Any& Value )
     {
         SolarMutexGuard aGuard;
 
@@ -277,7 +277,7 @@ namespace toolkit
     }
 
 
-    Any SAL_CALL VCLXSpinButton::getProperty( const OUString& PropertyName ) throw(RuntimeException, std::exception)
+    Any SAL_CALL VCLXSpinButton::getProperty( const OUString& PropertyName )
     {
         SolarMutexGuard aGuard;
 
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 6baa157cab9e..f661f265ce7c 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -50,7 +50,7 @@ VCLXSystemDependentWindow::~VCLXSystemDependentWindow()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXSystemDependentWindow::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXSystemDependentWindow::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XSystemDependentWindowPeer* >(this)) );
@@ -63,7 +63,7 @@ IMPL_XTYPEPROVIDER_START( VCLXSystemDependentWindow )
     VCLXWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-css::uno::Any VCLXSystemDependentWindow::getWindowHandle( const css::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXSystemDependentWindow::getWindowHandle( const css::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType )
 {
     SolarMutexGuard aGuard;
 
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 8e28a28175d9..a882eec4321a 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -54,7 +54,7 @@ VCLXTabPageContainer::~VCLXTabPageContainer()
     SAL_INFO("toolkit", __FUNCTION__);
 }
 
-void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY ) throw(RuntimeException, std::exception)
+void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY )
 {
     SolarMutexGuard aGuard;
     VclPtr<TabControl> pTabControl = GetAs<TabControl>();
@@ -77,13 +77,13 @@ void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY ) throw(Run
     VCLXWindow::draw( nX, nY );
 }
 
-css::awt::DeviceInfo VCLXTabPageContainer::getInfo() throw(RuntimeException, std::exception)
+css::awt::DeviceInfo VCLXTabPageContainer::getInfo()
 {
     css::awt::DeviceInfo aInfo = VCLXDevice::getInfo();
     return aInfo;
 }
 
-void SAL_CALL VCLXTabPageContainer::setProperty(const OUString& PropertyName,   const Any& Value ) throw(RuntimeException, std::exception)
+void SAL_CALL VCLXTabPageContainer::setProperty(const OUString& PropertyName,   const Any& Value )
 {
     SolarMutexGuard aGuard;
     VclPtr<TabControl> pTabPage = GetAs<TabControl>();
@@ -91,36 +91,36 @@ void SAL_CALL VCLXTabPageContainer::setProperty(const OUString& PropertyName,
         VCLXWindow::setProperty( PropertyName, Value );
 }
 
-::sal_Int16 SAL_CALL VCLXTabPageContainer::getActiveTabPageID() throw (RuntimeException, std::exception)
+::sal_Int16 SAL_CALL VCLXTabPageContainer::getActiveTabPageID()
 {
     VclPtr<TabControl> pTabCtrl = GetAs<TabControl>();
     return pTabCtrl ? pTabCtrl->GetCurPageId( ) : 0;
 }
 
-void SAL_CALL VCLXTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpageid )
 {
     VclPtr<TabControl> pTabCtrl = GetAs<TabControl>();
     if ( pTabCtrl )
         pTabCtrl->SelectTabPage(_activetabpageid);
 }
 
-::sal_Int16 SAL_CALL VCLXTabPageContainer::getTabPageCount(  ) throw (RuntimeException, std::exception)
+::sal_Int16 SAL_CALL VCLXTabPageContainer::getTabPageCount(  )
 {
     VclPtr<TabControl> pTabCtrl = GetAs<TabControl>();
     return pTabCtrl ? pTabCtrl->GetPageCount() : 0;
 }
 
-sal_Bool SAL_CALL VCLXTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex )
 {
     return (getActiveTabPageID() == tabPageIndex);
 }
 
-Reference< css::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception)
+Reference< css::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex )
 {
     return (tabPageIndex >= 0 && tabPageIndex < static_cast<sal_Int16>(m_aTabPages.size())) ? m_aTabPages[tabPageIndex] : nullptr;
 }
 
-Reference< css::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException, std::exception)
+Reference< css::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID )
 {
     SolarMutexGuard aGuard;
     Reference< css::awt::tab::XTabPage > xTabPage;
@@ -139,12 +139,12 @@ Reference< css::awt::tab::XTabPage > SAL_CALL VCLXTabPageContainer::getTabPageBy
     return xTabPage;
 }
 
-void SAL_CALL VCLXTabPageContainer::addTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXTabPageContainer::addTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener )
 {
     m_aTabPageListeners.addInterface( listener );
 }
 
-void SAL_CALL VCLXTabPageContainer::removeTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXTabPageContainer::removeTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener )
 {
     m_aTabPageListeners.removeInterface( listener );
 }
@@ -171,10 +171,10 @@ void VCLXTabPageContainer::ProcessWindowEvent( const VclWindowEvent& _rVclWindow
         }
     }
 }
-void SAL_CALL VCLXTabPageContainer::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXTabPageContainer::disposing( const css::lang::EventObject& /*Source*/ )
 {
 }
-void SAL_CALL VCLXTabPageContainer::elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXTabPageContainer::elementInserted( const css::container::ContainerEvent& Event )
 {
     SolarMutexGuard aGuard;
     VclPtr<TabControl> pTabCtrl = GetAs<TabControl>();
@@ -198,7 +198,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const css::container::Conta
         m_aTabPages.push_back(xTabPage);
     }
 }
-void SAL_CALL VCLXTabPageContainer::elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXTabPageContainer::elementRemoved( const css::container::ContainerEvent& Event )
 {
     SolarMutexGuard aGuard;
     VclPtr<TabControl> pTabCtrl = GetAs<TabControl>();
@@ -211,7 +211,7 @@ void SAL_CALL VCLXTabPageContainer::elementRemoved( const css::container::Contai
         m_aTabPages.erase(::std::remove(m_aTabPages.begin(),m_aTabPages.end(),xTabPage));
     }
 }
-void SAL_CALL VCLXTabPageContainer::elementReplaced( const css::container::ContainerEvent& /*Event*/ ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXTabPageContainer::elementReplaced( const css::container::ContainerEvent& /*Event*/ )
 {
 }
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 02eddc8a2850..b80d2607525a 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -217,116 +217,94 @@ public:
     VCLXToolkit();
 
     // css::awt::XToolkitExperimental
-    virtual void SAL_CALL processEventsToIdle()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL processEventsToIdle() override;
 
-    virtual sal_Int64 SAL_CALL getOpenGLBufferSwapCounter()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getOpenGLBufferSwapCounter() override;
 
-    virtual void SAL_CALL setDeterministicScheduling(sal_Bool bDeterministicMode)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDeterministicScheduling(sal_Bool bDeterministicMode) override;
 
-    virtual void SAL_CALL pause(sal_Int32 nMilliseconds)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL pause(sal_Int32 nMilliseconds) override;
 
     // css::awt::XToolkit
-    css::uno::Reference< css::awt::XWindowPeer >  SAL_CALL getDesktopWindow(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::awt::Rectangle                                        SAL_CALL getWorkArea(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XWindowPeer >  SAL_CALL createWindow( const css::awt::WindowDescriptor& Descriptor ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::uno::Reference< css::awt::XWindowPeer > > SAL_CALL createWindows( const css::uno::Sequence< css::awt::WindowDescriptor >& Descriptors ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XDevice >      SAL_CALL createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) throw
-(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::awt::XRegion >      SAL_CALL createRegion(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::awt::XWindowPeer >  SAL_CALL getDesktopWindow(  ) override;
+    css::awt::Rectangle                                        SAL_CALL getWorkArea(  ) override;
+    css::uno::Reference< css::awt::XWindowPeer >  SAL_CALL createWindow( const css::awt::WindowDescriptor& Descriptor ) override;
+    css::uno::Sequence< css::uno::Reference< css::awt::XWindowPeer > > SAL_CALL createWindows( const css::uno::Sequence< css::awt::WindowDescriptor >& Descriptors ) override;
+    css::uno::Reference< css::awt::XDevice >      SAL_CALL createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) override;
+    css::uno::Reference< css::awt::XRegion >      SAL_CALL createRegion(  ) override;
 
     // css::awt::XSystemChildFactory
-    css::uno::Reference< css::awt::XWindowPeer > SAL_CALL createSystemChild( const css::uno::Any& Parent, const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::awt::XWindowPeer > SAL_CALL createSystemChild( const css::uno::Any& Parent, const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) override;
 
     // css::awt::XMessageBoxFactory
-    virtual css::uno::Reference< css::awt::XMessageBox > SAL_CALL createMessageBox( const css::uno::Reference< css::awt::XWindowPeer >& aParent, css::awt::MessageBoxType eType, ::sal_Int32 aButtons, const OUString& aTitle, const OUString& aMessage ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XMessageBox > SAL_CALL createMessageBox( const css::uno::Reference< css::awt::XWindowPeer >& aParent, css::awt::MessageBoxType eType, ::sal_Int32 aButtons, const OUString& aTitle, const OUString& aMessage ) override;
 
     // css::awt::XDataTransfer
-    css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL getDragGestureRecognizer( const css::uno::Reference< css::awt::XWindow >& window ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::datatransfer::dnd::XDragSource > SAL_CALL getDragSource( const css::uno::Reference< css::awt::XWindow >& window ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::datatransfer::dnd::XDropTarget > SAL_CALL getDropTarget( const css::uno::Reference< css::awt::XWindow >& window ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& clipboardName ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL getDragGestureRecognizer( const css::uno::Reference< css::awt::XWindow >& window ) override;
+    css::uno::Reference< css::datatransfer::dnd::XDragSource > SAL_CALL getDragSource( const css::uno::Reference< css::awt::XWindow >& window ) override;
+    css::uno::Reference< css::datatransfer::dnd::XDropTarget > SAL_CALL getDropTarget( const css::uno::Reference< css::awt::XWindow >& window ) override;
+    css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL getClipboard( const OUString& clipboardName ) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // css::awt::XExtendedToolkit:
 
-    virtual ::sal_Int32 SAL_CALL getTopWindowCount()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getTopWindowCount() override;
 
     virtual css::uno::Reference< css::awt::XTopWindow >
-    SAL_CALL getTopWindow(::sal_Int32 nIndex)
-        throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getTopWindow(::sal_Int32 nIndex) override;
 
     virtual css::uno::Reference< css::awt::XTopWindow >
-    SAL_CALL getActiveTopWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getActiveTopWindow() override;
 
     virtual void SAL_CALL addTopWindowListener(
         css::uno::Reference<
-        css::awt::XTopWindowListener > const & rListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::awt::XTopWindowListener > const & rListener) override;
 
     virtual void SAL_CALL removeTopWindowListener(
         css::uno::Reference<
-        css::awt::XTopWindowListener > const & rListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::awt::XTopWindowListener > const & rListener) override;
 
     virtual void SAL_CALL addKeyHandler(
         css::uno::Reference<
-        css::awt::XKeyHandler > const & rHandler)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::awt::XKeyHandler > const & rHandler) override;
 
     virtual void SAL_CALL removeKeyHandler(
         css::uno::Reference<
-        css::awt::XKeyHandler > const & rHandler)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::awt::XKeyHandler > const & rHandler) override;
 
     virtual void SAL_CALL addFocusListener(
         css::uno::Reference<
-        css::awt::XFocusListener > const & rListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::awt::XFocusListener > const & rListener) override;
 
     virtual void SAL_CALL removeFocusListener(
         css::uno::Reference<
-        css::awt::XFocusListener > const & rListener)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::awt::XFocusListener > const & rListener) override;
 
     virtual void SAL_CALL fireFocusGained(
         css::uno::Reference<
-        css::uno::XInterface > const & source)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::XInterface > const & source) override;
 
     virtual void SAL_CALL fireFocusLost(
         css::uno::Reference<
-        css::uno::XInterface > const & source)
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::XInterface > const & source) override;
 
     // css::awt::XReschedule:
-    virtual void SAL_CALL reschedule()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL reschedule() override;
 
     // css:awt:XToolkitRobot
-    virtual void SAL_CALL keyPress( const css::awt::KeyEvent & aKeyEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL keyPress( const css::awt::KeyEvent & aKeyEvent ) override;
 
-    virtual void SAL_CALL keyRelease( const css::awt::KeyEvent & aKeyEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL keyRelease( const css::awt::KeyEvent & aKeyEvent ) override;
 
-    virtual void SAL_CALL mousePress( const css::awt::MouseEvent & aMouseEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mousePress( const css::awt::MouseEvent & aMouseEvent ) override;
 
-    virtual void SAL_CALL mouseRelease( const css::awt::MouseEvent & aMouseEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseRelease( const css::awt::MouseEvent & aMouseEvent ) override;
 
-    virtual void SAL_CALL mouseMove( const css::awt::MouseEvent & aMouseEvent )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL mouseMove( const css::awt::MouseEvent & aMouseEvent ) override;
 
 };
 
@@ -765,14 +743,14 @@ void SAL_CALL VCLXToolkit::disposing()
 }
 
 
-css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::getDesktopWindow(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::getDesktopWindow(  )
 {
     css::uno::Reference< css::awt::XWindowPeer > xRef;
     // 07/00: AppWindow doesn't exist anymore...
     return xRef;
 }
 
-css::awt::Rectangle VCLXToolkit::getWorkArea(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Rectangle VCLXToolkit::getWorkArea(  )
 {
     sal_Int32 nDisplay = Application::GetDisplayBuiltInScreen();
     Rectangle aWorkRect = Application::GetScreenPosSizePixel( nDisplay );
@@ -784,12 +762,12 @@ css::awt::Rectangle VCLXToolkit::getWorkArea(  ) throw(css::uno::RuntimeExceptio
     return aNotherRect;
 }
 
-css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::createWindow( const css::awt::WindowDescriptor& rDescriptor ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::createWindow( const css::awt::WindowDescriptor& rDescriptor )
 {
     return ImplCreateWindow( rDescriptor, WinBits(0) );
 }
 
-css::uno::Reference< css::awt::XDevice > VCLXToolkit::createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XDevice > VCLXToolkit::createScreenCompatibleDevice( sal_Int32 Width, sal_Int32 Height )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -806,7 +784,7 @@ css::uno::Reference< css::awt::XDevice > VCLXToolkit::createScreenCompatibleDevi
     return xRef;
 }
 
-css::uno::Reference< css::awt::XRegion > VCLXToolkit::createRegion(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XRegion > VCLXToolkit::createRegion(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -1339,7 +1317,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
     return xRef;
 }
 
-css::uno::Sequence< css::uno::Reference< css::awt::XWindowPeer > > VCLXToolkit::createWindows( const css::uno::Sequence< css::awt::WindowDescriptor >& rDescriptors ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Reference< css::awt::XWindowPeer > > VCLXToolkit::createWindows( const css::uno::Sequence< css::awt::WindowDescriptor >& rDescriptors )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -1359,7 +1337,7 @@ css::uno::Sequence< css::uno::Reference< css::awt::XWindowPeer > > VCLXToolkit::
 }
 
 // css::awt::XSystemChildFactory
-css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::createSystemChild( const css::uno::Any& Parent, const css::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 nSystemType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::createSystemChild( const css::uno::Any& Parent, const css::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 nSystemType )
 {
     VclPtr<vcl::Window> pChildWindow;
     if ( nSystemType == SYSTEM_DEPENDENT_TYPE )
@@ -1442,7 +1420,7 @@ css::uno::Reference< css::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessage
     css::awt::MessageBoxType eType,
     ::sal_Int32 aButtons,
     const OUString& aTitle,
-    const OUString& aMessage ) throw (css::uno::RuntimeException, std::exception)
+    const OUString& aMessage )
 {
     css::awt::WindowDescriptor aDescriptor;
 
@@ -1505,7 +1483,7 @@ css::uno::Reference< css::awt::XMessageBox > SAL_CALL VCLXToolkit::createMessage
     return xMsgBox;
 }
 
-css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL VCLXToolkit::getDragGestureRecognizer( const css::uno::Reference< css::awt::XWindow >& window ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL VCLXToolkit::getDragGestureRecognizer( const css::uno::Reference< css::awt::XWindow >& window )
 {
     SolarMutexGuard g;
 
@@ -1517,7 +1495,7 @@ css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL V
     return css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer >();
 }
 
-css::uno::Reference< css::datatransfer::dnd::XDragSource > SAL_CALL VCLXToolkit::getDragSource( const css::uno::Reference< css::awt::XWindow >& window ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::datatransfer::dnd::XDragSource > SAL_CALL VCLXToolkit::getDragSource( const css::uno::Reference< css::awt::XWindow >& window )
 {
     SolarMutexGuard g;
 
@@ -1529,7 +1507,7 @@ css::uno::Reference< css::datatransfer::dnd::XDragSource > SAL_CALL VCLXToolkit:
     return css::uno::Reference< css::datatransfer::dnd::XDragSource >();
 }
 
-css::uno::Reference< css::datatransfer::dnd::XDropTarget > SAL_CALL VCLXToolkit::getDropTarget( const css::uno::Reference< css::awt::XWindow >& window ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::datatransfer::dnd::XDropTarget > SAL_CALL VCLXToolkit::getDropTarget( const css::uno::Reference< css::awt::XWindow >& window )
 {
     SolarMutexGuard g;
 
@@ -1541,7 +1519,7 @@ css::uno::Reference< css::datatransfer::dnd::XDropTarget > SAL_CALL VCLXToolkit:
     return css::uno::Reference< css::datatransfer::dnd::XDropTarget >();
 }
 
-css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToolkit::getClipboard( const OUString& clipboardName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToolkit::getClipboard( const OUString& clipboardName )
 {
     if( clipboardName.isEmpty() )
     {
@@ -1564,17 +1542,17 @@ css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToo
 }
 
 // XServiceInfo
-OUString VCLXToolkit::getImplementationName() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXToolkit::getImplementationName()
 {
     return OUString("stardiv.Toolkit.VCLXToolkit");
 }
 
-sal_Bool VCLXToolkit::supportsService( const OUString& rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXToolkit::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-css::uno::Sequence< OUString > VCLXToolkit::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > VCLXToolkit::getSupportedServiceNames()
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.awt.Toolkit", "stardiv.vcl.VclToolkit"};
@@ -1584,7 +1562,6 @@ css::uno::Sequence< OUString > VCLXToolkit::getSupportedServiceNames() throw(css
 
 // virtual
 ::sal_Int32 SAL_CALL VCLXToolkit::getTopWindowCount()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return static_cast< ::sal_Int32 >(::Application::GetTopWindowCount());
         // XXX  numeric overflow
@@ -1593,7 +1570,6 @@ css::uno::Sequence< OUString > VCLXToolkit::getSupportedServiceNames() throw(css
 // virtual
 css::uno::Reference< css::awt::XTopWindow > SAL_CALL
 VCLXToolkit::getTopWindow(::sal_Int32 nIndex)
-    throw (css::uno::RuntimeException, std::exception)
 {
     vcl::Window * p = ::Application::GetTopWindow(static_cast< long >(nIndex));
         // XXX  numeric overflow
@@ -1604,7 +1580,7 @@ VCLXToolkit::getTopWindow(::sal_Int32 nIndex)
 
 // virtual
 css::uno::Reference< css::awt::XTopWindow > SAL_CALL
-VCLXToolkit::getActiveTopWindow() throw (css::uno::RuntimeException, std::exception)
+VCLXToolkit::getActiveTopWindow()
 {
     vcl::Window * p = ::Application::GetActiveTopWindow();
     return css::uno::Reference< css::awt::XTopWindow >(
@@ -1615,7 +1591,6 @@ VCLXToolkit::getActiveTopWindow() throw (css::uno::RuntimeException, std::except
 // virtual
 void SAL_CALL VCLXToolkit::addTopWindowListener(
     css::uno::Reference< css::awt::XTopWindowListener > const & rListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     OSL_ENSURE(rListener.is(), "Null rListener");
     ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex);
@@ -1637,7 +1612,6 @@ void SAL_CALL VCLXToolkit::addTopWindowListener(
 // virtual
 void SAL_CALL VCLXToolkit::removeTopWindowListener(
     css::uno::Reference< css::awt::XTopWindowListener > const & rListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(rBHelper.rMutex);
     if (!(rBHelper.bDisposed || rBHelper.bInDispose)
@@ -1652,7 +1626,6 @@ void SAL_CALL VCLXToolkit::removeTopWindowListener(
 // virtual
 void SAL_CALL VCLXToolkit::addKeyHandler(
     css::uno::Reference< css::awt::XKeyHandler > const & rHandler)
-    throw (css::uno::RuntimeException, std::exception)
 {
     OSL_ENSURE(rHandler.is(), "Null rHandler");
     ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex);
@@ -1673,7 +1646,6 @@ void SAL_CALL VCLXToolkit::addKeyHandler(
 // virtual
 void SAL_CALL VCLXToolkit::removeKeyHandler(
     css::uno::Reference< css::awt::XKeyHandler > const & rHandler)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(rBHelper.rMutex);
     if (!(rBHelper.bDisposed || rBHelper.bInDispose)
@@ -1687,7 +1659,6 @@ void SAL_CALL VCLXToolkit::removeKeyHandler(
 // virtual
 void SAL_CALL VCLXToolkit::addFocusListener(
     css::uno::Reference< css::awt::XFocusListener > const & rListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     OSL_ENSURE(rListener.is(), "Null rListener");
     ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex);
@@ -1709,7 +1680,6 @@ void SAL_CALL VCLXToolkit::addFocusListener(
 // virtual
 void SAL_CALL VCLXToolkit::removeFocusListener(
     css::uno::Reference< css::awt::XFocusListener > const & rListener)
-    throw (css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard(rBHelper.rMutex);
     if (!(rBHelper.bDisposed || rBHelper.bInDispose)
@@ -1725,7 +1695,6 @@ void SAL_CALL VCLXToolkit::removeFocusListener(
 void SAL_CALL VCLXToolkit::fireFocusGained(
     css::uno::Reference<
     css::uno::XInterface > const &)
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -1733,7 +1702,6 @@ void SAL_CALL VCLXToolkit::fireFocusGained(
 void SAL_CALL VCLXToolkit::fireFocusLost(
     css::uno::Reference<
     css::uno::XInterface > const &)
-    throw (css::uno::RuntimeException, std::exception)
 {
 }
 
@@ -1919,7 +1887,6 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent,
 // css::awt::XReschedule:
 
 void SAL_CALL VCLXToolkit::reschedule()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     Application::Reschedule(true);
@@ -1928,14 +1895,12 @@ void SAL_CALL VCLXToolkit::reschedule()
 // css::awt::XToolkitExperimental
 
 void SAL_CALL VCLXToolkit::processEventsToIdle()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     Scheduler::ProcessEventsToIdle();
 }
 
 sal_Int64 SAL_CALL VCLXToolkit::getOpenGLBufferSwapCounter()
-    throw (css::uno::RuntimeException, std::exception)
 {
 #if HAVE_FEATURE_OPENGL
     return OpenGLWrapper::getBufferSwapCounter();
@@ -1945,14 +1910,12 @@ sal_Int64 SAL_CALL VCLXToolkit::getOpenGLBufferSwapCounter()
 }
 
 void SAL_CALL VCLXToolkit::setDeterministicScheduling(sal_Bool bDeterministicMode)
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aSolarGuard;
     Scheduler::SetDeterministicMode(bDeterministicMode);
 }
 
 void SAL_CALL VCLXToolkit::pause(sal_Int32 nMilliseconds)
-    throw (css::uno::RuntimeException, std::exception)
 {
     new Pause(nMilliseconds);
 }
@@ -1960,7 +1923,6 @@ void SAL_CALL VCLXToolkit::pause(sal_Int32 nMilliseconds)
 // css:awt:XToolkitRobot
 
 void SAL_CALL VCLXToolkit::keyPress( const css::awt::KeyEvent & aKeyEvent )
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference<css::awt::XWindow> xWindow ( aKeyEvent.Source, css::uno::UNO_QUERY );
     if( !xWindow.is() )
@@ -1975,7 +1937,6 @@ void SAL_CALL VCLXToolkit::keyPress( const css::awt::KeyEvent & aKeyEvent )
 }
 
 void SAL_CALL VCLXToolkit::keyRelease( const css::awt::KeyEvent & aKeyEvent )
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference<css::awt::XWindow> xWindow ( aKeyEvent.Source, css::uno::UNO_QUERY );
     if( !xWindow.is() )
@@ -1991,7 +1952,6 @@ void SAL_CALL VCLXToolkit::keyRelease( const css::awt::KeyEvent & aKeyEvent )
 
 
 void SAL_CALL VCLXToolkit::mousePress( const css::awt::MouseEvent & aMouseEvent )
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference<css::awt::XWindow> xWindow ( aMouseEvent.Source, css::uno::UNO_QUERY );
     if( !xWindow.is() )
@@ -2006,7 +1966,6 @@ void SAL_CALL VCLXToolkit::mousePress( const css::awt::MouseEvent & aMouseEvent
 }
 
 void SAL_CALL VCLXToolkit::mouseRelease( const css::awt::MouseEvent & aMouseEvent )
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference<css::awt::XWindow> xWindow ( aMouseEvent.Source, css::uno::UNO_QUERY );
     if( !xWindow.is() )
@@ -2021,7 +1980,6 @@ void SAL_CALL VCLXToolkit::mouseRelease( const css::awt::MouseEvent & aMouseEven
 }
 
 void SAL_CALL VCLXToolkit::mouseMove( const css::awt::MouseEvent & aMouseEvent )
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference<css::awt::XWindow> xWindow ( aMouseEvent.Source, css::uno::UNO_QUERY );
     if( !xWindow.is() )
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index e21d7bb2e416..3078b2753257 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -55,7 +55,7 @@ VCLXTopWindow_Base::~VCLXTopWindow_Base()
 {
 }
 
-Any VCLXTopWindow_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any VCLXTopWindow_Base::queryInterface( const Type & rType )
 {
     css::uno::Any aRet( VCLXTopWindow_XBase::queryInterface( rType ) );
 
@@ -66,7 +66,7 @@ Any VCLXTopWindow_Base::queryInterface( const Type & rType ) throw(RuntimeExcept
     return aRet;
 }
 
-Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException, std::exception)
+Sequence< Type > VCLXTopWindow_Base::getTypes()
 {
     Sequence< Type > aTypes( VCLXTopWindow_XBase::getTypes() );
     if ( m_bWHWND )
@@ -74,7 +74,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException, std::exc
     return aTypes;
 }
 
-css::uno::Any VCLXTopWindow_Base::getWindowHandle( const css::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXTopWindow_Base::getWindowHandle( const css::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType )
 {
     SolarMutexGuard aGuard;
 
@@ -116,21 +116,21 @@ css::uno::Any VCLXTopWindow_Base::getWindowHandle( const css::uno::Sequence< sal
     return aRet;
 }
 
-void VCLXTopWindow_Base::addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTopWindow_Base::addTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener )
 {
     SolarMutexGuard aGuard;
 
     GetTopWindowListenersImpl().addInterface( rxListener );
 }
 
-void VCLXTopWindow_Base::removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTopWindow_Base::removeTopWindowListener( const css::uno::Reference< css::awt::XTopWindowListener >& rxListener )
 {
     SolarMutexGuard aGuard;
 
     GetTopWindowListenersImpl().removeInterface( rxListener );
 }
 
-void VCLXTopWindow_Base::toFront(  ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTopWindow_Base::toFront(  )
 {
     SolarMutexGuard aGuard;
 
@@ -139,11 +139,11 @@ void VCLXTopWindow_Base::toFront(  ) throw(css::uno::RuntimeException, std::exce
         static_cast<WorkWindow*>(pWindow)->ToTop( ToTopFlags::RestoreWhenMin );
 }
 
-void VCLXTopWindow_Base::toBack(  ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTopWindow_Base::toBack(  )
 {
 }
 
-void VCLXTopWindow_Base::setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& rxMenu ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTopWindow_Base::setMenuBar( const css::uno::Reference< css::awt::XMenuBar >& rxMenu )
 {
     SolarMutexGuard aGuard;
 
@@ -163,7 +163,7 @@ void VCLXTopWindow_Base::setMenuBar( const css::uno::Reference< css::awt::XMenuB
 }
 
 
-sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized()
 {
     SolarMutexGuard aGuard;
 
@@ -175,7 +175,7 @@ sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized() throw (RuntimeException,
 }
 
 
-void SAL_CALL VCLXTopWindow_Base::setIsMaximized( sal_Bool _ismaximized ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXTopWindow_Base::setIsMaximized( sal_Bool _ismaximized )
 {
     SolarMutexGuard aGuard;
 
@@ -187,7 +187,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( sal_Bool _ismaximized ) throw
 }
 
 
-sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized()
 {
     SolarMutexGuard aGuard;
 
@@ -199,7 +199,7 @@ sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized() throw (RuntimeException,
 }
 
 
-void SAL_CALL VCLXTopWindow_Base::setIsMinimized( sal_Bool _isMinimized ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXTopWindow_Base::setIsMinimized( sal_Bool _isMinimized )
 {
     SolarMutexGuard aGuard;
 
@@ -211,7 +211,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( sal_Bool _isMinimized ) throw
 }
 
 
-::sal_Int32 SAL_CALL VCLXTopWindow_Base::getDisplay() throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL VCLXTopWindow_Base::getDisplay()
 {
     SolarMutexGuard aGuard;
 
@@ -223,7 +223,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( sal_Bool _isMinimized ) throw
 }
 
 
-void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (RuntimeException, IndexOutOfBoundsException, std::exception)
+void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display )
 {
     SolarMutexGuard aGuard;
 
@@ -266,7 +266,7 @@ vcl::Window* VCLXTopWindow::GetWindowImpl()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXTopWindow::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXTopWindow::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet( VCLXTopWindow_Base::queryInterface( rType ) );
 
@@ -276,12 +276,12 @@ css::uno::Any VCLXTopWindow::queryInterface( const css::uno::Type & rType ) thro
     return aRet;
 }
 
-css::uno::Sequence< sal_Int8 > VCLXTopWindow::getImplementationId() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > VCLXTopWindow::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-css::uno::Sequence< css::uno::Type > VCLXTopWindow::getTypes() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > VCLXTopWindow::getTypes()
 {
     return ::comphelper::concatSequences( VCLXTopWindow_Base::getTypes(), VCLXContainer::getTypes() );
 }
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 8b4da17e05a3..12fd7822a413 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -882,7 +882,7 @@ Size VCLXWindow::ImplCalcWindowSize( const Size& rOutSz ) const
 
 
 // css::lang::XUnoTunnel
-sal_Int64 VCLXWindow::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 VCLXWindow::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier )
 {
     if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( VCLXWindow::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) )
     {
@@ -906,7 +906,7 @@ VCLXWindow* VCLXWindow::GetImplementation( const css::uno::Reference< css::uno::
 
 
 // css::lang::Component
-void VCLXWindow::dispose(  ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::dispose(  )
 {
     SolarMutexGuard aGuard;
 
@@ -945,14 +945,14 @@ void VCLXWindow::dispose(  ) throw(css::uno::RuntimeException, std::exception)
     }
 }
 
-void VCLXWindow::addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener )
 {
     SolarMutexGuard aGuard;
 
     mpImpl->getEventListeners().addInterface( rxListener );
 }
 
-void VCLXWindow::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener )
 {
     SolarMutexGuard aGuard;
 
@@ -961,7 +961,7 @@ void VCLXWindow::removeEventListener( const css::uno::Reference< css::lang::XEve
 
 
 // css::awt::XWindow
-void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
 {
     SolarMutexGuard aGuard;
 
@@ -974,7 +974,7 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3
     }
 }
 
-css::awt::Rectangle VCLXWindow::getPosSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Rectangle VCLXWindow::getPosSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -990,7 +990,7 @@ css::awt::Rectangle VCLXWindow::getPosSize(  ) throw(css::uno::RuntimeException,
     return aBounds;
 }
 
-void VCLXWindow::setVisible( sal_Bool bVisible ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setVisible( sal_Bool bVisible )
 {
     SolarMutexGuard aGuard;
 
@@ -1002,7 +1002,7 @@ void VCLXWindow::setVisible( sal_Bool bVisible ) throw(css::uno::RuntimeExceptio
     }
 }
 
-void VCLXWindow::setEnable( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setEnable( sal_Bool bEnable )
 {
     SolarMutexGuard aGuard;
 
@@ -1014,7 +1014,7 @@ void VCLXWindow::setEnable( sal_Bool bEnable ) throw(css::uno::RuntimeException,
     }
 }
 
-void VCLXWindow::setFocus(  ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setFocus(  )
 {
     SolarMutexGuard aGuard;
 
@@ -1022,7 +1022,7 @@ void VCLXWindow::setFocus(  ) throw(css::uno::RuntimeException, std::exception)
         GetWindow()->GrabFocus();
 }
 
-void VCLXWindow::addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rxListener )
 {
     SolarMutexGuard aGuard;
 
@@ -1037,7 +1037,7 @@ void VCLXWindow::addWindowListener( const css::uno::Reference< css::awt::XWindow
         GetWindow()->EnableAllResize();
 }
 
-void VCLXWindow::removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rxListener )
 {
     SolarMutexGuard aGuard;
 
@@ -1048,75 +1048,75 @@ void VCLXWindow::removeWindowListener( const css::uno::Reference< css::awt::XWin
     mpImpl->getWindowListeners().removeInterface( rxListener );
 }
 
-void VCLXWindow::addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getFocusListeners().addInterface( rxListener );
 }
 
-void VCLXWindow::removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getFocusListeners().removeInterface( rxListener );
 }
 
-void VCLXWindow::addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getKeyListeners().addInterface( rxListener );
 }
 
-void VCLXWindow::removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getKeyListeners().removeInterface( rxListener );
 }
 
-void VCLXWindow::addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getMouseListeners().addInterface( rxListener );
 }
 
-void VCLXWindow::removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getMouseListeners().removeInterface( rxListener );
 }
 
-void VCLXWindow::addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getMouseMotionListeners().addInterface( rxListener );
 }
 
-void VCLXWindow::removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getMouseMotionListeners().removeInterface( rxListener );
 }
 
-void VCLXWindow::addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getPaintListeners().addInterface( rxListener );
 }
 
-void VCLXWindow::removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& rxListener )
 {
     SolarMutexGuard aGuard;
     mpImpl->getPaintListeners().removeInterface( rxListener );
 }
 
 // css::awt::XWindowPeer
-css::uno::Reference< css::awt::XToolkit > VCLXWindow::getToolkit(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XToolkit > VCLXWindow::getToolkit(  )
 {
     // no guard. nothing to guard here.
     // 82463 - 12/21/00 - fs
     return Application::GetVCLToolkit();
 }
 
-void VCLXWindow::setPointer( const css::uno::Reference< css::awt::XPointer >& rxPointer ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setPointer( const css::uno::Reference< css::awt::XPointer >& rxPointer )
 {
     SolarMutexGuard aGuard;
 
@@ -1129,7 +1129,7 @@ void VCLXWindow::setPointer( const css::uno::Reference< css::awt::XPointer >& rx
     }
 }
 
-void VCLXWindow::setBackground( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setBackground( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
@@ -1149,7 +1149,7 @@ void VCLXWindow::setBackground( sal_Int32 nColor ) throw(css::uno::RuntimeExcept
     }
 }
 
-void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags )
 {
     SolarMutexGuard aGuard;
 
@@ -1157,7 +1157,7 @@ void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags ) throw(css::uno::Runtim
         GetWindow()->Invalidate( static_cast<InvalidateFlags>(nInvalidateFlags) );
 }
 
-void VCLXWindow::invalidateRect( const css::awt::Rectangle& rRect, sal_Int16 nInvalidateFlags ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::invalidateRect( const css::awt::Rectangle& rRect, sal_Int16 nInvalidateFlags )
 {
     SolarMutexGuard aGuard;
 
@@ -1167,7 +1167,7 @@ void VCLXWindow::invalidateRect( const css::awt::Rectangle& rRect, sal_Int16 nIn
 
 
 // css::awt::XVclWindowPeer
-sal_Bool VCLXWindow::isChild( const css::uno::Reference< css::awt::XWindowPeer >& rxPeer ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXWindow::isChild( const css::uno::Reference< css::awt::XWindowPeer >& rxPeer )
 {
     SolarMutexGuard aGuard;
 
@@ -1182,20 +1182,20 @@ sal_Bool VCLXWindow::isChild( const css::uno::Reference< css::awt::XWindowPeer >
     return bIsChild;
 }
 
-void VCLXWindow::setDesignMode( sal_Bool bOn ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setDesignMode( sal_Bool bOn )
 {
     SolarMutexGuard aGuard;
 
     mpImpl->mbDesignMode = bOn;
 }
 
-sal_Bool VCLXWindow::isDesignMode(  ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXWindow::isDesignMode(  )
 {
     SolarMutexGuard aGuard;
     return mpImpl->mbDesignMode;
 }
 
-void VCLXWindow::enableClipSiblings( sal_Bool bClip ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::enableClipSiblings( sal_Bool bClip )
 {
     SolarMutexGuard aGuard;
 
@@ -1203,7 +1203,7 @@ void VCLXWindow::enableClipSiblings( sal_Bool bClip ) throw(css::uno::RuntimeExc
         GetWindow()->EnableClipSiblings( bClip );
 }
 
-void VCLXWindow::setForeground( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setForeground( sal_Int32 nColor )
 {
     SolarMutexGuard aGuard;
 
@@ -1214,7 +1214,7 @@ void VCLXWindow::setForeground( sal_Int32 nColor ) throw(css::uno::RuntimeExcept
     }
 }
 
-void VCLXWindow::setControlFont( const css::awt::FontDescriptor& rFont ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setControlFont( const css::awt::FontDescriptor& rFont )
 {
     SolarMutexGuard aGuard;
 
@@ -1222,7 +1222,7 @@ void VCLXWindow::setControlFont( const css::awt::FontDescriptor& rFont ) throw(c
         GetWindow()->SetControlFont( VCLUnoHelper::CreateFont( rFont, GetWindow()->GetControlFont() ) );
 }
 
-void VCLXWindow::getStyles( sal_Int16 nType, css::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::getStyles( sal_Int16 nType, css::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor )
 {
     SolarMutexGuard aGuard;
 
@@ -1377,8 +1377,6 @@ namespace
 }
 
 void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any& Value )
-    throw(css::uno::RuntimeException,
-          std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -1908,7 +1906,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any&
     }
 }
 
-css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -2138,7 +2136,7 @@ css::uno::Any VCLXWindow::getProperty( const OUString& PropertyName ) throw(css:
 
 
 // css::awt::XLayoutConstrains
-css::awt::Size VCLXWindow::getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXWindow::getMinimumSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -2176,12 +2174,12 @@ css::awt::Size VCLXWindow::getMinimumSize(  ) throw(css::uno::RuntimeException,
     return css::awt::Size( aSz.Width(), aSz.Height() );
 }
 
-css::awt::Size VCLXWindow::getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXWindow::getPreferredSize(  )
 {
     return getMinimumSize();
 }
 
-css::awt::Size VCLXWindow::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXWindow::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -2198,7 +2196,7 @@ css::awt::Size VCLXWindow::calcAdjustedSize( const css::awt::Size& rNewSize ) th
 
 
 // css::awt::XView
-sal_Bool VCLXWindow::setGraphics( const css::uno::Reference< css::awt::XGraphics >& rxDevice ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXWindow::setGraphics( const css::uno::Reference< css::awt::XGraphics >& rxDevice )
 {
     SolarMutexGuard aGuard;
 
@@ -2210,14 +2208,14 @@ sal_Bool VCLXWindow::setGraphics( const css::uno::Reference< css::awt::XGraphics
     return mpImpl->mxViewGraphics.is();
 }
 
-css::uno::Reference< css::awt::XGraphics > VCLXWindow::getGraphics(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XGraphics > VCLXWindow::getGraphics(  )
 {
     SolarMutexGuard aGuard;
 
     return mpImpl->mxViewGraphics;
 }
 
-css::awt::Size VCLXWindow::getSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXWindow::getSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -2227,7 +2225,7 @@ css::awt::Size VCLXWindow::getSize(  ) throw(css::uno::RuntimeException, std::ex
     return css::awt::Size( aSz.Width(), aSz.Height() );
 }
 
-void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY )
 {
     SolarMutexGuard aGuard;
 
@@ -2321,7 +2319,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeExcep
     }
 }
 
-void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ ) throw(css::uno::RuntimeException, std::exception)
+void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ )
 {
     SolarMutexGuard aGuard;
 
@@ -2338,7 +2336,7 @@ void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ ) throw(css::uno::Runti
 }
 
 // css::lang::XEventListener
-void SAL_CALL VCLXWindow::disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXWindow::disposing( const css::lang::EventObject& _rSource )
 {
     SolarMutexGuard aGuard;
 
@@ -2353,7 +2351,7 @@ void SAL_CALL VCLXWindow::disposing( const css::lang::EventObject& _rSource ) th
 }
 
 // css::accessibility::XAccessible
-css::uno::Reference< css::accessibility::XAccessibleContext > VCLXWindow::getAccessibleContext(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::accessibility::XAccessibleContext > VCLXWindow::getAccessibleContext(  )
 {
     using namespace ::com::sun::star;
 
@@ -2379,7 +2377,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXWindow::getAcc
 }
 
 // css::awt::XDockable
-void SAL_CALL VCLXWindow::addDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXWindow::addDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener )
 {
     SolarMutexGuard aGuard;
 
@@ -2388,14 +2386,14 @@ void SAL_CALL VCLXWindow::addDockableWindowListener( const css::uno::Reference<
 
 }
 
-void SAL_CALL VCLXWindow::removeDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXWindow::removeDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener )
 {
     SolarMutexGuard aGuard;
 
     mpImpl->getDockableWindowListeners().removeInterface( xListener );
 }
 
-void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable )
 {
     SolarMutexGuard aGuard;
 
@@ -2404,7 +2402,7 @@ void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (css::uno::Run
         pWindow->EnableDocking( bEnable );
 }
 
-sal_Bool SAL_CALL VCLXWindow::isFloating(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXWindow::isFloating(  )
 {
     SolarMutexGuard aGuard;
 
@@ -2415,7 +2413,7 @@ sal_Bool SAL_CALL VCLXWindow::isFloating(  ) throw (css::uno::RuntimeException,
         return false;
 }
 
-void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating )
 {
     SolarMutexGuard aGuard;
 
@@ -2424,7 +2422,7 @@ void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (css::uno:
         vcl::Window::GetDockingManager()->SetFloatingMode( pWindow, bFloating );
 }
 
-sal_Bool SAL_CALL VCLXWindow::isLocked(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXWindow::isLocked(  )
 {
     SolarMutexGuard aGuard;
 
@@ -2435,7 +2433,7 @@ sal_Bool SAL_CALL VCLXWindow::isLocked(  ) throw (css::uno::RuntimeException, st
         return false;
 }
 
-void SAL_CALL VCLXWindow::lock(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXWindow::lock(  )
 {
     SolarMutexGuard aGuard;
 
@@ -2444,7 +2442,7 @@ void SAL_CALL VCLXWindow::lock(  ) throw (css::uno::RuntimeException, std::excep
         vcl::Window::GetDockingManager()->Lock( pWindow );
 }
 
-void SAL_CALL VCLXWindow::unlock(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXWindow::unlock(  )
 {
     SolarMutexGuard aGuard;
 
@@ -2453,12 +2451,12 @@ void SAL_CALL VCLXWindow::unlock(  ) throw (css::uno::RuntimeException, std::exc
         vcl::Window::GetDockingManager()->Unlock( pWindow );
 }
 
-void SAL_CALL VCLXWindow::startPopupMode( const css::awt::Rectangle& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXWindow::startPopupMode( const css::awt::Rectangle& )
 {
     // TODO: remove interface in the next incompatible build
 }
 
-sal_Bool SAL_CALL VCLXWindow::isInPopupMode(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXWindow::isInPopupMode(  )
 {
     // TODO: remove interface in the next incompatible build
     return false;
@@ -2467,7 +2465,7 @@ sal_Bool SAL_CALL VCLXWindow::isInPopupMode(  ) throw (css::uno::RuntimeExceptio
 
 // css::awt::XWindow2
 
-void SAL_CALL VCLXWindow::setOutputSize( const css::awt::Size& aSize ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXWindow::setOutputSize( const css::awt::Size& aSize )
 {
     SolarMutexGuard aGuard;
     VclPtr<vcl::Window> pWindow;
@@ -2481,7 +2479,7 @@ void SAL_CALL VCLXWindow::setOutputSize( const css::awt::Size& aSize ) throw (cs
     }
 }
 
-css::awt::Size SAL_CALL VCLXWindow::getOutputSize(  ) throw (css::uno::RuntimeException, std::exception)
+css::awt::Size SAL_CALL VCLXWindow::getOutputSize(  )
 {
     SolarMutexGuard aGuard;
     VclPtr<vcl::Window> pWindow;
@@ -2497,7 +2495,7 @@ css::awt::Size SAL_CALL VCLXWindow::getOutputSize(  ) throw (css::uno::RuntimeEx
         return css::awt::Size();
 }
 
-sal_Bool SAL_CALL VCLXWindow::isVisible(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXWindow::isVisible(  )
 {
     SolarMutexGuard aGuard;
     if( GetWindow() )
@@ -2506,7 +2504,7 @@ sal_Bool SAL_CALL VCLXWindow::isVisible(  ) throw (css::uno::RuntimeException, s
         return false;
 }
 
-sal_Bool SAL_CALL VCLXWindow::isActive(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXWindow::isActive(  )
 {
     SolarMutexGuard aGuard;
     if( GetWindow() )
@@ -2516,7 +2514,7 @@ sal_Bool SAL_CALL VCLXWindow::isActive(  ) throw (css::uno::RuntimeException, st
 
 }
 
-sal_Bool SAL_CALL VCLXWindow::isEnabled(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXWindow::isEnabled(  )
 {
     SolarMutexGuard aGuard;
     if( GetWindow() )
@@ -2525,7 +2523,7 @@ sal_Bool SAL_CALL VCLXWindow::isEnabled(  ) throw (css::uno::RuntimeException, s
         return false;
 }
 
-sal_Bool SAL_CALL VCLXWindow::hasFocus(  ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VCLXWindow::hasFocus(  )
 {
     SolarMutexGuard aGuard;
     if( GetWindow() )
@@ -2550,23 +2548,23 @@ VCLXWindow::GetPropHelper()
 }
 
 css::uno::Sequence< css::beans::Property > SAL_CALL
-VCLXWindow::getProperties() throw (css::uno::RuntimeException, std::exception)
+VCLXWindow::getProperties()
 {
     return GetPropHelper()->getProperties();
 }
 css::beans::Property SAL_CALL
-VCLXWindow::getPropertyByName( const OUString& rName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+VCLXWindow::getPropertyByName( const OUString& rName )
 {
     return GetPropHelper()->getPropertyByName( rName );
 }
 
 sal_Bool SAL_CALL
-VCLXWindow::hasPropertyByName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception)
+VCLXWindow::hasPropertyByName( const OUString& rName )
 {
     return GetPropHelper()->hasPropertyByName( rName );
 }
 
-Reference< XStyleSettings > SAL_CALL VCLXWindow::getStyleSettings() throw (RuntimeException, std::exception)
+Reference< XStyleSettings > SAL_CALL VCLXWindow::getStyleSettings()
 {
     return mpImpl->getStyleSettings();
 }
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index ff79b033bd37..278d67dfb544 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -216,7 +216,7 @@ void VCLXGraphicControl::ImplSetNewImage()
     pButton->SetModeImage( GetImage() );
 }
 
-void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, short Flags ) throw(css::uno::RuntimeException, std::exception)
+void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, short Flags )
 {
     SolarMutexGuard aGuard;
 
@@ -229,7 +229,7 @@ void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width,
     }
 }
 
-void VCLXGraphicControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXGraphicControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -282,7 +282,7 @@ void VCLXGraphicControl::setProperty( const OUString& PropertyName, const css::u
     }
 }
 
-css::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXGraphicControl::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -384,7 +384,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXButton::Create
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
-void VCLXButton::dispose() throw(css::uno::RuntimeException, std::exception)
+void VCLXButton::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -395,31 +395,31 @@ void VCLXButton::dispose() throw(css::uno::RuntimeException, std::exception)
     VCLXGraphicControl::dispose();
 }
 
-void VCLXButton::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l  )throw(css::uno::RuntimeException, std::exception)
+void VCLXButton::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l  )
 {
     SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
-void VCLXButton::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXButton::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l )
 {
     SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
-void VCLXButton::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l  )throw(css::uno::RuntimeException, std::exception)
+void VCLXButton::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l  )
 {
     SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
-void VCLXButton::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXButton::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l )
 {
     SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
-void VCLXButton::setLabel( const OUString& rLabel ) throw(css::uno::RuntimeException, std::exception)
+void VCLXButton::setLabel( const OUString& rLabel )
 {
     SolarMutexGuard aGuard;
 
@@ -428,14 +428,14 @@ void VCLXButton::setLabel( const OUString& rLabel ) throw(css::uno::RuntimeExcep
         pWindow->SetText( rLabel );
 }
 
-void VCLXButton::setActionCommand( const OUString& rCommand ) throw(css::uno::RuntimeException, std::exception)
+void VCLXButton::setActionCommand( const OUString& rCommand )
 {
     SolarMutexGuard aGuard;
 
     maActionCommand = rCommand;
 }
 
-css::awt::Size VCLXButton::getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXButton::getMinimumSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -446,7 +446,7 @@ css::awt::Size VCLXButton::getMinimumSize(  ) throw(css::uno::RuntimeException,
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXButton::getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXButton::getPreferredSize(  )
 {
     css::awt::Size aSz = getMinimumSize();
     aSz.Width += 16;
@@ -454,7 +454,7 @@ css::awt::Size VCLXButton::getPreferredSize(  ) throw(css::uno::RuntimeException
     return aSz;
 }
 
-css::awt::Size VCLXButton::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXButton::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -482,7 +482,7 @@ css::awt::Size VCLXButton::calcAdjustedSize( const css::awt::Size& rNewSize ) th
     return AWTSize(aSz);
 }
 
-void VCLXButton::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXButton::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -527,7 +527,7 @@ void VCLXButton::setProperty( const OUString& PropertyName, const css::uno::Any&
     }
 }
 
-css::uno::Any VCLXButton::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXButton::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -656,7 +656,7 @@ void VCLXImageControl::ImplSetNewImage()
     pControl->SetImage( GetImage() );
 }
 
-css::awt::Size VCLXImageControl::getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXImageControl::getMinimumSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -666,12 +666,12 @@ css::awt::Size VCLXImageControl::getMinimumSize(  ) throw(css::uno::RuntimeExcep
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXImageControl::getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXImageControl::getPreferredSize(  )
 {
     return getMinimumSize();
 }
 
-css::awt::Size VCLXImageControl::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXImageControl::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -684,7 +684,7 @@ css::awt::Size VCLXImageControl::calcAdjustedSize( const css::awt::Size& rNewSiz
     return aSz;
 }
 
-void VCLXImageControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXImageControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -720,7 +720,7 @@ void VCLXImageControl::setProperty( const OUString& PropertyName, const css::uno
     }
 }
 
-css::uno::Any VCLXImageControl::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXImageControl::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -783,7 +783,7 @@ VCLXCheckBox::VCLXCheckBox() :  maActionListeners( *this ), maItemListeners( *th
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXCheckBox::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXCheckBox::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XButton* >(this)),
@@ -803,7 +803,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXCheckBox::Crea
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
-void VCLXCheckBox::dispose() throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -813,37 +813,37 @@ void VCLXCheckBox::dispose() throw(css::uno::RuntimeException, std::exception)
     VCLXGraphicControl::dispose();
 }
 
-void VCLXCheckBox::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l )
 {
     SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
-void VCLXCheckBox::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l )
 {
     SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
-void VCLXCheckBox::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l  )throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l  )
 {
     SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
-void VCLXCheckBox::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l )
 {
     SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
-void VCLXCheckBox::setActionCommand( const OUString& rCommand ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::setActionCommand( const OUString& rCommand )
 {
     SolarMutexGuard aGuard;
     maActionCommand = rCommand;
 }
 
-void VCLXCheckBox::setLabel( const OUString& rLabel ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::setLabel( const OUString& rLabel )
 {
     SolarMutexGuard aGuard;
 
@@ -852,7 +852,7 @@ void VCLXCheckBox::setLabel( const OUString& rLabel ) throw(css::uno::RuntimeExc
         pWindow->SetText( rLabel );
 }
 
-void VCLXCheckBox::setState( short n ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::setState( short n )
 {
     SolarMutexGuard aGuard;
 
@@ -880,7 +880,7 @@ void VCLXCheckBox::setState( short n ) throw(css::uno::RuntimeException, std::ex
     }
 }
 
-short VCLXCheckBox::getState() throw(css::uno::RuntimeException, std::exception)
+short VCLXCheckBox::getState()
 {
     SolarMutexGuard aGuard;
 
@@ -900,7 +900,7 @@ short VCLXCheckBox::getState() throw(css::uno::RuntimeException, std::exception)
     return nState;
 }
 
-void VCLXCheckBox::enableTriState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::enableTriState( sal_Bool b )
 {
     SolarMutexGuard aGuard;
 
@@ -909,7 +909,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(css::uno::RuntimeException
         pCheckBox->EnableTriState( b );
 }
 
-css::awt::Size VCLXCheckBox::getMinimumSize() throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXCheckBox::getMinimumSize()
 {
     SolarMutexGuard aGuard;
 
@@ -920,12 +920,12 @@ css::awt::Size VCLXCheckBox::getMinimumSize() throw(css::uno::RuntimeException,
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXCheckBox::getPreferredSize() throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXCheckBox::getPreferredSize()
 {
     return getMinimumSize();
 }
 
-css::awt::Size VCLXCheckBox::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXCheckBox::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -942,7 +942,7 @@ css::awt::Size VCLXCheckBox::calcAdjustedSize( const css::awt::Size& rNewSize )
     return AWTSize(aSz);
 }
 
-void VCLXCheckBox::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXCheckBox::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -978,7 +978,7 @@ void VCLXCheckBox::setProperty( const OUString& PropertyName, const css::uno::An
     }
 }
 
-css::uno::Any VCLXCheckBox::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXCheckBox::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -1084,7 +1084,7 @@ VCLXRadioButton::VCLXRadioButton() : maItemListeners( *this ), maActionListeners
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXRadioButton::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXRadioButton::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XRadioButton* >(this)),
@@ -1104,7 +1104,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXRadioButton::C
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
-void VCLXRadioButton::dispose() throw(css::uno::RuntimeException, std::exception)
+void VCLXRadioButton::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -1114,7 +1114,7 @@ void VCLXRadioButton::dispose() throw(css::uno::RuntimeException, std::exception
     VCLXGraphicControl::dispose();
 }
 
-void VCLXRadioButton::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXRadioButton::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -1156,7 +1156,7 @@ void VCLXRadioButton::setProperty( const OUString& PropertyName, const css::uno:
     }
 }
 
-css::uno::Any VCLXRadioButton::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXRadioButton::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -1185,31 +1185,31 @@ css::uno::Any VCLXRadioButton::getProperty( const OUString& PropertyName ) throw
     return aProp;
 }
 
-void VCLXRadioButton::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRadioButton::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l )
 {
     SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
-void VCLXRadioButton::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRadioButton::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l )
 {
     SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
-void VCLXRadioButton::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l  )throw(css::uno::RuntimeException, std::exception)
+void VCLXRadioButton::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l  )
 {
     SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
-void VCLXRadioButton::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRadioButton::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l )
 {
     SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
-void VCLXRadioButton::setLabel( const OUString& rLabel ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRadioButton::setLabel( const OUString& rLabel )
 {
     SolarMutexGuard aGuard;
 
@@ -1218,13 +1218,13 @@ void VCLXRadioButton::setLabel( const OUString& rLabel ) throw(css::uno::Runtime
         pWindow->SetText( rLabel );
 }
 
-void VCLXRadioButton::setActionCommand( const OUString& rCommand ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRadioButton::setActionCommand( const OUString& rCommand )
 {
     SolarMutexGuard aGuard;
     maActionCommand = rCommand;
 }
 
-void VCLXRadioButton::setState( sal_Bool b ) throw(css::uno::RuntimeException, std::exception)
+void VCLXRadioButton::setState( sal_Bool b )
 {
     SolarMutexGuard aGuard;
 
@@ -1243,7 +1243,7 @@ void VCLXRadioButton::setState( sal_Bool b ) throw(css::uno::RuntimeException, s
     }
 }
 
-sal_Bool VCLXRadioButton::getState() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXRadioButton::getState()
 {
     SolarMutexGuard aGuard;
 
@@ -1251,7 +1251,7 @@ sal_Bool VCLXRadioButton::getState() throw(css::uno::RuntimeException, std::exce
     return pRadioButton && pRadioButton->IsChecked();
 }
 
-css::awt::Size VCLXRadioButton::getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXRadioButton::getMinimumSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -1262,12 +1262,12 @@ css::awt::Size VCLXRadioButton::getMinimumSize(  ) throw(css::uno::RuntimeExcept
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXRadioButton::getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXRadioButton::getPreferredSize(  )
 {
     return getMinimumSize();
 }
 
-css::awt::Size VCLXRadioButton::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXRadioButton::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -1345,7 +1345,7 @@ VCLXSpinField::VCLXSpinField() : maSpinListeners( *this )
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXSpinField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXSpinField::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XSpinField* >(this)) );
@@ -1358,19 +1358,19 @@ IMPL_XTYPEPROVIDER_START( VCLXSpinField )
     VCLXEdit::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void VCLXSpinField::addSpinListener( const css::uno::Reference< css::awt::XSpinListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXSpinField::addSpinListener( const css::uno::Reference< css::awt::XSpinListener > & l )
 {
     SolarMutexGuard aGuard;
     maSpinListeners.addInterface( l );
 }
 
-void VCLXSpinField::removeSpinListener( const css::uno::Reference< css::awt::XSpinListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXSpinField::removeSpinListener( const css::uno::Reference< css::awt::XSpinListener > & l )
 {
     SolarMutexGuard aGuard;
     maSpinListeners.removeInterface( l );
 }
 
-void VCLXSpinField::up() throw(css::uno::RuntimeException, std::exception)
+void VCLXSpinField::up()
 {
     SolarMutexGuard aGuard;
 
@@ -1379,7 +1379,7 @@ void VCLXSpinField::up() throw(css::uno::RuntimeException, std::exception)
         pSpinField->Up();
 }
 
-void VCLXSpinField::down() throw(css::uno::RuntimeException, std::exception)
+void VCLXSpinField::down()
 {
     SolarMutexGuard aGuard;
 
@@ -1388,7 +1388,7 @@ void VCLXSpinField::down() throw(css::uno::RuntimeException, std::exception)
         pSpinField->Down();
 }
 
-void VCLXSpinField::first() throw(css::uno::RuntimeException, std::exception)
+void VCLXSpinField::first()
 {
     SolarMutexGuard aGuard;
 
@@ -1397,7 +1397,7 @@ void VCLXSpinField::first() throw(css::uno::RuntimeException, std::exception)
         pSpinField->First();
 }
 
-void VCLXSpinField::last() throw(css::uno::RuntimeException, std::exception)
+void VCLXSpinField::last()
 {
     SolarMutexGuard aGuard;
 
@@ -1406,7 +1406,7 @@ void VCLXSpinField::last() throw(css::uno::RuntimeException, std::exception)
         pSpinField->Last();
 }
 
-void VCLXSpinField::enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception)
+void VCLXSpinField::enableRepeat( sal_Bool bRepeat )
 {
     SolarMutexGuard aGuard;
 
@@ -1504,7 +1504,7 @@ VCLXListBox::VCLXListBox()
 {
 }
 
-void VCLXListBox::dispose() throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -1515,31 +1515,31 @@ void VCLXListBox::dispose() throw(css::uno::RuntimeException, std::exception)
     VCLXWindow::dispose();
 }
 
-void VCLXListBox::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l )
 {
     SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
-void VCLXListBox::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l )
 {
     SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
-void VCLXListBox::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l )
 {
     SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
-void VCLXListBox::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l )
 {
     SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
-void VCLXListBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::addItem( const OUString& aItem, sal_Int16 nPos )
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pBox = GetAs< ListBox >();
@@ -1547,7 +1547,7 @@ void VCLXListBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::un
         pBox->InsertEntry( aItem, nPos );
 }
 
-void VCLXListBox::addItems( const css::uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::addItems( const css::uno::Sequence< OUString>& aItems, sal_Int16 nPos )
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pBox = GetAs< ListBox >();
@@ -1570,7 +1570,7 @@ void VCLXListBox::addItems( const css::uno::Sequence< OUString>& aItems, sal_Int
     }
 }
 
-void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount )
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pBox = GetAs< ListBox >();
@@ -1581,7 +1581,7 @@ void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno
     }
 }
 
-sal_Int16 VCLXListBox::getItemCount() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXListBox::getItemCount()
 {
     SolarMutexGuard aGuard;
 
@@ -1589,7 +1589,7 @@ sal_Int16 VCLXListBox::getItemCount() throw(css::uno::RuntimeException, std::exc
     return pBox ? pBox->GetEntryCount() : 0;
 }
 
-OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception)
+OUString VCLXListBox::getItem( sal_Int16 nPos )
 {
     SolarMutexGuard aGuard;
 
@@ -1600,7 +1600,7 @@ OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException
     return aItem;
 }
 
-css::uno::Sequence< OUString> VCLXListBox::getItems() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString> VCLXListBox::getItems()
 {
     SolarMutexGuard aGuard;
 
@@ -1619,14 +1619,14 @@ css::uno::Sequence< OUString> VCLXListBox::getItems() throw(css::uno::RuntimeExc
     return aSeq;
 }
 
-sal_Int16 VCLXListBox::getSelectedItemPos() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXListBox::getSelectedItemPos()
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pBox = GetAs< ListBox >();
     return pBox ? pBox->GetSelectEntryPos() : 0;
 }
 
-css::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos()
 {
     SolarMutexGuard aGuard;
 
@@ -1642,7 +1642,7 @@ css::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos() throw(css::uno:
     return aSeq;
 }
 
-OUString VCLXListBox::getSelectedItem() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXListBox::getSelectedItem()
 {
     SolarMutexGuard aGuard;
 
@@ -1653,7 +1653,7 @@ OUString VCLXListBox::getSelectedItem() throw(css::uno::RuntimeException, std::e
     return aItem;
 }
 
-css::uno::Sequence< OUString> VCLXListBox::getSelectedItems() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString> VCLXListBox::getSelectedItems()
 {
     SolarMutexGuard aGuard;
 
@@ -1669,7 +1669,7 @@ css::uno::Sequence< OUString> VCLXListBox::getSelectedItems() throw(css::uno::Ru
     return aSeq;
 }
 
-void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect )
 {
     SolarMutexGuard aGuard;
 
@@ -1688,7 +1688,7 @@ void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(css::u
     }
 }
 
-void VCLXListBox::selectItemsPos( const css::uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::selectItemsPos( const css::uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect )
 {
     SolarMutexGuard aGuard;
 
@@ -1719,7 +1719,7 @@ void VCLXListBox::selectItemsPos( const css::uno::Sequence<sal_Int16>& aPosition
     }
 }
 
-void VCLXListBox::selectItem( const OUString& rItemText, sal_Bool bSelect ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::selectItem( const OUString& rItemText, sal_Bool bSelect )
 {
     SolarMutexGuard aGuard;
 
@@ -1730,7 +1730,7 @@ void VCLXListBox::selectItem( const OUString& rItemText, sal_Bool bSelect ) thro
     }
 }
 
-void VCLXListBox::setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::setDropDownLineCount( sal_Int16 nLines )
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pBox = GetAs< ListBox >();
@@ -1738,7 +1738,7 @@ void VCLXListBox::setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::Runti
         pBox->SetDropDownLineCount( nLines );
 }
 
-sal_Int16 VCLXListBox::getDropDownLineCount() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXListBox::getDropDownLineCount()
 {
     SolarMutexGuard aGuard;
 
@@ -1749,7 +1749,7 @@ sal_Int16 VCLXListBox::getDropDownLineCount() throw(css::uno::RuntimeException,
     return nLines;
 }
 
-sal_Bool VCLXListBox::isMutipleMode() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXListBox::isMutipleMode()
 {
     SolarMutexGuard aGuard;
     bool bMulti = false;
@@ -1759,7 +1759,7 @@ sal_Bool VCLXListBox::isMutipleMode() throw(css::uno::RuntimeException, std::exc
     return bMulti;
 }
 
-void VCLXListBox::setMultipleMode( sal_Bool bMulti ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::setMultipleMode( sal_Bool bMulti )
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pBox = GetAs< ListBox >();
@@ -1767,7 +1767,7 @@ void VCLXListBox::setMultipleMode( sal_Bool bMulti ) throw(css::uno::RuntimeExce
         pBox->EnableMultiSelection( bMulti );
 }
 
-void VCLXListBox::makeVisible( sal_Int16 nEntry ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::makeVisible( sal_Int16 nEntry )
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pBox = GetAs< ListBox >();
@@ -1830,7 +1830,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXListBox::Creat
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
-void VCLXListBox::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pListBox = GetAs< ListBox >();
@@ -1906,7 +1906,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const css::uno::Any
     }
 }
 
-css::uno::Any VCLXListBox::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXListBox::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
     css::uno::Any aProp;
@@ -1959,7 +1959,7 @@ css::uno::Any VCLXListBox::getProperty( const OUString& PropertyName ) throw(css
     return aProp;
 }
 
-css::awt::Size VCLXListBox::getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXListBox::getMinimumSize(  )
 {
     SolarMutexGuard aGuard;
     Size aSz;
@@ -1969,7 +1969,7 @@ css::awt::Size VCLXListBox::getMinimumSize(  ) throw(css::uno::RuntimeException,
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXListBox::getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXListBox::getPreferredSize(  )
 {
     SolarMutexGuard aGuard;
     Size aSz;
@@ -1983,7 +1983,7 @@ css::awt::Size VCLXListBox::getPreferredSize(  ) throw(css::uno::RuntimeExceptio
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXListBox::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXListBox::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
     Size aSz = VCLSize(rNewSize);
@@ -1993,7 +1993,7 @@ css::awt::Size VCLXListBox::calcAdjustedSize( const css::awt::Size& rNewSize ) t
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXListBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXListBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
 {
     SolarMutexGuard aGuard;
     Size aSz;
@@ -2003,7 +2003,7 @@ css::awt::Size VCLXListBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
     return AWTSize(aSz);
 }
 
-void VCLXListBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception)
+void VCLXListBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
 {
     SolarMutexGuard aGuard;
     nCols = nLines = 0;
@@ -2055,7 +2055,7 @@ namespace
          return Image();
      }
 }
-void SAL_CALL VCLXListBox::listItemInserted( const ItemListEvent& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXListBox::listItemInserted( const ItemListEvent& i_rEvent )
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pListBox = GetAs< ListBox >();
@@ -2069,7 +2069,7 @@ void SAL_CALL VCLXListBox::listItemInserted( const ItemListEvent& i_rEvent ) thr
         i_rEvent.ItemPosition );
 }
 
-void SAL_CALL VCLXListBox::listItemRemoved( const ItemListEvent& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXListBox::listItemRemoved( const ItemListEvent& i_rEvent )
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pListBox = GetAs< ListBox >();
@@ -2081,7 +2081,7 @@ void SAL_CALL VCLXListBox::listItemRemoved( const ItemListEvent& i_rEvent ) thro
     pListBox->RemoveEntry( i_rEvent.ItemPosition );
 }
 
-void SAL_CALL VCLXListBox::listItemModified( const ItemListEvent& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXListBox::listItemModified( const ItemListEvent& i_rEvent )
 {
     SolarMutexGuard aGuard;
     VclPtr< ListBox > pListBox = GetAs< ListBox >();
@@ -2099,7 +2099,7 @@ void SAL_CALL VCLXListBox::listItemModified( const ItemListEvent& i_rEvent ) thr
     pListBox->InsertEntry( sNewText, aNewImage, i_rEvent.ItemPosition );
 }
 
-void SAL_CALL VCLXListBox::allItemsRemoved( const EventObject& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXListBox::allItemsRemoved( const EventObject& i_rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -2111,7 +2111,7 @@ void SAL_CALL VCLXListBox::allItemsRemoved( const EventObject& i_rEvent ) throw
     (void)i_rEvent;
 }
 
-void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -2145,7 +2145,7 @@ void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent ) throw
     }
 }
 
-void SAL_CALL VCLXListBox::disposing( const EventObject& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXListBox::disposing( const EventObject& i_rEvent )
 {
     // just disambiguate
     VCLXWindow::disposing( i_rEvent );
@@ -2169,7 +2169,7 @@ VCLXMessageBox::~VCLXMessageBox()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXMessageBox::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXMessageBox::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XMessageBox* >(this)) );
@@ -2182,7 +2182,7 @@ IMPL_XTYPEPROVIDER_START( VCLXMessageBox )
     VCLXTopWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void VCLXMessageBox::setCaptionText( const OUString& rText ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMessageBox::setCaptionText( const OUString& rText )
 {
     SolarMutexGuard aGuard;
 
@@ -2191,7 +2191,7 @@ void VCLXMessageBox::setCaptionText( const OUString& rText ) throw(css::uno::Run
         pWindow->SetText( rText );
 }
 
-OUString VCLXMessageBox::getCaptionText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXMessageBox::getCaptionText()
 {
     SolarMutexGuard aGuard;
 
@@ -2202,7 +2202,7 @@ OUString VCLXMessageBox::getCaptionText() throw(css::uno::RuntimeException, std:
     return aText;
 }
 
-void VCLXMessageBox::setMessageText( const OUString& rText ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMessageBox::setMessageText( const OUString& rText )
 {
     SolarMutexGuard aGuard;
     VclPtr< MessBox > pBox = GetAs< MessBox >();
@@ -2210,7 +2210,7 @@ void VCLXMessageBox::setMessageText( const OUString& rText ) throw(css::uno::Run
         pBox->SetMessText( rText );
 }
 
-OUString VCLXMessageBox::getMessageText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXMessageBox::getMessageText()
 {
     SolarMutexGuard aGuard;
     OUString aText;
@@ -2220,14 +2220,14 @@ OUString VCLXMessageBox::getMessageText() throw(css::uno::RuntimeException, std:
     return aText;
 }
 
-sal_Int16 VCLXMessageBox::execute() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXMessageBox::execute()
 {
     SolarMutexGuard aGuard;
     VclPtr< MessBox > pBox = GetAs< MessBox >();
     return pBox ? pBox->Execute() : 0;
 }
 
-css::awt::Size SAL_CALL VCLXMessageBox::getMinimumSize() throw(css::uno::RuntimeException, std::exception)
+css::awt::Size SAL_CALL VCLXMessageBox::getMinimumSize()
 {
     SolarMutexGuard aGuard;
     return css::awt::Size( 250, 100 );
@@ -2252,7 +2252,7 @@ VCLXDialog::~VCLXDialog()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXDialog::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXDialog::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XDialog2* >(this)),
@@ -2267,7 +2267,7 @@ IMPL_XTYPEPROVIDER_START( VCLXDialog )
     VCLXTopWindow::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void SAL_CALL VCLXDialog::endDialog( ::sal_Int32 i_result ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXDialog::endDialog( ::sal_Int32 i_result )
 {
     SolarMutexGuard aGuard;
     VclPtr<Dialog> pDialog = GetAsDynamic< Dialog >();
@@ -2275,7 +2275,7 @@ void SAL_CALL VCLXDialog::endDialog( ::sal_Int32 i_result ) throw (RuntimeExcept
         pDialog->EndDialog( i_result );
 }
 
-void SAL_CALL VCLXDialog::setHelpId( const OUString& rId ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXDialog::setHelpId( const OUString& rId )
 {
     SolarMutexGuard aGuard;
     VclPtr< vcl::Window > pWindow = GetWindow();
@@ -2283,7 +2283,7 @@ void SAL_CALL VCLXDialog::setHelpId( const OUString& rId ) throw (RuntimeExcepti
         pWindow->SetHelpId( OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) );
 }
 
-void VCLXDialog::setTitle( const OUString& Title ) throw(css::uno::RuntimeException, std::exception)
+void VCLXDialog::setTitle( const OUString& Title )
 {
     SolarMutexGuard aGuard;
     VclPtr< vcl::Window > pWindow = GetWindow();
@@ -2291,7 +2291,7 @@ void VCLXDialog::setTitle( const OUString& Title ) throw(css::uno::RuntimeExcept
         pWindow->SetText( Title );
 }
 
-OUString VCLXDialog::getTitle() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXDialog::getTitle()
 {
     SolarMutexGuard aGuard;
 
@@ -2302,7 +2302,7 @@ OUString VCLXDialog::getTitle() throw(css::uno::RuntimeException, std::exception
     return aTitle;
 }
 
-sal_Int16 VCLXDialog::execute() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXDialog::execute()
 {
     SolarMutexGuard aGuard;
 
@@ -2334,12 +2334,12 @@ sal_Int16 VCLXDialog::execute() throw(css::uno::RuntimeException, std::exception
     return nRet;
 }
 
-void VCLXDialog::endExecute() throw(css::uno::RuntimeException, std::exception)
+void VCLXDialog::endExecute()
 {
     endDialog(0);
 }
 
-void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY )
 {
     SolarMutexGuard aGuard;
     VclPtr< vcl::Window > pWindow = GetWindow();
@@ -2356,7 +2356,7 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::Run
     }
 }
 
-css::awt::DeviceInfo VCLXDialog::getInfo() throw(css::uno::RuntimeException, std::exception)
+css::awt::DeviceInfo VCLXDialog::getInfo()
 {
     css::awt::DeviceInfo aInfo = VCLXDevice::getInfo();
 
@@ -2371,7 +2371,6 @@ css::awt::DeviceInfo VCLXDialog::getInfo() throw(css::uno::RuntimeException, std
 void SAL_CALL VCLXDialog::setProperty(
     const OUString& PropertyName,
     const css::uno::Any& Value )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     VclPtr< Dialog > pDialog = GetAs< Dialog >();
@@ -2446,7 +2445,7 @@ void VCLXMultiPage::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
 VCLXMultiPage::~VCLXMultiPage()
 {
 }
-void SAL_CALL VCLXMultiPage::dispose() throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL VCLXMultiPage::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -2456,7 +2455,6 @@ void SAL_CALL VCLXMultiPage::dispose() throw(css::uno::RuntimeException, std::ex
     VCLXContainer::dispose();
 }
 css::uno::Any SAL_CALL VCLXMultiPage::queryInterface(const css::uno::Type & rType )
-throw(css::uno::RuntimeException, std::exception)
 {
     uno::Any aRet = ::cppu::queryInterface( rType, static_cast< awt::XSimpleTabController*>( this ) );
 
@@ -2470,7 +2468,6 @@ IMPL_XTYPEPROVIDER_END
 
 // css::awt::XView
 void SAL_CALL VCLXMultiPage::draw( sal_Int32 nX, sal_Int32 nY )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     VclPtr< vcl::Window > pWindow = GetWindow();
@@ -2490,13 +2487,12 @@ throw(css::uno::RuntimeException, std::exception)
 
 // css::awt::XDevice,
 css::awt::DeviceInfo SAL_CALL VCLXMultiPage::getInfo()
-throw(css::uno::RuntimeException, std::exception)
 {
     css::awt::DeviceInfo aInfo = VCLXDevice::getInfo();
     return aInfo;
 }
 
-uno::Any SAL_CALL VCLXMultiPage::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL VCLXMultiPage::getProperty( const OUString& PropertyName )
 {
     SAL_INFO("toolkit", " **** VCLXMultiPage::getProperty " << PropertyName );
     SolarMutexGuard aGuard;
@@ -2519,7 +2515,6 @@ uno::Any SAL_CALL VCLXMultiPage::getProperty( const OUString& PropertyName ) thr
 void SAL_CALL VCLXMultiPage::setProperty(
     const OUString& PropertyName,
     const css::uno::Any& Value )
-throw(css::uno::RuntimeException, std::exception)
 {
     SAL_INFO("toolkit", " **** VCLXMultiPage::setProperty " << PropertyName );
     SolarMutexGuard aGuard;
@@ -2574,14 +2569,14 @@ throw(css::uno::RuntimeException, std::exception)
     }
 }
 
-TabControl *VCLXMultiPage::getTabControl() const throw (uno::RuntimeException)
+TabControl *VCLXMultiPage::getTabControl() const
 {
     VclPtr<TabControl> pTabControl = GetAsDynamic< TabControl >();
     if ( pTabControl )
         return pTabControl;
     throw uno::RuntimeException();
 }
-sal_Int32 SAL_CALL VCLXMultiPage::insertTab() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXMultiPage::insertTab()
 {
     TabControl *pTabControl = getTabControl();
     VclPtrInstance<TabPage> pTab( pTabControl );
@@ -2598,7 +2593,7 @@ sal_uInt16 VCLXMultiPage::insertTab( TabPage* pPage, OUString& sTitle )
     return id;
 }
 
-void SAL_CALL VCLXMultiPage::removeTab( sal_Int32 ID ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
+void SAL_CALL VCLXMultiPage::removeTab( sal_Int32 ID )
 {
     TabControl *pTabControl = getTabControl();
     if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == nullptr )
@@ -2606,7 +2601,7 @@ void SAL_CALL VCLXMultiPage::removeTab( sal_Int32 ID ) throw (uno::RuntimeExcept
     pTabControl->RemovePage( sal::static_int_cast< sal_uInt16 >( ID ) );
 }
 
-void SAL_CALL VCLXMultiPage::activateTab( sal_Int32 ID ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
+void SAL_CALL VCLXMultiPage::activateTab( sal_Int32 ID )
 {
     TabControl *pTabControl = getTabControl();
     SAL_INFO(
@@ -2618,24 +2613,24 @@ void SAL_CALL VCLXMultiPage::activateTab( sal_Int32 ID ) throw (uno::RuntimeExce
     pTabControl->SelectTabPage( sal::static_int_cast< sal_uInt16 >( ID ) );
 }
 
-sal_Int32 SAL_CALL VCLXMultiPage::getActiveTabID() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL VCLXMultiPage::getActiveTabID()
 {
     return getTabControl()->GetCurPageId( );
 }
 
-void SAL_CALL VCLXMultiPage::addTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VCLXMultiPage::addTabListener( const uno::Reference< awt::XTabListener >& xListener )
 {
     SolarMutexGuard aGuard;
     maTabListeners.addInterface( xListener );
 }
 
-void SAL_CALL VCLXMultiPage::removeTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VCLXMultiPage::removeTabListener( const uno::Reference< awt::XTabListener >& xListener )
 {
     SolarMutexGuard aGuard;
     maTabListeners.addInterface( xListener );
 }
 
-void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< beans::NamedValue >& Properties ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
+void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< beans::NamedValue >& Properties )
 {
     SolarMutexGuard aGuard;
     TabControl *pTabControl = getTabControl();
@@ -2656,7 +2651,6 @@ void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< bea
 }
 
 uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int32 ID )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     TabControl *pTabControl = getTabControl();
@@ -2733,7 +2727,6 @@ IMPL_XTYPEPROVIDER_END
 
 // css::awt::XView
 void SAL_CALL VCLXTabPage::draw( sal_Int32 nX, sal_Int32 nY )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     VclPtr< vcl::Window > pWindow = GetWindow();
@@ -2753,7 +2746,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 // css::awt::XDevice,
 css::awt::DeviceInfo SAL_CALL VCLXTabPage::getInfo()
-throw(css::uno::RuntimeException, std::exception)
 {
     css::awt::DeviceInfo aInfo = VCLXDevice::getInfo();
     return aInfo;
@@ -2762,7 +2754,6 @@ throw(css::uno::RuntimeException, std::exception)
 void SAL_CALL VCLXTabPage::setProperty(
     const OUString& PropertyName,
     const css::uno::Any& Value )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     VclPtr< TabPage > pTabPage = GetAs< TabPage >();
@@ -2813,7 +2804,7 @@ throw(css::uno::RuntimeException, std::exception)
     }
 }
 
-TabPage *VCLXTabPage::getTabPage() const throw (uno::RuntimeException)
+TabPage *VCLXTabPage::getTabPage() const
 {
     VclPtr< TabPage > pTabPage = GetAsDynamic< TabPage >();
     if ( pTabPage )
@@ -2837,14 +2828,14 @@ VCLXFixedHyperlink::~VCLXFixedHyperlink()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXFixedHyperlink::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXFixedHyperlink::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XFixedHyperlink* >(this)) );
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
-void VCLXFixedHyperlink::dispose() throw(css::uno::RuntimeException, std::exception)
+void VCLXFixedHyperlink::dispose()
 {
         SolarMutexGuard aGuard;
 
@@ -2907,7 +2898,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXFixedHyperlink
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
-void VCLXFixedHyperlink::setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFixedHyperlink::setText( const OUString& Text )
 {
     SolarMutexGuard aGuard;
     VclPtr< FixedHyperlink > pBase = GetAs< FixedHyperlink >();
@@ -2915,7 +2906,7 @@ void VCLXFixedHyperlink::setText( const OUString& Text ) throw(css::uno::Runtime
         pBase->SetText(Text);
 }
 
-OUString VCLXFixedHyperlink::getText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXFixedHyperlink::getText()
 {
     SolarMutexGuard aGuard;
 
@@ -2926,7 +2917,7 @@ OUString VCLXFixedHyperlink::getText() throw(css::uno::RuntimeException, std::ex
     return aText;
 }
 
-void VCLXFixedHyperlink::setURL( const OUString& URL ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFixedHyperlink::setURL( const OUString& URL )
 {
     SolarMutexGuard aGuard;
     VclPtr< FixedHyperlink > pBase = GetAs< FixedHyperlink >();
@@ -2934,7 +2925,7 @@ void VCLXFixedHyperlink::setURL( const OUString& URL ) throw(css::uno::RuntimeEx
         pBase->SetURL( URL );
 }
 
-OUString VCLXFixedHyperlink::getURL(  ) throw(css::uno::RuntimeException, std::exception)
+OUString VCLXFixedHyperlink::getURL(  )
 {
     SolarMutexGuard aGuard;
 
@@ -2945,7 +2936,7 @@ OUString VCLXFixedHyperlink::getURL(  ) throw(css::uno::RuntimeException, std::e
     return aText;
 }
 
-void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFixedHyperlink::setAlignment( short nAlign )
 {
     SolarMutexGuard aGuard;
 
@@ -2966,7 +2957,7 @@ void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(css::uno::RuntimeExc
     }
 }
 
-short VCLXFixedHyperlink::getAlignment() throw(css::uno::RuntimeException, std::exception)
+short VCLXFixedHyperlink::getAlignment()
 {
     SolarMutexGuard aGuard;
 
@@ -2985,19 +2976,19 @@ short VCLXFixedHyperlink::getAlignment() throw(css::uno::RuntimeException, std::
     return nAlign;
 }
 
-void VCLXFixedHyperlink::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l  )throw(css::uno::RuntimeException, std::exception)
+void VCLXFixedHyperlink::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l  )
 {
         SolarMutexGuard aGuard;
         maActionListeners.addInterface( l );
 }
 
-void VCLXFixedHyperlink::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFixedHyperlink::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l )
 {
         SolarMutexGuard aGuard;
         maActionListeners.removeInterface( l );
 }
 
-css::awt::Size VCLXFixedHyperlink::getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFixedHyperlink::getMinimumSize(  )
 {
     SolarMutexGuard aGuard;
     Size aSz;
@@ -3007,12 +2998,12 @@ css::awt::Size VCLXFixedHyperlink::getMinimumSize(  ) throw(css::uno::RuntimeExc
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXFixedHyperlink::getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFixedHyperlink::getPreferredSize(  )
 {
     return getMinimumSize();
 }
 
-css::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -3024,7 +3015,7 @@ css::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const css::awt::Size& rNewS
     return aSz;
 }
 
-void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -3058,7 +3049,7 @@ void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const css::u
     }
 }
 
-css::uno::Any VCLXFixedHyperlink::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXFixedHyperlink::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -3148,7 +3139,7 @@ VCLXFixedText::~VCLXFixedText()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXFixedText::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXFixedText::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XFixedText* >(this)) );
@@ -3166,7 +3157,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXFixedText::Cre
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
-void VCLXFixedText::setText( const OUString& Text ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFixedText::setText( const OUString& Text )
 {
     SolarMutexGuard aGuard;
 
@@ -3175,7 +3166,7 @@ void VCLXFixedText::setText( const OUString& Text ) throw(css::uno::RuntimeExcep
         pWindow->SetText( Text );
 }
 
-OUString VCLXFixedText::getText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXFixedText::getText()
 {
     SolarMutexGuard aGuard;
 
@@ -3186,7 +3177,7 @@ OUString VCLXFixedText::getText() throw(css::uno::RuntimeException, std::excepti
     return aText;
 }
 
-void VCLXFixedText::setAlignment( short nAlign ) throw(css::uno::RuntimeException, std::exception)
+void VCLXFixedText::setAlignment( short nAlign )
 {
     SolarMutexGuard aGuard;
 
@@ -3207,7 +3198,7 @@ void VCLXFixedText::setAlignment( short nAlign ) throw(css::uno::RuntimeExceptio
     }
 }
 
-short VCLXFixedText::getAlignment() throw(css::uno::RuntimeException, std::exception)
+short VCLXFixedText::getAlignment()
 {
     SolarMutexGuard aGuard;
 
@@ -3226,7 +3217,7 @@ short VCLXFixedText::getAlignment() throw(css::uno::RuntimeException, std::excep
     return nAlign;
 }
 
-css::awt::Size VCLXFixedText::getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFixedText::getMinimumSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -3237,12 +3228,12 @@ css::awt::Size VCLXFixedText::getMinimumSize(  ) throw(css::uno::RuntimeExceptio
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXFixedText::getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFixedText::getPreferredSize(  )
 {
     return getMinimumSize();
 }
 
-css::awt::Size VCLXFixedText::calcAdjustedSize( const css::awt::Size& rMaxSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXFixedText::calcAdjustedSize( const css::awt::Size& rMaxSize )
 {
     SolarMutexGuard aGuard;
 
@@ -3290,7 +3281,7 @@ VCLXScrollBar::VCLXScrollBar() : maAdjustmentListeners( *this )
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXScrollBar::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXScrollBar::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XScrollBar* >(this)) );
@@ -3309,7 +3300,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXScrollBar::Cre
 }
 
 // css::lang::XComponent
-void VCLXScrollBar::dispose() throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -3320,19 +3311,19 @@ void VCLXScrollBar::dispose() throw(css::uno::RuntimeException, std::exception)
 }
 
 // css::awt::XScrollbar
-void VCLXScrollBar::addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l )
 {
     SolarMutexGuard aGuard;
     maAdjustmentListeners.addInterface( l );
 }
 
-void VCLXScrollBar::removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l )
 {
     SolarMutexGuard aGuard;
     maAdjustmentListeners.removeInterface( l );
 }
 
-void VCLXScrollBar::setValue( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::setValue( sal_Int32 n )
 {
     SolarMutexGuard aGuard;
 
@@ -3341,7 +3332,7 @@ void VCLXScrollBar::setValue( sal_Int32 n ) throw(css::uno::RuntimeException, st
         pScrollBar->DoScroll( n );
 }
 
-void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax )
 {
     SolarMutexGuard aGuard;
 
@@ -3354,7 +3345,7 @@ void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 n
     }
 }
 
-sal_Int32 VCLXScrollBar::getValue() throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXScrollBar::getValue()
 {
     SolarMutexGuard aGuard;
 
@@ -3362,7 +3353,7 @@ sal_Int32 VCLXScrollBar::getValue() throw(css::uno::RuntimeException, std::excep
     return pScrollBar ? pScrollBar->GetThumbPos() : 0;
 }
 
-void VCLXScrollBar::setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::setMaximum( sal_Int32 n )
 {
     SolarMutexGuard aGuard;
 
@@ -3371,7 +3362,7 @@ void VCLXScrollBar::setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException,
         pScrollBar->SetRangeMax( n );
 }
 
-sal_Int32 VCLXScrollBar::getMaximum() throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXScrollBar::getMaximum()
 {
     SolarMutexGuard aGuard;
 
@@ -3379,7 +3370,7 @@ sal_Int32 VCLXScrollBar::getMaximum() throw(css::uno::RuntimeException, std::exc
     return pScrollBar ? pScrollBar->GetRangeMax() : 0;
 }
 
-void VCLXScrollBar::setMinimum( sal_Int32 n ) throw(css::uno::RuntimeException)
+void VCLXScrollBar::setMinimum( sal_Int32 n )
 {
     SolarMutexGuard aGuard;
 
@@ -3388,7 +3379,7 @@ void VCLXScrollBar::setMinimum( sal_Int32 n ) throw(css::uno::RuntimeException)
         pScrollBar->SetRangeMin( n );
 }
 
-sal_Int32 VCLXScrollBar::getMinimum() throw(css::uno::RuntimeException)
+sal_Int32 VCLXScrollBar::getMinimum()
 {
     SolarMutexGuard aGuard;
 
@@ -3396,7 +3387,7 @@ sal_Int32 VCLXScrollBar::getMinimum() throw(css::uno::RuntimeException)
     return pScrollBar ? pScrollBar->GetRangeMin() : 0;
 }
 
-void VCLXScrollBar::setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::setLineIncrement( sal_Int32 n )
 {
     SolarMutexGuard aGuard;
 
@@ -3405,7 +3396,7 @@ void VCLXScrollBar::setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeExcep
         pScrollBar->SetLineSize( n );
 }
 
-sal_Int32 VCLXScrollBar::getLineIncrement() throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXScrollBar::getLineIncrement()
 {
     SolarMutexGuard aGuard;
 
@@ -3413,7 +3404,7 @@ sal_Int32 VCLXScrollBar::getLineIncrement() throw(css::uno::RuntimeException, st
     return pScrollBar ? pScrollBar->GetLineSize() : 0;
 }
 
-void VCLXScrollBar::setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::setBlockIncrement( sal_Int32 n )
 {
     SolarMutexGuard aGuard;
 
@@ -3422,7 +3413,7 @@ void VCLXScrollBar::setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeExce
         pScrollBar->SetPageSize( n );
 }
 
-sal_Int32 VCLXScrollBar::getBlockIncrement() throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXScrollBar::getBlockIncrement()
 {
     SolarMutexGuard aGuard;
 
@@ -3430,7 +3421,7 @@ sal_Int32 VCLXScrollBar::getBlockIncrement() throw(css::uno::RuntimeException, s
     return pScrollBar ? pScrollBar->GetPageSize() : 0;
 }
 
-void VCLXScrollBar::setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::setVisibleSize( sal_Int32 n )
 {
     SolarMutexGuard aGuard;
 
@@ -3439,7 +3430,7 @@ void VCLXScrollBar::setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeExcepti
         pScrollBar->SetVisibleSize( n );
 }
 
-sal_Int32 VCLXScrollBar::getVisibleSize() throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXScrollBar::getVisibleSize()
 {
     SolarMutexGuard aGuard;
 
@@ -3447,7 +3438,7 @@ sal_Int32 VCLXScrollBar::getVisibleSize() throw(css::uno::RuntimeException, std:
     return pScrollBar ? pScrollBar->GetVisibleSize() : 0;
 }
 
-void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::setOrientation( sal_Int32 n )
 {
     SolarMutexGuard aGuard;
 
@@ -3466,7 +3457,7 @@ void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(css::uno::RuntimeExcepti
     }
 }
 
-sal_Int32 VCLXScrollBar::getOrientation() throw(css::uno::RuntimeException, std::exception)
+sal_Int32 VCLXScrollBar::getOrientation()
 {
     SolarMutexGuard aGuard;
 
@@ -3485,7 +3476,7 @@ sal_Int32 VCLXScrollBar::getOrientation() throw(css::uno::RuntimeException, std:
 }
 
 // css::awt::VclWindowPeer
-void VCLXScrollBar::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXScrollBar::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -3600,7 +3591,7 @@ void VCLXScrollBar::setProperty( const OUString& PropertyName, const css::uno::A
     }
 }
 
-css::uno::Any VCLXScrollBar::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXScrollBar::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -3717,13 +3708,13 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     }
 }
 
-css::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window* p ) throw(css::uno::RuntimeException)
+css::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window* p )
 {
     long n = p->GetSettings().GetStyleSettings().GetScrollBarSize();
     return css::awt::Size( n, n );
 }
 
-css::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize() throw(css::uno::RuntimeException, std::exception)
+css::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize()
 {
     SolarMutexGuard aGuard;
     return implGetMinimumSize( GetWindow() );
@@ -3773,7 +3764,7 @@ VCLXEdit::VCLXEdit() : maTextListeners( *this )
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXEdit::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXEdit::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XTextComponent* >(this)),
@@ -3795,7 +3786,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXEdit::CreateAc
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
-void VCLXEdit::dispose() throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -3805,19 +3796,19 @@ void VCLXEdit::dispose() throw(css::uno::RuntimeException, std::exception)
     VCLXWindow::dispose();
 }
 
-void VCLXEdit::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l )
 {
     SolarMutexGuard aGuard;
     GetTextListeners().addInterface( l );
 }
 
-void VCLXEdit::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l )
 {
     SolarMutexGuard aGuard;
     GetTextListeners().removeInterface( l );
 }
 
-void VCLXEdit::setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::setText( const OUString& aText )
 {
     SolarMutexGuard aGuard;
 
@@ -3834,7 +3825,7 @@ void VCLXEdit::setText( const OUString& aText ) throw(css::uno::RuntimeException
     }
 }
 
-void VCLXEdit::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::insertText( const css::awt::Selection& rSel, const OUString& aText )
 {
     SolarMutexGuard aGuard;
 
@@ -3852,7 +3843,7 @@ void VCLXEdit::insertText( const css::awt::Selection& rSel, const OUString& aTex
     }
 }
 
-OUString VCLXEdit::getText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXEdit::getText()
 {
     SolarMutexGuard aGuard;
 
@@ -3863,7 +3854,7 @@ OUString VCLXEdit::getText() throw(css::uno::RuntimeException, std::exception)
     return aText;
 }
 
-OUString VCLXEdit::getSelectedText() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXEdit::getSelectedText()
 {
     SolarMutexGuard aGuard;
 
@@ -3875,7 +3866,7 @@ OUString VCLXEdit::getSelectedText() throw(css::uno::RuntimeException, std::exce
 
 }
 
-void VCLXEdit::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::setSelection( const css::awt::Selection& aSelection )
 {
     SolarMutexGuard aGuard;
 
@@ -3884,7 +3875,7 @@ void VCLXEdit::setSelection( const css::awt::Selection& aSelection ) throw(css::
         pEdit->SetSelection( Selection( aSelection.Min, aSelection.Max ) );
 }
 
-css::awt::Selection VCLXEdit::getSelection() throw(css::uno::RuntimeException, std::exception)
+css::awt::Selection VCLXEdit::getSelection()
 {
     SolarMutexGuard aGuard;
 
@@ -3895,7 +3886,7 @@ css::awt::Selection VCLXEdit::getSelection() throw(css::uno::RuntimeException, s
     return css::awt::Selection( aSel.Min(), aSel.Max() );
 }
 
-sal_Bool VCLXEdit::isEditable() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXEdit::isEditable()
 {
     SolarMutexGuard aGuard;
 
@@ -3903,7 +3894,7 @@ sal_Bool VCLXEdit::isEditable() throw(css::uno::RuntimeException, std::exception
     return pEdit && !pEdit->IsReadOnly() && pEdit->IsEnabled();
 }
 
-void VCLXEdit::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::setEditable( sal_Bool bEditable )
 {
     SolarMutexGuard aGuard;
 
@@ -3913,7 +3904,7 @@ void VCLXEdit::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeExceptio
 }
 
 
-void VCLXEdit::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::setMaxTextLen( sal_Int16 nLen )
 {
     SolarMutexGuard aGuard;
 
@@ -3922,7 +3913,7 @@ void VCLXEdit::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException,
         pEdit->SetMaxTextLen( nLen );
 }
 
-sal_Int16 VCLXEdit::getMaxTextLen() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXEdit::getMaxTextLen()
 {
     SolarMutexGuard aGuard;
 
@@ -3930,7 +3921,7 @@ sal_Int16 VCLXEdit::getMaxTextLen() throw(css::uno::RuntimeException, std::excep
     return pEdit ? pEdit->GetMaxTextLen() : 0;
 }
 
-void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::setEchoChar( sal_Unicode cEcho )
 {
     SolarMutexGuard aGuard;
 
@@ -3939,7 +3930,7 @@ void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(css::uno::RuntimeException
         pEdit->SetEchoChar( cEcho );
 }
 
-void VCLXEdit::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -3984,7 +3975,7 @@ void VCLXEdit::setProperty( const OUString& PropertyName, const css::uno::Any& V
     }
 }
 
-css::uno::Any VCLXEdit::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXEdit::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -4016,7 +4007,7 @@ css::uno::Any VCLXEdit::getProperty( const OUString& PropertyName ) throw(css::u
     return aProp;
 }
 
-css::awt::Size VCLXEdit::getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXEdit::getMinimumSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -4027,7 +4018,7 @@ css::awt::Size VCLXEdit::getMinimumSize(  ) throw(css::uno::RuntimeException, st
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXEdit::getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXEdit::getPreferredSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -4041,7 +4032,7 @@ css::awt::Size VCLXEdit::getPreferredSize(  ) throw(css::uno::RuntimeException,
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXEdit::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXEdit::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -4053,7 +4044,7 @@ css::awt::Size VCLXEdit::calcAdjustedSize( const css::awt::Size& rNewSize ) thro
     return aSz;
 }
 
-css::awt::Size VCLXEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 )
 {
     SolarMutexGuard aGuard;
 
@@ -4069,7 +4060,7 @@ css::awt::Size VCLXEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(css:
     return AWTSize(aSz);
 }
 
-void VCLXEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception)
+void VCLXEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
 {
     SolarMutexGuard aGuard;
 
@@ -4161,7 +4152,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXComboBox::Crea
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
-void VCLXComboBox::dispose() throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -4173,31 +4164,31 @@ void VCLXComboBox::dispose() throw(css::uno::RuntimeException, std::exception)
 }
 
 
-void VCLXComboBox::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::addItemListener( const css::uno::Reference< css::awt::XItemListener > & l )
 {
     SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
-void VCLXComboBox::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::removeItemListener( const css::uno::Reference< css::awt::XItemListener > & l )
 {
     SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
-void VCLXComboBox::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::addActionListener( const css::uno::Reference< css::awt::XActionListener > & l )
 {
     SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
-void VCLXComboBox::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l ) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::removeActionListener( const css::uno::Reference< css::awt::XActionListener > & l )
 {
     SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
-void VCLXComboBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::addItem( const OUString& aItem, sal_Int16 nPos )
 {
     SolarMutexGuard aGuard;
 
@@ -4206,7 +4197,7 @@ void VCLXComboBox::addItem( const OUString& aItem, sal_Int16 nPos ) throw(css::u
         pBox->InsertEntry( aItem, nPos );
 }
 
-void VCLXComboBox::addItems( const css::uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::addItems( const css::uno::Sequence< OUString>& aItems, sal_Int16 nPos )
 {
     SolarMutexGuard aGuard;
 
@@ -4227,7 +4218,7 @@ void VCLXComboBox::addItems( const css::uno::Sequence< OUString>& aItems, sal_In
     }
 }
 
-void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount )
 {
     SolarMutexGuard aGuard;
 
@@ -4239,7 +4230,7 @@ void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(css::un
     }
 }
 
-sal_Int16 VCLXComboBox::getItemCount() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXComboBox::getItemCount()
 {
     SolarMutexGuard aGuard;
 
@@ -4247,7 +4238,7 @@ sal_Int16 VCLXComboBox::getItemCount() throw(css::uno::RuntimeException, std::ex
     return pBox ? pBox->GetEntryCount() : 0;
 }
 
-OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(css::uno::RuntimeException, std::exception)
+OUString VCLXComboBox::getItem( sal_Int16 nPos )
 {
     SolarMutexGuard aGuard;
 
@@ -4258,7 +4249,7 @@ OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(css::uno::RuntimeExceptio
     return aItem;
 }
 
-css::uno::Sequence< OUString> VCLXComboBox::getItems() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString> VCLXComboBox::getItems()
 {
     SolarMutexGuard aGuard;
 
@@ -4277,7 +4268,7 @@ css::uno::Sequence< OUString> VCLXComboBox::getItems() throw(css::uno::RuntimeEx
     return aSeq;
 }
 
-void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines )
 {
     SolarMutexGuard aGuard;
 
@@ -4286,7 +4277,7 @@ void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines ) throw(css::uno::Runt
         pBox->SetDropDownLineCount( nLines );
 }
 
-sal_Int16 VCLXComboBox::getDropDownLineCount() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXComboBox::getDropDownLineCount()
 {
     SolarMutexGuard aGuard;
 
@@ -4297,7 +4288,7 @@ sal_Int16 VCLXComboBox::getDropDownLineCount() throw(css::uno::RuntimeException,
     return nLines;
 }
 
-void VCLXComboBox::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -4353,7 +4344,7 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const css::uno::An
     }
 }
 
-css::uno::Any VCLXComboBox::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXComboBox::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -4440,7 +4431,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     }
 }
 
-css::awt::Size VCLXComboBox::getMinimumSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXComboBox::getMinimumSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -4451,7 +4442,7 @@ css::awt::Size VCLXComboBox::getMinimumSize(  ) throw(css::uno::RuntimeException
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXComboBox::getPreferredSize(  ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXComboBox::getPreferredSize(  )
 {
     SolarMutexGuard aGuard;
 
@@ -4466,7 +4457,7 @@ css::awt::Size VCLXComboBox::getPreferredSize(  ) throw(css::uno::RuntimeExcepti
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXComboBox::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXComboBox::calcAdjustedSize( const css::awt::Size& rNewSize )
 {
     SolarMutexGuard aGuard;
 
@@ -4477,7 +4468,7 @@ css::awt::Size VCLXComboBox::calcAdjustedSize( const css::awt::Size& rNewSize )
     return AWTSize(aSz);
 }
 
-css::awt::Size VCLXComboBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception)
+css::awt::Size VCLXComboBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
 {
     SolarMutexGuard aGuard;
 
@@ -4488,7 +4479,7 @@ css::awt::Size VCLXComboBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
     return AWTSize(aSz);
 }
 
-void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception)
+void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
 {
     SolarMutexGuard aGuard;
 
@@ -4502,7 +4493,7 @@ void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) thr
         nLines = nL;
     }
 }
-void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -4517,7 +4508,7 @@ void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent ) th
         i_rEvent.ItemPosition );
 }
 
-void SAL_CALL VCLXComboBox::listItemRemoved( const ItemListEvent& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXComboBox::listItemRemoved( const ItemListEvent& i_rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -4530,7 +4521,7 @@ void SAL_CALL VCLXComboBox::listItemRemoved( const ItemListEvent& i_rEvent ) thr
     pComboBox->RemoveEntryAt( i_rEvent.ItemPosition );
 }
 
-void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -4549,7 +4540,7 @@ void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) th
     pComboBox->InsertEntryWithImage(sNewText, aNewImage, i_rEvent.ItemPosition);
 }
 
-void SAL_CALL VCLXComboBox::allItemsRemoved( const EventObject& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXComboBox::allItemsRemoved( const EventObject& i_rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -4561,7 +4552,7 @@ void SAL_CALL VCLXComboBox::allItemsRemoved( const EventObject& i_rEvent ) throw
     (void)i_rEvent;
 }
 
-void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -4596,7 +4587,7 @@ void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent ) throw
                 lcl_getImageFromURL(aItems[i].Second));
     }
 }
-void SAL_CALL VCLXComboBox::disposing( const EventObject& i_rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL VCLXComboBox::disposing( const EventObject& i_rEvent )
 {
     // just disambiguate
     VCLXEdit::disposing( i_rEvent );
@@ -4638,7 +4629,7 @@ bool VCLXFormattedSpinField::isStrictFormat()
 }
 
 
-void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -4677,7 +4668,7 @@ void VCLXFormattedSpinField::setProperty( const OUString& PropertyName, const cs
     }
 }
 
-css::uno::Any VCLXFormattedSpinField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXFormattedSpinField::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -4768,7 +4759,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXDateField::Cre
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXDateField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXDateField::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XDateField* >(this)) );
@@ -4781,7 +4772,7 @@ IMPL_XTYPEPROVIDER_START( VCLXDateField )
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void VCLXDateField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXDateField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -4850,7 +4841,7 @@ void VCLXDateField::setProperty( const OUString& PropertyName, const css::uno::A
     }
 }
 
-css::uno::Any VCLXDateField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXDateField::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -4896,7 +4887,7 @@ css::uno::Any VCLXDateField::getProperty( const OUString& PropertyName ) throw(c
 }
 
 
-void VCLXDateField::setDate( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception)
+void VCLXDateField::setDate( const util::Date& aDate )
 {
     SolarMutexGuard aGuard;
 
@@ -4913,7 +4904,7 @@ void VCLXDateField::setDate( const util::Date& aDate ) throw(css::uno::RuntimeEx
     }
 }
 
-util::Date VCLXDateField::getDate() throw(css::uno::RuntimeException, std::exception)
+util::Date VCLXDateField::getDate()
 {
     SolarMutexGuard aGuard;
 
@@ -4924,7 +4915,7 @@ util::Date VCLXDateField::getDate() throw(css::uno::RuntimeException, std::excep
         return util::Date();
 }
 
-void VCLXDateField::setMin( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception)
+void VCLXDateField::setMin( const util::Date& aDate )
 {
     SolarMutexGuard aGuard;
 
@@ -4933,7 +4924,7 @@ void VCLXDateField::setMin( const util::Date& aDate ) throw(css::uno::RuntimeExc
         pDateField->SetMin( aDate );
 }
 
-util::Date VCLXDateField::getMin() throw(css::uno::RuntimeException, std::exception)
+util::Date VCLXDateField::getMin()
 {
     SolarMutexGuard aGuard;
 
@@ -4944,7 +4935,7 @@ util::Date VCLXDateField::getMin() throw(css::uno::RuntimeException, std::except
         return util::Date();
 }
 
-void VCLXDateField::setMax( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception)
+void VCLXDateField::setMax( const util::Date& aDate )
 {
     SolarMutexGuard aGuard;
 
@@ -4953,7 +4944,7 @@ void VCLXDateField::setMax( const util::Date& aDate ) throw(css::uno::RuntimeExc
         pDateField->SetMax( aDate );
 }
 
-util::Date VCLXDateField::getMax() throw(css::uno::RuntimeException, std::exception)
+util::Date VCLXDateField::getMax()
 {
     SolarMutexGuard aGuard;
 
@@ -4964,7 +4955,7 @@ util::Date VCLXDateField::getMax() throw(css::uno::RuntimeException, std::except
         return util::Date();
 }
 
-void VCLXDateField::setFirst( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception)
+void VCLXDateField::setFirst( const util::Date& aDate )
 {
     SolarMutexGuard aGuard;
 
@@ -4973,7 +4964,7 @@ void VCLXDateField::setFirst( const util::Date& aDate ) throw(css::uno::RuntimeE
         pDateField->SetFirst( aDate );
 }
 
-util::Date VCLXDateField::getFirst() throw(css::uno::RuntimeException, std::exception)
+util::Date VCLXDateField::getFirst()
 {
     SolarMutexGuard aGuard;
 
@@ -4984,7 +4975,7 @@ util::Date VCLXDateField::getFirst() throw(css::uno::RuntimeException, std::exce
         return util::Date();
 }
 
-void VCLXDateField::setLast( const util::Date& aDate ) throw(css::uno::RuntimeException, std::exception)
+void VCLXDateField::setLast( const util::Date& aDate )
 {
     SolarMutexGuard aGuard;
 
@@ -4993,7 +4984,7 @@ void VCLXDateField::setLast( const util::Date& aDate ) throw(css::uno::RuntimeEx
         pDateField->SetLast( aDate );
 }
 
-util::Date VCLXDateField::getLast() throw(css::uno::RuntimeException, std::exception)
+util::Date VCLXDateField::getLast()
 {
     SolarMutexGuard aGuard;
 
@@ -5004,7 +4995,7 @@ util::Date VCLXDateField::getLast() throw(css::uno::RuntimeException, std::excep
         return util::Date();
 }
 
-void VCLXDateField::setLongFormat( sal_Bool bLong ) throw(css::uno::RuntimeException, std::exception)
+void VCLXDateField::setLongFormat( sal_Bool bLong )
 {
     SolarMutexGuard aGuard;
 
@@ -5013,7 +5004,7 @@ void VCLXDateField::setLongFormat( sal_Bool bLong ) throw(css::uno::RuntimeExcep
         pDateField->SetLongFormat( bLong );
 }
 
-sal_Bool VCLXDateField::isLongFormat() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXDateField::isLongFormat()
 {
     SolarMutexGuard aGuard;
 
@@ -5021,7 +5012,7 @@ sal_Bool VCLXDateField::isLongFormat() throw(css::uno::RuntimeException, std::ex
     return pDateField && pDateField->IsLongFormat();
 }
 
-void VCLXDateField::setEmpty() throw(css::uno::RuntimeException, std::exception)
+void VCLXDateField::setEmpty()
 {
     SolarMutexGuard aGuard;
 
@@ -5038,7 +5029,7 @@ void VCLXDateField::setEmpty() throw(css::uno::RuntimeException, std::exception)
     }
 }
 
-sal_Bool VCLXDateField::isEmpty() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXDateField::isEmpty()
 {
     SolarMutexGuard aGuard;
 
@@ -5046,12 +5037,12 @@ sal_Bool VCLXDateField::isEmpty() throw(css::uno::RuntimeException, std::excepti
     return pDateField && pDateField->IsEmptyDate();
 }
 
-void VCLXDateField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
+void VCLXDateField::setStrictFormat( sal_Bool bStrict )
 {
     VCLXFormattedSpinField::setStrictFormat( bStrict );
 }
 
-sal_Bool VCLXDateField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXDateField::isStrictFormat()
 {
     return VCLXFormattedSpinField::isStrictFormat();
 }
@@ -5115,7 +5106,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXTimeField::Cre
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXTimeField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXTimeField::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XTimeField* >(this)) );
@@ -5128,7 +5119,7 @@ IMPL_XTYPEPROVIDER_START( VCLXTimeField )
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void VCLXTimeField::setTime( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTimeField::setTime( const util::Time& aTime )
 {
     SolarMutexGuard aGuard;
 
@@ -5145,7 +5136,7 @@ void VCLXTimeField::setTime( const util::Time& aTime ) throw(css::uno::RuntimeEx
     }
 }
 
-util::Time VCLXTimeField::getTime() throw(css::uno::RuntimeException, std::exception)
+util::Time VCLXTimeField::getTime()
 {
     SolarMutexGuard aGuard;
 
@@ -5156,7 +5147,7 @@ util::Time VCLXTimeField::getTime() throw(css::uno::RuntimeException, std::excep
         return util::Time();
 }
 
-void VCLXTimeField::setMin( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTimeField::setMin( const util::Time& aTime )
 {
     SolarMutexGuard aGuard;
 
@@ -5165,7 +5156,7 @@ void VCLXTimeField::setMin( const util::Time& aTime ) throw(css::uno::RuntimeExc
         pTimeField->SetMin( aTime );
 }
 
-util::Time VCLXTimeField::getMin() throw(css::uno::RuntimeException, std::exception)
+util::Time VCLXTimeField::getMin()
 {
     SolarMutexGuard aGuard;
 
@@ -5176,7 +5167,7 @@ util::Time VCLXTimeField::getMin() throw(css::uno::RuntimeException, std::except
         return util::Time();
 }
 
-void VCLXTimeField::setMax( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTimeField::setMax( const util::Time& aTime )
 {
     SolarMutexGuard aGuard;
 
@@ -5185,7 +5176,7 @@ void VCLXTimeField::setMax( const util::Time& aTime ) throw(css::uno::RuntimeExc
         pTimeField->SetMax( aTime );
 }
 
-util::Time VCLXTimeField::getMax() throw(css::uno::RuntimeException, std::exception)
+util::Time VCLXTimeField::getMax()
 {
     SolarMutexGuard aGuard;
 
@@ -5196,7 +5187,7 @@ util::Time VCLXTimeField::getMax() throw(css::uno::RuntimeException, std::except
         return util::Time();
 }
 
-void VCLXTimeField::setFirst( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTimeField::setFirst( const util::Time& aTime )
 {
     SolarMutexGuard aGuard;
 
@@ -5205,7 +5196,7 @@ void VCLXTimeField::setFirst( const util::Time& aTime ) throw(css::uno::RuntimeE
         pTimeField->SetFirst( aTime );
 }
 
-util::Time VCLXTimeField::getFirst() throw(css::uno::RuntimeException, std::exception)
+util::Time VCLXTimeField::getFirst()
 {
     SolarMutexGuard aGuard;
 
@@ -5216,7 +5207,7 @@ util::Time VCLXTimeField::getFirst() throw(css::uno::RuntimeException, std::exce
         return util::Time();
 }
 
-void VCLXTimeField::setLast( const util::Time& aTime ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTimeField::setLast( const util::Time& aTime )
 {
     SolarMutexGuard aGuard;
 
@@ -5225,7 +5216,7 @@ void VCLXTimeField::setLast( const util::Time& aTime ) throw(css::uno::RuntimeEx
         pTimeField->SetLast( aTime );
 }
 
-util::Time VCLXTimeField::getLast() throw(css::uno::RuntimeException, std::exception)
+util::Time VCLXTimeField::getLast()
 {
     SolarMutexGuard aGuard;
 
@@ -5236,7 +5227,7 @@ util::Time VCLXTimeField::getLast() throw(css::uno::RuntimeException, std::excep
         return util::Time();
 }
 
-void VCLXTimeField::setEmpty() throw(css::uno::RuntimeException, std::exception)
+void VCLXTimeField::setEmpty()
 {
     SolarMutexGuard aGuard;
 
@@ -5245,7 +5236,7 @@ void VCLXTimeField::setEmpty() throw(css::uno::RuntimeException, std::exception)
         pTimeField->SetEmptyTime();
 }
 
-sal_Bool VCLXTimeField::isEmpty() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXTimeField::isEmpty()
 {
     SolarMutexGuard aGuard;
 
@@ -5253,18 +5244,18 @@ sal_Bool VCLXTimeField::isEmpty() throw(css::uno::RuntimeException, std::excepti
     return pTimeField && pTimeField->IsEmptyTime();
 }
 
-void VCLXTimeField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
+void VCLXTimeField::setStrictFormat( sal_Bool bStrict )
 {
     VCLXFormattedSpinField::setStrictFormat( bStrict );
 }
 
-sal_Bool VCLXTimeField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXTimeField::isStrictFormat()
 {
     return VCLXFormattedSpinField::isStrictFormat();
 }
 
 
-void VCLXTimeField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXTimeField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -5326,7 +5317,7 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const css::uno::A
     }
 }
 
-css::uno::Any VCLXTimeField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXTimeField::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -5414,7 +5405,7 @@ VCLXNumericField::~VCLXNumericField()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXNumericField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXNumericField::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XNumericField* >(this)) );
@@ -5427,7 +5418,7 @@ IMPL_XTYPEPROVIDER_START( VCLXNumericField )
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void VCLXNumericField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXNumericField::setValue( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -5452,7 +5443,7 @@ void VCLXNumericField::setValue( double Value ) throw(css::uno::RuntimeException
     }
 }
 
-double VCLXNumericField::getValue() throw(css::uno::RuntimeException, std::exception)
+double VCLXNumericField::getValue()
 {
     SolarMutexGuard aGuard;
 
@@ -5462,7 +5453,7 @@ double VCLXNumericField::getValue() throw(css::uno::RuntimeException, std::excep
         : 0;
 }
 
-void VCLXNumericField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXNumericField::setMin( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -5472,7 +5463,7 @@ void VCLXNumericField::setMin( double Value ) throw(css::uno::RuntimeException,
             (long)ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() ) );
 }
 
-double VCLXNumericField::getMin() throw(css::uno::RuntimeException, std::exception)
+double VCLXNumericField::getMin()
 {
     SolarMutexGuard aGuard;
 
@@ -5482,7 +5473,7 @@ double VCLXNumericField::getMin() throw(css::uno::RuntimeException, std::excepti
         : 0;
 }
 
-void VCLXNumericField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXNumericField::setMax( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -5492,7 +5483,7 @@ void VCLXNumericField::setMax( double Value ) throw(css::uno::RuntimeException,
             (long)ImplCalcLongValue( Value, pNumericFormatter->GetDecimalDigits() ) );
 }
 
-double VCLXNumericField::getMax() throw(css::uno::RuntimeException, std::exception)
+double VCLXNumericField::getMax()
 {
     SolarMutexGuard aGuard;
 
@@ -5502,7 +5493,7 @@ double VCLXNumericField::getMax() throw(css::uno::RuntimeException, std::excepti
         : 0;
 }
 
-void VCLXNumericField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXNumericField::setFirst( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -5512,7 +5503,7 @@ void VCLXNumericField::setFirst( double Value ) throw(css::uno::RuntimeException
             (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) );
 }
 
-double VCLXNumericField::getFirst() throw(css::uno::RuntimeException, std::exception)
+double VCLXNumericField::getFirst()
 {
     SolarMutexGuard aGuard;
 
@@ -5522,7 +5513,7 @@ double VCLXNumericField::getFirst() throw(css::uno::RuntimeException, std::excep
         : 0;
 }
 
-void VCLXNumericField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXNumericField::setLast( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -5532,7 +5523,7 @@ void VCLXNumericField::setLast( double Value ) throw(css::uno::RuntimeException,
             (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) );
 }
 
-double VCLXNumericField::getLast() throw(css::uno::RuntimeException, std::exception)
+double VCLXNumericField::getLast()
 {
     SolarMutexGuard aGuard;
 
@@ -5542,18 +5533,18 @@ double VCLXNumericField::getLast() throw(css::uno::RuntimeException, std::except
         : 0;
 }
 
-void VCLXNumericField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
+void VCLXNumericField::setStrictFormat( sal_Bool bStrict )
 {
     VCLXFormattedSpinField::setStrictFormat( bStrict );
 }
 
-sal_Bool VCLXNumericField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXNumericField::isStrictFormat()
 {
     return VCLXFormattedSpinField::isStrictFormat();
 }
 
 
-void VCLXNumericField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXNumericField::setSpinSize( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -5563,7 +5554,7 @@ void VCLXNumericField::setSpinSize( double Value ) throw(css::uno::RuntimeExcept
             (long)ImplCalcLongValue( Value, pNumericField->GetDecimalDigits() ) );
 }
 
-double VCLXNumericField::getSpinSize() throw(css::uno::RuntimeException, std::exception)
+double VCLXNumericField::getSpinSize()
 {
     SolarMutexGuard aGuard;
 
@@ -5573,7 +5564,7 @@ double VCLXNumericField::getSpinSize() throw(css::uno::RuntimeException, std::ex
         : 0;
 }
 
-void VCLXNumericField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXNumericField::setDecimalDigits( sal_Int16 Value )
 {
     SolarMutexGuard aGuard;
 
@@ -5586,7 +5577,7 @@ void VCLXNumericField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::Runti
        }
 }
 
-sal_Int16 VCLXNumericField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXNumericField::getDecimalDigits()
 {
     SolarMutexGuard aGuard;
 
@@ -5594,7 +5585,7 @@ sal_Int16 VCLXNumericField::getDecimalDigits() throw(css::uno::RuntimeException,
     return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0;
 }
 
-void VCLXNumericField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXNumericField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -5663,7 +5654,7 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const css::uno
     }
 }
 
-css::uno::Any VCLXNumericField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXNumericField::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -5754,7 +5745,7 @@ VCLXMetricField::~VCLXMetricField()
 {
 }
 
-MetricFormatter *VCLXMetricField::GetMetricFormatter() throw(css::uno::RuntimeException)
+MetricFormatter *VCLXMetricField::GetMetricFormatter()
 {
     MetricFormatter *pFormatter = static_cast<MetricFormatter *>(GetFormatter());
     if (!pFormatter)
@@ -5762,7 +5753,7 @@ MetricFormatter *VCLXMetricField::GetMetricFormatter() throw(css::uno::RuntimeEx
     return pFormatter;
 }
 
-MetricField *VCLXMetricField::GetMetricField() throw(css::uno::RuntimeException)
+MetricField *VCLXMetricField::GetMetricField()
 {
     VclPtr< MetricField > pField = GetAs< MetricField >();
     if (!pField)
@@ -5771,7 +5762,7 @@ MetricField *VCLXMetricField::GetMetricField() throw(css::uno::RuntimeException)
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXMetricField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXMetricField::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                                               (static_cast< css::awt::XMetricField* >(this)) );
@@ -5788,12 +5779,12 @@ IMPL_XTYPEPROVIDER_END
 #define MetricUnitUnoToVcl(a) ((FieldUnit)(a))
 
 #define METRIC_MAP_PAIR(method,parent) \
-    sal_Int64 VCLXMetricField::get##method( sal_Int16 nUnit ) throw (css::uno::RuntimeException, std::exception) \
+    sal_Int64 VCLXMetricField::get##method( sal_Int16 nUnit ) \
     { \
         SolarMutexGuard aGuard; \
         return GetMetric##parent()->Get##method( MetricUnitUnoToVcl( nUnit ) ); \
     } \
-    void VCLXMetricField::set##method( sal_Int64 nValue, sal_Int16 nUnit ) throw (css::uno::RuntimeException, std::exception) \
+    void VCLXMetricField::set##method( sal_Int64 nValue, sal_Int16 nUnit ) \
     { \
         SolarMutexGuard aGuard; \
         GetMetric##parent()->Set##method( nValue, MetricUnitUnoToVcl( nUnit ) ); \
@@ -5806,13 +5797,13 @@ METRIC_MAP_PAIR(Last,  Field)
 
 #undef METRIC_MAP_PAIR
 
-::sal_Int64 VCLXMetricField::getValue( ::sal_Int16 nUnit ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int64 VCLXMetricField::getValue( ::sal_Int16 nUnit )
 {
     SolarMutexGuard aGuard;
     return GetMetricFormatter()->GetValue( MetricUnitUnoToVcl( nUnit ) );
 }
 
-::sal_Int64 VCLXMetricField::getCorrectedValue( ::sal_Int16 nUnit ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int64 VCLXMetricField::getCorrectedValue( ::sal_Int16 nUnit )
 {
     SolarMutexGuard aGuard;
     return GetMetricFormatter()->GetCorrectedValue( MetricUnitUnoToVcl( nUnit ) );
@@ -5832,49 +5823,49 @@ void VCLXMetricField::CallListeners()
     }
 }
 
-void VCLXMetricField::setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception)
+void VCLXMetricField::setValue( ::sal_Int64 Value, ::sal_Int16 Unit )
 {
     SolarMutexGuard aGuard;
     GetMetricFormatter()->SetValue( Value, MetricUnitUnoToVcl( Unit ) );
     CallListeners();
 }
 
-void VCLXMetricField::setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (css::uno::RuntimeException, std::exception)
+void VCLXMetricField::setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit )
 {
     SolarMutexGuard aGuard;
     GetMetricFormatter()->SetUserValue( Value, MetricUnitUnoToVcl( Unit ) );
     CallListeners();
 }
 
-void VCLXMetricField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMetricField::setStrictFormat( sal_Bool bStrict )
 {
     VCLXFormattedSpinField::setStrictFormat( bStrict );
 }
 
-sal_Bool VCLXMetricField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXMetricField::isStrictFormat()
 {
     return VCLXFormattedSpinField::isStrictFormat();
 }
 
-void VCLXMetricField::setSpinSize( sal_Int64 Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMetricField::setSpinSize( sal_Int64 Value )
 {
     SolarMutexGuard aGuard;
     GetMetricField()->SetSpinSize( Value );
 }
 
-sal_Int64 VCLXMetricField::getSpinSize() throw(css::uno::RuntimeException, std::exception)
+sal_Int64 VCLXMetricField::getSpinSize()
 {
     SolarMutexGuard aGuard;
     return GetMetricField()->GetSpinSize();
 }
 
-void VCLXMetricField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXMetricField::setDecimalDigits( sal_Int16 Value )
 {
     SolarMutexGuard aGuard;
     GetMetricFormatter()->SetDecimalDigits( Value );
 }
 
-sal_Int16 VCLXMetricField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXMetricField::getDecimalDigits()
 {
     SolarMutexGuard aGuard;
 
@@ -5882,7 +5873,7 @@ sal_Int16 VCLXMetricField::getDecimalDigits() throw(css::uno::RuntimeException,
     return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0;
 }
 
-void VCLXMetricField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXMetricField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -5928,7 +5919,7 @@ void VCLXMetricField::setProperty( const OUString& PropertyName, const css::uno:
     }
 }
 
-css::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -6009,7 +6000,7 @@ VCLXCurrencyField::~VCLXCurrencyField()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXCurrencyField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXCurrencyField::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XCurrencyField* >(this)) );
@@ -6022,7 +6013,7 @@ IMPL_XTYPEPROVIDER_START( VCLXCurrencyField )
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void VCLXCurrencyField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCurrencyField::setValue( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -6047,7 +6038,7 @@ void VCLXCurrencyField::setValue( double Value ) throw(css::uno::RuntimeExceptio
     }
 }
 
-double VCLXCurrencyField::getValue() throw(css::uno::RuntimeException, std::exception)
+double VCLXCurrencyField::getValue()
 {
     SolarMutexGuard aGuard;
 
@@ -6057,7 +6048,7 @@ double VCLXCurrencyField::getValue() throw(css::uno::RuntimeException, std::exce
         : 0;
 }
 
-void VCLXCurrencyField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCurrencyField::setMin( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -6067,7 +6058,7 @@ void VCLXCurrencyField::setMin( double Value ) throw(css::uno::RuntimeException,
             ImplCalcLongValue( Value, pCurrencyFormatter->GetDecimalDigits() ) );
 }
 
-double VCLXCurrencyField::getMin() throw(css::uno::RuntimeException, std::exception)
+double VCLXCurrencyField::getMin()
 {
     SolarMutexGuard aGuard;
 
@@ -6077,7 +6068,7 @@ double VCLXCurrencyField::getMin() throw(css::uno::RuntimeException, std::except
         : 0;
 }
 
-void VCLXCurrencyField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCurrencyField::setMax( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -6087,7 +6078,7 @@ void VCLXCurrencyField::setMax( double Value ) throw(css::uno::RuntimeException,
             ImplCalcLongValue( Value, pCurrencyFormatter->GetDecimalDigits() ) );
 }
 
-double VCLXCurrencyField::getMax() throw(css::uno::RuntimeException, std::exception)
+double VCLXCurrencyField::getMax()
 {
     SolarMutexGuard aGuard;
 
@@ -6097,7 +6088,7 @@ double VCLXCurrencyField::getMax() throw(css::uno::RuntimeException, std::except
         : 0;
 }
 
-void VCLXCurrencyField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCurrencyField::setFirst( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -6107,7 +6098,7 @@ void VCLXCurrencyField::setFirst( double Value ) throw(css::uno::RuntimeExceptio
             ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) );
 }
 
-double VCLXCurrencyField::getFirst() throw(css::uno::RuntimeException, std::exception)
+double VCLXCurrencyField::getFirst()
 {
     SolarMutexGuard aGuard;
 
@@ -6117,7 +6108,7 @@ double VCLXCurrencyField::getFirst() throw(css::uno::RuntimeException, std::exce
         : 0;
 }
 
-void VCLXCurrencyField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCurrencyField::setLast( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -6127,7 +6118,7 @@ void VCLXCurrencyField::setLast( double Value ) throw(css::uno::RuntimeException
             ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) );
 }
 
-double VCLXCurrencyField::getLast() throw(css::uno::RuntimeException, std::exception)
+double VCLXCurrencyField::getLast()
 {
     SolarMutexGuard aGuard;
 
@@ -6137,7 +6128,7 @@ double VCLXCurrencyField::getLast() throw(css::uno::RuntimeException, std::excep
         : 0;
 }
 
-void VCLXCurrencyField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCurrencyField::setSpinSize( double Value )
 {
     SolarMutexGuard aGuard;
 
@@ -6147,7 +6138,7 @@ void VCLXCurrencyField::setSpinSize( double Value ) throw(css::uno::RuntimeExcep
             ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) );
 }
 
-double VCLXCurrencyField::getSpinSize() throw(css::uno::RuntimeException, std::exception)
+double VCLXCurrencyField::getSpinSize()
 {
     SolarMutexGuard aGuard;
 
@@ -6157,18 +6148,18 @@ double VCLXCurrencyField::getSpinSize() throw(css::uno::RuntimeException, std::e
         : 0;
 }
 
-void VCLXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCurrencyField::setStrictFormat( sal_Bool bStrict )
 {
     VCLXFormattedSpinField::setStrictFormat( bStrict );
 }
 
-sal_Bool VCLXCurrencyField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXCurrencyField::isStrictFormat()
 {
     return VCLXFormattedSpinField::isStrictFormat();
 }
 
 
-void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception)
+void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value )
 {
     SolarMutexGuard aGuard;
 
@@ -6181,7 +6172,7 @@ void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::Runt
        }
 }
 
-sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception)
+sal_Int16 VCLXCurrencyField::getDecimalDigits()
 {
     SolarMutexGuard aGuard;
 
@@ -6189,7 +6180,7 @@ sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(css::uno::RuntimeException
     return pCurrencyFormatter ? pCurrencyFormatter->GetDecimalDigits() : 0;
 }
 
-void VCLXCurrencyField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXCurrencyField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -6265,7 +6256,7 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const css::un
     }
 }
 
-css::uno::Any VCLXCurrencyField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXCurrencyField::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -6358,7 +6349,7 @@ VCLXPatternField::~VCLXPatternField()
 }
 
 // css::uno::XInterface
-css::uno::Any VCLXPatternField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXPatternField::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XPatternField* >(this)) );
@@ -6371,7 +6362,7 @@ IMPL_XTYPEPROVIDER_START( VCLXPatternField )
     VCLXFormattedSpinField::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void VCLXPatternField::setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception)
+void VCLXPatternField::setMasks( const OUString& EditMask, const OUString& LiteralMask )
 {
     SolarMutexGuard aGuard;
 
@@ -6382,7 +6373,7 @@ void VCLXPatternField::setMasks( const OUString& EditMask, const OUString& Liter
     }
 }
 
-void VCLXPatternField::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(css::uno::RuntimeException, std::exception)
+void VCLXPatternField::getMasks( OUString& EditMask, OUString& LiteralMask )
 {
     SolarMutexGuard aGuard;
 
@@ -6394,7 +6385,7 @@ void VCLXPatternField::getMasks( OUString& EditMask, OUString& LiteralMask ) thr
     }
 }
 
-void VCLXPatternField::setString( const OUString& Str ) throw(css::uno::RuntimeException, std::exception)
+void VCLXPatternField::setString( const OUString& Str )
 {
     SolarMutexGuard aGuard;
     VclPtr< PatternField > pPatternField = GetAs< PatternField >();
@@ -6402,7 +6393,7 @@ void VCLXPatternField::setString( const OUString& Str ) throw(css::uno::RuntimeE
         pPatternField->SetString( Str );
 }
 
-OUString VCLXPatternField::getString() throw(css::uno::RuntimeException, std::exception)
+OUString VCLXPatternField::getString()
 {
     SolarMutexGuard aGuard;
 
@@ -6413,17 +6404,17 @@ OUString VCLXPatternField::getString() throw(css::uno::RuntimeException, std::ex
     return aString;
 }
 
-void VCLXPatternField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception)
+void VCLXPatternField::setStrictFormat( sal_Bool bStrict )
 {
     VCLXFormattedSpinField::setStrictFormat( bStrict );
 }
 
-sal_Bool VCLXPatternField::isStrictFormat() throw(css::uno::RuntimeException, std::exception)
+sal_Bool VCLXPatternField::isStrictFormat()
 {
     return VCLXFormattedSpinField::isStrictFormat();
 }
 
-void VCLXPatternField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception)
+void VCLXPatternField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
     SolarMutexGuard aGuard;
 
@@ -6456,7 +6447,7 @@ void VCLXPatternField::setProperty( const OUString& PropertyName, const css::uno
     }
 }
 
-css::uno::Any VCLXPatternField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any VCLXPatternField::getProperty( const OUString& PropertyName )
 {
     SolarMutexGuard aGuard;
 
@@ -6537,7 +6528,6 @@ IMPL_XTYPEPROVIDER_END
 
 // css::awt::XView
 void SAL_CALL VCLXFrame::draw( sal_Int32 nX, sal_Int32 nY )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     VclPtr< vcl::Window > pWindow = GetWindow();
@@ -6557,7 +6547,6 @@ throw(css::uno::RuntimeException, std::exception)
 
 // css::awt::XDevice,
 css::awt::DeviceInfo SAL_CALL VCLXFrame::getInfo()
-throw(css::uno::RuntimeException, std::exception)
 {
     css::awt::DeviceInfo aInfo = VCLXDevice::getInfo();
     return aInfo;
@@ -6566,7 +6555,6 @@ throw(css::uno::RuntimeException, std::exception)
 void SAL_CALL VCLXFrame::setProperty(
     const OUString& PropertyName,
     const css::uno::Any& Value )
-throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 33e99cebdd3e..9be20827f287 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -118,21 +118,21 @@ namespace toolkit
     }
 
 
-    sal_Int32 SAL_CALL OAccessibleControlContext::getAccessibleChildCount(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OAccessibleControlContext::getAccessibleChildCount(  )
     {
         // we do not have children
         return 0;
     }
 
 
-    Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 )
     {
         // we do not have children
         throw IndexOutOfBoundsException();
     }
 
 
-    Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleParent(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleParent(  )
     {
         OContextEntryGuard aGuard( this );
         OSL_ENSURE( implGetForeignControlledParent().is(), "OAccessibleControlContext::getAccessibleParent: somebody forgot to set a parent!" );
@@ -142,33 +142,33 @@ namespace toolkit
     }
 
 
-    sal_Int16 SAL_CALL OAccessibleControlContext::getAccessibleRole(  ) throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL OAccessibleControlContext::getAccessibleRole(  )
     {
         return AccessibleRole::SHAPE;
     }
 
 
-    OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription(  )
     {
         OContextEntryGuard aGuard( this );
         return getModelStringProperty( "HelpText" );
     }
 
 
-    OUString SAL_CALL OAccessibleControlContext::getAccessibleName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL OAccessibleControlContext::getAccessibleName(  )
     {
         OContextEntryGuard aGuard( this );
         return getModelStringProperty( "Name" );
     }
 
 
-    Reference< XAccessibleRelationSet > SAL_CALL OAccessibleControlContext::getAccessibleRelationSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleRelationSet > SAL_CALL OAccessibleControlContext::getAccessibleRelationSet(  )
     {
         return nullptr;
     }
 
 
-    Reference< XAccessibleStateSet > SAL_CALL OAccessibleControlContext::getAccessibleStateSet(  ) throw (RuntimeException, std::exception)
+    Reference< XAccessibleStateSet > SAL_CALL OAccessibleControlContext::getAccessibleStateSet(  )
     {
         ::osl::MutexGuard aGuard( GetMutex() );
             // no OContextEntryGuard here, as we do not want to throw an exception in case we're not alive anymore
@@ -188,7 +188,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL OAccessibleControlContext::disposing( const EventObject& _rSource ) throw ( RuntimeException, std::exception )
+    void SAL_CALL OAccessibleControlContext::disposing( const EventObject& _rSource )
     {
         OSL_ENSURE( Reference< XPropertySet >( _rSource.Source, UNO_QUERY ).get() == m_xControlModel.get(),
             "OAccessibleControlContext::disposing: where did this come from?" );
@@ -237,7 +237,7 @@ namespace toolkit
     }
 
 
-    awt::Rectangle OAccessibleControlContext::implGetBounds(  ) throw (RuntimeException)
+    awt::Rectangle OAccessibleControlContext::implGetBounds(  )
     {
         SolarMutexGuard aSolarGuard;
             // want to do some VCL stuff here ...
@@ -297,20 +297,20 @@ namespace toolkit
     }
 
 
-    Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleAtPoint( const awt::Point& /* _rPoint */ ) throw (RuntimeException, std::exception)
+    Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleAtPoint( const awt::Point& /* _rPoint */ )
     {
         // no children at all
         return nullptr;
     }
 
 
-    void SAL_CALL OAccessibleControlContext::grabFocus(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL OAccessibleControlContext::grabFocus(  )
     {
         OSL_FAIL( "OAccessibleControlContext::grabFocus: !isFocusTraversable, but grabFocus!" );
     }
 
 
-    sal_Int32 SAL_CALL OAccessibleControlContext::getForeground(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OAccessibleControlContext::getForeground(  )
     {
         SolarMutexGuard aSolarGuard;
             // want to do some VCL stuff here ...
@@ -336,7 +336,7 @@ namespace toolkit
     }
 
 
-    sal_Int32 SAL_CALL OAccessibleControlContext::getBackground(  ) throw (css::uno::RuntimeException, std::exception)
+    sal_Int32 SAL_CALL OAccessibleControlContext::getBackground(  )
     {
         SolarMutexGuard aSolarGuard;
             // want to do some VCL stuff here ...
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 3a461083fa79..f50761cae167 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -57,26 +57,26 @@ public:
     OUString GetComponentServiceName() override;
 
     // XAnimation
-    virtual void SAL_CALL startAnimation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stopAnimation(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAnimationRunning(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startAnimation(  ) override;
+    virtual void SAL_CALL stopAnimation(  ) override;
+    virtual sal_Bool SAL_CALL isAnimationRunning(  ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XControl
-    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& i_rModel ) throw ( css::uno::RuntimeException, std::exception ) override;
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& i_toolkit, const css::uno::Reference< css::awt::XWindowPeer >& i_parentPeer ) throw(css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& i_rModel ) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& i_toolkit, const css::uno::Reference< css::awt::XWindowPeer >& i_parentPeer ) override;
 
 
     // XContainerListener
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) override;
 };
 
     AnimatedImagesControl::AnimatedImagesControl()
@@ -91,7 +91,7 @@ public:
     }
 
 
-    void SAL_CALL AnimatedImagesControl::startAnimation(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControl::startAnimation(  )
     {
         Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY );
         if ( xAnimation.is() )
@@ -99,7 +99,7 @@ public:
     }
 
 
-    void SAL_CALL AnimatedImagesControl::stopAnimation(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControl::stopAnimation(  )
     {
         Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY );
         if ( xAnimation.is() )
@@ -107,7 +107,7 @@ public:
     }
 
 
-    sal_Bool SAL_CALL AnimatedImagesControl::isAnimationRunning(  ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AnimatedImagesControl::isAnimationRunning(  )
     {
         Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY );
         if ( xAnimation.is() )
@@ -116,13 +116,13 @@ public:
     }
 
 
-    OUString SAL_CALL AnimatedImagesControl::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL AnimatedImagesControl::getImplementationName(  )
     {
         return OUString( "org.openoffice.comp.toolkit.AnimatedImagesControl" );
     }
 
 
-    Sequence< OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames()
     {
         Sequence< OUString > aServices( AnimatedImagesControl_Base::getSupportedServiceNames() );
         aServices.realloc( aServices.getLength() + 1 );
@@ -146,7 +146,7 @@ public:
     }
 
 
-    sal_Bool SAL_CALL AnimatedImagesControl::setModel( const Reference< XControlModel >& i_rModel ) throw ( RuntimeException, std::exception )
+    sal_Bool SAL_CALL AnimatedImagesControl::setModel( const Reference< XControlModel >& i_rModel )
     {
         const Reference< XAnimatedImages > xOldContainer( getModel(), UNO_QUERY );
         const Reference< XAnimatedImages > xNewContainer( i_rModel, UNO_QUERY );
@@ -166,7 +166,7 @@ public:
     }
 
 
-    void SAL_CALL AnimatedImagesControl::createPeer( const Reference< XToolkit >& i_toolkit, const Reference< XWindowPeer >& i_parentPeer ) throw(RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControl::createPeer( const Reference< XToolkit >& i_toolkit, const Reference< XWindowPeer >& i_parentPeer )
     {
         AnimatedImagesControl_Base::createPeer( i_toolkit, i_parentPeer );
 
@@ -174,7 +174,7 @@ public:
     }
 
 
-    void SAL_CALL AnimatedImagesControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControl::elementInserted( const ContainerEvent& i_event )
     {
         const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY );
         if ( xPeerListener.is() )
@@ -182,7 +182,7 @@ public:
     }
 
 
-    void SAL_CALL AnimatedImagesControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControl::elementRemoved( const ContainerEvent& i_event )
     {
         const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY );
         if ( xPeerListener.is() )
@@ -190,7 +190,7 @@ public:
     }
 
 
-    void SAL_CALL AnimatedImagesControl::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControl::elementReplaced( const ContainerEvent& i_event )
     {
         const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY );
         if ( xPeerListener.is() )
@@ -198,7 +198,7 @@ public:
     }
 
 
-    void SAL_CALL AnimatedImagesControl::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControl::disposing( const EventObject& i_event )
     {
         UnoControlBase::disposing( i_event );
     }
@@ -275,26 +275,26 @@ namespace toolkit {
     }
 
 
-    Reference< css::beans::XPropertySetInfo > SAL_CALL AnimatedImagesControlModel::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< css::beans::XPropertySetInfo > SAL_CALL AnimatedImagesControlModel::getPropertySetInfo(  )
     {
         static Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
 
-    OUString SAL_CALL AnimatedImagesControlModel::getServiceName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL AnimatedImagesControlModel::getServiceName()
     {
         return OUString("com.sun.star.awt.AnimatedImagesControlModel");
     }
 
 
-    OUString SAL_CALL AnimatedImagesControlModel::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL AnimatedImagesControlModel::getImplementationName(  )
     {
         return OUString("org.openoffice.comp.toolkit.AnimatedImagesControlModel");
     }
 
 
-    Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames()
     {
         Sequence< OUString > aServiceNames(2);
         aServiceNames[0] = "com.sun.star.awt.AnimatedImagesControlModel";
@@ -303,7 +303,7 @@ namespace toolkit {
     }
 
 
-    void SAL_CALL AnimatedImagesControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 i_handle, const Any& i_value ) throw (Exception, std::exception)
+    void SAL_CALL AnimatedImagesControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 i_handle, const Any& i_value )
     {
         switch ( i_handle )
         {
@@ -361,7 +361,7 @@ namespace toolkit {
     }
 
 
-    ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getStepTime() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getStepTime()
     {
         sal_Int32 nStepTime( 100 );
         OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_STEP_TIME ) ) >>= nStepTime );
@@ -369,13 +369,13 @@ namespace toolkit {
     }
 
 
-    void SAL_CALL AnimatedImagesControlModel::setStepTime( ::sal_Int32 i_stepTime ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControlModel::setStepTime( ::sal_Int32 i_stepTime )
     {
         setPropertyValue( GetPropertyName( BASEPROPERTY_STEP_TIME ), makeAny( i_stepTime ) );
     }
 
 
-    sal_Bool SAL_CALL AnimatedImagesControlModel::getAutoRepeat() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL AnimatedImagesControlModel::getAutoRepeat()
     {
         bool bAutoRepeat( true );
         OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_AUTO_REPEAT ) ) >>= bAutoRepeat );
@@ -383,13 +383,13 @@ namespace toolkit {
     }
 
 
-    void SAL_CALL AnimatedImagesControlModel::setAutoRepeat( sal_Bool i_autoRepeat ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControlModel::setAutoRepeat( sal_Bool i_autoRepeat )
     {
         setPropertyValue( GetPropertyName( BASEPROPERTY_AUTO_REPEAT ), makeAny( i_autoRepeat ) );
     }
 
 
-    ::sal_Int16 SAL_CALL AnimatedImagesControlModel::getScaleMode() throw (RuntimeException, std::exception)
+    ::sal_Int16 SAL_CALL AnimatedImagesControlModel::getScaleMode()
     {
         sal_Int16 nImageScaleMode( ImageScaleMode::ANISOTROPIC );
         OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ) ) >>= nImageScaleMode );
@@ -397,13 +397,13 @@ namespace toolkit {
     }
 
 
-    void SAL_CALL AnimatedImagesControlModel::setScaleMode( ::sal_Int16 i_scaleMode ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControlModel::setScaleMode( ::sal_Int16 i_scaleMode )
     {
         setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ), makeAny( i_scaleMode ) );
     }
 
 
-    ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getImageSetCount(  ) throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getImageSetCount(  )
     {
         ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
         if ( GetBroadcastHelper().bDisposed || GetBroadcastHelper().bInDispose )
@@ -413,7 +413,7 @@ namespace toolkit {
     }
 
 
-    Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index )
     {
         ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
         if ( GetBroadcastHelper().bDisposed || GetBroadcastHelper().bInDispose )
@@ -425,7 +425,7 @@ namespace toolkit {
     }
 
 
-    void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs )
     {
         ::osl::ClearableMutexGuard aGuard( GetMutex() );
         // sanity checks
@@ -442,7 +442,7 @@ namespace toolkit {
     }
 
 
-    void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs )
     {
         ::osl::ClearableMutexGuard aGuard( GetMutex() );
         // sanity checks
@@ -459,7 +459,7 @@ namespace toolkit {
     }
 
 
-    void SAL_CALL AnimatedImagesControlModel::removeImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControlModel::removeImageSet( ::sal_Int32 i_index )
     {
         ::osl::ClearableMutexGuard aGuard( GetMutex() );
         // sanity checks
@@ -478,13 +478,13 @@ namespace toolkit {
     }
 
 
-    void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener )
     {
         BrdcstHelper.addListener( cppu::UnoType<XContainerListener>::get(), i_listener );
     }
 
 
-    void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener )
     {
         BrdcstHelper.removeListener( cppu::UnoType<XContainerListener>::get(), i_listener );
     }
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 1294f41cef3f..5f88ae38faae 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -258,7 +258,7 @@ Any ControlModelContainerBase::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     return *pHelper;
 }
 
-void SAL_CALL ControlModelContainerBase::dispose(  ) throw(RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::dispose(  )
 {
 
     // tell our listeners
@@ -296,7 +296,7 @@ void SAL_CALL ControlModelContainerBase::dispose(  ) throw(RuntimeException, std
 }
 
 // XMultiPropertySet
-Reference< XPropertySetInfo > ControlModelContainerBase::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > ControlModelContainerBase::getPropertySetInfo(  )
 {
     static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -324,7 +324,7 @@ ControlModelContainerBase::UnoControlModelHolderList::iterator ControlModelConta
 }
 
 // ::XMultiServiceFactory
-Reference< XInterface > ControlModelContainerBase::createInstance( const OUString& aServiceSpecifier ) throw(Exception, RuntimeException, std::exception)
+Reference< XInterface > ControlModelContainerBase::createInstance( const OUString& aServiceSpecifier )
 {
     SolarMutexGuard aGuard;
 
@@ -411,7 +411,7 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const OUStrin
     return xNewModel;
 }
 
-Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& i_arguments ) throw(Exception, RuntimeException, std::exception)
+Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& i_arguments )
 {
     const Reference< XInterface > xInstance( createInstance( ServiceSpecifier ) );
     const Reference< XInitialization > xInstanceInit( xInstance, UNO_QUERY );
@@ -420,7 +420,7 @@ Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments(
     return xInstance;
 }
 
-Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw(RuntimeException, std::exception)
+Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames()
 {
     static Sequence< OUString >* pNamesSeq = nullptr;
     if ( !pNamesSeq )
@@ -454,30 +454,30 @@ Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw
 }
 
 // XContainer
-void ControlModelContainerBase::addContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception)
+void ControlModelContainerBase::addContainerListener( const Reference< XContainerListener >& l )
 {
     maContainerListeners.addInterface( l );
 }
 
-void ControlModelContainerBase::removeContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception)
+void ControlModelContainerBase::removeContainerListener( const Reference< XContainerListener >& l )
 {
     maContainerListeners.removeInterface( l );
 }
 
 // XElementAcces
-Type ControlModelContainerBase::getElementType() throw(RuntimeException, std::exception)
+Type ControlModelContainerBase::getElementType()
 {
     Type aType = cppu::UnoType<XControlModel>::get();
     return aType;
 }
 
-sal_Bool ControlModelContainerBase::hasElements() throw(RuntimeException, std::exception)
+sal_Bool ControlModelContainerBase::hasElements()
 {
     return !maModels.empty();
 }
 
 // XNameContainer, XNameReplace, XNameAccess
-void ControlModelContainerBase::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void ControlModelContainerBase::replaceByName( const OUString& aName, const Any& aElement )
 {
     SolarMutexGuard aGuard;
 
@@ -523,7 +523,7 @@ void ControlModelContainerBase::replaceByName( const OUString& aName, const Any&
     implNotifyTabModelChange( aName );
 }
 
-Any ControlModelContainerBase::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+Any ControlModelContainerBase::getByName( const OUString& aName )
 {
     UnoControlModelHolderList::iterator aElementPos = ImplFindElement( aName );
     if ( maModels.end() == aElementPos )
@@ -532,7 +532,7 @@ Any ControlModelContainerBase::getByName( const OUString& aName ) throw(NoSuchEl
     return makeAny( aElementPos->first );
 }
 
-Sequence< OUString > ControlModelContainerBase::getElementNames() throw(RuntimeException, std::exception)
+Sequence< OUString > ControlModelContainerBase::getElementNames()
 {
     Sequence< OUString > aNames( maModels.size() );
 
@@ -546,12 +546,12 @@ Sequence< OUString > ControlModelContainerBase::getElementNames() throw(RuntimeE
     return aNames;
 }
 
-sal_Bool ControlModelContainerBase::hasByName( const OUString& aName ) throw(RuntimeException, std::exception)
+sal_Bool ControlModelContainerBase::hasByName( const OUString& aName )
 {
     return maModels.end() != ImplFindElement( aName );
 }
 
-void ControlModelContainerBase::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
+void ControlModelContainerBase::insertByName( const OUString& aName, const Any& aElement )
 {
     SolarMutexGuard aGuard;
 
@@ -614,7 +614,7 @@ void ControlModelContainerBase::insertByName( const OUString& aName, const Any&
     implNotifyTabModelChange( aName );
 }
 
-void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+void ControlModelContainerBase::removeByName( const OUString& aName )
 {
     SolarMutexGuard aGuard;
 
@@ -659,19 +659,19 @@ void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSu
 }
 
 
-sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl(  )
 {
     return true;
 }
 
 
-void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool )
 {
     SAL_WARN("toolkit", "explicit grouping not supported" );
 }
 
 
-void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Reference< XControlModel > >& _rControls ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Reference< XControlModel > >& _rControls )
 {
     SolarMutexGuard aGuard;
 
@@ -708,7 +708,7 @@ void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Refer
 typedef ::std::multimap< sal_Int32, Reference< XControlModel > > MapIndexToModel;
 
 
-Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getControlModels(  ) throw (RuntimeException, std::exception)
+Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getControlModels(  )
 {
     SolarMutexGuard aGuard;
 
@@ -757,7 +757,7 @@ Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getCo
 }
 
 
-void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const OUString& ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const OUString& )
 {
     // not supported. We have only implicit grouping:
     // We only have a sequence of control models, and we _know_ (yes, that's a HACK relying on
@@ -767,7 +767,7 @@ void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XC
 }
 
 ////----- XInitialization -------------------------------------------------------------------
-void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments)
 {
     if ( rArguments.getLength() == 1 )
     {
@@ -779,19 +779,19 @@ void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArgum
     else
         m_nTabPageId = -1;
 }
-::sal_Int16 SAL_CALL ControlModelContainerBase::getTabPageID() throw (css::uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL ControlModelContainerBase::getTabPageID()
 {
     return m_nTabPageId;
 }
-sal_Bool SAL_CALL ControlModelContainerBase::getEnabled() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ControlModelContainerBase::getEnabled()
 {
     return m_bEnabled;
 }
-void SAL_CALL ControlModelContainerBase::setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::setEnabled( sal_Bool _enabled )
 {
     m_bEnabled = _enabled;
 }
-OUString SAL_CALL ControlModelContainerBase::getTitle() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ControlModelContainerBase::getTitle()
 {
     SolarMutexGuard aGuard;
     Reference<XPropertySet> xThis(*this,UNO_QUERY);
@@ -799,25 +799,25 @@ OUString SAL_CALL ControlModelContainerBase::getTitle() throw (css::uno::Runtime
     xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle;
     return sTitle;
 }
-void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title )
 {
     SolarMutexGuard aGuard;
     Reference<XPropertySet> xThis(*this,UNO_QUERY);
     xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),makeAny(_title));
 }
-OUString SAL_CALL ControlModelContainerBase::getImageURL() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ControlModelContainerBase::getImageURL()
 {
     return m_sImageURL;
 }
-void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& _imageurl ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& _imageurl )
 {
     m_sImageURL = _imageurl;
 }
-OUString SAL_CALL ControlModelContainerBase::getToolTip() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ControlModelContainerBase::getToolTip()
 {
     return m_sTooltip;
 }
-void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip )
 {
     m_sTooltip = _tooltip;
 }
@@ -849,7 +849,7 @@ namespace
 }
 
 
-sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount(  )
 {
     SolarMutexGuard aGuard;
 
@@ -859,7 +859,7 @@ sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount(  ) throw (RuntimeEx
 }
 
 
-void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< Reference< XControlModel > >& _rGroup, OUString& _rName ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< Reference< XControlModel > >& _rGroup, OUString& _rName )
 {
     SolarMutexGuard aGuard;
 
@@ -883,7 +883,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence<
 }
 
 
-void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup )
 {
     SolarMutexGuard aGuard;
 
@@ -892,13 +892,13 @@ void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName,
 }
 
 
-void SAL_CALL ControlModelContainerBase::addChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::addChangesListener( const Reference< XChangesListener >& _rxListener )
 {
     maChangeListeners.addInterface( _rxListener );
 }
 
 
-void SAL_CALL ControlModelContainerBase::removeChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::removeChangesListener( const Reference< XChangesListener >& _rxListener )
 {
     maChangeListeners.removeInterface( _rxListener );
 }
@@ -1028,7 +1028,7 @@ void ControlModelContainerBase::implUpdateGroupStructure()
 }
 
 
-void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEvent& _rEvent )
 {
     SolarMutexGuard aGuard;
 
@@ -1054,7 +1054,7 @@ void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEve
 }
 
 
-void SAL_CALL ControlModelContainerBase::disposing( const EventObject& /*rEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlModelContainerBase::disposing( const EventObject& /*rEvent*/ )
 {
 }
 
@@ -1104,7 +1104,6 @@ ResourceListener::~ResourceListener()
 
 // XInterface
 Any SAL_CALL ResourceListener::queryInterface( const Type& rType )
-throw ( RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface(
                 rType ,
@@ -1210,7 +1209,6 @@ void ResourceListener::stopListening()
 // XModifyListener
 void SAL_CALL ResourceListener::modified(
     const lang::EventObject& aEvent )
-throw ( RuntimeException, std::exception )
 {
     Reference< util::XModifyListener > xListener;
 
@@ -1239,7 +1237,6 @@ throw ( RuntimeException, std::exception )
 // XEventListener
 void SAL_CALL ResourceListener::disposing(
     const EventObject& Source )
-throw ( RuntimeException, std::exception )
 {
     Reference< lang::XEventListener > xListener;
     Reference< resource::XStringResourceResolver > xResource;
@@ -1328,7 +1325,7 @@ ControlContainerBase::~ControlContainerBase()
 {
 }
 
-void ControlContainerBase::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException, std::exception)
+void ControlContainerBase::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer )
 {
     SolarMutexGuard aGuard;
     UnoControlContainer::createPeer( rxToolkit, rParentPeer );
@@ -1431,7 +1428,7 @@ void ControlContainerBase::ImplSetPosSize( Reference< XControl >& rxCtrl )
     xW->setPosSize( nX, nY, nWidth, nHeight, PosSize::POSSIZE );
 }
 
-void ControlContainerBase::dispose() throw(RuntimeException, std::exception)
+void ControlContainerBase::dispose()
 {
     EventObject aEvt;
     aEvt.Source = static_cast< ::cppu::OWeakObject* >( this );
@@ -1451,12 +1448,11 @@ void ControlContainerBase::dispose() throw(RuntimeException, std::exception)
 
 void SAL_CALL ControlContainerBase::disposing(
     const EventObject& Source )
-throw(RuntimeException, std::exception)
 {
     UnoControlContainer::disposing( Source );
 }
 
-sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception)
+sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxModel )
 {
     SolarMutexGuard aGuard;
 
@@ -1529,7 +1525,7 @@ sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxMod
 
     return bRet;
 }
-void ControlContainerBase::setDesignMode( sal_Bool bOn ) throw(RuntimeException, std::exception)
+void ControlContainerBase::setDesignMode( sal_Bool bOn )
 {
     SolarMutexGuard aGuard;
 
@@ -1548,7 +1544,7 @@ void ControlContainerBase::setDesignMode( sal_Bool bOn ) throw(RuntimeException,
         mxTabController->activateTabOrder();
 }
 
-void ControlContainerBase::elementInserted( const ContainerEvent& Event ) throw(RuntimeException, std::exception)
+void ControlContainerBase::elementInserted( const ContainerEvent& Event )
 {
     SolarMutexGuard aGuard;
 
@@ -1572,7 +1568,7 @@ void ControlContainerBase::elementInserted( const ContainerEvent& Event ) throw(
     }
 }
 
-void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException, std::exception)
+void ControlContainerBase::elementRemoved( const ContainerEvent& Event )
 {
     SolarMutexGuard aGuard;
 
@@ -1593,7 +1589,7 @@ void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) throw(R
     }
 }
 
-void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException, std::exception)
+void ControlContainerBase::elementReplaced( const ContainerEvent& Event )
 {
     SolarMutexGuard aGuard;
 
@@ -1633,7 +1629,7 @@ void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw(
 }
 
 // XPropertiesChangeListener
-void ControlContainerBase::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception)
+void ControlContainerBase::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents )
 {
     if( !isDesignMode() && !mbCreatingCompatiblePeer )
     {
@@ -1712,7 +1708,7 @@ void ControlContainerBase::removingControl( const Reference< XControl >& _rxCont
 
 }
 
-void SAL_CALL ControlContainerBase::changesOccurred( const ChangesEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlContainerBase::changesOccurred( const ChangesEvent& )
 {
     SolarMutexGuard aGuard;
     // a tab controller model may have changed
@@ -1840,7 +1836,7 @@ OUString getPhysicalLocation( const css::uno::Any& rbase, const css::uno::Any& r
 }
 
 void
-ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const css::uno::Reference< css::awt::XControlModel >& xTarget ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const css::uno::Reference< css::awt::XControlModel >& xTarget )
 {
     if ( Operation < Insert || Operation > Remove )
         throw IllegalArgumentException();
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index e13026c91413..ba0d503e6231 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -81,7 +81,7 @@ class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNam
     ::osl::Mutex m_aMutex;
 public:
     // css::container::XNameContainer, XNameReplace, XNameAccess
-    virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override
+    virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !hasByName( aName ) )
@@ -91,24 +91,24 @@ public:
             throw IllegalArgumentException();
         things[ aName ] = xElement;
     }
-    virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override
+    virtual Any SAL_CALL getByName( const OUString& aName ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !hasByName( aName ) )
             throw NoSuchElementException();
         return uno::makeAny( things[ aName ] );
     }
-    virtual Sequence< OUString > SAL_CALL getElementNames(  ) throw(RuntimeException, std::exception) override
+    virtual Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return comphelper::mapKeysToSequence( things );
     }
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return ( things.find( aName ) != things.end() );
     }
-    virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override
+    virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( hasByName( aName ) )
@@ -118,18 +118,18 @@ public:
             throw IllegalArgumentException();
         things[ aName ] = xElement;
     }
-    virtual void SAL_CALL removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override
+    virtual void SAL_CALL removeByName( const OUString& aName ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !hasByName( aName ) )
             throw NoSuchElementException();
         things.erase( things.find( aName ) );
     }
-    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException, std::exception) override
+    virtual Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<T>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return ( !things.empty() );
@@ -145,25 +145,23 @@ protected:
     css::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const override;
     ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper() override;
     // ::cppu::OPropertySetHelper
-    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 public:
     explicit UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     UnoControlDialogModel( const UnoControlDialogModel& rModel );
 
     UnoControlModel*    Clone() const override;
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("stardiv.Toolkit.UnoControlDialogModel"); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         auto s(ControlModelContainerBase::getSupportedServiceNames());
         s.realloc(s.getLength() + 2);
@@ -236,7 +234,7 @@ UnoControlModel* UnoControlDialogModel::Clone() const
 }
 
 
-OUString UnoControlDialogModel::getServiceName( ) throw(RuntimeException, std::exception)
+OUString UnoControlDialogModel::getServiceName( )
 {
     return OUString("stardiv.vcl.controlmodel.Dialog");
 }
@@ -275,13 +273,13 @@ Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 }
 
 // XMultiPropertySet
-Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo(  )
 {
     static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
-void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception)
+void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
 {
     ControlModelContainerBase::setFastPropertyValue_NoBroadcast( nHandle, rValue );
     try
@@ -329,7 +327,7 @@ OUString UnoDialogControl::GetComponentServiceName()
         return OUString("TabPage");
 }
 
-void UnoDialogControl::dispose() throw(RuntimeException, std::exception)
+void UnoDialogControl::dispose()
 {
     SolarMutexGuard aGuard;
 
@@ -341,12 +339,11 @@ void UnoDialogControl::dispose() throw(RuntimeException, std::exception)
 
 void SAL_CALL UnoDialogControl::disposing(
     const EventObject& Source )
-throw(RuntimeException, std::exception)
 {
     ControlContainerBase::disposing( Source );
 }
 
-sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception)
+sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel )
 {
         // #Can we move all the Resource stuff to the ControlContainerBase ?
     SolarMutexGuard aGuard;
@@ -355,7 +352,7 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel )
     return bRet;
 }
 
-void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException, std::exception)
+void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer )
 {
     SolarMutexGuard aGuard;
 
@@ -385,19 +382,16 @@ void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, cons
 }
 
 OUString UnoDialogControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoDialogControl");
 }
 
 sal_Bool UnoDialogControl::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> UnoDialogControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         OUString::createFromAscii(szServiceName2_UnoControlDialog),
@@ -435,7 +429,7 @@ void UnoDialogControl::PrepareWindowDescriptor( css::awt::WindowDescriptor& rDes
     }
 }
 
-void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException, std::exception)
+void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener )
 {
     maTopWindowListeners.addInterface( rxListener );
     if( getPeer().is() && maTopWindowListeners.getLength() == 1 )
@@ -445,7 +439,7 @@ void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener
     }
 }
 
-void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException, std::exception)
+void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListener >& rxListener )
 {
     if( getPeer().is() && maTopWindowListeners.getLength() == 1 )
     {
@@ -455,7 +449,7 @@ void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListe
     maTopWindowListeners.removeInterface( rxListener );
 }
 
-void UnoDialogControl::toFront(  ) throw (RuntimeException, std::exception)
+void UnoDialogControl::toFront(  )
 {
     SolarMutexGuard aGuard;
     if ( getPeer().is() )
@@ -466,7 +460,7 @@ void UnoDialogControl::toFront(  ) throw (RuntimeException, std::exception)
     }
 }
 
-void UnoDialogControl::toBack(  ) throw (RuntimeException, std::exception)
+void UnoDialogControl::toBack(  )
 {
     SolarMutexGuard aGuard;
     if ( getPeer().is() )
@@ -477,7 +471,7 @@ void UnoDialogControl::toBack(  ) throw (RuntimeException, std::exception)
     }
 }
 
-void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) throw (RuntimeException, std::exception)
+void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar )
 {
     SolarMutexGuard aGuard;
     mxMenuBar = rxMenuBar;
@@ -495,7 +489,6 @@ static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize
 }
 // css::awt::XWindowListener
 void SAL_CALL UnoDialogControl::windowResized( const css::awt::WindowEvent& e )
-throw (css::uno::RuntimeException, std::exception)
 {
     OutputDevice*pOutDev = Application::GetDefaultDevice();
     DBG_ASSERT( pOutDev, "Missing Default Device!" );
@@ -536,7 +529,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL UnoDialogControl::windowMoved( const css::awt::WindowEvent& e )
-throw (css::uno::RuntimeException, std::exception)
 {
     OutputDevice*pOutDev = Application::GetDefaultDevice();
     DBG_ASSERT( pOutDev, "Missing Default Device!" );
@@ -561,43 +553,43 @@ throw (css::uno::RuntimeException, std::exception)
     }
 }
 
-void SAL_CALL UnoDialogControl::windowShown( const EventObject& e ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoDialogControl::windowShown( const EventObject& e )
 {
     (void)e;
 }
 
-void SAL_CALL UnoDialogControl::windowHidden( const EventObject& e ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoDialogControl::windowHidden( const EventObject& e )
 {
     (void)e;
 }
 
-void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result )
 {
     Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY );
     if ( xPeerDialog.is() )
         xPeerDialog->endDialog( i_result );
 }
 
-void SAL_CALL UnoDialogControl::setHelpId( const OUString& i_id ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoDialogControl::setHelpId( const OUString& i_id )
 {
     Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY );
     if ( xPeerDialog.is() )
         xPeerDialog->setHelpId( i_id );
 }
 
-void UnoDialogControl::setTitle( const OUString& Title ) throw(RuntimeException, std::exception)
+void UnoDialogControl::setTitle( const OUString& Title )
 {
     SolarMutexGuard aGuard;
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ), uno::Any(Title), true );
 }
 
-OUString UnoDialogControl::getTitle() throw(RuntimeException, std::exception)
+OUString UnoDialogControl::getTitle()
 {
     SolarMutexGuard aGuard;
     return ImplGetPropertyValue_UString( BASEPROPERTY_TITLE );
 }
 
-sal_Int16 UnoDialogControl::execute() throw(RuntimeException, std::exception)
+sal_Int16 UnoDialogControl::execute()
 {
     SolarMutexGuard aGuard;
     sal_Int16 nDone = -1;
@@ -614,7 +606,7 @@ sal_Int16 UnoDialogControl::execute() throw(RuntimeException, std::exception)
     return nDone;
 }
 
-void UnoDialogControl::endExecute() throw(RuntimeException, std::exception)
+void UnoDialogControl::endExecute()
 {
     SolarMutexGuard aGuard;
     if ( getPeer().is() )
@@ -631,12 +623,11 @@ void UnoDialogControl::endExecute() throw(RuntimeException, std::exception)
 // XModifyListener
 void SAL_CALL UnoDialogControl::modified(
     const lang::EventObject& /*rEvent*/ )
-throw (RuntimeException, std::exception)
 {
     ImplUpdateResourceResolver();
 }
 
-void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception)
+void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents )
 {
     sal_Int32 nLen = rEvents.getLength();
     for( sal_Int32 i = 0; i < nLen; i++ )
@@ -680,29 +671,29 @@ UnoMultiPageControl::~UnoMultiPageControl()
 }
 // XTabListener
 
-void SAL_CALL UnoMultiPageControl::inserted( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::inserted( SAL_UNUSED_PARAMETER ::sal_Int32 )
 {
 }
-void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 )
 {
 }
 void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32,
-                                            SAL_UNUSED_PARAMETER const Sequence< NamedValue >& ) throw (RuntimeException, std::exception)
+                                            SAL_UNUSED_PARAMETER const Sequence< NamedValue >& )
 {
 }
-void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), false );
 
 }
-void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 )
 {
 }
-void SAL_CALL UnoMultiPageControl::disposing(const EventObject&) throw (RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::disposing(const EventObject&)
 {
 }
 
-void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::dispose()
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -711,7 +702,7 @@ void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::excep
 }
 
 // css::awt::XSimpleTabController
-::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab()
 {
     Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
     if ( !xMultiPage.is() )
@@ -719,7 +710,7 @@ void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::excep
     return xMultiPage->insertTab();
 }
 
-void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID )
 {
     Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
     if ( !xMultiPage.is() )
@@ -727,7 +718,7 @@ void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) throw (IndexOutOf
     xMultiPage->removeTab( ID );
 }
 
-void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< NamedValue >& Properties ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< NamedValue >& Properties )
 {
     Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
     if ( !xMultiPage.is() )
@@ -735,7 +726,7 @@ void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence<
     xMultiPage->setTabProps( ID, Properties );
 }
 
-Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID )
 {
     Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
     if ( !xMultiPage.is() )
@@ -743,7 +734,7 @@ Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID
     return xMultiPage->getTabProps( ID );
 }
 
-void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID )
 {
     Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
     if ( !xMultiPage.is() )
@@ -753,7 +744,7 @@ void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOut
 
 }
 
-::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID() throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID()
 {
     Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
     if ( !xMultiPage.is() )
@@ -761,7 +752,7 @@ void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOut
     return xMultiPage->getActiveTabID();
 }
 
-void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener >& Listener )
 {
     maTabListeners.addInterface( Listener );
     Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
@@ -769,7 +760,7 @@ void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener
         xMultiPage->addTabListener( &maTabListeners );
 }
 
-void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener )
 {
     Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
     if ( xMultiPage.is()  && maTabListeners.getLength() == 1 )
@@ -786,7 +777,7 @@ IMPL_XTYPEPROVIDER_START( UnoMultiPageControl )
 IMPL_XTYPEPROVIDER_END
 
 // uno::XInterface
-uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
+uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XTabListener* >(this)), (static_cast< awt::XSimpleTabController* >(this)) );
@@ -824,7 +815,7 @@ void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxCo
 
 }
 
-void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException, std::exception)
+void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -914,7 +905,7 @@ UnoMultiPageModel::Clone() const
     return pClone;
 }
 
-OUString UnoMultiPageModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoMultiPageModel::getServiceName()
 {
     return OUString( "com.sun.star.awt.UnoMultiPageModel" );
 }
@@ -940,13 +931,13 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
-void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
+void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement )
 {
     Reference< XServiceInfo > xInfo;
     aElement >>= xInfo;
@@ -962,7 +953,7 @@ void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement
 }
 
 
-sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl(  )
 {
     return true;
 }
@@ -1032,7 +1023,7 @@ UnoPageModel::Clone() const
     return pClone;
 }
 
-OUString UnoPageModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoPageModel::getServiceName()
 {
     return OUString( "com.sun.star.awt.UnoPageModel" );
 }
@@ -1058,14 +1049,14 @@ uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 
-sal_Bool SAL_CALL UnoPageModel::getGroupControl(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoPageModel::getGroupControl(  )
 {
     return false;
 }
@@ -1195,7 +1186,7 @@ UnoFrameModel::Clone() const
     return pClone;
 }
 
-OUString UnoFrameModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoFrameModel::getServiceName()
 {
     return OUString( "com.sun.star.awt.UnoFrameModel" );
 }
@@ -1234,7 +1225,7 @@ uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx
index 4687c7314793..a64f8094b07b 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.cxx
@@ -42,13 +42,11 @@ namespace toolkit
 
 // Methods XElementAccess
 Type ScriptEventContainer::getElementType()
-    throw(RuntimeException, std::exception)
 {
     return mType;
 }
 
 sal_Bool ScriptEventContainer::hasElements()
-    throw(RuntimeException, std::exception)
 {
     bool bRet = (mnElementCount > 0);
     return bRet;
@@ -56,7 +54,6 @@ sal_Bool ScriptEventContainer::hasElements()
 
 // Methods XNameAccess
 Any ScriptEventContainer::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
     if( aIt == mHashMap.end() )
@@ -69,13 +66,11 @@ Any ScriptEventContainer::getByName( const OUString& aName )
 }
 
 Sequence< OUString > ScriptEventContainer::getElementNames()
-    throw(RuntimeException, std::exception)
 {
     return mNames;
 }
 
 sal_Bool ScriptEventContainer::hasByName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
     bool bRet = ( aIt != mHashMap.end() );
@@ -85,7 +80,6 @@ sal_Bool ScriptEventContainer::hasByName( const OUString& aName )
 
 // Methods XNameReplace
 void ScriptEventContainer::replaceByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     const Type& aAnyType = aElement.getValueType();
     if( mType != aAnyType )
@@ -112,7 +106,6 @@ void ScriptEventContainer::replaceByName( const OUString& aName, const Any& aEle
 
 // Methods XNameContainer
 void ScriptEventContainer::insertByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     const Type& aAnyType = aElement.getValueType();
     if( mType != aAnyType )
@@ -140,7 +133,6 @@ void ScriptEventContainer::insertByName( const OUString& aName, const Any& aElem
 }
 
 void ScriptEventContainer::removeByName( const OUString& Name )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( Name );
     if( aIt == mHashMap.end() )
@@ -172,12 +164,12 @@ void ScriptEventContainer::removeByName( const OUString& Name )
 }
 
 // Methods XContainer
-void ScriptEventContainer::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) throw(css::uno::RuntimeException, std::exception)
+void ScriptEventContainer::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& l )
 {
     maContainerListeners.addInterface( l );
 }
 
-void ScriptEventContainer::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) throw(css::uno::RuntimeException, std::exception)
+void ScriptEventContainer::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& l )
 {
     maContainerListeners.removeInterface( l );
 }
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 8a567b27fa3b..5f9b13a7d9ea 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -164,13 +164,13 @@ namespace toolkit
     }
 
 
-    OUString UnoControlFormattedFieldModel::getServiceName() throw(RuntimeException, std::exception)
+    OUString UnoControlFormattedFieldModel::getServiceName()
     {
         return OUString::createFromAscii( szServiceName_UnoControlFormattedFieldModel );
     }
 
 
-    void SAL_CALL UnoControlFormattedFieldModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+    void SAL_CALL UnoControlFormattedFieldModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
     {
         UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 
@@ -261,7 +261,7 @@ namespace toolkit
     }
 
 
-    void UnoControlFormattedFieldModel::dispose(  ) throw(RuntimeException, std::exception)
+    void UnoControlFormattedFieldModel::dispose(  )
     {
         UnoControlModel::dispose();
 
@@ -303,7 +303,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues )
     {
         bool bSettingValue = false;
         bool bSettingText = false;
@@ -327,7 +327,7 @@ namespace toolkit
 
     sal_Bool UnoControlFormattedFieldModel::convertFastPropertyValue(
                 Any& rConvertedValue, Any& rOldValue, sal_Int32 nPropId,
-                const Any& rValue ) throw (IllegalArgumentException, std::exception)
+                const Any& rValue )
     {
         if ( BASEPROPERTY_EFFECTIVE_DEFAULT == nPropId && rValue.hasValue() )
         {
@@ -412,21 +412,19 @@ namespace toolkit
 
     // beans::XMultiPropertySet
 
-    Reference< XPropertySetInfo > UnoControlFormattedFieldModel::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > UnoControlFormattedFieldModel::getPropertySetInfo(  )
     {
         static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
     OUString UnoControlFormattedFieldModel::getImplementationName()
-        throw (css::uno::RuntimeException, std::exception)
     {
         return OUString("stardiv.Toolkit.UnoControlFormattedFieldModel");
     }
 
     css::uno::Sequence<OUString>
     UnoControlFormattedFieldModel::getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception)
     {
         auto s(UnoControlModel::getSupportedServiceNames());
         s.realloc(s.getLength() + 2);
@@ -450,7 +448,7 @@ namespace toolkit
     }
 
 
-    void UnoFormattedFieldControl::textChanged(const TextEvent& e) throw(RuntimeException, std::exception)
+    void UnoFormattedFieldControl::textChanged(const TextEvent& e)
     {
         Reference< XVclWindowPeer >  xPeer(getPeer(), UNO_QUERY);
         OSL_ENSURE(xPeer.is(), "UnoFormattedFieldControl::textChanged : what kind of peer do I have ?");
@@ -470,14 +468,12 @@ namespace toolkit
     }
 
     OUString UnoFormattedFieldControl::getImplementationName()
-        throw (css::uno::RuntimeException, std::exception)
     {
         return OUString("stardiv.Toolkit.UnoFormattedFieldControl");
     }
 
     css::uno::Sequence<OUString>
     UnoFormattedFieldControl::getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception)
     {
         auto s(UnoEditControl::getSupportedServiceNames());
         s.realloc(s.getLength() + 2);
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index f4cc7cd1f8c6..5cd187c2fd42 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -134,7 +134,7 @@
     }
 
 
-    Sequence< Type > SAL_CALL OGeometryControlModel_Base::getTypes(  ) throw (RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL OGeometryControlModel_Base::getTypes(  )
     {
         // our own types
         Sequence< Type > aTypes = ::comphelper::concatSequences(
@@ -244,7 +244,7 @@
     }
 
 
-    Any SAL_CALL OGeometryControlModel_Base::queryAggregation( const Type& _rType ) throw(RuntimeException, std::exception)
+    Any SAL_CALL OGeometryControlModel_Base::queryAggregation( const Type& _rType )
     {
         Any aReturn;
         if (_rType.equals(cppu::UnoType<XCloneable>::get()) && !m_bCloneable)
@@ -269,7 +269,7 @@
     }
 
 
-    Any SAL_CALL OGeometryControlModel_Base::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+    Any SAL_CALL OGeometryControlModel_Base::queryInterface( const Type& _rType )
     {
         return OGCM_Base::queryInterface(_rType);
     }
@@ -303,13 +303,13 @@
 
 
     sal_Bool SAL_CALL OGeometryControlModel_Base::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue,
-            sal_Int32 _nHandle, const Any& _rValue) throw (IllegalArgumentException)
+            sal_Int32 _nHandle, const Any& _rValue)
     {
         return OPropertyContainer::convertFastPropertyValue(_rConvertedValue, _rOldValue, _nHandle, _rValue);
     }
 
 
-    void SAL_CALL OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception, std::exception)
+    void SAL_CALL OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
     {
         OPropertyContainer::setFastPropertyValue_NoBroadcast(_nHandle, _rValue);
     }
@@ -349,13 +349,13 @@
     }
 
 
-    Reference< XPropertySetInfo> SAL_CALL OGeometryControlModel_Base::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo> SAL_CALL OGeometryControlModel_Base::getPropertySetInfo()
     {
         return OPropertySetAggregationHelper::createPropertySetInfo(getInfoHelper());
     }
 
 
-    Reference< XCloneable > SAL_CALL OGeometryControlModel_Base::createClone(  ) throw(RuntimeException, std::exception)
+    Reference< XCloneable > SAL_CALL OGeometryControlModel_Base::createClone(  )
     {
         OSL_ENSURE(m_bCloneable, "OGeometryControlModel_Base::createClone: invalid call!");
         if (!m_bCloneable)
@@ -417,7 +417,7 @@
     }
 
 
-    Reference< XNameContainer > SAL_CALL OGeometryControlModel_Base::getEvents() throw(RuntimeException, std::exception)
+    Reference< XNameContainer > SAL_CALL OGeometryControlModel_Base::getEvents()
     {
         if( !mxEventContainer.is() )
             mxEventContainer = static_cast<XNameContainer*>(new toolkit::ScriptEventContainer());
@@ -578,7 +578,7 @@
         return new OCommonGeometryControlModel( _rxAggregateInstance, m_sServiceSpecifier );
     }
 
-    Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId(  ) throw (RuntimeException, std::exception)
+    Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -596,7 +596,7 @@
     };
 
 
-    void SAL_CALL OCommonGeometryControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception )
+    void SAL_CALL OCommonGeometryControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue )
     {
         OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
 
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 5f3c21d14b2e..9d6aeae9564d 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -58,25 +58,25 @@ public:
     DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource );
 
     // XGridColumnModel
-    virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL createColumn(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL addColumn(const css::uno::Reference< css::awt::grid::XGridColumn > & column) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
-    virtual void SAL_CALL removeColumn( ::sal_Int32 i_columnIndex )  throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Reference< css::awt::grid::XGridColumn > > SAL_CALL getColumns() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL getColumn(::sal_Int32 index) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) throw (css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getColumnCount() override;
+    virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL createColumn(  ) override;
+    virtual ::sal_Int32 SAL_CALL addColumn(const css::uno::Reference< css::awt::grid::XGridColumn > & column) override;
+    virtual void SAL_CALL removeColumn( ::sal_Int32 i_columnIndex ) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::awt::grid::XGridColumn > > SAL_CALL getColumns() override;
+    virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL getColumn(::sal_Int32 index) override;
+    virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XContainer
-    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
+    virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
@@ -132,13 +132,13 @@ private:
             m_aColumns.swap( aColumns );
     }
 
-    ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount()
     {
         return m_aColumns.size();
     }
 
 
-    Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn(  ) throw (RuntimeException, std::exception)
+    Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn(  )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return new GridColumn();
@@ -146,7 +146,6 @@ private:
 
 
     ::sal_Int32 SAL_CALL DefaultGridColumnModel::addColumn( const Reference< XGridColumn > & i_column )
-        throw (RuntimeException, css::lang::IllegalArgumentException, std::exception)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -172,7 +171,6 @@ private:
 
 
     void SAL_CALL DefaultGridColumnModel::removeColumn( ::sal_Int32 i_columnIndex )
-        throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -221,7 +219,7 @@ private:
     }
 
 
-    Sequence< Reference< XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns() throw (RuntimeException, std::exception)
+    Sequence< Reference< XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return ::comphelper::containerToSequence( m_aColumns );
@@ -229,7 +227,6 @@ private:
 
 
     Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::getColumn(::sal_Int32 index)
-        throw (css::lang::IndexOutOfBoundsException, RuntimeException, std::exception)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -240,7 +237,7 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) throw (RuntimeException, std::exception)
+    void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements)
     {
         ::std::vector< ContainerEvent > aRemovedColumns;
         ::std::vector< ContainerEvent > aInsertedColumns;
@@ -324,17 +321,17 @@ private:
     }
 
 
-    OUString SAL_CALL DefaultGridColumnModel::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL DefaultGridColumnModel::getImplementationName(  )
     {
         return OUString("stardiv.Toolkit.DefaultGridColumnModel");
     }
 
-    sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName )
     {
         return cppu::supportsService(this, i_serviceName);
     }
 
-    Sequence< OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames(  )
     {
         const OUString aServiceName("com.sun.star.awt.grid.DefaultGridColumnModel");
         const Sequence< OUString > aSeq( &aServiceName, 1 );
@@ -342,14 +339,14 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridColumnModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DefaultGridColumnModel::addContainerListener( const Reference< XContainerListener >& i_listener )
     {
         if ( i_listener.is() )
             m_aContainerListeners.addInterface( i_listener );
     }
 
 
-    void SAL_CALL DefaultGridColumnModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DefaultGridColumnModel::removeContainerListener( const Reference< XContainerListener >& i_listener )
     {
         if ( i_listener.is() )
             m_aContainerListeners.removeInterface( i_listener );
@@ -386,7 +383,7 @@ private:
     }
 
 
-    Reference< css::util::XCloneable > SAL_CALL DefaultGridColumnModel::createClone(  ) throw (RuntimeException, std::exception)
+    Reference< css::util::XCloneable > SAL_CALL DefaultGridColumnModel::createClone(  )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return new DefaultGridColumnModel( *this );
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 4e96dfd0b2ce..cae8df334284 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -55,38 +55,38 @@ public:
     DefaultGridDataModel( DefaultGridDataModel const & i_copySource );
 
     // XMutableGridDataModel
-    virtual void SAL_CALL addRow( const Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addRows( const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertRow( ::sal_Int32 i_index, const css::uno::Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
-    virtual void SAL_CALL insertRows( ::sal_Int32 i_index, const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAllRows(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateRowData( const css::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const css::uno::Sequence< css::uno::Any >& Values ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addRow( const Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) override;
+    virtual void SAL_CALL addRows( const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) override;
+    virtual void SAL_CALL insertRow( ::sal_Int32 i_index, const css::uno::Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) override;
+    virtual void SAL_CALL insertRows( ::sal_Int32 i_index, const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) override;
+    virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) override;
+    virtual void SAL_CALL removeAllRows(  ) override;
+    virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) override;
+    virtual void SAL_CALL updateRowData( const css::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const css::uno::Sequence< css::uno::Any >& Values ) override;
+    virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) override;
+    virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) override;
+    virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) override;
+    virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) override;
+    virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) override;
 
     // XGridDataModel
-    virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 Row ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 Row ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getRowCount() override;
+    virtual ::sal_Int32 SAL_CALL getColumnCount() override;
+    virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 Row ) override;
+    virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 Row ) override;
+    virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     typedef ::std::pair< Any, Any >     CellData;
@@ -141,14 +141,14 @@ private:
     }
 
 
-    ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (css::uno::RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return impl_getRowCount_nolck();
     }
 
 
-    ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() throw (css::uno::RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nColumnCount;
@@ -194,21 +194,21 @@ private:
     }
 
 
-    Any SAL_CALL DefaultGridDataModel::getCellData( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException, std::exception)
+    Any SAL_CALL DefaultGridDataModel::getCellData( ::sal_Int32 i_column, ::sal_Int32 i_row )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return impl_getCellData_throw( i_column, i_row ).first;
     }
 
 
-    Any SAL_CALL DefaultGridDataModel::getCellToolTip( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException, std::exception)
+    Any SAL_CALL DefaultGridDataModel::getCellToolTip( ::sal_Int32 i_column, ::sal_Int32 i_row )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return impl_getCellData_throw( i_column, i_row ).second;
     }
 
 
-    Any SAL_CALL DefaultGridDataModel::getRowHeading( ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException, std::exception)
+    Any SAL_CALL DefaultGridDataModel::getRowHeading( ::sal_Int32 i_row )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -219,7 +219,7 @@ private:
     }
 
 
-    Sequence< Any > SAL_CALL DefaultGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Sequence< Any > SAL_CALL DefaultGridDataModel::getRowData( ::sal_Int32 i_rowIndex )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -252,19 +252,19 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data )
     {
         insertRow( getRowCount(), i_heading, i_data );
     }
 
 
-    void SAL_CALL DefaultGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data )
     {
         insertRows( getRowCount(), i_headings, i_data );
     }
 
 
-    void SAL_CALL DefaultGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException, std::exception)
+    void SAL_CALL DefaultGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -287,7 +287,7 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data )
     {
         if ( i_headings.getLength() != i_data.getLength() )
             throw IllegalArgumentException( OUString(), *this, -1 );
@@ -326,7 +326,7 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::removeRow( ::sal_Int32 i_rowIndex )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -344,7 +344,7 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridDataModel::removeAllRows(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::removeAllRows(  )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -359,7 +359,7 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -373,7 +373,7 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -413,7 +413,7 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -430,14 +430,14 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         impl_getCellDataAccess_throw( i_columnIndex, i_rowIndex ).second = i_value;
     }
 
 
-    void SAL_CALL DefaultGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -447,13 +447,13 @@ private:
     }
 
 
-    void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener )
     {
         rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
 
-    void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener )
     {
         rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
@@ -476,24 +476,24 @@ private:
     }
 
 
-    OUString SAL_CALL DefaultGridDataModel::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL DefaultGridDataModel::getImplementationName(  )
     {
         return OUString("stardiv.Toolkit.DefaultGridDataModel");
     }
 
-    sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName )
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-    Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames(  )
     {
         Sequence<OUString> aSeq { "com.sun.star.awt.grid.DefaultGridDataModel" };
         return aSeq;
     }
 
 
-    Reference< css::util::XCloneable > SAL_CALL DefaultGridDataModel::createClone(  ) throw (RuntimeException, std::exception)
+    Reference< css::util::XCloneable > SAL_CALL DefaultGridDataModel::createClone(  )
     {
         return new DefaultGridDataModel( *this );
     }
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index 90f79dae8fa8..55623f29a1ed 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -93,106 +93,106 @@ namespace toolkit
     }
 
 
-    css::uno::Any SAL_CALL GridColumn::getIdentifier() throw (css::uno::RuntimeException, std::exception)
+    css::uno::Any SAL_CALL GridColumn::getIdentifier()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_aIdentifier;
     }
 
 
-    void SAL_CALL GridColumn::setIdentifier(const css::uno::Any & value) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setIdentifier(const css::uno::Any & value)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         m_aIdentifier = value;
     }
 
 
-    ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (css::uno::RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL GridColumn::getColumnWidth()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nColumnWidth;
     }
 
 
-    void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value)
     {
         impl_set( m_nColumnWidth, value, "ColumnWidth" );
     }
 
 
-    ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (css::uno::RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL GridColumn::getMaxWidth()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nMaxWidth;
     }
 
 
-    void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value)
     {
         impl_set( m_nMaxWidth, value, "MaxWidth" );
     }
 
 
-    ::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (css::uno::RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL GridColumn::getMinWidth()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nMinWidth;
     }
 
 
-    void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value)
     {
         impl_set( m_nMinWidth, value, "MinWidth" );
     }
 
 
-    OUString SAL_CALL GridColumn::getTitle() throw (css::uno::RuntimeException, std::exception)
+    OUString SAL_CALL GridColumn::getTitle()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_sTitle;
     }
 
 
-    void SAL_CALL GridColumn::setTitle(const OUString & value) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setTitle(const OUString & value)
     {
         impl_set( m_sTitle, value, "Title" );
     }
 
 
-    OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException, std::exception)
+    OUString SAL_CALL GridColumn::getHelpText()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_sHelpText;
     }
 
 
-    void SAL_CALL GridColumn::setHelpText( const OUString & value ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setHelpText( const OUString & value )
     {
         impl_set( m_sHelpText, value, "HelpText" );
     }
 
 
-    sal_Bool SAL_CALL GridColumn::getResizeable() throw (css::uno::RuntimeException, std::exception)
+    sal_Bool SAL_CALL GridColumn::getResizeable()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_bResizeable;
     }
 
 
-    void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setResizeable(sal_Bool value)
     {
         impl_set( m_bResizeable, bool(value), "Resizeable" );
     }
 
 
-    ::sal_Int32 SAL_CALL GridColumn::getFlexibility() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL GridColumn::getFlexibility()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nFlexibility;
     }
 
 
-    void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value )
     {
         if ( i_value < 0 )
             throw IllegalArgumentException( OUString(), *this, 1 );
@@ -200,26 +200,26 @@ namespace toolkit
     }
 
 
-    HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (css::uno::RuntimeException, std::exception)
+    HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_eHorizontalAlign;
     }
 
 
-    void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align)
     {
         impl_set( m_eHorizontalAlign, align, "HorizontalAlign" );
     }
 
 
-    void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener )
     {
         rBHelper.addListener( cppu::UnoType<XGridColumnListener>::get(), xListener );
     }
 
 
-    void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener )
     {
         rBHelper.removeListener( cppu::UnoType<XGridColumnListener>::get(), xListener );
     }
@@ -234,7 +234,7 @@ namespace toolkit
     }
 
 
-    ::sal_Int32 SAL_CALL GridColumn::getIndex() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL GridColumn::getIndex()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nIndex;
@@ -248,30 +248,30 @@ namespace toolkit
     }
 
 
-    ::sal_Int32 SAL_CALL GridColumn::getDataColumnIndex() throw(RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL GridColumn::getDataColumnIndex()
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nDataColumnIndex;
     }
 
 
-    void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(RuntimeException, std::exception)
+    void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32 i_dataColumnIndex )
     {
         impl_set( m_nDataColumnIndex, i_dataColumnIndex, "DataColumnIndex" );
     }
 
 
-    OUString SAL_CALL GridColumn::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL GridColumn::getImplementationName(  )
     {
         return OUString( "org.openoffice.comp.toolkit.GridColumn" );
     }
 
-    sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName )
     {
         return cppu::supportsService(this, i_serviceName);
     }
 
-    css::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    css::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames(  )
     {
         const OUString aServiceName("com.sun.star.awt.grid.GridColumn");
         const Sequence< OUString > aSeq( &aServiceName, 1 );
@@ -279,13 +279,13 @@ namespace toolkit
     }
 
 
-    Reference< XCloneable > SAL_CALL GridColumn::createClone(  ) throw (RuntimeException, std::exception)
+    Reference< XCloneable > SAL_CALL GridColumn::createClone(  )
     {
         return new GridColumn( *this );
     }
 
 
-    sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier ) throw(RuntimeException, std::exception)
+    sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier )
     {
         if ( ( i_identifier.getLength() == 16 ) && ( i_identifier == getUnoTunnelId() ) )
             return ::sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ) );
diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx
index d0001b0c20cb..65a61363d7e6 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.hxx
@@ -50,43 +50,43 @@ public:
     virtual ~GridColumn() override;
 
     // css::awt::grid::XGridColumn
-    virtual css::uno::Any SAL_CALL getIdentifier() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setIdentifier(const css::uno::Any & value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getColumnWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setColumnWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getMaxWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMaxWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getMinWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMinWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getResizeable() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setResizeable(sal_Bool the_value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getFlexibility() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitle(const OUString & value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getHelpText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpText(const OUString & value) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getDataColumnIndex() throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::style::HorizontalAlignment SAL_CALL getHorizontalAlign() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHorizontalAlign(css::style::HorizontalAlignment align) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getIdentifier() override;
+    virtual void SAL_CALL setIdentifier(const css::uno::Any & value) override;
+    virtual ::sal_Int32 SAL_CALL getColumnWidth() override;
+    virtual void SAL_CALL setColumnWidth(::sal_Int32 the_value) override;
+    virtual ::sal_Int32 SAL_CALL getMaxWidth() override;
+    virtual void SAL_CALL setMaxWidth(::sal_Int32 the_value) override;
+    virtual ::sal_Int32 SAL_CALL getMinWidth() override;
+    virtual void SAL_CALL setMinWidth(::sal_Int32 the_value) override;
+    virtual sal_Bool SAL_CALL getResizeable() override;
+    virtual void SAL_CALL setResizeable(sal_Bool the_value) override;
+    virtual ::sal_Int32 SAL_CALL getFlexibility() override;
+    virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) override;
+    virtual OUString SAL_CALL getTitle() override;
+    virtual void SAL_CALL setTitle(const OUString & value) override;
+    virtual OUString SAL_CALL getHelpText() override;
+    virtual void SAL_CALL setHelpText(const OUString & value) override;
+    virtual ::sal_Int32 SAL_CALL getIndex() override;
+    virtual ::sal_Int32 SAL_CALL getDataColumnIndex() override;
+    virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) override;
+    virtual css::style::HorizontalAlignment SAL_CALL getHorizontalAlign() override;
+    virtual void SAL_CALL setHorizontalAlign(css::style::HorizontalAlignment align) override;
+    virtual void SAL_CALL addGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) override;
+    virtual void SAL_CALL removeGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XCloneable (base of XGridColumn)
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XUnoTunnel and friends
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& i_identifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& i_identifier ) override;
     static css::uno::Sequence< sal_Int8 > getUnoTunnelId() throw();
     static GridColumn* getImplementation( const css::uno::Reference< css::uno::XInterface >& i_component );
 
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 62709421d1f5..c18a1e4e56a9 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -180,7 +180,7 @@ namespace
 }
 
 
-void SAL_CALL UnoGridModel::dispose(  ) throw(RuntimeException, std::exception)
+void SAL_CALL UnoGridModel::dispose(  )
 {
     lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL ) );
     lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL ) );
@@ -189,7 +189,7 @@ void SAL_CALL UnoGridModel::dispose(  ) throw(RuntimeException, std::exception)
 }
 
 
-void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception)
+void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
 {
     Any aOldSubModel;
     if ( ( nHandle == BASEPROPERTY_GRID_COLUMNMODEL ) || ( nHandle == BASEPROPERTY_GRID_DATAMODEL ) )
@@ -210,7 +210,7 @@ void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
 }
 
 
-OUString UnoGridModel::getServiceName() throw(RuntimeException, std::exception)
+OUString UnoGridModel::getServiceName()
 {
     return OUString("com.sun.star.awt.grid.UnoControlGridModel");
 }
@@ -262,7 +262,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 
 // XMultiPropertySet
-Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo(  )
 {
     static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -290,7 +290,7 @@ OUString UnoGridControl::GetComponentServiceName()
 }
 
 
-void SAL_CALL UnoGridControl::dispose(  ) throw(RuntimeException, std::exception)
+void SAL_CALL UnoGridControl::dispose(  )
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -299,7 +299,7 @@ void SAL_CALL UnoGridControl::dispose(  ) throw(RuntimeException, std::exception
 }
 
 
-void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoControlBase::createPeer( rxToolkit, rParentPeer );
 
@@ -348,7 +348,7 @@ namespace
 }
 
 
-sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_model ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_model )
 {
     lcl_setEventForwarding( getModel(), m_pEventForwarder, false );
     if ( !UnoGridControl_Base::setModel( i_model ) )
@@ -358,90 +358,90 @@ sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_
 }
 
 
-::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y)
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     return xGrid->getRowAtPoint( x, y );
 }
 
 
-::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y)
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     return xGrid->getColumnAtPoint( x, y );
 }
 
 
-::sal_Int32 SAL_CALL UnoGridControl::getCurrentColumn(  ) throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL UnoGridControl::getCurrentColumn(  )
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     return xGrid->getCurrentColumn();
 }
 
 
-::sal_Int32 SAL_CALL UnoGridControl::getCurrentRow(  ) throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL UnoGridControl::getCurrentRow(  )
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     return xGrid->getCurrentRow();
 }
 
 
-void SAL_CALL UnoGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, VetoException, std::exception)
+void SAL_CALL UnoGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex )
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     xGrid->goToCell( i_columnIndex, i_rowIndex );
 }
 
 
-void SAL_CALL UnoGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception )
+void SAL_CALL UnoGridControl::selectRow( ::sal_Int32 i_rowIndex )
 {
     Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectRow( i_rowIndex );
 }
 
 
-void SAL_CALL UnoGridControl::selectAllRows() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UnoGridControl::selectAllRows()
 {
     Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectAllRows();
 }
 
 
-void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception )
+void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex )
 {
     Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectRow( i_rowIndex );
 }
 
 
-void SAL_CALL UnoGridControl::deselectAllRows() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UnoGridControl::deselectAllRows()
 {
     Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectAllRows();
 }
 
 
-css::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows()
 {
     return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->getSelectedRows();
 }
 
 
-sal_Bool SAL_CALL UnoGridControl::hasSelectedRows() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoGridControl::hasSelectedRows()
 {
     return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->hasSelectedRows();
 }
 
 
-sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index)
 {
     return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->isRowSelected( index );
 }
 
 
-void SAL_CALL UnoGridControl::addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UnoGridControl::addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener)
 {
     m_aSelectionListeners.addInterface( listener );
 }
 
 
-void SAL_CALL UnoGridControl::removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UnoGridControl::removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener)
 {
     m_aSelectionListeners.removeInterface( listener );
 }
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index afc22b760c00..a4f8a1f5b026 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -53,24 +53,22 @@ public:
     UnoControlModel* Clone() const override;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // OPropertySetHelper
-    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override;
+    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("stardiv.Toolkit.GridControlModel"); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         auto s(UnoControlModel::getSupportedServiceNames());
         s.realloc(s.getLength() + 1);
@@ -93,37 +91,35 @@ public:
     OUString             GetComponentServiceName() override;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XControl
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& rxModel ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& rxModel ) override;
 
     // css::awt::grid::XGridControl
-    virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCurrentColumn(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getCurrentRow(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, css::util::VetoException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) override;
+    virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) override;
+    virtual ::sal_Int32 SAL_CALL getCurrentColumn(  ) override;
+    virtual ::sal_Int32 SAL_CALL getCurrentRow(  ) override;
+    virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) override;
 
     // css::awt::grid::XGridRowSelection
-    virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
-    virtual void SAL_CALL selectAllRows() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override;
-    virtual void SAL_CALL deselectAllRows() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasSelectedRows() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) override;
+    virtual void SAL_CALL selectAllRows() override;
+    virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) override;
+    virtual void SAL_CALL deselectAllRows() override;
+    virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() override;
+    virtual sal_Bool SAL_CALL hasSelectedRows() override;
+    virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) override;
+    virtual void SAL_CALL addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) override;
+    virtual void SAL_CALL removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) override;
 
     // css::lang::XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("stardiv.Toolkit.GridControl"); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         auto s(UnoControlBase::getSupportedServiceNames());
         s.realloc(s.getLength() + 1);
diff --git a/toolkit/source/controls/grid/grideventforwarder.cxx b/toolkit/source/controls/grid/grideventforwarder.cxx
index a85d47c4a471..9de7a9a56d1b 100644
--- a/toolkit/source/controls/grid/grideventforwarder.cxx
+++ b/toolkit/source/controls/grid/grideventforwarder.cxx
@@ -59,7 +59,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL GridEventForwarder::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridEventForwarder::rowsInserted( const GridDataEvent& i_event )
     {
         Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
         if ( xPeer.is() )
@@ -67,7 +67,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL GridEventForwarder::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridEventForwarder::rowsRemoved( const GridDataEvent& i_event )
     {
         Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
         if ( xPeer.is() )
@@ -75,7 +75,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL GridEventForwarder::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridEventForwarder::dataChanged( const GridDataEvent& i_event )
     {
         Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
         if ( xPeer.is() )
@@ -83,7 +83,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL GridEventForwarder::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridEventForwarder::rowHeadingChanged( const GridDataEvent& i_event )
     {
         Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
         if ( xPeer.is() )
@@ -91,7 +91,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL GridEventForwarder::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridEventForwarder::elementInserted( const ContainerEvent& i_event )
     {
         Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY );
         if ( xPeer.is() )
@@ -99,7 +99,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL GridEventForwarder::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridEventForwarder::elementRemoved( const ContainerEvent& i_event )
     {
         Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY );
         if ( xPeer.is() )
@@ -107,7 +107,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL GridEventForwarder::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridEventForwarder::elementReplaced( const ContainerEvent& i_event )
     {
         Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY );
         if ( xPeer.is() )
@@ -115,7 +115,7 @@ namespace toolkit
     }
 
 
-    void SAL_CALL GridEventForwarder::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL GridEventForwarder::disposing( const EventObject& i_event )
     {
         Reference< XEventListener > xPeer( m_parent.getPeer(), UNO_QUERY );
         if ( xPeer.is() )
diff --git a/toolkit/source/controls/grid/grideventforwarder.hxx b/toolkit/source/controls/grid/grideventforwarder.hxx
index da9a6cd269f3..50a3fd4501da 100644
--- a/toolkit/source/controls/grid/grideventforwarder.hxx
+++ b/toolkit/source/controls/grid/grideventforwarder.hxx
@@ -52,18 +52,18 @@ namespace toolkit
         virtual void SAL_CALL release() throw() override;
 
         // XGridDataListener
-        virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) override;
+        virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) override;
+        virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) override;
+        virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) override;
 
         // XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
+        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) override;
 
     private:
         UnoGridControl& m_parent;
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 59463e8696b5..8df02feb14b6 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -72,64 +72,64 @@ protected:
 
 public:
     // XSortableGridData
-    virtual void SAL_CALL sortByColumn( ::sal_Int32 ColumnIndex, sal_Bool SortAscending ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeColumnSort(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::beans::Pair< ::sal_Int32, sal_Bool > SAL_CALL getCurrentSortOrder(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL sortByColumn( ::sal_Int32 ColumnIndex, sal_Bool SortAscending ) override;
+    virtual void SAL_CALL removeColumnSort(  ) override;
+    virtual css::beans::Pair< ::sal_Int32, sal_Bool > SAL_CALL getCurrentSortOrder(  ) override;
 
     // XMutableGridDataModel
-    virtual void SAL_CALL addRow( const css::uno::Any& Heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addRows( const css::uno::Sequence< css::uno::Any >& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertRow( ::sal_Int32 i_index, const css::uno::Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override;
-    virtual void SAL_CALL insertRows( ::sal_Int32 i_index, const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAllRows(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateRowData( const css::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const css::uno::Sequence< css::uno::Any >& Values ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addRow( const css::uno::Any& Heading, const css::uno::Sequence< css::uno::Any >& Data ) override;
+    virtual void SAL_CALL addRows( const css::uno::Sequence< css::uno::Any >& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) override;
+    virtual void SAL_CALL insertRow( ::sal_Int32 i_index, const css::uno::Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) override;
+    virtual void SAL_CALL insertRows( ::sal_Int32 i_index, const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) override;
+    virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) override;
+    virtual void SAL_CALL removeAllRows(  ) override;
+    virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) override;
+    virtual void SAL_CALL updateRowData( const css::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const css::uno::Sequence< css::uno::Any >& Values ) override;
+    virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) override;
+    virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) override;
+    virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) override;
+    virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) override;
+    virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) override;
 
     // XGridDataModel
-    virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getRowCount() override;
+    virtual ::sal_Int32 SAL_CALL getColumnCount() override;
+    virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 RowIndex ) override;
+    virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 RowIndex ) override;
+    virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) override;
+    virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) override;
 
     // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
     // XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XGridDataListener
-    virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) override;
+    virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) override;
+    virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) override;
+    virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  ) throw () final override;
     virtual void SAL_CALL release(  ) throw () override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId(  ) override;
 
 private:
     /** translates the given public index into one to be passed to our delegator
@@ -261,7 +261,7 @@ public:
     }
 
 
-    Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+    Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType )
     {
         Any aReturn( SortableGridDataModel_Base::queryInterface( aType ) );
         if ( !aReturn.hasValue() )
@@ -282,14 +282,14 @@ public:
     }
 
 
-    Sequence< Type > SAL_CALL SortableGridDataModel::getTypes(  ) throw (RuntimeException, std::exception)
+    Sequence< Type > SAL_CALL SortableGridDataModel::getTypes(  )
     {
         return SortableGridDataModel_Base::getTypes();
         // don't expose the types got via SortableGridDataModel_PrivateBase - they're private, after all
     }
 
 
-    Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId(  ) throw (RuntimeException, std::exception)
+    Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -306,7 +306,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments ) throw (Exception, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
@@ -363,7 +363,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -422,7 +422,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -482,7 +482,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -491,7 +491,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -500,7 +500,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::disposing( const EventObject& ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::disposing( const EventObject& )
     {
     }
 
@@ -592,7 +592,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, sal_Bool i_sortAscending ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, sal_Bool i_sortAscending )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -634,14 +634,14 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::removeColumnSort(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::removeColumnSort(  )
     {
         MethodGuard aGuard( *this, rBHelper );
         impl_removeColumnSort( aGuard );
     }
 
 
-    css::beans::Pair< ::sal_Int32, sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder(  ) throw (RuntimeException, std::exception)
+    css::beans::Pair< ::sal_Int32, sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder(  )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -649,7 +649,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -659,7 +659,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -669,7 +669,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException, std::exception)
+    void SAL_CALL SortableGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -682,7 +682,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -695,7 +695,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -707,7 +707,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::removeAllRows(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::removeAllRows(  )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -717,7 +717,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -729,7 +729,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -741,7 +741,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -753,7 +753,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -765,7 +765,7 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -777,19 +777,19 @@ public:
     }
 
 
-    void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener )
     {
         rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
 
-    void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener )
     {
         rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
 
-    ::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount()
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -799,7 +799,7 @@ public:
     }
 
 
-    ::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount() throw (RuntimeException, std::exception)
+    ::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount()
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -809,7 +809,7 @@ public:
     }
 
 
-    Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -821,7 +821,7 @@ public:
     }
 
 
-    Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -833,7 +833,7 @@ public:
     }
 
 
-    Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -845,7 +845,7 @@ public:
     }
 
 
-    Sequence< Any > SAL_CALL SortableGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+    Sequence< Any > SAL_CALL SortableGridDataModel::getRowData( ::sal_Int32 i_rowIndex )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -876,7 +876,7 @@ public:
     }
 
 
-    Reference< css::util::XCloneable > SAL_CALL SortableGridDataModel::createClone(  ) throw (RuntimeException, std::exception)
+    Reference< css::util::XCloneable > SAL_CALL SortableGridDataModel::createClone(  )
     {
         MethodGuard aGuard( *this, rBHelper );
 
@@ -884,17 +884,17 @@ public:
     }
 
 
-    OUString SAL_CALL SortableGridDataModel::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL SortableGridDataModel::getImplementationName(  )
     {
         return OUString( "org.openoffice.comp.toolkit.SortableGridDataModel" );
     }
 
-    sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName )
     {
         return cppu::supportsService(this, i_serviceName);
     }
 
-    Sequence< OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames(  )
     {
         Sequence< OUString > aServiceNames { "com.sun.star.awt.grid.SortableGridDataModel" };
         return aServiceNames;
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index c6359a108272..59c99d314194 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -76,20 +76,18 @@ static void lcl_throwIndexOutOfBoundsException( )
     }
 
 
-    OUString UnoControlRoadmapModel::getServiceName() throw(RuntimeException, std::exception)
+    OUString UnoControlRoadmapModel::getServiceName()
     {
         return OUString::createFromAscii( szServiceName_UnoControlRoadmapModel );
     }
 
     OUString UnoControlRoadmapModel::getImplementationName()
-        throw (css::uno::RuntimeException, std::exception)
     {
         return OUString("stardiv.Toolkit.UnoControlRoadmapModel");
     }
 
     css::uno::Sequence<OUString>
     UnoControlRoadmapModel::getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception)
     {
         auto s(UnoControlRoadmapModel_Base::getSupportedServiceNames());
         s.realloc(s.getLength() + 2);
@@ -127,7 +125,7 @@ static void lcl_throwIndexOutOfBoundsException( )
     }
 
 
-    Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance(  ) throw (Exception, css::uno::RuntimeException, std::exception)
+    Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance(  )
     {
         ORoadmapEntry* pRoadmapItem = new ORoadmapEntry();
         Reference< XInterface > xNewRoadmapItem = static_cast<cppu::OWeakObject*>(pRoadmapItem);
@@ -135,7 +133,7 @@ static void lcl_throwIndexOutOfBoundsException( )
     }
 
 
-    Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstanceWithArguments( const Sequence< Any >& /*aArguments*/ ) throw (Exception, RuntimeException, std::exception)
+    Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstanceWithArguments( const Sequence< Any >& /*aArguments*/ )
     {
         // Todo: implementation of the arguments handling
         ORoadmapEntry* pRoadmapItem = new ORoadmapEntry();
@@ -147,7 +145,7 @@ static void lcl_throwIndexOutOfBoundsException( )
  IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, UnoControlRoadmapModel_IBase )
 
 
-    css::uno::Any  SAL_CALL UnoControlRoadmapModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+    css::uno::Any  SAL_CALL UnoControlRoadmapModel::queryAggregation( const css::uno::Type & rType )
     {
         Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType );
         if ( !aRet.hasValue() )
@@ -170,19 +168,19 @@ static void lcl_throwIndexOutOfBoundsException( )
 
     // beans::XMultiPropertySet
 
-    Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo(  )
     {
         static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
 
-    sal_Int32 SAL_CALL UnoControlRoadmapModel::getCount() throw(RuntimeException, std::exception)
+    sal_Int32 SAL_CALL UnoControlRoadmapModel::getCount()
     {
         return maRoadmapItems.size();
     }
 
-    Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+    Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index )
     {
         if (( Index >= (sal_Int32)maRoadmapItems.size()) || (Index < 0))
             lcl_throwIndexOutOfBoundsException( );
@@ -273,7 +271,6 @@ static void lcl_throwIndexOutOfBoundsException( )
 
 
     void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& Element)
-                                    throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
     {
         if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0))
             lcl_throwIndexOutOfBoundsException( );
@@ -295,7 +292,6 @@ static void lcl_throwIndexOutOfBoundsException( )
 
 
     void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index)
-                                                throw    (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
     {
         if (( Index > (sal_Int32)maRoadmapItems.size()) || (Index < 0))
             lcl_throwIndexOutOfBoundsException( );
@@ -326,7 +322,6 @@ static void lcl_throwIndexOutOfBoundsException( )
 
 
     void SAL_CALL UnoControlRoadmapModel::replaceByIndex( const sal_Int32 Index, const Any& Element)
-                                throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
     {
         Reference< XInterface > xRoadmapItem;
         Element >>= xRoadmapItem;
@@ -339,25 +334,25 @@ static void lcl_throwIndexOutOfBoundsException( )
     }
 
 
-    Type SAL_CALL UnoControlRoadmapModel::getElementType() throw(RuntimeException, std::exception)
+    Type SAL_CALL UnoControlRoadmapModel::getElementType()
     {
         Type aType = cppu::UnoType<XPropertySet>::get();
         return aType;
     }
 
 
-    sal_Bool SAL_CALL UnoControlRoadmapModel::hasElements() throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL UnoControlRoadmapModel::hasElements()
     {
         return !maRoadmapItems.empty();
     }
 
 
-    void SAL_CALL UnoControlRoadmapModel::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL UnoControlRoadmapModel::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener )
     {
         maContainerListeners.addInterface( xListener );
     }
 
-    void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener )
     {
         maContainerListeners.removeInterface( xListener );
     }
@@ -376,7 +371,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoRoadmapControl, UnoControlRoadmap_Base, Uno
 IMPLEMENT_FORWARD_XINTERFACE2( UnoRoadmapControl, UnoControlRoadmap_Base, UnoControlRoadmap_IBase )
 
 
-sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& _rModel) throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& _rModel)
     {
 
 
@@ -400,7 +395,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
     }
 
 
-    void UnoRoadmapControl::dispose() throw(RuntimeException, std::exception)
+    void UnoRoadmapControl::dispose()
     {
         EventObject aEvt;
         aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -409,7 +404,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
     }
 
 
-void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(RuntimeException, std::exception)
+void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )
 {
     Reference< XInterface > xRoadmapItem;
     rEvent.Element >>= xRoadmapItem;
@@ -428,7 +423,7 @@ void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(Run
 }
 
 
-void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(RuntimeException, std::exception)
+void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )
 {
     Reference< XContainerListener >  xPeer(getPeer(), UNO_QUERY);
     if ( xPeer.is() )
@@ -441,7 +436,7 @@ void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(Runt
 }
 
 
-void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )throw(RuntimeException, std::exception)
+void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )
 {
     Reference< XContainerListener >  xPeer(getPeer(), UNO_QUERY);
     if ( xPeer.is() )
@@ -449,7 +444,7 @@ void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )throw(Run
 }
 
 
-void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent )
 {
     sal_Int16 CurItemIndex = sal::static_int_cast< sal_Int16 >(rEvent.ItemId);
     Reference< XControlModel > xModel( getModel( ), UNO_QUERY );
@@ -460,7 +455,7 @@ void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) thr
 }
 
 
-void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener >& l )
 {
     maItemListeners.addInterface( l );
     if( getPeer().is() && maItemListeners.getLength() == 1 )
@@ -471,7 +466,7 @@ void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener
 }
 
 
-void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListener >& l )
 {
     if( getPeer().is() && maItemListeners.getLength() == 1 )
     {
@@ -483,7 +478,7 @@ void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListe
 }
 
 
-void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt )
 {
     Reference< XPropertyChangeListener >  xPeer(getPeer(), UNO_QUERY);
     if ( xPeer.is() )
@@ -491,13 +486,11 @@ void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt
 }
 
 OUString UnoRoadmapControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoRoadmapControl");
 }
 
 css::uno::Sequence<OUString> UnoRoadmapControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index 2327d0248690..3238b6e5d578 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -69,24 +69,23 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe
 
 css::uno::Reference< css:: beans::XPropertySetInfo > SAL_CALL
     ORoadmapEntry::getPropertySetInfo()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return css::uno::Reference< css::beans::XPropertySetInfo >(
         createPropertySetInfo( getInfoHelper() ) );
 }
 
-OUString SAL_CALL ORoadmapEntry::getImplementationName(  ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ORoadmapEntry::getImplementationName(  )
 {
     OUString aStr("com.sun.star.comp.toolkit.RoadmapItem");
     return aStr;
 }
 
-sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames(  )
 {
     css::uno::Sequence<OUString> aRet { "com.sun.star.awt.RoadmapItem" };
     return aRet;
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index 231a3e85f534..fbb44bcbc7ba 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -38,14 +38,14 @@ public:
     virtual UnoControlModel* Clone() const override;
 
     // XPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 protected:
     virtual ~SpinningProgressControlModel() override;
@@ -96,26 +96,26 @@ protected:
     }
 
 
-    Reference< beans::XPropertySetInfo > SAL_CALL SpinningProgressControlModel::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< beans::XPropertySetInfo > SAL_CALL SpinningProgressControlModel::getPropertySetInfo(  )
     {
         static Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
 
-    OUString SAL_CALL SpinningProgressControlModel::getServiceName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL SpinningProgressControlModel::getServiceName()
     {
         return OUString("com.sun.star.awt.SpinningProgressControlModel");
     }
 
 
-    OUString SAL_CALL SpinningProgressControlModel::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL SpinningProgressControlModel::getImplementationName(  )
     {
         return OUString("org.openoffice.comp.toolkit.SpinningProgressControlModel");
     }
 
 
-    Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames()
     {
         Sequence< OUString > aServiceNames(3);
         aServiceNames[0] = "com.sun.star.awt.SpinningProgressControlModel";
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 6603e86caa4a..6b3456969c26 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -161,7 +161,7 @@ void StdTabController::ImplActivateControl( bool bFirst ) const
 }
 
 // XInterface
-Any StdTabController::queryAggregation( const Type & rType ) throw(RuntimeException, std::exception)
+Any StdTabController::queryAggregation( const Type & rType )
 {
     Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< XTabController* >(this)),
@@ -176,35 +176,35 @@ IMPL_XTYPEPROVIDER_START( StdTabController )
     cppu::UnoType<XServiceInfo>::get()
 IMPL_XTYPEPROVIDER_END
 
-void StdTabController::setModel( const Reference< XTabControllerModel >& Model ) throw(RuntimeException, std::exception)
+void StdTabController::setModel( const Reference< XTabControllerModel >& Model )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     mxModel = Model;
 }
 
-Reference< XTabControllerModel > StdTabController::getModel(  ) throw(RuntimeException, std::exception)
+Reference< XTabControllerModel > StdTabController::getModel(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     return mxModel;
 }
 
-void StdTabController::setContainer( const Reference< XControlContainer >& Container ) throw(RuntimeException, std::exception)
+void StdTabController::setContainer( const Reference< XControlContainer >& Container )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     mxControlContainer = Container;
 }
 
-Reference< XControlContainer > StdTabController::getContainer(  ) throw(RuntimeException, std::exception)
+Reference< XControlContainer > StdTabController::getContainer(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     return mxControlContainer;
 }
 
-Sequence< Reference< XControl > > StdTabController::getControls(  ) throw(RuntimeException, std::exception)
+Sequence< Reference< XControl > > StdTabController::getControls(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -230,7 +230,7 @@ Sequence< Reference< XControl > > StdTabController::getControls(  ) throw(Runtim
     return aSeq;
 }
 
-void StdTabController::autoTabOrder(  ) throw(RuntimeException, std::exception)
+void StdTabController::autoTabOrder(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -295,7 +295,7 @@ void StdTabController::autoTabOrder(  ) throw(RuntimeException, std::exception)
     mxModel->setControlModels( aNewSeq );
 }
 
-void StdTabController::activateTabOrder(  ) throw(RuntimeException, std::exception)
+void StdTabController::activateTabOrder(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -350,7 +350,7 @@ void StdTabController::activateTabOrder(  ) throw(RuntimeException, std::excepti
     }
 }
 
-void StdTabController::activateFirst(  ) throw(RuntimeException, std::exception)
+void StdTabController::activateFirst(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); //TODO: necessary?
@@ -358,7 +358,7 @@ void StdTabController::activateFirst(  ) throw(RuntimeException, std::exception)
     ImplActivateControl( true );
 }
 
-void StdTabController::activateLast(  ) throw(RuntimeException, std::exception)
+void StdTabController::activateLast(  )
 {
     SolarMutexGuard aSolarGuard;
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); //TODO: necessary?
@@ -367,19 +367,16 @@ void StdTabController::activateLast(  ) throw(RuntimeException, std::exception)
 }
 
 OUString StdTabController::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.StdTabController");
 }
 
 sal_Bool StdTabController::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> StdTabController::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         OUString::createFromAscii(szServiceName2_TabController),
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 184d56c0fdcf..a9b2786bb42a 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -213,7 +213,7 @@ css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > ImplReadCon
 
 
 // css::uno::XInterface
-css::uno::Any StdTabControllerModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any StdTabControllerModel::queryAggregation( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::awt::XTabControllerModel* >(this)),
@@ -230,21 +230,21 @@ IMPL_XTYPEPROVIDER_START( StdTabControllerModel )
     cppu::UnoType<css::io::XPersistObject>::get()
 IMPL_XTYPEPROVIDER_END
 
-sal_Bool StdTabControllerModel::getGroupControl(  ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool StdTabControllerModel::getGroupControl(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     return mbGroupControl;
 }
 
-void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) throw(css::uno::RuntimeException, std::exception)
+void StdTabControllerModel::setGroupControl( sal_Bool GroupControl )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     mbGroupControl = GroupControl;
 }
 
-void StdTabControllerModel::setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) throw(css::uno::RuntimeException, std::exception)
+void StdTabControllerModel::setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -252,7 +252,7 @@ void StdTabControllerModel::setControlModels( const css::uno::Sequence< css::uno
     ImplSetControlModels( maControls, Controls );
 }
 
-css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > StdTabControllerModel::getControlModels(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > StdTabControllerModel::getControlModels(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -262,7 +262,7 @@ css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > StdTabContr
     return aSeq;
 }
 
-void StdTabControllerModel::setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) throw(css::uno::RuntimeException, std::exception)
+void StdTabControllerModel::setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -300,7 +300,7 @@ void StdTabControllerModel::setGroup( const css::uno::Sequence< css::uno::Refere
         maControls.push_back( pNewEntry );
 }
 
-sal_Int32 StdTabControllerModel::getGroupCount(  ) throw(css::uno::RuntimeException, std::exception)
+sal_Int32 StdTabControllerModel::getGroupCount(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -318,7 +318,7 @@ sal_Int32 StdTabControllerModel::getGroupCount(  ) throw(css::uno::RuntimeExcept
     return nGroups;
 }
 
-void StdTabControllerModel::getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup, OUString& rName ) throw(css::uno::RuntimeException, std::exception)
+void StdTabControllerModel::getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup, OUString& rName )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -345,7 +345,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, css::uno::Sequence< css:
     rGroup = aSeq;
 }
 
-void StdTabControllerModel::getGroupByName( const OUString& rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup ) throw(css::uno::RuntimeException, std::exception)
+void StdTabControllerModel::getGroupByName( const OUString& rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -369,12 +369,12 @@ void StdTabControllerModel::getGroupByName( const OUString& rName, css::uno::Seq
 
 
 // css::io::XPersistObject
-OUString StdTabControllerModel::getServiceName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString StdTabControllerModel::getServiceName(  )
 {
     return OUString::createFromAscii( szServiceName_TabControllerModel );
 }
 
-void StdTabControllerModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception)
+void StdTabControllerModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -398,7 +398,7 @@ void StdTabControllerModel::write( const css::uno::Reference< css::io::XObjectOu
     }
 }
 
-void StdTabControllerModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception)
+void StdTabControllerModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -415,19 +415,16 @@ void StdTabControllerModel::read( const css::uno::Reference< css::io::XObjectInp
 }
 
 OUString StdTabControllerModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.StdTabControllerModel");
 }
 
 sal_Bool StdTabControllerModel::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> StdTabControllerModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         OUString::createFromAscii(szServiceName2_TabControllerModel),
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 0e4939947f7a..1a7319d96693 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -61,7 +61,7 @@ UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Referenc
     ImplRegisterProperty( BASEPROPERTY_TEXT );
 }
 
-OUString UnoControlTabPageContainerModel::getServiceName() throw(RuntimeException, std::exception)
+OUString UnoControlTabPageContainerModel::getServiceName()
 {
     return OUString("com.sun.star.awt.tab.UnoControlTabPageContainerModel");
 }
@@ -89,7 +89,7 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI
     }
     return *pHelper;
 }
-Reference< css::beans::XPropertySetInfo > UnoControlTabPageContainerModel::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > UnoControlTabPageContainerModel::getPropertySetInfo(  )
 {
     static Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -129,14 +129,14 @@ namespace
     }
 }
 
-Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::createTabPage( ::sal_Int16 i_tabPageID ) throw (RuntimeException, std::exception)
+Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::createTabPage( ::sal_Int16 i_tabPageID )
 {
     Sequence< Any > aInitArgs(1);
     aInitArgs[0] <<= i_tabPageID;
     return lcl_createTabPageModel( m_xContext, aInitArgs, this );
 }
 
-Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const OUString& i_resourceURL ) throw (RuntimeException, std::exception)
+Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const OUString& i_resourceURL )
 {
     Sequence< Any > aInitArgs(2);
     aInitArgs[0] <<= i_tabPageID;
@@ -144,7 +144,7 @@ Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage
     return lcl_createTabPageModel( m_xContext, aInitArgs, this );
 }
 
-void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const css::uno::Any& aElement) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const css::uno::Any& aElement)
 {
     SolarMutexGuard aSolarGuard;
     uno::Reference < XTabPageModel > xTabPageModel;
@@ -170,22 +170,22 @@ void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex
         throw IllegalArgumentException( WRONG_TYPE_EXCEPTION, static_cast<OWeakObject *>(this), 2 );
 }
 
-void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Index*/ ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Index*/ )
 {
 }
 // XIndexReplace
-void SAL_CALL UnoControlTabPageContainerModel::replaceByIndex( ::sal_Int32 /*Index*/, const uno::Any& /*Element*/ ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL UnoControlTabPageContainerModel::replaceByIndex( ::sal_Int32 /*Index*/, const uno::Any& /*Element*/ )
 {
 }
 
 // XIndexAccess
-::sal_Int32 SAL_CALL UnoControlTabPageContainerModel::getCount(  ) throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL UnoControlTabPageContainerModel::getCount(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     return sal_Int32( m_aTabPageVector.size());
 }
 
-uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nIndex )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     if ( nIndex < 0 || nIndex > sal_Int32(m_aTabPageVector.size()) )
@@ -194,23 +194,23 @@ uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nInde
 }
 
 // XElementAccess
-uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType(  )
 {
     return cppu::UnoType<css::awt::XControlModel>::get();
 }
 
-sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     return !m_aTabPageVector.empty();
 }
 // XContainer
-void UnoControlTabPageContainerModel::addContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception)
+void UnoControlTabPageContainerModel::addContainerListener( const Reference< XContainerListener >& l )
 {
     maContainerListeners.addInterface( l );
 }
 
-void UnoControlTabPageContainerModel::removeContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception)
+void UnoControlTabPageContainerModel::removeContainerListener( const Reference< XContainerListener >& l )
 {
     maContainerListeners.removeInterface( l );
 }
@@ -229,7 +229,7 @@ OUString UnoControlTabPageContainer::GetComponentServiceName()
     return OUString("TabPageContainer");
 }
 
-void SAL_CALL UnoControlTabPageContainer::dispose(  ) throw(RuntimeException, std::exception)
+void SAL_CALL UnoControlTabPageContainer::dispose(  )
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -237,7 +237,7 @@ void SAL_CALL UnoControlTabPageContainer::dispose(  ) throw(RuntimeException, st
     UnoControl::dispose();
 }
 
-void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoControlBase::createPeer( rxToolkit, rParentPeer );
 
@@ -249,43 +249,43 @@ void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit
 
 // XTabPageContainer
 
-::sal_Int16 SAL_CALL UnoControlTabPageContainer::getActiveTabPageID() throw (RuntimeException, std::exception)
+::sal_Int16 SAL_CALL UnoControlTabPageContainer::getActiveTabPageID()
 {
     SolarMutexGuard aSolarGuard;
     Reference< XTabPageContainer >  xTPContainer( getPeer(), UNO_QUERY_THROW );
     return xTPContainer->getActiveTabPageID();
 }
-void SAL_CALL UnoControlTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoControlTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpageid )
 {
     SolarMutexGuard aSolarGuard;
     Reference< XTabPageContainer >  xTPContainer( getPeer(), UNO_QUERY_THROW );
     xTPContainer->setActiveTabPageID(_activetabpageid);
 }
-::sal_Int16 SAL_CALL UnoControlTabPageContainer::getTabPageCount(  ) throw (RuntimeException, std::exception)
+::sal_Int16 SAL_CALL UnoControlTabPageContainer::getTabPageCount(  )
 {
     SolarMutexGuard aSolarGuard;
     Reference< XTabPageContainer >  xTPContainer( getPeer(), UNO_QUERY_THROW );
     return xTPContainer->getTabPageCount();
 }
-sal_Bool SAL_CALL UnoControlTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoControlTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex )
 {
     SolarMutexGuard aSolarGuard;
     Reference< XTabPageContainer >  xTPContainer( getPeer(), UNO_QUERY_THROW );
     return xTPContainer->isTabPageActive(tabPageIndex);
 }
-Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception)
+Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex )
 {
     SolarMutexGuard aSolarGuard;
     Reference< XTabPageContainer >  xTPContainer( getPeer(), UNO_QUERY_THROW );
     return xTPContainer->getTabPage(tabPageIndex);
 }
-Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException, std::exception)
+Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID )
 {
     SolarMutexGuard aSolarGuard;
     Reference< XTabPageContainer >  xTPContainer( getPeer(), UNO_QUERY_THROW );
     return xTPContainer->getTabPageByID(tabPageID);
 }
-void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener )
 {
     m_aTabPageListeners.addInterface( listener );
     if( getPeer().is() && m_aTabPageListeners.getLength() == 1 )
@@ -294,7 +294,7 @@ void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Ref
         xTabPageContainer->addTabPageContainerListener( &m_aTabPageListeners );
     }
 }
-void SAL_CALL UnoControlTabPageContainer::removeTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoControlTabPageContainer::removeTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener )
 {
     if( getPeer().is() && m_aTabPageListeners.getLength() == 1 )
     {
@@ -322,7 +322,7 @@ void UnoControlTabPageContainer::updateFromModel()
         xContainerListener->elementInserted( aEvent );
     }
 }
-void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, const Reference< css::awt::XControl >& Control ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, const Reference< css::awt::XControl >& Control )
 {
     SolarMutexGuard aSolarGuard;
     ControlContainerBase::addControl(Name,Control);
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 488d72a325ed..b8f67f88f86c 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -59,12 +59,12 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c
     ImplRegisterProperty( BASEPROPERTY_HELPURL );
 }
 
-OUString SAL_CALL UnoControlTabPageModel::getImplementationName() throw(css::uno::RuntimeException, std::exception)
+OUString SAL_CALL UnoControlTabPageModel::getImplementationName()
 {
     return OUString("stardiv.Toolkit.UnoControlTabPageModel");
 }
 
-css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServiceNames()
 {
     css::uno::Sequence< OUString > aNames = ControlModelContainerBase::getSupportedServiceNames( );
     aNames.realloc( aNames.getLength() + 1 );
@@ -72,7 +72,7 @@ css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServ
     return aNames;
 }
 
-OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException, std::exception)
+OUString UnoControlTabPageModel::getServiceName( )
 {
     return OUString("com.sun.star.awt.tab.UnoControlTabPageModel");
 }
@@ -104,14 +104,13 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     return *pHelper;
 }
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 ////----- XInitialization -------------------------------------------------------------------
 void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArguments)
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     sal_Int16 nPageId = -1;
     if ( rArguments.getLength() == 1 )
@@ -181,25 +180,22 @@ OUString UnoControlTabPage::GetComponentServiceName()
 }
 
 OUString SAL_CALL UnoControlTabPage::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlTabPage");
 }
 
 sal_Bool SAL_CALL UnoControlTabPage::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> SAL_CALL UnoControlTabPage::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > aSeq { "com.sun.star.awt.tab.UnoControlTabPage" };
     return aSeq;
 }
 
-void UnoControlTabPage::dispose() throw(RuntimeException, std::exception)
+void UnoControlTabPage::dispose()
 {
     SolarMutexGuard aSolarGuard;
 
@@ -208,12 +204,12 @@ void UnoControlTabPage::dispose() throw(RuntimeException, std::exception)
     ControlContainerBase::dispose();
 }
 
-void SAL_CALL UnoControlTabPage::disposing( const lang::EventObject& Source )throw(RuntimeException, std::exception)
+void SAL_CALL UnoControlTabPage::disposing( const lang::EventObject& Source )
 {
      ControlContainerBase::disposing( Source );
 }
 
-void UnoControlTabPage::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException, std::exception)
+void UnoControlTabPage::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer )
 {
     SolarMutexGuard aSolarGuard;
     ImplUpdateResourceResolver();
@@ -239,7 +235,6 @@ static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize
 }
 // css::awt::XWindowListener
 void SAL_CALL UnoControlTabPage::windowResized( const css::awt::WindowEvent& e )
-throw (css::uno::RuntimeException, std::exception)
 {
     OutputDevice*pOutDev = Application::GetDefaultDevice();
     DBG_ASSERT( pOutDev, "Missing Default Device!" );
@@ -277,7 +272,6 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL UnoControlTabPage::windowMoved( const css::awt::WindowEvent& e )
-throw (css::uno::RuntimeException, std::exception)
 {
     OutputDevice*pOutDev = Application::GetDefaultDevice();
     DBG_ASSERT( pOutDev, "Missing Default Device!" );
@@ -303,13 +297,11 @@ throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL UnoControlTabPage::windowShown( const css::lang::EventObject& e )
-throw (css::uno::RuntimeException, std::exception)
 {
     (void)e;
 }
 
 void SAL_CALL UnoControlTabPage::windowHidden( const css::lang::EventObject& e )
-throw (css::uno::RuntimeException, std::exception)
 {
     (void)e;
 }
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 3c42011c0b08..8acda6794406 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -44,20 +44,18 @@ namespace toolkit
     }
 
 
-    OUString UnoControlScrollBarModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception)
+    OUString UnoControlScrollBarModel::getServiceName( )
     {
         return OUString::createFromAscii( szServiceName_UnoControlScrollBarModel );
     }
 
     OUString UnoControlScrollBarModel::getImplementationName()
-        throw (css::uno::RuntimeException, std::exception)
     {
         return OUString("stardiv.Toolkit.UnoControlScrollBarModel");
     }
 
     css::uno::Sequence<OUString>
     UnoControlScrollBarModel::getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception)
     {
         auto s(UnoControlModel::getSupportedServiceNames());
         s.realloc(s.getLength() + 2);
@@ -93,7 +91,7 @@ namespace toolkit
     }
 
 
-    uno::Reference< beans::XPropertySetInfo > UnoControlScrollBarModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+    uno::Reference< beans::XPropertySetInfo > UnoControlScrollBarModel::getPropertySetInfo(  )
     {
         static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
@@ -114,7 +112,7 @@ namespace toolkit
     }
 
     // css::uno::XInterface
-    uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+    uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType )
     {
         uno::Any aRet = ::cppu::queryInterface( rType,
                                             (static_cast< awt::XAdjustmentListener* >(this)),
@@ -129,7 +127,7 @@ namespace toolkit
         UnoControlBase::getTypes()
     IMPL_XTYPEPROVIDER_END
 
-    void UnoScrollBarControl::dispose() throw(uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::dispose()
     {
         lang::EventObject aEvt;
         aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -137,7 +135,7 @@ namespace toolkit
         UnoControl::dispose();
     }
 
-    void UnoScrollBarControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
     {
         UnoControl::createPeer( rxToolkit, rParentPeer );
 
@@ -146,7 +144,7 @@ namespace toolkit
     }
 
     // css::awt::XAdjustmentListener
-    void UnoScrollBarControl::adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent )
     {
         switch ( rEvent.Type )
         {
@@ -174,29 +172,29 @@ namespace toolkit
     }
 
     // css::awt::XScrollBar
-    void UnoScrollBarControl::addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l )
     {
         maAdjustmentListeners.addInterface( l );
     }
 
-    void UnoScrollBarControl::removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l )
     {
         maAdjustmentListeners.removeInterface( l );
     }
 
-    void UnoScrollBarControl::setValue( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::setValue( sal_Int32 n )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), uno::makeAny( n ), true );
     }
 
-    void UnoScrollBarControl::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), uno::Any(nValue), true );
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), uno::Any(nVisible), true );
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), uno::Any(nMax), true );
     }
 
-    sal_Int32 UnoScrollBarControl::getValue() throw(css::uno::RuntimeException, std::exception)
+    sal_Int32 UnoScrollBarControl::getValue()
     {
         sal_Int32 n = 0;
         if ( getPeer().is() )
@@ -207,12 +205,12 @@ namespace toolkit
         return n;
     }
 
-    void UnoScrollBarControl::setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::setMaximum( sal_Int32 n )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), uno::makeAny( n ), true );
     }
 
-    sal_Int32 UnoScrollBarControl::getMaximum() throw(css::uno::RuntimeException, std::exception)
+    sal_Int32 UnoScrollBarControl::getMaximum()
     {
         sal_Int32 n = 0;
         if ( getPeer().is() )
@@ -223,12 +221,12 @@ namespace toolkit
         return n;
     }
 
-    void UnoScrollBarControl::setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::setLineIncrement( sal_Int32 n )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINEINCREMENT ), uno::makeAny( n ), true );
     }
 
-    sal_Int32 UnoScrollBarControl::getLineIncrement() throw(css::uno::RuntimeException, std::exception)
+    sal_Int32 UnoScrollBarControl::getLineIncrement()
     {
         sal_Int32 n = 0;
         if ( getPeer().is() )
@@ -239,12 +237,12 @@ namespace toolkit
         return n;
     }
 
-    void UnoScrollBarControl::setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::setBlockIncrement( sal_Int32 n )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BLOCKINCREMENT ), uno::makeAny( n ), true );
     }
 
-    sal_Int32 UnoScrollBarControl::getBlockIncrement() throw(css::uno::RuntimeException, std::exception)
+    sal_Int32 UnoScrollBarControl::getBlockIncrement()
     {
         sal_Int32 n = 0;
         if ( getPeer().is() )
@@ -255,12 +253,12 @@ namespace toolkit
         return n;
     }
 
-    void UnoScrollBarControl::setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::setVisibleSize( sal_Int32 n )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), uno::makeAny( n ), true );
     }
 
-    sal_Int32 UnoScrollBarControl::getVisibleSize() throw(css::uno::RuntimeException, std::exception)
+    sal_Int32 UnoScrollBarControl::getVisibleSize()
     {
         sal_Int32 n = 0;
         if ( getPeer().is() )
@@ -271,12 +269,12 @@ namespace toolkit
         return n;
     }
 
-    void UnoScrollBarControl::setOrientation( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception)
+    void UnoScrollBarControl::setOrientation( sal_Int32 n )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), uno::makeAny( n ), true );
     }
 
-    sal_Int32 UnoScrollBarControl::getOrientation() throw(css::uno::RuntimeException, std::exception)
+    sal_Int32 UnoScrollBarControl::getOrientation()
     {
         sal_Int32 n = 0;
         if ( getPeer().is() )
@@ -288,13 +286,11 @@ namespace toolkit
     }
 
     OUString UnoScrollBarControl::getImplementationName()
-        throw (css::uno::RuntimeException, std::exception)
     {
         return OUString("stardiv.Toolkit.UnoScrollBarControl");
     }
 
     css::uno::Sequence<OUString> UnoScrollBarControl::getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception)
     {
         auto s(UnoControlBase::getSupportedServiceNames());
         s.realloc(s.getLength() + 2);
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index d69051025218..9807970109b7 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -52,14 +52,14 @@ public:
     UnoControlModel*    Clone() const override { return new UnoSpinButtonModel( *this ); }
 
     // XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -81,36 +81,36 @@ public:
     OUString             GetComponentServiceName() override;
 
     DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase )
-    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any  SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
 
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); }
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
+    void SAL_CALL disposing( const css::lang::EventObject& Source ) override { UnoControlBase::disposing( Source ); }
+    void SAL_CALL dispose(  ) override;
 
     // XTypeProvider
     DECLARE_XTYPEPROVIDER()
 
     // XAdjustmentListener
-    void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) override;
 
     // XSpinValue
-    virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( sal_Int32 value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMinimum( sal_Int32 minValue ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMinimum(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaximum(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSpinIncrement(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getOrientation(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) override;
+    virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) override;
+    virtual void SAL_CALL setValue( sal_Int32 value ) override;
+    virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) override;
+    virtual sal_Int32 SAL_CALL getValue(  ) override;
+    virtual void SAL_CALL setMinimum( sal_Int32 minValue ) override;
+    virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) override;
+    virtual sal_Int32 SAL_CALL getMinimum(  ) override;
+    virtual sal_Int32 SAL_CALL getMaximum(  ) override;
+    virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) override;
+    virtual sal_Int32 SAL_CALL getSpinIncrement(  ) override;
+    virtual void SAL_CALL setOrientation( sal_Int32 orientation ) override;
+    virtual sal_Int32 SAL_CALL getOrientation(  ) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -143,7 +143,7 @@ public:
     }
 
 
-    OUString UnoSpinButtonModel::getServiceName( ) throw (RuntimeException, std::exception)
+    OUString UnoSpinButtonModel::getServiceName( )
     {
         return OUString("com.sun.star.awt.UnoControlSpinButtonModel");
     }
@@ -180,20 +180,20 @@ public:
     }
 
 
-    Reference< XPropertySetInfo > UnoSpinButtonModel::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+    Reference< XPropertySetInfo > UnoSpinButtonModel::getPropertySetInfo(  )
     {
         static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
 
-    OUString SAL_CALL UnoSpinButtonModel::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL UnoSpinButtonModel::getImplementationName(  )
     {
         return OUString( "stardiv.Toolkit.UnoSpinButtonModel" );
     }
 
 
-    Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames()
     {
         Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() );
         aServices.realloc( aServices.getLength() + 1 );
@@ -218,7 +218,7 @@ public:
     }
 
 
-    Any UnoSpinButtonControl::queryAggregation( const Type & rType ) throw(RuntimeException, std::exception)
+    Any UnoSpinButtonControl::queryAggregation( const Type & rType )
     {
         Any aRet = UnoControlBase::queryAggregation( rType );
         if ( !aRet.hasValue() )
@@ -230,7 +230,7 @@ public:
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoSpinButtonControl, UnoControlBase, UnoSpinButtonControl_Base )
 
 
-    void UnoSpinButtonControl::dispose() throw(RuntimeException, std::exception)
+    void UnoSpinButtonControl::dispose()
     {
         ::osl::ClearableMutexGuard aGuard( GetMutex() );
         if ( maAdjustmentListeners.getLength() )
@@ -250,13 +250,13 @@ public:
     }
 
 
-    OUString SAL_CALL UnoSpinButtonControl::getImplementationName(  ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL UnoSpinButtonControl::getImplementationName(  )
     {
         return OUString( "stardiv.Toolkit.UnoSpinButtonControl" );
     }
 
 
-    Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames()
     {
         Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() );
         aServices.realloc( aServices.getLength() + 1 );
@@ -265,7 +265,7 @@ public:
     }
 
 
-    void UnoSpinButtonControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException, std::exception)
+    void UnoSpinButtonControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer )
     {
         UnoControl::createPeer( rxToolkit, rParentPeer );
 
@@ -275,7 +275,7 @@ public:
     }
 
 
-    void UnoSpinButtonControl::adjustmentValueChanged( const AdjustmentEvent& rEvent ) throw(RuntimeException, std::exception)
+    void UnoSpinButtonControl::adjustmentValueChanged( const AdjustmentEvent& rEvent )
     {
         switch ( rEvent.Type )
         {
@@ -297,27 +297,27 @@ public:
     }
 
 
-    void UnoSpinButtonControl::addAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException, std::exception)
+    void UnoSpinButtonControl::addAdjustmentListener( const Reference< XAdjustmentListener > & listener )
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         maAdjustmentListeners.addInterface( listener );
     }
 
 
-    void UnoSpinButtonControl::removeAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException, std::exception)
+    void UnoSpinButtonControl::removeAdjustmentListener( const Reference< XAdjustmentListener > & listener )
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         maAdjustmentListeners.removeInterface( listener );
     }
 
 
-    void SAL_CALL UnoSpinButtonControl::setValue( sal_Int32 value ) throw (RuntimeException, std::exception)
+    void SAL_CALL UnoSpinButtonControl::setValue( sal_Int32 value )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), true );
     }
 
 
-    void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException, std::exception)
+    void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), true );
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), true );
@@ -325,7 +325,7 @@ public:
     }
 
 
-    sal_Int32 SAL_CALL UnoSpinButtonControl::getValue(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL UnoSpinButtonControl::getValue(  )
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         sal_Int32 nValue = 0;
@@ -338,19 +338,19 @@ public:
     }
 
 
-    void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException, std::exception)
+    void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), true );
     }
 
 
-    void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException, std::exception)
+    void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), true );
     }
 
 
-    sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum(  )
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         sal_Int32 nMin = 0;
@@ -363,7 +363,7 @@ public:
     }
 
 
-    sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum(  )
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         sal_Int32 nMax = 0;
@@ -376,13 +376,13 @@ public:
     }
 
 
-    void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException, std::exception)
+    void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), true );
     }
 
 
-    sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement(  )
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         sal_Int32 nIncrement = 0;
@@ -395,13 +395,13 @@ public:
     }
 
 
-    void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException, std::exception)
+    void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation )
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), true );
     }
 
 
-    sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation(  ) throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation(  )
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         sal_Int32 nOrientation = ScrollBarOrientation::HORIZONTAL;
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 428d5b9ddfcc..3cba6623cd6c 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -79,7 +79,7 @@ UnoControlModel* UnoTreeModel::Clone() const
     return new UnoTreeModel( *this );
 }
 
-OUString UnoTreeModel::getServiceName() throw(RuntimeException, std::exception)
+OUString UnoTreeModel::getServiceName()
 {
     return OUString( "com.sun.star.awt.tree.TreeControlModel" );
 }
@@ -120,7 +120,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 }
 
 // XMultiPropertySet
-Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo(  )
 {
     static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -138,47 +138,47 @@ public:
     OUString GetComponentServiceName() override;
 
     // css::lang::XComponent
-    void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL dispose(  ) override;
 
     // css::awt::XControl
-    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override;
 
     // css::view::XSelectionSupplier
-    virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) override;
+    virtual css::uno::Any SAL_CALL getSelection(  ) override;
+    virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
+    virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
 
     // css::view::XMultiSelectionSupplier
-    virtual sal_Bool SAL_CALL addSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getSelectionCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSelectionEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL addSelection( const css::uno::Any& Selection ) override;
+    virtual void SAL_CALL removeSelection( const css::uno::Any& Selection ) override;
+    virtual void SAL_CALL clearSelection(  ) override;
+    virtual ::sal_Int32 SAL_CALL getSelectionCount(  ) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSelectionEnumeration(  ) override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration(  ) override;
 
     // css::awt::XTreeControl
-    virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNodeExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNodeCollapsed( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL makeNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL expandNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL collapseNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::awt::Rectangle SAL_CALL getNodeRect( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isEditing(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL stopEditing(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancelEditing(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startEditingAtNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDefaultExpandedGraphicURL() override;
+    virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) override;
+    virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() override;
+    virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) override;
+    virtual sal_Bool SAL_CALL isNodeExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual sal_Bool SAL_CALL isNodeCollapsed( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL makeNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual sal_Bool SAL_CALL isNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL expandNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL collapseNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL addTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) override;
+    virtual void SAL_CALL removeTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) override;
+    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) override;
+    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) override;
+    virtual css::awt::Rectangle SAL_CALL getNodeRect( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual sal_Bool SAL_CALL isEditing(  ) override;
+    virtual sal_Bool SAL_CALL stopEditing(  ) override;
+    virtual void SAL_CALL cancelEditing(  ) override;
+    virtual void SAL_CALL startEditingAtNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual void SAL_CALL addTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) override;
+    virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) override;
 
     // css::lang::XServiceInfo
     DECLIMPL_SERVICEINFO_DERIVED( UnoTreeControl, UnoControlBase, "com.sun.star.awt.tree.TreeControl" )
@@ -207,19 +207,19 @@ OUString UnoTreeControl::GetComponentServiceName()
 // css::view::XSelectionSupplier
 
 
-sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection )
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->select( rSelection );
 }
 
 
-Any SAL_CALL UnoTreeControl::getSelection() throw (RuntimeException, std::exception)
+Any SAL_CALL UnoTreeControl::getSelection()
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelection();
 }
 
 
-void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener )
 {
     maSelectionListeners.addInterface( xListener );
     if( getPeer().is() && (maSelectionListeners.getLength() == 1) )
@@ -231,7 +231,7 @@ void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSele
 }
 
 
-void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener )
 {
     if( getPeer().is() && (maSelectionListeners.getLength() == 1) )
     {
@@ -246,37 +246,37 @@ void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XS
 // css::view::XMultiSelectionSupplier
 
 
-sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection )
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->addSelection(rSelection);
 }
 
 
-void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection )
 {
     Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->removeSelection(rSelection);
 }
 
 
-void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::clearSelection()
 {
     Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->clearSelection();
 }
 
 
-sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount()
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelectionCount();
 }
 
 
-Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration() throw (RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration()
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createSelectionEnumeration();
 }
 
 
-Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration() throw (RuntimeException, std::exception)
+Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration()
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createReverseSelectionEnumeration();
 }
@@ -285,67 +285,67 @@ Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumera
 // XTreeControl
 
 
-OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL() throw (RuntimeException, std::exception)
+OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL()
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultExpandedGraphicURL();
 }
 
 
-void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl )
 {
     Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->setDefaultExpandedGraphicURL(_defaultexpansiongraphicurl);
 }
 
 
-OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL() throw (RuntimeException, std::exception)
+OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL()
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultCollapsedGraphicURL();
 }
 
 
-void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl )
 {
     Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->setDefaultCollapsedGraphicURL(_defaultcollapsedgraphicurl);
 }
 
 
-sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception)
+sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode )
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeExpanded(xNode);
 }
 
 
-sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception)
+sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode )
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeCollapsed(xNode);
 }
 
 
-void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception)
+void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode )
 {
     Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->makeNodeVisible(xNode);
 }
 
 
-sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception)
+sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode )
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeVisible(xNode);
 }
 
 
-void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception)
+void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode )
 {
     Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->expandNode(xNode);
 }
 
 
-void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception)
+void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode )
 {
     Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->collapseNode(xNode);
 }
 
 
-void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener )
 {
     maTreeExpansionListeners.addInterface( xListener );
     if( getPeer().is() && (maTreeExpansionListeners.getLength() == 1) )
@@ -357,7 +357,7 @@ void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeEx
 }
 
 
-void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener )
 {
     if( getPeer().is() && (maTreeExpansionListeners.getLength() == 1) )
     {
@@ -369,49 +369,49 @@ void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTre
 }
 
 
-Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception)
+Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y )
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeForLocation(x,y);
 }
 
 
-Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception)
+Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y )
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getClosestNodeForLocation(x,y);
 }
 
 
-awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node ) throw (IllegalArgumentException, RuntimeException, std::exception)
+awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node )
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeRect( Node );
 }
 
 
-sal_Bool SAL_CALL UnoTreeControl::isEditing(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoTreeControl::isEditing(  )
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isEditing();
 }
 
 
-sal_Bool SAL_CALL UnoTreeControl::stopEditing() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoTreeControl::stopEditing()
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->stopEditing();
 }
 
 
-void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::cancelEditing()
 {
     Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->cancelEditing();
 }
 
 
-void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode )
 {
     Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->startEditingAtNode(xNode);
 }
 
 
-void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener )
 {
     maTreeEditListeners.addInterface( xListener );
     if( getPeer().is() && (maTreeEditListeners.getLength() == 1) )
@@ -423,7 +423,7 @@ void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditLis
 }
 
 
-void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener )
 {
     if( getPeer().is() && (maTreeEditListeners.getLength() == 1) )
     {
@@ -438,7 +438,7 @@ void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEdit
 // XComponent
 
 
-void SAL_CALL UnoTreeControl::dispose(  ) throw(RuntimeException, std::exception)
+void SAL_CALL UnoTreeControl::dispose(  )
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast< ::cppu::OWeakObject* >(this);
@@ -447,7 +447,7 @@ void SAL_CALL UnoTreeControl::dispose(  ) throw(RuntimeException, std::exception
     UnoControl::dispose();
 }
 
-void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoControlBase::createPeer( rxToolkit, rParentPeer );
 
@@ -460,7 +460,7 @@ void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk
 
 }
 
-void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNode >& Node ) throw (RuntimeException, css::util::VetoException, std::exception)
+void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNode >& Node )
 {
     ::comphelper::OInterfaceIteratorHelper2 aIt( *this );
     while( aIt.hasMoreElements() )
@@ -484,7 +484,7 @@ void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNo
     }
 }
 
-void SAL_CALL TreeEditListenerMultiplexer::nodeEdited( const Reference< XTreeNode >& Node, const OUString& NewText ) throw (RuntimeException, std::exception)
+void SAL_CALL TreeEditListenerMultiplexer::nodeEdited( const Reference< XTreeNode >& Node, const OUString& NewText )
 {
     ::comphelper::OInterfaceIteratorHelper2 aIt( *this );
     while( aIt.hasMoreElements() )
diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx
index 6b014d84d5e1..e40f9410185e 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -43,18 +43,16 @@ public:
     UnoControlModel* Clone() const override;
 
     // css::beans::XMultiPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
 
     // css::io::XPersistObject
-    OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getServiceName() override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("stardiv.Toolkit.TreeControlModel"); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         auto s(UnoControlModel::getSupportedServiceNames());
         s.realloc(s.getLength() + 1);
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index 0f925a5566fa..d150b242cc13 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -53,23 +53,23 @@ public:
     void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode );
 
     // XMutableTreeDataModel
-    virtual css::uno::Reference< css::awt::tree::XMutableTreeNode > SAL_CALL createNode( const css::uno::Any& DisplayValue, sal_Bool ChildrenOnDemand ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRoot( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& RootNode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::tree::XMutableTreeNode > SAL_CALL createNode( const css::uno::Any& DisplayValue, sal_Bool ChildrenOnDemand ) override;
+    virtual void SAL_CALL setRoot( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& RootNode ) override;
 
     // XTreeDataModel
-    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getRoot(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getRoot(  ) override;
+    virtual void SAL_CALL addTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) override;
+    virtual void SAL_CALL removeTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose(  ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose(  ) override;
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
     bool mbDisposed;
@@ -89,32 +89,32 @@ public:
     void broadcast_changes(const Reference< XTreeNode >& xNode, bool bNew);
 
     // XMutableTreeNode
-    virtual css::uno::Any SAL_CALL getDataValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDataValue( const css::uno::Any& _datavalue ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL appendChild( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertChildByIndex( ::sal_Int32 Index, const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChildByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHasChildrenOnDemand( sal_Bool ChildrenOnDemand ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDisplayValue( const css::uno::Any& Value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNodeGraphicURL( const OUString& URL ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setExpandedGraphicURL( const OUString& URL ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCollapsedGraphicURL( const OUString& URL ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getDataValue() override;
+    virtual void SAL_CALL setDataValue( const css::uno::Any& _datavalue ) override;
+    virtual void SAL_CALL appendChild( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) override;
+    virtual void SAL_CALL insertChildByIndex( ::sal_Int32 Index, const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) override;
+    virtual void SAL_CALL removeChildByIndex( ::sal_Int32 Index ) override;
+    virtual void SAL_CALL setHasChildrenOnDemand( sal_Bool ChildrenOnDemand ) override;
+    virtual void SAL_CALL setDisplayValue( const css::uno::Any& Value ) override;
+    virtual void SAL_CALL setNodeGraphicURL( const OUString& URL ) override;
+    virtual void SAL_CALL setExpandedGraphicURL( const OUString& URL ) override;
+    virtual void SAL_CALL setCollapsedGraphicURL( const OUString& URL ) override;
 
     // XTreeNode
-    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getChildAt( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getChildCount(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getIndex( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasChildrenOnDemand(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getDisplayValue(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNodeGraphicURL(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getExpandedGraphicURL(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCollapsedGraphicURL(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getChildAt( ::sal_Int32 Index ) override;
+    virtual ::sal_Int32 SAL_CALL getChildCount(  ) override;
+    virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getParent(  ) override;
+    virtual ::sal_Int32 SAL_CALL getIndex( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override;
+    virtual sal_Bool SAL_CALL hasChildrenOnDemand(  ) override;
+    virtual css::uno::Any SAL_CALL getDisplayValue(  ) override;
+    virtual OUString SAL_CALL getNodeGraphicURL(  ) override;
+    virtual OUString SAL_CALL getExpandedGraphicURL(  ) override;
+    virtual OUString SAL_CALL getCollapsedGraphicURL(  ) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     static Reference< XTreeNode > getReference( MutableTreeNode* pNode )
     {
@@ -164,12 +164,12 @@ void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTr
     }
 }
 
-Reference< XMutableTreeNode > SAL_CALL MutableTreeDataModel::createNode( const Any& aValue, sal_Bool bChildrenOnDemand ) throw (RuntimeException, std::exception)
+Reference< XMutableTreeNode > SAL_CALL MutableTreeDataModel::createNode( const Any& aValue, sal_Bool bChildrenOnDemand )
 {
     return new MutableTreeNode( this, aValue, bChildrenOnDemand );
 }
 
-void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode >& xNode )
 {
     if( !xNode.is() )
         throw IllegalArgumentException();
@@ -196,23 +196,23 @@ void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode >
     }
 }
 
-Reference< XTreeNode > SAL_CALL MutableTreeDataModel::getRoot(  ) throw (RuntimeException, std::exception)
+Reference< XTreeNode > SAL_CALL MutableTreeDataModel::getRoot(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     return mxRootNode;
 }
 
-void SAL_CALL MutableTreeDataModel::addTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeDataModel::addTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener )
 {
     BrdcstHelper.addListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener );
 }
 
-void SAL_CALL MutableTreeDataModel::removeTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeDataModel::removeTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener )
 {
     BrdcstHelper.removeListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener );
 }
 
-void SAL_CALL MutableTreeDataModel::dispose() throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeDataModel::dispose()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -225,27 +225,27 @@ void SAL_CALL MutableTreeDataModel::dispose() throw (RuntimeException, std::exce
     }
 }
 
-void SAL_CALL MutableTreeDataModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeDataModel::addEventListener( const Reference< XEventListener >& xListener )
 {
     BrdcstHelper.addListener( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
-void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEventListener >& xListener )
 {
     BrdcstHelper.removeListener( cppu::UnoType<XEventListener>::get(), xListener );
 }
 
-OUString SAL_CALL MutableTreeDataModel::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL MutableTreeDataModel::getImplementationName(  )
 {
     return OUString( "toolkit.MutableTreeDataModel" );
 }
 
-sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames(  )
 {
     Sequence<OUString> aSeq { "com.sun.star.awt.tree.MutableTreeDataModel" };
     return aSeq;
@@ -291,19 +291,19 @@ void MutableTreeNode::broadcast_changes(const Reference< XTreeNode >& xNode, boo
     }
 }
 
-Any SAL_CALL MutableTreeNode::getDataValue() throw (RuntimeException, std::exception)
+Any SAL_CALL MutableTreeNode::getDataValue()
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     return maDataValue;
 }
 
-void SAL_CALL MutableTreeNode::setDataValue( const Any& _datavalue ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeNode::setDataValue( const Any& _datavalue )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     maDataValue = _datavalue;
 }
 
-void SAL_CALL MutableTreeNode::appendChild( const Reference< XMutableTreeNode >& xChildNode ) throw (IllegalArgumentException, RuntimeException, std::exception)
+void SAL_CALL MutableTreeNode::appendChild( const Reference< XMutableTreeNode >& xChildNode )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     Reference< XTreeNode > xNode( xChildNode.get() );
@@ -319,7 +319,7 @@ void SAL_CALL MutableTreeNode::appendChild( const Reference< XMutableTreeNode >&
     broadcast_changes( xNode, true );
 }
 
-void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const Reference< XMutableTreeNode >& xChildNode ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const Reference< XMutableTreeNode >& xChildNode )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
 
@@ -343,7 +343,7 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const
     broadcast_changes( xNode, true );
 }
 
-void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
 
@@ -367,7 +367,7 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw
     broadcast_changes( getReference( xImpl.get() ), false );
 }
 
-void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDemand ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDemand )
 {
     bool bChanged;
 
@@ -381,7 +381,7 @@ void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDeman
         broadcast_changes();
 }
 
-void SAL_CALL MutableTreeNode::setDisplayValue( const Any& aValue ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeNode::setDisplayValue( const Any& aValue )
 {
     {
         ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
@@ -391,7 +391,7 @@ void SAL_CALL MutableTreeNode::setDisplayValue( const Any& aValue ) throw (Runti
     broadcast_changes();
 }
 
-void SAL_CALL MutableTreeNode::setNodeGraphicURL( const OUString& rURL ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeNode::setNodeGraphicURL( const OUString& rURL )
 {
     bool bChanged;
 
@@ -405,7 +405,7 @@ void SAL_CALL MutableTreeNode::setNodeGraphicURL( const OUString& rURL ) throw (
         broadcast_changes();
 }
 
-void SAL_CALL MutableTreeNode::setExpandedGraphicURL( const OUString& rURL ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeNode::setExpandedGraphicURL( const OUString& rURL )
 {
     bool bChanged;
 
@@ -419,7 +419,7 @@ void SAL_CALL MutableTreeNode::setExpandedGraphicURL( const OUString& rURL ) thr
         broadcast_changes();
 }
 
-void SAL_CALL MutableTreeNode::setCollapsedGraphicURL( const OUString& rURL ) throw (RuntimeException, std::exception)
+void SAL_CALL MutableTreeNode::setCollapsedGraphicURL( const OUString& rURL )
 {
     bool bChanged;
 
@@ -433,7 +433,7 @@ void SAL_CALL MutableTreeNode::setCollapsedGraphicURL( const OUString& rURL ) th
         broadcast_changes();
 }
 
-Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException,RuntimeException, std::exception)
+Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildIndex )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
 
@@ -442,19 +442,19 @@ Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildInd
     return getReference( maChildren[nChildIndex].get() );
 }
 
-sal_Int32 SAL_CALL MutableTreeNode::getChildCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL MutableTreeNode::getChildCount(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     return (sal_Int32)maChildren.size();
 }
 
-Reference< XTreeNode > SAL_CALL MutableTreeNode::getParent(  ) throw (RuntimeException, std::exception)
+Reference< XTreeNode > SAL_CALL MutableTreeNode::getParent(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     return getReference( mpParent );
 }
 
-sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNode ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNode )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
 
@@ -472,47 +472,47 @@ sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNod
     return -1;
 }
 
-sal_Bool SAL_CALL MutableTreeNode::hasChildrenOnDemand(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL MutableTreeNode::hasChildrenOnDemand(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     return mbHasChildrenOnDemand;
 }
 
-Any SAL_CALL MutableTreeNode::getDisplayValue(  ) throw (RuntimeException, std::exception)
+Any SAL_CALL MutableTreeNode::getDisplayValue(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     return maDisplayValue;
 }
 
-OUString SAL_CALL MutableTreeNode::getNodeGraphicURL(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL MutableTreeNode::getNodeGraphicURL(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     return maNodeGraphicURL;
 }
 
-OUString SAL_CALL MutableTreeNode::getExpandedGraphicURL(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL MutableTreeNode::getExpandedGraphicURL(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     return maExpandedGraphicURL;
 }
 
-OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
     return maCollapsedGraphicURL;
 }
 
-OUString SAL_CALL MutableTreeNode::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL MutableTreeNode::getImplementationName(  )
 {
     return OUString( "toolkit.MutableTreeNode" );
 }
 
-sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames(  )
 {
     Sequence<OUString> aSeq { "com.sun.star.awt.tree.MutableTreeNode" };
     return aSeq;
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 3bf3d5d51d43..c074859e02ba 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -341,7 +341,7 @@ UnoControl::DisposeAccessibleContext(Reference<XComponent> const& xContextComp)
     }
 }
 
-void UnoControl::dispose(  ) throw(RuntimeException, std::exception)
+void UnoControl::dispose(  )
 {
     Reference< XWindowPeer > xPeer;
     Reference<XComponent> xAccessibleComp;
@@ -380,14 +380,14 @@ void UnoControl::dispose(  ) throw(RuntimeException, std::exception)
     setContext( Reference< XInterface > () );
 }
 
-void UnoControl::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::addEventListener( const Reference< XEventListener >& rxListener )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
     maDisposeListeners.addInterface( rxListener );
 }
 
-void UnoControl::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::removeEventListener( const Reference< XEventListener >& rxListener )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
@@ -400,7 +400,7 @@ bool UnoControl::requiresNewPeer( const OUString& /* _rPropertyName */ ) const
 }
 
 // XPropertiesChangeListener
-void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception)
+void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvents )
 {
     Sequence< PropertyChangeEvent > aEvents( rEvents );
     {
@@ -660,7 +660,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
     }
 }
 
-void UnoControl::disposing( const EventObject& rEvt ) throw(RuntimeException, std::exception)
+void UnoControl::disposing( const EventObject& rEvt )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     // do not compare differing types in case of multiple inheritance
@@ -684,7 +684,7 @@ void UnoControl::disposing( const EventObject& rEvt ) throw(RuntimeException, st
 }
 
 
-void SAL_CALL UnoControl::setOutputSize( const awt::Size& aSize ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoControl::setOutputSize( const awt::Size& aSize )
 {
     Reference< XWindow2 > xPeerWindow;
     {
@@ -711,33 +711,33 @@ namespace
     }
 }
 
-awt::Size SAL_CALL UnoControl::getOutputSize(  ) throw (RuntimeException, std::exception)
+awt::Size SAL_CALL UnoControl::getOutputSize(  )
 {
     return lcl_askPeer( getPeer(), &XWindow2::getOutputSize, awt::Size() );
 }
 
-sal_Bool SAL_CALL UnoControl::isVisible(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoControl::isVisible(  )
 {
     return lcl_askPeer( getPeer(), &XWindow2::isVisible, maComponentInfos.bVisible );
 }
 
-sal_Bool SAL_CALL UnoControl::isActive(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoControl::isActive(  )
 {
     return lcl_askPeer( getPeer(), &XWindow2::isActive, false );
 }
 
-sal_Bool SAL_CALL UnoControl::isEnabled(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoControl::isEnabled(  )
 {
     return lcl_askPeer( getPeer(), &XWindow2::isEnabled, maComponentInfos.bEnable );
 }
 
-sal_Bool SAL_CALL UnoControl::hasFocus(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoControl::hasFocus(  )
 {
     return lcl_askPeer( getPeer(), &XWindow2::hasFocus, false );
 }
 
 // XWindow
-void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(RuntimeException, std::exception)
+void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
 {
     Reference< XWindow > xWindow;
     {
@@ -760,7 +760,7 @@ void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3
         xWindow->setPosSize( X, Y, Width, Height, Flags );
 }
 
-awt::Rectangle UnoControl::getPosSize(  ) throw(RuntimeException, std::exception)
+awt::Rectangle UnoControl::getPosSize(  )
 {
     awt::Rectangle aRect( maComponentInfos.nX, maComponentInfos.nY, maComponentInfos.nWidth, maComponentInfos.nHeight);
     Reference< XWindow > xWindow;
@@ -775,7 +775,7 @@ awt::Rectangle UnoControl::getPosSize(  ) throw(RuntimeException, std::exception
     return aRect;
 }
 
-void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException, std::exception)
+void UnoControl::setVisible( sal_Bool bVisible )
 {
     Reference< XWindow > xWindow;
     {
@@ -789,7 +789,7 @@ void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException, std::ex
         xWindow->setVisible( bVisible );
 }
 
-void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException, std::exception)
+void UnoControl::setEnable( sal_Bool bEnable )
 {
     Reference< XWindow > xWindow;
     {
@@ -803,7 +803,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException, std::exce
         xWindow->setEnable( bEnable );
 }
 
-void UnoControl::setFocus(  ) throw(RuntimeException, std::exception)
+void UnoControl::setFocus(  )
 {
     Reference< XWindow > xWindow;
     {
@@ -814,7 +814,7 @@ void UnoControl::setFocus(  ) throw(RuntimeException, std::exception)
         xWindow->setFocus();
 }
 
-void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -827,7 +827,7 @@ void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListen
         xPeerWindow->addWindowListener( &maWindowListeners );
 }
 
-void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -840,7 +840,7 @@ void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxLis
         xPeerWindow->removeWindowListener( &maWindowListeners );
 }
 
-void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -853,7 +853,7 @@ void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener
         xPeerWindow->addFocusListener( &maFocusListeners );
 }
 
-void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -866,7 +866,7 @@ void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListe
         xPeerWindow->removeFocusListener( &maFocusListeners );
 }
 
-void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -879,7 +879,7 @@ void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener ) t
         xPeerWindow->addKeyListener( &maKeyListeners);
 }
 
-void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -892,7 +892,7 @@ void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener
         xPeerWindow->removeKeyListener( &maKeyListeners);
 }
 
-void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -905,7 +905,7 @@ void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener
         xPeerWindow->addMouseListener( &maMouseListeners);
 }
 
-void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -918,7 +918,7 @@ void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListe
         xPeerWindow->removeMouseListener( &maMouseListeners );
 }
 
-void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -931,7 +931,7 @@ void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener >
         xPeerWindow->addMouseMotionListener( &maMouseMotionListeners);
 }
 
-void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -944,7 +944,7 @@ void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListene
         xPeerWindow->removeMouseMotionListener( &maMouseMotionListeners );
 }
 
-void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -957,7 +957,7 @@ void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener
         xPeerWindow->addPaintListener( &maPaintListeners);
 }
 
-void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListener ) throw(RuntimeException, std::exception)
+void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListener )
 {
     Reference< XWindow > xPeerWindow;
     {
@@ -971,7 +971,7 @@ void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListe
 }
 
 // XView
-sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw(RuntimeException, std::exception)
+sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice )
 {
     Reference< XView > xView;
     {
@@ -983,18 +983,18 @@ sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw(
     return !xView.is() || xView->setGraphics( rDevice );
 }
 
-Reference< XGraphics > UnoControl::getGraphics(  ) throw(RuntimeException, std::exception)
+Reference< XGraphics > UnoControl::getGraphics(  )
 {
     return mxGraphics;
 }
 
-awt::Size UnoControl::getSize(  ) throw(RuntimeException, std::exception)
+awt::Size UnoControl::getSize(  )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     return awt::Size( maComponentInfos.nWidth, maComponentInfos.nHeight );
 }
 
-void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException, std::exception)
+void UnoControl::draw( sal_Int32 x, sal_Int32 y )
 {
     Reference< XWindowPeer > xDrawPeer;
     Reference< XView > xDrawPeerView;
@@ -1023,7 +1023,7 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException, std::e
         xDrawPeer->dispose();
 }
 
-void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException, std::exception)
+void UnoControl::setZoom( float fZoomX, float fZoomY )
 {
     Reference< XView > xView;
     {
@@ -1039,14 +1039,14 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException, s
 }
 
 // XControl
-void UnoControl::setContext( const Reference< XInterface >& rxContext ) throw(RuntimeException, std::exception)
+void UnoControl::setContext( const Reference< XInterface >& rxContext )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
     mxContext = rxContext;
 }
 
-Reference< XInterface > UnoControl::getContext(  ) throw(RuntimeException, std::exception)
+Reference< XInterface > UnoControl::getContext(  )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
@@ -1078,7 +1078,7 @@ void UnoControl::peerCreated()
         xWindow->addPaintListener( &maPaintListeners );
 }
 
-void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Reference< XWindowPeer >& rParentPeer ) throw(RuntimeException, std::exception)
+void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Reference< XWindowPeer >& rParentPeer )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     if ( !mxModel.is() )
@@ -1320,13 +1320,13 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
     }
 }
 
-Reference< XWindowPeer > UnoControl::getPeer() throw(RuntimeException, std::exception)
+Reference< XWindowPeer > UnoControl::getPeer()
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     return mxPeer;
 }
 
-sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception)
+sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
@@ -1364,17 +1364,17 @@ sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw
     return mxModel.is();
 }
 
-Reference< XControlModel > UnoControl::getModel(    ) throw(RuntimeException, std::exception)
+Reference< XControlModel > UnoControl::getModel(    )
 {
     return mxModel;
 }
 
-Reference< XView > UnoControl::getView(  ) throw(RuntimeException, std::exception)
+Reference< XView > UnoControl::getView(  )
 {
     return  static_cast< XView* >( this );
 }
 
-void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException, std::exception)
+void UnoControl::setDesignMode( sal_Bool bOn )
 {
     ModeChangeEvent aModeChangeEvent;
 
@@ -1409,36 +1409,36 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException, std::exce
     maModeChangeListeners.notifyEach( &XModeChangeListener::modeChanged, aModeChangeEvent );
 }
 
-sal_Bool UnoControl::isDesignMode(  ) throw(RuntimeException, std::exception)
+sal_Bool UnoControl::isDesignMode(  )
 {
     return mbDesignMode;
 }
 
-sal_Bool UnoControl::isTransparent(  ) throw(RuntimeException, std::exception)
+sal_Bool UnoControl::isTransparent(  )
 {
     return false;
 }
 
 // XServiceInfo
-OUString UnoControl::getImplementationName(  ) throw(RuntimeException, std::exception)
+OUString UnoControl::getImplementationName(  )
 {
     OSL_FAIL( "This method should be overridden!" );
     return OUString();
 }
 
-sal_Bool UnoControl::supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool UnoControl::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > UnoControl::getSupportedServiceNames(  ) throw(RuntimeException, std::exception)
+Sequence< OUString > UnoControl::getSupportedServiceNames(  )
 {
     OUString sName( "com.sun.star.awt.UnoControl" );
     return Sequence< OUString >( &sName, 1 );
 }
 
 
-Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext(  ) throw (RuntimeException, std::exception)
+Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext(  )
 {
     // creation of the context will certainly require the SolarMutex ...
     SolarMutexGuard aSolarGuard;
@@ -1473,30 +1473,30 @@ Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext(  ) th
     return xCurrentContext;
 }
 
-void SAL_CALL UnoControl::addModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoControl::addModeChangeListener( const Reference< XModeChangeListener >& _rxListener )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     maModeChangeListeners.addInterface( _rxListener );
 }
 
-void SAL_CALL UnoControl::removeModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL UnoControl::removeModeChangeListener( const Reference< XModeChangeListener >& _rxListener )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     maModeChangeListeners.removeInterface( _rxListener );
 }
 
-void SAL_CALL UnoControl::addModeChangeApproveListener( const Reference< XModeChangeApproveListener >& ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL UnoControl::addModeChangeApproveListener( const Reference< XModeChangeApproveListener >& )
 {
     throw NoSupportException( );
 }
 
-void SAL_CALL UnoControl::removeModeChangeApproveListener( const Reference< XModeChangeApproveListener >&  ) throw (NoSupportException, RuntimeException, std::exception)
+void SAL_CALL UnoControl::removeModeChangeApproveListener( const Reference< XModeChangeApproveListener >&  )
 {
     throw NoSupportException( );
 }
 
 
-awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException, std::exception)
+awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, ::sal_Int16 i_TargetUnit )
 {
     Reference< XUnitConversion > xPeerConversion;
     {
@@ -1509,7 +1509,7 @@ awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point,
 }
 
 
-awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException, std::exception)
+awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point, ::sal_Int16 i_SourceUnit )
 {
     Reference< XUnitConversion > xPeerConversion;
     {
@@ -1522,7 +1522,7 @@ awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point,
 }
 
 
-awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException, std::exception)
+awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sal_Int16 i_TargetUnit )
 {
     Reference< XUnitConversion > xPeerConversion;
     {
@@ -1535,7 +1535,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sa
 }
 
 
-awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException, std::exception)
+awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sal_Int16 i_SourceUnit )
 {
     Reference< XUnitConversion > xPeerConversion;
     {
@@ -1548,7 +1548,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sa
 }
 
 
-uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() throw (RuntimeException, std::exception)
+uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings()
 {
     Reference< awt::XStyleSettingsSupplier > xPeerSupplier;
     {
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index d752eb177b9a..d64d9f75562c 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -354,21 +354,19 @@ public:
         : mxControlContainer( xControlContainer ) {}
 
     // XEventListener
-    virtual void SAL_CALL disposing( const  lang::EventObject& Source ) throw( uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const  lang::EventObject& Source ) override;
 
     // XPropertyChangeListener
-    virtual void SAL_CALL propertyChange( const  beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL propertyChange( const  beans::PropertyChangeEvent& evt ) override;
 
 };
 
 void SAL_CALL DialogStepChangedListener::disposing( const  lang::EventObject& /*_rSource*/)
-    throw( uno::RuntimeException, std::exception)
 {
     mxControlContainer.clear();
 }
 
 void SAL_CALL DialogStepChangedListener::propertyChange( const  beans::PropertyChangeEvent& evt )
-    throw( uno::RuntimeException, std::exception)
 {
     // evt.PropertyName HAS to be "Step" because we only use the listener for that
     sal_Int32 nDialogStep = 0;
@@ -411,7 +409,7 @@ void UnoControlContainer::ImplActivateTabControllers()
 }
 
 // lang::XComponent
-void UnoControlContainer::dispose(  ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::dispose(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -444,7 +442,7 @@ void UnoControlContainer::dispose(  ) throw(uno::RuntimeException, std::exceptio
 }
 
 // lang::XEventListener
-void UnoControlContainer::disposing( const lang::EventObject& _rEvt ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::disposing( const lang::EventObject& _rEvt )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -456,14 +454,14 @@ void UnoControlContainer::disposing( const lang::EventObject& _rEvt ) throw(uno:
 }
 
 // container::XContainer
-void UnoControlContainer::addContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::addContainerListener( const uno::Reference< container::XContainerListener >& rxListener )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maCListeners.addInterface( rxListener );
 }
 
-void UnoControlContainer::removeContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::removeContainerListener( const uno::Reference< container::XContainerListener >& rxListener )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -471,7 +469,7 @@ void UnoControlContainer::removeContainerListener( const uno::Reference< contain
 }
 
 
-::sal_Int32 SAL_CALL UnoControlContainer::insert( const uno::Any& _rElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL UnoControlContainer::insert( const uno::Any& _rElement )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -486,7 +484,7 @@ void UnoControlContainer::removeContainerListener( const uno::Reference< contain
     return impl_addControl( xControl );
 }
 
-void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -500,7 +498,7 @@ void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier
     impl_removeControl( _nIdentifier, xControl );
 }
 
-void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, const uno::Any& _rElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, const uno::Any& _rElement )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -538,7 +536,7 @@ void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier,
     }
 }
 
-uno::Any SAL_CALL UnoControlContainer::getByIdentifier( ::sal_Int32 _nIdentifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL UnoControlContainer::getByIdentifier( ::sal_Int32 _nIdentifier )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -548,7 +546,7 @@ uno::Any SAL_CALL UnoControlContainer::getByIdentifier( ::sal_Int32 _nIdentifier
     return uno::makeAny( xControl );
 }
 
-uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlContainer::getIdentifiers(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlContainer::getIdentifiers(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -558,19 +556,19 @@ uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlContainer::getIdentifiers(  ) th
 }
 
 // container::XElementAccess
-uno::Type SAL_CALL UnoControlContainer::getElementType(  ) throw (uno::RuntimeException, std::exception)
+uno::Type SAL_CALL UnoControlContainer::getElementType(  )
 {
     return cppu::UnoType<awt::XControlModel>::get();
 }
 
-sal_Bool SAL_CALL UnoControlContainer::hasElements(  ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UnoControlContainer::hasElements(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     return !mpControls->empty();
 }
 
 // awt::XControlContainer
-void UnoControlContainer::setStatusText( const OUString& rStatusText ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::setStatusText( const OUString& rStatusText )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -580,7 +578,7 @@ void UnoControlContainer::setStatusText( const OUString& rStatusText ) throw(uno
         xContainer->setStatusText( rStatusText );
 }
 
-uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControls(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControls(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     uno::Sequence< uno::Reference< awt::XControl > > aControls;
@@ -588,7 +586,7 @@ uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControl
     return aControls;
 }
 
-uno::Reference< awt::XControl > UnoControlContainer::getControl( const OUString& rName ) throw(uno::RuntimeException, std::exception)
+uno::Reference< awt::XControl > UnoControlContainer::getControl( const OUString& rName )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     return mpControls->getControlForName( rName );
@@ -642,7 +640,7 @@ sal_Int32 UnoControlContainer::impl_addControl( const uno::Reference< awt::XCont
     return id;
 }
 
-void UnoControlContainer::addControl( const OUString& rName, const uno::Reference< awt::XControl >& rControl ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::addControl( const OUString& rName, const uno::Reference< awt::XControl >& rControl )
 {
     if ( rControl.is() )
         impl_addControl( rControl, &rName );
@@ -680,7 +678,7 @@ void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Referen
     }
 }
 
-void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >& _rxControl ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >& _rxControl )
 {
     if ( _rxControl.is() )
     {
@@ -694,21 +692,21 @@ void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >&
 
 
 // awt::XUnoControlContainer
-void UnoControlContainer::setTabControllers( const uno::Sequence< uno::Reference< awt::XTabController > >& TabControllers ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::setTabControllers( const uno::Sequence< uno::Reference< awt::XTabController > >& TabControllers )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maTabControllers = TabControllers;
 }
 
-uno::Sequence< uno::Reference< awt::XTabController > > UnoControlContainer::getTabControllers(  ) throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Reference< awt::XTabController > > UnoControlContainer::getTabControllers(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     return maTabControllers;
 }
 
-void UnoControlContainer::addTabController( const uno::Reference< awt::XTabController >& TabController ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::addTabController( const uno::Reference< awt::XTabController >& TabController )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -717,7 +715,7 @@ void UnoControlContainer::addTabController( const uno::Reference< awt::XTabContr
     maTabControllers[ nCount ] = TabController;
 }
 
-void UnoControlContainer::removeTabController( const uno::Reference< awt::XTabController >& TabController ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::removeTabController( const uno::Reference< awt::XTabController >& TabController )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -734,7 +732,7 @@ void UnoControlContainer::removeTabController( const uno::Reference< awt::XTabCo
 }
 
 // awt::XControl
-void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxToolkit, const uno::Reference< awt::XWindowPeer >& rParent ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxToolkit, const uno::Reference< awt::XWindowPeer >& rParent )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -793,7 +791,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT
 
 
 // awt::XWindow
-void UnoControlContainer::setVisible( sal_Bool bVisible ) throw(uno::RuntimeException, std::exception)
+void UnoControlContainer::setVisible( sal_Bool bVisible )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -804,13 +802,11 @@ void UnoControlContainer::setVisible( sal_Bool bVisible ) throw(uno::RuntimeExce
 }
 
 OUString UnoControlContainer::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlContainer");
 }
 
 css::uno::Sequence<OUString> UnoControlContainer::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 342c4626bc26..f4a2d50f5d13 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -40,20 +40,18 @@ UnoControlContainerModel::UnoControlContainerModel( const css::uno::Reference< c
     ImplRegisterProperty( BASEPROPERTY_TEXT );
 }
 
-OUString UnoControlContainerModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlContainerModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlContainerModel );
 }
 
 OUString UnoControlContainerModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlContainerModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlContainerModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -73,7 +71,7 @@ css::uno::Any UnoControlContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId
 }
 
 
-css::uno::Reference< css::beans::XPropertySetInfo > UnoControlContainerModel::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > UnoControlContainerModel::getPropertySetInfo(  )
 {
     static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 31dca8b755da..d7e0ab636a46 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -411,7 +411,7 @@ void UnoControlModel::ImplRegisterProperties( const std::vector< sal_uInt16 > &r
 }
 
 // css::uno::XInterface
-css::uno::Any UnoControlModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any UnoControlModel::queryAggregation( const css::uno::Type & rType )
 {
     Any aRet = UnoControlModel_Base::queryAggregation( rType );
     if ( !aRet.hasValue() )
@@ -429,7 +429,7 @@ IMPLEMENT_FORWARD_REFCOUNT( UnoControlModel, UnoControlModel_Base )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlModel, UnoControlModel_Base, ::cppu::OPropertySetHelper )
 
 
-uno::Reference< util::XCloneable > UnoControlModel::createClone() throw(css::uno::RuntimeException, std::exception)
+uno::Reference< util::XCloneable > UnoControlModel::createClone()
 {
     UnoControlModel* pClone = Clone();
     uno::Reference< util::XCloneable > xClone( static_cast<cppu::OWeakObject*>(pClone), uno::UNO_QUERY );
@@ -437,7 +437,7 @@ uno::Reference< util::XCloneable > UnoControlModel::createClone() throw(css::uno
 }
 
 // css::lang::XComponent
-void UnoControlModel::dispose(  ) throw(css::uno::RuntimeException, std::exception)
+void UnoControlModel::dispose(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -451,14 +451,14 @@ void UnoControlModel::dispose(  ) throw(css::uno::RuntimeException, std::excepti
     OPropertySetHelper::disposing();
 }
 
-void UnoControlModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void UnoControlModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
     maDisposeListeners.addInterface( rxListener );
 }
 
-void UnoControlModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception)
+void UnoControlModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -467,7 +467,7 @@ void UnoControlModel::removeEventListener( const css::uno::Reference< css::lang:
 
 
 // css::beans::XPropertyState
-css::beans::PropertyState UnoControlModel::getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+css::beans::PropertyState UnoControlModel::getPropertyState( const OUString& PropertyName )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -479,7 +479,7 @@ css::beans::PropertyState UnoControlModel::getPropertyState( const OUString& Pro
     return CompareProperties( aValue, aDefault ) ? css::beans::PropertyState_DEFAULT_VALUE : css::beans::PropertyState_DIRECT_VALUE;
 }
 
-css::uno::Sequence< css::beans::PropertyState > UnoControlModel::getPropertyStates( const css::uno::Sequence< OUString >& PropertyNames ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::beans::PropertyState > UnoControlModel::getPropertyStates( const css::uno::Sequence< OUString >& PropertyNames )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -495,7 +495,7 @@ css::uno::Sequence< css::beans::PropertyState > UnoControlModel::getPropertyStat
     return aStates;
 }
 
-void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
+void UnoControlModel::setPropertyToDefault( const OUString& PropertyName )
 {
     Any aDefaultValue;
     {
@@ -505,7 +505,7 @@ void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw
     setPropertyValue( PropertyName, aDefaultValue );
 }
 
-css::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+css::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -514,7 +514,7 @@ css::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName
 
 
 // css::io::XPersistObjec
-OUString UnoControlModel::getServiceName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlModel::getServiceName(  )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -522,7 +522,7 @@ OUString UnoControlModel::getServiceName(  ) throw(css::uno::RuntimeException, s
     return OUString();
 }
 
-void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception)
+void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -755,7 +755,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt
     }
 }
 
-void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception)
+void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -1022,25 +1022,25 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre
 
 
 // css::lang::XServiceInfo
-OUString UnoControlModel::getImplementationName(  ) throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlModel::getImplementationName(  )
 {
     OSL_FAIL( "This method should be overridden!" );
     return OUString();
 
 }
 
-sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool UnoControlModel::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-css::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames(  )
 {
     OUString sName( "com.sun.star.awt.UnoControlModel" );
     return Sequence< OUString >( &sName, 1 );
 }
 
-sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nPropId, const Any& rValue ) throw (IllegalArgumentException, std::exception)
+sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nPropId, const Any& rValue )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
@@ -1166,7 +1166,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any &
     return !CompareProperties( rConvertedValue, rOldValue );
 }
 
-void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception)
+void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const css::uno::Any& rValue )
 {
     // Missing: the fake solo properties of the FontDescriptor
 
@@ -1236,7 +1236,7 @@ void UnoControlModel::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nPr
 }
 
 // css::beans::XPropertySet
-void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css::uno::Any& rValue )
 {
     sal_Int32 nPropId = 0;
     {
@@ -1251,7 +1251,7 @@ void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css
 }
 
 // css::beans::XFastPropertySet
-void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::Any& rValue )
 {
     if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
     {
@@ -1286,13 +1286,13 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::A
 }
 
 // css::beans::XMultiPropertySet
-css::uno::Reference< css::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo(  )
 {
     OSL_FAIL( "UnoControlModel::getPropertySetInfo() not possible!" );
     return css::uno::Reference< css::beans::XPropertySetInfo >();
 }
 
-void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& Values )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
 
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 2264fba931d0..9473f4a7837b 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -118,7 +118,7 @@ UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext >&
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit );
 }
 
-OUString UnoControlEditModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlEditModel::getServiceName( )
 {
     return OUString::createFromAscii( szServiceName_UnoControlEditModel );
 }
@@ -154,20 +154,18 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlEditModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlEditModel");
 }
 
 css::uno::Sequence<OUString> UnoControlEditModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -201,7 +199,7 @@ UnoEditControl::UnoEditControl()
     mbSetMaxTextLenInPeer = false;
 }
 
-uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aReturn = UnoControlBase::queryAggregation( rType );
     if ( !aReturn.hasValue() )
@@ -209,7 +207,7 @@ uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType ) th
     return aReturn;
 }
 
-uno::Any SAL_CALL UnoEditControl::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any SAL_CALL UnoEditControl::queryInterface( const uno::Type & rType )
 {
     return UnoControlBase::queryInterface( rType );
 }
@@ -240,7 +238,7 @@ OUString UnoEditControl::GetComponentServiceName()
     return sName;
 }
 
-sal_Bool SAL_CALL UnoEditControl::setModel(const uno::Reference< awt::XControlModel >& _rModel) throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL UnoEditControl::setModel(const uno::Reference< awt::XControlModel >& _rModel)
 {
     bool bReturn = UnoControlBase::setModel( _rModel );
     mbHasTextProperty = ImplHasProperty( BASEPROPERTY_TEXT );
@@ -268,14 +266,14 @@ void UnoEditControl::ImplSetPeerProperty( const OUString& rPropName, const uno::
         UnoControlBase::ImplSetPeerProperty( rPropName, rVal );
 }
 
-void UnoEditControl::dispose() throw(uno::RuntimeException, std::exception)
+void UnoEditControl::dispose()
 {
     lang::EventObject aEvt( *this );
     maTextListeners.disposeAndClear( aEvt );
     UnoControl::dispose();
 }
 
-void UnoEditControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoControl::createPeer( rxToolkit, rParentPeer );
 
@@ -291,7 +289,7 @@ void UnoEditControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk
     }
 }
 
-void UnoEditControl::textChanged(const awt::TextEvent& e) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::textChanged(const awt::TextEvent& e)
 {
     uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY );
 
@@ -308,17 +306,17 @@ void UnoEditControl::textChanged(const awt::TextEvent& e) throw(uno::RuntimeExce
         maTextListeners.textChanged( e );
 }
 
-void UnoEditControl::addTextListener(const uno::Reference< awt::XTextListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::addTextListener(const uno::Reference< awt::XTextListener > & l)
 {
     maTextListeners.addInterface( l );
 }
 
-void UnoEditControl::removeTextListener(const uno::Reference< awt::XTextListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::removeTextListener(const uno::Reference< awt::XTextListener > & l)
 {
     maTextListeners.removeInterface( l );
 }
 
-void UnoEditControl::setText( const OUString& aText ) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::setText( const OUString& aText )
 {
     if ( mbHasTextProperty )
     {
@@ -351,7 +349,7 @@ namespace
     }
 }
 
-void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNewText ) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNewText )
 {
     // normalize the selection - OUString::replaceAt has a strange behaviour if the min is greater than the max
     awt::Selection aSelection( rSel );
@@ -378,7 +376,7 @@ void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNe
     setSelection( aNewSelection );
 }
 
-OUString UnoEditControl::getText() throw(uno::RuntimeException, std::exception)
+OUString UnoEditControl::getText()
 {
     OUString aText = maText;
 
@@ -394,7 +392,7 @@ OUString UnoEditControl::getText() throw(uno::RuntimeException, std::exception)
     return aText;
 }
 
-OUString UnoEditControl::getSelectedText() throw(uno::RuntimeException, std::exception)
+OUString UnoEditControl::getSelectedText()
 {
     OUString sSelected;
         uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY );
@@ -404,14 +402,14 @@ OUString UnoEditControl::getSelectedText() throw(uno::RuntimeException, std::exc
     return sSelected;
 }
 
-void UnoEditControl::setSelection( const awt::Selection& aSelection ) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::setSelection( const awt::Selection& aSelection )
 {
         uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY );
     if ( xText.is() )
         xText->setSelection( aSelection );
 }
 
-awt::Selection UnoEditControl::getSelection() throw(uno::RuntimeException, std::exception)
+awt::Selection UnoEditControl::getSelection()
 {
     awt::Selection aSel;
         uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY );
@@ -420,17 +418,17 @@ awt::Selection UnoEditControl::getSelection() throw(uno::RuntimeException, std::
     return aSel;
 }
 
-sal_Bool UnoEditControl::isEditable() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoEditControl::isEditable()
 {
     return !ImplGetPropertyValue_BOOL( BASEPROPERTY_READONLY );
 }
 
-void UnoEditControl::setEditable( sal_Bool bEditable ) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::setEditable( sal_Bool bEditable )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_READONLY ), uno::Any(!bEditable), true );
 }
 
-sal_Int16 UnoEditControl::getMaxTextLen() throw(uno::RuntimeException, std::exception)
+sal_Int16 UnoEditControl::getMaxTextLen()
 {
     sal_Int16 nMaxLen = mnMaxTextLen;
 
@@ -440,7 +438,7 @@ sal_Int16 UnoEditControl::getMaxTextLen() throw(uno::RuntimeException, std::exce
     return nMaxLen;
 }
 
-void UnoEditControl::setMaxTextLen( sal_Int16 nLen ) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::setMaxTextLen( sal_Int16 nLen )
 {
     if ( ImplHasProperty( BASEPROPERTY_MAXTEXTLEN) )
     {
@@ -456,37 +454,37 @@ void UnoEditControl::setMaxTextLen( sal_Int16 nLen ) throw(uno::RuntimeException
     }
 }
 
-awt::Size UnoEditControl::getMinimumSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoEditControl::getMinimumSize(  )
 {
     return Impl_getMinimumSize();
 }
 
-awt::Size UnoEditControl::getPreferredSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoEditControl::getPreferredSize(  )
 {
     return Impl_getPreferredSize();
 }
 
-awt::Size UnoEditControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoEditControl::calcAdjustedSize( const awt::Size& rNewSize )
 {
     return Impl_calcAdjustedSize( rNewSize );
 }
 
-awt::Size UnoEditControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoEditControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
 {
     return Impl_getMinimumSize( nCols, nLines );
 }
 
-void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(uno::RuntimeException, std::exception)
+void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
 {
     Impl_getColumnsAndLines( nCols, nLines );
 }
 
-OUString UnoEditControl::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString UnoEditControl::getImplementationName(  )
 {
     return OUString( "stardiv.Toolkit.UnoEditControl" );
 }
 
-uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames()
 {
     uno::Sequence< OUString > aNames = UnoControlBase::getSupportedServiceNames( );
     aNames.realloc( aNames.getLength() + 2 );
@@ -529,7 +527,7 @@ UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XCompon
     ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION );
 }
 
-OUString UnoControlFileControlModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlFileControlModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlFileControlModel );
 }
@@ -555,21 +553,19 @@ uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlFileControlModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlFileControlModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlFileControlModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -600,13 +596,11 @@ OUString UnoFileControl::GetComponentServiceName()
 }
 
 OUString UnoFileControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoFileControl");
 }
 
 css::uno::Sequence<OUString> UnoFileControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoEditControl::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -634,7 +628,7 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     return UnoControlModel::ImplGetDefaultValue( nPropId );
 }
 
-void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception)
+void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue )
 {
     UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 
@@ -711,7 +705,7 @@ UnoControlButtonModel::UnoControlButtonModel( const Reference< XComponentContext
     osl_atomic_decrement( &m_refCount );
 }
 
-OUString UnoControlButtonModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlButtonModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlButtonModel );
 }
@@ -745,20 +739,18 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlButtonModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlButtonModel");
 }
 
 css::uno::Sequence<OUString> UnoControlButtonModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(GraphicControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -812,7 +804,7 @@ OUString UnoButtonControl::GetComponentServiceName()
     return aName;
 }
 
-void UnoButtonControl::dispose() throw(uno::RuntimeException, std::exception)
+void UnoButtonControl::dispose()
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -821,7 +813,7 @@ void UnoButtonControl::dispose() throw(uno::RuntimeException, std::exception)
     UnoControlBase::dispose();
 }
 
-void UnoButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoControlBase::createPeer( rxToolkit, rParentPeer );
 
@@ -835,7 +827,7 @@ void UnoButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToo
         xPushButton->addItemListener( this );
 }
 
-void UnoButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     maActionListeners.addInterface( l );
     if( getPeer().is() && maActionListeners.getLength() == 1 )
@@ -845,7 +837,7 @@ void UnoButtonControl::addActionListener(const uno::Reference< awt::XActionListe
     }
 }
 
-void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     if( getPeer().is() && maActionListeners.getLength() == 1 )
     {
@@ -855,22 +847,22 @@ void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionLi
     maActionListeners.removeInterface( l );
 }
 
-void UnoButtonControl::addItemListener(const uno::Reference< awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoButtonControl::addItemListener(const uno::Reference< awt::XItemListener > & l)
 {
     maItemListeners.addInterface( l );
 }
 
-void UnoButtonControl::removeItemListener(const uno::Reference< awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoButtonControl::removeItemListener(const uno::Reference< awt::XItemListener > & l)
 {
     maItemListeners.removeInterface( l );
 }
 
-void SAL_CALL UnoButtonControl::disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoButtonControl::disposing( const lang::EventObject& Source )
 {
     UnoControlBase::disposing( Source );
 }
 
-void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent )
 {
     // forward to model
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16)rEvent.Selected), false );
@@ -881,12 +873,12 @@ void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent )
     maItemListeners.itemStateChanged( aEvent );
 }
 
-void UnoButtonControl::setLabel( const OUString&  rLabel ) throw(uno::RuntimeException, std::exception)
+void UnoButtonControl::setLabel( const OUString&  rLabel )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(rLabel), true );
 }
 
-void UnoButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException, std::exception)
+void UnoButtonControl::setActionCommand( const OUString& rCommand )
 {
     maActionCommand = rCommand;
     if ( getPeer().is() )
@@ -896,29 +888,27 @@ void UnoButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::R
     }
 }
 
-awt::Size UnoButtonControl::getMinimumSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoButtonControl::getMinimumSize(  )
 {
     return Impl_getMinimumSize();
 }
 
-awt::Size UnoButtonControl::getPreferredSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoButtonControl::getPreferredSize(  )
 {
     return Impl_getPreferredSize();
 }
 
-awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize )
 {
     return Impl_calcAdjustedSize( rNewSize );
 }
 
 OUString UnoButtonControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoButtonControl");
 }
 
 css::uno::Sequence<OUString> UnoButtonControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -945,20 +935,18 @@ UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XComp
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl );
 }
 
-OUString UnoControlImageControlModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlImageControlModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlImageControlModel );
 }
 
 OUString UnoControlImageControlModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlImageControlModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlImageControlModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(GraphicControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 4);
@@ -992,13 +980,13 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId )
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlImageControlModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlImageControlModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
-void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception)
+void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue )
 {
     GraphicControlModel::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
 
@@ -1061,7 +1049,7 @@ OUString UnoImageControlControl::GetComponentServiceName()
     return OUString("fixedimage");
 }
 
-void UnoImageControlControl::dispose() throw(uno::RuntimeException, std::exception)
+void UnoImageControlControl::dispose()
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -1069,34 +1057,32 @@ void UnoImageControlControl::dispose() throw(uno::RuntimeException, std::excepti
     UnoControl::dispose();
 }
 
-sal_Bool UnoImageControlControl::isTransparent() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoImageControlControl::isTransparent()
 {
     return true;
 }
 
-awt::Size UnoImageControlControl::getMinimumSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoImageControlControl::getMinimumSize(  )
 {
     return Impl_getMinimumSize();
 }
 
-awt::Size UnoImageControlControl::getPreferredSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoImageControlControl::getPreferredSize(  )
 {
     return Impl_getPreferredSize();
 }
 
-awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize )
 {
     return Impl_calcAdjustedSize( rNewSize );
 }
 
 OUString UnoImageControlControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoImageControlControl");
 }
 
 css::uno::Sequence<OUString> UnoImageControlControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 4);
@@ -1124,7 +1110,7 @@ UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XCompon
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton );
 }
 
-OUString UnoControlRadioButtonModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlRadioButtonModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlRadioButtonModel );
 }
@@ -1155,21 +1141,19 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlRadioButtonModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlRadioButtonModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlRadioButtonModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(GraphicControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -1203,7 +1187,7 @@ OUString UnoRadioButtonControl::GetComponentServiceName()
     return OUString("radiobutton");
 }
 
-void UnoRadioButtonControl::dispose() throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::dispose()
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -1212,12 +1196,12 @@ void UnoRadioButtonControl::dispose() throw(uno::RuntimeException, std::exceptio
 }
 
 
-sal_Bool UnoRadioButtonControl::isTransparent() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoRadioButtonControl::isTransparent()
 {
     return true;
 }
 
-void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoControlBase::createPeer( rxToolkit, rParentPeer );
 
@@ -1237,17 +1221,17 @@ void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > &
         xVclWindowPeer->setProperty( GetPropertyName( BASEPROPERTY_AUTOTOGGLE ), css::uno::Any(true) );
 }
 
-void UnoRadioButtonControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::addItemListener(const uno::Reference < awt::XItemListener > & l)
 {
     maItemListeners.addInterface( l );
 }
 
-void UnoRadioButtonControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::removeItemListener(const uno::Reference < awt::XItemListener > & l)
 {
     maItemListeners.removeInterface( l );
 }
 
-void UnoRadioButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     maActionListeners.addInterface( l );
     if( getPeer().is() && maActionListeners.getLength() == 1 )
@@ -1257,7 +1241,7 @@ void UnoRadioButtonControl::addActionListener(const uno::Reference< awt::XAction
     }
 }
 
-void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     if( getPeer().is() && maActionListeners.getLength() == 1 )
     {
@@ -1267,12 +1251,12 @@ void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XAct
     maActionListeners.removeInterface( l );
 }
 
-void UnoRadioButtonControl::setLabel( const OUString&  rLabel ) throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::setLabel( const OUString&  rLabel )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(rLabel), true );
 }
 
-void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::setActionCommand( const OUString& rCommand )
 {
     maActionCommand = rCommand;
     if ( getPeer().is() )
@@ -1282,13 +1266,13 @@ void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) throw(u
     }
 }
 
-void UnoRadioButtonControl::setState( sal_Bool bOn ) throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::setState( sal_Bool bOn )
 {
     sal_Int16 nState = bOn ? 1 : 0;
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(nState), true );
 }
 
-sal_Bool UnoRadioButtonControl::getState() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoRadioButtonControl::getState()
 {
     sal_Int16 nState = 0;
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ) );
@@ -1296,7 +1280,7 @@ sal_Bool UnoRadioButtonControl::getState() throw(uno::RuntimeException, std::exc
     return nState != 0;
 }
 
-void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception)
+void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16)rEvent.Selected), false );
 
@@ -1327,29 +1311,27 @@ void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) thr
         // to be inconsistent with.
 }
 
-awt::Size UnoRadioButtonControl::getMinimumSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoRadioButtonControl::getMinimumSize(  )
 {
     return Impl_getMinimumSize();
 }
 
-awt::Size UnoRadioButtonControl::getPreferredSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoRadioButtonControl::getPreferredSize(  )
 {
     return Impl_getPreferredSize();
 }
 
-awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize )
 {
     return Impl_calcAdjustedSize( rNewSize );
 }
 
 OUString UnoRadioButtonControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoRadioButtonControl");
 }
 
 css::uno::Sequence<OUString> UnoRadioButtonControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -1375,7 +1357,7 @@ UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XComponentCon
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox );
 }
 
-OUString UnoControlCheckBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlCheckBoxModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlCheckBoxModel );
 }
@@ -1406,20 +1388,18 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlCheckBoxModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString( "stardiv.Toolkit.UnoControlCheckBoxModel");
 }
 
 css::uno::Sequence<OUString> UnoControlCheckBoxModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(GraphicControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -1452,7 +1432,7 @@ OUString UnoCheckBoxControl::GetComponentServiceName()
     return OUString("checkbox");
 }
 
-void UnoCheckBoxControl::dispose() throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::dispose()
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -1460,12 +1440,12 @@ void UnoCheckBoxControl::dispose() throw(uno::RuntimeException, std::exception)
     UnoControlBase::dispose();
 }
 
-sal_Bool UnoCheckBoxControl::isTransparent() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoCheckBoxControl::isTransparent()
 {
     return true;
 }
 
-void UnoCheckBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoControlBase::createPeer( rxToolkit, rParentPeer );
 
@@ -1478,17 +1458,17 @@ void UnoCheckBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxT
         xButton->addActionListener( &maActionListeners );
 }
 
-void UnoCheckBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l)
 {
     maItemListeners.addInterface( l );
 }
 
-void UnoCheckBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l)
 {
     maItemListeners.removeInterface( l );
 }
 
-void UnoCheckBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     maActionListeners.addInterface( l );
     if( getPeer().is() && maActionListeners.getLength() == 1 )
@@ -1498,7 +1478,7 @@ void UnoCheckBoxControl::addActionListener(const uno::Reference< awt::XActionLis
     }
 }
 
-void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     if( getPeer().is() && maActionListeners.getLength() == 1 )
     {
@@ -1508,7 +1488,7 @@ void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XAction
     maActionListeners.removeInterface( l );
 }
 
-void UnoCheckBoxControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::setActionCommand( const OUString& rCommand )
 {
     maActionCommand = rCommand;
     if ( getPeer().is() )
@@ -1519,17 +1499,17 @@ void UnoCheckBoxControl::setActionCommand( const OUString& rCommand ) throw(uno:
 }
 
 
-void UnoCheckBoxControl::setLabel( const OUString&  rLabel ) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::setLabel( const OUString&  rLabel )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(rLabel), true );
 }
 
-void UnoCheckBoxControl::setState( short n ) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::setState( short n )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16) n), true );
 }
 
-short UnoCheckBoxControl::getState() throw(uno::RuntimeException, std::exception)
+short UnoCheckBoxControl::getState()
 {
     short nState = 0;
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ) );
@@ -1537,12 +1517,12 @@ short UnoCheckBoxControl::getState() throw(uno::RuntimeException, std::exception
     return nState;
 }
 
-void UnoCheckBoxControl::enableTriState( sal_Bool b ) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::enableTriState( sal_Bool b )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TRISTATE ), uno::Any(b), true );
 }
 
-void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception)
+void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16) rEvent.Selected), false );
 
@@ -1550,29 +1530,27 @@ void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(
         maItemListeners.itemStateChanged( rEvent );
 }
 
-awt::Size UnoCheckBoxControl::getMinimumSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoCheckBoxControl::getMinimumSize(  )
 {
     return Impl_getMinimumSize();
 }
 
-awt::Size UnoCheckBoxControl::getPreferredSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoCheckBoxControl::getPreferredSize(  )
 {
     return Impl_getPreferredSize();
 }
 
-awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize )
 {
     return Impl_calcAdjustedSize( rNewSize );
 }
 
 OUString UnoCheckBoxControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoCheckBoxControl");
 }
 
 css::uno::Sequence<OUString> UnoCheckBoxControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -1598,7 +1576,7 @@ UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< X
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink );
 }
 
-OUString UnoControlFixedHyperlinkModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlFixedHyperlinkModel::getServiceName()
 {
     return OUString( "com.sun.star.awt.UnoControlFixedHyperlinkModel" );
 }
@@ -1633,7 +1611,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -1664,7 +1642,7 @@ OUString UnoFixedHyperlinkControl::GetComponentServiceName()
 }
 
 // uno::XInterface
-uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XFixedHyperlink* >(this)),
@@ -1679,37 +1657,37 @@ IMPL_XTYPEPROVIDER_START( UnoFixedHyperlinkControl )
     UnoControlBase::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-sal_Bool UnoFixedHyperlinkControl::isTransparent() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoFixedHyperlinkControl::isTransparent()
 {
     return true;
 }
 
-void UnoFixedHyperlinkControl::setText( const OUString& Text ) throw(uno::RuntimeException, std::exception)
+void UnoFixedHyperlinkControl::setText( const OUString& Text )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(Text), true );
 }
 
-OUString UnoFixedHyperlinkControl::getText() throw(uno::RuntimeException, std::exception)
+OUString UnoFixedHyperlinkControl::getText()
 {
     return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL );
 }
 
-void UnoFixedHyperlinkControl::setURL( const OUString& URL ) throw(css::uno::RuntimeException, std::exception)
+void UnoFixedHyperlinkControl::setURL( const OUString& URL )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_URL ), uno::Any(URL), true );
 }
 
-OUString UnoFixedHyperlinkControl::getURL(  ) throw(css::uno::RuntimeException, std::exception)
+OUString UnoFixedHyperlinkControl::getURL(  )
 {
     return ImplGetPropertyValue_UString( BASEPROPERTY_URL );
 }
 
-void UnoFixedHyperlinkControl::setAlignment( short nAlign ) throw(uno::RuntimeException, std::exception)
+void UnoFixedHyperlinkControl::setAlignment( short nAlign )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any((sal_Int16) nAlign), true );
 }
 
-short UnoFixedHyperlinkControl::getAlignment() throw(uno::RuntimeException, std::exception)
+short UnoFixedHyperlinkControl::getAlignment()
 {
     short nAlign = 0;
     if ( mxModel.is() )
@@ -1720,22 +1698,22 @@ short UnoFixedHyperlinkControl::getAlignment() throw(uno::RuntimeException, std:
     return nAlign;
 }
 
-awt::Size UnoFixedHyperlinkControl::getMinimumSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoFixedHyperlinkControl::getMinimumSize(  )
 {
     return Impl_getMinimumSize();
 }
 
-awt::Size UnoFixedHyperlinkControl::getPreferredSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoFixedHyperlinkControl::getPreferredSize(  )
 {
     return Impl_getPreferredSize();
 }
 
-awt::Size UnoFixedHyperlinkControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoFixedHyperlinkControl::calcAdjustedSize( const awt::Size& rNewSize )
 {
     return Impl_calcAdjustedSize( rNewSize );
 }
 
-void UnoFixedHyperlinkControl::dispose() throw(uno::RuntimeException, std::exception)
+void UnoFixedHyperlinkControl::dispose()
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -1743,7 +1721,7 @@ void UnoFixedHyperlinkControl::dispose() throw(uno::RuntimeException, std::excep
     UnoControlBase::dispose();
 }
 
-void UnoFixedHyperlinkControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoFixedHyperlinkControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoControlBase::createPeer( rxToolkit, rParentPeer );
 
@@ -1752,7 +1730,7 @@ void UnoFixedHyperlinkControl::createPeer( const uno::Reference< awt::XToolkit >
         xFixedHyperlink->addActionListener( &maActionListeners );
 }
 
-void UnoFixedHyperlinkControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoFixedHyperlinkControl::addActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     maActionListeners.addInterface( l );
     if( getPeer().is() && maActionListeners.getLength() == 1 )
@@ -1762,7 +1740,7 @@ void UnoFixedHyperlinkControl::addActionListener(const uno::Reference< awt::XAct
     }
 }
 
-void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     if( getPeer().is() && maActionListeners.getLength() == 1 )
     {
@@ -1789,7 +1767,7 @@ UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentC
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedText );
 }
 
-OUString UnoControlFixedTextModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlFixedTextModel::getServiceName()
 {
     return OUString( "stardiv.vcl.controlmodel.FixedText" );
 }
@@ -1820,21 +1798,19 @@ uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlFixedTextModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlFixedTextModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlFixedTextModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -1867,7 +1843,7 @@ OUString UnoFixedTextControl::GetComponentServiceName()
 }
 
 // uno::XInterface
-uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XFixedText* >(this)),
@@ -1882,27 +1858,27 @@ IMPL_XTYPEPROVIDER_START( UnoFixedTextControl )
     UnoControlBase::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-sal_Bool UnoFixedTextControl::isTransparent() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoFixedTextControl::isTransparent()
 {
     return true;
 }
 
-void UnoFixedTextControl::setText( const OUString& Text ) throw(uno::RuntimeException, std::exception)
+void UnoFixedTextControl::setText( const OUString& Text )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(Text), true );
 }
 
-OUString UnoFixedTextControl::getText() throw(uno::RuntimeException, std::exception)
+OUString UnoFixedTextControl::getText()
 {
     return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL );
 }
 
-void UnoFixedTextControl::setAlignment( short nAlign ) throw(uno::RuntimeException, std::exception)
+void UnoFixedTextControl::setAlignment( short nAlign )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any((sal_Int16) nAlign), true );
 }
 
-short UnoFixedTextControl::getAlignment() throw(uno::RuntimeException, std::exception)
+short UnoFixedTextControl::getAlignment()
 {
     short nAlign = 0;
     if ( mxModel.is() )
@@ -1913,29 +1889,27 @@ short UnoFixedTextControl::getAlignment() throw(uno::RuntimeException, std::exce
     return nAlign;
 }
 
-awt::Size UnoFixedTextControl::getMinimumSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoFixedTextControl::getMinimumSize(  )
 {
     return Impl_getMinimumSize();
 }
 
-awt::Size UnoFixedTextControl::getPreferredSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoFixedTextControl::getPreferredSize(  )
 {
     return Impl_getPreferredSize();
 }
 
-awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize )
 {
     return Impl_calcAdjustedSize( rNewSize );
 }
 
 OUString UnoFixedTextControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoFixedTextControl");
 }
 
 css::uno::Sequence<OUString> UnoFixedTextControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -1970,7 +1944,7 @@ UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XComponentCon
     ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE );
 }
 
-OUString UnoControlGroupBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlGroupBoxModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlGroupBoxModel );
 }
@@ -1996,20 +1970,18 @@ uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlGroupBoxModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlGroupBoxModel");
 }
 
 css::uno::Sequence<OUString> UnoControlGroupBoxModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -2041,19 +2013,17 @@ OUString UnoGroupBoxControl::GetComponentServiceName()
     return OUString("groupbox");
 }
 
-sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoGroupBoxControl::isTransparent()
 {
     return true;
 }
 
 OUString UnoGroupBoxControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoGroupBoxControl");
 }
 
 css::uno::Sequence<OUString> UnoGroupBoxControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -2199,13 +2169,11 @@ UnoControlListBoxModel::~UnoControlListBoxModel()
 }
 
 OUString UnoControlListBoxModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlListBoxModel");
 }
 
 css::uno::Sequence<OUString> UnoControlListBoxModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -2214,7 +2182,7 @@ css::uno::Sequence<OUString> UnoControlListBoxModel::getSupportedServiceNames()
     return s;
 }
 
-OUString UnoControlListBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlListBoxModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlListBoxModel );
 }
@@ -2243,7 +2211,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -2262,7 +2230,7 @@ namespace
 }
 
 
-void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception, std::exception)
+void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue )
 {
     UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 
@@ -2313,14 +2281,14 @@ void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCo
 }
 
 
-::sal_Int32 SAL_CALL UnoControlListBoxModel::getItemCount() throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL UnoControlListBoxModel::getItemCount()
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     return m_xData->getItemCount();
 }
 
 
-void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     // SYNCHRONIZED ----->
@@ -2333,7 +2301,7 @@ void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const
 }
 
 
-void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     // SYNCHRONIZED ----->
@@ -2345,7 +2313,7 @@ void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, c
 }
 
 
-void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     // SYNCHRONIZED ----->
@@ -2357,7 +2325,7 @@ void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition,
 }
 
 
-void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     // SYNCHRONIZED ----->
@@ -2368,7 +2336,7 @@ void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) thro
 }
 
 
-void SAL_CALL UnoControlListBoxModel::removeAllItems(  ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::removeAllItems(  )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     // SYNCHRONIZED ----->
@@ -2379,7 +2347,7 @@ void SAL_CALL UnoControlListBoxModel::removeAllItems(  ) throw (css::uno::Runtim
 }
 
 
-void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     // SYNCHRONIZED ----->
@@ -2391,7 +2359,7 @@ void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, cons
 }
 
 
-void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     // SYNCHRONIZED ----->
@@ -2403,7 +2371,7 @@ void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, con
 }
 
 
-void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     // SYNCHRONIZED ----->
@@ -2416,7 +2384,7 @@ void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPositi
 }
 
 
-void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, const Any& i_rDataValue ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, const Any& i_rDataValue )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     ListItem& rItem( m_xData->getItem( i_nPosition ) );
@@ -2424,7 +2392,7 @@ void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, cons
 }
 
 
-OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     const ListItem& rItem( m_xData->getItem( i_nPosition ) );
@@ -2432,7 +2400,7 @@ OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition )
 }
 
 
-OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     const ListItem& rItem( m_xData->getItem( i_nPosition ) );
@@ -2440,7 +2408,7 @@ OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition
 }
 
 
-beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAndImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAndImage( ::sal_Int32 i_nPosition )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     const ListItem& rItem( m_xData->getItem( i_nPosition ) );
@@ -2448,7 +2416,7 @@ beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAn
 }
 
 
-Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition )
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
     const ListItem& rItem( m_xData->getItem( i_nPosition ) );
@@ -2456,21 +2424,21 @@ Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) thro
 }
 
 
-Sequence< beans::Pair< OUString, OUString > > SAL_CALL UnoControlListBoxModel::getAllItems(  ) throw (RuntimeException, std::exception)
+Sequence< beans::Pair< OUString, OUString > > SAL_CALL UnoControlListBoxModel::getAllItems(  )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     return m_xData->getAllItems();
 }
 
 
-void SAL_CALL UnoControlListBoxModel::addItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::addItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener )
 {
     if ( i_Listener.is() )
         m_aItemListListeners.addInterface( i_Listener );
 }
 
 
-void SAL_CALL UnoControlListBoxModel::removeItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoControlListBoxModel::removeItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener )
 {
     if ( i_Listener.is() )
         m_aItemListListeners.removeInterface( i_Listener );
@@ -2648,13 +2616,11 @@ OUString UnoListBoxControl::GetComponentServiceName()
 }
 
 OUString UnoListBoxControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoListBoxControl");
 }
 
 css::uno::Sequence<OUString> UnoListBoxControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -2663,7 +2629,7 @@ css::uno::Sequence<OUString> UnoListBoxControl::getSupportedServiceNames()
     return s;
 }
 
-void UnoListBoxControl::dispose() throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::dispose()
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -2712,7 +2678,7 @@ void UnoListBoxControl::ImplSetPeerProperty( const OUString& rPropName, const un
     UnoControl::ImplSetPeerProperty( rPropName, rVal );
 }
 
-void UnoListBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoControl::createPeer( rxToolkit, rParentPeer );
 
@@ -2723,7 +2689,7 @@ void UnoListBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxTo
         xListBox->addActionListener( &maActionListeners );
 }
 
-void UnoListBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     maActionListeners.addInterface( l );
     if( getPeer().is() && maActionListeners.getLength() == 1 )
@@ -2733,7 +2699,7 @@ void UnoListBoxControl::addActionListener(const uno::Reference< awt::XActionList
     }
 }
 
-void UnoListBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     if( getPeer().is() && maActionListeners.getLength() == 1 )
     {
@@ -2743,23 +2709,23 @@ void UnoListBoxControl::removeActionListener(const uno::Reference< awt::XActionL
     maActionListeners.removeInterface( l );
 }
 
-void UnoListBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l)
 {
     maItemListeners.addInterface( l );
 }
 
-void UnoListBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l)
 {
     maItemListeners.removeInterface( l );
 }
 
-void UnoListBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::addItem( const OUString& aItem, sal_Int16 nPos )
 {
     uno::Sequence<OUString> aSeq { aItem };
     addItems( aSeq, nPos );
 }
 
-void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos )
 {
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
@@ -2791,7 +2757,7 @@ void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_In
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), uno::Any(aNewSeq), true );
 }
 
-void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount )
 {
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
@@ -2821,7 +2787,7 @@ void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(un
     }
 }
 
-sal_Int16 UnoListBoxControl::getItemCount() throw(uno::RuntimeException, std::exception)
+sal_Int16 UnoListBoxControl::getItemCount()
 {
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
@@ -2829,7 +2795,7 @@ sal_Int16 UnoListBoxControl::getItemCount() throw(uno::RuntimeException, std::ex
     return (sal_Int16)aSeq.getLength();
 }
 
-OUString UnoListBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException, std::exception)
+OUString UnoListBoxControl::getItem( sal_Int16 nPos )
 {
     OUString aItem;
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
@@ -2840,7 +2806,7 @@ OUString UnoListBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeExceptio
     return aItem;
 }
 
-uno::Sequence< OUString> UnoListBoxControl::getItems() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString> UnoListBoxControl::getItems()
 {
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
@@ -2848,7 +2814,7 @@ uno::Sequence< OUString> UnoListBoxControl::getItems() throw(uno::RuntimeExcepti
     return aSeq;
 }
 
-sal_Int16 UnoListBoxControl::getSelectedItemPos() throw(uno::RuntimeException, std::exception)
+sal_Int16 UnoListBoxControl::getSelectedItemPos()
 {
     sal_Int16 n = -1;
     if ( getPeer().is() )
@@ -2859,7 +2825,7 @@ sal_Int16 UnoListBoxControl::getSelectedItemPos() throw(uno::RuntimeException, s
     return n;
 }
 
-uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() throw(uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos()
 {
     uno::Sequence<sal_Int16> aSeq;
     if ( getPeer().is() )
@@ -2870,7 +2836,7 @@ uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() throw(uno::Run
     return aSeq;
 }
 
-OUString UnoListBoxControl::getSelectedItem() throw(uno::RuntimeException, std::exception)
+OUString UnoListBoxControl::getSelectedItem()
 {
     OUString aItem;
     if ( getPeer().is() )
@@ -2881,7 +2847,7 @@ OUString UnoListBoxControl::getSelectedItem() throw(uno::RuntimeException, std::
     return aItem;
 }
 
-uno::Sequence< OUString> UnoListBoxControl::getSelectedItems() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString> UnoListBoxControl::getSelectedItems()
 {
     uno::Sequence< OUString> aSeq;
     if ( getPeer().is() )
@@ -2892,7 +2858,7 @@ uno::Sequence< OUString> UnoListBoxControl::getSelectedItems() throw(uno::Runtim
     return aSeq;
 }
 
-void UnoListBoxControl::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::selectItemPos( sal_Int16 nPos, sal_Bool bSelect )
 {
     if ( getPeer().is() )
     {
@@ -2902,7 +2868,7 @@ void UnoListBoxControl::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(
     ImplUpdateSelectedItemsProperty();
 }
 
-void UnoListBoxControl::selectItemsPos( const uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::selectItemsPos( const uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect )
 {
     if ( getPeer().is() )
     {
@@ -2912,7 +2878,7 @@ void UnoListBoxControl::selectItemsPos( const uno::Sequence<sal_Int16>& aPositio
     ImplUpdateSelectedItemsProperty();
 }
 
-void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect )
 {
     if ( getPeer().is() )
     {
@@ -2922,7 +2888,7 @@ void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) th
     ImplUpdateSelectedItemsProperty();
 }
 
-void UnoListBoxControl::makeVisible( sal_Int16 nEntry ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::makeVisible( sal_Int16 nEntry )
 {
     if ( getPeer().is() )
     {
@@ -2931,27 +2897,27 @@ void UnoListBoxControl::makeVisible( sal_Int16 nEntry ) throw(uno::RuntimeExcept
     }
 }
 
-void UnoListBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::setDropDownLineCount( sal_Int16 nLines )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), uno::Any((sal_Int16) nLines), true );
 }
 
-sal_Int16 UnoListBoxControl::getDropDownLineCount() throw(uno::RuntimeException, std::exception)
+sal_Int16 UnoListBoxControl::getDropDownLineCount()
 {
     return ImplGetPropertyValue_INT16( BASEPROPERTY_LINECOUNT );
 }
 
-sal_Bool UnoListBoxControl::isMutipleMode() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoListBoxControl::isMutipleMode()
 {
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_MULTISELECTION );
 }
 
-void UnoListBoxControl::setMultipleMode( sal_Bool bMulti ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::setMultipleMode( sal_Bool bMulti )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTISELECTION ), uno::Any(bMulti), true );
 }
 
-void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent )
 {
     ImplUpdateSelectedItemsProperty();
     if ( maItemListeners.getLength() )
@@ -2973,32 +2939,32 @@ void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(u
     }
 }
 
-awt::Size UnoListBoxControl::getMinimumSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoListBoxControl::getMinimumSize(  )
 {
     return Impl_getMinimumSize();
 }
 
-awt::Size UnoListBoxControl::getPreferredSize(  ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoListBoxControl::getPreferredSize(  )
 {
     return Impl_getPreferredSize();
 }
 
-awt::Size UnoListBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoListBoxControl::calcAdjustedSize( const awt::Size& rNewSize )
 {
     return Impl_calcAdjustedSize( rNewSize );
 }
 
-awt::Size UnoListBoxControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(uno::RuntimeException, std::exception)
+awt::Size UnoListBoxControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
 {
     return Impl_getMinimumSize( nCols, nLines );
 }
 
-void UnoListBoxControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(uno::RuntimeException, std::exception)
+void UnoListBoxControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
 {
     Impl_getColumnsAndLines( nCols, nLines );
 }
 
-sal_Bool SAL_CALL UnoListBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL UnoListBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
@@ -3018,7 +2984,7 @@ sal_Bool SAL_CALL UnoListBoxControl::setModel( const uno::Reference< awt::XContr
     return true;
 }
 
-void SAL_CALL UnoListBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoListBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::listItemInserted: invalid peer!" );
@@ -3026,7 +2992,7 @@ void SAL_CALL UnoListBoxControl::listItemInserted( const awt::ItemListEvent& i_r
         xPeerListener->listItemInserted( i_rEvent );
 }
 
-void SAL_CALL UnoListBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoListBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::listItemRemoved: invalid peer!" );
@@ -3034,7 +3000,7 @@ void SAL_CALL UnoListBoxControl::listItemRemoved( const awt::ItemListEvent& i_rE
         xPeerListener->listItemRemoved( i_rEvent );
 }
 
-void SAL_CALL UnoListBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoListBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::listItemModified: invalid peer!" );
@@ -3042,7 +3008,7 @@ void SAL_CALL UnoListBoxControl::listItemModified( const awt::ItemListEvent& i_r
         xPeerListener->listItemModified( i_rEvent );
 }
 
-void SAL_CALL UnoListBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoListBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::allItemsRemoved: invalid peer!" );
@@ -3050,7 +3016,7 @@ void SAL_CALL UnoListBoxControl::allItemsRemoved( const lang::EventObject& i_rEv
         xPeerListener->allItemsRemoved( i_rEvent );
 }
 
-void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::itemListChanged: invalid peer!" );
@@ -3076,13 +3042,11 @@ UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentCon
 }
 
 OUString UnoControlComboBoxModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlComboBoxModel");
 }
 
 css::uno::Sequence<OUString> UnoControlComboBoxModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -3091,7 +3055,7 @@ css::uno::Sequence<OUString> UnoControlComboBoxModel::getSupportedServiceNames()
     return s;
 }
 
-uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -3109,11 +3073,11 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe
 }
 
 
-OUString UnoControlComboBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlComboBoxModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlComboBoxModel );
 }
-void SAL_CALL UnoControlComboBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception, std::exception)
+void SAL_CALL UnoControlComboBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue )
 {
     UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 
@@ -3175,13 +3139,11 @@ UnoComboBoxControl::UnoComboBoxControl()
 }
 
 OUString UnoComboBoxControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString( "stardiv.Toolkit.UnoComboBoxControl");
 }
 
 css::uno::Sequence<OUString> UnoComboBoxControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoEditControl::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -3195,7 +3157,7 @@ OUString UnoComboBoxControl::GetComponentServiceName()
     return OUString("combobox");
 }
 
-void UnoComboBoxControl::dispose() throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::dispose()
 {
     lang::EventObject aEvt;
     aEvt.Source = static_cast<cppu::OWeakObject*>(this);
@@ -3203,7 +3165,7 @@ void UnoComboBoxControl::dispose() throw(uno::RuntimeException, std::exception)
     maItemListeners.disposeAndClear( aEvt );
     UnoControl::dispose();
 }
-uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XComboBox* >(this)) );
@@ -3247,7 +3209,7 @@ void UnoComboBoxControl::ImplSetPeerProperty( const OUString& rPropName, const u
 
     UnoEditControl::ImplSetPeerProperty( rPropName, rVal );
 }
-void UnoComboBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoEditControl::createPeer( rxToolkit, rParentPeer );
 
@@ -3258,7 +3220,7 @@ void UnoComboBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxT
         xComboBox->addItemListener( &maItemListeners );
 }
 
-void UnoComboBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     maActionListeners.addInterface( l );
     if( getPeer().is() && maActionListeners.getLength() == 1 )
@@ -3268,7 +3230,7 @@ void UnoComboBoxControl::addActionListener(const uno::Reference< awt::XActionLis
     }
 }
 
-void UnoComboBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l)
 {
     if( getPeer().is() && maActionListeners.getLength() == 1 )
     {
@@ -3278,7 +3240,7 @@ void UnoComboBoxControl::removeActionListener(const uno::Reference< awt::XAction
     maActionListeners.removeInterface( l );
 }
 
-void UnoComboBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l)
 {
     maItemListeners.addInterface( l );
     if( getPeer().is() && maItemListeners.getLength() == 1 )
@@ -3288,7 +3250,7 @@ void UnoComboBoxControl::addItemListener(const uno::Reference < awt::XItemListen
     }
 }
 
-void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l)
 {
     if( getPeer().is() && maItemListeners.getLength() == 1 )
     {
@@ -3298,7 +3260,7 @@ void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemLis
     }
     maItemListeners.removeInterface( l );
 }
-void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent )
 {
     if ( maItemListeners.getLength() )
     {
@@ -3318,7 +3280,7 @@ void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(
         }
     }
 }
-sal_Bool SAL_CALL UnoComboBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL UnoComboBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
 
@@ -3338,7 +3300,7 @@ sal_Bool SAL_CALL UnoComboBoxControl::setModel( const uno::Reference< awt::XCont
     return true;
 }
 
-void SAL_CALL UnoComboBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoComboBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemInserted: invalid peer!" );
@@ -3346,7 +3308,7 @@ void SAL_CALL UnoComboBoxControl::listItemInserted( const awt::ItemListEvent& i_
         xPeerListener->listItemInserted( i_rEvent );
 }
 
-void SAL_CALL UnoComboBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoComboBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemRemoved: invalid peer!" );
@@ -3354,7 +3316,7 @@ void SAL_CALL UnoComboBoxControl::listItemRemoved( const awt::ItemListEvent& i_r
         xPeerListener->listItemRemoved( i_rEvent );
 }
 
-void SAL_CALL UnoComboBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoComboBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemModified: invalid peer!" );
@@ -3362,7 +3324,7 @@ void SAL_CALL UnoComboBoxControl::listItemModified( const awt::ItemListEvent& i_
         xPeerListener->listItemModified( i_rEvent );
 }
 
-void SAL_CALL UnoComboBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoComboBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::allItemsRemoved: invalid peer!" );
@@ -3370,7 +3332,7 @@ void SAL_CALL UnoComboBoxControl::allItemsRemoved( const lang::EventObject& i_rE
         xPeerListener->allItemsRemoved( i_rEvent );
 }
 
-void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rEvent )
 {
     const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY );
     OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::itemListChanged: invalid peer!" );
@@ -3378,13 +3340,13 @@ void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rE
         xPeerListener->itemListChanged( i_rEvent );
 }
 
-void UnoComboBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::addItem( const OUString& aItem, sal_Int16 nPos )
 {
     uno::Sequence<OUString> aSeq { aItem };
     addItems( aSeq, nPos );
 }
 
-void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos )
 {
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
@@ -3416,7 +3378,7 @@ void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_I
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), Any(aNewSeq), true );
 }
 
-void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount )
 {
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
@@ -3446,7 +3408,7 @@ void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(u
     }
 }
 
-sal_Int16 UnoComboBoxControl::getItemCount() throw(uno::RuntimeException, std::exception)
+sal_Int16 UnoComboBoxControl::getItemCount()
 {
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
@@ -3454,7 +3416,7 @@ sal_Int16 UnoComboBoxControl::getItemCount() throw(uno::RuntimeException, std::e
     return (sal_Int16)aSeq.getLength();
 }
 
-OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException, std::exception)
+OUString UnoComboBoxControl::getItem( sal_Int16 nPos )
 {
     OUString aItem;
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
@@ -3465,7 +3427,7 @@ OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeExcepti
     return aItem;
 }
 
-uno::Sequence< OUString> UnoComboBoxControl::getItems() throw(uno::RuntimeException, std::exception)
+uno::Sequence< OUString> UnoComboBoxControl::getItems()
 {
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
     uno::Sequence< OUString> aSeq;
@@ -3473,12 +3435,12 @@ uno::Sequence< OUString> UnoComboBoxControl::getItems() throw(uno::RuntimeExcept
     return aSeq;
 }
 
-void UnoComboBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::RuntimeException, std::exception)
+void UnoComboBoxControl::setDropDownLineCount( sal_Int16 nLines )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), uno::Any(nLines), true );
 }
 
-sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException, std::exception)
+sal_Int16 UnoComboBoxControl::getDropDownLineCount()
 {
     return ImplGetPropertyValue_INT16( BASEPROPERTY_LINECOUNT );
 }
@@ -3502,7 +3464,7 @@ UnoSpinFieldControl::UnoSpinFieldControl()
 }
 
 // uno::XInterface
-uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XSpinField* >(this)) );
@@ -3515,7 +3477,7 @@ IMPL_XTYPEPROVIDER_START( UnoSpinFieldControl )
     UnoEditControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void UnoSpinFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoSpinFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoEditControl::createPeer( rxToolkit, rParentPeer );
 
@@ -3526,7 +3488,7 @@ void UnoSpinFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx
 }
 
     // css::awt::XSpinField
-void UnoSpinFieldControl::addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception)
+void UnoSpinFieldControl::addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l )
 {
     maSpinListeners.addInterface( l );
     if( getPeer().is() && maSpinListeners.getLength() == 1 )
@@ -3536,7 +3498,7 @@ void UnoSpinFieldControl::addSpinListener( const css::uno::Reference< css::awt::
     }
 }
 
-void UnoSpinFieldControl::removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception)
+void UnoSpinFieldControl::removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l )
 {
     if( getPeer().is() && maSpinListeners.getLength() == 1 )
     {
@@ -3546,35 +3508,35 @@ void UnoSpinFieldControl::removeSpinListener( const css::uno::Reference< css::aw
     maSpinListeners.removeInterface( l );
 }
 
-void UnoSpinFieldControl::up() throw(css::uno::RuntimeException, std::exception)
+void UnoSpinFieldControl::up()
 {
     uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY );
     if ( xField.is() )
         xField->up();
 }
 
-void UnoSpinFieldControl::down() throw(css::uno::RuntimeException, std::exception)
+void UnoSpinFieldControl::down()
 {
     uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY );
     if ( xField.is() )
         xField->down();
 }
 
-void UnoSpinFieldControl::first() throw(css::uno::RuntimeException, std::exception)
+void UnoSpinFieldControl::first()
 {
     uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY );
     if ( xField.is() )
         xField->first();
 }
 
-void UnoSpinFieldControl::last() throw(css::uno::RuntimeException, std::exception)
+void UnoSpinFieldControl::last()
 {
     uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY );
     if ( xField.is() )
         xField->last();
 }
 
-void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception)
+void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat )
 {
     mbRepeat = bRepeat;
 
@@ -3592,7 +3554,7 @@ UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XComponentC
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField );
 }
 
-OUString UnoControlDateFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlDateFieldModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlDateFieldModel );
 }
@@ -3619,21 +3581,19 @@ uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlDateFieldModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlDateFieldModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlDateFieldModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -3667,7 +3627,7 @@ OUString UnoDateFieldControl::GetComponentServiceName()
 }
 
 // uno::XInterface
-uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XDateField* >(this)) );
@@ -3680,7 +3640,7 @@ IMPL_XTYPEPROVIDER_START( UnoDateFieldControl )
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void UnoDateFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer );
 
@@ -3692,7 +3652,7 @@ void UnoDateFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx
 }
 
 
-void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::textChanged( const awt::TextEvent& e )
 {
     uno::Reference< awt::XVclWindowPeer > xPeer( getPeer(), uno::UNO_QUERY );
 
@@ -3733,37 +3693,37 @@ void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt
         GetTextListeners().textChanged( e );
 }
 
-void UnoDateFieldControl::setDate( const util::Date& Date ) throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::setDate( const util::Date& Date )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATE ), uno::Any(Date), true );
 }
 
-util::Date UnoDateFieldControl::getDate() throw(uno::RuntimeException, std::exception)
+util::Date UnoDateFieldControl::getDate()
 {
     return ImplGetPropertyValue_Date( BASEPROPERTY_DATE );
 }
 
-void UnoDateFieldControl::setMin( const util::Date& Date ) throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::setMin( const util::Date& Date )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMIN ), uno::Any(Date), true );
 }
 
-util::Date UnoDateFieldControl::getMin() throw(uno::RuntimeException, std::exception)
+util::Date UnoDateFieldControl::getMin()
 {
     return ImplGetPropertyValue_Date( BASEPROPERTY_DATEMIN );
 }
 
-void UnoDateFieldControl::setMax( const util::Date& Date ) throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::setMax( const util::Date& Date )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMAX ), uno::Any(Date), true );
 }
 
-util::Date UnoDateFieldControl::getMax() throw(uno::RuntimeException, std::exception)
+util::Date UnoDateFieldControl::getMax()
 {
     return ImplGetPropertyValue_Date( BASEPROPERTY_DATEMAX );
 }
 
-void UnoDateFieldControl::setFirst( const util::Date& Date ) throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::setFirst( const util::Date& Date )
 {
     mnFirst = Date;
     if ( getPeer().is() )
@@ -3773,12 +3733,12 @@ void UnoDateFieldControl::setFirst( const util::Date& Date ) throw(uno::RuntimeE
     }
 }
 
-util::Date UnoDateFieldControl::getFirst() throw(uno::RuntimeException, std::exception)
+util::Date UnoDateFieldControl::getFirst()
 {
     return mnFirst;
 }
 
-void UnoDateFieldControl::setLast( const util::Date& Date ) throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::setLast( const util::Date& Date )
 {
     mnLast = Date;
     if ( getPeer().is() )
@@ -3788,12 +3748,12 @@ void UnoDateFieldControl::setLast( const util::Date& Date ) throw(uno::RuntimeEx
     }
 }
 
-util::Date UnoDateFieldControl::getLast() throw(uno::RuntimeException, std::exception)
+util::Date UnoDateFieldControl::getLast()
 {
     return mnLast;
 }
 
-void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::setLongFormat( sal_Bool bLong )
 {
     mbLongFormat = bLong ? TRISTATE_TRUE : TRISTATE_FALSE;
     if ( getPeer().is() )
@@ -3803,12 +3763,12 @@ void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) throw(uno::RuntimeExce
     }
 }
 
-sal_Bool UnoDateFieldControl::isLongFormat() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoDateFieldControl::isLongFormat()
 {
     return mbLongFormat == TRISTATE_TRUE;
 }
 
-void UnoDateFieldControl::setEmpty() throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::setEmpty()
 {
     if ( getPeer().is() )
     {
@@ -3817,7 +3777,7 @@ void UnoDateFieldControl::setEmpty() throw(uno::RuntimeException, std::exception
     }
 }
 
-sal_Bool UnoDateFieldControl::isEmpty() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoDateFieldControl::isEmpty()
 {
     bool bEmpty = false;
     if ( getPeer().is() )
@@ -3828,24 +3788,22 @@ sal_Bool UnoDateFieldControl::isEmpty() throw(uno::RuntimeException, std::except
     return bEmpty;
 }
 
-void UnoDateFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception)
+void UnoDateFieldControl::setStrictFormat( sal_Bool bStrict )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true );
 }
 
-sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoDateFieldControl::isStrictFormat()
 {
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
 OUString UnoDateFieldControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoDateFieldControl");
 }
 
 css::uno::Sequence<OUString> UnoDateFieldControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoSpinFieldControl::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -3871,7 +3829,7 @@ UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XComponentC
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField );
 }
 
-OUString UnoControlTimeFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlTimeFieldModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlTimeFieldModel );
 }
@@ -3898,21 +3856,19 @@ uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlTimeFieldModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlTimeFieldModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlTimeFieldModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -3945,7 +3901,7 @@ OUString UnoTimeFieldControl::GetComponentServiceName()
 }
 
 // uno::XInterface
-uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XTimeField* >(this)) );
@@ -3958,7 +3914,7 @@ IMPL_XTYPEPROVIDER_START( UnoTimeFieldControl )
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void UnoTimeFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoTimeFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer );
 
@@ -3967,7 +3923,7 @@ void UnoTimeFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx
     xField->setLast( mnLast );
 }
 
-void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception)
+void UnoTimeFieldControl::textChanged( const awt::TextEvent& e )
 {
     // also change the text property (#i25106#)
     uno::Reference< awt::XVclWindowPeer > xPeer( getPeer(), uno::UNO_QUERY );
@@ -3986,37 +3942,37 @@ void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt
         GetTextListeners().textChanged( e );
 }
 
-void UnoTimeFieldControl::setTime( const util::Time& Time ) throw(uno::RuntimeException, std::exception)
+void UnoTimeFieldControl::setTime( const util::Time& Time )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIME ), Any(Time), true );
 }
 
-util::Time UnoTimeFieldControl::getTime() throw(uno::RuntimeException, std::exception)
+util::Time UnoTimeFieldControl::getTime()
 {
     return ImplGetPropertyValue_Time( BASEPROPERTY_TIME );
 }
 
-void UnoTimeFieldControl::setMin( const util::Time& Time ) throw(uno::RuntimeException, std::exception)
+void UnoTimeFieldControl::setMin( const util::Time& Time )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMIN ), uno::Any(Time), true );
 }
 
-util::Time UnoTimeFieldControl::getMin() throw(uno::RuntimeException, std::exception)
+util::Time UnoTimeFieldControl::getMin()
 {
     return ImplGetPropertyValue_Time( BASEPROPERTY_TIMEMIN );
 }
 
-void UnoTimeFieldControl::setMax( const util::Time& Time ) throw(uno::RuntimeException, std::exception)
+void UnoTimeFieldControl::setMax( const util::Time& Time )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMAX ), uno::Any(Time), true );
 }
 
-util::Time UnoTimeFieldControl::getMax() throw(uno::RuntimeException, std::exception)
+util::Time UnoTimeFieldControl::getMax()
 {
     return ImplGetPropertyValue_Time( BASEPROPERTY_TIMEMAX );
 }
 
-void UnoTimeFieldControl::setFirst( const util::Time& Time ) throw(uno::RuntimeException, std::exception)
+void UnoTimeFieldControl::setFirst( const util::Time& Time )
 {
     mnFirst = Time;
     if ( getPeer().is() )
@@ -4026,12 +3982,12 @@ void UnoTimeFieldControl::setFirst( const util::Time& Time ) throw(uno::RuntimeE
     }
 }
 
-util::Time UnoTimeFieldControl::getFirst() throw(uno::RuntimeException, std::exception)
+util::Time UnoTimeFieldControl::getFirst()
 {
     return mnFirst;
 }
 
-void UnoTimeFieldControl::setLast( const util::Time& Time ) throw(uno::RuntimeException, std::exception)
+void UnoTimeFieldControl::setLast( const util::Time& Time )
 {
     mnLast = Time;
     if ( getPeer().is() )
@@ -4041,12 +3997,12 @@ void UnoTimeFieldControl::setLast( const util::Time& Time ) throw(uno::RuntimeEx
     }
 }
 
-util::Time UnoTimeFieldControl::getLast() throw(uno::RuntimeException, std::exception)
+util::Time UnoTimeFieldControl::getLast()
 {
     return mnLast;
 }
 
-void UnoTimeFieldControl::setEmpty() throw(uno::RuntimeException, std::exception)
+void UnoTimeFieldControl::setEmpty()
 {
     if ( getPeer().is() )
     {
@@ -4055,7 +4011,7 @@ void UnoTimeFieldControl::setEmpty() throw(uno::RuntimeException, std::exception
     }
 }
 
-sal_Bool UnoTimeFieldControl::isEmpty() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoTimeFieldControl::isEmpty()
 {
     bool bEmpty = false;
     if ( getPeer().is() )
@@ -4066,24 +4022,22 @@ sal_Bool UnoTimeFieldControl::isEmpty() throw(uno::RuntimeException, std::except
     return bEmpty;
 }
 
-void UnoTimeFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception)
+void UnoTimeFieldControl::setStrictFormat( sal_Bool bStrict )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true );
 }
 
-sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoTimeFieldControl::isStrictFormat()
 {
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
 OUString UnoTimeFieldControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoTimeFieldControl");
 }
 
 css::uno::Sequence<OUString> UnoTimeFieldControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoSpinFieldControl::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4109,7 +4063,7 @@ UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XComp
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField );
 }
 
-OUString UnoControlNumericFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlNumericFieldModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlNumericFieldModel );
 }
@@ -4136,21 +4090,19 @@ uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlNumericFieldModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlNumericFieldModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlNumericFieldModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4183,7 +4135,7 @@ OUString UnoNumericFieldControl::GetComponentServiceName()
 }
 
 // uno::XInterface
-uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XNumericField* >(this)) );
@@ -4196,7 +4148,7 @@ IMPL_XTYPEPROVIDER_START( UnoNumericFieldControl )
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void UnoNumericFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer );
 
@@ -4206,7 +4158,7 @@ void UnoNumericFieldControl::createPeer( const uno::Reference< awt::XToolkit > &
 }
 
 
-void UnoNumericFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::textChanged( const awt::TextEvent& e )
 {
     uno::Reference < awt::XNumericField >  xField( getPeer(), uno::UNO_QUERY );
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), uno::Any(xField->getValue()), false );
@@ -4215,37 +4167,37 @@ void UnoNumericFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::R
         GetTextListeners().textChanged( e );
 }
 
-void UnoNumericFieldControl::setValue( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::setValue( double Value )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), uno::Any(Value), true );
 }
 
-double UnoNumericFieldControl::getValue() throw(uno::RuntimeException, std::exception)
+double UnoNumericFieldControl::getValue()
 {
     return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUE_DOUBLE );
 }
 
-void UnoNumericFieldControl::setMin( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::setMin( double Value )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), uno::Any(Value), true );
 }
 
-double UnoNumericFieldControl::getMin() throw(uno::RuntimeException, std::exception)
+double UnoNumericFieldControl::getMin()
 {
     return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMIN_DOUBLE );
 }
 
-void UnoNumericFieldControl::setMax( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::setMax( double Value )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), uno::Any(Value), true );
 }
 
-double UnoNumericFieldControl::getMax() throw(uno::RuntimeException, std::exception)
+double UnoNumericFieldControl::getMax()
 {
     return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMAX_DOUBLE );
 }
 
-void UnoNumericFieldControl::setFirst( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::setFirst( double Value )
 {
     mnFirst = Value;
     if ( getPeer().is() )
@@ -4255,12 +4207,12 @@ void UnoNumericFieldControl::setFirst( double Value ) throw(uno::RuntimeExceptio
     }
 }
 
-double UnoNumericFieldControl::getFirst() throw(uno::RuntimeException, std::exception)
+double UnoNumericFieldControl::getFirst()
 {
     return mnFirst;
 }
 
-void UnoNumericFieldControl::setLast( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::setLast( double Value )
 {
     mnLast = Value;
     if ( getPeer().is() )
@@ -4270,29 +4222,27 @@ void UnoNumericFieldControl::setLast( double Value ) throw(uno::RuntimeException
     }
 }
 
-double UnoNumericFieldControl::getLast() throw(uno::RuntimeException, std::exception)
+double UnoNumericFieldControl::getLast()
 {
     return mnLast;
 }
 
-void UnoNumericFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::setStrictFormat( sal_Bool bStrict )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true );
 }
 
-sal_Bool UnoNumericFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoNumericFieldControl::isStrictFormat()
 {
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
 OUString UnoNumericFieldControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoNumericFieldControl");
 }
 
 css::uno::Sequence<OUString> UnoNumericFieldControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoSpinFieldControl::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4301,22 +4251,22 @@ css::uno::Sequence<OUString> UnoNumericFieldControl::getSupportedServiceNames()
     return s;
 }
 
-void UnoNumericFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::setSpinSize( double Digits )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), uno::Any(Digits), true );
 }
 
-double UnoNumericFieldControl::getSpinSize() throw(uno::RuntimeException, std::exception)
+double UnoNumericFieldControl::getSpinSize()
 {
     return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUESTEP_DOUBLE );
 }
 
-void UnoNumericFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::RuntimeException, std::exception)
+void UnoNumericFieldControl::setDecimalDigits( sal_Int16 Digits )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), uno::Any(Digits), true );
 }
 
-sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException, std::exception)
+sal_Int16 UnoNumericFieldControl::getDecimalDigits()
 {
     return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY );
 }
@@ -4338,7 +4288,7 @@ UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XCo
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField );
 }
 
-OUString UnoControlCurrencyFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlCurrencyFieldModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlCurrencyFieldModel );
 }
@@ -4369,21 +4319,19 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlCurrencyFieldModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlCurrencyFieldModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlCurrencyFieldModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4416,7 +4364,7 @@ OUString UnoCurrencyFieldControl::GetComponentServiceName()
 }
 
 // uno::XInterface
-uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XCurrencyField* >(this)) );
@@ -4429,7 +4377,7 @@ IMPL_XTYPEPROVIDER_START( UnoCurrencyFieldControl )
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void UnoCurrencyFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer )
 {
     UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer );
 
@@ -4438,7 +4386,7 @@ void UnoCurrencyFieldControl::createPeer( const uno::Reference< awt::XToolkit >
     xField->setLast( mnLast );
 }
 
-void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e )
 {
     uno::Reference < awt::XCurrencyField >  xField( getPeer(), uno::UNO_QUERY );
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), uno::Any(xField->getValue()), false );
@@ -4447,37 +4395,37 @@ void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::
         GetTextListeners().textChanged( e );
 }
 
-void UnoCurrencyFieldControl::setValue( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::setValue( double Value )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), Any(Value), true );
 }
 
-double UnoCurrencyFieldControl::getValue() throw(uno::RuntimeException, std::exception)
+double UnoCurrencyFieldControl::getValue()
 {
     return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUE_DOUBLE );
 }
 
-void UnoCurrencyFieldControl::setMin( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::setMin( double Value )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), uno::Any(Value), true );
 }
 
-double UnoCurrencyFieldControl::getMin() throw(uno::RuntimeException, std::exception)
+double UnoCurrencyFieldControl::getMin()
 {
     return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMIN_DOUBLE );
 }
 
-void UnoCurrencyFieldControl::setMax( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::setMax( double Value )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), uno::Any(Value), true );
 }
 
-double UnoCurrencyFieldControl::getMax() throw(uno::RuntimeException, std::exception)
+double UnoCurrencyFieldControl::getMax()
 {
     return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMAX_DOUBLE );
 }
 
-void UnoCurrencyFieldControl::setFirst( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::setFirst( double Value )
 {
     mnFirst = Value;
     if ( getPeer().is() )
@@ -4487,12 +4435,12 @@ void UnoCurrencyFieldControl::setFirst( double Value ) throw(uno::RuntimeExcepti
     }
 }
 
-double UnoCurrencyFieldControl::getFirst() throw(uno::RuntimeException, std::exception)
+double UnoCurrencyFieldControl::getFirst()
 {
     return mnFirst;
 }
 
-void UnoCurrencyFieldControl::setLast( double Value ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::setLast( double Value )
 {
     mnLast = Value;
     if ( getPeer().is() )
@@ -4502,30 +4450,28 @@ void UnoCurrencyFieldControl::setLast( double Value ) throw(uno::RuntimeExceptio
     }
 }
 
-double UnoCurrencyFieldControl::getLast() throw(uno::RuntimeException, std::exception)
+double UnoCurrencyFieldControl::getLast()
 {
     return mnLast;
 }
 
-void UnoCurrencyFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::setStrictFormat( sal_Bool bStrict )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true );
 }
 
-sal_Bool UnoCurrencyFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoCurrencyFieldControl::isStrictFormat()
 {
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
 OUString UnoCurrencyFieldControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoCurrencyFieldControl");
 }
 
 css::uno::Sequence<OUString>
 UnoCurrencyFieldControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoSpinFieldControl::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4534,22 +4480,22 @@ UnoCurrencyFieldControl::getSupportedServiceNames()
     return s;
 }
 
-void UnoCurrencyFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::setSpinSize( double Digits )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), uno::Any(Digits), true );
 }
 
-double UnoCurrencyFieldControl::getSpinSize() throw(uno::RuntimeException, std::exception)
+double UnoCurrencyFieldControl::getSpinSize()
 {
     return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUESTEP_DOUBLE );
 }
 
-void UnoCurrencyFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::RuntimeException, std::exception)
+void UnoCurrencyFieldControl::setDecimalDigits( sal_Int16 Digits )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), uno::Any(Digits), true );
 }
 
-sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeException, std::exception)
+sal_Int16 UnoCurrencyFieldControl::getDecimalDigits()
 {
     return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY );
 }
@@ -4571,7 +4517,7 @@ UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XComp
     UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField );
 }
 
-OUString UnoControlPatternFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlPatternFieldModel::getServiceName()
 {
     return OUString::createFromAscii( szServiceName_UnoControlPatternFieldModel );
 }
@@ -4597,21 +4543,19 @@ uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlPatternFieldModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlPatternFieldModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlPatternFieldModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4667,7 +4611,7 @@ void UnoPatternFieldControl::ImplSetPeerProperty( const OUString& rPropName, con
 
 
 // uno::XInterface
-uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XPatternField* >(this)) );
@@ -4680,46 +4624,44 @@ IMPL_XTYPEPROVIDER_START( UnoPatternFieldControl )
     UnoSpinFieldControl::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-void UnoPatternFieldControl::setString( const OUString& rString ) throw(uno::RuntimeException, std::exception)
+void UnoPatternFieldControl::setString( const OUString& rString )
 {
     setText( rString );
 }
 
-OUString UnoPatternFieldControl::getString() throw(uno::RuntimeException, std::exception)
+OUString UnoPatternFieldControl::getString()
 {
     return getText();
 }
 
-void UnoPatternFieldControl::setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(uno::RuntimeException, std::exception)
+void UnoPatternFieldControl::setMasks( const OUString& EditMask, const OUString& LiteralMask )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_EDITMASK ), uno::Any(EditMask), true );
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LITERALMASK ), uno::Any(LiteralMask), true );
 }
 
-void UnoPatternFieldControl::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(uno::RuntimeException, std::exception)
+void UnoPatternFieldControl::getMasks( OUString& EditMask, OUString& LiteralMask )
 {
     EditMask = ImplGetPropertyValue_UString( BASEPROPERTY_EDITMASK );
     LiteralMask = ImplGetPropertyValue_UString( BASEPROPERTY_LITERALMASK );
 }
 
-void UnoPatternFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception)
+void UnoPatternFieldControl::setStrictFormat( sal_Bool bStrict )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true );
 }
 
-sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoPatternFieldControl::isStrictFormat()
 {
     return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT );
 }
 
 OUString UnoPatternFieldControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoPatternFieldControl");
 }
 
 css::uno::Sequence<OUString> UnoPatternFieldControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoSpinFieldControl::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4757,7 +4699,7 @@ UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XCompon
     ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MIN );
 }
 
-OUString UnoControlProgressBarModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlProgressBarModel::getServiceName( )
 {
     return OUString::createFromAscii( szServiceName_UnoControlProgressBarModel );
 }
@@ -4784,21 +4726,19 @@ uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlProgressBarModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlProgressBarModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlProgressBarModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4829,7 +4769,7 @@ OUString UnoProgressBarControl::GetComponentServiceName()
 }
 
 // uno::XInterface
-uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< awt::XProgressBar* >(this)) );
@@ -4843,22 +4783,22 @@ IMPL_XTYPEPROVIDER_START( UnoProgressBarControl )
 IMPL_XTYPEPROVIDER_END
 
 // css::awt::XProgressBar
-void UnoProgressBarControl::setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception)
+void UnoProgressBarControl::setForegroundColor( sal_Int32 nColor )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_FILLCOLOR ), uno::Any(nColor), true );
 }
 
-void UnoProgressBarControl::setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception)
+void UnoProgressBarControl::setBackgroundColor( sal_Int32 nColor )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BACKGROUNDCOLOR ), uno::Any(nColor), true );
 }
 
-void UnoProgressBarControl::setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception)
+void UnoProgressBarControl::setValue( sal_Int32 nValue )
 {
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE ), uno::Any(nValue), true );
 }
 
-void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception )
+void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax )
 {
     uno::Any aMin;
     uno::Any aMax;
@@ -4880,19 +4820,17 @@ void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE_MAX ), aMax, true );
 }
 
-sal_Int32 UnoProgressBarControl::getValue() throw(css::uno::RuntimeException, std::exception)
+sal_Int32 UnoProgressBarControl::getValue()
 {
     return ImplGetPropertyValue_INT32( BASEPROPERTY_PROGRESSVALUE );
 }
 
 OUString UnoProgressBarControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoProgressBarControl");
 }
 
 css::uno::Sequence<OUString> UnoProgressBarControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4927,7 +4865,7 @@ UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XComponentC
     ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
 }
 
-OUString UnoControlFixedLineModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception)
+OUString UnoControlFixedLineModel::getServiceName( )
 {
     return OUString::createFromAscii( szServiceName_UnoControlFixedLineModel );
 }
@@ -4953,21 +4891,19 @@ uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
 }
 
 // beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertySetInfo(  ) throw(uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertySetInfo(  )
 {
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
 OUString UnoControlFixedLineModel::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoControlFixedLineModel");
 }
 
 css::uno::Sequence<OUString>
 UnoControlFixedLineModel::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlModel::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
@@ -4999,19 +4935,17 @@ OUString UnoFixedLineControl::GetComponentServiceName()
     return OUString("FixedLine");
 }
 
-sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException, std::exception)
+sal_Bool UnoFixedLineControl::isTransparent()
 {
     return true;
 }
 
 OUString UnoFixedLineControl::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("stardiv.Toolkit.UnoFixedLineControl");
 }
 
 css::uno::Sequence<OUString> UnoFixedLineControl::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     auto s(UnoControlBase::getSupportedServiceNames());
     s.realloc(s.getLength() + 2);
diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
index 2cd81736eb72..39ccf22366ab 100644
--- a/toolkit/source/helper/listenermultiplexer.cxx
+++ b/toolkit/source/helper/listenermultiplexer.cxx
@@ -33,7 +33,7 @@ ListenerMultiplexerBase::~ListenerMultiplexerBase()
 }
 
 // css::uno::XInterface
-css::uno::Any ListenerMultiplexerBase::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any ListenerMultiplexerBase::queryInterface( const css::uno::Type & rType )
 {
     return ::cppu::queryInterface( rType, (static_cast< css::uno::XInterface* >(this)) );
 }
@@ -56,7 +56,7 @@ void SAL_CALL EventListenerMultiplexer::release() throw ()
 }
 
 // css::uno::XInterface
-css::uno::Any EventListenerMultiplexer::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any EventListenerMultiplexer::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType,
                                         (static_cast< css::lang::XEventListener* >(this)) );
@@ -64,7 +64,7 @@ css::uno::Any EventListenerMultiplexer::queryInterface( const css::uno::Type & r
 }
 
 // css::lang::XEventListener
-void EventListenerMultiplexer::disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)
+void EventListenerMultiplexer::disposing( const css::lang::EventObject& )
 {
 }
 
@@ -155,13 +155,13 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ItemListenerMultiplexer, css::awt::XIte
 
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TabListenerMultiplexer, css::awt::XTabListener )
 
-void TabListenerMultiplexer::inserted( sal_Int32 evt ) throw(css::uno::RuntimeException, std::exception)
+void TabListenerMultiplexer::inserted( sal_Int32 evt )
 IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, css::awt::XTabListener, inserted, ::sal_Int32 )
 
-void TabListenerMultiplexer::removed( sal_Int32 evt ) throw(css::uno::RuntimeException, std::exception)
+void TabListenerMultiplexer::removed( sal_Int32 evt )
 IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, css::awt::XTabListener, removed, ::sal_Int32 )
 
-void TabListenerMultiplexer::changed( sal_Int32 evt, const css::uno::Sequence< css::beans::NamedValue >& evt2 ) throw(css::uno::RuntimeException, std::exception)
+void TabListenerMultiplexer::changed( sal_Int32 evt, const css::uno::Sequence< css::beans::NamedValue >& evt2 )
 {
     sal_Int32 aMulti( evt );
     ::comphelper::OInterfaceIteratorHelper2 aIt( *this );
@@ -187,10 +187,10 @@ void TabListenerMultiplexer::changed( sal_Int32 evt, const css::uno::Sequence< c
 }
 
 
-void TabListenerMultiplexer::activated( sal_Int32 evt ) throw(css::uno::RuntimeException, std::exception)
+void TabListenerMultiplexer::activated( sal_Int32 evt )
 IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, css::awt::XTabListener, activated, ::sal_Int32 )
 
-void TabListenerMultiplexer::deactivated( sal_Int32 evt ) throw(css::uno::RuntimeException, std::exception)
+void TabListenerMultiplexer::deactivated( sal_Int32 evt )
 IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, css::awt::XTabListener, deactivated, ::sal_Int32 )
 
 
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx
index 3d0c184578f7..d78544c9fb4a 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.cxx
@@ -99,7 +99,7 @@ css::uno::Sequence< css::beans::Property > UnoPropertyArrayHelper::getProperties
     return aProps;
 }
 
-css::beans::Property UnoPropertyArrayHelper::getPropertyByName(const OUString& rPropertyName) throw (css::beans::UnknownPropertyException)
+css::beans::Property UnoPropertyArrayHelper::getPropertyByName(const OUString& rPropertyName)
 {
     css::beans::Property aProp;
     sal_uInt16 nId = GetPropertyId( rPropertyName );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index a1d977f53c68..bd3430c980d6 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -583,7 +583,7 @@ FieldUnit VCLUnoHelper::ConvertToFieldUnit( sal_Int16 _nMeasurementUnit, sal_Int
 }
 
 
-MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit) throw (css::lang::IllegalArgumentException)
+MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit)
 {
     MapUnit eMode;
     switch(_nMeasureUnit)
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index e08edb397bc5..93a26824f388 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -203,8 +203,6 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache
 
 Any& SAL_CALL CachedContentResultSet::CCRS_Cache
     ::getRowAny( sal_Int32 nRow )
-    throw( SQLException,
-    RuntimeException )
 {
     if( !nRow )
         throw SQLException();
@@ -269,8 +267,6 @@ Sequence< sal_Bool >* SAL_CALL CachedContentResultSet::CCRS_Cache
 
 const Any& SAL_CALL CachedContentResultSet::CCRS_Cache
     ::getAny( sal_Int32 nRow, sal_Int32 nColumnIndex )
-    throw( SQLException,
-    RuntimeException )
 {
     if( !nColumnIndex )
         throw SQLException();
@@ -297,7 +293,6 @@ const Any& SAL_CALL CachedContentResultSet::CCRS_Cache
 
 OUString SAL_CALL CachedContentResultSet::CCRS_Cache
     ::getContentIdentifierString( sal_Int32 nRow )
-    throw( css::uno::RuntimeException )
 {
     try
     {
@@ -319,7 +314,6 @@ OUString SAL_CALL CachedContentResultSet::CCRS_Cache
 
 Reference< XContentIdentifier > SAL_CALL CachedContentResultSet::CCRS_Cache
     ::getContentIdentifier( sal_Int32 nRow )
-    throw( css::uno::RuntimeException )
 {
     try
     {
@@ -341,7 +335,6 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet::CCRS_Cache
 
 Reference< XContent > SAL_CALL CachedContentResultSet::CCRS_Cache
     ::getContent( sal_Int32 nRow )
-    throw( css::uno::RuntimeException )
 {
     try
     {
@@ -398,31 +391,25 @@ public:
             XPropertySetInfo > const & xPropertySetInfoOrigin );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XPropertySetInfo
     virtual Sequence< css::beans::Property > SAL_CALL
-    getProperties()
-        throw( RuntimeException, std::exception ) override;
+    getProperties() override;
 
     virtual css::beans::Property SAL_CALL
-    getPropertyByName( const OUString& aName )
-        throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) override;
+    getPropertyByName( const OUString& aName ) override;
 
     virtual sal_Bool SAL_CALL
-    hasPropertyByName( const OUString& Name )
-        throw( RuntimeException, std::exception ) override;
+    hasPropertyByName( const OUString& Name ) override;
 };
 
 //some helping variables ( names for my special properties )
@@ -518,7 +505,6 @@ void SAL_CALL CCRS_PropertySetInfo::release()
 }
 
 css::uno::Any SAL_CALL CCRS_PropertySetInfo::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XTypeProvider* >(this)),
@@ -539,7 +525,7 @@ XTYPEPROVIDER_IMPL_2( CCRS_PropertySetInfo
 
 //virtual
 Sequence< Property > SAL_CALL CCRS_PropertySetInfo
-    ::getProperties() throw( RuntimeException, std::exception )
+    ::getProperties()
 {
     return *m_pProperties;
 }
@@ -547,7 +533,6 @@ Sequence< Property > SAL_CALL CCRS_PropertySetInfo
 //virtual
 Property SAL_CALL CCRS_PropertySetInfo
     ::getPropertyByName( const OUString& aName )
-        throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     if ( aName.isEmpty() )
         throw UnknownPropertyException();
@@ -562,7 +547,6 @@ Property SAL_CALL CCRS_PropertySetInfo
 //virtual
 sal_Bool SAL_CALL CCRS_PropertySetInfo
     ::hasPropertyByName( const OUString& Name )
-        throw( RuntimeException, std::exception )
 {
     return ( impl_getPos( Name ) != -1 );
 }
@@ -696,8 +680,6 @@ CachedContentResultSet::~CachedContentResultSet()
 
 bool SAL_CALL CachedContentResultSet
     ::applyPositionToOrigin( sal_Int32 nRow )
-    throw( SQLException,
-           RuntimeException )
 {
     impl_EnsureNotDisposed();
 
@@ -825,7 +807,6 @@ if( bIsFinalCount && !bCurIsFinalCount )                            \
 void SAL_CALL CachedContentResultSet
     ::impl_fetchData( sal_Int32 nRow
         , sal_Int32 nFetchSize, sal_Int32 nFetchDirection )
-        throw( css::uno::RuntimeException )
 {
     FETCH_XXX( m_aCache, m_xFetchProvider, fetch );
 }
@@ -923,7 +904,6 @@ void SAL_CALL CachedContentResultSet::release()
 
 Any SAL_CALL CachedContentResultSet
     ::queryInterface( const Type&  rType )
-    throw ( RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
 
@@ -962,19 +942,16 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet
 // XServiceInfo methods.
 
 OUString SAL_CALL CachedContentResultSet::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.CachedContentResultSet" );
 }
 
 sal_Bool SAL_CALL CachedContentResultSet::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL CachedContentResultSet::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { CACHED_CONTENT_RESULTSET_SERVICE_NAME };
 }
@@ -987,11 +964,6 @@ css::uno::Sequence< OUString > SAL_CALL CachedContentResultSet::getSupportedServ
 // virtual
 void SAL_CALL CachedContentResultSet
     ::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
-    throw( UnknownPropertyException,
-           PropertyVetoException,
-           IllegalArgumentException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1098,9 +1070,6 @@ void SAL_CALL CachedContentResultSet
 // virtual
 Any SAL_CALL CachedContentResultSet
     ::getPropertyValue( const OUString& rPropertyName )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1157,7 +1126,6 @@ Any SAL_CALL CachedContentResultSet
 //virtual
 void SAL_CALL CachedContentResultSet
     ::impl_disposing( const EventObject& rEventObject )
-    throw( RuntimeException )
 {
     {
         impl_EnsureNotDisposed();
@@ -1172,7 +1140,6 @@ void SAL_CALL CachedContentResultSet
 //virtual
 void SAL_CALL CachedContentResultSet
     ::impl_propertyChange( const PropertyChangeEvent& rEvt )
-    throw( RuntimeException )
 {
     impl_EnsureNotDisposed();
 
@@ -1226,8 +1193,6 @@ void SAL_CALL CachedContentResultSet
 //virtual
 void SAL_CALL CachedContentResultSet
     ::impl_vetoableChange( const PropertyChangeEvent& rEvt )
-    throw( PropertyVetoException,
-           RuntimeException )
 {
     impl_EnsureNotDisposed();
 
@@ -1306,7 +1271,6 @@ return m_aCache##XXX.get##XXX( nRow );
 // virtual
 OUString SAL_CALL CachedContentResultSet
     ::queryContentIdentifierString()
-    throw( RuntimeException, std::exception )
 {
     XCONTENTACCESS_queryXXX( queryContentIdentifierString, ContentIdentifierString, OUString )
 }
@@ -1315,7 +1279,6 @@ OUString SAL_CALL CachedContentResultSet
 // virtual
 Reference< XContentIdentifier > SAL_CALL CachedContentResultSet
     ::queryContentIdentifier()
-    throw( RuntimeException, std::exception )
 {
     XCONTENTACCESS_queryXXX( queryContentIdentifier, ContentIdentifier, Reference< XContentIdentifier > )
 }
@@ -1324,7 +1287,6 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet
 // virtual
 Reference< XContent > SAL_CALL CachedContentResultSet
     ::queryContent()
-    throw( RuntimeException, std::exception )
 {
     XCONTENTACCESS_queryXXX( queryContent, Content, Reference< XContent > )
 }
@@ -1336,8 +1298,6 @@ Reference< XContent > SAL_CALL CachedContentResultSet
 
 sal_Bool SAL_CALL CachedContentResultSet
     ::next()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1377,8 +1337,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::previous()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1418,8 +1376,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::absolute( sal_Int32 row )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1537,8 +1493,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::relative( sal_Int32 rows )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1592,8 +1546,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::first()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1627,8 +1579,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::last()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1676,8 +1626,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 void SAL_CALL CachedContentResultSet
     ::beforeFirst()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1692,8 +1640,6 @@ void SAL_CALL CachedContentResultSet
 //virtual
 void SAL_CALL CachedContentResultSet
     ::afterLast()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1708,8 +1654,6 @@ void SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::isAfterLast()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1741,8 +1685,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::isBeforeFirst()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1777,8 +1719,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::isFirst()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1812,8 +1752,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::isLast()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1845,8 +1783,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Int32 SAL_CALL CachedContentResultSet
     ::getRow()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1859,8 +1795,6 @@ sal_Int32 SAL_CALL CachedContentResultSet
 //virtual
 void SAL_CALL CachedContentResultSet
     ::refreshRow()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1871,8 +1805,6 @@ void SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::rowUpdated()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1882,8 +1814,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::rowInserted()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1894,8 +1824,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::rowDeleted()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1906,8 +1834,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 Reference< XInterface > SAL_CALL CachedContentResultSet
     ::getStatement()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     //@todo ?return anything
@@ -1921,8 +1847,6 @@ Reference< XInterface > SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::wasNull()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xRowOrigin();
@@ -1942,8 +1866,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 OUString SAL_CALL CachedContentResultSet
     ::getString( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<OUString>(&css::sdbc::XRow::getString, columnIndex);
 }
@@ -1951,8 +1873,6 @@ OUString SAL_CALL CachedContentResultSet
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
     ::getBoolean( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Bool>(&css::sdbc::XRow::getBoolean, columnIndex);
 }
@@ -1960,8 +1880,6 @@ sal_Bool SAL_CALL CachedContentResultSet
 //virtual
 sal_Int8 SAL_CALL CachedContentResultSet
     ::getByte( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Int8>(&css::sdbc::XRow::getByte, columnIndex);
 }
@@ -1969,8 +1887,6 @@ sal_Int8 SAL_CALL CachedContentResultSet
 //virtual
 sal_Int16 SAL_CALL CachedContentResultSet
     ::getShort( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Int16>(&css::sdbc::XRow::getShort, columnIndex);
 }
@@ -1978,8 +1894,6 @@ sal_Int16 SAL_CALL CachedContentResultSet
 //virtual
 sal_Int32 SAL_CALL CachedContentResultSet
     ::getInt( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Int32>(&css::sdbc::XRow::getInt, columnIndex);
 }
@@ -1987,8 +1901,6 @@ sal_Int32 SAL_CALL CachedContentResultSet
 //virtual
 sal_Int64 SAL_CALL CachedContentResultSet
     ::getLong( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Int64>(&css::sdbc::XRow::getLong, columnIndex);
 }
@@ -1996,8 +1908,6 @@ sal_Int64 SAL_CALL CachedContentResultSet
 //virtual
 float SAL_CALL CachedContentResultSet
     ::getFloat( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<float>(&css::sdbc::XRow::getFloat, columnIndex);
 }
@@ -2005,8 +1915,6 @@ float SAL_CALL CachedContentResultSet
 //virtual
 double SAL_CALL CachedContentResultSet
     ::getDouble( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<double>(&css::sdbc::XRow::getDouble, columnIndex);
 }
@@ -2014,8 +1922,6 @@ double SAL_CALL CachedContentResultSet
 //virtual
 Sequence< sal_Int8 > SAL_CALL CachedContentResultSet
     ::getBytes( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Sequence<sal_Int8> >(
         &css::sdbc::XRow::getBytes, columnIndex);
@@ -2024,8 +1930,6 @@ Sequence< sal_Int8 > SAL_CALL CachedContentResultSet
 //virtual
 Date SAL_CALL CachedContentResultSet
     ::getDate( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<css::util::Date>(
         &css::sdbc::XRow::getDate, columnIndex);
@@ -2034,8 +1938,6 @@ Date SAL_CALL CachedContentResultSet
 //virtual
 Time SAL_CALL CachedContentResultSet
     ::getTime( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<css::util::Time>(
         &css::sdbc::XRow::getTime, columnIndex);
@@ -2044,8 +1946,6 @@ Time SAL_CALL CachedContentResultSet
 //virtual
 DateTime SAL_CALL CachedContentResultSet
     ::getTimestamp( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet<css::util::DateTime>(
         &css::sdbc::XRow::getTimestamp, columnIndex);
@@ -2055,8 +1955,6 @@ DateTime SAL_CALL CachedContentResultSet
 Reference< css::io::XInputStream >
     SAL_CALL CachedContentResultSet
     ::getBinaryStream( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::io::XInputStream> >(
         &css::sdbc::XRow::getBinaryStream, columnIndex);
@@ -2066,8 +1964,6 @@ Reference< css::io::XInputStream >
 Reference< css::io::XInputStream >
     SAL_CALL CachedContentResultSet
     ::getCharacterStream( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::io::XInputStream> >(
         &css::sdbc::XRow::getCharacterStream, columnIndex);
@@ -2078,8 +1974,6 @@ Any SAL_CALL CachedContentResultSet
     ::getObject( sal_Int32 columnIndex,
            const Reference<
             css::container::XNameAccess >& typeMap )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     //if you change this function please pay attention to
     //function template rowOriginGet, where this is similar implemented
@@ -2126,8 +2020,6 @@ Any SAL_CALL CachedContentResultSet
 //virtual
 Reference< XRef > SAL_CALL CachedContentResultSet
     ::getRef( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::sdbc::XRef> >(
         &css::sdbc::XRow::getRef, columnIndex);
@@ -2136,8 +2028,6 @@ Reference< XRef > SAL_CALL CachedContentResultSet
 //virtual
 Reference< XBlob > SAL_CALL CachedContentResultSet
     ::getBlob( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::sdbc::XBlob> >(
         &css::sdbc::XRow::getBlob, columnIndex);
@@ -2146,8 +2036,6 @@ Reference< XBlob > SAL_CALL CachedContentResultSet
 //virtual
 Reference< XClob > SAL_CALL CachedContentResultSet
     ::getClob( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::sdbc::XClob> >(
         &css::sdbc::XRow::getClob, columnIndex);
@@ -2156,8 +2044,6 @@ Reference< XClob > SAL_CALL CachedContentResultSet
 //virtual
 Reference< XArray > SAL_CALL CachedContentResultSet
     ::getArray( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::sdbc::XArray> >(
         &css::sdbc::XRow::getArray, columnIndex);
@@ -2212,7 +2098,6 @@ void SAL_CALL CachedContentResultSetFactory::release()
 }
 
 css::uno::Any SAL_CALL CachedContentResultSetFactory::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XTypeProvider* >(this)),
@@ -2238,7 +2123,6 @@ XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetFactory,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 CachedContentResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new CachedContentResultSetFactory( ucbhelper::getComponentContext(rSMgr) ));
@@ -2266,7 +2150,6 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetFactory
     ::createCachedContentResultSet(
             const Reference< XResultSet > & xSource,
             const Reference< XContentIdentifierMapping > & xMapping )
-            throw( css::uno::RuntimeException, std::exception )
 {
     Reference< XResultSet > xRet;
     xRet = new CachedContentResultSet( m_xContext, xSource, xMapping );
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index bced10f312e1..ae3c02c525b3 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -62,9 +62,7 @@ class CachedContentResultSet
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
         css::uno::Any& SAL_CALL
-        getRowAny( sal_Int32 nRow )
-            throw( css::sdbc::SQLException,
-            css::uno::RuntimeException );
+        getRowAny( sal_Int32 nRow );
 
         void SAL_CALL clear();
 
@@ -97,24 +95,19 @@ class CachedContentResultSet
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
         const css::uno::Any& SAL_CALL
-        getAny( sal_Int32 nRow, sal_Int32 nColumnIndex )
-            throw( css::sdbc::SQLException,
-            css::uno::RuntimeException );
+        getAny( sal_Int32 nRow, sal_Int32 nColumnIndex );
 
         /// @throws css::uno::RuntimeException
         OUString SAL_CALL
-        getContentIdentifierString( sal_Int32 nRow )
-            throw( css::uno::RuntimeException );
+        getContentIdentifierString( sal_Int32 nRow );
 
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-        getContentIdentifier( sal_Int32 nRow )
-            throw( css::uno::RuntimeException );
+        getContentIdentifier( sal_Int32 nRow );
 
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::ucb::XContent > SAL_CALL
-        getContent( sal_Int32 nRow )
-            throw( css::uno::RuntimeException );
+        getContent( sal_Int32 nRow );
     };
 
     //members
@@ -167,15 +160,12 @@ private:
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
     bool SAL_CALL
-    applyPositionToOrigin( sal_Int32 nRow )
-        throw( css::sdbc::SQLException,
-        css::uno::RuntimeException );
+    applyPositionToOrigin( sal_Int32 nRow );
 
     /// @throws css::uno::RuntimeException
     void SAL_CALL
     impl_fetchData( sal_Int32 nRow, sal_Int32 nCount
-                    , sal_Int32 nFetchDirection )
-        throw( css::uno::RuntimeException );
+                    , sal_Int32 nFetchDirection );
 
     bool SAL_CALL
     impl_isKnownValidPosition( sal_Int32 nRow );
@@ -199,8 +189,7 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -208,250 +197,154 @@ public:
 
     // XTypeProvider
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XPropertySet inherited
 
 
     virtual void SAL_CALL
     setPropertyValue( const OUString& aPropertyName,
-                      const css::uno::Any& aValue )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                      const css::uno::Any& aValue ) override;
 
     virtual css::uno::Any SAL_CALL
-    getPropertyValue( const OUString& PropertyName )
-        throw( css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception ) override;
+    getPropertyValue( const OUString& PropertyName ) override;
 
 
     // own inherited
 
     virtual void SAL_CALL
-    impl_disposing( const css::lang::EventObject& Source )
-        throw( css::uno::RuntimeException ) override;
+    impl_disposing( const css::lang::EventObject& Source ) override;
 
     virtual void SAL_CALL
-    impl_propertyChange( const css::beans::PropertyChangeEvent& evt )
-        throw( css::uno::RuntimeException ) override;
+    impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
     virtual void SAL_CALL
-    impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent )
-        throw( css::beans::PropertyVetoException,
-               css::uno::RuntimeException ) override;
+    impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) override;
 
 
     // XContentAccess inherited
 
     virtual OUString SAL_CALL
-    queryContentIdentifierString()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentIdentifierString() override;
 
     virtual css::uno::Reference<
                 css::ucb::XContentIdentifier > SAL_CALL
-    queryContentIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentIdentifier() override;
 
     virtual css::uno::Reference<
                 css::ucb::XContent > SAL_CALL
-    queryContent()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContent() override;
 
 
     // XResultSet inherited
 
     virtual sal_Bool SAL_CALL
-    next()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    next() override;
     virtual sal_Bool SAL_CALL
-    isBeforeFirst()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isBeforeFirst() override;
     virtual sal_Bool SAL_CALL
-    isAfterLast()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isAfterLast() override;
     virtual sal_Bool SAL_CALL
-    isFirst()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isFirst() override;
     virtual sal_Bool SAL_CALL
-    isLast()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isLast() override;
     virtual void SAL_CALL
-    beforeFirst()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    beforeFirst() override;
     virtual void SAL_CALL
-    afterLast()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    afterLast() override;
     virtual sal_Bool SAL_CALL
-    first()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    first() override;
     virtual sal_Bool SAL_CALL
-    last()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    last() override;
     virtual sal_Int32 SAL_CALL
-    getRow()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getRow() override;
     virtual sal_Bool SAL_CALL
-    absolute( sal_Int32 row )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    absolute( sal_Int32 row ) override;
     virtual sal_Bool SAL_CALL
-    relative( sal_Int32 rows )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    relative( sal_Int32 rows ) override;
     virtual sal_Bool SAL_CALL
-    previous()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    previous() override;
     virtual void SAL_CALL
-    refreshRow()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    refreshRow() override;
     virtual sal_Bool SAL_CALL
-    rowUpdated()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    rowUpdated() override;
     virtual sal_Bool SAL_CALL
-    rowInserted()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    rowInserted() override;
     virtual sal_Bool SAL_CALL
-    rowDeleted()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    rowDeleted() override;
     virtual css::uno::Reference<
                 css::uno::XInterface > SAL_CALL
-    getStatement()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getStatement() override;
 
 
     // XRow inherited
 
     virtual sal_Bool SAL_CALL
-    wasNull()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    wasNull() override;
 
     virtual OUString SAL_CALL
-    getString( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getString( sal_Int32 columnIndex ) override;
 
     virtual sal_Bool SAL_CALL
-    getBoolean( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBoolean( sal_Int32 columnIndex ) override;
 
     virtual sal_Int8 SAL_CALL
-    getByte( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getByte( sal_Int32 columnIndex ) override;
 
     virtual sal_Int16 SAL_CALL
-    getShort( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getShort( sal_Int32 columnIndex ) override;
 
     virtual sal_Int32 SAL_CALL
-    getInt( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getInt( sal_Int32 columnIndex ) override;
 
     virtual sal_Int64 SAL_CALL
-    getLong( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getLong( sal_Int32 columnIndex ) override;
 
     virtual float SAL_CALL
-    getFloat( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getFloat( sal_Int32 columnIndex ) override;
 
     virtual double SAL_CALL
-    getDouble( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getDouble( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getBytes( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBytes( sal_Int32 columnIndex ) override;
 
     virtual css::util::Date SAL_CALL
-    getDate( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getDate( sal_Int32 columnIndex ) override;
 
     virtual css::util::Time SAL_CALL
-    getTime( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getTime( sal_Int32 columnIndex ) override;
 
     virtual css::util::DateTime SAL_CALL
-    getTimestamp( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getTimestamp( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-    getBinaryStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBinaryStream( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-    getCharacterStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getCharacterStream( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Any SAL_CALL
     getObject( sal_Int32 columnIndex,
-               const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+               const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
     virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
-    getRef( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getRef( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
-    getBlob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBlob( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
-    getClob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getClob( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
-    getArray( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getArray( sal_Int32 columnIndex ) override;
 
 
     // Type Converter support
@@ -486,26 +379,20 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -519,8 +406,7 @@ public:
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
     createCachedContentResultSet(
             const css::uno::Reference< css::sdbc::XResultSet > & xSource,
-            const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xMapping )
-        throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xMapping ) override;
 };
 
 #endif
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 19cdff4d5205..99f45f02c9dd 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -67,7 +67,6 @@ void SAL_CALL CachedContentResultSetStub::release()
 
 Any SAL_CALL CachedContentResultSetStub
     ::queryInterface( const Type&  rType )
-    throw ( RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
 
@@ -92,7 +91,6 @@ Any SAL_CALL CachedContentResultSetStub
 //virtual
 void SAL_CALL CachedContentResultSetStub
     ::impl_propertyChange( const PropertyChangeEvent& rEvt )
-    throw( RuntimeException )
 {
     impl_EnsureNotDisposed();
 
@@ -113,8 +111,6 @@ void SAL_CALL CachedContentResultSetStub
 //virtual
 void SAL_CALL CachedContentResultSetStub
     ::impl_vetoableChange( const PropertyChangeEvent& rEvt )
-    throw( PropertyVetoException,
-           RuntimeException )
 {
     impl_EnsureNotDisposed();
 
@@ -139,7 +135,6 @@ XTYPEPROVIDER_COMMON_IMPL( CachedContentResultSetStub )
 //list all interfaces exclusive baseclasses
 Sequence< Type > SAL_CALL CachedContentResultSetStub
     ::getTypes()
-    throw( RuntimeException, std::exception )
 {
     static Sequence< Type >* pTypes = nullptr;
     if( !pTypes )
@@ -170,19 +165,16 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
 // XServiceInfo methods.
 
 OUString SAL_CALL CachedContentResultSetStub::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.CachedContentResultSetStub" );
 }
 
 sal_Bool SAL_CALL CachedContentResultSetStub::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL CachedContentResultSetStub::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { CACHED_CRS_STUB_SERVICE_NAME };
 }
@@ -308,7 +300,6 @@ return aRet;
 FetchResult SAL_CALL CachedContentResultSetStub
     ::fetch( sal_Int32 nRowStartPosition
     , sal_Int32 nRowCount, sal_Bool bDirection )
-    throw( RuntimeException, std::exception )
 {
     impl_init_xRowOrigin();
     FETCH_XXX( impl_getCurrentRowContent, m_xRowOrigin );
@@ -347,7 +338,6 @@ sal_Int32 SAL_CALL CachedContentResultSetStub
 void SAL_CALL CachedContentResultSetStub
     ::impl_getCurrentRowContent( Any& rRowContent
         , const Reference< XRow >& xRow )
-        throw ( SQLException, RuntimeException )
 {
     sal_Int32 nCount = impl_getColumnCount();
 
@@ -362,7 +352,6 @@ void SAL_CALL CachedContentResultSetStub
 
 void SAL_CALL CachedContentResultSetStub
     ::impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection )
-        throw ( RuntimeException )
 {
     //this is done only for the case, that there is another CachedContentResultSet in the chain of underlying ResultSets
 
@@ -452,7 +441,6 @@ void SAL_CALL CachedContentResultSetStub
 void SAL_CALL CachedContentResultSetStub
     ::impl_getCurrentContentIdentifierString( Any& rAny
         , const Reference< XContentAccess >& xContentAccess )
-        throw ( RuntimeException )
 {
      rAny <<= xContentAccess->queryContentIdentifierString();
 }
@@ -460,7 +448,6 @@ void SAL_CALL CachedContentResultSetStub
 void SAL_CALL CachedContentResultSetStub
     ::impl_getCurrentContentIdentifier( Any& rAny
         , const Reference< XContentAccess >& xContentAccess )
-        throw ( RuntimeException )
 {
      rAny <<= xContentAccess->queryContentIdentifier();
 }
@@ -468,7 +455,6 @@ void SAL_CALL CachedContentResultSetStub
 void SAL_CALL CachedContentResultSetStub
     ::impl_getCurrentContent( Any& rAny
         , const Reference< XContentAccess >& xContentAccess )
-        throw ( RuntimeException )
 {
      rAny <<= xContentAccess->queryContent();
 }
@@ -477,7 +463,6 @@ void SAL_CALL CachedContentResultSetStub
 FetchResult SAL_CALL CachedContentResultSetStub
     ::fetchContentIdentifierStrings( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( css::uno::RuntimeException, std::exception )
 {
     impl_init_xContentAccessOrigin();
     FETCH_XXX( impl_getCurrentContentIdentifierString, m_xContentAccessOrigin );
@@ -487,7 +472,6 @@ FetchResult SAL_CALL CachedContentResultSetStub
 FetchResult SAL_CALL CachedContentResultSetStub
     ::fetchContentIdentifiers( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( css::uno::RuntimeException, std::exception )
 {
     impl_init_xContentAccessOrigin();
     FETCH_XXX( impl_getCurrentContentIdentifier, m_xContentAccessOrigin );
@@ -497,7 +481,6 @@ FetchResult SAL_CALL CachedContentResultSetStub
 FetchResult SAL_CALL CachedContentResultSetStub
     ::fetchContents( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( css::uno::RuntimeException, std::exception )
 {
     impl_init_xContentAccessOrigin();
     FETCH_XXX( impl_getCurrentContent, m_xContentAccessOrigin );
@@ -532,7 +515,6 @@ void SAL_CALL CachedContentResultSetStubFactory::release()
 }
 
 css::uno::Any SAL_CALL CachedContentResultSetStubFactory::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XTypeProvider* >(this)),
@@ -558,7 +540,6 @@ XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetStubFactory,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 CachedContentResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new CachedContentResultSetStubFactory( rSMgr ));
@@ -583,7 +564,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetStubFactory );
 Reference< XResultSet > SAL_CALL CachedContentResultSetStubFactory
     ::createCachedContentResultSetStub(
             const Reference< XResultSet > & xSource )
-            throw( RuntimeException, std::exception )
 {
     if( xSource.is() )
     {
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 85cbe1860c6f..81387c50867a 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -55,9 +55,7 @@ private:
     void SAL_CALL
     impl_getCurrentRowContent(
         css::uno::Any& rRowContent,
-        const css::uno::Reference< css::sdbc::XRow >& xRow )
-        throw ( css::sdbc::SQLException
-              , css::uno::RuntimeException );
+        const css::uno::Reference< css::sdbc::XRow >& xRow );
 
     sal_Int32 SAL_CALL
     impl_getColumnCount();
@@ -66,27 +64,23 @@ private:
     static void SAL_CALL
     impl_getCurrentContentIdentifierString(
             css::uno::Any& rAny
-            , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess )
-            throw ( css::uno::RuntimeException );
+            , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess );
 
     /// @throws css::uno::RuntimeException
     static void SAL_CALL
     impl_getCurrentContentIdentifier(
             css::uno::Any& rAny
-            , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess )
-            throw ( css::uno::RuntimeException );
+            , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess );
 
     /// @throws css::uno::RuntimeException
     static void SAL_CALL
     impl_getCurrentContent(
             css::uno::Any& rAny
-            , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess )
-            throw ( css::uno::RuntimeException );
+            , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess );
 
     /// @throws css::uno::RuntimeException
     void SAL_CALL
-    impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection )
-        throw ( css::uno::RuntimeException );
+    impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection );
 
 public:
     CachedContentResultSetStub( css::uno::Reference< css::sdbc::XResultSet > const & xOrigin );
@@ -95,8 +89,7 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -105,54 +98,42 @@ public:
     // own inherited
 
     virtual void SAL_CALL
-    impl_propertyChange( const css::beans::PropertyChangeEvent& evt )
-        throw( css::uno::RuntimeException ) override;
+    impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
     virtual void SAL_CALL
-    impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent )
-        throw( css::beans::PropertyVetoException,
-               css::uno::RuntimeException ) override;
+    impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) override;
 
     // XTypeProvider
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XFetchProvider
 
 
     virtual css::ucb::FetchResult SAL_CALL
     fetch( sal_Int32 nRowStartPosition
-        , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        , sal_Int32 nRowCount, sal_Bool bDirection ) override;
 
 
     // XFetchProviderForContentAccess
 
     virtual css::ucb::FetchResult SAL_CALL
          fetchContentIdentifierStrings( sal_Int32 nRowStartPosition
-        , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        , sal_Int32 nRowCount, sal_Bool bDirection ) override;
 
     virtual css::ucb::FetchResult SAL_CALL
          fetchContentIdentifiers( sal_Int32 nRowStartPosition
-        , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        , sal_Int32 nRowCount, sal_Bool bDirection ) override;
 
     virtual css::ucb::FetchResult SAL_CALL
          fetchContents( sal_Int32 nRowStartPosition
-        , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        , sal_Int32 nRowCount, sal_Bool bDirection ) override;
 };
 
 
@@ -174,27 +155,21 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -207,8 +182,7 @@ public:
 
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
     createCachedContentResultSetStub(
-                const css::uno::Reference< css::sdbc::XResultSet > & xSource )
-            throw( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::sdbc::XResultSet > & xSource ) override;
 };
 
 #endif
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 783d35f6f341..d72688f8d688 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -89,7 +89,6 @@ void SAL_CALL CachedDynamicResultSet::release()
 
 Any SAL_CALL CachedDynamicResultSet
     ::queryInterface( const Type&  rType )
-    throw ( RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
 
@@ -119,19 +118,16 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
 // XServiceInfo methods.
 
 OUString SAL_CALL CachedDynamicResultSet::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.CachedDynamicResultSet" );
 }
 
 sal_Bool SAL_CALL CachedDynamicResultSet::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSet::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { CACHED_DRS_SERVICE_NAME };
 }
@@ -142,7 +138,6 @@ css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSet::getSupportedServ
 //virtual
 void SAL_CALL CachedDynamicResultSet
     ::impl_disposing( const EventObject& Source )
-    throw( RuntimeException )
 {
     DynamicResultSetWrapper::impl_disposing( Source );
     m_xContentIdentifierMapping.clear();
@@ -177,7 +172,6 @@ void SAL_CALL CachedDynamicResultSetFactory::release()
 }
 
 css::uno::Any SAL_CALL CachedDynamicResultSetFactory::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XTypeProvider* >(this)),
@@ -203,7 +197,6 @@ XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetFactory,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 CachedDynamicResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new CachedDynamicResultSetFactory( ucbhelper::getComponentContext(rSMgr) ));
@@ -231,7 +224,6 @@ Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetFactory
     ::createCachedDynamicResultSet(
           const Reference< XDynamicResultSet > & SourceStub
         , const Reference< XContentIdentifierMapping > & ContentIdentifierMapping )
-        throw( RuntimeException, std::exception )
 {
     Reference< XDynamicResultSet > xRet;
     xRet = new CachedDynamicResultSet( SourceStub, ContentIdentifierMapping, m_xContext );
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index c16a272701ad..07b9f991d716 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -51,8 +51,7 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -60,24 +59,18 @@ public:
 
     // XTypeProvider
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // own methods ( inherited )
 
     virtual void SAL_CALL
-    impl_disposing( const css::lang::EventObject& Source )
-        throw( css::uno::RuntimeException ) override;
+    impl_disposing( const css::lang::EventObject& Source ) override;
 };
 
 
@@ -99,27 +92,21 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -134,8 +121,7 @@ public:
     createCachedDynamicResultSet(
                   const css::uno::Reference< css::ucb::XDynamicResultSet > &          SourceStub
                 , const css::uno::Reference< css::ucb::XContentIdentifierMapping > &  ContentIdentifierMapping
-                )
-            throw( css::uno::RuntimeException, std::exception ) override;
+                ) override;
 };
 
 #endif
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 293063673652..e25fa173bcf1 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -90,7 +90,6 @@ void SAL_CALL CachedDynamicResultSetStub::release()
 
 Any SAL_CALL CachedDynamicResultSetStub
     ::queryInterface( const Type&  rType )
-    throw ( RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
 
@@ -121,19 +120,16 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
 // XServiceInfo methods.
 
 OUString SAL_CALL CachedDynamicResultSetStub::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStub" );
 }
 
 sal_Bool SAL_CALL CachedDynamicResultSetStub::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSetStub::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { CACHED_DRS_STUB_SERVICE_NAME };
 }
@@ -168,7 +164,6 @@ void SAL_CALL CachedDynamicResultSetStubFactory::release()
 }
 
 css::uno::Any SAL_CALL CachedDynamicResultSetStubFactory::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XTypeProvider* >(this)),
@@ -194,7 +189,6 @@ XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetStubFactory,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 CachedDynamicResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new CachedDynamicResultSetStubFactory( ucbhelper::getComponentContext(rSMgr) ));
@@ -221,7 +215,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetStubFactory );
 Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetStubFactory
     ::createCachedDynamicResultSetStub(
             const Reference< XDynamicResultSet > & Source )
-            throw( RuntimeException, std::exception )
 {
     Reference< XDynamicResultSet > xRet;
     xRet = new CachedDynamicResultSetStub( Source, m_xContext );
@@ -236,9 +229,6 @@ void SAL_CALL CachedDynamicResultSetStubFactory
             , const Sequence< NumberedSortingInfo > & SortingInfo
             , const Reference< XAnyCompareFactory > & CompareFactory
             )
-            throw (  ListenerAlreadySetException
-            , AlreadyInitializedException
-            , RuntimeException, std::exception )
 {
     OSL_ENSURE( Source.is(), "a Source is needed" );
     OSL_ENSURE( TargetCache.is(), "a TargetCache is needed" );
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index afc6144830d0..54edc472ad7b 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -46,8 +46,7 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -55,18 +54,13 @@ public:
 
     // XTypeProvider
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 
@@ -87,26 +81,20 @@ public:
     virtual ~CachedDynamicResultSetStubFactory() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -119,8 +107,7 @@ public:
 
     virtual css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL
     createCachedDynamicResultSetStub(
-                const css::uno::Reference< css::ucb::XDynamicResultSet > & Source )
-                throw( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::ucb::XDynamicResultSet > & Source ) override;
 
 
     virtual void SAL_CALL connectToCache(
@@ -128,12 +115,7 @@ public:
                 , const css::uno::Reference< css::ucb::XDynamicResultSet > & TargetCache
                 , const css::uno::Sequence< css::ucb::NumberedSortingInfo > & SortingInfo
                 , const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory
-                )
-                throw (
-                  css::ucb::ListenerAlreadySetException
-                , css::ucb::AlreadyInitializedException
-                , css::uno::RuntimeException, std::exception
-                 ) override;
+                ) override;
 };
 
 #endif
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index f336f607dd04..06a7b1f8a129 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -168,7 +168,6 @@ void SAL_CALL ContentResultSetWrapper::impl_initPropertySetInfo()
 }
 
 void SAL_CALL ContentResultSetWrapper::impl_EnsureNotDisposed()
-    throw( DisposedException, RuntimeException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     if( m_bDisposed )
@@ -230,8 +229,6 @@ void SAL_CALL ContentResultSetWrapper::impl_notifyPropertyChangeListeners( const
 }
 
 void SAL_CALL ContentResultSetWrapper::impl_notifyVetoableChangeListeners( const PropertyChangeEvent& rEvt )
-    throw( PropertyVetoException,
-           RuntimeException )
 {
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -324,7 +321,6 @@ bool SAL_CALL ContentResultSetWrapper::impl_isForwardOnly()
 // XInterface methods.
 
 css::uno::Any SAL_CALL ContentResultSetWrapper::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
     css::uno::Any aRet = cppu::queryInterface( rType,
@@ -343,7 +339,6 @@ css::uno::Any SAL_CALL ContentResultSetWrapper::queryInterface( const css::uno::
 
 // virtual
 void SAL_CALL ContentResultSetWrapper::dispose()
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -437,7 +432,6 @@ void SAL_CALL ContentResultSetWrapper::dispose()
 
 // virtual
 void SAL_CALL ContentResultSetWrapper::addEventListener( const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -452,7 +446,6 @@ void SAL_CALL ContentResultSetWrapper::addEventListener( const Reference< XEvent
 
 // virtual
 void SAL_CALL ContentResultSetWrapper::removeEventListener( const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -466,8 +459,6 @@ void SAL_CALL ContentResultSetWrapper::removeEventListener( const Reference< XEv
 
 //virtual
 void SAL_CALL ContentResultSetWrapper::close()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     dispose();
@@ -478,8 +469,6 @@ void SAL_CALL ContentResultSetWrapper::close()
 
 //virtual
 Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper::getMetaData()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -508,7 +497,6 @@ Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper::getMetaData()
 
 // virtual
 Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper::getPropertySetInfo()
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     {
@@ -522,11 +510,6 @@ Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper::getPropertySetIn
 
 // virtual
 void SAL_CALL ContentResultSetWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
-    throw( UnknownPropertyException,
-           PropertyVetoException,
-           IllegalArgumentException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xPropertySetOrigin();
@@ -541,9 +524,6 @@ void SAL_CALL ContentResultSetWrapper::setPropertyValue( const OUString& rProper
 
 // virtual
 Any SAL_CALL ContentResultSetWrapper::getPropertyValue( const OUString& rPropertyName )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xPropertySetOrigin();
@@ -558,9 +538,6 @@ Any SAL_CALL ContentResultSetWrapper::getPropertyValue( const OUString& rPropert
 
 // virtual
 void SAL_CALL ContentResultSetWrapper::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -607,9 +584,6 @@ void SAL_CALL ContentResultSetWrapper::addPropertyChangeListener( const OUString
 
 // virtual
 void SAL_CALL ContentResultSetWrapper::addVetoableChangeListener( const OUString& rPropertyName, const Reference< XVetoableChangeListener >& xListener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -655,9 +629,6 @@ void SAL_CALL ContentResultSetWrapper::addVetoableChangeListener( const OUString
 
 // virtual
 void SAL_CALL ContentResultSetWrapper::removePropertyChangeListener( const OUString& rPropertyName, const Reference< XPropertyChangeListener >& xListener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -711,9 +682,6 @@ void SAL_CALL ContentResultSetWrapper::removePropertyChangeListener( const OUStr
 
 // virtual
 void SAL_CALL ContentResultSetWrapper::removeVetoableChangeListener( const OUString& rPropertyName, const Reference< XVetoableChangeListener >& xListener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -770,7 +738,6 @@ void SAL_CALL ContentResultSetWrapper::removeVetoableChangeListener( const OUStr
 
 //virtual
 void SAL_CALL ContentResultSetWrapper::impl_disposing( const EventObject& )
-    throw( RuntimeException )
 {
     impl_EnsureNotDisposed();
 
@@ -794,7 +761,6 @@ void SAL_CALL ContentResultSetWrapper::impl_disposing( const EventObject& )
 
 //virtual
 void SAL_CALL ContentResultSetWrapper::impl_propertyChange( const PropertyChangeEvent& rEvt )
-    throw( RuntimeException )
 {
     impl_EnsureNotDisposed();
 
@@ -806,8 +772,6 @@ void SAL_CALL ContentResultSetWrapper::impl_propertyChange( const PropertyChange
 
 //virtual
 void SAL_CALL ContentResultSetWrapper::impl_vetoableChange( const PropertyChangeEvent& rEvt )
-    throw( PropertyVetoException,
-           RuntimeException )
 {
     impl_EnsureNotDisposed();
 
@@ -824,7 +788,6 @@ void SAL_CALL ContentResultSetWrapper::impl_vetoableChange( const PropertyChange
 
 // virtual
 OUString SAL_CALL ContentResultSetWrapper::queryContentIdentifierString()
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xContentAccessOrigin();
@@ -839,7 +802,6 @@ OUString SAL_CALL ContentResultSetWrapper::queryContentIdentifierString()
 
 // virtual
 Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper::queryContentIdentifier()
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xContentAccessOrigin();
@@ -854,7 +816,6 @@ Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper::queryContentId
 
 // virtual
 Reference< XContent > SAL_CALL ContentResultSetWrapper::queryContent()
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xContentAccessOrigin();
@@ -872,8 +833,6 @@ Reference< XContent > SAL_CALL ContentResultSetWrapper::queryContent()
 //virtual
 
 sal_Bool SAL_CALL ContentResultSetWrapper::next()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -887,8 +846,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::next()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::previous()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -902,8 +859,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::previous()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::absolute( sal_Int32 row )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -917,8 +872,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::absolute( sal_Int32 row )
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::relative( sal_Int32 rows )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -933,8 +886,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::relative( sal_Int32 rows )
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::first()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -948,8 +899,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::first()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::last()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -963,8 +912,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::last()
 
 //virtual
 void SAL_CALL ContentResultSetWrapper::beforeFirst()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -978,8 +925,6 @@ void SAL_CALL ContentResultSetWrapper::beforeFirst()
 
 //virtual
 void SAL_CALL ContentResultSetWrapper::afterLast()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -993,8 +938,6 @@ void SAL_CALL ContentResultSetWrapper::afterLast()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::isAfterLast()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1008,8 +951,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::isAfterLast()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::isBeforeFirst()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1023,8 +964,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::isBeforeFirst()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::isFirst()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1038,8 +977,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::isFirst()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::isLast()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1054,8 +991,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::isLast()
 
 //virtual
 sal_Int32 SAL_CALL ContentResultSetWrapper::getRow()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1069,8 +1004,6 @@ sal_Int32 SAL_CALL ContentResultSetWrapper::getRow()
 
 //virtual
 void SAL_CALL ContentResultSetWrapper::refreshRow()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1084,8 +1017,6 @@ void SAL_CALL ContentResultSetWrapper::refreshRow()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::rowUpdated()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1099,8 +1030,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::rowUpdated()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::rowInserted()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1114,8 +1043,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::rowInserted()
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::rowDeleted()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1129,8 +1056,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::rowDeleted()
 
 //virtual
 Reference< XInterface > SAL_CALL ContentResultSetWrapper::getStatement()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     //@todo ?return anything
@@ -1153,8 +1078,6 @@ return m_xRowOrigin->getXXX( columnIndex );
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::wasNull()
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xRowOrigin();
@@ -1168,120 +1091,90 @@ sal_Bool SAL_CALL ContentResultSetWrapper::wasNull()
 
 //virtual
 OUString SAL_CALL ContentResultSetWrapper::getString( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getString );
 }
 
 //virtual
 sal_Bool SAL_CALL ContentResultSetWrapper::getBoolean( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getBoolean );
 }
 
 //virtual
 sal_Int8 SAL_CALL ContentResultSetWrapper::getByte( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getByte );
 }
 
 //virtual
 sal_Int16 SAL_CALL ContentResultSetWrapper::getShort( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getShort );
 }
 
 //virtual
 sal_Int32 SAL_CALL ContentResultSetWrapper::getInt( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getInt );
 }
 
 //virtual
 sal_Int64 SAL_CALL ContentResultSetWrapper::getLong( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getLong );
 }
 
 //virtual
 float SAL_CALL ContentResultSetWrapper::getFloat( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getFloat );
 }
 
 //virtual
 double SAL_CALL ContentResultSetWrapper::getDouble( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getDouble );
 }
 
 //virtual
 Sequence< sal_Int8 > SAL_CALL ContentResultSetWrapper::getBytes( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getBytes );
 }
 
 //virtual
 Date SAL_CALL ContentResultSetWrapper::getDate( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getDate );
 }
 
 //virtual
 Time SAL_CALL ContentResultSetWrapper::getTime( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getTime );
 }
 
 //virtual
 DateTime SAL_CALL ContentResultSetWrapper::getTimestamp( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getTimestamp );
 }
 
 //virtual
 Reference< css::io::XInputStream > SAL_CALL ContentResultSetWrapper::getBinaryStream( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getBinaryStream );
 }
 
 //virtual
 Reference< css::io::XInputStream > SAL_CALL ContentResultSetWrapper::getCharacterStream( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getCharacterStream );
 }
 
 //virtual
 Any SAL_CALL ContentResultSetWrapper::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     //if you change this macro please pay attention to
     //define XROW_GETXXX, where this is similar implemented
@@ -1298,32 +1191,24 @@ Any SAL_CALL ContentResultSetWrapper::getObject( sal_Int32 columnIndex, const Re
 
 //virtual
 Reference< XRef > SAL_CALL ContentResultSetWrapper::getRef( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getRef );
 }
 
 //virtual
 Reference< XBlob > SAL_CALL ContentResultSetWrapper::getBlob( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getBlob );
 }
 
 //virtual
 Reference< XClob > SAL_CALL ContentResultSetWrapper::getClob( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getClob );
 }
 
 //virtual
 Reference< XArray > SAL_CALL ContentResultSetWrapper::getArray( sal_Int32 columnIndex )
-    throw( SQLException,
-           RuntimeException, std::exception )
 {
     XROW_GETXXX( getArray );
 }
@@ -1357,7 +1242,6 @@ void SAL_CALL ContentResultSetWrapperListener::release()
 }
 
 css::uno::Any SAL_CALL ContentResultSetWrapperListener::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
     css::uno::Any aRet = cppu::queryInterface( rType,
@@ -1374,7 +1258,6 @@ css::uno::Any SAL_CALL ContentResultSetWrapperListener::queryInterface( const cs
 
 //virtual
 void SAL_CALL ContentResultSetWrapperListener::disposing( const EventObject& rEventObject )
-    throw( RuntimeException, std::exception )
 {
     if( m_pOwner )
         m_pOwner->impl_disposing( rEventObject );
@@ -1386,7 +1269,6 @@ void SAL_CALL ContentResultSetWrapperListener::disposing( const EventObject& rEv
 
 //virtual
 void SAL_CALL ContentResultSetWrapperListener::propertyChange( const PropertyChangeEvent& rEvt )
-    throw( RuntimeException, std::exception )
 {
     if( m_pOwner )
         m_pOwner->impl_propertyChange( rEvt );
@@ -1397,8 +1279,6 @@ void SAL_CALL ContentResultSetWrapperListener::propertyChange( const PropertyCha
 
 //virtual
 void SAL_CALL ContentResultSetWrapperListener::vetoableChange( const PropertyChangeEvent& rEvt )
-    throw( PropertyVetoException,
-           RuntimeException, std::exception )
 {
     if( m_pOwner )
         m_pOwner->impl_vetoableChange( rEvt );
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index 6ee731ee4bbf..7823f9f93041 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -126,9 +126,7 @@ protected:
     /// @throws css::lang::DisposedException
     /// @throws css::uno::RuntimeException
     void SAL_CALL
-    impl_EnsureNotDisposed()
-        throw( css::lang::DisposedException,
-               css::uno::RuntimeException );
+    impl_EnsureNotDisposed();
 
     void SAL_CALL
     impl_notifyPropertyChangeListeners(
@@ -138,9 +136,7 @@ protected:
     /// @throws css::uno::RuntimeException
     void SAL_CALL
     impl_notifyVetoableChangeListeners(
-            const css::beans::PropertyChangeEvent& rEvt )
-            throw( css::beans::PropertyVetoException,
-                   css::uno::RuntimeException );
+            const css::beans::PropertyChangeEvent& rEvt );
 
     bool SAL_CALL impl_isForwardOnly();
 
@@ -150,304 +146,193 @@ public:
     // XInterface
 
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
 
 
     // XComponent
 
     virtual void SAL_CALL
-    dispose() throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
 
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
 
     //XCloseable
 
     virtual void SAL_CALL
-    close()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    close() override;
 
 
     //XResultSetMetaDataSupplier
 
     virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
-    getMetaData()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getMetaData() override;
 
 
     // XPropertySet
 
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getPropertySetInfo() override;
 
     virtual void SAL_CALL
     setPropertyValue( const OUString& aPropertyName,
-                      const css::uno::Any& aValue )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                      const css::uno::Any& aValue ) override;
 
     virtual css::uno::Any SAL_CALL
-    getPropertyValue( const OUString& PropertyName )
-        throw( css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception ) override;
+    getPropertyValue( const OUString& PropertyName ) override;
 
     virtual void SAL_CALL
     addPropertyChangeListener( const OUString& aPropertyName,
-                               const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                               const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
 
     virtual void SAL_CALL
     removePropertyChangeListener( const OUString& aPropertyName,
-                                  const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                  const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
 
     virtual void SAL_CALL
     addVetoableChangeListener( const OUString& PropertyName,
-                               const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                               const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     virtual void SAL_CALL
     removeVetoableChangeListener( const OUString& PropertyName,
-                                  const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                  const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 
     // own methods
 
     /// @throws css::uno::RuntimeException
     virtual void SAL_CALL
-        impl_disposing( const css::lang::EventObject& Source )
-        throw( css::uno::RuntimeException );
+        impl_disposing( const css::lang::EventObject& Source );
 
     /// @throws css::uno::RuntimeException
     virtual void SAL_CALL
-    impl_propertyChange( const css::beans::PropertyChangeEvent& evt )
-        throw( css::uno::RuntimeException );
+    impl_propertyChange( const css::beans::PropertyChangeEvent& evt );
 
     /// @throws css::beans::PropertyVetoException
     /// @throws css::uno::RuntimeException
     virtual void SAL_CALL
-    impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent )
-        throw( css::beans::PropertyVetoException,
-               css::uno::RuntimeException );
+    impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent );
 
 
     // XContentAccess
 
     virtual OUString SAL_CALL
-    queryContentIdentifierString()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentIdentifierString() override;
 
     virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-    queryContentIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentIdentifier() override;
 
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContent() override;
 
 
     // XResultSet
 
     virtual sal_Bool SAL_CALL
-    next()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    next() override;
     virtual sal_Bool SAL_CALL
-    isBeforeFirst()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isBeforeFirst() override;
     virtual sal_Bool SAL_CALL
-    isAfterLast()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isAfterLast() override;
     virtual sal_Bool SAL_CALL
-    isFirst()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isFirst() override;
     virtual sal_Bool SAL_CALL
-    isLast()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    isLast() override;
     virtual void SAL_CALL
-    beforeFirst()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    beforeFirst() override;
     virtual void SAL_CALL
-    afterLast()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    afterLast() override;
     virtual sal_Bool SAL_CALL
-    first()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    first() override;
     virtual sal_Bool SAL_CALL
-    last()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    last() override;
     virtual sal_Int32 SAL_CALL
-    getRow()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getRow() override;
     virtual sal_Bool SAL_CALL
-    absolute( sal_Int32 row )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    absolute( sal_Int32 row ) override;
     virtual sal_Bool SAL_CALL
-    relative( sal_Int32 rows )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    relative( sal_Int32 rows ) override;
     virtual sal_Bool SAL_CALL
-    previous()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    previous() override;
     virtual void SAL_CALL
-    refreshRow()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    refreshRow() override;
     virtual sal_Bool SAL_CALL
-    rowUpdated()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    rowUpdated() override;
     virtual sal_Bool SAL_CALL
-    rowInserted()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    rowInserted() override;
     virtual sal_Bool SAL_CALL
-    rowDeleted()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    rowDeleted() override;
     virtual css::uno::Reference<
                 css::uno::XInterface > SAL_CALL
-    getStatement()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getStatement() override;
 
 
     // XRow
 
     virtual sal_Bool SAL_CALL
-    wasNull()
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    wasNull() override;
 
     virtual OUString SAL_CALL
-    getString( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getString( sal_Int32 columnIndex ) override;
 
     virtual sal_Bool SAL_CALL
-    getBoolean( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBoolean( sal_Int32 columnIndex ) override;
 
     virtual sal_Int8 SAL_CALL
-    getByte( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getByte( sal_Int32 columnIndex ) override;
 
     virtual sal_Int16 SAL_CALL
-    getShort( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getShort( sal_Int32 columnIndex ) override;
 
     virtual sal_Int32 SAL_CALL
-    getInt( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getInt( sal_Int32 columnIndex ) override;
 
     virtual sal_Int64 SAL_CALL
-    getLong( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getLong( sal_Int32 columnIndex ) override;
 
     virtual float SAL_CALL
-    getFloat( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getFloat( sal_Int32 columnIndex ) override;
 
     virtual double SAL_CALL
-    getDouble( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getDouble( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getBytes( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBytes( sal_Int32 columnIndex ) override;
 
     virtual css::util::Date SAL_CALL
-    getDate( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getDate( sal_Int32 columnIndex ) override;
 
     virtual css::util::Time SAL_CALL
-    getTime( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getTime( sal_Int32 columnIndex ) override;
 
     virtual css::util::DateTime SAL_CALL
-    getTimestamp( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getTimestamp( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-    getBinaryStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBinaryStream( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-    getCharacterStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getCharacterStream( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Any SAL_CALL
     getObject( sal_Int32 columnIndex,
-               const css::uno::Reference< css::container::XNameAccess >& typeMap )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+               const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
     virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
-    getRef( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getRef( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
-    getBlob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getBlob( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
-    getClob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getClob( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
-    getArray( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException,
-               css::uno::RuntimeException, std::exception ) override;
+    getArray( sal_Int32 columnIndex ) override;
 };
 
 
@@ -466,8 +351,7 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -476,23 +360,19 @@ public:
     //XEventListener
 
     virtual void SAL_CALL
-        disposing( const css::lang::EventObject& Source )
-        throw( css::uno::RuntimeException, std::exception ) override;
+        disposing( const css::lang::EventObject& Source ) override;
 
 
     //XPropertyChangeListener
 
     virtual void SAL_CALL
-    propertyChange( const css::beans::PropertyChangeEvent& evt )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    propertyChange( const css::beans::PropertyChangeEvent& evt ) override;
 
 
     //XVetoableChangeListener
 
     virtual void SAL_CALL
-    vetoableChange( const css::beans::PropertyChangeEvent& aEvent )
-        throw( css::beans::PropertyVetoException,
-               css::uno::RuntimeException, std::exception ) override;
+    vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) override;
 
 
     // own methods:
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 78aa7f39cd65..36bd508e1ea0 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -87,7 +87,6 @@ void SAL_CALL DynamicResultSetWrapper::impl_deinit()
 }
 
 void SAL_CALL DynamicResultSetWrapper::impl_EnsureNotDisposed()
-    throw( DisposedException, RuntimeException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     if( m_bDisposed )
@@ -114,7 +113,6 @@ void SAL_CALL DynamicResultSetWrapper::impl_InitResultSetTwo( const Reference< X
 
 // XInterface methods.
 css::uno::Any SAL_CALL DynamicResultSetWrapper::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
     css::uno::Any aRet = cppu::queryInterface( rType,
@@ -129,7 +127,6 @@ css::uno::Any SAL_CALL DynamicResultSetWrapper::queryInterface( const css::uno::
 
 // virtual
 void SAL_CALL DynamicResultSetWrapper::dispose()
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -165,7 +162,6 @@ void SAL_CALL DynamicResultSetWrapper::dispose()
 
 // virtual
 void SAL_CALL DynamicResultSetWrapper::addEventListener( const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -180,7 +176,6 @@ void SAL_CALL DynamicResultSetWrapper::addEventListener( const Reference< XEvent
 
 // virtual
 void SAL_CALL DynamicResultSetWrapper::removeEventListener( const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -195,7 +190,6 @@ void SAL_CALL DynamicResultSetWrapper::removeEventListener( const Reference< XEv
 
 //virtual
 void SAL_CALL DynamicResultSetWrapper::impl_disposing( const EventObject& )
-    throw( RuntimeException )
 {
     impl_EnsureNotDisposed();
 
@@ -214,7 +208,6 @@ void SAL_CALL DynamicResultSetWrapper::impl_disposing( const EventObject& )
 
 //virtual
 void SAL_CALL DynamicResultSetWrapper::impl_notify( const ListEvent& Changes )
-    throw( RuntimeException )
 {
     impl_EnsureNotDisposed();
     //@todo
@@ -281,7 +274,6 @@ void SAL_CALL DynamicResultSetWrapper::impl_notify( const ListEvent& Changes )
 
 //virtual
 void SAL_CALL DynamicResultSetWrapper::setSource( const Reference< XInterface > & Source )
-    throw( AlreadyInitializedException, RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     {
@@ -322,7 +314,6 @@ void SAL_CALL DynamicResultSetWrapper::setSource( const Reference< XInterface >
 
 //virtual
 Reference< XResultSet > SAL_CALL DynamicResultSetWrapper::getStaticResultSet()
-    throw( ListenerAlreadySetException, RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -353,7 +344,6 @@ Reference< XResultSet > SAL_CALL DynamicResultSetWrapper::getStaticResultSet()
 
 //virtual
 void SAL_CALL DynamicResultSetWrapper::setListener( const Reference< XDynamicResultSetListener > & Listener )
-    throw( ListenerAlreadySetException, RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -380,7 +370,6 @@ void SAL_CALL DynamicResultSetWrapper::setListener( const Reference< XDynamicRes
 
 //virtual
 void SAL_CALL DynamicResultSetWrapper::connectToCache( const Reference< XDynamicResultSet > & xCache )
-    throw( ListenerAlreadySetException, AlreadyInitializedException, ServiceNotFoundException, RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -417,7 +406,6 @@ void SAL_CALL DynamicResultSetWrapper::connectToCache( const Reference< XDynamic
 
 //virtual
 sal_Int16 SAL_CALL DynamicResultSetWrapper::getCapabilities()
-    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -462,7 +450,6 @@ void SAL_CALL DynamicResultSetWrapperListener::release()
 }
 
 css::uno::Any SAL_CALL DynamicResultSetWrapperListener::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XDynamicResultSetListener* >(this)),
@@ -475,7 +462,6 @@ css::uno::Any SAL_CALL DynamicResultSetWrapperListener::queryInterface( const cs
 
 //virtual
 void SAL_CALL DynamicResultSetWrapperListener::disposing( const EventObject& rEventObject )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -485,7 +471,6 @@ void SAL_CALL DynamicResultSetWrapperListener::disposing( const EventObject& rEv
 
 //virtual
 void SAL_CALL DynamicResultSetWrapperListener::notify( const ListEvent& Changes )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index 733cc5f29d3b..b588b9db0aa6 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -86,9 +86,7 @@ protected:
     /// @throws css::lang::DisposedException
     /// @throws css::uno::RuntimeException
     void SAL_CALL
-    impl_EnsureNotDisposed()
-        throw( css::lang::DisposedException,
-               css::uno::RuntimeException );
+    impl_EnsureNotDisposed();
 
     virtual void SAL_CALL
     impl_InitResultSetOne( const css::uno::Reference<
@@ -108,63 +106,48 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
 
 
     // XDynamicResultSet
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
-    getStaticResultSet()
-        throw( css::ucb::ListenerAlreadySetException
-        , css::uno::RuntimeException, std::exception ) override;
+    getStaticResultSet() override;
 
     virtual void SAL_CALL
-    setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener > & Listener )
-        throw( css::ucb::ListenerAlreadySetException
-            , css::uno::RuntimeException, std::exception ) override;
+    setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener > & Listener ) override;
 
     virtual void SAL_CALL
-    connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache )
-        throw( css::ucb::ListenerAlreadySetException
-            , css::ucb::AlreadyInitializedException
-            , css::ucb::ServiceNotFoundException
-            , css::uno::RuntimeException, std::exception ) override;
+    connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) override;
 
     virtual sal_Int16 SAL_CALL
-    getCapabilities() throw( css::uno::RuntimeException, std::exception ) override;
+    getCapabilities() override;
 
 
     // XComponent ( base of XDynamicResultSet )
     virtual void SAL_CALL
-    dispose() throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
 
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
 
     // XSourceInitialization
 
     virtual void SAL_CALL
-    setSource(  const css::uno::Reference< css::uno::XInterface > & Source )
-         throw( css::ucb::AlreadyInitializedException
-                , css::uno::RuntimeException, std::exception ) override;
+    setSource(  const css::uno::Reference< css::uno::XInterface > & Source ) override;
 
 
     // own methods:
     /// @throws css::uno::RuntimeException
     virtual void SAL_CALL
-    impl_disposing( const css::lang::EventObject& Source )
-        throw( css::uno::RuntimeException );
+    impl_disposing( const css::lang::EventObject& Source );
 
     /// @throws css::uno::RuntimeException
     void SAL_CALL
-    impl_notify( const css::ucb::ListEvent& Changes )
-        throw( css::uno::RuntimeException );
+    impl_notify( const css::ucb::ListEvent& Changes );
 };
 
 
@@ -183,8 +166,7 @@ public:
 
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -193,13 +175,11 @@ public:
     // XEventListener ( base of XDynamicResultSetListener )
 
     virtual void SAL_CALL
-    disposing( const css::lang::EventObject& Source )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    disposing( const css::lang::EventObject& Source ) override;
 
     // XDynamicResultSetListener
     virtual void SAL_CALL
-    notify( const css::ucb::ListEvent& Changes )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    notify( const css::ucb::ListEvent& Changes ) override;
 
 
     // own methods:
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 7762bf3c2bb2..450bafcb5e65 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -88,48 +88,43 @@ class OFileAccess : public FileAccessHelper
     /// @throws CommandAbortedException
     /// @throws Exception
     /// @throws RuntimeException
-    void transferImpl( const OUString& rSource, const OUString& rDest, bool bMoveData )
-        throw(CommandAbortedException, Exception, RuntimeException);
+    void transferImpl( const OUString& rSource, const OUString& rDest, bool bMoveData );
     /// @throws Exception
     bool createNewFile( const OUString & rParentURL,
                         const OUString & rTitle,
-                        const Reference< XInputStream >& data )
-        throw ( Exception );
+                        const Reference< XInputStream >& data );
 
 public:
     explicit OFileAccess( const Reference< XComponentContext > & xContext )
         : m_xContext( xContext) {}
     // Methods
-    virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL kill( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL writeFile( const OUString& FileURL, const css::uno::Reference< css::io::XInputStream >& data ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) override;
+    virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) override;
+    virtual void SAL_CALL kill( const OUString& FileURL ) override;
+    virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) override;
+    virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) override;
+    virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) override;
+    virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) override;
+    virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) override;
+    virtual OUString SAL_CALL getContentType( const OUString& FileURL ) override;
+    virtual css::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) override;
+    virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) override;
+    virtual css::uno::Reference< css::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) override;
+    virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
+    virtual void SAL_CALL writeFile( const OUString& FileURL, const css::uno::Reference< css::io::XInputStream >& data ) override;
+    virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) override;
+    virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) override;
+
+    OUString SAL_CALL getImplementationName() override
     { return OUString(IMPLEMENTATION_NAME); }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     { return FileAccess_getSupportedServiceNames(); }
 };
 
@@ -142,10 +137,8 @@ class OActiveDataSink : public cppu::WeakImplHelper< XActiveDataSink >
 public:
 
     // Methods
-    virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream )
-        throw(RuntimeException, std::exception) override;
-    virtual Reference< XInputStream > SAL_CALL getInputStream(  )
-        throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) override;
+    virtual Reference< XInputStream > SAL_CALL getInputStream(  ) override;
 };
 
 // Implementation XActiveDataStreamer
@@ -157,10 +150,8 @@ class OActiveDataStreamer : public cppu::WeakImplHelper< XActiveDataStreamer >
 public:
 
     // Methods
-    virtual void SAL_CALL setStream( const Reference< XStream >& aStream )
-        throw(RuntimeException, std::exception) override;
-    virtual Reference< XStream > SAL_CALL getStream()
-        throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setStream( const Reference< XStream >& aStream ) override;
+    virtual Reference< XStream > SAL_CALL getStream() override;
 };
 
 // Implementation XCommandEnvironment
@@ -176,44 +167,36 @@ public:
     }
 
     // Methods
-    virtual Reference< XInteractionHandler > SAL_CALL getInteractionHandler()
-        throw(RuntimeException, std::exception) override;
-    virtual Reference< XProgressHandler > SAL_CALL getProgressHandler()
-        throw(RuntimeException, std::exception) override;
+    virtual Reference< XInteractionHandler > SAL_CALL getInteractionHandler() override;
+    virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override;
 };
 
 void OActiveDataSink::setInputStream( const Reference< XInputStream >& aStream )
-    throw(RuntimeException, std::exception)
 {
     mxStream = aStream;
 }
 
 Reference< XInputStream > OActiveDataSink::getInputStream()
-    throw(RuntimeException, std::exception)
 {
     return mxStream;
 }
 
 void OActiveDataStreamer::setStream( const Reference< XStream >& aStream )
-    throw(RuntimeException, std::exception)
 {
     mxStream = aStream;
 }
 
 Reference< XStream > OActiveDataStreamer::getStream()
-    throw(RuntimeException, std::exception)
 {
     return mxStream;
 }
 
 Reference< XInteractionHandler > OCommandEnvironment::getInteractionHandler()
-    throw(RuntimeException, std::exception)
 {
     return mxInteraction;
 }
 
 Reference< XProgressHandler > OCommandEnvironment::getProgressHandler()
-    throw(RuntimeException, std::exception)
 {
     Reference< XProgressHandler > xRet;
     return xRet;
@@ -222,7 +205,6 @@ Reference< XProgressHandler > OCommandEnvironment::getProgressHandler()
 void OFileAccess::transferImpl( const OUString& rSource,
                                 const OUString& rDest,
                                 bool bMoveData )
-    throw(CommandAbortedException, Exception, RuntimeException)
 {
     // SfxContentHelper::Transfer_Impl
     INetURLObject aSourceObj( rSource, INetProtocol::File );
@@ -293,19 +275,16 @@ void OFileAccess::transferImpl( const OUString& rSource,
 }
 
 void OFileAccess::copy( const OUString& SourceURL, const OUString& DestURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     transferImpl( SourceURL, DestURL, false );
 }
 
 void OFileAccess::move( const OUString& SourceURL, const OUString& DestURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     transferImpl( SourceURL, DestURL, true );
 }
 
 void OFileAccess::kill( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     // SfxContentHelper::Kill
     INetURLObject aDeleteObj( FileURL, INetProtocol::File );
@@ -321,7 +300,6 @@ void OFileAccess::kill( const OUString& FileURL )
 }
 
 sal_Bool OFileAccess::isFolder( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     bool bRet = false;
     try
@@ -335,7 +313,6 @@ sal_Bool OFileAccess::isFolder( const OUString& FileURL )
 }
 
 sal_Bool OFileAccess::isReadOnly( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
@@ -346,7 +323,6 @@ sal_Bool OFileAccess::isReadOnly( const OUString& FileURL )
 }
 
 void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
@@ -354,7 +330,6 @@ void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly )
 }
 
 void OFileAccess::createFolder( const OUString& NewFolderURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     // Does the folder already exist?
     if( NewFolderURL.isEmpty() || isFolder( NewFolderURL ) )
@@ -420,7 +395,6 @@ void OFileAccess::createFolder( const OUString& NewFolderURL )
 }
 
 sal_Int32 OFileAccess::getSize( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     // SfxContentHelper::GetSize
     sal_Int32 nSize = 0;
@@ -433,7 +407,6 @@ sal_Int32 OFileAccess::getSize( const OUString& FileURL )
 }
 
 OUString OFileAccess::getContentType( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
@@ -444,7 +417,6 @@ OUString OFileAccess::getContentType( const OUString& FileURL )
 }
 
 css::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aFileObj( FileURL, INetProtocol::File );
     css::util::DateTime aDateTime;
@@ -458,7 +430,6 @@ css::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL )
 typedef vector< OUString* > StringList_Impl;
 
 Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     // SfxContentHelper::GetFolderContents
 
@@ -514,7 +485,6 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL,
 }
 
 sal_Bool OFileAccess::exists( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     bool bRet = false;
     try
@@ -533,7 +503,6 @@ sal_Bool OFileAccess::exists( const OUString& FileURL )
 }
 
 Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     Reference< XInputStream > xRet;
     INetURLObject aObj( FileURL, INetProtocol::File );
@@ -556,7 +525,6 @@ Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL )
 }
 
 Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     Reference< XOutputStream > xRet;
     Reference< XStream > xStream = OFileAccess::openFileReadWrite( FileURL );
@@ -566,7 +534,6 @@ Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL )
 }
 
 Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     Reference< XActiveDataStreamer > xSink = static_cast<XActiveDataStreamer*>(new OActiveDataStreamer());
     Reference< XInterface > xSinkIface( xSink, UNO_QUERY );
@@ -628,7 +595,6 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
 }
 
 void OFileAccess::setInteractionHandler( const Reference< XInteractionHandler >& Handler )
-    throw(RuntimeException, std::exception)
 {
     if( !mxEnvironment.is() )
     {
@@ -640,7 +606,6 @@ void OFileAccess::setInteractionHandler( const Reference< XInteractionHandler >&
 bool OFileAccess::createNewFile( const OUString & rParentURL,
                                  const OUString & rTitle,
                                  const Reference< XInputStream >& data )
-    throw ( Exception )
 {
     ucbhelper::Content aParentCnt( rParentURL, mxEnvironment.get(), comphelper::getProcessComponentContext() );
 
@@ -694,7 +659,6 @@ bool OFileAccess::createNewFile( const OUString & rParentURL,
 
 void SAL_CALL OFileAccess::writeFile( const OUString& FileURL,
                                       const Reference< XInputStream >& data )
-    throw ( Exception, RuntimeException, std::exception )
 {
     INetURLObject aURL( FileURL, INetProtocol::File );
     try
@@ -744,7 +708,6 @@ void SAL_CALL OFileAccess::writeFile( const OUString& FileURL,
 }
 
 sal_Bool OFileAccess::isHidden( const OUString& FileURL )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
@@ -755,7 +718,6 @@ sal_Bool OFileAccess::isHidden( const OUString& FileURL )
 }
 
 void OFileAccess::setHidden( const OUString& FileURL, sal_Bool bHidden )
-    throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
     ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() );
diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx
index 012aa6e197d2..a8c1b862fd6d 100644
--- a/ucb/source/core/cmdenv.cxx
+++ b/ucb/source/core/cmdenv.cxx
@@ -55,8 +55,6 @@ UcbCommandEnvironment::~UcbCommandEnvironment()
 // virtual
 void SAL_CALL UcbCommandEnvironment::initialize(
         const uno::Sequence< uno::Any >& aArguments )
-    throw( uno::Exception,
-           uno::RuntimeException, std::exception )
 {
     if ( ( aArguments.getLength() < 2 ) ||
          !( aArguments[ 0 ] >>= m_xIH ) ||
@@ -70,7 +68,6 @@ void SAL_CALL UcbCommandEnvironment::initialize(
 
 // virtual
 OUString SAL_CALL UcbCommandEnvironment::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
@@ -79,7 +76,6 @@ OUString SAL_CALL UcbCommandEnvironment::getImplementationName()
 // virtual
 sal_Bool SAL_CALL
 UcbCommandEnvironment::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -88,7 +84,6 @@ UcbCommandEnvironment::supportsService( const OUString& ServiceName )
 // virtual
 uno::Sequence< OUString > SAL_CALL
 UcbCommandEnvironment::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return getSupportedServiceNames_Static();
 }
@@ -116,7 +111,6 @@ UcbCommandEnvironment::getSupportedServiceNames_Static()
 // virtual
 uno::Reference< task::XInteractionHandler > SAL_CALL
 UcbCommandEnvironment::getInteractionHandler()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xIH;
 }
@@ -125,7 +119,6 @@ UcbCommandEnvironment::getInteractionHandler()
 // virtual
 uno::Reference< ucb::XProgressHandler > SAL_CALL
 UcbCommandEnvironment::getProgressHandler()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xPH;
 }
@@ -137,7 +130,6 @@ UcbCommandEnvironment::getProgressHandler()
 static uno::Reference< uno::XInterface > SAL_CALL
 UcbCommandEnvironment_CreateInstance(
     const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
-    throw( uno::Exception )
 {
     lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >(
         new UcbCommandEnvironment( rSMgr ) );
diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx
index a731fa2a7348..68dd3e4708a8 100644
--- a/ucb/source/core/cmdenv.hxx
+++ b/ucb/source/core/cmdenv.hxx
@@ -43,29 +43,22 @@ public:
 
     // XInitialization
     virtual void SAL_CALL
-    initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw( css::uno::Exception,
-               css::uno::RuntimeException, std::exception ) override;
+    initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // 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( const OUString& ServiceName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    supportsService( const OUString& ServiceName ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     // XCommandEnvironment
     virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL
-    getInteractionHandler()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getInteractionHandler() override;
     virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL
-    getProgressHandler()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getProgressHandler() override;
 
     // Non-UNO interfaces
     static OUString  getImplementationName_Static();
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx
index f03cbb252adc..912163080154 100644
--- a/ucb/source/core/identify.cxx
+++ b/ucb/source/core/identify.cxx
@@ -47,7 +47,6 @@ ContentIdentifier::~ContentIdentifier()
 // XContentIdentifier methods.
 // virtual
 OUString SAL_CALL ContentIdentifier::getContentIdentifier()
-    throw( RuntimeException, std::exception )
 {
     return m_aContentId;
 }
@@ -55,7 +54,6 @@ OUString SAL_CALL ContentIdentifier::getContentIdentifier()
 
 // virtual
 OUString SAL_CALL ContentIdentifier::getContentProviderScheme()
-    throw( RuntimeException, std::exception )
 {
     if ( m_aProviderScheme.isEmpty() && !m_aContentId.isEmpty() )
     {
diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index cb7313e27332..3dbf3ed380c1 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -33,10 +33,8 @@ public:
     virtual ~ContentIdentifier() override;
 
     // XContentIdentifier
-    virtual OUString SAL_CALL getContentIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getContentProviderScheme()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getContentIdentifier() override;
+    virtual OUString SAL_CALL getContentProviderScheme() override;
 
 private:
     OUString m_aContentId;
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 00770507dc7a..92819a585e00 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -50,7 +50,6 @@ XSERVICEINFO_COMMOM_IMPL( UcbContentProviderProxyFactory,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 UcbContentProviderProxyFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new UcbContentProviderProxyFactory( rSMgr ));
@@ -75,7 +74,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbContentProviderProxyFactory );
 Reference< XContentProvider > SAL_CALL
 UcbContentProviderProxyFactory::createContentProvider(
                                                 const OUString& Service )
-    throw( RuntimeException, std::exception )
 {
     return Reference< XContentProvider >(
                         new UcbContentProviderProxy( m_xSMgr, Service ) );
@@ -118,7 +116,6 @@ void SAL_CALL UcbContentProviderProxy::release()
 // virtual
 Any SAL_CALL
 UcbContentProviderProxy::queryInterface( const Type & rType )
-    throw ( RuntimeException, std::exception )
 {
     Any aRet = cppu::queryInterface( rType,
                 static_cast< XTypeProvider * >( this ),
@@ -150,7 +147,6 @@ XTYPEPROVIDER_COMMON_IMPL( UcbContentProviderProxy );
 
 
 Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
-    throw( RuntimeException, std::exception )
 {
     // Get original provider an forward the call...
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -175,19 +171,16 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
 // XServiceInfo methods.
 
 OUString SAL_CALL UcbContentProviderProxy::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" );
 }
 
 sal_Bool SAL_CALL UcbContentProviderProxy::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL UcbContentProviderProxy::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.ucb.ContentProviderProxy" };
 }
@@ -199,8 +192,6 @@ css::uno::Sequence< OUString > SAL_CALL UcbContentProviderProxy::getSupportedSer
 // virtual
 Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent(
                         const Reference< XContentIdentifier >& Identifier )
-    throw( IllegalIdentifierException,
-           RuntimeException, std::exception )
 {
     // Get original provider an forward the call...
 
@@ -218,7 +209,6 @@ Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent(
 sal_Int32 SAL_CALL UcbContentProviderProxy::compareContentIds(
                        const Reference< XContentIdentifier >& Id1,
                        const Reference< XContentIdentifier >& Id2 )
-    throw( RuntimeException, std::exception )
 {
     // Get original provider an forward the call...
 
@@ -242,8 +232,6 @@ Reference< XContentProvider > SAL_CALL
 UcbContentProviderProxy::registerInstance( const OUString& Template,
                                              const OUString& Arguments,
                                              sal_Bool ReplaceExisting )
-    throw( IllegalArgumentException,
-           RuntimeException, std::exception )
 {
     // Just remember that this method was called ( and the params ).
 
@@ -266,8 +254,6 @@ UcbContentProviderProxy::registerInstance( const OUString& Template,
 Reference< XContentProvider > SAL_CALL
 UcbContentProviderProxy::deregisterInstance( const OUString& Template,
                                              const OUString& Arguments )
-    throw( IllegalArgumentException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -303,7 +289,6 @@ UcbContentProviderProxy::deregisterInstance( const OUString& Template,
 // virtual
 Reference< XContentProvider > SAL_CALL
 UcbContentProviderProxy::getContentProvider()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     if ( !m_xProvider.is() )
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 2e1a4fc6590b..d6abd529d8dd 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -49,12 +49,9 @@ public:
     virtual ~UcbContentProviderProxyFactory() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -65,8 +62,7 @@ public:
 
     // XContentProviderFactory
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
-    createContentProvider( const OUString& Service )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createContentProvider( const OUString& Service ) override;
 };
 
 
@@ -102,56 +98,42 @@ public:
     virtual ~UcbContentProviderProxy() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XContentProviderSupplier
     virtual css::uno::Reference<
         css::ucb::XContentProvider > SAL_CALL
-    getContentProvider()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContentProvider() override;
 
     // XContentProvider
     virtual css::uno::Reference<
         css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
     virtual sal_Int32 SAL_CALL
     compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1,
-                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override;
 
     // XParameterizedContentProvider
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
     registerInstance( const OUString& Template,
                       const OUString& Arguments,
-                      sal_Bool ReplaceExisting )
-        throw( css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception ) override;
+                      sal_Bool ReplaceExisting ) override;
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
     deregisterInstance( const OUString& Template,
-                        const OUString& Arguments )
-        throw( css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception ) override;
+                        const OUString& Arguments ) override;
 };
 
 #endif // INCLUDED_UCB_SOURCE_CORE_PROVPROX_HXX
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index c452136ee086..025d5537bb84 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -255,7 +255,6 @@ void SAL_CALL UniversalContentBroker::release()
 }
 
 css::uno::Any SAL_CALL UniversalContentBroker::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XUniversalContentBroker* >(this)),
@@ -291,7 +290,6 @@ XTYPEPROVIDER_IMPL_9( UniversalContentBroker,
 
 // virtual
 void SAL_CALL UniversalContentBroker::dispose()
-    throw( css::uno::RuntimeException, std::exception )
 {
     if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() )
     {
@@ -308,7 +306,6 @@ void SAL_CALL UniversalContentBroker::dispose()
 // virtual
 void SAL_CALL UniversalContentBroker::addEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     if ( !m_pDisposeEventListeners )
         m_pDisposeEventListeners.reset( new OInterfaceContainerHelper2( m_aMutex ) );
@@ -320,7 +317,6 @@ void SAL_CALL UniversalContentBroker::addEventListener(
 // virtual
 void SAL_CALL UniversalContentBroker::removeEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( css::uno::RuntimeException, std::exception )
 {
     if ( m_pDisposeEventListeners )
         m_pDisposeEventListeners->removeInterface( Listener );
@@ -336,7 +332,6 @@ XSERVICEINFO_COMMOM_IMPL( UniversalContentBroker,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 UniversalContentBroker_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new UniversalContentBroker( ucbhelper::getComponentContext(rSMgr) ));
@@ -361,8 +356,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UniversalContentBroker );
 
 // virtual
 void SAL_CALL UniversalContentBroker::initialize( const css::uno::Sequence< Any >& aArguments )
-    throw( css::uno::Exception,
-           css::uno::RuntimeException, std::exception )
 {
     {
         osl::MutexGuard aGuard(m_aMutex);
@@ -404,7 +397,6 @@ UniversalContentBroker::registerContentProvider(
                             const Reference< XContentProvider >& Provider,
                             const OUString& Scheme,
                             sal_Bool ReplaceExisting )
-    throw( DuplicateProviderException, css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -450,7 +442,6 @@ UniversalContentBroker::registerContentProvider(
 void SAL_CALL UniversalContentBroker::deregisterContentProvider(
                               const Reference< XContentProvider >& Provider,
                             const OUString& Scheme )
-    throw( css::uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -488,7 +479,6 @@ void SAL_CALL UniversalContentBroker::deregisterContentProvider(
 // virtual
 css::uno::Sequence< ContentProviderInfo > SAL_CALL
                             UniversalContentBroker::queryContentProviders()
-    throw( css::uno::RuntimeException, std::exception )
 {
     // Return a list with information about active(!) content providers.
 
@@ -515,7 +505,6 @@ css::uno::Sequence< ContentProviderInfo > SAL_CALL
 Reference< XContentProvider > SAL_CALL
         UniversalContentBroker::queryContentProvider( const OUString&
                                                           Identifier )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return queryContentProvider( Identifier, false );
 }
@@ -527,7 +516,6 @@ Reference< XContentProvider > SAL_CALL
 // virtual
 Reference< XContent > SAL_CALL UniversalContentBroker::queryContent(
                         const Reference< XContentIdentifier >& Identifier )
-    throw( IllegalIdentifierException, css::uno::RuntimeException, std::exception )
 {
 
     // Let the content provider for the scheme given with the content
@@ -550,7 +538,6 @@ Reference< XContent > SAL_CALL UniversalContentBroker::queryContent(
 sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds(
                                 const Reference< XContentIdentifier >& Id1,
                                 const Reference< XContentIdentifier >& Id2 )
-    throw( css::uno::RuntimeException, std::exception )
 {
     OUString aURI1( Id1->getContentIdentifier() );
     OUString aURI2( Id2->getContentIdentifier() );
@@ -577,7 +564,6 @@ sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds(
 Reference< XContentIdentifier > SAL_CALL
         UniversalContentBroker::createContentIdentifier(
                                             const OUString& ContentId )
-    throw( css::uno::RuntimeException, std::exception )
 {
 
     // Let the content provider for the scheme given with content
@@ -609,7 +595,6 @@ Reference< XContentIdentifier > SAL_CALL
 
 // virtual
 sal_Int32 SAL_CALL UniversalContentBroker::createCommandIdentifier()
-    throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -623,7 +608,6 @@ Any SAL_CALL UniversalContentBroker::execute(
                           const Command& aCommand,
                           sal_Int32,
                           const Reference< XCommandEnvironment >& Environment )
-    throw( Exception, CommandAbortedException, RuntimeException, std::exception )
 {
     Any aRet;
 
@@ -709,7 +693,6 @@ Any SAL_CALL UniversalContentBroker::execute(
 
 // virtual
 void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aCommandId*/)
-    throw( RuntimeException, std::exception )
 {
     // @@@ Not implemeted ( yet).
 }
@@ -717,7 +700,6 @@ void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aComm
 
 // virtual
 void SAL_CALL UniversalContentBroker::abort( sal_Int32 )
-    throw( RuntimeException, std::exception )
 {
     // @@@ Not implemeted ( yet).
 }
@@ -728,7 +710,6 @@ void SAL_CALL UniversalContentBroker::abort( sal_Int32 )
 
 // virtual
 void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& Event )
-        throw( uno::RuntimeException, std::exception )
 {
     sal_Int32 nCount = Event.Changes.getLength();
     if ( nCount )
@@ -774,7 +755,6 @@ void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent&
 
 // virtual
 void SAL_CALL UniversalContentBroker::disposing(const lang::EventObject&)
-    throw( uno::RuntimeException, std::exception )
 {
     if ( m_xNotifier.is() )
     {
@@ -802,7 +782,6 @@ Reference< XContentProvider > UniversalContentBroker::queryContentProvider(
 }
 
 void UniversalContentBroker::configureUcb()
-    throw (uno::RuntimeException)
 {
     OUString aKey1;
     OUString aKey2;
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index c09252829346..1cd5ef1a364b 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -66,26 +66,20 @@ public:
     virtual ~UniversalContentBroker() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -96,81 +90,59 @@ public:
 
     // XComponent
     virtual void SAL_CALL
-    dispose()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
     virtual void SAL_CALL
     removeEventListener( const css::uno::Reference<
-                            css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                            css::lang::XEventListener >& Listener ) override;
 
     // XInitialization
     virtual void SAL_CALL
-    initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw( css::uno::Exception,
-               css::uno::RuntimeException, std::exception ) override;
+    initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // XContentProviderManager
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
     registerContentProvider( const css::uno::Reference< css::ucb::XContentProvider >&  Provider,
                              const OUString& Scheme,
-                             sal_Bool ReplaceExisting )
-        throw( css::ucb::DuplicateProviderException,
-               css::uno::RuntimeException, std::exception ) override;
+                             sal_Bool ReplaceExisting ) override;
     virtual void SAL_CALL
     deregisterContentProvider( const css::uno::Reference< css::ucb::XContentProvider >&  Provider,
-                               const OUString& Scheme )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                               const OUString& Scheme ) override;
     virtual css::uno::Sequence< css::ucb::ContentProviderInfo > SAL_CALL
-    queryContentProviders()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentProviders() override;
     virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL
-    queryContentProvider( const OUString& Identifier )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentProvider( const OUString& Identifier ) override;
 
     // XContentProvider
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
     virtual sal_Int32 SAL_CALL
     compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1,
-                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                       const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override;
 
     // XContentIdentifierFactory
     virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-    createContentIdentifier( const OUString& ContentId )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createContentIdentifier( const OUString& ContentId ) override;
 
     // XCommandProcessor
     virtual sal_Int32 SAL_CALL
-    createCommandIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createCommandIdentifier() override;
     virtual css::uno::Any SAL_CALL
     execute( const css::ucb::Command& aCommand,
              sal_Int32 CommandId,
-             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception ) override;
+             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
     virtual void SAL_CALL
-    abort( sal_Int32 CommandId )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    abort( sal_Int32 CommandId ) override;
 
     // XCommandProcessor2
-    virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId)
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId) override;
 
     // XChangesListener
-    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override;
 
      // XEventListener ( base of XChangesLisetenr )
-    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;
 
 private:
     css::uno::Reference< css::ucb::XContentProvider >
@@ -184,17 +156,15 @@ private:
     void
     globalTransfer(
             const css::ucb::GlobalTransferCommandArgument2 & rArg,
-            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw( css::uno::Exception, std::exception );
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     css::uno::Any checkIn( const css::ucb::CheckinArgument& rArg,
-            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw( css::uno::Exception );
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
 
     /// @throws css::uno::RuntimeException
-    void configureUcb()
-        throw ( css::uno::RuntimeException);
+    void configureUcb();
 
     bool getContentProviderData(
             const OUString & rKey1,
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 70f03c91fe24..e93f056c8e37 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -101,15 +101,13 @@ public:
 
     // XInteractionHandler methods.
     virtual void SAL_CALL handle(
-            const uno::Reference< task::XInteractionRequest >& Request )
-        throw ( uno::RuntimeException, std::exception ) override;
+            const uno::Reference< task::XInteractionRequest >& Request ) override;
 };
 
 
 // virtual
 void SAL_CALL InteractionHandlerProxy::handle(
             const uno::Reference< task::XInteractionRequest >& Request )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( !m_xOrig.is() )
         return;
@@ -168,17 +166,14 @@ class ActiveDataSink : public cppu::WeakImplHelper< io::XActiveDataSink >
 public:
     // XActiveDataSink methods.
     virtual void SAL_CALL setInputStream(
-                        const uno::Reference< io::XInputStream >& aStream )
-        throw( uno::RuntimeException, std::exception ) override;
-    virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream()
-        throw( uno::RuntimeException, std::exception ) override;
+                        const uno::Reference< io::XInputStream >& aStream ) override;
+    virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() override;
 };
 
 
 // virtual
 void SAL_CALL ActiveDataSink::setInputStream(
                         const uno::Reference< io::XInputStream >& aStream )
-    throw( uno::RuntimeException, std::exception )
 {
     m_xStream = aStream;
 }
@@ -186,7 +181,6 @@ void SAL_CALL ActiveDataSink::setInputStream(
 
 // virtual
 uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_xStream;
 }
@@ -204,18 +198,13 @@ public:
     CommandProcessorInfo();
 
     // XCommandInfo methods
-    virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands()
-        throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands() override;
     virtual ucb::CommandInfo SAL_CALL
-    getCommandInfoByName( const OUString& Name )
-        throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) override;
+    getCommandInfoByName( const OUString& Name ) override;
     virtual ucb::CommandInfo SAL_CALL
-    getCommandInfoByHandle( sal_Int32 Handle )
-        throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name )
-        throw( uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle )
-        throw( uno::RuntimeException, std::exception ) override;
+    getCommandInfoByHandle( sal_Int32 Handle ) override;
+    virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) override;
 };
 
 
@@ -244,7 +233,6 @@ CommandProcessorInfo::CommandProcessorInfo()
 // virtual
 uno::Sequence< ucb::CommandInfo > SAL_CALL
 CommandProcessorInfo::getCommands()
-    throw( uno::RuntimeException, std::exception )
 {
     return uno::Sequence< ucb::CommandInfo >( *m_pInfo );
 }
@@ -253,7 +241,6 @@ CommandProcessorInfo::getCommands()
 // virtual
 ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByName( const OUString& Name )
-    throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception )
 {
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
@@ -268,7 +255,6 @@ CommandProcessorInfo::getCommandInfoByName( const OUString& Name )
 // virtual
 ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
-    throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception )
 {
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
@@ -283,7 +269,6 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
 // virtual
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
                                                 const OUString& Name )
-    throw( uno::RuntimeException, std::exception )
 {
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
@@ -297,7 +282,6 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
 
 // virtual
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle )
-    throw( uno::RuntimeException, std::exception )
 {
     for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n )
     {
@@ -450,7 +434,6 @@ bool setTitle(
         const uno::Reference< ucb::XCommandProcessor > & xCommandProcessor,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv,
         const OUString & rNewTitle )
-    throw( uno::RuntimeException )
 {
     try
     {
@@ -499,7 +482,6 @@ uno::Reference< ucb::XContent > createNew(
                     bool bSourceIsFolder,
                     bool bSourceIsDocument,
                     bool bSourceIsLink )
-    throw( uno::Exception )
 {
 
 
@@ -722,7 +704,6 @@ void transferProperties(
     const TransferCommandContext & rContext,
     const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS,
     const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorN )
-        throw( uno::Exception )
 {
     ucb::Command aGetPropertySetInfoCommand(
                 OUString("getPropertySetInfo"),
@@ -880,7 +861,6 @@ void transferProperties(
 uno::Reference< io::XInputStream > getInputStream(
     const TransferCommandContext & rContext,
     const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS )
-        throw( uno::Exception )
 {
     uno::Reference< io::XInputStream > xInputStream;
 
@@ -958,7 +938,6 @@ uno::Reference< io::XInputStream > getInputStream(
 uno::Reference< sdbc::XResultSet > getResultSet(
     const TransferCommandContext & rContext,
     const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS )
-        throw( uno::Exception )
 {
     uno::Reference< sdbc::XResultSet > xResultSet;
 
@@ -1009,7 +988,6 @@ void handleNameClashRename(
         const uno::Reference<
             ucb::XCommandProcessor > & xCommandProcessorS,
         /* [inout] */ uno::Reference< io::XInputStream > & xInputStream )
-    throw( uno::Exception, std::exception )
 {
     sal_Int32 nTry = 0;
 
@@ -1179,7 +1157,6 @@ void globalTransfer_(
         const uno::Reference< ucb::XContent > & xSource,
         const uno::Reference< ucb::XContent > & xTarget,
         const uno::Reference< sdbc::XRow > & xSourceProps )
-    throw( uno::Exception, std::exception )
 {
     // IsFolder: property is required.
     bool bSourceIsFolder = xSourceProps->getBoolean( 1 );
@@ -1642,7 +1619,6 @@ UniversalContentBroker::getCommandInfo()
 void UniversalContentBroker::globalTransfer(
             const ucb::GlobalTransferCommandArgument2 & rArg,
             const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     // Use own command environment with own interaction handler intercepting
     // some interaction requests that shall not be handled by the user-supplied
@@ -1973,7 +1949,7 @@ void UniversalContentBroker::globalTransfer(
 }
 
 uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg,
-            const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw ( uno::Exception )
+            const uno::Reference< ucb::XCommandEnvironment >& xEnv )
 {
     uno::Any aRet;
     // Use own command environment with own interaction handler intercepting
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index b79d6a3f8078..b6cb1d1224c8 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -200,7 +200,6 @@ XSERVICEINFO_COMMOM_IMPL( UcbPropertiesManager,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 UcbPropertiesManager_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new UcbPropertiesManager( rSMgr ));
@@ -223,7 +222,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbPropertiesManager );
 
 // virtual
 Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties()
-    throw( RuntimeException, std::exception )
 {
     return m_pProps;
 }
@@ -231,7 +229,6 @@ Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties()
 
 // virtual
 Property SAL_CALL UcbPropertiesManager::getPropertyByName( const OUString& aName )
-    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     Property aProp;
     if ( queryProperty( aName, aProp ) )
@@ -243,7 +240,6 @@ Property SAL_CALL UcbPropertiesManager::getPropertyByName( const OUString& aName
 
 // virtual
 sal_Bool SAL_CALL UcbPropertiesManager::hasPropertyByName( const OUString& Name )
-    throw( RuntimeException, std::exception )
 {
     Property aProp;
     return queryProperty( Name, aProp );
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 536b2c4f78db..4f789f999476 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -50,12 +50,9 @@ public:
     virtual ~UcbPropertiesManager() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -66,15 +63,11 @@ public:
 
     // XPropertySetInfo
     virtual css::uno::Sequence< css::beans::Property > SAL_CALL
-    getProperties()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getProperties() override;
     virtual css::beans::Property SAL_CALL
-    getPropertyByName( const OUString& aName )
-        throw( css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception ) override;
+    getPropertyByName( const OUString& aName ) override;
     virtual sal_Bool SAL_CALL
-    hasPropertyByName( const OUString& Name )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    hasPropertyByName( const OUString& Name ) override;
 };
 
 #endif // INCLUDED_UCB_SOURCE_CORE_UCBPROPS_HXX
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index d51090765a59..8c1f9c4c5c64 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -121,12 +121,9 @@ public:
     explicit PropertySetInfo_Impl(PersistentPropertySet* pOwner);
 
     // XPropertySetInfo
-    virtual Sequence< Property > SAL_CALL getProperties()
-        throw( RuntimeException, std::exception ) override;
-    virtual Property SAL_CALL getPropertyByName( const OUString& aName )
-        throw( UnknownPropertyException, RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-        throw( RuntimeException, std::exception ) override;
+    virtual Sequence< Property > SAL_CALL getProperties() override;
+    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
     // Non-interface methods.
     void reset() { m_pProps.reset(); }
@@ -164,7 +161,6 @@ XSERVICEINFO_COMMOM_IMPL( UcbStore,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 UcbStore_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new UcbStore( ucbhelper::getComponentContext(rSMgr) ));
@@ -190,7 +186,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbStore );
 // virtual
 Reference< XPropertySetRegistry > SAL_CALL
 UcbStore::createPropertySetRegistry( const OUString& )
-    throw( RuntimeException, std::exception )
 {
     // The URL parameter is ignored by this interface implementation. It always
     // uses the configuration server as storage medium.
@@ -211,7 +206,6 @@ UcbStore::createPropertySetRegistry( const OUString& )
 
 // virtual
 void SAL_CALL UcbStore::initialize( const Sequence< Any >& aArguments )
-    throw( Exception, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
     m_pImpl->m_aInitArgs = aArguments;
@@ -263,19 +257,16 @@ PropertySetRegistry::~PropertySetRegistry()
 
 
 OUString SAL_CALL PropertySetRegistry::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.PropertySetRegistry" );
 }
 
 sal_Bool SAL_CALL PropertySetRegistry::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL PropertySetRegistry::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { PROPSET_REG_SERVICE_NAME };
 }
@@ -287,7 +278,6 @@ css::uno::Sequence< OUString > SAL_CALL PropertySetRegistry::getSupportedService
 // virtual
 Reference< XPersistentPropertySet > SAL_CALL
 PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
-    throw( RuntimeException, std::exception )
 {
     if ( !key.isEmpty() )
     {
@@ -412,7 +402,6 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
 
 // virtual
 void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key )
-    throw( RuntimeException, std::exception )
 {
     if ( key.isEmpty() )
         return;
@@ -472,7 +461,6 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key )
 
 // virtual
 css::uno::Type SAL_CALL PropertySetRegistry::getElementType()
-    throw( RuntimeException, std::exception )
 {
     return cppu::UnoType<XPersistentPropertySet>::get();
 }
@@ -480,7 +468,6 @@ css::uno::Type SAL_CALL PropertySetRegistry::getElementType()
 
 // virtual
 sal_Bool SAL_CALL PropertySetRegistry::hasElements()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -498,7 +485,6 @@ sal_Bool SAL_CALL PropertySetRegistry::hasElements()
 
 // virtual
 Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName )
-    throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -527,7 +513,6 @@ Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName )
 
 // virtual
 Sequence< OUString > SAL_CALL PropertySetRegistry::getElementNames()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -543,7 +528,6 @@ Sequence< OUString > SAL_CALL PropertySetRegistry::getElementNames()
 
 // virtual
 sal_Bool SAL_CALL PropertySetRegistry::hasByName( const OUString& aName )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -1134,20 +1118,17 @@ PersistentPropertySet::~PersistentPropertySet()
 // XServiceInfo methods.
 
 OUString SAL_CALL PersistentPropertySet::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.PersistentPropertySet" );
 }
 
 sal_Bool SAL_CALL PersistentPropertySet::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL
 PersistentPropertySet::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { PERS_PROPSET_SERVICE_NAME };
 }
@@ -1158,7 +1139,6 @@ PersistentPropertySet::getSupportedServiceNames()
 
 // virtual
 void SAL_CALL PersistentPropertySet::dispose()
-    throw( RuntimeException, std::exception )
 {
     if ( m_pImpl->m_pDisposeEventListeners &&
          m_pImpl->m_pDisposeEventListeners->getLength() )
@@ -1188,7 +1168,6 @@ void SAL_CALL PersistentPropertySet::dispose()
 // virtual
 void SAL_CALL PersistentPropertySet::addEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if ( !m_pImpl->m_pDisposeEventListeners )
         m_pImpl->m_pDisposeEventListeners =
@@ -1201,7 +1180,6 @@ void SAL_CALL PersistentPropertySet::addEventListener(
 // virtual
 void SAL_CALL PersistentPropertySet::removeEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if ( m_pImpl->m_pDisposeEventListeners )
         m_pImpl->m_pDisposeEventListeners->removeInterface( Listener );
@@ -1215,7 +1193,6 @@ void SAL_CALL PersistentPropertySet::removeEventListener(
 
 // virtual
 Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -1230,12 +1207,6 @@ Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo
 // virtual
 void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aPropertyName,
                                                        const Any& aValue )
-    throw( UnknownPropertyException,
-           PropertyVetoException,
-           IllegalArgumentException,
-           WrappedTargetException,
-           RuntimeException,
-           std::exception )
 {
     if ( aPropertyName.isEmpty() )
         throw UnknownPropertyException();
@@ -1337,9 +1308,6 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty
 // virtual
 Any SAL_CALL PersistentPropertySet::getPropertyValue(
                                             const OUString& PropertyName )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     if ( PropertyName.isEmpty() )
         throw UnknownPropertyException();
@@ -1372,9 +1340,6 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue(
 void SAL_CALL PersistentPropertySet::addPropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& xListener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
 //  load();
 
@@ -1391,9 +1356,6 @@ void SAL_CALL PersistentPropertySet::addPropertyChangeListener(
 void SAL_CALL PersistentPropertySet::removePropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& aListener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
 //  load();
 
@@ -1409,9 +1371,6 @@ void SAL_CALL PersistentPropertySet::removePropertyChangeListener(
 void SAL_CALL PersistentPropertySet::addVetoableChangeListener(
                     const OUString&,
                     const Reference< XVetoableChangeListener >& )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
 //  load();
 //  OSL_FAIL( //                "PersistentPropertySet::addVetoableChangeListener - N.Y.I." );
@@ -1422,9 +1381,6 @@ void SAL_CALL PersistentPropertySet::addVetoableChangeListener(
 void SAL_CALL PersistentPropertySet::removeVetoableChangeListener(
                     const OUString&,
                     const Reference< XVetoableChangeListener >& )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
 //  load();
 //  OSL_FAIL( //                "PersistentPropertySet::removeVetoableChangeListener - N.Y.I." );
@@ -1436,7 +1392,6 @@ void SAL_CALL PersistentPropertySet::removeVetoableChangeListener(
 
 // virtual
 Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry()
-    throw( RuntimeException, std::exception )
 {
     return Reference< XPropertySetRegistry >( m_pImpl->m_pCreator.get() );
 }
@@ -1444,7 +1399,6 @@ Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry()
 
 // virtual
 OUString SAL_CALL PersistentPropertySet::getKey()
-    throw( RuntimeException, std::exception )
 {
     return m_pImpl->m_aKey;
 }
@@ -1455,7 +1409,6 @@ OUString SAL_CALL PersistentPropertySet::getKey()
 
 // virtual
 OUString SAL_CALL PersistentPropertySet::getName()
-    throw( RuntimeException, std::exception )
 {
     // same as getKey()
     return m_pImpl->m_aKey;
@@ -1464,7 +1417,6 @@ OUString SAL_CALL PersistentPropertySet::getName()
 
 // virtual
 void SAL_CALL PersistentPropertySet::setName( const OUString& aName )
-    throw( RuntimeException, std::exception )
 {
     if ( aName != m_pImpl->m_aKey )
         m_pImpl->m_pCreator->renamePropertySet( m_pImpl->m_aKey, aName );
@@ -1477,10 +1429,6 @@ void SAL_CALL PersistentPropertySet::setName( const OUString& aName )
 // virtual
 void SAL_CALL PersistentPropertySet::addProperty(
         const OUString& Name, sal_Int16 Attributes, const Any& DefaultValue )
-    throw( PropertyExistException,
-           IllegalTypeException,
-           IllegalArgumentException,
-           RuntimeException, std::exception )
 {
     if ( Name.isEmpty() )
         throw IllegalArgumentException();
@@ -1640,9 +1588,6 @@ void SAL_CALL PersistentPropertySet::addProperty(
 
 // virtual
 void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
-    throw( UnknownPropertyException,
-           NotRemoveableException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -1792,7 +1737,6 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
 // virtual
 void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener(
                 const Reference< XPropertySetInfoChangeListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if ( !m_pImpl->m_pPropSetChangeListeners )
         m_pImpl->m_pPropSetChangeListeners =
@@ -1805,7 +1749,6 @@ void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener(
 // virtual
 void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener(
                 const Reference< XPropertySetInfoChangeListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if ( m_pImpl->m_pPropSetChangeListeners )
         m_pImpl->m_pPropSetChangeListeners->removeInterface( Listener );
@@ -1817,7 +1760,6 @@ void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener(
 
 // virtual
 Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -1950,11 +1892,6 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
 // virtual
 void SAL_CALL PersistentPropertySet::setPropertyValues(
                                  const Sequence< PropertyValue >& aProps )
-    throw( UnknownPropertyException,
-           PropertyVetoException,
-           IllegalArgumentException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     sal_Int32 nCount = aProps.getLength();
     if ( !nCount )
@@ -2175,7 +2112,6 @@ PropertySetInfo_Impl::PropertySetInfo_Impl(
 
 // virtual
 Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
-    throw( RuntimeException, std::exception )
 {
     if ( !m_pProps )
     {
@@ -2323,7 +2259,6 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
 // virtual
 Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
                                                     const OUString& aName )
-    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     Reference< XHierarchicalNameAccess > xRootHierNameAccess(
             m_pOwner->getPropertySetRegistry().getRootConfigReadAccess(),
@@ -2407,7 +2342,6 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
 // virtual
 sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName(
                                                     const OUString& Name )
-    throw( RuntimeException, std::exception )
 {
     Reference< XHierarchicalNameAccess > xRootHierNameAccess(
             m_pOwner->getPropertySetRegistry().getRootConfigReadAccess(),
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 912256fcad47..ebc8fa419d5c 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -59,12 +59,9 @@ public:
     virtual ~UcbStore() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -75,14 +72,11 @@ public:
 
     // XPropertySetRegistryFactory
     virtual css::uno::Reference< css::ucb::XPropertySetRegistry > SAL_CALL
-    createPropertySetRegistry( const OUString& URL )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createPropertySetRegistry( const OUString& URL ) override;
 
     // XInitialization
     virtual void SAL_CALL
-    initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw( css::uno::Exception,
-               css::uno::RuntimeException, std::exception ) override;
+    initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 };
 
 
@@ -117,41 +111,29 @@ public:
 
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XPropertySetRegistry
     virtual css::uno::Reference< css::ucb::XPersistentPropertySet > SAL_CALL
-    openPropertySet( const OUString& key, sal_Bool create )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    openPropertySet( const OUString& key, sal_Bool create ) override;
     virtual void SAL_CALL
-    removePropertySet( const OUString& key )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removePropertySet( const OUString& key ) override;
 
     // XElementAccess ( XNameAccess is derived from it )
     virtual css::uno::Type SAL_CALL
-    getElementType()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getElementType() override;
     virtual sal_Bool SAL_CALL
-    hasElements()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    hasElements() override;
 
     // XNameAccess
     virtual css::uno::Any SAL_CALL
-    getByName( const OUString& aName )
-        throw( css::container::NoSuchElementException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+    getByName( const OUString& aName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getElementNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getElementNames() override;
     virtual sal_Bool SAL_CALL
-    hasByName( const OUString& aName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    hasByName( const OUString& aName ) override;
 
     // Non-interface methods
     css::uno::Reference< css::uno::XInterface >
@@ -187,116 +169,70 @@ public:
     virtual ~PersistentPropertySet() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
     virtual void SAL_CALL
-    dispose()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getPropertySetInfo() override;
     virtual void SAL_CALL
     setPropertyValue( const OUString& aPropertyName,
-                      const css::uno::Any& aValue )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                      const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL
-    getPropertyValue( const OUString& PropertyName )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+    getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL
     addPropertyChangeListener( const OUString& aPropertyName,
-                               const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                               const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL
     removePropertyChangeListener( const OUString& aPropertyName,
-                                  const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                  const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL
     addVetoableChangeListener( const OUString& PropertyName,
-                               const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                               const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL
     removeVetoableChangeListener( const OUString& PropertyName,
-                                  const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                  const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // XPersistentPropertySet
     virtual css::uno::Reference< css::ucb::XPropertySetRegistry > SAL_CALL
-    getRegistry()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getRegistry() override;
     virtual OUString SAL_CALL
-    getKey()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getKey() override;
 
     // XNamed
     virtual OUString SAL_CALL
-    getName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getName() override;
     virtual void SAL_CALL
-    setName( const OUString& aName )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    setName( const OUString& aName ) override;
 
     // XPropertyContainer
     virtual void SAL_CALL
     addProperty( const OUString& Name,
                  sal_Int16 Attributes,
-                 const css::uno::Any& DefaultValue )
-        throw( css::beans::PropertyExistException,
-               css::beans::IllegalTypeException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception ) override;
+                 const css::uno::Any& DefaultValue ) override;
     virtual void SAL_CALL
-    removeProperty( const OUString& Name )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::NotRemoveableException,
-               css::uno::RuntimeException, std::exception ) override;
+    removeProperty( const OUString& Name ) override;
 
     // XPropertySetInfoChangeNotifier
     virtual void SAL_CALL
-    addPropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addPropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
     virtual void SAL_CALL
-    removePropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removePropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
 
     // XPropertyAccess
     virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
-    getPropertyValues()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getPropertyValues() override;
     virtual void SAL_CALL
-    setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+    setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
 
     // Non-interface methods.
     PropertySetRegistry& getPropertySetRegistry();
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 4f656eb16c37..0722095256f2 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -91,19 +91,16 @@ SortedDynamicResultSet::~SortedDynamicResultSet()
 // XServiceInfo methods.
 
 OUString SAL_CALL SortedDynamicResultSet::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.SortedDynamicResultSet" );
 }
 
 sal_Bool SAL_CALL SortedDynamicResultSet::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSet::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { DYNAMIC_RESULTSET_SERVICE_NAME };
 }
@@ -111,7 +108,6 @@ css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSet::getSupportedServ
 // XComponent methods.
 
 void SAL_CALL SortedDynamicResultSet::dispose()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -131,7 +127,6 @@ void SAL_CALL SortedDynamicResultSet::dispose()
 
 void SAL_CALL SortedDynamicResultSet::addEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -144,7 +139,6 @@ void SAL_CALL SortedDynamicResultSet::addEventListener(
 
 void SAL_CALL SortedDynamicResultSet::removeEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -157,7 +151,6 @@ void SAL_CALL SortedDynamicResultSet::removeEventListener(
 
 Reference< XResultSet > SAL_CALL
 SortedDynamicResultSet::getStaticResultSet()
-    throw( ListenerAlreadySetException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -178,7 +171,6 @@ SortedDynamicResultSet::getStaticResultSet()
 
 void SAL_CALL
 SortedDynamicResultSet::setListener( const Reference< XDynamicResultSetListener >& Listener )
-    throw( ListenerAlreadySetException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -196,10 +188,6 @@ SortedDynamicResultSet::setListener( const Reference< XDynamicResultSetListener
 
 void SAL_CALL
 SortedDynamicResultSet::connectToCache( const Reference< XDynamicResultSet > & xCache )
-        throw( ListenerAlreadySetException,
-               AlreadyInitializedException,
-               ServiceNotFoundException,
-               RuntimeException, std::exception )
 {
     if( mxListener.is() )
         throw ListenerAlreadySetException();
@@ -231,7 +219,6 @@ SortedDynamicResultSet::connectToCache( const Reference< XDynamicResultSet > & x
 
 
 sal_Int16 SAL_CALL SortedDynamicResultSet::getCapabilities()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -265,7 +252,6 @@ sal_Int16 SAL_CALL SortedDynamicResultSet::getCapabilities()
  removing himself as listener (otherwise you deadlock)!!!
 */
 void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
-    throw( RuntimeException )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -393,7 +379,6 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
 // XEventListener
 
 void SortedDynamicResultSet::impl_disposing( const EventObject& )
-    throw( RuntimeException )
 {
     mxListener.clear();
     mxOriginal.clear();
@@ -442,7 +427,6 @@ SortedDynamicResultSetFactory::~SortedDynamicResultSetFactory()
 // XServiceInfo methods.
 
 OUString SAL_CALL SortedDynamicResultSetFactory::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
@@ -453,13 +437,11 @@ OUString SortedDynamicResultSetFactory::getImplementationName_Static()
 }
 
 sal_Bool SAL_CALL SortedDynamicResultSetFactory::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSetFactory::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return getSupportedServiceNames_Static();
 }
@@ -468,7 +450,6 @@ css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSetFactory::getSuppor
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 SortedDynamicResultSetFactory_CreateInstance( const css::uno::Reference<
                                               css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(
         new SortedDynamicResultSetFactory( ucbhelper::getComponentContext(rSMgr) ));
@@ -501,7 +482,6 @@ SortedDynamicResultSetFactory::createSortedDynamicResultSet(
                 const Reference< XDynamicResultSet > & Source,
                 const Sequence< NumberedSortingInfo > & Info,
                 const Reference< XAnyCompareFactory > & CompareFactory )
-    throw( RuntimeException, std::exception )
 {
     Reference< XDynamicResultSet > xRet;
     xRet = new SortedDynamicResultSet( Source, Info, CompareFactory, m_xContext );
@@ -547,7 +527,6 @@ SortedDynamicResultSetListener::~SortedDynamicResultSetListener()
 
 void SAL_CALL
 SortedDynamicResultSetListener::disposing( const EventObject& Source )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -560,7 +539,6 @@ SortedDynamicResultSetListener::disposing( const EventObject& Source )
 
 void SAL_CALL
 SortedDynamicResultSetListener::notify( const ListEvent& Changes )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index b931774f2c2f..8e24cb70635c 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -77,56 +77,42 @@ public:
 
     // XServiceInfo
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
 
-    virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
 
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
 
     // XDynamicResultSet
 
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet()
-        throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet() override;
 
     virtual void SAL_CALL
-    setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener )
-        throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ) override;
+    setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) override;
 
     virtual void SAL_CALL
-    connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache )
-        throw( css::ucb::ListenerAlreadySetException,
-               css::ucb::AlreadyInitializedException,
-               css::ucb::ServiceNotFoundException,
-               css::uno::RuntimeException, std::exception ) override;
+    connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) override;
 
     virtual sal_Int16 SAL_CALL
-    getCapabilities()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getCapabilities() override;
 
 
     // own methods:
 
     /// @throws css::uno::RuntimeException
-    void impl_disposing( const css::lang::EventObject& Source )
-        throw( css::uno::RuntimeException );
+    void impl_disposing( const css::lang::EventObject& Source );
 
     /// @throws css::uno::RuntimeException
-    void impl_notify( const css::ucb::ListEvent& Changes )
-        throw( css::uno::RuntimeException );
+    void impl_notify( const css::ucb::ListEvent& Changes );
 };
 
 class SortedDynamicResultSetListener: public cppu::WeakImplHelper <
@@ -142,13 +128,11 @@ public:
     // XEventListener ( base of XDynamicResultSetListener )
 
     virtual void SAL_CALL
-    disposing( const css::lang::EventObject& Source )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    disposing( const css::lang::EventObject& Source ) override;
 
     // XDynamicResultSetListener
 
-    virtual void SAL_CALL notify( const css::ucb::ListEvent& Changes )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL notify( const css::ucb::ListEvent& Changes ) override;
 
     // own methods:
 
@@ -177,12 +161,9 @@ public:
 
     // XSortedDynamicResultSetFactory
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
@@ -190,8 +171,7 @@ public:
     createSortedDynamicResultSet(
                 const css::uno::Reference< css::ucb::XDynamicResultSet > & Source,
                 const css::uno::Sequence< css::ucb::NumberedSortingInfo > & Info,
-                const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory )
-        throw( css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory ) override;
 };
 
 #endif
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 24a507a066a7..aa5580b06eb4 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -99,12 +99,9 @@ public:
                 SRSPropertySetInfo();
 
     // XPropertySetInfo
-    virtual Sequence< Property > SAL_CALL getProperties()
-        throw( RuntimeException, std::exception ) override;
-    virtual Property SAL_CALL getPropertyByName( const OUString& aName )
-        throw( UnknownPropertyException, RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-        throw( RuntimeException, std::exception ) override;
+    virtual Sequence< Property > SAL_CALL getProperties() override;
+    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 };
 
 typedef OMultiTypeInterfaceContainerHelperVar<OUString>
@@ -161,19 +158,16 @@ SortedResultSet::~SortedResultSet()
 // XServiceInfo methods.
 
 OUString SAL_CALL SortedResultSet::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.SortedResultSet" );
 }
 
 sal_Bool SAL_CALL SortedResultSet::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL SortedResultSet::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { RESULTSET_SERVICE_NAME };
 }
@@ -182,7 +176,6 @@ css::uno::Sequence< OUString > SAL_CALL SortedResultSet::getSupportedServiceName
 // XComponent methods.
 
 void SAL_CALL SortedResultSet::dispose()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -214,7 +207,6 @@ void SAL_CALL SortedResultSet::dispose()
 
 void SAL_CALL SortedResultSet::addEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -228,7 +220,6 @@ void SAL_CALL SortedResultSet::addEventListener(
 
 void SAL_CALL SortedResultSet::removeEventListener(
                             const Reference< XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -242,7 +233,6 @@ void SAL_CALL SortedResultSet::removeEventListener(
 
 OUString SAL_CALL
 SortedResultSet::queryContentIdentifierString()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifierString();
@@ -251,7 +241,6 @@ SortedResultSet::queryContentIdentifierString()
 
 Reference< XContentIdentifier > SAL_CALL
 SortedResultSet::queryContentIdentifier()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifier();
@@ -260,7 +249,6 @@ SortedResultSet::queryContentIdentifier()
 
 Reference< XContent > SAL_CALL
 SortedResultSet::queryContent()
-    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XContentAccess >::query(mxOriginal)->queryContent();
@@ -270,7 +258,6 @@ SortedResultSet::queryContent()
 // XResultSet methods.
 
 sal_Bool SAL_CALL SortedResultSet::next()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -293,7 +280,6 @@ sal_Bool SAL_CALL SortedResultSet::next()
 
 
 sal_Bool SAL_CALL SortedResultSet::isBeforeFirst()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     if ( mnCurEntry )
         return false;
@@ -303,7 +289,6 @@ sal_Bool SAL_CALL SortedResultSet::isBeforeFirst()
 
 
 sal_Bool SAL_CALL SortedResultSet::isAfterLast()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     if ( mnCurEntry > mnCount )
         return true;
@@ -313,7 +298,6 @@ sal_Bool SAL_CALL SortedResultSet::isAfterLast()
 
 
 sal_Bool SAL_CALL SortedResultSet::isFirst()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     if ( mnCurEntry == 1 )
         return true;
@@ -323,7 +307,6 @@ sal_Bool SAL_CALL SortedResultSet::isFirst()
 
 
 sal_Bool SAL_CALL SortedResultSet::isLast()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     if ( mnCurEntry == mnCount )
         return true;
@@ -333,7 +316,6 @@ sal_Bool SAL_CALL SortedResultSet::isLast()
 
 
 void SAL_CALL SortedResultSet::beforeFirst()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     mnCurEntry = 0;
@@ -342,7 +324,6 @@ void SAL_CALL SortedResultSet::beforeFirst()
 
 
 void SAL_CALL SortedResultSet::afterLast()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     mnCurEntry = mnCount+1;
@@ -351,7 +332,6 @@ void SAL_CALL SortedResultSet::afterLast()
 
 
 sal_Bool SAL_CALL SortedResultSet::first()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -370,7 +350,6 @@ sal_Bool SAL_CALL SortedResultSet::first()
 
 
 sal_Bool SAL_CALL SortedResultSet::last()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -389,7 +368,6 @@ sal_Bool SAL_CALL SortedResultSet::last()
 
 
 sal_Int32 SAL_CALL SortedResultSet::getRow()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     return mnCurEntry;
 }
@@ -421,7 +399,6 @@ sal_Int32 SAL_CALL SortedResultSet::getRow()
     type is FORWARD_ONLY.
  */
 sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row )
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -484,7 +461,6 @@ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row )
     current row, or the result set type is FORWARD_ONLY.
  */
 sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows )
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -529,7 +505,6 @@ sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows )
     is FORWARD_ONLY.
  */
 sal_Bool SAL_CALL SortedResultSet::previous()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -551,7 +526,6 @@ sal_Bool SAL_CALL SortedResultSet::previous()
 
 
 void SAL_CALL SortedResultSet::refreshRow()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -565,7 +539,6 @@ void SAL_CALL SortedResultSet::refreshRow()
 
 
 sal_Bool SAL_CALL SortedResultSet::rowUpdated()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -579,7 +552,6 @@ sal_Bool SAL_CALL SortedResultSet::rowUpdated()
 
 
 sal_Bool SAL_CALL SortedResultSet::rowInserted()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -593,7 +565,6 @@ sal_Bool SAL_CALL SortedResultSet::rowInserted()
 
 
 sal_Bool SAL_CALL SortedResultSet::rowDeleted()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -607,7 +578,6 @@ sal_Bool SAL_CALL SortedResultSet::rowDeleted()
 
 
 Reference< XInterface > SAL_CALL SortedResultSet::getStatement()
-    throw ( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -624,7 +594,6 @@ Reference< XInterface > SAL_CALL SortedResultSet::getStatement()
 
 
 sal_Bool SAL_CALL SortedResultSet::wasNull()
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->wasNull();
@@ -632,7 +601,6 @@ sal_Bool SAL_CALL SortedResultSet::wasNull()
 
 
 OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getString( columnIndex );
@@ -640,7 +608,6 @@ OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex )
 
 
 sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getBoolean( columnIndex );
@@ -648,7 +615,6 @@ sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex )
 
 
 sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getByte( columnIndex );
@@ -656,7 +622,6 @@ sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex )
 
 
 sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getShort( columnIndex );
@@ -664,14 +629,12 @@ sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex )
 
 
 sal_Int32 SAL_CALL SortedResultSet::getInt( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getInt( columnIndex );
 }
 
 sal_Int64 SAL_CALL SortedResultSet::getLong( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getLong( columnIndex );
@@ -679,7 +642,6 @@ sal_Int64 SAL_CALL SortedResultSet::getLong( sal_Int32 columnIndex )
 
 
 float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getFloat( columnIndex );
@@ -687,7 +649,6 @@ float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex )
 
 
 double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getDouble( columnIndex );
@@ -695,7 +656,6 @@ double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex )
 
 
 Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getBytes( columnIndex );
@@ -703,7 +663,6 @@ Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex )
 
 
 Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getDate( columnIndex );
@@ -711,7 +670,6 @@ Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex )
 
 
 Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getTime( columnIndex );
@@ -719,7 +677,6 @@ Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex )
 
 
 DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getTimestamp( columnIndex );
@@ -728,7 +685,6 @@ DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex )
 
 Reference< XInputStream > SAL_CALL
 SortedResultSet::getBinaryStream( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getBinaryStream( columnIndex );
@@ -737,7 +693,6 @@ SortedResultSet::getBinaryStream( sal_Int32 columnIndex )
 
 Reference< XInputStream > SAL_CALL
 SortedResultSet::getCharacterStream( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getCharacterStream( columnIndex );
@@ -746,7 +701,6 @@ SortedResultSet::getCharacterStream( sal_Int32 columnIndex )
 
 Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex,
                        const Reference< XNameAccess >& typeMap )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getObject( columnIndex,
@@ -755,7 +709,6 @@ Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex,
 
 
 Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getRef( columnIndex );
@@ -763,7 +716,6 @@ Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex )
 
 
 Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getBlob( columnIndex );
@@ -771,7 +723,6 @@ Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex )
 
 
 Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getClob( columnIndex );
@@ -779,7 +730,6 @@ Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex )
 
 
 Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getArray( columnIndex );
@@ -790,7 +740,6 @@ Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex )
 
 
 void SAL_CALL SortedResultSet::close()
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     Reference< XCloseable >::query(mxOriginal)->close();
@@ -801,7 +750,6 @@ void SAL_CALL SortedResultSet::close()
 
 
 Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData()
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XResultSetMetaDataSupplier >::query(mxOriginal)->getMetaData();
@@ -812,7 +760,7 @@ Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData()
 
 
 Reference< XPropertySetInfo > SAL_CALL
-SortedResultSet::getPropertySetInfo() throw( RuntimeException, std::exception )
+SortedResultSet::getPropertySetInfo()
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -828,11 +776,6 @@ SortedResultSet::getPropertySetInfo() throw( RuntimeException, std::exception )
 void SAL_CALL SortedResultSet::setPropertyValue(
                         const OUString& PropertyName,
                         const Any& )
-    throw( UnknownPropertyException,
-           PropertyVetoException,
-           IllegalArgumentException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -844,9 +787,6 @@ void SAL_CALL SortedResultSet::setPropertyValue(
 
 
 Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -887,9 +827,6 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
 void SAL_CALL SortedResultSet::addPropertyChangeListener(
                         const OUString& PropertyName,
                         const Reference< XPropertyChangeListener >& Listener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -904,9 +841,6 @@ void SAL_CALL SortedResultSet::addPropertyChangeListener(
 void SAL_CALL SortedResultSet::removePropertyChangeListener(
                         const OUString& PropertyName,
                         const Reference< XPropertyChangeListener >& Listener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -918,9 +852,6 @@ void SAL_CALL SortedResultSet::removePropertyChangeListener(
 void SAL_CALL SortedResultSet::addVetoableChangeListener(
                         const OUString& PropertyName,
                         const Reference< XVetoableChangeListener >& Listener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -935,9 +866,6 @@ void SAL_CALL SortedResultSet::addVetoableChangeListener(
 void SAL_CALL SortedResultSet::removeVetoableChangeListener(
                         const OUString& PropertyName,
                         const Reference< XVetoableChangeListener >& Listener )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
 
@@ -952,8 +880,6 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResult
                                    const Reference < XResultSet >& xResultTwo,
                                    sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo,
                                    SortInfo* pSortInfo )
-
-    throw( SQLException, RuntimeException )
 {
     Reference < XRow > xRowOne( xResultOne, UNO_QUERY );
     Reference < XRow > xRowTwo( xResultTwo, UNO_QUERY );
@@ -1166,7 +1092,6 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResult
 sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResultOne,
                                    const Reference < XResultSet >& xResultTwo,
                                    sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo )
-    throw( SQLException, RuntimeException )
 {
     sal_IntPtr  nCompare = 0;
     SortInfo*   pInfo = mpSortInfo;
@@ -1207,7 +1132,6 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResult
 
 sal_IntPtr SortedResultSet::Compare( SortListData *pOne,
                                SortListData *pTwo )
-    throw( SQLException, RuntimeException )
 {
     sal_IntPtr nIndexOne;
     sal_IntPtr nIndexTwo;
@@ -1246,7 +1170,6 @@ sal_IntPtr SortedResultSet::Compare( SortListData *pOne,
 
 sal_IntPtr SortedResultSet::FindPos( SortListData *pEntry,
                                sal_IntPtr _nStart, sal_IntPtr _nEnd )
-    throw( SQLException, RuntimeException )
 {
     if ( _nStart > _nEnd )
         return _nStart + 1;
@@ -1872,7 +1795,7 @@ SRSPropertySetInfo::SRSPropertySetInfo()
 // XPropertySetInfo methods.
 
 Sequence< Property > SAL_CALL
-SRSPropertySetInfo::getProperties() throw( RuntimeException, std::exception )
+SRSPropertySetInfo::getProperties()
 {
     return Sequence < Property > ( maProps, 2 );
 }
@@ -1880,7 +1803,6 @@ SRSPropertySetInfo::getProperties() throw( RuntimeException, std::exception )
 
 Property SAL_CALL
 SRSPropertySetInfo::getPropertyByName( const OUString& Name )
-    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     if ( Name == "RowCount" )
         return maProps[0];
@@ -1893,7 +1815,6 @@ SRSPropertySetInfo::getPropertyByName( const OUString& Name )
 
 sal_Bool SAL_CALL
 SRSPropertySetInfo::hasPropertyByName( const OUString& Name )
-    throw( RuntimeException, std::exception )
 {
     if ( Name == "RowCount" )
         return true;
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index f68d3ed69f89..9547bb827e1a 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -120,13 +120,11 @@ class SortedResultSet: public cppu::WeakImplHelper <
 private:
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    sal_IntPtr          FindPos( SortListData *pEntry, sal_IntPtr nStart, sal_IntPtr nEnd )
-                            throw( css::sdbc::SQLException, css::uno::RuntimeException );
+    sal_IntPtr          FindPos( SortListData *pEntry, sal_IntPtr nStart, sal_IntPtr nEnd );
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
     sal_IntPtr          Compare( SortListData *pOne,
-                                 SortListData *pTwo )
-                            throw( css::sdbc::SQLException, css::uno::RuntimeException );
+                                 SortListData *pTwo );
     void                BuildSortInfo( const css::uno::Reference< css::sdbc::XResultSet >& aResult,
                                        const css::uno::Sequence < css::ucb::NumberedSortingInfo > &xSortInfo,
                                        const css::uno::Reference< css::ucb::XAnyCompareFactory > &xCompFac );
@@ -135,14 +133,12 @@ private:
     static sal_IntPtr   CompareImpl( const css::uno::Reference < css::sdbc::XResultSet >& xResultOne,
                                      const css::uno::Reference < css::sdbc::XResultSet >& xResultTwo,
                                      sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo,
-                                     SortInfo* pSortInfo )
-                            throw( css::sdbc::SQLException, css::uno::RuntimeException );
+                                     SortInfo* pSortInfo );
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
     sal_IntPtr          CompareImpl( const css::uno::Reference < css::sdbc::XResultSet >& xResultOne,
                                      const css::uno::Reference < css::sdbc::XResultSet >& xResultTwo,
-                                     sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo )
-                            throw( css::sdbc::SQLException, css::uno::RuntimeException );
+                                     sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo );
     void                PropertyChanged( const css::beans::PropertyChangeEvent& rEvt );
 
 public:
@@ -165,245 +161,174 @@ public:
     void                ResortNew( EventList* pList );
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException,
-               std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException,
-               std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException,
-               std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XComponent
     virtual void SAL_CALL
-    dispose() throw( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
 
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override;
 
     // XContentAccess
     virtual OUString SAL_CALL
-    queryContentIdentifierString()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentIdentifierString() override;
     virtual css::uno::Reference<
                 css::ucb::XContentIdentifier > SAL_CALL
-    queryContentIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContentIdentifier() override;
     virtual css::uno::Reference<
                 css::ucb::XContent > SAL_CALL
-    queryContent()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryContent() override;
 
     // XResultSet
     virtual sal_Bool SAL_CALL
-    next()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    next() override;
     virtual sal_Bool SAL_CALL
-    isBeforeFirst()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    isBeforeFirst() override;
     virtual sal_Bool SAL_CALL
-    isAfterLast()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    isAfterLast() override;
     virtual sal_Bool SAL_CALL
-    isFirst()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    isFirst() override;
     virtual sal_Bool SAL_CALL
-    isLast()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    isLast() override;
     virtual void SAL_CALL
-    beforeFirst()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    beforeFirst() override;
     virtual void SAL_CALL
-    afterLast()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    afterLast() override;
     virtual sal_Bool SAL_CALL
-    first()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    first() override;
     virtual sal_Bool SAL_CALL
-    last()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    last() override;
     virtual sal_Int32 SAL_CALL
-    getRow()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getRow() override;
     virtual sal_Bool SAL_CALL
-    absolute( sal_Int32 row )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    absolute( sal_Int32 row ) override;
     virtual sal_Bool SAL_CALL
-    relative( sal_Int32 rows )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    relative( sal_Int32 rows ) override;
     virtual sal_Bool SAL_CALL
-    previous()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    previous() override;
     virtual void SAL_CALL
-    refreshRow()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    refreshRow() override;
     virtual sal_Bool SAL_CALL
-    rowUpdated()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    rowUpdated() override;
     virtual sal_Bool SAL_CALL
-    rowInserted()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    rowInserted() override;
     virtual sal_Bool SAL_CALL
-    rowDeleted()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    rowDeleted() override;
     virtual css::uno::Reference<
                 css::uno::XInterface > SAL_CALL
-    getStatement()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getStatement() override;
 
     // XRow
     virtual sal_Bool SAL_CALL
-    wasNull() throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    wasNull() override;
 
     virtual OUString SAL_CALL
-    getString( sal_Int32 columnIndex )
-    throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getString( sal_Int32 columnIndex ) override;
 
     virtual sal_Bool SAL_CALL
-    getBoolean( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getBoolean( sal_Int32 columnIndex ) override;
 
     virtual sal_Int8 SAL_CALL
-    getByte( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getByte( sal_Int32 columnIndex ) override;
 
     virtual sal_Int16 SAL_CALL
-    getShort( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getShort( sal_Int32 columnIndex ) override;
 
     virtual sal_Int32 SAL_CALL
-    getInt( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getInt( sal_Int32 columnIndex ) override;
 
     virtual sal_Int64 SAL_CALL
-    getLong( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getLong( sal_Int32 columnIndex ) override;
 
     virtual float SAL_CALL
-    getFloat( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getFloat( sal_Int32 columnIndex ) override;
 
     virtual double SAL_CALL
-    getDouble( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getDouble( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getBytes( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getBytes( sal_Int32 columnIndex ) override;
 
     virtual css::util::Date SAL_CALL
-    getDate( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getDate( sal_Int32 columnIndex ) override;
 
     virtual css::util::Time SAL_CALL
-    getTime( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getTime( sal_Int32 columnIndex ) override;
 
     virtual css::util::DateTime SAL_CALL
-    getTimestamp( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getTimestamp( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference<
                 css::io::XInputStream > SAL_CALL
-    getBinaryStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getBinaryStream( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Reference<
                 css::io::XInputStream > SAL_CALL
-    getCharacterStream( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getCharacterStream( sal_Int32 columnIndex ) override;
 
     virtual css::uno::Any SAL_CALL
     getObject( sal_Int32 columnIndex,
                const css::uno::Reference<
-                   css::container::XNameAccess >& typeMap )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+                   css::container::XNameAccess >& typeMap ) override;
     virtual css::uno::Reference<
                 css::sdbc::XRef > SAL_CALL
-    getRef( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getRef( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::sdbc::XBlob > SAL_CALL
-    getBlob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getBlob( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::sdbc::XClob > SAL_CALL
-    getClob( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getClob( sal_Int32 columnIndex ) override;
     virtual css::uno::Reference<
                 css::sdbc::XArray > SAL_CALL
-    getArray( sal_Int32 columnIndex )
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getArray( sal_Int32 columnIndex ) override;
 
     // XCloseable
     virtual void SAL_CALL
-    close()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    close() override;
 
     // XResultSetMetaDataSupplier
     virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
-    getMetaData()
-        throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override;
+    getMetaData() override;
 
 
     // XPropertySet
     virtual css::uno::Reference<
                 css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getPropertySetInfo() override;
 
     virtual void SAL_CALL
     setPropertyValue( const OUString& PropertyName,
-                      const css::uno::Any& Value )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                      const css::uno::Any& Value ) override;
 
     virtual css::uno::Any SAL_CALL
-    getPropertyValue( const OUString& PropertyName )
-        throw( css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception ) override;
+    getPropertyValue( const OUString& PropertyName ) override;
 
     virtual void SAL_CALL
     addPropertyChangeListener( const OUString& PropertyName,
                                const css::uno::Reference<
-                                       css::beans::XPropertyChangeListener >& Listener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                       css::beans::XPropertyChangeListener >& Listener ) override;
 
     virtual void SAL_CALL
     removePropertyChangeListener( const OUString& PropertyName,
                                   const css::uno::Reference<
-                                      css::beans::XPropertyChangeListener >& Listener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                      css::beans::XPropertyChangeListener >& Listener ) override;
 
     virtual void SAL_CALL
     addVetoableChangeListener( const OUString& PropertyName,
                                const css::uno::Reference<
-                                       css::beans::XVetoableChangeListener >& Listener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                       css::beans::XVetoableChangeListener >& Listener ) override;
 
     virtual void SAL_CALL
     removeVetoableChangeListener( const OUString& PropertyName,
                                   const css::uno::Reference<
-                                      css::beans::XVetoableChangeListener >& aListener )
-        throw( css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception ) override;
+                                      css::beans::XVetoableChangeListener >& aListener ) override;
 };
 
 #endif
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 65ba37d484fd..7d0ab609edce 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -287,7 +287,6 @@ namespace cmis
     Content::Content( const uno::Reference< uno::XComponentContext >& rxContext,
         ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier,
         libcmis::ObjectPtr const & pObject )
-            throw ( ucb::ContentCreationException )
         : ContentImplHelper( rxContext, pProvider, Identifier ),
         m_pProvider( pProvider ),
         m_pSession( nullptr ),
@@ -306,7 +305,6 @@ namespace cmis
     Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider *pProvider,
         const uno::Reference< ucb::XContentIdentifier >& Identifier,
         bool bIsFolder )
-            throw ( ucb::ContentCreationException )
         : ContentImplHelper( rxContext, pProvider, Identifier ),
         m_pProvider( pProvider ),
         m_pSession( nullptr ),
@@ -497,7 +495,7 @@ namespace cmis
     }
 
 
-    libcmis::ObjectPtr const & Content::getObject( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception)
+    libcmis::ObjectPtr const & Content::getObject( const uno::Reference< ucb::XCommandEnvironment >& xEnv )
     {
         // can't get the session for some reason
         // the recent file opening at start up is an example.
@@ -974,7 +972,6 @@ namespace cmis
 
     uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-            throw( uno::Exception, libcmis::Exception )
     {
         bool bIsFolder = isFolder( xEnv );
 
@@ -1042,7 +1039,6 @@ namespace cmis
 
     OUString Content::checkIn( const ucb::CheckinArgument& rArg,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-            throw( uno::Exception )
     {
         ucbhelper::Content aSourceContent( rArg.SourceURL, xEnv, comphelper::getProcessComponentContext( ) );
         uno::Reference< io::XInputStream > xIn = aSourceContent.openStream( );
@@ -1113,7 +1109,6 @@ namespace cmis
     }
 
     OUString Content::checkOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-            throw( uno::Exception )
     {
         OUString aRet;
         try
@@ -1160,7 +1155,6 @@ namespace cmis
     }
 
     OUString Content::cancelCheckOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-            throw( uno::Exception )
     {
         OUString aRet;
         try
@@ -1226,7 +1220,6 @@ namespace cmis
     }
 
     uno::Sequence< document::CmisVersion> Content::getAllVersions( const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-            throw( uno::Exception, std::exception )
     {
         try
         {
@@ -1268,7 +1261,6 @@ namespace cmis
 
     void Content::transfer( const ucb::TransferInfo& rTransferInfo,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-            throw( uno::Exception )
     {
         // If the source isn't on the same CMIS repository, then simply copy
         INetURLObject aSourceUrl( rTransferInfo.SourceURL );
@@ -1292,7 +1284,6 @@ namespace cmis
     void Content::insert( const uno::Reference< io::XInputStream > & xInputStream,
         bool bReplaceExisting, const OUString& rMimeType,
         const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-            throw (uno::Exception, std::exception)
     {
         if ( !xInputStream.is() )
         {
@@ -1736,25 +1727,24 @@ namespace cmis
         ContentImplHelper::release();
     }
 
-    uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception )
+    uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
     {
         uno::Any aRet = cppu::queryInterface( rType, static_cast< ucb::XContentCreator * >( this ) );
         return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface(rType);
     }
 
-    OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL Content::getImplementationName()
     {
        return OUString("com.sun.star.comp.CmisContent");
     }
 
     uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-           throw( uno::RuntimeException, std::exception )
     {
            uno::Sequence<OUString> aSNS { "com.sun.star.ucb.CmisContent" };
            return aSNS;
     }
 
-    OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL Content::getContentType()
     {
         OUString sRet;
         try
@@ -1781,7 +1771,6 @@ namespace cmis
         const ucb::Command& aCommand,
         sal_Int32 /*CommandId*/,
         const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-            throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException, std::exception )
     {
         SAL_INFO( "ucb.ucp.cmis", "Content::execute( ) - " << aCommand.Name );
         uno::Any aRet;
@@ -1906,20 +1895,19 @@ namespace cmis
         return aRet;
     }
 
-    void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException, std::exception )
+    void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
     {
         SAL_INFO( "ucb.ucp.cmis", "TODO - Content::abort()" );
         // TODO Implement me
     }
 
     uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo()
-            throw( uno::RuntimeException, std::exception )
     {
         return queryCreatableContentsInfo( uno::Reference< ucb::XCommandEnvironment >() );
     }
 
     uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent(
-            const ucb::ContentInfo& Info ) throw( uno::RuntimeException, std::exception )
+            const ucb::ContentInfo& Info )
     {
         bool create_document;
 
@@ -1949,7 +1937,7 @@ namespace cmis
         }
     }
 
-    uno::Sequence< uno::Type > SAL_CALL Content::getTypes() throw( uno::RuntimeException, std::exception )
+    uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
     {
         try
         {
@@ -1999,7 +1987,6 @@ namespace cmis
 
     uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
         const uno::Reference< ucb::XCommandEnvironment >& xEnv)
-            throw( uno::RuntimeException )
     {
         try
         {
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index d7b1aec656f9..270a232ed556 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -89,32 +89,26 @@ private:
     /// @throws css::uno::Exception
     /// @throws libcmis::Exception
     css::uno::Any open(const css::ucb::OpenCommandArgument2 & rArg,
-        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-            throw( css::uno::Exception, libcmis::Exception );
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void transfer( const css::ucb::TransferInfo& rTransferInfo,
-        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-            throw( css::uno::Exception );
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream,
         bool bReplaceExisting, const OUString & rMimeType,
-        const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-            throw (css::uno::Exception, std::exception);
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     OUString checkIn( const css::ucb::CheckinArgument& rArg,
-        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-            throw( css::uno::Exception );
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
-    OUString checkOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-            throw( css::uno::Exception );
+    OUString checkOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
-    OUString cancelCheckOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-            throw( css::uno::Exception );
+    OUString cancelCheckOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     static void copyData( const css::uno::Reference< css::io::XInputStream >& xIn,
         const css::uno::Reference< css::io::XOutputStream >& xOut );
@@ -125,9 +119,7 @@ private:
 
     /// @throws css::uno::Exception
     css::uno::Sequence< css::document::CmisVersion >
-        getAllVersions( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-            throw(css::uno::Exception,
-                  std::exception);
+        getAllVersions( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     bool feedSink( const css::uno::Reference< css::uno::XInterface>& aSink,
         const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
@@ -137,15 +129,13 @@ public:
     Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         ContentProvider *pProvider,
         const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
-        libcmis::ObjectPtr const & pObject = libcmis::ObjectPtr( ) )
-            throw ( css::ucb::ContentCreationException );
+        libcmis::ObjectPtr const & pObject = libcmis::ObjectPtr( ) );
 
     /// @throws css::ucb::ContentCreationException
     Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         ContentProvider *pProvider,
         const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
-        bool bIsFolder)
-            throw ( css::ucb::ContentCreationException );
+        bool bIsFolder);
 
     virtual ~Content() override;
 
@@ -162,58 +152,47 @@ public:
     virtual OUString getParentURL() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     virtual OUString SAL_CALL
-    getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationName() override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     virtual OUString SAL_CALL
-    getContentType()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getContentType() override;
 
     virtual css::uno::Any SAL_CALL
         execute( const css::ucb::Command& aCommand,
         sal_Int32 CommandId,
-        const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-            throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
 
-    virtual void SAL_CALL abort( sal_Int32 CommandId )
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL abort( sal_Int32 CommandId ) override;
 
     virtual css::uno::Sequence< css::ucb::ContentInfo >
-        SAL_CALL queryCreatableContentsInfo()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL queryCreatableContentsInfo() override;
 
     virtual css::uno::Reference< css::ucb::XContent >
-        SAL_CALL createNewContent( const css::ucb::ContentInfo& Info )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) override;
 
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< css::ucb::ContentInfo >
-        queryCreatableContentsInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-                throw( css::uno::RuntimeException );
+        queryCreatableContentsInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override;
 
     /// @throws css::uno::RuntimeException
     /// @throws css::ucb::CommandFailedException
     /// @throws libcmis::Exception
-    libcmis::ObjectPtr const & getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception);
+    libcmis::ObjectPtr const & getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 };
 
 }
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
index 14b3385ec712..9f9fbae0cb0b 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
@@ -166,7 +166,7 @@ namespace cmis
     {
     }
 
-    void DataSupplier::validate() throw( ucb::ResultSetException )
+    void DataSupplier::validate()
     {
     }
 
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
index 2e3dd1ba272b..619af90e355c 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
@@ -65,8 +65,7 @@ namespace cmis
 
             virtual void close() override;
 
-            virtual void validate()
-                throw( css::ucb::ResultSetException ) override;
+            virtual void validate() override;
     };
 
 }
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index a022c44a2d3e..a906ac609d6f 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -23,8 +23,6 @@ namespace cmis
 uno::Reference< css::ucb::XContent > SAL_CALL
 ContentProvider::queryContent(
             const uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-    throw( css::ucb::IllegalIdentifierException,
-           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -103,7 +101,6 @@ void SAL_CALL ContentProvider::release()
 }
 
 css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -123,7 +120,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx
index 3915c0664e81..cfca2923de13 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -27,26 +27,20 @@ public:
     virtual ~ContentProvider() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -57,9 +51,7 @@ public:
 
     // XContentProvider
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
     libcmis::Session* getSession( const OUString& sBindingUrl, const OUString& sUsername );
     void registerSession( const OUString& sBindingUrl, const OUString& sUsername, libcmis::Session* pSession );
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index b0726898cae7..a1a4bd0bedcd 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -50,7 +50,6 @@ namespace cmis
     RepoContent::RepoContent( const uno::Reference< uno::XComponentContext >& rxContext,
         ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier,
         vector< libcmis::RepositoryPtr > const & aRepos )
-            throw ( ucb::ContentCreationException )
         : ContentImplHelper( rxContext, pProvider, Identifier ),
         m_pProvider( pProvider ),
         m_aURL( Identifier->getContentIdentifier( ) ),
@@ -320,19 +319,18 @@ namespace cmis
 
     XTYPEPROVIDER_COMMON_IMPL( RepoContent );
 
-    OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL RepoContent::getImplementationName()
     {
        return OUString("com.sun.star.comp.CmisRepoContent");
     }
 
     uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames()
-           throw( uno::RuntimeException, std::exception )
     {
        uno::Sequence<OUString> aSNS { "com.sun.star.ucb.Content" };
        return aSNS;
     }
 
-    OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException, std::exception )
+    OUString SAL_CALL RepoContent::getContentType()
     {
         return OUString( CMIS_REPO_TYPE );
     }
@@ -341,7 +339,6 @@ namespace cmis
         const ucb::Command& aCommand,
         sal_Int32 /*CommandId*/,
         const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-            throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException, std::exception )
     {
         SAL_INFO( "ucb.ucp.cmis", "RepoContent::execute( ) - " << aCommand.Name );
 
@@ -378,13 +375,13 @@ namespace cmis
         return aRet;
     }
 
-    void SAL_CALL RepoContent::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException, std::exception )
+    void SAL_CALL RepoContent::abort( sal_Int32 /*CommandId*/ )
     {
         SAL_INFO( "ucb.ucp.cmis", "TODO - RepoContent::abort()" );
         // TODO Implement me
     }
 
-    uno::Sequence< uno::Type > SAL_CALL RepoContent::getTypes() throw( uno::RuntimeException, std::exception )
+    uno::Sequence< uno::Type > SAL_CALL RepoContent::getTypes()
     {
         static cppu::OTypeCollection aFolderCollection
             (CPPU_TYPE_REF( lang::XTypeProvider ),
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index ba5f18154481..4be969ee1c24 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -76,8 +76,7 @@ public:
     RepoContent( const css::uno::Reference<
         css::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
         const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
-        std::vector< libcmis::RepositoryPtr > const & aRepos = std::vector< libcmis::RepositoryPtr > ( ) )
-            throw ( css::ucb::ContentCreationException );
+        std::vector< libcmis::RepositoryPtr > const & aRepos = std::vector< libcmis::RepositoryPtr > ( ) );
 
     virtual ~RepoContent() override;
 
@@ -91,31 +90,24 @@ public:
 
     // XInterface
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     virtual OUString SAL_CALL
-    getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationName() override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     virtual OUString SAL_CALL
-    getContentType()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getContentType() override;
 
     virtual css::uno::Any SAL_CALL
         execute( const css::ucb::Command& aCommand,
         sal_Int32 CommandId,
-        const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-            throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
 
-    virtual void SAL_CALL abort( sal_Int32 CommandId )
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL abort( sal_Int32 CommandId ) override;
 
     virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override;
 };
diff --git a/ucb/source/ucp/cmis/std_inputstream.cxx b/ucb/source/ucp/cmis/std_inputstream.cxx
index 4a6b1c468d34..18f850545fc5 100644
--- a/ucb/source/ucp/cmis/std_inputstream.cxx
+++ b/ucb/source/ucp/cmis/std_inputstream.cxx
@@ -37,7 +37,7 @@ namespace cmis
     {
     }
 
-    uno::Any SAL_CALL StdInputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception )
+    uno::Any SAL_CALL StdInputStream::queryInterface( const uno::Type& rType )
     {
         uno::Any aRet = ::cppu::queryInterface( rType,
                                           ( static_cast< XInputStream* >( this ) ),
@@ -57,8 +57,6 @@ namespace cmis
     }
 
     sal_Int32 SAL_CALL StdInputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw( io::NotConnectedException, io::BufferSizeExceededException,
-               io::IOException, uno::RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -85,8 +83,6 @@ namespace cmis
 
     sal_Int32 SAL_CALL StdInputStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData,
             sal_Int32 nMaxBytesToRead )
-        throw( io::NotConnectedException, io::BufferSizeExceededException,
-               io::IOException, uno::RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -110,8 +106,6 @@ namespace cmis
     }
 
     void SAL_CALL StdInputStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw( io::NotConnectedException, io::BufferSizeExceededException,
-               io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -130,19 +124,16 @@ namespace cmis
     }
 
     sal_Int32 SAL_CALL StdInputStream::available( )
-        throw(io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception )
     {
         return sal::static_int_cast< sal_Int32 >( m_nLength - getPosition() );
     }
 
     void SAL_CALL StdInputStream::closeInput( )
-        throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception)
     {
         // No need to implement this for an istream
     }
 
     void SAL_CALL StdInputStream::seek( sal_Int64 location )
-        throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -167,7 +158,6 @@ namespace cmis
     }
 
     sal_Int64 SAL_CALL StdInputStream::getPosition( )
-        throw( io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -182,7 +172,6 @@ namespace cmis
     }
 
     sal_Int64 SAL_CALL StdInputStream::getLength( )
-        throw ( io::IOException, uno::RuntimeException, std::exception )
     {
         return m_nLength;
     }
diff --git a/ucb/source/ucp/cmis/std_inputstream.hxx b/ucb/source/ucp/cmis/std_inputstream.hxx
index ba7338c76375..40596a33787a 100644
--- a/ucb/source/ucp/cmis/std_inputstream.hxx
+++ b/ucb/source/ucp/cmis/std_inputstream.hxx
@@ -36,8 +36,7 @@ namespace cmis
 
             virtual ~StdInputStream() override;
 
-            virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType )
-                throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType ) override;
 
             virtual void SAL_CALL acquire( ) throw ( ) override;
 
@@ -45,59 +44,35 @@ namespace cmis
 
             virtual sal_Int32 SAL_CALL
             readBytes ( css::uno::Sequence< sal_Int8 >& aData,
-                        sal_Int32 nBytesToRead )
-                throw ( css::io::NotConnectedException,
-                        css::io::BufferSizeExceededException,
-                        css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
+                        sal_Int32 nBytesToRead ) override;
 
             virtual sal_Int32 SAL_CALL
             readSomeBytes ( css::uno::Sequence< sal_Int8 >& aData,
-                           sal_Int32 nMaxBytesToRead )
-                throw ( css::io::NotConnectedException,
-                        css::io::BufferSizeExceededException,
-                        css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
+                           sal_Int32 nMaxBytesToRead ) override;
 
             virtual void SAL_CALL
-            skipBytes ( sal_Int32 nBytesToSkip )
-                throw ( css::io::NotConnectedException,
-                        css::io::BufferSizeExceededException,
-                        css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
+            skipBytes ( sal_Int32 nBytesToSkip ) override;
 
             virtual sal_Int32 SAL_CALL
-            available ( )
-                throw ( css::io::NotConnectedException,
-                        css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
+            available ( ) override;
 
             virtual void SAL_CALL
-            closeInput ( )
-                throw ( css::io::NotConnectedException,
-                        css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
+            closeInput ( ) override;
 
 
             /** XSeekable
              */
 
             virtual void SAL_CALL
-            seek ( sal_Int64 location )
-                throw ( css::lang::IllegalArgumentException,
-                        css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
+            seek ( sal_Int64 location ) override;
 
 
             virtual sal_Int64 SAL_CALL
-            getPosition ( )
-                throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) override;
+            getPosition ( ) override;
 
 
             virtual sal_Int64 SAL_CALL
-            getLength ( )
-                throw ( css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
+            getLength ( ) override;
 
         private:
 
diff --git a/ucb/source/ucp/cmis/std_outputstream.cxx b/ucb/source/ucp/cmis/std_outputstream.cxx
index c26f0ef30885..1cd4ec13350c 100644
--- a/ucb/source/ucp/cmis/std_outputstream.cxx
+++ b/ucb/source/ucp/cmis/std_outputstream.cxx
@@ -29,7 +29,7 @@ namespace cmis
             m_pStream->setstate( ios::eofbit );
     }
 
-    uno::Any SAL_CALL StdOutputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception )
+    uno::Any SAL_CALL StdOutputStream::queryInterface( const uno::Type& rType )
     {
         uno::Any aRet = ::cppu::queryInterface( rType, ( static_cast< XOutputStream* >( this ) ) );
 
@@ -47,8 +47,6 @@ namespace cmis
     }
 
     void SAL_CALL StdOutputStream::writeBytes ( const uno::Sequence< sal_Int8 >& aData )
-        throw ( io::NotConnectedException, io::BufferSizeExceededException,
-                io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -67,8 +65,6 @@ namespace cmis
     }
 
     void SAL_CALL StdOutputStream::flush ( )
-        throw ( io::NotConnectedException, io::BufferSizeExceededException,
-                io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -87,8 +83,6 @@ namespace cmis
     }
 
     void SAL_CALL StdOutputStream::closeOutput ( )
-        throw ( io::NotConnectedException, io::BufferSizeExceededException,
-                io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/cmis/std_outputstream.hxx b/ucb/source/ucp/cmis/std_outputstream.hxx
index 1521bbd211db..574948c7a546 100644
--- a/ucb/source/ucp/cmis/std_outputstream.hxx
+++ b/ucb/source/ucp/cmis/std_outputstream.hxx
@@ -33,30 +33,17 @@ namespace cmis
 
             virtual ~StdOutputStream( ) override;
 
-            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-                throw ( css::uno::RuntimeException, std::exception ) override;
+            virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
 
             virtual void SAL_CALL acquire ( ) throw ( ) override;
 
             virtual void SAL_CALL release ( ) throw ( ) override;
 
-            virtual void SAL_CALL writeBytes ( const css::uno::Sequence< sal_Int8 >& aData )
-                throw ( css::io::NotConnectedException,
-                        css::io::BufferSizeExceededException,
-                        css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
-
-            virtual void SAL_CALL flush ( )
-                throw ( css::io::NotConnectedException,
-                        css::io::BufferSizeExceededException,
-                        css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
-
-            virtual void SAL_CALL closeOutput ( )
-                throw ( css::io::NotConnectedException,
-                        css::io::BufferSizeExceededException,
-                        css::io::IOException,
-                        css::uno::RuntimeException, std::exception ) override;
+            virtual void SAL_CALL writeBytes ( const css::uno::Sequence< sal_Int8 >& aData ) override;
+
+            virtual void SAL_CALL flush ( ) override;
+
+            virtual void SAL_CALL closeOutput ( ) override;
 
         private:
 
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 71ed084d30fa..9c6b4c2e4b0a 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -71,21 +71,16 @@ public:
         {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const & 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( OUString const & serviceName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XContentProvider
     virtual uno::Reference< ucb::XContent > SAL_CALL queryContent(
-        uno::Reference< ucb::XContentIdentifier > const & xIdentifier )
-        throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception) override;
+        uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) override;
     virtual sal_Int32 SAL_CALL compareContentIds(
         uno::Reference< ucb::XContentIdentifier > const & xId1,
-        uno::Reference< ucb::XContentIdentifier > const & xId2 )
-        throw (uno::RuntimeException, std::exception) override;
+        uno::Reference< ucb::XContentIdentifier > const & xId2 ) override;
 };
 
 
@@ -134,7 +129,6 @@ uno::Sequence< OUString > SAL_CALL supportedServices()
 // XServiceInfo
 
 OUString ExpandContentProviderImpl::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     check();
     return implName();
@@ -142,14 +136,12 @@ OUString ExpandContentProviderImpl::getImplementationName()
 
 
 uno::Sequence< OUString > ExpandContentProviderImpl::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     check();
     return supportedServices();
 }
 
 sal_Bool ExpandContentProviderImpl::supportsService(OUString const & serviceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, serviceName);
 }
@@ -178,7 +170,6 @@ OUString ExpandContentProviderImpl::expandUri(
 
 uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent(
     uno::Reference< ucb::XContentIdentifier > const & xIdentifier )
-    throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception)
 {
     check();
     OUString uri( expandUri( xIdentifier ) );
@@ -200,7 +191,6 @@ uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent(
 sal_Int32 ExpandContentProviderImpl::compareContentIds(
     uno::Reference< ucb::XContentIdentifier > const & xId1,
     uno::Reference< ucb::XContentIdentifier > const & xId2 )
-    throw (uno::RuntimeException, std::exception)
 {
     check();
     try
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index e7f52419935b..85a008dee62b 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -160,13 +160,13 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-    OUString SAL_CALL Content::getImplementationName() throw( RuntimeException, std::exception )
+    OUString SAL_CALL Content::getImplementationName()
     {
         return OUString(  "org.openoffice.comp.ucp.ext.Content"  );
     }
 
 
-    Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException, std::exception )
+    Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
     {
         Sequence< OUString > aServiceNames(2);
         aServiceNames[0] = "com.sun.star.ucb.Content";
@@ -175,7 +175,7 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-    OUString SAL_CALL Content::getContentType() throw( RuntimeException, std::exception )
+    OUString SAL_CALL Content::getContentType()
     {
         impl_determineContentType();
         return *m_aContentType;
@@ -183,7 +183,6 @@ namespace ucb { namespace ucp { namespace ext
 
 
     Any SAL_CALL Content::execute( const Command& aCommand, sal_Int32 /* CommandId */, const Reference< XCommandEnvironment >& i_rEvironment )
-        throw( Exception, CommandAbortedException, RuntimeException, std::exception )
     {
         Any aRet;
 
@@ -274,7 +273,7 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-    void SAL_CALL Content::abort( sal_Int32 ) throw( RuntimeException, std::exception )
+    void SAL_CALL Content::abort( sal_Int32 )
     {
     }
 
diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx
index c01a330e1f1b..89c8498d36d8 100644
--- a/ucb/source/ucp/ext/ucpext_content.hxx
+++ b/ucb/source/ucp/ext/ucpext_content.hxx
@@ -89,11 +89,11 @@ namespace ucb { namespace ucp { namespace ext
         virtual ~Content() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XContent
-        virtual OUString SAL_CALL getContentType() throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getContentType() override;
 
         // XCommandProcessor
         virtual css::uno::Any SAL_CALL
@@ -101,18 +101,12 @@ namespace ucb { namespace ucp { namespace ext
                     const css::ucb::Command& aCommand,
                     sal_Int32 CommandId,
                     const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment
-                )
-                throw   (   css::uno::Exception
-                        ,   css::ucb::CommandAbortedException
-                        ,   css::uno::RuntimeException, std::exception
-                        ) override;
+                ) override;
 
         virtual void SAL_CALL
                 abort(
                     sal_Int32 CommandId
-                )
-                throw   (   css::uno::RuntimeException, std::exception
-                        ) override;
+                ) override;
 
     private:
         virtual css::uno::Sequence< css::beans::Property > getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment >& i_rEnv ) override;
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index ca437c51b2b5..1f8f0eb4af5d 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -337,7 +337,7 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-    void DataSupplier::validate() throw( ResultSetException )
+    void DataSupplier::validate()
     {
     }
 
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
index b9a7fccb2d11..fe7effa5640f 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
@@ -65,7 +65,7 @@ namespace ucb { namespace ucp { namespace ext
 
         virtual void close() override;
 
-        virtual void validate() throw( css::ucb::ResultSetException ) override;
+        virtual void validate() override;
 
     private:
         std::unique_ptr< DataSupplier_Impl >    m_pImpl;
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index 6da0f7fb8f5b..0d955baebda7 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -54,19 +54,19 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-    OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException)
+    OUString SAL_CALL ContentProvider::getImplementationName_static()
     {
         return OUString(  "org.openoffice.comp.ucp.ext.ContentProvider"  );
     }
 
 
-    OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL ContentProvider::getImplementationName()
     {
         return getImplementationName_static();
     }
 
 
-    Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static(  )
     {
         Sequence< OUString > aServiceNames(2);
         aServiceNames[0] = "com.sun.star.ucb.ContentProvider";
@@ -75,7 +75,7 @@ namespace ucb { namespace ucp { namespace ext
     }
 
 
-    Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames(  )
     {
         return getSupportedServiceNames_static();
     }
@@ -112,7 +112,6 @@ namespace ucb { namespace ucp { namespace ext
 
 
     Reference< XContent > SAL_CALL ContentProvider::queryContent( const Reference< XContentIdentifier  >& i_rIdentifier )
-        throw( IllegalIdentifierException, RuntimeException, std::exception )
     {
         // Check URL scheme...
         const OUString sScheme( "vnd.sun.star.extension" );
diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx
index af8d00c4f5fc..e69f827b33aa 100644
--- a/ucb/source/ucp/ext/ucpext_provider.hxx
+++ b/ucb/source/ucp/ext/ucpext_provider.hxx
@@ -37,18 +37,18 @@ namespace ucb { namespace ucp { namespace ext
         virtual ~ContentProvider() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
         // XServiceInfo - static versions
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL getImplementationName_static(  ) throw (css::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_static(  );
         /// @throws css::uno::RuntimeException
-        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw (css::uno::RuntimeException);
+        static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
         static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& i_rContext );
 
         // XContentProvider
-        virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) throw (css::ucb::IllegalIdentifierException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
     public:
         static OUString getRootURL();
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index bafc57cab2d9..6f45334bc53f 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -153,7 +153,6 @@ BaseContent::release()
 
 Any SAL_CALL
 BaseContent::queryInterface( const Type& rType )
-    throw( RuntimeException, std::exception )
 {
     Any aRet = cppu::queryInterface( rType,
                                      (static_cast< lang::XComponent* >(this)),
@@ -175,7 +174,6 @@ BaseContent::queryInterface( const Type& rType )
 
 void SAL_CALL
 BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -189,7 +187,6 @@ BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener
 
 void SAL_CALL
 BaseContent::removeEventListener( const Reference< lang::XEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -200,7 +197,6 @@ BaseContent::removeEventListener( const Reference< lang::XEventListener >& Liste
 
 void SAL_CALL
 BaseContent::dispose()
-    throw( RuntimeException, std::exception )
 {
     lang::EventObject aEvt;
     comphelper::OInterfaceContainerHelper2* pDisposeEventListeners;
@@ -247,21 +243,18 @@ BaseContent::dispose()
 //  XServiceInfo
 OUString SAL_CALL
 BaseContent::getImplementationName()
-    throw( RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.ucb.FileContent");
 }
 
 sal_Bool SAL_CALL
 BaseContent::supportsService( const OUString& ServiceName )
-    throw( RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 Sequence< OUString > SAL_CALL
 BaseContent::getSupportedServiceNames()
-    throw( RuntimeException, std::exception )
 {
     Sequence<OUString> ret { "com.sun.star.ucb.FileContent" };
     return ret;
@@ -286,7 +279,6 @@ XTYPEPROVIDER_IMPL_10( BaseContent,
 
 sal_Int32 SAL_CALL
 BaseContent::createCommandIdentifier()
-    throw( RuntimeException, std::exception )
 {
     return m_pMyShell->getCommandId();
 }
@@ -294,7 +286,6 @@ BaseContent::createCommandIdentifier()
 
 void SAL_CALL
 BaseContent::abort( sal_Int32 CommandId )
-    throw( RuntimeException, std::exception )
 {
     m_pMyShell->abort( CommandId );
 }
@@ -304,9 +295,6 @@ Any SAL_CALL
 BaseContent::execute( const Command& aCommand,
                       sal_Int32 CommandId,
                       const Reference< XCommandEnvironment >& Environment )
-    throw( Exception,
-           CommandAbortedException,
-           RuntimeException, std::exception )
 {
     if( ! CommandId )
         // A Command with commandid zero cannot be aborted
@@ -423,7 +411,6 @@ void SAL_CALL
 BaseContent::addPropertiesChangeListener(
     const Sequence< OUString >& PropertyNames,
     const Reference< beans::XPropertiesChangeListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if( ! Listener.is() )
         return;
@@ -449,7 +436,6 @@ BaseContent::addPropertiesChangeListener(
 void SAL_CALL
 BaseContent::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames,
                                              const Reference< beans::XPropertiesChangeListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     if( ! Listener.is() )
         return;
@@ -471,7 +457,6 @@ BaseContent::removePropertiesChangeListener( const Sequence< OUString >& Propert
 
 Reference< ucb::XContentIdentifier > SAL_CALL
 BaseContent::getIdentifier()
-    throw( RuntimeException, std::exception )
 {
     return m_xContentIdentifier;
 }
@@ -479,7 +464,6 @@ BaseContent::getIdentifier()
 
 OUString SAL_CALL
 BaseContent::getContentType()
-    throw( RuntimeException, std::exception )
 {
     if( !( m_nState & Deleted ) )
     {
@@ -529,7 +513,6 @@ BaseContent::getContentType()
 void SAL_CALL
 BaseContent::addContentEventListener(
     const Reference< XContentEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -545,7 +528,6 @@ BaseContent::addContentEventListener(
 void SAL_CALL
 BaseContent::removeContentEventListener(
     const Reference< XContentEventListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -562,10 +544,6 @@ BaseContent::addProperty(
     const OUString& Name,
     sal_Int16 Attributes,
     const Any& DefaultValue )
-    throw( beans::PropertyExistException,
-           beans::IllegalTypeException,
-           lang::IllegalArgumentException,
-           RuntimeException, std::exception)
 {
     if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name.isEmpty() )
     {
@@ -578,9 +556,6 @@ BaseContent::addProperty(
 
 void SAL_CALL
 BaseContent::removeProperty( const OUString& Name )
-    throw( beans::UnknownPropertyException,
-           beans::NotRemoveableException,
-           RuntimeException, std::exception)
 {
 
     if( m_nState & Deleted )
@@ -595,7 +570,6 @@ BaseContent::removeProperty( const OUString& Name )
 
 Sequence< ContentInfo > SAL_CALL
 BaseContent::queryCreatableContentsInfo()
-    throw( RuntimeException, std::exception )
 {
     return m_pMyShell->queryCreatableContentsInfo();
 }
@@ -603,7 +577,6 @@ BaseContent::queryCreatableContentsInfo()
 
 Reference< XContent > SAL_CALL
 BaseContent::createNewContent( const ContentInfo& Info )
-    throw( RuntimeException, std::exception )
 {
     // Check type.
     if ( Info.Type.isEmpty() )
@@ -666,7 +639,6 @@ BaseContent::createNewContent( const ContentInfo& Info )
 void SAL_CALL
 BaseContent::addPropertySetInfoChangeListener(
     const Reference< beans::XPropertySetInfoChangeListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
     if( ! m_pPropertySetInfoChangeListeners )
@@ -679,7 +651,6 @@ BaseContent::addPropertySetInfoChangeListener(
 void SAL_CALL
 BaseContent::removePropertySetInfoChangeListener(
     const Reference< beans::XPropertySetInfoChangeListener >& Listener )
-    throw( RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -693,7 +664,6 @@ BaseContent::removePropertySetInfoChangeListener(
 
 Reference< XInterface > SAL_CALL
 BaseContent::getParent()
-    throw( RuntimeException, std::exception )
 {
     OUString ParentUnq = getParentName( m_aUncPath );
     OUString ParentUrl;
@@ -720,8 +690,6 @@ BaseContent::getParent()
 void SAL_CALL
 BaseContent::setParent(
     const Reference< XInterface >& )
-    throw( lang::NoSupportException,
-           RuntimeException, std::exception)
 {
     throw lang::NoSupportException( THROW_WHERE );
 }
@@ -732,7 +700,6 @@ BaseContent::setParent(
 
 Reference< XCommandInfo > SAL_CALL
 BaseContent::getCommandInfo()
-    throw( RuntimeException )
 {
     if( m_nState & Deleted )
         return Reference< XCommandInfo >();
@@ -744,7 +711,6 @@ BaseContent::getCommandInfo()
 Reference< beans::XPropertySetInfo > SAL_CALL
 BaseContent::getPropertySetInfo(
     sal_Int32 )
-    throw( RuntimeException )
 {
     if( m_nState & Deleted )
         return Reference< beans::XPropertySetInfo >();
@@ -756,7 +722,6 @@ Reference< sdbc::XRow > SAL_CALL
 BaseContent::getPropertyValues(
     sal_Int32 nMyCommandIdentifier,
     const Sequence< beans::Property >& PropertySet )
-    throw( RuntimeException, std::exception )
 {
     sal_Int32 nProps = PropertySet.getLength();
     if ( !nProps )
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 75ebdbd0cd9b..e6d82ad6f393 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -88,8 +88,7 @@ namespace fileaccess {
 
         // XInterface
         virtual css::uno::Any SAL_CALL
-        queryInterface( const css::uno::Type& aType )
-            throw( css::uno::RuntimeException, std::exception) override;
+        queryInterface( const css::uno::Type& aType ) override;
 
         virtual void SAL_CALL
         acquire()
@@ -102,91 +101,72 @@ namespace fileaccess {
 
         // XComponent
         virtual void SAL_CALL
-        dispose()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        dispose() override;
 
         virtual void SAL_CALL
         addEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
         virtual void SAL_CALL
-        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 
         // XTypeProvider
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-            throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
 
         // XServiceInfo
         virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception) override;
+        getImplementationName() override;
 
         virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception) override;
+        supportsService( const OUString& ServiceName ) override;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 
         // XCommandProcessor
         virtual sal_Int32 SAL_CALL
-        createCommandIdentifier()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        createCommandIdentifier() override;
 
         virtual css::uno::Any SAL_CALL
         execute(
             const css::ucb::Command& aCommand,
             sal_Int32 CommandId,
-            const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-            throw( css::uno::Exception,
-                   css::ucb::CommandAbortedException,
-                   css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
 
         virtual void SAL_CALL
-        abort( sal_Int32 CommandId )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        abort( sal_Int32 CommandId ) override;
 
 
         // XContent
         virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-        getIdentifier()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getIdentifier() override;
 
         virtual OUString SAL_CALL
-        getContentType()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getContentType() override;
 
         virtual void SAL_CALL
         addContentEventListener(
-            const css::uno::Reference< css::ucb::XContentEventListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override;
 
         virtual void SAL_CALL
         removeContentEventListener(
-            const css::uno::Reference< css::ucb::XContentEventListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override;
 
         // XPropertiesChangeNotifier
 
         virtual void SAL_CALL
         addPropertiesChangeListener(
             const css::uno::Sequence< OUString >& PropertyNames,
-            const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override;
 
         virtual void SAL_CALL
         removePropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames,
-                                        const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+                                        const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override;
 
         // XPropertyContainer
 
@@ -194,51 +174,38 @@ namespace fileaccess {
         addProperty(
             const OUString& Name,
             sal_Int16 Attributes,
-            const css::uno::Any& DefaultValue )
-            throw( css::beans::PropertyExistException,
-                   css::beans::IllegalTypeException,
-                   css::lang::IllegalArgumentException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& DefaultValue ) override;
 
         virtual void SAL_CALL
-        removeProperty( const OUString& Name )
-            throw( css::beans::UnknownPropertyException,
-                   css::beans::NotRemoveableException,
-                   css::uno::RuntimeException, std::exception ) override;
+        removeProperty( const OUString& Name ) override;
 
         // XPropertySetInfoChangeNotifier
 
         virtual void SAL_CALL
         addPropertySetInfoChangeListener(
-            const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
 
         virtual void SAL_CALL
         removePropertySetInfoChangeListener(
-            const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override;
 
 
         // XContentCreator
 
         virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL
-        queryCreatableContentsInfo()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryCreatableContentsInfo() override;
 
         virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-        createNewContent( const css::ucb::ContentInfo& Info )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        createNewContent( const css::ucb::ContentInfo& Info ) override;
 
 
         // XChild
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-        getParent() throw( css::uno::RuntimeException, std::exception ) override;
+        getParent() override;
 
         // Not supported
         virtual void SAL_CALL
-        setParent( const css::uno::Reference< css::uno::XInterface >& Parent )
-            throw( css::lang::NoSupportException,
-                   css::uno::RuntimeException, std::exception) override;
+        setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
 
         // Notifier
@@ -274,21 +241,18 @@ namespace fileaccess {
         // Private Methods
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::ucb::XCommandInfo > SAL_CALL
-        getCommandInfo()
-            throw( css::uno::RuntimeException );
+        getCommandInfo();
 
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
         getPropertySetInfo(
-            sal_Int32 nMyCommandIdentifier )
-            throw( css::uno::RuntimeException );
+            sal_Int32 nMyCommandIdentifier );
 
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::sdbc::XRow > SAL_CALL
         getPropertyValues(
             sal_Int32 nMyCommandIdentifier,
-            const css::uno::Sequence< css::beans::Property >& PropertySet )
-            throw( css::uno::RuntimeException, std::exception );
+            const css::uno::Sequence< css::beans::Property >& PropertySet );
 
         css::uno::Sequence< css::uno::Any > SAL_CALL
         setPropertyValues(
diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx
index daa4e7415918..72c67f1557c7 100644
--- a/ucb/source/ucp/file/filcmd.cxx
+++ b/ucb/source/ucp/file/filcmd.cxx
@@ -59,7 +59,6 @@ XCommandInfo_impl::release()
 
 uno::Any SAL_CALL
 XCommandInfo_impl::queryInterface( const uno::Type& rType )
-  throw( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                                           (static_cast< XCommandInfo* >(this)) );
@@ -69,7 +68,6 @@ XCommandInfo_impl::queryInterface( const uno::Type& rType )
 
 uno::Sequence< CommandInfo > SAL_CALL
 XCommandInfo_impl::getCommands()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_pMyShell->m_sCommandInfo;
 }
@@ -78,8 +76,6 @@ XCommandInfo_impl::getCommands()
 CommandInfo SAL_CALL
 XCommandInfo_impl::getCommandInfoByName(
     const OUString& aName )
-    throw( UnsupportedCommandException,
-           uno::RuntimeException, std::exception)
 {
     for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); i++ )
         if( m_pMyShell->m_sCommandInfo[i].Name == aName )
@@ -92,8 +88,6 @@ XCommandInfo_impl::getCommandInfoByName(
 CommandInfo SAL_CALL
 XCommandInfo_impl::getCommandInfoByHandle(
     sal_Int32 Handle )
-    throw( UnsupportedCommandException,
-           uno::RuntimeException, std::exception )
 {
     for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i )
         if( m_pMyShell->m_sCommandInfo[i].Handle == Handle )
@@ -106,7 +100,6 @@ XCommandInfo_impl::getCommandInfoByHandle(
 sal_Bool SAL_CALL
 XCommandInfo_impl::hasCommandByName(
     const OUString& aName )
-    throw( uno::RuntimeException, std::exception )
 {
     for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i )
         if( m_pMyShell->m_sCommandInfo[i].Name == aName )
@@ -119,7 +112,6 @@ XCommandInfo_impl::hasCommandByName(
 sal_Bool SAL_CALL
 XCommandInfo_impl::hasCommandByHandle(
     sal_Int32 Handle )
-    throw( uno::RuntimeException, std::exception )
 {
     for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i )
         if( m_pMyShell->m_sCommandInfo[i].Handle == Handle )
diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx
index c9b686c49408..a42bc2422730 100644
--- a/ucb/source/ucp/file/filcmd.hxx
+++ b/ucb/source/ucp/file/filcmd.hxx
@@ -45,8 +45,7 @@ namespace fileaccess {
 
         // XInterface
         virtual css::uno::Any SAL_CALL
-        queryInterface( const css::uno::Type& aType )
-            throw( css::uno::RuntimeException, std::exception) override;
+        queryInterface( const css::uno::Type& aType ) override;
 
         virtual void SAL_CALL
         acquire()
@@ -59,26 +58,19 @@ namespace fileaccess {
         // XCommandInfo
 
         virtual css::uno::Sequence< css::ucb::CommandInfo > SAL_CALL
-        getCommands()
-            throw( css::uno::RuntimeException, std::exception) override;
+        getCommands() override;
 
         virtual css::ucb::CommandInfo SAL_CALL
-        getCommandInfoByName( const OUString& Name )
-            throw( css::ucb::UnsupportedCommandException,
-                   css::uno::RuntimeException, std::exception) override;
+        getCommandInfoByName( const OUString& Name ) override;
 
         virtual css::ucb::CommandInfo SAL_CALL
-        getCommandInfoByHandle( sal_Int32 Handle )
-            throw( css::ucb::UnsupportedCommandException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getCommandInfoByHandle( sal_Int32 Handle ) override;
 
         virtual sal_Bool SAL_CALL
-        hasCommandByName( const OUString& Name )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        hasCommandByName( const OUString& Name ) override;
 
         virtual sal_Bool SAL_CALL
-        hasCommandByHandle( sal_Int32 Handle )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        hasCommandByHandle( sal_Int32 Handle ) override;
 
 
     private:
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 5ef3565c8988..220d19fbd1f2 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -68,7 +68,6 @@ FileContentIdentifier::release()
 
 uno::Any SAL_CALL
 FileContentIdentifier::queryInterface( const uno::Type& rType )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                                           (static_cast< lang::XTypeProvider* >(this)),
@@ -79,7 +78,6 @@ FileContentIdentifier::queryInterface( const uno::Type& rType )
 
 uno::Sequence< sal_Int8 > SAL_CALL
 FileContentIdentifier::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -87,7 +85,6 @@ FileContentIdentifier::getImplementationId()
 
 uno::Sequence< uno::Type > SAL_CALL
 FileContentIdentifier::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
     if ( !pCollection ) {
@@ -107,7 +104,6 @@ FileContentIdentifier::getTypes()
 OUString
 SAL_CALL
 FileContentIdentifier::getContentIdentifier()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_aContentId;
 }
@@ -115,7 +111,6 @@ FileContentIdentifier::getContentIdentifier()
 
 OUString SAL_CALL
 FileContentIdentifier::getContentProviderScheme()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_aProviderScheme;
 }
diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index be04b008670c..428d4b4d91cc 100644
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.hxx
@@ -43,8 +43,7 @@ namespace fileaccess {
 
         // XInterface
         virtual css::uno::Any SAL_CALL
-        queryInterface( const css::uno::Type& aType )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryInterface( const css::uno::Type& aType ) override;
 
         virtual void SAL_CALL
         acquire()
@@ -56,21 +55,17 @@ namespace fileaccess {
 
         // XTypeProvider
         virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-        getTypes()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getTypes() override;
 
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getImplementationId()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationId() override;
 
         // XContentIdentifier
         virtual OUString SAL_CALL
-        getContentIdentifier()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getContentIdentifier() override;
 
         virtual OUString SAL_CALL
-        getContentProviderScheme()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getContentProviderScheme() override;
 
     private:
         OUString m_aContentId;              // The URL string
diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index 9b6d560e8c01..afbc02c950eb 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -83,7 +83,6 @@ XTYPEPROVIDER_IMPL_3( XInputStream_impl,
 
 uno::Any SAL_CALL
 XInputStream_impl::queryInterface( const uno::Type& rType )
-    throw( uno::RuntimeException, std::exception)
 {
     uno::Any aRet = cppu::queryInterface( rType,
                                           (static_cast< io::XInputStream* >(this)),
@@ -113,10 +112,6 @@ sal_Int32 SAL_CALL
 XInputStream_impl::readBytes(
                  uno::Sequence< sal_Int8 >& aData,
                  sal_Int32 nBytesToRead )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     if( ! m_nIsOpen ) throw io::IOException( THROW_WHERE );
 
@@ -141,10 +136,6 @@ sal_Int32 SAL_CALL
 XInputStream_impl::readSomeBytes(
     uno::Sequence< sal_Int8 >& aData,
     sal_Int32 nMaxBytesToRead )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     return readBytes( aData,nMaxBytesToRead );
 }
@@ -152,10 +143,6 @@ XInputStream_impl::readSomeBytes(
 
 void SAL_CALL
 XInputStream_impl::skipBytes( sal_Int32 nBytesToSkip )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) );
 }
@@ -163,9 +150,6 @@ XInputStream_impl::skipBytes( sal_Int32 nBytesToSkip )
 
 sal_Int32 SAL_CALL
 XInputStream_impl::available()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     return 0;
 }
@@ -173,9 +157,6 @@ XInputStream_impl::available()
 
 void SAL_CALL
 XInputStream_impl::closeInput()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if( m_nIsOpen )
     {
@@ -189,9 +170,6 @@ XInputStream_impl::closeInput()
 
 void SAL_CALL
 XInputStream_impl::seek( sal_Int64 location )
-    throw( lang::IllegalArgumentException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if( location < 0 )
         throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 );
@@ -202,8 +180,6 @@ XInputStream_impl::seek( sal_Int64 location )
 
 sal_Int64 SAL_CALL
 XInputStream_impl::getPosition()
-    throw( io::IOException,
-           uno::RuntimeException, std::exception )
 {
     sal_uInt64 uPos;
     if( osl::FileBase::E_None != m_aFile.getPos( uPos ) )
@@ -213,8 +189,6 @@ XInputStream_impl::getPosition()
 
 sal_Int64 SAL_CALL
 XInputStream_impl::getLength()
-    throw( io::IOException,
-           uno::RuntimeException, std::exception )
 {
     sal_uInt64 uEndPos;
     if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None )
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 8dc6c28db4e6..4e2c622e82b9 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -56,14 +56,11 @@ namespace fileaccess {
 
         // XTypeProvider
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-            throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
         virtual css::uno::Any SAL_CALL
-        queryInterface( const css::uno::Type& rType )
-            throw( css::uno::RuntimeException, std::exception) override;
+        queryInterface( const css::uno::Type& rType ) override;
 
         virtual void SAL_CALL
         acquire()
@@ -76,55 +73,30 @@ namespace fileaccess {
         virtual sal_Int32 SAL_CALL
         readBytes(
             css::uno::Sequence< sal_Int8 >& aData,
-            sal_Int32 nBytesToRead )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nBytesToRead ) override;
 
         virtual sal_Int32 SAL_CALL
         readSomeBytes(
             css::uno::Sequence< sal_Int8 >& aData,
-            sal_Int32 nMaxBytesToRead )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nMaxBytesToRead ) override;
 
         virtual void SAL_CALL
-        skipBytes( sal_Int32 nBytesToSkip )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        skipBytes( sal_Int32 nBytesToSkip ) override;
 
         virtual sal_Int32 SAL_CALL
-        available()
-            throw( css::io::NotConnectedException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        available() override;
 
         virtual void SAL_CALL
-        closeInput()
-            throw( css::io::NotConnectedException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        closeInput() override;
 
         virtual void SAL_CALL
-        seek( sal_Int64 location )
-            throw( css::lang::IllegalArgumentException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        seek( sal_Int64 location ) override;
 
         virtual sal_Int64 SAL_CALL
-        getPosition()
-            throw( css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getPosition() override;
 
         virtual sal_Int64 SAL_CALL
-        getLength()
-            throw( css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getLength() override;
 
     private:
 
diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx
index 549f008daaa0..93c526f3571d 100644
--- a/ucb/source/ucp/file/filinsreq.hxx
+++ b/ucb/source/ucp/file/filinsreq.hxx
@@ -45,14 +45,12 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
         {
         }
 
-        virtual void SAL_CALL select()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL select() override
         {
             m_bSelected = true;
         }
 
-        void SAL_CALL setName(const OUString& Name)
-            throw(css::uno::RuntimeException, std::exception) override
+        void SAL_CALL setName(const OUString& Name) override
         {
             m_aNewName = Name;
         }
@@ -84,8 +82,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
         {
         }
 
-        virtual void SAL_CALL select()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL select() override
         {
             m_bSelected = true;
         }
diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx
index be7fbecfeb64..179eb487098a 100644
--- a/ucb/source/ucp/file/filprp.cxx
+++ b/ucb/source/ucp/file/filprp.cxx
@@ -76,8 +76,6 @@ XPropertySetInfo_impl::~XPropertySetInfo_impl()
 
 beans::Property SAL_CALL
 XPropertySetInfo_impl::getPropertyByName( const OUString& aName )
-  throw( beans::UnknownPropertyException,
-     RuntimeException, std::exception)
 {
   for( sal_Int32 i = 0; i < m_seq.getLength(); ++i )
     if( m_seq[i].Name == aName ) return m_seq[i];
@@ -88,7 +86,6 @@ XPropertySetInfo_impl::getPropertyByName( const OUString& aName )
 
 Sequence< beans::Property > SAL_CALL
 XPropertySetInfo_impl::getProperties()
-  throw( RuntimeException, std::exception )
 {
   return m_seq;
 }
@@ -96,7 +93,6 @@ XPropertySetInfo_impl::getProperties()
 
 sal_Bool SAL_CALL
 XPropertySetInfo_impl::hasPropertyByName( const OUString& aName )
-  throw( RuntimeException, std::exception )
 {
   for( sal_Int32 i = 0; i < m_seq.getLength(); ++i )
     if( m_seq[i].Name == aName ) return true;
diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx
index 0a9208d4ab3a..1be9af995c7d 100644
--- a/ucb/source/ucp/file/filprp.hxx
+++ b/ucb/source/ucp/file/filprp.hxx
@@ -38,17 +38,13 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper<
         virtual ~XPropertySetInfo_impl() override;
 
         virtual css::uno::Sequence< css::beans::Property > SAL_CALL
-        getProperties()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getProperties() override;
 
         virtual css::beans::Property SAL_CALL
-        getPropertyByName( const OUString& aName )
-            throw( css::beans::UnknownPropertyException,
-                   css::uno::RuntimeException, std::exception) override;
+        getPropertyByName( const OUString& aName ) override;
 
         virtual sal_Bool SAL_CALL
-        hasPropertyByName( const OUString& Name )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        hasPropertyByName( const OUString& Name ) override;
 
     private:
         TaskManager*                                               m_pMyShell;
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index e79555f1043c..47fa98e8f278 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -90,8 +90,6 @@ XRow_impl::~XRow_impl()
 
 sal_Bool SAL_CALL
 XRow_impl::wasNull()
-  throw( sdbc::SQLException,
-     uno::RuntimeException, std::exception)
 {
   return m_nWasNull;
 }
@@ -100,8 +98,6 @@ XRow_impl::wasNull()
 OUString SAL_CALL
 XRow_impl::getString(
              sal_Int32 columnIndex )
-  throw( sdbc::SQLException,
-     uno::RuntimeException, std::exception)
 {
   if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
     throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -114,8 +110,6 @@ XRow_impl::getString(
 sal_Bool SAL_CALL
 XRow_impl::getBoolean(
     sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -129,8 +123,6 @@ XRow_impl::getBoolean(
 sal_Int8 SAL_CALL
 XRow_impl::getByte(
     sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -143,8 +135,6 @@ XRow_impl::getByte(
 sal_Int16 SAL_CALL
 XRow_impl::getShort(
     sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -158,8 +148,6 @@ XRow_impl::getShort(
 sal_Int32 SAL_CALL
 XRow_impl::getInt(
           sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -172,8 +160,6 @@ XRow_impl::getInt(
 sal_Int64 SAL_CALL
 XRow_impl::getLong(
            sal_Int32 columnIndex )
-  throw( sdbc::SQLException,
-     uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -186,8 +172,6 @@ XRow_impl::getLong(
 float SAL_CALL
 XRow_impl::getFloat(
     sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -200,8 +184,6 @@ XRow_impl::getFloat(
 double SAL_CALL
 XRow_impl::getDouble(
     sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -214,8 +196,6 @@ XRow_impl::getDouble(
 uno::Sequence< sal_Int8 > SAL_CALL
 XRow_impl::getBytes(
     sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -228,8 +208,6 @@ XRow_impl::getBytes(
 util::Date SAL_CALL
 XRow_impl::getDate(
     sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -242,8 +220,6 @@ XRow_impl::getDate(
 util::Time SAL_CALL
 XRow_impl::getTime(
     sal_Int32 columnIndex )
-  throw( sdbc::SQLException,
-         uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -256,8 +232,6 @@ XRow_impl::getTime(
 util::DateTime SAL_CALL
 XRow_impl::getTimestamp(
             sal_Int32 columnIndex )
-  throw( sdbc::SQLException,
-     uno::RuntimeException, std::exception)
 {
   if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
     throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -271,8 +245,6 @@ XRow_impl::getTimestamp(
 uno::Reference< io::XInputStream > SAL_CALL
 XRow_impl::getBinaryStream(
                sal_Int32 columnIndex )
-  throw( sdbc::SQLException,
-     uno::RuntimeException, std::exception)
 {
   if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
     throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -286,8 +258,6 @@ XRow_impl::getBinaryStream(
 uno::Reference< io::XInputStream > SAL_CALL
 XRow_impl::getCharacterStream(
                   sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
   if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
       throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -302,8 +272,6 @@ uno::Any SAL_CALL
 XRow_impl::getObject(
     sal_Int32 columnIndex,
     const uno::Reference< container::XNameAccess >& )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -316,8 +284,6 @@ XRow_impl::getObject(
 uno::Reference< sdbc::XRef > SAL_CALL
 XRow_impl::getRef(
     sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -333,8 +299,6 @@ XRow_impl::getRef(
 uno::Reference< sdbc::XBlob > SAL_CALL
 XRow_impl::getBlob(
            sal_Int32 columnIndex )
-  throw( sdbc::SQLException,
-     uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -350,8 +314,6 @@ XRow_impl::getBlob(
 uno::Reference< sdbc::XClob > SAL_CALL
 XRow_impl::getClob(
            sal_Int32 columnIndex )
-  throw( sdbc::SQLException,
-     uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -368,8 +330,6 @@ XRow_impl::getClob(
 uno::Reference< sdbc::XArray > SAL_CALL
 XRow_impl::getArray(
     sal_Int32 columnIndex )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index 866627509d4b..589a5ad49f45 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
@@ -36,108 +36,67 @@ namespace fileaccess {
         virtual ~XRow_impl() override;
 
         virtual sal_Bool SAL_CALL
-        wasNull()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override;
+        wasNull() override;
 
         virtual OUString SAL_CALL
-        getString( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getString( sal_Int32 columnIndex ) override;
 
         virtual sal_Bool SAL_CALL
-        getBoolean( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getBoolean( sal_Int32 columnIndex ) override;
 
         virtual sal_Int8 SAL_CALL
-        getByte( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getByte( sal_Int32 columnIndex ) override;
 
         virtual sal_Int16 SAL_CALL
-        getShort( sal_Int32 columnIndex )
-            throw(
-                css::sdbc::SQLException,
-                css::uno::RuntimeException, std::exception ) override;
+        getShort( sal_Int32 columnIndex ) override;
 
         virtual sal_Int32 SAL_CALL
-        getInt( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getInt( sal_Int32 columnIndex ) override;
 
         virtual sal_Int64 SAL_CALL
-        getLong( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getLong( sal_Int32 columnIndex ) override;
 
         virtual float SAL_CALL
-        getFloat( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getFloat( sal_Int32 columnIndex ) override;
 
         virtual double SAL_CALL
         getDouble(
-            sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+            sal_Int32 columnIndex ) override;
 
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getBytes( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getBytes( sal_Int32 columnIndex ) override;
 
         virtual css::util::Date SAL_CALL
-        getDate( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getDate( sal_Int32 columnIndex ) override;
 
         virtual css::util::Time SAL_CALL
-        getTime( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getTime( sal_Int32 columnIndex ) override;
 
         virtual css::util::DateTime SAL_CALL
-        getTimestamp( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getTimestamp( sal_Int32 columnIndex ) override;
 
         virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-        getBinaryStream( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getBinaryStream( sal_Int32 columnIndex ) override;
 
         virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-        getCharacterStream( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getCharacterStream( sal_Int32 columnIndex ) override;
 
         virtual css::uno::Any SAL_CALL
         getObject(
             sal_Int32 columnIndex,
-            const css::uno::Reference< css::container::XNameAccess >& typeMap )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::container::XNameAccess >& typeMap ) override;
 
         virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
-        getRef( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getRef( sal_Int32 columnIndex ) override;
 
         virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
-        getBlob( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getBlob( sal_Int32 columnIndex ) override;
 
         virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
-        getClob( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getClob( sal_Int32 columnIndex ) override;
 
         virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
-        getArray( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getArray( sal_Int32 columnIndex ) override;
 
     private:
         osl::Mutex                                         m_aMutex;
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index f677e8588b78..6d9f19b35f60 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -92,7 +92,6 @@ XResultSet_impl::~XResultSet_impl()
 
 void SAL_CALL
 XResultSet_impl::disposing( const lang::EventObject& )
-    throw( uno::RuntimeException, std::exception )
 {
     // To do, but what
 }
@@ -101,7 +100,6 @@ XResultSet_impl::disposing( const lang::EventObject& )
 void SAL_CALL
 XResultSet_impl::addEventListener(
     const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -116,7 +114,6 @@ XResultSet_impl::addEventListener(
 void SAL_CALL
 XResultSet_impl::removeEventListener(
     const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -127,7 +124,6 @@ XResultSet_impl::removeEventListener(
 
 void SAL_CALL
 XResultSet_impl::dispose()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -205,9 +201,6 @@ void XResultSet_impl::isFinalChanged()
 
 bool SAL_CALL
 XResultSet_impl::OneMore()
-    throw( sdbc::SQLException,
-           uno::RuntimeException,
-           std::exception )
 {
     if( ! m_nIsOpen )
         return false;
@@ -283,8 +276,6 @@ XResultSet_impl::OneMore()
 
 sal_Bool SAL_CALL
 XResultSet_impl::next()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     bool test;
     if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) test = true;
@@ -296,8 +287,6 @@ XResultSet_impl::next()
 
 sal_Bool SAL_CALL
 XResultSet_impl::isBeforeFirst()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return m_nRow == -1;
 }
@@ -305,8 +294,6 @@ XResultSet_impl::isBeforeFirst()
 
 sal_Bool SAL_CALL
 XResultSet_impl::isAfterLast()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size());   // Cannot happen, if m_aFolder.isOpen()
 }
@@ -314,8 +301,6 @@ XResultSet_impl::isAfterLast()
 
 sal_Bool SAL_CALL
 XResultSet_impl::isFirst()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return m_nRow == 0;
 }
@@ -323,8 +308,6 @@ XResultSet_impl::isFirst()
 
 sal_Bool SAL_CALL
 XResultSet_impl::isLast()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( m_nRow ==  sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1 )
         return ! OneMore();
@@ -335,8 +318,6 @@ XResultSet_impl::isLast()
 
 void SAL_CALL
 XResultSet_impl::beforeFirst()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     m_nRow = -1;
 }
@@ -344,8 +325,6 @@ XResultSet_impl::beforeFirst()
 
 void SAL_CALL
 XResultSet_impl::afterLast()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size());
     while( OneMore() )
@@ -355,8 +334,6 @@ XResultSet_impl::afterLast()
 
 sal_Bool SAL_CALL
 XResultSet_impl::first()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     m_nRow = -1;
     return next();
@@ -365,8 +342,6 @@ XResultSet_impl::first()
 
 sal_Bool SAL_CALL
 XResultSet_impl::last()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1;
     while( OneMore() )
@@ -377,8 +352,6 @@ XResultSet_impl::last()
 
 sal_Int32 SAL_CALL
 XResultSet_impl::getRow()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     // Test, whether behind last row
     if( -1 == m_nRow || m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -389,7 +362,6 @@ XResultSet_impl::getRow()
 
 
 sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception)
 {
     if( row >= 0 )
     {
@@ -412,8 +384,6 @@ sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row )
 
 sal_Bool SAL_CALL
 XResultSet_impl::relative( sal_Int32 row )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( isAfterLast() || isBeforeFirst() )
         throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
@@ -428,8 +398,6 @@ XResultSet_impl::relative( sal_Int32 row )
 
 sal_Bool SAL_CALL
 XResultSet_impl::previous()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( m_nRow > sal::static_int_cast<sal_Int32>(m_aItems.size()) )
         m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size());  // Correct Handling of afterLast
@@ -441,8 +409,6 @@ XResultSet_impl::previous()
 
 void SAL_CALL
 XResultSet_impl::refreshRow()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     // get the row from the filesystem
     return;
@@ -451,24 +417,18 @@ XResultSet_impl::refreshRow()
 
 sal_Bool SAL_CALL
 XResultSet_impl::rowUpdated()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return false;
 }
 
 sal_Bool SAL_CALL
 XResultSet_impl::rowInserted()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return false;
 }
 
 sal_Bool SAL_CALL
 XResultSet_impl::rowDeleted()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return false;
 }
@@ -476,8 +436,6 @@ XResultSet_impl::rowDeleted()
 
 uno::Reference< uno::XInterface > SAL_CALL
 XResultSet_impl::getStatement()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return uno::Reference< uno::XInterface >();
 }
@@ -487,8 +445,6 @@ XResultSet_impl::getStatement()
 
 void SAL_CALL
 XResultSet_impl::close()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( m_nIsOpen )
     {
@@ -502,7 +458,6 @@ XResultSet_impl::close()
 
 OUString SAL_CALL
 XResultSet_impl::queryContentIdentifierString()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Reference< ucb::XContentIdentifier > xContentId
         = queryContentIdentifier();
@@ -516,7 +471,6 @@ XResultSet_impl::queryContentIdentifierString()
 
 uno::Reference< ucb::XContentIdentifier > SAL_CALL
 XResultSet_impl::queryContentIdentifier()
-    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
     {
@@ -532,7 +486,6 @@ XResultSet_impl::queryContentIdentifier()
 
 uno::Reference< ucb::XContent > SAL_CALL
 XResultSet_impl::queryContent()
-    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
         return m_pMyShell->m_pProvider->queryContent( queryContentIdentifier() );
@@ -547,8 +500,6 @@ XResultSet_impl::queryContent()
 // virtual
 uno::Reference< sdbc::XResultSet > SAL_CALL
 XResultSet_impl::getStaticResultSet()
-    throw( ucb::ListenerAlreadySetException,
-           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -563,8 +514,6 @@ XResultSet_impl::getStaticResultSet()
 void SAL_CALL
 XResultSet_impl::setListener(
     const uno::Reference< ucb::XDynamicResultSetListener >& Listener )
-    throw( ucb::ListenerAlreadySetException,
-           uno::RuntimeException, std::exception )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -603,10 +552,6 @@ XResultSet_impl::setListener(
 void SAL_CALL
 XResultSet_impl::connectToCache(
     const uno::Reference< ucb::XDynamicResultSet > & xCache )
-    throw( ucb::ListenerAlreadySetException,
-           ucb::AlreadyInitializedException,
-           ucb::ServiceNotFoundException,
-           uno::RuntimeException, std::exception )
 {
     if( m_xListener.is() )
         throw ucb::ListenerAlreadySetException( THROW_WHERE );
@@ -640,7 +585,6 @@ XResultSet_impl::connectToCache(
 // virtual
 sal_Int16 SAL_CALL
 XResultSet_impl::getCapabilities()
-  throw( uno::RuntimeException, std::exception )
 {
     // Never set ucb::ContentResultSetCapability::SORTED
     //  - Underlying content cannot provide sorted data...
@@ -650,8 +594,6 @@ XResultSet_impl::getCapabilities()
 // XResultSetMetaDataSupplier
 uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
 XResultSet_impl::getMetaData()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     for ( sal_Int32 n = 0; n < m_sProperty.getLength(); ++n )
     {
@@ -682,7 +624,6 @@ XResultSet_impl::getMetaData()
 // XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 XResultSet_impl::getPropertySetInfo()
-    throw( uno::RuntimeException, std::exception)
 {
 
     uno::Sequence< beans::Property > seq(2);
@@ -704,11 +645,6 @@ XResultSet_impl::getPropertySetInfo()
 
 void SAL_CALL XResultSet_impl::setPropertyValue(
     const OUString& aPropertyName, const uno::Any& )
-    throw( beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" ||
         aPropertyName == "RowCount" )
@@ -719,9 +655,6 @@ void SAL_CALL XResultSet_impl::setPropertyValue(
 
 uno::Any SAL_CALL XResultSet_impl::getPropertyValue(
     const OUString& PropertyName )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( PropertyName == "IsRowCountFinal" )
     {
@@ -740,9 +673,6 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue(
 void SAL_CALL XResultSet_impl::addPropertyChangeListener(
     const OUString& aPropertyName,
     const uno::Reference< beans::XPropertyChangeListener >& xListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" )
     {
@@ -769,9 +699,6 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener(
 void SAL_CALL XResultSet_impl::removePropertyChangeListener(
     const OUString& aPropertyName,
     const uno::Reference< beans::XPropertyChangeListener >& aListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" &&
         m_pIsFinalListeners )
@@ -793,9 +720,6 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener(
 void SAL_CALL XResultSet_impl::addVetoableChangeListener(
     const OUString&,
     const uno::Reference< beans::XVetoableChangeListener >& )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
 }
 
@@ -803,9 +727,6 @@ void SAL_CALL XResultSet_impl::addVetoableChangeListener(
 void SAL_CALL XResultSet_impl::removeVetoableChangeListener(
     const OUString&,
     const uno::Reference< beans::XVetoableChangeListener >& )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
 }
 
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index e4dea03b1313..3c2769ac2ecb 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -91,29 +91,23 @@ class XResultSet_impl : public Notifier,
 
         // XEventListener
         virtual void SAL_CALL
-        disposing( const css::lang::EventObject& Source )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        disposing( const css::lang::EventObject& Source ) override;
 
         // XComponent
         virtual void SAL_CALL
-        dispose()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        dispose() override;
 
         virtual void SAL_CALL
         addEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
         virtual void SAL_CALL
-        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 
         // XRow
         virtual sal_Bool SAL_CALL
-        wasNull()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        wasNull() override
         {
             if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 m_nWasNull = m_aItems[m_nRow]->wasNull();
@@ -123,9 +117,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual OUString SAL_CALL
-        getString( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getString( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getString( columnIndex );
@@ -134,9 +126,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual sal_Bool SAL_CALL
-        getBoolean( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getBoolean( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBoolean( columnIndex );
@@ -145,9 +135,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual sal_Int8 SAL_CALL
-        getByte( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getByte( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getByte( columnIndex );
@@ -156,10 +144,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual sal_Int16 SAL_CALL
-        getShort( sal_Int32 columnIndex )
-            throw(
-                css::sdbc::SQLException,
-                css::uno::RuntimeException, std::exception) override
+        getShort( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getShort( columnIndex );
@@ -168,9 +153,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual sal_Int32 SAL_CALL
-        getInt( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getInt( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getInt( columnIndex );
@@ -179,9 +162,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual sal_Int64 SAL_CALL
-        getLong( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getLong( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getLong( columnIndex );
@@ -190,9 +171,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual float SAL_CALL
-        getFloat( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getFloat( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getFloat( columnIndex );
@@ -201,9 +180,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual double SAL_CALL
-        getDouble( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getDouble( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getDouble( columnIndex );
@@ -212,9 +189,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getBytes( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getBytes( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBytes( columnIndex );
@@ -223,9 +198,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::util::Date SAL_CALL
-        getDate( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getDate( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getDate( columnIndex );
@@ -234,9 +207,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::util::Time SAL_CALL
-        getTime( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getTime( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getTime( columnIndex );
@@ -245,9 +216,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::util::DateTime SAL_CALL
-        getTimestamp( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getTimestamp( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getTimestamp( columnIndex );
@@ -256,9 +225,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-        getBinaryStream( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getBinaryStream( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBinaryStream( columnIndex );
@@ -267,9 +234,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-        getCharacterStream( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getCharacterStream( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getCharacterStream( columnIndex );
@@ -279,9 +244,7 @@ class XResultSet_impl : public Notifier,
 
         virtual css::uno::Any SAL_CALL
         getObject( sal_Int32 columnIndex,
-            const css::uno::Reference< css::container::XNameAccess >& typeMap )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+            const css::uno::Reference< css::container::XNameAccess >& typeMap ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getObject( columnIndex,typeMap );
@@ -290,9 +253,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
-        getRef( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getRef( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getRef( columnIndex );
@@ -301,9 +262,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
-        getBlob( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getBlob( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBlob( columnIndex );
@@ -312,9 +271,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
-        getClob( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getClob( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getClob( columnIndex );
@@ -323,9 +280,7 @@ class XResultSet_impl : public Notifier,
         }
 
         virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
-        getArray( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getArray( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getArray( columnIndex );
@@ -337,202 +292,129 @@ class XResultSet_impl : public Notifier,
         // XResultSet
 
         virtual sal_Bool SAL_CALL
-        next()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        next() override;
 
         virtual sal_Bool SAL_CALL
-        isBeforeFirst()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isBeforeFirst() override;
 
         virtual sal_Bool SAL_CALL
-        isAfterLast()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isAfterLast() override;
 
         virtual sal_Bool SAL_CALL
-        isFirst()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isFirst() override;
 
         virtual sal_Bool SAL_CALL
-        isLast()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isLast() override;
 
         virtual void SAL_CALL
-        beforeFirst()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        beforeFirst() override;
 
         virtual void SAL_CALL
-        afterLast()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        afterLast() override;
 
         virtual sal_Bool SAL_CALL
-        first()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        first() override;
 
         virtual sal_Bool SAL_CALL
-        last()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        last() override;
 
         virtual sal_Int32 SAL_CALL
-        getRow()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getRow() override;
 
         virtual sal_Bool SAL_CALL
-        absolute( sal_Int32 row )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        absolute( sal_Int32 row ) override;
 
         virtual sal_Bool SAL_CALL
-        relative( sal_Int32 rows )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        relative( sal_Int32 rows ) override;
 
         virtual sal_Bool SAL_CALL
-        previous()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        previous() override;
 
         virtual void SAL_CALL
-        refreshRow()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        refreshRow() override;
 
         virtual sal_Bool SAL_CALL
-        rowUpdated()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        rowUpdated() override;
 
         virtual sal_Bool SAL_CALL
-        rowInserted()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        rowInserted() override;
 
         virtual sal_Bool SAL_CALL
-        rowDeleted()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        rowDeleted() override;
 
 
         virtual  css::uno::Reference<  css::uno::XInterface > SAL_CALL
-        getStatement()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getStatement() override;
 
 
         // XDynamicResultSet
 
         virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
-        getStaticResultSet()
-            throw( css::ucb::ListenerAlreadySetException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getStaticResultSet() override;
 
         virtual void SAL_CALL
         setListener(
             const css::uno::Reference<
-            css::ucb::XDynamicResultSetListener >& Listener )
-            throw( css::ucb::ListenerAlreadySetException,
-                   css::uno::RuntimeException, std::exception ) override;
+            css::ucb::XDynamicResultSetListener >& Listener ) override;
 
         virtual void SAL_CALL
-        connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache )
-            throw( css::ucb::ListenerAlreadySetException,
-                   css::ucb::AlreadyInitializedException,
-                   css::ucb::ServiceNotFoundException,
-                   css::uno::RuntimeException, std::exception ) override;
+        connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) override;
 
         virtual sal_Int16 SAL_CALL
-        getCapabilities()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getCapabilities() override;
 
 
         // XCloseable
 
         virtual void SAL_CALL
-        close()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        close() override;
 
         // XContentAccess
 
         virtual OUString SAL_CALL
-        queryContentIdentifierString()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryContentIdentifierString() override;
 
         virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-        queryContentIdentifier()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryContentIdentifier() override;
 
         virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-        queryContent()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryContent() override;
 
         // XResultSetMetaDataSupplier
         virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
-        getMetaData()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getMetaData() override;
 
 
         // XPropertySet
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-            throw( css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
         virtual void SAL_CALL setPropertyValue(
             const OUString& aPropertyName,
-            const css::uno::Any& aValue )
-            throw( css::beans::UnknownPropertyException,
-                   css::beans::PropertyVetoException,
-                   css::lang::IllegalArgumentException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& aValue ) override;
 
         virtual css::uno::Any SAL_CALL
         getPropertyValue(
-            const OUString& PropertyName )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const OUString& PropertyName ) override;
 
         virtual void SAL_CALL
         addPropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
 
         virtual void SAL_CALL
         removePropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
 
         virtual void SAL_CALL
         addVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     private:
 
@@ -571,10 +453,7 @@ class XResultSet_impl : public Notifier,
         // Methods
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        bool SAL_CALL OneMore()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException,
-                   std::exception );
+        bool SAL_CALL OneMore();
 
         void rowCountChanged();
         void isFinalChanged();
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 41891839f3d3..20e4952ab5f3 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -85,7 +85,6 @@ XStream_impl::~XStream_impl()
 
 uno::Reference< io::XInputStream > SAL_CALL
 XStream_impl::getInputStream(  )
-    throw( uno::RuntimeException, std::exception)
 {
     {
         osl::MutexGuard aGuard( m_aMutex );
@@ -97,7 +96,6 @@ XStream_impl::getInputStream(  )
 
 uno::Reference< io::XOutputStream > SAL_CALL
 XStream_impl::getOutputStream(  )
-    throw( uno::RuntimeException, std::exception )
 {
     {
         osl::MutexGuard aGuard( m_aMutex );
@@ -108,7 +106,6 @@ XStream_impl::getOutputStream(  )
 
 
 void SAL_CALL XStream_impl::truncate()
-    throw( io::IOException, uno::RuntimeException, std::exception )
 {
     if (osl::FileBase::E_None != m_aFile.setSize(0))
         throw io::IOException( THROW_WHERE );
@@ -125,10 +122,6 @@ sal_Int32 SAL_CALL
 XStream_impl::readBytes(
     uno::Sequence< sal_Int8 >& aData,
     sal_Int32 nBytesToRead )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     if( ! m_nIsOpen )
         throw io::IOException( THROW_WHERE );
@@ -159,10 +152,6 @@ sal_Int32 SAL_CALL
 XStream_impl::readSomeBytes(
     uno::Sequence< sal_Int8 >& aData,
     sal_Int32 nMaxBytesToRead )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     return readBytes( aData,nMaxBytesToRead );
 }
@@ -170,10 +159,6 @@ XStream_impl::readSomeBytes(
 
 void SAL_CALL
 XStream_impl::skipBytes( sal_Int32 nBytesToSkip )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) );
 }
@@ -181,9 +166,6 @@ XStream_impl::skipBytes( sal_Int32 nBytesToSkip )
 
 sal_Int32 SAL_CALL
 XStream_impl::available()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     return 0;
 }
@@ -191,10 +173,6 @@ XStream_impl::available()
 
 void SAL_CALL
 XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     sal_uInt32 length = aData.getLength();
     if(length)
@@ -210,9 +188,6 @@ XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData )
 
 void SAL_CALL
 XStream_impl::closeStream()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException )
 {
     if( m_nIsOpen )
     {
@@ -230,9 +205,6 @@ XStream_impl::closeStream()
 
 void SAL_CALL
 XStream_impl::closeInput()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
     m_bInputStreamCalled = false;
@@ -244,9 +216,6 @@ XStream_impl::closeInput()
 
 void SAL_CALL
 XStream_impl::closeOutput()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
     m_bOutputStreamCalled = false;
@@ -258,9 +227,6 @@ XStream_impl::closeOutput()
 
 void SAL_CALL
 XStream_impl::seek( sal_Int64 location )
-    throw( lang::IllegalArgumentException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if( location < 0 )
         throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 );
@@ -271,8 +237,6 @@ XStream_impl::seek( sal_Int64 location )
 
 sal_Int64 SAL_CALL
 XStream_impl::getPosition()
-    throw( io::IOException,
-           uno::RuntimeException, std::exception )
 {
     sal_uInt64 uPos;
     if( osl::FileBase::E_None != m_aFile.getPos( uPos ) )
@@ -282,8 +246,6 @@ XStream_impl::getPosition()
 
 sal_Int64 SAL_CALL
 XStream_impl::getLength()
-    throw( io::IOException,
-           uno::RuntimeException, std::exception )
 {
         sal_uInt64 uEndPos;
         if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None )
@@ -294,14 +256,9 @@ XStream_impl::getLength()
 
 void SAL_CALL
 XStream_impl::flush()
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {}
 
 void XStream_impl::waitForCompletion()
-    throw (io::IOException, uno::RuntimeException, std::exception)
 {
     // At least on UNIX, to reliably learn about any errors encountered by
     // asynchronous NFS write operations, without closing the file directly
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index c4308afa3184..c65b7cda76cb 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -63,19 +63,15 @@ class XStream_impl :  public cppu::WeakImplHelper<
         // XStream
 
         virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-        getInputStream()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getInputStream() override;
 
         virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL
-        getOutputStream()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getOutputStream() override;
 
 
         // XTruncate
 
-        virtual void SAL_CALL truncate()
-            throw( css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL truncate() override;
 
 
         // XInputStream
@@ -83,88 +79,49 @@ class XStream_impl :  public cppu::WeakImplHelper<
         sal_Int32 SAL_CALL
         readBytes(
             css::uno::Sequence< sal_Int8 >& aData,
-            sal_Int32 nBytesToRead )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nBytesToRead ) override;
 
         sal_Int32 SAL_CALL
         readSomeBytes(
             css::uno::Sequence< sal_Int8 >& aData,
-            sal_Int32 nMaxBytesToRead )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nMaxBytesToRead ) override;
 
 
         void SAL_CALL
-        skipBytes( sal_Int32 nBytesToSkip )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        skipBytes( sal_Int32 nBytesToSkip ) override;
 
         sal_Int32 SAL_CALL
-        available()
-            throw( css::io::NotConnectedException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        available() override;
 
         void SAL_CALL
-        closeInput()
-            throw( css::io::NotConnectedException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        closeInput() override;
 
         // XSeekable
 
         void SAL_CALL
-        seek( sal_Int64 location )
-            throw( css::lang::IllegalArgumentException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        seek( sal_Int64 location ) override;
 
         sal_Int64 SAL_CALL
-        getPosition()
-            throw( css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getPosition() override;
 
         sal_Int64 SAL_CALL
-        getLength()
-            throw( css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getLength() override;
 
 
         // XOutputStream
 
         void SAL_CALL
-        writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+        writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
 
 
         void SAL_CALL
-        flush()
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+        flush() override;
 
 
         void SAL_CALL
-        closeOutput()
-            throw( css::io::NotConnectedException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        closeOutput() override;
 
-        virtual void SAL_CALL waitForCompletion()
-            throw (
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL waitForCompletion() override;
 
     private:
 
@@ -183,10 +140,7 @@ class XStream_impl :  public cppu::WeakImplHelper<
         /// @throws css::io::IOException
         /// @throws css::uno::RuntimeException
         void SAL_CALL
-        closeStream()
-            throw( css::io::NotConnectedException,
-                   css::io::IOException,
-                   css::uno::RuntimeException );
+        closeStream();
 
     };
 
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index cc038ca61a0f..653289b13a5c 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -390,7 +390,6 @@ void SAL_CALL
 TaskManager::startTask(
     sal_Int32 CommandId,
     const uno::Reference< XCommandEnvironment >& xCommandEnv )
-    throw( DuplicateCommandIdentifierException )
 {
     osl::MutexGuard aGuard( m_aMutex );
     TaskMap::iterator it = m_aTaskMap.find( CommandId );
@@ -571,9 +570,6 @@ TaskManager::associate( const OUString& aUnqPath,
                   const OUString& PropertyName,
                   const uno::Any& DefaultValue,
                   const sal_Int16 Attributes )
-    throw( beans::PropertyExistException,
-           beans::IllegalTypeException,
-           uno::RuntimeException )
 {
     MyProperty newProperty( false,
                             PropertyName,
@@ -611,9 +607,6 @@ TaskManager::associate( const OUString& aUnqPath,
 void SAL_CALL
 TaskManager::deassociate( const OUString& aUnqPath,
             const OUString& PropertyName )
-  throw( beans::UnknownPropertyException,
-     beans::NotRemoveableException,
-     uno::RuntimeException )
 {
     MyProperty oldProperty( PropertyName );
 
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index eb81fd594a35..e924f191dd16 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -254,8 +254,7 @@ namespace fileaccess
         /// @throws css::ucb::DuplicateCommandIdentifierException
         void SAL_CALL startTask(
             sal_Int32 CommandId,
-            const css::uno::Reference< css::ucb::XCommandEnvironment >&  xCommandEnv )
-            throw( css::ucb::DuplicateCommandIdentifierException );
+            const css::uno::Reference< css::ucb::XCommandEnvironment >&  xCommandEnv );
 
         sal_Int32 SAL_CALL getCommandId();
         void SAL_CALL abort( sal_Int32 CommandId );
@@ -322,19 +321,13 @@ namespace fileaccess
         void SAL_CALL associate( const OUString& UnqPath,
                                  const OUString& PropertyName,
                                  const css::uno::Any& DefaultValue,
-                                 const sal_Int16 Attributes )
-            throw( css::beans::PropertyExistException,
-                   css::beans::IllegalTypeException,
-                   css::uno::RuntimeException);
+                                 const sal_Int16 Attributes );
 
         /// @throws css::beans::UnknownPropertyException
         /// @throws css::beans::NotRemoveableException
         /// @throws css::uno::RuntimeException
         void SAL_CALL deassociate( const OUString& UnqPath,
-                                   const OUString& PropertyName )
-            throw( css::beans::UnknownPropertyException,
-                   css::beans::NotRemoveableException,
-                   css::uno::RuntimeException);
+                                   const OUString& PropertyName );
 
 
         //  Every method having a command id is not allowed to throw anything,
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 9659d5caaf59..5552d016a43b 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -105,7 +105,6 @@ void SAL_CALL FileProvider::init()
 void SAL_CALL
 FileProvider::initialize(
     const Sequence< Any >& aArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     if( ! m_pMyShell ) {
         OUString config;
@@ -121,20 +120,17 @@ FileProvider::initialize(
 // XServiceInfo methods.
 OUString SAL_CALL
 FileProvider::getImplementationName()
-    throw( RuntimeException, std::exception )
 {
     return fileaccess::TaskManager::getImplementationName_static();
 }
 
 sal_Bool SAL_CALL FileProvider::supportsService(const OUString& ServiceName )
-  throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL
 FileProvider::getSupportedServiceNames()
-  throw( RuntimeException, std::exception )
 {
     return fileaccess::TaskManager::getSupportedServiceNames_static();
 }
@@ -165,8 +161,6 @@ FileProvider::CreateInstance(
 Reference< XContent > SAL_CALL
 FileProvider::queryContent(
     const Reference< XContentIdentifier >& xIdentifier )
-    throw( IllegalIdentifierException,
-           RuntimeException, std::exception)
 {
     init();
     OUString aUnc;
@@ -184,7 +178,6 @@ sal_Int32 SAL_CALL
 FileProvider::compareContentIds(
                 const Reference< XContentIdentifier >& Id1,
                 const Reference< XContentIdentifier >& Id2 )
-  throw( RuntimeException, std::exception )
 {
     init();
     OUString aUrl1 = Id1->getContentIdentifier();
@@ -241,7 +234,6 @@ FileProvider::compareContentIds(
 Reference< XContentIdentifier > SAL_CALL
 FileProvider::createContentIdentifier(
                       const OUString& ContentId )
-  throw( RuntimeException, std::exception )
 {
     init();
     FileContentIdentifier* p = new FileContentIdentifier( ContentId,false );
@@ -260,8 +252,7 @@ public:
 
     // XInterface
     virtual Any SAL_CALL
-    queryInterface( const Type& aType )
-        throw( RuntimeException, std::exception) override;
+    queryInterface( const Type& aType ) override;
 
     virtual void SAL_CALL
     acquire()
@@ -273,17 +264,13 @@ public:
 
 
     virtual Sequence< Property > SAL_CALL
-    getProperties()
-        throw( RuntimeException, std::exception ) override;
+    getProperties() override;
 
     virtual Property SAL_CALL
-    getPropertyByName( const OUString& aName )
-        throw( UnknownPropertyException,
-               RuntimeException, std::exception) override;
+    getPropertyByName( const OUString& aName ) override;
 
     virtual sal_Bool SAL_CALL
-    hasPropertyByName( const OUString& Name )
-        throw( RuntimeException, std::exception ) override;
+    hasPropertyByName( const OUString& Name ) override;
 
 
 private:
@@ -328,7 +315,6 @@ XPropertySetInfoImpl2::release()
 
 Any SAL_CALL
 XPropertySetInfoImpl2::queryInterface( const Type& rType )
-    throw( RuntimeException, std::exception )
 {
     Any aRet = cppu::queryInterface( rType,
                                           (static_cast< XPropertySetInfo* >(this)) );
@@ -338,8 +324,6 @@ XPropertySetInfoImpl2::queryInterface( const Type& rType )
 
 Property SAL_CALL
 XPropertySetInfoImpl2::getPropertyByName( const OUString& aName )
-    throw( UnknownPropertyException,
-           RuntimeException, std::exception)
 {
     for( sal_Int32 i = 0; i < m_seq.getLength(); ++i )
         if( m_seq[i].Name == aName )
@@ -351,7 +335,6 @@ XPropertySetInfoImpl2::getPropertyByName( const OUString& aName )
 
 Sequence< Property > SAL_CALL
 XPropertySetInfoImpl2::getProperties()
-    throw( RuntimeException, std::exception )
 {
     return m_seq;
 }
@@ -360,7 +343,6 @@ XPropertySetInfoImpl2::getProperties()
 sal_Bool SAL_CALL
 XPropertySetInfoImpl2::hasPropertyByName(
     const OUString& aName )
-    throw( RuntimeException, std::exception )
 {
     for( sal_Int32 i = 0; i < m_seq.getLength(); ++i )
         if( m_seq[i].Name == aName )
@@ -401,7 +383,6 @@ void SAL_CALL FileProvider::initProperties()
 
 Reference< XPropertySetInfo > SAL_CALL
 FileProvider::getPropertySetInfo(  )
-    throw( RuntimeException, std::exception )
 {
     initProperties();
     return m_xPropertySetInfo;
@@ -411,11 +392,6 @@ FileProvider::getPropertySetInfo(  )
 void SAL_CALL
 FileProvider::setPropertyValue( const OUString& aPropertyName,
                                 const Any& )
-    throw( UnknownPropertyException,
-           PropertyVetoException,
-           IllegalArgumentException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     if( aPropertyName == "FileSystemNotation" ||
         aPropertyName == "HomeDirectory"      ||
@@ -429,9 +405,6 @@ FileProvider::setPropertyValue( const OUString& aPropertyName,
 Any SAL_CALL
 FileProvider::getPropertyValue(
     const OUString& aPropertyName )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     initProperties();
     if( aPropertyName == "FileSystemNotation" )
@@ -455,9 +428,6 @@ void SAL_CALL
 FileProvider::addPropertyChangeListener(
     const OUString&,
     const Reference< XPropertyChangeListener >& )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception)
 {
     return;
 }
@@ -467,9 +437,6 @@ void SAL_CALL
 FileProvider::removePropertyChangeListener(
     const OUString&,
     const Reference< XPropertyChangeListener >& )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     return;
 }
@@ -478,9 +445,6 @@ void SAL_CALL
 FileProvider::addVetoableChangeListener(
     const OUString&,
     const Reference< XVetoableChangeListener >& )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     return;
 }
@@ -490,9 +454,6 @@ void SAL_CALL
 FileProvider::removeVetoableChangeListener(
     const OUString&,
     const Reference< XVetoableChangeListener >& )
-    throw( UnknownPropertyException,
-           WrappedTargetException,
-           RuntimeException, std::exception)
 {
     return;
 }
@@ -502,7 +463,6 @@ FileProvider::removeVetoableChangeListener(
 
 sal_Int32 SAL_CALL
 FileProvider::getFileProviderLocality( const OUString& BaseURL )
-    throw( RuntimeException, std::exception )
 {
     // If the base URL is a 'file' URL, return 10 (very 'local'), otherwise
     // return -1 (missmatch).  What is missing is a fast comparison to ASCII,
@@ -518,7 +478,6 @@ FileProvider::getFileProviderLocality( const OUString& BaseURL )
 
 OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&,
                                                                const OUString& SystemPath )
-    throw( RuntimeException, std::exception )
 {
     OUString aNormalizedPath;
     if ( osl::FileBase::getFileURLFromSystemPath( SystemPath,aNormalizedPath ) != osl::FileBase::E_None )
@@ -528,7 +487,6 @@ OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&,
 }
 
 OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const OUString& URL )
-    throw( RuntimeException, std::exception )
 {
     OUString aSystemPath;
     if (osl::FileBase::getSystemPathFromFileURL( URL,aSystemPath ) != osl::FileBase::E_None )
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 28c8238ea329..78e44db96323 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -64,16 +64,13 @@ namespace fileaccess {
 
         // XServiceInfo
         virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
 
         virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw(css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL
@@ -87,99 +84,70 @@ namespace fileaccess {
         // XInitialization
         virtual void SAL_CALL
         initialize(
-            const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 
         // XContentProvider
         virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
         queryContent(
-            const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-            throw( css::ucb::IllegalIdentifierException,
-                   css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
         // XContentIdentifierFactory
 
         virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
         createContentIdentifier(
-            const OUString& ContentId )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const OUString& ContentId ) override;
 
 
         virtual sal_Int32 SAL_CALL
         compareContentIds(
             const css::uno::Reference< css::ucb::XContentIdentifier >& Id1,
-            const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override;
 
         // XProperySet
 
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo(  )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getPropertySetInfo(  ) override;
 
         virtual void SAL_CALL
         setPropertyValue(
             const OUString& aPropertyName,
-            const css::uno::Any& aValue )
-            throw( css::beans::UnknownPropertyException,
-                   css::beans::PropertyVetoException,
-                   css::lang::IllegalArgumentException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Any& aValue ) override;
 
         virtual css::uno::Any SAL_CALL
         getPropertyValue(
-            const OUString& PropertyName )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception ) override;
+            const OUString& PropertyName ) override;
 
         virtual void SAL_CALL
         addPropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
 
         virtual void SAL_CALL
         removePropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
 
         virtual void SAL_CALL
         addVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         virtual void SAL_CALL
         removeVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
 
         // XFileIdentifierConverter
 
         virtual sal_Int32 SAL_CALL
-        getFileProviderLocality( const OUString& BaseURL )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getFileProviderLocality( const OUString& BaseURL ) override;
 
         virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL,
-                                                            const OUString& SystemPath )
-            throw( css::uno::RuntimeException, std::exception ) override;
+                                                            const OUString& SystemPath ) override;
 
-        virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) override;
 
 
     private:
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index ca606c994b9c..2933e73820bb 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -125,7 +125,6 @@ void SAL_CALL FTPContent::release()
 }
 
 css::uno::Any SAL_CALL FTPContent::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XTypeProvider* >(this)),
@@ -141,15 +140,11 @@ css::uno::Any SAL_CALL FTPContent::queryInterface( const css::uno::Type & rType
 // XTypeProvider methods.
 
 css::uno::Sequence< sal_Int8 > SAL_CALL FTPContent::getImplementationId()
-    throw( css::uno::RuntimeException,
-           std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes()
-    throw( css::uno::RuntimeException,
-           std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
     if ( !pCollection )
@@ -175,19 +170,16 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes()
 // XServiceInfo methods.
 
 OUString SAL_CALL FTPContent::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.FTPContent");
 }
 
 sal_Bool SAL_CALL FTPContent::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { "com.sun.star.ucb.FTPContent" };
 }
@@ -197,7 +189,6 @@ css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames()
 
 // virtual
 OUString SAL_CALL FTPContent::getContentType()
-    throw( RuntimeException, std::exception )
 {
     return OUString(FTP_CONTENT_TYPE);
 }
@@ -206,7 +197,6 @@ OUString SAL_CALL FTPContent::getContentType()
 
 //virtual
 void SAL_CALL FTPContent::abort( sal_Int32 /*CommandId*/ )
-    throw( RuntimeException, std::exception )
 {
 }
 
@@ -248,10 +238,6 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand,
                                   sal_Int32 /*CommandId*/,
                                   const Reference<
                                   XCommandEnvironment >& Environment)
-    throw( Exception,
-           CommandAbortedException,
-           RuntimeException,
-           std::exception)
 {
     ACTION action(NOACTION);
     Any aRet;
@@ -598,7 +584,6 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand,
 
 Sequence<ContentInfo > SAL_CALL
 FTPContent::queryCreatableContentsInfo(  )
-    throw (RuntimeException, std::exception)
 {
     return queryCreatableContentsInfo_Static();
 }
@@ -606,7 +591,6 @@ FTPContent::queryCreatableContentsInfo(  )
 // static
 Sequence<ContentInfo >
 FTPContent::queryCreatableContentsInfo_Static(  )
-    throw (RuntimeException)
 {
     Sequence< ContentInfo > seq(2);
 
@@ -632,7 +616,6 @@ FTPContent::queryCreatableContentsInfo_Static(  )
 
 Reference<XContent > SAL_CALL
 FTPContent::createNewContent( const ContentInfo& Info )
-    throw (RuntimeException, std::exception)
 {
     if( Info.Type =="application/vnd.sun.staroffice.ftp-file" || Info.Type == "application/vnd.sun.staroffice.ftp-folder" )
         return new FTPContent(m_xContext,
@@ -645,7 +628,6 @@ FTPContent::createNewContent( const ContentInfo& Info )
 
 Reference<XInterface > SAL_CALL
 FTPContent::getParent(  )
-    throw (RuntimeException, std::exception)
 {
     Reference<XContentIdentifier>
         xIdent(new FTPContentIdentifier(m_aFTPURL.parent()));
@@ -655,8 +637,6 @@ FTPContent::getParent(  )
 
 void SAL_CALL
 FTPContent::setParent(const Reference<XInterface >& /*Parent*/ )
-    throw (NoSupportException,
-           RuntimeException, std::exception)
 {
     throw NoSupportException();
 }
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index bf9b53b3d4fe..74666dee9a0e 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -63,68 +63,49 @@ public:
     virtual ~FTPContent() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException,
-               std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException,
-                   std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XContent
-    virtual OUString SAL_CALL getContentType()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getContentType() override;
 
     // XCommandProcessor
     virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand,
                                             sal_Int32 CommandId,
                                             const css::uno::Reference<
-                                            css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception ) override;
+                                            css::ucb::XCommandEnvironment >& Environment ) override;
 
-    virtual void SAL_CALL abort(sal_Int32 CommandId)
-        throw( css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL abort(sal_Int32 CommandId) override;
 
     // XContentCreator
     virtual css::uno::Sequence<
         css::ucb::ContentInfo > SAL_CALL
-        queryCreatableContentsInfo(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        queryCreatableContentsInfo(  ) override;
 
     virtual css::uno::Reference<
         css::ucb::XContent > SAL_CALL
-        createNewContent( const css::ucb::ContentInfo& Info )
-            throw (css::uno::RuntimeException, std::exception) override;
+        createNewContent( const css::ucb::ContentInfo& Info ) override;
 
     // XChild
 
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) override;
 
-    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent )
-        throw (css::lang::NoSupportException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
 
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo_Static()
-        throw (css::uno::RuntimeException);
+    static css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo_Static();
 
 private:
 
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index bbc3e0b800d9..683422366703 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -49,9 +49,6 @@ Any SAL_CALL
 FTPContentIdentifier::queryInterface(
     const Type& rType
 )
-    throw(
-        RuntimeException, std::exception
-    )
 {
     Any aRet =
         ::cppu::queryInterface(rType,
@@ -74,7 +71,6 @@ void SAL_CALL FTPContentIdentifier::release() throw() {
 
 Sequence<sal_Int8> SAL_CALL
 FTPContentIdentifier::getImplementationId()
-    throw(RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -82,7 +78,6 @@ FTPContentIdentifier::getImplementationId()
 
 Sequence<Type> SAL_CALL
 FTPContentIdentifier::getTypes()
-    throw(RuntimeException, std::exception)
 {
     static cppu::OTypeCollection* pCollection = nullptr;
     if ( !pCollection ) {
@@ -102,9 +97,6 @@ FTPContentIdentifier::getTypes()
 OUString SAL_CALL
 FTPContentIdentifier::getContentIdentifier(
 )
-    throw (
-        css::uno::RuntimeException, std::exception
-    )
 {
     return m_ident;
 }
@@ -113,9 +105,6 @@ FTPContentIdentifier::getContentIdentifier(
 OUString SAL_CALL
 FTPContentIdentifier::getContentProviderScheme(
 )
-    throw (
-        css::uno::RuntimeException, std::exception
-    )
 {
     return OUString("ftp");
 }
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index 99f13b31ef79..670f9fde74dc 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -53,8 +53,7 @@ namespace ftp {
         // XInterface
 
         virtual css::uno::Any SAL_CALL
-        queryInterface( const css::uno::Type& rType )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryInterface( const css::uno::Type& rType ) override;
 
         virtual void SAL_CALL acquire() throw() override;
 
@@ -64,31 +63,19 @@ namespace ftp {
 
         virtual
         css::uno::Sequence<css::uno::Type> SAL_CALL
-        getTypes()
-            throw(
-                css::uno::RuntimeException, std::exception
-            ) override;
+        getTypes() override;
 
         virtual css::uno::Sequence<sal_Int8> SAL_CALL
-        getImplementationId()
-            throw(
-                css::uno::RuntimeException, std::exception
-            ) override;
+        getImplementationId() override;
 
 
         // XContentIdentifier
 
         virtual OUString SAL_CALL
-        getContentIdentifier()
-            throw (
-                css::uno::RuntimeException, std::exception
-            ) override;
+        getContentIdentifier() override;
 
         virtual OUString SAL_CALL
-        getContentProviderScheme()
-            throw (
-                css::uno::RuntimeException, std::exception
-            ) override;
+        getContentProviderScheme() override;
 
 
     private:
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 1ee0fcc7c48c..d2628b9ae04a 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -69,7 +69,6 @@ void SAL_CALL FTPContentProvider::release()
 }
 
 css::uno::Any SAL_CALL FTPContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XTypeProvider* >(this)),
@@ -81,15 +80,11 @@ css::uno::Any SAL_CALL FTPContentProvider::queryInterface( const css::uno::Type
 
 // XTypeProvider methods.
 css::uno::Sequence< sal_Int8 > SAL_CALL FTPContentProvider::getImplementationId()
-    throw( css::uno::RuntimeException,
-           std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes()
-    throw( css::uno::RuntimeException,
-           std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
     if ( !pCollection )
@@ -112,7 +107,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes()
 // XServiceInfo methods.
 
 OUString SAL_CALL FTPContentProvider::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
@@ -123,13 +117,11 @@ OUString FTPContentProvider::getImplementationName_Static()
 }
 
 sal_Bool SAL_CALL FTPContentProvider::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL FTPContentProvider::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return getSupportedServiceNames_Static();
 }
@@ -138,7 +130,6 @@ css::uno::Sequence< OUString > SAL_CALL FTPContentProvider::getSupportedServiceN
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 FTPContentProvider_CreateInstance( const css::uno::Reference<
                                    css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(
         new FTPContentProvider( ucbhelper::getComponentContext(rSMgr) ));
@@ -171,9 +162,6 @@ FTPContentProvider::createServiceFactory( const css::uno::Reference<
 // virtual
 Reference<XContent> SAL_CALL FTPContentProvider::queryContent(
         const Reference< XContentIdentifier >& xCanonicId)
-    throw( IllegalIdentifierException,
-           RuntimeException,
-           std::exception)
 {
     // Check, if a content with given id already exists...
     Reference<XContent> xContent = queryExistingContent(xCanonicId).get();
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 1c93e7f58539..46db49efd062 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -50,32 +50,20 @@ namespace ftp
         virtual ~FTPContentProvider() override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-            throw( css::uno::RuntimeException,
-                   std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire()
             throw() override;
         virtual void SAL_CALL release()
             throw() override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-            throw( css::uno::RuntimeException,
-                   std::exception ) override;
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-            throw( css::uno::RuntimeException,
-                   std::exception ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException,
-                   std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException,
-                   std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException,
-                   std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         static OUString getImplementationName_Static();
         static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -86,10 +74,7 @@ namespace ftp
 
         // XContentProvider
         virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-        queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-            throw( css::ucb::IllegalIdentifierException,
-                   css::uno::RuntimeException,
-                   std::exception ) override;
+        queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
         CURL* handle();
 
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index 380b7df711b1..e660153807c4 100644
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/ucb/source/ucp/ftp/ftpintreq.cxx
@@ -40,8 +40,6 @@ XInteractionApproveImpl::XInteractionApproveImpl()
 }
 
 void SAL_CALL XInteractionApproveImpl::select()
-    throw (RuntimeException,
-           std::exception)
 {
     m_bSelected = true;
 }
@@ -55,8 +53,6 @@ XInteractionDisapproveImpl::XInteractionDisapproveImpl()
 }
 
 void SAL_CALL XInteractionDisapproveImpl::select()
-    throw (RuntimeException,
-           std::exception)
 {
     m_bSelected = true;
 }
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 1816662558bb..50356454f05f 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -40,9 +40,7 @@ namespace ftp {
 
         XInteractionApproveImpl();
 
-        virtual void SAL_CALL select()
-            throw (css::uno::RuntimeException,
-                   std::exception) override;
+        virtual void SAL_CALL select() override;
 
         bool isSelected() const { return m_bSelected;}
 
@@ -59,8 +57,7 @@ namespace ftp {
 
         XInteractionDisapproveImpl();
 
-        virtual void SAL_CALL select()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL select() override;
 
     private:
 
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 062ef471e0b8..00f0dc4c8238 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -73,7 +73,6 @@ ResultSetBase::release()
 
 uno::Any SAL_CALL
 ResultSetBase::queryInterface( const uno::Type& rType )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface(
         rType,
@@ -93,7 +92,6 @@ ResultSetBase::queryInterface( const uno::Type& rType )
 void SAL_CALL
 ResultSetBase::addEventListener(
     const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -108,7 +106,6 @@ ResultSetBase::addEventListener(
 void SAL_CALL
 ResultSetBase::removeEventListener(
     const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -119,7 +116,6 @@ ResultSetBase::removeEventListener(
 
 void SAL_CALL
 ResultSetBase::dispose()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -145,8 +141,6 @@ ResultSetBase::dispose()
 
 sal_Bool SAL_CALL
 ResultSetBase::next()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     bool test;
     if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -159,8 +153,6 @@ ResultSetBase::next()
 
 sal_Bool SAL_CALL
 ResultSetBase::isBeforeFirst()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return m_nRow == -1;
 }
@@ -168,8 +160,6 @@ ResultSetBase::isBeforeFirst()
 
 sal_Bool SAL_CALL
 ResultSetBase::isAfterLast()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size());   // Cannot happen, if m_aFolder.isOpen()
 }
@@ -177,8 +167,6 @@ ResultSetBase::isAfterLast()
 
 sal_Bool SAL_CALL
 ResultSetBase::isFirst()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return m_nRow == 0;
 }
@@ -186,8 +174,6 @@ ResultSetBase::isFirst()
 
 sal_Bool SAL_CALL
 ResultSetBase::isLast()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( m_nRow ==  sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1 )
         return true;
@@ -198,8 +184,6 @@ ResultSetBase::isLast()
 
 void SAL_CALL
 ResultSetBase::beforeFirst()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     m_nRow = -1;
 }
@@ -207,8 +191,6 @@ ResultSetBase::beforeFirst()
 
 void SAL_CALL
 ResultSetBase::afterLast()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     m_nRow = m_aItems.size();
 }
@@ -216,8 +198,6 @@ ResultSetBase::afterLast()
 
 sal_Bool SAL_CALL
 ResultSetBase::first()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     m_nRow = -1;
     return next();
@@ -226,8 +206,6 @@ ResultSetBase::first()
 
 sal_Bool SAL_CALL
 ResultSetBase::last()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     m_nRow = m_aItems.size() - 1;
     return true;
@@ -236,8 +214,6 @@ ResultSetBase::last()
 
 sal_Int32 SAL_CALL
 ResultSetBase::getRow()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     // Test, whether behind last row
     if( -1 == m_nRow || m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -248,7 +224,6 @@ ResultSetBase::getRow()
 
 
 sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception)
 {
     if( row >= 0 )
         m_nRow = row - 1;
@@ -266,8 +241,6 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
 
 sal_Bool SAL_CALL
 ResultSetBase::relative( sal_Int32 row )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( isAfterLast() || isBeforeFirst() )
         throw sdbc::SQLException();
@@ -285,8 +258,6 @@ ResultSetBase::relative( sal_Int32 row )
 
 sal_Bool SAL_CALL
 ResultSetBase::previous()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( m_nRow > sal::static_int_cast<sal_Int32>(m_aItems.size()) )
         m_nRow = m_aItems.size();  // Correct Handling of afterLast
@@ -298,32 +269,24 @@ ResultSetBase::previous()
 
 void SAL_CALL
 ResultSetBase::refreshRow()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
 }
 
 
 sal_Bool SAL_CALL
 ResultSetBase::rowUpdated()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return false;
 }
 
 sal_Bool SAL_CALL
 ResultSetBase::rowInserted()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return false;
 }
 
 sal_Bool SAL_CALL
 ResultSetBase::rowDeleted()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return false;
 }
@@ -331,8 +294,6 @@ ResultSetBase::rowDeleted()
 
 uno::Reference< uno::XInterface > SAL_CALL
 ResultSetBase::getStatement()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     uno::Reference< uno::XInterface > test( nullptr );
     return test;
@@ -343,15 +304,12 @@ ResultSetBase::getStatement()
 
 void SAL_CALL
 ResultSetBase::close()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
 }
 
 
 OUString SAL_CALL
 ResultSetBase::queryContentIdentifierString()
-    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
         return m_aPath[m_nRow];
@@ -362,7 +320,6 @@ ResultSetBase::queryContentIdentifierString()
 
 uno::Reference< ucb::XContentIdentifier > SAL_CALL
 ResultSetBase::queryContentIdentifier()
-    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
     {
@@ -382,7 +339,6 @@ ResultSetBase::queryContentIdentifier()
 
 uno::Reference< ucb::XContent > SAL_CALL
 ResultSetBase::queryContent()
-    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
         return m_xProvider->queryContent(queryContentIdentifier());
@@ -415,8 +371,7 @@ public:
         OWeakObject::release();
     }
 
-    uno::Any SAL_CALL queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception ) override
+    uno::Any SAL_CALL queryInterface( const uno::Type& rType ) override
     {
         uno::Any aRet = cppu::queryInterface(
             rType,
@@ -424,15 +379,12 @@ public:
         return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
     }
 
-    uno::Sequence< beans::Property > SAL_CALL getProperties()
-        throw( uno::RuntimeException, std::exception ) override
+    uno::Sequence< beans::Property > SAL_CALL getProperties() override
     {
         return m_aSeq;
     }
 
-    beans::Property SAL_CALL getPropertyByName( const OUString& aName )
-        throw( beans::UnknownPropertyException,
-               uno::RuntimeException, std::exception) override
+    beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override
     {
         for( int i = 0; i < m_aSeq.getLength(); ++i )
             if( aName == m_aSeq[i].Name )
@@ -440,8 +392,7 @@ public:
         throw beans::UnknownPropertyException();
     }
 
-    sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-        throw( uno::RuntimeException, std::exception ) override
+    sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override
     {
         for( int i = 0; i < m_aSeq.getLength(); ++i )
             if( Name == m_aSeq[i].Name )
@@ -458,7 +409,6 @@ private:
 // XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 ResultSetBase::getPropertySetInfo()
-    throw( uno::RuntimeException, std::exception)
 {
     uno::Sequence< beans::Property > seq(2);
     seq[0].Name = "RowCount";
@@ -479,11 +429,6 @@ ResultSetBase::getPropertySetInfo()
 
 void SAL_CALL ResultSetBase::setPropertyValue(
     const OUString& aPropertyName, const uno::Any& /*aValue*/ )
-    throw( beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" ||
         aPropertyName == "RowCount" )
@@ -495,9 +440,6 @@ void SAL_CALL ResultSetBase::setPropertyValue(
 
 uno::Any SAL_CALL ResultSetBase::getPropertyValue(
     const OUString& PropertyName )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( PropertyName == "IsRowCountFinal" )
     {
@@ -516,9 +458,6 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
 void SAL_CALL ResultSetBase::addPropertyChangeListener(
     const OUString& aPropertyName,
     const uno::Reference< beans::XPropertyChangeListener >& xListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" )
     {
@@ -545,9 +484,6 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
 void SAL_CALL ResultSetBase::removePropertyChangeListener(
     const OUString& aPropertyName,
     const uno::Reference< beans::XPropertyChangeListener >& aListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" &&
         m_pIsFinalListeners )
@@ -569,9 +505,6 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
 void SAL_CALL ResultSetBase::addVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
 }
 
@@ -579,9 +512,6 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener(
 void SAL_CALL ResultSetBase::removeVetoableChangeListener(
     const OUString& /*PropertyName*/,
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
 }
 
@@ -589,8 +519,6 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener(
 // XResultSetMetaDataSupplier
 uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
 ResultSetBase::getMetaData()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     ::ucbhelper::ResultSetMetaData* p =
           new ::ucbhelper::ResultSetMetaData( m_xContext, m_sProperty );
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 1b083eea9f38..93bcc8b6a6b6 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -58,8 +58,7 @@ namespace ftp {
 
         // XInterface
         virtual css::uno::Any SAL_CALL
-        queryInterface( const css::uno::Type& aType )
-            throw( css::uno::RuntimeException, std::exception) override;
+        queryInterface( const css::uno::Type& aType ) override;
 
         virtual void SAL_CALL
         acquire()
@@ -71,24 +70,19 @@ namespace ftp {
 
         // XComponent
         virtual void SAL_CALL
-        dispose()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        dispose() override;
 
         virtual void SAL_CALL
         addEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
         virtual void SAL_CALL
-        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 
         // XRow
         virtual sal_Bool SAL_CALL
-        wasNull()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        wasNull() override
         {
             if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 m_nWasNull = m_aItems[m_nRow]->wasNull();
@@ -98,9 +92,7 @@ namespace ftp {
         }
 
         virtual OUString SAL_CALL
-        getString( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getString( sal_Int32 columnIndex ) override
         {
             OUString ret;
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -110,9 +102,7 @@ namespace ftp {
         }
 
         virtual sal_Bool SAL_CALL
-        getBoolean( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getBoolean( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBoolean( columnIndex );
@@ -121,9 +111,7 @@ namespace ftp {
         }
 
         virtual sal_Int8 SAL_CALL
-        getByte( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getByte( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getByte( columnIndex );
@@ -132,10 +120,7 @@ namespace ftp {
         }
 
         virtual sal_Int16 SAL_CALL
-        getShort( sal_Int32 columnIndex )
-            throw(
-                css::sdbc::SQLException,
-                css::uno::RuntimeException, std::exception) override
+        getShort( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getShort( columnIndex );
@@ -144,9 +129,7 @@ namespace ftp {
         }
 
         virtual sal_Int32 SAL_CALL
-        getInt( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getInt( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getInt( columnIndex );
@@ -155,9 +138,7 @@ namespace ftp {
         }
 
         virtual sal_Int64 SAL_CALL
-        getLong( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getLong( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getLong( columnIndex );
@@ -166,9 +147,7 @@ namespace ftp {
         }
 
         virtual float SAL_CALL
-        getFloat( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getFloat( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getFloat( columnIndex );
@@ -177,9 +156,7 @@ namespace ftp {
         }
 
         virtual double SAL_CALL
-        getDouble( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getDouble( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getDouble( columnIndex );
@@ -188,9 +165,7 @@ namespace ftp {
         }
 
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getBytes( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getBytes( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBytes( columnIndex );
@@ -199,9 +174,7 @@ namespace ftp {
         }
 
         virtual css::util::Date SAL_CALL
-        getDate( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getDate( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getDate( columnIndex );
@@ -210,9 +183,7 @@ namespace ftp {
         }
 
         virtual css::util::Time SAL_CALL
-        getTime( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getTime( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getTime( columnIndex );
@@ -221,9 +192,7 @@ namespace ftp {
         }
 
         virtual css::util::DateTime SAL_CALL
-        getTimestamp( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getTimestamp( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getTimestamp( columnIndex );
@@ -233,9 +202,7 @@ namespace ftp {
 
 
         virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-        getBinaryStream( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getBinaryStream( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBinaryStream( columnIndex );
@@ -244,9 +211,7 @@ namespace ftp {
         }
 
         virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-        getCharacterStream( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getCharacterStream( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getCharacterStream( columnIndex );
@@ -256,9 +221,7 @@ namespace ftp {
 
         virtual css::uno::Any SAL_CALL
         getObject( sal_Int32 columnIndex,
-            const css::uno::Reference< css::container::XNameAccess >& typeMap )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+            const css::uno::Reference< css::container::XNameAccess >& typeMap ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getObject( columnIndex,typeMap );
@@ -267,9 +230,7 @@ namespace ftp {
         }
 
         virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
-        getRef( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getRef( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getRef( columnIndex );
@@ -278,9 +239,7 @@ namespace ftp {
         }
 
         virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
-        getBlob( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getBlob( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBlob( columnIndex );
@@ -289,9 +248,7 @@ namespace ftp {
         }
 
         virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
-        getClob( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getClob( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getClob( columnIndex );
@@ -300,9 +257,7 @@ namespace ftp {
         }
 
         virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
-        getArray( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getArray( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getArray( columnIndex );
@@ -315,177 +270,113 @@ namespace ftp {
         // XResultSet
 
         virtual sal_Bool SAL_CALL
-        next()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        next() override;
 
         virtual sal_Bool SAL_CALL
-        isBeforeFirst()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isBeforeFirst() override;
 
         virtual sal_Bool SAL_CALL
-        isAfterLast()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isAfterLast() override;
 
         virtual sal_Bool SAL_CALL
-        isFirst()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isFirst() override;
 
         virtual sal_Bool SAL_CALL
-        isLast()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isLast() override;
 
         virtual void SAL_CALL
-        beforeFirst()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        beforeFirst() override;
 
         virtual void SAL_CALL
-        afterLast()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        afterLast() override;
 
         virtual sal_Bool SAL_CALL
-        first()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        first() override;
 
         virtual sal_Bool SAL_CALL
-        last()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        last() override;
 
         virtual sal_Int32 SAL_CALL
-        getRow()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getRow() override;
 
         virtual sal_Bool SAL_CALL
         absolute(
-            sal_Int32 row )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+            sal_Int32 row ) override;
 
         virtual sal_Bool SAL_CALL
         relative(
-            sal_Int32 rows )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+            sal_Int32 rows ) override;
 
         virtual sal_Bool SAL_CALL
-        previous()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        previous() override;
 
         virtual void SAL_CALL
-        refreshRow()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        refreshRow() override;
 
         virtual sal_Bool SAL_CALL
-        rowUpdated()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        rowUpdated() override;
 
         virtual sal_Bool SAL_CALL
-        rowInserted()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        rowInserted() override;
 
         virtual sal_Bool SAL_CALL
-        rowDeleted()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        rowDeleted() override;
 
 
         virtual  css::uno::Reference< css::uno::XInterface > SAL_CALL
-        getStatement()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getStatement() override;
 
         // XCloseable
 
         virtual void SAL_CALL
-        close()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        close() override;
 
         // XContentAccess
 
         virtual OUString SAL_CALL
-        queryContentIdentifierString()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryContentIdentifierString() override;
 
         virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-        queryContentIdentifier()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryContentIdentifier() override;
 
         virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-        queryContent()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryContent() override;
 
         // XResultSetMetaDataSupplier
         virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
-        getMetaData()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getMetaData() override;
 
 
         // XPropertySet
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-            throw( css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
         virtual void SAL_CALL setPropertyValue(
             const OUString& aPropertyName,
-            const css::uno::Any& aValue )
-            throw( css::beans::UnknownPropertyException,
-                   css::beans::PropertyVetoException,
-                   css::lang::IllegalArgumentException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& aValue ) override;
 
         virtual css::uno::Any SAL_CALL
         getPropertyValue(
-            const OUString& PropertyName )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const OUString& PropertyName ) override;
 
         virtual void SAL_CALL
         addPropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
 
         virtual void SAL_CALL
         removePropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
 
         virtual void SAL_CALL
         addVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     protected:
 
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 6c33c81a9b19..40c2872d6989 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -126,9 +126,6 @@ FTPURL::FTPURL(const FTPURL& r)
 
 FTPURL::FTPURL(const OUString& url,
                FTPContentProvider* pFCP)
-    throw(
-        malformed_exception
-    )
     : m_pFCP(pFCP),
       m_aUsername("anonymous"),
       m_bShowPassword(false),
@@ -144,9 +141,6 @@ FTPURL::~FTPURL()
 
 
 void FTPURL::parse(const OUString& url)
-    throw(
-        malformed_exception
-    )
 {
     OUString aPassword,aAccount;
     OString aIdent(url.getStr(),
@@ -385,7 +379,6 @@ namespace ftp {
                      urlParAscii.getStr());
 
 oslFileHandle FTPURL::open()
-    throw(curl_exception, std::exception)
 {
     if(m_aPathSegmentVec.empty())
         throw curl_exception(CURLE_FTP_COULDNT_RETR_FILE);
@@ -425,9 +418,6 @@ oslFileHandle FTPURL::open()
 std::vector<FTPDirentry> FTPURL::list(
     sal_Int16 nMode
 ) const
-    throw(
-        curl_exception
-    )
 {
     CURL *curl = m_pFCP->handle();
 
@@ -512,7 +502,6 @@ std::vector<FTPDirentry> FTPURL::list(
 
 
 OUString FTPURL::net_title() const
-    throw(curl_exception, std::exception)
 {
     CURL *curl = m_pFCP->handle();
 
@@ -592,7 +581,6 @@ OUString FTPURL::net_title() const
 
 
 FTPDirentry FTPURL::direntry() const
-    throw (curl_exception, malformed_exception, std::exception)
 {
     OUString nettitle = net_title();
     FTPDirentry aDirentry;
@@ -638,7 +626,6 @@ extern "C" {
 
 
 void FTPURL::insert(bool replaceExisting,void* stream) const
-    throw(curl_exception)
 {
     if(!replaceExisting) {
 //          FTPDirentry aDirentry(direntry());
@@ -670,7 +657,6 @@ void FTPURL::insert(bool replaceExisting,void* stream) const
 
 
 void FTPURL::mkdir(bool ReplaceExisting) const
-    throw (curl_exception, malformed_exception, std::exception)
 {
     OString title;
     if(!m_aPathSegmentVec.empty()) {
@@ -720,7 +706,6 @@ void FTPURL::mkdir(bool ReplaceExisting) const
 
 
 OUString FTPURL::ren(const OUString& NewTitle)
-    throw(curl_exception, std::exception)
 {
     CURL *curl = m_pFCP->handle();
 
@@ -763,7 +748,6 @@ OUString FTPURL::ren(const OUString& NewTitle)
 
 
 void FTPURL::del() const
-    throw(curl_exception, malformed_exception, std::exception)
 {
     FTPDirentry aDirentry(direntry());
 
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index cedd41211976..a0bdf0abb281 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -85,7 +85,7 @@ namespace ftp {
         FTPURL(
             const OUString& aIdent,
             FTPContentProvider* pFCP
-        ) throw (malformed_exception);
+        );
 
         FTPURL(const FTPURL& r);
 
@@ -115,36 +115,30 @@ namespace ftp {
         OUString child() const;
 
         /// @throws curl_exception
-        std::vector<FTPDirentry> list(sal_Int16 nMode) const
-            throw(curl_exception);
+        std::vector<FTPDirentry> list(sal_Int16 nMode) const;
 
         // returns a pointer to an open tempfile,
         // sought to the beginning of.
         /// @throws curl_exception
-        oslFileHandle open() throw(curl_exception, std::exception);
+        oslFileHandle open();
 
         /// @throws curl_exception
         /// @throws malformed_exception
-        FTPDirentry direntry() const
-            throw(curl_exception, malformed_exception, std::exception);
+        FTPDirentry direntry() const;
 
         /// @throws curl_exception
-        void insert(bool ReplaceExisting,void* stream) const
-            throw(curl_exception);
+        void insert(bool ReplaceExisting,void* stream) const;
 
         /// @throws curl_exception
         /// @throws malformed_exception
-        void mkdir(bool ReplaceExisting) const
-            throw(curl_exception, malformed_exception, std::exception);
+        void mkdir(bool ReplaceExisting) const;
 
         /// @throws curl_exception
-        OUString ren(const OUString& NewTitle)
-            throw(curl_exception, std::exception);
+        OUString ren(const OUString& NewTitle);
 
         /// @throws curl_exception
         /// @throws malformed_exception
-        void del() const
-            throw(curl_exception, malformed_exception, std::exception);
+        void del() const;
 
 
     private:
@@ -162,13 +156,10 @@ namespace ftp {
         std::vector<OUString> m_aPathSegmentVec;
 
         /// @throws malformed_exception
-        void parse(const OUString& url)
-            throw(
-                malformed_exception
-            );
+        void parse(const OUString& url);
 
         /// @throws curl_exception
-        OUString net_title() const throw(curl_exception, std::exception);
+        OUString net_title() const;
     };
 
 }
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 3a6e231939f1..6b193765dcf3 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -85,7 +85,6 @@ Content::Content(
     const uno::Reference< uno::XComponentContext >& rxContext,
     ContentProvider* pProvider,
     const uno::Reference< ucb::XContentIdentifier >& Identifier)
-        throw ( ucb::ContentCreationException )
     : ContentImplHelper( rxContext, pProvider, Identifier ),
       m_pProvider( pProvider ), mpFile (nullptr), mpInfo( nullptr ), mbTransient(false)
 {
@@ -97,7 +96,6 @@ Content::Content(
     ContentProvider* pProvider,
     const uno::Reference< ucb::XContentIdentifier >& Identifier,
     bool bIsFolder)
-        throw ( ucb::ContentCreationException )
     : ContentImplHelper( rxContext, pProvider, Identifier ),
       m_pProvider( pProvider ), mpFile (nullptr), mpInfo( nullptr ), mbTransient(true)
 {
@@ -126,14 +124,13 @@ OUString Content::getParentURL()
 }
 
 void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
-       throw( uno::RuntimeException, std::exception )
 {
     //TODO
     //stick a map from each CommandId to a new GCancellable and propagate
     //it throughout the g_file_* calls
 }
 
-OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL Content::getContentType()
 {
     return isFolder(uno::Reference< ucb::XCommandEnvironment >())
         ? OUString( GIO_FOLDER_TYPE )
@@ -281,7 +278,6 @@ uno::Any convertToException(GError *pError, const uno::Reference< uno::XInterfac
 }
 
 void convertToIOException(GError *pError, const uno::Reference< uno::XInterface >& rContext)
-    throw( io::IOException, uno::RuntimeException, std::exception )
 {
     try
     {
@@ -856,7 +852,6 @@ bool Content::feedSink( const uno::Reference< uno::XInterface >& xSink,
 
 uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception )
 {
     bool bIsFolder = isFolder(xEnv);
 
@@ -924,9 +919,6 @@ uno::Any SAL_CALL Content::execute(
         const ucb::Command& aCommand,
         sal_Int32 /*CommandId*/,
         const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception,
-           ucb::CommandAbortedException,
-           uno::RuntimeException, std::exception )
 {
     SAL_INFO("ucb.ucp.gio", "Content::execute " << aCommand.Name << "\n");
     uno::Any aRet;
@@ -1012,7 +1004,6 @@ uno::Any SAL_CALL Content::execute(
 }
 
 void Content::destroy( bool bDeletePhysical )
-    throw( uno::Exception, std::exception )
 {
     uno::Reference< ucb::XContent > xThis = this;
 
@@ -1033,7 +1024,6 @@ void Content::destroy( bool bDeletePhysical )
 
 void Content::insert(const uno::Reference< io::XInputStream > &xInputStream,
     bool bReplaceExisting, const uno::Reference< ucb::XCommandEnvironment > &xEnv )
-        throw( uno::Exception )
 {
     GError *pError = nullptr;
     GFileInfo *pInfo = getGFileInfo(xEnv);
@@ -1082,7 +1072,6 @@ const GFileCopyFlags DEFAULT_COPYDATA_FLAGS =
     static_cast<GFileCopyFlags>(G_FILE_COPY_OVERWRITE|G_FILE_COPY_TARGET_DEFAULT_PERMS);
 
 void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception, std::exception )
 {
     OUString sDest = m_xIdentifier->getContentIdentifier();
     if (!sDest.endsWith("/")) {
@@ -1110,7 +1099,6 @@ void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Refer
 
 uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
     const uno::Reference< ucb::XCommandEnvironment >& xEnv)
-            throw( uno::RuntimeException )
 {
     if ( isFolder( xEnv ) )
     {
@@ -1144,14 +1132,12 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
 }
 
 uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo()
-            throw( uno::RuntimeException, std::exception )
 {
     return queryCreatableContentsInfo( uno::Reference< ucb::XCommandEnvironment >() );
 }
 
 uno::Reference< ucb::XContent >
     SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info )
-        throw( uno::RuntimeException, std::exception )
 {
     bool create_document;
     const char *name;
@@ -1187,7 +1173,6 @@ uno::Reference< ucb::XContent >
 }
 
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) )
     {
@@ -1324,19 +1309,18 @@ void SAL_CALL Content::release() throw()
     ContentImplHelper::release();
 }
 
-uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
 {
     uno::Any aRet = cppu::queryInterface( rType, static_cast< ucb::XContentCreator * >( this ) );
     return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface(rType);
 }
 
-OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL Content::getImplementationName()
 {
        return OUString("com.sun.star.comp.GIOContent");
 }
 
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-       throw( uno::RuntimeException, std::exception )
 {
        uno::Sequence<OUString> aSNS { "com.sun.star.ucb.GIOContent" };
        return aSNS;
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 9f505364484b..366eb721f0c7 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -58,8 +58,7 @@ css::uno::Any convertToException(GError *pError,
 /// @throws css::io::IOException
 /// @throws css::uno::RuntimeException
 void convertToIOException(GError *pError,
-    const css::uno::Reference< css::uno::XInterface >& rContext)
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception);
+    const css::uno::Reference< css::uno::XInterface >& rContext);
 
 class ContentProvider;
 class Content : public ::ucbhelper::ContentImplHelper, public css::ucb::XContentCreator
@@ -91,21 +90,18 @@ private:
 
     /// @throws css::uno::Exception
     css::uno::Any open(const css::ucb::OpenCommandArgument2 & rArg,
-        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-            throw( css::uno::Exception );
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void transfer( const css::ucb::TransferInfo& rTransferInfo,
-        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-            throw( css::uno::Exception, std::exception );
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream,
-        bool bReplaceExisting, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-            throw( css::uno::Exception );
+        bool bReplaceExisting, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
-    void destroy( bool bDeletePhysical ) throw( css::uno::Exception, std::exception );
+    void destroy( bool bDeletePhysical );
 
     static void copyData( const css::uno::Reference< css::io::XInputStream >& xIn,
         const css::uno::Reference< css::io::XOutputStream >& xOut );
@@ -125,15 +121,13 @@ public:
     /// @throws css::ucb::ContentCreationException
     Content( const css::uno::Reference<
         css::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
-        const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier)
-            throw ( css::ucb::ContentCreationException );
+        const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier);
 
     /// @throws css::ucb::ContentCreationException
     Content( const css::uno::Reference<
         css::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
         const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
-        bool bIsFolder)
-            throw ( css::ucb::ContentCreationException );
+        bool bIsFolder);
 
     virtual ~Content() override;
 
@@ -153,51 +147,40 @@ public:
     virtual OUString getParentURL() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     virtual OUString SAL_CALL
-    getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationName() override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     virtual OUString SAL_CALL
-    getContentType()
-            throw( css::uno::RuntimeException, std::exception ) override;
+    getContentType() override;
 
     virtual css::uno::Any SAL_CALL
         execute( const css::ucb::Command& aCommand,
         sal_Int32 CommandId,
-        const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-            throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override;
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
 
-    virtual void SAL_CALL abort( sal_Int32 CommandId )
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL abort( sal_Int32 CommandId ) override;
 
     virtual css::uno::Sequence< css::ucb::ContentInfo >
-        SAL_CALL queryCreatableContentsInfo()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL queryCreatableContentsInfo() override;
     virtual css::uno::Reference< css::ucb::XContent >
-        SAL_CALL createNewContent( const css::ucb::ContentInfo& Info )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) override;
 
     /// @throws css::uno::RuntimeException
     css::uno::Sequence< css::ucb::ContentInfo >
         queryCreatableContentsInfo(
-        const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv)
-            throw( css::uno::RuntimeException );
+        const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv);
 
     GFile* getGFile();
 };
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index 4e85e210ec7f..e2069973e38e 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -262,7 +262,7 @@ void DataSupplier::close()
 {
 }
 
-void DataSupplier::validate() throw( ucb::ResultSetException )
+void DataSupplier::validate()
 {
 }
 
diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx
index 9927970c1358..4ff3047ec4c8 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.hxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.hxx
@@ -80,8 +80,7 @@ public:
 
     virtual void close() override;
 
-    virtual void validate()
-        throw( css::ucb::ResultSetException ) override;
+    virtual void validate() override;
 };
 
 }
diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx
index 8c9453122514..2275cb7a6a84 100644
--- a/ucb/source/ucp/gio/gio_inputstream.cxx
+++ b/ucb/source/ucp/gio/gio_inputstream.cxx
@@ -41,21 +41,17 @@ InputStream::~InputStream()
 }
 
 sal_Int32 SAL_CALL InputStream::available()
-    throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception )
 {
     return 0;
 }
 
 void SAL_CALL InputStream::closeInput()
-    throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception )
 {
     if (mpStream)
         g_input_stream_close(G_INPUT_STREAM(mpStream), nullptr, nullptr);
 }
 
 void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip )
-    throw( io::NotConnectedException, io::BufferSizeExceededException,
-      io::IOException, uno::RuntimeException, std::exception )
 {
     // Conservatively call readBytes and discard the read data, but given this
     // InputStream will always be wrapped in comphelper::OSeekableInputWrapper,
@@ -65,8 +61,6 @@ void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip )
 }
 
 sal_Int32 SAL_CALL InputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-    throw( io::NotConnectedException, io::BufferSizeExceededException,
-      io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -89,8 +83,6 @@ sal_Int32 SAL_CALL InputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal
 }
 
 sal_Int32 SAL_CALL InputStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-    throw( io::NotConnectedException, io::BufferSizeExceededException,
-      io::IOException, uno::RuntimeException, std::exception )
 {
     return readBytes(aData, nMaxBytesToRead);
 }
diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx
index 6a08aab71b15..9cee1c54653c 100644
--- a/ucb/source/ucp/gio/gio_inputstream.hxx
+++ b/ucb/source/ucp/gio/gio_inputstream.hxx
@@ -42,34 +42,16 @@ public:
 
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 > & aData,
-        sal_Int32 nBytesToRead )
-            throw( css::io::NotConnectedException,
-                css::io::BufferSizeExceededException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nBytesToRead ) override;
 
     virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 > & aData,
-        sal_Int32 nMaxBytesToRead )
-            throw( css::io::NotConnectedException,
-                css::io::BufferSizeExceededException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+        sal_Int32 nMaxBytesToRead ) override;
 
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-            throw( css::io::NotConnectedException,
-                css::io::BufferSizeExceededException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
 
-    virtual sal_Int32 SAL_CALL available()
-            throw( css::io::NotConnectedException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL available() override;
 
-    virtual void SAL_CALL closeInput()
-            throw( css::io::NotConnectedException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL closeInput() override;
 };
 
 } // namespace gio
diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx
index 4698ab93800c..da504b87e291 100644
--- a/ucb/source/ucp/gio/gio_outputstream.cxx
+++ b/ucb/source/ucp/gio/gio_outputstream.cxx
@@ -41,8 +41,6 @@ OutputStream::~OutputStream()
 }
 
 void SAL_CALL OutputStream::writeBytes( const css::uno::Sequence< sal_Int8 >& rData )
-    throw( io::NotConnectedException, io::BufferSizeExceededException,
-           io::IOException, uno::RuntimeException, std::exception)
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -53,8 +51,6 @@ void SAL_CALL OutputStream::writeBytes( const css::uno::Sequence< sal_Int8 >& rD
 }
 
 void SAL_CALL OutputStream::flush()
-    throw( io::NotConnectedException, io::BufferSizeExceededException,
-           io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -65,14 +61,12 @@ void SAL_CALL OutputStream::flush()
 }
 
 void SAL_CALL OutputStream::closeOutput()
-    throw( io::NotConnectedException, io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if (mpStream)
         g_output_stream_close(G_OUTPUT_STREAM(mpStream), nullptr, nullptr);
 }
 
-uno::Any OutputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception )
+uno::Any OutputStream::queryInterface( const uno::Type &type )
 {
     uno::Any aRet = ::cppu::queryInterface ( type,
         static_cast< XOutputStream * >( this ) );
diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx
index 6cae73ad7555..1b6cf6ffd273 100644
--- a/ucb/source/ucp/gio/gio_outputstream.hxx
+++ b/ucb/source/ucp/gio/gio_outputstream.hxx
@@ -45,29 +45,17 @@ public:
     virtual ~OutputStream() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type )
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type ) override;
     virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); }
     virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
 
     // XOutputStream
-   virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
-           throw( css::io::NotConnectedException,
-                  css::io::BufferSizeExceededException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
+   virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
 
-   virtual void SAL_CALL flush()
-           throw( css::io::NotConnectedException,
-                  css::io::BufferSizeExceededException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception) override;
+   virtual void SAL_CALL flush() override;
 
 
-    virtual void SAL_CALL closeOutput()
-           throw( css::io::NotConnectedException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL closeOutput() override;
 };
 
 } // namespace gio
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 010d658ae777..9c3aa481b78e 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -30,8 +30,6 @@ namespace gio
 uno::Reference< css::ucb::XContent > SAL_CALL
 ContentProvider::queryContent(
             const uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-    throw( css::ucb::IllegalIdentifierException,
-           uno::RuntimeException, std::exception )
 {
     SAL_INFO("ucb.ucp.gio", "QueryContent: " << Identifier->getContentIdentifier());
     osl::MutexGuard aGuard( m_aMutex );
@@ -80,7 +78,6 @@ void SAL_CALL ContentProvider::release()
 }
 
 css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -100,7 +97,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 338811e098c2..d6ebed7047b2 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -34,26 +34,20 @@ public:
     virtual ~ContentProvider() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -64,9 +58,7 @@ public:
 
     // XContentProvider
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 };
 
 }
diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx
index 6566eff801f1..56b295809656 100644
--- a/ucb/source/ucp/gio/gio_seekable.cxx
+++ b/ucb/source/ucp/gio/gio_seekable.cxx
@@ -40,7 +40,6 @@ Seekable::~Seekable()
 }
 
 void SAL_CALL Seekable::truncate()
-    throw( io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -55,7 +54,6 @@ void SAL_CALL Seekable::truncate()
 }
 
 void SAL_CALL Seekable::seek( sal_Int64 location )
-    throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception )
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -69,7 +67,7 @@ void SAL_CALL Seekable::seek( sal_Int64 location )
         convertToIOException(pError, static_cast< cppu::OWeakObject * >(this));
 }
 
-sal_Int64 SAL_CALL Seekable::getPosition() throw( io::IOException, uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL Seekable::getPosition()
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -77,7 +75,7 @@ sal_Int64 SAL_CALL Seekable::getPosition() throw( io::IOException, uno::RuntimeE
     return g_seekable_tell(mpStream);
 }
 
-sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeException, std::exception )
+sal_Int64 SAL_CALL Seekable::getLength()
 {
     if (!mpStream)
         throw io::NotConnectedException();
@@ -112,7 +110,7 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc
     return nSize;
 }
 
-uno::Any Seekable::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception )
+uno::Any Seekable::queryInterface( const uno::Type &type )
 {
     uno::Any aRet = ::cppu::queryInterface ( type,
         static_cast< XSeekable * >( this ) );
diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx
index 2781c6ba12cf..0d3a62dccde2 100644
--- a/ucb/source/ucp/gio/gio_seekable.hxx
+++ b/ucb/source/ucp/gio/gio_seekable.hxx
@@ -43,29 +43,19 @@ public:
     virtual ~Seekable() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type )
-            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type ) override;
     virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); }
     virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
 
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location )
-            throw( css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
 
-    virtual sal_Int64 SAL_CALL getPosition()
-            throw( css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
 
-    virtual sal_Int64 SAL_CALL getLength()
-            throw( css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
     // XTruncate
-    virtual void SAL_CALL truncate()
-            throw( css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL truncate() override;
 };
 
 } // namespace gio
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 6ece6a1d308c..2d6d3dedf114 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -168,7 +168,6 @@ void SAL_CALL HierarchyContent::release()
 
 // virtual
 uno::Any SAL_CALL HierarchyContent::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = ContentImplHelper::queryInterface( rType );
 
@@ -197,7 +196,6 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyContent );
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     cppu::OTypeCollection * pCollection = nullptr;
 
@@ -276,7 +274,6 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes()
 
 // virtual
 OUString SAL_CALL HierarchyContent::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.HierarchyContent" );
 }
@@ -285,7 +282,6 @@ OUString SAL_CALL HierarchyContent::getImplementationName()
 // virtual
 uno::Sequence< OUString > SAL_CALL
 HierarchyContent::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aSNS( 1 );
 
@@ -305,7 +301,6 @@ HierarchyContent::getSupportedServiceNames()
 
 // virtual
 OUString SAL_CALL HierarchyContent::getContentType()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_aProps.getContentType();
 }
@@ -314,7 +309,6 @@ OUString SAL_CALL HierarchyContent::getContentType()
 // virtual
 uno::Reference< ucb::XContentIdentifier > SAL_CALL
 HierarchyContent::getIdentifier()
-    throw( uno::RuntimeException, std::exception )
 {
     // Transient?
     if ( m_eState == TRANSIENT )
@@ -335,9 +329,6 @@ uno::Any SAL_CALL HierarchyContent::execute(
         const ucb::Command& aCommand,
         sal_Int32 /*CommandId*/,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception,
-           ucb::CommandAbortedException,
-           uno::RuntimeException, std::exception )
 {
     uno::Any aRet;
 
@@ -552,7 +543,6 @@ uno::Any SAL_CALL HierarchyContent::execute(
 
 // virtual
 void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ )
-    throw( uno::RuntimeException, std::exception )
 {
     // @@@ Generally, no action takes much time...
 }
@@ -564,7 +554,6 @@ void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ )
 // virtual
 uno::Sequence< ucb::ContentInfo > SAL_CALL
 HierarchyContent::queryCreatableContentsInfo()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_aProps.getCreatableContentsInfo();
 }
@@ -573,7 +562,6 @@ HierarchyContent::queryCreatableContentsInfo()
 // virtual
 uno::Reference< ucb::XContent > SAL_CALL
 HierarchyContent::createNewContent( const ucb::ContentInfo& Info )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( isFolder() )
     {
@@ -1058,7 +1046,6 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
 uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
         const uno::Sequence< beans::PropertyValue >& rValues,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1363,7 +1350,6 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
 void HierarchyContent::insert( sal_Int32 nNameClashResolve,
                                const uno::Reference<
                                     ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1509,7 +1495,6 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
 void HierarchyContent::destroy( bool bDeletePhysical,
                                 const uno::Reference<
                                     ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     // @@@ take care about bDeletePhysical -> trashcan support
 
@@ -1566,7 +1551,6 @@ void HierarchyContent::destroy( bool bDeletePhysical,
 void HierarchyContent::transfer(
             const ucb::TransferInfo& rInfo,
             const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 7bcd7a397db4..60b19b2aa71c 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -167,23 +167,19 @@ private:
     css::uno::Sequence< css::uno::Any >
     setPropertyValues(
             const css::uno::Sequence< css::beans::PropertyValue >& rValues,
-            const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+            const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void insert( sal_Int32 nNameClashResolve,
-                 const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                 const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void destroy( bool bDeletePhysical,
-                  const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                  const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void transfer( const css::ucb::TransferInfo& rInfo,
-                   const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                   const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
 public:
     // Create existing content. Fail, if not already exists.
@@ -203,46 +199,35 @@ public:
     virtual ~HierarchyContent() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL
-    getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     // XContent
     virtual OUString SAL_CALL
-    getContentType()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContentType() override;
     virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-    getIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getIdentifier() override;
 
     // XCommandProcessor
     virtual css::uno::Any SAL_CALL
     execute( const css::ucb::Command& aCommand,
              sal_Int32 CommandId,
-             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception ) override;
+             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
     virtual void SAL_CALL
-    abort( sal_Int32 CommandId )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    abort( sal_Int32 CommandId ) override;
 
 
     // Additional interfaces
@@ -250,11 +235,9 @@ public:
 
     // XContentCreator
     virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL
-    queryCreatableContentsInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryCreatableContentsInfo() override;
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    createNewContent( const css::ucb::ContentInfo& Info )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createNewContent( const css::ucb::ContentInfo& Info ) override;
 
 
     // Non-interface methods.
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 4337e17761c9..b9ba11f2eaa5 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -91,117 +91,81 @@ public:
                          bool bReadOnly );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XComponent
     virtual void SAL_CALL
-    dispose()
-        throw ( uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const uno::Reference< lang::XEventListener > & xListener )
-        throw ( uno::RuntimeException, std::exception ) override;
+    addEventListener( const uno::Reference< lang::XEventListener > & xListener ) override;
     virtual void SAL_CALL
     removeEventListener( const uno::Reference<
-                            lang::XEventListener > & aListener )
-        throw ( uno::RuntimeException, std::exception ) override;
+                            lang::XEventListener > & aListener ) override;
 
     // XSingleServiceFactory
     virtual uno::Reference< uno::XInterface > SAL_CALL
-    createInstance()
-        throw ( uno::Exception, uno::RuntimeException, std::exception ) override;
+    createInstance() override;
     virtual uno::Reference< uno::XInterface > SAL_CALL
-    createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments )
-        throw ( uno::Exception, uno::RuntimeException, std::exception ) override;
+    createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) override;
 
     // XHierarchicalNameAccess
     virtual uno::Any SAL_CALL
-    getByHierarchicalName( const OUString & aName )
-        throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ) override;
+    getByHierarchicalName( const OUString & aName ) override;
     virtual sal_Bool SAL_CALL
-    hasByHierarchicalName( const OUString & aName )
-        throw ( uno::RuntimeException, std::exception ) override;
+    hasByHierarchicalName( const OUString & aName ) override;
 
     // XNameContainer
     virtual void SAL_CALL
-    insertByName( const OUString & aName, const uno::Any & aElement )
-        throw ( lang::IllegalArgumentException,
-                container::ElementExistException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception ) override;
+    insertByName( const OUString & aName, const uno::Any & aElement ) override;
     virtual void SAL_CALL
-    removeByName( const OUString & Name )
-        throw ( container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception ) override;
+    removeByName( const OUString & Name ) override;
 
     // XNameReplace ( base of XNameContainer )
     virtual void SAL_CALL
-    replaceByName( const OUString & aName, const uno::Any & aElement )
-        throw ( lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception ) override;
+    replaceByName( const OUString & aName, const uno::Any & aElement ) override;
 
     // XNameAccess ( base of XNameReplace )
     virtual uno::Any SAL_CALL
-    getByName( const OUString & aName )
-        throw ( container::NoSuchElementException,
-                lang::WrappedTargetException,
-                uno::RuntimeException, std::exception ) override;
+    getByName( const OUString & aName ) override;
     virtual uno::Sequence< OUString > SAL_CALL
-    getElementNames()
-        throw ( uno::RuntimeException, std::exception ) override;
+    getElementNames() override;
     virtual sal_Bool SAL_CALL
-    hasByName( const OUString & aName )
-        throw ( uno::RuntimeException, std::exception ) override;
+    hasByName( const OUString & aName ) override;
 
     // XElementAccess ( base of XNameAccess )
     virtual uno::Type SAL_CALL
-    getElementType()
-        throw ( uno::RuntimeException, std::exception ) override;
+    getElementType() override;
     virtual sal_Bool SAL_CALL
-    hasElements()
-        throw ( uno::RuntimeException, std::exception ) override;
+    hasElements() override;
 
     // XChangesNotifier
     virtual void SAL_CALL
     addChangesListener( const uno::Reference<
-                            util::XChangesListener > & aListener )
-        throw ( uno::RuntimeException, std::exception ) override;
+                            util::XChangesListener > & aListener ) override;
     virtual void SAL_CALL
     removeChangesListener( const uno::Reference<
-                            util::XChangesListener > & aListener )
-        throw ( uno::RuntimeException, std::exception ) override;
+                            util::XChangesListener > & aListener ) override;
 
     // XChangesBatch
     virtual void SAL_CALL
-    commitChanges()
-        throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) override;
+    commitChanges() override;
     virtual sal_Bool SAL_CALL
-    hasPendingChanges()
-        throw ( uno::RuntimeException, std::exception ) override;
+    hasPendingChanges() override;
     virtual uno::Sequence< util::ElementChange > SAL_CALL
-    getPendingChanges()
-        throw ( uno::RuntimeException, std::exception ) override;
+    getPendingChanges() override;
 };
 
 } // namespace hcp_impl
@@ -240,7 +204,6 @@ void SAL_CALL HierarchyDataSource::release()
 }
 
 css::uno::Any SAL_CALL HierarchyDataSource::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -268,7 +231,6 @@ XSERVICEINFO_COMMOM_IMPL( HierarchyDataSource,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 HierarchyDataSource_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new HierarchyDataSource( ucbhelper::getComponentContext(rSMgr) ));
@@ -292,7 +254,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource );
 
 // virtual
 void SAL_CALL HierarchyDataSource::dispose()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -308,7 +269,6 @@ void SAL_CALL HierarchyDataSource::dispose()
 // virtual
 void SAL_CALL HierarchyDataSource::addEventListener(
                     const uno::Reference< lang::XEventListener > & Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -323,7 +283,6 @@ void SAL_CALL HierarchyDataSource::addEventListener(
 // virtual
 void SAL_CALL HierarchyDataSource::removeEventListener(
                     const uno::Reference< lang::XEventListener > & Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -338,7 +297,6 @@ void SAL_CALL HierarchyDataSource::removeEventListener(
 // virtual
 uno::Reference< uno::XInterface > SAL_CALL
 HierarchyDataSource::createInstance( const OUString & aServiceSpecifier )
-    throw ( uno::Exception, uno::RuntimeException, std::exception )
 {
     // Create view to root node.
 
@@ -358,7 +316,6 @@ uno::Reference< uno::XInterface > SAL_CALL
 HierarchyDataSource::createInstanceWithArguments(
                                 const OUString & ServiceSpecifier,
                                 const uno::Sequence< uno::Any > & Arguments )
-    throw ( uno::Exception, uno::RuntimeException, std::exception )
 {
     return createInstanceWithArguments( ServiceSpecifier, Arguments, true );
 }
@@ -367,7 +324,6 @@ HierarchyDataSource::createInstanceWithArguments(
 // virtual
 uno::Sequence< OUString > SAL_CALL
 HierarchyDataSource::getAvailableServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aNames( 2 );
     aNames[ 0 ] = READ_SERVICE_NAME;
@@ -384,7 +340,6 @@ HierarchyDataSource::createInstanceWithArguments(
                                 const OUString & ServiceSpecifier,
                                 const uno::Sequence< uno::Any > & Arguments,
                                 bool bCheckArgs )
-    throw ( uno::Exception, uno::RuntimeException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -618,7 +573,6 @@ void SAL_CALL HierarchyDataAccess::release()
 
 // virtual
 uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType )
-    throw ( uno::RuntimeException, std::exception )
 {
     // Interfaces supported in read-only and read-write mode.
     uno::Any aRet = cppu::queryInterface( aType,
@@ -652,7 +606,6 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyDataAccess );
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     cppu::OTypeCollection * pCollection = nullptr;
 
@@ -722,19 +675,16 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes()
 // XServiceInfo methods.
 
 OUString SAL_CALL HierarchyDataAccess::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString("com.sun.star.comp.ucb.HierarchyDataAccess");
 }
 
 sal_Bool SAL_CALL HierarchyDataAccess::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { READ_SERVICE_NAME, READWRITE_SERVICE_NAME };
 }
@@ -745,7 +695,6 @@ css::uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getSupportedService
 
 // virtual
 void SAL_CALL HierarchyDataAccess::dispose()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< lang::XComponent > xOrig
         = ENSURE_ORIG_INTERFACE( lang::XComponent, C );
@@ -759,7 +708,6 @@ void SAL_CALL HierarchyDataAccess::dispose()
 // virtual
 void SAL_CALL HierarchyDataAccess::addEventListener(
                     const uno::Reference< lang::XEventListener > & xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< lang::XComponent > xOrig
         = ENSURE_ORIG_INTERFACE( lang::XComponent, C );
@@ -773,7 +721,6 @@ void SAL_CALL HierarchyDataAccess::addEventListener(
 // virtual
 void SAL_CALL HierarchyDataAccess::removeEventListener(
                     const uno::Reference< lang::XEventListener > & aListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< lang::XComponent > xOrig
         = ENSURE_ORIG_INTERFACE( lang::XComponent, C );
@@ -790,7 +737,6 @@ void SAL_CALL HierarchyDataAccess::removeEventListener(
 // virtual
 uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName(
                                                 const OUString & aName )
-    throw ( container::NoSuchElementException, uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XHierarchicalNameAccess > xOrig
         = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA );
@@ -805,7 +751,6 @@ uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName(
 // virtual
 sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName(
                                                 const OUString & aName )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XHierarchicalNameAccess > xOrig
         = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA );
@@ -822,9 +767,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName(
 
 // virtual
 uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName )
-    throw ( container::NoSuchElementException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XNameAccess > xOrig
         = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA );
@@ -837,7 +779,6 @@ uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName )
 
 // virtual
 uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XNameAccess > xOrig
         = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA );
@@ -850,7 +791,6 @@ uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames()
 
 // virtual
 sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XNameAccess > xOrig
         = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA );
@@ -866,7 +806,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName )
 
 // virtual
 uno::Type SAL_CALL HierarchyDataAccess::getElementType()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XElementAccess > xOrig
         = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA );
@@ -879,7 +818,6 @@ uno::Type SAL_CALL HierarchyDataAccess::getElementType()
 
 // virtual
 sal_Bool SAL_CALL HierarchyDataAccess::hasElements()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XElementAccess > xOrig
         = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA );
@@ -896,7 +834,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasElements()
 // virtual
 void SAL_CALL HierarchyDataAccess::addChangesListener(
                 const uno::Reference< util::XChangesListener > & aListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< util::XChangesNotifier > xOrig
         = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN );
@@ -910,7 +847,6 @@ void SAL_CALL HierarchyDataAccess::addChangesListener(
 // virtual
 void SAL_CALL HierarchyDataAccess::removeChangesListener(
                 const uno::Reference< util::XChangesListener > & aListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< util::XChangesNotifier > xOrig
         = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN );
@@ -926,7 +862,6 @@ void SAL_CALL HierarchyDataAccess::removeChangesListener(
 
 // virtual
 uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance()
-    throw ( uno::Exception, uno::RuntimeException, std::exception )
 {
     uno::Reference< lang::XSingleServiceFactory > xOrig
         = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF );
@@ -941,7 +876,6 @@ uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance()
 uno::Reference< uno::XInterface > SAL_CALL
 HierarchyDataAccess::createInstanceWithArguments(
                             const uno::Sequence< uno::Any > & aArguments )
-    throw ( uno::Exception, uno::RuntimeException, std::exception )
 {
     uno::Reference< lang::XSingleServiceFactory > xOrig
         = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF );
@@ -959,10 +893,6 @@ HierarchyDataAccess::createInstanceWithArguments(
 void SAL_CALL
 HierarchyDataAccess::insertByName( const OUString & aName,
                                    const uno::Any & aElement )
-    throw ( lang::IllegalArgumentException,
-            container::ElementExistException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XNameContainer > xOrig
         = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC );
@@ -976,9 +906,6 @@ HierarchyDataAccess::insertByName( const OUString & aName,
 // virtual
 void SAL_CALL
 HierarchyDataAccess::removeByName( const OUString & Name )
-    throw ( container::NoSuchElementException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XNameContainer > xOrig
         = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC );
@@ -995,10 +922,6 @@ HierarchyDataAccess::removeByName( const OUString & Name )
 // virtual
 void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName,
                                                   const uno::Any & aElement )
-    throw ( lang::IllegalArgumentException,
-            container::NoSuchElementException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     uno::Reference< container::XNameReplace > xOrig
         = ENSURE_ORIG_INTERFACE( container::XNameReplace, NR );
@@ -1014,7 +937,6 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName,
 
 // virtual
 void SAL_CALL HierarchyDataAccess::commitChanges()
-    throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     uno::Reference< util::XChangesBatch > xOrig
         = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB );
@@ -1027,7 +949,6 @@ void SAL_CALL HierarchyDataAccess::commitChanges()
 
 // virtual
 sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< util::XChangesBatch > xOrig
         = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB );
@@ -1041,7 +962,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges()
 // virtual
 uno::Sequence< util::ElementChange > SAL_CALL
 HierarchyDataAccess::getPendingChanges()
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Reference< util::XChangesBatch > xOrig
         = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB );
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 2f9b5cf79295..244063e5ee0d 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -51,20 +51,16 @@ public:
     virtual ~HierarchyDataSource() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -73,30 +69,20 @@ public:
                           css::lang::XMultiServiceFactory >& rxServiceMgr );
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XComponent
-    virtual void SAL_CALL dispose()
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) override;
 
     // XMultiServiceFactory
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString & aServiceSpecifier )
-        throw ( css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString & aServiceSpecifier ) override;
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier,
                                  const css::uno::Sequence<
-                                    css::uno::Any > & Arguments )
-        throw ( css::uno::Exception,
-                css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+                                    css::uno::Any > & Arguments ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
 
     // Non-Interface methods
 
@@ -105,8 +91,7 @@ private:
     css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier,
                                  const css::uno::Sequence<
                                     css::uno::Any > & Arguments,
-                                 bool bCheckArgs )
-        throw ( css::uno::Exception, css::uno::RuntimeException );
+                                 bool bCheckArgs );
 
     css::uno::Reference< css::lang::XMultiServiceFactory > getConfigProvider();
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index 3796652a9e79..8c05f4b9df8f 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -384,7 +384,6 @@ void HierarchyResultSetDataSupplier::close()
 
 // virtual
 void HierarchyResultSetDataSupplier::validate()
-    throw( ucb::ResultSetException )
 {
 }
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
index 27e87c8f8495..8982a2905a06 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
@@ -64,8 +64,7 @@ public:
 
     virtual void close() override;
 
-    virtual void validate()
-        throw( css::ucb::ResultSetException ) override;
+    virtual void validate() override;
 };
 
 } // namespace hierarchy_ucp
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index 3a7d3eb582f9..48ed7f1b588e 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -72,7 +72,6 @@ void SAL_CALL HierarchyContentProvider::release()
 }
 
 css::uno::Any SAL_CALL HierarchyContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -100,7 +99,6 @@ XSERVICEINFO_COMMOM_IMPL( HierarchyContentProvider,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 HierarchyContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new HierarchyContentProvider( ucbhelper::getComponentContext(rSMgr) ));
@@ -127,7 +125,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyContentProvider );
 uno::Reference< ucb::XContent > SAL_CALL
 HierarchyContentProvider::queryContent(
         const uno::Reference< ucb::XContentIdentifier >& Identifier )
-    throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception )
 {
     HierarchyUri aUri( Identifier->getContentIdentifier() );
     if ( !aUri.isValid() )
@@ -161,7 +158,6 @@ HierarchyContentProvider::queryContent(
 // virtual
 void SAL_CALL HierarchyContentProvider::initialize(
                                 const uno::Sequence< uno::Any >& aArguments )
-    throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     if ( aArguments.getLength() > 0 )
         OSL_FAIL( "HierarchyContentProvider::initialize : not supported!" );
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 8eb74d17519a..4bde1b14600f 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -74,26 +74,20 @@ public:
     virtual ~HierarchyContentProvider() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -104,15 +98,11 @@ public:
 
     // XContentProvider
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
     // XInitialization
     virtual void SAL_CALL
-    initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw( css::uno::Exception,
-               css::uno::RuntimeException, std::exception ) override;
+    initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // Non-Interface methods
     css::uno::Reference< css::lang::XMultiServiceFactory >
diff --git a/ucb/source/ucp/image/ucpimage.cxx b/ucb/source/ucp/image/ucpimage.cxx
index 723e7a22aaf0..f25b17636029 100644
--- a/ucb/source/ucp/image/ucpimage.cxx
+++ b/ucb/source/ucp/image/ucpimage.cxx
@@ -46,16 +46,13 @@ public:
     {}
 
 private:
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.comp.ucb.ImageContentProvider"); }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
         return css::uno::Sequence<OUString>{
             "com.sun.star.ucb.ImageContentProvider"};
@@ -63,9 +60,6 @@ private:
 
     css::uno::Reference<css::ucb::XContent> SAL_CALL queryContent(
         css::uno::Reference<css::ucb::XContentIdentifier> const & Identifier)
-        throw (
-            css::ucb::IllegalIdentifierException, css::uno::RuntimeException,
-            std::exception)
         override
     {
         css::uno::Reference<css::uno::XComponentContext> context;
@@ -145,8 +139,7 @@ private:
 
     sal_Int32 SAL_CALL compareContentIds(
         css::uno::Reference<css::ucb::XContentIdentifier> const & Id1,
-        css::uno::Reference<css::ucb::XContentIdentifier> const & Id2)
-        throw (css::uno::RuntimeException, std::exception) override
+        css::uno::Reference<css::ucb::XContentIdentifier> const & Id2) override
     {
         return Id1->getContentIdentifier().compareTo(
             Id2->getContentIdentifier());
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 983d7b54e3f0..5a4153124bd6 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -291,7 +291,6 @@ void SAL_CALL Content::release()
 
 // virtual
 uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet;
 
@@ -311,7 +310,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     cppu::OTypeCollection * pCollection = nullptr;
 
@@ -390,7 +388,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 
 // virtual
 OUString SAL_CALL Content::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.PackageContent" );
 }
@@ -398,7 +395,6 @@ OUString SAL_CALL Content::getImplementationName()
 
 // virtual
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aSNS( 1 );
     if ( isFolder() )
@@ -415,7 +411,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
 
 // virtual
 OUString SAL_CALL Content::getContentType()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_aProps.aContentType;
 }
@@ -429,9 +424,6 @@ uno::Any SAL_CALL Content::execute(
         const ucb::Command& aCommand,
         sal_Int32 /*CommandId*/,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception,
-           ucb::CommandAbortedException,
-           uno::RuntimeException, std::exception )
 {
     uno::Any aRet;
 
@@ -669,7 +661,6 @@ uno::Any SAL_CALL Content::execute(
 
 // virtual
 void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
-    throw( uno::RuntimeException, std::exception )
 {
     // @@@ Implement logic to abort running commands, if this makes
     //     sense for your content.
@@ -682,7 +673,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
 // virtual
 uno::Sequence< ucb::ContentInfo > SAL_CALL
 Content::queryCreatableContentsInfo()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_aProps.getCreatableContentsInfo( m_aUri );
 }
@@ -691,7 +681,6 @@ Content::queryCreatableContentsInfo()
 // virtual
 uno::Reference< ucb::XContent > SAL_CALL
 Content::createNewContent( const ucb::ContentInfo& Info )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( isFolder() )
     {
@@ -1016,7 +1005,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 uno::Sequence< uno::Any > Content::setPropertyValues(
         const uno::Sequence< beans::PropertyValue >& rValues,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1424,7 +1412,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 uno::Any Content::open(
                 const ucb::OpenCommandArgument2& rArg,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception, std::exception )
 {
     if ( rArg.Mode == ucb::OpenMode::ALL ||
          rArg.Mode == ucb::OpenMode::FOLDERS ||
@@ -1573,7 +1560,6 @@ void Content::insert(
             const uno::Reference< io::XInputStream >& xStream,
             sal_Int32 nNameClashResolve,
             const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1731,7 +1717,6 @@ void Content::insert(
 void Content::destroy(
                 bool bDeletePhysical,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception, std::exception )
 {
     // @@@ take care about bDeletePhysical -> trashcan support
 
@@ -1777,7 +1762,6 @@ void Content::destroy(
 void Content::transfer(
             const ucb::TransferInfo& rInfo,
             const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index 865fe9167b15..f6b0ad555b56 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -134,8 +134,7 @@ private:
     /// @throws css::uno::Exception
     css::uno::Sequence< css::uno::Any >
     setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues,
-                       const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                       const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     css::uno::Reference< css::container::XHierarchicalNameAccess >
     getPackage( const PackageUri& rURI );
@@ -176,25 +175,21 @@ private:
     /// @throws css::uno::Exception
     css::uno::Any
     open( const css::ucb::OpenCommandArgument2& rArg,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void insert( const css::uno::Reference< css::io::XInputStream >& xStream,
                  sal_Int32 nNameClashResolve,
                  const css::uno::Reference<
-                    css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                    css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void destroy( bool bDeletePhysical,
-                  const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                  const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void transfer( const css::ucb::TransferInfo& rInfo,
-                   const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                   const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     css::uno::Reference< css::io::XInputStream >
     getInputStream();
@@ -218,43 +213,33 @@ public:
     virtual ~Content() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL
-    getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     // XContent
     virtual OUString SAL_CALL
-    getContentType()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContentType() override;
 
     // XCommandProcessor
     virtual css::uno::Any SAL_CALL
     execute( const css::ucb::Command& aCommand,
              sal_Int32 CommandId,
-             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception ) override;
+             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
     virtual void SAL_CALL
-    abort( sal_Int32 CommandId )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    abort( sal_Int32 CommandId ) override;
 
 
     // Additional interfaces
@@ -262,11 +247,9 @@ public:
 
     // XContentCreator
     virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL
-    queryCreatableContentsInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryCreatableContentsInfo() override;
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    createNewContent( const css::ucb::ContentInfo& Info )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createNewContent( const css::ucb::ContentInfo& Info ) override;
 
 
     // Non-interface methods.
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index 1137516fbb6e..6ed79632272b 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -430,7 +430,6 @@ void DataSupplier::close()
 
 // virtual
 void DataSupplier::validate()
-    throw( ucb::ResultSetException )
 {
     if ( m_pImpl->m_bThrowException )
         throw ucb::ResultSetException();
diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx
index 5b40c24c437a..678fd2940218 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.hxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.hxx
@@ -56,8 +56,7 @@ public:
 
     virtual void close() override;
 
-    virtual void validate()
-        throw( css::ucb::ResultSetException ) override;
+    virtual void validate() override;
 
     OUString assembleChildURL( const OUString& aName );
 };
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 4095c2f64a8b..8178245b8fe9 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -62,8 +62,7 @@ public:
 
     // XInterface
     virtual uno::Any SAL_CALL
-    queryInterface( const uno::Type& aType )
-        throw( uno::RuntimeException, std::exception ) override
+    queryInterface( const uno::Type& aType ) override
     { return m_xNA->queryInterface( aType ); }
     virtual void SAL_CALL
     acquire() throw() override
@@ -74,12 +73,10 @@ public:
 
     // XHierarchicalNameAccess
     virtual uno::Any SAL_CALL
-    getByHierarchicalName( const OUString& aName )
-        throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) override
+    getByHierarchicalName( const OUString& aName ) override
     { return m_xNA->getByHierarchicalName( aName ); }
     virtual sal_Bool SAL_CALL
-    hasByHierarchicalName( const OUString& aName )
-        throw( uno::RuntimeException, std::exception ) override
+    hasByHierarchicalName( const OUString& aName ) override
     { return m_xNA->hasByHierarchicalName( aName ); }
 };
 
@@ -128,7 +125,6 @@ void SAL_CALL ContentProvider::release()
 }
 
 css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -154,7 +150,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
@@ -180,7 +175,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 // virtual
 uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent(
             const uno::Reference< ucb::XContentIdentifier >& Identifier )
-    throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception )
 {
     if ( !Identifier.is() )
         return uno::Reference< ucb::XContent >();
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index dad04ea69091..c0c1b5b75fd6 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -52,26 +52,20 @@ public:
     virtual ~ContentProvider() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -82,9 +76,7 @@ public:
 
     // XContentProvider
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
 
     // Non-interface methods.
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 189d8d7365ce..5b5e5ec9f506 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -183,7 +183,6 @@ void SAL_CALL Content::release()
 
 // virtual
 uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = ContentImplHelper::queryInterface( rType );
 
@@ -210,7 +209,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     cppu::OTypeCollection * pCollection = nullptr;
 
@@ -289,7 +287,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 
 // virtual
 OUString SAL_CALL Content::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.TransientDocumentsContent" );
 }
@@ -297,7 +294,6 @@ OUString SAL_CALL Content::getImplementationName()
 
 // virtual
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -321,7 +317,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
 
 // virtual
 OUString SAL_CALL Content::getContentType()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     return m_aProps.getContentType();
@@ -331,7 +326,6 @@ OUString SAL_CALL Content::getContentType()
 // virtual
 uno::Reference< ucb::XContentIdentifier > SAL_CALL
 Content::getIdentifier()
-    throw( uno::RuntimeException, std::exception )
 {
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -355,9 +349,6 @@ uno::Any SAL_CALL Content::execute(
         const ucb::Command& aCommand,
         sal_Int32 /*CommandId*/,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception,
-           ucb::CommandAbortedException,
-           uno::RuntimeException, std::exception )
 {
     uno::Any aRet;
 
@@ -649,7 +640,6 @@ uno::Any SAL_CALL Content::execute(
 
 // virtual
 void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
@@ -660,7 +650,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
 // virtual
 uno::Sequence< ucb::ContentInfo > SAL_CALL
 Content::queryCreatableContentsInfo()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_aProps.getCreatableContentsInfo();
 }
@@ -669,7 +658,6 @@ Content::queryCreatableContentsInfo()
 // virtual
 uno::Reference< ucb::XContent > SAL_CALL
 Content::createNewContent( const ucb::ContentInfo& Info )
-    throw( uno::RuntimeException, std::exception )
 {
     if ( m_aProps.isContentCreator() )
     {
@@ -1108,7 +1096,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 uno::Sequence< uno::Any > Content::setPropertyValues(
         const uno::Sequence< beans::PropertyValue >& rValues,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1384,7 +1371,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 uno::Any Content::open(
                 const ucb::OpenCommandArgument2& rArg,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception )
 {
     if ( rArg.Mode == ucb::OpenMode::ALL ||
          rArg.Mode == ucb::OpenMode::FOLDERS ||
@@ -1568,7 +1554,6 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
                       sal_Int32 nNameClashResolve,
                       const uno::Reference<
                           ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1740,7 +1725,6 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
 void Content::destroy( bool bDeletePhysical,
                        const uno::Reference<
                            ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     // @@@ take care about bDeletePhysical -> trashcan support
 
@@ -1889,7 +1873,6 @@ void Content::notifyChildInserted( const OUString & rRelativeChildUri )
 void Content::transfer(
             const ucb::TransferInfo& rInfo,
             const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
@@ -2329,9 +2312,6 @@ bool Content::loadData( ContentProvider* pProvider,
 bool Content::storeData( const uno::Reference< io::XInputStream >& xData,
                          const uno::Reference<
                             ucb::XCommandEnvironment >& xEnv )
-    throw ( ucb::CommandFailedException,
-            task::DocumentPasswordRequest,
-            css::uno::RuntimeException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -2726,8 +2706,6 @@ static OUString obtainPassword(
         const OUString & rName,
         task::PasswordRequestMode eMode,
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw ( ucb::CommandFailedException,
-            task::DocumentPasswordRequest )
 {
     rtl::Reference< DocumentPasswordRequest > xRequest
         = new DocumentPasswordRequest( eMode, rName );
@@ -2781,9 +2759,6 @@ static OUString obtainPassword(
 
 uno::Reference< io::XInputStream > Content::getInputStream(
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw ( ucb::CommandFailedException,
-            task::DocumentPasswordRequest,
-            uno::RuntimeException )
 {
     OUString aUri;
     OUString aPassword;
@@ -2827,9 +2802,6 @@ static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream(
                 const OUString & rUri,
                 ContentProvider * pProvider,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw ( ucb::CommandFailedException,
-            task::DocumentPasswordRequest,
-            uno::RuntimeException )
 {
     OUString aPassword;
     bool bPasswordRequested = false;
@@ -2858,9 +2830,6 @@ static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream(
 
 uno::Reference< io::XOutputStream > Content::getTruncatedOutputStream(
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw ( ucb::CommandFailedException,
-            task::DocumentPasswordRequest,
-            css::uno::RuntimeException )
 {
     OSL_ENSURE( m_aProps.getType() == STREAM,
                 "Content::getTruncatedOutputStream - content is no stream!" );
@@ -2874,9 +2843,6 @@ uno::Reference< io::XOutputStream > Content::getTruncatedOutputStream(
 
 uno::Reference< io::XStream > Content::getStream(
         const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw ( ucb::CommandFailedException,
-            task::DocumentPasswordRequest,
-            uno::RuntimeException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 45be23bc6bc3..25502ba5499b 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -124,10 +124,7 @@ private:
     /// @throws css::task::DocumentPasswordRequest
     /// @throws css::uno::RuntimeException
     bool storeData( const css::uno::Reference< css::io::XInputStream >& xData,
-                    const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::ucb::CommandFailedException,
-                css::task::DocumentPasswordRequest,
-                css::uno::RuntimeException );
+                    const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
     void renameData( const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId,
                      const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId );
     bool removeData();
@@ -150,30 +147,25 @@ private:
     /// @throws css::uno::Exception
     setPropertyValues(
             const css::uno::Sequence< css::beans::PropertyValue >& rValues,
-            const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+            const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     css::uno::Any
     open( const css::ucb::OpenCommandArgument2& rArg,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw( css::uno::Exception );
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     void insert( const css::uno::Reference< css::io::XInputStream >& xData,
                  sal_Int32 nNameClashResolve,
-                 const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception );
+                 const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void destroy( bool bDeletePhysical,
-                  const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                  const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::Exception
     void transfer( const css::ucb::TransferInfo& rInfo,
-                   const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+                   const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     static css::uno::Reference< css::sdbc::XRow >
     getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -193,20 +185,14 @@ private:
     /// @throws css::task::DocumentPasswordRequest
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XInputStream >
-    getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( css::ucb::CommandFailedException,
-                css::task::DocumentPasswordRequest,
-                css::uno::RuntimeException );
+    getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::ucb::CommandFailedException
     /// @throws css::task::DocumentPasswordRequest
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XOutputStream >
     getTruncatedOutputStream(
-        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( css::ucb::CommandFailedException,
-                css::task::DocumentPasswordRequest,
-                css::uno::RuntimeException );
+        const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     css::uno::Reference< css::ucb::XContent >
     queryChildContent( const OUString & rRelativeChildUri );
@@ -215,10 +201,7 @@ private:
     /// @throws css::task::DocumentPasswordRequest
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XStream >
-    getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( css::ucb::CommandFailedException,
-                css::task::DocumentPasswordRequest,
-                css::uno::RuntimeException );
+    getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
 public:
     // Create existing content. Fail, if not already exists.
@@ -237,46 +220,35 @@ public:
     virtual ~Content() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL
-    getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     // XContent
     virtual OUString SAL_CALL
-    getContentType()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContentType() override;
     virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-    getIdentifier()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getIdentifier() override;
 
     // XCommandProcessor
     virtual css::uno::Any SAL_CALL
     execute( const css::ucb::Command& aCommand,
              sal_Int32 CommandId,
-             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception ) override;
+             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
     virtual void SAL_CALL
-    abort( sal_Int32 CommandId )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    abort( sal_Int32 CommandId ) override;
 
 
     // Additional interfaces
@@ -284,11 +256,9 @@ public:
 
     // XContentCreator
     virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL
-    queryCreatableContentsInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryCreatableContentsInfo() override;
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    createNewContent( const css::ucb::ContentInfo& Info )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createNewContent( const css::ucb::ContentInfo& Info ) override;
 
 
     // Non-interface methods.
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index c8213ae8e7f5..b9e4d3dae2db 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -378,7 +378,6 @@ void ResultSetDataSupplier::close()
 
 // virtual
 void ResultSetDataSupplier::validate()
-    throw( ucb::ResultSetException )
 {
     if ( m_pImpl->m_bThrowException )
         throw ucb::ResultSetException();
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
index a6cf5f1ba522..e83b48bd9a88 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
@@ -62,8 +62,7 @@ public:
 
     virtual void close() override;
 
-    virtual void validate()
-        throw( css::ucb::ResultSetException ) override;
+    virtual void validate() override;
 };
 
 } // namespace tdoc_ucp
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 6994349dfdbe..cb1ffc7bfe07 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -58,15 +58,12 @@ using namespace tdoc_ucp;
 // virtual
 void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::queryClosing(
          const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ )
-    throw ( util::CloseVetoException,
-            uno::RuntimeException, std::exception )
 {
 }
 
 
 void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosing(
          const lang::EventObject& Source )
-    throw ( uno::RuntimeException, std::exception )
 {
     if (!m_pManager) return; // disposed?
 
@@ -83,7 +80,6 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin
 // virtual
 void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing(
         const lang::EventObject& /*Source*/ )
-    throw ( uno::RuntimeException, std::exception )
 {
 }
 
@@ -171,7 +167,6 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc )
 // virtual
 void SAL_CALL OfficeDocumentsManager::documentEventOccured(
         const document::DocumentEvent & Event )
-    throw ( uno::RuntimeException, std::exception )
 {
 /*
     Events documentation: OOo Developer's Guide / Writing UNO Components /
@@ -433,7 +428,6 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured(
 // virtual
 void SAL_CALL OfficeDocumentsManager::disposing(
         const lang::EventObject& /*Source*/ )
-    throw ( uno::RuntimeException, std::exception )
 {
 }
 
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index 7dd5a07459ec..7f21e4ce8658 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -71,18 +71,14 @@ namespace tdoc_ucp {
             // util::XCloseListener
             virtual void SAL_CALL queryClosing(
                     const css::lang::EventObject& Source,
-                    sal_Bool GetsOwnership )
-                throw (css::util::CloseVetoException,
-                       css::uno::RuntimeException, std::exception) override;
+                    sal_Bool GetsOwnership ) override;
 
             virtual void SAL_CALL notifyClosing(
-                    const css::lang::EventObject& Source )
-                throw (css::uno::RuntimeException, std::exception) override;
+                    const css::lang::EventObject& Source ) override;
 
             // lang::XEventListener (base of util::XCloseListener)
             virtual void SAL_CALL disposing(
-                    const css::lang::EventObject & Source )
-                throw ( css::uno::RuntimeException, std::exception ) override;
+                    const css::lang::EventObject & Source ) override;
 
             void Dispose() { m_pManager = nullptr; }
 
@@ -100,13 +96,11 @@ namespace tdoc_ucp {
 
         // document::XDocumentEventListener
         virtual void SAL_CALL documentEventOccured(
-                const css::document::DocumentEvent & Event )
-            throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::document::DocumentEvent & Event ) override;
 
         // lang::XEventListener (base of document::XDocumentEventListener)
         virtual void SAL_CALL disposing(
-                const css::lang::EventObject & Source )
-            throw ( css::uno::RuntimeException, std::exception ) override;
+                const css::lang::EventObject & Source ) override;
 
         // Non-interface
         css::uno::Reference< css::embed::XStorage >
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index b4a27a8951fb..0ec5fbfe00e3 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -54,7 +54,6 @@ DocumentContentFactory::~DocumentContentFactory()
 
 // virtual
 OUString SAL_CALL DocumentContentFactory::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
@@ -62,7 +61,6 @@ OUString SAL_CALL DocumentContentFactory::getImplementationName()
 // virtual
 sal_Bool SAL_CALL
 DocumentContentFactory::supportsService( const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -70,7 +68,6 @@ DocumentContentFactory::supportsService( const OUString& ServiceName )
 // virtual
 uno::Sequence< OUString > SAL_CALL
 DocumentContentFactory::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return getSupportedServiceNames_Static();
 }
@@ -100,7 +97,6 @@ DocumentContentFactory::getSupportedServiceNames_Static()
 uno::Reference< ucb::XContent > SAL_CALL
 DocumentContentFactory::createDocumentContent(
         const uno::Reference< frame::XModel >& Model )
-    throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     uno::Reference< frame::XTransientDocumentsDocumentContentFactory > xDocFac;
     try
@@ -129,7 +125,6 @@ DocumentContentFactory::createDocumentContent(
 static uno::Reference< uno::XInterface > SAL_CALL
 DocumentContentFactory_CreateInstance(
     const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
-    throw( uno::Exception )
 {
     lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >(
         new DocumentContentFactory( rSMgr ) );
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
index 866c7a778c5f..61786dafb1ea 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
@@ -38,22 +38,17 @@ public:
     virtual ~DocumentContentFactory() override;
 
     // 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( const OUString& ServiceName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    supportsService( const OUString& ServiceName ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     // XTransientDocumentsDocumentContentFactory
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    createDocumentContent( const css::uno::Reference< css::frame::XModel >& Model )
-        throw ( css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception ) override;
+    createDocumentContent( const css::uno::Reference< css::frame::XModel >& Model ) override;
 
     // Non-UNO interfaces
     static OUString
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index 3e497f9a243b..439f60df4b34 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
@@ -44,28 +44,22 @@ namespace tdoc_ucp
             : InteractionContinuation( pRequest ) {}
 
         // XInterface
-        virtual uno::Any SAL_CALL queryInterface( const uno::Type & rType )
-            throw ( uno::RuntimeException, std::exception ) override;
+        virtual uno::Any SAL_CALL queryInterface( const uno::Type & rType ) override;
         virtual void SAL_CALL acquire()
             throw () override;
         virtual void SAL_CALL release()
             throw () override;
 
         // XTypeProvider
-        virtual uno::Sequence< uno::Type > SAL_CALL getTypes()
-            throw ( uno::RuntimeException, std::exception ) override;
-        virtual uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-            throw ( uno::RuntimeException, std::exception ) override;
+        virtual uno::Sequence< uno::Type > SAL_CALL getTypes() override;
+        virtual uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 
         // XInteractionContinuation
-        virtual void SAL_CALL select()
-            throw ( uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL select() override;
 
         // XInteractionPassword
-        virtual void SAL_CALL setPassword( const OUString & aPasswd )
-            throw ( uno::RuntimeException, std::exception ) override;
-        virtual OUString SAL_CALL getPassword()
-            throw ( uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setPassword( const OUString & aPasswd ) override;
+        virtual OUString SAL_CALL getPassword() override;
 
     private:
         osl::Mutex m_aMutex;
@@ -99,7 +93,6 @@ void SAL_CALL InteractionSupplyPassword::release()
 // virtual
 uno::Any SAL_CALL
 InteractionSupplyPassword::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -117,7 +110,6 @@ InteractionSupplyPassword::queryInterface( const uno::Type & rType )
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL
 InteractionSupplyPassword::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -125,7 +117,6 @@ InteractionSupplyPassword::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection * pCollection = nullptr;
     if ( !pCollection )
@@ -148,7 +139,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes()
 
 // virtual
 void SAL_CALL InteractionSupplyPassword::select()
-    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -160,7 +150,6 @@ void SAL_CALL InteractionSupplyPassword::select()
 // virtual
 void SAL_CALL
 InteractionSupplyPassword::setPassword( const OUString& aPasswd )
-    throw ( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
     m_aPassword = aPasswd;
@@ -168,7 +157,6 @@ InteractionSupplyPassword::setPassword( const OUString& aPasswd )
 
 // virtual
 OUString SAL_CALL InteractionSupplyPassword::getPassword()
-    throw ( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
     return m_aPassword;
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 580a115e4a87..4c80a626035d 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -77,7 +77,6 @@ void SAL_CALL ContentProvider::release()
 }
 
 css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -105,7 +104,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
@@ -132,7 +130,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 uno::Reference< ucb::XContent > SAL_CALL
 ContentProvider::queryContent(
         const uno::Reference< ucb::XContentIdentifier >& Identifier )
-    throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception )
 {
     Uri aUri( Identifier->getContentIdentifier() );
     if ( !aUri.isValid() )
@@ -168,7 +165,6 @@ ContentProvider::queryContent(
 uno::Reference< ucb::XContent > SAL_CALL
 ContentProvider::createDocumentContent(
         const uno::Reference< frame::XModel >& Model )
-    throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     // model -> id -> content identifier -> queryContent
     if ( m_xDocsMgr.is() )
@@ -403,7 +399,6 @@ ContentProvider::queryStorageClone( const OUString & rUri ) const
 uno::Reference< io::XInputStream >
 ContentProvider::queryInputStream( const OUString & rUri,
                                    const OUString & rPassword ) const
-    throw ( packages::WrongPasswordException, css::uno::RuntimeException )
 {
     if ( m_xStgElemFac.is() )
     {
@@ -441,8 +436,6 @@ uno::Reference< io::XOutputStream >
 ContentProvider::queryOutputStream( const OUString & rUri,
                                     const OUString & rPassword,
                                     bool bTruncate ) const
-    throw ( packages::WrongPasswordException,
-            uno::RuntimeException )
 {
     if ( m_xStgElemFac.is() )
     {
@@ -482,7 +475,6 @@ uno::Reference< io::XStream >
 ContentProvider::queryStream( const OUString & rUri,
                               const OUString & rPassword,
                               bool bTruncate ) const
-    throw ( packages::WrongPasswordException, uno::RuntimeException )
 {
     if ( m_xStgElemFac.is() )
     {
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 5e70d04e044c..e99f79301e8e 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -60,26 +60,20 @@ public:
     virtual ~ContentProvider() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -90,16 +84,12 @@ public:
 
     // XContentProvider
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
     // XTransientDocumentsDocumentContentFactory
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
     createDocumentContent( const css::uno::Reference<
-                                css::frame::XModel >& Model )
-        throw ( css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception ) override;
+                                css::frame::XModel >& Model ) override;
 
     // Non-UNO interfaces
     css::uno::Reference< css::embed::XStorage >
@@ -112,27 +102,21 @@ public:
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XInputStream >
     queryInputStream( const OUString & rUri,
-                      const OUString & rPassword ) const
-        throw ( css::packages::WrongPasswordException,
-                css::uno::RuntimeException );
+                      const OUString & rPassword ) const;
 
     /// @throws css::packages::WrongPasswordException
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XOutputStream >
     queryOutputStream( const OUString & rUri,
                        const OUString & rPassword,
-                       bool bTruncate ) const
-        throw ( css::packages::WrongPasswordException,
-                css::uno::RuntimeException );
+                       bool bTruncate ) const;
 
     /// @throws css::packages::WrongPasswordException
     /// @throws css::uno::RuntimeException
     css::uno::Reference< css::io::XStream >
     queryStream( const OUString & rUri,
                  const OUString & rPassword,
-                 bool bTruncate ) const
-        throw ( css::packages::WrongPasswordException,
-                css::uno::RuntimeException );
+                 bool bTruncate ) const;
 
     bool queryNamesOfChildren(
         const OUString & rUri,
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index 4eb418dba25c..8046f938de2a 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -146,7 +146,6 @@ Storage::~Storage()
 
 // virtual
 uno::Any SAL_CALL Storage::queryInterface( const uno::Type& aType )
-    throw ( uno::RuntimeException, std::exception )
 {
     // First, try to use interfaces implemented by myself and base class(es)
     uno::Any aRet = StorageUNOBase::queryInterface( aType );
@@ -187,7 +186,6 @@ void SAL_CALL Storage::release()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL Storage::getTypes()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xWrappedTypeProv->getTypes();
 }
@@ -195,7 +193,6 @@ uno::Sequence< uno::Type > SAL_CALL Storage::getTypes()
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId()
-    throw ( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -206,7 +203,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId()
 
 // virtual
 void SAL_CALL Storage::dispose()
-    throw ( uno::RuntimeException, std::exception )
 {
     m_xWrappedStorage->dispose();
 }
@@ -215,7 +211,6 @@ void SAL_CALL Storage::dispose()
 // virtual
 void SAL_CALL Storage::addEventListener(
         const uno::Reference< lang::XEventListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     m_xWrappedStorage->addEventListener( xListener );
 }
@@ -223,7 +218,6 @@ void SAL_CALL Storage::addEventListener(
 // virtual
 void SAL_CALL Storage::removeEventListener(
         const uno::Reference< lang::XEventListener >& aListener )
-    throw (uno::RuntimeException, std::exception)
 {
     m_xWrappedStorage->removeEventListener( aListener );
 }
@@ -234,7 +228,6 @@ void SAL_CALL Storage::removeEventListener(
 
 // virtual
 uno::Type SAL_CALL Storage::getElementType()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->getElementType();
 }
@@ -242,7 +235,6 @@ uno::Type SAL_CALL Storage::getElementType()
 
 // virtual
 sal_Bool SAL_CALL Storage::hasElements()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->hasElements();
 }
@@ -253,9 +245,6 @@ sal_Bool SAL_CALL Storage::hasElements()
 
 // virtual
 uno::Any SAL_CALL Storage::getByName( const OUString& aName )
-    throw ( container::NoSuchElementException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->getByName( aName );
 }
@@ -263,7 +252,6 @@ uno::Any SAL_CALL Storage::getByName( const OUString& aName )
 
 // virtual
 uno::Sequence< OUString > SAL_CALL Storage::getElementNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->getElementNames();
 }
@@ -271,7 +259,6 @@ uno::Sequence< OUString > SAL_CALL Storage::getElementNames()
 
 // virtual
 sal_Bool SAL_CALL Storage::hasByName( const OUString& aName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->hasByName( aName );
 }
@@ -283,11 +270,6 @@ sal_Bool SAL_CALL Storage::hasByName( const OUString& aName )
 // virtual
 void SAL_CALL Storage::copyToStorage(
         const uno::Reference< embed::XStorage >& xDest )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     m_xWrappedStorage->copyToStorage( xDest );
 }
@@ -296,12 +278,6 @@ void SAL_CALL Storage::copyToStorage(
 // virtual
 uno::Reference< io::XStream > SAL_CALL Storage::openStreamElement(
         const OUString& aStreamName, sal_Int32 nOpenMode )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            packages::WrongPasswordException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->openStreamElement( aStreamName, nOpenMode );
 }
@@ -312,13 +288,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement(
         const OUString& aStreamName,
         sal_Int32 nOpenMode,
         const OUString& aPassword )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            packages::NoEncryptionException,
-            packages::WrongPasswordException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->openEncryptedStreamElement(
         aStreamName, nOpenMode, aPassword );
@@ -328,11 +297,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement(
 // virtual
 uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement(
         const OUString& aStorName, sal_Int32 nOpenMode )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->openStorageElement( aStorName, nOpenMode );
 }
@@ -341,12 +305,6 @@ uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement(
 // virtual
 uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement(
         const OUString& aStreamName )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            packages::WrongPasswordException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->cloneStreamElement( aStreamName );
 }
@@ -356,13 +314,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement(
 uno::Reference< io::XStream > SAL_CALL Storage::cloneEncryptedStreamElement(
         const OUString& aStreamName,
         const OUString& aPassword )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            packages::NoEncryptionException,
-            packages::WrongPasswordException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->cloneEncryptedStreamElement( aStreamName,
                                                            aPassword );
@@ -372,11 +323,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneEncryptedStreamElement(
 // virtual
 void SAL_CALL Storage::copyLastCommitTo(
         const uno::Reference< embed::XStorage >& xTargetStorage )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception)
 {
     m_xWrappedStorage->copyLastCommitTo( xTargetStorage );
 }
@@ -386,11 +332,6 @@ void SAL_CALL Storage::copyLastCommitTo(
 void SAL_CALL Storage::copyStorageElementLastCommitTo(
         const OUString& aStorName,
         const uno::Reference< embed::XStorage >& xTargetStorage )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception)
 {
     m_xWrappedStorage->copyStorageElementLastCommitTo( aStorName, xTargetStorage );
 }
@@ -399,10 +340,6 @@ void SAL_CALL Storage::copyStorageElementLastCommitTo(
 // virtual
 sal_Bool SAL_CALL Storage::isStreamElement(
         const OUString& aElementName )
-    throw ( container::NoSuchElementException,
-            lang::IllegalArgumentException,
-            embed::InvalidStorageException,
-            uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->isStreamElement( aElementName );
 }
@@ -411,10 +348,6 @@ sal_Bool SAL_CALL Storage::isStreamElement(
 // virtual
 sal_Bool SAL_CALL Storage::isStorageElement(
         const OUString& aElementName )
-    throw ( container::NoSuchElementException,
-            lang::IllegalArgumentException,
-            embed::InvalidStorageException,
-            uno::RuntimeException, std::exception )
 {
     return m_xWrappedStorage->isStorageElement( aElementName );
 }
@@ -422,12 +355,6 @@ sal_Bool SAL_CALL Storage::isStorageElement(
 
 // virtual
 void SAL_CALL Storage::removeElement( const OUString& aElementName )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            container::NoSuchElementException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     m_xWrappedStorage->removeElement( aElementName );
 }
@@ -436,13 +363,6 @@ void SAL_CALL Storage::removeElement( const OUString& aElementName )
 // virtual
 void SAL_CALL Storage::renameElement( const OUString& aEleName,
                                       const OUString& aNewName )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            container::NoSuchElementException,
-            container::ElementExistException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     m_xWrappedStorage->renameElement( aEleName, aNewName );
 }
@@ -453,13 +373,6 @@ void SAL_CALL Storage::copyElementTo(
         const OUString& aElementName,
         const uno::Reference< embed::XStorage >& xDest,
         const OUString& aNewName )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            container::NoSuchElementException,
-            container::ElementExistException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     m_xWrappedStorage->copyElementTo( aElementName, xDest, aNewName );
 }
@@ -470,13 +383,6 @@ void SAL_CALL Storage::moveElementTo(
         const OUString& aElementName,
         const uno::Reference< embed::XStorage >& xDest,
         const OUString& rNewName )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            container::NoSuchElementException,
-            container::ElementExistException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     m_xWrappedStorage->moveElementTo( aElementName, xDest, rNewName );
 }
@@ -487,9 +393,6 @@ void SAL_CALL Storage::moveElementTo(
 
 // virtual
 void SAL_CALL Storage::commit()
-    throw ( io::IOException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     // Never commit a root storage (-> has no parent)!
     // Would lead in writing the whole document to disk.
@@ -519,9 +422,6 @@ void SAL_CALL Storage::commit()
 
 // virtual
 void SAL_CALL Storage::revert()
-    throw ( io::IOException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     uno::Reference< embed::XStorage > xParentStorage = getParentStorage();
     if ( xParentStorage.is() )
@@ -614,7 +514,6 @@ OutputStream::~OutputStream()
 
 // virtual
 uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = OutputStreamUNOBase::queryInterface( aType );
 
@@ -633,7 +532,6 @@ uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType )
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xWrappedTypeProv->getTypes();
 }
@@ -641,7 +539,6 @@ uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes()
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId()
-    throw ( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -653,10 +550,6 @@ uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId()
 // virtual
 void SAL_CALL
 OutputStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
-    throw ( io::NotConnectedException,
-            io::BufferSizeExceededException,
-            io::IOException,
-            uno::RuntimeException, std::exception )
 {
     m_xWrappedStream->writeBytes( aData );
 }
@@ -665,10 +558,6 @@ OutputStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
 // virtual
 void SAL_CALL
 OutputStream::flush()
-    throw ( io::NotConnectedException,
-            io::BufferSizeExceededException,
-            io::IOException,
-            uno::RuntimeException, std::exception )
 {
     m_xWrappedStream->flush();
 }
@@ -677,10 +566,6 @@ OutputStream::flush()
 // virtual
 void SAL_CALL
 OutputStream::closeOutput(  )
-    throw ( io::NotConnectedException,
-            io::BufferSizeExceededException,
-            io::IOException,
-            uno::RuntimeException, std::exception )
 {
     m_xWrappedStream->closeOutput();
 
@@ -696,7 +581,6 @@ OutputStream::closeOutput(  )
 // virtual
 void SAL_CALL
 OutputStream::dispose()
-    throw ( uno::RuntimeException, std::exception )
 {
     m_xWrappedComponent->dispose();
 
@@ -710,7 +594,6 @@ OutputStream::dispose()
 void SAL_CALL
 OutputStream::addEventListener(
         const uno::Reference< lang::XEventListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     m_xWrappedComponent->addEventListener( xListener );
 }
@@ -720,7 +603,6 @@ OutputStream::addEventListener(
 void SAL_CALL
 OutputStream::removeEventListener(
         const uno::Reference< lang::XEventListener >& aListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     m_xWrappedComponent->removeEventListener( aListener );
 }
@@ -797,7 +679,6 @@ Stream::~Stream()
 
 // virtual
 uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = StreamUNOBase::queryInterface( aType );
 
@@ -816,7 +697,6 @@ uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType )
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL Stream::getTypes()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xWrappedTypeProv->getTypes();
 }
@@ -824,7 +704,6 @@ uno::Sequence< uno::Type > SAL_CALL Stream::getTypes()
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId()
-    throw ( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -835,7 +714,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId()
 
 // virtual
 uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream()
-    throw( uno::RuntimeException, std::exception )
 {
     return uno::Reference< io::XInputStream >( this );
 }
@@ -843,7 +721,6 @@ uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream()
 
 // virtual
 uno::Reference< io::XOutputStream > SAL_CALL Stream::getOutputStream()
-    throw( uno::RuntimeException, std::exception )
 {
     return uno::Reference< io::XOutputStream >( this );
 }
@@ -854,10 +731,6 @@ uno::Reference< io::XOutputStream > SAL_CALL Stream::getOutputStream()
 
 // virtual
 void SAL_CALL Stream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if ( m_xWrappedOutputStream.is() )
     {
@@ -869,10 +742,6 @@ void SAL_CALL Stream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
 
 // virtual
 void SAL_CALL Stream::flush()
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if ( m_xWrappedOutputStream.is() )
     {
@@ -884,9 +753,6 @@ void SAL_CALL Stream::flush()
 
 // virtual
 void SAL_CALL Stream::closeOutput()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if ( m_xWrappedOutputStream.is() )
     {
@@ -905,8 +771,6 @@ void SAL_CALL Stream::closeOutput()
 
 // virtual
 void SAL_CALL Stream::truncate()
-    throw( io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if ( m_xWrappedTruncate.is() )
     {
@@ -922,10 +786,6 @@ void SAL_CALL Stream::truncate()
 // virtual
 sal_Int32 SAL_CALL Stream::readBytes( uno::Sequence< sal_Int8 >& aData,
                                       sal_Int32 nBytesToRead )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     return m_xWrappedInputStream->readBytes( aData, nBytesToRead );
 }
@@ -934,10 +794,6 @@ sal_Int32 SAL_CALL Stream::readBytes( uno::Sequence< sal_Int8 >& aData,
 // virtual
 sal_Int32 SAL_CALL Stream::readSomeBytes( uno::Sequence< sal_Int8 >& aData,
                                           sal_Int32 nMaxBytesToRead )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     return m_xWrappedInputStream->readSomeBytes( aData, nMaxBytesToRead );
 }
@@ -945,10 +801,6 @@ sal_Int32 SAL_CALL Stream::readSomeBytes( uno::Sequence< sal_Int8 >& aData,
 
 // virtual
 void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     m_xWrappedInputStream->skipBytes( nBytesToSkip );
 }
@@ -956,9 +808,6 @@ void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip )
 
 // virtual
 sal_Int32 SAL_CALL Stream::available()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     return m_xWrappedInputStream->available();
 }
@@ -966,9 +815,6 @@ sal_Int32 SAL_CALL Stream::available()
 
 // virtual
 void SAL_CALL Stream::closeInput()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     m_xWrappedInputStream->closeInput();
 }
@@ -979,7 +825,6 @@ void SAL_CALL Stream::closeInput()
 
 // virtual
 void SAL_CALL Stream::dispose()
-    throw ( uno::RuntimeException, std::exception )
 {
     m_xWrappedComponent->dispose();
 
@@ -992,7 +837,6 @@ void SAL_CALL Stream::dispose()
 // virtual
 void SAL_CALL Stream::addEventListener(
         const uno::Reference< lang::XEventListener >& xListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     m_xWrappedComponent->addEventListener( xListener );
 }
@@ -1001,7 +845,6 @@ void SAL_CALL Stream::addEventListener(
 // virtual
 void SAL_CALL Stream::removeEventListener(
         const uno::Reference< lang::XEventListener >& aListener )
-    throw ( uno::RuntimeException, std::exception )
 {
     m_xWrappedComponent->removeEventListener( aListener );
 }
@@ -1011,7 +854,6 @@ void SAL_CALL Stream::removeEventListener(
 
 
 void Stream::commitChanges()
-    throw( io::IOException )
 {
     uno::Reference< embed::XTransactedObject >
         xParentTA( getParentStorage(), uno::UNO_QUERY );
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 33f8302ba8d9..28994800424b 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -83,8 +83,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface(
-            const css::uno::Type& aType )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+            const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire()
         throw () override;
     virtual void SAL_CALL release()
@@ -93,178 +92,79 @@ public:
     // XTypeProvider (implemnented by base, but needs to be overridden for
     //                delegating to aggregate)
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XComponent ( one of XStorage bases )
     virtual void SAL_CALL
-    dispose()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XNameAccess ( one of XStorage bases )
     virtual css::uno::Any SAL_CALL
-    getByName( const OUString& aName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    getByName( const OUString& aName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getElementNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getElementNames() override;
     virtual sal_Bool SAL_CALL
-    hasByName( const OUString& aName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    hasByName( const OUString& aName ) override;
 
     // XElementAccess (base of XNameAccess)
     virtual css::uno::Type SAL_CALL
-    getElementType()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getElementType() override;
     virtual sal_Bool SAL_CALL
-    hasElements()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    hasElements() override;
 
     // XStorage
     virtual void SAL_CALL
-    copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) override;
     virtual css::uno::Reference< css::io::XStream > SAL_CALL
     openStreamElement( const OUString& aStreamName,
-                       sal_Int32 nOpenMode )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                       sal_Int32 nOpenMode ) override;
     virtual css::uno::Reference< css::io::XStream > SAL_CALL
     openEncryptedStreamElement( const OUString& aStreamName,
                                 sal_Int32 nOpenMode,
-                                const OUString& aPassword )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                                const OUString& aPassword ) override;
     virtual css::uno::Reference< css::embed::XStorage > SAL_CALL
     openStorageElement( const OUString& aStorName,
-                        sal_Int32 nOpenMode )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                        sal_Int32 nOpenMode ) override;
     virtual css::uno::Reference< css::io::XStream > SAL_CALL
-    cloneStreamElement( const OUString& aStreamName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    cloneStreamElement( const OUString& aStreamName ) override;
     virtual css::uno::Reference< css::io::XStream > SAL_CALL
     cloneEncryptedStreamElement( const OUString& aStreamName,
-                                 const OUString& aPassword )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::packages::NoEncryptionException,
-                css::packages::WrongPasswordException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                                 const OUString& aPassword ) override;
     virtual void SAL_CALL
     copyLastCommitTo( const css::uno::Reference<
-                        css::embed::XStorage >& xTargetStorage )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                        css::embed::XStorage >& xTargetStorage ) override;
     virtual void SAL_CALL
     copyStorageElementLastCommitTo( const OUString& aStorName,
                                     const css::uno::Reference<
                                         css::embed::XStorage > &
-                                            xTargetStorage )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                                            xTargetStorage ) override;
     virtual sal_Bool SAL_CALL
-    isStreamElement( const OUString& aElementName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::IllegalArgumentException,
-                css::embed::InvalidStorageException,
-                css::uno::RuntimeException, std::exception ) override;
+    isStreamElement( const OUString& aElementName ) override;
     virtual sal_Bool SAL_CALL
-    isStorageElement( const OUString& aElementName )
-        throw ( css::container::NoSuchElementException,
-                css::lang::IllegalArgumentException,
-                css::embed::InvalidStorageException,
-                css::uno::RuntimeException, std::exception ) override;
+    isStorageElement( const OUString& aElementName ) override;
     virtual void SAL_CALL
-    removeElement( const OUString& aElementName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    removeElement( const OUString& aElementName ) override;
     virtual void SAL_CALL
     renameElement( const OUString& aEleName,
-                   const OUString& aNewName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                   const OUString& aNewName ) override;
     virtual void SAL_CALL
     copyElementTo( const OUString& aElementName,
                    const css::uno::Reference< css::embed::XStorage >& xDest,
-                   const OUString& aNewName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                   const OUString& aNewName ) override;
     virtual void SAL_CALL
     moveElementTo( const OUString& aElementName,
                    const css::uno::Reference< css::embed::XStorage >& xDest,
-                   const OUString& rNewName )
-        throw ( css::embed::InvalidStorageException,
-                css::lang::IllegalArgumentException,
-                css::container::NoSuchElementException,
-                css::container::ElementExistException,
-                css::io::IOException,
-                css::embed::StorageWrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+                   const OUString& rNewName ) override;
 
     // XTransactedObject
-    virtual void SAL_CALL commit()
-        throw ( css::io::IOException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL revert()
-        throw ( css::io::IOException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL commit() override;
+    virtual void SAL_CALL revert() override;
 
 private:
     rtl::Reference< StorageElementFactory >         m_xFactory;
@@ -299,50 +199,32 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type& aType )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type& aType ) override;
 
     // XTypeProvider (implemnented by base, but needs to be overridden for
     //                delegating to aggregate)
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XOutputStream
     virtual void SAL_CALL
-    writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
-        throw ( css::io::NotConnectedException,
-                css::io::BufferSizeExceededException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
     virtual void SAL_CALL
-    flush(  )
-        throw ( css::io::NotConnectedException,
-                css::io::BufferSizeExceededException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    flush(  ) override;
     // Note: We need to intercept this one.
     virtual void SAL_CALL
-    closeOutput(  )
-        throw ( css::io::NotConnectedException,
-                css::io::BufferSizeExceededException,
-                css::io::IOException,
-                css::uno::RuntimeException, std::exception ) override;
+    closeOutput(  ) override;
 
     // XComponent
     // Note: We need to intercept this one.
     virtual void SAL_CALL
-    dispose()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 private:
     css::uno::Reference<
@@ -376,106 +258,66 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type& aType )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type& aType ) override;
 
     // XTypeProvider (implemnented by base, but needs to be overridden for
     //                delegating to aggregate)
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XStream
     virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-    getInputStream()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getInputStream() override;
 
     virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL
-    getOutputStream()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getOutputStream() override;
 
     // XOutputStream
     virtual void SAL_CALL
-    writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+    writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
 
     virtual void SAL_CALL
-    flush()
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+    flush() override;
 
     virtual void SAL_CALL
-    closeOutput()
-        throw( css::io::NotConnectedException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+    closeOutput() override;
 
     // XTruncate
     virtual void SAL_CALL
-    truncate()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+    truncate() override;
 
     // XInputStream
     virtual sal_Int32 SAL_CALL
     readBytes( css::uno::Sequence< sal_Int8 >& aData,
-               sal_Int32 nBytesToRead )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+               sal_Int32 nBytesToRead ) override;
 
     virtual sal_Int32 SAL_CALL
     readSomeBytes( css::uno::Sequence< sal_Int8 >& aData,
-                   sal_Int32 nMaxBytesToRead )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception) override;
+                   sal_Int32 nMaxBytesToRead ) override;
 
     virtual void SAL_CALL
-    skipBytes( sal_Int32 nBytesToSkip )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+    skipBytes( sal_Int32 nBytesToSkip ) override;
 
     virtual sal_Int32 SAL_CALL
-    available()
-        throw( css::io::NotConnectedException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+    available() override;
 
     virtual void SAL_CALL
-    closeInput()
-        throw( css::io::NotConnectedException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+    closeInput() override;
 
     // XComponent
     // Note: We need to intercept this one.
     virtual void SAL_CALL
-    dispose()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    dispose() override;
     virtual void SAL_CALL
-    addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
     virtual void SAL_CALL
-    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 private:
     /// @throws css::io::IOException
-    void commitChanges()
-        throw( css::io::IOException );
+    void commitChanges();
 
     css::uno::Reference<
         css::uno::XAggregation >     m_xAggProxy;
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index 8bba2180a939..a8055241522b 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -56,8 +56,6 @@ StorageElementFactory::~StorageElementFactory()
 
 uno::Reference< embed::XStorage >
 StorageElementFactory::createTemporaryStorage()
-    throw ( uno::Exception,
-            uno::RuntimeException )
 {
     uno::Reference< embed::XStorage > xStorage;
     uno::Reference< lang::XSingleServiceFactory > xStorageFac;
@@ -80,11 +78,6 @@ StorageElementFactory::createTemporaryStorage()
 uno::Reference< embed::XStorage >
 StorageElementFactory::createStorage( const OUString & rUri,
                                       StorageAccessMode eMode )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -233,12 +226,6 @@ StorageElementFactory::createStorage( const OUString & rUri,
 uno::Reference< io::XInputStream >
 StorageElementFactory::createInputStream( const OUString & rUri,
                                           const OUString & rPassword )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            packages::WrongPasswordException,
-            uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -263,12 +250,6 @@ uno::Reference< io::XOutputStream >
 StorageElementFactory::createOutputStream( const OUString & rUri,
                                            const OUString & rPassword,
                                            bool bTruncate )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            packages::WrongPasswordException,
-            uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -308,12 +289,6 @@ uno::Reference< io::XStream >
 StorageElementFactory::createStream( const OUString & rUri,
                                      const OUString & rPassword,
                                      bool bTruncate )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            packages::WrongPasswordException,
-            uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -358,11 +333,6 @@ void StorageElementFactory::releaseElement( Storage * pElement )
 
 uno::Reference< embed::XStorage > StorageElementFactory::queryParentStorage(
         const OUString & rUri, StorageAccessMode eMode )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException )
 {
     uno::Reference< embed::XStorage > xParentStorage;
 
@@ -384,11 +354,6 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage(
         const uno::Reference< embed::XStorage > & xParentStorage,
         const OUString & rUri,
         StorageAccessMode eMode )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            uno::RuntimeException )
 {
     uno::Reference< embed::XStorage > xStorage;
 
@@ -529,12 +494,6 @@ StorageElementFactory::queryStream(
                 const OUString & rPassword,
                 StorageAccessMode eMode,
                 bool bTruncate )
-    throw ( embed::InvalidStorageException,
-            lang::IllegalArgumentException,
-            io::IOException,
-            embed::StorageWrappedTargetException,
-            packages::WrongPasswordException,
-            uno::RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx
index c47717a49623..15e315ee4d18 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx
@@ -51,9 +51,7 @@ namespace tdoc_ucp {
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::embed::XStorage >
-        createTemporaryStorage()
-            throw ( css::uno::Exception,
-                    css::uno::RuntimeException );
+        createTemporaryStorage();
 
         /// @throws css::embed::InvalidStorageException
         /// @throws css::lang::IllegalArgumentException
@@ -61,12 +59,7 @@ namespace tdoc_ucp {
         /// @throws css::embed::StorageWrappedTargetException
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::embed::XStorage >
-        createStorage( const OUString & rUri, StorageAccessMode eMode )
-            throw ( css::embed::InvalidStorageException,
-                    css::lang::IllegalArgumentException,
-                    css::io::IOException,
-                    css::embed::StorageWrappedTargetException,
-                    css::uno::RuntimeException );
+        createStorage( const OUString & rUri, StorageAccessMode eMode );
 
         /// @throws css::embed::InvalidStorageException
         /// @throws css::lang::IllegalArgumentException
@@ -76,13 +69,7 @@ namespace tdoc_ucp {
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::io::XInputStream >
         createInputStream( const OUString & rUri,
-                           const OUString & rPassword )
-            throw ( css::embed::InvalidStorageException,
-                    css::lang::IllegalArgumentException,
-                    css::io::IOException,
-                    css::embed::StorageWrappedTargetException,
-                    css::packages::WrongPasswordException,
-                    css::uno::RuntimeException );
+                           const OUString & rPassword );
 
         /// @throws css::embed::InvalidStorageException
         /// @throws css::lang::IllegalArgumentException
@@ -93,13 +80,7 @@ namespace tdoc_ucp {
         css::uno::Reference< css::io::XOutputStream >
         createOutputStream( const OUString & rUri,
                             const OUString & rPassword,
-                            bool bTruncate )
-            throw ( css::embed::InvalidStorageException,
-                    css::lang::IllegalArgumentException,
-                    css::io::IOException,
-                    css::embed::StorageWrappedTargetException,
-                    css::packages::WrongPasswordException,
-                    css::uno::RuntimeException );
+                            bool bTruncate );
 
         /// @throws css::embed::InvalidStorageException
         /// @throws css::lang::IllegalArgumentException
@@ -110,13 +91,7 @@ namespace tdoc_ucp {
         css::uno::Reference< css::io::XStream >
         createStream( const OUString & rUri,
                       const OUString & rPassword,
-                      bool bTruncate )
-            throw ( css::embed::InvalidStorageException,
-                    css::lang::IllegalArgumentException,
-                    css::io::IOException,
-                    css::embed::StorageWrappedTargetException,
-                    css::packages::WrongPasswordException,
-                    css::uno::RuntimeException );
+                      bool bTruncate );
 
     private:
         friend class Storage;
@@ -130,12 +105,7 @@ namespace tdoc_ucp {
         /// @throws css::uno::RuntimeException
         css::uno::Reference< css::embed::XStorage >
         queryParentStorage( const OUString & rUri,
-                            StorageAccessMode eMode )
-            throw ( css::embed::InvalidStorageException,
-                    css::lang::IllegalArgumentException,
-                    css::io::IOException,
-                    css::embed::StorageWrappedTargetException,
-                    css::uno::RuntimeException );
+                            StorageAccessMode eMode );
 
         /// @throws css::embed::InvalidStorageException
         /// @throws css::lang::IllegalArgumentException
@@ -146,12 +116,7 @@ namespace tdoc_ucp {
         queryStorage( const css::uno::Reference<
                         css::embed::XStorage > & xParentStorage,
                       const OUString & rUri,
-                      StorageAccessMode eMode )
-            throw ( css::embed::InvalidStorageException,
-                    css::lang::IllegalArgumentException,
-                    css::io::IOException,
-                    css::embed::StorageWrappedTargetException,
-                    css::uno::RuntimeException );
+                      StorageAccessMode eMode );
 
         /// @throws css::embed::InvalidStorageException
         /// @throws css::lang::IllegalArgumentException
@@ -165,13 +130,7 @@ namespace tdoc_ucp {
                      const OUString & rPassword,
                      const OUString & rUri,
                      StorageAccessMode eMode,
-                     bool bTruncate /* ignored for read-only streams */ )
-            throw ( css::embed::InvalidStorageException,
-                    css::lang::IllegalArgumentException,
-                    css::io::IOException,
-                    css::embed::StorageWrappedTargetException,
-                    css::packages::WrongPasswordException,
-                    css::uno::RuntimeException );
+                     bool bTruncate /* ignored for read-only streams */ );
 
         struct ltstrbool
         {
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index 2ce02150afbb..c20173a6bde7 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -171,7 +171,6 @@ void DAVResourceAccess::OPTIONS(
     DAVOptions & rOptions,
     const css::uno::Reference<
     css::ucb::XCommandEnvironment > & xEnv )
-    throw ( DAVException )
 {
     initialize();
 
@@ -212,7 +211,6 @@ void DAVResourceAccess::PROPFIND(
     const std::vector< OUString > & rPropertyNames,
     std::vector< DAVResource > & rResources,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -255,7 +253,6 @@ void DAVResourceAccess::PROPFIND(
     const Depth nDepth,
     std::vector< DAVResourceInfo > & rResInfo,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -295,7 +292,6 @@ void DAVResourceAccess::PROPFIND(
 void DAVResourceAccess::PROPPATCH(
     const std::vector< ProppatchValue >& rValues,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -335,7 +331,6 @@ void DAVResourceAccess::HEAD(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -374,7 +369,6 @@ void DAVResourceAccess::HEAD(
 
 uno::Reference< io::XInputStream > DAVResourceAccess::GET(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -416,7 +410,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
 void DAVResourceAccess::GET(
     uno::Reference< io::XOutputStream > & rStream,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -455,7 +448,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw (css::uno::RuntimeException, DAVException)
 {
     initialize();
 
@@ -501,7 +493,6 @@ void DAVResourceAccess::GET0(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -544,7 +535,6 @@ void DAVResourceAccess::GET(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -583,7 +573,6 @@ void DAVResourceAccess::GET(
 
 
 void DAVResourceAccess::abort()
-  throw( DAVException )
 {
     initialize();
     m_xSession->abort();
@@ -594,7 +583,6 @@ namespace {
 
     /// @throws DAVException
     void resetInputStream( const uno::Reference< io::XInputStream > & rStream )
-        throw( DAVException )
     {
         try
         {
@@ -622,7 +610,6 @@ namespace {
 void DAVResourceAccess::PUT(
     const uno::Reference< io::XInputStream > & rStream,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw (css::uno::RuntimeException, DAVException)
 {
     initialize();
 
@@ -671,7 +658,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST(
     const OUString & rReferer,
     const uno::Reference< io::XInputStream > & rInputStream,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw (css::uno::RuntimeException, DAVException)
 {
     initialize();
 
@@ -735,7 +721,6 @@ void DAVResourceAccess::POST(
     const uno::Reference< io::XInputStream > & rInputStream,
     uno::Reference< io::XOutputStream > & rOutputStream,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw (css::uno::RuntimeException, DAVException)
 {
     initialize();
 
@@ -793,7 +778,6 @@ void DAVResourceAccess::POST(
 
 void DAVResourceAccess::MKCOL(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -833,7 +817,6 @@ void DAVResourceAccess::COPY(
     const OUString & rDestinationURI,
     bool bOverwrite,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -875,7 +858,6 @@ void DAVResourceAccess::MOVE(
     const OUString & rDestinationURI,
     bool bOverwrite,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -914,7 +896,6 @@ void DAVResourceAccess::MOVE(
 
 void DAVResourceAccess::DESTROY(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -953,7 +934,6 @@ void DAVResourceAccess::DESTROY(
 void DAVResourceAccess::LOCK(
     ucb::Lock & inLock,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw ( DAVException )
 {
     initialize();
 
@@ -1037,7 +1017,6 @@ sal_Int64 DAVResourceAccess::LOCK(
 
 void DAVResourceAccess::UNLOCK(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw ( DAVException )
 {
     initialize();
 
@@ -1073,7 +1052,6 @@ void DAVResourceAccess::UNLOCK(
 
 
 void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFlags )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_aFlags = rFlags;
@@ -1081,7 +1059,6 @@ void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFla
 
 
 void DAVResourceAccess::setURL( const OUString & rNewURL )
-    throw( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_aURL  = rNewURL;
@@ -1091,7 +1068,6 @@ void DAVResourceAccess::setURL( const OUString & rNewURL )
 
 // init dav session and path
 void DAVResourceAccess::initialize()
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     if ( m_aPath.isEmpty() )
@@ -1189,7 +1165,6 @@ void DAVResourceAccess::getUserRequestHeaders(
 // This function member implements the control on cyclical redirections
 bool DAVResourceAccess::detectRedirectCycle(
                                 const OUString& rRedirectURL )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1236,7 +1211,6 @@ void DAVResourceAccess::resetUri()
 
 
 bool DAVResourceAccess::handleException( const DAVException & e, int errorCount )
-    throw ( DAVException )
 {
     switch ( e.getError() )
     {
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
index 73e7d6d0b8ad..3667b9a15b22 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
@@ -73,12 +73,10 @@ public:
     DAVResourceAccess & operator=( const DAVResourceAccess & rOther );
 
     /// @throws DAVException
-    void setFlags( const css::uno::Sequence< css::beans::NamedValue >& rFlags )
-        throw ( DAVException );
+    void setFlags( const css::uno::Sequence< css::beans::NamedValue >& rFlags );
 
     /// @throws DAVException
-    void setURL( const OUString & rNewURL )
-        throw ( DAVException );
+    void setURL( const OUString & rNewURL );
 
     void resetUri();
 
@@ -93,8 +91,7 @@ public:
     void
     OPTIONS( DAVOptions & rOptions,
              const css::uno::Reference<
-             css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+             css::ucb::XCommandEnvironment > & xEnv );
 
     // allprop & named
     /// @throws DAVException
@@ -102,48 +99,41 @@ public:
     PROPFIND( const Depth nDepth,
               const std::vector< OUString > & rPropertyNames,
               std::vector< DAVResource > & rResources,
-              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // propnames
     /// @throws DAVException
     void
     PROPFIND( const Depth nDepth,
               std::vector< DAVResourceInfo > & rResInfo,
-              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     PROPPATCH( const std::vector< ProppatchValue > & rValues,
-               const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( DAVException );
+               const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     void
     HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all'
           DAVResource & rResource,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     css::uno::Reference< css::io::XInputStream >
-    GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     GET( css::uno::Reference< css::io::XOutputStream > & rStream,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::RuntimeException
     /// @throws DAVException
     css::uno::Reference< css::io::XInputStream >
     GET( const std::vector< OUString > & rHeaderNames, // empty == 'all'
          DAVResource & rResource,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw (css::uno::RuntimeException, DAVException);
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // used as HEAD substitute when HEAD is not implemented on server
     /// @throws DAVException
@@ -151,23 +141,20 @@ public:
     GET0( DAVRequestHeaders & rRequestHeaders,
           const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all'
           DAVResource & rResource,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-         throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     GET( css::uno::Reference< css::io::XOutputStream > & rStream,
          const std::vector< OUString > & rHeaderNames, // empty == 'all'
          DAVResource & rResource,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::RuntimeException
     /// @throws DAVException
     void
     PUT( const css::uno::Reference< css::io::XInputStream > & rStream,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw (css::uno::RuntimeException, DAVException);
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws css::uno::RuntimeException
     /// @throws DAVException
@@ -175,8 +162,7 @@ public:
     POST( const OUString & rContentType,
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & rInputStream,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw (css::uno::RuntimeException, DAVException);
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::RuntimeException
     /// @throws DAVException
@@ -185,41 +171,35 @@ public:
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & rInputStream,
           css::uno::Reference< css::io::XOutputStream > & rOutputStream,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw (css::uno::RuntimeException, DAVException);
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     void
-    MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     COPY( const OUString & rSourcePath,
           const OUString & rDestinationURI,
           bool bOverwrite,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     MOVE( const OUString & rSourcePath,
           const OUString & rDestinationURI,
           bool bOverwrite,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
-    DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // set new lock.
     /// @throws DAVException
     void
     LOCK( css::ucb::Lock & inLock,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
 #if 0 // currently not used, but please don't remove code
     // refresh existing lock.
@@ -231,13 +211,11 @@ public:
 
     /// @throws DAVException
     void
-    UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
-    abort()
-        throw ( DAVException );
+    abort();
 
     // helper
     static void
@@ -248,17 +226,14 @@ public:
         DAVRequestHeaders & rRequestHeaders );
 
         /// @throws DAVException
-        bool handleException( const DAVException & e, int errorCount )
-        throw ( DAVException );
+        bool handleException( const DAVException & e, int errorCount );
 
 private:
     const OUString & getRequestURI() const;
     /// @throws DAVException
-    bool detectRedirectCycle( const OUString& rRedirectURL )
-        throw ( DAVException );
+    bool detectRedirectCycle( const OUString& rRedirectURL );
     /// @throws DAVException
-    void initialize()
-        throw ( DAVException );
+    void initialize();
 };
 
 } // namespace webdav_ucp
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 5516a26a215f..58839c80a47f 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -78,8 +78,7 @@ public:
     /// @throws std::exception
     virtual void OPTIONS( const OUString & inPath,
                           DAVOptions& rOptions,
-                          const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                          const DAVRequestEnvironment & rEnv ) = 0;
 
     // allprop & named
     /// @throws std::exception
@@ -87,49 +86,42 @@ public:
                            const Depth inDepth,
                            const std::vector< OUString > & inPropertyNames,
                            std::vector< DAVResource > & ioResources,
-                           const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                           const DAVRequestEnvironment & rEnv ) = 0;
 
     // propnames
     /// @throws std::exception
     virtual void PROPFIND( const OUString & inPath,
                            const Depth inDepth,
                            std::vector< DAVResourceInfo > & ioResInfo,
-                           const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                           const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void PROPPATCH( const OUString & inPath,
                             const std::vector< ProppatchValue > & inValues,
-                            const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                            const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void HEAD( const OUString &  inPath,
                        const std::vector< OUString > & inHeaderNames,
                        DAVResource & ioResource,
-                       const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                       const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
-         const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void GET( const OUString & inPath,
                       css::uno::Reference< css::io::XOutputStream >& o,
-                      const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                      const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+         const DAVRequestEnvironment & rEnv ) = 0;
 
     // used as HEAD substitute when HEAD is not implemented on server
     /// @throws std::exception
@@ -137,8 +129,7 @@ public:
     GET0( const OUString & inPath,
           const std::vector< OUString > & inHeaderNames,
           DAVResource & ioResource,
-          const DAVRequestEnvironment & rEnv )
-         throw( std::exception ) = 0;
+          const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void
@@ -146,14 +137,12 @@ public:
          css::uno::Reference< css::io::XOutputStream >& o,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void PUT( const OUString & inPath,
                       const css::uno::Reference< css::io::XInputStream >& s,
-                      const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                      const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual css::uno::Reference< css::io::XInputStream >
@@ -161,8 +150,7 @@ public:
           const OUString & rContentType,
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) = 0;
+          const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void POST( const OUString & inPath,
@@ -170,48 +158,40 @@ public:
                        const OUString & rReferer,
                        const css::uno::Reference< css::io::XInputStream > & inInputStream,
                        css::uno::Reference< css::io::XOutputStream > & oOutputStream,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) = 0;
+                       const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void MKCOL( const OUString & inPath,
-                        const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                        const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void COPY( const OUString & inSource,
                        const OUString & inDestination,
                        const DAVRequestEnvironment & rEnv,
-                       bool inOverwrite )
-        throw( std::exception ) = 0;
+                       bool inOverwrite ) = 0;
 
     /// @throws std::exception
     virtual void MOVE( const OUString & inSource,
                        const OUString & inDestination,
                        const DAVRequestEnvironment & rEnv,
-                       bool inOverwrite )
-        throw( std::exception ) = 0;
+                       bool inOverwrite ) = 0;
 
     /// @throws std::exception
     virtual void DESTROY( const OUString & inPath,
-                          const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) = 0;
+                          const DAVRequestEnvironment & rEnv ) = 0;
 
     // set new lock.
     /// @throws std::exception
     virtual void LOCK( const OUString & inPath,
                        css::ucb::Lock & inLock,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) = 0;
+                       const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
     virtual void UNLOCK( const OUString & inPath,
-                         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) = 0;
+                         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws std::exception
-    virtual void abort()
-        throw( std::exception ) = 0;
+    virtual void abort() = 0;
 
 protected:
     rtl::Reference< DAVSessionFactory > m_xFactory;
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
index db1ee134df0f..d189a66cba7e 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
@@ -43,7 +43,6 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
                 const OUString & inUri,
                 const uno::Sequence< beans::NamedValue >& rFlags,
                 const uno::Reference< uno::XComponentContext > & rxContext )
-    throw( DAVException )
 {
     m_xContext = rxContext;
 
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
index 07dee1521472..7fa3b095974e 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
@@ -65,8 +65,7 @@ public:
     rtl::Reference< DAVSession >
         createDAVSession( const OUString & inUri,
                           const ::uno::Sequence< css::beans::NamedValue >& rFlags,
-                          const ::uno::Reference< ::uno::XComponentContext >& rxContext )
-            throw( DAVException );
+                          const ::uno::Reference< ::uno::XComponentContext >& rxContext );
 
     const ::uno::Reference< ::uno::XComponentContext >& getComponentContext() {  return m_xContext; }
 private:
diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
index c6c65a906656..d5e80029933d 100644
--- a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx
@@ -56,7 +56,6 @@ void NeonInputStream::AddToStream( const char * inBuf, sal_Int32 inLen )
 }
 
 Any NeonInputStream::queryInterface( const Type &type )
-                        throw( RuntimeException, std::exception )
 {
     Any aRet = ::cppu::queryInterface( type,
                                        static_cast< XInputStream * >( this ),
@@ -67,10 +66,6 @@ Any NeonInputStream::queryInterface( const Type &type )
 // "Reads" the specified number of bytes from the stream
 sal_Int32 SAL_CALL NeonInputStream::readBytes(
   css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     // Work out how much we're actually going to write
     sal_Int32 theBytes2Read = nBytesToRead;
@@ -93,10 +88,6 @@ sal_Int32 SAL_CALL NeonInputStream::readBytes(
 
 sal_Int32 SAL_CALL NeonInputStream::readSomeBytes(
  css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     // Warning: What should this be doing ?
     return readBytes( aData, nMaxBytesToRead );
@@ -104,10 +95,6 @@ sal_Int32 SAL_CALL NeonInputStream::readSomeBytes(
 
 // Moves the current stream position forward
 void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     mPos += nBytesToSkip;
     if ( mPos >= mLen )
@@ -116,24 +103,15 @@ void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip )
 
 // Returns the number of unread bytes currently remaining on the stream
 sal_Int32 SAL_CALL NeonInputStream::available(  )
-        throw( css::io::NotConnectedException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     return sal::static_int_cast<sal_Int32>(mLen - mPos);
 }
 
 void SAL_CALL NeonInputStream::closeInput()
-         throw( css::io::NotConnectedException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL NeonInputStream::seek( sal_Int64 location )
-        throw( css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     if ( location < 0 )
         throw css::lang::IllegalArgumentException();
@@ -145,15 +123,11 @@ void SAL_CALL NeonInputStream::seek( sal_Int64 location )
 }
 
 sal_Int64 SAL_CALL NeonInputStream::getPosition()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     return mPos;
 }
 
 sal_Int64 SAL_CALL NeonInputStream::getLength()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception )
 {
     return mLen;
 }
diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
index 154f0fbe9195..42e134637ec9 100644
--- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx
@@ -58,8 +58,7 @@ class NeonInputStream : public css::io::XInputStream,
         void AddToStream( const char * inBuf, sal_Int32 inLen );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type )
-                            throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) override;
 
     virtual void SAL_CALL acquire()
                             throw () override
@@ -73,49 +72,24 @@ class NeonInputStream : public css::io::XInputStream,
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(
               css::uno::Sequence< sal_Int8 > & aData,
-            sal_Int32 nBytesToRead )
-                throw( css::io::NotConnectedException,
-                          css::io::BufferSizeExceededException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
+            sal_Int32 nBytesToRead ) override;
 
     virtual sal_Int32 SAL_CALL readSomeBytes(
             css::uno::Sequence< sal_Int8 > & aData,
-            sal_Int32 nMaxBytesToRead )
-                throw( css::io::NotConnectedException,
-                          css::io::BufferSizeExceededException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-                throw( css::io::NotConnectedException,
-                          css::io::BufferSizeExceededException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Int32 SAL_CALL available()
-                throw( css::io::NotConnectedException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
-
-    virtual void SAL_CALL closeInput()
-                throw( css::io::NotConnectedException,
-                          css::io::IOException,
-                          css::uno::RuntimeException, std::exception ) override;
+            sal_Int32 nMaxBytesToRead ) override;
+
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+
+    virtual sal_Int32 SAL_CALL available() override;
+
+    virtual void SAL_CALL closeInput() override;
 
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location )
-        throw( css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Int64 SAL_CALL getPosition()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
-
-    virtual sal_Int64 SAL_CALL getLength()
-        throw( css::io::IOException,
-               css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+
+    virtual sal_Int64 SAL_CALL getPosition() override;
+
+    virtual sal_Int64 SAL_CALL getLength() override;
 };
 
 } // namespace webdav_ucp
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index d614a79d3930..89a0456cb4e8 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -581,7 +581,6 @@ NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFa
                           const OUString& inUri,
                           const uno::Sequence< beans::NamedValue >& rFlags,
                           const ucbhelper::InternetProxyDecider & rProxyDecider )
-    throw ( std::exception )
     : DAVSession( rSessionFactory )
     , m_nProxyPort( 0 )
     , m_aFlags( rFlags )
@@ -610,7 +609,6 @@ NeonSession::~NeonSession( )
 }
 
 void NeonSession::Init( const DAVRequestEnvironment & rEnv )
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     m_aEnv = rEnv;
@@ -618,7 +616,6 @@ void NeonSession::Init( const DAVRequestEnvironment & rEnv )
 }
 
 void NeonSession::Init()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -843,7 +840,6 @@ bool NeonSession::UsesProxy()
 void NeonSession::OPTIONS( const OUString & inPath,
                            DAVOptions & rOptions, // contains the name+values of every header
                            const DAVRequestEnvironment & rEnv )
-    throw( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -964,7 +960,6 @@ void NeonSession::PROPFIND( const OUString & inPath,
                             const std::vector< OUString > & inPropNames,
                             std::vector< DAVResource > & ioResources,
                             const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
 
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -998,7 +993,6 @@ void NeonSession::PROPFIND( const OUString & inPath,
                             const Depth inDepth,
                             std::vector< DAVResourceInfo > & ioResInfo,
                             const DAVRequestEnvironment & rEnv )
-    throw( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "PROPFIND - relative URL: <" << inPath << "> Depth: " << inDepth );
@@ -1033,7 +1027,6 @@ void NeonSession::PROPFIND( const OUString & inPath,
 void NeonSession::PROPPATCH( const OUString & inPath,
                              const std::vector< ProppatchValue > & inValues,
                              const DAVRequestEnvironment & rEnv )
-    throw( std::exception )
 {
     SAL_INFO( "ucb.ucp.webdav", "PROPPATCH - relative URL <" << inPath << ">" );
 
@@ -1164,7 +1157,6 @@ void NeonSession::HEAD( const OUString &  inPath,
                         const std::vector< OUString > & inHeaderNames,
                         DAVResource & ioResource,
                         const DAVRequestEnvironment & rEnv )
-    throw( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "HEAD - relative URL <" << inPath << ">" );
@@ -1184,7 +1176,6 @@ void NeonSession::HEAD( const OUString &  inPath,
 uno::Reference< io::XInputStream >
 NeonSession::GET( const OUString & inPath,
                   const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1208,7 +1199,6 @@ NeonSession::GET( const OUString & inPath,
 void NeonSession::GET( const OUString & inPath,
                        uno::Reference< io::XOutputStream > & ioOutputStream,
                        const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1231,7 +1221,6 @@ NeonSession::GET( const OUString & inPath,
                   const std::vector< OUString > & inHeaderNames,
                   DAVResource & ioResource,
                   const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1259,7 +1248,6 @@ void NeonSession::GET0( const OUString & inPath,
                   const std::vector< OUString > & inHeaderNames,
                   DAVResource & ioResource,
                   const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1285,7 +1273,6 @@ void NeonSession::GET( const OUString & inPath,
                        const std::vector< OUString > & inHeaderNames,
                        DAVResource & ioResource,
                        const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" );
@@ -1309,7 +1296,6 @@ void NeonSession::GET( const OUString & inPath,
 void NeonSession::PUT( const OUString & inPath,
                        const uno::Reference< io::XInputStream > & inInputStream,
                        const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "PUT - relative URL <" << inPath << ">" );
@@ -1336,7 +1322,6 @@ NeonSession::POST( const OUString & inPath,
                    const OUString & rReferer,
                    const uno::Reference< io::XInputStream > & inInputStream,
                    const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "POST - relative URL <" << inPath << ">" );
@@ -1370,7 +1355,6 @@ void NeonSession::POST( const OUString & inPath,
                         const uno::Reference< io::XInputStream > & inInputStream,
                         uno::Reference< io::XOutputStream > & oOutputStream,
                         const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "POST - relative URL <" << inPath << ">" );
@@ -1397,7 +1381,6 @@ void NeonSession::POST( const OUString & inPath,
 
 void NeonSession::MKCOL( const OUString & inPath,
                          const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "MKCOL - relative URL <" << inPath << ">" );
@@ -1415,7 +1398,6 @@ void NeonSession::COPY( const OUString & inSourceURL,
                         const OUString & inDestinationURL,
                         const DAVRequestEnvironment & rEnv,
                         bool inOverWrite )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "COPY - inSourceURL: "<<inSourceURL<<" inDestinationURL: "<<inDestinationURL);
@@ -1442,7 +1424,6 @@ void NeonSession::MOVE( const OUString & inSourceURL,
                         const OUString & inDestinationURL,
                         const DAVRequestEnvironment & rEnv,
                         bool inOverWrite )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "MOVE - inSourceURL: "<<inSourceURL<<" inDestinationURL: "<<inDestinationURL);
@@ -1465,7 +1446,6 @@ void NeonSession::MOVE( const OUString & inSourceURL,
 
 void NeonSession::DESTROY( const OUString & inPath,
                            const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "DESTROY - relative URL <" << inPath << ">" );
@@ -1512,7 +1492,6 @@ namespace
 void NeonSession::LOCK( const OUString & inPath,
                         ucb::Lock & rLock,
                         const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     SAL_INFO( "ucb.ucp.webdav", "LOCK (create) - relative URL: <" << inPath << ">" );
@@ -1651,7 +1630,6 @@ bool NeonSession::LOCK( NeonLock * pLock,
 
 void NeonSession::UNLOCK( const OUString & inPath,
                           const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -1717,7 +1695,6 @@ bool NeonSession::UNLOCK( NeonLock * pLock )
 }
 
 void NeonSession::abort()
-    throw ( std::exception )
 {
     SAL_INFO( "ucb.ucp.webdav", "neon commands cannot be aborted" );
 }
@@ -1823,7 +1800,6 @@ bool NeonSession::removeExpiredLocktoken( const OUString & inURL,
 void NeonSession::HandleError( int nError,
                                const OUString & inPath,
                                const DAVRequestEnvironment & rEnv )
-    throw ( std::exception )
 {
     m_aEnv = DAVRequestEnvironment();
 
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 85e8172bed75..28b23678326c 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -75,8 +75,7 @@ public:
     NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory,
                  const OUString& inUri,
                  const css::uno::Sequence< css::beans::NamedValue >& rFlags,
-                 const ucbhelper::InternetProxyDecider & rProxyDecider )
-        throw ( std::exception );
+                 const ucbhelper::InternetProxyDecider & rProxyDecider );
 
     // DAVSession methods
     virtual bool CanUse( const OUString & inPath,
@@ -90,8 +89,7 @@ public:
     virtual void
     OPTIONS( const OUString & inPath,
              DAVOptions& rOptions, // contains the name+values
-             const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) SAL_OVERRIDE;
+             const DAVRequestEnvironment & rEnv ) SAL_OVERRIDE;
 
     // allprop & named
     virtual void
@@ -99,76 +97,65 @@ public:
               const Depth inDepth,
               const std::vector< OUString > & inPropNames,
               std::vector< DAVResource > & ioResources,
-              const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+              const DAVRequestEnvironment & rEnv ) override;
 
     // propnames
     virtual void
     PROPFIND( const OUString & inPath,
               const Depth inDepth,
               std::vector< DAVResourceInfo >& ioResInfo,
-              const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+              const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     PROPPATCH( const OUString & inPath,
                const std::vector< ProppatchValue > & inValues,
-               const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+               const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     HEAD( const OUString &  inPath,
           const std::vector< OUString > & inHeaderNames,
           DAVResource & ioResource,
-          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     GET( const OUString & inPath,
          css::uno::Reference< css::io::XOutputStream > &  ioOutputStream,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     GET0( const OUString & inPath,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     GET( const OUString & inPath,
          css::uno::Reference< css::io::XOutputStream > & ioOutputStream,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     PUT( const OUString & inPath,
          const css::uno::Reference< css::io::XInputStream > & inInputStream,
-         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual css::uno::Reference< css::io::XInputStream >
     POST( const OUString & inPath,
           const OUString & rContentType,
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     POST( const OUString & inPath,
@@ -176,45 +163,37 @@ public:
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
           css::uno::Reference< css::io::XOutputStream > & oOutputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     MKCOL( const OUString & inPath,
-           const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+           const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     COPY( const OUString & inSourceURL,
           const OUString & inDestinationURL,
           const DAVRequestEnvironment & rEnv,
-          bool inOverWrite )
-        throw ( std::exception ) override;
+          bool inOverWrite ) override;
 
     virtual void
     MOVE( const OUString & inSourceURL,
           const OUString & inDestinationURL,
           const DAVRequestEnvironment & rEnv,
-          bool inOverWrite )
-        throw ( std::exception ) override;
+          bool inOverWrite ) override;
 
     virtual void DESTROY( const OUString & inPath,
-                          const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+                          const DAVRequestEnvironment & rEnv ) override;
 
     // set new lock.
     virtual void LOCK( const OUString & inURL,
                        css::ucb::Lock & inLock,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+                       const DAVRequestEnvironment & rEnv ) override;
 
     virtual void UNLOCK( const OUString & inURL,
-                         const DAVRequestEnvironment & rEnv )
-        throw ( std::exception ) override;
+                         const DAVRequestEnvironment & rEnv ) override;
 
     // helpers
-    virtual void abort()
-        throw ( std::exception ) override;
+    virtual void abort() override;
 
     const OUString & getHostName() const { return m_aHostName; }
 
@@ -229,19 +208,16 @@ private:
     friend class NeonLockStore;
 
     /// @throws css::uno::RuntimeException
-    void Init()
-        throw (css::uno::RuntimeException, std::exception);
+    void Init();
 
     /// @throws css::uno::RuntimeException
-    void Init( const DAVRequestEnvironment & rEnv )
-        throw (css::uno::RuntimeException, std::exception);
+    void Init( const DAVRequestEnvironment & rEnv );
 
     // ret: true => retry request.
     /// @throws std::exception
     void HandleError( int nError,
                       const OUString & inPath,
-                      const DAVRequestEnvironment & rEnv )
-        throw ( std::exception );
+                      const DAVRequestEnvironment & rEnv );
 
     const ucbhelper::InternetProxyServer & getProxySettings() const;
 
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index 40a569cb196b..cf20b9fff2aa 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -73,7 +73,6 @@ const ne_uri g_sUriDefaultsFTP   = { const_cast<char *>("ftp"),
 } // namespace
 
 NeonUri::NeonUri( const ne_uri * inUri )
-    throw ( DAVException )
 {
     if ( inUri == nullptr )
         throw DAVException( DAVException::DAV_INVALID_ARG );
@@ -90,7 +89,6 @@ NeonUri::NeonUri( const ne_uri * inUri )
 }
 
 NeonUri::NeonUri( const OUString & inUri )
-    throw ( DAVException )
 {
     if ( inUri.isEmpty() )
         throw DAVException( DAVException::DAV_INVALID_ARG );
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx
index 66ad95bd9409..ef7b852b1f84 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx
@@ -56,9 +56,9 @@ class NeonUri
 
     public:
         /// @throws DAVException
-        explicit NeonUri( const OUString & inUri ) throw ( DAVException );
+        explicit NeonUri( const OUString & inUri );
         /// @throws DAVException
-        explicit NeonUri( const ne_uri * inUri ) throw ( DAVException );
+        explicit NeonUri( const ne_uri * inUri );
         ~NeonUri( );
 
         bool operator== ( const NeonUri & rOther ) const;
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 96a737130006..3b332fa36ce7 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -221,7 +221,6 @@ Content::Content(
           ContentProvider* pProvider,
           const uno::Reference< ucb::XContentIdentifier >& Identifier,
           rtl::Reference< DAVSessionFactory > const & rSessionFactory )
-  throw (ucb::ContentCreationException, css::uno::RuntimeException)
 : ContentImplHelper( rxContext, pProvider, Identifier ),
   m_eResourceType( UNKNOWN ),
   m_eResourceTypeForLocks( UNKNOWN ),
@@ -255,7 +254,6 @@ Content::Content(
             const uno::Reference< ucb::XContentIdentifier >& Identifier,
             rtl::Reference< DAVSessionFactory > const & rSessionFactory,
             bool isCollection )
-  throw (ucb::ContentCreationException, css::uno::RuntimeException)
 : ContentImplHelper( rxContext, pProvider, Identifier ),
   m_eResourceType( UNKNOWN ),
   m_eResourceTypeForLocks( UNKNOWN ),
@@ -306,7 +304,6 @@ void SAL_CALL Content::release()
 
 // virtual
 uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     // Note: isFolder may require network activities! So call it only
     //       if it is really necessary!!!
@@ -353,7 +350,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     bool bFolder = false;
     try
@@ -446,7 +442,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 
 // virtual
 OUString SAL_CALL Content::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "com.sun.star.comp.ucb.WebDAVContent" );
 }
@@ -454,7 +449,6 @@ OUString SAL_CALL Content::getImplementationName()
 
 // virtual
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { WEBDAV_CONTENT_SERVICE_NAME };
     return aSNS;
@@ -466,7 +460,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
 
 // virtual
 OUString SAL_CALL Content::getContentType()
-    throw( uno::RuntimeException, std::exception )
 {
     bool bFolder = false;
     try
@@ -497,9 +490,6 @@ uno::Any SAL_CALL Content::execute(
         const ucb::Command& aCommand,
         sal_Int32 /*CommandId*/,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception,
-           ucb::CommandAbortedException,
-           uno::RuntimeException, std::exception )
 {
     SAL_INFO( "ucb.ucp.webdav", "Content::execute: start: command: " <<
               aCommand.Name << ", env: " <<
@@ -843,7 +833,6 @@ uno::Any SAL_CALL Content::execute(
 
 // virtual
 void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
-    throw( uno::RuntimeException, std::exception )
 {
     try
     {
@@ -870,11 +859,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
 
 void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg,
                            const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( beans::PropertyExistException,
-           beans::IllegalTypeException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException,
-           std::exception )
 {
 //    if ( m_bTransient )
 //   @@@ ???
@@ -1012,10 +996,6 @@ void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg,
 
 void Content::removeProperty( const OUString& Name,
                               const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( beans::UnknownPropertyException,
-           beans::NotRemoveableException,
-           uno::RuntimeException,
-           std::exception )
 {
 
     // Try to remove property from server.
@@ -1105,10 +1085,6 @@ void Content::removeProperty( const OUString& Name,
 void SAL_CALL Content::addProperty( const OUString& Name,
                                     sal_Int16 Attributes,
                                     const uno::Any& DefaultValue )
-    throw( beans::PropertyExistException,
-           beans::IllegalTypeException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception )
 {
     beans::Property aProperty;
     aProperty.Name = Name;
@@ -1122,9 +1098,6 @@ void SAL_CALL Content::addProperty( const OUString& Name,
 
 // virtual
 void SAL_CALL Content::removeProperty( const OUString& Name )
-    throw( beans::UnknownPropertyException,
-           beans::NotRemoveableException,
-           uno::RuntimeException, std::exception )
 {
     removeProperty( Name,
                     uno::Reference< ucb::XCommandEnvironment >() );
@@ -1137,7 +1110,6 @@ void SAL_CALL Content::removeProperty( const OUString& Name )
 // virtual
 uno::Sequence< ucb::ContentInfo > SAL_CALL
 Content::queryCreatableContentsInfo()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1172,7 +1144,6 @@ Content::queryCreatableContentsInfo()
 // virtual
 uno::Reference< ucb::XContent > SAL_CALL
 Content::createNewContent( const ucb::ContentInfo& Info )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1339,7 +1310,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 const uno::Sequence< beans::Property >& rProperties,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw ( uno::Exception, std::exception )
 {
     std::unique_ptr< ContentProperties > xProps;
     std::unique_ptr< ContentProperties > xCachedProps;
@@ -1795,7 +1765,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 uno::Sequence< uno::Any > Content::setPropertyValues(
                 const uno::Sequence< beans::PropertyValue >& rValues,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw ( uno::Exception, std::exception )
 {
     uno::Reference< ucb::XContentIdentifier >    xIdentifier;
     rtl::Reference< ContentProvider >            xProvider;
@@ -2199,7 +2168,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 uno::Any Content::open(
                 const ucb::OpenCommandArgument3 & rArg,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw (uno::Exception, std::exception)
 {
     uno::Any aRet;
 
@@ -2395,7 +2363,6 @@ uno::Any Content::open(
 void Content::post(
                 const ucb::PostCommandArgument2 & rArg,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception, std::exception )
 {
     uno::Reference< io::XActiveDataSink > xSink( rArg.Sink, uno::UNO_QUERY );
     if ( xSink.is() )
@@ -2533,7 +2500,6 @@ void Content::insert(
         const uno::Reference< io::XInputStream > & xInputStream,
         bool bReplaceExisting,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception, std::exception )
 {
     bool bTransient, bCollection;
     OUString aEscapedTitle;
@@ -2796,7 +2762,6 @@ void Content::insert(
 void Content::transfer(
         const ucb::TransferInfo & rArgs,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception, std::exception )
 {
     uno::Reference< ucb::XContentIdentifier >    xIdentifier;
     uno::Reference< ucb::XContentProvider >      xProvider;
@@ -3045,7 +3010,6 @@ void Content::transfer(
 
 
 void Content::destroy( bool bDeletePhysical )
-    throw( uno::Exception, std::exception )
 {
     // @@@ take care about bDeletePhysical -> trashcan support
     uno::Reference< ucb::XContent > xThis = this;
@@ -3269,7 +3233,6 @@ Content::ResourceType Content::resourceTypeForLocks(
 
 void Content::lock(
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception, std::exception )
 {
 // prepare aURL to be used in exception, see below
     OUString aURL;
@@ -3417,7 +3380,6 @@ void Content::lock(
 
 void Content::unlock(
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception, std::exception )
 {
 
     try
@@ -3560,7 +3522,6 @@ bool Content::exchangeIdentity(
 
 bool Content::isFolder(
             const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception, std::exception )
 {
     {
         osl::MutexGuard aGuard( m_aMutex );
@@ -3765,7 +3726,6 @@ void Content::cancelCommandExecution(
                 const DAVException & e,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv,
                 bool bWrite /* = sal_False */ )
-    throw ( uno::Exception, std::exception )
 {
     ucbhelper::cancelCommandExecution( MapDAVException( e, bWrite ), xEnv );
     // Unreachable
@@ -3806,7 +3766,6 @@ Content::ResourceType Content::getResourceType(
                     const uno::Reference< ucb::XCommandEnvironment >& xEnv,
                     const std::unique_ptr< DAVResourceAccess > & rResAccess,
                     bool * networkAccessAllowed)
-    throw ( uno::Exception, std::exception )
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -3988,7 +3947,6 @@ Content::ResourceType Content::getResourceType(
 
 Content::ResourceType Content::getResourceType(
                     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw ( uno::Exception, std::exception )
 {
     std::unique_ptr< DAVResourceAccess > xResAccess;
     {
@@ -4037,7 +3995,6 @@ void Content::getResourceOptions(
                     DAVOptions& rDAVOptions,
                     const std::unique_ptr< DAVResourceAccess > & rResAccess,
                     bool * networkAccessAllowed )
-    throw ( css::uno::Exception, std::exception )
 {
     OUString aRedirURL;
     OUString aTargetURL = rResAccess->getURL();
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 4510674a918c..571dec7b2fa6 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -123,20 +123,17 @@ private:
     virtual OUString getParentURL() override;
 
     /// @throws css::uno::Exception
-    bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception, std::exception );
+    bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     css::uno::Reference< css::sdbc::XRow >
     getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties,
-                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception, std::exception );
+                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     css::uno::Sequence< css::uno::Any >
     setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues,
-                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception, std::exception );
+                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     typedef rtl::Reference< Content > ContentRef;
     typedef std::list< ContentRef > ContentRefList;
@@ -150,56 +147,47 @@ private:
 
     /// @throws css::uno::Exception
     ResourceType
-    getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception, std::exception );
+    getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     ResourceType
     getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
                      const std::unique_ptr< DAVResourceAccess > & rResAccess,
-                     bool * networkAccessAllowed = nullptr)
-        throw ( css::uno::Exception, std::exception );
+                     bool * networkAccessAllowed = nullptr);
 
     // Command "open"
     /// @throws css::uno::Exception
     css::uno::Any open(
                 const css::ucb::OpenCommandArgument3 & rArg,
-                const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw (css::uno::Exception, std::exception);
+                const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // Command "post"
     /// @throws css::uno::Exception
     void post( const css::ucb::PostCommandArgument2 & rArg,
-               const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception, std::exception );
+               const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // Command "insert"
     /// @throws css::uno::Exception
     void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream,
                  bool bReplaceExisting,
-                 const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception, std::exception );
+                 const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     // Command "transfer"
     /// @throws css::uno::Exception
     void transfer( const css::ucb::TransferInfo & rArgs,
-                   const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception, std::exception );
+                   const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     // Command "delete"
     /// @throws css::uno::Exception
-    void destroy( bool bDeletePhysical )
-        throw( css::uno::Exception, std::exception );
+    void destroy( bool bDeletePhysical );
 
     // Command "lock"
     /// @throws css::uno::Exception
-    void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception, std::exception );
+    void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     // Command "unlock"
     /// @throws css::uno::Exception
-    void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception, std::exception );
+    void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     css::uno::Any MapDAVException( const DAVException & e,
                                                 bool bWrite );
@@ -207,8 +195,7 @@ private:
     void cancelCommandExecution(
                     const DAVException & e,
                     const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
-                    bool bWrite = false )
-        throw( css::uno::Exception, std::exception );
+                    bool bWrite = false );
 
     static bool shouldAccessNetworkAfterException( const DAVException & e );
 
@@ -224,22 +211,13 @@ private:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     void addProperty( const css::ucb::PropertyCommandArgument &aCmdArg,
-                      const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-    throw( css::beans::PropertyExistException,
-           css::beans::IllegalTypeException,
-           css::lang::IllegalArgumentException,
-           css::uno::RuntimeException,
-           std::exception );
+                      const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::beans::NotRemoveableException
     /// @throws css::uno::RuntimeException
     void removeProperty( const OUString& Name,
-                         const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-    throw( css::beans::UnknownPropertyException,
-           css::beans::NotRemoveableException,
-           css::uno::RuntimeException,
-           std::exception );
+                         const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
 public:
     /// @throws css::ucb::ContentCreationException
@@ -247,73 +225,54 @@ public:
     Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
              ContentProvider* pProvider,
              const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
-             rtl::Reference< DAVSessionFactory > const & rSessionFactory )
-        throw (css::ucb::ContentCreationException, css::uno::RuntimeException);
+             rtl::Reference< DAVSessionFactory > const & rSessionFactory );
     /// @throws css::ucb::ContentCreationException
     /// @throws css::uno::RuntimeException
     Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
              ContentProvider* pProvider,
              const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
              rtl::Reference< DAVSessionFactory > const & rSessionFactory,
-             bool isCollection )
-        throw (css::ucb::ContentCreationException, css::uno::RuntimeException);
+             bool isCollection );
     virtual ~Content() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL
-    getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationName() override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     // XContent
     virtual OUString SAL_CALL
-    getContentType()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getContentType() override;
 
     // XCommandProcessor
     virtual css::uno::Any SAL_CALL
     execute( const css::ucb::Command& aCommand,
              sal_Int32 CommandId,
-             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException, std::exception ) override;
+             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
     virtual void SAL_CALL
-    abort( sal_Int32 CommandId )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    abort( sal_Int32 CommandId ) override;
 
     // XPropertyContainer
     virtual void SAL_CALL
     addProperty( const OUString& Name,
                  sal_Int16 Attributes,
-                 const css::uno::Any& DefaultValue )
-        throw( css::beans::PropertyExistException,
-               css::beans::IllegalTypeException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException, std::exception ) override;
+                 const css::uno::Any& DefaultValue ) override;
 
     virtual void SAL_CALL
-    removeProperty( const OUString& Name )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::NotRemoveableException,
-               css::uno::RuntimeException, std::exception ) override;
+    removeProperty( const OUString& Name ) override;
 
 
     // Additional interfaces
@@ -321,11 +280,9 @@ public:
 
     // XContentCreator
     virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL
-   queryCreatableContentsInfo()
-        throw( css::uno::RuntimeException, std::exception ) override;
+   queryCreatableContentsInfo() override;
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    createNewContent( const css::ucb::ContentInfo& Info )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    createNewContent( const css::ucb::ContentInfo& Info ) override;
 
 
     // Non-interface methods.
@@ -346,8 +303,7 @@ public:
     void getResourceOptions( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
                              DAVOptions& rDAVOptions,
                              const std::unique_ptr< DAVResourceAccess > & rResAccess,
-                             bool * networkAccessAllowed = nullptr)
-        throw ( css::uno::Exception, std::exception );
+                             bool * networkAccessAllowed = nullptr);
 
     static bool isResourceAvailable( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
                              const std::unique_ptr< DAVResourceAccess > & rResAccess,
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 7eef0b111b35..92a290699cd3 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -321,7 +321,6 @@ void DataSupplier::close()
 
 // virtual
 void DataSupplier::validate()
-    throw( ucb::ResultSetException )
 {
     if ( m_pImpl->m_bThrowException )
         throw ucb::ResultSetException();
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
index 141a6ee14a12..d717f41a88c0 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx
@@ -72,8 +72,7 @@ public:
 
     virtual void close() override;
 
-    virtual void validate()
-        throw( css::ucb::ResultSetException ) override;
+    virtual void validate() override;
 };
 
 }
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index 4c68042591fb..f1f5530787d2 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -76,7 +76,6 @@ void SAL_CALL ContentProvider::release()
 }
 
 css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
     (static_cast< lang::XTypeProvider* >(this)),
@@ -102,7 +101,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
         static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
@@ -130,8 +128,6 @@ uno::Reference< ucb::XContent > SAL_CALL
 ContentProvider::queryContent(
             const uno::Reference<
                     ucb::XContentIdentifier >& Identifier )
-    throw( ucb::IllegalIdentifierException,
-           uno::RuntimeException, std::exception )
 {
     // Check URL scheme...
 
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
index cadd3f71e91c..071260c6e4c5 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
@@ -80,26 +80,20 @@ public:
     virtual ~ContentProvider() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -110,9 +104,7 @@ public:
 
     // XContentProvider
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException, std::exception ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
 
     // Non-interface methods.
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 9fd3a179a16f..f1eb8bab0e74 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -161,7 +161,6 @@ void DAVResourceAccess::PROPFIND(
     const std::vector< OUString > & rPropertyNames,
     std::vector< DAVResource > & rResources,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -204,7 +203,6 @@ void DAVResourceAccess::PROPFIND(
     const Depth nDepth,
     std::vector< DAVResourceInfo > & rResInfo,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -244,7 +242,6 @@ void DAVResourceAccess::PROPFIND(
 void DAVResourceAccess::PROPPATCH(
     const std::vector< ProppatchValue >& rValues,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -284,7 +281,6 @@ void DAVResourceAccess::HEAD(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -323,7 +319,6 @@ void DAVResourceAccess::HEAD(
 
 uno::Reference< io::XInputStream > DAVResourceAccess::GET(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -365,7 +360,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
 void DAVResourceAccess::GET(
     uno::Reference< io::XOutputStream > & rStream,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -405,7 +399,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -451,7 +444,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -496,7 +488,6 @@ void DAVResourceAccess::GET(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -535,7 +526,6 @@ void DAVResourceAccess::GET(
 
 
 void DAVResourceAccess::abort()
-  throw( DAVException )
 {
     // 17.11.09 (tkr): abort currently disabled caused by issue i106766
     // initialize();
@@ -548,7 +538,6 @@ namespace {
 
     /// @throws DAVException
     void resetInputStream( const uno::Reference< io::XInputStream > & rStream )
-        throw( DAVException )
     {
         try
         {
@@ -576,7 +565,6 @@ namespace {
 void DAVResourceAccess::PUT(
     const uno::Reference< io::XInputStream > & rStream,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -625,7 +613,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST(
     const OUString & rReferer,
     const uno::Reference< io::XInputStream > & rInputStream,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw ( DAVException )
 {
     initialize();
 
@@ -689,7 +676,6 @@ void DAVResourceAccess::POST(
     const uno::Reference< io::XInputStream > & rInputStream,
     uno::Reference< io::XOutputStream > & rOutputStream,
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-  throw ( DAVException )
 {
     initialize();
 
@@ -747,7 +733,6 @@ void DAVResourceAccess::POST(
 
 void DAVResourceAccess::MKCOL(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -787,7 +772,6 @@ void DAVResourceAccess::COPY(
     const OUString & rDestinationURI,
     bool bOverwrite,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -829,7 +813,6 @@ void DAVResourceAccess::MOVE(
     const OUString & rDestinationURI,
     bool bOverwrite,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -868,7 +851,6 @@ void DAVResourceAccess::MOVE(
 
 void DAVResourceAccess::DESTROY(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
 {
     initialize();
 
@@ -907,7 +889,6 @@ void DAVResourceAccess::DESTROY(
 void DAVResourceAccess::LOCK(
     ucb::Lock & inLock,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw ( DAVException )
 {
     initialize();
 
@@ -991,7 +972,6 @@ sal_Int64 DAVResourceAccess::LOCK(
 
 void DAVResourceAccess::UNLOCK(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw ( DAVException )
 {
     initialize();
 
@@ -1027,7 +1007,6 @@ void DAVResourceAccess::UNLOCK(
 
 
 void DAVResourceAccess::setURL( const OUString & rNewURL )
-    throw( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_aURL  = rNewURL;
@@ -1037,7 +1016,6 @@ void DAVResourceAccess::setURL( const OUString & rNewURL )
 
 // init dav session and path
 void DAVResourceAccess::initialize()
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     if ( m_aPath.isEmpty() )
@@ -1120,7 +1098,6 @@ void DAVResourceAccess::getUserRequestHeaders(
 
 bool DAVResourceAccess::detectRedirectCycle(
                                 const OUString& rRedirectURL )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1157,7 +1134,6 @@ void DAVResourceAccess::resetUri()
 
 
 bool DAVResourceAccess::handleException( DAVException & e, int errorCount )
-    throw ( DAVException )
 {
     switch ( e.getError() )
     {
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index 1327a0b40c68..44f7f393d0f7 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
@@ -62,8 +62,7 @@ public:
     DAVResourceAccess & operator=( const DAVResourceAccess & rOther );
 
     /// @throws DAVException
-    void setURL( const OUString & rNewURL )
-        throw ( DAVException );
+    void setURL( const OUString & rNewURL );
 
     void resetUri();
 
@@ -81,77 +80,66 @@ public:
     PROPFIND( const Depth nDepth,
               const std::vector< OUString > & rPropertyNames,
               std::vector< DAVResource > & rResources,
-              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // propnames
     /// @throws DAVException
     void
     PROPFIND( const Depth nDepth,
               std::vector< DAVResourceInfo > & rResInfo,
-              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+              const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     PROPPATCH( const std::vector< ProppatchValue > & rValues,
-               const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( DAVException );
+               const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     void
     HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all'
           DAVResource & rResource,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     css::uno::Reference< css::io::XInputStream >
-    GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     GET( css::uno::Reference< css::io::XOutputStream > & rStream,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     css::uno::Reference< css::io::XInputStream >
     GET( const std::vector< OUString > & rHeaderNames, // empty == 'all'
          DAVResource & rResource,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     css::uno::Reference< css::io::XInputStream >
     GET( DAVRequestHeaders & rRequestHeaders,
          const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all'
          DAVResource & rResource,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     GET( css::uno::Reference< css::io::XOutputStream > & rStream,
          const std::vector< OUString > & rHeaderNames, // empty == 'all'
          DAVResource & rResource,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     PUT( const css::uno::Reference< css::io::XInputStream > & rStream,
-         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     css::uno::Reference< css::io::XInputStream >
     POST( const OUString & rContentType,
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & rInputStream,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     void
@@ -159,41 +147,35 @@ public:
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & rInputStream,
           css::uno::Reference< css::io::XOutputStream > & rOutputStream,
-          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws DAVException
     void
-    MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     COPY( const OUString & rSourcePath,
           const OUString & rDestinationURI,
           bool bOverwrite,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
     MOVE( const OUString & rSourcePath,
           const OUString & rDestinationURI,
           bool bOverwrite,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
-    DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // set new lock.
     /// @throws DAVException
     void
     LOCK( css::ucb::Lock & inLock,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( DAVException );
+          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
 #if 0 // currently not used, but please don't remove code
     // refresh existing lock.
@@ -205,13 +187,11 @@ public:
 
     /// @throws DAVException
     void
-    UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+    UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     /// @throws DAVException
     void
-    static abort()
-        throw ( DAVException );
+    static abort();
 
     // helper
     static void
@@ -224,14 +204,11 @@ public:
 private:
     const OUString & getRequestURI() const;
     /// @throws DAVException
-    bool detectRedirectCycle( const OUString& rRedirectURL )
-        throw ( DAVException );
+    bool detectRedirectCycle( const OUString& rRedirectURL );
     /// @throws DAVException
-    bool handleException( DAVException & e, int errorCount )
-        throw ( DAVException );
+    bool handleException( DAVException & e, int errorCount );
     /// @throws DAVException
-    void initialize()
-        throw ( DAVException );
+    void initialize();
 };
 
 } // namespace http_dav_ucp
diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx
index 4a28d40a8d27..1c6a8c0e01aa 100644
--- a/ucb/source/ucp/webdav/DAVSession.hxx
+++ b/ucb/source/ucp/webdav/DAVSession.hxx
@@ -79,49 +79,42 @@ public:
                            const Depth inDepth,
                            const std::vector< OUString > & inPropertyNames,
                            std::vector< DAVResource > & ioResources,
-                           const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+                           const DAVRequestEnvironment & rEnv ) = 0;
 
     // propnames
     /// @throws DAVException
     virtual void PROPFIND( const OUString & inPath,
                            const Depth inDepth,
                            std::vector< DAVResourceInfo > & ioResInfo,
-                           const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+                           const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual void PROPPATCH( const OUString & inPath,
                             const std::vector< ProppatchValue > & inValues,
-                            const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+                            const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual void HEAD( const OUString &  inPath,
                        const std::vector< OUString > & inHeaderNames,
                        DAVResource & ioResource,
-                       const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+                       const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
-         const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual void GET( const OUString & inPath,
                       css::uno::Reference< css::io::XOutputStream >& o,
-                      const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+                      const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual void
@@ -129,14 +122,12 @@ public:
          css::uno::Reference< css::io::XOutputStream >& o,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual void PUT( const OUString & inPath,
                       const css::uno::Reference< css::io::XInputStream >& s,
-                      const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+                      const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual css::uno::Reference< css::io::XInputStream >
@@ -144,8 +135,7 @@ public:
           const OUString & rContentType,
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) = 0;
+          const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual void POST( const OUString & inPath,
@@ -153,55 +143,46 @@ public:
                        const OUString & rReferer,
                        const css::uno::Reference< css::io::XInputStream > & inInputStream,
                        css::uno::Reference< css::io::XOutputStream > & oOutputStream,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) = 0;
+                       const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual void MKCOL( const OUString & inPath,
-                        const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+                        const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual void COPY( const OUString & inSource,
                        const OUString & inDestination,
                        const DAVRequestEnvironment & rEnv,
-                       bool inOverwrite = false )
-        throw( DAVException ) = 0;
+                       bool inOverwrite = false ) = 0;
 
     /// @throws DAVException
     virtual void MOVE( const OUString & inSource,
                        const OUString & inDestination,
                        const DAVRequestEnvironment & rEnv,
-                       bool inOverwrite = false )
-        throw( DAVException ) = 0;
+                       bool inOverwrite = false ) = 0;
 
     /// @throws DAVException
     virtual void DESTROY( const OUString & inPath,
-                          const DAVRequestEnvironment & rEnv )
-        throw( DAVException ) = 0;
+                          const DAVRequestEnvironment & rEnv ) = 0;
 
     // set new lock.
     /// @throws DAVException
     virtual void LOCK( const OUString & inPath,
                        css::ucb::Lock & inLock,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) = 0;
+                       const DAVRequestEnvironment & rEnv ) = 0;
 
     // refresh existing lock.
     /// @throws DAVException
     virtual sal_Int64 LOCK( const OUString & inPath,
                             sal_Int64 nTimeout,
-                            const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) = 0;
+                            const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
     virtual void UNLOCK( const OUString & inPath,
-                         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) = 0;
+                         const DAVRequestEnvironment & rEnv ) = 0;
 
     /// @throws DAVException
-    virtual void abort()
-        throw( DAVException ) = 0;
+    virtual void abort() = 0;
 
 protected:
     rtl::Reference< DAVSessionFactory > m_xFactory;
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
index abb74ee7b7c8..c31d3cc0a9a7 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
@@ -32,7 +32,6 @@ DAVSessionFactory::~DAVSessionFactory()
 rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
                 const OUString & inUri,
                 const uno::Reference< uno::XComponentContext > & rxContext )
-    throw( DAVException )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
index fb2b5338a1e0..29d504b59733 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
@@ -52,8 +52,7 @@ public:
     /// @throws DAVException
     rtl::Reference< DAVSession >
         createDAVSession( const OUString & inUri,
-                          const css::uno::Reference< css::uno::XComponentContext >& rxContext )
-            throw( DAVException );
+                          const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
 private:
     typedef std::map< OUString, DAVSession * > Map;
diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx
index 2575cb08227e..3ca05e55a383 100644
--- a/ucb/source/ucp/webdav/SerfInputStream.cxx
+++ b/ucb/source/ucp/webdav/SerfInputStream.cxx
@@ -59,7 +59,6 @@ void SerfInputStream::AddToStream( const char * inBuf, sal_Int32 inLen )
 // queryInterface
 
 Any SerfInputStream::queryInterface( const Type &type )
-                        throw( RuntimeException )
 {
     Any aRet = ::cppu::queryInterface( type,
                                        static_cast< XInputStream * >( this ),
@@ -73,10 +72,6 @@ Any SerfInputStream::queryInterface( const Type &type )
 
 sal_Int32 SAL_CALL SerfInputStream::readBytes(
   css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException )
 {
     // Work out how much we're actually going to write
     sal_Int32 theBytes2Read = nBytesToRead;
@@ -102,10 +97,6 @@ sal_Int32 SAL_CALL SerfInputStream::readBytes(
 
 sal_Int32 SAL_CALL SerfInputStream::readSomeBytes(
  css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException )
 {
     // Warning: What should this be doing ?
     return readBytes( aData, nMaxBytesToRead );
@@ -116,10 +107,6 @@ sal_Int32 SAL_CALL SerfInputStream::readSomeBytes(
 // Moves the current stream position forward
 
 void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip )
-        throw( css::io::NotConnectedException,
-               css::io::BufferSizeExceededException,
-               css::io::IOException,
-               css::uno::RuntimeException )
 {
     mPos += nBytesToSkip;
     if ( mPos >= mLen )
@@ -131,9 +118,6 @@ void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip )
 // Returns the number of unread bytes currently remaining on the stream
 
 sal_Int32 SAL_CALL SerfInputStream::available(  )
-        throw( css::io::NotConnectedException,
-               css::io::IOException,
-               css::uno::RuntimeException )
 {
     return sal::static_int_cast<sal_Int32>(mLen - mPos);
 }
@@ -142,9 +126,6 @@ sal_Int32 SAL_CALL SerfInputStream::available(  )
 // closeInput
 
 void SAL_CALL SerfInputStream::closeInput()
-        throw( css::io::NotConnectedException,
-               css::io::IOException,
-               css::uno::RuntimeException )
 {
 }
 
@@ -152,9 +133,6 @@ void SAL_CALL SerfInputStream::closeInput()
 // seek
 
 void SAL_CALL SerfInputStream::seek( sal_Int64 location )
-        throw( css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::RuntimeException )
 {
     if ( location < 0 )
         throw css::lang::IllegalArgumentException();
@@ -169,8 +147,6 @@ void SAL_CALL SerfInputStream::seek( sal_Int64 location )
 // getPosition
 
 sal_Int64 SAL_CALL SerfInputStream::getPosition()
-        throw( css::io::IOException,
-               css::uno::RuntimeException )
 {
     return mPos;
 }
@@ -179,8 +155,6 @@ sal_Int64 SAL_CALL SerfInputStream::getPosition()
 // getLength
 
 sal_Int64 SAL_CALL SerfInputStream::getLength()
-        throw( css::io::IOException,
-               css::uno::RuntimeException )
 {
     return mLen;
 }
diff --git a/ucb/source/ucp/webdav/SerfInputStream.hxx b/ucb/source/ucp/webdav/SerfInputStream.hxx
index fd893c813a7b..7d849e6c9bdb 100644
--- a/ucb/source/ucp/webdav/SerfInputStream.hxx
+++ b/ucb/source/ucp/webdav/SerfInputStream.hxx
@@ -53,8 +53,7 @@ class SerfInputStream : public css::io::XInputStream,
         void AddToStream( const char * inBuf, sal_Int32 inLen );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type )
-                            throw( css::uno::RuntimeException ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) override;
 
     virtual void SAL_CALL acquire()
                             throw () override
@@ -68,49 +67,24 @@ class SerfInputStream : public css::io::XInputStream,
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(
             css::uno::Sequence< sal_Int8 > & aData,
-            sal_Int32 nBytesToRead )
-                throw( css::io::NotConnectedException,
-                       css::io::BufferSizeExceededException,
-                       css::io::IOException,
-                       css::uno::RuntimeException ) override;
+            sal_Int32 nBytesToRead ) override;
 
     virtual sal_Int32 SAL_CALL readSomeBytes(
             css::uno::Sequence< sal_Int8 > & aData,
-            sal_Int32 nMaxBytesToRead )
-                throw( css::io::NotConnectedException,
-                       css::io::BufferSizeExceededException,
-                       css::io::IOException,
-                       css::uno::RuntimeException ) override;
-
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-                throw( css::io::NotConnectedException,
-                       css::io::BufferSizeExceededException,
-                       css::io::IOException,
-                       css::uno::RuntimeException ) override;
-
-    virtual sal_Int32 SAL_CALL available()
-                throw( css::io::NotConnectedException,
-                       css::io::IOException,
-                       css::uno::RuntimeException ) override;
-
-    virtual void SAL_CALL closeInput()
-                throw( css::io::NotConnectedException,
-                       css::io::IOException,
-                       css::uno::RuntimeException ) override;
+            sal_Int32 nMaxBytesToRead ) override;
+
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+
+    virtual sal_Int32 SAL_CALL available() override;
+
+    virtual void SAL_CALL closeInput() override;
 
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location )
-        throw( css::lang::IllegalArgumentException,
-               css::io::IOException,
-               css::uno::RuntimeException ) override;
-
-    virtual sal_Int64 SAL_CALL getPosition()
-        throw( css::io::IOException,
-               css::uno::RuntimeException ) override;
-
-    virtual sal_Int64 SAL_CALL getLength()
-        throw( css::io::IOException,
-               css::uno::RuntimeException ) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+
+    virtual sal_Int64 SAL_CALL getPosition() override;
+
+    virtual sal_Int64 SAL_CALL getLength() override;
 };
 
 } // namespace http_dav_ucp
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 40c8ffe9fb26..90becfc60cb6 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -58,7 +58,6 @@ SerfSession::SerfSession(
         const rtl::Reference< DAVSessionFactory > & rSessionFactory,
         const OUString& inUri,
         const ucbhelper::InternetProxyDecider & rProxyDecider )
-    throw ( DAVException )
     : DAVSession( rSessionFactory )
     , m_aMutex()
     , m_aUri( inUri )
@@ -91,7 +90,6 @@ SerfSession::~SerfSession( )
 
 
 void SerfSession::Init( const DAVRequestEnvironment & rEnv )
-  throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
     m_aEnv = rEnv;
@@ -100,7 +98,6 @@ void SerfSession::Init( const DAVRequestEnvironment & rEnv )
 
 
 void SerfSession::Init()
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -597,7 +594,6 @@ void SerfSession::PROPFIND( const OUString & inPath,
                             const std::vector< OUString > & inPropNames,
                             std::vector< DAVResource > & ioResources,
                             const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -627,7 +623,6 @@ void SerfSession::PROPFIND( const OUString & inPath,
                             const Depth inDepth,
                             std::vector< DAVResourceInfo > & ioResInfo,
                             const DAVRequestEnvironment & rEnv )
-    throw( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -655,7 +650,6 @@ void SerfSession::PROPFIND( const OUString & inPath,
 void SerfSession::PROPPATCH( const OUString & inPath,
                              const std::vector< ProppatchValue > & inValues,
                              const DAVRequestEnvironment & rEnv )
-    throw( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -676,7 +670,6 @@ void SerfSession::HEAD( const OUString & inPath,
                         const std::vector< OUString > & inHeaderNames,
                         DAVResource & ioResource,
                         const DAVRequestEnvironment & rEnv )
-    throw( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -703,7 +696,6 @@ void SerfSession::HEAD( const OUString & inPath,
 uno::Reference< io::XInputStream >
 SerfSession::GET( const OUString & inPath,
                   const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -726,7 +718,6 @@ SerfSession::GET( const OUString & inPath,
 void SerfSession::GET( const OUString & inPath,
                        uno::Reference< io::XOutputStream > & ioOutputStream,
                        const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -748,7 +739,6 @@ SerfSession::GET( const OUString & inPath,
                   const std::vector< OUString > & inHeaderNames,
                   DAVResource & ioResource,
                   const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -777,7 +767,6 @@ void SerfSession::GET( const OUString & inPath,
                        const std::vector< OUString > & inHeaderNames,
                        DAVResource & ioResource,
                        const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -801,7 +790,6 @@ void SerfSession::GET( const OUString & inPath,
 void SerfSession::PUT( const OUString & inPath,
                        const uno::Reference< io::XInputStream > & inInputStream,
                        const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -828,7 +816,6 @@ SerfSession::POST( const OUString & inPath,
                    const OUString & rReferer,
                    const uno::Reference< io::XInputStream > & inInputStream,
                    const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -863,7 +850,6 @@ void SerfSession::POST( const OUString & inPath,
                         const uno::Reference< io::XInputStream > & inInputStream,
                         uno::Reference< io::XOutputStream > & oOutputStream,
                         const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -892,7 +878,6 @@ void SerfSession::POST( const OUString & inPath,
 
 void SerfSession::MKCOL( const OUString & inPath,
                          const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -912,7 +897,6 @@ void SerfSession::COPY( const OUString & inSourceURL,
                         const OUString & inDestinationURL,
                         const DAVRequestEnvironment & rEnv,
                         bool inOverWrite )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -933,7 +917,6 @@ void SerfSession::MOVE( const OUString & inSourceURL,
                         const OUString & inDestinationURL,
                         const DAVRequestEnvironment & rEnv,
                         bool inOverWrite )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -952,7 +935,6 @@ void SerfSession::MOVE( const OUString & inSourceURL,
 
 void SerfSession::DESTROY( const OUString & inPath,
                            const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -1002,7 +984,6 @@ namespace
 void SerfSession::LOCK( const OUString & inPath,
                         ucb::Lock & rLock,
                         const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -1020,7 +1001,6 @@ void SerfSession::LOCK( const OUString & inPath,
 sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/,
                              sal_Int64 nTimeout,
                              const DAVRequestEnvironment & /*rEnv*/ )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -1084,7 +1064,6 @@ bool SerfSession::LOCK( const OUString& rLock,
 
 void SerfSession::UNLOCK( const OUString & inPath,
                           const DAVRequestEnvironment & rEnv )
-    throw ( DAVException )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
 
@@ -1128,7 +1107,6 @@ void SerfSession::UNLOCK( const OUString& rLock )
 
 
 void SerfSession::abort()
-    throw ( DAVException )
 {
     // 11.11.09 (tkr): The following code lines causing crashes if
     // closing a ongoing connection. It turned out that this existing
@@ -1249,7 +1227,6 @@ bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/,
 // Common Error Handler
 
 void SerfSession::HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc )
-    throw ( DAVException )
 {
     m_aEnv = DAVRequestEnvironment();
 
diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx
index 9bcc112a4d59..3e162258117c 100644
--- a/ucb/source/ucp/webdav/SerfSession.hxx
+++ b/ucb/source/ucp/webdav/SerfSession.hxx
@@ -74,8 +74,7 @@ public:
     /// @throws DAVException
     SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory,
                  const OUString& inUri,
-                 const ucbhelper::InternetProxyDecider & rProxyDecider )
-        throw ( DAVException );
+                 const ucbhelper::InternetProxyDecider & rProxyDecider );
 
     // Serf library callbacks
     apr_status_t setupSerfConnection( apr_socket_t * inAprSocket,
@@ -121,71 +120,61 @@ public:
               const Depth inDepth,
               const std::vector< OUString > & inPropNames,
               std::vector< DAVResource > & ioResources,
-              const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+              const DAVRequestEnvironment & rEnv ) override;
 
     // propnames
     virtual void
     PROPFIND( const OUString & inPath,
               const Depth inDepth,
               std::vector< DAVResourceInfo >& ioResInfo,
-              const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+              const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     PROPPATCH( const OUString & inPath,
                const std::vector< ProppatchValue > & inValues,
-               const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+               const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     HEAD( const OUString &  inPath,
           const std::vector< OUString > & inHeaderNames,
           DAVResource & ioResource,
-          const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     bool isHeadRequestInProgress();
 
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
-         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     GET( const OUString & inPath,
          css::uno::Reference< css::io::XOutputStream > &  ioOutputStream,
-         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual css::uno::Reference< css::io::XInputStream >
     GET( const OUString & inPath,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     GET( const OUString & inPath,
          css::uno::Reference< css::io::XOutputStream > & ioOutputStream,
          const std::vector< OUString > & inHeaderNames,
          DAVResource & ioResource,
-         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     PUT( const OUString & inPath,
          const css::uno::Reference< css::io::XInputStream > & inInputStream,
-         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+         const DAVRequestEnvironment & rEnv ) override;
 
     virtual css::uno::Reference< css::io::XInputStream >
     POST( const OUString & inPath,
           const OUString & rContentType,
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     POST( const OUString & inPath,
@@ -193,51 +182,42 @@ public:
           const OUString & rReferer,
           const css::uno::Reference< css::io::XInputStream > & inInputStream,
           css::uno::Reference< css::io::XOutputStream > & oOutputStream,
-          const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+          const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     MKCOL( const OUString & inPath,
-           const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+           const DAVRequestEnvironment & rEnv ) override;
 
     virtual void
     COPY( const OUString & inSourceURL,
           const OUString & inDestinationURL,
           const DAVRequestEnvironment & rEnv,
-          bool inOverWrite = false )
-        throw ( DAVException ) override;
+          bool inOverWrite = false ) override;
 
     virtual void
     MOVE( const OUString & inSourceURL,
           const OUString & inDestinationURL,
           const DAVRequestEnvironment & rEnv,
-          bool inOverWrite = false )
-        throw ( DAVException ) override;
+          bool inOverWrite = false ) override;
 
     virtual void DESTROY( const OUString & inPath,
-                          const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+                          const DAVRequestEnvironment & rEnv ) override;
 
     // set new lock.
     virtual void LOCK( const OUString & inURL,
                        css::ucb::Lock & inLock,
-                       const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+                       const DAVRequestEnvironment & rEnv ) override;
 
     // refresh existing lock.
     virtual sal_Int64 LOCK( const OUString & inURL,
                             sal_Int64 nTimeout,
-                            const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+                            const DAVRequestEnvironment & rEnv ) override;
 
     virtual void UNLOCK( const OUString & inURL,
-                         const DAVRequestEnvironment & rEnv )
-        throw ( DAVException ) override;
+                         const DAVRequestEnvironment & rEnv ) override;
 
     // helpers
-    virtual void abort()
-        throw ( DAVException ) override;
+    virtual void abort() override;
 
     const OUString & getHostName() const { return m_aUri.GetHost(); }
     int getPort() const { return m_aUri.GetPort(); }
@@ -248,16 +228,13 @@ private:
     friend class SerfLockStore;
 
     /// @throws DAVException
-    void Init()
-        throw ( DAVException );
+    void Init();
 
     /// @throws DAVException
-    void Init( const DAVRequestEnvironment & rEnv )
-        throw ( DAVException );
+    void Init( const DAVRequestEnvironment & rEnv );
 
     /// @throws DAVException
-    void HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc )
-        throw ( DAVException );
+    void HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc );
 
     const ucbhelper::InternetProxyServer & getProxySettings() const;
 
diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx
index 565ece80d364..7aec24f61bc0 100644
--- a/ucb/source/ucp/webdav/SerfUri.cxx
+++ b/ucb/source/ucp/webdav/SerfUri.cxx
@@ -31,7 +31,6 @@ using namespace http_dav_ucp;
 
 
 SerfUri::SerfUri( const apr_uri_t * inUri )
-    throw ( DAVException )
     : mAprUri( *inUri )
     , mURI()
     , mScheme()
@@ -54,7 +53,6 @@ SerfUri::SerfUri( const apr_uri_t * inUri )
 }
 
 SerfUri::SerfUri( const OUString & inUri )
-    throw ( DAVException )
     : mAprUri()
     , mURI()
     , mScheme()
diff --git a/ucb/source/ucp/webdav/SerfUri.hxx b/ucb/source/ucp/webdav/SerfUri.hxx
index 31361582c253..f943cd489e0e 100644
--- a/ucb/source/ucp/webdav/SerfUri.hxx
+++ b/ucb/source/ucp/webdav/SerfUri.hxx
@@ -51,9 +51,9 @@ class SerfUri
 
     public:
         /// @throws DAVException
-        explicit SerfUri( const OUString & inUri ) throw ( DAVException );
+        explicit SerfUri( const OUString & inUri );
         /// @throws DAVException
-        explicit SerfUri( const apr_uri_t * inUri ) throw ( DAVException );
+        explicit SerfUri( const apr_uri_t * inUri );
         ~SerfUri( );
 
         bool operator== ( const SerfUri & rOther ) const;
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 101aa1793f7f..5b193ea25bb4 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -197,7 +197,6 @@ Content::Content(
           ContentProvider* pProvider,
           const uno::Reference< ucb::XContentIdentifier >& Identifier,
           rtl::Reference< DAVSessionFactory > const & rSessionFactory )
-  throw ( ucb::ContentCreationException )
 : ContentImplHelper( rxContext, pProvider, Identifier ),
   m_eResourceType( UNKNOWN ),
   m_pProvider( pProvider ),
@@ -230,7 +229,6 @@ Content::Content(
             const uno::Reference< ucb::XContentIdentifier >& Identifier,
             rtl::Reference< DAVSessionFactory > const & rSessionFactory,
             bool isCollection )
-  throw ( ucb::ContentCreationException )
 : ContentImplHelper( rxContext, pProvider, Identifier ),
   m_eResourceType( UNKNOWN ),
   m_pProvider( pProvider ),
@@ -282,7 +280,6 @@ void SAL_CALL Content::release()
 
 // virtual
 uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     // Note: isFolder may require network activities! So call it only
     //       if it is really necessary!!!
@@ -335,7 +332,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     bool bFolder = false;
     try
@@ -428,7 +424,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 
 // virtual
 OUString SAL_CALL Content::getImplementationName()
-    throw( uno::RuntimeException )
 {
     return OUString( "com.sun.star.comp.ucb.WebDAVContent" );
 }
@@ -436,7 +431,6 @@ OUString SAL_CALL Content::getImplementationName()
 
 // virtual
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-    throw( uno::RuntimeException )
 {
     uno::Sequence<OUString> aSNS { WEBDAV_CONTENT_SERVICE_NAME };
     return aSNS;
@@ -448,7 +442,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
 
 // virtual
 OUString SAL_CALL Content::getContentType()
-    throw( uno::RuntimeException )
 {
     bool bFolder = false;
     try
@@ -479,9 +472,6 @@ uno::Any SAL_CALL Content::execute(
         const ucb::Command& aCommand,
         sal_Int32 /*CommandId*/,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception,
-           ucb::CommandAbortedException,
-           uno::RuntimeException )
 {
     SAL_INFO("ucb.ucp.webdav",  ">>>>> Content::execute: start: command: " << aCommand.Name
             << ", env: " << (Environment.is() ? "present" : "missing") );
@@ -804,7 +794,6 @@ uno::Any SAL_CALL Content::execute(
 
 // virtual
 void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
-    throw( uno::RuntimeException )
 {
     try
     {
@@ -831,10 +820,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
 
 void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg,
                            const uno::Reference< ucb::XCommandEnvironment >& xEnv  )
-throw( beans::PropertyExistException,
-       beans::IllegalTypeException,
-       lang::IllegalArgumentException,
-       uno::RuntimeException )
 {
 //    if ( m_bTransient )
 //   @@@ ???
@@ -966,9 +951,6 @@ throw( beans::PropertyExistException,
 
 void Content::removeProperty( const rtl::OUString& Name,
                               const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-throw( beans::UnknownPropertyException,
-       beans::NotRemoveableException,
-       uno::RuntimeException )
 {
 #if 0
     // @@@ REMOVABLE at the moment not properly set in the PropSetInfo
@@ -1074,10 +1056,6 @@ throw( beans::UnknownPropertyException,
 void SAL_CALL Content::addProperty( const rtl::OUString& Name,
                                     sal_Int16 Attributes,
                                     const uno::Any& DefaultValue )
-    throw( beans::PropertyExistException,
-           beans::IllegalTypeException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException )
 {
     beans::Property aProperty;
     aProperty.Name = Name;
@@ -1091,9 +1069,6 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name,
 
 // virtual
 void SAL_CALL Content::removeProperty( const rtl::OUString& Name )
-    throw( beans::UnknownPropertyException,
-           beans::NotRemoveableException,
-           uno::RuntimeException )
 {
     removeProperty( Name,
                     uno::Reference< ucb::XCommandEnvironment >() );
@@ -1106,7 +1081,6 @@ void SAL_CALL Content::removeProperty( const rtl::OUString& Name )
 // virtual
 uno::Sequence< ucb::ContentInfo > SAL_CALL
 Content::queryCreatableContentsInfo()
-    throw( uno::RuntimeException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1140,7 +1114,6 @@ Content::queryCreatableContentsInfo()
 // virtual
 uno::Reference< ucb::XContent > SAL_CALL
 Content::createNewContent( const ucb::ContentInfo& Info )
-    throw( uno::RuntimeException )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -1311,7 +1284,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 const uno::Sequence< beans::Property >& rProperties,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw ( uno::Exception )
 {
     std::unique_ptr< ContentProperties > xProps;
     std::unique_ptr< ContentProperties > xCachedProps;
@@ -1651,7 +1623,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 uno::Sequence< uno::Any > Content::setPropertyValues(
                 const uno::Sequence< beans::PropertyValue >& rValues,
                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw ( uno::Exception )
 {
     uno::Reference< ucb::XContentIdentifier >    xIdentifier;
     rtl::Reference< ContentProvider >            xProvider;
@@ -2061,7 +2032,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 uno::Any Content::open(
                 const ucb::OpenCommandArgument2 & rArg,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception )
 {
     uno::Any aRet;
 
@@ -2226,7 +2196,6 @@ uno::Any Content::open(
 void Content::post(
                 const ucb::PostCommandArgument2 & rArg,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception )
 {
     uno::Reference< io::XActiveDataSink > xSink( rArg.Sink, uno::UNO_QUERY );
     if ( xSink.is() )
@@ -2362,7 +2331,6 @@ void Content::insert(
         const uno::Reference< io::XInputStream > & xInputStream,
         bool bReplaceExisting,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception )
 {
     bool bTransient, bCollection;
     OUString aEscapedTitle;
@@ -2605,7 +2573,6 @@ void Content::insert(
 void Content::transfer(
         const ucb::TransferInfo & rArgs,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception )
 {
     uno::Reference< uno::XComponentContext > xContext;
     uno::Reference< ucb::XContentIdentifier >    xIdentifier;
@@ -2844,7 +2811,6 @@ void Content::transfer(
 
 
 void Content::destroy( bool bDeletePhysical )
-    throw( uno::Exception )
 {
     // @@@ take care about bDeletePhysical -> trashcan support
 
@@ -2898,7 +2864,6 @@ bool Content::supportsExclusiveWriteLock(
 
 void Content::lock(
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception )
 {
     try
     {
@@ -2938,7 +2903,6 @@ void Content::lock(
 
 void Content::unlock(
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception )
 {
     try
     {
@@ -3034,7 +2998,6 @@ bool Content::exchangeIdentity(
 
 bool Content::isFolder(
             const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception )
 {
     {
         osl::MutexGuard aGuard( m_aMutex );
@@ -3258,7 +3221,6 @@ void Content::cancelCommandExecution(
                 const DAVException & e,
                 const uno::Reference< ucb::XCommandEnvironment > & xEnv,
                 bool bWrite /* = false */ )
-    throw ( uno::Exception )
 {
     ucbhelper::cancelCommandExecution( MapDAVException( e, bWrite ), xEnv );
     // Unreachable
@@ -3299,7 +3261,6 @@ Content::ResourceType Content::getResourceType(
                     const uno::Reference< ucb::XCommandEnvironment >& xEnv,
                     const std::unique_ptr< DAVResourceAccess > & rResAccess,
                     bool * networkAccessAllowed )
-    throw ( uno::Exception )
 {
     {
         osl::MutexGuard g(m_aMutex);
@@ -3380,7 +3341,6 @@ Content::ResourceType Content::getResourceType(
 
 Content::ResourceType Content::getResourceType(
                     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw ( uno::Exception )
 {
     std::unique_ptr< DAVResourceAccess > xResAccess;
     {
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index 57341fcab0ea..8eefba6f2f32 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -91,20 +91,17 @@ private:
     virtual OUString getParentURL() override;
 
     /// @throws css::uno::Exception
-    bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception );
+    bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     css::uno::Reference< css::sdbc::XRow >
     getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties,
-                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception );
+                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     css::uno::Sequence< css::uno::Any >
     setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues,
-                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception );
+                       const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     typedef rtl::Reference< Content > ContentRef;
     typedef std::list< ContentRef > ContentRefList;
@@ -118,57 +115,48 @@ private:
 
     /// @throws css::uno::Exception
     ResourceType
-    getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
-        throw ( css::uno::Exception );
+    getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
 
     /// @throws css::uno::Exception
     ResourceType
     getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
                      const std::unique_ptr< DAVResourceAccess > & rResAccess,
-                     bool * networkAccessAllowed = nullptr )
-        throw ( css::uno::Exception );
+                     bool * networkAccessAllowed = nullptr );
 
     // Command "open"
     /// @throws css::uno::Exception
     css::uno::Any open(
                 const css::ucb::OpenCommandArgument2 & rArg,
                 const css::uno::Reference<
-                    css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception );
+                    css::ucb::XCommandEnvironment > & xEnv );
 
     // Command "post"
     /// @throws css::uno::Exception
     void post( const css::ucb::PostCommandArgument2 & rArg,
-               const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw( css::uno::Exception );
+               const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
     // Command "insert"
     /// @throws css::uno::Exception
     void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream,
                  bool bReplaceExisting,
-                 const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception );
+                 const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     // Command "transfer"
     /// @throws css::uno::Exception
     void transfer( const css::ucb::TransferInfo & rArgs,
-                   const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception );
+                   const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     // Command "delete"
     /// @throws css::uno::Exception
-    void destroy( bool bDeletePhysical )
-        throw( css::uno::Exception );
+    void destroy( bool bDeletePhysical );
 
     // Command "lock"
     /// @throws css::uno::Exception
-    void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception );
+    void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     // Command "unlock"
     /// @throws css::uno::Exception
-    void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception );
+    void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     css::uno::Any MapDAVException( const DAVException & e,
                                                 bool bWrite );
@@ -176,8 +164,7 @@ private:
     void cancelCommandExecution(
                     const DAVException & e,
                     const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
-                    bool bWrite = false )
-        throw( css::uno::Exception );
+                    bool bWrite = false );
 
     static bool shouldAccessNetworkAfterException( const DAVException & e );
 
@@ -190,91 +177,65 @@ private:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
     void addProperty( const css::ucb::PropertyCommandArgument &aCmdArg,
-                      const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-    throw( css::beans::PropertyExistException,
-           css::beans::IllegalTypeException,
-           css::lang::IllegalArgumentException,
-           css::uno::RuntimeException );
+                      const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 
     /// @throws css::beans::PropertyExistException
     /// @throws css::beans::NotRemoveableException
     /// @throws css::uno::RuntimeException
     void removeProperty( const rtl::OUString& Name,
-                         const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-    throw( css::beans::UnknownPropertyException,
-           css::beans::NotRemoveableException,
-           css::uno::RuntimeException );
+                         const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 public:
     /// @throws css::ucb::ContentCreationException
     Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
              ContentProvider* pProvider,
              const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
-             rtl::Reference< DAVSessionFactory > const & rSessionFactory )
-        throw ( css::ucb::ContentCreationException );
+             rtl::Reference< DAVSessionFactory > const & rSessionFactory );
     /// @throws css::ucb::ContentCreationException
     Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
              ContentProvider* pProvider,
              const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
              rtl::Reference< DAVSessionFactory > const & rSessionFactory,
-             bool isCollection )
-        throw ( css::ucb::ContentCreationException );
+             bool isCollection );
     virtual ~Content() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL
-    getImplementationName()
-        throw( css::uno::RuntimeException ) override;
+    getImplementationName() override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw( css::uno::RuntimeException ) override;
+    getSupportedServiceNames() override;
 
     // XContent
     virtual OUString SAL_CALL
-    getContentType()
-        throw( css::uno::RuntimeException ) override;
+    getContentType() override;
 
     // XCommandProcessor
     virtual css::uno::Any SAL_CALL
     execute( const css::ucb::Command& aCommand,
              sal_Int32 CommandId,
-             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-        throw( css::uno::Exception,
-               css::ucb::CommandAbortedException,
-               css::uno::RuntimeException ) override;
+             const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
     virtual void SAL_CALL
-    abort( sal_Int32 CommandId )
-        throw( css::uno::RuntimeException ) override;
+    abort( sal_Int32 CommandId ) override;
 
     // XPropertyContainer
     virtual void SAL_CALL
     addProperty( const OUString& Name,
                  sal_Int16 Attributes,
-                 const css::uno::Any& DefaultValue )
-        throw( css::beans::PropertyExistException,
-               css::beans::IllegalTypeException,
-               css::lang::IllegalArgumentException,
-               css::uno::RuntimeException ) override;
+                 const css::uno::Any& DefaultValue ) override;
 
     virtual void SAL_CALL
-    removeProperty( const OUString& Name )
-        throw( css::beans::UnknownPropertyException,
-               css::beans::NotRemoveableException,
-               css::uno::RuntimeException ) override;
+    removeProperty( const OUString& Name ) override;
 
 
     // Additional interfaces
@@ -282,11 +243,9 @@ public:
 
     // XContentCreator
     virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL
-   queryCreatableContentsInfo()
-        throw( css::uno::RuntimeException ) override;
+   queryCreatableContentsInfo() override;
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    createNewContent( const css::ucb::ContentInfo& Info )
-        throw( css::uno::RuntimeException ) override;
+    createNewContent( const css::ucb::ContentInfo& Info ) override;
 
 
     // Non-interface methods.
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index 9765d8486d6b..4ff990a9995d 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -320,7 +320,6 @@ void DataSupplier::close()
 
 // virtual
 void DataSupplier::validate()
-    throw( ucb::ResultSetException )
 {
     if ( m_pImpl->m_bThrowException )
         throw ucb::ResultSetException();
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
index 7c168c0e661d..9224f9259a72 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
@@ -67,8 +67,7 @@ public:
 
     virtual void close() override;
 
-    virtual void validate()
-        throw( css::ucb::ResultSetException ) override;
+    virtual void validate() override;
 };
 
 }
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 4a76fa8f7f73..4fc3d300bd75 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -61,7 +61,6 @@ void SAL_CALL ContentProvider::release()
 }
 
 css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
     (static_cast< lang::XTypeProvider* >(this)),
@@ -87,7 +86,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider,
 /// @throws css::uno::Exception
 static css::uno::Reference< css::uno::XInterface > SAL_CALL
 ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
-    throw( css::uno::Exception )
 {
     css::lang::XServiceInfo* pX =
                 static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
@@ -115,8 +113,6 @@ uno::Reference< ucb::XContent > SAL_CALL
 ContentProvider::queryContent(
             const uno::Reference<
                     ucb::XContentIdentifier >& Identifier )
-    throw( ucb::IllegalIdentifierException,
-           uno::RuntimeException )
 {
     // Check URL scheme...
 
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index 2672b262383a..383ffc119f7f 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -73,26 +73,20 @@ public:
     virtual ~ContentProvider() override;
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -103,9 +97,7 @@ public:
 
     // XContentProvider
     virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-        throw( css::ucb::IllegalIdentifierException,
-               css::uno::RuntimeException ) override;
+    queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
 
     // Non-interface methods.
diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx
index d7f30dd78479..f90aaed2593b 100644
--- a/ucb/source/ucp/webdav/webdavresponseparser.cxx
+++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx
@@ -355,14 +355,14 @@ namespace
         virtual ~WebDAVResponseParser() override;
 
         // Methods XDocumentHandler
-        virtual void SAL_CALL startDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException) override;
-        virtual void SAL_CALL endDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException) override;
-        virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) override;
-        virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) override;
-        virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) override;
-        virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException) override;
-        virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException) override;
-        virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException) override;
+        virtual void SAL_CALL startDocument(  ) override;
+        virtual void SAL_CALL endDocument(  ) override;
+        virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) override;
+        virtual void SAL_CALL endElement( const OUString& aName ) override;
+        virtual void SAL_CALL characters( const OUString& aChars ) override;
+        virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+        virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+        virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) override;
 
         const std::vector< ucb::Lock >& getResult_Lock() const { return maResult_Lock; }
         const std::vector< http_dav_ucp::DAVResource >& getResult_PropFind() const { return maResult_PropFind; }
@@ -398,17 +398,17 @@ namespace
         }
     }
 
-    void SAL_CALL WebDAVResponseParser::startDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException)
+    void SAL_CALL WebDAVResponseParser::startDocument(  )
     {
         SAL_WARN_IF(mpContext, "ucb.ucp.webdav", "Parser start with existing content (!)");
     }
 
-    void SAL_CALL WebDAVResponseParser::endDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException)
+    void SAL_CALL WebDAVResponseParser::endDocument(  )
     {
         SAL_WARN_IF(mpContext, "ucb.ucp.webdav", "Parser end with existing content (!)");
     }
 
-    void SAL_CALL WebDAVResponseParser::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException)
+    void SAL_CALL WebDAVResponseParser::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
     {
         const sal_Int32 nLen(aName.getLength());
 
@@ -507,7 +507,7 @@ namespace
         }
     }
 
-    void SAL_CALL WebDAVResponseParser::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException)
+    void SAL_CALL WebDAVResponseParser::endElement( const OUString& aName )
     {
         const sal_Int32 nLen(aName.getLength());
         SAL_WARN_IF(!mpContext, "ucb.ucp.webdav", "Parser EndElement without content (!)");
@@ -790,7 +790,7 @@ namespace
         }
     }
 
-    void SAL_CALL WebDAVResponseParser::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException)
+    void SAL_CALL WebDAVResponseParser::characters( const OUString& aChars )
     {
         // collect whitespace over evtl. several calls in mpContext
         SAL_WARN_IF(!mpContext, "ucb.ucp.webdav", "Parser characters without content (!)");
@@ -817,15 +817,15 @@ namespace
         }
     }
 
-    void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw (xml::sax::SAXException, uno::RuntimeException)
+    void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
     {
     }
 
-    void SAL_CALL WebDAVResponseParser::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw (xml::sax::SAXException, uno::RuntimeException)
+    void SAL_CALL WebDAVResponseParser::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
     {
     }
 
-    void SAL_CALL WebDAVResponseParser::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) throw (xml::sax::SAXException, uno::RuntimeException)
+    void SAL_CALL WebDAVResponseParser::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
     {
     }
 } // end of anonymous namespace
diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx
index 604801f4983a..b232cca7cfb0 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.cxx
@@ -34,7 +34,6 @@ namespace ucbhelper
 
 // virtual
 void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< io::XInputStream >& aStream )
-    throw( uno::RuntimeException, std::exception )
 {
     m_xStream = aStream;
 }
@@ -42,7 +41,6 @@ void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< io::XInputSt
 
 // virtual
 uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_xStream;
 }
diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx
index 0190b6d11ee4..bd98cf74e1b5 100644
--- a/ucbhelper/source/client/activedatastreamer.cxx
+++ b/ucbhelper/source/client/activedatastreamer.cxx
@@ -35,16 +35,12 @@ namespace ucbhelper
 
 // virtual
 void SAL_CALL ActiveDataStreamer::setStream( const uno::Reference< io::XStream >& xStream )
-    throw( uno::RuntimeException,
-           std::exception )
 {
     m_xStream = xStream;
 }
 
 // virtual
 uno::Reference< io::XStream > SAL_CALL ActiveDataStreamer::getStream()
-    throw( uno::RuntimeException,
-           std::exception )
 {
     return m_xStream;
 }
diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx
index 1210d301b1bb..7ee9cd2f85bd 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.cxx
@@ -69,14 +69,12 @@ CommandEnvironment::~CommandEnvironment()
 
 // virtual
 Reference< XInteractionHandler > SAL_CALL CommandEnvironment::getInteractionHandler()
-    throw ( RuntimeException, std::exception )
 {
     return m_pImpl->m_xInteractionHandler;
 }
 
 // virtual
 Reference< XProgressHandler > SAL_CALL CommandEnvironment::getProgressHandler()
-    throw ( RuntimeException, std::exception )
 {
     return m_pImpl->m_xProgressHandler;
 }
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 5f723e62cfb4..d1e7feb3b6dc 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -80,22 +80,16 @@ class EmptyInputStream : public ::cppu::WeakImplHelper< XInputStream >
 {
 public:
     virtual sal_Int32 SAL_CALL readBytes(
-        Sequence< sal_Int8 > & data, sal_Int32 nBytesToRead )
-        throw (IOException, RuntimeException, std::exception) override;
+        Sequence< sal_Int8 > & data, sal_Int32 nBytesToRead ) override;
     virtual sal_Int32 SAL_CALL readSomeBytes(
-        Sequence< sal_Int8 > & data, sal_Int32 nMaxBytesToRead )
-        throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw (IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available()
-        throw (IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput()
-        throw (IOException, RuntimeException, std::exception) override;
+        Sequence< sal_Int8 > & data, sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 };
 
 sal_Int32 EmptyInputStream::readBytes(
     Sequence< sal_Int8 > & data, sal_Int32 )
-    throw (IOException, RuntimeException, std::exception)
 {
     data.realloc( 0 );
     return 0;
@@ -103,25 +97,21 @@ sal_Int32 EmptyInputStream::readBytes(
 
 sal_Int32 EmptyInputStream::readSomeBytes(
     Sequence< sal_Int8 > & data, sal_Int32 )
-    throw (IOException, RuntimeException, std::exception)
 {
     data.realloc( 0 );
     return 0;
 }
 
 void EmptyInputStream::skipBytes( sal_Int32 )
-    throw (IOException, RuntimeException, std::exception)
 {
 }
 
 sal_Int32 EmptyInputStream::available()
-    throw (IOException, RuntimeException, std::exception)
 {
     return 0;
 }
 
 void EmptyInputStream::closeInput()
-    throw (IOException, RuntimeException, std::exception)
 {
 }
 
@@ -139,20 +129,17 @@ public:
         : m_rContent( rContent ) {}
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XContentEventListener
-    virtual void SAL_CALL contentEvent( const ContentEvent& evt )
-        throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL contentEvent( const ContentEvent& evt ) override;
 
     // XEventListener ( base of XContentEventListener )
-    virtual void SAL_CALL disposing( const EventObject& Source )
-        throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const EventObject& Source ) override;
 };
 
 
@@ -205,7 +192,6 @@ public:
 /// @throws RuntimeException
 static void ensureContentProviderForURL( const Reference< XUniversalContentBroker >& rBroker,
                                          const OUString & rURL )
-    throw ( ContentCreationException, RuntimeException )
 {
     Reference< XContentProvider > xProv
         = rBroker->queryContentProvider( rURL );
@@ -223,7 +209,6 @@ static void ensureContentProviderForURL( const Reference< XUniversalContentBroke
 static Reference< XContentIdentifier > getContentIdentifierThrow(
                                     const Reference< XUniversalContentBroker > & rBroker,
                                     const OUString & rURL)
-    throw (ContentCreationException, RuntimeException)
 {
     Reference< XContentIdentifier > xId
         = rBroker->createContentIdentifier( rURL );
@@ -245,7 +230,6 @@ static Reference< XContentIdentifier > getContentIdentifierThrow(
 static Reference< XContentIdentifier > getContentIdentifierNoThrow(
                                     const Reference< XUniversalContentBroker > & rBroker,
                                     const OUString & rURL)
-    throw (RuntimeException)
 {
     return rBroker->createContentIdentifier(rURL);
 }
@@ -255,7 +239,6 @@ static Reference< XContentIdentifier > getContentIdentifierNoThrow(
 static Reference< XContent > getContentThrow(
                                     const Reference< XUniversalContentBroker > & rBroker,
                                     const Reference< XContentIdentifier > & xId)
-    throw ( ContentCreationException, RuntimeException )
 {
     Reference< XContent > xContent;
     OUString msg;
@@ -286,7 +269,6 @@ static Reference< XContent > getContentThrow(
 static Reference< XContent > getContentNoThrow(
                                     const Reference< XUniversalContentBroker > & rBroker,
                                     const Reference< XContentIdentifier > & xId)
-    throw ( RuntimeException )
 {
     Reference< XContent > xContent;
     try
@@ -314,7 +296,6 @@ Content::Content()
 Content::Content( const OUString& rURL,
                   const Reference< XCommandEnvironment >& rEnv,
                   const Reference< XComponentContext >& rCtx )
-    throw ( ContentCreationException, RuntimeException )
 {
     Reference< XUniversalContentBroker > pBroker(
         UniversalContentBroker::create( rCtx ) );
@@ -331,7 +312,6 @@ Content::Content( const OUString& rURL,
 Content::Content( const Reference< XContent >& rContent,
                   const Reference< XCommandEnvironment >& rEnv,
                   const Reference< XComponentContext >& rCtx )
-    throw ( ContentCreationException, RuntimeException )
 {
     m_xImpl = new Content_Impl( rCtx, rContent, rEnv );
 }
@@ -415,7 +395,6 @@ void Content::setCommandEnvironment(
 
 
 Reference< XCommandInfo > Content::getCommands()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Command aCommand;
     aCommand.Name     = "getCommandInfo";
@@ -431,7 +410,6 @@ Reference< XCommandInfo > Content::getCommands()
 
 
 Reference< XPropertySetInfo > Content::getProperties()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Command aCommand;
     aCommand.Name     = "getPropertySetInfo";
@@ -447,7 +425,6 @@ Reference< XPropertySetInfo > Content::getProperties()
 
 
 Any Content::getPropertyValue( const OUString& rPropertyName )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Sequence<OUString> aNames { rPropertyName };
 
@@ -458,7 +435,6 @@ Any Content::getPropertyValue( const OUString& rPropertyName )
 
 Any Content::setPropertyValue( const OUString& rName,
                                 const Any& rValue )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Sequence<OUString> aNames { rName };
 
@@ -472,7 +448,6 @@ Any Content::setPropertyValue( const OUString& rName,
 
 Sequence< Any > Content::getPropertyValues(
                             const Sequence< OUString >& rPropertyNames )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Reference< XRow > xRow = getPropertyValuesInterface( rPropertyNames );
 
@@ -493,7 +468,6 @@ Sequence< Any > Content::getPropertyValues(
 
 Reference< XRow > Content::getPropertyValuesInterface(
                             const Sequence< OUString >& rPropertyNames )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     sal_Int32 nCount = rPropertyNames.getLength();
     Sequence< Property > aProps( nCount );
@@ -527,7 +501,6 @@ Reference< XRow > Content::getPropertyValuesInterface(
 Sequence< Any > Content::setPropertyValues(
                             const Sequence< OUString >& rPropertyNames,
                                 const Sequence< Any >& rValues )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( rPropertyNames.getLength() != rValues.getLength() )
     {
@@ -574,7 +547,6 @@ Sequence< Any > Content::setPropertyValues(
 
 Any Content::executeCommand( const OUString& rCommandName,
                              const Any& rCommandArgument )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Command aCommand;
     aCommand.Name     = rCommandName;
@@ -587,7 +559,6 @@ Any Content::executeCommand( const OUString& rCommandName,
 
 Any Content::createCursorAny( const Sequence< OUString >& rPropertyNames,
                               ResultSetInclude eMode )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     sal_Int32 nCount = rPropertyNames.getLength();
     Sequence< Property > aProps( nCount );
@@ -621,7 +592,6 @@ Any Content::createCursorAny( const Sequence< OUString >& rPropertyNames,
 Reference< XResultSet > Content::createCursor(
                             const Sequence< OUString >& rPropertyNames,
                             ResultSetInclude eMode )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Any aCursorAny = createCursorAny( rPropertyNames, eMode );
 
@@ -651,7 +621,6 @@ Reference< XResultSet > Content::createCursor(
 Reference< XDynamicResultSet > Content::createDynamicCursor(
                             const Sequence< OUString >& rPropertyNames,
                             ResultSetInclude eMode )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Reference< XDynamicResultSet > aResult;
     createCursorAny( rPropertyNames, eMode ) >>= aResult;
@@ -667,7 +636,6 @@ Reference< XResultSet > Content::createSortedCursor(
                             const Sequence< NumberedSortingInfo >& rSortInfo,
                             const Reference< XAnyCompareFactory >& rAnyCompareFactory,
                             ResultSetInclude eMode )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Reference< XResultSet > aResult;
     Reference< XDynamicResultSet > aDynSet;
@@ -715,7 +683,6 @@ Reference< XResultSet > Content::createSortedCursor(
 
 
 Reference< XInputStream > Content::openStream()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( !isDocument() )
         return Reference< XInputStream >();
@@ -740,7 +707,6 @@ Reference< XInputStream > Content::openStream()
 
 
 Reference< XInputStream > Content::openStreamNoLock()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( !isDocument() )
         return Reference< XInputStream >();
@@ -765,7 +731,6 @@ Reference< XInputStream > Content::openStreamNoLock()
 
 
 Reference< XStream > Content::openWriteableStream()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( !isDocument() )
         return Reference< XStream >();
@@ -790,7 +755,6 @@ Reference< XStream > Content::openWriteableStream()
 
 
 Reference< XStream > Content::openWriteableStreamNoLock()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( !isDocument() )
         return Reference< XStream >();
@@ -815,7 +779,6 @@ Reference< XStream > Content::openWriteableStreamNoLock()
 
 
 bool Content::openStream( const Reference< XActiveDataSink >& rSink )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( !isDocument() )
         return false;
@@ -838,7 +801,6 @@ bool Content::openStream( const Reference< XActiveDataSink >& rSink )
 
 
 bool Content::openStream( const Reference< XOutputStream >& rStream )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( !isDocument() )
         return false;
@@ -862,7 +824,6 @@ bool Content::openStream( const Reference< XOutputStream >& rStream )
 
 void Content::writeStream( const Reference< XInputStream >& rStream,
                            bool bReplaceExisting )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     InsertCommandArgument aArg;
     aArg.Data            = rStream.is() ? rStream : new EmptyInputStream;
@@ -880,7 +841,6 @@ void Content::writeStream( const Reference< XInputStream >& rStream,
 
 
 Sequence< ContentInfo > Content::queryCreatableContentsInfo()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     // First, try it using "CreatableContentsInfo" property -> the "new" way.
     Sequence< ContentInfo > aInfo;
@@ -904,7 +864,6 @@ bool Content::insertNewContent( const OUString& rContentType,
                                         rPropertyNames,
                                     const Sequence< Any >& rPropertyValues,
                                     Content& rNewContent )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     return insertNewContent( rContentType,
                              rPropertyNames,
@@ -920,7 +879,6 @@ bool Content::insertNewContent( const OUString& rContentType,
                                     const Sequence< Any >& rPropertyValues,
                                     const Reference< XInputStream >& rData,
                                     Content& rNewContent )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( rContentType.isEmpty() )
         return false;
@@ -987,7 +945,6 @@ bool Content::transferContent( const Content& rSourceContent,
                                    const OUString & rVersionComment,
                                    OUString* pResultURL,
                                    const OUString & rDocumentId )
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Reference< XUniversalContentBroker > pBroker(
         UniversalContentBroker::create( m_xImpl->getComponentContext() ) );
@@ -1048,7 +1005,6 @@ bool Content::transferContent( const Content& rSourceContent,
 
 
 bool Content::isFolder()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     bool bFolder = false;
     if ( getPropertyValue("IsFolder")
@@ -1073,7 +1029,6 @@ bool Content::isFolder()
 SAL_WNOUNREACHABLE_CODE_PUSH
 
 bool Content::isDocument()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     bool bDoc = false;
     if ( getPropertyValue("IsDocument")
@@ -1095,7 +1050,6 @@ bool Content::isDocument()
 SAL_WNOUNREACHABLE_CODE_POP
 
 void Content::lock()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
     Command aCommand;
     aCommand.Name     = "lock";
@@ -1106,7 +1060,6 @@ void Content::lock()
 }
 
 void Content::unlock()
-    throw( CommandAbortedException, RuntimeException, Exception )
 {
 
     Command aCommand;
@@ -1353,7 +1306,6 @@ void SAL_CALL ContentEventListener_Impl::release()
 }
 
 css::uno::Any SAL_CALL ContentEventListener_Impl::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XContentEventListener* >(this)),
@@ -1367,7 +1319,6 @@ css::uno::Any SAL_CALL ContentEventListener_Impl::queryInterface( const css::uno
 
 // virtual
 void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt )
-    throw( RuntimeException, std::exception )
 {
     if ( evt.Source == m_rContent.m_xContent )
     {
@@ -1393,7 +1344,6 @@ void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt )
 
 // virtual
 void SAL_CALL ContentEventListener_Impl::disposing( const EventObject& Source )
-    throw( RuntimeException, std::exception )
 {
     m_rContent.disposing(Source);
 }
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx
index 2ed226e0c30e..9cffc4909714 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.cxx
@@ -64,7 +64,6 @@ css::uno::Reference< css::task::XInteractionContinuation > InterceptedInteractio
 }
 
 void SAL_CALL InterceptedInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
-    throw(css::uno::RuntimeException, std::exception)
 {
     impl_handleDefault(xRequest);
 }
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 58d5a24d11b8..d40f572efb04 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -142,12 +142,10 @@ public:
                                           sal_Int32 nPort ) const;
 
     // XChangesListener
-    virtual void SAL_CALL changesOccurred( const util::ChangesEvent& Event )
-        throw( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL changesOccurred( const util::ChangesEvent& Event ) override;
 
     // XEventListener ( base of XChangesLisetenr )
-    virtual void SAL_CALL disposing( const lang::EventObject& Source )
-        throw( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
 
 private:
     void setNoProxyList( const OUString & rNoProxyList );
@@ -538,7 +536,6 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy(
 // virtual
 void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                                         const util::ChangesEvent& Event )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -634,7 +631,6 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
 
 // virtual
 void SAL_CALL InternetProxyDecider_Impl::disposing(const lang::EventObject&)
-    throw( uno::RuntimeException, std::exception )
 {
     if ( m_xNotifier.is() )
     {
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx
index db1de0cc53d4..4fe2b8d4a490 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.cxx
@@ -43,7 +43,6 @@ namespace ucbhelper
 void cancelCommandExecution( const uno::Any & rException,
                              const uno::Reference<
                                         ucb::XCommandEnvironment > & xEnv )
-    throw( uno::Exception )
 {
     if ( xEnv.is() )
     {
@@ -87,7 +86,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
                              const OUString & rMessage,
                              const uno::Reference<
                                     ucb::XCommandProcessor > & xContext )
-    throw( uno::Exception )
 {
     rtl::Reference< ucbhelper::SimpleIOErrorRequest > xRequest
         = new ucbhelper::SimpleIOErrorRequest(
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index 00ae20e5520b..6958419208d2 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -157,7 +157,6 @@ void SAL_CALL ContentImplHelper::release()
 }
 
 uno::Any SAL_CALL ContentImplHelper::queryInterface( const uno::Type & rType )
-    throw( uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
             static_cast< lang::XTypeProvider * >(this),
@@ -188,14 +187,12 @@ XTYPEPROVIDER_IMPL_10( ContentImplHelper,
 // virtual
 sal_Bool SAL_CALL ContentImplHelper::supportsService(
                                             const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // virtual
 void SAL_CALL ContentImplHelper::dispose()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -244,7 +241,6 @@ void SAL_CALL ContentImplHelper::dispose()
 // virtual
 void SAL_CALL ContentImplHelper::addEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -258,7 +254,6 @@ void SAL_CALL ContentImplHelper::addEventListener(
 // virtual
 void SAL_CALL ContentImplHelper::removeEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -269,7 +264,6 @@ void SAL_CALL ContentImplHelper::removeEventListener(
 // virtual
 uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
 ContentImplHelper::getIdentifier()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_xIdentifier;
 }
@@ -277,7 +271,6 @@ ContentImplHelper::getIdentifier()
 // virtual
 void SAL_CALL ContentImplHelper::addContentEventListener(
         const uno::Reference< css::ucb::XContentEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -291,7 +284,6 @@ void SAL_CALL ContentImplHelper::addContentEventListener(
 // virtual
 void SAL_CALL ContentImplHelper::removeContentEventListener(
         const uno::Reference< css::ucb::XContentEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -301,7 +293,6 @@ void SAL_CALL ContentImplHelper::removeContentEventListener(
 
 // virtual
 sal_Int32 SAL_CALL ContentImplHelper::createCommandIdentifier()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -313,7 +304,6 @@ sal_Int32 SAL_CALL ContentImplHelper::createCommandIdentifier()
 void SAL_CALL ContentImplHelper::addPropertiesChangeListener(
         const uno::Sequence< OUString >& PropertyNames,
         const uno::Reference< beans::XPropertiesChangeListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -346,7 +336,6 @@ void SAL_CALL ContentImplHelper::addPropertiesChangeListener(
 void SAL_CALL ContentImplHelper::removePropertiesChangeListener(
         const uno::Sequence< OUString >& PropertyNames,
         const uno::Reference< beans::XPropertiesChangeListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -377,7 +366,6 @@ void SAL_CALL ContentImplHelper::removePropertiesChangeListener(
 // virtual
 void SAL_CALL ContentImplHelper::addCommandInfoChangeListener(
         const uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -391,7 +379,6 @@ void SAL_CALL ContentImplHelper::addCommandInfoChangeListener(
 // virtual
 void SAL_CALL ContentImplHelper::removeCommandInfoChangeListener(
         const uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -404,10 +391,6 @@ void SAL_CALL ContentImplHelper::addProperty(
         const OUString& Name,
         sal_Int16 Attributes,
         const uno::Any& DefaultValue )
-    throw( beans::PropertyExistException,
-           beans::IllegalTypeException,
-           lang::IllegalArgumentException,
-           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -492,9 +475,6 @@ void SAL_CALL ContentImplHelper::addProperty(
 
 // virtual
 void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
-    throw( beans::UnknownPropertyException,
-           beans::NotRemoveableException,
-           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -592,7 +572,6 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
 // virtual
 void SAL_CALL ContentImplHelper::addPropertySetInfoChangeListener(
         const uno::Reference< beans::XPropertySetInfoChangeListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -606,7 +585,6 @@ void SAL_CALL ContentImplHelper::addPropertySetInfoChangeListener(
 // virtual
 void SAL_CALL ContentImplHelper::removePropertySetInfoChangeListener(
         const uno::Reference< beans::XPropertySetInfoChangeListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -616,7 +594,6 @@ void SAL_CALL ContentImplHelper::removePropertySetInfoChangeListener(
 
 // virtual
 uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Reference< uno::XInterface > xParent;
     OUString aURL = getParentURL();
@@ -640,7 +617,6 @@ uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent()
 // virtual
 void SAL_CALL ContentImplHelper::setParent(
                                     const uno::Reference< uno::XInterface >& )
-    throw( lang::NoSupportException, uno::RuntimeException, std::exception )
 {
     throw lang::NoSupportException();
 }
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index 24240278073a..16a682682365 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -104,7 +104,6 @@ void SAL_CALL ContentIdentifier::release() throw()
 // virtual
 Any SAL_CALL
 ContentIdentifier::queryInterface( const Type & rType )
-    throw ( RuntimeException, std::exception )
 {
     Any aRet = cppu::queryInterface( rType,
                 static_cast< XTypeProvider * >( this ),
@@ -120,7 +119,6 @@ ContentIdentifier::queryInterface( const Type & rType )
 // virtual
 Sequence< sal_Int8 > SAL_CALL
 ContentIdentifier::getImplementationId()
-    throw( RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -129,7 +127,6 @@ ContentIdentifier::getImplementationId()
 // virtual
 Sequence< css::uno::Type > SAL_CALL
 ContentIdentifier::getTypes()
-    throw( RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -152,7 +149,6 @@ ContentIdentifier::getTypes()
 
 // virtual
 OUString SAL_CALL ContentIdentifier::getContentIdentifier()
-    throw( RuntimeException, std::exception )
 {
     return m_pImpl->m_aContentId;
 }
@@ -160,7 +156,6 @@ OUString SAL_CALL ContentIdentifier::getContentIdentifier()
 
 // virtual
 OUString SAL_CALL ContentIdentifier::getContentProviderScheme()
-    throw( RuntimeException, std::exception )
 {
     return m_pImpl->m_aProviderScheme;
 }
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index b4838831cc3c..b4ada7454845 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -69,7 +69,6 @@ void SAL_CALL PropertySetInfo::release()
 }
 
 css::uno::Any SAL_CALL PropertySetInfo::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -89,7 +88,6 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo,
 
 // virtual
 uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
-    throw( uno::RuntimeException, std::exception )
 {
     if ( !m_pProps )
     {
@@ -155,7 +153,6 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
 // virtual
 beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
         const OUString& aName )
-    throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
 {
     beans::Property aProp;
     if ( queryProperty( aName, aProp ) )
@@ -168,7 +165,6 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
 // virtual
 sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
         const OUString& Name )
-    throw( uno::RuntimeException, std::exception )
 {
     beans::Property aProp;
     return queryProperty( Name, aProp );
@@ -243,7 +239,6 @@ void SAL_CALL CommandProcessorInfo::release()
 }
 
 css::uno::Any SAL_CALL CommandProcessorInfo::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -266,7 +261,6 @@ XTYPEPROVIDER_IMPL_2( CommandProcessorInfo,
 // virtual
 uno::Sequence< css::ucb::CommandInfo > SAL_CALL
 CommandProcessorInfo::getCommands()
-    throw( uno::RuntimeException, std::exception )
 {
     if ( !m_pCommands )
     {
@@ -301,8 +295,6 @@ CommandProcessorInfo::getCommands()
 css::ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByName(
         const OUString& Name )
-    throw( css::ucb::UnsupportedCommandException,
-           uno::RuntimeException, std::exception )
 {
     css::ucb::CommandInfo aInfo;
     if ( queryCommand( Name, aInfo ) )
@@ -315,8 +307,6 @@ CommandProcessorInfo::getCommandInfoByName(
 // virtual
 css::ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
-    throw( css::ucb::UnsupportedCommandException,
-           uno::RuntimeException, std::exception )
 {
     css::ucb::CommandInfo aInfo;
     if ( queryCommand( Handle, aInfo ) )
@@ -329,7 +319,6 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
 // virtual
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
        const OUString& Name )
-    throw( uno::RuntimeException, std::exception )
 {
     css::ucb::CommandInfo aInfo;
     return queryCommand( Name, aInfo );
@@ -338,7 +327,6 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
 
 // virtual
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle )
-    throw( uno::RuntimeException, std::exception )
 {
     css::ucb::CommandInfo aInfo;
     return queryCommand( Handle, aInfo );
diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx
index d22b2b651730..c98884087c07 100644
--- a/ucbhelper/source/provider/fd_inputstream.cxx
+++ b/ucbhelper/source/provider/fd_inputstream.cxx
@@ -56,10 +56,6 @@ namespace ucbhelper
 
     sal_Int32 SAL_CALL FdInputStream::readBytes(Sequence< sal_Int8 >& aData,
                                                  sal_Int32 nBytesToRead)
-        throw(NotConnectedException,
-              BufferSizeExceededException,
-              IOException,
-              RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard(m_aMutex);
 
@@ -84,20 +80,12 @@ namespace ucbhelper
 
     sal_Int32 SAL_CALL FdInputStream::readSomeBytes( Sequence< sal_Int8 >& aData,
                                                       sal_Int32 nMaxBytesToRead )
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               IOException,
-               RuntimeException, std::exception)
     {
         return readBytes(aData,nMaxBytesToRead);
     }
 
 
     void SAL_CALL FdInputStream::skipBytes(sal_Int32 nBytesToSkip)
-        throw(NotConnectedException,
-              BufferSizeExceededException,
-              IOException,
-              RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard(m_aMutex);
         if(!m_tmpfl)
@@ -109,18 +97,12 @@ namespace ucbhelper
 
 
     sal_Int32 SAL_CALL FdInputStream::available()
-        throw(NotConnectedException,
-              IOException,
-              RuntimeException, std::exception)
     {
         return sal::static_int_cast<sal_Int32>(m_nLength - getPosition());
     }
 
 
     void SAL_CALL FdInputStream::closeInput()
-        throw(NotConnectedException,
-              IOException,
-              RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard(m_aMutex);
         if(m_tmpfl)
@@ -132,9 +114,6 @@ namespace ucbhelper
 
 
     void SAL_CALL FdInputStream::seek(sal_Int64 location)
-        throw( IllegalArgumentException,
-               IOException,
-               RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard(m_aMutex);
         if(!m_tmpfl)
@@ -147,8 +126,6 @@ namespace ucbhelper
 
     sal_Int64 SAL_CALL
     FdInputStream::getPosition()
-        throw( IOException,
-               RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard(m_aMutex);
         if(!m_tmpfl)
@@ -161,7 +138,6 @@ namespace ucbhelper
 
 
     sal_Int64 SAL_CALL FdInputStream::getLength()
-        throw( IOException,RuntimeException, std::exception )
     {
         return m_nLength;
     }
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index c8d0858bea18..5738187bdf0f 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -124,7 +124,6 @@ void SAL_CALL InteractionRequest::release()
 // virtual
 uno::Any SAL_CALL
 InteractionRequest::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -139,7 +138,6 @@ InteractionRequest::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -147,7 +145,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -170,7 +167,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes()
 
 // virtual
 uno::Any SAL_CALL InteractionRequest::getRequest()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_pImpl->m_aRequest;
 }
@@ -179,7 +175,6 @@ uno::Any SAL_CALL InteractionRequest::getRequest()
 // virtual
 uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL
 InteractionRequest::getContinuations()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_pImpl->m_aContinuations;
 }
@@ -232,7 +227,6 @@ void SAL_CALL InteractionAbort::release()
 // virtual
 uno::Any SAL_CALL
 InteractionAbort::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -249,7 +243,6 @@ InteractionAbort::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -257,7 +250,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -280,7 +272,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes()
 
 // virtual
 void SAL_CALL InteractionAbort::select()
-    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -311,7 +302,6 @@ void SAL_CALL InteractionRetry::release()
 // virtual
 uno::Any SAL_CALL
 InteractionRetry::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -328,7 +318,6 @@ InteractionRetry::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -336,7 +325,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -359,7 +347,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes()
 
 // virtual
 void SAL_CALL InteractionRetry::select()
-    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -390,7 +377,6 @@ void SAL_CALL InteractionApprove::release()
 // virtual
 uno::Any SAL_CALL
 InteractionApprove::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -407,7 +393,6 @@ InteractionApprove::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -415,7 +400,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -438,7 +422,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes()
 
 // virtual
 void SAL_CALL InteractionApprove::select()
-    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -469,7 +452,6 @@ void SAL_CALL InteractionDisapprove::release()
 // virtual
 uno::Any SAL_CALL
 InteractionDisapprove::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -486,7 +468,6 @@ InteractionDisapprove::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -494,7 +475,6 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -517,7 +497,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes()
 
 // virtual
 void SAL_CALL InteractionDisapprove::select()
-    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -548,7 +527,6 @@ void SAL_CALL InteractionSupplyAuthentication::release()
 // virtual
 uno::Any SAL_CALL
 InteractionSupplyAuthentication::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
             static_cast< lang::XTypeProvider * >( this ),
@@ -567,7 +545,6 @@ InteractionSupplyAuthentication::queryInterface( const uno::Type & rType )
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL
 InteractionSupplyAuthentication::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -575,7 +552,6 @@ InteractionSupplyAuthentication::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -598,7 +574,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes()
 
 // virtual
 void SAL_CALL InteractionSupplyAuthentication::select()
-    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -610,7 +585,6 @@ void SAL_CALL InteractionSupplyAuthentication::select()
 // virtual
 sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canSetRealm()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_bCanSetRealm;
 }
@@ -619,7 +593,6 @@ InteractionSupplyAuthentication::canSetRealm()
 // virtual
 void SAL_CALL
 InteractionSupplyAuthentication::setRealm( const OUString& Realm )
-    throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( m_bCanSetPassword,
         "InteractionSupplyAuthentication::setRealm - Not supported!" );
@@ -632,7 +605,6 @@ InteractionSupplyAuthentication::setRealm( const OUString& Realm )
 // virtual
 sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canSetUserName()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_bCanSetUserName;
 }
@@ -641,7 +613,6 @@ InteractionSupplyAuthentication::canSetUserName()
 // virtual
 void SAL_CALL
 InteractionSupplyAuthentication::setUserName( const OUString& UserName )
-    throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( m_bCanSetUserName,
         "InteractionSupplyAuthentication::setUserName - Not supported!" );
@@ -654,7 +625,6 @@ InteractionSupplyAuthentication::setUserName( const OUString& UserName )
 // virtual
 sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canSetPassword()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_bCanSetPassword;
 }
@@ -663,7 +633,6 @@ InteractionSupplyAuthentication::canSetPassword()
 // virtual
 void SAL_CALL
 InteractionSupplyAuthentication::setPassword( const OUString& Password )
-    throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( m_bCanSetPassword,
         "InteractionSupplyAuthentication::setPassword - Not supported!" );
@@ -677,7 +646,6 @@ InteractionSupplyAuthentication::setPassword( const OUString& Password )
 uno::Sequence< ucb::RememberAuthentication > SAL_CALL
 InteractionSupplyAuthentication::getRememberPasswordModes(
                                     ucb::RememberAuthentication& Default )
-    throw( uno::RuntimeException, std::exception )
 {
     Default = m_eDefaultRememberPasswordMode;
     return m_aRememberPasswordModes;
@@ -688,7 +656,6 @@ InteractionSupplyAuthentication::getRememberPasswordModes(
 void SAL_CALL
 InteractionSupplyAuthentication::setRememberPassword(
                                     ucb::RememberAuthentication Remember )
-    throw( uno::RuntimeException, std::exception )
 {
     m_eRememberPasswordMode = Remember;
 }
@@ -697,7 +664,6 @@ InteractionSupplyAuthentication::setRememberPassword(
 // virtual
 sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canSetAccount()
-    throw( uno::RuntimeException, std::exception )
 {
     return m_bCanSetAccount;
 }
@@ -706,7 +672,6 @@ InteractionSupplyAuthentication::canSetAccount()
 // virtual
 void SAL_CALL
 InteractionSupplyAuthentication::setAccount( const OUString& Account )
-    throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( m_bCanSetAccount,
         "InteractionSupplyAuthentication::setAccount - Not supported!" );
@@ -720,7 +685,6 @@ InteractionSupplyAuthentication::setAccount( const OUString& Account )
 uno::Sequence< ucb::RememberAuthentication > SAL_CALL
 InteractionSupplyAuthentication::getRememberAccountModes(
                                     ucb::RememberAuthentication& Default )
-    throw( uno::RuntimeException, std::exception )
 {
     Default = m_eDefaultRememberAccountMode;
     return m_aRememberAccountModes;
@@ -730,7 +694,6 @@ InteractionSupplyAuthentication::getRememberAccountModes(
 // virtual
 void SAL_CALL InteractionSupplyAuthentication::setRememberAccount(
                                     ucb::RememberAuthentication Remember )
-    throw( uno::RuntimeException, std::exception )
 {
     m_eRememberAccountMode = Remember;
 }
@@ -743,7 +706,6 @@ void SAL_CALL InteractionSupplyAuthentication::setRememberAccount(
 sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canUseSystemCredentials(
         sal_Bool& Default )
-    throw ( uno::RuntimeException, std::exception )
 {
     Default = false;
     return m_bCanUseSystemCredentials;
@@ -753,7 +715,6 @@ InteractionSupplyAuthentication::canUseSystemCredentials(
 // virtual
 void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials(
         sal_Bool UseSystemCredentials )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( m_bCanUseSystemCredentials )
         m_bUseSystemCredentials = UseSystemCredentials;
@@ -785,7 +746,6 @@ void SAL_CALL InteractionReplaceExistingData::release()
 // virtual
 uno::Any SAL_CALL
 InteractionReplaceExistingData::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -803,7 +763,6 @@ InteractionReplaceExistingData::queryInterface( const uno::Type & rType )
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL
 InteractionReplaceExistingData::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
@@ -811,7 +770,6 @@ InteractionReplaceExistingData::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -834,7 +792,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes()
 
 // virtual
 void SAL_CALL InteractionReplaceExistingData::select()
-    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -860,7 +817,6 @@ void SAL_CALL InteractionAuthFallback::release()
 // virtual
 uno::Any SAL_CALL
 InteractionAuthFallback::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
             static_cast< task::XInteractionContinuation * >( this ),
@@ -874,7 +830,6 @@ InteractionAuthFallback::queryInterface( const uno::Type & rType )
 
 // virtual
 void SAL_CALL InteractionAuthFallback::select()
-    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -883,13 +838,11 @@ void SAL_CALL InteractionAuthFallback::select()
 
 // virtual
 void SAL_CALL InteractionAuthFallback::setCode( const OUString& code )
-    throw ( uno::RuntimeException, std::exception )
 {
     m_aCode = code;
 }
 
 const OUString& SAL_CALL InteractionAuthFallback::getCode( )
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_aCode;
 }
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 5f836d149327..b375ab96b21b 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -259,7 +259,6 @@ void SAL_CALL PropertyValueSet::release()
 }
 
 css::uno::Any SAL_CALL PropertyValueSet::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XTypeProvider* >(this)),
@@ -283,7 +282,6 @@ XTYPEPROVIDER_IMPL_3( PropertyValueSet,
 
 // virtual
 sal_Bool SAL_CALL PropertyValueSet::wasNull()
-    throw( SQLException, RuntimeException, std::exception )
 {
     // This method can not be implemented correctly!!! Imagine different
     // threads doing a getXYZ - wasNull calling sequence on the same
@@ -294,7 +292,6 @@ sal_Bool SAL_CALL PropertyValueSet::wasNull()
 
 // virtual
 OUString SAL_CALL PropertyValueSet::getString( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( OUString, PropsSet::String, aString );
 }
@@ -302,7 +299,6 @@ OUString SAL_CALL PropertyValueSet::getString( sal_Int32 columnIndex )
 
 // virtual
 sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( bool, PropsSet::Boolean, bBoolean );
 }
@@ -310,7 +306,6 @@ sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex )
 
 // virtual
 sal_Int8 SAL_CALL PropertyValueSet::getByte( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( sal_Int8, PropsSet::Byte, nByte );
 }
@@ -318,7 +313,6 @@ sal_Int8 SAL_CALL PropertyValueSet::getByte( sal_Int32 columnIndex )
 
 // virtual
 sal_Int16 SAL_CALL PropertyValueSet::getShort( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( sal_Int16, PropsSet::Short, nShort );
 }
@@ -326,7 +320,6 @@ sal_Int16 SAL_CALL PropertyValueSet::getShort( sal_Int32 columnIndex )
 
 // virtual
 sal_Int32 SAL_CALL PropertyValueSet::getInt( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( sal_Int32, PropsSet::Int, nInt );
 }
@@ -334,7 +327,6 @@ sal_Int32 SAL_CALL PropertyValueSet::getInt( sal_Int32 columnIndex )
 
 // virtual
 sal_Int64 SAL_CALL PropertyValueSet::getLong( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( sal_Int64, PropsSet::Long, nLong );
 }
@@ -342,7 +334,6 @@ sal_Int64 SAL_CALL PropertyValueSet::getLong( sal_Int32 columnIndex )
 
 // virtual
 float SAL_CALL PropertyValueSet::getFloat( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( float, PropsSet::Float, nFloat );
 }
@@ -350,7 +341,6 @@ float SAL_CALL PropertyValueSet::getFloat( sal_Int32 columnIndex )
 
 // virtual
 double SAL_CALL PropertyValueSet::getDouble( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( double, PropsSet::Double, nDouble );
 }
@@ -359,7 +349,6 @@ double SAL_CALL PropertyValueSet::getDouble( sal_Int32 columnIndex )
 // virtual
 Sequence< sal_Int8 > SAL_CALL
 PropertyValueSet::getBytes( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Sequence< sal_Int8 >, PropsSet::Bytes, aBytes );
 }
@@ -367,7 +356,6 @@ PropertyValueSet::getBytes( sal_Int32 columnIndex )
 
 // virtual
 Date SAL_CALL PropertyValueSet::getDate( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Date, PropsSet::Date, aDate );
 }
@@ -375,7 +363,6 @@ Date SAL_CALL PropertyValueSet::getDate( sal_Int32 columnIndex )
 
 // virtual
 Time SAL_CALL PropertyValueSet::getTime( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Time, PropsSet::Time, aTime );
 }
@@ -383,7 +370,6 @@ Time SAL_CALL PropertyValueSet::getTime( sal_Int32 columnIndex )
 
 // virtual
 DateTime SAL_CALL PropertyValueSet::getTimestamp( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( DateTime, PropsSet::Timestamp, aTimestamp );
 }
@@ -392,7 +378,6 @@ DateTime SAL_CALL PropertyValueSet::getTimestamp( sal_Int32 columnIndex )
 // virtual
 Reference< XInputStream > SAL_CALL
 PropertyValueSet::getBinaryStream( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL(
         Reference< XInputStream >, PropsSet::BinaryStream, xBinaryStream );
@@ -402,7 +387,6 @@ PropertyValueSet::getBinaryStream( sal_Int32 columnIndex )
 // virtual
 Reference< XInputStream > SAL_CALL
 PropertyValueSet::getCharacterStream( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL(
         Reference< XInputStream >, PropsSet::CharacterStream, xCharacterStream );
@@ -413,7 +397,6 @@ PropertyValueSet::getCharacterStream( sal_Int32 columnIndex )
 Any SAL_CALL PropertyValueSet::getObject(
                                     sal_Int32 columnIndex,
                                          const Reference< XNameAccess >& )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -541,7 +524,6 @@ Any SAL_CALL PropertyValueSet::getObject(
 
 // virtual
 Reference< XRef > SAL_CALL PropertyValueSet::getRef( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Reference< XRef >, PropsSet::Ref, xRef );
 }
@@ -549,7 +531,6 @@ Reference< XRef > SAL_CALL PropertyValueSet::getRef( sal_Int32 columnIndex )
 
 // virtual
 Reference< XBlob > SAL_CALL PropertyValueSet::getBlob( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Reference< XBlob >, PropsSet::Blob, xBlob );
 }
@@ -557,7 +538,6 @@ Reference< XBlob > SAL_CALL PropertyValueSet::getBlob( sal_Int32 columnIndex )
 
 // virtual
 Reference< XClob > SAL_CALL PropertyValueSet::getClob( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Reference< XClob >, PropsSet::Clob, xClob );
 }
@@ -565,7 +545,6 @@ Reference< XClob > SAL_CALL PropertyValueSet::getClob( sal_Int32 columnIndex )
 
 // virtual
 Reference< XArray > SAL_CALL PropertyValueSet::getArray( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Reference< XArray >, PropsSet::Array, xArray );
 }
@@ -576,7 +555,6 @@ Reference< XArray > SAL_CALL PropertyValueSet::getArray( sal_Int32 columnIndex )
 
 // virtual
 sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName )
-    throw( SQLException, RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index c4148fc82996..2fd42abc079d 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -83,7 +83,6 @@ void SAL_CALL ContentProviderImplHelper::release()
 }
 
 css::uno::Any SAL_CALL ContentProviderImplHelper::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -101,7 +100,6 @@ XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper,
 // virtual
 sal_Bool SAL_CALL ContentProviderImplHelper::supportsService(
                                             const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -110,7 +108,6 @@ sal_Bool SAL_CALL ContentProviderImplHelper::supportsService(
 sal_Int32 SAL_CALL ContentProviderImplHelper::compareContentIds(
         const uno::Reference< css::ucb::XContentIdentifier >& Id1,
         const uno::Reference< css::ucb::XContentIdentifier >& Id2 )
-    throw( uno::RuntimeException, std::exception )
 {
     // Simply do a string compare.
 
diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx
index edd19b47d950..8c5d19c2ca63 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -44,7 +44,6 @@ registerAtUcb(
     OUString const & rName,
     OUString const & rArguments,
     OUString const & rTemplate)
-    throw (uno::RuntimeException)
 {
     OSL_ENSURE(rxContext.is(),
                "ucb::registerAtUcb(): No service factory");
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 2bf8c54dc45c..b4ba14f7e3f6 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -95,27 +95,21 @@ public:
         sal_Int32 nProps );
 
     // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
     // XPropertySetInfo
-    virtual uno::Sequence< beans::Property > SAL_CALL getProperties()
-        throw( uno::RuntimeException, std::exception ) override;
+    virtual uno::Sequence< beans::Property > SAL_CALL getProperties() override;
     virtual beans::Property SAL_CALL getPropertyByName(
-            const OUString& aName )
-        throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-        throw( uno::RuntimeException, std::exception ) override;
+            const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 };
 
 typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
@@ -236,7 +230,6 @@ void SAL_CALL ResultSet::release()
 }
 
 css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -270,19 +263,16 @@ XTYPEPROVIDER_IMPL_9( ResultSet,
 // XServiceInfo methods.
 
 OUString SAL_CALL ResultSet::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "ResultSet" );
 }
 
 sal_Bool SAL_CALL ResultSet::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL ResultSet::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { RESULTSET_SERVICE_NAME };
 }
@@ -293,7 +283,6 @@ css::uno::Sequence< OUString > SAL_CALL ResultSet::getSupportedServiceNames()
 
 // virtual
 void SAL_CALL ResultSet::dispose()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -319,7 +308,6 @@ void SAL_CALL ResultSet::dispose()
 // virtual
 void SAL_CALL ResultSet::addEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -334,7 +322,6 @@ void SAL_CALL ResultSet::addEventListener(
 // virtual
 void SAL_CALL ResultSet::removeEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -348,7 +335,6 @@ void SAL_CALL ResultSet::removeEventListener(
 
 // virtual
 uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -365,7 +351,6 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::next()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     // Note: Cursor is initially positioned before the first row.
     //       First call to 'next()' moves it to first row.
@@ -394,7 +379,6 @@ sal_Bool SAL_CALL ResultSet::next()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::isBeforeFirst()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bAfterLast )
     {
@@ -416,7 +400,6 @@ sal_Bool SAL_CALL ResultSet::isBeforeFirst()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::isAfterLast()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->validate();
     return m_pImpl->m_bAfterLast;
@@ -425,7 +408,6 @@ sal_Bool SAL_CALL ResultSet::isAfterLast()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::isFirst()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bAfterLast )
     {
@@ -440,7 +422,6 @@ sal_Bool SAL_CALL ResultSet::isFirst()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::isLast()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bAfterLast )
     {
@@ -462,7 +443,6 @@ sal_Bool SAL_CALL ResultSet::isLast()
 
 // virtual
 void SAL_CALL ResultSet::beforeFirst()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
     m_pImpl->m_bAfterLast = false;
@@ -473,7 +453,6 @@ void SAL_CALL ResultSet::beforeFirst()
 
 // virtual
 void SAL_CALL ResultSet::afterLast()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
     m_pImpl->m_bAfterLast = true;
@@ -483,7 +462,6 @@ void SAL_CALL ResultSet::afterLast()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::first()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     // getResult works zero-based!
     if ( m_pImpl->m_xDataSupplier->getResult( 0 ) )
@@ -502,7 +480,6 @@ sal_Bool SAL_CALL ResultSet::first()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::last()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     sal_Int32 nCount = m_pImpl->m_xDataSupplier->totalCount();
     if ( nCount )
@@ -521,7 +498,6 @@ sal_Bool SAL_CALL ResultSet::last()
 
 // virtual
 sal_Int32 SAL_CALL ResultSet::getRow()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bAfterLast )
     {
@@ -536,7 +512,6 @@ sal_Int32 SAL_CALL ResultSet::getRow()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
 /*
     If the row number is positive, the cursor moves to the given row number
@@ -609,7 +584,6 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
 
 // virtual
 sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
 /*
     Attempting to move beyond the first/last row in the result set
@@ -679,7 +653,6 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
 
 // virtual
 sal_Bool SAL_CALL ResultSet::previous()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
 /*
     previous() is not the same as relative( -1 ) because it makes sense
@@ -709,7 +682,6 @@ sal_Bool SAL_CALL ResultSet::previous()
 
 // virtual
 void SAL_CALL ResultSet::refreshRow()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
     if ( m_pImpl->m_bAfterLast || ( m_pImpl->m_nPos == 0 ) )
@@ -722,7 +694,6 @@ void SAL_CALL ResultSet::refreshRow()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::rowUpdated()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->validate();
     return false;
@@ -731,7 +702,6 @@ sal_Bool SAL_CALL ResultSet::rowUpdated()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::rowInserted()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->validate();
     return false;
@@ -740,7 +710,6 @@ sal_Bool SAL_CALL ResultSet::rowInserted()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::rowDeleted()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->validate();
     return false;
@@ -749,7 +718,6 @@ sal_Bool SAL_CALL ResultSet::rowDeleted()
 
 // virtual
 uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
 /*
     returns the Statement that produced this ResultSet object. If the
@@ -765,7 +733,6 @@ uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::wasNull()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     // This method can not be implemented correctly!!! Imagine different
     // threads doing a getXYZ - wasNull calling sequence on the same
@@ -790,7 +757,6 @@ sal_Bool SAL_CALL ResultSet::wasNull()
 
 // virtual
 OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -813,7 +779,6 @@ OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex )
 
 // virtual
 sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -836,7 +801,6 @@ sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex )
 
 // virtual
 sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -859,7 +823,6 @@ sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex )
 
 // virtual
 sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -882,7 +845,6 @@ sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex )
 
 // virtual
 sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -905,7 +867,6 @@ sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex )
 
 // virtual
 sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -928,7 +889,6 @@ sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex )
 
 // virtual
 float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -951,7 +911,6 @@ float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex )
 
 // virtual
 double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -975,7 +934,6 @@ double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex )
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL
 ResultSet::getBytes( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -998,7 +956,6 @@ ResultSet::getBytes( sal_Int32 columnIndex )
 
 // virtual
 util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1021,7 +978,6 @@ util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex )
 
 // virtual
 util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1045,7 +1001,6 @@ util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex )
 // virtual
 util::DateTime SAL_CALL
 ResultSet::getTimestamp( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1069,7 +1024,6 @@ ResultSet::getTimestamp( sal_Int32 columnIndex )
 // virtual
 uno::Reference< io::XInputStream > SAL_CALL
 ResultSet::getBinaryStream( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1093,7 +1047,6 @@ ResultSet::getBinaryStream( sal_Int32 columnIndex )
 // virtual
 uno::Reference< io::XInputStream > SAL_CALL
 ResultSet::getCharacterStream( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1118,7 +1071,6 @@ ResultSet::getCharacterStream( sal_Int32 columnIndex )
 uno::Any SAL_CALL ResultSet::getObject(
         sal_Int32 columnIndex,
         const uno::Reference< container::XNameAccess >& typeMap )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1142,7 +1094,6 @@ uno::Any SAL_CALL ResultSet::getObject(
 // virtual
 uno::Reference< sdbc::XRef > SAL_CALL
 ResultSet::getRef( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1166,7 +1117,6 @@ ResultSet::getRef( sal_Int32 columnIndex )
 // virtual
 uno::Reference< sdbc::XBlob > SAL_CALL
 ResultSet::getBlob( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1190,7 +1140,6 @@ ResultSet::getBlob( sal_Int32 columnIndex )
 // virtual
 uno::Reference< sdbc::XClob > SAL_CALL
 ResultSet::getClob( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1214,7 +1163,6 @@ ResultSet::getClob( sal_Int32 columnIndex )
 // virtual
 uno::Reference< sdbc::XArray > SAL_CALL
 ResultSet::getArray( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1240,7 +1188,6 @@ ResultSet::getArray( sal_Int32 columnIndex )
 
 // virtual
 void SAL_CALL ResultSet::close()
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->close();
     m_pImpl->m_xDataSupplier->validate();
@@ -1252,7 +1199,6 @@ void SAL_CALL ResultSet::close()
 
 // virtual
 OUString SAL_CALL ResultSet::queryContentIdentifierString()
-    throw( uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
         return m_pImpl->m_xDataSupplier->queryContentIdentifierString(
@@ -1265,7 +1211,6 @@ OUString SAL_CALL ResultSet::queryContentIdentifierString()
 // virtual
 uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
 ResultSet::queryContentIdentifier()
-    throw( uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
         return m_pImpl->m_xDataSupplier->queryContentIdentifier(
@@ -1278,7 +1223,6 @@ ResultSet::queryContentIdentifier()
 // virtual
 uno::Reference< css::ucb::XContent > SAL_CALL
 ResultSet::queryContent()
-    throw( uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
         return m_pImpl->m_xDataSupplier->queryContent( m_pImpl->m_nPos - 1 );
@@ -1293,7 +1237,6 @@ ResultSet::queryContent()
 // virtual
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 ResultSet::getPropertySetInfo()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -1308,11 +1251,6 @@ ResultSet::getPropertySetInfo()
 // virtual
 void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName,
                                            const uno::Any& )
-    throw( beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     if ( aPropertyName.isEmpty() )
         throw beans::UnknownPropertyException();
@@ -1337,9 +1275,6 @@ void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName,
 // virtual
 uno::Any SAL_CALL ResultSet::getPropertyValue(
         const OUString& PropertyName )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     if ( PropertyName.isEmpty() )
         throw beans::UnknownPropertyException();
@@ -1367,9 +1302,6 @@ uno::Any SAL_CALL ResultSet::getPropertyValue(
 void SAL_CALL ResultSet::addPropertyChangeListener(
         const OUString& aPropertyName,
         const uno::Reference< beans::XPropertyChangeListener >& xListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     // Note: An empty property name means a listener for "all" properties.
 
@@ -1393,9 +1325,6 @@ void SAL_CALL ResultSet::addPropertyChangeListener(
 void SAL_CALL ResultSet::removePropertyChangeListener(
         const OUString& aPropertyName,
         const uno::Reference< beans::XPropertyChangeListener >& xListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -1415,9 +1344,6 @@ void SAL_CALL ResultSet::removePropertyChangeListener(
 void SAL_CALL ResultSet::addVetoableChangeListener(
         const OUString&,
         const uno::Reference< beans::XVetoableChangeListener >& )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     //  No constrained props, at the moment.
 }
@@ -1427,9 +1353,6 @@ void SAL_CALL ResultSet::addVetoableChangeListener(
 void SAL_CALL ResultSet::removeVetoableChangeListener(
         const OUString&,
         const uno::Reference< beans::XVetoableChangeListener >& )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception )
 {
     //  No constrained props, at the moment.
 }
@@ -1565,7 +1488,6 @@ void SAL_CALL PropertySetInfo::release()
 
 css::uno::Any SAL_CALL PropertySetInfo::queryInterface(
                                 const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -1587,7 +1509,6 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo,
 
 // virtual
 uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
-    throw( uno::RuntimeException, std::exception )
 {
     return uno::Sequence< beans::Property >( *m_pProps );
 }
@@ -1596,7 +1517,6 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
 // virtual
 beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
         const OUString& aName )
-    throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
 {
     beans::Property aProp;
     if ( queryProperty( aName, aProp ) )
@@ -1609,7 +1529,6 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
 // virtual
 sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
         const OUString& Name )
-    throw( uno::RuntimeException, std::exception )
 {
     beans::Property aProp;
     return queryProperty( Name, aProp );
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 314e4e6e6d58..9013b13ba43c 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -77,7 +77,6 @@ void SAL_CALL ResultSetImplHelper::release()
 }
 
 css::uno::Any SAL_CALL ResultSetImplHelper::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -100,19 +99,16 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper,
 // XServiceInfo methods.
 
 OUString SAL_CALL ResultSetImplHelper::getImplementationName()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return OUString( "ResultSetImplHelper" );
 }
 
 sal_Bool SAL_CALL ResultSetImplHelper::supportsService( const OUString& ServiceName )
-    throw( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 css::uno::Sequence< OUString > SAL_CALL ResultSetImplHelper::getSupportedServiceNames()
-    throw( css::uno::RuntimeException, std::exception )
 {
     return { DYNAMICRESULTSET_SERVICE_NAME };
 }
@@ -122,7 +118,6 @@ css::uno::Sequence< OUString > SAL_CALL ResultSetImplHelper::getSupportedService
 
 // virtual
 void SAL_CALL ResultSetImplHelper::dispose()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -138,7 +133,6 @@ void SAL_CALL ResultSetImplHelper::dispose()
 // virtual
 void SAL_CALL ResultSetImplHelper::addEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -152,7 +146,6 @@ void SAL_CALL ResultSetImplHelper::addEventListener(
 // virtual
 void SAL_CALL ResultSetImplHelper::removeEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -167,8 +160,6 @@ void SAL_CALL ResultSetImplHelper::removeEventListener(
 // virtual
 uno::Reference< sdbc::XResultSet > SAL_CALL
 ResultSetImplHelper::getStaticResultSet()
-    throw( css::ucb::ListenerAlreadySetException,
-           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -183,8 +174,6 @@ ResultSetImplHelper::getStaticResultSet()
 // virtual
 void SAL_CALL ResultSetImplHelper::setListener(
         const uno::Reference< css::ucb::XDynamicResultSetListener >& Listener )
-    throw( css::ucb::ListenerAlreadySetException,
-           uno::RuntimeException, std::exception )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -225,7 +214,6 @@ void SAL_CALL ResultSetImplHelper::setListener(
 
 // virtual
 sal_Int16 SAL_CALL ResultSetImplHelper::getCapabilities()
-    throw( uno::RuntimeException, std::exception )
 {
     // ! css::ucb::ContentResultSetCapability::SORTED
     return 0;
@@ -235,10 +223,6 @@ sal_Int16 SAL_CALL ResultSetImplHelper::getCapabilities()
 // virtual
 void SAL_CALL ResultSetImplHelper::connectToCache(
         const uno::Reference< css::ucb::XDynamicResultSet > & xCache )
-    throw( css::ucb::ListenerAlreadySetException,
-           css::ucb::AlreadyInitializedException,
-           css::ucb::ServiceNotFoundException,
-           uno::RuntimeException, std::exception )
 {
     if ( m_xListener.is() )
         throw css::ucb::ListenerAlreadySetException();
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index fe36117b1eba..5c35d84c6f6e 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -119,7 +119,6 @@ void SAL_CALL ResultSetMetaData::release()
 }
 
 css::uno::Any SAL_CALL ResultSetMetaData::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< XTypeProvider* >(this)),
@@ -141,7 +140,6 @@ XTYPEPROVIDER_IMPL_2( ResultSetMetaData,
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getColumnCount()
-    throw( SQLException, RuntimeException, std::exception )
 {
     return m_aProps.getLength();
 }
@@ -149,7 +147,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnCount()
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Checks whether column is automatically numbered, which makes it
@@ -161,7 +158,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isCaseSensitive( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     if ( ( column < 1 ) || ( column > m_aProps.getLength() ) )
         return false;
@@ -172,7 +168,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isCaseSensitive( sal_Int32 column )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isSearchable( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     return false;
 }
@@ -180,7 +175,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isSearchable( sal_Int32 /*column*/ )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isCurrency( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     return false;
 }
@@ -188,7 +182,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isCurrency( sal_Int32 /*column*/ )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::isNullable( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     return ColumnValue::NULLABLE;
 }
@@ -196,7 +189,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::isNullable( sal_Int32 /*column*/ )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isSigned( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     return false;
 }
@@ -204,7 +196,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isSigned( sal_Int32 /*column*/ )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the normal maximum width in characters for column.
@@ -219,7 +210,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getColumnLabel( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the suggested column title for column, to be used in print-
@@ -239,7 +229,6 @@ OUString SAL_CALL ResultSetMetaData::getColumnLabel( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getColumnName( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the name of column.
@@ -254,7 +243,6 @@ OUString SAL_CALL ResultSetMetaData::getColumnName( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getSchemaName( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the schema name for the table from which column of this
@@ -272,7 +260,6 @@ OUString SAL_CALL ResultSetMetaData::getSchemaName( sal_Int32 column )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getPrecision( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     return -1;
 }
@@ -280,7 +267,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getPrecision( sal_Int32 /*column*/ )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getScale( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     return 0;
 }
@@ -288,7 +274,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getScale( sal_Int32 /*column*/ )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getTableName( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the name of the table from which column of this result set
@@ -306,7 +291,6 @@ OUString SAL_CALL ResultSetMetaData::getTableName( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getCatalogName( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the catalog name for the table from which column of this
@@ -324,7 +308,6 @@ OUString SAL_CALL ResultSetMetaData::getCatalogName( sal_Int32 column )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the JDBC type for the value stored in column. ... The STRUCT
@@ -432,7 +415,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getColumnTypeName( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the type name used by this particular data source for the
@@ -450,7 +432,6 @@ OUString SAL_CALL ResultSetMetaData::getColumnTypeName( sal_Int32 column )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isReadOnly( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     return true;
 }
@@ -458,7 +439,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isReadOnly( sal_Int32 /*column*/ )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isWritable( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     return false;
 }
@@ -466,7 +446,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isWritable( sal_Int32 /*column*/ )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ )
-    throw( SQLException, RuntimeException, std::exception )
 {
     return false;
 }
@@ -474,7 +453,6 @@ sal_Bool SAL_CALL ResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getColumnServiceName( sal_Int32 column )
-    throw( SQLException, RuntimeException, std::exception )
 {
     /*
           Returns the fully-qualified name of the service whose instances
diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index a9712a3425ae..912e559f989b 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
@@ -45,8 +45,7 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL
-    queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    queryInterface( const css::uno::Type & rType ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
@@ -54,19 +53,15 @@ public:
 
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL
-    getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-    getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    getImplementationId() override;
 
     // XInteractionContinuation
-    virtual void SAL_CALL select()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL select() override;
 
     // XInteractionSupplyName
-    virtual void SAL_CALL setName( const OUString& Name )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setName( const OUString& Name ) override;
 
     // Non-interface methods.
 
@@ -93,7 +88,6 @@ void SAL_CALL InteractionSupplyName::release()
 
 uno::Any SAL_CALL
 InteractionSupplyName::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -105,13 +99,11 @@ InteractionSupplyName::queryInterface( const uno::Type & rType )
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyName::getImplementationId()
-    throw( uno::RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 uno::Sequence< uno::Type > SAL_CALL InteractionSupplyName::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -129,14 +121,12 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyName::getTypes()
 }
 
 void SAL_CALL InteractionSupplyName::select()
-    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
 
 void SAL_CALL
 InteractionSupplyName::setName( const OUString& Name )
-    throw( uno::RuntimeException, std::exception )
 {
     m_aName = Name;
 }
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index e25719c8bb2c..1a59cea8e844 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -33,22 +33,16 @@ public:
     AccessibleRelationSetHelperImpl(const AccessibleRelationSetHelperImpl& rImpl);
 
     /// @throws uno::RuntimeException
-    sal_Int32 getRelationCount(  )
-        throw (uno::RuntimeException);
+    sal_Int32 getRelationCount(  );
     /// @throws lang::IndexOutOfBoundsException
     /// @throws uno::RuntimeException
-    AccessibleRelation getRelation( sal_Int32 nIndex )
-            throw (lang::IndexOutOfBoundsException,
-                    uno::RuntimeException);
+    AccessibleRelation getRelation( sal_Int32 nIndex );
     /// @throws uno::RuntimeException
-    bool containsRelation( sal_Int16 aRelationType )
-        throw (uno::RuntimeException);
+    bool containsRelation( sal_Int16 aRelationType );
     /// @throws uno::RuntimeException
-    AccessibleRelation getRelationByType( sal_Int16 aRelationType )
-            throw (uno::RuntimeException);
+    AccessibleRelation getRelationByType( sal_Int16 aRelationType );
     /// @throws uno::RuntimeException
-    void AddRelation(const AccessibleRelation& rRelation)
-            throw (uno::RuntimeException);
+    void AddRelation(const AccessibleRelation& rRelation);
 
 private:
     std::vector<AccessibleRelation> maRelations;
@@ -64,14 +58,11 @@ AccessibleRelationSetHelperImpl::AccessibleRelationSetHelperImpl(const Accessibl
 }
 
 sal_Int32 AccessibleRelationSetHelperImpl::getRelationCount(  )
-    throw (uno::RuntimeException)
 {
     return maRelations.size();
 }
 
 AccessibleRelation AccessibleRelationSetHelperImpl::getRelation( sal_Int32 nIndex )
-    throw (lang::IndexOutOfBoundsException,
-            uno::RuntimeException)
 {
     if ((nIndex < 0) || (static_cast<sal_uInt32>(nIndex) >= maRelations.size()))
         throw lang::IndexOutOfBoundsException();
@@ -79,7 +70,6 @@ AccessibleRelation AccessibleRelationSetHelperImpl::getRelation( sal_Int32 nInde
 }
 
 bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType )
-    throw (uno::RuntimeException)
 {
     AccessibleRelation defaultRelation; // default is INVALID
     AccessibleRelation relationByType = getRelationByType(aRelationType);
@@ -87,7 +77,6 @@ bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType
 }
 
 AccessibleRelation AccessibleRelationSetHelperImpl::getRelationByType( sal_Int16 aRelationType )
-    throw (uno::RuntimeException)
 {
     sal_Int32 nCount(getRelationCount());
     sal_Int32 i(0);
@@ -103,7 +92,6 @@ AccessibleRelation AccessibleRelationSetHelperImpl::getRelationByType( sal_Int16
 }
 
 void AccessibleRelationSetHelperImpl::AddRelation(const AccessibleRelation& rRelation)
-    throw (uno::RuntimeException)
 {
     sal_Int32 nCount(getRelationCount());
     sal_Int32 i(0);
@@ -150,7 +138,6 @@ AccessibleRelationSetHelper::~AccessibleRelationSetHelper()
     */
 sal_Int32 SAL_CALL
     AccessibleRelationSetHelper::getRelationCount(  )
-        throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->getRelationCount();
@@ -171,8 +158,6 @@ sal_Int32 SAL_CALL
     */
  AccessibleRelation SAL_CALL
         AccessibleRelationSetHelper::getRelation( sal_Int32 nIndex )
-            throw (lang::IndexOutOfBoundsException,
-                    uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->getRelation(nIndex);
@@ -192,7 +177,6 @@ sal_Int32 SAL_CALL
     */
 sal_Bool SAL_CALL
     AccessibleRelationSetHelper::containsRelation( sal_Int16 aRelationType )
-        throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->containsRelation(aRelationType);
@@ -211,14 +195,12 @@ sal_Bool SAL_CALL
     */
 AccessibleRelation SAL_CALL
         AccessibleRelationSetHelper::getRelationByType( sal_Int16 aRelationType )
-            throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->getRelationByType(aRelationType);
 }
 
 void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelation)
-            throw (uno::RuntimeException)
 {
     osl::MutexGuard aGuard (maMutex);
     mpHelperImpl->AddRelation(rRelation);
@@ -227,7 +209,6 @@ void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelatio
 //=====  XTypeProvider  =======================================================
 
 uno::Sequence< css::uno::Type> AccessibleRelationSetHelper::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     css::uno::Sequence< css::uno::Type> aTypeSequence {
@@ -238,7 +219,6 @@ uno::Sequence< css::uno::Type> AccessibleRelationSetHelper::getTypes()
 }
 
 uno::Sequence<sal_Int8> SAL_CALL AccessibleRelationSetHelper::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 0b669c6cdbbe..26cd61c1a5e8 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -36,20 +36,15 @@ public:
     AccessibleStateSetHelperImpl(const AccessibleStateSetHelperImpl& rImpl);
 
     /// @throws uno::RuntimeException
-    bool IsEmpty () const
-        throw (uno::RuntimeException);
+    bool IsEmpty () const;
     /// @throws uno::RuntimeException
-    bool Contains (sal_Int16 aState) const
-        throw (uno::RuntimeException);
+    bool Contains (sal_Int16 aState) const;
     /// @throws uno::RuntimeException
-    uno::Sequence<sal_Int16> GetStates() const
-        throw (uno::RuntimeException);
+    uno::Sequence<sal_Int16> GetStates() const;
     /// @throws uno::RuntimeException
-    void AddState(sal_Int16 aState)
-        throw (uno::RuntimeException);
+    void AddState(sal_Int16 aState);
     /// @throws uno::RuntimeException
-    void RemoveState(sal_Int16 aState)
-        throw (uno::RuntimeException);
+    void RemoveState(sal_Int16 aState);
 
     inline void AddStates( const sal_Int64 _nStates );
 
@@ -68,13 +63,11 @@ AccessibleStateSetHelperImpl::AccessibleStateSetHelperImpl(const AccessibleState
 }
 
 inline bool AccessibleStateSetHelperImpl::IsEmpty () const
-    throw (uno::RuntimeException)
 {
     return maStates == 0;
 }
 
 inline bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const
-    throw (uno::RuntimeException)
 {
     DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
     sal_uInt64 aTempBitSet(1);
@@ -83,7 +76,6 @@ inline bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const
 }
 
 inline uno::Sequence<sal_Int16> AccessibleStateSetHelperImpl::GetStates() const
-    throw (uno::RuntimeException)
 {
     uno::Sequence<sal_Int16> aRet(BITFIELDSIZE);
     sal_Int16* pSeq = aRet.getArray();
@@ -105,7 +97,6 @@ inline void AccessibleStateSetHelperImpl::AddStates( const sal_Int64 _nStates )
 }
 
 inline void AccessibleStateSetHelperImpl::AddState(sal_Int16 aState)
-    throw (uno::RuntimeException)
 {
     DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
     sal_uInt64 aTempBitSet(1);
@@ -114,7 +105,6 @@ inline void AccessibleStateSetHelperImpl::AddState(sal_Int16 aState)
 }
 
 inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState)
-    throw (uno::RuntimeException)
 {
     DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
     sal_uInt64 aTempBitSet(1);
@@ -158,7 +148,6 @@ AccessibleStateSetHelper::~AccessibleStateSetHelper()
             <FALSE/> if there is at least one state set in it.
     */
 sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty ()
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->IsEmpty();
@@ -176,7 +165,6 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty ()
             state set and <FALSE/> otherwise.
     */
 sal_Bool SAL_CALL AccessibleStateSetHelper::contains (sal_Int16 aState)
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->Contains(aState);
@@ -199,7 +187,6 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::contains (sal_Int16 aState)
     */
 sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll
     (const uno::Sequence<sal_Int16>& rStateSet)
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     sal_Int32 nCount(rStateSet.getLength());
@@ -215,21 +202,18 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll
 }
 
 uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSetHelper::getStates()
-    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(maMutex);
     return mpHelperImpl->GetStates();
 }
 
 void AccessibleStateSetHelper::AddState(sal_Int16 aState)
-    throw (uno::RuntimeException)
 {
     osl::MutexGuard aGuard (maMutex);
     mpHelperImpl->AddState(aState);
 }
 
 void AccessibleStateSetHelper::RemoveState(sal_Int16 aState)
-    throw (uno::RuntimeException)
 {
     osl::MutexGuard aGuard (maMutex);
     mpHelperImpl->RemoveState(aState);
@@ -238,7 +222,6 @@ void AccessibleStateSetHelper::RemoveState(sal_Int16 aState)
 //=====  XTypeProvider  =======================================================
 
 uno::Sequence< css::uno::Type> AccessibleStateSetHelper::getTypes()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< css::uno::Type> aTypeSequence {
         cppu::UnoType<XAccessibleStateSet>::get(),
@@ -248,7 +231,6 @@ uno::Sequence< css::uno::Type> AccessibleStateSetHelper::getTypes()
 }
 
 uno::Sequence<sal_Int8> SAL_CALL AccessibleStateSetHelper::getImplementationId()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<sal_Int8>();
 }
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index b40d0ccde3c9..ae468e78d701 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -73,10 +73,10 @@ namespace utl{
             ConfigChangeListener_Impl(ConfigItem& rItem, const Sequence< OUString >& rNames);
 
         //XChangesListener
-        virtual void SAL_CALL changesOccurred( const ChangesEvent& Event ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL changesOccurred( const ChangesEvent& Event ) override;
 
         //XEventListener
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
     };
 }
 
@@ -116,7 +116,7 @@ static bool lcl_Find(
     return false;
 }
 
-void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) throw(RuntimeException, std::exception)
+void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent )
 {
     const ElementChange* pElementChanges = rEvent.Changes.getConstArray();
 
@@ -145,7 +145,7 @@ void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) th
     }
 }
 
-void ConfigChangeListener_Impl::disposing( const EventObject& /*rSource*/ ) throw(RuntimeException, std::exception)
+void ConfigChangeListener_Impl::disposing( const EventObject& /*rSource*/ )
 {
     pParent->RemoveChangesListener();
 }
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index a2faf43afbf3..0965269b44e6 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -99,19 +99,19 @@ public:
     /// @throws css::container::NoSuchElementException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement );
     /// @throws css::container::NoSuchElementException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    css::uno::Any SAL_CALL getByName( const OUString& aName );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (css::uno::RuntimeException);
+    css::uno::Sequence< OUString > SAL_CALL getElementNames(  );
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException);
+    bool SAL_CALL hasByName( const OUString& aName );
     /// @throws css::uno::RuntimeException
-    static css::uno::Type SAL_CALL getElementType(  ) throw (css::uno::RuntimeException);
+    static css::uno::Type SAL_CALL getElementType(  );
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException);
+    bool SAL_CALL hasElements(  );
     OUString GetEventName( GlobalEventId nID );
 };
 
@@ -236,7 +236,7 @@ void GlobalEventConfig_Impl::initBindingInfo()
     }
 }
 
-void SAL_CALL GlobalEventConfig_Impl::replaceByName( const OUString& aName, const Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
+void SAL_CALL GlobalEventConfig_Impl::replaceByName( const OUString& aName, const Any& aElement )
 {
     Sequence< beans::PropertyValue > props;
     //DF should we prepopulate the hash with a list of valid event Names?
@@ -256,7 +256,7 @@ void SAL_CALL GlobalEventConfig_Impl::replaceByName( const OUString& aName, cons
     SetModified();
 }
 
-Any SAL_CALL GlobalEventConfig_Impl::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
+Any SAL_CALL GlobalEventConfig_Impl::getByName( const OUString& aName )
 {
     Any aRet;
     Sequence< beans::PropertyValue > props(2);
@@ -282,12 +282,12 @@ Any SAL_CALL GlobalEventConfig_Impl::getByName( const OUString& aName ) throw (c
     return aRet;
 }
 
-Sequence< OUString > SAL_CALL GlobalEventConfig_Impl::getElementNames(  ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL GlobalEventConfig_Impl::getElementNames(  )
 {
     return uno::Sequence< OUString >(m_supportedEvents.data(), SupportedEventsVector::size());
 }
 
-bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (RuntimeException)
+bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName )
 {
     if ( m_eventBindingHash.find( aName ) != m_eventBindingHash.end() )
         return true;
@@ -301,13 +301,13 @@ bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (
     return false;
 }
 
-Type SAL_CALL GlobalEventConfig_Impl::getElementType(  ) throw (RuntimeException)
+Type SAL_CALL GlobalEventConfig_Impl::getElementType(  )
 {
     //DF definitely not sure about this??
     return cppu::UnoType<Sequence<beans::PropertyValue>>::get();
 }
 
-bool SAL_CALL GlobalEventConfig_Impl::hasElements(  ) throw (RuntimeException)
+bool SAL_CALL GlobalEventConfig_Impl::hasElements(  )
 {
     return ( m_eventBindingHash.empty() );
 }
@@ -347,39 +347,39 @@ GlobalEventConfig::~GlobalEventConfig()
     }
 }
 
-Reference< container::XNameReplace > SAL_CALL GlobalEventConfig::getEvents() throw (css::uno::RuntimeException, std::exception)
+Reference< container::XNameReplace > SAL_CALL GlobalEventConfig::getEvents()
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     Reference< container::XNameReplace > ret(this);
     return ret;
 }
 
-void SAL_CALL GlobalEventConfig::replaceByName( const OUString& aName, const Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL GlobalEventConfig::replaceByName( const OUString& aName, const Any& aElement )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pImpl->replaceByName( aName, aElement );
 }
-Any SAL_CALL GlobalEventConfig::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL GlobalEventConfig::getByName( const OUString& aName )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pImpl->getByName( aName );
 }
-Sequence< OUString > SAL_CALL GlobalEventConfig::getElementNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL GlobalEventConfig::getElementNames(  )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pImpl->getElementNames( );
 }
-sal_Bool SAL_CALL GlobalEventConfig::hasByName( const OUString& aName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL GlobalEventConfig::hasByName( const OUString& aName )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pImpl->hasByName( aName );
 }
-Type SAL_CALL GlobalEventConfig::getElementType(  ) throw (RuntimeException, std::exception)
+Type SAL_CALL GlobalEventConfig::getElementType(  )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return GlobalEventConfig_Impl::getElementType( );
 }
-sal_Bool SAL_CALL GlobalEventConfig::hasElements(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL GlobalEventConfig::hasElements(  )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pImpl->hasElements( );
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 43a239b7e1fd..76e06437bf5e 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -88,7 +88,6 @@ void ItemHolder1::holdConfigItem(EItem eItem)
 }
 
 void SAL_CALL ItemHolder1::disposing(const css::lang::EventObject&)
-    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::uno::XInterface > xSelfHold(static_cast< css::lang::XEventListener* >(this), css::uno::UNO_QUERY);
     impl_releaseAllItems();
diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx
index 9a1626dadc88..c181c579da1f 100644
--- a/unotools/source/config/itemholder1.hxx
+++ b/unotools/source/config/itemholder1.hxx
@@ -43,8 +43,7 @@ class ItemHolder1 : private ItemHolderMutexBase
     // uno interface
     public:
 
-        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
     // helper
     private:
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 747997dcca61..6459495157f7 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -76,9 +76,9 @@ public:
     explicit ChangeListener (Impl& rParent): m_rParent(rParent) { }
 
     // XChangesListener
-    virtual void SAL_CALL changesOccurred (util::ChangesEvent const& Event) throw(uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL changesOccurred (util::ChangesEvent const& Event) override;
     // XEventListener
-    virtual void SAL_CALL disposing (lang::EventObject const& Source) throw(uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing (lang::EventObject const& Source) override;
 
 private:
     Impl& m_rParent;
@@ -102,13 +102,13 @@ private:
     uno::Reference<beans::XPropertySet>    m_xData;
 };
 
-void SvtUserOptions::ChangeListener::changesOccurred (util::ChangesEvent const& rEvent) throw(uno::RuntimeException, std::exception)
+void SvtUserOptions::ChangeListener::changesOccurred (util::ChangesEvent const& rEvent)
 {
     if (rEvent.Changes.getLength())
         m_rParent.Notify();
 }
 
-void SvtUserOptions::ChangeListener::disposing (lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception)
+void SvtUserOptions::ChangeListener::disposing (lang::EventObject const& rSource)
 {
     try
     {
diff --git a/unotools/source/misc/ServiceDocumenter.cxx b/unotools/source/misc/ServiceDocumenter.cxx
index 7b90b57ebfcc..f1d1500ccb74 100644
--- a/unotools/source/misc/ServiceDocumenter.cxx
+++ b/unotools/source/misc/ServiceDocumenter.cxx
@@ -16,7 +16,6 @@ using lang::XServiceInfo;
 using lang::XTypeProvider;
 
 void unotools::misc::ServiceDocumenter::showCoreDocs(const Reference<XServiceInfo>& xService)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if(!xService.is())
         return;
@@ -26,7 +25,6 @@ void unotools::misc::ServiceDocumenter::showCoreDocs(const Reference<XServiceInf
 }
 
 void unotools::misc::ServiceDocumenter::showInterfaceDocs(const Reference<XTypeProvider>& xTypeProvider)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if(!xTypeProvider.is())
         return;
@@ -43,7 +41,6 @@ void unotools::misc::ServiceDocumenter::showInterfaceDocs(const Reference<XTypeP
 }
 
 void unotools::misc::ServiceDocumenter::showServiceDocs(const Reference<XServiceInfo>& xService)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if(!xService.is())
         return;
diff --git a/unotools/source/misc/ServiceDocumenter.hxx b/unotools/source/misc/ServiceDocumenter.hxx
index b600c5ff03be..a0701ce32a02 100644
--- a/unotools/source/misc/ServiceDocumenter.hxx
+++ b/unotools/source/misc/ServiceDocumenter.hxx
@@ -25,17 +25,17 @@ class ServiceDocumenter : public ::cppu::WeakImplHelper<
             , m_sServiceBaseUrl("http://api.libreoffice.org/docs/idl/ref")
             {};
         // XServiceDocumenter
-        virtual ::rtl::OUString SAL_CALL getCoreBaseUrl() throw (css::uno::RuntimeException, std::exception) override
+        virtual ::rtl::OUString SAL_CALL getCoreBaseUrl() override
             { return m_sCoreBaseUrl; };
-        virtual void SAL_CALL setCoreBaseUrl( const ::rtl::OUString& sCoreBaseUrl ) throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setCoreBaseUrl( const ::rtl::OUString& sCoreBaseUrl ) override
             { m_sCoreBaseUrl = sCoreBaseUrl; };
-        virtual ::rtl::OUString SAL_CALL getServiceBaseUrl() throw (css::uno::RuntimeException, std::exception) override
+        virtual ::rtl::OUString SAL_CALL getServiceBaseUrl() override
             { return m_sServiceBaseUrl; };
-        virtual void SAL_CALL setServiceBaseUrl( const ::rtl::OUString& sServiceBaseUrl ) throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL setServiceBaseUrl( const ::rtl::OUString& sServiceBaseUrl ) override
             { m_sServiceBaseUrl = sServiceBaseUrl; };
-        virtual void SAL_CALL showServiceDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL showInterfaceDocs( const ::css::uno::Reference< ::css::lang::XTypeProvider >& xTypeProvider ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL showCoreDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL showServiceDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) override;
+        virtual void SAL_CALL showInterfaceDocs( const ::css::uno::Reference< ::css::lang::XTypeProvider >& xTypeProvider ) override;
+        virtual void SAL_CALL showCoreDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) override;
     protected:
         virtual ~ServiceDocumenter() override
             {};
diff --git a/unotools/source/misc/ZipPackageHelper.cxx b/unotools/source/misc/ZipPackageHelper.cxx
index 0656c45f29d8..763d01c222ac 100644
--- a/unotools/source/misc/ZipPackageHelper.cxx
+++ b/unotools/source/misc/ZipPackageHelper.cxx
@@ -105,7 +105,6 @@ Reference< XInterface >& ZipPackageHelper::getRootFolder()
 
 Reference< XInterface > ZipPackageHelper::addFolder( Reference< XInterface >& xRootFolder,
                                                      const OUString& rName )
-    throw( css::uno::Exception, std::exception )
 {
     if ( rName == ".." || rName == "." )
         throw lang::IllegalArgumentException();
@@ -165,7 +164,6 @@ void ZipPackageHelper::addFolderWithContent( Reference< XInterface >& xRootFolde
 
 void ZipPackageHelper::addFile( css::uno::Reference< css::uno::XInterface >& xRootFolder,
                                 const OUString& rSourceFile )
-    throw( Exception, std::exception )
 {
     OUString aFileURL( rSourceFile );
 
diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx
index 18f352ff3b40..94804c921a10 100644
--- a/unotools/source/misc/closeveto.cxx
+++ b/unotools/source/misc/closeveto.cxx
@@ -51,11 +51,11 @@ namespace utl
         }
 
         // XCloseListener
-        virtual void SAL_CALL queryClosing( const EventObject& Source, sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL queryClosing( const EventObject& Source, sal_Bool GetsOwnership ) override;
+        virtual void SAL_CALL notifyClosing( const EventObject& Source ) override;
 
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& Source) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& Source) override;
 
         bool hasOwnership() const { return m_bHasOwnership; }
 
@@ -68,7 +68,7 @@ namespace utl
         bool    m_bHasOwnership;
     };
 
-    void SAL_CALL CloseListener_Impl::queryClosing( const EventObject& i_source, sal_Bool i_deliverOwnership ) throw (CloseVetoException, RuntimeException, std::exception)
+    void SAL_CALL CloseListener_Impl::queryClosing( const EventObject& i_source, sal_Bool i_deliverOwnership )
     {
         (void)i_source;
 
@@ -78,12 +78,12 @@ namespace utl
         throw CloseVetoException();
     }
 
-    void SAL_CALL CloseListener_Impl::notifyClosing( const EventObject& i_source ) throw (RuntimeException, std::exception)
+    void SAL_CALL CloseListener_Impl::notifyClosing( const EventObject& i_source )
     {
         (void)i_source;
     }
 
-    void SAL_CALL CloseListener_Impl::disposing( const EventObject& i_source ) throw (RuntimeException, std::exception)
+    void SAL_CALL CloseListener_Impl::disposing( const EventObject& i_source )
     {
         (void)i_source;
     }
diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx
index 4d27a6d49208..be4f1b87bdfc 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.cxx
@@ -67,11 +67,11 @@ namespace utl
 
         private:
             // XTerminateListener
-            virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) override;
-            virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception) override;
+            virtual void SAL_CALL queryTermination( const EventObject& Event ) override;
+            virtual void SAL_CALL notifyTermination( const EventObject& Event ) 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;
         };
 
         OObserverImpl::OObserverImpl()
@@ -105,7 +105,7 @@ namespace utl
             }
         }
 
-        void SAL_CALL OObserverImpl::queryTermination( const EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException, std::exception)
+        void SAL_CALL OObserverImpl::queryTermination( const EventObject& /*Event*/ )
         {
             Listeners aToNotify;
             {
@@ -123,7 +123,7 @@ namespace utl
             }
         }
 
-        void SAL_CALL OObserverImpl::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException, std::exception)
+        void SAL_CALL OObserverImpl::notifyTermination( const EventObject& /*Event*/ )
         {
             // get the listeners
             Listeners aToNotify;
@@ -150,7 +150,7 @@ namespace utl
             }
         }
 
-        void SAL_CALL OObserverImpl::disposing( const EventObject& /*Event*/ ) throw (RuntimeException, std::exception)
+        void SAL_CALL OObserverImpl::disposing( const EventObject& /*Event*/ )
         {
 #if OSL_DEBUG_LEVEL > 0
             ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index f33811a463a6..07a24d88705a 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -50,7 +50,7 @@ namespace utl
         const Reference< XComponent >&  getComponent() const { return m_xComponent; }
 
     protected:
-        virtual void SAL_CALL disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& _rSource ) override;
     };
 
     OEventListenerImpl::OEventListenerImpl( OEventListenerAdapter* _pAdapter, const Reference< XComponent >& _rxComp )
@@ -79,7 +79,7 @@ namespace utl
         }
     }
 
-    void SAL_CALL OEventListenerImpl::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+    void SAL_CALL OEventListenerImpl::disposing( const EventObject& _rSource )
     {
         Reference< XEventListener > xDeleteUponLeaving = m_xKeepMeAlive;
         m_xKeepMeAlive.clear();
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 5010164ec6fb..68d9f030e10e 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -527,7 +527,6 @@ bool MediaDescriptor::impl_addInputStream( bool bLockFile )
 }
 
 bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData )
-    throw(css::uno::RuntimeException)
 {
     if ( !_rxPostData.is() )
         throw css::lang::IllegalArgumentException("Found invalid PostData.",
@@ -597,7 +596,6 @@ bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< cs
 
 /*-----------------------------------------------*/
 bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFile )
-    throw(css::uno::RuntimeException)
 {
     OUString referer(getUnpackedValueOrDefault(PROP_REFERRER(), OUString()));
     if (SvtSecurityOptions().isUntrustedReferer(referer)) {
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index f4a2ae4536b9..fe44e5d441be 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -87,11 +87,11 @@ namespace utl
         virtual ~CloseableComponentImpl() override;
 
         // XCloseListener overridables
-        virtual void SAL_CALL queryClosing( const EventObject& Source, sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException, std::exception) override;
-        virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL queryClosing( const EventObject& Source, sal_Bool GetsOwnership ) override;
+        virtual void SAL_CALL notifyClosing( const EventObject& Source ) override;
 
         // XEventListener overridables
-        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;
 
     private:
         /** starts or stops being a CloseListener at the component
@@ -158,7 +158,7 @@ namespace utl
         }
     }
 
-    void SAL_CALL CloseableComponentImpl::queryClosing( const EventObject& Source, sal_Bool /*GetsOwnership*/ ) throw (CloseVetoException, RuntimeException, std::exception)
+    void SAL_CALL CloseableComponentImpl::queryClosing( const EventObject& Source, sal_Bool /*GetsOwnership*/ )
     {
         // as long as we live, somebody wants to keep the object alive. So, veto the
         // closing
@@ -166,7 +166,7 @@ namespace utl
         throw CloseVetoException();
     }
 
-    void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject& Source )
     {
         DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::notifyClosing: where did this come from?" );
 
@@ -176,7 +176,7 @@ namespace utl
         OSL_FAIL( "CloseableComponentImpl::notifyClosing: unreachable!" );
     }
 
-    void SAL_CALL CloseableComponentImpl::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL CloseableComponentImpl::disposing( const EventObject& Source )
     {
         DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::disposing: where did this come from?" );
         OSL_FAIL( "CloseableComponentImpl::disposing: unreachable!" );
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index e2881b7b9a55..d3f41ad5e286 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -23,7 +23,6 @@ namespace utl
 {
 
 sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-    throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
 {
     if (!m_xLockBytes.Is())
         throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
@@ -49,18 +48,18 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >&
     return nRead;
 }
 
-void SAL_CALL OInputStreamHelper::seek( sal_Int64 location ) throw(css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OInputStreamHelper::seek( sal_Int64 location )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     m_nActPos = location;
 }
 
-sal_Int64 SAL_CALL OInputStreamHelper::getPosition(  ) throw(css::io::IOException, css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL OInputStreamHelper::getPosition(  )
 {
     return m_nActPos;
 }
 
-sal_Int64 SAL_CALL OInputStreamHelper::getLength(  ) throw(css::io::IOException, css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL OInputStreamHelper::getLength(  )
 {
     if (!m_xLockBytes.Is())
         return 0;
@@ -73,14 +72,12 @@ sal_Int64 SAL_CALL OInputStreamHelper::getLength(  ) throw(css::io::IOException,
 
 sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData,
                                                      sal_Int32 nMaxBytesToRead)
-    throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
 {
     // read all data desired
     return readBytes(aData, nMaxBytesToRead);
 }
 
 void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip)
-    throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_xLockBytes.Is())
@@ -93,7 +90,6 @@ void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip)
 }
 
 sal_Int32 SAL_CALL OInputStreamHelper::available()
-    throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_xLockBytes.Is())
@@ -103,7 +99,6 @@ sal_Int32 SAL_CALL OInputStreamHelper::available()
 }
 
 void SAL_CALL OInputStreamHelper::closeInput()
-    throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_xLockBytes.Is())
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index 59d751d3758e..fea638ed26a4 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -46,7 +46,6 @@ OInputStreamWrapper::~OInputStreamWrapper()
 }
 
 sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
 {
     checkConnected();
 
@@ -68,7 +67,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >
     return nRead;
 }
 
-sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
 {
     checkError();
 
@@ -84,7 +83,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_In
         return readBytes(aData, nMaxBytesToRead);
 }
 
-void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkError();
@@ -93,7 +92,7 @@ void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( css:
     checkError();
 }
 
-sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL OInputStreamWrapper::available()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -111,7 +110,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( css::io::NotConnected
     return nAvailable;
 }
 
-void SAL_CALL OInputStreamWrapper::closeInput() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OInputStreamWrapper::closeInput()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -151,7 +150,7 @@ OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream* _pStream, boo
     SetStream( _pStream, _bOwner );
 }
 
-void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception)
+void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -160,7 +159,7 @@ void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation ) throw (I
     checkError();
 }
 
-sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition(  ) throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -170,7 +169,7 @@ sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition(  ) throw (IOExcepti
     return (sal_Int64)nPos;
 }
 
-sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getLength(  ) throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getLength(  )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -195,7 +194,7 @@ OOutputStreamWrapper::OOutputStreamWrapper(SvStream& _rStream):
 
 OOutputStreamWrapper::~OOutputStreamWrapper() {}
 
-void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData)
 {
     sal_uInt32 nWritten = rStream.WriteBytes(aData.getConstArray(), aData.getLength());
     ErrCode err = rStream.GetError();
@@ -207,13 +206,13 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int
     }
 }
 
-void SAL_CALL OOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OOutputStreamWrapper::flush()
 {
     rStream.Flush();
     checkError();
 }
 
-void SAL_CALL OOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception )
+void SAL_CALL OOutputStreamWrapper::closeOutput()
 {
 }
 
@@ -233,7 +232,7 @@ OSeekableOutputStreamWrapper::OSeekableOutputStreamWrapper(SvStream& _rStream)
 
 OSeekableOutputStreamWrapper::~OSeekableOutputStreamWrapper() {}
 
-Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType )
 {
     Any aReturn = OOutputStreamWrapper::queryInterface(_rType);
     if (!aReturn.hasValue())
@@ -251,20 +250,20 @@ void SAL_CALL OSeekableOutputStreamWrapper::release(  ) throw ()
     OOutputStreamWrapper::release();
 }
 
-void SAL_CALL OSeekableOutputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception)
+void SAL_CALL OSeekableOutputStreamWrapper::seek( sal_Int64 _nLocation )
 {
     rStream.Seek((sal_uInt32)_nLocation);
     checkError();
 }
 
-sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition(  ) throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition(  )
 {
     sal_uInt32 nPos = rStream.Tell();
     checkError();
     return (sal_Int64)nPos;
 }
 
-sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength(  ) throw (IOException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength(  )
 {
     sal_uInt32 nCurrentPos = rStream.Tell();
     checkError();
@@ -285,17 +284,17 @@ OStreamWrapper::OStreamWrapper(SvStream& _rStream)
     SetStream( &_rStream, false );
 }
 
-css::uno::Reference< css::io::XInputStream > SAL_CALL OStreamWrapper::getInputStream(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::io::XInputStream > SAL_CALL OStreamWrapper::getInputStream(  )
 {
     return this;
 }
 
-css::uno::Reference< css::io::XOutputStream > SAL_CALL OStreamWrapper::getOutputStream(  ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::io::XOutputStream > SAL_CALL OStreamWrapper::getOutputStream(  )
 {
     return this;
 }
 
-void SAL_CALL OStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData)
 {
     sal_uInt32 nWritten = m_pSvStream->WriteBytes(aData.getConstArray(), aData.getLength());
     ErrCode err = m_pSvStream->GetError();
@@ -307,18 +306,18 @@ void SAL_CALL OStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& a
     }
 }
 
-void SAL_CALL OStreamWrapper::flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OStreamWrapper::flush()
 {
     m_pSvStream->Flush();
     if (m_pSvStream->GetError() != ERRCODE_NONE)
         throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
 }
 
-void SAL_CALL OStreamWrapper::closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OStreamWrapper::closeOutput()
 {
 }
 
-void SAL_CALL OStreamWrapper::truncate() throw(css::io::IOException, css::uno::RuntimeException, std::exception)
+void SAL_CALL OStreamWrapper::truncate()
 {
     m_pSvStream->SetStreamSize(0);
 }
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index 38b38167547b..43150b675f07 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -63,59 +63,39 @@ public:
 
     //Methods
     //  XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
     virtual void SAL_CALL acquire(  )
         throw () override;
     virtual void SAL_CALL release(  )
         throw () override;
     //  XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     //  XTempFile
-    virtual sal_Bool SAL_CALL getRemoveFile()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRemoveFile( sal_Bool _removefile )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getUri()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getResourceName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getRemoveFile() override;
+    virtual void SAL_CALL setRemoveFile( sal_Bool _removefile ) override;
+    virtual OUString SAL_CALL getUri() override;
+    virtual OUString SAL_CALL getResourceName() override;
 
     // XInputStream
-    virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
-        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
-        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip )
-        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL available(  )
-        throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  )
-        throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) override;
+    virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) override;
+    virtual ::sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
     // XOutputStream
-    virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData )
-        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush(  )
-        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput(  )
-        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) override;
+    virtual void SAL_CALL flush(  ) override;
+    virtual void SAL_CALL closeOutput(  ) override;
     // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location )
-        throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getPosition(  )
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int64 SAL_CALL getLength(  )
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
+    virtual sal_Int64 SAL_CALL getPosition(  ) override;
+    virtual sal_Int64 SAL_CALL getLength(  ) override;
     // XStream
-    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream(  ) override;
+    virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream(  ) override;
     // XTruncate
-    virtual void SAL_CALL truncate()
-        throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL truncate() override;
 
     virtual ~OTempFileService () override;
 };
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index f3edf6185dfd..05e6a6131518 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx
@@ -49,7 +49,6 @@ bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum )
 }
 
 void SAL_CALL ProgressHandlerWrap::push( const Any& Status )
-    throw( RuntimeException, std::exception )
 {
     if( !m_xStatusIndicator.is() )
         return;
@@ -62,7 +61,6 @@ void SAL_CALL ProgressHandlerWrap::push( const Any& Status )
 }
 
 void SAL_CALL ProgressHandlerWrap::update( const Any& Status )
-    throw( RuntimeException, std::exception )
 {
     if( !m_xStatusIndicator.is() )
         return;
@@ -78,7 +76,6 @@ void SAL_CALL ProgressHandlerWrap::update( const Any& Status )
 }
 
 void SAL_CALL ProgressHandlerWrap::pop()
-        throw( RuntimeException, std::exception )
 {
     if( m_xStatusIndicator.is() )
         m_xStatusIndicator->end();
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index bb885a3482ee..8c302d82b4af 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -79,16 +79,16 @@ public:
     {}
 
     // XActiveDataControl.
-    virtual void SAL_CALL   addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) override {}
-    virtual void SAL_CALL   removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) override {}
-    virtual void SAL_CALL   start() throw(RuntimeException, std::exception) override {}
-    virtual void SAL_CALL   terminate() throw(RuntimeException, std::exception) override
+    virtual void SAL_CALL   addListener ( const Reference<XStreamListener> &/*rxListener*/) override {}
+    virtual void SAL_CALL   removeListener ( const Reference<XStreamListener> &/*rxListener*/) override {}
+    virtual void SAL_CALL   start() override {}
+    virtual void SAL_CALL   terminate() override
                             { m_xLockBytes->terminate_Impl(); }
 
     // XActiveDataSink.
-    virtual void SAL_CALL   setInputStream ( const Reference<XInputStream> &rxInputStream) throw(RuntimeException, std::exception) override
+    virtual void SAL_CALL   setInputStream ( const Reference<XInputStream> &rxInputStream) override
                             { m_xLockBytes->setInputStream_Impl (rxInputStream); }
-    virtual Reference<XInputStream> SAL_CALL getInputStream() throw(RuntimeException, std::exception) override
+    virtual Reference<XInputStream> SAL_CALL getInputStream() override
                             { return m_xLockBytes->getInputStream_Impl(); }
 };
 
@@ -106,16 +106,16 @@ public:
     {}
 
     // XActiveDataControl.
-    virtual void SAL_CALL   addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) override {}
-    virtual void SAL_CALL   removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) override {}
-    virtual void SAL_CALL   start() throw(RuntimeException, std::exception) override {}
-    virtual void SAL_CALL   terminate() throw(RuntimeException, std::exception) override
+    virtual void SAL_CALL   addListener ( const Reference<XStreamListener> &/*rxListener*/) override {}
+    virtual void SAL_CALL   removeListener ( const Reference<XStreamListener> &/*rxListener*/) override {}
+    virtual void SAL_CALL   start() override {}
+    virtual void SAL_CALL   terminate() override
                             { m_xLockBytes->terminate_Impl(); }
 
     // XActiveDataStreamer
-    virtual void SAL_CALL   setStream( const Reference< XStream >& aStream ) throw(RuntimeException, std::exception) override
+    virtual void SAL_CALL   setStream( const Reference< XStream >& aStream ) override
                             { m_xStream = aStream; m_xLockBytes->setStream_Impl( aStream ); }
-    virtual Reference< XStream > SAL_CALL getStream() throw(RuntimeException, std::exception) override
+    virtual Reference< XStream > SAL_CALL getStream() override
                             { return m_xStream; }
 };
 
@@ -134,10 +134,10 @@ public:
                                 , m_xProgressHandler( rxProgressHandler )
                             {}
 
-    virtual Reference<XInteractionHandler> SAL_CALL getInteractionHandler() throw (RuntimeException, std::exception) override
+    virtual Reference<XInteractionHandler> SAL_CALL getInteractionHandler() override
     { return m_xInteractionHandler; }
 
-    virtual Reference<XProgressHandler> SAL_CALL    getProgressHandler() throw (RuntimeException, std::exception) override
+    virtual Reference<XProgressHandler> SAL_CALL    getProgressHandler() override
     { return m_xProgressHandler; }
 };
 
@@ -153,11 +153,11 @@ public:
         : m_xLockBytes( rRef )
     {}
 
-    virtual void SAL_CALL   disposing ( const EventObject &/*rEvent*/) throw(RuntimeException, std::exception) override {}
-    virtual void SAL_CALL   propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL   disposing ( const EventObject &/*rEvent*/) override {}
+    virtual void SAL_CALL   propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) override;
 };
 
-void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) throw(RuntimeException, std::exception)
+void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent)
 {
     sal_Int32 i, n = rEvent.getLength();
     for (i = 0; i < n; i++)
@@ -225,11 +225,7 @@ public:
         Reference < XContent > const & xContent,
         Reference < XInteractionHandler > const & xInteract,
         const Command& rArg
-    )
-        throw(
-            ContentCreationException,
-            RuntimeException
-        );
+    );
 
     enum ResultType {
         NORESULT,
@@ -345,16 +341,11 @@ public:
     virtual void SAL_CALL
     setStream(
         const Reference< XStream >& aStream
-    )
-        throw(
-            RuntimeException, std::exception
-        ) override;
+    ) override;
 
     virtual Reference<XStream> SAL_CALL
     getStream (
         void
-    ) throw(
-        RuntimeException, std::exception
     ) override
     {
         osl::MutexGuard aGuard(m_aMutex);
@@ -379,16 +370,11 @@ public:
     virtual void SAL_CALL
     setInputStream (
         const Reference<XInputStream> &rxInputStream
-    )
-        throw(
-            RuntimeException, std::exception
-        ) override;
+    ) override;
 
     virtual Reference<XInputStream> SAL_CALL
     getInputStream (
         void
-    ) throw(
-        RuntimeException, std::exception
     ) override
     {
         osl::MutexGuard aGuard(m_aMutex);
@@ -411,9 +397,6 @@ void SAL_CALL
 ModeratorsActiveDataSink::setInputStream (
     const Reference<XInputStream> &rxInputStream
 )
-    throw(
-        RuntimeException, std::exception
-    )
 {
     m_aModerator.setInputStream(rxInputStream);
     osl::MutexGuard aGuard(m_aMutex);
@@ -432,9 +415,6 @@ void SAL_CALL
 ModeratorsActiveDataStreamer::setStream (
     const Reference<XStream> &rxStream
 )
-    throw(
-        RuntimeException, std::exception
-    )
 {
     m_aModerator.setStream(rxStream);
     osl::MutexGuard aGuard(m_aMutex);
@@ -449,8 +429,7 @@ public:
     explicit ModeratorsInteractionHandler(Moderator &theModerator);
 
     virtual void SAL_CALL
-    handle( const Reference<XInteractionRequest >& Request )
-        throw (RuntimeException, std::exception) override;
+    handle( const Reference<XInteractionRequest >& Request ) override;
 
 private:
 
@@ -467,9 +446,6 @@ void SAL_CALL
 ModeratorsInteractionHandler::handle(
     const Reference<XInteractionRequest >& Request
 )
-    throw (
-        RuntimeException, std::exception
-    )
 {
     // wakes up the mainthread
     m_aModerator.handle(Request);
@@ -480,10 +456,6 @@ Moderator::Moderator(
     Reference < XInteractionHandler > const & xInteract,
     const Command& rArg
 )
-    throw(
-        css::ucb::ContentCreationException,
-        css::uno::RuntimeException
-    )
     : m_aMutex(),
 
       m_aRes(m_aMutex,*this),
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index bcf247ad4696..ac5cfc707dcd 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -51,7 +51,6 @@ OTempFileService::~OTempFileService ()
 // XInterface
 
 css::uno::Any SAL_CALL OTempFileService::queryInterface( css::uno::Type const & aType )
-throw ( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aResult( OTempFileBase::queryInterface( aType ) );
     if (!aResult.hasValue())
@@ -72,7 +71,6 @@ throw ()
 //  XTypeProvider
 
 css::uno::Sequence< css::uno::Type > SAL_CALL OTempFileService::getTypes(  )
-throw ( css::uno::RuntimeException, std::exception )
 {
     static ::cppu::OTypeCollection* pTypeCollection = nullptr;
     if ( pTypeCollection == nullptr )
@@ -93,7 +91,6 @@ throw ( css::uno::RuntimeException, std::exception )
 //  XTempFile
 
 sal_Bool SAL_CALL OTempFileService::getRemoveFile()
-throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -106,7 +103,6 @@ throw ( css::uno::RuntimeException, std::exception )
     return mbRemoveFile;
 };
 void SAL_CALL OTempFileService::setRemoveFile( sal_Bool _removefile )
-throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -120,7 +116,6 @@ throw ( css::uno::RuntimeException, std::exception )
     mpTempFile->EnableKillingFile( mbRemoveFile );
 };
 OUString SAL_CALL OTempFileService::getUri()
-throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -133,7 +128,6 @@ throw ( css::uno::RuntimeException, std::exception )
 
 };
 OUString SAL_CALL OTempFileService::getResourceName()
-throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -148,7 +142,6 @@ throw ( css::uno::RuntimeException, std::exception )
 // XInputStream
 
 sal_Int32 SAL_CALL OTempFileService::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -182,7 +175,6 @@ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css
     return nRead;
 }
 sal_Int32 SAL_CALL OTempFileService::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -203,7 +195,6 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
         return readBytes(aData, nMaxBytesToRead);
 }
 void SAL_CALL OTempFileService::skipBytes( sal_Int32 nBytesToSkip )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -215,7 +206,6 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
     checkError();
 }
 sal_Int32 SAL_CALL OTempFileService::available(  )
-throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -230,7 +220,6 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE
     return nAvailable;
 }
 void SAL_CALL OTempFileService::closeInput(  )
-throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -251,7 +240,6 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE
 // XOutputStream
 
 void SAL_CALL OTempFileService::writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbOutClosed )
@@ -264,7 +252,6 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
         throw css::io::BufferSizeExceededException( OUString(),static_cast < css::uno::XWeak * > ( this ) );
 }
 void SAL_CALL OTempFileService::flush(  )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbOutClosed )
@@ -275,7 +262,6 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
     checkError();
 }
 void SAL_CALL OTempFileService::closeOutput(  )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbOutClosed )
@@ -337,7 +323,6 @@ void OTempFileService::checkConnected ()
 // XSeekable
 
 void SAL_CALL OTempFileService::seek( sal_Int64 nLocation )
-throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     checkConnected();
@@ -348,7 +333,6 @@ throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::Run
     checkError();
 }
 sal_Int64 SAL_CALL OTempFileService::getPosition(  )
-throw ( css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     checkConnected();
@@ -358,7 +342,6 @@ throw ( css::io::IOException, css::uno::RuntimeException, std::exception )
     return (sal_Int64)nPos;
 }
 sal_Int64 SAL_CALL OTempFileService::getLength(  )
-throw ( css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     checkConnected();
@@ -378,13 +361,11 @@ throw ( css::io::IOException, css::uno::RuntimeException, std::exception )
 // XStream
 
 css::uno::Reference< css::io::XInputStream > SAL_CALL OTempFileService::getInputStream()
-throw ( css::uno::RuntimeException, std::exception )
     {
     return css::uno::Reference< css::io::XInputStream >( *this, css::uno::UNO_QUERY );
 }
 
 css::uno::Reference< css::io::XOutputStream > SAL_CALL OTempFileService::getOutputStream()
-throw ( css::uno::RuntimeException, std::exception )
     {
     return css::uno::Reference< css::io::XOutputStream >( *this, css::uno::UNO_QUERY );
     }
@@ -392,7 +373,6 @@ throw ( css::uno::RuntimeException, std::exception )
 // XTruncate
 
 void SAL_CALL OTempFileService::truncate()
-throw ( css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     checkConnected();
diff --git a/unoxml/inc/node.hxx b/unoxml/inc/node.hxx
index 8a1b2d8fb781..e33178a074a0 100644
--- a/unoxml/inc/node.hxx
+++ b/unoxml/inc/node.hxx
@@ -144,128 +144,108 @@ namespace DOM
         Adds the node newChild to the end of the list of children of this node.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            appendChild(css::uno::Reference< css::xml::dom::XNode > const& xNewChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+            appendChild(css::uno::Reference< css::xml::dom::XNode > const& xNewChild) override;
 
         /**
         Returns a duplicate of this node, i.e., serves as a generic copy
         constructor for nodes.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override;
 
         /**
         A NamedNodeMap containing the attributes of this node
         (if it is an Element) or null otherwise.
         */
-        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override;
 
         /**
         A NodeList that contains all children of this node.
         */
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override;
 
         /**
         The first child of this node.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override;
 
         /**
         The last child of this node.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override;
 
         /**
         Returns the local part of the qualified name of this node.
         */
-        virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getLocalName() override;
 
         /**
         The namespace URI of this node, or null if it is unspecified.
         */
-        virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNamespaceURI() override;
 
         /**
         The node immediately following this node.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override;
 
         /**
         The name of this node, depending on its type; see the table above.
         -- virtual implemented by actual node types
         */
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
 
         /**
         A code representing the type of the underlying object, as defined above.
         */
-        virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::xml::dom::NodeType SAL_CALL getNodeType() override;
 
         /**
         The value of this node, depending on its type; see the table above.
         -- virtual implemented by actual node types
         */
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeValue() override;
 
         /**
         The Document object associated with this node.
         */
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override;
 
         /**
         The parent of this node.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override;
 
         /**
         The namespace prefix of this node, or null if it is unspecified.
         */
-        virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getPrefix() override;
 
         /**
         The node immediately preceding this node.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override;
 
         /**
         Returns whether this node (if it is an element) has any attributes.
         */
-        virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasAttributes() override;
 
         /**
         Returns whether this node has any children.
         */
-        virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasChildNodes() override;
 
         /**
         Inserts the node newChild before the existing child node refChild.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override;
 
         /**
         Tests whether the DOM implementation implements a specific feature and
         that feature is supported by this node.
         */
-        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override;
 
         /**
         Puts all Text nodes in the full depth of the sub-tree underneath this
@@ -274,55 +254,46 @@ namespace DOM
         entity references) separates Text nodes, i.e., there are neither adjacent
         Text nodes nor empty Text nodes.
         */
-        virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL normalize() override;
 
         /**
         Removes the child node indicated by oldChild from the list of children,
         and returns it.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override;
 
         /**
         Replaces the child node oldChild with newChild in the list of children,
         and returns the oldChild node.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override;
 
         /**
         The value of this node, depending on its type; see the table above.
         */
-        virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override;
 
         /**
         The namespace prefix of this node, or null if it is unspecified.
         */
-        virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL setPrefix(const OUString& prefix) override;
 
 
         // --- XEventTarget
         virtual void SAL_CALL addEventListener(const OUString& eventType,
             const css::uno::Reference< css::xml::dom::events::XEventListener >& listener,
-            sal_Bool useCapture)
-            throw (css::uno::RuntimeException, std::exception) override;
+            sal_Bool useCapture) override;
 
         virtual void SAL_CALL removeEventListener(const OUString& eventType,
             const css::uno::Reference< css::xml::dom::events::XEventListener >& listener,
-            sal_Bool useCapture)
-            throw (css::uno::RuntimeException, std::exception) override;
+            sal_Bool useCapture) override;
 
-        virtual sal_Bool SAL_CALL dispatchEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt)
-            throw(css::uno::RuntimeException, css::xml::dom::events::EventException, std::exception) override;
+        virtual sal_Bool SAL_CALL dispatchEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt) override;
 
         // --- XUnoTunnel
         virtual ::sal_Int64 SAL_CALL
-            getSomething(css::uno::Sequence< ::sal_Int8 > const& rId)
-            throw (css::uno::RuntimeException, std::exception) override;
+            getSomething(css::uno::Sequence< ::sal_Int8 > const& rId) override;
     };
 
     /// eliminate redundant namespace declarations
diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx
index bc7ff57c2234..ce7b88393d6c 100644
--- a/unoxml/qa/unit/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -100,17 +100,17 @@ struct ErrorHandler
     ErrorHandler() : mnErrCount(0), mnFatalCount(0), mnWarnCount(0)
     {}
 
-    virtual void SAL_CALL error( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL error( const uno::Any& ) override
     {
         ++mnErrCount;
     }
 
-    virtual void SAL_CALL fatalError( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL fatalError( const uno::Any& ) override
     {
         ++mnFatalCount;
     }
 
-    virtual void SAL_CALL warning( const uno::Any& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL warning( const uno::Any& ) override
     {
         ++mnWarnCount;
     }
@@ -120,7 +120,7 @@ struct DocumentHandler
     : public ::cppu::WeakImplHelper< xml::sax::XFastDocumentHandler >
 {
     // XFastContextHandler
-    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList >& ) override
     {
         SAL_INFO(
             "unoxml",
@@ -128,42 +128,42 @@ struct DocumentHandler
                 << (Element & 0xFFFF0000));
     }
 
-    virtual void SAL_CALL startUnknownElement( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL startUnknownElement( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) override
     {
     }
 
-    virtual void SAL_CALL endFastElement( ::sal_Int32 ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL endFastElement( ::sal_Int32 ) override
     {
     }
 
-    virtual void SAL_CALL endUnknownElement( const OUString&, const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL endUnknownElement( const OUString&, const OUString& ) override
     {
     }
 
-    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 , const uno::Reference< xml::sax::XFastAttributeList >& ) override
     {
         return this;
     }
 
-    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& , const OUString& , const uno::Reference< xml::sax::XFastAttributeList >& ) override
     {
         return this;
     }
 
-    virtual void SAL_CALL characters( const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL characters( const OUString& ) override
     {
     }
 
     // XFastDocumentHandler
-    virtual void SAL_CALL startDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL startDocument(  ) override
     {
     }
 
-    virtual void SAL_CALL endDocument(  ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL endDocument(  ) override
     {
     }
 
-    virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException) override
+    virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) override
     {
     }
 };
@@ -171,12 +171,12 @@ struct DocumentHandler
 struct TokenHandler
     : public ::cppu::WeakImplHelper< xml::sax::XFastTokenHandler >
 {
-    virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) throw (uno::RuntimeException) override
+    virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) override
     {
         return Identifier.getLength() ? Identifier[0] : 0;
     }
 
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getUTF8Identifier( ::sal_Int32 ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL getUTF8Identifier( ::sal_Int32 ) override
     {
         CPPUNIT_ASSERT_MESSAGE( "TokenHandler::getUTF8Identifier() unexpected call",
                                 false );
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
index ed2a87ccbdd6..9f0f7c8c5b67 100644
--- a/unoxml/source/dom/attr.cxx
+++ b/unoxml/source/dom/attr.cxx
@@ -81,17 +81,14 @@ namespace DOM
     }
 
     OUString SAL_CALL CAttr::getNodeName()
-        throw (RuntimeException, std::exception)
     {
         return getName();
     }
     OUString SAL_CALL CAttr::getNodeValue()
-        throw (RuntimeException, std::exception)
     {
         return getValue();
     }
     OUString SAL_CALL CAttr::getLocalName()
-        throw (RuntimeException, std::exception)
     {
         return getName();
     }
@@ -100,7 +97,7 @@ namespace DOM
     /**
     Returns the name of this attribute.
     */
-    OUString SAL_CALL CAttr::getName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CAttr::getName()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -117,7 +114,6 @@ namespace DOM
     attribute is not in use.
     */
     Reference< XElement > SAL_CALL CAttr::getOwnerElement()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -139,7 +135,6 @@ namespace DOM
     document, this is true; otherwise, it is false.
     */
     sal_Bool SAL_CALL CAttr::getSpecified()
-        throw (RuntimeException, std::exception)
     {
         // FIXME if this DOM implementation supported DTDs it would need
         // to check that this attribute is not default or something
@@ -150,7 +145,6 @@ namespace DOM
     On retrieval, the value of the attribute is returned as a string.
     */
     OUString SAL_CALL CAttr::getValue()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -171,7 +165,6 @@ namespace DOM
     Sets the value of the attribute from a string.
     */
     void SAL_CALL CAttr::setValue(const OUString& value)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::ClearableMutexGuard guard(m_rMutex);
 
@@ -218,7 +211,6 @@ namespace DOM
     }
 
     void SAL_CALL CAttr::setPrefix(const OUString& prefix)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -234,7 +226,6 @@ namespace DOM
     }
 
     OUString SAL_CALL CAttr::getPrefix()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -251,7 +242,6 @@ namespace DOM
     }
 
     OUString SAL_CALL CAttr::getNamespaceURI()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx
index 2dfbe6d64b4e..cc0f2d94071b 100644
--- a/unoxml/source/dom/attr.hxx
+++ b/unoxml/source/dom/attr.hxx
@@ -61,144 +61,119 @@ namespace DOM
         /**
         Returns the name of this attribute.
         */
-        virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName() override;
 
         /**
         The Element node this attribute is attached to or null if this
         attribute is not in use.
         */
-        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getOwnerElement() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getOwnerElement() override;
 
         /**
         If this attribute was explicitly given a value in the original
         document, this is true; otherwise, it is false.
         */
-        virtual sal_Bool SAL_CALL getSpecified()throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getSpecified() override;
 
         /**
         On retrieval, the value of the attribute is returned as a string.
         */
-        virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getValue() override;
 
         /**
         Sets the value of the attribute from a string.
         */
 
-        virtual void SAL_CALL setValue(const OUString& value) throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL setValue(const OUString& value) override;
 
         // resolve uno inheritance problems...
         // overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
+        virtual OUString SAL_CALL getLocalName() override;
 
     // --- delegation for XNode base.
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
     {
         return CNode::appendChild(newChild);
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
     {
         return CNode::cloneNode(deep);
     }
-    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
     {
         return CNode::getAttributes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
     {
         return CNode::getChildNodes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
     {
         return CNode::getFirstChild();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
     {
         return CNode::getLastChild();
     }
-    virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getNamespaceURI() override;
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
     {
         return CNode::getNextSibling();
     }
-    virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
     {
         return CNode::getNodeType();
     }
-    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
     {
         return CNode::getOwnerDocument();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
     {
         return CNode::getParentNode();
     }
-    virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPrefix() override;
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
     {
         return CNode::getPreviousSibling();
     }
-    virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAttributes() override
     {
         return CNode::hasAttributes();
     }
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
-    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
     {
         return CNode::isSupported(feature, ver);
     }
-    virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL normalize() override
     {
         CNode::normalize();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
-    virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
     {
         return setValue(nodeValue);
     }
-    virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+    virtual void SAL_CALL setPrefix(const OUString& prefix) override;
 
     };
 }
diff --git a/unoxml/source/dom/attributesmap.cxx b/unoxml/source/dom/attributesmap.cxx
index 921c085fbca3..88b386196c80 100644
--- a/unoxml/source/dom/attributesmap.cxx
+++ b/unoxml/source/dom/attributesmap.cxx
@@ -39,7 +39,7 @@ namespace DOM
     /**
     The number of nodes in this map.
     */
-    sal_Int32 SAL_CALL CAttributesMap::getLength() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CAttributesMap::getLength()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -61,7 +61,7 @@ namespace DOM
     Retrieves a node specified by local name
     */
     Reference< XNode > SAL_CALL
-    CAttributesMap::getNamedItem(OUString const& name) throw (RuntimeException, std::exception)
+    CAttributesMap::getNamedItem(OUString const& name)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -92,7 +92,6 @@ namespace DOM
     Reference< XNode > SAL_CALL
     CAttributesMap::getNamedItemNS(
             OUString const& namespaceURI, OUString const& localName)
-    throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -126,7 +125,7 @@ namespace DOM
     Returns the indexth item in the map.
     */
     Reference< XNode > SAL_CALL
-    CAttributesMap::item(sal_Int32 index) throw (RuntimeException, std::exception)
+    CAttributesMap::item(sal_Int32 index)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -156,7 +155,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CAttributesMap::removeNamedItem(OUString const& name)
-    throw (DOMException, RuntimeException, std::exception)
     {
         // no MutexGuard needed: m_pElement is const
         Reference< XAttr > const xAttr(m_pElement->getAttributeNode(name));
@@ -177,7 +175,6 @@ namespace DOM
     Reference< XNode > SAL_CALL
     CAttributesMap::removeNamedItemNS(
             OUString const& namespaceURI, OUString const& localName)
-    throw (DOMException, RuntimeException, std::exception)
     {
         // no MutexGuard needed: m_pElement is const
         Reference< XAttr > const xAttr(
@@ -198,7 +195,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CAttributesMap::setNamedItem(Reference< XNode > const& xNode)
-    throw (DOMException, RuntimeException, std::exception)
     {
         Reference< XAttr > const xAttr(xNode, UNO_QUERY);
         if (!xNode.is()) {
@@ -218,7 +214,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CAttributesMap::setNamedItemNS(Reference< XNode > const& xNode)
-    throw (DOMException, RuntimeException, std::exception)
     {
         Reference< XAttr > const xAttr(xNode, UNO_QUERY);
         if (!xNode.is()) {
diff --git a/unoxml/source/dom/attributesmap.hxx b/unoxml/source/dom/attributesmap.hxx
index 38a11fb069cc..84255fd048b4 100644
--- a/unoxml/source/dom/attributesmap.hxx
+++ b/unoxml/source/dom/attributesmap.hxx
@@ -47,54 +47,47 @@ namespace DOM
         /**
         The number of nodes in this map.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getLength() override;
 
         /**
         Retrieves a node specified by local name
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItem(OUString const& name)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItem(OUString const& name) override;
 
         /**
         Retrieves a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItemNS(
-                OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+                OUString const& namespaceURI, OUString const& localName) override;
 
         /**
         Returns the indexth item in the map.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override;
 
         /**
         Removes a node specified by name.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            removeNamedItem(OUString const& name)
-            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override;
+            removeNamedItem(OUString const& name) override;
 
         /**
         // Removes a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeNamedItemNS(
-                OUString const& namespaceURI, OUString const& localName)
-            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override;
+                OUString const& namespaceURI, OUString const& localName) override;
 
         /**
         // Adds a node using its nodeName attribute.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override;
+            setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg) override;
 
         /**
         Adds a node using its namespaceURI and localName.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::xml::dom::DOMException, css::uno::RuntimeException, std::exception) override;
+            setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg) override;
     };
 }
 
diff --git a/unoxml/source/dom/cdatasection.cxx b/unoxml/source/dom/cdatasection.cxx
index a1c7550513e1..bd02fbd11a66 100644
--- a/unoxml/source/dom/cdatasection.cxx
+++ b/unoxml/source/dom/cdatasection.cxx
@@ -46,12 +46,12 @@ namespace DOM
         }
     }
 
-    OUString SAL_CALL CCDATASection::getNodeName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CCDATASection::getNodeName()
     {
         return OUString( "#cdata-section" );
     }
 
-    OUString SAL_CALL CCDATASection::getNodeValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CCDATASection::getNodeValue()
     {
         return CCharacterData::getData();
     }
diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx
index 8fb6fb98a95e..fdd0a87b2a54 100644
--- a/unoxml/source/dom/cdatasection.hxx
+++ b/unoxml/source/dom/cdatasection.hxx
@@ -44,174 +44,142 @@ namespace DOM
 
         virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override;
 
-        virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset)
-             throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset) override
         {
             return CText::splitText(offset);
         }
 
          // --- delegations for XCharacterData
-        virtual void SAL_CALL appendData(const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL appendData(const OUString& arg) override
         {
             CCharacterData::appendData(arg);
         }
-        virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) override
         {
             CCharacterData::deleteData(offset, count);
         }
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getData() override
         {
             return CCharacterData::getData();
         }
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Int32 SAL_CALL getLength() override
         {
             return CCharacterData::getLength();
         }
-        virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) override
         {
             CCharacterData::insertData(offset, arg);
         }
-        virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) override
         {
             CCharacterData::replaceData(offset, count, arg);
         }
-        virtual void SAL_CALL setData(const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setData(const OUString& data) override
         {
             CCharacterData::setData(data);
         }
-        virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) override
         {
             return CCharacterData::subStringData(offset, count);
         }
 
 
          // --- overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
 
     // --- delegation for XNode base.
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
     {
         return CNode::appendChild(newChild);
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
     {
         return CNode::cloneNode(deep);
     }
-    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
     {
         return CNode::getAttributes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
     {
         return CNode::getChildNodes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
     {
         return CNode::getFirstChild();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
     {
         return CNode::getLastChild();
     }
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLocalName() override
     {
         return CNode::getLocalName();
     }
-    virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getNamespaceURI() override
     {
         return CNode::getNamespaceURI();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
     {
         return CNode::getNextSibling();
     }
-    virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
     {
         return CNode::getNodeType();
     }
-    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
     {
         return CNode::getOwnerDocument();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
     {
         return CNode::getParentNode();
     }
-    virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPrefix() override
     {
         return CNode::getPrefix();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
     {
         return CNode::getPreviousSibling();
     }
-    virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAttributes() override
     {
         return CNode::hasAttributes();
     }
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
-    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
     {
         return CNode::isSupported(feature, ver);
     }
-    virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL normalize() override
     {
         CNode::normalize();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
-    virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
     {
         return CText::setNodeValue(nodeValue);
     }
-    virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setPrefix(const OUString& prefix) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx
index fea48292663c..e5fa6c7db74b 100644
--- a/unoxml/source/dom/characterdata.cxx
+++ b/unoxml/source/dom/characterdata.cxx
@@ -61,7 +61,6 @@ namespace DOM
     Append the string to the end of the character data of the node.
     */
     void SAL_CALL CCharacterData::appendData(const OUString& arg)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::ClearableMutexGuard guard(m_rMutex);
 
@@ -80,7 +79,6 @@ namespace DOM
     Remove a range of 16-bit units from the node.
     */
     void SAL_CALL CCharacterData::deleteData(sal_Int32 offset, sal_Int32 count)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::ClearableMutexGuard guard(m_rMutex);
 
@@ -114,7 +112,7 @@ namespace DOM
     /**
     Return the character data of the node that implements this interface.
     */
-    OUString SAL_CALL CCharacterData::getData() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CCharacterData::getData()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -134,7 +132,7 @@ namespace DOM
     The number of 16-bit units that are available through data and the
     substringData method below.
     */
-    sal_Int32 SAL_CALL CCharacterData::getLength() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CCharacterData::getLength()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -151,7 +149,6 @@ namespace DOM
     Insert a string at the specified 16-bit unit offset.
     */
     void SAL_CALL CCharacterData::insertData(sal_Int32 offset, const OUString& arg)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::ClearableMutexGuard guard(m_rMutex);
 
@@ -186,7 +183,6 @@ namespace DOM
     with the specified string.
     */
     void SAL_CALL CCharacterData::replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::ClearableMutexGuard guard(m_rMutex);
 
@@ -221,7 +217,6 @@ namespace DOM
     Set the character data of the node that implements this interface.
     */
     void SAL_CALL CCharacterData::setData(const OUString& data)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::ClearableMutexGuard guard(m_rMutex);
 
@@ -240,7 +235,6 @@ namespace DOM
     Extracts a range of data from the node.
     */
     OUString SAL_CALL CCharacterData::subStringData(sal_Int32 offset, sal_Int32 count)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
diff --git a/unoxml/source/dom/characterdata.hxx b/unoxml/source/dom/characterdata.hxx
index 54c8e1ab16d9..8a3179d3de77 100644
--- a/unoxml/source/dom/characterdata.hxx
+++ b/unoxml/source/dom/characterdata.hxx
@@ -52,176 +52,145 @@ namespace DOM
         /**
         Append the string to the end of the character data of the node.
         */
-        virtual void SAL_CALL appendData(const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL appendData(const OUString& arg) override;
 
         /**
         Remove a range of 16-bit units from the node.
         */
-        virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) override;
 
         /**
         Return the character data of the node that implements this interface.
         */
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getData() override;
 
         /**
         The number of 16-bit units that are available through data and the
         substringData method below.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getLength() override;
 
         /**
         Insert a string at the specified 16-bit unit offset.
         */
-        virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) override;
 
         /**
         Replace the characters starting at the specified 16-bit unit offset
         with the specified string.
         */
-        virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) override;
 
         /**
         Set the character data of the node that implements this interface.
         */
-        virtual void SAL_CALL setData(const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL setData(const OUString& data) override;
 
         /**
         Extracts a range of data from the node.
         */
-        virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) override;
 
         // --- delegation for XNode base.
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
         {
             return CNode::appendChild(newChild);
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
         {
             return CNode::cloneNode(deep);
         }
-        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
         {
             return CNode::getAttributes();
         }
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
         {
             return CNode::getChildNodes();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
         {
             return CNode::getFirstChild();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
         {
             return CNode::getLastChild();
         }
-        virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getLocalName() override
         {
             return CNode::getLocalName();
         }
-        virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getNamespaceURI() override
         {
             return CNode::getNamespaceURI();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
         {
             return CNode::getNextSibling();
         }
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getNodeName() override
         {
             return CNode::getNodeName();
         }
-        virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
         {
             return CNode::getNodeType();
         }
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getNodeValue() override
         {
             return getData();
         }
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
         {
             return CNode::getOwnerDocument();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
         {
             return CNode::getParentNode();
         }
-        virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getPrefix() override
         {
             return CNode::getPrefix();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
         {
             return CNode::getPreviousSibling();
         }
-        virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasAttributes() override
         {
             return CNode::hasAttributes();
         }
-        virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasChildNodes() override
         {
             return CNode::hasChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
         {
             return CNode::insertBefore(newChild, refChild);
         }
-        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
         {
             return CNode::isSupported(feature, ver);
         }
-        virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL normalize() override
         {
             CNode::normalize();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
         {
             return CNode::removeChild(oldChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
         {
             return CNode::replaceChild(newChild, oldChild);
         }
-        virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
         {
             return setData(nodeValue);
         }
-        virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setPrefix(const OUString& prefix) override
         {
             return CNode::setPrefix(prefix);
         }
diff --git a/unoxml/source/dom/childlist.cxx b/unoxml/source/dom/childlist.cxx
index d301d7aa9a59..3666eeb2b0f7 100644
--- a/unoxml/source/dom/childlist.cxx
+++ b/unoxml/source/dom/childlist.cxx
@@ -39,7 +39,7 @@ namespace DOM
     /**
     The number of nodes in the list.
     */
-    sal_Int32 SAL_CALL CChildList::getLength() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CChildList::getLength()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -63,7 +63,6 @@ namespace DOM
     Returns the indexth item in the collection.
     */
     Reference< XNode > SAL_CALL CChildList::item(sal_Int32 index)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
diff --git a/unoxml/source/dom/childlist.hxx b/unoxml/source/dom/childlist.hxx
index 91daba41eb7f..24f833eff749 100644
--- a/unoxml/source/dom/childlist.hxx
+++ b/unoxml/source/dom/childlist.hxx
@@ -47,12 +47,11 @@ namespace DOM
         /**
         The number of nodes in the list.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getLength() override;
         /**
         Returns the indexth item in the collection.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override;
     };
 }
 
diff --git a/unoxml/source/dom/comment.cxx b/unoxml/source/dom/comment.cxx
index b6a1da8a9221..740e4813b886 100644
--- a/unoxml/source/dom/comment.cxx
+++ b/unoxml/source/dom/comment.cxx
@@ -42,12 +42,12 @@ namespace DOM
         }
     }
 
-    OUString SAL_CALL CComment::getNodeName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CComment::getNodeName()
     {
         return OUString("#comment");
     }
 
-    OUString SAL_CALL CComment::getNodeValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CComment::getNodeValue()
     {
         return CCharacterData::getData();
     }
diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx
index 4cf3cd2637a5..3ce9362606f4 100644
--- a/unoxml/source/dom/comment.hxx
+++ b/unoxml/source/dom/comment.hxx
@@ -46,167 +46,136 @@ namespace DOM
         virtual void saxify(const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler) override;
 
          // --- delegations for XCharacterData
-        virtual void SAL_CALL appendData(const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL appendData(const OUString& arg) override
         {
             CCharacterData::appendData(arg);
         }
-        virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) override
         {
             CCharacterData::deleteData(offset, count);
         }
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getData() override
         {
             return CCharacterData::getData();
         }
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Int32 SAL_CALL getLength() override
         {
             return CCharacterData::getLength();
         }
-        virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) override
         {
             CCharacterData::insertData(offset, arg);
         }
-        virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) override
         {
             CCharacterData::replaceData(offset, count, arg);
         }
-        virtual void SAL_CALL setData(const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setData(const OUString& data) override
         {
             CCharacterData::setData(data);
         }
-        virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) override
         {
             return CCharacterData::subStringData(offset, count);
         }
 
 
          // --- overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
 
     // --- delegation for XNode base.
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
     {
         return CCharacterData::appendChild(newChild);
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
     {
         return CCharacterData::cloneNode(deep);
     }
-    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
     {
         return CCharacterData::getAttributes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
     {
         return CCharacterData::getChildNodes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
     {
         return CCharacterData::getFirstChild();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
     {
         return CCharacterData::getLastChild();
     }
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLocalName() override
     {
         return CCharacterData::getLocalName();
     }
-    virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getNamespaceURI() override
     {
         return CCharacterData::getNamespaceURI();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
     {
         return CCharacterData::getNextSibling();
     }
-    virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
     {
         return CCharacterData::getNodeType();
     }
-    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
     {
         return CCharacterData::getOwnerDocument();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
     {
         return CCharacterData::getParentNode();
     }
-    virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPrefix() override
     {
         return CCharacterData::getPrefix();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
     {
         return CCharacterData::getPreviousSibling();
     }
-    virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAttributes() override
     {
         return CCharacterData::hasAttributes();
     }
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return CCharacterData::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
     {
         return CCharacterData::insertBefore(newChild, refChild);
     }
-    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
     {
         return CCharacterData::isSupported(feature, ver);
     }
-    virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL normalize() override
     {
         CCharacterData::normalize();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CCharacterData::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CCharacterData::replaceChild(newChild, oldChild);
     }
-    virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
     {
         return CCharacterData::setNodeValue(nodeValue);
     }
-    virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setPrefix(const OUString& prefix) override
     {
         return CCharacterData::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 8c0b25d2ffc5..9911c33e9ab2 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -325,7 +325,6 @@ namespace DOM
 
 
     void SAL_CALL CDocument::addListener(const Reference< XStreamListener >& aListener )
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -333,7 +332,6 @@ namespace DOM
     }
 
     void SAL_CALL CDocument::removeListener(const Reference< XStreamListener >& aListener )
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -370,7 +368,6 @@ namespace DOM
     } // extern "C"
 
     void SAL_CALL CDocument::start()
-        throw (RuntimeException, std::exception)
     {
         listenerlist_t streamListeners;
         {
@@ -411,20 +408,18 @@ namespace DOM
     }
 
     void SAL_CALL CDocument::terminate()
-        throw (RuntimeException, std::exception)
     {
         // not supported
     }
 
     void SAL_CALL CDocument::setOutputStream( const Reference< XOutputStream >& aStream )
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
         m_rOutputStream = aStream;
     }
 
-    Reference< XOutputStream > SAL_CALL  CDocument::getOutputStream() throw (RuntimeException, std::exception)
+    Reference< XOutputStream > SAL_CALL  CDocument::getOutputStream()
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -433,7 +428,6 @@ namespace DOM
 
     // Creates an Attr of the given name.
     Reference< XAttr > SAL_CALL CDocument::createAttribute(const OUString& name)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -451,7 +445,6 @@ namespace DOM
     // Creates an attribute of the given qualified name and namespace URI.
     Reference< XAttr > SAL_CALL CDocument::createAttributeNS(
             const OUString& ns, const OUString& qname)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -486,7 +479,6 @@ namespace DOM
 
     // Creates a CDATASection node whose value is the specified string.
     Reference< XCDATASection > SAL_CALL CDocument::createCDATASection(const OUString& data)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -504,7 +496,6 @@ namespace DOM
 
     // Creates a Comment node given the specified string.
     Reference< XComment > SAL_CALL CDocument::createComment(const OUString& data)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -519,7 +510,6 @@ namespace DOM
 
     //Creates an empty DocumentFragment object.
     Reference< XDocumentFragment > SAL_CALL CDocument::createDocumentFragment()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -532,7 +522,6 @@ namespace DOM
 
     // Creates an element of the type specified.
     Reference< XElement > SAL_CALL CDocument::createElement(const OUString& tagName)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -548,7 +537,6 @@ namespace DOM
     // Creates an element of the given qualified name and namespace URI.
     Reference< XElement > SAL_CALL CDocument::createElementNS(
             const OUString& ns, const OUString& qname)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -584,7 +572,6 @@ namespace DOM
 
     //Creates an EntityReference object.
     Reference< XEntityReference > SAL_CALL CDocument::createEntityReference(const OUString& name)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -601,7 +588,6 @@ namespace DOM
     // data strings.
     Reference< XProcessingInstruction > SAL_CALL CDocument::createProcessingInstruction(
             const OUString& target, const OUString& data)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -619,7 +605,6 @@ namespace DOM
 
     // Creates a Text node given the specified string.
     Reference< XText > SAL_CALL CDocument::createTextNode(const OUString& data)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -635,7 +620,6 @@ namespace DOM
     // The Document Type Declaration (see DocumentType) associated with this
     // document.
     Reference< XDocumentType > SAL_CALL CDocument::getDoctype()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -649,7 +633,6 @@ namespace DOM
     // This is a convenience attribute that allows direct access to the child
     // node that is the root element of the document.
     Reference< XElement > SAL_CALL CDocument::getDocumentElement()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -690,7 +673,6 @@ namespace DOM
     // Returns the Element whose ID is given by elementId.
     Reference< XElement > SAL_CALL
     CDocument::getElementById(const OUString& elementId)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -709,7 +691,6 @@ namespace DOM
 
     Reference< XNodeList > SAL_CALL
     CDocument::getElementsByTagName(OUString const& rTagname)
-            throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -720,7 +701,6 @@ namespace DOM
 
     Reference< XNodeList > SAL_CALL CDocument::getElementsByTagNameNS(
             OUString const& rNamespaceURI, OUString const& rLocalName)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -731,7 +711,6 @@ namespace DOM
     }
 
     Reference< XDOMImplementation > SAL_CALL CDocument::getImplementation()
-        throw (RuntimeException, std::exception)
     {
         // does not need mutex currently
         return Reference< XDOMImplementation >(CDOMImplementation::get());
@@ -916,7 +895,6 @@ namespace DOM
 
     Reference< XNode > SAL_CALL CDocument::importNode(
             Reference< XNode > const& xImportedNode, sal_Bool deep)
-        throw (RuntimeException, DOMException, std::exception)
     {
         if (!xImportedNode.is()) { throw RuntimeException(); }
 
@@ -945,20 +923,19 @@ namespace DOM
         return xNode;
     }
 
-    OUString SAL_CALL CDocument::getNodeName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocument::getNodeName()
     {
         // does not need mutex currently
         return OUString("#document");
     }
 
-    OUString SAL_CALL CDocument::getNodeValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocument::getNodeValue()
     {
         // does not need mutex currently
         return OUString();
     }
 
     Reference< XNode > SAL_CALL CDocument::cloneNode(sal_Bool bDeep)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -973,7 +950,7 @@ namespace DOM
         return xRet;
     }
 
-    Reference< XEvent > SAL_CALL CDocument::createEvent(const OUString& aType) throw (RuntimeException, std::exception)
+    Reference< XEvent > SAL_CALL CDocument::createEvent(const OUString& aType)
     {
         // does not need mutex currently
         events::CEvent *pEvent = nullptr;
@@ -1002,7 +979,6 @@ namespace DOM
     void SAL_CALL CDocument::serialize(
             const Reference< XDocumentHandler >& i_xHandler,
             const Sequence< beans::StringPair >& i_rNamespaces)
-        throw (RuntimeException, SAXException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -1031,7 +1007,6 @@ namespace DOM
                                             const Reference< XFastTokenHandler >& i_xTokenHandler,
                                             const Sequence< beans::StringPair >& i_rNamespaces,
                                             const Sequence< beans::Pair< OUString, sal_Int32 > >& i_rRegisterNamespaces )
-        throw (SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx
index fce0514b62a9..8d1fcd8fa587 100644
--- a/unoxml/source/dom/document.hxx
+++ b/unoxml/source/dom/document.hxx
@@ -118,246 +118,204 @@ namespace DOM
         /**
         Creates an Attr of the given name.
         */
-        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttribute(const OUString& name)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttribute(const OUString& name) override;
 
         /**
         Creates an attribute of the given qualified name and namespace URI.
         */
-        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttributeNS(const OUString& namespaceURI, const OUString& qualifiedName)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL createAttributeNS(const OUString& namespaceURI, const OUString& qualifiedName) override;
 
         /**
         Creates a CDATASection node whose value is the specified string.
         */
-        virtual css::uno::Reference< css::xml::dom::XCDATASection > SAL_CALL createCDATASection(const OUString& data)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XCDATASection > SAL_CALL createCDATASection(const OUString& data) override;
 
         /**
         Creates a Comment node given the specified string.
         */
-        virtual css::uno::Reference< css::xml::dom::XComment > SAL_CALL createComment(const OUString& data)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XComment > SAL_CALL createComment(const OUString& data) override;
 
         /**
         Creates an empty DocumentFragment object.
         */
-        virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL createDocumentFragment()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL createDocumentFragment() override;
 
         /**
         Creates an element of the type specified.
         */
-        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElement(const OUString& tagName)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElement(const OUString& tagName) override;
 
         /**
         Creates an element of the given qualified name and namespace URI.
         */
-        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElementNS(const OUString& namespaceURI, const OUString& qualifiedName)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL createElementNS(const OUString& namespaceURI, const OUString& qualifiedName) override;
 
         /**
         Creates an EntityReference object.
         */
-        virtual css::uno::Reference< css::xml::dom::XEntityReference > SAL_CALL createEntityReference(const OUString& name)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XEntityReference > SAL_CALL createEntityReference(const OUString& name) override;
 
         /**
         Creates a ProcessingInstruction node given the specified name and
         data strings.
         */
         virtual css::uno::Reference< css::xml::dom::XProcessingInstruction > SAL_CALL createProcessingInstruction(
-                const OUString& target, const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+                const OUString& target, const OUString& data) override;
 
         /**
         Creates a Text node given the specified string.
         */
-        virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL createTextNode(const OUString& data)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL createTextNode(const OUString& data) override;
 
         /**
         The Document Type Declaration (see DocumentType) associated with this
         document.
         */
-        virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL getDoctype()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL getDoctype() override;
 
         /**
         This is a convenience attribute that allows direct access to the child
         node that is the root element of the document.
         */
-        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getDocumentElement()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getDocumentElement() override;
 
         /**
         Returns the Element whose ID is given by elementId.
         */
-        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getElementById(const OUString& elementId)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XElement > SAL_CALL getElementById(const OUString& elementId) override;
 
         /**
         Returns a NodeList of all the Elements with a given tag name in the
         order in which they are encountered in a preorder traversal of the
         Document tree.
         */
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& tagname)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& tagname) override;
 
         /**
         Returns a NodeList of all the Elements with a given local name and
         namespace URI in the order in which they are encountered in a preorder
         traversal of the Document tree.
         */
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI, const OUString& localName) override;
 
         /**
         The DOMImplementation object that handles this document.
         */
-        virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getImplementation()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getImplementation() override;
 
         /**
         Imports a node from another document to this document.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL importNode(const css::uno::Reference< css::xml::dom::XNode >& importedNode, sal_Bool deep)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL importNode(const css::uno::Reference< css::xml::dom::XNode >& importedNode, sal_Bool deep) override;
 
         // XDocumentEvent
-        virtual css::uno::Reference< css::xml::dom::events::XEvent > SAL_CALL createEvent(const OUString& eventType) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::events::XEvent > SAL_CALL createEvent(const OUString& eventType) override;
 
         // XActiveDataControl,
         // see http://api.libreoffice.org/docs/common/ref/com/sun/star/io/XActiveDataControl.html
-        virtual void SAL_CALL addListener(const css::uno::Reference< css::io::XStreamListener >& aListener )  throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeListener(const css::uno::Reference< css::io::XStreamListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL start() throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL terminate() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addListener(const css::uno::Reference< css::io::XStreamListener >& aListener ) override;
+        virtual void SAL_CALL removeListener(const css::uno::Reference< css::io::XStreamListener >& aListener ) override;
+        virtual void SAL_CALL start() override;
+        virtual void SAL_CALL terminate() override;
 
         // XActiveDataSource
         // see http://api.libreoffice.org/docs/common/ref/com/sun/star/io/XActiveDataSource.html
-        virtual void SAL_CALL setOutputStream(  const css::uno::Reference< css::io::XOutputStream >& aStream ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setOutputStream(  const css::uno::Reference< css::io::XOutputStream >& aStream ) override;
+        virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream() override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override;
         // --- delegation for XNode base.
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
         {
             return CNode::appendChild(newChild);
         }
-        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
         {
             return CNode::getAttributes();
         }
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
         {
             return CNode::getChildNodes();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
         {
             return CNode::getFirstChild();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
         {
             return CNode::getLastChild();
         }
-        virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getLocalName() override
         {
             return CNode::getLocalName();
         }
-        virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getNamespaceURI() override
         {
             return CNode::getNamespaceURI();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
         {
             return CNode::getNextSibling();
         }
-        virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
         {
             return CNode::getNodeType();
         }
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
         {
             return CNode::getOwnerDocument();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
         {
             return CNode::getParentNode();
         }
-        virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getPrefix() override
         {
            return CNode::getPrefix();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
         {
             return CNode::getPreviousSibling();
         }
-        virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasAttributes() override
         {
             return CNode::hasAttributes();
         }
-        virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasChildNodes() override
         {
             return CNode::hasChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
         {
             return CNode::insertBefore(newChild, refChild);
         }
-        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
         {
             return CNode::isSupported(feature, ver);
         }
-        virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL normalize() override
         {
             CNode::normalize();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
         {
             return CNode::removeChild(oldChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
         {
             return CNode::replaceChild(newChild, oldChild);
         }
-        virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
         {
             return CNode::setNodeValue(nodeValue);
         }
-        virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setPrefix(const OUString& prefix) override
         {
             return CNode::setPrefix(prefix);
         }
@@ -365,15 +323,13 @@ namespace DOM
         // css::xml::sax::XSAXSerializable
         virtual void SAL_CALL serialize(
             const css::uno::Reference< css::xml::sax::XDocumentHandler >& i_xHandler,
-            const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+            const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces) override;
 
         // css::xml::sax::XFastSAXSerializable
         virtual void SAL_CALL fastSerialize( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& handler,
                                              const css::uno::Reference< css::xml::sax::XFastTokenHandler >& tokenHandler,
                                              const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces,
-                                             const css::uno::Sequence< css::beans::Pair< OUString, sal_Int32 > >& namespaces )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+                                             const css::uno::Sequence< css::beans::Pair< OUString, sal_Int32 > >& namespaces ) override;
     };
 }
 
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index b460004687e0..0a3e80dc9767 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -63,8 +63,7 @@ namespace DOM
     class CDefaultEntityResolver : public cppu::WeakImplHelper< XEntityResolver >
     {
     public:
-        virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, const OUString& sSystemId )
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, const OUString& sSystemId ) override
         {
             InputSource is;
             is.sPublicId = sPublicId;
@@ -122,44 +121,37 @@ namespace DOM
     }
 
     Sequence< OUString > SAL_CALL CDocumentBuilder::getSupportedServiceNames()
-        throw (RuntimeException, std::exception)
     {
         return CDocumentBuilder::_getSupportedServiceNames();
     }
 
     OUString SAL_CALL CDocumentBuilder::getImplementationName()
-        throw (RuntimeException, std::exception)
     {
         return CDocumentBuilder::_getImplementationName();
     }
 
     sal_Bool SAL_CALL CDocumentBuilder::supportsService(const OUString& aServiceName)
-        throw (RuntimeException, std::exception)
     {
         return cppu::supportsService(this, aServiceName);
     }
 
     Reference< XDOMImplementation > SAL_CALL CDocumentBuilder::getDOMImplementation()
-        throw (RuntimeException, std::exception)
     {
 
         return Reference< XDOMImplementation >();
     }
 
     sal_Bool SAL_CALL CDocumentBuilder::isNamespaceAware()
-        throw (RuntimeException, std::exception)
     {
         return true;
     }
 
     sal_Bool SAL_CALL CDocumentBuilder::isValidating()
-        throw (RuntimeException, std::exception)
     {
         return false;
     }
 
     Reference< XDocument > SAL_CALL CDocumentBuilder::newDocument()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -308,7 +300,6 @@ namespace DOM
     }
 
     Reference< XDocument > SAL_CALL CDocumentBuilder::parse(const Reference< XInputStream >& is)
-        throw (RuntimeException, SAXParseException, IOException, std::exception)
     {
         if (!is.is()) {
             throw RuntimeException();
@@ -345,7 +336,6 @@ namespace DOM
     }
 
     Reference< XDocument > SAL_CALL CDocumentBuilder::parseURI(const OUString& sUri)
-        throw (RuntimeException, SAXParseException, IOException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -369,7 +359,6 @@ namespace DOM
 
     void SAL_CALL
     CDocumentBuilder::setEntityResolver(Reference< XEntityResolver > const& xER)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -377,7 +366,6 @@ namespace DOM
     }
 
     Reference< XEntityResolver > SAL_CALL CDocumentBuilder::getEntityResolver()
-        throw (RuntimeException)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -386,7 +374,6 @@ namespace DOM
 
     void SAL_CALL
     CDocumentBuilder::setErrorHandler(Reference< XErrorHandler > const& xEH)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx
index 482c5ea718dc..cdda893010d5 100644
--- a/unoxml/source/dom/documentbuilder.hxx
+++ b/unoxml/source/dom/documentbuilder.hxx
@@ -69,72 +69,60 @@ namespace DOM
                 rSMgr);
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames () override;
 
         /**
         Obtain an instance of a DOMImplementation object.
         */
-        virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getDOMImplementation()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDOMImplementation > SAL_CALL getDOMImplementation() override;
 
         /**
         Indicates whether or not this parser is configured to understand
         namespaces.
         */
-        virtual sal_Bool SAL_CALL isNamespaceAware()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isNamespaceAware() override;
 
         /**
         Indicates whether or not this parser is configured to validate XML
         documents.
         */
-        virtual sal_Bool SAL_CALL isValidating()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isValidating() override;
 
         /**
         Obtain a new instance of a DOM Document object to build a DOM tree
         with.
         */
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL newDocument()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL newDocument() override;
 
         /**
         Parse the content of the given InputStream as an XML document and
         return a new DOM Document object.
         */
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parse(const css::uno::Reference< css::io::XInputStream >& is)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXParseException, css::io::IOException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parse(const css::uno::Reference< css::io::XInputStream >& is) override;
 
         /**
         Parse the content of the given URI as an XML document and return
         a new DOM Document object.
         */
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parseURI(const OUString& uri)
-            throw (css::uno::RuntimeException, css::xml::sax::SAXParseException, css::io::IOException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL parseURI(const OUString& uri) override;
 
         /**
         Specify the EntityResolver to be used to resolve entities present
         in the XML document to be parsed.
         */
-        virtual void SAL_CALL setEntityResolver(const css::uno::Reference< css::xml::sax::XEntityResolver >& er)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setEntityResolver(const css::uno::Reference< css::xml::sax::XEntityResolver >& er) override;
 
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::xml::sax::XEntityResolver > SAL_CALL getEntityResolver()
-            throw (css::uno::RuntimeException);
+        css::uno::Reference< css::xml::sax::XEntityResolver > SAL_CALL getEntityResolver();
 
 
         /**
         Specify the ErrorHandler to be used to report errors present in
         the XML document to be parsed.
         */
-        virtual void SAL_CALL setErrorHandler(const css::uno::Reference< css::xml::sax::XErrorHandler >& eh)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setErrorHandler(const css::uno::Reference< css::xml::sax::XErrorHandler >& eh) override;
     };
 }
 
diff --git a/unoxml/source/dom/documentfragment.cxx b/unoxml/source/dom/documentfragment.cxx
index 9b67514809ee..82a25aba5222 100644
--- a/unoxml/source/dom/documentfragment.cxx
+++ b/unoxml/source/dom/documentfragment.cxx
@@ -47,11 +47,11 @@ namespace DOM
         }
     }
 
-    OUString SAL_CALL CDocumentFragment::getNodeName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocumentFragment::getNodeName()
     {
         return OUString("#document-fragment");
     }
-    OUString SAL_CALL CDocumentFragment::getNodeValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocumentFragment::getNodeValue()
     {
         return OUString();
     }
diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx
index 62068af0c478..8ed4481484bc 100644
--- a/unoxml/source/dom/documentfragment.hxx
+++ b/unoxml/source/dom/documentfragment.hxx
@@ -47,125 +47,100 @@ namespace DOM
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
     // --- delegation for XNode base.
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
     {
         return CNode::appendChild(newChild);
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
     {
         return CNode::cloneNode(deep);
     }
-    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
     {
         return CNode::getAttributes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
     {
         return CNode::getChildNodes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
     {
         return CNode::getFirstChild();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
     {
         return CNode::getLastChild();
     }
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLocalName() override
     {
         return CNode::getLocalName();
     }
-    virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getNamespaceURI() override
     {
         return CNode::getNamespaceURI();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
     {
         return CNode::getNextSibling();
     }
-    virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
     {
         return CNode::getNodeType();
     }
-    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
     {
         return CNode::getOwnerDocument();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
     {
         return CNode::getParentNode();
     }
-    virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPrefix() override
     {
         return CNode::getPrefix();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
     {
         return CNode::getPreviousSibling();
     }
-    virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAttributes() override
     {
         return CNode::hasAttributes();
     }
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
-    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
     {
         return CNode::isSupported(feature, ver);
     }
-    virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL normalize() override
     {
         CNode::normalize();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
-    virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
     {
         return CNode::setNodeValue(nodeValue);
     }
-    virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setPrefix(const OUString& prefix) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/documenttype.cxx b/unoxml/source/dom/documenttype.cxx
index ddc32016dbe6..047f5742cd4c 100644
--- a/unoxml/source/dom/documenttype.cxx
+++ b/unoxml/source/dom/documenttype.cxx
@@ -45,7 +45,7 @@ namespace DOM
     A NamedNodeMap containing the general entities, both external and
     internal, declared in the DTD.
     */
-    css::uno::Reference< XNamedNodeMap > SAL_CALL CDocumentType::getEntities() throw (RuntimeException, std::exception)
+    css::uno::Reference< XNamedNodeMap > SAL_CALL CDocumentType::getEntities()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -60,7 +60,7 @@ namespace DOM
     /**
     The internal subset as a string, or null if there is none.
     */
-    OUString SAL_CALL CDocumentType::getInternalSubset() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocumentType::getInternalSubset()
     {
         OSL_ENSURE(false,
             "CDocumentType::getInternalSubset: not implemented (#i113683#)");
@@ -71,7 +71,7 @@ namespace DOM
     The name of DTD; i.e., the name immediately following the DOCTYPE
     keyword.
     */
-    OUString SAL_CALL CDocumentType::getName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocumentType::getName()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -86,7 +86,7 @@ namespace DOM
     /**
     A NamedNodeMap containing the notations declared in the DTD.
     */
-    css::uno::Reference< XNamedNodeMap > SAL_CALL CDocumentType::getNotations() throw (RuntimeException, std::exception)
+    css::uno::Reference< XNamedNodeMap > SAL_CALL CDocumentType::getNotations()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -101,7 +101,7 @@ namespace DOM
     /**
     The public identifier of the external subset.
     */
-    OUString SAL_CALL CDocumentType::getPublicId() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocumentType::getPublicId()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -116,7 +116,7 @@ namespace DOM
     /**
     The system identifier of the external subset.
     */
-    OUString SAL_CALL CDocumentType::getSystemId() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocumentType::getSystemId()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -128,12 +128,12 @@ namespace DOM
         return aId;
     }
 
-    OUString SAL_CALL CDocumentType::getNodeName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocumentType::getNodeName()
     {
         return getName();
     }
 
-    OUString SAL_CALL CDocumentType::getNodeValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CDocumentType::getNodeValue()
     {
         return OUString();
     }
diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx
index 711f1a4e5a59..1987fb8e110d 100644
--- a/unoxml/source/dom/documenttype.hxx
+++ b/unoxml/source/dom/documenttype.hxx
@@ -55,155 +55,130 @@ namespace DOM
         A NamedNodeMap containing the general entities, both external and
         internal, declared in the DTD.
         */
-        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getEntities() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getEntities() override;
 
         /**
         The internal subset as a string, or null if there is none.
         */
-        virtual OUString SAL_CALL getInternalSubset() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getInternalSubset() override;
 
         /**
         The name of DTD; i.e., the name immediately following the DOCTYPE
         keyword.
         */
-        virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName() override;
 
         /**
         A NamedNodeMap containing the notations declared in the DTD.
         */
-        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getNotations() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getNotations() override;
 
         /**
         The public identifier of the external subset.
         */
-        virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getPublicId() override;
 
         /**
         The system identifier of the external subset.
         */
-        virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getSystemId() override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
     // --- delegation for XNode base.
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
     {
         return CNode::appendChild(newChild);
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
     {
         return CNode::cloneNode(deep);
     }
-    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
     {
         return CNode::getAttributes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
     {
         return CNode::getChildNodes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
     {
         return CNode::getFirstChild();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
     {
         return CNode::getLastChild();
     }
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLocalName() override
     {
         return CNode::getLocalName();
     }
-    virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getNamespaceURI() override
     {
         return CNode::getNamespaceURI();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
     {
         return CNode::getNextSibling();
     }
-    virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
     {
         return CNode::getNodeType();
     }
-    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
     {
         return CNode::getOwnerDocument();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
     {
         return CNode::getParentNode();
     }
-    virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPrefix() override
     {
         return CNode::getPrefix();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
     {
         return CNode::getPreviousSibling();
     }
-    virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAttributes() override
     {
         return CNode::hasAttributes();
     }
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
-    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
     {
         return CNode::isSupported(feature, ver);
     }
-    virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL normalize() override
     {
         CNode::normalize();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
-    virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
     {
         return CNode::setNodeValue(nodeValue);
     }
-    virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setPrefix(const OUString& prefix) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/domimplementation.cxx b/unoxml/source/dom/domimplementation.cxx
index 9439320e0ca5..1bf354ced661 100644
--- a/unoxml/source/dom/domimplementation.cxx
+++ b/unoxml/source/dom/domimplementation.cxx
@@ -51,7 +51,6 @@ namespace DOM
            OUString const& /*rNamespaceURI*/,
            OUString const& /*rQualifiedName*/,
            Reference< XDocumentType > const& /*xDoctype*/)
-        throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CDOMImplementation::createDocument: not implemented (#i113683#)");
@@ -64,7 +63,6 @@ namespace DOM
     Reference< XDocumentType > SAL_CALL CDOMImplementation::createDocumentType(
             OUString const& /*rQualifiedName*/,
             OUString const& /*rPublicId*/, OUString const& /*rSystemId*/)
-        throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false, "CDOMImplementation::createDocumentType: "
                 "not implemented (#i113683#)");
@@ -76,7 +74,6 @@ namespace DOM
     */
     sal_Bool SAL_CALL
     CDOMImplementation::hasFeature(OUString const& /*feature*/, OUString const& /*ver*/)
-        throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CDOMImplementation::hasFeature: not implemented (#i113683#)");
diff --git a/unoxml/source/dom/domimplementation.hxx b/unoxml/source/dom/domimplementation.hxx
index de218640f1f1..095587409235 100644
--- a/unoxml/source/dom/domimplementation.hxx
+++ b/unoxml/source/dom/domimplementation.hxx
@@ -45,20 +45,17 @@ namespace DOM
         /**
         Creates a DOM Document object of the specified type with its document element.
         */
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL createDocument(const OUString& namespaceURI, const OUString& qualifiedName, const css::uno::Reference< css::xml::dom::XDocumentType >& doctype)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL createDocument(const OUString& namespaceURI, const OUString& qualifiedName, const css::uno::Reference< css::xml::dom::XDocumentType >& doctype) override;
 
         /**
         Creates an empty DocumentType node.
         */
-        virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL createDocumentType(const OUString& qualifiedName, const OUString& publicId, const OUString& systemId)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XDocumentType > SAL_CALL createDocumentType(const OUString& qualifiedName, const OUString& publicId, const OUString& systemId) override;
 
         /**
         Test if the DOM implementation implements a specific feature.
         */
-        virtual sal_Bool SAL_CALL hasFeature(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasFeature(const OUString& feature, const OUString& ver) override;
         };
 }
 #endif
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 4933f89baf3c..ed81e8d2333f 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -231,7 +231,6 @@ namespace DOM
         return empty string if attribute is not set
     */
     OUString SAL_CALL CElement::getAttribute(OUString const& name)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -254,7 +253,6 @@ namespace DOM
     Retrieves an attribute node by name.
     */
     Reference< XAttr > SAL_CALL CElement::getAttributeNode(OUString const& name)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -280,7 +278,6 @@ namespace DOM
     */
     Reference< XAttr > SAL_CALL CElement::getAttributeNodeNS(
             const OUString& namespaceURI, const OUString& localName)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -311,7 +308,6 @@ namespace DOM
     OUString SAL_CALL
     CElement::getAttributeNS(
             OUString const& namespaceURI, OUString const& localName)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -342,7 +338,6 @@ namespace DOM
     */
     Reference< XNodeList > SAL_CALL
     CElement::getElementsByTagName(OUString const& rLocalName)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -359,7 +354,6 @@ namespace DOM
     Reference< XNodeList > SAL_CALL
     CElement::getElementsByTagNameNS(
             OUString const& rNamespaceURI, OUString const& rLocalName)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -372,7 +366,6 @@ namespace DOM
     The name of the element.
     */
     OUString SAL_CALL CElement::getTagName()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -390,7 +383,6 @@ namespace DOM
     element or has a default value, false otherwise.
     */
     sal_Bool SAL_CALL CElement::hasAttribute(OUString const& name)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -405,7 +397,6 @@ namespace DOM
     */
     sal_Bool SAL_CALL CElement::hasAttributeNS(
             OUString const& namespaceURI, OUString const& localName)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -420,7 +411,6 @@ namespace DOM
     Removes an attribute by name.
     */
     void SAL_CALL CElement::removeAttribute(OUString const& name)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -445,7 +435,6 @@ namespace DOM
     */
     void SAL_CALL CElement::removeAttributeNS(
             OUString const& namespaceURI, OUString const& localName)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -475,7 +464,6 @@ namespace DOM
     */
     Reference< XAttr > SAL_CALL
     CElement::removeAttributeNode(Reference< XAttr > const& oldAttr)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -594,7 +582,6 @@ namespace DOM
 
     Reference< XAttr >
     CElement::setAttributeNode(const Reference< XAttr >& newAttr)
-        throw (RuntimeException, DOMException, std::exception)
     {
         return setAttributeNode_Impl_Lock(newAttr, false);
     }
@@ -604,7 +591,6 @@ namespace DOM
     */
     Reference< XAttr >
     CElement::setAttributeNodeNS(const Reference< XAttr >& newAttr)
-        throw (RuntimeException, DOMException, std::exception)
     {
         return setAttributeNode_Impl_Lock(newAttr, true);
     }
@@ -614,7 +600,6 @@ namespace DOM
     */
     void SAL_CALL
     CElement::setAttribute(OUString const& name, OUString const& value)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::ClearableMutexGuard guard(m_rMutex);
 
@@ -660,7 +645,6 @@ namespace DOM
     void SAL_CALL
     CElement::setAttributeNS(OUString const& namespaceURI,
             OUString const& qualifiedName, OUString const& value)
-        throw (RuntimeException, DOMException, std::exception)
     {
         if (namespaceURI.isEmpty()) throw RuntimeException();
 
@@ -737,7 +721,7 @@ namespace DOM
     }
 
     Reference< XNamedNodeMap > SAL_CALL
-    CElement::getAttributes() throw (RuntimeException, std::exception)
+    CElement::getAttributes()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -746,12 +730,12 @@ namespace DOM
         return xMap;
     }
 
-    OUString SAL_CALL CElement::getNodeName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CElement::getNodeName()
     {
         return getLocalName();
     }
 
-    OUString SAL_CALL CElement::getLocalName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CElement::getLocalName()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -764,7 +748,7 @@ namespace DOM
         return aName;
     }
 
-    OUString SAL_CALL CElement::getNodeValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CElement::getNodeValue()
     {
         return OUString();
     }
diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx
index e14a5de4b908..5e44f14ac8f1 100644
--- a/unoxml/source/dom/element.hxx
+++ b/unoxml/source/dom/element.hxx
@@ -59,34 +59,29 @@ namespace DOM
         /**
         Retrieves an attribute value by name.
         */
-        virtual OUString  SAL_CALL getAttribute(const OUString& name)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString  SAL_CALL getAttribute(const OUString& name) override;
 
         /**
         Retrieves an attribute node by name.
         */
-        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNode(const OUString& name)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNode(const OUString& name) override;
 
         /**
         Retrieves an Attr node by local name and namespace URI.
         */
-        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNodeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL getAttributeNodeNS(const OUString& namespaceURI, const OUString& localName) override;
 
         /**
         Retrieves an attribute value by local name and namespace URI.
         */
-        virtual OUString SAL_CALL getAttributeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getAttributeNS(const OUString& namespaceURI, const OUString& localName) override;
 
         /**
         Returns a NodeList of all descendant Elements with a given tag name,
         in the order in which they are
         encountered in a preorder traversal of this Element tree.
         */
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& name)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagName(const OUString& name) override;
 
         /**
         Returns a NodeList of all the descendant Elements with a given local
@@ -94,188 +89,152 @@ namespace DOM
         a preorder traversal of this Element tree.
         */
         virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getElementsByTagNameNS(const OUString& namespaceURI,
-                const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+                const OUString& localName) override;
 
         /**
         The name of the element.
         */
-        virtual OUString SAL_CALL getTagName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTagName() override;
 
         /**
         Returns true when an attribute with a given name is specified on this
         element or has a default value, false otherwise.
         */
-        virtual sal_Bool SAL_CALL hasAttribute(const OUString& name)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasAttribute(const OUString& name) override;
 
         /**
         Returns true when an attribute with a given local name and namespace
         URI is specified on this element or has a default value, false otherwise.
         */
-        virtual sal_Bool SAL_CALL hasAttributeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasAttributeNS(const OUString& namespaceURI, const OUString& localName) override;
 
         /**
         Removes an attribute by name.
         */
-        virtual void SAL_CALL removeAttribute(const OUString& name)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL removeAttribute(const OUString& name) override;
 
         /**
         Removes the specified attribute node.
         */
-        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL removeAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& oldAttr)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL removeAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& oldAttr) override;
 
         /**
         Removes an attribute by local name and namespace URI.
         */
-        virtual void SAL_CALL removeAttributeNS(const OUString& namespaceURI, const OUString& localName)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL removeAttributeNS(const OUString& namespaceURI, const OUString& localName) override;
 
         /**
         Adds a new attribute.
         */
-        virtual void SAL_CALL setAttribute(const OUString& name, const OUString& value)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL setAttribute(const OUString& name, const OUString& value) override;
 
         /**
         Adds a new attribute node.
         */
-        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& newAttr)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNode(const css::uno::Reference< css::xml::dom::XAttr >& newAttr) override;
 
         /**
         Adds a new attribute.
         */
-        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNodeNS(const css::uno::Reference< css::xml::dom::XAttr >& newAttr)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XAttr > SAL_CALL setAttributeNodeNS(const css::uno::Reference< css::xml::dom::XAttr >& newAttr) override;
 
         /**
         Adds a new attribute.
         */
         virtual void SAL_CALL setAttributeNS(
-                const OUString& namespaceURI, const OUString& qualifiedName, const OUString& value)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+                const OUString& namespaceURI, const OUString& qualifiedName, const OUString& value) override;
 
         // overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override;
+        virtual OUString SAL_CALL getLocalName() override;
 
         // resolve uno inheritance problems...
         // --- delegation for XNode base.
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
         {
             return CNode::appendChild(newChild);
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
         {
             return CNode::cloneNode(deep);
         }
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
         {
             return CNode::getChildNodes();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
         {
             return CNode::getFirstChild();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
         {
             return CNode::getLastChild();
         }
-        virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getNamespaceURI() override
         {
             return CNode::getNamespaceURI();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
         {
             return CNode::getNextSibling();
         }
-        virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
         {
             return CNode::getNodeType();
         }
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
         {
             return CNode::getOwnerDocument();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
         {
             return CNode::getParentNode();
         }
-        virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getPrefix() override
         {
             return CNode::getPrefix();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
         {
             return CNode::getPreviousSibling();
         }
-        virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasAttributes() override
         {
             return CNode::hasAttributes();
         }
-        virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasChildNodes() override
         {
             return CNode::hasChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
         {
             return CNode::insertBefore(newChild, refChild);
         }
-        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
         {
             return CNode::isSupported(feature, ver);
         }
-        virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL normalize() override
         {
             CNode::normalize();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
         {
             return CNode::removeChild(oldChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
         {
             return CNode::replaceChild(newChild, oldChild);
         }
-        virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
         {
             return CNode::setNodeValue(nodeValue);
         }
-        virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setPrefix(const OUString& prefix) override
         {
             return CNode::setPrefix(prefix);
         }
diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx
index c851faf426b3..fad086a3b604 100644
--- a/unoxml/source/dom/elementlist.cxx
+++ b/unoxml/source/dom/elementlist.cxx
@@ -44,8 +44,7 @@ namespace
         {
         }
 
-        virtual void SAL_CALL handleEvent(const css::uno::Reference<css::xml::dom::events::XEvent>& rEvent)
-            throw(css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL handleEvent(const css::uno::Reference<css::xml::dom::events::XEvent>& rEvent) override
         {
             css::uno::Reference<css::xml::dom::events::XEventListener> xOwner(mxOwner.get(),
                 css::uno::UNO_QUERY);
@@ -155,7 +154,7 @@ namespace DOM
     /**
     The number of nodes in the list.
     */
-    sal_Int32 SAL_CALL CElementListImpl::getLength() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CElementListImpl::getLength()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -169,7 +168,6 @@ namespace DOM
     Returns the indexth item in the collection.
     */
     Reference< XNode > SAL_CALL CElementListImpl::item(sal_Int32 index)
-        throw (RuntimeException, std::exception)
     {
         if (index < 0) throw RuntimeException();
 
@@ -188,7 +186,6 @@ namespace DOM
 
     // tree mutations can change the list
     void SAL_CALL CElementListImpl::handleEvent(Reference< XEvent > const&)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx
index d6ce1353019a..3f44d05a0253 100644
--- a/unoxml/source/dom/elementlist.hxx
+++ b/unoxml/source/dom/elementlist.hxx
@@ -75,16 +75,14 @@ namespace DOM
         /**
         The number of nodes in the list.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getLength() override;
         /**
         Returns the indexth item in the collection.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override;
 
         // XEventListener
-        virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt) override;
     };
 
     class CElementList
@@ -101,22 +99,20 @@ namespace DOM
         /**
         The number of nodes in the list.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Int32 SAL_CALL getLength() override
         {
             return m_xImpl->getLength();
         }
         /**
         Returns the indexth item in the collection.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override
         {
             return m_xImpl->item(index);
         }
 
         // XEventListener
-        virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL handleEvent(const css::uno::Reference< css::xml::dom::events::XEvent >& evt) override
         {
             m_xImpl->handleEvent(evt);
         }
diff --git a/unoxml/source/dom/entitiesmap.cxx b/unoxml/source/dom/entitiesmap.cxx
index a281fa1b07ce..c75b70d9e853 100644
--- a/unoxml/source/dom/entitiesmap.cxx
+++ b/unoxml/source/dom/entitiesmap.cxx
@@ -35,7 +35,7 @@ namespace DOM
     /**
     The number of nodes in this map.
     */
-    sal_Int32 SAL_CALL CEntitiesMap::getLength() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CEntitiesMap::getLength()
     {
         OSL_ENSURE(false,
             "CEntitiesMap::getLength: not implemented (#i113683#)");
@@ -46,7 +46,7 @@ namespace DOM
     Retrieves a node specified by local name
     */
     Reference< XNode > SAL_CALL
-    CEntitiesMap::getNamedItem(OUString const& /*name*/) throw (RuntimeException, std::exception)
+    CEntitiesMap::getNamedItem(OUString const& /*name*/)
     {
         OSL_ENSURE(false,
             "CEntitiesMap::getNamedItem: not implemented (#i113683#)");
@@ -59,7 +59,6 @@ namespace DOM
     Reference< XNode > SAL_CALL
     CEntitiesMap::getNamedItemNS(
         OUString const& /*namespaceURI*/, OUString const& /*localName*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CEntitiesMap::getNamedItemNS: not implemented (#i113683#)");
@@ -70,7 +69,7 @@ namespace DOM
     Returns the indexth item in the map.
     */
     Reference< XNode > SAL_CALL
-    CEntitiesMap::item(sal_Int32 /*index*/) throw (RuntimeException, std::exception)
+    CEntitiesMap::item(sal_Int32 /*index*/)
     {
         OSL_ENSURE(false, "CEntitiesMap::item: not implemented (#i113683#)");
         return Reference< XNode >();
@@ -81,7 +80,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CEntitiesMap::removeNamedItem(OUString const& /*name*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CEntitiesMap::removeNamedItem: not implemented (#i113683#)");
@@ -94,7 +92,6 @@ namespace DOM
     Reference< XNode > SAL_CALL
     CEntitiesMap::removeNamedItemNS(
         OUString const& /*namespaceURI*/, OUString const& /*localName*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CEntitiesMap::removeNamedItemNS: not implemented (#i113683#)");
@@ -106,7 +103,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CEntitiesMap::setNamedItem(Reference< XNode > const& /*arg*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CEntitiesMap::setNamedItem: not implemented (#i113683#)");
@@ -118,7 +114,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CEntitiesMap::setNamedItemNS(Reference< XNode > const& /*arg*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CEntitiesMap::setNamedItemNS: not implemented (#i113683#)");
diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx
index b358ae6795a7..af3ad4218aee 100644
--- a/unoxml/source/dom/entitiesmap.hxx
+++ b/unoxml/source/dom/entitiesmap.hxx
@@ -42,53 +42,49 @@ namespace DOM
         /**
         The number of nodes in this map.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getLength() override;
 
         /**
         Retrieves a node specified by local name
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            getNamedItem(const OUString& name) throw (css::uno::RuntimeException, std::exception) override;
+            getNamedItem(const OUString& name) override;
 
         /**
         Retrieves a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItemNS(
-                OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+                OUString const& namespaceURI, OUString const& localName) override;
 
         /**
         Returns the indexth item in the map.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            item(sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override;
+            item(sal_Int32 index) override;
 
         /**
         Removes a node specified by name.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            removeNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) override;
+            removeNamedItem(OUString const& name) override;
 
         /**
         // Removes a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeNamedItemNS(
-                OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+                OUString const& namespaceURI, OUString const& localName) override;
 
         /**
         // Adds a node using its nodeName attribute.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::uno::RuntimeException, std::exception) override;
+            setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg) override;
 
         /**
         Adds a node using its namespaceURI and localName.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::uno::RuntimeException, std::exception) override;
+            setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg) override;
     };
 }
 
diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx
index 7ce7817319db..87d0f9c74efb 100644
--- a/unoxml/source/dom/entity.cxx
+++ b/unoxml/source/dom/entity.cxx
@@ -55,7 +55,7 @@ namespace DOM
     /**
     For unparsed entities, the name of the notation for the entity.
     */
-    OUString SAL_CALL CEntity::getNotationName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CEntity::getNotationName()
     {
         OSL_ENSURE(false,
                 "CEntity::getNotationName: not implemented (#i113683#)");
@@ -65,7 +65,7 @@ namespace DOM
     /**
     The public identifier associated with the entity, if specified.
     */
-    OUString SAL_CALL CEntity::getPublicId() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CEntity::getPublicId()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -80,7 +80,7 @@ namespace DOM
     /**
     The system identifier associated with the entity, if specified.
     */
-    OUString SAL_CALL CEntity::getSystemId() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CEntity::getSystemId()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -91,7 +91,7 @@ namespace DOM
         }
         return aID;
     }
-    OUString SAL_CALL CEntity::getNodeName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CEntity::getNodeName()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -103,7 +103,7 @@ namespace DOM
         }
         return aName;
     }
-    OUString SAL_CALL CEntity::getNodeValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CEntity::getNodeValue()
     {
         return OUString();
     }
diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx
index 3bcc94408f87..51c10ce00005 100644
--- a/unoxml/source/dom/entity.hxx
+++ b/unoxml/source/dom/entity.hxx
@@ -54,139 +54,114 @@ namespace DOM
         /**
         For unparsed entities, the name of the notation for the entity.
         */
-        virtual OUString SAL_CALL getNotationName() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNotationName() override;
 
         /**
         The public identifier associated with the entity, if specified.
         */
-        virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getPublicId() override;
 
         /**
         The system identifier associated with the entity, if specified.
         */
-        virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getSystemId() override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
     // --- delegation for XNode base.
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
     {
         return CNode::appendChild(newChild);
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
     {
         return CNode::cloneNode(deep);
     }
-    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
     {
         return CNode::getAttributes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
     {
         return CNode::getChildNodes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
     {
         return CNode::getFirstChild();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
     {
         return CNode::getLastChild();
     }
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLocalName() override
     {
         return CNode::getLocalName();
     }
-    virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getNamespaceURI() override
     {
         return CNode::getNamespaceURI();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
     {
         return CNode::getNextSibling();
     }
-    virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
     {
         return CNode::getNodeType();
     }
-    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
     {
         return CNode::getOwnerDocument();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
     {
         return CNode::getParentNode();
     }
-    virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPrefix() override
     {
         return CNode::getPrefix();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
     {
         return CNode::getPreviousSibling();
     }
-    virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAttributes() override
     {
         return CNode::hasAttributes();
     }
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
-    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
     {
         return CNode::isSupported(feature, ver);
     }
-    virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL normalize() override
     {
         CNode::normalize();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
-    virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
     {
         return CNode::setNodeValue(nodeValue);
     }
-    virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setPrefix(const OUString& prefix) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/entityreference.cxx b/unoxml/source/dom/entityreference.cxx
index 6d62e69d576c..f4955aeba88b 100644
--- a/unoxml/source/dom/entityreference.cxx
+++ b/unoxml/source/dom/entityreference.cxx
@@ -49,7 +49,7 @@ namespace DOM
         }
     }
 
-    OUString SAL_CALL CEntityReference::getNodeName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CEntityReference::getNodeName()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -62,7 +62,7 @@ namespace DOM
         return aName;
     }
 
-    OUString SAL_CALL CEntityReference::getNodeValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CEntityReference::getNodeValue()
     {
         return OUString();
     }
diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx
index 1ce5c3648559..711818d7e948 100644
--- a/unoxml/source/dom/entityreference.hxx
+++ b/unoxml/source/dom/entityreference.hxx
@@ -49,125 +49,100 @@ namespace DOM
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
     // --- delegation for XNode base.
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
     {
         return CNode::appendChild(newChild);
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
     {
         return CNode::cloneNode(deep);
     }
-    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
     {
         return CNode::getAttributes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
     {
         return CNode::getChildNodes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
     {
         return CNode::getFirstChild();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
     {
         return CNode::getLastChild();
     }
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLocalName() override
     {
         return CNode::getLocalName();
     }
-    virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getNamespaceURI() override
     {
         return CNode::getNamespaceURI();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
     {
         return CNode::getNextSibling();
     }
-    virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
     {
         return CNode::getNodeType();
     }
-    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
     {
         return CNode::getOwnerDocument();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
     {
         return CNode::getParentNode();
     }
-    virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPrefix() override
     {
         return CNode::getPrefix();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
     {
         return CNode::getPreviousSibling();
     }
-    virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAttributes() override
     {
         return CNode::hasAttributes();
     }
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
-    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
     {
         return CNode::isSupported(feature, ver);
     }
-    virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL normalize() override
     {
         CNode::normalize();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
-    virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
     {
         return CNode::setNodeValue(nodeValue);
     }
-    virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setPrefix(const OUString& prefix) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index 3617d1f45d5d..2d191b5cd997 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -285,7 +285,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL CNode::appendChild(
             Reference< XNode > const& xNewChild)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::ClearableMutexGuard guard(m_rMutex);
 
@@ -387,7 +386,6 @@ namespace DOM
     constructor for nodes.
     */
     Reference< XNode > SAL_CALL CNode::cloneNode(sal_Bool bDeep)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -406,7 +404,6 @@ namespace DOM
     or null otherwise.
     */
     Reference< XNamedNodeMap > SAL_CALL CNode::getAttributes()
-        throw (RuntimeException, std::exception)
     {
         // return empty reference; only element node may override this impl
         return Reference< XNamedNodeMap>();
@@ -416,7 +413,6 @@ namespace DOM
     A NodeList that contains all children of this node.
     */
     Reference< XNodeList > SAL_CALL CNode::getChildNodes()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -431,7 +427,6 @@ namespace DOM
     The first child of this node.
     */
     Reference< XNode > SAL_CALL CNode::getFirstChild()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -447,7 +442,6 @@ namespace DOM
     The last child of this node.
     */
     Reference< XNode > SAL_CALL CNode::getLastChild()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -463,7 +457,6 @@ namespace DOM
     Returns the local part of the qualified name of this node.
     */
     OUString SAL_CALL CNode::getLocalName()
-        throw (RuntimeException, std::exception)
     {
         // see CElement/CAttr
         return OUString();
@@ -474,7 +467,6 @@ namespace DOM
     The namespace URI of this node, or null if it is unspecified.
     */
     OUString SAL_CALL CNode::getNamespaceURI()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -493,7 +485,6 @@ namespace DOM
     The node immediately following this node.
     */
     Reference< XNode > SAL_CALL CNode::getNextSibling()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -509,7 +500,6 @@ namespace DOM
     The name of this node, depending on its type; see the table above.
     */
     OUString SAL_CALL CNode::getNodeName()
-        throw (RuntimeException, std::exception)
     {
         /*
         Interface        nodeName               nodeValue                       attributes
@@ -537,7 +527,6 @@ namespace DOM
     A code representing the type of the underlying object, as defined above.
     */
     NodeType SAL_CALL CNode::getNodeType()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -548,7 +537,6 @@ namespace DOM
     The value of this node, depending on its type; see the table above.
     */
     OUString SAL_CALL CNode::getNodeValue()
-        throw (RuntimeException, std::exception)
     {
         OUString aValue;
         return aValue;
@@ -558,7 +546,6 @@ namespace DOM
     The Document object associated with this node.
     */
     Reference< XDocument > SAL_CALL CNode::getOwnerDocument()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -573,7 +560,6 @@ namespace DOM
     The parent of this node.
     */
     Reference< XNode > SAL_CALL CNode::getParentNode()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -589,7 +575,6 @@ namespace DOM
     The namespace prefix of this node, or null if it is unspecified.
     */
     OUString SAL_CALL CNode::getPrefix()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -610,7 +595,6 @@ namespace DOM
     The node immediately preceding this node.
     */
     Reference< XNode > SAL_CALL CNode::getPreviousSibling()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -626,7 +610,6 @@ namespace DOM
     Returns whether this node (if it is an element) has any attributes.
     */
     sal_Bool SAL_CALL CNode::hasAttributes()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -637,7 +620,6 @@ namespace DOM
     Returns whether this node has any children.
     */
     sal_Bool SAL_CALL CNode::hasChildNodes()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -649,7 +631,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL CNode::insertBefore(
             const Reference< XNode >& newChild, const Reference< XNode >& refChild)
-        throw (RuntimeException, DOMException, std::exception)
     {
         if (!newChild.is() || !refChild.is()) { throw RuntimeException(); }
 
@@ -728,7 +709,6 @@ namespace DOM
     that feature is supported by this node.
     */
   sal_Bool SAL_CALL CNode::isSupported(const OUString& /*feature*/, const OUString& /*ver*/)
-        throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false, "CNode::isSupported: not implemented (#i113683#)");
         return false;
@@ -742,7 +722,6 @@ namespace DOM
     Text nodes nor empty Text nodes.
     */
     void SAL_CALL CNode::normalize()
-        throw (RuntimeException, std::exception)
     {
         //XXX combine adjacent text nodes and remove empty ones
         OSL_ENSURE(false, "CNode::normalize: not implemented (#i113683#)");
@@ -754,7 +733,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CNode::removeChild(const Reference< XNode >& xOldChild)
-        throw (RuntimeException, DOMException, std::exception)
     {
         if (!xOldChild.is()) {
             throw RuntimeException();
@@ -830,7 +808,6 @@ namespace DOM
     Reference< XNode > SAL_CALL CNode::replaceChild(
             Reference< XNode > const& xNewChild,
             Reference< XNode > const& xOldChild)
-        throw (RuntimeException, DOMException, std::exception)
     {
         if (!xOldChild.is() || !xNewChild.is()) {
             throw RuntimeException();
@@ -948,7 +925,6 @@ namespace DOM
     The value of this node, depending on its type; see the table above.
     */
     void SAL_CALL CNode::setNodeValue(const OUString& /*nodeValue*/)
-        throw (RuntimeException, DOMException, std::exception)
     {
         // use specific node implementation
         // if we end up down here, something went wrong
@@ -961,7 +937,6 @@ namespace DOM
     The namespace prefix of this node, or null if it is unspecified.
     */
     void SAL_CALL CNode::setPrefix(const OUString& prefix)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -987,7 +962,6 @@ namespace DOM
     void SAL_CALL CNode::addEventListener(const OUString& eventType,
         const Reference< css::xml::dom::events::XEventListener >& listener,
         sal_Bool useCapture)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -999,7 +973,6 @@ namespace DOM
     void SAL_CALL CNode::removeEventListener(const OUString& eventType,
         const Reference< css::xml::dom::events::XEventListener >& listener,
         sal_Bool useCapture)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -1009,7 +982,6 @@ namespace DOM
     }
 
     sal_Bool SAL_CALL CNode::dispatchEvent(const Reference< XEvent >& evt)
-        throw(RuntimeException, EventException, std::exception)
     {
         CDocument * pDocument;
         events::CEventDispatcher * pDispatcher;
@@ -1028,7 +1000,6 @@ namespace DOM
 
     ::sal_Int64 SAL_CALL
     CNode::getSomething(Sequence< ::sal_Int8 > const& rId)
-        throw (RuntimeException, std::exception)
     {
         if ((rId.getLength() == 16) &&
             (0 == memcmp(theCNodeUnoTunnelId::get().getSeq().getConstArray(),
diff --git a/unoxml/source/dom/notation.cxx b/unoxml/source/dom/notation.cxx
index 2fa8e3f6f71b..f3a137b3c712 100644
--- a/unoxml/source/dom/notation.cxx
+++ b/unoxml/source/dom/notation.cxx
@@ -35,7 +35,7 @@ namespace DOM
     {
     }
 
-    OUString SAL_CALL CNotation::getPublicId() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CNotation::getPublicId()
     {
         OSL_ENSURE(false,
             "CNotation::getPublicId: not implemented (#i113683#)");
@@ -45,7 +45,7 @@ namespace DOM
     /**
     The system identifier of this notation.
     */
-    OUString SAL_CALL CNotation::getSystemId() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CNotation::getSystemId()
     {
         OSL_ENSURE(false,
             "CNotation::getSystemId: not implemented (#i113683#)");
@@ -53,7 +53,7 @@ namespace DOM
     }
 
 
-    OUString SAL_CALL CNotation::getNodeName()throw (RuntimeException, std::exception)
+    OUString SAL_CALL CNotation::getNodeName()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -66,7 +66,7 @@ namespace DOM
         return aName;
     }
 
-    OUString SAL_CALL CNotation::getNodeValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CNotation::getNodeValue()
     {
         return OUString();
     }
diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx
index 434b1b8d486c..099905acf3ac 100644
--- a/unoxml/source/dom/notation.hxx
+++ b/unoxml/source/dom/notation.hxx
@@ -45,134 +45,109 @@ namespace DOM
         /**
         The public identifier of this notation.
         */
-        virtual OUString SAL_CALL getPublicId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getPublicId() override;
 
         /**
         The system identifier of this notation.
         */
-        virtual OUString SAL_CALL getSystemId() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getSystemId() override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
     // --- delegation for XNode base.
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
     {
         return CNode::appendChild(newChild);
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
     {
         return CNode::cloneNode(deep);
     }
-    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
     {
         return CNode::getAttributes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
     {
         return CNode::getChildNodes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
     {
         return CNode::getFirstChild();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
     {
         return CNode::getLastChild();
     }
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLocalName() override
     {
         return CNode::getLocalName();
     }
-    virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getNamespaceURI() override
     {
         return CNode::getNamespaceURI();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
     {
         return CNode::getNextSibling();
     }
-    virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
     {
         return CNode::getNodeType();
     }
-    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
     {
         return CNode::getOwnerDocument();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
     {
         return CNode::getParentNode();
     }
-    virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPrefix() override
     {
         return CNode::getPrefix();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
     {
         return CNode::getPreviousSibling();
     }
-    virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAttributes() override
     {
         return CNode::hasAttributes();
     }
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
-    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
     {
         return CNode::isSupported(feature, ver);
     }
-    virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL normalize() override
     {
         CNode::normalize();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
-    virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
     {
         return CNode::setNodeValue(nodeValue);
     }
-    virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setPrefix(const OUString& prefix) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/notationsmap.cxx b/unoxml/source/dom/notationsmap.cxx
index d2fc182cab8a..30bb0e456d25 100644
--- a/unoxml/source/dom/notationsmap.cxx
+++ b/unoxml/source/dom/notationsmap.cxx
@@ -35,7 +35,7 @@ namespace DOM
     /**
     The number of nodes in this map.
     */
-    sal_Int32 SAL_CALL CNotationsMap::getLength() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CNotationsMap::getLength()
     {
         OSL_ENSURE(false,
             "CNotationsMap::getLength: not implemented (#i113683#)");
@@ -47,7 +47,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CNotationsMap::getNamedItem(OUString const& /*name*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CNotationsMap::getNamedItem: not implemented (#i113683#)");
@@ -60,7 +59,6 @@ namespace DOM
     Reference< XNode > SAL_CALL
     CNotationsMap::getNamedItemNS(
         OUString const& /*namespaceURI*/, OUString const& /*localName*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CNotationsMap::getNamedItemNS: not implemented (#i113683#)");
@@ -71,7 +69,7 @@ namespace DOM
     Returns the indexth item in the map.
     */
     Reference< XNode > SAL_CALL
-    CNotationsMap::item(sal_Int32 /*index*/) throw (RuntimeException, std::exception)
+    CNotationsMap::item(sal_Int32 /*index*/)
     {
         OSL_ENSURE(false, "CNotationsMap::item: not implemented (#i113683#)");
         return Reference< XNode >();
@@ -82,7 +80,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CNotationsMap::removeNamedItem(OUString const& /*name*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CNotationsMap::removeNamedItem: not implemented (#i113683#)");
@@ -95,7 +92,6 @@ namespace DOM
     Reference< XNode > SAL_CALL
     CNotationsMap::removeNamedItemNS(
         OUString const& /*namespaceURI*/, OUString const& /*localName*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CNotationsMap::removeNamedItemNS: not implemented (#i113683#)");
@@ -107,7 +103,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CNotationsMap::setNamedItem(Reference< XNode > const& /*arg*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CNotationsMap::setNamedItem: not implemented (#i113683#)");
@@ -119,7 +114,6 @@ namespace DOM
     */
     Reference< XNode > SAL_CALL
     CNotationsMap::setNamedItemNS(Reference< XNode > const& /*arg*/)
-    throw (RuntimeException, std::exception)
     {
         OSL_ENSURE(false,
             "CNotationsMap::setNamedItemNS: not implemented (#i113683#)");
diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx
index a68452e44fd8..daabc9f7f70e 100644
--- a/unoxml/source/dom/notationsmap.hxx
+++ b/unoxml/source/dom/notationsmap.hxx
@@ -42,53 +42,49 @@ namespace DOM
         /**
         The number of nodes in this map.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getLength() override;
 
         /**
         Retrieves a node specified by local name
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            getNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) override;
+            getNamedItem(OUString const& name) override;
 
         /**
         Retrieves a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNamedItemNS(
-                OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+                OUString const& namespaceURI, OUString const& localName) override;
 
         /**
         Returns the indexth item in the map.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            item(sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override;
+            item(sal_Int32 index) override;
 
         /**
         Removes a node specified by name.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            removeNamedItem(OUString const& name) throw (css::uno::RuntimeException, std::exception) override;
+            removeNamedItem(OUString const& name) override;
 
         /**
         // Removes a node specified by local name and namespace URI.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeNamedItemNS(
-                OUString const& namespaceURI, OUString const& localName)
-            throw (css::uno::RuntimeException, std::exception) override;
+                OUString const& namespaceURI, OUString const& localName) override;
 
         /**
         // Adds a node using its nodeName attribute.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::uno::RuntimeException, std::exception) override;
+            setNamedItem(css::uno::Reference< css::xml::dom::XNode > const& arg) override;
 
         /**
         Adds a node using its namespaceURI and localName.
         */
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL
-            setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg)
-            throw (css::uno::RuntimeException, std::exception) override;
+            setNamedItemNS(css::uno::Reference< css::xml::dom::XNode > const& arg) override;
     };
 }
 
diff --git a/unoxml/source/dom/processinginstruction.cxx b/unoxml/source/dom/processinginstruction.cxx
index 1cda0809808f..70f492ae4e4d 100644
--- a/unoxml/source/dom/processinginstruction.cxx
+++ b/unoxml/source/dom/processinginstruction.cxx
@@ -50,7 +50,7 @@ namespace DOM
     The content of this processing instruction.
     */
     OUString SAL_CALL
-    CProcessingInstruction::getData() throw (RuntimeException, std::exception)
+    CProcessingInstruction::getData()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -71,7 +71,7 @@ namespace DOM
     The target of this processing instruction.
     */
     OUString SAL_CALL
-    CProcessingInstruction::getTarget() throw (RuntimeException, std::exception)
+    CProcessingInstruction::getTarget()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -92,7 +92,6 @@ namespace DOM
     The content of this processing instruction.
     */
     void SAL_CALL CProcessingInstruction::setData(OUString const& rData)
-        throw (RuntimeException, DOMException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -109,7 +108,7 @@ namespace DOM
     }
 
     OUString SAL_CALL
-    CProcessingInstruction::getNodeName() throw (RuntimeException, std::exception)
+    CProcessingInstruction::getNodeName()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -124,14 +123,12 @@ namespace DOM
     }
 
     OUString SAL_CALL CProcessingInstruction::getNodeValue()
-        throw (RuntimeException, std::exception)
     {
         return getData();
     }
 
     void SAL_CALL
     CProcessingInstruction::setNodeValue(OUString const& rNodeValue)
-        throw (RuntimeException, DOMException, std::exception)
     {
         return setData(rNodeValue);
     }
diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx
index 212bbfd7ae11..0920edec47ba 100644
--- a/unoxml/source/dom/processinginstruction.hxx
+++ b/unoxml/source/dom/processinginstruction.hxx
@@ -51,137 +51,112 @@ namespace DOM
         /**
         The content of this processing instruction.
         */
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getData() override;
 
         /**
         The target of this processing instruction.
         */
-        virtual OUString SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTarget() override;
 
         /**
         The content of this processing instruction.
         */
-        virtual void SAL_CALL setData(const OUString& data) throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual void SAL_CALL setData(const OUString& data) override;
 
         // ---- resolve uno inheritance problems...
         // overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNodeValue()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setNodeValue(OUString const& rNodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
+        virtual OUString SAL_CALL getNodeValue() override;
+        virtual void SAL_CALL setNodeValue(OUString const& rNodeValue) override;
 
     // --- delegation for XNode base.
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
     {
         return CNode::appendChild(newChild);
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
     {
         return CNode::cloneNode(deep);
     }
-    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
     {
         return CNode::getAttributes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
     {
         return CNode::getChildNodes();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
     {
         return CNode::getFirstChild();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
     {
         return CNode::getLastChild();
     }
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLocalName() override
     {
         return CNode::getLocalName();
     }
-    virtual OUString SAL_CALL getNamespaceURI()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getNamespaceURI() override
     {
         return CNode::getNamespaceURI();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
     {
         return CNode::getNextSibling();
     }
-    virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
     {
         return CNode::getNodeType();
     }
-    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
     {
         return CNode::getOwnerDocument();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
     {
         return CNode::getParentNode();
     }
-    virtual OUString SAL_CALL getPrefix()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPrefix() override
     {
         return CNode::getPrefix();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
     {
         return CNode::getPreviousSibling();
     }
-    virtual sal_Bool SAL_CALL hasAttributes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasAttributes() override
     {
         return CNode::hasAttributes();
     }
-    virtual sal_Bool SAL_CALL hasChildNodes()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasChildNodes() override
     {
         return CNode::hasChildNodes();
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
     {
         return CNode::insertBefore(newChild, refChild);
     }
-    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
     {
         return CNode::isSupported(feature, ver);
     }
-    virtual void SAL_CALL normalize()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL normalize() override
     {
         CNode::normalize();
     }
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::removeChild(oldChild);
     }
     virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+            const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
     {
         return CNode::replaceChild(newChild, oldChild);
     }
-    virtual void SAL_CALL setPrefix(const OUString& prefix)
-        throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+    virtual void SAL_CALL setPrefix(const OUString& prefix) override
     {
         return CNode::setPrefix(prefix);
     }
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 786f3700b9f0..4bbd27176046 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -64,25 +64,21 @@ namespace DOM
     }
 
     Sequence< OUString > SAL_CALL CSAXDocumentBuilder::getSupportedServiceNames()
-        throw (RuntimeException, std::exception)
     {
         return CSAXDocumentBuilder::_getSupportedServiceNames();
     }
 
     OUString SAL_CALL CSAXDocumentBuilder::getImplementationName()
-        throw (RuntimeException, std::exception)
     {
         return CSAXDocumentBuilder::_getImplementationName();
     }
 
     sal_Bool SAL_CALL CSAXDocumentBuilder::supportsService(const OUString& aServiceName)
-        throw (RuntimeException, std::exception)
     {
         return cppu::supportsService(this, aServiceName);
     }
 
     SAXDocumentBuilderState SAL_CALL CSAXDocumentBuilder::getState()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -90,7 +86,6 @@ namespace DOM
     }
 
     void SAL_CALL CSAXDocumentBuilder::reset()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -102,7 +97,6 @@ namespace DOM
     }
 
     Reference< XDocument > SAL_CALL CSAXDocumentBuilder::getDocument()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -113,7 +107,6 @@ namespace DOM
     }
 
     Reference< XDocumentFragment > SAL_CALL CSAXDocumentBuilder::getDocumentFragment()
-         throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -123,7 +116,6 @@ namespace DOM
     }
 
     void SAL_CALL CSAXDocumentBuilder::startDocumentFragment(const Reference< XDocument >& ownerDoc)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -140,7 +132,6 @@ namespace DOM
     }
 
     void SAL_CALL CSAXDocumentBuilder::endDocumentFragment()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -157,7 +148,7 @@ namespace DOM
 
     // document handler
 
-    void SAL_CALL  CSAXDocumentBuilder::startDocument() throw (RuntimeException, SAXException, std::exception)
+    void SAL_CALL  CSAXDocumentBuilder::startDocument()
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -173,7 +164,7 @@ namespace DOM
         m_aState = SAXDocumentBuilderState_BUILDING_DOCUMENT;
     }
 
-    void SAL_CALL CSAXDocumentBuilder::endDocument() throw (RuntimeException, SAXException, std::exception)
+    void SAL_CALL CSAXDocumentBuilder::endDocument()
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -189,7 +180,6 @@ namespace DOM
     }
 
     void SAL_CALL CSAXDocumentBuilder::startElement(const OUString& aName, const Reference< XAttributeList>& attribs)
-        throw (RuntimeException, SAXException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -290,7 +280,6 @@ namespace DOM
     }
 
     void SAL_CALL CSAXDocumentBuilder::endElement(const OUString& aName)
-        throw (RuntimeException, SAXException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -319,7 +308,6 @@ namespace DOM
     }
 
     void SAL_CALL CSAXDocumentBuilder::characters(const OUString& aChars)
-        throw (RuntimeException, SAXException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -333,7 +321,6 @@ namespace DOM
     }
 
     void SAL_CALL CSAXDocumentBuilder::ignorableWhitespace(const OUString& )
-        throw (RuntimeException, SAXException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -344,7 +331,6 @@ namespace DOM
     }
 
     void SAL_CALL CSAXDocumentBuilder::processingInstruction(const OUString& aTarget, const OUString& aData)
-        throw (RuntimeException, SAXException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
@@ -359,7 +345,6 @@ namespace DOM
     }
 
     void SAL_CALL CSAXDocumentBuilder::setDocumentLocator(const Reference< XLocator >& aLocator)
-        throw (RuntimeException, SAXException, std::exception)
     {
         ::osl::MutexGuard g(m_Mutex);
 
diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx
index ad3e7ce4dca6..0caf53ea4faf 100644
--- a/unoxml/source/dom/saxbuilder.hxx
+++ b/unoxml/source/dom/saxbuilder.hxx
@@ -77,47 +77,30 @@ namespace DOM
         explicit CSAXDocumentBuilder(const css::uno::Reference< css::lang::XMultiServiceFactory >& mgr);
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames () override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
-        virtual void SAL_CALL endDocument()
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+        virtual void SAL_CALL startDocument() override;
+        virtual void SAL_CALL endDocument() override;
         virtual void SAL_CALL startElement( const OUString& aName,
-             const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
-        virtual void SAL_CALL endElement( const OUString& aName )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
-        virtual void SAL_CALL characters( const OUString& aChars )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
-        virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+             const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
+        virtual void SAL_CALL endElement( const OUString& aName ) override;
+        virtual void SAL_CALL characters( const OUString& aChars ) override;
+        virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
         virtual void SAL_CALL processingInstruction( const OUString& aTarget,
-             const OUString& aData )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
-        virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-            throw( css::uno::RuntimeException, css::xml::sax::SAXException, std::exception ) override;
+             const OUString& aData ) override;
+        virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 
 
         // XSAXDocumentBuilder
-        virtual css::xml::dom::SAXDocumentBuilderState SAL_CALL getState()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL reset()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getDocument()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL getDocumentFragment()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL startDocumentFragment(const css::uno::Reference< css::xml::dom::XDocument >& ownerDoc)
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endDocumentFragment()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::xml::dom::SAXDocumentBuilderState SAL_CALL getState() override;
+        virtual void SAL_CALL reset() override;
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getDocument() override;
+        virtual css::uno::Reference< css::xml::dom::XDocumentFragment > SAL_CALL getDocumentFragment() override;
+        virtual void SAL_CALL startDocumentFragment(const css::uno::Reference< css::xml::dom::XDocument >& ownerDoc) override;
+        virtual void SAL_CALL endDocumentFragment() override;
 
 
     };
diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx
index cb0d5aaf6e20..030c16db238b 100644
--- a/unoxml/source/dom/text.cxx
+++ b/unoxml/source/dom/text.cxx
@@ -58,13 +58,12 @@ namespace DOM
         }
     }
 
-    OUString SAL_CALL CText::getNodeName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CText::getNodeName()
     {
         return OUString("#text");
     }
 
     Reference< XText > SAL_CALL CText::splitText(sal_Int32 /*offset*/)
-         throw (RuntimeException, std::exception)
     {
         OSL_FAIL("CText::splitText: not implemented (#i113683#)");
         return Reference< XText >(this);
diff --git a/unoxml/source/dom/text.hxx b/unoxml/source/dom/text.hxx
index 884f7d6d4eaa..8ef372981e32 100644
--- a/unoxml/source/dom/text.hxx
+++ b/unoxml/source/dom/text.hxx
@@ -56,175 +56,144 @@ namespace DOM
 
          // Breaks this node into two nodes at the specified offset, keeping
          // both in the tree as siblings.
-         virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset)
-             throw (css::uno::RuntimeException, std::exception) override;
+         virtual css::uno::Reference< css::xml::dom::XText > SAL_CALL splitText(sal_Int32 offset) override;
 
 
          // --- delegations for XCharacterData
-        virtual void SAL_CALL appendData(const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL appendData(const OUString& arg) override
         {
             CCharacterData::appendData(arg);
         }
-        virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL deleteData(sal_Int32 offset, sal_Int32 count) override
         {
             CCharacterData::deleteData(offset, count);
         }
-        virtual OUString SAL_CALL getData() throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getData() override
         {
             return CCharacterData::getData();
         }
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Int32 SAL_CALL getLength() override
         {
             return CCharacterData::getLength();
         }
-        virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL insertData(sal_Int32 offset, const OUString& arg) override
         {
             CCharacterData::insertData(offset, arg);
         }
-        virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL replaceData(sal_Int32 offset, sal_Int32 count, const OUString& arg) override
         {
             CCharacterData::replaceData(offset, count, arg);
         }
-        virtual void SAL_CALL setData(const OUString& data)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setData(const OUString& data) override
         {
             CCharacterData::setData(data);
         }
-        virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual OUString SAL_CALL subStringData(sal_Int32 offset, sal_Int32 count) override
         {
             return CCharacterData::subStringData(offset, count);
         }
 
 
          // --- overrides for XNode base
-        virtual OUString SAL_CALL getNodeName()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getNodeName() override;
 
         // --- resolve uno inheritance problems...
         // --- delegation for XNode base.
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL appendChild(const css::uno::Reference< css::xml::dom::XNode >& newChild) override
         {
             return CCharacterData::appendChild(newChild);
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL cloneNode(sal_Bool deep) override
         {
             return CCharacterData::cloneNode(deep);
         }
-        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNamedNodeMap > SAL_CALL getAttributes() override
         {
             return CCharacterData::getAttributes();
         }
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getChildNodes() override
         {
             return CCharacterData::getChildNodes();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getFirstChild() override
         {
             return CCharacterData::getFirstChild();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getLastChild() override
         {
             return CCharacterData::getLastChild();
         }
-        virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getLocalName() override
         {
             return CCharacterData::getLocalName();
         }
-        virtual OUString SAL_CALL getNamespaceURI()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getNamespaceURI() override
         {
             return CCharacterData::getNamespaceURI();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getNextSibling() override
         {
             return CCharacterData::getNextSibling();
         }
-        virtual css::xml::dom::NodeType SAL_CALL getNodeType()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::xml::dom::NodeType SAL_CALL getNodeType() override
         {
             return CCharacterData::getNodeType();
         }
-        virtual OUString SAL_CALL getNodeValue() throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getNodeValue() override
         {
             return CCharacterData::getNodeValue();
         }
-        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XDocument > SAL_CALL getOwnerDocument() override
         {
             return CCharacterData::getOwnerDocument();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getParentNode() override
         {
             return CCharacterData::getParentNode();
         }
-        virtual OUString SAL_CALL getPrefix()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual OUString SAL_CALL getPrefix() override
         {
             return CCharacterData::getPrefix();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getPreviousSibling() override
         {
             return CCharacterData::getPreviousSibling();
         }
-        virtual sal_Bool SAL_CALL hasAttributes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasAttributes() override
         {
             return CCharacterData::hasAttributes();
         }
-        virtual sal_Bool SAL_CALL hasChildNodes()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasChildNodes() override
         {
             return CCharacterData::hasChildNodes();
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL insertBefore(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& refChild) override
         {
             return CCharacterData::insertBefore(newChild, refChild);
         }
-        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL isSupported(const OUString& feature, const OUString& ver) override
         {
             return CCharacterData::isSupported(feature, ver);
         }
-        virtual void SAL_CALL normalize()
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL normalize() override
         {
             CCharacterData::normalize();
         }
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL removeChild(const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
         {
             return CCharacterData::removeChild(oldChild);
         }
         virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL replaceChild(
-                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+                const css::uno::Reference< css::xml::dom::XNode >& newChild, const css::uno::Reference< css::xml::dom::XNode >& oldChild) override
         {
             return CCharacterData::replaceChild(newChild, oldChild);
         }
-        virtual void SAL_CALL setNodeValue(const OUString& nodeValue)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setNodeValue(const OUString& nodeValue) override
         {
             return CCharacterData::setNodeValue(nodeValue);
         }
-        virtual void SAL_CALL setPrefix(const OUString& prefix)
-            throw (css::uno::RuntimeException, css::xml::dom::DOMException, std::exception) override
+        virtual void SAL_CALL setPrefix(const OUString& prefix) override
         {
             return CCharacterData::setPrefix(prefix);
         }
diff --git a/unoxml/source/events/event.cxx b/unoxml/source/events/event.cxx
index 39b2f850679b..ade1e56285db 100644
--- a/unoxml/source/events/event.cxx
+++ b/unoxml/source/events/event.cxx
@@ -37,64 +37,64 @@ namespace DOM { namespace events
     {
     }
 
-    OUString SAL_CALL CEvent::getType() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CEvent::getType()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_eventType;
     }
 
     Reference< XEventTarget > SAL_CALL
-    CEvent::getTarget() throw (RuntimeException, std::exception)
+    CEvent::getTarget()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_target;
     }
 
     Reference< XEventTarget > SAL_CALL
-    CEvent::getCurrentTarget() throw (RuntimeException, std::exception)
+    CEvent::getCurrentTarget()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_currentTarget;
     }
 
-    PhaseType SAL_CALL CEvent::getEventPhase() throw (RuntimeException, std::exception)
+    PhaseType SAL_CALL CEvent::getEventPhase()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_phase;
     }
 
-    sal_Bool SAL_CALL CEvent::getBubbles() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CEvent::getBubbles()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_bubbles;
     }
 
-    sal_Bool SAL_CALL CEvent::getCancelable() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CEvent::getCancelable()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_cancelable;
     }
 
     css::util::Time SAL_CALL
-    CEvent::getTimeStamp() throw (RuntimeException, std::exception)
+    CEvent::getTimeStamp()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_time;
     }
 
-    void SAL_CALL CEvent::stopPropagation() throw (RuntimeException, std::exception)
+    void SAL_CALL CEvent::stopPropagation()
     {
         ::osl::MutexGuard const g(m_Mutex);
         if (m_cancelable) { m_canceled = true; }
     }
 
-    void SAL_CALL CEvent::preventDefault() throw (RuntimeException, std::exception)
+    void SAL_CALL CEvent::preventDefault()
     {
     }
 
     void SAL_CALL
     CEvent::initEvent(OUString const& eventTypeArg, sal_Bool canBubbleArg,
-        sal_Bool cancelableArg) throw (RuntimeException, std::exception)
+        sal_Bool cancelableArg)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx
index e829ae496cfd..ed07d59f2639 100644
--- a/unoxml/source/events/event.hxx
+++ b/unoxml/source/events/event.hxx
@@ -53,19 +53,19 @@ public:
     explicit CEvent();
 
     virtual ~CEvent() override;
-    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getType() override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override;
+    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override;
+    virtual sal_Bool SAL_CALL getBubbles() override;
+    virtual sal_Bool SAL_CALL getCancelable() override;
+    virtual css::util::Time SAL_CALL getTimeStamp() override;
+    virtual void SAL_CALL stopPropagation() override;
+    virtual void SAL_CALL preventDefault() override;
     virtual void SAL_CALL initEvent(
         const OUString& eventTypeArg,
         sal_Bool canBubbleArg,
-        sal_Bool cancelableArg)  throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool cancelableArg) override;
 };
 }}
 #endif
diff --git a/unoxml/source/events/mouseevent.cxx b/unoxml/source/events/mouseevent.cxx
index b710d799e1b0..7b0c71cd17c4 100644
--- a/unoxml/source/events/mouseevent.cxx
+++ b/unoxml/source/events/mouseevent.cxx
@@ -39,52 +39,52 @@ namespace DOM { namespace events
     {
     }
 
-    sal_Int32 SAL_CALL CMouseEvent::getScreenX() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CMouseEvent::getScreenX()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_screenX;
     }
-    sal_Int32 SAL_CALL CMouseEvent::getScreenY() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CMouseEvent::getScreenY()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_screenY;
     }
-    sal_Int32 SAL_CALL CMouseEvent::getClientX() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CMouseEvent::getClientX()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_clientX;
     }
-    sal_Int32 SAL_CALL CMouseEvent::getClientY() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CMouseEvent::getClientY()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_clientY;
     }
-    sal_Bool SAL_CALL CMouseEvent::getCtrlKey() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CMouseEvent::getCtrlKey()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_ctrlKey;
     }
-    sal_Bool SAL_CALL CMouseEvent::getShiftKey() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CMouseEvent::getShiftKey()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_shiftKey;
     }
-    sal_Bool SAL_CALL CMouseEvent::getAltKey() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CMouseEvent::getAltKey()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_altKey;
     }
-    sal_Bool SAL_CALL CMouseEvent::getMetaKey() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CMouseEvent::getMetaKey()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_metaKey;
     }
-    sal_Int16 SAL_CALL CMouseEvent::getButton() throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL CMouseEvent::getButton()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_button;
     }
-    Reference< XEventTarget > SAL_CALL CMouseEvent::getRelatedTarget()  throw(RuntimeException, std::exception)
+    Reference< XEventTarget > SAL_CALL CMouseEvent::getRelatedTarget()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_relatedTarget;
@@ -106,7 +106,6 @@ namespace DOM { namespace events
                         sal_Bool metaKeyArg,
                         sal_Int16 buttonArg,
                         const Reference< XEventTarget >& /*relatedTargetArg*/)
-        throw(RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -123,12 +122,12 @@ namespace DOM { namespace events
     }
 
     // delegate to CUIEvent, since we are inheriting from CUIEvent and XUIEvent
-    Reference< XAbstractView > SAL_CALL CMouseEvent::getView() throw(RuntimeException, std::exception)
+    Reference< XAbstractView > SAL_CALL CMouseEvent::getView()
     {
         return CUIEvent::getView();
     }
 
-    sal_Int32 SAL_CALL CMouseEvent::getDetail() throw(RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CMouseEvent::getDetail()
     {
         return CUIEvent::getDetail();
     }
@@ -137,58 +136,58 @@ namespace DOM { namespace events
                      sal_Bool canBubbleArg,
                      sal_Bool cancelableArg,
                      const Reference< XAbstractView >& viewArg,
-                     sal_Int32 detailArg) throw(RuntimeException, std::exception)
+                     sal_Int32 detailArg)
     {
         CUIEvent::initUIEvent(typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
     }
 
-    OUString SAL_CALL CMouseEvent::getType() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CMouseEvent::getType()
     {
         return CUIEvent::getType();
     }
 
-    Reference< XEventTarget > SAL_CALL CMouseEvent::getTarget() throw (RuntimeException, std::exception)
+    Reference< XEventTarget > SAL_CALL CMouseEvent::getTarget()
     {
         return CUIEvent::getTarget();
     }
 
-    Reference< XEventTarget > SAL_CALL CMouseEvent::getCurrentTarget() throw (RuntimeException, std::exception)
+    Reference< XEventTarget > SAL_CALL CMouseEvent::getCurrentTarget()
     {
         return CUIEvent::getCurrentTarget();
     }
 
-    PhaseType SAL_CALL CMouseEvent::getEventPhase() throw (RuntimeException, std::exception)
+    PhaseType SAL_CALL CMouseEvent::getEventPhase()
     {
         return CUIEvent::getEventPhase();
     }
 
-    sal_Bool SAL_CALL CMouseEvent::getBubbles() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CMouseEvent::getBubbles()
     {
         return CEvent::getBubbles();
     }
 
-    sal_Bool SAL_CALL CMouseEvent::getCancelable() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CMouseEvent::getCancelable()
     {
         return CUIEvent::getCancelable();
     }
 
-    css::util::Time SAL_CALL CMouseEvent::getTimeStamp() throw (RuntimeException, std::exception)
+    css::util::Time SAL_CALL CMouseEvent::getTimeStamp()
     {
         return CUIEvent::getTimeStamp();
     }
 
-    void SAL_CALL CMouseEvent::stopPropagation() throw (RuntimeException, std::exception)
+    void SAL_CALL CMouseEvent::stopPropagation()
     {
         CUIEvent::stopPropagation();
     }
 
-    void SAL_CALL CMouseEvent::preventDefault() throw (RuntimeException, std::exception)
+    void SAL_CALL CMouseEvent::preventDefault()
     {
         CUIEvent::preventDefault();
     }
 
     void SAL_CALL CMouseEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg,
-        sal_Bool cancelableArg) throw (RuntimeException, std::exception)
+        sal_Bool cancelableArg)
     {
         // base initializer
         CUIEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg);
diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx
index 4c1964a71c1e..4fa5f28b75aa 100644
--- a/unoxml/source/events/mouseevent.hxx
+++ b/unoxml/source/events/mouseevent.hxx
@@ -50,16 +50,16 @@ protected:
 public:
     explicit CMouseEvent();
 
-    virtual sal_Int32 SAL_CALL getScreenX() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getScreenY() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getClientX() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getClientY() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getCtrlKey() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getShiftKey() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAltKey() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMetaKey() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getButton() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getRelatedTarget()  throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getScreenX() override;
+    virtual sal_Int32 SAL_CALL getScreenY() override;
+    virtual sal_Int32 SAL_CALL getClientX() override;
+    virtual sal_Int32 SAL_CALL getClientY() override;
+    virtual sal_Bool SAL_CALL getCtrlKey() override;
+    virtual sal_Bool SAL_CALL getShiftKey() override;
+    virtual sal_Bool SAL_CALL getAltKey() override;
+    virtual sal_Bool SAL_CALL getMetaKey() override;
+    virtual sal_Int16 SAL_CALL getButton() override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getRelatedTarget() override;
 
     virtual void SAL_CALL initMouseEvent(
                         const OUString& typeArg,
@@ -76,31 +76,29 @@ public:
                         sal_Bool shiftKeyArg,
                         sal_Bool metaKeyArg,
                         sal_Int16 buttonArg,
-                        const css::uno::Reference< css::xml::dom::events::XEventTarget >& relatedTargetArg)
-        throw(css::uno::RuntimeException, std::exception) override;
+                        const css::uno::Reference< css::xml::dom::events::XEventTarget >& relatedTargetArg) override;
 
     // delegate to CUIevent
-    virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getDetail() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() override;
+    virtual sal_Int32 SAL_CALL getDetail() override;
     virtual void SAL_CALL initUIEvent(const OUString& typeArg,
                      sal_Bool canBubbleArg,
                      sal_Bool cancelableArg,
                      const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg,
-                     sal_Int32 detailArg) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override;
+                     sal_Int32 detailArg) override;
+    virtual OUString SAL_CALL getType() override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override;
+    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override;
+    virtual sal_Bool SAL_CALL getBubbles() override;
+    virtual sal_Bool SAL_CALL getCancelable() override;
+    virtual css::util::Time SAL_CALL getTimeStamp() override;
+    virtual void SAL_CALL stopPropagation() override;
+    virtual void SAL_CALL preventDefault() override;
     virtual void SAL_CALL initEvent(
         const OUString& eventTypeArg,
         sal_Bool canBubbleArg,
-        sal_Bool cancelableArg)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool cancelableArg) override;
 };
 }}
 #endif
diff --git a/unoxml/source/events/mutationevent.cxx b/unoxml/source/events/mutationevent.cxx
index 16ebd52a462d..b0648a6de5a9 100644
--- a/unoxml/source/events/mutationevent.cxx
+++ b/unoxml/source/events/mutationevent.cxx
@@ -35,31 +35,31 @@ namespace DOM { namespace events
     {
     }
 
-    Reference< XNode > SAL_CALL CMutationEvent::getRelatedNode() throw (RuntimeException, std::exception)
+    Reference< XNode > SAL_CALL CMutationEvent::getRelatedNode()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_relatedNode;
     }
 
-    OUString SAL_CALL CMutationEvent::getPrevValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CMutationEvent::getPrevValue()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_prevValue;
     }
 
-    OUString SAL_CALL CMutationEvent::getNewValue() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CMutationEvent::getNewValue()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_newValue;
     }
 
-    OUString SAL_CALL CMutationEvent::getAttrName() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CMutationEvent::getAttrName()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_attrName;
     }
 
-    AttrChangeType SAL_CALL CMutationEvent::getAttrChange() throw (RuntimeException, std::exception)
+    AttrChangeType SAL_CALL CMutationEvent::getAttrChange()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_attrChangeType;
@@ -69,7 +69,7 @@ namespace DOM { namespace events
         sal_Bool canBubbleArg, sal_Bool cancelableArg,
         const Reference< XNode >& relatedNodeArg, const OUString& prevValueArg,
         const OUString& newValueArg, const OUString& attrNameArg,
-        AttrChangeType attrChangeArg) throw (RuntimeException, std::exception)
+        AttrChangeType attrChangeArg)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -82,52 +82,52 @@ namespace DOM { namespace events
     }
 
     // delegate to CEvent, since we are inheriting from CEvent and XEvent
-    OUString SAL_CALL CMutationEvent::getType() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CMutationEvent::getType()
     {
         return CEvent::getType();
     }
 
-    Reference< XEventTarget > SAL_CALL CMutationEvent::getTarget() throw (RuntimeException, std::exception)
+    Reference< XEventTarget > SAL_CALL CMutationEvent::getTarget()
     {
         return CEvent::getTarget();
     }
 
-    Reference< XEventTarget > SAL_CALL CMutationEvent::getCurrentTarget() throw (RuntimeException, std::exception)
+    Reference< XEventTarget > SAL_CALL CMutationEvent::getCurrentTarget()
     {
         return CEvent::getCurrentTarget();
     }
 
-    PhaseType SAL_CALL CMutationEvent::getEventPhase() throw (RuntimeException, std::exception)
+    PhaseType SAL_CALL CMutationEvent::getEventPhase()
     {
         return CEvent::getEventPhase();
     }
 
-    sal_Bool SAL_CALL CMutationEvent::getBubbles() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CMutationEvent::getBubbles()
     {
         return CEvent::getBubbles();
     }
 
-    sal_Bool SAL_CALL CMutationEvent::getCancelable() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CMutationEvent::getCancelable()
     {
         return CEvent::getCancelable();
     }
 
-    css::util::Time SAL_CALL CMutationEvent::getTimeStamp() throw (RuntimeException, std::exception)
+    css::util::Time SAL_CALL CMutationEvent::getTimeStamp()
     {
         return CEvent::getTimeStamp();
     }
 
-    void SAL_CALL CMutationEvent::stopPropagation() throw (RuntimeException, std::exception)
+    void SAL_CALL CMutationEvent::stopPropagation()
     {
         CEvent::stopPropagation();
     }
-    void SAL_CALL CMutationEvent::preventDefault() throw (RuntimeException, std::exception)
+    void SAL_CALL CMutationEvent::preventDefault()
     {
         CEvent::preventDefault();
     }
 
     void SAL_CALL CMutationEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg,
-        sal_Bool cancelableArg) throw (RuntimeException, std::exception)
+        sal_Bool cancelableArg)
     {
         // base initializer
         CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg);
diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx
index 224d8943adb7..413d062e6f9a 100644
--- a/unoxml/source/events/mutationevent.hxx
+++ b/unoxml/source/events/mutationevent.hxx
@@ -52,11 +52,11 @@ public:
 
     virtual ~CMutationEvent() override;
 
-    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getPrevValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNewValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAttrName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::xml::dom::events::AttrChangeType SAL_CALL getAttrChange() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() override;
+    virtual OUString SAL_CALL getPrevValue() override;
+    virtual OUString SAL_CALL getNewValue() override;
+    virtual OUString SAL_CALL getAttrName() override;
+    virtual css::xml::dom::events::AttrChangeType SAL_CALL getAttrChange() override;
     virtual void SAL_CALL initMutationEvent(
                            const OUString& typeArg,
                            sal_Bool canBubbleArg,
@@ -65,23 +65,22 @@ public:
                            const OUString& prevValueArg,
                            const OUString& newValueArg,
                            const OUString& attrNameArg,
-                           css::xml::dom::events::AttrChangeType attrChangeArg) throw (css::uno::RuntimeException, std::exception) override;
+                           css::xml::dom::events::AttrChangeType attrChangeArg) override;
 
     // delegate to CEvent, since we are inheriting from CEvent and XEvent
-    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getType() override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override;
+    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override;
+    virtual sal_Bool SAL_CALL getBubbles() override;
+    virtual sal_Bool SAL_CALL getCancelable() override;
+    virtual css::util::Time SAL_CALL getTimeStamp() override;
+    virtual void SAL_CALL stopPropagation() override;
+    virtual void SAL_CALL preventDefault() override;
     virtual void SAL_CALL initEvent(
         const OUString& eventTypeArg,
         sal_Bool canBubbleArg,
-        sal_Bool cancelableArg)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool cancelableArg) override;
 };
 }}
 #endif
diff --git a/unoxml/source/events/uievent.cxx b/unoxml/source/events/uievent.cxx
index 6d5177c2c948..48ad583c2d4c 100644
--- a/unoxml/source/events/uievent.cxx
+++ b/unoxml/source/events/uievent.cxx
@@ -32,13 +32,13 @@ namespace DOM { namespace events
     }
 
     Reference< XAbstractView > SAL_CALL
-    CUIEvent::getView() throw(RuntimeException, std::exception)
+    CUIEvent::getView()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_view;
     }
 
-    sal_Int32 SAL_CALL CUIEvent::getDetail() throw(RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CUIEvent::getDetail()
     {
         ::osl::MutexGuard const g(m_Mutex);
         return m_detail;
@@ -48,7 +48,7 @@ namespace DOM { namespace events
                      sal_Bool canBubbleArg,
                      sal_Bool cancelableArg,
                      const Reference< XAbstractView >& viewArg,
-                     sal_Int32 detailArg) throw(RuntimeException, std::exception)
+                     sal_Int32 detailArg)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -59,53 +59,53 @@ namespace DOM { namespace events
 
 
     // delegate to CEvent, since we are inheriting from CEvent and XEvent
-    OUString SAL_CALL CUIEvent::getType() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CUIEvent::getType()
     {
         return CEvent::getType();
     }
 
-    Reference< XEventTarget > SAL_CALL CUIEvent::getTarget() throw (RuntimeException, std::exception)
+    Reference< XEventTarget > SAL_CALL CUIEvent::getTarget()
     {
         return CEvent::getTarget();
     }
 
-    Reference< XEventTarget > SAL_CALL CUIEvent::getCurrentTarget() throw (RuntimeException, std::exception)
+    Reference< XEventTarget > SAL_CALL CUIEvent::getCurrentTarget()
     {
         return CEvent::getCurrentTarget();
     }
 
-    PhaseType SAL_CALL CUIEvent::getEventPhase() throw (RuntimeException, std::exception)
+    PhaseType SAL_CALL CUIEvent::getEventPhase()
     {
         return CEvent::getEventPhase();
     }
 
-    sal_Bool SAL_CALL CUIEvent::getBubbles() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CUIEvent::getBubbles()
     {
         return CEvent::getBubbles();
     }
 
-    sal_Bool SAL_CALL CUIEvent::getCancelable() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CUIEvent::getCancelable()
     {
         // mutation events cannot be canceled
         return false;
     }
 
-    css::util::Time SAL_CALL CUIEvent::getTimeStamp() throw (RuntimeException, std::exception)
+    css::util::Time SAL_CALL CUIEvent::getTimeStamp()
     {
         return CEvent::getTimeStamp();
     }
 
-    void SAL_CALL CUIEvent::stopPropagation() throw (RuntimeException, std::exception)
+    void SAL_CALL CUIEvent::stopPropagation()
     {
         CEvent::stopPropagation();
     }
-    void SAL_CALL CUIEvent::preventDefault() throw (RuntimeException, std::exception)
+    void SAL_CALL CUIEvent::preventDefault()
     {
         CEvent::preventDefault();
     }
 
     void SAL_CALL CUIEvent::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg,
-        sal_Bool cancelableArg) throw (RuntimeException, std::exception)
+        sal_Bool cancelableArg)
     {
         // base initializer
         CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg);
diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx
index 7a6b57030dfa..c82e600c24c6 100644
--- a/unoxml/source/events/uievent.hxx
+++ b/unoxml/source/events/uievent.hxx
@@ -44,29 +44,28 @@ protected:
 public:
     explicit CUIEvent();
 
-    virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getDetail() throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() override;
+    virtual sal_Int32 SAL_CALL getDetail() override;
     virtual void SAL_CALL initUIEvent(const OUString& typeArg,
                      sal_Bool canBubbleArg,
                      sal_Bool cancelableArg,
                      const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg,
-                     sal_Int32 detailArg) throw(css::uno::RuntimeException, std::exception) override;
+                     sal_Int32 detailArg) override;
 
     // delegate to CEvent, since we are inheriting from CEvent and XEvent
-    virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getType() override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override;
+    virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override;
+    virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override;
+    virtual sal_Bool SAL_CALL getBubbles() override;
+    virtual sal_Bool SAL_CALL getCancelable() override;
+    virtual css::util::Time SAL_CALL getTimeStamp() override;
+    virtual void SAL_CALL stopPropagation() override;
+    virtual void SAL_CALL preventDefault() override;
     virtual void SAL_CALL initEvent(
         const OUString& eventTypeArg,
         sal_Bool canBubbleArg,
-        sal_Bool cancelableArg)
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool cancelableArg) override;
 };
 }}
 #endif
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index 761082c27906..5d687876d223 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -41,15 +41,15 @@ public:
     CBlankNode();
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getStringValue() override;
 
 private:
     CBlankNode(CBlankNode const&) = delete;
@@ -63,23 +63,23 @@ CBlankNode::CBlankNode() :
 {}
 
 // com.sun.star.uno.XServiceInfo:
-OUString SAL_CALL CBlankNode::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CBlankNode::getImplementationName()
 {
     return comp_CBlankNode::_getImplementationName();
 }
 
-sal_Bool SAL_CALL CBlankNode::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL CBlankNode::supportsService(OUString const & serviceName)
 {
     return cppu::supportsService(this, serviceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL CBlankNode::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL CBlankNode::getSupportedServiceNames()
 {
     return comp_CBlankNode::_getSupportedServiceNames();
 }
 
 // css::lang::XInitialization:
-void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception)
+void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< css::uno::Any > & aArguments)
 {
     if (aArguments.getLength() != 1) {
         throw css::lang::IllegalArgumentException(
@@ -105,7 +105,7 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< css::uno::Any > &
 }
 
 // css::rdf::XNode:
-OUString SAL_CALL CBlankNode::getStringValue() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CBlankNode::getStringValue()
 {
     return m_NodeID;
 }
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index bfcf0f150c98..6643df240acd 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -43,20 +43,20 @@ public:
     explicit CLiteral();
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getStringValue() override;
 
     // css::rdf::XLiteral:
-    virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getValue() override;
+    virtual OUString SAL_CALL getLanguage() override;
+    virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() override;
 
 private:
     CLiteral(CLiteral const&) = delete;
@@ -72,23 +72,23 @@ CLiteral::CLiteral() :
 {}
 
 // com.sun.star.uno.XServiceInfo:
-OUString SAL_CALL CLiteral::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CLiteral::getImplementationName()
 {
     return comp_CLiteral::_getImplementationName();
 }
 
-sal_Bool SAL_CALL CLiteral::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL CLiteral::supportsService(OUString const & serviceName)
 {
     return cppu::supportsService(this, serviceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL CLiteral::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL CLiteral::getSupportedServiceNames()
 {
     return comp_CLiteral::_getSupportedServiceNames();
 }
 
 // css::lang::XInitialization:
-void SAL_CALL CLiteral::initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception)
+void SAL_CALL CLiteral::initialize(const css::uno::Sequence< css::uno::Any > & aArguments)
 {
     const sal_Int32 len( aArguments.getLength() );
     if (len < 1 || len > 2) {
@@ -140,7 +140,7 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< css::uno::Any > & a
 }
 
 // css::rdf::XNode:
-OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CLiteral::getStringValue()
 {
     if (!m_Language.isEmpty()) {
         OUStringBuffer buf(m_Value);
@@ -158,17 +158,17 @@ OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException,
 }
 
 // css::rdf::XLiteral:
-OUString SAL_CALL CLiteral::getValue() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CLiteral::getValue()
 {
     return m_Value;
 }
 
-OUString SAL_CALL CLiteral::getLanguage() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CLiteral::getLanguage()
 {
     return m_Language;
 }
 
-css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype()
 {
     return m_xDatatype;
 }
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index 6473ae3d78b7..0a6d903b1088 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -42,19 +42,19 @@ public:
     explicit CURI();
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // css::lang::XInitialization:
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getStringValue() override;
 
     // css::rdf::XURI:
-    virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getLocalName() override;
+    virtual OUString SAL_CALL getNamespace() override;
 
 private:
     CURI(CURI const&) = delete;
@@ -72,17 +72,17 @@ CURI::CURI() :
 {}
 
 // com.sun.star.uno.XServiceInfo:
-OUString SAL_CALL CURI::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CURI::getImplementationName()
 {
     return comp_CURI::_getImplementationName();
 }
 
-sal_Bool SAL_CALL CURI::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL CURI::supportsService(OUString const & serviceName)
 {
     return cppu::supportsService(this, serviceName);
 }
 
-css::uno::Sequence< OUString > SAL_CALL CURI::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL CURI::getSupportedServiceNames()
 {
     return comp_CURI::_getSupportedServiceNames();
 }
@@ -709,7 +709,7 @@ void SAL_CALL CURI::initFromConstant(const sal_Int16 i_Constant)
 }
 
 // css::lang::XInitialization:
-void SAL_CALL CURI::initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception)
+void SAL_CALL CURI::initialize(const css::uno::Sequence< css::uno::Any > & aArguments)
 {
     sal_Int32 len = aArguments.getLength();
     if ((len < 1) || (len > 2)) {
@@ -783,18 +783,18 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< css::uno::Any > & aArgu
 }
 
 // css::rdf::XNode:
-OUString SAL_CALL CURI::getStringValue() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CURI::getStringValue()
 {
     return m_Namespace + m_LocalName;
 }
 
 // css::rdf::XURI:
-OUString SAL_CALL CURI::getNamespace() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CURI::getNamespace()
 {
     return m_Namespace;
 }
 
-OUString SAL_CALL CURI::getLocalName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL CURI::getLocalName()
 {
     return m_LocalName;
 }
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 82d0f9077f58..25ffe996041f 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -272,64 +272,40 @@ public:
     virtual ~librdf_Repository() override;
 
     // css::lang::XServiceInfo:
-    virtual OUString SAL_CALL getImplementationName()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL supportsService(
-            const OUString & ServiceName) throw (uno::RuntimeException, std::exception) override;
+            const OUString & ServiceName) override;
     virtual uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+        getSupportedServiceNames() override;
 
     // css::rdf::XRepository:
-    virtual uno::Reference< rdf::XBlankNode > SAL_CALL createBlankNode()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Reference< rdf::XBlankNode > SAL_CALL createBlankNode() override;
     virtual uno::Reference<rdf::XNamedGraph> SAL_CALL importGraph(
             ::sal_Int16 i_Format,
             const uno::Reference< io::XInputStream > & i_xInStream,
             const uno::Reference< rdf::XURI > & i_xGraphName,
-            const uno::Reference< rdf::XURI > & i_xBaseURI)
-        throw (uno::RuntimeException, lang::IllegalArgumentException,
-            datatransfer::UnsupportedFlavorException,
-            container::ElementExistException, rdf::ParseException,
-            rdf::RepositoryException, io::IOException, std::exception) override;
+            const uno::Reference< rdf::XURI > & i_xBaseURI) override;
     virtual void SAL_CALL exportGraph(::sal_Int16 i_Format,
             const uno::Reference< io::XOutputStream > & i_xOutStream,
             const uno::Reference< rdf::XURI > & i_xGraphName,
-            const uno::Reference< rdf::XURI > & i_xBaseURI)
-        throw (uno::RuntimeException, lang::IllegalArgumentException,
-            datatransfer::UnsupportedFlavorException,
-            container::NoSuchElementException, rdf::RepositoryException,
-            io::IOException, std::exception) override;
+            const uno::Reference< rdf::XURI > & i_xBaseURI) override;
     virtual uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL
-        getGraphNames() throw (uno::RuntimeException, rdf::RepositoryException, std::exception) override;
+        getGraphNames() override;
     virtual uno::Reference< rdf::XNamedGraph > SAL_CALL getGraph(
-            const uno::Reference< rdf::XURI > & i_xGraphName)
-        throw (uno::RuntimeException, lang::IllegalArgumentException,
-            rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XURI > & i_xGraphName) override;
     virtual uno::Reference< rdf::XNamedGraph > SAL_CALL createGraph(
-            const uno::Reference< rdf::XURI > & i_xGraphName)
-        throw (uno::RuntimeException, lang::IllegalArgumentException,
-            container::ElementExistException, rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XURI > & i_xGraphName) override;
     virtual void SAL_CALL destroyGraph(
-            const uno::Reference< rdf::XURI > & i_xGraphName)
-        throw (uno::RuntimeException, lang::IllegalArgumentException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XURI > & i_xGraphName) override;
     virtual uno::Reference< container::XEnumeration > SAL_CALL getStatements(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
-            const uno::Reference< rdf::XNode > & i_xObject)
-        throw (uno::RuntimeException,
-            rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XNode > & i_xObject) override;
     virtual uno::Reference< rdf::XQuerySelectResult > SAL_CALL
-            querySelect(const OUString & i_rQuery)
-        throw (uno::RuntimeException, rdf::QueryException,
-            rdf::RepositoryException, std::exception) override;
+            querySelect(const OUString & i_rQuery) override;
     virtual uno::Reference< container::XEnumeration > SAL_CALL
-        queryConstruct(const OUString & i_rQuery)
-        throw (uno::RuntimeException, rdf::QueryException,
-            rdf::RepositoryException, std::exception) override;
-    virtual sal_Bool SAL_CALL queryAsk(const OUString & i_rQuery)
-        throw (uno::RuntimeException, rdf::QueryException,
-            rdf::RepositoryException, std::exception) override;
+        queryConstruct(const OUString & i_rQuery) override;
+    virtual sal_Bool SAL_CALL queryAsk(const OUString & i_rQuery) override;
 
     // css::rdf::XDocumentRepository:
     virtual void SAL_CALL setStatementRDFa(
@@ -337,29 +313,20 @@ public:
             const uno::Sequence< uno::Reference< rdf::XURI > > & i_rPredicates,
             const uno::Reference< rdf::XMetadatable > & i_xObject,
             const OUString & i_rRDFaContent,
-            const uno::Reference< rdf::XURI > & i_xRDFaDatatype)
-        throw (uno::RuntimeException, lang::IllegalArgumentException,
-            rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XURI > & i_xRDFaDatatype) override;
     virtual void SAL_CALL removeStatementRDFa(
-            const uno::Reference< rdf::XMetadatable > & i_xElement)
-        throw (uno::RuntimeException, lang::IllegalArgumentException,
-            rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XMetadatable > & i_xElement) override;
     virtual beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool > SAL_CALL
-        getStatementRDFa(uno::Reference< rdf::XMetadatable > const& i_xElement)
-        throw (uno::RuntimeException, lang::IllegalArgumentException,
-            rdf::RepositoryException, std::exception) override;
+        getStatementRDFa(uno::Reference< rdf::XMetadatable > const& i_xElement) override;
     virtual uno::Reference< container::XEnumeration > SAL_CALL
         getStatementsRDFa(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
-            const uno::Reference< rdf::XNode > & i_xObject)
-        throw (uno::RuntimeException,
-            rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XNode > & i_xObject) override;
 
     // css::lang::XInitialization:
     virtual void SAL_CALL initialize(
-            const uno::Sequence< css::uno::Any > & i_rArguments)
-        throw (uno::RuntimeException, uno::Exception, std::exception) override;
+            const uno::Sequence< css::uno::Any > & i_rArguments) override;
 
     // XNamedGraph forwards ---------------------------------------------
     const NamedGraphMap_t::iterator clearGraph_NoLock(
@@ -470,11 +437,8 @@ public:
     }
 
     // css::container::XEnumeration:
-    virtual sal_Bool SAL_CALL hasMoreElements()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL nextElement()
-        throw (uno::RuntimeException, container::NoSuchElementException,
-            lang::WrappedTargetException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual uno::Any SAL_CALL nextElement() override;
 
 private:
 
@@ -500,7 +464,7 @@ private:
 
 // css::container::XEnumeration:
 sal_Bool SAL_CALL
-librdf_GraphResult::hasMoreElements() throw (uno::RuntimeException, std::exception)
+librdf_GraphResult::hasMoreElements()
 {
     ::osl::MutexGuard g(m_rMutex);
     return m_pStream.get() && !librdf_stream_end(m_pStream.get());
@@ -523,8 +487,6 @@ librdf_node* librdf_GraphResult::getContext_Lock() const
 
 css::uno::Any SAL_CALL
 librdf_GraphResult::nextElement()
-throw (uno::RuntimeException, container::NoSuchElementException,
-    lang::WrappedTargetException, std::exception)
 {
     ::osl::MutexGuard g(m_rMutex);
     if (!m_pStream.get() || !librdf_stream_end(m_pStream.get())) {
@@ -584,15 +546,11 @@ public:
     }
 
     // css::container::XEnumeration:
-    virtual sal_Bool SAL_CALL hasMoreElements()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual uno::Any SAL_CALL nextElement()
-        throw (uno::RuntimeException, container::NoSuchElementException,
-            lang::WrappedTargetException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual uno::Any SAL_CALL nextElement() override;
 
     // css::rdf::XQuerySelectResult:
-    virtual uno::Sequence< OUString > SAL_CALL getBindingNames()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Sequence< OUString > SAL_CALL getBindingNames() override;
 
 private:
 
@@ -615,7 +573,7 @@ private:
 
 // css::container::XEnumeration:
 sal_Bool SAL_CALL
-librdf_QuerySelectResult::hasMoreElements() throw (uno::RuntimeException, std::exception)
+librdf_QuerySelectResult::hasMoreElements()
 {
     ::osl::MutexGuard g(m_rMutex);
     return !librdf_query_results_finished(m_pQueryResult.get());
@@ -637,8 +595,6 @@ public:
 
 css::uno::Any SAL_CALL
 librdf_QuerySelectResult::nextElement()
-throw (uno::RuntimeException, container::NoSuchElementException,
-    lang::WrappedTargetException, std::exception)
 {
     ::osl::MutexGuard g(m_rMutex);
     if (!librdf_query_results_finished(m_pQueryResult.get())) {
@@ -674,7 +630,7 @@ throw (uno::RuntimeException, container::NoSuchElementException,
 
 // css::rdf::XQuerySelectResult:
 uno::Sequence< OUString > SAL_CALL
-librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException, std::exception)
+librdf_QuerySelectResult::getBindingNames()
 {
     // const - no lock needed
     return m_BindingNames;
@@ -696,39 +652,27 @@ public:
     { };
 
     // css::rdf::XNode:
-    virtual OUString SAL_CALL getStringValue()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getStringValue() override;
 
     // css::rdf::XURI:
-    virtual OUString SAL_CALL getNamespace()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLocalName()
-        throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getNamespace() override;
+    virtual OUString SAL_CALL getLocalName() override;
 
     // css::rdf::XNamedGraph:
-    virtual uno::Reference<rdf::XURI> SAL_CALL getName()
-        throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clear()
-        throw (uno::RuntimeException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
+    virtual uno::Reference<rdf::XURI> SAL_CALL getName() override;
+    virtual void SAL_CALL clear() override;
     virtual void SAL_CALL addStatement(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
-            const uno::Reference< rdf::XNode > & i_xObject)
-        throw (uno::RuntimeException, lang::IllegalArgumentException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XNode > & i_xObject) override;
     virtual void SAL_CALL removeStatements(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
-            const uno::Reference< rdf::XNode > & i_xObject)
-        throw (uno::RuntimeException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XNode > & i_xObject) override;
     virtual uno::Reference< container::XEnumeration > SAL_CALL getStatements(
             const uno::Reference< rdf::XResource > & i_xSubject,
             const uno::Reference< rdf::XURI > & i_xPredicate,
-            const uno::Reference< rdf::XNode > & i_xObject)
-        throw (uno::RuntimeException,
-            container::NoSuchElementException, rdf::RepositoryException, std::exception) override;
+            const uno::Reference< rdf::XNode > & i_xObject) override;
 
 private:
 
@@ -744,34 +688,28 @@ private:
 
 // css::rdf::XNode:
 OUString SAL_CALL librdf_NamedGraph::getStringValue()
-throw (uno::RuntimeException, std::exception)
 {
     return m_xName->getStringValue();
 }
 
 // css::rdf::XURI:
 OUString SAL_CALL librdf_NamedGraph::getNamespace()
-throw (uno::RuntimeException, std::exception)
 {
     return m_xName->getNamespace();
 }
 
 OUString SAL_CALL librdf_NamedGraph::getLocalName()
-throw (uno::RuntimeException, std::exception)
 {
     return m_xName->getLocalName();
 }
 
 // css::rdf::XNamedGraph:
 uno::Reference< rdf::XURI > SAL_CALL librdf_NamedGraph::getName()
-throw (uno::RuntimeException, std::exception)
 {
     return m_xName;
 }
 
 void SAL_CALL librdf_NamedGraph::clear()
-throw (uno::RuntimeException,
-    container::NoSuchElementException, rdf::RepositoryException, std::exception)
 {
     uno::Reference< rdf::XRepository > xRep( m_wRep );
     if (!xRep.is()) {
@@ -790,8 +728,6 @@ void SAL_CALL librdf_NamedGraph::addStatement(
     const uno::Reference< rdf::XResource > & i_xSubject,
     const uno::Reference< rdf::XURI > & i_xPredicate,
     const uno::Reference< rdf::XNode > & i_xObject)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    container::NoSuchElementException, rdf::RepositoryException, std::exception)
 {
     uno::Reference< rdf::XRepository > xRep( m_wRep );
     if (!xRep.is()) {
@@ -806,8 +742,6 @@ void SAL_CALL librdf_NamedGraph::removeStatements(
     const uno::Reference< rdf::XResource > & i_xSubject,
     const uno::Reference< rdf::XURI > & i_xPredicate,
     const uno::Reference< rdf::XNode > & i_xObject)
-throw (uno::RuntimeException,
-    container::NoSuchElementException, rdf::RepositoryException, std::exception)
 {
     uno::Reference< rdf::XRepository > xRep( m_wRep );
     if (!xRep.is()) {
@@ -823,8 +757,6 @@ librdf_NamedGraph::getStatements(
     const uno::Reference< rdf::XResource > & i_xSubject,
     const uno::Reference< rdf::XURI > & i_xPredicate,
     const uno::Reference< rdf::XNode > & i_xObject)
-throw (uno::RuntimeException,
-    container::NoSuchElementException, rdf::RepositoryException, std::exception)
 {
     uno::Reference< rdf::XRepository > xRep( m_wRep );
     if (!xRep.is()) {
@@ -878,26 +810,24 @@ librdf_Repository::~librdf_Repository()
 
 // com.sun.star.uno.XServiceInfo:
 OUString SAL_CALL librdf_Repository::getImplementationName()
-throw (uno::RuntimeException, std::exception)
 {
     return comp_librdf_Repository::_getImplementationName();
 }
 
 sal_Bool SAL_CALL librdf_Repository::supportsService(
-    OUString const & serviceName) throw (uno::RuntimeException, std::exception)
+    OUString const & serviceName)
 {
     return cppu::supportsService(this, serviceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-librdf_Repository::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+librdf_Repository::getSupportedServiceNames()
 {
     return comp_librdf_Repository::_getSupportedServiceNames();
 }
 
 // css::rdf::XRepository:
 uno::Reference< rdf::XBlankNode > SAL_CALL librdf_Repository::createBlankNode()
-throw (uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     const std::shared_ptr<librdf_node> pNode(
@@ -937,10 +867,6 @@ librdf_Repository::importGraph(::sal_Int16 i_Format,
     const uno::Reference< io::XInputStream > & i_xInStream,
     const uno::Reference< rdf::XURI > & i_xGraphName,
     const uno::Reference< rdf::XURI > & i_xBaseURI)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    datatransfer::UnsupportedFlavorException,
-    container::ElementExistException, rdf::ParseException,
-    rdf::RepositoryException, io::IOException, std::exception)
 {
     if (!i_xInStream.is()) {
         throw lang::IllegalArgumentException(
@@ -1092,10 +1018,6 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
     const uno::Reference< io::XOutputStream > & i_xOutStream,
     const uno::Reference< rdf::XURI > & i_xGraphName,
     const uno::Reference< rdf::XURI > & i_xBaseURI)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    datatransfer::UnsupportedFlavorException,
-    container::NoSuchElementException, rdf::RepositoryException,
-    io::IOException, std::exception)
 {
     if (!i_xOutStream.is()) {
         throw lang::IllegalArgumentException(
@@ -1235,7 +1157,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
 uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL
 librdf_Repository::getGraphNames()
-throw (uno::RuntimeException, rdf::RepositoryException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     ::std::vector< uno::Reference<rdf::XURI> > ret;
@@ -1248,8 +1169,6 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception)
 
 uno::Reference< rdf::XNamedGraph > SAL_CALL
 librdf_Repository::getGraph(const uno::Reference< rdf::XURI > & i_xGraphName)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    rdf::RepositoryException, std::exception)
 {
     if (!i_xGraphName.is()) {
         throw lang::IllegalArgumentException(
@@ -1268,8 +1187,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
 uno::Reference< rdf::XNamedGraph > SAL_CALL
 librdf_Repository::createGraph(const uno::Reference< rdf::XURI > & i_xGraphName)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    container::ElementExistException, rdf::RepositoryException, std::exception)
 {
     if (!i_xGraphName.is()) {
         throw lang::IllegalArgumentException(
@@ -1302,8 +1219,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 void SAL_CALL
 librdf_Repository::destroyGraph(
         const uno::Reference< rdf::XURI > & i_xGraphName)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    container::NoSuchElementException, rdf::RepositoryException, std::exception)
 {
     if (!i_xGraphName.is()) {
         throw lang::IllegalArgumentException(
@@ -1329,7 +1244,6 @@ librdf_Repository::getStatements(
     const uno::Reference< rdf::XResource > & i_xSubject,
     const uno::Reference< rdf::XURI > & i_xPredicate,
     const uno::Reference< rdf::XNode > & i_xObject)
-throw (uno::RuntimeException, rdf::RepositoryException, std::exception)
 {
     if (isMetadatableWithoutMetadata(i_xSubject)   ||
         isMetadatableWithoutMetadata(i_xPredicate) ||
@@ -1367,7 +1281,6 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception)
 
 uno::Reference< rdf::XQuerySelectResult > SAL_CALL
 librdf_Repository::querySelect(const OUString & i_rQuery)
-throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     const OString query(
@@ -1416,7 +1329,6 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std
 
 uno::Reference< container::XEnumeration > SAL_CALL
 librdf_Repository::queryConstruct(const OUString & i_rQuery)
-throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
     const OString query(
@@ -1453,7 +1365,6 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std
 
 sal_Bool SAL_CALL
 librdf_Repository::queryAsk(const OUString & i_rQuery)
-throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException, std::exception)
 {
     ::osl::MutexGuard g(m_aMutex);
 
@@ -1486,8 +1397,6 @@ void SAL_CALL librdf_Repository::setStatementRDFa(
     const uno::Reference< rdf::XMetadatable > & i_xObject,
     const OUString & i_rRDFaContent,
     const uno::Reference< rdf::XURI > & i_xRDFaDatatype)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    rdf::RepositoryException, std::exception)
 {
     if (!i_xSubject.is()) {
         throw lang::IllegalArgumentException(
@@ -1602,8 +1511,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
 void SAL_CALL librdf_Repository::removeStatementRDFa(
     const uno::Reference< rdf::XMetadatable > & i_xElement)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    rdf::RepositoryException, std::exception)
 {
     if (!i_xElement.is()) {
         throw lang::IllegalArgumentException(
@@ -1624,8 +1531,6 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool > SAL_CALL
 librdf_Repository::getStatementRDFa(
     const uno::Reference< rdf::XMetadatable > & i_xElement)
-throw (uno::RuntimeException, lang::IllegalArgumentException,
-    rdf::RepositoryException, std::exception)
 {
     if (!i_xElement.is()) {
         throw lang::IllegalArgumentException(
@@ -1700,7 +1605,6 @@ librdf_Repository::getStatementsRDFa(
     const uno::Reference< rdf::XResource > & i_xSubject,
     const uno::Reference< rdf::XURI > & i_xPredicate,
     const uno::Reference< rdf::XNode > & i_xObject)
-throw (uno::RuntimeException, rdf::RepositoryException, std::exception)
 {
     if (isMetadatableWithoutMetadata(i_xSubject)   ||
         isMetadatableWithoutMetadata(i_xPredicate) ||
@@ -1745,7 +1649,6 @@ throw (uno::RuntimeException, rdf::RepositoryException, std::exception)
 // css::lang::XInitialization:
 void SAL_CALL librdf_Repository::initialize(
     const uno::Sequence< css::uno::Any > & i_rArguments)
-throw (uno::RuntimeException, uno::Exception, std::exception)
 {
     (void) i_rArguments;
 
diff --git a/unoxml/source/xpath/nodelist.cxx b/unoxml/source/xpath/nodelist.cxx
index 766a96e80ee9..93fcc111d87f 100644
--- a/unoxml/source/xpath/nodelist.cxx
+++ b/unoxml/source/xpath/nodelist.cxx
@@ -44,7 +44,7 @@ namespace XPath
     /**
     The number of nodes in the list.
     */
-    sal_Int32 SAL_CALL CNodeList::getLength() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CNodeList::getLength()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -58,7 +58,6 @@ namespace XPath
     Returns the indexth item in the collection.
     */
     Reference< XNode > SAL_CALL CNodeList::item(sal_Int32 index)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_rMutex);
 
diff --git a/unoxml/source/xpath/nodelist.hxx b/unoxml/source/xpath/nodelist.hxx
index c2dffe44fc33..c4582624ab8f 100644
--- a/unoxml/source/xpath/nodelist.hxx
+++ b/unoxml/source/xpath/nodelist.hxx
@@ -60,12 +60,11 @@ namespace XPath
         /**
         The number of nodes in the list.
         */
-        virtual sal_Int32 SAL_CALL getLength() throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getLength() override;
         /**
         Returns the indexth item in the collection.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL item(sal_Int32 index) override;
     };
 }
 
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index 345623241a3f..faf243b6ff69 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -79,19 +79,16 @@ namespace XPath
     }
 
     Sequence< OUString > SAL_CALL CXPathAPI::getSupportedServiceNames()
-        throw (RuntimeException, std::exception)
     {
         return CXPathAPI::_getSupportedServiceNames();
     }
 
     OUString SAL_CALL CXPathAPI::getImplementationName()
-        throw (RuntimeException, std::exception)
     {
         return CXPathAPI::_getImplementationName();
     }
 
     sal_Bool SAL_CALL CXPathAPI::supportsService(const OUString& aServiceName)
-        throw (RuntimeException, std::exception)
     {
         return cppu::supportsService(this, aServiceName);
     }
@@ -99,7 +96,6 @@ namespace XPath
     void SAL_CALL CXPathAPI::registerNS(
             const OUString& aPrefix,
             const OUString& aURI)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -109,7 +105,6 @@ namespace XPath
     void SAL_CALL CXPathAPI::unregisterNS(
             const OUString& aPrefix,
             const OUString& aURI)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -213,7 +208,6 @@ namespace XPath
     Reference< XNodeList > SAL_CALL CXPathAPI::selectNodeList(
             const Reference< XNode >& contextNode,
             const OUString& expr)
-        throw (RuntimeException, XPathException, std::exception)
     {
         Reference< XXPathObject > xobj = eval(contextNode, expr);
         return xobj->getNodeList();
@@ -226,7 +220,6 @@ namespace XPath
             const Reference< XNode >&  contextNode,
             const OUString& expr,
             const Reference< XNode >&  namespaceNode)
-        throw (RuntimeException, XPathException, std::exception)
     {
         lcl_collectRegisterNamespaces(*this, namespaceNode);
         return selectNodeList(contextNode, expr);
@@ -238,7 +231,6 @@ namespace XPath
     Reference< XNode > SAL_CALL CXPathAPI::selectSingleNode(
             const Reference< XNode >& contextNode,
             const OUString& expr)
-        throw (RuntimeException, XPathException, std::exception)
     {
         Reference< XNodeList > aList = selectNodeList(contextNode, expr);
         Reference< XNode > aNode = aList->item(0);
@@ -253,7 +245,6 @@ namespace XPath
             const Reference< XNode >& contextNode,
             const OUString& expr,
             const Reference< XNode >&  namespaceNode )
-        throw (RuntimeException, XPathException, std::exception)
     {
         lcl_collectRegisterNamespaces(*this, namespaceNode);
         return selectSingleNode(contextNode, expr);
@@ -316,7 +307,6 @@ namespace XPath
     Reference< XXPathObject > SAL_CALL CXPathAPI::eval(
             Reference< XNode > const& xContextNode,
             const OUString& expr)
-        throw (RuntimeException, XPathException, std::exception)
     {
         if (!xContextNode.is()) { throw RuntimeException(); }
 
@@ -392,7 +382,6 @@ namespace XPath
             const Reference< XNode >& contextNode,
             const OUString& expr,
             const Reference< XNode >& namespaceNode)
-        throw (RuntimeException, XPathException, std::exception)
     {
         lcl_collectRegisterNamespaces(*this, namespaceNode);
         return eval(contextNode, expr);
@@ -405,7 +394,6 @@ namespace XPath
      */
     void SAL_CALL CXPathAPI::registerExtension(
             const OUString& aName)
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard const g(m_Mutex);
 
@@ -421,7 +409,6 @@ namespace XPath
      */
     void SAL_CALL CXPathAPI::registerExtensionInstance(
             Reference< XXPathExtension> const& xExtension)
-        throw (RuntimeException, std::exception)
     {
         if (!xExtension.is()) {
             throw RuntimeException();
diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx
index cf359dacacd4..c0e57f56e35d 100644
--- a/unoxml/source/xpath/xpathapi.hxx
+++ b/unoxml/source/xpath/xpathapi.hxx
@@ -79,54 +79,43 @@ namespace XPath
                 rSMgr);
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames () override;
 
 
         // --- XXPathAPI ---
 
-        virtual void SAL_CALL registerNS(const OUString& aPrefix, const OUString& aURI)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerNS(const OUString& aPrefix, const OUString& aURI) override;
 
-        virtual void SAL_CALL unregisterNS(const OUString& aPrefix, const OUString& aURI)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL unregisterNS(const OUString& aPrefix, const OUString& aURI) override;
 
         /**
         Use an XPath string to select a nodelist.
         */
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeList(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeList(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str) override;
 
         /**
         Use an XPath string to select a nodelist.
         */
-        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeListNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >&  namespaceNode)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL selectNodeListNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >&  namespaceNode) override;
 
         /**
         Use an XPath string to select a single node.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNode(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNode(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str) override;
 
         /**
         Use an XPath string to select a single node.
         */
-        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNodeNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >&  namespaceNode)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
+        virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL selectSingleNodeNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >&  namespaceNode) override;
 
-        virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL eval(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
+        virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL eval(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str) override;
 
-        virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL evalNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >&  namespaceNode)
-            throw (css::uno::RuntimeException, css::xml::xpath::XPathException, std::exception) override;
+        virtual css::uno::Reference< css::xml::xpath::XXPathObject > SAL_CALL evalNS(const css::uno::Reference< css::xml::dom::XNode >& contextNode, const OUString& str, const css::uno::Reference< css::xml::dom::XNode >&  namespaceNode) override;
 
-        virtual void SAL_CALL registerExtension(const OUString& aName) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL registerExtensionInstance(const css::uno::Reference< css::xml::xpath::XXPathExtension>& aExtension) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL registerExtension(const OUString& aName) override;
+        virtual void SAL_CALL registerExtensionInstance(const css::uno::Reference< css::xml::xpath::XXPathExtension>& aExtension) override;
 
     };
 }
diff --git a/unoxml/source/xpath/xpathobject.cxx b/unoxml/source/xpath/xpathobject.cxx
index 59f071313d29..000b3e55c35c 100644
--- a/unoxml/source/xpath/xpathobject.cxx
+++ b/unoxml/source/xpath/xpathobject.cxx
@@ -73,7 +73,7 @@ namespace XPath
     /**
         get object type
     */
-    XPathObjectType CXPathObject::getObjectType() throw (RuntimeException, std::exception)
+    XPathObjectType CXPathObject::getObjectType()
     {
         return m_XPathObjectType;
     }
@@ -82,7 +82,7 @@ namespace XPath
         get the nodes from a nodelist type object
     */
     Reference< XNodeList > SAL_CALL
-    CXPathObject::getNodeList() throw (RuntimeException, std::exception)
+    CXPathObject::getNodeList()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -94,7 +94,7 @@ namespace XPath
      /**
         get value of a boolean object
      */
-    sal_Bool SAL_CALL CXPathObject::getBoolean() throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL CXPathObject::getBoolean()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -104,7 +104,7 @@ namespace XPath
     /**
         get number as byte
     */
-    sal_Int8 SAL_CALL CXPathObject::getByte() throw (RuntimeException, std::exception)
+    sal_Int8 SAL_CALL CXPathObject::getByte()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -114,7 +114,7 @@ namespace XPath
     /**
         get number as short
     */
-    sal_Int16 SAL_CALL CXPathObject::getShort() throw (RuntimeException, std::exception)
+    sal_Int16 SAL_CALL CXPathObject::getShort()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -124,7 +124,7 @@ namespace XPath
     /**
         get number as long
     */
-    sal_Int32 SAL_CALL CXPathObject::getLong() throw (RuntimeException, std::exception)
+    sal_Int32 SAL_CALL CXPathObject::getLong()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -134,7 +134,7 @@ namespace XPath
     /**
         get number as hyper
     */
-    sal_Int64 SAL_CALL CXPathObject::getHyper() throw (RuntimeException, std::exception)
+    sal_Int64 SAL_CALL CXPathObject::getHyper()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -144,7 +144,7 @@ namespace XPath
     /**
         get number as float
     */
-    float SAL_CALL CXPathObject::getFloat() throw (RuntimeException, std::exception)
+    float SAL_CALL CXPathObject::getFloat()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -154,7 +154,7 @@ namespace XPath
     /**
         get number as double
     */
-    double SAL_CALL CXPathObject::getDouble() throw (RuntimeException, std::exception)
+    double SAL_CALL CXPathObject::getDouble()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
@@ -164,7 +164,7 @@ namespace XPath
     /**
         get string value
     */
-    OUString SAL_CALL CXPathObject::getString() throw (RuntimeException, std::exception)
+    OUString SAL_CALL CXPathObject::getString()
     {
         ::osl::MutexGuard const g(m_rMutex);
 
diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx
index 7d06dbb08597..41787c3bb705 100644
--- a/unoxml/source/xpath/xpathobject.hxx
+++ b/unoxml/source/xpath/xpathobject.hxx
@@ -56,53 +56,52 @@ namespace XPath
     /**
         get object type
     */
-    virtual css::xml::xpath::XPathObjectType SAL_CALL getObjectType() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::xml::xpath::XPathObjectType SAL_CALL getObjectType() override;
 
     /**
         get the nodes from a nodelist type object
     */
-    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getNodeList()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::dom::XNodeList > SAL_CALL getNodeList() override;
 
      /**
         get value of a boolean object
      */
-     virtual sal_Bool SAL_CALL getBoolean() throw (css::uno::RuntimeException, std::exception) override;
+     virtual sal_Bool SAL_CALL getBoolean() override;
 
     /**
         get number as byte
     */
-    virtual sal_Int8 SAL_CALL getByte() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int8 SAL_CALL getByte() override;
 
     /**
         get number as short
     */
-    virtual sal_Int16 SAL_CALL getShort() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getShort() override;
 
     /**
         get number as long
     */
-    virtual sal_Int32 SAL_CALL getLong() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getLong() override;
 
     /**
         get number as hyper
     */
-    virtual sal_Int64 SAL_CALL getHyper() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getHyper() override;
 
     /**
         get number as float
     */
-    virtual float SAL_CALL getFloat() throw (css::uno::RuntimeException, std::exception) override;
+    virtual float SAL_CALL getFloat() override;
 
     /**
         get number as double
     */
-    virtual double SAL_CALL getDouble() throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getDouble() override;
 
     /**
         get string value
     */
-    virtual OUString SAL_CALL getString() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getString() override;
 
     };
 }
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 4aa2baa2c8e9..84cec1b166a6 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -173,7 +173,7 @@ class StringCalculator : public ::cppu::WeakImplHelper< css::util::XStringWidth
         {
         }
 
-        sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( css::uno::RuntimeException, std::exception ) override
+        sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) override
         {
             return (sal_Int32)(m_pDevice->GetTextWidth(sString));
         }
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index 7ed463cd844b..fde6db7f4687 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -47,29 +47,24 @@ public:
     UUIInteractionHandler(const UUIInteractionHandler&) = delete;
     UUIInteractionHandler& operator=(const UUIInteractionHandler&) = delete;
 
-    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 & rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
     virtual void SAL_CALL
     initialize(
-        css::uno::Sequence< css::uno::Any > const & rArguments)
-        throw (css::uno::Exception, std::exception) override;
+        css::uno::Sequence< css::uno::Any > const & rArguments) override;
 
     virtual void SAL_CALL
-    handle(css::uno::Reference< css::task::XInteractionRequest > const & rRequest)
-        throw (css::uno::RuntimeException, std::exception) override;
+    handle(css::uno::Reference< css::task::XInteractionRequest > const & rRequest) override;
 
     virtual sal_Bool SAL_CALL
         handleInteractionRequest(
             const css::uno::Reference< css::task::XInteractionRequest >& Request
-        )   throw ( css::uno::RuntimeException, std::exception ) override;
+        ) override;
 };
 
 UUIInteractionHandler::UUIInteractionHandler(
@@ -79,21 +74,18 @@ UUIInteractionHandler::UUIInteractionHandler(
 }
 
 OUString SAL_CALL UUIInteractionHandler::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.uui.UUIInteractionHandler");
 }
 
 sal_Bool SAL_CALL
 UUIInteractionHandler::supportsService(OUString const & rServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
 UUIInteractionHandler::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aNames(3);
     aNames[0] = "com.sun.star.task.InteractionHandler";
@@ -107,7 +99,6 @@ UUIInteractionHandler::getSupportedServiceNames()
 void SAL_CALL
 UUIInteractionHandler::initialize(
     uno::Sequence< uno::Any > const & rArguments)
-    throw (uno::Exception, std::exception)
 {
     uno::Reference<uno::XComponentContext> xContext = m_pImpl->getORB();
     m_pImpl.reset();
@@ -139,7 +130,6 @@ UUIInteractionHandler::initialize(
 void SAL_CALL
 UUIInteractionHandler::handle(
     uno::Reference< task::XInteractionRequest > const & rRequest)
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
@@ -152,7 +142,7 @@ UUIInteractionHandler::handle(
 }
 
 sal_Bool SAL_CALL UUIInteractionHandler::handleInteractionRequest(
-    const uno::Reference< task::XInteractionRequest >& Request ) throw ( uno::RuntimeException, std::exception )
+    const uno::Reference< task::XInteractionRequest >& Request )
 {
     try
     {
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 35bf978669d8..c0639c269cfa 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -291,7 +291,6 @@ PasswordContainerInteractionHandler::~PasswordContainerInteractionHandler()
 // virtual
 OUString SAL_CALL
 PasswordContainerInteractionHandler::getImplementationName()
-    throw ( uno::RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
@@ -301,7 +300,6 @@ PasswordContainerInteractionHandler::getImplementationName()
 sal_Bool SAL_CALL
 PasswordContainerInteractionHandler::supportsService(
         const OUString& ServiceName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -310,7 +308,6 @@ PasswordContainerInteractionHandler::supportsService(
 // virtual
 uno::Sequence< OUString > SAL_CALL
 PasswordContainerInteractionHandler::getSupportedServiceNames()
-    throw ( uno::RuntimeException, std::exception )
 {
     return getSupportedServiceNames_Static();
 }
@@ -340,7 +337,6 @@ PasswordContainerInteractionHandler::getSupportedServiceNames_Static()
 void SAL_CALL
 PasswordContainerInteractionHandler::handle(
         const uno::Reference< task::XInteractionRequest >& rRequest )
-    throw ( uno::RuntimeException, std::exception )
 {
     handleInteractionRequest( rRequest );
 }
@@ -349,7 +345,6 @@ PasswordContainerInteractionHandler::handle(
 sal_Bool SAL_CALL
 PasswordContainerInteractionHandler::handleInteractionRequest(
         const uno::Reference< task::XInteractionRequest >& rRequest )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( !rRequest.is() )
         return false;
@@ -406,7 +401,6 @@ PasswordContainerInteractionHandler::handleInteractionRequest(
 static uno::Reference< uno::XInterface > SAL_CALL
 PasswordContainerInteractionHandler_CreateInstance(
         const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
-    throw( uno::Exception )
 {
     lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >(
         new PasswordContainerInteractionHandler( comphelper::getComponentContext(rSMgr) ) );
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index 7457ddfe264a..d4bdf32f9d9d 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -134,25 +134,20 @@ public:
     virtual ~PasswordContainerInteractionHandler() override;
 
     // 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( const OUString& ServiceName )
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    supportsService( const OUString& ServiceName ) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw ( css::uno::RuntimeException, std::exception ) override;
+    getSupportedServiceNames() override;
 
     // XInteractionHandler2
     virtual void SAL_CALL
-    handle( const css::uno::Reference< css::task::XInteractionRequest >& Request )
-        throw (css::uno::RuntimeException, std::exception) override;
+    handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
 
     virtual sal_Bool SAL_CALL
-    handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request )
-        throw (css::uno::RuntimeException, std::exception) override;
+    handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
 
     // Non-UNO interfaces
     static OUString
diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index b63b0358f988..1289a9e9c6fc 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -36,7 +36,6 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver()
 
 OUString SAL_CALL
 UUIInteractionRequestStringResolver::getImplementationName()
-    throw (uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.uui.UUIInteractionRequestStringResolver");
 }
@@ -44,7 +43,6 @@ UUIInteractionRequestStringResolver::getImplementationName()
 sal_Bool SAL_CALL
 UUIInteractionRequestStringResolver::supportsService(
         OUString const & rServiceName)
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
@@ -52,7 +50,6 @@ UUIInteractionRequestStringResolver::supportsService(
 
 uno::Sequence< OUString > SAL_CALL
 UUIInteractionRequestStringResolver::getSupportedServiceNames()
-    throw (uno::RuntimeException, std::exception)
 {
     return { "com.sun.star.task.InteractionRequestStringResolver" };
 }
@@ -61,7 +58,6 @@ beans::Optional< OUString > SAL_CALL
 UUIInteractionRequestStringResolver::getStringFromInformationalRequest(
     const uno::Reference<
         task::XInteractionRequest >& Request )
-    throw (uno::RuntimeException, std::exception)
 {
     try
     {
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index e6dc745f2ab7..7a9bf0237623 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -45,21 +45,17 @@ private:
 
     virtual ~UUIInteractionRequestStringResolver() 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 &
-                          rServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+                          rServiceName) override;
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    getSupportedServiceNames() override;
 
     virtual css::beans::Optional< OUString > SAL_CALL
     getStringFromInformationalRequest(
-        const css::uno::Reference< css::task::XInteractionRequest >& Request )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
 };
 
 #endif // INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx
index cfae8b095f58..5070bade10b2 100644
--- a/vbahelper/source/msforms/vbabutton.cxx
+++ b/vbahelper/source/msforms/vbabutton.cxx
@@ -29,7 +29,7 @@ VbaButton::VbaButton( const uno::Reference< XHelperInterface >& xParent, const u
 
 // Attributes
 OUString SAL_CALL
-VbaButton::getCaption() throw (css::uno::RuntimeException, std::exception)
+VbaButton::getCaption()
 {
     OUString Label;
     m_xProps->getPropertyValue( "Label" ) >>= Label;
@@ -37,73 +37,73 @@ VbaButton::getCaption() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-VbaButton::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception)
+VbaButton::setCaption( const OUString& _caption )
 {
     m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
 }
 
-sal_Bool SAL_CALL VbaButton::getAutoSize() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaButton::getAutoSize()
 {
     return ScVbaControl::getAutoSize();
 }
 
-void SAL_CALL VbaButton::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaButton::setAutoSize( sal_Bool bAutoSize )
 {
     ScVbaControl::setAutoSize( bAutoSize );
 }
 
-sal_Bool SAL_CALL VbaButton::getLocked() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaButton::getLocked()
 {
     return ScVbaControl::getLocked();
 }
 
-void SAL_CALL VbaButton::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaButton::setLocked( sal_Bool bLocked )
 {
     ScVbaControl::setLocked( bLocked );
 }
 
-sal_Bool SAL_CALL VbaButton::getCancel() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaButton::getCancel()
 {
     return false;
 }
 
-void SAL_CALL VbaButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaButton::setCancel( sal_Bool /*bCancel*/ )
 {
     // #STUB
 }
 
-sal_Bool SAL_CALL VbaButton::getDefault() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaButton::getDefault()
 {
     // #STUB
     return false;
 }
 
-void SAL_CALL VbaButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaButton::setDefault( sal_Bool /*bDefault*/ )
 {
     // #STUB
 }
 
-sal_Int32 SAL_CALL VbaButton::getBackColor() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL VbaButton::getBackColor()
 {
     return ScVbaControl::getBackColor();
 }
 
-void SAL_CALL VbaButton::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaButton::setBackColor( sal_Int32 nBackColor )
 {
     ScVbaControl::setBackColor( nBackColor );
 }
 
-sal_Int32 SAL_CALL VbaButton::getForeColor() throw (uno::RuntimeException)
+sal_Int32 SAL_CALL VbaButton::getForeColor()
 {
     return ScVbaControl::getForeColor();
 }
 
-void SAL_CALL VbaButton::setForeColor( sal_Int32 /*nForeColor*/ ) throw (uno::RuntimeException)
+void SAL_CALL VbaButton::setForeColor( sal_Int32 /*nForeColor*/ )
 {
     // #STUB
 }
 
-uno::Reference< msforms::XNewFont > SAL_CALL VbaButton::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XNewFont > SAL_CALL VbaButton::getFont()
 {
     return new VbaNewFont( m_xProps );
 }
diff --git a/vbahelper/source/msforms/vbabutton.hxx b/vbahelper/source/msforms/vbabutton.hxx
index 868496b70b5d..af6ab6a10d65 100644
--- a/vbahelper/source/msforms/vbabutton.hxx
+++ b/vbahelper/source/msforms/vbabutton.hxx
@@ -31,21 +31,21 @@ class VbaButton : public ButtonImpl_BASE
 public:
     VbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
    // Attributes
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getCancel() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCancel( sal_Bool bCancel ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDefault() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefault( sal_Bool bDefault ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeColor() throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setForeColor( sal_Int32 nForeColor ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+    virtual sal_Bool SAL_CALL getAutoSize() override;
+    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) override;
+    virtual sal_Bool SAL_CALL getCancel() override;
+    virtual void SAL_CALL setCancel( sal_Bool bCancel ) override;
+    virtual sal_Bool SAL_CALL getDefault() override;
+    virtual void SAL_CALL setDefault( sal_Bool bDefault ) override;
+    virtual sal_Int32 SAL_CALL getBackColor() override;
+    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) override;
+    virtual sal_Int32 SAL_CALL getForeColor() override;
+    virtual void SAL_CALL setForeColor( sal_Int32 nForeColor ) override;
+    virtual sal_Bool SAL_CALL getLocked() override;
+    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
+    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() override;
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx
index e00270f80646..41b8b941c5ce 100644
--- a/vbahelper/source/msforms/vbacheckbox.cxx
+++ b/vbahelper/source/msforms/vbacheckbox.cxx
@@ -30,7 +30,7 @@ ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xPar
 
 // Attributes
 OUString SAL_CALL
-ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException, std::exception)
+ScVbaCheckbox::getCaption()
 {
     OUString Label;
     m_xProps->getPropertyValue( "Label" ) >>= Label;
@@ -38,13 +38,13 @@ ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaCheckbox::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception)
+ScVbaCheckbox::setCaption( const OUString& _caption )
 {
     m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
 }
 
 uno::Any SAL_CALL
-ScVbaCheckbox::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaCheckbox::getValue()
 {
     sal_Int16 nValue = -1;
     m_xProps->getPropertyValue( "State" ) >>= nValue;
@@ -57,7 +57,7 @@ ScVbaCheckbox::getValue() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception)
+ScVbaCheckbox::setValue( const uno::Any& _value )
 {
     sal_Int16 nValue = 0;
     sal_Int16 nOldValue = 0;
@@ -77,7 +77,7 @@ ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeExcept
         fireClickEvent();
 }
 
-uno::Reference< msforms::XNewFont > SAL_CALL ScVbaCheckbox::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XNewFont > SAL_CALL ScVbaCheckbox::getFont()
 {
     return new VbaNewFont( m_xProps );
 }
@@ -100,32 +100,32 @@ ScVbaCheckbox::getServiceNames()
     return aServiceNames;
 }
 
-sal_Int32 SAL_CALL ScVbaCheckbox::getBackColor() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaCheckbox::getBackColor()
 {
     return ScVbaControl::getBackColor();
 }
 
-void SAL_CALL ScVbaCheckbox::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaCheckbox::setBackColor( sal_Int32 nBackColor )
 {
     ScVbaControl::setBackColor( nBackColor );
 }
 
-sal_Bool SAL_CALL ScVbaCheckbox::getAutoSize() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaCheckbox::getAutoSize()
 {
     return ScVbaControl::getAutoSize();
 }
 
-void SAL_CALL ScVbaCheckbox::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaCheckbox::setAutoSize( sal_Bool bAutoSize )
 {
     ScVbaControl::setAutoSize( bAutoSize );
 }
 
-sal_Bool SAL_CALL ScVbaCheckbox::getLocked() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaCheckbox::getLocked()
 {
     return ScVbaControl::getLocked();
 }
 
-void SAL_CALL ScVbaCheckbox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaCheckbox::setLocked( sal_Bool bLocked )
 {
     ScVbaControl::setLocked( bLocked );
 }
diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx
index 1b799a41fada..9ae55579f839 100644
--- a/vbahelper/source/msforms/vbacheckbox.hxx
+++ b/vbahelper/source/msforms/vbacheckbox.hxx
@@ -31,19 +31,19 @@ class ScVbaCheckbox : public CheckBoxImpl_BASE
 public:
     ScVbaCheckbox(  const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
    // Attributes
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() override;
+    virtual sal_Int32 SAL_CALL getBackColor() override;
+    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) override;
+    virtual sal_Bool SAL_CALL getAutoSize() override;
+    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) override;
+    virtual sal_Bool SAL_CALL getLocked() override;
+    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx
index dc7189b64f88..ab26e01b3ae9 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -57,13 +57,13 @@ ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent,
 // Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in
 // the drop down
 uno::Any SAL_CALL
-ScVbaComboBox::getValue() throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::getValue()
 {
     return m_xProps->getPropertyValue( sSourceName );
 }
 
 void SAL_CALL
-ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::setListIndex( const uno::Any& _value )
 {
     sal_Int16 nIndex = 0;
     if( _value >>= nIndex )
@@ -85,7 +85,7 @@ ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeExcepti
 }
 
 uno::Any SAL_CALL
-ScVbaComboBox::getListIndex() throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::getListIndex()
 {
     uno::Sequence< OUString > sItems;
     m_xProps->getPropertyValue( "StringItemList" ) >>= sItems;
@@ -112,7 +112,7 @@ ScVbaComboBox::getListIndex() throw (uno::RuntimeException, std::exception)
 // Value, [write]e.g. setValue sets the value in the drop down, and if the value is one
 // of the values in the list then the selection is also set
 void SAL_CALL
-ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::setValue( const uno::Any& _value )
 {
     // booleans are converted to uppercase strings
     OUString oldValue = extractStringFromAny( getValue(), OUString(), true );
@@ -133,7 +133,7 @@ ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException,
 // see Value
 
 OUString SAL_CALL
-ScVbaComboBox::getText() throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::getText()
 {
     OUString result;
     getValue() >>= result;
@@ -141,109 +141,109 @@ ScVbaComboBox::getText() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaComboBox::setText( const OUString& _text ) throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::setText( const OUString& _text )
 {
     setValue( uno::makeAny( _text ) ); // seems the same
 }
 
 // Methods
 void SAL_CALL
-ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex )
 {
     mpListHelper->AddItem( pvargItem, pvargIndex );
 }
 
 void SAL_CALL
-ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::removeItem( const uno::Any& index )
 {
     mpListHelper->removeItem( index );
 }
 
 void SAL_CALL
-ScVbaComboBox::Clear(  ) throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::Clear(  )
 {
     mpListHelper->Clear();
 }
 
 void SAL_CALL
-ScVbaComboBox::setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException, std::exception)
+ScVbaComboBox::setRowSource( const OUString& _rowsource )
 {
     ScVbaControl::setRowSource( _rowsource );
     mpListHelper->setRowSource( _rowsource );
 }
 
 sal_Int32 SAL_CALL
-ScVbaComboBox::getListCount() throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::getListCount()
 {
     return mpListHelper->getListCount();
 }
 
 uno::Any SAL_CALL
-ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException, std::exception)
+ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn )
 {
     return mpListHelper->List( pvargIndex, pvarColumn );
 }
 
-sal_Int32 SAL_CALL ScVbaComboBox::getStyle() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaComboBox::getStyle()
 {
     return msforms::fmStyle::fmStyleDropDownCombo;
 }
 
-void SAL_CALL ScVbaComboBox::setStyle( sal_Int32 /*nStyle*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setStyle( sal_Int32 /*nStyle*/ )
 {
 }
 
-sal_Int32 SAL_CALL ScVbaComboBox::getDropButtonStyle() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaComboBox::getDropButtonStyle()
 {
     return msforms::fmDropButtonStyle::fmDropButtonStyleArrow;
 }
 
-void SAL_CALL ScVbaComboBox::setDropButtonStyle( sal_Int32 /*nDropButtonStyle*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setDropButtonStyle( sal_Int32 /*nDropButtonStyle*/ )
 {
 }
 
-sal_Int32 SAL_CALL ScVbaComboBox::getDragBehavior() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaComboBox::getDragBehavior()
 {
     return msforms::fmDragBehavior::fmDragBehaviorDisabled;
 }
 
-void SAL_CALL ScVbaComboBox::setDragBehavior( sal_Int32 /*nDragBehavior*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setDragBehavior( sal_Int32 /*nDragBehavior*/ )
 {
 }
 
-sal_Int32 SAL_CALL ScVbaComboBox::getEnterFieldBehavior() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaComboBox::getEnterFieldBehavior()
 {
     return msforms::fmEnterFieldBehavior::fmEnterFieldBehaviorSelectAll;
 }
 
-void SAL_CALL ScVbaComboBox::setEnterFieldBehavior( sal_Int32 /*nEnterFieldBehavior*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setEnterFieldBehavior( sal_Int32 /*nEnterFieldBehavior*/ )
 {
 }
 
-sal_Int32 SAL_CALL ScVbaComboBox::getListStyle() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaComboBox::getListStyle()
 {
     return msforms::fmListStyle::fmListStylePlain;
 }
 
-void SAL_CALL ScVbaComboBox::setListStyle( sal_Int32 /*nListStyle*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setListStyle( sal_Int32 /*nListStyle*/ )
 {
 }
 
-sal_Int32 SAL_CALL ScVbaComboBox::getTextAlign() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaComboBox::getTextAlign()
 {
     return msforms::fmTextAlign::fmTextAlignLeft;
 }
 
-void SAL_CALL ScVbaComboBox::setTextAlign( sal_Int32 /*nTextAlign*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setTextAlign( sal_Int32 /*nTextAlign*/ )
 {
 }
 
-sal_Int32 SAL_CALL ScVbaComboBox::getTextLength() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaComboBox::getTextLength()
 {
     return getText().getLength();
 }
 
-uno::Reference< msforms::XNewFont > SAL_CALL ScVbaComboBox::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XNewFont > SAL_CALL ScVbaComboBox::getFont()
 {
     return new VbaNewFont( m_xProps );
 }
@@ -254,42 +254,42 @@ ScVbaComboBox::getServiceImplName()
     return OUString("ScVbaComboBox");
 }
 
-sal_Int32 SAL_CALL ScVbaComboBox::getBackColor() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaComboBox::getBackColor()
 {
     return ScVbaControl::getBackColor();
 }
 
-void SAL_CALL ScVbaComboBox::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setBackColor( sal_Int32 nBackColor )
 {
     ScVbaControl::setBackColor( nBackColor );
 }
 
-sal_Bool SAL_CALL ScVbaComboBox::getAutoSize() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaComboBox::getAutoSize()
 {
     return ScVbaControl::getAutoSize();
 }
 
-void SAL_CALL ScVbaComboBox::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setAutoSize( sal_Bool bAutoSize )
 {
     ScVbaControl::setAutoSize( bAutoSize );
 }
 
-sal_Bool SAL_CALL ScVbaComboBox::getLocked() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaComboBox::getLocked()
 {
     return ScVbaControl::getLocked();
 }
 
-void SAL_CALL ScVbaComboBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setLocked( sal_Bool bLocked )
 {
     ScVbaControl::setLocked( bLocked );
 }
 
-OUString SAL_CALL ScVbaComboBox::getLinkedCell() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaComboBox::getLinkedCell()
 {
     return ScVbaControl::getControlSource();
 }
 
-void SAL_CALL ScVbaComboBox::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaComboBox::setLinkedCell( const OUString& _linkedcell )
 {
     ScVbaControl::setControlSource( _linkedcell );
 }
diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx
index 18bfa92def4e..1fbd26ba5ec9 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -41,46 +41,46 @@ public:
     ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
 
     // Attributes
-    virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStyle( sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getDropButtonStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDropButtonStyle( sal_Int32 nDropButtonStyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getDragBehavior() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDragBehavior( sal_Int32 nDragBehavior ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getEnterFieldBehavior() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnterFieldBehavior( sal_Int32 nEnterFieldBehavior ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getListStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setListStyle( sal_Int32 nListStyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getTextAlign() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTextAlign( sal_Int32 nTextAlign ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getTextLength() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLinkedCell() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getListIndex() override;
+    virtual ::sal_Int32 SAL_CALL getListCount() override;
+    virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& _text ) override;
+    virtual sal_Int32 SAL_CALL getStyle() override;
+    virtual void SAL_CALL setStyle( sal_Int32 nStyle ) override;
+    virtual sal_Int32 SAL_CALL getDropButtonStyle() override;
+    virtual void SAL_CALL setDropButtonStyle( sal_Int32 nDropButtonStyle ) override;
+    virtual sal_Int32 SAL_CALL getDragBehavior() override;
+    virtual void SAL_CALL setDragBehavior( sal_Int32 nDragBehavior ) override;
+    virtual sal_Int32 SAL_CALL getEnterFieldBehavior() override;
+    virtual void SAL_CALL setEnterFieldBehavior( sal_Int32 nEnterFieldBehavior ) override;
+    virtual sal_Int32 SAL_CALL getListStyle() override;
+    virtual void SAL_CALL setListStyle( sal_Int32 nListStyle ) override;
+    virtual sal_Int32 SAL_CALL getTextAlign() override;
+    virtual void SAL_CALL setTextAlign( sal_Int32 nTextAlign ) override;
+    virtual sal_Int32 SAL_CALL getTextLength() override;
+    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() override;
+    virtual sal_Int32 SAL_CALL getBackColor() override;
+    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) override;
+    virtual sal_Bool SAL_CALL getAutoSize() override;
+    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) override;
+    virtual sal_Bool SAL_CALL getLocked() override;
+    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
+    virtual OUString SAL_CALL getLinkedCell() override;
+    virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) override;
 
     // Methods
-    virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) override;
+    virtual void SAL_CALL removeItem( const css::uno::Any& index ) override;
+    virtual void SAL_CALL Clear(  ) override;
+    virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) override;
     // XControl
-    virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setRowSource( const OUString& _rowsource ) override;
 
     // XDefaultProperty
-        OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+        OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index cf59d6bcae1d..0521d4826d0b 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -67,7 +67,7 @@ using namespace com::sun::star;
 using namespace ooo::vba;
 
 uno::Reference< css::awt::XWindowPeer >
-ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
+ScVbaControl::getWindowPeer()
 {
     uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
 
@@ -104,7 +104,7 @@ private:
 public:
     explicit ScVbaControlListener( ScVbaControl *pTmpControl );
 
-    virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) override;
 };
 
 ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pControl( pTmpControl )
@@ -112,7 +112,7 @@ ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pContro
 }
 
 void SAL_CALL
-ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception )
+ScVbaControlListener::disposing( const lang::EventObject& )
 {
     if( pControl )
     {
@@ -164,7 +164,7 @@ ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
     mpGeometryHelper.reset( pHelper );
 }
 
-void ScVbaControl::removeResource() throw( uno::RuntimeException )
+void ScVbaControl::removeResource()
 {
     uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
     xComponent->removeEventListener( m_xEventListener );
@@ -173,7 +173,7 @@ void ScVbaControl::removeResource() throw( uno::RuntimeException )
 }
 
 //In design model has different behavior
-sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaControl::getEnabled()
 {
     uno::Any aValue = m_xProps->getPropertyValue ( "Enabled" );
     bool bRet = false;
@@ -181,14 +181,14 @@ sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException, std::
     return bRet;
 }
 
-void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible )
 {
     uno::Any aValue( bVisible );
     m_xProps->setPropertyValue(  "Enabled" , aValue);
 
 }
 
-sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaControl::getVisible()
 {
     bool bVisible( true );
     m_xProps->getPropertyValue ( "EnableVisible" ) >>= bVisible;
@@ -205,7 +205,7 @@ sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException, std::
     return bVisible;
 }
 
-void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible )
 {
     uno::Any aValue( bVisible );
     m_xProps->setPropertyValue( "EnableVisible" , aValue);
@@ -216,63 +216,62 @@ void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeE
         xProps->setPropertyValue ( "Visible", aValue );
     }
 }
-double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaControl::getHeight()
 {
     return mpGeometryHelper->getHeight();
 }
-void SAL_CALL ScVbaControl::setHeight( double _height ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControl::setHeight( double _height )
 {
     mpGeometryHelper->setHeight( _height );
 }
 
-double SAL_CALL ScVbaControl::getWidth() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaControl::getWidth()
 {
     return mpGeometryHelper->getWidth();
 }
-void SAL_CALL ScVbaControl::setWidth( double _width ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControl::setWidth( double _width )
 {
     mpGeometryHelper->setWidth( _width );
 }
 
 double SAL_CALL
-ScVbaControl::getLeft() throw (uno::RuntimeException, std::exception)
+ScVbaControl::getLeft()
 {
     return mpGeometryHelper->getLeft();
 }
 
 void SAL_CALL
-ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException, std::exception)
+ScVbaControl::setLeft( double _left )
 {
     mpGeometryHelper->setLeft( _left );
 }
 
 double SAL_CALL
-ScVbaControl::getTop() throw (uno::RuntimeException, std::exception)
+ScVbaControl::getTop()
 {
     return mpGeometryHelper->getTop();
 }
 
 void SAL_CALL
-ScVbaControl::setTop( double _top ) throw (uno::RuntimeException, std::exception)
+ScVbaControl::setTop( double _top )
 {
     mpGeometryHelper->setTop( _top );
 }
 
 uno::Reference< uno::XInterface > SAL_CALL
-ScVbaControl::getObject() throw (uno::RuntimeException, std::exception)
+ScVbaControl::getObject()
 {
     uno::Reference< msforms::XControl > xRet( this );
     return xRet;
 }
 
-void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControl::SetFocus()
 {
     uno::Reference< awt::XWindow > xWin( m_xControl, uno::UNO_QUERY_THROW );
     xWin->setFocus();
 }
 
 void SAL_CALL ScVbaControl::Move( double Left, double Top, const uno::Any& Width, const uno::Any& Height )
-    throw ( uno::RuntimeException, std::exception )
 {
     double nWidth = 0.0;
     double nHeight = 0.0;
@@ -288,7 +287,7 @@ void SAL_CALL ScVbaControl::Move( double Left, double Top, const uno::Any& Width
 }
 
 OUString SAL_CALL
-ScVbaControl::getControlSource() throw (uno::RuntimeException, std::exception)
+ScVbaControl::getControlSource()
 {
 // #FIXME I *hate* having these upstream differences
 // but this is necessary until I manage to upstream other
@@ -315,7 +314,7 @@ ScVbaControl::getControlSource() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaControl::setControlSource( const OUString& _controlsource ) throw (uno::RuntimeException, std::exception)
+ScVbaControl::setControlSource( const OUString& _controlsource )
 {
     // afaik this is only relevant for Excel documents ( and we need to set up a
     // reference tab in case no Sheet is specified in "_controlsource"
@@ -354,7 +353,7 @@ ScVbaControl::setControlSource( const OUString& _controlsource ) throw (uno::Run
 }
 
 OUString SAL_CALL
-ScVbaControl::getRowSource() throw (uno::RuntimeException, std::exception)
+ScVbaControl::getRowSource()
 {
     OUString sRowSource;
     uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY );
@@ -379,13 +378,13 @@ ScVbaControl::getRowSource() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaControl::setRowSource( const OUString& _rowsource ) throw (uno::RuntimeException, std::exception)
+ScVbaControl::setRowSource( const OUString& _rowsource )
 {
     svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, "", _rowsource );
 }
 
 OUString SAL_CALL
-ScVbaControl::getName() throw (uno::RuntimeException, std::exception)
+ScVbaControl::getName()
 {
     OUString sName;
     m_xProps->getPropertyValue( "Name" ) >>= sName;
@@ -394,13 +393,13 @@ ScVbaControl::getName() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaControl::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception)
+ScVbaControl::setName( const OUString& _name )
 {
     m_xProps->setPropertyValue( "Name" , uno::makeAny( _name ) );
     }
 
 OUString SAL_CALL
-ScVbaControl::getControlTipText() throw (css::uno::RuntimeException, std::exception)
+ScVbaControl::getControlTipText()
 {
     OUString sName;
     m_xProps->getPropertyValue( "HelpText" ) >>= sName;
@@ -408,24 +407,22 @@ ScVbaControl::getControlTipText() throw (css::uno::RuntimeException, std::except
 }
 
 void SAL_CALL
-ScVbaControl::setControlTipText( const OUString& rsToolTip ) throw (css::uno::RuntimeException, std::exception)
+ScVbaControl::setControlTipText( const OUString& rsToolTip )
 {
     m_xProps->setPropertyValue( "HelpText" , uno::makeAny( rsToolTip ) );
 }
 
 OUString SAL_CALL ScVbaControl::getTag()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_aControlTag;
 }
 
 void SAL_CALL ScVbaControl::setTag( const OUString& aTag )
-    throw (css::uno::RuntimeException, std::exception)
 {
     m_aControlTag = aTag;
 }
 
-::sal_Int32 SAL_CALL ScVbaControl::getForeColor() throw (css::uno::RuntimeException)
+::sal_Int32 SAL_CALL ScVbaControl::getForeColor()
 {
     sal_Int32 nForeColor = -1;
     m_xProps->getPropertyValue( "TextColor" ) >>= nForeColor;
@@ -489,7 +486,7 @@ static Pointer lcl_msoPointerToLOPointer( long msoPointerStyle )
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaControl::getMousePointer() throw (css::uno::RuntimeException, std::exception)
+ScVbaControl::getMousePointer()
 {
     PointerStyle eType = PointerStyle::Arrow; // default ?
     VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getWindowPeer() );
@@ -501,7 +498,7 @@ ScVbaControl::getMousePointer() throw (css::uno::RuntimeException, std::exceptio
 }
 
 void SAL_CALL
-ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) throw (css::uno::RuntimeException, std::exception)
+ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer )
 {
     VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( getWindowPeer() );
     if ( pWindow )
@@ -512,7 +509,7 @@ ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) throw (css::uno::Runt
     }
 }
 
-void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt )
 {
     script::ScriptEvent evt( rEvt );
     uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
@@ -583,12 +580,12 @@ void ScVbaControl::fireClickEvent()
     fireEvent( evt );
 }
 
-sal_Int32 SAL_CALL ScVbaControl::getTabIndex() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaControl::getTabIndex()
 {
     return 1;
 }
 
-void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ )
 {
 }
 
@@ -597,7 +594,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R
 /*static*/ uno::Reference< msforms::XControl > ScVbaControlFactory::createShapeControl(
         const uno::Reference< uno::XComponentContext >& xContext,
         const uno::Reference< drawing::XControlShape >& xControlShape,
-        const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+        const uno::Reference< frame::XModel >& xModel )
 {
     uno::Reference< beans::XPropertySet > xProps( xControlShape->getControl(), uno::UNO_QUERY_THROW );
     sal_Int32 nClassId = -1;
@@ -643,7 +640,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R
         const uno::Reference< awt::XControl >& xControl,
         const uno::Reference< awt::XControl >& xDialog,
         const uno::Reference< frame::XModel >& xModel,
-        double fOffsetX, double fOffsetY ) throw (uno::RuntimeException)
+        double fOffsetX, double fOffsetY )
 {
     uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
     uno::Reference< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW );
@@ -716,14 +713,14 @@ ScVbaControl::getServiceNames()
 
 sal_Int32 const nSysCols[] = { 0xC8D0D4, 0x0, 0x6A240A, 0x808080, 0xE4E4E4, 0xFFFFFF, 0x0, 0x0, 0x0, 0xFFFFFF, 0xE4E4E4, 0xE4E4E4, 0x808080, 0x6A240A, 0xFFFFFF, 0xE4E4E4, 0x808080, 0x808080, 0x0, 0xC8D0D4, 0xFFFFFF, 0x404040, 0xE4E4E4, 0x0, 0xE1FFFF };
 
-sal_Int32 ScVbaControl::getBackColor() throw (uno::RuntimeException)
+sal_Int32 ScVbaControl::getBackColor()
 {
     sal_Int32 nBackColor = 0;
     m_xProps->getPropertyValue( "BackgroundColor" ) >>= nBackColor;
     return nBackColor;
 }
 
-void ScVbaControl::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException)
+void ScVbaControl::setBackColor( sal_Int32 nBackColor )
 {
     if ( ( (sal_uInt32)nBackColor >= (sal_uInt32)0x80000000 ) &&
          ( (sal_uInt32)nBackColor <= (sal_uInt32)0x80000000 + SAL_N_ELEMENTS(nSysCols) ) )
@@ -733,7 +730,7 @@ void ScVbaControl::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeExcep
     m_xProps->setPropertyValue( "BackgroundColor" , uno::makeAny( XLRGBToOORGB( nBackColor ) ) );
 }
 
-bool ScVbaControl::getAutoSize() throw (uno::RuntimeException)
+bool ScVbaControl::getAutoSize()
 {
     bool bIsResizeEnabled = false;
     uno::Reference< uno::XInterface > xIf( m_xControl, uno::UNO_QUERY_THROW );
@@ -744,7 +741,7 @@ bool ScVbaControl::getAutoSize() throw (uno::RuntimeException)
 }
 
 // currently no implementation for this
-void ScVbaControl::setAutoSize( bool bAutoSize ) throw (uno::RuntimeException)
+void ScVbaControl::setAutoSize( bool bAutoSize )
 {
     uno::Reference< uno::XInterface > xIf( m_xControl, uno::UNO_QUERY_THROW );
     SdrObject* pObj = SdrObject::getSdrObjectFromXShape( xIf );
@@ -752,14 +749,14 @@ void ScVbaControl::setAutoSize( bool bAutoSize ) throw (uno::RuntimeException)
         pObj->SetResizeProtect( !bAutoSize );
 }
 
-bool ScVbaControl::getLocked() throw (uno::RuntimeException)
+bool ScVbaControl::getLocked()
 {
     bool bRes( false );
     m_xProps->getPropertyValue( "ReadOnly" ) >>= bRes;
     return bRes;
 }
 
-void ScVbaControl::setLocked( bool bLocked ) throw (uno::RuntimeException)
+void ScVbaControl::setLocked( bool bLocked )
 {
     m_xProps->setPropertyValue( "ReadOnly" , uno::makeAny( bLocked ) );
 }
@@ -769,11 +766,11 @@ class ControlProviderImpl : public cppu::WeakImplHelper< XControlProvider >
     uno::Reference< uno::XComponentContext > m_xCtx;
 public:
     explicit ControlProviderImpl( const uno::Reference< uno::XComponentContext >& xCtx ) : m_xCtx( xCtx ) {}
-    virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const uno::Reference< drawing::XControlShape >& xControl, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException, std::exception) override;
+    virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const uno::Reference< drawing::XControlShape >& xControl, const uno::Reference< frame::XModel >& xDocOwner ) override;
 };
 
 uno::Reference< msforms::XControl > SAL_CALL
-ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException, std::exception)
+ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< frame::XModel >& xDocOwner )
 {
     uno::Reference< msforms::XControl > xControlToReturn;
     if ( xControlShape.is() )
diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx
index acbe760e9f8a..51bcb958480d 100644
--- a/vbahelper/source/msforms/vbacontrol.hxx
+++ b/vbahelper/source/msforms/vbacontrol.hxx
@@ -52,7 +52,7 @@ protected:
     css::uno::Reference< css::frame::XModel > m_xModel;
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::awt::XWindowPeer > getWindowPeer();
     void fireChangeEvent();
     void fireClickEvent();
 public:
@@ -66,59 +66,59 @@ public:
     void setLibraryAndCodeName( const OUString& sLibCodeName ) { m_sLibraryAndCodeName = sLibCodeName; }
 
     // XControl
-    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL SetFocus(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Move( double Left, double Top, const css::uno::Any& Width, const css::uno::Any& Height ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL fireEvent( const css::script::ScriptEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getEnabled() override;
+    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+    virtual double SAL_CALL getHeight() override;
+    virtual void SAL_CALL setHeight( double _height ) override;
+    virtual double SAL_CALL getWidth() override;
+    virtual void SAL_CALL setWidth( double _width ) override;
+    virtual double SAL_CALL getLeft() override;
+    virtual void SAL_CALL setLeft( double _left ) override;
+    virtual double SAL_CALL getTop() override;
+    virtual void SAL_CALL setTop( double _top ) override;
+    virtual void SAL_CALL SetFocus(  ) override;
+    virtual void SAL_CALL Move( double Left, double Top, const css::uno::Any& Width, const css::uno::Any& Height ) override;
+    virtual void SAL_CALL fireEvent( const css::script::ScriptEvent& evt ) override;
 
-    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setControlSource( const OUString& _controlsource ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getControlTipText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setControlTipText( const OUString& ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getTag() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTag( const OUString& aTag ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getTabIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTabIndex( sal_Int32 nTabIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getMousePointer() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMousePointer( ::sal_Int32 _mousepointer ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() override;
+    virtual OUString SAL_CALL getControlSource() override;
+    virtual void SAL_CALL setControlSource( const OUString& _controlsource ) override;
+    virtual OUString SAL_CALL getRowSource() override;
+    virtual void SAL_CALL setRowSource( const OUString& _rowsource ) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& _name ) override;
+    virtual OUString SAL_CALL getControlTipText() override;
+    virtual void SAL_CALL setControlTipText( const OUString& ) override;
+    virtual OUString SAL_CALL getTag() override;
+    virtual void SAL_CALL setTag( const OUString& aTag ) override;
+    virtual sal_Int32 SAL_CALL getTabIndex() override;
+    virtual void SAL_CALL setTabIndex( sal_Int32 nTabIndex ) override;
+    virtual ::sal_Int32 SAL_CALL getMousePointer() override;
+    virtual void SAL_CALL setMousePointer( ::sal_Int32 _mousepointer ) override;
     //remove resource because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
     /// @throws css::uno::RuntimeException
-    void removeResource() throw( css::uno::RuntimeException );
+    void removeResource();
     /// @throws css::uno::RuntimeException
-    virtual ::sal_Int32 SAL_CALL getForeColor() throw (css::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getForeColor();
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     //General helper methods for properties (may or may not be relevant for all
     //controls)
     /// @throws css::uno::RuntimeException
-    sal_Int32 getBackColor() throw (css::uno::RuntimeException);
+    sal_Int32 getBackColor();
     /// @throws css::uno::RuntimeException
-    void setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException);
+    void setBackColor( sal_Int32 nBackColor );
     /// @throws css::uno::RuntimeException
-    bool getAutoSize() throw (css::uno::RuntimeException);
+    bool getAutoSize();
     /// @throws css::uno::RuntimeException
-    void setAutoSize( bool bAutoSize ) throw (css::uno::RuntimeException);
+    void setAutoSize( bool bAutoSize );
     /// @throws css::uno::RuntimeException
-    bool getLocked() throw (css::uno::RuntimeException);
+    bool getLocked();
     /// @throws css::uno::RuntimeException
-    void setLocked( bool bAutoSize ) throw (css::uno::RuntimeException);
+    void setLocked( bool bAutoSize );
 };
 
 
@@ -128,7 +128,7 @@ namespace ScVbaControlFactory
     css::uno::Reference< ov::msforms::XControl > createShapeControl(
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const css::uno::Reference< css::drawing::XControlShape >& xControlShape,
-        const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::frame::XModel >& xModel );
 
     /// @throws css::uno::RuntimeException
     css::uno::Reference< ov::msforms::XControl > createUserformControl(
@@ -136,7 +136,7 @@ namespace ScVbaControlFactory
         const css::uno::Reference< css::awt::XControl >& xControl,
         const css::uno::Reference< css::awt::XControl >& xDialog,
         const css::uno::Reference< css::frame::XModel >& xModel,
-        double fOffsetX, double fOffsetY ) throw (css::uno::RuntimeException);
+        double fOffsetX, double fOffsetY );
 }
 
 #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROL_HXX
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index cfe9f06dd640..0fb456a99829 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -111,42 +111,42 @@ public:
 
 
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<awt::XControl>::get();
     }
 
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return ( !mControls.empty() );
     }
 
     // XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         if ( !hasByName( aName ) )
             throw container::NoSuchElementException();
         return getByIndex( mIndices[ aName ] );
     }
 
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         return msNames;
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         ControlIndexMap::iterator it = mIndices.find( aName );
         return it != mIndices.end();
     }
 
     // XElementAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         return mControls.size();
     }
 
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) )
             throw lang::IndexOutOfBoundsException();
@@ -181,12 +181,12 @@ public:
     mfOffsetY( fOffsetY ),
     nIndex( 0 ) {}
 
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return ( nIndex < m_xIndexAccess->getCount() );
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( nIndex < m_xIndexAccess->getCount() )
         {
@@ -225,7 +225,7 @@ ScVbaControls::ScVbaControls(
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaControls::createEnumeration() throw (uno::RuntimeException)
+ScVbaControls::createEnumeration()
 {
     uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxContext, m_xIndexAccess, mxDialog, mxModel, mfOffsetX, mfOffsetY ) );
     if ( !xEnum.is() )
@@ -243,7 +243,7 @@ ScVbaControls::createCollectionObject( const css::uno::Any& aSource )
 }
 
 void SAL_CALL
-ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException, std::exception)
+ScVbaControls::Move( double cx, double cy )
 {
     uno::Reference< container::XEnumeration > xEnum( createEnumeration() );
     while ( xEnum->hasMoreElements() )
@@ -255,7 +255,6 @@ ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException, std::e
 }
 
 uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& Object, const uno::Any& StringKey, const uno::Any& /*Before*/, const uno::Any& /*After*/ )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Any aResult;
     OUString aComServiceName;
@@ -438,7 +437,6 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& Object, const uno::Any& St
 }
 
 void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex )
-    throw (uno::RuntimeException, std::exception)
 {
     OUString aControlName;
     sal_Int32 nIndex = -1;
@@ -492,7 +490,7 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex )
 
 
 uno::Type
-ScVbaControls::getElementType() throw (uno::RuntimeException)
+ScVbaControls::getElementType()
 {
     return cppu::UnoType<ooo::vba::msforms::XControl>::get();
 }
diff --git a/vbahelper/source/msforms/vbacontrols.hxx b/vbahelper/source/msforms/vbacontrols.hxx
index f123b018da69..1e9d95042633 100644
--- a/vbahelper/source/msforms/vbacontrols.hxx
+++ b/vbahelper/source/msforms/vbacontrols.hxx
@@ -37,13 +37,13 @@ public:
         const css::uno::Reference< css::frame::XModel >& xModel,
         double fOffsetX, double fOffsetY );
     // XControls
-    virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Object, const css::uno::Any& StringKey, const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Remove( const css::uno::Any& StringKeyOrIndex ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Move( double cx, double cy ) override;
+    virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Object, const css::uno::Any& StringKey, const css::uno::Any& Before, const css::uno::Any& After ) override;
+    virtual void SAL_CALL Remove( const css::uno::Any& StringKeyOrIndex ) override;
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
diff --git a/vbahelper/source/msforms/vbaframe.cxx b/vbahelper/source/msforms/vbaframe.cxx
index 775b3810cb1e..e85e313148b6 100644
--- a/vbahelper/source/msforms/vbaframe.cxx
+++ b/vbahelper/source/msforms/vbaframe.cxx
@@ -40,47 +40,47 @@ ScVbaFrame::ScVbaFrame(
 
 // XFrame attributes
 
-OUString SAL_CALL ScVbaFrame::getCaption() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaFrame::getCaption()
 {
     OUString Label;
     m_xProps->getPropertyValue( "Label" ) >>= Label;
     return Label;
 }
 
-void SAL_CALL ScVbaFrame::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaFrame::setCaption( const OUString& _caption )
 {
     m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
 }
 
-sal_Int32 SAL_CALL ScVbaFrame::getSpecialEffect() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaFrame::getSpecialEffect()
 {
     return msforms::fmSpecialEffect::fmSpecialEffectEtched;
 }
 
 
-void SAL_CALL ScVbaFrame::setSpecialEffect( sal_Int32 /*nSpecialEffect*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaFrame::setSpecialEffect( sal_Int32 /*nSpecialEffect*/ )
 {
     // #STUB
 }
 
-sal_Int32 SAL_CALL ScVbaFrame::getBorderStyle() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaFrame::getBorderStyle()
 {
     return msforms::fmBorderStyle::fmBorderStyleNone;
 }
 
-void SAL_CALL ScVbaFrame::setBorderStyle( sal_Int32 /*nBorderStyle*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaFrame::setBorderStyle( sal_Int32 /*nBorderStyle*/ )
 {
     // #STUB
 }
 
-uno::Reference< msforms::XNewFont > SAL_CALL ScVbaFrame::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XNewFont > SAL_CALL ScVbaFrame::getFont()
 {
     return new VbaNewFont( m_xProps );
 }
 
 // XFrame methods
 
-uno::Any SAL_CALL ScVbaFrame::Controls( const uno::Any& rIndex ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaFrame::Controls( const uno::Any& rIndex )
 {
     // horizontal anchor of frame children is inside border line (add one unit to compensate border line width)
     double fOffsetX = mpGeometryHelper->getOffsetX() + getLeft() + 1.0;
diff --git a/vbahelper/source/msforms/vbaframe.hxx b/vbahelper/source/msforms/vbaframe.hxx
index 6fe40c67b369..10e2374cde38 100644
--- a/vbahelper/source/msforms/vbaframe.hxx
+++ b/vbahelper/source/msforms/vbaframe.hxx
@@ -40,16 +40,16 @@ public:
         const css::uno::Reference< css::awt::XControl >& xDialog );
 
     // XFrame attributes
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-
-    virtual sal_Int32 SAL_CALL getSpecialEffect() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSpecialEffect( sal_Int32 nSpecialEffect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBorderStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBorderStyle( sal_Int32 nBorderStyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+
+    virtual sal_Int32 SAL_CALL getSpecialEffect() override;
+    virtual void SAL_CALL setSpecialEffect( sal_Int32 nSpecialEffect ) override;
+    virtual sal_Int32 SAL_CALL getBorderStyle() override;
+    virtual void SAL_CALL setBorderStyle( sal_Int32 nBorderStyle ) override;
+    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() override;
     // XFrame methods
-    css::uno::Any SAL_CALL Controls( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL Controls( const css::uno::Any& rIndex ) override;
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx
index 0515a111bcf0..26f85fa9ac1a 100644
--- a/vbahelper/source/msforms/vbaimage.cxx
+++ b/vbahelper/source/msforms/vbaimage.cxx
@@ -44,12 +44,12 @@ ScVbaImage::getServiceNames()
     return aServiceNames;
 }
 
-sal_Int32 SAL_CALL ScVbaImage::getBackColor() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaImage::getBackColor()
 {
     return ScVbaControl::getBackColor();
 }
 
-void SAL_CALL ScVbaImage::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaImage::setBackColor( sal_Int32 nBackColor )
 {
     ScVbaControl::setBackColor( nBackColor );
 }
diff --git a/vbahelper/source/msforms/vbaimage.hxx b/vbahelper/source/msforms/vbaimage.hxx
index 1d254b255dd9..ac6f5e803b36 100644
--- a/vbahelper/source/msforms/vbaimage.hxx
+++ b/vbahelper/source/msforms/vbaimage.hxx
@@ -30,8 +30,8 @@ class ScVbaImage : public ImageImpl_BASE
 {
 public:
     ScVbaImage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
-    virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackColor() override;
+    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) override;
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx
index eb714c8121eb..e952d663e358 100644
--- a/vbahelper/source/msforms/vbalabel.cxx
+++ b/vbahelper/source/msforms/vbalabel.cxx
@@ -29,7 +29,7 @@ ScVbaLabel::ScVbaLabel(  const css::uno::Reference< XHelperInterface >& xParent,
 
 // Attributes
 OUString SAL_CALL
-ScVbaLabel::getCaption() throw (css::uno::RuntimeException, std::exception)
+ScVbaLabel::getCaption()
 {
     OUString Label;
     m_xProps->getPropertyValue( "Label" ) >>= Label;
@@ -37,18 +37,18 @@ ScVbaLabel::getCaption() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaLabel::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception)
+ScVbaLabel::setCaption( const OUString& _caption )
 {
     m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
 }
 uno::Any SAL_CALL
-ScVbaLabel::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaLabel::getValue()
 {
     return uno::makeAny( getCaption() );
 }
 
 void SAL_CALL
-ScVbaLabel::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception)
+ScVbaLabel::setValue( const uno::Any& _value )
 {
     OUString sCaption;
     _value >>= sCaption;
@@ -56,19 +56,19 @@ ScVbaLabel::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException
 }
 
 OUString SAL_CALL
-ScVbaLabel::getAccelerator() throw (css::uno::RuntimeException, std::exception)
+ScVbaLabel::getAccelerator()
 {
     // #STUB
     return OUString();
 }
 
 void SAL_CALL
-ScVbaLabel::setAccelerator( const OUString& /*_accelerator*/ ) throw (css::uno::RuntimeException, std::exception)
+ScVbaLabel::setAccelerator( const OUString& /*_accelerator*/ )
 {
     // #STUB
 }
 
-uno::Reference< msforms::XNewFont > SAL_CALL ScVbaLabel::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XNewFont > SAL_CALL ScVbaLabel::getFont()
 {
     return new VbaNewFont( m_xProps );
 }
@@ -78,22 +78,22 @@ OUString ScVbaLabel::getServiceImplName()
     return OUString( "ScVbaLabel" );
 }
 
-sal_Int32 SAL_CALL ScVbaLabel::getBackColor() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaLabel::getBackColor()
 {
     return ScVbaControl::getBackColor();
 }
 
-void SAL_CALL ScVbaLabel::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaLabel::setBackColor( sal_Int32 nBackColor )
 {
     ScVbaControl::setBackColor( nBackColor );
 }
 
-sal_Bool SAL_CALL ScVbaLabel::getAutoSize() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaLabel::getAutoSize()
 {
     return ScVbaControl::getAutoSize();
 }
 
-void SAL_CALL ScVbaLabel::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaLabel::setAutoSize( sal_Bool bAutoSize )
 {
     ScVbaControl::setAutoSize( bAutoSize );
 }
diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx
index 047b466c6571..798952faa587 100644
--- a/vbahelper/source/msforms/vbalabel.hxx
+++ b/vbahelper/source/msforms/vbalabel.hxx
@@ -31,22 +31,22 @@ class ScVbaLabel : public LabelImpl_BASE
 public:
     ScVbaLabel( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
    // Attributes
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccelerator() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAccelerator( const OUString& _accelerator ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+    virtual OUString SAL_CALL getAccelerator() override;
+    virtual void SAL_CALL setAccelerator( const OUString& _accelerator ) override;
+    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() override;
+    virtual sal_Int32 SAL_CALL getBackColor() override;
+    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) override;
+    virtual sal_Bool SAL_CALL getAutoSize() override;
+    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) override;
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
 };
 #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBALABEL_HXX
 
diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx
index 19d3ce26129a..3e94440f5a1a 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -36,7 +36,7 @@ ScVbaListBox::ScVbaListBox( const uno::Reference< XHelperInterface >& xParent, c
 
 // Attributes
 void SAL_CALL
-ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException, std::exception)
+ScVbaListBox::setListIndex( const uno::Any& _value )
 {
     sal_Int32 nIndex = 0;
     _value >>= nIndex;
@@ -45,7 +45,7 @@ ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-ScVbaListBox::getListIndex() throw (uno::RuntimeException, std::exception)
+ScVbaListBox::getListIndex()
 {
     uno::Sequence< sal_Int16 > sSelection;
     m_xProps->getPropertyValue( "SelectedItems" ) >>= sSelection;
@@ -55,7 +55,7 @@ ScVbaListBox::getListIndex() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Any SAL_CALL
-ScVbaListBox::getValue() throw (uno::RuntimeException, std::exception)
+ScVbaListBox::getValue()
 {
     uno::Sequence< sal_Int16 > sSelection;
     uno::Sequence< OUString > sItems;
@@ -70,7 +70,7 @@ ScVbaListBox::getValue() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException, std::exception)
+ScVbaListBox::setValue( const uno::Any& _value )
 {
     if( getMultiSelect() )
     {
@@ -103,7 +103,7 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException, s
 }
 
 OUString SAL_CALL
-ScVbaListBox::getText() throw (uno::RuntimeException, std::exception)
+ScVbaListBox::getText()
 {
     OUString result;
     getValue() >>= result;
@@ -111,13 +111,13 @@ ScVbaListBox::getText() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaListBox::setText( const OUString& _text ) throw (uno::RuntimeException, std::exception)
+ScVbaListBox::setText( const OUString& _text )
 {
     setValue( uno::makeAny( _text ) ); // seems the same
 }
 
 sal_Int32 SAL_CALL
-ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException, std::exception)
+ScVbaListBox::getMultiSelect()
 {
     bool bMultiSelect = false;
     m_xProps->getPropertyValue( "MultiSelection" ) >>= bMultiSelect;
@@ -126,7 +126,7 @@ ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException, std::exception
 }
 
 void SAL_CALL
-ScVbaListBox::setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeException, std::exception)
+ScVbaListBox::setMultiSelect( sal_Int32 _multiselect )
 {
     bool bBoolVal = false;
     switch ( _multiselect )
@@ -147,7 +147,7 @@ ScVbaListBox::setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeE
 
 
 css::uno::Any SAL_CALL
-ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException, std::exception)
+ScVbaListBox::Selected( sal_Int32 index )
 {
     uno::Sequence< OUString > sList;
     m_xProps->getPropertyValue( "StringItemList" ) >>= sList;
@@ -163,19 +163,19 @@ ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException, std
 
 // Methods
 void SAL_CALL
-ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException, std::exception)
+ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex )
 {
     mpListHelper->AddItem( pvargItem, pvargIndex );
         }
 
 void SAL_CALL
-ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+ScVbaListBox::removeItem( const uno::Any& index )
 {
     mpListHelper->removeItem( index );
 }
 
 void SAL_CALL
-ScVbaListBox::Clear(  ) throw (uno::RuntimeException, std::exception)
+ScVbaListBox::Clear(  )
 {
     mpListHelper->Clear();
 }
@@ -254,25 +254,25 @@ ScVbaListBox::getValueEvent()
 }
 
 void SAL_CALL
-ScVbaListBox::setRowSource( const OUString& _rowsource ) throw (uno::RuntimeException, std::exception)
+ScVbaListBox::setRowSource( const OUString& _rowsource )
 {
     ScVbaControl::setRowSource( _rowsource );
     mpListHelper->setRowSource( _rowsource );
 }
 
 sal_Int32 SAL_CALL
-ScVbaListBox::getListCount() throw (uno::RuntimeException, std::exception)
+ScVbaListBox::getListCount()
 {
     return mpListHelper->getListCount();
 }
 
 uno::Any SAL_CALL
-ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException, std::exception)
+ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn )
 {
     return mpListHelper->List( pvargIndex, pvarColumn );
 }
 
-uno::Reference< msforms::XNewFont > SAL_CALL ScVbaListBox::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XNewFont > SAL_CALL ScVbaListBox::getFont()
 {
     return new VbaNewFont( m_xProps );
 }
diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx
index d2f939a6376f..d51410d31e9c 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -41,28 +41,28 @@ public:
     ScVbaListBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
 
     // Attributes
-    virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMultiSelect() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMultiSelect( sal_Int32 _multiselect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getListIndex() override;
+    virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) override;
+    virtual ::sal_Int32 SAL_CALL getListCount() override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& _text ) override;
+    virtual sal_Int32 SAL_CALL getMultiSelect() override;
+    virtual void SAL_CALL setMultiSelect( sal_Int32 _multiselect ) override;
+    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Clear(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) override;
+    virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) override;
+    virtual void SAL_CALL removeItem( const css::uno::Any& index ) override;
+    virtual void SAL_CALL Clear(  ) override;
+    virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) override;
     // XControl
-    virtual void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setRowSource( const OUString& _rowsource ) override;
 
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
 
     //XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index 6166154ca0d8..a0a9c73b3964 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
@@ -81,7 +81,7 @@ uno::Any ListPropListener::getValueEvent()
 }
 
 void SAL_CALL
-ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
+ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex )
 {
     if ( pvargItem.hasValue()  )
     {
@@ -136,7 +136,7 @@ ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargInde
 }
 
 void SAL_CALL
-ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
+ListControlHelper::removeItem( const uno::Any& index )
 {
     sal_Int32 nIndex = 0;
     // for int index
@@ -165,7 +165,7 @@ ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeExcept
 }
 
 void SAL_CALL
-ListControlHelper::Clear(  ) throw (uno::RuntimeException)
+ListControlHelper::Clear(  )
 {
     // urk, setValue doesn't seem to work !!
     //setValue( uno::makeAny( sal_Int16() ) );
@@ -173,14 +173,14 @@ ListControlHelper::Clear(  ) throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ListControlHelper::setRowSource( const OUString& _rowsource ) throw (uno::RuntimeException)
+ListControlHelper::setRowSource( const OUString& _rowsource )
 {
     if ( _rowsource.isEmpty() )
         Clear();
 }
 
 sal_Int32 SAL_CALL
-ListControlHelper::getListCount() throw (uno::RuntimeException)
+ListControlHelper::getListCount()
 {
     uno::Sequence< OUString > sList;
     m_xProps->getPropertyValue( "StringItemList" ) >>= sList;
@@ -188,7 +188,7 @@ ListControlHelper::getListCount() throw (uno::RuntimeException)
 }
 
 uno::Any SAL_CALL
-ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
+ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn )
 {
     return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( new ListPropListener( m_xProps, pvargIndex, pvarColumn ) ) ) );
 }
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.hxx b/vbahelper/source/msforms/vbalistcontrolhelper.hxx
index d83734d93802..334f7347603f 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.hxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.hxx
@@ -29,17 +29,17 @@ class ListControlHelper final
 public:
     explicit ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
     /// @throws css::uno::RuntimeException
-    void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
+    void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex );
     /// @throws css::uno::RuntimeException
-    void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
+    void SAL_CALL removeItem( const css::uno::Any& index );
     /// @throws css::uno::RuntimeException
-        void SAL_CALL setRowSource( const OUString& _rowsource ) throw (css::uno::RuntimeException);
+        void SAL_CALL setRowSource( const OUString& _rowsource );
     /// @throws css::uno::RuntimeException
-    ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
+    ::sal_Int32 SAL_CALL getListCount();
     /// @throws css::uno::RuntimeException
-    css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
+    css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn );
     /// @throws css::uno::RuntimeException
-    void SAL_CALL Clear(  ) throw (css::uno::RuntimeException);
+    void SAL_CALL Clear(  );
 };
 
 #endif
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 5ac79e3ad333..89282b4b1249 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -32,21 +32,21 @@ class PagesImpl : public cppu::WeakImplHelper< container::XIndexAccess >
     sal_Int32 mnPages;
 public:
     explicit PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
-    virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override { return mnPages; }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount() override { return mnPages; }
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0 || Index > mnPages )
             throw lang::IndexOutOfBoundsException();
         return uno::makeAny( uno::Reference< uno::XInterface >() );
     }
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType() override
     {
         // no Pages object yet #FIXME
         //return cppu::UnoType<msforms::XPage>::get();
         return cppu::UnoType<uno::XInterface>::get();
     }
-    virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements( ) override
     {
         return ( mnPages > 0 );
     }
@@ -64,7 +64,7 @@ ScVbaMultiPage::ScVbaMultiPage(
 
 // Attributes
 sal_Int32 SAL_CALL
-ScVbaMultiPage::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaMultiPage::getValue()
 {
     sal_Int32 nValue = 0;
     m_xProps->getPropertyValue( SVALUE ) >>= nValue;
@@ -73,7 +73,7 @@ ScVbaMultiPage::getValue() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (css::uno::RuntimeException, std::exception)
+ScVbaMultiPage::setValue( const sal_Int32 _value )
 {
     // Openoffice 1 based tab index
     sal_Int32 nVal = _value + 1;
@@ -90,7 +90,7 @@ ScVbaMultiPage::getServiceImplName()
 }
 
 uno::Any SAL_CALL
-ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+ScVbaMultiPage::Pages( const uno::Any& index )
 {
     // get the container model
     uno::Reference< container::XNameContainer > xContainer( m_xProps, uno::UNO_QUERY_THROW );
diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx
index ba260cfb0cc0..d6d306eaa4b6 100644
--- a/vbahelper/source/msforms/vbamultipage.hxx
+++ b/vbahelper/source/msforms/vbamultipage.hxx
@@ -40,9 +40,9 @@ public:
         ov::AbstractGeometryAttributes* pGeomHelper);
 
    // Attributes
-    virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( sal_Int32 _value ) override;
+    virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) override;
 
     //XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/vbahelper/source/msforms/vbanewfont.cxx b/vbahelper/source/msforms/vbanewfont.cxx
index 39293ade4095..30860e10a0ef 100644
--- a/vbahelper/source/msforms/vbanewfont.cxx
+++ b/vbahelper/source/msforms/vbanewfont.cxx
@@ -30,42 +30,42 @@ using namespace ::ooo::vba;
 
 
 VbaNewFont::VbaNewFont(
-        const uno::Reference< beans::XPropertySet >& rxModelProps ) throw (uno::RuntimeException) :
+        const uno::Reference< beans::XPropertySet >& rxModelProps ) :
     mxProps( rxModelProps, uno::UNO_SET_THROW )
 {
 }
 
 // XNewFont attributes
 
-OUString SAL_CALL VbaNewFont::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL VbaNewFont::getName()
 {
     uno::Any aAny = mxProps->getPropertyValue( "FontName" );
     return aAny.get< OUString >();
 }
 
-void SAL_CALL VbaNewFont::setName( const OUString& rName ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaNewFont::setName( const OUString& rName )
 {
     mxProps->setPropertyValue( "FontName" , uno::Any( rName ) );
 }
 
-double SAL_CALL VbaNewFont::getSize() throw (uno::RuntimeException, std::exception)
+double SAL_CALL VbaNewFont::getSize()
 {
     uno::Any aAny = mxProps->getPropertyValue( "FontHeight" );
     return aAny.get< float >();
 }
 
-void SAL_CALL VbaNewFont::setSize( double fSize ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaNewFont::setSize( double fSize )
 {
     mxProps->setPropertyValue( "FontHeight" , uno::Any( static_cast< float >( fSize ) ) );
 }
 
-sal_Int16 SAL_CALL VbaNewFont::getCharset() throw (uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL VbaNewFont::getCharset()
 {
     uno::Any aAny = mxProps->getPropertyValue( "FontCharset" );
     return rtl_getBestWindowsCharsetFromTextEncoding( static_cast< rtl_TextEncoding >( aAny.get< sal_Int16 >() ) );
 }
 
-void SAL_CALL VbaNewFont::setCharset( sal_Int16 nCharset ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaNewFont::setCharset( sal_Int16 nCharset )
 {
     rtl_TextEncoding eFontEnc = RTL_TEXTENCODING_DONTKNOW;
     if( (0 <= nCharset) && (nCharset <= SAL_MAX_UINT8) )
@@ -75,56 +75,56 @@ void SAL_CALL VbaNewFont::setCharset( sal_Int16 nCharset ) throw (uno::RuntimeEx
     mxProps->setPropertyValue( "FontCharset" , uno::Any( static_cast< sal_Int16 >( eFontEnc ) ) );
 }
 
-sal_Int16 SAL_CALL VbaNewFont::getWeight() throw (uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL VbaNewFont::getWeight()
 {
     return getBold() ? 700 : 400;
 }
 
-void SAL_CALL VbaNewFont::setWeight( sal_Int16 nWeight ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaNewFont::setWeight( sal_Int16 nWeight )
 {
     setBold( nWeight >= 700 );
 }
 
-sal_Bool SAL_CALL VbaNewFont::getBold() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaNewFont::getBold()
 {
     uno::Any aAny = mxProps->getPropertyValue( "FontWeight" );
     return aAny.get< float >() > awt::FontWeight::NORMAL;
 }
 
-void SAL_CALL VbaNewFont::setBold( sal_Bool bBold ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaNewFont::setBold( sal_Bool bBold )
 {
     mxProps->setPropertyValue( "FontWeight" , uno::Any( bBold ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL ) );
 }
 
-sal_Bool SAL_CALL VbaNewFont::getItalic() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaNewFont::getItalic()
 {
     uno::Any aAny = mxProps->getPropertyValue( "FontSlant" );
     return aAny.get< awt::FontSlant >() != awt::FontSlant_NONE;
 }
 
-void SAL_CALL VbaNewFont::setItalic( sal_Bool bItalic ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaNewFont::setItalic( sal_Bool bItalic )
 {
     mxProps->setPropertyValue( "FontSlant" , uno::Any( bItalic ? awt::FontSlant_ITALIC : awt::FontSlant_NONE ) );
 }
 
-sal_Bool SAL_CALL VbaNewFont::getUnderline() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaNewFont::getUnderline()
 {
     uno::Any aAny = mxProps->getPropertyValue("FontUnderline" );
     return aAny.get< sal_Int16 >() != awt::FontUnderline::NONE;
 }
 
-void SAL_CALL VbaNewFont::setUnderline( sal_Bool bUnderline ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaNewFont::setUnderline( sal_Bool bUnderline )
 {
     mxProps->setPropertyValue("FontUnderline" , uno::Any( bUnderline ? awt::FontUnderline::SINGLE : awt::FontUnderline::NONE ) );
 }
 
-sal_Bool SAL_CALL VbaNewFont::getStrikethrough() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaNewFont::getStrikethrough()
 {
     uno::Any aAny = mxProps->getPropertyValue( "FontStrikeout" );
     return aAny.get< sal_Int16 >() != awt::FontStrikeout::NONE;
 }
 
-void SAL_CALL VbaNewFont::setStrikethrough( sal_Bool bStrikethrough ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaNewFont::setStrikethrough( sal_Bool bStrikethrough )
 {
     mxProps->setPropertyValue( "FontStrikeout" ,uno::Any( bStrikethrough ? awt::FontStrikeout::SINGLE : awt::FontStrikeout::NONE ) );
 }
diff --git a/vbahelper/source/msforms/vbanewfont.hxx b/vbahelper/source/msforms/vbanewfont.hxx
index 3a95c1cbc282..bf3d0f1d1400 100644
--- a/vbahelper/source/msforms/vbanewfont.hxx
+++ b/vbahelper/source/msforms/vbanewfont.hxx
@@ -32,25 +32,25 @@ class VbaNewFont : public VbaNewFont_BASE
 public:
     /// @throws css::uno::RuntimeException
     explicit VbaNewFont(
-        const css::uno::Reference< css::beans::XPropertySet >& rxModelProps ) throw (css::uno::RuntimeException);
+        const css::uno::Reference< css::beans::XPropertySet >& rxModelProps );
 
     // XNewFont attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( double fSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getCharset() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCharset( sal_Int16 nCharset ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWeight( sal_Int16 nWeight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBold( sal_Bool bBold ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setItalic( sal_Bool bItalic ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setUnderline( sal_Bool bUnderline ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStrikethrough( sal_Bool bStrikethrough ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& rName ) override;
+    virtual double SAL_CALL getSize() override;
+    virtual void SAL_CALL setSize( double fSize ) override;
+    virtual sal_Int16 SAL_CALL getCharset() override;
+    virtual void SAL_CALL setCharset( sal_Int16 nCharset ) override;
+    virtual sal_Int16 SAL_CALL getWeight() override;
+    virtual void SAL_CALL setWeight( sal_Int16 nWeight ) override;
+    virtual sal_Bool SAL_CALL getBold() override;
+    virtual void SAL_CALL setBold( sal_Bool bBold ) override;
+    virtual sal_Bool SAL_CALL getItalic() override;
+    virtual void SAL_CALL setItalic( sal_Bool bItalic ) override;
+    virtual sal_Bool SAL_CALL getUnderline() override;
+    virtual void SAL_CALL setUnderline( sal_Bool bUnderline ) override;
+    virtual sal_Bool SAL_CALL getStrikethrough() override;
+    virtual void SAL_CALL setStrikethrough( sal_Bool bStrikethrough ) override;
 
 private:
     css::uno::Reference< css::beans::XPropertySet > mxProps;
diff --git a/vbahelper/source/msforms/vbapages.cxx b/vbahelper/source/msforms/vbapages.cxx
index fecf870b79e3..6854ef68f82b 100644
--- a/vbahelper/source/msforms/vbapages.cxx
+++ b/vbahelper/source/msforms/vbapages.cxx
@@ -21,12 +21,12 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPages ) throw( lang::IllegalArgumentException ) : ScVbaPages_BASE( xParent, xContext, xPages )
+ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPages ) : ScVbaPages_BASE( xParent, xContext, xPages )
 {
 }
 
 uno::Type SAL_CALL
-ScVbaPages::getElementType() throw (uno::RuntimeException)
+ScVbaPages::getElementType()
 {
     // return cppu::UnoType<msforms::XPage>::get();
     return cppu::UnoType<uno::XInterface>::get();
@@ -45,7 +45,7 @@ ScVbaPages::getServiceImplName()
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-ScVbaPages::createEnumeration() throw (uno::RuntimeException)
+ScVbaPages::createEnumeration()
 {
     // #STUB
     return uno::Reference< container::XEnumeration >();
diff --git a/vbahelper/source/msforms/vbapages.hxx b/vbahelper/source/msforms/vbapages.hxx
index b71da38d9d10..c9845fb0cc2e 100644
--- a/vbahelper/source/msforms/vbapages.hxx
+++ b/vbahelper/source/msforms/vbapages.hxx
@@ -35,11 +35,11 @@ protected:
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 public:
     /// @throws css::lang::IllegalArgumentException
-    ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages ) throw ( css::lang::IllegalArgumentException );
+    ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages );
     virtual ~ScVbaPages() override {}
         // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
      // ScVbaPages_BASE
      virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx
index 7d7bbf2ebb45..002670e71c0b 100644
--- a/vbahelper/source/msforms/vbaprogressbar.cxx
+++ b/vbahelper/source/msforms/vbaprogressbar.cxx
@@ -30,13 +30,13 @@ ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface >
 
 // Attributes
 uno::Any SAL_CALL
-ScVbaProgressBar::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaProgressBar::getValue()
 {
     return m_xProps->getPropertyValue( SVALUE );
 }
 
 void SAL_CALL
-ScVbaProgressBar::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception)
+ScVbaProgressBar::setValue( const uno::Any& _value )
 {
     m_xProps->setPropertyValue( SVALUE,  _value );
 }
diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx
index ab00704ff38a..d63854e25023 100644
--- a/vbahelper/source/msforms/vbaprogressbar.hxx
+++ b/vbahelper/source/msforms/vbaprogressbar.hxx
@@ -33,13 +33,13 @@ class ScVbaProgressBar : public ProgressBarImpl_BASE
 public:
     ScVbaProgressBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
    // Attributes
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
 };
 
 #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAPROGRESSBAR_HXX
diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx
index 27984d74985d..776bdba07df4 100644
--- a/vbahelper/source/msforms/vbaradiobutton.cxx
+++ b/vbahelper/source/msforms/vbaradiobutton.cxx
@@ -29,7 +29,7 @@ ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xP
 
 // Attributes
 OUString SAL_CALL
-ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException, std::exception)
+ScVbaRadioButton::getCaption()
 {
     OUString Label;
     m_xProps->getPropertyValue( "Label" ) >>= Label;
@@ -37,13 +37,13 @@ ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException, std::exception
 }
 
 void SAL_CALL
-ScVbaRadioButton::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception)
+ScVbaRadioButton::setCaption( const OUString& _caption )
 {
     m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
 }
 
 uno::Any SAL_CALL
-ScVbaRadioButton::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaRadioButton::getValue()
 {
     sal_Int16 nValue = -1;
     m_xProps->getPropertyValue( "State" ) >>= nValue;
@@ -57,7 +57,7 @@ ScVbaRadioButton::getValue() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException, std::exception)
+ScVbaRadioButton::setValue( const uno::Any& _value )
 {
     sal_Int16 nValue = 0;
     sal_Int16 nOldValue = 0;
@@ -85,7 +85,7 @@ ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExceptio
     }
 }
 
-uno::Reference< msforms::XNewFont > SAL_CALL ScVbaRadioButton::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XNewFont > SAL_CALL ScVbaRadioButton::getFont()
 {
     return new VbaNewFont( m_xProps );
 }
diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx
index d688430716a1..e8df30e84644 100644
--- a/vbahelper/source/msforms/vbaradiobutton.hxx
+++ b/vbahelper/source/msforms/vbaradiobutton.hxx
@@ -30,16 +30,16 @@ class ScVbaRadioButton : public RadioButtonImpl_BASE
 public:
     ScVbaRadioButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
    // Attributes
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue(const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue(const css::uno::Any&) override;
+    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() override;
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
 
 };
 #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBARADIOBUTTON_HXX
diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx
index 520b0af438da..6c2effdd492b 100644
--- a/vbahelper/source/msforms/vbascrollbar.cxx
+++ b/vbahelper/source/msforms/vbascrollbar.cxx
@@ -28,19 +28,19 @@ ScVbaScrollBar::ScVbaScrollBar(  const css::uno::Reference< ov::XHelperInterface
 
 // Attributes
 uno::Any SAL_CALL
-ScVbaScrollBar::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaScrollBar::getValue()
 {
     return  m_xProps->getPropertyValue( "ScrollValue" );
 }
 
 void SAL_CALL
-ScVbaScrollBar::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception)
+ScVbaScrollBar::setValue( const uno::Any& _value )
 {
     m_xProps->setPropertyValue( "ScrollValue", _value );
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaScrollBar::getMax() throw (uno::RuntimeException, std::exception)
+ScVbaScrollBar::getMax()
 {
     sal_Int32 nMax = 0;
     m_xProps->getPropertyValue( "ScrollValueMax" ) >>= nMax;
@@ -48,13 +48,13 @@ ScVbaScrollBar::getMax() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException, std::exception)
+ScVbaScrollBar::setMax( sal_Int32 nVal )
 {
     m_xProps->setPropertyValue( "ScrollValueMax", uno::makeAny( nVal ) );
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaScrollBar::getMin() throw (uno::RuntimeException, std::exception)
+ScVbaScrollBar::getMin()
 {
     sal_Int32 nVal = 0;
     m_xProps->getPropertyValue( "ScrollValueMin" ) >>= nVal;
@@ -62,19 +62,19 @@ ScVbaScrollBar::getMin() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException, std::exception)
+ScVbaScrollBar::setMin( sal_Int32 nVal )
 {
     m_xProps->setPropertyValue( "ScrollValueMin", uno::makeAny( nVal ) );
 }
 
 void SAL_CALL
-ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException, std::exception)
+ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange )
 {
     m_xProps->setPropertyValue( "BlockIncrement", uno::makeAny( _largechange ) );
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException, std::exception)
+ScVbaScrollBar::getLargeChange()
 {
     sal_Int32 nVal = 0;
     m_xProps->getPropertyValue( "BlockIncrement" ) >>= nVal;
@@ -82,7 +82,7 @@ ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException, std::exception)
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException, std::exception)
+ScVbaScrollBar::getSmallChange()
 {
     sal_Int32 nSmallChange = 0;
     m_xProps->getPropertyValue( "LineIncrement" ) >>= nSmallChange;
@@ -90,7 +90,7 @@ ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException, std::exception)
+ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange )
 {
     m_xProps->setPropertyValue( "LineIncrement", uno::makeAny( _smallchange ) );
 }
diff --git a/vbahelper/source/msforms/vbascrollbar.hxx b/vbahelper/source/msforms/vbascrollbar.hxx
index addd19fd6f8c..d76cf576f394 100644
--- a/vbahelper/source/msforms/vbascrollbar.hxx
+++ b/vbahelper/source/msforms/vbascrollbar.hxx
@@ -33,16 +33,16 @@ class ScVbaScrollBar : public ScrollBarImpl_BASE
 public:
     ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
    // Attributes
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getLargeChange() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getSmallChange() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+    virtual ::sal_Int32 SAL_CALL getMax() override;
+    virtual void SAL_CALL setMax( ::sal_Int32 _max ) override;
+    virtual ::sal_Int32 SAL_CALL getMin() override;
+    virtual void SAL_CALL setMin( ::sal_Int32 _min ) override;
+    virtual ::sal_Int32 SAL_CALL getLargeChange() override;
+    virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) override;
+    virtual ::sal_Int32 SAL_CALL getSmallChange() override;
+    virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) override;
 
 
     //XHelperInterface
diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx
index 7a6eda2bd4a6..6023374d78c0 100644
--- a/vbahelper/source/msforms/vbaspinbutton.cxx
+++ b/vbahelper/source/msforms/vbaspinbutton.cxx
@@ -28,19 +28,19 @@ ScVbaSpinButton::ScVbaSpinButton(  const css::uno::Reference< ov::XHelperInterfa
 
 // Attributes
 uno::Any SAL_CALL
-ScVbaSpinButton::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaSpinButton::getValue()
 {
     return  m_xProps->getPropertyValue( "SpinValue" );
 }
 
 void SAL_CALL
-ScVbaSpinButton::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception)
+ScVbaSpinButton::setValue( const uno::Any& _value )
 {
     m_xProps->setPropertyValue( "SpinValue", _value );
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaSpinButton::getMax() throw (uno::RuntimeException, std::exception)
+ScVbaSpinButton::getMax()
 {
     sal_Int32 nMax = 0;
     m_xProps->getPropertyValue( "SpinValueMax" ) >>= nMax;
@@ -48,13 +48,13 @@ ScVbaSpinButton::getMax() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException, std::exception)
+ScVbaSpinButton::setMax( sal_Int32 nVal )
 {
     m_xProps->setPropertyValue( "SpinValueMax", uno::makeAny( nVal ) );
 }
 
 ::sal_Int32 SAL_CALL
-ScVbaSpinButton::getMin() throw (uno::RuntimeException, std::exception)
+ScVbaSpinButton::getMin()
 {
     sal_Int32 nVal = 0;
     m_xProps->getPropertyValue( "SpinValueMin" ) >>= nVal;
@@ -62,7 +62,7 @@ ScVbaSpinButton::getMin() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException, std::exception)
+ScVbaSpinButton::setMin( sal_Int32 nVal )
 {
     m_xProps->setPropertyValue( "SpinValueMin", uno::makeAny( nVal ) );
 }
diff --git a/vbahelper/source/msforms/vbaspinbutton.hxx b/vbahelper/source/msforms/vbaspinbutton.hxx
index aae3dc649745..ecc26a0c7a2f 100644
--- a/vbahelper/source/msforms/vbaspinbutton.hxx
+++ b/vbahelper/source/msforms/vbaspinbutton.hxx
@@ -31,12 +31,12 @@ class ScVbaSpinButton : public SpinButtonImpl_BASE
 public:
     ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
    // Attributes
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+    virtual ::sal_Int32 SAL_CALL getMax() override;
+    virtual void SAL_CALL setMax( ::sal_Int32 _max ) override;
+    virtual ::sal_Int32 SAL_CALL getMin() override;
+    virtual void SAL_CALL setMin( ::sal_Int32 _min ) override;
 
     //XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
index 016224a05755..a11bbe9db56e 100644
--- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx
+++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
@@ -30,42 +30,36 @@ VbaSystemAXControl::VbaSystemAXControl(  const uno::Reference< ov::XHelperInterf
 
 
 uno::Reference< beans::XIntrospectionAccess > SAL_CALL VbaSystemAXControl::getIntrospection()
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xControlInvocation->getIntrospection();
 }
 
 
 uno::Any SAL_CALL VbaSystemAXControl::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& aParams, uno::Sequence< ::sal_Int16 >& aOutParamIndex, uno::Sequence< uno::Any >& aOutParam )
-    throw ( lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception )
 {
     return m_xControlInvocation->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam );
 }
 
 
 void SAL_CALL VbaSystemAXControl::setValue( const OUString& aPropertyName, const uno::Any& aValue )
-    throw ( beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception )
 {
     m_xControlInvocation->setValue( aPropertyName, aValue );
 }
 
 
 uno::Any SAL_CALL VbaSystemAXControl::getValue( const OUString& aPropertyName )
-    throw ( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
 {
     return m_xControlInvocation->getValue( aPropertyName );
 }
 
 
 sal_Bool SAL_CALL VbaSystemAXControl::hasMethod( const OUString& aName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xControlInvocation->hasMethod( aName );
 }
 
 
 sal_Bool SAL_CALL VbaSystemAXControl::hasProperty( const OUString& aName )
-    throw ( uno::RuntimeException, std::exception )
 {
     return m_xControlInvocation->hasProperty( aName );
 }
diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx
index 5dde95aeeba7..5033f2f00cf1 100644
--- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx
+++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx
@@ -35,12 +35,12 @@ public:
     VbaSystemAXControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper  );
 
     // XInvocation
-    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw ( css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw ( css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw ( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw ( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) override;
+    virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) override;
+    virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override;
 
     //XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx
index 36e256eb21b5..b8ef93550c16 100644
--- a/vbahelper/source/msforms/vbatextbox.cxx
+++ b/vbahelper/source/msforms/vbatextbox.cxx
@@ -32,13 +32,13 @@ ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParen
 
 // Attributes
 uno::Any SAL_CALL
-ScVbaTextBox::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBox::getValue()
 {
     return uno::makeAny( getText() );
 }
 
 void SAL_CALL
-ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBox::setValue( const uno::Any& _value )
 {
     // booleans are converted to uppercase strings
     OUString sVal = extractStringFromAny( _value, true );
@@ -47,7 +47,7 @@ ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeExcepti
 
 //getString() will cause some info lose.
 OUString SAL_CALL
-ScVbaTextBox::getText() throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBox::getText()
 {
     uno::Any aValue;
     aValue = m_xProps->getPropertyValue( "Text" );
@@ -57,7 +57,7 @@ ScVbaTextBox::getText() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaTextBox::setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBox::setText( const OUString& _text )
 {
     OUString oldText( getText() );
     if ( !mbDialog )
@@ -72,7 +72,7 @@ ScVbaTextBox::setText( const OUString& _text ) throw (css::uno::RuntimeException
 }
 
 sal_Int32 SAL_CALL
-ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBox::getMaxLength()
 {
     uno::Any aValue;
     aValue = m_xProps->getPropertyValue( "MaxTextLen" );
@@ -82,7 +82,7 @@ ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBox::setMaxLength( sal_Int32 _maxlength )
 {
     sal_Int16 nTmp( _maxlength );
     uno::Any aValue( nTmp );
@@ -90,7 +90,7 @@ ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeExcep
 }
 
 sal_Bool SAL_CALL
-ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBox::getMultiline()
 {
     uno::Any aValue;
     aValue = m_xProps->getPropertyValue( "MultiLine" );
@@ -100,68 +100,68 @@ ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException, std::exception)
+ScVbaTextBox::setMultiline( sal_Bool _multiline )
 {
     uno::Any aValue( _multiline );
     m_xProps->setPropertyValue( "MultiLine" , aValue);
 }
 
-sal_Int32 SAL_CALL ScVbaTextBox::getSpecialEffect() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaTextBox::getSpecialEffect()
 {
     return msforms::fmSpecialEffect::fmSpecialEffectSunken;
 }
 
-void SAL_CALL ScVbaTextBox::setSpecialEffect( sal_Int32 /*nSpecialEffect*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaTextBox::setSpecialEffect( sal_Int32 /*nSpecialEffect*/ )
 {
     // #STUB
 }
 
-sal_Int32 SAL_CALL ScVbaTextBox::getBorderStyle() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaTextBox::getBorderStyle()
 {
     return msforms::fmBorderStyle::fmBorderStyleNone;
 }
 
-void SAL_CALL ScVbaTextBox::setBorderStyle( sal_Int32 /*nBorderStyle*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaTextBox::setBorderStyle( sal_Int32 /*nBorderStyle*/ )
 {
     // #STUB
 }
 
-sal_Int32 SAL_CALL ScVbaTextBox::getTextLength() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaTextBox::getTextLength()
 {
     return getText().getLength();
 }
 
-uno::Reference< msforms::XNewFont > SAL_CALL ScVbaTextBox::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XNewFont > SAL_CALL ScVbaTextBox::getFont()
 {
     return new VbaNewFont( m_xProps );
 }
 
-sal_Int32 SAL_CALL ScVbaTextBox::getBackColor() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaTextBox::getBackColor()
 {
     return ScVbaControl::getBackColor();
 }
 
-void SAL_CALL ScVbaTextBox::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaTextBox::setBackColor( sal_Int32 nBackColor )
 {
     ScVbaControl::setBackColor( nBackColor );
 }
 
-sal_Bool SAL_CALL ScVbaTextBox::getAutoSize() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaTextBox::getAutoSize()
 {
     return ScVbaControl::getAutoSize();
 }
 
-void SAL_CALL ScVbaTextBox::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaTextBox::setAutoSize( sal_Bool bAutoSize )
 {
     ScVbaControl::setAutoSize( bAutoSize );
 }
 
-sal_Bool SAL_CALL ScVbaTextBox::getLocked() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaTextBox::getLocked()
 {
     return ScVbaControl::getLocked();
 }
 
-void SAL_CALL ScVbaTextBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaTextBox::setLocked( sal_Bool bLocked )
 {
     ScVbaControl::setLocked( bLocked );
 }
diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx
index 598bbe5842c1..8081471ba118 100644
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
@@ -33,29 +33,29 @@ class ScVbaTextBox : public TextBoxImpl_BASE
 public:
     ScVbaTextBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialog = false );
    // Attributes
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSpecialEffect() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSpecialEffect( sal_Int32 nSpecialEffect ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBorderStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBorderStyle( sal_Int32 nBorderStyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getTextLength() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+    virtual OUString SAL_CALL getText() override;
+    virtual void SAL_CALL setText( const OUString& _text ) override;
+    virtual sal_Int32 SAL_CALL getMaxLength() override;
+    virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) override;
+    virtual sal_Bool SAL_CALL getMultiline() override;
+    virtual void SAL_CALL setMultiline( sal_Bool _multiline ) override;
+    virtual sal_Int32 SAL_CALL getSpecialEffect() override;
+    virtual void SAL_CALL setSpecialEffect( sal_Int32 nSpecialEffect ) override;
+    virtual sal_Int32 SAL_CALL getBorderStyle() override;
+    virtual void SAL_CALL setBorderStyle( sal_Int32 nBorderStyle ) override;
+    virtual sal_Int32 SAL_CALL getTextLength() override;
+    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() override;
+    virtual sal_Int32 SAL_CALL getBackColor() override;
+    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) override;
+    virtual sal_Bool SAL_CALL getAutoSize() override;
+    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) override;
+    virtual sal_Bool SAL_CALL getLocked() override;
+    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
 
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx
index 6c92648c36b0..c603eb3dc71b 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -36,7 +36,7 @@ ScVbaToggleButton::~ScVbaToggleButton()
 
 // Attributes
 OUString SAL_CALL
-ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException, std::exception)
+ScVbaToggleButton::getCaption()
 {
     OUString Label;
     m_xProps->getPropertyValue( "Label" ) >>= Label;
@@ -44,13 +44,13 @@ ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException, std::exceptio
 }
 
 void SAL_CALL
-ScVbaToggleButton::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception)
+ScVbaToggleButton::setCaption( const OUString& _caption )
 {
     m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
 }
 
 uno::Any SAL_CALL
-ScVbaToggleButton::getValue() throw (uno::RuntimeException, std::exception)
+ScVbaToggleButton::getValue()
 {
     sal_Int16 nState = 0;
         m_xProps->getPropertyValue( "State" ) >>= nState;
@@ -59,7 +59,7 @@ ScVbaToggleButton::getValue() throw (uno::RuntimeException, std::exception)
 
 
 void SAL_CALL
-ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException, std::exception)
+ScVbaToggleButton::setValue( const uno::Any& _value )
 {
     sal_Int16 nState = 0;
     if ( ! ( _value >>= nState ) )
@@ -75,70 +75,70 @@ ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExcepti
     m_xProps->setPropertyValue( "State", uno::makeAny(   nState ) );
 }
 
-sal_Bool SAL_CALL ScVbaToggleButton::getAutoSize() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaToggleButton::getAutoSize()
 {
     return ScVbaControl::getAutoSize();
 }
 
-void SAL_CALL ScVbaToggleButton::setAutoSize( sal_Bool bAutoSize ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaToggleButton::setAutoSize( sal_Bool bAutoSize )
 {
     ScVbaControl::setAutoSize( bAutoSize );
 }
 
-sal_Bool SAL_CALL ScVbaToggleButton::getCancel() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaToggleButton::getCancel()
 {
     // #STUB
     return false;
 }
 
-void SAL_CALL ScVbaToggleButton::setCancel( sal_Bool /*bCancel*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaToggleButton::setCancel( sal_Bool /*bCancel*/ )
 {
     // #STUB
 }
 
-sal_Bool SAL_CALL ScVbaToggleButton::getDefault() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaToggleButton::getDefault()
 {
     // #STUB
     return false;
 }
 
-void SAL_CALL ScVbaToggleButton::setDefault( sal_Bool /*bDefault*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaToggleButton::setDefault( sal_Bool /*bDefault*/ )
 {
     // #STUB
 }
 
-sal_Int32 SAL_CALL ScVbaToggleButton::getBackColor() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ScVbaToggleButton::getBackColor()
 {
     return ScVbaControl::getBackColor();
 }
 
-void SAL_CALL ScVbaToggleButton::setBackColor( sal_Int32 nBackColor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaToggleButton::setBackColor( sal_Int32 nBackColor )
 {
     ScVbaControl::setBackColor( nBackColor );
 }
 
-sal_Int32 SAL_CALL ScVbaToggleButton::getForeColor() throw (uno::RuntimeException)
+sal_Int32 SAL_CALL ScVbaToggleButton::getForeColor()
 {
     // #STUB
     return 0;
 }
 
-void SAL_CALL ScVbaToggleButton::setForeColor( sal_Int32 /*nForeColor*/ ) throw (uno::RuntimeException)
+void SAL_CALL ScVbaToggleButton::setForeColor( sal_Int32 /*nForeColor*/ )
 {
     // #STUB
 }
 
-uno::Reference< msforms::XNewFont > SAL_CALL ScVbaToggleButton::getFont() throw (uno::RuntimeException, std::exception)
+uno::Reference< msforms::XNewFont > SAL_CALL ScVbaToggleButton::getFont()
 {
     return new VbaNewFont( m_xProps );
 }
 
-sal_Bool SAL_CALL ScVbaToggleButton::getLocked() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaToggleButton::getLocked()
 {
     return ScVbaControl::getLocked();
 }
 
-void SAL_CALL ScVbaToggleButton::setLocked( sal_Bool bLocked ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaToggleButton::setLocked( sal_Bool bLocked )
 {
     ScVbaControl::setLocked( bLocked );
 }
diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx
index 0d73cd3679fa..f320b3b954f6 100644
--- a/vbahelper/source/msforms/vbatogglebutton.hxx
+++ b/vbahelper/source/msforms/vbatogglebutton.hxx
@@ -32,28 +32,28 @@ public:
     ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
     virtual ~ScVbaToggleButton() override;
    // Attributes
-    virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getCancel() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCancel( sal_Bool bCancel ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getDefault() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefault( sal_Bool bDefault ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeColor() throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL setForeColor( sal_Int32 nForeColor ) throw (css::uno::RuntimeException) override;
-    virtual sal_Bool SAL_CALL getLocked() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValue() override;
+    virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+    virtual sal_Bool SAL_CALL getAutoSize() override;
+    virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) override;
+    virtual sal_Bool SAL_CALL getCancel() override;
+    virtual void SAL_CALL setCancel( sal_Bool bCancel ) override;
+    virtual sal_Bool SAL_CALL getDefault() override;
+    virtual void SAL_CALL setDefault( sal_Bool bDefault ) override;
+    virtual sal_Int32 SAL_CALL getBackColor() override;
+    virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) override;
+    virtual sal_Int32 SAL_CALL getForeColor() override;
+    virtual void SAL_CALL setForeColor( sal_Int32 nForeColor ) override;
+    virtual sal_Bool SAL_CALL getLocked() override;
+    virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
+    virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() override;
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     // XDefaultProperty
-    OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException, std::exception) override { return OUString("Value"); }
+    OUString SAL_CALL getDefaultPropertyName(  ) override { return OUString("Value"); }
 };
 #endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBATOGGLEBUTTON_HXX
 
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index 2fca16237d04..7ff527ac8353 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star;
 //     the models in ControlModels can be accessed by name
 // also the XDialog is a XControl ( to access the model above
 
-ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) throw ( lang::IllegalArgumentException, uno::RuntimeException ) :  ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(nullptr) ),  mbDispose( true )
+ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) :  ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(nullptr) ),  mbDispose( true )
 {
     m_xDialog.set( m_xControl, uno::UNO_QUERY_THROW );
     uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
@@ -59,7 +59,7 @@ ScVbaUserForm::~ScVbaUserForm()
 }
 
 void SAL_CALL
-ScVbaUserForm::Show(  ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::Show(  )
 {
     SAL_INFO("vbahelper", "ScVbaUserForm::Show(  )");
     short aRet = 0;
@@ -102,20 +102,20 @@ ScVbaUserForm::Show(  ) throw (uno::RuntimeException, std::exception)
 }
 
 OUString SAL_CALL
-ScVbaUserForm::getCaption() throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::getCaption()
 {
     OUString sCaption;
     m_xProps->getPropertyValue( "Title" ) >>= sCaption;
     return sCaption;
 }
 void
-ScVbaUserForm::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::setCaption( const OUString& _caption )
 {
     m_xProps->setPropertyValue( "Title", uno::makeAny( _caption ) );
 }
 
 sal_Bool SAL_CALL
-ScVbaUserForm::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::getVisible()
 {
     uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
     uno::Reference< awt::XWindow2 > xControlWindow( xControl->getPeer(), uno::UNO_QUERY_THROW );
@@ -123,7 +123,7 @@ ScVbaUserForm::getVisible() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaUserForm::setVisible( sal_Bool bVis ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::setVisible( sal_Bool bVis )
 {
     if ( bVis )
         Show();
@@ -131,28 +131,28 @@ ScVbaUserForm::setVisible( sal_Bool bVis ) throw (uno::RuntimeException, std::ex
         Hide();
 }
 
-double SAL_CALL ScVbaUserForm::getInnerWidth() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaUserForm::getInnerWidth()
 {
     return mpGeometryHelper->getInnerWidth();
 }
 
-void SAL_CALL ScVbaUserForm::setInnerWidth( double fInnerWidth ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaUserForm::setInnerWidth( double fInnerWidth )
 {
     mpGeometryHelper->setInnerWidth( fInnerWidth );
 }
 
-double SAL_CALL ScVbaUserForm::getInnerHeight() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaUserForm::getInnerHeight()
 {
     return mpGeometryHelper->getInnerHeight();
 }
 
-void SAL_CALL ScVbaUserForm::setInnerHeight( double fInnerHeight ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaUserForm::setInnerHeight( double fInnerHeight )
 {
     mpGeometryHelper->setInnerHeight( fInnerHeight );
 }
 
 void SAL_CALL
-ScVbaUserForm::Hide(  ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::Hide(  )
 {
     mbDispose = false;  // hide not dispose
     if ( m_xDialog.is() )
@@ -160,14 +160,14 @@ ScVbaUserForm::Hide(  ) throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaUserForm::RePaint(  ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::RePaint(  )
 {
     // #STUB
     // do nothing
 }
 
 void SAL_CALL
-ScVbaUserForm::UnloadObject(  ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::UnloadObject(  )
 {
     mbDispose = true;
     if ( m_xDialog.is() )
@@ -193,19 +193,19 @@ ScVbaUserForm::getServiceNames()
 }
 
 uno::Reference< beans::XIntrospectionAccess > SAL_CALL
-ScVbaUserForm::getIntrospection(  ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::getIntrospection(  )
 {
     return uno::Reference< beans::XIntrospectionAccess >();
 }
 
 uno::Any SAL_CALL
-ScVbaUserForm::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+ScVbaUserForm::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ )
 {
     throw uno::RuntimeException(); // unsupported operation
 }
 
 void SAL_CALL
-ScVbaUserForm::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+ScVbaUserForm::setValue( const OUString& aPropertyName, const uno::Any& aValue )
 {
     uno::Any aObject = getValue( aPropertyName );
 
@@ -249,7 +249,7 @@ ScVbaUserForm::nestedSearch( const OUString& aPropertyName, uno::Reference< awt:
 }
 
 uno::Any SAL_CALL
-ScVbaUserForm::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
+ScVbaUserForm::getValue( const OUString& aPropertyName )
 {
     uno::Any aResult;
 
@@ -274,12 +274,12 @@ ScVbaUserForm::getValue( const OUString& aPropertyName ) throw (beans::UnknownPr
 }
 
 sal_Bool SAL_CALL
-ScVbaUserForm::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::hasMethod( const OUString& /*aName*/ )
 {
     return false;
 }
 uno::Any SAL_CALL
-ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::Controls( const uno::Any& index )
 {
     // if the dialog already closed we should do nothing, but the VBA will call methods of the Controls objects
     // thus we have to provide a dummy object in this case
@@ -291,7 +291,7 @@ ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException, s
 }
 
 sal_Bool SAL_CALL
-ScVbaUserForm::hasProperty( const OUString& aName ) throw (uno::RuntimeException, std::exception)
+ScVbaUserForm::hasProperty( const OUString& aName )
 {
     uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY );
 
diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx
index 8bf1586e833a..a7f7b261acf0 100644
--- a/vbahelper/source/msforms/vbauserform.hxx
+++ b/vbahelper/source/msforms/vbauserform.hxx
@@ -41,30 +41,30 @@ protected:
 public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+    ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
     virtual ~ScVbaUserForm() override;
     static css::uno::Reference< css::awt::XControl > nestedSearch( const OUString& aPropertyName, css::uno::Reference< css::awt::XControlContainer >& xContainer );
     // XUserForm
-    virtual void SAL_CALL RePaint(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Show(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getInnerWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInnerWidth( double fInnerWidth ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getInnerHeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setInnerHeight( double fInnerHeight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Hide(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL UnloadObject(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool bVis ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL RePaint(  ) override;
+    virtual void SAL_CALL Show(  ) override;
+    virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+    virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) override;
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+    virtual double SAL_CALL getInnerWidth() override;
+    virtual void SAL_CALL setInnerWidth( double fInnerWidth ) override;
+    virtual double SAL_CALL getInnerHeight() override;
+    virtual void SAL_CALL setInnerHeight( double fInnerHeight ) override;
+    virtual void SAL_CALL Hide(  ) override;
+    virtual void SAL_CALL UnloadObject(  ) override;
+    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool bVis ) override;
     // XIntrospection
-    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(  ) override;
+    virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override;
     //XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index d78a4b62a2c6..b7c6b9a3c0ef 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -183,14 +183,14 @@ VbaApplicationBase::~VbaApplicationBase()
 }
 
 sal_Bool SAL_CALL
-VbaApplicationBase::getScreenUpdating() throw (uno::RuntimeException, std::exception)
+VbaApplicationBase::getScreenUpdating()
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     return !xModel->hasControllersLocked();
 }
 
 void SAL_CALL
-VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException, std::exception)
+VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate)
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     // #163808# use helper from module "basic" to lock all documents of this application
@@ -198,7 +198,7 @@ VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeExcep
 }
 
 sal_Bool SAL_CALL
-VbaApplicationBase::getDisplayStatusBar() throw (uno::RuntimeException, std::exception)
+VbaApplicationBase::getDisplayStatusBar()
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
@@ -215,7 +215,7 @@ VbaApplicationBase::getDisplayStatusBar() throw (uno::RuntimeException, std::exc
 }
 
 void SAL_CALL
-VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::RuntimeException, std::exception)
+VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar)
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
@@ -240,7 +240,6 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::
 }
 
 sal_Bool SAL_CALL VbaApplicationBase::getInteractive()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
@@ -250,26 +249,25 @@ sal_Bool SAL_CALL VbaApplicationBase::getInteractive()
 }
 
 void SAL_CALL VbaApplicationBase::setInteractive( sal_Bool bInteractive )
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     // #163808# use helper from module "basic" to enable/disable all container windows of all documents of this application
     ::basic::vba::enableContainerWindowsOfAllDocuments( xModel, bInteractive );
 }
 
-sal_Bool SAL_CALL VbaApplicationBase::getVisible() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaApplicationBase::getVisible()
 {
     return m_pImpl->mbVisible;    // dummy implementation
 }
 
-void SAL_CALL VbaApplicationBase::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaApplicationBase::setVisible( sal_Bool bVisible )
 {
     m_pImpl->mbVisible = bVisible;  // dummy implementation
 }
 
 
 void SAL_CALL
-VbaApplicationBase::OnKey( const OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException, std::exception)
+VbaApplicationBase::OnKey( const OUString& Key, const uno::Any& Procedure )
 {
     // parse the Key & modifiers
     awt::KeyEvent aKeyEvent = parseKeyEvent( Key );
@@ -291,7 +289,7 @@ VbaApplicationBase::OnKey( const OUString& Key, const uno::Any& Procedure ) thro
 }
 
 uno::Any SAL_CALL
-VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException, std::exception)
+VbaApplicationBase::CommandBars( const uno::Any& aIndex )
 {
     uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >(), getCurrentDocument() ) );
     if( aIndex.hasValue() )
@@ -300,12 +298,12 @@ VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeExc
 }
 
 OUString SAL_CALL
-VbaApplicationBase::getVersion() throw (uno::RuntimeException, std::exception)
+VbaApplicationBase::getVersion()
 {
     return OUString(OFFICEVERSION);
 }
 
-uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 )
 {
     OUString aMacroName = MacroName.trim();
     if( aMacroName.startsWith("!") )
@@ -356,7 +354,6 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const uno:
 }
 
 void SAL_CALL VbaApplicationBase::OnTime( const uno::Any& aEarliestTime, const OUString& aFunction, const uno::Any& aLatestTime, const uno::Any& aSchedule )
-    throw ( uno::RuntimeException, std::exception )
 {
     if ( aFunction.isEmpty() )
         throw uno::RuntimeException( "Unexpected function name!" );
@@ -388,14 +385,14 @@ void SAL_CALL VbaApplicationBase::OnTime( const uno::Any& aEarliestTime, const O
     }
 }
 
-float SAL_CALL VbaApplicationBase::CentimetersToPoints( float Centimeters ) throw (uno::RuntimeException, std::exception)
+float SAL_CALL VbaApplicationBase::CentimetersToPoints( float Centimeters )
 {
     // i cm = 28.35 points
     static const float rate = 28.35f;
     return ( Centimeters * rate );
 }
 
-uno::Any SAL_CALL VbaApplicationBase::getVBE() throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL VbaApplicationBase::getVBE()
 {
     try // return empty object on error
     {
@@ -432,13 +429,12 @@ VbaApplicationBase::getServiceNames()
 }
 
 void SAL_CALL VbaApplicationBase::Undo()
-    throw (uno::RuntimeException, std::exception)
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     dispatchRequests( xModel, ".uno:Undo" );
 }
 
-void VbaApplicationBase::Quit() throw (uno::RuntimeException, std::exception)
+void VbaApplicationBase::Quit()
 {
     // need to stop basic
     SbMethod* pMeth = StarBASIC::GetActiveMethod();
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx
index dffe7717168b..39ec1c090d93 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
@@ -56,7 +56,7 @@ ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xP
 
 // Attribute
 sal_Int32 SAL_CALL
-ScVbaColorFormat::getRGB() throw (uno::RuntimeException, std::exception)
+ScVbaColorFormat::getRGB()
 {
     sal_Int32 nRGB = 0;
     switch( m_nColorFormatType )
@@ -82,7 +82,7 @@ ScVbaColorFormat::getRGB() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException, std::exception)
+ScVbaColorFormat::setRGB( sal_Int32 _rgb )
 {
     sal_Int32 nRGB = XLRGBToOORGB( _rgb );
     switch( m_nColorFormatType )
@@ -113,7 +113,7 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException, std::ex
 }
 
 sal_Int32 SAL_CALL
-ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException, std::exception)
+ScVbaColorFormat::getSchemeColor()
 {
     sal_Int32 nColor = getRGB();
     // #TODO I guess the number of elements is determined by the correct scheme
@@ -143,7 +143,7 @@ ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeException, std::exception)
+ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor )
 {
     // the table is 0 based
     sal_Int32 nColor = MsoColorIndices::getColorIndex( _schemecolor );
diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx
index 1e6248ec3b6f..9504e4ef3789 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.hxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.hxx
@@ -104,10 +104,10 @@ public:
     ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface >& xInternalParent, const css::uno::Reference< css::drawing::XShape >& xShape, const sal_Int16 nColorFormatType );
 
     // Attributes
-    virtual sal_Int32 SAL_CALL getRGB() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRGB( sal_Int32 _rgb ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSchemeColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSchemeColor( sal_Int32 _schemecolor ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getRGB() override;
+    virtual void SAL_CALL setRGB( sal_Int32 _rgb ) override;
+    virtual sal_Int32 SAL_CALL getSchemeColor() override;
+    virtual void SAL_CALL setSchemeColor( sal_Int32 _schemecolor ) override;
 
 };
 
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx
index a39ee2a5aba8..17ccb4d4cfc5 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -33,13 +33,13 @@ ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface >&
                                   const uno::Reference< uno::XComponentContext >& xContext,
                                   VbaCommandBarHelperRef const & pHelper,
                                   const uno::Reference< container::XIndexAccess >& xBarSettings,
-                                  const OUString& sResourceUrl, bool bIsMenu ) throw( uno::RuntimeException )
+                                  const OUString& sResourceUrl, bool bIsMenu )
    : CommandBar_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl ), m_bIsMenu( bIsMenu )
 {
 }
 
 OUString SAL_CALL
-ScVbaCommandBar::getName() throw ( uno::RuntimeException, std::exception )
+ScVbaCommandBar::getName()
 {
     // This will get a "NULL length string" when Name is not set.
     uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
@@ -71,7 +71,7 @@ ScVbaCommandBar::getName() throw ( uno::RuntimeException, std::exception )
     return sName;
 }
 void SAL_CALL
-ScVbaCommandBar::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception)
+ScVbaCommandBar::setName( const OUString& _name )
 {
     uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
     xPropertySet->setPropertyValue( "UIName" , uno::makeAny( _name ) );
@@ -79,7 +79,7 @@ ScVbaCommandBar::setName( const OUString& _name ) throw (uno::RuntimeException,
     pCBarHelper->ApplyTempChange( m_sResourceUrl, m_xBarSettings );
 }
 sal_Bool SAL_CALL
-ScVbaCommandBar::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaCommandBar::getVisible()
 {
     // menu bar is always visible in OOo
     if( m_bIsMenu )
@@ -102,7 +102,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException, std::exception)
     return bVisible;
 }
 void SAL_CALL
-ScVbaCommandBar::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception)
+ScVbaCommandBar::setVisible( sal_Bool _visible )
 {
     try
     {
@@ -125,21 +125,21 @@ ScVbaCommandBar::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, s
 }
 
 sal_Bool SAL_CALL
-ScVbaCommandBar::getEnabled() throw (uno::RuntimeException, std::exception)
+ScVbaCommandBar::getEnabled()
 {
     // emulated with Visible
     return getVisible();
 }
 
 void SAL_CALL
-ScVbaCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception)
+ScVbaCommandBar::setEnabled( sal_Bool _enabled )
 {
     // emulated with Visible
     setVisible( _enabled );
 }
 
 void SAL_CALL
-ScVbaCommandBar::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaCommandBar::Delete(  )
 {
     pCBarHelper->removeSettings( m_sResourceUrl );
     uno::Reference< container::XNameContainer > xNameContainer( pCBarHelper->getPersistentWindowState(), uno::UNO_QUERY_THROW );
@@ -149,7 +149,7 @@ ScVbaCommandBar::Delete(  ) throw (script::BasicErrorException, uno::RuntimeExce
     }
 }
 uno::Any SAL_CALL
-ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaCommandBar::Controls( const uno::Any& aIndex )
 {
     uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, m_xBarSettings, pCBarHelper, m_xBarSettings, m_sResourceUrl ) );
     if( aIndex.hasValue() )
@@ -160,7 +160,7 @@ ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorExc
 }
 
 sal_Int32 SAL_CALL
-ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaCommandBar::Type()
 {
     // #FIXME support msoBarTypePopup
     sal_Int32 nType = office::MsoBarType::msoBarTypePopup;
@@ -169,7 +169,7 @@ ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ )
 {
     // alwayse fail to find control
     return uno::makeAny( uno::Reference< XCommandBarControl > () );
@@ -197,52 +197,52 @@ ScVbaCommandBar::getServiceNames()
 VbaDummyCommandBar::VbaDummyCommandBar(
         const uno::Reference< ov::XHelperInterface >& xParent,
         const uno::Reference< uno::XComponentContext >& xContext,
-        const OUString& rName ) throw( uno::RuntimeException ) :
+        const OUString& rName ) :
     CommandBar_BASE( xParent, xContext ),
     maName( rName )
 {
 }
 
-OUString SAL_CALL VbaDummyCommandBar::getName() throw ( uno::RuntimeException, std::exception )
+OUString SAL_CALL VbaDummyCommandBar::getName()
 {
     return maName;
 }
 
-void SAL_CALL VbaDummyCommandBar::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaDummyCommandBar::setName( const OUString& _name )
 {
     maName = _name;
 }
 
-sal_Bool SAL_CALL VbaDummyCommandBar::getVisible() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaDummyCommandBar::getVisible()
 {
     // #STUB
     return true;
 }
 
-void SAL_CALL VbaDummyCommandBar::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaDummyCommandBar::setVisible( sal_Bool /*_visible*/ )
 {
     // #STUB
 }
 
-sal_Bool SAL_CALL VbaDummyCommandBar::getEnabled() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VbaDummyCommandBar::getEnabled()
 {
     // emulated with Visible
     return getVisible();
 }
 
-void SAL_CALL VbaDummyCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaDummyCommandBar::setEnabled( sal_Bool _enabled )
 {
     // emulated with Visible
     setVisible( _enabled );
 }
 
-void SAL_CALL VbaDummyCommandBar::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+void SAL_CALL VbaDummyCommandBar::Delete(  )
 {
     // no-op
     // #STUB
 }
 
-uno::Any SAL_CALL VbaDummyCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL VbaDummyCommandBar::Controls( const uno::Any& aIndex )
 {
     uno::Reference< XCommandBarControls > xCommandBarControls( new VbaDummyCommandBarControls( this, mxContext ) );
     if( aIndex.hasValue() )
@@ -250,12 +250,12 @@ uno::Any SAL_CALL VbaDummyCommandBar::Controls( const uno::Any& aIndex ) throw (
     return uno::Any( xCommandBarControls );
 }
 
-sal_Int32 SAL_CALL VbaDummyCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL VbaDummyCommandBar::Type()
 {
     return office::MsoBarType::msoBarTypePopup;
 }
 
-uno::Any SAL_CALL VbaDummyCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+uno::Any SAL_CALL VbaDummyCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ )
 {
     return uno::Any( uno::Reference< XCommandBarControl >() );
 }
diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx
index 8510abf5ba83..46e273b207fd 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.hxx
@@ -40,21 +40,21 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, VbaCommandBarHelperRef const & pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, bool bIsMenu ) throw( css::uno::RuntimeException );
+    ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, VbaCommandBarHelperRef const & pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, bool bIsMenu );
 
     // Attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& _name ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+    virtual sal_Bool SAL_CALL getEnabled() override;
+    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) override;
 
     // Methods
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL Type(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) override;
+    virtual sal_Int32 SAL_CALL Type(  ) override;
+    virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
@@ -69,21 +69,21 @@ public:
     VbaDummyCommandBar(
             const css::uno::Reference< ov::XHelperInterface >& xParent,
             const css::uno::Reference< css::uno::XComponentContext >& xContext,
-            const OUString& rName ) throw( css::uno::RuntimeException );
+            const OUString& rName );
 
     // Attributes
-    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
+    virtual void SAL_CALL setName( const OUString& _name ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+    virtual sal_Bool SAL_CALL getEnabled() override;
+    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) override;
 
     // Methods
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL Type(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) override;
+    virtual sal_Int32 SAL_CALL Type(  ) override;
+    virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index 7676913be402..cfc89c70abd8 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -24,11 +24,11 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) throw (css::uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( 0 ), m_bTemporary( true )
+ScVbaCommandBarControl::ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) : CommandBarControl_BASE( xParent, xContext ), pCBarHelper( pHelper ), m_sResourceUrl( sResourceUrl ), m_xCurrentSettings( xSettings ), m_xBarSettings( xBarSettings ), m_nPosition( 0 ), m_bTemporary( true )
 {
 }
 
-void ScVbaCommandBarControl::ApplyChange() throw ( uno::RuntimeException )
+void ScVbaCommandBarControl::ApplyChange()
 {
     uno::Reference< container::XIndexContainer > xIndexContainer( m_xCurrentSettings, uno::UNO_QUERY_THROW );
     xIndexContainer->replaceByIndex( m_nPosition, uno::makeAny( m_aPropertyValues ) );
@@ -36,7 +36,7 @@ void ScVbaCommandBarControl::ApplyChange() throw ( uno::RuntimeException )
 }
 
 OUString SAL_CALL
-ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException, std::exception )
+ScVbaCommandBarControl::getCaption()
 {
     // "Label" always empty
     OUString sCaption;
@@ -45,7 +45,7 @@ ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException, std::excepti
 }
 
 void SAL_CALL
-ScVbaCommandBarControl::setCaption( const OUString& _caption ) throw (uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::setCaption( const OUString& _caption )
 {
     OUString sCaption = _caption.replace('&','~');
     setPropertyValue( m_aPropertyValues, "Label" , uno::makeAny( sCaption ) );
@@ -53,7 +53,7 @@ ScVbaCommandBarControl::setCaption( const OUString& _caption ) throw (uno::Runti
 }
 
 OUString SAL_CALL
-ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::getOnAction()
 {
     OUString sCommandURL;
     getPropertyValue( m_aPropertyValues, "CommandURL" ) >>= sCommandURL;
@@ -61,7 +61,7 @@ ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException, std::excepti
 }
 
 void SAL_CALL
-ScVbaCommandBarControl::setOnAction( const OUString& _onaction ) throw (uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::setOnAction( const OUString& _onaction )
 {
     // get the current model
     uno::Reference< frame::XModel > xModel( pCBarHelper->getModel() );
@@ -76,7 +76,7 @@ ScVbaCommandBarControl::setOnAction( const OUString& _onaction ) throw (uno::Run
 }
 
 sal_Bool SAL_CALL
-ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::getVisible()
 {
     bool bVisible = true;
     uno::Any aValue = getPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ISVISIBLE );
@@ -85,7 +85,7 @@ ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException, std::exceptio
     return bVisible;
 }
 void SAL_CALL
-ScVbaCommandBarControl::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::setVisible( sal_Bool _visible )
 {
     uno::Any aValue = getPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ISVISIBLE );
     if( aValue.hasValue() )
@@ -96,7 +96,7 @@ ScVbaCommandBarControl::setVisible( sal_Bool _visible ) throw (uno::RuntimeExcep
 }
 
 sal_Bool SAL_CALL
-ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::getEnabled()
 {
     bool bEnabled = true;
 
@@ -114,7 +114,7 @@ ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException, std::exceptio
 }
 
 void SAL_CALL
-ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::setEnabled( sal_Bool _enabled )
 {
     uno::Any aValue = getPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ENABLED );
     if( aValue.hasValue() )
@@ -130,7 +130,7 @@ ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeExcep
 }
 
 sal_Bool SAL_CALL
-ScVbaCommandBarControl::getBeginGroup() throw (css::uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::getBeginGroup()
 {
     // TODO: need to check if the item before this item is of type 'separator'
     //#STUB
@@ -138,7 +138,7 @@ ScVbaCommandBarControl::getBeginGroup() throw (css::uno::RuntimeException, std::
 }
 
 void SAL_CALL
-ScVbaCommandBarControl::setBeginGroup( sal_Bool _begin ) throw (css::uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::setBeginGroup( sal_Bool _begin )
 {
     if( getBeginGroup() != _begin )
     {
@@ -147,7 +147,7 @@ ScVbaCommandBarControl::setBeginGroup( sal_Bool _begin ) throw (css::uno::Runtim
 }
 
 void SAL_CALL
-ScVbaCommandBarControl::Delete(  ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::Delete(  )
 {
     if( m_xCurrentSettings.is() )
     {
@@ -159,7 +159,7 @@ ScVbaCommandBarControl::Delete(  ) throw (script::BasicErrorException, uno::Runt
 }
 
 uno::Any SAL_CALL
-ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaCommandBarControl::Controls( const uno::Any& aIndex )
 {
     // only Popup Menu has controls
     uno::Reference< container::XIndexAccess > xSubMenu;
@@ -201,7 +201,7 @@ ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelp
                                             const css::uno::Reference< css::container::XIndexAccess >& xBarSettings,
                                             const OUString& sResourceUrl,
                                             sal_Int32 nPosition,
-                                            bool bTemporary ) throw (css::uno::RuntimeException)
+                                            bool bTemporary )
     : CommandBarPopup_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
 {
     m_nPosition = nPosition;
@@ -235,7 +235,7 @@ ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHe
                                               const css::uno::Reference< css::container::XIndexAccess >& xBarSettings,
                                               const OUString& sResourceUrl,
                                               sal_Int32 nPosition,
-                                              bool bTemporary ) throw (css::uno::RuntimeException)
+                                              bool bTemporary )
     : CommandBarButton_BASE( xParent, xContext, xSettings, pHelper, xBarSettings, sResourceUrl )
 {
     m_nPosition = nPosition;
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
index 2033fe40912b..de5fdfc4d6af 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx
@@ -44,31 +44,31 @@ protected:
 
 private:
     /// @throws css::uno::RuntimeException
-    void ApplyChange() throw (css::uno::RuntimeException);
+    void ApplyChange();
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) throw (css::uno::RuntimeException);
+    ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl );
 
     // Attributes
-    virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getBeginGroup() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBeginGroup( sal_Bool _begin ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getCaption() override;
+    virtual void SAL_CALL setCaption( const OUString& _caption ) override;
+    virtual OUString SAL_CALL getOnAction() override;
+    virtual void SAL_CALL setOnAction( const OUString& _onaction ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+    virtual sal_Bool SAL_CALL getEnabled() override;
+    virtual void SAL_CALL setEnabled( sal_Bool _enabled ) override;
+    virtual sal_Bool SAL_CALL getBeginGroup() override;
+    virtual void SAL_CALL setBeginGroup( sal_Bool _begin ) override;
+    virtual sal_Int32 SAL_CALL getType() override
     {
         return ov::office::MsoControlType::msoControlButton;
     }
 
     // Methods
-    virtual void SAL_CALL Delete(  ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Delete(  ) override;
+    virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) override;
 
     // XHelperInterface
     virtual OUString getServiceImplName() override;
@@ -80,9 +80,9 @@ class ScVbaCommandBarPopup : public CommandBarPopup_BASE
 {
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, bool bTemporary ) throw (css::uno::RuntimeException);
+    ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, bool bTemporary );
 
-    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getType() override
     {
         return ov::office::MsoControlType::msoControlPopup;
     }
@@ -96,9 +96,9 @@ class ScVbaCommandBarButton : public CommandBarButton_BASE
 {
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, bool bTemporary ) throw (css::uno::RuntimeException);
+    ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, const VbaCommandBarHelperRef& pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, sal_Int32 nPosition, bool bTemporary );
 
-    virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getType() override
     {
         return ov::office::MsoControlType::msoControlButton;
     }
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index e6be3a8a3a08..b180fb7ba8ea 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -30,13 +30,13 @@ class CommandBarControlEnumeration : public ::cppu::WeakImplHelper< container::X
     sal_Int32 m_nCurrentPosition;
 public:
     explicit CommandBarControlEnumeration( CommandBarControls_BASE* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {}
-    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasMoreElements() override
     {
         if( m_nCurrentPosition < m_pCommandBarControls->getCount() )
             return true;
         return false;
     }
-    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL nextElement() override
     {
         if( hasMoreElements() )
         {
@@ -47,7 +47,7 @@ public:
     }
 };
 
-ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess>& xIndexAccess, VbaCommandBarHelperRef const & pHelper, const uno::Reference< container::XIndexAccess>& xBarSettings, const OUString& sResourceUrl ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl )
+ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess>& xIndexAccess, VbaCommandBarHelperRef const & pHelper, const uno::Reference< container::XIndexAccess>& xBarSettings, const OUString& sResourceUrl ) : CommandBarControls_BASE( xParent, xContext, xIndexAccess ), pCBarHelper( pHelper ), m_xBarSettings( xBarSettings ), m_sResourceUrl( sResourceUrl )
 {
     m_bIsMenu = sResourceUrl == ITEM_MENUBAR_URL;
 }
@@ -110,13 +110,13 @@ uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateToolbarItem
 
 // XEnumerationAccess
 uno::Type SAL_CALL
-ScVbaCommandBarControls::getElementType() throw ( uno::RuntimeException )
+ScVbaCommandBarControls::getElementType()
 {
     return cppu::UnoType<XCommandBarControl>::get();
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
+ScVbaCommandBarControls::createEnumeration()
 {
     return uno::Reference< container::XEnumeration >( new CommandBarControlEnumeration( this ) );
 }
@@ -141,7 +141,7 @@ ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
 
 // Methods
 uno::Any SAL_CALL
-ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException)
+ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ )
 {
     sal_Int32 nPosition = -1;
     if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
@@ -164,7 +164,7 @@ ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*
 }
 
 uno::Reference< XCommandBarControl > SAL_CALL
-ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& Parameter, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& Parameter, const uno::Any& Before, const uno::Any& Temporary )
 {
     // Parameter is not supported
     // the following name needs to be individually created;
@@ -259,32 +259,32 @@ class VbaDummyIndexAccess : public ::cppu::WeakImplHelper< container::XIndexAcce
 public:
     inline VbaDummyIndexAccess() {}
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
         { return 0; }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 /*Index*/ ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 /*Index*/ ) override
         { throw lang::IndexOutOfBoundsException(); }
     // XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
         { return cppu::UnoType<XCommandBarControl>::get(); }
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
         { return false; }
 };
 
 
 VbaDummyCommandBarControls::VbaDummyCommandBarControls(
         const uno::Reference< XHelperInterface >& xParent,
-        const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException) :
+        const uno::Reference< uno::XComponentContext >& xContext ) :
     CommandBarControls_BASE( xParent, xContext, new VbaDummyIndexAccess )
 {
 }
 
 // XEnumerationAccess
-uno::Type SAL_CALL VbaDummyCommandBarControls::getElementType() throw ( uno::RuntimeException )
+uno::Type SAL_CALL VbaDummyCommandBarControls::getElementType()
 {
     return cppu::UnoType<XCommandBarControl>::get();
 }
 
-uno::Reference< container::XEnumeration > VbaDummyCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
+uno::Reference< container::XEnumeration > VbaDummyCommandBarControls::createEnumeration()
 {
     return uno::Reference< container::XEnumeration >( new CommandBarControlEnumeration( this ) );
 }
@@ -295,13 +295,13 @@ uno::Any VbaDummyCommandBarControls::createCollectionObject( const uno::Any& /*a
 }
 
 // Methods
-uno::Any SAL_CALL VbaDummyCommandBarControls::Item( const uno::Any& /*aIndex*/, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException)
+uno::Any SAL_CALL VbaDummyCommandBarControls::Item( const uno::Any& /*aIndex*/, const uno::Any& /*aIndex*/ )
 {
     return uno::Any( uno::Reference< XCommandBarControl >() );
 }
 
 uno::Reference< XCommandBarControl > SAL_CALL VbaDummyCommandBarControls::Add(
-        const uno::Any& /*Type*/, const uno::Any& /*Id*/, const uno::Any& /*Parameter*/, const uno::Any& /*Before*/, const uno::Any& /*Temporary*/ ) throw (script::BasicErrorException, uno::RuntimeException, std::exception)
+        const uno::Any& /*Type*/, const uno::Any& /*Id*/, const uno::Any& /*Parameter*/, const uno::Any& /*Before*/, const uno::Any& /*Temporary*/ )
 {
     return uno::Reference< XCommandBarControl >();
 }
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
index e329a1d00988..aae4de66c891 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
@@ -46,16 +46,16 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, VbaCommandBarHelperRef const & pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) throw( css::uno::RuntimeException );
+    ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, VbaCommandBarHelperRef const & pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) override;
+    virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
@@ -67,16 +67,16 @@ public:
     /// @throws css::uno::RuntimeException
     VbaDummyCommandBarControls(
         const css::uno::Reference< ov::XHelperInterface >& xParent,
-        const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw( css::uno::RuntimeException );
+        const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
     // Methods
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) override;
+    virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index 5c82007317ae..777e7a3695b7 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
@@ -86,12 +86,12 @@ public:
 MSO2OOCommandbarHelper* MSO2OOCommandbarHelper::pMSO2OOCommandbarHelper = nullptr;
 
 
-VbaCommandBarHelper::VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException) : mxContext( xContext ), mxModel( xModel )
+VbaCommandBarHelper::VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ) : mxContext( xContext ), mxModel( xModel )
 {
     Init();
 }
 
-void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException)
+void VbaCommandBarHelper::Init( )
 {
     uno::Reference< css::ui::XUIConfigurationManagerSupplier > xUICfgSupplier( mxModel, uno::UNO_QUERY_THROW );
     m_xDocCfgMgr = xUICfgSupplier->getUIConfigurationManager();
@@ -121,7 +121,7 @@ void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException)
     m_xWindowState.set( xNameAccess->getByName( maModuleId ), uno::UNO_QUERY_THROW );
 }
 
-css::uno::Reference< css::container::XIndexAccess > VbaCommandBarHelper::getSettings( const OUString& sResourceUrl ) throw (css::uno::RuntimeException)
+css::uno::Reference< css::container::XIndexAccess > VbaCommandBarHelper::getSettings( const OUString& sResourceUrl )
 {
     if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
         return m_xDocCfgMgr->getSettings( sResourceUrl, true );
@@ -134,7 +134,7 @@ css::uno::Reference< css::container::XIndexAccess > VbaCommandBarHelper::getSett
     }
 }
 
-void VbaCommandBarHelper::removeSettings( const OUString& sResourceUrl ) throw (css::uno::RuntimeException)
+void VbaCommandBarHelper::removeSettings( const OUString& sResourceUrl )
 {
     if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
         m_xDocCfgMgr->removeSettings( sResourceUrl );
@@ -144,7 +144,7 @@ void VbaCommandBarHelper::removeSettings( const OUString& sResourceUrl ) throw (
     // persistChanges();
 }
 
-void VbaCommandBarHelper::ApplyTempChange( const OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings ) throw (css::uno::RuntimeException)
+void VbaCommandBarHelper::ApplyTempChange( const OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings )
 {
     if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
     {
@@ -156,7 +156,7 @@ void VbaCommandBarHelper::ApplyTempChange( const OUString& sResourceUrl, const c
     }
 }
 
-uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager() throw (uno::RuntimeException)
+uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager()
 {
     uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
     uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
@@ -164,7 +164,7 @@ uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager()
     return xLayoutManager;
 }
 
-bool VbaCommandBarHelper::hasToolbar( const OUString& sResourceUrl, const OUString& sName ) throw (css::uno::RuntimeException)
+bool VbaCommandBarHelper::hasToolbar( const OUString& sResourceUrl, const OUString& sName )
 {
     if( m_xDocCfgMgr->hasSettings( sResourceUrl ) )
     {
@@ -178,7 +178,7 @@ bool VbaCommandBarHelper::hasToolbar( const OUString& sResourceUrl, const OUStri
 }
 
 // return the resource url if found
-OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const OUString& sName ) throw (css::uno::RuntimeException)
+OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const OUString& sName )
 {
     OUString sResourceUrl;
 
@@ -207,7 +207,7 @@ OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< css:
 }
 
 // if found, return the position of the control. if not found, return -1
-sal_Int32 VbaCommandBarHelper::findControlByName( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const OUString& sName, bool bMenu ) throw (css::uno::RuntimeException)
+sal_Int32 VbaCommandBarHelper::findControlByName( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const OUString& sName, bool bMenu )
 {
     sal_Int32 nCount = xIndexAccess->getCount();
     css::uno::Sequence< css::beans::PropertyValue > aProps;
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
index a06b2887f0e0..75f1a82ecfff 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
@@ -59,35 +59,35 @@ private:
     OUString maModuleId;
 
     /// @throws css::uno::RuntimeException
-    void Init() throw (css::uno::RuntimeException);
+    void Init();
     /// @throws css::uno::RuntimeException
-    bool hasToolbar( const OUString& sResourceUrl, const OUString& sName )  throw (css::uno::RuntimeException);
+    bool hasToolbar( const OUString& sResourceUrl, const OUString& sName );
 public:
     /// @throws css::uno::RuntimeException
-    VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException );
+    VbaCommandBarHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
 
     const css::uno::Reference< css::frame::XModel >& getModel() const { return mxModel; }
 
     /// @throws css::uno::RuntimeException
-    const css::uno::Reference< css::container::XNameAccess >& getPersistentWindowState() const throw (css::uno::RuntimeException)
+    const css::uno::Reference< css::container::XNameAccess >& getPersistentWindowState() const
     {
         return m_xWindowState;
     }
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::container::XIndexAccess > getSettings( const OUString& sResourceUrl ) throw (css::uno::RuntimeException);
+    css::uno::Reference< css::container::XIndexAccess > getSettings( const OUString& sResourceUrl );
     /// @throws css::uno::RuntimeException
-    void removeSettings( const OUString& sResourceUrl ) throw (css::uno::RuntimeException);
+    void removeSettings( const OUString& sResourceUrl );
     /// @throws css::uno::RuntimeException
-    void ApplyTempChange( const OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings) throw (css::uno::RuntimeException);
+    void ApplyTempChange( const OUString& sResourceUrl, const css::uno::Reference< css::container::XIndexAccess >& xSettings);
 
     /// @throws css::uno::RuntimeException
-    css::uno::Reference< css::frame::XLayoutManager > getLayoutManager() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::frame::XLayoutManager > getLayoutManager();
 
     const OUString& getModuleId() const { return maModuleId; }
     /// @throws css::uno::RuntimeException
-    OUString findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const OUString& sName ) throw (css::uno::RuntimeException);
+    OUString findToolbarByName( const css::uno::Reference< css::container::XNameAccess >& xNameAccess, const OUString& sName );
     /// @throws css::uno::RuntimeException
-    static sal_Int32 findControlByName( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const OUString& sName, bool bMenu ) throw (css::uno::RuntimeException);
+    static sal_Int32 findControlByName( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const OUString& sName, bool bMenu );
     static OUString generateCustomURL();
 };
 
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index e22c524b1237..ec2a439b89dd 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -42,18 +42,18 @@ class CommandBarEnumeration : public ::cppu::WeakImplHelper< container::XEnumera
     sal_Int32 m_nCurrentPosition;
 public:
     /// @throws uno::RuntimeException
-    CommandBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const VbaCommandBarHelperRef& pHelper) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_pCBarHelper( pHelper ) , m_nCurrentPosition( 0 )
+    CommandBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const VbaCommandBarHelperRef& pHelper) : m_xParent( xParent ), m_xContext( xContext ), m_pCBarHelper( pHelper ) , m_nCurrentPosition( 0 )
     {
         uno::Reference< container::XNameAccess > xNameAccess = m_pCBarHelper->getPersistentWindowState();
         m_sNames = xNameAccess->getElementNames();
     }
-    virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override
+    virtual sal_Bool SAL_CALL hasMoreElements() override
     {
         if( m_nCurrentPosition < m_sNames.getLength() )
             return true;
         return false;
     }
-    virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override
+    virtual uno::Any SAL_CALL nextElement() override
     {
         // FIXME: should be add menubar
         if( hasMoreElements() )
@@ -76,7 +76,7 @@ public:
     }
 };
 
-ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
+ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< frame::XModel >& xModel ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
 {
     m_pCBarHelper.reset( new VbaCommandBarHelper( mxContext, xModel ) );
     m_xNameAccess = m_pCBarHelper->getPersistentWindowState();
@@ -88,13 +88,13 @@ ScVbaCommandBars::~ScVbaCommandBars()
 
 // XEnumerationAccess
 uno::Type SAL_CALL
-ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
+ScVbaCommandBars::getElementType()
 {
     return cppu::UnoType<XCommandBar>::get();
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaCommandBars::createEnumeration() throw ( uno::RuntimeException )
+ScVbaCommandBars::createEnumeration()
 {
     return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( this, mxContext, m_pCBarHelper ) );
 }
@@ -158,7 +158,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
 
 // XCommandBars
 uno::Reference< XCommandBar > SAL_CALL
-ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& /*Temporary*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& /*Temporary*/ )
 {
     // FIXME: only support to add Toolbar
     // Position - MsoBar MenuBar - sal_Bool
@@ -186,7 +186,7 @@ ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Positio
     return xCBar;
 }
 sal_Int32 SAL_CALL
-ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
+ScVbaCommandBars::getCount()
 {
     // Filter out all toolbars from the window collection
     sal_Int32 nCount = 1; // there is a Menubar in OOo
@@ -203,7 +203,7 @@ ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
 
 // ScVbaCollectionBaseImpl
 uno::Any SAL_CALL
-ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
+ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ )
 {
     if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
     {
diff --git a/vbahelper/source/vbahelper/vbacommandbars.hxx b/vbahelper/source/vbahelper/vbacommandbars.hxx
index 2c3fca4b5c82..e94efafe59f9 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.hxx
@@ -35,18 +35,18 @@ private:
 
 public:
     /// @throws css::uno::RuntimeException
-    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
+    ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const css::uno::Reference< css::frame::XModel >& xModel );
     virtual ~ScVbaCommandBars() override;
 
     // XCommandBars
-    virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) override;
     // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 
-    virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) override;
-    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException) override;
+    virtual sal_Int32 SAL_CALL getCount() override;
+    virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) override;
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx
index e5af3b3e9c0e..605a9c76f7eb 100644
--- a/vbahelper/source/vbahelper/vbadialogbase.cxx
+++ b/vbahelper/source/vbahelper/vbadialogbase.cxx
@@ -23,7 +23,7 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-void SAL_CALL VbaDialogBase::Show() throw ( uno::RuntimeException, std::exception )
+void SAL_CALL VbaDialogBase::Show()
 {
     OUString aURL;
     if ( m_xModel.is() )
diff --git a/vbahelper/source/vbahelper/vbadialogsbase.cxx b/vbahelper/source/vbahelper/vbadialogsbase.cxx
index 4ff570f2c6d8..d73ac6c062e4 100644
--- a/vbahelper/source/vbahelper/vbadialogsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadialogsbase.cxx
@@ -22,14 +22,14 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 ::sal_Int32
-VbaDialogsBase::getCount() throw (uno::RuntimeException, std::exception)
+VbaDialogsBase::getCount()
 {
     //#STUB
     return 0;
 }
 
 uno::Any
-VbaDialogsBase::Item( const uno::Any& /* &aItem */) throw (uno::RuntimeException, std::exception)
+VbaDialogsBase::Item( const uno::Any& /* &aItem */)
 {
     //#STUB
     return uno::Any();
diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx
index 899d0de3049a..cf221ab6b95f 100644
--- a/vbahelper/source/vbahelper/vbadocumentbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx
@@ -53,7 +53,7 @@ VbaDocumentBase::VbaDocumentBase( uno::Sequence< uno::Any> const & args,
 }
 
 OUString
-VbaDocumentBase::getName() throw (uno::RuntimeException, std::exception)
+VbaDocumentBase::getName()
 {
     return VbaDocumentBase::getNameFromModel( getModel() );
 }
@@ -76,7 +76,7 @@ OUString VbaDocumentBase::getNameFromModel( const uno::Reference< frame::XModel
     return sName;
 }
 OUString
-VbaDocumentBase::getPath() throw (uno::RuntimeException, std::exception)
+VbaDocumentBase::getPath()
 {
     INetURLObject aURL( getModel()->getURL() );
     OUString sURL = aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri );
@@ -90,7 +90,7 @@ VbaDocumentBase::getPath() throw (uno::RuntimeException, std::exception)
 }
 
 OUString
-VbaDocumentBase::getFullName() throw (uno::RuntimeException, std::exception)
+VbaDocumentBase::getFullName()
 {
     OUString sPath = getName();
     //::osl::File::getSystemPathFromFileURL( getModel()->getURL(), sPath );
@@ -99,7 +99,7 @@ VbaDocumentBase::getFullName() throw (uno::RuntimeException, std::exception)
 
 void
 VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
-                      const uno::Any &rRouteArg ) throw (uno::RuntimeException, std::exception)
+                      const uno::Any &rRouteArg )
 {
     bool bSaveChanges = false;
     OUString aFileName;
@@ -190,7 +190,7 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
 }
 
 void
-VbaDocumentBase::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException)
+VbaDocumentBase::Protect( const uno::Any &aPassword )
 {
     OUString rPassword;
     uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
@@ -202,7 +202,7 @@ VbaDocumentBase::Protect( const uno::Any &aPassword ) throw (uno::RuntimeExcepti
 }
 
 void
-VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException, std::exception)
+VbaDocumentBase::Unprotect( const uno::Any &aPassword )
 {
     OUString rPassword;
     uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
@@ -218,7 +218,7 @@ VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeExcep
 }
 
 void
-VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException, std::exception)
+VbaDocumentBase::setSaved( sal_Bool bSave )
 {
     uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
     try
@@ -240,14 +240,14 @@ VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException, std::e
 }
 
 sal_Bool
-VbaDocumentBase::getSaved() throw (uno::RuntimeException, std::exception)
+VbaDocumentBase::getSaved()
 {
     uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
     return !xModifiable->isModified();
 }
 
 void
-VbaDocumentBase::Save() throw (uno::RuntimeException, std::exception)
+VbaDocumentBase::Save()
 {
     OUString url(".uno:Save");
     uno::Reference< frame::XModel > xModel = getModel();
@@ -255,14 +255,14 @@ VbaDocumentBase::Save() throw (uno::RuntimeException, std::exception)
 }
 
 void
-VbaDocumentBase::Activate() throw (uno::RuntimeException, std::exception)
+VbaDocumentBase::Activate()
 {
     uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
     xFrame->activate();
 }
 
 uno::Any SAL_CALL
-VbaDocumentBase::getVBProject() throw (uno::RuntimeException, std::exception)
+VbaDocumentBase::getVBProject()
 {
     if( !mxVBProject.is() ) try
     {
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 10bfe880adcc..7e61c47efd80 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -71,12 +71,12 @@ class DocumentsEnumImpl : public ::cppu::WeakImplHelper< container::XEnumeration
 
 public:
     /// @throws uno::RuntimeException
-    DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Documents& docs ) throw ( uno::RuntimeException ) :  m_xContext( xContext ), m_documents( docs )
+    DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const Documents& docs ) :  m_xContext( xContext ), m_documents( docs )
     {
         m_it = m_documents.begin();
     }
     /// @throws uno::RuntimeException
-    explicit DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) :  m_xContext( xContext )
+    explicit DocumentsEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ) :  m_xContext( xContext )
     {
         uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create( m_xContext );
         uno::Reference< container::XEnumeration > xComponents = xDesktop->getComponents()->createEnumeration();
@@ -89,12 +89,12 @@ public:
         m_it = m_documents.begin();
     }
     // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasMoreElements(  ) override
     {
         return m_it != m_documents.end();
     }
 
-    virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL nextElement(  ) override
     {
         if ( !hasMoreElements() )
         {
@@ -123,7 +123,7 @@ class DocumentsAccessImpl : public DocumentsAccessImpl_BASE
     VbaDocumentsBase::DOCUMENT_TYPE meDocType;
 public:
     /// @throws uno::RuntimeException
-    DocumentsAccessImpl( const uno::Reference< uno::XComponentContext >& xContext, VbaDocumentsBase::DOCUMENT_TYPE eDocType ) throw (uno::RuntimeException, std::exception) :m_xContext( xContext ), meDocType( eDocType )
+    DocumentsAccessImpl( const uno::Reference< uno::XComponentContext >& xContext, VbaDocumentsBase::DOCUMENT_TYPE eDocType ) :m_xContext( xContext ), meDocType( eDocType )
     {
         uno::Reference< container::XEnumeration > xEnum = new DocumentsEnumImpl( m_xContext );
         sal_Int32 nIndex=0;
@@ -144,16 +144,16 @@ public:
     }
 
     //XEnumerationAccess
-    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration(  ) override
     {
         return new DocumentsEnumImpl( m_xContext, m_documents );
     }
     // XIndexAccess
-    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getCount(  ) override
     {
         return m_documents.size();
     }
-    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override
     {
         if ( Index < 0
             || static_cast< Documents::size_type >(Index) >= m_documents.size() )
@@ -162,18 +162,18 @@ public:
     }
 
     //XElementAccess
-    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Type SAL_CALL getElementType(  ) override
     {
         return cppu::UnoType<frame::XModel>::get();
     }
 
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasElements(  ) override
     {
         return (!m_documents.empty());
     }
 
     //XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override
     {
         NameIndexHash::const_iterator it = namesToIndices.find( aName );
         if ( it == namesToIndices.end() )
@@ -182,12 +182,12 @@ public:
 
     }
 
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames(  ) override
     {
         return comphelper::mapKeysToSequence( namesToIndices );
     }
 
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override
     {
         NameIndexHash::const_iterator it = namesToIndices.find( aName );
         return (it != namesToIndices.end());
@@ -195,7 +195,7 @@ public:
 
 };
 
-VbaDocumentsBase::VbaDocumentsBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext, DOCUMENT_TYPE eDocType ) throw (uno::RuntimeException) : VbaDocumentsBase_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new DocumentsAccessImpl( xContext, eDocType ) ) ), meDocType( eDocType )
+VbaDocumentsBase::VbaDocumentsBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext, DOCUMENT_TYPE eDocType ) : VbaDocumentsBase_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new DocumentsAccessImpl( xContext, eDocType ) ) ), meDocType( eDocType )
 {
 }
 
@@ -225,7 +225,7 @@ void lclSetupComponent( const uno::Reference< lang::XComponent >& rxComponent, b
 
 } // namespace
 
-uno::Any VbaDocumentsBase::createDocument() throw (uno::RuntimeException, std::exception)
+uno::Any VbaDocumentsBase::createDocument()
 {
     // #163808# determine state of Application.ScreenUpdating and Application.Interactive symbols (before new document is opened)
     uno::Reference< XApplicationBase > xApplication( Application(), uno::UNO_QUERY );
@@ -258,7 +258,7 @@ uno::Any VbaDocumentsBase::createDocument() throw (uno::RuntimeException, std::e
 }
 
 // #TODO# #FIXME# can any of the unused params below be used?
-uno::Any VbaDocumentsBase::openDocument( const OUString& rFileName, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps ) throw (uno::RuntimeException)
+uno::Any VbaDocumentsBase::openDocument( const OUString& rFileName, const uno::Any& ReadOnly, const uno::Sequence< beans::PropertyValue >& rProps )
 {
     // #163808# determine state of Application.ScreenUpdating and Application.Interactive symbols (before new document is opened)
     uno::Reference< XApplicationBase > xApplication( Application(), uno::UNO_QUERY );
diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
index 8176f9954fcf..ed718c171712 100644
--- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
+++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
@@ -54,7 +54,6 @@ VbaEventsHelperBase::~VbaEventsHelperBase()
 }
 
 sal_Bool SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs )
-        throw (lang::IllegalArgumentException, util::VetoException, uno::RuntimeException, std::exception)
 {
     /*  Derived classes may add new event identifiers to be processed while
         processing the original event. All unprocessed events are collected in
@@ -131,14 +130,14 @@ sal_Bool SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, cons
     return bExecuted;
 }
 
-void SAL_CALL VbaEventsHelperBase::notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaEventsHelperBase::notifyEvent( const document::EventObject& rEvent )
 {
     SAL_INFO("vbahelper", "VbaEventsHelperBase::notifyEvent( \"" << rEvent.EventName << "\" )");
     if( rEvent.EventName == GlobalEventConfig::GetEventName( GlobalEventId::CLOSEDOC ) )
         stopListening();
 }
 
-void SAL_CALL VbaEventsHelperBase::changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaEventsHelperBase::changesOccurred( const util::ChangesEvent& rEvent )
 {
     // make sure the VBA library exists
     try
@@ -176,7 +175,7 @@ void SAL_CALL VbaEventsHelperBase::changesOccurred( const util::ChangesEvent& rE
     }
 }
 
-void SAL_CALL VbaEventsHelperBase::disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL VbaEventsHelperBase::disposing( const lang::EventObject& rEvent )
 {
     uno::Reference< frame::XModel > xSender( rEvent.Source, uno::UNO_QUERY );
     if( xSender.is() )
@@ -184,7 +183,6 @@ void SAL_CALL VbaEventsHelperBase::disposing( const lang::EventObject& rEvent )
 }
 
 sal_Bool VbaEventsHelperBase::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -241,7 +239,6 @@ void VbaEventsHelperBase::stopListening()
 }
 
 sal_Bool SAL_CALL VbaEventsHelperBase::hasVbaEventHandler( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs )
-        throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     EventHandlerInfoMap::const_iterator aIt = maEventInfos.find( nEventId );
     if( aIt == maEventInfos.end() )
@@ -251,7 +248,7 @@ sal_Bool SAL_CALL VbaEventsHelperBase::hasVbaEventHandler( sal_Int32 nEventId, c
 }
 
 const VbaEventsHelperBase::EventHandlerInfo& VbaEventsHelperBase::getEventHandlerInfo(
-        sal_Int32 nEventId ) const throw (lang::IllegalArgumentException)
+        sal_Int32 nEventId ) const
 {
     EventHandlerInfoMap::const_iterator aIt = maEventInfos.find( nEventId );
     if( aIt == maEventInfos.end() )
@@ -260,7 +257,7 @@ const VbaEventsHelperBase::EventHandlerInfo& VbaEventsHelperBase::getEventHandle
 }
 
 OUString VbaEventsHelperBase::getEventHandlerPath( const EventHandlerInfo& rInfo,
-        const uno::Sequence< uno::Any >& rArgs ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+        const uno::Sequence< uno::Any >& rArgs )
 {
     OUString aModuleName;
     switch( rInfo.mnModuleType )
@@ -287,7 +284,7 @@ OUString VbaEventsHelperBase::getEventHandlerPath( const EventHandlerInfo& rInfo
     return rPathMap[ rInfo.mnEventId ];
 }
 
-void VbaEventsHelperBase::ensureVBALibrary() throw (uno::RuntimeException)
+void VbaEventsHelperBase::ensureVBALibrary()
 {
     if( !mxModuleInfos.is() ) try
     {
@@ -310,7 +307,7 @@ void VbaEventsHelperBase::ensureVBALibrary() throw (uno::RuntimeException)
     }
 }
 
-sal_Int32 VbaEventsHelperBase::getModuleType( const OUString& rModuleName ) throw (uno::RuntimeException)
+sal_Int32 VbaEventsHelperBase::getModuleType( const OUString& rModuleName )
 {
     // make sure the VBA library exists
     ensureVBALibrary();
@@ -330,7 +327,7 @@ sal_Int32 VbaEventsHelperBase::getModuleType( const OUString& rModuleName ) thro
     throw uno::RuntimeException();
 }
 
-VbaEventsHelperBase::ModulePathMap& VbaEventsHelperBase::updateModulePathMap( const OUString& rModuleName ) throw (uno::RuntimeException, std::exception)
+VbaEventsHelperBase::ModulePathMap& VbaEventsHelperBase::updateModulePathMap( const OUString& rModuleName )
 {
     // get type of the specified module (throws on error)
     sal_Int32 nModuleType = getModuleType( rModuleName );
diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx
index 0ee49c407d51..7ca9781af6aa 100644
--- a/vbahelper/source/vbahelper/vbafillformat.cxx
+++ b/vbahelper/source/vbahelper/vbafillformat.cxx
@@ -35,7 +35,7 @@ ScVbaFillFormat::ScVbaFillFormat( const uno::Reference< XHelperInterface >& xPar
 }
 
 void
-ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle ) throw (uno::RuntimeException)
+ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle )
 {
     m_nFillStyle = nFillStyle;
     if( m_nFillStyle == drawing::FillStyle_GRADIENT )
@@ -66,7 +66,7 @@ ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle ) throw (uno::Runti
 }
 
 void
-ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException)
+ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor )
 {
     m_nForeColor = nForeColor;
     setFillStyle( m_nFillStyle );
@@ -74,7 +74,7 @@ ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css
 
 // Attributes
 sal_Bool SAL_CALL
-ScVbaFillFormat::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaFillFormat::getVisible()
 {
     drawing::FillStyle nFillStyle;
     m_xPropertySet->getPropertyValue( "FillStyle" ) >>= nFillStyle;
@@ -84,7 +84,7 @@ ScVbaFillFormat::getVisible() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception)
+ScVbaFillFormat::setVisible( sal_Bool _visible )
 {
     drawing::FillStyle aFillStyle;
     m_xPropertySet->getPropertyValue( "FillStyle" ) >>= aFillStyle;
@@ -102,7 +102,7 @@ ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, s
 }
 
 double SAL_CALL
-ScVbaFillFormat::getTransparency() throw (uno::RuntimeException, std::exception)
+ScVbaFillFormat::getTransparency()
 {
     sal_Int16 nTransparence = 0;
     double dTransparence = 0;
@@ -113,7 +113,7 @@ ScVbaFillFormat::getTransparency() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException, std::exception)
+ScVbaFillFormat::setTransparency( double _transparency )
 {
     sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 );
     m_xPropertySet->setPropertyValue( "FillTransparence" , uno::makeAny( nTransparence ) );
@@ -122,13 +122,13 @@ ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeExce
 
 // Methods
 void SAL_CALL
-ScVbaFillFormat::Solid() throw (uno::RuntimeException, std::exception)
+ScVbaFillFormat::Solid()
 {
     setFillStyle( drawing::FillStyle_SOLID );
 }
 
 void SAL_CALL
-ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ )
 {
     if( style == office::MsoGradientStyle::msoGradientHorizontal )
     {
@@ -153,7 +153,7 @@ ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) thro
 }
 
 uno::Reference< msforms::XColorFormat > SAL_CALL
-ScVbaFillFormat::BackColor() throw (uno::RuntimeException, std::exception)
+ScVbaFillFormat::BackColor()
 {
     if( !m_xColorFormat.is() )
         m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_BACKCOLOR ) );
@@ -161,7 +161,7 @@ ScVbaFillFormat::BackColor() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< msforms::XColorFormat > SAL_CALL
-ScVbaFillFormat::ForeColor() throw (uno::RuntimeException, std::exception)
+ScVbaFillFormat::ForeColor()
 {
     if( !m_xColorFormat.is() )
         m_xColorFormat.set( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ColorFormatType::FILLFORMAT_FORECOLOR ) );
diff --git a/vbahelper/source/vbahelper/vbafillformat.hxx b/vbahelper/source/vbahelper/vbafillformat.hxx
index 8789560e18ee..e1635a80db28 100644
--- a/vbahelper/source/vbahelper/vbafillformat.hxx
+++ b/vbahelper/source/vbahelper/vbafillformat.hxx
@@ -37,7 +37,7 @@ private:
     sal_Int16 m_nGradientAngle;
 private:
     /// @throws css::uno::RuntimeException
-    void setFillStyle( css::drawing::FillStyle nFillStyle ) throw (css::uno::RuntimeException);
+    void setFillStyle( css::drawing::FillStyle nFillStyle );
 protected:
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
@@ -46,18 +46,18 @@ public:
     ScVbaFillFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
 
     /// @throws css::uno::RuntimeException
-    void setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css::uno::RuntimeException);
+    void setForeColorAndInternalStyle( sal_Int32 nForeColor );
     // Attributes
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+    virtual double SAL_CALL getTransparency() override;
+    virtual void SAL_CALL setTransparency( double _transparency ) override;
 
     // Methods
-    virtual void SAL_CALL Solid() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL TwoColorGradient( sal_Int32 style, sal_Int32 variant ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Solid() override;
+    virtual void SAL_CALL TwoColorGradient( sal_Int32 style, sal_Int32 variant ) override;
+    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() override;
+    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() override;
 
 };
 
diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx
index d9f908bee01c..3dd15e11bea7 100644
--- a/vbahelper/source/vbahelper/vbafontbase.cxx
+++ b/vbahelper/source/vbahelper/vbafontbase.cxx
@@ -39,7 +39,7 @@ VbaFontBase::VbaFontBase(
         const uno::Reference< uno::XComponentContext >& xContext,
         const uno::Reference< css::container::XIndexAccess >& xPalette,
         const uno::Reference< beans::XPropertySet >& xPropertySet,
-        bool bFormControl ) throw ( uno::RuntimeException ) :
+        bool bFormControl ) :
     VbaFontBase_BASE( xParent, xContext ),
     mxFont( xPropertySet, uno::UNO_SET_THROW ),
     mxPalette( xPalette, uno::UNO_SET_THROW ),
@@ -52,7 +52,7 @@ VbaFontBase::~VbaFontBase()
 }
 
 void SAL_CALL
-VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+VbaFontBase::setSuperscript( const uno::Any& aValue )
 {
     // not supported in form controls
     if( mbFormControl )
@@ -73,7 +73,7 @@ VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExcept
 }
 
 uno::Any SAL_CALL
-VbaFontBase::getSuperscript() throw ( uno::RuntimeException, std::exception )
+VbaFontBase::getSuperscript()
 {
     short nValue = NORMAL;
     // not supported in form controls
@@ -83,7 +83,7 @@ VbaFontBase::getSuperscript() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-VbaFontBase::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+VbaFontBase::setSubscript( const uno::Any& aValue )
 {
     // not supported in form controls
     if( mbFormControl )
@@ -106,7 +106,7 @@ VbaFontBase::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio
 }
 
 uno::Any SAL_CALL
-VbaFontBase::getSubscript() throw ( uno::RuntimeException, std::exception )
+VbaFontBase::getSubscript()
 {
     short nValue = NORMAL;
     // not supported in form controls
@@ -116,7 +116,7 @@ VbaFontBase::getSubscript() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-VbaFontBase::setSize( const uno::Any& aValue ) throw( uno::RuntimeException, std::exception )
+VbaFontBase::setSize( const uno::Any& aValue )
 {
     // form controls need a sal_Int16 containing points, other APIs need a float
     uno::Any aVal( aValue );
@@ -130,13 +130,13 @@ VbaFontBase::setSize( const uno::Any& aValue ) throw( uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL
-VbaFontBase::getSize() throw ( uno::RuntimeException, std::exception )
+VbaFontBase::getSize()
 {
     return mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharHeight", "FontHeight" ) );
 }
 
 void SAL_CALL
-VbaFontBase::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeException, std::exception )
+VbaFontBase::setColorIndex( const uno::Any& _colorindex )
 {
     sal_Int32 nIndex = 0;
     _colorindex >>= nIndex;
@@ -151,7 +151,7 @@ VbaFontBase::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExc
 
 
 uno::Any SAL_CALL
-VbaFontBase::getColorIndex() throw ( uno::RuntimeException, std::exception )
+VbaFontBase::getColorIndex()
 {
     sal_Int32 nColor = 0;
 
@@ -172,7 +172,7 @@ VbaFontBase::getColorIndex() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-VbaFontBase::setBold( const uno::Any& aValue ) throw( uno::RuntimeException, std::exception )
+VbaFontBase::setBold( const uno::Any& aValue )
 {
     bool bValue = false;
     aValue >>= bValue;
@@ -184,7 +184,7 @@ VbaFontBase::setBold( const uno::Any& aValue ) throw( uno::RuntimeException, std
 }
 
 uno::Any SAL_CALL
-VbaFontBase::getBold() throw ( uno::RuntimeException, std::exception )
+VbaFontBase::getBold()
 {
     double fValue = 0.0;
     mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharWeight", "FontWeight" ) ) >>= fValue;
@@ -192,7 +192,7 @@ VbaFontBase::getBold() throw ( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL
-VbaFontBase::setStrikethrough( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+VbaFontBase::setStrikethrough( const uno::Any& aValue )
 {
     bool bValue = false;
     aValue >>= bValue;
@@ -203,7 +203,7 @@ VbaFontBase::setStrikethrough( const uno::Any& aValue ) throw ( uno::RuntimeExce
 }
 
 uno::Any SAL_CALL
-VbaFontBase::getStrikethrough() throw ( uno::RuntimeException, std::exception )
+VbaFontBase::getStrikethrough()
 {
     short nValue = 0;
     mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharStrikeout", "FontStrikeout" ) ) >>= nValue;
@@ -211,20 +211,20 @@ VbaFontBase::getStrikethrough() throw ( uno::RuntimeException, std::exception )
 }
 
 void  SAL_CALL
-VbaFontBase::setShadow( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+VbaFontBase::setShadow( const uno::Any& aValue )
 {
     if( !mbFormControl )
        mxFont->setPropertyValue( "CharShadowed" , aValue );
 }
 
 uno::Any SAL_CALL
-VbaFontBase::getShadow() throw (uno::RuntimeException, std::exception)
+VbaFontBase::getShadow()
 {
     return mbFormControl ? uno::Any( false ) : mxFont->getPropertyValue( "CharShadowed" );
 }
 
 void  SAL_CALL
-VbaFontBase::setItalic( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+VbaFontBase::setItalic( const uno::Any& aValue )
 {
     bool bValue = false;
     aValue >>= bValue;
@@ -235,7 +235,7 @@ VbaFontBase::setItalic( const uno::Any& aValue ) throw ( uno::RuntimeException,
 }
 
 uno::Any SAL_CALL
-VbaFontBase::getItalic() throw ( uno::RuntimeException, std::exception )
+VbaFontBase::getItalic()
 {
     awt::FontSlant aFS;
     mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharPosture", "FontSlant" ) ) >>= aFS;
@@ -243,7 +243,7 @@ VbaFontBase::getItalic() throw ( uno::RuntimeException, std::exception )
 }
 
 void  SAL_CALL
-VbaFontBase::setName( const uno::Any& aValue ) throw ( uno::RuntimeException, std::exception )
+VbaFontBase::setName( const uno::Any& aValue )
 {
     OUString sString;
     aValue >>= sString;
@@ -251,13 +251,13 @@ VbaFontBase::setName( const uno::Any& aValue ) throw ( uno::RuntimeException, st
 }
 
 uno::Any SAL_CALL
-VbaFontBase::getName() throw ( uno::RuntimeException, std::exception )
+VbaFontBase::getName()
 {
     return mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharFontName", "FontName" ) );
 }
 
 uno::Any
-VbaFontBase::getColor() throw (uno::RuntimeException, std::exception)
+VbaFontBase::getColor()
 {
     uno::Any aAny;
     aAny = OORGBToXLRGB( mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharColor", "TextColor" ) ) );
@@ -265,7 +265,7 @@ VbaFontBase::getColor() throw (uno::RuntimeException, std::exception)
 }
 
 void
-VbaFontBase::setColor( const uno::Any& _color  ) throw (uno::RuntimeException, std::exception)
+VbaFontBase::setColor( const uno::Any& _color  )
 {
     mxFont->setPropertyValue( VBAFONTBASE_PROPNAME( "CharColor", "TextColor" ), XLRGBToOORGB(_color) );
 }
diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index 177aa1cf064b..3d90fa37d181 100644
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@@ -119,7 +119,7 @@ VbaGlobalsBase::init(  const uno::Sequence< beans::PropertyValue >& aInitArgs )
 }
 
 uno::Reference< uno::XInterface > SAL_CALL
-VbaGlobalsBase::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException, std::exception)
+VbaGlobalsBase::createInstance( const OUString& aServiceSpecifier )
 {
     uno::Reference< uno::XInterface > xReturn;
     if ( aServiceSpecifier == sAppService )
@@ -134,7 +134,7 @@ VbaGlobalsBase::createInstance( const OUString& aServiceSpecifier ) throw (uno::
 }
 
 uno::Reference< uno::XInterface > SAL_CALL
-VbaGlobalsBase::createInstanceWithArguments( const OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException, std::exception)
+VbaGlobalsBase::createInstanceWithArguments( const OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& Arguments )
 {
 
     uno::Reference< uno::XInterface > xReturn;
@@ -150,7 +150,7 @@ VbaGlobalsBase::createInstanceWithArguments( const OUString& aServiceSpecifier,
 }
 
 uno::Sequence< OUString > SAL_CALL
-VbaGlobalsBase::getAvailableServiceNames(  ) throw (uno::RuntimeException, std::exception)
+VbaGlobalsBase::getAvailableServiceNames(  )
 {
     uno::Sequence< OUString > serviceNames { "ooo.vba.msforms.UserForm" };
     return serviceNames;
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index a1a30d1b43c7..e35416617028 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -98,7 +98,7 @@ nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
 }
 
 uno::Reference< beans::XIntrospectionAccess >
-getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
+getIntrospectionAccess( const uno::Any& aObject )
 {
     static uno::Reference< beans::XIntrospection > xIntrospection;
     if( !xIntrospection.is() )
@@ -110,7 +110,7 @@ getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
 }
 
 uno::Reference< script::XTypeConverter > const &
-getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
+getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext )
 {
     static uno::Reference< script::XTypeConverter > xTypeConv( script::Converter::create(xContext) );
     return xTypeConv;
@@ -186,7 +186,7 @@ dispatchRequests( const uno::Reference< frame::XModel>& xModel, const OUString&
 }
 
 uno::Reference< frame::XModel >
-getCurrentDoc( const OUString& sKey ) throw (uno::RuntimeException)
+getCurrentDoc( const OUString& sKey )
 {
     uno::Reference< frame::XModel > xModel;
     SbxObject* pBasic = dynamic_cast< SbxObject* > ( SfxApplication::GetBasic() );
@@ -236,7 +236,7 @@ getCurrentDoc( const OUString& sKey ) throw (uno::RuntimeException)
 
 /// @throws uno::RuntimeException
  uno::Reference< frame::XModel >
-getCurrentDocCtx( const OUString& ctxName, const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
+getCurrentDocCtx( const OUString& ctxName, const uno::Reference< uno::XComponentContext >& xContext )
 {
     uno::Reference< frame::XModel > xModel;
      // try fallback to calling doc
@@ -246,19 +246,19 @@ getCurrentDocCtx( const OUString& ctxName, const uno::Reference< uno::XComponent
 }
 
 uno::Reference< frame::XModel >
-getThisExcelDoc( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
+getThisExcelDoc( const uno::Reference< uno::XComponentContext >& xContext )
 {
     return getCurrentDocCtx( "ExcelDocumentContext" , xContext );
 }
 
 uno::Reference< frame::XModel >
-getThisWordDoc( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
+getThisWordDoc( const uno::Reference< uno::XComponentContext >& xContext )
 {
     return getCurrentDocCtx( "WordDocumentContext" , xContext );
 }
 
  uno::Reference< frame::XModel >
-getCurrentExcelDoc( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
+getCurrentExcelDoc( const uno::Reference< uno::XComponentContext >& xContext )
 {
     uno::Reference< frame::XModel > xModel;
     try
@@ -273,7 +273,7 @@ getCurrentExcelDoc( const uno::Reference< uno::XComponentContext >& xContext ) t
 }
 
  uno::Reference< frame::XModel >
-getCurrentWordDoc( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
+getCurrentWordDoc( const uno::Reference< uno::XComponentContext >& xContext )
 {
     uno::Reference< frame::XModel > xModel;
     try
@@ -442,7 +442,7 @@ void WaitUntilPreviewIsClosed( SfxViewFrame* pViewFrame )
         Application::Yield();
 }
 
-bool extractBoolFromAny( const uno::Any& rAny ) throw (uno::RuntimeException)
+bool extractBoolFromAny( const uno::Any& rAny )
 {
     switch( rAny.getValueType().getTypeClass() )
     {
@@ -463,7 +463,7 @@ bool extractBoolFromAny( const uno::Any& rAny ) throw (uno::RuntimeException)
     throw uno::RuntimeException( "Invalid type, cannot convert to boolean." , nullptr );
 }
 
-OUString extractStringFromAny( const uno::Any& rAny, bool bUppercaseBool ) throw (uno::RuntimeException)
+OUString extractStringFromAny( const uno::Any& rAny, bool bUppercaseBool )
 {
     switch( rAny.getValueType().getTypeClass() )
     {
@@ -488,12 +488,12 @@ OUString extractStringFromAny( const uno::Any& rAny, bool bUppercaseBool ) throw
     throw uno::RuntimeException( "Invalid type, cannot convert to string." , nullptr );
 }
 
-OUString extractStringFromAny( const uno::Any& rAny, const OUString& rDefault, bool bUppercaseBool ) throw (uno::RuntimeException)
+OUString extractStringFromAny( const uno::Any& rAny, const OUString& rDefault, bool bUppercaseBool )
 {
     return rAny.hasValue() ? extractStringFromAny( rAny, bUppercaseBool ) : rDefault;
 }
 
-OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
+OUString getAnyAsString( const uno::Any& pvargItem )
 {
     return extractStringFromAny( pvargItem );
 }
@@ -733,7 +733,7 @@ void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Point
     }
 }
 
-void setDefaultPropByIntrospection( const uno::Any& aObj, const uno::Any& aValue  ) throw ( uno::RuntimeException )
+void setDefaultPropByIntrospection( const uno::Any& aObj, const uno::Any& aValue  )
 {
     uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObj ) );
 
@@ -991,7 +991,6 @@ void ConcreteXShapeGeometryAttributes::setWidth( double nWidth)
 
 
 ShapeHelper::ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape)
-    throw (css::script::BasicErrorException, css::uno::RuntimeException)
     : xShape( _xShape )
 {
     if( !xShape.is() )
@@ -1046,23 +1045,23 @@ void ShapeHelper::setTop(double _fTop)
     xShape->setPosition(aPoint);
 }
 
-void DebugHelper::basicexception( const OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
+void DebugHelper::basicexception( const OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const OUString& /*additionalArgument*/ )
 {
     // #TODO #FIXME ( do we want to support additionalArg here )
     throw css::script::BasicErrorException( DetailedMessage.concat( " " ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, OUString() );
 }
 
-void DebugHelper::basicexception( int err,  const OUString& additionalArgument ) throw( css::script::BasicErrorException )
+void DebugHelper::basicexception( int err,  const OUString& additionalArgument )
 {
     basicexception( OUString(), css::uno::Exception(), err, additionalArgument );
 }
 
-void DebugHelper::basicexception( const css::uno::Exception& ex ) throw( css::script::BasicErrorException )
+void DebugHelper::basicexception( const css::uno::Exception& ex )
 {
     basicexception( OUString(), ex, ERRCODE_BASIC_INTERNAL_ERROR, OUString() );
 }
 
-void DebugHelper::runtimeexception( int err,  const OUString& /*additionalArgument*/ ) throw( css::uno::RuntimeException )
+void DebugHelper::runtimeexception( int err,  const OUString& /*additionalArgument*/ )
 {
     // #TODO #FIXME ( do we want to support additionalArg here )
     throw css::uno::RuntimeException( css::uno::Exception().Message + " " + OUString::number(err),
@@ -1127,7 +1126,7 @@ uno::Reference< XHelperInterface > getUnoDocModule( const OUString& aModName, Sf
     return xIf;
 }
 
-SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
+SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel )
 {
     SfxObjectShell* pFoundShell = nullptr;
     if ( xModel.is() )
diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx
index 3f418205672b..0690206f671c 100644
--- a/vbahelper/source/vbahelper/vbalineformat.cxx
+++ b/vbahelper/source/vbahelper/vbalineformat.cxx
@@ -74,7 +74,7 @@ ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( const OUString& sLineN
 }
 
 OUString
-ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (uno::RuntimeException)
+ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle )
 {
     switch( nArrowheadStyle )
     {
@@ -97,7 +97,7 @@ ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadSt
 
 // Attributes
 sal_Int32 SAL_CALL
-ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getBeginArrowheadStyle()
 {
     sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
     OUString sLineName;
@@ -117,14 +117,14 @@ ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException, std::exc
 }
 
 void SAL_CALL
-ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle )
 {
     OUString sArrayName = convertArrowheadStyleToLineStartEndName( _beginarrowheadstyle );
     m_xPropertySet->setPropertyValue( "LineStartName" , uno::makeAny( sArrayName ) );
 }
 
 sal_Int32 SAL_CALL
-ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getBeginArrowheadLength()
 {
     // #STUB
     // force error
@@ -132,7 +132,7 @@ ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException, std::ex
 }
 
 void SAL_CALL
-ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ )
 {
     // #STUB
     // force error
@@ -140,7 +140,7 @@ ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ )
 }
 
 sal_Int32 SAL_CALL
-ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getBeginArrowheadWidth()
 {
     // #STUB
     // force error
@@ -148,7 +148,7 @@ ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException, std::exc
 }
 
 void SAL_CALL
-ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ )
 {
     // #STUB
     // force error
@@ -156,20 +156,20 @@ ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) th
 }
 
 sal_Int32 SAL_CALL
-ScVbaLineFormat::getEndArrowheadStylel() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getEndArrowheadStylel()
 {
     // #STUB
     return 0;
 }
 
 void SAL_CALL
-ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ )
 {
     // #STUB
 }
 
 sal_Int32 SAL_CALL
-ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getEndArrowheadLength()
 {
     // #STUB
     // force error
@@ -177,28 +177,28 @@ ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException, std::exce
 }
 
 void SAL_CALL
-ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ )
 {
     // #STUB
     throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." );
 }
 
 sal_Int32 SAL_CALL
-ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getEndArrowheadWidth()
 {
     // #STUB
     throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." );
 }
 
 void SAL_CALL
-ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ )
 {
     // #STUB
     throw uno::RuntimeException( "Property 'EndArrowheadWidth' is not supported." );
 }
 
 double SAL_CALL
-ScVbaLineFormat::getWeight() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getWeight()
 {
     sal_Int32 nLineWidth=0;
     m_xPropertySet->getPropertyValue( "LineWidth" ) >>= nLineWidth;
@@ -207,7 +207,7 @@ ScVbaLineFormat::getWeight() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setWeight( double _weight )
 {
     if( _weight < 0 )
         throw uno::RuntimeException( "Parameter: Must be positive." );
@@ -223,7 +223,7 @@ ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException, std::
 }
 
 sal_Bool SAL_CALL
-ScVbaLineFormat::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getVisible()
 {
     drawing::LineStyle aLineStyle;
     m_xPropertySet->getPropertyValue( "LineStyle" ) >>= aLineStyle;
@@ -235,7 +235,7 @@ ScVbaLineFormat::getVisible() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setVisible( sal_Bool _visible )
 {
     drawing::LineStyle aLineStyle;
     m_xPropertySet->getPropertyValue( "LineStyle" ) >>= aLineStyle;
@@ -254,7 +254,7 @@ ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, s
 }
 
 double SAL_CALL
-ScVbaLineFormat::getTransparency() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getTransparency()
 {
     sal_Int16 nTransparency = 0;
     m_xPropertySet->getPropertyValue( "LineTransparence" ) >>= nTransparency;
@@ -263,14 +263,14 @@ ScVbaLineFormat::getTransparency() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setTransparency( double _transparency )
 {
     sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 );
     m_xPropertySet->setPropertyValue( "LineTransparence" , uno::makeAny( nTransparency ) );
 }
 
 sal_Int16 SAL_CALL
-ScVbaLineFormat::getStyle() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getStyle()
 {
     //OpenOffice.org only supports one LineStyle (other than the DashStyles)
     //Therefore we can only return the SingleLine
@@ -278,7 +278,7 @@ ScVbaLineFormat::getStyle() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setStyle( sal_Int16 /*_style */)
 {
     //OpenOffice.org only supports one LineStyle (other than the DashStyles)
     //Therefore we do not set the LineStyle, because it maybe is already set
@@ -289,7 +289,7 @@ ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException,
 }
 
 sal_Int32 SAL_CALL
-ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::getDashStyle()
 {
     drawing::LineStyle eLineStyle;
     //LineStyle integer in Xray
@@ -340,7 +340,7 @@ ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle )
 {
     m_nLineDashStyle = _dashstyle;
     if( _dashstyle == office::MsoLineDashStyle::msoLineSolid )
@@ -413,13 +413,13 @@ ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeExcepti
 
 // Methods
 uno::Reference< msforms::XColorFormat > SAL_CALL
-ScVbaLineFormat::BackColor() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::BackColor()
 {
     return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_BACKCOLOR ) );
 }
 
 uno::Reference< msforms::XColorFormat > SAL_CALL
-ScVbaLineFormat::ForeColor() throw (uno::RuntimeException, std::exception)
+ScVbaLineFormat::ForeColor()
 {
     return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_FORECOLOR ) );
 }
diff --git a/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx
index eca78e8d4105..c23e80faeaa1 100644
--- a/vbahelper/source/vbahelper/vbalineformat.hxx
+++ b/vbahelper/source/vbahelper/vbalineformat.hxx
@@ -38,37 +38,37 @@ protected:
     virtual css::uno::Sequence<OUString> getServiceNames() override;
     static sal_Int32 convertLineStartEndNameToArrowheadStyle( const OUString& sLineName );
     /// @throws css::uno::RuntimeException
-    static OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (css::uno::RuntimeException);
+    static OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle );
 public:
     ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
 
     // Attributes
-    virtual sal_Int32 SAL_CALL getBeginArrowheadStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBeginArrowheadLength() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBeginArrowheadLength( sal_Int32 _beginarrowheadlength ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBeginArrowheadWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBeginArrowheadWidth( sal_Int32 _beginarrowheadwidth ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getEndArrowheadStylel() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEndArrowheadStylel( sal_Int32 _endarrowheadstylel ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getEndArrowheadLength() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEndArrowheadLength( sal_Int32 _endarrowheadlength ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getEndArrowheadWidth() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setEndArrowheadWidth( sal_Int32 _endarrowheadwidth ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setWeight( double _weight ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getTransparency() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTransparency( double _transparency ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setStyle( sal_Int16 _style ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getDashStyle() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDashStyle( sal_Int32 _dashstyle ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBeginArrowheadStyle() override;
+    virtual void SAL_CALL setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) override;
+    virtual sal_Int32 SAL_CALL getBeginArrowheadLength() override;
+    virtual void SAL_CALL setBeginArrowheadLength( sal_Int32 _beginarrowheadlength ) override;
+    virtual sal_Int32 SAL_CALL getBeginArrowheadWidth() override;
+    virtual void SAL_CALL setBeginArrowheadWidth( sal_Int32 _beginarrowheadwidth ) override;
+    virtual sal_Int32 SAL_CALL getEndArrowheadStylel() override;
+    virtual void SAL_CALL setEndArrowheadStylel( sal_Int32 _endarrowheadstylel ) override;
+    virtual sal_Int32 SAL_CALL getEndArrowheadLength() override;
+    virtual void SAL_CALL setEndArrowheadLength( sal_Int32 _endarrowheadlength ) override;
+    virtual sal_Int32 SAL_CALL getEndArrowheadWidth() override;
+    virtual void SAL_CALL setEndArrowheadWidth( sal_Int32 _endarrowheadwidth ) override;
+    virtual double SAL_CALL getWeight() override;
+    virtual void SAL_CALL setWeight( double _weight ) override;
+    virtual sal_Bool SAL_CALL getVisible() override;
+    virtual void SAL_CALL setVisible( sal_Bool _visible ) override;
+    virtual double SAL_CALL getTransparency() override;
+    virtual void SAL_CALL setTransparency( double _transparency ) override;
+    virtual sal_Int16 SAL_CALL getStyle() override;
+    virtual void SAL_CALL setStyle( sal_Int16 _style ) override;
+    virtual sal_Int32 SAL_CALL getDashStyle() override;
+    virtual void SAL_CALL setDashStyle( sal_Int32 _dashstyle ) override;
 
     // Methods
-    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL BackColor() override;
+    virtual css::uno::Reference< ov::msforms::XColorFormat > SAL_CALL ForeColor() override;
 };
 
 #endif // INCLUDED_VBAHELPER_SOURCE_VBAHELPER_VBALINEFORMAT_HXX
diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
index d3f86d0dbcc0..d689e003e043 100644
--- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx
+++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
@@ -24,14 +24,14 @@ using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
 VbaPageSetupBase::VbaPageSetupBase(const uno::Reference< XHelperInterface >& xParent,
-                const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
+                const uno::Reference< uno::XComponentContext >& xContext )
     : VbaPageSetupBase_BASE( xParent, xContext )
     , mnOrientLandscape(0)
     , mnOrientPortrait(0)
 {
 }
 
-double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeException, std::exception)
+double SAL_CALL VbaPageSetupBase::getTopMargin()
 {
     sal_Int32 topMargin = 0;
 
@@ -60,7 +60,7 @@ double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeExcepti
     return Millimeter::getInPoints( topMargin );
 }
 
-void SAL_CALL VbaPageSetupBase::setTopMargin( double margin ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VbaPageSetupBase::setTopMargin( double margin )
 {
     sal_Int32 topMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
 
@@ -86,7 +86,7 @@ void SAL_CALL VbaPageSetupBase::setTopMargin( double margin ) throw (css::uno::R
     }
 }
 
-double SAL_CALL VbaPageSetupBase::getBottomMargin() throw (css::uno::RuntimeException, std::exception)
+double SAL_CALL VbaPageSetupBase::getBottomMargin()
 {
     sal_Int32 bottomMargin = 0;
 
@@ -115,7 +115,7 @@ double SAL_CALL VbaPageSetupBase::getBottomMargin() throw (css::uno::RuntimeExce
     return Millimeter::getInPoints( bottomMargin );
 }
 
-void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin )
 {
     sal_Int32 bottomMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
 
@@ -141,7 +141,7 @@ void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin ) throw (css::uno
     }
 }
 
-double SAL_CALL VbaPageSetupBase::getRightMargin() throw (css::uno::RuntimeException, std::exception)
+double SAL_CALL VbaPageSetupBase::getRightMargin()
 {
     sal_Int32 rightMargin = 0;
     try
@@ -156,7 +156,7 @@ double SAL_CALL VbaPageSetupBase::getRightMargin() throw (css::uno::RuntimeExcep
     return Millimeter::getInPoints( rightMargin );
 }
 
-void SAL_CALL VbaPageSetupBase::setRightMargin( double margin ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VbaPageSetupBase::setRightMargin( double margin )
 {
     sal_Int32 rightMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
     try
@@ -169,7 +169,7 @@ void SAL_CALL VbaPageSetupBase::setRightMargin( double margin ) throw (css::uno:
 
 }
 
-double SAL_CALL VbaPageSetupBase::getLeftMargin() throw (css::uno::RuntimeException, std::exception)
+double SAL_CALL VbaPageSetupBase::getLeftMargin()
 {
     sal_Int32 leftMargin = 0;
     try
@@ -184,7 +184,7 @@ double SAL_CALL VbaPageSetupBase::getLeftMargin() throw (css::uno::RuntimeExcept
     return Millimeter::getInPoints( leftMargin );
 }
 
-void SAL_CALL VbaPageSetupBase::setLeftMargin( double margin ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VbaPageSetupBase::setLeftMargin( double margin )
 {
     sal_Int32 leftMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
     try
@@ -196,7 +196,7 @@ void SAL_CALL VbaPageSetupBase::setLeftMargin( double margin ) throw (css::uno::
     }
 }
 
-double SAL_CALL VbaPageSetupBase::getHeaderMargin() throw (css::uno::RuntimeException)
+double SAL_CALL VbaPageSetupBase::getHeaderMargin()
 {
     sal_Int32 headerMargin = 0;
     try
@@ -211,7 +211,7 @@ double SAL_CALL VbaPageSetupBase::getHeaderMargin() throw (css::uno::RuntimeExce
     return Millimeter::getInPoints( headerMargin );
 }
 
-void SAL_CALL VbaPageSetupBase::setHeaderMargin( double margin ) throw (css::uno::RuntimeException)
+void SAL_CALL VbaPageSetupBase::setHeaderMargin( double margin )
 {
     sal_Int32 headerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
     try
@@ -223,7 +223,7 @@ void SAL_CALL VbaPageSetupBase::setHeaderMargin( double margin ) throw (css::uno
     }
 }
 
-double SAL_CALL VbaPageSetupBase::getFooterMargin() throw (css::uno::RuntimeException)
+double SAL_CALL VbaPageSetupBase::getFooterMargin()
 {
     sal_Int32 footerMargin = 0;
     try
@@ -238,7 +238,7 @@ double SAL_CALL VbaPageSetupBase::getFooterMargin() throw (css::uno::RuntimeExce
     return Millimeter::getInPoints( footerMargin );
 }
 
-void SAL_CALL VbaPageSetupBase::setFooterMargin( double margin ) throw (css::uno::RuntimeException)
+void SAL_CALL VbaPageSetupBase::setFooterMargin( double margin )
 {
     sal_Int32 footerMargin = Millimeter::getInHundredthsOfOneMillimeter( margin );
     try
@@ -250,7 +250,7 @@ void SAL_CALL VbaPageSetupBase::setFooterMargin( double margin ) throw (css::uno
     }
 }
 
-sal_Int32 SAL_CALL VbaPageSetupBase::getOrientation() throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL VbaPageSetupBase::getOrientation()
 {
     sal_Int32 orientation = mnOrientPortrait;
     try
@@ -270,7 +270,7 @@ sal_Int32 SAL_CALL VbaPageSetupBase::getOrientation() throw (css::uno::RuntimeEx
     return orientation;
 }
 
-void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 orientation )
 {
     if( ( orientation != mnOrientPortrait ) &&
         ( orientation != mnOrientLandscape ) )
diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx
index 69ab3b382d1c..76b4cafe5f97 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.cxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.cxx
@@ -24,14 +24,13 @@ using namespace com::sun::star;
 ScVbaPictureFormat::ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent,
     const css::uno::Reference< css::uno::XComponentContext >& xContext,
     uno::Reference< drawing::XShape > const & xShape )
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
     : ScVbaPictureFormat_BASE( xParent, xContext ), m_xShape( xShape )
 {
     m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
 }
 
 void
-ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException)
+ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, double nMax )
 {
     if( nRange < nMin )
     {
@@ -45,7 +44,7 @@ ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, dou
 
 // Attributes
 double SAL_CALL
-ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException, std::exception)
+ScVbaPictureFormat::getBrightness()
 {
     sal_Int16 nLuminance = 0;
     m_xPropertySet->getPropertyValue( "AdjustLuminance" ) >>= nLuminance;
@@ -55,7 +54,7 @@ ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException, std::exception
 }
 
 void SAL_CALL
-ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeException, std::exception)
+ScVbaPictureFormat::setBrightness( double _brightness )
 {
     checkParameterRangeInDouble( _brightness, 0.0, 1.0 );
     double fLuminance = _brightness * 200 - 100;
@@ -64,7 +63,7 @@ ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeExcep
 }
 
 double SAL_CALL
-ScVbaPictureFormat::getContrast() throw (uno::RuntimeException, std::exception)
+ScVbaPictureFormat::getContrast()
 {
     sal_Int16 nContrast = 0;
     m_xPropertySet->getPropertyValue( "AdjustContrast" ) >>= nContrast;
@@ -74,7 +73,7 @@ ScVbaPictureFormat::getContrast() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException, std::exception)
+ScVbaPictureFormat::setContrast( double _contrast )
 {
     checkParameterRangeInDouble( _contrast, 0.0, 1.0 );
     double fContrast = _contrast * 200 - 100;
@@ -85,7 +84,7 @@ ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException
 
 // Methods
 void SAL_CALL
-ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeException, std::exception)
+ScVbaPictureFormat::IncrementBrightness( double increment )
 {
     double fBrightness = getBrightness();
     fBrightness += increment;
@@ -101,7 +100,7 @@ ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeE
 }
 
 void SAL_CALL
-ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeException, std::exception)
+ScVbaPictureFormat::IncrementContrast( double increment )
 {
     double nContrast = getContrast();
     nContrast += increment;
diff --git a/vbahelper/source/vbahelper/vbapictureformat.hxx b/vbahelper/source/vbahelper/vbapictureformat.hxx
index 73cb5e98a355..8ee2dba53ec2 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.hxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.hxx
@@ -36,22 +36,21 @@ protected:
     virtual css::uno::Sequence<OUString> getServiceNames() override;
 private:
     /// @throws css::uno::RuntimeException
-    static void checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException);
+    static void checkParameterRangeInDouble( double nRange, double nMin, double nMax );
 public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XShape > const & xShape )
-        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XShape > const & xShape );
 
     // Attributes
-    virtual double SAL_CALL getBrightness() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setBrightness( double _brightness ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual double SAL_CALL getContrast() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setContrast( double _contrast ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual double SAL_CALL getBrightness() override;
+    virtual void SAL_CALL setBrightness( double _brightness ) override;
+    virtual double SAL_CALL getContrast() override;
+    virtual void SAL_CALL setContrast( double _contrast ) override;
 
     // Methods
-    virtual void SAL_CALL IncrementBrightness( double increment ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL IncrementContrast( double increment ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL IncrementBrightness( double increment ) override;
+    virtual void SAL_CALL IncrementContrast( double increment ) override;
 };
 
 #endif // INCLUDED_VBAHELPER_SOURCE_VBAHELPER_VBAPICTUREFORMAT_HXX
diff --git a/vbahelper/source/vbahelper/vbapropvalue.cxx b/vbahelper/source/vbahelper/vbapropvalue.cxx
index dcb2b6db56b0..9788add5bed4 100644
--- a/vbahelper/source/vbahelper/vbapropvalue.cxx
+++ b/vbahelper/source/vbahelper/vbapropvalue.cxx
@@ -25,13 +25,13 @@ ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListen
 }
 
 css::uno::Any SAL_CALL
-ScVbaPropValue::getValue() throw (css::uno::RuntimeException, std::exception)
+ScVbaPropValue::getValue()
 {
     return m_pListener->getValueEvent();
 }
 
 void SAL_CALL
-ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception)
+ScVbaPropValue::setValue( const css::uno::Any& _value )
 {
     m_pListener->setValueEvent( _value );
 }
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index d562a4f44235..7b73d2f11b3b 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -50,7 +50,6 @@ using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 ScVbaShape::ScVbaShape( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XShapes >& xShapes, const uno::Reference< frame::XModel >& xModel, sal_Int32 nType )
-    throw (lang::IllegalArgumentException, uno::RuntimeException)
     : ScVbaShape_BASE( xParent, xContext ), m_xShape( xShape ), m_xShapes( xShapes ), m_nType( nType ), m_xModel( xModel )
 {
     m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
@@ -63,7 +62,7 @@ ScVbaShape::~ScVbaShape()
 }
 
 void SAL_CALL
-ScVbaShape::disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException, std::exception )
+ScVbaShape::disposing( const lang::EventObject& rEventObject )
 {
     try
     {
@@ -92,7 +91,7 @@ void ScVbaShape::addListeners()
 }
 
 void
-ScVbaShape::removeShapeListener() throw( uno::RuntimeException )
+ScVbaShape::removeShapeListener()
 {
     if( m_xShape.is() )
     {
@@ -104,7 +103,7 @@ ScVbaShape::removeShapeListener() throw( uno::RuntimeException )
 }
 
 void
-ScVbaShape::removeShapesListener() throw( uno::RuntimeException )
+ScVbaShape::removeShapesListener()
 {
     if( m_xShapes.is() )
     {
@@ -115,7 +114,7 @@ ScVbaShape::removeShapesListener() throw( uno::RuntimeException )
 }
 
 sal_Int32
-ScVbaShape::getType( const css::uno::Reference< drawing::XShape >& xShape ) throw (uno::RuntimeException)
+ScVbaShape::getType( const css::uno::Reference< drawing::XShape >& xShape )
 {
     OUString sShapeType;
     uno::Reference< drawing::XShapeDescriptor > xShapeDescriptor( xShape, uno::UNO_QUERY_THROW );
@@ -156,7 +155,7 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape >& xShape ) thro
 
 // Attributes
 OUString SAL_CALL
-ScVbaShape::getName() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getName()
 {
     OUString sName;
     uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
@@ -165,14 +164,14 @@ ScVbaShape::getName() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaShape::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setName( const OUString& _name )
 {
     uno::Reference< container::XNamed > xNamed( m_xShape, uno::UNO_QUERY_THROW );
     xNamed->setName( _name );
 }
 
 OUString SAL_CALL
-ScVbaShape::getAlternativeText() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getAlternativeText()
 {
     OUString sAltText;
     uno::Reference< beans::XPropertySet > xProps( m_xShape, uno::UNO_QUERY_THROW );
@@ -181,40 +180,38 @@ ScVbaShape::getAlternativeText() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaShape::setAlternativeText( const OUString& sAltText ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setAlternativeText( const OUString& sAltText )
 {
     uno::Reference< beans::XPropertySet > xProps( m_xShape, uno::UNO_QUERY_THROW );
     xProps->setPropertyValue("Title", uno::Any( sAltText ) );
 }
 
 double SAL_CALL
-ScVbaShape::getHeight() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getHeight()
 {
     return m_pShapeHelper->getHeight();
 }
 
 void SAL_CALL
 ScVbaShape::setHeight(double _height)
-    throw (uno::RuntimeException, std::exception)
 {
     m_pShapeHelper->setHeight( _height );
 }
 
 double SAL_CALL
-ScVbaShape::getWidth() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getWidth()
 {
     return m_pShapeHelper->getWidth();
 }
 
 void SAL_CALL
 ScVbaShape::setWidth(double _width)
-    throw (uno::RuntimeException, std::exception)
 {
     m_pShapeHelper->setWidth( _width );
 }
 
 double SAL_CALL
-ScVbaShape::getLeft() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getLeft()
 {
     double left = 0;
     try
@@ -232,7 +229,7 @@ ScVbaShape::getLeft() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setLeft( double _left )
 {
     try
     {
@@ -247,7 +244,7 @@ ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException, std::exception
 }
 
 double SAL_CALL
-ScVbaShape::getTop() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getTop()
 {
     double top = 0;
     try
@@ -264,7 +261,7 @@ ScVbaShape::getTop() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaShape::setTop( double _top ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setTop( double _top )
 {
     try
     {
@@ -279,7 +276,7 @@ ScVbaShape::setTop( double _top ) throw (uno::RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL
-ScVbaShape::getVisible() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getVisible()
 {
     // #STUB
     //UNO Shapes are always visible
@@ -287,14 +284,14 @@ ScVbaShape::getVisible() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaShape::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setVisible( sal_Bool /*_visible*/ )
 {
     // #STUB
     //UNO Shapes are always visible
 }
 
 sal_Int32 SAL_CALL
-ScVbaShape::getZOrderPosition() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getZOrderPosition()
 {
     sal_Int32 nZOrderPosition = 0;
     uno::Any aZOrderPosition =  m_xPropertySet->getPropertyValue( "ZOrder" );
@@ -303,13 +300,13 @@ ScVbaShape::getZOrderPosition() throw (uno::RuntimeException, std::exception)
 }
 
 sal_Int32 SAL_CALL
-ScVbaShape::getType() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getType()
 {
     return m_nType;
 }
 
 double SAL_CALL
-ScVbaShape::getRotation() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getRotation()
 {
     double dRotation = 0;
     sal_Int32 nRotation = 0;
@@ -319,34 +316,34 @@ ScVbaShape::getRotation() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaShape::setRotation( double _rotation ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setRotation( double _rotation )
 {
     sal_Int32 nRotation = static_cast < sal_Int32 > ( _rotation * 100 );
     m_xPropertySet->setPropertyValue( "RotateAngle" , uno::makeAny( nRotation ) );
 }
 
 uno::Reference< msforms::XLineFormat > SAL_CALL
-ScVbaShape::getLine() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getLine()
 {
     // TODO should only return line
     return uno::Reference< msforms::XLineFormat >( new ScVbaLineFormat( this, mxContext, m_xShape ) );
 }
 
 uno::Reference< msforms::XFillFormat > SAL_CALL
-ScVbaShape::getFill() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getFill()
 {
     return uno::Reference< msforms::XFillFormat >( new ScVbaFillFormat( this, mxContext, m_xShape ) );
 }
 
 uno::Reference<  msforms::XPictureFormat > SAL_CALL
-ScVbaShape::getPictureFormat() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getPictureFormat()
 {
     return uno::Reference< msforms::XPictureFormat >( new ScVbaPictureFormat( this, mxContext, m_xShape ) );
 }
 
 // Methods
 uno::Any SAL_CALL
-ScVbaShape::TextFrame() throw (uno::RuntimeException, std::exception)
+ScVbaShape::TextFrame()
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
     if( xServiceInfo->supportsService( "com.sun.star.sheet.SpreadsheetDocument" ) )
@@ -363,14 +360,14 @@ ScVbaShape::TextFrame() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ScVbaShape::Delete() throw (uno::RuntimeException, std::exception)
+ScVbaShape::Delete()
 {
     SolarMutexGuard aGuard;
     m_xShapes->remove( m_xShape );
 }
 
 void SAL_CALL
-ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::ZOrder( sal_Int32 ZOrderCmd )
 {
     sal_Int32 nOrderPosition;
     uno::Any aOrderPosition = m_xPropertySet->getPropertyValue( "ZOrder" );
@@ -404,7 +401,7 @@ ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException, std::exc
 }
 
 void SAL_CALL
-ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::IncrementRotation( double Increment )
 {
     double nCurrentRotation = getRotation();
     nCurrentRotation += Increment;
@@ -412,7 +409,7 @@ ScVbaShape::IncrementRotation( double Increment ) throw (uno::RuntimeException,
 }
 
 void SAL_CALL
-ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::IncrementLeft( double Increment )
 {
     double nCurrentLeft = getLeft();
     nCurrentLeft += Increment;
@@ -420,7 +417,7 @@ ScVbaShape::IncrementLeft( double Increment ) throw (uno::RuntimeException, std:
 }
 
 void SAL_CALL
-ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::IncrementTop( double Increment )
 {
     double nCurrentTop = getTop();
     nCurrentTop += Increment;
@@ -428,7 +425,7 @@ ScVbaShape::IncrementTop( double Increment ) throw (uno::RuntimeException, std::
 }
 
 void SAL_CALL
-ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale )
 {
     double nHeight = getHeight();
     double nNewHeight = nHeight * Factor;
@@ -457,7 +454,7 @@ ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal
 }
 
 void SAL_CALL
-ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_Int32 Scale )
 {
     double nWidth = getWidth();
     double nNewWidth = nWidth * Factor;
@@ -486,7 +483,7 @@ ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_
 }
 
 void SAL_CALL
-ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException, std::exception )
+ScVbaShape::Select( const uno::Any& /*Replace*/ )
 {
     uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
     xSelectSupp->select( uno::makeAny( m_xShape ) );
@@ -496,7 +493,7 @@ ScVbaShape::Select( const uno::Any& /*Replace*/ ) throw ( uno::RuntimeException,
 // dynamically create the appropriate objects e.g. TextBox, Oval, Picture etc.
 // ( e.g. the ones that really do have ShapeRange as an attribute )
 uno::Any SAL_CALL
-ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException, std::exception )
+ScVbaShape::ShapeRange( const uno::Any& index )
 {
     // perhaps we should store a reference to the Shapes Collection
     // in this class
@@ -515,33 +512,33 @@ ScVbaShape::ShapeRange( const uno::Any& index ) throw ( uno::RuntimeException, s
 }
 
 sal_Bool SAL_CALL
-ScVbaShape::getLockAspectRatio() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getLockAspectRatio()
 {
     // #STUB
     return false;
 }
 
 void SAL_CALL
-ScVbaShape::setLockAspectRatio( sal_Bool /*_lockaspectratio*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setLockAspectRatio( sal_Bool /*_lockaspectratio*/ )
 {
     // #STUB
 }
 
 sal_Bool SAL_CALL
-ScVbaShape::getLockAnchor() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getLockAnchor()
 {
     // #STUB
     return true;
 }
 
 void SAL_CALL
-ScVbaShape::setLockAnchor( sal_Bool /*_lockanchor*/ ) throw (uno::RuntimeException, std::exception)
+ScVbaShape::setLockAnchor( sal_Bool /*_lockanchor*/ )
 {
     // #STUB
 }
 
 sal_Int32 SAL_CALL
-ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getRelativeHorizontalPosition()
 {
     sal_Int32 nRelativeHorizontalPosition = word::WdRelativeHorizontalPosition::wdRelativeHorizontalPositionMargin;
     sal_Int16 nType = text::RelOrientation::PAGE_LEFT;
@@ -579,7 +576,6 @@ ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException, std::e
 
 void SAL_CALL
 ScVbaShape::setRelativeHorizontalPosition(::sal_Int32 _relativehorizontalposition)
-    throw (uno::RuntimeException, std::exception)
 {
     sal_Int16 nType = text::RelOrientation::PAGE_FRAME;
     switch( _relativehorizontalposition )
@@ -613,7 +609,7 @@ ScVbaShape::setRelativeHorizontalPosition(::sal_Int32 _relativehorizontalpositio
 }
 
 sal_Int32 SAL_CALL
-ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException, std::exception)
+ScVbaShape::getRelativeVerticalPosition()
 {
     sal_Int32 nRelativeVerticalPosition = word::WdRelativeVerticalPosition::wdRelativeVerticalPositionMargin;
     sal_Int16 nType = text::RelOrientation::PAGE_FRAME;
@@ -651,7 +647,6 @@ ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException, std::exc
 
 void SAL_CALL
 ScVbaShape::setRelativeVerticalPosition(::sal_Int32 _relativeverticalposition)
-    throw (uno::RuntimeException, std::exception)
 {
     sal_Int16 nType = text::RelOrientation::PAGE_FRAME;
     switch( _relativeverticalposition )
@@ -685,7 +680,7 @@ ScVbaShape::setRelativeVerticalPosition(::sal_Int32 _relativeverticalposition)
 }
 
 uno::Any SAL_CALL
-ScVbaShape::WrapFormat() throw (uno::RuntimeException, std::exception)
+ScVbaShape::WrapFormat()
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
     if( xServiceInfo->supportsService( "com.sun.star.text.TextDocument" ))
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx
index 11aab8c2768d..b6e98d0a3424 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -36,11 +36,11 @@ class VbShapeRangeEnumHelper : public EnumerationHelper_BASE
         sal_Int32 nIndex;
 public:
     VbShapeRangeEnumHelper( const uno::Reference< XCollection >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-        virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasMoreElements(  ) override
         {
                 return ( nIndex < m_xIndexAccess->getCount() );
         }
-        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual uno::Any SAL_CALL nextElement(  ) override
         {
                 ScVbaShapeRange* pCollectionImpl = dynamic_cast< ScVbaShapeRange* >(m_xParent.get());
                 if ( pCollectionImpl && hasMoreElements() )
@@ -56,14 +56,14 @@ ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xPar
 
 // Methods
 void SAL_CALL
-ScVbaShapeRange::Select(  ) throw (uno::RuntimeException, std::exception)
+ScVbaShapeRange::Select(  )
 {
     uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
     xSelectSupp->select( uno::makeAny( getShapes() ) );
 }
 
 uno::Reference< msforms::XShape > SAL_CALL
-ScVbaShapeRange::Group() throw (uno::RuntimeException, std::exception)
+ScVbaShapeRange::Group()
 {
     uno::Reference< drawing::XShapeGrouper > xShapeGrouper( m_xDrawPage, uno::UNO_QUERY_THROW );
     uno::Reference< drawing::XShapeGroup > xShapeGroup( xShapeGrouper->group( getShapes() ), uno::UNO_QUERY_THROW );
@@ -72,7 +72,7 @@ ScVbaShapeRange::Group() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< drawing::XShapes > const &
-ScVbaShapeRange::getShapes() throw (uno::RuntimeException)
+ScVbaShapeRange::getShapes()
 {
     if ( !m_xShapes.is() )
     {
@@ -87,7 +87,7 @@ ScVbaShapeRange::getShapes() throw (uno::RuntimeException)
 
 
 void SAL_CALL
-ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeException, std::exception)
+ScVbaShapeRange::IncrementRotation( double Increment )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -98,7 +98,7 @@ ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeExcept
 }
 
 void SAL_CALL
-ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException, std::exception)
+ScVbaShapeRange::IncrementLeft( double Increment )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -109,7 +109,7 @@ ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException,
 }
 
 void SAL_CALL
-ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException, std::exception)
+ScVbaShapeRange::IncrementTop( double Increment )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -119,7 +119,7 @@ ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException,
     }
 }
 
-OUString SAL_CALL ScVbaShapeRange::getName() throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL ScVbaShapeRange::getName()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -131,7 +131,7 @@ OUString SAL_CALL ScVbaShapeRange::getName() throw (uno::RuntimeException, std::
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::setName( const OUString& _name ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::setName( const OUString& _name )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -141,7 +141,7 @@ void SAL_CALL ScVbaShapeRange::setName( const OUString& _name ) throw (uno::Runt
     }
 }
 
-double SAL_CALL ScVbaShapeRange::getHeight() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaShapeRange::getHeight()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -153,7 +153,7 @@ double SAL_CALL ScVbaShapeRange::getHeight() throw (uno::RuntimeException, std::
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::setHeight( double _height ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::setHeight( double _height )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -163,7 +163,7 @@ void SAL_CALL ScVbaShapeRange::setHeight( double _height ) throw (uno::RuntimeEx
     }
 }
 
-double SAL_CALL ScVbaShapeRange::getWidth() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaShapeRange::getWidth()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -175,7 +175,7 @@ double SAL_CALL ScVbaShapeRange::getWidth() throw (uno::RuntimeException, std::e
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::setWidth( double _width ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::setWidth( double _width )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -185,7 +185,7 @@ void SAL_CALL ScVbaShapeRange::setWidth( double _width ) throw (uno::RuntimeExce
     }
 }
 
-double SAL_CALL ScVbaShapeRange::getLeft() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaShapeRange::getLeft()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -197,7 +197,7 @@ double SAL_CALL ScVbaShapeRange::getLeft() throw (uno::RuntimeException, std::ex
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::setLeft( double _left ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::setLeft( double _left )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -207,7 +207,7 @@ void SAL_CALL ScVbaShapeRange::setLeft( double _left ) throw (uno::RuntimeExcept
     }
 }
 
-double SAL_CALL ScVbaShapeRange::getTop() throw (uno::RuntimeException, std::exception)
+double SAL_CALL ScVbaShapeRange::getTop()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -219,7 +219,7 @@ double SAL_CALL ScVbaShapeRange::getTop() throw (uno::RuntimeException, std::exc
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::setTop( double _top ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::setTop( double _top )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -229,7 +229,7 @@ void SAL_CALL ScVbaShapeRange::setTop( double _top ) throw (uno::RuntimeExceptio
     }
 }
 
-uno::Reference< ov::msforms::XLineFormat > SAL_CALL ScVbaShapeRange::getLine() throw (css::uno::RuntimeException, std::exception)
+uno::Reference< ov::msforms::XLineFormat > SAL_CALL ScVbaShapeRange::getLine()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -241,7 +241,7 @@ uno::Reference< ov::msforms::XLineFormat > SAL_CALL ScVbaShapeRange::getLine() t
     throw uno::RuntimeException();
 }
 
-uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() throw (css::uno::RuntimeException, std::exception)
+uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -253,7 +253,7 @@ uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() t
     throw uno::RuntimeException();
 }
 
-sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -265,7 +265,7 @@ sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio() throw (uno::RuntimeExcep
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::setLockAspectRatio( sal_Bool _lockaspectratio ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::setLockAspectRatio( sal_Bool _lockaspectratio )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -275,7 +275,7 @@ void SAL_CALL ScVbaShapeRange::setLockAspectRatio( sal_Bool _lockaspectratio ) t
     }
 }
 
-sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -287,7 +287,7 @@ sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor() throw (uno::RuntimeException,
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::setLockAnchor( sal_Bool _lockanchor ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::setLockAnchor( sal_Bool _lockanchor )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -297,7 +297,7 @@ void SAL_CALL ScVbaShapeRange::setLockAnchor( sal_Bool _lockanchor ) throw (uno:
     }
 }
 
-::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeHorizontalPosition() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeHorizontalPosition()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -309,7 +309,7 @@ void SAL_CALL ScVbaShapeRange::setLockAnchor( sal_Bool _lockanchor ) throw (uno:
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -319,7 +319,7 @@ void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relat
     }
 }
 
-::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeVerticalPosition() throw (uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL ScVbaShapeRange::getRelativeVerticalPosition()
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -331,7 +331,7 @@ void SAL_CALL ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relat
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -341,7 +341,7 @@ void SAL_CALL ScVbaShapeRange::setRelativeVerticalPosition( ::sal_Int32 _relativ
     }
 }
 
-uno::Any SAL_CALL ScVbaShapeRange::TextFrame(  ) throw (css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaShapeRange::TextFrame(  )
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -353,7 +353,7 @@ uno::Any SAL_CALL ScVbaShapeRange::TextFrame(  ) throw (css::uno::RuntimeExcepti
     throw uno::RuntimeException();
 }
 
-uno::Any SAL_CALL ScVbaShapeRange::WrapFormat(  ) throw (css::uno::RuntimeException, std::exception)
+uno::Any SAL_CALL ScVbaShapeRange::WrapFormat(  )
 {
     sal_Int32 nLen = getCount();
     sal_Int32 index = 1;
@@ -365,7 +365,7 @@ uno::Any SAL_CALL ScVbaShapeRange::WrapFormat(  ) throw (css::uno::RuntimeExcept
     throw uno::RuntimeException();
 }
 
-void SAL_CALL ScVbaShapeRange::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ScVbaShapeRange::ZOrder( sal_Int32 ZOrderCmd )
 {
     sal_Int32 nLen = getCount();
     for ( sal_Int32 index = 1; index <= nLen; ++index )
@@ -376,13 +376,13 @@ void SAL_CALL ScVbaShapeRange::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::Runtime
 }
 
 uno::Type SAL_CALL
-ScVbaShapeRange::getElementType() throw (uno::RuntimeException)
+ScVbaShapeRange::getElementType()
 {
     return cppu::UnoType<msforms::XShape>::get();
 }
 
 uno::Reference< container::XEnumeration > SAL_CALL
-ScVbaShapeRange::createEnumeration() throw (uno::RuntimeException)
+ScVbaShapeRange::createEnumeration()
 {
     return new VbShapeRangeEnumHelper( this, m_xIndexAccess );
 }
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index bb5c620f8742..dd840240efd8 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -57,11 +57,11 @@ class VbShapeEnumHelper : public EnumerationHelper_BASE
         sal_Int32 nIndex;
 public:
     VbShapeEnumHelper( const uno::Reference< msforms::XShapes >& xParent,  const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
-        virtual sal_Bool SAL_CALL hasMoreElements(  ) throw (uno::RuntimeException, std::exception) override
+        virtual sal_Bool SAL_CALL hasMoreElements(  ) override
         {
                 return ( nIndex < m_xIndexAccess->getCount() );
         }
-        virtual uno::Any SAL_CALL nextElement(  ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
+        virtual uno::Any SAL_CALL nextElement(  ) override
         {
                 ScVbaShapes* pShapes = dynamic_cast< ScVbaShapes* >(m_xParent.get());
                 if ( pShapes && hasMoreElements() )
@@ -94,13 +94,13 @@ ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xPa
 }
 
 uno::Reference< container::XEnumeration >
-ScVbaShapes::createEnumeration() throw (uno::RuntimeException)
+ScVbaShapes::createEnumeration()
 {
     return new VbShapeEnumHelper( this,  m_xIndexAccess );
 }
 
 uno::Any
-ScVbaShapes::createCollectionObject( const css::uno::Any& aSource ) throw (uno::RuntimeException)
+ScVbaShapes::createCollectionObject( const css::uno::Any& aSource )
 {
     if( aSource.hasValue() )
     {
@@ -111,7 +111,7 @@ ScVbaShapes::createCollectionObject( const css::uno::Any& aSource ) throw (uno::
 }
 
 uno::Type
-ScVbaShapes::getElementType() throw (uno::RuntimeException)
+ScVbaShapes::getElementType()
 {
     return cppu::UnoType<ooo::vba::msforms::XShape>::get();
 }
@@ -135,7 +135,7 @@ ScVbaShapes::getServiceNames()
 }
 
 css::uno::Reference< css::container::XIndexAccess >
-ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index  ) throw (uno::RuntimeException)
+ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index  )
 {
     if ( Index.getValueTypeClass() != uno::TypeClass_SEQUENCE )
         throw uno::RuntimeException();
@@ -174,7 +174,7 @@ ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index  ) throw (uno::Runti
 }
 
 uno::Reference< msforms::XShapeRange > SAL_CALL
-ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException, std::exception)
+ScVbaShapes::Range( const uno::Any& shapes )
 {
     // shapes, can be an index or an array of indices
     uno::Reference< container::XIndexAccess > xShapes;
@@ -193,7 +193,7 @@ ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException,
 }
 
 void SAL_CALL
-ScVbaShapes::SelectAll() throw (uno::RuntimeException, std::exception)
+ScVbaShapes::SelectAll()
 {
     uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
     try
@@ -209,7 +209,7 @@ ScVbaShapes::SelectAll() throw (uno::RuntimeException, std::exception)
 }
 
 uno::Reference< drawing::XShape >
-ScVbaShapes::createShape( const OUString& service ) throw (css::uno::RuntimeException)
+ScVbaShapes::createShape( const OUString& service )
 {
     uno::Reference< lang::XMultiServiceFactory > xMSF( m_xModel, uno::UNO_QUERY_THROW );
     uno::Reference< drawing::XShape > xShape( xMSF->createInstance( service ), uno::UNO_QUERY_THROW );
@@ -217,7 +217,7 @@ ScVbaShapes::createShape( const OUString& service ) throw (css::uno::RuntimeExce
 }
 
 uno::Any
-ScVbaShapes::AddRectangle(sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, const uno::Any& rRange) throw (css::uno::RuntimeException)
+ScVbaShapes::AddRectangle(sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, const uno::Any& rRange)
 {
     OUString sCreateShapeName( "com.sun.star.drawing.RectangleShape" );
     sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
@@ -249,7 +249,7 @@ ScVbaShapes::AddRectangle(sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWid
 }
 
 uno::Any
-ScVbaShapes::AddEllipse(sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, const uno::Any& rRange) throw (css::uno::RuntimeException)
+ScVbaShapes::AddEllipse(sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, const uno::Any& rRange)
 {
     OUString sCreateShapeName( "com.sun.star.drawing.EllipseShape" );
     sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
@@ -294,7 +294,7 @@ ScVbaShapes::AddEllipse(sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth
 
 //helpeapi calc
 uno::Any SAL_CALL
-ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (uno::RuntimeException, std::exception)
+ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY )
 {
     sal_Int32 nLineWidth = endX - StartX;
     sal_Int32 nLineHeight = endY - StartY;
@@ -328,7 +328,7 @@ ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_In
 }
 
 uno::Any SAL_CALL
-ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException, std::exception)
+ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight )
 {
     uno::Any _aAnchor;
     if (_nType == office::MsoAutoShapeType::msoShapeRectangle)
@@ -343,7 +343,7 @@ ScVbaShapes::AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_
 }
 
 uno::Any SAL_CALL
-ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException, std::exception)
+ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight )
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( m_xModel, uno::UNO_QUERY_THROW );
     if( xServiceInfo->supportsService( "com.sun.star.text.TextDocument" ) )
@@ -354,7 +354,7 @@ ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _n
 }
 
 uno::Any
-ScVbaShapes::AddTextboxInWriter( sal_Int32 /*_nOrientation*/, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
+ScVbaShapes::AddTextboxInWriter( sal_Int32 /*_nOrientation*/, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight )
 {
     OUString sCreateShapeName( "com.sun.star.drawing.TextShape" );
     sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( _nLeft );
@@ -400,7 +400,7 @@ ScVbaShapes::AddTextboxInWriter( sal_Int32 /*_nOrientation*/, sal_Int32 _nLeft,
 }
 
 void
-ScVbaShapes::setDefaultShapeProperties( const uno::Reference< drawing::XShape >& xShape ) throw (uno::RuntimeException)
+ScVbaShapes::setDefaultShapeProperties( const uno::Reference< drawing::XShape >& xShape )
 {
     uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
     xPropertySet->setPropertyValue( "FillStyle", uno::makeAny( OUString("SOLID") ) );
diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx
index f99d9641aa81..865ebeba3fe7 100644
--- a/vbahelper/source/vbahelper/vbatextframe.cxx
+++ b/vbahelper/source/vbahelper/vbatextframe.cxx
@@ -56,7 +56,7 @@ void VbaTextFrame::setMargin( const OUString& sMarginType, float fMargin )
 
 // Attributes
 sal_Bool SAL_CALL
-VbaTextFrame::getAutoSize() throw (uno::RuntimeException, std::exception)
+VbaTextFrame::getAutoSize()
 {
     // I don't know why, but in OOo, TextAutoGrowHeight is the property control autosize. not TextFitToSize.
     // TextFitToSize control the text content.
@@ -68,14 +68,14 @@ VbaTextFrame::getAutoSize() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-VbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException, std::exception)
+VbaTextFrame::setAutoSize( sal_Bool _autosize )
 {
     setAsMSObehavior();
     m_xPropertySet->setPropertyValue( "TextAutoGrowHeight", uno::makeAny( _autosize ) );
 }
 
 float SAL_CALL
-VbaTextFrame::getMarginBottom() throw (uno::RuntimeException, std::exception)
+VbaTextFrame::getMarginBottom()
 {
     sal_Int32 nMargin = getMargin( "TextLowerDistance" );
     float fMargin = (float)Millimeter::getInPoints( nMargin );
@@ -83,13 +83,13 @@ VbaTextFrame::getMarginBottom() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-VbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException, std::exception)
+VbaTextFrame::setMarginBottom( float _marginbottom )
 {
     setMargin( "TextLowerDistance", _marginbottom );
 }
 
 float SAL_CALL
-VbaTextFrame::getMarginTop() throw (uno::RuntimeException, std::exception)
+VbaTextFrame::getMarginTop()
 {
     sal_Int32 nMargin = getMargin( "TextUpperDistance" );
     float fMargin = (float)Millimeter::getInPoints( nMargin );
@@ -97,13 +97,13 @@ VbaTextFrame::getMarginTop() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-VbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException, std::exception)
+VbaTextFrame::setMarginTop( float _margintop )
 {
     setMargin( "TextUpperDistance", _margintop );
 }
 
 float SAL_CALL
-VbaTextFrame::getMarginLeft() throw (uno::RuntimeException, std::exception)
+VbaTextFrame::getMarginLeft()
 {
     sal_Int32 nMargin = getMargin( "TextLeftDistance" );
     float fMargin = (float)Millimeter::getInPoints( nMargin );
@@ -111,13 +111,13 @@ VbaTextFrame::getMarginLeft() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-VbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException, std::exception)
+VbaTextFrame::setMarginLeft( float _marginleft )
 {
     setMargin( "TextLeftDistance", _marginleft );
 }
 
 float SAL_CALL
-VbaTextFrame::getMarginRight() throw (uno::RuntimeException, std::exception)
+VbaTextFrame::getMarginRight()
 {
     sal_Int32 nMargin = getMargin( "TextRightDistance" );
     float fMargin = (float)Millimeter::getInPoints( nMargin );
@@ -125,7 +125,7 @@ VbaTextFrame::getMarginRight() throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException, std::exception)
+VbaTextFrame::setMarginRight( float _marginright )
 {
     setMargin( "TextRightDistance" , _marginright );
 }
@@ -133,7 +133,7 @@ VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException,
 
 // Methods
 uno::Any SAL_CALL
-VbaTextFrame::Characters() throw (uno::RuntimeException, std::exception)
+VbaTextFrame::Characters()
 {
     throw uno::RuntimeException( "Not implemented" );
 }
diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx
index 19b7aaba6e86..36fd27441e68 100644
--- a/vbahelper/source/vbahelper/vbawindowbase.cxx
+++ b/vbahelper/source/vbahelper/vbawindowbase.cxx
@@ -32,7 +32,7 @@ VbaWindowBase::VbaWindowBase(
         const uno::Reference< XHelperInterface >& xParent,
         const uno::Reference< uno::XComponentContext >& xContext,
         const css::uno::Reference< css::frame::XModel >& xModel,
-        const uno::Reference< frame::XController >& xController ) throw (uno::RuntimeException) :
+        const uno::Reference< frame::XController >& xController ) :
     WindowBaseImpl_BASE( xParent, xContext ),
     m_xModel( xModel, uno::UNO_SET_THROW )
 {
@@ -40,7 +40,7 @@ VbaWindowBase::VbaWindowBase(
 }
 
 VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args,
-        uno::Reference< uno::XComponentContext > const & xContext ) throw (uno::RuntimeException) :
+        uno::Reference< uno::XComponentContext > const & xContext ) :
     WindowBaseImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0, false ), xContext ),
     m_xModel( getXSomethingFromArgs< frame::XModel >( args, 1, false ) )
 {
@@ -48,13 +48,13 @@ VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args,
 }
 
 sal_Bool SAL_CALL
-VbaWindowBase::getVisible() throw (uno::RuntimeException, std::exception)
+VbaWindowBase::getVisible()
 {
     return getWindow2()->isVisible();
 }
 
 void SAL_CALL
-VbaWindowBase::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception)
+VbaWindowBase::setVisible( sal_Bool _visible )
 {
     getWindow2()->setVisible( _visible );
 }
@@ -82,49 +82,49 @@ void setPosSize( const uno::Reference< awt::XWindow >& xWindow, sal_Int32 nValue
 }
 
 sal_Int32 SAL_CALL
-VbaWindowBase::getHeight() throw (uno::RuntimeException, std::exception)
+VbaWindowBase::getHeight()
 {
     return getWindow()->getPosSize().Height;
 }
 
 void SAL_CALL
-VbaWindowBase::setHeight( sal_Int32 _height ) throw (uno::RuntimeException, std::exception)
+VbaWindowBase::setHeight( sal_Int32 _height )
 {
     setPosSize( getWindow(), _height, css::awt::PosSize::HEIGHT );
 }
 
 sal_Int32 SAL_CALL
-VbaWindowBase::getLeft() throw (uno::RuntimeException, std::exception)
+VbaWindowBase::getLeft()
 {
     return getWindow()->getPosSize().X;
 }
 
 void SAL_CALL
-VbaWindowBase::setLeft( sal_Int32 _left ) throw (uno::RuntimeException, std::exception)
+VbaWindowBase::setLeft( sal_Int32 _left )
 {
     setPosSize( getWindow(), _left, css::awt::PosSize::X );
 }
 
 sal_Int32 SAL_CALL
-VbaWindowBase::getTop() throw (uno::RuntimeException, std::exception)
+VbaWindowBase::getTop()
 {
     return getWindow()->getPosSize().Y;
 }
 
 void SAL_CALL
-VbaWindowBase::setTop( sal_Int32 _top ) throw (uno::RuntimeException, std::exception)
+VbaWindowBase::setTop( sal_Int32 _top )
 {
     setPosSize( getWindow(), _top, css::awt::PosSize::Y );
 }
 
 sal_Int32 SAL_CALL
-VbaWindowBase::getWidth() throw (uno::RuntimeException, std::exception)
+VbaWindowBase::getWidth()
 {
     return getWindow()->getPosSize().Width;
 }
 
 void SAL_CALL
-VbaWindowBase::setWidth( sal_Int32 _width ) throw (uno::RuntimeException, std::exception)
+VbaWindowBase::setWidth( sal_Int32 _width )
 {
     setPosSize( getWindow(), _width, css::awt::PosSize::WIDTH );
 }
@@ -147,22 +147,22 @@ VbaWindowBase::getServiceNames()
     return aServiceNames;
 }
 
-uno::Reference< frame::XController > VbaWindowBase::getController() throw (css::uno::RuntimeException)
+uno::Reference< frame::XController > VbaWindowBase::getController()
 {
     return uno::Reference< frame::XController >( m_xController, uno::UNO_SET_THROW );
 }
 
-uno::Reference< awt::XWindow > VbaWindowBase::getWindow() throw (uno::RuntimeException)
+uno::Reference< awt::XWindow > VbaWindowBase::getWindow()
 {
     return uno::Reference< awt::XWindow >( m_xWindow, uno::UNO_SET_THROW );
 }
 
-uno::Reference< awt::XWindow2 > VbaWindowBase::getWindow2() throw (uno::RuntimeException)
+uno::Reference< awt::XWindow2 > VbaWindowBase::getWindow2()
 {
     return uno::Reference< awt::XWindow2 >( getWindow(), uno::UNO_QUERY_THROW );
 }
 
-void VbaWindowBase::construct( const uno::Reference< frame::XController >& xController ) throw (uno::RuntimeException)
+void VbaWindowBase::construct( const uno::Reference< frame::XController >& xController )
 {
     if( !xController.is() ) throw uno::RuntimeException();
     uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_SET_THROW );
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index 5df5eb28a256..cffeb7c5bbd6 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -63,46 +63,46 @@ namespace unotools
 
     public:
         // XBitmap
-        virtual css::geometry::IntegerSize2D SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasAlpha(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::geometry::IntegerSize2D SAL_CALL getSize() override;
+        virtual sal_Bool SAL_CALL hasAlpha(  ) override;
+        virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, sal_Bool beFast ) override;
 
         // XIntegerReadOnlyBitmap
-        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) override;
+        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) override;
         /// @throws css::uno::RuntimeException
-        css::uno::Reference< css::rendering::XBitmapPalette > SAL_CALL getPalette(  ) throw (css::uno::RuntimeException);
-        virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout(  ) throw (css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::rendering::XBitmapPalette > SAL_CALL getPalette(  );
+        virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout(  ) override;
 
         // XBitmapPalette
-        virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getIndex( css::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL setIndex( const css::uno::Sequence< double >& color, sal_Bool transparency, ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getNumberOfEntries() override;
+        virtual sal_Bool SAL_CALL getIndex( css::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) override;
+        virtual sal_Bool SAL_CALL setIndex( const css::uno::Sequence< double >& color, sal_Bool transparency, ::sal_Int32 nIndex ) override;
+        virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace(  ) override;
 
         // XIntegerBitmapColorSpace
-        virtual ::sal_Int8 SAL_CALL getType(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL convertColorSpace( const css::uno::Sequence< double >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertToRGB( const css::uno::Sequence< double >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToARGB( const css::uno::Sequence< double >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToPARGB( const css::uno::Sequence< double >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL convertFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL convertFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< double > SAL_CALL convertFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int8 SAL_CALL getEndianness(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int8 SAL_CALL getType(  ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags(  ) override;
+        virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties(  ) override;
+        virtual css::uno::Sequence< double > SAL_CALL convertColorSpace( const css::uno::Sequence< double >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) override;
+        virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertToRGB( const css::uno::Sequence< double >& deviceColor ) override;
+        virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToARGB( const css::uno::Sequence< double >& deviceColor ) override;
+        virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertToPARGB( const css::uno::Sequence< double >& deviceColor ) override;
+        virtual css::uno::Sequence< double > SAL_CALL convertFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) override;
+        virtual css::uno::Sequence< double > SAL_CALL convertFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override;
+        virtual css::uno::Sequence< double > SAL_CALL convertFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override;
+        virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) override;
+        virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) override;
+        virtual ::sal_Int8 SAL_CALL getEndianness(  ) override;
+        virtual css::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XColorSpace >& targetColorSpace ) override;
+        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const css::uno::Sequence< ::sal_Int8 >& deviceColor, const css::uno::Reference< css::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override;
+        virtual css::uno::Sequence< css::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override;
+        virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override;
+        virtual css::uno::Sequence< css::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const css::uno::Sequence< ::sal_Int8 >& deviceColor ) override;
+        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const css::uno::Sequence< css::rendering::RGBColor >& rgbColor ) override;
+        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override;
+        virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const css::uno::Sequence< css::rendering::ARGBColor >& rgbColor ) override;
 
         /** Create API wrapper for given BitmapEx
 
diff --git a/vcl/inc/displayconnectiondispatch.hxx b/vcl/inc/displayconnectiondispatch.hxx
index 72d6279d79f0..04468995edc4 100644
--- a/vcl/inc/displayconnectiondispatch.hxx
+++ b/vcl/inc/displayconnectiondispatch.hxx
@@ -49,11 +49,11 @@ public:
     bool dispatchEvent( void* pData, int nBytes );
 
     // XDisplayConnection
-    virtual void SAL_CALL addEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(std::exception) override;
-    virtual void SAL_CALL removeEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler ) throw(std::exception) override;
-    virtual void SAL_CALL addErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) throw(std::exception) override;
-    virtual void SAL_CALL removeErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) throw(std::exception) override;
-    virtual css::uno::Any SAL_CALL getIdentifier() throw(std::exception) override;
+    virtual void SAL_CALL addEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler, sal_Int32 eventMask ) override;
+    virtual void SAL_CALL removeEventHandler( const css::uno::Any& window, const css::uno::Reference< css::awt::XEventHandler >& handler ) override;
+    virtual void SAL_CALL addErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) override;
+    virtual void SAL_CALL removeErrorHandler( const css::uno::Reference< css::awt::XEventHandler >& handler ) override;
+    virtual css::uno::Any SAL_CALL getIdentifier() override;
 
 };
 
diff --git a/vcl/inc/dndeventdispatcher.hxx b/vcl/inc/dndeventdispatcher.hxx
index 4d35032c9cb2..a6af677350df 100644
--- a/vcl/inc/dndeventdispatcher.hxx
+++ b/vcl/inc/dndeventdispatcher.hxx
@@ -49,27 +49,27 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper<
     /// @throws css::uno::RuntimeException
     static sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
-        const css::uno::Sequence< css::datatransfer::DataFlavor >& aFlavorList ) throw(css::uno::RuntimeException);
+        const css::uno::Sequence< css::datatransfer::DataFlavor >& aFlavorList );
 
     /// @throws css::uno::RuntimeException
     static sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& xContext,
-        const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(css::uno::RuntimeException);
+        const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction );
 
     /// @throws css::uno::RuntimeException
-    static sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(css::uno::RuntimeException);
+    static sal_Int32 fireDragExitEvent( vcl::Window *pWindow );
 
     /// @throws css::uno::RuntimeException
     static sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDragContext >& xContext,
-        const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(css::uno::RuntimeException);
+        const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction );
 
     /// @throws css::uno::RuntimeException
     static sal_Int32 fireDropEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDropTargetDropContext >& xContext,
         const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction,
-        const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable ) throw(css::uno::RuntimeException);
+        const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable );
 
     /// @throws css::uno::RuntimeException
     static sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const css::uno::Reference< css::datatransfer::dnd::XDragSource >& xSource,
-        const css::uno::Any& event, const Point& rOrigin, const sal_Int8 nDragAction )throw(css::uno::RuntimeException);
+        const css::uno::Any& event, const Point& rOrigin, const sal_Int8 nDragAction );
 
 public:
 
@@ -80,30 +80,30 @@ public:
      * XDropTargetDragContext
      */
 
-    virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rejectDrag() throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) override;
+    virtual void SAL_CALL rejectDrag() override;
 
     /*
      * XDropTargetListener
      */
 
-    virtual void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) override;
+    virtual void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override;
+    virtual void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) override;
+    virtual void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override;
+    virtual void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override;
 
     /*
      * XDragGestureListener
      */
 
-    virtual void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) override;
 
     /*
      * XEventListener
      */
 
-    virtual void SAL_CALL disposing( const css::lang::EventObject& eo ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& eo ) override;
 };
 
 #endif
diff --git a/vcl/inc/dndlistenercontainer.hxx b/vcl/inc/dndlistenercontainer.hxx
index 078b4aa3721b..e78da03f1bf8 100644
--- a/vcl/inc/dndlistenercontainer.hxx
+++ b/vcl/inc/dndlistenercontainer.hxx
@@ -76,35 +76,35 @@ public:
      * XDragGestureRecognizer
      */
 
-    virtual void SAL_CALL addDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL resetRecognizer(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) override;
+    virtual void SAL_CALL removeDragGestureListener( const css::uno::Reference< css::datatransfer::dnd::XDragGestureListener >& dgl ) override;
+    virtual void SAL_CALL resetRecognizer(  ) override;
 
        /*
      * XDropTargetDragContext
      */
 
-    virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rejectDrag(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) override;
+    virtual void SAL_CALL rejectDrag(  ) override;
 
        /*
      * XDropTargetDropContext
      */
 
-    virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL rejectDrop(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL dropComplete( sal_Bool success ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) override;
+    virtual void SAL_CALL rejectDrop(  ) override;
+    virtual void SAL_CALL dropComplete( sal_Bool success ) override;
 
     /*
      * XDropTarget
      */
 
-    virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isActive(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setActive( sal_Bool active ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int8 SAL_CALL getDefaultActions(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) override;
+    virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) override;
+    virtual sal_Bool SAL_CALL isActive(  ) override;
+    virtual void SAL_CALL setActive( sal_Bool active ) override;
+    virtual sal_Int8 SAL_CALL getDefaultActions(  ) override;
+    virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) override;
 };
 
 #endif
diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
index 353b6428d9a7..a5355946786d 100644
--- a/vcl/inc/osx/a11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -38,12 +38,10 @@ public:
     virtual ~AquaA11yEventListener() 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;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
 private:
     const id m_wrapperObject;
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index e20ca9dd3850..250fd9b1ca1b 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -75,17 +75,12 @@ protected:
     std::vector<css::datatransfer::DataFlavor> getTransferDataFlavorsAsVector(GdkAtom *targets, gint n_targets);
 public:
 
-    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor)
-        throw(css::datatransfer::UnsupportedFlavorException,
-              css::io::IOException,
-              css::uno::RuntimeException, std::exception) override = 0;
+    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) override = 0;
 
     virtual std::vector<css::datatransfer::DataFlavor> getTransferDataFlavorsAsVector() = 0;
 
-    virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor)
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor) override;
 };
 
 class GtkDropTarget : public cppu::WeakComponentImplHelper<css::datatransfer::dnd::XDropTarget,
@@ -102,28 +97,22 @@ public:
     virtual ~GtkDropTarget() override;
 
     // XInitialization
-    virtual void        SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArgs)
-                                    throw (css::uno::Exception, std::exception) override;
+    virtual void        SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArgs) override;
             void        deinitialize();
 
     // XDropTarget
-    virtual void        SAL_CALL addDropTargetListener(const css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>&)
-                                    throw (std::exception) override;
-    virtual void        SAL_CALL removeDropTargetListener(const css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>&)
-                                    throw (std::exception) override;
-    virtual sal_Bool    SAL_CALL isActive() throw(std::exception) override;
-    virtual void        SAL_CALL setActive(sal_Bool active) throw(std::exception) override;
-    virtual sal_Int8    SAL_CALL getDefaultActions() throw(std::exception) override;
-    virtual void        SAL_CALL setDefaultActions(sal_Int8 actions) throw(std::exception) override;
+    virtual void        SAL_CALL addDropTargetListener(const css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>&) override;
+    virtual void        SAL_CALL removeDropTargetListener(const css::uno::Reference<css::datatransfer::dnd::XDropTargetListener>&) override;
+    virtual sal_Bool    SAL_CALL isActive() override;
+    virtual void        SAL_CALL setActive(sal_Bool active) override;
+    virtual sal_Int8    SAL_CALL getDefaultActions() override;
+    virtual void        SAL_CALL setDefaultActions(sal_Int8 actions) override;
 
-    OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-                throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-                throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     void fire_dragEnter(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee);
     void fire_dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde);
@@ -150,26 +139,22 @@ public:
     virtual ~GtkDragSource() override;
 
     // XDragSource
-    virtual sal_Bool    SAL_CALL isDragImageSupported() throw(std::exception) override;
-    virtual sal_Int32   SAL_CALL getDefaultCursor(sal_Int8 dragAction) throw(std::exception) override;
+    virtual sal_Bool    SAL_CALL isDragImageSupported() override;
+    virtual sal_Int32   SAL_CALL getDefaultCursor(sal_Int8 dragAction) override;
     virtual void        SAL_CALL startDrag(
         const css::datatransfer::dnd::DragGestureEvent& trigger, sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
         const css::uno::Reference< css::datatransfer::XTransferable >& transferable,
-        const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener) throw(std::exception) override;
+        const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener) override;
 
     // XInitialization
-    virtual void        SAL_CALL initialize(const css::uno::Sequence<css::uno::Any >& rArguments)
-        throw (css::uno::Exception, std::exception) override;
+    virtual void        SAL_CALL initialize(const css::uno::Sequence<css::uno::Any >& rArguments) override;
             void        deinitialize();
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     void dragFailed();
     void dragDelete();
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index d794d1fb808d..1a50d4fbc3db 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -158,7 +158,6 @@ DragSource::~DragSource()
 }
 
 void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
-  throw(Exception, std::exception)
 {
   if (aArguments.getLength() < 2)
     {
@@ -203,13 +202,11 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
 }
 
 sal_Bool SAL_CALL DragSource::isDragImageSupported(  )
-  throw(RuntimeException, std::exception)
 {
   return true;
 }
 
 sal_Int32 SAL_CALL DragSource::getDefaultCursor( sal_Int8 /*dragAction*/ )
-  throw( IllegalArgumentException, RuntimeException, std::exception)
 {
   return 0;
 }
@@ -220,7 +217,6 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
                                     sal_Int32 /*image*/,
                                     const uno::Reference<XTransferable >& transferable,
                                     const uno::Reference<XDragSourceListener >& listener )
-  throw( RuntimeException, std::exception)
 {
   MutexGuard guard(m_aMutex);
 
@@ -323,17 +319,17 @@ unsigned int DragSource::getSupportedDragOperations(bool isLocal) const
   return srcActions;
 }
 
-OUString SAL_CALL DragSource::getImplementationName(  ) throw (RuntimeException, std::exception)
+OUString SAL_CALL DragSource::getImplementationName(  )
 {
   return dragSource_getImplementationName();
 }
 
-sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL DragSource::supportsService( const OUString& ServiceName )
 {
   return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames()
 {
   return dragSource_getSupportedServiceNames();
 }
diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx
index 597e0728516e..9027ac455a7c 100644
--- a/vcl/osx/DragSource.hxx
+++ b/vcl/osx/DragSource.hxx
@@ -79,27 +79,24 @@ public:
   DragSource& operator=(const DragSource&) = delete;
 
   // XInitialization
-  virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-    throw(css::uno::Exception, std::exception/*, css::uno::RuntimeException*/) override;
+  virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
   // XDragSource
-  virtual sal_Bool SAL_CALL isDragImageSupported(  ) throw(css::uno::RuntimeException, std::exception) override;
+  virtual sal_Bool SAL_CALL isDragImageSupported(  ) override;
 
-  virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction)
-    throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+  virtual sal_Int32 SAL_CALL getDefaultCursor(sal_Int8 dragAction) override;
 
   virtual void SAL_CALL startDrag( const css::datatransfer::dnd::DragGestureEvent& trigger,
                                    sal_Int8 sourceActions,
                                    sal_Int32 cursor,
                                    sal_Int32 image,
                                    const css::uno::Reference< css::datatransfer::XTransferable >& transferable,
-                                   const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener )
-    throw(css::uno::RuntimeException, std::exception) override;
+                                   const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener ) override;
 
   // XServiceInfo
-  virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-  virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-  virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+  virtual OUString SAL_CALL getImplementationName() override;
+  virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+  virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
   void saveMouseEvent(NSEvent* theEvent);
   unsigned int getSupportedDragOperations(bool isLocal) const;
diff --git a/vcl/osx/DragSourceContext.cxx b/vcl/osx/DragSourceContext.cxx
index 319e969e8e99..253dc867d3de 100644
--- a/vcl/osx/DragSourceContext.cxx
+++ b/vcl/osx/DragSourceContext.cxx
@@ -36,23 +36,19 @@ DragSourceContext::~DragSourceContext()
 }
 
 sal_Int32 SAL_CALL DragSourceContext::getCurrentCursor(  )
-    throw( RuntimeException, std::exception)
 {
     return 0;
 }
 
 void SAL_CALL DragSourceContext::setCursor( sal_Int32 /*cursorId*/ )
-    throw( RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL DragSourceContext::setImage( sal_Int32 /*imageId*/ )
-    throw( RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL DragSourceContext::transferablesFlavorsChanged(  )
-    throw( RuntimeException, std::exception)
 {
 }
 
diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx
index 833b7d1093ea..3ebeb362b4d9 100644
--- a/vcl/osx/DragSourceContext.hxx
+++ b/vcl/osx/DragSourceContext.hxx
@@ -39,17 +39,13 @@ public:
   DragSourceContext(const DragSourceContext&) = delete;
   DragSourceContext& operator=(const DragSourceContext&) = delete;
 
-  virtual sal_Int32 SAL_CALL getCurrentCursor(  )
-    throw( css::uno::RuntimeException, std::exception) override;
+  virtual sal_Int32 SAL_CALL getCurrentCursor(  ) override;
 
-  virtual void SAL_CALL setCursor( sal_Int32 cursorId )
-    throw( css::uno::RuntimeException, std::exception) override;
+  virtual void SAL_CALL setCursor( sal_Int32 cursorId ) override;
 
-  virtual void SAL_CALL setImage( sal_Int32 imageId )
-    throw( css::uno::RuntimeException, std::exception) override;
+  virtual void SAL_CALL setImage( sal_Int32 imageId ) override;
 
-  virtual void SAL_CALL transferablesFlavorsChanged(  )
-    throw( css::uno::RuntimeException, std::exception) override;
+  virtual void SAL_CALL transferablesFlavorsChanged(  ) override;
 };
 
 #endif // INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index 2da380577f55..55f8fc732568 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -350,7 +350,6 @@ void SAL_CALL DropTarget::disposing()
 }
 
 void SAL_CALL DropTarget::initialize(const Sequence< Any >& aArguments)
-    throw(Exception, std::exception)
 {
     if (aArguments.getLength() < 2)
     {
@@ -387,59 +386,57 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 }
 
 void SAL_CALL DropTarget::addDropTargetListener(const uno::Reference<XDropTargetListener>& dtl)
-    throw(RuntimeException, std::exception)
 {
     rBHelper.addListener(cppu::UnoType<decltype(dtl)>::get(), dtl);
 }
 
 void SAL_CALL DropTarget::removeDropTargetListener(const uno::Reference<XDropTargetListener>& dtl)
-    throw(RuntimeException, std::exception)
 {
     rBHelper.removeListener(cppu::UnoType<decltype(dtl)>::get(), dtl);
 }
 
-sal_Bool SAL_CALL DropTarget::isActive(  ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL DropTarget::isActive(  )
 {
     return mbActive;
 }
 
-void SAL_CALL DropTarget::setActive(sal_Bool active) throw(RuntimeException, std::exception)
+void SAL_CALL DropTarget::setActive(sal_Bool active)
 {
     mbActive = active;
 }
 
-sal_Int8 SAL_CALL DropTarget::getDefaultActions() throw(RuntimeException, std::exception)
+sal_Int8 SAL_CALL DropTarget::getDefaultActions()
 {
     return mDefaultActions;
 }
 
-void SAL_CALL DropTarget::setDefaultActions(sal_Int8 actions) throw(RuntimeException, std::exception)
+void SAL_CALL DropTarget::setDefaultActions(sal_Int8 actions)
 {
     OSL_ENSURE( actions < 8, "No valid default actions");
     mDefaultActions= actions;
 }
 
-void SAL_CALL DropTarget::acceptDrag(sal_Int8 dragOperation) throw (RuntimeException, std::exception)
+void SAL_CALL DropTarget::acceptDrag(sal_Int8 dragOperation)
 {
     mSelectedDropAction = dragOperation;
 }
 
-void SAL_CALL DropTarget::rejectDrag() throw (RuntimeException, std::exception)
+void SAL_CALL DropTarget::rejectDrag()
 {
     mSelectedDropAction = DNDConstants::ACTION_NONE;
 }
 
-void SAL_CALL DropTarget::acceptDrop(sal_Int8 dropOperation) throw( RuntimeException, std::exception)
+void SAL_CALL DropTarget::acceptDrop(sal_Int8 dropOperation)
 {
     mSelectedDropAction = dropOperation;
 }
 
-void SAL_CALL DropTarget::rejectDrop() throw (RuntimeException, std::exception)
+void SAL_CALL DropTarget::rejectDrop()
 {
     mSelectedDropAction = DNDConstants::ACTION_NONE;
 }
 
-void SAL_CALL DropTarget::dropComplete(sal_Bool success) throw (RuntimeException, std::exception)
+void SAL_CALL DropTarget::dropComplete(sal_Bool success)
 {
     // Reset the internal transferable used as shortcut in case this is
     // an internal D&D operation
@@ -529,17 +526,17 @@ void DropTarget::fire_dropActionChanged(const DropTargetDragEvent& dtde)
     }
 }
 
-OUString SAL_CALL DropTarget::getImplementationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL DropTarget::getImplementationName()
 {
     return dropTarget_getImplementationName();
 }
 
-sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL DropTarget::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL DropTarget::getSupportedServiceNames(  )
 {
     return dropTarget_getSupportedServiceNames();
 }
diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index ef0c82b190fd..aafb6449599f 100644
--- a/vcl/osx/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -89,35 +89,32 @@ public:
   virtual void SAL_CALL disposing() 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;
 
   // XDropTarget
-  virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl )
-    throw(css::uno::RuntimeException, std::exception) override;
+  virtual void SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& dtl ) override;
 
-  virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference<  css::datatransfer::dnd::XDropTargetListener >& dtl )
-    throw(css::uno::RuntimeException, std::exception) override;
+  virtual void SAL_CALL removeDropTargetListener( const css::uno::Reference<  css::datatransfer::dnd::XDropTargetListener >& dtl ) override;
 
   // Default is not active
-  virtual sal_Bool SAL_CALL isActive() throw(css::uno::RuntimeException, std::exception) override;
-  virtual void SAL_CALL setActive(sal_Bool isActive) throw(css::uno::RuntimeException, std::exception) override;
-  virtual sal_Int8 SAL_CALL getDefaultActions() throw(css::uno::RuntimeException, std::exception) override;
-  virtual void SAL_CALL setDefaultActions(sal_Int8 actions) throw(css::uno::RuntimeException, std::exception) override;
+  virtual sal_Bool SAL_CALL isActive() override;
+  virtual void SAL_CALL setActive(sal_Bool isActive) override;
+  virtual sal_Int8 SAL_CALL getDefaultActions() override;
+  virtual void SAL_CALL setDefaultActions(sal_Int8 actions) override;
 
   // XDropTargetDragContext
-  virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(css::uno::RuntimeException, std::exception) override;
-  virtual void SAL_CALL rejectDrag() throw(css::uno::RuntimeException, std::exception) override;
+  virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) override;
+  virtual void SAL_CALL rejectDrag() override;
 
   // XDropTargetDragContext
-  virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) throw (css::uno::RuntimeException, std::exception) override;
-  virtual void SAL_CALL rejectDrop() throw (css::uno::RuntimeException, std::exception) override;
-  virtual void SAL_CALL dropComplete(sal_Bool success) throw (css::uno::RuntimeException, std::exception) override;
+  virtual void SAL_CALL acceptDrop(sal_Int8 dropOperation) override;
+  virtual void SAL_CALL rejectDrop() override;
+  virtual void SAL_CALL dropComplete(sal_Bool success) override;
 
   // XServiceInfo
-  virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
-  virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override;
-  virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+  virtual OUString SAL_CALL getImplementationName() override;
+  virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+  virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
   // NSDraggingDestination protocol functions
   NSDragOperation draggingEntered(id sender);
diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index df39c42206da..32fca10a00a6 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -96,7 +96,6 @@ OSXTransferable::~OSXTransferable()
 }
 
 Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
-  throw( UnsupportedFlavorException, IOException, RuntimeException, std::exception )
 {
   if (!isValidFlavor(aFlavor) || !isDataFlavorSupported(aFlavor))
     {
@@ -132,13 +131,11 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
 }
 
 Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors(  )
-    throw( RuntimeException, std::exception )
 {
   return mFlavorList;
 }
 
 sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlavor)
-    throw( RuntimeException, std::exception )
 {
     for (sal_Int32 i = 0; i < mFlavorList.getLength(); i++)
       if (compareDataFlavors(aFlavor, mFlavorList[i]))
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index 961c9cefe7a4..2e7056145dd1 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -47,14 +47,11 @@ public:
 
   // XTransferable
 
-  virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
-    throw( css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception ) override;
+  virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
 
-  virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
-    throw( css::uno::RuntimeException, std::exception ) override;
+  virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) override;
 
-  virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
-    throw( css::uno::RuntimeException, std::exception ) override;
+  virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 
   // Helper functions not part of the XTransferable interface
 
diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx
index 1d56c1fafa25..018106fd9304 100644
--- a/vcl/osx/a11ylistener.cxx
+++ b/vcl/osx/a11ylistener.cxx
@@ -61,13 +61,13 @@ AquaA11yEventListener::~AquaA11yEventListener()
 }
 
 void SAL_CALL
-AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+AquaA11yEventListener::disposing( const EventObject& )
 {
     [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ];
 }
 
 void SAL_CALL
-AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException, std::exception )
+AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent )
 {
     NSString * notification = nil;
     id element = m_wrapperObject;
diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx
index 6095a0123a70..20f5decb4809 100644
--- a/vcl/osx/clipboard.cxx
+++ b/vcl/osx/clipboard.cxx
@@ -140,7 +140,7 @@ AquaClipboard::~AquaClipboard()
     [mPasteboard release];
 }
 
-Reference<XTransferable> SAL_CALL AquaClipboard::getContents() throw(RuntimeException, std::exception)
+Reference<XTransferable> SAL_CALL AquaClipboard::getContents()
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -158,7 +158,6 @@ Reference<XTransferable> SAL_CALL AquaClipboard::getContents() throw(RuntimeExce
 
 void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransferable,
     const Reference<XClipboardOwner>& xClipboardOwner)
-        throw( RuntimeException, std::exception )
 {
     NSArray* types = xTransferable.is() ?
         mpDataFlavorMapper->flavorSequenceToTypesArray(xTransferable->getTransferDataFlavors()) :
@@ -186,18 +185,17 @@ void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransf
     fireClipboardChangedEvent();
 }
 
-OUString SAL_CALL AquaClipboard::getName() throw( RuntimeException, std::exception )
+OUString SAL_CALL AquaClipboard::getName()
 {
     return OUString();
 }
 
-sal_Int8 SAL_CALL AquaClipboard::getRenderingCapabilities() throw( RuntimeException, std::exception )
+sal_Int8 SAL_CALL AquaClipboard::getRenderingCapabilities()
 {
     return 0;
 }
 
 void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardListener >& listener)
-  throw( RuntimeException, std::exception )
 {
   MutexGuard aGuard(m_aMutex);
 
@@ -209,7 +207,6 @@ void SAL_CALL AquaClipboard::addClipboardListener(const Reference< XClipboardLis
 }
 
 void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboardListener >& listener)
-  throw( RuntimeException, std::exception )
 {
   MutexGuard aGuard(m_aMutex);
 
@@ -299,7 +296,6 @@ void AquaClipboard::provideDataForType(NSPasteboard* sender, const NSString* typ
 }
 
 void SAL_CALL AquaClipboard::flushClipboard()
-  throw(RuntimeException, std::exception)
 {
     if (mXClipboardContent.is())
     {
@@ -325,17 +321,17 @@ NSPasteboard* AquaClipboard::getPasteboard() const
     return mPasteboard;
 }
 
-OUString SAL_CALL AquaClipboard::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL AquaClipboard::getImplementationName()
 {
     return clipboard_getImplementationName();
 }
 
-sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames()
 {
     return clipboard_getSupportedServiceNames();
 }
diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx
index 8a45c037b5b3..638eb4e7875b 100644
--- a/vcl/osx/clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -87,43 +87,34 @@ public:
 
   // XClipboard
 
-  virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents()
-    throw( css::uno::RuntimeException, std::exception ) override;
+  virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override;
 
   virtual void SAL_CALL setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable,
-                                     const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-    throw( css::uno::RuntimeException, std::exception ) override;
+                                     const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override;
 
-  virtual OUString SAL_CALL getName()
-    throw( css::uno::RuntimeException, std::exception ) override;
+  virtual OUString SAL_CALL getName() override;
 
   // XClipboardEx
 
-  virtual sal_Int8 SAL_CALL getRenderingCapabilities()
-    throw( css::uno::RuntimeException, std::exception ) override;
+  virtual sal_Int8 SAL_CALL getRenderingCapabilities() override;
 
   // XClipboardNotifier
 
-  virtual void SAL_CALL addClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-    throw( css::uno::RuntimeException, std::exception ) override;
+  virtual void SAL_CALL addClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
-  virtual void SAL_CALL removeClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-    throw( css::uno::RuntimeException, std::exception ) override;
+  virtual void SAL_CALL removeClipboardListener( const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
   // XFlushableClipboard
 
-  virtual void SAL_CALL flushClipboard( ) throw( css::uno::RuntimeException, std::exception ) override;
+  virtual void SAL_CALL flushClipboard( ) override;
 
   // 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( const OUString& ServiceName )
-    throw(css::uno::RuntimeException, std::exception) override;
+  virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 
   /* Get a reference to the used pastboard.
    */
diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx
index 3fa2c0b5e03c..3c628d96d27f 100644
--- a/vcl/osx/documentfocuslistener.cxx
+++ b/vcl/osx/documentfocuslistener.cxx
@@ -36,7 +36,6 @@ DocumentFocusListener::DocumentFocusListener(AquaA11yFocusTracker& rTracker) :
 
 void SAL_CALL
 DocumentFocusListener::disposing( const EventObject& aEvent )
-    throw (RuntimeException, std::exception)
 {
     // Unref the object here, but do not remove as listener since the object
     // might no longer be in a state that safely allows this.
@@ -46,7 +45,6 @@ DocumentFocusListener::disposing( const EventObject& aEvent )
 
 void SAL_CALL
 DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
-    throw( RuntimeException, std::exception )
 {
     try {
         switch( aEvent.EventId )
@@ -92,7 +90,6 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
 }
 
 Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& aEvent )
-    throw (IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessible > xAccessible(aEvent.Source, UNO_QUERY);
 
@@ -118,7 +115,6 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject&
 }
 
 void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible)
-    throw (IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext();
 
@@ -129,7 +125,7 @@ void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAcc
 void DocumentFocusListener::attachRecursive(
     const Reference< XAccessible >& xAccessible,
     const Reference< XAccessibleContext >& xContext
-)  throw (IndexOutOfBoundsException, RuntimeException)
+)
 {
     if( xContext.is() )
     {
@@ -144,7 +140,7 @@ void DocumentFocusListener::attachRecursive(
     const Reference< XAccessible >& xAccessible,
     const Reference< XAccessibleContext >& xContext,
     const Reference< XAccessibleStateSet >& xStateSet
-) throw (IndexOutOfBoundsException,RuntimeException)
+)
 {
     if( xStateSet->contains(AccessibleStateType::FOCUSED ) )
         m_aFocusTracker.setFocusedObject( xAccessible );
@@ -172,7 +168,6 @@ void DocumentFocusListener::attachRecursive(
 }
 
 void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible)
-    throw (IndexOutOfBoundsException, RuntimeException)
 {
     Reference< XAccessibleContext > xContext = xAccessible->getAccessibleContext();
 
@@ -183,7 +178,7 @@ void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAcc
 void DocumentFocusListener::detachRecursive(
     const Reference< XAccessible >& xAccessible,
     const Reference< XAccessibleContext >& xContext
-)  throw (IndexOutOfBoundsException, RuntimeException)
+)
 {
     Reference< XAccessibleStateSet > xStateSet = xContext->getAccessibleStateSet();
 
@@ -195,7 +190,7 @@ void DocumentFocusListener::detachRecursive(
     const Reference< XAccessible >&,
     const Reference< XAccessibleContext >& xContext,
     const Reference< XAccessibleStateSet >& xStateSet
-) throw (IndexOutOfBoundsException, RuntimeException)
+)
 {
     Reference< XAccessibleEventBroadcaster > xBroadcaster =
         Reference< XAccessibleEventBroadcaster >(xContext, UNO_QUERY);
diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx
index 2a06b78cf282..f22f7e371305 100644
--- a/vcl/osx/documentfocuslistener.hxx
+++ b/vcl/osx/documentfocuslistener.hxx
@@ -41,14 +41,14 @@ public:
     /// @throws css::uno::RuntimeException
     void attachRecursive(
         const css::uno::Reference< css::accessibility::XAccessible >& xAccessible
-    ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    );
 
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
     void attachRecursive(
         const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
         const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext
-    ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    );
 
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
@@ -56,20 +56,20 @@ public:
         const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
         const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext,
         const css::uno::Reference< css::accessibility::XAccessibleStateSet >& xStateSet
-    ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    );
 
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
     void detachRecursive(
         const css::uno::Reference< css::accessibility::XAccessible >& xAccessible
-    ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    );
 
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
     void detachRecursive(
         const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
         const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext
-    ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    );
 
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
@@ -77,20 +77,17 @@ public:
         const css::uno::Reference< css::accessibility::XAccessible >& xAccessible,
         const css::uno::Reference< css::accessibility::XAccessibleContext >& xContext,
         const css::uno::Reference< css::accessibility::XAccessibleStateSet >& xStateSet
-    ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    );
 
     /// @throws css::lang::IndexOutOfBoundsException
     /// @throws css::uno::RuntimeException
-    static css::uno::Reference< css::accessibility::XAccessible > getAccessible(const css::lang::EventObject& aEvent )
-        throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    static css::uno::Reference< css::accessibility::XAccessible > getAccessible(const css::lang::EventObject& aEvent );
 
     // 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;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
 private:
     std::set< css::uno::Reference< css::uno::XInterface > > m_aRefList;
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 53ce5c91cbcd..ff3479cdce13 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -249,18 +249,14 @@ private:
     const sal_Int32                mnBitsPerPixel;
 
     // XBitmap
-    virtual geometry::IntegerSize2D SAL_CALL getSize() throw (uno::RuntimeException, std::exception) override { return maSize; }
-    virtual sal_Bool SAL_CALL hasAlpha(  ) throw (uno::RuntimeException, std::exception) override { return mnBitsPerPixel != 8; }
+    virtual geometry::IntegerSize2D SAL_CALL getSize() override { return maSize; }
+    virtual sal_Bool SAL_CALL hasAlpha(  ) override { return mnBitsPerPixel != 8; }
     virtual uno::Reference< rendering::XBitmap > SAL_CALL getScaledBitmap( const geometry::RealSize2D&,
-                                                                           sal_Bool ) throw (uno::RuntimeException, std::exception) override { return this; }
+                                                                           sal_Bool ) override { return this; }
 
     // XIntegerReadOnlyBitmap
     virtual uno::Sequence< ::sal_Int8 > SAL_CALL getData( rendering::IntegerBitmapLayout&     bitmapLayout,
-                                                          const geometry::IntegerRectangle2D& rect )
-        throw (lang::IndexOutOfBoundsException,
-               rendering::VolatileContentDestroyedException,
-               uno::RuntimeException,
-               std::exception) override
+                                                          const geometry::IntegerRectangle2D& rect ) override
     {
         CPPUNIT_ASSERT_MESSAGE( "X1 out of bounds", rect.X1 >= 0 );
         CPPUNIT_ASSERT_MESSAGE( "Y1 out of bounds", rect.Y1 >= 0 );
@@ -305,18 +301,14 @@ private:
     }
 
     virtual uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( rendering::IntegerBitmapLayout&,
-                                                           const geometry::IntegerPoint2D&  )
-        throw (lang::IndexOutOfBoundsException,
-               rendering::VolatileContentDestroyedException,
-               uno::RuntimeException,
-               std::exception) override
+                                                           const geometry::IntegerPoint2D&  ) override
     {
         CPPUNIT_ASSERT_MESSAGE("getPixel: method not implemented", false);
         return uno::Sequence< sal_Int8 >();
     }
 
     /// @throws uno::RuntimeException
-    uno::Reference< rendering::XBitmapPalette > SAL_CALL getPalette(  ) throw (uno::RuntimeException)
+    uno::Reference< rendering::XBitmapPalette > SAL_CALL getPalette(  )
     {
         uno::Reference< XBitmapPalette > aRet;
         if( mnBitsPerPixel == 8 )
@@ -324,7 +316,7 @@ private:
         return aRet;
     }
 
-    virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout(  ) throw (uno::RuntimeException, std::exception) override
+    virtual rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout(  ) override
     {
         rendering::IntegerBitmapLayout aLayout( maLayout );
 
@@ -340,7 +332,7 @@ private:
     }
 
     // XBitmapPalette
-    virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (uno::RuntimeException, std::exception) override
+    virtual sal_Int32 SAL_CALL getNumberOfEntries() override
     {
         CPPUNIT_ASSERT_MESSAGE( "Got palette getNumberOfEntries interface call without handing out palette",
                                 getPalette().is() );
@@ -349,10 +341,7 @@ private:
     }
 
     virtual sal_Bool SAL_CALL getIndex( uno::Sequence< double >& entry,
-                                          ::sal_Int32 nIndex )
-        throw (lang::IndexOutOfBoundsException,
-               uno::RuntimeException,
-               std::exception) override
+                                          ::sal_Int32 nIndex ) override
     {
         CPPUNIT_ASSERT_MESSAGE( "Got palette getIndex interface call without handing out palette",
                                 getPalette().is() );
@@ -368,10 +357,7 @@ private:
 
     virtual sal_Bool SAL_CALL setIndex( const uno::Sequence< double >&,
                                           sal_Bool,
-                                          ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException,
-                                                                      lang::IllegalArgumentException,
-                                                                      uno::RuntimeException,
-                                                                      std::exception) override
+                                          ::sal_Int32 nIndex ) override
     {
         CPPUNIT_ASSERT_MESSAGE( "Got palette setIndex interface call without handing out palette",
                                 getPalette().is());
@@ -389,7 +375,7 @@ private:
         }
     };
 
-    virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Reference< rendering::XColorSpace > SAL_CALL getColorSpace(  ) override
     {
         // this is the method from XBitmapPalette. Return palette color
         // space here
@@ -397,129 +383,100 @@ private:
     }
 
     // XIntegerBitmapColorSpace
-    virtual ::sal_Int8 SAL_CALL getType(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int8 SAL_CALL getType(  ) override
     {
         return rendering::ColorSpaceType::RGB;
     }
 
-    virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< sal_Int8 > SAL_CALL getComponentTags(  ) override
     {
         return maComponentTags;
     }
 
-    virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) override
     {
         return rendering::RenderingIntent::PERCEPTUAL;
     }
 
-    virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties()
-        throw (uno::RuntimeException,
-               std::exception) override
+    virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties() override
     {
         CPPUNIT_ASSERT_MESSAGE("getProperties: method not implemented", false );
         return uno::Sequence< ::beans::PropertyValue >();
     }
 
     virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >&,
-                                                                const uno::Reference< rendering::XColorSpace >& )
-        throw (uno::RuntimeException,
-               std::exception) override
+                                                                const uno::Reference< rendering::XColorSpace >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertColorSpace: method not implemented", false);
         return uno::Sequence< double >();
     }
 
-    virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& )
-        throw (lang::IllegalArgumentException,
-               uno::RuntimeException,
-               std::exception) override
+    virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertToRGB: method not implemented", false);
         return uno::Sequence< rendering::RGBColor >();
     }
 
-    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& )
-        throw (lang::IllegalArgumentException,
-               uno::RuntimeException,
-               std::exception) override
+    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertToARGB: method not implemented", false);
         return uno::Sequence< rendering::ARGBColor >();
     }
 
-    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& )
-        throw (lang::IllegalArgumentException,
-               uno::RuntimeException,
-               std::exception) override
+    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertToPARGB: method not implemented", false);
         return uno::Sequence< rendering::ARGBColor >();
     }
 
-    virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& )
-        throw (lang::IllegalArgumentException,
-               uno::RuntimeException,
-               std::exception) override
+    virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertFromRGB: method not implemented", false);
         return uno::Sequence< double >();
     }
 
-    virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& )
-        throw (lang::IllegalArgumentException,
-               uno::RuntimeException,
-               std::exception) override
+    virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertFromARGB: this method is not expected to be called!", false);
         return uno::Sequence< double >();
     }
 
-    virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& )
-        throw (lang::IllegalArgumentException,
-               uno::RuntimeException,
-               std::exception) override
+    virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertFromPARGB: this method is not expected to be called!", false);
         return uno::Sequence< double >();
     }
 
-    virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) override
     {
         return mnBitsPerPixel;
     }
 
-    virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) throw (uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) override
     {
         return maComponentBitCounts;
     }
 
-    virtual ::sal_Int8 SAL_CALL getEndianness(  ) throw (uno::RuntimeException, std::exception) override
+    virtual ::sal_Int8 SAL_CALL getEndianness(  ) override
     {
         return util::Endianness::LITTLE;
     }
 
     virtual uno::Sequence< double > SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& ,
-                                                                           const uno::Reference< rendering::XColorSpace >& )
-        throw (lang::IllegalArgumentException,
-               uno::RuntimeException,
-               std::exception) override
+                                                                           const uno::Reference< rendering::XColorSpace >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertFromIntegerColorSpace: method not implemented", false);
         return uno::Sequence< double >();
     }
 
     virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& ,
-                                                                             const uno::Reference< rendering::XIntegerBitmapColorSpace >& )
-        throw (lang::IllegalArgumentException,
-               uno::RuntimeException,
-               std::exception) override
+                                                                             const uno::Reference< rendering::XIntegerBitmapColorSpace >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertToIntegerColorSpace: method not implemented", false);
         return uno::Sequence< sal_Int8 >();
     }
 
-    virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,
-                                                                                                                                       uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
     {
         const uno::Sequence< rendering::ARGBColor > aTemp( convertIntegerToARGB(deviceColor) );
         const std::size_t nLen(aTemp.getLength());
@@ -535,8 +492,7 @@ private:
         return aRes;
     }
 
-    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,
-                                                                                                                                         uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override
     {
         const std::size_t  nLen( deviceColor.getLength() );
         const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4);
@@ -573,10 +529,7 @@ private:
     }
 
     virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB(
-        const uno::Sequence< ::sal_Int8 >& deviceColor)
-            throw (lang::IllegalArgumentException,
-                   uno::RuntimeException,
-                   std::exception) override
+        const uno::Sequence< ::sal_Int8 >& deviceColor) override
     {
         const std::size_t  nLen( deviceColor.getLength() );
         const sal_Int32 nBytesPerPixel(mnBitsPerPixel == 8 ? 1 : 4);
@@ -614,27 +567,19 @@ private:
     }
 
     virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB(
-        const uno::Sequence< rendering::RGBColor >&)
-            throw (lang::IllegalArgumentException,
-                   uno::RuntimeException,
-                   std::exception) override
+        const uno::Sequence< rendering::RGBColor >&) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertIntegerFromRGB: method not implemented", false);
         return uno::Sequence< sal_Int8 >();
     }
 
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& ) throw (lang::IllegalArgumentException,
-                                                                                                                               uno::RuntimeException,
-                                  std::exception) override
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertIntegerFromARGB: method not implemented", false);
         return uno::Sequence< sal_Int8 >();
     }
 
-    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& )
-        throw (lang::IllegalArgumentException,
-        uno::RuntimeException,
-        std::exception) override
+    virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& ) override
     {
         CPPUNIT_ASSERT_MESSAGE("convertIntegerFromPARGB: method not implemented", false);
         return uno::Sequence< sal_Int8 >();
diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx
index 4ea7fe1b8584..49edd7d47294 100644
--- a/vcl/source/app/dndhelp.cxx
+++ b/vcl/source/app/dndhelp.cxx
@@ -26,38 +26,26 @@ using namespace ::com::sun::star;
 vcl::unohelper::DragAndDropClient::~DragAndDropClient() {}
 
 void vcl::unohelper::DragAndDropClient::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& /*dge*/ )
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
 }
 
 void vcl::unohelper::DragAndDropClient::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& /*dsde*/ )
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
 }
 
 void vcl::unohelper::DragAndDropClient::drop( const css::datatransfer::dnd::DropTargetDropEvent& /*dtde*/ )
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
 }
 
 void vcl::unohelper::DragAndDropClient::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& /*dtdee*/ )
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
 }
 
 void vcl::unohelper::DragAndDropClient::dragExit( const css::datatransfer::dnd::DropTargetEvent& /*dte*/ )
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
 }
 
 void vcl::unohelper::DragAndDropClient::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& /*dtde*/ )
-    throw (css::uno::RuntimeException,
-           std::exception)
 {
 }
 
@@ -71,7 +59,7 @@ vcl::unohelper::DragAndDropWrapper::~DragAndDropWrapper()
 }
 
 // uno::XInterface
-uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType )
 {
     uno::Any aRet = ::cppu::queryInterface( rType,
                             (static_cast< css::lang::XEventListener* >( static_cast<css::datatransfer::dnd::XDragGestureListener*>(this)) ),
@@ -82,7 +70,7 @@ uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & r
 }
 
 // css::lang::XEventListener
-void vcl::unohelper::DragAndDropWrapper::disposing( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::disposing( const css::lang::EventObject& rEvent )
 {
     // Empty Source means it's the client, because the client is not a XInterface
     if ( !rEvent.Source.is() )
@@ -90,61 +78,61 @@ void vcl::unohelper::DragAndDropWrapper::disposing( const css::lang::EventObject
 }
 
 // css::datatransfer::dnd::XDragGestureListener
-void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE )
 {
     if ( mpClient )
         mpClient->dragGestureRecognized( rDGE );
 }
 
 // css::datatransfer::dnd::XDragSourceListener
-void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE )
 {
     if ( mpClient )
         mpClient->dragDropEnd( rDSDE );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& )
 {
 }
 
-void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DragSourceEvent& ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DragSourceEvent& )
 {
 }
 
-void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DragSourceDragEvent& )
 {
 }
 
-void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& )
 {
 }
 
 // css::datatransfer::dnd::XDropTargetListener
-void vcl::unohelper::DragAndDropWrapper::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE )
 {
     if ( mpClient )
         mpClient->drop( rDTDE );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDEE )
 {
     if ( mpClient )
         mpClient->dragEnter( rDTDEE );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragExit( const css::datatransfer::dnd::DropTargetEvent& dte )
 {
     if ( mpClient )
         mpClient->dragExit( dte );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE )
 {
     if ( mpClient )
         mpClient->dragOver( rDTDE );
 }
 
-void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw (css::uno::RuntimeException, std::exception)
+void vcl::unohelper::DragAndDropWrapper::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& )
 {
 }
 
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 2dc15b157b1c..fd8ef606bdd7 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -75,12 +75,12 @@ class VCLSession:
 
     virtual ~VCLSession() override {}
 
-    virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override;
-    virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL cancelShutdown() throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL addSessionManagerListener( const css::uno::Reference< XSessionManagerListener >& xListener ) override;
+    virtual void SAL_CALL removeSessionManagerListener( const css::uno::Reference< XSessionManagerListener>& xListener ) override;
+    virtual void SAL_CALL queryInteraction( const css::uno::Reference< XSessionManagerListener >& xListener ) override;
+    virtual void SAL_CALL interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) override;
+    virtual void SAL_CALL saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) override;
+    virtual sal_Bool SAL_CALL cancelShutdown() override;
 
     void SAL_CALL disposing() override;
 
@@ -252,7 +252,7 @@ void VCLSession::SalSessionEventProc( void* pData, SalSessionEvent* pEvent )
     }
 }
 
-void SAL_CALL VCLSession::addSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL VCLSession::addSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener )
 {
     SAL_INFO("vcl.se", "VCLSession::addSessionManagerListener" );
 
@@ -262,7 +262,7 @@ void SAL_CALL VCLSession::addSessionManagerListener( const css::uno::Reference<X
     m_aListeners.push_back( Listener( xListener ) );
 }
 
-void SAL_CALL VCLSession::removeSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL VCLSession::removeSessionManagerListener( const css::uno::Reference<XSessionManagerListener>& xListener )
 {
     SAL_INFO("vcl.se", "VCLSession::removeSessionManagerListener" );
 
@@ -282,7 +282,7 @@ void SAL_CALL VCLSession::removeSessionManagerListener( const css::uno::Referenc
     }
 }
 
-void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionManagerListener>& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionManagerListener>& xListener )
 {
     SAL_INFO("vcl.se", "VCLSession::queryInteraction");
 
@@ -314,7 +314,7 @@ void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionMa
     }
 }
 
-void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionManagerListener >& xListener )
 {
     SAL_INFO("vcl.se", "VCLSession::interactionDone");
 
@@ -342,7 +342,7 @@ void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionMa
     }
 }
 
-void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerListener >& xListener )
 {
     SAL_INFO("vcl.se", "VCLSession::saveDone");
 
@@ -367,7 +367,7 @@ void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerLi
     }
 }
 
-sal_Bool SAL_CALL VCLSession::cancelShutdown() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL VCLSession::cancelShutdown()
 {
     SAL_INFO("vcl.se", "VCLSession::cancelShutdown");
 
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index d398d6bc2562..294847ef45a3 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -237,14 +237,13 @@ public:
         : m_xNextContext( ctx ) {}
 
     // XCurrentContext
-    virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name )
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) override;
 
 private:
     css::uno::Reference< css::uno::XCurrentContext > m_xNextContext;
 };
 
-uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL DesktopEnvironmentContext::getValueByName( const OUString& Name)
 {
     uno::Any retVal;
 
@@ -342,12 +341,11 @@ namespace
  */
 class VCLUnoWrapperDeleter : public cppu::WeakImplHelper<css::lang::XEventListener>
 {
-    virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(lang::EventObject const& rSource) override;
 };
 
 void
 VCLUnoWrapperDeleter::disposing(lang::EventObject const& /* rSource */)
-    throw(uno::RuntimeException, std::exception)
 {
     ImplSVData* const pSVData = ImplGetSVData();
     if (pSVData && pSVData->mpUnoWrapper)
diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx
index 3d98b1219a58..d721fd4f42e4 100644
--- a/vcl/source/app/unohelp2.cxx
+++ b/vcl/source/app/unohelp2.cxx
@@ -62,14 +62,14 @@ namespace vcl { namespace unohelper {
     }
 
     // css::uno::XInterface
-    uno::Any TextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
+    uno::Any TextDataObject::queryInterface( const uno::Type & rType )
     {
         uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) );
         return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
     }
 
     // css::datatransfer::XTransferable
-    uno::Any TextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor ) throw(datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception)
+    uno::Any TextDataObject::getTransferData( const datatransfer::DataFlavor& rFlavor )
     {
         uno::Any aAny;
 
@@ -85,14 +85,14 @@ namespace vcl { namespace unohelper {
         return aAny;
     }
 
-    uno::Sequence< datatransfer::DataFlavor > TextDataObject::getTransferDataFlavors(  ) throw(uno::RuntimeException, std::exception)
+    uno::Sequence< datatransfer::DataFlavor > TextDataObject::getTransferDataFlavors(  )
     {
         uno::Sequence< datatransfer::DataFlavor > aDataFlavors(1);
         SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aDataFlavors.getArray()[0] );
         return aDataFlavors;
     }
 
-    sal_Bool TextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException, std::exception)
+    sal_Bool TextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor )
     {
         SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor );
         return ( nT == SotClipboardFormatId::STRING );
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index fcdf217c25d3..91c8d4b3f929 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -73,9 +73,9 @@ public:
      * XServiceInfo
      */
 
-    virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     static Sequence< OUString > getSupportedServiceNames_static();
 
@@ -83,34 +83,28 @@ public:
      * XClipboard
      */
 
-    virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents()
-        throw(RuntimeException, std::exception) override;
+    virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override;
 
     virtual void SAL_CALL setContents(
         const Reference< css::datatransfer::XTransferable >& xTrans,
-        const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-        throw(RuntimeException, std::exception) override;
+        const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override;
 
-    virtual OUString SAL_CALL getName()
-        throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
 
     /*
      * XClipboardEx
      */
 
-    virtual sal_Int8 SAL_CALL getRenderingCapabilities()
-        throw(RuntimeException, std::exception) override;
+    virtual sal_Int8 SAL_CALL getRenderingCapabilities() override;
 
     /*
      * XClipboardNotifier
      */
     virtual void SAL_CALL addClipboardListener(
-        const Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-        throw(RuntimeException, std::exception) override;
+        const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
     virtual void SAL_CALL removeClipboardListener(
-        const Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-        throw(RuntimeException, std::exception) override;
+        const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 };
 
 Sequence< OUString > GenericClipboard::getSupportedServiceNames_static()
@@ -119,22 +113,22 @@ Sequence< OUString > GenericClipboard::getSupportedServiceNames_static()
     return aRet;
 }
 
-OUString GenericClipboard::getImplementationName() throw( RuntimeException, std::exception )
+OUString GenericClipboard::getImplementationName()
 {
     return OUString("com.sun.star.datatransfer.VCLGenericClipboard");
 }
 
-Sequence< OUString > GenericClipboard::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > GenericClipboard::getSupportedServiceNames()
 {
     return getSupportedServiceNames_static();
 }
 
-sal_Bool GenericClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception )
+sal_Bool GenericClipboard::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Reference< css::datatransfer::XTransferable > GenericClipboard::getContents() throw( RuntimeException, std::exception )
+Reference< css::datatransfer::XTransferable > GenericClipboard::getContents()
 {
     return m_aContents;
 }
@@ -142,7 +136,6 @@ Reference< css::datatransfer::XTransferable > GenericClipboard::getContents() th
 void GenericClipboard::setContents(
         const Reference< css::datatransfer::XTransferable >& xTrans,
         const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-    throw( RuntimeException, std::exception )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
     Reference< datatransfer::clipboard::XClipboardOwner > xOldOwner( m_aOwner );
@@ -165,18 +158,17 @@ void GenericClipboard::setContents(
     }
 }
 
-OUString GenericClipboard::getName() throw( RuntimeException, std::exception )
+OUString GenericClipboard::getName()
 {
     return OUString( "CLIPBOARD"  );
 }
 
-sal_Int8 GenericClipboard::getRenderingCapabilities() throw( RuntimeException, std::exception )
+sal_Int8 GenericClipboard::getRenderingCapabilities()
 {
     return 0;
 }
 
 void GenericClipboard::addClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener )
-    throw( RuntimeException, std::exception )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -184,7 +176,6 @@ void GenericClipboard::addClipboardListener( const Reference< datatransfer::clip
 }
 
 void GenericClipboard::removeClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener )
-    throw( RuntimeException, std::exception )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -202,8 +193,8 @@ public:
     /*
      *  XSingleServiceFactory
      */
-    virtual Reference< XInterface > SAL_CALL createInstance() throw(std::exception) override;
-    virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(std::exception) override;
+    virtual Reference< XInterface > SAL_CALL createInstance() override;
+    virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) override;
 };
 
 ClipboardFactory::ClipboardFactory() :
@@ -213,12 +204,12 @@ ClipboardFactory::ClipboardFactory() :
 {
 }
 
-Reference< XInterface > ClipboardFactory::createInstance() throw(std::exception)
+Reference< XInterface > ClipboardFactory::createInstance()
 {
     return createInstanceWithArguments( Sequence< Any >() );
 }
 
-Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) throw(std::exception)
+Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments )
 {
     SolarMutexGuard aGuard;
     Reference< XInterface > xResult = ImplGetSVData()->mpDefInst->CreateClipboard( arguments );
@@ -257,28 +248,25 @@ public:
     GenericDragSource() : WeakComponentImplHelper( m_aMutex ) {}
 
     // XDragSource
-    virtual sal_Bool    SAL_CALL isDragImageSupported() throw(std::exception) override;
-    virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) override;
+    virtual sal_Bool    SAL_CALL isDragImageSupported() override;
+    virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) override;
     virtual void        SAL_CALL startDrag(
                                      const datatransfer::dnd::DragGestureEvent& trigger,
                                      sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
                                      const Reference< datatransfer::XTransferable >& transferable,
                                      const Reference< datatransfer::dnd::XDragSourceListener >& listener
-                                     ) throw(std::exception) override;
+                                     ) override;
 
     // XInitialization
-    virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception ) override;
+    virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) override;
 
-    OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) override
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource"); }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     { return getSupportedServiceNames_static(); }
 
     static Sequence< OUString > getSupportedServiceNames_static()
@@ -288,12 +276,12 @@ public:
     }
 };
 
-sal_Bool GenericDragSource::isDragImageSupported() throw(std::exception)
+sal_Bool GenericDragSource::isDragImageSupported()
 {
     return false;
 }
 
-sal_Int32 GenericDragSource::getDefaultCursor( sal_Int8 ) throw(std::exception)
+sal_Int32 GenericDragSource::getDefaultCursor( sal_Int8 )
 {
     return 0;
 }
@@ -302,7 +290,7 @@ void GenericDragSource::startDrag( const datatransfer::dnd::DragGestureEvent&,
                                    sal_Int8 /*sourceActions*/, sal_Int32 /*cursor*/, sal_Int32 /*image*/,
                                    const Reference< datatransfer::XTransferable >&,
                                    const Reference< datatransfer::dnd::XDragSourceListener >& listener
-                                   ) throw(std::exception)
+                                   )
 {
     datatransfer::dnd::DragSourceDropEvent aEv;
     aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_COPY;
@@ -310,7 +298,7 @@ void GenericDragSource::startDrag( const datatransfer::dnd::DragGestureEvent&,
     listener->dragDropEnd( aEv );
 }
 
-void GenericDragSource::initialize( const Sequence< Any >& ) throw( Exception, std::exception )
+void GenericDragSource::initialize( const Sequence< Any >& )
 {
 }
 
@@ -359,26 +347,23 @@ public:
     {}
 
     // XInitialization
-    virtual void        SAL_CALL initialize( const Sequence< Any >& args ) throw ( Exception, std::exception ) override;
+    virtual void        SAL_CALL initialize( const Sequence< Any >& args ) override;
 
     // XDropTarget
-    virtual void        SAL_CALL addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override;
-    virtual void        SAL_CALL removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override;
-    virtual sal_Bool    SAL_CALL isActive() throw(std::exception) override;
-    virtual void        SAL_CALL setActive( sal_Bool active ) throw(std::exception) override;
-    virtual sal_Int8    SAL_CALL getDefaultActions() throw(std::exception) override;
-    virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) override;
-
-    OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) override
+    virtual void        SAL_CALL addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) override;
+    virtual void        SAL_CALL removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) override;
+    virtual sal_Bool    SAL_CALL isActive() override;
+    virtual void        SAL_CALL setActive( sal_Bool active ) override;
+    virtual sal_Int8    SAL_CALL getDefaultActions() override;
+    virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) override;
+
+    OUString SAL_CALL getImplementationName() override
     { return OUString("com.sun.star.datatransfer.dnd.VclGenericDropTarget"); }
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     { return getSupportedServiceNames_static(); }
 
     static Sequence< OUString > getSupportedServiceNames_static()
@@ -388,33 +373,33 @@ public:
     }
 };
 
-void GenericDropTarget::initialize( const Sequence< Any >& ) throw( Exception, std::exception )
+void GenericDropTarget::initialize( const Sequence< Any >& )
 {
 }
 
-void GenericDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception)
+void GenericDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& )
 {
 }
 
-void GenericDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception)
+void GenericDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& )
 {
 }
 
-sal_Bool GenericDropTarget::isActive() throw(std::exception)
+sal_Bool GenericDropTarget::isActive()
 {
     return false;
 }
 
-void GenericDropTarget::setActive( sal_Bool ) throw(std::exception)
+void GenericDropTarget::setActive( sal_Bool )
 {
 }
 
-sal_Int8 GenericDropTarget::getDefaultActions() throw(std::exception)
+sal_Int8 GenericDropTarget::getDefaultActions()
 {
     return 0;
 }
 
-void GenericDropTarget::setDefaultActions( sal_Int8) throw(std::exception)
+void GenericDropTarget::setDefaultActions( sal_Int8)
 {
 }
 
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index 9568c4c846cb..3d99129b933e 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -52,19 +52,19 @@ public:
 FontIdentificator() {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ) throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence< Any >& ) throw (Exception, RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const Sequence< Any >& ) override;
 
     // XMaterialHolder
-    virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) override;
+    virtual Any SAL_CALL getMaterial() override;
 
 };
 
-void SAL_CALL FontIdentificator::initialize( const Sequence<Any>& i_rArgs ) throw(Exception,RuntimeException, std::exception)
+void SAL_CALL FontIdentificator::initialize( const Sequence<Any>& i_rArgs )
 {
     if( !ImplGetSVData() )
         return; // VCL not initialized
@@ -82,7 +82,7 @@ void SAL_CALL FontIdentificator::initialize( const Sequence<Any>& i_rArgs ) thro
     }
 }
 
-Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::exception)
+Any SAL_CALL FontIdentificator::getMaterial()
 {
     if( !ImplGetSVData() )
         return Any(); // VCL not initialized
@@ -163,17 +163,17 @@ Reference< XInterface > SAL_CALL FontIdentificator_createInstance( const Referen
 }
 
 // XServiceInfo
-OUString SAL_CALL FontIdentificator::getImplementationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL FontIdentificator::getImplementationName()
 {
     return FontIdentificator_getImplementationName();
 }
 
-sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rServiceName ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL FontIdentificator::supportsService( const OUString& i_rServiceName )
 {
     return cppu::supportsService(this, i_rServiceName);
 }
 
-Sequence< OUString > SAL_CALL FontIdentificator::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL FontIdentificator::getSupportedServiceNames()
 {
     return FontIdentificator_getSupportedServiceNames();
 }
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f6ca2cc0bcb0..f228b8e81f6a 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2816,7 +2816,7 @@ VclPtr<PopupMenu> Edit::CreatePopupMenu()
 }
 
 // css::datatransfer::dnd::XDragGestureListener
-void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception)
+void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE )
 {
     SolarMutexGuard aVclGuard;
 
@@ -2853,7 +2853,7 @@ void Edit::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent
 }
 
 // css::datatransfer::dnd::XDragSourceListener
-void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE ) throw (css::uno::RuntimeException, std::exception)
+void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE )
 {
     SolarMutexGuard aVclGuard;
 
@@ -2879,7 +2879,7 @@ void Edit::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& rDSDE
 }
 
 // css::datatransfer::dnd::XDropTargetListener
-void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception)
+void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE )
 {
     SolarMutexGuard aVclGuard;
 
@@ -2926,7 +2926,7 @@ void Edit::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) thro
     rDTDE.Context->dropComplete( bChanges );
 }
 
-void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception)
+void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE )
 {
     if ( !mpDDInfo )
     {
@@ -2948,14 +2948,14 @@ void Edit::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& rD
     }
 }
 
-void Edit::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception)
+void Edit::dragExit( const css::datatransfer::dnd::DropTargetEvent& )
 {
     SolarMutexGuard aVclGuard;
 
     ImplHideDDCursor();
 }
 
-void Edit::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception)
+void Edit::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE )
 {
     SolarMutexGuard aVclGuard;
 
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index 78d14c593208..770cf1ee41d1 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -24,11 +24,9 @@ public:
     explicit NotebookBarContextChangeEventListener(NotebookBar *p) : mpParent(p) {}
 
     // XContextChangeEventListener
-    virtual void SAL_CALL notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) override;
 
-    virtual void SAL_CALL disposing(const ::css::lang::EventObject&)
-        throw (::css::uno::RuntimeException, ::std::exception) override;
+    virtual void SAL_CALL disposing(const ::css::lang::EventObject&) override;
 };
 
 
@@ -121,7 +119,6 @@ void NotebookBar::SetSystemWindow(SystemWindow* pSystemWindow)
 }
 
 void SAL_CALL NotebookBarContextChangeEventListener::notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent)
-        throw (css::uno::RuntimeException, std::exception)
 {
     if (mpParent && mpParent->m_pContextContainer)
         mpParent->m_pContextContainer->SetContext(vcl::EnumContext::GetContextEnum(rEvent.ContextName));
@@ -129,7 +126,6 @@ void SAL_CALL NotebookBarContextChangeEventListener::notifyContextChangeEvent(co
 
 
 void SAL_CALL NotebookBarContextChangeEventListener::disposing(const ::css::lang::EventObject&)
-    throw (::css::uno::RuntimeException, ::std::exception)
 {
     mpParent.clear();
 }
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 08627478b8e7..e738f34777d2 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -74,14 +74,14 @@ public:
     SvMemoryStream& GetHTMLStream() { return maHTMLStream; }
 
     // css::uno::XInterface
-    css::uno::Any                               SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any                               SAL_CALL queryInterface( const css::uno::Type & rType ) override;
     void                                        SAL_CALL acquire() throw() override  { OWeakObject::acquire(); }
     void                                        SAL_CALL release() throw() override  { OWeakObject::release(); }
 
     // css::datatransfer::XTransferable
-    css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
+    css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) override;
+    sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 };
 
 TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText )
@@ -89,14 +89,14 @@ TETextDataObject::TETextDataObject( const OUString& rText ) : maText( rText )
 }
 
 // css::uno::XInterface
-css::uno::Any TETextDataObject::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any TETextDataObject::queryInterface( const css::uno::Type & rType )
 {
     css::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::datatransfer::XTransferable* >(this)) );
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
 // css::datatransfer::XTransferable
-css::uno::Any TETextDataObject::getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception)
+css::uno::Any TETextDataObject::getTransferData( const css::datatransfer::DataFlavor& rFlavor )
 {
     css::uno::Any aAny;
 
@@ -122,7 +122,7 @@ css::uno::Any TETextDataObject::getTransferData( const css::datatransfer::DataFl
     return aAny;
 }
 
-css::uno::Sequence< css::datatransfer::DataFlavor > TETextDataObject::getTransferDataFlavors(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::datatransfer::DataFlavor > TETextDataObject::getTransferDataFlavors(  )
 {
     GetHTMLStream().Seek( STREAM_SEEK_TO_END );
     bool bHTML = GetHTMLStream().Tell() > 0;
@@ -133,7 +133,7 @@ css::uno::Sequence< css::datatransfer::DataFlavor > TETextDataObject::getTransfe
     return aDataFlavors;
 }
 
-sal_Bool TETextDataObject::isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool TETextDataObject::isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor )
 {
     SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor );
     return ( nT == SotClipboardFormatId::STRING );
@@ -1889,7 +1889,7 @@ bool TextView::ImplCheckTextLen( const OUString& rNewText )
     return bOK;
 }
 
-void TextView::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE ) throw (css::uno::RuntimeException, std::exception)
+void TextView::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& rDGE )
 {
     if ( mpImpl->mbClickedInSelection )
     {
@@ -1935,13 +1935,13 @@ void TextView::dragGestureRecognized( const css::datatransfer::dnd::DragGestureE
     }
 }
 
-void TextView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& ) throw (css::uno::RuntimeException, std::exception)
+void TextView::dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& )
 {
     ImpHideDDCursor();
     mpImpl->mpDDInfo.reset();
 }
 
-void TextView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception)
+void TextView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE )
 {
     SolarMutexGuard aVclGuard;
 
@@ -2047,17 +2047,17 @@ void TextView::drop( const css::datatransfer::dnd::DropTargetDropEvent& rDTDE )
     rDTDE.Context->dropComplete( bChanges );
 }
 
-void TextView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& ) throw (css::uno::RuntimeException, std::exception)
+void TextView::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& )
 {
 }
 
-void TextView::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw (css::uno::RuntimeException, std::exception)
+void TextView::dragExit( const css::datatransfer::dnd::DropTargetEvent& )
 {
     SolarMutexGuard aVclGuard;
     ImpHideDDCursor();
 }
 
-void TextView::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE ) throw (css::uno::RuntimeException, std::exception)
+void TextView::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& rDTDE )
 {
     SolarMutexGuard aVclGuard;
 
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index 33f0aa966183..8067a1ee2256 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -117,7 +117,6 @@ OUString FilterConfigCache::FilterConfigCacheEntry::GetShortName()
     @throws It let pass RuntimeExceptions only.
  */
 Reference< XInterface > openConfig(const char* sPackage)
-    throw(RuntimeException)
 {
     Reference< XComponentContext > xContext(
         comphelper::getProcessComponentContext() );
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 50506fe955a0..4bf9efce66fa 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -90,13 +90,11 @@ protected:
 
     SvStream&               mrStm;
 
-    virtual void SAL_CALL   writeBytes( const css::uno::Sequence< sal_Int8 >& rData )
-        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL   writeBytes( const css::uno::Sequence< sal_Int8 >& rData ) override
         { mrStm.WriteBytes(rData.getConstArray(), rData.getLength()); }
-    virtual void SAL_CALL   flush()
-        throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL   flush() override
         { mrStm.Flush(); }
-    virtual void SAL_CALL   closeOutput() throw(std::exception) override {}
+    virtual void SAL_CALL   closeOutput() override {}
 
 public:
 
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index a4f2fe0f1cb3..6bb422880592 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8058,13 +8058,13 @@ class PDFStreamIf :
     public:
     explicit PDFStreamIf( PDFWriterImpl* pWriter ) : m_pWriter( pWriter ), m_bWrite( true ) {}
 
-    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(std::exception) override;
-    virtual void SAL_CALL flush() throw(std::exception) override;
-    virtual void SAL_CALL closeOutput() throw(std::exception) override;
+    virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 };
 }
 
-void SAL_CALL  PDFStreamIf::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw(std::exception)
+void SAL_CALL  PDFStreamIf::writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
 {
     if( m_bWrite && aData.getLength() )
     {
@@ -8073,11 +8073,11 @@ void SAL_CALL  PDFStreamIf::writeBytes( const css::uno::Sequence< sal_Int8 >& aD
     }
 }
 
-void SAL_CALL PDFStreamIf::flush() throw(std::exception)
+void SAL_CALL PDFStreamIf::flush()
 {
 }
 
-void SAL_CALL PDFStreamIf::closeOutput() throw(std::exception)
+void SAL_CALL PDFStreamIf::closeOutput()
 {
     m_bWrite = false;
 }
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 8afd8b70cdc0..a06b9b945da2 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1126,7 +1126,7 @@ public:
     }
 
     // XMaterialHolder
-    virtual uno::Any SAL_CALL getMaterial() throw(std::exception) override
+    virtual uno::Any SAL_CALL getMaterial() override
     {
         return uno::makeAny( sal_Int64(maID) );
     }
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index cbf05245d343..a3015fb5e91a 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -425,20 +425,20 @@ VclCanvasBitmap::~VclCanvasBitmap()
 }
 
 // XBitmap
-geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize() throw (uno::RuntimeException, std::exception)
+geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize()
 {
     SolarMutexGuard aGuard;
     return integerSize2DFromSize( m_aBitmap.GetSizePixel() );
 }
 
-sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha()
 {
     SolarMutexGuard aGuard;
     return m_aBmpEx.IsTransparent();
 }
 
 uno::Reference< rendering::XBitmap > SAL_CALL VclCanvasBitmap::getScaledBitmap( const geometry::RealSize2D& newSize,
-                                                                                sal_Bool beFast ) throw (uno::RuntimeException, std::exception)
+                                                                                sal_Bool beFast )
 {
     SolarMutexGuard aGuard;
 
@@ -449,9 +449,7 @@ uno::Reference< rendering::XBitmap > SAL_CALL VclCanvasBitmap::getScaledBitmap(
 
 // XIntegerReadOnlyBitmap
 uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerBitmapLayout&     bitmapLayout,
-                                                             const geometry::IntegerRectangle2D& rect ) throw( lang::IndexOutOfBoundsException,
-                                                                                                               rendering::VolatileContentDestroyedException,
-                                                                                                               uno::RuntimeException, std::exception)
+                                                             const geometry::IntegerRectangle2D& rect )
 {
     SolarMutexGuard aGuard;
 
@@ -554,9 +552,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerB
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getPixel( rendering::IntegerBitmapLayout&   bitmapLayout,
-                                                              const geometry::IntegerPoint2D&   pos ) throw (lang::IndexOutOfBoundsException,
-                                                                                                             rendering::VolatileContentDestroyedException,
-                                                                                                             uno::RuntimeException, std::exception)
+                                                              const geometry::IntegerPoint2D&   pos )
 {
     SolarMutexGuard aGuard;
 
@@ -622,7 +618,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getPixel( rendering::Integer
     return aRet;
 }
 
-uno::Reference< rendering::XBitmapPalette > SAL_CALL VclCanvasBitmap::getPalette() throw (uno::RuntimeException)
+uno::Reference< rendering::XBitmapPalette > SAL_CALL VclCanvasBitmap::getPalette()
 {
     SolarMutexGuard aGuard;
 
@@ -633,7 +629,7 @@ uno::Reference< rendering::XBitmapPalette > SAL_CALL VclCanvasBitmap::getPalette
     return aRet;
 }
 
-rendering::IntegerBitmapLayout SAL_CALL VclCanvasBitmap::getMemoryLayout() throw (uno::RuntimeException, std::exception)
+rendering::IntegerBitmapLayout SAL_CALL VclCanvasBitmap::getMemoryLayout()
 {
     SolarMutexGuard aGuard;
 
@@ -650,7 +646,7 @@ rendering::IntegerBitmapLayout SAL_CALL VclCanvasBitmap::getMemoryLayout() throw
     return aLayout;
 }
 
-sal_Int32 SAL_CALL VclCanvasBitmap::getNumberOfEntries() throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL VclCanvasBitmap::getNumberOfEntries()
 {
     SolarMutexGuard aGuard;
 
@@ -660,7 +656,7 @@ sal_Int32 SAL_CALL VclCanvasBitmap::getNumberOfEntries() throw (uno::RuntimeExce
     return m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ;
 }
 
-sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, sal_Int32 nIndex )
 {
     SolarMutexGuard aGuard;
 
@@ -681,7 +677,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s
     return true; // no palette transparency here.
 }
 
-sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal_Bool, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal_Bool, sal_Int32 nIndex )
 {
     SolarMutexGuard aGuard;
 
@@ -708,36 +704,36 @@ namespace
     };
 }
 
-uno::Reference< rendering::XColorSpace > SAL_CALL VclCanvasBitmap::getColorSpace(  ) throw (uno::RuntimeException, std::exception)
+uno::Reference< rendering::XColorSpace > SAL_CALL VclCanvasBitmap::getColorSpace(  )
 {
     // this is the method from XBitmapPalette. Return palette color
     // space here
     return PaletteColorSpaceHolder::get();
 }
 
-sal_Int8 SAL_CALL VclCanvasBitmap::getType(  ) throw (uno::RuntimeException, std::exception)
+sal_Int8 SAL_CALL VclCanvasBitmap::getType(  )
 {
     return rendering::ColorSpaceType::RGB;
 }
 
-uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::getComponentTags(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::getComponentTags(  )
 {
     SolarMutexGuard aGuard;
     return m_aComponentTags;
 }
 
-sal_Int8 SAL_CALL VclCanvasBitmap::getRenderingIntent(  ) throw (uno::RuntimeException, std::exception)
+sal_Int8 SAL_CALL VclCanvasBitmap::getRenderingIntent(  )
 {
     return rendering::RenderingIntent::PERCEPTUAL;
 }
 
-uno::Sequence< ::beans::PropertyValue > SAL_CALL VclCanvasBitmap::getProperties(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< ::beans::PropertyValue > SAL_CALL VclCanvasBitmap::getProperties(  )
 {
     return uno::Sequence< ::beans::PropertyValue >();
 }
 
 uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                     const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) throw (uno::RuntimeException, std::exception)
+                                                                     const uno::Reference< ::rendering::XColorSpace >& targetColorSpace )
 {
     // TODO(P3): if we know anything about target
     // colorspace, this can be greatly sped up
@@ -746,7 +742,7 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertColorSpace( const uno::
     return targetColorSpace->convertFromARGB(aIntermediate);
 }
 
-uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertToRGB( const uno::Sequence< double >& deviceColor )
 {
     SolarMutexGuard aGuard;
 
@@ -795,7 +791,7 @@ uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertToRGB( const
     return aRes;
 }
 
-uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToARGB( const uno::Sequence< double >& deviceColor )
 {
     SolarMutexGuard aGuard;
 
@@ -848,7 +844,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToARGB( con
     return aRes;
 }
 
-uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToPARGB( const uno::Sequence< double >& deviceColor )
 {
     SolarMutexGuard aGuard;
 
@@ -901,7 +897,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertToPARGB( co
     return aRes;
 }
 
-uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor )
 {
     SolarMutexGuard aGuard;
 
@@ -941,7 +937,7 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromRGB( const uno::Seq
     return aRes;
 }
 
-uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor )
 {
     SolarMutexGuard aGuard;
 
@@ -981,7 +977,7 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromARGB( const uno::Se
     return aRes;
 }
 
-uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor )
 {
     SolarMutexGuard aGuard;
 
@@ -1023,26 +1019,26 @@ uno::Sequence< double > SAL_CALL VclCanvasBitmap::convertFromPARGB( const uno::S
     return aRes;
 }
 
-sal_Int32 SAL_CALL VclCanvasBitmap::getBitsPerPixel(  ) throw (uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL VclCanvasBitmap::getBitsPerPixel(  )
 {
     SolarMutexGuard aGuard;
     return m_nBitsPerOutputPixel;
 }
 
-uno::Sequence< ::sal_Int32 > SAL_CALL VclCanvasBitmap::getComponentBitCounts(  ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< ::sal_Int32 > SAL_CALL VclCanvasBitmap::getComponentBitCounts(  )
 {
     SolarMutexGuard aGuard;
     return m_aComponentBitCounts;
 }
 
-sal_Int8 SAL_CALL VclCanvasBitmap::getEndianness(  ) throw (uno::RuntimeException, std::exception)
+sal_Int8 SAL_CALL VclCanvasBitmap::getEndianness(  )
 {
     SolarMutexGuard aGuard;
     return m_nEndianness;
 }
 
 uno::Sequence<double> SAL_CALL VclCanvasBitmap::convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                              const uno::Reference< ::rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+                                                                              const uno::Reference< ::rendering::XColorSpace >& targetColorSpace )
 {
     if( dynamic_cast<VclCanvasBitmap*>(targetColorSpace.get()) )
     {
@@ -1106,7 +1102,7 @@ uno::Sequence<double> SAL_CALL VclCanvasBitmap::convertFromIntegerColorSpace( co
 }
 
 uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor,
-                                                                                  const uno::Reference< ::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+                                                                                  const uno::Reference< ::rendering::XIntegerBitmapColorSpace >& targetColorSpace )
 {
     if( dynamic_cast<VclCanvasBitmap*>(targetColorSpace.get()) )
     {
@@ -1123,7 +1119,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertToIntegerColorSpace
     }
 }
 
-uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
 {
     SolarMutexGuard aGuard;
 
@@ -1175,7 +1171,7 @@ uno::Sequence<rendering::RGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToRGB
     return aRes;
 }
 
-uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
 {
     SolarMutexGuard aGuard;
 
@@ -1230,7 +1226,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToAR
     return aRes;
 }
 
-uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
 {
     SolarMutexGuard aGuard;
 
@@ -1286,7 +1282,7 @@ uno::Sequence<rendering::ARGBColor> SAL_CALL VclCanvasBitmap::convertIntegerToPA
     return aRes;
 }
 
-uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromRGB( const uno::Sequence<rendering::RGBColor>& rgbColor )
 {
     SolarMutexGuard aGuard;
 
@@ -1335,7 +1331,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromRGB( con
     return aRes;
 }
 
-uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor )
 {
     SolarMutexGuard aGuard;
 
@@ -1384,7 +1380,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromARGB( co
     return aRes;
 }
 
-uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception)
+uno::Sequence< ::sal_Int8 > SAL_CALL VclCanvasBitmap::convertIntegerFromPARGB( const uno::Sequence<rendering::ARGBColor>& rgbColor )
 {
     SolarMutexGuard aGuard;
 
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index b66ec69a6ea0..3dd1df22c791 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -428,25 +428,24 @@ namespace vcl
             private:
                 uno::Sequence< sal_Int8 > m_aComponentTags;
 
-                virtual ::sal_Int8 SAL_CALL getType(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int8 SAL_CALL getType(  ) override
                 {
                     return rendering::ColorSpaceType::RGB;
                 }
-                virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) throw (uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags(  ) override
                 {
                     return m_aComponentTags;
                 }
-                virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) throw (uno::RuntimeException, std::exception) override
+                virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) override
                 {
                     return rendering::RenderingIntent::PERCEPTUAL;
                 }
-                virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) throw (uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties(  ) override
                 {
                     return uno::Sequence< beans::PropertyValue >();
                 }
                 virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor,
-                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException,
-                                                                                                                                                      uno::RuntimeException, std::exception) override
+                                                                            const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override
                 {
                     // TODO(P3): if we know anything about target
                     // colorspace, this can be greatly sped up
@@ -454,7 +453,7 @@ namespace vcl
                         convertToARGB(deviceColor));
                     return targetColorSpace->convertFromARGB(aIntermediate);
                 }
-                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const std::size_t nLen( deviceColor.getLength() );
@@ -471,7 +470,7 @@ namespace vcl
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const std::size_t nLen( deviceColor.getLength() );
@@ -488,7 +487,7 @@ namespace vcl
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override
                 {
                     const double*  pIn( deviceColor.getConstArray() );
                     const std::size_t nLen( deviceColor.getLength() );
@@ -505,7 +504,7 @@ namespace vcl
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override
                 {
                     const rendering::RGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t             nLen( rgbColor.getLength() );
@@ -522,7 +521,7 @@ namespace vcl
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
@@ -539,7 +538,7 @@ namespace vcl
                     }
                     return aRes;
                 }
-                virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
+                virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override
                 {
                     const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
                     const std::size_t              nLen( rgbColor.getLength() );
diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx
index 7a844c607300..f1578151fb56 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -58,8 +58,7 @@ namespace
                 mxFrame->addFrameActionListener(this);
         }
 
-        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) override
         {
             // The same frame can be reused for a different component, e.g.
             // starting component from the start center, so need to re-init the cached data.
@@ -71,8 +70,7 @@ namespace
             if (mxFrame.is())
                 mxFrame->removeFrameActionListener(this);
         }
-        virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
-            throw (RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override
         {
             (void)rEvent;
             mrInfoProvider.SetFrame(nullptr);
diff --git a/vcl/source/helper/displayconnectiondispatch.cxx b/vcl/source/helper/displayconnectiondispatch.cxx
index 77c9dab8d3b1..60851598ba08 100644
--- a/vcl/source/helper/displayconnectiondispatch.cxx
+++ b/vcl/source/helper/displayconnectiondispatch.cxx
@@ -73,35 +73,35 @@ void DisplayConnectionDispatch::terminate()
         (*it)->handleEvent( aEvent );
 }
 
-void SAL_CALL DisplayConnectionDispatch::addEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler, sal_Int32 /*eventMask*/ ) throw(std::exception)
+void SAL_CALL DisplayConnectionDispatch::addEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler, sal_Int32 /*eventMask*/ )
 {
     MutexGuard aGuard( m_aMutex );
 
     m_aHandlers.push_back( handler );
 }
 
-void SAL_CALL DisplayConnectionDispatch::removeEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler ) throw(std::exception)
+void SAL_CALL DisplayConnectionDispatch::removeEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler )
 {
     MutexGuard aGuard( m_aMutex );
 
     m_aHandlers.remove( handler );
 }
 
-void SAL_CALL DisplayConnectionDispatch::addErrorHandler( const css::uno::Reference< XEventHandler >& handler ) throw(std::exception)
+void SAL_CALL DisplayConnectionDispatch::addErrorHandler( const css::uno::Reference< XEventHandler >& handler )
 {
     MutexGuard aGuard( m_aMutex );
 
     m_aErrorHandlers.push_back( handler );
 }
 
-void SAL_CALL DisplayConnectionDispatch::removeErrorHandler( const css::uno::Reference< XEventHandler >& handler ) throw(std::exception)
+void SAL_CALL DisplayConnectionDispatch::removeErrorHandler( const css::uno::Reference< XEventHandler >& handler )
 {
     MutexGuard aGuard( m_aMutex );
 
     m_aErrorHandlers.remove( handler );
 }
 
-Any SAL_CALL DisplayConnectionDispatch::getIdentifier() throw(std::exception)
+Any SAL_CALL DisplayConnectionDispatch::getIdentifier()
 {
     return m_aAny;
 }
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx
index 6506c058fd6f..9907e7bc4ecc 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -25,7 +25,6 @@ UIObjectUnoObj::~UIObjectUnoObj()
 }
 
 css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UIObjectUnoObj::getChild(const OUString& rID)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!mpObj)
         throw css::uno::RuntimeException();
@@ -36,7 +35,6 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UIObjectUnoObj::getChild(
 }
 
 void SAL_CALL UIObjectUnoObj::executeAction(const OUString& rAction, const css::uno::Sequence<css::beans::PropertyValue>& rPropValues)
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!mpObj)
         throw css::uno::RuntimeException();
@@ -55,7 +53,6 @@ void SAL_CALL UIObjectUnoObj::executeAction(const OUString& rAction, const css::
 }
 
 css::uno::Sequence<css::beans::PropertyValue> UIObjectUnoObj::getState()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!mpObj)
         throw css::uno::RuntimeException();
@@ -74,7 +71,6 @@ css::uno::Sequence<css::beans::PropertyValue> UIObjectUnoObj::getState()
 }
 
 css::uno::Sequence<OUString> UIObjectUnoObj::getChildren()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!mpObj)
         throw css::uno::RuntimeException();
@@ -92,7 +88,6 @@ css::uno::Sequence<OUString> UIObjectUnoObj::getChildren()
 }
 
 OUString SAL_CALL UIObjectUnoObj::getType()
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (!mpObj)
         throw css::uno::RuntimeException();
@@ -101,19 +96,16 @@ OUString SAL_CALL UIObjectUnoObj::getType()
 }
 
 OUString SAL_CALL UIObjectUnoObj::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.uitest.UIObject");
 }
 
 sal_Bool UIObjectUnoObj::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> UIObjectUnoObj::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<OUString> aServiceNames(1);
     aServiceNames[0] = "com.sun.star.ui.test.UIObject";
diff --git a/vcl/source/uitest/uno/uiobject_uno.hxx b/vcl/source/uitest/uno/uiobject_uno.hxx
index d06e6691272d..510c22c16631 100644
--- a/vcl/source/uitest/uno/uiobject_uno.hxx
+++ b/vcl/source/uitest/uno/uiobject_uno.hxx
@@ -37,29 +37,21 @@ public:
     explicit UIObjectUnoObj(std::unique_ptr<UIObject> pObj);
     virtual ~UIObjectUnoObj() override;
 
-    css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getChild(const OUString& rID)
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getChild(const OUString& rID) override;
 
-    void SAL_CALL executeAction(const OUString& rAction, const css::uno::Sequence<css::beans::PropertyValue>& xPropValues)
-        throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL executeAction(const OUString& rAction, const css::uno::Sequence<css::beans::PropertyValue>& xPropValues) override;
 
-    css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getState()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getState() override;
 
-    css::uno::Sequence<OUString> SAL_CALL getChildren()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getChildren() override;
 
-    OUString SAL_CALL getType()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getType() override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx
index 4840934e8d13..aad296e9b604 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -38,20 +38,15 @@ public:
 
     UITestUnoObj();
 
-    void SAL_CALL executeCommand(const OUString& rCommand)
-        throw (css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL executeCommand(const OUString& rCommand) override;
 
-    css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getTopFocusWindow()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getTopFocusWindow() override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 UITestUnoObj::UITestUnoObj():
@@ -61,14 +56,12 @@ UITestUnoObj::UITestUnoObj():
 }
 
 void SAL_CALL UITestUnoObj::executeCommand(const OUString& rCommand)
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     UITest::executeCommand(rCommand);
 }
 
 css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getTopFocusWindow()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     std::unique_ptr<UIObject> pObj = UITest::getFocusTopWindow();
@@ -76,19 +69,16 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL UITestUnoObj::getTopFocus
 }
 
 OUString SAL_CALL UITestUnoObj::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.uitest.UITest");
 }
 
 sal_Bool UITestUnoObj::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> UITestUnoObj::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<OUString> aServiceNames(1);
     aServiceNames[0] = "com.sun.star.ui.test.UITest";
diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx
index e02d8fc0e8fd..5fce2982d5f9 100644
--- a/vcl/source/window/dndeventdispatcher.cxx
+++ b/vcl/source/window/dndeventdispatcher.cxx
@@ -86,7 +86,6 @@ void DNDEventDispatcher::designate_currentwindow(vcl::Window *pWindow)
 }
 
 void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde )
-    throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aImplGuard( m_aMutex );
 
@@ -122,7 +121,6 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde )
 }
 
 void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtdee )
-    throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aImplGuard( m_aMutex );
     Point location( dtdee.LocationX, dtdee.LocationY );
@@ -146,7 +144,6 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd
 }
 
 void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ )
-    throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aImplGuard( m_aMutex );
 
@@ -158,7 +155,6 @@ void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ )
 }
 
 void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde )
-    throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aImplGuard( m_aMutex );
 
@@ -195,7 +191,6 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde )
 }
 
 void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& dtde )
-    throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aImplGuard( m_aMutex );
 
@@ -232,7 +227,6 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent&
 }
 
 void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge )
-    throw(RuntimeException, std::exception)
 {
     osl::MutexGuard aImplGuard( m_aMutex );
 
@@ -244,15 +238,14 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent&
 }
 
 void SAL_CALL DNDEventDispatcher::disposing( const EventObject& )
-    throw(RuntimeException, std::exception)
 {
 }
 
-void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ )
 {
 }
 
-void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException, std::exception)
+void SAL_CALL DNDEventDispatcher::rejectDrag()
 {
 }
 
@@ -260,7 +253,6 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( vcl::Window *pWindow,
     const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction,
     const Point& rLocation, const sal_Int8 nSourceActions, const Sequence< DataFlavor >& aFlavorList
 )
-    throw(RuntimeException)
 {
     sal_Int32 n = 0;
 
@@ -292,7 +284,6 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( vcl::Window *pWindow,
     const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction,
     const Point& rLocation, const sal_Int8 nSourceActions
 )
-    throw(RuntimeException)
 {
     sal_Int32 n = 0;
 
@@ -317,7 +308,7 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( vcl::Window *pWindow,
     return n;
 }
 
-sal_Int32 DNDEventDispatcher::fireDragExitEvent( vcl::Window *pWindow ) throw(RuntimeException)
+sal_Int32 DNDEventDispatcher::fireDragExitEvent( vcl::Window *pWindow )
 {
     sal_Int32 n = 0;
 
@@ -344,7 +335,6 @@ sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( vcl::Window *pWindow,
     const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction,
     const Point& rLocation, const sal_Int8 nSourceActions
 )
-    throw(RuntimeException)
 {
     sal_Int32 n = 0;
 
@@ -373,7 +363,6 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( vcl::Window *pWindow,
     const Reference< XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation,
     const sal_Int8 nSourceActions, const Reference< XTransferable >& xTransferable
 )
-    throw(RuntimeException)
 {
     sal_Int32 n = 0;
 
@@ -412,7 +401,6 @@ sal_Int32 DNDEventDispatcher::fireDragGestureEvent( vcl::Window *pWindow,
     const Reference< XDragSource >& xSource, const Any& event,
     const Point& rOrigin, const sal_Int8 nDragAction
 )
-    throw(css::uno::RuntimeException)
 {
     sal_Int32 n = 0;
 
diff --git a/vcl/source/window/dndlistenercontainer.cxx b/vcl/source/window/dndlistenercontainer.cxx
index b9874fc08086..fd0244c6e014 100644
--- a/vcl/source/window/dndlistenercontainer.cxx
+++ b/vcl/source/window/dndlistenercontainer.cxx
@@ -36,54 +36,45 @@ DNDListenerContainer::~DNDListenerContainer()
 }
 
 void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl )
-    throw(RuntimeException, std::exception)
 {
     rBHelper.addListener( cppu::UnoType<XDragGestureListener>::get(), dgl );
 }
 
 void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl )
-    throw(RuntimeException, std::exception)
 {
     rBHelper.removeListener( cppu::UnoType<XDragGestureListener>::get(), dgl );
 }
 
 void SAL_CALL DNDListenerContainer::resetRecognizer(  )
-    throw(RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl )
-    throw(RuntimeException, std::exception)
 {
     rBHelper.addListener( cppu::UnoType<XDropTargetListener>::get(), dtl );
 }
 
 void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl )
-    throw(RuntimeException, std::exception)
 {
     rBHelper.removeListener( cppu::UnoType<XDropTargetListener>::get(), dtl );
 }
 
 sal_Bool SAL_CALL DNDListenerContainer::isActive(  )
-    throw(RuntimeException, std::exception)
 {
     return m_bActive;
 }
 
 void SAL_CALL DNDListenerContainer::setActive( sal_Bool active )
-    throw(RuntimeException, std::exception)
 {
     m_bActive = active;
 }
 
 sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions(  )
-    throw(RuntimeException, std::exception)
 {
     return m_nDefaultActions;
 }
 
 void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions )
-    throw(RuntimeException, std::exception)
 {
     m_nDefaultActions = actions;
 }
@@ -423,7 +414,7 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_
     return nRet;
 }
 
-void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (RuntimeException, std::exception)
+void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation )
 {
     if( m_xDropTargetDragContext.is() )
     {
@@ -432,23 +423,23 @@ void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (
     }
 }
 
-void SAL_CALL DNDListenerContainer::rejectDrag(  ) throw (RuntimeException, std::exception)
+void SAL_CALL DNDListenerContainer::rejectDrag(  )
 {
     // nothing to do here
 }
 
-void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw (RuntimeException, std::exception)
+void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation )
 {
     if( m_xDropTargetDropContext.is() )
         m_xDropTargetDropContext->acceptDrop( dropOperation );
 }
 
-void SAL_CALL DNDListenerContainer::rejectDrop(  ) throw (RuntimeException, std::exception)
+void SAL_CALL DNDListenerContainer::rejectDrop(  )
 {
     // nothing to do here
 }
 
-void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) throw (RuntimeException, std::exception)
+void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success )
 {
     if( m_xDropTargetDropContext.is() )
     {
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 6e9f5678a3ba..6f9e4de03856 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -133,7 +133,6 @@ void X11Clipboard::clearContents()
 }
 
 Reference< XTransferable > SAL_CALL X11Clipboard::getContents()
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_rSelectionManager.getMutex());
 
@@ -145,7 +144,6 @@ Reference< XTransferable > SAL_CALL X11Clipboard::getContents()
 void SAL_CALL X11Clipboard::setContents(
     const Reference< XTransferable >& xTrans,
     const Reference< XClipboardOwner >& xClipboardOwner )
-    throw(RuntimeException, std::exception)
 {
     // remember old values for callbacks before setting the new ones.
     ClearableMutexGuard aGuard(m_rSelectionManager.getMutex());
@@ -176,26 +174,22 @@ void SAL_CALL X11Clipboard::setContents(
 }
 
 OUString SAL_CALL X11Clipboard::getName()
-    throw(RuntimeException, std::exception)
 {
     return m_rSelectionManager.getString( m_aSelection );
 }
 
 sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities()
-    throw(RuntimeException, std::exception)
 {
     return RenderingCapabilities::Delayed;
 }
 
 void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_rSelectionManager.getMutex() );
     m_aListeners.push_back( listener );
 }
 
 void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard( m_rSelectionManager.getMutex() );
     m_aListeners.remove( listener );
@@ -222,19 +216,16 @@ Reference< XInterface > X11Clipboard::getReference() throw()
 }
 
 OUString SAL_CALL X11Clipboard::getImplementationName(  )
-    throw(RuntimeException, std::exception)
 {
     return OUString(X11_CLIPBOARD_IMPLEMENTATION_NAME);
 }
 
 sal_Bool SAL_CALL X11Clipboard::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL X11Clipboard::getSupportedServiceNames(    )
-    throw(RuntimeException, std::exception)
 {
     return X11Clipboard_getSupportedServiceNames();
 }
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index b3d06f4f6f55..c9a948cefd99 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -66,47 +66,38 @@ namespace x11 {
          * 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( const OUString& ServiceName )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 
         /*
          * XClipboard
          */
 
-        virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override;
 
         virtual void SAL_CALL setContents(
             const css::uno::Reference< css::datatransfer::XTransferable >& xTrans,
-            const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-            throw(css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override;
 
-        virtual OUString SAL_CALL getName()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getName() override;
 
         /*
          * XClipboardEx
          */
 
-        virtual sal_Int8 SAL_CALL getRenderingCapabilities()
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int8 SAL_CALL getRenderingCapabilities() override;
 
         /*
          * XClipboardNotifier
          */
         virtual void SAL_CALL addClipboardListener(
-            const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-            throw(css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
         virtual void SAL_CALL removeClipboardListener(
-            const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-            throw(css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
         /*
          *  SelectionAdaptor
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
index 375bdea01538..3f923d4b0e95 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
@@ -42,17 +42,17 @@ DropTargetDropContext::~DropTargetDropContext()
 {
 }
 
-void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation ) throw(std::exception)
+void DropTargetDropContext::acceptDrop( sal_Int8 dragOperation )
 {
     m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp );
 }
 
-void DropTargetDropContext::rejectDrop() throw(std::exception)
+void DropTargetDropContext::rejectDrop()
 {
     m_rManager.reject( m_aDropWindow, m_nTimestamp );
 }
 
-void DropTargetDropContext::dropComplete( sal_Bool success ) throw(std::exception)
+void DropTargetDropContext::dropComplete( sal_Bool success )
 {
     m_rManager.dropComplete( success, m_aDropWindow, m_nTimestamp );
 }
@@ -76,12 +76,12 @@ DropTargetDragContext::~DropTargetDragContext()
 {
 }
 
-void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation ) throw(std::exception)
+void DropTargetDragContext::acceptDrag( sal_Int8 dragOperation )
 {
     m_rManager.accept( dragOperation, m_aDropWindow, m_nTimestamp );
 }
 
-void DropTargetDragContext::rejectDrag() throw(std::exception)
+void DropTargetDragContext::rejectDrag()
 {
     m_rManager.reject( m_aDropWindow, m_nTimestamp );
 }
@@ -105,21 +105,21 @@ DragSourceContext::~DragSourceContext()
 {
 }
 
-sal_Int32 DragSourceContext::getCurrentCursor() throw(std::exception)
+sal_Int32 DragSourceContext::getCurrentCursor()
 {
     return m_rManager.getCurrentCursor();
 }
 
-void DragSourceContext::setCursor( sal_Int32 cursorId ) throw(std::exception)
+void DragSourceContext::setCursor( sal_Int32 cursorId )
 {
     m_rManager.setCursor( cursorId, m_aDropWindow, m_nTimestamp );
 }
 
-void DragSourceContext::setImage( sal_Int32 ) throw(std::exception)
+void DragSourceContext::setImage( sal_Int32 )
 {
 }
 
-void DragSourceContext::transferablesFlavorsChanged() throw(std::exception)
+void DragSourceContext::transferablesFlavorsChanged()
 {
     m_rManager.transferablesFlavorsChanged();
 }
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index d4ff95a500d3..93b493daaf4c 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -44,9 +44,9 @@ namespace x11 {
         virtual ~DropTargetDropContext() override;
 
         // XDropTargetDropContext
-        virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) throw(std::exception) override;
-        virtual void SAL_CALL rejectDrop() throw(std::exception) override;
-        virtual void SAL_CALL dropComplete( sal_Bool success ) throw(std::exception) override;
+        virtual void SAL_CALL acceptDrop( sal_Int8 dragOperation ) override;
+        virtual void SAL_CALL rejectDrop() override;
+        virtual void SAL_CALL dropComplete( sal_Bool success ) override;
     };
 
     class DropTargetDragContext :
@@ -61,8 +61,8 @@ namespace x11 {
         virtual ~DropTargetDragContext() override;
 
         // XDropTargetDragContext
-        virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw(std::exception) override;
-        virtual void SAL_CALL rejectDrag() throw(std::exception) override;
+        virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) override;
+        virtual void SAL_CALL rejectDrag() override;
     };
 
     class DragSourceContext :
@@ -77,10 +77,10 @@ namespace x11 {
         virtual ~DragSourceContext() override;
 
         // XDragSourceContext
-        virtual sal_Int32   SAL_CALL getCurrentCursor() throw(std::exception) override;
-        virtual void        SAL_CALL setCursor( sal_Int32 cursorId ) throw(std::exception) override;
-        virtual void        SAL_CALL setImage( sal_Int32 imageId ) throw(std::exception) override;
-        virtual void        SAL_CALL transferablesFlavorsChanged() throw(std::exception) override;
+        virtual sal_Int32   SAL_CALL getCurrentCursor() override;
+        virtual void        SAL_CALL setCursor( sal_Int32 cursorId ) override;
+        virtual void        SAL_CALL setImage( sal_Int32 imageId ) override;
+        virtual void        SAL_CALL transferablesFlavorsChanged() override;
     };
 } // namespace
 
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index 3915d8e46762..3ed63ec7ef1b 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -45,7 +45,7 @@ DropTarget::~DropTarget()
         m_xSelectionManager->deregisterDropTarget( m_aTargetWindow );
 }
 
-void DropTarget::initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception )
+void DropTarget::initialize( const Sequence< Any >& arguments )
 {
     if( arguments.getLength() > 1 )
     {
@@ -72,38 +72,38 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( css::uno:
     }
 }
 
-void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception)
+void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
     m_aListeners.push_back( xListener );
 }
 
-void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw(std::exception)
+void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
     m_aListeners.remove( xListener );
 }
 
-sal_Bool DropTarget::isActive() throw(std::exception)
+sal_Bool DropTarget::isActive()
 {
     return m_bActive;
 }
 
-void DropTarget::setActive( sal_Bool active ) throw(std::exception)
+void DropTarget::setActive( sal_Bool active )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
     m_bActive = active;
 }
 
-sal_Int8 DropTarget::getDefaultActions() throw(std::exception)
+sal_Int8 DropTarget::getDefaultActions()
 {
     return m_nDefaultActions;
 }
 
-void DropTarget::setDefaultActions( sal_Int8 actions ) throw(std::exception)
+void DropTarget::setDefaultActions( sal_Int8 actions )
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
@@ -159,17 +159,17 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw()
 }
 
 // XServiceInfo
-OUString DropTarget::getImplementationName() throw(std::exception)
+OUString DropTarget::getImplementationName()
 {
     return OUString(XDND_DROPTARGET_IMPLEMENTATION_NAME);
 }
 
-sal_Bool DropTarget::supportsService( const OUString& ServiceName ) throw(std::exception)
+sal_Bool DropTarget::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > DropTarget::getSupportedServiceNames() throw(std::exception)
+Sequence< OUString > DropTarget::getSupportedServiceNames()
 {
     return Xdnd_dropTarget_getSupportedServiceNames();
 }
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 2f578f2dd611..af2cd43947ac 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -315,7 +315,7 @@ Cursor SelectionManager::createCursor( const unsigned char* pPointerData, const
     return aCursor;
 }
 
-void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (css::uno::Exception, std::exception)
+void SelectionManager::initialize( const Sequence< Any >& arguments )
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -2869,12 +2869,12 @@ void SelectionManager::reject( ::Window aDropWindow, Time )
  *  XDragSource
  */
 
-sal_Bool SelectionManager::isDragImageSupported() throw(std::exception)
+sal_Bool SelectionManager::isDragImageSupported()
 {
     return false;
 }
 
-sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception)
+sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction )
 {
     Cursor aCursor = m_aNoneCursor;
     if( dragAction & DNDConstants::ACTION_MOVE )
@@ -3118,7 +3118,7 @@ void SelectionManager::startDrag(
                                  sal_Int32,
                                  const css::uno::Reference< XTransferable >& transferable,
                                  const css::uno::Reference< XDragSourceListener >& listener
-                                 ) throw(std::exception)
+                                 )
 {
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "startDrag( sourceActions = %x )\n", (int)sourceActions );
@@ -3767,7 +3767,6 @@ void SelectionManager::shutdown() throw()
 }
 
 sal_Bool SelectionManager::handleEvent(const Any& event)
-    throw (css::uno::RuntimeException, std::exception)
 {
     Sequence< sal_Int8 > aSeq;
     if( (event >>= aSeq) )
@@ -3803,14 +3802,12 @@ sal_Bool SelectionManager::handleEvent(const Any& event)
 }
 
 void SAL_CALL SelectionManager::disposing( const css::lang::EventObject& rEvt )
-    throw( css::uno::RuntimeException, std::exception )
 {
     if (rEvt.Source == m_xDesktop || rEvt.Source == m_xDisplayConnection)
         shutdown();
 }
 
 void SAL_CALL SelectionManager::queryTermination( const css::lang::EventObject& )
-    throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception )
 {
 }
 
@@ -3820,7 +3817,6 @@ void SAL_CALL SelectionManager::queryTermination( const css::lang::EventObject&
  * has been called before vcl is shutdown
  */
 void SAL_CALL SelectionManager::notifyTermination( const css::lang::EventObject& rEvent )
-    throw( css::uno::RuntimeException, std::exception )
 {
     disposing(rEvent);
 }
@@ -3987,7 +3983,7 @@ SelectionManagerHolder::~SelectionManagerHolder()
 {
 }
 
-void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( css::uno::Exception, std::exception )
+void SelectionManagerHolder::initialize( const Sequence< Any >& arguments )
 {
     OUString aDisplayName;
 
@@ -4011,12 +4007,12 @@ void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) thro
  *  XDragSource
  */
 
-sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception)
+sal_Bool SelectionManagerHolder::isDragImageSupported()
 {
     return m_xRealDragSource.is() && m_xRealDragSource->isDragImageSupported();
 }
 
-sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw(std::exception)
+sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction )
 {
     return m_xRealDragSource.is() ? m_xRealDragSource->getDefaultCursor( dragAction ) : 0;
 }
@@ -4026,7 +4022,7 @@ void SelectionManagerHolder::startDrag(
                                        sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
                                        const css::uno::Reference< css::datatransfer::XTransferable >& transferable,
                                        const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener
-                                       ) throw(std::exception)
+                                       )
 {
     if( m_xRealDragSource.is() )
         m_xRealDragSource->startDrag( trigger, sourceActions, cursor, image, transferable, listener );
@@ -4036,17 +4032,17 @@ void SelectionManagerHolder::startDrag(
  *  XServiceInfo
  */
 
-OUString SelectionManagerHolder::getImplementationName() throw(std::exception)
+OUString SelectionManagerHolder::getImplementationName()
 {
     return OUString(XDND_IMPLEMENTATION_NAME);
 }
 
-sal_Bool SelectionManagerHolder::supportsService( const OUString& ServiceName ) throw(std::exception)
+sal_Bool SelectionManagerHolder::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > SelectionManagerHolder::getSupportedServiceNames() throw(std::exception)
+Sequence< OUString > SelectionManagerHolder::getSupportedServiceNames()
 {
     return Xdnd_getSupportedServiceNames();
 }
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index 24de1bc580a6..ef1449e8daf6 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -90,21 +90,21 @@ namespace x11 {
         void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw();
 
         // XInitialization
-        virtual void        SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& args ) throw ( css::uno::Exception, std::exception ) override;
+        virtual void        SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& args ) override;
 
         // XDropTarget
-        virtual void        SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override;
-        virtual void        SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) throw(std::exception) override;
-        virtual sal_Bool    SAL_CALL isActive() throw(std::exception) override;
-        virtual void        SAL_CALL setActive( sal_Bool active ) throw(std::exception) override;
-        virtual sal_Int8    SAL_CALL getDefaultActions() throw(std::exception) override;
-        virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) throw(std::exception) override;
+        virtual void        SAL_CALL addDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) override;
+        virtual void        SAL_CALL removeDropTargetListener( const css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >& ) override;
+        virtual sal_Bool    SAL_CALL isActive() override;
+        virtual void        SAL_CALL setActive( sal_Bool active ) override;
+        virtual sal_Int8    SAL_CALL getDefaultActions() override;
+        virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(std::exception) override;
-        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) override;
         virtual css::uno::Sequence< OUString >
-                            SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+                            SAL_CALL getSupportedServiceNames() override;
     };
 
     class SelectionManagerHolder :
@@ -122,23 +122,23 @@ namespace x11 {
         virtual ~SelectionManagerHolder() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw(std::exception) override;
-        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) throw(std::exception) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) override;
         virtual css::uno::Sequence< OUString >
-                            SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+                            SAL_CALL getSupportedServiceNames() override;
 
         // XInitialization
-        virtual void        SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& arguments ) throw( css::uno::Exception, std::exception ) override;
+        virtual void        SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& arguments ) override;
 
         // XDragSource
-        virtual sal_Bool    SAL_CALL isDragImageSupported() throw(std::exception) override;
-        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) override;
+        virtual sal_Bool    SAL_CALL isDragImageSupported() override;
+        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) override;
         virtual void        SAL_CALL startDrag(
             const css::datatransfer::dnd::DragGestureEvent& trigger,
             sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
             const css::uno::Reference< css::datatransfer::XTransferable >& transferable,
             const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener
-            ) throw(std::exception) override;
+            ) override;
 
     };
 
@@ -464,21 +464,20 @@ namespace x11 {
         void shutdown() throw();
 
         // XInitialization
-        virtual void        SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& arguments ) throw( css::uno::Exception, std::exception ) override;
+        virtual void        SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& arguments ) override;
 
         // XEventHandler
-        virtual sal_Bool    SAL_CALL handleEvent(const css::uno::Any& event)
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool    SAL_CALL handleEvent(const css::uno::Any& event) override;
 
         // XDragSource
-        virtual sal_Bool    SAL_CALL isDragImageSupported() throw(std::exception) override;
-        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) throw(std::exception) override;
+        virtual sal_Bool    SAL_CALL isDragImageSupported() override;
+        virtual sal_Int32   SAL_CALL getDefaultCursor( sal_Int8 dragAction ) override;
         virtual void        SAL_CALL startDrag(
             const css::datatransfer::dnd::DragGestureEvent& trigger,
             sal_Int8 sourceActions, sal_Int32 cursor, sal_Int32 image,
             const css::uno::Reference< css::datatransfer::XTransferable >& transferable,
             const css::uno::Reference< css::datatransfer::dnd::XDragSourceListener >& listener
-            ) throw(std::exception) override;
+            ) override;
 
         // SelectionAdaptor for XdndSelection Drag (we are drag source)
         virtual css::uno::Reference< css::datatransfer::XTransferable > getTransferable() throw() override;
@@ -487,13 +486,11 @@ namespace x11 {
         virtual css::uno::Reference< css::uno::XInterface > getReference() throw() 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;
     };
 
     css::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames();
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx
index 9e6714c2aa45..b042152c244d 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -44,7 +44,6 @@ X11Transferable::~X11Transferable()
 }
 
 Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor )
-    throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception)
 {
     Any aRet;
     Sequence< sal_Int8 > aData;
@@ -71,7 +70,6 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor )
 }
 
 Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors()
-    throw(RuntimeException, std::exception)
 {
     Sequence< DataFlavor > aFlavorList;
     bool bSuccess = m_rManager.getPasteDataTypes( m_aSelection ? m_aSelection : XA_PRIMARY, aFlavorList );
@@ -82,7 +80,6 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors()
 }
 
 sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor )
-    throw(RuntimeException, std::exception)
 {
     if( aFlavor.DataType != cppu::UnoType<Sequence< sal_Int8 >>::get() )
     {
diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx
index 7fa9b5509208..2ce30541a8d3 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.hxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.hxx
@@ -40,17 +40,11 @@ namespace x11 {
          * XTransferable
          */
 
-        virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
-            throw(css::datatransfer::UnsupportedFlavorException,
-                  css::io::IOException,
-                  css::uno::RuntimeException, std::exception
-                  ) override;
+        virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
 
-        virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) override;
 
-        virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
-            throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
     };
 
 } // namespace
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 3dc2fea35c72..faadc4091ba4 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -45,7 +45,7 @@ getAsConst( const OString& rString )
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleAction>
-        getAction( AtkAction *action ) throw (uno::RuntimeException)
+        getAction( AtkAction *action )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( action );
 
diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx
index 84ab86b0c87a..54e664b5ae39 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star;
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleComponent>
-    getComponent( AtkComponent *pComponent ) throw (uno::RuntimeException)
+    getComponent( AtkComponent *pComponent )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pComponent );
     if (pWrap)
diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index d7dda03a5321..070ee28ffa74 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star;
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleEditableText>
-    getEditableText( AtkEditableText *pEditableText ) throw (uno::RuntimeException)
+    getEditableText( AtkEditableText *pEditableText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pEditableText );
     if (pWrap)
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index 4a10b3c82733..356262feb4cb 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -191,7 +191,7 @@ hyper_link_get_type()
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleHypertext>
-    getHypertext( AtkHypertext *pHypertext ) throw (uno::RuntimeException)
+    getHypertext( AtkHypertext *pHypertext )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pHypertext );
     if (pWrap)
diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index 88897210fb2a..404871f1d3a9 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.cxx
@@ -37,7 +37,7 @@ getAsConst( const OUString& rString )
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleImage>
-    getImage( AtkImage *pImage ) throw (uno::RuntimeException)
+    getImage( AtkImage *pImage )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pImage );
     if (pWrap)
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index 2901bcb73ecf..48dc6e83a895 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -93,7 +93,7 @@ extern "C" {
 }
 
 // XEventListener implementation
-void AtkListener::disposing( const lang::EventObject& ) throw (uno::RuntimeException, std::exception)
+void AtkListener::disposing( const lang::EventObject& )
 {
     if( mpWrapper )
     {
@@ -420,7 +420,7 @@ void printNotifyEvent( const accessibility::AccessibleEventObject& rEvent )
 
 #endif
 
-void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent )
 {
     if( !mpWrapper )
         return;
diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index fccf03181c37..39d5075c8822 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.hxx
@@ -33,12 +33,10 @@ public:
     explicit AtkListener(AtkObjectWrapper * pWrapper);
 
     // XEventListener
-    virtual void disposing( const css::lang::EventObject& Source )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void disposing( const css::lang::EventObject& Source ) override;
 
     // XAccessibleEventListener
-    virtual void notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
 private:
 
diff --git a/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx
index 39bf065cbb37..b6d2a711fa66 100644
--- a/vcl/unx/gtk/a11y/atkselection.cxx
+++ b/vcl/unx/gtk/a11y/atkselection.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star;
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleSelection>
-    getSelection( AtkSelection *pSelection ) throw (uno::RuntimeException)
+    getSelection( AtkSelection *pSelection )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pSelection );
     if (pWrap)
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index 26fdef1659b2..a39110a61b16 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.cxx
@@ -50,7 +50,7 @@ getAsConst( const OUString& rString )
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleTable>
-    getTable( AtkTable *pTable ) throw (uno::RuntimeException)
+    getTable( AtkTable *pTable )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pTable );
     if (pWrap)
diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index b08edd1fa18f..6dc3ca3692d8 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.cxx
@@ -135,7 +135,7 @@ adjust_boundaries( css::uno::Reference<css::accessibility::XAccessibleText> cons
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleText>
-    getText( AtkText *pText ) throw (uno::RuntimeException)
+    getText( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
     if (pWrap)
@@ -152,7 +152,7 @@ static css::uno::Reference<css::accessibility::XAccessibleText>
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleTextMarkup>
-    getTextMarkup( AtkText *pText ) throw (uno::RuntimeException)
+    getTextMarkup( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
     if (pWrap)
@@ -169,7 +169,7 @@ static css::uno::Reference<css::accessibility::XAccessibleTextMarkup>
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleTextAttributes>
-    getTextAttributes( AtkText *pText ) throw (uno::RuntimeException)
+    getTextAttributes( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
     if (pWrap)
@@ -186,7 +186,7 @@ static css::uno::Reference<css::accessibility::XAccessibleTextAttributes>
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleMultiLineText>
-    getMultiLineText( AtkText *pText ) throw (uno::RuntimeException)
+    getMultiLineText( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
     if (pWrap)
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 4fa1afb42266..75971173f978 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -209,7 +209,7 @@ String2Float( uno::Any& rAny, const gchar * value )
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleComponent>
-    getComponent( AtkText *pText ) throw (uno::RuntimeException)
+    getComponent( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
     if (pWrap)
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index da165245be0b..c386e8b89899 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -143,14 +143,14 @@ public:
     /// @throws uno::RuntimeException
     void attachRecursive(
         const uno::Reference< accessibility::XAccessible >& xAccessible
-    ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException);
+    );
 
     /// @trhows lang::IndexOutOfBoundsException
     /// @throws uno::RuntimeException
     void attachRecursive(
         const uno::Reference< accessibility::XAccessible >& xAccessible,
         const uno::Reference< accessibility::XAccessibleContext >& xContext
-    ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException);
+    );
 
     /// @trhows lang::IndexOutOfBoundsException
     /// @throws uno::RuntimeException
@@ -158,20 +158,20 @@ public:
         const uno::Reference< accessibility::XAccessible >& xAccessible,
         const uno::Reference< accessibility::XAccessibleContext >& xContext,
         const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet
-    ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException);
+    );
 
     /// @trhows lang::IndexOutOfBoundsException
     /// @throws uno::RuntimeException
     void detachRecursive(
         const uno::Reference< accessibility::XAccessible >& xAccessible
-    ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException);
+    );
 
     /// @trhows lang::IndexOutOfBoundsException
     /// @throws uno::RuntimeException
     void detachRecursive(
         const uno::Reference< accessibility::XAccessible >& xAccessible,
         const uno::Reference< accessibility::XAccessibleContext >& xContext
-    ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException);
+    );
 
     /// @trhows lang::IndexOutOfBoundsException
     /// @throws uno::RuntimeException
@@ -179,24 +179,22 @@ public:
         const uno::Reference< accessibility::XAccessible >& xAccessible,
         const uno::Reference< accessibility::XAccessibleContext >& xContext,
         const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet
-    ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException);
+    );
 
     /// @trhows lang::IndexOutOfBoundsException
     /// @throws uno::RuntimeException
-    static uno::Reference< accessibility::XAccessible > getAccessible(const lang::EventObject& aEvent )
-        throw (lang::IndexOutOfBoundsException, uno::RuntimeException);
+    static uno::Reference< accessibility::XAccessible > getAccessible(const lang::EventObject& aEvent );
 
     // XEventListener
-    virtual void disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override;
+    virtual void disposing( const lang::EventObject& Source ) override;
 
     // XAccessibleEventListener
-    virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override;
+    virtual void notifyEvent( const accessibility::AccessibleEventObject& aEvent ) override;
 };
 
 /*****************************************************************************/
 
 void DocumentFocusListener::disposing( const lang::EventObject& aEvent )
-    throw (uno::RuntimeException, std::exception)
 {
 
     // Unref the object here, but do not remove as listener since the object
@@ -209,7 +207,6 @@ void DocumentFocusListener::disposing( const lang::EventObject& aEvent )
 /*****************************************************************************/
 
 void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObject& aEvent )
-    throw( uno::RuntimeException, std::exception )
 {
     try {
         switch( aEvent.EventId )
@@ -254,7 +251,6 @@ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObj
 /*****************************************************************************/
 
 uno::Reference< accessibility::XAccessible > DocumentFocusListener::getAccessible(const lang::EventObject& aEvent )
-    throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
     uno::Reference< accessibility::XAccessible > xAccessible(aEvent.Source, uno::UNO_QUERY);
 
@@ -283,7 +279,7 @@ uno::Reference< accessibility::XAccessible > DocumentFocusListener::getAccessibl
 
 void DocumentFocusListener::attachRecursive(
     const uno::Reference< accessibility::XAccessible >& xAccessible
-) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+)
 {
     uno::Reference< accessibility::XAccessibleContext > xContext =
         xAccessible->getAccessibleContext();
@@ -297,7 +293,7 @@ void DocumentFocusListener::attachRecursive(
 void DocumentFocusListener::attachRecursive(
     const uno::Reference< accessibility::XAccessible >& xAccessible,
     const uno::Reference< accessibility::XAccessibleContext >& xContext
-)  throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+)
 {
     uno::Reference< accessibility::XAccessibleStateSet > xStateSet =
         xContext->getAccessibleStateSet();
@@ -312,7 +308,7 @@ void DocumentFocusListener::attachRecursive(
     const uno::Reference< accessibility::XAccessible >& xAccessible,
     const uno::Reference< accessibility::XAccessibleContext >& xContext,
     const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet
-) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+)
 {
     if( xStateSet->contains(accessibility::AccessibleStateType::FOCUSED ) )
         atk_wrapper_focus_tracker_notify_when_idle( xAccessible );
@@ -347,7 +343,7 @@ void DocumentFocusListener::attachRecursive(
 
 void DocumentFocusListener::detachRecursive(
     const uno::Reference< accessibility::XAccessible >& xAccessible
-) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+)
 {
     uno::Reference< accessibility::XAccessibleContext > xContext =
         xAccessible->getAccessibleContext();
@@ -361,7 +357,7 @@ void DocumentFocusListener::detachRecursive(
 void DocumentFocusListener::detachRecursive(
     const uno::Reference< accessibility::XAccessible >& xAccessible,
     const uno::Reference< accessibility::XAccessibleContext >& xContext
-)  throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+)
 {
     uno::Reference< accessibility::XAccessibleStateSet > xStateSet =
         xContext->getAccessibleStateSet();
@@ -376,7 +372,7 @@ void DocumentFocusListener::detachRecursive(
     const uno::Reference< accessibility::XAccessible >&,
     const uno::Reference< accessibility::XAccessibleContext >& xContext,
     const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet
-) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+)
 {
     uno::Reference< accessibility::XAccessibleEventBroadcaster > xBroadcaster =
         uno::Reference< accessibility::XAccessibleEventBroadcaster >(xContext, uno::UNO_QUERY);
diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx
index 067333af5916..6c80e37b2969 100644
--- a/vcl/unx/gtk/a11y/atkvalue.cxx
+++ b/vcl/unx/gtk/a11y/atkvalue.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star;
 
 /// @throws uno::RuntimeException
 static css::uno::Reference<css::accessibility::XAccessibleValue>
-    getValue( AtkValue *pValue ) throw (uno::RuntimeException)
+    getValue( AtkValue *pValue )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pValue );
     if (pWrap)
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index b31cc783c8d5..541f640484d2 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -281,7 +281,6 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
 // XFilePickerNotifier
 
 void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -291,7 +290,6 @@ void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFil
 }
 
 void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -525,7 +523,6 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter
 }
 
 void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter )
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -542,7 +539,6 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt
 }
 
 void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle )
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -601,7 +597,7 @@ void SalGtkFilePicker::UpdateFilterfromUI()
     }
 }
 
-OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SalGtkFilePicker::getCurrentFilter()
 {
     SolarMutexGuard g;
 
@@ -615,7 +611,6 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept
 // XFilterGroupManager functions
 
 void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters )
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -644,7 +639,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle
 
 // XFilePicker functions
 
-void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode )
 {
     SolarMutexGuard g;
 
@@ -654,7 +649,6 @@ void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( u
 }
 
 void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -669,21 +663,20 @@ void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName )
 }
 
 void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const OUString& rDirectory )
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
     implsetDisplayDirectory(rDirectory);
 }
 
-OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory()
 {
     SolarMutexGuard g;
 
     return implgetDisplayDirectory();
 }
 
-uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException, std::exception )
+uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles()
 {
     // no member access => no mutex needed
 
@@ -716,7 +709,7 @@ bool lcl_matchFilter( const rtl::OUString& rFilter, const rtl::OUString& rExt )
 
 }
 
-uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException, std::exception )
+uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles()
 {
     SolarMutexGuard g;
 
@@ -863,14 +856,14 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
 
 // XExecutableDialog functions
 
-void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle )
 {
     SolarMutexGuard g;
 
     implsetTitle(rTitle);
 }
 
-sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std::exception )
+sal_Int16 SAL_CALL SalGtkFilePicker::execute()
 {
     SolarMutexGuard g;
 
@@ -1235,7 +1228,6 @@ uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nC
 }
 
 void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1261,7 +1253,6 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr
 }
 
 uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1285,7 +1276,6 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC
 }
 
 void SAL_CALL SalGtkFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1309,7 +1299,6 @@ throw( uno::RuntimeException, std::exception )
 }
 
 void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1346,7 +1335,6 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
 }
 
 OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1368,7 +1356,7 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
 
 // XFilePreview functions
 
-uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException, std::exception )
+uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats()
 {
     SolarMutexGuard g;
 
@@ -1378,7 +1366,7 @@ uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() t
     return uno::Sequence<sal_Int16>();
 }
 
-sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth()
 {
     SolarMutexGuard g;
 
@@ -1388,7 +1376,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getTargetColorDepth() throw( uno::RuntimeEx
     return 0;
 }
 
-sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth()
 {
     SolarMutexGuard g;
 
@@ -1397,7 +1385,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableWidth() throw( uno::RuntimeExce
     return m_PreviewImageWidth;
 }
 
-sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeException, std::exception )
+sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight()
 {
     SolarMutexGuard g;
 
@@ -1407,7 +1395,6 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeExc
 }
 
 void SAL_CALL SalGtkFilePicker::setImage( sal_Int16 /*aImageFormat*/, const uno::Any& /*aImage*/ )
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -1507,7 +1494,7 @@ void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, SalGtkFi
         g_free( filename );
 }
 
-sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState )
 {
     SolarMutexGuard g;
 
@@ -1541,7 +1528,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( u
     return true;
 }
 
-sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SalGtkFilePicker::getShowState()
 {
     SolarMutexGuard g;
 
@@ -1553,7 +1540,6 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException,
 // XInitialization
 
 void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments )
-    throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     // parameter checking
     uno::Any aAny;
@@ -1721,7 +1707,7 @@ void SalGtkFilePicker::preview_toggled_cb( GObject *cb, SalGtkFilePicker* pobjFP
 
 // XCancellable
 
-void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exception )
+void SAL_CALL SalGtkFilePicker::cancel()
 {
     SolarMutexGuard g;
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index 948ff38b6094..03ee6f5e7346 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -59,107 +59,78 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
 
         // XFilePickerNotifier
 
-        virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
-        virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
+        virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
 
         // XExecutableDialog functions
 
-        virtual void SAL_CALL setTitle( const OUString& aTitle )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-        virtual sal_Int16 SAL_CALL execute()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int16 SAL_CALL execute() override;
 
         // XFilePicker functions
 
-        virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override;
 
-        virtual void SAL_CALL setDefaultName( const OUString& aName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setDefaultName( const OUString& aName ) override;
 
-        virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-            throw( css::lang::IllegalArgumentException,
-                css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
 
-        virtual OUString SAL_CALL getDisplayDirectory(  )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  ) override;
 
         // XFilePicker2 functions
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
-                throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() override;
 
         // XFilterManager functions
 
-        virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-            throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) override;
 
-        virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-            throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) override;
 
-        virtual OUString SAL_CALL getCurrentFilter(  )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getCurrentFilter(  ) override;
 
         // XFilterGroupManager functions
 
-        virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
-                throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) override;
 
         // XFilePickerControlAccess functions
 
-        virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& aValue )
-                throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& aValue ) override;
 
-        virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-                throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) override;
 
-        virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-            throw(css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) override;
 
-        virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) override;
 
-        virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) override;
 
         // XFilePreview
 
-        virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  ) override;
 
-        virtual sal_Int32 SAL_CALL getTargetColorDepth(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getTargetColorDepth(  ) override;
 
-        virtual sal_Int32 SAL_CALL getAvailableWidth(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAvailableWidth(  ) override;
 
-        virtual sal_Int32 SAL_CALL getAvailableHeight(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int32 SAL_CALL getAvailableHeight(  ) override;
 
-        virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) override;
 
-        virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) override;
 
-        virtual sal_Bool SAL_CALL getShowState(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getShowState(  ) override;
 
         // XInitialization
 
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XCancellable
 
-        virtual void SAL_CALL cancel( )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL cancel( ) override;
 
         // FilePicker Event functions
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index cedbd5a20f1d..0b7549a0ee55 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -63,7 +63,6 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon
 }
 
 void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirectory )
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -83,7 +82,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirector
         aTxt.getStr() );
 }
 
-OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory()
 {
     SolarMutexGuard g;
 
@@ -97,7 +96,7 @@ OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeE
     return aCurrentFolderName;
 }
 
-OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SalGtkFolderPicker::getDirectory()
 {
     SolarMutexGuard g;
 
@@ -112,13 +111,12 @@ OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeExceptio
 }
 
 void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription*/ )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
 // XExecutableDialog functions
 
-void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle )
 {
     SolarMutexGuard g;
 
@@ -129,7 +127,7 @@ void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno:
     gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() );
 }
 
-sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, std::exception )
+sal_Int16 SAL_CALL SalGtkFolderPicker::execute()
 {
     SolarMutexGuard g;
 
@@ -168,7 +166,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s
 
 // XCancellable
 
-void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException, std::exception )
+void SAL_CALL SalGtkFolderPicker::cancel()
 {
     SolarMutexGuard g;
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index 9e2955796c8e..e7e27b17c0cc 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -38,30 +38,23 @@ class SalGtkFolderPicker :
 
         // XExecutableDialog functions
 
-        virtual void SAL_CALL setTitle( const OUString& aTitle )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
 
-        virtual sal_Int16 SAL_CALL execute(  )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual sal_Int16 SAL_CALL execute(  ) override;
 
         // XFolderPicker functions
 
-        virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory )
-            throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) override;
 
-        virtual OUString SAL_CALL getDisplayDirectory(  )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getDisplayDirectory(  ) override;
 
-        virtual OUString SAL_CALL getDirectory( )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual OUString SAL_CALL getDirectory( ) override;
 
-        virtual void SAL_CALL setDescription( const OUString& rDescription )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL setDescription( const OUString& rDescription ) override;
 
         // XCancellable
 
-        virtual void SAL_CALL cancel( )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL cancel( ) override;
 
     private:
         SalGtkFolderPicker( const SalGtkFolderPicker& ) = delete;
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index c710bb0ea9d6..060cf23abab1 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -134,7 +134,6 @@ RunDialog::~RunDialog()
 }
 
 void SAL_CALL RunDialog::windowOpened(const css::lang::EventObject& e)
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -154,12 +153,10 @@ void SAL_CALL RunDialog::windowOpened(const css::lang::EventObject& e)
 }
 
 void SAL_CALL RunDialog::queryTermination( const css::lang::EventObject& )
-        throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL RunDialog::notifyTermination( const css::lang::EventObject& )
-        throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -201,7 +198,6 @@ SalGtkPicker::~SalGtkPicker()
 }
 
 void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory )
-    throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     OSL_ASSERT( m_pDialog != nullptr );
 
@@ -219,7 +215,7 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory
         aTxt.getStr() );
 }
 
-OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory()
 {
     OSL_ASSERT( m_pDialog != nullptr );
 
@@ -231,7 +227,7 @@ OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeExc
     return aCurrentFolderName;
 }
 
-void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle )
 {
     OSL_ASSERT( m_pDialog != nullptr );
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index 74c46af9c995..b5bca9f75da2 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -50,17 +50,14 @@ class SalGtkPicker
         GtkWidget  *m_pDialog;
     protected:
         /// @throws css::uno::RuntimeException
-        void SAL_CALL implsetTitle( const OUString& aTitle )
-            throw( css::uno::RuntimeException );
+        void SAL_CALL implsetTitle( const OUString& aTitle );
 
         /// @throws css::lang::IllegalArgumentException
         /// @throws css::uno::RuntimeException
-        void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory )
-            throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
+        void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory );
 
         /// @throws css::uno::RuntimeException
-        OUString SAL_CALL implgetDisplayDirectory(  )
-            throw( css::uno::RuntimeException );
+        OUString SAL_CALL implgetDisplayDirectory(  );
         OUString uritounicode(const gchar *pIn);
         OString unicodetouri(const OUString &rURL);
 
@@ -88,28 +85,18 @@ public:
 
     // XTopWindowListener
     using cppu::WeakComponentImplHelperBase::disposing;
-    virtual void SAL_CALL disposing( const css::lang::EventObject& )
-        throw(css::uno::RuntimeException, std::exception) override {}
-    virtual void SAL_CALL windowOpened( const css::lang::EventObject& e )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL windowClosing( const css::lang::EventObject& )
-        throw (css::uno::RuntimeException, std::exception) override {}
-    virtual void SAL_CALL windowClosed( const css::lang::EventObject& )
-        throw (css::uno::RuntimeException, std::exception) override {}
-    virtual void SAL_CALL windowMinimized( const css::lang::EventObject& )
-        throw (css::uno::RuntimeException, std::exception) override {}
-    virtual void SAL_CALL windowNormalized( const css::lang::EventObject& )
-        throw (css::uno::RuntimeException, std::exception) override {}
-    virtual void SAL_CALL windowActivated( const css::lang::EventObject& )
-        throw (css::uno::RuntimeException, std::exception) override {}
-    virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& )
-        throw (css::uno::RuntimeException, std::exception) override {}
+    virtual void SAL_CALL disposing( const css::lang::EventObject& ) override {}
+    virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowClosing( const css::lang::EventObject& ) override {}
+    virtual void SAL_CALL windowClosed( const css::lang::EventObject& ) override {}
+    virtual void SAL_CALL windowMinimized( const css::lang::EventObject& ) override {}
+    virtual void SAL_CALL windowNormalized( const css::lang::EventObject& ) override {}
+    virtual void SAL_CALL windowActivated( const css::lang::EventObject& ) override {}
+    virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& ) 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;
 public:
     RunDialog(GtkWidget *pDialog,
         css::uno::Reference< css::awt::XExtendedToolkit > &rToolkit
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index d3a0310245f7..cbd746c213e6 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3268,17 +3268,17 @@ public:
     }
 
     // XDropTargetDropContext
-    virtual void SAL_CALL acceptDrop(sal_Int8 dragOperation) throw(std::exception) override
+    virtual void SAL_CALL acceptDrop(sal_Int8 dragOperation) override
     {
         gdk_drag_status(m_pContext, getPreferredDragAction(dragOperation), m_nTime);
     }
 
-    virtual void SAL_CALL rejectDrop() throw(std::exception) override
+    virtual void SAL_CALL rejectDrop() override
     {
         gdk_drag_status(m_pContext, static_cast<GdkDragAction>(0), m_nTime);
     }
 
-    virtual void SAL_CALL dropComplete(sal_Bool bSuccess) throw(std::exception) override
+    virtual void SAL_CALL dropComplete(sal_Bool bSuccess) override
     {
         gtk_drag_finish(m_pContext, bSuccess, false, m_nTime);
     }
@@ -3303,10 +3303,7 @@ public:
     {
     }
 
-    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor)
-        throw(css::datatransfer::UnsupportedFlavorException,
-              css::io::IOException,
-              css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) override
     {
         css::datatransfer::DataFlavor aFlavor(rFlavor);
         if (aFlavor.MimeType == "text/plain;charset=utf-16")
@@ -3421,12 +3418,12 @@ public:
     {
     }
 
-    virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) throw(std::exception) override
+    virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) override
     {
         gdk_drag_status(m_pContext, getPreferredDragAction(dragOperation), m_nTime);
     }
 
-    virtual void SAL_CALL rejectDrag() throw(std::exception) override
+    virtual void SAL_CALL rejectDrag() override
     {
         gdk_drag_status(m_pContext, static_cast<GdkDragAction>(0), m_nTime);
     }
@@ -4118,7 +4115,7 @@ sal_uIntPtr GtkSalFrame::GetNativeWindowHandle()
 void GtkDragSource::startDrag(const datatransfer::dnd::DragGestureEvent& rEvent,
                               sal_Int8 sourceActions, sal_Int32 /*cursor*/, sal_Int32 /*image*/,
                               const css::uno::Reference<css::datatransfer::XTransferable>& rTrans,
-                              const css::uno::Reference<css::datatransfer::dnd::XDragSourceListener>& rListener) throw(std::exception)
+                              const css::uno::Reference<css::datatransfer::dnd::XDragSourceListener>& rListener)
 {
     m_xListener = rListener;
     m_xTrans = rTrans;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8ebca1c08713..9e5c9c9224dc 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -159,13 +159,11 @@ std::vector<css::datatransfer::DataFlavor> GtkTransferable::getTransferDataFlavo
 
 
 css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL GtkTransferable::getTransferDataFlavors()
-        throw(css::uno::RuntimeException, std::exception)
 {
     return comphelper::containerToSequence(getTransferDataFlavorsAsVector());
 }
 
 sal_Bool SAL_CALL GtkTransferable::isDataFlavorSupported(const css::datatransfer::DataFlavor& rFlavor)
-        throw(css::uno::RuntimeException, std::exception)
 {
     const std::vector<css::datatransfer::DataFlavor> aAll =
         getTransferDataFlavorsAsVector();
@@ -188,11 +186,7 @@ public:
      * XTransferable
      */
 
-    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor)
-        throw(css::datatransfer::UnsupportedFlavorException,
-              css::io::IOException,
-              css::uno::RuntimeException, std::exception
-              ) override
+    virtual css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& rFlavor) override
     {
         GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
         if (rFlavor.MimeType == "text/plain;charset=utf-16")
@@ -270,71 +264,64 @@ public:
      * XServiceInfo
      */
 
-    virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     /*
      * XClipboard
      */
 
-    virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents()
-        throw(RuntimeException, std::exception) override;
+    virtual Reference< css::datatransfer::XTransferable > SAL_CALL getContents() override;
 
     virtual void SAL_CALL setContents(
         const Reference< css::datatransfer::XTransferable >& xTrans,
-        const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-        throw(RuntimeException, std::exception) override;
+        const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ) override;
 
-    virtual OUString SAL_CALL getName()
-        throw(RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() override;
 
     /*
      * XClipboardEx
      */
 
-    virtual sal_Int8 SAL_CALL getRenderingCapabilities()
-        throw(RuntimeException, std::exception) override;
+    virtual sal_Int8 SAL_CALL getRenderingCapabilities() override;
 
     /*
      * XFlushableClipboard
      */
-    virtual void SAL_CALL flushClipboard()
-        throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL flushClipboard() override;
 
     /*
      * XClipboardNotifier
      */
     virtual void SAL_CALL addClipboardListener(
-        const Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-        throw(RuntimeException, std::exception) override;
+        const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
     virtual void SAL_CALL removeClipboardListener(
-        const Reference< css::datatransfer::clipboard::XClipboardListener >& listener )
-        throw(RuntimeException, std::exception) override;
+        const Reference< css::datatransfer::clipboard::XClipboardListener >& listener ) override;
 
     void ClipboardGet(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info);
     void ClipboardClear(GtkClipboard *clipboard);
     void OwnerPossiblyChanged(GtkClipboard *clipboard, GdkEvent *event);
 };
 
-OUString VclGtkClipboard::getImplementationName() throw( RuntimeException, std::exception )
+OUString VclGtkClipboard::getImplementationName()
 {
     return OUString("com.sun.star.datatransfer.VclGtkClipboard");
 }
 
-Sequence< OUString > VclGtkClipboard::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString > VclGtkClipboard::getSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.datatransfer.clipboard.SystemClipboard" };
     return aRet;
 }
 
-sal_Bool VclGtkClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception )
+sal_Bool VclGtkClipboard::supportsService( const OUString& ServiceName )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Reference< css::datatransfer::XTransferable > VclGtkClipboard::getContents() throw( RuntimeException, std::exception )
+Reference< css::datatransfer::XTransferable > VclGtkClipboard::getContents()
 {
     if (!m_aContents.is())
     {
@@ -536,7 +523,6 @@ VclGtkClipboard::VclGtkClipboard(GdkAtom nSelection)
 }
 
 void VclGtkClipboard::flushClipboard()
-  throw (RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -603,7 +589,6 @@ std::vector<GtkTargetEntry> VclToGtkHelper::FormatsToGtk(const css::uno::Sequenc
 void VclGtkClipboard::setContents(
         const Reference< css::datatransfer::XTransferable >& xTrans,
         const Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
-    throw(RuntimeException, std::exception)
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
     Reference< datatransfer::clipboard::XClipboardOwner > xOldOwner( m_aOwner );
@@ -655,18 +640,17 @@ void VclGtkClipboard::setContents(
     }
 }
 
-OUString VclGtkClipboard::getName() throw( RuntimeException, std::exception )
+OUString VclGtkClipboard::getName()
 {
     return (m_nSelection == GDK_SELECTION_CLIPBOARD) ? OUString("CLIPBOARD") : OUString("PRIMARY");
 }
 
-sal_Int8 VclGtkClipboard::getRenderingCapabilities() throw( RuntimeException, std::exception )
+sal_Int8 VclGtkClipboard::getRenderingCapabilities()
 {
     return 0;
 }
 
 void VclGtkClipboard::addClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener )
-    throw( RuntimeException, std::exception )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -674,7 +658,6 @@ void VclGtkClipboard::addClipboardListener( const Reference< datatransfer::clipb
 }
 
 void VclGtkClipboard::removeClipboardListener( const Reference< datatransfer::clipboard::XClipboardListener >& listener )
-    throw( RuntimeException, std::exception )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -713,19 +696,16 @@ GtkDropTarget::GtkDropTarget()
 }
 
 OUString SAL_CALL GtkDropTarget::getImplementationName()
-            throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.datatransfer.dnd.VclGtkDropTarget");
 }
 
 sal_Bool SAL_CALL GtkDropTarget::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> SAL_CALL GtkDropTarget::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     Sequence<OUString> aRet { "com.sun.star.datatransfer.dnd.GtkDropTarget" };
     return aRet;
@@ -743,7 +723,7 @@ void GtkDropTarget::deinitialize()
     m_bActive = false;
 }
 
-void GtkDropTarget::initialize(const Sequence<Any>& rArguments) throw( Exception, std::exception )
+void GtkDropTarget::initialize(const Sequence<Any>& rArguments)
 {
     if (rArguments.getLength() < 2)
     {
@@ -765,14 +745,14 @@ void GtkDropTarget::initialize(const Sequence<Any>& rArguments) throw( Exception
     m_bActive = true;
 }
 
-void GtkDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& xListener) throw(std::exception)
+void GtkDropTarget::addDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& xListener)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
     m_aListeners.push_back( xListener );
 }
 
-void GtkDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& xListener) throw(std::exception)
+void GtkDropTarget::removeDropTargetListener( const Reference< css::datatransfer::dnd::XDropTargetListener >& xListener)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
 
@@ -827,22 +807,22 @@ void GtkDropTarget::fire_dragExit(const css::datatransfer::dnd::DropTargetEvent&
     }
 }
 
-sal_Bool GtkDropTarget::isActive() throw(std::exception)
+sal_Bool GtkDropTarget::isActive()
 {
     return m_bActive;
 }
 
-void GtkDropTarget::setActive(sal_Bool bActive) throw(std::exception)
+void GtkDropTarget::setActive(sal_Bool bActive)
 {
     m_bActive = bActive;
 }
 
-sal_Int8 GtkDropTarget::getDefaultActions() throw(std::exception)
+sal_Int8 GtkDropTarget::getDefaultActions()
 {
     return m_nDefaultActions;
 }
 
-void GtkDropTarget::setDefaultActions(sal_Int8 nDefaultActions) throw(std::exception)
+void GtkDropTarget::setDefaultActions(sal_Int8 nDefaultActions)
 {
     m_nDefaultActions = nDefaultActions;
 }
@@ -869,17 +849,17 @@ void GtkDragSource::deinitialize()
     m_pFrame = nullptr;
 }
 
-sal_Bool GtkDragSource::isDragImageSupported() throw(std::exception)
+sal_Bool GtkDragSource::isDragImageSupported()
 {
     return true;
 }
 
-sal_Int32 GtkDragSource::getDefaultCursor( sal_Int8 ) throw(std::exception)
+sal_Int32 GtkDragSource::getDefaultCursor( sal_Int8 )
 {
     return 0;
 }
 
-void GtkDragSource::initialize(const css::uno::Sequence<css::uno::Any >& rArguments) throw(Exception, std::exception)
+void GtkDragSource::initialize(const css::uno::Sequence<css::uno::Any >& rArguments)
 {
     if (rArguments.getLength() < 2)
     {
@@ -901,19 +881,16 @@ void GtkDragSource::initialize(const css::uno::Sequence<css::uno::Any >& rArgume
 }
 
 OUString SAL_CALL GtkDragSource::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("com.sun.star.datatransfer.dnd.VclGtkDragSource");
 }
 
 sal_Bool SAL_CALL GtkDragSource::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString> SAL_CALL GtkDragSource::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     Sequence<OUString> aRet { "com.sun.star.datatransfer.dnd.GtkDragSource" };
     return aRet;
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 567648a90833..4576076dcaf8 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -208,21 +208,18 @@ void KDE4FilePicker::cleanupProxy()
 }
 
 void SAL_CALL KDE4FilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     m_xListener = xListener;
 }
 
 void SAL_CALL KDE4FilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& )
-    throw( uno::RuntimeException, std::exception )
 {
     SolarMutexGuard aGuard;
     m_xListener.clear();
 }
 
 void SAL_CALL KDE4FilePicker::setTitle( const OUString &title )
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser aReleaser;
@@ -233,7 +230,6 @@ void SAL_CALL KDE4FilePicker::setTitle( const OUString &title )
 }
 
 sal_Int16 SAL_CALL KDE4FilePicker::execute()
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser aReleaser;
@@ -270,7 +266,6 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
 }
 
 void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect )
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -294,7 +289,6 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect )
 }
 
 void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name )
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -306,7 +300,6 @@ void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name )
 }
 
 void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir )
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -318,7 +311,6 @@ void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir )
 }
 
 OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -330,7 +322,6 @@ OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
 }
 
 uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles()
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -343,7 +334,6 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles()
 }
 
 uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles()
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -358,7 +348,6 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles()
 }
 
 void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUString &filter )
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -385,7 +374,6 @@ void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUStrin
 }
 
 void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -396,7 +384,6 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
 }
 
 OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -417,7 +404,6 @@ OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
 }
 
 void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& rGroupTitle, const uno::Sequence<beans::StringPair>& filters)
-    throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -433,7 +419,6 @@ void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& rGroupTitle, co
 }
 
 void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16 nControlAction, const uno::Any &value )
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -450,7 +435,6 @@ void SAL_CALL KDE4FilePicker::setValue( sal_Int16 controlId, sal_Int16 nControlA
 }
 
 uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nControlAction )
-    throw( uno::RuntimeException, std::exception )
 {
     if (CHECKBOX_AUTOEXTENSION == controlId)
         // We ignore this one and rely on KFileDialog to provide the function.
@@ -478,7 +462,6 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 nCont
 }
 
 void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enable )
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -492,7 +475,6 @@ void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enabl
 }
 
 void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &label )
-    throw( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -509,7 +491,6 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &lab
 }
 
 OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
-    throw ( uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -631,7 +612,6 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
 }
 
 void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
-    throw( uno::Exception, uno::RuntimeException, std::exception )
 {
     if( qApp->thread() != QThread::currentThread() ) {
         SalYieldMutexReleaser rel;
@@ -762,13 +742,11 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
 }
 
 void SAL_CALL KDE4FilePicker::cancel()
-    throw ( uno::RuntimeException, std::exception )
 {
 
 }
 
 void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent )
-    throw( uno::RuntimeException )
 {
     uno::Reference<XFilePickerListener> xFilePickerListener( rEvent.Source, uno::UNO_QUERY );
 
@@ -779,19 +757,16 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent )
 }
 
 OUString SAL_CALL KDE4FilePicker::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( FILE_PICKER_IMPL_NAME );
 }
 
 sal_Bool SAL_CALL KDE4FilePicker::supportsService( const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     return FilePicker_getSupportedServiceNames();
 }
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 9720e766a404..96d94a9868e2 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -83,34 +83,34 @@ public:
     virtual ~KDE4FilePicker() override;
 
     // XFilePickerNotifier
-    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
+    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) override;
 
     // XExecutableDialog functions
-    virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int16 SAL_CALL execute() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setTitle( const OUString &rTitle ) override;
+    virtual sal_Int16 SAL_CALL execute() override;
 
     // XFilePicker functions
-    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getFiles() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) override;
+    virtual void SAL_CALL setDefaultName( const OUString &rName ) override;
+    virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) override;
+    virtual OUString SAL_CALL getDisplayDirectory() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles() override;
 
     // XFilterManager functions
-    virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getCurrentFilter() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) override;
+    virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) override;
+    virtual OUString SAL_CALL getCurrentFilter() override;
 
     // XFilterGroupManager functions
-    virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) override;
 
     // XFilePickerControlAccess functions
-    virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) override;
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) override;
+    virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) override;
+    virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) override;
+    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) override;
 
     /* TODO XFilePreview
 
@@ -124,79 +124,78 @@ public:
     */
 
     // XFilePicker2 functions
-    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() 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;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > &rArguments ) override;
 
     // XCancellable
-    virtual void SAL_CALL cancel( ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL cancel( ) override;
 
     // XEventListener
     /// @throws css::uno::RuntimeException
-    virtual void SAL_CALL disposing( const css::lang::EventObject &rEvent ) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL disposing( const css::lang::EventObject &rEvent );
     using cppu::WeakComponentImplHelperBase::disposing;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private Q_SLOTS:
     // XExecutableDialog functions
     /// @throws css::uno::RuntimeException
-    void setTitleSlot( const OUString &rTitle ) throw( css::uno::RuntimeException ) { return setTitle( rTitle ); }
+    void setTitleSlot( const OUString &rTitle ) { return setTitle( rTitle ); }
     /// @throws css::uno::RuntimeException
-    sal_Int16 executeSlot() throw( css::uno::RuntimeException ) { return execute(); }
+    sal_Int16 executeSlot() { return execute(); }
 
     // XFilePicker functions
     /// @throws css::uno::RuntimeException
-    void setMultiSelectionModeSlot( bool bMode ) throw( css::uno::RuntimeException ) { return setMultiSelectionMode( bMode ); }
+    void setMultiSelectionModeSlot( bool bMode ) { return setMultiSelectionMode( bMode ); }
     /// @throws css::uno::RuntimeException
-    void setDefaultNameSlot( const OUString &rName ) throw( css::uno::RuntimeException ) { return setDefaultName( rName ); }
+    void setDefaultNameSlot( const OUString &rName ) { return setDefaultName( rName ); }
     /// @throws css::uno::RuntimeException
-    void setDisplayDirectorySlot( const OUString &rDirectory ) throw( css::uno::RuntimeException ) { return setDisplayDirectory( rDirectory ); }
+    void setDisplayDirectorySlot( const OUString &rDirectory ) { return setDisplayDirectory( rDirectory ); }
     /// @throws css::uno::RuntimeException
-    OUString getDisplayDirectorySlot() throw( css::uno::RuntimeException ) { return getDisplayDirectory(); }
+    OUString getDisplayDirectorySlot() { return getDisplayDirectory(); }
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > getFilesSlot() throw( css::uno::RuntimeException ) { return getFiles(); }
+    css::uno::Sequence< OUString > getFilesSlot() { return getFiles(); }
 
     // XFilterManager functions
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void appendFilterSlot( const OUString &rTitle, const OUString &rFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) { return appendFilter( rTitle, rFilter ); }
+    void appendFilterSlot( const OUString &rTitle, const OUString &rFilter ) { return appendFilter( rTitle, rFilter ); }
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void setCurrentFilterSlot( const OUString &rTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) { return setCurrentFilter( rTitle ); }
+    void setCurrentFilterSlot( const OUString &rTitle ) { return setCurrentFilter( rTitle ); }
     /// @throws css::uno::RuntimeException
-    OUString getCurrentFilterSlot() throw( css::uno::RuntimeException ) { return getCurrentFilter(); }
+    OUString getCurrentFilterSlot() { return getCurrentFilter(); }
 
     // XFilterGroupManager functions
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
-    void appendFilterGroupSlot( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) { return appendFilterGroup( rGroupTitle, rFilters ); }
+    void appendFilterGroupSlot( const OUString &rGroupTitle, const css::uno::Sequence< css::beans::StringPair > &rFilters ) { return appendFilterGroup( rGroupTitle, rFilters ); }
 
     // XFilePickerControlAccess functions
     /// @throws css::uno::RuntimeException
-    void setValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) throw (css::uno::RuntimeException) { return setValue( nControlId, nControlAction, rValue ); }
+    void setValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any &rValue ) { return setValue( nControlId, nControlAction, rValue ); }
     /// @throws css::uno::RuntimeException
-    css::uno::Any getValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (css::uno::RuntimeException) { return getValue( nControlId, nControlAction ); }
+    css::uno::Any getValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction ) { return getValue( nControlId, nControlAction ); }
     /// @throws css::uno::RuntimeException
-    void enableControlSlot( sal_Int16 nControlId, bool bEnable ) throw( css::uno::RuntimeException ) { return enableControl( nControlId, bEnable ); }
+    void enableControlSlot( sal_Int16 nControlId, bool bEnable ) { return enableControl( nControlId, bEnable ); }
     /// @throws css::uno::RuntimeException
-    void setLabelSlot( sal_Int16 nControlId, const OUString &rLabel ) throw (css::uno::RuntimeException) { return setLabel( nControlId, rLabel ); }
+    void setLabelSlot( sal_Int16 nControlId, const OUString &rLabel ) { return setLabel( nControlId, rLabel ); }
     /// @throws css::uno::RuntimeException
-    OUString getLabelSlot( sal_Int16 nControlId ) throw (css::uno::RuntimeException) { return getLabel( nControlId ); }
+    OUString getLabelSlot( sal_Int16 nControlId ) { return getLabel( nControlId ); }
 
     // XFilePicker2 functions
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< OUString > getSelectedFilesSlot() throw (css::uno::RuntimeException) { return getSelectedFiles(); }
+    css::uno::Sequence< OUString > getSelectedFilesSlot() { return getSelectedFiles(); }
 
     // XInitialization
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
-    void initializeSlot( const css::uno::Sequence< css::uno::Any > &rArguments ) throw( css::uno::Exception, css::uno::RuntimeException ) { return initialize( rArguments ); }
+    void initializeSlot( const css::uno::Sequence< css::uno::Any > &rArguments ) { return initialize( rArguments ); }
 
 Q_SIGNALS:
     // XExecutableDialog functions
diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx
index 67cfc44312a9..e5321fdba9fd 100644
--- a/winaccessibility/inc/AccComponentEventListener.hxx
+++ b/winaccessibility/inc/AccComponentEventListener.hxx
@@ -42,7 +42,7 @@ public:
     virtual ~AccComponentEventListener() override;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for value changed event
     virtual void HandleValueChangedEvent(
diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx
index 55c09acd9867..64ca9029072e 100644
--- a/winaccessibility/inc/AccContainerEventListener.hxx
+++ b/winaccessibility/inc/AccContainerEventListener.hxx
@@ -42,7 +42,7 @@ public:
     virtual ~AccContainerEventListener() override;
 
     //AccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for child changed event
     virtual void HandleChildChangedEvent(
diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
index 26aec84e29e6..2408157324d3 100644
--- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx
+++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
@@ -39,7 +39,7 @@ public:
     virtual ~AccDescendantManagerEventListener() override;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for selection changed event
     virtual void HandleSelectionChangedEvent(
diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx
index f7f9dfe35bae..b8c340c553df 100644
--- a/winaccessibility/inc/AccDialogEventListener.hxx
+++ b/winaccessibility/inc/AccDialogEventListener.hxx
@@ -38,7 +38,7 @@ public:
     virtual ~AccDialogEventListener() override;
 
     //AccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for child changed event
     virtual void HandleChildChangedEvent(
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index d4e2a1b7daa0..fc8f8f85c02d 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -48,10 +48,10 @@ public:
     virtual ~AccEventListener() override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for name changed event
     virtual void HandleNameChangedEvent(css::uno::Any name);
diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx
index cab26c3f0410..5b49860608d1 100644
--- a/winaccessibility/inc/AccFrameEventListener.hxx
+++ b/winaccessibility/inc/AccFrameEventListener.hxx
@@ -39,7 +39,7 @@ public:
     virtual ~AccFrameEventListener() override;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for child changed event
     virtual void HandleChildChangedEvent(
diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx
index 2b414f40fb15..769d377afd82 100644
--- a/winaccessibility/inc/AccListEventListener.hxx
+++ b/winaccessibility/inc/AccListEventListener.hxx
@@ -39,7 +39,7 @@ public:
     virtual ~AccListEventListener() override;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for active descendant changed event
     virtual void HandleActiveDescendantChangedEvent(
diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx
index 585c42aab171..5446cf570a67 100644
--- a/winaccessibility/inc/AccMenuEventListener.hxx
+++ b/winaccessibility/inc/AccMenuEventListener.hxx
@@ -39,7 +39,7 @@ public:
     virtual ~AccMenuEventListener() override;
 
     //AccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for child changed event
     virtual void HandleChildChangedEvent(
diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx
index 55b6618f4f6d..73c3b717287b 100644
--- a/winaccessibility/inc/AccParagraphEventListener.hxx
+++ b/winaccessibility/inc/AccParagraphEventListener.hxx
@@ -39,7 +39,7 @@ public:
     virtual ~AccParagraphEventListener() override;
 
     //AccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for caret changed event
     virtual void HandleCaretChangedEvent(
diff --git a/winaccessibility/inc/AccTableEventListener.hxx b/winaccessibility/inc/AccTableEventListener.hxx
index 1fd2bb4b5a73..a2aaa74eddb8 100644
--- a/winaccessibility/inc/AccTableEventListener.hxx
+++ b/winaccessibility/inc/AccTableEventListener.hxx
@@ -39,7 +39,7 @@ public:
     virtual ~AccTableEventListener() override;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for active descendant changed event
     virtual void HandleActiveDescendantChangedEvent(
diff --git a/winaccessibility/inc/AccTopWindowListener.hxx b/winaccessibility/inc/AccTopWindowListener.hxx
index 4281dbeba72a..bd71e08b3081 100644
--- a/winaccessibility/inc/AccTopWindowListener.hxx
+++ b/winaccessibility/inc/AccTopWindowListener.hxx
@@ -45,16 +45,16 @@ public:
     virtual ~AccTopWindowListener() override;
 
     // XTopWindowListener
-    virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override;
-    virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) override;
+    virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) override;
 
     // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
 
     virtual void AddAllListeners(css::accessibility::XAccessible* pAccessible,css::accessibility::XAccessible* pParentXAcc,HWND pWND );
     //for On-Demand load.
diff --git a/winaccessibility/inc/AccTreeEventListener.hxx b/winaccessibility/inc/AccTreeEventListener.hxx
index 4455933cc1fc..23c6cba2c537 100644
--- a/winaccessibility/inc/AccTreeEventListener.hxx
+++ b/winaccessibility/inc/AccTreeEventListener.hxx
@@ -39,7 +39,7 @@ public:
     virtual ~AccTreeEventListener() override;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for active descendant changed event
     virtual void HandleActiveDescendantChangedEvent(
diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx
index e6d4582d56e1..aad49d9d731d 100644
--- a/winaccessibility/inc/AccWindowEventListener.hxx
+++ b/winaccessibility/inc/AccWindowEventListener.hxx
@@ -39,7 +39,7 @@ public:
     virtual ~AccWindowEventListener() override;
 
     // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException) override;
+    virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override;
 
     //for child changed event
     virtual void HandleChildChangedEvent(
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index 39fb61103cf7..97f3112aa979 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -47,7 +47,6 @@ AccComponentEventListener::~AccComponentEventListener()
  * @param   AccessibleEventObject   the event object which contains information about event
  */
 void  AccComponentEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index c52f3e3a1d53..b26ee70fd85a 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -47,7 +47,6 @@ AccContainerEventListener::~AccContainerEventListener()
  *  @param AccessibleEventObject    the event object which contains information about event
  */
 void  AccContainerEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index fe2f6ec02420..1a46dd4e67b5 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -46,7 +46,6 @@ AccDescendantManagerEventListener::~AccDescendantManagerEventListener()
  * @param AccessibleEventObject     the event object which contains information about event
  */
 void  AccDescendantManagerEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx b/winaccessibility/source/service/AccDialogEventListener.cxx
index a053d1cb7470..3810539c084a 100644
--- a/winaccessibility/source/service/AccDialogEventListener.cxx
+++ b/winaccessibility/source/service/AccDialogEventListener.cxx
@@ -44,7 +44,6 @@ AccDialogEventListener::~AccDialogEventListener()
  *  @param AccessibleEventObject    the event object which contains information about event
  */
 void  AccDialogEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
index a5b608cb7908..c508de5092b1 100644
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -57,7 +57,6 @@ AccEventListener::~AccEventListener()
  *  @param AccessibleEventObject    the event object which contains information about event
  */
 void  AccEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
@@ -259,7 +258,6 @@ void AccEventListener::RemoveMeFromBroadcaster()
  *  this method is invoked before listener is disposed
  */
 void AccEventListener::disposing( const css::lang::EventObject& /*Source*/ )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index 0dbb45130ff4..f131de0af0bd 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -50,7 +50,6 @@ AccFrameEventListener::~AccFrameEventListener()
  *  @param AccessibleEventObject    the event object which contains information about event
  */
 void  AccFrameEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccListEventListener.cxx b/winaccessibility/source/service/AccListEventListener.cxx
index 9557bfbd3093..d6747faf5fa1 100644
--- a/winaccessibility/source/service/AccListEventListener.cxx
+++ b/winaccessibility/source/service/AccListEventListener.cxx
@@ -45,7 +45,7 @@ AccListEventListener::~AccListEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccListEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException)
+void  AccListEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccMenuEventListener.cxx b/winaccessibility/source/service/AccMenuEventListener.cxx
index 50119671d00e..279fdf695dfb 100644
--- a/winaccessibility/source/service/AccMenuEventListener.cxx
+++ b/winaccessibility/source/service/AccMenuEventListener.cxx
@@ -44,7 +44,6 @@ AccMenuEventListener::~AccMenuEventListener()
  *  @param AccessibleEventObject    the event object which contains information about event
  */
 void  AccMenuEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccParagraphEventListener.cxx b/winaccessibility/source/service/AccParagraphEventListener.cxx
index 58c248b395fc..bc2762c0a9e8 100644
--- a/winaccessibility/source/service/AccParagraphEventListener.cxx
+++ b/winaccessibility/source/service/AccParagraphEventListener.cxx
@@ -44,7 +44,6 @@ AccParagraphEventListener::~AccParagraphEventListener()
  *  @param AccessibleEventObject    the event object which contains information about event
  */
 void  AccParagraphEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccTableEventListener.cxx b/winaccessibility/source/service/AccTableEventListener.cxx
index c413ef050795..8beb7b35c898 100644
--- a/winaccessibility/source/service/AccTableEventListener.cxx
+++ b/winaccessibility/source/service/AccTableEventListener.cxx
@@ -45,7 +45,6 @@ AccTableEventListener::~AccTableEventListener()
  *  @param AccessibleEventObject    the event object which contains information about event
  */
 void  AccTableEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
-throw (css::uno::RuntimeException)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index 9fda3ed1732a..2bbcfd33177f 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -109,7 +109,7 @@ AccTopWindowListener::~AccTopWindowListener()
 /**
  *  It is invoked when a new window is opened, the source of this EventObject is the window
  */
-void AccTopWindowListener::windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException)
+void AccTopWindowListener::windowOpened( const css::lang::EventObject& e )
 {
     SAL_INFO( "iacc2", "windowOpened triggered" );
 
@@ -185,7 +185,7 @@ void AccTopWindowListener::AddAllListeners(css::accessibility::XAccessible* pAcc
     }
 }
 
-void AccTopWindowListener::windowClosing( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
+void AccTopWindowListener::windowClosing( const css::lang::EventObject& )
 {
     SAL_INFO( "iacc2", "windowClosing triggered" );
 }
@@ -195,7 +195,7 @@ void AccTopWindowListener::windowClosing( const css::lang::EventObject& ) throw
  *  from current manager's cache, and remove the COM object and the accessible event listener
  *  assigned to the accessible objects.
  */
-void AccTopWindowListener::windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException)
+void AccTopWindowListener::windowClosed( const css::lang::EventObject& e )
 {
     SAL_INFO( "iacc2", "windowClosed triggered" );
 
@@ -233,23 +233,23 @@ void AccTopWindowListener::windowClosed( const css::lang::EventObject& e ) throw
 
 }
 
-void AccTopWindowListener::windowMinimized( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
+void AccTopWindowListener::windowMinimized( const css::lang::EventObject& )
 {
 }
 
-void AccTopWindowListener::windowNormalized( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
+void AccTopWindowListener::windowNormalized( const css::lang::EventObject& )
 {
 }
 
-void AccTopWindowListener::windowActivated( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
+void AccTopWindowListener::windowActivated( const css::lang::EventObject& )
 {
 }
 
-void AccTopWindowListener::windowDeactivated( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
+void AccTopWindowListener::windowDeactivated( const css::lang::EventObject& )
 {
 }
 
-void AccTopWindowListener::disposing( const css::lang::EventObject&  ) throw (css::uno::RuntimeException)
+void AccTopWindowListener::disposing( const css::lang::EventObject&  )
 {
 }
 
diff --git a/winaccessibility/source/service/AccTreeEventListener.cxx b/winaccessibility/source/service/AccTreeEventListener.cxx
index 59f80bfce7a1..830bcbaa35c3 100644
--- a/winaccessibility/source/service/AccTreeEventListener.cxx
+++ b/winaccessibility/source/service/AccTreeEventListener.cxx
@@ -43,7 +43,7 @@ AccTreeEventListener::~AccTreeEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject    the event object which contains information about event
  */
-void  AccTreeEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException)
+void  AccTreeEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/AccWindowEventListener.cxx b/winaccessibility/source/service/AccWindowEventListener.cxx
index c89972031db3..e71112af230b 100644
--- a/winaccessibility/source/service/AccWindowEventListener.cxx
+++ b/winaccessibility/source/service/AccWindowEventListener.cxx
@@ -43,7 +43,7 @@ AccWindowEventListener::~AccWindowEventListener()
  *  Uno's event notifier when event is captured
  *  @param AccessibleEventObject: the event object which contains information about event
  */
-void  AccWindowEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) throw (css::uno::RuntimeException)
+void  AccWindowEventListener::notifyEvent( const css::accessibility::AccessibleEventObject& aEvent )
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx
index 943e70ba27a9..f3220b92fb5e 100644
--- a/winaccessibility/source/service/msaaservice_impl.cxx
+++ b/winaccessibility/source/service/msaaservice_impl.cxx
@@ -66,29 +66,21 @@ public:
     MSAAServiceImpl ();
 
     // XComponent - as used by VCL to lifecycle manage this bridge.
-    virtual void SAL_CALL dispose()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& )
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) override
     { /* dummy */ }
-    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& )
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) override
     { /* dummy */ }
 
     // XMSAAService
     virtual sal_Int64 SAL_CALL getAccObjectPtr(
-            sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL handleWindowOpened(sal_Int64)
-        throw (css::uno::RuntimeException, std::exception) override;
+            sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam) override;
+    virtual void SAL_CALL handleWindowOpened(sal_Int64) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 /**
@@ -98,7 +90,6 @@ public:
    */
 sal_Int64 MSAAServiceImpl::getAccObjectPtr(
         sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
-throw (RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -116,7 +107,6 @@ throw (RuntimeException, std::exception)
    * @return
    */
 void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc)
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -130,7 +120,7 @@ void MSAAServiceImpl::handleWindowOpened(sal_Int64 nAcc)
     }
 }
 
-OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException, std::exception)
+OUString MSAAServiceImpl::getImplementationName()
 {
     return getImplementationName_MSAAServiceImpl();
 }
@@ -140,7 +130,7 @@ OUString MSAAServiceImpl::getImplementationName() throw (RuntimeException, std::
    * @param Service name.
    * @return If the service name is supported.
    */
-sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw (RuntimeException, std::exception)
+sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
@@ -150,7 +140,7 @@ sal_Bool MSAAServiceImpl::supportsService( OUString const & serviceName ) throw
    * @param.
    * @return service name sequence.
    */
-Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeException, std::exception)
+Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames()
 {
     return getSupportedServiceNames_MSAAServiceImpl();
 }
@@ -277,7 +267,6 @@ MSAAServiceImpl::MSAAServiceImpl()
 }
 
 void MSAAServiceImpl::dispose()
-    throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f82e45cb8b5b..09da1b3bb345 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2636,7 +2636,7 @@ void DomainMapper_Impl::ChainTextFrames()
     }
 }
 
-uno::Reference<beans::XPropertySet> DomainMapper_Impl::FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName) throw(uno::Exception)
+uno::Reference<beans::XPropertySet> DomainMapper_Impl::FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName)
 {
     // query master, create if not available
     uno::Reference< text::XTextFieldsSupplier > xFieldsSupplier( GetTextDocument(), uno::UNO_QUERY_THROW );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 3185840dcb51..cce9d590b463 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -459,7 +459,7 @@ private:
     void GetCurrentLocale(css::lang::Locale& rLocale);
     void SetNumberFormat(const OUString& rCommand, css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, bool bDetectFormat = false);
     /// @throws css::uno::Exception
-    css::uno::Reference<css::beans::XPropertySet> FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName) throw(css::uno::Exception);
+    css::uno::Reference<css::beans::XPropertySet> FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName);
     css::uno::Reference<css::beans::XPropertySet> const & GetDocumentSettings();
 
     std::map<sal_Int32, css::uno::Any> deferredCharacterProperties;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 41c1166e129c..6307510f1e94 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -81,11 +81,11 @@ class XInputStreamHelper : public cppu::WeakImplHelper<io::XInputStream>
 public:
     XInputStreamHelper(const sal_uInt8* buf, size_t len);
 
-    virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL available(  ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput(  ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) override;
+    virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) override;
+    virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) override;
+    virtual ::sal_Int32 SAL_CALL available(  ) override;
+    virtual void SAL_CALL closeInput(  ) override;
 };
 
 XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len) :
@@ -100,13 +100,11 @@ XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len) :
 }
 
 sal_Int32 XInputStreamHelper::readBytes( uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
 {
     return readSomeBytes( aData, nBytesToRead );
 }
 
 sal_Int32 XInputStreamHelper::readSomeBytes( uno::Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
 {
     sal_Int32 nRet = 0;
     if( nMaxBytesToRead > 0 )
@@ -136,7 +134,7 @@ sal_Int32 XInputStreamHelper::readSomeBytes( uno::Sequence<sal_Int8>& aData, sal
 }
 
 
-void XInputStreamHelper::skipBytes( sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
+void XInputStreamHelper::skipBytes( sal_Int32 nBytesToSkip )
 {
     if( nBytesToSkip < 0 || m_nPosition + nBytesToSkip > (m_nLength + m_nHeaderLength))
         throw io::BufferSizeExceededException();
@@ -144,13 +142,13 @@ void XInputStreamHelper::skipBytes( sal_Int32 nBytesToSkip ) throw (io::NotConne
 }
 
 
-sal_Int32 XInputStreamHelper::available(  ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception)
+sal_Int32 XInputStreamHelper::available(  )
 {
     return ( m_nLength + m_nHeaderLength ) - m_nPosition;
 }
 
 
-void XInputStreamHelper::closeInput(  ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception)
+void XInputStreamHelper::closeInput(  )
 {
 }
 
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index fc8b6b2b2e23..851825e27699 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -48,7 +48,7 @@ ModelEventListener::~ModelEventListener()
 }
 
 
-void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
+void ModelEventListener::notifyEvent( const document::EventObject& rEvent )
 {
     if ( rEvent.EventName == "OnFocus" && m_bIndexes)
     {
@@ -102,7 +102,7 @@ void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) thro
 }
 
 
-void ModelEventListener::disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
+void ModelEventListener::disposing( const lang::EventObject& rEvent )
 {
     try
     {
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index f2396dce2b14..3a5dab834a11 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -34,8 +34,8 @@ public:
     ModelEventListener(bool bIndexes, bool bControls);
     virtual ~ModelEventListener() override;
 
-    virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) override;
+    virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
 
 };
 }//namespace writerfilter
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index cea2dc473a8d..7cba5a1a3a8a 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1105,11 +1105,6 @@ bool SectionPropertyMap::FloatingTableConversion(FloatingTableInfo& rInfo)
 }
 
 void SectionPropertyMap::InheritOrFinalizePageStyles( DomainMapper_Impl& rDM_Impl )
-throw ( css::beans::UnknownPropertyException,
-        css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception )
 {
     const uno::Reference< container::XNameContainer >& xPageStyles = rDM_Impl.GetPageStyles();
     const uno::Reference < lang::XMultiServiceFactory >& xTextFactory = rDM_Impl.GetTextFactory();
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 6ab6b4b8285c..7e6a1365bcab 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -294,12 +294,7 @@ public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void InheritOrFinalizePageStyles( DomainMapper_Impl& rDM_Impl )
-        throw ( css::beans::UnknownPropertyException,
-                css::beans::PropertyVetoException,
-                css::lang::IllegalArgumentException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception);
+    void InheritOrFinalizePageStyles( DomainMapper_Impl& rDM_Impl );
 
     void SetBorder(BorderPosition ePos, sal_Int32 nLineDistance, const css::table::BorderLine2& rBorderLine, bool bShadow);
     void SetBorderParams( sal_Int32 nSet ) { m_nBorderParams = nSet; }
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index ad7ed9a8d847..a148a2ff32f6 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -55,22 +55,22 @@ public:
     explicit RtfFilter(const uno::Reference<uno::XComponentContext>& xContext);
 
     // XFilter
-    sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
-    void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) override;
+    void SAL_CALL cancel() override;
 
     // XImporter
-    void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) override;
 
     // XExporter
-    void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) override;
 
     // XInitialization
-    void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+    void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (uno::RuntimeException, std::exception) override;
-    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 };
 
@@ -79,7 +79,7 @@ RtfFilter::RtfFilter(const uno::Reference< uno::XComponentContext >& rxContext)
 {
 }
 
-sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) throw(uno::RuntimeException, std::exception)
+sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor)
 {
     sal_uInt32 nStartTime = osl_getGlobalTimer();
     if (m_xSrcDoc.is())
@@ -162,37 +162,37 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip
     return bResult;
 }
 
-void RtfFilter::cancel() throw(uno::RuntimeException, std::exception)
+void RtfFilter::cancel()
 {
 }
 
-void RtfFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void RtfFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc)
 {
     m_xSrcDoc = xDoc;
 }
 
-void RtfFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void RtfFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc)
 {
     m_xDstDoc = xDoc;
 }
 
-void RtfFilter::initialize(const uno::Sequence< uno::Any >& /*aArguments*/) throw(uno::Exception, uno::RuntimeException, std::exception)
+void RtfFilter::initialize(const uno::Sequence< uno::Any >& /*aArguments*/)
 {
     // The DOCX exporter here extracts 'type' of the filter, ie 'Word' or
     // 'Word Template' but we don't need it for RTF.
 }
 
-OUString RtfFilter::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString RtfFilter::getImplementationName()
 {
     return OUString("com.sun.star.comp.Writer.RtfFilter");
 }
 
-sal_Bool RtfFilter::supportsService(const OUString& rServiceName) throw(uno::RuntimeException, std::exception)
+sal_Bool RtfFilter::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence<OUString> RtfFilter::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> RtfFilter::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet =
     {
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index e247000158f3..a940046d36ad 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -100,29 +100,29 @@ public:
     {}
 
     // XFilter
-    sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
-    void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) override;
+    void SAL_CALL cancel() override;
 
     // XImporter
-    void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) override;
 
     // XExporter
-    void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+    void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) override;
 
     // XInitialization
-    void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+    void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override;
-    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
+    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
     void putPropertiesToDocumentGrabBag(const comphelper::SequenceAsHashMap& rProperties);
 
 };
 
-sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) throw (uno::RuntimeException, std::exception)
+sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor)
 {
     if (m_xSrcDoc.is())
     {
@@ -263,11 +263,11 @@ sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDesc
 }
 
 
-void WriterFilter::cancel() throw (uno::RuntimeException, std::exception)
+void WriterFilter::cancel()
 {
 }
 
-void WriterFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void WriterFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc)
 {
     m_xDstDoc = xDoc;
 
@@ -301,28 +301,28 @@ void WriterFilter::setTargetDocument(const uno::Reference< lang::XComponent >& x
     xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage", uno::makeAny(true));
 }
 
-void WriterFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void WriterFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc)
 {
     m_xSrcDoc = xDoc;
 }
 
-void WriterFilter::initialize(const uno::Sequence< uno::Any >& /*rArguments*/) throw (uno::Exception, uno::RuntimeException, std::exception)
+void WriterFilter::initialize(const uno::Sequence< uno::Any >& /*rArguments*/)
 {
 }
 
-OUString WriterFilter::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString WriterFilter::getImplementationName()
 {
     return OUString("com.sun.star.comp.Writer.WriterFilter");
 }
 
 
-sal_Bool WriterFilter::supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception)
+sal_Bool WriterFilter::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 
-uno::Sequence<OUString> WriterFilter::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence<OUString> WriterFilter::getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet =
     {
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 3202721ded5a..83f6024ebb0d 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -37,20 +37,20 @@ public:
     explicit WriterFilterDetection();
 
     //XExtendedFilterDetection
-    OUString SAL_CALL detect(uno::Sequence<beans::PropertyValue>& Descriptor) throw (uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL detect(uno::Sequence<beans::PropertyValue>& Descriptor) override;
 
     // XServiceInfo
-    OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override;
-    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
+    uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 /// @throws uno::RuntimeException
-uno::Sequence<OUString> SAL_CALL WriterFilterDetection_getSupportedServiceNames() throw (uno::RuntimeException);
+uno::Sequence<OUString> SAL_CALL WriterFilterDetection_getSupportedServiceNames();
 
 WriterFilterDetection::WriterFilterDetection() = default;
 
-OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception)
+OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDescriptor)
 {
     OUString sTypeName;
     bool bWord = false;
@@ -102,7 +102,7 @@ OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDes
     return sTypeName;
 }
 
-uno::Sequence<OUString> WriterFilterDetection_getSupportedServiceNames() throw (uno::RuntimeException)
+uno::Sequence<OUString> WriterFilterDetection_getSupportedServiceNames()
 {
     uno::Sequence<OUString> aRet =
     {
@@ -111,17 +111,17 @@ uno::Sequence<OUString> WriterFilterDetection_getSupportedServiceNames() throw (
     return aRet;
 }
 
-OUString WriterFilterDetection::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString WriterFilterDetection::getImplementationName()
 {
     return OUString("com.sun.star.comp.Writer.WriterFilterDetector");
 }
 
-sal_Bool WriterFilterDetection::supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception)
+sal_Bool WriterFilterDetection::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence<OUString> WriterFilterDetection::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence<OUString> WriterFilterDetection::getSupportedServiceNames()
 {
     return WriterFilterDetection_getSupportedServiceNames();
 }
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 7cee46482905..802d577a6f5c 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -157,7 +157,6 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Ref
 void SAL_CALL OOXMLFastContextHandler::startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (oox::getNamespace(Element) == static_cast<sal_Int32>(NMSP_mce))
         m_bDiscardChildren = prepareMceContext(Element, Attribs);
@@ -172,12 +171,10 @@ void SAL_CALL OOXMLFastContextHandler::startFastElement
 void SAL_CALL OOXMLFastContextHandler::startUnknownElement
 (const OUString & /*Namespace*/, const OUString & /*Name*/,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 }
 
 void SAL_CALL OOXMLFastContextHandler::endFastElement(Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (Element == (NMSP_mce | XML_Choice) || Element == (NMSP_mce | XML_Fallback))
         m_bDiscardChildren = false;
@@ -195,7 +192,6 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 void OOXMLFastContextHandler::lcl_startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     OOXMLFactory::startAction(this, Element);
     if( Element == (NMSP_dmlWordDr|XML_positionV) )
@@ -207,14 +203,12 @@ void OOXMLFastContextHandler::lcl_startFastElement
 
 void OOXMLFastContextHandler::lcl_endFastElement
 (Token_t Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     OOXMLFactory::endAction(this, Element);
 }
 
 void SAL_CALL OOXMLFastContextHandler::endUnknownElement
 (const OUString & , const OUString & )
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 }
 
@@ -222,7 +216,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
  OOXMLFastContextHandler::createFastChildContext
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference< xml::sax::XFastContextHandler > xResult;
     if (oox::getNamespace(Element) != NMSP_mce && !m_bDiscardChildren)
@@ -237,7 +230,6 @@ uno::Reference< xml::sax::XFastContextHandler >
  OOXMLFastContextHandler::lcl_createFastChildContext
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     return OOXMLFactory::createFastChildContext(this, Element);
 }
@@ -247,7 +239,6 @@ OOXMLFastContextHandler::createUnknownChildContext
 (const OUString &,
  const OUString &,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     return uno::Reference< xml::sax::XFastContextHandler >
         (new OOXMLFastContextHandler(*const_cast<const OOXMLFastContextHandler *>(this)));
@@ -255,14 +246,12 @@ OOXMLFastContextHandler::createUnknownChildContext
 
 void SAL_CALL OOXMLFastContextHandler::characters
 (const OUString & aChars)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     lcl_characters(aChars);
 }
 
 void OOXMLFastContextHandler::lcl_characters
 (const OUString & rString)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (!m_bDiscardChildren)
         OOXMLFactory::characters(this, rString);
@@ -280,7 +269,6 @@ OOXMLValue::Pointer_t OOXMLFastContextHandler::getValue() const
 
 void OOXMLFastContextHandler::attributes
 (const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException)
 {
     OOXMLFactory::attributes(this, Attribs);
 }
@@ -935,7 +923,6 @@ OOXMLFastContextHandlerProperties::~OOXMLFastContextHandlerProperties()
 
 void OOXMLFastContextHandlerProperties::lcl_endFastElement
 (Token_t Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     try
     {
@@ -1104,7 +1091,6 @@ OOXMLFastContextHandlerPropertyTable::~OOXMLFastContextHandlerPropertyTable()
 
 void OOXMLFastContextHandlerPropertyTable::lcl_endFastElement
 (Token_t Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     OOXMLPropertySet::Pointer_t pPropSet(mpPropertySet->clone());
     OOXMLTable::ValuePointer_t pTmpVal
@@ -1145,7 +1131,6 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerValue::getValue() const
 
 void OOXMLFastContextHandlerValue::lcl_endFastElement
 (Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     sendPropertyToParent();
 
@@ -1205,7 +1190,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 OOXMLFastContextHandlerTable::createFastChildContext
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     addCurrentChild();
 
@@ -1216,7 +1200,6 @@ OOXMLFastContextHandlerTable::createFastChildContext
 
 void OOXMLFastContextHandlerTable::lcl_endFastElement
 (Token_t /*Element*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     addCurrentChild();
 
@@ -1262,7 +1245,6 @@ OOXMLFastContextHandlerXNote::~OOXMLFastContextHandlerXNote()
 void OOXMLFastContextHandlerXNote::lcl_startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     mbForwardEventsSaved = isForwardEvents();
 
@@ -1277,7 +1259,6 @@ void OOXMLFastContextHandlerXNote::lcl_startFastElement
 
 void OOXMLFastContextHandlerXNote::lcl_endFastElement
 (Token_t Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     endAction(Element);
 
@@ -1515,7 +1496,6 @@ OOXMLFastContextHandlerTextTable::~OOXMLFastContextHandlerTextTable()
 void OOXMLFastContextHandlerTextTable::lcl_startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     mpParserState->startTable();
     mnTableDepth++;
@@ -1534,7 +1514,6 @@ void OOXMLFastContextHandlerTextTable::lcl_startFastElement
 
 void OOXMLFastContextHandlerTextTable::lcl_endFastElement
 (Token_t Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     endAction(Element);
 
@@ -1586,7 +1565,6 @@ OOXMLFastContextHandlerShape::~OOXMLFastContextHandlerShape()
 void OOXMLFastContextHandlerShape::lcl_startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     startAction(Element);
 
@@ -1600,7 +1578,6 @@ void SAL_CALL OOXMLFastContextHandlerShape::startUnknownElement
 (const OUString & Namespace,
  const OUString & Name,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (mrShapeContext.is())
         mrShapeContext->startUnknownElement(Namespace, Name, Attribs);
@@ -1642,7 +1619,6 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t Element )
 
 void OOXMLFastContextHandlerShape::lcl_endFastElement
 (Token_t Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (mrShapeContext.is())
     {
@@ -1661,7 +1637,6 @@ void OOXMLFastContextHandlerShape::lcl_endFastElement
 void SAL_CALL OOXMLFastContextHandlerShape::endUnknownElement
 (const OUString & Namespace,
  const OUString & Name)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (mrShapeContext.is())
         mrShapeContext->endUnknownElement(Namespace, Name);
@@ -1671,7 +1646,6 @@ uno::Reference< xml::sax::XFastContextHandler >
 OOXMLFastContextHandlerShape::lcl_createFastChildContext
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference< xml::sax::XFastContextHandler > xContextHandler;
 
@@ -1730,7 +1704,6 @@ OOXMLFastContextHandlerShape::createUnknownChildContext
 (const OUString & Namespace,
  const OUString & Name,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference< xml::sax::XFastContextHandler > xResult;
 
@@ -1743,7 +1716,6 @@ OOXMLFastContextHandlerShape::createUnknownChildContext
 
 void OOXMLFastContextHandlerShape::lcl_characters
 (const OUString & aChars)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (mrShapeContext.is())
         mrShapeContext->characters(aChars);
@@ -1771,7 +1743,6 @@ void SAL_CALL OOXMLFastContextHandlerWrapper::startUnknownElement
 (const OUString & Namespace,
  const OUString & Name,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (mxContext.is())
         mxContext->startUnknownElement(Namespace, Name, Attribs);
@@ -1780,7 +1751,6 @@ void SAL_CALL OOXMLFastContextHandlerWrapper::startUnknownElement
 void SAL_CALL OOXMLFastContextHandlerWrapper::endUnknownElement
 (const OUString & Namespace,
  const OUString & Name)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (mxContext.is())
         mxContext->endUnknownElement(Namespace, Name);
@@ -1791,7 +1761,6 @@ OOXMLFastContextHandlerWrapper::createUnknownChildContext
 (const OUString & Namespace,
  const OUString & Name,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference< xml::sax::XFastContextHandler > xResult;
 
@@ -1806,7 +1775,6 @@ OOXMLFastContextHandlerWrapper::createUnknownChildContext
 
 void OOXMLFastContextHandlerWrapper::attributes
 (const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-throw (uno::RuntimeException, xml::sax::SAXException)
 {
     if (mxContext.is())
     {
@@ -1835,7 +1803,6 @@ void OOXMLFastContextHandlerWrapper::addToken( Token_t Token )
 void OOXMLFastContextHandlerWrapper::lcl_startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (mxContext.is())
         mxContext->startFastElement(Element, Attribs);
@@ -1843,7 +1810,6 @@ void OOXMLFastContextHandlerWrapper::lcl_startFastElement
 
 void OOXMLFastContextHandlerWrapper::lcl_endFastElement
 (Token_t Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (mxContext.is())
         mxContext->endFastElement(Element);
@@ -1853,7 +1819,6 @@ uno::Reference< xml::sax::XFastContextHandler >
 OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference< xml::sax::XFastContextHandler > xResult;
 
@@ -1890,7 +1855,6 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
 
 void OOXMLFastContextHandlerWrapper::lcl_characters
 (const OUString & aChars)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (mxContext.is())
         mxContext->characters(aChars);
@@ -2025,14 +1989,12 @@ OOXMLFastContextHandlerLinear::OOXMLFastContextHandlerLinear(OOXMLFastContextHan
 
 void OOXMLFastContextHandlerLinear::lcl_startFastElement(Token_t Element,
     const uno::Reference< xml::sax::XFastAttributeList >& Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     buffer.appendOpeningTag( Element, Attribs );
     ++depthCount;
 }
 
 void OOXMLFastContextHandlerLinear::lcl_endFastElement(Token_t Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     buffer.appendClosingTag( Element );
     if( --depthCount == 0 )
@@ -2042,7 +2004,6 @@ void OOXMLFastContextHandlerLinear::lcl_endFastElement(Token_t Element)
 uno::Reference< xml::sax::XFastContextHandler >
 OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t,
     const uno::Reference< xml::sax::XFastAttributeList >&)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference< xml::sax::XFastContextHandler > xContextHandler;
     xContextHandler.set( this );
@@ -2050,7 +2011,6 @@ OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t,
 }
 
 void OOXMLFastContextHandlerLinear::lcl_characters(const OUString& aChars)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     buffer.appendCharacters( aChars );
 }
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index f3b70b1fbe11..f1786c6f0471 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -51,28 +51,21 @@ public:
     virtual ~OOXMLFastContextHandler() override;
 
     // css::xml::sax::XFastContextHandler:
-    virtual void SAL_CALL startFastElement (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL startFastElement (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs) override;
 
-    virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void SAL_CALL endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endFastElement(Token_t Element) override;
 
-    virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) override;
 
     virtual css::uno::Reference<css::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext(Token_t Element,
-        const css::uno::Reference<css::xml::sax::XFastAttributeList>& Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference<css::xml::sax::XFastAttributeList>& Attribs) override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext(const OUString & Namespace, const OUString & Name,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void SAL_CALL characters(const OUString & aChars)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL characters(const OUString & aChars) override;
 
     // local
 
@@ -98,7 +91,7 @@ public:
 
     /// @throws css::uno::RuntimeException
     /// @throws css::xml::sax::SAXException
-    virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException);
+    virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs);
 
     virtual void newProperty(Id aId, const OOXMLValue::Pointer_t& pVal);
     virtual void setPropertySet(const OOXMLPropertySet::Pointer_t& pPropertySet);
@@ -211,23 +204,19 @@ protected:
 
     /// @throws css::uno::RuntimeException
     /// @throws css::xml::sax::SAXException
-    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
+    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs);
 
     /// @throws css::uno::RuntimeException
     /// @throws css::xml::sax::SAXException
-    virtual void lcl_endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
+    virtual void lcl_endFastElement(Token_t Element);
 
     /// @throws css::uno::RuntimeException
     /// @throws css::xml::sax::SAXException
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs);
 
     /// @throws css::uno::RuntimeException
     /// @throws css::xml::sax::SAXException
-    virtual void lcl_characters(const OUString & aChars)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
+    virtual void lcl_characters(const OUString & aChars);
 
     void startAction(Token_t Element);
     void endAction(Token_t Element);
@@ -297,8 +286,7 @@ protected:
     /// the properties
     OOXMLPropertySet::Pointer_t mpPropertySet;
 
-    virtual void lcl_endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_endFastElement(Token_t Element) override;
     virtual void setParent(OOXMLFastContextHandler * pParent) override;
 
 private:
@@ -316,8 +304,7 @@ public:
 protected:
     OOXMLTable mTable;
 
-    virtual void lcl_endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_endFastElement(Token_t Element) override;
  };
 
 class OOXMLFastContextHandlerValue :
@@ -330,8 +317,7 @@ public:
     void setValue(const OOXMLValue::Pointer_t& pValue);
     virtual OOXMLValue::Pointer_t getValue() const override;
 
-    virtual void lcl_endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_endFastElement(Token_t Element) override;
 
     virtual std::string getType() const override { return "Value"; }
 
@@ -351,16 +337,14 @@ public:
     virtual ~OOXMLFastContextHandlerTable() override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (Token_t Element,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
 protected:
     OOXMLTable mTable;
 
     css::uno::Reference<css::xml::sax::XFastContextHandler> mCurrentChild;
 
-    virtual void lcl_endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_endFastElement(Token_t Element) override;
 
     virtual ResourceEnum_t getResource() const override { return TABLE; }
 
@@ -386,11 +370,9 @@ private:
     sal_Int32 mnMyXNoteId;
     sal_Int32 mnMyXNoteType;
 
-    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void lcl_endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_endFastElement(Token_t Element) override;
 
     virtual ResourceEnum_t getResource() const override { return STREAM; }
 };
@@ -433,11 +415,9 @@ public:
     virtual std::string getType() const override { return "TextTable"; }
 
 protected:
-    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void lcl_endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_endFastElement(Token_t Element) override;
 };
 
 class OOXMLFastContextHandlerShape: public OOXMLFastContextHandlerProperties
@@ -453,15 +433,12 @@ public:
     virtual std::string getType() const override { return "Shape"; }
 
     // css::xml::sax::XFastContextHandler:
-    virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext(const OUString & Namespace, const OUString & Name,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
     virtual void setToken(Token_t nToken) override;
 
@@ -473,17 +450,13 @@ public:
 protected:
     css::uno::Reference<css::xml::sax::XFastShapeContextHandler> mrShapeContext;
 
-    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void lcl_endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_endFastElement(Token_t Element) override;
 
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void lcl_characters(const OUString & aChars)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_characters(const OUString & aChars) override;
 
 };
 
@@ -500,18 +473,14 @@ public:
     virtual ~OOXMLFastContextHandlerWrapper() override;
 
     // css::xml::sax::XFastContextHandler:
-    virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException) override;
+    virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
     virtual ResourceEnum_t getResource() const override;
 
@@ -525,17 +494,13 @@ public:
     virtual std::string getType() const override;
 
 protected:
-    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void lcl_endFastElement(Token_t Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_endFastElement(Token_t Element) override;
 
-    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void lcl_characters(const OUString & aChars)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_characters(const OUString & aChars) override;
 
     virtual void setId(Id nId) override;
     virtual Id getId() const override;
@@ -584,16 +549,14 @@ protected:
     */
     virtual void process() = 0;
 
-    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void lcl_endFastElement(Token_t Element) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_endFastElement(Token_t Element) override;
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
 
-    virtual void lcl_characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void lcl_characters(const OUString & aChars) override;
 
     // should be private, but not much point in making deep copies of it
     oox::formulaimport::XmlStreamBuilder buffer;
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index 89287f140412..f7092dfc6761 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -51,7 +51,6 @@ void SAL_CALL OOXMLFastDocumentHandler::startFastElement
 Element
 #endif
 , const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 #ifdef DEBUG_WRITERFILTER
     clog << this << ":start element:"
@@ -71,7 +70,6 @@ Name
 #endif
 ,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 #ifdef DEBUG_WRITERFILTER
     clog << this << ":start unknown element:"
@@ -87,7 +85,6 @@ void SAL_CALL OOXMLFastDocumentHandler::endFastElement(::sal_Int32
 Element
 #endif
 )
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 #ifdef DEBUG_WRITERFILTER
     clog << this << ":end element:"
@@ -106,7 +103,6 @@ Namespace
 Name
 #endif
 )
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 #ifdef DEBUG_WRITERFILTER
     clog << this << ":end unknown element:"
@@ -136,7 +132,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
  OOXMLFastDocumentHandler::createFastChildContext
 (::sal_Int32 Element,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if ( mpStream == nullptr && mpDocument == nullptr )
     {
@@ -160,7 +155,6 @@ Namespace
 Name
 #endif
 , const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 #ifdef DEBUG_WRITERFILTER
     clog << this << ":createUnknownChildContext:"
@@ -175,24 +169,20 @@ Name
 }
 
 void SAL_CALL OOXMLFastDocumentHandler::characters(const OUString & /*aChars*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 }
 
 // css::xml::sax::XFastDocumentHandler:
 void SAL_CALL OOXMLFastDocumentHandler::startDocument()
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 }
 
 void SAL_CALL OOXMLFastDocumentHandler::endDocument()
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 }
 
 void SAL_CALL OOXMLFastDocumentHandler::setDocumentLocator
 (const uno::Reference< xml::sax::XLocator > & /*xLocator*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 }
 
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index a473c55b31d7..c47bb96ad18a 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -45,43 +45,33 @@ public:
     virtual ~OOXMLFastDocumentHandler() override;
 
     // css::xml::sax::XFastDocumentHandler:
-    virtual void SAL_CALL startDocument()
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL endDocument()
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL setDocumentLocator
-    (const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+    (const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override;
 
     // css::xml::sax::XFastContextHandler:
     virtual void SAL_CALL startFastElement
     (::sal_Int32 Element,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
     virtual void SAL_CALL startUnknownElement
     (const OUString & Namespace,
      const OUString & Name,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL endFastElement(::sal_Int32 Element)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
+    virtual void SAL_CALL endFastElement(::sal_Int32 Element) override;
     virtual void SAL_CALL endUnknownElement
     (const OUString & Namespace,
-     const OUString & Name)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const OUString & Name) override;
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     createFastChildContext
     (::sal_Int32 Element,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     createUnknownChildContext
     (const OUString & Namespace,
      const OUString & Name,
-     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
-    virtual void SAL_CALL characters(const OUString & aChars)
-        throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+     const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
+    virtual void SAL_CALL characters(const OUString & aChars) override;
 
     void setIsSubstream( bool bSubstream );
 
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index fa8f931924d2..0993d4a9f62a 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -70,8 +70,7 @@ public:
     }
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor)
-    throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor) override
     {
         utl::MediaDescriptor aDescriptor(rDescriptor);
         css::uno::Reference < css::io::XInputStream > xInputStream;
@@ -106,8 +105,7 @@ public:
         return this->doImportDocument(input, exporter, aDescriptor);
     }
 
-    virtual void SAL_CALL cancel()
-    throw (css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL cancel() override
     {
     }
 
@@ -116,15 +114,13 @@ public:
     {
         return mxDoc;
     }
-    virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc) override
     {
         mxDoc = xDoc;
     }
 
     //XExtendedFilterDetection
-    virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor)
-    throw(css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor) override
     {
         OUString sTypeName;
         sal_Int32 nLength = Descriptor.getLength();
@@ -161,8 +157,7 @@ public:
     }
 
     // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments) override
     {
         css::uno::Sequence < css::beans::PropertyValue > aAnySeq;
         sal_Int32 nLength = aArguments.getLength();
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 1c80fa79bcf7..6cb6fe88e06f 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -237,7 +237,6 @@ bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInp
 
 //XExtendedFilterDetection
 sal_Bool MSWorksCalcImportFilter::filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor)
-throw (css::uno::RuntimeException, std::exception)
 {
     OUString sUrl;
     css::uno::Reference < css::io::XInputStream > xInputStream;
@@ -379,19 +378,16 @@ void MSWorksCalcImportFilter::doRegisterHandlers(OdsGenerator &)
 
 // XServiceInfo
 OUString SAL_CALL MSWorksCalcImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Calc.MSWorksCalcImportFilter");
 }
 
 sal_Bool SAL_CALL MSWorksCalcImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL MSWorksCalcImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx
index c209f6f9f3a9..725465c71287 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx
@@ -27,16 +27,12 @@ public:
         : writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     //XFilter
-    virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor)
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor) override;
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
     virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdsGenerator &rGenerator, utl::MediaDescriptor &) override;
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
index 63f1c278bdb8..904b58351bf7 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
@@ -99,19 +99,16 @@ void MWAWCalcImportFilter::doRegisterHandlers(OdsGenerator &rGenerator)
 
 // XServiceInfo
 OUString SAL_CALL MWAWCalcImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Calc.MWAWCalcImportFilter");
 }
 
 sal_Bool SAL_CALL MWAWCalcImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL MWAWCalcImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.hxx b/writerperfect/source/calc/MWAWCalcImportFilter.hxx
index 3a8979438010..c511e5115cae 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.hxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/calc/NumbersImportFilter.cxx b/writerperfect/source/calc/NumbersImportFilter.cxx
index 568505e72283..f23397e94c56 100644
--- a/writerperfect/source/calc/NumbersImportFilter.cxx
+++ b/writerperfect/source/calc/NumbersImportFilter.cxx
@@ -46,19 +46,16 @@ void NumbersImportFilter::doRegisterHandlers(OdsGenerator &)
 
 // XServiceInfo
 OUString SAL_CALL NumbersImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.Calc.NumbersImportFilter");
 }
 
 sal_Bool SAL_CALL NumbersImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL NumbersImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/calc/NumbersImportFilter.hxx b/writerperfect/source/calc/NumbersImportFilter.hxx
index f12226ff4200..dcbb2fe70002 100644
--- a/writerperfect/source/calc/NumbersImportFilter.hxx
+++ b/writerperfect/source/calc/NumbersImportFilter.hxx
@@ -26,12 +26,9 @@ public:
         : writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
index 5ed92db46dfc..d6b529a6c66f 100644
--- a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
+++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
@@ -67,19 +67,16 @@ void StarOfficeCalcImportFilter::doRegisterHandlers(OdsGenerator &rGenerator)
 
 // XServiceInfo
 OUString SAL_CALL StarOfficeCalcImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.Calc.StarOfficeCalcImportFilter");
 }
 
 sal_Bool SAL_CALL StarOfficeCalcImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL StarOfficeCalcImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
 }
diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx
index bcf457fd5bae..d753df37d368 100644
--- a/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx
+++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index 7c29a30db957..c2d9c39494d7 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -42,19 +42,16 @@ bool CDRImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStri
 
 // XServiceInfo
 OUString SAL_CALL CDRImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Draw.CDRImportFilter");
 }
 
 sal_Bool SAL_CALL CDRImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL CDRImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/draw/CDRImportFilter.hxx b/writerperfect/source/draw/CDRImportFilter.hxx
index 6fe957d019d5..8a99d49b6677 100644
--- a/writerperfect/source/draw/CDRImportFilter.hxx
+++ b/writerperfect/source/draw/CDRImportFilter.hxx
@@ -27,12 +27,9 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 3144ef758f02..28c24e0e2b8a 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -42,19 +42,16 @@ bool CMXImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStri
 
 // XServiceInfo
 OUString SAL_CALL CMXImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Draw.CMXImportFilter");
 }
 
 sal_Bool SAL_CALL CMXImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL CMXImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/draw/CMXImportFilter.hxx b/writerperfect/source/draw/CMXImportFilter.hxx
index c6e3fa66c84b..6bf66a6e9c34 100644
--- a/writerperfect/source/draw/CMXImportFilter.hxx
+++ b/writerperfect/source/draw/CMXImportFilter.hxx
@@ -27,12 +27,9 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx
index e5a1fb955503..7d640c3fd83c 100644
--- a/writerperfect/source/draw/FreehandImportFilter.cxx
+++ b/writerperfect/source/draw/FreehandImportFilter.cxx
@@ -38,19 +38,16 @@ bool FreehandImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O
 
 // XServiceInfo
 OUString SAL_CALL FreehandImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Draw.FreehandImportFilter");
 }
 
 sal_Bool SAL_CALL FreehandImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL FreehandImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/draw/FreehandImportFilter.hxx b/writerperfect/source/draw/FreehandImportFilter.hxx
index 4d974715c766..027d5e0b7e40 100644
--- a/writerperfect/source/draw/FreehandImportFilter.hxx
+++ b/writerperfect/source/draw/FreehandImportFilter.hxx
@@ -24,12 +24,9 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 03a3ff54a0f5..61cf0b557888 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -38,19 +38,16 @@ bool MSPUBImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt
 
 // XServiceInfo
 OUString SAL_CALL MSPUBImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Draw.MSPUBImportFilter");
 }
 
 sal_Bool SAL_CALL MSPUBImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL MSPUBImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/draw/MSPUBImportFilter.hxx b/writerperfect/source/draw/MSPUBImportFilter.hxx
index 72bbe4daa2e0..5c65791fa317 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.hxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.hxx
@@ -24,12 +24,9 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index f99c67e9df77..e8a7a3d3f9e0 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -91,19 +91,16 @@ void MWAWDrawImportFilter::doRegisterHandlers(OdgGenerator &rGenerator)
 
 // XServiceInfo
 OUString SAL_CALL MWAWDrawImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Draw.MWAWDrawImportFilter");
 }
 
 sal_Bool SAL_CALL MWAWDrawImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL MWAWDrawImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.hxx b/writerperfect/source/draw/MWAWDrawImportFilter.hxx
index 3cfa54bc82a1..2467a8d2e1ef 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.hxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdgGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx b/writerperfect/source/draw/PageMakerImportFilter.cxx
index a2ef7f8106c5..7f0c62857cf7 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.cxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.cxx
@@ -40,19 +40,16 @@ bool PageMakerImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput,
 
 // XServiceInfo
 OUString SAL_CALL PageMakerImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.Draw.PageMakerImportFilter");
 }
 
 sal_Bool SAL_CALL PageMakerImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL PageMakerImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence< OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/draw/PageMakerImportFilter.hxx b/writerperfect/source/draw/PageMakerImportFilter.hxx
index 93bcfeb3040c..d5e6f9ac7600 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.hxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.hxx
@@ -24,12 +24,9 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
index bded190f5fda..7197d496a7b9 100644
--- a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
+++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
@@ -69,19 +69,16 @@ void StarOfficeDrawImportFilter::doRegisterHandlers(OdgGenerator &rGenerator)
 
 // XServiceInfo
 OUString SAL_CALL StarOfficeDrawImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.Draw.StarOfficeDrawImportFilter");
 }
 
 sal_Bool SAL_CALL StarOfficeDrawImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL StarOfficeDrawImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
 }
diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx
index 2fd9b7bb24e8..b6caf48b57e7 100644
--- a/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx
+++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdgGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index 9467035779ba..896fdacc4fb3 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -38,19 +38,16 @@ bool VisioImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt
 
 // XServiceInfo
 OUString SAL_CALL VisioImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Draw.VisioImportFilter");
 }
 
 sal_Bool SAL_CALL VisioImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL VisioImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/draw/VisioImportFilter.hxx b/writerperfect/source/draw/VisioImportFilter.hxx
index 2183b28fef05..f842aded9946 100644
--- a/writerperfect/source/draw/VisioImportFilter.hxx
+++ b/writerperfect/source/draw/VisioImportFilter.hxx
@@ -24,12 +24,9 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index dbac05dd7bd0..dadbd084e117 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -45,19 +45,16 @@ bool WPGImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStri
 
 // XServiceInfo
 OUString SAL_CALL WPGImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Draw.WPGImportFilter");
 }
 
 sal_Bool SAL_CALL WPGImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL WPGImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/draw/WPGImportFilter.hxx b/writerperfect/source/draw/WPGImportFilter.hxx
index 6be6ab90f038..c261d6154537 100644
--- a/writerperfect/source/draw/WPGImportFilter.hxx
+++ b/writerperfect/source/draw/WPGImportFilter.hxx
@@ -29,12 +29,9 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/draw/ZMFImportFilter.cxx b/writerperfect/source/draw/ZMFImportFilter.cxx
index 8c6e0294eb4b..c5bfe12a9214 100644
--- a/writerperfect/source/draw/ZMFImportFilter.cxx
+++ b/writerperfect/source/draw/ZMFImportFilter.cxx
@@ -40,19 +40,16 @@ bool ZMFImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStri
 
 // XServiceInfo
 OUString SAL_CALL ZMFImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.Draw.ZMFImportFilter");
 }
 
 sal_Bool SAL_CALL ZMFImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL ZMFImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
 }
diff --git a/writerperfect/source/draw/ZMFImportFilter.hxx b/writerperfect/source/draw/ZMFImportFilter.hxx
index a5eb9f20b0f5..4a8036e0f090 100644
--- a/writerperfect/source/draw/ZMFImportFilter.hxx
+++ b/writerperfect/source/draw/ZMFImportFilter.hxx
@@ -24,12 +24,9 @@ public:
     }
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index cf274c85f56a..143131fd65b5 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -69,7 +69,6 @@ bool KeynoteImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OU
 
 // XExtendedFilterDetection
 OUString SAL_CALL KeynoteImportFilter::detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor)
-throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nLength = Descriptor.getLength();
     sal_Int32 nNewLength = nLength + 2;
@@ -241,19 +240,16 @@ throw(css::uno::RuntimeException, std::exception)
 
 // XServiceInfo
 OUString SAL_CALL KeynoteImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.Impress.KeynoteImportFilter");
 }
 
 sal_Bool SAL_CALL KeynoteImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL KeynoteImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx
index a56ffcc8b63c..ea61a20b69f6 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.hxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.hxx
@@ -25,16 +25,12 @@ public:
     virtual ~KeynoteImportFilter() override {}
 
     //XExtendedFilterDetection
-    virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor)
-    throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
index e0e5d9a0c672..3b77605a2c6e 100644
--- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
+++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
@@ -79,17 +79,14 @@ void MWAWPresentationImportFilter::doRegisterHandlers(OdpGenerator &rGenerator)
 
 // XServiceInfo
 OUString SAL_CALL MWAWPresentationImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Impress.MWAWPresentationImportFilter");
 }
 sal_Bool SAL_CALL MWAWPresentationImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 Sequence< OUString > SAL_CALL MWAWPresentationImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx
index 10de65df90f2..11625bf14457 100644
--- a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx
+++ b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdpGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/writer/AbiWordImportFilter.cxx b/writerperfect/source/writer/AbiWordImportFilter.cxx
index 43d5d1e7f7d4..e2b702272337 100644
--- a/writerperfect/source/writer/AbiWordImportFilter.cxx
+++ b/writerperfect/source/writer/AbiWordImportFilter.cxx
@@ -38,19 +38,16 @@ bool AbiWordImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OU
 
 // XServiceInfo
 OUString SAL_CALL AbiWordImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Writer.AbiWordImportFilter");
 }
 
 sal_Bool SAL_CALL AbiWordImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL AbiWordImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/writer/AbiWordImportFilter.hxx b/writerperfect/source/writer/AbiWordImportFilter.hxx
index 99cc61c725f9..c3ce92bade41 100644
--- a/writerperfect/source/writer/AbiWordImportFilter.hxx
+++ b/writerperfect/source/writer/AbiWordImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index 3f1dfbb11393..ecddf56302a5 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -90,19 +90,16 @@ bool EBookImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt
 
 // XServiceInfo
 OUString SAL_CALL EBookImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.Writer.EBookImportFilter");
 }
 
 sal_Bool SAL_CALL EBookImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL EBookImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/writer/EBookImportFilter.hxx b/writerperfect/source/writer/EBookImportFilter.hxx
index 66ff6779b563..79468e0ae45a 100644
--- a/writerperfect/source/writer/EBookImportFilter.hxx
+++ b/writerperfect/source/writer/EBookImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 9466b4495a51..631dc5f9ed04 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -118,19 +118,16 @@ void MSWorksImportFilter::doRegisterHandlers(OdtGenerator &rGenerator)
 
 // XServiceInfo
 OUString SAL_CALL MSWorksImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Writer.MSWorksImportFilter");
 }
 
 sal_Bool SAL_CALL MSWorksImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL MSWorksImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/writer/MSWorksImportFilter.hxx b/writerperfect/source/writer/MSWorksImportFilter.hxx
index cef3519f88ab..45404be5e83f 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.hxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index 2b06ea163cbd..0d8d9f29b0f5 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -91,19 +91,16 @@ void MWAWImportFilter::doRegisterHandlers(OdtGenerator &rGenerator)
 
 // XServiceInfo
 OUString SAL_CALL MWAWImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Writer.MWAWImportFilter");
 }
 
 sal_Bool SAL_CALL MWAWImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL MWAWImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/writer/MWAWImportFilter.hxx b/writerperfect/source/writer/MWAWImportFilter.hxx
index 8644aa3fb7e1..309e9cf9a151 100644
--- a/writerperfect/source/writer/MWAWImportFilter.hxx
+++ b/writerperfect/source/writer/MWAWImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/writer/PagesImportFilter.cxx b/writerperfect/source/writer/PagesImportFilter.cxx
index af2a88834b0f..9352a9b3b92c 100644
--- a/writerperfect/source/writer/PagesImportFilter.cxx
+++ b/writerperfect/source/writer/PagesImportFilter.cxx
@@ -42,19 +42,16 @@ bool PagesImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt
 
 // XServiceInfo
 OUString SAL_CALL PagesImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.Writer.PagesImportFilter");
 }
 
 sal_Bool SAL_CALL PagesImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL PagesImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/writer/PagesImportFilter.hxx b/writerperfect/source/writer/PagesImportFilter.hxx
index ce68915e3c55..15b083ca5cba 100644
--- a/writerperfect/source/writer/PagesImportFilter.hxx
+++ b/writerperfect/source/writer/PagesImportFilter.hxx
@@ -26,12 +26,9 @@ public:
         : writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx
index 9ee289ee0c04..f04343e205bb 100644
--- a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx
+++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx
@@ -90,19 +90,16 @@ void StarOfficeWriterImportFilter::doRegisterHandlers(OdtGenerator &rGenerator)
 
 // XServiceInfo
 OUString SAL_CALL StarOfficeWriterImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("org.libreoffice.comp.Writer.StarOfficeWriterImportFilter");
 }
 
 sal_Bool SAL_CALL StarOfficeWriterImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL StarOfficeWriterImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
 }
diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx
index 65805e049aee..ed1da0540763 100644
--- a/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx
+++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx
@@ -27,12 +27,9 @@ public:
         : writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) override;
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 82912eac4813..74f050772afe 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -86,7 +86,6 @@ static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, libr
 }
 
 bool SAL_CALL WordPerfectImportFilter::importImpl(const Sequence< css::beans::PropertyValue > &aDescriptor)
-throw (RuntimeException, std::exception)
 {
     sal_Int32 nLength = aDescriptor.getLength();
     const PropertyValue *pValue = aDescriptor.getConstArray();
@@ -152,25 +151,21 @@ throw (RuntimeException, std::exception)
 }
 
 sal_Bool SAL_CALL WordPerfectImportFilter::filter(const Sequence< css::beans::PropertyValue > &aDescriptor)
-throw (RuntimeException, std::exception)
 {
     return importImpl(aDescriptor);
 }
 void SAL_CALL WordPerfectImportFilter::cancel()
-throw (RuntimeException, std::exception)
 {
 }
 
 // XImporter
 void SAL_CALL WordPerfectImportFilter::setTargetDocument(const Reference< css::lang::XComponent > &xDoc)
-throw (css::lang::IllegalArgumentException, RuntimeException, std::exception)
 {
     mxDoc = xDoc;
 }
 
 // XExtendedFilterDetection
 OUString SAL_CALL WordPerfectImportFilter::detect(Sequence< PropertyValue > &Descriptor)
-throw(RuntimeException, std::exception)
 {
     libwpd::WPDConfidence confidence = libwpd::WPD_CONFIDENCE_NONE;
     OUString sTypeName;
@@ -213,7 +208,6 @@ throw(RuntimeException, std::exception)
 
 // XInitialization
 void SAL_CALL WordPerfectImportFilter::initialize(const Sequence< Any > &aArguments)
-throw (Exception, RuntimeException, std::exception)
 {
     Sequence < PropertyValue > aAnySeq;
     sal_Int32 nLength = aArguments.getLength();
@@ -234,19 +228,16 @@ throw (Exception, RuntimeException, std::exception)
 
 // XServiceInfo
 OUString SAL_CALL WordPerfectImportFilter::getImplementationName()
-throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.Writer.WordPerfectImportFilter");
 }
 
 sal_Bool SAL_CALL WordPerfectImportFilter::supportsService(const OUString &rServiceName)
-throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL WordPerfectImportFilter::getSupportedServiceNames()
-throw (RuntimeException, std::exception)
 {
     Sequence < OUString > aRet(2);
     OUString *pArray = aRet.getArray();
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx
index af6676dfc688..a34255dea56b 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx
@@ -40,8 +40,7 @@ protected:
     OUString msFilterName;
 
     /// @throws css::uno::RuntimeException
-    bool SAL_CALL importImpl(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor)
-    throw (css::uno::RuntimeException, std::exception);
+    bool SAL_CALL importImpl(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor);
 
 public:
     explicit WordPerfectImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
@@ -49,38 +48,25 @@ public:
     virtual ~WordPerfectImportFilter() override {}
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor) override;
+    virtual void SAL_CALL cancel() override;
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc)
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc) override;
 
     //XExtendedFilterDetection
-    virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor)
-    throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments) override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
-    throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
-/// @throws css::uno::RuntimeException
-bool SAL_CALL WordPerfectImportFilter_supportsService(const OUString &ServiceName)
-throw (css::uno::RuntimeException);
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
index 695889b4d4a6..1563c8896941 100644
--- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
@@ -45,35 +45,27 @@ class TVFactory: public cppu::WeakImplHelper <
 
         // XServiceInfo
         virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
 
         virtual sal_Bool SAL_CALL
-        supportsService( const OUString& ServiceName )
-            throw(css::uno::RuntimeException, std::exception ) override;
+        supportsService( const OUString& ServiceName ) override;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
         // XMultiServiceFactory
 
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
         createInstance(
-            const OUString& aServiceSpecifier )
-            throw( css::uno::Exception,
-                   css::uno::RuntimeException, std::exception ) override;
+            const OUString& aServiceSpecifier ) override;
 
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
         createInstanceWithArguments(
             const OUString& ServiceSpecifier,
-            const css::uno::Sequence< css::uno::Any >& Arguments )
-            throw( css::uno::Exception,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Sequence< css::uno::Any >& Arguments ) override;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        getAvailableServiceNames( )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getAvailableServiceNames( ) override;
 
         // Other
 
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 4795854cd89b..0b4e1594a7f0 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -76,14 +76,12 @@ namespace treeview {
         // XNameAccess
 
         virtual css::uno::Type SAL_CALL
-        getElementType(  )
-            throw( css::uno::RuntimeException, std::exception ) override
+        getElementType(  ) override
         {
             return cppu::UnoType<void>::get();
         }
 
-        virtual sal_Bool SAL_CALL hasElements()
-            throw( css::uno::RuntimeException, std::exception ) override
+        virtual sal_Bool SAL_CALL hasElements() override
         {
             return true;
         }
@@ -92,8 +90,7 @@ namespace treeview {
 
         virtual void SAL_CALL
         addChangesListener(
-            const css::uno::Reference< css::util::XChangesListener >& aListener )
-            throw( css::uno::RuntimeException, std::exception ) override
+            const css::uno::Reference< css::util::XChangesListener >& aListener ) override
         {
             // read only
             (void)aListener;
@@ -101,8 +98,7 @@ namespace treeview {
 
         virtual void SAL_CALL
         removeChangesListener(
-            const css::uno::Reference< css::util::XChangesListener >& aListener )
-            throw( css::uno::RuntimeException, std::exception ) override
+            const css::uno::Reference< css::util::XChangesListener >& aListener ) override
         {
             // read only
             (void)aListener;
@@ -110,22 +106,19 @@ namespace treeview {
 
         // XComponent
 
-        virtual void SAL_CALL dispose( )
-            throw( css::uno::RuntimeException, std::exception ) override
+        virtual void SAL_CALL dispose( ) override
         {
         }
 
         virtual void SAL_CALL addEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override
+            const css::uno::Reference< css::lang::XEventListener >& xListener ) override
         {
             (void)xListener;
         }
 
         virtual void SAL_CALL
         removeEventListener(
-            const css::uno::Reference< css::lang::XEventListener >& aListener )
-            throw( css::uno::RuntimeException, std::exception ) override
+            const css::uno::Reference< css::lang::XEventListener >& aListener ) override
         {
             (void)aListener;
         }
@@ -134,29 +127,21 @@ namespace treeview {
         // XNameAccess
 
         virtual css::uno::Any SAL_CALL
-        getByName( const OUString& aName )
-            throw( css::container::NoSuchElementException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override = 0;
+        getByName( const OUString& aName ) override = 0;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        getElementNames( )
-            throw( css::uno::RuntimeException, std::exception ) override = 0;
+        getElementNames( ) override = 0;
 
         virtual sal_Bool SAL_CALL
-        hasByName( const OUString& aName )
-            throw( css::uno::RuntimeException, std::exception ) override = 0;
+        hasByName( const OUString& aName ) override = 0;
 
         // XHierarchicalNameAccess
 
         virtual css::uno::Any SAL_CALL
-        getByHierarchicalName( const OUString& aName )
-            throw( css::container::NoSuchElementException,
-                   css::uno::RuntimeException, std::exception ) override = 0;
+        getByHierarchicalName( const OUString& aName ) override = 0;
 
         virtual sal_Bool SAL_CALL
-        hasByHierarchicalName( const OUString& aName )
-            throw( css::uno::RuntimeException, std::exception ) override = 0;
+        hasByHierarchicalName( const OUString& aName ) override = 0;
 
     }; // end class TVBase
 
@@ -173,29 +158,21 @@ namespace treeview {
         // XNameAccess
 
         virtual css::uno::Any SAL_CALL
-        getByName( const OUString& aName )
-            throw( css::container::NoSuchElementException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+        getByName( const OUString& aName ) override;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        getElementNames( )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getElementNames( ) override;
 
         virtual sal_Bool SAL_CALL
-        hasByName( const OUString& aName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        hasByName( const OUString& aName ) override;
 
         // XHierarchicalNameAccess
 
         virtual css::uno::Any SAL_CALL
-        getByHierarchicalName( const OUString& aName )
-            throw( css::container::NoSuchElementException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getByHierarchicalName( const OUString& aName ) override;
 
         virtual sal_Bool SAL_CALL
-        hasByHierarchicalName( const OUString& aName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        hasByHierarchicalName( const OUString& aName ) override;
 
     private:
 
@@ -217,29 +194,21 @@ namespace treeview {
         virtual ~TVChildTarget() override;
 
         virtual css::uno::Any SAL_CALL
-        getByName( const OUString& aName )
-            throw( css::container::NoSuchElementException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+        getByName( const OUString& aName ) override;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        getElementNames( )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getElementNames( ) override;
 
         virtual sal_Bool SAL_CALL
-        hasByName( const OUString& aName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        hasByName( const OUString& aName ) override;
 
         // XHierarchicalNameAccess
 
         virtual css::uno::Any SAL_CALL
-        getByHierarchicalName( const OUString& aName )
-            throw( css::container::NoSuchElementException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getByHierarchicalName( const OUString& aName ) override;
 
         virtual sal_Bool SAL_CALL
-        hasByHierarchicalName( const OUString& aName )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        hasByHierarchicalName( const OUString& aName ) override;
 
     private:
         std::vector< rtl::Reference< TVRead > >   Elements;
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index b43a0804bd43..fbc0eb7a035c 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -71,7 +71,6 @@ Content::~Content()
 
 // virtual
 uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet;
      return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType );
@@ -83,7 +82,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
 
@@ -114,14 +112,12 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 
 // virtual
 OUString SAL_CALL Content::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( "CHelpContent" );
 }
 
 // virtual
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence<OUString> aSNS { "com.sun.star.ucb.CHelpContent" };
 
@@ -132,7 +128,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
 
 // virtual
 OUString SAL_CALL Content::getContentType()
-    throw( uno::RuntimeException, std::exception )
 {
     return OUString( MYUCP_CONTENT_TYPE );
 }
@@ -141,7 +136,6 @@ OUString SAL_CALL Content::getContentType()
 
 //virtual
 void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
-    throw( uno::RuntimeException, std::exception )
 {
 }
 
@@ -224,9 +218,6 @@ uno::Any SAL_CALL Content::execute(
         const ucb::Command& aCommand,
         sal_Int32 CommandId,
         const uno::Reference< ucb::XCommandEnvironment >& Environment )
-    throw( uno::Exception,
-           ucb::CommandAbortedException,
-           uno::RuntimeException, std::exception )
 {
     uno::Any aRet;
 
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 4120a9b31d86..5f639762ff05 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -51,41 +51,31 @@ namespace chelp
         virtual ~Content() override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-            throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
         // XServiceInfo
         virtual OUString SAL_CALL
-        getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getImplementationName() override;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-        getSupportedServiceNames()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getSupportedServiceNames() override;
 
         // XContent
         virtual OUString SAL_CALL
-        getContentType()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        getContentType() override;
 
         // XCommandProcessor
         virtual css::uno::Any SAL_CALL
         execute( const css::ucb::Command& aCommand,
                  sal_Int32 CommandId,
-                 const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
-            throw( css::uno::Exception,
-                   css::ucb::CommandAbortedException,
-                   css::uno::RuntimeException, std::exception ) override;
+                 const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
 
         virtual void SAL_CALL
-        abort( sal_Int32 CommandId )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        abort( sal_Int32 CommandId ) override;
 
     private:
 
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index 23da935affac..410135091c86 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -44,7 +44,6 @@ XInputStream_impl::~XInputStream_impl()
 
 uno::Any SAL_CALL
 XInputStream_impl::queryInterface( const uno::Type& rType )
-    throw( uno::RuntimeException, std::exception)
 {
     uno::Any aRet = cppu::queryInterface( rType,
                                           (static_cast< io::XInputStream* >(this)),
@@ -73,10 +72,6 @@ sal_Int32 SAL_CALL
 XInputStream_impl::readBytes(
                  uno::Sequence< sal_Int8 >& aData,
                  sal_Int32 nBytesToRead )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     if( ! m_bIsOpen )
         throw io::IOException();
@@ -101,10 +96,6 @@ sal_Int32 SAL_CALL
 XInputStream_impl::readSomeBytes(
     uno::Sequence< sal_Int8 >& aData,
     sal_Int32 nMaxBytesToRead )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     return readBytes( aData,nMaxBytesToRead );
 }
@@ -113,10 +104,6 @@ XInputStream_impl::readSomeBytes(
 void SAL_CALL
 XInputStream_impl::skipBytes(
     sal_Int32 nBytesToSkip )
-    throw( io::NotConnectedException,
-           io::BufferSizeExceededException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     if (m_aFile.setPos(osl_Pos_Current, sal_uInt64(nBytesToSkip)) != osl::FileBase::E_None)
     {
@@ -127,9 +114,6 @@ XInputStream_impl::skipBytes(
 
 sal_Int32 SAL_CALL
 XInputStream_impl::available()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception)
 {
     return 0;
 }
@@ -137,9 +121,6 @@ XInputStream_impl::available()
 
 void SAL_CALL
 XInputStream_impl::closeInput()
-    throw( io::NotConnectedException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if( m_bIsOpen )
     {
@@ -153,9 +134,6 @@ XInputStream_impl::closeInput()
 
 void SAL_CALL
 XInputStream_impl::seek( sal_Int64 location )
-    throw( lang::IllegalArgumentException,
-           io::IOException,
-           uno::RuntimeException, std::exception )
 {
     if( location < 0 )
         throw lang::IllegalArgumentException();
@@ -166,8 +144,6 @@ XInputStream_impl::seek( sal_Int64 location )
 
 sal_Int64 SAL_CALL
 XInputStream_impl::getPosition()
-    throw( io::IOException,
-           uno::RuntimeException, std::exception )
 {
     sal_uInt64 uPos;
     if( osl::FileBase::E_None != m_aFile.getPos( uPos ) )
@@ -177,8 +153,6 @@ XInputStream_impl::getPosition()
 
 sal_Int64 SAL_CALL
 XInputStream_impl::getLength()
-    throw( io::IOException,
-           uno::RuntimeException, std::exception )
 {
     osl::FileBase::RC   err;
     sal_uInt64          uCurrentPos, uEndPos;
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
index d3d99e9dbc3d..8b90a26518a2 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
@@ -50,8 +50,7 @@ namespace chelp {
 
         virtual css::uno::Any SAL_CALL
         queryInterface(
-            const css::uno::Type& rType )
-            throw( css::uno::RuntimeException, std::exception) override;
+            const css::uno::Type& rType ) override;
 
         virtual void SAL_CALL
         acquire()
@@ -64,55 +63,30 @@ namespace chelp {
         virtual sal_Int32 SAL_CALL
         readBytes(
             css::uno::Sequence< sal_Int8 >& aData,
-            sal_Int32 nBytesToRead )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nBytesToRead ) override;
 
         virtual sal_Int32 SAL_CALL
         readSomeBytes(
             css::uno::Sequence< sal_Int8 >& aData,
-            sal_Int32 nMaxBytesToRead )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception) override;
+            sal_Int32 nMaxBytesToRead ) override;
 
         virtual void SAL_CALL
-        skipBytes( sal_Int32 nBytesToSkip )
-            throw( css::io::NotConnectedException,
-                   css::io::BufferSizeExceededException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        skipBytes( sal_Int32 nBytesToSkip ) override;
 
         virtual sal_Int32 SAL_CALL
-        available()
-            throw( css::io::NotConnectedException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        available() override;
 
         virtual void SAL_CALL
-        closeInput()
-            throw( css::io::NotConnectedException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        closeInput() override;
 
         virtual void SAL_CALL
-        seek( sal_Int64 location )
-            throw( css::lang::IllegalArgumentException,
-                   css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        seek( sal_Int64 location ) override;
 
         virtual sal_Int64 SAL_CALL
-        getPosition()
-            throw( css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getPosition() override;
 
         virtual sal_Int64 SAL_CALL
-        getLength()
-            throw( css::io::IOException,
-                   css::uno::RuntimeException, std::exception ) override;
+        getLength() override;
 
     private:
         bool                                               m_bIsOpen;
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 0cd7c897b8ec..6f5fad966224 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -70,7 +70,6 @@ void SAL_CALL ContentProvider::release()
 }
 
 css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aRet = cppu::queryInterface( rType,
                                                (static_cast< lang::XTypeProvider* >(this)),
@@ -86,13 +85,11 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r
 // XTypeProvider methods.
 
 css::uno::Sequence< sal_Int8 > SAL_CALL ContentProvider::getImplementationId()
-    throw( css::uno::RuntimeException, std::exception )
 {
       return css::uno::Sequence<sal_Int8>();
 }
 
 css::uno::Sequence< css::uno::Type > SAL_CALL ContentProvider::getTypes()
-    throw( css::uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = nullptr;
       if ( !pCollection )
@@ -117,7 +114,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL ContentProvider::getTypes()
 // XServiceInfo methods.
 
 OUString SAL_CALL ContentProvider::getImplementationName()
-    throw( uno::RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
@@ -129,14 +125,12 @@ OUString ContentProvider::getImplementationName_Static()
 
 sal_Bool SAL_CALL
 ContentProvider::supportsService(const OUString& ServiceName )
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
 ContentProvider::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     return getSupportedServiceNames_Static();
 }
@@ -145,7 +139,6 @@ ContentProvider::getSupportedServiceNames()
 static uno::Reference< uno::XInterface > SAL_CALL
 ContentProvider_CreateInstance(
          const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
-    throw( uno::Exception )
 {
     lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >(
         new ContentProvider( comphelper::getComponentContext(rSMgr) ) );
@@ -183,7 +176,6 @@ ContentProvider::createServiceFactory( const css::uno::Reference<
 uno::Reference< ucb::XContent > SAL_CALL
 ContentProvider::queryContent(
         const uno::Reference< ucb::XContentIdentifier >& xCanonicId )
-    throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception )
 {
     if ( !xCanonicId->getContentProviderScheme()
              .equalsIgnoreAsciiCase( m_aScheme ) )
@@ -221,7 +213,6 @@ ContentProvider::queryContent(
 
 void SAL_CALL
 ContentProvider::dispose()
-    throw ( uno::RuntimeException, std::exception)
 {
     if(m_xContainer.is())
     {
@@ -232,7 +223,6 @@ ContentProvider::dispose()
 
 void SAL_CALL
 ContentProvider::elementReplaced(const container::ContainerEvent& Event)
-    throw (uno::RuntimeException, std::exception)
 {
     if(!m_pDatabases)
         return;
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 530f7ab349a9..7f2a1ddc2f3f 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -57,27 +57,20 @@ namespace chelp {
         virtual ~ContentProvider() override;
 
         // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
         virtual void SAL_CALL acquire()
             throw() override;
         virtual void SAL_CALL release()
             throw() override;
 
         // XTypeProvider
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-            throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-            throw( css::uno::RuntimeException, std::exception ) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw( css::uno::RuntimeException, std::exception ) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-            throw( css::uno::RuntimeException,
-                   std::exception ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         static OUString getImplementationName_Static();
 
@@ -88,28 +81,23 @@ namespace chelp {
 
         // XContentProvider
         virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent(
-                const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
-            throw( css::ucb::IllegalIdentifierException,
-                   css::uno::RuntimeException, std::exception ) override;
+                const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
 
         // Additional interfaces
 
         // XComponent
 
         virtual void SAL_CALL
-        dispose(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        dispose(  ) override;
 
         virtual void SAL_CALL
-        addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override
+        addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override
         {
             (void)xListener;
         }
 
         virtual void SAL_CALL
-        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-            throw (css::uno::RuntimeException, std::exception) override
+        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override
         {
             (void)aListener;
         }
@@ -117,29 +105,25 @@ namespace chelp {
         // XContainerListener ( derive from XEventListener )
 
         virtual void SAL_CALL
-        disposing( const css::lang::EventObject& /*Source*/ )
-            throw (css::uno::RuntimeException, std::exception) override
+        disposing( const css::lang::EventObject& /*Source*/ ) override
         {
             m_xContainer.clear();
         }
 
         virtual void SAL_CALL
-        elementInserted( const css::container::ContainerEvent& Event )
-            throw (css::uno::RuntimeException, std::exception) override
+        elementInserted( const css::container::ContainerEvent& Event ) override
         {
             (void)Event;
         }
 
         virtual void SAL_CALL
-        elementRemoved( const css::container::ContainerEvent& Event )
-            throw (css::uno::RuntimeException, std::exception) override
+        elementRemoved( const css::container::ContainerEvent& Event ) override
         {
             (void)Event;
         }
 
         virtual void SAL_CALL
-        elementReplaced( const css::container::ContainerEvent& Event )
-            throw (css::uno::RuntimeException, std::exception) override;
+        elementReplaced( const css::container::ContainerEvent& Event ) override;
 
         // Non-interface methods.
 
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 9858740ae138..0c0bd40bde2c 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -73,7 +73,6 @@ ResultSetBase::release()
 
 uno::Any SAL_CALL
 ResultSetBase::queryInterface( const uno::Type& rType )
-    throw( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                                           (static_cast< lang::XComponent* >(this)),
@@ -92,7 +91,6 @@ ResultSetBase::queryInterface( const uno::Type& rType )
 void SAL_CALL
 ResultSetBase::addEventListener(
     const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -107,7 +105,6 @@ ResultSetBase::addEventListener(
 void SAL_CALL
 ResultSetBase::removeEventListener(
     const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -118,7 +115,6 @@ ResultSetBase::removeEventListener(
 
 void SAL_CALL
 ResultSetBase::dispose()
-    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -144,8 +140,6 @@ ResultSetBase::dispose()
 
 sal_Bool SAL_CALL
 ResultSetBase::next()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     bool test;
     m_nRow++;
@@ -159,8 +153,6 @@ ResultSetBase::next()
 
 sal_Bool SAL_CALL
 ResultSetBase::isBeforeFirst()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return m_nRow == -1;
 }
@@ -168,8 +160,6 @@ ResultSetBase::isBeforeFirst()
 
 sal_Bool SAL_CALL
 ResultSetBase::isAfterLast()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return sal::static_int_cast<sal_uInt32>( m_nRow ) >= m_aItems.size();   // Cannot happen, if m_aFolder.isOpen()
 }
@@ -177,8 +167,6 @@ ResultSetBase::isAfterLast()
 
 sal_Bool SAL_CALL
 ResultSetBase::isFirst()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return m_nRow == 0;
 }
@@ -186,8 +174,6 @@ ResultSetBase::isFirst()
 
 sal_Bool SAL_CALL
 ResultSetBase::isLast()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( sal::static_int_cast<sal_uInt32>( m_nRow ) ==  m_aItems.size() - 1 )
         return true;
@@ -198,8 +184,6 @@ ResultSetBase::isLast()
 
 void SAL_CALL
 ResultSetBase::beforeFirst()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     m_nRow = -1;
 }
@@ -207,8 +191,6 @@ ResultSetBase::beforeFirst()
 
 void SAL_CALL
 ResultSetBase::afterLast()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     m_nRow = m_aItems.size();
 }
@@ -216,8 +198,6 @@ ResultSetBase::afterLast()
 
 sal_Bool SAL_CALL
 ResultSetBase::first()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     m_nRow = -1;
     return next();
@@ -226,8 +206,6 @@ ResultSetBase::first()
 
 sal_Bool SAL_CALL
 ResultSetBase::last()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     m_nRow = m_aItems.size() - 1;
     return true;
@@ -236,8 +214,6 @@ ResultSetBase::last()
 
 sal_Int32 SAL_CALL
 ResultSetBase::getRow()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     // Test, whether behind last row
     if( -1 == m_nRow || sal::static_int_cast<sal_uInt32>( m_nRow ) >= m_aItems.size() )
@@ -248,7 +224,6 @@ ResultSetBase::getRow()
 
 
 sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
-    throw( sdbc::SQLException, uno::RuntimeException, std::exception)
 {
     if( row >= 0 )
         m_nRow = row - 1;
@@ -266,8 +241,6 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
 
 sal_Bool SAL_CALL
 ResultSetBase::relative( sal_Int32 row )
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( isAfterLast() || isBeforeFirst() )
         throw sdbc::SQLException();
@@ -285,8 +258,6 @@ ResultSetBase::relative( sal_Int32 row )
 
 sal_Bool SAL_CALL
 ResultSetBase::previous()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
     if( sal::static_int_cast<sal_uInt32>( m_nRow ) > m_aItems.size() )
         m_nRow = m_aItems.size();  // Correct Handling of afterLast
@@ -298,32 +269,24 @@ ResultSetBase::previous()
 
 void SAL_CALL
 ResultSetBase::refreshRow()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
 }
 
 
 sal_Bool SAL_CALL
 ResultSetBase::rowUpdated()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return false;
 }
 
 sal_Bool SAL_CALL
 ResultSetBase::rowInserted()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return false;
 }
 
 sal_Bool SAL_CALL
 ResultSetBase::rowDeleted()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     return false;
 }
@@ -331,8 +294,6 @@ ResultSetBase::rowDeleted()
 
 uno::Reference< uno::XInterface > SAL_CALL
 ResultSetBase::getStatement()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     uno::Reference< uno::XInterface > test( nullptr );
     return test;
@@ -343,15 +304,12 @@ ResultSetBase::getStatement()
 
 void SAL_CALL
 ResultSetBase::close()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception)
 {
 }
 
 
 OUString SAL_CALL
 ResultSetBase::queryContentIdentifierString()
-    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
         return m_aPath[m_nRow];
@@ -362,7 +320,6 @@ ResultSetBase::queryContentIdentifierString()
 
 uno::Reference< ucb::XContentIdentifier > SAL_CALL
 ResultSetBase::queryContentIdentifier()
-    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
     {
@@ -378,7 +335,6 @@ ResultSetBase::queryContentIdentifier()
 
 uno::Reference< ucb::XContent > SAL_CALL
 ResultSetBase::queryContent()
-    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
         return m_xProvider->queryContent( queryContentIdentifier() );
@@ -411,23 +367,19 @@ public:
         OWeakObject::release();
     }
 
-    uno::Any SAL_CALL queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException, std::exception ) override
+    uno::Any SAL_CALL queryInterface( const uno::Type& rType ) override
     {
         uno::Any aRet = cppu::queryInterface( rType,
                                               (static_cast< beans::XPropertySetInfo* >(this)) );
         return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
     }
 
-    uno::Sequence< beans::Property > SAL_CALL getProperties()
-        throw( uno::RuntimeException, std::exception ) override
+    uno::Sequence< beans::Property > SAL_CALL getProperties() override
     {
         return m_aSeq;
     }
 
-    beans::Property SAL_CALL getPropertyByName( const OUString& aName )
-        throw( beans::UnknownPropertyException,
-               uno::RuntimeException, std::exception) override
+    beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override
     {
         for( int i = 0; i < m_aSeq.getLength(); ++i )
             if( aName == m_aSeq[i].Name )
@@ -435,8 +387,7 @@ public:
         throw beans::UnknownPropertyException();
     }
 
-    sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-        throw( uno::RuntimeException, std::exception ) override
+    sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override
     {
         for( int i = 0; i < m_aSeq.getLength(); ++i )
             if( Name == m_aSeq[i].Name )
@@ -453,7 +404,6 @@ private:
 // XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 ResultSetBase::getPropertySetInfo()
-    throw( uno::RuntimeException, std::exception)
 {
     uno::Sequence< beans::Property > seq(2);
     seq[0].Name = "RowCount";
@@ -473,11 +423,6 @@ ResultSetBase::getPropertySetInfo()
 
 void SAL_CALL ResultSetBase::setPropertyValue(
     const OUString& aPropertyName, const uno::Any& aValue )
-    throw( beans::UnknownPropertyException,
-           beans::PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     (void)aValue;
 
@@ -491,9 +436,6 @@ void SAL_CALL ResultSetBase::setPropertyValue(
 
 uno::Any SAL_CALL ResultSetBase::getPropertyValue(
     const OUString& PropertyName )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( PropertyName == "IsRowCountFinal" )
     {
@@ -512,9 +454,6 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
 void SAL_CALL ResultSetBase::addPropertyChangeListener(
     const OUString& aPropertyName,
     const uno::Reference< beans::XPropertyChangeListener >& xListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" )
     {
@@ -541,9 +480,6 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
 void SAL_CALL ResultSetBase::removePropertyChangeListener(
     const OUString& aPropertyName,
     const uno::Reference< beans::XPropertyChangeListener >& aListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" &&
         m_pIsFinalListeners )
@@ -565,9 +501,6 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
 void SAL_CALL ResultSetBase::addVetoableChangeListener(
     const OUString& PropertyName,
     const uno::Reference< beans::XVetoableChangeListener >& aListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     (void)PropertyName;
     (void)aListener;
@@ -577,9 +510,6 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener(
 void SAL_CALL ResultSetBase::removeVetoableChangeListener(
     const OUString& PropertyName,
     const uno::Reference< beans::XVetoableChangeListener >& aListener )
-    throw( beans::UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     (void)PropertyName;
     (void)aListener;
@@ -589,8 +519,6 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener(
 // XResultSetMetaDataSupplier
 uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
 ResultSetBase::getMetaData()
-    throw( sdbc::SQLException,
-           uno::RuntimeException, std::exception )
 {
     ::ucbhelper::ResultSetMetaData* p =
           new ::ucbhelper::ResultSetMetaData( m_xContext, m_sProperty );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 250cdbb5d741..af6d4a6959ce 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -58,8 +58,7 @@ namespace chelp {
 
         // XInterface
         virtual css::uno::Any SAL_CALL
-        queryInterface( const css::uno::Type& aType )
-            throw( css::uno::RuntimeException, std::exception) override;
+        queryInterface( const css::uno::Type& aType ) override;
 
         virtual void SAL_CALL
         acquire()
@@ -71,23 +70,18 @@ namespace chelp {
 
         // XComponent
         virtual void SAL_CALL
-        dispose()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        dispose() override;
 
         virtual void SAL_CALL
-        addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
 
         virtual void SAL_CALL
-        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
-            throw( css::uno::RuntimeException, std::exception ) override;
+        removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
 
         // XRow
         virtual sal_Bool SAL_CALL
-        wasNull()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        wasNull() override
         {
             if( 0<= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 m_nWasNull = m_aItems[m_nRow]->wasNull();
@@ -97,9 +91,7 @@ namespace chelp {
         }
 
         virtual OUString SAL_CALL
-        getString( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getString( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getString( columnIndex );
@@ -108,9 +100,7 @@ namespace chelp {
         }
 
         virtual sal_Bool SAL_CALL
-        getBoolean( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getBoolean( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getBoolean( columnIndex );
@@ -119,9 +109,7 @@ namespace chelp {
         }
 
         virtual sal_Int8 SAL_CALL
-        getByte( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getByte( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getByte( columnIndex );
@@ -130,10 +118,7 @@ namespace chelp {
         }
 
         virtual sal_Int16 SAL_CALL
-        getShort( sal_Int32 columnIndex )
-            throw(
-                css::sdbc::SQLException,
-                css::uno::RuntimeException, std::exception) override
+        getShort( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getShort( columnIndex );
@@ -142,9 +127,7 @@ namespace chelp {
         }
 
         virtual sal_Int32 SAL_CALL
-        getInt( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getInt( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getInt( columnIndex );
@@ -153,9 +136,7 @@ namespace chelp {
         }
 
         virtual sal_Int64 SAL_CALL
-        getLong( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getLong( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getLong( columnIndex );
@@ -164,9 +145,7 @@ namespace chelp {
         }
 
         virtual float SAL_CALL
-        getFloat( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getFloat( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getFloat( columnIndex );
@@ -175,9 +154,7 @@ namespace chelp {
         }
 
         virtual double SAL_CALL
-        getDouble( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getDouble( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getDouble( columnIndex );
@@ -186,9 +163,7 @@ namespace chelp {
         }
 
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL
-        getBytes( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception ) override
+        getBytes( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getBytes( columnIndex );
@@ -197,9 +172,7 @@ namespace chelp {
         }
 
         virtual css::util::Date SAL_CALL
-        getDate( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getDate( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getDate( columnIndex );
@@ -208,9 +181,7 @@ namespace chelp {
         }
 
         virtual css::util::Time SAL_CALL
-        getTime( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getTime( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getTime( columnIndex );
@@ -219,9 +190,7 @@ namespace chelp {
         }
 
         virtual css::util::DateTime SAL_CALL
-        getTimestamp( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getTimestamp( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getTimestamp( columnIndex );
@@ -230,9 +199,7 @@ namespace chelp {
         }
 
         virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-        getBinaryStream( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getBinaryStream( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getBinaryStream( columnIndex );
@@ -241,9 +208,7 @@ namespace chelp {
         }
 
         virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
-        getCharacterStream( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getCharacterStream( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getCharacterStream( columnIndex );
@@ -253,9 +218,7 @@ namespace chelp {
 
         virtual css::uno::Any SAL_CALL
         getObject( sal_Int32 columnIndex,
-                   const css::uno::Reference< css::container::XNameAccess >& typeMap )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+                   const css::uno::Reference< css::container::XNameAccess >& typeMap ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getObject( columnIndex,typeMap );
@@ -264,9 +227,7 @@ namespace chelp {
         }
 
         virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
-        getRef( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getRef( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getRef( columnIndex );
@@ -275,9 +236,7 @@ namespace chelp {
         }
 
         virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
-        getBlob( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getBlob( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getBlob( columnIndex );
@@ -286,9 +245,7 @@ namespace chelp {
         }
 
         virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
-        getClob( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getClob( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getClob( columnIndex );
@@ -297,9 +254,7 @@ namespace chelp {
         }
 
         virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
-        getArray( sal_Int32 columnIndex )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override
+        getArray( sal_Int32 columnIndex ) override
         {
             if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
                 return m_aItems[m_nRow]->getArray( columnIndex );
@@ -311,175 +266,111 @@ namespace chelp {
         // XResultSet
 
         virtual sal_Bool SAL_CALL
-        next()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        next() override;
 
         virtual sal_Bool SAL_CALL
-        isBeforeFirst()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isBeforeFirst() override;
 
         virtual sal_Bool SAL_CALL
-        isAfterLast()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isAfterLast() override;
 
         virtual sal_Bool SAL_CALL
-        isFirst()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isFirst() override;
 
         virtual sal_Bool SAL_CALL
-        isLast()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        isLast() override;
 
         virtual void SAL_CALL
-        beforeFirst()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        beforeFirst() override;
 
         virtual void SAL_CALL
-        afterLast()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        afterLast() override;
 
         virtual sal_Bool SAL_CALL
-        first()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        first() override;
 
         virtual sal_Bool SAL_CALL
-        last()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        last() override;
 
         virtual sal_Int32 SAL_CALL
-        getRow()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getRow() override;
 
         virtual sal_Bool SAL_CALL
-        absolute( sal_Int32 row )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        absolute( sal_Int32 row ) override;
 
         virtual sal_Bool SAL_CALL
-        relative( sal_Int32 rows )
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        relative( sal_Int32 rows ) override;
 
         virtual sal_Bool SAL_CALL
-        previous()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        previous() override;
 
         virtual void SAL_CALL
-        refreshRow()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        refreshRow() override;
 
         virtual sal_Bool SAL_CALL
-        rowUpdated()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        rowUpdated() override;
 
         virtual sal_Bool SAL_CALL
-        rowInserted()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        rowInserted() override;
 
         virtual sal_Bool SAL_CALL
-        rowDeleted()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        rowDeleted() override;
 
 
         virtual  css::uno::Reference<  css::uno::XInterface > SAL_CALL
-        getStatement()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getStatement() override;
 
         // XCloseable
 
         virtual void SAL_CALL
-        close()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        close() override;
 
         // XContentAccess
 
         virtual OUString SAL_CALL
-        queryContentIdentifierString()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryContentIdentifierString() override;
 
         virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
-        queryContentIdentifier()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryContentIdentifier() override;
 
         virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
-        queryContent()
-            throw( css::uno::RuntimeException, std::exception ) override;
+        queryContent() override;
 
         // XResultSetMetaDataSupplier
         virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
-        getMetaData()
-            throw( css::sdbc::SQLException,
-                   css::uno::RuntimeException, std::exception) override;
+        getMetaData() override;
 
 
         // XPropertySet
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo()
-            throw( css::uno::RuntimeException, std::exception) override;
+        getPropertySetInfo() override;
 
         virtual void SAL_CALL setPropertyValue(
             const OUString& aPropertyName,
-            const css::uno::Any& aValue )
-            throw( css::beans::UnknownPropertyException,
-                   css::beans::PropertyVetoException,
-                   css::lang::IllegalArgumentException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Any& aValue ) override;
 
         virtual css::uno::Any SAL_CALL
         getPropertyValue(
-            const OUString& PropertyName )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const OUString& PropertyName ) override;
 
         virtual void SAL_CALL
         addPropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
 
         virtual void SAL_CALL
         removePropertyChangeListener(
             const OUString& aPropertyName,
-            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
 
         virtual void SAL_CALL
         addVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& PropertyName,
-            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-            throw( css::beans::UnknownPropertyException,
-                   css::lang::WrappedTargetException,
-                   css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     protected:
 
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 4a6f13d2c6f4..4e3b5d9d9d8b 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -61,7 +61,6 @@ using namespace chelp;
 
 URLParameter::URLParameter( const OUString& aURL,
                             Databases* pDatabases )
-    throw( css::ucb::IllegalIdentifierException )
     : m_pDatabases( pDatabases ),
       m_aURL( aURL )
 {
@@ -305,42 +304,25 @@ public:
                             Databases*    pDatatabases,
                             bool isRoot );
 
-    virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) override;
+    virtual Any SAL_CALL queryInterface( const Type& rType ) override;
     virtual void SAL_CALL acquire() throw() override;
     virtual void SAL_CALL release() throw() override;
 
-    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead )
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               IOException,
-               RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead ) override;
 
-    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData,sal_Int32 nMaxBytesToRead )
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               IOException,
-               RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData,sal_Int32 nMaxBytesToRead ) override;
 
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException,
-                                                                     BufferSizeExceededException,
-                                                                     IOException,
-                                                                     RuntimeException, std::exception ) override;
+    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
 
-    virtual sal_Int32 SAL_CALL available() throw( NotConnectedException,
-                                                        IOException,
-                                                        RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL available() override;
 
-    virtual void SAL_CALL closeInput() throw( NotConnectedException,
-                                                    IOException,
-                                                    RuntimeException, std::exception ) override;
+    virtual void SAL_CALL closeInput() override;
 
-    virtual void SAL_CALL seek( sal_Int64 location ) throw( IllegalArgumentException,
-                                                            IOException,
-                                                            RuntimeException, std::exception ) override;
+    virtual void SAL_CALL seek( sal_Int64 location ) override;
 
-    virtual sal_Int64 SAL_CALL getPosition() throw( IOException,RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getPosition() override;
 
-    virtual sal_Int64 SAL_CALL getLength() throw( IOException,RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getLength() override;
 
     void addToBuffer( const char* buffer,int len );
 
@@ -397,7 +379,7 @@ void URLParameter::open( const Command& aCommand,
 }
 
 
-void URLParameter::parse() throw( css::ucb::IllegalIdentifierException )
+void URLParameter::parse()
 {
     m_aExpr = m_aURL;
 
@@ -909,7 +891,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
 }
 
 
-Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType )
 {
     Any aRet = ::cppu::queryInterface( rType,
                                        (static_cast< XInputStream* >(this)),
@@ -932,10 +914,6 @@ void SAL_CALL InputStreamTransformer::release() throw()
 
 
 sal_Int32 SAL_CALL InputStreamTransformer::readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead )
-    throw( NotConnectedException,
-           BufferSizeExceededException,
-           IOException,
-           RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -956,44 +934,31 @@ sal_Int32 SAL_CALL InputStreamTransformer::readBytes( Sequence< sal_Int8 >& aDat
 
 
 sal_Int32 SAL_CALL InputStreamTransformer::readSomeBytes( Sequence< sal_Int8 >& aData,sal_Int32 nMaxBytesToRead )
-    throw( NotConnectedException,
-           BufferSizeExceededException,
-           IOException,
-           RuntimeException, std::exception)
 {
     return readBytes( aData,nMaxBytesToRead );
 }
 
 
-void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException,
-                                                                                 BufferSizeExceededException,
-                                                                                 IOException,
-                                                                                 RuntimeException, std::exception )
+void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip )
 {
     osl::MutexGuard aGuard( m_aMutex );
     while( nBytesToSkip-- ) ++pos;
 }
 
 
-sal_Int32 SAL_CALL InputStreamTransformer::available() throw( NotConnectedException,
-                                                                    IOException,
-                                                                    RuntimeException, std::exception )
+sal_Int32 SAL_CALL InputStreamTransformer::available()
 {
     osl::MutexGuard aGuard( m_aMutex );
     return len-pos > 0 ? len - pos : 0 ;
 }
 
 
-void SAL_CALL InputStreamTransformer::closeInput() throw( NotConnectedException,
-                                                                IOException,
-                                                                RuntimeException, std::exception )
+void SAL_CALL InputStreamTransformer::closeInput()
 {
 }
 
 
-void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalArgumentException,
-                                                                        IOException,
-                                                                        RuntimeException, std::exception )
+void SAL_CALL InputStreamTransformer::seek( sal_Int64 location )
 {
     osl::MutexGuard aGuard( m_aMutex );
     if( location < 0 )
@@ -1006,15 +971,14 @@ void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalA
 }
 
 
-sal_Int64 SAL_CALL InputStreamTransformer::getPosition() throw( IOException,
-                                                                      RuntimeException, std::exception )
+sal_Int64 SAL_CALL InputStreamTransformer::getPosition()
 {
     osl::MutexGuard aGuard( m_aMutex );
     return sal_Int64( pos );
 }
 
 
-sal_Int64 SAL_CALL InputStreamTransformer::getLength() throw( IOException,RuntimeException, std::exception )
+sal_Int64 SAL_CALL InputStreamTransformer::getLength()
 {
     osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index c2d67cafd413..4a6a7af4a033 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -111,8 +111,7 @@ namespace chelp {
     public:
         /// @throws css::ucb::IllegalIdentifierException
         URLParameter( const OUString& aURL,
-                      Databases* pDatabases )
-            throw( css::ucb::IllegalIdentifierException );
+                      Databases* pDatabases );
 
         bool isActive() const { return !m_aActive.isEmpty() && m_aActive == "true"; }
         bool isQuery() const { return m_aId.isEmpty() && !m_aQuery.isEmpty(); }
@@ -219,7 +218,7 @@ namespace chelp {
         void readHelpDataFile();
 
         /// @throws css::ucb::IllegalIdentifierException
-        void parse() throw( css::ucb::IllegalIdentifierException );
+        void parse();
 
         bool scheme();
 
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index f054d4f0e2c7..c0f4b9605ff6 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -45,20 +45,17 @@ TVFactory::~TVFactory()
 
 OUString SAL_CALL
 TVFactory::getImplementationName()
-    throw( RuntimeException, std::exception )
 {
     return TVFactory::getImplementationName_static();
 }
 
 sal_Bool SAL_CALL TVFactory::supportsService( const OUString& ServiceName )
-    throw( RuntimeException, std::exception )
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 Sequence< OUString > SAL_CALL
 TVFactory::getSupportedServiceNames()
-    throw( RuntimeException, std::exception )
 {
     return TVFactory::getSupportedServiceNames_static();
 }
@@ -68,8 +65,6 @@ TVFactory::getSupportedServiceNames()
 Reference< XInterface > SAL_CALL
 TVFactory::createInstance(
     const OUString& aServiceSpecifier )
-    throw( Exception,
-           RuntimeException, std::exception )
 {
     Sequence< Any > seq( 1 );
     seq[0] <<= PropertyValue(
@@ -86,8 +81,6 @@ Reference< XInterface > SAL_CALL
 TVFactory::createInstanceWithArguments(
     const OUString& /*ServiceSpecifier*/,
     const Sequence< Any >& Arguments )
-    throw( Exception,
-           RuntimeException, std::exception )
 {
     if( ! m_xHDS.is() )
     {
@@ -127,7 +120,6 @@ TVFactory::createInstanceWithArguments(
 
 Sequence< OUString > SAL_CALL
 TVFactory::getAvailableServiceNames( )
-    throw( RuntimeException, std::exception )
 {
     Sequence<OUString> seq { "com.sun.star.ucb.HierarchyDataReadAccess" };
     return seq;
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index fd9ae6c3c138..a2732f3a6007 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -254,9 +254,6 @@ TVRead::~TVRead()
 
 Any SAL_CALL
 TVRead::getByName( const OUString& aName )
-    throw( NoSuchElementException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     bool found( true );
     Any aAny;
@@ -280,7 +277,6 @@ TVRead::getByName( const OUString& aName )
 
 Sequence< OUString > SAL_CALL
 TVRead::getElementNames( )
-    throw( RuntimeException, std::exception )
 {
     Sequence< OUString > seq( 3 );
 
@@ -293,7 +289,6 @@ TVRead::getElementNames( )
 
 sal_Bool SAL_CALL
 TVRead::hasByName( const OUString& aName )
-    throw( RuntimeException, std::exception )
 {
     if( aName == "Title"     ||
         aName == "TargetURL" ||
@@ -307,8 +302,6 @@ TVRead::hasByName( const OUString& aName )
 
 Any SAL_CALL
 TVRead::getByHierarchicalName( const OUString& aName )
-    throw( NoSuchElementException,
-           RuntimeException, std::exception )
 {
     sal_Int32 idx;
 
@@ -321,7 +314,6 @@ TVRead::getByHierarchicalName( const OUString& aName )
 
 sal_Bool SAL_CALL
 TVRead::hasByHierarchicalName( const OUString& aName )
-    throw( RuntimeException, std::exception )
 {
     sal_Int32 idx;
 
@@ -525,9 +517,6 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
 
 Any SAL_CALL
 TVChildTarget::getByName( const OUString& aName )
-    throw( NoSuchElementException,
-           WrappedTargetException,
-           RuntimeException, std::exception )
 {
     OUString num( aName.getStr()+2,aName.getLength()-4 );
     sal_Int32 idx = num.toInt32() - 1;
@@ -540,7 +529,6 @@ TVChildTarget::getByName( const OUString& aName )
 
 Sequence< OUString > SAL_CALL
 TVChildTarget::getElementNames( )
-    throw( RuntimeException, std::exception )
 {
     Sequence< OUString > seq( Elements.size() );
     for( size_t i = 0; i < Elements.size(); ++i )
@@ -551,7 +539,6 @@ TVChildTarget::getElementNames( )
 
 sal_Bool SAL_CALL
 TVChildTarget::hasByName( const OUString& aName )
-    throw( RuntimeException, std::exception )
 {
     OUString num( aName.getStr()+2,aName.getLength()-4 );
     sal_Int32 idx = num.toInt32() - 1;
@@ -565,8 +552,6 @@ TVChildTarget::hasByName( const OUString& aName )
 
 Any SAL_CALL
 TVChildTarget::getByHierarchicalName( const OUString& aName )
-    throw( NoSuchElementException,
-           RuntimeException, std::exception )
 {
     sal_Int32 idx;
 
@@ -586,7 +571,6 @@ TVChildTarget::getByHierarchicalName( const OUString& aName )
 
 sal_Bool SAL_CALL
 TVChildTarget::hasByHierarchicalName( const OUString& aName )
-    throw( RuntimeException, std::exception )
 {
     sal_Int32 idx;
 
diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index 0f128201cb21..239f52ca67ce 100644
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
@@ -42,7 +42,7 @@ protected:
         enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) override;
 
     // accept XDocumentProperties in addition to XModel
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     // override
     virtual void ExportMeta_() override;
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 645b683e96a9..32037a78d8eb 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -173,7 +173,7 @@ public:
         const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index d308ba033ff0..f5b99a3278b2 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -74,7 +74,7 @@ public:
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-                const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+                const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_STYLEMAP_HXX
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index e4128586bdec..f659f05b8f75 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -39,23 +39,15 @@ public:
     virtual ~XMLBasicExportFilter() override;
 
     // XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL startElement( const OUString& aName,
-        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement( const OUString& aName )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 1a15986d8669..d19ad010913f 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -38,64 +38,54 @@ OUString SAL_CALL XMLImpressImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressStylesImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressContentImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressContentImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressMetaImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressSettingsImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress oasis export
 OUString SAL_CALL XMLImpressExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressStylesExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressContentExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressContentExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressMetaExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressSettingsExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress OOo import
 
@@ -104,96 +94,81 @@ OUString SAL_CALL XMLImpressExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressStylesExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressStylesExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressStylesExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressContentExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressContentExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressContentExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressMetaExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressMetaExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressMetaExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLImpressSettingsExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressSettingsExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressSettingsExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // draw oasis import
 OUString SAL_CALL XMLDrawImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawStylesImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawContentImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawContentImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawMetaImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawSettingsImportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsImportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsImportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // draw oasis export
 OUString SAL_CALL XMLDrawExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawStylesExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawContentExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawContentExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawMetaExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawSettingsExportOasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsExportOasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // draw OOo import
 
@@ -202,108 +177,92 @@ OUString SAL_CALL XMLDrawExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawStylesExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawStylesExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawStylesExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawContentExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawContentExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawContentExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawMetaExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawMetaExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawMetaExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL XMLDrawSettingsExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawSettingsExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawSettingsExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress animation import
 OUString SAL_CALL AnimationsImport_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL AnimationsImport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL AnimationsImport_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // drawing layer export
 OUString SAL_CALL XMLDrawingLayerExport_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLDrawingLayerExport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLDrawingLayerExport_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // impress xml clipboard export
 OUString SAL_CALL XMLImpressClipboardExport_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLImpressClipboardExport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLImpressClipboardExport_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // chart oasis import
 OUString SAL_CALL SchXMLImport_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLImport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Meta_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Styles_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLImport_Content_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // chart oasis export
 OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Meta_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Styles_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Oasis_Content_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Oasis_Content_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // chart OOo import
 
@@ -312,76 +271,45 @@ OUString SAL_CALL SchXMLExport_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLExport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Styles_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Styles_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL SchXMLExport_Content_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // meta export OOo
 OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLMetaExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLMetaExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // writer autotext event export
 OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventExport_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // writer autotext event import
 OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventImport_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventImport_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 // writer autotext event export OOo
 OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw();
 css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventExportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventExportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
-
-// writer autotext event import OOo
-OUString SAL_CALL XMLAutoTextEventImportOOO_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL XMLAutoTextEventImportOOO_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL XMLAutoTextEventImportOOO_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
-
-// Oasis2OOo transformer
-OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL Oasis2OOoTransformer_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
-
-// OOo2Oasis transformer
-OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw();
-css::uno::Sequence<OUString> SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference<css::uno::XInterface> SAL_CALL OOo2OasisTransformer_createInstance(
-    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr)
-    throw (css::uno::Exception);
+    css::uno::Reference<css::lang::XMultiServiceFactory> const & rSMgr);
 
 #endif
 
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index 303e0e16c76f..8c33b306a28c 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -115,17 +115,14 @@ public:
 class XMLVersionListPersistence : public ::cppu::WeakImplHelper< css::document::XDocumentRevisionListPersistence, css::lang::XServiceInfo >
 {
 public:
-    virtual css::uno::Sequence< css::util::RevisionTag > SAL_CALL load( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL store( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Sequence< css::util::RevisionTag >& List ) throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::util::RevisionTag > SAL_CALL load( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+    virtual void SAL_CALL store( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Sequence< css::util::RevisionTag >& List ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 };
 
 #endif
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 7061bac800ae..573a29605207 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -40,9 +40,9 @@ public:
 
 protected:
     // ____ XPropertySetInfo ____
-    virtual Sequence< Property > SAL_CALL getProperties()                throw (RuntimeException, std::exception) override;
-    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )  throw (RuntimeException, std::exception) override;
+    virtual Sequence< Property > SAL_CALL getProperties() override;
+    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 
 private:
     OUString m_aColorPropName;
@@ -56,14 +56,12 @@ lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo() :
 {}
 
 Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties()
-    throw (RuntimeException, std::exception)
 {
 
     return Sequence< Property >( & m_aColorProp, 1 );
 }
 
 Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& aName )
-    throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     if( aName.equals( m_aColorPropName ))
         return m_aColorProp;
@@ -71,7 +69,6 @@ Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& a
 }
 
 sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& Name )
-    throw (RuntimeException, std::exception)
 {
     return Name.equals( m_aColorPropName );
 }
@@ -95,7 +92,6 @@ ColorPropertySet::~ColorPropertySet()
 // ____ XPropertySet ____
 
 Reference< XPropertySetInfo > SAL_CALL ColorPropertySet::getPropertySetInfo()
-    throw (uno::RuntimeException, std::exception)
 {
     if( ! m_xInfo.is())
         m_xInfo.set( new lcl_ColorPropertySetInfo );
@@ -104,54 +100,34 @@ Reference< XPropertySetInfo > SAL_CALL ColorPropertySet::getPropertySetInfo()
 }
 
 void SAL_CALL ColorPropertySet::setPropertyValue( const OUString& /* aPropertyName */, const uno::Any& aValue )
-    throw (UnknownPropertyException,
-           PropertyVetoException,
-           lang::IllegalArgumentException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     aValue >>= m_nColor;
 }
 
 uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& /* PropertyName */ )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     return uno::makeAny( m_nColor );
 }
 
 void SAL_CALL ColorPropertySet::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not Implemented" );
     return;
 }
 
 void SAL_CALL ColorPropertySet::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* aListener */ )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not Implemented" );
     return;
 }
 
 void SAL_CALL ColorPropertySet::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not Implemented" );
     return;
 }
 
 void SAL_CALL ColorPropertySet::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     OSL_FAIL( "Not Implemented" );
     return;
@@ -160,32 +136,23 @@ void SAL_CALL ColorPropertySet::removeVetoableChangeListener( const OUString& /*
 // ____ XPropertyState ____
 
 PropertyState SAL_CALL ColorPropertySet::getPropertyState( const OUString& /* PropertyName */ )
-    throw (UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     return PropertyState_DIRECT_VALUE;
 }
 
 Sequence< PropertyState > SAL_CALL ColorPropertySet::getPropertyStates( const Sequence< OUString >& /* aPropertyName */ )
-    throw (UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     PropertyState aState = PropertyState_DIRECT_VALUE;
     return Sequence< PropertyState >( & aState, 1 );
 }
 
 void SAL_CALL ColorPropertySet::setPropertyToDefault( const OUString& PropertyName )
-    throw (UnknownPropertyException,
-           uno::RuntimeException, std::exception)
 {
     if( PropertyName.equals( m_aColorPropName ))
         m_nColor = m_nDefaultColor;
 }
 
 uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropertyName )
-    throw (UnknownPropertyException,
-           lang::WrappedTargetException,
-           uno::RuntimeException, std::exception)
 {
     if( aPropertyName.equals( m_aColorPropName ))
         return uno::makeAny( m_nDefaultColor );
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index 7ea0ec85b3ec..785f7f9482e6 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -39,64 +39,34 @@ public:
 
 protected:
     // ____ XPropertySet ____
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
     virtual void SAL_CALL setPropertyValue(
         const OUString& aPropertyName,
-        const css::uno::Any& aValue )
-        throw (css::beans::UnknownPropertyException,
-               css::beans::PropertyVetoException,
-               css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Any& aValue ) override;
     virtual css::uno::Any SAL_CALL getPropertyValue(
-        const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& PropertyName ) override;
     virtual void SAL_CALL addPropertyChangeListener(
         const OUString& aPropertyName,
-        const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
     virtual void SAL_CALL removePropertyChangeListener(
         const OUString& aPropertyName,
-        const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
     virtual void SAL_CALL addVetoableChangeListener(
         const OUString& PropertyName,
-        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
     virtual void SAL_CALL removeVetoableChangeListener(
         const OUString& PropertyName,
-        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
     // ____ XPropertyState ____
     virtual css::beans::PropertyState SAL_CALL getPropertyState(
-        const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& PropertyName ) override;
     virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(
-        const css::uno::Sequence< OUString >& aPropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< OUString >& aPropertyName ) override;
     virtual void SAL_CALL setPropertyToDefault(
-        const OUString& PropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& PropertyName ) override;
     virtual css::uno::Any SAL_CALL getPropertyDefault(
-        const OUString& aPropertyName )
-        throw (css::beans::UnknownPropertyException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& aPropertyName ) override;
 
 private:
     css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 88488d2a37ba..fc47c6f5554c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3707,7 +3707,7 @@ OUString SAL_CALL SchXMLExport_getImplementationName() throw()
     return OUString(  "SchXMLExport.Compact"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     // #103997# removed some flags from EXPORT_ALL
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_getImplementationName(), SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS )));
@@ -3724,7 +3724,7 @@ OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw()
     return OUString(  "SchXMLExport.Oasis.Compact"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     // #103997# removed some flags from EXPORT_ALL
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr),
@@ -3744,7 +3744,7 @@ OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw()
     return OUString(  "SchXMLExport.Styles" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Styles_getImplementationName(), SvXMLExportFlags::STYLES ));
 }
@@ -3760,7 +3760,7 @@ OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw()
     return OUString( "SchXMLExport.Oasis.Styles" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Styles_getImplementationName(), SvXMLExportFlags::STYLES | SvXMLExportFlags::OASIS ));
 }
@@ -3775,7 +3775,7 @@ OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw()
     return OUString(  "SchXMLExport.Content" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS ));
 }
@@ -3791,7 +3791,7 @@ OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw()
     return OUString(  "SchXMLExport.Oasis.Content" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS ));
 }
@@ -3807,7 +3807,7 @@ OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw()
     return OUString(  "SchXMLExport.Oasis.Meta" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Meta_getImplementationName(), SvXMLExportFlags::META | SvXMLExportFlags::OASIS  ));
 }
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 373efbec0cc5..5d33fc69301b 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -575,7 +575,6 @@ SvXMLImportContext* SchXMLImport::CreateStylesContext(
 }
 
 void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComponent >& xDoc )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     uno::Reference< chart2::XChartDocument > xOldDoc( GetModel(), uno::UNO_QUERY );
     if( xOldDoc.is() && xOldDoc->hasControllersLocked() )
@@ -652,7 +651,7 @@ OUString SAL_CALL SchXMLImport_getImplementationName() throw()
     return OUString(  "SchXMLImport"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_getImplementationName(), SvXMLImportFlags::ALL));
 }
@@ -669,7 +668,7 @@ OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw()
     return OUString( "SchXMLImport.Styles" );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES ));
 }
@@ -684,7 +683,7 @@ OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw()
     return OUString(  "SchXMLImport.Content"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Content_getImplementationName(), SvXMLImportFlags::CONTENT | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS ));
 }
@@ -699,7 +698,7 @@ OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw()
     return OUString(  "SchXMLImport.Meta"  );
 }
 
-Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
+Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META ));
 }
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx
index 1cf9c56e5c3b..814a62d952db 100644
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
@@ -42,24 +42,24 @@ public:
     PropertySetMergerImpl( const Reference< XPropertySet > & rPropSet1, const Reference< XPropertySet > & rPropSet2 );
 
     // XPropertySet
-    virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) override;
+    virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) override;
 
     // XPropertyState
-    virtual PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual Sequence< PropertyState > SAL_CALL getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+    virtual Sequence< PropertyState > SAL_CALL getPropertyStates( const Sequence< OUString >& aPropertyName ) override;
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+    virtual Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
 
     // XPropertySetInfo
-    virtual Sequence< Property > SAL_CALL getProperties(  ) throw(RuntimeException, std::exception) override;
-    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw(UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(RuntimeException, std::exception) override;
+    virtual Sequence< Property > SAL_CALL getProperties(  ) override;
+    virtual Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
 };
 
 // Interface implementation
@@ -75,12 +75,12 @@ PropertySetMergerImpl::PropertySetMergerImpl( Reference< XPropertySet > const &
 }
 
 // XPropertySet
-Reference< XPropertySetInfo > SAL_CALL PropertySetMergerImpl::getPropertySetInfo(  ) throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL PropertySetMergerImpl::getPropertySetInfo(  )
 {
     return this;
 }
 
-void SAL_CALL PropertySetMergerImpl::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetMergerImpl::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
 {
     if( mxPropSet1Info->hasPropertyByName( aPropertyName ) )
     {
@@ -92,7 +92,7 @@ void SAL_CALL PropertySetMergerImpl::setPropertyValue( const OUString& aProperty
     }
 }
 
-Any SAL_CALL PropertySetMergerImpl::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL PropertySetMergerImpl::getPropertyValue( const OUString& PropertyName )
 {
     if( mxPropSet1Info->hasPropertyByName( PropertyName ) )
     {
@@ -104,24 +104,24 @@ Any SAL_CALL PropertySetMergerImpl::getPropertyValue( const OUString& PropertyNa
     }
 }
 
-void SAL_CALL PropertySetMergerImpl::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetMergerImpl::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ )
 {
 }
 
-void SAL_CALL PropertySetMergerImpl::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetMergerImpl::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ )
 {
 }
 
-void SAL_CALL PropertySetMergerImpl::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetMergerImpl::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ )
 {
 }
 
-void SAL_CALL PropertySetMergerImpl::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL PropertySetMergerImpl::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ )
 {
 }
 
 // XPropertyState
-PropertyState SAL_CALL PropertySetMergerImpl::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+PropertyState SAL_CALL PropertySetMergerImpl::getPropertyState( const OUString& PropertyName )
 {
     if( mxPropSet1Info->hasPropertyByName( PropertyName ) )
     {
@@ -147,7 +147,7 @@ PropertyState SAL_CALL PropertySetMergerImpl::getPropertyState( const OUString&
     }
 }
 
-Sequence< PropertyState > SAL_CALL PropertySetMergerImpl::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+Sequence< PropertyState > SAL_CALL PropertySetMergerImpl::getPropertyStates( const Sequence< OUString >& aPropertyName )
 {
     const sal_Int32 nCount = aPropertyName.getLength();
     Sequence< PropertyState > aPropStates( nCount );
@@ -161,7 +161,7 @@ Sequence< PropertyState > SAL_CALL PropertySetMergerImpl::getPropertyStates( con
     return aPropStates;
 }
 
-void SAL_CALL PropertySetMergerImpl::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+void SAL_CALL PropertySetMergerImpl::setPropertyToDefault( const OUString& PropertyName )
 {
     if( mxPropSet1State.is() && mxPropSet1Info->hasPropertyByName( PropertyName ) )
     {
@@ -176,7 +176,7 @@ void SAL_CALL PropertySetMergerImpl::setPropertyToDefault( const OUString& Prope
     }
 }
 
-Any SAL_CALL PropertySetMergerImpl::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL PropertySetMergerImpl::getPropertyDefault( const OUString& aPropertyName )
 {
     if( mxPropSet1State.is() && mxPropSet1Info->hasPropertyByName( aPropertyName ) )
     {
@@ -197,7 +197,7 @@ Any SAL_CALL PropertySetMergerImpl::getPropertyDefault( const OUString& aPropert
 }
 
 // XPropertySetInfo
-Sequence< Property > SAL_CALL PropertySetMergerImpl::getProperties() throw(RuntimeException, std::exception)
+Sequence< Property > SAL_CALL PropertySetMergerImpl::getProperties()
 {
     Sequence< Property > aProps1( mxPropSet1Info->getProperties() );
     const Property* pProps1 = aProps1.getArray();
@@ -222,7 +222,7 @@ Sequence< Property > SAL_CALL PropertySetMergerImpl::getProperties() throw(Runti
     return aProperties;
 }
 
-Property SAL_CALL PropertySetMergerImpl::getPropertyByName( const OUString& aName ) throw(UnknownPropertyException, RuntimeException, std::exception)
+Property SAL_CALL PropertySetMergerImpl::getPropertyByName( const OUString& aName )
 {
     if( mxPropSet1Info->hasPropertyByName( aName ) )
         return mxPropSet1Info->getPropertyByName( aName );
@@ -230,7 +230,7 @@ Property SAL_CALL PropertySetMergerImpl::getPropertyByName( const OUString& aNam
     return mxPropSet2Info->getPropertyByName( aName );
 }
 
-sal_Bool SAL_CALL PropertySetMergerImpl::hasPropertyByName( const OUString& Name ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL PropertySetMergerImpl::hasPropertyByName( const OUString& Name )
 {
     if(mxPropSet1Info->hasPropertyByName( Name ) )
         return true;
diff --git a/xmloff/source/core/XMLBasicExportFilter.cxx b/xmloff/source/core/XMLBasicExportFilter.cxx
index c3485772c7f0..c0462eeeb022 100644
--- a/xmloff/source/core/XMLBasicExportFilter.cxx
+++ b/xmloff/source/core/XMLBasicExportFilter.cxx
@@ -36,41 +36,35 @@ XMLBasicExportFilter::~XMLBasicExportFilter()
 // XDocumentHandler
 
 void XMLBasicExportFilter::startDocument()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // do nothing, filter this
 }
 
 void XMLBasicExportFilter::endDocument()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // do nothing, filter this
 }
 
 void XMLBasicExportFilter::startElement( const OUString& aName,
         const Reference< xml::sax::XAttributeList >& xAttribs )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if ( m_xHandler.is() )
         m_xHandler->startElement( aName, xAttribs );
 }
 
 void XMLBasicExportFilter::endElement( const OUString& aName )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if ( m_xHandler.is() )
         m_xHandler->endElement( aName );
 }
 
 void XMLBasicExportFilter::characters( const OUString& aChars )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if ( m_xHandler.is() )
         m_xHandler->characters( aChars );
 }
 
 void XMLBasicExportFilter::ignorableWhitespace( const OUString& aWhitespaces )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if ( m_xHandler.is() )
         m_xHandler->ignorableWhitespace( aWhitespaces );
@@ -78,14 +72,12 @@ void XMLBasicExportFilter::ignorableWhitespace( const OUString& aWhitespaces )
 
 void XMLBasicExportFilter::processingInstruction( const OUString& aTarget,
         const OUString& aData )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if ( m_xHandler.is() )
         m_xHandler->processingInstruction( aTarget, aData );
 }
 
 void XMLBasicExportFilter::setDocumentLocator( const Reference< xml::sax::XLocator >& xLocator )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if ( m_xHandler.is() )
         m_xHandler->setDocumentLocator( xLocator );
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index 63e00c332472..355ec819e35a 100644
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -36,13 +36,11 @@ XMLEmbeddedObjectExportFilter::~XMLEmbeddedObjectExportFilter () throw()
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::startDocument()
-    throw( SAXException, RuntimeException, std::exception )
 {
     // do nothing, filter this
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::endDocument()
-    throw( SAXException, RuntimeException, std::exception)
 {
     // do nothing, filter this
 }
@@ -50,26 +48,22 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::endDocument()
 void SAL_CALL XMLEmbeddedObjectExportFilter::startElement(
         const OUString& rName,
         const Reference< XAttributeList >& xAttrList )
-    throw(SAXException, RuntimeException, std::exception)
 {
     xHandler->startElement( rName, xAttrList );
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::endElement( const OUString& rName )
-    throw(SAXException, RuntimeException, std::exception)
 {
     xHandler->endElement( rName );
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::characters( const OUString& rChars )
-    throw(SAXException, RuntimeException, std::exception)
 {
     xHandler->characters( rChars );
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::ignorableWhitespace(
         const OUString& rWhitespaces )
-    throw(SAXException, RuntimeException, std::exception)
 {
     xHandler->ignorableWhitespace( rWhitespaces );
 }
@@ -77,49 +71,42 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::ignorableWhitespace(
 void SAL_CALL XMLEmbeddedObjectExportFilter::processingInstruction(
         const OUString& rTarget,
         const OUString& rData )
-    throw(SAXException, RuntimeException, std::exception)
 {
     xHandler->processingInstruction( rTarget, rData );
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::setDocumentLocator(
         const Reference< XLocator >& rLocator )
-    throw(SAXException, RuntimeException, std::exception)
 {
     xHandler->setDocumentLocator( rLocator );
 }
 
 // XExtendedDocumentHandler
 void SAL_CALL XMLEmbeddedObjectExportFilter::startCDATA()
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( xExtHandler.is() )
         xExtHandler->startCDATA();
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::endCDATA()
-    throw(RuntimeException, std::exception)
 {
     if( xExtHandler.is() )
         xExtHandler->endCDATA();
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::comment( const OUString& rComment )
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( xExtHandler.is() )
         xExtHandler->comment( rComment );
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::allowLineBreak()
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( xExtHandler.is() )
         xExtHandler->allowLineBreak();
 }
 
 void SAL_CALL XMLEmbeddedObjectExportFilter::unknown( const OUString& rString )
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( xExtHandler.is() )
         xExtHandler->unknown( rString );
@@ -128,7 +115,6 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::unknown( const OUString& rString )
 // XInitialize
 void SAL_CALL XMLEmbeddedObjectExportFilter::initialize(
         const Sequence< Any >& aArguments )
-    throw(Exception, RuntimeException, std::exception)
 {
     const sal_Int32 nAnyCount = aArguments.getLength();
     const Any* pAny = aArguments.getConstArray();
@@ -146,20 +132,17 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::initialize(
 
 // XServiceInfo
 OUString SAL_CALL XMLEmbeddedObjectExportFilter::getImplementationName()
-    throw(RuntimeException, std::exception)
 {
     OUString aStr;
     return aStr;
 }
 
 sal_Bool SAL_CALL XMLEmbeddedObjectExportFilter::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL XMLEmbeddedObjectExportFilter::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     Sequence< OUString > aSeq;
     return aSeq;
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index ed81acdc0f04..4cd94a6d768b 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -70,7 +70,7 @@ struct SvXMLAttributeList_Impl
 };
 
 
-sal_Int16 SAL_CALL SvXMLAttributeList::getLength() throw( css::uno::RuntimeException, std::exception )
+sal_Int16 SAL_CALL SvXMLAttributeList::getLength()
 {
     return sal::static_int_cast< sal_Int16 >(m_pImpl->vecAttribute.size());
 }
@@ -97,28 +97,28 @@ SvXMLAttributeList::SvXMLAttributeList( const uno::Reference<
         AppendAttributeList( rAttrList );
 }
 
-OUString SAL_CALL SvXMLAttributeList::getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SvXMLAttributeList::getNameByIndex(sal_Int16 i)
 {
     return ( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) ? m_pImpl->vecAttribute[i].sName : OUString();
 }
 
 
-OUString SAL_CALL SvXMLAttributeList::getTypeByIndex(sal_Int16) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SvXMLAttributeList::getTypeByIndex(sal_Int16)
 {
     return sType;
 }
 
-OUString SAL_CALL  SvXMLAttributeList::getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL  SvXMLAttributeList::getValueByIndex(sal_Int16 i)
 {
     return ( static_cast< SvXMLAttributeList_Impl::size_type >( i ) < m_pImpl->vecAttribute.size() ) ? m_pImpl->vecAttribute[i].sValue : OUString();
 }
 
-OUString SAL_CALL SvXMLAttributeList::getTypeByName( const OUString& ) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SvXMLAttributeList::getTypeByName( const OUString& )
 {
     return sType;
 }
 
-OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName) throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName)
 {
     ::std::vector<struct SvXMLTagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
 
@@ -131,7 +131,7 @@ OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName) thro
 }
 
 
-uno::Reference< css::util::XCloneable >  SvXMLAttributeList::createClone() throw( css::uno::RuntimeException, std::exception )
+uno::Reference< css::util::XCloneable >  SvXMLAttributeList::createClone()
 {
     uno::Reference< css::util::XCloneable >  r = new SvXMLAttributeList( *this );
     return r;
@@ -262,7 +262,6 @@ SvXMLAttributeList* SvXMLAttributeList::getImplementation( const uno::Reference<
 
 // XUnoTunnel
 sal_Int64 SAL_CALL SvXMLAttributeList::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw( uno::RuntimeException, std::exception )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(),
                                                          rId.getConstArray(), 16 ) )
diff --git a/xmloff/source/core/fasttokenhandler.cxx b/xmloff/source/core/fasttokenhandler.cxx
index 9e2b45fcbe10..8c60bd15520f 100644
--- a/xmloff/source/core/fasttokenhandler.cxx
+++ b/xmloff/source/core/fasttokenhandler.cxx
@@ -79,13 +79,11 @@ FastTokenHandler::~FastTokenHandler()
 
 // XFastTokenHandler
 uno::Sequence< sal_Int8 > FastTokenHandler::getUTF8Identifier( sal_Int32 nToken )
-    throw (uno::RuntimeException, std::exception)
 {
     return mrTokenMap.getUtf8TokenName( nToken );
 }
 
 sal_Int32 FastTokenHandler::getTokenFromUTF8( const uno::Sequence< sal_Int8 >& rIdentifier )
-    throw (uno::RuntimeException, std::exception)
 {
     return TokenMap::getTokenFromUtf8( rIdentifier );
 }
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index fec3e48fa4ae..335dbeb916ef 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -48,13 +48,11 @@ SvUnoAttributeContainer::SvUnoAttributeContainer( std::unique_ptr<SvXMLAttrConta
 
 // container::XElementAccess
 uno::Type SAL_CALL SvUnoAttributeContainer::getElementType()
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::UnoType<xml::AttributeData>::get();
 }
 
 sal_Bool SAL_CALL SvUnoAttributeContainer::hasElements()
-    throw( uno::RuntimeException, std::exception )
 {
     return mpContainer->GetAttrCount() != 0;
 }
@@ -99,7 +97,7 @@ const css::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::getUnoTunnelId()
     return theSvUnoAttributeContainerUnoTunnelId::get().getSeq();
 }
 
-sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(),
                                                          rId.getConstArray(), 16 ) )
@@ -111,7 +109,6 @@ sal_Int64 SAL_CALL SvUnoAttributeContainer::getSomething( const css::uno::Sequen
 
 // container::XNameAccess
 uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName)
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     sal_uInt16 nAttr = getIndexByName(aName );
 
@@ -126,7 +123,7 @@ uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName)
     return uno::Any(aData);
 }
 
-uno::Sequence< OUString > SAL_CALL SvUnoAttributeContainer::getElementNames() throw( uno::RuntimeException, std::exception )
+uno::Sequence< OUString > SAL_CALL SvUnoAttributeContainer::getElementNames()
 {
     const sal_uInt16 nAttrCount = mpContainer->GetAttrCount();
 
@@ -145,14 +142,13 @@ uno::Sequence< OUString > SAL_CALL SvUnoAttributeContainer::getElementNames() th
     return aElementNames;
 }
 
-sal_Bool SAL_CALL SvUnoAttributeContainer::hasByName(const OUString& aName) throw( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SvUnoAttributeContainer::hasByName(const OUString& aName)
 {
     return getIndexByName(aName ) != USHRT_MAX;
 }
 
 // container::XNameReplace
 void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, const uno::Any& aElement)
-    throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     if( auto pData = o3tl::tryAccess<xml::AttributeData>(aElement) )
     {
@@ -192,7 +188,6 @@ void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, cons
 
 // container::XNameContainer
 void SAL_CALL SvUnoAttributeContainer::insertByName(const OUString& aName, const uno::Any& aElement)
-throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     auto pData = o3tl::tryAccess<xml::AttributeData>(aElement);
     if( !pData )
@@ -230,7 +225,6 @@ throw( lang::IllegalArgumentException, container::ElementExistException, lang::W
 }
 
 void SAL_CALL SvUnoAttributeContainer::removeByName(const OUString& Name)
-    throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
 {
     sal_uInt16 nAttr = getIndexByName(Name);
     if( nAttr == USHRT_MAX )
@@ -240,13 +234,12 @@ void SAL_CALL SvUnoAttributeContainer::removeByName(const OUString& Name)
 }
 
 //XServiceInfo
-OUString SAL_CALL SvUnoAttributeContainer::getImplementationName() throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvUnoAttributeContainer::getImplementationName()
 {
     return OUString( "SvUnoAttributeContainer" );
 }
 
 uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames()
-    throw( uno::RuntimeException, std::exception )
 {
     OUString aSN( "com.sun.star.xml.AttributeContainer" );
     uno::Sequence< OUString > aNS( &aSN, 1L );
@@ -254,7 +247,6 @@ uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames()
 }
 
 sal_Bool SvUnoAttributeContainer::supportsService(const OUString& ServiceName)
-    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index fbdcc941e399..15adb7251613 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -199,7 +199,6 @@ void XMLErrors::AddRecord(
 }
 
 void XMLErrors::ThrowErrorAsSAXException(sal_Int32 nIdMask)
-    throw( SAXParseException )
 {
     // search first error/warning that matches the nIdMask
     for( ErrorList::iterator aIter = aErrors.begin();
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 3666cfa761b1..cd8a9c487c9c 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -214,7 +214,7 @@ public:
     explicit SvXMLExportEventListener(SvXMLExport* pExport);
 
                             // XEventListener
-    virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) override;
 };
 
 SvXMLExportEventListener::SvXMLExportEventListener(SvXMLExport* pTempExport)
@@ -224,7 +224,6 @@ SvXMLExportEventListener::SvXMLExportEventListener(SvXMLExport* pTempExport)
 
 // XEventListener
 void SAL_CALL SvXMLExportEventListener::disposing( const lang::EventObject& )
-    throw(uno::RuntimeException, std::exception)
 {
     if (pExport)
     {
@@ -575,7 +574,6 @@ SvXMLExport::~SvXMLExport()
 
 // XExporter
 void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     mxModel.set( xDoc, UNO_QUERY );
     if( !mxModel.is() )
@@ -665,7 +663,6 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
 
 // XInitialize
 void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArguments )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     // #93186# we need to queryInterface every single Any with any expected outcome. This variable hold the queryInterface results.
 
@@ -775,7 +772,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
 }
 
 // XFilter
-sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
 {
     // check for xHandler first... should have been supplied in initialize
     if( !mxHandler.is() )
@@ -851,7 +848,7 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
     return (mnErrorFlags & (SvXMLErrorFlags::DO_NOTHING|SvXMLErrorFlags::ERROR_OCCURRED)) == SvXMLErrorFlags::NO;
 }
 
-void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvXMLExport::cancel()
 {
     // stop export
     Sequence<OUString> aEmptySeq;
@@ -859,30 +856,27 @@ void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException, std::exception)
 }
 
 OUString SAL_CALL SvXMLExport::getName(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return msFilterName;
 }
 
 void SAL_CALL SvXMLExport::setName( const OUString& )
-    throw (css::uno::RuntimeException, std::exception)
 {
     // do nothing, because it is not possible to set the FilterName
 }
 
 // XServiceInfo
-OUString SAL_CALL SvXMLExport::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL SvXMLExport::getImplementationName(  )
 {
     return m_implementationName;
 }
 
-sal_Bool SAL_CALL SvXMLExport::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SvXMLExport::supportsService( const OUString& rServiceName )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SvXMLExport::getSupportedServiceNames(  )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence<OUString> aSeq(2);
     aSeq[0] = "com.sun.star.document.ExportFilter";
@@ -2074,7 +2068,6 @@ SvXMLExport* SvXMLExport::getImplementation( const uno::Reference< uno::XInterfa
 
 // XUnoTunnel
 sal_Int64 SAL_CALL SvXMLExport::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw( uno::RuntimeException, std::exception )
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(),
                                                          rId.getConstArray(), 16 ) )
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index 05a6c45426c2..509e7d919eb8 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -68,7 +68,6 @@ void SvXMLImportContext::Characters( const OUString& )
 
 // css::xml::sax::XFastContextHandler:
 void SAL_CALL SvXMLImportContext::startFastElement(sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     mrImport.isFastContext = false;
     startUnknownElement( mrImport.getNamespacePrefixFromToken( nElement ),
@@ -77,7 +76,6 @@ void SAL_CALL SvXMLImportContext::startFastElement(sal_Int32 nElement, const uno
 
 void SAL_CALL SvXMLImportContext::startUnknownElement(const OUString & rPrefix, const OUString & rLocalName,
     const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     OUString elementName;
     rtl::Reference < comphelper::AttributeList > rAttrList = new comphelper::AttributeList;
@@ -125,7 +123,6 @@ void SAL_CALL SvXMLImportContext::startUnknownElement(const OUString & rPrefix,
 }
 
 void SAL_CALL SvXMLImportContext::endFastElement(sal_Int32 nElement)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     mrImport.isFastContext = false;
     endUnknownElement( mrImport.getNamespacePrefixFromToken( nElement ),
@@ -133,7 +130,6 @@ void SAL_CALL SvXMLImportContext::endFastElement(sal_Int32 nElement)
 }
 
 void SAL_CALL SvXMLImportContext::endUnknownElement (const OUString & rPrefix, const OUString & rLocalName)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     OUString elementName;
     if ( !rPrefix.isEmpty() )
@@ -145,7 +141,6 @@ void SAL_CALL SvXMLImportContext::endUnknownElement (const OUString & rPrefix, c
 
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SvXMLImportContext::createFastChildContext
     (sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     // Call CreateFastContext only if it's the first element of the document
     if ( !mrImport.maFastContexts.size() )
@@ -156,13 +151,11 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SvXMLImportContext::cre
 
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SvXMLImportContext::createUnknownChildContext
     (const OUString &, const OUString &, const uno::Reference< xml::sax::XFastAttributeList > &)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     return this;
 }
 
 void SAL_CALL SvXMLImportContext::characters(const OUString &rChars)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     mrImport.Characters( rChars );
 }
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 008ac5cc7f86..f7eb33c34939 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -84,7 +84,7 @@ public:
     explicit SvXMLImportEventListener(SvXMLImport* pImport);
 
                             // XEventListener
-    virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) throw(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing(const lang::EventObject& rEventObject) override;
 };
 
 SvXMLImportEventListener::SvXMLImportEventListener(SvXMLImport* pTempImport)
@@ -94,7 +94,6 @@ SvXMLImportEventListener::SvXMLImportEventListener(SvXMLImport* pTempImport)
 
 // XEventListener
 void SAL_CALL SvXMLImportEventListener::disposing( const lang::EventObject& )
-    throw(uno::RuntimeException, std::exception)
 {
     if (pImport)
     {
@@ -420,7 +419,6 @@ namespace
 
 // XUnoTunnel
 sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >& rId )
-    throw( uno::RuntimeException, std::exception )
 {
     if( rId.getLength() == 16 &&
         0 == memcmp( theSvXMLImportUnoTunnelId::get().getSeq().getConstArray(),
@@ -433,7 +431,6 @@ sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >& r
 
 // XFastParser
 void SAL_CALL SvXMLImport::parseStream( const xml::sax::InputSource& aInputSource )
-    throw (xml::sax::SAXException, io::IOException, uno::RuntimeException, std::exception)
 {
     if ( mxFastDocumentHandler.is() )
         mxParser->setFastDocumentHandler( mxFastDocumentHandler );
@@ -445,58 +442,47 @@ void SAL_CALL SvXMLImport::parseStream( const xml::sax::InputSource& aInputSourc
 }
 
 void SAL_CALL SvXMLImport::setFastDocumentHandler( const uno::Reference< xml::sax::XFastDocumentHandler >& Handler )
-    throw (uno::RuntimeException, std::exception)
 {
     mxFastDocumentHandler = Handler;
 }
 
 void SAL_CALL SvXMLImport::setTokenHandler( const uno::Reference< xml::sax::XFastTokenHandler >& Handler )
-    throw (uno::RuntimeException, std::exception)
 {
     mxParser->setTokenHandler( Handler );
 }
 
 void SAL_CALL SvXMLImport::registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken )
-    throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     mxParser->registerNamespace( NamespaceURL, NamespaceToken );
 }
 
 OUString SAL_CALL SvXMLImport::getNamespaceURL( const OUString& rPrefix )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     return mxParser->getNamespaceURL( rPrefix );
 }
 
 void SAL_CALL SvXMLImport::setErrorHandler( const uno::Reference< xml::sax::XErrorHandler >& Handler )
-    throw (uno::RuntimeException, std::exception)
 {
     mxParser->setErrorHandler( Handler );
 }
 
 void SAL_CALL SvXMLImport::setEntityResolver( const uno::Reference< xml::sax::XEntityResolver >& Resolver )
-    throw (uno::RuntimeException, std::exception)
 {
     mxParser->setEntityResolver( Resolver );
 }
 
 void SAL_CALL SvXMLImport::setLocale( const lang::Locale& rLocale )
-    throw (uno::RuntimeException, std::exception)
 {
     mxParser->setLocale( rLocale );
 }
 
 void SAL_CALL SvXMLImport::setNamespaceHandler( const uno::Reference< xml::sax::XFastNamespaceHandler >& Handler)
-    throw (uno::RuntimeException, std::exception)
 {
     mxParser->setNamespaceHandler( Handler );
 }
 
 
 void SAL_CALL SvXMLImport::startDocument()
-    throw (xml::sax::SAXException,
-           uno::RuntimeException,
-           std::exception)
 {
     SAL_INFO( "xmloff.core", "{ SvXMLImport::startDocument" );
     if( !mxGraphicResolver.is() || !mxEmbeddedResolver.is() )
@@ -532,9 +518,6 @@ void SAL_CALL SvXMLImport::startDocument()
 }
 
 void SAL_CALL SvXMLImport::endDocument()
-    throw(xml::sax::SAXException,
-          uno::RuntimeException,
-          std::exception)
 {
     SAL_INFO( "xmloff.core", "} SvXMLImport::endDocument" );
     //  #i9518# All the stuff that accesses the document has to be done here, not in the dtor,
@@ -676,7 +659,6 @@ std::unique_ptr<SvXMLNamespaceMap> SvXMLImport::processNSAttributes(
 
 void SAL_CALL SvXMLImport::startElement( const OUString& rName,
                                          const uno::Reference< xml::sax::XAttributeList >& xAttrList )
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     //    SAL_INFO("svg", "startElement " << rName);
     // Process namespace attributes. This must happen before creating the
@@ -732,7 +714,6 @@ void SAL_CALL SvXMLImport::endElement( const OUString&
 rName
 #endif
 )
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if (maContexts.empty())
     {
@@ -772,7 +753,6 @@ rName
 }
 
 void SAL_CALL SvXMLImport::characters( const OUString& rChars )
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     if ( !maFastContexts.empty() )
     {
@@ -793,18 +773,15 @@ void SvXMLImport::Characters( const OUString& rChars )
 }
 
 void SAL_CALL SvXMLImport::ignorableWhitespace( const OUString& )
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL SvXMLImport::processingInstruction( const OUString&,
                                        const OUString& )
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL SvXMLImport::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& rLocator )
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     mxLocator = rLocator;
 }
@@ -812,7 +789,6 @@ void SAL_CALL SvXMLImport::setDocumentLocator( const uno::Reference< xml::sax::X
 // XFastContextHandler
 void SAL_CALL SvXMLImport::startFastElement (sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     //Namespace handling is unnecessary. It is done by the fastparser itself.
     uno::Reference<XFastContextHandler> xContext;
@@ -850,7 +826,6 @@ void SAL_CALL SvXMLImport::startFastElement (sal_Int32 Element,
 
 void SAL_CALL SvXMLImport::startUnknownElement (const OUString & rPrefix, const OUString & rLocalName,
     const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     uno::Reference<XFastContextHandler> xContext;
     if (!maFastContexts.empty())
@@ -869,7 +844,6 @@ void SAL_CALL SvXMLImport::startUnknownElement (const OUString & rPrefix, const
 }
 
 void SAL_CALL SvXMLImport::endFastElement (sal_Int32 Element)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (!maFastContexts.empty())
     {
@@ -885,7 +859,6 @@ void SAL_CALL SvXMLImport::endFastElement (sal_Int32 Element)
 }
 
 void SAL_CALL SvXMLImport::endUnknownElement (const OUString & rPrefix, const OUString & rLocalName)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     if (!maFastContexts.empty())
     {
@@ -899,7 +872,6 @@ void SAL_CALL SvXMLImport::endUnknownElement (const OUString & rPrefix, const OU
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
     SvXMLImport::createFastChildContext (sal_Int32,
     const uno::Reference< xml::sax::XFastAttributeList > &)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     return this;
 }
@@ -907,32 +879,28 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
     SvXMLImport::createUnknownChildContext (const OUString &, const OUString &,
     const uno::Reference< xml::sax::XFastAttributeList > &)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     return this;
 }
 
 // XExtendedDocumentHandler
-void SAL_CALL SvXMLImport::startCDATA() throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL SvXMLImport::startCDATA()
 {
 }
 
-void SAL_CALL SvXMLImport::endCDATA() throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvXMLImport::endCDATA()
 {
 }
 
 void SAL_CALL SvXMLImport::comment( const OUString& )
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL SvXMLImport::allowLineBreak()
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL SvXMLImport::unknown( const OUString& )
-    throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
@@ -944,7 +912,6 @@ void SvXMLImport::SetStatistics(const uno::Sequence< beans::NamedValue> &)
 
 // XImporter
 void SAL_CALL SvXMLImport::setTargetDocument( const uno::Reference< lang::XComponent >& xDoc )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     mxModel.set( xDoc, UNO_QUERY );
     if( !mxModel.is() )
@@ -980,19 +947,16 @@ void SAL_CALL SvXMLImport::setTargetDocument( const uno::Reference< lang::XCompo
 
 // XFilter
 sal_Bool SAL_CALL SvXMLImport::filter( const uno::Sequence< beans::PropertyValue >& )
-    throw (uno::RuntimeException, std::exception)
 {
     return false;
 }
 
 void SAL_CALL SvXMLImport::cancel(  )
-    throw (uno::RuntimeException, std::exception)
 {
 }
 
 // XInitialize
 void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArguments )
-    throw(css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     const sal_Int32 nAnyCount = aArguments.getLength();
     const uno::Any* pAny = aArguments.getConstArray();
@@ -1098,19 +1062,16 @@ void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen
 
 // XServiceInfo
 OUString SAL_CALL SvXMLImport::getImplementationName()
-    throw(uno::RuntimeException, std::exception)
 {
     return mpImpl->implementationName;
 }
 
 sal_Bool SAL_CALL SvXMLImport::supportsService( const OUString& rServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SvXMLImport::getSupportedServiceNames(  )
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Sequence<OUString> aSeq(2);
     aSeq[0] = "com.sun.star.document.ImportFilter";
@@ -2118,14 +2079,12 @@ void SvXMLImportFastNamespaceHandler::addNSDeclAttributes( rtl::Reference < comp
 }
 
 void SvXMLImportFastNamespaceHandler::registerNamespace( const OUString& rNamespacePrefix, const OUString& rNamespaceURI )
-                            throw (uno::RuntimeException, std::exception)
 {
     m_aNamespaceDefines.push_back( o3tl::make_unique<NamespaceDefine>(
                                     rNamespacePrefix, rNamespaceURI) );
 }
 
 OUString SvXMLImportFastNamespaceHandler::getNamespaceURI( const OUString&/* rNamespacePrefix */ )
-                            throw (uno::RuntimeException, std::exception)
 {
     return OUString();
 }
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index ac7033f91047..7ecfb5fdb3df 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1252,12 +1252,12 @@ public:
     SvXMLImportContext* CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName,   const Reference<XAttributeList>& xAttrList) override;
 
     // XInterface
-    virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) override;
+    virtual Any SAL_CALL queryInterface( const Type& aType ) override;
     virtual void SAL_CALL acquire() throw () override;
     virtual void SAL_CALL release() throw () override;
 
     // XAnimationNodeSupplier
-    Reference< XAnimationNode > SAL_CALL getAnimationNode() throw (RuntimeException, std::exception) override;
+    Reference< XAnimationNode > SAL_CALL getAnimationNode() override;
 
 private:
     Reference< XAnimationNode > mxRootNode;
@@ -1289,7 +1289,7 @@ AnimationsImport::AnimationsImport( const Reference< XComponentContext > & rxCon
 }
 
 // XInterface
-Any SAL_CALL AnimationsImport::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
+Any SAL_CALL AnimationsImport::queryInterface( const Type& aType )
 {
     if ( aType == cppu::UnoType<XAnimationNodeSupplier>::get())
     {
@@ -1328,7 +1328,7 @@ SvXMLImportContext *AnimationsImport::CreateContext(sal_uInt16 nPrefix, const OU
 }
 
 // XAnimationNodeSupplier
-Reference< XAnimationNode > SAL_CALL AnimationsImport::getAnimationNode() throw (RuntimeException, std::exception)
+Reference< XAnimationNode > SAL_CALL AnimationsImport::getAnimationNode()
 {
     return mxRootNode;
 }
@@ -1413,7 +1413,7 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
 
 } // namespace xmloff
 
-Reference< XInterface > SAL_CALL AnimationsImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception )
+Reference< XInterface > SAL_CALL AnimationsImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr)
 {
     return static_cast<cppu::OWeakObject*>(new xmloff::AnimationsImport( comphelper::getComponentContext(rSMgr) ));
 }
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 81f05076c846..ed72c78b8a90 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -410,7 +410,6 @@ SdXMLExport::SdXMLExport(
 
 // XExporter
 void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent >& xDoc )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SvXMLExport::setSourceDocument( xDoc );
 
@@ -2709,7 +2708,7 @@ OUString SAL_CALL classname##_getImplementationName() throw()\
 {\
     return OUString( implementationname );\
 }\
-uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )\
+uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
 {\
     return static_cast<cppu::OWeakObject*>(new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
 }
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index 6e13b5cc3b0c..484193314313 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -166,7 +166,7 @@ public:
     virtual ~SdXMLExport() override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     // get factories and mappers
     XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper.get(); }
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 276afb1f3a14..10010ca83ec0 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -243,7 +243,7 @@ OUString SAL_CALL classname##_getImplementationName() throw()\
 {\
     return OUString( implementationname );\
 }\
-uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )\
+uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr)\
 {\
     return static_cast<cppu::OWeakObject*>(new SdXMLImport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
 }
@@ -295,7 +295,6 @@ SdXMLImport::SdXMLImport(
 
 // XImporter
 void SAL_CALL SdXMLImport::setTargetDocument( const uno::Reference< lang::XComponent >& xDoc )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SvXMLImport::setTargetDocument( xDoc );
 
@@ -354,7 +353,6 @@ void SAL_CALL SdXMLImport::setTargetDocument( const uno::Reference< lang::XCompo
 
 // XInitialization
 void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArguments )
-    throw( uno::Exception, uno::RuntimeException, std::exception)
 {
     SvXMLImport::initialize( aArguments );
 
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 06fe67013a75..f102b96d06f5 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -191,10 +191,10 @@ public:
         bool bIsDraw, SvXMLImportFlags nImportFlags );
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override;
     virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override;
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 00a0125670c4..1f701b2eba7f 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -514,12 +514,12 @@ public:
     explicit XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes );
 
     // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(  ) throw (RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getCount(  ) override;
+    virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override;
 
     // XElementAccess
-    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException, std::exception) override;
+    virtual Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
 private:
     std::vector< Reference< XShape > > maShapes;
@@ -531,12 +531,12 @@ XoNavigationOrderAccess::XoNavigationOrderAccess( std::vector< Reference< XShape
 }
 
 // XIndexAccess
-sal_Int32 SAL_CALL XoNavigationOrderAccess::getCount(  ) throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL XoNavigationOrderAccess::getCount(  )
 {
     return static_cast< sal_Int32 >( maShapes.size() );
 }
 
-Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index )
 {
     if( (Index < 0) || (Index > getCount()) )
         throw IndexOutOfBoundsException();
@@ -545,12 +545,12 @@ Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (Index
 }
 
 // XElementAccess
-Type SAL_CALL XoNavigationOrderAccess::getElementType(  ) throw (RuntimeException, std::exception)
+Type SAL_CALL XoNavigationOrderAccess::getElementType(  )
 {
     return cppu::UnoType<XShape>::get();
 }
 
-sal_Bool SAL_CALL XoNavigationOrderAccess::hasElements(  ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL XoNavigationOrderAccess::hasElements(  )
 {
     return !maShapes.empty();
 }
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index 275c6232d59d..ed3dfa169382 100644
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
@@ -73,7 +73,7 @@ namespace xmloff
         return false;
     }
 
-    sal_Int16 SAL_CALL OAttribListMerger::getLength(  ) throw(RuntimeException, std::exception)
+    sal_Int16 SAL_CALL OAttribListMerger::getLength(  )
     {
         sal_Int16 nCount = 0;
         for (   AttributeListArray::const_iterator aAccumulate = m_aLists.begin();
@@ -84,7 +84,7 @@ namespace xmloff
         return nCount;
     }
 
-    OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i )
     {
         Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
@@ -95,7 +95,7 @@ namespace xmloff
         return xSubList->getNameByIndex(nLocalIndex);
     }
 
-    OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i )
     {
         Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
@@ -106,7 +106,7 @@ namespace xmloff
         return xSubList->getTypeByIndex(nLocalIndex);
     }
 
-    OUString SAL_CALL OAttribListMerger::getTypeByName( const OUString& _rName ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL OAttribListMerger::getTypeByName( const OUString& _rName )
     {
         Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
@@ -119,7 +119,7 @@ namespace xmloff
         return xSubList->getTypeByIndex(nLocalIndex);
     }
 
-    OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i )
     {
         Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
@@ -130,7 +130,7 @@ namespace xmloff
         return xSubList->getValueByIndex(nLocalIndex);
     }
 
-    OUString SAL_CALL OAttribListMerger::getValueByName( const OUString& _rName ) throw(RuntimeException, std::exception)
+    OUString SAL_CALL OAttribListMerger::getValueByName( const OUString& _rName )
     {
         Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index f6f29024269b..0355adb66497 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -52,12 +52,12 @@ namespace xmloff
         void addList(const css::uno::Reference< css::xml::sax::XAttributeList >& _rList);
 
         // XAttributeList
-        virtual sal_Int16 SAL_CALL getLength(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getTypeByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getValueByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int16 SAL_CALL getLength(  ) override;
+        virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) override;
+        virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) override;
+        virtual OUString SAL_CALL getTypeByName( const OUString& aName ) override;
+        virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) override;
+        virtual OUString SAL_CALL getValueByName( const OUString& aName ) override;
 
     protected:
         bool seekToIndex(sal_Int16 _nGlobalIndex, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex);
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index d5a406e7f40e..b89dc22bc5bb 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -308,7 +308,7 @@ namespace xmloff
         exportOuterAttributes();
     }
 
-    void OControlExport::exportSubTags() throw (Exception, std::exception)
+    void OControlExport::exportSubTags()
     {
         // for the upcoming exportRemainingProperties:
         // if a control has the LabelControl property, this is not stored with the control itself, but instead with
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index ca32768652c6..c3fcd4e96648 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -149,7 +149,7 @@ namespace xmloff
 
         /** writes everything which needs to be represented as sub tag
         */
-        void exportSubTags() throw (css::uno::Exception, std::exception) override;
+        void exportSubTags() override;
 
         /** adds the attributes which are handled via generic IPropertyHandlers
 
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index fb35f1c7269c..0cbd69068eb4 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -88,13 +88,13 @@ namespace xmloff
         }
     }
 
-    void SAL_CALL OEventDescriptorMapper::replaceByName( const OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OEventDescriptorMapper::replaceByName( const OUString&, const Any& )
     {
         throw IllegalArgumentException(
             "replacing is not implemented for this wrapper class.", static_cast< ::cppu::OWeakObject* >(this), 1);
     }
 
-    Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName )
     {
         MapString2PropertyValueSequence::const_iterator aPos = m_aMappedEvents.find(_rName);
         if (m_aMappedEvents.end() == aPos)
@@ -105,23 +105,23 @@ namespace xmloff
         return makeAny(aPos->second);
     }
 
-    Sequence< OUString > SAL_CALL OEventDescriptorMapper::getElementNames(  ) throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OEventDescriptorMapper::getElementNames(  )
     {
         return comphelper::mapKeysToSequence(m_aMappedEvents);
     }
 
-    sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const OUString& _rName ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const OUString& _rName )
     {
         MapString2PropertyValueSequence::const_iterator aPos = m_aMappedEvents.find(_rName);
         return m_aMappedEvents.end() != aPos;
     }
 
-    Type SAL_CALL OEventDescriptorMapper::getElementType(  ) throw(RuntimeException, std::exception)
+    Type SAL_CALL OEventDescriptorMapper::getElementType(  )
     {
         return ::cppu::UnoType<PropertyValue>::get();
     }
 
-    sal_Bool SAL_CALL OEventDescriptorMapper::hasElements(  ) throw(RuntimeException, std::exception)
+    sal_Bool SAL_CALL OEventDescriptorMapper::hasElements(  )
     {
         return !m_aMappedEvents.empty();
     }
diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx
index 40d239358542..3f609d896ed8 100644
--- a/xmloff/source/forms/eventexport.hxx
+++ b/xmloff/source/forms/eventexport.hxx
@@ -56,16 +56,16 @@ namespace xmloff
             const css::uno::Sequence< css::script::ScriptEventDescriptor >& _rEvents);
 
         // XNameReplace
-        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
         // XNameAccess
-        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
         // XElementAccess
-        virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasElements(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Type SAL_CALL getElementType(  ) override;
+        virtual sal_Bool SAL_CALL hasElements(  ) override;
     };
 
 }   // namespace xmloff
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index 8ac82ee9b186..b149d4f9665c 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -127,9 +127,9 @@ namespace xmloff
             virtual ~OMergedPropertySetInfo() override;
 
             // XPropertySetInfo
-            virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
-            virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
-            virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override;
+            virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties(  ) override;
+            virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+            virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
         };
 
         OMergedPropertySetInfo::OMergedPropertySetInfo( const Reference< XPropertySetInfo >& _rxMasterInfo )
@@ -142,7 +142,7 @@ namespace xmloff
         {
         }
 
-        Sequence< Property > SAL_CALL OMergedPropertySetInfo::getProperties(  ) throw (RuntimeException, std::exception)
+        Sequence< Property > SAL_CALL OMergedPropertySetInfo::getProperties(  )
         {
             // add a "ParaAdjust" property to the master properties
             Sequence< Property > aProperties;
@@ -156,7 +156,7 @@ namespace xmloff
             return aProperties;
         }
 
-        Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+        Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const OUString& aName )
         {
             if ( aName == getParaAlignProperty() )
                 return Property( getParaAlignProperty(), -1,
@@ -168,7 +168,7 @@ namespace xmloff
             return m_xMasterInfo->getPropertyByName( aName );
         }
 
-        sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception)
+        sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const OUString& Name )
         {
             if ( Name == getParaAlignProperty() )
                 return true;
@@ -191,7 +191,7 @@ namespace xmloff
     {
     }
 
-    Reference< XPropertySetInfo > SAL_CALL OGridColumnPropertyTranslator::getPropertySetInfo(  ) throw (RuntimeException, std::exception)
+    Reference< XPropertySetInfo > SAL_CALL OGridColumnPropertyTranslator::getPropertySetInfo(  )
     {
         Reference< XPropertySetInfo > xColumnPropInfo;
         if ( m_xGridColumn.is() )
@@ -199,7 +199,7 @@ namespace xmloff
         return new OMergedPropertySetInfo( xColumnPropInfo );
     }
 
-    void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const OUString& _rPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const OUString& _rPropertyName, const Any& aValue )
     {
         // we implement this by delegating it to setPropertyValues, which is to ignore unknown properties. On the other hand, our
         // contract requires us to throw a UnknownPropertyException for unknown properties, so check this first.
@@ -212,7 +212,7 @@ namespace xmloff
         setPropertyValues( aNames, aValues );
     }
 
-    Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const OUString& PropertyName )
     {
         Sequence< OUString > aNames( &PropertyName, 1 );
         Sequence< Any > aValues = getPropertyValues( aNames );
@@ -222,27 +222,27 @@ namespace xmloff
         return Any();
     }
 
-    void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
     {
         OSL_FAIL( "OGridColumnPropertyTranslator::addPropertyChangeListener: not implemented - this should not be needed!" );
     }
 
-    void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
     {
         OSL_FAIL( "OGridColumnPropertyTranslator::removePropertyChangeListener: not implemented - this should not be needed!" );
     }
 
-    void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
     {
         OSL_FAIL( "OGridColumnPropertyTranslator::addVetoableChangeListener: not implemented - this should not be needed!" );
     }
 
-    void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
     {
         OSL_FAIL( "OGridColumnPropertyTranslator::removeVetoableChangeListener: not implemented - this should not be needed!" );
     }
 
-    void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+    void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues )
     {
         if ( !m_xGridColumn.is() )
             return;
@@ -263,7 +263,7 @@ namespace xmloff
         m_xGridColumn->setPropertyValues( aTranslatedNames, aTranslatedValues );
     }
 
-    Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception)
+    Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< OUString >& aPropertyNames )
     {
         Sequence< Any > aValues( aPropertyNames.getLength() );
         if ( !m_xGridColumn.is() )
@@ -281,17 +281,17 @@ namespace xmloff
         return aValues;
     }
 
-    void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception)
+    void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
     {
         OSL_FAIL( "OGridColumnPropertyTranslator::addPropertiesChangeListener: not implemented - this should not be needed!" );
     }
 
-    void SAL_CALL OGridColumnPropertyTranslator::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception)
+    void SAL_CALL OGridColumnPropertyTranslator::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& )
     {
         OSL_FAIL( "OGridColumnPropertyTranslator::removePropertiesChangeListener: not implemented - this should not be needed!" );
     }
 
-    void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception)
+    void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
     {
         OSL_FAIL( "OGridColumnPropertyTranslator::firePropertiesChangeEvent: not implemented - this should not be needed!" );
     }
diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx
index 5d66f671e35f..d8e0c17509a8 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.hxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.hxx
@@ -46,20 +46,20 @@ namespace xmloff
         virtual ~OGridColumnPropertyTranslator() override;
 
         // XPropertySet
-        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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 getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+        virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+        virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+        virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+        virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
     };
 
 } // namespace xmloff
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index eef8e3adf1a4..24ff911018c6 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -53,7 +53,7 @@ XMLMetaExportComponent::~XMLMetaExportComponent()
 {
 }
 
-void SAL_CALL XMLMetaExportComponent::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL XMLMetaExportComponent::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
 {
     try
     {
@@ -199,7 +199,6 @@ OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw()
 
 uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance(
         const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-    throw( uno::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportOOO_getImplementationName(), SvXMLExportFlags::META));
 }
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index fcf9a8352bc5..98fe47608ca3 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -49,8 +49,7 @@ protected:
         const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc )
-        throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 };
 
 // global functions to support the component
@@ -93,7 +92,6 @@ SvXMLImportContext* XMLMetaImportComponent::CreateContext(
 
 void SAL_CALL XMLMetaImportComponent::setTargetDocument(
     const uno::Reference< lang::XComponent >& xDoc )
-    throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     mxDocProps.set( xDoc, uno::UNO_QUERY );
     if( !mxDocProps.is() )
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index 9d94e7917573..2cb5522e27a8 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -347,7 +347,6 @@ void SvXMLMetaExport::Export()
 // css::xml::sax::XDocumentHandler:
 void SAL_CALL
 SvXMLMetaExport::startDocument()
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     // ignore: has already been done by SvXMLExport::exportDoc
     assert(m_level == 0 && "SvXMLMetaExport: level error");
@@ -355,7 +354,6 @@ SvXMLMetaExport::startDocument()
 
 void SAL_CALL
 SvXMLMetaExport::endDocument()
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     // ignore: will be done by SvXMLExport::exportDoc
     assert(m_level == 0 && "SvXMLMetaExport: level error");
@@ -365,7 +363,6 @@ SvXMLMetaExport::endDocument()
 void SAL_CALL
 SvXMLMetaExport::startElement(const OUString & i_rName,
     const uno::Reference< xml::sax::XAttributeList > & i_xAttribs)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 
     if (m_level == 0) {
@@ -447,7 +444,6 @@ SvXMLMetaExport::startElement(const OUString & i_rName,
 
 void SAL_CALL
 SvXMLMetaExport::endElement(const OUString & i_rName)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     --m_level;
     if (m_level == 0) {
@@ -460,14 +456,12 @@ SvXMLMetaExport::endElement(const OUString & i_rName)
 
 void SAL_CALL
 SvXMLMetaExport::characters(const OUString & i_rChars)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     mrExport.Characters(i_rChars);
 }
 
 void SAL_CALL
 SvXMLMetaExport::ignorableWhitespace(const OUString & /*i_rWhitespaces*/)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     mrExport.IgnorableWhitespace(/*i_rWhitespaces*/);
 }
@@ -475,7 +469,6 @@ SvXMLMetaExport::ignorableWhitespace(const OUString & /*i_rWhitespaces*/)
 void SAL_CALL
 SvXMLMetaExport::processingInstruction(const OUString & i_rTarget,
     const OUString & i_rData)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     // ignore; the exporter cannot handle these
     (void) i_rTarget;
@@ -484,7 +477,6 @@ SvXMLMetaExport::processingInstruction(const OUString & i_rTarget,
 
 void SAL_CALL
 SvXMLMetaExport::setDocumentLocator(const uno::Reference<xml::sax::XLocator>&)
-    throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
     // nothing to do here, move along...
 }
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index cb664689a477..9ccbc23bea63 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -318,7 +318,6 @@ bool XMLVersionContext::ParseISODateTimeString(
 }
 
 void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XStorage >& xRoot, const uno::Sequence< util::RevisionTag >& rVersions )
-    throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     // no storage, no version list!
     if ( xRoot.is() )
@@ -364,7 +363,6 @@ void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XSt
 }
 
 uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( const uno::Reference< embed::XStorage >& xRoot )
-        throw (css::container::NoSuchElementException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence < css::util::RevisionTag > aVersions;
 
@@ -427,21 +425,18 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
 }
 
 OUString XMLVersionListPersistence::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return OUString("XMLVersionListPersistence");
 }
 
 sal_Bool XMLVersionListPersistence::supportsService(
     OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString>
 XMLVersionListPersistence::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return css::uno::Sequence<OUString>{
         "com.sun.star.document.DocumentRevisionListPersistence"};
diff --git a/xmloff/source/style/StyleMap.cxx b/xmloff/source/style/StyleMap.cxx
index 0ebcbc0985b3..b500390daa35 100644
--- a/xmloff/source/style/StyleMap.cxx
+++ b/xmloff/source/style/StyleMap.cxx
@@ -63,7 +63,6 @@ StyleMap* StyleMap::getImplementation(const Reference<XInterface>& xInterface) t
 
 // XUnoTunnel
 sal_Int64 SAL_CALL StyleMap::getSomething(const Sequence<sal_Int8>& rId)
-    throw(RuntimeException, std::exception)
 {
     if (rId.getLength() == 16 &&
         memcmp(getUnoTunnelId().getConstArray(), rId.getConstArray(), 16) == 0)
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index a0b89188b1e0..2d409a48dca6 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -69,7 +69,6 @@ XMLAutoTextEventExport::~XMLAutoTextEventExport()
 
 void XMLAutoTextEventExport::initialize(
     const Sequence<Any> & rArguments )
-        throw(uno::Exception, uno::RuntimeException, std::exception)
 {
     if (rArguments.getLength() > 1)
     {
@@ -217,7 +216,6 @@ OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw()
 
 Reference< XInterface > SAL_CALL XMLAutoTextEventExport_createInstance(
         const Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExport_getImplementationName(), SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS));
 }
@@ -238,7 +236,6 @@ OUString SAL_CALL XMLAutoTextEventExportOOO_getImplementationName() throw()
 
 Reference< XInterface > SAL_CALL XMLAutoTextEventExportOOO_createInstance(
         const Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExportOOO_getImplementationName(), SvXMLExportFlags::ALL));
 }
diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx
index 7885d60e4d7e..014ce926ee28 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
@@ -58,10 +58,7 @@ public:
 
     // 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;
 
 protected:
 
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index c78c5a92d2ee..dcb7d93554b3 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <facreg.hxx>
 #include "XMLAutoTextContainerEventImport.hxx"
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
@@ -57,7 +58,6 @@ XMLAutoTextEventImport::~XMLAutoTextEventImport() throw()
 
 void XMLAutoTextEventImport::initialize(
     const Sequence<Any> & rArguments )
-        throw(Exception, RuntimeException, std::exception)
 {
     // The events may come as either an XNameReplace or XEventsSupplier.
 
@@ -118,7 +118,6 @@ OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw()
 
 Reference< XInterface > SAL_CALL XMLAutoTextEventImport_createInstance(
         const Reference< XMultiServiceFactory > & rSMgr)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventImport( comphelper::getComponentContext(rSMgr) ));
 }
diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx
index 79be6557c02d..0d7b4d4787fb 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.hxx
@@ -26,14 +26,11 @@
 
 namespace com { namespace sun { namespace star {
     namespace frame { class XModel; }
-    namespace lang { class XMultiServiceFactory; }
     namespace text { class XAutoTextContainer; }
     namespace text { class XAutoTextGroup; }
     namespace text { class XAutoTextEntry; }
     namespace uno { template<class X> class Reference; }
     namespace uno { template<class X> class Sequence; }
-    namespace uno { class XInterface; }
-    namespace uno { class Exception; }
     namespace xml { namespace sax { class XDocumentHandler; } }
 } } }
 
@@ -51,10 +48,7 @@ public:
 
     // 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;
 
 protected:
 
@@ -65,22 +59,6 @@ protected:
 
 };
 
-
-// global functions to support the component
-
-css::uno::Sequence< OUString > SAL_CALL
-    XMLAutoTextEventImport_getSupportedServiceNames()
-    throw();
-
-OUString SAL_CALL XMLAutoTextEventImport_getImplementationName()
-    throw();
-
-/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface > SAL_CALL
-    XMLAutoTextEventImport_createInstance(
-        const css::uno::Reference< css::lang::XMultiServiceFactory > & )
-    throw( css::uno::Exception );
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index a020147ddd05..c831e6f27d21 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -71,7 +71,6 @@ namespace
 // XUnoTunnel
 sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething(
         const Sequence< sal_Int8 >& rId )
-    throw( RuntimeException, std::exception )
 {
     if( rId.getLength() == 16 &&
         0 == memcmp( theXMLMutableAttributeListUnoTunnelId::get().getSeq().getConstArray(),
@@ -83,48 +82,41 @@ sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething(
 }
 
 sal_Int16 SAL_CALL XMLMutableAttributeList::getLength()
-        throw( RuntimeException, std::exception )
 {
     return m_xAttrList->getLength();
 }
 
 
 OUString SAL_CALL XMLMutableAttributeList::getNameByIndex(sal_Int16 i)
-        throw( RuntimeException, std::exception )
 {
     return m_xAttrList->getNameByIndex( i );
 }
 
 
 OUString SAL_CALL XMLMutableAttributeList::getTypeByIndex(sal_Int16 i)
-        throw( RuntimeException, std::exception )
 {
     return m_xAttrList->getTypeByIndex( i );
 }
 
 OUString SAL_CALL  XMLMutableAttributeList::getValueByIndex(sal_Int16 i)
-    throw( RuntimeException, std::exception )
 {
     return m_xAttrList->getValueByIndex( i );
 }
 
 OUString SAL_CALL XMLMutableAttributeList::getTypeByName(
         const OUString& rName )
-        throw( RuntimeException, std::exception )
 {
     return m_xAttrList->getTypeByName( rName );
 }
 
 OUString SAL_CALL XMLMutableAttributeList::getValueByName(
         const OUString& rName)
-        throw( RuntimeException, std::exception )
 {
     return m_xAttrList->getValueByName( rName );
 }
 
 
 Reference< XCloneable > XMLMutableAttributeList::createClone()
-        throw( RuntimeException, std::exception )
 {
     // A cloned list will be a read only list!
     Reference< XCloneable >  r = new SvXMLAttributeList( m_xAttrList );
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index f5df31659ab5..dd311560c655 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -47,18 +47,18 @@ public:
     virtual ~XMLMutableAttributeList() override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // css::xml::sax::XAttributeList
-    virtual sal_Int16 SAL_CALL getLength() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int16 SAL_CALL getLength() override;
+    virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) override;
+    virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) override;
+    virtual OUString SAL_CALL getTypeByName(const OUString& aName) override;
+    virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) override;
+    virtual OUString SAL_CALL getValueByName(const OUString& aName) override;
 
     // css::util::XCloneable
-    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()   throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
 
     // methods that are not contained in any interface
     void SetValueByIndex( sal_Int16 i, const OUString& rValue );
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index e5e188eb13a8..9d2dcf492283 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1810,7 +1810,6 @@ OOo2OasisTransformer::~OOo2OasisTransformer() throw()
 }
 
 Any OOo2OasisTransformer::queryInterface( const Type& rType )
-    throw (RuntimeException, std::exception)
 {
     Any aRet;
     if ( rType == cppu::UnoType<XImporter>::get())
@@ -1834,7 +1833,6 @@ Any OOo2OasisTransformer::queryInterface( const Type& rType )
 // XImporter
 void SAL_CALL OOo2OasisTransformer::setTargetDocument(
         const Reference< XComponent >& xDoc )
-    throw( IllegalArgumentException, RuntimeException, std::exception)
 {
     if( !GetDocHandler().is() )
     {
@@ -1855,7 +1853,6 @@ void SAL_CALL OOo2OasisTransformer::setTargetDocument(
 // XFilter
 sal_Bool SAL_CALL OOo2OasisTransformer::filter(
         const Sequence< PropertyValue >& aDescriptor )
-    throw ( RuntimeException, std::exception)
 {
     Reference< XFilter> xFilter( GetDocHandler(), UNO_QUERY );
     OSL_ENSURE( xFilter.is(), "doc handler is not a filter" );
@@ -1866,7 +1863,6 @@ sal_Bool SAL_CALL OOo2OasisTransformer::filter(
 }
 
 void SAL_CALL OOo2OasisTransformer::cancel(  )
-    throw ( RuntimeException, std::exception)
 {
     Reference< XFilter> xFilter( GetDocHandler(), UNO_QUERY );
     OSL_ENSURE( xFilter.is(), "doc handler is not a filter" );
@@ -1877,13 +1873,11 @@ void SAL_CALL OOo2OasisTransformer::cancel(  )
 // XInitialize
 void SAL_CALL OOo2OasisTransformer::initialize(
                 const Sequence< Any >& rArguments )
-    throw( Exception, RuntimeException, std::exception )
 {
     Initialize( rArguments );
 }
 
 void SAL_CALL OOo2OasisTransformer::startDocument()
-    throw( SAXException, RuntimeException, std::exception )
 {
     if( !GetDocHandler().is() )
     {
@@ -1898,7 +1892,6 @@ void SAL_CALL OOo2OasisTransformer::startDocument()
 
 void SAL_CALL OOo2OasisTransformer::Initialize(
                 const Sequence< Any >& rArguments )
-    throw( Exception, RuntimeException )
 {
     OSL_ENSURE( !GetDocHandler().is(), "duplication initialization" );
 
@@ -1944,7 +1937,6 @@ namespace
 
 // XUnoTunnel
 sal_Int64 SAL_CALL OOo2OasisTransformer::getSomething( const Sequence< sal_Int8 >& rId )
-    throw(RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( theOOo2OasisTransformerUnoTunnelId::get().getSeq().getConstArray(),
@@ -1960,19 +1952,16 @@ sal_Int64 SAL_CALL OOo2OasisTransformer::getSomething( const Sequence< sal_Int8
 
 // XServiceInfo
 OUString SAL_CALL OOo2OasisTransformer::getImplementationName()
-    throw(RuntimeException, std::exception)
 {
     return m_aImplName;
 }
 
 sal_Bool SAL_CALL OOo2OasisTransformer::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL OOo2OasisTransformer::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     Sequence<OUString> aSeq(0);
     return aSeq;
@@ -1980,7 +1969,7 @@ Sequence< OUString > SAL_CALL OOo2OasisTransformer::getSupportedServiceNames(  )
 
 // XTypeProvider
 Sequence< css::uno::Type > SAL_CALL
-    OOo2OasisTransformer::getTypes() throw(RuntimeException, std::exception)
+    OOo2OasisTransformer::getTypes()
 {
     Sequence< css::uno::Type > aTypes( XMLTransformerBase::getTypes() );
 
@@ -2010,7 +1999,6 @@ Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() th
 
 Reference< XInterface > SAL_CALL OOo2OasisTransformer_createInstance(
         const Reference< XMultiServiceFactory > & )
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer());
 }
@@ -2030,7 +2018,6 @@ Sequence< OUString > SAL_CALL className##_getSupportedServiceNames() throw()\
                                                                         \
 Reference< XInterface > SAL_CALL className##_createInstance(            \
         const Reference< XMultiServiceFactory > & )                     \
-    throw( Exception )                                                  \
 {                                                                       \
     return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer( implName,      \
                                          subServiceName ));              \
diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx
index 14c4bcfae20a..96dcb42d8f87 100644
--- a/xmloff/source/transform/OOo2Oasis.hxx
+++ b/xmloff/source/transform/OOo2Oasis.hxx
@@ -58,8 +58,7 @@ public:
     // the new interfaces).
 
     virtual css::uno::Any SAL_CALL queryInterface(
-        const css::uno::Type& aType )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Type& aType ) override;
 
     virtual void SAL_CALL acquire(  ) throw () override
         { XMLTransformerBase::acquire(); };
@@ -68,34 +67,33 @@ public:
         { XMLTransformerBase::release(); };
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XTypeProvider
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL cancel(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+    virtual void SAL_CALL cancel(  ) override;
 
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
-    void SAL_CALL Initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException);
+    void SAL_CALL Initialize( const css::uno::Sequence< css::uno::Any >& aArguments );
 
     // css::xml::sax::XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocument() override;
 
     virtual OUString GetEventName( const OUString& rName,
                                             bool bForm = false ) override;
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index e90126430594..b5784f520344 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -41,6 +41,7 @@
 #include "AttrTransformerAction.hxx"
 #include "TransformerActions.hxx"
 #include "FamilyType.hxx"
+#include "XMLFilterRegistration.hxx"
 #include "facreg.hxx"
 #include <comphelper/servicehelper.hxx>
 #include "Oasis2OOo.hxx"
@@ -1924,7 +1925,6 @@ namespace
 
 // XUnoTunnel
 sal_Int64 SAL_CALL Oasis2OOoTransformer::getSomething( const Sequence< sal_Int8 >& rId )
-    throw(RuntimeException, std::exception)
 {
     if( rId.getLength() == 16
         && 0 == memcmp( theOasis2OOoTransformerUnoTunnelId::get().getSeq().getConstArray(),
@@ -1940,19 +1940,16 @@ sal_Int64 SAL_CALL Oasis2OOoTransformer::getSomething( const Sequence< sal_Int8
 
 // XServiceInfo
 OUString SAL_CALL Oasis2OOoTransformer::getImplementationName()
-    throw(RuntimeException, std::exception)
 {
     return Oasis2OOoTransformer_getImplementationName();
 }
 
 sal_Bool SAL_CALL Oasis2OOoTransformer::supportsService( const OUString& ServiceName )
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Sequence< OUString > SAL_CALL Oasis2OOoTransformer::getSupportedServiceNames(  )
-    throw(RuntimeException, std::exception)
 {
     Sequence<OUString> aSeq(0);
     return aSeq;
@@ -1975,7 +1972,6 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames()
 
 Reference< XInterface > SAL_CALL Oasis2OOoTransformer_createInstance(
         const Reference< XMultiServiceFactory > &)
-    throw( Exception )
 {
     SAL_INFO("xmloff.transform", "Creating Oasis2OOoTransformer");
     return static_cast<cppu::OWeakObject*>(new Oasis2OOoTransformer);
diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx
index 2dd880200ec3..eac75d289224 100644
--- a/xmloff/source/transform/Oasis2OOo.hxx
+++ b/xmloff/source/transform/Oasis2OOo.hxx
@@ -45,12 +45,12 @@ public:
     virtual ~Oasis2OOoTransformer() throw() override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
     virtual OUString GetEventName( const OUString& rName,
                                              bool bForm = false ) override;
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 08c4a21d00e5..92c569af0d41 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -211,20 +211,17 @@ XMLTransformerBase::~XMLTransformerBase() throw ()
 }
 
 void SAL_CALL XMLTransformerBase::startDocument()
-    throw( SAXException, RuntimeException, std::exception )
 {
     m_xHandler->startDocument();
 }
 
 void SAL_CALL XMLTransformerBase::endDocument()
-    throw( SAXException, RuntimeException, std::exception)
 {
     m_xHandler->endDocument();
 }
 
 void SAL_CALL XMLTransformerBase::startElement( const OUString& rName,
                                          const Reference< XAttributeList >& rAttrList )
-    throw(SAXException, RuntimeException, std::exception)
 {
     SvXMLNamespaceMap *pRewindMap = nullptr;
 
@@ -321,7 +318,6 @@ void SAL_CALL XMLTransformerBase::endElement( const OUString&
 rName
 #endif
 )
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( !m_pContexts.empty() )
     {
@@ -355,7 +351,6 @@ rName
 }
 
 void SAL_CALL XMLTransformerBase::characters( const OUString& rChars )
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( !m_pContexts.empty() )
     {
@@ -364,53 +359,47 @@ void SAL_CALL XMLTransformerBase::characters( const OUString& rChars )
 }
 
 void SAL_CALL XMLTransformerBase::ignorableWhitespace( const OUString& rWhitespaces )
-    throw(SAXException, RuntimeException, std::exception)
 {
     m_xHandler->ignorableWhitespace( rWhitespaces );
 }
 
 void SAL_CALL XMLTransformerBase::processingInstruction( const OUString& rTarget,
                                        const OUString& rData )
-    throw(SAXException, RuntimeException, std::exception)
 {
     m_xHandler->processingInstruction( rTarget, rData );
 }
 
 void SAL_CALL XMLTransformerBase::setDocumentLocator( const Reference< XLocator >& rLocator )
-    throw(SAXException, RuntimeException, std::exception)
 {
     m_xLocator = rLocator;
 }
 
 // XExtendedDocumentHandler
-void SAL_CALL XMLTransformerBase::startCDATA() throw(SAXException, RuntimeException, std::exception)
+void SAL_CALL XMLTransformerBase::startCDATA()
 {
     if( m_xExtHandler.is() )
         m_xExtHandler->startCDATA();
 }
 
-void SAL_CALL XMLTransformerBase::endCDATA() throw(RuntimeException, std::exception)
+void SAL_CALL XMLTransformerBase::endCDATA()
 {
     if( m_xExtHandler.is() )
         m_xExtHandler->endCDATA();
 }
 
 void SAL_CALL XMLTransformerBase::comment( const OUString& rComment )
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( m_xExtHandler.is() )
         m_xExtHandler->comment( rComment );
 }
 
 void SAL_CALL XMLTransformerBase::allowLineBreak()
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( m_xExtHandler.is() )
         m_xExtHandler->allowLineBreak();
 }
 
 void SAL_CALL XMLTransformerBase::unknown( const OUString& rString )
-    throw(SAXException, RuntimeException, std::exception)
 {
     if( m_xExtHandler.is() )
         m_xExtHandler->unknown( rString );
@@ -418,7 +407,6 @@ void SAL_CALL XMLTransformerBase::unknown( const OUString& rString )
 
 // XInitialize
 void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments )
-    throw(Exception, RuntimeException, std::exception)
 {
     const sal_Int32 nAnyCount = aArguments.getLength();
     const Any* pAny = aArguments.getConstArray();
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index 2dbb32a74950..323ddc5a55fc 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -94,37 +94,26 @@ public:
     virtual ~XMLTransformerBase() throw() override;
 
     // css::xml::sax::XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endDocument()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL startElement(const OUString& aName,
-                              const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endElement(const OUString& aName)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL characters(const OUString& aChars)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+                              const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override;
+    virtual void SAL_CALL endElement(const OUString& aName) override;
+    virtual void SAL_CALL characters(const OUString& aChars) override;
+    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
     virtual void SAL_CALL processingInstruction(const OUString& aTarget,
-                                       const OUString& aData)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+                                       const OUString& aData) override;
+    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override;
 
     // css::xml::sax::XExtendedDocumentHandler
-    virtual void SAL_CALL startCDATA() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL endCDATA() throw( css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL comment(const OUString& sComment)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL allowLineBreak()
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL unknown(const OUString& sString)
-        throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL startCDATA() override;
+    virtual void SAL_CALL endCDATA() override;
+    virtual void SAL_CALL comment(const OUString& sComment) override;
+    virtual void SAL_CALL allowLineBreak() override;
+    virtual void SAL_CALL unknown(const OUString& sString) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     // C++
     const css::uno::Reference< css::xml::sax::XDocumentHandler > & GetDocHandler() { return m_xHandler; }
diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx
index 813c431288cf..67747352c621 100644
--- a/xmloff/source/transform/XMLFilterRegistration.hxx
+++ b/xmloff/source/transform/XMLFilterRegistration.hxx
@@ -26,175 +26,175 @@ OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL OOo2OasisTransformer_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL Oasis2OOoTransformer_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLAutoTextEventImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLAutoTextEventImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLMetaImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLMetaImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMetaImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLMathSettingsImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLMathSettingsImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMathSettingsImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLMathMetaImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLMathMetaImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMathMetaImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLCalcSettingsImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLCalcSettingsImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcSettingsImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLCalcMetaImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLCalcMetaImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcMetaImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLCalcContentImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLCalcContentImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcContentImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLCalcStylesImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLCalcStylesImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcStylesImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLCalcImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLCalcImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLWriterSettingsImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLWriterSettingsImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterSettingsImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLWriterMetaImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLWriterMetaImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterMetaImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLWriterContentImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLWriterContentImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterContentImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLWriterStylesImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLWriterStylesImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterStylesImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLWriterImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLWriterImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLChartContentImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLChartContentImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartContentImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLChartStylesImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLChartStylesImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartStylesImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLChartImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLChartImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLDrawSettingsImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLDrawSettingsImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawSettingsImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLDrawMetaImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLDrawMetaImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawMetaImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLDrawContentImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLDrawContentImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawContentImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLDrawStylesImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLDrawStylesImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawStylesImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLDrawImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLDrawImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLImpressSettingsImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLImpressSettingsImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressSettingsImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLImpressMetaImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLImpressMetaImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressMetaImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLImpressContentImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLImpressContentImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressContentImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLImpressStylesImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLImpressStylesImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressStylesImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 OUString SAL_CALL XMLImpressImportOOO_getImplementationName() throw();
 css::uno::Sequence< OUString > SAL_CALL XMLImpressImportOOO_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressImportOOO_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 #endif
 
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index 9a6254c29b38..7948e1cf0d87 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -44,23 +44,17 @@ public:
 
     // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(
-        Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) override;
+        Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead ) override;
     virtual sal_Int32 SAL_CALL readSomeBytes(
-        Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) override;
+        Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead ) override;
     virtual void SAL_CALL skipBytes(
-        sal_Int32 nBytesToSkip )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL available()
-        throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeInput()
-        throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception) override;
+        sal_Int32 nBytesToSkip ) override;
+    virtual sal_Int32 SAL_CALL available() override;
+    virtual void SAL_CALL closeInput() override;
 };
 
 sal_Int32 BSeqInputStream::readBytes(
     Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception)
 {
     nBytesToRead = ((nBytesToRead > (sal_Int32)_seq.size() - _nPos)
                     ? _seq.size() - _nPos
@@ -77,25 +71,21 @@ sal_Int32 BSeqInputStream::readBytes(
 
 sal_Int32 BSeqInputStream::readSomeBytes(
     Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception)
 {
     return readBytes( rData, nMaxBytesToRead );
 }
 
 void BSeqInputStream::skipBytes(
     sal_Int32 /*nBytesToSkip*/ )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception)
 {
 }
 
 sal_Int32 BSeqInputStream::available()
-    throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception)
 {
     return _seq.size() - _nPos;
 }
 
 void BSeqInputStream::closeInput()
-    throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception)
 {
 }
 
@@ -111,16 +101,12 @@ public:
 
     // XOutputStream
     virtual void SAL_CALL writeBytes(
-        Sequence< sal_Int8 > const & rData )
-        throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL flush()
-        throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL closeOutput()
-        throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) override;
+        Sequence< sal_Int8 > const & rData ) override;
+    virtual void SAL_CALL flush() override;
+    virtual void SAL_CALL closeOutput() override;
 };
 
 void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData )
-    throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception)
 {
     sal_Int32 nPos = _seq->size();
     _seq->resize( nPos + rData.getLength() );
@@ -129,12 +115,10 @@ void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData )
                       rData.getLength() );
 }
 void BSeqOutputStream::flush()
-    throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception)
 {
 }
 
 void BSeqOutputStream::closeOutput()
-    throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception)
 {
 }
 
diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx
index 1347ac84d582..326ba5305124 100644
--- a/xmlscript/source/xml_helper/xml_element.cxx
+++ b/xmlscript/source/xml_helper/xml_element.cxx
@@ -63,20 +63,17 @@ void XMLElement::dump( Reference< xml::sax::XDocumentHandler > const & xOut )
 
 // XAttributeList
 sal_Int16 XMLElement::getLength()
-    throw (RuntimeException, std::exception)
 {
     return static_cast<sal_Int16>(_attrNames.size());
 }
 
 OUString XMLElement::getNameByIndex( sal_Int16 nPos )
-    throw (RuntimeException, std::exception)
 {
     OSL_ASSERT( (size_t)nPos < _attrNames.size() );
     return _attrNames[ nPos ];
 }
 
 OUString XMLElement::getTypeByIndex( sal_Int16 nPos )
-    throw (RuntimeException, std::exception)
 {
     OSL_ASSERT( (size_t)nPos < _attrNames.size() );
     static_cast<void>(nPos);
@@ -85,21 +82,18 @@ OUString XMLElement::getTypeByIndex( sal_Int16 nPos )
 }
 
 OUString XMLElement::getTypeByName( OUString const & /*rName*/ )
-    throw (RuntimeException, std::exception)
 {
     // xxx todo
     return OUString();
 }
 
 OUString XMLElement::getValueByIndex( sal_Int16 nPos )
-    throw (RuntimeException, std::exception)
 {
     OSL_ASSERT( (size_t)nPos < _attrNames.size() );
     return _attrValues[ nPos ];
 }
 
 OUString XMLElement::getValueByName( OUString const & rName )
-    throw (RuntimeException, std::exception)
 {
     for ( size_t nPos = 0; nPos < _attrNames.size(); ++nPos )
     {
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 859197517bd4..e6297e915c41 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -138,49 +138,35 @@ public:
     virtual ~DocumentHandlerImpl() throw () override;
 
     // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw (RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL supportsService(
-        OUString const & servicename )
-        throw (RuntimeException, std::exception) override;
-    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (RuntimeException, std::exception) override;
+        OUString const & servicename ) override;
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     // XInitialization
     virtual void SAL_CALL initialize(
-        Sequence< Any > const & arguments )
-        throw (Exception, std::exception) override;
+        Sequence< Any > const & arguments ) override;
 
     // XDocumentHandler
-    virtual void SAL_CALL startDocument()
-        throw (xml::sax::SAXException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument()
-        throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL startElement(
         OUString const & rQElementName,
-        Reference< xml::sax::XAttributeList > const & xAttribs )
-        throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+        Reference< xml::sax::XAttributeList > const & xAttribs ) override;
     virtual void SAL_CALL endElement(
-        OUString const & rQElementName )
-        throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+        OUString const & rQElementName ) override;
     virtual void SAL_CALL characters(
-        OUString const & rChars )
-        throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+        OUString const & rChars ) override;
     virtual void SAL_CALL ignorableWhitespace(
-        OUString const & rWhitespaces )
-        throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+        OUString const & rWhitespaces ) override;
     virtual void SAL_CALL processingInstruction(
-        OUString const & rTarget, OUString const & rData )
-        throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+        OUString const & rTarget, OUString const & rData ) override;
     virtual void SAL_CALL setDocumentLocator(
-        Reference< xml::sax::XLocator > const & xLocator )
-        throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+        Reference< xml::sax::XLocator > const & xLocator ) override;
 
     // XNamespaceMapping
-    virtual sal_Int32 SAL_CALL getUidByUri( OUString const & Uri )
-        throw (RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getUriByUid( sal_Int32 Uid )
-        throw (container::NoSuchElementException, RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getUidByUri( OUString const & Uri ) override;
+    virtual OUString SAL_CALL getUriByUid( sal_Int32 Uid ) override;
 };
 
 DocumentHandlerImpl::DocumentHandlerImpl(
@@ -345,32 +331,23 @@ public:
     virtual ~ExtendedAttributes() throw () override;
 
     // XAttributes
-    virtual sal_Int32 SAL_CALL getLength()
-        throw (RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getLength() override;
     virtual sal_Int32 SAL_CALL getIndexByQName(
-        OUString const & rQName )
-        throw (RuntimeException, std::exception) override;
+        OUString const & rQName ) override;
     virtual sal_Int32 SAL_CALL getIndexByUidName(
-        sal_Int32 nUid, OUString const & rLocalName )
-        throw (RuntimeException, std::exception) override;
+        sal_Int32 nUid, OUString const & rLocalName ) override;
     virtual OUString SAL_CALL getQNameByIndex(
-        sal_Int32 nIndex )
-        throw (RuntimeException, std::exception) override;
+        sal_Int32 nIndex ) override;
     virtual sal_Int32 SAL_CALL getUidByIndex(
-        sal_Int32 nIndex )
-        throw (RuntimeException, std::exception) override;
+        sal_Int32 nIndex ) override;
     virtual OUString SAL_CALL getLocalNameByIndex(
-        sal_Int32 nIndex )
-        throw (RuntimeException, std::exception) override;
+        sal_Int32 nIndex ) override;
     virtual OUString SAL_CALL getValueByIndex(
-        sal_Int32 nIndex )
-        throw (RuntimeException, std::exception) override;
+        sal_Int32 nIndex ) override;
     virtual OUString SAL_CALL getValueByUidName(
-        sal_Int32 nUid, OUString const & rLocalName )
-        throw (RuntimeException, std::exception) override;
+        sal_Int32 nUid, OUString const & rLocalName ) override;
     virtual OUString SAL_CALL getTypeByIndex(
-        sal_Int32 nIndex )
-        throw (RuntimeException, std::exception) override;
+        sal_Int32 nIndex ) override;
 };
 
 inline ExtendedAttributes::ExtendedAttributes(
@@ -403,19 +380,16 @@ ExtendedAttributes::~ExtendedAttributes() throw ()
 // XServiceInfo
 
 OUString DocumentHandlerImpl::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return getImplementationName_DocumentHandlerImpl();
 }
 
 sal_Bool DocumentHandlerImpl::supportsService( OUString const & servicename )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, servicename);
 }
 
 Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames()
-    throw (RuntimeException, std::exception)
 {
     return getSupportedServiceNames_DocumentHandlerImpl();
 }
@@ -424,7 +398,6 @@ Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames()
 
 void DocumentHandlerImpl::initialize(
     Sequence< Any > const & arguments )
-    throw (Exception, std::exception)
 {
     MGuard guard( m_pMutex );
     Reference< xml::input::XRoot > xRoot;
@@ -443,7 +416,6 @@ void DocumentHandlerImpl::initialize(
 // XNamespaceMapping
 
 sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri )
-    throw (RuntimeException, std::exception)
 {
     sal_Int32 uid = getUidByURI( Uri );
     SAL_WARN_IF( uid == UID_UNKNOWN, "xmlscript.xmlhelper", "uid UNKNOWN");
@@ -451,7 +423,6 @@ sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri )
 }
 
 OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
-    throw (container::NoSuchElementException, RuntimeException, std::exception)
 {
     MGuard guard( m_pMutex );
     t_OUString2LongMap::const_iterator iPos( m_URI2Uid.begin() );
@@ -467,13 +438,11 @@ OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
 // XDocumentHandler
 
 void DocumentHandlerImpl::startDocument()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     m_xRoot->startDocument( static_cast< xml::input::XNamespaceMapping * >( this ) );
 }
 
 void DocumentHandlerImpl::endDocument()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     m_xRoot->endDocument();
 }
@@ -481,7 +450,6 @@ void DocumentHandlerImpl::endDocument()
 void DocumentHandlerImpl::startElement(
     OUString const & rQElementName,
     Reference< xml::sax::XAttributeList > const & xAttribs )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement;
     Reference< xml::input::XAttributes > xAttributes;
@@ -609,7 +577,6 @@ void DocumentHandlerImpl::startElement(
 
 void DocumentHandlerImpl::endElement(
     OUString const & rQElementName )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement;
     {
@@ -647,7 +614,6 @@ void DocumentHandlerImpl::endElement(
 }
 
 void DocumentHandlerImpl::characters( OUString const & rChars )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement( getCurrentElement() );
     if (xCurrentElement.is())
@@ -656,7 +622,6 @@ void DocumentHandlerImpl::characters( OUString const & rChars )
 
 void DocumentHandlerImpl::ignorableWhitespace(
     OUString const & rWhitespaces )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement( getCurrentElement() );
     if (xCurrentElement.is())
@@ -665,7 +630,6 @@ void DocumentHandlerImpl::ignorableWhitespace(
 
 void DocumentHandlerImpl::processingInstruction(
     OUString const & rTarget, OUString const & rData )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XElement > xCurrentElement( getCurrentElement() );
     if (xCurrentElement.is())
@@ -676,7 +640,6 @@ void DocumentHandlerImpl::processingInstruction(
 
 void DocumentHandlerImpl::setDocumentLocator(
     Reference< xml::sax::XLocator > const & xLocator )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     m_xRoot->setDocumentLocator( xLocator );
 }
@@ -684,7 +647,6 @@ void DocumentHandlerImpl::setDocumentLocator(
 // XAttributes
 
 sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName )
-    throw (RuntimeException, std::exception)
 {
     for ( sal_Int32 nPos = m_nAttributes; nPos--; )
     {
@@ -697,13 +659,11 @@ sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName )
 }
 
 sal_Int32 ExtendedAttributes::getLength()
-    throw (RuntimeException, std::exception)
 {
     return m_nAttributes;
 }
 
 OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex )
-    throw (RuntimeException, std::exception)
 {
     if (nIndex < m_nAttributes)
         return m_pLocalNames[ nIndex ];
@@ -712,7 +672,6 @@ OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex )
 }
 
 OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex )
-    throw (RuntimeException, std::exception)
 {
     if (nIndex < m_nAttributes)
         return m_pQNames[ nIndex ];
@@ -721,7 +680,6 @@ OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex )
 }
 
 OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex )
-    throw (RuntimeException, std::exception)
 {
     static_cast<void>(nIndex);
     SAL_WARN_IF( nIndex >= m_nAttributes , "xmlscript.xmlhelper", "nIndex is bigger then m_nAttributes");
@@ -729,7 +687,6 @@ OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex )
 }
 
 OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex )
-    throw (RuntimeException, std::exception)
 {
     if (nIndex < m_nAttributes)
         return m_pValues[ nIndex ];
@@ -739,7 +696,6 @@ OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex )
 
 sal_Int32 ExtendedAttributes::getIndexByUidName(
     sal_Int32 nUid, OUString const & rLocalName )
-    throw (RuntimeException, std::exception)
 {
     for ( sal_Int32 nPos = m_nAttributes; nPos--; )
     {
@@ -752,7 +708,6 @@ sal_Int32 ExtendedAttributes::getIndexByUidName(
 }
 
 sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex )
-    throw (RuntimeException, std::exception)
 {
     if (nIndex < m_nAttributes)
         return m_pUids[ nIndex ];
@@ -762,7 +717,6 @@ sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex )
 
 OUString ExtendedAttributes::getValueByUidName(
     sal_Int32 nUid, OUString const & rLocalName )
-    throw (RuntimeException, std::exception)
 {
     for ( sal_Int32 nPos = m_nAttributes; nPos--; )
     {
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index d29fff943fce..18598891bce7 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -183,21 +183,16 @@ public:
     // XRoot
     virtual void SAL_CALL startDocument(
         css::uno::Reference< css::xml::input::XNamespaceMapping >
-        const & xNamespaceMapping )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const & xNamespaceMapping ) override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL processingInstruction(
-        OUString const & rTarget, OUString const & rData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        OUString const & rTarget, OUString const & rData ) override;
     virtual void SAL_CALL setDocumentLocator(
-        css::uno::Reference< css::xml::sax::XLocator > const & xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) override;
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startRootElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
 };
 
 class ElementBase
@@ -220,29 +215,21 @@ public:
     virtual ~ElementBase() override;
 
     // XElement
-    virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getUid()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent() override;
+    virtual OUString SAL_CALL getLocalName() override;
+    virtual sal_Int32 SAL_CALL getUid() override;
     virtual css::uno::Reference< css::xml::input::XAttributes >
-    SAL_CALL getAttributes() throw (css::uno::RuntimeException, std::exception) override;
+    SAL_CALL getAttributes() override;
     virtual void SAL_CALL ignorableWhitespace(
-        OUString const & rWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( OUString const & rChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        OUString const & rWhitespaces ) override;
+    virtual void SAL_CALL characters( OUString const & rChars ) override;
     virtual void SAL_CALL processingInstruction(
-        OUString const & Target, OUString const & Data )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        OUString const & Target, OUString const & Data ) override;
+    virtual void SAL_CALL endElement() override;
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
 };
 
 class StylesElement
@@ -252,8 +239,7 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
 
     inline StylesElement(
         OUString const & rLocalName,
@@ -288,10 +274,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     void importTextColorStyle(
         css::uno::Reference< css::beans::XPropertySet > const & xProps );
@@ -341,8 +325,7 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
 
     inline MenuPopupElement(
         OUString const & rLocalName,
@@ -503,7 +486,7 @@ public:
 
     /// @throws css::xml::sax::SAXException
     /// @throws css::uno::RuntimeException
-    inline void finish() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
+    inline void finish()
     {
         try
         {
@@ -526,10 +509,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline WindowElement(
         OUString const & rLocalName,
@@ -543,8 +524,7 @@ class EventElement
     : public ElementBase
 {
 public:
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endElement() override;
 
     inline EventElement(
         sal_Int32 nUid, OUString const & rLocalName,
@@ -561,8 +541,7 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
 
     BulletinBoardElement(
         OUString const & rLocalName,
@@ -577,10 +556,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline ButtonElement(
         OUString const & rLocalName,
@@ -597,10 +574,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline CheckBoxElement(
         OUString const & rLocalName,
@@ -618,10 +593,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline ComboBoxElement(
         OUString const & rLocalName,
@@ -639,10 +612,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline MenuListElement(
         OUString const & rLocalName,
@@ -659,8 +630,7 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
 
     inline RadioElement(
         OUString const & rLocalName,
@@ -678,10 +648,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    void SAL_CALL endElement() override;
 
     inline RadioGroupElement(
         OUString const & rLocalName,
@@ -700,10 +668,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline TitledBoxElement(
         OUString const & rLocalName,
@@ -720,10 +686,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline TextElement(
         OUString const & rLocalName,
@@ -739,10 +703,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline FixedHyperLinkElement(
         OUString const & rLocalName,
@@ -759,10 +721,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline TextFieldElement(
         OUString const & rLocalName,
@@ -779,10 +739,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline ImageControlElement(
         OUString const & rLocalName,
@@ -799,10 +757,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline FileControlElement(
         OUString const & rLocalName,
@@ -819,10 +775,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline TreeControlElement(
         OUString const & rLocalName,
@@ -839,10 +793,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline CurrencyFieldElement(
         OUString const & rLocalName,
@@ -859,10 +811,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline DateFieldElement(
         OUString const & rLocalName,
@@ -879,10 +829,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline NumericFieldElement(
         OUString const & rLocalName,
@@ -899,10 +847,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline TimeFieldElement(
         OUString const & rLocalName,
@@ -919,10 +865,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline PatternFieldElement(
         OUString const & rLocalName,
@@ -939,10 +883,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline FormattedFieldElement(
         OUString const & rLocalName,
@@ -959,10 +901,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline FixedLineElement(
         OUString const & rLocalName,
@@ -979,10 +919,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline ScrollBarElement(
         OUString const & rLocalName,
@@ -999,10 +937,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline SpinButtonElement(
         OUString const & rLocalName,
@@ -1019,10 +955,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline MultiPage(
         OUString const & rLocalName,
@@ -1044,10 +978,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline Frame(
         OUString const & rLocalName,
@@ -1066,10 +998,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline Page(
         OUString const & rLocalName,
@@ -1090,10 +1020,8 @@ public:
     virtual css::uno::Reference< css::xml::input::XElement >
     SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     inline ProgressBarElement(
         OUString const & rLocalName,
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
index beb697136e89..d55aae5e16a5 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
@@ -47,11 +47,9 @@ public:
     }
 
     // XInputStreamProvider
-    virtual Reference< io::XInputStream > SAL_CALL createInputStream()
-        throw (RuntimeException, std::exception) override;
+    virtual Reference< io::XInputStream > SAL_CALL createInputStream() override;
 };
 Reference< io::XInputStream > InputStreamProvider::createInputStream()
-    throw (RuntimeException, std::exception)
 {
     return ::xmlscript::createInputStream( _bytes );
 }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 79d327eb3ea0..f37993e2bd91 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -44,7 +44,6 @@ namespace xmlscript
 Reference< xml::input::XElement > Frame::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if ( !m_xContainer.is() )
         m_xContainer.set( m_xImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoFrameModel" ), UNO_QUERY );
@@ -74,7 +73,6 @@ Reference< xml::input::XElement > Frame::startChildElement(
 }
 
 void Frame::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
         if ( !m_xContainer.is() )
             m_xContainer.set( m_xImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoFrameModel" ), UNO_QUERY );
@@ -110,7 +108,6 @@ void Frame::endElement()
 Reference< xml::input::XElement > MultiPage::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -134,7 +131,6 @@ Reference< xml::input::XElement > MultiPage::startChildElement(
 }
 
 void MultiPage::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
         Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW );
         // m_xImport is what we need to add to ( e.g. the dialog in this case )
@@ -166,7 +162,6 @@ void MultiPage::endElement()
 Reference< xml::input::XElement > Page::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -189,7 +184,6 @@ Reference< xml::input::XElement > Page::startChildElement(
 }
 
 void Page::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
         Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW );
 
@@ -221,7 +215,6 @@ void Page::endElement()
 Reference< xml::input::XElement > ProgressBarElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -237,7 +230,6 @@ Reference< xml::input::XElement > ProgressBarElement::startChildElement(
     }
 }
 void ProgressBarElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlProgressBarModel" );
 
@@ -267,7 +259,6 @@ void ProgressBarElement::endElement()
 Reference< xml::input::XElement > ScrollBarElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -280,7 +271,6 @@ Reference< xml::input::XElement > ScrollBarElement::startChildElement(
     }
 }
 void ScrollBarElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlScrollBarModel" , _xAttributes ) );
 
@@ -319,7 +309,6 @@ void ScrollBarElement::endElement()
 Reference< xml::input::XElement > SpinButtonElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -333,7 +322,6 @@ Reference< xml::input::XElement > SpinButtonElement::startChildElement(
 }
 
 void SpinButtonElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlSpinButtonModel", _xAttributes ) );
 
@@ -369,7 +357,6 @@ void SpinButtonElement::endElement()
 Reference< xml::input::XElement > FixedLineElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -382,7 +369,6 @@ Reference< xml::input::XElement > FixedLineElement::startChildElement(
     }
 }
 void FixedLineElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx(m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFixedLineModel" );
 
@@ -411,7 +397,6 @@ void FixedLineElement::endElement()
 Reference< xml::input::XElement > PatternFieldElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -424,7 +409,6 @@ Reference< xml::input::XElement > PatternFieldElement::startChildElement(
     }
 }
 void PatternFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlPatternFieldModel" );
 
@@ -461,7 +445,6 @@ void PatternFieldElement::endElement()
 Reference< xml::input::XElement > FormattedFieldElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -475,7 +458,6 @@ Reference< xml::input::XElement > FormattedFieldElement::startChildElement(
 }
 
 void FormattedFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFormattedFieldModel" );
 
@@ -591,7 +573,6 @@ void FormattedFieldElement::endElement()
 Reference< xml::input::XElement > TimeFieldElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -604,7 +585,6 @@ Reference< xml::input::XElement > TimeFieldElement::startChildElement(
     }
 }
 void TimeFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlTimeFieldModel" );
 
@@ -647,7 +627,6 @@ void TimeFieldElement::endElement()
 Reference< xml::input::XElement > NumericFieldElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -660,7 +639,6 @@ Reference< xml::input::XElement > NumericFieldElement::startChildElement(
     }
 }
 void NumericFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlNumericFieldModel" );
 
@@ -705,7 +683,6 @@ void NumericFieldElement::endElement()
 Reference< xml::input::XElement > DateFieldElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -718,7 +695,6 @@ Reference< xml::input::XElement > DateFieldElement::startChildElement(
     }
 }
 void DateFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlDateFieldModel" );
 
@@ -762,7 +738,6 @@ void DateFieldElement::endElement()
 Reference< xml::input::XElement > CurrencyFieldElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -775,7 +750,6 @@ Reference< xml::input::XElement > CurrencyFieldElement::startChildElement(
     }
 }
 void CurrencyFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlCurrencyFieldModel" );
 
@@ -820,7 +794,6 @@ void CurrencyFieldElement::endElement()
 Reference< xml::input::XElement > FileControlElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -833,7 +806,6 @@ Reference< xml::input::XElement > FileControlElement::startChildElement(
     }
 }
 void FileControlElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFileControlModel" );
 
@@ -866,7 +838,6 @@ void FileControlElement::endElement()
 Reference< xml::input::XElement > TreeControlElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -879,7 +850,6 @@ Reference< xml::input::XElement > TreeControlElement::startChildElement(
     }
 }
 void TreeControlElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.tree.TreeControlModel" );
 
@@ -914,7 +884,6 @@ void TreeControlElement::endElement()
 Reference< xml::input::XElement > ImageControlElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -928,7 +897,6 @@ Reference< xml::input::XElement > ImageControlElement::startChildElement(
 }
 
 void ImageControlElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlImageControlModel" );
 
@@ -958,7 +926,6 @@ void ImageControlElement::endElement()
 Reference< xml::input::XElement > TextElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -972,7 +939,6 @@ Reference< xml::input::XElement > TextElement::startChildElement(
 }
 
 void TextElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFixedTextModel" );
 
@@ -1007,7 +973,6 @@ void TextElement::endElement()
 Reference< xml::input::XElement > FixedHyperLinkElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -1020,7 +985,6 @@ Reference< xml::input::XElement > FixedHyperLinkElement::startChildElement(
     }
 }
 void FixedHyperLinkElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlFixedHyperlinkModel" );
 
@@ -1058,7 +1022,6 @@ void FixedHyperLinkElement::endElement()
 Reference< xml::input::XElement > TextFieldElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -1071,7 +1034,6 @@ Reference< xml::input::XElement > TextFieldElement::startChildElement(
     }
 }
 void TextFieldElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlEditModel" );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
@@ -1124,7 +1086,6 @@ void TextFieldElement::endElement()
 Reference< xml::input::XElement > TitledBoxElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -1159,7 +1120,6 @@ Reference< xml::input::XElement > TitledBoxElement::startChildElement(
 }
 
 void TitledBoxElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     {
         ControlImportContext ctx(m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlGroupBoxModel" );
@@ -1244,7 +1204,6 @@ void TitledBoxElement::endElement()
 Reference< xml::input::XElement > RadioElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -1261,7 +1220,6 @@ Reference< xml::input::XElement > RadioElement::startChildElement(
 Reference< xml::input::XElement > RadioGroupElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if (m_xImport->XMLNS_DIALOGS_UID != nUid)
     {
@@ -1283,7 +1241,6 @@ Reference< xml::input::XElement > RadioGroupElement::startChildElement(
     }
 }
 void RadioGroupElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     for (Reference<XElement>& xRadio : _radios)
     {
@@ -1341,7 +1298,6 @@ void RadioGroupElement::endElement()
 Reference< xml::input::XElement > MenuPopupElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if (m_xImport->XMLNS_DIALOGS_UID != nUid)
     {
@@ -1394,7 +1350,6 @@ Sequence< sal_Int16 > MenuPopupElement::getSelectedItems()
 Reference< xml::input::XElement > MenuListElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -1418,7 +1373,6 @@ Reference< xml::input::XElement > MenuListElement::startChildElement(
 }
 
 void MenuListElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlListBoxModel", _xAttributes  ) );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
@@ -1464,7 +1418,6 @@ void MenuListElement::endElement()
 Reference< xml::input::XElement > ComboBoxElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -1487,7 +1440,6 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement(
     }
 }
 void ComboBoxElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), getControlModelName( "com.sun.star.awt.UnoControlComboBoxModel", _xAttributes ) );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
@@ -1533,7 +1485,6 @@ void ComboBoxElement::endElement()
 Reference< xml::input::XElement > CheckBoxElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -1546,7 +1497,6 @@ Reference< xml::input::XElement > CheckBoxElement::startChildElement(
     }
 }
 void CheckBoxElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlCheckBoxModel" );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
@@ -1601,7 +1551,6 @@ void CheckBoxElement::endElement()
 Reference< xml::input::XElement > ButtonElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -1615,7 +1564,6 @@ Reference< xml::input::XElement > ButtonElement::startChildElement(
 }
 
 void ButtonElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     ControlImportContext ctx( m_xImport.get(), getControlId( _xAttributes ), "com.sun.star.awt.UnoControlButtonModel" );
 
@@ -1667,7 +1615,6 @@ void ButtonElement::endElement()
 Reference< xml::input::XElement > BulletinBoardElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if (m_xImport->XMLNS_DIALOGS_UID != nUid)
     {
@@ -1827,13 +1774,11 @@ BulletinBoardElement::BulletinBoardElement(
 Reference< xml::input::XElement > StyleElement::startChildElement(
     sal_Int32 /*nUid*/, OUString const & /*rLocalName*/,
     Reference< xml::input::XAttributes > const & /*xAttributes*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     throw xml::sax::SAXException( "unexpected sub elements of style!", Reference< XInterface >(), Any() );
 }
 
 void StyleElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< xml::input::XAttributes > xStyle;
     OUString aStyleId( _xAttributes->getValueByUidName( m_xImport->XMLNS_DIALOGS_UID, "style-id" ) );
@@ -1851,7 +1796,6 @@ void StyleElement::endElement()
 Reference< xml::input::XElement > StylesElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if (m_xImport->XMLNS_DIALOGS_UID != nUid)
     {
@@ -1872,7 +1816,6 @@ Reference< xml::input::XElement > StylesElement::startChildElement(
 Reference< xml::input::XElement > WindowElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // event
     if (m_xImport->isEventElement( nUid, rLocalName ))
@@ -1900,7 +1843,6 @@ Reference< xml::input::XElement > WindowElement::startChildElement(
 }
 
 void WindowElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     Reference< beans::XPropertySet > xProps(
         m_xImport->_xDialogModel, UNO_QUERY_THROW );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index faa8f733e878..e9d2b67505b7 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -67,7 +67,6 @@ namespace xmlscript
 {
 
 void EventElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     static_cast< ControlElement * >( m_xParent.get() )->_events.push_back( this );
 }
@@ -1614,57 +1613,48 @@ void ImportContext::importDefaults(
 }
 
 Reference< xml::input::XElement > ElementBase::getParent()
-    throw (RuntimeException, std::exception)
 {
     return static_cast< xml::input::XElement * >( m_xParent.get() );
 }
 
 OUString ElementBase::getLocalName()
-    throw (RuntimeException, std::exception)
 {
     return _aLocalName;
 }
 
 sal_Int32 ElementBase::getUid()
-    throw (RuntimeException, std::exception)
 {
     return _nUid;
 }
 
 Reference< xml::input::XAttributes > ElementBase::getAttributes()
-    throw (RuntimeException, std::exception)
 {
     return _xAttributes;
 }
 
 void ElementBase::ignorableWhitespace(
     OUString const & /*rWhitespaces*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // not used
 }
 
 void ElementBase::characters( OUString const & /*rChars*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // not used, all characters ignored
 }
 
 void ElementBase::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void ElementBase::processingInstruction(
     OUString const & /*Target*/, OUString const & /*Data*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 Reference< xml::input::XElement > ElementBase::startChildElement(
     sal_Int32 /*nUid*/, OUString const & /*rLocalName*/,
     Reference< xml::input::XAttributes > const & /*xAttributes*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     throw xml::sax::SAXException( "unexpected element!", Reference< XInterface >(), Any() );
 }
@@ -1690,28 +1680,24 @@ ElementBase::~ElementBase()
 
 void DialogImport::startDocument(
     Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     XMLNS_DIALOGS_UID = xNamespaceMapping->getUidByUri( XMLNS_DIALOGS_URI );
     XMLNS_SCRIPT_UID = xNamespaceMapping->getUidByUri( XMLNS_SCRIPT_URI );
 }
 
 void DialogImport::endDocument()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // ignored
 }
 
 void DialogImport::processingInstruction(
     OUString const & /*rTarget*/, OUString const & /*rData*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // ignored for now: xxx todo
 }
 
 void DialogImport::setDocumentLocator(
     Reference< xml::sax::XLocator > const & /*xLocator*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // ignored for now: xxx todo
 }
@@ -1719,7 +1705,6 @@ void DialogImport::setDocumentLocator(
 Reference< xml::input::XElement > DialogImport::startRootElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if (XMLNS_DIALOGS_UID != nUid)
     {
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index c6fa807f1208..37f9b9e6108a 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -50,14 +50,14 @@ namespace xmlscript
     }
 
     // XServiceInfo
-    sal_Bool XMLBasicExporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool XMLBasicExporterBase::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
     // XInitialization
 
-    void XMLBasicExporterBase::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception)
+    void XMLBasicExporterBase::initialize( const Sequence< Any >& aArguments )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -79,7 +79,6 @@ namespace xmlscript
     // XExporter
 
     void XMLBasicExporterBase::setSourceDocument( const Reference< XComponent >& rxDoc )
-        throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -94,7 +93,6 @@ namespace xmlscript
     // XFilter
 
 sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /*aDescriptor*/ )
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -329,7 +327,6 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
     }
 
     void XMLBasicExporterBase::cancel()
-        throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -349,12 +346,12 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
 
     // XServiceInfo
 
-    OUString XMLBasicExporter::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString XMLBasicExporter::getImplementationName(  )
     {
         return OUString( "com.sun.star.comp.xmlscript.XMLBasicExporter" );
     }
 
-    Sequence< OUString > XMLBasicExporter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > XMLBasicExporter::getSupportedServiceNames(  )
     {
         Sequence< OUString > aNames { "com.sun.star.document.XMLBasicExporter" };
         return aNames;
@@ -373,12 +370,12 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
 
     // XServiceInfo
 
-    OUString XMLOasisBasicExporter::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString XMLOasisBasicExporter::getImplementationName(  )
     {
         return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicExporter" );
     }
 
-    Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames(  )
     {
         Sequence< OUString > aNames { "com.sun.star.document.XMLOasisBasicExporter" };
         return aNames;
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
index 9476d44f39bd..6d44d6255451 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
@@ -52,22 +52,17 @@ namespace xmlscript
         virtual ~XMLBasicExporterBase() override;
 
         // XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
         // XInitialization
-        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
         // XExporter
-        virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& rxDoc )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& rxDoc ) override;
 
         // XFilter
-        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL cancel()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+        virtual void SAL_CALL cancel() override;
     };
 
     // class XMLBasicExporter
@@ -79,10 +74,8 @@ namespace xmlscript
         virtual ~XMLBasicExporter() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     };
 
     // class XMLOasisBasicExporter
@@ -94,10 +87,8 @@ namespace xmlscript
         virtual ~XMLOasisBasicExporter() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     };
 
 }   // namespace xmlscript
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 316b3a0d4007..da62d412f5b7 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -85,19 +85,16 @@ namespace xmlscript
     // XElement
 
     Reference< xml::input::XElement > BasicElementBase::getParent()
-        throw (RuntimeException, std::exception)
     {
         return m_xParent.get();
     }
 
     OUString BasicElementBase::getLocalName()
-        throw (RuntimeException, std::exception)
     {
         return m_aLocalName;
     }
 
     sal_Int32 BasicElementBase::getUid()
-        throw (RuntimeException, std::exception)
     {
         sal_Int32 nId = -1;
         if ( m_xImport.is() )
@@ -106,7 +103,6 @@ namespace xmlscript
     }
 
     Reference< xml::input::XAttributes > BasicElementBase::getAttributes()
-        throw (RuntimeException, std::exception)
     {
         return m_xAttributes;
     }
@@ -114,29 +110,24 @@ namespace xmlscript
     Reference< xml::input::XElement > BasicElementBase::startChildElement(
         sal_Int32 /*nUid*/, const OUString& /*rLocalName*/,
         const Reference< xml::input::XAttributes >& /*xAttributes*/ )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() );
     }
 
 void BasicElementBase::characters( const OUString& /*rChars*/ )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         // not used, all characters ignored
     }
 
 void BasicElementBase::ignorableWhitespace( const OUString& /*rWhitespaces*/ )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
 void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const OUString& /*rData*/ )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
     void BasicElementBase::endElement()
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
@@ -156,7 +147,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     Reference< xml::input::XElement > BasicLibrariesElement::startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const Reference< xml::input::XAttributes >& xAttributes )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         Reference< xml::input::XElement > xElement;
 
@@ -240,7 +230,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     }
 
     void BasicLibrariesElement::endElement()
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
@@ -272,7 +261,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     Reference< xml::input::XElement > BasicEmbeddedLibraryElement::startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const Reference< xml::input::XAttributes >& xAttributes )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         Reference< xml::input::XElement > xElement;
 
@@ -299,7 +287,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     }
 
     void BasicEmbeddedLibraryElement::endElement()
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         if ( m_xLibContainer.is() && m_xLibContainer->hasByName( m_aLibName ) && m_bReadOnly )
             m_xLibContainer->setLibraryReadOnly( m_aLibName, m_bReadOnly );
@@ -322,7 +309,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     Reference< xml::input::XElement > BasicModuleElement::startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
             const Reference< xml::input::XAttributes >& xAttributes )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         // TODO: <byte-code>
 
@@ -351,7 +337,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     }
 
     void BasicModuleElement::endElement()
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
@@ -370,13 +355,11 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     // XElement
 
     void BasicSourceCodeElement::characters( const OUString& rChars )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         m_aBuffer.append( rChars );
     }
 
     void BasicSourceCodeElement::endElement()
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         try
         {
@@ -418,7 +401,6 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     // XRoot
 
     void BasicImport::startDocument( const Reference< xml::input::XNamespaceMapping >& xNamespaceMapping )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         if ( xNamespaceMapping.is() )
         {
@@ -433,23 +415,19 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
     }
 
     void BasicImport::endDocument()
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
 void BasicImport::processingInstruction( const OUString& /*rTarget*/, const OUString& /*rData*/ )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
 void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*xLocator*/ )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
     }
 
     Reference< xml::input::XElement > BasicImport::startRootElement( sal_Int32 nUid, const OUString& rLocalName,
             Reference< xml::input::XAttributes > const & xAttributes )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         Reference< xml::input::XElement > xElement;
 
@@ -502,14 +480,13 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     // XServiceInfo
-    sal_Bool XMLBasicImporterBase::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception)
+    sal_Bool XMLBasicImporterBase::supportsService( const OUString& rServiceName )
     {
         return cppu::supportsService(this, rServiceName);
     }
 
     // XImporter
     void XMLBasicImporterBase::setTargetDocument( const Reference< XComponent >& rxDoc )
-        throw (IllegalArgumentException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -536,7 +513,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     // XDocumentHandler
 
     void XMLBasicImporterBase::startDocument()
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -545,7 +521,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::endDocument()
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -555,7 +530,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     void XMLBasicImporterBase::startElement( const OUString& aName,
             const Reference< xml::sax::XAttributeList >& xAttribs )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -564,7 +538,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::endElement( const OUString& aName )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -573,7 +546,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::characters( const OUString& aChars )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -582,7 +554,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::ignorableWhitespace( const OUString& aWhitespaces )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -592,7 +563,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     void XMLBasicImporterBase::processingInstruction( const OUString& aTarget,
             const OUString& aData )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -601,7 +571,6 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
     }
 
     void XMLBasicImporterBase::setDocumentLocator( const Reference< xml::sax::XLocator >& xLocator )
-        throw (xml::sax::SAXException, RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -622,12 +591,12 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     // XServiceInfo
 
-    OUString XMLBasicImporter::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString XMLBasicImporter::getImplementationName(  )
     {
         return OUString( "com.sun.star.comp.xmlscript.XMLBasicImporter" );
     }
 
-    Sequence< OUString > XMLBasicImporter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > XMLBasicImporter::getSupportedServiceNames(  )
     {
         Sequence< OUString > aNames { "com.sun.star.document.XMLBasicImporter" };
         return aNames;
@@ -646,12 +615,12 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
 
     // XServiceInfo
 
-    OUString XMLOasisBasicImporter::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString XMLOasisBasicImporter::getImplementationName(  )
     {
         return OUString( "com.sun.star.comp.xmlscript.XMLOasisBasicImporter" );
     }
 
-    Sequence< OUString > XMLOasisBasicImporter::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > XMLOasisBasicImporter::getSupportedServiceNames(  )
     {
         Sequence< OUString > aNames { "com.sun.star.document.XMLOasisBasicImporter" };
         return aNames;
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
index 194283c87d87..247cf835eb3c 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
@@ -62,28 +62,19 @@ namespace xmlscript
         virtual ~BasicElementBase() override;
 
         // XElement
-        virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getLocalName()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual sal_Int32 SAL_CALL getUid()
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes()
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() override;
+        virtual OUString SAL_CALL getLocalName() override;
+        virtual sal_Int32 SAL_CALL getUid() override;
+        virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() override;
         virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
-            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL characters( const OUString& rChars )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override;
+        virtual void SAL_CALL characters( const OUString& rChars ) override;
         virtual void SAL_CALL ignorableWhitespace(
-            const OUString& rWhitespaces )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const OUString& rWhitespaces ) override;
         virtual void SAL_CALL processingInstruction(
-            const OUString& rTarget, const OUString& rData )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endElement()
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const OUString& rTarget, const OUString& rData ) override;
+        virtual void SAL_CALL endElement() override;
     };
 
     // class BasicLibrariesElement
@@ -102,10 +93,8 @@ namespace xmlscript
         // XElement
         virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
-            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endElement()
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override;
+        virtual void SAL_CALL endElement() override;
     };
 
     // class BasicEmbeddedLibraryElement
@@ -128,10 +117,8 @@ namespace xmlscript
         // XElement
         virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
-            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endElement()
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override;
+        virtual void SAL_CALL endElement() override;
     };
 
     // class BasicModuleElement
@@ -152,10 +139,8 @@ namespace xmlscript
         // XElement
         virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement(
             sal_Int32 nUid, const OUString& rLocalName,
-            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endElement()
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override;
+        virtual void SAL_CALL endElement() override;
     };
 
     // class BasicSourceCodeElement
@@ -175,10 +160,8 @@ namespace xmlscript
             const OUString& rName );
 
         // XElement
-        virtual void SAL_CALL characters( const OUString& rChars )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endElement()
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL characters( const OUString& rChars ) override;
+        virtual void SAL_CALL endElement() override;
     };
 
     // class BasicImport
@@ -205,20 +188,15 @@ namespace xmlscript
 
         // XRoot
         virtual void SAL_CALL startDocument(
-            const css::uno::Reference< css::xml::input::XNamespaceMapping >& xNamespaceMapping )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endDocument()
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::input::XNamespaceMapping >& xNamespaceMapping ) override;
+        virtual void SAL_CALL endDocument() override;
         virtual void SAL_CALL processingInstruction(
-            const OUString& rTarget, const OUString& rData )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const OUString& rTarget, const OUString& rData ) override;
         virtual void SAL_CALL setDocumentLocator(
-            const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
         virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startRootElement(
             sal_Int32 nUid, const OUString& rLocalName,
-            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::input::XAttributes >& xAttributes ) override;
     };
 
     // class XMLBasicImporterBase
@@ -242,31 +220,21 @@ namespace xmlscript
         virtual ~XMLBasicImporterBase() override;
 
         // XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
         // XImporter
-        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& rxDoc )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& rxDoc ) override;
 
         // XDocumentHandler
-        virtual void SAL_CALL startDocument()
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endDocument()
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL startDocument() override;
+        virtual void SAL_CALL endDocument() override;
         virtual void SAL_CALL startElement( const OUString& aName,
-            const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL endElement( const OUString& aName )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL characters( const OUString& aChars )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-            throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
+        virtual void SAL_CALL endElement( const OUString& aName ) override;
+        virtual void SAL_CALL characters( const OUString& aChars ) override;
+        virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
+        virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
+        virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
     };
 
     // class XMLBasicImporter
@@ -279,10 +247,8 @@ namespace xmlscript
         virtual ~XMLBasicImporter() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     };
 
     // class XMLOasisBasicImporter
@@ -295,10 +261,8 @@ namespace xmlscript
         virtual ~XMLOasisBasicImporter() override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  )
-            throw (css::uno::RuntimeException, std::exception) override;
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
     };
 
 }   // namespace xmlscript
diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx
index 71d7d9435be4..8bdb2f7f5d8c 100644
--- a/xmlscript/source/xmllib_imexp/imp_share.hxx
+++ b/xmlscript/source/xmllib_imexp/imp_share.hxx
@@ -136,20 +136,15 @@ public:
 
     // XRoot
     virtual void SAL_CALL startDocument(
-        css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping ) override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL processingInstruction(
-        OUString const & rTarget, OUString const & rData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        OUString const & rTarget, OUString const & rData ) override;
     virtual void SAL_CALL setDocumentLocator(
-        css::uno::Reference< css::xml::sax::XLocator > const & xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) override;
     virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startRootElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override;
 };
 
 class LibElementBase
@@ -170,28 +165,19 @@ public:
     virtual ~LibElementBase() override;
 
     // XElement
-    virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getUid()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() override;
+    virtual OUString SAL_CALL getLocalName() override;
+    virtual sal_Int32 SAL_CALL getUid() override;
+    virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() override;
     virtual void SAL_CALL ignorableWhitespace(
-        OUString const & rWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( OUString const & rChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        OUString const & rWhitespaces ) override;
+    virtual void SAL_CALL characters( OUString const & rChars ) override;
     virtual void SAL_CALL processingInstruction(
-        OUString const & rTarget, OUString const & rData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        OUString const & rTarget, OUString const & rData ) override;
+    virtual void SAL_CALL endElement() override;
     virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override;
 };
 
 class LibrariesElement : public LibElementBase
@@ -204,10 +190,8 @@ protected:
 public:
     virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     LibrariesElement(
         OUString const & rLocalName,
@@ -226,10 +210,8 @@ public:
 
     virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override;
+    virtual void SAL_CALL endElement() override;
 
     LibraryElement(
         OUString const & rLocalName,
diff --git a/xmlscript/source/xmllib_imexp/xmllib_import.cxx b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
index 2bf8b167edb6..2fc285e265b7 100644
--- a/xmlscript/source/xmllib_imexp/xmllib_import.cxx
+++ b/xmlscript/source/xmllib_imexp/xmllib_import.cxx
@@ -31,55 +31,46 @@ namespace xmlscript
 {
 
 Reference< xml::input::XElement > LibElementBase::getParent()
-    throw (RuntimeException, std::exception)
 {
     return mxParent.get();
 }
 
 OUString LibElementBase::getLocalName()
-    throw (RuntimeException, std::exception)
 {
     return _aLocalName;
 }
 
 sal_Int32 LibElementBase::getUid()
-    throw (RuntimeException, std::exception)
 {
     return mxImport->XMLNS_LIBRARY_UID;
 }
 
 Reference< xml::input::XAttributes > LibElementBase::getAttributes()
-    throw (RuntimeException, std::exception)
 {
     return _xAttributes;
 }
 
 void LibElementBase::ignorableWhitespace(
     OUString const & /*rWhitespaces*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void LibElementBase::characters( OUString const & /*rChars*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // not used, all characters ignored
 }
 
 void LibElementBase::processingInstruction(
     OUString const & /*rTarget*/, OUString const & /*rData*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void LibElementBase::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 Reference< xml::input::XElement > LibElementBase::startChildElement(
     sal_Int32 /*nUid*/, OUString const & /*rLocalName*/,
     Reference< xml::input::XAttributes > const & /*xAttributes*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() );
 }
@@ -104,33 +95,28 @@ LibElementBase::~LibElementBase()
 
 void LibraryImport::startDocument(
     Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     XMLNS_LIBRARY_UID = xNamespaceMapping->getUidByUri( XMLNS_LIBRARY_URI );
     XMLNS_XLINK_UID = xNamespaceMapping->getUidByUri( XMLNS_XLINK_URI );
 }
 
 void LibraryImport::endDocument()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void LibraryImport::processingInstruction(
     OUString const & /*rTarget*/, OUString const & /*rData*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void LibraryImport::setDocumentLocator(
     Reference< xml::sax::XLocator > const & /*xLocator*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 Reference< xml::input::XElement > LibraryImport::startRootElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if (XMLNS_LIBRARY_UID != nUid)
     {
@@ -167,7 +153,6 @@ LibraryImport::~LibraryImport()
 Reference< xml::input::XElement > LibrariesElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if (mxImport->XMLNS_LIBRARY_UID != nUid)
     {
@@ -195,7 +180,6 @@ Reference< xml::input::XElement > LibrariesElement::startChildElement(
 }
 
 void LibrariesElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     sal_Int32 nLibCount = mxImport->mpLibArray->mnLibCount = (sal_Int32)mLibDescriptors.size();
     mxImport->mpLibArray->mpLibs.reset( new LibDescriptor[ nLibCount ] );
@@ -211,7 +195,6 @@ void LibrariesElement::endElement()
 Reference< xml::input::XElement > LibraryElement::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if (mxImport->XMLNS_LIBRARY_UID != nUid)
     {
@@ -233,7 +216,6 @@ Reference< xml::input::XElement > LibraryElement::startChildElement(
 }
 
 void LibraryElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     sal_Int32 nElementCount = mElements.size();
     Sequence< OUString > aElementNames( nElementCount );
diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx
index 1f170a0dc8ca..78c4d2a54830 100644
--- a/xmlscript/source/xmlmod_imexp/imp_share.hxx
+++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx
@@ -67,20 +67,15 @@ public:
 
     // XRoot
     virtual void SAL_CALL startDocument(
-        css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::input::XNamespaceMapping > const & xNamespaceMapping ) override;
+    virtual void SAL_CALL endDocument() override;
     virtual void SAL_CALL processingInstruction(
-        OUString const & rTarget, OUString const & rData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        OUString const & rTarget, OUString const & rData ) override;
     virtual void SAL_CALL setDocumentLocator(
-        css::uno::Reference< css::xml::sax::XLocator > const & xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::sax::XLocator > const & xLocator ) override;
     virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startRootElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override;
 };
 
 class ModuleElement
@@ -100,28 +95,19 @@ public:
     virtual ~ModuleElement() override;
 
     // XElement
-    virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLocalName()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getUid()
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes()
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() override;
+    virtual OUString SAL_CALL getLocalName() override;
+    virtual sal_Int32 SAL_CALL getUid() override;
+    virtual css::uno::Reference< css::xml::input::XAttributes > SAL_CALL getAttributes() override;
     virtual void SAL_CALL ignorableWhitespace(
-        OUString const & rWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( OUString const & rChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        OUString const & rWhitespaces ) override;
+    virtual void SAL_CALL characters( OUString const & rChars ) override;
     virtual void SAL_CALL processingInstruction(
-        OUString const & rTarget, OUString const & rData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement()
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        OUString const & rTarget, OUString const & rData ) override;
+    virtual void SAL_CALL endElement() override;
     virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL startChildElement(
         sal_Int32 nUid, OUString const & rLocalName,
-        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes ) override;
 };
 
 }
diff --git a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
index cb562815d7c4..07f67d45f72c 100644
--- a/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
+++ b/xmlscript/source/xmlmod_imexp/xmlmod_import.cxx
@@ -31,47 +31,39 @@ namespace xmlscript
 {
 
 Reference< xml::input::XElement > ModuleElement::getParent()
-    throw (RuntimeException, std::exception)
 {
     return nullptr;
 }
 OUString ModuleElement::getLocalName()
-    throw (RuntimeException, std::exception)
 {
     return _aLocalName;
 }
 sal_Int32 ModuleElement::getUid()
-    throw (RuntimeException, std::exception)
 {
     return mxImport->XMLNS_SCRIPT_UID;
 }
 Reference< xml::input::XAttributes > ModuleElement::getAttributes()
-    throw (RuntimeException, std::exception)
 {
     return _xAttributes;
 }
 
 void ModuleElement::ignorableWhitespace(
     OUString const & /*rWhitespaces*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // not used
 }
 
 void ModuleElement::characters( OUString const & rChars )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     _strBuffer.append( rChars );
 }
 
 void ModuleElement::processingInstruction(
     OUString const & /*rTarget*/, OUString const & /*rData*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void ModuleElement::endElement()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     mxImport->mrModuleDesc.aCode = _strBuffer.makeStringAndClear();
 }
@@ -79,7 +71,6 @@ void ModuleElement::endElement()
 Reference< xml::input::XElement > ModuleElement::startChildElement(
     sal_Int32 /*nUid*/, OUString const & /*rLocalName*/,
     Reference< xml::input::XAttributes > const & /*xAttributes*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     throw xml::sax::SAXException("unexpected element!", Reference< XInterface >(), Any() );
 }
@@ -103,7 +94,6 @@ ModuleElement::~ModuleElement()
 
 void ModuleImport::startDocument(
     Reference< xml::input::XNamespaceMapping > const & xNamespaceMapping )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     XMLNS_SCRIPT_UID = xNamespaceMapping->getUidByUri( XMLNS_SCRIPT_URI );
     XMLNS_LIBRARY_UID = xNamespaceMapping->getUidByUri( XMLNS_LIBRARY_URI );
@@ -111,27 +101,23 @@ void ModuleImport::startDocument(
 }
 
 void ModuleImport::endDocument()
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     // ignored
 }
 
 void ModuleImport::processingInstruction(
     OUString const & /*rTarget*/, OUString const & /*rData*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 void ModuleImport::setDocumentLocator(
     Reference< xml::sax::XLocator > const & /*xLocator*/ )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
 }
 
 Reference< xml::input::XElement > ModuleImport::startRootElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException, std::exception)
 {
     if (XMLNS_SCRIPT_UID != nUid)
     {
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index f09ffb7a978f..88af1e5b4dc1 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -23,7 +23,7 @@ public:
     /// Returns the SHA-256 thumbprint.
     ///
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() throw (css::uno::RuntimeException, std::exception) = 0;
+    virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() = 0;
 
 protected:
     ~Certificate() throw () {}
diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
index 012646c60c61..7b03800fbefb 100644
--- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx
@@ -215,109 +215,78 @@ public:
     virtual ~SAXEventKeeperImpl() override;
 
     /* XSAXEventKeeper */
-    virtual sal_Int32 SAL_CALL addElementCollector(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeElementCollector( sal_Int32 id )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL addBlocker(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeBlocker( sal_Int32 id )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isBlocking(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL addElementCollector(  ) override;
+    virtual void SAL_CALL removeElementCollector( sal_Int32 id ) override;
+    virtual sal_Int32 SAL_CALL addBlocker(  ) override;
+    virtual void SAL_CALL removeBlocker( sal_Int32 id ) override;
+    virtual sal_Bool SAL_CALL isBlocking(  ) override;
     virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL
-        getElement( sal_Int32 id )
-        throw (css::uno::RuntimeException, std::exception) override;
+        getElement( sal_Int32 id ) override;
     virtual void SAL_CALL setElement(
         sal_Int32 id,
-        const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aElement )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aElement ) override;
     virtual css::uno::Reference<
         css::xml::sax::XDocumentHandler > SAL_CALL
         setNextHandler( const css::uno::Reference<
-            css::xml::sax::XDocumentHandler >& xNewHandler )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL printBufferNodeTree()
-        throw (css::uno::RuntimeException, std::exception) override;
+            css::xml::sax::XDocumentHandler >& xNewHandler ) override;
+    virtual OUString SAL_CALL printBufferNodeTree() override;
     virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL
-        getCurrentBlockingNode()
-        throw (css::uno::RuntimeException, std::exception) override;
+        getCurrentBlockingNode() override;
 
     /* XSecuritySAXEventKeeper */
     virtual sal_Int32 SAL_CALL addSecurityElementCollector(
         css::xml::crypto::sax::ElementMarkPriority priority,
-        sal_Bool modifyElement )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSecurityId( sal_Int32 id, sal_Int32 securityId )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool modifyElement ) override;
+    virtual void SAL_CALL setSecurityId( sal_Int32 id, sal_Int32 securityId ) override;
 
     /* XReferenceResolvedBroadcaster */
     virtual void SAL_CALL addReferenceResolvedListener(
         sal_Int32 referenceId,
-        const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener ) override;
     virtual void SAL_CALL removeReferenceResolvedListener(
         sal_Int32 referenceId,
-        const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener ) override;
 
     /* XSAXEventKeeperStatusChangeBroadcaster */
     virtual void SAL_CALL addSAXEventKeeperStatusChangeListener(
-        const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) override;
     virtual void SAL_CALL removeSAXEventKeeperStatusChangeListener(
-        const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) override;
 
     /* XDocumentHandler */
-    virtual void SAL_CALL startDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument(  ) override;
+    virtual void SAL_CALL endDocument(  ) override;
     virtual void SAL_CALL startElement(
         const OUString& aName,
         const css::uno::Reference< css::xml::sax::XAttributeList >&
-        xAttribs )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL endElement( const OUString& aName )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL characters( const OUString& aChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        xAttribs ) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
     virtual void SAL_CALL processingInstruction(
-        const OUString& aTarget, const OUString& aData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const OUString& aTarget, const OUString& aData ) override;
     virtual void SAL_CALL setDocumentLocator(
-        const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 
     /* XInitialization */
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /// @throws css::uno::RuntimeException
-OUString SAXEventKeeperImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString SAXEventKeeperImpl_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
-SAL_CALL SAXEventKeeperImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-    throw ( css::uno::Exception );
+SAL_CALL SAXEventKeeperImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 
 #endif
 
diff --git a/xmlsecurity/inc/framework/securityengine.hxx b/xmlsecurity/inc/framework/securityengine.hxx
index 1315aae84b92..b1cc565292da 100644
--- a/xmlsecurity/inc/framework/securityengine.hxx
+++ b/xmlsecurity/inc/framework/securityengine.hxx
@@ -106,8 +106,7 @@ protected:
      */
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
-    virtual void tryToPerform( )
-        throw (css::uno::Exception, css::uno::RuntimeException){};
+    virtual void tryToPerform( ){};
 
     /*
      * clear up all resources used by this operation.
@@ -126,7 +125,6 @@ protected:
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
     virtual void notifyResultListener() const
-        throw (css::uno::Exception, css::uno::RuntimeException)
         {};
 
     /*
@@ -137,16 +135,13 @@ protected:
 
 public:
     /* XReferenceResolvedListener */
-    virtual void SAL_CALL referenceResolved( sal_Int32 referenceId )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL referenceResolved( sal_Int32 referenceId ) override;
 
     /* XKeyCollector */
-    virtual void SAL_CALL setKeyId( sal_Int32 id )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setKeyId( sal_Int32 id ) override;
 
         /* XMissionTaker */
-        virtual sal_Bool SAL_CALL endMission(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL endMission(  ) override;
 };
 
 #endif
diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
index bd81d0efe976..683d2d2a676d 100644
--- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
@@ -59,57 +59,45 @@ private:
 
     css::uno::Reference< css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
 
-    virtual void notifyResultListener() const
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void notifyResultListener() const override;
     virtual void clearUp( ) const override;
     virtual bool checkReady() const override;
-    virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate)
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) override;
 
 public:
     explicit SignatureCreatorImpl();
     virtual ~SignatureCreatorImpl() override;
 
     /* XBlockerMonitor */
-    virtual void SAL_CALL setBlockerId( sal_Int32 id )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setBlockerId( sal_Int32 id ) override;
 
     /* XSignatureCreationResultBroadcaster */
     void SAL_CALL addSignatureCreationResultListener(
-        const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) override;
 
     void SAL_CALL removeSignatureCreationResultListener(
-        const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) override;
 
     /* XInitialization */
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /// @throws css::uno::RuntimeException
-OUString SignatureCreatorImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString SignatureCreatorImpl_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
 SAL_CALL SignatureCreatorImpl_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-    throw ( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 
 #endif
 
diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx
index 3a2231dc4f6c..a173fa52c7e4 100644
--- a/xmlsecurity/inc/framework/signatureengine.hxx
+++ b/xmlsecurity/inc/framework/signatureengine.hxx
@@ -86,8 +86,7 @@ protected:
     explicit SignatureEngine();
     virtual ~SignatureEngine() override {};
 
-    virtual void tryToPerform( )
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void tryToPerform( ) override;
     virtual void clearUp( ) const override;
     virtual bool checkReady() const override;
 
@@ -100,25 +99,20 @@ protected:
     /// @throws css::uno::RuntimeException
     virtual void startEngine( const css::uno::Reference<
                               css::xml::crypto::XXMLSignatureTemplate >&)
-        throw (css::uno::Exception, css::uno::RuntimeException)
         {};
 
 public:
     /* XReferenceCollector */
-    virtual void SAL_CALL setReferenceCount( sal_Int32 count )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setReferenceCount( sal_Int32 count ) override;
 
-    virtual void SAL_CALL setReferenceId( sal_Int32 id )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setReferenceId( sal_Int32 id ) override;
 
     /* XUriBinding */
     virtual void SAL_CALL setUriBinding(
         const OUString& uri,
-        const css::uno::Reference< css::io::XInputStream >& aInputStream )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::io::XInputStream >& aInputStream ) override;
     virtual css::uno::Reference< css::io::XInputStream >
-        SAL_CALL getUriBinding( const OUString& uri )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getUriBinding( const OUString& uri ) override;
 };
 
 #endif
diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
index de394d1da8bc..8c20c8385de9 100644
--- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
@@ -54,11 +54,9 @@ class XSECFW_DLLPUBLIC SignatureVerifierImpl : public SignatureVerifierImpl_Base
 private:
     css::uno::Reference< css::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
 
-    virtual void notifyResultListener() const
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void notifyResultListener() const override;
     virtual bool checkReady() const override;
-    virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate)
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) override;
 
 public:
     explicit SignatureVerifierImpl();
@@ -66,39 +64,30 @@ public:
 
     /* XSignatureVerifyResultBroadcaster */
     virtual void SAL_CALL addSignatureVerifyResultListener(
-        const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) override;
     virtual void SAL_CALL removeSignatureVerifyResultListener(
-        const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) override;
 
     /* XInitialization */
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /// @throws css::uno::RuntimeException
-OUString SignatureVerifierImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString SignatureVerifierImpl_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
 SAL_CALL SignatureVerifierImpl_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-    throw ( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 
 #endif
 
diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx
index 6814ede6d826..44e61de8e0ef 100644
--- a/xmlsecurity/inc/xmlsec/saxhelper.hxx
+++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx
@@ -47,43 +47,36 @@ class SAXHelper final
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void startDocument()
-            throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
+        void startDocument() ;
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void endDocument()
-            throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
+        void endDocument() ;
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
         void startElement(
             const OUString& aName ,
             const css::uno::Sequence<
-                css::xml::csax::XMLAttribute >& aAttributes )
-            throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
+                css::xml::csax::XMLAttribute >& aAttributes ) ;
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void endElement( const OUString& aName )
-            throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
+        void endElement( const OUString& aName ) ;
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void characters( const OUString& aChars )
-            throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
+        void characters( const OUString& aChars ) ;
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
-        void ignorableWhitespace( const OUString& aWhitespaces )
-            throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
+        void ignorableWhitespace( const OUString& aWhitespaces ) ;
 
         /// @throws css::xml::sax::SAXException
         /// @throws css::uno::RuntimeException
         void processingInstruction(
             const OUString& aTarget ,
-            const OUString& aData )
-            throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ;
+            const OUString& aData ) ;
 
 } ;
 
diff --git a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index dfeb0042adf0..94d237997702 100644
--- a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -93,22 +93,19 @@ private:
     static void sendStartElement(
         const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler,
         const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2,
-        const xmlNodePtr pNode)
-        throw (css::xml::sax::SAXException);
+        const xmlNodePtr pNode);
 
     /// @throws css::xml::sax::SAXException
     static void sendEndElement(
         const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler,
         const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2,
-        const xmlNodePtr pNode)
-        throw (css::xml::sax::SAXException);
+        const xmlNodePtr pNode);
 
     /// @throws css::xml::sax::SAXException
     static void sendNode(
         const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler,
         const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2,
-        const xmlNodePtr pNode)
-        throw (css::xml::sax::SAXException);
+        const xmlNodePtr pNode);
 
     static OString getNodeQName(const xmlNodePtr pNode);
 
@@ -129,135 +126,102 @@ public:
     virtual ~XMLDocumentWrapper_XmlSecImpl() override;
 
     /* css::xml::wrapper::XXMLDocumentWrapper */
-    virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement(  ) override;
 
     virtual void SAL_CALL setCurrentElement( const css::uno::Reference<
-        css::xml::wrapper::XXMLElementWrapper >& element )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::xml::wrapper::XXMLElementWrapper >& element ) override;
 
-    virtual void SAL_CALL removeCurrentElement(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeCurrentElement(  ) override;
 
     virtual sal_Bool SAL_CALL isCurrent( const css::uno::Reference<
-        css::xml::wrapper::XXMLElementWrapper >& node )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::xml::wrapper::XXMLElementWrapper >& node ) override;
 
-    virtual sal_Bool SAL_CALL isCurrentElementEmpty(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isCurrentElementEmpty(  ) override;
 
     virtual OUString SAL_CALL getNodeName( const css::uno::Reference<
-        css::xml::wrapper::XXMLElementWrapper >& node )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::xml::wrapper::XXMLElementWrapper >& node ) override;
 
     virtual void SAL_CALL clearUselessData(
         const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node,
         const css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > >& reservedDescendants,
-        const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& stopAtNode )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& stopAtNode ) override;
 
     virtual void SAL_CALL collapse( const css::uno::Reference<
-        css::xml::wrapper::XXMLElementWrapper >& node )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::xml::wrapper::XXMLElementWrapper >& node ) override;
 
     virtual void SAL_CALL generateSAXEvents(
         const css::uno::Reference< css::xml::sax::XDocumentHandler >& handler,
         const css::uno::Reference< css::xml::sax::XDocumentHandler >& xEventKeeperHandler,
         const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& startNode,
-        const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& endNode )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& endNode ) override;
 
     virtual void SAL_CALL getTree(
-        const css::uno::Reference< css::xml::sax::XDocumentHandler >& handler )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XDocumentHandler >& handler ) override;
 
     virtual void SAL_CALL rebuildIDLink(
-        const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node )
-        throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node ) override;
 
     /* css::xml::sax::XDocumentHandler */
-    virtual void SAL_CALL startDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument(  ) override;
 
-    virtual void SAL_CALL endDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument(  ) override;
 
     virtual void SAL_CALL startElement(
         const OUString& aName,
-        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
 
-    virtual void SAL_CALL endElement( const OUString& aName )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
 
-    virtual void SAL_CALL characters( const OUString& aChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
 
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
 
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
 
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 
     /* css::xml::csax::XCompressedDocumentHandler */
-    virtual void SAL_CALL compressedStartDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL compressedStartDocument(  ) override;
 
-    virtual void SAL_CALL compressedEndDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL compressedEndDocument(  ) override;
 
     virtual void SAL_CALL compressedStartElement(
         const OUString& aName,
-        const css::uno::Sequence< css::xml::csax::XMLAttribute >& aAttributes )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::xml::csax::XMLAttribute >& aAttributes ) override;
 
-    virtual void SAL_CALL compressedEndElement( const OUString& aName )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL compressedEndElement( const OUString& aName ) override;
 
-    virtual void SAL_CALL compressedCharacters( const OUString& aChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL compressedCharacters( const OUString& aChars ) override;
 
-    virtual void SAL_CALL compressedIgnorableWhitespace( const OUString& aWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL compressedIgnorableWhitespace( const OUString& aWhitespaces ) override;
 
-    virtual void SAL_CALL compressedProcessingInstruction( const OUString& aTarget, const OUString& aData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL compressedProcessingInstruction( const OUString& aTarget, const OUString& aData ) override;
 
     virtual void SAL_CALL compressedSetDocumentLocator(
         sal_Int32 columnNumber,
         sal_Int32 lineNumber,
         const OUString& publicId,
-        const OUString& systemId )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const OUString& systemId ) override;
 
     /* css::lang::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( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 };
 
 /// @throws css::uno::RuntimeException
-OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName();
 
 /// @throws css::uno::RuntimeException
 css::uno::Sequence< OUString > SAL_CALL
-    XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+    XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
 SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance(
-    const css::uno::Reference< css::uno::XComponentContext > &)
-    throw ( css::uno::Exception );
+    const css::uno::Reference< css::uno::XComponentContext > &);
 
 #endif
 
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index 686d23dca4c4..322b1ddb801e 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -403,25 +403,20 @@ public:
     /*
      * XSAXEventKeeperStatusChangeListener
      */
-    virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking ) override;
     virtual void SAL_CALL collectionStatusChanged(
-        sal_Bool isInsideCollectedElement )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL bufferStatusChanged( sal_Bool isBufferEmpty )
-        throw (css::uno::RuntimeException, std::exception) override;
+        sal_Bool isInsideCollectedElement ) override;
+    virtual void SAL_CALL bufferStatusChanged( sal_Bool isBufferEmpty ) override;
 
     /*
      * XSignatureCreationResultListener
      */
-    virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) override;
 
     /*
      * XSignatureVerifyResultListener
      */
-    virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) override;
 
     /// Writes XML elements inside a single OOXML signature's <Signature> element.
     bool WriteOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::xml::sax::XDocumentHandler>& xDocumentHandler);
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index a972dc33dc09..0635fd702849 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -46,21 +46,18 @@ CertificateContainer::searchMap( const OUString & url, const OUString & certific
 
 bool
 CertificateContainer::isTemporaryCertificate ( const OUString & url, const OUString & certificate_name )
-    throw(css::uno::RuntimeException)
 {
     return searchMap( url, certificate_name, certMap);
 }
 
 bool
 CertificateContainer::isCertificateTrust ( const OUString & url, const OUString & certificate_name )
-    throw(css::uno::RuntimeException)
 {
     return searchMap( url, certificate_name, certTrustMap);
 }
 
 sal_Bool
 CertificateContainer::addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust )
-    throw(css::uno::RuntimeException, std::exception)
 {
     certMap.insert( Map::value_type( url, certificate_name ) );
 
@@ -72,7 +69,7 @@ CertificateContainer::addCertificate( const OUString & url, const OUString & cer
 }
 
 ::security::CertificateContainerStatus
-CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException, std::exception)
+CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name )
 {
     if ( isTemporaryCertificate( url, certificate_name ) )
     {
@@ -88,28 +85,24 @@ CertificateContainer::hasCertificate( const OUString & url, const OUString & cer
 
 OUString SAL_CALL
 CertificateContainer::getImplementationName( )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return impl_getStaticImplementationName();
 }
 
 sal_Bool SAL_CALL
 CertificateContainer::supportsService( const OUString& ServiceName )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, ServiceName );
 }
 
 Sequence< OUString > SAL_CALL
 CertificateContainer::getSupportedServiceNames(  )
-    throw(css::uno::RuntimeException, std::exception)
 {
     return impl_getStaticSupportedServiceNames();
 }
 
 Sequence< OUString > SAL_CALL
 CertificateContainer::impl_getStaticSupportedServiceNames(  )
-    throw(css::uno::RuntimeException)
 {
     Sequence< OUString > aRet { "com.sun.star.security.CertificateContainer" };
     return aRet;
@@ -117,13 +110,11 @@ CertificateContainer::impl_getStaticSupportedServiceNames(  )
 
 OUString SAL_CALL
 CertificateContainer::impl_getStaticImplementationName()
-    throw(css::uno::RuntimeException)
 {
     return OUString("com.sun.star.security.CertificateContainer");
 }
 
 Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
-    throw( RuntimeException )
 {
     return Reference< XInterface >( *new CertificateContainer( xServiceManager ) );
 }
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index acb8c3e3eee2..c1fe605fc183 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -41,36 +41,36 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI
 
         static bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap  );
         /// @throws css::uno::RuntimeException
-        bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
+        bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name );
         /// @throws css::uno::RuntimeException
-        bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
+        bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name );
 
     public:
 
         explicit CertificateContainer(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) {}
         virtual ~CertificateContainer() override {}
 
-        virtual sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust ) override;
+        virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) override;
 
         // provide factory
         /// @throws css::uno::RuntimeException
-        static OUString SAL_CALL impl_getStaticImplementationName( ) throw(css::uno::RuntimeException);
+        static OUString SAL_CALL impl_getStaticImplementationName( );
 
         /// @throws css::uno::RuntimeException
         static css::uno::Sequence< OUString > SAL_CALL
-                    impl_getStaticSupportedServiceNames(  ) throw(css::uno::RuntimeException);
+                    impl_getStaticSupportedServiceNames(  );
 
         /// @throws css::uno::RuntimeException
         static css::uno::Reference< css::uno::XInterface > SAL_CALL
-                    impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException );
+                    impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
         virtual css::uno::Sequence< OUString > SAL_CALL
-                    getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+                    getSupportedServiceNames(  ) override;
 
 };
 
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 56bfb5558f70..353e115befaf 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -62,7 +62,6 @@ DocumentDigitalSignatures::~DocumentDigitalSignatures()
 }
 
 void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     if (aArguments.getLength() > 2)
         throw css::lang::IllegalArgumentException(
@@ -93,21 +92,18 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments)
 }
 
 OUString DocumentDigitalSignatures::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return GetImplementationName();
 }
 
 sal_Bool DocumentDigitalSignatures::supportsService(
     OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence<OUString>
 DocumentDigitalSignatures::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return GetSupportedServiceNames();
 }
@@ -115,7 +111,6 @@ DocumentDigitalSignatures::getSupportedServiceNames()
 sal_Bool DocumentDigitalSignatures::signDocumentContent(
     const Reference< css::embed::XStorage >& rxStorage,
     const Reference< css::io::XStream >& xSignStream)
-        throw (RuntimeException, std::exception)
 {
     OSL_ENSURE(!m_sODFVersion.isEmpty(), "DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
     return ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Content, false );
@@ -124,7 +119,7 @@ sal_Bool DocumentDigitalSignatures::signDocumentContent(
 Sequence< css::security::DocumentSignatureInformation >
 DocumentDigitalSignatures::verifyDocumentContentSignatures(
     const Reference< css::embed::XStorage >& rxStorage,
-    const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception)
+    const Reference< css::io::XInputStream >& xSignInStream )
 {
     OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
     return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Content );
@@ -132,21 +127,20 @@ DocumentDigitalSignatures::verifyDocumentContentSignatures(
 
 void DocumentDigitalSignatures::showDocumentContentSignatures(
     const Reference< css::embed::XStorage >& rxStorage,
-    const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception)
+    const Reference< css::io::XInputStream >& xSignInStream )
 {
     OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
     ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Content, true );
 }
 
 OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName();
 }
 
 sal_Bool DocumentDigitalSignatures::signScriptingContent(
     const Reference< css::embed::XStorage >& rxStorage,
-    const Reference< css::io::XStream >& xSignStream ) throw (RuntimeException, std::exception)
+    const Reference< css::io::XStream >& xSignStream )
 {
     OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
     OSL_ENSURE(m_nArgumentsCount == 2, "DocumentDigitalSignatures: Service was not initialized properly");
@@ -156,7 +150,7 @@ sal_Bool DocumentDigitalSignatures::signScriptingContent(
 Sequence< css::security::DocumentSignatureInformation >
 DocumentDigitalSignatures::verifyScriptingContentSignatures(
     const Reference< css::embed::XStorage >& rxStorage,
-    const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception)
+    const Reference< css::io::XInputStream >& xSignInStream )
 {
     OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
     return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Macros );
@@ -164,14 +158,13 @@ DocumentDigitalSignatures::verifyScriptingContentSignatures(
 
 void DocumentDigitalSignatures::showScriptingContentSignatures(
     const Reference< css::embed::XStorage >& rxStorage,
-    const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception)
+    const Reference< css::io::XInputStream >& xSignInStream )
 {
     OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
     ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Macros, true );
 }
 
 OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName();
 }
@@ -179,7 +172,7 @@ OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamNam
 
 sal_Bool DocumentDigitalSignatures::signPackage(
     const Reference< css::embed::XStorage >& rxStorage,
-    const Reference< css::io::XStream >& xSignStream  ) throw (RuntimeException, std::exception)
+    const Reference< css::io::XStream >& xSignStream  )
 {
     OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
     return ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Package, false );
@@ -188,7 +181,7 @@ sal_Bool DocumentDigitalSignatures::signPackage(
 Sequence< css::security::DocumentSignatureInformation >
 DocumentDigitalSignatures::verifyPackageSignatures(
     const Reference< css::embed::XStorage >& rxStorage,
-    const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception)
+    const Reference< css::io::XInputStream >& xSignInStream )
 {
     OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
     return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Package );
@@ -196,14 +189,13 @@ DocumentDigitalSignatures::verifyPackageSignatures(
 
 void DocumentDigitalSignatures::showPackageSignatures(
     const Reference< css::embed::XStorage >& rxStorage,
-    const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception)
+    const Reference< css::io::XInputStream >& xSignInStream )
 {
     OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2");
     ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Package, true );
 }
 
 OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return DocumentSignatureHelper::GetPackageSignatureDefaultStreamName();
 }
@@ -212,7 +204,7 @@ OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName(  )
 void DocumentDigitalSignatures::ImplViewSignatures(
     const Reference< css::embed::XStorage >& rxStorage,
     const Reference< css::io::XInputStream >& xSignStream,
-    DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException, std::exception)
+    DocumentSignatureMode eMode, bool bReadOnly )
 {
     Reference< io::XStream > xStream;
     if ( xSignStream.is() )
@@ -222,7 +214,7 @@ void DocumentDigitalSignatures::ImplViewSignatures(
 
 bool DocumentDigitalSignatures::ImplViewSignatures(
     const Reference< css::embed::XStorage >& rxStorage, const Reference< css::io::XStream >& xSignStream,
-    DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException, std::exception)
+    DocumentSignatureMode eMode, bool bReadOnly )
 {
     bool bChanges = false;
     ScopedVclPtrInstance<DigitalSignaturesDialog> aSignaturesDialog(
@@ -263,7 +255,7 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
 Sequence< css::security::DocumentSignatureInformation >
 DocumentDigitalSignatures::ImplVerifySignatures(
     const Reference< css::embed::XStorage >& rxStorage,
-    const Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (RuntimeException)
+    const Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode )
 {
     DocumentSignatureManager aSignatureManager(mxCtx, eMode);
 
@@ -397,7 +389,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
 
 }
 
-void DocumentDigitalSignatures::manageTrustedSources(  ) throw (RuntimeException, std::exception)
+void DocumentDigitalSignatures::manageTrustedSources(  )
 {
     // MT: i45295
     // SecEnv is only needed to display certificate information from trusted sources.
@@ -416,7 +408,7 @@ void DocumentDigitalSignatures::manageTrustedSources(  ) throw (RuntimeException
 }
 
 void DocumentDigitalSignatures::showCertificate(
-    const Reference< css::security::XCertificate >& Certificate ) throw (RuntimeException, std::exception)
+    const Reference< css::security::XCertificate >& Certificate )
 {
     DocumentSignatureMode eMode{};
     DocumentSignatureManager aSignatureManager(mxCtx, eMode);
@@ -434,7 +426,7 @@ void DocumentDigitalSignatures::showCertificate(
 }
 
 sal_Bool DocumentDigitalSignatures::isAuthorTrusted(
-    const Reference< css::security::XCertificate >& Author ) throw (RuntimeException, std::exception)
+    const Reference< css::security::XCertificate >& Author )
 {
     bool bFound = false;
 
@@ -459,7 +451,7 @@ sal_Bool DocumentDigitalSignatures::isAuthorTrusted(
     return bFound;
 }
 
-Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificate(OUString& rDescription) throw (RuntimeException, std::exception)
+Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificate(OUString& rDescription)
 {
     Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv;
 
@@ -483,13 +475,13 @@ Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertif
 }
 
 
-sal_Bool DocumentDigitalSignatures::isLocationTrusted( const OUString& Location ) throw (RuntimeException, std::exception)
+sal_Bool DocumentDigitalSignatures::isLocationTrusted( const OUString& Location )
 {
     return SvtSecurityOptions().isTrustedLocationUri(Location);
 }
 
 void DocumentDigitalSignatures::addAuthorToTrustedSources(
-    const Reference< css::security::XCertificate >& Author ) throw (RuntimeException, std::exception)
+    const Reference< css::security::XCertificate >& Author )
 {
     SvtSecurityOptions aSecOpts;
 
@@ -513,7 +505,7 @@ void DocumentDigitalSignatures::addAuthorToTrustedSources(
     aSecOpts.SetTrustedAuthors( aTrustedAuthors );
 }
 
-void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Location ) throw (RuntimeException, std::exception)
+void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Location )
 {
     SvtSecurityOptions aSecOpt;
 
@@ -525,12 +517,12 @@ void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Loc
     aSecOpt.SetSecureURLs( aSecURLs );
 }
 
-OUString DocumentDigitalSignatures::GetImplementationName() throw (RuntimeException)
+OUString DocumentDigitalSignatures::GetImplementationName()
 {
     return OUString( "com.sun.star.security.DocumentDigitalSignatures" );
 }
 
-Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (css::uno::RuntimeException)
+Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames()
 {
     Sequence<OUString> aRet { "com.sun.star.security.DocumentDigitalSignatures" };
     return aRet;
@@ -538,7 +530,7 @@ Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw
 
 
 Reference< XInterface > DocumentDigitalSignatures_CreateInstance(
-    const Reference< XComponentContext >& rCtx) throw ( Exception )
+    const Reference< XComponentContext >& rCtx)
 {
     return static_cast<cppu::OWeakObject*>(new DocumentDigitalSignatures( rCtx ));
 }
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index f95ca192f8c8..6e23e2d7487d 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -55,11 +55,11 @@ private:
     bool m_bHasDocumentSignature;
 
     /// @throws css::uno::RuntimeException
-    bool ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (css::uno::RuntimeException, std::exception);
+    bool ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly );
     /// @throws css::uno::RuntimeException
-    void ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (css::uno::RuntimeException, std::exception);
+    void ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly );
     /// @throws css::uno::RuntimeException
-    css::uno::Sequence< css::security::DocumentSignatureInformation > ImplVerifySignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (css::uno::RuntimeException);
+    css::uno::Sequence< css::security::DocumentSignatureInformation > ImplVerifySignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode );
 
 public:
     explicit DocumentDigitalSignatures( const css::uno::Reference< css::uno::XComponentContext>& rxCtx );
@@ -67,49 +67,45 @@ public:
 
     // for service registration...
     /// @throws css::uno::RuntimeException
-    static OUString GetImplementationName() throw (css::uno::RuntimeException);
+    static OUString GetImplementationName();
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence < OUString > GetSupportedServiceNames() throw (css::uno::RuntimeException);
+    static css::uno::Sequence < OUString > GetSupportedServiceNames();
 
     //XInitialization
-    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
-    OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override;
+    OUString SAL_CALL getImplementationName() override;
 
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
 
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override;
+    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
     // XDocumentDigitalSignatures
-    sal_Bool SAL_CALL signDocumentContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL showDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getDocumentContentSignatureDefaultStreamName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL signScriptingContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL showScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getScriptingContentSignatureDefaultStreamName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL signPackage( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XStream >& xSignStream ) throw (css::uno::RuntimeException, std::exception) override;
-    css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL showPackageSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override;
-    OUString SAL_CALL getPackageSignatureDefaultStreamName(  ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL showCertificate( const css::uno::Reference< css::security::XCertificate >& Certificate ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL manageTrustedSources(  ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isAuthorTrusted( const css::uno::Reference< css::security::XCertificate >& Author ) throw (css::uno::RuntimeException, std::exception) override;
-    sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addAuthorToTrustedSources( const css::uno::Reference< css::security::XCertificate >& Author ) throw (css::uno::RuntimeException, std::exception) override;
-    void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (css::uno::RuntimeException, std::exception) override;
-
-    css::uno::Reference< css::security::XCertificate > SAL_CALL chooseCertificate(OUString& rDescription) throw (css::uno::RuntimeException, std::exception) override;
+    sal_Bool SAL_CALL signDocumentContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) override;
+    css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override;
+    void SAL_CALL showDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override;
+    OUString SAL_CALL getDocumentContentSignatureDefaultStreamName(  ) override;
+    sal_Bool SAL_CALL signScriptingContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) override;
+    css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override;
+    void SAL_CALL showScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override;
+    OUString SAL_CALL getScriptingContentSignatureDefaultStreamName(  ) override;
+    sal_Bool SAL_CALL signPackage( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XStream >& xSignStream ) override;
+    css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override;
+    void SAL_CALL showPackageSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override;
+    OUString SAL_CALL getPackageSignatureDefaultStreamName(  ) override;
+    void SAL_CALL showCertificate( const css::uno::Reference< css::security::XCertificate >& Certificate ) override;
+    void SAL_CALL manageTrustedSources(  ) override;
+    sal_Bool SAL_CALL isAuthorTrusted( const css::uno::Reference< css::security::XCertificate >& Author ) override;
+    sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) override;
+    void SAL_CALL addAuthorToTrustedSources( const css::uno::Reference< css::security::XCertificate >& Author ) override;
+    void SAL_CALL addLocationToTrustedSources( const OUString& Location ) override;
+
+    css::uno::Reference< css::security::XCertificate > SAL_CALL chooseCertificate(OUString& rDescription) override;
 };
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance(
-    const css::uno::Reference< css::uno::XComponentContext >& rCtx) throw ( css::uno::Exception );
+    const css::uno::Reference< css::uno::XComponentContext >& rCtx);
 
 #endif // INCLUDED_XMLSECURITY_SOURCE_COMPONENT_DOCUMENTDIGITALSIGNATURES_HXX
 
diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx
index d499bcd96087..757b5d9507d6 100644
--- a/xmlsecurity/source/framework/decryptorimpl.cxx
+++ b/xmlsecurity/source/framework/decryptorimpl.cxx
@@ -64,7 +64,6 @@ bool DecryptorImpl::checkReady() const
 }
 
 void DecryptorImpl::notifyResultListener() const
-    throw (cssu::Exception, cssu::RuntimeException)
 /****** DecryptorImpl/notifyResultListener ***********************************
  *
  *   NAME
@@ -81,7 +80,6 @@ void DecryptorImpl::notifyResultListener() const
 void DecryptorImpl::startEngine( const cssu::Reference<
     cssxc::XXMLEncryptionTemplate >&
     xEncryptionTemplate)
-    throw (cssu::Exception, cssu::RuntimeException)
 /****** DecryptorImpl/startEngine ********************************************
  *
  *   NAME
@@ -117,20 +115,17 @@ void DecryptorImpl::startEngine( const cssu::Reference<
 
 /* XDecryptionResultBroadcaster */
 void SAL_CALL DecryptorImpl::addDecryptionResultListener( const cssu::Reference< cssxc::sax::XDecryptionResultListener >& listener )
-        throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     m_xResultListener = listener;
     tryToPerform();
 }
 
 void SAL_CALL DecryptorImpl::removeDecryptionResultListener( const cssu::Reference< cssxc::sax::XDecryptionResultListener >&)
-        throw (cssu::RuntimeException, std::exception)
 {
 }
 
 /* XInitialization */
 void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     OSL_ASSERT(aArguments.getLength() == 5);
 
@@ -146,39 +141,33 @@ void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg
 }
 
 OUString DecryptorImpl_getImplementationName ()
-    throw (cssu::RuntimeException)
 {
     return OUString ( IMPLEMENTATION_NAME );
 }
 
 cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  )
-    throw (cssu::RuntimeException)
 {
     cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.Decryptor" };
     return aRet;
 }
 
 cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& xMSF)
-    throw( cssu::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new DecryptorImpl( comphelper::getComponentContext( xMSF ) ));
 }
 
 /* XServiceInfo */
 OUString SAL_CALL DecryptorImpl::getImplementationName(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return DecryptorImpl_getImplementationName();
 }
 
 sal_Bool SAL_CALL DecryptorImpl::supportsService( const OUString& rServiceName )
-    throw (cssu::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 cssu::Sequence< OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return DecryptorImpl_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx
index 0c485250210f..b1b72c1ef0e9 100644
--- a/xmlsecurity/source/framework/decryptorimpl.hxx
+++ b/xmlsecurity/source/framework/decryptorimpl.hxx
@@ -51,13 +51,11 @@ class DecryptorImpl : public DecryptorImpl_Base
 private:
     css::uno::Reference< css::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext;
 
-    virtual void notifyResultListener() const
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void notifyResultListener() const override;
     virtual bool checkReady() const override;
     virtual void startEngine( const css::uno::Reference<
         css::xml::crypto::XXMLEncryptionTemplate >&
-        xEncryptionTemplate)
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+        xEncryptionTemplate) override;
 
 public:
     explicit DecryptorImpl(const css::uno::Reference< css::uno::XComponentContext > & xContext);
@@ -65,38 +63,29 @@ public:
 
     /* XDecryptionResultBroadcaster */
     virtual void SAL_CALL addDecryptionResultListener(
-        const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener ) override;
         virtual void SAL_CALL removeDecryptionResultListener(
-            const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener )
-            throw (css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener ) override;
 
     /* XInitialization */
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /// @throws css::uno::RuntimeException
-OUString DecryptorImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString DecryptorImpl_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
-SAL_CALL DecryptorImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr)
-    throw ( css::uno::Exception );
+SAL_CALL DecryptorImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr);
 
 #endif
 
diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx
index eb236e81be97..8cf7d295da5c 100644
--- a/xmlsecurity/source/framework/encryptionengine.cxx
+++ b/xmlsecurity/source/framework/encryptionengine.cxx
@@ -74,7 +74,6 @@ bool EncryptionEngine::checkReady() const
 }
 
 void EncryptionEngine::tryToPerform( )
-        throw (Exception, RuntimeException)
 /****** EncryptionEngine/tryToPerform ****************************************
  *
  *   NAME
@@ -152,7 +151,6 @@ void EncryptionEngine::clearUp( ) const
 
 /* XBlockerMonitor */
 void SAL_CALL EncryptionEngine::setBlockerId( sal_Int32 id )
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     m_nIdOfBlocker = id;
     tryToPerform();
diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx
index c71ec058c739..33915c5ceb0e 100644
--- a/xmlsecurity/source/framework/encryptionengine.hxx
+++ b/xmlsecurity/source/framework/encryptionengine.hxx
@@ -69,8 +69,7 @@ protected:
     explicit EncryptionEngine( const css::uno::Reference< css::uno::XComponentContext > & xContext );
     virtual ~EncryptionEngine() override {};
 
-    virtual void tryToPerform( )
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void tryToPerform( ) override;
     virtual void clearUp( ) const override;
     virtual bool checkReady() const override;
 
@@ -82,13 +81,11 @@ protected:
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
     virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >&)
-        throw (css::uno::Exception, css::uno::RuntimeException)
         {};
 
 public:
     /* XBlockerMonitor */
-    virtual void SAL_CALL setBlockerId( sal_Int32 id )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setBlockerId( sal_Int32 id ) override;
 };
 
 #endif
diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx
index 33bd583b5d85..8c274147c26f 100644
--- a/xmlsecurity/source/framework/encryptorimpl.cxx
+++ b/xmlsecurity/source/framework/encryptorimpl.cxx
@@ -73,7 +73,6 @@ bool EncryptorImpl::checkReady() const
 }
 
 void EncryptorImpl::notifyResultListener() const
-    throw (Exception, RuntimeException)
 /****** DecryptorImpl/notifyResultListener ***********************************
  *
  *   NAME
@@ -90,7 +89,6 @@ void EncryptorImpl::notifyResultListener() const
 void EncryptorImpl::startEngine( const Reference<
     cssxc::XXMLEncryptionTemplate >&
     xEncryptionTemplate)
-        throw (Exception, RuntimeException)
 /****** EncryptorImpl/startEngine ********************************************
  *
  *   NAME
@@ -136,7 +134,6 @@ void EncryptorImpl::startEngine( const Reference<
 
 /* XReferenceCollector */
 void SAL_CALL EncryptorImpl::setReferenceCount(sal_Int32)
-    throw (Exception, RuntimeException, std::exception)
 {
     /*
      * dummy method, because there is only one reference in
@@ -146,27 +143,23 @@ void SAL_CALL EncryptorImpl::setReferenceCount(sal_Int32)
 }
 
 void SAL_CALL EncryptorImpl::setReferenceId( sal_Int32 id )
-    throw (Exception, RuntimeException, std::exception)
 {
     m_nReferenceId = id;
 }
 
 /* XEncryptionResultBroadcaster */
 void SAL_CALL EncryptorImpl::addEncryptionResultListener( const Reference< cssxc::sax::XEncryptionResultListener >& listener )
-        throw (Exception, RuntimeException, std::exception)
 {
     m_xResultListener = listener;
     tryToPerform();
 }
 
 void SAL_CALL EncryptorImpl::removeEncryptionResultListener( const Reference< cssxc::sax::XEncryptionResultListener >&)
-        throw (RuntimeException, std::exception)
 {
 }
 
 /* XInitialization */
 void SAL_CALL EncryptorImpl::initialize( const Sequence< Any >& aArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     OSL_ASSERT(aArguments.getLength() == 5);
 
@@ -183,13 +176,11 @@ void SAL_CALL EncryptorImpl::initialize( const Sequence< Any >& aArguments )
 
 
 OUString EncryptorImpl_getImplementationName ()
-    throw (RuntimeException)
 {
     return OUString ( IMPLEMENTATION_NAME );
 }
 
 Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
-    throw (RuntimeException)
 {
     Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.Encryptor" };
     return aRet;
@@ -197,26 +188,22 @@ Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
 
 Reference< XInterface > SAL_CALL EncryptorImpl_createInstance(
     const Reference< cssl::XMultiServiceFactory >& xMSF)
-    throw( Exception )
 {
     return static_cast<cppu::OWeakObject*>(new EncryptorImpl( comphelper::getComponentContext( xMSF ) ));
 }
 
 /* XServiceInfo */
 OUString SAL_CALL EncryptorImpl::getImplementationName(  )
-    throw (RuntimeException, std::exception)
 {
     return EncryptorImpl_getImplementationName();
 }
 
 sal_Bool SAL_CALL EncryptorImpl::supportsService( const OUString& rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames(  )
-    throw (RuntimeException, std::exception)
 {
     return EncryptorImpl_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx
index 561c041aa493..d0e8f05c5073 100644
--- a/xmlsecurity/source/framework/encryptorimpl.hxx
+++ b/xmlsecurity/source/framework/encryptorimpl.hxx
@@ -60,13 +60,11 @@ private:
     css::uno::Reference<
         css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment;
 
-    virtual void notifyResultListener() const
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+    virtual void notifyResultListener() const override;
     virtual bool checkReady() const override;
     virtual void startEngine( const css::uno::Reference<
         css::xml::crypto::XXMLEncryptionTemplate >&
-        xEncryptionTemplate)
-        throw (css::uno::Exception, css::uno::RuntimeException) override;
+        xEncryptionTemplate) override;
 
 public:
     explicit EncryptorImpl(const css::uno::Reference< css::uno::XComponentContext > & xContext);
@@ -76,48 +74,37 @@ public:
     virtual void SAL_CALL addEncryptionResultListener(
         const css::uno::Reference<
             css::xml::crypto::sax::XEncryptionResultListener >&
-            listener )
-            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+            listener ) override;
         virtual void SAL_CALL removeEncryptionResultListener(
             const css::uno::Reference<
                 css::xml::crypto::sax::XEncryptionResultListener >&
-                listener )
-            throw (css::uno::RuntimeException, std::exception) override;
+                listener ) override;
 
     /* XReferenceCollector */
-    virtual void SAL_CALL setReferenceCount( sal_Int32 count )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setReferenceCount( sal_Int32 count ) override;
 
-    virtual void SAL_CALL setReferenceId( sal_Int32 id )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setReferenceId( sal_Int32 id ) override;
 
     /* XInitialization */
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /// @throws css::uno::RuntimeException
-OUString EncryptorImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString EncryptorImpl_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
 SAL_CALL EncryptorImpl_createInstance(
-    const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr)
-    throw ( css::uno::Exception );
+    const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr);
 
 #endif
 
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index e14bc1fa7830..bb1ce37ff4f2 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -858,7 +858,6 @@ sal_Int32 SAXEventKeeperImpl::createBlocker()
 
 /* XSAXEventKeeper */
 sal_Int32 SAL_CALL SAXEventKeeperImpl::addElementCollector(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return createElementCollector(
         cssxc::sax::ElementMarkPriority_AFTERMODIFY,
@@ -867,32 +866,27 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::addElementCollector(  )
 }
 
 void SAL_CALL SAXEventKeeperImpl::removeElementCollector( sal_Int32 id )
-    throw (cssu::RuntimeException, std::exception)
 {
     markElementMarkBuffer(id);
 }
 
 sal_Int32 SAL_CALL SAXEventKeeperImpl::addBlocker(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return createBlocker();
 }
 
 void SAL_CALL SAXEventKeeperImpl::removeBlocker( sal_Int32 id )
-    throw (cssu::RuntimeException, std::exception)
 {
     markElementMarkBuffer(id);
 }
 
 sal_Bool SAL_CALL SAXEventKeeperImpl::isBlocking(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return (m_pCurrentBlockingBufferNode != nullptr);
 }
 
 cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL
     SAXEventKeeperImpl::getElement( sal_Int32 id )
-    throw (cssu::RuntimeException, std::exception)
 {
     cssu::Reference< cssxw::XXMLElementWrapper > rc;
 
@@ -908,7 +902,6 @@ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL
 void SAL_CALL SAXEventKeeperImpl::setElement(
     sal_Int32 id,
     const cssu::Reference< cssxw::XXMLElementWrapper >& aElement )
-    throw (cssu::RuntimeException, std::exception)
 {
     if (aElement.is())
     {
@@ -939,7 +932,6 @@ void SAL_CALL SAXEventKeeperImpl::setElement(
 
 cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextHandler(
     const cssu::Reference< cssxs::XDocumentHandler >& xNewHandler )
-    throw (cssu::RuntimeException, std::exception)
 {
     cssu::Reference< cssxs::XDocumentHandler > xOldHandler = m_xNextHandler;
 
@@ -948,7 +940,6 @@ cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextH
 }
 
 OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree()
-    throw (cssu::RuntimeException, std::exception)
 {
     OUString rc;
 
@@ -962,7 +953,6 @@ OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree()
 }
 
 cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCurrentBlockingNode()
-    throw (cssu::RuntimeException, std::exception)
 {
     cssu::Reference< cssxw::XXMLElementWrapper > rc;
 
@@ -978,7 +968,6 @@ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCur
 sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector(
     cssxc::sax::ElementMarkPriority priority,
     sal_Bool modifyElement )
-    throw (cssu::RuntimeException, std::exception)
 {
     return createElementCollector(
         priority,
@@ -987,7 +976,6 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector(
 }
 
 void SAL_CALL SAXEventKeeperImpl::setSecurityId( sal_Int32 id, sal_Int32 securityId )
-    throw (cssu::RuntimeException, std::exception)
 {
     ElementMark* pElementMark = findElementMarkBuffer(id);
     if (pElementMark != nullptr)
@@ -1001,7 +989,6 @@ void SAL_CALL SAXEventKeeperImpl::setSecurityId( sal_Int32 id, sal_Int32 securit
 void SAL_CALL SAXEventKeeperImpl::addReferenceResolvedListener(
     sal_Int32 referenceId,
     const cssu::Reference< cssxc::sax::XReferenceResolvedListener >& listener )
-    throw (cssu::RuntimeException, std::exception)
 {
     ElementCollector* pElementCollector = static_cast<ElementCollector*>(findElementMarkBuffer(referenceId));
     if (pElementCollector != nullptr)
@@ -1013,27 +1000,23 @@ void SAL_CALL SAXEventKeeperImpl::addReferenceResolvedListener(
 void SAL_CALL SAXEventKeeperImpl::removeReferenceResolvedListener(
     sal_Int32 /*referenceId*/,
     const cssu::Reference< cssxc::sax::XReferenceResolvedListener >&)
-    throw (cssu::RuntimeException, std::exception)
 {
 }
 
 /* XSAXEventKeeperStatusChangeBroadcaster */
 void SAL_CALL SAXEventKeeperImpl::addSAXEventKeeperStatusChangeListener(
     const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >& listener )
-    throw (cssu::RuntimeException, std::exception)
 {
     m_xSAXEventKeeperStatusChangeListener = listener;
 }
 
 void SAL_CALL SAXEventKeeperImpl::removeSAXEventKeeperStatusChangeListener(
     const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >&)
-    throw (cssu::RuntimeException, std::exception)
 {
 }
 
 /* XDocumentHandler */
 void SAL_CALL SAXEventKeeperImpl::startDocument(  )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if ( m_xNextHandler.is())
     {
@@ -1042,7 +1025,6 @@ void SAL_CALL SAXEventKeeperImpl::startDocument(  )
 }
 
 void SAL_CALL SAXEventKeeperImpl::endDocument(  )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if ( m_xNextHandler.is())
     {
@@ -1053,7 +1035,6 @@ void SAL_CALL SAXEventKeeperImpl::endDocument(  )
 void SAL_CALL SAXEventKeeperImpl::startElement(
     const OUString& aName,
     const cssu::Reference< cssxs::XAttributeList >& xAttribs )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
         /*
          * If there is a following handler and no blocking now, then
@@ -1091,7 +1072,6 @@ void SAL_CALL SAXEventKeeperImpl::startElement(
 }
 
 void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
         bool bIsCurrent = m_xXMLDocument->isCurrent(m_pCurrentBufferNode->getXMLElement());
 
@@ -1144,7 +1124,6 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName )
 }
 
 void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if (!m_bIsForwarding)
     {
@@ -1162,14 +1141,12 @@ void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars )
 }
 
 void SAL_CALL SAXEventKeeperImpl::ignorableWhitespace( const OUString& aWhitespaces )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     characters( aWhitespaces );
 }
 
 void SAL_CALL SAXEventKeeperImpl::processingInstruction(
     const OUString& aTarget, const OUString& aData )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if (!m_bIsForwarding)
     {
@@ -1187,13 +1164,11 @@ void SAL_CALL SAXEventKeeperImpl::processingInstruction(
 }
 
 void SAL_CALL SAXEventKeeperImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >&)
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
 
 /* XInitialization */
 void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     OSL_ASSERT(aArguments.getLength() == 1);
 
@@ -1206,13 +1181,11 @@ void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >&
 }
 
 OUString SAXEventKeeperImpl_getImplementationName ()
-    throw (cssu::RuntimeException)
 {
     return OUString ( IMPLEMENTATION_NAME );
 }
 
 cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  )
-    throw (cssu::RuntimeException)
 {
     cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SAXEventKeeper" };
     return aRet;
@@ -1220,26 +1193,22 @@ cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(
 
 cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance(
     const cssu::Reference< cssl::XMultiServiceFactory > &)
-    throw( cssu::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new SAXEventKeeperImpl());
 }
 
 /* XServiceInfo */
 OUString SAL_CALL SAXEventKeeperImpl::getImplementationName(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return SAXEventKeeperImpl_getImplementationName();
 }
 
 sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const OUString& rServiceName )
-    throw (cssu::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return SAXEventKeeperImpl_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/framework/securityengine.cxx b/xmlsecurity/source/framework/securityengine.cxx
index 80e7ecfb8be1..fa8ec96428c1 100644
--- a/xmlsecurity/source/framework/securityengine.cxx
+++ b/xmlsecurity/source/framework/securityengine.cxx
@@ -34,7 +34,6 @@ SecurityEngine::SecurityEngine()
 
 /* XReferenceResolvedListener */
 void SAL_CALL SecurityEngine::referenceResolved( sal_Int32 /*referenceId*/)
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     m_nNumOfResolvedReferences++;
     tryToPerform();
@@ -42,7 +41,6 @@ void SAL_CALL SecurityEngine::referenceResolved( sal_Int32 /*referenceId*/)
 
 /* XKeyCollector */
 void SAL_CALL SecurityEngine::setKeyId( sal_Int32 id )
-    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     m_nIdOfKeyEC = id;
     tryToPerform();
@@ -50,7 +48,6 @@ void SAL_CALL SecurityEngine::setKeyId( sal_Int32 id )
 
 /* XMissionTaker */
 sal_Bool SAL_CALL SecurityEngine::endMission(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     bool rc = m_bMissionDone;
 
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 3e289b90f134..d938601afed7 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -68,7 +68,6 @@ bool SignatureCreatorImpl::checkReady() const
 }
 
 void SignatureCreatorImpl::notifyResultListener() const
-    throw (cssu::Exception, cssu::RuntimeException)
 /****** SignatureCreatorImpl/notifyResultListener *****************************
  *
  *   NAME
@@ -85,7 +84,6 @@ void SignatureCreatorImpl::notifyResultListener() const
 void SignatureCreatorImpl::startEngine( const cssu::Reference<
     cssxc::XXMLSignatureTemplate >&
     xSignatureTemplate)
-        throw (cssu::Exception, cssu::RuntimeException)
 /****** SignatureCreatorImpl/startEngine *************************************
  *
  *   NAME
@@ -147,7 +145,6 @@ void SignatureCreatorImpl::clearUp() const
 
 /* XBlockerMonitor */
 void SAL_CALL SignatureCreatorImpl::setBlockerId( sal_Int32 id )
-        throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     m_nIdOfBlocker = id;
     tryToPerform();
@@ -156,7 +153,6 @@ void SAL_CALL SignatureCreatorImpl::setBlockerId( sal_Int32 id )
 /* XSignatureCreationResultBroadcaster */
 void SAL_CALL SignatureCreatorImpl::addSignatureCreationResultListener(
     const cssu::Reference< cssxc::sax::XSignatureCreationResultListener >& listener )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     m_xResultListener = listener;
     tryToPerform();
@@ -164,13 +160,11 @@ void SAL_CALL SignatureCreatorImpl::addSignatureCreationResultListener(
 
 void SAL_CALL SignatureCreatorImpl::removeSignatureCreationResultListener(
     const cssu::Reference< cssxc::sax::XSignatureCreationResultListener >&)
-    throw (cssu::RuntimeException, std::exception)
 {
 }
 
 /* XInitialization */
 void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     OSL_ASSERT(aArguments.getLength() == 5);
 
@@ -187,13 +181,11 @@ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any
 
 
 OUString SignatureCreatorImpl_getImplementationName ()
-    throw (cssu::RuntimeException)
 {
     return OUString ( IMPLEMENTATION_NAME );
 }
 
 cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
-    throw (cssu::RuntimeException)
 {
     cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureCreator" };
     return aRet;
@@ -201,26 +193,22 @@ cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceName
 
 cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance(
     const cssu::Reference< cssl::XMultiServiceFactory >& /*xMSF*/ )
-    throw( cssu::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new SignatureCreatorImpl);
 }
 
 /* XServiceInfo */
 OUString SAL_CALL SignatureCreatorImpl::getImplementationName(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return SignatureCreatorImpl_getImplementationName();
 }
 
 sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const OUString& rServiceName )
-    throw (cssu::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return SignatureCreatorImpl_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx
index b22d97cbccf4..8b570465c44d 100644
--- a/xmlsecurity/source/framework/signatureengine.cxx
+++ b/xmlsecurity/source/framework/signatureengine.cxx
@@ -75,7 +75,6 @@ bool SignatureEngine::checkReady() const
 }
 
 void SignatureEngine::tryToPerform( )
-        throw (cssu::Exception, cssu::RuntimeException)
 /****** SignatureEngine/tryToPerform *****************************************
  *
  *   NAME
@@ -164,14 +163,12 @@ void SignatureEngine::clearUp( ) const
 
 /* XReferenceCollector */
 void SAL_CALL SignatureEngine::setReferenceCount( sal_Int32 count )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     m_nTotalReferenceNumber = count;
     tryToPerform();
 }
 
 void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     m_vReferenceIds.push_back( id );
 }
@@ -180,14 +177,12 @@ void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id )
 void SAL_CALL SignatureEngine::setUriBinding(
     const OUString& uri,
     const cssu::Reference< css::io::XInputStream >& aInputStream )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     m_vUris.push_back(uri);
     m_vXInputStreams.push_back(aInputStream);
 }
 
 cssu::Reference< css::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const OUString& uri )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     cssu::Reference< css::io::XInputStream > xInputStream;
 
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index b399af103718..0ae3b619ddcc 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -63,7 +63,6 @@ bool SignatureVerifierImpl::checkReady() const
 }
 
 void SignatureVerifierImpl::notifyResultListener() const
-    throw (cssu::Exception, cssu::RuntimeException)
 /****** SignatureVerifierImpl/notifyResultListener ***************************
  *
  *   NAME
@@ -79,7 +78,6 @@ void SignatureVerifierImpl::notifyResultListener() const
 void SignatureVerifierImpl::startEngine( const cssu::Reference<
     cssxc::XXMLSignatureTemplate >&
     xSignatureTemplate)
-    throw (cssu::Exception, cssu::RuntimeException)
 /****** SignatureVerifierImpl/startEngine ************************************
  *
  *   NAME
@@ -108,7 +106,6 @@ void SignatureVerifierImpl::startEngine( const cssu::Reference<
 /* XSignatureVerifyResultBroadcaster */
 void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener(
     const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >& listener )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     m_xResultListener = listener;
     tryToPerform();
@@ -116,14 +113,12 @@ void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener(
 
 void SAL_CALL SignatureVerifierImpl::removeSignatureVerifyResultListener(
     const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >&)
-    throw (cssu::RuntimeException, std::exception)
 {
 }
 
 /* XInitialization */
 void SAL_CALL SignatureVerifierImpl::initialize(
     const cssu::Sequence< cssu::Any >& aArguments )
-    throw (cssu::Exception, cssu::RuntimeException, std::exception)
 {
     OSL_ASSERT(aArguments.getLength() == 5);
 
@@ -140,13 +135,11 @@ void SAL_CALL SignatureVerifierImpl::initialize(
 
 
 OUString SignatureVerifierImpl_getImplementationName ()
-    throw (cssu::RuntimeException)
 {
     return OUString( IMPLEMENTATION_NAME );
 }
 
 cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  )
-    throw (cssu::RuntimeException)
 {
     cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureVerifier" };
     return aRet;
@@ -154,26 +147,22 @@ cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNam
 
 cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstance(
     const cssu::Reference< cssl::XMultiServiceFactory >& /*rSMgr*/)
-    throw( cssu::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new SignatureVerifierImpl);
 }
 
 /* XServiceInfo */
 OUString SAL_CALL SignatureVerifierImpl::getImplementationName(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return SignatureVerifierImpl_getImplementationName();
 }
 
 sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const OUString& rServiceName )
-    throw (cssu::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return SignatureVerifierImpl_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
index 2cb06278d19a..923f4bb73b3a 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
@@ -39,51 +39,45 @@ XMLEncryptionTemplateImpl::~XMLEncryptionTemplateImpl() {
 
 /* XXMLEncryptionTemplate */
 void SAL_CALL XMLEncryptionTemplateImpl::setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
-    throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
 {
     m_xTemplate = aTemplate ;
 }
 
 /* XXMLEncryptionTemplate */
 Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTemplate()
-throw (css::uno::RuntimeException, std::exception)
 {
     return m_xTemplate ;
 }
 
 /* XXMLEncryptionTemplate */
-void SAL_CALL XMLEncryptionTemplateImpl::setTarget( const Reference< XXMLElementWrapper >& aTarget )
-    throw( css::lang::IllegalArgumentException, std::exception ) {
+void SAL_CALL XMLEncryptionTemplateImpl::setTarget( const Reference< XXMLElementWrapper >& aTarget ) {
     m_xTarget = aTarget ;
 }
 
 /* XXMLEncryptionTemplate */
 Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTarget()
-throw (css::uno::RuntimeException, std::exception)
 {
     return m_xTarget ;
 }
 
 void SAL_CALL XMLEncryptionTemplateImpl::setStatus(
     css::xml::crypto::SecurityOperationStatus status )
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     m_nStatus = status;
 }
 
 css::xml::crypto::SecurityOperationStatus SAL_CALL XMLEncryptionTemplateImpl::getStatus(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_nStatus;
 }
 
 /* XServiceInfo */
-OUString SAL_CALL XMLEncryptionTemplateImpl::getImplementationName() throw( RuntimeException, std::exception ) {
+OUString SAL_CALL XMLEncryptionTemplateImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL XMLEncryptionTemplateImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
+sal_Bool SAL_CALL XMLEncryptionTemplateImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -94,7 +88,7 @@ sal_Bool SAL_CALL XMLEncryptionTemplateImpl::supportsService( const OUString& se
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) {
+Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -105,12 +99,12 @@ Sequence< OUString > XMLEncryptionTemplateImpl::impl_getSupportedServiceNames()
     return seqServiceNames;
 }
 
-OUString XMLEncryptionTemplateImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLEncryptionTemplateImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL XMLEncryptionTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >&  ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLEncryptionTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >&  ) {
     return Reference< XInterface >( *new XMLEncryptionTemplateImpl ) ;
 }
 
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
index e5bec6a3e098..adc92a868d48 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
@@ -50,44 +50,41 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper<
         //Methods from XXMLEncryptionTemplate
         virtual void SAL_CALL setTemplate(
             const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
-            )
-            throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
+            ) override;
 
         virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate(
-        ) throw (css::uno::RuntimeException, std::exception) override;
+        ) override;
 
         virtual void SAL_CALL setTarget(
             const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
-            ) throw( css::lang::IllegalArgumentException, std::exception) override;
+            ) override;
 
         virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTarget(
-        ) throw (css::uno::RuntimeException, std::exception) override ;
+        ) override ;
 
         virtual void SAL_CALL setStatus(
-            css::xml::crypto::SecurityOperationStatus status )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            css::xml::crypto::SecurityOperationStatus status ) override;
         virtual css::xml::crypto::SecurityOperationStatus
-            SAL_CALL getStatus(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+            SAL_CALL getStatus(  ) override;
 
         //Methods from 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(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException, std::exception ) override ;
+        ) 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 ;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
         /// @throws css::uno::RuntimeException
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index a2f7b9bd41dc..8d85579e4a7b 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -40,26 +40,22 @@ XMLSignatureTemplateImpl::~XMLSignatureTemplateImpl() {
 
 /* XXMLSignatureTemplate */
 void SAL_CALL XMLSignatureTemplateImpl::setTemplate( const Reference< XXMLElementWrapper >& aTemplate )
-    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
 {
     m_xTemplate = aTemplate ;
 }
 
 /* XXMLSignatureTemplate */
 Reference< XXMLElementWrapper > SAL_CALL XMLSignatureTemplateImpl::getTemplate()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_xTemplate ;
 }
 
 void SAL_CALL XMLSignatureTemplateImpl::setTarget( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement )
-    throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception)
 {
     targets.push_back( aXmlElement );
 }
 
 css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > SAL_CALL XMLSignatureTemplateImpl::getTargets()
-    throw (css::uno::RuntimeException, std::exception)
 {
     sal_Int32 length = targets.size();
     css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > aTargets (length);
@@ -76,37 +72,33 @@ css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >
 
 void SAL_CALL XMLSignatureTemplateImpl::setBinding(
     const css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding )
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     m_xUriBinding = aUriBinding;
 }
 
 css::uno::Reference< css::xml::crypto::XUriBinding > SAL_CALL XMLSignatureTemplateImpl::getBinding()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_xUriBinding;
 }
 
 void SAL_CALL XMLSignatureTemplateImpl::setStatus(
     css::xml::crypto::SecurityOperationStatus status )
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     m_nStatus = status;
 }
 
 css::xml::crypto::SecurityOperationStatus SAL_CALL XMLSignatureTemplateImpl::getStatus(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_nStatus;
 }
 
 /* XServiceInfo */
-OUString SAL_CALL XMLSignatureTemplateImpl::getImplementationName() throw( RuntimeException, std::exception ) {
+OUString SAL_CALL XMLSignatureTemplateImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL XMLSignatureTemplateImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
+sal_Bool SAL_CALL XMLSignatureTemplateImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -117,7 +109,7 @@ sal_Bool SAL_CALL XMLSignatureTemplateImpl::supportsService( const OUString& ser
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) {
+Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -128,12 +120,12 @@ Sequence< OUString > XMLSignatureTemplateImpl::impl_getSupportedServiceNames() {
     return seqServiceNames ;
 }
 
-OUString XMLSignatureTemplateImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLSignatureTemplateImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.framework.XMLSignatureTemplateImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >&  ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >&  ) {
     return Reference< XInterface >( *new XMLSignatureTemplateImpl ) ;
 }
 
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
index ad04b808a967..62f713aecc6f 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
@@ -52,50 +52,46 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper<
         //Methods from XXMLSignatureTemplate
         virtual void SAL_CALL setTemplate(
             const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
-            ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
+            ) override;
 
         virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate(
-        ) throw (css::uno::RuntimeException, std::exception) override;
+        ) override;
 
         virtual void SAL_CALL setTarget(
             const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement
-        ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
+        ) override;
 
         virtual css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > SAL_CALL getTargets(
-        ) throw (css::uno::RuntimeException, std::exception) override;
+        ) override;
 
         virtual void SAL_CALL setBinding(
-            const css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            const css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding ) override;
         virtual css::uno::Reference< css::xml::crypto::XUriBinding >
-            SAL_CALL getBinding(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+            SAL_CALL getBinding(  ) override;
 
         virtual void SAL_CALL setStatus(
-            css::xml::crypto::SecurityOperationStatus status )
-            throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+            css::xml::crypto::SecurityOperationStatus status ) override;
         virtual css::xml::crypto::SecurityOperationStatus
-            SAL_CALL getStatus(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+            SAL_CALL getStatus(  ) override;
 
         //Methods from 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(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException, std::exception ) override ;
+        ) 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 ;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
         /// @throws css::uno::RuntimeException
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx b/xmlsecurity/source/helper/ooxmlsecparser.cxx
index 8535c8279c49..aff5c1d302c5 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx
@@ -30,20 +30,19 @@ OOXMLSecParser::~OOXMLSecParser()
 {
 }
 
-void SAL_CALL OOXMLSecParser::startDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL OOXMLSecParser::startDocument()
 {
     if (m_xNextHandler.is())
         m_xNextHandler->startDocument();
 }
 
-void SAL_CALL OOXMLSecParser::endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL OOXMLSecParser::endDocument()
 {
     if (m_xNextHandler.is())
         m_xNextHandler->endDocument();
 }
 
 void SAL_CALL OOXMLSecParser::startElement(const OUString& rName, const uno::Reference<xml::sax::XAttributeList>& xAttribs)
-throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     OUString aId = xAttribs->getValueByName("Id");
     if (!aId.isEmpty())
@@ -123,7 +122,7 @@ throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
         m_xNextHandler->startElement(rName, xAttribs);
 }
 
-void SAL_CALL OOXMLSecParser::endElement(const OUString& rName) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL OOXMLSecParser::endElement(const OUString& rName)
 {
     if (rName == "SignedInfo")
         m_pXSecController->setReferenceCount();
@@ -179,7 +178,7 @@ void SAL_CALL OOXMLSecParser::endElement(const OUString& rName) throw (xml::sax:
         m_xNextHandler->endElement(rName);
 }
 
-void SAL_CALL OOXMLSecParser::characters(const OUString& rChars) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL OOXMLSecParser::characters(const OUString& rChars)
 {
     if (m_bInDigestValue && !m_bInCertDigest)
         m_aDigestValue += rChars;
@@ -202,25 +201,25 @@ void SAL_CALL OOXMLSecParser::characters(const OUString& rChars) throw (xml::sax
         m_xNextHandler->characters(rChars);
 }
 
-void SAL_CALL OOXMLSecParser::ignorableWhitespace(const OUString& rWhitespace) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL OOXMLSecParser::ignorableWhitespace(const OUString& rWhitespace)
 {
     if (m_xNextHandler.is())
         m_xNextHandler->ignorableWhitespace(rWhitespace);
 }
 
-void SAL_CALL OOXMLSecParser::processingInstruction(const OUString& rTarget, const OUString& rData) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL OOXMLSecParser::processingInstruction(const OUString& rTarget, const OUString& rData)
 {
     if (m_xNextHandler.is())
         m_xNextHandler->processingInstruction(rTarget, rData);
 }
 
-void SAL_CALL OOXMLSecParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& xLocator) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
+void SAL_CALL OOXMLSecParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& xLocator)
 {
     if (m_xNextHandler.is())
         m_xNextHandler->setDocumentLocator(xLocator);
 }
 
-void SAL_CALL OOXMLSecParser::initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL OOXMLSecParser::initialize(const uno::Sequence<uno::Any>& rArguments)
 {
     rArguments[0] >>= m_xNextHandler;
 }
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx
index a78c3e369c24..068ffb22a930 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.hxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx
@@ -56,26 +56,24 @@ public:
     virtual ~OOXMLSecParser() override;
 
     // XDocumentHandler
-    virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument() override;
 
-    virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument() override;
 
-    virtual void SAL_CALL startElement(const OUString& aName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs)
-    throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startElement(const OUString& aName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override;
 
-    virtual void SAL_CALL endElement(const OUString& aName) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endElement(const OUString& aName) override;
 
-    virtual void SAL_CALL characters(const OUString& aChars) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters(const OUString& aChars) override;
 
-    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
 
-    virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) override;
 
-    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator>& xLocator)
-    throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator>& xLocator) 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;
+    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
 };
 
 #endif
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 772b7cd56a5b..926f445fbd16 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -52,14 +52,12 @@ void ImplXMLSignatureListener::setNextHandler(
 }
 
 void SAL_CALL ImplXMLSignatureListener::signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
-        throw (css::uno::RuntimeException, std::exception)
 {
     XMLSignatureCreationResult aResult( securityId, nResult );
     maCreationResultListenerListener.Call( aResult );
 }
 
 void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
-        throw (css::uno::RuntimeException, std::exception)
 {
     XMLSignatureVerifyResult aResult( securityId, nResult );
     maVerifyResultListenerListener.Call( aResult );
@@ -67,7 +65,6 @@ void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId,
 
 // XDocumentHandler
 void SAL_CALL ImplXMLSignatureListener::startDocument(  )
-    throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -76,7 +73,6 @@ void SAL_CALL ImplXMLSignatureListener::startDocument(  )
 }
 
 void SAL_CALL ImplXMLSignatureListener::endDocument(  )
-    throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -85,7 +81,6 @@ void SAL_CALL ImplXMLSignatureListener::endDocument(  )
 }
 
 void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
 {
     if ( aName == "Signature" )
     {
@@ -99,7 +94,6 @@ void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, con
 }
 
 void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName )
-    throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -108,7 +102,6 @@ void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName )
 }
 
 void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars )
-    throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -117,7 +110,6 @@ void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars )
 }
 
 void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWhitespaces )
-    throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -126,7 +118,6 @@ void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWh
 }
 
 void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& aTarget, const OUString& aData )
-    throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -135,7 +126,6 @@ void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& a
 }
 
 void SAL_CALL ImplXMLSignatureListener::setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-    throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -155,12 +145,10 @@ UriBindingHelper::UriBindingHelper( const css::uno::Reference < css::embed::XSto
 }
 
 void SAL_CALL UriBindingHelper::setUriBinding( const OUString& /*uri*/, const uno::Reference< io::XInputStream >&)
-    throw (uno::Exception, uno::RuntimeException, std::exception)
 {
 }
 
 uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( const OUString& uri )
-    throw (uno::Exception, uno::RuntimeException, std::exception)
 {
     uno::Reference< io::XInputStream > xInputStream;
     if ( mxStorage.is() )
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
index 7c76a9a86ffa..6518aa96d610 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
@@ -68,37 +68,27 @@ public:
     void setNextHandler(const css::uno::Reference< css::xml::sax::XDocumentHandler >& xNextHandler);
 
     // css::xml::crypto::sax::XSignatureCreationResultListener
-    virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus creationResult )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus creationResult ) override;
 
     // css::xml::crypto::sax::XSignatureVerifyResultListener
-    virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus verifyResult )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus verifyResult ) override;
 
     // css::xml::sax::XDocumentHandler
-    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override;
 
-    virtual void SAL_CALL startDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument(  ) override;
 
-    virtual void SAL_CALL endDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument(  ) override;
 
-    virtual void SAL_CALL endElement( const OUString& aName )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
 
-    virtual void SAL_CALL characters( const OUString& aChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
 
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
 
-    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override;
 
-    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
 };
 
 // XUriBinding
@@ -112,11 +102,9 @@ public:
     UriBindingHelper();
     explicit UriBindingHelper( const css::uno::Reference < css::embed::XStorage >& rxStorage );
 
-    void SAL_CALL setUriBinding( const OUString& uri, const css::uno::Reference< css::io::XInputStream >& aInputStream )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    void SAL_CALL setUriBinding( const OUString& uri, const css::uno::Reference< css::io::XInputStream >& aInputStream ) override;
 
-    css::uno::Reference< css::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri )
-        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference< css::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri ) override;
 
     static css::uno::Reference < css::io::XInputStream > OpenInputStream( const css::uno::Reference < css::embed::XStorage >& rxStore, const OUString& rURI );
 };
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index e27101b4cdf8..ff2e47219216 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -911,7 +911,6 @@ SignatureInformations XSecController::getSignatureInformations() const
  */
 
 void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking )
-    throw (cssu::RuntimeException, std::exception)
 {
     this->m_bIsBlocking = isBlocking;
     checkChainingStatus();
@@ -919,14 +918,12 @@ void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking )
 
 void SAL_CALL XSecController::collectionStatusChanged(
     sal_Bool isInsideCollectedElement )
-    throw (cssu::RuntimeException, std::exception)
 {
     this->m_bIsCollectingElement = isInsideCollectedElement;
     checkChainingStatus();
 }
 
 void SAL_CALL XSecController::bufferStatusChanged( sal_Bool /*isBufferEmpty*/)
-    throw (cssu::RuntimeException, std::exception)
 {
 
 }
@@ -935,7 +932,6 @@ void SAL_CALL XSecController::bufferStatusChanged( sal_Bool /*isBufferEmpty*/)
  * XSignatureCreationResultListener
  */
 void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
-        throw (css::uno::RuntimeException, std::exception)
 {
     int index = findSignatureInfor(securityId);
     assert(index != -1 && "Signature Not Found!");
@@ -947,7 +943,6 @@ void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, css::xml::
  * XSignatureVerifyResultListener
  */
 void SAL_CALL XSecController::signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult )
-        throw (css::uno::RuntimeException, std::exception)
 {
     int index = findSignatureInfor(securityId);
     assert(index != -1 && "Signature Not Found!");
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index d4c9f9dcfe0d..210db2d113cc 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -62,7 +62,6 @@ OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList >& x
  * XDocumentHandler
  */
 void SAL_CALL XSecParser::startDocument(  )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     m_bInX509IssuerName = false;
     m_bInX509SerialNumber = false;
@@ -79,7 +78,6 @@ void SAL_CALL XSecParser::startDocument(  )
 }
 
 void SAL_CALL XSecParser::endDocument(  )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -90,7 +88,6 @@ void SAL_CALL XSecParser::endDocument(  )
 void SAL_CALL XSecParser::startElement(
     const OUString& aName,
     const cssu::Reference< cssxs::XAttributeList >& xAttribs )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     try
     {
@@ -243,7 +240,6 @@ void SAL_CALL XSecParser::startElement(
 }
 
 void SAL_CALL XSecParser::endElement( const OUString& aName )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     try
     {
@@ -338,7 +334,6 @@ void SAL_CALL XSecParser::endElement( const OUString& aName )
 }
 
 void SAL_CALL XSecParser::characters( const OUString& aChars )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if (m_bInX509IssuerName)
     {
@@ -388,7 +383,6 @@ void SAL_CALL XSecParser::characters( const OUString& aChars )
 }
 
 void SAL_CALL XSecParser::ignorableWhitespace( const OUString& aWhitespaces )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -397,7 +391,6 @@ void SAL_CALL XSecParser::ignorableWhitespace( const OUString& aWhitespaces )
 }
 
 void SAL_CALL XSecParser::processingInstruction( const OUString& aTarget, const OUString& aData )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -406,7 +399,6 @@ void SAL_CALL XSecParser::processingInstruction( const OUString& aTarget, const
 }
 
 void SAL_CALL XSecParser::setDocumentLocator( const cssu::Reference< cssxs::XLocator >& xLocator )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if (m_xNextHandler.is())
     {
@@ -419,7 +411,6 @@ void SAL_CALL XSecParser::setDocumentLocator( const cssu::Reference< cssxs::XLoc
  */
 void SAL_CALL XSecParser::initialize(
     const cssu::Sequence< cssu::Any >& aArguments )
-    throw(cssu::Exception, cssu::RuntimeException, std::exception)
 {
     aArguments[0] >>= m_xNextHandler;
 }
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index c9463cc485dc..098e41ee3034 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -117,43 +117,34 @@ public:
     /*
      * XDocumentHandler
      */
-    virtual void SAL_CALL startDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startDocument(  ) override;
 
-    virtual void SAL_CALL endDocument(  )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endDocument(  ) override;
 
     virtual void SAL_CALL startElement(
         const OUString& aName,
         const css::uno::Reference<
-            css::xml::sax::XAttributeList >& xAttribs )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            css::xml::sax::XAttributeList >& xAttribs ) override;
 
-    virtual void SAL_CALL endElement( const OUString& aName )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL endElement( const OUString& aName ) override;
 
-    virtual void SAL_CALL characters( const OUString& aChars )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL characters( const OUString& aChars ) override;
 
-    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override;
 
     virtual void SAL_CALL processingInstruction(
         const OUString& aTarget,
-        const OUString& aData )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+        const OUString& aData ) override;
 
     virtual void SAL_CALL setDocumentLocator(
         const css::uno::Reference<
-            css::xml::sax::XLocator >& xLocator )
-        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+            css::xml::sax::XLocator >& xLocator ) override;
 
     /*
      * XInitialization
      */
     virtual void SAL_CALL initialize(
-        const css::uno::Sequence< css::uno::Any >& aArguments )
-        throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 };
 
 #endif
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
index 6c6723f08aad..112aebc7f7d8 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
@@ -37,17 +37,17 @@ class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper<
 
     public:
         //Methods from XCertificateExtension
-        virtual sal_Bool SAL_CALL isCritical() throw( css::uno::RuntimeException, std::exception ) override
+        virtual sal_Bool SAL_CALL isCritical() override
         {
             return m_Extn.m_critical;
         }
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( css::uno::RuntimeException, std::exception ) override
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() override
         {
             return m_Extn.m_xExtnId;
         }
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( css::uno::RuntimeException, std::exception ) override
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() override
         {
             return m_Extn.m_xExtnValue;
         }
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
index c5ce74dbf400..5fba1ff146d3 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
@@ -44,20 +44,20 @@ SanExtensionImpl::~SanExtensionImpl() {
 
 
 //Methods from XCertificateExtension
-sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( css::uno::RuntimeException ) {
+sal_Bool SAL_CALL SanExtensionImpl::isCritical() {
     return m_critical ;
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() throw( css::uno::RuntimeException ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() {
     return m_xExtnId ;
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() throw( css::uno::RuntimeException ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() {
     return m_xExtnValue ;
 }
 
 //Methods from XSanExtension
-css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( css::uno::RuntimeException ){
+css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames(){
 
     if (!m_Entries.hasElements())
     {
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
index c4e391a65fa9..795e08d1a7cf 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx
@@ -53,15 +53,15 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper<
         virtual ~SanExtensionImpl() override;
 
         //Methods from XCertificateExtension
-        virtual sal_Bool SAL_CALL isCritical() throw( css::uno::RuntimeException ) override;
+        virtual sal_Bool SAL_CALL isCritical() override;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( css::uno::RuntimeException ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() override;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( css::uno::RuntimeException ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() override;
 
         //Methods from XSanExtension
 
-        virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( css::uno::RuntimeException ) override;
+        virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() override;
 
         //Helper method
         void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 39f52f76d753..f383046aa5d3 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -154,12 +154,12 @@ SecurityEnvironment_MSCryptImpl::~SecurityEnvironment_MSCryptImpl() {
 }
 
 /* XServiceInfo */
-OUString SAL_CALL SecurityEnvironment_MSCryptImpl::getImplementationName() throw( RuntimeException ) {
+OUString SAL_CALL SecurityEnvironment_MSCryptImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) {
+sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -170,7 +170,7 @@ sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl::supportsService( const OUStri
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) {
+Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -181,12 +181,12 @@ Sequence< OUString > SecurityEnvironment_MSCryptImpl::impl_getSupportedServiceNa
     return seqServiceNames ;
 }
 
-OUString SecurityEnvironment_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString SecurityEnvironment_MSCryptImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL SecurityEnvironment_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL SecurityEnvironment_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) {
     return Reference< XInterface >( *new SecurityEnvironment_MSCryptImpl( aServiceManager ) ) ;
 }
 
@@ -196,7 +196,6 @@ Reference< XSingleServiceFactory > SecurityEnvironment_MSCryptImpl::impl_createF
 
 /* XUnoTunnel */
 sal_Int64 SAL_CALL SecurityEnvironment_MSCryptImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier )
-    throw( RuntimeException )
 {
     if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
         return reinterpret_cast<sal_Int64>(this);
@@ -225,11 +224,11 @@ SecurityEnvironment_MSCryptImpl* SecurityEnvironment_MSCryptImpl::getImplementat
         return nullptr ;
 }
 
-HCRYPTPROV SecurityEnvironment_MSCryptImpl::getCryptoProvider() throw( css::uno::Exception , css::uno::RuntimeException ) {
+HCRYPTPROV SecurityEnvironment_MSCryptImpl::getCryptoProvider() {
     return m_hProv ;
 }
 
-void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) throw( css::uno::Exception , css::uno::RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) {
     if( m_hProv != NULL ) {
         CryptReleaseContext( m_hProv, 0 ) ;
         m_hProv = NULL ;
@@ -240,21 +239,21 @@ void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) thro
     }
 }
 
-LPCTSTR SecurityEnvironment_MSCryptImpl::getKeyContainer() throw( css::uno::Exception , css::uno::RuntimeException ) {
+LPCTSTR SecurityEnvironment_MSCryptImpl::getKeyContainer() {
     return m_pszContainer ;
 }
 
-void SecurityEnvironment_MSCryptImpl::setKeyContainer( LPCTSTR aKeyContainer ) throw( css::uno::Exception , css::uno::RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setKeyContainer( LPCTSTR aKeyContainer ) {
     //TODO: Don't know whether or not it should be copied.
     m_pszContainer = aKeyContainer ;
 }
 
 
-HCERTSTORE SecurityEnvironment_MSCryptImpl::getCryptoSlot() throw( Exception , RuntimeException ) {
+HCERTSTORE SecurityEnvironment_MSCryptImpl::getCryptoSlot() {
     return m_hKeyStore ;
 }
 
-void SecurityEnvironment_MSCryptImpl::setCryptoSlot( HCERTSTORE aSlot) throw( Exception , RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setCryptoSlot( HCERTSTORE aSlot) {
     if( m_hKeyStore != nullptr ) {
         CertCloseStore( m_hKeyStore, CERT_CLOSE_STORE_FORCE_FLAG ) ;
         m_hKeyStore = nullptr ;
@@ -265,11 +264,11 @@ void SecurityEnvironment_MSCryptImpl::setCryptoSlot( HCERTSTORE aSlot) throw( Ex
     }
 }
 
-HCERTSTORE SecurityEnvironment_MSCryptImpl::getCertDb() throw( Exception , RuntimeException ) {
+HCERTSTORE SecurityEnvironment_MSCryptImpl::getCertDb() {
     return m_hCertStore ;
 }
 
-void SecurityEnvironment_MSCryptImpl::setCertDb( HCERTSTORE aCertDb ) throw( Exception , RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::setCertDb( HCERTSTORE aCertDb ) {
     if( m_hCertStore != nullptr ) {
         CertCloseStore( m_hCertStore, CERT_CLOSE_STORE_FORCE_FLAG ) ;
         m_hCertStore = nullptr ;
@@ -346,7 +345,7 @@ extern "C" BOOL WINAPI cert_enum_system_store_callback(const void *pvSystemStore
 #endif
 
 //Methods from XSecurityEnvironment
-Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::getPersonalCertificates() throw( SecurityException , RuntimeException )
+Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::getPersonalCertificates()
 {
     sal_Int32 length ;
     X509Certificate_MSCryptImpl* xcert ;
@@ -421,7 +420,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::getPerso
 }
 
 
-Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException ) {
+Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) {
     unsigned int i ;
     LPCSTR   pszName ;
     X509Certificate_MSCryptImpl *xcert = nullptr ;
@@ -618,12 +617,12 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const
     return xcert ;
 }
 
-Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const OUString& serialNumber ) throw( SecurityException , RuntimeException ) {
+Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const OUString& serialNumber ) {
     Sequence< sal_Int8 > serial = numericStringToBigInteger( serialNumber ) ;
     return getCertificate( issuerName, serial ) ;
 }
 
-Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::buildCertificatePath( const Reference< XCertificate >& begin ) throw( SecurityException , RuntimeException ) {
+Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::buildCertificatePath( const Reference< XCertificate >& begin ) {
     PCCERT_CHAIN_CONTEXT pChainContext ;
     PCCERT_CONTEXT pCertContext ;
     const X509Certificate_MSCryptImpl* xcert ;
@@ -745,7 +744,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::buildCer
     return Sequence< Reference < XCertificate > >();
 }
 
-Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) throw( SecurityException , RuntimeException ) {
+Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) {
     X509Certificate_MSCryptImpl* xcert ;
 
     if( rawCertificate.getLength() > 0 ) {
@@ -758,7 +757,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFrom
     return xcert ;
 }
 
-Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromAscii( const OUString& asciiCertificate ) throw( SecurityException , RuntimeException ) {
+Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromAscii( const OUString& asciiCertificate ) {
     xmlChar* chCert ;
     xmlSecSize certSize ;
 
@@ -809,7 +808,6 @@ HCERTSTORE getCertStoreForIntermediatCerts(
 sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate(
     const Reference< css::security::XCertificate >& aCert,
     const Sequence< Reference< css::security::XCertificate > >& seqCerts)
-    throw( css::uno::SecurityException, css::uno::RuntimeException )
 {
     sal_Int32 validity = 0;
     PCCERT_CHAIN_CONTEXT pChainContext = nullptr;
@@ -978,7 +976,7 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate(
     return validity ;
 }
 
-sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& aCert ) throw( css::uno::SecurityException, css::uno::RuntimeException ) {
+sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& aCert ) {
     sal_Int32 characters ;
     PCCERT_CONTEXT pCertContext ;
     const X509Certificate_MSCryptImpl* xcert ;
@@ -1027,11 +1025,11 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const css::
     return characters ;
 }
 
-void SecurityEnvironment_MSCryptImpl::enableDefaultCrypt( bool enable ) throw( Exception, RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::enableDefaultCrypt( bool enable ) {
     m_bEnableDefault = enable ;
 }
 
-bool SecurityEnvironment_MSCryptImpl::defaultEnabled() throw( Exception, RuntimeException ) {
+bool SecurityEnvironment_MSCryptImpl::defaultEnabled() {
     return m_bEnableDefault ;
 }
 
@@ -1049,12 +1047,12 @@ static X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cer
     return xcert ;
 }
 
-OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( css::uno::RuntimeException )
+OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation()
 {
     return OUString("Microsoft Crypto API");
 }
 
-xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Exception, RuntimeException ) {
+xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() {
 
     xmlSecKeysMngrPtr pKeysMngr = nullptr ;
 
@@ -1112,7 +1110,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Ex
 
     return pKeysMngr ;
 }
-void SecurityEnvironment_MSCryptImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( Exception, RuntimeException ) {
+void SecurityEnvironment_MSCryptImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) {
     if( pKeysMngr != nullptr ) {
         xmlSecKeysMngrDestroy( pKeysMngr ) ;
     }
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 3a4280bfb10a..932f69cd89c7 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -83,117 +83,109 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper<
         virtual ~SecurityEnvironment_MSCryptImpl() override;
 
         //Methods from XSecurityEnvironment
-        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates()
-            throw(  css::uno::SecurityException , css::uno::RuntimeException ) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates() override;
 
         virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate(
             const OUString& issuerName,
-            const css::uno::Sequence< sal_Int8 >& serialNumber )
-            throw( css::uno::SecurityException , css::uno::RuntimeException ) override;
+            const css::uno::Sequence< sal_Int8 >& serialNumber ) override;
 
+        /// @throws css::uno::SecurityException
+        /// @throws css::uno::RuntimeException
         virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate(
             const OUString& issuerName,
-            const OUString& serialNumber )
-            throw( css::uno::SecurityException , css::uno::RuntimeException ) ;
+            const OUString& serialNumber ) ;
 
         virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL buildCertificatePath(
-            const css::uno::Reference< css::security::XCertificate >& beginCert )
-            throw(  css::uno::SecurityException , css::uno::RuntimeException ) override;
+            const css::uno::Reference< css::security::XCertificate >& beginCert ) override;
 
         virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromRaw(
-            const css::uno::Sequence< sal_Int8 >& rawCertificate )
-            throw( css::uno::SecurityException , css::uno::RuntimeException ) override;
+            const css::uno::Sequence< sal_Int8 >& rawCertificate ) override;
 
         virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromAscii(
-            const OUString& asciiCertificate )
-            throw( css::uno::SecurityException , css::uno::RuntimeException ) override;
+            const OUString& asciiCertificate ) override;
 
         virtual ::sal_Int32 SAL_CALL verifyCertificate(
             const css::uno::Reference< css::security::XCertificate >& xCert,
             const css::uno::Sequence< css::uno::Reference<
-            css::security::XCertificate > >& intermediateCertificates)
-            throw (css::uno::SecurityException, css::uno::RuntimeException) override;
+            css::security::XCertificate > >& intermediateCertificates) override;
 
         virtual ::sal_Int32 SAL_CALL getCertificateCharacters(
-            const css::uno::Reference< css::security::XCertificate >& xCert )
-            throw (css::uno::SecurityException, css::uno::RuntimeException) override;
+            const css::uno::Reference< css::security::XCertificate >& xCert ) override;
 
-        virtual OUString SAL_CALL getSecurityEnvironmentInformation(  )
-            throw (css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getSecurityEnvironmentInformation(  ) override;
 
 
         //Methods from XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         virtual sal_Bool SAL_CALL supportsService(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException ) override;
+        ) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
+        /// @throws css::uno::RuntimeException
         static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance(
-            const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager )
-            throw( css::uno::RuntimeException ) ;
+            const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory(
             const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         //Methods from XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-            throw (css::uno::RuntimeException) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
         static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
         static SecurityEnvironment_MSCryptImpl* getImplementation( const css::uno::Reference< css::uno::XInterface >& rObj ) ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        HCRYPTPROV getCryptoProvider() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        HCRYPTPROV getCryptoProvider() ;
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        void setCryptoProvider( HCRYPTPROV aProv ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        void setCryptoProvider( HCRYPTPROV aProv ) ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        LPCTSTR getKeyContainer() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        LPCTSTR getKeyContainer() ;
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        void setKeyContainer( LPCTSTR aKeyContainer ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        void setKeyContainer( LPCTSTR aKeyContainer ) ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        HCERTSTORE getCryptoSlot() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        HCERTSTORE getCryptoSlot() ;
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        void setCryptoSlot( HCERTSTORE aKeyStore ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        void setCryptoSlot( HCERTSTORE aKeyStore ) ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        HCERTSTORE getCertDb() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        HCERTSTORE getCertDb() ;
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        void setCertDb( HCERTSTORE aCertDb ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        void setCertDb( HCERTSTORE aCertDb ) ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        void enableDefaultCrypt( bool enable ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        void enableDefaultCrypt( bool enable ) ;
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        bool defaultEnabled() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        bool defaultEnabled() ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        xmlSecKeysMngrPtr createKeysManager() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        xmlSecKeysMngrPtr createKeysManager() ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) ;
 } ;
 
 #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SECURITYENVIRONMENT_MSCRYPTIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index 91158dd14d6b..72b50e292079 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -47,7 +47,6 @@ SEInitializer_MSCryptImpl::~SEInitializer_MSCryptImpl()
 cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
     SEInitializer_MSCryptImpl::createSecurityContext(
     const OUString& sCertDB )
-    throw (cssu::RuntimeException)
 {
     const char* n_pCertStore ;
     HCERTSTORE  n_hStoreHandle ;
@@ -118,7 +117,6 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
 }
 
 void SAL_CALL SEInitializer_MSCryptImpl::freeSecurityContext( const cssu::Reference< cssxc::XXMLSecurityContext >&)
-    throw (cssu::RuntimeException)
 {
     /*
     cssu::Reference< cssxc::XSecurityEnvironment > xSecEnv
@@ -148,39 +146,33 @@ void SAL_CALL SEInitializer_MSCryptImpl::freeSecurityContext( const cssu::Refere
 }
 
 OUString SEInitializer_MSCryptImpl_getImplementationName()
-    throw (cssu::RuntimeException)
 {
     return OUString( "com.sun.star.xml.security.bridge.xmlsec.SEInitializer_MSCryptImpl" );
 }
 
 cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames()
-    throw (cssu::RuntimeException)
 {
     cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.SEInitializer" };
     return aRet;
 }
 
 cssu::Reference< cssu::XInterface > SAL_CALL SEInitializer_MSCryptImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr)
-    throw( cssu::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new SEInitializer_MSCryptImpl( comphelper::getComponentContext(rSMgr) ));
 }
 
 /* XServiceInfo */
 OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName()
-    throw (cssu::RuntimeException)
 {
     return SEInitializer_MSCryptImpl_getImplementationName();
 }
 
 sal_Bool SAL_CALL SEInitializer_MSCryptImpl::supportsService( const OUString& rServiceName )
-    throw (cssu::RuntimeException)
 {
     return cppu::supportsService( this, rServiceName );
 }
 
 cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames()
-    throw (cssu::RuntimeException)
 {
     return SEInitializer_MSCryptImpl_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
index b36da2d65986..05afb7bd0db8 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
@@ -56,37 +56,28 @@ public:
 
     /* XSEInitializer */
     virtual css::uno::Reference< css::xml::crypto::XXMLSecurityContext >
-        SAL_CALL createSecurityContext( const OUString& certDB )
-        throw (css::uno::RuntimeException) override;
+        SAL_CALL createSecurityContext( const OUString& certDB ) override;
 
     virtual void SAL_CALL freeSecurityContext( const css::uno::Reference<
-        css::xml::crypto::XXMLSecurityContext >& securityContext )
-        throw (css::uno::RuntimeException) override;
+        css::xml::crypto::XXMLSecurityContext >& securityContext ) override;
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
 
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
 /// @throws css::uno::RuntimeException
-OUString SEInitializer_MSCryptImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString SEInitializer_MSCryptImpl_getImplementationName();
 
-bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const OUString& ServiceName )
-    throw ( css::uno::RuntimeException );
-
-css::uno::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+/// @throws css::uno::RuntimeException
+css::uno::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  );
 
+/// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
-SAL_CALL SEInitializer_MSCryptImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
-    throw ( css::uno::Exception );
+SAL_CALL SEInitializer_MSCryptImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
 
 #endif
 
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index c2033024f8c2..b468bf109a25 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -181,7 +181,7 @@ X509Certificate_MSCryptImpl::~X509Certificate_MSCryptImpl() {
 }
 
 //Methods from XCertificate
-sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() throw ( css::uno::RuntimeException) {
+sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) {
         return ( char )m_pCertContext->pCertInfo->dwVersion ;
     } else {
@@ -189,7 +189,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() throw ( css::uno::R
     }
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSerialNumber() throw ( css::uno::RuntimeException) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSerialNumber() {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) {
         Sequence< sal_Int8 > serial( m_pCertContext->pCertInfo->SerialNumber.cbData ) ;
         for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->SerialNumber.cbData ; i ++ )
@@ -201,7 +201,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSerialNu
     }
 }
 
-OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() throw ( css::uno::RuntimeException) {
+OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) {
         DWORD cbIssuer ;
 
@@ -247,7 +247,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() throw ( css::uno:
     }
 }
 
-OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( css::uno::RuntimeException)
+OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName()
 {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr )
     {
@@ -291,7 +291,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( css::uno
     }
 }
 
-css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidBefore() throw ( css::uno::RuntimeException ) {
+css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidBefore() {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) {
         SYSTEMTIME explTime ;
         DateTime dateTime ;
@@ -317,7 +317,7 @@ css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidBefore() th
     }
 }
 
-css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidAfter() throw ( css::uno::RuntimeException) {
+css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidAfter() {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) {
         SYSTEMTIME explTime ;
         DateTime dateTime ;
@@ -343,7 +343,7 @@ css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidAfter() thr
     }
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getIssuerUniqueID() throw ( css::uno::RuntimeException) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getIssuerUniqueID() {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) {
         Sequence< sal_Int8 > issuerUid( m_pCertContext->pCertInfo->IssuerUniqueId.cbData ) ;
         for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->IssuerUniqueId.cbData; i ++ )
@@ -355,7 +355,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getIssuerUn
     }
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectUniqueID() throw ( css::uno::RuntimeException ) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectUniqueID() {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) {
         Sequence< sal_Int8 > subjectUid( m_pCertContext->pCertInfo->SubjectUniqueId.cbData ) ;
         for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->SubjectUniqueId.cbData; i ++ )
@@ -367,7 +367,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectU
     }
 }
 
-css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_MSCryptImpl::getExtensions() throw ( css::uno::RuntimeException ) {
+css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_MSCryptImpl::getExtensions() {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr && m_pCertContext->pCertInfo->cExtension != 0 ) {
         CertificateExtension_XmlSecImpl* xExtn ;
         Sequence< Reference< XCertificateExtension > > xExtns( m_pCertContext->pCertInfo->cExtension ) ;
@@ -396,7 +396,7 @@ css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension >
     }
 }
 
-css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_MSCryptImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& /*oid*/ ) throw (css::uno::RuntimeException) {
+css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_MSCryptImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& /*oid*/ ) {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr && m_pCertContext->pCertInfo->cExtension != 0 ) {
         CertificateExtension_XmlSecImpl* xExtn ;
 
@@ -421,7 +421,7 @@ css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certifi
 }
 
 
-css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getEncoded() throw ( css::uno::RuntimeException) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getEncoded() {
     if( m_pCertContext != nullptr && m_pCertContext->cbCertEncoded > 0 ) {
         Sequence< sal_Int8 > rawCert( m_pCertContext->cbCertEncoded ) ;
 
@@ -454,7 +454,7 @@ const CERT_CONTEXT* X509Certificate_MSCryptImpl::getMswcryCert() const {
     }
 }
 
-void X509Certificate_MSCryptImpl::setRawCert( Sequence< sal_Int8 > const & rawCert ) throw ( css::uno::RuntimeException) {
+void X509Certificate_MSCryptImpl::setRawCert( Sequence< sal_Int8 > const & rawCert ) {
     if( m_pCertContext != nullptr ) {
         CertFreeCertificateContext( m_pCertContext ) ;
         m_pCertContext = nullptr ;
@@ -466,7 +466,7 @@ void X509Certificate_MSCryptImpl::setRawCert( Sequence< sal_Int8 > const & rawCe
 }
 
 /* XUnoTunnel */
-sal_Int64 SAL_CALL X509Certificate_MSCryptImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw( RuntimeException ) {
+sal_Int64 SAL_CALL X509Certificate_MSCryptImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) {
     if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
         return reinterpret_cast<sal_Int64>(this);
     }
@@ -535,7 +535,6 @@ css::uno::Sequence< sal_Int8 > getThumbprint(const CERT_CONTEXT* pCertContext, D
 }
 
 OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm()
-    throw ( css::uno::RuntimeException)
 {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr )
     {
@@ -549,7 +548,6 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm()
 }
 
 css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyValue()
-    throw ( css::uno::RuntimeException)
 {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr )
     {
@@ -570,7 +568,6 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectP
 }
 
 OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm()
-    throw ( css::uno::RuntimeException)
 {
     if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr )
     {
@@ -583,25 +580,22 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm()
     }
 }
 
-uno::Sequence<sal_Int8> X509Certificate_MSCryptImpl::getSHA256Thumbprint() throw (uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> X509Certificate_MSCryptImpl::getSHA256Thumbprint()
 {
     return getThumbprint(m_pCertContext, CERT_SHA256_HASH_PROP_ID);
 }
 
 css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSHA1Thumbprint()
-    throw ( css::uno::RuntimeException)
 {
     return getThumbprint(m_pCertContext, CERT_SHA1_HASH_PROP_ID);
 }
 
 css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getMD5Thumbprint()
-    throw ( css::uno::RuntimeException)
 {
     return getThumbprint(m_pCertContext, CERT_MD5_HASH_PROP_ID);
 }
 
 sal_Int32 SAL_CALL X509Certificate_MSCryptImpl::getCertificateUsage(  )
-    throw ( css::uno::RuntimeException)
 {
     sal_Int32 usage =
         CERT_DATA_ENCIPHERMENT_KEY_USAGE |
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index 27be6535f702..f7ba8a21a3fc 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -50,36 +50,31 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper<
         virtual ~X509Certificate_MSCryptImpl() override;
 
         //Methods from XCertificate
-        virtual sal_Int16 SAL_CALL getVersion() throw ( css::uno::RuntimeException) override;
+        virtual sal_Int16 SAL_CALL getVersion() override;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber() throw ( css::uno::RuntimeException) override;
-        virtual OUString SAL_CALL getIssuerName() throw ( css::uno::RuntimeException) override;
-        virtual OUString SAL_CALL getSubjectName() throw ( css::uno::RuntimeException) override;
-        virtual css::util::DateTime SAL_CALL getNotValidBefore() throw ( css::uno::RuntimeException) override;
-        virtual css::util::DateTime SAL_CALL getNotValidAfter() throw ( css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() throw ( css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID() throw ( css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions() throw ( css::uno::RuntimeException) override;
-        virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded() throw ( css::uno::RuntimeException) override;
-        virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm()
-            throw ( css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
-            throw ( css::uno::RuntimeException) override;
-        virtual OUString SAL_CALL getSignatureAlgorithm()
-            throw ( css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
-            throw ( css::uno::RuntimeException) override;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint()
-            throw ( css::uno::RuntimeException) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber() override;
+        virtual OUString SAL_CALL getIssuerName() override;
+        virtual OUString SAL_CALL getSubjectName() override;
+        virtual css::util::DateTime SAL_CALL getNotValidBefore() override;
+        virtual css::util::DateTime SAL_CALL getNotValidAfter() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID() override;
+        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions() override;
+        virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded() override;
+        virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() override;
+        virtual OUString SAL_CALL getSignatureAlgorithm() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint() override;
 
-        virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( css::uno::RuntimeException) override;
+        virtual sal_Int32 SAL_CALL getCertificateUsage( ) override;
 
         //Methods from XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
         /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-        virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() override;
 
         static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
         static X509Certificate_MSCryptImpl* getImplementation( const css::uno::Reference< css::uno::XInterface >& rObj ) ;
@@ -88,7 +83,7 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper<
         void setMswcryCert( const CERT_CONTEXT* cert ) ;
         const CERT_CONTEXT* getMswcryCert() const ;
         /// @throws css::uno::RuntimeException
-        void setRawCert( css::uno::Sequence< sal_Int8 > const & rawCert ) throw ( css::uno::RuntimeException) ;
+        void setRawCert( css::uno::Sequence< sal_Int8 > const & rawCert ) ;
 } ;
 
 #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_X509CERTIFICATE_MSCRYPTIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 7d5fd3ef32b3..6e520d6503af 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -58,8 +58,7 @@ Reference< XXMLEncryptionTemplate >
 SAL_CALL XMLEncryption_MSCryptImpl::encrypt(
     const Reference< XXMLEncryptionTemplate >& aTemplate ,
     const Reference< XSecurityEnvironment >& aEnvironment
-) throw( css::xml::crypto::XMLEncryptionException,
-         css::uno::SecurityException )
+)
 {
     xmlSecKeysMngrPtr pMngr = nullptr ;
     xmlSecEncCtxPtr pEncCtx = nullptr ;
@@ -194,8 +193,7 @@ Reference< XXMLEncryptionTemplate > SAL_CALL
 XMLEncryption_MSCryptImpl::decrypt(
     const Reference< XXMLEncryptionTemplate >& aTemplate ,
     const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( css::xml::crypto::XMLEncryptionException ,
-         css::uno::SecurityException) {
+) {
     xmlSecKeysMngrPtr pMngr = nullptr ;
     xmlSecEncCtxPtr pEncCtx = nullptr ;
     xmlNodePtr pEncryptedData = nullptr ;
@@ -320,12 +318,12 @@ XMLEncryption_MSCryptImpl::decrypt(
 }
 
 /* XServiceInfo */
-OUString SAL_CALL XMLEncryption_MSCryptImpl::getImplementationName() throw( RuntimeException ) {
+OUString SAL_CALL XMLEncryption_MSCryptImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL XMLEncryption_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) {
+sal_Bool SAL_CALL XMLEncryption_MSCryptImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -336,7 +334,7 @@ sal_Bool SAL_CALL XMLEncryption_MSCryptImpl::supportsService( const OUString& se
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) {
+Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -347,12 +345,12 @@ Sequence< OUString > XMLEncryption_MSCryptImpl::impl_getSupportedServiceNames()
     return seqServiceNames ;
 }
 
-OUString XMLEncryption_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLEncryption_MSCryptImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL XMLEncryption_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLEncryption_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) {
     return Reference< XInterface >( *new XMLEncryption_MSCryptImpl( aServiceManager ) ) ;
 }
 
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
index 5d773a29573a..c445cea1bdc8 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
@@ -50,32 +50,31 @@ class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper<
             const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
             const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment)
             // ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
-            throw ( css::xml::crypto::XMLEncryptionException ,
-                    css::uno::SecurityException) override;
+             override;
 
         virtual css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt(
             const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
             const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext
-        ) throw( css::xml::crypto::XMLEncryptionException ,
-                    css::uno::SecurityException) override;
+        ) override;
 
         //Methods from XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         virtual sal_Bool SAL_CALL supportsService(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException ) override;
+        ) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
+        /// @throws css::uno::RuntimeException
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index e1de76a5473d..df5fb696db25 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -65,7 +65,6 @@ XMLSecurityContext_MSCryptImpl::~XMLSecurityContext_MSCryptImpl() {
 
 sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::addSecurityEnvironment(
     const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment)
-    throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException)
 {
     if( !aSecurityEnvironment.is() )
     {
@@ -79,14 +78,12 @@ sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::addSecurityEnvironment(
 
 
 sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentNumber(  )
-    throw (css::uno::RuntimeException)
 {
     return 1;
 }
 
 css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
     XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentByIndex( sal_Int32 index )
-    throw (css::uno::RuntimeException)
 {
     if (index == 0)
     {
@@ -98,30 +95,27 @@ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
 
 css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
     XMLSecurityContext_MSCryptImpl::getSecurityEnvironment(  )
-    throw (css::uno::RuntimeException)
 {
     return m_xSecurityEnvironment;
 }
 
 sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::getDefaultSecurityEnvironmentIndex(  )
-    throw (css::uno::RuntimeException)
 {
     return 0;
 }
 
 void SAL_CALL XMLSecurityContext_MSCryptImpl::setDefaultSecurityEnvironmentIndex( sal_Int32 /*nDefaultEnvIndex*/ )
-    throw (css::uno::RuntimeException)
 {
     //dummy
 }
 
 /* XServiceInfo */
-OUString SAL_CALL XMLSecurityContext_MSCryptImpl::getImplementationName() throw( RuntimeException ) {
+OUString SAL_CALL XMLSecurityContext_MSCryptImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL XMLSecurityContext_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) {
+sal_Bool SAL_CALL XMLSecurityContext_MSCryptImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -132,7 +126,7 @@ sal_Bool SAL_CALL XMLSecurityContext_MSCryptImpl::supportsService( const OUStrin
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) {
+Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -143,12 +137,12 @@ Sequence< OUString > XMLSecurityContext_MSCryptImpl::impl_getSupportedServiceNam
     return seqServiceNames ;
 }
 
-OUString XMLSecurityContext_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLSecurityContext_MSCryptImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL XMLSecurityContext_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLSecurityContext_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) {
     return Reference< XInterface >( *new XMLSecurityContext_MSCryptImpl ) ;
 }
 
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
index 4ed4153bca54..3f9bc3c40ba7 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
@@ -50,45 +50,41 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper<
         //Methods from XXMLSecurityContext
         virtual sal_Int32 SAL_CALL addSecurityEnvironment(
             const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment
-            ) throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException) override;
+            ) override;
 
-        virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber(  )
-            throw (css::uno::RuntimeException) override;
+        virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber(  ) override;
 
         virtual css::uno::Reference<
             css::xml::crypto::XSecurityEnvironment > SAL_CALL
-            getSecurityEnvironmentByIndex( ::sal_Int32 index )
-            throw (css::uno::RuntimeException) override;
+            getSecurityEnvironmentByIndex( ::sal_Int32 index ) override;
 
         virtual css::uno::Reference<
             css::xml::crypto::XSecurityEnvironment > SAL_CALL
-            getSecurityEnvironment(  )
-            throw (css::uno::RuntimeException) override;
+            getSecurityEnvironment(  ) override;
 
-        virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex(  )
-            throw (css::uno::RuntimeException) override;
+        virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex(  ) override;
 
-        virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex )
-            throw (css::uno::RuntimeException) override;
+        virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) override;
 
 
         //Methods from XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         virtual sal_Bool SAL_CALL supportsService(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException ) override;
+        ) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
+        /// @throws css::uno::RuntimeException
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index ac5ffda6f87b..7b6ee686a05c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -55,8 +55,7 @@ Reference< XXMLSignatureTemplate >
 SAL_CALL XMLSignature_MSCryptImpl::generate(
     const Reference< XXMLSignatureTemplate >& aTemplate ,
     const Reference< XSecurityEnvironment >& aEnvironment
-) throw( css::xml::crypto::XMLSignatureException,
-         css::uno::SecurityException )
+)
 {
     xmlSecKeysMngrPtr pMngr = nullptr ;
     xmlSecDSigCtxPtr pDsigCtx = nullptr ;
@@ -151,9 +150,7 @@ Reference< XXMLSignatureTemplate >
 SAL_CALL XMLSignature_MSCryptImpl::validate(
     const Reference< XXMLSignatureTemplate >& aTemplate ,
     const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( css::uno::RuntimeException,
-         css::uno::SecurityException,
-         css::xml::crypto::XMLSignatureException ) {
+) {
     xmlSecKeysMngrPtr pMngr = nullptr ;
     xmlSecDSigCtxPtr pDsigCtx = nullptr ;
     xmlNodePtr pNode = nullptr ;
@@ -265,12 +262,12 @@ SAL_CALL XMLSignature_MSCryptImpl::validate(
 }
 
 /* XServiceInfo */
-OUString SAL_CALL XMLSignature_MSCryptImpl::getImplementationName() throw( RuntimeException ) {
+OUString SAL_CALL XMLSignature_MSCryptImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL XMLSignature_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) {
+sal_Bool SAL_CALL XMLSignature_MSCryptImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -281,7 +278,7 @@ sal_Bool SAL_CALL XMLSignature_MSCryptImpl::supportsService( const OUString& ser
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) {
+Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -292,12 +289,12 @@ Sequence< OUString > XMLSignature_MSCryptImpl::impl_getSupportedServiceNames() {
     return seqServiceNames ;
 }
 
-OUString XMLSignature_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLSignature_MSCryptImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL XMLSignature_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLSignature_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) {
     return Reference< XInterface >( *new XMLSignature_MSCryptImpl( aServiceManager ) ) ;
 }
 
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
index 32def55df640..a5cb5c6398a7 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
@@ -49,33 +49,31 @@ class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper<
         virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate(
             const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
             const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment
-        ) throw( css::xml::crypto::XMLSignatureException,
-                 css::uno::SecurityException) override;
+        ) override;
 
         virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate(
             const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
             const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext
-        ) throw( css::uno::RuntimeException,
-                 css::uno::SecurityException,
-                 css::xml::crypto::XMLSignatureException) override;
+        ) override;
 
         //Methods from XServiceInfo
-        virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override;
+        virtual OUString SAL_CALL getImplementationName() override;
 
         virtual sal_Bool SAL_CALL supportsService(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException ) override;
+        ) override;
 
-        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
+        /// @throws css::uno::RuntimeException
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
index 6d9d40ade222..c1532d77bea3 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
@@ -91,7 +91,6 @@ void OCipherContext::Dispose()
 }
 
 uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::convertWithCipherContext( const uno::Sequence< ::sal_Int8 >& aData )
-    throw ( lang::IllegalArgumentException, lang::DisposedException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -172,7 +171,6 @@ uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::convertWithCipherContext( c
 }
 
 uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::finalizeCipherContextAndDispose()
-    throw (lang::DisposedException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
index 9d8d54535caf..a7a4e6dad54e 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
@@ -73,8 +73,8 @@ public:
     static css::uno::Reference< css::xml::crypto::XCipherContext > Create( CK_MECHANISM_TYPE nNSSCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, bool bEncryption, bool bW3CPadding );
 
     // XCipherContext
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::IllegalArgumentException, css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose(  ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose(  ) override;
 };
 
 #endif
diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.cxx b/xmlsecurity/source/xmlsec/nss/digestcontext.cxx
index 86f8c77b6f63..538452e641c2 100644
--- a/xmlsecurity/source/xmlsec/nss/digestcontext.cxx
+++ b/xmlsecurity/source/xmlsec/nss/digestcontext.cxx
@@ -33,7 +33,6 @@ ODigestContext::~ODigestContext()
 }
 
 void SAL_CALL ODigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& aData )
-    throw (lang::DisposedException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -62,7 +61,6 @@ void SAL_CALL ODigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& a
 }
 
 uno::Sequence< ::sal_Int8 > SAL_CALL ODigestContext::finalizeDigestAndDispose()
-    throw (lang::DisposedException, uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
index 59074b282d08..7e20cd8d99d0 100644
--- a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
@@ -52,8 +52,8 @@ public:
 
 
     // XDigestContext
-    virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) override;
+    virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() override;
 };
 
 #endif
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 136c8d6b79d6..c25bc9fe973b 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -393,7 +393,6 @@ bool ONSSInitializer::initNSS( const css::uno::Reference< css::uno::XComponentCo
 }
 
 css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL ONSSInitializer::getDigestContext( ::sal_Int32 nDigestID, const css::uno::Sequence< css::beans::NamedValue >& aParams )
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     SECOidTag nNSSDigestID = SEC_OID_UNKNOWN;
     sal_Int32 nDigestLength = 0;
@@ -430,7 +429,6 @@ css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL ONSSInitializer
 }
 
 css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL ONSSInitializer::getCipherContext( ::sal_Int32 nCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const css::uno::Sequence< css::beans::NamedValue >& aParams )
-    throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
 {
     CK_MECHANISM_TYPE nNSSCipherID = 0;
     bool bW3CPadding = false;
@@ -461,40 +459,34 @@ css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL ONSSInitializer
 }
 
 OUString ONSSInitializer_getImplementationName ()
-    throw (cssu::RuntimeException)
 {
 
     return OUString ( IMPLEMENTATION_NAME );
 }
 
 cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames(  )
-    throw (cssu::RuntimeException)
 {
     cssu::Sequence<OUString> aRet { NSS_SERVICE_NAME };
     return aRet;
 }
 
 cssu::Reference< cssu::XInterface > SAL_CALL ONSSInitializer_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr)
-    throw( cssu::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new ONSSInitializer( comphelper::getComponentContext(rSMgr) ));
 }
 
 /* XServiceInfo */
 OUString SAL_CALL ONSSInitializer::getImplementationName()
-    throw (cssu::RuntimeException, std::exception)
 {
     return ONSSInitializer_getImplementationName();
 }
 
 sal_Bool SAL_CALL ONSSInitializer::supportsService( const OUString& rServiceName )
-    throw (cssu::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 cssu::Sequence< OUString > SAL_CALL ONSSInitializer::getSupportedServiceNames(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return ONSSInitializer_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
index d7fd1737bf3d..9e07b6eda444 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
@@ -47,34 +47,28 @@ public:
     static bool initNSS( const css::uno::Reference< css::uno::XComponentContext > &rxContext );
 
     /* XDigestContextSupplier */
-    virtual css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const css::uno::Sequence< css::beans::NamedValue >& aParams ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const css::uno::Sequence< css::beans::NamedValue >& aParams ) override;
 
     /* XCipherContextSupplier */
-    virtual css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const css::uno::Sequence< css::beans::NamedValue >& aParams ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const css::uno::Sequence< css::beans::NamedValue >& aParams ) override;
 
     /* 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( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 };
 
 /// @throws css::uno::RuntimeException
-OUString ONSSInitializer_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString ONSSInitializer_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames()
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames();
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
-SAL_CALL ONSSInitializer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
-    throw ( css::uno::Exception );
+SAL_CALL ONSSInitializer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
 
 #endif
 
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index fc0e05e3ff1e..a1d4200214e5 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -58,7 +58,7 @@ namespace {
 }
 
 //Methods from XSanExtension
-css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames()
 {
     if (m_Entries.empty())
     {
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
index df81eee47408..3e2d85b739e4 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
@@ -43,17 +43,17 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper<
 
     public:
         //Methods from XCertificateExtension
-        virtual sal_Bool SAL_CALL isCritical() throw( css::uno::RuntimeException, std::exception ) override
+        virtual sal_Bool SAL_CALL isCritical() override
         {
             return m_Extn.m_critical;
         }
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( css::uno::RuntimeException, std::exception ) override
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() override
         {
             return m_Extn.m_xExtnId;
         }
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( css::uno::RuntimeException, std::exception ) override
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() override
         {
             return m_Extn.m_xExtnValue;
         }
@@ -65,7 +65,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper<
 
         //Methods from XSanExtension
 
-        virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( css::uno::RuntimeException, std::exception ) override ;
+        virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() override ;
 } ;
 
 #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SANEXTENSION_NSSIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index f5eb1d2ebfb5..769d183b17fe 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -142,12 +142,12 @@ SecurityEnvironment_NssImpl::~SecurityEnvironment_NssImpl() {
 }
 
 /* XServiceInfo */
-OUString SAL_CALL SecurityEnvironment_NssImpl::getImplementationName() throw( RuntimeException, std::exception ) {
+OUString SAL_CALL SecurityEnvironment_NssImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL SecurityEnvironment_NssImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
+sal_Bool SAL_CALL SecurityEnvironment_NssImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -158,7 +158,7 @@ sal_Bool SAL_CALL SecurityEnvironment_NssImpl::supportsService( const OUString&
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) {
+Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -169,12 +169,12 @@ Sequence< OUString > SecurityEnvironment_NssImpl::impl_getSupportedServiceNames(
     return seqServiceNames ;
 }
 
-OUString SecurityEnvironment_NssImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString SecurityEnvironment_NssImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL SecurityEnvironment_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL SecurityEnvironment_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) {
     return Reference< XInterface >( *new SecurityEnvironment_NssImpl ) ;
 }
 
@@ -184,7 +184,6 @@ Reference< XSingleServiceFactory > SecurityEnvironment_NssImpl::impl_createFacto
 
 /* XUnoTunnel */
 sal_Int64 SAL_CALL SecurityEnvironment_NssImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier )
-    throw( RuntimeException, std::exception )
 {
     if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this));
@@ -203,7 +202,7 @@ const Sequence< sal_Int8>& SecurityEnvironment_NssImpl::getUnoTunnelId() {
     return theSecurityEnvironment_NssImplUnoTunnelId::get().getSeq();
 }
 
-OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( css::uno::RuntimeException, std::exception )
+OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation()
 {
     OUStringBuffer buff;
     for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); is++)
@@ -214,18 +213,18 @@ OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw(
     return buff.makeStringAndClear();
 }
 
-void SecurityEnvironment_NssImpl::addCryptoSlot( PK11SlotInfo* aSlot) throw( Exception , RuntimeException )
+void SecurityEnvironment_NssImpl::addCryptoSlot( PK11SlotInfo* aSlot)
 {
     PK11_ReferenceSlot(aSlot);
     m_Slots.push_back(aSlot);
 }
 
 //Could we have multiple cert dbs?
-void SecurityEnvironment_NssImpl::setCertDb( CERTCertDBHandle* aCertDb ) throw( Exception , RuntimeException ) {
+void SecurityEnvironment_NssImpl::setCertDb( CERTCertDBHandle* aCertDb ) {
     m_pHandler = aCertDb ;
 }
 
-void SecurityEnvironment_NssImpl::adoptSymKey( PK11SymKey* aSymKey ) throw( Exception , RuntimeException ) {
+void SecurityEnvironment_NssImpl::adoptSymKey( PK11SymKey* aSymKey ) {
     std::list< PK11SymKey* >::iterator keyIt ;
 
     if( aSymKey != nullptr ) {
@@ -248,7 +247,7 @@ void SecurityEnvironment_NssImpl::adoptSymKey( PK11SymKey* aSymKey ) throw( Exce
     }
 }
 
-PK11SymKey* SecurityEnvironment_NssImpl::getSymKey( unsigned int position ) throw( Exception , RuntimeException ) {
+PK11SymKey* SecurityEnvironment_NssImpl::getSymKey( unsigned int position ) {
     PK11SymKey* symkey ;
     std::list< PK11SymKey* >::iterator keyIt ;
     unsigned int pos ;
@@ -262,7 +261,7 @@ PK11SymKey* SecurityEnvironment_NssImpl::getSymKey( unsigned int position ) thro
     return symkey ;
 }
 
-SECKEYPublicKey* SecurityEnvironment_NssImpl::getPubKey( unsigned int position ) throw( Exception , RuntimeException ) {
+SECKEYPublicKey* SecurityEnvironment_NssImpl::getPubKey( unsigned int position ) {
     SECKEYPublicKey* pubkey ;
     std::list< SECKEYPublicKey* >::iterator keyIt ;
     unsigned int pos ;
@@ -276,7 +275,7 @@ SECKEYPublicKey* SecurityEnvironment_NssImpl::getPubKey( unsigned int position )
     return pubkey ;
 }
 
-SECKEYPrivateKey* SecurityEnvironment_NssImpl::getPriKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException )  {
+SECKEYPrivateKey* SecurityEnvironment_NssImpl::getPriKey( unsigned int position )  {
     SECKEYPrivateKey* prikey ;
     std::list< SECKEYPrivateKey* >::iterator keyIt ;
     unsigned int pos ;
@@ -346,7 +345,7 @@ void SecurityEnvironment_NssImpl::updateSlots()
 }
 
 Sequence< Reference < XCertificate > >
-SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException , RuntimeException, std::exception )
+SecurityEnvironment_NssImpl::getPersonalCertificates()
 {
     sal_Int32 length ;
     X509Certificate_NssImpl* xcert ;
@@ -413,7 +412,7 @@ SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException
     return Sequence< Reference < XCertificate > > ();
 }
 
-Reference< XCertificate > SecurityEnvironment_NssImpl::getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException, std::exception )
+Reference< XCertificate > SecurityEnvironment_NssImpl::getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber )
 {
     X509Certificate_NssImpl* xcert = nullptr;
 
@@ -474,7 +473,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl::getCertificate( const OUS
     return xcert ;
 }
 
-Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl::buildCertificatePath( const Reference< XCertificate >& begin ) throw( SecurityException , RuntimeException, std::exception ) {
+Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl::buildCertificatePath( const Reference< XCertificate >& begin ) {
     const X509Certificate_NssImpl* xcert ;
     const CERTCertificate* cert ;
     CERTCertList* certChain ;
@@ -530,7 +529,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl::buildCertifi
     return Sequence< Reference < XCertificate > >();
 }
 
-Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) throw( SecurityException , RuntimeException, std::exception ) {
+Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) {
     X509Certificate_NssImpl* xcert ;
 
     if( rawCertificate.getLength() > 0 ) {
@@ -546,7 +545,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromRaw(
     return xcert ;
 }
 
-Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromAscii( const OUString& asciiCertificate ) throw( SecurityException , RuntimeException, std::exception )
+Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromAscii( const OUString& asciiCertificate )
 {
     OString oscert = OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ;
     xmlChar* chCert = xmlStrndup( reinterpret_cast<const xmlChar*>(oscert.getStr()), ( int )oscert.getLength() ) ;
@@ -570,7 +569,6 @@ Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromAsci
 sal_Int32 SecurityEnvironment_NssImpl ::
 verifyCertificate( const Reference< csss::XCertificate >& aCert,
                    const Sequence< Reference< csss::XCertificate > >&  intermediateCerts )
-    throw( css::uno::SecurityException, css::uno::RuntimeException, std::exception )
 {
     sal_Int32 validity = csss::CertificateValidity::INVALID;
     const X509Certificate_NssImpl* xcert ;
@@ -795,7 +793,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
 }
 
 sal_Int32 SecurityEnvironment_NssImpl::getCertificateCharacters(
-    const css::uno::Reference< css::security::XCertificate >& aCert ) throw( css::uno::SecurityException, css::uno::RuntimeException, std::exception ) {
+    const css::uno::Reference< css::security::XCertificate >& aCert ) {
     sal_Int32 characters ;
     const X509Certificate_NssImpl* xcert ;
     const CERTCertificate* cert ;
@@ -896,7 +894,7 @@ X509Certificate_NssImpl* NssPrivKeyToXCert( SECKEYPrivateKey* priKey )
 
 
 /* Native methods */
-xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() throw( Exception, RuntimeException ) {
+xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() {
 
     unsigned int i ;
     CERTCertDBHandle* handler = nullptr ;
@@ -950,7 +948,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() throw( Except
     }
     return pKeysMngr ;
 }
-void SecurityEnvironment_NssImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( Exception, RuntimeException ) {
+void SecurityEnvironment_NssImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) {
     if( pKeysMngr != nullptr ) {
         xmlSecKeysMngrDestroy( pKeysMngr ) ;
     }
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 117d599c34e4..5b0e8920abd2 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -69,23 +69,23 @@ private:
         //Methods from XSecurityEnvironment
 
         //Methods from 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(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException, std::exception ) override ;
+        ) 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 ;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
         /// @throws css::uno::RuntimeException
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
@@ -94,61 +94,59 @@ private:
             css::security::XCertificate >& xCert,
             const css::uno::Sequence<
             css::uno::Reference< css::security::XCertificate > > &
-            intermediateCerts)
-            throw (css::uno::SecurityException, css::uno::RuntimeException, std::exception) override ;
+            intermediateCerts) override ;
 
-        virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& xCert ) throw (css::uno::SecurityException, css::uno::RuntimeException, std::exception) override ;
+        virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& xCert ) override ;
 
-        virtual OUString SAL_CALL getSecurityEnvironmentInformation(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getSecurityEnvironmentInformation(  ) override;
 
         //Methods from XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
         static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        void setCertDb( CERTCertDBHandle* aCertDb ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        void setCertDb( CERTCertDBHandle* aCertDb ) ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        void adoptSymKey( PK11SymKey* aSymKey ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        void adoptSymKey( PK11SymKey* aSymKey ) ;
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        PK11SymKey* getSymKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        PK11SymKey* getSymKey( unsigned int position ) ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        SECKEYPublicKey* getPubKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        SECKEYPublicKey* getPubKey( unsigned int position ) ;
 
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        SECKEYPrivateKey* getPriKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        SECKEYPrivateKey* getPriKey( unsigned int position ) ;
 
-        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates() throw(  css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
+        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates() override ;
 
-        virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const css::uno::Sequence< sal_Int8 >& serialNumber ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
+        virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const css::uno::Sequence< sal_Int8 >& serialNumber ) override ;
 
-        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL buildCertificatePath( const css::uno::Reference< css::security::XCertificate >& beginCert ) throw(  css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
+        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL buildCertificatePath( const css::uno::Reference< css::security::XCertificate >& beginCert ) override ;
 
-        virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromRaw( const css::uno::Sequence< sal_Int8 >& rawCertificate ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
-        virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ;
+        virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromRaw( const css::uno::Sequence< sal_Int8 >& rawCertificate ) override ;
+        virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) override ;
 
 
         //Native methods
         /// @throws css::uno::RuntimeException
-        xmlSecKeysMngrPtr createKeysManager() throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        xmlSecKeysMngrPtr createKeysManager() ;
         /// @throws css::uno::Exception
         /// @throws css::uno::RuntimeException
-        static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+        static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) ;
 
 private:
         void updateSlots();
 
           /// @throws css::uno::Exception
           /// @throws css::uno::RuntimeException
-          void addCryptoSlot( PK11SlotInfo* aSlot ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
+          void addCryptoSlot( PK11SlotInfo* aSlot ) ;
 } ;
 
 #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SECURITYENVIRONMENT_NSSIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 012106c41c05..a45f34ee9714 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -64,7 +64,6 @@ SEInitializer_NssImpl::~SEInitializer_NssImpl()
 /* XSEInitializer */
 uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL
     SEInitializer_NssImpl::createSecurityContext( const OUString& )
-    throw (uno::RuntimeException, std::exception)
 {
     CERTCertDBHandle    *pCertHandle = nullptr ;
 
@@ -99,7 +98,6 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL
 }
 
 void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference< cssxc::XXMLSecurityContext >& )
-    throw (uno::RuntimeException, std::exception)
 {
     /*
      * because the security context will free all its content when it
@@ -111,13 +109,11 @@ void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference<
 }
 
 OUString SEInitializer_NssImpl_getImplementationName ()
-    throw (uno::RuntimeException)
 {
     return OUString ("com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl" );
 }
 
 uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  )
-    throw (uno::RuntimeException)
 {
     uno::Sequence < OUString > aRet(2);
     OUString* pArray = aRet.getArray();
@@ -127,24 +123,20 @@ uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceName
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SEInitializer_NssImpl_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rxMSF)
-    throw( uno::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new SEInitializer_NssImpl(comphelper::getComponentContext(rxMSF)));
 }
 
 /* XServiceInfo */
 OUString SAL_CALL SEInitializer_NssImpl::getImplementationName(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return SEInitializer_NssImpl_getImplementationName();
 }
 sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( const OUString& rServiceName )
-    throw (uno::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl::getSupportedServiceNames(  )
-    throw (uno::RuntimeException, std::exception)
 {
     return SEInitializer_NssImpl_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index 6b051315cb93..29335e780bb4 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -41,36 +41,28 @@ public:
 
     /* XSEInitializer */
     virtual css::uno::Reference< css::xml::crypto::XXMLSecurityContext >
-        SAL_CALL createSecurityContext( const OUString& )
-        throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL createSecurityContext( const OUString& ) override;
 
     virtual void SAL_CALL freeSecurityContext( const css::uno::Reference<
-        css::xml::crypto::XXMLSecurityContext >& securityContext )
-        throw (css::uno::RuntimeException, std::exception) override;
+        css::xml::crypto::XXMLSecurityContext >& securityContext ) override;
 
     /* 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( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& 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;
 };
 
 /// @throws css::uno::RuntimeException
-OUString SEInitializer_NssImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString SEInitializer_NssImpl_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
-SAL_CALL SEInitializer_NssImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxMSF)
-    throw ( css::uno::Exception );
+SAL_CALL SEInitializer_NssImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxMSF);
 
 #endif
 
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index be930a222b3e..00582e4cf307 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -55,7 +55,7 @@ X509Certificate_NssImpl::~X509Certificate_NssImpl() {
 }
 
 //Methods from XCertificate
-sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() throw ( css::uno::RuntimeException, std::exception) {
+sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() {
     if( m_pCert != nullptr ) {
         if( m_pCert->version.len > 0 ) {
             return ( char )*( m_pCert->version.data ) ;
@@ -66,7 +66,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() throw ( css::uno::Runti
     }
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSerialNumber() throw ( css::uno::RuntimeException, std::exception) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSerialNumber() {
     if( m_pCert != nullptr && m_pCert->serialNumber.len > 0 ) {
         Sequence< sal_Int8 > serial( m_pCert->serialNumber.len ) ;
         for( unsigned int i = 0 ; i < m_pCert->serialNumber.len ; i ++ )
@@ -78,7 +78,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSerialNumber
     }
 }
 
-OUString SAL_CALL X509Certificate_NssImpl::getIssuerName() throw ( css::uno::RuntimeException, std::exception) {
+OUString SAL_CALL X509Certificate_NssImpl::getIssuerName() {
     if( m_pCert != nullptr ) {
         return OUString(m_pCert->issuerName , PL_strlen(m_pCert->issuerName) , RTL_TEXTENCODING_UTF8) ;
     } else {
@@ -86,7 +86,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getIssuerName() throw ( css::uno::Run
     }
 }
 
-OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( css::uno::RuntimeException, std::exception) {
+OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() {
     if( m_pCert != nullptr ) {
         return OUString(m_pCert->subjectName , PL_strlen(m_pCert->subjectName) , RTL_TEXTENCODING_UTF8);
     } else {
@@ -94,7 +94,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( css::uno::Ru
     }
 }
 
-css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidBefore() throw ( css::uno::RuntimeException, std::exception) {
+css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidBefore() {
     if( m_pCert != nullptr ) {
         SECStatus rv ;
         PRTime notBefore ;
@@ -123,7 +123,7 @@ css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidBefore() throw
     }
 }
 
-css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidAfter() throw ( css::uno::RuntimeException, std::exception) {
+css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidAfter() {
     if( m_pCert != nullptr ) {
         SECStatus rv ;
         PRTime notAfter ;
@@ -152,7 +152,7 @@ css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidAfter() throw (
     }
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getIssuerUniqueID() throw ( css::uno::RuntimeException, std::exception) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getIssuerUniqueID() {
     if( m_pCert != nullptr && m_pCert->issuerID.len > 0 ) {
         Sequence< sal_Int8 > issuerUid( m_pCert->issuerID.len ) ;
         for( unsigned int i = 0 ; i < m_pCert->issuerID.len ; i ++ )
@@ -164,7 +164,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getIssuerUnique
     }
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectUniqueID() throw ( css::uno::RuntimeException, std::exception) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectUniqueID() {
     if( m_pCert != nullptr && m_pCert->subjectID.len > 0 ) {
         Sequence< sal_Int8 > subjectUid( m_pCert->subjectID.len ) ;
         for( unsigned int i = 0 ; i < m_pCert->subjectID.len ; i ++ )
@@ -176,7 +176,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectUniqu
     }
 }
 
-css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_NssImpl::getExtensions() throw ( css::uno::RuntimeException, std::exception) {
+css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_NssImpl::getExtensions() {
     if( m_pCert != nullptr && m_pCert->extensions != nullptr ) {
         CERTCertExtension** extns ;
         int len ;
@@ -227,7 +227,7 @@ css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension >
     }
 }
 
-css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_NssImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException, std::exception) {
+css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_NssImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) {
     if( m_pCert != nullptr && m_pCert->extensions != nullptr ) {
         CERTCertExtension** extns ;
         SECItem idItem ;
@@ -277,7 +277,7 @@ css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certifi
 }
 
 
-css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getEncoded() throw ( css::uno::RuntimeException, std::exception) {
+css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getEncoded() {
     if( m_pCert != nullptr && m_pCert->derCert.len > 0 ) {
         Sequence< sal_Int8 > rawCert( m_pCert->derCert.len ) ;
 
@@ -310,7 +310,7 @@ const CERTCertificate* X509Certificate_NssImpl::getNssCert() const {
     }
 }
 
-void X509Certificate_NssImpl::setRawCert( const Sequence< sal_Int8 >& rawCert ) throw ( css::uno::RuntimeException) {
+void X509Certificate_NssImpl::setRawCert( const Sequence< sal_Int8 >& rawCert ) {
     CERTCertificate* cert ;
     SECItem certItem ;
 
@@ -330,7 +330,7 @@ void X509Certificate_NssImpl::setRawCert( const Sequence< sal_Int8 >& rawCert )
 }
 
 /* XUnoTunnel */
-sal_Int64 SAL_CALL X509Certificate_NssImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw( RuntimeException, std::exception ) {
+sal_Int64 SAL_CALL X509Certificate_NssImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) {
     if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
         return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this));
     }
@@ -395,7 +395,6 @@ css::uno::Sequence< sal_Int8 > getThumbprint(CERTCertificate *pCert, SECOidTag i
 }
 
 OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm()
-    throw ( css::uno::RuntimeException, std::exception)
 {
     if( m_pCert != nullptr )
     {
@@ -408,7 +407,6 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm()
 }
 
 css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyValue()
-    throw ( css::uno::RuntimeException, std::exception)
 {
     if( m_pCert != nullptr )
     {
@@ -431,7 +429,6 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectPubli
 }
 
 OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm()
-    throw ( css::uno::RuntimeException, std::exception)
 {
     if( m_pCert != nullptr )
     {
@@ -444,24 +441,21 @@ OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm()
 }
 
 css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSHA1Thumbprint()
-    throw ( css::uno::RuntimeException, std::exception)
 {
     return getThumbprint(m_pCert, SEC_OID_SHA1);
 }
 
-uno::Sequence<sal_Int8> X509Certificate_NssImpl::getSHA256Thumbprint() throw (uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> X509Certificate_NssImpl::getSHA256Thumbprint()
 {
     return getThumbprint(m_pCert, SEC_OID_SHA256);
 }
 
 css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getMD5Thumbprint()
-    throw ( css::uno::RuntimeException, std::exception)
 {
     return getThumbprint(m_pCert, SEC_OID_MD5);
 }
 
 sal_Int32 SAL_CALL X509Certificate_NssImpl::getCertificateUsage(  )
-    throw ( css::uno::RuntimeException, std::exception)
 {
     SECStatus rv;
     SECItem tmpitem;
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
index 8c9e6ab502c8..08e9cf1185e7 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
@@ -44,47 +44,42 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper<
         virtual ~X509Certificate_NssImpl() override ;
 
         //Methods from XCertificate
-        virtual sal_Int16 SAL_CALL getVersion(  ) throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual sal_Int16 SAL_CALL getVersion(  ) override ;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber(  ) throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber(  ) override ;
 
-        virtual OUString SAL_CALL getIssuerName(  ) throw ( css::uno::RuntimeException, std::exception) override ;
-        virtual OUString SAL_CALL getSubjectName(  ) throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual OUString SAL_CALL getIssuerName(  ) override ;
+        virtual OUString SAL_CALL getSubjectName(  ) override ;
 
-        virtual css::util::DateTime SAL_CALL getNotValidBefore(  ) throw ( css::uno::RuntimeException, std::exception) override ;
-        virtual css::util::DateTime SAL_CALL getNotValidAfter(  ) throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual css::util::DateTime SAL_CALL getNotValidBefore(  ) override ;
+        virtual css::util::DateTime SAL_CALL getNotValidAfter(  ) override ;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID(  ) throw ( css::uno::RuntimeException, std::exception) override ;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID(  ) throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID(  ) override ;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID(  ) override ;
 
-        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions(  ) throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions(  ) override ;
 
-        virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) override ;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded(  ) throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded(  ) override ;
 
-        virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm()
-            throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() override ;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
-            throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() override ;
 
-        virtual OUString SAL_CALL getSignatureAlgorithm()
-            throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual OUString SAL_CALL getSignatureAlgorithm() override ;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
-            throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() override ;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint()
-            throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint() override ;
 
-        virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( css::uno::RuntimeException, std::exception) override ;
+        virtual sal_Int32 SAL_CALL getCertificateUsage( ) override ;
 
         //Methods from XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
         /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-        virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() override;
 
         static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
 
@@ -92,7 +87,7 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper<
         void setCert( CERTCertificate* cert ) ;
         const CERTCertificate* getNssCert() const ;
         /// @throws css::uno::RuntimeException
-        void setRawCert( const css::uno::Sequence< sal_Int8 >& rawCert ) throw ( css::uno::RuntimeException) ;
+        void setRawCert( const css::uno::Sequence< sal_Int8 >& rawCert ) ;
 } ;
 
 #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_X509CERTIFICATE_NSSIMPL_HXX
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 5f65cc37aaee..ccfb78098bda 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -54,9 +54,7 @@ Reference< XXMLEncryptionTemplate >
 SAL_CALL XMLEncryption_NssImpl::encrypt(
     const Reference< XXMLEncryptionTemplate >& aTemplate ,
     const Reference< XSecurityEnvironment >& aEnvironment
-) throw (css::xml::crypto::XMLEncryptionException,
-         css::uno::SecurityException,
-         css::uno::RuntimeException, std::exception)
+)
 {
     xmlSecKeysMngrPtr pMngr = nullptr ;
     xmlSecEncCtxPtr pEncCtx = nullptr ;
@@ -193,9 +191,7 @@ Reference< XXMLEncryptionTemplate >
 SAL_CALL XMLEncryption_NssImpl::decrypt(
     const Reference< XXMLEncryptionTemplate >& aTemplate ,
     const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw (css::xml::crypto::XMLEncryptionException ,
-         css::uno::SecurityException,
-         css::uno::RuntimeException, std::exception)
+)
 {
     xmlSecKeysMngrPtr pMngr = nullptr ;
     xmlSecEncCtxPtr pEncCtx = nullptr ;
@@ -310,12 +306,12 @@ SAL_CALL XMLEncryption_NssImpl::decrypt(
 }
 
 /* XServiceInfo */
-OUString SAL_CALL XMLEncryption_NssImpl::getImplementationName() throw( RuntimeException, std::exception ) {
+OUString SAL_CALL XMLEncryption_NssImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL XMLEncryption_NssImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
+sal_Bool SAL_CALL XMLEncryption_NssImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -326,7 +322,7 @@ sal_Bool SAL_CALL XMLEncryption_NssImpl::supportsService( const OUString& servic
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLEncryption_NssImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) {
+Sequence< OUString > SAL_CALL XMLEncryption_NssImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -337,12 +333,12 @@ Sequence< OUString > XMLEncryption_NssImpl::impl_getSupportedServiceNames() {
     return seqServiceNames ;
 }
 
-OUString XMLEncryption_NssImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLEncryption_NssImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL XMLEncryption_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >&  ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLEncryption_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >&  ) {
     return Reference< XInterface >( *new XMLEncryption_NssImpl ) ;
 }
 
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index 37d66f6b1dd1..276a4c5c0350 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -47,35 +47,31 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper<
             const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
             const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment)
             // ) throw( css::uno::Exception , css::uno::RuntimeException ) ;
-            throw (css::xml::crypto::XMLEncryptionException ,
-                   css::uno::SecurityException,
-                   css::uno::RuntimeException, std::exception) override;
+             override;
 
         virtual css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt(
             const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
             const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext
-        ) throw (css::xml::crypto::XMLEncryptionException ,
-                 css::uno::SecurityException,
-                 css::uno::RuntimeException, std::exception) override;
+        ) override;
 
         //Methods from 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(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException, std::exception ) override ;
+        ) 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 ;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
         /// @throws css::uno::RuntimeException
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index 8e51babf6a08..6cf908545fa2 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -65,7 +65,6 @@ XMLSecurityContext_NssImpl::~XMLSecurityContext_NssImpl()
 
 sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment(
     const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment)
-    throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException, std::exception)
 {
     if( !aSecurityEnvironment.is() )
     {
@@ -79,14 +78,12 @@ sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment(
 
 
 sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentNumber(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_vSecurityEnvironments.size();
 }
 
 css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
     XMLSecurityContext_NssImpl::getSecurityEnvironmentByIndex( sal_Int32 index )
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::xml::crypto::XSecurityEnvironment > xSecurityEnvironment;
 
@@ -102,7 +99,6 @@ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
 
 css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
     XMLSecurityContext_NssImpl::getSecurityEnvironment(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     if (m_nDefaultEnvIndex >= 0 && m_nDefaultEnvIndex < ( sal_Int32 )m_vSecurityEnvironments.size())
         return getSecurityEnvironmentByIndex(m_nDefaultEnvIndex);
@@ -111,24 +107,22 @@ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL
 }
 
 sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getDefaultSecurityEnvironmentIndex(  )
-    throw (css::uno::RuntimeException, std::exception)
 {
     return m_nDefaultEnvIndex ;
 }
 
 void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex )
-    throw (css::uno::RuntimeException, std::exception)
 {
     m_nDefaultEnvIndex = nDefaultEnvIndex;
 }
 
 /* XServiceInfo */
-OUString SAL_CALL XMLSecurityContext_NssImpl::getImplementationName() throw( RuntimeException, std::exception ) {
+OUString SAL_CALL XMLSecurityContext_NssImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL XMLSecurityContext_NssImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
+sal_Bool SAL_CALL XMLSecurityContext_NssImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -139,7 +133,7 @@ sal_Bool SAL_CALL XMLSecurityContext_NssImpl::supportsService( const OUString& s
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) {
+Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -150,12 +144,12 @@ Sequence< OUString > XMLSecurityContext_NssImpl::impl_getSupportedServiceNames()
     return seqServiceNames ;
 }
 
-OUString XMLSecurityContext_NssImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLSecurityContext_NssImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL XMLSecurityContext_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLSecurityContext_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) {
     return Reference< XInterface >( *new XMLSecurityContext_NssImpl ) ;
 }
 
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index 52db8b1e9517..3d611424a9f3 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -52,45 +52,40 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper<
         //Methods from XXMLSecurityContext
         virtual sal_Int32 SAL_CALL addSecurityEnvironment(
             const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment
-            ) throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException, std::exception) override;
+            ) override;
 
-        virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber(  ) override;
 
         virtual css::uno::Reference<
             css::xml::crypto::XSecurityEnvironment > SAL_CALL
-            getSecurityEnvironmentByIndex( ::sal_Int32 index )
-            throw (css::uno::RuntimeException, std::exception) override;
+            getSecurityEnvironmentByIndex( ::sal_Int32 index ) override;
 
         virtual css::uno::Reference<
             css::xml::crypto::XSecurityEnvironment > SAL_CALL
-            getSecurityEnvironment(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+            getSecurityEnvironment(  ) override;
 
-        virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex(  )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex(  ) override;
 
-        virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex )
-            throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) override;
 
         //Methods from 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(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException, std::exception ) override ;
+        ) 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 ;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
         /// @throws css::uno::RuntimeException
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 1a3fe0c95f47..566d3cc77d35 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -58,9 +58,7 @@ Reference< XXMLSignatureTemplate >
 SAL_CALL XMLSignature_NssImpl::generate(
     const Reference< XXMLSignatureTemplate >& aTemplate ,
     const Reference< XSecurityEnvironment >& aEnvironment
-) throw( css::xml::crypto::XMLSignatureException,
-         css::uno::SecurityException,
-         css::uno::RuntimeException, std::exception )
+)
 {
     xmlSecKeysMngrPtr pMngr = nullptr ;
     xmlSecDSigCtxPtr pDsigCtx = nullptr ;
@@ -163,9 +161,7 @@ Reference< XXMLSignatureTemplate >
 SAL_CALL XMLSignature_NssImpl::validate(
     const Reference< XXMLSignatureTemplate >& aTemplate ,
     const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( css::uno::RuntimeException,
-         css::uno::SecurityException,
-         css::xml::crypto::XMLSignatureException, std::exception ) {
+) {
     xmlSecKeysMngrPtr pMngr = nullptr ;
     xmlSecDSigCtxPtr pDsigCtx = nullptr ;
     xmlNodePtr pNode = nullptr ;
@@ -284,12 +280,12 @@ SAL_CALL XMLSignature_NssImpl::validate(
 }
 
 /* XServiceInfo */
-OUString SAL_CALL XMLSignature_NssImpl::getImplementationName() throw( RuntimeException, std::exception ) {
+OUString SAL_CALL XMLSignature_NssImpl::getImplementationName() {
     return impl_getImplementationName() ;
 }
 
 /* XServiceInfo */
-sal_Bool SAL_CALL XMLSignature_NssImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) {
+sal_Bool SAL_CALL XMLSignature_NssImpl::supportsService( const OUString& serviceName) {
     Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
     const OUString* pArray = seqServiceNames.getConstArray() ;
     for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
@@ -300,7 +296,7 @@ sal_Bool SAL_CALL XMLSignature_NssImpl::supportsService( const OUString& service
 }
 
 /* XServiceInfo */
-Sequence< OUString > SAL_CALL XMLSignature_NssImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) {
+Sequence< OUString > SAL_CALL XMLSignature_NssImpl::getSupportedServiceNames() {
     return impl_getSupportedServiceNames() ;
 }
 
@@ -311,12 +307,12 @@ Sequence< OUString > XMLSignature_NssImpl::impl_getSupportedServiceNames() {
     return seqServiceNames ;
 }
 
-OUString XMLSignature_NssImpl::impl_getImplementationName() throw( RuntimeException ) {
+OUString XMLSignature_NssImpl::impl_getImplementationName() {
     return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl") ;
 }
 
 //Helper for registry
-Reference< XInterface > SAL_CALL XMLSignature_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) {
+Reference< XInterface > SAL_CALL XMLSignature_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) {
     return Reference< XInterface >( *new XMLSignature_NssImpl ) ;
 }
 
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index 5e6fe23a1ca0..92f50d9acb26 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -46,35 +46,31 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper<
         virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate(
             const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
             const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment
-        ) throw (css::xml::crypto::XMLSignatureException,
-                 css::uno::SecurityException,
-                 css::uno::RuntimeException, std::exception) override ;
+        ) override ;
 
         virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate(
             const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
             const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext
-        ) throw( css::uno::RuntimeException,
-                 css::uno::SecurityException,
-                 css::xml::crypto::XMLSignatureException, std::exception) override;
+        ) override;
 
         //Methods from 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(
             const OUString& ServiceName
-        ) throw( css::uno::RuntimeException, std::exception ) override ;
+        ) 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 ;
 
         //Helper for XServiceInfo
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
         /// @throws css::uno::RuntimeException
-        static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() ;
 
         //Helper for registry
         /// @throws css::uno::RuntimeException
-        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ;
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 
         static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ;
 } ;
diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx
index 3a6a499eb94b..6fb61db139f6 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.cxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.cxx
@@ -214,7 +214,6 @@ void SAXHelper::setCurrentNode(const xmlNodePtr pNode)
  * XDocumentHandler -- start an xml document
  */
 void SAXHelper::startDocument()
-    throw( cssxs::SAXException , cssu::RuntimeException )
 {
     if( m_pParserCtxt == nullptr)
     {
@@ -243,7 +242,6 @@ void SAXHelper::startDocument()
  * XDocumentHandler -- end an xml document
  */
 void SAXHelper::endDocument()
-    throw( cssxs::SAXException , cssu::RuntimeException )
 {
     m_pSaxHandler->endDocument( m_pParserCtxt ) ;
 }
@@ -254,7 +252,6 @@ void SAXHelper::endDocument()
 void SAXHelper::startElement(
     const OUString& aName,
     const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
-    throw( cssxs::SAXException , cssu::RuntimeException )
 {
     const xmlChar* fullName = nullptr ;
     const xmlChar** attrs = nullptr ;
@@ -290,7 +287,6 @@ void SAXHelper::startElement(
  * XDocumentHandler -- end an xml element
  */
 void SAXHelper::endElement( const OUString& aName )
-    throw( cssxs::SAXException , cssu::RuntimeException )
 {
     xmlChar* fullname = nullptr ;
 
@@ -308,7 +304,6 @@ void SAXHelper::endElement( const OUString& aName )
  * XDocumentHandler -- an xml element or cdata characters
  */
 void SAXHelper::characters( const OUString& aChars )
-    throw( cssxs::SAXException , cssu::RuntimeException )
 {
     const xmlChar* chars = nullptr ;
     int length = 0 ;
@@ -326,7 +321,6 @@ void SAXHelper::characters( const OUString& aChars )
  * XDocumentHandler -- ignorable xml white space
  */
 void SAXHelper::ignorableWhitespace( const OUString& aWhitespaces )
-    throw( cssxs::SAXException , cssu::RuntimeException )
 {
     const xmlChar* chars = nullptr ;
     int length = 0 ;
@@ -346,7 +340,6 @@ void SAXHelper::ignorableWhitespace( const OUString& aWhitespaces )
 void SAXHelper::processingInstruction(
     const OUString& aTarget,
     const OUString& aData )
-    throw( cssxs::SAXException , cssu::RuntimeException )
 {
     xmlChar* target = nullptr ;
     xmlChar* data = nullptr ;
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
index 0917f2717a4d..2377654b086d 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
@@ -49,26 +49,21 @@ public:
 private:
     virtual ~Service() override {}
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return xml_security::serial_number_adapter::implementationName(); }
 
-    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
     { return cppu::supportsService(this, ServiceName); }
 
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
     { return xml_security::serial_number_adapter::serviceNames(); }
 
     virtual OUString SAL_CALL toString(
-        css::uno::Sequence< sal_Int8 > const & SerialNumber)
-        throw (css::uno::RuntimeException, std::exception) override
+        css::uno::Sequence< sal_Int8 > const & SerialNumber) override
     { return bigIntegerToNumericString(SerialNumber); }
 
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL toSequence(
-        OUString const & SerialNumber)
-        throw (css::uno::RuntimeException, std::exception) override
+        OUString const & SerialNumber) override
     { return numericStringToBigInteger(SerialNumber); }
 };
 
@@ -82,14 +77,12 @@ xml_security::serial_number_adapter::create(
 }
 
 OUString xml_security::serial_number_adapter::implementationName()
-    throw (css::uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.security.SerialNumberAdapter");
 }
 
 css::uno::Sequence< OUString >
 xml_security::serial_number_adapter::serviceNames()
-    throw (css::uno::RuntimeException)
 {
     css::uno::Sequence< OUString > s { "com.sun.star.security.SerialNumberAdapter" };
     return s;
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
index 5fb4269b92fe..2eb976afdced 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
@@ -37,11 +37,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
     css::uno::Reference< css::uno::XComponentContext > const &);
 
 /// @throws css::uno::RuntimeException
-OUString implementationName() throw (css::uno::RuntimeException);
+OUString implementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > serviceNames()
-    throw (css::uno::RuntimeException);
+css::uno::Sequence< OUString > serviceNames();
 
 } }
 
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 8945a421a3b6..fafa81d30e42 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -168,7 +168,6 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
     const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
     const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
     const xmlNodePtr pNode)
-    throw (cssxs::SAXException)
 /****** XMLDocumentWrapper_XmlSecImpl/sendStartElement ************************
  *
  *   NAME
@@ -257,7 +256,6 @@ void XMLDocumentWrapper_XmlSecImpl::sendEndElement(
     const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
     const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
     const xmlNodePtr pNode)
-    throw (cssxs::SAXException)
 /****** XMLDocumentWrapper_XmlSecImpl/sendEndElement **************************
  *
  *   NAME
@@ -291,7 +289,6 @@ void XMLDocumentWrapper_XmlSecImpl::sendNode(
     const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
     const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
     const xmlNodePtr pNode)
-    throw (cssxs::SAXException)
 /****** XMLDocumentWrapper_XmlSecImpl/sendNode ********************************
  *
  *   NAME
@@ -599,21 +596,18 @@ void XMLDocumentWrapper_XmlSecImpl::rebuildIDLink(xmlNodePtr pNode) const
 
 /* XXMLDocumentWrapper */
 cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getCurrentElement(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     XMLElementWrapper_XmlSecImpl* pElement = new XMLElementWrapper_XmlSecImpl(m_pCurrentElement);
     return cssu::Reference< cssxw::XXMLElementWrapper >(pElement);
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setCurrentElement( const cssu::Reference< cssxw::XXMLElementWrapper >& element )
-    throw (cssu::RuntimeException, std::exception)
 {
     m_pCurrentElement = checkElement( element );
     saxHelper.setCurrentNode( m_pCurrentElement );
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     OSL_ASSERT( m_pCurrentElement != nullptr );
 
@@ -635,14 +629,12 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement(  )
 }
 
 sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrent( const cssu::Reference< cssxw::XXMLElementWrapper >& node )
-    throw (cssu::RuntimeException, std::exception)
 {
     xmlNodePtr pNode = checkElement(node);
     return (pNode == m_pCurrentElement);
 }
 
 sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     bool rc = false;
 
@@ -655,7 +647,6 @@ sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty(  )
 }
 
 OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getNodeName( const cssu::Reference< cssxw::XXMLElementWrapper >& node )
-    throw (cssu::RuntimeException, std::exception)
 {
     xmlNodePtr pNode = checkElement(node);
     return OUString::fromUtf8(reinterpret_cast<char const *>(pNode->name));
@@ -665,7 +656,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData(
     const cssu::Reference< cssxw::XXMLElementWrapper >& node,
     const cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >& reservedDescendants,
     const cssu::Reference< cssxw::XXMLElementWrapper >& stopAtNode )
-    throw (cssu::RuntimeException, std::exception)
 {
     xmlNodePtr pTargetNode = checkElement(node);
 
@@ -679,7 +669,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData(
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::collapse( const cssu::Reference< cssxw::XXMLElementWrapper >& node )
-    throw (cssu::RuntimeException, std::exception)
 {
     xmlNodePtr pTargetNode = checkElement(node);
     xmlNodePtr pParent;
@@ -698,7 +687,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::collapse( const cssu::Reference< cs
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::getTree( const cssu::Reference< cssxs::XDocumentHandler >& handler )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     if (m_pRootElement != nullptr)
     {
@@ -742,7 +730,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents(
     const cssu::Reference< cssxs::XDocumentHandler >& xEventKeeperHandler,
     const cssu::Reference< cssxw::XXMLElementWrapper >& startNode,
     const cssu::Reference< cssxw::XXMLElementWrapper >& endNode )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
         /*
          * The first SAX event is the startElement of the startNode
@@ -816,7 +803,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents(
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::rebuildIDLink(
     const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node )
-    throw (css::uno::RuntimeException, std::exception)
 {
     xmlNodePtr pNode = checkElement( node );
     rebuildIDLink(pNode);
@@ -825,17 +811,14 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::rebuildIDLink(
 
 /* cssxs::XDocumentHandler */
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startDocument(  )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endDocument(  )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     sal_Int32 nLength = xAttribs->getLength();
     cssu::Sequence< cssxcsax::XMLAttribute > aAttributes (nLength);
@@ -850,48 +833,40 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const OUString& aName
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const OUString& aName )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     saxHelper.endElement(aName);
     m_pCurrentElement = saxHelper.getCurrentNode();
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::characters( const OUString& aChars )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     saxHelper.characters(aChars);
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::ignorableWhitespace( const OUString& aWhitespaces )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     saxHelper.ignorableWhitespace(aWhitespaces);
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::processingInstruction( const OUString& aTarget, const OUString& aData )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     saxHelper.processingInstruction(aTarget, aData);
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >& )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
 
 /* XCompressedDocumentHandler */
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartDocument(  )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedEndDocument(  )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     saxHelper.startElement(aName, aAttributes);
     m_pCurrentElement = saxHelper.getCurrentNode();
@@ -900,42 +875,35 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartElement( const OUStr
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedEndElement( const OUString& aName )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     endElement( aName );
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedCharacters( const OUString& aChars )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     characters( aChars );
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedIgnorableWhitespace( const OUString& aWhitespaces )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     ignorableWhitespace( aWhitespaces );
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedProcessingInstruction( const OUString& aTarget, const OUString& aData )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     processingInstruction( aTarget, aData );
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedSetDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const OUString& /*publicId*/, const OUString& /*systemId*/ )
-    throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
 
 OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName ()
-    throw (cssu::RuntimeException)
 {
     return OUString ( IMPLEMENTATION_NAME );
 }
 
 cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  )
-    throw (cssu::RuntimeException)
 {
     cssu::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLDocumentWrapper" };
     return aRet;
@@ -943,24 +911,20 @@ cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedSe
 
 cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance(
     const cssu::Reference< cssu::XComponentContext > &)
-    throw( cssu::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new XMLDocumentWrapper_XmlSecImpl( ));
 }
 
 /* XServiceInfo */
 OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getImplementationName(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return XMLDocumentWrapper_XmlSecImpl_getImplementationName();
 }
 sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::supportsService( const OUString& rServiceName )
-    throw (cssu::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getSupportedServiceNames(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index 409a68d86cc1..6c9efb970083 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -38,7 +38,6 @@ XMLElementWrapper_XmlSecImpl::XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNod
 
 /* XUnoTunnel */
 cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId()
-    throw (cssu::RuntimeException)
 {
     static ::cppu::OImplementationId* pId = nullptr;
     if (! pId)
@@ -54,7 +53,6 @@ cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementat
 }
 
 sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Sequence< sal_Int8 >& aIdentifier )
-    throw (cssu::RuntimeException, std::exception)
 {
     if (aIdentifier.getLength() == 16 &&
         0 == memcmp(
@@ -72,13 +70,11 @@ sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Seque
 
 
 OUString XMLElementWrapper_XmlSecImpl_getImplementationName ()
-    throw (cssu::RuntimeException)
 {
     return OUString ( IMPLEMENTATION_NAME );
 }
 
 cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  )
-    throw (cssu::RuntimeException)
 {
     cssu::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLElementWrapper" };
     return aRet;
@@ -87,24 +83,20 @@ cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedSer
 cssu::Reference< cssu::XInterface > SAL_CALL
     XMLElementWrapper_XmlSecImpl_createInstance(
         const cssu::Reference< cssu::XComponentContext > &)
-    throw( cssu::Exception )
 {
     return static_cast<cppu::OWeakObject*>(new XMLElementWrapper_XmlSecImpl(nullptr));
 }
 
 /* XServiceInfo */
 OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return XMLElementWrapper_XmlSecImpl_getImplementationName();
 }
 sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const OUString& rServiceName )
-    throw (cssu::RuntimeException, std::exception)
 {
     return cppu::supportsService( this, rServiceName );
 }
 cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames(  )
-    throw (cssu::RuntimeException, std::exception)
 {
     return XMLElementWrapper_XmlSecImpl_getSupportedServiceNames();
 }
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index 469ab4eef5a5..67a47d17db31 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -59,19 +59,14 @@ public:
     /* XXMLElementWrapper */
 
     /* css::lang::XUnoTunnel */
-    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
     /// @throws css::uno::RuntimeException
-    static css::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId()
-        throw(css::uno::RuntimeException);
+    static css::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId();
 
     /* css::lang::XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName(  )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 public:
     /*
@@ -89,18 +84,15 @@ public:
 };
 
 /// @throws css::uno::RuntimeException
-OUString XMLElementWrapper_XmlSecImpl_getImplementationName()
-    throw ( css::uno::RuntimeException );
+OUString XMLElementWrapper_XmlSecImpl_getImplementationName();
 
 /// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  )
-    throw ( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  );
 
 /// @throws css::uno::Exception
 css::uno::Reference< css::uno::XInterface >
 SAL_CALL XMLElementWrapper_XmlSecImpl_createInstance(
-    const css::uno::Reference< css::uno::XComponentContext > &)
-    throw ( css::uno::Exception );
+    const css::uno::Reference< css::uno::XComponentContext > &);
 
 #endif